diff --git a/.cargo/config b/.cargo/config
new file mode 100644
index 0000000000000000000000000000000000000000..72652ad2f11c848a7b1dd184899acc04caa604f9
--- /dev/null
+++ b/.cargo/config
@@ -0,0 +1,3 @@
+[target.x86_64-pc-windows-msvc]
+# Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643
+rustflags = ["-Ctarget-feature=+crt-static"]
diff --git a/.editorconfig b/.editorconfig
index 28b11218608140435d9349f36da97bcbcde1235a..e47fd12f0cd0fa589ab851721520156fbaf5976f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,7 +9,7 @@ trim_trailing_whitespace=true
 max_line_length=120
 insert_final_newline=true
 
-[.travis.yml]
+[*.{yml,sh}]
 indent_style=space
 indent_size=2
 tab_width=8
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000000000000000000000000000000000..a737b1a880f109c11fd555643c0955632605044f
--- /dev/null
+++ b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,84 @@
+# Code of Conduct
+
+## 1. Purpose
+
+A primary goal of Parity is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
+
+This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
+
+We invite all those who participate in Parity to help us create safe and positive experiences for everyone.
+
+## 2. Open Source Citizenship
+
+A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
+
+Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
+
+If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
+
+## 3. Expected Behavior
+
+The following behaviors are expected and requested of all community members:
+
+*   Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
+*   Exercise consideration and respect in your speech and actions.
+*   Attempt collaboration before conflict.
+*   Refrain from demeaning, discriminatory, or harassing behavior and speech.
+*   Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
+*   Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
+
+## 4. Unacceptable Behavior
+
+The following behaviors are considered harassment and are unacceptable within our community:
+
+*   Violence, threats of violence or violent language directed against another person.
+*   Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
+*   Posting or displaying sexually explicit or violent material.
+*   Posting or threatening to post other people’s personally identifying information ("doxing").
+*   Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
+*   Inappropriate photography or recording.
+*   Inappropriate physical contact. You should have someone’s consent before touching them.
+*   Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
+*   Deliberate intimidation, stalking or following (online or in person).
+*   Advocating for, or encouraging, any of the above behavior.
+*   Sustained disruption of community events, including talks and presentations.
+
+## 5. Consequences of Unacceptable Behavior
+
+Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
+
+Anyone asked to stop unacceptable behavior is expected to comply immediately.
+
+If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
+
+## 6. Reporting Guidelines
+
+If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. community@parity.io.
+
+Link to reporting guidelines: [CONTRIBUTING.md](CONTRIBUTING.md)
+
+Link to security policy: [SECURITY.md](../SECURITY.md)
+
+Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
+
+## 7. Addressing Grievances
+
+If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Parity Technologies with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
+
+## 8. Scope
+
+We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues–online and in-person–as well as in all one-on-one communications pertaining to community business.
+
+This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
+
+## 9. Contact info
+
+You can contact Parity via Email: community@parity.io
+
+## 10. License and attribution
+
+This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
+
+Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
+
+Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 0000000000000000000000000000000000000000..e3438f10a23b548453645c4a5d5b65d58fbabc3c
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,33 @@
+# Contributing Guidelines
+
+## Do you have a question?
+
+Check out our [Basic Usage](https://github.com/paritytech/parity/wiki/Basic-Usage), [Configuration](https://github.com/paritytech/parity/wiki/Configuring-Parity), and [FAQ](https://github.com/paritytech/parity/wiki/FAQ) articles on our [wiki](https://github.com/paritytech/parity/wiki)!
+
+See also frequently asked questions [tagged with `parity`](https://ethereum.stackexchange.com/questions/tagged/parity?sort=votes&pageSize=50) on Stack Exchange.
+
+## Report bugs!
+
+Do **not** open an issue on Github if you think your discovered bug could be a **security-relevant vulnerability**. Please, read our [security policy](../SECURITY.md) instead.
+
+Otherwise, just create a [new issue](https://github.com/paritytech/parity/issues/new) in our repository and state:
+
+- What's your Parity version?
+- What's your operating system and version?
+- How did you install parity?
+- Is your node fully synchronized?
+- Did you try turning it off and on again?
+
+Also, try to include **steps to reproduce** the issue and expand on the **actual versus expected behavior**.
+
+## Contribute!
+
+If you would like to contribute to Parity, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity/compare).
+
+Please, refer to the [Coding Guide](https://github.com/paritytech/parity/wiki/Coding-guide) in our wiki for more details about hacking on Parity.
+
+## License.
+
+By contributing to Parity, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
+
+Each contributor has to sign our Contributor License Agreement. The purpose of the CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen license. You can read and sign our full Contributor License Agreement at [cla.parity.io](https://cla.parity.io) before submitting a pull request.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index f4b5311d59e848c65698b314f6bc9e9da3e732c5..15dc3fa1a2331c2d16e10061bf9b59a35babf8a2 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -2,11 +2,12 @@ _Before filing a new issue, please **provide the following information**._
 
 > I'm running:
 >
-> - **Parity version**: 0.0.0
-> - **Operating system**: Windows / MacOS / Linux
-> - **And installed**: via installer / homebrew / binaries / from source
+> - **Which Parity version?**: 0.0.0
+> - **Which operating system?**: Windows / MacOS / Linux
+> - **How installed?**: via installer / homebrew / binaries / from source
+> - **Are you fully synchronized?**: no / yes
+> - **Which network are you connected to?**: ethereum / ropsten / kovan / ...
+> - **Did you try to restart the node?**: no / yes
 
 _Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._
 
----
-
diff --git a/.gitignore b/.gitignore
index 994559bb157102bcbfdbdf98cebe9aa784635885..0675bc41ebf2703740d770a58ac3fd6a4544b952 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 
 # vim stuff
 *.swp
+*.swo
 
 # mac stuff
 .DS_Store
@@ -23,6 +24,9 @@
 npm-debug.log
 node_modules
 
+# js build artifacts
+.git-release.log
+
 # gdb files
 .gdb_history
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed3a3675a12f6f21fde2d43cf73062ff62701277..f3a8a3f0c1e49fb1819e781f294fe97e88e92736 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,17 @@
 stages:
   - test
-  - js-build
   - push-release
   - build
 variables:
-  GIT_DEPTH: "3"
-  SIMPLECOV: "true"
   RUST_BACKTRACE: "1"
   RUSTFLAGS: ""
   CARGOFLAGS: ""
   CI_SERVER_NAME: "GitLab CI"
+  LIBSSL: "libssl1.0.0 (>=1.0.0)"
 cache:
-  key: "$CI_BUILD_STAGE/$CI_BUILD_REF_NAME"
+  key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME"
+  paths:
+    - target/
   untracked: true
 linux-stable:
   stage: build
@@ -23,77 +23,14 @@ linux-stable:
     - triggers
   script:
     - rustup default stable
-    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
-    - cargo build -j $(nproc) --release -p evmbin
-    - cargo build -j $(nproc) --release -p ethstore-cli
-    - cargo build -j $(nproc) --release -p ethkey-cli
-    - strip target/release/parity
-    - strip target/release/parity-evm
-    - strip target/release/ethstore
-    - strip target/release/ethkey
-    - export SHA3=$(target/release/parity tools hash target/release/parity)
-    - md5sum target/release/parity > parity.md5
-    - sh scripts/deb-build.sh amd64
-    - cp target/release/parity deb/usr/bin/parity
-    - cp target/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/release/ethstore deb/usr/bin/ethstore
-    - cp target/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
-    - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
+    # ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags 6. binary identifier
+    - scripts/gitlab-build.sh x86_64-unknown-linux-gnu x86_64-unknown-linux-gnu amd64 gcc g++ ubuntu
   tags:
-    - rust
     - rust-stable
   artifacts:
     paths:
-    - target/release/parity
-    - target/release/parity-evm
-    - target/release/ethstore
-    - target/release/ethkey
+    - parity.zip
     name: "stable-x86_64-unknown-linux-gnu_parity"
-linux-snap:
-  stage: build
-  image: parity/snapcraft:gitlab-ci
-  only:
-    - snap
-    - beta
-    - tags
-    - triggers
-  script:
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - cd snap
-    - rm -rf *snap
-    - sed -i 's/master/'"$VER"'/g' snapcraft.yaml
-    - echo "Version:"$VER
-    - snapcraft
-    - ls
-    - cp "parity_"$CI_BUILD"_REF_NAME_amd64.snap" "parity_"$VER"_amd64.snap"
-    - md5sum "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.snap" --body "parity_"$VER"_amd64.snap"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.snap.md5" --body "parity_"$VER"_amd64.snap.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-  tags:
-    - rust
-    - rust-stable
-  artifacts:
-    paths:
-    - scripts/parity_*_amd64.snap
-    name: "stable-x86_64-unknown-snap-gnu_parity"
-  allow_failure: true  
 linux-stable-debian:
   stage: build
   image: parity/rust-debian:gitlab-ci
@@ -103,81 +40,14 @@ linux-stable-debian:
     - stable
     - triggers
   script:
-    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
-    - cargo build -j $(nproc) --release -p evmbin
-    - cargo build -j $(nproc) --release -p ethstore-cli
-    - cargo build -j $(nproc) --release -p ethkey-cli
-    - strip target/release/parity
-    - strip target/release/parity-evm
-    - strip target/release/ethstore
-    - strip target/release/ethkey
-    - export SHA3=$(target/release/parity tools hash target/release/parity)
-    - md5sum target/release/parity > parity.md5
-    - sh scripts/deb-build.sh amd64
-    - cp target/release/parity deb/usr/bin/parity
-    - cp target/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/release/ethstore deb/usr/bin/ethstore
-    - cp target/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
-    - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity --body target/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
+    - export LIBSSL="libssl1.1 (>=1.1.0)"
+    - scripts/gitlab-build.sh x86_64-unknown-debian-gnu x86_64-unknown-linux-gnu amd64 gcc g++ debian
   tags:
-    - rust
     - rust-debian
   artifacts:
     paths:
-    - target/release/parity
+    - parity.zip
     name: "stable-x86_64-unknown-debian-gnu_parity"
-linux-beta:
-  stage: build
-  image: parity/rust:gitlab-ci
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - rustup default beta
-    - cargo build -j $(nproc) --release $CARGOFLAGS
-    - strip target/release/parity
-  tags:
-    - rust
-    - rust-beta
-  artifacts:
-    paths:
-    - target/release/parity
-    name: "beta-x86_64-unknown-linux-gnu_parity"
-  allow_failure: true
-linux-nightly:
-  stage: build
-  image: parity/rust:gitlab-ci
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - rustup default nightly
-    - cargo build -j $(nproc) --release $CARGOFLAGS
-    - strip target/release/parity
-  tags:
-    - rust
-    - rust-nightly
-  artifacts:
-    paths:
-    - target/release/parity
-    name: "nigthly-x86_64-unknown-linux-gnu_parity"
-  allow_failure: true
 linux-centos:
   stage: build
   image: parity/rust-centos:gitlab-ci
@@ -187,42 +57,12 @@ linux-centos:
     - stable
     - triggers
   script:
-    - export CXX="g++"
-    - export CC="gcc"
-    - export PLATFORM=x86_64-unknown-centos-gnu
-    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
-    - cargo build -j $(nproc) --release -p evmbin
-    - cargo build -j $(nproc) --release -p ethstore-cli
-    - cargo build -j $(nproc) --release -p ethkey-cli
-    - strip target/release/parity
-    - strip target/release/parity-evm
-    - strip target/release/ethstore
-    - strip target/release/ethkey
-    - md5sum target/release/parity > parity.md5
-    - md5sum target/release/parity-evm > parity-evm.md5
-    - md5sum target/release/ethstore > ethstore.md5
-    - md5sum target/release/ethkey > ethkey.md5
-    - export SHA3=$(target/release/parity tools hash target/release/parity)
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity-evm --body target/release/parity-evm
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity-evm.md5 --body parity-evm.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethstore --body target/release/ethstore
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethstore.md5 --body ethstore.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethkey --body target/release/ethkey
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethkey.md5 --body ethkey.md5
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh x86_64-unknown-centos-gnu x86_64-unknown-linux-gnu x86_64 gcc g++ centos
   tags:
-    - rust
     - rust-centos
   artifacts:
     paths:
-    - target/release/parity
+    - parity.zip
     name: "x86_64-unknown-centos-gnu_parity"
 linux-i686:
   stage: build
@@ -233,47 +73,13 @@ linux-i686:
     - stable
     - triggers
   script:
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export COMMIT=$(git rev-parse HEAD)
-    - export PLATFORM=i686-unknown-linux-gnu
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
-    - strip target/$PLATFORM/release/parity
-    - strip target/$PLATFORM/release/parity-evm
-    - strip target/$PLATFORM/release/ethstore
-    - strip target/$PLATFORM/release/ethkey   
-    - strip target/$PLATFORM/release/parity
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - export SHA3=$(target/$PLATFORM/release/parity tools hash target/$PLATFORM/release/parity)
-    - sh scripts/deb-build.sh i386
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_i386.deb"
-    - md5sum "parity_"$VER"_i386.deb" > "parity_"$VER"_i386.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_i386.deb" --body "parity_"$VER"_i386.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_i386.deb.md5" --body "parity_"$VER"_i386.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++ ubuntu
   tags:
-    - rust
     - rust-i686
   artifacts:
     paths:
-      - target/i686-unknown-linux-gnu/release/parity
+      - parity.zip
     name: "i686-unknown-linux-gnu"
-  allow_failure: true
 linux-armv7:
   stage: build
   image: parity/rust-armv7:gitlab-ci
@@ -283,55 +89,13 @@ linux-armv7:
     - stable
     - triggers
   script:
-    - export CC=arm-linux-gnueabihf-gcc
-    - export CXX=arm-linux-gnueabihf-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export PLATFORM=armv7-unknown-linux-gnueabihf
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.$PLATFORM]" >> .cargo/config
-    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
-    - cat .cargo/config
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - export SHA3=$(target/$PLATFORM/release/parity tools hash target/$PLATFORM/release/parity)
-    - sh scripts/deb-build.sh i386
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity-evm
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethstore
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethkey
-    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - sh scripts/deb-build.sh armhf
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
-    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
   tags:
-    - rust
     - rust-arm
   artifacts:
     paths:
-    - target/armv7-unknown-linux-gnueabihf/release/parity
+    - parity.zip
     name: "armv7_unknown_linux_gnueabihf_parity"
-  allow_failure: true
 linux-arm:
   stage: build
   image: parity/rust-arm:gitlab-ci
@@ -341,52 +105,13 @@ linux-arm:
     - stable
     - triggers
   script:
-    - export CC=arm-linux-gnueabihf-gcc
-    - export CXX=arm-linux-gnueabihf-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export PLATFORM=arm-unknown-linux-gnueabihf
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.$PLATFORM]" >> .cargo/config
-    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
-    - cat .cargo/config
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity-evm
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethstore
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethkey
-    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - sh scripts/deb-build.sh armhf
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
-    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
   tags:
-    - rust
     - rust-arm
   artifacts:
     paths:
-    - target/arm-unknown-linux-gnueabihf/release/parity
+    - parity.zip
     name: "arm-unknown-linux-gnueabihf_parity"
-  allow_failure: true
 linux-aarch64:
   stage: build
   image: parity/rust-arm64:gitlab-ci
@@ -396,51 +121,29 @@ linux-aarch64:
     - stable
     - triggers
   script:
-    - export CC=aarch64-linux-gnu-gcc
-    - export CXX=aarch64-linux-gnu-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export PLATFORM=aarch64-unknown-linux-gnu
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.$PLATFORM]" >> .cargo/config
-    - echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
-    - cat .cargo/config
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/parity
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/parity-evm
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/ethstore
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/ethkey
-    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - sh scripts/deb-build.sh arm64
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_arm64.deb"
-    - md5sum "parity_"$VER"_arm64.deb" > "parity_"$VER"_arm64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb.md5" --body "parity_"$VER"_arm64.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++ ubuntu
   tags:
-    - rust
     - rust-arm
   artifacts:
     paths:
-    - target/aarch64-unknown-linux-gnu/release/parity
+    - parity.zip
     name: "aarch64-unknown-linux-gnu_parity"
-  allow_failure: true
+linux-snap:
+  stage: build
+  image: parity/snapcraft:gitlab-ci
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - scripts/gitlab-build.sh x86_64-unknown-snap-gnu x86_64-unknown-linux-gnu amd64 gcc g++ snap
+  tags:
+    - rust-stable
+  artifacts:
+    paths:
+    - parity.zip
+    name: "stable-x86_64-unknown-snap-gnu_parity"
 darwin:
   stage: build
   only:
@@ -448,45 +151,17 @@ darwin:
     - tags
     - stable
     - triggers
-  script: |
-      export COMMIT=$(git rev-parse HEAD)
-      export PLATFORM=x86_64-apple-darwin
-      rustup default stable
-      cargo clean
-      cargo build -j 8 --features final --release #$CARGOFLAGS
-      cargo build -j 8 --release -p ethstore-cli #$CARGOFLAGS
-      cargo build -j 8 --release -p ethkey-cli #$CARGOFLAGS
-      cargo build -j 8 --release -p evmbin #$CARGOFLAGS
-      rm -rf parity.md5
-      md5sum target/release/parity > parity.md5
-      export SHA3=$(target/release/parity tools hash target/release/parity)
-      cd mac
-      xcodebuild -configuration Release
-      cd ..
-      packagesbuild -v mac/Parity.pkgproj
-      productsign --sign 'Developer ID Installer: PARITY TECHNOLOGIES LIMITED (P2PX3JU8FT)' target/release/Parity\ Ethereum.pkg target/release/Parity\ Ethereum-signed.pkg
-      export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-      mv target/release/Parity\ Ethereum-signed.pkg "parity-"$VER"-macos-installer.pkg"
-      md5sum "parity-"$VER"-macos-installer.pkg" >> "parity-"$VER"-macos-installer.pkg.md5"
-      aws configure set aws_access_key_id $s3_key
-      aws configure set aws_secret_access_key $s3_secret
-      if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-      aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/release/parity
-      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-macos-installer.pkg" --body "parity-"$VER"-macos-installer.pkg"
-      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-macos-installer.pkg.md5" --body "parity-"$VER"-macos-installer.pkg.md5"
-      curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-      curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+  script:
+    - scripts/gitlab-build.sh x86_64-apple-darwin x86_64-apple-darwin macos gcc g++ macos
   tags:
     - osx
   artifacts:
     paths:
-    - target/release/parity
+    - parity.zip
     name: "x86_64-apple-darwin_parity"
 windows:
   cache:
-    key: "%CI_BUILD_STAGE%/%CI_BUILD_REF_NAME%"
+    key: "%CI_BUILD_STAGE%-%CI_BUILD_REF_NAME%"
     untracked: true
   stage: build
   only:
@@ -495,62 +170,12 @@ windows:
     - stable
     - triggers
   script:
-    - set PLATFORM=x86_64-pc-windows-msvc
-    - set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt
-    - set LIB=C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64
-    - set RUST_BACKTRACE=1
-    - set RUSTFLAGS=%RUSTFLAGS%
-    - rustup default stable-x86_64-pc-windows-msvc
-    - cargo clean
-    - cargo build --features final --release #%CARGOFLAGS%
-    - cargo build --release -p ethstore-cli #%CARGOFLAGS%
-    - cargo build --release -p ethkey-cli #%CARGOFLAGS%
-    - cargo build --release -p evmbin #%CARGOFLAGS%
-    - signtool sign /f %keyfile% /p %certpass% target\release\parity.exe
-    - target\release\parity.exe tools hash target\release\parity.exe > parity.sha3
-    - set /P SHA3=<parity.sha3
-    - curl -sL --url "https://github.com/paritytech/win-build/raw/master/SimpleFC.dll" -o nsis\SimpleFC.dll
-    - curl -sL --url "https://github.com/paritytech/win-build/raw/master/vc_redist.x64.exe" -o nsis\vc_redist.x64.exe
-    - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release
-    - signtool sign /f %keyfile% /p %certpass% windows\ptray\x64\release\ptray.exe
-    - cd nsis
-    - makensis.exe installer.nsi
-    - copy installer.exe InstallParity.exe
-    - signtool sign /f %keyfile% /p %certpass% InstallParity.exe
-    - md5sums InstallParity.exe > InstallParity.exe.md5
-    - zip win-installer.zip InstallParity.exe InstallParity.exe.md5
-    - md5sums win-installer.zip > win-installer.zip.md5
-    - cd ..\target\release\
-    - md5sums parity.exe > parity.exe.md5
-    - zip parity.zip parity.exe parity.md5
-    - md5sums parity.zip > parity.zip.md5
-    - cd ..\..
-    - aws configure set aws_access_key_id %s3_key%
-    - aws configure set aws_secret_access_key %s3_secret%
-    - echo %CI_BUILD_REF_NAME%
-    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "nightly" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
-    - echo %S3_BUCKET%
-    - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe.md5 --body target\release\parity.exe.md5
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip --body target\release\parity.zip
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip.md5 --body target\release\parity.zip.md5
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe --body nsis\InstallParity.exe
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe.md5 --body nsis\InstallParity.exe.md5
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip --body nsis\win-installer.zip
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip.md5 --body nsis\win-installer.zip.md5
-    - curl --data "commit=%CI_BUILD_REF%&sha3=%SHA3%&filename=parity.exe&secret=%RELEASES_SECRET%" http://update.parity.io:1337/push-build/%CI_BUILD_REF_NAME%/%PLATFORM%
-    - curl --data "commit=%CI_BUILD_REF%&sha3=%SHA3%&filename=parity.exe&secret=%RELEASES_SECRET%" http://update.parity.io:1338/push-build/%CI_BUILD_REF_NAME%/%PLATFORM%
+    - sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" windows
   tags:
    - rust-windows
   artifacts:
     paths:
-    - target/release/parity.exe
-    - target/release/parity.pdb
-    - nsis/InstallParity.exe
+    - parity.zip
     name: "x86_64-pc-windows-msvc_parity"
 docker-build:
   stage: build
@@ -563,7 +188,7 @@ docker-build:
     - if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
     - echo "Tag:" $DOCKER_TAG
     - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
-    - sh scripts/docker-build.sh $DOCKER_TAG
+    - scripts/docker-build.sh $DOCKER_TAG
     - docker logout
   tags:
     - docker
@@ -572,65 +197,16 @@ test-coverage:
   only:
     - master
   script:
-    - git submodule update --init --recursive
-    - rm -rf target/*
-    - rm -rf js/.coverage
-    - scripts/cov.sh
- #   - COVERAGE=$(grep -Po 'covered":.*?[^\\]"' target/cov/index.json | grep "[0-9]*\.[0-9]" -o)
- #   - echo "Coverage:" $COVERAGE
+    - scripts/gitlab-test.sh test-coverage
   tags:
     - kcov
   allow_failure: true
-test-darwin:
-  stage: test
-  only:
-    - triggers
-  before_script:
-    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e "^js/" -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
-  script:
-    - export RUST_BACKTRACE=1
-    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
-  tags:
-    - osx
-  allow_failure: true
-test-windows:
-  stage: test
-  only:
-    - triggers
-  before_script:
-    - git submodule update --init --recursive
-  script:
-    - set RUST_BACKTRACE=1
-    - echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p parity-dapps -p parity-rpc -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity-rpc-client -p parity %CARGOFLAGS% --verbose --release
-  tags:
-    - rust-windows
-  allow_failure: true
 test-rust-stable:
   stage: test
   image: parity/rust:gitlab-ci
-  before_script:
-    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
-    - rustup show
-    - export RUST_BACKTRACE=1
-    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
-    - if [ "$CI_BUILD_REF_NAME" == "nightly" ]; then sh scripts/aura-test.sh; fi
+    - scripts/gitlab-test.sh stable
   tags:
-    - rust
-    - rust-stable
-js-test:
-  stage: test
-  image: parity/rust:gitlab-ci
-  before_script:
-    - git submodule update --init --recursive
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
-    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
-  script:
-    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS lint since no JS files modified."; else ./js/scripts/lint.sh && ./js/scripts/test.sh && ./js/scripts/build.sh; fi
-  tags:
-    - rust
     - rust-stable
 test-rust-beta:
   stage: test
@@ -638,15 +214,9 @@ test-rust-beta:
     - triggers
     - master
   image: parity/rust:gitlab-ci
-  before_script:
-    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
-    - rustup default beta
-    - export RUST_BACKTRACE=1
-    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
+    - scripts/gitlab-test.sh beta
   tags:
-    - rust
     - rust-beta
   allow_failure: true
 test-rust-nightly:
@@ -655,36 +225,12 @@ test-rust-nightly:
     - triggers
     - master
   image: parity/rust:gitlab-ci
-  before_script:
-    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
-    - rustup default nightly
-    - export RUST_BACKTRACE=1
-    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
+    - scripts/gitlab-test.sh nightly
   tags:
     - rust
     - rust-nightly
   allow_failure: true
-js-release:
-  stage: js-build
-  only:
-    - master
-    - beta
-    - stable
-    - tags
-    - triggers
-  image: parity/rust:gitlab-ci
-  before_script:
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
-    - echo $JS_FILES_MODIFIED
-    - if [ $JS_FILES_MODIFIED -eq 0  ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
-  script:
-    - rustup default stable
-    - echo $JS_FILES_MODIFIED
-    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi
-  tags:
-    - javascript
 push-release:
   stage: push-release
   only:
@@ -692,8 +238,6 @@ push-release:
     - triggers
   image: parity/rust:gitlab-ci
   script:
-    - rustup default stable
-    - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
-    - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1338/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
+    - scripts/gitlab-push-release.sh
   tags:
     - curl
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78bf895ee48026b07ad761ca32fd909f18710c75..c0f438696b66e7611bee7bfee252ccfcdb0193d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4394 +1,213 @@
-## Parity [v1.7.0](https://github.com/paritytech/parity/releases/tag/v1.7.0) (2017-07-28)
+## Parity [v1.10.0](https://github.com/paritytech/parity/releases/tag/v1.10.0) (2018-03-22)
 
-Parity 1.7.0 is a major release introducing several important features:
+This is the Parity 1.10.0-beta release! Cool!
 
-- **Experimental [Light client](https://github.com/paritytech/parity/wiki/The-Parity-Light-Protocol-(PIP)) support**. Start Parity with `--light` to enable light mode. Please, note: The wallet UI integration for the light client is not included, yet.
-- **Experimental web wallet**. A hosted version of Parity that keeps the keys and signs transactions using your browser storage. Try it at https://wallet.parity.io or run your own with `--public-node`.
-- **WASM contract support**. Private networks can run contracts compiled into WASM bytecode. _More information and documentation to follow_.
-- **DApps and RPC server merge**. DApp and RPC are now available through a single API endpoint. DApp server related settings are deprecated.
-- **Export accounts from the wallet**. Backing up your keys can now simply be managed through the wallet interface.
-- **PoA/Kovan validator set contract**. The PoA network validator-set management via smart contract is now supported by warp and, in the near future, light sync.
-- **PubSub API**. https://github.com/paritytech/parity/wiki/JSONRPC-Parity-Pub-Sub-module
-- **Signer apps for IOS and Android**.
+### Disabling the Parity Wallet
 
-Full list of included changes:
+The **Parity Wallet (a.k.a. "UI") is now disabled by default**. We are preparing to split the wallet from the core client.
 
-- Backports [#6163](https://github.com/paritytech/parity/pull/6163)
-  - Light client improvements ([#6156](https://github.com/paritytech/parity/pull/6156))
-    - No seal checking
-    - Import command and --no-seal-check for light client
-    - Fix eth_call
-    - Tweak registry dapps lookup
-    - Ignore failed requests to non-server peers
-  - Fix connecting to wildcard addresses. ([#6167](https://github.com/paritytech/parity/pull/6167))
-  - Don't display an overlay in case the time sync check fails. ([#6164](https://github.com/paritytech/parity/pull/6164))
-    - Small improvements to time estimation.
-    - Temporarily disable NTP time check by default.
-- Light client fixes ([#6148](https://github.com/paritytech/parity/pull/6148)) [#6151](https://github.com/paritytech/parity/pull/6151)
-  - Light client fixes
-  - Fix memory-lru-cache
-  - Clear pending reqs on disconnect
-- Filter tokens logs from current block, not genesis ([#6128](https://github.com/paritytech/parity/pull/6128)) [#6141](https://github.com/paritytech/parity/pull/6141)
-- Fix QR scanner returning null on confirm [#6122](https://github.com/paritytech/parity/pull/6122)
-- Check QR before lowercase ([#6119](https://github.com/paritytech/parity/pull/6119)) [#6120](https://github.com/paritytech/parity/pull/6120)
-- Remove chunk to restore from pending set only upon successful import [#6117](https://github.com/paritytech/parity/pull/6117)
-- Fixed node address detection on incoming connection [#6094](https://github.com/paritytech/parity/pull/6094)
-- Place RETURNDATA behind block number gate [#6095](https://github.com/paritytech/parity/pull/6095)
-- Update wallet library binaries [#6108](https://github.com/paritytech/parity/pull/6108)
-- Backported wallet fix [#6105](https://github.com/paritytech/parity/pull/6105)
-  - Fix initialisation bug. ([#6102](https://github.com/paritytech/parity/pull/6102))
-  - Update wallet library modifiers ([#6103](https://github.com/paritytech/parity/pull/6103))
-- Place RETURNDATA behind block number gate [#6095](https://github.com/paritytech/parity/pull/6095)
-- Fixed node address detection on incoming connection [#6094](https://github.com/paritytech/parity/pull/6094)
-- Bump snap version and tweak importing detection logic ([#6079](https://github.com/paritytech/parity/pull/6079)) [#6081](https://github.com/paritytech/parity/pull/6081)
-  - bump last tick just before printing info and restore sync detection
-  - bump kovan snapshot version
-  - Fixed sync tests
-  - Fixed rpc tests
-- Acquire client report under lock in informant [#6071](https://github.com/paritytech/parity/pull/6071)
-- Show busy indicator on Address forget [#6069](https://github.com/paritytech/parity/pull/6069)
-- Add CSP for worker-src ([#6059](https://github.com/paritytech/parity/pull/6059)) [#6064](https://github.com/paritytech/parity/pull/6064)
-  - Specify worker-src seperately, add blob
-  - Upgrade react-qr-scan to latest version
-- Set release channel to beta
-- Limit transaction queue memory & limit future queue [#6038](https://github.com/paritytech/parity/pull/6038)
-- Fix CI build issue [#6050](https://github.com/paritytech/parity/pull/6050)
-- New contract PoA sync fixes [#5991](https://github.com/paritytech/parity/pull/5991)
-- Fixed link to Multisig Contract Wallet on master [#5984](https://github.com/paritytech/parity/pull/5984)
-- Ethcore crate split part 1 [#6041](https://github.com/paritytech/parity/pull/6041)
-- Fix status icon [#6039](https://github.com/paritytech/parity/pull/6039)
-- Errors & warnings for inappropriate RPCs [#6029](https://github.com/paritytech/parity/pull/6029)
-- Add missing CSP for web3.site [#5992](https://github.com/paritytech/parity/pull/5992)
-- Remove cargo install --git from README.md [#6037](https://github.com/paritytech/parity/pull/6037)
-- Node Health warnings [#5951](https://github.com/paritytech/parity/pull/5951)
-- RPC cpu pool [#6023](https://github.com/paritytech/parity/pull/6023)
-- Use crates.io dependencies for parity-wasm [#6036](https://github.com/paritytech/parity/pull/6036)
-- Add test for loading the chain specs [#6028](https://github.com/paritytech/parity/pull/6028)
-- Whitelist APIs for generic Pub-Sub [#5840](https://github.com/paritytech/parity/pull/5840)
-- WASM contracts MVP [#5679](https://github.com/paritytech/parity/pull/5679)
-- Fix valid QR scan not advancing [#6033](https://github.com/paritytech/parity/pull/6033)
-- --reseal-on-uncle [#5940](https://github.com/paritytech/parity/pull/5940)
-- Support comments in reserved peers file ([#6004](https://github.com/paritytech/parity/pull/6004)) [#6012](https://github.com/paritytech/parity/pull/6012)
-- Add new md tnc [#5937](https://github.com/paritytech/parity/pull/5937)
-- Fix output of parity-evm in case of bad instruction [#5955](https://github.com/paritytech/parity/pull/5955)
-- Don't send notifications to unsubscribed clients of PubSub [#5960](https://github.com/paritytech/parity/pull/5960)
-- Proper light client informant and more verification of imported headers [#5897](https://github.com/paritytech/parity/pull/5897)
-- New Kovan bootnodes [#6017](https://github.com/paritytech/parity/pull/6017)
-- Use standard paths for Ethash cache [#5881](https://github.com/paritytech/parity/pull/5881)
-- Defer code hash calculation. [#5959](https://github.com/paritytech/parity/pull/5959)
-- Fix first run wizard. [#6000](https://github.com/paritytech/parity/pull/6000)
-- migration to serde 1.0 [#5996](https://github.com/paritytech/parity/pull/5996)
-- SecretStore: generating signatures [#5764](https://github.com/paritytech/parity/pull/5764)
-- bigint upgraded to version 3.0 [#5986](https://github.com/paritytech/parity/pull/5986)
-- config: don't allow dev chain with force sealing option [#5965](https://github.com/paritytech/parity/pull/5965)
-- Update lockfile for miniz-sys and gcc [#5969](https://github.com/paritytech/parity/pull/5969)
-- Clean up function naming in RPC error module [#5995](https://github.com/paritytech/parity/pull/5995)
-- Fix underflow in gas calculation [#5975](https://github.com/paritytech/parity/pull/5975)
-- PubSub for parity-js [#5830](https://github.com/paritytech/parity/pull/5830)
-- Report whether a peer was kept from `Handler::on_connect` [#5958](https://github.com/paritytech/parity/pull/5958)
-- Implement skeleton for transaction index and epoch transition proof PIP messages [#5908](https://github.com/paritytech/parity/pull/5908)
-- TransactionQueue improvements [#5917](https://github.com/paritytech/parity/pull/5917)
-- constant time HMAC comparison and clarify docs in ethkey [#5952](https://github.com/paritytech/parity/pull/5952)
-- Avoid pre-computing jump destinations [#5954](https://github.com/paritytech/parity/pull/5954)
-- Upgrade elastic array [#5949](https://github.com/paritytech/parity/pull/5949)
-- PoA: Wait for transition finality before applying [#5774](https://github.com/paritytech/parity/pull/5774)
-- Logs Pub-Sub [#5705](https://github.com/paritytech/parity/pull/5705)
-- Add the command to install the parity snap [#5945](https://github.com/paritytech/parity/pull/5945)
-- Reduce unnecessary allocations [#5944](https://github.com/paritytech/parity/pull/5944)
-- Clarify confusing messages. [#5935](https://github.com/paritytech/parity/pull/5935)
-- Content Security Policy [#5790](https://github.com/paritytech/parity/pull/5790)
-- CLI: Export error message and less verbose peer counter. [#5870](https://github.com/paritytech/parity/pull/5870)
-- network: make it more explicit about StreamToken and TimerToken [#5939](https://github.com/paritytech/parity/pull/5939)
-- sync: make it more idiomatic rust [#5938](https://github.com/paritytech/parity/pull/5938)
-- Prioritize accounts over address book [#5909](https://github.com/paritytech/parity/pull/5909)
-- Fixing failing compilation of RPC test on master. [#5916](https://github.com/paritytech/parity/pull/5916)
-- Empty local middleware, until explicitly requested [#5912](https://github.com/paritytech/parity/pull/5912)
-- Cancel propagated TX [#5899](https://github.com/paritytech/parity/pull/5899)
-- fix minor race condition in aura seal generation [#5910](https://github.com/paritytech/parity/pull/5910)
-- Docs for Pub-Sub, optional parameter for parity_subscribe [#5833](https://github.com/paritytech/parity/pull/5833)
-- Fix gas editor doubling-up on gas [#5820](https://github.com/paritytech/parity/pull/5820)
-- Information about used paths added to general output block [#5904](https://github.com/paritytech/parity/pull/5904)
-- Domain-locked web tokens. [#5894](https://github.com/paritytech/parity/pull/5894)
-- Removed panic handlers [#5895](https://github.com/paritytech/parity/pull/5895)
-- Latest changes from Rust RocksDB binding merged [#5905](https://github.com/paritytech/parity/pull/5905)
-- Adjust keyethereum/secp256 aliasses [#5903](https://github.com/paritytech/parity/pull/5903)
-- Keyethereum fs dependency [#5902](https://github.com/paritytech/parity/pull/5902)
-- Ethereum Classic Monetary Policy [#5741](https://github.com/paritytech/parity/pull/5741)
-- Initial token should allow full access. [#5873](https://github.com/paritytech/parity/pull/5873)
-- Fixed account selection for Dapps on public node [#5856](https://github.com/paritytech/parity/pull/5856)
-- blacklist bad snapshot manifest hashes upon failure [#5874](https://github.com/paritytech/parity/pull/5874)
-- Fix wrongly called timeouts [#5838](https://github.com/paritytech/parity/pull/5838)
-- ArchiveDB and other small fixes [#5867](https://github.com/paritytech/parity/pull/5867)
-- convert try!() to ? [#5866](https://github.com/paritytech/parity/pull/5866)
-- Make config file optional in systemd [#5847](https://github.com/paritytech/parity/pull/5847)
-- EIP-116 (214), [#4833](https://github.com/paritytech/parity/issues/4833) [#4851](https://github.com/paritytech/parity/pull/4851)
-- all executables are workspace members [#5865](https://github.com/paritytech/parity/pull/5865)
-- minor optimizations of the modexp builtin [#5860](https://github.com/paritytech/parity/pull/5860)
-- three small commits for HashDB and MemoryDB [#5766](https://github.com/paritytech/parity/pull/5766)
-- use rust 1.18's retain to boost the purge performance [#5801](https://github.com/paritytech/parity/pull/5801)
-- Allow IPFS server to accept POST requests [#5858](https://github.com/paritytech/parity/pull/5858)
-- Dutch i18n from [#5802](https://github.com/paritytech/parity/issues/5802) for master [#5836](https://github.com/paritytech/parity/pull/5836)
-- Typos in token deploy dapp ui [#5851](https://github.com/paritytech/parity/pull/5851)
-- A CLI flag to allow fast transaction signing when account is unlocked. [#5778](https://github.com/paritytech/parity/pull/5778)
-- Removing `additional` field from EVM instructions [#5821](https://github.com/paritytech/parity/pull/5821)
-- Don't fail on wrong log decoding [#5813](https://github.com/paritytech/parity/pull/5813)
-- Use randomized subscription ids for PubSub [#5756](https://github.com/paritytech/parity/pull/5756)
-- Fixed mem write for empty slice [#5827](https://github.com/paritytech/parity/pull/5827)
-- Fix party technologies [#5810](https://github.com/paritytech/parity/pull/5810)
-- Revert "Fixed mem write for empty slice" [#5826](https://github.com/paritytech/parity/pull/5826)
-- Fixed mem write for empty slice [#5825](https://github.com/paritytech/parity/pull/5825)
-- Fix JS tests [#5822](https://github.com/paritytech/parity/pull/5822)
-- Bump native-tls and openssl crates. [#5817](https://github.com/paritytech/parity/pull/5817)
-- Public node using WASM [#5734](https://github.com/paritytech/parity/pull/5734)
-- enforce block signer == author field in PoA [#5808](https://github.com/paritytech/parity/pull/5808)
-- Fix stack display in evmbin. [#5733](https://github.com/paritytech/parity/pull/5733)
-- Disable UI if it's not compiled in. [#5773](https://github.com/paritytech/parity/pull/5773)
-- Require phrase confirmation. [#5731](https://github.com/paritytech/parity/pull/5731)
-- Duration limit made optional for EthashParams [#5777](https://github.com/paritytech/parity/pull/5777)
-- Update Changelog for 1.6.8 [#5798](https://github.com/paritytech/parity/pull/5798)
-- Replace Ethcore comany name in T&C and some other places [#5796](https://github.com/paritytech/parity/pull/5796)
-- PubSub for IPC. [#5800](https://github.com/paritytech/parity/pull/5800)
-- Fix terminology distributed -> decentralized applications [#5797](https://github.com/paritytech/parity/pull/5797)
-- Disable compression for RLP strings [#5786](https://github.com/paritytech/parity/pull/5786)
-- update the source for the snapcraft package [#5781](https://github.com/paritytech/parity/pull/5781)
-- Fixed default UI port for mac installer [#5782](https://github.com/paritytech/parity/pull/5782)
-- Block invalid account name creation [#5784](https://github.com/paritytech/parity/pull/5784)
-- Update Cid/multihash/ring/tinykeccak [#5785](https://github.com/paritytech/parity/pull/5785)
-- use NULL_RLP, remove NULL_RLP_STATIC [#5742](https://github.com/paritytech/parity/pull/5742)
-- Blacklist empty phrase account. [#5730](https://github.com/paritytech/parity/pull/5730)
-- EIP-211 RETURNDATACOPY and RETURNDATASIZE [#5678](https://github.com/paritytech/parity/pull/5678)
-- Bump mio [#5763](https://github.com/paritytech/parity/pull/5763)
-- Fixing UI issues after UI server refactor [#5710](https://github.com/paritytech/parity/pull/5710)
-- Fix WS server expose issue. [#5728](https://github.com/paritytech/parity/pull/5728)
-- Fix local transactions without condition. [#5716](https://github.com/paritytech/parity/pull/5716)
-- Bump parity-wordlist. [#5748](https://github.com/paritytech/parity/pull/5748)
-- two small changes in evm [#5700](https://github.com/paritytech/parity/pull/5700)
-- Evmbin: JSON format printing pre-state. [#5712](https://github.com/paritytech/parity/pull/5712)
-- Recover from empty phrase in dev mode [#5698](https://github.com/paritytech/parity/pull/5698)
-- EIP-210 BLOCKHASH changes [#5505](https://github.com/paritytech/parity/pull/5505)
-- fixes typo [#5708](https://github.com/paritytech/parity/pull/5708)
-- Bump rocksdb [#5707](https://github.com/paritytech/parity/pull/5707)
-- Fixed --datadir option [#5697](https://github.com/paritytech/parity/pull/5697)
-- rpc -> weak to arc [#5688](https://github.com/paritytech/parity/pull/5688)
-- typo fix [#5699](https://github.com/paritytech/parity/pull/5699)
-- Revamping parity-evmbin [#5696](https://github.com/paritytech/parity/pull/5696)
-- Update dependencies and bigint api [#5685](https://github.com/paritytech/parity/pull/5685)
-- UI server refactoring [#5580](https://github.com/paritytech/parity/pull/5580)
-- Fix from/into electrum in ethkey [#5686](https://github.com/paritytech/parity/pull/5686)
-- Add unit tests [#5668](https://github.com/paritytech/parity/pull/5668)
-- Guanqun add unit tests [#5671](https://github.com/paritytech/parity/pull/5671)
-- Parity-PubSub as a separate API. [#5676](https://github.com/paritytech/parity/pull/5676)
-- EIP-140 REVERT opcode [#5477](https://github.com/paritytech/parity/pull/5477)
-- Update CHANGELOG for 1.6.7 [#5683](https://github.com/paritytech/parity/pull/5683)
-- Updated docs slightly. [#5674](https://github.com/paritytech/parity/pull/5674)
-- Fix build [#5684](https://github.com/paritytech/parity/pull/5684)
-- Back-references for the on-demand service [#5573](https://github.com/paritytech/parity/pull/5573)
-- Dynamically adjust PIP request costs based on gathered data [#5603](https://github.com/paritytech/parity/pull/5603)
-- use cargo workspace [#5601](https://github.com/paritytech/parity/pull/5601)
-- Latest headers Pub-Sub [#5655](https://github.com/paritytech/parity/pull/5655)
-- improved dockerfile builds [#5659](https://github.com/paritytech/parity/pull/5659)
-- Adding CLI options: port shift and unsafe expose. [#5677](https://github.com/paritytech/parity/pull/5677)
-- Report missing author in Aura [#5583](https://github.com/paritytech/parity/pull/5583)
-- typo fix [#5669](https://github.com/paritytech/parity/pull/5669)
-- Remove public middleware (temporary) [#5665](https://github.com/paritytech/parity/pull/5665)
-- Remove additional polyfill [#5663](https://github.com/paritytech/parity/pull/5663)
-- Importing accounts from files. [#5644](https://github.com/paritytech/parity/pull/5644)
-- remove the deprecated options in rustfmt.toml [#5616](https://github.com/paritytech/parity/pull/5616)
-- Update the Console dapp [#5602](https://github.com/paritytech/parity/pull/5602)
-- Create an account for chain=dev [#5612](https://github.com/paritytech/parity/pull/5612)
-- Use babel-runtime as opposed to babel-polyfill [#5662](https://github.com/paritytech/parity/pull/5662)
-- Connection dialog timestamp info [#5554](https://github.com/paritytech/parity/pull/5554)
-- use copy_from_slice instead of for loop [#5647](https://github.com/paritytech/parity/pull/5647)
-- Light friendly dapps [#5634](https://github.com/paritytech/parity/pull/5634)
-- Add Recover button to Accounts and warnings [#5645](https://github.com/paritytech/parity/pull/5645)
-- Update eth_sign docs. [#5631](https://github.com/paritytech/parity/pull/5631)
-- Proper signer Pub-Sub for pending requests. [#5594](https://github.com/paritytech/parity/pull/5594)
-- Bump bigint to 1.0.5 [#5641](https://github.com/paritytech/parity/pull/5641)
-- PoA warp implementation [#5488](https://github.com/paritytech/parity/pull/5488)
-- Improve on-demand dispatch and add support for batch requests [#5419](https://github.com/paritytech/parity/pull/5419)
-- Use default account for sending transactions [#5588](https://github.com/paritytech/parity/pull/5588)
-- Add peer management to the Status tab [#5566](https://github.com/paritytech/parity/pull/5566)
-- Add monotonic step transition [#5587](https://github.com/paritytech/parity/pull/5587)
-- Decrypting for external accounts. [#5581](https://github.com/paritytech/parity/pull/5581)
-- only enable warp sync when engine supports it [#5595](https://github.com/paritytech/parity/pull/5595)
-- fix the doc of installing rust [#5586](https://github.com/paritytech/parity/pull/5586)
-- Small fixes [#5584](https://github.com/paritytech/parity/pull/5584)
-- SecretStore: remove session on master node [#5545](https://github.com/paritytech/parity/pull/5545)
-- run-clean [#5607](https://github.com/paritytech/parity/pull/5607)
-- relicense RLP to MIT/Apache2 [#5591](https://github.com/paritytech/parity/pull/5591)
-- Fix eth_sign signature encoding. [#5597](https://github.com/paritytech/parity/pull/5597)
-- Check pending request on Node local transactions [#5564](https://github.com/paritytech/parity/pull/5564)
-- Add tooltips on ActionBar [#5562](https://github.com/paritytech/parity/pull/5562)
-- Can't deploy without compiling Contract [#5593](https://github.com/paritytech/parity/pull/5593)
-- Add a warning when node is syncing [#5565](https://github.com/paritytech/parity/pull/5565)
-- Update registry middleware [#5585](https://github.com/paritytech/parity/pull/5585)
-- Set block condition to BigNumber in MethodDecoding [#5592](https://github.com/paritytech/parity/pull/5592)
-- Load the sources immediately in Contract Dev [#5575](https://github.com/paritytech/parity/pull/5575)
-- Remove formal verification messages in Dev Contract [#5574](https://github.com/paritytech/parity/pull/5574)
-- Fix event params decoding when no names for parameters [#5567](https://github.com/paritytech/parity/pull/5567)
-- Do not convert to Dates twice [#5563](https://github.com/paritytech/parity/pull/5563)
-- Fix Multisig wallet settings [#5560](https://github.com/paritytech/parity/pull/5560)
-- Typo [#5547](https://github.com/paritytech/parity/pull/5547)
-- Generic PubSub implementation [#5456](https://github.com/paritytech/parity/pull/5456)
-- Fix CI paths. [#5570](https://github.com/paritytech/parity/pull/5570)
-- reorg into blocks before minimum history [#5558](https://github.com/paritytech/parity/pull/5558)
-- EIP-86 update [#5506](https://github.com/paritytech/parity/pull/5506)
-- Secretstore RPCs + integration [#5439](https://github.com/paritytech/parity/pull/5439)
-- Fixes Parity Bar position [#5557](https://github.com/paritytech/parity/pull/5557)
-- Fixes invalid log in BadgeReg events [#5556](https://github.com/paritytech/parity/pull/5556)
-- Fix issues in Contract Development view [#5555](https://github.com/paritytech/parity/pull/5555)
-- Added missing methods [#5542](https://github.com/paritytech/parity/pull/5542)
-- option to disable persistent txqueue [#5544](https://github.com/paritytech/parity/pull/5544)
-- Bump jsonrpc [#5552](https://github.com/paritytech/parity/pull/5552)
-- Retrieve block headers only for header-only info [#5480](https://github.com/paritytech/parity/pull/5480)
-- add snap to CI [#5519](https://github.com/paritytech/parity/pull/5519)
-- Pass additional data when reporting [#5527](https://github.com/paritytech/parity/pull/5527)
-- Calculate post-constructors state root in spec at load time [#5523](https://github.com/paritytech/parity/pull/5523)
-- Fix utf8 decoding [#5533](https://github.com/paritytech/parity/pull/5533)
-- Add CHANGELOG.md [#5513](https://github.com/paritytech/parity/pull/5513)
-- Change all occurrences of ethcore.io into parity.io [#5528](https://github.com/paritytech/parity/pull/5528)
-- Memory usage optimization [#5526](https://github.com/paritytech/parity/pull/5526)
-- Compose transaction RPC. [#5524](https://github.com/paritytech/parity/pull/5524)
-- Support external eth_sign  [#5481](https://github.com/paritytech/parity/pull/5481)
-- Treat block numbers as strings, not BigNums. [#5449](https://github.com/paritytech/parity/pull/5449)
-- npm cleanups [#5512](https://github.com/paritytech/parity/pull/5512)
-- Export acc js [#4973](https://github.com/paritytech/parity/pull/4973)
-- YARN [#5395](https://github.com/paritytech/parity/pull/5395)
-- Fix linting issues [#5511](https://github.com/paritytech/parity/pull/5511)
-- Chinese Translation [#5460](https://github.com/paritytech/parity/pull/5460)
-- Fixing secretstore TODOs - part 2 [#5416](https://github.com/paritytech/parity/pull/5416)
-- fix json format of state snapshot [#5504](https://github.com/paritytech/parity/pull/5504)
-- Bump jsonrpc version [#5489](https://github.com/paritytech/parity/pull/5489)
-- Groundwork for generalized warp sync [#5454](https://github.com/paritytech/parity/pull/5454)
-- Add the packaging metadata to build the parity snap [#5496](https://github.com/paritytech/parity/pull/5496)
-- Cancel tx JS [#4958](https://github.com/paritytech/parity/pull/4958)
-- EIP-212 (bn128 curve pairing) [#5307](https://github.com/paritytech/parity/pull/5307)
-- fix panickers in tree-route [#5479](https://github.com/paritytech/parity/pull/5479)
-- Update links to etherscan.io [#5455](https://github.com/paritytech/parity/pull/5455)
-- Refresh UI on nodeKind changes, e.g. personal -> public [#5312](https://github.com/paritytech/parity/pull/5312)
-- Correct contract address for EIP-86 [#5473](https://github.com/paritytech/parity/pull/5473)
-- Force two decimals for USD conversion rate [#5471](https://github.com/paritytech/parity/pull/5471)
-- Refactoring of Tokens & Balances [#5372](https://github.com/paritytech/parity/pull/5372)
-- Background-repeat round [#5475](https://github.com/paritytech/parity/pull/5475)
-- nl i18n updated [#5461](https://github.com/paritytech/parity/pull/5461)
-- Show ETH value (even 0) if ETH transfer in transaction list [#5406](https://github.com/paritytech/parity/pull/5406)
-- Store the pending requests per network version [#5405](https://github.com/paritytech/parity/pull/5405)
-- Use in-memory database for tests [#5451](https://github.com/paritytech/parity/pull/5451)
-- WebSockets RPC server [#5425](https://github.com/paritytech/parity/pull/5425)
-- Added missing docs [#5452](https://github.com/paritytech/parity/pull/5452)
-- Tests and tweaks for public node middleware [#5417](https://github.com/paritytech/parity/pull/5417)
-- Fix removal of hash-mismatched files. [#5440](https://github.com/paritytech/parity/pull/5440)
-- parity_getBlockHeaderByNumber and LightFetch utility [#5383](https://github.com/paritytech/parity/pull/5383)
-- New state tests [#5418](https://github.com/paritytech/parity/pull/5418)
-- Fix buffer length for QR code gen. [#5447](https://github.com/paritytech/parity/pull/5447)
-- Add raw hash signing [#5423](https://github.com/paritytech/parity/pull/5423)
-- Filters and block RPCs for the light client [#5320](https://github.com/paritytech/parity/pull/5320)
-- Work around mismatch for QR checksum [#5374](https://github.com/paritytech/parity/pull/5374)
-- easy to use conversion from and to string for ethstore::Crypto [#5437](https://github.com/paritytech/parity/pull/5437)
-- Tendermint fixes [#5415](https://github.com/paritytech/parity/pull/5415)
-- Adrianbrink lightclientcache branch. [#5428](https://github.com/paritytech/parity/pull/5428)
-- Add caching to HeaderChain struct [#5403](https://github.com/paritytech/parity/pull/5403)
-- Add decryption to the UI (in the Signer) [#5422](https://github.com/paritytech/parity/pull/5422)
-- Add CIDv0 RPC [#5414](https://github.com/paritytech/parity/pull/5414)
-- Updating documentation for RPCs [#5392](https://github.com/paritytech/parity/pull/5392)
-- Fixing secretstore TODOs - part 1 [#5386](https://github.com/paritytech/parity/pull/5386)
-- Fixing disappearing content. [#5399](https://github.com/paritytech/parity/pull/5399)
-- Snapshot chunks packed by size [#5318](https://github.com/paritytech/parity/pull/5318)
-- APIs wildcards and simple arithmetic. [#5402](https://github.com/paritytech/parity/pull/5402)
-- Fixing compilation without dapps. [#5410](https://github.com/paritytech/parity/pull/5410)
-- Don't use port 8080 anymore [#5397](https://github.com/paritytech/parity/pull/5397)
-- Quick'n'dirty CLI for the light client [#5002](https://github.com/paritytech/parity/pull/5002)
-- set gas limit before proving transactions [#5401](https://github.com/paritytech/parity/pull/5401)
-- Public node: perf and fixes [#5390](https://github.com/paritytech/parity/pull/5390)
-- Straight download path in the readme [#5393](https://github.com/paritytech/parity/pull/5393)
-- On-chain ACL checker for secretstore [#5015](https://github.com/paritytech/parity/pull/5015)
-- Allow empty-encoded values from QR encoding [#5385](https://github.com/paritytech/parity/pull/5385)
-- Update npm build for new inclusions [#5381](https://github.com/paritytech/parity/pull/5381)
-- Fix for Ubuntu Dockerfile [#5356](https://github.com/paritytech/parity/pull/5356)
-- Secretstore over network [#4974](https://github.com/paritytech/parity/pull/4974)
-- Dapps and RPC server merge [#5365](https://github.com/paritytech/parity/pull/5365)
-- trigger js build release [#5379](https://github.com/paritytech/parity/pull/5379)
-- Update expanse json with fork at block 600000 [#5351](https://github.com/paritytech/parity/pull/5351)
-- Futures-based native wrappers for contract ABIs [#5341](https://github.com/paritytech/parity/pull/5341)
-- Kovan warp sync fixed [#5337](https://github.com/paritytech/parity/pull/5337)
-- Aura eip155 validation transition [#5362](https://github.com/paritytech/parity/pull/5362)
-- Shared wordlist for brain wallets [#5331](https://github.com/paritytech/parity/pull/5331)
-- Allow signing via Qr [#4881](https://github.com/paritytech/parity/pull/4881)
-- Allow entry of url or hash for DappReg meta [#5360](https://github.com/paritytech/parity/pull/5360)
-- Adjust tx overlay colours [#5353](https://github.com/paritytech/parity/pull/5353)
-- Add ability to disallow API subscriptions [#5366](https://github.com/paritytech/parity/pull/5366)
-- EIP-213 (bn128 curve operations) [#4999](https://github.com/paritytech/parity/pull/4999)
-- Fix analize output file name [#5357](https://github.com/paritytech/parity/pull/5357)
-- Add default eip155 validation [#5346](https://github.com/paritytech/parity/pull/5346)
-- Add new seed nodes for Classic chain [#5345](https://github.com/paritytech/parity/pull/5345)
-- Shared wordlist for frontend [#5336](https://github.com/paritytech/parity/pull/5336)
-- fix rpc tests [#5338](https://github.com/paritytech/parity/pull/5338)
-- Public node with accounts and signing in Frontend [#5304](https://github.com/paritytech/parity/pull/5304)
-- Rename Status/Status -> Status/NodeStatus [#5332](https://github.com/paritytech/parity/pull/5332)
-- Updating paths to repos. [#5330](https://github.com/paritytech/parity/pull/5330)
-- Separate status for canceled local transactions. [#5319](https://github.com/paritytech/parity/pull/5319)
-- Cleanup the Status View [#5317](https://github.com/paritytech/parity/pull/5317)
-- Update UI minimised requests [#5324](https://github.com/paritytech/parity/pull/5324)
-- Order signer transactions FIFO [#5321](https://github.com/paritytech/parity/pull/5321)
-- updating dependencies [#5028](https://github.com/paritytech/parity/pull/5028)
-- Minimise transactions progress [#4942](https://github.com/paritytech/parity/pull/4942)
-- Fix eth_sign showing as wallet account [#5309](https://github.com/paritytech/parity/pull/5309)
-- Ropsten revival [#5302](https://github.com/paritytech/parity/pull/5302)
-- Strict validation transitions [#4988](https://github.com/paritytech/parity/pull/4988)
-- Fix default list sorting [#5303](https://github.com/paritytech/parity/pull/5303)
-- Use unique owners for multisig wallets [#5298](https://github.com/paritytech/parity/pull/5298)
-- Copy all existing i18n strings into zh (as-is translation aid) [#5305](https://github.com/paritytech/parity/pull/5305)
-- Fix booleans in Typedinput [#5295](https://github.com/paritytech/parity/pull/5295)
-- node kind RPC [#5025](https://github.com/paritytech/parity/pull/5025)
-- Fix the use of MobX in playground [#5294](https://github.com/paritytech/parity/pull/5294)
-- Fine grained snapshot chunking [#5019](https://github.com/paritytech/parity/pull/5019)
-- Add lint:i18n to find missing & extra keys [#5290](https://github.com/paritytech/parity/pull/5290)
-- Scaffolding for zh translations, including first-round by @btceth [#5289](https://github.com/paritytech/parity/pull/5289)
-- JS package bumps [#5287](https://github.com/paritytech/parity/pull/5287)
-- Auto-extract new i18n strings (update) [#5288](https://github.com/paritytech/parity/pull/5288)
-- eip100b [#5027](https://github.com/paritytech/parity/pull/5027)
-- Set earliest era in snapshot restoration [#5021](https://github.com/paritytech/parity/pull/5021)
-- Avoid clogging up tmp when updater dir has bad permissions. [#5024](https://github.com/paritytech/parity/pull/5024)
-- Resilient warp sync [#5018](https://github.com/paritytech/parity/pull/5018)
-- Create webpack analysis files (size) [#5009](https://github.com/paritytech/parity/pull/5009)
-- Dispatch an open event on drag of Parity Bar [#4987](https://github.com/paritytech/parity/pull/4987)
-- Various installer and tray apps fixes [#4970](https://github.com/paritytech/parity/pull/4970)
-- Export account RPC [#4967](https://github.com/paritytech/parity/pull/4967)
-- Switching ValidatorSet [#4961](https://github.com/paritytech/parity/pull/4961)
-- Implement PIP messages, request builder, and handlers [#4945](https://github.com/paritytech/parity/pull/4945)
-- auto lint [#5003](https://github.com/paritytech/parity/pull/5003)
-- Fix FireFox overflows [#5000](https://github.com/paritytech/parity/pull/5000)
-- Show busy indicator, focus first field in password change [#4997](https://github.com/paritytech/parity/pull/4997)
-- Consistent store naming in the Signer components [#4996](https://github.com/paritytech/parity/pull/4996)
-- second (and last) part of rlp refactor [#4901](https://github.com/paritytech/parity/pull/4901)
-- Double click to select account creation type [#4986](https://github.com/paritytech/parity/pull/4986)
-- Fixes to the Registry dapp [#4984](https://github.com/paritytech/parity/pull/4984)
-- Extend api.util [#4979](https://github.com/paritytech/parity/pull/4979)
-- Updating JSON-RPC crates [#4934](https://github.com/paritytech/parity/pull/4934)
-- splitting part of util into smaller crates [#4956](https://github.com/paritytech/parity/pull/4956)
-- Updating syntex et al [#4983](https://github.com/paritytech/parity/pull/4983)
-- EIP198 and built-in activation [#4926](https://github.com/paritytech/parity/pull/4926)
-- Fix MethodDecoding for Arrays [#4977](https://github.com/paritytech/parity/pull/4977)
-- Try to fix WS race condition connection [#4976](https://github.com/paritytech/parity/pull/4976)
-- eth_sign where account === undefined [#4964](https://github.com/paritytech/parity/pull/4964)
-- Fix references to api outside of `parity.js` [#4981](https://github.com/paritytech/parity/pull/4981)
-- Fix Password Dialog form overflow [#4968](https://github.com/paritytech/parity/pull/4968)
-- Changing Mutex into RwLock for transaction queue [#4951](https://github.com/paritytech/parity/pull/4951)
-- Disable max seal period for external sealing [#4927](https://github.com/paritytech/parity/pull/4927)
-- Attach hardware wallets already in addressbook [#4912](https://github.com/paritytech/parity/pull/4912)
-- rlp serialization refactor [#4873](https://github.com/paritytech/parity/pull/4873)
-- Bump nanomsg [#4965](https://github.com/paritytech/parity/pull/4965)
-- Fixed multi-chunk ledger transactions on windows [#4960](https://github.com/paritytech/parity/pull/4960)
-- Fix outputs in Contract Constant Queries [#4953](https://github.com/paritytech/parity/pull/4953)
-- systemd: Start parity after network.target [#4952](https://github.com/paritytech/parity/pull/4952)
-- Remove transaction RPC [#4949](https://github.com/paritytech/parity/pull/4949)
-- Swap out ethcore.io url for parity.io [#4947](https://github.com/paritytech/parity/pull/4947)
-- Don't remove confirmed requests to early. [#4933](https://github.com/paritytech/parity/pull/4933)
-- Ensure sealing work enabled in miner once subscribers added [#4930](https://github.com/paritytech/parity/pull/4930)
-- Add z-index to small modals as well [#4923](https://github.com/paritytech/parity/pull/4923)
-- Bump nanomsg [#4946](https://github.com/paritytech/parity/pull/4946)
-- Bumping multihash and libc [#4943](https://github.com/paritytech/parity/pull/4943)
-- Edit ETH value, gas and gas price in Contract Deployment [#4919](https://github.com/paritytech/parity/pull/4919)
-- Add ability to configure Secure API [#4922](https://github.com/paritytech/parity/pull/4922)
-- Add Token image from URL [#4916](https://github.com/paritytech/parity/pull/4916)
-- Use the registry fee in Token Deployment dapp [#4915](https://github.com/paritytech/parity/pull/4915)
-- Add reseal max period [#4903](https://github.com/paritytech/parity/pull/4903)
-- Detect rust compiler version in Parity build script, closes 4742 [#4907](https://github.com/paritytech/parity/pull/4907)
-- Add Vaults logic to First Run [#4914](https://github.com/paritytech/parity/pull/4914)
-- Updated gcc and rayon crates to remove outdated num_cpus dependency [#4909](https://github.com/paritytech/parity/pull/4909)
-- Renaming evm binary to avoid conflicts. [#4899](https://github.com/paritytech/parity/pull/4899)
-- Better error handling for traces RPC [#4849](https://github.com/paritytech/parity/pull/4849)
-- Safari SectionList fix [#4895](https://github.com/paritytech/parity/pull/4895)
-- Safari Dialog scrolling fix [#4893](https://github.com/paritytech/parity/pull/4893)
-- Spelling :) [#4900](https://github.com/paritytech/parity/pull/4900)
-- Additional kovan params [#4892](https://github.com/paritytech/parity/pull/4892)
-- trigger js-precompiled build [#4898](https://github.com/paritytech/parity/pull/4898)
-- Recalculate receipt roots in close_and_lock [#4884](https://github.com/paritytech/parity/pull/4884)
-- Reload UI on network switch [#4864](https://github.com/paritytech/parity/pull/4864)
-- Update parity-ui-precompiled with branch [#4850](https://github.com/paritytech/parity/pull/4850)
-- OSX Installer is no longer experimental [#4882](https://github.com/paritytech/parity/pull/4882)
-- Chain-selection from UI [#4859](https://github.com/paritytech/parity/pull/4859)
-- removed redundant (and unused) FromJson trait [#4871](https://github.com/paritytech/parity/pull/4871)
-- fix typos and grammar [#4880](https://github.com/paritytech/parity/pull/4880)
-- Remove old experimental remote-db code [#4872](https://github.com/paritytech/parity/pull/4872)
-- removed redundant FixedHash trait, fixes [#4029](https://github.com/paritytech/parity/issues/4029) [#4866](https://github.com/paritytech/parity/pull/4866)
-- Reference JSON-RPC more changes-friendly [#4870](https://github.com/paritytech/parity/pull/4870)
-- Better handling of Solidity compliation [#4860](https://github.com/paritytech/parity/pull/4860)
-- Go through contract links in Transaction List display [#4863](https://github.com/paritytech/parity/pull/4863)
-- Fix Gas Price Selector Tooltips [#4865](https://github.com/paritytech/parity/pull/4865)
-- Fix auto-updater [#4867](https://github.com/paritytech/parity/pull/4867)
-- Make the UI work offline [#4861](https://github.com/paritytech/parity/pull/4861)
-- Subscribe to accounts info in Signer / ParityBar [#4856](https://github.com/paritytech/parity/pull/4856)
-- Don't link libsnappy explicitly [#4841](https://github.com/paritytech/parity/pull/4841)
-- Fix paste in Inputs [#4854](https://github.com/paritytech/parity/pull/4854)
-- Extract i18n from shared UI components [#4834](https://github.com/paritytech/parity/pull/4834)
-- Fix paste in Inputs [#4844](https://github.com/paritytech/parity/pull/4844)
-- Pull contract deployment title from available steps [#4848](https://github.com/paritytech/parity/pull/4848)
-- Supress USB error message [#4839](https://github.com/paritytech/parity/pull/4839)
-- Fix getTransactionCount in --geth mode [#4837](https://github.com/paritytech/parity/pull/4837)
-- CI: test coverage (for core and js) [#4832](https://github.com/paritytech/parity/pull/4832)
-- Lowering threshold for transactions above gas limit [#4831](https://github.com/paritytech/parity/pull/4831)
-- Fix TxViewer when no `to` (contract deployment) [#4847](https://github.com/paritytech/parity/pull/4847)
-- Fix method decoding [#4845](https://github.com/paritytech/parity/pull/4845)
-- Add React Hot Reload to dapps + TokenDeploy fix [#4846](https://github.com/paritytech/parity/pull/4846)
-- Dapps show multiple times in some cases [#4843](https://github.com/paritytech/parity/pull/4843)
-- Fixes to the Registry dapp [#4838](https://github.com/paritytech/parity/pull/4838)
-- Show token icons on list summary pages [#4826](https://github.com/paritytech/parity/pull/4826)
-- Calibrate step before rejection [#4800](https://github.com/paritytech/parity/pull/4800)
-- Add replay protection [#4808](https://github.com/paritytech/parity/pull/4808)
-- Better icon on windows [#4804](https://github.com/paritytech/parity/pull/4804)
-- Better logic for contract deployments detection [#4821](https://github.com/paritytech/parity/pull/4821)
-- Fix wrong default values for contract queries inputs [#4819](https://github.com/paritytech/parity/pull/4819)
-- Adjust selection colours/display [#4811](https://github.com/paritytech/parity/pull/4811)
-- Update the Wallet Library Registry key [#4817](https://github.com/paritytech/parity/pull/4817)
-- Update Wallet to new Wallet Code [#4805](https://github.com/paritytech/parity/pull/4805)
+To reactivate the parity wallet, you have to run Parity either with `parity --force-ui` (not recommended) or `parity ui` (deprecated) from the command line. Or, if you feel super fancy and want to test our pre-releases of the stand-alone electron wallet, head over to the [Parity-JS repositories and check the releases](https://github.com/Parity-JS/shell/releases).
 
-## Parity [v1.6.10](https://github.com/paritytech/parity/releases/tag/v1.6.10) (2017-07-25)
+Further reading:
 
-This is a hotfix release for the stable channel addressing the recent [multi-signature wallet vulnerability](https://blog.parity.io/security-alert-high-2/). Note, upgrading is not mandatory, and all future multi-sig wallets created by any version of Parity are secure.
+- [Docs: Parity Wallet](https://wiki.parity.io/Parity-Wallet)
+- [Docs: How to customize Parity UI?](https://wiki.parity.io/FAQ-Customize-Parity-UI.html)
+- [Github: Parity-JS](https://github.com/parity-js)
 
-All Changes:
+### Introducing the Wasm VM
 
-- Backports for stable [#6116](https://github.com/paritytech/parity/pull/6116)
-  - Remove chunk to restore from pending set only upon successful import [#6112](https://github.com/paritytech/parity/pull/6112)
-  - Blacklist bad snapshot manifest hashes upon failure [#5874](https://github.com/paritytech/parity/pull/5874)
-  - Bump snap version and tweak importing detection logic [#6079](https://github.com/paritytech/parity/pull/6079) (modified to work)
-- Fix docker build for stable [#6118](https://github.com/paritytech/parity/pull/6118)
-- Update wallet library binaries [#6108](https://github.com/paritytech/parity/pull/6108)
-- Backported wallet fix [#6104](https://github.com/paritytech/parity/pull/6104)
-  - Fix initialisation bug. ([#6102](https://github.com/paritytech/parity/pull/6102))
-  - Update wallet library modifiers ([#6103](https://github.com/paritytech/parity/pull/6103))
-- Bump to v1.6.10
+We are excited to announce support for **Wasm Smart Contracts on Kovan network**. The hard-fork to activate the Wasm-VM will take place on block `6_600_000`.
 
-## Parity [v1.6.9](https://github.com/paritytech/parity/releases/tag/v1.6.9) (2017-07-16)
+To enable Wasm contracts on your custom network, just schedule a `wasmActivationTransition` at your favorite block number (e.g., `42`, `666`, or `0xbada55`). To hack your first Wasm smart contracts in Rust, have a look at the [Parity Wasm Tutorials](https://github.com/paritytech/pwasm-tutorial).
 
-This is a first stable release of 1.6 series. It contains a number of minor fixes and introduces the `--reseal-on-uncles` option for miners.
+Further reading:
 
-Full list of changes:
+- [Docs: WebAssembly (wasm)](https://wiki.parity.io/WebAssembly-Home)
+- [Docs: Wasm VM Design](https://wiki.parity.io/WebAssembly-Design)
+- [Docs: Wasm tutorials and examples](https://wiki.parity.io/WebAssembly-Links)
 
-- Backports [#6061](https://github.com/paritytech/parity/pull/6061)
-  - Ethereum Classic Monetary Policy [#5741](https://github.com/paritytech/parity/pull/5741)
-    - Update rewards for uncle miners for ECIP1017
-    - Fix an off-by-one error in ECIP1017 era calculation
-    - `ecip1017_era_rounds` missing from EthashParams when run in build bot
-    - strip out ecip1017_eras_block_reward function and add unit test
-  - JS precompiled set to stable
-- Backports [#6060](https://github.com/paritytech/parity/pull/6060)
-  - --reseal-on-uncle [#5940](https://github.com/paritytech/parity/pull/5940)
-    - Optimized uncle check
-    - Additional uncle check
-    - Updated comment
-  - Bump to v1.6.9
-  - CLI: Export error message and less verbose peer counter. [#5870](https://github.com/paritytech/parity/pull/5870)
-    - Removed numbed of active connections from informant
-    - Print error message when fatdb is required
-    - Remove peers from UI
+### Empty step messages in PoA
 
-## Parity [v1.6.8](https://github.com/paritytech/parity/releases/tag/v1.6.8) (2017-06-08)
+To **reduce blockchain bloat, proof-of-authority networks can now enable _empty step messages_ which replace empty blocks**. Each step message will be signed and broadcasted by the issuing authorities, and included and rewarded in the next non-empty block.
 
-This release addresses:
+To enable empty step messages, set the `emptyStepsTransition` to your favorite block number. You can also specify a maximum number of empty steps with `maximumEmptySteps` in your chain spec.
 
-- a rare condition where quickly creating a new account was generating an account not matching the recovery phrase.
-- compressed RLP strings caused wrong/empty transaction receipts on Classic network.
-- blacklisting the _empty phrase_ account from UI and RPC on non-development chains. See also [this blog post](https://blog.parity.io/restoring-blank-seed-phrase/).
-- canceling transactions that didn't have a condition.
-- the updated Expanse fork block and chain ID.
+### Other noteworthy changes
 
-Full changelog:
+We removed the old database migrations from 2016. In case you upgrade Parity from a really, really old version, you will have to reset your database manually first with `parity <options> db kill`.
 
-- Backporting to beta [#5791](https://github.com/paritytech/parity/pull/5791)
-  - Bump to v1.6.8
-  - Update expanse json with fork at block 600000 [#5351](https://github.com/paritytech/parity/pull/5351)
-    - Update expanse json with fork at block 600000
-    - Update exp chainID to 2
-  - Bumped mio [#5763](https://github.com/paritytech/parity/pull/5763)
-  - Fixed default UI port for mac installer [#5782](https://github.com/paritytech/parity/pull/5782)
-  - Blacklist empty phrase account. [#5730](https://github.com/paritytech/parity/pull/5730)
-  - Update Cid/multihash/ring/tinykeccak [#5785](https://github.com/paritytech/parity/pull/5785)
-    - Updating ring,multihash,tiny-keccak
-    - Updating CID in ipfs.
-  - Disable compression for RLP strings [#5786](https://github.com/paritytech/parity/pull/5786)
-- Beta Backports [#5789](https://github.com/paritytech/parity/pull/5789)
-  - Fix local transactions without condition. [#5716](https://github.com/paritytech/parity/pull/5716)
-  - Block invalid account name creation [#5784](https://github.com/paritytech/parity/pull/5784)
-    - Additional non-empty phrase check (fromNew)
-    - Explicit canCreate check in create (not only on UI)
-    - BN instance check (fixes Geth imports)
-    - Fixup tests after better checks
-  - Recover from empty phrase in dev mode [#5698](https://github.com/paritytech/parity/pull/5698)
-    - Add dev chain to isTest
-    - Fix signer
-    - Fix no condition transactions
-    - Fix case: old parity
-    - Fix propTypes.
+We fixed  DELEGATECALL `from` and `to` fields, see [#7166](https://github.com/paritytech/parity/issues/7166).
 
-## Parity [v1.6.7](https://github.com/paritytech/parity/releases/tag/v1.6.7) (2017-05-18)
+We reduced the default USD per transaction value to 0.0001. Thanks, @MysticRyuujin!
 
-This release addresses:
+The Musicoin chain is now enabled with Byzantium features starting at block `2_222_222`.
 
-- potential usability issues with [import and recovery of existing accounts](https://blog.parity.io/restoring-blank-seed-phrase/).
-- canceling scheduled transactions via RPC or UI.
-- warp sync issues with the Kovan network.
+### Overview of all changes included
 
-Full changelog:
+The full list of included changes:
 
-- Backporting to beta [#5657](https://github.com/paritytech/parity/pull/5657)
-  - Add CHANGELOG.md [#5513](https://github.com/paritytech/parity/pull/5513)
-  - Reorg into blocks before minimum history [#5558](https://github.com/paritytech/parity/pull/5558)
-  - Bump to v1.6.7
-- Cancel Transaction [#5656](https://github.com/paritytech/parity/pull/5656)
-  - option to disable persistent txqueue [#5544](https://github.com/paritytech/parity/pull/5544)
-  - Remove transaction RPC [#4949](https://github.com/paritytech/parity/pull/4949)
-  - Cancel tx JS [#4958](https://github.com/paritytech/parity/pull/4958)
-  - Updating documentation for RPCs [#5392](https://github.com/paritytech/parity/pull/5392)
-- Backport Recover button [#5654](https://github.com/paritytech/parity/pull/5654)
-  - Backport [#5645](https://github.com/paritytech/parity/pull/5645)
-- Add monotonic step to Kovan [#5630](https://github.com/paritytech/parity/pull/5630)
-  - Add monotonic transition to kovan [#5587](https://github.com/paritytech/parity/pull/5587)
-- Fix ethsign [#5600](https://github.com/paritytech/parity/pull/5600)
-- Registry backports [#5445](https://github.com/paritytech/parity/pull/5445)
-  - Fixes to the Registry dapp [#4984](https://github.com/paritytech/parity/pull/4984)
-  - Fix references to api outside of `parity.js` [#4981](https://github.com/paritytech/parity/pull/4981)
-
-## Parity [v1.6.6](https://github.com/paritytech/parity/releases/tag/v1.6.6) (2017-04-11)
-
-This release brings warp sync support for kovan network.
-
-- Beta Backports [#5434](https://github.com/paritytech/parity/pull/5434)
-  - Bump to v1.6.6
-  - Strict validation transitions [#4988](https://github.com/paritytech/parity/pull/4988)
-    - Ability to make validation stricter
-    - Fix consensus
-    - Remove logger
-  - Fix eth_sign showing as wallet account [#5309](https://github.com/paritytech/parity/pull/5309)
-    - DefaultProps for account
-    - Pass signing account
-    - Update tests for Connect(...)
-  - Add new seed nodes [#5345](https://github.com/paritytech/parity/pull/5345)
-  - Kovan warp sync fixed
-- Aura eip155 validation transition [#5363](https://github.com/paritytech/parity/pull/5363)
-  - Add eip155 validation
-  - Add transition block
-- Default eip155 validation [#5350](https://github.com/paritytech/parity/pull/5350)
-- Backport syntax libs update [#5316](https://github.com/paritytech/parity/pull/5316)
-
-## Parity [v1.6.5](https://github.com/paritytech/parity/releases/tag/v1.6.5) (2017-03-28)
-
-This release contains the following changes:
-
-- Warp sync snapshot format improvements.
-- Fix for Firefox UI issues.
-- Fix for restoring from a file snapshot.
-- Fix for auto-updater error handling.
-- Updated configuration for [Ropsten revival](https://github.com/ethereum/ropsten/blob/master/revival.md). Make sure to delete old Ropsten blockchain first with `parity db kill --chain ropsten`. After that you can sync normally with `parity --chain ropsten`.
-
-Full changes:
-
-- Beta Backports [#5299](https://github.com/paritytech/parity/pull/5299)
-  - Fix FireFox overflows [#5000](https://github.com/paritytech/parity/pull/5000)
-    - Max width for container
-    - Set min-width
-  - Switching ValidatorSet [#4961](https://github.com/paritytech/parity/pull/4961)
-    - Add multi validator set
-    - Nicer comment
-    - Validate in constructor
-    - Reporting
-  - Avoid clogging up tmp when updater dir has bad permissions. [#5024](https://github.com/paritytech/parity/pull/5024)
-  - Force earliest era set in snapshot restore [#5021](https://github.com/paritytech/parity/pull/5021)
-  - Bumb to v1.6.5
-  - Fine grained snapshot chunking
-  - Ropsten revival
-- Fix validator contract syncing [#4789](https://github.com/paritytech/parity/pull/4789) [#5011](https://github.com/paritytech/parity/pull/5011)
-  - Make validator set aware of various states
-  - Fix updater build
-  - Clean up contract call
-  - Failing sync test
-  - Adjust tests
-  - Nicer indent
-  - Revert bound divisor
-
-## Parity [v1.5.12](https://github.com/paritytech/parity/releases/tag/v1.5.12) (2017-03-27)
-
-Stable release that adds support for a new warp sync snapshot format.
-
-- Stable Backports [#5297](https://github.com/paritytech/parity/pull/5297)
-  - Bump to v1.5.12
-  - Fine grained snapshot chunking
-
-## Parity [v1.6.4](https://github.com/paritytech/parity/releases/tag/v1.6.4) (2017-03-22)
-
-A number of issues fixed in this release:
-
-- Ledger device connectivity issues for some users on Windows.
-- Improved vault usability.
-- Stratum mining no longer requires `--force-sealing`.
-- `evm` binary has been renamed to `parity-evm` to avoid conflict with cpp-ethereum package.
-
-Full Changes:
-
-- Backporting to beta [#4995](https://github.com/paritytech/parity/pull/4995)
-  - Bump to v1.6.4
-  - Ensure sealing work enabled if notifier registed
-  - Fix condition check
-  - Always send full chunks [#4960](https://github.com/paritytech/parity/pull/4960)
-  - Bump nanomsg [#4965](https://github.com/paritytech/parity/pull/4965)
-  - Renaming evm binary to avoid conflicts. [#4899](https://github.com/paritytech/parity/pull/4899)
-- Beta UI backports [#4993](https://github.com/paritytech/parity/pull/4993)
-  - Update js-precompiled 20170314-121823
-  - Attach hardware wallets already in addressbook [#4912](https://github.com/paritytech/parity/pull/4912)
-    - Attach hardware wallets already in addressbook
-    - Only set values changed
-  - Add Vaults logic to First Run [#4894](https://github.com/paritytech/parity/issues/4894) [#4914](https://github.com/paritytech/parity/pull/4914)
-  - Add ability to configure Secure API (for [#4885](https://github.com/paritytech/parity/issues/4885)) [#4922](https://github.com/paritytech/parity/pull/4922)
-  - Add z-index to small modals as well [#4923](https://github.com/paritytech/parity/pull/4923)
-  - Eth_sign where account === undefined [#4964](https://github.com/paritytech/parity/pull/4964)
-    - Update for case where account === undefined
-    - Update tests to not mask account === undefined
-    - Default account = {} where undefined (thanks [@tomusdrw](https://github.com/tomusdrw))
-  - Fix Password Dialog forms style issue [#4968](https://github.com/paritytech/parity/pull/4968)
-
-
-## Parity [v1.6.3](https://github.com/paritytech/parity/releases/tag/v1.6.3) (2017-03-14)
-
-This release fixes issue compatibility with Safari on MacOS.
-
-- Safari fixes [#4902](https://github.com/paritytech/parity/pull/4902)
-  - Add intitial max-width to sections
-  - Move background z-index to -1
-
-## Parity [v1.5.11](https://github.com/paritytech/parity/releases/tag/v1.5.11) (2017-03-14)
-
-Parity 1.5.11 Includes a patch for a more comprehensive block verification.
-
-- Bump to v1.5.11
-- Additional kovan params
-- Recalculate receipt roots in close_and_lock
-- Bump to v1.5.10
-
-## Parity [v1.6.2](https://github.com/paritytech/parity/releases/tag/v1.6.2) (2017-03-13)
-
-A major release introducing a few new features:
-
-- Revamped UI.
-- Account Vaults.
-- Support for Ledger hardware wallet devices.
-- Stratum protocol for PoW mining.
-- A new MacOS installer. Parity for MacOS now includes a Menu Bar icon that allows controlling Parity service.
-- Disk backed transaction store. Pending transactions are now saved to disk and won't get lost when Parity is restarted.
-- Improved memory management.
-
-See the [blog post](https://blog.parity.io/announcing-parity-1-6/) for more details.
-
-Full Changes:
-
-- Fix auto-updater beta [#4868](https://github.com/paritytech/parity/pull/4868)
-- Beta UI backports [#4855](https://github.com/paritytech/parity/pull/4855)
-  - Added React Hot Reload to dapps + TokenDeplpoy fix ([#4846](https://github.com/paritytech/parity/pull/4846))
-  - Fix method decoding ([#4845](https://github.com/paritytech/parity/pull/4845))
-    - Fix contract deployment method decoding in Signer
-    - Linting
-  - Fix TxViewer when no `to` (contract deployment) ([#4847](https://github.com/paritytech/parity/pull/4847))
-    - Added React Hot Reload to dapps + TokenDeplpoy fix
-    - Fixes to the LocalTx dapp
-    - Don't send the nonce for mined transactions
-    - Don't encode empty to values for options
-  - Pull steps from actual available steps ([#4848](https://github.com/paritytech/parity/pull/4848))
-  - Wait for the value to have changed in the input ([#4844](https://github.com/paritytech/parity/pull/4844))
-  - Backport Regsirty changes from [#4589](https://github.com/paritytech/parity/pull/4589)
-  - Test fixes for [#4589](https://github.com/paritytech/parity/pull/4589)
-- Beta Simple score [#4852](https://github.com/paritytech/parity/pull/4852)
-  - Simple score
-  - Ignore part of a test
-- Backporting to beta [#4840](https://github.com/paritytech/parity/pull/4840)
-  - Fixes to the Registry dapp ([#4838](https://github.com/paritytech/parity/pull/4838))
-    - Fix wrong ABI methods
-    - Fix comparison
-  - Bump to v1.6.1
-- Show token icons on list summary pages ([#4826](https://github.com/paritytech/parity/pull/4826)) [#4827](https://github.com/paritytech/parity/pull/4827)
-  - Adjust balance overlay margins (no jumps)
-  - Img only balances, small verifications
-  - Invalid tests removed
-  - Always wrap display (Thanks [@ngotchac](https://github.com/ngotchac))
-  - Update tests to reflect reality
-- Beta Engine backports [#4806](https://github.com/paritytech/parity/pull/4806)
-  - Calibrate before rejection
-  - Change flag name
-  - Add eip155
-  - Make network_id default
-- Beta UI backports [#4823](https://github.com/paritytech/parity/pull/4823)
-  - Better logic for contract deployments ([#4821](https://github.com/paritytech/parity/pull/4821))
-- Beta UI backports [#4818](https://github.com/paritytech/parity/pull/4818)
-  - Update the key ([#4817](https://github.com/paritytech/parity/pull/4817))
-  - Adjust selection colours/display ([#4811](https://github.com/paritytech/parity/pull/4811))
-    - Adjust selection colours to match with mui
-    - allow -> disable (simplify selections)
-    - Only use top-border
-    - Overlay selection line
-    - Slightly more muted unselected
-    - Restore address icon
-  - Fix default values for contract queries
-- Beta UI backports [#4809](https://github.com/paritytech/parity/pull/4809)
-  - Update Wallet to new Wallet Code ([#4805](https://github.com/paritytech/parity/pull/4805))
-    - Update Wallet Version
-    - Update Wallet Library
-    - Update Wallets Bytecodes
-    - Typo
-    - Separate Deploy in Contract API
-    - Use the new Wallet ABI // Update wallet code
-    - WIP .// Deploy from Wallet
-    - Update Wallet contract
-    - Contract Deployment for Wallet
-    - Working deployments for Single Owned Wallet contracts
-    - Linting
-    - Create a Wallet from a Wallet
-    - Linting
-    - Fix Signer transactions // Add Gas Used for transactions
-    - Deploy wallet contract fix
-    - Fix too high gas estimate for Wallet Contract Deploys
-    - Final piece ; deploying from Wallet owned by wallet
-    - Update Wallet Code
-    - Updated the Wallet Codes
-    - Fixing Wallet Deployments
-    - Add Support for older wallets
-    - Linting
-  - SMS Faucet ([#4774](https://github.com/paritytech/parity/pull/4774))
-    - Faucet
-    - Remove flakey button-index testing
-    - Only display faucet when sms verified (mainnet)
-    - Simplify availability checks
-    - WIP
-    - Resuest from verified -> verified
-    - Update endpoint, display response text
-    - Error icon on errors
-    - Parse hash text response
-    - Use /api/:address endpoint
-    - Hash -> data
-    - Adjust sms-certified message
-  - Fix SectionList hovering issue ([#4749](https://github.com/paritytech/parity/pull/4749))
-    - Fix SectionList Items hover when <3 items
-    - Even easier...
-  - Lint (new)
-- Update ETC bootnodes [#4794](https://github.com/paritytech/parity/pull/4794)
-- Update comments and reg ABI [#4787](https://github.com/paritytech/parity/pull/4787)
-- Optimize signature for fallback function. [#4780](https://github.com/paritytech/parity/pull/4780)
-- Rephrasing token generation screen. [#4777](https://github.com/paritytech/parity/pull/4777)
-- Etherscan links based on netVersion identifier [#4772](https://github.com/paritytech/parity/pull/4772)
-- Update README.md  [#4762](https://github.com/paritytech/parity/pull/4762)
-- Fix invalid props to verification code [#4766](https://github.com/paritytech/parity/pull/4766)
-- Extend authority round consensus test [#4756](https://github.com/paritytech/parity/pull/4756)
-- Revert last hyper "fix" [#4752](https://github.com/paritytech/parity/pull/4752)
-- Vault Management UI (round 3) [#4652](https://github.com/paritytech/parity/pull/4652)
-- Update SelectionList indicators [#4736](https://github.com/paritytech/parity/pull/4736)
-- Update testnet detection [#4746](https://github.com/paritytech/parity/pull/4746)
-- Fix Portal in Portal ESC issue [#4745](https://github.com/paritytech/parity/pull/4745)
-- Update wiki [#4743](https://github.com/paritytech/parity/pull/4743)
-- Account selector close operations [#4728](https://github.com/paritytech/parity/pull/4728)
-- Fix Account Selection in Signer [#4744](https://github.com/paritytech/parity/pull/4744)
-- Support both V1 & V2 DataChanged events in registry [#4734](https://github.com/paritytech/parity/pull/4734)
-- Add info on forks. [#4733](https://github.com/paritytech/parity/pull/4733)
-- Add registry addr [#4732](https://github.com/paritytech/parity/pull/4732)
-- UI support for hardware wallets [#4539](https://github.com/paritytech/parity/pull/4539)
-- S/delete/forget/ for wallets [#4729](https://github.com/paritytech/parity/pull/4729)
-- New chains [#4720](https://github.com/paritytech/parity/pull/4720)
-- Enable --warp by default [#4719](https://github.com/paritytech/parity/pull/4719)
-- Update Uglify (fix to 2.8.2) to fix binary builds [#4723](https://github.com/paritytech/parity/pull/4723)
-- Extract i18n strings in modals/* [#4706](https://github.com/paritytech/parity/pull/4706)
-- Provide uncle size where available in RPC [#4713](https://github.com/paritytech/parity/pull/4713)
-- EC math functions [#4696](https://github.com/paritytech/parity/pull/4696)
-- Add registrar fields [#4716](https://github.com/paritytech/parity/pull/4716)
-- Extract i18n strings in views/* [#4695](https://github.com/paritytech/parity/pull/4695)
-- Removing network=disable from config files [#4715](https://github.com/paritytech/parity/pull/4715)
-- Fast in-place migration for adding and removing column families [#4687](https://github.com/paritytech/parity/pull/4687)
-- Display badges on summary view [#4689](https://github.com/paritytech/parity/pull/4689)
-- Consistent file uploads [#4699](https://github.com/paritytech/parity/pull/4699)
-- Rename https://mkr.market -> https://oasisdex.com [#4701](https://github.com/paritytech/parity/pull/4701)
-- Stop copy & clickthrough from list summaries [#4700](https://github.com/paritytech/parity/pull/4700)
-- Display ... for address summary overflows [#4691](https://github.com/paritytech/parity/pull/4691)
-- Less agressive grayscale/opacity in SelectionList [#4688](https://github.com/paritytech/parity/pull/4688)
-- Propagate trie errors upwards from State [#4655](https://github.com/paritytech/parity/pull/4655)
-- Generic state backend [#4632](https://github.com/paritytech/parity/pull/4632)
-- Enhance dialog layouts (round 1) [#4637](https://github.com/paritytech/parity/pull/4637)
-- Vault Management UI (round 2) [#4631](https://github.com/paritytech/parity/pull/4631)
-- Fix Portal broad event stopper [#4674](https://github.com/paritytech/parity/pull/4674)
-- Custom dev chain presets [#4671](https://github.com/paritytech/parity/pull/4671)
-- Max gas limit and min gas price [#4661](https://github.com/paritytech/parity/pull/4661)
-- Align list displays with SectionList (UI consistency) [#4621](https://github.com/paritytech/parity/pull/4621)
-- Add SelectionList component to DRY up [#4639](https://github.com/paritytech/parity/pull/4639)
-- I18n NL linting updates [#4662](https://github.com/paritytech/parity/pull/4662)
-- Misc. small UI fixes [#4657](https://github.com/paritytech/parity/pull/4657)
-- More CLI settings for IPFS API [#4608](https://github.com/paritytech/parity/pull/4608)
-- Fix Tendermint deadlock [#4654](https://github.com/paritytech/parity/pull/4654)
-- Nl translations [#4649](https://github.com/paritytech/parity/pull/4649)
-- Update transaction condition documentation [#4659](https://github.com/paritytech/parity/pull/4659)
-- Bump hyper versions [#4645](https://github.com/paritytech/parity/pull/4645)
-- Sane updater [#4658](https://github.com/paritytech/parity/pull/4658)
-- Remainder of RPC APIs implemented for the light client [#4594](https://github.com/paritytech/parity/pull/4594)
-- Preserve vault meta when changing pwd [#4650](https://github.com/paritytech/parity/pull/4650)
-- Fix Geth account import [#4641](https://github.com/paritytech/parity/pull/4641)
-- Tweak some checks. [#4633](https://github.com/paritytech/parity/pull/4633)
-- Attempt to fix subscribeToEvents test [#4638](https://github.com/paritytech/parity/pull/4638)
-- Fix selection value from RadioButtons [#4636](https://github.com/paritytech/parity/pull/4636)
-- Convert all remaining Modals to use Portal (UI consistency) [#4625](https://github.com/paritytech/parity/pull/4625)
-- Default account selection update [#4609](https://github.com/paritytech/parity/pull/4609)
-- Display ETH balance in overlay account selector [#4588](https://github.com/paritytech/parity/pull/4588)
-- Fixed minor grammar mistake in readme [#4627](https://github.com/paritytech/parity/pull/4627)
-- Extract newly available i18n strings [#4623](https://github.com/paritytech/parity/pull/4623)
-- Save pending local transactions in the database [#4566](https://github.com/paritytech/parity/pull/4566)
-- Bump CID version to allow compilation on all platforms [#4614](https://github.com/paritytech/parity/pull/4614)
-- Vault Management UI (first round) [#4446](https://github.com/paritytech/parity/pull/4446)
-- Let Engine decide if it seals internally [#4613](https://github.com/paritytech/parity/pull/4613)
-- Show only known accounts/wallets/addresses on Home [#4612](https://github.com/paritytech/parity/pull/4612)
-- Proper default accounts RPCs [#4580](https://github.com/paritytech/parity/pull/4580)
-- Hash-fetch errors in case upstream returns non-200 [#4599](https://github.com/paritytech/parity/pull/4599)
-- Added pending transaction info to eth_getTransactionByHash [#4570](https://github.com/paritytech/parity/pull/4570)
-- Secret store - initial version [#4567](https://github.com/paritytech/parity/pull/4567)
-- Handle invalid ABI retrieved from address_book gracefully [#4606](https://github.com/paritytech/parity/pull/4606)
-- Optimize key directory reloads [#4583](https://github.com/paritytech/parity/pull/4583)
-- Revert Double Click on Accounts to close in Signer Bar [#4590](https://github.com/paritytech/parity/pull/4590)
-- IPFS MVP [#4545](https://github.com/paritytech/parity/pull/4545)
-- Networking fixes [#4563](https://github.com/paritytech/parity/pull/4563)
-- Remove eth_compile* RPCs [#4577](https://github.com/paritytech/parity/pull/4577)
-- Ledger wallet signing fixed [#4578](https://github.com/paritytech/parity/pull/4578)
-- Remove vertx from Webpack config [#4576](https://github.com/paritytech/parity/pull/4576)
-- Better display of tags [#4564](https://github.com/paritytech/parity/pull/4564)
-- Added vaults support to `ethstore-cli` [#4532](https://github.com/paritytech/parity/pull/4532)
-- Fixed font URLs [#4579](https://github.com/paritytech/parity/pull/4579)
-- Explicitly set seconds to 0 from selector [#4559](https://github.com/paritytech/parity/pull/4559)
-- Fixes evmbin compilation and adding to standard build. [#4561](https://github.com/paritytech/parity/pull/4561)
-- Alias for personal_sendTransaction [#4554](https://github.com/paritytech/parity/pull/4554)
-- Key derivation in ethstore & rpc [#4515](https://github.com/paritytech/parity/pull/4515)
-- Skip OOG check for simple transfers [#4558](https://github.com/paritytech/parity/pull/4558)
-- Light Client transaction queue, initial LightDispatcher [#4501](https://github.com/paritytech/parity/pull/4501)
-- Fixes BadgeReg Middleware [#4556](https://github.com/paritytech/parity/pull/4556)
-- Fix pasting of value in Input fields [#4555](https://github.com/paritytech/parity/pull/4555)
-- Tooltips with react-intl [#4549](https://github.com/paritytech/parity/pull/4549)
-- Close on double-click for Signer Account selection [#4540](https://github.com/paritytech/parity/pull/4540)
-- Signer provenance [#4477](https://github.com/paritytech/parity/pull/4477)
-- Fix console dapp [#4544](https://github.com/paritytech/parity/pull/4544)
-- Extract i18n string into i18n/_defaults (base of translations) [#4514](https://github.com/paritytech/parity/pull/4514)
-- Fix contract queries bug [#4534](https://github.com/paritytech/parity/pull/4534)
-- Fixing namespace of couple methods in console. [#4538](https://github.com/paritytech/parity/pull/4538)
-- Home landing page [#4178](https://github.com/paritytech/parity/pull/4178)
-- Bump JSON RPC crates versions [#4530](https://github.com/paritytech/parity/pull/4530)
-- Update rust version in README [#4531](https://github.com/paritytech/parity/pull/4531)
-- Lower default pruning history and memory [#4528](https://github.com/paritytech/parity/pull/4528)
-- Serde 0.9 [#4508](https://github.com/paritytech/parity/pull/4508)
-- Fixes to Token Deploy dapp [#4513](https://github.com/paritytech/parity/pull/4513)
-- Fixed receipt decoding [#4521](https://github.com/paritytech/parity/pull/4521)
-- Several fixes to the Wallet in general [#4504](https://github.com/paritytech/parity/pull/4504)
-- Use the current contract name for Solidity compilation [#4510](https://github.com/paritytech/parity/pull/4510)
-- Preparation for Light client RPC [#4485](https://github.com/paritytech/parity/pull/4485)
-- Fix Dutch translation [#4509](https://github.com/paritytech/parity/pull/4509)
-- Fixed a warning and bumped libusb-sys [#4507](https://github.com/paritytech/parity/pull/4507)
-- Fix TnC overflows on small screens [#4505](https://github.com/paritytech/parity/pull/4505)
-- Fix no data sent in TxQueue dapp [#4502](https://github.com/paritytech/parity/pull/4502)
-- Ledger wallet support [#4486](https://github.com/paritytech/parity/pull/4486)
-- Add new Componennt for Token Images [#4498](https://github.com/paritytech/parity/pull/4498)
-- Fix address and accounts links [#4491](https://github.com/paritytech/parity/pull/4491)
-- Fix Token Reg Dapp issues in Firefox [#4489](https://github.com/paritytech/parity/pull/4489)
-- Parity.js interfaces for vaults [#4497](https://github.com/paritytech/parity/pull/4497)
-- Initial Dutch translations [#4484](https://github.com/paritytech/parity/pull/4484)
-- Fix key.meta.vault for root dir keys && read vault.meta without vault key [#4482](https://github.com/paritytech/parity/pull/4482)
-- Arbitrary labels for extended keys (u32, H256 built-in) [#4438](https://github.com/paritytech/parity/pull/4438)
-- Fix ethstore build [#4492](https://github.com/paritytech/parity/pull/4492)
-- Fixed compilation of ethstore-cli [#4493](https://github.com/paritytech/parity/pull/4493)
-- Build embedded Parity JS properly and separatly  [#4426](https://github.com/paritytech/parity/pull/4426)
-- Static link for snappy [#4487](https://github.com/paritytech/parity/pull/4487)
-- Work with string numbers in contract (Fixes #4472) [#4478](https://github.com/paritytech/parity/pull/4478)
-- Metadata support for vaults [#4475](https://github.com/paritytech/parity/pull/4475)
-- Sort gas price corpus when hitting genesis [#4470](https://github.com/paritytech/parity/pull/4470)
-- Fixing CORS headers for parity.web3.site [#4461](https://github.com/paritytech/parity/pull/4461)
-- Make signing compatible with geth. [#4468](https://github.com/paritytech/parity/pull/4468)
-- Handle registry not found errors [#4465](https://github.com/paritytech/parity/pull/4465)
-- Fix Portal scrolling getting stuck [#4455](https://github.com/paritytech/parity/pull/4455)
-- Fix AccountCard stretch to 100% [#4450](https://github.com/paritytech/parity/pull/4450)
-- Include total difficulty in CHTs and hide implementation details from consumers [#4428](https://github.com/paritytech/parity/pull/4428)
-- Fix RLP encoding for types recursively calling `RlpStream::append` [#4362](https://github.com/paritytech/parity/pull/4362)
-- Open popup without attempting inline [#4440](https://github.com/paritytech/parity/pull/4440)
-- Fixing histogram again ([#4464](https://github.com/paritytech/parity/issues/4464)) port from beta [#4467](https://github.com/paritytech/parity/pull/4467)
-- Vaults RPCs [#4366](https://github.com/paritytech/parity/pull/4366)
-- Ethkey - extended keys [#4377](https://github.com/paritytech/parity/pull/4377)
-- Use secure websocket from HTTPS clients [#4436](https://github.com/paritytech/parity/pull/4436)
-- RPC middleware: Informant & Client.keep_alive [#4384](https://github.com/paritytech/parity/pull/4384)
-- Fix eth_sign/parity_postSign [#4432](https://github.com/paritytech/parity/pull/4432)
-- Web view with web3.site support [#4313](https://github.com/paritytech/parity/pull/4313)
-- Extend Portal component with title, buttons & steps (as per Modal) [#4392](https://github.com/paritytech/parity/pull/4392)
-- Extension installation overlay [#4423](https://github.com/paritytech/parity/pull/4423)
-- Add block & timestamp conditions to Signer [#4411](https://github.com/paritytech/parity/pull/4411)
-- Transaction timestamp condition [#4419](https://github.com/paritytech/parity/pull/4419)
-- Poll for defaultAccount to update dapp & overlay subscriptions [#4417](https://github.com/paritytech/parity/pull/4417)
-- Validate dapps accounts with address book [#4407](https://github.com/paritytech/parity/pull/4407)
-- Dapps use defaultAccount instead of own selectors [#4386](https://github.com/paritytech/parity/pull/4386)
-- Fix lock and rename tracing [#4403](https://github.com/paritytech/parity/pull/4403)
-- Restarting fetch client every now and then [#4399](https://github.com/paritytech/parity/pull/4399)
-- Perform a sync between Rust and JS when generating markdown instead of in spec tests [#4408](https://github.com/paritytech/parity/pull/4408)
-- Registry dapp: make lookup use lower case [#4409](https://github.com/paritytech/parity/pull/4409)
-- Available Dapp selection alignment with Permissions (Portal) [#4374](https://github.com/paritytech/parity/pull/4374)
-- More permissive verification process [#4317](https://github.com/paritytech/parity/pull/4317)
-- Fix ParityBar account selection overflows [#4405](https://github.com/paritytech/parity/pull/4405)
-- Mac binaries signing [#4397](https://github.com/paritytech/parity/pull/4397)
-- Revert "remove [ci skip]" [#4398](https://github.com/paritytech/parity/pull/4398)
-- Registry, s/a the owner/the owner/ [#4391](https://github.com/paritytech/parity/pull/4391)
-- Fixing invalid address in docs [#4388](https://github.com/paritytech/parity/pull/4388)
-- Remove [ci skip] [#4381](https://github.com/paritytech/parity/pull/4381)
-- Fixing estimate gas in case histogram is not available [#4387](https://github.com/paritytech/parity/pull/4387)
-- Default Account selector in Signer overlay [#4375](https://github.com/paritytech/parity/pull/4375)
-- Fixing web3 in console [#4382](https://github.com/paritytech/parity/pull/4382)
-- Add parity_defaultAccount RPC (with subscription) [#4383](https://github.com/paritytech/parity/pull/4383)
-- Full JSON-RPC docs + sync tests. [#4335](https://github.com/paritytech/parity/pull/4335)
-- Expose util as Api.util [#4372](https://github.com/paritytech/parity/pull/4372)
-- Dapp Account Selection & Defaults [#4355](https://github.com/paritytech/parity/pull/4355)
-- Publish @parity/jsonrpc [#4365](https://github.com/paritytech/parity/pull/4365)
-- Fix signing [#4363](https://github.com/paritytech/parity/pull/4363)
-- Fixing embedded bar not closing in chrome extension [#4367](https://github.com/paritytech/parity/pull/4367)
-- Update AccountCard for re-use [#4350](https://github.com/paritytech/parity/pull/4350)
-- Add proper event listener to Portal [#4359](https://github.com/paritytech/parity/pull/4359)
-- Optional from field in Transaction Requests [#4332](https://github.com/paritytech/parity/pull/4332)
-- Rust 1.14 in README [ci-skip] [#4361](https://github.com/paritytech/parity/pull/4361)
-- Fix JournalDB::earliest_era on empty database [#4316](https://github.com/paritytech/parity/pull/4316)
-- Fixed race condition deadlock on fetching enode URL [#4354](https://github.com/paritytech/parity/pull/4354)
-- Allow Portal to be used as top-level modal [#4338](https://github.com/paritytech/parity/pull/4338)
-- Fix postsign [#4347](https://github.com/paritytech/parity/pull/4347)
-- Renaming signAndSendTransaction to sendTransaction [#4351](https://github.com/paritytech/parity/pull/4351)
-- Add api.util.encodeMethodCall to parity.js [#4330](https://github.com/paritytech/parity/pull/4330)
-- Initial commit for vaults [#4312](https://github.com/paritytech/parity/pull/4312)
-- Returning default account as coinbase + allow altering sender in signer [#4323](https://github.com/paritytech/parity/pull/4323)
-- Persistent tracking of dapps [#4302](https://github.com/paritytech/parity/pull/4302)
-- Exposing all RPCs over dapps port as CLI option [#4346](https://github.com/paritytech/parity/pull/4346)
-- New macOS App [#4345](https://github.com/paritytech/parity/pull/4345)
-- Display QrCode for accounts, addresses & contracts [#4329](https://github.com/paritytech/parity/pull/4329)
-- Add QrCode & Copy to ShapeShift [#4322](https://github.com/paritytech/parity/pull/4322)
-- Parity.js api.parity.chainStatus should handle { blockGap: null } [#4327](https://github.com/paritytech/parity/pull/4327)
-- DeleteAccount & LoadContract modal updates [#4320](https://github.com/paritytech/parity/pull/4320)
-- Split Tab from TabBar [#4318](https://github.com/paritytech/parity/pull/4318)
-- Contracts interface expansion [#4307](https://github.com/paritytech/parity/pull/4307)
-- HistoryStore for tracking relevant routes [#4305](https://github.com/paritytech/parity/pull/4305)
-- Split Dapp icon into ui/DappIcon (re-use) [#4308](https://github.com/paritytech/parity/pull/4308)
-- Add a Playground for the UI Components [#4301](https://github.com/paritytech/parity/pull/4301)
-- Update CreateWallet with FormattedMessage [#4298](https://github.com/paritytech/parity/pull/4298)
-- Update dates for new PRs missed [#4306](https://github.com/paritytech/parity/pull/4306)
-- EIP-98: Optional transaction state root [#4296](https://github.com/paritytech/parity/pull/4296)
-- Fix whitespace [#4299](https://github.com/paritytech/parity/pull/4299)
-- Attempt to fix console. [#4294](https://github.com/paritytech/parity/pull/4294)
-- Ui/SectionList component [#4292](https://github.com/paritytech/parity/pull/4292)
-- Stratum up [#4233](https://github.com/paritytech/parity/pull/4233)
-- Logging transaction duration [#4297](https://github.com/paritytech/parity/pull/4297)
-- Generic engine utilities [#4258](https://github.com/paritytech/parity/pull/4258)
-- JSON-RPC interfaces with documentation [#4276](https://github.com/paritytech/parity/pull/4276)
-- Dont decode seal fields [#4263](https://github.com/paritytech/parity/pull/4263)
-- Skip misbehaving test until properly fixed [#4283](https://github.com/paritytech/parity/pull/4283)
-- Additional logs for own transactions [#4278](https://github.com/paritytech/parity/pull/4278)
-- Ensure write lock isn't held when calling handlers [#4285](https://github.com/paritytech/parity/pull/4285)
-- Feature selector [#4074](https://github.com/paritytech/parity/pull/4074)
-- AccountCreate updates [#3988](https://github.com/paritytech/parity/pull/3988)
-- Extended JS interface -> Markdown generator [#4275](https://github.com/paritytech/parity/pull/4275)
-- Added 3 warpnodes for ropsten [#4289](https://github.com/paritytech/parity/pull/4289)
-- Ledger Communication JS toolkit [#4268](https://github.com/paritytech/parity/pull/4268)
-- ValidatorSet reporting [#4208](https://github.com/paritytech/parity/pull/4208)
-- Add support for api.subscribe('parity_accountsInfo') [#4273](https://github.com/paritytech/parity/pull/4273)
-- Display AccountCard name via IdentityName [#4235](https://github.com/paritytech/parity/pull/4235)
-- Dapp visibility save/load tests [#4150](https://github.com/paritytech/parity/pull/4150)
-- Fix wrong output format of peers [#4270](https://github.com/paritytech/parity/pull/4270)
-- Chain scoring [#4218](https://github.com/paritytech/parity/pull/4218)
-- Rust 1.14 for windows builds [#4269](https://github.com/paritytech/parity/pull/4269)
-- Eslint formatting updates [#4234](https://github.com/paritytech/parity/pull/4234)
-- Embeddable ParityBar [#4222](https://github.com/paritytech/parity/pull/4222)
-- Update deb-build.sh to fix libssl dependency [#4260](https://github.com/paritytech/parity/pull/4260)
-- Integration with zgp whitelist contract [#4215](https://github.com/paritytech/parity/pull/4215)
-- Adjust the location of the signer snippet [#4155](https://github.com/paritytech/parity/pull/4155)
-- Fix wrong token handling [#4254](https://github.com/paritytech/parity/pull/4254)
-- Additional building-block UI components [#4239](https://github.com/paritytech/parity/pull/4239)
-- Bump package.json to 0.3.0 (1.6 track) [#4244](https://github.com/paritytech/parity/pull/4244)
-- Disable incoming ETH notifications [#4243](https://github.com/paritytech/parity/pull/4243)
-- Memory-based pruning history size [#4114](https://github.com/paritytech/parity/pull/4114)
-- Common EngineSigner [#4189](https://github.com/paritytech/parity/pull/4189)
-- Verification: don't request a code twice [#4221](https://github.com/paritytech/parity/pull/4221)
-- S/Delete Contract/Forget Contract/ [#4237](https://github.com/paritytech/parity/pull/4237)
-- Light protocol syncing improvements [#4212](https://github.com/paritytech/parity/pull/4212)
-- LES Peer Info [#4195](https://github.com/paritytech/parity/pull/4195)
-- Don't panic on uknown git commit hash [#4231](https://github.com/paritytech/parity/pull/4231)
-- Cache registry reverses in local storage [#4182](https://github.com/paritytech/parity/pull/4182)
-- Update version numbers in README [#4223](https://github.com/paritytech/parity/pull/4223)
-- CHT calculations for full nodes [#4181](https://github.com/paritytech/parity/pull/4181)
-- Use single source of info for dapp meta (build & display) [#4217](https://github.com/paritytech/parity/pull/4217)
-- Non-secure API for DappReg [#4216](https://github.com/paritytech/parity/pull/4216)
-- Console now has admin [#4220](https://github.com/paritytech/parity/pull/4220)
-- Verification: add mainnet BadgeReg ids [#4190](https://github.com/paritytech/parity/pull/4190)
-- Fixing minimal transaction queue price [#4204](https://github.com/paritytech/parity/pull/4204)
-- Remove unnecessary Engine method [#4184](https://github.com/paritytech/parity/pull/4184)
-- Fixed --base-path on windows [#4193](https://github.com/paritytech/parity/pull/4193)
-- Fixing etherscan price parsing [#4202](https://github.com/paritytech/parity/pull/4202)
-- LES: Better timeouts + Track failed requests [#4093](https://github.com/paritytech/parity/pull/4093)
-- ESLint additional rules [#4186](https://github.com/paritytech/parity/pull/4186)
-- JsonRPC bump for IPC fix [#4200](https://github.com/paritytech/parity/pull/4200)
-- Poll for upgrades as part of global status (long) [#4197](https://github.com/paritytech/parity/pull/4197)
-- Updater fixes [#4196](https://github.com/paritytech/parity/pull/4196)
-- Prevent duplicate incoming connections [#4180](https://github.com/paritytech/parity/pull/4180)
-- Minor typo to ensure it updates only when synced. [#4188](https://github.com/paritytech/parity/pull/4188)
-- Minor refactor for clarity [#4174](https://github.com/paritytech/parity/pull/4174)
-- Secret - from hash function, also validate data [#4159](https://github.com/paritytech/parity/pull/4159)
-- Gas_limit for blocks, mined by Parity will be divisible by 37 [#4154](https://github.com/paritytech/parity/pull/4154)
-- Support HTML5-routed dapps [#4173](https://github.com/paritytech/parity/pull/4173)
-- Fix subscribeToEvents test [#4166](https://github.com/paritytech/parity/pull/4166)
-- Fix dapps not loading [#4170](https://github.com/paritytech/parity/pull/4170)
-- Fix broken token images [#4169](https://github.com/paritytech/parity/pull/4169)
-- Bumping hyper [#4167](https://github.com/paritytech/parity/pull/4167)
-- Icarus -> update, increase web timeout. [#4165](https://github.com/paritytech/parity/pull/4165)
-- Add a password strength component [#4153](https://github.com/paritytech/parity/pull/4153)
-- Stop flickering + added loader in AddressSelector [#4149](https://github.com/paritytech/parity/pull/4149)
-- On demand LES request [#4036](https://github.com/paritytech/parity/pull/4036)
-- Ropsten fork detection [#4163](https://github.com/paritytech/parity/pull/4163)
-- Pull in console dapp as builtin [#4145](https://github.com/paritytech/parity/pull/4145)
-- Optimized hash lookups [#4144](https://github.com/paritytech/parity/pull/4144)
-- UnverifiedTransaction type [#4134](https://github.com/paritytech/parity/pull/4134)
-- Verification: check if server is running [#4140](https://github.com/paritytech/parity/pull/4140)
-- Remove onSubmit of current (no auto-change on password edit) [#4151](https://github.com/paritytech/parity/pull/4151)
-- Trim spaces from InputAddress [#4126](https://github.com/paritytech/parity/pull/4126)
-- Don't pop-up notifications after network switch [#4076](https://github.com/paritytech/parity/pull/4076)
-- Use estimateGas error (as per updated implementation) [#4131](https://github.com/paritytech/parity/pull/4131)
-- Improvements and optimisations to estimate_gas [#4142](https://github.com/paritytech/parity/pull/4142)
-- New jsonrpc-core with futures and metadata support [#3859](https://github.com/paritytech/parity/pull/3859)
-- Reenable mainnet update server. [#4137](https://github.com/paritytech/parity/pull/4137)
-- Temporarily skip failing test [#4138](https://github.com/paritytech/parity/pull/4138)
-- Refactor VoteCollector [#4101](https://github.com/paritytech/parity/pull/4101)
-- Another minor estimation fix [#4133](https://github.com/paritytech/parity/pull/4133)
-- Add proper label to method decoding inputs [#4136](https://github.com/paritytech/parity/pull/4136)
-- Remove bindActionCreators({}, dispatch) (empty, unneeded) [#4135](https://github.com/paritytech/parity/pull/4135)
-- Better contract error log reporting & handling [#4128](https://github.com/paritytech/parity/pull/4128)
-- Fix broken Transfer : total account balance [#4127](https://github.com/paritytech/parity/pull/4127)
-- Test harness for lightsync [#4109](https://github.com/paritytech/parity/pull/4109)
-- Fix call/estimate_gas [#4121](https://github.com/paritytech/parity/pull/4121)
-- Fixing decoding ABI with signatures in names [#4125](https://github.com/paritytech/parity/pull/4125)
-- Get rid of unsafe code in ethkey, propagate incorrect Secret errors. [#4119](https://github.com/paritytech/parity/pull/4119)
-- Basic tests for subscribeToEvents [#4115](https://github.com/paritytech/parity/pull/4115)
-- Auto-detect hex encoded bytes in sha3 [#4108](https://github.com/paritytech/parity/pull/4108)
-- Use binary chop to estimate gas accurately [#4100](https://github.com/paritytech/parity/pull/4100)
-- V1.6 in master [#4113](https://github.com/paritytech/parity/pull/4113)
-- Ignore get_price_info test by default. [#4112](https://github.com/paritytech/parity/pull/4112)
-- Fix wrong information logging [#4106](https://github.com/paritytech/parity/pull/4106)
-- Avoid comms with not-yet-active release update server. [#4111](https://github.com/paritytech/parity/pull/4111)
-- Update Transfer logic + Better logging [#4098](https://github.com/paritytech/parity/pull/4098)
-- Fix Signer : wrong account on reload [#4104](https://github.com/paritytech/parity/pull/4104)
-- Cache registry reverses, completion in address selector [#4066](https://github.com/paritytech/parity/pull/4066)
-- Validator/authority contract [#3937](https://github.com/paritytech/parity/pull/3937)
-- No reorg limit for ancient blocks [#4099](https://github.com/paritytech/parity/pull/4099)
-- Update registration after every write [#4102](https://github.com/paritytech/parity/pull/4102)
-- Default to no auto-update. [#4092](https://github.com/paritytech/parity/pull/4092)
-- Don't remove out of date local transactions [#4094](https://github.com/paritytech/parity/pull/4094)
-
-## Parity [v1.5.9](https://github.com/paritytech/parity/releases/tag/v1.5.9) (2017-03-11)
-
-First stable release of 1.5.x series. This release enables EIP-161 transaction replay protection for PoA networks.
-
-- Bump to v1.5.9
-- Fix auto-updater stable [#4869](https://github.com/paritytech/parity/pull/4869)
-- Fixing windows build script
-- Bump js-precompiled 20170308-152339
-- Force js update
-- Stable Engine backports [#4807](https://github.com/paritytech/parity/pull/4807)
-  - Calibrate before rejection
-  - Change flag name
-  - Add eip155
-  - Fix build
-  - Make network_id default
-- Switch js branch to stable
-- Bump to v1.5.8
-
-## Parity [v1.5.7](https://github.com/paritytech/parity/releases/tag/v1.5.7) (2017-03-07)
-
-This release resolves a single issue with failing auto-updates.
-
-- Update ETC bootnodes [#4794](https://github.com/paritytech/parity/pull/4794)
-- Bump to v1.5.7
-- Sane updater [#4658](https://github.com/paritytech/parity/pull/4658)
-  - Disable if files can't be moved.
-  - Make updater avoid downloading earlier versions.
-
-## Parity [v1.5.6](https://github.com/paritytech/parity/releases/tag/v1.5.6) (2017-03-06)
-
-This release among various stability fixes adds support for a new [Kovan](https://github.com/kovan-testnet/proposal) testnet.
-
-See [full list of changes.](https://github.com/paritytech/parity/compare/v1.5.4...v1.5.6):
-
-- Beta Update comments and reg ABI [#4788](https://github.com/paritytech/parity/pull/4788)
-  - Update comments.
-  - Fix up new ABI.
-- Bump to v1.5.6 in beta [#4786](https://github.com/paritytech/parity/pull/4786)
-- Beta Optimize signature for fallback function. ([#4780](https://github.com/paritytech/parity/pull/4780)) [#4784](https://github.com/paritytech/parity/pull/4784)
-- Beta Add registrar fields ([#4716](https://github.com/paritytech/parity/pull/4716)) [#4781](https://github.com/paritytech/parity/pull/4781)
-- Beta Etherscan links ([#4772](https://github.com/paritytech/parity/pull/4772)) [#4778](https://github.com/paritytech/parity/pull/4778)
-  - Etherscan links [#4772](https://github.com/paritytech/parity/pull/4772)
-    - Use netVersion to determine external links
-    - Update additional isTest references
-  - Port tests
-  - Update address links
-  - Signer accountlink isTest
-- Beta Fix invalid props [#4767](https://github.com/paritytech/parity/pull/4767)
-- Backporting to beta [#4741](https://github.com/paritytech/parity/pull/4741)
-  - New chains [#4720](https://github.com/paritytech/parity/pull/4720)
-    - Add Kovan chain.
-    - Fix up --testnet.
-    - Fix tests.
-  - Fix to UglifyJS 2.8.2 to fix app build issues [#4723](https://github.com/paritytech/parity/pull/4723)
-  - Update classic bootnodes, ref #4717 [#4735](https://github.com/paritytech/parity/pull/4735)
-  - Allow failure docker beta
-  - Adjust pruning history default to 64 [#4709](https://github.com/paritytech/parity/pull/4709)
-  - Backporting from master
-    - Update docker-build.sh
-    - Update gitlab.ci
-    - Fix docker hub build
-    - Update gitlab
-    - Docker beta-release->latest
-    - Add registry.
-    - Add info on forks.
-    - Fixed spec file
-  - Support both V1 & V2 DataChanged events in registry [#4734](https://github.com/paritytech/parity/pull/4734)
-    - Add info on forks.
-    - Add new registry ABI
-    - Import registry2 & fix exports
-    - Select ABI based on code hash
-    - Render new event types (owner not available)
-    - New registry.
-    - Rename old chain.
-    - Fix test.
-    - Another fix.
-    - Finish rename.
-  - Fixed fonts URLs [#4579](https://github.com/paritytech/parity/pull/4579)
-  - Fix Token Reg Dapp issues in Firefox [#4489](https://github.com/paritytech/parity/pull/4489)
-    - Fix overflow issues in Firefox [#4348](https://github.com/paritytech/parity/issues/4348)
-    - Fix wrong Promise inferance
-    - Revert "Add new Componennt for Token Images [#4496](https://github.com/paritytech/parity/issues/4496)"
-    - Add new Componennt for Token Images [#4496](https://github.com/paritytech/parity/issues/4496)
-  - Add StackEventListener [#4745](https://github.com/paritytech/parity/pull/4745)
-  - Update testnet detection [#4746](https://github.com/paritytech/parity/pull/4746)
-  - Fix Account Selection in Signer [#4744](https://github.com/paritytech/parity/pull/4744)
-    - Can pass FormattedMessage to Input (eg. Status // RPC Enabled)
-    - Simple fixed-width fix for Accoutn Selection in Parity Signer
-- Beta backports [#4763](https://github.com/paritytech/parity/pull/4763)
-  - Https://mkr-market -> https://oasisdex.com [#4701](https://github.com/paritytech/parity/pull/4701)
-  - Wallet s/delete/forget/ [#4741](https://github.com/paritytech/parity/pull/4741)
-- Update classic bootnodes [#4735](https://github.com/paritytech/parity/pull/4735)
-- Engine backports [#4718](https://github.com/paritytech/parity/pull/4718)
-  - Custom dev presets
-  - Add registrar field
-  - Use constructor for dev registrar
-  - Fix test
-- Beta Adjust pruning history default to 64 [#4709](https://github.com/paritytech/parity/pull/4709)
-- Bump to v1.5.5
-
-## Parity [v1.5.4](https://github.com/paritytech/parity/releases/tag/v1.5.4) (2017-02-23)
-
-A couple of issue fixed in this release:
-
-- Parity now allows uncles headers to have timestamp set to arbitrary future value.
-- Importing keys from geth is now working again.
-
-Changes:
-
-- Beta Fix Geth account import [#4643](https://github.com/paritytech/parity/pull/4643)
-  - Fix Geth import - actually pass addresses through
-  - Fix geth accounts not displayed
-  - Port saving of returned addresses (master MobX, beta state)
-  - Log result -> importGethAccounts
-- Beta Backporting ([#4633](https://github.com/paritytech/parity/pull/4633)) [#4640](https://github.com/paritytech/parity/pull/4640)
-  - Tweak some checks.
-  - Fixed build and added a difficulty test
-  - Bump to v1.5.4
-
-## Parity [v1.4.12](https://github.com/paritytech/parity/releases/tag/v1.4.12) (2017-02-22)
-
-This stable release fixes an issue with block uncle validation. Parity now allows uncle headers to have timestamp set to arbitrary future value.
-
-- Stable Backporting ([#4633](https://github.com/paritytech/parity/pull/4633)) [#4642](https://github.com/paritytech/parity/pull/4642)
-  - Tweak some checks.
-  - Fixed build and added a difficulty test
-  - Bump to v1.4.12
-- Add missing maxCodeSize [#4585](https://github.com/paritytech/parity/pull/4585)
-
-## Parity [v1.5.3](https://github.com/paritytech/parity/releases/tag/v1.5.3) (2017-02-20)
-
-This is a maintenance release that fixes a number of stability issues. Notably this resolves an issue where Parity would allow a pre EIP-155 transaction into the sealed block.
-
-See [full list of changes](https://github.com/paritytech/parity/compare/v1.5.2...v1.5.3):
-
-- Bump to v1.5.3 [#4611](https://github.com/paritytech/parity/pull/4611)
-- Handle invalid ABI retrieved from address_book gracefully ([#4606](https://github.com/paritytech/parity/pull/4606)) [#4610](https://github.com/paritytech/parity/pull/4610)
-  - Handle invalid ABI gracefully
-  - Also include failed abi in log
-- Backporting to beta [#4602](https://github.com/paritytech/parity/pull/4602)
-  - Static link for snappy
-  - added 3 warpnodes for ropsten ([#4289](https://github.com/paritytech/parity/pull/4289))
-  - Fixed indentation
-- Validate transaction before adding to the queue [#4600](https://github.com/paritytech/parity/pull/4600)
-- Beta backports [#4569](https://github.com/paritytech/parity/pull/4569)
-  - Fixing evmbin compilation and added standard build. ([#4561](https://github.com/paritytech/parity/pull/4561))
-  - Alias for personal_sendTransaction ([#4554](https://github.com/paritytech/parity/pull/4554))
-  - Fix console dapp ([#4544](https://github.com/paritytech/parity/pull/4544))
-  - Fixing linting issues. Better support for console as secure app
-  - Fixing linting issues
-  - Fix no data sent in TxQueue dapp ([#4502](https://github.com/paritytech/parity/pull/4502))
-  - Fix wrong PropType req for Embedded Signer
-  - Fix wrong data for tx #4499
-- Explicitly set seconds to 0 from selector ([#4559](https://github.com/paritytech/parity/pull/4559)) [#4571](https://github.com/paritytech/parity/pull/4571)
-  - Explicitly set seconds/milli to 0
-  - Use condition time & block setters consistently
-  - Fix failing test
-  - test for 0 ms & sec
-  - It cannot hurt, clone date before setting
-  - Prettier date test constants (OCD)
-- Remove invalid expectation [#4542](https://github.com/paritytech/parity/pull/4542)
-- Skip OOG check for simple transfers [#4558](https://github.com/paritytech/parity/pull/4558) [#4560](https://github.com/paritytech/parity/pull/4560)
- - Skip OOG check for simple transfers [#4558](https://github.com/paritytech/parity/pull/4558)
- - Fix failing test
-
-## Parity [v1.4.11](https://github.com/paritytech/parity/releases/tag/v1.4.11) (2017-02-17)
-
-This release corrects the Ropsten chain specification file.
-
-- Bump to v1.4.11 [#4587](https://github.com/paritytech/parity/pull/4587)
-- Fixing etherscan price parsing ([#4202](https://github.com/paritytech/parity/pull/4202)) [#4209](https://github.com/paritytech/parity/pull/4209)
- - Fixing etherscan price parsing
- - Handling all errors
-- Removed pdbs
-- Add missing maxCodeSize [#4585](https://github.com/paritytech/parity/pull/4585)
-
-## Parity [v1.5.2](https://github.com/paritytech/parity/releases/tag/v1.5.2) (2017-02-08)
-
-This release brings a few stability fixes along with a feature that allows queuing transactions that are activated and send out on selected date or block number.
-- Debian packages have been updated to require `libssl1.0.0` for better compatibility.
-- eth_sign (and parity_postSign) used to return concatenated r ++ s ++ v with v being 0 or 1. it now agrees with geth as v ++ r ++ s with v being 27 or 28.
-
-Parity Wallet
-- Accounts & ShapeShift integration now displays QR code for scanning from mobile wallets
-- Dapp integration now allows for the selection of available accounts and the setting of the default account
-- Transaction creation now allows for the selection of future blocks or timestamps after which the transaction is released
-
-Parity Extension
-- First release of the Parity Extension, allowing for Parity integration from web-based dapps
-
-See [full list of changes](https://github.com/paritytech/parity/compare/v1.5.0...v1.5.2):
-- Work with string numbers in contract (Fixes #4472) ([#4478](https://github.com/paritytech/parity/pull/4478)) [#4480](https://github.com/paritytech/parity/pull/4480)
-- Eth_sign improvements backport [#4473](https://github.com/paritytech/parity/pull/4473)
-  - Fix postsign ([#4347](https://github.com/paritytech/parity/pull/4347))
-  - Fix whitespace.
-  - Fix post sign.
+- Re-enable signer, even with no UI. ([#8167](https://github.com/paritytech/parity/pull/8167)) ([#8168](https://github.com/paritytech/parity/pull/8168))
+  - Re-enable signer, even with no UI.
   - Fix message.
-  - Fix tests.
-  - Rest of the problems.
-  - All hail the linter and its omniscience.
-  - ...and its divine omniscience.
-  - Grumbles and wording.
-  - Make signing compatible with geth. ([#4468](https://github.com/paritytech/parity/pull/4468))
-- Sort gas price corpus when hitting genesis [#4471](https://github.com/paritytech/parity/pull/4471)
-- Wallet dev chain fix [#4466](https://github.com/paritytech/parity/pull/4466)
-- Fixing histogram again [#4464](https://github.com/paritytech/parity/pull/4464)
-- Beta backports [#4462](https://github.com/paritytech/parity/pull/4462)
-  - Support HTML5-routed dapps ([#4173](https://github.com/paritytech/parity/pull/4173))
-  - Fix compilation on latest nightly
-  - Updating precompiled
-- Fix Portal scrolling getting stuck [#4456](https://github.com/paritytech/parity/pull/4456)
-  - Fix Portal scrolling getting stuck
-  - DappCard container flex
-  - Container height to 100%
-- Fix AccountCard stretch to 100% [#4451](https://github.com/paritytech/parity/pull/4451)
-- Fix wrong output format of peers ([#4270](https://github.com/paritytech/parity/pull/4270)) [#4442](https://github.com/paritytech/parity/pull/4442)
-  - Fix wrong output format of peers
-  - Add outPeer tests
-- Opening extension page without inline installation [#4441](https://github.com/paritytech/parity/pull/4441)
-  - Open popup without attempting inline
-  - Cater for all .web3.site addresses
-- Fix svg extension image webpack inlining [#4437](https://github.com/paritytech/parity/pull/4437)
-- Backporting to beta [#4434](https://github.com/paritytech/parity/pull/4434)
-  - Bump to v1.5.2
-  - Fix eth_sign/parity_postSign ([#4432](https://github.com/paritytech/parity/pull/4432))
-  - Fix dispatch for signing.
-  - Remove console log
-  - Fix signing & tests.
-- Returning default account as coinbase [#4431](https://github.com/paritytech/parity/pull/4431)
-  - Returning first address as coinbase
-  - Allowing sender alteration in signer
-  - Adding default account RPC
-- UI updates for 1.5.1 [#4429](https://github.com/paritytech/parity/pull/4429)
-  - S/Delete Contract/Forget Contract/ ([#4237](https://github.com/paritytech/parity/pull/4237))
-  - Adjust the location of the signer snippet ([#4155](https://github.com/paritytech/parity/pull/4155))
-  - Additional building-block UI components ([#4239](https://github.com/paritytech/parity/pull/4239))
-  - Currency WIP
-  - Expand tests
-  - Pass className
-  - Add QrCode
-  - Export new components in ~/ui
-  - S/this.props.netSymbol/netSymbol/
-  - Fix import case
-  - Ui/SectionList component ([#4292](https://github.com/paritytech/parity/pull/4292))
-  - Array chunking utility
-  - Add SectionList component
-  - Add TODOs to indicate possible future work
-  - Add missing overlay style (as used in dapps at present)
-  - Add a Playground for the UI Components ([#4301](https://github.com/paritytech/parity/pull/4301))
-  - Playground // WIP
-  - Linting
-  - Add Examples with code
-  - CSS Linting
-  - Linting
-  - Add Connected Currency Symbol
-  - 2015-2017
-  - Added `renderSymbol` tests
-  - PR grumbles
-  - Add Eth and Btc QRCode examples
-  - 2015-2017
-  - Add tests for playground
-  - Fixing tests
-  - Split Dapp icon into ui/DappIcon ([#4308](https://github.com/paritytech/parity/pull/4308))
-  - Add QrCode & Copy to ShapeShift ([#4322](https://github.com/paritytech/parity/pull/4322))
-  - Extract CopyIcon to ~/ui/Icons
-  - Add copy & QrCode address
-  - Default size 4
-  - Add bitcoin: link
-  - Use protocol links applicable to coin exchanged
-  - Remove .only
-  - Display QrCode for accounts, addresses & contracts ([#4329](https://github.com/paritytech/parity/pull/4329))
-  - Allow Portal to be used as top-level modal ([#4338](https://github.com/paritytech/parity/pull/4338))
-  - Portal
-  - Allow Portal to be used in as both top-level and popover
-  - Modal/popover variable naming
-  - Export Portal in ~/ui
-  - Properly handle optional onKeyDown
-  - Add simple Playground Example
-  - Add proper event listener to Portal ([#4359](https://github.com/paritytech/parity/pull/4359))
-  - Display AccountCard name via IdentityName ([#4235](https://github.com/paritytech/parity/pull/4235))
-  - Fix signing ([#4363](https://github.com/paritytech/parity/pull/4363))
-  - Dapp Account Selection & Defaults ([#4355](https://github.com/paritytech/parity/pull/4355))
-  - Add parity_defaultAccount RPC (with subscription) ([#4383](https://github.com/paritytech/parity/pull/4383))
-  - Default Account selector in Signer overlay ([#4375](https://github.com/paritytech/parity/pull/4375))
-  - Typo, fixes #4271 ([#4391](https://github.com/paritytech/parity/pull/4391))
-  - Fix ParityBar account selection overflows ([#4405](https://github.com/paritytech/parity/pull/4405))
-  - Available Dapp selection alignment with Permissions (Portal) ([#4374](https://github.com/paritytech/parity/pull/4374))
-  - Registry dapp: make lookup use lower case ([#4409](https://github.com/paritytech/parity/pull/4409))
-  - Dapps use defaultAccount instead of own selectors ([#4386](https://github.com/paritytech/parity/pull/4386))
-  - Poll for defaultAccount to update dapp & overlay subscriptions ([#4417](https://github.com/paritytech/parity/pull/4417))
-  - Poll for defaultAccount (Fixes #4413)
-  - Fix nextTimeout on catch
-  - Store timers
-  - Re-enable default updates on change detection
-  - Add block & timestamp conditions to Signer ([#4411](https://github.com/paritytech/parity/pull/4411))
-  - Extension installation overlay ([#4423](https://github.com/paritytech/parity/pull/4423))
-  - Extension installation overlay
-  - Pr gumbles
-  - Spelling
-  - Update Chrome URL
-  - Fix for non-included jsonrpc
-  - Extend Portal component (as per Modal) [#4392](https://github.com/paritytech/parity/pull/4392)
-- Transaction timestamp condition [#4427](https://github.com/paritytech/parity/pull/4427)
-- Fixing embedded bar not closing in chrome extension [#4421](https://github.com/paritytech/parity/pull/4421)
-- Backporting to beta [#4418](https://github.com/paritytech/parity/pull/4418)
-  - Bump to 1.5.1
-  - Disable notifications ([#4243](https://github.com/paritytech/parity/pull/4243))
-  - Fix wrong token handling ([#4254](https://github.com/paritytech/parity/pull/4254))
-  - Fixing wrong token displayed
-  - Linting
-  - Revert filtering out
-  - Revert the revert
-  - Don't panic on uknown git commit hash ([#4231](https://github.com/paritytech/parity/pull/4231))
-  - Additional logs for own transactions ([#4278](https://github.com/paritytech/parity/pull/4278))
-  - Integration with zgp whitelist contract ([#4215](https://github.com/paritytech/parity/pull/4215))
-  - Zgp-transactions checker
-  - Polishing
-  - Rename + refactor
-  - Refuse-service-transactions cl option
-  - Fixed tests compilation
-  - Renaming signAndSendTransaction to sendTransaction ([#4351](https://github.com/paritytech/parity/pull/4351))
-  - Fixed deadlock in external_url ([#4354](https://github.com/paritytech/parity/pull/4354))
-  - Fixing web3 in console ([#4382](https://github.com/paritytech/parity/pull/4382))
-  - Fixing estimate gas in case histogram is not available ([#4387](https://github.com/paritytech/parity/pull/4387))
-  - Restarting fetch client every now and then ([#4399](https://github.com/paritytech/parity/pull/4399))
-- Embeddable ParityBar ([#4222](https://github.com/paritytech/parity/pull/4222)) [#4287](https://github.com/paritytech/parity/pull/4287)
-  - Embeddable ParityBar
-  - Replacing storage with store
-  - Fixing  references.
-  - Addressing style issues
-  - Supporting parity background
-
-## Parity [v1.5.0: "Nativity"](https://github.com/paritytech/parity/releases/tag/v1.5.0) (2017-01-19)
-
-Major feature release including _Tendermint_ consensus engine, _Multisig wallet_ support, _badge/certification_ UI integration and _automatic updates_.
-
-Directories:
-
-- New XDG-informed Parity data directory structure. Base dir (`--base-path` or `-d`) that defaulted to `$HOME/.parity` is changed to:
-  - `/Users/You/AppData/Roaming/Parity/Ethereum` on Windows
-  - `/Users/you/Library/Application Support/io.parity.ethereum` on MacOS
-  - `/home/you/.local/share/parity` on Linux/Unix
-- Keys are now stored in chain-specific directories . On first run of 1.5, all keys will be moved into the key's directory of the chain you run. You'll need to move the wallet files between directories manually if you wish to split them between testnet/mainnet.
-- `--db-path` option now controls the path just for the databases, not for keys (`--keys-path`) or dapps (`--dapps-path`).
-
-Basics:
-
-- Version tracking, consensus-protection, hypervised auto-updating:
-  - Parity will ensure syncing is paused if its version cannot support an upcoming hard-fork (disable with `--no-consensus`).
-  - Parity will automatically download the latest version and may be updated through Parity Wallet (disable with `--no-download`)
-  - Parity can automatically update and seamlessly restart to later versions in the same release track (enable with `--auto-update=all` or `--auto-update=critical`).
-  - Parity hypervisor will automatically run the latest version (disable with `--force-direct`).
-- Fat database; to enable, sync the chain with the option `--fat-db`.
-  - Accounts and storage entries can be enumerated.
-  - Chain state can be exported to JSON for analysis with `parity export state`.
-- CLI and config options renamed: all variants of `--signer` are renamed to `--ui`.
-- Log files are appended by default rather than truncated (useful for daemon deployments).
-
-Parity Wallet:
-
-- Multisig wallet support: "New Wallet" button in the "Accounts" section allows you to create a new multisig wallet or import an existing one.
-- Solidity compiler: "Develop Contract" button in the "Contracts" section allows you to write, edit, compile and deploy contracts.
-- SMS & e-mail verification: Accounts can now be certified as verified using Parity's SMS and e-Mail verification/registration oracle.
-- Badge/certification integration: The `BadgeReg` contract can be used to deploy additional certifications.
-- Local transaction propagation tracking: "TxQueue Viewer" in the "Applications" section allows you to track and resubmit previously sent transactions.
-- Contract executions can now have gas and gas-price configured.
-- Signer can now alter the gas and gas-price of transactions at password-entry.
-- The deprecated Chrome "Signer" extension is now incompatible.
-
-[Proof of Authority](https://github.com/paritytech/parity/wiki/Proof-of-Authority-Chains):
-
-- Authority Round consensus engine: `engine: authorityRound {...}`; this is a high-performance Proof-of-Authority consensus engine. It is not BFT under normal circumstances (however the `--force-sealing` flag can be used to ensure consensus even with Byzantine nodes).
-- Tendermint Engine: `engine: tendermint {...}`; this is an experimental Proof-of-Authority consensus engine. BFT up to one third of the authorities and falling back to delayed finalization chain ordering (50% fault tolerant).
-- Generic seal JSON spec includes engine-specific types (`seal: { generic: { rlp: "0x..." } }` becomes `seal: { authority_round { step: 0, signature: "0x..." } }`.
-- To set a node as authority either `--engine-signer ADDRESS` should be used with `--password` or `parity_setEngineSigner(address, password)` RPC should be called. Unlocking the account permanently or using `--author` is now unnecessary.
-- Set of authorities can now be specified using a [list or a contract](https://github.com/paritytech/parity/wiki/Consensus-Engines#validator-engines).
-
-Chains:
-
-- Dev chain: `--chain=dev`; instant seal engine (no mining needed). Great for development work.
-- Ropsten chain (`--chain=ropsten` or `--chain=testnet`) configures for Ropsten, the new test net.
-- Morden chain (`--chain=morden`) changed to "Classic" rules and stays as the Ethereum Classic test net.
-
-RPCs/APIs:
-
-- All JSON-RPC interfaces have strict JSON deserialization - no extra fields are allowed.
-- `eth_sign` RPC now hashes given data instead of getting the hash.
-- `signer_confirmRequestWithToken`: additional RPC for signing transactions with a rotating token, alleviating the need for keeping an account password in memory.
-- `eth_signTransaction` now conforms to the specification, `eth_submitTransaction` is introduced.
-
-Full changes:
-
-- Backporting to beta [#4211](https://github.com/paritytech/parity/pull/4211)
-  - JsonRPC bump for IPC fix
-  - Fixing etherscan price parsing ([#4202](https://github.com/paritytech/parity/pull/4202))
-  - Handling all errors
-  - Fixed --base-path on windows ([#4193](https://github.com/paritytech/parity/pull/4193))
-  - Add support for optional args with default text
-  - Fixing minimal transaction queue price ([#4204](https://github.com/paritytech/parity/pull/4204))
-  - Fixing tests
-  - verification: add mainnet BadgeReg ids ([#4190](https://github.com/paritytech/parity/pull/4190))
-  - verification: fetch contracts by name
-  - verification: better wording
-  - typo
-  - reregistered badges
-  - Console now has admin ([#4220](https://github.com/paritytech/parity/pull/4220))
-  - Fixes [#4210](https://github.com/paritytech/parity/pull/4210)
-  - Non-secure for DappReg ([#4216](https://github.com/paritytech/parity/pull/4216))
-- Backporting to beta [#4203](https://github.com/paritytech/parity/pull/4203)
-  - Minor typo to ensure it updates only when synced. ([#4188](https://github.com/paritytech/parity/pull/4188))
-  - Updater fixes ([#4196](https://github.com/paritytech/parity/pull/4196))
-  - Minor typo to ensure it updates only when synced.
-  - Fix deadlock.
-  - Skip unneeded arg in making list.
-  - Allow auto-restart even when not running an update.
-  - Fix trace.
-  - Update update info on each loop.
-  - Fix build.
-  - Shutdown all sockets
-  - Remove superfluous use.
-  - Poll for upgrades as part of global status (long) ([#4197](https://github.com/paritytech/parity/pull/4197))
-  - Fix path
-  - Prevent duplicate incoming connections ([#4180](https://github.com/paritytech/parity/pull/4180))
-- Gas_limit for blocks, mined by Parity will be divisible by 37 ([#4154](https://github.com/paritytech/parity/pull/4154)) [#4176](https://github.com/paritytech/parity/pull/4176)
-  - gas_limit for new blocks will divide evenly by 13
-  - increased PARITY_GAS_LIMIT_DETERMINANT to 37
-  - separate method for marking mined block
-  - debug_asserts(gas_limit within protocol range)
-  - round_block_gas_limit method is now static
-  - made round_block_gas_limit free-function
-  - multiplier->multiple
-- Backporting to beta [#4175](https://github.com/paritytech/parity/pull/4175)
-  - verification: check if server is running ([#4140](https://github.com/paritytech/parity/pull/4140))
-  - verification: check if server is running
-  - See also ethcore/email-verification#67c6466 and ethcore/sms-verification#a585e42.
-  - verification: show in the UI if server is running
-  - verification: code style ✨, more i18n
-  - fix i18n key
-  - Optimized hash lookups ([#4144](https://github.com/paritytech/parity/pull/4144))
-  - Optimize hash comparison
-  - Use libc
-  - Ropsten fork detection ([#4163](https://github.com/paritytech/parity/pull/4163))
-  - Stop flickering + added loader in AddressSelector ([#4149](https://github.com/paritytech/parity/pull/4149))
-  - Stop UI flickering + added loader to AddressSelector [#4103](https://github.com/paritytech/parity/pull/4103)
-  - PR Grumbles
-  - Add a password strength component ([#4153](https://github.com/paritytech/parity/pull/4153))
-  - Added new PasswordStrength Component
-  - Added tests
-  - PR Grumbles
-  - icarus -> update, increase web timeout. ([#4165](https://github.com/paritytech/parity/pull/4165))
-  - Fix estimate gas
-  - Fix token images // Error in Contract Queries ([#4169](https://github.com/paritytech/parity/pull/4169))
-  - Fix dapps not loading ([#4170](https://github.com/paritytech/parity/pull/4170))
-  - Add secure to dappsreg
-  - Remove trailing slash // fix dapps
-- Bumping hyper [#4168](https://github.com/paritytech/parity/pull/4168)
-  - Bumping hyper
-  - Bumping again
-- Backporting to beta [#4158](https://github.com/paritytech/parity/pull/4158)
-  - Remove onSubmit of current (no auto-change on password edit) ([#4151](https://github.com/paritytech/parity/pull/4151))
-  - Remove onSubmit from current password
-  - Remove onSubmit from hint
-  - Pull in console dapp as builtin ([#4145](https://github.com/paritytech/parity/pull/4145))
-  - Copy static dapps from static (no build)
-  - Console sources
-  - Add console to builtins
-  - Remove console assets
-  - Disable eslint on console.js
-  - Enable eslint after disable
-  - Webpack copy
-- Backporting to beta [#4152](https://github.com/paritytech/parity/pull/4152)
-  - Fix broken transfer total balance ([#4127](https://github.com/paritytech/parity/pull/4127))
-  - Add proper label to method decoding inputs ([#4136](https://github.com/paritytech/parity/pull/4136))
-  - Another minor estimation fix ([#4133](https://github.com/paritytech/parity/pull/4133))
-  - Return 0 instead of error with out of gas on estimate_gas
-  - Fix stuff up.
-  - Another estimate gas fix.
-  - Alter balance to maximum possible rather than GP=0.
-  - Only increase to amount strictly necessary.
-  - Get rid of unsafe code in ethkey, propagate incorrect Secret errors. ([#4119](https://github.com/paritytech/parity/pull/4119))
-  - Implementing secret
-  - Fixing tests
-  - Refactor VoteCollector ([#4101](https://github.com/paritytech/parity/pull/4101))
-  - dir
-  - simple validator list
-  - stub validator contract
-  - make the engine hold Weak<Client> instead of IoChannel
-  - validator set factory
-  - register weak client with ValidatorContract
-  - check chain security
-  - add address array to generator
-  - register provider contract
-  - update validator set on notify
-  - add validator contract spec
-  - simple list test
-  - split update and contract test
-  - contract change
-  - use client in tendermint
-  - fix deadlock
-  - step duration in params
-  - adapt tendermint tests
-  - add storage fields to test spec
-  - constructor spec
-  - execute under wrong address
-  - create under correct address
-  - revert
-  - validator contract constructor
-  - move genesis block lookup
-  - add removal ability to contract
-  - validator contract adding validators
-  - fix basic authority
-  - validator changing test
-  - more docs
-  - update sync tests
-  - remove env_logger
-  - another env_logger
-  - cameltoe
-  - hold EngineClient instead of Client
-  - return error on misbehaviour
-  - nicer return
-  - sprinkle docs
-  - Reenable mainnet update server. ([#4137](https://github.com/paritytech/parity/pull/4137))
-  - basic tests for subscribeToEvents ([#4115](https://github.com/paritytech/parity/pull/4115))
-  - subscribeToEvent fixtures ✅
-  - subscribeToEvent tests ✅
-  - temporarily skip failing test ([#4138](https://github.com/paritytech/parity/pull/4138))
-  - Improvements and optimisations to estimate_gas ([#4142](https://github.com/paritytech/parity/pull/4142))
-  - Return 0 instead of error with out of gas on estimate_gas
-  - Fix stuff up.
-  - Another estimate gas fix.
-  - Alter balance to maximum possible rather than GP=0.
-  - Only increase to amount strictly necessary.
-  - Improvements and optimisations to estimate_gas.
-  - Introduce proper error type
-  - Avoid building costly traces
-  - Fix tests.
-  - Actually fix testsActually fix tests
-  - Use estimateGas error (as per updated implementation) ([#4131](https://github.com/paritytech/parity/pull/4131))
-  - EXCEPTION_ERROR as per #4142
-  - Better error log reporting & handling ([#4128](https://github.com/paritytech/parity/pull/4128))
-  - Don't pop-up notifications after network switch ([#4076](https://github.com/paritytech/parity/pull/4076))
-  - Better notifications
-  - Don't pollute with notifs if switched networks
-  - Better connection close/open events / No more notifs on change network
-  - PR Grumbles
-  - Add close and open events to HTTP // Add tests
-  - Fix tests
-  - WIP Signer Fix
-  - Fix Signer // Better reconnection handling
-  - PR Grumbles
-  - PR Grumbles
-  - Fixes wrong fetching of balances + Notifications
-  - Secure API WIP
-  - Updated Secure API Connection + Status
-  - Linting
-  - Updated Secure API Logic
-  - Proper handling of token updates // Fixing poping notifications
-  - PR Grumbles
-  - Fixing tests
-  - Trim spaces from InputAddress ([#4126](https://github.com/paritytech/parity/pull/4126))
-  - Trim spaces for addresses
-  - onSubmit has only value, not event
-  - onSubmit (again)
-  - Length check on trimmed value
-  - Remove bindActionCreators({}, dispatch) (empty) ([#4135](https://github.com/paritytech/parity/pull/4135))
-- Backporting to beta [#4118](https://github.com/paritytech/parity/pull/4118)
-  - Ignore get_price_info test by default. ([#4112](https://github.com/paritytech/parity/pull/4112))
-  - Auto-detect hex encoded bytes in sha3 ([#4108](https://github.com/paritytech/parity/pull/4108))
-  - Using types/isHex
-  - Removing unused imports
-  - Use binary chop to estimate gas accurately ([#4100](https://github.com/paritytech/parity/pull/4100))
-  - Initial sketch.
-  - Building.
-  - Fix a few things.
-  - Fix issue, add tracing.
-  - Address grumbles
-  - Raise upper limit if needed
-  - Fix test.
-  - Fixing decoding API with signatures in names ([#4125](https://github.com/paritytech/parity/pull/4125))
-  - Fix call/estimate_gas ([#4121](https://github.com/paritytech/parity/pull/4121))
-  - Return 0 instead of error with out of gas on estimate_gas
-  - Fix stuff up.
-- Current release: 1.3 -> 1.4 [#4183](https://github.com/paritytech/parity/pull/4183)
-- Fix rebroadcast panic [#4084](https://github.com/paritytech/parity/pull/4084)
-- Use shallow-only rendering in all tests [#4087](https://github.com/paritytech/parity/pull/4087)
-- Sending transactions in chunks [#4089](https://github.com/paritytech/parity/pull/4089)
-- Move to new auto-update server. [#4091](https://github.com/paritytech/parity/pull/4091)
-- Fixing compilation without dapps. [#4088](https://github.com/paritytech/parity/pull/4088)
-- Fix balances update [#4077](https://github.com/paritytech/parity/pull/4077)
-- Key derivation in Worker [#4071](https://github.com/paritytech/parity/pull/4071)
-- Display contract block creation [#4069](https://github.com/paritytech/parity/pull/4069)
-- Improving logs for transactions sync and disable re-broadcasting while syncing [#4065](https://github.com/paritytech/parity/pull/4065)
-- Passwords are valid by default [#4075](https://github.com/paritytech/parity/pull/4075)
-- Show Origin label to events table [#4073](https://github.com/paritytech/parity/pull/4073)
-- Fix tags not working [#4070](https://github.com/paritytech/parity/pull/4070)
-- Zero-alloc trie lookups [#3998](https://github.com/paritytech/parity/pull/3998)
-- Opening local dapp [#4041](https://github.com/paritytech/parity/pull/4041)
-- Bringing back `js-sha3` to fix in-browser signing [#4063](https://github.com/paritytech/parity/pull/4063)
-- Fix wrong transaction input for contract deployments [#4052](https://github.com/paritytech/parity/pull/4052)
-- Re-broadcast transactions to few random peers on each new block. [#4054](https://github.com/paritytech/parity/pull/4054)
-- Removing old transactions from the queue [#4046](https://github.com/paritytech/parity/pull/4046)
-- Add block rewards to more Engines [#4055](https://github.com/paritytech/parity/pull/4055)
-- Return old trie values on insert and remove [#4053](https://github.com/paritytech/parity/pull/4053)
-- Let users open urls from dapps view [#4042](https://github.com/paritytech/parity/pull/4042)
-- Util/validation update [#4051](https://github.com/paritytech/parity/pull/4051)
-- Convert ShapeShift modal to store [#4035](https://github.com/paritytech/parity/pull/4035)
-- Using local path on Windows [#4017](https://github.com/paritytech/parity/pull/4017)
-- Fixing minGasLimit > ceil limit mining issue [#4018](https://github.com/paritytech/parity/pull/4018)
-- Naive light client synchronization [#3892](https://github.com/paritytech/parity/pull/3892)
-- Starting on homestead shows reload snackbar [#4043](https://github.com/paritytech/parity/pull/4043)
-- Show contract parameters in MethodDecoding [#4024](https://github.com/paritytech/parity/pull/4024)
-- UI component updates [#4010](https://github.com/paritytech/parity/pull/4010)
-- Account view updates [#4008](https://github.com/paritytech/parity/pull/4008)
-- Better error messages for PoA chains [#4034](https://github.com/paritytech/parity/pull/4034)
-- Make some spec fields optional [#4019](https://github.com/paritytech/parity/pull/4019)
-- Basic account type [#4021](https://github.com/paritytech/parity/pull/4021)
-- Fix wallet in main net [#4038](https://github.com/paritytech/parity/pull/4038)
-- Removing orphaned Cargo.toml [#4032](https://github.com/paritytech/parity/pull/4032)
-- Address selector: support reverse lookup [#4033](https://github.com/paritytech/parity/pull/4033)
-- Only fetch App when necessary [#4023](https://github.com/paritytech/parity/pull/4023)
-- Connection UI cleanups & tests for prior PR [#4020](https://github.com/paritytech/parity/pull/4020)
-- Unsubscribe error on ShapeShift modal close [#4005](https://github.com/paritytech/parity/pull/4005)
-- Add ownership checks the Registry dApp [#4001](https://github.com/paritytech/parity/pull/4001)
-- Refresh balances of contacts & contracts when syncing [#4022](https://github.com/paritytech/parity/pull/4022)
-- Show message on new chain [#4016](https://github.com/paritytech/parity/pull/4016)
-- Use TypedInputs in Contracts view [#4015](https://github.com/paritytech/parity/pull/4015)
-- Fix focus on Modal [#4014](https://github.com/paritytech/parity/pull/4014)
-- Fix newError noops when not bound to dispacher [#4013](https://github.com/paritytech/parity/pull/4013)
-- Parse testnet chain as ropsten [#4004](https://github.com/paritytech/parity/pull/4004)
-- Work on Portal Style [#4003](https://github.com/paritytech/parity/pull/4003)
-- Make Wallet first-class citizens [#3990](https://github.com/paritytech/parity/pull/3990)
-- Don't slice non-existent tags [#4000](https://github.com/paritytech/parity/pull/4000)
-- Update dev dependencies and make Webpack less verbose [#3997](https://github.com/paritytech/parity/pull/3997)
-- Correct log index in transaction receipt [#3995](https://github.com/paritytech/parity/pull/3995)
-- Add Email and Registry lookups to Address Selector [#3992](https://github.com/paritytech/parity/pull/3992)
-- Remove node journal: dead code [#3994](https://github.com/paritytech/parity/pull/3994)
-- Cleanup AddContract with store [#3981](https://github.com/paritytech/parity/pull/3981)
-- Store for EditPassword Modal [#3979](https://github.com/paritytech/parity/pull/3979)
-- Additional fetch tests [#3983](https://github.com/paritytech/parity/pull/3983)
-- Owning views of blockchain data [#3982](https://github.com/paritytech/parity/pull/3982)
-- Make test network generic over peer type [#3974](https://github.com/paritytech/parity/pull/3974)
-- Fetch tests (first batch) [#3977](https://github.com/paritytech/parity/pull/3977)
-- Fetch certifiers only when needed [#3978](https://github.com/paritytech/parity/pull/3978)
-- Visible accounts for dapps (default whitelist) [#3898](https://github.com/paritytech/parity/pull/3898)
-- Remove some old (unused/duplicate) files [#3975](https://github.com/paritytech/parity/pull/3975)
-- Port `try` macro to new `?` operator. [#3962](https://github.com/paritytech/parity/pull/3962)
-- Small UI fixes [#3966](https://github.com/paritytech/parity/pull/3966)
-- Fix wrong use of Icons [#3973](https://github.com/paritytech/parity/pull/3973)
-- Updating dependencies [#3968](https://github.com/paritytech/parity/pull/3968)
-- Web Based Dapps [#3956](https://github.com/paritytech/parity/pull/3956)
-- Contract query: render false as false [#3971](https://github.com/paritytech/parity/pull/3971)
-- Email verification: add Terms of Service [#3970](https://github.com/paritytech/parity/pull/3970)
-- Fix method decoding [#3967](https://github.com/paritytech/parity/pull/3967)
-- Store for EditMeta modal [#3959](https://github.com/paritytech/parity/pull/3959)
-- Registry dapp: cleanup, support reverse entries [#3933](https://github.com/paritytech/parity/pull/3933)
-- New Address Selector Component [#3829](https://github.com/paritytech/parity/pull/3829)
-- Limiting accounts returned by parity_accountInfo [#3931](https://github.com/paritytech/parity/pull/3931)
-- Unknown block error for RPC [#3965](https://github.com/paritytech/parity/pull/3965)
-- Remove unused fields in informant [#3963](https://github.com/paritytech/parity/pull/3963)
-- Allow contract constructors in chain spec [#3932](https://github.com/paritytech/parity/pull/3932)
-- Sync reorg up to history size [#3874](https://github.com/paritytech/parity/pull/3874)
-- Rising the limit for fetch [#3964](https://github.com/paritytech/parity/pull/3964)
-- Bring integer arithmetic up to crates.io [#3943](https://github.com/paritytech/parity/pull/3943)
-- Eslint rule for block curlies [#3955](https://github.com/paritytech/parity/pull/3955)
-- Gas exception warnings on deployment [#3938](https://github.com/paritytech/parity/pull/3938)
-- Move verification store into modal [#3951](https://github.com/paritytech/parity/pull/3951)
-- Allow setting of minBlock on sending [#3921](https://github.com/paritytech/parity/pull/3921)
-- Allow empty address [#3961](https://github.com/paritytech/parity/pull/3961)
-- Fix default import [#3960](https://github.com/paritytech/parity/pull/3960)
-- Display 0x00..00 as null [#3950](https://github.com/paritytech/parity/pull/3950)
-- Global Fetch Service [#3915](https://github.com/paritytech/parity/pull/3915)
-- Update babel-loader for WebPack 2.2-rc [#3953](https://github.com/paritytech/parity/pull/3953)
-- Fix Webpack build [#3946](https://github.com/paritytech/parity/pull/3946)
-- Fix manual input token [#3945](https://github.com/paritytech/parity/pull/3945)
-- Update Webpack [#3952](https://github.com/paritytech/parity/pull/3952)
-- Add missing Ethcore -> Parity headers [#3948](https://github.com/paritytech/parity/pull/3948)
-- Code example: do start before register_protocol [#3947](https://github.com/paritytech/parity/pull/3947)
-- Set CHAIN_ID for Classic [#3934](https://github.com/paritytech/parity/pull/3934)
-- Fixed compile error. [#3940](https://github.com/paritytech/parity/pull/3940)
-- Fix dapps not loading [#3935](https://github.com/paritytech/parity/pull/3935)
-- Fix Secure API hangs [#3927](https://github.com/paritytech/parity/pull/3927)
-- Parity_chainStatus RPC for block gap info [#3899](https://github.com/paritytech/parity/pull/3899)
-- Custom attribute for binary serialization  [#3922](https://github.com/paritytech/parity/pull/3922)
-- Split intermediate stage into two. [#3926](https://github.com/paritytech/parity/pull/3926)
-- Move release-registering to intermediate stage. [#3920](https://github.com/paritytech/parity/pull/3920)
-- Blocktime format rounding [#3894](https://github.com/paritytech/parity/pull/3894)
-- Ignore dapps_policy.json [#3919](https://github.com/paritytech/parity/pull/3919)
-- Fixing Contract Development [#3912](https://github.com/paritytech/parity/pull/3912)
-- Use rhash for non-native CI platforms and submit build. [#3911](https://github.com/paritytech/parity/pull/3911)
-- Remove -Zorbit=off from rustflags on windows [#3907](https://github.com/paritytech/parity/pull/3907)
-- Fixed upgrading keys on the first run [#3904](https://github.com/paritytech/parity/pull/3904)
-- Fix deadlock in queue drop [#3903](https://github.com/paritytech/parity/pull/3903)
-- Require only simpler methods on Provider [#3897](https://github.com/paritytech/parity/pull/3897)
-- Fix grammar ("you try" -> "you tried" + article) [#3902](https://github.com/paritytech/parity/pull/3902)
-- Remove light server capability temporarily [#3872](https://github.com/paritytech/parity/pull/3872)
-- Allow retry for future blocks [#3896](https://github.com/paritytech/parity/pull/3896)
-- Consistent engine and seal names [#3895](https://github.com/paritytech/parity/pull/3895)
-- Update email certification ABI [#3893](https://github.com/paritytech/parity/pull/3893)
-- Remove existence & length checks on passwords & phrases [#3854](https://github.com/paritytech/parity/pull/3854)
-- Refresh certifications automatically [#3878](https://github.com/paritytech/parity/pull/3878)
-- Fix Wallet Settings Modal [#3856](https://github.com/paritytech/parity/pull/3856)
-- Fix difficulty adjustment. [#3884](https://github.com/paritytech/parity/pull/3884)
-- Final fixups for updater [#3883](https://github.com/paritytech/parity/pull/3883)
-- Attempt to fix windows CI. [#3882](https://github.com/paritytech/parity/pull/3882)
-- Fixing racy test [#3881](https://github.com/paritytech/parity/pull/3881)
-- Fix updater permissions [#3880](https://github.com/paritytech/parity/pull/3880)
-- Delayed transactions [#3865](https://github.com/paritytech/parity/pull/3865)
-- Don't log auth token [#3853](https://github.com/paritytech/parity/pull/3853)
-- Loading default config from default path [#3875](https://github.com/paritytech/parity/pull/3875)
-- New paths [#3877](https://github.com/paritytech/parity/pull/3877)
-- Update tests, gitlabci [#3876](https://github.com/paritytech/parity/pull/3876)
-- Base directory option [#3868](https://github.com/paritytech/parity/pull/3868)
-- Auto-updating [#3505](https://github.com/paritytech/parity/pull/3505)
-- Fix naming collision [#3873](https://github.com/paritytech/parity/pull/3873)
-- Get rid of unecessary redirection while fetching content [#3858](https://github.com/paritytech/parity/pull/3858)
-- Fix verification stores [#3864](https://github.com/paritytech/parity/pull/3864)
-- Store subscriptionId, align with main subscription model [#3863](https://github.com/paritytech/parity/pull/3863)
-- Additional RPCs for dapps accounts management [#3792](https://github.com/paritytech/parity/pull/3792)
-- Add Ws Json rpc client and command line utils (take 2) [#3830](https://github.com/paritytech/parity/pull/3830)
-- Fix typo in method call (broken contract interface) [#3862](https://github.com/paritytech/parity/pull/3862)
-- Fix flaky test [#3860](https://github.com/paritytech/parity/pull/3860)
-- Converting traces API to AutoArgs [#3844](https://github.com/paritytech/parity/pull/3844)
-- Get certifications from BadgeReg, show them in accounts overview [#3768](https://github.com/paritytech/parity/pull/3768)
-- New directory structure [#3828](https://github.com/paritytech/parity/pull/3828)
-- First run: skip account creation if they already have accounts [#3827](https://github.com/paritytech/parity/pull/3827)
-- Tendermint seal [#3857](https://github.com/paritytech/parity/pull/3857)
-- Tendermint Engine [#3759](https://github.com/paritytech/parity/pull/3759)
-- Expand lint to catch css issues [#3852](https://github.com/paritytech/parity/pull/3852)
-- Inject exports both partiy & web3 [#3851](https://github.com/paritytech/parity/pull/3851)
-- Let Webpack talk again [#3848](https://github.com/paritytech/parity/pull/3848)
-- AuthorityRound seal and simplify Generic seal Spec [#3843](https://github.com/paritytech/parity/pull/3843)
-- Signing transactions with rotating token [#3691](https://github.com/paritytech/parity/pull/3691)
-- Bump dev chain [#3835](https://github.com/paritytech/parity/pull/3835)
-- Spelling [#3839](https://github.com/paritytech/parity/pull/3839)
-- Email verification [#3766](https://github.com/paritytech/parity/pull/3766)
-- Network configuration for Ethereum Classic [#3812](https://github.com/paritytech/parity/pull/3812)
-- Using jsonrpc-macros [#3831](https://github.com/paritytech/parity/pull/3831)
-- Fixed bool dropdown in contract execution [#3823](https://github.com/paritytech/parity/pull/3823)
-- Avoid broadcasting transactions to peers that send them [#3796](https://github.com/paritytech/parity/pull/3796)
-- Eth_sign RPC now hashes given data instead of getting the hash [#3800](https://github.com/paritytech/parity/pull/3800)
-- Add store for MethodDecoding [#3821](https://github.com/paritytech/parity/pull/3821)
-- Add store for AddAddress [#3819](https://github.com/paritytech/parity/pull/3819)
-- Fix React-Router in i18n locale change [#3815](https://github.com/paritytech/parity/pull/3815)
-- Cache fetched Dapps [#3804](https://github.com/paritytech/parity/pull/3804)
-- Authors & homepage => Parity [#3818](https://github.com/paritytech/parity/pull/3818)
-- Rename Ethcore -> Parity Technologies [#3817](https://github.com/paritytech/parity/pull/3817)
-- Allow editing of gasPrice & gas in Signer [#3777](https://github.com/paritytech/parity/pull/3777)
-- I18n string dictionaries [#3532](https://github.com/paritytech/parity/pull/3532)
-- Fix padding in App [#3813](https://github.com/paritytech/parity/pull/3813)
-- Light server improvements and protocol adjustments [#3801](https://github.com/paritytech/parity/pull/3801)
-- Tolerate errors in user_defaults [#3810](https://github.com/paritytech/parity/pull/3810)
-- Block: enforce gas limit falls within engine bounds [#3809](https://github.com/paritytech/parity/pull/3809)
-- Target Babel to latest Chrome Versions in dev [#3806](https://github.com/paritytech/parity/pull/3806)
-- Lowercase npm packages [#3807](https://github.com/paritytech/parity/pull/3807)
-- Extended publishing of libraries to npm [#3786](https://github.com/paritytech/parity/pull/3786)
-- Several Fixes to the UI [#3799](https://github.com/paritytech/parity/pull/3799)
-- Remove "s [#3805](https://github.com/paritytech/parity/pull/3805)
-- Extract CSS to file in production builds [#3783](https://github.com/paritytech/parity/pull/3783)
-- Notify user on transaction received [#3782](https://github.com/paritytech/parity/pull/3782)
-- Removing all old entries from transaction queue [#3772](https://github.com/paritytech/parity/pull/3772)
-- Status page updates [#3774](https://github.com/paritytech/parity/pull/3774)
-- Allow modifications of gas when confirming in signer [#3798](https://github.com/paritytech/parity/pull/3798)
-- Network connectivity fixes [#3794](https://github.com/paritytech/parity/pull/3794)
-- Make *ID names consistent with std Rust (Id) [#3781](https://github.com/paritytech/parity/pull/3781)
-- Update CI builds [#3780](https://github.com/paritytech/parity/pull/3780)
-- Update AuthorityRound tests to new spec [#3790](https://github.com/paritytech/parity/pull/3790)
-- Fixes to the Wallet UI [#3787](https://github.com/paritytech/parity/pull/3787)
-- Add support for wallets without getOwner() interface [#3779](https://github.com/paritytech/parity/pull/3779)
-- Update Material-UI [#3785](https://github.com/paritytech/parity/pull/3785)
-- Fixes error in Transfer modal [#3788](https://github.com/paritytech/parity/pull/3788)
-- LES Part 3: Event handlers and handling responses [#3755](https://github.com/paritytech/parity/pull/3755)
-- Basic UI rendering tests [#3743](https://github.com/paritytech/parity/pull/3743)
-- Network: process packets only after connection handler finishes [#3776](https://github.com/paritytech/parity/pull/3776)
-- AuthorityRound network simulation test [#3778](https://github.com/paritytech/parity/pull/3778)
-- GasPrice selection for contract execution [#3770](https://github.com/paritytech/parity/pull/3770)
-- Reject existing transactions [#3762](https://github.com/paritytech/parity/pull/3762)
-- Allow autoRemove from api.subscribe based on callback return values [#3752](https://github.com/paritytech/parity/pull/3752)
-- Replace misplaced & with && in gitlab-ci.yml [#3753](https://github.com/paritytech/parity/pull/3753)
-- Lower gas usage for creating a Multisig Wallet [#3773](https://github.com/paritytech/parity/pull/3773)
-- Added IO service explicit stop [#3761](https://github.com/paritytech/parity/pull/3761)
-- Be lenient around invalid owners map [#3764](https://github.com/paritytech/parity/pull/3764)
-- GasEditor component [#3750](https://github.com/paritytech/parity/pull/3750)
-- Cleanups [#3742](https://github.com/paritytech/parity/pull/3742)
-- Update babel, fix CI build due to breaking changes [#3754](https://github.com/paritytech/parity/pull/3754)
-- Small fixes to contract [#3751](https://github.com/paritytech/parity/pull/3751)
-- Make engine hold AccountProvider [#3725](https://github.com/paritytech/parity/pull/3725)
-- Properly delete addresses/contracts in addressbook [#3739](https://github.com/paritytech/parity/pull/3739)
-- Display Wallet Owners Icons in Accounts list [#3741](https://github.com/paritytech/parity/pull/3741)
-- Edit Multisig Wallet settings [#3740](https://github.com/paritytech/parity/pull/3740)
-- Replace build directory completely [#3748](https://github.com/paritytech/parity/pull/3748)
-- Add existing release files before merge [#3747](https://github.com/paritytech/parity/pull/3747)
-- Release script back to using fetch/merge [#3746](https://github.com/paritytech/parity/pull/3746)
-- Update with -X only for merge [#3745](https://github.com/paritytech/parity/pull/3745)
-- Give accounts precedence over address_book entries [#3732](https://github.com/paritytech/parity/pull/3732)
-- Enable Panic=abort [#3423](https://github.com/paritytech/parity/pull/3423)
-- Cleanups on js-precompiled [#3738](https://github.com/paritytech/parity/pull/3738)
-- Add parity_removeAddress RPC [#3735](https://github.com/paritytech/parity/pull/3735)
-- Fix up the transaction JSON serialisation for RPC. [#3633](https://github.com/paritytech/parity/pull/3633)
-- Queue: CLI for auto-scaling and num verifiers [#3709](https://github.com/paritytech/parity/pull/3709)
-- Add functionalities to multi-sig wallet [#3729](https://github.com/paritytech/parity/pull/3729)
-- PropTypes as function call [#3731](https://github.com/paritytech/parity/pull/3731)
-- Unify proptypes in util/proptypes.js [#3728](https://github.com/paritytech/parity/pull/3728)
-- Bump jsonrpc-ipc-server to fix windows build [#3730](https://github.com/paritytech/parity/pull/3730)
-- LES Part 2 [#3527](https://github.com/paritytech/parity/pull/3527)
-- First draft of the MultiSig Wallet [#3700](https://github.com/paritytech/parity/pull/3700)
-- Engine block ordering [#3719](https://github.com/paritytech/parity/pull/3719)
-- Use fdlimit utility crate from crates.io [#3716](https://github.com/paritytech/parity/pull/3716)
-- Move decoding for contract deployment logic earlier [#3714](https://github.com/paritytech/parity/pull/3714)
-- Possible fix for queue drop deadlock [#3702](https://github.com/paritytech/parity/pull/3702)
-- Encode networkid as a u64. [#3713](https://github.com/paritytech/parity/pull/3713)
-- Use valid RLP in generic genesis seal spec [#3717](https://github.com/paritytech/parity/pull/3717)
-- Update JS dependencies [#3710](https://github.com/paritytech/parity/pull/3710)
-- Use Webpack Aliases [#3711](https://github.com/paritytech/parity/pull/3711)
-- Dapps-specific accounts [#3627](https://github.com/paritytech/parity/pull/3627)
-- Signer method parameter decoding & destination info [#3671](https://github.com/paritytech/parity/pull/3671)
-- Remove invalid slice test [#3712](https://github.com/paritytech/parity/pull/3712)
-- React library update [#3704](https://github.com/paritytech/parity/pull/3704)
-- New Loading Component for the UI [#3707](https://github.com/paritytech/parity/pull/3707)
-- Refactoring Transfer Modal [#3705](https://github.com/paritytech/parity/pull/3705)
-- Fix extra scrollbars in dapps [#3706](https://github.com/paritytech/parity/pull/3706)
-- Indent state tests [#3431](https://github.com/paritytech/parity/pull/3431)
-- Filter null transactions for display (not available on node) [#3698](https://github.com/paritytech/parity/pull/3698)
-- Move recovery phrase print button [#3697](https://github.com/paritytech/parity/pull/3697)
-- Fix padding bottom needed after fixed status [#3701](https://github.com/paritytech/parity/pull/3701)
-- Don't share the snapshot while downloading old blocks [#3695](https://github.com/paritytech/parity/pull/3695)
-- Button to print recovery phrase [#3694](https://github.com/paritytech/parity/pull/3694)
-- Fix status bar to bottom of the screen [#3692](https://github.com/paritytech/parity/pull/3692)
-- Splitting serialization of signTransaction and sendTransaction confirmation requests [#3642](https://github.com/paritytech/parity/pull/3642)
-- Implement basic badges/certifications/flair [#3665](https://github.com/paritytech/parity/pull/3665)
-- Simplify Container title rendering [#3680](https://github.com/paritytech/parity/pull/3680)
-- Update loading splash to fit in with l&f [#3685](https://github.com/paritytech/parity/pull/3685)
-- Safari UI fixes [#3678](https://github.com/paritytech/parity/pull/3678)
-- Remove strict mode for DappReg (work-around for package upgrade) [#3681](https://github.com/paritytech/parity/pull/3681)
-- Bumping clippy [#3654](https://github.com/paritytech/parity/pull/3654)
-- Return of the Fat DB [#3636](https://github.com/paritytech/parity/pull/3636)
-- Invalidate blocks from future [#3652](https://github.com/paritytech/parity/pull/3652)
-- Make Modal always scrollable [#3667](https://github.com/paritytech/parity/pull/3667)
-- Display local/completed transactions [#3630](https://github.com/paritytech/parity/pull/3630)
-- Added build-essential dep to dockerfiles [#3666](https://github.com/paritytech/parity/pull/3666)
-- Strict config parsing (uknown keys are rejected) [#3663](https://github.com/paritytech/parity/pull/3663)
-- Strict deserialization [#3662](https://github.com/paritytech/parity/pull/3662)
-- Disable peer if no common block found [#3655](https://github.com/paritytech/parity/pull/3655)
-- Show snackbar on password change [#3661](https://github.com/paritytech/parity/pull/3661)
-- Bring back PV62 support [#3660](https://github.com/paritytech/parity/pull/3660)
-- Unlock expecting quantity [#3659](https://github.com/paritytech/parity/pull/3659)
-- Update Webpack => v2 [#3643](https://github.com/paritytech/parity/pull/3643)
-- Update SMS verification [#3579](https://github.com/paritytech/parity/pull/3579)
-- Simplify tx confirmations display [#3559](https://github.com/paritytech/parity/pull/3559)
-- Fixes overflow in Signer tx data [#3657](https://github.com/paritytech/parity/pull/3657)
-- Fixed tab bar not updating [#3653](https://github.com/paritytech/parity/pull/3653)
-- Set default min tx price to $0.0025 [#3617](https://github.com/paritytech/parity/pull/3617)
-- Use accountsInfo instead of eth_accounts for first check [#3618](https://github.com/paritytech/parity/pull/3618)
-- Fix Copy to Clipboard Snackbar [#3619](https://github.com/paritytech/parity/pull/3619)
-- Manually add \r to Windows phrases pre 1.4.5 [#3615](https://github.com/paritytech/parity/pull/3615)
-- Signer layouts to flexbox [#3600](https://github.com/paritytech/parity/pull/3600)
-- Fixing wrong tokens type in Redux store [#3621](https://github.com/paritytech/parity/pull/3621)
-- Add dappreg link to apps list [#3568](https://github.com/paritytech/parity/pull/3568)
-- Smarter balance fetching [#3605](https://github.com/paritytech/parity/pull/3605)
-- Dapp iframe allow forms, allow target=_blank [#3597](https://github.com/paritytech/parity/pull/3597)
-- Align copy button to input field [#3604](https://github.com/paritytech/parity/pull/3604)
-- Appending logs by default [#3609](https://github.com/paritytech/parity/pull/3609)
-- Update test, fix number. [#3612](https://github.com/paritytech/parity/pull/3612)
-- Fixing phrases generated on windows [#3614](https://github.com/paritytech/parity/pull/3614)
-- Check for network ID for live/test matching [#3602](https://github.com/paritytech/parity/pull/3602)
-- Always insert traces for genesis. [#3603](https://github.com/paritytech/parity/pull/3603)
-- Real deleting accounts [#3540](https://github.com/paritytech/parity/pull/3540)
-- Trim whitespace from input recovery phrase [#3599](https://github.com/paritytech/parity/pull/3599)
-- Fix local tx requests  [#3589](https://github.com/paritytech/parity/pull/3589)
-- Fix CPU usage when idle [#3592](https://github.com/paritytech/parity/pull/3592)
-- Don't fetch balances on every new block if syncing [#3591](https://github.com/paritytech/parity/pull/3591)
-- Work around WS in UI [#3587](https://github.com/paritytech/parity/pull/3587)
-- CLI option to disable ancient block downloading [#3573](https://github.com/paritytech/parity/pull/3573)
-- Move Signer balance queries to store for component-wide re-use [#3531](https://github.com/paritytech/parity/pull/3531)
-- Fix wrong method name in `contract.js` [#3580](https://github.com/paritytech/parity/pull/3580)
-- Smarter Tokens fetching [#3546](https://github.com/paritytech/parity/pull/3546)
-- Fix panic on importing own invalid transaction [#3550](https://github.com/paritytech/parity/pull/3550)
-- Use an adaptive number of threads in the verification queue [#2445](https://github.com/paritytech/parity/pull/2445)
-- Faster UI - React Tweaks [#3555](https://github.com/paritytech/parity/pull/3555)
-- Send value & contract execute gas limit warnings [#3512](https://github.com/paritytech/parity/pull/3512)
-- Add TxQueue visibility specifier (not added between merges) [#3566](https://github.com/paritytech/parity/pull/3566)
-- DappRegistry [#3405](https://github.com/paritytech/parity/pull/3405)
-- Import account message [#3552](https://github.com/paritytech/parity/pull/3552)
-- --testnet set to ropsten [#3551](https://github.com/paritytech/parity/pull/3551)
-- Fix flaky test [#3547](https://github.com/paritytech/parity/pull/3547)
-- Sms verification code style [#3564](https://github.com/paritytech/parity/pull/3564)
-- [Registry] Clear input and working buttons [#3563](https://github.com/paritytech/parity/pull/3563)
-- Fix peers not displaying [#3561](https://github.com/paritytech/parity/pull/3561)
-- New registry contract address for ropsten [#3549](https://github.com/paritytech/parity/pull/3549)
-- Use contract Registry fee, not a hard-coded value [#3554](https://github.com/paritytech/parity/pull/3554)
-- Don't query chain in Signer, use Redux isTest [#3524](https://github.com/paritytech/parity/pull/3524)
-- Moving fetching of hash-addressed dapps/content to separate crate. [#3543](https://github.com/paritytech/parity/pull/3543)
-- Ropsten network [#3539](https://github.com/paritytech/parity/pull/3539)
-- Add simple one-line installer to README.md [#3534](https://github.com/paritytech/parity/pull/3534)
-- Propagations & local transactions tracking [#3491](https://github.com/paritytech/parity/pull/3491)
-- Correct format of eth_signTransaction [#3503](https://github.com/paritytech/parity/pull/3503)
-- ABI can be empty and auto-fill contract name [#3518](https://github.com/paritytech/parity/pull/3518)
-- Fix versions for NPM [#3516](https://github.com/paritytech/parity/pull/3516)
-- Better GHH event display & tracking [#3498](https://github.com/paritytech/parity/pull/3498)
-- Dapp section & visibility changes [#3438](https://github.com/paritytech/parity/pull/3438)
-- Fix parity.js badly built [#3526](https://github.com/paritytech/parity/pull/3526)
-- Updated the european warp bootnode addresses [#3528](https://github.com/paritytech/parity/pull/3528)
-- Limit sync reorg to 20 blocks [#3519](https://github.com/paritytech/parity/pull/3519)
-- Revert "Limit sync reorganization to 20 blocks" [#3517](https://github.com/paritytech/parity/pull/3517)
-- Check transaction signature when adding to the queue [#3508](https://github.com/paritytech/parity/pull/3508)
-- Limit sync reorganization to 20 blocks [#3509](https://github.com/paritytech/parity/pull/3509)
-- Keep track of block gasLimit [#3506](https://github.com/paritytech/parity/pull/3506)
-- Smarter Status Polling [#3504](https://github.com/paritytech/parity/pull/3504)
-- Handle solc combined output [#3496](https://github.com/paritytech/parity/pull/3496)
-- Wallet names shouldn't use UUID [#3481](https://github.com/paritytech/parity/pull/3481)
-- Make parity.js usable by Node and Browser [#3475](https://github.com/paritytech/parity/pull/3475)
-- Sms verification modal [#3336](https://github.com/paritytech/parity/pull/3336)
-- Sudo -c is not supported on Mac [#3488](https://github.com/paritytech/parity/pull/3488)
-- Add trace_{call, rawTransaction, replayTransaction} [#3492](https://github.com/paritytech/parity/pull/3492)
-- Check for possible panics in scrypt key derivation [#3490](https://github.com/paritytech/parity/pull/3490)
-- Sync traffic optimization [#3477](https://github.com/paritytech/parity/pull/3477)
-- Wallet files shouldn't give away the address [#3378](https://github.com/paritytech/parity/pull/3378)
-- Fixing tests, fixing refreshing precompiled [#3483](https://github.com/paritytech/parity/pull/3483)
-- Better Errors Snackbar in UI [#3478](https://github.com/paritytech/parity/pull/3478)
-- Handle Signer Rejection [#3476](https://github.com/paritytech/parity/pull/3476)
-- Enhanced MethodDecoding in Transactions list [#3454](https://github.com/paritytech/parity/pull/3454)
-- Signer new-token generates a link and opens browser [#3379](https://github.com/paritytech/parity/pull/3379)
-- Make tokenreg dapp fast again [#3474](https://github.com/paritytech/parity/pull/3474)
-- Build fix [#3470](https://github.com/paritytech/parity/pull/3470)
-- Display deployed Basic token addresses [#3447](https://github.com/paritytech/parity/pull/3447)
-- Export accounts as JSON or CSV [#2866](https://github.com/paritytech/parity/pull/2866)
-- Set HF2 block number [#3466](https://github.com/paritytech/parity/pull/3466)
-- Better word list for secret phrase generation [#3461](https://github.com/paritytech/parity/pull/3461)
-- Drop spec when no longer useful [#3460](https://github.com/paritytech/parity/pull/3460)
-- Add fallback check in ABI validation [#3459](https://github.com/paritytech/parity/pull/3459)
-- Save sort order in LocalStorage [#3457](https://github.com/paritytech/parity/pull/3457)
-- Adds onPaste event to Inputs [#3456](https://github.com/paritytech/parity/pull/3456)
-- Update signer to take care of text overflows [#3450](https://github.com/paritytech/parity/pull/3450)
-- Authority round consensus engine [#3426](https://github.com/paritytech/parity/pull/3426)
-- Fix transfer token decimal calculation [#3445](https://github.com/paritytech/parity/pull/3445)
-- Restrict max code size for EIP-150 and after. [#3363](https://github.com/paritytech/parity/pull/3363)
-- Contract queries should display IdentityIcons [#3453](https://github.com/paritytech/parity/pull/3453)
-- Use Babel in vendor when needed [#3451](https://github.com/paritytech/parity/pull/3451)
-- Use signature of functions instead of names [#3448](https://github.com/paritytech/parity/pull/3448)
-- Handle contract constructor inputs [#3430](https://github.com/paritytech/parity/pull/3430)
-- Use Contract owner for unregistering Token [#3446](https://github.com/paritytech/parity/pull/3446)
-- Create directories only if feature is enabled [#3442](https://github.com/paritytech/parity/pull/3442)
-- Import AddresBook from exported JSON [#3433](https://github.com/paritytech/parity/pull/3433)
-- Scrollable accounts in autocomplete [#3427](https://github.com/paritytech/parity/pull/3427)
-- Bump ws-rs [#3428](https://github.com/paritytech/parity/pull/3428)
-- Swap TokenReg dapp from base to decimals [#3425](https://github.com/paritytech/parity/pull/3425)
-- Change beta builds to stable on Travis [#3421](https://github.com/paritytech/parity/pull/3421)
-- Refactor copy to clipboard functionality [#3420](https://github.com/paritytech/parity/pull/3420)
-- Dev chain [#3385](https://github.com/paritytech/parity/pull/3385)
-- Fetch known code from the database during restoration [#3377](https://github.com/paritytech/parity/pull/3377)
-- Fixing benches [#3422](https://github.com/paritytech/parity/pull/3422)
-- Fix chainspec storage field. [#3406](https://github.com/paritytech/parity/pull/3406)
-- Abort snapshot restoration faster [#3356](https://github.com/paritytech/parity/pull/3356)
-- Remove addresses, display non-refundable warning on registries [#3403](https://github.com/paritytech/parity/pull/3403)
-- Don't auto-unsubscribe when subscriber callback throws [#3401](https://github.com/paritytech/parity/pull/3401)
-- Fix dapp account selection [#3399](https://github.com/paritytech/parity/pull/3399)
-- Fix travis build: remove unused import [#3381](https://github.com/paritytech/parity/pull/3381)
-- Optimize memory footprint [#3376](https://github.com/paritytech/parity/pull/3376)
-- Fixing parsing passwords from file [#3367](https://github.com/paritytech/parity/pull/3367)
-- Remove some unwraps from parity/helpers [#3364](https://github.com/paritytech/parity/pull/3364)
-- Load external, builtin & local apps in parallel [#3340](https://github.com/paritytech/parity/pull/3340)
-- Solidity Compiler in UI [#3279](https://github.com/paritytech/parity/pull/3279)
-- Determine real-time HTTP connected status [#3335](https://github.com/paritytech/parity/pull/3335)
-- Clarify error message about disabled Signer [#3359](https://github.com/paritytech/parity/pull/3359)
-- Cater for home.parity hostname in dappsUrl [#3341](https://github.com/paritytech/parity/pull/3341)
-- Make sure Token is ECR20 [#3347](https://github.com/paritytech/parity/pull/3347)
-- [TokenReg dApp] Fixed Unregister for Contract Owner only [#3346](https://github.com/paritytech/parity/pull/3346)
-- LES Part 1 [#3322](https://github.com/paritytech/parity/pull/3322)
-- Make transactions load [#3348](https://github.com/paritytech/parity/pull/3348)
-- Manual bump package.json [#3345](https://github.com/paritytech/parity/pull/3345)
-- Windows app and installer fixes [#3338](https://github.com/paritytech/parity/pull/3338)
-- Fix JS API test [#3342](https://github.com/paritytech/parity/pull/3342)
-- Git pre-push checks for UI [#3072](https://github.com/paritytech/parity/pull/3072)
-- Disarm the HF and add more bootnodes [#3323](https://github.com/paritytech/parity/pull/3323)
-- Default contract type on UI [#3310](https://github.com/paritytech/parity/pull/3310)
-- In-browser signing support [#3231](https://github.com/paritytech/parity/pull/3231)
-- Handle redirects from /api/content on manifest.json gracefully [#3315](https://github.com/paritytech/parity/pull/3315)
-- Dapps interface RPC [#3311](https://github.com/paritytech/parity/pull/3311)
-- Additional snapshot sync checks [#3318](https://github.com/paritytech/parity/pull/3318)
-- Fix spurious signer tests failures [#3312](https://github.com/paritytech/parity/pull/3312)
-- Fix signer token updates [#3302](https://github.com/paritytech/parity/pull/3302)
-- Update account recovery phrase hint [#3316](https://github.com/paritytech/parity/pull/3316)
-- New transaction tests [#3313](https://github.com/paritytech/parity/pull/3313)
-- Remove 127.0.0.1 references [#3303](https://github.com/paritytech/parity/pull/3303)
-- Fix for opening UI after installation on mac [#3300](https://github.com/paritytech/parity/pull/3300)
-- Fixed uncle query [#3299](https://github.com/paritytech/parity/pull/3299)
-- Updated blance display with max decimals [#3266](https://github.com/paritytech/parity/pull/3266)
-- Refactoring Signer to auto_args + eth_signTransaction [#3261](https://github.com/paritytech/parity/pull/3261)
-- Fix typo [#3298](https://github.com/paritytech/parity/pull/3298)
-- Change to more common focused spelling [#3264](https://github.com/paritytech/parity/pull/3264)
-- Manual bump of package.json (recovery) [#3295](https://github.com/paritytech/parity/pull/3295)
-- Fix initial token generation [#3289](https://github.com/paritytech/parity/pull/3289)
-- Fixed IO service shutdown [#3286](https://github.com/paritytech/parity/pull/3286)
-- Autostart setting for windows tray app [#3269](https://github.com/paritytech/parity/pull/3269)
-- Fixes for 1.4 [#3260](https://github.com/paritytech/parity/pull/3260)
-- Build tray app for x64 [#3255](https://github.com/paritytech/parity/pull/3255)
-- Add secure flag back [#3244](https://github.com/paritytech/parity/pull/3244)
-- Verify chunk hashes in cli restore [#3241](https://github.com/paritytech/parity/pull/3241)
-- Load network apps manifests as contentHash (no coding) [#3235](https://github.com/paritytech/parity/pull/3235)
-- Fixed some typos [#3236](https://github.com/paritytech/parity/pull/3236)
-- Rename cli and config options signer->ui [#3232](https://github.com/paritytech/parity/pull/3232)
-- Add store for dapps state [#3211](https://github.com/paritytech/parity/pull/3211)
-- Fix first-time tagging of contracts [#3222](https://github.com/paritytech/parity/pull/3222)
-- Fix /parity-utils/{web3,parity}.js webpack errors [#3221](https://github.com/paritytech/parity/pull/3221)
-- Improve 'invalid raw key' error msg [#3219](https://github.com/paritytech/parity/pull/3219)
-- Cleaning up polluted namespaces [#3143](https://github.com/paritytech/parity/pull/3143)
-- Set passive mode for first run only [#3214](https://github.com/paritytech/parity/pull/3214)
-- Parity configuration settings, i.e. mode [#3212](https://github.com/paritytech/parity/pull/3212)
-- Ethash unsafety cleanup [#3210](https://github.com/paritytech/parity/pull/3210)
-- Mode improvements for UI [#3109](https://github.com/paritytech/parity/pull/3109)
-- Delay bomb for Classic (ECIP-1010) [#3179](https://github.com/paritytech/parity/pull/3179)
-- Use ethcore_dappsPort when constructing URLs [#3139](https://github.com/paritytech/parity/pull/3139)
-- Add copy address button to Contract deploy [#3199](https://github.com/paritytech/parity/pull/3199)
-- Expose Parity api as window.secureApi [#3207](https://github.com/paritytech/parity/pull/3207)
-- Add error for sendRawTransaction and estimateGas [#3194](https://github.com/paritytech/parity/pull/3194)
-- Exposing engine extra info in block RPC [#3169](https://github.com/paritytech/parity/pull/3169)
-- V1.5 [#3195](https://github.com/paritytech/parity/pull/3195)
-- Remove dapp logos (GHH points to dapp-assets) [#3192](https://github.com/paritytech/parity/pull/3192)
-- Fixing possible race in ethcore_hashContent [#3191](https://github.com/paritytech/parity/pull/3191)
-- Bump package.json version (1.5 is master) [#3193](https://github.com/paritytech/parity/pull/3193)
-
-## Parity [v1.4.10](https://github.com/paritytech/parity/releases/tag/v1.4.10) (2017-01-18)
-
-Parity 1.4.10 is a first stable release of 1.4.x series. It includes a few minor networking fixes.
-
-- Gas_limit for blocks, mined by Parity will be divisible by 37 (#4154) [#4179](https://github.com/paritytech/parity/pull/4179)
-  - gas_limit for new blocks will divide evenly by 13
-  - increased PARITY_GAS_LIMIT_DETERMINANT to 37
-  - separate method for marking mined block
-  - debug_asserts(gas_limit within protocol range)
-  - round_block_gas_limit method is now static
-  - made round_block_gas_limit free-function
-  - multiplier->multiple
-- Backporing to 1.4.10-stable [#4110](https://github.com/paritytech/parity/pull/4110)
-  - Bump to v1.4.10
-  - No reorg limit for ancient blocks
-  - Update registration after every write
-
-## Parity [v1.4.9](https://github.com/paritytech/parity/releases/tag/v1.4.9) (2017-01-09)
-
-This fixes an issue introduced in 1.4.8 that causes Parity to panic on propagating transactions in some cases.
-
-- v1.4.9 in beta [#4097](https://github.com/paritytech/parity/pull/4097)
-  - Bump to v1.4.9
-  - Disable armv6 build
-- beta Fix queue deadlock [#4095](https://github.com/paritytech/parity/pull/4095)
-- Fix rebroadcast panic beta [#4085](https://github.com/paritytech/parity/pull/4085)
-  - fix compile
-  - fix backport
-  - clean up old method
-  - remove unnecessary reference
-  - simplify
-  - Fixing 'simplify'
-
-## Parity [v1.4.8](https://github.com/paritytech/parity/releases/tag/v1.4.8) (2017-01-06)
-
-Ethereum Classic Hard Fork ready release containing various bugfixes:
-
-- Fix for excessive transactions propagation
-- Fix for inconsistent `logIndex` in transaction receipts
-
-See [full list of changes](https://github.com/paritytech/parity/compare/v1.4.7...v1.4.8):
-
-- Beta backports [#4067](https://github.com/paritytech/parity/pull/4067)
-- Re-broadcast transactions to few random peers on each new block. (#4054) [#4061](https://github.com/paritytech/parity/pull/4061)
-- Tolerate errors in user_defaults [#4060](https://github.com/paritytech/parity/pull/4060)
-- ETC Config change backport [#4056](https://github.com/paritytech/parity/pull/4056)
-- [beta] Avoid re-broadcasting transactions on each block [#4047](https://github.com/paritytech/parity/pull/4047)
-- Beta Backports [#4012](https://github.com/paritytech/parity/pull/4012)
-
-## Parity [v1.4.7](https://github.com/paritytech/parity/releases/tag/v1.4.7) (2016-12-27)
-
-This maintenance release fixes an issue with sync falling behind occasionally.
-
-- Backporting to beta [#3980](https://github.com/paritytech/parity/pull/3980)
-- [beta] enforce gas limit falls within engine bounds [#3816](https://github.com/paritytech/parity/pull/3816)
-
-
-## Parity [v1.3.15](https://github.com/paritytech/parity/releases/tag/v1.3.15) (2016-12-10)
-
-This patch release fixes an issue with syncing on the Ropsten test network.
-
-- Backporting to stable [#3793](https://github.com/paritytech/parity/pull/3793)
-
-## Parity [v1.4.6](https://github.com/paritytech/parity/releases/tag/v1.4.6) (2016-12-05)
-
-This patch release fixes an issue with syncing on the Ropsten test network.
-
-- Backporting to beta [#3718](https://github.com/paritytech/parity/pull/3718)
-- [beta] scrollable contract deploy & execute modals [#3656](https://github.com/paritytech/parity/pull/3656)
-
-## Parity [v1.4.5](https://github.com/paritytech/parity/releases/tag/v1.4.5) (2016-11-26)
-
-1.4.5 release fixes a number of issues, notably:
-- High CPU usage when idle.
-- Key recovery phrases generated on windows now can be imported.
-
-#### Configuration changes
-- `--usd-per-tx` is now set to 0.0025 by default.
-
-#### New features
-- Support for Ropsten test network is introduced with `--chain=ropsten` or `--testnet`. Morden network is still available via `--chain=morden`
-
-#### Full changes
-- [beta] Pin package versions for React [#3628](https://github.com/paritytech/parity/pull/3628)
-- Backporting to beta [#3623](https://github.com/paritytech/parity/pull/3623)
-- [beta] Ropsten chain for UI [#3622](https://github.com/paritytech/parity/pull/3622)
-
-## Parity [v1.3.14](https://github.com/paritytech/parity/releases/tag/v1.3.14) (2016-11-25)
-
-Parity 1.3.14 fixes a few stability issues and adds support for the Ropsten testnet.
-
-- Backporting to stable [#3616](https://github.com/paritytech/parity/pull/3616)
-
-## Parity [v1.4.4](https://github.com/paritytech/parity/releases/tag/v1.4.4) (2016-11-18)
-
-This is a maintenance release that fixes an issue with EIP-155 transactions being added to the transaction pool. It also improves syncing stability and resolved a number of UI issues.
-Full changelog is available [here.](https://github.com/paritytech/parity/commit/3e0d033eaf789cfdf517f4a97effc500f1f9263b)
-
-- [beta] apps typo fix [#3533](https://github.com/paritytech/parity/pull/3533)
-- Backporting to beta [#3525](https://github.com/paritytech/parity/pull/3525)
-
-## Parity [v1.3.13](https://github.com/paritytech/parity/releases/tag/v1.3.13) (2016-11-18)
-
-This release fixes an issue with EIP-155 transactions being allowed into the transaction pool.
-
-- [stable] Check tx signatures before adding to the queue. [#3521](https://github.com/paritytech/parity/pull/3521)
-- Fix Stable Docker Build [#3479](https://github.com/paritytech/parity/pull/3479)
-
-## Parity [v1.4.3](https://github.com/paritytech/parity/releases/tag/v1.4.3) (2016-11-16)
-
-This release includes memory footprint optimization as well as a few fixes in the UI.
-EIP-155/160/161/170 hardfork is enabled at block 2675000 (1885000 for test network).
-Full changelog is available [here.](https://github.com/paritytech/parity/compare/v1.4.2...v1.4.3)
-
-- [beta] EIP-170 [#3464](https://github.com/paritytech/parity/pull/3464)
-- Backports to beta [#3465](https://github.com/paritytech/parity/pull/3465)
-- Backport: additional fields on transaction and receipt [#3463](https://github.com/paritytech/parity/pull/3463)
-- v1.4.3 in beta [#3424](https://github.com/paritytech/parity/pull/3424)
-
-
-## Parity [v1.3.12](https://github.com/paritytech/parity/releases/tag/v1.3.12) (2016-11-16)
-
-This stable release enables EIP-155/160/161/170 hardfork at block 2675000 (1885000 for test network).
-
-- [stable] EIP-170 [#3462](https://github.com/paritytech/parity/pull/3462)
-- #3035 Backport to stable [#3441](https://github.com/paritytech/parity/pull/3441)
-
-## Parity [v1.3.11](https://github.com/paritytech/parity/releases/tag/v1.3.11) (2016-11-11)
-
-This is a maintenance release for the stable series to delay the EIP-155/160/161 hard fork transition. **Update from 1.3.10 is mandatory**. It also deprecates and disables the old Parity UI.
-
-- [stable] Disable HF and UI  [#3372](https://github.com/paritytech/parity/pull/3372)
-- [stable] EIP-155 update with Vitalik's new test vectors (#3166) [#3190](https://github.com/paritytech/parity/pull/3190)
-- Backport EIP-150 to stable [#2672](https://github.com/paritytech/parity/pull/2672)
-- Create gitlab-ci.yml for stable [#2517](https://github.com/paritytech/parity/pull/2517)
-
-## Parity [v1.4.2](https://github.com/paritytech/parity/releases/tag/v1.4.2) (2016-11-10)
-
-This release fixes a few additional issues:
-- Parity now correctly handles external `--dapps-interface` and  `--ui-interface` in the UI.
-- Crash in `eth_getUncle*` has been fixed.
-- macOS installer now includes an uninstall script.
-- Security token input UI has been fixed.
-- Correct display for tokens with minimum decimals.
-
-And some additional minor changes. Full changelog is [available](https://github.com/paritytech/parity/compare/v1.4.1...v1.4.2)
-- Backporting to beta [#3344](https://github.com/paritytech/parity/pull/3344)
-- Backporting to beta [#3324](https://github.com/paritytech/parity/pull/3324)
-
-## Parity [v1.4.1](https://github.com/paritytech/parity/releases/tag/v1.4.1) (2016-11-09)
-
-This is a hotfix release to address a couple of issues with 1.4.0:
-
-- UI token is requested instead of being supplied automatically.
-- Running with `--geth` results in an error.
-
-- Backporting to beta [#3293](https://github.com/paritytech/parity/pull/3293)
-
-## Parity [v1.4.0](https://github.com/paritytech/parity/releases/tag/v1.4.0) (2016-11-07)
-
-First beta release of the 1.4 series.
-
-This includes the new Parity Wallet and Warp-Sync synchronisation as well as several optimisations and fixes.
-
-- Add secure flag back [#3246](https://github.com/paritytech/parity/pull/3246)
-- [BETA] verify chunk hashes in cli restore [#3242](https://github.com/paritytech/parity/pull/3242)
-- Backporting to beta [#3239](https://github.com/paritytech/parity/pull/3239)
-- UI fixes backporting [#3234](https://github.com/paritytech/parity/pull/3234)
-- Backporting to beta [#3229](https://github.com/paritytech/parity/pull/3229)
-- Beta branch cleanup [#3226](https://github.com/paritytech/parity/pull/3226)
-- [beta] Set passive mode for first run only (#3214) [#3216](https://github.com/paritytech/parity/pull/3216)
-- Mode configuration backported to beta [#3213](https://github.com/paritytech/parity/pull/3213)
-- Backporting [#3198](https://github.com/paritytech/parity/pull/3198)
-- [beta] EIP-155 update with Vitalik's new test vectors (#3166) [#3189](https://github.com/paritytech/parity/pull/3189)
-- Backporting to beta [#3176](https://github.com/paritytech/parity/pull/3176)
-- parity-ui-precompiled pinned to beta [#3168](https://github.com/paritytech/parity/pull/3168)
-- EIP-155 update with Vitalik's new test vectors [#3166](https://github.com/paritytech/parity/pull/3166)
-- Push precompiled for beta/stable, npm only master [#3163](https://github.com/paritytech/parity/pull/3163)
-- Back to real root after npm publish [#3178](https://github.com/paritytech/parity/pull/3178)
-- Remove extra cd js [#3177](https://github.com/paritytech/parity/pull/3177)
-- Fixes Gas price selection bug [#3175](https://github.com/paritytech/parity/pull/3175)
-- Exposing state root and logsBloom in RPC receipts [#3174](https://github.com/paritytech/parity/pull/3174)
-- Exposing v,r,s from transaction signature in RPC [#3172](https://github.com/paritytech/parity/pull/3172)
-- Enabling personal RPC over IPC by default [#3165](https://github.com/paritytech/parity/pull/3165)
-- Gitlab CI badge [#3164](https://github.com/paritytech/parity/pull/3164)
-- Dependencies in README [#3162](https://github.com/paritytech/parity/pull/3162)
-- Make the footer a bit less ugly. [#3160](https://github.com/paritytech/parity/pull/3160)
-- Linux build case sensitivity fix [#3161](https://github.com/paritytech/parity/pull/3161)
-- abbreviated enode, `CopyToClipboard` component [#3131](https://github.com/paritytech/parity/pull/3131)
-- EIPs 155, 160, 161 [#2976](https://github.com/paritytech/parity/pull/2976)
-- beta reset to 1.4.0 [#3157](https://github.com/paritytech/parity/pull/3157)
-- Fix histogram [#3150](https://github.com/paritytech/parity/pull/3150)
-- Remove network label from TabBar [#3142](https://github.com/paritytech/parity/pull/3142)
-- Speed up unresponsive Contract events & Account transactions [#3145](https://github.com/paritytech/parity/pull/3145)
-- Better windows shortcut [#3147](https://github.com/paritytech/parity/pull/3147)
-- Redirect content to the same address as requested [#3133](https://github.com/paritytech/parity/pull/3133)
-- Fixed peer ping timeout [#3137](https://github.com/paritytech/parity/pull/3137)
-- Fix for windows build [#3125](https://github.com/paritytech/parity/pull/3125)
-- Fix AddessInput icon position [#3132](https://github.com/paritytech/parity/pull/3132)
-- Fixed not scrollable accounts in tokenreg dapp [#3128](https://github.com/paritytech/parity/pull/3128)
-- Returning cache headers for network content [#3123](https://github.com/paritytech/parity/pull/3123)
-- Optimise contract events display [#3120](https://github.com/paritytech/parity/pull/3120)
-- Add basic validation for contract execute values [#3118](https://github.com/paritytech/parity/pull/3118)
-- Dapps errors embeddable on signer [#3115](https://github.com/paritytech/parity/pull/3115)
-- Use enode RPC in UI [#3108](https://github.com/paritytech/parity/pull/3108)
-- Windows tray app [#3103](https://github.com/paritytech/parity/pull/3103)
-- Displaying CLI errors on stderr [#3116](https://github.com/paritytech/parity/pull/3116)
-- new InputAddressSelect component [#3071](https://github.com/paritytech/parity/pull/3071)
-- Bump mio [#3117](https://github.com/paritytech/parity/pull/3117)
-- Minor typo fixed. [#3110](https://github.com/paritytech/parity/pull/3110)
-- Sort by ETH balance and contract by date [#3107](https://github.com/paritytech/parity/pull/3107)
-- Add RPC enode lookup [#3096](https://github.com/paritytech/parity/pull/3096)
-- Initializing logger for each command [#3090](https://github.com/paritytech/parity/pull/3090)
-- Allow registration of content bundles in GitHubHint [#3094](https://github.com/paritytech/parity/pull/3094)
-- Add read-only inputs to UI plus Copy to Clipboard buttons [#3095](https://github.com/paritytech/parity/pull/3095)
-- Allow boolean dropdowns for contract deploy [#3077](https://github.com/paritytech/parity/pull/3077)
-- Add mac installer files [#2995](https://github.com/paritytech/parity/pull/2995)
-- Fixing dapps sorting [#3086](https://github.com/paritytech/parity/pull/3086)
-- Add a Gitter chat badge to README.md [#3092](https://github.com/paritytech/parity/pull/3092)
-- Fixes webpack HTML loader [#3089](https://github.com/paritytech/parity/pull/3089)
-- Redirecting /home to new UI [#3084](https://github.com/paritytech/parity/pull/3084)
-- Allow GitHubHint content owner to update url [#3083](https://github.com/paritytech/parity/pull/3083)
-- Remove token assets (moved to ethcore/dapps-assets) [#3082](https://github.com/paritytech/parity/pull/3082)
-- Goodbye Gavcoin, Hello Gavcoin [#3080](https://github.com/paritytech/parity/pull/3080)
-- Load network dapps [#3078](https://github.com/paritytech/parity/pull/3078)
-- Swap account phrase input to normal (non-multiline) [#3060](https://github.com/paritytech/parity/pull/3060)
-- Fix minor typo in informant [#3056](https://github.com/paritytech/parity/pull/3056)
-- Warp sync status display [#3045](https://github.com/paritytech/parity/pull/3045)
-- Enhance address input [#3065](https://github.com/paritytech/parity/pull/3065)
-- Go to Accounts Page if Tooltips are displayed [#3063](https://github.com/paritytech/parity/pull/3063)
-- Change contract Execute bool values & query bool value display [#3024](https://github.com/paritytech/parity/pull/3024)
-- Update Parity logo [#3036](https://github.com/paritytech/parity/pull/3036)
-- settings: replace background patterns (inline) [#3047](https://github.com/paritytech/parity/pull/3047)
-- Multiple line description for dapps [#3058](https://github.com/paritytech/parity/pull/3058)
-- Fix status log order [#3062](https://github.com/paritytech/parity/pull/3062)
-- Graphical gas price selection [#2898](https://github.com/paritytech/parity/pull/2898)
-- [Registry dApp] Actions not available before selecting accounts [#3032](https://github.com/paritytech/parity/pull/3032)
-- apply post-consolidation migrations after consolidating [#3020](https://github.com/paritytech/parity/pull/3020)
-- fix chain badge padding [#3046](https://github.com/paritytech/parity/pull/3046)
-- Don't delete Tags input on blur (eg. tab) [#3044](https://github.com/paritytech/parity/pull/3044)
-- Fixing last hashes for ethcall [#3043](https://github.com/paritytech/parity/pull/3043)
-- Remove signer icons [#3039](https://github.com/paritytech/parity/pull/3039)
-- execute periodic snapshot in new thread [#3029](https://github.com/paritytech/parity/pull/3029)
-- fix background of embedded signer [#3026](https://github.com/paritytech/parity/pull/3026)
-- registry dapp: fix reducer [#3028](https://github.com/paritytech/parity/pull/3028)
-- Replace Execute by Query in contract button [#3031](https://github.com/paritytech/parity/pull/3031)
-- Fixing GavCoin dApp overflow issues [#3030](https://github.com/paritytech/parity/pull/3030)
-- execute contract function: validate address [#3013](https://github.com/paritytech/parity/pull/3013)
-- Align tag inputs with other input boxes [#2965](https://github.com/paritytech/parity/pull/2965)
-- Sweep panickers from IO and network [#3018](https://github.com/paritytech/parity/pull/3018)
-- Terms & Conditions [#3019](https://github.com/paritytech/parity/pull/3019)
-- open column families after reparing db corruption [#3017](https://github.com/paritytech/parity/pull/3017)
-- Snapshot sync and block gap info in `eth_syncing` [#2948](https://github.com/paritytech/parity/pull/2948)
-- personal_ RPCs to AutoArgs [#3000](https://github.com/paritytech/parity/pull/3000)
-- RPCs for mode change [#3002](https://github.com/paritytech/parity/pull/3002)
-- Fix a test sensitive to slow execution. [#3014](https://github.com/paritytech/parity/pull/3014)
-- Fixes search filtering issues [#3011](https://github.com/paritytech/parity/pull/3011)
-- Restart sync if no more peers with snapshots [#3007](https://github.com/paritytech/parity/pull/3007)
-- Allow empty/non-existant input arrays for ABIs in contract view [#3001](https://github.com/paritytech/parity/pull/3001)
-- Allow operation when no registry is available [#2980](https://github.com/paritytech/parity/pull/2980)
-- Make JS lint & test run on Travis [#2894](https://github.com/paritytech/parity/pull/2894)
-- Update account dropdowns [#2959](https://github.com/paritytech/parity/pull/2959)
-- Modify gas price statistics [#2947](https://github.com/paritytech/parity/pull/2947)
-- Fixes pending/mined transactions in registry dApp [#3004](https://github.com/paritytech/parity/pull/3004)
-- Prevent connecting to self [#2997](https://github.com/paritytech/parity/pull/2997)
-- Disable verbose in gitlab CI [#2999](https://github.com/paritytech/parity/pull/2999)
-- Allow warnings in gitlab [#2998](https://github.com/paritytech/parity/pull/2998)
-- Fix the brainwallet functionality. [#2994](https://github.com/paritytech/parity/pull/2994)
-- Provided gas description update [#2993](https://github.com/paritytech/parity/pull/2993)
-- Print messages to stderr [#2991](https://github.com/paritytech/parity/pull/2991)
-- Networking and syncing tweaks [#2990](https://github.com/paritytech/parity/pull/2990)
-- Allow build warnings [#2985](https://github.com/paritytech/parity/pull/2985)
-- Display network status for finished Signer requests [#2983](https://github.com/paritytech/parity/pull/2983)
-- Fixed rejecting transactions [#2984](https://github.com/paritytech/parity/pull/2984)
-- mio version bump [#2982](https://github.com/paritytech/parity/pull/2982)
-- Publish parity.js to npmjs registry [#2978](https://github.com/paritytech/parity/pull/2978)
-- Import raw private key [#2945](https://github.com/paritytech/parity/pull/2945)
-- refactor etherscan.io links [#2896](https://github.com/paritytech/parity/pull/2896)
-- Use separate lock for code cache [#2977](https://github.com/paritytech/parity/pull/2977)
-- Add favicon [#2974](https://github.com/paritytech/parity/pull/2974)
-- Align password change dialog with create dialog ordering [#2970](https://github.com/paritytech/parity/pull/2970)
-- WS bump [#2973](https://github.com/paritytech/parity/pull/2973)
-- Discovery performance optimization [#2972](https://github.com/paritytech/parity/pull/2972)
-- Pass gas & gasPrice to token transfers [#2964](https://github.com/paritytech/parity/pull/2964)
-- Updating ws-rs [#2962](https://github.com/paritytech/parity/pull/2962)
-- Run cargo with verbose flag when testing [#2943](https://github.com/paritytech/parity/pull/2943)
-- Fixing clippy warnings take two [#2961](https://github.com/paritytech/parity/pull/2961)
-- Snapshot sync improvements [#2960](https://github.com/paritytech/parity/pull/2960)
-- Gavcoin event display updates [#2956](https://github.com/paritytech/parity/pull/2956)
-- Eslint fixes [#2957](https://github.com/paritytech/parity/pull/2957)
-- Add import of raw private key RPCs [#2942](https://github.com/paritytech/parity/pull/2942)
-- Bring in styling queues from original Gavcoin [#2936](https://github.com/paritytech/parity/pull/2936)
-- Validating minimal required gas for a transaction [#2937](https://github.com/paritytech/parity/pull/2937)
-- Even more snapshot validity checks [#2935](https://github.com/paritytech/parity/pull/2935)
-- Shared code cache [#2921](https://github.com/paritytech/parity/pull/2921)
-- Updating bootnodes for ETC [#2938](https://github.com/paritytech/parity/pull/2938)
-- More bootnodes [#2926](https://github.com/paritytech/parity/pull/2926)
-- Revert hash updates until testable [#2925](https://github.com/paritytech/parity/pull/2925)
-- Release.sh verbose output [#2924](https://github.com/paritytech/parity/pull/2924)
-- additional release.sh debugging info [#2922](https://github.com/paritytech/parity/pull/2922)
-- Pass the js-precompiled commit hash to cargo update [#2920](https://github.com/paritytech/parity/pull/2920)
-- Next nonce RPC [#2917](https://github.com/paritytech/parity/pull/2917)
-- Get rid of duplicated code in EVM [#2915](https://github.com/paritytech/parity/pull/2915)
-- Transaction Queue banning [#2524](https://github.com/paritytech/parity/pull/2524)
-- Revert to gas price ordering [#2919](https://github.com/paritytech/parity/pull/2919)
-- Personal split [#2879](https://github.com/paritytech/parity/pull/2879)
-- Fixing config values for pruning_history [#2918](https://github.com/paritytech/parity/pull/2918)
-- Apply pending block details on commit [#2254](https://github.com/paritytech/parity/pull/2254)
-- Fixed GetNodeData output [#2892](https://github.com/paritytech/parity/pull/2892)
-- New sync protocol ID [#2912](https://github.com/paritytech/parity/pull/2912)
-- Clippy bump [#2877](https://github.com/paritytech/parity/pull/2877)
-- iconomi token images [#2906](https://github.com/paritytech/parity/pull/2906)
-- Fixes too long description and Token balance value in Dapps/Accounts [#2902](https://github.com/paritytech/parity/pull/2902)
-- Add missing images for local dapps [#2890](https://github.com/paritytech/parity/pull/2890)
-- Fix Webpack, again [#2895](https://github.com/paritytech/parity/pull/2895)
-- Enable suicide json test [#2893](https://github.com/paritytech/parity/pull/2893)
-- More snapshot fixes and optimizations [#2883](https://github.com/paritytech/parity/pull/2883)
-- Fixes CI JS precompiled build [#2886](https://github.com/paritytech/parity/pull/2886)
-- Fix empty tags modification [#2884](https://github.com/paritytech/parity/pull/2884)
-- Fix up informant. [#2865](https://github.com/paritytech/parity/pull/2865)
-- Get rid of MemoryDB denote [#2881](https://github.com/paritytech/parity/pull/2881)
-- Add inject to "bundle everything" list [#2871](https://github.com/paritytech/parity/pull/2871)
-- Fixes signer and MUI errors throwing [#2876](https://github.com/paritytech/parity/pull/2876)
-- Fix failing tests after log parsing updates [#2878](https://github.com/paritytech/parity/pull/2878)
-- Sweep some more panics [#2848](https://github.com/paritytech/parity/pull/2848)
-- Make GitLab js-precompiled really update Cargo.toml in main repo [#2869](https://github.com/paritytech/parity/pull/2869)
-- IPC version bump [#2870](https://github.com/paritytech/parity/pull/2870)
-- Snapshot sync fixes and optimizations [#2863](https://github.com/paritytech/parity/pull/2863)
-- Add Check and Change Password for an Account [#2861](https://github.com/paritytech/parity/pull/2861)
-- Output git fetch/push to log files [#2862](https://github.com/paritytech/parity/pull/2862)
-- Align contract event log l&f with transactions [#2812](https://github.com/paritytech/parity/pull/2812)
-- Nicer port in use errors [#2859](https://github.com/paritytech/parity/pull/2859)
-- Remove personal_* calls from dapps [#2860](https://github.com/paritytech/parity/pull/2860)
-- Token sorting, zero-ETH transfer & token decimals [#2805](https://github.com/paritytech/parity/pull/2805)
-- Don't fail badly when no transactions in last 100 blocks. [#2856](https://github.com/paritytech/parity/pull/2856)
-- Fixing home.parity address for new signer [#2851](https://github.com/paritytech/parity/pull/2851)
-- Enabling UI build back [#2853](https://github.com/paritytech/parity/pull/2853)
-- Remove eventName in unsubscribe API arguments [#2844](https://github.com/paritytech/parity/pull/2844)
-- Don't return empty names as clickable titles [#2809](https://github.com/paritytech/parity/pull/2809)
-- Auto-bump js-precompiled on release [#2828](https://github.com/paritytech/parity/pull/2828)
-- Remove ethcore::common re-export module [#2792](https://github.com/paritytech/parity/pull/2792)
-- Prevent database corruption on OOM [#2832](https://github.com/paritytech/parity/pull/2832)
-- Download/Export Addressbook [#2847](https://github.com/paritytech/parity/pull/2847)
-- Snapshot and blockchain stability improvements [#2843](https://github.com/paritytech/parity/pull/2843)
-- Extended network options [#2845](https://github.com/paritytech/parity/pull/2845)
-- fix failing master test build [#2846](https://github.com/paritytech/parity/pull/2846)
-- Local dapps embeddable on signer port [#2815](https://github.com/paritytech/parity/pull/2815)
-- Trigger accounts/contracts search on search input change [#2838](https://github.com/paritytech/parity/pull/2838)
-- Move snapshot sync to a subprotocol [#2820](https://github.com/paritytech/parity/pull/2820)
-- fix node log being reversed [#2839](https://github.com/paritytech/parity/pull/2839)
-- Fixes currency symbol font size in Shapeshift modal [#2840](https://github.com/paritytech/parity/pull/2840)
-- Disable personal APIs by default for security reasons [#2834](https://github.com/paritytech/parity/pull/2834)
-- Clear cached content [#2833](https://github.com/paritytech/parity/pull/2833)
-- Add ethcore_[dapps|signer]Port APIs [#2821](https://github.com/paritytech/parity/pull/2821)
-- CLI option to skip seal check when importing [#2842](https://github.com/paritytech/parity/pull/2842)
-- Fix case error in Dapps import [#2837](https://github.com/paritytech/parity/pull/2837)
-- Double click on address in account detail view should select it [#2841](https://github.com/paritytech/parity/pull/2841)
-- Bump js-precompiled to 20161022-223915 UTC [#2826](https://github.com/paritytech/parity/pull/2826)
-- Adjust paths to handle CORS changes [#2816](https://github.com/paritytech/parity/pull/2816)
-- RPC for dapps port and signer port [#2819](https://github.com/paritytech/parity/pull/2819)
-- Update build to working version on pre-compiled repo [#2825](https://github.com/paritytech/parity/pull/2825)
-- Adjust network name badge colours (darker) [#2823](https://github.com/paritytech/parity/pull/2823)
-- Removing submodule in favour of rust crate [#2756](https://github.com/paritytech/parity/pull/2756)
-- Return old-ish content even when syncing [#2757](https://github.com/paritytech/parity/pull/2757)
-- fix Signer UI [#2750](https://github.com/paritytech/parity/pull/2750)
-- USG, GBP, Euro & Yuan updates [#2818](https://github.com/paritytech/parity/pull/2818)
-- Make locally installed apps available again (Fixes #2771) [#2808](https://github.com/paritytech/parity/pull/2808)
-- Additional RPCs for password management [#2779](https://github.com/paritytech/parity/pull/2779)
-- flush DB changes on drop [#2795](https://github.com/paritytech/parity/pull/2795)
-- rename State::snapshot to checkpoint to avoid confusion [#2796](https://github.com/paritytech/parity/pull/2796)
-- Missing changes required to make new UI work [#2793](https://github.com/paritytech/parity/pull/2793)
-- Cleanup method decoding (Fixes #2811) [#2810](https://github.com/paritytech/parity/pull/2810)
-- Use trace API for decentralized transaction list [#2784](https://github.com/paritytech/parity/pull/2784)
-- Automatic compaction selection on Linux [#2785](https://github.com/paritytech/parity/pull/2785)
-- Update token images [#2804](https://github.com/paritytech/parity/pull/2804)
-- Hackergold token images [#2801](https://github.com/paritytech/parity/pull/2801)
-- Additional token images [#2800](https://github.com/paritytech/parity/pull/2800)
-- Additional token images [#2798](https://github.com/paritytech/parity/pull/2798)
-- Resolve morden fork [#2773](https://github.com/paritytech/parity/pull/2773)
-- Using SipHashes from crates.io [#2778](https://github.com/paritytech/parity/pull/2778)
-- Fixed issues on Searchable Addresses [#2790](https://github.com/paritytech/parity/pull/2790)
-- Currency icons [#2788](https://github.com/paritytech/parity/pull/2788)
-- Update token images [#2783](https://github.com/paritytech/parity/pull/2783)
-- Fix warning in master [#2775](https://github.com/paritytech/parity/pull/2775)
-- Add empty account existence test from beta. [#2769](https://github.com/paritytech/parity/pull/2769)
-- Update name of basiccoin manager [#2768](https://github.com/paritytech/parity/pull/2768)
-- sweep most unwraps from ethcore crate, dapps crate [#2762](https://github.com/paritytech/parity/pull/2762)
-- Check queue to determine major importing [#2763](https://github.com/paritytech/parity/pull/2763)
-- Trace filtering fix [#2760](https://github.com/paritytech/parity/pull/2760)
-- Update js precompiled to 20161020-141636 [#2761](https://github.com/paritytech/parity/pull/2761)
-- Incrementally calculate verification queue heap size [#2749](https://github.com/paritytech/parity/pull/2749)
-- Don't add empty accounts to bloom [#2753](https://github.com/paritytech/parity/pull/2753)
-- fix contract deployments not showing up [#2759](https://github.com/paritytech/parity/pull/2759)
-- Fixes a positioning issue in Address Selection component [#2754](https://github.com/paritytech/parity/pull/2754)
-- fix linting issues [#2758](https://github.com/paritytech/parity/pull/2758)
-- Making Trie.iter non-recursive [#2733](https://github.com/paritytech/parity/pull/2733)
-- Block import optimization [#2748](https://github.com/paritytech/parity/pull/2748)
-- Update js-precompiled to 20161020-110858 [#2752](https://github.com/paritytech/parity/pull/2752)
-- Fixing small files fetching [#2742](https://github.com/paritytech/parity/pull/2742)
-- Fixing stalled sync [#2747](https://github.com/paritytech/parity/pull/2747)
-- refactor signer components [#2691](https://github.com/paritytech/parity/pull/2691)
-- Png images with backgrounds (original svg) [#2740](https://github.com/paritytech/parity/pull/2740)
-- Make address selection searchable [#2739](https://github.com/paritytech/parity/pull/2739)
-- very basic dapp add/remove interface [#2721](https://github.com/paritytech/parity/pull/2721)
-- Frontport commits from beta to master [#2743](https://github.com/paritytech/parity/pull/2743)
-- Implements Trace API Formatter [#2732](https://github.com/paritytech/parity/pull/2732)
-- bump parking_lot to 0.3.x series [#2702](https://github.com/paritytech/parity/pull/2702)
-- Unify major syncing detection [#2699](https://github.com/paritytech/parity/pull/2699)
-- Fixes gas/gasPrice change not reflected in transaction modal [#2735](https://github.com/paritytech/parity/pull/2735)
-- Fixing build UI stuff along with Rust [#2726](https://github.com/paritytech/parity/pull/2726)
-- Fixed Snackbar not showing and/or behind transactions (#2730) [#2731](https://github.com/paritytech/parity/pull/2731)
-- Updating json tests to latest develop commit [#2728](https://github.com/paritytech/parity/pull/2728)
-- dapps: show errors [#2727](https://github.com/paritytech/parity/pull/2727)
-- node logs: break lines [#2722](https://github.com/paritytech/parity/pull/2722)
-- Bumping JSON-RPC http server [#2714](https://github.com/paritytech/parity/pull/2714)
-- Add ability to copy address to the clipboard [#2716](https://github.com/paritytech/parity/pull/2716)
-- Sort tags when displaying ; use AND for search results [#2720](https://github.com/paritytech/parity/pull/2720)
-- allow-same-origin for iframe [#2711](https://github.com/paritytech/parity/pull/2711)
-- Update Registry address (mainnet) [#2713](https://github.com/paritytech/parity/pull/2713)
-- Allow tags for Accounts, Addresses and Contracts [#2712](https://github.com/paritytech/parity/pull/2712)
-- Correct parameters for eth_sign [#2703](https://github.com/paritytech/parity/pull/2703)
-- Bump js-precompiled to 20161018-161705 [#2698](https://github.com/paritytech/parity/pull/2698)
-- Add inject.js (for web3 exposed) [#2692](https://github.com/paritytech/parity/pull/2692)
-- Remove obsolete dapps and update security headers [#2694](https://github.com/paritytech/parity/pull/2694)
-- Snapshot sync part 2 [#2098](https://github.com/paritytech/parity/pull/2098)
-- Fix issues with no ethereum test dir present (2382) [#2659](https://github.com/paritytech/parity/pull/2659)
-- Apply UI PRs after master merge [#2690](https://github.com/paritytech/parity/pull/2690)
-- Fix importing traces for non-canon blocks [#2683](https://github.com/paritytech/parity/pull/2683)
-- Fixing random test failures [#2577](https://github.com/paritytech/parity/pull/2577)
-- Disable IPC in default build for 1.4 [#2657](https://github.com/paritytech/parity/pull/2657)
-- use pruning history in CLI snapshots [#2658](https://github.com/paritytech/parity/pull/2658)
-- Fixing --no-default-features again and evmbin [#2670](https://github.com/paritytech/parity/pull/2670)
-- Settings > Proxy for proxy.pac setup instructions [#2678](https://github.com/paritytech/parity/pull/2678)
-- Re-instate transaitions to allow updating busy indicator [#2682](https://github.com/paritytech/parity/pull/2682)
-- signer: remove reject counter [#2685](https://github.com/paritytech/parity/pull/2685)
-- Initial new UI source code import [#2607](https://github.com/paritytech/parity/pull/2607)
-- Additional dapp logo images [#2677](https://github.com/paritytech/parity/pull/2677)
-- Redirect from :8080 to :8180 [#2676](https://github.com/paritytech/parity/pull/2676)
-- script to update js-precompiled [#2673](https://github.com/paritytech/parity/pull/2673)
-- Styling in FF is not 100% [#2669](https://github.com/paritytech/parity/pull/2669)
-- Don't allow gavcoin transfer with no balances [#2667](https://github.com/paritytech/parity/pull/2667)
-- fix signer rejections [#2666](https://github.com/paritytech/parity/pull/2666)
-- better text on unique background pattern [#2664](https://github.com/paritytech/parity/pull/2664)
-- Adjust z-index for error overlay [#2662](https://github.com/paritytech/parity/pull/2662)
-- Fix address selection for contract deployment [#2660](https://github.com/paritytech/parity/pull/2660)
-- Add additional contract images [#2655](https://github.com/paritytech/parity/pull/2655)
-- Update /api/* to point to :8080/api/* (first generation interface) [#2612](https://github.com/paritytech/parity/pull/2612)
-- Initial import of new UI (compiled JS code) [#2220](https://github.com/paritytech/parity/pull/2220)
-- Fixing evmbin compilation [#2652](https://github.com/paritytech/parity/pull/2652)
-- Fix up ETC EIP-150 transition to 2,500,000. [#2636](https://github.com/paritytech/parity/pull/2636)
-- Fixing compilation without default features [#2638](https://github.com/paritytech/parity/pull/2638)
-- [frontport] CLI to specify queue ordering strategy (#2494) [#2623](https://github.com/paritytech/parity/pull/2623)
-- Support for decryption in Signer [#2421](https://github.com/paritytech/parity/pull/2421)
-- EIP150.1c [#2591](https://github.com/paritytech/parity/pull/2591)
-- Release merge with origin with ours strategy [#2631](https://github.com/paritytech/parity/pull/2631)
-- Adjust build output directories [#2630](https://github.com/paritytech/parity/pull/2630)
-- cater for txhash returning null/empty object [#2629](https://github.com/paritytech/parity/pull/2629)
-- snapshot: single byte for empty accounts [#2625](https://github.com/paritytech/parity/pull/2625)
-- Configurable history size in master [#2606](https://github.com/paritytech/parity/pull/2606)
-- Database performance tweaks [#2619](https://github.com/paritytech/parity/pull/2619)
-- Enable suicide json test [#2626](https://github.com/paritytech/parity/pull/2626)
-- Split journaldb commit into two functions: journal_under and mark_canonical [#2329](https://github.com/paritytech/parity/pull/2329)
-- Fixed tx queue limit for local transactions [#2616](https://github.com/paritytech/parity/pull/2616)
-- Additional logs when transactions is removed from queue [#2617](https://github.com/paritytech/parity/pull/2617)
-- mitigate refcell conflict in state diffing [#2601](https://github.com/paritytech/parity/pull/2601)
-- Fix tests [#2611](https://github.com/paritytech/parity/pull/2611)
-- small styling updates [#2610](https://github.com/paritytech/parity/pull/2610)
-- Remove web3 from Signer, bring in parity.js API [#2604](https://github.com/paritytech/parity/pull/2604)
-- Mostly configurable canonical cache size [#2516](https://github.com/paritytech/parity/pull/2516)
-- Added peers details to ethcore_netPeers RPC [#2580](https://github.com/paritytech/parity/pull/2580)
-- Display account password hint when available [#2596](https://github.com/paritytech/parity/pull/2596)
-- Fix gas estimation on transfer when data supplied [#2593](https://github.com/paritytech/parity/pull/2593)
-- remove unused npm packages [#2590](https://github.com/paritytech/parity/pull/2590)
-- Bundle fonts as part of the build process [#2588](https://github.com/paritytech/parity/pull/2588)
-- Contract constructor params [#2586](https://github.com/paritytech/parity/pull/2586)
-- Update json test suite [#2574](https://github.com/paritytech/parity/pull/2574)
-- Filter apps that has been replaced for the local list [#2583](https://github.com/paritytech/parity/pull/2583)
-- Display local apps listed by Parity [#2581](https://github.com/paritytech/parity/pull/2581)
-- Network-specific nodes file [#2569](https://github.com/paritytech/parity/pull/2569)
-- Dont close when block is known to be invalid [#2572](https://github.com/paritytech/parity/pull/2572)
-- deny compiler warnings in CI [#2570](https://github.com/paritytech/parity/pull/2570)
-- adjust alignment of queries [#2573](https://github.com/paritytech/parity/pull/2573)
-- update ethcore-bigint crate to 0.1.1 [#2562](https://github.com/paritytech/parity/pull/2562)
-- Registry dapp uses setAddress to actually set addresses now [#2568](https://github.com/paritytech/parity/pull/2568)
-- Add the new EIP150 test. [#2563](https://github.com/paritytech/parity/pull/2563)
-- fix failing tests [#2567](https://github.com/paritytech/parity/pull/2567)
-- ΞTH -> ETH [#2566](https://github.com/paritytech/parity/pull/2566)
-- Ensure polling is only done when connected [#2565](https://github.com/paritytech/parity/pull/2565)
-- Fixed race condition in trace import [#2555](https://github.com/paritytech/parity/pull/2555)
-- Disable misbehaving peers while seeking for best block [#2537](https://github.com/paritytech/parity/pull/2537)
-- TX queue gas limit config and allow local transactions over the gas limit [#2553](https://github.com/paritytech/parity/pull/2553)
-- standard component for address -> name mappings (consistent use everywhere) [#2557](https://github.com/paritytech/parity/pull/2557)
-- Remove unwrap from client module [#2554](https://github.com/paritytech/parity/pull/2554)
-- Removing panickers from sync module [#2551](https://github.com/paritytech/parity/pull/2551)
-- Address images (tokens, dapps) as registered via contentHash (when available) [#2526](https://github.com/paritytech/parity/pull/2526)
-- TokenReg set & get images working [#2540](https://github.com/paritytech/parity/pull/2540)
-- adjust app_id where /api/content/<hash> is called, fixes #2541 [#2543](https://github.com/paritytech/parity/pull/2543)
-- connection dialog now shows up in dapps as well, closes #2538 [#2550](https://github.com/paritytech/parity/pull/2550)
-- display account uuid (where available), closes #2546 [#2549](https://github.com/paritytech/parity/pull/2549)
-- create accounts via recovery phrase [#2545](https://github.com/paritytech/parity/pull/2545)
-- Build ethcore/js-precompiled on GitLab [#2522](https://github.com/paritytech/parity/pull/2522)
-- Return errors from eth_call RPC [#2498](https://github.com/paritytech/parity/pull/2498)
-- registry dapp: manage records [#2323](https://github.com/paritytech/parity/pull/2323)
-- Print backtrace on panic [#2535](https://github.com/paritytech/parity/pull/2535)
-- GitHubHint dapp [#2531](https://github.com/paritytech/parity/pull/2531)
-- Backports to master [#2530](https://github.com/paritytech/parity/pull/2530)
-- Handle reorganizations in the state cache [#2490](https://github.com/paritytech/parity/pull/2490)
-- Hypervisor: terminate hanging modules [#2513](https://github.com/paritytech/parity/pull/2513)
-- signer & node connection prompts/indicators [#2504](https://github.com/paritytech/parity/pull/2504)
-- Using pending block only if is not old [#2514](https://github.com/paritytech/parity/pull/2514)
-- More caching optimizations [#2505](https://github.com/paritytech/parity/pull/2505)
-- Fixed possible panic in the networking [#2495](https://github.com/paritytech/parity/pull/2495)
-- Trim password from file [#2503](https://github.com/paritytech/parity/pull/2503)
-- Fixing RPC Filter conversion to EthFilter [#2500](https://github.com/paritytech/parity/pull/2500)
-- Fixing error message for transactions [#2496](https://github.com/paritytech/parity/pull/2496)
-- Adjustable stack size for EVM [#2483](https://github.com/paritytech/parity/pull/2483)
-- [master] Fixing penalization in future [#2499](https://github.com/paritytech/parity/pull/2499)
-- Preserve cache on reverting the snapshot [#2488](https://github.com/paritytech/parity/pull/2488)
-- RocksDB version bump [#2492](https://github.com/paritytech/parity/pull/2492)
-- Increase default size of transaction queue [#2489](https://github.com/paritytech/parity/pull/2489)
-- basiccoin v1 available [#2491](https://github.com/paritytech/parity/pull/2491)
-- Small EVM optimization [#2487](https://github.com/paritytech/parity/pull/2487)
-- Track dirty accounts in the state [#2461](https://github.com/paritytech/parity/pull/2461)
-- fix signature lookup address [#2480](https://github.com/paritytech/parity/pull/2480)
-- update registrar test with generic non-empty test [#2476](https://github.com/paritytech/parity/pull/2476)
-- Derive IPC interface only when ipc feature is on [#2463](https://github.com/paritytech/parity/pull/2463)
-- Fix ethstore opening all key files in the directory at once [#2471](https://github.com/paritytech/parity/pull/2471)
-- contract api event log fixes [#2469](https://github.com/paritytech/parity/pull/2469)
-- basiccoin base functionality in-place [#2468](https://github.com/paritytech/parity/pull/2468)
-- Merge IPC codegen attributes into one [#2460](https://github.com/paritytech/parity/pull/2460)
-- Close after importing keys from geth [#2464](https://github.com/paritytech/parity/pull/2464)
-- Port a couple more RPC APIs to the new auto args [#2325](https://github.com/paritytech/parity/pull/2325)
-- update rustc for appveyor to 1.12.0 [#2423](https://github.com/paritytech/parity/pull/2423)
-- dapp basiccoin send operations [#2456](https://github.com/paritytech/parity/pull/2456)
-- Better EVM informant & Slow transactions warning [#2436](https://github.com/paritytech/parity/pull/2436)
-- Fixing Signer token RPC API [#2437](https://github.com/paritytech/parity/pull/2437)
-- Fixed FatDB check [#2443](https://github.com/paritytech/parity/pull/2443)
-- dapp basiccoin structure [#2444](https://github.com/paritytech/parity/pull/2444)
-- Accounts bloom in master [#2426](https://github.com/paritytech/parity/pull/2426)
-- Polishing Actually enable fat db pr (#1974) [#2048](https://github.com/paritytech/parity/pull/2048)
-- Jumptable cache [#2427](https://github.com/paritytech/parity/pull/2427)
-- signaturereg registered, remove hardcoding [#2431](https://github.com/paritytech/parity/pull/2431)
-- tokenreg dapp fixes for non-null returns [#2430](https://github.com/paritytech/parity/pull/2430)
-- update ABI json to latest deployed versions [#2428](https://github.com/paritytech/parity/pull/2428)
-- update Morden registry address [#2417](https://github.com/paritytech/parity/pull/2417)
-- Make migration api more friendly [#2420](https://github.com/paritytech/parity/pull/2420)
-- Journaling bloom filter crate in util [#2395](https://github.com/paritytech/parity/pull/2395)
-- move abis from js/json to contracts/abi [#2418](https://github.com/paritytech/parity/pull/2418)
-- Fixing logs-receipt matching [#2403](https://github.com/paritytech/parity/pull/2403)
-- fix broken beta compilation [#2405](https://github.com/paritytech/parity/pull/2405)
-- registry dapp: transfer names [#2335](https://github.com/paritytech/parity/pull/2335)
-- manage firstRun better [#2398](https://github.com/paritytech/parity/pull/2398)
-- render contract deployment address [#2397](https://github.com/paritytech/parity/pull/2397)
-- Transaction Queue fix [#2392](https://github.com/paritytech/parity/pull/2392)
-- contracts abi types & execute value [#2394](https://github.com/paritytech/parity/pull/2394)
-- update styling with ParityBar overlay [#2390](https://github.com/paritytech/parity/pull/2390)
-- application Signer popup window [#2388](https://github.com/paritytech/parity/pull/2388)
-- Fixing Delegate Call in JIT [#2378](https://github.com/paritytech/parity/pull/2378)
-- Prioritizing re-imported transactions [#2372](https://github.com/paritytech/parity/pull/2372)
-- Revert #2172, pretty much. [#2387](https://github.com/paritytech/parity/pull/2387)
-- correct sync memory usage calculation [#2385](https://github.com/paritytech/parity/pull/2385)
-- fix migration system for post-consolidation migrations, better errors [#2334](https://github.com/paritytech/parity/pull/2334)
-- Fix the traceAddress field in transaction traces. [#2373](https://github.com/paritytech/parity/pull/2373)
-- Gavcoin utilises the popup box [#2381](https://github.com/paritytech/parity/pull/2381)
-- registry dapp: support dropping names [#2328](https://github.com/paritytech/parity/pull/2328)
-- settings view, set background & store views [#2380](https://github.com/paritytech/parity/pull/2380)
-- Removing extras data from retracted blocks. [#2375](https://github.com/paritytech/parity/pull/2375)
-- fixed #2263, geth keys with ciphertext shorter than 32 bytes [#2318](https://github.com/paritytech/parity/pull/2318)
-- Expanse compatibility [#2369](https://github.com/paritytech/parity/pull/2369)
-- Allow queries of constant functions on contracts [#2360](https://github.com/paritytech/parity/pull/2360)
-- Auto Open/Close the Signer window on new transaction request [#2362](https://github.com/paritytech/parity/pull/2362)
-- Specify column cache sizes explicitly; default fallback of 2MB [#2358](https://github.com/paritytech/parity/pull/2358)
-- Canonical state cache (master) [#2311](https://github.com/paritytech/parity/pull/2311)
-- method signature lookups, parameter decoding & management [#2313](https://github.com/paritytech/parity/pull/2313)
-- make block queue into a more generic verification queue and fix block heap size calculation [#2095](https://github.com/paritytech/parity/pull/2095)
-- Hash Content RPC method [#2355](https://github.com/paritytech/parity/pull/2355)
-- registry dapp: show reserved events by default [#2359](https://github.com/paritytech/parity/pull/2359)
-- Display timestamp in Signer requests details [#2324](https://github.com/paritytech/parity/pull/2324)
-- Reorder transaction_by_hash to favour canon search [#2332](https://github.com/paritytech/parity/pull/2332)
-- Optimize DIV for some common divisors [#2327](https://github.com/paritytech/parity/pull/2327)
-- Return error when deserializing invalid hex [#2339](https://github.com/paritytech/parity/pull/2339)
-- Changed http:// to https:// on some links [#2349](https://github.com/paritytech/parity/pull/2349)
-- user defaults [#2014](https://github.com/paritytech/parity/pull/2014)
-- Fixing jit feature compilation [#2310](https://github.com/paritytech/parity/pull/2310)
-- Tx Queue improvements  [#2292](https://github.com/paritytech/parity/pull/2292)
-- Removing PropTypes on build [#2322](https://github.com/paritytech/parity/pull/2322)
-- Lenient bytes deserialization [#2036](https://github.com/paritytech/parity/pull/2036)
-- reverse call data decoding given transaction data & method [#2312](https://github.com/paritytech/parity/pull/2312)
-- add missing gpl headers to gavcoin dapp [#2317](https://github.com/paritytech/parity/pull/2317)
-- contract Events, Functions & Queries sub-components as well as Event log visual updates [#2306](https://github.com/paritytech/parity/pull/2306)
-- webpack config updates (really include babel-polyfill, rename npm steps) [#2305](https://github.com/paritytech/parity/pull/2305)
-- remove unneeded Form from Account header [#2302](https://github.com/paritytech/parity/pull/2302)
-- edit of metadata across accounts, addresses & contracts [#2300](https://github.com/paritytech/parity/pull/2300)
-- Adjust all modals for consistency & css DRY-ness [#2301](https://github.com/paritytech/parity/pull/2301)
-- update container spacing [#2296](https://github.com/paritytech/parity/pull/2296)
-- local cache of generated background (no allocation on each re-render) [#2298](https://github.com/paritytech/parity/pull/2298)
-- fix failing tests [#2290](https://github.com/paritytech/parity/pull/2290)
-- Respecting standards for tokenreg dapp [#2287](https://github.com/paritytech/parity/pull/2287)
-- Separate RPC serialization from implementation [#2072](https://github.com/paritytech/parity/pull/2072)
-- Webpack optimisations - Using DLL [#2264](https://github.com/paritytech/parity/pull/2264)
-- header background, theme adjustments (not that harsh) [#2273](https://github.com/paritytech/parity/pull/2273)
-- contract view (developer-centric) [#2259](https://github.com/paritytech/parity/pull/2259)
-- Add hash as CLI function [#1995](https://github.com/paritytech/parity/pull/1995)
-- registry: fix mined events showing as pending [#2267](https://github.com/paritytech/parity/pull/2267)
-- Dapp - Tokereg ; Query Tokens from TLA or Address [#2266](https://github.com/paritytech/parity/pull/2266)
-- Fixes to the Token Registration dApp [#2250](https://github.com/paritytech/parity/pull/2250)
-- remove abi *.json duplication, provide a single version of the truth [#2253](https://github.com/paritytech/parity/pull/2253)
-- Separate path for ext code size [#2251](https://github.com/paritytech/parity/pull/2251)
-- Snapshot format changes [#2234](https://github.com/paritytech/parity/pull/2234)
-- Serving content at /api/content/<hash> [#2248](https://github.com/paritytech/parity/pull/2248)
-- Fails when deserializing non-hex uints [#2247](https://github.com/paritytech/parity/pull/2247)
-- registry dapp: add GPL headers [#2252](https://github.com/paritytech/parity/pull/2252)
-- registry dapp: user-friendly lookup [#2229](https://github.com/paritytech/parity/pull/2229)
-- registry dapp: show DataChanged events [#2242](https://github.com/paritytech/parity/pull/2242)
-- fixups for deploys [#2249](https://github.com/paritytech/parity/pull/2249)
-- Fixing output of eth_call and Bytes deserialization [#2230](https://github.com/paritytech/parity/pull/2230)
-- Encryption, decryption and public key RPCs. [#1946](https://github.com/paritytech/parity/pull/1946)
-- limit number of event logs returned [#2231](https://github.com/paritytech/parity/pull/2231)
-- babel-polyfill [#2239](https://github.com/paritytech/parity/pull/2239)
-- procedurally generate background based on signer key [#2233](https://github.com/paritytech/parity/pull/2233)
-- UI fixes [#2238](https://github.com/paritytech/parity/pull/2238)
-- expose isConnected() from transport [#2225](https://github.com/paritytech/parity/pull/2225)
-- registry dapp: rename event log [#2227](https://github.com/paritytech/parity/pull/2227)
-- registry dapp: show pending events [#2223](https://github.com/paritytech/parity/pull/2223)
-- Handle RLP to string UTF-8 decoding errors [#2217](https://github.com/paritytech/parity/pull/2217)
-- Use WebSocket transport for all built-in calls [#2216](https://github.com/paritytech/parity/pull/2216)
-- Remove panickers from trie iterators [#2209](https://github.com/paritytech/parity/pull/2209)
-- Limit for logs filter. [#2180](https://github.com/paritytech/parity/pull/2180)
-- Various state copy optimizations [#2172](https://github.com/paritytech/parity/pull/2172)
-- New signer token RPC & Initial signer connection without token. [#2096](https://github.com/paritytech/parity/pull/2096)
-- signer ui fixes [#2219](https://github.com/paritytech/parity/pull/2219)
-- contract deploy ui [#2212](https://github.com/paritytech/parity/pull/2212)
-- registry dapp: fix propTypes [#2218](https://github.com/paritytech/parity/pull/2218)
-- registry: fix IdentityIcon in events log [#2206](https://github.com/paritytech/parity/pull/2206)
-- Fixing evm-debug [#2161](https://github.com/paritytech/parity/pull/2161)
-- Fix syncing with pv63 peers [#2204](https://github.com/paritytech/parity/pull/2204)
-- registry: show shortened hashes [#2205](https://github.com/paritytech/parity/pull/2205)
-- registry dapp: remove owner [#2203](https://github.com/paritytech/parity/pull/2203)
-- webpack proxy updates for /api* [#2175](https://github.com/paritytech/parity/pull/2175)
-- simplify personal event publishing, fix delete refresh issues [#2183](https://github.com/paritytech/parity/pull/2183)
-- fix global & initial states [#2160](https://github.com/paritytech/parity/pull/2160)
-- Allow selection & saving of available views [#2131](https://github.com/paritytech/parity/pull/2131)
-- global/contract events with promisy subscribe/unsubscribe [#2136](https://github.com/paritytech/parity/pull/2136)
-- Token Registry dApp [#2178](https://github.com/paritytech/parity/pull/2178)
-- re-usable bytesToHex exposed in api.util [#2174](https://github.com/paritytech/parity/pull/2174)
-- Webpack optimisations [#2179](https://github.com/paritytech/parity/pull/2179)
-- cleanup on contract event subscriptions [#2104](https://github.com/paritytech/parity/pull/2104)
-- move utility functions to api.util [#2105](https://github.com/paritytech/parity/pull/2105)
-- registry dapp [#2077](https://github.com/paritytech/parity/pull/2077)
-- mui/FlatButton to ui/Button [#2129](https://github.com/paritytech/parity/pull/2129)
-- address delete functionality [#2128](https://github.com/paritytech/parity/pull/2128)
-- contract deployment updates [#2106](https://github.com/paritytech/parity/pull/2106)
-- contract events, indexed string fix [#2108](https://github.com/paritytech/parity/pull/2108)
-- Bumping jsonrpc-core & jsonrpc-http-server [#2162](https://github.com/paritytech/parity/pull/2162)
-- gitlab testing & build processes [#2090](https://github.com/paritytech/parity/pull/2090)
-- Misc small UI fixes (recently broken) [#2101](https://github.com/paritytech/parity/pull/2101)
-- Bump clippy & Fix warnings [#2109](https://github.com/paritytech/parity/pull/2109)
-- Import command summary [#2102](https://github.com/paritytech/parity/pull/2102)
-- check for existence of deprecated ethash file before attempting delete [#2103](https://github.com/paritytech/parity/pull/2103)
-- shapeshift Promise API library [#2088](https://github.com/paritytech/parity/pull/2088)
-- fund account via ShapeShift [#2099](https://github.com/paritytech/parity/pull/2099)
-- Get bigint on crates.io [#2078](https://github.com/paritytech/parity/pull/2078)
-- Enable sealing if Engine provides internal sealing given author [#2084](https://github.com/paritytech/parity/pull/2084)
-- Config files [#2070](https://github.com/paritytech/parity/pull/2070)
-- re-add lodash plugin to babel config [#2092](https://github.com/paritytech/parity/pull/2092)
-- Remove old cache data [#2081](https://github.com/paritytech/parity/pull/2081)
-- Logs limit & log_index bug [#2073](https://github.com/paritytech/parity/pull/2073)
-- flatten store, muiTheme & api providers [#2087](https://github.com/paritytech/parity/pull/2087)
-- add babel es2016 & es2017 presets [#2083](https://github.com/paritytech/parity/pull/2083)
-- remove all '<name>/index' imports in API [#2089](https://github.com/paritytech/parity/pull/2089)
-- add missing GPL headers to all files [#2086](https://github.com/paritytech/parity/pull/2086)
-- readme cleanups [#2085](https://github.com/paritytech/parity/pull/2085)
-- gavcoin global import of parity api  [#2082](https://github.com/paritytech/parity/pull/2082)
-- Fixing removal from gas price when moving future->current [#2076](https://github.com/paritytech/parity/pull/2076)
-- Split internal sealing from work preparation [#2071](https://github.com/paritytech/parity/pull/2071)
-- ensure the target folder doesn't exist before renaming [#2074](https://github.com/paritytech/parity/pull/2074)
-- Get rid of 'Dapp is being downloaded' page [#2055](https://github.com/paritytech/parity/pull/2055)
-- fix failing master build: update tests to new init_restore signature. [#2069](https://github.com/paritytech/parity/pull/2069)
-- Local snapshot restore [#2058](https://github.com/paritytech/parity/pull/2058)
-- import: keep informant going until finished [#2065](https://github.com/paritytech/parity/pull/2065)
-- Add a few tests for the snapshot service [#2059](https://github.com/paritytech/parity/pull/2059)
-- IPC tweaks [#2046](https://github.com/paritytech/parity/pull/2046)
-- Update arm* Docker [#2064](https://github.com/paritytech/parity/pull/2064)
-- Fetching any content-addressed content [#2050](https://github.com/paritytech/parity/pull/2050)
-- Use proper database configuration in snapshots. [#2052](https://github.com/paritytech/parity/pull/2052)
-- periodic snapshot tweaks [#2054](https://github.com/paritytech/parity/pull/2054)
-- ethkey-cli [#2057](https://github.com/paritytech/parity/pull/2057)
-- Forward ethstore-cli feature [#2056](https://github.com/paritytech/parity/pull/2056)
-- handling invalid spec jsons properly, additional tests, closes #1840 [#2049](https://github.com/paritytech/parity/pull/2049)
-- Periodic snapshots [#2044](https://github.com/paritytech/parity/pull/2044)
-- Snapshot sync [#2047](https://github.com/paritytech/parity/pull/2047)
-- Nice error pages for Dapps & Signer [#2033](https://github.com/paritytech/parity/pull/2033)
-- Add a few small snapshot tests [#2038](https://github.com/paritytech/parity/pull/2038)
-- facelift for traces, added errors [#2042](https://github.com/paritytech/parity/pull/2042)
-- Fetching content from HTTPS using `rustls` [#2024](https://github.com/paritytech/parity/pull/2024)
-- Skipping log when there are no transactions were sent [#2045](https://github.com/paritytech/parity/pull/2045)
-- rlp as separate crate [#2034](https://github.com/paritytech/parity/pull/2034)
-- Fixing uint serialization [#2037](https://github.com/paritytech/parity/pull/2037)
-- Fixing new transactions propagation [#2039](https://github.com/paritytech/parity/pull/2039)
-- Propagating transactions to peers on timer. [#2035](https://github.com/paritytech/parity/pull/2035)
-- Remove Populatable and BytesConvertable traits [#2019](https://github.com/paritytech/parity/pull/2019)
-- fixed #1933 [#1979](https://github.com/paritytech/parity/pull/1979)
-- Synchronization tweaks for IPC services [#2028](https://github.com/paritytech/parity/pull/2028)
-- Asynchronous RPC support [#2017](https://github.com/paritytech/parity/pull/2017)
-- Disable ArchiveDB counter check [#2016](https://github.com/paritytech/parity/pull/2016)
-- always process trie death row on commit, add more tracing [#2025](https://github.com/paritytech/parity/pull/2025)
-- fixed transaction addresses mapping, fixes #1971 [#2026](https://github.com/paritytech/parity/pull/2026)
-- Adding tests for dapps server. [#2021](https://github.com/paritytech/parity/pull/2021)
-- builtin trait refactoring [#2018](https://github.com/paritytech/parity/pull/2018)
-- Start parity with systemd [#1967](https://github.com/paritytech/parity/pull/1967)
-- Control service for IPC [#2013](https://github.com/paritytech/parity/pull/2013)
-- LRU cache for dapps [#2006](https://github.com/paritytech/parity/pull/2006)
-- CLI for valid hosts for dapps server [#2005](https://github.com/paritytech/parity/pull/2005)
-- Make the block header struct's internals private [#2000](https://github.com/paritytech/parity/pull/2000)
-- Take control of recovered snapshots, start restoration asynchronously [#2010](https://github.com/paritytech/parity/pull/2010)
-- remove internal locking from DBTransaction [#2003](https://github.com/paritytech/parity/pull/2003)
-- Snapshot optimizations [#1991](https://github.com/paritytech/parity/pull/1991)
-- Revert removing ecies [#2009](https://github.com/paritytech/parity/pull/2009)
-- small blooms optimization [#1998](https://github.com/paritytech/parity/pull/1998)
-- protection from adding empty traces && assertion in traces db [#1994](https://github.com/paritytech/parity/pull/1994)
-- Stratum IPC service [#1959](https://github.com/paritytech/parity/pull/1959)
-- Signature cleanup [#1921](https://github.com/paritytech/parity/pull/1921)
-- Fixed discovery skipping some nodes [#1996](https://github.com/paritytech/parity/pull/1996)
-- Trie query recording and AccountDB factory for no mangling [#1944](https://github.com/paritytech/parity/pull/1944)
-- Validating sha3 of a dapp bundle [#1993](https://github.com/paritytech/parity/pull/1993)
-- Improve eth_getWork timeout test rpc_get_work_should_timeout [#1992](https://github.com/paritytech/parity/pull/1992)
-- Resolving URLs from contract [#1964](https://github.com/paritytech/parity/pull/1964)
-- Add timeout for eth_getWork call [#1975](https://github.com/paritytech/parity/pull/1975)
-- CLI for Signer interface [#1980](https://github.com/paritytech/parity/pull/1980)
-- IPC timeout multiplied [#1990](https://github.com/paritytech/parity/pull/1990)
-- Use relative path for IPC sockets [#1983](https://github.com/paritytech/parity/pull/1983)
-- Market-orientated transaction pricing [#1963](https://github.com/paritytech/parity/pull/1963)
-- Bump clippy [#1982](https://github.com/paritytech/parity/pull/1982)
-- Fixing mutual recursive types serialization [#1977](https://github.com/paritytech/parity/pull/1977)
-- Fix open on FreeBSD [#1984](https://github.com/paritytech/parity/pull/1984)
-- Upgrade hyper dependency to 0.9 [#1973](https://github.com/paritytech/parity/pull/1973)
-- Create network-specific nodes files [#1970](https://github.com/paritytech/parity/pull/1970)
-- Getting rid of syntex [#1965](https://github.com/paritytech/parity/pull/1965)
-- Remove binary specification from hypervisor [#1960](https://github.com/paritytech/parity/pull/1960)
-- Stratum protocol general [#1954](https://github.com/paritytech/parity/pull/1954)
-- keep track of first block in blockchain [#1937](https://github.com/paritytech/parity/pull/1937)
-- introduce ethcore/state module [#1953](https://github.com/paritytech/parity/pull/1953)
-- Apply settings to column families [#1956](https://github.com/paritytech/parity/pull/1956)
-- move column family constants into db module [#1955](https://github.com/paritytech/parity/pull/1955)
-- ECIES without MAC [#1948](https://github.com/paritytech/parity/pull/1948)
-- Fix canny warnings [#1951](https://github.com/paritytech/parity/pull/1951)
-- Fetchable dapps [#1949](https://github.com/paritytech/parity/pull/1949)
-- remove impossible panickers related to infallible db transaction [#1947](https://github.com/paritytech/parity/pull/1947)
-- Minor optimizations [#1943](https://github.com/paritytech/parity/pull/1943)
-- remove randomness from bigint benches, fix warnings [#1945](https://github.com/paritytech/parity/pull/1945)
-- Fix several RPCs [#1926](https://github.com/paritytech/parity/pull/1926)
-- Bump clippy, fix warnings [#1939](https://github.com/paritytech/parity/pull/1939)
-- DB WAL size limit [#1935](https://github.com/paritytech/parity/pull/1935)
-- Use explicit global namespaces in codegen [#1928](https://github.com/paritytech/parity/pull/1928)
-- Fix build on master [#1934](https://github.com/paritytech/parity/pull/1934)
-- IPC on by default [#1927](https://github.com/paritytech/parity/pull/1927)
-- fix util benches compilation [#1931](https://github.com/paritytech/parity/pull/1931)
-- Update gitlab-ci [#1929](https://github.com/paritytech/parity/pull/1929)
-- ethkey and ethstore use hash structures from bigint [#1851](https://github.com/paritytech/parity/pull/1851)
-
-## Parity [v1.3.10](https://github.com/paritytech/parity/releases/tag/v1.3.10) (2016-11-04)
-
-The latest 1.3 series release, now considered stable.
-
-This includes several additional optimisations and fixes together with provisional support for the upcoming hard fork for EIP155/160/161.
-
-- Stable branch reset to 1.3.10 [#3156](https://github.com/paritytech/parity/pull/3156)
-- Backporting to beta [#3149](https://github.com/paritytech/parity/pull/3149)
-- apply post-consolidation migrations after consolidating (BETA) [#3048](https://github.com/paritytech/parity/pull/3048)
-- [beta] Fix the brainwallet functionality. (#2994) [#3005](https://github.com/paritytech/parity/pull/3005)
-- Bumping json-ipc-server [#2989](https://github.com/paritytech/parity/pull/2989)
-- Backports for 1.3.10 [#2987](https://github.com/paritytech/parity/pull/2987)
-
-## Parity [v1.3.9](https://github.com/paritytech/parity/releases/tag/v1.3.9) (2016-10-21)
-
-This release enables EIP-150 hard fork for Ethereum Classic chain and resolves a few stability and performance issues, such as:
-- Interrupted syncing on the test network.
-- Block import delays caused by a large number of incoming transactions. A full re-sync is recommended for performance improvement to take effect.
-
-Full changes:
-- [beta] Resolve morden fork [#2776](https://github.com/paritytech/parity/pull/2776)
-- Fixing botched merge [#2767](https://github.com/paritytech/parity/pull/2767)
-- Backports for beta [#2764](https://github.com/paritytech/parity/pull/2764)
-- Introduce EIP150 hardfork block for ETC [#2736](https://github.com/paritytech/parity/pull/2736)
-- [beta] fix issues with no test dir present (#2659) [#2724](https://github.com/paritytech/parity/pull/2724)
-- [beta] Bumping jsonrpc-http-server [#2715](https://github.com/paritytech/parity/pull/2715)
-- [beta] Fix migration system, better errors [#2661](https://github.com/paritytech/parity/pull/2661)
-
-## Parity [v1.3.8](https://github.com/paritytech/parity/releases/tag/v1.3.8) (2016-10-15)
-
-Parity 1.3.8 is our EIP150 hard-fork compliant release.
-
-Running this will enact a mild change of the protocol at block number 2,463,000 which should occur on Tuesday 18th October 2016 at approximately 12:20 London time (BST). This change alters the gas prices for a number of operations, mainly centring around i/o intensive Merkle trie lookups (`BALANCE`, `EXTCODESIZE` &c.) and state-trie polluters (`SUICIDE`, `CREATE` and `CALL`). These operations were heavily underpriced, an oversight which lead to the recent degradation of network service. The full details of the alteration are specified in [EIP-150](https://github.com/ethereum/EIPs/issues/150).
-
-Additionally several issues have been fixed including:
-- a transaction queue limitation leading to dropped transactions;
-- a synchronisation issue leading to stalls when syncing;
-
-And some small features including database performance improvements and additional logging.
-
-#### Upgrading private chain specification files.
-
-All the chain specification files now have EIP-150 rules enabled by default. To continue using the chain add the `eip150Transition` key under `Engine/ethash/params` and set it to a future transition block as shown in [this example](https://github.com/paritytech/parity/blob/85eeb3ea6e5e21ad8e5644241edf82eb8069f536/ethcore/res/ethereum/morden.json#L13).
-
-The key related to homestead transition has been renamed from `frontierCompatibilityModeLimit` to `homesteadTransition`.
-
-#### Full changes
-
-- [beta] EIP150.1c [#2599](https://github.com/paritytech/parity/pull/2599)
-- Remove count limit for local transactions [#2634](https://github.com/paritytech/parity/pull/2634)
-- Tweak DB and mining defaults [#2598](https://github.com/paritytech/parity/pull/2598)
-- Revert "Bloom upgrade in beta" [#2635](https://github.com/paritytech/parity/pull/2635)
-- Bloom upgrade in beta [#2609](https://github.com/paritytech/parity/pull/2609)
-- Backports to beta [#2628](https://github.com/paritytech/parity/pull/2628)
-
-## Parity [v1.3.7](https://github.com/paritytech/parity/releases/tag/v1.3.7) (2016-10-12)
-
-This release contains fixes to reduce memory usage under the DoS attack and improve transaction relay.
-
-- Configurable history size in beta [#2587](https://github.com/paritytech/parity/pull/2587)
-- Backports to beta [#2592](https://github.com/paritytech/parity/pull/2592)
-
-
-## Parity [v1.3.6](https://github.com/paritytech/parity/releases/tag/v1.3.6) (2016-10-11)
-
-Parity 1.3.6 is another hotfix release to address transaction spam and deal with stability issues. With this release transaction pool gas limit no longer applies to local transactions. Full list of changes is available here:
-
-- Backports to beta v1.3.6 [#2571](https://github.com/paritytech/parity/pull/2571)
-- Use global state cache when mining [#2529](https://github.com/paritytech/parity/pull/2529)
-- Transaction queue limited by gas [#2528](https://github.com/paritytech/parity/pull/2528)
-
-## Parity [v1.3.5](https://github.com/paritytech/parity/releases/tag/v1.3.5) (2016-10-08)
-
-1.3.5 is a hotfix release for the transaction propagation issue. Transaction pool limit is now calculated based on the block gas limit.
-
-- Update appveyor rustc [beta] [#2521](https://github.com/paritytech/parity/pull/2521)
-- Increase size of transaction queue by default [#2519](https://github.com/paritytech/parity/pull/2519)
-
-## Parity [v1.3.4](https://github.com/paritytech/parity/releases/tag/v1.3.4) (2016-10-07)
-
-Parity 1.3.4 release contains more optimizations to internal caching as well as stability improvements.
-
-It also introduces an ability for miners to choose a transaction ordering strategy:
-
-    --tx-queue-strategy S    Prioritization strategy used to order transactions
-                             in the queue. S may be:
-                             gas - Prioritize txs with low gas limit;
-                             gas_price - Prioritize txs with high gas price;
-                             gas_factor - Prioritize txs using gas price
-                             and gas limit ratio [default: gas_factor].
-
-- Backport to beta [#2518](https://github.com/paritytech/parity/pull/2518)
-- [beta] Fixing RPC Filter conversion to EthFilter [#2501](https://github.com/paritytech/parity/pull/2501)
-- [beta] Using pending block only if is not old [#2515](https://github.com/paritytech/parity/pull/2515)
-- Backports into beta [#2512](https://github.com/paritytech/parity/pull/2512)
-- CLI to specify queue ordering strategy [#2494](https://github.com/paritytech/parity/pull/2494)
-- Fix ethstore opening all key files in the directory at once (BETA) [#2472](https://github.com/paritytech/parity/pull/2472)
-- Beta backports [#2465](https://github.com/paritytech/parity/pull/2465)
-- IPC-library dependency fork & bump for beta [#2455](https://github.com/paritytech/parity/pull/2455)
-
-## Parity [v1.3.3](https://github.com/paritytech/parity/releases/tag/v1.3.3) (2016-10-04)
-
-1.3.3 is another hotfix release for the DoS attack
-
-- Jumptable cache [#2435](https://github.com/paritytech/parity/pull/2435)
-- fix broken beta compilation (backport to beta) [#2414](https://github.com/paritytech/parity/pull/2414)
-- Run inplace upgrades after version update [#2411](https://github.com/paritytech/parity/pull/2411)
-
-## Parity [v1.3.2](https://github.com/paritytech/parity/releases/tag/v1.3.2) (2016-09-29)
-
-This is a hotfix release to address stability and performance issues uncovered during the network DoS attack. Full list of changes is available [here](https://github.com/paritytech/parity/compare/v1.3.1...v1.3.2)
-
-- Beta Backports [#2396](https://github.com/paritytech/parity/pull/2396)
-- Fixing penalization in future [#2493](https://github.com/paritytech/parity/pull/2493)
-- A quick fix for missing tree route blocks [#2400](https://github.com/paritytech/parity/pull/2400)
-- Cache the fork block header after snapshot restoration [#2391](https://github.com/paritytech/parity/pull/2391)
-- correct sync memory usage calculation (BETA) [#2386](https://github.com/paritytech/parity/pull/2386)
-- Accounts bloom [#2357](https://github.com/paritytech/parity/pull/2357)
-- Disable colors when generating signer token. [#2379](https://github.com/paritytech/parity/pull/2379)
-- Fixing jit feature compilation [#2376](https://github.com/paritytech/parity/pull/2376)
-- Clear state cache on sealed block import [#2377](https://github.com/paritytech/parity/pull/2377)
-- DIV optimization (beta) [#2353](https://github.com/paritytech/parity/pull/2353)
-- Canonical state cache [#2308](https://github.com/paritytech/parity/pull/2308)
-- Reorder transaction_by_hash to favour canon search [#2331](https://github.com/paritytech/parity/pull/2331)
-- Lenient bytes deserialization [#2340](https://github.com/paritytech/parity/pull/2340)
-- Penalize transactions with gas above gas limit [#2271](https://github.com/paritytech/parity/pull/2271)
-- Peek transaction queue via RPC [#2270](https://github.com/paritytech/parity/pull/2270)
-- Handle RLP to string UTF-8 decoding errors (#2217) [#2226](https://github.com/paritytech/parity/pull/2226)
-- Fixing compilation without default features [beta] [#2207](https://github.com/paritytech/parity/pull/2207)
-- Avoid cloning clean stuff [beta backport] [#2173](https://github.com/paritytech/parity/pull/2173)
-- v1.3.2 in beta [#2200](https://github.com/paritytech/parity/pull/2200)
-
-## Parity [v1.3.1](https://github.com/paritytech/parity/releases/tag/v1.3.1) (2016-09-11)
-
-1.3.1 includes many [bugfixes](https://github.com/paritytech/parity/commit/2a82fa0a47b00bedfec520a2fdd3cc31aa4ccd8c). Critical ones:
-- **Chain reorganisation fix** Transaction receipts / traces were sometimes linked with incorrect block hash. Fixed in https://github.com/paritytech/parity/commit/a9587f8965a32c84973c35ce1c8d51d07044143f
-- **Trace overflow fix** Overflow which occurred during tracing. Fixed in https://github.com/paritytech/parity/pull/1979
-
-- Backports to beta [#2068](https://github.com/paritytech/parity/pull/2068)
-- Fixing serde overflow error (#1977) [#2030](https://github.com/paritytech/parity/pull/2030)
-- Simplified db pruning detection in beta [#1924](https://github.com/paritytech/parity/pull/1924)
-- Backports to beta [#1919](https://github.com/paritytech/parity/pull/1919)
-
-## Parity [v1.3.0: "Acuity"](https://github.com/paritytech/parity/releases/tag/v1.3.0) (2016-08-12)
-
-As well as many bug fixes, 1.3.0 includes a number of important improvements including:
-- **Optimisations** Heavily optimised block/transaction processing core - up to 2x faster than 1.2 series.
-- **Database compression** Databases take as much as 30% less storage than before.
-- **State snapshotting** An installation synchronised from scratch in 1-2 minutes can be made after downloading the 140MB state snapshot. See [the wiki](https://github.com/paritytech/parity/wiki/Getting-Synced) for more information.
-- **Process isolation** The networking/chain-synchronisation is now a fully independent process.
-
-Incremental improvements include:
-- Additional [RPCs](https://github.com/paritytech/parity/wiki/JSONRPC) for transaction tracing, state diffing, VM tracing, asynchronous transaction posting, accounts metadata and message signing.
-- Improved logging, including for chain reorganisations.
-- Added a `--fast-and-loose` option for additional speed-ups which can compromise integrity on a dirty shutdown.
-- Column families to ensure maximal inter-database integrity.
-- Key naming includes date/time of creation.
-- Various improvements to networking robustness and performance.
-- Solidity compilation supported through RPC if `solc` is available.
-- Various improvements to the miner including [HTTP push work notification](https://github.com/ethcoreparitytech/parity/wiki/Mining#starting-it).
-
-Full changes:
-- Bumping Parity UI [#1920](https://github.com/paritytech/parity/pull/1920)
-- Adding entrypoints to docker images [#1909](https://github.com/paritytech/parity/pull/1909)
-- Save nodes removed from backing_overlay until commit [#1917](https://github.com/paritytech/parity/pull/1917)
-- RPC for importing geth keys [#1916](https://github.com/paritytech/parity/pull/1916)
-- Peers RPC + UI displaying active/connected/max peers [#1915](https://github.com/paritytech/parity/pull/1915)
-- RPC for deriving address from phrase. [#1912](https://github.com/paritytech/parity/pull/1912)
-- adjust polling & connection timeouts for ipc [#1910](https://github.com/paritytech/parity/pull/1910)
-- Don't return deleted nodes that are not yet flushed [#1908](https://github.com/paritytech/parity/pull/1908)
-- Wallet rpcs [#1898](https://github.com/paritytech/parity/pull/1898)
-- Fix binary serialization bug [#1907](https://github.com/paritytech/parity/pull/1907)
-- fixed #1889, .DS_Store is no longer treated as key file [#1892](https://github.com/paritytech/parity/pull/1892)
-- Purging .derefs, fixing clippy warnings. [#1890](https://github.com/paritytech/parity/pull/1890)
-- RocksDB version bump [#1904](https://github.com/paritytech/parity/pull/1904)
-- Fix ipc compilation and add ipc feature to test targets [#1902](https://github.com/paritytech/parity/pull/1902)
-- Autocreating geth dir if none and geth mode on [#1896](https://github.com/paritytech/parity/pull/1896)
-- v1.4.0 in master [#1886](https://github.com/paritytech/parity/pull/1886)
-- Adding more details to miner log [#1891](https://github.com/paritytech/parity/pull/1891)
-- moved hash.rs to bigint library [#1827](https://github.com/paritytech/parity/pull/1827)
-- fixed cache_manager lock order [#1877](https://github.com/paritytech/parity/pull/1877)
-- Fixing miner deadlock [#1885](https://github.com/paritytech/parity/pull/1885)
-- Updating WS + Increasing token validity [#1882](https://github.com/paritytech/parity/pull/1882)
-- take snapshot at specified block and slightly better informants [#1873](https://github.com/paritytech/parity/pull/1873)
-- RPC errors & logs [#1845](https://github.com/paritytech/parity/pull/1845)
-- Reduce max open files [#1876](https://github.com/paritytech/parity/pull/1876)
-- Send new block hashes to all peers [#1875](https://github.com/paritytech/parity/pull/1875)
-- Use UntrustedRlp for block verification [#1872](https://github.com/paritytech/parity/pull/1872)
-- Update cache usage on commiting block info [#1871](https://github.com/paritytech/parity/pull/1871)
-- Validating conversion U256->usize when doing gas calculation (for 32bits) [#1870](https://github.com/paritytech/parity/pull/1870)
-- Sync to peers with confirmed fork block only [#1863](https://github.com/paritytech/parity/pull/1863)
-- miner and client take spec reference [#1853](https://github.com/paritytech/parity/pull/1853)
-- Unlock account with timeout for geth compatibility [#1854](https://github.com/paritytech/parity/pull/1854)
-- Fixed reported max height and transaction propagation [#1852](https://github.com/paritytech/parity/pull/1852)
-- Snapshot creation and restoration [#1679](https://github.com/paritytech/parity/pull/1679)
-- fix deprecated typo [#1850](https://github.com/paritytech/parity/pull/1850)
-- Split IO and network crates [#1828](https://github.com/paritytech/parity/pull/1828)
-- updated classic JSON spec with classic bootnodes, fixes #1842 [#1847](https://github.com/paritytech/parity/pull/1847)
-- protect unsafety in plainhasher; get more unique hashes [#1841](https://github.com/paritytech/parity/pull/1841)
-- use mutex in dbtransaction [#1843](https://github.com/paritytech/parity/pull/1843)
-- Fix state not using "account_starting_nonce" [#1830](https://github.com/paritytech/parity/pull/1830)
-- Supporting blockid in eth_call and trace_call/trace_raw [#1837](https://github.com/paritytech/parity/pull/1837)
-- eth_checkTransaction renamed to eth_checkRequest [#1817](https://github.com/paritytech/parity/pull/1817)
-- Bump json-ipc-server again [#1839](https://github.com/paritytech/parity/pull/1839)
-- Fixing another deadlock in trace db [#1833](https://github.com/paritytech/parity/pull/1833)
-- Fix up the VM trace. [#1829](https://github.com/paritytech/parity/pull/1829)
-- fixed parsing export params, fixes #1826 [#1834](https://github.com/paritytech/parity/pull/1834)
-- More performance optimizations [#1814](https://github.com/paritytech/parity/pull/1814)
-- Bumping clippy & fixing warnings [#1823](https://github.com/paritytech/parity/pull/1823)
-- removed unused code from util and unnecessary dependency of FixedHash [#1824](https://github.com/paritytech/parity/pull/1824)
-- Remove (almost all) panickers from trie module [#1776](https://github.com/paritytech/parity/pull/1776)
-- Fixing account naming [#1810](https://github.com/paritytech/parity/pull/1810)
-- JournalDB inject [#1806](https://github.com/paritytech/parity/pull/1806)
-- No block number in get work while in geth-compat mode. [#1821](https://github.com/paritytech/parity/pull/1821)
-- Import wallet fix [#1820](https://github.com/paritytech/parity/pull/1820)
-- Supporting eth_sign in Signer [#1787](https://github.com/paritytech/parity/pull/1787)
-- Fixing cache update after chain reorg [#1816](https://github.com/paritytech/parity/pull/1816)
-- Development mode for Signer UI [#1788](https://github.com/paritytech/parity/pull/1788)
-- Miner tweaks [#1797](https://github.com/paritytech/parity/pull/1797)
-- Util & ipc clenup [#1807](https://github.com/paritytech/parity/pull/1807)
-- Fixing unlock parsing [#1802](https://github.com/paritytech/parity/pull/1802)
-- fixed importing presale wallet with encseed longer than 96 bytes [#1801](https://github.com/paritytech/parity/pull/1801)
-- DRYing build scripts [#1795](https://github.com/paritytech/parity/pull/1795)
-- Allow code from spec json [#1790](https://github.com/paritytech/parity/pull/1790)
-- nano-tests (ipc transport) to the CI [#1793](https://github.com/paritytech/parity/pull/1793)
-- Commit best block after closing transaction [#1791](https://github.com/paritytech/parity/pull/1791)
-- Place thread name in the log output [#1792](https://github.com/paritytech/parity/pull/1792)
-- Fix ipc tests and bring to CI [#1789](https://github.com/paritytech/parity/pull/1789)
-- dynamic keys pickup [#1779](https://github.com/paritytech/parity/pull/1779)
-- ipc version bump [#1783](https://github.com/paritytech/parity/pull/1783)
-- Prevent deadlock on trace GC [#1780](https://github.com/paritytech/parity/pull/1780)
-- fixed trace_transaction crash when block contained suicide [#1781](https://github.com/paritytech/parity/pull/1781)
-- Fix block body migration [#1777](https://github.com/paritytech/parity/pull/1777)
-- cache manager and clearing tracing cache [#1769](https://github.com/paritytech/parity/pull/1769)
-- Return storage as H256 from RPC. [#1774](https://github.com/paritytech/parity/pull/1774)
-- Instant sealing engine [#1767](https://github.com/paritytech/parity/pull/1767)
-- fix state unsafety with a mostly-guaranteed handle [#1755](https://github.com/paritytech/parity/pull/1755)
-- Gas for mem optimization [#1768](https://github.com/paritytech/parity/pull/1768)
-- Min and Max peers setting [#1771](https://github.com/paritytech/parity/pull/1771)
-- Disable WAL [#1765](https://github.com/paritytech/parity/pull/1765)
-- Add new line when printing start strings [#1766](https://github.com/paritytech/parity/pull/1766)
-- Log tweak [#1764](https://github.com/paritytech/parity/pull/1764)
-- Remove update_sealing call on importing own block [#1762](https://github.com/paritytech/parity/pull/1762)
-- Single DB [#1741](https://github.com/paritytech/parity/pull/1741)
-- Tweak format of log so it's not so verbose. [#1758](https://github.com/paritytech/parity/pull/1758)
-- Combine mining queue and enabled into single locked datum [#1749](https://github.com/paritytech/parity/pull/1749)
-- Collect consensus/null engines into a single module [#1754](https://github.com/paritytech/parity/pull/1754)
-- Fix failing deserialization test [#1756](https://github.com/paritytech/parity/pull/1756)
-- Stackoverflow fix [#1742](https://github.com/paritytech/parity/pull/1742)
-- compaction profile used during migration, fixes #1750 [#1751](https://github.com/paritytech/parity/pull/1751)
-- Splitting documentation into separate build job [#1752](https://github.com/paritytech/parity/pull/1752)
-- handle keys deserialization errors, fixes #1592 [#1701](https://github.com/paritytech/parity/pull/1701)
-- add gitlab-ci yaml [#1753](https://github.com/paritytech/parity/pull/1753)
-- Better handling of multiple migrations [#1747](https://github.com/paritytech/parity/pull/1747)
-- Disconnect peers on a fork [#1738](https://github.com/paritytech/parity/pull/1738)
-- Add RPC & client call to replay a transaction. [#1734](https://github.com/paritytech/parity/pull/1734)
-- another version bump for jsonrpc-ipc [#1744](https://github.com/paritytech/parity/pull/1744)
-- Trace other types of calls [#1727](https://github.com/paritytech/parity/pull/1727)
-- Fixing compilation on latest nightly [#1736](https://github.com/paritytech/parity/pull/1736)
-- Blocks and snapshot compression [#1687](https://github.com/paritytech/parity/pull/1687)
-- bump json-ipc-server version [#1739](https://github.com/paritytech/parity/pull/1739)
-- Use std::sync::Condvar [#1732](https://github.com/paritytech/parity/pull/1732)
-- Bump json-ipc-server version [#1733](https://github.com/paritytech/parity/pull/1733)
-- bump json-ipc-server version [#1731](https://github.com/paritytech/parity/pull/1731)
-- Fixing some clippy warnings [#1728](https://github.com/paritytech/parity/pull/1728)
-- Bumping Parity UI [#1682](https://github.com/paritytech/parity/pull/1682)
-- Various improvements to tracing & diagnostics. [#1707](https://github.com/paritytech/parity/pull/1707)
-- Fixed reading chunked EIP8 handshake [#1712](https://github.com/paritytech/parity/pull/1712)
-- Fix for importing blocks from a pipe file [#1724](https://github.com/paritytech/parity/pull/1724)
-- Proper errors for binary serializer [#1714](https://github.com/paritytech/parity/pull/1714)
-- Use a transaction for writing blocks [#1718](https://github.com/paritytech/parity/pull/1718)
-- Exclude generated code from coverage [#1720](https://github.com/paritytech/parity/pull/1720)
-- Use single binary for ipc modules [#1710](https://github.com/paritytech/parity/pull/1710)
-- Log a chain-reorg. [#1715](https://github.com/paritytech/parity/pull/1715)
-- Restore new block informant message [#1716](https://github.com/paritytech/parity/pull/1716)
-- Parallel block body download [#1659](https://github.com/paritytech/parity/pull/1659)
-- Rotate blockchain cache [#1709](https://github.com/paritytech/parity/pull/1709)
-- Fix broken internal names. [#1711](https://github.com/paritytech/parity/pull/1711)
-- cli overhaul [#1600](https://github.com/paritytech/parity/pull/1600)
-- Key files include timestamp in name. [#1700](https://github.com/paritytech/parity/pull/1700)
-- Fixing warnings [#1705](https://github.com/paritytech/parity/pull/1705)
-- Ethereum classic [#1706](https://github.com/paritytech/parity/pull/1706)
-- Docker Arguments [#1703](https://github.com/paritytech/parity/pull/1703)
-- Informant tidyup. [#1699](https://github.com/paritytech/parity/pull/1699)
-- Name and meta in accounts [#1695](https://github.com/paritytech/parity/pull/1695)
-- Stackoverflow #1686 [#1698](https://github.com/paritytech/parity/pull/1698)
-- filtering transactions toAddress includes contract creation [#1697](https://github.com/paritytech/parity/pull/1697)
-- Prevent syncing to ancient blocks [#1693](https://github.com/paritytech/parity/pull/1693)
-- Enable WAL and disable DB repair [#1696](https://github.com/paritytech/parity/pull/1696)
-- Returning error when transaction is rejected (for consistency) [#1667](https://github.com/paritytech/parity/pull/1667)
-- Disabling signer when in geth-compatibility mode [#1676](https://github.com/paritytech/parity/pull/1676)
-- Suicides tracing [#1688](https://github.com/paritytech/parity/pull/1688)
-- small cleanup of substate.rs [#1685](https://github.com/paritytech/parity/pull/1685)
-- resolve #411: remove install scripts [#1684](https://github.com/paritytech/parity/pull/1684)
-- IPC (feature-gated) [#1654](https://github.com/paritytech/parity/pull/1654)
-- Bumping JSONRPC-http-server [#1678](https://github.com/paritytech/parity/pull/1678)
-- Fixing hash deserialisation [#1674](https://github.com/paritytech/parity/pull/1674)
-- Ping discovery nodes gradually [#1671](https://github.com/paritytech/parity/pull/1671)
-- Fixing the deadlock on incoming connection [#1672](https://github.com/paritytech/parity/pull/1672)
-- Fixing errors returned by sendTransaction* method family [#1665](https://github.com/paritytech/parity/pull/1665)
-- Moved syncing log out of the client [#1670](https://github.com/paritytech/parity/pull/1670)
-- Host validation (again) [#1666](https://github.com/paritytech/parity/pull/1666)
-- Update install-deps.sh [ci skip] [#1664](https://github.com/paritytech/parity/pull/1664)
-- fix typos [#1644](https://github.com/paritytech/parity/pull/1644)
-- Size for blocks [#1668](https://github.com/paritytech/parity/pull/1668)
-- Revert "Validating Host headers in RPC requests" [#1663](https://github.com/paritytech/parity/pull/1663)
-- Validating Host headers in RPC requests [#1658](https://github.com/paritytech/parity/pull/1658)
-- fixed failing master [#1662](https://github.com/paritytech/parity/pull/1662)
-- Fixing clippy warnings [#1660](https://github.com/paritytech/parity/pull/1660)
-- Don't ping all nodes on start [#1656](https://github.com/paritytech/parity/pull/1656)
-- More performance optimizations [#1649](https://github.com/paritytech/parity/pull/1649)
-- Removing unused client code [#1645](https://github.com/paritytech/parity/pull/1645)
-- Asynchronous transactions (polling based for now). [#1652](https://github.com/paritytech/parity/pull/1652)
-- Sync stand-alone binary and feature-gated dependencies refactoring  [#1637](https://github.com/paritytech/parity/pull/1637)
-- Re-enabling Parity UI [#1627](https://github.com/paritytech/parity/pull/1627)
-- Blockchain repair on missing state root [#1646](https://github.com/paritytech/parity/pull/1646)
-- Multi-mode logging. [#1643](https://github.com/paritytech/parity/pull/1643)
-- Pro paths [#1650](https://github.com/paritytech/parity/pull/1650)
-- Performance optimizations [#1642](https://github.com/paritytech/parity/pull/1642)
-- Removed DAO soft fork traces [#1639](https://github.com/paritytech/parity/pull/1639)
-- Compiler version update for windows [#1638](https://github.com/paritytech/parity/pull/1638)
-- Delete values immediately from DB overlay [#1631](https://github.com/paritytech/parity/pull/1631)
-- DAO hard-fork [#1483](https://github.com/paritytech/parity/pull/1483)
-- fix network_start regression [#1629](https://github.com/paritytech/parity/pull/1629)
-- Die if the DB is newer than the one supported. [#1630](https://github.com/paritytech/parity/pull/1630)
-- Cleanup of colour code. Use is_a_tty. [#1621](https://github.com/paritytech/parity/pull/1621)
-- don't batch best block for branches [#1623](https://github.com/paritytech/parity/pull/1623)
-- In-memory trie operations [#1408](https://github.com/paritytech/parity/pull/1408)
-- Fix "pending" parameter on RPC block requests [#1602](https://github.com/paritytech/parity/pull/1602)
-- Allow RPC to use solc to compile solidity [#1607](https://github.com/paritytech/parity/pull/1607)
-- IPC RPC deriving for traits [#1599](https://github.com/paritytech/parity/pull/1599)
-- Utilize cached kcov if exists [#1619](https://github.com/paritytech/parity/pull/1619)
-- Fixing no-ui feature [#1618](https://github.com/paritytech/parity/pull/1618)
-- Couple of rocksdb optimizations [#1614](https://github.com/paritytech/parity/pull/1614)
-- Miner tests [#1597](https://github.com/paritytech/parity/pull/1597)
-- Sync IPC interface [#1584](https://github.com/paritytech/parity/pull/1584)
-- Make sure reserved peers are in the node table [#1616](https://github.com/paritytech/parity/pull/1616)
-- Fix bloomchain on blockchain repair [#1610](https://github.com/paritytech/parity/pull/1610)
-- fixed broken tracing [#1615](https://github.com/paritytech/parity/pull/1615)
-- fix benchmark compilation [#1612](https://github.com/paritytech/parity/pull/1612)
-- Updating jsonrpc-http-server [#1611](https://github.com/paritytech/parity/pull/1611)
-- replace synchronization primitives with those from parking_lot [#1593](https://github.com/paritytech/parity/pull/1593)
-- ui compilation feature [#1604](https://github.com/paritytech/parity/pull/1604)
-- is_zero() and pow() optimisations for uint [#1608](https://github.com/paritytech/parity/pull/1608)
-- Optimizing & Cleaning the build [#1591](https://github.com/paritytech/parity/pull/1591)
-- Fix logging [#1590](https://github.com/paritytech/parity/pull/1590)
-- remove unnecessary mutex in logging [#1601](https://github.com/paritytech/parity/pull/1601)
-- Using streamlined parity-ui repository [#1566](https://github.com/paritytech/parity/pull/1566)
-- Optimizing InstructionInfo access. [#1595](https://github.com/paritytech/parity/pull/1595)
-- V7 Migration progress indicator [#1594](https://github.com/paritytech/parity/pull/1594)
-- bring snapshotting work into master [#1577](https://github.com/paritytech/parity/pull/1577)
-- Bump clippy [#1587](https://github.com/paritytech/parity/pull/1587)
-- refactoring of handshake messages serialization in ipc [#1586](https://github.com/paritytech/parity/pull/1586)
-- expunge &Vec<T> pattern [#1579](https://github.com/paritytech/parity/pull/1579)
-- EVM gas for memory tiny optimization [#1578](https://github.com/paritytech/parity/pull/1578)
-- cleaned up parity/signer [#1551](https://github.com/paritytech/parity/pull/1551)
-- Major sync <-> client interactions refactoring [#1572](https://github.com/paritytech/parity/pull/1572)
-- failing test with overlayrecent pruning [#1567](https://github.com/paritytech/parity/pull/1567)
-- Enable state queries for OverlayRecent DB [#1575](https://github.com/paritytech/parity/pull/1575)
-- have AccountDB use address hash for uniqueness [#1533](https://github.com/paritytech/parity/pull/1533)
-- Very basic EVM binary. [#1574](https://github.com/paritytech/parity/pull/1574)
-- Some obvious evm & uint optimizations  [#1576](https://github.com/paritytech/parity/pull/1576)
-- Fixing clippy warnings [#1568](https://github.com/paritytech/parity/pull/1568)
-- Miner's gas price gets updated dynamically [#1570](https://github.com/paritytech/parity/pull/1570)
-- bringing hypervisor as a crate in ipc dir [#1565](https://github.com/paritytech/parity/pull/1565)
-- Init public interface with IO message [#1573](https://github.com/paritytech/parity/pull/1573)
-- Uncommenting simple Miner tests [#1571](https://github.com/paritytech/parity/pull/1571)
-- Kill lock unwraps [#1558](https://github.com/paritytech/parity/pull/1558)
-- Fixing deadlock in miner [#1569](https://github.com/paritytech/parity/pull/1569)
-- Idealpeers in log [#1563](https://github.com/paritytech/parity/pull/1563)
-- Simple style fix. [#1561](https://github.com/paritytech/parity/pull/1561)
-- Enum variants serialisation test&fix [#1559](https://github.com/paritytech/parity/pull/1559)
-- Supporting /api/ping for dapps server [#1543](https://github.com/paritytech/parity/pull/1543)
-- Client IPC Interface [#1493](https://github.com/paritytech/parity/pull/1493)
-- Kill timers when removing IO handler [#1554](https://github.com/paritytech/parity/pull/1554)
-- Fix and add info messages [#1552](https://github.com/paritytech/parity/pull/1552)
-- Fix indent of #1541 [#1555](https://github.com/paritytech/parity/pull/1555)
-- Update sealing just once when  externally importing many blocks [#1541](https://github.com/paritytech/parity/pull/1541)
-- Remove soft-fork stuff. [#1548](https://github.com/paritytech/parity/pull/1548)
-- fix codegen warning [#1550](https://github.com/paritytech/parity/pull/1550)
-- Extend migration framework [#1546](https://github.com/paritytech/parity/pull/1546)
-- Refactoring dapps to support API endpoints. [#1542](https://github.com/paritytech/parity/pull/1542)
-- serde is no longer util dependency [#1534](https://github.com/paritytech/parity/pull/1534)
-- mention wiki in README [#1549](https://github.com/paritytech/parity/pull/1549)
-- Skipping transactions with invalid nonces when pushing to block. [#1545](https://github.com/paritytech/parity/pull/1545)
-- Silent running operating modes [#1477](https://github.com/paritytech/parity/pull/1477)
-- util cleanup [#1474](https://github.com/paritytech/parity/pull/1474)
-- Calculating gas using usize (if supplied gaslimit fits in usize) [#1518](https://github.com/paritytech/parity/pull/1518)
-- add owning NibbleVec [#1536](https://github.com/paritytech/parity/pull/1536)
-- Attempt to fix blochchain/extras DBs sync [#1538](https://github.com/paritytech/parity/pull/1538)
-- Client API refactoring - limiting errors to crate-level error types [#1525](https://github.com/paritytech/parity/pull/1525)
-- IPC codegen enhancement - allow void methods [#1540](https://github.com/paritytech/parity/pull/1540)
-- Fixing serving nested files for dapps. [#1539](https://github.com/paritytech/parity/pull/1539)
-- Fixed public address config [#1537](https://github.com/paritytech/parity/pull/1537)
-- Fixing compilation&clippy warnings [#1531](https://github.com/paritytech/parity/pull/1531)
-- creating ethereum dir while in geth mode [#1530](https://github.com/paritytech/parity/pull/1530)
-- Bumping clippy [#1532](https://github.com/paritytech/parity/pull/1532)
-- Make signer default as long as --unlock isn't used. [#1524](https://github.com/paritytech/parity/pull/1524)
-- add client timeout when requesting usd price for gas [#1526](https://github.com/paritytech/parity/pull/1526)
-- Fix gitter-url link in README.md [#1528](https://github.com/paritytech/parity/pull/1528)
-- Fix error message. [#1527](https://github.com/paritytech/parity/pull/1527)
-- BTreeMap binary serialization [#1489](https://github.com/paritytech/parity/pull/1489)
-- Save block reference in the queue on notification [#1501](https://github.com/paritytech/parity/pull/1501)
-- bigint tests to run on CI [#1522](https://github.com/paritytech/parity/pull/1522)
-- Client api cleaning - uncles are returned as rlp [#1516](https://github.com/paritytech/parity/pull/1516)
-- Fatdb integration with CLI [#1464](https://github.com/paritytech/parity/pull/1464)
-- Optimizing/simplifying shr [#1517](https://github.com/paritytech/parity/pull/1517)
-- change IPC codegen to allow attributes [#1500](https://github.com/paritytech/parity/pull/1500)
-- Fix warnings [#1514](https://github.com/paritytech/parity/pull/1514)
-- FatDB [#1452](https://github.com/paritytech/parity/pull/1452)
-- Fix the reseal mechanism. [#1513](https://github.com/paritytech/parity/pull/1513)
-- Update Dockerfile ubuntu-aarch64 [#1509](https://github.com/paritytech/parity/pull/1509)
-- Update Ubuntu-arm Dockerfile [#1510](https://github.com/paritytech/parity/pull/1510)
-- Update Ubuntu-jit Dockerfile [#1511](https://github.com/paritytech/parity/pull/1511)
-- Update Ubuntu Dockerfile [#1512](https://github.com/paritytech/parity/pull/1512)
-- Update CentOS Dockerfile [#1508](https://github.com/paritytech/parity/pull/1508)
-- bump status page v0.5.1 [#1502](https://github.com/paritytech/parity/pull/1502)
-- Update CentOS Dockerfile [#1507](https://github.com/paritytech/parity/pull/1507)
-- Update Dockerfile ubuntu-aarch64 [#1506](https://github.com/paritytech/parity/pull/1506)
-- Update Ubuntu-arm Dockerfile [#1505](https://github.com/paritytech/parity/pull/1505)
-- Update Ubuntu-jit Dockerfile [#1504](https://github.com/paritytech/parity/pull/1504)
-- Update Ubuntu Dockerfile [#1503](https://github.com/paritytech/parity/pull/1503)
-- Optionally clone block behind work-package [#1497](https://github.com/paritytech/parity/pull/1497)
-- Fix no colour on windows. [#1498](https://github.com/paritytech/parity/pull/1498)
-- Workaround for hyper panic [#1495](https://github.com/paritytech/parity/pull/1495)
-- Colourful notification on mine [#1488](https://github.com/paritytech/parity/pull/1488)
-- Quick fix for max open files error [#1494](https://github.com/paritytech/parity/pull/1494)
-- Work notification over HTTP [#1491](https://github.com/paritytech/parity/pull/1491)
-- Sealed block importing and propagation optimization [#1478](https://github.com/paritytech/parity/pull/1478)
-- vm factory to mining client [#1487](https://github.com/paritytech/parity/pull/1487)
-- topbar dialog fix [#1479](https://github.com/paritytech/parity/pull/1479)
-- Minor additions to allow resetting of code. [#1482](https://github.com/paritytech/parity/pull/1482)
-- Introduce options for fine-grained management of work queue. [#1484](https://github.com/paritytech/parity/pull/1484)
-- Snapshot state restoration [#1308](https://github.com/paritytech/parity/pull/1308)
-- Merge master into pv64 branch [#1486](https://github.com/paritytech/parity/pull/1486)
-- Ensure we don't reject our own transactions for gasprice. [#1485](https://github.com/paritytech/parity/pull/1485)
-- Signing parity executable & windows installer in appveyor [#1481](https://github.com/paritytech/parity/pull/1481)
-- Rearrange fork CLI options. [#1476](https://github.com/paritytech/parity/pull/1476)
-- give appveyor some breath [#1475](https://github.com/paritytech/parity/pull/1475)
-- Ensure we always get the latest work when mining on submitted. [#1469](https://github.com/paritytech/parity/pull/1469)
-- Tests for views [#1471](https://github.com/paritytech/parity/pull/1471)
-- json ipc version bump [#1470](https://github.com/paritytech/parity/pull/1470)
-- verifier is no longer a template type of client [#1467](https://github.com/paritytech/parity/pull/1467)
-- Allow configuration of when to reseal blocks. [#1460](https://github.com/paritytech/parity/pull/1460)
-- removed unsafe code [#1466](https://github.com/paritytech/parity/pull/1466)
-- WS bump + Adding default for value [#1465](https://github.com/paritytech/parity/pull/1465)
-- Attempt DB repair if corrupted [#1461](https://github.com/paritytech/parity/pull/1461)
-- Database configuration extended [#1454](https://github.com/paritytech/parity/pull/1454)
-- Updating WS-RS server [#1459](https://github.com/paritytech/parity/pull/1459)
-- Reduced IO messages; removed panics on IO notifications [#1457](https://github.com/paritytech/parity/pull/1457)
-- Handle errors when starting parity --signer [#1451](https://github.com/paritytech/parity/pull/1451)
-- Fixed losing queued blocks on error [#1453](https://github.com/paritytech/parity/pull/1453)
-- Updated to latest hyper with patched mio [#1450](https://github.com/paritytech/parity/pull/1450)
-- Retweak BASE and MULTIPLIER in rocksdb config. [#1445](https://github.com/paritytech/parity/pull/1445)
-- Removing Miner::default. [#1410](https://github.com/paritytech/parity/pull/1410)
-- Don't mine without --author [#1436](https://github.com/paritytech/parity/pull/1436)
-- Revert the rescuedao extradata. [#1437](https://github.com/paritytech/parity/pull/1437)
-- More conservative settings for rocksdb. [#1440](https://github.com/paritytech/parity/pull/1440)
-- v1.3.0 in master [#1421](https://github.com/paritytech/parity/pull/1421)
-- Update Ubuntu-arm Dockerfile [#1429](https://github.com/paritytech/parity/pull/1429)
-- Create Dockerfile ubuntu-aarch64 [#1430](https://github.com/paritytech/parity/pull/1430)
-- Update CentOS Dockerfile [#1424](https://github.com/paritytech/parity/pull/1424)
-- Update Ubuntu Dockerfile [#1426](https://github.com/paritytech/parity/pull/1426)
-- Update Ubuntu-jit Dockerfile [#1427](https://github.com/paritytech/parity/pull/1427)
-- Update SF blocknumber to 1800000. [#1418](https://github.com/paritytech/parity/pull/1418)
-
-## Parity [v1.2.4](https://github.com/paritytech/parity/releases/tag/v1.2.4) (2016-08-09)
-
-Parity 1.2.4 Is a maintenance release that fixes a [few](https://github.com/paritytech/parity/pull/1888/commits) issues related to mining and peer synchronization.
-This release is marked as stable.
-
-- Backports for beta [#1888](https://github.com/paritytech/parity/pull/1888)
-- BETA: fixed trace_transaction crash when block contained suicide [#1782](https://github.com/paritytech/parity/pull/1782)
-
-## Parity [v1.2.3](https://github.com/paritytech/parity/releases/tag/v1.2.3) (2016-07-31)
-
-Parity 1.2.3 is a patch release that addresses network stability issues for both Ethereum HF and Ethereum classic chains and brings a few changes to the transaction tracing API.
-
-#### Tracing API changes
-- Added tracing for `CALLCODE`, `DELEGATECALL` and `SUICIDE`
-- `trace_call` returns traces in flat format
-- Added 2 new methods: `trace_rawTransaction` and `trace_replayTransaction`
-
-Note that to continue using tracing features in this version you need to re-sync the blockchain. This can be done by using `parity export $HOME/ethereum-chain-backup.rlp` , deleting the database usually located at `~/.parity/906a34e69aec8c0d` followed by `parity import $HOME/ethereum-chain-backup.rlp`.
-
-- [beta] Updating UI [#1778](https://github.com/paritytech/parity/pull/1778)
-- tracing backport [#1770](https://github.com/paritytech/parity/pull/1770)
-- Backport commits to beta [#1763](https://github.com/paritytech/parity/pull/1763)
-- Deadlock on incoming connection (#1672) [#1675](https://github.com/paritytech/parity/pull/1675)
-- [BETA] Removed DAO soft fork traces [#1640](https://github.com/paritytech/parity/pull/1640)
-
-
-## Parity [v1.2.2](https://github.com/paritytech/parity/releases/tag/v1.2.2) (2016-07-16)
-
-#### New
-- DAO hard-fork.
-
-DAO hard-fork implementation conforms to the [specification](https://blog.slock.it/hard-fork-specification-24b889e70703) and is enabled by default.
-
-#### Changed
-- `--reseal-on-txs` defaults to `own`.
-- DAO soft-fork support has been removed along with related command line options.
-
-#### Resolved issues
-- `--db-cache-size` consuming too much memory.
-  `eth_getWork` RPC response additionally includes the block number.
-- Skipping transactions with invalid nonces when pushing to block.
-- Update sealing just once when externally importing many blocks (#1541).
-- Transaction tracing skipping simple transactions (#1606).
-- Other small fixes and improvements.
-
-Full changelog
-
-- DAO hard-fork (#1483) [#1636](https://github.com/paritytech/parity/pull/1636)
-- Backports for beta [#1628](https://github.com/paritytech/parity/pull/1628)
-- don't batch best block for branches (#1623) [#1626](https://github.com/paritytech/parity/pull/1626)
-- Merge bugfixes from master to beta [#1605](https://github.com/paritytech/parity/pull/1605)
-- (BETA) using block options cache instead of general cache for rocksdb [#1613](https://github.com/paritytech/parity/pull/1613)
-- Backport sealing fixes to beta [#1583](https://github.com/paritytech/parity/pull/1583)
-- v1.2.2 in beta [#1581](https://github.com/paritytech/parity/pull/1581)
-- Skipping transactions with invalid nonces when pushing to block. (#1545) [#1547](https://github.com/paritytech/parity/pull/1547)
-
-
-## Parity [v1.2.1](https://github.com/paritytech/parity/releases/tag/v1.2.1) (2016-07-01)
-
-#### New
-- Options for more precise mining tuning (see below).
-- Informative notification when block mined.
-- HTTP signal on new work-package.
-- Optimised database insertion for self-mined blocks.
-- Short-circuit for local transaction gas-price approval.
-- A number of issues related to mining have been fixed.
-
-##### Mining options
-- `--author` is now required for mining.
-- `--reseal-on-txs` Specify which transactions should force the node to reseal a block. By default parity updates the seal on incoming transactions to reduce transaction latency. Set this option to `none` to force updates on new blocks only.
-- `--reseal-min-period` Can be used to control how often a new pending block is generated if `none` is not selected on prior option.
-- `--work-queue-size` Controls how many pending blocks to keep in memory.
-- `--relay-set`  Can be used to enable more strict transaction verification.
-- `--remove-solved` Move solved blocks from the work package queue instead of cloning them. This gives a slightly faster import speed, but means that extra solutions submitted for the same work package will go unused.
-- `--notify-work` Accepts a list of URLs that will receive a POST request when new work package is available. The body of the POST message is JSON encoded and has the same format as `eth_getWork` RPC response.
-
-##### RPC
-
-`eth_getWork` RPC response additionally includes the block number.
-
-##### DAO soft-fork
-
-DAO soft-fork control options have been replaced by the single `--fork` option which disables the soft-fork by default.
-
-#### Changes
-
-- v1.2.1 in beta [#1492](https://github.com/paritytech/parity/pull/1492)
-- (BETA) add artifacts [#1420](https://github.com/paritytech/parity/pull/1420)
-
-## Parity [v1.2.0: "Security"](https://github.com/paritytech/parity/releases/tag/v1.2.0) (2016-06-24)
-
-[Blog post](https://blog.parity.io/announcing-parity-1-2/)
-
-#### New
-
-- Transaction signing UI.
-- IPC/RPC module.
-- Optimised mining support.
-- Windows build.
-- DAO soft-fork support.
-
-##### Transaction signing UI
-
-This is a new framework for signing transactions. It fulfills three requirements:
-- You should never have to type your passwords into a Dapp.
-- No Javascript code should ever hold a secret.
-- No transaction should ever be signed without the consent of the user.
-
-The feature is enabled through the `--signer` flag. When enabled, the user must ensure at least one "Signer UI" is set-up for managing transaction confirmation. There are two such UIs available; one through a Google Chrome Extension, separately installable and the second through a special web page hosted locally. Set-up must be done once for each such UI, through copying and pasting a token from the output console of Parity into the UI. Specific instructions are given in the UI.
-
-From this point on, no transaction may ever be signed by Parity except through one of these allowed Signer UIs, and no password should ever be entered anywhere else.
-
-##### IPC/RPC module and Mist/Geth compatibility
-
-Should be started with `--geth` to ensure Mist compatibility.
-
-##### Optimised mining support
-
-Numerous improvements and optimisations have been added to our mining implementation. A large "active queue" ensures that late-included transactions are included in the mined block without sacrificing older results from latent-reported `ethminer` results.
-
-##### Windows build
-
-We're happy to announce full Windows support with 1.2!
-
-##### Soft-fork
-
-This release includes support for the proposed [DAO soft-fork](https://docs.google.com/document/d/10RktunzjKNfp6Y8Cu4EhR5V9IqxEZq42LU126EYhWY4/pub). Upon upgrade, all mining nodes can vote for or against the soft fork (this is done through altering the block gas limit; a gas limit of at most 4M results in the soft-fork being triggered).
-
-By default, nodes vote "for" the DAO soft-fork (and try to reduce the gas limit to 3.1M). To vote against the soft-fork (keeping it at 4.7M), run with `--dont-help-rescue-dao`. Not upgrading is not recommended; if the majority votes with a soft-fork, an upgrade will be necessary to mine on the correct chain.
-
-#### Changed
-- Fast pruning method is now default for a fresh sync.
-- Web UI renamed to Dapps UI.
-- JSONRPC and Dapps UI enabled by default.
-- CLI options ending `-off` renamed to GNU-consistent prefix `--no-`.
-- Dynamic gas-pricing (data feed and statistical techniques used to determine optimum gas prices).
-
-Full changes:
-
-- Signer enabled by default for UI [#1417](https://github.com/paritytech/parity/pull/1417)
-- Remove experimental pruning options. [#1415](https://github.com/paritytech/parity/pull/1415)
-- Fixing interface and port for parity ui [#1414](https://github.com/paritytech/parity/pull/1414)
-- Configurable gas limit cap. [#1405](https://github.com/paritytech/parity/pull/1405)
-- Bumping TopBar, Minimal SignerUI and wallet [#1413](https://github.com/paritytech/parity/pull/1413)
-- Sync: Update highest block for progress reporting [#1411](https://github.com/paritytech/parity/pull/1411)
-- Tweaked CLI options for the release [#1407](https://github.com/paritytech/parity/pull/1407)
-- Further rocksdb tuning [#1409](https://github.com/paritytech/parity/pull/1409)
-- Fixing jit compilation [#1406](https://github.com/paritytech/parity/pull/1406)
-- Bump clippy [#1403](https://github.com/paritytech/parity/pull/1403)
-- Shortcut SF condition when canon known [#1401](https://github.com/paritytech/parity/pull/1401)
-- Additional assertions for internal state of queue [#1402](https://github.com/paritytech/parity/pull/1402)
-- Replace deprecated hashdb trait names [#1394](https://github.com/paritytech/parity/pull/1394)
-- rpc api by default for ipc [#1400](https://github.com/paritytech/parity/pull/1400)
-- Ensure judging the SF trigger by relative branch [#1399](https://github.com/paritytech/parity/pull/1399)
-- Signer with unlocked account working as expected. [#1398](https://github.com/paritytech/parity/pull/1398)
-- Make --signer default. [#1392](https://github.com/paritytech/parity/pull/1392)
-- Presale wallet [#1376](https://github.com/paritytech/parity/pull/1376)
-- Removing signer connection limit [#1396](https://github.com/paritytech/parity/pull/1396)
-- Optional gas price in transactions come from statistics [#1388](https://github.com/paritytech/parity/pull/1388)
-- Update README.md with cargo install [ci-skip] [#1389](https://github.com/paritytech/parity/pull/1389)
-- Fixing possible overflow during multiplication [#1381](https://github.com/paritytech/parity/pull/1381)
-- Update SF to latest spec [#1386](https://github.com/paritytech/parity/pull/1386)
-- Sync optimization [#1385](https://github.com/paritytech/parity/pull/1385)
-- Fixing order of if statements to avoid overflows. [#1384](https://github.com/paritytech/parity/pull/1384)
-- New topbar & signer UI [#1383](https://github.com/paritytech/parity/pull/1383)
-- Install trigger for DAO-rescue soft-fork. [#1329](https://github.com/paritytech/parity/pull/1329)
-- Rocksdb flush/compact limit [#1375](https://github.com/paritytech/parity/pull/1375)
-- CentOS Dockerfile [#1377](https://github.com/paritytech/parity/pull/1377)
-- RPC method to return number of unconfirmed transactions... [#1371](https://github.com/paritytech/parity/pull/1371)
-- bump jsonrpc-http-server [#1369](https://github.com/paritytech/parity/pull/1369)
-- Fix lock order when updating sealing [#1364](https://github.com/paritytech/parity/pull/1364)
-- Update sealing on new transactions [#1365](https://github.com/paritytech/parity/pull/1365)
-- Fixed panic on aborted connection [#1370](https://github.com/paritytech/parity/pull/1370)
-- importing presale wallet [#1368](https://github.com/paritytech/parity/pull/1368)
-- Set default database file size large enough [#1363](https://github.com/paritytech/parity/pull/1363)
-- Reserved peers rpc API [#1360](https://github.com/paritytech/parity/pull/1360)
-- Fixing replacing transaction with lower gas_price result. [#1343](https://github.com/paritytech/parity/pull/1343)
-- fixed migration of empty pruning dir [#1362](https://github.com/paritytech/parity/pull/1362)
-- Transaction processing queue [#1335](https://github.com/paritytech/parity/pull/1335)
-- Fixing last nonce values in case transaction is replaced [#1359](https://github.com/paritytech/parity/pull/1359)
-- docopt is an optional dependency of ethkey and ethstore [#1358](https://github.com/paritytech/parity/pull/1358)
-- Fixing clippy warnings [#1354](https://github.com/paritytech/parity/pull/1354)
-- Reduce locking when syncing [#1357](https://github.com/paritytech/parity/pull/1357)
-- removed unnecessary logs [#1356](https://github.com/paritytech/parity/pull/1356)
-- Updating parity-dapps [#1353](https://github.com/paritytech/parity/pull/1353)
-- moved keystore tests files from util to ethstore [#1352](https://github.com/paritytech/parity/pull/1352)
-- removed redundant bigint deps [#1351](https://github.com/paritytech/parity/pull/1351)
-- Reopen "reserved peers and reserved-only flag" [#1350](https://github.com/paritytech/parity/pull/1350)
-- Configurable rocksdb cache size [#1348](https://github.com/paritytech/parity/pull/1348)
-- Fixing future order and errors when reaching limit. [#1346](https://github.com/paritytech/parity/pull/1346)
-- Removing priority on local transactions [#1342](https://github.com/paritytech/parity/pull/1342)
-- Revert "Reserved peers, reserved-only flag" [#1349](https://github.com/paritytech/parity/pull/1349)
-- Sync attack defense: Deactivate peers on invalid block bodies [#1345](https://github.com/paritytech/parity/pull/1345)
-- Reserved peers, reserved-only flag [#1347](https://github.com/paritytech/parity/pull/1347)
-- CI for ethkey and ethstore [#1341](https://github.com/paritytech/parity/pull/1341)
-- Fixed empty block body composition [#1340](https://github.com/paritytech/parity/pull/1340)
-- Provide a signer UI token by default. [#1334](https://github.com/paritytech/parity/pull/1334)
-- docker uses rustup, fixes #1337 [#1344](https://github.com/paritytech/parity/pull/1344)
-- Fixed network service dispose [#1339](https://github.com/paritytech/parity/pull/1339)
-- Sync: Cache last sync round block parents [#1331](https://github.com/paritytech/parity/pull/1331)
-- secret store separated from util [#1304](https://github.com/paritytech/parity/pull/1304)
-- --geth prevent getTransactionReceipt from using pending. [#1325](https://github.com/paritytech/parity/pull/1325)
-- Fixing locks order in miner. [#1328](https://github.com/paritytech/parity/pull/1328)
-- Update default gas limit, rename field [#1324](https://github.com/paritytech/parity/pull/1324)
-- Use constants for DatabaseConfig [#1318](https://github.com/paritytech/parity/pull/1318)
-- Fixing clippy warnings [#1321](https://github.com/paritytech/parity/pull/1321)
-- Bumping topbar. Fixing ws server closing when suspending [#1312](https://github.com/paritytech/parity/pull/1312)
-- Syncing fix [#1320](https://github.com/paritytech/parity/pull/1320)
-- Filling-in optional fields of TransactionRequest... [#1305](https://github.com/paritytech/parity/pull/1305)
-- Removing MakerOTC and DAO dapps  [#1319](https://github.com/paritytech/parity/pull/1319)
-- Disabling ethcore_set* APIs by default (+ Status page update) [#1315](https://github.com/paritytech/parity/pull/1315)
-- fixed #1180 [#1282](https://github.com/paritytech/parity/pull/1282)
-- Network start/stop [#1313](https://github.com/paritytech/parity/pull/1313)
-- Additional logging for own transactions in queue [#1311](https://github.com/paritytech/parity/pull/1311)
-- DAO Rescue soft fork [#1309](https://github.com/paritytech/parity/pull/1309)
-- Appveyor config for windows build+installer [#1302](https://github.com/paritytech/parity/pull/1302)
-- Key load avoid warning [#1303](https://github.com/paritytech/parity/pull/1303)
-- More meaningful errors when sending transaction [#1290](https://github.com/paritytech/parity/pull/1290)
-- Gas price statistics. [#1291](https://github.com/paritytech/parity/pull/1291)
-- Fix read-ahead bug. [#1298](https://github.com/paritytech/parity/pull/1298)
-- firewall rules for windows installer [#1297](https://github.com/paritytech/parity/pull/1297)
-- x64 program files path for installer [#1296](https://github.com/paritytech/parity/pull/1296)
-- Fixed loosing peers on incoming connections. [#1293](https://github.com/paritytech/parity/pull/1293)
-- fixed #1261, overflow when calculating work [#1283](https://github.com/paritytech/parity/pull/1283)
-- snappy and minor block compression [#1286](https://github.com/paritytech/parity/pull/1286)
-- clarify build instructions [#1287](https://github.com/paritytech/parity/pull/1287)
-- fixed #1255 [#1280](https://github.com/paritytech/parity/pull/1280)
-- bump rust-crypto [#1289](https://github.com/paritytech/parity/pull/1289)
-- Security audit issues fixed [#1279](https://github.com/paritytech/parity/pull/1279)
-- Fixing origin/host validation [#1273](https://github.com/paritytech/parity/pull/1273)
-- windows installer + parity start ui cli option [#1284](https://github.com/paritytech/parity/pull/1284)
-- ipc lib version bump [#1285](https://github.com/paritytech/parity/pull/1285)
-- Syncing improvements [#1274](https://github.com/paritytech/parity/pull/1274)
-- removed redundant if condition [#1270](https://github.com/paritytech/parity/pull/1270)
-- Naive chunk creation, snapshotting [#1263](https://github.com/paritytech/parity/pull/1263)
-- Fixing generating new token while another parity instance is running. [#1272](https://github.com/paritytech/parity/pull/1272)
-- README: rustup and windows instructions [#1266](https://github.com/paritytech/parity/pull/1266)
-- Windows build [#1253](https://github.com/paritytech/parity/pull/1253)
-- removed try_seal from MiningBlockChainClient [#1262](https://github.com/paritytech/parity/pull/1262)
-- simplified block opening [#1232](https://github.com/paritytech/parity/pull/1232)
-- Clippy bump [#1259](https://github.com/paritytech/parity/pull/1259)
-- Fixing uint ASM macros compilation [#1258](https://github.com/paritytech/parity/pull/1258)
-- Signer port returned from RPC + Topbar showing count of unconfirmed transactions. [#1252](https://github.com/paritytech/parity/pull/1252)
-- codegen - avoid unwraps leading to compilation crash [#1250](https://github.com/paritytech/parity/pull/1250)
-- Dapps bump [#1257](https://github.com/paritytech/parity/pull/1257)
-- Windows named pipes [#1254](https://github.com/paritytech/parity/pull/1254)
-- remove unsafety from util/hash.rs and util/bigint/uint.rs [#1236](https://github.com/paritytech/parity/pull/1236)
-- Fixing CORS settings for special values: * & null. [#1247](https://github.com/paritytech/parity/pull/1247)
-- JSONRPC test strings avoid using \ char [#1246](https://github.com/paritytech/parity/pull/1246)
-- Tests for JSON serialisation of statediff/vmtrace [#1241](https://github.com/paritytech/parity/pull/1241)
-- Bumping Dapps & TopBar to newest version. [#1245](https://github.com/paritytech/parity/pull/1245)
-- keys import [#1240](https://github.com/paritytech/parity/pull/1240)
-- Splitting RPC Apis into more fine-grained sets [#1234](https://github.com/paritytech/parity/pull/1234)
-- Refactor triedb constructors to error on invalid state root  [#1230](https://github.com/paritytech/parity/pull/1230)
-- Signer RPC method to check if signer is enabled [#1238](https://github.com/paritytech/parity/pull/1238)
-- Fixing signer behaviour when confirming transaction with wrong password. [#1237](https://github.com/paritytech/parity/pull/1237)
-- SystemUIs authorization [#1233](https://github.com/paritytech/parity/pull/1233)
-- IPC path for tesetnet with --geth compatibility [#1231](https://github.com/paritytech/parity/pull/1231)
-- Transaction tracing for eth_call [#1210](https://github.com/paritytech/parity/pull/1210)
-- Removing compilation warnings [#1227](https://github.com/paritytech/parity/pull/1227)
-- Allowing connections only from chrome-extension and self-hosted client [#1226](https://github.com/paritytech/parity/pull/1226)
-- Clippy bump & fixing warnings [#1219](https://github.com/paritytech/parity/pull/1219)
-- Bumping serde & syntex [#1216](https://github.com/paritytech/parity/pull/1216)
-- Minimal Signer UI (System UI) exposed over websockets. [#1211](https://github.com/paritytech/parity/pull/1211)
-- Switch RPC namespace form ethcore_ to trace_ [#1208](https://github.com/paritytech/parity/pull/1208)
-- Verify the state root exists before creating a State [#1217](https://github.com/paritytech/parity/pull/1217)
-- Integrate state diffing into the ethcore JSONRPC [#1206](https://github.com/paritytech/parity/pull/1206)
-- Updating topbar to latest version [#1220](https://github.com/paritytech/parity/pull/1220)
-- Loading local Dapps from FS. [#1214](https://github.com/paritytech/parity/pull/1214)
-- Ipc serialization & protocol fixes [#1188](https://github.com/paritytech/parity/pull/1188)
-- Have Ext::ret take self by value [#1187](https://github.com/paritytech/parity/pull/1187)
-- Simple WebSockets notification about new request [#1202](https://github.com/paritytech/parity/pull/1202)
-- Removing leftovers of ethminer [#1207](https://github.com/paritytech/parity/pull/1207)
-- fixed #1204 [#1205](https://github.com/paritytech/parity/pull/1205)
-- VM tracing and JSON RPC endpoint for it. [#1169](https://github.com/paritytech/parity/pull/1169)
-- devtools helpers extended [#1186](https://github.com/paritytech/parity/pull/1186)
-- Networking refactoring [#1172](https://github.com/paritytech/parity/pull/1172)
-- Client & Miner refactoring [#1195](https://github.com/paritytech/parity/pull/1195)
-- update readme [#1201](https://github.com/paritytech/parity/pull/1201)
-- Simple signing queue, confirmation APIs exposed in signer WebSockets. [#1182](https://github.com/paritytech/parity/pull/1182)
-- Using ordered hashmap to keep the order of dapps on home screen [#1199](https://github.com/paritytech/parity/pull/1199)
-- Disabling `ethcore` by default, adding x-frame-options header to dapps. [#1197](https://github.com/paritytech/parity/pull/1197)
-- transaction count verifier tests [#1196](https://github.com/paritytech/parity/pull/1196)
-- expunge x! and xx! from the codebase [#1192](https://github.com/paritytech/parity/pull/1192)
-- Database service upgrade (from the ipc branch) [#1185](https://github.com/paritytech/parity/pull/1185)
-- stop eth_syncing from returning true forever [#1181](https://github.com/paritytech/parity/pull/1181)
-- Sync fixes and tweaks [#1164](https://github.com/paritytech/parity/pull/1164)
-- Exposing RPC over Signer WebSockets [#1167](https://github.com/paritytech/parity/pull/1167)
-- implement missing rpc methods and tests [#1171](https://github.com/paritytech/parity/pull/1171)
-- json ipc server version bump [#1170](https://github.com/paritytech/parity/pull/1170)
-- Updated dependencies for windows build [#1173](https://github.com/paritytech/parity/pull/1173)
-- Framework for improved RPC unit tests [#1141](https://github.com/paritytech/parity/pull/1141)
-- remove all possible unsafe code in crypto [#1168](https://github.com/paritytech/parity/pull/1168)
-- Base for Signer Websockets server [#1158](https://github.com/paritytech/parity/pull/1158)
-- Write queue to speed-up db ipc [#1160](https://github.com/paritytech/parity/pull/1160)
-- Fixing few clippy warnings [#1163](https://github.com/paritytech/parity/pull/1163)
-- Change eth_signAndSendTransaction to personal_SignAndSendTransaction [#1154](https://github.com/paritytech/parity/pull/1154)
-- Support "earliest" and specific block parameters in RPC where possible [#1149](https://github.com/paritytech/parity/pull/1149)
-- migration fixes [#1155](https://github.com/paritytech/parity/pull/1155)
-- Empty trusted signer crate with it's general purpose described. [#1150](https://github.com/paritytech/parity/pull/1150)
-- More bootnodes for morden. [#1153](https://github.com/paritytech/parity/pull/1153)
-- move existing rpc tests into mocked module [#1151](https://github.com/paritytech/parity/pull/1151)
-- Bloomchain [#1014](https://github.com/paritytech/parity/pull/1014)
-- Renaming dapps repos. Updating dapps [#1142](https://github.com/paritytech/parity/pull/1142)
-- fixed pending transactions [#1147](https://github.com/paritytech/parity/pull/1147)
-- Basic benches to provide metrics for ipc optimizations [#1145](https://github.com/paritytech/parity/pull/1145)
-- Fixing clippy warnings [#1148](https://github.com/paritytech/parity/pull/1148)
-- correct signature of SecTrieDB::raw_mut [#1143](https://github.com/paritytech/parity/pull/1143)
-- Merge to master and start hypervisor for import/export [#1138](https://github.com/paritytech/parity/pull/1138)
-- Bumping clippy. Fixing warnings [#1139](https://github.com/paritytech/parity/pull/1139)
-- Display progress when importing [#1136](https://github.com/paritytech/parity/pull/1136)
-- foundation of simple db migration [#1128](https://github.com/paritytech/parity/pull/1128)
-- Fixpending [#1074](https://github.com/paritytech/parity/pull/1074)
-- Sync: Propagate uncles and fix status reporting [#1134](https://github.com/paritytech/parity/pull/1134)
-- Coloured, padding logging. [#1133](https://github.com/paritytech/parity/pull/1133)
-- Importing [#1132](https://github.com/paritytech/parity/pull/1132)
-- Have `die_with_error` use `fmt::Display` rather than Debug [#1116](https://github.com/paritytech/parity/pull/1116)
-- Exporting [#1129](https://github.com/paritytech/parity/pull/1129)
-- Sign and send transaction [#1124](https://github.com/paritytech/parity/pull/1124)
-- Fixing unused imports warnings [#1125](https://github.com/paritytech/parity/pull/1125)
-- Adding info messages on mined blocks [#1127](https://github.com/paritytech/parity/pull/1127)
-- Fix styling - don't mix spaces with tabs!!! [#1123](https://github.com/paritytech/parity/pull/1123)
-- Fix is_syncing so it's false as long as the update is trivial. [#1122](https://github.com/paritytech/parity/pull/1122)
-- Relock unlocked accounts after first use [#1120](https://github.com/paritytech/parity/pull/1120)
-- Avoid importing keys into wrong place. [#1119](https://github.com/paritytech/parity/pull/1119)
-- Implement receipt's gasUsed field [#1118](https://github.com/paritytech/parity/pull/1118)
-- New dapps & query parameter handling [#1113](https://github.com/paritytech/parity/pull/1113)
-- pretty print trace error [#1098](https://github.com/paritytech/parity/pull/1098)
-- New syncing strategy [#1095](https://github.com/paritytech/parity/pull/1095)
-- ethcore-db crate [#1097](https://github.com/paritytech/parity/pull/1097)
-- Fix the default for pruning. [#1107](https://github.com/paritytech/parity/pull/1107)
-- Make Id/ID and db/Db/DB usage consistent [#1105](https://github.com/paritytech/parity/pull/1105)
-- Miner holds it's own copy of spec/engine [#1091](https://github.com/paritytech/parity/pull/1091)
-- Apps listing API & Home webapp. [#1101](https://github.com/paritytech/parity/pull/1101)
-- CLI option for using JITEVM [#1103](https://github.com/paritytech/parity/pull/1103)
-- Fix up the seal fields in RPC output [#1096](https://github.com/paritytech/parity/pull/1096)
-- Fixing some warnings [#1102](https://github.com/paritytech/parity/pull/1102)
-- fixed incorrect decoding of header seal_fields. added tests. #1090 [#1094](https://github.com/paritytech/parity/pull/1094)
-- Bumping Clippy [#1093](https://github.com/paritytech/parity/pull/1093)
-- Injectable topbar support. [#1092](https://github.com/paritytech/parity/pull/1092)
-- New syncing part 1: Block collection [#1088](https://github.com/paritytech/parity/pull/1088)
-- Moving all Client public API types to separate mod & binary serialization codegen for that mod [#1051](https://github.com/paritytech/parity/pull/1051)
-- Subdomains support in content server (webapps server). [#1082](https://github.com/paritytech/parity/pull/1082)
-- Fix uncle getter [#1087](https://github.com/paritytech/parity/pull/1087)
-- Provide fallback for usd-per-eth option when offline. [#1085](https://github.com/paritytech/parity/pull/1085)
-- path centralized [#1083](https://github.com/paritytech/parity/pull/1083)
-- Limiting result of the execution to execution-specific errors [#1071](https://github.com/paritytech/parity/pull/1071)
-- Configurable keys security [#1080](https://github.com/paritytech/parity/pull/1080)
-- comma delimeting multiple cors headers [#1078](https://github.com/paritytech/parity/pull/1078)
-- Update error message [#1081](https://github.com/paritytech/parity/pull/1081)
-- Updating dapp-wallet [#1076](https://github.com/paritytech/parity/pull/1076)
-- Fixed connecting to local nodes on startup [#1070](https://github.com/paritytech/parity/pull/1070)
-- Validate signature in Tx queue [#1068](https://github.com/paritytech/parity/pull/1068)
-- moving deps to ethcore/hyper and bumping jsonrpc-http-server version [#1067](https://github.com/paritytech/parity/pull/1067)
-- Updating status page. Bringing back wallet [#1064](https://github.com/paritytech/parity/pull/1064)
-- Fix --geth IPC for MacOS. [#1062](https://github.com/paritytech/parity/pull/1062)
-- Fixing formatter for defaultExtraData [#1060](https://github.com/paritytech/parity/pull/1060)
-- --geth IPC compatibility [#1059](https://github.com/paritytech/parity/pull/1059)
-- Moving dependencies to ethcore & uniforming syntax libs through all crates [#1050](https://github.com/paritytech/parity/pull/1050)
-- update hyper branch mio [#1054](https://github.com/paritytech/parity/pull/1054)
-- IPC lib update [#1047](https://github.com/paritytech/parity/pull/1047)
-- Updating hyper-mio revision [#1048](https://github.com/paritytech/parity/pull/1048)
-- Bump ipc-lib version [#1046](https://github.com/paritytech/parity/pull/1046)
-- Tidy up CLI options and make JSONRPC & webapps on by default. [#1045](https://github.com/paritytech/parity/pull/1045)
-- Fixing clippy warnings [#1044](https://github.com/paritytech/parity/pull/1044)
-- Fixing RPC modules compatibility [#1041](https://github.com/paritytech/parity/pull/1041)
-- Fixing hyper-mio revision [#1043](https://github.com/paritytech/parity/pull/1043)
-- Updating locations of webapp stuff [#1040](https://github.com/paritytech/parity/pull/1040)
-- JSON-RPC over IPC [#1039](https://github.com/paritytech/parity/pull/1039)
-- Update nix/mio for ARM [#1036](https://github.com/paritytech/parity/pull/1036)
-- Basic Authority [#991](https://github.com/paritytech/parity/pull/991)
-- Prioritizing of local transaction [#1023](https://github.com/paritytech/parity/pull/1023)
-- Version 1.2 [#1030](https://github.com/paritytech/parity/pull/1030)
-- Bumping status page [#1033](https://github.com/paritytech/parity/pull/1033)
-
-## Parity [v1.1.0](https://github.com/paritytech/parity/releases/tag/v1.1.0) (2016-05-02)
-
-Parity 1.1.0 introduces:
-
-- Transaction tracing. Parity now optionally indexes & stores message-call/"internal transaction" information and provides additional RPC for querying.
-- Web interface for logs, status & JSON RPC.
-- Improved JSON RPC compatibility.
-- Reduced memory footprint.
-- Optimized EVM interpreter performance.
-
-Full Changes:
-
-- Exposing default extra data via ethcore RPC [#1032](https://github.com/paritytech/parity/pull/1032)
-- Net etiquette [#1028](https://github.com/paritytech/parity/pull/1028)
-- Bumping clippy & fixing warnings [#1024](https://github.com/paritytech/parity/pull/1024)
-- Tracedb interface && cli [#997](https://github.com/paritytech/parity/pull/997)
-- Switching to geth-attach supporting version of rpc core and server [#1022](https://github.com/paritytech/parity/pull/1022)
-- Fixing status page displaying homestead  [#1020](https://github.com/paritytech/parity/pull/1020)
-- Core tracedb functionality. [#996](https://github.com/paritytech/parity/pull/996)
-- RPC method for supported modules [#1019](https://github.com/paritytech/parity/pull/1019)
-- Updating status page [#1015](https://github.com/paritytech/parity/pull/1015)
-- Disabling wallet [#1017](https://github.com/paritytech/parity/pull/1017)
-- More detailed fatal error reporting [#1016](https://github.com/paritytech/parity/pull/1016)
-- Support 'pending' block in RPC [#1007](https://github.com/paritytech/parity/pull/1007)
-- Enable pending block when there is local transaction pending. [#1005](https://github.com/paritytech/parity/pull/1005)
-- updating key files permissions on save [#1010](https://github.com/paritytech/parity/pull/1010)
-- IPC JSON RPC (for external interface) [#1009](https://github.com/paritytech/parity/pull/1009)
-- Fixing Firefox authorization issues [#1013](https://github.com/paritytech/parity/pull/1013)
-- cargo update [#1012](https://github.com/paritytech/parity/pull/1012)
-- Switching to rust-url@1.0.0 [#1011](https://github.com/paritytech/parity/pull/1011)
-- Exception handling in RPC & WebApps [#988](https://github.com/paritytech/parity/pull/988)
-- Fixed uint deserialization from hex [#1008](https://github.com/paritytech/parity/pull/1008)
-- Tweak timeout and packet size to handle slow networks better [#1004](https://github.com/paritytech/parity/pull/1004)
-- db key is generic and can be made smaller [#1006](https://github.com/paritytech/parity/pull/1006)
-- IPC with new serialization [#998](https://github.com/paritytech/parity/pull/998)
-- make jsonrpc api engine agnostic [#1001](https://github.com/paritytech/parity/pull/1001)
-- updated cargo.lock [#1002](https://github.com/paritytech/parity/pull/1002)
-- updated parity dependencies [#993](https://github.com/paritytech/parity/pull/993)
-- Auto (with codegen) binary serializer  [#980](https://github.com/paritytech/parity/pull/980)
-- Fixing transaction queue last_nonces update [#995](https://github.com/paritytech/parity/pull/995)
-- import route contains ommited blocks [#994](https://github.com/paritytech/parity/pull/994)
-- fixed encoding 0u8 [#992](https://github.com/paritytech/parity/pull/992)
-- Use latest netstats [#989](https://github.com/paritytech/parity/pull/989)
-- RPC shared external miner [#984](https://github.com/paritytech/parity/pull/984)
-- Additional RPC methods for settings [#983](https://github.com/paritytech/parity/pull/983)
-- Fixing transaction_queue deadlock [#985](https://github.com/paritytech/parity/pull/985)
-- Refactoring of `parity/main.rs` [#981](https://github.com/paritytech/parity/pull/981)
-- Fixing clippy warnings. [#982](https://github.com/paritytech/parity/pull/982)
-- Bumping status page [#977](https://github.com/paritytech/parity/pull/977)
-- querying extras separated to its own module [#972](https://github.com/paritytech/parity/pull/972)
-- Exposing application logs via RPC. [#976](https://github.com/paritytech/parity/pull/976)
-- Addressing binary serialization for db types [#966](https://github.com/paritytech/parity/pull/966)
-- removed redundant unwraps [#935](https://github.com/paritytech/parity/pull/935)
-- fixed transaction queue merge conflict [#975](https://github.com/paritytech/parity/pull/975)
-- Configurable limit for transaction queue (CLI & Ethcore-RPC) [#974](https://github.com/paritytech/parity/pull/974)
-- Enforce limit caused `last_nonce` to return incorrect values. [#973](https://github.com/paritytech/parity/pull/973)
-- Even more detailed errors for transaction queue [#969](https://github.com/paritytech/parity/pull/969)
-- temporary fix of panic in blockchain garbage collection [#970](https://github.com/paritytech/parity/pull/970)
-- IPC codegen - some minor fixes & enhancements [#967](https://github.com/paritytech/parity/pull/967)
-- Additional logging for transactions [#968](https://github.com/paritytech/parity/pull/968)
-- refactored blockchain extras keys building [#963](https://github.com/paritytech/parity/pull/963)
-- Using hyper-mio branch in webapps. [#957](https://github.com/paritytech/parity/pull/957)
-- Remove nanomsg from build-dependencies [#965](https://github.com/paritytech/parity/pull/965)
-- Fix build for --target=armv7-unknown-linux-gnueabihf [#964](https://github.com/paritytech/parity/pull/964)
-- IPC RPC codegen extra feature [#962](https://github.com/paritytech/parity/pull/962)
-- IPC RPC codegen for generic implementation [#961](https://github.com/paritytech/parity/pull/961)
-- using db_path directory when upgrading [#960](https://github.com/paritytech/parity/pull/960)
-- IPC hypervisor [#958](https://github.com/paritytech/parity/pull/958)
-- Removing a transaction from queue now removes all from this sender with lower nonces. [#950](https://github.com/paritytech/parity/pull/950)
-- bump status page version 0.1.7 [#955](https://github.com/paritytech/parity/pull/955)
-- Changing cors header to be optional [#956](https://github.com/paritytech/parity/pull/956)
-- Update ARM Dockerfile [#959](https://github.com/paritytech/parity/pull/959)
-- Sensible gas limits for eth_sendTransaction [#953](https://github.com/paritytech/parity/pull/953)
-- Fix upgrade script and make parity run when no .parity dir. [#954](https://github.com/paritytech/parity/pull/954)
-- Tracing and docs for --pruning=auto. [#952](https://github.com/paritytech/parity/pull/952)
-- IPC serialization for custom parameters [#946](https://github.com/paritytech/parity/pull/946)
-- default filter from block should be Latest, not Earliest [#948](https://github.com/paritytech/parity/pull/948)
-- README.md: removes sudo from multirust installation [#943](https://github.com/paritytech/parity/pull/943)
-- Disable long lines formatting + ethash example. [#939](https://github.com/paritytech/parity/pull/939)
-- Ethcore-specific RPC methods for altering miner parameters. [#934](https://github.com/paritytech/parity/pull/934)
-- Use ethcore nanomsg bindings [#941](https://github.com/paritytech/parity/pull/941)
-- Update IPC codegen to latest syntax libs [#938](https://github.com/paritytech/parity/pull/938)
-- IPC documentation [#937](https://github.com/paritytech/parity/pull/937)
-- Bumping clippy and fixing warnings. [#936](https://github.com/paritytech/parity/pull/936)
-- Pruning auto [#927](https://github.com/paritytech/parity/pull/927)
-- IPC persistent client link [#933](https://github.com/paritytech/parity/pull/933)
-- IPC persistent client link [#930](https://github.com/paritytech/parity/pull/930)
-- IPC handshake (negotiating protocol/api version) [#928](https://github.com/paritytech/parity/pull/928)
-- Upgrade logic between versions [#914](https://github.com/paritytech/parity/pull/914)
-- executive tracing cleanup [#903](https://github.com/paritytech/parity/pull/903)
-- Ethcore-specific RPC methods [#923](https://github.com/paritytech/parity/pull/923)
-- Parameter to allow user to force the sealing mechanism [#918](https://github.com/paritytech/parity/pull/918)
-- updated dependencies [#921](https://github.com/paritytech/parity/pull/921)
-- Fixed send transaction deadlock [#920](https://github.com/paritytech/parity/pull/920)
-- --unlock is comma-delimited. [#916](https://github.com/paritytech/parity/pull/916)
-- fixed eth_getLogs [#915](https://github.com/paritytech/parity/pull/915)
-- create provided custom dir for keys if none [#912](https://github.com/paritytech/parity/pull/912)
-- spec loading cleanup [#858](https://github.com/paritytech/parity/pull/858)
-- WebApps HTTP Basic Auth Support [#906](https://github.com/paritytech/parity/pull/906)
-- Removing match on constant [#888](https://github.com/paritytech/parity/pull/888)
-- Update auth.rs [#907](https://github.com/paritytech/parity/pull/907)
-- Enabling webapps compilation by default [#904](https://github.com/paritytech/parity/pull/904)
-- fixed #895 [#898](https://github.com/paritytech/parity/pull/898)
-- Support for compile-time included WebApplications. [#899](https://github.com/paritytech/parity/pull/899)
-- Propagate transaction queue [#894](https://github.com/paritytech/parity/pull/894)
-- Use new json RPC server [#901](https://github.com/paritytech/parity/pull/901)
-- Gracefully dying when trying to enable RPC and app is compiled without it. [#900](https://github.com/paritytech/parity/pull/900)
-- Additional logging and friendlier error messages [#893](https://github.com/paritytech/parity/pull/893)
-- Avoid signalling readiness when app is about to be closed. [#897](https://github.com/paritytech/parity/pull/897)
-- fixed #875 and added tests for eth_sendTransaction [#890](https://github.com/paritytech/parity/pull/890)
-- passing key path to all invocations [#891](https://github.com/paritytech/parity/pull/891)
-- Fixed eth_call nonce and gas handling [#892](https://github.com/paritytech/parity/pull/892)
-- ipc rpc with nano transport (simple duplex) [#886](https://github.com/paritytech/parity/pull/886)
-- Bumping clippy and fixing warnings [#889](https://github.com/paritytech/parity/pull/889)
-- More descriptive expectations to transaction queue consistency. [#878](https://github.com/paritytech/parity/pull/878)
-- uint bug - replace add with or [#879](https://github.com/paritytech/parity/pull/879)
-- Fixing typo in bigint [#877](https://github.com/paritytech/parity/pull/877)
-- update misleading cli help msg for author [#874](https://github.com/paritytech/parity/pull/874)
-- Find geth data store cross-platform. [#871](https://github.com/paritytech/parity/pull/871)
-- Import geth 1.4.0 keys [#872](https://github.com/paritytech/parity/pull/872)
-- Syntax helpers for IPC RPC (part 2) [#854](https://github.com/paritytech/parity/pull/854)
-- Fixed bootnode URL and error message [#870](https://github.com/paritytech/parity/pull/870)
-- replace popcnt with mov (861) [#867](https://github.com/paritytech/parity/pull/867)
-- weekly dependencies update [#865](https://github.com/paritytech/parity/pull/865)
-- Remove unused mut [#866](https://github.com/paritytech/parity/pull/866)
-- fixed #855 [#864](https://github.com/paritytech/parity/pull/864)
-- simplified trace from functions, removed clippy warnings [#862](https://github.com/paritytech/parity/pull/862)
-- Update deprecated HashDB methods in docs. [#857](https://github.com/paritytech/parity/pull/857)
-- refactored loading transaction json tests [#853](https://github.com/paritytech/parity/pull/853)
-- reorganised price info lookup [#852](https://github.com/paritytech/parity/pull/852)
-- Publish locally-made transactions to peers. [#850](https://github.com/paritytech/parity/pull/850)
-- Add generalbeck's token [#847](https://github.com/paritytech/parity/pull/847)
-- Fix response for mining. [#846](https://github.com/paritytech/parity/pull/846)
-- USD-based pricing of gas. [#843](https://github.com/paritytech/parity/pull/843)
-- Parity can accept older work packages [#811](https://github.com/paritytech/parity/pull/811)
-- Caching for computing seed hashes (#541) [#841](https://github.com/paritytech/parity/pull/841)
-- checking transaction queue for pending transaction [#838](https://github.com/paritytech/parity/pull/838)
-- refactored loading of state tests [#817](https://github.com/paritytech/parity/pull/817)
-- tests for deserialization of transaction from issue #835 [#837](https://github.com/paritytech/parity/pull/837)
-- unlocks with no expiration [on top of 833] [#834](https://github.com/paritytech/parity/pull/834)
-- Unlock accounts on CLI. [#833](https://github.com/paritytech/parity/pull/833)
-- Make BlockNumber optional, fix eth_call [#829](https://github.com/paritytech/parity/pull/829)
-- Test socket to common test code (ethcore-devtools) [#831](https://github.com/paritytech/parity/pull/831)
-- Use network id for the web3_net_version return. [#822](https://github.com/paritytech/parity/pull/822)
-- json-rpc web3_sha3 [#824](https://github.com/paritytech/parity/pull/824)
-- remove some unused files [#819](https://github.com/paritytech/parity/pull/819)
-- debug symbols for master/beta [#818](https://github.com/paritytech/parity/pull/818)
-- Syntax helpers for IPC RPC [#809](https://github.com/paritytech/parity/pull/809)
-- refactored loading of execution tests [#803](https://github.com/paritytech/parity/pull/803)
-- Rustfmt.toml [#805](https://github.com/paritytech/parity/pull/805)
-- install-partiy runs brew reinstall parity on osx [#810](https://github.com/paritytech/parity/pull/810)
-- Fix mining from spinning [#807](https://github.com/paritytech/parity/pull/807)
-
-## Parity [v1.0.2](https://github.com/paritytech/parity/releases/tag/v1.0.2) (2016-04-11)
-
-Parity 1.0.2 release improves Json RPC compatibility and fixes a number of stability issues.
-
-- Flush password prompt [#1031](https://github.com/paritytech/parity/pull/1031)
-- [beta] dependencies update [#949](https://github.com/paritytech/parity/pull/949)
-- Master to beta v1.0.2 [#922](https://github.com/paritytech/parity/pull/922)
-- Master to beta 1.0.2 [#908](https://github.com/paritytech/parity/pull/908)
-
-## Parity [v1.0.1](https://github.com/paritytech/parity/releases/tag/v1.0.1) (2016-03-28)
-
-Parity 1.0.1 update fixes a number of issues with Json RPC, transaction propagation and syncing.
-
-- Imporved sync error handling [#905](https://github.com/paritytech/parity/pull/905)
-- Publish locally-made transactions to peers. [#851](https://github.com/paritytech/parity/pull/851)
-- Merge fixes from master to beta [#845](https://github.com/paritytech/parity/pull/845)
-- Full sync restart on bad block [#844](https://github.com/paritytech/parity/pull/844)
-- Make BlockNumber optional, fix eth_call [#828](https://github.com/paritytech/parity/pull/828)
-- Web3sha3 beta [#826](https://github.com/paritytech/parity/pull/826)
-- Use network id for the web3_net_version return. [#821](https://github.com/paritytech/parity/pull/821)
-- Fix mining from spinning [#806](https://github.com/paritytech/parity/pull/806)
-- Merge master to beta [#796](https://github.com/paritytech/parity/pull/796)
-
-## Parity [v1.0.0](https://github.com/paritytech/parity/releases/tag/v1.0.0) (2016-03-24)
-
-Parity 1.0.0 release adds the following features:
-
-- Standard JsonRPC interface.
-- Full Homestead compatibility.
-- Transaction management.
-- Mining with external miner.
-- Account management.
-- Geth key chain compatibility.
-- Additional command line options.
-- State trie pruning.
-- Cache and queue footprint.
-- Network discovery & NAT traversal.
-- Custom chain specification files.
-
-Note that in this release the state database is in archive (full) mode by default. Run with one of the `--pruning` options to enable pruning.
-
-- First part of multi-mining support [#804](https://github.com/paritytech/parity/pull/804)
-- Fixing future-current transactions clash [#802](https://github.com/paritytech/parity/pull/802)
-- Increase threads to num_cpus & fix author reporting [#800](https://github.com/paritytech/parity/pull/800)
-- another batch of rpc improvements [#798](https://github.com/paritytech/parity/pull/798)
-- Avoid tracing DELEGATECALL and CALLCODE. Plus tests for it. [#794](https://github.com/paritytech/parity/pull/794)
-- complete getting started steps for OS X [#793](https://github.com/paritytech/parity/pull/793)
-- Auto detect available port (with fixed test) [#788](https://github.com/paritytech/parity/pull/788)
-- eth_getTransactionReceipt [#792](https://github.com/paritytech/parity/pull/792)
-- Comprehensive tests for tracing transactions [#791](https://github.com/paritytech/parity/pull/791)
-- Disable preparing work package if miners don't ask for it. [#771](https://github.com/paritytech/parity/pull/771)
-- Listen on all interfaces for JSONRPC by default. [#786](https://github.com/paritytech/parity/pull/786)
-- eth_call [#783](https://github.com/paritytech/parity/pull/783)
-- Revert "Auto detect available port" [#789](https://github.com/paritytech/parity/pull/789)
-- added output to execution result [#777](https://github.com/paritytech/parity/pull/777)
-- Auto detect available port [#782](https://github.com/paritytech/parity/pull/782)
-- Allow 0x prefix for --author. [#785](https://github.com/paritytech/parity/pull/785)
-- updated dependencies, moved rpctest to its own submodule [#784](https://github.com/paritytech/parity/pull/784)
-- use ethjson module to load chain json tests [#778](https://github.com/paritytech/parity/pull/778)
-- Tracing implemented. [#772](https://github.com/paritytech/parity/pull/772)
-- test ethjson module on travis [#780](https://github.com/paritytech/parity/pull/780)
-- batch of rpc fixes [#775](https://github.com/paritytech/parity/pull/775)
-- rpctest executable [#757](https://github.com/paritytech/parity/pull/757)
-- Refactoring error transaction_queue error handling and `update_sealing` method. [#753](https://github.com/paritytech/parity/pull/753)
-- Avoid importing transactions with gas above 1.1*block_gas_limit to transaction queue [#760](https://github.com/paritytech/parity/pull/760)
-- Removing transactions that failed to be pushed to block. [#752](https://github.com/paritytech/parity/pull/752)
-- Updating clippy [#766](https://github.com/paritytech/parity/pull/766)
-- Attempting to add all transactions to mined block [#754](https://github.com/paritytech/parity/pull/754)
-- Prettier version w/o git dir; Use rustc compile time version [#761](https://github.com/paritytech/parity/pull/761)
-- Stop adding transactions to queue while not fully synced [#751](https://github.com/paritytech/parity/pull/751)
-- Verify sender's balance before importing transaction to queue [#746](https://github.com/paritytech/parity/pull/746)
-- Returning number of transactions pending in block not queue [#750](https://github.com/paritytech/parity/pull/750)
-- Speeding up build [#733](https://github.com/paritytech/parity/pull/733)
-- adding check for a sync when giving work to miner [#742](https://github.com/paritytech/parity/pull/742)
-- json deserialization module [#745](https://github.com/paritytech/parity/pull/745)
-- Update install-parity.sh [#749](https://github.com/paritytech/parity/pull/749)
-- Restart sync on getting old unknown header [#747](https://github.com/paritytech/parity/pull/747)
-- Missing return for #737 [#744](https://github.com/paritytech/parity/pull/744)
-- Enact block with uncles test [#741](https://github.com/paritytech/parity/pull/741)
-- Fix outdated libc version on dependency [#740](https://github.com/paritytech/parity/pull/740)
-- Fixing possible race in transaction queue [#735](https://github.com/paritytech/parity/pull/735)
-- Sync fixed again [#737](https://github.com/paritytech/parity/pull/737)
-- Don't change best block until extras is committed. [#734](https://github.com/paritytech/parity/pull/734)
-- stable only until travis speedup [#736](https://github.com/paritytech/parity/pull/736)
-- Optimizing uint operations (architecture independent) [#629](https://github.com/paritytech/parity/pull/629)
-- Add RLP, not a data item. [#725](https://github.com/paritytech/parity/pull/725)
-- PV63 receipts response [#687](https://github.com/paritytech/parity/pull/687)
-- another batch of rpc tests [#723](https://github.com/paritytech/parity/pull/723)
-- dockerfiles update [#726](https://github.com/paritytech/parity/pull/726)
-- Lock reports to avoid out of order badness. [#721](https://github.com/paritytech/parity/pull/721)
-- Fixed handshake leak [#722](https://github.com/paritytech/parity/pull/722)
-- Allow configuration of target gas limit. [#719](https://github.com/paritytech/parity/pull/719)
-- Version 1.1 in master [#714](https://github.com/paritytech/parity/pull/714)
-- Silence UDP warnings [#720](https://github.com/paritytech/parity/pull/720)
-- Rpc personal tests [#715](https://github.com/paritytech/parity/pull/715)
-- Fixing warnings [#704](https://github.com/paritytech/parity/pull/704)
-- docopts cleanups [#713](https://github.com/paritytech/parity/pull/713)
-- Removed rocksdb build dependency [#717](https://github.com/paritytech/parity/pull/717)
-- Fixed splitting Neighbours packet [#710](https://github.com/paritytech/parity/pull/710)
-- management of account expiration & memory [#701](https://github.com/paritytech/parity/pull/701)
-- Remove EarlyMerge from user docs. [#708](https://github.com/paritytech/parity/pull/708)
-- Fixes and traces for refcountdb. [#705](https://github.com/paritytech/parity/pull/705)
-- Check for NULL_RLP in AccountDB [#706](https://github.com/paritytech/parity/pull/706)
-- ethminer as crate [#700](https://github.com/paritytech/parity/pull/700)
-- Old ref-counted DB code [#692](https://github.com/paritytech/parity/pull/692)
-- next batch of rpc tests and fixes [#699](https://github.com/paritytech/parity/pull/699)
-- implemented eth_geStorageAt rpc method, added more tests for rpc [#695](https://github.com/paritytech/parity/pull/695)
-- Fix JournalDB era marker [#690](https://github.com/paritytech/parity/pull/690)
-- More sync fixes [#685](https://github.com/paritytech/parity/pull/685)
-- mark some key tests as heavy [#694](https://github.com/paritytech/parity/pull/694)
-- Limit incoming connections [#693](https://github.com/paritytech/parity/pull/693)
-- Updating clippy [#688](https://github.com/paritytech/parity/pull/688)
-- eth_accounts, eth_getBalance rpc functions && tests [#691](https://github.com/paritytech/parity/pull/691)
-- state query for archive jdb [#683](https://github.com/paritytech/parity/pull/683)
-- Fix for option 1 of JournalDB [#658](https://github.com/paritytech/parity/pull/658)
-- Rename into something that is a little more descriptive. [#689](https://github.com/paritytech/parity/pull/689)
-- JournalDB with in-memory overlay (option2) [#634](https://github.com/paritytech/parity/pull/634)
-- additional (failing) SecretStore test [#682](https://github.com/paritytech/parity/pull/682)
-- Updating clippy & fixing warnings. [#670](https://github.com/paritytech/parity/pull/670)
-- rpc web3 tests [#681](https://github.com/paritytech/parity/pull/681)
-- Making personal json-rpc configurable via cli [#677](https://github.com/paritytech/parity/pull/677)
-- RPC Pending Transactions Filter [#661](https://github.com/paritytech/parity/pull/661)
-- Rearrange journaldb infrastructure to make more extensible [#678](https://github.com/paritytech/parity/pull/678)
-- JournalDB -> Box<JournalDB>, and it's a trait. [#673](https://github.com/paritytech/parity/pull/673)
-- fix warning for transaction_queue.add usage [#676](https://github.com/paritytech/parity/pull/676)
-- Adding std::mem back (only for asm) [#680](https://github.com/paritytech/parity/pull/680)
-- update readme to exclude beta step (stable is ok) [#679](https://github.com/paritytech/parity/pull/679)
-- fixed U256 and transaction request deserialization [#675](https://github.com/paritytech/parity/pull/675)
-- More geth compatibility. [#666](https://github.com/paritytech/parity/pull/666)
-- Removing running clippy by default on nightly. [#671](https://github.com/paritytech/parity/pull/671)
-- rpc net submodule tests [#667](https://github.com/paritytech/parity/pull/667)
-- Client module overhaul [#665](https://github.com/paritytech/parity/pull/665)
-- Rpc transaction signing [#587](https://github.com/paritytech/parity/pull/587)
-- Transaction queue exposed via JSON rpc. [#652](https://github.com/paritytech/parity/pull/652)
-- Remove unneeded locking [#499](https://github.com/paritytech/parity/pull/499)
-- extend sync status interface to sync provider [#664](https://github.com/paritytech/parity/pull/664)
-- --archive is default. --pruning is option. [#663](https://github.com/paritytech/parity/pull/663)
-- jsonrpc uses client and sync interfaces [#641](https://github.com/paritytech/parity/pull/641)
-- Expose transaction insertion in sync lib [#609](https://github.com/paritytech/parity/pull/609)
-- Removing get prefix from poll_info [#660](https://github.com/paritytech/parity/pull/660)
-- Tx queue update height bug [#657](https://github.com/paritytech/parity/pull/657)
-- Tx_queue_docs -> To master [#651](https://github.com/paritytech/parity/pull/651)
-- blockchain import_route [#645](https://github.com/paritytech/parity/pull/645)
-- Stop workers before stopping event loop [#655](https://github.com/paritytech/parity/pull/655)
-- Validate sender before importing to queue [#650](https://github.com/paritytech/parity/pull/650)
-- Gas price threshold for transactions [#640](https://github.com/paritytech/parity/pull/640)
-- `dev` feature enabled when compiling without `--release` [#627](https://github.com/paritytech/parity/pull/627)
-- Don't call mark_as_bad needlessly [#648](https://github.com/paritytech/parity/pull/648)
-- Fixed sync handling large forks [#647](https://github.com/paritytech/parity/pull/647)
-- Additional documentation for transaction queue [#631](https://github.com/paritytech/parity/pull/631)
-- Transaction Queue Integration [#607](https://github.com/paritytech/parity/pull/607)
-- Keys cli [#639](https://github.com/paritytech/parity/pull/639)
-- fix build warning [#643](https://github.com/paritytech/parity/pull/643)
-- updated jsonrpc-core and http-server libs [#642](https://github.com/paritytech/parity/pull/642)
-- jsonrpc panics gracefully shutdown client [#638](https://github.com/paritytech/parity/pull/638)
-- Fixing CLI parameters [#633](https://github.com/paritytech/parity/pull/633)
-- Normal CLI options with geth. [#628](https://github.com/paritytech/parity/pull/628)
-- Do not remove the peer immediatelly on send error [#626](https://github.com/paritytech/parity/pull/626)
-- Jsonrpc block behind [#622](https://github.com/paritytech/parity/pull/622)
-- Remove println!s. [#624](https://github.com/paritytech/parity/pull/624)
-- JournalDB option 1 fix [#613](https://github.com/paritytech/parity/pull/613)
-- Network tracing cleanup [#611](https://github.com/paritytech/parity/pull/611)
-- Revert "Transaction Queue integration" [#602](https://github.com/paritytech/parity/pull/602)
-- fix benches compilation [#601](https://github.com/paritytech/parity/pull/601)
-- Transaction Queue integration [#595](https://github.com/paritytech/parity/pull/595)
-- verifier trait improvements [#597](https://github.com/paritytech/parity/pull/597)
-- build on rust stable [#600](https://github.com/paritytech/parity/pull/600)
-- Geth import silent if no geth [#599](https://github.com/paritytech/parity/pull/599)
-- Additional journaldb logging and assert [#593](https://github.com/paritytech/parity/pull/593)
-- Uncle inclusion in block authoring. [#578](https://github.com/paritytech/parity/pull/578)
-- Fixed potential deadlock on startup [#592](https://github.com/paritytech/parity/pull/592)
-- Fixing an overflow panic [#591](https://github.com/paritytech/parity/pull/591)
-- Fixed one more case of sync stalling [#590](https://github.com/paritytech/parity/pull/590)
-- JournalDB can now operate in "archive" mode [#589](https://github.com/paritytech/parity/pull/589)
-- Secret store integration with client [#586](https://github.com/paritytech/parity/pull/586)
-- fix build on nightly rust [#588](https://github.com/paritytech/parity/pull/588)
-- deserialization for uint generic [#585](https://github.com/paritytech/parity/pull/585)
-- TransactionsQueue implementation [#559](https://github.com/paritytech/parity/pull/559)
-- JSON-RPC personal service (follows #582) [#583](https://github.com/paritytech/parity/pull/583)
-- making key directory thread-safe [#582](https://github.com/paritytech/parity/pull/582)
-- verifier trait [#581](https://github.com/paritytech/parity/pull/581)
-- shrink_to_fit after removing hashes. [#580](https://github.com/paritytech/parity/pull/580)
-- support for rpc polling [#504](https://github.com/paritytech/parity/pull/504)
-- limit serde codegen only to rpc types submodule [#569](https://github.com/paritytech/parity/pull/569)
-- fork test for Issue test/568 [#573](https://github.com/paritytech/parity/pull/573)
-- Fixing clippy warnings = small refactoring of `request_blocks` [#560](https://github.com/paritytech/parity/pull/560)
-- Improved journaldb logging [#571](https://github.com/paritytech/parity/pull/571)
-- Additional check to ancient enactments. [#570](https://github.com/paritytech/parity/pull/570)
-- chainfilter shouldnt exclude to_block from results [#564](https://github.com/paritytech/parity/pull/564)
-- Fix coverage test run [#567](https://github.com/paritytech/parity/pull/567)
-- Mining [#547](https://github.com/paritytech/parity/pull/547)
-- fix uint warnings [#565](https://github.com/paritytech/parity/pull/565)
-- Finished blockchain generator. [#562](https://github.com/paritytech/parity/pull/562)
-- fixed broken master [#563](https://github.com/paritytech/parity/pull/563)
-- uint to separate crate [#544](https://github.com/paritytech/parity/pull/544)
-- improved test chain generator [#554](https://github.com/paritytech/parity/pull/554)
-- Fixing spelling in propagade->propagate [#558](https://github.com/paritytech/parity/pull/558)
-- Changing RefCell to Cell in transaction. [#557](https://github.com/paritytech/parity/pull/557)
-- Fix for morden consensus. [#556](https://github.com/paritytech/parity/pull/556)
-- blockchain generator [#550](https://github.com/paritytech/parity/pull/550)
-- Sparse Table Implementation (Row, Col) -> Val [#545](https://github.com/paritytech/parity/pull/545)
-- fixup install script [#548](https://github.com/paritytech/parity/pull/548)
-- Fixing clippy warnings [#546](https://github.com/paritytech/parity/pull/546)
-- ignore out directory [#543](https://github.com/paritytech/parity/pull/543)
-- u256 full multiplication [#539](https://github.com/paritytech/parity/pull/539)
-- Fix panic when downloading stales, update homestead transition [#537](https://github.com/paritytech/parity/pull/537)
-- changing x64 asm config [#534](https://github.com/paritytech/parity/pull/534)
-- uncomment state transition tests [#533](https://github.com/paritytech/parity/pull/533)
-- jsonrpc uses weak pointers to client [#532](https://github.com/paritytech/parity/pull/532)
-- Morden switch to Homestead rules at #494,000. [#531](https://github.com/paritytech/parity/pull/531)
-- Blockchain module cleanup [#524](https://github.com/paritytech/parity/pull/524)
-- Multiplication issue + very exhaustive tests for it [#528](https://github.com/paritytech/parity/pull/528)
-- EIP-8 [#498](https://github.com/paritytech/parity/pull/498)
-- Make "random" trie tests fully deterministic. [#527](https://github.com/paritytech/parity/pull/527)
-- udpated serde to version 0.7.0 [#526](https://github.com/paritytech/parity/pull/526)
-- Better memory management [#516](https://github.com/paritytech/parity/pull/516)
-- Typo [#523](https://github.com/paritytech/parity/pull/523)
-- U512 add/sub optimize [#521](https://github.com/paritytech/parity/pull/521)
-- Account management + geth keystore import (no utility crate added) [#509](https://github.com/paritytech/parity/pull/509)
-- Delayed UPnP initialization [#505](https://github.com/paritytech/parity/pull/505)
-- Fixing marking blocks as bad & SyncMessage bugs + small client refactoring. [#503](https://github.com/paritytech/parity/pull/503)
-- optimization of U256 [#515](https://github.com/paritytech/parity/pull/515)
-- Removed rocksdb from build scripts and instructions [#520](https://github.com/paritytech/parity/pull/520)
-- RocksDB abstraction layer + Hash index for state DB [#464](https://github.com/paritytech/parity/pull/464)
-- bloomfilter [#418](https://github.com/paritytech/parity/pull/418)
-- Fixed a race condition when connecting peer disconnects immediately [#519](https://github.com/paritytech/parity/pull/519)
-- ignore intellij idea project files as well [#518](https://github.com/paritytech/parity/pull/518)
-- updated version of unicase [#517](https://github.com/paritytech/parity/pull/517)
-- jsonrpc security, cors headers, fixed #359 [#493](https://github.com/paritytech/parity/pull/493)
-- Rust implementations to replace data tables (#161) [#482](https://github.com/paritytech/parity/pull/482)
-- fix issue with starting requested block number was not included itself [#512](https://github.com/paritytech/parity/pull/512)
-- fixed travis --org GH_TOKEN [#510](https://github.com/paritytech/parity/pull/510)
-- Improved log format [#506](https://github.com/paritytech/parity/pull/506)
-- Log address on failed connection attempt [#502](https://github.com/paritytech/parity/pull/502)
-- Bumping clippy and fixing warnings. [#501](https://github.com/paritytech/parity/pull/501)
-- Bumping versions. Fixes #496 [#500](https://github.com/paritytech/parity/pull/500)
-- Manage final user-input errors. [#494](https://github.com/paritytech/parity/pull/494)
-- Remove unneeded code, fix minor potential issue with length. [#495](https://github.com/paritytech/parity/pull/495)
-- Remove "unknown" from version string. [#488](https://github.com/paritytech/parity/pull/488)
-- Include git commit date & hash. [#486](https://github.com/paritytech/parity/pull/486)
-- Use proper version string. [#485](https://github.com/paritytech/parity/pull/485)
-- Networking fixes [#480](https://github.com/paritytech/parity/pull/480)
-- Fix potential deadlock on node table update [#484](https://github.com/paritytech/parity/pull/484)
-- Squash more warnings [#481](https://github.com/paritytech/parity/pull/481)
-- dev/test/build tools to separate crate [#477](https://github.com/paritytech/parity/pull/477)
-- Back to original slab crate [#479](https://github.com/paritytech/parity/pull/479)
-- Better user errors. [#476](https://github.com/paritytech/parity/pull/476)
-- UDP Discovery [#440](https://github.com/paritytech/parity/pull/440)
-- update readme with rust override [#475](https://github.com/paritytech/parity/pull/475)
-- fixed warnings on rust beta [#474](https://github.com/paritytech/parity/pull/474)
-- Secret store (part2 - encrypted key/value svc) [#449](https://github.com/paritytech/parity/pull/449)
-- Kill bad test. [#473](https://github.com/paritytech/parity/pull/473)
-- Make clippy an optional dependency [#422](https://github.com/paritytech/parity/pull/422)
-- parity compiling fine [#469](https://github.com/paritytech/parity/pull/469)
-- compiling ethcore on beta [#468](https://github.com/paritytech/parity/pull/468)
-- Utils compiling in beta [#467](https://github.com/paritytech/parity/pull/467)
-- Get rid of lru_cache dependency [#466](https://github.com/paritytech/parity/pull/466)
-- Add daemonization. [#459](https://github.com/paritytech/parity/pull/459)
-- Master upgrade [#448](https://github.com/paritytech/parity/pull/448)
-- Remove contributing stuff now that we have CLA bot. [#447](https://github.com/paritytech/parity/pull/447)
-- Add Morden bootnode. [#446](https://github.com/paritytech/parity/pull/446)
-- beta fixes to master [#441](https://github.com/paritytech/parity/pull/441)
-- Secret store (part1 - key management) [#423](https://github.com/paritytech/parity/pull/423)
-- Use 1100000 as the homestead transition, fix build instructions. [#438](https://github.com/paritytech/parity/pull/438)
-- More sync and propagation fixes [#420](https://github.com/paritytech/parity/pull/420)
-- back to cargo crates [#436](https://github.com/paritytech/parity/pull/436)
-- Fixing clippy warnings [#435](https://github.com/paritytech/parity/pull/435)
-- preserving root cargo lock [#434](https://github.com/paritytech/parity/pull/434)
-- Nightly fix [#432](https://github.com/paritytech/parity/pull/432)
-- nightly fixes [#431](https://github.com/paritytech/parity/pull/431)
-- Delay Homestead transition from 1,000,000. [#429](https://github.com/paritytech/parity/pull/429)
-- Nightly fix effort (still should fail) [#428](https://github.com/paritytech/parity/pull/428)
-- clippy version update, docopt-macro moving to fork [#425](https://github.com/paritytech/parity/pull/425)
-- Network/Sync fixes and optimizations [#416](https://github.com/paritytech/parity/pull/416)
-- Use latest era instead of end era as journal marker [#414](https://github.com/paritytech/parity/pull/414)
-- api changes [#402](https://github.com/paritytech/parity/pull/402)
-- Option for no init nodes. [#408](https://github.com/paritytech/parity/pull/408)
-- Fixed block_bodies not returning a list [#406](https://github.com/paritytech/parity/pull/406)
-- Fix test. [#405](https://github.com/paritytech/parity/pull/405)
-- Allow path to be configured. [#404](https://github.com/paritytech/parity/pull/404)
-- Upnp [#400](https://github.com/paritytech/parity/pull/400)
-- eth_syncing, fixed #397 [#398](https://github.com/paritytech/parity/pull/398)
-- Using modified version of ctrlc that catches SIGTERM [#399](https://github.com/paritytech/parity/pull/399)
-- Catching panics. [#396](https://github.com/paritytech/parity/pull/396)
-- jsonrpc [#391](https://github.com/paritytech/parity/pull/391)
-- Externalities tests (still clumsy) [#394](https://github.com/paritytech/parity/pull/394)
-- excluding test code itself from coverage [#395](https://github.com/paritytech/parity/pull/395)
-- Additional tweaks to options. [#390](https://github.com/paritytech/parity/pull/390)
-- --chain option for setting which network to go on. [#388](https://github.com/paritytech/parity/pull/388)
-- Ethash unit tests final [#387](https://github.com/paritytech/parity/pull/387)
-- jsonrpc [#374](https://github.com/paritytech/parity/pull/374)
-- Editorconfig file. [#384](https://github.com/paritytech/parity/pull/384)
-- Coverage effort [in progress] [#382](https://github.com/paritytech/parity/pull/382)
-- making root kcov runner simular to the one running on CI [#380](https://github.com/paritytech/parity/pull/380)
-- add gcc as a dependency to dockerfiles [#381](https://github.com/paritytech/parity/pull/381)
-- Check for handshake expiration before attempting connection replace [#375](https://github.com/paritytech/parity/pull/375)
-- Blocks propagation [#364](https://github.com/paritytech/parity/pull/364)
-- Network params. [#376](https://github.com/paritytech/parity/pull/376)
-- Add parity-node-zero to bootnodes. [#373](https://github.com/paritytech/parity/pull/373)
-- kcov uses travis_job_id instead of coveralls token [#370](https://github.com/paritytech/parity/pull/370)
-- Add parity-node-zero.ethcore.io to boot nodes. [#371](https://github.com/paritytech/parity/pull/371)
-
-## Parity [v1.0.0-rc1](https://github.com/paritytech/parity/releases/tag/v1.0.0-rc1) (2016-03-15)
-
-First Parity 1.0.0 release candidate.
-
-- Version 1.0 in beta [#712](https://github.com/paritytech/parity/pull/712)
-- Fix test for beta [#617](https://github.com/paritytech/parity/pull/617)
-- JournalDB fix option 1 for beta [#614](https://github.com/paritytech/parity/pull/614)
-- Failing test. [#606](https://github.com/paritytech/parity/pull/606)
-- Fix transition points [#604](https://github.com/paritytech/parity/pull/604)
-- (BETA) Update README.md [#549](https://github.com/paritytech/parity/pull/549)
-- (BETA) instructions for beta release channel [#456](https://github.com/paritytech/parity/pull/456)
-- (BETA) fix nightly - remerge [#454](https://github.com/paritytech/parity/pull/454)
-- (BETA) fixing nightly version for beta [#452](https://github.com/paritytech/parity/pull/452)
-
-## Parity [beta-0.9.1](https://github.com/paritytech/parity/releases/tag/beta-0.9.1) (2016-02-16)
-
-Homestead transition block changed to 1100000.
-
-- Beta patch to 0.9.1 [#445](https://github.com/paritytech/parity/pull/445)
-- Delay homestead transition [#430](https://github.com/paritytech/parity/pull/430)
-- (BETA) https link in the installer (?) [#392](https://github.com/paritytech/parity/pull/392)
-- beta: Check for handshake expiration before attempting replace [#377](https://github.com/paritytech/parity/pull/377)
-
-## Parity [beta-0.9](https://github.com/paritytech/parity/releases/tag/beta-0.9) (2016-02-08)
-
-First Parity Beta 0.9 released.
-
-- Panic on missing counters; Client cleanup [#368](https://github.com/paritytech/parity/pull/368)
-- Update README for new PPAs. [#369](https://github.com/paritytech/parity/pull/369)
-- block_queue::clear should be more thorough [#365](https://github.com/paritytech/parity/pull/365)
-- Fixed an issue with forked counters [#363](https://github.com/paritytech/parity/pull/363)
-- Install parity [#362](https://github.com/paritytech/parity/pull/362)
-- DB directory versioning [#358](https://github.com/paritytech/parity/pull/358)
-- Raise FD limit for MacOS [#357](https://github.com/paritytech/parity/pull/357)
-- Travis slack integration. [#356](https://github.com/paritytech/parity/pull/356)
-- SignedTransaction structure [#350](https://github.com/paritytech/parity/pull/350)
-- License [#354](https://github.com/paritytech/parity/pull/354)
-- Performance optimizations [#353](https://github.com/paritytech/parity/pull/353)
-- Gitter in README. [#355](https://github.com/paritytech/parity/pull/355)
-- test efforts, receipt requests [#352](https://github.com/paritytech/parity/pull/352)
-- sync tests setup & local module coverage [#348](https://github.com/paritytech/parity/pull/348)
-- install parity script [#347](https://github.com/paritytech/parity/pull/347)
-- evmjit homestead merge [#342](https://github.com/paritytech/parity/pull/342)
-- Fixed sync stalling on fork [#343](https://github.com/paritytech/parity/pull/343)
-- Remerge 264 [#334](https://github.com/paritytech/parity/pull/334)
-- Ethsync tests bfix [#339](https://github.com/paritytech/parity/pull/339)
-- Fix default options. [#335](https://github.com/paritytech/parity/pull/335)
-- sync queue limit hotfix [#338](https://github.com/paritytech/parity/pull/338)
-- Network tests, separate local coverage for utils [#333](https://github.com/paritytech/parity/pull/333)
-- fix parity version so netstats can parse it [#332](https://github.com/paritytech/parity/pull/332)
-- reveal surprise [#331](https://github.com/paritytech/parity/pull/331)
-- Revert removal of `new_code`. [#330](https://github.com/paritytech/parity/pull/330)
-- Network mod tests first part [#329](https://github.com/paritytech/parity/pull/329)
-- Look ma no `dead_code` [#323](https://github.com/paritytech/parity/pull/323)
-- Fixing JIT, Updating hook to run `ethcore` tests. [#326](https://github.com/paritytech/parity/pull/326)
-- Final docs [#327](https://github.com/paritytech/parity/pull/327)
-- update install-deps.sh [#316](https://github.com/paritytech/parity/pull/316)
-- Finish all my docs. Fix previous test compilation. [#320](https://github.com/paritytech/parity/pull/320)
-- Additional evm tests (extops, call, jumps) and some docs [#317](https://github.com/paritytech/parity/pull/317)
-- More documentation. [#318](https://github.com/paritytech/parity/pull/318)
-- Additional documentation. [#315](https://github.com/paritytech/parity/pull/315)
-- unused functions cleanup [#310](https://github.com/paritytech/parity/pull/310)
-- update ethcore.github.io documentation automatically [#311](https://github.com/paritytech/parity/pull/311)
-- Another try with travis ci credentials [#314](https://github.com/paritytech/parity/pull/314)
-- Document some stuff. [#309](https://github.com/paritytech/parity/pull/309)
-- Check block parent on import; Peer timeouts [#303](https://github.com/paritytech/parity/pull/303)
-- Increasing coverage for evm. [#306](https://github.com/paritytech/parity/pull/306)
-- ethcore docs [#301](https://github.com/paritytech/parity/pull/301)
-- Replacing secure token for deployment [#305](https://github.com/paritytech/parity/pull/305)
-- doc.sh [#299](https://github.com/paritytech/parity/pull/299)
-- Building beta-* and stable-* tags [#302](https://github.com/paritytech/parity/pull/302)
-- Deploying artifacts for tags (release/beta) [#300](https://github.com/paritytech/parity/pull/300)
-- cov.sh to show coverage locally [#298](https://github.com/paritytech/parity/pull/298)
-- benchmark fixes [#297](https://github.com/paritytech/parity/pull/297)
-- Include JSONRPC CLI options. [#296](https://github.com/paritytech/parity/pull/296)
-- travis.yml fixes [#293](https://github.com/paritytech/parity/pull/293)
-- Improve version string. [#295](https://github.com/paritytech/parity/pull/295)
-- Fixed block queue test [#294](https://github.com/paritytech/parity/pull/294)
-- Util docs [#292](https://github.com/paritytech/parity/pull/292)
-- fixed building docs [#289](https://github.com/paritytech/parity/pull/289)
-- update travis to build PRs only against master [#290](https://github.com/paritytech/parity/pull/290)
-- Coverage effort [#272](https://github.com/paritytech/parity/pull/272)
-- updated docker containers [#288](https://github.com/paritytech/parity/pull/288)
-- rpc module fixes [#287](https://github.com/paritytech/parity/pull/287)
-- Test for Receipt RLP. [#282](https://github.com/paritytech/parity/pull/282)
-- Building from source guide [#284](https://github.com/paritytech/parity/pull/284)
-- Fixed neted empty list RLP encoding [#283](https://github.com/paritytech/parity/pull/283)
-- Fix CALLDATACOPY (and bonus CODECOPY, too!). [#279](https://github.com/paritytech/parity/pull/279)
-- added travis && coveralls badge to README.md [#280](https://github.com/paritytech/parity/pull/280)
-- coveralls coverage [#277](https://github.com/paritytech/parity/pull/277)
-- Travis [in progress] [#257](https://github.com/paritytech/parity/pull/257)
-- Travis on reorganized repo [#276](https://github.com/paritytech/parity/pull/276)
-- umbrella project [#275](https://github.com/paritytech/parity/pull/275)
-- Ethash disk cache [#273](https://github.com/paritytech/parity/pull/273)
-- Parity executable name and version [#274](https://github.com/paritytech/parity/pull/274)
-- Dockerfile [#195](https://github.com/paritytech/parity/pull/195)
-- Garbage collection test fix [#267](https://github.com/paritytech/parity/pull/267)
-- Fix stCallCreateCallCodeTest, add more tests [#271](https://github.com/paritytech/parity/pull/271)
-- Moved sync out of ethcore crate; Added block validation [#265](https://github.com/paritytech/parity/pull/265)
-- RLP encoder refactoring [#252](https://github.com/paritytech/parity/pull/252)
-- Chain sync tests and minor refactoring [#264](https://github.com/paritytech/parity/pull/264)
-- Common log init function [#263](https://github.com/paritytech/parity/pull/263)
-- changed max vm depth from 128 to 64, change homestead block to 1_000_000 [#262](https://github.com/paritytech/parity/pull/262)
-- fixed blockchain tests crash on log init [#261](https://github.com/paritytech/parity/pull/261)
-- Blockchain tests and some helpers for guarding temp directory [#256](https://github.com/paritytech/parity/pull/256)
-- Fix logging and random tests. [#260](https://github.com/paritytech/parity/pull/260)
-- Fix difficulty calculation algo. [#259](https://github.com/paritytech/parity/pull/259)
-- fix submodule version [#258](https://github.com/paritytech/parity/pull/258)
-- temp dir spawn refactoring [#246](https://github.com/paritytech/parity/pull/246)
-- fixed tests submodule branch [#254](https://github.com/paritytech/parity/pull/254)
-- rpc net methods returns real peer count && protocol version [#253](https://github.com/paritytech/parity/pull/253)
-- Add homestead & random tests. [#245](https://github.com/paritytech/parity/pull/245)
-- Fixing suicide with self-refund to be consistent with CPP. [#247](https://github.com/paritytech/parity/pull/247)
-- stubs for rpc methods [#251](https://github.com/paritytech/parity/pull/251)
-- clippy, missing docs, renaming etc. [#244](https://github.com/paritytech/parity/pull/244)
-- impl missing methods in tests [#243](https://github.com/paritytech/parity/pull/243)
-- General tests and some helpers [#239](https://github.com/paritytech/parity/pull/239)
-- Note additional tests are fixed, fix doc test. [#242](https://github.com/paritytech/parity/pull/242)
-- jsonrpc http server [#193](https://github.com/paritytech/parity/pull/193)
-- Ethash nonce is H64 not a u64 [#240](https://github.com/paritytech/parity/pull/240)
-- Fix import for bcMultiChainTest [#236](https://github.com/paritytech/parity/pull/236)
-- Client basic tests [#232](https://github.com/paritytech/parity/pull/232)
-- Fix ensure_db_good() and flush_queue(), block refactoring, check block format, be strict. [#231](https://github.com/paritytech/parity/pull/231)
-- Rlp [#207](https://github.com/paritytech/parity/pull/207)
-- Schedule documentation [#219](https://github.com/paritytech/parity/pull/219)
-- U256<->H256 Conversion [#206](https://github.com/paritytech/parity/pull/206)
-- Spawning new thread when we are reaching stack limit [#217](https://github.com/paritytech/parity/pull/217)
-- Blockchain tests [#211](https://github.com/paritytech/parity/pull/211)
-- fixed failing sync test [#218](https://github.com/paritytech/parity/pull/218)
-- Removing println [#216](https://github.com/paritytech/parity/pull/216)
-- Cleaning readme [#212](https://github.com/paritytech/parity/pull/212)
-- Fixing delegatecall [#196](https://github.com/paritytech/parity/pull/196)
-- Autogenerate the Args from the docopt macro. [#205](https://github.com/paritytech/parity/pull/205)
-- Networking fixes [#202](https://github.com/paritytech/parity/pull/202)
-- Argument parsing from CLI [#204](https://github.com/paritytech/parity/pull/204)
-- Removed wildcard from clippy version [#203](https://github.com/paritytech/parity/pull/203)
-- Fixed tests and tweaked sync progress report [#201](https://github.com/paritytech/parity/pull/201)
-- Heavy tests [#199](https://github.com/paritytech/parity/pull/199)
-- Mutithreaded IO [#198](https://github.com/paritytech/parity/pull/198)
-- Populating last_hashes [#197](https://github.com/paritytech/parity/pull/197)
-- Fixing clippy stuff [#170](https://github.com/paritytech/parity/pull/170)
-- basic .travis.yml [#194](https://github.com/paritytech/parity/pull/194)
-- Generating coverage reports. [#190](https://github.com/paritytech/parity/pull/190)
-- Adding doc requests comments [#192](https://github.com/paritytech/parity/pull/192)
-- moved src/bin/client.rs -> src/bin/client/main.rs [#185](https://github.com/paritytech/parity/pull/185)
-- removed overflowing_shr [#188](https://github.com/paritytech/parity/pull/188)
-- fixed wrapping ops on latest nightly [#187](https://github.com/paritytech/parity/pull/187)
-- Pruned state DB [#176](https://github.com/paritytech/parity/pull/176)
-- Memory management for cache [#180](https://github.com/paritytech/parity/pull/180)
-- Implement signs having low-s. [#183](https://github.com/paritytech/parity/pull/183)
-- Introduce sha3 crate and use it in ethash [#178](https://github.com/paritytech/parity/pull/178)
-- Multithreaded block queue [#173](https://github.com/paritytech/parity/pull/173)
-- Iterator for NibbleSlice and TrieDB. [#171](https://github.com/paritytech/parity/pull/171)
-- Handling all possible overflows [#145](https://github.com/paritytech/parity/pull/145)
-- Global secp256k1 context [#164](https://github.com/paritytech/parity/pull/164)
-- Ethash [#152](https://github.com/paritytech/parity/pull/152)
-- Move util into here [#153](https://github.com/paritytech/parity/pull/153)
-- EVM Interpreter [#103](https://github.com/paritytech/parity/pull/103)
-- Homestead transition support, maybe. [#141](https://github.com/paritytech/parity/pull/141)
-- externalities refactor [#131](https://github.com/paritytech/parity/pull/131)
-- More open files. [#140](https://github.com/paritytech/parity/pull/140)
-- Single array for logs output. [#133](https://github.com/paritytech/parity/pull/133)
-- Client app event handler [#132](https://github.com/paritytech/parity/pull/132)
-- Various consensus fixes. [#130](https://github.com/paritytech/parity/pull/130)
-- callcode builtins tests pass [#127](https://github.com/paritytech/parity/pull/127)
-- Client state syncing [#119](https://github.com/paritytech/parity/pull/119)
-- Split externalities from executive. [#126](https://github.com/paritytech/parity/pull/126)
-- executive error on not enoguh base gas [#124](https://github.com/paritytech/parity/pull/124)
-- Gav [#125](https://github.com/paritytech/parity/pull/125)
-- builtin sets excepted to true [#123](https://github.com/paritytech/parity/pull/123)
-- More state tests. [#122](https://github.com/paritytech/parity/pull/122)
-- updated to rocksdb wrapper version 0.3 [#121](https://github.com/paritytech/parity/pull/121)
-- out_of_gas -> excepted [#120](https://github.com/paritytech/parity/pull/120)
-- Parametrizing evm::Factory [#111](https://github.com/paritytech/parity/pull/111)
-- stLogs tests passing [#118](https://github.com/paritytech/parity/pull/118)
-- Fix executive. [#117](https://github.com/paritytech/parity/pull/117)
-- Fixes for marek's shooting from the hip. [#116](https://github.com/paritytech/parity/pull/116)
-- Executive revert fix [#115](https://github.com/paritytech/parity/pull/115)
-- Fix storage/account and add butress test. [#114](https://github.com/paritytech/parity/pull/114)
-- Refactored Pod & Diff types into separate files, JSON infrastructure revamp. [#113](https://github.com/paritytech/parity/pull/113)
-- Fix storage stuff and introduce per-item dirty-tracking. [#112](https://github.com/paritytech/parity/pull/112)
-- Check logs in state tests. [#109](https://github.com/paritytech/parity/pull/109)
-- executive gas calculation fixes [#108](https://github.com/paritytech/parity/pull/108)
-- proper gas calculation in executive [#107](https://github.com/paritytech/parity/pull/107)
-- Fixing MaxDepth param for executive [#105](https://github.com/paritytech/parity/pull/105)
-- Fix determination of state roots. [#106](https://github.com/paritytech/parity/pull/106)
-- transact substracts tx_gas [#104](https://github.com/paritytech/parity/pull/104)
-- Pretty-print and fix for state. [#102](https://github.com/paritytech/parity/pull/102)
-- Tier step price. [#101](https://github.com/paritytech/parity/pull/101)
-- Refactor Diff datastructures. [#100](https://github.com/paritytech/parity/pull/100)
-- externalities use u256 instead of u64 for gas calculation [#99](https://github.com/paritytech/parity/pull/99)
-- Executive tests [#97](https://github.com/paritytech/parity/pull/97)
-- State conensus tests now print mismatching diff on fail. [#98](https://github.com/paritytech/parity/pull/98)
-- State testing framework. First test is failing. [#96](https://github.com/paritytech/parity/pull/96)
-- executive tests [#95](https://github.com/paritytech/parity/pull/95)
-- Use U512s for ether cost calculation, complete transaction API [#94](https://github.com/paritytech/parity/pull/94)
-- Utils for consensus test decoding and better layout. [#93](https://github.com/paritytech/parity/pull/93)
-- executive fixes + tests [#89](https://github.com/paritytech/parity/pull/89)
-- All transaction tests pass. Nicer testing framework. [#92](https://github.com/paritytech/parity/pull/92)
-- Block verification tests; BlockProvider blockchain trait for testing [#88](https://github.com/paritytech/parity/pull/88)
-- State::exists, docs and tests. [#87](https://github.com/paritytech/parity/pull/87)
-- Add tests module, add two more transaction tests. [#86](https://github.com/paritytech/parity/pull/86)
-- bring back removed tests, removed build warnings [#82](https://github.com/paritytech/parity/pull/82)
-- Nicer transaction validation API. Nicer OutOfBounds API in general. [#85](https://github.com/paritytech/parity/pull/85)
-- Transaction fixes and consensus tests (all passing) [#84](https://github.com/paritytech/parity/pull/84)
-- fixed getting block info in evmjit + tests [#81](https://github.com/paritytech/parity/pull/81)
-- evm tests cleanup [#80](https://github.com/paritytech/parity/pull/80)
-- renamed VmFactory -> Factory [#77](https://github.com/paritytech/parity/pull/77)
-- fixed rust-evmjit description of improper_ctypes usage [#76](https://github.com/paritytech/parity/pull/76)
-- jit feature enabled by default [#75](https://github.com/paritytech/parity/pull/75)
-- evm [#52](https://github.com/paritytech/parity/pull/52)
-- state clone [#74](https://github.com/paritytech/parity/pull/74)
-- Block Verification (no tests yet) [#72](https://github.com/paritytech/parity/pull/72)
-- Improvements to LogEntry and Transaction [#73](https://github.com/paritytech/parity/pull/73)
-- Use getter in header in preparation for a Header trait; additional testing in enact_block(). [#64](https://github.com/paritytech/parity/pull/64)
-- BlockChain sync and Client app [#55](https://github.com/paritytech/parity/pull/55)
-- Block enactment (including test) [#63](https://github.com/paritytech/parity/pull/63)
-- Block complete. Needs tests. [#62](https://github.com/paritytech/parity/pull/62)
-- More on OpenBlock::close; State::kill_account added [#61](https://github.com/paritytech/parity/pull/61)
-- Remove genesis module, add more chain specs and separate out ethereum-specific stuff [#60](https://github.com/paritytech/parity/pull/60)
-- State::new_contract, camelCase engine params, missing param [#59](https://github.com/paritytech/parity/pull/59)
-- Use reorganisation [#58](https://github.com/paritytech/parity/pull/58)
-- Initial Ethash/Block skeleton implementations. [#57](https://github.com/paritytech/parity/pull/57)
-- Spec with tested Morden genesis decoder and builtins. [#54](https://github.com/paritytech/parity/pull/54)
-- Move all chain parameters into `engine_params` [#50](https://github.com/paritytech/parity/pull/50)
-- jit ffi improvements [please review] [#51](https://github.com/paritytech/parity/pull/51)
-- blockchain [please review] [#34](https://github.com/paritytech/parity/pull/34)
-- Move information from networkparams.rs into spec.rs [#48](https://github.com/paritytech/parity/pull/48)
-- Move bulking out in Engine/Params. [#47](https://github.com/paritytech/parity/pull/47)
-- Removed need for mutation in State. [#46](https://github.com/paritytech/parity/pull/46)
-- State::code and State::storage_at + tests. [#45](https://github.com/paritytech/parity/pull/45)
-- State functions for balance and nonce operations [#44](https://github.com/paritytech/parity/pull/44)
-- Account::storage_at, Account::ensure_cached and tests. [#43](https://github.com/paritytech/parity/pull/43)
-- Additional tests. [#42](https://github.com/paritytech/parity/pull/42)
-- seal todo done [#41](https://github.com/paritytech/parity/pull/41)
-- missing rustc_serialize crate && rlp `as_list` function [#40](https://github.com/paritytech/parity/pull/40)
-- More methods in Account, documentation and tests. [#39](https://github.com/paritytech/parity/pull/39)
-- Minor reworking of Account. [#38](https://github.com/paritytech/parity/pull/38)
-- Add Account and State classes. [#37](https://github.com/paritytech/parity/pull/37)
-- Revert regressions [#36](https://github.com/paritytech/parity/pull/36)
+- Beta Backports ([#8136](https://github.com/paritytech/parity/pull/8136))
+  - Support parity protocol. ([#8035](https://github.com/paritytech/parity/pull/8035))
+  - updater: apply exponential backoff after download failure ([#8059](https://github.com/paritytech/parity/pull/8059))
+	  - updater: apply exponential backoff after download failure
+	  - updater: reset backoff on new release
+  - Max code size on Kovan ([#8067](https://github.com/paritytech/parity/pull/8067))
+	  - Enable code size limit on kovan
+	  - Fix formatting.
+  - Limit incoming connections.  ([#8060](https://github.com/paritytech/parity/pull/8060))
+	  - Limit ingress connections
+	  - Optimized handshakes logging
+  - WASM libraries bump ([#7970](https://github.com/paritytech/parity/pull/7970))
+	  - update wasmi, parity-wasm, wasm-utils to latest version
+	  - Update to new wasmi & error handling
+	  - also utilize new stack limiter
+	  - fix typo
+	  - replace dependency url
+	  - Cargo.lock update
+  - add some dos protection ([#8084](https://github.com/paritytech/parity/pull/8084))
+  - revert removing blooms ([#8066](https://github.com/paritytech/parity/pull/8066))
+  - Revert "fix traces, removed bloomchain crate, closes [#7228](https://github.com/paritytech/parity/issues/7228), closes [#7167](https://github.com/paritytech/parity/issues/7167)"
+  - Revert "fixed broken logs ([#7934](https://github.com/paritytech/parity/pull/7934))"
+	  - fixed broken logs
+	  - bring back old lock order
+	  - remove migration v13
+	  - revert CURRENT_VERSION to 12 in migration.rs
+  - more dos protection ([#8104](https://github.com/paritytech/parity/pull/8104))
+  - Const time comparison ([#8113](https://github.com/paritytech/parity/pull/8113))
+	  - Use `subtle::slices_equal` for constant time comparison.
+	  - Also update the existing version of subtle in `ethcrypto` from 0.1 to 0.5
+	  - Test specifically for InvalidPassword error.
+  - fix trace filter returning returning unrelated reward calls, closes #8070 ([#8098](https://github.com/paritytech/parity/pull/8098))
+  - network: init discovery using healthy nodes ([#8061](https://github.com/paritytech/parity/pull/8061))
+	  - network: init discovery using healthy nodes
+	  - network: fix style grumble
+	  - network: fix typo
+  - Postpone Kovan hard fork ([#8137](https://github.com/paritytech/parity/pull/8137))
+	  - ethcore: postpone Kovan hard fork
+	  - util: update version fork metadata
+  - Disable UI by default. ([#8105](https://github.com/paritytech/parity/pull/8105))
+  - dapps: update parity-ui dependencies ([#8160](https://github.com/paritytech/parity/pull/8160))
+- Probe changes one step deeper ([#8134](https://github.com/paritytech/parity/pull/8134)) ([#8135](https://github.com/paritytech/parity/pull/8135))
+- Beta backports ([#8053](https://github.com/paritytech/parity/pull/8053))
+  - CI: Fix cargo cache ([#7968](https://github.com/paritytech/parity/pull/7968))
+	  - Fix cache
+	  - Only clean locked cargo cache on windows
+  - fixed ethstore sign ([#8026](https://github.com/paritytech/parity/pull/8026))
+  - fixed parsing ethash seals and verify_block_undordered ([#8031](https://github.com/paritytech/parity/pull/8031))
+  - fix for verify_block_basic crashing on invalid transaction rlp ([#8032](https://github.com/paritytech/parity/pull/8032))
+  - fix cache & snapcraft CI build ([#8052](https://github.com/paritytech/parity/pull/8052))
+  - Add MCIP-6 Byzyantium transition to Musicoin spec ([#7841](https://github.com/paritytech/parity/pull/7841))
+	  - Add test chain spec for musicoin byzantium testnet
+	  - Add MCIP-6 Byzyantium transition to Musicoin spec
+	  - Update mcip6_byz.json
+	  - ethcore: update musicoin byzantium block number
+	  - ethcore: update musicoin bootnodes
+	  - Update musicoin.json
+	  - More bootnodes.
+- Make 1.10 beta ([#8022](https://github.com/paritytech/parity/pull/8022))
+  - Make 1.10 beta
+  - Fix gitlab builds
+- SecretStore: secretstore_generateDocumentKey RPC ([#7864](https://github.com/paritytech/parity/pull/7864))
+- SecretStore: ECDSA session for cases when 2*t < N ([#7739](https://github.com/paritytech/parity/pull/7739))
+- bump tiny-keccak ([#8019](https://github.com/paritytech/parity/pull/8019))
+- Remove un-necessary comment ([#8014](https://github.com/paritytech/parity/pull/8014))
+- clean up account fmt::Debug ([#7983](https://github.com/paritytech/parity/pull/7983))
+- improve quality of vote_collector module ([#7984](https://github.com/paritytech/parity/pull/7984))
+- ExecutedBlock cleanup ([#7991](https://github.com/paritytech/parity/pull/7991))
+- Hardware-wallet/usb-subscribe-refactor ([#7860](https://github.com/paritytech/parity/pull/7860))
+- remove wildcard imports from views, make tests more idiomatic ([#7986](https://github.com/paritytech/parity/pull/7986))
+- moved PerfTimer to a separate crate - "trace-time" ([#7985](https://github.com/paritytech/parity/pull/7985))
+- clean up ethcore::spec module imports ([#7990](https://github.com/paritytech/parity/pull/7990))
+- rpc: don't include current block in new_block_filter ([#7982](https://github.com/paritytech/parity/pull/7982))
+- fix traces, removed bloomchain crate ([#7979](https://github.com/paritytech/parity/pull/7979))
+- simplify compression and move it out of rlp crate ([#7957](https://github.com/paritytech/parity/pull/7957))
+- removed old migrations ([#7974](https://github.com/paritytech/parity/pull/7974))
+- Reject too large packets in snapshot sync. ([#7977](https://github.com/paritytech/parity/pull/7977))
+- fixed broken logs ([#7934](https://github.com/paritytech/parity/pull/7934))
+- Increase max download limit to 128MB ([#7965](https://github.com/paritytech/parity/pull/7965))
+- Calculate proper keccak256/sha3 using parity. ([#7953](https://github.com/paritytech/parity/pull/7953))
+- Add changelog for 1.8.10 stable and 1.9.3 beta ([#7947](https://github.com/paritytech/parity/pull/7947))
+- kvdb-rocksdb: remove buffered operations when committing transaction ([#7950](https://github.com/paritytech/parity/pull/7950))
+- Bump WebSockets ([#7952](https://github.com/paritytech/parity/pull/7952))
+- removed redundant Bloom conversions ([#7932](https://github.com/paritytech/parity/pull/7932))
+- simplify RefInfo fmt ([#7929](https://github.com/paritytech/parity/pull/7929))
+- Kovan WASM fork code ([#7849](https://github.com/paritytech/parity/pull/7849))
+- bring back trie and triehash benches ([#7926](https://github.com/paritytech/parity/pull/7926))
+- removed redundant PodAccount::new method ([#7928](https://github.com/paritytech/parity/pull/7928))
+- removed dummy wrapper structure - LogGroupPosition ([#7922](https://github.com/paritytech/parity/pull/7922))
+- spec: Validate required divisor fields are not 0 ([#7933](https://github.com/paritytech/parity/pull/7933))
+- simplify Client::filter_traces method ([#7936](https://github.com/paritytech/parity/pull/7936))
+- gitlab cache ([#7921](https://github.com/paritytech/parity/pull/7921))
+- Fix a division by zero in light client RPC handler ([#7917](https://github.com/paritytech/parity/pull/7917))
+- triehash optimisations ([#7920](https://github.com/paritytech/parity/pull/7920))
+- removed redundant Blockchain::db method ([#7919](https://github.com/paritytech/parity/pull/7919))
+- removed redundant Blockchain::rewind method ([#7918](https://github.com/paritytech/parity/pull/7918))
+- Pending transactions subscription ([#7906](https://github.com/paritytech/parity/pull/7906))
+- removed redundant otry! macro from ethcore ([#7916](https://github.com/paritytech/parity/pull/7916))
+- Make block generator easier to use ([#7888](https://github.com/paritytech/parity/pull/7888))
+- ECIP 1041 - Remove Difficulty Bomb ([#7905](https://github.com/paritytech/parity/pull/7905))
+- Fix CSP for dapps that require eval. ([#7867](https://github.com/paritytech/parity/pull/7867))
+- Fix gitlab ([#7901](https://github.com/paritytech/parity/pull/7901))
+- Gitlb snap master patch ([#7900](https://github.com/paritytech/parity/pull/7900))
+- fix snap build master ([#7896](https://github.com/paritytech/parity/pull/7896))
+- Fix wallet import ([#7873](https://github.com/paritytech/parity/pull/7873))
+- Fix snapcraft nightly ([#7884](https://github.com/paritytech/parity/pull/7884))
+- Add a timeout for light client sync requests ([#7848](https://github.com/paritytech/parity/pull/7848))
+- SecretStore: fixed test ([#7878](https://github.com/paritytech/parity/pull/7878))
+- Fix checksums and auto-update push ([#7846](https://github.com/paritytech/parity/pull/7846))
+- Forward-port snap fixes ([#7831](https://github.com/paritytech/parity/pull/7831))
+- Update gitlab-test.sh ([#7883](https://github.com/paritytech/parity/pull/7883))
+- Fix installer binary names for macos and windows ([#7881](https://github.com/paritytech/parity/pull/7881))
+- Fix string typo: "develoopment" -> "development" ([#7874](https://github.com/paritytech/parity/pull/7874))
+- Update the instructions to install the stable snap ([#7876](https://github.com/paritytech/parity/pull/7876))
+- SecretStore: 'broadcast' decryption session ([#7843](https://github.com/paritytech/parity/pull/7843))
+- Flush keyfiles. Resolves #7632 ([#7868](https://github.com/paritytech/parity/pull/7868))
+- Read registry_address from given block ([#7866](https://github.com/paritytech/parity/pull/7866))
+- Clean up docs formatting for Wasm runtime ([#7869](https://github.com/paritytech/parity/pull/7869))
+- WASM: Disable internal memory ([#7842](https://github.com/paritytech/parity/pull/7842))
+- Update gitlab-build.sh ([#7855](https://github.com/paritytech/parity/pull/7855))
+- ethabi version 5 ([#7723](https://github.com/paritytech/parity/pull/7723))
+- Light client: randomize the peer we dispatch requests to ([#7844](https://github.com/paritytech/parity/pull/7844))
+- Store updater metadata in a single place ([#7832](https://github.com/paritytech/parity/pull/7832))
+- Add new EF ropstens nodes. ([#7824](https://github.com/paritytech/parity/pull/7824))
+- refactor stratum to remove retain cycle ([#7827](https://github.com/paritytech/parity/pull/7827))
+- Bump jsonrpc. ([#7828](https://github.com/paritytech/parity/pull/7828))
+- Add binary identifiers and sha256sum to builds ([#7830](https://github.com/paritytech/parity/pull/7830))
+- Update references to UI shell & wallet ([#7808](https://github.com/paritytech/parity/pull/7808))
+- Adjust storage update evm-style ([#7812](https://github.com/paritytech/parity/pull/7812))
+- Updated WASM Runtime & new interpreter (wasmi) ([#7796](https://github.com/paritytech/parity/pull/7796))
+- SecretStore: ignore removed authorities when running auto-migration ([#7674](https://github.com/paritytech/parity/pull/7674))
+- Fix build ([#7807](https://github.com/paritytech/parity/pull/7807))
+- Move js & js-old code to github.com/parity-js ([#7685](https://github.com/paritytech/parity/pull/7685))
+- More changelogs :) ([#7782](https://github.com/paritytech/parity/pull/7782))
+- Actualized API set in help ([#7790](https://github.com/paritytech/parity/pull/7790))
+- Removed obsolete file ([#7788](https://github.com/paritytech/parity/pull/7788))
+- Update ropsten bootnodes ([#7776](https://github.com/paritytech/parity/pull/7776))
+- CHANGELOG for 1.9.1 and 1.8.8 ([#7775](https://github.com/paritytech/parity/pull/7775))
+- Enable byzantium features on non-ethash chains ([#7753](https://github.com/paritytech/parity/pull/7753))
+- Fix client not being dropped on shutdown ([#7695](https://github.com/paritytech/parity/pull/7695))
+- Filter-out nodes.json ([#7716](https://github.com/paritytech/parity/pull/7716))
+- Removes redundant parentheses ([#7721](https://github.com/paritytech/parity/pull/7721))
+- Transaction-pool fixes ([#7741](https://github.com/paritytech/parity/pull/7741))
+- More visible download link in README.md ([#7707](https://github.com/paritytech/parity/pull/7707))
+- Changelog for 1.9.0 ([#7664](https://github.com/paritytech/parity/pull/7664))
+- Add scroll when too many accounts ([#7677](https://github.com/paritytech/parity/pull/7677))
+- SecretStore: return HTTP 403 (access denied) if consensus is unreachable ([#7656](https://github.com/paritytech/parity/pull/7656))
+- Moved StopGaurd to it's own crate ([#7635](https://github.com/paritytech/parity/pull/7635))
+
+## Previous releases
+
+- [CHANGELOG-1.9](docs/CHANGELOG-1.9.md) (_stable_)
+- [CHANGELOG-1.8](docs/CHANGELOG-1.8.md) (EOL: 2018-03-22)
+- [CHANGELOG-1.7](docs/CHANGELOG-1.7.md) (EOL: 2018-01-25)
+- [CHANGELOG-1.6](docs/CHANGELOG-1.6.md) (EOL: 2017-10-15)
+- [CHANGELOG-1.5](docs/CHANGELOG-1.5.md) (EOL: 2017-07-28)
+- [CHANGELOG-1.4](docs/CHANGELOG-1.4.md) (EOL: 2017-03-13)
+- [CHANGELOG-1.3](docs/CHANGELOG-1.3.md) (EOL: 2017-01-19)
+- [CHANGELOG-1.2](docs/CHANGELOG-1.2.md) (EOL: 2016-11-07)
+- [CHANGELOG-1.1](docs/CHANGELOG-1.1.md) (EOL: 2016-08-12)
+- [CHANGELOG-1.0](docs/CHANGELOG-1.0.md) (EOL: 2016-06-24)
+- [CHANGELOG-0.9](docs/CHANGELOG-0.9.md) (EOL: 2016-05-02)
diff --git a/Cargo.lock b/Cargo.lock
index e2108d1866e7d71340eb3cf5b0aa82d9a38a5036..211fbbd61cd8a4aed6501418cb087750ff245c9c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,41 +1,14 @@
-[root]
-name = "wasm"
-version = "0.1.0"
-dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-logger 1.8.0",
- "ethcore-util 1.8.0",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-wasm 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "vm 0.1.0",
- "wasm-utils 0.1.0 (git+https://github.com/paritytech/wasm-utils)",
-]
-
-[[package]]
-name = "advapi32-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "aho-corasick"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ansi_term"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "antidote"
-version = "1.0.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -46,16 +19,15 @@ dependencies = [
  "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "xdg 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xdg 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "arrayvec"
-version = "0.3.20"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "odds 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -63,7 +35,7 @@ name = "aster"
 version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -72,45 +44,29 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "backtrace"
-version = "0.3.2"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "backtrace-sys"
-version = "0.1.11"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -124,51 +80,54 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "bigint"
-version = "4.1.2"
+name = "base64"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "bincode"
-version = "0.8.0"
+name = "base64"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "bit-set"
-version = "0.2.0"
+name = "bigint"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bit-vec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "bit-set"
-version = "0.4.0"
+name = "bincode"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bit-vec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "bit-vec"
-version = "0.4.3"
+name = "bit-set"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "bitflags"
-version = "0.5.0"
+name = "bit-vec"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -187,55 +146,53 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "blastfig"
-version = "0.3.3"
+name = "bitflags"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "bloomable"
-version = "0.1.0"
+name = "bloomchain"
+version = "0.2.0"
 dependencies = [
- "ethcore-bigint 0.1.3",
- "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethbloom 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "bloomchain"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "bn"
 version = "0.4.4"
-source = "git+https://github.com/paritytech/bn#b97e95a45f4484a41a515338c4f0e093bf6675e0"
+source = "git+https://github.com/paritytech/bn#964b48fad5dffbaa124c2f10699e76faf5846c4e"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "byteorder"
-version = "0.5.3"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "byteorder"
-version = "1.0.0"
+name = "bytes"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "bytes"
-version = "0.4.4"
+name = "cc"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -244,64 +201,52 @@ version = "0.1.0"
 dependencies = [
  "ethjson 0.1.0",
  "serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "cid"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "integer-encoding 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "multibase 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "multihash 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "clap"
-version = "2.24.2"
+version = "2.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "clippy"
-version = "0.0.103"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "clippy_lints 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "clippy_lints"
-version = "0.0.103"
+name = "coco"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "quine-mc_cluskey 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "common-types"
 version = "0.1.0"
 dependencies = [
- "bloomable 0.1.0",
- "ethcore-util 1.8.0",
+ "ethcore-bytes 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethjson 0.1.0",
- "rlp 0.2.0",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "rlp 0.2.1",
  "rlp_derive 0.1.0",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -319,30 +264,13 @@ name = "cookie"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "crossbeam"
-version = "0.2.10"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -351,12 +279,11 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "crypt32-sys"
+name = "ct-logs"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sct 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -365,7 +292,7 @@ version = "1.1.1"
 source = "git+https://github.com/paritytech/rust-ctrlc.git#b523017108bb2d571a7a69bd97bc406e63bc7a9d"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -376,537 +303,602 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "daemonize"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+version = "0.2.3"
+source = "git+https://github.com/paritytech/daemonize#df00295f03450326613f2d616059fd44434a0d74"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "dbghelp-sys"
-version = "0.2.0"
+name = "difference"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "deque"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "dir"
+version = "0.1.0"
 dependencies = [
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "journaldb 0.1.0",
 ]
 
-[[package]]
-name = "difference"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "docopt"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "dtoa"
-version = "0.4.0"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "edit-distance"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "either"
-version = "1.0.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "elastic-array"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "env_logger"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "error-chain"
-version = "0.5.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "eth-secp256k1"
-version = "0.5.6"
-source = "git+https://github.com/paritytech/rust-secp256k1#b6b67055edc929057e97d64f036c78ad91f58a7f"
+version = "0.5.7"
+source = "git+https://github.com/paritytech/rust-secp256k1#db81cfea59014b4d176f10f86ed52e1a130b6822"
 dependencies = [
- "arrayvec 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethabi"
-version = "2.0.0"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ethabi-contract"
+version = "5.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "ethabi-derive"
+version = "5.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ethabi 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethash"
-version = "1.8.0"
+version = "1.11.0"
 dependencies = [
  "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "primal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha3 0.1.0",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ethbloom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fixed-hash 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethcore"
-version = "1.8.0"
+version = "1.11.0"
 dependencies = [
- "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bloomable 0.1.0",
- "bloomchain 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bloomchain 0.2.0",
  "bn 0.4.4 (git+https://github.com/paritytech/bn)",
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "common-types 0.1.0",
- "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethash 1.8.0",
+ "crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-contract 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 5.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethash 1.11.0",
  "ethcore-bloom-journal 0.1.0",
- "ethcore-devtools 1.8.0",
- "ethcore-io 1.8.0",
- "ethcore-ipc 1.8.0",
- "ethcore-ipc-codegen 1.8.0",
- "ethcore-ipc-nano 1.8.0",
- "ethcore-logger 1.8.0",
- "ethcore-stratum 1.8.0",
- "ethcore-util 1.8.0",
+ "ethcore-bytes 0.1.0",
+ "ethcore-io 1.11.0",
+ "ethcore-logger 1.11.0",
+ "ethcore-miner 1.11.0",
+ "ethcore-stratum 1.11.0",
+ "ethcore-transaction 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethjson 0.1.0",
- "ethkey 0.2.0",
- "ethstore 0.1.0",
+ "ethkey 0.3.0",
+ "ethstore 0.2.0",
  "evm 0.1.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "hardware-wallet 1.8.0",
- "hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)",
- "itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "lru-cache 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "native-contracts 0.1.0",
- "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "price-info 1.7.0",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hardware-wallet 1.11.0",
+ "hashdb 0.1.1",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "journaldb 0.1.0",
+ "keccak-hash 0.1.0",
+ "kvdb 0.1.0",
+ "kvdb-memorydb 0.1.0",
+ "kvdb-rocksdb 0.1.0",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "macros 0.1.0",
+ "memory-cache 0.1.0",
+ "memorydb 0.1.1",
+ "migration 0.1.0",
+ "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-machine 0.1.0",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "patricia-trie 0.1.0",
+ "price-info 1.11.0",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
+ "rlp_compress 0.1.0",
  "rlp_derive 0.1.0",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "snappy 0.1.0 (git+https://github.com/paritytech/rust-snappy)",
  "stats 0.1.0",
+ "stop-guard 0.1.0",
  "table 0.1.0",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trace-time 0.1.0",
+ "trie-standardmap 0.1.0",
+ "triehash 0.1.0",
+ "unexpected 0.1.0",
  "using_queue 0.1.0",
+ "util-error 0.1.0",
  "vm 0.1.0",
  "wasm 0.1.0",
 ]
 
 [[package]]
-name = "ethcore-bigint"
-version = "0.1.3"
+name = "ethcore-bloom-journal"
+version = "0.1.0"
 dependencies = [
- "bigint 4.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "plain_hasher 0.1.0",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "siphasher 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "ethcore-bloom-journal"
+name = "ethcore-bytes"
 version = "0.1.0"
-dependencies = [
- "siphasher 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "ethcore-devtools"
-version = "1.8.0"
-dependencies = [
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+version = "1.11.0"
 
 [[package]]
 name = "ethcore-io"
-version = "1.8.0"
+version = "1.11.0"
 dependencies = [
- "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "ethcore-ipc"
-version = "1.8.0"
-dependencies = [
- "ethcore-devtools 1.8.0",
- "ethcore-util 1.8.0",
- "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
- "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ethcore-ipc-codegen"
-version = "1.8.0"
-dependencies = [
- "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "quasi_macros 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ethcore-ipc-hypervisor"
-version = "1.2.0"
+name = "ethcore-light"
+version = "1.11.0"
 dependencies = [
- "ethcore-ipc 1.8.0",
- "ethcore-ipc-codegen 1.8.0",
- "ethcore-ipc-nano 1.8.0",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
- "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore 1.11.0",
+ "ethcore-bytes 0.1.0",
+ "ethcore-io 1.11.0",
+ "ethcore-network 1.11.0",
+ "ethcore-transaction 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashdb 0.1.1",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "kvdb 0.1.0",
+ "kvdb-memorydb 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memory-cache 0.1.0",
+ "memorydb 0.1.1",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "patricia-trie 0.1.0",
+ "plain_hasher 0.1.0",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
+ "rlp_derive 0.1.0",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stats 0.1.0",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "triehash 0.1.0",
+ "vm 0.1.0",
 ]
 
 [[package]]
-name = "ethcore-ipc-nano"
-version = "1.8.0"
+name = "ethcore-logger"
+version = "1.11.0"
 dependencies = [
- "ethcore-ipc 1.8.0",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
+ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "ethcore-ipc-tests"
+name = "ethcore-migrations"
 version = "0.1.0"
 dependencies = [
- "ethcore-devtools 1.8.0",
- "ethcore-ipc 1.8.0",
- "ethcore-ipc-codegen 1.8.0",
- "ethcore-ipc-nano 1.8.0",
- "ethcore-util 1.8.0",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
- "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "migration 0.1.0",
 ]
 
 [[package]]
-name = "ethcore-light"
-version = "1.8.0"
+name = "ethcore-miner"
+version = "1.11.0"
 dependencies = [
- "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.8.0",
- "ethcore-devtools 1.8.0",
- "ethcore-io 1.8.0",
- "ethcore-ipc 1.8.0",
- "ethcore-ipc-codegen 1.8.0",
- "ethcore-network 1.8.0",
- "ethcore-util 1.8.0",
- "evm 0.1.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
- "rlp_derive 0.1.0",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "stats 0.1.0",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "vm 0.1.0",
+ "common-types 0.1.0",
+ "ethabi 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-contract 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 5.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethash 1.11.0",
+ "ethcore-transaction 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethkey 0.3.0",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)",
+ "keccak-hash 0.1.0",
+ "linked-hash-map 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "table 0.1.0",
+ "transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "ethcore-logger"
-version = "1.8.0"
+name = "ethcore-network"
+version = "1.11.0"
 dependencies = [
- "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "arrayvec 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore-io 1.11.0",
+ "ethcrypto 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethkey 0.3.0",
+ "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
+ "snappy 0.1.0 (git+https://github.com/paritytech/rust-snappy)",
 ]
 
 [[package]]
-name = "ethcore-network"
-version = "1.8.0"
-dependencies = [
- "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-devtools 1.8.0",
- "ethcore-io 1.8.0",
- "ethcore-logger 1.8.0",
- "ethcore-util 1.8.0",
+name = "ethcore-network-devp2p"
+version = "1.11.0"
+dependencies = [
+ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore-bytes 0.1.0",
+ "ethcore-io 1.11.0",
+ "ethcore-logger 1.11.0",
+ "ethcore-network 1.11.0",
  "ethcrypto 0.1.0",
- "ethkey 0.2.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethkey 0.3.0",
  "igd 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "path 0.1.0",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "snappy 0.1.0 (git+https://github.com/paritytech/rust-snappy)",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethcore-secretstore"
 version = "1.0.0"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.8.0",
- "ethcore-devtools 1.8.0",
- "ethcore-ipc 1.8.0",
- "ethcore-ipc-codegen 1.8.0",
- "ethcore-ipc-nano 1.8.0",
- "ethcore-logger 1.8.0",
- "ethcore-util 1.8.0",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-contract 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 5.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore 1.11.0",
+ "ethcore-bytes 0.1.0",
+ "ethcore-logger 1.11.0",
  "ethcrypto 0.1.0",
- "ethkey 0.2.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "native-contracts 0.1.0",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethkey 0.3.0",
+ "ethsync 1.11.0",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "kvdb 0.1.0",
+ "kvdb-rocksdb 0.1.0",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ethcore-service"
+version = "0.1.0"
+dependencies = [
+ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore 1.11.0",
+ "ethcore-io 1.11.0",
+ "kvdb 0.1.0",
+ "kvdb-rocksdb 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stop-guard 0.1.0",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethcore-stratum"
-version = "1.8.0"
-dependencies = [
- "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-devtools 1.8.0",
- "ethcore-ipc 1.8.0",
- "ethcore-ipc-codegen 1.8.0",
- "ethcore-ipc-nano 1.8.0",
- "ethcore-logger 1.8.0",
- "ethcore-util 1.8.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-macros 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-tcp-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+version = "1.11.0"
+dependencies = [
+ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore-logger 1.11.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-tcp-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "keccak-hash 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "ethcore-util"
-version = "1.8.0"
+name = "ethcore-transaction"
+version = "0.1.0"
 dependencies = [
- "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)",
- "ethcore-bigint 0.1.3",
- "ethcore-bloom-journal 0.1.0",
- "ethcore-devtools 1.8.0",
- "ethcore-logger 1.8.0",
- "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "lru-cache 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
- "rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)",
- "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethjson 0.1.0",
+ "ethkey 0.3.0",
+ "evm 0.1.0",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "rlp 0.2.1",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha3 0.1.0",
- "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "vergen 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unexpected 0.1.0",
 ]
 
 [[package]]
 name = "ethcrypto"
 version = "0.1.0"
 dependencies = [
- "eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)",
- "ethcore-bigint 0.1.3",
- "ethkey 0.2.0",
+ "eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethkey 0.3.0",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "subtle 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "subtle 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ethereum-types"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethbloom 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fixed-hash 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ethereum-types-serialize"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethjson"
 version = "0.1.0"
 dependencies = [
- "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-bigint 0.1.3",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethkey"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)",
- "ethcore-bigint 0.1.3",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "edit-distance 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-wordlist 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethkey-cli"
 version = "0.1.0"
 dependencies = [
- "docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethkey 0.2.0",
+ "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethkey 0.3.0",
  "panic_hook 0.1.0",
+ "parity-wordlist 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethstore"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
- "ethcore-bigint 0.1.3",
+ "dir 0.1.0",
  "ethcrypto 0.1.0",
- "ethkey 0.2.0",
- "itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-wordlist 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethkey 0.3.0",
+ "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-wordlist 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "subtle 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethstore-cli"
 version = "0.1.0"
 dependencies = [
- "docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethstore 0.1.0",
+ "dir 0.1.0",
+ "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethstore 0.2.0",
+ "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "panic_hook 0.1.0",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ethsync"
-version = "1.8.0"
-dependencies = [
- "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.8.0",
- "ethcore-devtools 1.8.0",
- "ethcore-io 1.8.0",
- "ethcore-ipc 1.8.0",
- "ethcore-ipc-codegen 1.8.0",
- "ethcore-ipc-nano 1.8.0",
- "ethcore-light 1.8.0",
- "ethcore-network 1.8.0",
- "ethcore-util 1.8.0",
- "ethkey 0.2.0",
- "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
+version = "1.11.0"
+dependencies = [
+ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore 1.11.0",
+ "ethcore-bytes 0.1.0",
+ "ethcore-io 1.11.0",
+ "ethcore-light 1.11.0",
+ "ethcore-network 1.11.0",
+ "ethcore-network-devp2p 1.11.0",
+ "ethcore-transaction 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethkey 0.3.0",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "kvdb 0.1.0",
+ "kvdb-memorydb 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "macros 0.1.0",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "plain_hasher 0.1.0",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
  "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "triehash 0.1.0",
 ]
 
 [[package]]
@@ -914,42 +906,43 @@ name = "evm"
 version = "0.1.0"
 dependencies = [
  "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "common-types 0.1.0",
- "ethcore-logger 1.8.0",
- "ethcore-util 1.8.0",
- "ethjson 0.1.0",
- "evmjit 1.8.0",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-wasm 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "evmjit 1.11.0",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memory-cache 0.1.0",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "vm 0.1.0",
- "wasm-utils 0.1.0 (git+https://github.com/paritytech/wasm-utils)",
 ]
 
 [[package]]
 name = "evmbin"
 version = "0.1.0"
 dependencies = [
- "docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.8.0",
- "ethcore-util 1.8.0",
+ "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore 1.11.0",
+ "ethcore-bytes 0.1.0",
+ "ethcore-transaction 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethjson 0.1.0",
  "evm 0.1.0",
  "panic_hook 0.1.0",
+ "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "vm 0.1.0",
 ]
 
 [[package]]
 name = "evmjit"
-version = "1.8.0"
+version = "1.11.0"
 dependencies = [
- "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -957,28 +950,40 @@ name = "fdlimit"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "fetch"
 version = "0.1.0"
 dependencies = [
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "reqwest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-timer 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper-rustls 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fixed-hash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "flate2"
-version = "0.2.14"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -987,44 +992,52 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "foreign-types"
-version = "0.2.0"
+name = "fuchsia-zircon"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-zircon-sys"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "futures"
-version = "0.1.11"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "futures-cpupool"
-version = "0.1.5"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "gcc"
-version = "0.3.51"
+name = "futures-timer"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rayon 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "gdi32-sys"
-version = "0.2.0"
+name = "gcc"
+version = "0.3.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "getopts"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1034,14 +1047,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "globset"
-version = "0.1.4"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1051,31 +1064,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "hardware-wallet"
-version = "1.8.0"
+version = "1.11.0"
 dependencies = [
- "ethcore-bigint 0.1.3",
- "ethkey 0.2.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethkey 0.3.0",
  "hidapi 0.3.1 (git+https://github.com/paritytech/hidapi-rs)",
  "libusb 0.3.0 (git+https://github.com/paritytech/libusb-rs)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trezor-sys 1.0.0 (git+https://github.com/paritytech/trezor-sys)",
+]
+
+[[package]]
+name = "hashdb"
+version = "0.1.1"
+dependencies = [
+ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "heapsize"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "heck"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1086,15 +1109,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "hidapi"
 version = "0.3.1"
-source = "git+https://github.com/paritytech/hidapi-rs#9a127c1dca7e327e4fdd428406a76c9f5ef48563"
+source = "git+https://github.com/paritytech/hidapi-rs#e77ea09c98f29ea8855dd9cd9461125a28ca9125"
 dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.1.2"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1103,56 +1126,86 @@ version = "0.10.0-a.0"
 source = "git+https://github.com/paritytech/hyper#da10f69a4924cd44e98a8d1f9562bd7534d13dcc"
 dependencies = [
  "cookie 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rotor 0.6.3 (git+https://github.com/tailhook/rotor)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "spmc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spmc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "vecio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "hyper"
-version = "0.10.5"
+version = "0.10.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
  "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "hyper-native-tls"
-version = "0.2.2"
+name = "hyper"
+version = "0.11.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "native-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ct-logs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki-roots 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "idna"
-version = "0.1.0"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1160,10 +1213,10 @@ name = "igd"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "xmltree 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1173,163 +1226,171 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "iovec"
-version = "0.1.0"
+name = "interleaved-ordered"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "ipc-common-types"
-version = "1.8.0"
+name = "iovec"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "ethcore-ipc 1.8.0",
- "ethcore-ipc-codegen 1.8.0",
- "ethcore-util 1.8.0",
- "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ipnetwork"
-version = "0.12.6"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "isatty"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "either 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.3.0"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "journaldb"
+version = "0.1.0"
+dependencies = [
+ "ethcore-bytes 0.1.0",
+ "ethcore-logger 1.11.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashdb 0.1.1",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "kvdb 0.1.0",
+ "kvdb-memorydb 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memorydb 0.1.1",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "plain_hasher 0.1.0",
+ "rlp 0.2.1",
+ "util-error 0.1.0",
+]
+
 [[package]]
 name = "jsonrpc-core"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#b5490782884218c5ccf74cd61e54904cb3a3aeed"
+version = "8.0.1"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11#06bec6ab682ec4ce16d7e7daf2612870c4272028"
 dependencies = [
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "jsonrpc-http-server"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#b5490782884218c5ccf74cd61e54904cb3a3aeed"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11#06bec6ab682ec4ce16d7e7daf2612870c4272028"
 dependencies = [
- "hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-server-utils 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "jsonrpc-ipc-server"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#b5490782884218c5ccf74cd61e54904cb3a3aeed"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11#06bec6ab682ec4ce16d7e7daf2612870c4272028"
 dependencies = [
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-server-utils 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-tokio-ipc 0.1.5 (git+https://github.com/nikvolf/parity-tokio-ipc)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "jsonrpc-macros"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#b5490782884218c5ccf74cd61e54904cb3a3aeed"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11#06bec6ab682ec4ce16d7e7daf2612870c4272028"
 dependencies = [
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-pubsub 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "jsonrpc-minihttp-server"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#b5490782884218c5ccf74cd61e54904cb3a3aeed"
-dependencies = [
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-minihttp 0.1.0 (git+https://github.com/tomusdrw/tokio-minihttp)",
- "tokio-proto 0.1.0 (git+https://github.com/tomusdrw/tokio-proto)",
- "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-pubsub 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "jsonrpc-pubsub"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#b5490782884218c5ccf74cd61e54904cb3a3aeed"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11#06bec6ab682ec4ce16d7e7daf2612870c4272028"
 dependencies = [
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "jsonrpc-server-utils"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#b5490782884218c5ccf74cd61e54904cb3a3aeed"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11#06bec6ab682ec4ce16d7e7daf2612870c4272028"
 dependencies = [
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "globset 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "globset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "jsonrpc-tcp-server"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#b5490782884218c5ccf74cd61e54904cb3a3aeed"
-dependencies = [
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+version = "8.0.0"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11#06bec6ab682ec4ce16d7e7daf2612870c4272028"
+dependencies = [
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-server-utils 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "jsonrpc-ws-server"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7#b5490782884218c5ccf74cd61e54904cb3a3aeed"
-dependencies = [
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+version = "8.0.0"
+source = "git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11#06bec6ab682ec4ce16d7e7daf2612870c4272028"
+dependencies = [
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-server-utils 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ws 0.7.1 (git+https://github.com/tomusdrw/ws-rs)",
+ "ws 0.7.5 (git+https://github.com/tomusdrw/ws-rs)",
+]
+
+[[package]]
+name = "keccak-hash"
+version = "0.1.0"
+dependencies = [
+ "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1341,6 +1402,39 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "kvdb"
+version = "0.1.0"
+dependencies = [
+ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore-bytes 0.1.0",
+]
+
+[[package]]
+name = "kvdb-memorydb"
+version = "0.1.0"
+dependencies = [
+ "kvdb 0.1.0",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "kvdb-rocksdb"
+version = "0.1.0"
+dependencies = [
+ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "language-tags"
 version = "0.2.2"
@@ -1348,172 +1442,225 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "lazy_static"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "lazycell"
-version = "0.4.0"
+name = "lazy_static"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "lazycell"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.21"
+version = "0.2.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "libflate"
-version = "0.1.9"
+name = "libusb"
+version = "0.3.0"
+source = "git+https://github.com/paritytech/libusb-rs#442708954a720bc89a9cf41e7be021a778bdbc27"
+dependencies = [
+ "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libusb-sys 0.2.4 (git+https://github.com/paritytech/libusb-sys)",
+]
+
+[[package]]
+name = "libusb-sys"
+version = "0.2.4"
+source = "git+https://github.com/paritytech/libusb-sys#14bdb698003731b6344a79e1d814704e44363e7c"
+dependencies = [
+ "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "linked-hash-map"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "local-encoding"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "skeptic 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "libusb"
-version = "0.3.0"
-source = "git+https://github.com/paritytech/libusb-rs#47c3d09cab346d629328d4bd691ed3509ffb8cbb"
+name = "log"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "log"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "lru-cache"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "macros"
+version = "0.1.0"
+
+[[package]]
+name = "matches"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "memchr"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bit-set 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "libusb-sys 0.2.3 (git+https://github.com/paritytech/libusb-sys)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "libusb-sys"
-version = "0.2.3"
-source = "git+https://github.com/paritytech/libusb-sys#c10b1180646c9dc3f23a9b6bb825abcd3b7487ce"
+name = "memmap"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "linked-hash-map"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "memory-cache"
+version = "0.1.0"
+dependencies = [
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "linked-hash-map"
+name = "memory_units"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "local-encoding"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "memorydb"
+version = "0.1.1"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "skeptic 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashdb 0.1.1",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "plain_hasher 0.1.0",
+ "rlp 0.2.1",
 ]
 
 [[package]]
-name = "log"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "lru-cache"
+name = "migration"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "linked-hash-map 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb 0.1.0",
+ "kvdb-rocksdb 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "macros 0.1.0",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "matches"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "memchr"
-version = "1.0.1"
+name = "mime"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "mime"
-version = "0.2.0"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "mime_guess"
-version = "1.6.1"
+version = "2.0.0-alpha.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "miniz-sys"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "mio"
-version = "0.6.8"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazycell 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "mio-named-pipes"
 version = "0.1.4"
-source = "git+https://github.com/alexcrichton/mio-named-pipes#903dc2f7eac6700c62bfdda258a599db13a9228f"
+source = "git+https://github.com/alexcrichton/mio-named-pipes#9c1bbb985b74374d3b7eda76937279f8e977ef81"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazycell 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "mio-uds"
-version = "0.6.2"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "miow"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1522,18 +1669,18 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "msdos_time"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1547,215 +1694,142 @@ dependencies = [
 
 [[package]]
 name = "multihash"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ring 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "nanomsg"
-version = "0.5.1"
-source = "git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7#673b79beef6e149273899850d7692335a481a920"
-dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "nanomsg-sys 0.5.0 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
-]
-
-[[package]]
-name = "nanomsg-sys"
-version = "0.5.0"
-source = "git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7#673b79beef6e149273899850d7692335a481a920"
-dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "native-contract-generator"
-version = "0.1.0"
-dependencies = [
- "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "heck 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "native-contracts"
-version = "0.1.0"
-dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-bigint 0.1.3",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "native-contract-generator 0.1.0",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.1.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "openssl 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "schannel 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "net2"
-version = "0.2.29"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "node-filter"
-version = "1.8.0"
-dependencies = [
- "ethcore 1.8.0",
- "ethcore-io 1.8.0",
- "ethcore-network 1.8.0",
- "ethcore-util 1.8.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "native-contracts 0.1.0",
+version = "1.11.0"
+dependencies = [
+ "ethabi 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-contract 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 5.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore 1.11.0",
+ "ethcore-bytes 0.1.0",
+ "ethcore-io 1.11.0",
+ "ethcore-network-devp2p 1.11.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb-memorydb 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "node-health"
 version = "0.1.0"
 dependencies = [
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "ntp 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ntp 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-reactor 0.1.0",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "nodrop"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "odds 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "nom"
-version = "1.2.2"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "ntp"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num"
-version = "0.1.32"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-bigint 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-complex 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-rational 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-bigint 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-bigint"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "num-integer 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.1.32"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.32"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.32"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-integer 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "num-rational"
-version = "0.1.32"
+name = "num-traits"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "num-bigint 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "num-traits"
-version = "0.1.32"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "num_cpus"
-version = "1.2.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "number_prefix"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "odds"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "ole32-sys"
 version = "0.2.0"
@@ -1765,30 +1839,6 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "openssl"
-version = "0.9.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "order-stat"
 version = "0.1.3"
@@ -1799,7 +1849,7 @@ name = "ordered-float"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1815,223 +1865,278 @@ dependencies = [
 name = "panic_hook"
 version = "0.1.0"
 dependencies = [
- "backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity"
-version = "1.8.0"
+version = "1.11.0"
 dependencies = [
- "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.29.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ctrlc 1.1.1 (git+https://github.com/paritytech/rust-ctrlc.git)",
- "daemonize 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.8.0",
- "ethcore-devtools 1.8.0",
- "ethcore-io 1.8.0",
- "ethcore-ipc 1.8.0",
- "ethcore-ipc-hypervisor 1.2.0",
- "ethcore-ipc-nano 1.8.0",
- "ethcore-ipc-tests 0.1.0",
- "ethcore-light 1.8.0",
- "ethcore-logger 1.8.0",
- "ethcore-network 1.8.0",
+ "daemonize 0.2.3 (git+https://github.com/paritytech/daemonize)",
+ "dir 0.1.0",
+ "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore 1.11.0",
+ "ethcore-bytes 0.1.0",
+ "ethcore-io 1.11.0",
+ "ethcore-light 1.11.0",
+ "ethcore-logger 1.11.0",
+ "ethcore-migrations 0.1.0",
+ "ethcore-miner 1.11.0",
+ "ethcore-network 1.11.0",
  "ethcore-secretstore 1.0.0",
- "ethcore-stratum 1.8.0",
- "ethcore-util 1.8.0",
- "ethkey 0.2.0",
- "ethsync 1.8.0",
+ "ethcore-service 0.1.0",
+ "ethcore-stratum 1.11.0",
+ "ethcore-transaction 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethkey 0.3.0",
+ "ethsync 1.11.0",
  "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "node-filter 1.8.0",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "journaldb 0.1.0",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "keccak-hash 0.1.0",
+ "kvdb 0.1.0",
+ "kvdb-rocksdb 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "migration 0.1.0",
+ "node-filter 1.11.0",
  "node-health 0.1.0",
- "num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "number_prefix 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "number_prefix 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "panic_hook 0.1.0",
- "parity-dapps 1.8.0",
- "parity-hash-fetch 1.8.0",
- "parity-ipfs-api 1.8.0",
+ "parity-dapps 1.11.0",
+ "parity-hash-fetch 1.11.0",
+ "parity-ipfs-api 1.11.0",
  "parity-local-store 0.1.0",
  "parity-reactor 0.1.0",
- "parity-rpc 1.8.0",
+ "parity-rpc 1.11.0",
  "parity-rpc-client 1.4.0",
- "parity-updater 1.8.0",
+ "parity-updater 1.11.0",
+ "parity-version 1.11.0",
  "parity-whisper 0.1.0",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "path 0.1.0",
  "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
- "rpassword 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "registrar 0.0.1",
+ "rlp 0.2.1",
+ "rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rpc-cli 1.4.0",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-dapps"
-version = "1.8.0"
+version = "1.11.0"
 dependencies = [
  "base32 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-devtools 1.8.0",
- "ethcore-util 1.8.0",
+ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore-bytes 0.1.0",
+ "ethcore-devtools 1.11.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "fetch 0.1.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "keccak-hash 0.1.0",
+ "linked-hash-map 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "node-health 0.1.0",
- "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-hash-fetch 1.8.0",
+ "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-hash-fetch 1.11.0",
  "parity-reactor 0.1.0",
- "parity-ui 1.8.0",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-ui 1.11.0",
+ "parity-version 1.11.0",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "registrar 0.0.1",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "zip 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "zip 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-dapps-glue"
-version = "1.7.0"
+version = "1.9.1"
+dependencies = [
+ "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quasi_macros 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parity-dapps-glue"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-hash-fetch"
-version = "1.8.0"
+version = "1.11.0"
 dependencies = [
- "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.8.0",
+ "ethabi 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-contract 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 5.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore-bytes 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "fetch 0.1.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "native-contracts 0.1.0",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-reactor 0.1.0",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "registrar 0.0.1",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-ipfs-api"
-version = "1.8.0"
+version = "1.11.0"
 dependencies = [
- "cid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.8.0",
- "ethcore-util 1.8.0",
- "jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
+ "cid 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore 1.11.0",
+ "ethcore-bytes 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "multihash 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
+ "unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-local-store"
 version = "0.1.0"
 dependencies = [
- "ethcore 1.8.0",
- "ethcore-io 1.8.0",
- "ethcore-util 1.8.0",
- "ethkey 0.2.0",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore 1.11.0",
+ "ethcore-io 1.11.0",
+ "ethcore-transaction 0.1.0",
+ "ethkey 0.3.0",
+ "kvdb 0.1.0",
+ "kvdb-memorydb 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parity-machine"
+version = "0.1.0"
+dependencies = [
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-reactor"
 version = "0.1.0"
 dependencies = [
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-rpc"
-version = "1.8.0"
-dependencies = [
- "cid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethash 1.8.0",
- "ethcore 1.8.0",
- "ethcore-devtools 1.8.0",
- "ethcore-io 1.8.0",
- "ethcore-ipc 1.8.0",
- "ethcore-light 1.8.0",
- "ethcore-logger 1.8.0",
- "ethcore-util 1.8.0",
+version = "1.11.0"
+dependencies = [
+ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cid 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethash 1.11.0",
+ "ethcore 1.11.0",
+ "ethcore-bytes 0.1.0",
+ "ethcore-devtools 1.11.0",
+ "ethcore-io 1.11.0",
+ "ethcore-light 1.11.0",
+ "ethcore-logger 1.11.0",
+ "ethcore-miner 1.11.0",
+ "ethcore-network 1.11.0",
+ "ethcore-transaction 0.1.0",
  "ethcrypto 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethjson 0.1.0",
- "ethkey 0.2.0",
- "ethstore 0.1.0",
- "ethsync 1.8.0",
+ "ethkey 0.3.0",
+ "ethstore 0.2.0",
+ "ethsync 1.11.0",
  "fetch 0.1.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-ipc-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-macros 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-minihttp-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-pubsub 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-ws-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hardware-wallet 1.11.0",
+ "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-ipc-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-pubsub 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "keccak-hash 0.1.0",
+ "kvdb-memorydb 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "macros 0.1.0",
+ "multihash 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "node-health 0.1.0",
  "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-reactor 0.1.0",
- "parity-updater 1.8.0",
+ "parity-updater 1.11.0",
+ "parity-version 1.11.0",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "patricia-trie 0.1.0",
  "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "stats 0.1.0",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "vm 0.1.0",
 ]
@@ -2040,18 +2145,17 @@ dependencies = [
 name = "parity-rpc-client"
 version = "1.4.0"
 dependencies = [
- "ethcore-util 1.8.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-ws-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-rpc 1.8.0",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "keccak-hash 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-rpc 1.11.0",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2059,69 +2163,101 @@ name = "parity-tokio-ipc"
 version = "0.1.5"
 source = "git+https://github.com/nikvolf/parity-tokio-ipc#d6c5b3cfcc913a1b9cf0f0562a10b083ceb9fb7c"
 dependencies = [
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-named-pipes 0.1.4 (git+https://github.com/alexcrichton/mio-named-pipes)",
  "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-named-pipes 0.1.0 (git+https://github.com/nikvolf/tokio-named-pipes)",
- "tokio-uds 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-uds 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-ui"
-version = "1.8.0"
+version = "1.11.0"
 dependencies = [
- "parity-ui-dev 1.8.0",
- "parity-ui-precompiled 1.4.0 (git+https://github.com/paritytech/js-precompiled.git)",
- "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-ui-dev 1.9.0 (git+https://github.com/parity-js/shell.git?rev=eecaadcb9e421bce31e91680d14a20bbd38f92a2)",
+ "parity-ui-old-dev 1.9.0 (git+https://github.com/parity-js/dapp-wallet.git?rev=65deb02e7c007a0fd8aab0c089c93e3fd1de6f87)",
+ "parity-ui-old-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git?rev=4b6f112412716cd05123d32eeb7fda448288a6c6)",
+ "parity-ui-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-10-shell.git?rev=bd25b41cd642c6b822d820dded3aa601a29aa079)",
+ "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-ui-dev"
-version = "1.8.0"
+version = "1.9.0"
+source = "git+https://github.com/parity-js/shell.git?rev=eecaadcb9e421bce31e91680d14a20bbd38f92a2#eecaadcb9e421bce31e91680d14a20bbd38f92a2"
+dependencies = [
+ "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parity-ui-old-dev"
+version = "1.9.0"
+source = "git+https://github.com/parity-js/dapp-wallet.git?rev=65deb02e7c007a0fd8aab0c089c93e3fd1de6f87#65deb02e7c007a0fd8aab0c089c93e3fd1de6f87"
+dependencies = [
+ "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parity-ui-old-precompiled"
+version = "1.9.0"
+source = "git+https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git?rev=4b6f112412716cd05123d32eeb7fda448288a6c6#4b6f112412716cd05123d32eeb7fda448288a6c6"
 dependencies = [
- "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-ui-precompiled"
-version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git#d809723e58bcb36c0f8d2eca5ca94abbb3690544"
+version = "1.9.0"
+source = "git+https://github.com/js-dist-paritytech/parity-master-1-10-shell.git?rev=bd25b41cd642c6b822d820dded3aa601a29aa079#bd25b41cd642c6b822d820dded3aa601a29aa079"
 dependencies = [
- "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-updater"
-version = "1.8.0"
-dependencies = [
- "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.8.0",
- "ethcore-ipc 1.8.0",
- "ethcore-ipc-codegen 1.8.0",
- "ethcore-util 1.8.0",
- "ethsync 1.8.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipc-common-types 1.8.0",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-hash-fetch 1.8.0",
- "parity-reactor 0.1.0",
+version = "1.11.0"
+dependencies = [
+ "ethabi 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-contract 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 5.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore 1.11.0",
+ "ethcore-bytes 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethsync 1.11.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-hash-fetch 1.11.0",
+ "parity-version 1.11.0",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "path 0.1.0",
+ "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parity-version"
+version = "1.11.0"
+dependencies = [
+ "ethcore-bytes 0.1.0",
+ "rlp 0.2.1",
+ "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vergen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-wasm"
-version = "0.12.1"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2129,60 +2265,57 @@ name = "parity-whisper"
 version = "0.1.0"
 dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-bigint 0.1.3",
- "ethcore-network 1.8.0",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore-network 1.11.0",
  "ethcrypto 0.1.0",
- "ethkey 0.2.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethkey 0.3.0",
  "hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-macros 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "jsonrpc-pubsub 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "jsonrpc-pubsub 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "ordered-float 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "ring 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parity-wordlist"
-version = "1.0.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parking_lot"
-version = "0.4.0"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread-id 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parking_lot_core"
-version = "0.2.0"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2190,50 +2323,70 @@ dependencies = [
 name = "path"
 version = "0.1.0"
 
+[[package]]
+name = "patricia-trie"
+version = "0.1.0"
+dependencies = [
+ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore-bytes 0.1.0",
+ "ethcore-logger 1.11.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashdb 0.1.1",
+ "keccak-hash 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memorydb 0.1.1",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
+ "trie-standardmap 0.1.0",
+ "triehash 0.1.0",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "phf"
-version = "0.7.14"
+version = "0.7.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "phf_codegen"
-version = "0.7.14"
+version = "0.7.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "phf_generator"
-version = "0.7.14"
+version = "0.7.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "phf_shared"
-version = "0.7.14"
+version = "0.7.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "pkg-config"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "plain_hasher"
 version = "0.1.0"
 dependencies = [
  "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2251,13 +2404,15 @@ dependencies = [
 
 [[package]]
 name = "price-info"
-version = "1.7.0"
+version = "1.11.0"
 dependencies = [
  "fetch 0.1.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2265,14 +2420,14 @@ name = "primal"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "primal-check 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "primal-check 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "primal-estimate 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "primal-sieve 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "primal-sieve 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "primal-bit"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "hamming 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2280,10 +2435,10 @@ dependencies = [
 
 [[package]]
 name = "primal-check"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2293,20 +2448,64 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "primal-sieve"
-version = "0.2.5"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "hamming 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "primal-bit 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "primal-bit 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "primal-estimate 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "proc-macro2"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "protobuf"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "pulldown-cmark"
 version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pwasm-run-test"
+version = "0.1.0"
+dependencies = [
+ "clap 2.29.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore-logger 1.11.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethjson 0.1.0",
+ "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vm 0.1.0",
+ "wasm 0.1.0",
+]
+
+[[package]]
+name = "pwasm-utils"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.29.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-wasm 0.27.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2314,8 +2513,8 @@ name = "quasi"
 version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "syntex_errors 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2324,9 +2523,9 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex_errors 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2339,122 +2538,152 @@ dependencies = [
 
 [[package]]
 name = "quick-error"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "quine-mc_cluskey"
-version = "0.2.2"
+name = "quote"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "quote"
-version = "0.3.15"
+name = "rand"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "rand"
-version = "0.3.14"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rayon"
-version = "0.7.0"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rayon-core 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rayon"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rayon-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon-core 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rayon-core"
-version = "1.0.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "coco 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "regex"
-version = "0.2.1"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.3.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "regex-syntax"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "registrar"
+version = "0.0.1"
+dependencies = [
+ "ethabi 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-contract 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 5.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+]
 
 [[package]]
-name = "reqwest"
-version = "0.6.2"
+name = "relay"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper-native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libflate 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ring"
-version = "0.9.5"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "untrusted 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rlp"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-bigint 0.1.3",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rlp_compress"
+version = "0.1.0"
+dependencies = [
+ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
+]
+
 [[package]]
 name = "rlp_derive"
 version = "0.1.0"
 dependencies = [
- "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
- "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rlp 0.2.1",
+ "syn 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rocksdb"
 version = "0.4.5"
-source = "git+https://github.com/paritytech/rust-rocksdb#4364caec4dd5da1a1d78c39276774ee65bf55c7d"
+source = "git+https://github.com/paritytech/rust-rocksdb#ecf06adf3148ab10f6f7686b724498382ff4f36e"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "local-encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rocksdb-sys 0.3.0 (git+https://github.com/paritytech/rust-rocksdb)",
 ]
@@ -2462,10 +2691,12 @@ dependencies = [
 [[package]]
 name = "rocksdb-sys"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/rust-rocksdb#4364caec4dd5da1a1d78c39276774ee65bf55c7d"
+source = "git+https://github.com/paritytech/rust-rocksdb#ecf06adf3148ab10f6f7686b724498382ff4f36e"
 dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "local-encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "snappy-sys 0.1.0 (git+https://github.com/paritytech/rust-snappy)",
 ]
 
 [[package]]
@@ -2473,32 +2704,21 @@ name = "rotor"
 version = "0.6.3"
 source = "git+https://github.com/tailhook/rotor#80ce2e4cd82fdc7f88bb2d737407fa5106799790"
 dependencies = [
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "quick-error 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rpassword"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rpassword"
-version = "0.3.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rprompt 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2506,29 +2726,33 @@ dependencies = [
 name = "rpc-cli"
 version = "1.4.0"
 dependencies = [
- "bigint 4.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.8.0",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-rpc 1.8.0",
+ "bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-rpc 1.11.0",
  "parity-rpc-client 1.4.0",
- "rpassword 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rprompt"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "rust-crypto"
 version = "0.2.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2538,84 +2762,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rustc-serialize"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "rustc_version"
-version = "0.1.7"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "rustc_version"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "schannel"
-version = "0.1.5"
+name = "rustls"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crypt32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "secur32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sct 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "scoped-tls"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "secur32-sys"
+name = "safemem"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "security-framework"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "security-framework-sys"
-version = "0.1.14"
+name = "scoped-tls"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "semver"
-version = "0.1.20"
+name = "scopeguard"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "semver"
-version = "0.2.3"
+name = "sct"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "nom 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2633,26 +2825,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.9"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde_derive"
-version = "1.0.9"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive_internals 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive_internals"
-version = "0.15.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2660,29 +2853,18 @@ name = "serde_ignored"
 version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "dtoa 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.5.1"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2690,13 +2872,6 @@ name = "sha1"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "sha3"
-version = "0.1.0"
-dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "shell32-sys"
 version = "0.1.1"
@@ -2708,7 +2883,12 @@ dependencies = [
 
 [[package]]
 name = "siphasher"
-version = "0.1.1"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "siphasher"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2731,8 +2911,8 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "smallvec"
-version = "0.1.8"
+name = "slab"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2742,15 +2922,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "smallvec"
-version = "0.4.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "snappy"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/rust-snappy#858eac97192ea25d18d3f3626a8cc13ca0b175bb"
+dependencies = [
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "snappy-sys 0.1.0 (git+https://github.com/paritytech/rust-snappy)",
+]
+
+[[package]]
+name = "snappy-sys"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/rust-snappy#858eac97192ea25d18d3f3626a8cc13ca0b175bb"
+dependencies = [
+ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "spmc"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2762,9 +2960,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "stats"
 version = "0.1.0"
 dependencies = [
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "stop-guard"
+version = "0.1.0"
+
 [[package]]
 name = "strsim"
 version = "0.6.0"
@@ -2772,69 +2974,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "subtle"
-version = "0.1.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "syn"
-version = "0.11.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "synom"
-version = "0.11.3"
+version = "0.12.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "syntex"
-version = "0.58.0"
+version = "0.58.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "syntex_errors 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "syntex_errors"
-version = "0.58.0"
+version = "0.58.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex_pos 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "syntex_pos"
-version = "0.58.0"
+version = "0.58.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "syntex_syntax"
-version = "0.58.0"
+version = "0.58.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex_errors 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex_pos 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2857,12 +3048,12 @@ name = "tempdir"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "term"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2871,95 +3062,81 @@ dependencies = [
 
 [[package]]
 name = "term_size"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "termios"
-version = "0.2.2"
+name = "textwrap"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "thread-id"
-version = "3.0.0"
+name = "thread_local"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "thread_local"
-version = "0.3.3"
+name = "threadpool"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "thread-id 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "time"
-version = "0.1.35"
+version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tiny-keccak"
-version = "1.3.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "tokio-core"
-version = "0.1.6"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-io"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-minihttp"
-version = "0.1.0"
-source = "git+https://github.com/tomusdrw/tokio-minihttp#67a400060bd29e51beaf206c552845255b6f699f"
-dependencies = [
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-proto 0.1.0 (git+https://github.com/tomusdrw/tokio-proto)",
- "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2967,43 +3144,39 @@ name = "tokio-named-pipes"
 version = "0.1.0"
 source = "git+https://github.com/nikvolf/tokio-named-pipes#0b9b728eaeb0a6673c287ac7692be398fd651752"
 dependencies = [
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-named-pipes 0.1.4 (git+https://github.com/alexcrichton/mio-named-pipes)",
- "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-proto"
-version = "0.1.0"
-source = "git+https://github.com/tomusdrw/tokio-proto#f6ee08cb594fa2fc1b4178eaaca0855d66e68fd3"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "tokio-proto"
-version = "0.1.0"
+name = "tokio-rustls"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3011,48 +3184,47 @@ name = "tokio-service"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-timer"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-uds"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio-uds 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio-uds 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "toml"
-version = "0.1.28"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "toml"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "trace-time"
+version = "0.1.0"
 dependencies = [
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3060,12 +3232,51 @@ name = "traitobject"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "transaction-pool"
+version = "1.11.0"
+dependencies = [
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "transient-hashmap"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "trezor-sys"
+version = "1.0.0"
+source = "git+https://github.com/paritytech/trezor-sys#8a401705e58c83db6c29c199d9577b78fde40709"
+dependencies = [
+ "protobuf 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "trie-standardmap"
+version = "0.1.0"
+dependencies = [
+ "ethcore-bytes 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "rlp 0.2.1",
+]
+
+[[package]]
+name = "triehash"
+version = "0.1.0"
+dependencies = [
+ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "keccak-hash 0.1.0",
+ "rlp 0.2.1",
+ "trie-standardmap 0.1.0",
 ]
 
 [[package]]
@@ -3073,30 +3284,53 @@ name = "typeable"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "uint"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unexpected"
+version = "0.1.0"
+
 [[package]]
 name = "unicase"
-version = "1.4.0"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicase"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "unicode-bidi"
-version = "0.2.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.2"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -3109,6 +3343,11 @@ name = "unicode-xid"
 version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unreachable"
 version = "0.1.1"
@@ -3118,26 +3357,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "untrusted"
-version = "0.5.0"
+name = "unreachable"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "url"
-version = "1.2.0"
+name = "untrusted"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "user32-sys"
-version = "0.2.0"
+name = "url"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3149,6 +3388,17 @@ name = "utf8-ranges"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "util-error"
+version = "0.1.0"
+dependencies = [
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb 0.1.0",
+ "rlp 0.2.1",
+ "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "vec_map"
 version = "0.8.0"
@@ -3165,25 +3415,31 @@ dependencies = [
 
 [[package]]
 name = "vergen"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "blastfig 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "version_check"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "vm"
 version = "0.1.0"
 dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "common-types 0.1.0",
- "ethcore-util 1.8.0",
+ "ethcore-bytes 0.1.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethjson 0.1.0",
- "evmjit 1.8.0",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rlp 0.2.0",
+ "keccak-hash 0.1.0",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "patricia-trie 0.1.0",
+ "rlp 0.2.1",
 ]
 
 [[package]]
@@ -3192,15 +3448,46 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "wasm-utils"
+name = "wasm"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/wasm-utils#9462bcc0680f0ec2c876abdf75bae981dd4344a5"
 dependencies = [
- "clap 2.24.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-wasm 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore-logger 1.11.0",
+ "ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-wasm 0.27.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pwasm-utils 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vm 0.1.0",
+ "wasmi 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasmi"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-wasm 0.27.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "webpki"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3208,25 +3495,44 @@ name = "winapi"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "winapi"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winapi-build"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "ws"
-version = "0.7.1"
-source = "git+https://github.com/tomusdrw/ws-rs#f8306a798b7541d64624299a83a2c934f173beed"
-dependencies = [
- "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+version = "0.7.5"
+source = "git+https://github.com/tomusdrw/ws-rs#f12d19c4c19422fc79af28a3181f598bc07ecd1e"
+dependencies = [
+ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3240,15 +3546,15 @@ dependencies = [
 
 [[package]]
 name = "xdg"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "xml-rs"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3256,286 +3562,293 @@ name = "xmltree"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "xml-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "zip"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "msdos_time 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "msdos_time 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "podio 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [metadata]
-"checksum advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a"
-"checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
-"checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
-"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
+"checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"
+"checksum ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455"
 "checksum app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7d1c0d48a81bbb13043847f957971f4d87c81542d80ece5e84ba3cba4058fd4"
-"checksum arrayvec 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d89f1b0e242270b5b797778af0c8d182a1a2ccac5d8d6fadf414223cc0fab096"
+"checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef"
 "checksum aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfdf7355d9db158df68f976ed030ab0f6578af811f5a7bb6dcf221ec24e0e0"
 "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
-"checksum backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "346d7644f0b5f9bc73082d3b2236b69a05fd35cce0cfa3724e184e6a5c9e2a2f"
-"checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76"
-"checksum backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0d842ea781ce92be2bf78a9b38883948542749640b8378b3b2f03d1fd9f1ff"
+"checksum backtrace 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbbf59b1c43eefa8c3ede390fcc36820b4999f7914104015be25025e0d62af2"
+"checksum backtrace-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "c63ea141ef8fdb10409d0f5daf30ac51f84ef43bff66f16627773d2a292cd189"
 "checksum base-x 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f59103b47307f76e03bef1633aec7fa9e29bfb5aa6daf5a334f94233c71f6c1"
 "checksum base32 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1b9605ba46d61df0410d8ac686b0007add8172eba90e8e909c347856fe794d8c"
-"checksum bigint 4.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56c9f1cd09cdcafcccdab1fd58797d39b7d4d203238b2e3768807590723bdf0"
+"checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
+"checksum base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "229d032f1a99302697f10b27167ae6d03d49d032e6a8e2550e8d3fc13356d2b4"
+"checksum bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5442186ef6560f30f1ee4b9c1e4c87a35a6879d3644550cc248ec2b955eb5fcd"
 "checksum bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e103c8b299b28a9c6990458b7013dc4a8356a9b854c51b9883241f5866fac36e"
-"checksum bit-set 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e6e1e6fb1c9e3d6fcdec57216a74eaa03e41f52a22f13a16438251d8e88b89da"
 "checksum bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c"
-"checksum bit-vec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5b97c2c8e8bbb4251754f559df8af22fb264853c7d009084a576cdf12565089d"
-"checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
+"checksum bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
-"checksum blastfig 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "09640e0509d97d5cdff03a9f5daf087a8e04c735c3b113a75139634a19cfc7b2"
-"checksum bloomchain 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f421095d2a76fc24cd3fb3f912b90df06be7689912b1bdb423caefae59c258d"
+"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
 "checksum bn 0.4.4 (git+https://github.com/paritytech/bn)" = "<none>"
-"checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
-"checksum byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c40977b0ee6b9885c9013cd41d9feffdd22deb3bb4dc3a71d901cc7a77de18c8"
-"checksum bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8b24f16593f445422331a5eed46b72f7f171f910fead4f2ea8f17e727e9c5c14"
-"checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c"
-"checksum cid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "34aa7da06f10541fbca6850719cdaa8fa03060a5d2fb33840f149cf8133a00c7"
-"checksum clap 2.24.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b8f69e518f967224e628896b54e41ff6acfb4dcfefc5076325c36525dac900f"
-"checksum clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "5b4fabf979ddf6419a313c1c0ada4a5b95cfd2049c56e8418d622d27b4b6ff32"
-"checksum clippy_lints 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "ce96ec05bfe018a0d5d43da115e54850ea2217981ff0f2e462780ab9d594651a"
+"checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23"
+"checksum bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1b7db437d718977f6dc9b2e3fd6fc343c02ac6b899b73fdd2179163447bd9ce9"
+"checksum cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "deaf9ec656256bb25b404c51ef50097207b9cbb29c933d31f92cae5a8a0ffee0"
+"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
+"checksum cid 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d85ee025368e69063c420cbb2ed9f852cb03a5e69b73be021e65726ce03585b6"
+"checksum clap 2.29.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8f4a2b3bb7ef3c672d7c13d15613211d5a6976b6892c598b0fcb5d40765f19c2"
+"checksum coco 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c06169f5beb7e31c7c67ebf5540b8b472d23e3eade3b2ec7d1f5b504a85f91bd"
 "checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
 "checksum cookie 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d53b80dde876f47f03cda35303e368a79b91c70b0d65ecba5fd5280944a08591"
-"checksum core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "20a6d0448d3a99d977ae4a2aa5a98d886a923e863e81ad9ff814645b6feb3bbd"
-"checksum core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "05eed248dc504a5391c63794fe4fb64f46f071280afaa1b73308f3c0ce4574c5"
-"checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
+"checksum crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19"
 "checksum crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a2f4a431c5c9f662e1200b7c7f02c34e91361150e382089a8f2dec3ba680cbda"
-"checksum crypt32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e34988f7e069e0b2f3bfc064295161e489b2d4e04a2e4248fb94360cdf00b4ec"
+"checksum ct-logs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "61cd11fb222fecf889f4531855c614548e92e8bd2eb178e35296885df5ee9a7c"
 "checksum ctrlc 1.1.1 (git+https://github.com/paritytech/rust-ctrlc.git)" = "<none>"
 "checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
-"checksum daemonize 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "271ec51b7e0bee92f0d04601422c73eb76ececf197026711c97ad25038a010cf"
-"checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
-"checksum deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1614659040e711785ed8ea24219140654da1729f3ec8a47a9719d041112fe7bf"
+"checksum daemonize 0.2.3 (git+https://github.com/paritytech/daemonize)" = "<none>"
 "checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8"
-"checksum docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b5b93718f8b3e5544fcc914c43de828ca6c6ace23e0332c6080a2977b49787a"
-"checksum dtoa 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5edd69c67b2f8e0911629b7e6b8a34cb3956613cd7c6e6414966dee349c2db4f"
-"checksum either 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3d2b503c86dad62aaf414ecf2b8c527439abedb3f8d812537f0b12bfd6f32a91"
-"checksum elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "258ff6a9a94f648d0379dbd79110e057edbb53eb85cc237e33eadf8e5a30df85"
-"checksum env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e3856f1697098606fc6cb97a93de88ca3f3bc35bb878c725920e6e82ecf05e83"
-"checksum error-chain 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd5c82c815138e278b8dcdeffc49f27ea6ffb528403e9dea4194f2e3dd40b143"
-"checksum eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)" = "<none>"
-"checksum ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c3d62319ee0f35abf20afe8859dd2668195912614346447bb2dee9fb8da7c62"
+"checksum docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d8acd393692c503b168471874953a2531df0e9ab77d0b6bbc582395743300a4a"
+"checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
+"checksum edit-distance 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6a34f5204fbc13582de418611cf3a7dcdd07c6d312a5b631597ba72c06b9d9c9"
+"checksum either 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "740178ddf48b1a9e878e6d6509a1442a2d42fd2928aae8e7a6f8a36fb01981b3"
+"checksum elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88d4851b005ef16de812ea9acdb7bece2f0a40dd86c07b85631d7dafa54537bb"
+"checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b"
+"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
+"checksum eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)" = "<none>"
+"checksum ethabi 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d8385a48c8ed984778dcca27efc0de162a191a14ed733a41a07d9b0cfaa999e"
+"checksum ethabi-contract 5.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca2263c24359e827348ac99aa1f2e28ba5bab0d6c0b83941fa252de8a9e9c073"
+"checksum ethabi-derive 5.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "057f76ceb314191b2e7fcd6e2129d75816e80912e73ccc8324baa3b9e259bce3"
+"checksum ethbloom 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f240172b976e2421fa5485e45cd45287bbdb56d742aa3a1d77005c49071a8518"
+"checksum ethereum-types 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bad6fb0e4ab648f4d8d8314c340c47f9e805b085b78be1b8da4676534cb419df"
+"checksum ethereum-types-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ac59a21a9ce98e188f3dace9eb67a6c4a3c67ec7fbc7218cb827852679dc002"
 "checksum fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1ee15a7050e5580b3712877157068ea713b245b080ff302ae2ca973cfcd9baa"
-"checksum flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "3eeb481e957304178d2e782f2da1257f1434dfecbae883bafb61ada2a9fea3bb"
+"checksum fixed-hash 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "21c520ebc46522d519aec9cba2b7115d49cea707d771b772c46bec61aa0daeb8"
+"checksum flate2 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "e6234dd4468ae5d1e2dbb06fe2b058696fdc50a339c68a393aefbf00bc81e423"
 "checksum fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344"
-"checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
-"checksum futures 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8e51e7f9c150ba7fd4cee9df8bf6ea3dea5b63b68955ddad19ccd35b71dcfb4d"
-"checksum futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a283c84501e92cade5ea673a2a7ca44f71f209ccdd302a3e0896f50083d2c5ff"
-"checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a"
-"checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
-"checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685"
+"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+"checksum futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0bab5b5e94f5c31fc764ba5dd9ad16568aae5d4825538c01d6bca680c9bf94a7"
+"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
+"checksum futures-timer 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5cedfe9b6dc756220782cc1ba5bcb1fa091cdcba155e40d3556159c3db58043"
+"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
+"checksum getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "65922871abd2f101a2eb0eaebadc66668e54a87ad9c3dd82520b5f86ede5eff9"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
-"checksum globset 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90d069fe6beb9be359ef505650b3f73228c5591a3c4b1f32be2f4f44459ffa3a"
+"checksum globset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "464627f948c3190ae3d04b1bc6d7dca2f785bda0ac01278e6db129ad383dbeb6"
 "checksum hamming 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65043da274378d68241eb9a8f8f8aa54e349136f7b8e12f63e3ef44043cc30e1"
-"checksum heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c7593b1522161003928c959c20a2ca421c68e940d63d75573316a009e48a6d4"
-"checksum heck 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f807d2f64cc044a6bcf250ff23e59be0deec7a16612c014f962a06fa7e020f9"
+"checksum heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461"
+"checksum heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea04fa3ead4e05e51a7c806fc07271fdbde4e246a6c6d1efd52e72230b771b82"
 "checksum hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa"
 "checksum hidapi 0.3.1 (git+https://github.com/paritytech/hidapi-rs)" = "<none>"
-"checksum httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46534074dbb80b070d60a5cb8ecadd8963a00a438ae1a95268850a7ef73b67ae"
+"checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
 "checksum hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)" = "<none>"
-"checksum hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)" = "43a15e3273b2133aaac0150478ab443fb89f15c3de41d8d93d8f3bb14bf560f6"
-"checksum hyper-native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "afe68f772f0497a7205e751626bb8e1718568b58534b6108c73a74ef80483409"
-"checksum idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1053236e00ce4f668aeca4a769a09b3bf5a682d802abd6f3cb39374f6b162c11"
+"checksum hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)" = "368cb56b2740ebf4230520e2b90ebb0461e69034d85d1945febd9b3971426db2"
+"checksum hyper 0.11.24 (registry+https://github.com/rust-lang/crates.io-index)" = "df4dd5dae401458087396b6db7fabc4d6760aa456a5fa8e92bda549f39cae661"
+"checksum hyper-rustls 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d6cdc1751771a14b8175764394f025e309a28c825ed9eaf97fa62bb831dc8c5"
+"checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
 "checksum igd 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "356a0dc23a4fa0f8ce4777258085d00a01ea4923b2efd93538fc44bf5e1bda76"
 "checksum integer-encoding 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a053c9c7dcb7db1f2aa012c37dc176c62e4cdf14898dee0eecc606de835b8acb"
-"checksum iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29d062ee61fccdf25be172e70f34c9f6efc597e1fb8f6526e8437b2046ab26be"
-"checksum ipnetwork 0.12.6 (registry+https://github.com/rust-lang/crates.io-index)" = "232e76922883005380e831068f731ef0305541c9f77b30df3a1635047b16f370"
-"checksum isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7408a548dc0e406b7912d9f84c261cc533c1866e047644a811c133c56041ac0c"
-"checksum itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d95557e7ba6b71377b0f2c3b3ae96c53f1b75a926a6901a500f557a370af730a"
-"checksum itoa 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91fd9dc2c587067de817fec4ad355e3818c3d893a78cab32a0a474c7a15bb8d5"
-"checksum jsonrpc-core 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
-"checksum jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
-"checksum jsonrpc-ipc-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
-"checksum jsonrpc-macros 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
-"checksum jsonrpc-minihttp-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
-"checksum jsonrpc-pubsub 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
-"checksum jsonrpc-server-utils 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
-"checksum jsonrpc-tcp-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
-"checksum jsonrpc-ws-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)" = "<none>"
+"checksum interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "141340095b15ed7491bd3d4ced9d20cebfb826174b6bb03386381f62b01e3d77"
+"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
+"checksum ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)" = "2134e210e2a024b5684f90e1556d5f71a1ce7f8b12e9ac9924c67fb36f63b336"
+"checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
+"checksum itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4833d6978da405305126af4ac88569b5d71ff758581ce5a987dbfa3755f694fc"
+"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
+"checksum jsonrpc-core 8.0.1 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)" = "<none>"
+"checksum jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)" = "<none>"
+"checksum jsonrpc-ipc-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)" = "<none>"
+"checksum jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)" = "<none>"
+"checksum jsonrpc-pubsub 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)" = "<none>"
+"checksum jsonrpc-server-utils 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)" = "<none>"
+"checksum jsonrpc-tcp-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)" = "<none>"
+"checksum jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.11)" = "<none>"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
-"checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
-"checksum lazycell 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce12306c4739d86ee97c23139f3a34ddf0387bbf181bc7929d287025a8c3ef6b"
-"checksum lazycell 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ec38a5c22f1ef3e30d2642aa875620d60edeef36cef43c4739d86215ce816331"
-"checksum libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "88ee81885f9f04bff991e306fea7c1c60a5f0f9e409e99f6b40e3311a3363135"
-"checksum libflate 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "59fa4619e0f202f63fde6046eafe0e754e829369c5e892abeca0c22a12dcfec9"
+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
+"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
+"checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"
+"checksum libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1e5d97d6708edaa407429faa671b942dc0f2727222fb6b6539bf1db936e4b121"
 "checksum libusb 0.3.0 (git+https://github.com/paritytech/libusb-rs)" = "<none>"
-"checksum libusb-sys 0.2.3 (git+https://github.com/paritytech/libusb-sys)" = "<none>"
-"checksum linked-hash-map 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bda158e0dabeb97ee8a401f4d17e479d6b891a14de0bba79d5cc2d4d325b5e48"
-"checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
+"checksum libusb-sys 0.2.4 (git+https://github.com/paritytech/libusb-sys)" = "<none>"
+"checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
+"checksum linked-hash-map 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d2aab0478615bb586559b0114d94dd8eca4fdbb73b443adcb0d00b61692b4bf"
 "checksum local-encoding 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1ceb20f39ff7ae42f3ff9795f3986b1daad821caaa1e1732a0944103a5a1a66"
-"checksum log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad"
-"checksum lru-cache 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "656fa4dfcb02bcf1063c592ba3ff6a5303ee1f2afe98c8a889e8b1a77c6dfdb7"
-"checksum matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "15305656809ce5a4805b1ff2946892810992197ce1270ff79baded852187942e"
-"checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
-"checksum mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a74cc2587bf97c49f3f5bab62860d6abf3902ca73b66b51d9b049fbdcd727bd2"
-"checksum mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e50bf542f81754ef69e5cea856946a3819f7c09ea97b4903c8bc8a89f74e7b6"
-"checksum miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "28eaee17666671fa872e567547e8428e83308ebe5808cdf6a0e28397dbe2c726"
-"checksum mio 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ba718a36791275c6782c0445a5f79b5ef4e68c01a4e60ac04aae28290e4957"
+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"
+"checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
+"checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
+"checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
+"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff"
+"checksum memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882"
+"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
+"checksum mime 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e3d709ffbb330e1566dc2f2a3c9b58a5ad4a381f740b810cd305dc3f089bc160"
+"checksum mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "27a5e6679a0614e25adc14c6434ba84e41632b765a6d9cb2031a0cca682699ae"
+"checksum miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4"
+"checksum mio 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "6d771e3ef92d58a8da8df7d6976bfca9371ed1de6619d9d5a5ce5b1f29b85bfe"
 "checksum mio-named-pipes 0.1.4 (git+https://github.com/alexcrichton/mio-named-pipes)" = "<none>"
-"checksum mio-uds 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "78437f00d9615c366932cbfe79790b5c2945706ba67cf78378ffacc0069ed9de"
-"checksum miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3e690c5df6b2f60acd45d56378981e827ff8295562fc8d34f573deb267a59cd1"
+"checksum mio-uds 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1731a873077147b626d89cc6c2a0db6288d607496c5d10c0cfcf3adc697ec673"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-"checksum msdos_time 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c04b68cc63a8480fb2550343695f7be72effdec953a9d4508161c3e69041c7d8"
+"checksum msdos_time 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "65ba9d75bcea84e07812618fedf284a64776c2f2ea0cad6bca7f69739695a958"
 "checksum multibase 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b9c35dac080fd6e16a99924c8dfdef0af89d797dd851adab25feaffacf7850d6"
-"checksum multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d14363c7695e2e5adbbb8fe139d806a19b8b13f02b9b1fb770fab0c12edaff58"
-"checksum nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)" = "<none>"
-"checksum nanomsg-sys 0.5.0 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)" = "<none>"
-"checksum native-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1e94a2fc65a44729fe969cc973da87c1052ae3f000b2cb33029f14aeb85550d5"
-"checksum net2 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "bc01404e7568680f1259aa5729539f221cb1e6d047a0d9053cab4be8a73b5d67"
-"checksum nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "52cd74cd09beba596430cc6e3091b74007169a56246e1262f0ba451ea95117b2"
-"checksum nom 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6caab12c5f97aa316cb249725aa32115118e1522b445e26c257dd77cad5ffd4e"
-"checksum ntp 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d23f30ae7da76e2c6c2f5de53f298aa9a3911d3955ab2c349eb944caedceb088"
-"checksum num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "c04bd954dbf96f76bab6e5bd6cef6f1ce1262d15268ce4f926d2b5b778fa7af2"
-"checksum num-bigint 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "41655c8d667be847a0b72fe0888857a7b3f052f691cf40852be5fcf87b274a65"
-"checksum num-complex 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "ccac67baf893ac97474f8d70eff7761dabb1f6c66e71f8f1c67a6859218db810"
-"checksum num-integer 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "fb24d9bfb3f222010df27995441ded1e954f8f69cd35021f6bef02ca9552fb92"
-"checksum num-iter 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "287a1c9969a847055e1122ec0ea7a5c5d6f72aad97934e131c83d5c08ab4e45c"
-"checksum num-rational 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "48cdcc9ff4ae2a8296805ac15af88b3d88ce62128ded0cb74ffb63a587502a84"
-"checksum num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "51eab148f171aefad295f8cece636fc488b9b392ef544da31ea4b8ef6b9e9c39"
-"checksum num_cpus 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "55aabf4e2d6271a2e4e4c0f2ea1f5b07cc589cc1a9e9213013b54a76678ca4f3"
-"checksum number_prefix 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "084d05f4bf60621a9ac9bde941a410df548f4de9545f06e5ee9d3aef4b97cd77"
-"checksum odds 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "b28c06e81b0f789122d415d6394b5fe849bde8067469f4c2980d3cdc10c78ec1"
+"checksum multihash 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d49add5f49eb08bfc4d01ff286b84a48f53d45314f165c2d6efe477222d24f3"
+"checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
+"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
+"checksum ntp 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "143149743832c6543b60a8ef2a26cd9122dfecec2b767158e852a7beecf6d7a0"
+"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
+"checksum num-bigint 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "81b483ea42927c463e191802e7334556b48e7875297564c0e9951bd3a0ae53e3"
+"checksum num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe"
+"checksum num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593"
+"checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0"
+"checksum num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dee092fcdf725aee04dd7da1d21debff559237d49ef1cb3e69bcb8ece44c7364"
+"checksum num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "514f0d73e64be53ff320680ca671b64fe3fb91da01e1ae2ddc99eb51d453b20d"
+"checksum number_prefix 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "59a14be9c211cb9c602bad35ac99f41e9a84b44d71b8cbd3040e3bd02a214902"
 "checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c"
-"checksum openssl 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b34cd77cf91301fff3123fbd46b065c3b728b17a392835de34c397315dce5586"
-"checksum openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e035022a50faa380bd7ccdbd184d946ce539ebdb0a358780de92a995882af97a"
 "checksum order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "efa535d5117d3661134dbf1719b6f0ffe06f2375843b13935db186cd094105eb"
 "checksum ordered-float 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "58d25b6c0e47b20d05226d288ff434940296e7e2f8b877975da32f862152241f"
 "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
-"checksum parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1d06f6ee0fda786df3784a96ee3f0629f529b91cbfb7d142f6410e6bcd1ce2c"
+"checksum parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "261c025c67ba416e9fe63aa9b3236520ce3c74cfbe43590c9cdcec4ccc8180e4"
 "checksum parity-tokio-ipc 0.1.5 (git+https://github.com/nikvolf/parity-tokio-ipc)" = "<none>"
-"checksum parity-ui-precompiled 1.4.0 (git+https://github.com/paritytech/js-precompiled.git)" = "<none>"
-"checksum parity-wasm 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "51104c8b8da5cd0ebe0ab765dfab37bc1927b4a01a3d870b0fe09d9ee65e35ea"
-"checksum parity-wordlist 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52142d717754f7ff7ef0fc8da1bdce4f302dd576fb9bf8b727d6a5fdef33348d"
-"checksum parking_lot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aebb68eebde2c99f89592d925288600fde220177e46b5c9a91ca218d245aeedf"
-"checksum parking_lot_core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb1b97670a2ffadce7c397fb80a3d687c4f3060140b885621ef1653d0e5d5068"
-"checksum phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)" = "447d9d45f2e0b4a9b532e808365abf18fc211be6ca217202fcd45236ef12f026"
-"checksum phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)" = "8af7ae7c3f75a502292b491e5cc0a1f69e3407744abe6e57e2a3b712bb82f01d"
-"checksum phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)" = "db005608fd99800c8c74106a7c894cf582055b689aa14a79462cefdcb7dc1cc3"
-"checksum phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)" = "fee4d039930e4f45123c9b15976cf93a499847b6483dc09c42ea0ec4940f2aa6"
-"checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
+"checksum parity-ui-dev 1.9.0 (git+https://github.com/parity-js/shell.git?rev=eecaadcb9e421bce31e91680d14a20bbd38f92a2)" = "<none>"
+"checksum parity-ui-old-dev 1.9.0 (git+https://github.com/parity-js/dapp-wallet.git?rev=65deb02e7c007a0fd8aab0c089c93e3fd1de6f87)" = "<none>"
+"checksum parity-ui-old-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git?rev=4b6f112412716cd05123d32eeb7fda448288a6c6)" = "<none>"
+"checksum parity-ui-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-10-shell.git?rev=bd25b41cd642c6b822d820dded3aa601a29aa079)" = "<none>"
+"checksum parity-wasm 0.27.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a93ad771f67ce8a6af64c6444a99c07b15f4674203657496fc31244ffb1de2c3"
+"checksum parity-wordlist 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0dec124478845b142f68b446cbee953d14d4b41f1bc0425024417720dce693"
+"checksum parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd9d732f2de194336fb02fe11f9eed13d9e76f13f4315b4d88a14ca411750cd"
+"checksum parking_lot_core 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4f610cb9664da38e417ea3225f23051f589851999535290e077939838ab7a595"
+"checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356"
+"checksum phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "cb325642290f28ee14d8c6201159949a872f220c62af6e110a56ea914fbe42fc"
+"checksum phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d62594c0bb54c464f633175d502038177e90309daf2e0158be42ed5f023ce88f"
+"checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03"
+"checksum phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "07e24b0ca9643bdecd0632f2b3da6b1b89bbb0030e0b992afc1113b23a7bc2f2"
 "checksum podio 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e5422a1ee1bc57cc47ae717b0137314258138f38fd5f3cea083f43a9725383a0"
 "checksum pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2412f3332a07c7a2a50168988dcc184f32180a9758ad470390e5f55e089f6b6e"
 "checksum primal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0e31b86efadeaeb1235452171a66689682783149a6249ff334a2c5d8218d00a4"
-"checksum primal-bit 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "464a91febc06166783d4f5ba3577b5ed8dda8e421012df80bfe48a971ed7be8f"
-"checksum primal-check 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "647c81b67bb9551a7b88d0bcd785ac35b7d0bf4b2f358683d7c2375d04daec51"
+"checksum primal-bit 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "686a64e2f50194c64942992af5799e6b6e8775b8f88c607d72ed0a2fd58b9b21"
+"checksum primal-check 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e65f96c0a171f887198c274392c99a116ef65aa7f53f3b6d4902f493965c2d1"
 "checksum primal-estimate 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "56ea4531dde757b56906493c8604641da14607bf9cdaa80fb9c9cabd2429f8d5"
-"checksum primal-sieve 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7aa73fd87e5984a00bdb4c1b14d3d5d6d0bad01b2caaaf924c16ab7260ac946c"
+"checksum primal-sieve 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c0911abe7b63ddec27527ba7579c3017f645eb992be6ddbfad605e34aca01876"
+"checksum proc-macro2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0"
+"checksum protobuf 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "568a15e4d572d9a5e63ae3a55f84328c984842887db179b40b4cc6a608bac6a4"
 "checksum pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07"
+"checksum pwasm-utils 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "54d440c3b56eee028aa5d4f18cbed8c6e0c9ae23563b93f344beb7e73854ea02"
 "checksum quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18c45c4854d6d1cf5d531db97c75880feb91c958b0720f4ec1057135fec358b3"
 "checksum quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9e25fa23c044c1803f43ca59c98dac608976dd04ce799411edd58ece776d4"
 "checksum quasi_macros 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29cec87bc2816766d7e4168302d505dd06b0a825aed41b00633d296e922e02dd"
-"checksum quick-error 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0aad603e8d7fb67da22dbdf1f4b826ce8829e406124109e73cf1b2454b93a71c"
-"checksum quine-mc_cluskey 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6683b0e23d80813b1a535841f0048c1537d3f86d63c999e8373b39a9b0eb74a"
-"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
-"checksum rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2791d88c6defac799c3f20d74f094ca33b9332612d9aef9078519c82e4fe04a5"
-"checksum rayon 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c83adcb08e5b922e804fe1918142b422602ef11f2fd670b0b52218cb5984a20"
-"checksum rayon-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "767d91bacddf07d442fe39257bf04fd95897d1c47c545d009f6beb03efd038f8"
-"checksum regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4278c17d0f6d62dfef0ab00028feb45bd7d2102843f80763474eeb1be8a10c01"
-"checksum regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "841591b1e05609a643e3b4d0045fce04f701daba7151ddcd3ad47b080693d5a9"
-"checksum regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9191b1f57603095f105d317e375d19b1c9c5c3185ea9633a99a6dcbed04457"
-"checksum reqwest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1d56dbe269dbe19d716b76ec8c3efce8ef84e974f5b7e5527463e8c0507d4e17"
-"checksum ring 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "873ec7c2b7c9bf58024eb8f1bbc40a6499cd23c1adc59532f4af9e355f1de0f3"
+"checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4"
+"checksum quote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eca14c727ad12702eb4b6bfb5a232287dcf8385cb8ca83a3eeaf6519c44c408"
+"checksum rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)" = "512870020642bb8c221bf68baa1b2573da814f6ccfe5c9699b1c303047abe9b1"
+"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
+"checksum rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b614fe08b6665cb9a231d07ac1364b0ef3cb3698f1239ee0c4c3a88a524f54c8"
+"checksum rayon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed02d09394c94ffbdfdc755ad62a132e94c3224a8354e78a1200ced34df12edf"
+"checksum rayon-core 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e64b609139d83da75902f88fd6c01820046840a18471e4dfcd5ac7c0f46bea53"
+"checksum redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "8dde11f18c108289bef24469638a04dce49da56084f2d50618b226e47eb04509"
+"checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa"
+"checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
+"checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a"
+"checksum ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6f7d28b30a72c01b458428e0ae988d4149c20d902346902be881e3edc4bb325c"
 "checksum rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)" = "<none>"
 "checksum rocksdb-sys 0.3.0 (git+https://github.com/paritytech/rust-rocksdb)" = "<none>"
 "checksum rotor 0.6.3 (git+https://github.com/tailhook/rotor)" = "<none>"
-"checksum rpassword 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5d3a99497c5c544e629cc8b359ae5ede321eba5fa8e5a8078f3ced727a976c3f"
-"checksum rpassword 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab6e42be826e215f30ff830904f8f4a0933c6e2ae890e1af8b408f5bae60081e"
+"checksum rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b273c91bd242ca03ad6d71c143b6f17a48790e61f21a6c78568fa2b6774a24a4"
+"checksum rprompt 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1601f32bc5858aae3cbfa1c645c96c4d820cc5c16be0194f089560c00b6eb625"
 "checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
-"checksum rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3058a43ada2c2d0b92b3ae38007a2d0fa5e9db971be260e0171408a4ff471c95"
+"checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e"
 "checksum rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ceb8ce7a5e520de349e1fa172baeba4a9e8d5ef06c47471863530bc4972ee1e"
-"checksum rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "6159e4e6e559c81bd706afe9c8fd68f547d3e851ce12e76b1de7914bab61691b"
-"checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
-"checksum rustc_version 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e114e275f7c9b5d50bb52b28f9aac1921209f02aa6077c8b255e21eefaf8ffa"
-"checksum schannel 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4e45ac5e9e4698c1c138d2972bedcd90b81fe1efeba805449d2bdd54512de5f9"
+"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
+"checksum rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9743a7670d88d5d52950408ecdb7c71d8986251ab604d4689dd2ca25c9bca69"
+"checksum rustls 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cc9f2e05fd6a3ce1530cd5dbcc553d2f94d7749fe3e4f5b443668eddd842889e"
+"checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
 "checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d"
-"checksum secur32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f412dfa83308d893101dd59c10d6fda8283465976c28c287c5c855bf8d216bc"
-"checksum security-framework 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "42ddf098d78d0b64564b23ee6345d07573e7d10e52ad86875d89ddf5f8378a02"
-"checksum security-framework-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "5bacdada57ea62022500c457c8571c17dfb5e6240b7c8eac5916ffa8c7138a55"
-"checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
-"checksum semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2d5b7638a1f03815d94e88cb3b3c08e87f0db4d683ef499d1836aaf70a45623f"
+"checksum scopeguard 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c79eb2c3ac4bc2507cda80e7f3ac5b88bd8eae4c0914d5663e6a8933994be918"
+"checksum sct 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1137b767bbe1c4d30656993bdd97422ed41255d9400b105d735f8c7d9e800632"
 "checksum semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6a7c6b751a2e8d5df57a5ff71b5b4fc8aaee9ee28ff1341d640dd130bb5f4f7a"
-"checksum serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2f6ca58905ebd3c3b285a8a6d4f3ac92b92c0d7951d5649b1bdd212549c06639"
-"checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a"
+"checksum serde 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)" = "4763b773978e495252615e814d2ad04773b2c1f85421c7913869a537f35cb406"
+"checksum serde_derive 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)" = "8ab31f00ae5574bb643c196d5e302961c122da1c768604c6d16a35c5d551948a"
+"checksum serde_derive_internals 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fc848d073be32cd982380c06587ea1d433bc1a4c4a111de07ec2286a3ddade8"
 "checksum serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142"
-"checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b"
-"checksum serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce0fd303af908732989354c6f02e05e2e6d597152870f2c6990efb0577137480"
+"checksum serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c9db7266c7d63a4c4b7fe8719656ccdd51acf1bed6124b174f933b009fb10bcb"
 "checksum sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c"
 "checksum shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72f20b8f3c060374edb8046591ba28f62448c369ccbdc7b02075103fb3a9e38d"
-"checksum siphasher 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c44e42fa187b5a8782489cf7740cc27c3125806be2bf33563cf5e02e9533fcd"
+"checksum siphasher 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "833011ca526bd88f16778d32c699d325a9ad302fa06381cd66f7be63351d3f6d"
+"checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
 "checksum skeptic 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24ebf8a06f5f8bae61ae5bbc7af7aac4ef6907ae975130faba1199e5fe82256a"
 "checksum slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6dbdd334bd28d328dad1c41b0ea662517883d8880d8533895ef96c8003dec9c4"
 "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
-"checksum smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "fcc8d19212aacecf95e4a7a2179b26f7aeb9732a915cf01f05b0d3e044865410"
+"checksum slab 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdeff4cd9ecff59ec7e3744cbca73dfe5ac35c2aedb2cfba8a1c715a18912e9d"
 "checksum smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013"
-"checksum smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e40af10aafe98b4d8294ae8388d8a5cd0707c65d364872efe72d063ec44bee0"
-"checksum spmc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93bdab61c1a413e591c4d17388ffa859eaff2df27f1e13a5ec8b716700605adf"
+"checksum smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8fcd03faf178110ab0334d74ca9631d77f94c8c11cc77fcb59538abf0025695d"
+"checksum snappy 0.1.0 (git+https://github.com/paritytech/rust-snappy)" = "<none>"
+"checksum snappy-sys 0.1.0 (git+https://github.com/paritytech/rust-snappy)" = "<none>"
+"checksum spmc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cd1f11d1fb5fd41834e55ce0b85a186efbf2f2afd9fdb09e2c8d72f9bff1ad1a"
 "checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b"
 "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
-"checksum subtle 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b811576c12506ff3f6da145585dc833edc32ee34c9fc021127d90e8134cc05c"
-"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
-"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
-"checksum syntex 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)" = "35f3cc9d446323ef8fefad933b65cd6de271d29fa14a2e9d036a084770c6d6d5"
-"checksum syntex_errors 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3af03823ea45d420dd2c1a44bb074e13ea55f9b99afe960fd58eb4069b7f6cad"
-"checksum syntex_pos 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e502a4a904d9f37cf975dbdbb0b08f2d111322f6792bda6eb095b4112c9a24b"
-"checksum syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6cf936464c3863952ea3fab848860ea891eba8647b6008b04c36f0bb007192a3"
+"checksum subtle 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc7f6353c2ee5407358d063a14cccc1630804527090a6fb5a9489ce4924280fb"
+"checksum syn 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)" = "8c5bc2d6ff27891209efa5f63e9de78648d7801f085e4653701a692ce938d6fd"
+"checksum syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a8f5e3aaa79319573d19938ea38d068056b826db9883a5d47f86c1cecc688f0e"
+"checksum syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "867cc5c2d7140ae7eaad2ae9e8bf39cb18a67ca651b7834f88d46ca98faadb9c"
+"checksum syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13ad4762fe52abc9f4008e85c4fb1b1fe3aa91ccb99ff4826a439c7c598e1047"
+"checksum syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e0e4dbae163dd98989464c23dd503161b338790640e11537686f2ef0f25c791"
 "checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5"
 "checksum target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe"
 "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6"
-"checksum term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d168af3930b369cfe245132550579d47dfd873d69470755a19c2c6568dbbd989"
-"checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
-"checksum termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d9cf598a6d7ce700a4e6a9199da127e6819a61e64b68609683cc9a01b5683a"
-"checksum thread-id 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4437c97558c70d129e40629a5b385b3fb1ffac301e63941335e4d354081ec14a"
-"checksum thread_local 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c85048c6260d17cf486ceae3282d9fb6b90be220bf5b28c400f5485ffc29f0c7"
-"checksum time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "3c7ec6d62a20df54e07ab3b78b9a3932972f4b7981de295563686849eb3989af"
-"checksum tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d52d12ad79e4063e0cb0ca5efa202ed7244b6ce4d25f4d3abe410b2a66128292"
-"checksum tokio-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "99e958104a67877907c1454386d5482fe8e965a55d60be834a15a44328e7dc76"
-"checksum tokio-io 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "48f55df1341bb92281f229a6030bc2abffde2c7a44c6d6b802b7687dd8be0775"
-"checksum tokio-minihttp 0.1.0 (git+https://github.com/tomusdrw/tokio-minihttp)" = "<none>"
+"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
+"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
+"checksum textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693"
+"checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
+"checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
+"checksum time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d788d3aa77bc0ef3e9621256885555368b47bd495c13dd2e7413c89f845520"
+"checksum tiny-keccak 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "58911ed5eb275a8fd2f1f0418ed360a42f59329864b64e1e95377a9024498c01"
+"checksum tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "52b4e32d8edbf29501aabb3570f027c6ceb00ccef6538f4bddba0200503e74e8"
+"checksum tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ab83e7adb5677e42e405fa4ceff75659d93c4d7d7dd22f52fcec59ee9f02af"
 "checksum tokio-named-pipes 0.1.0 (git+https://github.com/nikvolf/tokio-named-pipes)" = "<none>"
-"checksum tokio-proto 0.1.0 (git+https://github.com/tomusdrw/tokio-proto)" = "<none>"
-"checksum tokio-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c0d6031f94d78d7b4d509d4a7c5e1cdf524a17e7b08d1c188a83cf720e69808"
+"checksum tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389"
+"checksum tokio-rustls 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9263e472d976e4345e50c6cce4cfe6b17c71593ea593cce1df26f1efd36debb"
 "checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
-"checksum tokio-timer 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86f33def658c14724fc13ec6289b3875a8152ee8ae767a5b1ccbded363b03db8"
-"checksum tokio-uds 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bd209039933255ea77c6d7a1d18abc20b997d161acb900acca6eb74cdd049f31"
-"checksum toml 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "fcd27a04ca509aff336ba5eb2abc58d456f52c4ff64d9724d88acb85ead560b6"
-"checksum toml 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0601da6c97135c8d330c7a13a013ca6cd4143221b01de2f8d4edc50a9e551c7"
+"checksum tokio-timer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6131e780037787ff1b3f8aad9da83bca02438b72277850dd6ad0d455e0e20efc"
+"checksum tokio-uds 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6116c71be48f8f1656551fd16458247fdd6c03201d7893ad81189055fcde03e8"
+"checksum toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e"
 "checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
 "checksum transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "715254c8f0811be1a79ad3ea5e6fa3c8eddec2b03d7f5ba78cf093e56d79c24f"
+"checksum trezor-sys 1.0.0 (git+https://github.com/paritytech/trezor-sys)" = "<none>"
 "checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
-"checksum unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "13a5906ca2b98c799f4b1ab4557b76367ebd6ae5ef14930ec841c74aed5f3764"
-"checksum unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c1f7ceb96afdfeedee42bade65a0d585a6a0106f681b6749c8ff4daa8df30b3f"
-"checksum unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "26643a2f83bac55f1976fb716c10234485f9202dcd65cfbdf9da49867b271172"
-"checksum unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18127285758f0e2c6cf325bb3f3d138a12fee27de4f23e146cd6a179f26c2cf3"
+"checksum uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53a4340c35703f926ec365c6797bb4a7a10bb6b9affe29ca385c9d804401f5e3"
+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+"checksum unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284b6d3db520d67fbe88fd778c21510d1b0ba4a551e5d0fbb023d33405f6de8a"
+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+"checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
+"checksum unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946"
 "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
 "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91"
-"checksum untrusted 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6b65243989ef6aacd9c0d6bd2b822765c3361d8ed352185a6f3a41f3a718c673"
-"checksum url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afe9ec54bc4db14bc8744b7fed060d785ac756791450959b2248443319d5b119"
-"checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47"
+"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f392d7819dbe58833e26872f5f6f0d68b7bbbe90fc3667e98731c4a15ad9a7ae"
+"checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27"
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
 "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
 "checksum vecio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0795a11576d29ae80525a3fda315bf7b534f8feb9d34101e5fe63fb95bb2fd24"
-"checksum vergen 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "56b639f935488eb40f06d17c3e3bcc3054f6f75d264e187b1107c8d1cba8d31c"
+"checksum vergen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c3365f36c57e5df714a34be40902b27a992eeddb9996eca52d0584611cf885d"
+"checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum wasm-utils 0.1.0 (git+https://github.com/paritytech/wasm-utils)" = "<none>"
+"checksum wasmi 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dedfb4cbfba1e1921b12ed05762d9d5ae99ce40e72b98bbf271561ef487e8c7"
+"checksum webpki 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9e1622384bcb5458c6a3e3fa572f53ea8fef1cc85e535a2983dea87e9154fac2"
+"checksum webpki-roots 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "155d4060e5befdf3a6076bd28c22513473d9900b763c9e4521acc6f78a75415c"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+"checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-"checksum ws 0.7.1 (git+https://github.com/tomusdrw/ws-rs)" = "<none>"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum ws 0.7.5 (git+https://github.com/tomusdrw/ws-rs)" = "<none>"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-"checksum xdg 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "77b831a5ba77110f438f0ac5583aafeb087f70432998ba6b7dcb1d32185db453"
-"checksum xml-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "65e74b96bd3179209dc70a980da6df843dff09e46eee103a0376c0949257e3ef"
+"checksum xdg 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a66b7c2281ebde13cf4391d70d4c7e5946c3c25e72a7b859ca8f677dcd0b0c61"
+"checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562"
 "checksum xmltree 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "472a9d37c7c53ab2391161df5b89b1f3bf76dab6ab150d7941ecbdd832282082"
-"checksum zip 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "3ceb33a75b3d0608942302eed325b59d2c3ed777cc6c01627ae14e5697c6a31c"
+"checksum zip 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c0deac03fc7d43abcf19f2c2db6bd9289f9ea3d31f350e26eb0ed8b4117983c1"
diff --git a/Cargo.toml b/Cargo.toml
index 06abd7b3169e750f9d729609ee7847548eee0139..d1c7b250cfa8e1d738a929dd04e08dc8352293aa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,22 +1,25 @@
 [package]
 description = "Parity Ethereum client"
 name = "parity"
-version = "1.8.0"
+# NOTE Make sure to update util/version/Cargo.toml as well
+version = "1.11.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
 
 [dependencies]
 log = "0.3"
 env_logger = "0.4"
 rustc-hex = "1.0"
 docopt = "0.8"
-time = "0.1"
+clap = "2"
+term_size = "0.3"
+textwrap = "0.9"
 num_cpus = "1.2"
 number_prefix = "0.2"
-rpassword = "0.2.1"
+rpassword = "1.0"
 semver = "0.6"
-ansi_term = "0.9"
+ansi_term = "0.10"
+parking_lot = "0.5"
 regex = "0.2"
 isatty = "0.1"
 toml = "0.4"
@@ -29,19 +32,20 @@ futures-cpupool = "0.1"
 fdlimit = "0.1"
 ws2_32-sys = "0.2"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 ethsync = { path = "sync" }
 ethcore = { path = "ethcore" }
-ethcore-util = { path = "util" }
+ethcore-bytes = { path = "util/bytes" }
 ethcore-io = { path = "util/io" }
-ethcore-devtools = { path = "devtools" }
-ethcore-ipc = { path = "ipc/rpc" }
-ethcore-ipc-nano = { path = "ipc/nano" }
-ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
 ethcore-light = { path = "ethcore/light" }
 ethcore-logger = { path = "logger" }
-ethcore-stratum = { path = "stratum" }
+ethcore-migrations = { path = "ethcore/migrations" }
+ethcore-miner = { path = "miner" }
 ethcore-network = { path = "util/network" }
+ethcore-service = { path = "ethcore/service" }
+ethcore-stratum = { path = "stratum" }
+ethcore-transaction = { path = "ethcore/transaction" }
+ethereum-types = "0.2"
 node-filter = { path = "ethcore/node_filter" }
 ethkey = { path = "ethkey" }
 node-health = { path = "dapps/node-health" }
@@ -54,27 +58,35 @@ parity-reactor = { path = "util/reactor" }
 parity-rpc = { path = "rpc" }
 parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
+parity-version = { path = "util/version" }
 parity-whisper = { path = "whisper" }
 path = { path = "util/path" }
-panic_hook = { path = "panic_hook" }
+dir = { path = "util/dir" }
+panic_hook = { path = "util/panic_hook" }
+keccak-hash = { path = "util/hash" }
+migration = { path = "util/migration" }
+kvdb = { path = "util/kvdb" }
+kvdb-rocksdb = { path = "util/kvdb-rocksdb" }
+journaldb = { path = "util/journaldb" }
 
 parity-dapps = { path = "dapps", optional = true }
-clippy = { version = "0.0.103", optional = true}
 ethcore-secretstore = { path = "secret_store", optional = true }
 
+registrar = { path = "registrar" }
+
 [build-dependencies]
 rustc_version = "0.2"
 
 [dev-dependencies]
-ethcore-ipc-tests = { path = "ipc/tests" }
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
+tempdir = "0.3"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.2"
 
 [target.'cfg(not(windows))'.dependencies]
-daemonize = "0.2"
+daemonize = { git = "https://github.com/paritytech/daemonize" }
 
 [features]
 default = ["ui-precompiled"]
@@ -88,16 +100,14 @@ ui-precompiled = [
 ]
 ui-enabled = ["dapps"]
 dapps = ["parity-dapps"]
-ipc = ["ethcore/ipc", "ethsync/ipc"]
 jit = ["ethcore/jit"]
-dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "parity-rpc/dev", "parity-dapps/dev"]
 json-tests = ["ethcore/json-tests"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
-final = ["ethcore-util/final"]
 secretstore = ["ethcore-secretstore"]
+final = ["parity-version/final"]
 
 [[bin]]
 path = "parity/main.rs"
@@ -112,4 +122,15 @@ lto = false
 panic = "abort"
 
 [workspace]
-members = ["ethstore/cli", "ethkey/cli", "evmbin", "whisper", "chainspec", "dapps/node-health"]
+members = [
+	"chainspec",
+	"dapps/js-glue",
+	"ethcore/wasm/run",
+	"ethcore/types",
+	"ethkey/cli",
+	"ethstore/cli",
+	"evmbin",
+	"miner",
+	"transaction-pool",
+	"whisper"
+]
diff --git a/README.md b/README.md
index 24178edbef17f55382867d4ab1f87fa550313b3f..1e4a12bf02d78d52afcd3ac5c924e27cdcfcec8e 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
-# [Parity](https://parity.io/parity.html) - fast, light, and robust Ethereum client
+# Parity - fast, light, and robust Ethereum client
+
+## [» Download the latest release «](https://github.com/paritytech/parity/releases/latest)
 
 [![build status](https://gitlab.parity.io/parity/parity/badges/master/build.svg)](https://gitlab.parity.io/parity/parity/commits/master)
+[![codecov](https://codecov.io/gh/paritytech/parity/branch/master/graph/badge.svg)](https://codecov.io/gh/paritytech/parity)
 [![Snap Status](https://build.snapcraft.io/badge/paritytech/parity.svg)](https://build.snapcraft.io/user/paritytech/parity)
 [![GPLv3](https://img.shields.io/badge/license-GPL%20v3-green.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
 
-- [Download the latest release here.](https://github.com/paritytech/parity/releases)
 
 ### Join the chat!
 
@@ -14,7 +16,12 @@ Get in touch with us on Gitter:
 [![Gitter: Parity/Miners](https://img.shields.io/badge/gitter-parity/miners-4AB495.svg)](https://gitter.im/paritytech/parity/miners)
 [![Gitter: Parity-PoA](https://img.shields.io/badge/gitter-parity--poa-4AB495.svg)](https://gitter.im/paritytech/parity-poa)
 
-Be sure to check out [our wiki](https://github.com/paritytech/parity/wiki) and the [internal documentation](https://paritytech.github.io/parity/ethcore/index.html) for more information.
+Or join our community on Matrix:
+[![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io)
+
+Official website: https://parity.io
+
+Be sure to check out [our wiki](https://wiki.parity.io) for more information.
 
 ----
 
@@ -22,26 +29,28 @@ Be sure to check out [our wiki](https://github.com/paritytech/parity/wiki) and t
 
 Parity's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity using the sophisticated and cutting-edge Rust programming language. Parity is licensed under the GPLv3, and can be used for all your Ethereum needs.
 
-Parity comes with a built-in wallet. To access [Parity Wallet](http://web3.site/) simply go to http://web3.site/ (if you don't have access to the internet, but still want to use the service, you can also use http://127.0.0.1:8180/). It includes various functionality allowing you to:
+Parity comes with a built-in wallet, to install it please follow [these instructions](https://wiki.parity.io/Parity-Wallet). It includes various functionality allowing you to:
 
 - create and manage your Ethereum accounts;
 - manage your Ether and any Ethereum tokens;
 - create and register your own tokens;
 - and much more.
 
-By default, Parity will also run a JSONRPC server on `127.0.0.1:8545`. This is fully configurable and supports a number of RPC APIs.
+From Parity Ethereum client version >=1.10, the User Interface (UI) is accessible in a separate application called Parity UI. To keep using the UI in the browser (deprecated), [follow these steps](https://wiki.parity.io/FAQ-Basic-Operations,-Configuration,-and-Synchronization.md#the-parity-ui-application-isnt-working-the-way-i-want).
 
-If you run into an issue while using parity, feel free to file one in this repository or hop on our [gitter chat room](https://gitter.im/paritytech/parity) to ask a question. We are glad to help!
+By default, Parity will also run a JSONRPC server on `127.0.0.1:8545` and a websockets server on `127.0.0.1:8546`. This is fully configurable and supports a number of APIs.
 
-**For security-critical issues**, please refer to the security policy outlined in `SECURITY.MD`.
+If you run into an issue while using Parity, feel free to file one in this repository or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help!
 
-Parity's current release is 1.7. You can download it at https://github.com/paritytech/parity/releases or follow the instructions below to build from source.
+**For security-critical issues**, please refer to the security policy outlined in [SECURITY.MD](SECURITY.md).
+
+Parity's current release is 1.9. You can download it at https://github.com/paritytech/parity/releases or follow the instructions below to build from source.
 
 ----
 
 ## Build dependencies
 
-**Parity requires Rust version 1.19.0 to build**
+**Parity requires Rust version 1.23.0 to build**
 
 We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have rustup, you can install it like this:
 
@@ -51,21 +60,22 @@ We recommend installing Rust through [rustup](https://www.rustup.rs/). If you do
 	```
 
 	Parity also requires `gcc`, `g++`, `libssl-dev`/`openssl`, `libudev-dev` and `pkg-config` packages to be installed.
+
 - OSX:
 	```bash
 	$ curl https://sh.rustup.rs -sSf | sh
 	```
 
 	`clang` is required. It comes with Xcode command line tools or can be installed with homebrew.
-- Windows
 
-    Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the rustup installer from
+- Windows
+  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the rustup installer from
 	https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the msvc toolchain:
-    ```
+  ```bash
 	$ rustup default stable-x86_64-pc-windows-msvc
-    ```
+  ```
 
-Once you have rustup, install parity or download and build from source
+Once you have rustup, install Parity or download and build from source
 
 ----
 
@@ -74,10 +84,20 @@ Once you have rustup, install parity or download and build from source
 In any of the [supported Linux distros](https://snapcraft.io/docs/core/install):
 
 ```bash
-sudo snap install parity --edge
+sudo snap install parity
+```
+
+Or, if you want to contribute testing the upcoming release:
+
+```bash
+sudo snap install parity --beta
 ```
 
-(Note that this is an experimental and unstable release, at the moment)
+And to test the latest code landed into the master branch:
+
+```bash
+sudo snap install parity --edge
+```
 
 ----
 
@@ -93,11 +113,39 @@ $ cargo build --release
 ```
 
 This will produce an executable in the `./target/release` subdirectory.
+
 Note: if cargo fails to parse manifest try:
 
 ```bash
 $ ~/.cargo/bin/cargo build --release
 ```
+
+Note: When compiling a crate and you receive the following error:
+
+```
+error: the crate is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind`
+```
+
+Cleaning the repository will most likely solve the issue, try:
+
+```bash
+$ cargo clean
+```
+
+This will always compile the latest nightly builds. If you want to build stable or beta, do a
+
+```bash
+$ git checkout stable
+```
+
+or
+
+```bash
+$ git checkout beta
+```
+
+first.
+
 ----
 
 ## Simple one-line installer for Mac and Ubuntu
@@ -106,9 +154,18 @@ $ ~/.cargo/bin/cargo build --release
 bash <(curl https://get.parity.io -Lk)
 ```
 
+The one-line installer always defaults to the latest beta release. To install a stable release, run:
+
+```bash
+bash <(curl https://get.parity.io -Lk) -r stable
+```
+
 ## Start Parity
+
 ### Manually
+
 To start Parity manually, just run
+
 ```bash
 $ ./target/release/parity
 ```
@@ -116,11 +173,9 @@ $ ./target/release/parity
 and Parity will begin syncing the Ethereum blockchain.
 
 ### Using systemd service file
+
 To start Parity as a regular user using systemd init:
 
-1. Copy `parity/scripts/parity.service` to your
+1. Copy `./scripts/parity.service` to your
 systemd user directory (usually `~/.config/systemd/user`).
-2. To pass any argument to Parity, write a `~/.parity/parity.conf` file this way:
-`ARGS="ARG1 ARG2 ARG3"`.
-
-	Example: `ARGS="ui --identity MyMachine"`.
+2. To configure Parity, write a `/etc/parity/config.toml` config file, see [Configuring Parity](https://paritytech.github.io/wiki/Configuring-Parity) for details.
diff --git a/SECURITY.md b/SECURITY.md
index 8257cf733ab85624d6375d3af07688a859857948..3f977bd1b0a06fda3c9597085244b768e99df9a7 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,13 +1,49 @@
 # Security Policy
 
-For security inquiries or vulnerability reports, please send a message to security@parity.io.
+Parity Technologies is committed to resolving security vulnerabilities in our software quickly and carefully. We take the necessary steps to minimize risk, provide timely information, and deliver vulnerability fixes and mitigations required to address security issues.
 
-Please use a descriptive subject line so we can identify the report as such.
+## Reporting a Vulnerability
 
-If you send a report, we will respond to the e-mail within 48 hours, and provide regular updates from that time onwards.
+Security vulnerabilities in Parity software should be reported by email to security@parity.io. If you think your report might be eligible for the Parity Bug Bounty Program, your email should be send to bugbounty@parity.io. 
 
-If you would like to encrypt your report, please use the PGP key provided below.
-It is also reproduced [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73)
+Your report should include the following:
+
+- your name
+- description of the vulnerability
+- attack scenario (if any)
+- components
+- reproduction
+- other details
+
+Try to include as much information in your report as you can, including a description of the vulnerability, its potential impact, and steps for reproducing it. Be sure to use a descriptive subject line.
+
+You'll receive a response to your email within two business days indicating the next steps in handling your report. We encourage finders to use encrypted communication channels to protect the confidentiality of vulnerability reports. You can encrypt your report using our public key. This key is [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73) server and reproduced below.
+
+After the initial reply to your report, our team will endeavor to keep you informed of the progress being made towards a fix. These updates will be sent at least every five business days. 
+
+Thank you for taking the time to responsibly disclose any vulnerabilities you find.
+
+## Responsible Investigation and Reporting
+
+Responsible investigation and reporting includes, but isn't limited to, the following:
+
+- Don't violate the privacy of other users, destroy data, etc.
+- Don’t defraud or harm Parity Technologies Ltd or its users during your research; you should make a good faith effort to not interrupt or degrade our services.
+- Don't target our physical security measures, or attempt to use social engineering, spam, distributed denial of service (DDOS) attacks, etc.
+- Initially report the bug only to us and not to anyone else.
+- Give us a reasonable amount of time to fix the bug before disclosing it to anyone else, and give us adequate written warning before disclosing it to anyone else.
+- In general, please investigate and report bugs in a way that makes a reasonable, good faith effort not to be disruptive or harmful to us or our users. Otherwise your actions might be interpreted as an attack rather than an effort to be helpful.
+
+## Bug Bounty Program
+
+Our Bug Bounty Program allows us to recognise and reward members of the Parity community for helping us find and address significant bugs, in accordance with the terms of the Parity Bug Bounty Program. A detailed description on eligibility, rewards, legal information and terms & conditions for contributors can be found on [our website](https://paritytech.io/bug-bounty.html). 
+
+
+
+
+
+
+## Plaintext PGP Key
 
 ```
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -42,13 +78,3 @@ ETBD1Q==
 =K9Qw
 -----END PGP PUBLIC KEY BLOCK-----
 ```
-
-Important Legal Information:
-
-Your submission might be eligible for a bug bounty. The bug bounty program is an experimental and discretionary rewards program for the Parity community to reward those who are helping to improve the Parity software. Rewards are at the sole discretion of Parity Technologies Ltd.. 
-
-We are not able to issue rewards to individuals who are on sanctions lists or who are in countries on sanctions lists (e.g. North Korea, Iran, etc). 
-
-You are responsible for all taxes. All rewards are subject to applicable law. 
-
-Finally, your testing must not violate any law or compromise any data that is not yours.
diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml
index b1751c6161b54dd9323e41274aa0c1a7aec1c846..e5b25a203f9665c22c775a1a884fd4754a5cc130 100644
--- a/dapps/Cargo.toml
+++ b/dapps/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Parity Dapps crate"
 name = "parity-dapps"
-version = "1.8.0"
+version = "1.11.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
@@ -10,40 +10,39 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 base32 = "0.3"
 futures = "0.1"
-linked-hash-map = "0.3"
+futures-cpupool = "0.1"
+linked-hash-map = "0.5"
 log = "0.3"
-parity-dapps-glue = "1.7"
-mime = "0.2"
-mime_guess = "1.6.1"
-rand = "0.3"
+parity-dapps-glue = "1.9"
+parking_lot = "0.5"
+mime_guess = "2.0.0-alpha.2"
+rand = "0.4"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-time = "0.1.35"
-unicase = "1.3"
-url = "1.0"
+unicase = "1.4"
 zip = { version = "0.1", default-features = false }
 itertools = "0.5"
 
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 
-ethcore-util = { path = "../util" }
+ethcore-bytes = { path = "../util/bytes" }
+ethereum-types = "0.2"
 fetch = { path = "../util/fetch" }
 node-health = { path = "./node-health" }
 parity-hash-fetch = { path = "../hash-fetch" }
 parity-reactor = { path = "../util/reactor" }
 parity-ui = { path = "./ui" }
-
-clippy = { version = "0.0.103", optional = true}
+keccak-hash = { path = "../util/hash" }
+parity-version = { path = "../util/version" }
+registrar = { path = "../registrar" }
 
 [dev-dependencies]
 env_logger = "0.4"
 ethcore-devtools = { path = "../devtools" }
 
 [features]
-dev = ["clippy", "ethcore-util/dev"]
-
 ui = ["parity-ui/no-precompiled-js"]
 ui-precompiled = ["parity-ui/use-precompiled-js"]
diff --git a/dapps/js-glue/Cargo.toml b/dapps/js-glue/Cargo.toml
index 0f4c929681e42752ba59938bc3e96268a0f12ee5..efe92bbda6ae02357ce7bee0b1bfc2d6e8557b43 100644
--- a/dapps/js-glue/Cargo.toml
+++ b/dapps/js-glue/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Base Package for all Parity built-in dapps"
 name = "parity-dapps-glue"
-version = "1.7.0"
+version = "1.9.1"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
@@ -12,19 +12,16 @@ syntex = { version = "0.58", optional = true }
 
 [dependencies]
 glob = { version = "0.2.11" }
-mime_guess = { version = "1.6.1" }
+mime_guess = { version = "2.0.0-alpha.2" }
 aster = { version = "0.41", default-features = false }
 quasi = { version = "0.32", default-features = false }
 quasi_macros = { version = "0.32", optional = true }
 syntex = { version = "0.58", optional = true }
 syntex_syntax = { version = "0.58", optional = true }
-clippy = { version = "0.0.90", optional = true }
 
 [features]
-dev = ["clippy"]
 default = ["with-syntex"]
 nightly = ["quasi_macros"]
-nightly-testing = ["clippy"]
 with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
 use-precompiled-js = []
 
diff --git a/dapps/js-glue/src/codegen.rs b/dapps/js-glue/src/codegen.rs
index 3d8c934600267ab4d66b3d4983acc2d516577578..c6e948820fce03ed2baabc734ddbe0bf94a7b7bf 100644
--- a/dapps/js-glue/src/codegen.rs
+++ b/dapps/js-glue/src/codegen.rs
@@ -101,6 +101,7 @@ fn implement_webapp(cx: &ExtCtxt, builder: &aster::AstBuilder, item: &Item, push
 
 	let files_impl = quote_item!(cx,
 		impl $type_name {
+			#[allow(unused_mut)]
 			fn files() -> ::std::collections::HashMap<&'static str, File> {
 				let mut files = ::std::collections::HashMap::new();
 				$statements
diff --git a/dapps/js-glue/src/js.rs b/dapps/js-glue/src/js.rs
index 49ccdd26fe3c05a441d3ada657c21d662ecce352..d1d1cdda9139dc3a8307a42904ecd8185fd3b6b0 100644
--- a/dapps/js-glue/src/js.rs
+++ b/dapps/js-glue/src/js.rs
@@ -25,7 +25,7 @@ mod platform {
 	use std::process::Command;
 
 	pub static NPM_CMD: &'static str = "npm";
-	pub fn handle_fd(cmd: &mut Command) -> &mut Command {
+	pub fn handle_cmd(cmd: &mut Command) -> &mut Command {
 		cmd
 	}
 }
@@ -34,14 +34,14 @@ mod platform {
 mod platform {
 	use std::process::{Command, Stdio};
 
-	pub static NPM_CMD: &'static str = "npm.cmd";
+	pub static NPM_CMD: &'static str = "cmd.exe";
 	// NOTE [ToDr] For some reason on windows
-	// We cannot have any file descriptors open when running a child process
-	// during build phase.
-	pub fn handle_fd(cmd: &mut Command) -> &mut Command {
+	// The command doesn't have %~dp0 set properly
+	// and it cannot load globally installed node.exe
+	pub fn handle_cmd(cmd: &mut Command) -> &mut Command {
 		cmd.stdin(Stdio::null())
-			.stdout(Stdio::null())
-			.stderr(Stdio::null())
+			.arg("/c")
+			.arg("npm.cmd")
 	}
 }
 
@@ -58,7 +58,7 @@ pub fn build(_path: &str, _dest: &str) {
 
 #[cfg(not(feature = "use-precompiled-js"))]
 pub fn build(path: &str, dest: &str) {
-	let child = platform::handle_fd(&mut Command::new(platform::NPM_CMD))
+	let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
 		.arg("install")
 		.arg("--no-progress")
 		.current_dir(path)
@@ -66,7 +66,7 @@ pub fn build(path: &str, dest: &str) {
 		.unwrap_or_else(|e| die("Installing node.js dependencies with npm", e));
 	assert!(child.success(), "There was an error installing dependencies.");
 
-	let child = platform::handle_fd(&mut Command::new(platform::NPM_CMD))
+	let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
 		.arg("run")
 		.arg("build")
 		.env("NODE_ENV", "production")
diff --git a/dapps/node-health/Cargo.toml b/dapps/node-health/Cargo.toml
index ff13e859328ca4b2ee92dd388c1a4297fe222db8..5688c8f76a106d9e19cc6159395d940e98289331 100644
--- a/dapps/node-health/Cargo.toml
+++ b/dapps/node-health/Cargo.toml
@@ -9,8 +9,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 futures = "0.1"
 futures-cpupool = "0.1"
 log = "0.3"
-ntp = "0.2.0"
-parking_lot = "0.4"
+ntp = "0.3.0"
+parking_lot = "0.5"
 serde = "1.0"
 serde_derive = "1.0"
 time = "0.1.35"
diff --git a/dapps/node-health/src/health.rs b/dapps/node-health/src/health.rs
index 3b3563d6bdc67024bff1d4b752d5f8b3cc02ea72..ec53d2e29441e6c01c6742c90b543bae701bcc72 100644
--- a/dapps/node-health/src/health.rs
+++ b/dapps/node-health/src/health.rs
@@ -18,7 +18,7 @@
 
 use std::sync::Arc;
 use std::time;
-use futures::{Future, BoxFuture};
+use futures::Future;
 use futures::sync::oneshot;
 use types::{HealthInfo, HealthStatus, Health};
 use time::{TimeChecker, MAX_DRIFT};
@@ -44,7 +44,7 @@ impl NodeHealth {
 	}
 
 	/// Query latest health report.
-	pub fn health(&self) -> BoxFuture<Health, ()> {
+	pub fn health(&self) -> Box<Future<Item = Health, Error = ()> + Send> {
 		trace!(target: "dapps", "Checking node health.");
 		// Check timediff
 		let sync_status = self.sync_status.clone();
@@ -63,7 +63,7 @@ impl NodeHealth {
 			},
 		);
 
-		rx.map_err(|err| {
+		Box::new(rx.map_err(|err| {
 			warn!(target: "dapps", "Health request cancelled: {:?}", err);
 		}).and_then(move |time| {
 			// Check peers
@@ -117,6 +117,6 @@ impl NodeHealth {
 			};
 
 			Ok(Health { peers, sync, time})
-		}).boxed()
+		}))
 	}
 }
diff --git a/dapps/node-health/src/time.rs b/dapps/node-health/src/time.rs
index 05c48ce4745901c0bc6c550782e624620a8f13c7..c3da050a47fddc63d4403ed1a03c4e1957933d62 100644
--- a/dapps/node-health/src/time.rs
+++ b/dapps/node-health/src/time.rs
@@ -37,7 +37,7 @@ use std::collections::VecDeque;
 use std::sync::atomic::{self, AtomicUsize};
 use std::sync::Arc;
 
-use futures::{self, Future, BoxFuture};
+use futures::{self, Future};
 use futures::future::{self, IntoFuture};
 use futures_cpupool::{CpuPool, CpuFuture};
 use ntp;
@@ -193,7 +193,9 @@ const UPDATE_TIMEOUT_ERR_SECS: u64 = 60;
 const UPDATE_TIMEOUT_INCOMPLETE_SECS: u64 = 10;
 
 /// Maximal valid time drift.
-pub const MAX_DRIFT: i64 = 500;
+pub const MAX_DRIFT: i64 = 10_000;
+
+type BoxFuture<A, B> = Box<Future<Item = A, Error = B> + Send>;
 
 #[derive(Debug, Clone)]
 /// A time checker.
@@ -224,7 +226,7 @@ impl<N: Ntp> TimeChecker<N> where <N::Future as IntoFuture>::Future: Send + 'sta
 	pub fn update(&self) -> BoxFuture<i64, Error> {
 		trace!(target: "dapps", "Updating time from NTP.");
 		let last_result = self.last_result.clone();
-		self.ntp.drift().into_future().then(move |res| {
+		Box::new(self.ntp.drift().into_future().then(move |res| {
 			let res = res.map(|d| d.num_milliseconds());
 
 			if let Err(Error::NoServersAvailable) = res {
@@ -255,7 +257,7 @@ impl<N: Ntp> TimeChecker<N> where <N::Future as IntoFuture>::Future: Send + 'sta
 			let res = select_result(results.iter());
 			*last_result.write() = (valid_till, results);
 			res
-		}).boxed()
+		}))
 	}
 
 	/// Returns a current time drift or error if last request to NTP server failed.
@@ -264,7 +266,7 @@ impl<N: Ntp> TimeChecker<N> where <N::Future as IntoFuture>::Future: Send + 'sta
 		{
 			let res = self.last_result.read();
 			if res.0 > time::Instant::now() {
-				return futures::done(select_result(res.1.iter())).boxed();
+				return Box::new(futures::done(select_result(res.1.iter())));
 			}
 		}
 		// or update and return result
diff --git a/dapps/src/api/api.rs b/dapps/src/api/api.rs
index 03ba859f8d32685f3794165ee7744e9b0476bb78..a9f9af293b0e0acad5780706214a15556f3ae3af 100644
--- a/dapps/src/api/api.rs
+++ b/dapps/src/api/api.rs
@@ -16,144 +16,82 @@
 
 use std::sync::Arc;
 
-use hyper::{server, net, Decoder, Encoder, Next, Control};
-use hyper::method::Method;
-use hyper::status::StatusCode;
+use hyper::{Method, StatusCode};
 
-use api::{response, types};
+use api::response;
 use apps::fetcher::Fetcher;
-use handlers::{self, extract_url};
-use endpoint::{Endpoint, Handler, EndpointPath};
-use node_health::{NodeHealth, HealthStatus, Health};
-use parity_reactor::Remote;
+use endpoint::{Endpoint, Request, Response, EndpointPath};
+use futures::{future, Future};
+use node_health::{NodeHealth, HealthStatus};
 
 #[derive(Clone)]
 pub struct RestApi {
 	fetcher: Arc<Fetcher>,
 	health: NodeHealth,
-	remote: Remote,
+}
+
+impl Endpoint for RestApi {
+	fn respond(&self, mut path: EndpointPath, req: Request) -> Response {
+		if let Method::Options = *req.method() {
+			return Box::new(future::ok(response::empty()));
+		}
+
+		let endpoint = path.app_params.get(0).map(String::to_owned);
+		let hash = path.app_params.get(1).map(String::to_owned);
+
+		// at this point path.app_id contains 'api', adjust it to the hash properly, otherwise
+		// we will try and retrieve 'api' as the hash when doing the /api/content route
+		if let Some(ref hash) = hash {
+			path.app_id = hash.to_owned();
+		}
+
+		trace!(target: "dapps", "Handling /api request: {:?}/{:?}", endpoint, hash);
+		match endpoint.as_ref().map(String::as_str) {
+			Some("ping") => Box::new(future::ok(response::ping(req))),
+			Some("health") => self.health(),
+			Some("content") => self.resolve_content(hash.as_ref().map(String::as_str), path, req),
+			_ => Box::new(future::ok(response::not_found())),
+		}
+	}
 }
 
 impl RestApi {
 	pub fn new(
 		fetcher: Arc<Fetcher>,
 		health: NodeHealth,
-		remote: Remote,
 	) -> Box<Endpoint> {
 		Box::new(RestApi {
 			fetcher,
 			health,
-			remote,
 		})
 	}
-}
-
-impl Endpoint for RestApi {
-	fn to_async_handler(&self, path: EndpointPath, control: Control) -> Box<Handler> {
-		Box::new(RestApiRouter::new((*self).clone(), path, control))
-	}
-}
-
-struct RestApiRouter {
-	api: RestApi,
-	path: Option<EndpointPath>,
-	control: Option<Control>,
-	handler: Box<Handler>,
-}
-
-impl RestApiRouter {
-	fn new(api: RestApi, path: EndpointPath, control: Control) -> Self {
-		RestApiRouter {
-			path: Some(path),
-			control: Some(control),
-			api: api,
-			handler: Box::new(response::as_json_error(StatusCode::NotFound, &types::ApiError {
-				code: "404".into(),
-				title: "Not Found".into(),
-				detail: "Resource you requested has not been found.".into(),
-			})),
-		}
-	}
 
-	fn resolve_content(&self, hash: Option<&str>, path: EndpointPath, control: Control) -> Option<Box<Handler>> {
+	fn resolve_content(&self, hash: Option<&str>, path: EndpointPath, req: Request) -> Response {
 		trace!(target: "dapps", "Resolving content: {:?} from path: {:?}", hash, path);
 		match hash {
-			Some(hash) if self.api.fetcher.contains(hash) => {
-				Some(self.api.fetcher.to_async_handler(path, control))
+			Some(hash) if self.fetcher.contains(hash) => {
+				self.fetcher.respond(path, req)
 			},
-			_ => None
+			_ => Box::new(future::ok(response::not_found())),
 		}
 	}
 
-	fn health(&self, control: Control) -> Box<Handler> {
-		let map = move |health: Result<Result<Health, ()>, ()>| {
-			let status = match health {
-				Ok(Ok(ref health)) => {
-					if [&health.peers.status, &health.sync.status].iter().any(|x| *x != &HealthStatus::Ok) {
-						StatusCode::PreconditionFailed // HTTP 412
-					} else {
-						StatusCode::Ok // HTTP 200
-					}
-				},
-				_ => StatusCode::ServiceUnavailable, // HTTP 503
-			};
-
-			response::as_json(status, &health)
-		};
-		let health = self.api.health.health();
-		let remote = self.api.remote.clone();
-		Box::new(handlers::AsyncHandler::new(health, map, remote, control))
-	}
-}
-
-impl server::Handler<net::HttpStream> for RestApiRouter {
-	fn on_request(&mut self, request: server::Request<net::HttpStream>) -> Next {
-		if let Method::Options = *request.method() {
-			self.handler = response::empty();
-			return Next::write();
-		}
-
-		// TODO [ToDr] Consider using `path.app_params` instead
-		let url = extract_url(&request);
-		if url.is_none() {
-			// Just return 404 if we can't parse URL
-			return Next::write();
-		}
-
-		let url = url.expect("Check for None early-exists above; qed");
-		let mut path = self.path.take().expect("on_request called only once, and path is always defined in new; qed");
-		let control = self.control.take().expect("on_request called only once, and control is always defined in new; qed");
-
-		let endpoint = url.path.get(1).map(|v| v.as_str());
-		let hash = url.path.get(2).map(|v| v.as_str());
-		// at this point path.app_id contains 'api', adjust it to the hash properly, otherwise
-		// we will try and retrieve 'api' as the hash when doing the /api/content route
-		if let Some(ref hash) = hash { path.app_id = hash.clone().to_owned() }
-
-		let handler = endpoint.and_then(|v| match v {
-			"ping" => Some(response::ping()),
-			"health" => Some(self.health(control)),
-			"content" => self.resolve_content(hash, path, control),
-			_ => None
-		});
-
-		// Overwrite default
-		if let Some(h) = handler {
-			self.handler = h;
-		}
-
-		self.handler.on_request(request)
-	}
-
-	fn on_request_readable(&mut self, decoder: &mut Decoder<net::HttpStream>) -> Next {
-		self.handler.on_request_readable(decoder)
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		self.handler.on_response(res)
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<net::HttpStream>) -> Next {
-		self.handler.on_response_writable(encoder)
+	fn health(&self) -> Response {
+		Box::new(self.health.health()
+			.then(|health| {
+				let status = match health {
+					Ok(ref health) => {
+						if [&health.peers.status, &health.sync.status].iter().any(|x| *x != &HealthStatus::Ok) {
+							StatusCode::PreconditionFailed // HTTP 412
+						} else {
+							StatusCode::Ok // HTTP 200
+						}
+					},
+					_ => StatusCode::ServiceUnavailable, // HTTP 503
+				};
+
+				Ok(response::as_json(status, &health).into())
+			})
+		)
 	}
 }
diff --git a/dapps/src/api/response.rs b/dapps/src/api/response.rs
index 6ecc2df6033c0c0f52ca018fe19a3038c593372a..c8d25c14450060896a2224f9cd0351d4b7b03fa7 100644
--- a/dapps/src/api/response.rs
+++ b/dapps/src/api/response.rs
@@ -16,27 +16,28 @@
 
 use serde::Serialize;
 use serde_json;
-use hyper::status::StatusCode;
+use hyper::{self, mime, StatusCode};
 
-use endpoint::Handler;
 use handlers::{ContentHandler, EchoHandler};
 
-pub fn empty() -> Box<Handler> {
-	Box::new(ContentHandler::ok("".into(), mime!(Text/Plain)))
+pub fn empty() -> hyper::Response {
+	ContentHandler::ok("".into(), mime::TEXT_PLAIN).into()
 }
 
-pub fn as_json<T: Serialize>(status: StatusCode, val: &T) -> ContentHandler {
+pub fn as_json<T: Serialize>(status: StatusCode, val: &T) -> hyper::Response {
 	let json = serde_json::to_string(val)
 		.expect("serialization to string is infallible; qed");
-	ContentHandler::new(status, json, mime!(Application/Json))
+	ContentHandler::new(status, json, mime::APPLICATION_JSON).into()
 }
 
-pub fn as_json_error<T: Serialize>(status: StatusCode, val: &T) -> ContentHandler {
-	let json = serde_json::to_string(val)
-		.expect("serialization to string is infallible; qed");
-	ContentHandler::new(status, json, mime!(Application/Json))
+pub fn ping(req: hyper::Request) -> hyper::Response {
+	EchoHandler::new(req).into()
 }
 
-pub fn ping() -> Box<Handler> {
-	Box::new(EchoHandler::default())
+pub fn not_found() -> hyper::Response {
+	as_json(StatusCode::NotFound, &::api::types::ApiError {
+		code: "404".into(),
+		title: "Not Found".into(),
+		detail: "Resource you requested has not been found.".into(),
+	})
 }
diff --git a/dapps/src/apps/app.rs b/dapps/src/apps/app.rs
index 1d2c9dca6a9cf57c62dd17fb68998b36a05830c6..c75346124c72bbe10bd518cc4905ffe8c187c57b 100644
--- a/dapps/src/apps/app.rs
+++ b/dapps/src/apps/app.rs
@@ -14,42 +14,26 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use endpoint::EndpointInfo;
-
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct App {
-	pub id: String,
+	pub id: Option<String>,
 	pub name: String,
 	pub description: String,
 	pub version: String,
 	pub author: String,
 	#[serde(rename="iconUrl")]
 	pub icon_url: String,
+	#[serde(rename="localUrl")]
+	pub local_url: Option<String>,
+	#[serde(rename="allowJsEval")]
+	pub allow_js_eval: Option<bool>,
 }
 
 impl App {
-	/// Creates `App` instance from `EndpointInfo` and `id`.
-	pub fn from_info(id: &str, info: &EndpointInfo) -> Self {
-		App {
-			id: id.to_owned(),
-			name: info.name.to_owned(),
-			description: info.description.to_owned(),
-			version: info.version.to_owned(),
-			author: info.author.to_owned(),
-			icon_url: info.icon_url.to_owned(),
-		}
-	}
-}
-
-impl Into<EndpointInfo> for App {
-	fn into(self) -> EndpointInfo {
-		EndpointInfo {
-			name: self.name,
-			description: self.description,
-			version: self.version,
-			author: self.author,
-			icon_url: self.icon_url,
-		}
+	pub fn with_id(&self, id: &str) -> Self {
+		let mut app = self.clone();
+		app.id = Some(id.into());
+		app
 	}
 }
diff --git a/dapps/src/apps/cache.rs b/dapps/src/apps/cache.rs
index 5bc01da8e5894365d2a1d271cbc0ab37be8ac654..c81d4d9af9daf70ec956fe9d134cb66b1181699c 100644
--- a/dapps/src/apps/cache.rs
+++ b/dapps/src/apps/cache.rs
@@ -19,12 +19,12 @@
 use std::fs;
 
 use linked_hash_map::LinkedHashMap;
-use page::LocalPageEndpoint;
+use page::local;
 use handlers::FetchControl;
 
 pub enum ContentStatus {
 	Fetching(FetchControl),
-	Ready(LocalPageEndpoint),
+	Ready(local::Dapp),
 }
 
 #[derive(Default)]
diff --git a/dapps/src/apps/fetcher/installers.rs b/dapps/src/apps/fetcher/installers.rs
index 82c91c859b3d8e4f4a09258dfab3cf274099972c..2c067d493c9d68790c23918862b2f344eb45c423 100644
--- a/dapps/src/apps/fetcher/installers.rs
+++ b/dapps/src/apps/fetcher/installers.rs
@@ -18,16 +18,18 @@ use zip;
 use std::{fs, fmt};
 use std::io::{self, Read, Write};
 use std::path::PathBuf;
-use fetch::{self, Mime};
-use util::H256;
+use ethereum_types::H256;
+use fetch;
+use futures_cpupool::CpuPool;
+use hash::keccak_buffer;
+use mime_guess::Mime;
 
-use util::sha3::sha3;
-use page::{LocalPageEndpoint, PageCache};
-use handlers::{ContentValidator, ValidatorResponse};
 use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest, serialize_manifest, Manifest};
+use handlers::{ContentValidator, ValidatorResponse};
+use page::{local, PageCache};
 use Embeddable;
 
-type OnDone = Box<Fn(Option<LocalPageEndpoint>) + Send>;
+type OnDone = Box<Fn(Option<local::Dapp>) + Send>;
 
 fn write_response_and_check_hash(
 	id: &str,
@@ -52,14 +54,14 @@ fn write_response_and_check_hash(
 
 	// Now write the response
 	let mut file = io::BufWriter::new(fs::File::create(&content_path)?);
-	let mut reader = io::BufReader::new(response);
+	let mut reader = io::BufReader::new(fetch::BodyReader::new(response));
 	io::copy(&mut reader, &mut file)?;
 	file.flush()?;
 
 	// Validate hash
-	// TODO [ToDr] calculate sha3 in-flight while reading the response
+	// TODO [ToDr] calculate keccak in-flight while reading the response
 	let mut file = io::BufReader::new(fs::File::open(&content_path)?);
-	let hash = sha3(&mut file)?;
+	let hash = keccak_buffer(&mut file)?;
 	if id == hash {
 		Ok((file.into_inner(), content_path))
 	} else {
@@ -75,15 +77,17 @@ pub struct Content {
 	mime: Mime,
 	content_path: PathBuf,
 	on_done: OnDone,
+	pool: CpuPool,
 }
 
 impl Content {
-	pub fn new(id: String, mime: Mime, content_path: PathBuf, on_done: OnDone) -> Self {
+	pub fn new(id: String, mime: Mime, content_path: PathBuf, on_done: OnDone, pool: CpuPool) -> Self {
 		Content {
-			id: id,
-			mime: mime,
-			content_path: content_path,
-			on_done: on_done,
+			id,
+			mime,
+			content_path,
+			on_done,
+			pool,
 		}
 	}
 }
@@ -91,12 +95,15 @@ impl Content {
 impl ContentValidator for Content {
 	type Error = ValidationError;
 
-	fn validate_and_install(&self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
-		let validate = |content_path: PathBuf| {
+	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
+		let pool = self.pool;
+		let id = self.id.clone();
+		let mime = self.mime;
+		let validate = move |content_path: PathBuf| {
 			// Create dir
-			let (_, content_path) = write_response_and_check_hash(self.id.as_str(), content_path.clone(), self.id.as_str(), response)?;
+			let (_, content_path) = write_response_and_check_hash(&id, content_path, &id, response)?;
 
-			Ok(LocalPageEndpoint::single_file(content_path, self.mime.clone(), PageCache::Enabled))
+			Ok(local::Dapp::single_file(pool, content_path, mime, PageCache::Enabled))
 		};
 
 		// Prepare path for a file
@@ -118,15 +125,17 @@ pub struct Dapp {
 	dapps_path: PathBuf,
 	on_done: OnDone,
 	embeddable_on: Embeddable,
+	pool: CpuPool,
 }
 
 impl Dapp {
-	pub fn new(id: String, dapps_path: PathBuf, on_done: OnDone, embeddable_on: Embeddable) -> Self {
+	pub fn new(id: String, dapps_path: PathBuf, on_done: OnDone, embeddable_on: Embeddable, pool: CpuPool) -> Self {
 		Dapp {
 			id,
 			dapps_path,
 			on_done,
 			embeddable_on,
+			pool,
 		}
 	}
 
@@ -158,16 +167,19 @@ impl Dapp {
 impl ContentValidator for Dapp {
 	type Error = ValidationError;
 
-	fn validate_and_install(&self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
-		let validate = |dapp_path: PathBuf| {
-			let (file, zip_path) = write_response_and_check_hash(self.id.as_str(), dapp_path.clone(), &format!("{}.zip", self.id), response)?;
+	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
+		let id = self.id.clone();
+		let pool = self.pool;
+		let embeddable_on = self.embeddable_on;
+		let validate = move |dapp_path: PathBuf| {
+			let (file, zip_path) = write_response_and_check_hash(&id, dapp_path.clone(), &format!("{}.zip", id), response)?;
 			trace!(target: "dapps", "Opening dapp bundle at {:?}", zip_path);
 			// Unpack archive
 			let mut zip = zip::ZipArchive::new(file)?;
 			// First find manifest file
 			let (mut manifest, manifest_dir) = Self::find_manifest(&mut zip)?;
 			// Overwrite id to match hash
-			manifest.id = self.id.clone();
+			manifest.id = Some(id);
 
 			// Unpack zip
 			for i in 0..zip.len() {
@@ -198,7 +210,7 @@ impl ContentValidator for Dapp {
 			let mut manifest_file = fs::File::create(manifest_path)?;
 			manifest_file.write_all(manifest_str.as_bytes())?;
 			// Create endpoint
-			let endpoint = LocalPageEndpoint::new(dapp_path, manifest.clone().into(), PageCache::Enabled, self.embeddable_on.clone());
+			let endpoint = local::Dapp::new(pool, dapp_path, manifest.into(), PageCache::Enabled, embeddable_on);
 			Ok(endpoint)
 		};
 
diff --git a/dapps/src/apps/fetcher/mod.rs b/dapps/src/apps/fetcher/mod.rs
index 5b91da1a32d34449d27aa62ae8a6f0cf291a21c9..8ed3024fdf2a1c0b7dffb2972c1de1d32194f86c 100644
--- a/dapps/src/apps/fetcher/mod.rs
+++ b/dapps/src/apps/fetcher/mod.rs
@@ -23,28 +23,26 @@ mod installers;
 use std::{fs, env};
 use std::path::PathBuf;
 use std::sync::Arc;
-use rustc_hex::FromHex;
+use futures::{future, Future};
+use futures_cpupool::CpuPool;
 use fetch::{Client as FetchClient, Fetch};
 use hash_fetch::urlhint::{URLHintContract, URLHint, URLHintResult};
-use parity_reactor::Remote;
 
-use hyper;
-use hyper::status::StatusCode;
+use hyper::StatusCode;
 
+use ethereum_types::H256;
 use {Embeddable, SyncStatus, random_filename};
-use util::Mutex;
-use page::LocalPageEndpoint;
+use parking_lot::Mutex;
+use page::local;
 use handlers::{ContentHandler, ContentFetcherHandler};
-use endpoint::{Endpoint, EndpointPath, Handler};
+use endpoint::{self, Endpoint, EndpointPath};
 use apps::cache::{ContentCache, ContentStatus};
 
 /// Limit of cached dapps/content
 const MAX_CACHED_DAPPS: usize = 20;
 
-pub trait Fetcher: Send + Sync + 'static {
+pub trait Fetcher: Endpoint + 'static {
 	fn contains(&self, content_id: &str) -> bool;
-
-	fn to_async_handler(&self, path: EndpointPath, control: hyper::Control) -> Box<Handler>;
 }
 
 pub struct ContentFetcher<F: Fetch = FetchClient, R: URLHint + 'static = URLHintContract> {
@@ -53,8 +51,8 @@ pub struct ContentFetcher<F: Fetch = FetchClient, R: URLHint + 'static = URLHint
 	cache: Arc<Mutex<ContentCache>>,
 	sync: Arc<SyncStatus>,
 	embeddable_on: Embeddable,
-	remote: Remote,
 	fetch: F,
+	pool: CpuPool,
 	only_content: bool,
 }
 
@@ -66,24 +64,23 @@ impl<R: URLHint + 'static, F: Fetch> Drop for ContentFetcher<F, R> {
 }
 
 impl<R: URLHint + 'static, F: Fetch> ContentFetcher<F, R> {
-
 	pub fn new(
 		resolver: R,
-		sync_status: Arc<SyncStatus>,
-		remote: Remote,
+		sync: Arc<SyncStatus>,
 		fetch: F,
+		pool: CpuPool,
 	) -> Self {
 		let mut cache_path = env::temp_dir();
 		cache_path.push(random_filename());
 
 		ContentFetcher {
-			cache_path: cache_path,
-			resolver: resolver,
-			sync: sync_status,
+			cache_path,
+			resolver,
+			sync,
 			cache: Arc::new(Mutex::new(ContentCache::default())),
 			embeddable_on: None,
-			remote: remote,
-			fetch: fetch,
+			fetch,
+			pool,
 			only_content: true,
 		}
 	}
@@ -98,24 +95,34 @@ impl<R: URLHint + 'static, F: Fetch> ContentFetcher<F, R> {
 		self
 	}
 
-	fn still_syncing(embeddable: Embeddable) -> Box<Handler> {
-		Box::new(ContentHandler::error(
+	fn not_found(embeddable: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
+			StatusCode::NotFound,
+			"Resource Not Found",
+			"Requested resource was not found.",
+			None,
+			embeddable,
+		).into()))
+	}
+
+	fn still_syncing(embeddable: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
 			StatusCode::ServiceUnavailable,
 			"Sync In Progress",
 			"Your node is still syncing. We cannot resolve any content before it's fully synced.",
 			Some("<a href=\"javascript:window.location.reload()\">Refresh</a>"),
 			embeddable,
-		))
+		).into()))
 	}
 
-	fn dapps_disabled(address: Embeddable) -> Box<Handler> {
-		Box::new(ContentHandler::error(
+	fn dapps_disabled(address: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
 			StatusCode::ServiceUnavailable,
 			"Network Dapps Not Available",
 			"This interface doesn't support network dapps for security reasons.",
 			None,
 			address,
-		))
+		).into()))
 	}
 
 	#[cfg(test)]
@@ -125,9 +132,7 @@ impl<R: URLHint + 'static, F: Fetch> ContentFetcher<F, R> {
 
 	// resolve contract call synchronously.
 	// TODO: port to futures-based hyper and make it all async.
-	fn resolve(&self, content_id: Vec<u8>) -> Option<URLHintResult> {
-		use futures::Future;
-
+	fn resolve(&self, content_id: H256) -> Option<URLHintResult> {
 		self.resolver.resolve(content_id)
 			.wait()
 			.unwrap_or_else(|e| { warn!("Error resolving content-id: {}", e); None })
@@ -144,15 +149,17 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 			}
 		}
 		// fallback to resolver
-		if let Ok(content_id) = content_id.from_hex() {
+		if let Ok(content_id) = content_id.parse() {
 			// if there is content or we are syncing return true
 			self.sync.is_major_importing() || self.resolve(content_id).is_some()
 		} else {
 			false
 		}
 	}
+}
 
-	fn to_async_handler(&self, path: EndpointPath, control: hyper::Control) -> Box<Handler> {
+impl<R: URLHint + 'static, F: Fetch> Endpoint for ContentFetcher<F, R> {
+	fn respond(&self, path: EndpointPath, req: endpoint::Request) -> endpoint::Response {
 		let mut cache = self.cache.lock();
 		let content_id = path.app_id.clone();
 
@@ -161,22 +168,22 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 			match status {
 				// Just serve the content
 				Some(&mut ContentStatus::Ready(ref endpoint)) => {
-					(None, endpoint.to_async_handler(path, control))
+					(None, endpoint.to_response(&path))
 				},
 				// Content is already being fetched
 				Some(&mut ContentStatus::Fetching(ref fetch_control)) if !fetch_control.is_deadline_reached() => {
 					trace!(target: "dapps", "Content fetching in progress. Waiting...");
-					(None, fetch_control.to_async_handler(path, control))
+					(None, fetch_control.to_response(path))
 				},
 				// We need to start fetching the content
 				_ => {
 					trace!(target: "dapps", "Content unavailable. Fetching... {:?}", content_id);
-					let content_hex = content_id.from_hex().expect("to_handler is called only when `contains` returns true.");
+					let content_hex = content_id.parse().expect("to_handler is called only when `contains` returns true.");
 					let content = self.resolve(content_hex);
 
 					let cache = self.cache.clone();
 					let id = content_id.clone();
-					let on_done = move |result: Option<LocalPageEndpoint>| {
+					let on_done = move |result: Option<local::Dapp>| {
 						let mut cache = cache.lock();
 						match result {
 							Some(endpoint) => cache.insert(id.clone(), ContentStatus::Ready(endpoint)),
@@ -193,41 +200,62 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 						Some(URLHintResult::Dapp(_)) if self.only_content => {
 							(None, Self::dapps_disabled(self.embeddable_on.clone()))
 						},
-						Some(URLHintResult::Dapp(dapp)) => {
-							let handler = ContentFetcherHandler::new(
-								dapp.url(),
-								path,
-								control,
-								installers::Dapp::new(
-									content_id.clone(),
-									self.cache_path.clone(),
-									Box::new(on_done),
-									self.embeddable_on.clone(),
-								),
-								self.embeddable_on.clone(),
-								self.remote.clone(),
-								self.fetch.clone(),
-							);
-
-							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as Box<Handler>)
-						},
-						Some(URLHintResult::Content(content)) => {
-							let handler = ContentFetcherHandler::new(
-								content.url,
-								path,
-								control,
-								installers::Content::new(
-									content_id.clone(),
-									content.mime,
-									self.cache_path.clone(),
-									Box::new(on_done),
-								),
-								self.embeddable_on.clone(),
-								self.remote.clone(),
-								self.fetch.clone(),
-							);
-
-							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as Box<Handler>)
+						Some(content) => {
+							let handler = match content {
+								URLHintResult::Dapp(dapp) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&dapp.url(),
+										path,
+										installers::Dapp::new(
+											content_id.clone(),
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.embeddable_on.clone(),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+										self.pool.clone(),
+									)
+								},
+							    URLHintResult::GithubDapp(content) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&content.url,
+										path,
+										installers::Dapp::new(
+											content_id.clone(),
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.embeddable_on.clone(),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+										self.pool.clone(),
+									)
+							    },
+								URLHintResult::Content(content) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&content.url,
+										path,
+										installers::Content::new(
+											content_id.clone(),
+											content.mime,
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+										self.pool.clone(),
+									)
+								},
+							};
+
+							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as endpoint::Response)
 						},
 						None if self.sync.is_major_importing() => {
 							(None, Self::still_syncing(self.embeddable_on.clone()))
@@ -235,13 +263,7 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 						None => {
 							// This may happen when sync status changes in between
 							// `contains` and `to_handler`
-							(None, Box::new(ContentHandler::error(
-								StatusCode::NotFound,
-								"Resource Not Found",
-								"Requested resource was not found.",
-								None,
-								self.embeddable_on.clone(),
-							)) as Box<Handler>)
+							(None, Self::not_found(self.embeddable_on.clone()))
 						},
 					}
 				},
@@ -261,23 +283,22 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 mod tests {
 	use std::env;
 	use std::sync::Arc;
-	use util::Bytes;
-	use fetch::{Fetch, Client};
-	use futures::{future, Future, BoxFuture};
+	use fetch::Client;
+	use futures::{future, Future};
 	use hash_fetch::urlhint::{URLHint, URLHintResult};
-	use parity_reactor::Remote;
+	use ethereum_types::H256;
 
 	use apps::cache::ContentStatus;
 	use endpoint::EndpointInfo;
-	use page::LocalPageEndpoint;
+	use page::local;
 	use super::{ContentFetcher, Fetcher};
 	use {SyncStatus};
 
 	#[derive(Clone)]
 	struct FakeResolver;
 	impl URLHint for FakeResolver {
-		fn resolve(&self, _id: Bytes) -> BoxFuture<Option<URLHintResult>, String> {
-			future::ok(None).boxed()
+		fn resolve(&self, _id: H256) -> Box<Future<Item = Option<URLHintResult>, Error = String> + Send> {
+			Box::new(future::ok(None))
 		}
 	}
 
@@ -291,15 +312,24 @@ mod tests {
 	#[test]
 	fn should_true_if_contains_the_app() {
 		// given
+		let pool = ::futures_cpupool::CpuPool::new(1);
 		let path = env::temp_dir();
-		let fetcher = ContentFetcher::new(FakeResolver, Arc::new(FakeSync(false)), Remote::new_sync(), Client::new().unwrap())
-			.allow_dapps(true);
-		let handler = LocalPageEndpoint::new(path, EndpointInfo {
+		let fetcher = ContentFetcher::new(
+			FakeResolver,
+			Arc::new(FakeSync(false)),
+			Client::new().unwrap(),
+			pool.clone(),
+		).allow_dapps(true);
+
+		let handler = local::Dapp::new(pool, path, EndpointInfo {
+			id: None,
 			name: "fake".into(),
 			description: "".into(),
 			version: "".into(),
 			author: "".into(),
 			icon_url: "".into(),
+			local_url: Some("".into()),
+			allow_js_eval: None,
 		}, Default::default(), None);
 
 		// when
diff --git a/dapps/src/apps/fs.rs b/dapps/src/apps/fs.rs
index eb9f65130c2b91480de096e6d2d3fc99fecc374e..3d93a2fae1a372221d3520bcfa82d16c158deafa 100644
--- a/dapps/src/apps/fs.rs
+++ b/dapps/src/apps/fs.rs
@@ -19,9 +19,11 @@ use std::io;
 use std::io::Read;
 use std::fs;
 use std::path::{Path, PathBuf};
-use page::{LocalPageEndpoint, PageCache};
-use endpoint::{Endpoint, EndpointInfo};
+use futures_cpupool::CpuPool;
+
 use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest};
+use endpoint::{Endpoint, EndpointInfo};
+use page::{local, PageCache};
 use Embeddable;
 
 struct LocalDapp {
@@ -44,16 +46,18 @@ fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo {
 			// Try to deserialize manifest
 			deserialize_manifest(s)
 		})
-		.map(Into::into)
 		.unwrap_or_else(|e| {
 			warn!(target: "dapps", "Cannot read manifest file at: {:?}. Error: {:?}", path, e);
 
 			EndpointInfo {
+				id: None,
 				name: name.into(),
 				description: name.into(),
 				version: "0.0.0".into(),
 				author: "?".into(),
 				icon_url: "icon.png".into(),
+				local_url: None,
+				allow_js_eval: Some(false),
 			}
 		})
 }
@@ -61,14 +65,14 @@ fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo {
 /// Returns Dapp Id and Local Dapp Endpoint for given filesystem path.
 /// Parses the path to extract last component (for name).
 /// `None` is returned when path is invalid or non-existent.
-pub fn local_endpoint<P: AsRef<Path>>(path: P, embeddable: Embeddable) -> Option<(String, Box<LocalPageEndpoint>)> {
+pub fn local_endpoint<P: AsRef<Path>>(path: P, embeddable: Embeddable, pool: CpuPool) -> Option<(String, Box<local::Dapp>)> {
 	let path = path.as_ref().to_owned();
 	path.canonicalize().ok().and_then(|path| {
 		let name = path.file_name().and_then(|name| name.to_str());
 		name.map(|name| {
 			let dapp = local_dapp(name.into(), path.clone());
-			(dapp.id, Box::new(LocalPageEndpoint::new(
-				dapp.path, dapp.info, PageCache::Disabled, embeddable.clone())
+			(dapp.id, Box::new(local::Dapp::new(
+				pool.clone(), dapp.path, dapp.info, PageCache::Disabled, embeddable.clone())
 			))
 		})
 	})
@@ -86,13 +90,13 @@ fn local_dapp(name: String, path: PathBuf) -> LocalDapp {
 }
 
 /// Returns endpoints for Local Dapps found for given filesystem path.
-/// Scans the directory and collects `LocalPageEndpoints`.
-pub fn local_endpoints<P: AsRef<Path>>(dapps_path: P, embeddable: Embeddable) -> BTreeMap<String, Box<Endpoint>> {
+/// Scans the directory and collects `local::Dapp`.
+pub fn local_endpoints<P: AsRef<Path>>(dapps_path: P, embeddable: Embeddable, pool: CpuPool) -> BTreeMap<String, Box<Endpoint>> {
 	let mut pages = BTreeMap::<String, Box<Endpoint>>::new();
 	for dapp in local_dapps(dapps_path.as_ref()) {
 		pages.insert(
 			dapp.id,
-			Box::new(LocalPageEndpoint::new(dapp.path, dapp.info, PageCache::Disabled, embeddable.clone()))
+			Box::new(local::Dapp::new(pool.clone(), dapp.path, dapp.info, PageCache::Disabled, embeddable.clone()))
 		);
 	}
 	pages
diff --git a/dapps/src/apps/manifest.rs b/dapps/src/apps/manifest.rs
index 9461149804321937377afd321b481536602986db..e320482195da5c1feb093ef29368fb1390054869 100644
--- a/dapps/src/apps/manifest.rs
+++ b/dapps/src/apps/manifest.rs
@@ -20,8 +20,13 @@ pub use apps::App as Manifest;
 pub const MANIFEST_FILENAME: &'static str = "manifest.json";
 
 pub fn deserialize_manifest(manifest: String) -> Result<Manifest, String> {
-	serde_json::from_str::<Manifest>(&manifest).map_err(|e| format!("{:?}", e))
-	// TODO [todr] Manifest validation (especialy: id (used as path))
+	let mut manifest = serde_json::from_str::<Manifest>(&manifest).map_err(|e| format!("{:?}", e))?;
+	if manifest.id.is_none() {
+		return Err("App 'id' is missing.".into());
+	}
+	manifest.allow_js_eval = Some(manifest.allow_js_eval.unwrap_or(false));
+
+	Ok(manifest)
 }
 
 pub fn serialize_manifest(manifest: &Manifest) -> Result<String, String> {
diff --git a/dapps/src/apps/mod.rs b/dapps/src/apps/mod.rs
index c38c6784a5ed4ce74ff708ad6a9a4ca68c01d5f8..c065a08474cc4735b413edc7e4adfdd0723edf0e 100644
--- a/dapps/src/apps/mod.rs
+++ b/dapps/src/apps/mod.rs
@@ -18,12 +18,12 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use endpoint::{Endpoints, Endpoint};
-use page::PageEndpoint;
+use futures_cpupool::CpuPool;
+use page;
 use proxypac::ProxyPac;
 use web::Web;
 use fetch::Fetch;
 use parity_dapps::WebApp;
-use parity_reactor::Remote;
 use parity_ui;
 use {WebProxyTokens, ParentFrameSettings};
 
@@ -43,12 +43,12 @@ pub const UTILS_PATH: &'static str =  "parity-utils";
 pub const WEB_PATH: &'static str = "web";
 pub const URL_REFERER: &'static str = "__referer=";
 
-pub fn utils() -> Box<Endpoint> {
-	Box::new(PageEndpoint::with_prefix(parity_ui::App::default(), UTILS_PATH.to_owned()))
+pub fn utils(pool: CpuPool) -> Box<Endpoint> {
+	Box::new(page::builtin::Dapp::new(pool, parity_ui::App::default()))
 }
 
-pub fn ui() -> Box<Endpoint> {
-	Box::new(PageEndpoint::with_fallback_to_index(parity_ui::App::default()))
+pub fn ui(pool: CpuPool) -> Box<Endpoint> {
+	Box::new(page::builtin::Dapp::with_fallback_to_index(pool, parity_ui::App::default()))
 }
 
 pub fn ui_redirection(embeddable: Option<ParentFrameSettings>) -> Box<Endpoint> {
@@ -61,14 +61,14 @@ pub fn all_endpoints<F: Fetch>(
 	dapps_domain: &str,
 	embeddable: Option<ParentFrameSettings>,
 	web_proxy_tokens: Arc<WebProxyTokens>,
-	remote: Remote,
 	fetch: F,
+	pool: CpuPool,
 ) -> (Vec<String>, Endpoints) {
 	// fetch fs dapps at first to avoid overwriting builtins
-	let mut pages = fs::local_endpoints(dapps_path.clone(), embeddable.clone());
+	let mut pages = fs::local_endpoints(dapps_path.clone(), embeddable.clone(), pool.clone());
 	let local_endpoints: Vec<String> = pages.keys().cloned().collect();
 	for path in extra_dapps {
-		if let Some((id, endpoint)) = fs::local_endpoint(path.clone(), embeddable.clone()) {
+		if let Some((id, endpoint)) = fs::local_endpoint(path.clone(), embeddable.clone(), pool.clone()) {
 			pages.insert(id, endpoint);
 		} else {
 			warn!(target: "dapps", "Ignoring invalid dapp at {}", path.display());
@@ -76,17 +76,20 @@ pub fn all_endpoints<F: Fetch>(
 	}
 
 	// NOTE [ToDr] Dapps will be currently embeded on 8180
-	insert::<parity_ui::App>(&mut pages, "ui", Embeddable::Yes(embeddable.clone()));
+	insert::<parity_ui::App>(&mut pages, "ui", Embeddable::Yes(embeddable.clone()), pool.clone());
+	// old version
+	insert::<parity_ui::old::App>(&mut pages, "v1", Embeddable::Yes(embeddable.clone()), pool.clone());
+
 	pages.insert("proxy".into(), ProxyPac::boxed(embeddable.clone(), dapps_domain.to_owned()));
-	pages.insert(WEB_PATH.into(), Web::boxed(embeddable.clone(), web_proxy_tokens.clone(), remote.clone(), fetch.clone()));
+	pages.insert(WEB_PATH.into(), Web::boxed(embeddable.clone(), web_proxy_tokens.clone(), fetch.clone(), pool.clone()));
 
 	(local_endpoints, pages)
 }
 
-fn insert<T : WebApp + Default + 'static>(pages: &mut Endpoints, id: &str, embed_at: Embeddable) {
+fn insert<T : WebApp + Default + 'static>(pages: &mut Endpoints, id: &str, embed_at: Embeddable, pool: CpuPool) {
 	pages.insert(id.to_owned(), Box::new(match embed_at {
-		Embeddable::Yes(address) => PageEndpoint::new_safe_to_embed(T::default(), address),
-		Embeddable::No => PageEndpoint::new(T::default()),
+		Embeddable::Yes(address) => page::builtin::Dapp::new_safe_to_embed(pool, T::default(), address),
+		Embeddable::No => page::builtin::Dapp::new(pool, T::default()),
 	}));
 }
 
diff --git a/dapps/src/apps/ui.rs b/dapps/src/apps/ui.rs
index 06a815a8a2236ccc7485bfb5f836ccd56d0b75c2..39da14e5b97509e918e821b702152ae51c8904db 100644
--- a/dapps/src/apps/ui.rs
+++ b/dapps/src/apps/ui.rs
@@ -16,9 +16,10 @@
 
 //! UI redirections
 
-use hyper::{Control, StatusCode};
+use hyper::StatusCode;
+use futures::future;
 
-use endpoint::{Endpoint, Handler, EndpointPath};
+use endpoint::{Endpoint, Request, Response, EndpointPath};
 use {handlers, Embeddable};
 
 /// Redirection to UI server.
@@ -37,19 +38,20 @@ impl Redirection {
 }
 
 impl Endpoint for Redirection {
-	fn to_async_handler(&self, _path: EndpointPath, _control: Control) -> Box<Handler> {
-		if let Some(ref frame) = self.embeddable_on {
+	fn respond(&self, _path: EndpointPath, req: Request) -> Response {
+		Box::new(future::ok(if let Some(ref frame) = self.embeddable_on {
 			trace!(target: "dapps", "Redirecting to signer interface.");
-			handlers::Redirection::boxed(&format!("http://{}:{}", &frame.host, frame.port))
+			let protocol = req.uri().scheme().unwrap_or("http");
+			handlers::Redirection::new(format!("{}://{}:{}", protocol, &frame.host, frame.port)).into()
 		} else {
 			trace!(target: "dapps", "Signer disabled, returning 404.");
-			Box::new(handlers::ContentHandler::error(
+			handlers::ContentHandler::error(
 				StatusCode::NotFound,
 				"404 Not Found",
 				"Your homepage is not available when Trusted Signer is disabled.",
 				Some("You can still access dapps by writing a correct address, though. Re-enable Signer to get your homepage back."),
 				None,
-			))
-		}
+			).into()
+		}))
 	}
 }
diff --git a/dapps/src/endpoint.rs b/dapps/src/endpoint.rs
index ea5825b74952ccddf4848b5aebc29c91cbe40d95..fd05445c2a240105073eb1dd7f283f79174b299a 100644
--- a/dapps/src/endpoint.rs
+++ b/dapps/src/endpoint.rs
@@ -18,37 +18,32 @@
 
 use std::collections::BTreeMap;
 
-use hyper::{self, server, net};
+use futures::Future;
+use hyper;
 
 #[derive(Debug, PartialEq, Default, Clone)]
 pub struct EndpointPath {
 	pub app_id: String,
 	pub app_params: Vec<String>,
+	pub query: Option<String>,
 	pub host: String,
 	pub port: u16,
 	pub using_dapps_domains: bool,
 }
 
-#[derive(Debug, PartialEq, Clone)]
-pub struct EndpointInfo {
-	pub name: String,
-	pub description: String,
-	pub version: String,
-	pub author: String,
-	pub icon_url: String,
+impl EndpointPath {
+	pub fn has_no_params(&self) -> bool {
+		self.app_params.is_empty() || self.app_params.iter().all(|x| x.is_empty())
+	}
 }
 
+pub type EndpointInfo = ::apps::App;
 pub type Endpoints = BTreeMap<String, Box<Endpoint>>;
-pub type Handler = server::Handler<net::HttpStream> + Send;
+pub type Response = Box<Future<Item=hyper::Response, Error=hyper::Error> + Send>;
+pub type Request = hyper::Request;
 
 pub trait Endpoint : Send + Sync {
 	fn info(&self) -> Option<&EndpointInfo> { None }
 
-	fn to_handler(&self, _path: EndpointPath) -> Box<Handler> {
-		panic!("This Endpoint is asynchronous and requires Control object.");
-	}
-
-	fn to_async_handler(&self, path: EndpointPath, _control: hyper::Control) -> Box<Handler> {
-		self.to_handler(path)
-	}
+	fn respond(&self, path: EndpointPath, req: Request) -> Response;
 }
diff --git a/dapps/src/handlers/async.rs b/dapps/src/handlers/async.rs
deleted file mode 100644
index d68c55cce169772bf0eb9afe5b687f39db7ff088..0000000000000000000000000000000000000000
--- a/dapps/src/handlers/async.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Async Content Handler
-//! Temporary solution until we switch to future-based server.
-//! Wraps a future and converts it to hyper::server::Handler;
-
-use std::{mem, time};
-use std::sync::mpsc;
-use futures::Future;
-use hyper::{server, Decoder, Encoder, Next, Control};
-use hyper::net::HttpStream;
-
-use handlers::ContentHandler;
-use parity_reactor::Remote;
-
-const TIMEOUT_SECS: u64 = 15;
-
-enum State<F, T, M> {
-	Initial(F, M, Remote, Control),
-	Waiting(mpsc::Receiver<Result<T, ()>>, M),
-	Done(ContentHandler),
-	Invalid,
-}
-
-pub struct AsyncHandler<F, T, M> {
-	state: State<F, T, M>,
-}
-
-impl<F, T, M> AsyncHandler<F, T, M> {
-	pub fn new(future: F, map: M, remote: Remote, control: Control) -> Self {
-		AsyncHandler {
-			state: State::Initial(future, map, remote, control),
-		}
-	}
-}
-
-impl<F, T, E, M> server::Handler<HttpStream> for AsyncHandler<F, Result<T, E>, M> where
-	F: Future<Item=T, Error=E> + Send + 'static,
-	M: FnOnce(Result<Result<T, E>, ()>) -> ContentHandler,
-	T: Send + 'static,
-	E: Send + 'static,
-{
-	fn on_request(&mut self, _request: server::Request<HttpStream>) -> Next {
-		if let State::Initial(future, map, remote, control) = mem::replace(&mut self.state, State::Invalid) {
-			let (tx, rx) = mpsc::sync_channel(1);
-			let control2 = control.clone();
-			let tx2 = tx.clone();
-			remote.spawn_with_timeout(move || future.then(move |result| {
-				// Send a result (ignore errors if the connection was dropped)
-				let _ = tx.send(Ok(result));
-				// Resume handler
-				let _ = control.ready(Next::read());
-
-				Ok(())
-			}), time::Duration::from_secs(TIMEOUT_SECS), move || {
-				// Notify about error
-				let _ = tx2.send(Err(()));
-				// Resume handler
-				let _ = control2.ready(Next::read());
-			});
-
-			self.state = State::Waiting(rx, map);
-		}
-
-		Next::wait()
-	}
-
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		if let State::Waiting(rx, map) = mem::replace(&mut self.state, State::Invalid) {
-			match rx.try_recv() {
-				Ok(result) => {
-					self.state = State::Done(map(result));
-				},
-				Err(err) => {
-					warn!("Resuming handler in incorrect state: {:?}", err);
-				}
-			}
-		}
-
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		if let State::Done(ref mut handler) = self.state {
-			handler.on_response(res)
-		} else {
-			Next::end()
-		}
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		if let State::Done(ref mut handler) = self.state {
-			handler.on_response_writable(encoder)
-		} else {
-			Next::end()
-		}
-	}
-}
diff --git a/dapps/src/handlers/content.rs b/dapps/src/handlers/content.rs
index 300f4b61aa14444a6c4be7cd9c9392bb0ff4831e..c7eccf474e44daae2904f0d656ff8d1be09f6e00 100644
--- a/dapps/src/handlers/content.rs
+++ b/dapps/src/handlers/content.rs
@@ -16,32 +16,29 @@
 
 //! Simple Content Handler
 
-use hyper::{header, server, Decoder, Encoder, Next};
-use hyper::net::HttpStream;
-use hyper::mime::Mime;
-use hyper::status::StatusCode;
+use hyper::{self, mime, header};
+use hyper::StatusCode;
 
-use util::version;
+use parity_version::version;
 
 use handlers::add_security_headers;
 use Embeddable;
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct ContentHandler {
 	code: StatusCode,
 	content: String,
-	mimetype: Mime,
-	write_pos: usize,
+	mimetype: mime::Mime,
 	safe_to_embed_on: Embeddable,
 }
 
 impl ContentHandler {
-	pub fn ok(content: String, mimetype: Mime) -> Self {
+	pub fn ok(content: String, mimetype: mime::Mime) -> Self {
 		Self::new(StatusCode::Ok, content, mimetype)
 	}
 
 	pub fn html(code: StatusCode, content: String, embeddable_on: Embeddable) -> Self {
-		Self::new_embeddable(code, content, mime!(Text/Html), embeddable_on)
+		Self::new_embeddable(code, content, mime::TEXT_HTML, embeddable_on)
 	}
 
 	pub fn error(
@@ -60,57 +57,32 @@ impl ContentHandler {
 		), embeddable_on)
 	}
 
-	pub fn new(code: StatusCode, content: String, mimetype: Mime) -> Self {
+	pub fn new(code: StatusCode, content: String, mimetype: mime::Mime) -> Self {
 		Self::new_embeddable(code, content, mimetype, None)
 	}
 
 	pub fn new_embeddable(
 		code: StatusCode,
 		content: String,
-		mimetype: Mime,
+		mimetype: mime::Mime,
 		safe_to_embed_on: Embeddable,
 	) -> Self {
 		ContentHandler {
 			code,
 			content,
 			mimetype,
-			write_pos: 0,
 			safe_to_embed_on,
 		}
 	}
 }
 
-impl server::Handler<HttpStream> for ContentHandler {
-	fn on_request(&mut self, _request: server::Request<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		res.set_status(self.code);
-		res.headers_mut().set(header::ContentType(self.mimetype.clone()));
-		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.take());
-		Next::write()
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		let bytes = self.content.as_bytes();
-		if self.write_pos == bytes.len() {
-			return Next::end();
-		}
-
-		match encoder.write(&bytes[self.write_pos..]) {
-			Ok(bytes) => {
-				self.write_pos += bytes;
-				Next::write()
-			},
-			Err(e) => match e.kind() {
-				::std::io::ErrorKind::WouldBlock => Next::write(),
-				_ => Next::end()
-			},
-		}
+impl Into<hyper::Response> for ContentHandler {
+	fn into(self) -> hyper::Response {
+		let mut res = hyper::Response::new()
+			.with_status(self.code)
+			.with_header(header::ContentType(self.mimetype))
+			.with_body(self.content);
+		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on, false);
+		res
 	}
 }
diff --git a/dapps/src/handlers/echo.rs b/dapps/src/handlers/echo.rs
index 1e00f2eec911d73b128f6daa7e77e3e89c82d1fa..375f047906fea1e065743adfa8440a11a7c97a04 100644
--- a/dapps/src/handlers/echo.rs
+++ b/dapps/src/handlers/echo.rs
@@ -16,45 +16,31 @@
 
 //! Echo Handler
 
-use std::io::Read;
-use hyper::{server, Decoder, Encoder, Next};
-use hyper::net::HttpStream;
-use super::ContentHandler;
+use hyper::{self, header};
 
-#[derive(Default)]
+use handlers::add_security_headers;
+
+#[derive(Debug)]
 pub struct EchoHandler {
-	content: String,
-	handler: Option<ContentHandler>,
+	request: hyper::Request,
 }
 
-impl server::Handler<HttpStream> for EchoHandler {
-	fn on_request(&mut self, _: server::Request<HttpStream>) -> Next {
-		Next::read()
-	}
-
-	fn on_request_readable(&mut self, decoder: &mut Decoder<HttpStream>) -> Next {
-		match decoder.read_to_string(&mut self.content) {
-			Ok(0) => {
-				self.handler = Some(ContentHandler::ok(self.content.clone(), mime!(Application/Json)));
-				Next::write()
-			},
-			Ok(_) => Next::read(),
-			Err(e) => match e.kind() {
-				::std::io::ErrorKind::WouldBlock => Next::read(),
-				_ => Next::end(),
-			}
+impl EchoHandler {
+	pub fn new(request: hyper::Request) -> Self {
+		EchoHandler {
+			request,
 		}
 	}
+}
 
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		self.handler.as_mut()
-			.expect("handler always set in on_request, which is before now; qed")
-			.on_response(res)
-	}
+impl Into<hyper::Response> for EchoHandler {
+	fn into(self) -> hyper::Response {
+		let content_type = self.request.headers().get().cloned();
+		let mut res = hyper::Response::new()
+			.with_header(content_type.unwrap_or(header::ContentType::json()))
+			.with_body(self.request.body());
 
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		self.handler.as_mut()
-			.expect("handler always set in on_request, which is before now; qed")
-			.on_response_writable(encoder)
+		add_security_headers(res.headers_mut(), None, false);
+		res
 	}
 }
diff --git a/dapps/src/handlers/fetch.rs b/dapps/src/handlers/fetch.rs
index 7740247d95a8758a2010681d4e5b6a5617f4c3bd..179bb4884c7e9f27ee319c6ced1fd6c1818a1f75 100644
--- a/dapps/src/handlers/fetch.rs
+++ b/dapps/src/handlers/fetch.rs
@@ -16,57 +16,39 @@
 
 //! Hyper Server Handler that fetches a file during a request (proxy).
 
-use std::fmt;
-use std::sync::{mpsc, Arc};
+use std::{fmt, mem};
+use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::{Instant, Duration};
 use fetch::{self, Fetch};
-use futures::Future;
-use parity_reactor::Remote;
-use util::Mutex;
+use futures::sync::oneshot;
+use futures::{self, Future};
+use futures_cpupool::CpuPool;
+use hyper::{self, Method, StatusCode};
+use parking_lot::Mutex;
 
-use hyper::{server, Decoder, Encoder, Next, Method, Control};
-use hyper::net::HttpStream;
-use hyper::uri::RequestUri;
-use hyper::status::StatusCode;
-
-use endpoint::EndpointPath;
+use endpoint::{self, EndpointPath};
 use handlers::{ContentHandler, StreamingHandler};
-use page::{LocalPageEndpoint, PageHandlerWaiting};
+use page::local;
 use {Embeddable};
 
 const FETCH_TIMEOUT: u64 = 300;
 
 pub enum ValidatorResponse {
-	Local(LocalPageEndpoint),
-	Streaming(StreamingHandler<fetch::Response>),
+	Local(local::Dapp),
+	Streaming(StreamingHandler<fetch::BodyReader>),
 }
 
-pub trait ContentValidator: Send + 'static {
+pub trait ContentValidator: Sized + Send + 'static {
 	type Error: fmt::Debug + fmt::Display;
 
-	fn validate_and_install(&self, fetch::Response) -> Result<ValidatorResponse, Self::Error>;
-}
-
-enum FetchState {
-	Waiting,
-	NotStarted(String),
-	Error(ContentHandler),
-	InProgress(mpsc::Receiver<FetchState>),
-	Streaming(StreamingHandler<fetch::Response>),
-	Done(LocalPageEndpoint, Box<PageHandlerWaiting>),
+	fn validate_and_install(self, fetch::Response) -> Result<ValidatorResponse, Self::Error>;
 }
 
-enum WaitResult {
-	Error(ContentHandler),
-	Done(LocalPageEndpoint),
-	NonAwaitable,
-}
-
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct FetchControl {
 	abort: Arc<AtomicBool>,
-	listeners: Arc<Mutex<Vec<(Control, mpsc::Sender<WaitResult>)>>>,
+	listeners: Arc<Mutex<Vec<oneshot::Sender<WaitResult>>>>,
 	deadline: Instant,
 }
 
@@ -81,14 +63,30 @@ impl Default for FetchControl {
 }
 
 impl FetchControl {
+	pub fn is_deadline_reached(&self) -> bool {
+		self.deadline < Instant::now()
+	}
+
+	pub fn abort(&self) {
+		self.abort.store(true, Ordering::SeqCst);
+	}
+
+	pub fn to_response(&self, path: EndpointPath) -> endpoint::Response {
+		let (tx, receiver) = oneshot::channel();
+		self.listeners.lock().push(tx);
+
+		Box::new(WaitingHandler {
+			path,
+			state: WaitState::Waiting(receiver),
+		})
+	}
+
 	fn notify<F: Fn() -> WaitResult>(&self, status: F) {
 		let mut listeners = self.listeners.lock();
-		for (control, sender) in listeners.drain(..) {
+		for sender in listeners.drain(..) {
 			trace!(target: "dapps", "Resuming request waiting for content...");
-			if let Err(e) = sender.send(status()) {
-				trace!(target: "dapps", "Waiting listener notification failed: {:?}", e);
-			} else {
-				let _ = control.ready(Next::read());
+			if let Err(_) = sender.send(status()) {
+				trace!(target: "dapps", "Waiting listener notification failed.");
 			}
 		}
 	}
@@ -98,92 +96,79 @@ impl FetchControl {
 			FetchState::Error(ref handler) => self.notify(|| WaitResult::Error(handler.clone())),
 			FetchState::Done(ref endpoint, _) => self.notify(|| WaitResult::Done(endpoint.clone())),
 			FetchState::Streaming(_) => self.notify(|| WaitResult::NonAwaitable),
-			FetchState::NotStarted(_) | FetchState::InProgress(_) | FetchState::Waiting => {},
+			FetchState::InProgress(_) => {},
+			FetchState::Empty => {},
 		}
 	}
+}
 
-	pub fn is_deadline_reached(&self) -> bool {
-		self.deadline < Instant::now()
-	}
 
-	pub fn abort(&self) {
-		self.abort.store(true, Ordering::SeqCst);
-	}
-
-	pub fn to_async_handler(&self, path: EndpointPath, control: Control) -> Box<server::Handler<HttpStream> + Send> {
-		let (tx, rx) = mpsc::channel();
-		self.listeners.lock().push((control, tx));
+enum WaitState {
+	Waiting(oneshot::Receiver<WaitResult>),
+	Done(endpoint::Response),
+}
 
-		Box::new(WaitingHandler {
-			receiver: rx,
-			state: FetchState::Waiting,
-			uri: RequestUri::default(),
-			path: path,
-		})
-	}
+#[derive(Debug)]
+enum WaitResult {
+	Error(ContentHandler),
+	Done(local::Dapp),
+	NonAwaitable,
 }
 
 pub struct WaitingHandler {
-	receiver: mpsc::Receiver<WaitResult>,
-	state: FetchState,
-	uri: RequestUri,
 	path: EndpointPath,
+	state: WaitState,
 }
 
-impl server::Handler<HttpStream> for WaitingHandler {
-	fn on_request(&mut self, request: server::Request<HttpStream>) -> Next {
-		self.uri = request.uri().clone();
-		Next::wait()
-	}
-
-	fn on_request_readable(&mut self, decoder: &mut Decoder<HttpStream>) -> Next {
-		let result = self.receiver.try_recv().ok();
-		self.state = match result {
-			Some(WaitResult::Error(handler)) => FetchState::Error(handler),
-			Some(WaitResult::Done(endpoint)) => {
-				let mut page_handler = endpoint.to_page_handler(self.path.clone());
-				page_handler.set_uri(&self.uri);
-				FetchState::Done(endpoint, page_handler)
-			},
-			_ => {
-				warn!("A result for waiting request was not received.");
-				FetchState::Waiting
-			},
-		};
-
-		match self.state {
-			FetchState::Done(_, ref mut handler) => handler.on_request_readable(decoder),
-			FetchState::Streaming(ref mut handler) => handler.on_request_readable(decoder),
-			FetchState::Error(ref mut handler) => handler.on_request_readable(decoder),
-			_ => Next::write(),
-		}
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		match self.state {
-			FetchState::Done(_, ref mut handler) => handler.on_response(res),
-			FetchState::Streaming(ref mut handler) => handler.on_response(res),
-			FetchState::Error(ref mut handler) => handler.on_response(res),
-			_ => Next::end(),
-		}
-	}
+impl Future for WaitingHandler {
+	type Item = hyper::Response;
+	type Error = hyper::Error;
+
+	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
+		loop {
+			let new_state = match self.state {
+				WaitState::Waiting(ref mut receiver) => {
+					let result = try_ready!(receiver.poll().map_err(|_| hyper::Error::Timeout));
+
+					match result {
+						WaitResult::Error(handler) => {
+							return Ok(futures::Async::Ready(handler.into()));
+						},
+						WaitResult::NonAwaitable => {
+							let errors = Errors { embeddable_on: None };
+							return Ok(futures::Async::Ready(errors.streaming().into()));
+						},
+						WaitResult::Done(endpoint) => {
+							WaitState::Done(endpoint.to_response(&self.path).into())
+						},
+					}
+				},
+				WaitState::Done(ref mut response) => {
+					return response.poll()
+				},
+			};
 
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		match self.state {
-			FetchState::Done(_, ref mut handler) => handler.on_response_writable(encoder),
-			FetchState::Streaming(ref mut handler) => handler.on_response_writable(encoder),
-			FetchState::Error(ref mut handler) => handler.on_response_writable(encoder),
-			_ => Next::end(),
+			self.state = new_state;
 		}
 	}
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 struct Errors {
 	embeddable_on: Embeddable,
 }
 
 impl Errors {
+	fn streaming(&self) -> ContentHandler {
+		ContentHandler::error(
+			StatusCode::BadGateway,
+			"Streaming Error",
+			"This content is being streamed in other place.",
+			None,
+			self.embeddable_on.clone(),
+		)
+	}
+
 	fn download_error<E: fmt::Debug>(&self, e: E) -> ContentHandler {
 		ContentHandler::error(
 			StatusCode::BadGateway,
@@ -225,67 +210,105 @@ impl Errors {
 	}
 }
 
-pub struct ContentFetcherHandler<H: ContentValidator, F: Fetch> {
+enum FetchState {
+	Error(ContentHandler),
+	InProgress(Box<Future<Item=FetchState, Error=()> + Send>),
+	Streaming(hyper::Response),
+	Done(local::Dapp, endpoint::Response),
+	Empty,
+}
+
+impl fmt::Debug for FetchState {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		use self::FetchState::*;
+
+		write!(fmt, "FetchState(")?;
+		match *self {
+			Error(ref error) => write!(fmt, "error: {:?}", error),
+			InProgress(_) => write!(fmt, "in progress"),
+			Streaming(ref res) => write!(fmt, "streaming: {:?}", res),
+			Done(ref endpoint, _) => write!(fmt, "done: {:?}", endpoint),
+			Empty => write!(fmt, "?"),
+		}?;
+		write!(fmt, ")")
+	}
+}
+
+#[derive(Debug)]
+pub struct ContentFetcherHandler {
 	fetch_control: FetchControl,
-	control: Control,
-	remote: Remote,
 	status: FetchState,
-	fetch: F,
-	installer: Option<H>,
-	path: EndpointPath,
 	errors: Errors,
 }
 
-impl<H: ContentValidator, F: Fetch> ContentFetcherHandler<H, F> {
-	pub fn new(
-		url: String,
+impl ContentFetcherHandler {
+	pub fn fetch_control(&self) -> FetchControl {
+		self.fetch_control.clone()
+	}
+
+	pub fn new<H: ContentValidator, F: Fetch>(
+		method: &hyper::Method,
+		url: &str,
 		path: EndpointPath,
-		control: Control,
 		installer: H,
 		embeddable_on: Embeddable,
-		remote: Remote,
 		fetch: F,
+		pool: CpuPool,
 	) -> Self {
-		ContentFetcherHandler {
-			fetch_control: FetchControl::default(),
-			control,
-			remote,
-			fetch,
-			status: FetchState::NotStarted(url),
-			installer: Some(installer),
-			path,
-			errors: Errors {
-				embeddable_on,
+		let fetch_control = FetchControl::default();
+		let errors = Errors { embeddable_on };
+
+		// Validation of method
+		let status = match *method {
+			// Start fetching content
+			Method::Get => {
+				trace!(target: "dapps", "Fetching content from: {:?}", url);
+				FetchState::InProgress(Self::fetch_content(
+						pool,
+						fetch,
+						url,
+						fetch_control.abort.clone(),
+						path,
+						errors.clone(),
+						installer,
+				))
 			},
-		}
-	}
+			// or return error
+			_ => FetchState::Error(errors.method_not_allowed()),
+		};
 
-	pub fn fetch_control(&self) -> FetchControl {
-		self.fetch_control.clone()
+		ContentFetcherHandler {
+			fetch_control,
+			status,
+			errors,
+		}
 	}
 
-	fn fetch_content(&self, uri: RequestUri, url: &str, installer: H) -> mpsc::Receiver<FetchState> {
-		let (tx, rx) = mpsc::channel();
-		let abort = self.fetch_control.abort.clone();
-
-		let path = self.path.clone();
-		let tx2 = tx.clone();
-		let control = self.control.clone();
-		let errors = self.errors.clone();
-
-		let future = self.fetch.fetch_with_abort(url, abort.into()).then(move |result| {
+	fn fetch_content<H: ContentValidator, F: Fetch>(
+		pool: CpuPool,
+		fetch: F,
+		url: &str,
+		abort: Arc<AtomicBool>,
+		path: EndpointPath,
+		errors: Errors,
+		installer: H,
+	) -> Box<Future<Item=FetchState, Error=()> + Send> {
+		// Start fetching the content
+		let pool2 = pool.clone();
+		let future = fetch.fetch(url, abort.into()).then(move |result| {
 			trace!(target: "dapps", "Fetching content finished. Starting validation: {:?}", result);
-			let new_state = match result {
+			Ok(match result {
 				Ok(response) => match installer.validate_and_install(response) {
 					Ok(ValidatorResponse::Local(endpoint)) => {
 						trace!(target: "dapps", "Validation OK. Returning response.");
-						let mut handler = endpoint.to_page_handler(path);
-						handler.set_uri(&uri);
-						FetchState::Done(endpoint, handler)
+						let response = endpoint.to_response(&path);
+						FetchState::Done(endpoint, response)
 					},
-					Ok(ValidatorResponse::Streaming(handler)) => {
+					Ok(ValidatorResponse::Streaming(stream)) => {
 						trace!(target: "dapps", "Validation OK. Streaming response.");
-						FetchState::Streaming(handler)
+						let (reading, response) = stream.into_response();
+						pool.spawn(reading).forget();
+						FetchState::Streaming(response)
 					},
 					Err(e) => {
 						trace!(target: "dapps", "Error while validating content: {:?}", e);
@@ -296,100 +319,55 @@ impl<H: ContentValidator, F: Fetch> ContentFetcherHandler<H, F> {
 					warn!(target: "dapps", "Unable to fetch content: {:?}", e);
 					FetchState::Error(errors.download_error(e))
 				},
-			};
-			// Content may be resolved when the connection is already dropped.
-			let _ = tx2.send(new_state);
-			// Ignoring control errors
-			let _ = control.ready(Next::read());
-			Ok(()) as Result<(), ()>
+			})
 		});
 
 		// make sure to run within fetch thread pool.
-		let future = self.fetch.process(future);
-		// spawn to event loop
-		let control = self.control.clone();
-		let errors = self.errors.clone();
-		self.remote.spawn_with_timeout(|| future, Duration::from_secs(FETCH_TIMEOUT), move || {
-			// Notify about the timeout
-			let _ = tx.send(FetchState::Error(errors.timeout_error()));
-			// Ignoring control errors
-			let _ = control.ready(Next::read());
-		});
-
-		rx
+		Box::new(pool2.spawn(future))
 	}
 }
 
-impl<H: ContentValidator, F: Fetch> server::Handler<HttpStream> for ContentFetcherHandler<H, F> {
-	fn on_request(&mut self, request: server::Request<HttpStream>) -> Next {
-		let status = if let FetchState::NotStarted(ref url) = self.status {
-			let uri = request.uri().clone();
-			let installer = self.installer.take().expect("Installer always set initialy; installer used only in on_request; on_request invoked only once; qed");
-
-			Some(match *request.method() {
-				// Start fetching content
-				Method::Get => {
-					trace!(target: "dapps", "Fetching content from: {:?}", url);
-					let receiver = self.fetch_content(uri, url, installer);
-					FetchState::InProgress(receiver)
-				},
-				// or return error
-				_ => FetchState::Error(self.errors.method_not_allowed()),
-			})
-		} else { None };
-
-		if let Some(status) = status {
-			self.fetch_control.set_status(&status);
-			self.status = status;
-		}
+impl Future for ContentFetcherHandler {
+	type Item = hyper::Response;
+	type Error = hyper::Error;
 
-		Next::read()
-	}
+	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
+		loop {
+			trace!(target: "dapps", "Polling status: {:?}", self.status);
+			self.status = match mem::replace(&mut self.status, FetchState::Empty) {
+				FetchState::Error(error) => {
+					return Ok(futures::Async::Ready(error.into()));
+				},
+				FetchState::Streaming(response) => {
+					return Ok(futures::Async::Ready(response));
+				},
+				any => any,
+			};
 
-	fn on_request_readable(&mut self, decoder: &mut Decoder<HttpStream>) -> Next {
-		let (status, next) = match self.status {
-			// Request may time out
-			FetchState::InProgress(_) if self.fetch_control.is_deadline_reached() => {
-				trace!(target: "dapps", "Fetching dapp failed because of timeout.");
-				(Some(FetchState::Error(self.errors.timeout_error())), Next::write())
-			},
-			FetchState::InProgress(ref receiver) => {
-				// Check if there is an answer
-				let rec = receiver.try_recv();
-				match rec {
-					// just return the new state
-					Ok(state) => (Some(state), Next::write()),
-					// wait some more
-					_ => (None, Next::wait())
-				}
-			},
-			FetchState::Error(ref mut handler) => (None, handler.on_request_readable(decoder)),
-			_ => (None, Next::write()),
-		};
+			let status = match self.status {
+				// Request may time out
+				FetchState::InProgress(_) if self.fetch_control.is_deadline_reached() => {
+					trace!(target: "dapps", "Fetching dapp failed because of timeout.");
+					FetchState::Error(self.errors.timeout_error())
+				},
+				FetchState::InProgress(ref mut receiver) => {
+					// Check if there is a response
+					trace!(target: "dapps", "Polling streaming response.");
+					try_ready!(receiver.poll().map_err(|err| {
+						warn!(target: "dapps", "Error while fetching response: {:?}", err);
+						hyper::Error::Timeout
+					}))
+				},
+				FetchState::Done(_, ref mut response) => {
+					return response.poll()
+				},
+				FetchState::Empty => panic!("Future polled twice."),
+				_ => unreachable!(),
+			};
 
-		if let Some(status) = status {
+			trace!(target: "dapps", "New status: {:?}", status);
 			self.fetch_control.set_status(&status);
 			self.status = status;
 		}
-
-		next
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		match self.status {
-			FetchState::Done(_, ref mut handler) => handler.on_response(res),
-			FetchState::Streaming(ref mut handler) => handler.on_response(res),
-			FetchState::Error(ref mut handler) => handler.on_response(res),
-			_ => Next::end(),
-		}
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		match self.status {
-			FetchState::Done(_, ref mut handler) => handler.on_response_writable(encoder),
-			FetchState::Streaming(ref mut handler) => handler.on_response_writable(encoder),
-			FetchState::Error(ref mut handler) => handler.on_response_writable(encoder),
-			_ => Next::end(),
-		}
 	}
 }
diff --git a/dapps/src/handlers/mod.rs b/dapps/src/handlers/mod.rs
index a8beabe846c33a8077ac0d6e3c6b261f89e43260..f78f46c76471d0e11236290c44f723af41aef6f8 100644
--- a/dapps/src/handlers/mod.rs
+++ b/dapps/src/handlers/mod.rs
@@ -16,80 +16,84 @@
 
 //! Hyper handlers implementations.
 
-mod async;
 mod content;
 mod echo;
 mod fetch;
+mod reader;
 mod redirect;
 mod streaming;
 
-pub use self::async::AsyncHandler;
 pub use self::content::ContentHandler;
 pub use self::echo::EchoHandler;
 pub use self::fetch::{ContentFetcherHandler, ContentValidator, FetchControl, ValidatorResponse};
+pub use self::reader::Reader;
 pub use self::redirect::Redirection;
 pub use self::streaming::StreamingHandler;
 
 use std::iter;
 use itertools::Itertools;
-use url::Url;
-use hyper::{server, header, net, uri};
+use hyper::header;
 use {apps, address, Embeddable};
 
 /// Adds security-related headers to the Response.
-pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embeddable) {
-	headers.set_raw("X-XSS-Protection", vec![b"1; mode=block".to_vec()]);
-	headers.set_raw("X-Content-Type-Options", vec![b"nosniff".to_vec()]);
+pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embeddable, allow_js_eval: bool) {
+	headers.set_raw("X-XSS-Protection", "1; mode=block");
+	headers.set_raw("X-Content-Type-Options", "nosniff");
 
 	// Embedding header:
 	if let None = embeddable_on {
-		headers.set_raw("X-Frame-Options",  vec![b"SAMEORIGIN".to_vec()]);
+		headers.set_raw("X-Frame-Options",  "SAMEORIGIN");
 	}
 
 	// Content Security Policy headers
-	headers.set_raw("Content-Security-Policy", vec![
+	headers.set_raw("Content-Security-Policy", String::new()
+		// Restrict everything to the same origin by default.
+		+ "default-src 'self';"
 		// Allow connecting to WS servers and HTTP(S) servers.
 		// We could be more restrictive and allow only RPC server URL.
-		b"connect-src http: https: ws: wss:;".to_vec(),
+		+ "connect-src http: https: ws: wss:;"
 		// Allow framing any content from HTTP(S).
 		// Again we could only allow embedding from RPC server URL.
 		// (deprecated)
-		b"frame-src 'self' http: https:;".to_vec(),
+		+ "frame-src 'self' http: https:;"
 		// Allow framing and web workers from HTTP(S).
-		b"child-src 'self' http: https:;".to_vec(),
+		+ "child-src 'self' http: https:;"
 		// We allow data: blob: and HTTP(s) images.
 		// We could get rid of wildcarding HTTP and only allow RPC server URL.
 		// (http required for local dapps icons)
-		b"img-src 'self' 'unsafe-inline' data: blob: http: https:;".to_vec(),
+		+ "img-src 'self' 'unsafe-inline' data: blob: http: https:;"
 		// Allow style from data: blob: and HTTPS.
-		b"style-src 'self' 'unsafe-inline' data: blob: https:;".to_vec(),
+		+ "style-src 'self' 'unsafe-inline' data: blob: https:;"
 		// Allow fonts from data: and HTTPS.
-		b"font-src 'self' data: https:;".to_vec(),
-		// Allow inline scripts and scripts eval (webpack/jsconsole)
-		{
+		+ "font-src 'self' data: https:;"
+		// Disallow objects
+		+ "object-src 'none';"
+		// Allow scripts
+		+ {
 			let script_src = embeddable_on.as_ref()
 				.map(|e| e.extra_script_src.iter()
 					 .map(|&(ref host, port)| address(host, port))
 					 .join(" ")
 				).unwrap_or_default();
-			format!(
-				"script-src 'self' 'unsafe-inline' 'unsafe-eval' {};",
-				script_src
-			).into_bytes()
-		},
+			let eval = if allow_js_eval { " 'unsafe-eval'" } else { "" };
+
+			&format!(
+				"script-src 'self' {}{};",
+				script_src,
+				eval
+			)
+		}
 		// Same restrictions as script-src with additional
 		// blob: that is required for camera access (worker)
-		b"worker-src 'self' 'unsafe-inline' 'unsafe-eval' https: blob:;".to_vec(),
-		// Restrict everything else to the same origin.
-		b"default-src 'self';".to_vec(),
+		+ "worker-src 'self' https: blob:;"
 		// Run in sandbox mode (although it's not fully safe since we allow same-origin and script)
-		b"sandbox allow-same-origin allow-forms allow-modals allow-popups allow-presentation allow-scripts;".to_vec(),
-		// Disallow subitting forms from any dapps
-		b"form-action 'none';".to_vec(),
+		+ "sandbox allow-same-origin allow-forms allow-modals allow-popups allow-presentation allow-scripts;"
+		// Disallow submitting forms from any dapps
+		+ "form-action 'none';"
 		// Never allow mixed content
-		b"block-all-mixed-content;".to_vec(),
+		+ "block-all-mixed-content;"
 		// Specify if the site can be embedded.
-		match embeddable_on {
+		+ &match embeddable_on {
 			Some(ref embed) => {
 				let std = address(&embed.host, embed.port);
 				let proxy = format!("{}.{}", apps::HOME_PAGE, embed.dapps_domain);
@@ -112,43 +116,6 @@ pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embedd
 				format!("frame-ancestors {};", ancestors)
 			},
 			None => format!("frame-ancestors 'self';"),
-		}.into_bytes(),
-	]);
-}
-
-
-/// Extracts URL part from the Request.
-pub fn extract_url(req: &server::Request<net::HttpStream>) -> Option<Url> {
-	convert_uri_to_url(req.uri(), req.headers().get::<header::Host>())
-}
-
-/// Extracts URL given URI and Host header.
-pub fn convert_uri_to_url(uri: &uri::RequestUri, host: Option<&header::Host>) -> Option<Url> {
-	match *uri {
-		uri::RequestUri::AbsoluteUri(ref url) => {
-			match Url::from_generic_url(url.clone()) {
-				Ok(url) => Some(url),
-				_ => None,
-			}
-		},
-		uri::RequestUri::AbsolutePath { ref path, ref query } => {
-			let query = match *query {
-				Some(ref query) => format!("?{}", query),
-				None => "".into(),
-			};
-			// Attempt to prepend the Host header (mandatory in HTTP/1.1)
-			let url_string = match host {
-				Some(ref host) => {
-					format!("http://{}:{}{}{}", host.hostname, host.port.unwrap_or(80), path, query)
-				},
-				None => return None,
-			};
-
-			match Url::parse(&url_string) {
-				Ok(url) => Some(url),
-				_ => None,
-			}
-		},
-		_ => None,
-	}
+		}
+	);
 }
diff --git a/dapps/src/handlers/reader.rs b/dapps/src/handlers/reader.rs
new file mode 100644
index 0000000000000000000000000000000000000000..85a351c7b0c934f832d33cc038a3aa1351f44f0d
--- /dev/null
+++ b/dapps/src/handlers/reader.rs
@@ -0,0 +1,73 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! A chunk-producing io::Read wrapper.
+
+use std::io::{self, Read};
+
+use futures::{self, sink, Sink, Future};
+use futures::sync::mpsc;
+use hyper;
+
+type Sender = mpsc::Sender<Result<hyper::Chunk, hyper::Error>>;
+
+const MAX_CHUNK_SIZE: usize = 32 * 1024;
+
+/// A Reader is essentially a stream of `hyper::Chunks`.
+/// The chunks are read from given `io::Read` instance.
+///
+/// Unfortunately `hyper` doesn't allow you to pass `Stream`
+/// directly to the response, so you need to create
+/// a `Body::pair()` and send over chunks using `sink::Send`.
+/// Also `Chunks` need to take `Vec` by value, so we need
+/// to allocate it for each chunk being sent.
+pub struct Reader<R: io::Read> {
+	buffer: [u8; MAX_CHUNK_SIZE],
+	content: io::BufReader<R>,
+	sending: sink::Send<Sender>,
+}
+
+impl<R: io::Read> Reader<R> {
+	pub fn pair(content: R, initial: Vec<u8>) -> (Self, hyper::Body) {
+		let (tx, rx) = hyper::Body::pair();
+		let reader = Reader {
+			buffer: [0; MAX_CHUNK_SIZE],
+			content: io::BufReader::new(content),
+			sending: tx.send(Ok(initial.into())),
+		};
+
+		(reader, rx)
+	}
+}
+
+impl<R: io::Read> Future for Reader<R> {
+	type Item = ();
+	type Error = ();
+
+	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
+		loop {
+			let next = try_ready!(self.sending.poll().map_err(|err| {
+				warn!(target: "dapps", "Unable to send next chunk: {:?}", err);
+			}));
+
+			self.sending = match self.content.read(&mut self.buffer) {
+				Ok(0) => return Ok(futures::Async::Ready(())),
+				Ok(read) => next.send(Ok(self.buffer[..read].to_vec().into())),
+				Err(err) => next.send(Err(hyper::Error::Io(err))),
+			}
+		}
+	}
+}
diff --git a/dapps/src/handlers/redirect.rs b/dapps/src/handlers/redirect.rs
index 09e8f9c5000fb0d79adaf70956dbb9ca06f320cf..cb1eda2dd555706effa224f83af19916adf99b94 100644
--- a/dapps/src/handlers/redirect.rs
+++ b/dapps/src/handlers/redirect.rs
@@ -16,9 +16,7 @@
 
 //! HTTP Redirection hyper handler
 
-use hyper::{header, server, Decoder, Encoder, Next};
-use hyper::net::HttpStream;
-use hyper::status::StatusCode;
+use hyper::{self, header, StatusCode};
 
 #[derive(Clone)]
 pub struct Redirection {
@@ -26,36 +24,18 @@ pub struct Redirection {
 }
 
 impl Redirection {
-	pub fn new(url: &str) -> Self {
+	pub fn new<T: Into<String>>(url: T) -> Self {
 		Redirection {
-			to_url: url.to_owned()
+			to_url: url.into()
 		}
 	}
-
-	pub fn boxed(url: &str) -> Box<Self> {
-		Box::new(Self::new(url))
-	}
 }
 
-impl server::Handler<HttpStream> for Redirection {
-	fn on_request(&mut self, _request: server::Request<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
+impl Into<hyper::Response> for Redirection {
+	fn into(self) -> hyper::Response {
 		// Don't use `MovedPermanently` here to prevent browser from caching the redirections.
-		res.set_status(StatusCode::Found);
-		res.headers_mut().set(header::Location(self.to_url.to_owned()));
-		Next::write()
-	}
-	fn on_response_writable(&mut self, _encoder: &mut Encoder<HttpStream>) -> Next {
-		Next::end()
+		hyper::Response::new()
+			.with_status(StatusCode::Found)
+			.with_header(header::Location::new(self.to_url))
 	}
 }
-
-
-
diff --git a/dapps/src/handlers/streaming.rs b/dapps/src/handlers/streaming.rs
index 5981cf221f7fd1ee640555044c8ac1d00733d8f2..269e4c5d2a730a57d4a024543857ac23b5b2901f 100644
--- a/dapps/src/handlers/streaming.rs
+++ b/dapps/src/handlers/streaming.rs
@@ -16,87 +16,43 @@
 
 //! Content Stream Response
 
-use std::io::{self, Read};
+use std::io;
+use hyper::{self, header, mime, StatusCode};
 
-use hyper::{header, server, Decoder, Encoder, Next};
-use hyper::net::HttpStream;
-use hyper::mime::Mime;
-use hyper::status::StatusCode;
-
-use handlers::add_security_headers;
+use handlers::{add_security_headers, Reader};
 use Embeddable;
 
-const BUFFER_SIZE: usize = 1024;
-
-pub struct StreamingHandler<R: io::Read> {
-	buffer: [u8; BUFFER_SIZE],
-	buffer_leftover: usize,
+pub struct StreamingHandler<R> {
+	initial: Vec<u8>,
+	content: R,
 	status: StatusCode,
-	content: io::BufReader<R>,
-	mimetype: Mime,
+	mimetype: mime::Mime,
 	safe_to_embed_on: Embeddable,
 }
 
 impl<R: io::Read> StreamingHandler<R> {
-	pub fn new(content: R, status: StatusCode, mimetype: Mime, embeddable_on: Embeddable) -> Self {
+	pub fn new(content: R, status: StatusCode, mimetype: mime::Mime, safe_to_embed_on: Embeddable) -> Self {
 		StreamingHandler {
-			buffer: [0; BUFFER_SIZE],
-			buffer_leftover: 0,
-			status: status,
-			content: io::BufReader::new(content),
-			mimetype: mimetype,
-			safe_to_embed_on: embeddable_on,
+			initial: Vec::new(),
+			content,
+			status,
+			mimetype,
+			safe_to_embed_on,
 		}
 	}
 
 	pub fn set_initial_content(&mut self, content: &str) {
-		assert_eq!(self.buffer_leftover, 0);
-		let bytes = content.as_bytes();
-		self.buffer_leftover = bytes.len();
-		self.buffer[0..self.buffer_leftover].copy_from_slice(bytes);
-	}
-}
-
-impl<R: io::Read> server::Handler<HttpStream> for StreamingHandler<R> {
-	fn on_request(&mut self, _request: server::Request<HttpStream>) -> Next {
-		Next::write()
+		self.initial = content.as_bytes().to_vec();
 	}
 
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		Next::write()
-	}
+	pub fn into_response(self) -> (Reader<R>, hyper::Response) {
+		let (reader, body) = Reader::pair(self.content, self.initial);
+		let mut res = hyper::Response::new()
+			.with_status(self.status)
+			.with_header(header::ContentType(self.mimetype))
+			.with_body(body);
+		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on, false);
 
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		res.set_status(self.status);
-		res.headers_mut().set(header::ContentType(self.mimetype.clone()));
-		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.take());
-		Next::write()
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		fn handle_error(e: io::Error) -> Next {
-			match e.kind() {
-				::std::io::ErrorKind::WouldBlock => Next::write(),
-				_ => Next::end(),
-			}
-		}
-
-		let write_pos = self.buffer_leftover;
-		match self.content.read(&mut self.buffer[write_pos..]) {
-			Err(e) => handle_error(e),
-			Ok(read) => match encoder.write(&self.buffer[..write_pos + read]) {
-				Err(e) => handle_error(e),
-				Ok(0) => Next::end(),
-				Ok(wrote) => {
-					self.buffer_leftover = write_pos + read - wrote;
-					if self.buffer_leftover > 0 {
-						for i in self.buffer_leftover..write_pos + read {
-							self.buffer.swap(i, i - self.buffer_leftover);
-						}
-					}
-					Next::write()
-				},
-			},
-		}
+		(reader, res)
 	}
 }
diff --git a/dapps/src/lib.rs b/dapps/src/lib.rs
index 073db5121442e27a436f15864994edca99043f52..482ee3959580f2a91cffc20c0817feedd28ad57a 100644
--- a/dapps/src/lib.rs
+++ b/dapps/src/lib.rs
@@ -16,45 +16,48 @@
 
 //! Ethcore Webapplications for Parity
 #![warn(missing_docs)]
-#![cfg_attr(feature="nightly", feature(plugin))]
-#![cfg_attr(feature="nightly", plugin(clippy))]
 
 extern crate base32;
-extern crate futures;
+extern crate futures_cpupool;
 extern crate itertools;
 extern crate linked_hash_map;
 extern crate mime_guess;
+extern crate parking_lot;
 extern crate rand;
 extern crate rustc_hex;
 extern crate serde;
 extern crate serde_json;
-extern crate time;
 extern crate unicase;
-extern crate url as url_lib;
 extern crate zip;
 
-extern crate jsonrpc_core;
 extern crate jsonrpc_http_server;
 
-extern crate ethcore_util as util;
+extern crate ethcore_bytes as bytes;
+extern crate ethereum_types;
 extern crate fetch;
 extern crate node_health;
 extern crate parity_dapps_glue as parity_dapps;
 extern crate parity_hash_fetch as hash_fetch;
-extern crate parity_reactor;
 extern crate parity_ui;
+extern crate keccak_hash as hash;
+extern crate parity_version;
+extern crate registrar;
 
 #[macro_use]
-extern crate log;
+extern crate futures;
 #[macro_use]
-extern crate mime;
+extern crate log;
 #[macro_use]
 extern crate serde_derive;
 
+#[cfg(test)]
+extern crate env_logger;
 #[cfg(test)]
 extern crate ethcore_devtools as devtools;
 #[cfg(test)]
-extern crate env_logger;
+extern crate jsonrpc_core;
+#[cfg(test)]
+extern crate parity_reactor;
 
 mod endpoint;
 mod apps;
@@ -63,7 +66,6 @@ mod router;
 mod handlers;
 mod api;
 mod proxypac;
-mod url;
 mod web;
 #[cfg(test)]
 mod tests;
@@ -72,15 +74,14 @@ use std::collections::HashMap;
 use std::mem;
 use std::path::PathBuf;
 use std::sync::Arc;
-use util::RwLock;
-
+use futures_cpupool::CpuPool;
 use jsonrpc_http_server::{self as http, hyper, Origin};
+use parking_lot::RwLock;
 
 use fetch::Fetch;
 use node_health::NodeHealth;
-use parity_reactor::Remote;
 
-pub use hash_fetch::urlhint::ContractClient;
+pub use registrar::{RegistrarClient, Asynchronous};
 pub use node_health::SyncStatus;
 
 
@@ -101,19 +102,24 @@ pub struct Endpoints {
 	endpoints: Arc<RwLock<endpoint::Endpoints>>,
 	dapps_path: PathBuf,
 	embeddable: Option<ParentFrameSettings>,
+	pool: Option<CpuPool>,
 }
 
 impl Endpoints {
 	/// Returns a current list of app endpoints.
 	pub fn list(&self) -> Vec<apps::App> {
 		self.endpoints.read().iter().filter_map(|(ref k, ref e)| {
-			e.info().map(|ref info| apps::App::from_info(k, info))
+			e.info().map(|ref info| info.with_id(k))
 		}).collect()
 	}
 
 	/// Check for any changes in the local dapps folder and update.
 	pub fn refresh_local_dapps(&self) {
-		let new_local = apps::fs::local_endpoints(&self.dapps_path, self.embeddable.clone());
+		let pool = match self.pool.as_ref() {
+			None => return,
+			Some(pool) => pool,
+		};
+		let new_local = apps::fs::local_endpoints(&self.dapps_path, self.embeddable.clone(), pool.clone());
 		let old_local = mem::replace(&mut *self.local_endpoints.write(), new_local.keys().cloned().collect());
 		let (_, to_remove): (_, Vec<_>) = old_local
 			.into_iter()
@@ -147,26 +153,26 @@ impl Middleware {
 
 	/// Creates new middleware for UI server.
 	pub fn ui<F: Fetch>(
+		pool: CpuPool,
 		health: NodeHealth,
-		remote: Remote,
 		dapps_domain: &str,
-		registrar: Arc<ContractClient>,
+		registrar: Arc<RegistrarClient<Call=Asynchronous>>,
 		sync_status: Arc<SyncStatus>,
 		fetch: F,
 	) -> Self {
 		let content_fetcher = Arc::new(apps::fetcher::ContentFetcher::new(
 			hash_fetch::urlhint::URLHintContract::new(registrar),
 			sync_status.clone(),
-			remote.clone(),
 			fetch.clone(),
+			pool.clone(),
 		).embeddable_on(None).allow_dapps(false));
 		let special = {
 			let mut special = special_endpoints(
+				pool.clone(),
 				health,
 				content_fetcher.clone(),
-				remote.clone(),
 			);
-			special.insert(router::SpecialEndpoint::Home, Some(apps::ui()));
+			special.insert(router::SpecialEndpoint::Home, Some(apps::ui(pool.clone())));
 			special
 		};
 		let router = router::Router::new(
@@ -185,15 +191,15 @@ impl Middleware {
 
 	/// Creates new Dapps server middleware.
 	pub fn dapps<F: Fetch>(
+		pool: CpuPool,
 		health: NodeHealth,
-		remote: Remote,
 		ui_address: Option<(String, u16)>,
 		extra_embed_on: Vec<(String, u16)>,
 		extra_script_src: Vec<(String, u16)>,
 		dapps_path: PathBuf,
 		extra_dapps: Vec<PathBuf>,
 		dapps_domain: &str,
-		registrar: Arc<ContractClient>,
+		registrar: Arc<RegistrarClient<Call=Asynchronous>>,
 		sync_status: Arc<SyncStatus>,
 		web_proxy_tokens: Arc<WebProxyTokens>,
 		fetch: F,
@@ -202,8 +208,8 @@ impl Middleware {
 		let content_fetcher = Arc::new(apps::fetcher::ContentFetcher::new(
 			hash_fetch::urlhint::URLHintContract::new(registrar),
 			sync_status.clone(),
-			remote.clone(),
 			fetch.clone(),
+			pool.clone(),
 		).embeddable_on(embeddable.clone()).allow_dapps(true));
 		let (local_endpoints, endpoints) = apps::all_endpoints(
 			dapps_path.clone(),
@@ -211,21 +217,22 @@ impl Middleware {
 			dapps_domain,
 			embeddable.clone(),
 			web_proxy_tokens,
-			remote.clone(),
 			fetch.clone(),
+			pool.clone(),
 		);
 		let endpoints = Endpoints {
 			endpoints: Arc::new(RwLock::new(endpoints)),
 			dapps_path,
 			local_endpoints: Arc::new(RwLock::new(local_endpoints)),
 			embeddable: embeddable.clone(),
+			pool: Some(pool.clone()),
 		};
 
 		let special = {
 			let mut special = special_endpoints(
+				pool.clone(),
 				health,
 				content_fetcher.clone(),
-				remote.clone(),
 			);
 			special.insert(
 				router::SpecialEndpoint::Home,
@@ -250,23 +257,22 @@ impl Middleware {
 }
 
 impl http::RequestMiddleware for Middleware {
-	fn on_request(&self, req: &hyper::server::Request<hyper::net::HttpStream>, control: &hyper::Control) -> http::RequestMiddlewareAction {
-		self.router.on_request(req, control)
+	fn on_request(&self, req: hyper::Request) -> http::RequestMiddlewareAction {
+		self.router.on_request(req)
 	}
 }
 
 fn special_endpoints(
+	pool: CpuPool,
 	health: NodeHealth,
 	content_fetcher: Arc<apps::fetcher::Fetcher>,
-	remote: Remote,
 ) -> HashMap<router::SpecialEndpoint, Option<Box<endpoint::Endpoint>>> {
 	let mut special = HashMap::new();
 	special.insert(router::SpecialEndpoint::Rpc, None);
-	special.insert(router::SpecialEndpoint::Utils, Some(apps::utils()));
+	special.insert(router::SpecialEndpoint::Utils, Some(apps::utils(pool)));
 	special.insert(router::SpecialEndpoint::Api, Some(api::RestApi::new(
 		content_fetcher,
 		health,
-		remote,
 	)));
 	special
 }
diff --git a/dapps/src/page/builtin.rs b/dapps/src/page/builtin.rs
index c01c49d21a0c1686f05685d433363274d8af578b..827fe27a3b4e15e09151beec80ffc1261f0fbab1 100644
--- a/dapps/src/page/builtin.rs
+++ b/dapps/src/page/builtin.rs
@@ -14,71 +14,62 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::io;
+use futures::future;
+use futures_cpupool::CpuPool;
+use hyper::mime::{self, Mime};
+use itertools::Itertools;
+use parity_dapps::{WebApp, Info};
+
+use endpoint::{Endpoint, EndpointInfo, EndpointPath, Request, Response};
 use page::{handler, PageCache};
-use std::sync::Arc;
-use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
-use parity_dapps::{WebApp, File, Info};
 use Embeddable;
 
-pub struct PageEndpoint<T : WebApp + 'static> {
+pub struct Dapp<T: WebApp + 'static> {
+	/// futures cpu pool
+	pool: CpuPool,
 	/// Content of the files
-	pub app: Arc<T>,
-	/// Prefix to strip from the path (when `None` deducted from `app_id`)
-	pub prefix: Option<String>,
+	app: T,
 	/// Safe to be loaded in frame by other origin. (use wisely!)
 	safe_to_embed_on: Embeddable,
 	info: EndpointInfo,
 	fallback_to_index_html: bool,
 }
 
-impl<T: WebApp + 'static> PageEndpoint<T> {
-	/// Creates new `PageEndpoint` for builtin (compile time) Dapp.
-	pub fn new(app: T) -> Self {
+impl<T: WebApp + 'static> Dapp<T> {
+	/// Creates new `Dapp` for builtin (compile time) Dapp.
+	pub fn new(pool: CpuPool, app: T) -> Self {
 		let info = app.info();
-		PageEndpoint {
-			app: Arc::new(app),
-			prefix: None,
+		Dapp {
+			pool,
+			app,
 			safe_to_embed_on: None,
 			info: EndpointInfo::from(info),
 			fallback_to_index_html: false,
 		}
 	}
 
-	/// Creates a new `PageEndpoint` for builtin (compile time) Dapp.
+	/// Creates a new `Dapp` for builtin (compile time) Dapp.
 	/// Instead of returning 404 this endpoint will always server index.html.
-	pub fn with_fallback_to_index(app: T) -> Self {
+	pub fn with_fallback_to_index(pool: CpuPool, app: T) -> Self {
 		let info = app.info();
-		PageEndpoint {
-			app: Arc::new(app),
-			prefix: None,
+		Dapp {
+			pool,
+			app,
 			safe_to_embed_on: None,
 			info: EndpointInfo::from(info),
 			fallback_to_index_html: true,
 		}
 	}
 
-	/// Create new `PageEndpoint` and specify prefix that should be removed before looking for a file.
-	/// It's used only for special endpoints (i.e. `/parity-utils/`)
-	/// So `/parity-utils/inject.js` will be resolved to `/inject.js` is prefix is set.
-	pub fn with_prefix(app: T, prefix: String) -> Self {
-		let info = app.info();
-		PageEndpoint {
-			app: Arc::new(app),
-			prefix: Some(prefix),
-			safe_to_embed_on: None,
-			info: EndpointInfo::from(info),
-			fallback_to_index_html: false,
-		}
-	}
-
-	/// Creates new `PageEndpoint` which can be safely used in iframe
+	/// Creates new `Dapp` which can be safely used in iframe
 	/// even from different origin. It might be dangerous (clickjacking).
 	/// Use wisely!
-	pub fn new_safe_to_embed(app: T, address: Embeddable) -> Self {
+	pub fn new_safe_to_embed(pool: CpuPool, app: T, address: Embeddable) -> Self {
 		let info = app.info();
-		PageEndpoint {
-			app: Arc::new(app),
-			prefix: None,
+		Dapp {
+			pool,
+			app,
 			safe_to_embed_on: address,
 			info: EndpointInfo::from(info),
 			fallback_to_index_html: false,
@@ -86,96 +77,84 @@ impl<T: WebApp + 'static> PageEndpoint<T> {
 	}
 }
 
-impl<T: WebApp> Endpoint for PageEndpoint<T> {
-
+impl<T: WebApp> Endpoint for Dapp<T> {
 	fn info(&self) -> Option<&EndpointInfo> {
 		Some(&self.info)
 	}
 
-	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
-		Box::new(handler::PageHandler {
-			app: BuiltinDapp::new(self.app.clone(), self.fallback_to_index_html),
-			prefix: self.prefix.clone(),
-			path: path,
-			file: handler::ServedFile::new(self.safe_to_embed_on.clone()),
+	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
+		trace!(target: "dapps", "Builtin file path: {:?}", path);
+		let file_path = if path.has_no_params() {
+			"index.html".to_owned()
+		} else {
+			path.app_params.into_iter().filter(|x| !x.is_empty()).join("/")
+		};
+		trace!(target: "dapps", "Builtin file: {:?}", file_path);
+
+		let file = {
+			let file = |path| self.app.file(path).map(|file| {
+				let content_type = match file.content_type.parse() {
+					Ok(mime) => mime,
+					Err(_) => {
+						warn!(target: "dapps", "invalid MIME type: {}", file.content_type);
+						mime::TEXT_HTML
+					},
+				};
+				BuiltinFile {
+					content_type,
+					content: io::Cursor::new(file.content),
+				}
+			});
+			let res = file(&file_path);
+			if self.fallback_to_index_html {
+				res.or_else(|| file("index.html"))
+			} else {
+				res
+			}
+		};
+
+		let (reader, response) = handler::PageHandler {
+			file,
 			cache: PageCache::Disabled,
 			safe_to_embed_on: self.safe_to_embed_on.clone(),
-		})
+			allow_js_eval: self.info.allow_js_eval.clone().unwrap_or(false),
+		}.into_response();
+
+		self.pool.spawn(reader).forget();
+
+		Box::new(future::ok(response))
 	}
 }
 
 impl From<Info> for EndpointInfo {
 	fn from(info: Info) -> Self {
 		EndpointInfo {
+			id: None,
 			name: info.name.into(),
 			description: info.description.into(),
 			author: info.author.into(),
 			icon_url: info.icon_url.into(),
+			local_url: None,
 			version: info.version.into(),
+			allow_js_eval: None,
 		}
 	}
 }
 
-struct BuiltinDapp<T: WebApp + 'static> {
-	app: Arc<T>,
-	fallback_to_index_html: bool,
-}
-
-impl<T: WebApp + 'static> BuiltinDapp<T> {
-	fn new(app: Arc<T>, fallback_to_index_html: bool) -> Self {
-		BuiltinDapp {
-			app: app,
-			fallback_to_index_html: fallback_to_index_html,
-		}
-	}
-}
-
-impl<T: WebApp + 'static> handler::Dapp for BuiltinDapp<T> {
-	type DappFile = BuiltinDappFile<T>;
-
-	fn file(&self, path: &str) -> Option<Self::DappFile> {
-		let file = |path| self.app.file(path).map(|_| {
-			BuiltinDappFile {
-				app: self.app.clone(),
-				path: path.into(),
-				write_pos: 0,
-			}
-		});
-		let res = file(path);
-		if self.fallback_to_index_html {
-			res.or_else(|| file("index.html"))
-		} else {
-			res
-		}
-	}
-}
-
-struct BuiltinDappFile<T: WebApp + 'static> {
-	app: Arc<T>,
-	path: String,
-	write_pos: usize,
-}
 
-impl<T: WebApp + 'static> BuiltinDappFile<T> {
-	fn file(&self) -> &File {
-		self.app.file(&self.path).expect("Check is done when structure is created.")
-	}
+struct BuiltinFile {
+	content_type: Mime,
+	content: io::Cursor<&'static [u8]>,
 }
 
-impl<T: WebApp + 'static> handler::DappFile for BuiltinDappFile<T> {
-	fn content_type(&self) -> &str {
-		self.file().content_type
-	}
-
-	fn is_drained(&self) -> bool {
-		self.write_pos == self.file().content.len()
-	}
+impl handler::DappFile for BuiltinFile {
+	type Reader = io::Cursor<&'static [u8]>;
 
-	fn next_chunk(&mut self) -> &[u8] {
-		&self.file().content[self.write_pos..]
+	fn content_type(&self) -> &Mime {
+		&self.content_type
 	}
 
-	fn bytes_written(&mut self, bytes: usize) {
-		self.write_pos += bytes;
+	fn into_reader(self) -> Self::Reader {
+		self.content
 	}
 }
diff --git a/dapps/src/page/handler.rs b/dapps/src/page/handler.rs
index ba38c64dc2640154357524da9c36a16736c871bf..a4bd6d71b3eba02878d9153a9d4040a629517b91 100644
--- a/dapps/src/page/handler.rs
+++ b/dapps/src/page/handler.rs
@@ -14,61 +14,26 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use time::{self, Duration};
+use std::io;
+use std::time::{Duration, SystemTime};
+use hyper::{self, header, StatusCode};
+use hyper::mime::{self, Mime};
 
-use hyper::header;
-use hyper::server;
-use hyper::uri::RequestUri;
-use hyper::net::HttpStream;
-use hyper::status::StatusCode;
-use hyper::{Decoder, Encoder, Next};
-use endpoint::EndpointPath;
-use handlers::{ContentHandler, add_security_headers};
+use apps;
+use handlers::{Reader, ContentHandler, add_security_headers};
 use {Embeddable};
 
 /// Represents a file that can be sent to client.
 /// Implementation should keep track of bytes already sent internally.
-pub trait DappFile: Send {
-	/// Returns a content-type of this file.
-	fn content_type(&self) -> &str;
-
-	/// Checks if all bytes from that file were written.
-	fn is_drained(&self) -> bool;
+pub trait DappFile {
+	/// A reader type returned by this file.
+	type Reader: io::Read;
 
-	/// Fetch next chunk to write to the client.
-	fn next_chunk(&mut self) -> &[u8];
-
-	/// How many files have been written to the client.
-	fn bytes_written(&mut self, bytes: usize);
-}
-
-/// Dapp as a (dynamic) set of files.
-pub trait Dapp: Send + 'static {
-	/// File type
-	type DappFile: DappFile;
-
-	/// Returns file under given path.
-	fn file(&self, path: &str) -> Option<Self::DappFile>;
-}
-
-/// Currently served by `PageHandler` file
-pub enum ServedFile<T: Dapp> {
-	/// File from dapp
-	File(T::DappFile),
-	/// Error (404)
-	Error(ContentHandler),
-}
+	/// Returns a content-type of this file.
+	fn content_type(&self) -> &Mime;
 
-impl<T: Dapp> ServedFile<T> {
-	pub fn new(embeddable_on: Embeddable) -> Self {
-		ServedFile::Error(ContentHandler::error(
-			StatusCode::NotFound,
-			"404 Not Found",
-			"Requested dapp resource was not found.",
-			None,
-			embeddable_on,
-		))
-	}
+	/// Convert this file into io::Read instance.
+	fn into_reader(self) -> Self::Reader where Self: Sized;
 }
 
 /// Defines what cache headers should be appended to returned resources.
@@ -84,194 +49,68 @@ impl Default for PageCache {
 	}
 }
 
-/// A generic type for `PageHandler` allowing to set the URL.
-/// Used by dapps fetching to set the URL after the content was downloaded.
-pub trait PageHandlerWaiting: server::Handler<HttpStream> + Send {
-	fn set_uri(&mut self, uri: &RequestUri);
-}
-
 /// A handler for a single webapp.
 /// Resolves correct paths and serves as a plumbing code between
 /// hyper server and dapp.
-pub struct PageHandler<T: Dapp> {
-	/// A Dapp.
-	pub app: T,
+pub struct PageHandler<T: DappFile> {
 	/// File currently being served
-	pub file: ServedFile<T>,
-	/// Optional prefix to strip from path.
-	pub prefix: Option<String>,
-	/// Requested path.
-	pub path: EndpointPath,
+	pub file: Option<T>,
 	/// Flag indicating if the file can be safely embeded (put in iframe).
 	pub safe_to_embed_on: Embeddable,
 	/// Cache settings for this page.
 	pub cache: PageCache,
+	/// Allow JS unsafe-eval.
+	pub allow_js_eval: bool,
 }
 
-impl<T: Dapp> PageHandlerWaiting for PageHandler<T> {
-	fn set_uri(&mut self, uri: &RequestUri) {
-		trace!(target: "dapps", "Setting URI: {:?}", uri);
-		self.file = match *uri {
-			RequestUri::AbsolutePath { ref path, .. } => {
-				self.app.file(&self.extract_path(path))
-			},
-			RequestUri::AbsoluteUri(ref url) => {
-				self.app.file(&self.extract_path(url.path()))
-			},
-			_ => None,
-		}.map_or_else(|| ServedFile::new(self.safe_to_embed_on.clone()), |f| ServedFile::File(f));
-	}
-}
-
-impl<T: Dapp> PageHandler<T> {
-	fn extract_path(&self, path: &str) -> String {
-		let app_id = &self.path.app_id;
-		let prefix = "/".to_owned() + self.prefix.as_ref().unwrap_or(app_id);
-		let prefix_with_slash = prefix.clone() + "/";
-		let query_pos = path.find('?').unwrap_or_else(|| path.len());
-
-		// Index file support
-		match path == "/" || path == &prefix || path == &prefix_with_slash {
-			true => "index.html".to_owned(),
-			false => if path.starts_with(&prefix_with_slash) {
-				path[prefix_with_slash.len()..query_pos].to_owned()
-			} else if path.starts_with("/") {
-				path[1..query_pos].to_owned()
-			} else {
-				path[0..query_pos].to_owned()
-			}
-		}
-	}
-}
-
-impl<T: Dapp> server::Handler<HttpStream> for PageHandler<T> {
-	fn on_request(&mut self, req: server::Request<HttpStream>) -> Next {
-		self.set_uri(req.uri());
-		Next::write()
-	}
-
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		match self.file {
-			ServedFile::File(ref f) => {
-				res.set_status(StatusCode::Ok);
-
-				if let PageCache::Enabled = self.cache {
-					let mut headers = res.headers_mut();
-					let validity = Duration::days(365);
-					headers.set(header::CacheControl(vec![
-						header::CacheDirective::Public,
-						header::CacheDirective::MaxAge(validity.num_seconds() as u32),
-					]));
-					headers.set(header::Expires(header::HttpDate(time::now() + validity)));
-				}
-
-				match f.content_type().parse() {
-					Ok(mime) => res.headers_mut().set(header::ContentType(mime)),
-					Err(()) => debug!(target: "dapps", "invalid MIME type: {}", f.content_type()),
-				}
-
-				// Security headers:
-				add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.take());
-				Next::write()
-			},
-			ServedFile::Error(ref mut handler) => {
-				handler.on_response(res)
-			}
-		}
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		match self.file {
-			ServedFile::Error(ref mut handler) => handler.on_response_writable(encoder),
-			ServedFile::File(ref f) if f.is_drained() => Next::end(),
-			ServedFile::File(ref mut f) => match encoder.write(f.next_chunk()) {
-				Ok(bytes) => {
-					f.bytes_written(bytes);
-					Next::write()
-				},
-				Err(e) => match e.kind() {
-					::std::io::ErrorKind::WouldBlock => Next::write(),
-					_ => Next::end(),
-				},
+impl<T: DappFile> PageHandler<T> {
+	pub fn into_response(self) -> (Option<Reader<T::Reader>>, hyper::Response) {
+		let file = match self.file {
+			None => return (None, ContentHandler::error(
+				StatusCode::NotFound,
+				"File not found",
+				"Requested file has not been found.",
+				None,
+				self.safe_to_embed_on,
+			).into()),
+			Some(file) => file,
+		};
+
+		let mut res = hyper::Response::new()
+			.with_status(StatusCode::Ok);
+
+		// headers
+		{
+			let mut headers = res.headers_mut();
+
+			if let PageCache::Enabled = self.cache {
+				let validity_secs = 365u32 * 24 * 3600;
+				let validity = Duration::from_secs(validity_secs as u64);
+				headers.set(header::CacheControl(vec![
+					header::CacheDirective::Public,
+					header::CacheDirective::MaxAge(validity_secs),
+				]));
+				headers.set(header::Expires(header::HttpDate::from(SystemTime::now() + validity)));
 			}
-		}
-	}
-}
-
-
-
-#[cfg(test)]
-mod test {
-	use super::*;
 
-	pub struct TestWebAppFile;
+			headers.set(header::ContentType(file.content_type().to_owned()));
 
-	impl DappFile for TestWebAppFile {
-		fn content_type(&self) -> &str {
-			unimplemented!()
+			add_security_headers(&mut headers, self.safe_to_embed_on, self.allow_js_eval);
 		}
 
-		fn is_drained(&self) -> bool {
-			unimplemented!()
-		}
+		let initial_content = if file.content_type().to_owned() == mime::TEXT_HTML {
+			let content = &format!(
+				r#"<script src="/{}/inject.js"></script>"#,
+				apps::UTILS_PATH,
+			);
 
-		fn next_chunk(&mut self) -> &[u8] {
-			unimplemented!()
-		}
+			content.as_bytes().to_vec()
+		} else {
+			Vec::new()
+		};
 
-		fn bytes_written(&mut self, _bytes: usize) {
-			unimplemented!()
-		}
+		let (reader, body) = Reader::pair(file.into_reader(), initial_content);
+		res.set_body(body);
+		(Some(reader), res)
 	}
-
-	#[derive(Default)]
-	pub struct TestWebapp;
-
-	impl Dapp for TestWebapp {
-		type DappFile = TestWebAppFile;
-
-		fn file(&self, _path: &str) -> Option<Self::DappFile> {
-			None
-		}
-	}
-}
-
-#[test]
-fn should_extract_path_with_appid() {
-
-	// given
-	let path1 = "/";
-	let path2= "/test.css";
-	let path3 = "/app/myfile.txt";
-	let path4 = "/app/myfile.txt?query=123";
-	let page_handler = PageHandler {
-		app: test::TestWebapp,
-		prefix: None,
-		path: EndpointPath {
-			app_id: "app".to_owned(),
-			app_params: vec![],
-			host: "".to_owned(),
-			port: 8080,
-			using_dapps_domains: true,
-		},
-		file: ServedFile::new(None),
-		cache: Default::default(),
-		safe_to_embed_on: None,
-	};
-
-	// when
-	let res1 = page_handler.extract_path(path1);
-	let res2 = page_handler.extract_path(path2);
-	let res3 = page_handler.extract_path(path3);
-	let res4 = page_handler.extract_path(path4);
-
-	// then
-	assert_eq!(&res1, "index.html");
-	assert_eq!(&res2, "test.css");
-	assert_eq!(&res3, "myfile.txt");
-	assert_eq!(&res4, "myfile.txt");
 }
diff --git a/dapps/src/page/local.rs b/dapps/src/page/local.rs
index 8d52e86dd1f26ecab2e273360957ba1be6a5d746..a1746efcd2172f5f82ee896a8bccffc2d2ef99d3 100644
--- a/dapps/src/page/local.rs
+++ b/dapps/src/page/local.rs
@@ -15,16 +15,18 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use mime_guess;
-use std::io::{Seek, Read, SeekFrom};
-use std::fs;
+use std::{fs, fmt};
 use std::path::{Path, PathBuf};
-use page::handler::{self, PageCache, PageHandlerWaiting};
-use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
-use mime::Mime;
+use futures::{future};
+use futures_cpupool::CpuPool;
+use page::handler::{self, PageCache};
+use endpoint::{Endpoint, EndpointInfo, EndpointPath, Request, Response};
+use hyper::mime::Mime;
 use Embeddable;
 
-#[derive(Debug, Clone)]
-pub struct LocalPageEndpoint {
+#[derive(Clone)]
+pub struct Dapp {
+	pool: CpuPool,
 	path: PathBuf,
 	mime: Option<Mime>,
 	info: Option<EndpointInfo>,
@@ -32,23 +34,37 @@ pub struct LocalPageEndpoint {
 	embeddable_on: Embeddable,
 }
 
-impl LocalPageEndpoint {
-	pub fn new(path: PathBuf, info: EndpointInfo, cache: PageCache, embeddable_on: Embeddable) -> Self {
-		LocalPageEndpoint {
-			path: path,
+impl fmt::Debug for Dapp {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		fmt.debug_struct("Dapp")
+			.field("path", &self.path)
+			.field("mime", &self.mime)
+			.field("info", &self.info)
+			.field("cache", &self.cache)
+			.field("embeddable_on", &self.embeddable_on)
+			.finish()
+	}
+}
+
+impl Dapp {
+	pub fn new(pool: CpuPool, path: PathBuf, info: EndpointInfo, cache: PageCache, embeddable_on: Embeddable) -> Self {
+		Dapp {
+			pool,
+			path,
 			mime: None,
 			info: Some(info),
-			cache: cache,
-			embeddable_on: embeddable_on,
+			cache,
+			embeddable_on,
 		}
 	}
 
-	pub fn single_file(path: PathBuf, mime: Mime, cache: PageCache) -> Self {
-		LocalPageEndpoint {
-			path: path,
+	pub fn single_file(pool: CpuPool, path: PathBuf, mime: Mime, cache: PageCache) -> Self {
+		Dapp {
+			pool,
+			path,
 			mime: Some(mime),
 			info: None,
-			cache: cache,
+			cache,
 			embeddable_on: None,
 		}
 	}
@@ -57,125 +73,76 @@ impl LocalPageEndpoint {
 		self.path.clone()
 	}
 
-	fn page_handler_with_mime(&self, path: EndpointPath, mime: &Mime) -> handler::PageHandler<LocalSingleFile> {
-		handler::PageHandler {
-			app: LocalSingleFile { path: self.path.clone(), mime: format!("{}", mime) },
-			prefix: None,
-			path: path,
-			file: handler::ServedFile::new(None),
-			safe_to_embed_on: self.embeddable_on.clone(),
-			cache: self.cache,
+	fn get_file(&self, path: &EndpointPath) -> Option<LocalFile> {
+		if let Some(ref mime) = self.mime {
+			return LocalFile::from_path(&self.path, mime.to_owned());
 		}
-	}
 
-	fn page_handler(&self, path: EndpointPath) -> handler::PageHandler<LocalDapp> {
-		handler::PageHandler {
-			app: LocalDapp { path: self.path.clone() },
-			prefix: None,
-			path: path,
-			file: handler::ServedFile::new(None),
-			safe_to_embed_on: self.embeddable_on.clone(),
-			cache: self.cache,
-		}
-	}
+		let mut file_path = self.path.to_owned();
 
-	pub fn to_page_handler(&self, path: EndpointPath) -> Box<PageHandlerWaiting> {
-		if let Some(ref mime) = self.mime {
-			Box::new(self.page_handler_with_mime(path, mime))
+		if path.has_no_params() {
+			file_path.push("index.html");
 		} else {
-			Box::new(self.page_handler(path))
+			for part in &path.app_params {
+				file_path.push(part);
+			}
 		}
-	}
-}
 
-impl Endpoint for LocalPageEndpoint {
-	fn info(&self) -> Option<&EndpointInfo> {
-		self.info.as_ref()
+		let mime = mime_guess::guess_mime_type(&file_path);
+		LocalFile::from_path(&file_path, mime)
 	}
 
-	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
-		if let Some(ref mime) = self.mime {
-			Box::new(self.page_handler_with_mime(path, mime))
-		} else {
-			Box::new(self.page_handler(path))
-		}
-	}
-}
 
-struct LocalSingleFile {
-	path: PathBuf,
-	mime: String,
-}
+	pub fn to_response(&self, path: &EndpointPath) -> Response {
+		let (reader, response) = handler::PageHandler {
+			file: self.get_file(path),
+			cache: self.cache,
+			safe_to_embed_on: self.embeddable_on.clone(),
+			allow_js_eval: self.info.as_ref().and_then(|x| x.allow_js_eval).unwrap_or(false),
+		}.into_response();
 
-impl handler::Dapp for LocalSingleFile {
-	type DappFile = LocalFile;
+		self.pool.spawn(reader).forget();
 
-	fn file(&self, _path: &str) -> Option<Self::DappFile> {
-		LocalFile::from_path(&self.path, Some(&self.mime))
+		Box::new(future::ok(response))
 	}
 }
 
-struct LocalDapp {
-	path: PathBuf,
-}
-
-impl handler::Dapp for LocalDapp {
-	type DappFile = LocalFile;
+impl Endpoint for Dapp {
+	fn info(&self) -> Option<&EndpointInfo> {
+		self.info.as_ref()
+	}
 
-	fn file(&self, file_path: &str) -> Option<Self::DappFile> {
-		let mut path = self.path.clone();
-		for part in file_path.split('/') {
-			path.push(part);
-		}
-		LocalFile::from_path(&path, None)
+	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
+		self.to_response(&path)
 	}
 }
 
 struct LocalFile {
-	content_type: String,
-	buffer: [u8; 4096],
+	content_type: Mime,
 	file: fs::File,
-	len: u64,
-	pos: u64,
 }
 
 impl LocalFile {
-	fn from_path<P: AsRef<Path>>(path: P, mime: Option<&str>) -> Option<Self> {
+	fn from_path<P: AsRef<Path>>(path: P, content_type: Mime) -> Option<Self> {
+		trace!(target: "dapps", "Local file: {:?}", path.as_ref());
 		// Check if file exists
 		fs::File::open(&path).ok().map(|file| {
-			let content_type = mime.map(|mime| mime.to_owned())
-				.unwrap_or_else(|| mime_guess::guess_mime_type(path).to_string());
-			let len = file.metadata().ok().map_or(0, |meta| meta.len());
 			LocalFile {
-				content_type: content_type,
-				buffer: [0; 4096],
-				file: file,
-				pos: 0,
-				len: len,
+				content_type,
+				file,
 			}
 		})
 	}
 }
 
 impl handler::DappFile for LocalFile {
-	fn content_type(&self) -> &str {
-		&self.content_type
-	}
+	type Reader = fs::File;
 
-	fn is_drained(&self) -> bool {
-		self.pos == self.len
-	}
-
-	fn next_chunk(&mut self) -> &[u8] {
-		let _ = self.file.seek(SeekFrom::Start(self.pos));
-		if let Ok(n) = self.file.read(&mut self.buffer) {
-			&self.buffer[0..n]
-		} else {
-			&self.buffer[0..0]
-		}
+	fn content_type(&self) -> &Mime {
+		&self.content_type
 	}
 
-	fn bytes_written(&mut self, bytes: usize) {
-		self.pos += bytes as u64;
+	fn into_reader(self) -> Self::Reader {
+		self.file
 	}
 }
diff --git a/dapps/src/page/mod.rs b/dapps/src/page/mod.rs
index 868cd00a386719f415b348d5c594157a47df73c0..420707bfe1955513d59dd8299c72d3638b1345c4 100644
--- a/dapps/src/page/mod.rs
+++ b/dapps/src/page/mod.rs
@@ -15,11 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 
-mod builtin;
-mod local;
+pub mod builtin;
+pub mod local;
 mod handler;
 
-pub use self::local::LocalPageEndpoint;
-pub use self::builtin::PageEndpoint;
-pub use self::handler::{PageCache, PageHandlerWaiting};
+pub use self::handler::PageCache;
 
diff --git a/dapps/src/proxypac.rs b/dapps/src/proxypac.rs
index 5bffe649c90a5c7597f4d3ee3eb9fbacf21a8d98..85ac11423a11ed4525ab80f2e19af88c184c8da9 100644
--- a/dapps/src/proxypac.rs
+++ b/dapps/src/proxypac.rs
@@ -16,9 +16,11 @@
 
 //! Serving ProxyPac file
 
-use endpoint::{Endpoint, Handler, EndpointPath};
-use handlers::ContentHandler;
 use apps::HOME_PAGE;
+use endpoint::{Endpoint, Request, Response, EndpointPath};
+use futures::future;
+use handlers::ContentHandler;
+use hyper::mime;
 use {address, Embeddable};
 
 pub struct ProxyPac {
@@ -33,7 +35,7 @@ impl ProxyPac {
 }
 
 impl Endpoint for ProxyPac {
-	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
+	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
 		let ui = self.embeddable
 			.as_ref()
 			.map(|ref parent| address(&parent.host, parent.port))
@@ -57,7 +59,9 @@ function FindProxyForURL(url, host) {{
 "#,
 		HOME_PAGE, self.dapps_domain, path.host, path.port, ui);
 
-		Box::new(ContentHandler::ok(content, mime!(Application/Javascript)))
+		Box::new(future::ok(
+			ContentHandler::ok(content, mime::TEXT_JAVASCRIPT).into()
+		))
 	}
 }
 
diff --git a/dapps/src/router.rs b/dapps/src/router.rs
index 2b74d51dfde2cbf1d29fa9505647e4495cc70136..e5770ca72b8f77578d21cdf646499da8930e3af2 100644
--- a/dapps/src/router.rs
+++ b/dapps/src/router.rs
@@ -17,18 +17,16 @@
 //! Router implementation
 //! Dispatch requests to proper application.
 
-use std::cmp;
 use std::sync::Arc;
 use std::collections::HashMap;
 
-use url::{Url, Host};
-use hyper::{self, server, header, Control};
-use hyper::net::HttpStream;
+use futures::future;
+use hyper::{self, header, Uri};
 use jsonrpc_http_server as http;
 
 use apps;
 use apps::fetcher::Fetcher;
-use endpoint::{Endpoint, EndpointPath, Handler};
+use endpoint::{self, Endpoint, EndpointPath};
 use Endpoints;
 use handlers;
 use Embeddable;
@@ -43,6 +41,13 @@ pub enum SpecialEndpoint {
 	None,
 }
 
+enum Response {
+	Some(endpoint::Response),
+	None(hyper::Request),
+}
+
+/// An endpoint router.
+/// Dispatches the request to particular Endpoint by requested uri/path.
 pub struct Router {
 	endpoints: Option<Endpoints>,
 	fetch: Arc<Fetcher>,
@@ -52,11 +57,10 @@ pub struct Router {
 }
 
 impl Router {
-	fn resolve_request(&self, req: &server::Request<HttpStream>, control: Control, refresh_dapps: bool) -> (bool, Option<Box<Handler>>) {
+	fn resolve_request(&self, req: hyper::Request, refresh_dapps: bool) -> (bool, Response) {
 		// Choose proper handler depending on path / domain
-		let url = handlers::extract_url(req);
-		let endpoint = extract_endpoint(&url, &self.dapps_domain);
-		let referer = extract_referer_endpoint(req, &self.dapps_domain);
+		let endpoint = extract_endpoint(req.uri(), req.headers().get(), &self.dapps_domain);
+		let referer = extract_referer_endpoint(&req, &self.dapps_domain);
 		let is_utils = endpoint.1 == SpecialEndpoint::Utils;
 		let is_get_request = *req.method() == hyper::Method::Get;
 		let is_head_request = *req.method() == hyper::Method::Head;
@@ -64,47 +68,51 @@ impl Router {
 			.as_ref()
 			.map_or(false, |endpoints| endpoints.endpoints.read().contains_key(dapp));
 
-		trace!(target: "dapps", "Routing request to {:?}. Details: {:?}", url, req);
-		debug!(target: "dapps", "Handling endpoint request: {:?}", endpoint);
+		trace!(target: "dapps", "Routing request to {:?}. Details: {:?}", req.uri(), req);
+		debug!(target: "dapps", "Handling endpoint request: {:?}, referer: {:?}", endpoint, referer);
 
 		(is_utils, match (endpoint.0, endpoint.1, referer) {
 			// Handle invalid web requests that we can recover from
-			(ref path, SpecialEndpoint::None, Some((ref referer, ref referer_url)))
+			(ref path, SpecialEndpoint::None, Some(ref referer))
 				if referer.app_id == apps::WEB_PATH
 					&& has_dapp(apps::WEB_PATH)
 					&& !is_web_endpoint(path)
 				=>
 			{
-				trace!(target: "dapps", "Redirecting to correct web request: {:?}", referer_url);
-				let len = cmp::min(referer_url.path.len(), 2); // /web/<encoded>/
-				let base = referer_url.path[..len].join("/");
-				let requested = url.map(|u| u.path.join("/")).unwrap_or_default();
-				Some(handlers::Redirection::boxed(&format!("/{}/{}", base, requested)))
+				let token = referer.app_params.get(0).map(String::as_str).unwrap_or("");
+				let requested = req.uri().path();
+				let query = req.uri().query().map_or_else(String::new, |query| format!("?{}", query));
+				let redirect_url = format!("/{}/{}{}{}", apps::WEB_PATH, token, requested, query);
+				trace!(target: "dapps", "Redirecting to correct web request: {:?}", redirect_url);
+				Response::Some(Box::new(future::ok(
+					handlers::Redirection::new(redirect_url).into()
+				)))
 			},
 			// First check special endpoints
 			(ref path, ref endpoint, _) if self.special.contains_key(endpoint) => {
 				trace!(target: "dapps", "Resolving to special endpoint.");
-				self.special.get(endpoint)
-					.expect("special known to contain key; qed")
-					.as_ref()
-					.map(|special| special.to_async_handler(path.clone().unwrap_or_default(), control))
+				let special = self.special.get(endpoint).expect("special known to contain key; qed");
+				match *special {
+					Some(ref special) => Response::Some(special.respond(path.clone().unwrap_or_default(), req)),
+					None => Response::None(req),
+				}
 			},
 			// Then delegate to dapp
 			(Some(ref path), _, _) if has_dapp(&path.app_id) => {
 				trace!(target: "dapps", "Resolving to local/builtin dapp.");
-				Some(self.endpoints
+				Response::Some(self.endpoints
 					.as_ref()
 					.expect("endpoints known to be set; qed")
 					.endpoints
 					.read()
 					.get(&path.app_id)
 					.expect("endpoints known to contain key; qed")
-					.to_async_handler(path.clone(), control))
+					.respond(path.clone(), req))
 			},
 			// Try to resolve and fetch the dapp
 			(Some(ref path), _, _) if self.fetch.contains(&path.app_id) => {
 				trace!(target: "dapps", "Resolving to fetchable content.");
-				Some(self.fetch.to_async_handler(path.clone(), control))
+				Response::Some(self.fetch.respond(path.clone(), req))
 			},
 			// 404 for non-existent content (only if serving endpoints and not homepage)
 			(Some(ref path), _, _)
@@ -117,45 +125,51 @@ impl Router {
 				if refresh_dapps {
 					debug!(target: "dapps", "Refreshing dapps and re-trying.");
 					self.endpoints.as_ref().map(|endpoints| endpoints.refresh_local_dapps());
-					return self.resolve_request(req, control, false)
+					return self.resolve_request(req, false);
 				} else {
-					Some(Box::new(handlers::ContentHandler::error(
+					Response::Some(Box::new(future::ok(handlers::ContentHandler::error(
 						hyper::StatusCode::NotFound,
 						"404 Not Found",
 						"Requested content was not found.",
 						None,
 						self.embeddable_on.clone(),
-					)))
+					).into())))
 				}
 			},
 			// Any other GET|HEAD requests to home page.
 			_ if (is_get_request || is_head_request) && self.special.contains_key(&SpecialEndpoint::Home) => {
-				self.special.get(&SpecialEndpoint::Home)
-					.expect("special known to contain key; qed")
-					.as_ref()
-					.map(|special| special.to_async_handler(Default::default(), control))
+				trace!(target: "dapps", "Resolving to home page.");
+				let special = self.special.get(&SpecialEndpoint::Home).expect("special known to contain key; qed");
+				match *special {
+					Some(ref special) => {
+						let mut endpoint = EndpointPath::default();
+						endpoint.app_params = req.uri().path().split('/').map(str::to_owned).collect();
+						Response::Some(special.respond(endpoint, req))
+					},
+					None => Response::None(req),
+				}
 			},
 			// RPC by default
 			_ => {
 				trace!(target: "dapps", "Resolving to RPC call.");
-				None
+				Response::None(req)
 			}
 		})
 	}
 }
 
 impl http::RequestMiddleware for Router {
-	fn on_request(&self, req: &server::Request<HttpStream>, control: &Control) -> http::RequestMiddlewareAction {
-		let control = control.clone();
+	fn on_request(&self, req: hyper::Request) -> http::RequestMiddlewareAction {
 		let is_origin_set = req.headers().get::<header::Origin>().is_some();
-		let (is_utils, handler) = self.resolve_request(req, control, self.endpoints.is_some());
-		match handler {
-			Some(handler) => http::RequestMiddlewareAction::Respond {
+		let (is_utils, response) = self.resolve_request(req, self.endpoints.is_some());
+		match response {
+			Response::Some(response) => http::RequestMiddlewareAction::Respond {
 				should_validate_hosts: !is_utils,
-				handler: handler,
+				response,
 			},
-			None => http::RequestMiddlewareAction::Proceed {
+			Response::None(request) => http::RequestMiddlewareAction::Proceed {
 				should_continue_on_invalid_cors: !is_origin_set,
+				request,
 			},
 		}
 	}
@@ -186,41 +200,44 @@ fn is_web_endpoint(path: &Option<EndpointPath>) -> bool {
 	}
 }
 
-fn extract_referer_endpoint(req: &server::Request<HttpStream>, dapps_domain: &str) -> Option<(EndpointPath, Url)> {
+fn extract_referer_endpoint(req: &hyper::Request, dapps_domain: &str) -> Option<EndpointPath> {
 	let referer = req.headers().get::<header::Referer>();
 
-	let url = referer.and_then(|referer| Url::parse(&referer.0).ok());
+	let url = referer.and_then(|referer| referer.parse().ok());
 	url.and_then(|url| {
-		let option = Some(url);
-		extract_url_referer_endpoint(&option, dapps_domain).or_else(|| {
-			extract_endpoint(&option, dapps_domain).0.map(|endpoint| (endpoint, option.expect("Just wrapped; qed")))
+		extract_url_referer_endpoint(&url, dapps_domain).or_else(|| {
+			extract_endpoint(&url, None, dapps_domain).0
 		})
 	})
 }
 
-fn extract_url_referer_endpoint(url: &Option<Url>, dapps_domain: &str) -> Option<(EndpointPath, Url)> {
-	let query = url.as_ref().and_then(|url| url.query.as_ref());
-	match (url, query) {
-		(&Some(ref url), Some(ref query)) if query.starts_with(apps::URL_REFERER) => {
-			let referer_url = format!("http://{}:{}/{}", url.host, url.port, &query[apps::URL_REFERER.len()..]);
+fn extract_url_referer_endpoint(url: &Uri, dapps_domain: &str) -> Option<EndpointPath> {
+	let query = url.query();
+	match query {
+		Some(query) if query.starts_with(apps::URL_REFERER) => {
+			let scheme = url.scheme().unwrap_or("http");
+			let host = url.host().unwrap_or("unknown");
+			let port = default_port(url, None);
+			let referer_url = format!("{}://{}:{}/{}", scheme, host, port, &query[apps::URL_REFERER.len()..]);
 			debug!(target: "dapps", "Recovering referer from query parameter: {}", referer_url);
 
-			let referer_url = Url::parse(&referer_url).ok();
-			extract_endpoint(&referer_url, dapps_domain).0.map(|endpoint| {
-				(endpoint, referer_url.expect("Endpoint returned only when url `is_some`").clone())
-			})
+			if let Some(referer_url) = referer_url.parse().ok() {
+				extract_endpoint(&referer_url, None, dapps_domain).0
+			} else {
+				None
+			}
 		},
 		_ => None,
 	}
 }
 
-fn extract_endpoint(url: &Option<Url>, dapps_domain: &str) -> (Option<EndpointPath>, SpecialEndpoint) {
-	fn special_endpoint(url: &Url) -> SpecialEndpoint {
-		if url.path.len() <= 1 {
+fn extract_endpoint(url: &Uri, extra_host: Option<&header::Host>, dapps_domain: &str) -> (Option<EndpointPath>, SpecialEndpoint) {
+	fn special_endpoint(path: &[&str]) -> SpecialEndpoint {
+		if path.len() <= 1 {
 			return SpecialEndpoint::None;
 		}
 
-		match url.path[0].as_ref() {
+		match path[0].as_ref() {
 			apps::RPC_PATH => SpecialEndpoint::Rpc,
 			apps::API_PATH => SpecialEndpoint::Api,
 			apps::UTILS_PATH => SpecialEndpoint::Utils,
@@ -229,114 +246,162 @@ fn extract_endpoint(url: &Option<Url>, dapps_domain: &str) -> (Option<EndpointPa
 		}
 	}
 
-	match *url {
-		Some(ref url) => match url.host {
-			Host::Domain(ref domain) if domain.ends_with(dapps_domain) => {
-				let id = &domain[0..(domain.len() - dapps_domain.len())];
-				let (id, params) = if let Some(split) = id.rfind('.') {
-					let (params, id) = id.split_at(split);
-					(id[1..].to_owned(), [params.to_owned()].into_iter().chain(&url.path).cloned().collect())
-				} else {
-					(id.to_owned(), url.path.clone())
-				};
-
-				(Some(EndpointPath {
-					app_id: id,
-					app_params: params,
-					host: domain.clone(),
-					port: url.port,
-					using_dapps_domains: true,
-				}), special_endpoint(url))
-			},
-			_ if url.path.len() > 1 => {
-				let id = url.path[0].to_owned();
-				(Some(EndpointPath {
-					app_id: id,
-					app_params: url.path[1..].to_vec(),
-					host: format!("{}", url.host),
-					port: url.port,
-					using_dapps_domains: false,
-				}), special_endpoint(url))
-			},
-			_ => (None, special_endpoint(url)),
+	let port = default_port(url, extra_host.as_ref().and_then(|h| h.port()));
+	let host = url.host().or_else(|| extra_host.as_ref().map(|h| h.hostname()));
+	let query = url.query().map(str::to_owned);
+	let mut path_segments = url.path().split('/').skip(1).collect::<Vec<_>>();
+	trace!(
+		target: "dapps",
+		"Extracting endpoint from: {:?} (dapps: {}). Got host {:?}:{} with path {:?}",
+		url, dapps_domain, host, port, path_segments
+	);
+	match host {
+		Some(host) if host.ends_with(dapps_domain) => {
+			let id = &host[0..(host.len() - dapps_domain.len())];
+			let special = special_endpoint(&path_segments);
+
+			// remove special endpoint id from params
+			if special != SpecialEndpoint::None {
+				path_segments.remove(0);
+			}
+
+			let (app_id, app_params) = if let Some(split) = id.rfind('.') {
+				let (params, id) = id.split_at(split);
+				path_segments.insert(0, params);
+				(id[1..].to_owned(), path_segments)
+			} else {
+				(id.to_owned(), path_segments)
+			};
+
+			(Some(EndpointPath {
+				app_id,
+				app_params: app_params.into_iter().map(Into::into).collect(),
+				query,
+				host: host.to_owned(),
+				port,
+				using_dapps_domains: true,
+			}), special)
+		},
+		Some(host) if path_segments.len() > 1 => {
+			let special = special_endpoint(&path_segments);
+			let id = path_segments.remove(0);
+			(Some(EndpointPath {
+				app_id: id.to_owned(),
+				app_params: path_segments.into_iter().map(Into::into).collect(),
+				query,
+				host: host.to_owned(),
+				port,
+				using_dapps_domains: false,
+			}), special)
 		},
-		_ => (None, SpecialEndpoint::None)
+		_ => (None, special_endpoint(&path_segments)),
 	}
 }
 
-#[test]
-fn should_extract_endpoint() {
-	let dapps_domain = ".web3.site";
-	assert_eq!(extract_endpoint(&None, dapps_domain), (None, SpecialEndpoint::None));
-
-	// With path prefix
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://localhost:8080/status/index.html").ok(), dapps_domain),
-		(Some(EndpointPath {
-			app_id: "status".to_owned(),
-			app_params: vec!["index.html".to_owned()],
-			host: "localhost".to_owned(),
-			port: 8080,
-			using_dapps_domains: false,
-		}), SpecialEndpoint::None)
-	);
+fn default_port(url: &Uri, extra_port: Option<u16>) -> u16 {
+	let scheme = url.scheme().unwrap_or("http");
+	url.port().or(extra_port).unwrap_or_else(|| match scheme {
+		"http" => 80,
+		"https" => 443,
+		_ => 80,
+	})
+}
 
-	// With path prefix
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://localhost:8080/rpc/").ok(), dapps_domain),
-		(Some(EndpointPath {
-			app_id: "rpc".to_owned(),
-			app_params: vec!["".to_owned()],
-			host: "localhost".to_owned(),
-			port: 8080,
-			using_dapps_domains: false,
-		}), SpecialEndpoint::Rpc)
-	);
+#[cfg(test)]
+mod tests {
+	use super::{SpecialEndpoint, EndpointPath, extract_endpoint};
 
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.web3.site/parity-utils/inject.js").ok(), dapps_domain),
-		(Some(EndpointPath {
-			app_id: "status".to_owned(),
-			app_params: vec!["my".to_owned(), "parity-utils".into(), "inject.js".into()],
-			host: "my.status.web3.site".to_owned(),
-			port: 80,
-			using_dapps_domains: true,
-		}), SpecialEndpoint::Utils)
-	);
+	#[test]
+	fn should_extract_endpoint() {
+		let dapps_domain = ".web3.site";
 
-	// By Subdomain
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://status.web3.site/test.html").ok(), dapps_domain),
-		(Some(EndpointPath {
-			app_id: "status".to_owned(),
-			app_params: vec!["test.html".to_owned()],
-			host: "status.web3.site".to_owned(),
-			port: 80,
-			using_dapps_domains: true,
-		}), SpecialEndpoint::None)
-	);
+		// With path prefix
+		assert_eq!(
+			extract_endpoint(&"http://localhost:8080/status/index.html?q=1".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["index.html".to_owned()],
+				query: Some("q=1".into()),
+				host: "localhost".to_owned(),
+				port: 8080,
+				using_dapps_domains: false,
+			}), SpecialEndpoint::None)
+		);
 
-	// RPC by subdomain
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.web3.site/rpc/").ok(), dapps_domain),
-		(Some(EndpointPath {
-			app_id: "status".to_owned(),
-			app_params: vec!["my".to_owned(), "rpc".into(), "".into()],
-			host: "my.status.web3.site".to_owned(),
-			port: 80,
-			using_dapps_domains: true,
-		}), SpecialEndpoint::Rpc)
-	);
+		// With path prefix
+		assert_eq!(
+			extract_endpoint(&"http://localhost:8080/rpc/".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "rpc".to_owned(),
+				app_params: vec!["".to_owned()],
+				query: None,
+				host: "localhost".to_owned(),
+				port: 8080,
+				using_dapps_domains: false,
+			}), SpecialEndpoint::Rpc)
+		);
 
-	// API by subdomain
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.web3.site/api/").ok(), dapps_domain),
-		(Some(EndpointPath {
-			app_id: "status".to_owned(),
-			app_params: vec!["my".to_owned(), "api".into(), "".into()],
-			host: "my.status.web3.site".to_owned(),
-			port: 80,
-			using_dapps_domains: true,
-		}), SpecialEndpoint::Api)
-	);
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/parity-utils/inject.js".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "inject.js".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::Utils)
+		);
+
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/inject.js".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "inject.js".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::None)
+		);
+
+		// By Subdomain
+		assert_eq!(
+			extract_endpoint(&"http://status.web3.site/test.html".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["test.html".to_owned()],
+				query: None,
+				host: "status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::None)
+		);
+
+		// RPC by subdomain
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/rpc/".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::Rpc)
+		);
+
+		// API by subdomain
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/api/".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::Api)
+		);
+	}
 }
diff --git a/dapps/src/tests/api.rs b/dapps/src/tests/api.rs
index b75cd25f29e226d964d21f3e6b157fe30e19efdc..3ae3f7cbbf88da4febf11e689c13f2ecb845d6cc 100644
--- a/dapps/src/tests/api.rs
+++ b/dapps/src/tests/api.rs
@@ -49,6 +49,7 @@ fn should_handle_ping() {
 		"\
 			POST /api/ping HTTP/1.1\r\n\
 			Host: home.parity\r\n\
+			Content-Type: application/json\r\n\
 			Connection: close\r\n\
 			\r\n\
 			{}
diff --git a/dapps/src/tests/fetch.rs b/dapps/src/tests/fetch.rs
index f123231554c86e97e923750ab16bfea99ef602c9..59eeaf8d662e6fcef7df2a3d3197845609dac380 100644
--- a/dapps/src/tests/fetch.rs
+++ b/dapps/src/tests/fetch.rs
@@ -18,7 +18,7 @@ use devtools::http_client;
 use rustc_hex::FromHex;
 use tests::helpers::{
 	serve_with_registrar, serve_with_registrar_and_sync, serve_with_fetch,
-	serve_with_registrar_and_fetch, serve_with_registrar_and_fetch_and_threads,
+	serve_with_registrar_and_fetch,
 	request, assert_security_headers_for_embed,
 };
 
@@ -166,26 +166,31 @@ fn should_return_fetched_dapp_content() {
 
 	response1.assert_status("HTTP/1.1 200 OK");
 	assert_security_headers_for_embed(&response1.headers);
-	assert_eq!(
-		response1.body,
-		r#"18
+	assert!(
+		response1.body.contains(r#"18
 <h1>Hello Gavcoin!</h1>
 
-"#
+0
+
+"#),
+		"Expected Gavcoin body: {}",
+		response1.body
 	);
 
 	response2.assert_status("HTTP/1.1 200 OK");
 	assert_security_headers_for_embed(&response2.headers);
 	assert_eq!(
 		response2.body,
-		r#"BE
+		r#"EA
 {
   "id": "9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a",
   "name": "Gavcoin",
   "description": "Gavcoin",
   "version": "1.0.0",
   "author": "",
-  "iconUrl": "icon.png"
+  "iconUrl": "icon.png",
+  "localUrl": null,
+  "allowJsEval": false
 }
 0
 
@@ -257,7 +262,7 @@ fn should_not_request_content_twice() {
 	use std::thread;
 
 	// given
-	let (server, fetch, registrar) = serve_with_registrar_and_fetch_and_threads(true);
+	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
 	let gavcoin = GAVCOIN_ICON.from_hex().unwrap();
 	registrar.set_result(
 		"2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e".parse().unwrap(),
diff --git a/dapps/src/tests/helpers/fetch.rs b/dapps/src/tests/helpers/fetch.rs
index e6e875c51441c5853fbedb24115afc58ec50bbc6..dfe523200e45e06005b49cc47c95b5af874a57c0 100644
--- a/dapps/src/tests/helpers/fetch.rs
+++ b/dapps/src/tests/helpers/fetch.rs
@@ -14,12 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{io, thread, time};
+use std::{thread, time};
 use std::sync::{atomic, mpsc, Arc};
-use util::Mutex;
+use parking_lot::Mutex;
+use hyper;
 
 use futures::{self, Future};
-use fetch::{self, Fetch};
+use fetch::{self, Fetch, Url};
 
 pub struct FetchControl {
 	sender: mpsc::Sender<()>,
@@ -94,13 +95,10 @@ impl FakeFetch {
 }
 
 impl Fetch for FakeFetch {
-	type Result = futures::BoxFuture<fetch::Response, fetch::Error>;
+	type Result = Box<Future<Item = fetch::Response, Error = fetch::Error> + Send>;
 
-	fn new() -> Result<Self, fetch::Error> where Self: Sized {
-		Ok(FakeFetch::default())
-	}
-
-	fn fetch_with_abort(&self, url: &str, _abort: fetch::Abort) -> Self::Result {
+	fn fetch(&self, url: &str, abort: fetch::Abort) -> Self::Result {
+		let u = Url::parse(url).unwrap();
 		self.requested.lock().push(url.into());
 		let manual = self.manual.clone();
 		let response = self.response.clone();
@@ -111,12 +109,10 @@ impl Fetch for FakeFetch {
 				// wait for manual resume
 				let _ = rx.recv();
 			}
-
 			let data = response.lock().take().unwrap_or(b"Some content");
-			let cursor = io::Cursor::new(data);
-			tx.send(fetch::Response::from_reader(cursor)).unwrap();
+			tx.send(fetch::Response::new(u, hyper::Response::new().with_body(data), abort)).unwrap();
 		});
 
-		rx.map_err(|_| fetch::Error::Aborted).boxed()
+		Box::new(rx.map_err(|_| fetch::Error::Aborted))
 	}
 }
diff --git a/dapps/src/tests/helpers/mod.rs b/dapps/src/tests/helpers/mod.rs
index 6f4652351ab9c9381c8dc15e233d629cbda5422c..3a1311578c7c776c28e21c334a223981b7cf2d35 100644
--- a/dapps/src/tests/helpers/mod.rs
+++ b/dapps/src/tests/helpers/mod.rs
@@ -14,20 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::env;
-use std::str;
+use std::{env, io, str};
 use std::net::SocketAddr;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use env_logger::LogBuilder;
 use jsonrpc_core::IoHandler;
 use jsonrpc_http_server::{self as http, Host, DomainsValidation};
+use parity_reactor::Remote;
 
 use devtools::http_client;
-use hash_fetch::urlhint::ContractClient;
+use registrar::{RegistrarClient, Asynchronous};
 use fetch::{Fetch, Client as FetchClient};
 use node_health::{NodeHealth, TimeChecker, CpuPool};
-use parity_reactor::Remote;
 
 use {Middleware, SyncStatus, WebProxyTokens};
 
@@ -55,7 +54,7 @@ fn init_logger() {
 	}
 }
 
-pub fn init_server<F, B>(process: F, io: IoHandler, remote: Remote) -> (Server, Arc<FakeRegistrar>) where
+pub fn init_server<F, B>(process: F, io: IoHandler) -> (Server, Arc<FakeRegistrar>) where
 	F: FnOnce(ServerBuilder) -> ServerBuilder<B>,
 	B: Fetch,
 {
@@ -64,11 +63,9 @@ pub fn init_server<F, B>(process: F, io: IoHandler, remote: Remote) -> (Server,
 	let mut dapps_path = env::temp_dir();
 	dapps_path.push("non-existent-dir-to-prevent-fs-files-from-loading");
 
-	let server = process(ServerBuilder::new(
-		&dapps_path, registrar.clone(), remote,
-	))
-		.signer_address(Some(("127.0.0.1".into(), SIGNER_PORT)))
-		.start_unsecured_http(&"127.0.0.1:0".parse().unwrap(), io).unwrap();
+	let mut builder = ServerBuilder::new(FetchClient::new().unwrap(), &dapps_path, registrar.clone());
+	builder.signer_address = Some(("127.0.0.1".into(), SIGNER_PORT));
+	let server = process(builder).start_unsecured_http(&"127.0.0.1:0".parse().unwrap(), io).unwrap();
 	(
 		server,
 		registrar,
@@ -76,34 +73,34 @@ pub fn init_server<F, B>(process: F, io: IoHandler, remote: Remote) -> (Server,
 }
 
 pub fn serve_with_rpc(io: IoHandler) -> Server {
-	init_server(|builder| builder, io, Remote::new_sync()).0
+	init_server(|builder| builder, io).0
 }
 
 pub fn serve_hosts(hosts: Option<Vec<String>>) -> Server {
 	let hosts = hosts.map(|hosts| hosts.into_iter().map(Into::into).collect());
-	init_server(|builder| builder.allowed_hosts(hosts.into()), Default::default(), Remote::new_sync()).0
+	init_server(|mut builder| {
+		builder.allowed_hosts = hosts.into();
+		builder
+	}, Default::default()).0
 }
 
 pub fn serve_with_registrar() -> (Server, Arc<FakeRegistrar>) {
-	init_server(|builder| builder, Default::default(), Remote::new_sync())
+	init_server(|builder| builder, Default::default())
 }
 
 pub fn serve_with_registrar_and_sync() -> (Server, Arc<FakeRegistrar>) {
-	init_server(|builder| {
-		builder.sync_status(Arc::new(FakeSync(true)))
-	}, Default::default(), Remote::new_sync())
+	init_server(|mut builder| {
+		builder.sync_status = Arc::new(FakeSync(true));
+		builder
+	}, Default::default())
 }
 
 pub fn serve_with_registrar_and_fetch() -> (Server, FakeFetch, Arc<FakeRegistrar>) {
-	serve_with_registrar_and_fetch_and_threads(false)
-}
-
-pub fn serve_with_registrar_and_fetch_and_threads(multi_threaded: bool) -> (Server, FakeFetch, Arc<FakeRegistrar>) {
 	let fetch = FakeFetch::default();
 	let f = fetch.clone();
 	let (server, reg) = init_server(move |builder| {
 		builder.fetch(f.clone())
-	}, Default::default(), if multi_threaded { Remote::new_thread_per_future() } else { Remote::new_sync() });
+	}, Default::default());
 
 	(server, fetch, reg)
 }
@@ -111,19 +108,25 @@ pub fn serve_with_registrar_and_fetch_and_threads(multi_threaded: bool) -> (Serv
 pub fn serve_with_fetch(web_token: &'static str, domain: &'static str) -> (Server, FakeFetch) {
 	let fetch = FakeFetch::default();
 	let f = fetch.clone();
-	let (server, _) = init_server(move |builder| {
-		builder
-			.fetch(f.clone())
-			.web_proxy_tokens(Arc::new(move |token| {
-				if &token == web_token { Some(domain.into()) } else { None }
-			}))
-	}, Default::default(), Remote::new_sync());
+	let (server, _) = init_server(move |mut builder| {
+		builder.web_proxy_tokens = Arc::new(move |token| {
+			if &token == web_token { Some(domain.into()) } else { None }
+		});
+		builder.fetch(f.clone())
+	}, Default::default());
 
 	(server, fetch)
 }
 
 pub fn serve() -> Server {
-	init_server(|builder| builder, Default::default(), Remote::new_sync()).0
+	init_server(|builder| builder, Default::default()).0
+}
+
+pub fn serve_ui() -> Server {
+	init_server(|mut builder| {
+		builder.serve_ui = true;
+		builder
+	}, Default::default()).0
 }
 
 pub fn request(server: Server, request: &str) -> http_client::Response {
@@ -141,18 +144,18 @@ pub fn assert_security_headers_for_embed(headers: &[String]) {
 /// Webapps HTTP+RPC server build.
 pub struct ServerBuilder<T: Fetch = FetchClient> {
 	dapps_path: PathBuf,
-	registrar: Arc<ContractClient>,
+	registrar: Arc<RegistrarClient<Call=Asynchronous>>,
 	sync_status: Arc<SyncStatus>,
 	web_proxy_tokens: Arc<WebProxyTokens>,
 	signer_address: Option<(String, u16)>,
 	allowed_hosts: DomainsValidation<Host>,
-	remote: Remote,
-	fetch: Option<T>,
+	fetch: T,
+	serve_ui: bool,
 }
 
 impl ServerBuilder {
 	/// Construct new dapps server
-	pub fn new<P: AsRef<Path>>(dapps_path: P, registrar: Arc<ContractClient>, remote: Remote) -> Self {
+	pub fn new<P: AsRef<Path>>(fetch: FetchClient, dapps_path: P, registrar: Arc<RegistrarClient<Call=Asynchronous>>) -> Self {
 		ServerBuilder {
 			dapps_path: dapps_path.as_ref().to_owned(),
 			registrar: registrar,
@@ -160,8 +163,8 @@ impl ServerBuilder {
 			web_proxy_tokens: Arc::new(|_| None),
 			signer_address: None,
 			allowed_hosts: DomainsValidation::Disabled,
-			remote: remote,
-			fetch: None,
+			fetch: fetch,
+			serve_ui: false,
 		}
 	}
 }
@@ -176,41 +179,14 @@ impl<T: Fetch> ServerBuilder<T> {
 			web_proxy_tokens: self.web_proxy_tokens,
 			signer_address: self.signer_address,
 			allowed_hosts: self.allowed_hosts,
-			remote: self.remote,
-			fetch: Some(fetch),
+			fetch: fetch,
+			serve_ui: self.serve_ui,
 		}
 	}
 
-	/// Change default sync status.
-	pub fn sync_status(mut self, status: Arc<SyncStatus>) -> Self {
-		self.sync_status = status;
-		self
-	}
-
-	/// Change default web proxy tokens validator.
-	pub fn web_proxy_tokens(mut self, tokens: Arc<WebProxyTokens>) -> Self {
-		self.web_proxy_tokens = tokens;
-		self
-	}
-
-	/// Change default signer port.
-	pub fn signer_address(mut self, signer_address: Option<(String, u16)>) -> Self {
-		self.signer_address = signer_address;
-		self
-	}
-
-	/// Change allowed hosts.
-	/// `None` - All hosts are allowed
-	/// `Some(whitelist)` - Allow only whitelisted hosts (+ listen address)
-	pub fn allowed_hosts(mut self, allowed_hosts: DomainsValidation<Host>) -> Self {
-		self.allowed_hosts = allowed_hosts;
-		self
-	}
-
 	/// Asynchronously start server with no authentication,
 	/// returns result with `Server` handle on success or an error.
-	pub fn start_unsecured_http(self, addr: &SocketAddr, io: IoHandler) -> Result<Server, http::Error> {
-		let fetch = self.fetch_client();
+	pub fn start_unsecured_http(self, addr: &SocketAddr, io: IoHandler) -> io::Result<Server> {
 		Server::start_http(
 			addr,
 			io,
@@ -221,17 +197,11 @@ impl<T: Fetch> ServerBuilder<T> {
 			self.registrar,
 			self.sync_status,
 			self.web_proxy_tokens,
-			self.remote,
-			fetch,
+			Remote::new_sync(),
+			self.fetch,
+			self.serve_ui,
 		)
 	}
-
-	fn fetch_client(&self) -> T {
-		match self.fetch.clone() {
-			Some(fetch) => fetch,
-			None => T::new().unwrap(),
-		}
-	}
 }
 
 const DAPPS_DOMAIN: &'static str = "web3.site";
@@ -249,34 +219,47 @@ impl Server {
 		signer_address: Option<(String, u16)>,
 		dapps_path: PathBuf,
 		extra_dapps: Vec<PathBuf>,
-		registrar: Arc<ContractClient>,
+		registrar: Arc<RegistrarClient<Call=Asynchronous>>,
 		sync_status: Arc<SyncStatus>,
 		web_proxy_tokens: Arc<WebProxyTokens>,
 		remote: Remote,
 		fetch: F,
-	) -> Result<Server, http::Error> {
+		serve_ui: bool,
+	) -> io::Result<Server> {
 		let health = NodeHealth::new(
 			sync_status.clone(),
 			TimeChecker::new::<String>(&[], CpuPool::new(1)),
 			remote.clone(),
 		);
-		let middleware = Middleware::dapps(
-			health,
-			remote,
-			signer_address,
-			vec![],
-			vec![],
-			dapps_path,
-			extra_dapps,
-			DAPPS_DOMAIN.into(),
-			registrar,
-			sync_status,
-			web_proxy_tokens,
-			fetch,
-		);
+		let pool = ::futures_cpupool::CpuPool::new(1);
+		let middleware = if serve_ui {
+			Middleware::ui(
+				pool,
+				health,
+				DAPPS_DOMAIN.into(),
+				registrar,
+				sync_status,
+				fetch,
+			)
+		} else {
+			Middleware::dapps(
+				pool,
+				health,
+				signer_address,
+				vec![],
+				vec![],
+				dapps_path,
+				extra_dapps,
+				DAPPS_DOMAIN.into(),
+				registrar,
+				sync_status,
+				web_proxy_tokens,
+				fetch,
+			)
+		};
 
 		let mut allowed_hosts: Option<Vec<Host>> = allowed_hosts.into();
-		allowed_hosts.as_mut().map(|mut hosts| {
+		allowed_hosts.as_mut().map(|hosts| {
 			hosts.push(format!("http://*.{}:*", DAPPS_DOMAIN).into());
 			hosts.push(format!("http://*.{}", DAPPS_DOMAIN).into());
 		});
@@ -295,9 +278,7 @@ impl Server {
 	pub fn addr(&self) -> &SocketAddr {
 		self.server.as_ref()
 			.expect("server is always Some at the start; it's consumed only when object is dropped; qed")
-			.addrs()
-			.first()
-			.expect("You cannot start the server without binding to at least one address; qed")
+			.address()
 	}
 }
 
diff --git a/dapps/src/tests/helpers/registrar.rs b/dapps/src/tests/helpers/registrar.rs
index d7890675b9341a1bb9bff8d3e8bbd3c9c5e24a3b..8668d43b131be00076ca0fb4e984cd69d1c22d09 100644
--- a/dapps/src/tests/helpers/registrar.rs
+++ b/dapps/src/tests/helpers/registrar.rs
@@ -17,10 +17,12 @@
 use std::str;
 use std::sync::Arc;
 use std::collections::HashMap;
-use rustc_hex::FromHex;
 
-use hash_fetch::urlhint::ContractClient;
-use util::{Bytes, Address, Mutex, H256, ToPretty};
+use ethereum_types::{H256, Address};
+use bytes::{Bytes, ToPretty};
+use registrar::{RegistrarClient, Asynchronous};
+use parking_lot::Mutex;
+use rustc_hex::FromHex;
 
 const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";
 const URLHINT: &'static str = "deadbeefcafe0000000000000000000000000000";
@@ -59,12 +61,14 @@ impl FakeRegistrar {
 	}
 }
 
-impl ContractClient for FakeRegistrar {
-	fn registrar(&self) -> Result<Address, String> {
+impl RegistrarClient for FakeRegistrar {
+	type Call = Asynchronous;
+
+	fn registrar_address(&self) -> Result<Address, String> {
 		Ok(REGISTRAR.parse().unwrap())
 	}
 
-	fn call(&self, address: Address, data: Bytes) -> ::futures::BoxFuture<Bytes, String> {
+	fn call_contract(&self, address: Address, data: Bytes) -> Self::Call {
 		let call = (address.to_hex(), data.to_hex());
 		self.calls.lock().push(call.clone());
 		let res = self.responses.lock().get(&call).cloned().expect(&format!("No response for call: {:?}", call));
diff --git a/dapps/src/tests/home.rs b/dapps/src/tests/home.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0ee0653648220ca5211078bd5af9039820fc129c
--- /dev/null
+++ b/dapps/src/tests/home.rs
@@ -0,0 +1,91 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use tests::helpers::{serve_ui, request, assert_security_headers};
+
+#[test]
+fn should_serve_home_js() {
+	// given
+	let server = serve_ui();
+
+	// when
+	let response = request(server,
+		"\
+			GET /inject.js HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "application/javascript");
+	assert_eq!(response.body.contains("function(){"), true, "Expected function in: {}", response.body);
+	assert_security_headers(&response.headers);
+}
+
+#[test]
+fn should_serve_home() {
+	// given
+	let server = serve_ui();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "text/html");
+	assert_security_headers(&response.headers);
+}
+
+
+#[test]
+fn should_inject_js() {
+	// given
+	let server = serve_ui();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "text/html");
+	assert_eq!(
+		response.body.contains(r#"/inject.js"></script>"#),
+		true,
+		"Expected inject script tag in: {}",
+		response.body
+	);
+	assert_security_headers(&response.headers);
+}
diff --git a/dapps/src/tests/mod.rs b/dapps/src/tests/mod.rs
index 089318483ac15e10022653f8ada6d5d0fda7bae9..a47294392ea8e1b5b9f2df39c2681a7f8b9f7132 100644
--- a/dapps/src/tests/mod.rs
+++ b/dapps/src/tests/mod.rs
@@ -20,6 +20,7 @@ mod helpers;
 
 mod api;
 mod fetch;
+mod home;
 mod redirection;
 mod rpc;
 mod validation;
diff --git a/dapps/src/tests/redirection.rs b/dapps/src/tests/redirection.rs
index 81d3ec76cc8d7e8c737f943813418fde66cdfffc..b7f72009f72f987394d53960aad62a6079e02f09 100644
--- a/dapps/src/tests/redirection.rs
+++ b/dapps/src/tests/redirection.rs
@@ -201,6 +201,7 @@ fn should_serve_utils() {
 
 	// then
 	response.assert_status("HTTP/1.1 200 OK");
-	assert_eq!(response.body.contains("function(){"), true);
+	response.assert_header("Content-Type", "application/javascript");
+	assert_eq!(response.body.contains("function(){"), true, "Expected function in: {}", response.body);
 	assert_security_headers(&response.headers);
 }
diff --git a/dapps/src/tests/validation.rs b/dapps/src/tests/validation.rs
index fb68cf5ed832ac0f162ad97d43c000ee7375b42a..bd97c940a04c67f38cc89f125741462d5e688f66 100644
--- a/dapps/src/tests/validation.rs
+++ b/dapps/src/tests/validation.rs
@@ -33,7 +33,7 @@ fn should_reject_invalid_host() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 403 Forbidden".to_owned());
+	response.assert_status("HTTP/1.1 403 Forbidden");
 	assert!(response.body.contains("Provided Host header is not whitelisted."), response.body);
 }
 
@@ -54,7 +54,7 @@ fn should_allow_valid_host() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	response.assert_status("HTTP/1.1 200 OK");
 }
 
 #[test]
@@ -74,7 +74,7 @@ fn should_serve_dapps_domains() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	response.assert_status("HTTP/1.1 200 OK");
 }
 
 #[test]
@@ -95,5 +95,5 @@ fn should_allow_parity_utils_even_on_invalid_domain() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	response.assert_status("HTTP/1.1 200 OK");
 }
diff --git a/dapps/src/url.rs b/dapps/src/url.rs
deleted file mode 100644
index 23dbfb4fcc3043380def50f963a81a49277d98bf..0000000000000000000000000000000000000000
--- a/dapps/src/url.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! HTTP/HTTPS URL type. Based on URL type from Iron library.
-
-use url_lib::{self};
-pub use url_lib::Host;
-
-/// HTTP/HTTPS URL type for Iron.
-#[derive(PartialEq, Eq, Clone, Debug)]
-pub struct Url {
-	/// Raw url of url
-	pub raw: url_lib::Url,
-
-	/// The host field of the URL, probably a domain.
-	pub host: Host,
-
-	/// The connection port.
-	pub port: u16,
-
-	/// The URL path, the resource to be accessed.
-	///
-	/// A *non-empty* vector encoding the parts of the URL path.
-	/// Empty entries of `""` correspond to trailing slashes.
-	pub path: Vec<String>,
-
-	/// The URL query.
-	pub query: Option<String>,
-
-	/// The URL username field, from the userinfo section of the URL.
-	///
-	/// `None` if the `@` character was not part of the input OR
-	/// if a blank username was provided.
-	/// Otherwise, a non-empty string.
-	pub username: Option<String>,
-
-	/// The URL password field, from the userinfo section of the URL.
-	///
-	/// `None` if the `@` character was not part of the input OR
-	/// if a blank password was provided.
-	/// Otherwise, a non-empty string.
-	pub password: Option<String>,
-}
-
-impl Url {
-	/// Create a URL from a string.
-	///
-	/// The input must be a valid URL with a special scheme for this to succeed.
-	///
-	/// HTTP and HTTPS are special schemes.
-	///
-	/// See: http://url.spec.whatwg.org/#special-scheme
-	pub fn parse(input: &str) -> Result<Url, String> {
-		// Parse the string using rust-url, then convert.
-		match url_lib::Url::parse(input) {
-			Ok(raw_url) => Url::from_generic_url(raw_url),
-			Err(e) => Err(format!("{}", e))
-		}
-	}
-
-	/// Create a `Url` from a `rust-url` `Url`.
-	pub fn from_generic_url(raw_url: url_lib::Url) -> Result<Url, String> {
-		// Map empty usernames to None.
-		let username = match raw_url.username() {
-			"" => None,
-			username => Some(username.to_owned())
-		};
-
-		// Map empty passwords to None.
-		let password = match raw_url.password() {
-			Some(password) if !password.is_empty() => Some(password.to_owned()),
-			_ => None,
-		};
-
-		let port = raw_url.port_or_known_default().ok_or_else(|| format!("Unknown port for scheme: `{}`", raw_url.scheme()))?;
-		let host = raw_url.host().ok_or_else(|| "Valid host, because only data:, mailto: protocols does not have host.".to_owned())?.to_owned();
-		let path = raw_url.path_segments().ok_or_else(|| "Valid path segments. In HTTP we won't get cannot-be-a-base URLs".to_owned())?
-					.map(|part| part.to_owned()).collect();
-		let query = raw_url.query().map(|x| x.to_owned());
-
-		Ok(Url {
-			port: port,
-			host: host,
-			path: path,
-			query: query,
-			raw: raw_url,
-			username: username,
-			password: password,
-		})
-	}
-}
-
-#[cfg(test)]
-mod test {
-    use super::Url;
-
-    #[test]
-    fn test_default_port() {
-        assert_eq!(Url::parse("http://example.com/wow").unwrap().port, 80u16);
-        assert_eq!(Url::parse("https://example.com/wow").unwrap().port, 443u16);
-    }
-
-    #[test]
-    fn test_explicit_port() {
-        assert_eq!(Url::parse("http://localhost:3097").unwrap().port, 3097u16);
-    }
-
-    #[test]
-    fn test_empty_username() {
-        assert!(Url::parse("http://@example.com").unwrap().username.is_none());
-        assert!(Url::parse("http://:password@example.com").unwrap().username.is_none());
-    }
-
-    #[test]
-    fn test_not_empty_username() {
-        let user = Url::parse("http://john:pass@example.com").unwrap().username;
-        assert_eq!(user.unwrap(), "john");
-
-        let user = Url::parse("http://john:@example.com").unwrap().username;
-        assert_eq!(user.unwrap(), "john");
-    }
-
-    #[test]
-    fn test_empty_password() {
-        assert!(Url::parse("http://michael@example.com").unwrap().password.is_none());
-        assert!(Url::parse("http://:@example.com").unwrap().password.is_none());
-    }
-
-    #[test]
-    fn test_not_empty_password() {
-        let pass = Url::parse("http://michael:pass@example.com").unwrap().password;
-        assert_eq!(pass.unwrap(), "pass");
-
-        let pass = Url::parse("http://:pass@example.com").unwrap().password;
-        assert_eq!(pass.unwrap(), "pass");
-    }
-}
diff --git a/dapps/src/web.rs b/dapps/src/web.rs
index 5222f51b5ba1b22d4ab5a46a7602cfc2c637a1e1..86c0ac28d6c8d01bae482f60e2df36bfa69a3942 100644
--- a/dapps/src/web.rs
+++ b/dapps/src/web.rs
@@ -17,119 +17,55 @@
 //! Serving web-based content (proxying)
 
 use std::sync::Arc;
-use fetch::{self, Fetch};
-use parity_reactor::Remote;
 
 use base32;
-use hyper::{self, server, net, Next, Encoder, Decoder};
-use hyper::status::StatusCode;
+use fetch::{self, Fetch};
+use hyper::{mime, StatusCode};
 
 use apps;
-use endpoint::{Endpoint, Handler, EndpointPath};
+use endpoint::{Endpoint, EndpointPath, Request, Response};
+use futures::future;
+use futures_cpupool::CpuPool;
 use handlers::{
 	ContentFetcherHandler, ContentHandler, ContentValidator, ValidatorResponse,
-	StreamingHandler, extract_url,
+	StreamingHandler,
 };
-use url::Url;
 use {Embeddable, WebProxyTokens};
 
 pub struct Web<F> {
 	embeddable_on: Embeddable,
 	web_proxy_tokens: Arc<WebProxyTokens>,
-	remote: Remote,
 	fetch: F,
+	pool: CpuPool,
 }
 
 impl<F: Fetch> Web<F> {
 	pub fn boxed(
 		embeddable_on: Embeddable,
 		web_proxy_tokens: Arc<WebProxyTokens>,
-		remote: Remote,
 		fetch: F,
+		pool: CpuPool,
 	) -> Box<Endpoint> {
 		Box::new(Web {
 			embeddable_on,
 			web_proxy_tokens,
-			remote,
 			fetch,
+			pool,
 		})
 	}
-}
-
-impl<F: Fetch> Endpoint for Web<F> {
-	fn to_async_handler(&self, path: EndpointPath, control: hyper::Control) -> Box<Handler> {
-		Box::new(WebHandler {
-			control: control,
-			state: State::Initial,
-			path: path,
-			remote: self.remote.clone(),
-			fetch: self.fetch.clone(),
-			web_proxy_tokens: self.web_proxy_tokens.clone(),
-			embeddable_on: self.embeddable_on.clone(),
-		})
-	}
-}
-
-struct WebInstaller {
-	embeddable_on: Embeddable,
-	referer: String,
-}
-
-impl ContentValidator for WebInstaller {
-	type Error = String;
-
-	fn validate_and_install(&self, response: fetch::Response) -> Result<ValidatorResponse, String> {
-		let status = StatusCode::from_u16(response.status().to_u16());
-		let is_html = response.is_html();
-		let mime = response.content_type().unwrap_or(mime!(Text/Html));
-		let mut handler = StreamingHandler::new(
-			response,
-			status,
-			mime,
-			self.embeddable_on.clone(),
-		);
-		if is_html {
-			handler.set_initial_content(&format!(
-				r#"<script src="/{}/inject.js"></script><script>history.replaceState({{}}, "", "/?{}{}/{}")</script>"#,
-				apps::UTILS_PATH,
-				apps::URL_REFERER,
-				apps::WEB_PATH,
-				&self.referer,
-			));
-		}
-		Ok(ValidatorResponse::Streaming(handler))
-	}
-}
-
-enum State<F: Fetch> {
-	Initial,
-	Error(ContentHandler),
-	Fetching(ContentFetcherHandler<WebInstaller, F>),
-}
-
-struct WebHandler<F: Fetch> {
-	control: hyper::Control,
-	state: State<F>,
-	path: EndpointPath,
-	remote: Remote,
-	fetch: F,
-	web_proxy_tokens: Arc<WebProxyTokens>,
-	embeddable_on: Embeddable,
-}
 
-impl<F: Fetch> WebHandler<F> {
-	fn extract_target_url(&self, url: Option<Url>) -> Result<String, State<F>> {
-		let token_and_url = self.path.app_params.get(0)
+	fn extract_target_url(&self, path: &EndpointPath) -> Result<String, ContentHandler> {
+		let token_and_url = path.app_params.get(0)
 			.map(|encoded| encoded.replace('.', ""))
 			.and_then(|encoded| base32::decode(base32::Alphabet::Crockford, &encoded.to_uppercase()))
 			.and_then(|data| String::from_utf8(data).ok())
-			.ok_or_else(|| State::Error(ContentHandler::error(
+			.ok_or_else(|| ContentHandler::error(
 				StatusCode::BadRequest,
 				"Invalid parameter",
 				"Couldn't parse given parameter:",
-				self.path.app_params.get(0).map(String::as_str),
+				path.app_params.get(0).map(String::as_str),
 				self.embeddable_on.clone()
-			)))?;
+			))?;
 
 		let mut token_it = token_and_url.split('+');
 		let token = token_it.next();
@@ -139,9 +75,9 @@ impl<F: Fetch> WebHandler<F> {
 		let domain = match token.and_then(|token| self.web_proxy_tokens.domain(token)) {
 			Some(domain) => domain,
 			_ => {
-				return Err(State::Error(ContentHandler::error(
+				return Err(ContentHandler::error(
 					StatusCode::BadRequest, "Invalid Access Token", "Invalid or old web proxy access token supplied.", Some("Try refreshing the page."), self.embeddable_on.clone()
-				)));
+				));
 			}
 		};
 
@@ -149,95 +85,87 @@ impl<F: Fetch> WebHandler<F> {
 		let mut target_url = match target_url {
 			Some(url) if url.starts_with("http://") || url.starts_with("https://") => url.to_owned(),
 			_ => {
-				return Err(State::Error(ContentHandler::error(
+				return Err(ContentHandler::error(
 					StatusCode::BadRequest, "Invalid Protocol", "Invalid protocol used.", None, self.embeddable_on.clone()
-				)));
+				));
 			}
 		};
 
 		if !target_url.starts_with(&*domain) {
-			return Err(State::Error(ContentHandler::error(
+			return Err(ContentHandler::error(
 				StatusCode::BadRequest, "Invalid Domain", "Dapp attempted to access invalid domain.", Some(&target_url), self.embeddable_on.clone(),
-			)));
+			));
 		}
 
 		if !target_url.ends_with("/") {
 			target_url = format!("{}/", target_url);
 		}
 
-		// TODO [ToDr] Should just use `path.app_params`
-		let (path, query) = match (&url, self.path.using_dapps_domains) {
-			(&Some(ref url), true) => (&url.path[..], &url.query),
-			(&Some(ref url), false) => (&url.path[2..], &url.query),
-			_ => {
-				return Err(State::Error(ContentHandler::error(
-					StatusCode::BadRequest, "Invalid URL", "Couldn't parse URL", None, self.embeddable_on.clone()
-				)));
-			}
-		};
-
-		let query = match *query {
-			Some(ref query) => format!("?{}", query),
-			None => "".into(),
-		};
+		// Skip the token
+		let query = path.query.as_ref().map_or_else(String::new, |query| format!("?{}", query));
+		let path = path.app_params[1..].join("/");
 
-		Ok(format!("{}{}{}", target_url, path.join("/"), query))
+		Ok(format!("{}{}{}", target_url, path, query))
 	}
 }
 
-impl<F: Fetch> server::Handler<net::HttpStream> for WebHandler<F> {
-	fn on_request(&mut self, request: server::Request<net::HttpStream>) -> Next {
-		let url = extract_url(&request);
+impl<F: Fetch> Endpoint for Web<F> {
+	fn respond(&self, path: EndpointPath, req: Request) -> Response {
 		// First extract the URL (reject invalid URLs)
-		let target_url = match self.extract_target_url(url) {
+		let target_url = match self.extract_target_url(&path) {
 			Ok(url) => url,
-			Err(error) => {
-				self.state = error;
-				return Next::write();
+			Err(response) => {
+				return Box::new(future::ok(response.into()));
 			}
 		};
 
-		let mut handler = ContentFetcherHandler::new(
-			target_url,
-			self.path.clone(),
-			self.control.clone(),
+		let token = path.app_params.get(0)
+			.expect("`target_url` is valid; app_params is not empty;qed")
+			.to_owned();
+
+		Box::new(ContentFetcherHandler::new(
+			req.method(),
+			&target_url,
+			path,
 			WebInstaller {
 				embeddable_on: self.embeddable_on.clone(),
-				referer: self.path.app_params.get(0)
-					.expect("`target_url` is valid; app_params is not empty;qed")
-					.to_owned(),
+				token,
 			},
 			self.embeddable_on.clone(),
-			self.remote.clone(),
 			self.fetch.clone(),
-		);
-		let res = handler.on_request(request);
-		self.state = State::Fetching(handler);
-
-		res
+			self.pool.clone(),
+		))
 	}
+}
 
-	fn on_request_readable(&mut self, decoder: &mut Decoder<net::HttpStream>) -> Next {
-		match self.state {
-			State::Initial => Next::end(),
-			State::Error(ref mut handler) => handler.on_request_readable(decoder),
-			State::Fetching(ref mut handler) => handler.on_request_readable(decoder),
-		}
-	}
+struct WebInstaller {
+	embeddable_on: Embeddable,
+	token: String,
+}
 
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		match self.state {
-			State::Initial => Next::end(),
-			State::Error(ref mut handler) => handler.on_response(res),
-			State::Fetching(ref mut handler) => handler.on_response(res),
-		}
-	}
+impl ContentValidator for WebInstaller {
+	type Error = String;
 
-	fn on_response_writable(&mut self, encoder: &mut Encoder<net::HttpStream>) -> Next {
-		match self.state {
-			State::Initial => Next::end(),
-			State::Error(ref mut handler) => handler.on_response_writable(encoder),
-			State::Fetching(ref mut handler) => handler.on_response_writable(encoder),
+	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, String> {
+		let status = response.status();
+		let is_html = response.is_html();
+		let mime = response.content_type().unwrap_or(mime::TEXT_HTML);
+		let mut handler = StreamingHandler::new(
+			fetch::BodyReader::new(response),
+			status,
+			mime,
+			self.embeddable_on,
+		);
+		if is_html {
+			handler.set_initial_content(&format!(
+				r#"<script src="/{}/inject.js"></script><script>history.replaceState({{}}, "", "/?{}{}/{}")</script>"#,
+				apps::UTILS_PATH,
+				apps::URL_REFERER,
+				apps::WEB_PATH,
+				&self.token,
+			));
 		}
+		Ok(ValidatorResponse::Streaming(handler))
 	}
 }
+
diff --git a/dapps/ui/Cargo.toml b/dapps/ui/Cargo.toml
index 41763b14dc96876e260b369ca8b5fca4b511d7fd..e7f409b1c1cdadefd7abc1e1d2984a4c9c44df23 100644
--- a/dapps/ui/Cargo.toml
+++ b/dapps/ui/Cargo.toml
@@ -3,17 +3,18 @@ description = "Ethcore Parity UI"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "parity-ui"
-version = "1.8.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [build-dependencies]
-rustc_version = "0.1"
+rustc_version = "0.2"
 
 [dependencies]
-parity-ui-dev = { path = "../../js", optional = true }
-# This is managed by the js/scripts/release.sh script on CI - keep it in a single line
-parity-ui-precompiled = { git = "https://github.com/paritytech/js-precompiled.git", optional = true, branch = "master" }
+parity-ui-dev = { git = "https://github.com/parity-js/shell.git", rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2", optional = true }
+parity-ui-old-dev = { git = "https://github.com/parity-js/dapp-wallet.git", rev = "65deb02e7c007a0fd8aab0c089c93e3fd1de6f87", optional = true }
+parity-ui-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git", rev="bd25b41cd642c6b822d820dded3aa601a29aa079", optional = true }
+parity-ui-old-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git", rev="4b6f112412716cd05123d32eeb7fda448288a6c6", optional = true }
 
 [features]
-no-precompiled-js = ["parity-ui-dev"]
-use-precompiled-js = ["parity-ui-precompiled"]
+no-precompiled-js = ["parity-ui-dev", "parity-ui-old-dev"]
+use-precompiled-js = ["parity-ui-precompiled", "parity-ui-old-precompiled"]
diff --git a/dapps/ui/src/lib.rs b/dapps/ui/src/lib.rs
index 931fd06beea804fade8392f6ad7a426b714e1fe8..aa1c86736668a09d325f1f91462c171a959ce265 100644
--- a/dapps/ui/src/lib.rs
+++ b/dapps/ui/src/lib.rs
@@ -29,5 +29,18 @@ mod inner {
 	pub use self::parity_ui_precompiled::*;
 }
 
+#[cfg(feature = "parity-ui-old-dev")]
+pub mod old {
+	extern crate parity_ui_old_dev;
+
+	pub use self::parity_ui_old_dev::*;
+}
+
+#[cfg(feature = "parity-ui-old-precompiled")]
+pub mod old {
+	extern crate parity_ui_old_precompiled;
+
+	pub use self::parity_ui_old_precompiled::*;
+}
 
 pub use self::inner::*;
diff --git a/devtools/Cargo.toml b/devtools/Cargo.toml
index faae037311342ec788d29c74bafb2ca203cfb3bf..d5e275a3adbcc8e857006883f3c68244ff48945f 100644
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -3,14 +3,5 @@ description = "Ethcore development/test/build tools"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-devtools"
-version = "1.8.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-rand = "0.3"
-
-[features]
-
-[lib]
-path = "src/lib.rs"
-test = true
diff --git a/devtools/src/http_client.rs b/devtools/src/http_client.rs
index 078c33721c1a076b1cbfbb089507283e3dd35a42..ab234105929077c3d777e2b5ac37a733a2bfbe2c 100644
--- a/devtools/src/http_client.rs
+++ b/devtools/src/http_client.rs
@@ -16,7 +16,7 @@
 
 use std::thread;
 use std::time::Duration;
-use std::io::{Read, Write};
+use std::io::{self, Read, Write};
 use std::str::{self, Lines};
 use std::net::{TcpStream, SocketAddr};
 
@@ -83,9 +83,18 @@ pub fn request(address: &SocketAddr, request: &str) -> Response {
 	req.set_read_timeout(Some(Duration::from_secs(2))).unwrap();
 	req.write_all(request.as_bytes()).unwrap();
 
-	let mut response = String::new();
-	let _ = req.read_to_string(&mut response);
+	let mut response = Vec::new();
+	loop {
+		let mut chunk = [0; 32 *1024];
+		match req.read(&mut chunk) {
+			Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => break,
+			Err(err) => panic!("Unable to read response: {:?}", err),
+			Ok(0) => break,
+			Ok(read) => response.extend_from_slice(&chunk[..read]),
+		}
+	}
 
+	let response = String::from_utf8_lossy(&response).into_owned();
 	let mut lines = response.lines();
 	let status = lines.next().expect("Expected a response").to_owned();
 	let headers_raw = read_block(&mut lines, false);
diff --git a/devtools/src/lib.rs b/devtools/src/lib.rs
index 419f0d6428b12594068da2c1ec8ff127a04af4b3..efaf4b9351acb9e04e65e4eabcb68f9310925789 100644
--- a/devtools/src/lib.rs
+++ b/devtools/src/lib.rs
@@ -16,14 +16,4 @@
 
 //! dev-tools
 
-
-extern crate rand;
-
-mod random_path;
-mod test_socket;
-mod stop_guard;
 pub mod http_client;
-
-pub use random_path::*;
-pub use test_socket::*;
-pub use stop_guard::*;
diff --git a/devtools/src/random_path.rs b/devtools/src/random_path.rs
deleted file mode 100644
index 9c399115b228531ce9210c8f8e07a979121416e1..0000000000000000000000000000000000000000
--- a/devtools/src/random_path.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Random path
-
-use std::path::*;
-use std::fs;
-use std::env;
-use std::ops::{Deref, DerefMut};
-use rand::random;
-
-pub struct RandomTempPath {
-	path: PathBuf,
-	pub panic_on_drop_failure: bool,
-}
-
-pub fn random_filename() -> String {
-	random_str(8)
-}
-
-pub fn random_str(len: usize) -> String {
-	(0..len).map(|_| ((random::<f32>() * 26.0) as u8 + 97) as char).collect()
-}
-
-impl RandomTempPath {
-	pub fn new() -> RandomTempPath {
-		let mut dir = env::temp_dir();
-		dir.push(random_filename());
-		RandomTempPath {
-			path: dir.clone(),
-			panic_on_drop_failure: true,
-		}
-	}
-
-	pub fn create_dir() -> RandomTempPath {
-		let mut dir = env::temp_dir();
-		dir.push(random_filename());
-		fs::create_dir_all(dir.as_path()).unwrap();
-		RandomTempPath {
-			path: dir.clone(),
-			panic_on_drop_failure: true,
-		}
-	}
-
-	pub fn as_path(&self) -> &PathBuf {
-		&self.path
-	}
-
-	pub fn as_str(&self) -> &str {
-		self.path.to_str().unwrap()
-	}
-
-	pub fn new_in(&self, name: &str) -> String {
-		let mut path = self.path.clone();
-		path.push(name);
-		path.to_str().unwrap().to_owned()
-	}
-}
-
-impl AsRef<Path> for RandomTempPath {
-	fn as_ref(&self) -> &Path {
-		self.as_path()
-	}
-}
-impl Deref for RandomTempPath {
-	type Target = Path;
-	fn deref(&self) -> &Self::Target {
-		self.as_path()
-	}
-}
-
-impl Drop for RandomTempPath {
-	fn drop(&mut self) {
-		if let Err(_) = fs::remove_dir_all(&self) {
-			if let Err(e) = fs::remove_file(&self) {
-				if self.panic_on_drop_failure {
-					panic!("Failed to remove temp directory. Here's what prevented this from happening:  ({})", e);
-				}
-			}
-		}
-	}
-}
-
-pub struct GuardedTempResult<T> {
-	pub result: Option<T>,
-	pub _temp: RandomTempPath,
-}
-
-impl<T> GuardedTempResult<T> {
-    pub fn reference(&self) -> &T {
-        self.result.as_ref().unwrap()
-    }
-
-    pub fn reference_mut(&mut self) -> &mut T {
-    	self.result.as_mut().unwrap()
-    }
-
-	pub fn take(&mut self) -> T {
-		self.result.take().unwrap()
-	}
-}
-
-impl<T> Deref for GuardedTempResult<T> {
-	type Target = T;
-
-	fn deref(&self) -> &T { self.result.as_ref().unwrap() }
-}
-
-impl<T> DerefMut for GuardedTempResult<T> {
-	fn deref_mut(&mut self) -> &mut T { self.result.as_mut().unwrap() }
-}
-
-#[test]
-fn creates_dir() {
-	let temp = RandomTempPath::create_dir();
-	assert!(fs::metadata(temp.as_path()).unwrap().is_dir());
-}
-
-#[test]
-fn destroys_dir() {
-	let path_buf = {
-		let temp = RandomTempPath::create_dir();
-		assert!(fs::metadata(temp.as_path()).unwrap().is_dir());
-		let path_buf = temp.as_path().to_path_buf();
-		path_buf
-	};
-
-	assert!(fs::metadata(&path_buf).is_err());
-}
-
-#[test]
-fn provides_random() {
-	let temp = RandomTempPath::create_dir();
-	assert!(temp.as_path().to_str().is_some());
-}
diff --git a/devtools/src/test_socket.rs b/devtools/src/test_socket.rs
deleted file mode 100644
index b5b0cefd3d9fcf96f4a3875a145f82bfbf8091d8..0000000000000000000000000000000000000000
--- a/devtools/src/test_socket.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::io::*;
-use std::cmp;
-
-pub struct TestSocket {
-	pub read_buffer: Vec<u8>,
-	pub write_buffer: Vec<u8>,
-	pub cursor: usize,
-	pub buf_size: usize,
-}
-
-impl Default for TestSocket {
-	fn default() -> Self {
-		TestSocket::new()
-	}
-}
-
-impl TestSocket {
-	pub fn new() -> Self {
-		TestSocket {
-			read_buffer: vec![],
-			write_buffer: vec![],
-			cursor: 0,
-			buf_size: 0,
-		}
-	}
-
-	pub fn new_buf(buf_size: usize) -> TestSocket {
-		TestSocket {
-			read_buffer: vec![],
-			write_buffer: vec![],
-			cursor: 0,
-			buf_size: buf_size,
-		}
-	}
-
-	pub fn new_ready(data: Vec<u8>) -> TestSocket {
-		TestSocket {
-			read_buffer: data,
-			write_buffer: vec![],
-			cursor: 0,
-			buf_size: 0,
-		}
-	}
-}
-
-impl Read for TestSocket {
-	fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
-		let end_position = cmp::min(self.read_buffer.len(), self.cursor+buf.len());
-		if self.cursor > end_position { return Ok(0) }
-		let len = cmp::max(end_position - self.cursor, 0);
-		match len {
-			0 => Ok(0),
-			_ => {
-				for i in self.cursor..end_position {
-					buf[i-self.cursor] = self.read_buffer[i];
-				}
-				self.cursor = end_position;
-				Ok(len)
-			}
-		}
-	}
-}
-
-impl Write for TestSocket {
-	fn write(&mut self, buf: &[u8]) -> Result<usize> {
-		if self.buf_size == 0 || buf.len() < self.buf_size {
-			self.write_buffer.extend(buf.iter().cloned());
-			Ok(buf.len())
-		}
-		else {
-			self.write_buffer.extend(buf.iter().take(self.buf_size).cloned());
-			Ok(self.buf_size)
-		}
-	}
-
-	fn flush(&mut self) -> Result<()> {
-		unimplemented!();
-	}
-}
diff --git a/docs/CHANGELOG-0.9.md b/docs/CHANGELOG-0.9.md
new file mode 100644
index 0000000000000000000000000000000000000000..be61dd27242bba620fcd1b322113411dc0236f57
--- /dev/null
+++ b/docs/CHANGELOG-0.9.md
@@ -0,0 +1,228 @@
+Note: Parity 0.9 reached End-of-Life on 2016-05-02 (EOL).
+
+## Parity [beta-0.9.1](https://github.com/paritytech/parity/releases/tag/beta-0.9.1) (2016-02-16)
+
+Homestead transition block changed to 1100000.
+
+- Beta patch to 0.9.1 [#445](https://github.com/paritytech/parity/pull/445)
+- Delay homestead transition [#430](https://github.com/paritytech/parity/pull/430)
+- (BETA) https link in the installer (?) [#392](https://github.com/paritytech/parity/pull/392)
+- beta: Check for handshake expiration before attempting replace [#377](https://github.com/paritytech/parity/pull/377)
+
+## Parity [beta-0.9](https://github.com/paritytech/parity/releases/tag/beta-0.9) (2016-02-08)
+
+First Parity Beta 0.9 released.
+
+- Panic on missing counters; Client cleanup [#368](https://github.com/paritytech/parity/pull/368)
+- Update README for new PPAs. [#369](https://github.com/paritytech/parity/pull/369)
+- block_queue::clear should be more thorough [#365](https://github.com/paritytech/parity/pull/365)
+- Fixed an issue with forked counters [#363](https://github.com/paritytech/parity/pull/363)
+- Install parity [#362](https://github.com/paritytech/parity/pull/362)
+- DB directory versioning [#358](https://github.com/paritytech/parity/pull/358)
+- Raise FD limit for MacOS [#357](https://github.com/paritytech/parity/pull/357)
+- Travis slack integration. [#356](https://github.com/paritytech/parity/pull/356)
+- SignedTransaction structure [#350](https://github.com/paritytech/parity/pull/350)
+- License [#354](https://github.com/paritytech/parity/pull/354)
+- Performance optimizations [#353](https://github.com/paritytech/parity/pull/353)
+- Gitter in README. [#355](https://github.com/paritytech/parity/pull/355)
+- test efforts, receipt requests [#352](https://github.com/paritytech/parity/pull/352)
+- sync tests setup & local module coverage [#348](https://github.com/paritytech/parity/pull/348)
+- install parity script [#347](https://github.com/paritytech/parity/pull/347)
+- evmjit homestead merge [#342](https://github.com/paritytech/parity/pull/342)
+- Fixed sync stalling on fork [#343](https://github.com/paritytech/parity/pull/343)
+- Remerge 264 [#334](https://github.com/paritytech/parity/pull/334)
+- Ethsync tests bfix [#339](https://github.com/paritytech/parity/pull/339)
+- Fix default options. [#335](https://github.com/paritytech/parity/pull/335)
+- sync queue limit hotfix [#338](https://github.com/paritytech/parity/pull/338)
+- Network tests, separate local coverage for utils [#333](https://github.com/paritytech/parity/pull/333)
+- fix parity version so netstats can parse it [#332](https://github.com/paritytech/parity/pull/332)
+- reveal surprise [#331](https://github.com/paritytech/parity/pull/331)
+- Revert removal of `new_code`. [#330](https://github.com/paritytech/parity/pull/330)
+- Network mod tests first part [#329](https://github.com/paritytech/parity/pull/329)
+- Look ma no `dead_code` [#323](https://github.com/paritytech/parity/pull/323)
+- Fixing JIT, Updating hook to run `ethcore` tests. [#326](https://github.com/paritytech/parity/pull/326)
+- Final docs [#327](https://github.com/paritytech/parity/pull/327)
+- update install-deps.sh [#316](https://github.com/paritytech/parity/pull/316)
+- Finish all my docs. Fix previous test compilation. [#320](https://github.com/paritytech/parity/pull/320)
+- Additional evm tests (extops, call, jumps) and some docs [#317](https://github.com/paritytech/parity/pull/317)
+- More documentation. [#318](https://github.com/paritytech/parity/pull/318)
+- Additional documentation. [#315](https://github.com/paritytech/parity/pull/315)
+- unused functions cleanup [#310](https://github.com/paritytech/parity/pull/310)
+- update ethcore.github.io documentation automatically [#311](https://github.com/paritytech/parity/pull/311)
+- Another try with travis ci credentials [#314](https://github.com/paritytech/parity/pull/314)
+- Document some stuff. [#309](https://github.com/paritytech/parity/pull/309)
+- Check block parent on import; Peer timeouts [#303](https://github.com/paritytech/parity/pull/303)
+- Increasing coverage for evm. [#306](https://github.com/paritytech/parity/pull/306)
+- ethcore docs [#301](https://github.com/paritytech/parity/pull/301)
+- Replacing secure token for deployment [#305](https://github.com/paritytech/parity/pull/305)
+- doc.sh [#299](https://github.com/paritytech/parity/pull/299)
+- Building beta-* and stable-* tags [#302](https://github.com/paritytech/parity/pull/302)
+- Deploying artifacts for tags (release/beta) [#300](https://github.com/paritytech/parity/pull/300)
+- cov.sh to show coverage locally [#298](https://github.com/paritytech/parity/pull/298)
+- benchmark fixes [#297](https://github.com/paritytech/parity/pull/297)
+- Include JSONRPC CLI options. [#296](https://github.com/paritytech/parity/pull/296)
+- travis.yml fixes [#293](https://github.com/paritytech/parity/pull/293)
+- Improve version string. [#295](https://github.com/paritytech/parity/pull/295)
+- Fixed block queue test [#294](https://github.com/paritytech/parity/pull/294)
+- Util docs [#292](https://github.com/paritytech/parity/pull/292)
+- fixed building docs [#289](https://github.com/paritytech/parity/pull/289)
+- update travis to build PRs only against master [#290](https://github.com/paritytech/parity/pull/290)
+- Coverage effort [#272](https://github.com/paritytech/parity/pull/272)
+- updated docker containers [#288](https://github.com/paritytech/parity/pull/288)
+- rpc module fixes [#287](https://github.com/paritytech/parity/pull/287)
+- Test for Receipt RLP. [#282](https://github.com/paritytech/parity/pull/282)
+- Building from source guide [#284](https://github.com/paritytech/parity/pull/284)
+- Fixed neted empty list RLP encoding [#283](https://github.com/paritytech/parity/pull/283)
+- Fix CALLDATACOPY (and bonus CODECOPY, too!). [#279](https://github.com/paritytech/parity/pull/279)
+- added travis && coveralls badge to README.md [#280](https://github.com/paritytech/parity/pull/280)
+- coveralls coverage [#277](https://github.com/paritytech/parity/pull/277)
+- Travis [in progress] [#257](https://github.com/paritytech/parity/pull/257)
+- Travis on reorganized repo [#276](https://github.com/paritytech/parity/pull/276)
+- umbrella project [#275](https://github.com/paritytech/parity/pull/275)
+- Ethash disk cache [#273](https://github.com/paritytech/parity/pull/273)
+- Parity executable name and version [#274](https://github.com/paritytech/parity/pull/274)
+- Dockerfile [#195](https://github.com/paritytech/parity/pull/195)
+- Garbage collection test fix [#267](https://github.com/paritytech/parity/pull/267)
+- Fix stCallCreateCallCodeTest, add more tests [#271](https://github.com/paritytech/parity/pull/271)
+- Moved sync out of ethcore crate; Added block validation [#265](https://github.com/paritytech/parity/pull/265)
+- RLP encoder refactoring [#252](https://github.com/paritytech/parity/pull/252)
+- Chain sync tests and minor refactoring [#264](https://github.com/paritytech/parity/pull/264)
+- Common log init function [#263](https://github.com/paritytech/parity/pull/263)
+- changed max vm depth from 128 to 64, change homestead block to 1_000_000 [#262](https://github.com/paritytech/parity/pull/262)
+- fixed blockchain tests crash on log init [#261](https://github.com/paritytech/parity/pull/261)
+- Blockchain tests and some helpers for guarding temp directory [#256](https://github.com/paritytech/parity/pull/256)
+- Fix logging and random tests. [#260](https://github.com/paritytech/parity/pull/260)
+- Fix difficulty calculation algo. [#259](https://github.com/paritytech/parity/pull/259)
+- fix submodule version [#258](https://github.com/paritytech/parity/pull/258)
+- temp dir spawn refactoring [#246](https://github.com/paritytech/parity/pull/246)
+- fixed tests submodule branch [#254](https://github.com/paritytech/parity/pull/254)
+- rpc net methods returns real peer count && protocol version [#253](https://github.com/paritytech/parity/pull/253)
+- Add homestead & random tests. [#245](https://github.com/paritytech/parity/pull/245)
+- Fixing suicide with self-refund to be consistent with CPP. [#247](https://github.com/paritytech/parity/pull/247)
+- stubs for rpc methods [#251](https://github.com/paritytech/parity/pull/251)
+- clippy, missing docs, renaming etc. [#244](https://github.com/paritytech/parity/pull/244)
+- impl missing methods in tests [#243](https://github.com/paritytech/parity/pull/243)
+- General tests and some helpers [#239](https://github.com/paritytech/parity/pull/239)
+- Note additional tests are fixed, fix doc test. [#242](https://github.com/paritytech/parity/pull/242)
+- jsonrpc http server [#193](https://github.com/paritytech/parity/pull/193)
+- Ethash nonce is H64 not a u64 [#240](https://github.com/paritytech/parity/pull/240)
+- Fix import for bcMultiChainTest [#236](https://github.com/paritytech/parity/pull/236)
+- Client basic tests [#232](https://github.com/paritytech/parity/pull/232)
+- Fix ensure_db_good() and flush_queue(), block refactoring, check block format, be strict. [#231](https://github.com/paritytech/parity/pull/231)
+- Rlp [#207](https://github.com/paritytech/parity/pull/207)
+- Schedule documentation [#219](https://github.com/paritytech/parity/pull/219)
+- U256<->H256 Conversion [#206](https://github.com/paritytech/parity/pull/206)
+- Spawning new thread when we are reaching stack limit [#217](https://github.com/paritytech/parity/pull/217)
+- Blockchain tests [#211](https://github.com/paritytech/parity/pull/211)
+- fixed failing sync test [#218](https://github.com/paritytech/parity/pull/218)
+- Removing println [#216](https://github.com/paritytech/parity/pull/216)
+- Cleaning readme [#212](https://github.com/paritytech/parity/pull/212)
+- Fixing delegatecall [#196](https://github.com/paritytech/parity/pull/196)
+- Autogenerate the Args from the docopt macro. [#205](https://github.com/paritytech/parity/pull/205)
+- Networking fixes [#202](https://github.com/paritytech/parity/pull/202)
+- Argument parsing from CLI [#204](https://github.com/paritytech/parity/pull/204)
+- Removed wildcard from clippy version [#203](https://github.com/paritytech/parity/pull/203)
+- Fixed tests and tweaked sync progress report [#201](https://github.com/paritytech/parity/pull/201)
+- Heavy tests [#199](https://github.com/paritytech/parity/pull/199)
+- Mutithreaded IO [#198](https://github.com/paritytech/parity/pull/198)
+- Populating last_hashes [#197](https://github.com/paritytech/parity/pull/197)
+- Fixing clippy stuff [#170](https://github.com/paritytech/parity/pull/170)
+- basic .travis.yml [#194](https://github.com/paritytech/parity/pull/194)
+- Generating coverage reports. [#190](https://github.com/paritytech/parity/pull/190)
+- Adding doc requests comments [#192](https://github.com/paritytech/parity/pull/192)
+- moved src/bin/client.rs -> src/bin/client/main.rs [#185](https://github.com/paritytech/parity/pull/185)
+- removed overflowing_shr [#188](https://github.com/paritytech/parity/pull/188)
+- fixed wrapping ops on latest nightly [#187](https://github.com/paritytech/parity/pull/187)
+- Pruned state DB [#176](https://github.com/paritytech/parity/pull/176)
+- Memory management for cache [#180](https://github.com/paritytech/parity/pull/180)
+- Implement signs having low-s. [#183](https://github.com/paritytech/parity/pull/183)
+- Introduce sha3 crate and use it in ethash [#178](https://github.com/paritytech/parity/pull/178)
+- Multithreaded block queue [#173](https://github.com/paritytech/parity/pull/173)
+- Iterator for NibbleSlice and TrieDB. [#171](https://github.com/paritytech/parity/pull/171)
+- Handling all possible overflows [#145](https://github.com/paritytech/parity/pull/145)
+- Global secp256k1 context [#164](https://github.com/paritytech/parity/pull/164)
+- Ethash [#152](https://github.com/paritytech/parity/pull/152)
+- Move util into here [#153](https://github.com/paritytech/parity/pull/153)
+- EVM Interpreter [#103](https://github.com/paritytech/parity/pull/103)
+- Homestead transition support, maybe. [#141](https://github.com/paritytech/parity/pull/141)
+- externalities refactor [#131](https://github.com/paritytech/parity/pull/131)
+- More open files. [#140](https://github.com/paritytech/parity/pull/140)
+- Single array for logs output. [#133](https://github.com/paritytech/parity/pull/133)
+- Client app event handler [#132](https://github.com/paritytech/parity/pull/132)
+- Various consensus fixes. [#130](https://github.com/paritytech/parity/pull/130)
+- callcode builtins tests pass [#127](https://github.com/paritytech/parity/pull/127)
+- Client state syncing [#119](https://github.com/paritytech/parity/pull/119)
+- Split externalities from executive. [#126](https://github.com/paritytech/parity/pull/126)
+- executive error on not enoguh base gas [#124](https://github.com/paritytech/parity/pull/124)
+- Gav [#125](https://github.com/paritytech/parity/pull/125)
+- builtin sets excepted to true [#123](https://github.com/paritytech/parity/pull/123)
+- More state tests. [#122](https://github.com/paritytech/parity/pull/122)
+- updated to rocksdb wrapper version 0.3 [#121](https://github.com/paritytech/parity/pull/121)
+- out_of_gas -> excepted [#120](https://github.com/paritytech/parity/pull/120)
+- Parametrizing evm::Factory [#111](https://github.com/paritytech/parity/pull/111)
+- stLogs tests passing [#118](https://github.com/paritytech/parity/pull/118)
+- Fix executive. [#117](https://github.com/paritytech/parity/pull/117)
+- Fixes for marek's shooting from the hip. [#116](https://github.com/paritytech/parity/pull/116)
+- Executive revert fix [#115](https://github.com/paritytech/parity/pull/115)
+- Fix storage/account and add butress test. [#114](https://github.com/paritytech/parity/pull/114)
+- Refactored Pod & Diff types into separate files, JSON infrastructure revamp. [#113](https://github.com/paritytech/parity/pull/113)
+- Fix storage stuff and introduce per-item dirty-tracking. [#112](https://github.com/paritytech/parity/pull/112)
+- Check logs in state tests. [#109](https://github.com/paritytech/parity/pull/109)
+- executive gas calculation fixes [#108](https://github.com/paritytech/parity/pull/108)
+- proper gas calculation in executive [#107](https://github.com/paritytech/parity/pull/107)
+- Fixing MaxDepth param for executive [#105](https://github.com/paritytech/parity/pull/105)
+- Fix determination of state roots. [#106](https://github.com/paritytech/parity/pull/106)
+- transact substracts tx_gas [#104](https://github.com/paritytech/parity/pull/104)
+- Pretty-print and fix for state. [#102](https://github.com/paritytech/parity/pull/102)
+- Tier step price. [#101](https://github.com/paritytech/parity/pull/101)
+- Refactor Diff datastructures. [#100](https://github.com/paritytech/parity/pull/100)
+- externalities use u256 instead of u64 for gas calculation [#99](https://github.com/paritytech/parity/pull/99)
+- Executive tests [#97](https://github.com/paritytech/parity/pull/97)
+- State conensus tests now print mismatching diff on fail. [#98](https://github.com/paritytech/parity/pull/98)
+- State testing framework. First test is failing. [#96](https://github.com/paritytech/parity/pull/96)
+- executive tests [#95](https://github.com/paritytech/parity/pull/95)
+- Use U512s for ether cost calculation, complete transaction API [#94](https://github.com/paritytech/parity/pull/94)
+- Utils for consensus test decoding and better layout. [#93](https://github.com/paritytech/parity/pull/93)
+- executive fixes + tests [#89](https://github.com/paritytech/parity/pull/89)
+- All transaction tests pass. Nicer testing framework. [#92](https://github.com/paritytech/parity/pull/92)
+- Block verification tests; BlockProvider blockchain trait for testing [#88](https://github.com/paritytech/parity/pull/88)
+- State::exists, docs and tests. [#87](https://github.com/paritytech/parity/pull/87)
+- Add tests module, add two more transaction tests. [#86](https://github.com/paritytech/parity/pull/86)
+- bring back removed tests, removed build warnings [#82](https://github.com/paritytech/parity/pull/82)
+- Nicer transaction validation API. Nicer OutOfBounds API in general. [#85](https://github.com/paritytech/parity/pull/85)
+- Transaction fixes and consensus tests (all passing) [#84](https://github.com/paritytech/parity/pull/84)
+- fixed getting block info in evmjit + tests [#81](https://github.com/paritytech/parity/pull/81)
+- evm tests cleanup [#80](https://github.com/paritytech/parity/pull/80)
+- renamed VmFactory -> Factory [#77](https://github.com/paritytech/parity/pull/77)
+- fixed rust-evmjit description of improper_ctypes usage [#76](https://github.com/paritytech/parity/pull/76)
+- jit feature enabled by default [#75](https://github.com/paritytech/parity/pull/75)
+- evm [#52](https://github.com/paritytech/parity/pull/52)
+- state clone [#74](https://github.com/paritytech/parity/pull/74)
+- Block Verification (no tests yet) [#72](https://github.com/paritytech/parity/pull/72)
+- Improvements to LogEntry and Transaction [#73](https://github.com/paritytech/parity/pull/73)
+- Use getter in header in preparation for a Header trait; additional testing in enact_block(). [#64](https://github.com/paritytech/parity/pull/64)
+- BlockChain sync and Client app [#55](https://github.com/paritytech/parity/pull/55)
+- Block enactment (including test) [#63](https://github.com/paritytech/parity/pull/63)
+- Block complete. Needs tests. [#62](https://github.com/paritytech/parity/pull/62)
+- More on OpenBlock::close; State::kill_account added [#61](https://github.com/paritytech/parity/pull/61)
+- Remove genesis module, add more chain specs and separate out ethereum-specific stuff [#60](https://github.com/paritytech/parity/pull/60)
+- State::new_contract, camelCase engine params, missing param [#59](https://github.com/paritytech/parity/pull/59)
+- Use reorganisation [#58](https://github.com/paritytech/parity/pull/58)
+- Initial Ethash/Block skeleton implementations. [#57](https://github.com/paritytech/parity/pull/57)
+- Spec with tested Morden genesis decoder and builtins. [#54](https://github.com/paritytech/parity/pull/54)
+- Move all chain parameters into `engine_params` [#50](https://github.com/paritytech/parity/pull/50)
+- jit ffi improvements [please review] [#51](https://github.com/paritytech/parity/pull/51)
+- blockchain [please review] [#34](https://github.com/paritytech/parity/pull/34)
+- Move information from networkparams.rs into spec.rs [#48](https://github.com/paritytech/parity/pull/48)
+- Move bulking out in Engine/Params. [#47](https://github.com/paritytech/parity/pull/47)
+- Removed need for mutation in State. [#46](https://github.com/paritytech/parity/pull/46)
+- State::code and State::storage_at + tests. [#45](https://github.com/paritytech/parity/pull/45)
+- State functions for balance and nonce operations [#44](https://github.com/paritytech/parity/pull/44)
+- Account::storage_at, Account::ensure_cached and tests. [#43](https://github.com/paritytech/parity/pull/43)
+- Additional tests. [#42](https://github.com/paritytech/parity/pull/42)
+- seal todo done [#41](https://github.com/paritytech/parity/pull/41)
+- missing rustc_serialize crate && rlp `as_list` function [#40](https://github.com/paritytech/parity/pull/40)
+- More methods in Account, documentation and tests. [#39](https://github.com/paritytech/parity/pull/39)
+- Minor reworking of Account. [#38](https://github.com/paritytech/parity/pull/38)
+- Add Account and State classes. [#37](https://github.com/paritytech/parity/pull/37)
+- Revert regressions [#36](https://github.com/paritytech/parity/pull/36)
diff --git a/docs/CHANGELOG-1.0.md b/docs/CHANGELOG-1.0.md
new file mode 100644
index 0000000000000000000000000000000000000000..58d3101f5a7f9059281a66eb3feb9afe8c4a676f
--- /dev/null
+++ b/docs/CHANGELOG-1.0.md
@@ -0,0 +1,317 @@
+Note: Parity 1.0 reached End-of-Life on 2016-06-24 (EOL).
+
+## Parity [v1.0.2](https://github.com/paritytech/parity/releases/tag/v1.0.2) (2016-04-11)
+
+Parity 1.0.2 release improves Json RPC compatibility and fixes a number of stability issues.
+
+- Flush password prompt [#1031](https://github.com/paritytech/parity/pull/1031)
+- [beta] dependencies update [#949](https://github.com/paritytech/parity/pull/949)
+- Master to beta v1.0.2 [#922](https://github.com/paritytech/parity/pull/922)
+- Master to beta 1.0.2 [#908](https://github.com/paritytech/parity/pull/908)
+
+## Parity [v1.0.1](https://github.com/paritytech/parity/releases/tag/v1.0.1) (2016-03-28)
+
+Parity 1.0.1 update fixes a number of issues with Json RPC, transaction propagation and syncing.
+
+- Imporved sync error handling [#905](https://github.com/paritytech/parity/pull/905)
+- Publish locally-made transactions to peers. [#851](https://github.com/paritytech/parity/pull/851)
+- Merge fixes from master to beta [#845](https://github.com/paritytech/parity/pull/845)
+- Full sync restart on bad block [#844](https://github.com/paritytech/parity/pull/844)
+- Make BlockNumber optional, fix eth_call [#828](https://github.com/paritytech/parity/pull/828)
+- Web3sha3 beta [#826](https://github.com/paritytech/parity/pull/826)
+- Use network id for the web3_net_version return. [#821](https://github.com/paritytech/parity/pull/821)
+- Fix mining from spinning [#806](https://github.com/paritytech/parity/pull/806)
+- Merge master to beta [#796](https://github.com/paritytech/parity/pull/796)
+
+## Parity [v1.0.0](https://github.com/paritytech/parity/releases/tag/v1.0.0) (2016-03-24)
+
+Parity 1.0.0 release adds the following features:
+
+- Standard JsonRPC interface.
+- Full Homestead compatibility.
+- Transaction management.
+- Mining with external miner.
+- Account management.
+- Geth key chain compatibility.
+- Additional command line options.
+- State trie pruning.
+- Cache and queue footprint.
+- Network discovery & NAT traversal.
+- Custom chain specification files.
+
+Note that in this release the state database is in archive (full) mode by default. Run with one of the `--pruning` options to enable pruning.
+
+- First part of multi-mining support [#804](https://github.com/paritytech/parity/pull/804)
+- Fixing future-current transactions clash [#802](https://github.com/paritytech/parity/pull/802)
+- Increase threads to num_cpus & fix author reporting [#800](https://github.com/paritytech/parity/pull/800)
+- another batch of rpc improvements [#798](https://github.com/paritytech/parity/pull/798)
+- Avoid tracing DELEGATECALL and CALLCODE. Plus tests for it. [#794](https://github.com/paritytech/parity/pull/794)
+- complete getting started steps for OS X [#793](https://github.com/paritytech/parity/pull/793)
+- Auto detect available port (with fixed test) [#788](https://github.com/paritytech/parity/pull/788)
+- eth_getTransactionReceipt [#792](https://github.com/paritytech/parity/pull/792)
+- Comprehensive tests for tracing transactions [#791](https://github.com/paritytech/parity/pull/791)
+- Disable preparing work package if miners don't ask for it. [#771](https://github.com/paritytech/parity/pull/771)
+- Listen on all interfaces for JSONRPC by default. [#786](https://github.com/paritytech/parity/pull/786)
+- eth_call [#783](https://github.com/paritytech/parity/pull/783)
+- Revert "Auto detect available port" [#789](https://github.com/paritytech/parity/pull/789)
+- added output to execution result [#777](https://github.com/paritytech/parity/pull/777)
+- Auto detect available port [#782](https://github.com/paritytech/parity/pull/782)
+- Allow 0x prefix for --author. [#785](https://github.com/paritytech/parity/pull/785)
+- updated dependencies, moved rpctest to its own submodule [#784](https://github.com/paritytech/parity/pull/784)
+- use ethjson module to load chain json tests [#778](https://github.com/paritytech/parity/pull/778)
+- Tracing implemented. [#772](https://github.com/paritytech/parity/pull/772)
+- test ethjson module on travis [#780](https://github.com/paritytech/parity/pull/780)
+- batch of rpc fixes [#775](https://github.com/paritytech/parity/pull/775)
+- rpctest executable [#757](https://github.com/paritytech/parity/pull/757)
+- Refactoring error transaction_queue error handling and `update_sealing` method. [#753](https://github.com/paritytech/parity/pull/753)
+- Avoid importing transactions with gas above 1.1*block_gas_limit to transaction queue [#760](https://github.com/paritytech/parity/pull/760)
+- Removing transactions that failed to be pushed to block. [#752](https://github.com/paritytech/parity/pull/752)
+- Updating clippy [#766](https://github.com/paritytech/parity/pull/766)
+- Attempting to add all transactions to mined block [#754](https://github.com/paritytech/parity/pull/754)
+- Prettier version w/o git dir; Use rustc compile time version [#761](https://github.com/paritytech/parity/pull/761)
+- Stop adding transactions to queue while not fully synced [#751](https://github.com/paritytech/parity/pull/751)
+- Verify sender's balance before importing transaction to queue [#746](https://github.com/paritytech/parity/pull/746)
+- Returning number of transactions pending in block not queue [#750](https://github.com/paritytech/parity/pull/750)
+- Speeding up build [#733](https://github.com/paritytech/parity/pull/733)
+- adding check for a sync when giving work to miner [#742](https://github.com/paritytech/parity/pull/742)
+- json deserialization module [#745](https://github.com/paritytech/parity/pull/745)
+- Update install-parity.sh [#749](https://github.com/paritytech/parity/pull/749)
+- Restart sync on getting old unknown header [#747](https://github.com/paritytech/parity/pull/747)
+- Missing return for #737 [#744](https://github.com/paritytech/parity/pull/744)
+- Enact block with uncles test [#741](https://github.com/paritytech/parity/pull/741)
+- Fix outdated libc version on dependency [#740](https://github.com/paritytech/parity/pull/740)
+- Fixing possible race in transaction queue [#735](https://github.com/paritytech/parity/pull/735)
+- Sync fixed again [#737](https://github.com/paritytech/parity/pull/737)
+- Don't change best block until extras is committed. [#734](https://github.com/paritytech/parity/pull/734)
+- stable only until travis speedup [#736](https://github.com/paritytech/parity/pull/736)
+- Optimizing uint operations (architecture independent) [#629](https://github.com/paritytech/parity/pull/629)
+- Add RLP, not a data item. [#725](https://github.com/paritytech/parity/pull/725)
+- PV63 receipts response [#687](https://github.com/paritytech/parity/pull/687)
+- another batch of rpc tests [#723](https://github.com/paritytech/parity/pull/723)
+- dockerfiles update [#726](https://github.com/paritytech/parity/pull/726)
+- Lock reports to avoid out of order badness. [#721](https://github.com/paritytech/parity/pull/721)
+- Fixed handshake leak [#722](https://github.com/paritytech/parity/pull/722)
+- Allow configuration of target gas limit. [#719](https://github.com/paritytech/parity/pull/719)
+- Version 1.1 in master [#714](https://github.com/paritytech/parity/pull/714)
+- Silence UDP warnings [#720](https://github.com/paritytech/parity/pull/720)
+- Rpc personal tests [#715](https://github.com/paritytech/parity/pull/715)
+- Fixing warnings [#704](https://github.com/paritytech/parity/pull/704)
+- docopts cleanups [#713](https://github.com/paritytech/parity/pull/713)
+- Removed rocksdb build dependency [#717](https://github.com/paritytech/parity/pull/717)
+- Fixed splitting Neighbours packet [#710](https://github.com/paritytech/parity/pull/710)
+- management of account expiration & memory [#701](https://github.com/paritytech/parity/pull/701)
+- Remove EarlyMerge from user docs. [#708](https://github.com/paritytech/parity/pull/708)
+- Fixes and traces for refcountdb. [#705](https://github.com/paritytech/parity/pull/705)
+- Check for NULL_RLP in AccountDB [#706](https://github.com/paritytech/parity/pull/706)
+- ethminer as crate [#700](https://github.com/paritytech/parity/pull/700)
+- Old ref-counted DB code [#692](https://github.com/paritytech/parity/pull/692)
+- next batch of rpc tests and fixes [#699](https://github.com/paritytech/parity/pull/699)
+- implemented eth_geStorageAt rpc method, added more tests for rpc [#695](https://github.com/paritytech/parity/pull/695)
+- Fix JournalDB era marker [#690](https://github.com/paritytech/parity/pull/690)
+- More sync fixes [#685](https://github.com/paritytech/parity/pull/685)
+- mark some key tests as heavy [#694](https://github.com/paritytech/parity/pull/694)
+- Limit incoming connections [#693](https://github.com/paritytech/parity/pull/693)
+- Updating clippy [#688](https://github.com/paritytech/parity/pull/688)
+- eth_accounts, eth_getBalance rpc functions && tests [#691](https://github.com/paritytech/parity/pull/691)
+- state query for archive jdb [#683](https://github.com/paritytech/parity/pull/683)
+- Fix for option 1 of JournalDB [#658](https://github.com/paritytech/parity/pull/658)
+- Rename into something that is a little more descriptive. [#689](https://github.com/paritytech/parity/pull/689)
+- JournalDB with in-memory overlay (option2) [#634](https://github.com/paritytech/parity/pull/634)
+- additional (failing) SecretStore test [#682](https://github.com/paritytech/parity/pull/682)
+- Updating clippy & fixing warnings. [#670](https://github.com/paritytech/parity/pull/670)
+- rpc web3 tests [#681](https://github.com/paritytech/parity/pull/681)
+- Making personal json-rpc configurable via cli [#677](https://github.com/paritytech/parity/pull/677)
+- RPC Pending Transactions Filter [#661](https://github.com/paritytech/parity/pull/661)
+- Rearrange journaldb infrastructure to make more extensible [#678](https://github.com/paritytech/parity/pull/678)
+- JournalDB -> Box<JournalDB>, and it's a trait. [#673](https://github.com/paritytech/parity/pull/673)
+- fix warning for transaction_queue.add usage [#676](https://github.com/paritytech/parity/pull/676)
+- Adding std::mem back (only for asm) [#680](https://github.com/paritytech/parity/pull/680)
+- update readme to exclude beta step (stable is ok) [#679](https://github.com/paritytech/parity/pull/679)
+- fixed U256 and transaction request deserialization [#675](https://github.com/paritytech/parity/pull/675)
+- More geth compatibility. [#666](https://github.com/paritytech/parity/pull/666)
+- Removing running clippy by default on nightly. [#671](https://github.com/paritytech/parity/pull/671)
+- rpc net submodule tests [#667](https://github.com/paritytech/parity/pull/667)
+- Client module overhaul [#665](https://github.com/paritytech/parity/pull/665)
+- Rpc transaction signing [#587](https://github.com/paritytech/parity/pull/587)
+- Transaction queue exposed via JSON rpc. [#652](https://github.com/paritytech/parity/pull/652)
+- Remove unneeded locking [#499](https://github.com/paritytech/parity/pull/499)
+- extend sync status interface to sync provider [#664](https://github.com/paritytech/parity/pull/664)
+- --archive is default. --pruning is option. [#663](https://github.com/paritytech/parity/pull/663)
+- jsonrpc uses client and sync interfaces [#641](https://github.com/paritytech/parity/pull/641)
+- Expose transaction insertion in sync lib [#609](https://github.com/paritytech/parity/pull/609)
+- Removing get prefix from poll_info [#660](https://github.com/paritytech/parity/pull/660)
+- Tx queue update height bug [#657](https://github.com/paritytech/parity/pull/657)
+- Tx_queue_docs -> To master [#651](https://github.com/paritytech/parity/pull/651)
+- blockchain import_route [#645](https://github.com/paritytech/parity/pull/645)
+- Stop workers before stopping event loop [#655](https://github.com/paritytech/parity/pull/655)
+- Validate sender before importing to queue [#650](https://github.com/paritytech/parity/pull/650)
+- Gas price threshold for transactions [#640](https://github.com/paritytech/parity/pull/640)
+- `dev` feature enabled when compiling without `--release` [#627](https://github.com/paritytech/parity/pull/627)
+- Don't call mark_as_bad needlessly [#648](https://github.com/paritytech/parity/pull/648)
+- Fixed sync handling large forks [#647](https://github.com/paritytech/parity/pull/647)
+- Additional documentation for transaction queue [#631](https://github.com/paritytech/parity/pull/631)
+- Transaction Queue Integration [#607](https://github.com/paritytech/parity/pull/607)
+- Keys cli [#639](https://github.com/paritytech/parity/pull/639)
+- fix build warning [#643](https://github.com/paritytech/parity/pull/643)
+- updated jsonrpc-core and http-server libs [#642](https://github.com/paritytech/parity/pull/642)
+- jsonrpc panics gracefully shutdown client [#638](https://github.com/paritytech/parity/pull/638)
+- Fixing CLI parameters [#633](https://github.com/paritytech/parity/pull/633)
+- Normal CLI options with geth. [#628](https://github.com/paritytech/parity/pull/628)
+- Do not remove the peer immediatelly on send error [#626](https://github.com/paritytech/parity/pull/626)
+- Jsonrpc block behind [#622](https://github.com/paritytech/parity/pull/622)
+- Remove println!s. [#624](https://github.com/paritytech/parity/pull/624)
+- JournalDB option 1 fix [#613](https://github.com/paritytech/parity/pull/613)
+- Network tracing cleanup [#611](https://github.com/paritytech/parity/pull/611)
+- Revert "Transaction Queue integration" [#602](https://github.com/paritytech/parity/pull/602)
+- fix benches compilation [#601](https://github.com/paritytech/parity/pull/601)
+- Transaction Queue integration [#595](https://github.com/paritytech/parity/pull/595)
+- verifier trait improvements [#597](https://github.com/paritytech/parity/pull/597)
+- build on rust stable [#600](https://github.com/paritytech/parity/pull/600)
+- Geth import silent if no geth [#599](https://github.com/paritytech/parity/pull/599)
+- Additional journaldb logging and assert [#593](https://github.com/paritytech/parity/pull/593)
+- Uncle inclusion in block authoring. [#578](https://github.com/paritytech/parity/pull/578)
+- Fixed potential deadlock on startup [#592](https://github.com/paritytech/parity/pull/592)
+- Fixing an overflow panic [#591](https://github.com/paritytech/parity/pull/591)
+- Fixed one more case of sync stalling [#590](https://github.com/paritytech/parity/pull/590)
+- JournalDB can now operate in "archive" mode [#589](https://github.com/paritytech/parity/pull/589)
+- Secret store integration with client [#586](https://github.com/paritytech/parity/pull/586)
+- fix build on nightly rust [#588](https://github.com/paritytech/parity/pull/588)
+- deserialization for uint generic [#585](https://github.com/paritytech/parity/pull/585)
+- TransactionsQueue implementation [#559](https://github.com/paritytech/parity/pull/559)
+- JSON-RPC personal service (follows #582) [#583](https://github.com/paritytech/parity/pull/583)
+- making key directory thread-safe [#582](https://github.com/paritytech/parity/pull/582)
+- verifier trait [#581](https://github.com/paritytech/parity/pull/581)
+- shrink_to_fit after removing hashes. [#580](https://github.com/paritytech/parity/pull/580)
+- support for rpc polling [#504](https://github.com/paritytech/parity/pull/504)
+- limit serde codegen only to rpc types submodule [#569](https://github.com/paritytech/parity/pull/569)
+- fork test for Issue test/568 [#573](https://github.com/paritytech/parity/pull/573)
+- Fixing clippy warnings = small refactoring of `request_blocks` [#560](https://github.com/paritytech/parity/pull/560)
+- Improved journaldb logging [#571](https://github.com/paritytech/parity/pull/571)
+- Additional check to ancient enactments. [#570](https://github.com/paritytech/parity/pull/570)
+- chainfilter shouldnt exclude to_block from results [#564](https://github.com/paritytech/parity/pull/564)
+- Fix coverage test run [#567](https://github.com/paritytech/parity/pull/567)
+- Mining [#547](https://github.com/paritytech/parity/pull/547)
+- fix uint warnings [#565](https://github.com/paritytech/parity/pull/565)
+- Finished blockchain generator. [#562](https://github.com/paritytech/parity/pull/562)
+- fixed broken master [#563](https://github.com/paritytech/parity/pull/563)
+- uint to separate crate [#544](https://github.com/paritytech/parity/pull/544)
+- improved test chain generator [#554](https://github.com/paritytech/parity/pull/554)
+- Fixing spelling in propagade->propagate [#558](https://github.com/paritytech/parity/pull/558)
+- Changing RefCell to Cell in transaction. [#557](https://github.com/paritytech/parity/pull/557)
+- Fix for morden consensus. [#556](https://github.com/paritytech/parity/pull/556)
+- blockchain generator [#550](https://github.com/paritytech/parity/pull/550)
+- Sparse Table Implementation (Row, Col) -> Val [#545](https://github.com/paritytech/parity/pull/545)
+- fixup install script [#548](https://github.com/paritytech/parity/pull/548)
+- Fixing clippy warnings [#546](https://github.com/paritytech/parity/pull/546)
+- ignore out directory [#543](https://github.com/paritytech/parity/pull/543)
+- u256 full multiplication [#539](https://github.com/paritytech/parity/pull/539)
+- Fix panic when downloading stales, update homestead transition [#537](https://github.com/paritytech/parity/pull/537)
+- changing x64 asm config [#534](https://github.com/paritytech/parity/pull/534)
+- uncomment state transition tests [#533](https://github.com/paritytech/parity/pull/533)
+- jsonrpc uses weak pointers to client [#532](https://github.com/paritytech/parity/pull/532)
+- Morden switch to Homestead rules at #494,000. [#531](https://github.com/paritytech/parity/pull/531)
+- Blockchain module cleanup [#524](https://github.com/paritytech/parity/pull/524)
+- Multiplication issue + very exhaustive tests for it [#528](https://github.com/paritytech/parity/pull/528)
+- EIP-8 [#498](https://github.com/paritytech/parity/pull/498)
+- Make "random" trie tests fully deterministic. [#527](https://github.com/paritytech/parity/pull/527)
+- udpated serde to version 0.7.0 [#526](https://github.com/paritytech/parity/pull/526)
+- Better memory management [#516](https://github.com/paritytech/parity/pull/516)
+- Typo [#523](https://github.com/paritytech/parity/pull/523)
+- U512 add/sub optimize [#521](https://github.com/paritytech/parity/pull/521)
+- Account management + geth keystore import (no utility crate added) [#509](https://github.com/paritytech/parity/pull/509)
+- Delayed UPnP initialization [#505](https://github.com/paritytech/parity/pull/505)
+- Fixing marking blocks as bad & SyncMessage bugs + small client refactoring. [#503](https://github.com/paritytech/parity/pull/503)
+- optimization of U256 [#515](https://github.com/paritytech/parity/pull/515)
+- Removed rocksdb from build scripts and instructions [#520](https://github.com/paritytech/parity/pull/520)
+- RocksDB abstraction layer + Hash index for state DB [#464](https://github.com/paritytech/parity/pull/464)
+- bloomfilter [#418](https://github.com/paritytech/parity/pull/418)
+- Fixed a race condition when connecting peer disconnects immediately [#519](https://github.com/paritytech/parity/pull/519)
+- ignore intellij idea project files as well [#518](https://github.com/paritytech/parity/pull/518)
+- updated version of unicase [#517](https://github.com/paritytech/parity/pull/517)
+- jsonrpc security, cors headers, fixed #359 [#493](https://github.com/paritytech/parity/pull/493)
+- Rust implementations to replace data tables (#161) [#482](https://github.com/paritytech/parity/pull/482)
+- fix issue with starting requested block number was not included itself [#512](https://github.com/paritytech/parity/pull/512)
+- fixed travis --org GH_TOKEN [#510](https://github.com/paritytech/parity/pull/510)
+- Improved log format [#506](https://github.com/paritytech/parity/pull/506)
+- Log address on failed connection attempt [#502](https://github.com/paritytech/parity/pull/502)
+- Bumping clippy and fixing warnings. [#501](https://github.com/paritytech/parity/pull/501)
+- Bumping versions. Fixes #496 [#500](https://github.com/paritytech/parity/pull/500)
+- Manage final user-input errors. [#494](https://github.com/paritytech/parity/pull/494)
+- Remove unneeded code, fix minor potential issue with length. [#495](https://github.com/paritytech/parity/pull/495)
+- Remove "unknown" from version string. [#488](https://github.com/paritytech/parity/pull/488)
+- Include git commit date & hash. [#486](https://github.com/paritytech/parity/pull/486)
+- Use proper version string. [#485](https://github.com/paritytech/parity/pull/485)
+- Networking fixes [#480](https://github.com/paritytech/parity/pull/480)
+- Fix potential deadlock on node table update [#484](https://github.com/paritytech/parity/pull/484)
+- Squash more warnings [#481](https://github.com/paritytech/parity/pull/481)
+- dev/test/build tools to separate crate [#477](https://github.com/paritytech/parity/pull/477)
+- Back to original slab crate [#479](https://github.com/paritytech/parity/pull/479)
+- Better user errors. [#476](https://github.com/paritytech/parity/pull/476)
+- UDP Discovery [#440](https://github.com/paritytech/parity/pull/440)
+- update readme with rust override [#475](https://github.com/paritytech/parity/pull/475)
+- fixed warnings on rust beta [#474](https://github.com/paritytech/parity/pull/474)
+- Secret store (part2 - encrypted key/value svc) [#449](https://github.com/paritytech/parity/pull/449)
+- Kill bad test. [#473](https://github.com/paritytech/parity/pull/473)
+- Make clippy an optional dependency [#422](https://github.com/paritytech/parity/pull/422)
+- parity compiling fine [#469](https://github.com/paritytech/parity/pull/469)
+- compiling ethcore on beta [#468](https://github.com/paritytech/parity/pull/468)
+- Utils compiling in beta [#467](https://github.com/paritytech/parity/pull/467)
+- Get rid of lru_cache dependency [#466](https://github.com/paritytech/parity/pull/466)
+- Add daemonization. [#459](https://github.com/paritytech/parity/pull/459)
+- Master upgrade [#448](https://github.com/paritytech/parity/pull/448)
+- Remove contributing stuff now that we have CLA bot. [#447](https://github.com/paritytech/parity/pull/447)
+- Add Morden bootnode. [#446](https://github.com/paritytech/parity/pull/446)
+- beta fixes to master [#441](https://github.com/paritytech/parity/pull/441)
+- Secret store (part1 - key management) [#423](https://github.com/paritytech/parity/pull/423)
+- Use 1100000 as the homestead transition, fix build instructions. [#438](https://github.com/paritytech/parity/pull/438)
+- More sync and propagation fixes [#420](https://github.com/paritytech/parity/pull/420)
+- back to cargo crates [#436](https://github.com/paritytech/parity/pull/436)
+- Fixing clippy warnings [#435](https://github.com/paritytech/parity/pull/435)
+- preserving root cargo lock [#434](https://github.com/paritytech/parity/pull/434)
+- Nightly fix [#432](https://github.com/paritytech/parity/pull/432)
+- nightly fixes [#431](https://github.com/paritytech/parity/pull/431)
+- Delay Homestead transition from 1,000,000. [#429](https://github.com/paritytech/parity/pull/429)
+- Nightly fix effort (still should fail) [#428](https://github.com/paritytech/parity/pull/428)
+- clippy version update, docopt-macro moving to fork [#425](https://github.com/paritytech/parity/pull/425)
+- Network/Sync fixes and optimizations [#416](https://github.com/paritytech/parity/pull/416)
+- Use latest era instead of end era as journal marker [#414](https://github.com/paritytech/parity/pull/414)
+- api changes [#402](https://github.com/paritytech/parity/pull/402)
+- Option for no init nodes. [#408](https://github.com/paritytech/parity/pull/408)
+- Fixed block_bodies not returning a list [#406](https://github.com/paritytech/parity/pull/406)
+- Fix test. [#405](https://github.com/paritytech/parity/pull/405)
+- Allow path to be configured. [#404](https://github.com/paritytech/parity/pull/404)
+- Upnp [#400](https://github.com/paritytech/parity/pull/400)
+- eth_syncing, fixed #397 [#398](https://github.com/paritytech/parity/pull/398)
+- Using modified version of ctrlc that catches SIGTERM [#399](https://github.com/paritytech/parity/pull/399)
+- Catching panics. [#396](https://github.com/paritytech/parity/pull/396)
+- jsonrpc [#391](https://github.com/paritytech/parity/pull/391)
+- Externalities tests (still clumsy) [#394](https://github.com/paritytech/parity/pull/394)
+- excluding test code itself from coverage [#395](https://github.com/paritytech/parity/pull/395)
+- Additional tweaks to options. [#390](https://github.com/paritytech/parity/pull/390)
+- --chain option for setting which network to go on. [#388](https://github.com/paritytech/parity/pull/388)
+- Ethash unit tests final [#387](https://github.com/paritytech/parity/pull/387)
+- jsonrpc [#374](https://github.com/paritytech/parity/pull/374)
+- Editorconfig file. [#384](https://github.com/paritytech/parity/pull/384)
+- Coverage effort [in progress] [#382](https://github.com/paritytech/parity/pull/382)
+- making root kcov runner simular to the one running on CI [#380](https://github.com/paritytech/parity/pull/380)
+- add gcc as a dependency to dockerfiles [#381](https://github.com/paritytech/parity/pull/381)
+- Check for handshake expiration before attempting connection replace [#375](https://github.com/paritytech/parity/pull/375)
+- Blocks propagation [#364](https://github.com/paritytech/parity/pull/364)
+- Network params. [#376](https://github.com/paritytech/parity/pull/376)
+- Add parity-node-zero to bootnodes. [#373](https://github.com/paritytech/parity/pull/373)
+- kcov uses travis_job_id instead of coveralls token [#370](https://github.com/paritytech/parity/pull/370)
+- Add parity-node-zero.ethcore.io to boot nodes. [#371](https://github.com/paritytech/parity/pull/371)
+
+## Parity [v1.0.0-rc1](https://github.com/paritytech/parity/releases/tag/v1.0.0-rc1) (2016-03-15)
+
+First Parity 1.0.0 release candidate.
+
+- Version 1.0 in beta [#712](https://github.com/paritytech/parity/pull/712)
+- Fix test for beta [#617](https://github.com/paritytech/parity/pull/617)
+- JournalDB fix option 1 for beta [#614](https://github.com/paritytech/parity/pull/614)
+- Failing test. [#606](https://github.com/paritytech/parity/pull/606)
+- Fix transition points [#604](https://github.com/paritytech/parity/pull/604)
+- (BETA) Update README.md [#549](https://github.com/paritytech/parity/pull/549)
+- (BETA) instructions for beta release channel [#456](https://github.com/paritytech/parity/pull/456)
+- (BETA) fix nightly - remerge [#454](https://github.com/paritytech/parity/pull/454)
+- (BETA) fixing nightly version for beta [#452](https://github.com/paritytech/parity/pull/452)
diff --git a/docs/CHANGELOG-1.1.md b/docs/CHANGELOG-1.1.md
new file mode 100644
index 0000000000000000000000000000000000000000..6c40ad8234e1b1f3535ff1d24fd44552d6e3e54f
--- /dev/null
+++ b/docs/CHANGELOG-1.1.md
@@ -0,0 +1,154 @@
+Note: Parity 1.1 reached End-of-Life on 2016-08-12 (EOL).
+
+## Parity [v1.1.0](https://github.com/paritytech/parity/releases/tag/v1.1.0) (2016-05-02)
+
+Parity 1.1.0 introduces:
+
+- Transaction tracing. Parity now optionally indexes & stores message-call/"internal transaction" information and provides additional RPC for querying.
+- Web interface for logs, status & JSON RPC.
+- Improved JSON RPC compatibility.
+- Reduced memory footprint.
+- Optimized EVM interpreter performance.
+
+Full Changes:
+
+- Exposing default extra data via ethcore RPC [#1032](https://github.com/paritytech/parity/pull/1032)
+- Net etiquette [#1028](https://github.com/paritytech/parity/pull/1028)
+- Bumping clippy & fixing warnings [#1024](https://github.com/paritytech/parity/pull/1024)
+- Tracedb interface && cli [#997](https://github.com/paritytech/parity/pull/997)
+- Switching to geth-attach supporting version of rpc core and server [#1022](https://github.com/paritytech/parity/pull/1022)
+- Fixing status page displaying homestead  [#1020](https://github.com/paritytech/parity/pull/1020)
+- Core tracedb functionality. [#996](https://github.com/paritytech/parity/pull/996)
+- RPC method for supported modules [#1019](https://github.com/paritytech/parity/pull/1019)
+- Updating status page [#1015](https://github.com/paritytech/parity/pull/1015)
+- Disabling wallet [#1017](https://github.com/paritytech/parity/pull/1017)
+- More detailed fatal error reporting [#1016](https://github.com/paritytech/parity/pull/1016)
+- Support 'pending' block in RPC [#1007](https://github.com/paritytech/parity/pull/1007)
+- Enable pending block when there is local transaction pending. [#1005](https://github.com/paritytech/parity/pull/1005)
+- updating key files permissions on save [#1010](https://github.com/paritytech/parity/pull/1010)
+- IPC JSON RPC (for external interface) [#1009](https://github.com/paritytech/parity/pull/1009)
+- Fixing Firefox authorization issues [#1013](https://github.com/paritytech/parity/pull/1013)
+- cargo update [#1012](https://github.com/paritytech/parity/pull/1012)
+- Switching to rust-url@1.0.0 [#1011](https://github.com/paritytech/parity/pull/1011)
+- Exception handling in RPC & WebApps [#988](https://github.com/paritytech/parity/pull/988)
+- Fixed uint deserialization from hex [#1008](https://github.com/paritytech/parity/pull/1008)
+- Tweak timeout and packet size to handle slow networks better [#1004](https://github.com/paritytech/parity/pull/1004)
+- db key is generic and can be made smaller [#1006](https://github.com/paritytech/parity/pull/1006)
+- IPC with new serialization [#998](https://github.com/paritytech/parity/pull/998)
+- make jsonrpc api engine agnostic [#1001](https://github.com/paritytech/parity/pull/1001)
+- updated cargo.lock [#1002](https://github.com/paritytech/parity/pull/1002)
+- updated parity dependencies [#993](https://github.com/paritytech/parity/pull/993)
+- Auto (with codegen) binary serializer  [#980](https://github.com/paritytech/parity/pull/980)
+- Fixing transaction queue last_nonces update [#995](https://github.com/paritytech/parity/pull/995)
+- import route contains ommited blocks [#994](https://github.com/paritytech/parity/pull/994)
+- fixed encoding 0u8 [#992](https://github.com/paritytech/parity/pull/992)
+- Use latest netstats [#989](https://github.com/paritytech/parity/pull/989)
+- RPC shared external miner [#984](https://github.com/paritytech/parity/pull/984)
+- Additional RPC methods for settings [#983](https://github.com/paritytech/parity/pull/983)
+- Fixing transaction_queue deadlock [#985](https://github.com/paritytech/parity/pull/985)
+- Refactoring of `parity/main.rs` [#981](https://github.com/paritytech/parity/pull/981)
+- Fixing clippy warnings. [#982](https://github.com/paritytech/parity/pull/982)
+- Bumping status page [#977](https://github.com/paritytech/parity/pull/977)
+- querying extras separated to its own module [#972](https://github.com/paritytech/parity/pull/972)
+- Exposing application logs via RPC. [#976](https://github.com/paritytech/parity/pull/976)
+- Addressing binary serialization for db types [#966](https://github.com/paritytech/parity/pull/966)
+- removed redundant unwraps [#935](https://github.com/paritytech/parity/pull/935)
+- fixed transaction queue merge conflict [#975](https://github.com/paritytech/parity/pull/975)
+- Configurable limit for transaction queue (CLI & Ethcore-RPC) [#974](https://github.com/paritytech/parity/pull/974)
+- Enforce limit caused `last_nonce` to return incorrect values. [#973](https://github.com/paritytech/parity/pull/973)
+- Even more detailed errors for transaction queue [#969](https://github.com/paritytech/parity/pull/969)
+- temporary fix of panic in blockchain garbage collection [#970](https://github.com/paritytech/parity/pull/970)
+- IPC codegen - some minor fixes & enhancements [#967](https://github.com/paritytech/parity/pull/967)
+- Additional logging for transactions [#968](https://github.com/paritytech/parity/pull/968)
+- refactored blockchain extras keys building [#963](https://github.com/paritytech/parity/pull/963)
+- Using hyper-mio branch in webapps. [#957](https://github.com/paritytech/parity/pull/957)
+- Remove nanomsg from build-dependencies [#965](https://github.com/paritytech/parity/pull/965)
+- Fix build for --target=armv7-unknown-linux-gnueabihf [#964](https://github.com/paritytech/parity/pull/964)
+- IPC RPC codegen extra feature [#962](https://github.com/paritytech/parity/pull/962)
+- IPC RPC codegen for generic implementation [#961](https://github.com/paritytech/parity/pull/961)
+- using db_path directory when upgrading [#960](https://github.com/paritytech/parity/pull/960)
+- IPC hypervisor [#958](https://github.com/paritytech/parity/pull/958)
+- Removing a transaction from queue now removes all from this sender with lower nonces. [#950](https://github.com/paritytech/parity/pull/950)
+- bump status page version 0.1.7 [#955](https://github.com/paritytech/parity/pull/955)
+- Changing cors header to be optional [#956](https://github.com/paritytech/parity/pull/956)
+- Update ARM Dockerfile [#959](https://github.com/paritytech/parity/pull/959)
+- Sensible gas limits for eth_sendTransaction [#953](https://github.com/paritytech/parity/pull/953)
+- Fix upgrade script and make parity run when no .parity dir. [#954](https://github.com/paritytech/parity/pull/954)
+- Tracing and docs for --pruning=auto. [#952](https://github.com/paritytech/parity/pull/952)
+- IPC serialization for custom parameters [#946](https://github.com/paritytech/parity/pull/946)
+- default filter from block should be Latest, not Earliest [#948](https://github.com/paritytech/parity/pull/948)
+- README.md: removes sudo from multirust installation [#943](https://github.com/paritytech/parity/pull/943)
+- Disable long lines formatting + ethash example. [#939](https://github.com/paritytech/parity/pull/939)
+- Ethcore-specific RPC methods for altering miner parameters. [#934](https://github.com/paritytech/parity/pull/934)
+- Use ethcore nanomsg bindings [#941](https://github.com/paritytech/parity/pull/941)
+- Update IPC codegen to latest syntax libs [#938](https://github.com/paritytech/parity/pull/938)
+- IPC documentation [#937](https://github.com/paritytech/parity/pull/937)
+- Bumping clippy and fixing warnings. [#936](https://github.com/paritytech/parity/pull/936)
+- Pruning auto [#927](https://github.com/paritytech/parity/pull/927)
+- IPC persistent client link [#933](https://github.com/paritytech/parity/pull/933)
+- IPC persistent client link [#930](https://github.com/paritytech/parity/pull/930)
+- IPC handshake (negotiating protocol/api version) [#928](https://github.com/paritytech/parity/pull/928)
+- Upgrade logic between versions [#914](https://github.com/paritytech/parity/pull/914)
+- executive tracing cleanup [#903](https://github.com/paritytech/parity/pull/903)
+- Ethcore-specific RPC methods [#923](https://github.com/paritytech/parity/pull/923)
+- Parameter to allow user to force the sealing mechanism [#918](https://github.com/paritytech/parity/pull/918)
+- updated dependencies [#921](https://github.com/paritytech/parity/pull/921)
+- Fixed send transaction deadlock [#920](https://github.com/paritytech/parity/pull/920)
+- --unlock is comma-delimited. [#916](https://github.com/paritytech/parity/pull/916)
+- fixed eth_getLogs [#915](https://github.com/paritytech/parity/pull/915)
+- create provided custom dir for keys if none [#912](https://github.com/paritytech/parity/pull/912)
+- spec loading cleanup [#858](https://github.com/paritytech/parity/pull/858)
+- WebApps HTTP Basic Auth Support [#906](https://github.com/paritytech/parity/pull/906)
+- Removing match on constant [#888](https://github.com/paritytech/parity/pull/888)
+- Update auth.rs [#907](https://github.com/paritytech/parity/pull/907)
+- Enabling webapps compilation by default [#904](https://github.com/paritytech/parity/pull/904)
+- fixed #895 [#898](https://github.com/paritytech/parity/pull/898)
+- Support for compile-time included WebApplications. [#899](https://github.com/paritytech/parity/pull/899)
+- Propagate transaction queue [#894](https://github.com/paritytech/parity/pull/894)
+- Use new json RPC server [#901](https://github.com/paritytech/parity/pull/901)
+- Gracefully dying when trying to enable RPC and app is compiled without it. [#900](https://github.com/paritytech/parity/pull/900)
+- Additional logging and friendlier error messages [#893](https://github.com/paritytech/parity/pull/893)
+- Avoid signalling readiness when app is about to be closed. [#897](https://github.com/paritytech/parity/pull/897)
+- fixed #875 and added tests for eth_sendTransaction [#890](https://github.com/paritytech/parity/pull/890)
+- passing key path to all invocations [#891](https://github.com/paritytech/parity/pull/891)
+- Fixed eth_call nonce and gas handling [#892](https://github.com/paritytech/parity/pull/892)
+- ipc rpc with nano transport (simple duplex) [#886](https://github.com/paritytech/parity/pull/886)
+- Bumping clippy and fixing warnings [#889](https://github.com/paritytech/parity/pull/889)
+- More descriptive expectations to transaction queue consistency. [#878](https://github.com/paritytech/parity/pull/878)
+- uint bug - replace add with or [#879](https://github.com/paritytech/parity/pull/879)
+- Fixing typo in bigint [#877](https://github.com/paritytech/parity/pull/877)
+- update misleading cli help msg for author [#874](https://github.com/paritytech/parity/pull/874)
+- Find geth data store cross-platform. [#871](https://github.com/paritytech/parity/pull/871)
+- Import geth 1.4.0 keys [#872](https://github.com/paritytech/parity/pull/872)
+- Syntax helpers for IPC RPC (part 2) [#854](https://github.com/paritytech/parity/pull/854)
+- Fixed bootnode URL and error message [#870](https://github.com/paritytech/parity/pull/870)
+- replace popcnt with mov (861) [#867](https://github.com/paritytech/parity/pull/867)
+- weekly dependencies update [#865](https://github.com/paritytech/parity/pull/865)
+- Remove unused mut [#866](https://github.com/paritytech/parity/pull/866)
+- fixed #855 [#864](https://github.com/paritytech/parity/pull/864)
+- simplified trace from functions, removed clippy warnings [#862](https://github.com/paritytech/parity/pull/862)
+- Update deprecated HashDB methods in docs. [#857](https://github.com/paritytech/parity/pull/857)
+- refactored loading transaction json tests [#853](https://github.com/paritytech/parity/pull/853)
+- reorganised price info lookup [#852](https://github.com/paritytech/parity/pull/852)
+- Publish locally-made transactions to peers. [#850](https://github.com/paritytech/parity/pull/850)
+- Add generalbeck's token [#847](https://github.com/paritytech/parity/pull/847)
+- Fix response for mining. [#846](https://github.com/paritytech/parity/pull/846)
+- USD-based pricing of gas. [#843](https://github.com/paritytech/parity/pull/843)
+- Parity can accept older work packages [#811](https://github.com/paritytech/parity/pull/811)
+- Caching for computing seed hashes (#541) [#841](https://github.com/paritytech/parity/pull/841)
+- checking transaction queue for pending transaction [#838](https://github.com/paritytech/parity/pull/838)
+- refactored loading of state tests [#817](https://github.com/paritytech/parity/pull/817)
+- tests for deserialization of transaction from issue #835 [#837](https://github.com/paritytech/parity/pull/837)
+- unlocks with no expiration [on top of 833] [#834](https://github.com/paritytech/parity/pull/834)
+- Unlock accounts on CLI. [#833](https://github.com/paritytech/parity/pull/833)
+- Make BlockNumber optional, fix eth_call [#829](https://github.com/paritytech/parity/pull/829)
+- Test socket to common test code (ethcore-devtools) [#831](https://github.com/paritytech/parity/pull/831)
+- Use network id for the web3_net_version return. [#822](https://github.com/paritytech/parity/pull/822)
+- json-rpc web3_sha3 [#824](https://github.com/paritytech/parity/pull/824)
+- remove some unused files [#819](https://github.com/paritytech/parity/pull/819)
+- debug symbols for master/beta [#818](https://github.com/paritytech/parity/pull/818)
+- Syntax helpers for IPC RPC [#809](https://github.com/paritytech/parity/pull/809)
+- refactored loading of execution tests [#803](https://github.com/paritytech/parity/pull/803)
+- Rustfmt.toml [#805](https://github.com/paritytech/parity/pull/805)
+- install-partiy runs brew reinstall parity on osx [#810](https://github.com/paritytech/parity/pull/810)
+- Fix mining from spinning [#807](https://github.com/paritytech/parity/pull/807)
diff --git a/docs/CHANGELOG-1.2.md b/docs/CHANGELOG-1.2.md
new file mode 100644
index 0000000000000000000000000000000000000000..4a9bfecd0714af2086b70f62e8e636c6eb511e09
--- /dev/null
+++ b/docs/CHANGELOG-1.2.md
@@ -0,0 +1,376 @@
+Note: Parity 1.2 reached End-of-Life on 2016-11-07 (EOL).
+
+## Parity [v1.2.4](https://github.com/paritytech/parity/releases/tag/v1.2.4) (2016-08-09)
+
+Parity 1.2.4 Is a maintenance release that fixes a [few](https://github.com/paritytech/parity/pull/1888/commits) issues related to mining and peer synchronization.
+This release is marked as stable.
+
+- Backports for beta [#1888](https://github.com/paritytech/parity/pull/1888)
+- BETA: fixed trace_transaction crash when block contained suicide [#1782](https://github.com/paritytech/parity/pull/1782)
+
+## Parity [v1.2.3](https://github.com/paritytech/parity/releases/tag/v1.2.3) (2016-07-31)
+
+Parity 1.2.3 is a patch release that addresses network stability issues for both Ethereum HF and Ethereum classic chains and brings a few changes to the transaction tracing API.
+
+#### Tracing API changes
+- Added tracing for `CALLCODE`, `DELEGATECALL` and `SUICIDE`
+- `trace_call` returns traces in flat format
+- Added 2 new methods: `trace_rawTransaction` and `trace_replayTransaction`
+
+Note that to continue using tracing features in this version you need to re-sync the blockchain. This can be done by using `parity export $HOME/ethereum-chain-backup.rlp` , deleting the database usually located at `~/.parity/906a34e69aec8c0d` followed by `parity import $HOME/ethereum-chain-backup.rlp`.
+
+- [beta] Updating UI [#1778](https://github.com/paritytech/parity/pull/1778)
+- tracing backport [#1770](https://github.com/paritytech/parity/pull/1770)
+- Backport commits to beta [#1763](https://github.com/paritytech/parity/pull/1763)
+- Deadlock on incoming connection (#1672) [#1675](https://github.com/paritytech/parity/pull/1675)
+- [BETA] Removed DAO soft fork traces [#1640](https://github.com/paritytech/parity/pull/1640)
+
+
+## Parity [v1.2.2](https://github.com/paritytech/parity/releases/tag/v1.2.2) (2016-07-16)
+
+#### New
+- DAO hard-fork.
+
+DAO hard-fork implementation conforms to the [specification](https://blog.slock.it/hard-fork-specification-24b889e70703) and is enabled by default.
+
+#### Changed
+- `--reseal-on-txs` defaults to `own`.
+- DAO soft-fork support has been removed along with related command line options.
+
+#### Resolved issues
+- `--db-cache-size` consuming too much memory.
+  `eth_getWork` RPC response additionally includes the block number.
+- Skipping transactions with invalid nonces when pushing to block.
+- Update sealing just once when externally importing many blocks (#1541).
+- Transaction tracing skipping simple transactions (#1606).
+- Other small fixes and improvements.
+
+Full changelog
+
+- DAO hard-fork (#1483) [#1636](https://github.com/paritytech/parity/pull/1636)
+- Backports for beta [#1628](https://github.com/paritytech/parity/pull/1628)
+- don't batch best block for branches (#1623) [#1626](https://github.com/paritytech/parity/pull/1626)
+- Merge bugfixes from master to beta [#1605](https://github.com/paritytech/parity/pull/1605)
+- (BETA) using block options cache instead of general cache for rocksdb [#1613](https://github.com/paritytech/parity/pull/1613)
+- Backport sealing fixes to beta [#1583](https://github.com/paritytech/parity/pull/1583)
+- v1.2.2 in beta [#1581](https://github.com/paritytech/parity/pull/1581)
+- Skipping transactions with invalid nonces when pushing to block. (#1545) [#1547](https://github.com/paritytech/parity/pull/1547)
+
+
+## Parity [v1.2.1](https://github.com/paritytech/parity/releases/tag/v1.2.1) (2016-07-01)
+
+#### New
+- Options for more precise mining tuning (see below).
+- Informative notification when block mined.
+- HTTP signal on new work-package.
+- Optimised database insertion for self-mined blocks.
+- Short-circuit for local transaction gas-price approval.
+- A number of issues related to mining have been fixed.
+
+##### Mining options
+- `--author` is now required for mining.
+- `--reseal-on-txs` Specify which transactions should force the node to reseal a block. By default parity updates the seal on incoming transactions to reduce transaction latency. Set this option to `none` to force updates on new blocks only.
+- `--reseal-min-period` Can be used to control how often a new pending block is generated if `none` is not selected on prior option.
+- `--work-queue-size` Controls how many pending blocks to keep in memory.
+- `--relay-set`  Can be used to enable more strict transaction verification.
+- `--remove-solved` Move solved blocks from the work package queue instead of cloning them. This gives a slightly faster import speed, but means that extra solutions submitted for the same work package will go unused.
+- `--notify-work` Accepts a list of URLs that will receive a POST request when new work package is available. The body of the POST message is JSON encoded and has the same format as `eth_getWork` RPC response.
+
+##### RPC
+
+`eth_getWork` RPC response additionally includes the block number.
+
+##### DAO soft-fork
+
+DAO soft-fork control options have been replaced by the single `--fork` option which disables the soft-fork by default.
+
+#### Changes
+
+- v1.2.1 in beta [#1492](https://github.com/paritytech/parity/pull/1492)
+- (BETA) add artifacts [#1420](https://github.com/paritytech/parity/pull/1420)
+
+## Parity [v1.2.0: "Security"](https://github.com/paritytech/parity/releases/tag/v1.2.0) (2016-06-24)
+
+[Blog post](https://blog.parity.io/announcing-parity-1-2/)
+
+#### New
+
+- Transaction signing UI.
+- IPC/RPC module.
+- Optimised mining support.
+- Windows build.
+- DAO soft-fork support.
+
+##### Transaction signing UI
+
+This is a new framework for signing transactions. It fulfills three requirements:
+- You should never have to type your passwords into a Dapp.
+- No Javascript code should ever hold a secret.
+- No transaction should ever be signed without the consent of the user.
+
+The feature is enabled through the `--signer` flag. When enabled, the user must ensure at least one "Signer UI" is set-up for managing transaction confirmation. There are two such UIs available; one through a Google Chrome Extension, separately installable and the second through a special web page hosted locally. Set-up must be done once for each such UI, through copying and pasting a token from the output console of Parity into the UI. Specific instructions are given in the UI.
+
+From this point on, no transaction may ever be signed by Parity except through one of these allowed Signer UIs, and no password should ever be entered anywhere else.
+
+##### IPC/RPC module and Mist/Geth compatibility
+
+Should be started with `--geth` to ensure Mist compatibility.
+
+##### Optimised mining support
+
+Numerous improvements and optimisations have been added to our mining implementation. A large "active queue" ensures that late-included transactions are included in the mined block without sacrificing older results from latent-reported `ethminer` results.
+
+##### Windows build
+
+We're happy to announce full Windows support with 1.2!
+
+##### Soft-fork
+
+This release includes support for the proposed [DAO soft-fork](https://docs.google.com/document/d/10RktunzjKNfp6Y8Cu4EhR5V9IqxEZq42LU126EYhWY4/pub). Upon upgrade, all mining nodes can vote for or against the soft fork (this is done through altering the block gas limit; a gas limit of at most 4M results in the soft-fork being triggered).
+
+By default, nodes vote "for" the DAO soft-fork (and try to reduce the gas limit to 3.1M). To vote against the soft-fork (keeping it at 4.7M), run with `--dont-help-rescue-dao`. Not upgrading is not recommended; if the majority votes with a soft-fork, an upgrade will be necessary to mine on the correct chain.
+
+#### Changed
+- Fast pruning method is now default for a fresh sync.
+- Web UI renamed to Dapps UI.
+- JSONRPC and Dapps UI enabled by default.
+- CLI options ending `-off` renamed to GNU-consistent prefix `--no-`.
+- Dynamic gas-pricing (data feed and statistical techniques used to determine optimum gas prices).
+
+Full changes:
+
+- Signer enabled by default for UI [#1417](https://github.com/paritytech/parity/pull/1417)
+- Remove experimental pruning options. [#1415](https://github.com/paritytech/parity/pull/1415)
+- Fixing interface and port for parity ui [#1414](https://github.com/paritytech/parity/pull/1414)
+- Configurable gas limit cap. [#1405](https://github.com/paritytech/parity/pull/1405)
+- Bumping TopBar, Minimal SignerUI and wallet [#1413](https://github.com/paritytech/parity/pull/1413)
+- Sync: Update highest block for progress reporting [#1411](https://github.com/paritytech/parity/pull/1411)
+- Tweaked CLI options for the release [#1407](https://github.com/paritytech/parity/pull/1407)
+- Further rocksdb tuning [#1409](https://github.com/paritytech/parity/pull/1409)
+- Fixing jit compilation [#1406](https://github.com/paritytech/parity/pull/1406)
+- Bump clippy [#1403](https://github.com/paritytech/parity/pull/1403)
+- Shortcut SF condition when canon known [#1401](https://github.com/paritytech/parity/pull/1401)
+- Additional assertions for internal state of queue [#1402](https://github.com/paritytech/parity/pull/1402)
+- Replace deprecated hashdb trait names [#1394](https://github.com/paritytech/parity/pull/1394)
+- rpc api by default for ipc [#1400](https://github.com/paritytech/parity/pull/1400)
+- Ensure judging the SF trigger by relative branch [#1399](https://github.com/paritytech/parity/pull/1399)
+- Signer with unlocked account working as expected. [#1398](https://github.com/paritytech/parity/pull/1398)
+- Make --signer default. [#1392](https://github.com/paritytech/parity/pull/1392)
+- Presale wallet [#1376](https://github.com/paritytech/parity/pull/1376)
+- Removing signer connection limit [#1396](https://github.com/paritytech/parity/pull/1396)
+- Optional gas price in transactions come from statistics [#1388](https://github.com/paritytech/parity/pull/1388)
+- Update README.md with cargo install [ci-skip] [#1389](https://github.com/paritytech/parity/pull/1389)
+- Fixing possible overflow during multiplication [#1381](https://github.com/paritytech/parity/pull/1381)
+- Update SF to latest spec [#1386](https://github.com/paritytech/parity/pull/1386)
+- Sync optimization [#1385](https://github.com/paritytech/parity/pull/1385)
+- Fixing order of if statements to avoid overflows. [#1384](https://github.com/paritytech/parity/pull/1384)
+- New topbar & signer UI [#1383](https://github.com/paritytech/parity/pull/1383)
+- Install trigger for DAO-rescue soft-fork. [#1329](https://github.com/paritytech/parity/pull/1329)
+- Rocksdb flush/compact limit [#1375](https://github.com/paritytech/parity/pull/1375)
+- CentOS Dockerfile [#1377](https://github.com/paritytech/parity/pull/1377)
+- RPC method to return number of unconfirmed transactions... [#1371](https://github.com/paritytech/parity/pull/1371)
+- bump jsonrpc-http-server [#1369](https://github.com/paritytech/parity/pull/1369)
+- Fix lock order when updating sealing [#1364](https://github.com/paritytech/parity/pull/1364)
+- Update sealing on new transactions [#1365](https://github.com/paritytech/parity/pull/1365)
+- Fixed panic on aborted connection [#1370](https://github.com/paritytech/parity/pull/1370)
+- importing presale wallet [#1368](https://github.com/paritytech/parity/pull/1368)
+- Set default database file size large enough [#1363](https://github.com/paritytech/parity/pull/1363)
+- Reserved peers rpc API [#1360](https://github.com/paritytech/parity/pull/1360)
+- Fixing replacing transaction with lower gas_price result. [#1343](https://github.com/paritytech/parity/pull/1343)
+- fixed migration of empty pruning dir [#1362](https://github.com/paritytech/parity/pull/1362)
+- Transaction processing queue [#1335](https://github.com/paritytech/parity/pull/1335)
+- Fixing last nonce values in case transaction is replaced [#1359](https://github.com/paritytech/parity/pull/1359)
+- docopt is an optional dependency of ethkey and ethstore [#1358](https://github.com/paritytech/parity/pull/1358)
+- Fixing clippy warnings [#1354](https://github.com/paritytech/parity/pull/1354)
+- Reduce locking when syncing [#1357](https://github.com/paritytech/parity/pull/1357)
+- removed unnecessary logs [#1356](https://github.com/paritytech/parity/pull/1356)
+- Updating parity-dapps [#1353](https://github.com/paritytech/parity/pull/1353)
+- moved keystore tests files from util to ethstore [#1352](https://github.com/paritytech/parity/pull/1352)
+- removed redundant bigint deps [#1351](https://github.com/paritytech/parity/pull/1351)
+- Reopen "reserved peers and reserved-only flag" [#1350](https://github.com/paritytech/parity/pull/1350)
+- Configurable rocksdb cache size [#1348](https://github.com/paritytech/parity/pull/1348)
+- Fixing future order and errors when reaching limit. [#1346](https://github.com/paritytech/parity/pull/1346)
+- Removing priority on local transactions [#1342](https://github.com/paritytech/parity/pull/1342)
+- Revert "Reserved peers, reserved-only flag" [#1349](https://github.com/paritytech/parity/pull/1349)
+- Sync attack defense: Deactivate peers on invalid block bodies [#1345](https://github.com/paritytech/parity/pull/1345)
+- Reserved peers, reserved-only flag [#1347](https://github.com/paritytech/parity/pull/1347)
+- CI for ethkey and ethstore [#1341](https://github.com/paritytech/parity/pull/1341)
+- Fixed empty block body composition [#1340](https://github.com/paritytech/parity/pull/1340)
+- Provide a signer UI token by default. [#1334](https://github.com/paritytech/parity/pull/1334)
+- docker uses rustup, fixes #1337 [#1344](https://github.com/paritytech/parity/pull/1344)
+- Fixed network service dispose [#1339](https://github.com/paritytech/parity/pull/1339)
+- Sync: Cache last sync round block parents [#1331](https://github.com/paritytech/parity/pull/1331)
+- secret store separated from util [#1304](https://github.com/paritytech/parity/pull/1304)
+- --geth prevent getTransactionReceipt from using pending. [#1325](https://github.com/paritytech/parity/pull/1325)
+- Fixing locks order in miner. [#1328](https://github.com/paritytech/parity/pull/1328)
+- Update default gas limit, rename field [#1324](https://github.com/paritytech/parity/pull/1324)
+- Use constants for DatabaseConfig [#1318](https://github.com/paritytech/parity/pull/1318)
+- Fixing clippy warnings [#1321](https://github.com/paritytech/parity/pull/1321)
+- Bumping topbar. Fixing ws server closing when suspending [#1312](https://github.com/paritytech/parity/pull/1312)
+- Syncing fix [#1320](https://github.com/paritytech/parity/pull/1320)
+- Filling-in optional fields of TransactionRequest... [#1305](https://github.com/paritytech/parity/pull/1305)
+- Removing MakerOTC and DAO dapps  [#1319](https://github.com/paritytech/parity/pull/1319)
+- Disabling ethcore_set* APIs by default (+ Status page update) [#1315](https://github.com/paritytech/parity/pull/1315)
+- fixed #1180 [#1282](https://github.com/paritytech/parity/pull/1282)
+- Network start/stop [#1313](https://github.com/paritytech/parity/pull/1313)
+- Additional logging for own transactions in queue [#1311](https://github.com/paritytech/parity/pull/1311)
+- DAO Rescue soft fork [#1309](https://github.com/paritytech/parity/pull/1309)
+- Appveyor config for windows build+installer [#1302](https://github.com/paritytech/parity/pull/1302)
+- Key load avoid warning [#1303](https://github.com/paritytech/parity/pull/1303)
+- More meaningful errors when sending transaction [#1290](https://github.com/paritytech/parity/pull/1290)
+- Gas price statistics. [#1291](https://github.com/paritytech/parity/pull/1291)
+- Fix read-ahead bug. [#1298](https://github.com/paritytech/parity/pull/1298)
+- firewall rules for windows installer [#1297](https://github.com/paritytech/parity/pull/1297)
+- x64 program files path for installer [#1296](https://github.com/paritytech/parity/pull/1296)
+- Fixed loosing peers on incoming connections. [#1293](https://github.com/paritytech/parity/pull/1293)
+- fixed #1261, overflow when calculating work [#1283](https://github.com/paritytech/parity/pull/1283)
+- snappy and minor block compression [#1286](https://github.com/paritytech/parity/pull/1286)
+- clarify build instructions [#1287](https://github.com/paritytech/parity/pull/1287)
+- fixed #1255 [#1280](https://github.com/paritytech/parity/pull/1280)
+- bump rust-crypto [#1289](https://github.com/paritytech/parity/pull/1289)
+- Security audit issues fixed [#1279](https://github.com/paritytech/parity/pull/1279)
+- Fixing origin/host validation [#1273](https://github.com/paritytech/parity/pull/1273)
+- windows installer + parity start ui cli option [#1284](https://github.com/paritytech/parity/pull/1284)
+- ipc lib version bump [#1285](https://github.com/paritytech/parity/pull/1285)
+- Syncing improvements [#1274](https://github.com/paritytech/parity/pull/1274)
+- removed redundant if condition [#1270](https://github.com/paritytech/parity/pull/1270)
+- Naive chunk creation, snapshotting [#1263](https://github.com/paritytech/parity/pull/1263)
+- Fixing generating new token while another parity instance is running. [#1272](https://github.com/paritytech/parity/pull/1272)
+- README: rustup and windows instructions [#1266](https://github.com/paritytech/parity/pull/1266)
+- Windows build [#1253](https://github.com/paritytech/parity/pull/1253)
+- removed try_seal from MiningBlockChainClient [#1262](https://github.com/paritytech/parity/pull/1262)
+- simplified block opening [#1232](https://github.com/paritytech/parity/pull/1232)
+- Clippy bump [#1259](https://github.com/paritytech/parity/pull/1259)
+- Fixing uint ASM macros compilation [#1258](https://github.com/paritytech/parity/pull/1258)
+- Signer port returned from RPC + Topbar showing count of unconfirmed transactions. [#1252](https://github.com/paritytech/parity/pull/1252)
+- codegen - avoid unwraps leading to compilation crash [#1250](https://github.com/paritytech/parity/pull/1250)
+- Dapps bump [#1257](https://github.com/paritytech/parity/pull/1257)
+- Windows named pipes [#1254](https://github.com/paritytech/parity/pull/1254)
+- remove unsafety from util/hash.rs and util/bigint/uint.rs [#1236](https://github.com/paritytech/parity/pull/1236)
+- Fixing CORS settings for special values: * & null. [#1247](https://github.com/paritytech/parity/pull/1247)
+- JSONRPC test strings avoid using \ char [#1246](https://github.com/paritytech/parity/pull/1246)
+- Tests for JSON serialisation of statediff/vmtrace [#1241](https://github.com/paritytech/parity/pull/1241)
+- Bumping Dapps & TopBar to newest version. [#1245](https://github.com/paritytech/parity/pull/1245)
+- keys import [#1240](https://github.com/paritytech/parity/pull/1240)
+- Splitting RPC Apis into more fine-grained sets [#1234](https://github.com/paritytech/parity/pull/1234)
+- Refactor triedb constructors to error on invalid state root  [#1230](https://github.com/paritytech/parity/pull/1230)
+- Signer RPC method to check if signer is enabled [#1238](https://github.com/paritytech/parity/pull/1238)
+- Fixing signer behaviour when confirming transaction with wrong password. [#1237](https://github.com/paritytech/parity/pull/1237)
+- SystemUIs authorization [#1233](https://github.com/paritytech/parity/pull/1233)
+- IPC path for tesetnet with --geth compatibility [#1231](https://github.com/paritytech/parity/pull/1231)
+- Transaction tracing for eth_call [#1210](https://github.com/paritytech/parity/pull/1210)
+- Removing compilation warnings [#1227](https://github.com/paritytech/parity/pull/1227)
+- Allowing connections only from chrome-extension and self-hosted client [#1226](https://github.com/paritytech/parity/pull/1226)
+- Clippy bump & fixing warnings [#1219](https://github.com/paritytech/parity/pull/1219)
+- Bumping serde & syntex [#1216](https://github.com/paritytech/parity/pull/1216)
+- Minimal Signer UI (System UI) exposed over websockets. [#1211](https://github.com/paritytech/parity/pull/1211)
+- Switch RPC namespace form ethcore_ to trace_ [#1208](https://github.com/paritytech/parity/pull/1208)
+- Verify the state root exists before creating a State [#1217](https://github.com/paritytech/parity/pull/1217)
+- Integrate state diffing into the ethcore JSONRPC [#1206](https://github.com/paritytech/parity/pull/1206)
+- Updating topbar to latest version [#1220](https://github.com/paritytech/parity/pull/1220)
+- Loading local Dapps from FS. [#1214](https://github.com/paritytech/parity/pull/1214)
+- Ipc serialization & protocol fixes [#1188](https://github.com/paritytech/parity/pull/1188)
+- Have Ext::ret take self by value [#1187](https://github.com/paritytech/parity/pull/1187)
+- Simple WebSockets notification about new request [#1202](https://github.com/paritytech/parity/pull/1202)
+- Removing leftovers of ethminer [#1207](https://github.com/paritytech/parity/pull/1207)
+- fixed #1204 [#1205](https://github.com/paritytech/parity/pull/1205)
+- VM tracing and JSON RPC endpoint for it. [#1169](https://github.com/paritytech/parity/pull/1169)
+- devtools helpers extended [#1186](https://github.com/paritytech/parity/pull/1186)
+- Networking refactoring [#1172](https://github.com/paritytech/parity/pull/1172)
+- Client & Miner refactoring [#1195](https://github.com/paritytech/parity/pull/1195)
+- update readme [#1201](https://github.com/paritytech/parity/pull/1201)
+- Simple signing queue, confirmation APIs exposed in signer WebSockets. [#1182](https://github.com/paritytech/parity/pull/1182)
+- Using ordered hashmap to keep the order of dapps on home screen [#1199](https://github.com/paritytech/parity/pull/1199)
+- Disabling `ethcore` by default, adding x-frame-options header to dapps. [#1197](https://github.com/paritytech/parity/pull/1197)
+- transaction count verifier tests [#1196](https://github.com/paritytech/parity/pull/1196)
+- expunge x! and xx! from the codebase [#1192](https://github.com/paritytech/parity/pull/1192)
+- Database service upgrade (from the ipc branch) [#1185](https://github.com/paritytech/parity/pull/1185)
+- stop eth_syncing from returning true forever [#1181](https://github.com/paritytech/parity/pull/1181)
+- Sync fixes and tweaks [#1164](https://github.com/paritytech/parity/pull/1164)
+- Exposing RPC over Signer WebSockets [#1167](https://github.com/paritytech/parity/pull/1167)
+- implement missing rpc methods and tests [#1171](https://github.com/paritytech/parity/pull/1171)
+- json ipc server version bump [#1170](https://github.com/paritytech/parity/pull/1170)
+- Updated dependencies for windows build [#1173](https://github.com/paritytech/parity/pull/1173)
+- Framework for improved RPC unit tests [#1141](https://github.com/paritytech/parity/pull/1141)
+- remove all possible unsafe code in crypto [#1168](https://github.com/paritytech/parity/pull/1168)
+- Base for Signer Websockets server [#1158](https://github.com/paritytech/parity/pull/1158)
+- Write queue to speed-up db ipc [#1160](https://github.com/paritytech/parity/pull/1160)
+- Fixing few clippy warnings [#1163](https://github.com/paritytech/parity/pull/1163)
+- Change eth_signAndSendTransaction to personal_SignAndSendTransaction [#1154](https://github.com/paritytech/parity/pull/1154)
+- Support "earliest" and specific block parameters in RPC where possible [#1149](https://github.com/paritytech/parity/pull/1149)
+- migration fixes [#1155](https://github.com/paritytech/parity/pull/1155)
+- Empty trusted signer crate with it's general purpose described. [#1150](https://github.com/paritytech/parity/pull/1150)
+- More bootnodes for morden. [#1153](https://github.com/paritytech/parity/pull/1153)
+- move existing rpc tests into mocked module [#1151](https://github.com/paritytech/parity/pull/1151)
+- Bloomchain [#1014](https://github.com/paritytech/parity/pull/1014)
+- Renaming dapps repos. Updating dapps [#1142](https://github.com/paritytech/parity/pull/1142)
+- fixed pending transactions [#1147](https://github.com/paritytech/parity/pull/1147)
+- Basic benches to provide metrics for ipc optimizations [#1145](https://github.com/paritytech/parity/pull/1145)
+- Fixing clippy warnings [#1148](https://github.com/paritytech/parity/pull/1148)
+- correct signature of SecTrieDB::raw_mut [#1143](https://github.com/paritytech/parity/pull/1143)
+- Merge to master and start hypervisor for import/export [#1138](https://github.com/paritytech/parity/pull/1138)
+- Bumping clippy. Fixing warnings [#1139](https://github.com/paritytech/parity/pull/1139)
+- Display progress when importing [#1136](https://github.com/paritytech/parity/pull/1136)
+- foundation of simple db migration [#1128](https://github.com/paritytech/parity/pull/1128)
+- Fixpending [#1074](https://github.com/paritytech/parity/pull/1074)
+- Sync: Propagate uncles and fix status reporting [#1134](https://github.com/paritytech/parity/pull/1134)
+- Coloured, padding logging. [#1133](https://github.com/paritytech/parity/pull/1133)
+- Importing [#1132](https://github.com/paritytech/parity/pull/1132)
+- Have `die_with_error` use `fmt::Display` rather than Debug [#1116](https://github.com/paritytech/parity/pull/1116)
+- Exporting [#1129](https://github.com/paritytech/parity/pull/1129)
+- Sign and send transaction [#1124](https://github.com/paritytech/parity/pull/1124)
+- Fixing unused imports warnings [#1125](https://github.com/paritytech/parity/pull/1125)
+- Adding info messages on mined blocks [#1127](https://github.com/paritytech/parity/pull/1127)
+- Fix styling - don't mix spaces with tabs!!! [#1123](https://github.com/paritytech/parity/pull/1123)
+- Fix is_syncing so it's false as long as the update is trivial. [#1122](https://github.com/paritytech/parity/pull/1122)
+- Relock unlocked accounts after first use [#1120](https://github.com/paritytech/parity/pull/1120)
+- Avoid importing keys into wrong place. [#1119](https://github.com/paritytech/parity/pull/1119)
+- Implement receipt's gasUsed field [#1118](https://github.com/paritytech/parity/pull/1118)
+- New dapps & query parameter handling [#1113](https://github.com/paritytech/parity/pull/1113)
+- pretty print trace error [#1098](https://github.com/paritytech/parity/pull/1098)
+- New syncing strategy [#1095](https://github.com/paritytech/parity/pull/1095)
+- ethcore-db crate [#1097](https://github.com/paritytech/parity/pull/1097)
+- Fix the default for pruning. [#1107](https://github.com/paritytech/parity/pull/1107)
+- Make Id/ID and db/Db/DB usage consistent [#1105](https://github.com/paritytech/parity/pull/1105)
+- Miner holds it's own copy of spec/engine [#1091](https://github.com/paritytech/parity/pull/1091)
+- Apps listing API & Home webapp. [#1101](https://github.com/paritytech/parity/pull/1101)
+- CLI option for using JITEVM [#1103](https://github.com/paritytech/parity/pull/1103)
+- Fix up the seal fields in RPC output [#1096](https://github.com/paritytech/parity/pull/1096)
+- Fixing some warnings [#1102](https://github.com/paritytech/parity/pull/1102)
+- fixed incorrect decoding of header seal_fields. added tests. #1090 [#1094](https://github.com/paritytech/parity/pull/1094)
+- Bumping Clippy [#1093](https://github.com/paritytech/parity/pull/1093)
+- Injectable topbar support. [#1092](https://github.com/paritytech/parity/pull/1092)
+- New syncing part 1: Block collection [#1088](https://github.com/paritytech/parity/pull/1088)
+- Moving all Client public API types to separate mod & binary serialization codegen for that mod [#1051](https://github.com/paritytech/parity/pull/1051)
+- Subdomains support in content server (webapps server). [#1082](https://github.com/paritytech/parity/pull/1082)
+- Fix uncle getter [#1087](https://github.com/paritytech/parity/pull/1087)
+- Provide fallback for usd-per-eth option when offline. [#1085](https://github.com/paritytech/parity/pull/1085)
+- path centralized [#1083](https://github.com/paritytech/parity/pull/1083)
+- Limiting result of the execution to execution-specific errors [#1071](https://github.com/paritytech/parity/pull/1071)
+- Configurable keys security [#1080](https://github.com/paritytech/parity/pull/1080)
+- comma delimeting multiple cors headers [#1078](https://github.com/paritytech/parity/pull/1078)
+- Update error message [#1081](https://github.com/paritytech/parity/pull/1081)
+- Updating dapp-wallet [#1076](https://github.com/paritytech/parity/pull/1076)
+- Fixed connecting to local nodes on startup [#1070](https://github.com/paritytech/parity/pull/1070)
+- Validate signature in Tx queue [#1068](https://github.com/paritytech/parity/pull/1068)
+- moving deps to ethcore/hyper and bumping jsonrpc-http-server version [#1067](https://github.com/paritytech/parity/pull/1067)
+- Updating status page. Bringing back wallet [#1064](https://github.com/paritytech/parity/pull/1064)
+- Fix --geth IPC for MacOS. [#1062](https://github.com/paritytech/parity/pull/1062)
+- Fixing formatter for defaultExtraData [#1060](https://github.com/paritytech/parity/pull/1060)
+- --geth IPC compatibility [#1059](https://github.com/paritytech/parity/pull/1059)
+- Moving dependencies to ethcore & uniforming syntax libs through all crates [#1050](https://github.com/paritytech/parity/pull/1050)
+- update hyper branch mio [#1054](https://github.com/paritytech/parity/pull/1054)
+- IPC lib update [#1047](https://github.com/paritytech/parity/pull/1047)
+- Updating hyper-mio revision [#1048](https://github.com/paritytech/parity/pull/1048)
+- Bump ipc-lib version [#1046](https://github.com/paritytech/parity/pull/1046)
+- Tidy up CLI options and make JSONRPC & webapps on by default. [#1045](https://github.com/paritytech/parity/pull/1045)
+- Fixing clippy warnings [#1044](https://github.com/paritytech/parity/pull/1044)
+- Fixing RPC modules compatibility [#1041](https://github.com/paritytech/parity/pull/1041)
+- Fixing hyper-mio revision [#1043](https://github.com/paritytech/parity/pull/1043)
+- Updating locations of webapp stuff [#1040](https://github.com/paritytech/parity/pull/1040)
+- JSON-RPC over IPC [#1039](https://github.com/paritytech/parity/pull/1039)
+- Update nix/mio for ARM [#1036](https://github.com/paritytech/parity/pull/1036)
+- Basic Authority [#991](https://github.com/paritytech/parity/pull/991)
+- Prioritizing of local transaction [#1023](https://github.com/paritytech/parity/pull/1023)
+- Version 1.2 [#1030](https://github.com/paritytech/parity/pull/1030)
+- Bumping status page [#1033](https://github.com/paritytech/parity/pull/1033)
diff --git a/docs/CHANGELOG-1.3.md b/docs/CHANGELOG-1.3.md
new file mode 100644
index 0000000000000000000000000000000000000000..d380eaccc2a32eb36540d45a3380a749f4225573
--- /dev/null
+++ b/docs/CHANGELOG-1.3.md
@@ -0,0 +1,502 @@
+Note: Parity 1.3 reached End-of-Life on 2017-01-19 (EOL).
+
+## Parity [v1.3.15](https://github.com/paritytech/parity/releases/tag/v1.3.15) (2016-12-10)
+
+This patch release fixes an issue with syncing on the Ropsten test network.
+
+- Backporting to stable [#3793](https://github.com/paritytech/parity/pull/3793)
+
+## Parity [v1.3.14](https://github.com/paritytech/parity/releases/tag/v1.3.14) (2016-11-25)
+
+Parity 1.3.14 fixes a few stability issues and adds support for the Ropsten testnet.
+
+- Backporting to stable [#3616](https://github.com/paritytech/parity/pull/3616)
+
+## Parity [v1.3.13](https://github.com/paritytech/parity/releases/tag/v1.3.13) (2016-11-18)
+
+This release fixes an issue with EIP-155 transactions being allowed into the transaction pool.
+
+- [stable] Check tx signatures before adding to the queue. [#3521](https://github.com/paritytech/parity/pull/3521)
+- Fix Stable Docker Build [#3479](https://github.com/paritytech/parity/pull/3479)
+
+## Parity [v1.3.12](https://github.com/paritytech/parity/releases/tag/v1.3.12) (2016-11-16)
+
+This stable release enables EIP-155/160/161/170 hardfork at block 2675000 (1885000 for test network).
+
+- [stable] EIP-170 [#3462](https://github.com/paritytech/parity/pull/3462)
+- #3035 Backport to stable [#3441](https://github.com/paritytech/parity/pull/3441)
+
+## Parity [v1.3.11](https://github.com/paritytech/parity/releases/tag/v1.3.11) (2016-11-11)
+
+This is a maintenance release for the stable series to delay the EIP-155/160/161 hard fork transition. **Update from 1.3.10 is mandatory**. It also deprecates and disables the old Parity UI.
+
+- [stable] Disable HF and UI  [#3372](https://github.com/paritytech/parity/pull/3372)
+- [stable] EIP-155 update with Vitalik's new test vectors (#3166) [#3190](https://github.com/paritytech/parity/pull/3190)
+- Backport EIP-150 to stable [#2672](https://github.com/paritytech/parity/pull/2672)
+- Create gitlab-ci.yml for stable [#2517](https://github.com/paritytech/parity/pull/2517)
+
+## Parity [v1.3.10](https://github.com/paritytech/parity/releases/tag/v1.3.10) (2016-11-04)
+
+The latest 1.3 series release, now considered stable.
+
+This includes several additional optimisations and fixes together with provisional support for the upcoming hard fork for EIP155/160/161.
+
+- Stable branch reset to 1.3.10 [#3156](https://github.com/paritytech/parity/pull/3156)
+- Backporting to beta [#3149](https://github.com/paritytech/parity/pull/3149)
+- apply post-consolidation migrations after consolidating (BETA) [#3048](https://github.com/paritytech/parity/pull/3048)
+- [beta] Fix the brainwallet functionality. (#2994) [#3005](https://github.com/paritytech/parity/pull/3005)
+- Bumping json-ipc-server [#2989](https://github.com/paritytech/parity/pull/2989)
+- Backports for 1.3.10 [#2987](https://github.com/paritytech/parity/pull/2987)
+
+## Parity [v1.3.9](https://github.com/paritytech/parity/releases/tag/v1.3.9) (2016-10-21)
+
+This release enables EIP-150 hard fork for Ethereum Classic chain and resolves a few stability and performance issues, such as:
+- Interrupted syncing on the test network.
+- Block import delays caused by a large number of incoming transactions. A full re-sync is recommended for performance improvement to take effect.
+
+Full changes:
+- [beta] Resolve morden fork [#2776](https://github.com/paritytech/parity/pull/2776)
+- Fixing botched merge [#2767](https://github.com/paritytech/parity/pull/2767)
+- Backports for beta [#2764](https://github.com/paritytech/parity/pull/2764)
+- Introduce EIP150 hardfork block for ETC [#2736](https://github.com/paritytech/parity/pull/2736)
+- [beta] fix issues with no test dir present (#2659) [#2724](https://github.com/paritytech/parity/pull/2724)
+- [beta] Bumping jsonrpc-http-server [#2715](https://github.com/paritytech/parity/pull/2715)
+- [beta] Fix migration system, better errors [#2661](https://github.com/paritytech/parity/pull/2661)
+
+## Parity [v1.3.8](https://github.com/paritytech/parity/releases/tag/v1.3.8) (2016-10-15)
+
+Parity 1.3.8 is our EIP150 hard-fork compliant release.
+
+Running this will enact a mild change of the protocol at block number 2,463,000 which should occur on Tuesday 18th October 2016 at approximately 12:20 London time (BST). This change alters the gas prices for a number of operations, mainly centring around i/o intensive Merkle trie lookups (`BALANCE`, `EXTCODESIZE` &c.) and state-trie polluters (`SUICIDE`, `CREATE` and `CALL`). These operations were heavily underpriced, an oversight which lead to the recent degradation of network service. The full details of the alteration are specified in [EIP-150](https://github.com/ethereum/EIPs/issues/150).
+
+Additionally several issues have been fixed including:
+- a transaction queue limitation leading to dropped transactions;
+- a synchronisation issue leading to stalls when syncing;
+
+And some small features including database performance improvements and additional logging.
+
+#### Upgrading private chain specification files.
+
+All the chain specification files now have EIP-150 rules enabled by default. To continue using the chain add the `eip150Transition` key under `Engine/ethash/params` and set it to a future transition block as shown in [this example](https://github.com/paritytech/parity/blob/85eeb3ea6e5e21ad8e5644241edf82eb8069f536/ethcore/res/ethereum/morden.json#L13).
+
+The key related to homestead transition has been renamed from `frontierCompatibilityModeLimit` to `homesteadTransition`.
+
+#### Full changes
+
+- [beta] EIP150.1c [#2599](https://github.com/paritytech/parity/pull/2599)
+- Remove count limit for local transactions [#2634](https://github.com/paritytech/parity/pull/2634)
+- Tweak DB and mining defaults [#2598](https://github.com/paritytech/parity/pull/2598)
+- Revert "Bloom upgrade in beta" [#2635](https://github.com/paritytech/parity/pull/2635)
+- Bloom upgrade in beta [#2609](https://github.com/paritytech/parity/pull/2609)
+- Backports to beta [#2628](https://github.com/paritytech/parity/pull/2628)
+
+## Parity [v1.3.7](https://github.com/paritytech/parity/releases/tag/v1.3.7) (2016-10-12)
+
+This release contains fixes to reduce memory usage under the DoS attack and improve transaction relay.
+
+- Configurable history size in beta [#2587](https://github.com/paritytech/parity/pull/2587)
+- Backports to beta [#2592](https://github.com/paritytech/parity/pull/2592)
+
+
+## Parity [v1.3.6](https://github.com/paritytech/parity/releases/tag/v1.3.6) (2016-10-11)
+
+Parity 1.3.6 is another hotfix release to address transaction spam and deal with stability issues. With this release transaction pool gas limit no longer applies to local transactions. Full list of changes is available here:
+
+- Backports to beta v1.3.6 [#2571](https://github.com/paritytech/parity/pull/2571)
+- Use global state cache when mining [#2529](https://github.com/paritytech/parity/pull/2529)
+- Transaction queue limited by gas [#2528](https://github.com/paritytech/parity/pull/2528)
+
+## Parity [v1.3.5](https://github.com/paritytech/parity/releases/tag/v1.3.5) (2016-10-08)
+
+1.3.5 is a hotfix release for the transaction propagation issue. Transaction pool limit is now calculated based on the block gas limit.
+
+- Update appveyor rustc [beta] [#2521](https://github.com/paritytech/parity/pull/2521)
+- Increase size of transaction queue by default [#2519](https://github.com/paritytech/parity/pull/2519)
+
+## Parity [v1.3.4](https://github.com/paritytech/parity/releases/tag/v1.3.4) (2016-10-07)
+
+Parity 1.3.4 release contains more optimizations to internal caching as well as stability improvements.
+
+It also introduces an ability for miners to choose a transaction ordering strategy:
+
+    --tx-queue-strategy S    Prioritization strategy used to order transactions
+                             in the queue. S may be:
+                             gas - Prioritize txs with low gas limit;
+                             gas_price - Prioritize txs with high gas price;
+                             gas_factor - Prioritize txs using gas price
+                             and gas limit ratio [default: gas_factor].
+
+- Backport to beta [#2518](https://github.com/paritytech/parity/pull/2518)
+- [beta] Fixing RPC Filter conversion to EthFilter [#2501](https://github.com/paritytech/parity/pull/2501)
+- [beta] Using pending block only if is not old [#2515](https://github.com/paritytech/parity/pull/2515)
+- Backports into beta [#2512](https://github.com/paritytech/parity/pull/2512)
+- CLI to specify queue ordering strategy [#2494](https://github.com/paritytech/parity/pull/2494)
+- Fix ethstore opening all key files in the directory at once (BETA) [#2472](https://github.com/paritytech/parity/pull/2472)
+- Beta backports [#2465](https://github.com/paritytech/parity/pull/2465)
+- IPC-library dependency fork & bump for beta [#2455](https://github.com/paritytech/parity/pull/2455)
+
+## Parity [v1.3.3](https://github.com/paritytech/parity/releases/tag/v1.3.3) (2016-10-04)
+
+1.3.3 is another hotfix release for the DoS attack
+
+- Jumptable cache [#2435](https://github.com/paritytech/parity/pull/2435)
+- fix broken beta compilation (backport to beta) [#2414](https://github.com/paritytech/parity/pull/2414)
+- Run inplace upgrades after version update [#2411](https://github.com/paritytech/parity/pull/2411)
+
+## Parity [v1.3.2](https://github.com/paritytech/parity/releases/tag/v1.3.2) (2016-09-29)
+
+This is a hotfix release to address stability and performance issues uncovered during the network DoS attack. Full list of changes is available [here](https://github.com/paritytech/parity/compare/v1.3.1...v1.3.2)
+
+- Beta Backports [#2396](https://github.com/paritytech/parity/pull/2396)
+- Fixing penalization in future [#2493](https://github.com/paritytech/parity/pull/2493)
+- A quick fix for missing tree route blocks [#2400](https://github.com/paritytech/parity/pull/2400)
+- Cache the fork block header after snapshot restoration [#2391](https://github.com/paritytech/parity/pull/2391)
+- correct sync memory usage calculation (BETA) [#2386](https://github.com/paritytech/parity/pull/2386)
+- Accounts bloom [#2357](https://github.com/paritytech/parity/pull/2357)
+- Disable colors when generating signer token. [#2379](https://github.com/paritytech/parity/pull/2379)
+- Fixing jit feature compilation [#2376](https://github.com/paritytech/parity/pull/2376)
+- Clear state cache on sealed block import [#2377](https://github.com/paritytech/parity/pull/2377)
+- DIV optimization (beta) [#2353](https://github.com/paritytech/parity/pull/2353)
+- Canonical state cache [#2308](https://github.com/paritytech/parity/pull/2308)
+- Reorder transaction_by_hash to favour canon search [#2331](https://github.com/paritytech/parity/pull/2331)
+- Lenient bytes deserialization [#2340](https://github.com/paritytech/parity/pull/2340)
+- Penalize transactions with gas above gas limit [#2271](https://github.com/paritytech/parity/pull/2271)
+- Peek transaction queue via RPC [#2270](https://github.com/paritytech/parity/pull/2270)
+- Handle RLP to string UTF-8 decoding errors (#2217) [#2226](https://github.com/paritytech/parity/pull/2226)
+- Fixing compilation without default features [beta] [#2207](https://github.com/paritytech/parity/pull/2207)
+- Avoid cloning clean stuff [beta backport] [#2173](https://github.com/paritytech/parity/pull/2173)
+- v1.3.2 in beta [#2200](https://github.com/paritytech/parity/pull/2200)
+
+## Parity [v1.3.1](https://github.com/paritytech/parity/releases/tag/v1.3.1) (2016-09-11)
+
+1.3.1 includes many [bugfixes](https://github.com/paritytech/parity/commit/2a82fa0a47b00bedfec520a2fdd3cc31aa4ccd8c). Critical ones:
+- **Chain reorganisation fix** Transaction receipts / traces were sometimes linked with incorrect block hash. Fixed in https://github.com/paritytech/parity/commit/a9587f8965a32c84973c35ce1c8d51d07044143f
+- **Trace overflow fix** Overflow which occurred during tracing. Fixed in https://github.com/paritytech/parity/pull/1979
+
+- Backports to beta [#2068](https://github.com/paritytech/parity/pull/2068)
+- Fixing serde overflow error (#1977) [#2030](https://github.com/paritytech/parity/pull/2030)
+- Simplified db pruning detection in beta [#1924](https://github.com/paritytech/parity/pull/1924)
+- Backports to beta [#1919](https://github.com/paritytech/parity/pull/1919)
+
+## Parity [v1.3.0: "Acuity"](https://github.com/paritytech/parity/releases/tag/v1.3.0) (2016-08-12)
+
+As well as many bug fixes, 1.3.0 includes a number of important improvements including:
+- **Optimisations** Heavily optimised block/transaction processing core - up to 2x faster than 1.2 series.
+- **Database compression** Databases take as much as 30% less storage than before.
+- **State snapshotting** An installation synchronised from scratch in 1-2 minutes can be made after downloading the 140MB state snapshot. See [the wiki](https://github.com/paritytech/parity/wiki/Getting-Synced) for more information.
+- **Process isolation** The networking/chain-synchronisation is now a fully independent process.
+
+Incremental improvements include:
+- Additional [RPCs](https://github.com/paritytech/parity/wiki/JSONRPC) for transaction tracing, state diffing, VM tracing, asynchronous transaction posting, accounts metadata and message signing.
+- Improved logging, including for chain reorganisations.
+- Added a `--fast-and-loose` option for additional speed-ups which can compromise integrity on a dirty shutdown.
+- Column families to ensure maximal inter-database integrity.
+- Key naming includes date/time of creation.
+- Various improvements to networking robustness and performance.
+- Solidity compilation supported through RPC if `solc` is available.
+- Various improvements to the miner including [HTTP push work notification](https://github.com/ethcoreparitytech/parity/wiki/Mining#starting-it).
+
+Full changes:
+- Bumping Parity UI [#1920](https://github.com/paritytech/parity/pull/1920)
+- Adding entrypoints to docker images [#1909](https://github.com/paritytech/parity/pull/1909)
+- Save nodes removed from backing_overlay until commit [#1917](https://github.com/paritytech/parity/pull/1917)
+- RPC for importing geth keys [#1916](https://github.com/paritytech/parity/pull/1916)
+- Peers RPC + UI displaying active/connected/max peers [#1915](https://github.com/paritytech/parity/pull/1915)
+- RPC for deriving address from phrase. [#1912](https://github.com/paritytech/parity/pull/1912)
+- adjust polling & connection timeouts for ipc [#1910](https://github.com/paritytech/parity/pull/1910)
+- Don't return deleted nodes that are not yet flushed [#1908](https://github.com/paritytech/parity/pull/1908)
+- Wallet rpcs [#1898](https://github.com/paritytech/parity/pull/1898)
+- Fix binary serialization bug [#1907](https://github.com/paritytech/parity/pull/1907)
+- fixed #1889, .DS_Store is no longer treated as key file [#1892](https://github.com/paritytech/parity/pull/1892)
+- Purging .derefs, fixing clippy warnings. [#1890](https://github.com/paritytech/parity/pull/1890)
+- RocksDB version bump [#1904](https://github.com/paritytech/parity/pull/1904)
+- Fix ipc compilation and add ipc feature to test targets [#1902](https://github.com/paritytech/parity/pull/1902)
+- Autocreating geth dir if none and geth mode on [#1896](https://github.com/paritytech/parity/pull/1896)
+- v1.4.0 in master [#1886](https://github.com/paritytech/parity/pull/1886)
+- Adding more details to miner log [#1891](https://github.com/paritytech/parity/pull/1891)
+- moved hash.rs to bigint library [#1827](https://github.com/paritytech/parity/pull/1827)
+- fixed cache_manager lock order [#1877](https://github.com/paritytech/parity/pull/1877)
+- Fixing miner deadlock [#1885](https://github.com/paritytech/parity/pull/1885)
+- Updating WS + Increasing token validity [#1882](https://github.com/paritytech/parity/pull/1882)
+- take snapshot at specified block and slightly better informants [#1873](https://github.com/paritytech/parity/pull/1873)
+- RPC errors & logs [#1845](https://github.com/paritytech/parity/pull/1845)
+- Reduce max open files [#1876](https://github.com/paritytech/parity/pull/1876)
+- Send new block hashes to all peers [#1875](https://github.com/paritytech/parity/pull/1875)
+- Use UntrustedRlp for block verification [#1872](https://github.com/paritytech/parity/pull/1872)
+- Update cache usage on commiting block info [#1871](https://github.com/paritytech/parity/pull/1871)
+- Validating conversion U256->usize when doing gas calculation (for 32bits) [#1870](https://github.com/paritytech/parity/pull/1870)
+- Sync to peers with confirmed fork block only [#1863](https://github.com/paritytech/parity/pull/1863)
+- miner and client take spec reference [#1853](https://github.com/paritytech/parity/pull/1853)
+- Unlock account with timeout for geth compatibility [#1854](https://github.com/paritytech/parity/pull/1854)
+- Fixed reported max height and transaction propagation [#1852](https://github.com/paritytech/parity/pull/1852)
+- Snapshot creation and restoration [#1679](https://github.com/paritytech/parity/pull/1679)
+- fix deprecated typo [#1850](https://github.com/paritytech/parity/pull/1850)
+- Split IO and network crates [#1828](https://github.com/paritytech/parity/pull/1828)
+- updated classic JSON spec with classic bootnodes, fixes #1842 [#1847](https://github.com/paritytech/parity/pull/1847)
+- protect unsafety in plainhasher; get more unique hashes [#1841](https://github.com/paritytech/parity/pull/1841)
+- use mutex in dbtransaction [#1843](https://github.com/paritytech/parity/pull/1843)
+- Fix state not using "account_starting_nonce" [#1830](https://github.com/paritytech/parity/pull/1830)
+- Supporting blockid in eth_call and trace_call/trace_raw [#1837](https://github.com/paritytech/parity/pull/1837)
+- eth_checkTransaction renamed to eth_checkRequest [#1817](https://github.com/paritytech/parity/pull/1817)
+- Bump json-ipc-server again [#1839](https://github.com/paritytech/parity/pull/1839)
+- Fixing another deadlock in trace db [#1833](https://github.com/paritytech/parity/pull/1833)
+- Fix up the VM trace. [#1829](https://github.com/paritytech/parity/pull/1829)
+- fixed parsing export params, fixes #1826 [#1834](https://github.com/paritytech/parity/pull/1834)
+- More performance optimizations [#1814](https://github.com/paritytech/parity/pull/1814)
+- Bumping clippy & fixing warnings [#1823](https://github.com/paritytech/parity/pull/1823)
+- removed unused code from util and unnecessary dependency of FixedHash [#1824](https://github.com/paritytech/parity/pull/1824)
+- Remove (almost all) panickers from trie module [#1776](https://github.com/paritytech/parity/pull/1776)
+- Fixing account naming [#1810](https://github.com/paritytech/parity/pull/1810)
+- JournalDB inject [#1806](https://github.com/paritytech/parity/pull/1806)
+- No block number in get work while in geth-compat mode. [#1821](https://github.com/paritytech/parity/pull/1821)
+- Import wallet fix [#1820](https://github.com/paritytech/parity/pull/1820)
+- Supporting eth_sign in Signer [#1787](https://github.com/paritytech/parity/pull/1787)
+- Fixing cache update after chain reorg [#1816](https://github.com/paritytech/parity/pull/1816)
+- Development mode for Signer UI [#1788](https://github.com/paritytech/parity/pull/1788)
+- Miner tweaks [#1797](https://github.com/paritytech/parity/pull/1797)
+- Util & ipc clenup [#1807](https://github.com/paritytech/parity/pull/1807)
+- Fixing unlock parsing [#1802](https://github.com/paritytech/parity/pull/1802)
+- fixed importing presale wallet with encseed longer than 96 bytes [#1801](https://github.com/paritytech/parity/pull/1801)
+- DRYing build scripts [#1795](https://github.com/paritytech/parity/pull/1795)
+- Allow code from spec json [#1790](https://github.com/paritytech/parity/pull/1790)
+- nano-tests (ipc transport) to the CI [#1793](https://github.com/paritytech/parity/pull/1793)
+- Commit best block after closing transaction [#1791](https://github.com/paritytech/parity/pull/1791)
+- Place thread name in the log output [#1792](https://github.com/paritytech/parity/pull/1792)
+- Fix ipc tests and bring to CI [#1789](https://github.com/paritytech/parity/pull/1789)
+- dynamic keys pickup [#1779](https://github.com/paritytech/parity/pull/1779)
+- ipc version bump [#1783](https://github.com/paritytech/parity/pull/1783)
+- Prevent deadlock on trace GC [#1780](https://github.com/paritytech/parity/pull/1780)
+- fixed trace_transaction crash when block contained suicide [#1781](https://github.com/paritytech/parity/pull/1781)
+- Fix block body migration [#1777](https://github.com/paritytech/parity/pull/1777)
+- cache manager and clearing tracing cache [#1769](https://github.com/paritytech/parity/pull/1769)
+- Return storage as H256 from RPC. [#1774](https://github.com/paritytech/parity/pull/1774)
+- Instant sealing engine [#1767](https://github.com/paritytech/parity/pull/1767)
+- fix state unsafety with a mostly-guaranteed handle [#1755](https://github.com/paritytech/parity/pull/1755)
+- Gas for mem optimization [#1768](https://github.com/paritytech/parity/pull/1768)
+- Min and Max peers setting [#1771](https://github.com/paritytech/parity/pull/1771)
+- Disable WAL [#1765](https://github.com/paritytech/parity/pull/1765)
+- Add new line when printing start strings [#1766](https://github.com/paritytech/parity/pull/1766)
+- Log tweak [#1764](https://github.com/paritytech/parity/pull/1764)
+- Remove update_sealing call on importing own block [#1762](https://github.com/paritytech/parity/pull/1762)
+- Single DB [#1741](https://github.com/paritytech/parity/pull/1741)
+- Tweak format of log so it's not so verbose. [#1758](https://github.com/paritytech/parity/pull/1758)
+- Combine mining queue and enabled into single locked datum [#1749](https://github.com/paritytech/parity/pull/1749)
+- Collect consensus/null engines into a single module [#1754](https://github.com/paritytech/parity/pull/1754)
+- Fix failing deserialization test [#1756](https://github.com/paritytech/parity/pull/1756)
+- Stackoverflow fix [#1742](https://github.com/paritytech/parity/pull/1742)
+- compaction profile used during migration, fixes #1750 [#1751](https://github.com/paritytech/parity/pull/1751)
+- Splitting documentation into separate build job [#1752](https://github.com/paritytech/parity/pull/1752)
+- handle keys deserialization errors, fixes #1592 [#1701](https://github.com/paritytech/parity/pull/1701)
+- add gitlab-ci yaml [#1753](https://github.com/paritytech/parity/pull/1753)
+- Better handling of multiple migrations [#1747](https://github.com/paritytech/parity/pull/1747)
+- Disconnect peers on a fork [#1738](https://github.com/paritytech/parity/pull/1738)
+- Add RPC & client call to replay a transaction. [#1734](https://github.com/paritytech/parity/pull/1734)
+- another version bump for jsonrpc-ipc [#1744](https://github.com/paritytech/parity/pull/1744)
+- Trace other types of calls [#1727](https://github.com/paritytech/parity/pull/1727)
+- Fixing compilation on latest nightly [#1736](https://github.com/paritytech/parity/pull/1736)
+- Blocks and snapshot compression [#1687](https://github.com/paritytech/parity/pull/1687)
+- bump json-ipc-server version [#1739](https://github.com/paritytech/parity/pull/1739)
+- Use std::sync::Condvar [#1732](https://github.com/paritytech/parity/pull/1732)
+- Bump json-ipc-server version [#1733](https://github.com/paritytech/parity/pull/1733)
+- bump json-ipc-server version [#1731](https://github.com/paritytech/parity/pull/1731)
+- Fixing some clippy warnings [#1728](https://github.com/paritytech/parity/pull/1728)
+- Bumping Parity UI [#1682](https://github.com/paritytech/parity/pull/1682)
+- Various improvements to tracing & diagnostics. [#1707](https://github.com/paritytech/parity/pull/1707)
+- Fixed reading chunked EIP8 handshake [#1712](https://github.com/paritytech/parity/pull/1712)
+- Fix for importing blocks from a pipe file [#1724](https://github.com/paritytech/parity/pull/1724)
+- Proper errors for binary serializer [#1714](https://github.com/paritytech/parity/pull/1714)
+- Use a transaction for writing blocks [#1718](https://github.com/paritytech/parity/pull/1718)
+- Exclude generated code from coverage [#1720](https://github.com/paritytech/parity/pull/1720)
+- Use single binary for ipc modules [#1710](https://github.com/paritytech/parity/pull/1710)
+- Log a chain-reorg. [#1715](https://github.com/paritytech/parity/pull/1715)
+- Restore new block informant message [#1716](https://github.com/paritytech/parity/pull/1716)
+- Parallel block body download [#1659](https://github.com/paritytech/parity/pull/1659)
+- Rotate blockchain cache [#1709](https://github.com/paritytech/parity/pull/1709)
+- Fix broken internal names. [#1711](https://github.com/paritytech/parity/pull/1711)
+- cli overhaul [#1600](https://github.com/paritytech/parity/pull/1600)
+- Key files include timestamp in name. [#1700](https://github.com/paritytech/parity/pull/1700)
+- Fixing warnings [#1705](https://github.com/paritytech/parity/pull/1705)
+- Ethereum classic [#1706](https://github.com/paritytech/parity/pull/1706)
+- Docker Arguments [#1703](https://github.com/paritytech/parity/pull/1703)
+- Informant tidyup. [#1699](https://github.com/paritytech/parity/pull/1699)
+- Name and meta in accounts [#1695](https://github.com/paritytech/parity/pull/1695)
+- Stackoverflow #1686 [#1698](https://github.com/paritytech/parity/pull/1698)
+- filtering transactions toAddress includes contract creation [#1697](https://github.com/paritytech/parity/pull/1697)
+- Prevent syncing to ancient blocks [#1693](https://github.com/paritytech/parity/pull/1693)
+- Enable WAL and disable DB repair [#1696](https://github.com/paritytech/parity/pull/1696)
+- Returning error when transaction is rejected (for consistency) [#1667](https://github.com/paritytech/parity/pull/1667)
+- Disabling signer when in geth-compatibility mode [#1676](https://github.com/paritytech/parity/pull/1676)
+- Suicides tracing [#1688](https://github.com/paritytech/parity/pull/1688)
+- small cleanup of substate.rs [#1685](https://github.com/paritytech/parity/pull/1685)
+- resolve #411: remove install scripts [#1684](https://github.com/paritytech/parity/pull/1684)
+- IPC (feature-gated) [#1654](https://github.com/paritytech/parity/pull/1654)
+- Bumping JSONRPC-http-server [#1678](https://github.com/paritytech/parity/pull/1678)
+- Fixing hash deserialisation [#1674](https://github.com/paritytech/parity/pull/1674)
+- Ping discovery nodes gradually [#1671](https://github.com/paritytech/parity/pull/1671)
+- Fixing the deadlock on incoming connection [#1672](https://github.com/paritytech/parity/pull/1672)
+- Fixing errors returned by sendTransaction* method family [#1665](https://github.com/paritytech/parity/pull/1665)
+- Moved syncing log out of the client [#1670](https://github.com/paritytech/parity/pull/1670)
+- Host validation (again) [#1666](https://github.com/paritytech/parity/pull/1666)
+- Update install-deps.sh [ci skip] [#1664](https://github.com/paritytech/parity/pull/1664)
+- fix typos [#1644](https://github.com/paritytech/parity/pull/1644)
+- Size for blocks [#1668](https://github.com/paritytech/parity/pull/1668)
+- Revert "Validating Host headers in RPC requests" [#1663](https://github.com/paritytech/parity/pull/1663)
+- Validating Host headers in RPC requests [#1658](https://github.com/paritytech/parity/pull/1658)
+- fixed failing master [#1662](https://github.com/paritytech/parity/pull/1662)
+- Fixing clippy warnings [#1660](https://github.com/paritytech/parity/pull/1660)
+- Don't ping all nodes on start [#1656](https://github.com/paritytech/parity/pull/1656)
+- More performance optimizations [#1649](https://github.com/paritytech/parity/pull/1649)
+- Removing unused client code [#1645](https://github.com/paritytech/parity/pull/1645)
+- Asynchronous transactions (polling based for now). [#1652](https://github.com/paritytech/parity/pull/1652)
+- Sync stand-alone binary and feature-gated dependencies refactoring  [#1637](https://github.com/paritytech/parity/pull/1637)
+- Re-enabling Parity UI [#1627](https://github.com/paritytech/parity/pull/1627)
+- Blockchain repair on missing state root [#1646](https://github.com/paritytech/parity/pull/1646)
+- Multi-mode logging. [#1643](https://github.com/paritytech/parity/pull/1643)
+- Pro paths [#1650](https://github.com/paritytech/parity/pull/1650)
+- Performance optimizations [#1642](https://github.com/paritytech/parity/pull/1642)
+- Removed DAO soft fork traces [#1639](https://github.com/paritytech/parity/pull/1639)
+- Compiler version update for windows [#1638](https://github.com/paritytech/parity/pull/1638)
+- Delete values immediately from DB overlay [#1631](https://github.com/paritytech/parity/pull/1631)
+- DAO hard-fork [#1483](https://github.com/paritytech/parity/pull/1483)
+- fix network_start regression [#1629](https://github.com/paritytech/parity/pull/1629)
+- Die if the DB is newer than the one supported. [#1630](https://github.com/paritytech/parity/pull/1630)
+- Cleanup of colour code. Use is_a_tty. [#1621](https://github.com/paritytech/parity/pull/1621)
+- don't batch best block for branches [#1623](https://github.com/paritytech/parity/pull/1623)
+- In-memory trie operations [#1408](https://github.com/paritytech/parity/pull/1408)
+- Fix "pending" parameter on RPC block requests [#1602](https://github.com/paritytech/parity/pull/1602)
+- Allow RPC to use solc to compile solidity [#1607](https://github.com/paritytech/parity/pull/1607)
+- IPC RPC deriving for traits [#1599](https://github.com/paritytech/parity/pull/1599)
+- Utilize cached kcov if exists [#1619](https://github.com/paritytech/parity/pull/1619)
+- Fixing no-ui feature [#1618](https://github.com/paritytech/parity/pull/1618)
+- Couple of rocksdb optimizations [#1614](https://github.com/paritytech/parity/pull/1614)
+- Miner tests [#1597](https://github.com/paritytech/parity/pull/1597)
+- Sync IPC interface [#1584](https://github.com/paritytech/parity/pull/1584)
+- Make sure reserved peers are in the node table [#1616](https://github.com/paritytech/parity/pull/1616)
+- Fix bloomchain on blockchain repair [#1610](https://github.com/paritytech/parity/pull/1610)
+- fixed broken tracing [#1615](https://github.com/paritytech/parity/pull/1615)
+- fix benchmark compilation [#1612](https://github.com/paritytech/parity/pull/1612)
+- Updating jsonrpc-http-server [#1611](https://github.com/paritytech/parity/pull/1611)
+- replace synchronization primitives with those from parking_lot [#1593](https://github.com/paritytech/parity/pull/1593)
+- ui compilation feature [#1604](https://github.com/paritytech/parity/pull/1604)
+- is_zero() and pow() optimisations for uint [#1608](https://github.com/paritytech/parity/pull/1608)
+- Optimizing & Cleaning the build [#1591](https://github.com/paritytech/parity/pull/1591)
+- Fix logging [#1590](https://github.com/paritytech/parity/pull/1590)
+- remove unnecessary mutex in logging [#1601](https://github.com/paritytech/parity/pull/1601)
+- Using streamlined parity-ui repository [#1566](https://github.com/paritytech/parity/pull/1566)
+- Optimizing InstructionInfo access. [#1595](https://github.com/paritytech/parity/pull/1595)
+- V7 Migration progress indicator [#1594](https://github.com/paritytech/parity/pull/1594)
+- bring snapshotting work into master [#1577](https://github.com/paritytech/parity/pull/1577)
+- Bump clippy [#1587](https://github.com/paritytech/parity/pull/1587)
+- refactoring of handshake messages serialization in ipc [#1586](https://github.com/paritytech/parity/pull/1586)
+- expunge &Vec<T> pattern [#1579](https://github.com/paritytech/parity/pull/1579)
+- EVM gas for memory tiny optimization [#1578](https://github.com/paritytech/parity/pull/1578)
+- cleaned up parity/signer [#1551](https://github.com/paritytech/parity/pull/1551)
+- Major sync <-> client interactions refactoring [#1572](https://github.com/paritytech/parity/pull/1572)
+- failing test with overlayrecent pruning [#1567](https://github.com/paritytech/parity/pull/1567)
+- Enable state queries for OverlayRecent DB [#1575](https://github.com/paritytech/parity/pull/1575)
+- have AccountDB use address hash for uniqueness [#1533](https://github.com/paritytech/parity/pull/1533)
+- Very basic EVM binary. [#1574](https://github.com/paritytech/parity/pull/1574)
+- Some obvious evm & uint optimizations  [#1576](https://github.com/paritytech/parity/pull/1576)
+- Fixing clippy warnings [#1568](https://github.com/paritytech/parity/pull/1568)
+- Miner's gas price gets updated dynamically [#1570](https://github.com/paritytech/parity/pull/1570)
+- bringing hypervisor as a crate in ipc dir [#1565](https://github.com/paritytech/parity/pull/1565)
+- Init public interface with IO message [#1573](https://github.com/paritytech/parity/pull/1573)
+- Uncommenting simple Miner tests [#1571](https://github.com/paritytech/parity/pull/1571)
+- Kill lock unwraps [#1558](https://github.com/paritytech/parity/pull/1558)
+- Fixing deadlock in miner [#1569](https://github.com/paritytech/parity/pull/1569)
+- Idealpeers in log [#1563](https://github.com/paritytech/parity/pull/1563)
+- Simple style fix. [#1561](https://github.com/paritytech/parity/pull/1561)
+- Enum variants serialisation test&fix [#1559](https://github.com/paritytech/parity/pull/1559)
+- Supporting /api/ping for dapps server [#1543](https://github.com/paritytech/parity/pull/1543)
+- Client IPC Interface [#1493](https://github.com/paritytech/parity/pull/1493)
+- Kill timers when removing IO handler [#1554](https://github.com/paritytech/parity/pull/1554)
+- Fix and add info messages [#1552](https://github.com/paritytech/parity/pull/1552)
+- Fix indent of #1541 [#1555](https://github.com/paritytech/parity/pull/1555)
+- Update sealing just once when  externally importing many blocks [#1541](https://github.com/paritytech/parity/pull/1541)
+- Remove soft-fork stuff. [#1548](https://github.com/paritytech/parity/pull/1548)
+- fix codegen warning [#1550](https://github.com/paritytech/parity/pull/1550)
+- Extend migration framework [#1546](https://github.com/paritytech/parity/pull/1546)
+- Refactoring dapps to support API endpoints. [#1542](https://github.com/paritytech/parity/pull/1542)
+- serde is no longer util dependency [#1534](https://github.com/paritytech/parity/pull/1534)
+- mention wiki in README [#1549](https://github.com/paritytech/parity/pull/1549)
+- Skipping transactions with invalid nonces when pushing to block. [#1545](https://github.com/paritytech/parity/pull/1545)
+- Silent running operating modes [#1477](https://github.com/paritytech/parity/pull/1477)
+- util cleanup [#1474](https://github.com/paritytech/parity/pull/1474)
+- Calculating gas using usize (if supplied gaslimit fits in usize) [#1518](https://github.com/paritytech/parity/pull/1518)
+- add owning NibbleVec [#1536](https://github.com/paritytech/parity/pull/1536)
+- Attempt to fix blochchain/extras DBs sync [#1538](https://github.com/paritytech/parity/pull/1538)
+- Client API refactoring - limiting errors to crate-level error types [#1525](https://github.com/paritytech/parity/pull/1525)
+- IPC codegen enhancement - allow void methods [#1540](https://github.com/paritytech/parity/pull/1540)
+- Fixing serving nested files for dapps. [#1539](https://github.com/paritytech/parity/pull/1539)
+- Fixed public address config [#1537](https://github.com/paritytech/parity/pull/1537)
+- Fixing compilation&clippy warnings [#1531](https://github.com/paritytech/parity/pull/1531)
+- creating ethereum dir while in geth mode [#1530](https://github.com/paritytech/parity/pull/1530)
+- Bumping clippy [#1532](https://github.com/paritytech/parity/pull/1532)
+- Make signer default as long as --unlock isn't used. [#1524](https://github.com/paritytech/parity/pull/1524)
+- add client timeout when requesting usd price for gas [#1526](https://github.com/paritytech/parity/pull/1526)
+- Fix gitter-url link in README.md [#1528](https://github.com/paritytech/parity/pull/1528)
+- Fix error message. [#1527](https://github.com/paritytech/parity/pull/1527)
+- BTreeMap binary serialization [#1489](https://github.com/paritytech/parity/pull/1489)
+- Save block reference in the queue on notification [#1501](https://github.com/paritytech/parity/pull/1501)
+- bigint tests to run on CI [#1522](https://github.com/paritytech/parity/pull/1522)
+- Client api cleaning - uncles are returned as rlp [#1516](https://github.com/paritytech/parity/pull/1516)
+- Fatdb integration with CLI [#1464](https://github.com/paritytech/parity/pull/1464)
+- Optimizing/simplifying shr [#1517](https://github.com/paritytech/parity/pull/1517)
+- change IPC codegen to allow attributes [#1500](https://github.com/paritytech/parity/pull/1500)
+- Fix warnings [#1514](https://github.com/paritytech/parity/pull/1514)
+- FatDB [#1452](https://github.com/paritytech/parity/pull/1452)
+- Fix the reseal mechanism. [#1513](https://github.com/paritytech/parity/pull/1513)
+- Update Dockerfile ubuntu-aarch64 [#1509](https://github.com/paritytech/parity/pull/1509)
+- Update Ubuntu-arm Dockerfile [#1510](https://github.com/paritytech/parity/pull/1510)
+- Update Ubuntu-jit Dockerfile [#1511](https://github.com/paritytech/parity/pull/1511)
+- Update Ubuntu Dockerfile [#1512](https://github.com/paritytech/parity/pull/1512)
+- Update CentOS Dockerfile [#1508](https://github.com/paritytech/parity/pull/1508)
+- bump status page v0.5.1 [#1502](https://github.com/paritytech/parity/pull/1502)
+- Update CentOS Dockerfile [#1507](https://github.com/paritytech/parity/pull/1507)
+- Update Dockerfile ubuntu-aarch64 [#1506](https://github.com/paritytech/parity/pull/1506)
+- Update Ubuntu-arm Dockerfile [#1505](https://github.com/paritytech/parity/pull/1505)
+- Update Ubuntu-jit Dockerfile [#1504](https://github.com/paritytech/parity/pull/1504)
+- Update Ubuntu Dockerfile [#1503](https://github.com/paritytech/parity/pull/1503)
+- Optionally clone block behind work-package [#1497](https://github.com/paritytech/parity/pull/1497)
+- Fix no colour on windows. [#1498](https://github.com/paritytech/parity/pull/1498)
+- Workaround for hyper panic [#1495](https://github.com/paritytech/parity/pull/1495)
+- Colourful notification on mine [#1488](https://github.com/paritytech/parity/pull/1488)
+- Quick fix for max open files error [#1494](https://github.com/paritytech/parity/pull/1494)
+- Work notification over HTTP [#1491](https://github.com/paritytech/parity/pull/1491)
+- Sealed block importing and propagation optimization [#1478](https://github.com/paritytech/parity/pull/1478)
+- vm factory to mining client [#1487](https://github.com/paritytech/parity/pull/1487)
+- topbar dialog fix [#1479](https://github.com/paritytech/parity/pull/1479)
+- Minor additions to allow resetting of code. [#1482](https://github.com/paritytech/parity/pull/1482)
+- Introduce options for fine-grained management of work queue. [#1484](https://github.com/paritytech/parity/pull/1484)
+- Snapshot state restoration [#1308](https://github.com/paritytech/parity/pull/1308)
+- Merge master into pv64 branch [#1486](https://github.com/paritytech/parity/pull/1486)
+- Ensure we don't reject our own transactions for gasprice. [#1485](https://github.com/paritytech/parity/pull/1485)
+- Signing parity executable & windows installer in appveyor [#1481](https://github.com/paritytech/parity/pull/1481)
+- Rearrange fork CLI options. [#1476](https://github.com/paritytech/parity/pull/1476)
+- give appveyor some breath [#1475](https://github.com/paritytech/parity/pull/1475)
+- Ensure we always get the latest work when mining on submitted. [#1469](https://github.com/paritytech/parity/pull/1469)
+- Tests for views [#1471](https://github.com/paritytech/parity/pull/1471)
+- json ipc version bump [#1470](https://github.com/paritytech/parity/pull/1470)
+- verifier is no longer a template type of client [#1467](https://github.com/paritytech/parity/pull/1467)
+- Allow configuration of when to reseal blocks. [#1460](https://github.com/paritytech/parity/pull/1460)
+- removed unsafe code [#1466](https://github.com/paritytech/parity/pull/1466)
+- WS bump + Adding default for value [#1465](https://github.com/paritytech/parity/pull/1465)
+- Attempt DB repair if corrupted [#1461](https://github.com/paritytech/parity/pull/1461)
+- Database configuration extended [#1454](https://github.com/paritytech/parity/pull/1454)
+- Updating WS-RS server [#1459](https://github.com/paritytech/parity/pull/1459)
+- Reduced IO messages; removed panics on IO notifications [#1457](https://github.com/paritytech/parity/pull/1457)
+- Handle errors when starting parity --signer [#1451](https://github.com/paritytech/parity/pull/1451)
+- Fixed losing queued blocks on error [#1453](https://github.com/paritytech/parity/pull/1453)
+- Updated to latest hyper with patched mio [#1450](https://github.com/paritytech/parity/pull/1450)
+- Retweak BASE and MULTIPLIER in rocksdb config. [#1445](https://github.com/paritytech/parity/pull/1445)
+- Removing Miner::default. [#1410](https://github.com/paritytech/parity/pull/1410)
+- Don't mine without --author [#1436](https://github.com/paritytech/parity/pull/1436)
+- Revert the rescuedao extradata. [#1437](https://github.com/paritytech/parity/pull/1437)
+- More conservative settings for rocksdb. [#1440](https://github.com/paritytech/parity/pull/1440)
+- v1.3.0 in master [#1421](https://github.com/paritytech/parity/pull/1421)
+- Update Ubuntu-arm Dockerfile [#1429](https://github.com/paritytech/parity/pull/1429)
+- Create Dockerfile ubuntu-aarch64 [#1430](https://github.com/paritytech/parity/pull/1430)
+- Update CentOS Dockerfile [#1424](https://github.com/paritytech/parity/pull/1424)
+- Update Ubuntu Dockerfile [#1426](https://github.com/paritytech/parity/pull/1426)
+- Update Ubuntu-jit Dockerfile [#1427](https://github.com/paritytech/parity/pull/1427)
+- Update SF blocknumber to 1800000. [#1418](https://github.com/paritytech/parity/pull/1418)
diff --git a/docs/CHANGELOG-1.4.md b/docs/CHANGELOG-1.4.md
new file mode 100644
index 0000000000000000000000000000000000000000..7595c10a7ef7b9b95723c256179518d2080ecbc0
--- /dev/null
+++ b/docs/CHANGELOG-1.4.md
@@ -0,0 +1,746 @@
+Note: Parity 1.4 reached End-of-Life on 2017-03-13 (EOL).
+
+## Parity [v1.4.12](https://github.com/paritytech/parity/releases/tag/v1.4.12) (2017-02-22)
+
+This stable release fixes an issue with block uncle validation. Parity now allows uncle headers to have timestamp set to arbitrary future value.
+
+- Stable Backporting ([#4633](https://github.com/paritytech/parity/pull/4633)) [#4642](https://github.com/paritytech/parity/pull/4642)
+  - Tweak some checks.
+  - Fixed build and added a difficulty test
+  - Bump to v1.4.12
+- Add missing maxCodeSize [#4585](https://github.com/paritytech/parity/pull/4585)
+
+## Parity [v1.4.11](https://github.com/paritytech/parity/releases/tag/v1.4.11) (2017-02-17)
+
+This release corrects the Ropsten chain specification file.
+
+- Bump to v1.4.11 [#4587](https://github.com/paritytech/parity/pull/4587)
+- Fixing etherscan price parsing ([#4202](https://github.com/paritytech/parity/pull/4202)) [#4209](https://github.com/paritytech/parity/pull/4209)
+ - Fixing etherscan price parsing
+ - Handling all errors
+- Removed pdbs
+- Add missing maxCodeSize [#4585](https://github.com/paritytech/parity/pull/4585)
+
+## Parity [v1.4.10](https://github.com/paritytech/parity/releases/tag/v1.4.10) (2017-01-18)
+
+Parity 1.4.10 is a first stable release of 1.4.x series. It includes a few minor networking fixes.
+
+- Gas_limit for blocks, mined by Parity will be divisible by 37 (#4154) [#4179](https://github.com/paritytech/parity/pull/4179)
+  - gas_limit for new blocks will divide evenly by 13
+  - increased PARITY_GAS_LIMIT_DETERMINANT to 37
+  - separate method for marking mined block
+  - debug_asserts(gas_limit within protocol range)
+  - round_block_gas_limit method is now static
+  - made round_block_gas_limit free-function
+  - multiplier->multiple
+- Backporing to 1.4.10-stable [#4110](https://github.com/paritytech/parity/pull/4110)
+  - Bump to v1.4.10
+  - No reorg limit for ancient blocks
+  - Update registration after every write
+
+## Parity [v1.4.9](https://github.com/paritytech/parity/releases/tag/v1.4.9) (2017-01-09)
+
+This fixes an issue introduced in 1.4.8 that causes Parity to panic on propagating transactions in some cases.
+
+- v1.4.9 in beta [#4097](https://github.com/paritytech/parity/pull/4097)
+  - Bump to v1.4.9
+  - Disable armv6 build
+- beta Fix queue deadlock [#4095](https://github.com/paritytech/parity/pull/4095)
+- Fix rebroadcast panic beta [#4085](https://github.com/paritytech/parity/pull/4085)
+  - fix compile
+  - fix backport
+  - clean up old method
+  - remove unnecessary reference
+  - simplify
+  - Fixing 'simplify'
+
+## Parity [v1.4.8](https://github.com/paritytech/parity/releases/tag/v1.4.8) (2017-01-06)
+
+Ethereum Classic Hard Fork ready release containing various bugfixes:
+
+- Fix for excessive transactions propagation
+- Fix for inconsistent `logIndex` in transaction receipts
+
+See [full list of changes](https://github.com/paritytech/parity/compare/v1.4.7...v1.4.8):
+
+- Beta backports [#4067](https://github.com/paritytech/parity/pull/4067)
+- Re-broadcast transactions to few random peers on each new block. (#4054) [#4061](https://github.com/paritytech/parity/pull/4061)
+- Tolerate errors in user_defaults [#4060](https://github.com/paritytech/parity/pull/4060)
+- ETC Config change backport [#4056](https://github.com/paritytech/parity/pull/4056)
+- [beta] Avoid re-broadcasting transactions on each block [#4047](https://github.com/paritytech/parity/pull/4047)
+- Beta Backports [#4012](https://github.com/paritytech/parity/pull/4012)
+
+## Parity [v1.4.7](https://github.com/paritytech/parity/releases/tag/v1.4.7) (2016-12-27)
+
+This maintenance release fixes an issue with sync falling behind occasionally.
+
+- Backporting to beta [#3980](https://github.com/paritytech/parity/pull/3980)
+- [beta] enforce gas limit falls within engine bounds [#3816](https://github.com/paritytech/parity/pull/3816)
+
+
+## Parity [v1.4.6](https://github.com/paritytech/parity/releases/tag/v1.4.6) (2016-12-05)
+
+This patch release fixes an issue with syncing on the Ropsten test network.
+
+- Backporting to beta [#3718](https://github.com/paritytech/parity/pull/3718)
+- [beta] scrollable contract deploy & execute modals [#3656](https://github.com/paritytech/parity/pull/3656)
+
+## Parity [v1.4.5](https://github.com/paritytech/parity/releases/tag/v1.4.5) (2016-11-26)
+
+1.4.5 release fixes a number of issues, notably:
+- High CPU usage when idle.
+- Key recovery phrases generated on windows now can be imported.
+
+#### Configuration changes
+- `--usd-per-tx` is now set to 0.0025 by default.
+
+#### New features
+- Support for Ropsten test network is introduced with `--chain=ropsten` or `--testnet`. Morden network is still available via `--chain=morden`
+
+#### Full changes
+- [beta] Pin package versions for React [#3628](https://github.com/paritytech/parity/pull/3628)
+- Backporting to beta [#3623](https://github.com/paritytech/parity/pull/3623)
+- [beta] Ropsten chain for UI [#3622](https://github.com/paritytech/parity/pull/3622)
+
+## Parity [v1.4.4](https://github.com/paritytech/parity/releases/tag/v1.4.4) (2016-11-18)
+
+This is a maintenance release that fixes an issue with EIP-155 transactions being added to the transaction pool. It also improves syncing stability and resolved a number of UI issues.
+Full changelog is available [here.](https://github.com/paritytech/parity/commit/3e0d033eaf789cfdf517f4a97effc500f1f9263b)
+
+- [beta] apps typo fix [#3533](https://github.com/paritytech/parity/pull/3533)
+- Backporting to beta [#3525](https://github.com/paritytech/parity/pull/3525)
+
+## Parity [v1.4.3](https://github.com/paritytech/parity/releases/tag/v1.4.3) (2016-11-16)
+
+This release includes memory footprint optimization as well as a few fixes in the UI.
+EIP-155/160/161/170 hardfork is enabled at block 2675000 (1885000 for test network).
+Full changelog is available [here.](https://github.com/paritytech/parity/compare/v1.4.2...v1.4.3)
+
+- [beta] EIP-170 [#3464](https://github.com/paritytech/parity/pull/3464)
+- Backports to beta [#3465](https://github.com/paritytech/parity/pull/3465)
+- Backport: additional fields on transaction and receipt [#3463](https://github.com/paritytech/parity/pull/3463)
+- v1.4.3 in beta [#3424](https://github.com/paritytech/parity/pull/3424)
+
+## Parity [v1.4.2](https://github.com/paritytech/parity/releases/tag/v1.4.2) (2016-11-10)
+
+This release fixes a few additional issues:
+- Parity now correctly handles external `--dapps-interface` and  `--ui-interface` in the UI.
+- Crash in `eth_getUncle*` has been fixed.
+- macOS installer now includes an uninstall script.
+- Security token input UI has been fixed.
+- Correct display for tokens with minimum decimals.
+
+And some additional minor changes. Full changelog is [available](https://github.com/paritytech/parity/compare/v1.4.1...v1.4.2)
+- Backporting to beta [#3344](https://github.com/paritytech/parity/pull/3344)
+- Backporting to beta [#3324](https://github.com/paritytech/parity/pull/3324)
+
+## Parity [v1.4.1](https://github.com/paritytech/parity/releases/tag/v1.4.1) (2016-11-09)
+
+This is a hotfix release to address a couple of issues with 1.4.0:
+
+- UI token is requested instead of being supplied automatically.
+- Running with `--geth` results in an error.
+
+- Backporting to beta [#3293](https://github.com/paritytech/parity/pull/3293)
+
+## Parity [v1.4.0](https://github.com/paritytech/parity/releases/tag/v1.4.0) (2016-11-07)
+
+First beta release of the 1.4 series.
+
+This includes the new Parity Wallet and Warp-Sync synchronisation as well as several optimisations and fixes.
+
+- Add secure flag back [#3246](https://github.com/paritytech/parity/pull/3246)
+- [BETA] verify chunk hashes in cli restore [#3242](https://github.com/paritytech/parity/pull/3242)
+- Backporting to beta [#3239](https://github.com/paritytech/parity/pull/3239)
+- UI fixes backporting [#3234](https://github.com/paritytech/parity/pull/3234)
+- Backporting to beta [#3229](https://github.com/paritytech/parity/pull/3229)
+- Beta branch cleanup [#3226](https://github.com/paritytech/parity/pull/3226)
+- [beta] Set passive mode for first run only (#3214) [#3216](https://github.com/paritytech/parity/pull/3216)
+- Mode configuration backported to beta [#3213](https://github.com/paritytech/parity/pull/3213)
+- Backporting [#3198](https://github.com/paritytech/parity/pull/3198)
+- [beta] EIP-155 update with Vitalik's new test vectors (#3166) [#3189](https://github.com/paritytech/parity/pull/3189)
+- Backporting to beta [#3176](https://github.com/paritytech/parity/pull/3176)
+- parity-ui-precompiled pinned to beta [#3168](https://github.com/paritytech/parity/pull/3168)
+- EIP-155 update with Vitalik's new test vectors [#3166](https://github.com/paritytech/parity/pull/3166)
+- Push precompiled for beta/stable, npm only master [#3163](https://github.com/paritytech/parity/pull/3163)
+- Back to real root after npm publish [#3178](https://github.com/paritytech/parity/pull/3178)
+- Remove extra cd js [#3177](https://github.com/paritytech/parity/pull/3177)
+- Fixes Gas price selection bug [#3175](https://github.com/paritytech/parity/pull/3175)
+- Exposing state root and logsBloom in RPC receipts [#3174](https://github.com/paritytech/parity/pull/3174)
+- Exposing v,r,s from transaction signature in RPC [#3172](https://github.com/paritytech/parity/pull/3172)
+- Enabling personal RPC over IPC by default [#3165](https://github.com/paritytech/parity/pull/3165)
+- Gitlab CI badge [#3164](https://github.com/paritytech/parity/pull/3164)
+- Dependencies in README [#3162](https://github.com/paritytech/parity/pull/3162)
+- Make the footer a bit less ugly. [#3160](https://github.com/paritytech/parity/pull/3160)
+- Linux build case sensitivity fix [#3161](https://github.com/paritytech/parity/pull/3161)
+- abbreviated enode, `CopyToClipboard` component [#3131](https://github.com/paritytech/parity/pull/3131)
+- EIPs 155, 160, 161 [#2976](https://github.com/paritytech/parity/pull/2976)
+- beta reset to 1.4.0 [#3157](https://github.com/paritytech/parity/pull/3157)
+- Fix histogram [#3150](https://github.com/paritytech/parity/pull/3150)
+- Remove network label from TabBar [#3142](https://github.com/paritytech/parity/pull/3142)
+- Speed up unresponsive Contract events & Account transactions [#3145](https://github.com/paritytech/parity/pull/3145)
+- Better windows shortcut [#3147](https://github.com/paritytech/parity/pull/3147)
+- Redirect content to the same address as requested [#3133](https://github.com/paritytech/parity/pull/3133)
+- Fixed peer ping timeout [#3137](https://github.com/paritytech/parity/pull/3137)
+- Fix for windows build [#3125](https://github.com/paritytech/parity/pull/3125)
+- Fix AddessInput icon position [#3132](https://github.com/paritytech/parity/pull/3132)
+- Fixed not scrollable accounts in tokenreg dapp [#3128](https://github.com/paritytech/parity/pull/3128)
+- Returning cache headers for network content [#3123](https://github.com/paritytech/parity/pull/3123)
+- Optimise contract events display [#3120](https://github.com/paritytech/parity/pull/3120)
+- Add basic validation for contract execute values [#3118](https://github.com/paritytech/parity/pull/3118)
+- Dapps errors embeddable on signer [#3115](https://github.com/paritytech/parity/pull/3115)
+- Use enode RPC in UI [#3108](https://github.com/paritytech/parity/pull/3108)
+- Windows tray app [#3103](https://github.com/paritytech/parity/pull/3103)
+- Displaying CLI errors on stderr [#3116](https://github.com/paritytech/parity/pull/3116)
+- new InputAddressSelect component [#3071](https://github.com/paritytech/parity/pull/3071)
+- Bump mio [#3117](https://github.com/paritytech/parity/pull/3117)
+- Minor typo fixed. [#3110](https://github.com/paritytech/parity/pull/3110)
+- Sort by ETH balance and contract by date [#3107](https://github.com/paritytech/parity/pull/3107)
+- Add RPC enode lookup [#3096](https://github.com/paritytech/parity/pull/3096)
+- Initializing logger for each command [#3090](https://github.com/paritytech/parity/pull/3090)
+- Allow registration of content bundles in GitHubHint [#3094](https://github.com/paritytech/parity/pull/3094)
+- Add read-only inputs to UI plus Copy to Clipboard buttons [#3095](https://github.com/paritytech/parity/pull/3095)
+- Allow boolean dropdowns for contract deploy [#3077](https://github.com/paritytech/parity/pull/3077)
+- Add mac installer files [#2995](https://github.com/paritytech/parity/pull/2995)
+- Fixing dapps sorting [#3086](https://github.com/paritytech/parity/pull/3086)
+- Add a Gitter chat badge to README.md [#3092](https://github.com/paritytech/parity/pull/3092)
+- Fixes webpack HTML loader [#3089](https://github.com/paritytech/parity/pull/3089)
+- Redirecting /home to new UI [#3084](https://github.com/paritytech/parity/pull/3084)
+- Allow GitHubHint content owner to update url [#3083](https://github.com/paritytech/parity/pull/3083)
+- Remove token assets (moved to ethcore/dapps-assets) [#3082](https://github.com/paritytech/parity/pull/3082)
+- Goodbye Gavcoin, Hello Gavcoin [#3080](https://github.com/paritytech/parity/pull/3080)
+- Load network dapps [#3078](https://github.com/paritytech/parity/pull/3078)
+- Swap account phrase input to normal (non-multiline) [#3060](https://github.com/paritytech/parity/pull/3060)
+- Fix minor typo in informant [#3056](https://github.com/paritytech/parity/pull/3056)
+- Warp sync status display [#3045](https://github.com/paritytech/parity/pull/3045)
+- Enhance address input [#3065](https://github.com/paritytech/parity/pull/3065)
+- Go to Accounts Page if Tooltips are displayed [#3063](https://github.com/paritytech/parity/pull/3063)
+- Change contract Execute bool values & query bool value display [#3024](https://github.com/paritytech/parity/pull/3024)
+- Update Parity logo [#3036](https://github.com/paritytech/parity/pull/3036)
+- settings: replace background patterns (inline) [#3047](https://github.com/paritytech/parity/pull/3047)
+- Multiple line description for dapps [#3058](https://github.com/paritytech/parity/pull/3058)
+- Fix status log order [#3062](https://github.com/paritytech/parity/pull/3062)
+- Graphical gas price selection [#2898](https://github.com/paritytech/parity/pull/2898)
+- [Registry dApp] Actions not available before selecting accounts [#3032](https://github.com/paritytech/parity/pull/3032)
+- apply post-consolidation migrations after consolidating [#3020](https://github.com/paritytech/parity/pull/3020)
+- fix chain badge padding [#3046](https://github.com/paritytech/parity/pull/3046)
+- Don't delete Tags input on blur (eg. tab) [#3044](https://github.com/paritytech/parity/pull/3044)
+- Fixing last hashes for ethcall [#3043](https://github.com/paritytech/parity/pull/3043)
+- Remove signer icons [#3039](https://github.com/paritytech/parity/pull/3039)
+- execute periodic snapshot in new thread [#3029](https://github.com/paritytech/parity/pull/3029)
+- fix background of embedded signer [#3026](https://github.com/paritytech/parity/pull/3026)
+- registry dapp: fix reducer [#3028](https://github.com/paritytech/parity/pull/3028)
+- Replace Execute by Query in contract button [#3031](https://github.com/paritytech/parity/pull/3031)
+- Fixing GavCoin dApp overflow issues [#3030](https://github.com/paritytech/parity/pull/3030)
+- execute contract function: validate address [#3013](https://github.com/paritytech/parity/pull/3013)
+- Align tag inputs with other input boxes [#2965](https://github.com/paritytech/parity/pull/2965)
+- Sweep panickers from IO and network [#3018](https://github.com/paritytech/parity/pull/3018)
+- Terms & Conditions [#3019](https://github.com/paritytech/parity/pull/3019)
+- open column families after reparing db corruption [#3017](https://github.com/paritytech/parity/pull/3017)
+- Snapshot sync and block gap info in `eth_syncing` [#2948](https://github.com/paritytech/parity/pull/2948)
+- personal_ RPCs to AutoArgs [#3000](https://github.com/paritytech/parity/pull/3000)
+- RPCs for mode change [#3002](https://github.com/paritytech/parity/pull/3002)
+- Fix a test sensitive to slow execution. [#3014](https://github.com/paritytech/parity/pull/3014)
+- Fixes search filtering issues [#3011](https://github.com/paritytech/parity/pull/3011)
+- Restart sync if no more peers with snapshots [#3007](https://github.com/paritytech/parity/pull/3007)
+- Allow empty/non-existant input arrays for ABIs in contract view [#3001](https://github.com/paritytech/parity/pull/3001)
+- Allow operation when no registry is available [#2980](https://github.com/paritytech/parity/pull/2980)
+- Make JS lint & test run on Travis [#2894](https://github.com/paritytech/parity/pull/2894)
+- Update account dropdowns [#2959](https://github.com/paritytech/parity/pull/2959)
+- Modify gas price statistics [#2947](https://github.com/paritytech/parity/pull/2947)
+- Fixes pending/mined transactions in registry dApp [#3004](https://github.com/paritytech/parity/pull/3004)
+- Prevent connecting to self [#2997](https://github.com/paritytech/parity/pull/2997)
+- Disable verbose in gitlab CI [#2999](https://github.com/paritytech/parity/pull/2999)
+- Allow warnings in gitlab [#2998](https://github.com/paritytech/parity/pull/2998)
+- Fix the brainwallet functionality. [#2994](https://github.com/paritytech/parity/pull/2994)
+- Provided gas description update [#2993](https://github.com/paritytech/parity/pull/2993)
+- Print messages to stderr [#2991](https://github.com/paritytech/parity/pull/2991)
+- Networking and syncing tweaks [#2990](https://github.com/paritytech/parity/pull/2990)
+- Allow build warnings [#2985](https://github.com/paritytech/parity/pull/2985)
+- Display network status for finished Signer requests [#2983](https://github.com/paritytech/parity/pull/2983)
+- Fixed rejecting transactions [#2984](https://github.com/paritytech/parity/pull/2984)
+- mio version bump [#2982](https://github.com/paritytech/parity/pull/2982)
+- Publish parity.js to npmjs registry [#2978](https://github.com/paritytech/parity/pull/2978)
+- Import raw private key [#2945](https://github.com/paritytech/parity/pull/2945)
+- refactor etherscan.io links [#2896](https://github.com/paritytech/parity/pull/2896)
+- Use separate lock for code cache [#2977](https://github.com/paritytech/parity/pull/2977)
+- Add favicon [#2974](https://github.com/paritytech/parity/pull/2974)
+- Align password change dialog with create dialog ordering [#2970](https://github.com/paritytech/parity/pull/2970)
+- WS bump [#2973](https://github.com/paritytech/parity/pull/2973)
+- Discovery performance optimization [#2972](https://github.com/paritytech/parity/pull/2972)
+- Pass gas & gasPrice to token transfers [#2964](https://github.com/paritytech/parity/pull/2964)
+- Updating ws-rs [#2962](https://github.com/paritytech/parity/pull/2962)
+- Run cargo with verbose flag when testing [#2943](https://github.com/paritytech/parity/pull/2943)
+- Fixing clippy warnings take two [#2961](https://github.com/paritytech/parity/pull/2961)
+- Snapshot sync improvements [#2960](https://github.com/paritytech/parity/pull/2960)
+- Gavcoin event display updates [#2956](https://github.com/paritytech/parity/pull/2956)
+- Eslint fixes [#2957](https://github.com/paritytech/parity/pull/2957)
+- Add import of raw private key RPCs [#2942](https://github.com/paritytech/parity/pull/2942)
+- Bring in styling queues from original Gavcoin [#2936](https://github.com/paritytech/parity/pull/2936)
+- Validating minimal required gas for a transaction [#2937](https://github.com/paritytech/parity/pull/2937)
+- Even more snapshot validity checks [#2935](https://github.com/paritytech/parity/pull/2935)
+- Shared code cache [#2921](https://github.com/paritytech/parity/pull/2921)
+- Updating bootnodes for ETC [#2938](https://github.com/paritytech/parity/pull/2938)
+- More bootnodes [#2926](https://github.com/paritytech/parity/pull/2926)
+- Revert hash updates until testable [#2925](https://github.com/paritytech/parity/pull/2925)
+- Release.sh verbose output [#2924](https://github.com/paritytech/parity/pull/2924)
+- additional release.sh debugging info [#2922](https://github.com/paritytech/parity/pull/2922)
+- Pass the js-precompiled commit hash to cargo update [#2920](https://github.com/paritytech/parity/pull/2920)
+- Next nonce RPC [#2917](https://github.com/paritytech/parity/pull/2917)
+- Get rid of duplicated code in EVM [#2915](https://github.com/paritytech/parity/pull/2915)
+- Transaction Queue banning [#2524](https://github.com/paritytech/parity/pull/2524)
+- Revert to gas price ordering [#2919](https://github.com/paritytech/parity/pull/2919)
+- Personal split [#2879](https://github.com/paritytech/parity/pull/2879)
+- Fixing config values for pruning_history [#2918](https://github.com/paritytech/parity/pull/2918)
+- Apply pending block details on commit [#2254](https://github.com/paritytech/parity/pull/2254)
+- Fixed GetNodeData output [#2892](https://github.com/paritytech/parity/pull/2892)
+- New sync protocol ID [#2912](https://github.com/paritytech/parity/pull/2912)
+- Clippy bump [#2877](https://github.com/paritytech/parity/pull/2877)
+- iconomi token images [#2906](https://github.com/paritytech/parity/pull/2906)
+- Fixes too long description and Token balance value in Dapps/Accounts [#2902](https://github.com/paritytech/parity/pull/2902)
+- Add missing images for local dapps [#2890](https://github.com/paritytech/parity/pull/2890)
+- Fix Webpack, again [#2895](https://github.com/paritytech/parity/pull/2895)
+- Enable suicide json test [#2893](https://github.com/paritytech/parity/pull/2893)
+- More snapshot fixes and optimizations [#2883](https://github.com/paritytech/parity/pull/2883)
+- Fixes CI JS precompiled build [#2886](https://github.com/paritytech/parity/pull/2886)
+- Fix empty tags modification [#2884](https://github.com/paritytech/parity/pull/2884)
+- Fix up informant. [#2865](https://github.com/paritytech/parity/pull/2865)
+- Get rid of MemoryDB denote [#2881](https://github.com/paritytech/parity/pull/2881)
+- Add inject to "bundle everything" list [#2871](https://github.com/paritytech/parity/pull/2871)
+- Fixes signer and MUI errors throwing [#2876](https://github.com/paritytech/parity/pull/2876)
+- Fix failing tests after log parsing updates [#2878](https://github.com/paritytech/parity/pull/2878)
+- Sweep some more panics [#2848](https://github.com/paritytech/parity/pull/2848)
+- Make GitLab js-precompiled really update Cargo.toml in main repo [#2869](https://github.com/paritytech/parity/pull/2869)
+- IPC version bump [#2870](https://github.com/paritytech/parity/pull/2870)
+- Snapshot sync fixes and optimizations [#2863](https://github.com/paritytech/parity/pull/2863)
+- Add Check and Change Password for an Account [#2861](https://github.com/paritytech/parity/pull/2861)
+- Output git fetch/push to log files [#2862](https://github.com/paritytech/parity/pull/2862)
+- Align contract event log l&f with transactions [#2812](https://github.com/paritytech/parity/pull/2812)
+- Nicer port in use errors [#2859](https://github.com/paritytech/parity/pull/2859)
+- Remove personal_* calls from dapps [#2860](https://github.com/paritytech/parity/pull/2860)
+- Token sorting, zero-ETH transfer & token decimals [#2805](https://github.com/paritytech/parity/pull/2805)
+- Don't fail badly when no transactions in last 100 blocks. [#2856](https://github.com/paritytech/parity/pull/2856)
+- Fixing home.parity address for new signer [#2851](https://github.com/paritytech/parity/pull/2851)
+- Enabling UI build back [#2853](https://github.com/paritytech/parity/pull/2853)
+- Remove eventName in unsubscribe API arguments [#2844](https://github.com/paritytech/parity/pull/2844)
+- Don't return empty names as clickable titles [#2809](https://github.com/paritytech/parity/pull/2809)
+- Auto-bump js-precompiled on release [#2828](https://github.com/paritytech/parity/pull/2828)
+- Remove ethcore::common re-export module [#2792](https://github.com/paritytech/parity/pull/2792)
+- Prevent database corruption on OOM [#2832](https://github.com/paritytech/parity/pull/2832)
+- Download/Export Addressbook [#2847](https://github.com/paritytech/parity/pull/2847)
+- Snapshot and blockchain stability improvements [#2843](https://github.com/paritytech/parity/pull/2843)
+- Extended network options [#2845](https://github.com/paritytech/parity/pull/2845)
+- fix failing master test build [#2846](https://github.com/paritytech/parity/pull/2846)
+- Local dapps embeddable on signer port [#2815](https://github.com/paritytech/parity/pull/2815)
+- Trigger accounts/contracts search on search input change [#2838](https://github.com/paritytech/parity/pull/2838)
+- Move snapshot sync to a subprotocol [#2820](https://github.com/paritytech/parity/pull/2820)
+- fix node log being reversed [#2839](https://github.com/paritytech/parity/pull/2839)
+- Fixes currency symbol font size in Shapeshift modal [#2840](https://github.com/paritytech/parity/pull/2840)
+- Disable personal APIs by default for security reasons [#2834](https://github.com/paritytech/parity/pull/2834)
+- Clear cached content [#2833](https://github.com/paritytech/parity/pull/2833)
+- Add ethcore_[dapps|signer]Port APIs [#2821](https://github.com/paritytech/parity/pull/2821)
+- CLI option to skip seal check when importing [#2842](https://github.com/paritytech/parity/pull/2842)
+- Fix case error in Dapps import [#2837](https://github.com/paritytech/parity/pull/2837)
+- Double click on address in account detail view should select it [#2841](https://github.com/paritytech/parity/pull/2841)
+- Bump js-precompiled to 20161022-223915 UTC [#2826](https://github.com/paritytech/parity/pull/2826)
+- Adjust paths to handle CORS changes [#2816](https://github.com/paritytech/parity/pull/2816)
+- RPC for dapps port and signer port [#2819](https://github.com/paritytech/parity/pull/2819)
+- Update build to working version on pre-compiled repo [#2825](https://github.com/paritytech/parity/pull/2825)
+- Adjust network name badge colours (darker) [#2823](https://github.com/paritytech/parity/pull/2823)
+- Removing submodule in favour of rust crate [#2756](https://github.com/paritytech/parity/pull/2756)
+- Return old-ish content even when syncing [#2757](https://github.com/paritytech/parity/pull/2757)
+- fix Signer UI [#2750](https://github.com/paritytech/parity/pull/2750)
+- USG, GBP, Euro & Yuan updates [#2818](https://github.com/paritytech/parity/pull/2818)
+- Make locally installed apps available again (Fixes #2771) [#2808](https://github.com/paritytech/parity/pull/2808)
+- Additional RPCs for password management [#2779](https://github.com/paritytech/parity/pull/2779)
+- flush DB changes on drop [#2795](https://github.com/paritytech/parity/pull/2795)
+- rename State::snapshot to checkpoint to avoid confusion [#2796](https://github.com/paritytech/parity/pull/2796)
+- Missing changes required to make new UI work [#2793](https://github.com/paritytech/parity/pull/2793)
+- Cleanup method decoding (Fixes #2811) [#2810](https://github.com/paritytech/parity/pull/2810)
+- Use trace API for decentralized transaction list [#2784](https://github.com/paritytech/parity/pull/2784)
+- Automatic compaction selection on Linux [#2785](https://github.com/paritytech/parity/pull/2785)
+- Update token images [#2804](https://github.com/paritytech/parity/pull/2804)
+- Hackergold token images [#2801](https://github.com/paritytech/parity/pull/2801)
+- Additional token images [#2800](https://github.com/paritytech/parity/pull/2800)
+- Additional token images [#2798](https://github.com/paritytech/parity/pull/2798)
+- Resolve morden fork [#2773](https://github.com/paritytech/parity/pull/2773)
+- Using SipHashes from crates.io [#2778](https://github.com/paritytech/parity/pull/2778)
+- Fixed issues on Searchable Addresses [#2790](https://github.com/paritytech/parity/pull/2790)
+- Currency icons [#2788](https://github.com/paritytech/parity/pull/2788)
+- Update token images [#2783](https://github.com/paritytech/parity/pull/2783)
+- Fix warning in master [#2775](https://github.com/paritytech/parity/pull/2775)
+- Add empty account existence test from beta. [#2769](https://github.com/paritytech/parity/pull/2769)
+- Update name of basiccoin manager [#2768](https://github.com/paritytech/parity/pull/2768)
+- sweep most unwraps from ethcore crate, dapps crate [#2762](https://github.com/paritytech/parity/pull/2762)
+- Check queue to determine major importing [#2763](https://github.com/paritytech/parity/pull/2763)
+- Trace filtering fix [#2760](https://github.com/paritytech/parity/pull/2760)
+- Update js precompiled to 20161020-141636 [#2761](https://github.com/paritytech/parity/pull/2761)
+- Incrementally calculate verification queue heap size [#2749](https://github.com/paritytech/parity/pull/2749)
+- Don't add empty accounts to bloom [#2753](https://github.com/paritytech/parity/pull/2753)
+- fix contract deployments not showing up [#2759](https://github.com/paritytech/parity/pull/2759)
+- Fixes a positioning issue in Address Selection component [#2754](https://github.com/paritytech/parity/pull/2754)
+- fix linting issues [#2758](https://github.com/paritytech/parity/pull/2758)
+- Making Trie.iter non-recursive [#2733](https://github.com/paritytech/parity/pull/2733)
+- Block import optimization [#2748](https://github.com/paritytech/parity/pull/2748)
+- Update js-precompiled to 20161020-110858 [#2752](https://github.com/paritytech/parity/pull/2752)
+- Fixing small files fetching [#2742](https://github.com/paritytech/parity/pull/2742)
+- Fixing stalled sync [#2747](https://github.com/paritytech/parity/pull/2747)
+- refactor signer components [#2691](https://github.com/paritytech/parity/pull/2691)
+- Png images with backgrounds (original svg) [#2740](https://github.com/paritytech/parity/pull/2740)
+- Make address selection searchable [#2739](https://github.com/paritytech/parity/pull/2739)
+- very basic dapp add/remove interface [#2721](https://github.com/paritytech/parity/pull/2721)
+- Frontport commits from beta to master [#2743](https://github.com/paritytech/parity/pull/2743)
+- Implements Trace API Formatter [#2732](https://github.com/paritytech/parity/pull/2732)
+- bump parking_lot to 0.3.x series [#2702](https://github.com/paritytech/parity/pull/2702)
+- Unify major syncing detection [#2699](https://github.com/paritytech/parity/pull/2699)
+- Fixes gas/gasPrice change not reflected in transaction modal [#2735](https://github.com/paritytech/parity/pull/2735)
+- Fixing build UI stuff along with Rust [#2726](https://github.com/paritytech/parity/pull/2726)
+- Fixed Snackbar not showing and/or behind transactions (#2730) [#2731](https://github.com/paritytech/parity/pull/2731)
+- Updating json tests to latest develop commit [#2728](https://github.com/paritytech/parity/pull/2728)
+- dapps: show errors [#2727](https://github.com/paritytech/parity/pull/2727)
+- node logs: break lines [#2722](https://github.com/paritytech/parity/pull/2722)
+- Bumping JSON-RPC http server [#2714](https://github.com/paritytech/parity/pull/2714)
+- Add ability to copy address to the clipboard [#2716](https://github.com/paritytech/parity/pull/2716)
+- Sort tags when displaying ; use AND for search results [#2720](https://github.com/paritytech/parity/pull/2720)
+- allow-same-origin for iframe [#2711](https://github.com/paritytech/parity/pull/2711)
+- Update Registry address (mainnet) [#2713](https://github.com/paritytech/parity/pull/2713)
+- Allow tags for Accounts, Addresses and Contracts [#2712](https://github.com/paritytech/parity/pull/2712)
+- Correct parameters for eth_sign [#2703](https://github.com/paritytech/parity/pull/2703)
+- Bump js-precompiled to 20161018-161705 [#2698](https://github.com/paritytech/parity/pull/2698)
+- Add inject.js (for web3 exposed) [#2692](https://github.com/paritytech/parity/pull/2692)
+- Remove obsolete dapps and update security headers [#2694](https://github.com/paritytech/parity/pull/2694)
+- Snapshot sync part 2 [#2098](https://github.com/paritytech/parity/pull/2098)
+- Fix issues with no ethereum test dir present (2382) [#2659](https://github.com/paritytech/parity/pull/2659)
+- Apply UI PRs after master merge [#2690](https://github.com/paritytech/parity/pull/2690)
+- Fix importing traces for non-canon blocks [#2683](https://github.com/paritytech/parity/pull/2683)
+- Fixing random test failures [#2577](https://github.com/paritytech/parity/pull/2577)
+- Disable IPC in default build for 1.4 [#2657](https://github.com/paritytech/parity/pull/2657)
+- use pruning history in CLI snapshots [#2658](https://github.com/paritytech/parity/pull/2658)
+- Fixing --no-default-features again and evmbin [#2670](https://github.com/paritytech/parity/pull/2670)
+- Settings > Proxy for proxy.pac setup instructions [#2678](https://github.com/paritytech/parity/pull/2678)
+- Re-instate transaitions to allow updating busy indicator [#2682](https://github.com/paritytech/parity/pull/2682)
+- signer: remove reject counter [#2685](https://github.com/paritytech/parity/pull/2685)
+- Initial new UI source code import [#2607](https://github.com/paritytech/parity/pull/2607)
+- Additional dapp logo images [#2677](https://github.com/paritytech/parity/pull/2677)
+- Redirect from :8080 to :8180 [#2676](https://github.com/paritytech/parity/pull/2676)
+- script to update js-precompiled [#2673](https://github.com/paritytech/parity/pull/2673)
+- Styling in FF is not 100% [#2669](https://github.com/paritytech/parity/pull/2669)
+- Don't allow gavcoin transfer with no balances [#2667](https://github.com/paritytech/parity/pull/2667)
+- fix signer rejections [#2666](https://github.com/paritytech/parity/pull/2666)
+- better text on unique background pattern [#2664](https://github.com/paritytech/parity/pull/2664)
+- Adjust z-index for error overlay [#2662](https://github.com/paritytech/parity/pull/2662)
+- Fix address selection for contract deployment [#2660](https://github.com/paritytech/parity/pull/2660)
+- Add additional contract images [#2655](https://github.com/paritytech/parity/pull/2655)
+- Update /api/* to point to :8080/api/* (first generation interface) [#2612](https://github.com/paritytech/parity/pull/2612)
+- Initial import of new UI (compiled JS code) [#2220](https://github.com/paritytech/parity/pull/2220)
+- Fixing evmbin compilation [#2652](https://github.com/paritytech/parity/pull/2652)
+- Fix up ETC EIP-150 transition to 2,500,000. [#2636](https://github.com/paritytech/parity/pull/2636)
+- Fixing compilation without default features [#2638](https://github.com/paritytech/parity/pull/2638)
+- [frontport] CLI to specify queue ordering strategy (#2494) [#2623](https://github.com/paritytech/parity/pull/2623)
+- Support for decryption in Signer [#2421](https://github.com/paritytech/parity/pull/2421)
+- EIP150.1c [#2591](https://github.com/paritytech/parity/pull/2591)
+- Release merge with origin with ours strategy [#2631](https://github.com/paritytech/parity/pull/2631)
+- Adjust build output directories [#2630](https://github.com/paritytech/parity/pull/2630)
+- cater for txhash returning null/empty object [#2629](https://github.com/paritytech/parity/pull/2629)
+- snapshot: single byte for empty accounts [#2625](https://github.com/paritytech/parity/pull/2625)
+- Configurable history size in master [#2606](https://github.com/paritytech/parity/pull/2606)
+- Database performance tweaks [#2619](https://github.com/paritytech/parity/pull/2619)
+- Enable suicide json test [#2626](https://github.com/paritytech/parity/pull/2626)
+- Split journaldb commit into two functions: journal_under and mark_canonical [#2329](https://github.com/paritytech/parity/pull/2329)
+- Fixed tx queue limit for local transactions [#2616](https://github.com/paritytech/parity/pull/2616)
+- Additional logs when transactions is removed from queue [#2617](https://github.com/paritytech/parity/pull/2617)
+- mitigate refcell conflict in state diffing [#2601](https://github.com/paritytech/parity/pull/2601)
+- Fix tests [#2611](https://github.com/paritytech/parity/pull/2611)
+- small styling updates [#2610](https://github.com/paritytech/parity/pull/2610)
+- Remove web3 from Signer, bring in parity.js API [#2604](https://github.com/paritytech/parity/pull/2604)
+- Mostly configurable canonical cache size [#2516](https://github.com/paritytech/parity/pull/2516)
+- Added peers details to ethcore_netPeers RPC [#2580](https://github.com/paritytech/parity/pull/2580)
+- Display account password hint when available [#2596](https://github.com/paritytech/parity/pull/2596)
+- Fix gas estimation on transfer when data supplied [#2593](https://github.com/paritytech/parity/pull/2593)
+- remove unused npm packages [#2590](https://github.com/paritytech/parity/pull/2590)
+- Bundle fonts as part of the build process [#2588](https://github.com/paritytech/parity/pull/2588)
+- Contract constructor params [#2586](https://github.com/paritytech/parity/pull/2586)
+- Update json test suite [#2574](https://github.com/paritytech/parity/pull/2574)
+- Filter apps that has been replaced for the local list [#2583](https://github.com/paritytech/parity/pull/2583)
+- Display local apps listed by Parity [#2581](https://github.com/paritytech/parity/pull/2581)
+- Network-specific nodes file [#2569](https://github.com/paritytech/parity/pull/2569)
+- Dont close when block is known to be invalid [#2572](https://github.com/paritytech/parity/pull/2572)
+- deny compiler warnings in CI [#2570](https://github.com/paritytech/parity/pull/2570)
+- adjust alignment of queries [#2573](https://github.com/paritytech/parity/pull/2573)
+- update ethcore-bigint crate to 0.1.1 [#2562](https://github.com/paritytech/parity/pull/2562)
+- Registry dapp uses setAddress to actually set addresses now [#2568](https://github.com/paritytech/parity/pull/2568)
+- Add the new EIP150 test. [#2563](https://github.com/paritytech/parity/pull/2563)
+- fix failing tests [#2567](https://github.com/paritytech/parity/pull/2567)
+- ΞTH -> ETH [#2566](https://github.com/paritytech/parity/pull/2566)
+- Ensure polling is only done when connected [#2565](https://github.com/paritytech/parity/pull/2565)
+- Fixed race condition in trace import [#2555](https://github.com/paritytech/parity/pull/2555)
+- Disable misbehaving peers while seeking for best block [#2537](https://github.com/paritytech/parity/pull/2537)
+- TX queue gas limit config and allow local transactions over the gas limit [#2553](https://github.com/paritytech/parity/pull/2553)
+- standard component for address -> name mappings (consistent use everywhere) [#2557](https://github.com/paritytech/parity/pull/2557)
+- Remove unwrap from client module [#2554](https://github.com/paritytech/parity/pull/2554)
+- Removing panickers from sync module [#2551](https://github.com/paritytech/parity/pull/2551)
+- Address images (tokens, dapps) as registered via contentHash (when available) [#2526](https://github.com/paritytech/parity/pull/2526)
+- TokenReg set & get images working [#2540](https://github.com/paritytech/parity/pull/2540)
+- adjust app_id where /api/content/<hash> is called, fixes #2541 [#2543](https://github.com/paritytech/parity/pull/2543)
+- connection dialog now shows up in dapps as well, closes #2538 [#2550](https://github.com/paritytech/parity/pull/2550)
+- display account uuid (where available), closes #2546 [#2549](https://github.com/paritytech/parity/pull/2549)
+- create accounts via recovery phrase [#2545](https://github.com/paritytech/parity/pull/2545)
+- Build ethcore/js-precompiled on GitLab [#2522](https://github.com/paritytech/parity/pull/2522)
+- Return errors from eth_call RPC [#2498](https://github.com/paritytech/parity/pull/2498)
+- registry dapp: manage records [#2323](https://github.com/paritytech/parity/pull/2323)
+- Print backtrace on panic [#2535](https://github.com/paritytech/parity/pull/2535)
+- GitHubHint dapp [#2531](https://github.com/paritytech/parity/pull/2531)
+- Backports to master [#2530](https://github.com/paritytech/parity/pull/2530)
+- Handle reorganizations in the state cache [#2490](https://github.com/paritytech/parity/pull/2490)
+- Hypervisor: terminate hanging modules [#2513](https://github.com/paritytech/parity/pull/2513)
+- signer & node connection prompts/indicators [#2504](https://github.com/paritytech/parity/pull/2504)
+- Using pending block only if is not old [#2514](https://github.com/paritytech/parity/pull/2514)
+- More caching optimizations [#2505](https://github.com/paritytech/parity/pull/2505)
+- Fixed possible panic in the networking [#2495](https://github.com/paritytech/parity/pull/2495)
+- Trim password from file [#2503](https://github.com/paritytech/parity/pull/2503)
+- Fixing RPC Filter conversion to EthFilter [#2500](https://github.com/paritytech/parity/pull/2500)
+- Fixing error message for transactions [#2496](https://github.com/paritytech/parity/pull/2496)
+- Adjustable stack size for EVM [#2483](https://github.com/paritytech/parity/pull/2483)
+- [master] Fixing penalization in future [#2499](https://github.com/paritytech/parity/pull/2499)
+- Preserve cache on reverting the snapshot [#2488](https://github.com/paritytech/parity/pull/2488)
+- RocksDB version bump [#2492](https://github.com/paritytech/parity/pull/2492)
+- Increase default size of transaction queue [#2489](https://github.com/paritytech/parity/pull/2489)
+- basiccoin v1 available [#2491](https://github.com/paritytech/parity/pull/2491)
+- Small EVM optimization [#2487](https://github.com/paritytech/parity/pull/2487)
+- Track dirty accounts in the state [#2461](https://github.com/paritytech/parity/pull/2461)
+- fix signature lookup address [#2480](https://github.com/paritytech/parity/pull/2480)
+- update registrar test with generic non-empty test [#2476](https://github.com/paritytech/parity/pull/2476)
+- Derive IPC interface only when ipc feature is on [#2463](https://github.com/paritytech/parity/pull/2463)
+- Fix ethstore opening all key files in the directory at once [#2471](https://github.com/paritytech/parity/pull/2471)
+- contract api event log fixes [#2469](https://github.com/paritytech/parity/pull/2469)
+- basiccoin base functionality in-place [#2468](https://github.com/paritytech/parity/pull/2468)
+- Merge IPC codegen attributes into one [#2460](https://github.com/paritytech/parity/pull/2460)
+- Close after importing keys from geth [#2464](https://github.com/paritytech/parity/pull/2464)
+- Port a couple more RPC APIs to the new auto args [#2325](https://github.com/paritytech/parity/pull/2325)
+- update rustc for appveyor to 1.12.0 [#2423](https://github.com/paritytech/parity/pull/2423)
+- dapp basiccoin send operations [#2456](https://github.com/paritytech/parity/pull/2456)
+- Better EVM informant & Slow transactions warning [#2436](https://github.com/paritytech/parity/pull/2436)
+- Fixing Signer token RPC API [#2437](https://github.com/paritytech/parity/pull/2437)
+- Fixed FatDB check [#2443](https://github.com/paritytech/parity/pull/2443)
+- dapp basiccoin structure [#2444](https://github.com/paritytech/parity/pull/2444)
+- Accounts bloom in master [#2426](https://github.com/paritytech/parity/pull/2426)
+- Polishing Actually enable fat db pr (#1974) [#2048](https://github.com/paritytech/parity/pull/2048)
+- Jumptable cache [#2427](https://github.com/paritytech/parity/pull/2427)
+- signaturereg registered, remove hardcoding [#2431](https://github.com/paritytech/parity/pull/2431)
+- tokenreg dapp fixes for non-null returns [#2430](https://github.com/paritytech/parity/pull/2430)
+- update ABI json to latest deployed versions [#2428](https://github.com/paritytech/parity/pull/2428)
+- update Morden registry address [#2417](https://github.com/paritytech/parity/pull/2417)
+- Make migration api more friendly [#2420](https://github.com/paritytech/parity/pull/2420)
+- Journaling bloom filter crate in util [#2395](https://github.com/paritytech/parity/pull/2395)
+- move abis from js/json to contracts/abi [#2418](https://github.com/paritytech/parity/pull/2418)
+- Fixing logs-receipt matching [#2403](https://github.com/paritytech/parity/pull/2403)
+- fix broken beta compilation [#2405](https://github.com/paritytech/parity/pull/2405)
+- registry dapp: transfer names [#2335](https://github.com/paritytech/parity/pull/2335)
+- manage firstRun better [#2398](https://github.com/paritytech/parity/pull/2398)
+- render contract deployment address [#2397](https://github.com/paritytech/parity/pull/2397)
+- Transaction Queue fix [#2392](https://github.com/paritytech/parity/pull/2392)
+- contracts abi types & execute value [#2394](https://github.com/paritytech/parity/pull/2394)
+- update styling with ParityBar overlay [#2390](https://github.com/paritytech/parity/pull/2390)
+- application Signer popup window [#2388](https://github.com/paritytech/parity/pull/2388)
+- Fixing Delegate Call in JIT [#2378](https://github.com/paritytech/parity/pull/2378)
+- Prioritizing re-imported transactions [#2372](https://github.com/paritytech/parity/pull/2372)
+- Revert #2172, pretty much. [#2387](https://github.com/paritytech/parity/pull/2387)
+- correct sync memory usage calculation [#2385](https://github.com/paritytech/parity/pull/2385)
+- fix migration system for post-consolidation migrations, better errors [#2334](https://github.com/paritytech/parity/pull/2334)
+- Fix the traceAddress field in transaction traces. [#2373](https://github.com/paritytech/parity/pull/2373)
+- Gavcoin utilises the popup box [#2381](https://github.com/paritytech/parity/pull/2381)
+- registry dapp: support dropping names [#2328](https://github.com/paritytech/parity/pull/2328)
+- settings view, set background & store views [#2380](https://github.com/paritytech/parity/pull/2380)
+- Removing extras data from retracted blocks. [#2375](https://github.com/paritytech/parity/pull/2375)
+- fixed #2263, geth keys with ciphertext shorter than 32 bytes [#2318](https://github.com/paritytech/parity/pull/2318)
+- Expanse compatibility [#2369](https://github.com/paritytech/parity/pull/2369)
+- Allow queries of constant functions on contracts [#2360](https://github.com/paritytech/parity/pull/2360)
+- Auto Open/Close the Signer window on new transaction request [#2362](https://github.com/paritytech/parity/pull/2362)
+- Specify column cache sizes explicitly; default fallback of 2MB [#2358](https://github.com/paritytech/parity/pull/2358)
+- Canonical state cache (master) [#2311](https://github.com/paritytech/parity/pull/2311)
+- method signature lookups, parameter decoding & management [#2313](https://github.com/paritytech/parity/pull/2313)
+- make block queue into a more generic verification queue and fix block heap size calculation [#2095](https://github.com/paritytech/parity/pull/2095)
+- Hash Content RPC method [#2355](https://github.com/paritytech/parity/pull/2355)
+- registry dapp: show reserved events by default [#2359](https://github.com/paritytech/parity/pull/2359)
+- Display timestamp in Signer requests details [#2324](https://github.com/paritytech/parity/pull/2324)
+- Reorder transaction_by_hash to favour canon search [#2332](https://github.com/paritytech/parity/pull/2332)
+- Optimize DIV for some common divisors [#2327](https://github.com/paritytech/parity/pull/2327)
+- Return error when deserializing invalid hex [#2339](https://github.com/paritytech/parity/pull/2339)
+- Changed http:// to https:// on some links [#2349](https://github.com/paritytech/parity/pull/2349)
+- user defaults [#2014](https://github.com/paritytech/parity/pull/2014)
+- Fixing jit feature compilation [#2310](https://github.com/paritytech/parity/pull/2310)
+- Tx Queue improvements  [#2292](https://github.com/paritytech/parity/pull/2292)
+- Removing PropTypes on build [#2322](https://github.com/paritytech/parity/pull/2322)
+- Lenient bytes deserialization [#2036](https://github.com/paritytech/parity/pull/2036)
+- reverse call data decoding given transaction data & method [#2312](https://github.com/paritytech/parity/pull/2312)
+- add missing gpl headers to gavcoin dapp [#2317](https://github.com/paritytech/parity/pull/2317)
+- contract Events, Functions & Queries sub-components as well as Event log visual updates [#2306](https://github.com/paritytech/parity/pull/2306)
+- webpack config updates (really include babel-polyfill, rename npm steps) [#2305](https://github.com/paritytech/parity/pull/2305)
+- remove unneeded Form from Account header [#2302](https://github.com/paritytech/parity/pull/2302)
+- edit of metadata across accounts, addresses & contracts [#2300](https://github.com/paritytech/parity/pull/2300)
+- Adjust all modals for consistency & css DRY-ness [#2301](https://github.com/paritytech/parity/pull/2301)
+- update container spacing [#2296](https://github.com/paritytech/parity/pull/2296)
+- local cache of generated background (no allocation on each re-render) [#2298](https://github.com/paritytech/parity/pull/2298)
+- fix failing tests [#2290](https://github.com/paritytech/parity/pull/2290)
+- Respecting standards for tokenreg dapp [#2287](https://github.com/paritytech/parity/pull/2287)
+- Separate RPC serialization from implementation [#2072](https://github.com/paritytech/parity/pull/2072)
+- Webpack optimisations - Using DLL [#2264](https://github.com/paritytech/parity/pull/2264)
+- header background, theme adjustments (not that harsh) [#2273](https://github.com/paritytech/parity/pull/2273)
+- contract view (developer-centric) [#2259](https://github.com/paritytech/parity/pull/2259)
+- Add hash as CLI function [#1995](https://github.com/paritytech/parity/pull/1995)
+- registry: fix mined events showing as pending [#2267](https://github.com/paritytech/parity/pull/2267)
+- Dapp - Tokereg ; Query Tokens from TLA or Address [#2266](https://github.com/paritytech/parity/pull/2266)
+- Fixes to the Token Registration dApp [#2250](https://github.com/paritytech/parity/pull/2250)
+- remove abi *.json duplication, provide a single version of the truth [#2253](https://github.com/paritytech/parity/pull/2253)
+- Separate path for ext code size [#2251](https://github.com/paritytech/parity/pull/2251)
+- Snapshot format changes [#2234](https://github.com/paritytech/parity/pull/2234)
+- Serving content at /api/content/<hash> [#2248](https://github.com/paritytech/parity/pull/2248)
+- Fails when deserializing non-hex uints [#2247](https://github.com/paritytech/parity/pull/2247)
+- registry dapp: add GPL headers [#2252](https://github.com/paritytech/parity/pull/2252)
+- registry dapp: user-friendly lookup [#2229](https://github.com/paritytech/parity/pull/2229)
+- registry dapp: show DataChanged events [#2242](https://github.com/paritytech/parity/pull/2242)
+- fixups for deploys [#2249](https://github.com/paritytech/parity/pull/2249)
+- Fixing output of eth_call and Bytes deserialization [#2230](https://github.com/paritytech/parity/pull/2230)
+- Encryption, decryption and public key RPCs. [#1946](https://github.com/paritytech/parity/pull/1946)
+- limit number of event logs returned [#2231](https://github.com/paritytech/parity/pull/2231)
+- babel-polyfill [#2239](https://github.com/paritytech/parity/pull/2239)
+- procedurally generate background based on signer key [#2233](https://github.com/paritytech/parity/pull/2233)
+- UI fixes [#2238](https://github.com/paritytech/parity/pull/2238)
+- expose isConnected() from transport [#2225](https://github.com/paritytech/parity/pull/2225)
+- registry dapp: rename event log [#2227](https://github.com/paritytech/parity/pull/2227)
+- registry dapp: show pending events [#2223](https://github.com/paritytech/parity/pull/2223)
+- Handle RLP to string UTF-8 decoding errors [#2217](https://github.com/paritytech/parity/pull/2217)
+- Use WebSocket transport for all built-in calls [#2216](https://github.com/paritytech/parity/pull/2216)
+- Remove panickers from trie iterators [#2209](https://github.com/paritytech/parity/pull/2209)
+- Limit for logs filter. [#2180](https://github.com/paritytech/parity/pull/2180)
+- Various state copy optimizations [#2172](https://github.com/paritytech/parity/pull/2172)
+- New signer token RPC & Initial signer connection without token. [#2096](https://github.com/paritytech/parity/pull/2096)
+- signer ui fixes [#2219](https://github.com/paritytech/parity/pull/2219)
+- contract deploy ui [#2212](https://github.com/paritytech/parity/pull/2212)
+- registry dapp: fix propTypes [#2218](https://github.com/paritytech/parity/pull/2218)
+- registry: fix IdentityIcon in events log [#2206](https://github.com/paritytech/parity/pull/2206)
+- Fixing evm-debug [#2161](https://github.com/paritytech/parity/pull/2161)
+- Fix syncing with pv63 peers [#2204](https://github.com/paritytech/parity/pull/2204)
+- registry: show shortened hashes [#2205](https://github.com/paritytech/parity/pull/2205)
+- registry dapp: remove owner [#2203](https://github.com/paritytech/parity/pull/2203)
+- webpack proxy updates for /api* [#2175](https://github.com/paritytech/parity/pull/2175)
+- simplify personal event publishing, fix delete refresh issues [#2183](https://github.com/paritytech/parity/pull/2183)
+- fix global & initial states [#2160](https://github.com/paritytech/parity/pull/2160)
+- Allow selection & saving of available views [#2131](https://github.com/paritytech/parity/pull/2131)
+- global/contract events with promisy subscribe/unsubscribe [#2136](https://github.com/paritytech/parity/pull/2136)
+- Token Registry dApp [#2178](https://github.com/paritytech/parity/pull/2178)
+- re-usable bytesToHex exposed in api.util [#2174](https://github.com/paritytech/parity/pull/2174)
+- Webpack optimisations [#2179](https://github.com/paritytech/parity/pull/2179)
+- cleanup on contract event subscriptions [#2104](https://github.com/paritytech/parity/pull/2104)
+- move utility functions to api.util [#2105](https://github.com/paritytech/parity/pull/2105)
+- registry dapp [#2077](https://github.com/paritytech/parity/pull/2077)
+- mui/FlatButton to ui/Button [#2129](https://github.com/paritytech/parity/pull/2129)
+- address delete functionality [#2128](https://github.com/paritytech/parity/pull/2128)
+- contract deployment updates [#2106](https://github.com/paritytech/parity/pull/2106)
+- contract events, indexed string fix [#2108](https://github.com/paritytech/parity/pull/2108)
+- Bumping jsonrpc-core & jsonrpc-http-server [#2162](https://github.com/paritytech/parity/pull/2162)
+- gitlab testing & build processes [#2090](https://github.com/paritytech/parity/pull/2090)
+- Misc small UI fixes (recently broken) [#2101](https://github.com/paritytech/parity/pull/2101)
+- Bump clippy & Fix warnings [#2109](https://github.com/paritytech/parity/pull/2109)
+- Import command summary [#2102](https://github.com/paritytech/parity/pull/2102)
+- check for existence of deprecated ethash file before attempting delete [#2103](https://github.com/paritytech/parity/pull/2103)
+- shapeshift Promise API library [#2088](https://github.com/paritytech/parity/pull/2088)
+- fund account via ShapeShift [#2099](https://github.com/paritytech/parity/pull/2099)
+- Get bigint on crates.io [#2078](https://github.com/paritytech/parity/pull/2078)
+- Enable sealing if Engine provides internal sealing given author [#2084](https://github.com/paritytech/parity/pull/2084)
+- Config files [#2070](https://github.com/paritytech/parity/pull/2070)
+- re-add lodash plugin to babel config [#2092](https://github.com/paritytech/parity/pull/2092)
+- Remove old cache data [#2081](https://github.com/paritytech/parity/pull/2081)
+- Logs limit & log_index bug [#2073](https://github.com/paritytech/parity/pull/2073)
+- flatten store, muiTheme & api providers [#2087](https://github.com/paritytech/parity/pull/2087)
+- add babel es2016 & es2017 presets [#2083](https://github.com/paritytech/parity/pull/2083)
+- remove all '<name>/index' imports in API [#2089](https://github.com/paritytech/parity/pull/2089)
+- add missing GPL headers to all files [#2086](https://github.com/paritytech/parity/pull/2086)
+- readme cleanups [#2085](https://github.com/paritytech/parity/pull/2085)
+- gavcoin global import of parity api  [#2082](https://github.com/paritytech/parity/pull/2082)
+- Fixing removal from gas price when moving future->current [#2076](https://github.com/paritytech/parity/pull/2076)
+- Split internal sealing from work preparation [#2071](https://github.com/paritytech/parity/pull/2071)
+- ensure the target folder doesn't exist before renaming [#2074](https://github.com/paritytech/parity/pull/2074)
+- Get rid of 'Dapp is being downloaded' page [#2055](https://github.com/paritytech/parity/pull/2055)
+- fix failing master build: update tests to new init_restore signature. [#2069](https://github.com/paritytech/parity/pull/2069)
+- Local snapshot restore [#2058](https://github.com/paritytech/parity/pull/2058)
+- import: keep informant going until finished [#2065](https://github.com/paritytech/parity/pull/2065)
+- Add a few tests for the snapshot service [#2059](https://github.com/paritytech/parity/pull/2059)
+- IPC tweaks [#2046](https://github.com/paritytech/parity/pull/2046)
+- Update arm* Docker [#2064](https://github.com/paritytech/parity/pull/2064)
+- Fetching any content-addressed content [#2050](https://github.com/paritytech/parity/pull/2050)
+- Use proper database configuration in snapshots. [#2052](https://github.com/paritytech/parity/pull/2052)
+- periodic snapshot tweaks [#2054](https://github.com/paritytech/parity/pull/2054)
+- ethkey-cli [#2057](https://github.com/paritytech/parity/pull/2057)
+- Forward ethstore-cli feature [#2056](https://github.com/paritytech/parity/pull/2056)
+- handling invalid spec jsons properly, additional tests, closes #1840 [#2049](https://github.com/paritytech/parity/pull/2049)
+- Periodic snapshots [#2044](https://github.com/paritytech/parity/pull/2044)
+- Snapshot sync [#2047](https://github.com/paritytech/parity/pull/2047)
+- Nice error pages for Dapps & Signer [#2033](https://github.com/paritytech/parity/pull/2033)
+- Add a few small snapshot tests [#2038](https://github.com/paritytech/parity/pull/2038)
+- facelift for traces, added errors [#2042](https://github.com/paritytech/parity/pull/2042)
+- Fetching content from HTTPS using `rustls` [#2024](https://github.com/paritytech/parity/pull/2024)
+- Skipping log when there are no transactions were sent [#2045](https://github.com/paritytech/parity/pull/2045)
+- rlp as separate crate [#2034](https://github.com/paritytech/parity/pull/2034)
+- Fixing uint serialization [#2037](https://github.com/paritytech/parity/pull/2037)
+- Fixing new transactions propagation [#2039](https://github.com/paritytech/parity/pull/2039)
+- Propagating transactions to peers on timer. [#2035](https://github.com/paritytech/parity/pull/2035)
+- Remove Populatable and BytesConvertable traits [#2019](https://github.com/paritytech/parity/pull/2019)
+- fixed #1933 [#1979](https://github.com/paritytech/parity/pull/1979)
+- Synchronization tweaks for IPC services [#2028](https://github.com/paritytech/parity/pull/2028)
+- Asynchronous RPC support [#2017](https://github.com/paritytech/parity/pull/2017)
+- Disable ArchiveDB counter check [#2016](https://github.com/paritytech/parity/pull/2016)
+- always process trie death row on commit, add more tracing [#2025](https://github.com/paritytech/parity/pull/2025)
+- fixed transaction addresses mapping, fixes #1971 [#2026](https://github.com/paritytech/parity/pull/2026)
+- Adding tests for dapps server. [#2021](https://github.com/paritytech/parity/pull/2021)
+- builtin trait refactoring [#2018](https://github.com/paritytech/parity/pull/2018)
+- Start parity with systemd [#1967](https://github.com/paritytech/parity/pull/1967)
+- Control service for IPC [#2013](https://github.com/paritytech/parity/pull/2013)
+- LRU cache for dapps [#2006](https://github.com/paritytech/parity/pull/2006)
+- CLI for valid hosts for dapps server [#2005](https://github.com/paritytech/parity/pull/2005)
+- Make the block header struct's internals private [#2000](https://github.com/paritytech/parity/pull/2000)
+- Take control of recovered snapshots, start restoration asynchronously [#2010](https://github.com/paritytech/parity/pull/2010)
+- remove internal locking from DBTransaction [#2003](https://github.com/paritytech/parity/pull/2003)
+- Snapshot optimizations [#1991](https://github.com/paritytech/parity/pull/1991)
+- Revert removing ecies [#2009](https://github.com/paritytech/parity/pull/2009)
+- small blooms optimization [#1998](https://github.com/paritytech/parity/pull/1998)
+- protection from adding empty traces && assertion in traces db [#1994](https://github.com/paritytech/parity/pull/1994)
+- Stratum IPC service [#1959](https://github.com/paritytech/parity/pull/1959)
+- Signature cleanup [#1921](https://github.com/paritytech/parity/pull/1921)
+- Fixed discovery skipping some nodes [#1996](https://github.com/paritytech/parity/pull/1996)
+- Trie query recording and AccountDB factory for no mangling [#1944](https://github.com/paritytech/parity/pull/1944)
+- Validating sha3 of a dapp bundle [#1993](https://github.com/paritytech/parity/pull/1993)
+- Improve eth_getWork timeout test rpc_get_work_should_timeout [#1992](https://github.com/paritytech/parity/pull/1992)
+- Resolving URLs from contract [#1964](https://github.com/paritytech/parity/pull/1964)
+- Add timeout for eth_getWork call [#1975](https://github.com/paritytech/parity/pull/1975)
+- CLI for Signer interface [#1980](https://github.com/paritytech/parity/pull/1980)
+- IPC timeout multiplied [#1990](https://github.com/paritytech/parity/pull/1990)
+- Use relative path for IPC sockets [#1983](https://github.com/paritytech/parity/pull/1983)
+- Market-orientated transaction pricing [#1963](https://github.com/paritytech/parity/pull/1963)
+- Bump clippy [#1982](https://github.com/paritytech/parity/pull/1982)
+- Fixing mutual recursive types serialization [#1977](https://github.com/paritytech/parity/pull/1977)
+- Fix open on FreeBSD [#1984](https://github.com/paritytech/parity/pull/1984)
+- Upgrade hyper dependency to 0.9 [#1973](https://github.com/paritytech/parity/pull/1973)
+- Create network-specific nodes files [#1970](https://github.com/paritytech/parity/pull/1970)
+- Getting rid of syntex [#1965](https://github.com/paritytech/parity/pull/1965)
+- Remove binary specification from hypervisor [#1960](https://github.com/paritytech/parity/pull/1960)
+- Stratum protocol general [#1954](https://github.com/paritytech/parity/pull/1954)
+- keep track of first block in blockchain [#1937](https://github.com/paritytech/parity/pull/1937)
+- introduce ethcore/state module [#1953](https://github.com/paritytech/parity/pull/1953)
+- Apply settings to column families [#1956](https://github.com/paritytech/parity/pull/1956)
+- move column family constants into db module [#1955](https://github.com/paritytech/parity/pull/1955)
+- ECIES without MAC [#1948](https://github.com/paritytech/parity/pull/1948)
+- Fix canny warnings [#1951](https://github.com/paritytech/parity/pull/1951)
+- Fetchable dapps [#1949](https://github.com/paritytech/parity/pull/1949)
+- remove impossible panickers related to infallible db transaction [#1947](https://github.com/paritytech/parity/pull/1947)
+- Minor optimizations [#1943](https://github.com/paritytech/parity/pull/1943)
+- remove randomness from bigint benches, fix warnings [#1945](https://github.com/paritytech/parity/pull/1945)
+- Fix several RPCs [#1926](https://github.com/paritytech/parity/pull/1926)
+- Bump clippy, fix warnings [#1939](https://github.com/paritytech/parity/pull/1939)
+- DB WAL size limit [#1935](https://github.com/paritytech/parity/pull/1935)
+- Use explicit global namespaces in codegen [#1928](https://github.com/paritytech/parity/pull/1928)
+- Fix build on master [#1934](https://github.com/paritytech/parity/pull/1934)
+- IPC on by default [#1927](https://github.com/paritytech/parity/pull/1927)
+- fix util benches compilation [#1931](https://github.com/paritytech/parity/pull/1931)
+- Update gitlab-ci [#1929](https://github.com/paritytech/parity/pull/1929)
+- ethkey and ethstore use hash structures from bigint [#1851](https://github.com/paritytech/parity/pull/1851)
diff --git a/docs/CHANGELOG-1.5.md b/docs/CHANGELOG-1.5.md
new file mode 100644
index 0000000000000000000000000000000000000000..fe9f72375ee26f850214041401b0896783ad76af
--- /dev/null
+++ b/docs/CHANGELOG-1.5.md
@@ -0,0 +1,1017 @@
+Note: Parity 1.5 reached End-of-Life on 2017-07-28 (EOL).
+
+## Parity [v1.5.12](https://github.com/paritytech/parity/releases/tag/v1.5.12) (2017-03-27)
+
+Stable release that adds support for a new warp sync snapshot format.
+
+- Stable Backports [#5297](https://github.com/paritytech/parity/pull/5297)
+  - Bump to v1.5.12
+  - Fine grained snapshot chunking
+
+## Parity [v1.5.11](https://github.com/paritytech/parity/releases/tag/v1.5.11) (2017-03-14)
+
+Parity 1.5.11 Includes a patch for a more comprehensive block verification.
+
+- Bump to v1.5.11
+- Additional kovan params
+- Recalculate receipt roots in close_and_lock
+- Bump to v1.5.10
+
+## Parity [v1.5.9](https://github.com/paritytech/parity/releases/tag/v1.5.9) (2017-03-11)
+
+First stable release of 1.5.x series. This release enables EIP-161 transaction replay protection for PoA networks.
+
+- Bump to v1.5.9
+- Fix auto-updater stable [#4869](https://github.com/paritytech/parity/pull/4869)
+- Fixing windows build script
+- Bump js-precompiled 20170308-152339
+- Force js update
+- Stable Engine backports [#4807](https://github.com/paritytech/parity/pull/4807)
+  - Calibrate before rejection
+  - Change flag name
+  - Add eip155
+  - Fix build
+  - Make network_id default
+- Switch js branch to stable
+- Bump to v1.5.8
+
+## Parity [v1.5.7](https://github.com/paritytech/parity/releases/tag/v1.5.7) (2017-03-07)
+
+This release resolves a single issue with failing auto-updates.
+
+- Update ETC bootnodes [#4794](https://github.com/paritytech/parity/pull/4794)
+- Bump to v1.5.7
+- Sane updater [#4658](https://github.com/paritytech/parity/pull/4658)
+  - Disable if files can't be moved.
+  - Make updater avoid downloading earlier versions.
+
+## Parity [v1.5.6](https://github.com/paritytech/parity/releases/tag/v1.5.6) (2017-03-06)
+
+This release among various stability fixes adds support for a new [Kovan](https://github.com/kovan-testnet/proposal) testnet.
+
+See [full list of changes.](https://github.com/paritytech/parity/compare/v1.5.4...v1.5.6):
+
+- Beta Update comments and reg ABI [#4788](https://github.com/paritytech/parity/pull/4788)
+  - Update comments.
+  - Fix up new ABI.
+- Bump to v1.5.6 in beta [#4786](https://github.com/paritytech/parity/pull/4786)
+- Beta Optimize signature for fallback function. ([#4780](https://github.com/paritytech/parity/pull/4780)) [#4784](https://github.com/paritytech/parity/pull/4784)
+- Beta Add registrar fields ([#4716](https://github.com/paritytech/parity/pull/4716)) [#4781](https://github.com/paritytech/parity/pull/4781)
+- Beta Etherscan links ([#4772](https://github.com/paritytech/parity/pull/4772)) [#4778](https://github.com/paritytech/parity/pull/4778)
+  - Etherscan links [#4772](https://github.com/paritytech/parity/pull/4772)
+    - Use netVersion to determine external links
+    - Update additional isTest references
+  - Port tests
+  - Update address links
+  - Signer accountlink isTest
+- Beta Fix invalid props [#4767](https://github.com/paritytech/parity/pull/4767)
+- Backporting to beta [#4741](https://github.com/paritytech/parity/pull/4741)
+  - New chains [#4720](https://github.com/paritytech/parity/pull/4720)
+    - Add Kovan chain.
+    - Fix up --testnet.
+    - Fix tests.
+  - Fix to UglifyJS 2.8.2 to fix app build issues [#4723](https://github.com/paritytech/parity/pull/4723)
+  - Update classic bootnodes, ref #4717 [#4735](https://github.com/paritytech/parity/pull/4735)
+  - Allow failure docker beta
+  - Adjust pruning history default to 64 [#4709](https://github.com/paritytech/parity/pull/4709)
+  - Backporting from master
+    - Update docker-build.sh
+    - Update gitlab.ci
+    - Fix docker hub build
+    - Update gitlab
+    - Docker beta-release->latest
+    - Add registry.
+    - Add info on forks.
+    - Fixed spec file
+  - Support both V1 & V2 DataChanged events in registry [#4734](https://github.com/paritytech/parity/pull/4734)
+    - Add info on forks.
+    - Add new registry ABI
+    - Import registry2 & fix exports
+    - Select ABI based on code hash
+    - Render new event types (owner not available)
+    - New registry.
+    - Rename old chain.
+    - Fix test.
+    - Another fix.
+    - Finish rename.
+  - Fixed fonts URLs [#4579](https://github.com/paritytech/parity/pull/4579)
+  - Fix Token Reg Dapp issues in Firefox [#4489](https://github.com/paritytech/parity/pull/4489)
+    - Fix overflow issues in Firefox [#4348](https://github.com/paritytech/parity/issues/4348)
+    - Fix wrong Promise inferance
+    - Revert "Add new Componennt for Token Images [#4496](https://github.com/paritytech/parity/issues/4496)"
+    - Add new Componennt for Token Images [#4496](https://github.com/paritytech/parity/issues/4496)
+  - Add StackEventListener [#4745](https://github.com/paritytech/parity/pull/4745)
+  - Update testnet detection [#4746](https://github.com/paritytech/parity/pull/4746)
+  - Fix Account Selection in Signer [#4744](https://github.com/paritytech/parity/pull/4744)
+    - Can pass FormattedMessage to Input (eg. Status // RPC Enabled)
+    - Simple fixed-width fix for Accoutn Selection in Parity Signer
+- Beta backports [#4763](https://github.com/paritytech/parity/pull/4763)
+  - Https://mkr-market -> https://oasisdex.com [#4701](https://github.com/paritytech/parity/pull/4701)
+  - Wallet s/delete/forget/ [#4741](https://github.com/paritytech/parity/pull/4741)
+- Update classic bootnodes [#4735](https://github.com/paritytech/parity/pull/4735)
+- Engine backports [#4718](https://github.com/paritytech/parity/pull/4718)
+  - Custom dev presets
+  - Add registrar field
+  - Use constructor for dev registrar
+  - Fix test
+- Beta Adjust pruning history default to 64 [#4709](https://github.com/paritytech/parity/pull/4709)
+- Bump to v1.5.5
+
+## Parity [v1.5.4](https://github.com/paritytech/parity/releases/tag/v1.5.4) (2017-02-23)
+
+A couple of issue fixed in this release:
+
+- Parity now allows uncles headers to have timestamp set to arbitrary future value.
+- Importing keys from geth is now working again.
+
+Changes:
+
+- Beta Fix Geth account import [#4643](https://github.com/paritytech/parity/pull/4643)
+  - Fix Geth import - actually pass addresses through
+  - Fix geth accounts not displayed
+  - Port saving of returned addresses (master MobX, beta state)
+  - Log result -> importGethAccounts
+- Beta Backporting ([#4633](https://github.com/paritytech/parity/pull/4633)) [#4640](https://github.com/paritytech/parity/pull/4640)
+  - Tweak some checks.
+  - Fixed build and added a difficulty test
+  - Bump to v1.5.4
+
+## Parity [v1.5.3](https://github.com/paritytech/parity/releases/tag/v1.5.3) (2017-02-20)
+
+This is a maintenance release that fixes a number of stability issues. Notably this resolves an issue where Parity would allow a pre EIP-155 transaction into the sealed block.
+
+See [full list of changes](https://github.com/paritytech/parity/compare/v1.5.2...v1.5.3):
+
+- Bump to v1.5.3 [#4611](https://github.com/paritytech/parity/pull/4611)
+- Handle invalid ABI retrieved from address_book gracefully ([#4606](https://github.com/paritytech/parity/pull/4606)) [#4610](https://github.com/paritytech/parity/pull/4610)
+  - Handle invalid ABI gracefully
+  - Also include failed abi in log
+- Backporting to beta [#4602](https://github.com/paritytech/parity/pull/4602)
+  - Static link for snappy
+  - added 3 warpnodes for ropsten ([#4289](https://github.com/paritytech/parity/pull/4289))
+  - Fixed indentation
+- Validate transaction before adding to the queue [#4600](https://github.com/paritytech/parity/pull/4600)
+- Beta backports [#4569](https://github.com/paritytech/parity/pull/4569)
+  - Fixing evmbin compilation and added standard build. ([#4561](https://github.com/paritytech/parity/pull/4561))
+  - Alias for personal_sendTransaction ([#4554](https://github.com/paritytech/parity/pull/4554))
+  - Fix console dapp ([#4544](https://github.com/paritytech/parity/pull/4544))
+  - Fixing linting issues. Better support for console as secure app
+  - Fixing linting issues
+  - Fix no data sent in TxQueue dapp ([#4502](https://github.com/paritytech/parity/pull/4502))
+  - Fix wrong PropType req for Embedded Signer
+  - Fix wrong data for tx #4499
+- Explicitly set seconds to 0 from selector ([#4559](https://github.com/paritytech/parity/pull/4559)) [#4571](https://github.com/paritytech/parity/pull/4571)
+  - Explicitly set seconds/milli to 0
+  - Use condition time & block setters consistently
+  - Fix failing test
+  - test for 0 ms & sec
+  - It cannot hurt, clone date before setting
+  - Prettier date test constants (OCD)
+- Remove invalid expectation [#4542](https://github.com/paritytech/parity/pull/4542)
+- Skip OOG check for simple transfers [#4558](https://github.com/paritytech/parity/pull/4558) [#4560](https://github.com/paritytech/parity/pull/4560)
+ - Skip OOG check for simple transfers [#4558](https://github.com/paritytech/parity/pull/4558)
+ - Fix failing test
+
+## Parity [v1.5.2](https://github.com/paritytech/parity/releases/tag/v1.5.2) (2017-02-08)
+
+This release brings a few stability fixes along with a feature that allows queuing transactions that are activated and send out on selected date or block number.
+- Debian packages have been updated to require `libssl1.0.0` for better compatibility.
+- eth_sign (and parity_postSign) used to return concatenated r ++ s ++ v with v being 0 or 1. it now agrees with geth as v ++ r ++ s with v being 27 or 28.
+
+Parity Wallet
+- Accounts & ShapeShift integration now displays QR code for scanning from mobile wallets
+- Dapp integration now allows for the selection of available accounts and the setting of the default account
+- Transaction creation now allows for the selection of future blocks or timestamps after which the transaction is released
+
+Parity Extension
+- First release of the Parity Extension, allowing for Parity integration from web-based dapps
+
+See [full list of changes](https://github.com/paritytech/parity/compare/v1.5.0...v1.5.2):
+- Work with string numbers in contract (Fixes #4472) ([#4478](https://github.com/paritytech/parity/pull/4478)) [#4480](https://github.com/paritytech/parity/pull/4480)
+- Eth_sign improvements backport [#4473](https://github.com/paritytech/parity/pull/4473)
+  - Fix postsign ([#4347](https://github.com/paritytech/parity/pull/4347))
+  - Fix whitespace.
+  - Fix post sign.
+  - Fix message.
+  - Fix tests.
+  - Rest of the problems.
+  - All hail the linter and its omniscience.
+  - ...and its divine omniscience.
+  - Grumbles and wording.
+  - Make signing compatible with geth. ([#4468](https://github.com/paritytech/parity/pull/4468))
+- Sort gas price corpus when hitting genesis [#4471](https://github.com/paritytech/parity/pull/4471)
+- Wallet dev chain fix [#4466](https://github.com/paritytech/parity/pull/4466)
+- Fixing histogram again [#4464](https://github.com/paritytech/parity/pull/4464)
+- Beta backports [#4462](https://github.com/paritytech/parity/pull/4462)
+  - Support HTML5-routed dapps ([#4173](https://github.com/paritytech/parity/pull/4173))
+  - Fix compilation on latest nightly
+  - Updating precompiled
+- Fix Portal scrolling getting stuck [#4456](https://github.com/paritytech/parity/pull/4456)
+  - Fix Portal scrolling getting stuck
+  - DappCard container flex
+  - Container height to 100%
+- Fix AccountCard stretch to 100% [#4451](https://github.com/paritytech/parity/pull/4451)
+- Fix wrong output format of peers ([#4270](https://github.com/paritytech/parity/pull/4270)) [#4442](https://github.com/paritytech/parity/pull/4442)
+  - Fix wrong output format of peers
+  - Add outPeer tests
+- Opening extension page without inline installation [#4441](https://github.com/paritytech/parity/pull/4441)
+  - Open popup without attempting inline
+  - Cater for all .web3.site addresses
+- Fix svg extension image webpack inlining [#4437](https://github.com/paritytech/parity/pull/4437)
+- Backporting to beta [#4434](https://github.com/paritytech/parity/pull/4434)
+  - Bump to v1.5.2
+  - Fix eth_sign/parity_postSign ([#4432](https://github.com/paritytech/parity/pull/4432))
+  - Fix dispatch for signing.
+  - Remove console log
+  - Fix signing & tests.
+- Returning default account as coinbase [#4431](https://github.com/paritytech/parity/pull/4431)
+  - Returning first address as coinbase
+  - Allowing sender alteration in signer
+  - Adding default account RPC
+- UI updates for 1.5.1 [#4429](https://github.com/paritytech/parity/pull/4429)
+  - S/Delete Contract/Forget Contract/ ([#4237](https://github.com/paritytech/parity/pull/4237))
+  - Adjust the location of the signer snippet ([#4155](https://github.com/paritytech/parity/pull/4155))
+  - Additional building-block UI components ([#4239](https://github.com/paritytech/parity/pull/4239))
+  - Currency WIP
+  - Expand tests
+  - Pass className
+  - Add QrCode
+  - Export new components in ~/ui
+  - S/this.props.netSymbol/netSymbol/
+  - Fix import case
+  - Ui/SectionList component ([#4292](https://github.com/paritytech/parity/pull/4292))
+  - Array chunking utility
+  - Add SectionList component
+  - Add TODOs to indicate possible future work
+  - Add missing overlay style (as used in dapps at present)
+  - Add a Playground for the UI Components ([#4301](https://github.com/paritytech/parity/pull/4301))
+  - Playground // WIP
+  - Linting
+  - Add Examples with code
+  - CSS Linting
+  - Linting
+  - Add Connected Currency Symbol
+  - 2015-2017
+  - Added `renderSymbol` tests
+  - PR grumbles
+  - Add Eth and Btc QRCode examples
+  - 2015-2017
+  - Add tests for playground
+  - Fixing tests
+  - Split Dapp icon into ui/DappIcon ([#4308](https://github.com/paritytech/parity/pull/4308))
+  - Add QrCode & Copy to ShapeShift ([#4322](https://github.com/paritytech/parity/pull/4322))
+  - Extract CopyIcon to ~/ui/Icons
+  - Add copy & QrCode address
+  - Default size 4
+  - Add bitcoin: link
+  - Use protocol links applicable to coin exchanged
+  - Remove .only
+  - Display QrCode for accounts, addresses & contracts ([#4329](https://github.com/paritytech/parity/pull/4329))
+  - Allow Portal to be used as top-level modal ([#4338](https://github.com/paritytech/parity/pull/4338))
+  - Portal
+  - Allow Portal to be used in as both top-level and popover
+  - Modal/popover variable naming
+  - Export Portal in ~/ui
+  - Properly handle optional onKeyDown
+  - Add simple Playground Example
+  - Add proper event listener to Portal ([#4359](https://github.com/paritytech/parity/pull/4359))
+  - Display AccountCard name via IdentityName ([#4235](https://github.com/paritytech/parity/pull/4235))
+  - Fix signing ([#4363](https://github.com/paritytech/parity/pull/4363))
+  - Dapp Account Selection & Defaults ([#4355](https://github.com/paritytech/parity/pull/4355))
+  - Add parity_defaultAccount RPC (with subscription) ([#4383](https://github.com/paritytech/parity/pull/4383))
+  - Default Account selector in Signer overlay ([#4375](https://github.com/paritytech/parity/pull/4375))
+  - Typo, fixes #4271 ([#4391](https://github.com/paritytech/parity/pull/4391))
+  - Fix ParityBar account selection overflows ([#4405](https://github.com/paritytech/parity/pull/4405))
+  - Available Dapp selection alignment with Permissions (Portal) ([#4374](https://github.com/paritytech/parity/pull/4374))
+  - Registry dapp: make lookup use lower case ([#4409](https://github.com/paritytech/parity/pull/4409))
+  - Dapps use defaultAccount instead of own selectors ([#4386](https://github.com/paritytech/parity/pull/4386))
+  - Poll for defaultAccount to update dapp & overlay subscriptions ([#4417](https://github.com/paritytech/parity/pull/4417))
+  - Poll for defaultAccount (Fixes #4413)
+  - Fix nextTimeout on catch
+  - Store timers
+  - Re-enable default updates on change detection
+  - Add block & timestamp conditions to Signer ([#4411](https://github.com/paritytech/parity/pull/4411))
+  - Extension installation overlay ([#4423](https://github.com/paritytech/parity/pull/4423))
+  - Extension installation overlay
+  - Pr gumbles
+  - Spelling
+  - Update Chrome URL
+  - Fix for non-included jsonrpc
+  - Extend Portal component (as per Modal) [#4392](https://github.com/paritytech/parity/pull/4392)
+- Transaction timestamp condition [#4427](https://github.com/paritytech/parity/pull/4427)
+- Fixing embedded bar not closing in chrome extension [#4421](https://github.com/paritytech/parity/pull/4421)
+- Backporting to beta [#4418](https://github.com/paritytech/parity/pull/4418)
+  - Bump to 1.5.1
+  - Disable notifications ([#4243](https://github.com/paritytech/parity/pull/4243))
+  - Fix wrong token handling ([#4254](https://github.com/paritytech/parity/pull/4254))
+  - Fixing wrong token displayed
+  - Linting
+  - Revert filtering out
+  - Revert the revert
+  - Don't panic on uknown git commit hash ([#4231](https://github.com/paritytech/parity/pull/4231))
+  - Additional logs for own transactions ([#4278](https://github.com/paritytech/parity/pull/4278))
+  - Integration with zgp whitelist contract ([#4215](https://github.com/paritytech/parity/pull/4215))
+  - Zgp-transactions checker
+  - Polishing
+  - Rename + refactor
+  - Refuse-service-transactions cl option
+  - Fixed tests compilation
+  - Renaming signAndSendTransaction to sendTransaction ([#4351](https://github.com/paritytech/parity/pull/4351))
+  - Fixed deadlock in external_url ([#4354](https://github.com/paritytech/parity/pull/4354))
+  - Fixing web3 in console ([#4382](https://github.com/paritytech/parity/pull/4382))
+  - Fixing estimate gas in case histogram is not available ([#4387](https://github.com/paritytech/parity/pull/4387))
+  - Restarting fetch client every now and then ([#4399](https://github.com/paritytech/parity/pull/4399))
+- Embeddable ParityBar ([#4222](https://github.com/paritytech/parity/pull/4222)) [#4287](https://github.com/paritytech/parity/pull/4287)
+  - Embeddable ParityBar
+  - Replacing storage with store
+  - Fixing  references.
+  - Addressing style issues
+  - Supporting parity background
+
+## Parity [v1.5.0: "Nativity"](https://github.com/paritytech/parity/releases/tag/v1.5.0) (2017-01-19)
+
+Major feature release including _Tendermint_ consensus engine, _Multisig wallet_ support, _badge/certification_ UI integration and _automatic updates_.
+
+Directories:
+
+- New XDG-informed Parity data directory structure. Base dir (`--base-path` or `-d`) that defaulted to `$HOME/.parity` is changed to:
+  - `/Users/You/AppData/Roaming/Parity/Ethereum` on Windows
+  - `/Users/you/Library/Application Support/io.parity.ethereum` on MacOS
+  - `/home/you/.local/share/parity` on Linux/Unix
+- Keys are now stored in chain-specific directories . On first run of 1.5, all keys will be moved into the key's directory of the chain you run. You'll need to move the wallet files between directories manually if you wish to split them between testnet/mainnet.
+- `--db-path` option now controls the path just for the databases, not for keys (`--keys-path`) or dapps (`--dapps-path`).
+
+Basics:
+
+- Version tracking, consensus-protection, hypervised auto-updating:
+  - Parity will ensure syncing is paused if its version cannot support an upcoming hard-fork (disable with `--no-consensus`).
+  - Parity will automatically download the latest version and may be updated through Parity Wallet (disable with `--no-download`)
+  - Parity can automatically update and seamlessly restart to later versions in the same release track (enable with `--auto-update=all` or `--auto-update=critical`).
+  - Parity hypervisor will automatically run the latest version (disable with `--force-direct`).
+- Fat database; to enable, sync the chain with the option `--fat-db`.
+  - Accounts and storage entries can be enumerated.
+  - Chain state can be exported to JSON for analysis with `parity export state`.
+- CLI and config options renamed: all variants of `--signer` are renamed to `--ui`.
+- Log files are appended by default rather than truncated (useful for daemon deployments).
+
+Parity Wallet:
+
+- Multisig wallet support: "New Wallet" button in the "Accounts" section allows you to create a new multisig wallet or import an existing one.
+- Solidity compiler: "Develop Contract" button in the "Contracts" section allows you to write, edit, compile and deploy contracts.
+- SMS & e-mail verification: Accounts can now be certified as verified using Parity's SMS and e-Mail verification/registration oracle.
+- Badge/certification integration: The `BadgeReg` contract can be used to deploy additional certifications.
+- Local transaction propagation tracking: "TxQueue Viewer" in the "Applications" section allows you to track and resubmit previously sent transactions.
+- Contract executions can now have gas and gas-price configured.
+- Signer can now alter the gas and gas-price of transactions at password-entry.
+- The deprecated Chrome "Signer" extension is now incompatible.
+
+[Proof of Authority](https://github.com/paritytech/parity/wiki/Proof-of-Authority-Chains):
+
+- Authority Round consensus engine: `engine: authorityRound {...}`; this is a high-performance Proof-of-Authority consensus engine. It is not BFT under normal circumstances (however the `--force-sealing` flag can be used to ensure consensus even with Byzantine nodes).
+- Tendermint Engine: `engine: tendermint {...}`; this is an experimental Proof-of-Authority consensus engine. BFT up to one third of the authorities and falling back to delayed finalization chain ordering (50% fault tolerant).
+- Generic seal JSON spec includes engine-specific types (`seal: { generic: { rlp: "0x..." } }` becomes `seal: { authority_round { step: 0, signature: "0x..." } }`.
+- To set a node as authority either `--engine-signer ADDRESS` should be used with `--password` or `parity_setEngineSigner(address, password)` RPC should be called. Unlocking the account permanently or using `--author` is now unnecessary.
+- Set of authorities can now be specified using a [list or a contract](https://github.com/paritytech/parity/wiki/Consensus-Engines#validator-engines).
+
+Chains:
+
+- Dev chain: `--chain=dev`; instant seal engine (no mining needed). Great for development work.
+- Ropsten chain (`--chain=ropsten` or `--chain=testnet`) configures for Ropsten, the new test net.
+- Morden chain (`--chain=morden`) changed to "Classic" rules and stays as the Ethereum Classic test net.
+
+RPCs/APIs:
+
+- All JSON-RPC interfaces have strict JSON deserialization - no extra fields are allowed.
+- `eth_sign` RPC now hashes given data instead of getting the hash.
+- `signer_confirmRequestWithToken`: additional RPC for signing transactions with a rotating token, alleviating the need for keeping an account password in memory.
+- `eth_signTransaction` now conforms to the specification, `eth_submitTransaction` is introduced.
+
+Full changes:
+
+- Backporting to beta [#4211](https://github.com/paritytech/parity/pull/4211)
+  - JsonRPC bump for IPC fix
+  - Fixing etherscan price parsing ([#4202](https://github.com/paritytech/parity/pull/4202))
+  - Handling all errors
+  - Fixed --base-path on windows ([#4193](https://github.com/paritytech/parity/pull/4193))
+  - Add support for optional args with default text
+  - Fixing minimal transaction queue price ([#4204](https://github.com/paritytech/parity/pull/4204))
+  - Fixing tests
+  - verification: add mainnet BadgeReg ids ([#4190](https://github.com/paritytech/parity/pull/4190))
+  - verification: fetch contracts by name
+  - verification: better wording
+  - typo
+  - reregistered badges
+  - Console now has admin ([#4220](https://github.com/paritytech/parity/pull/4220))
+  - Fixes [#4210](https://github.com/paritytech/parity/pull/4210)
+  - Non-secure for DappReg ([#4216](https://github.com/paritytech/parity/pull/4216))
+- Backporting to beta [#4203](https://github.com/paritytech/parity/pull/4203)
+  - Minor typo to ensure it updates only when synced. ([#4188](https://github.com/paritytech/parity/pull/4188))
+  - Updater fixes ([#4196](https://github.com/paritytech/parity/pull/4196))
+  - Minor typo to ensure it updates only when synced.
+  - Fix deadlock.
+  - Skip unneeded arg in making list.
+  - Allow auto-restart even when not running an update.
+  - Fix trace.
+  - Update update info on each loop.
+  - Fix build.
+  - Shutdown all sockets
+  - Remove superfluous use.
+  - Poll for upgrades as part of global status (long) ([#4197](https://github.com/paritytech/parity/pull/4197))
+  - Fix path
+  - Prevent duplicate incoming connections ([#4180](https://github.com/paritytech/parity/pull/4180))
+- Gas_limit for blocks, mined by Parity will be divisible by 37 ([#4154](https://github.com/paritytech/parity/pull/4154)) [#4176](https://github.com/paritytech/parity/pull/4176)
+  - gas_limit for new blocks will divide evenly by 13
+  - increased PARITY_GAS_LIMIT_DETERMINANT to 37
+  - separate method for marking mined block
+  - debug_asserts(gas_limit within protocol range)
+  - round_block_gas_limit method is now static
+  - made round_block_gas_limit free-function
+  - multiplier->multiple
+- Backporting to beta [#4175](https://github.com/paritytech/parity/pull/4175)
+  - verification: check if server is running ([#4140](https://github.com/paritytech/parity/pull/4140))
+  - verification: check if server is running
+  - See also ethcore/email-verification#67c6466 and ethcore/sms-verification#a585e42.
+  - verification: show in the UI if server is running
+  - verification: code style ✨, more i18n
+  - fix i18n key
+  - Optimized hash lookups ([#4144](https://github.com/paritytech/parity/pull/4144))
+  - Optimize hash comparison
+  - Use libc
+  - Ropsten fork detection ([#4163](https://github.com/paritytech/parity/pull/4163))
+  - Stop flickering + added loader in AddressSelector ([#4149](https://github.com/paritytech/parity/pull/4149))
+  - Stop UI flickering + added loader to AddressSelector [#4103](https://github.com/paritytech/parity/pull/4103)
+  - PR Grumbles
+  - Add a password strength component ([#4153](https://github.com/paritytech/parity/pull/4153))
+  - Added new PasswordStrength Component
+  - Added tests
+  - PR Grumbles
+  - icarus -> update, increase web timeout. ([#4165](https://github.com/paritytech/parity/pull/4165))
+  - Fix estimate gas
+  - Fix token images // Error in Contract Queries ([#4169](https://github.com/paritytech/parity/pull/4169))
+  - Fix dapps not loading ([#4170](https://github.com/paritytech/parity/pull/4170))
+  - Add secure to dappsreg
+  - Remove trailing slash // fix dapps
+- Bumping hyper [#4168](https://github.com/paritytech/parity/pull/4168)
+  - Bumping hyper
+  - Bumping again
+- Backporting to beta [#4158](https://github.com/paritytech/parity/pull/4158)
+  - Remove onSubmit of current (no auto-change on password edit) ([#4151](https://github.com/paritytech/parity/pull/4151))
+  - Remove onSubmit from current password
+  - Remove onSubmit from hint
+  - Pull in console dapp as builtin ([#4145](https://github.com/paritytech/parity/pull/4145))
+  - Copy static dapps from static (no build)
+  - Console sources
+  - Add console to builtins
+  - Remove console assets
+  - Disable eslint on console.js
+  - Enable eslint after disable
+  - Webpack copy
+- Backporting to beta [#4152](https://github.com/paritytech/parity/pull/4152)
+  - Fix broken transfer total balance ([#4127](https://github.com/paritytech/parity/pull/4127))
+  - Add proper label to method decoding inputs ([#4136](https://github.com/paritytech/parity/pull/4136))
+  - Another minor estimation fix ([#4133](https://github.com/paritytech/parity/pull/4133))
+  - Return 0 instead of error with out of gas on estimate_gas
+  - Fix stuff up.
+  - Another estimate gas fix.
+  - Alter balance to maximum possible rather than GP=0.
+  - Only increase to amount strictly necessary.
+  - Get rid of unsafe code in ethkey, propagate incorrect Secret errors. ([#4119](https://github.com/paritytech/parity/pull/4119))
+  - Implementing secret
+  - Fixing tests
+  - Refactor VoteCollector ([#4101](https://github.com/paritytech/parity/pull/4101))
+  - dir
+  - simple validator list
+  - stub validator contract
+  - make the engine hold Weak<Client> instead of IoChannel
+  - validator set factory
+  - register weak client with ValidatorContract
+  - check chain security
+  - add address array to generator
+  - register provider contract
+  - update validator set on notify
+  - add validator contract spec
+  - simple list test
+  - split update and contract test
+  - contract change
+  - use client in tendermint
+  - fix deadlock
+  - step duration in params
+  - adapt tendermint tests
+  - add storage fields to test spec
+  - constructor spec
+  - execute under wrong address
+  - create under correct address
+  - revert
+  - validator contract constructor
+  - move genesis block lookup
+  - add removal ability to contract
+  - validator contract adding validators
+  - fix basic authority
+  - validator changing test
+  - more docs
+  - update sync tests
+  - remove env_logger
+  - another env_logger
+  - cameltoe
+  - hold EngineClient instead of Client
+  - return error on misbehaviour
+  - nicer return
+  - sprinkle docs
+  - Reenable mainnet update server. ([#4137](https://github.com/paritytech/parity/pull/4137))
+  - basic tests for subscribeToEvents ([#4115](https://github.com/paritytech/parity/pull/4115))
+  - subscribeToEvent fixtures ✅
+  - subscribeToEvent tests ✅
+  - temporarily skip failing test ([#4138](https://github.com/paritytech/parity/pull/4138))
+  - Improvements and optimisations to estimate_gas ([#4142](https://github.com/paritytech/parity/pull/4142))
+  - Return 0 instead of error with out of gas on estimate_gas
+  - Fix stuff up.
+  - Another estimate gas fix.
+  - Alter balance to maximum possible rather than GP=0.
+  - Only increase to amount strictly necessary.
+  - Improvements and optimisations to estimate_gas.
+  - Introduce proper error type
+  - Avoid building costly traces
+  - Fix tests.
+  - Actually fix testsActually fix tests
+  - Use estimateGas error (as per updated implementation) ([#4131](https://github.com/paritytech/parity/pull/4131))
+  - EXCEPTION_ERROR as per #4142
+  - Better error log reporting & handling ([#4128](https://github.com/paritytech/parity/pull/4128))
+  - Don't pop-up notifications after network switch ([#4076](https://github.com/paritytech/parity/pull/4076))
+  - Better notifications
+  - Don't pollute with notifs if switched networks
+  - Better connection close/open events / No more notifs on change network
+  - PR Grumbles
+  - Add close and open events to HTTP // Add tests
+  - Fix tests
+  - WIP Signer Fix
+  - Fix Signer // Better reconnection handling
+  - PR Grumbles
+  - PR Grumbles
+  - Fixes wrong fetching of balances + Notifications
+  - Secure API WIP
+  - Updated Secure API Connection + Status
+  - Linting
+  - Updated Secure API Logic
+  - Proper handling of token updates // Fixing poping notifications
+  - PR Grumbles
+  - Fixing tests
+  - Trim spaces from InputAddress ([#4126](https://github.com/paritytech/parity/pull/4126))
+  - Trim spaces for addresses
+  - onSubmit has only value, not event
+  - onSubmit (again)
+  - Length check on trimmed value
+  - Remove bindActionCreators({}, dispatch) (empty) ([#4135](https://github.com/paritytech/parity/pull/4135))
+- Backporting to beta [#4118](https://github.com/paritytech/parity/pull/4118)
+  - Ignore get_price_info test by default. ([#4112](https://github.com/paritytech/parity/pull/4112))
+  - Auto-detect hex encoded bytes in sha3 ([#4108](https://github.com/paritytech/parity/pull/4108))
+  - Using types/isHex
+  - Removing unused imports
+  - Use binary chop to estimate gas accurately ([#4100](https://github.com/paritytech/parity/pull/4100))
+  - Initial sketch.
+  - Building.
+  - Fix a few things.
+  - Fix issue, add tracing.
+  - Address grumbles
+  - Raise upper limit if needed
+  - Fix test.
+  - Fixing decoding API with signatures in names ([#4125](https://github.com/paritytech/parity/pull/4125))
+  - Fix call/estimate_gas ([#4121](https://github.com/paritytech/parity/pull/4121))
+  - Return 0 instead of error with out of gas on estimate_gas
+  - Fix stuff up.
+- Current release: 1.3 -> 1.4 [#4183](https://github.com/paritytech/parity/pull/4183)
+- Fix rebroadcast panic [#4084](https://github.com/paritytech/parity/pull/4084)
+- Use shallow-only rendering in all tests [#4087](https://github.com/paritytech/parity/pull/4087)
+- Sending transactions in chunks [#4089](https://github.com/paritytech/parity/pull/4089)
+- Move to new auto-update server. [#4091](https://github.com/paritytech/parity/pull/4091)
+- Fixing compilation without dapps. [#4088](https://github.com/paritytech/parity/pull/4088)
+- Fix balances update [#4077](https://github.com/paritytech/parity/pull/4077)
+- Key derivation in Worker [#4071](https://github.com/paritytech/parity/pull/4071)
+- Display contract block creation [#4069](https://github.com/paritytech/parity/pull/4069)
+- Improving logs for transactions sync and disable re-broadcasting while syncing [#4065](https://github.com/paritytech/parity/pull/4065)
+- Passwords are valid by default [#4075](https://github.com/paritytech/parity/pull/4075)
+- Show Origin label to events table [#4073](https://github.com/paritytech/parity/pull/4073)
+- Fix tags not working [#4070](https://github.com/paritytech/parity/pull/4070)
+- Zero-alloc trie lookups [#3998](https://github.com/paritytech/parity/pull/3998)
+- Opening local dapp [#4041](https://github.com/paritytech/parity/pull/4041)
+- Bringing back `js-sha3` to fix in-browser signing [#4063](https://github.com/paritytech/parity/pull/4063)
+- Fix wrong transaction input for contract deployments [#4052](https://github.com/paritytech/parity/pull/4052)
+- Re-broadcast transactions to few random peers on each new block. [#4054](https://github.com/paritytech/parity/pull/4054)
+- Removing old transactions from the queue [#4046](https://github.com/paritytech/parity/pull/4046)
+- Add block rewards to more Engines [#4055](https://github.com/paritytech/parity/pull/4055)
+- Return old trie values on insert and remove [#4053](https://github.com/paritytech/parity/pull/4053)
+- Let users open urls from dapps view [#4042](https://github.com/paritytech/parity/pull/4042)
+- Util/validation update [#4051](https://github.com/paritytech/parity/pull/4051)
+- Convert ShapeShift modal to store [#4035](https://github.com/paritytech/parity/pull/4035)
+- Using local path on Windows [#4017](https://github.com/paritytech/parity/pull/4017)
+- Fixing minGasLimit > ceil limit mining issue [#4018](https://github.com/paritytech/parity/pull/4018)
+- Naive light client synchronization [#3892](https://github.com/paritytech/parity/pull/3892)
+- Starting on homestead shows reload snackbar [#4043](https://github.com/paritytech/parity/pull/4043)
+- Show contract parameters in MethodDecoding [#4024](https://github.com/paritytech/parity/pull/4024)
+- UI component updates [#4010](https://github.com/paritytech/parity/pull/4010)
+- Account view updates [#4008](https://github.com/paritytech/parity/pull/4008)
+- Better error messages for PoA chains [#4034](https://github.com/paritytech/parity/pull/4034)
+- Make some spec fields optional [#4019](https://github.com/paritytech/parity/pull/4019)
+- Basic account type [#4021](https://github.com/paritytech/parity/pull/4021)
+- Fix wallet in main net [#4038](https://github.com/paritytech/parity/pull/4038)
+- Removing orphaned Cargo.toml [#4032](https://github.com/paritytech/parity/pull/4032)
+- Address selector: support reverse lookup [#4033](https://github.com/paritytech/parity/pull/4033)
+- Only fetch App when necessary [#4023](https://github.com/paritytech/parity/pull/4023)
+- Connection UI cleanups & tests for prior PR [#4020](https://github.com/paritytech/parity/pull/4020)
+- Unsubscribe error on ShapeShift modal close [#4005](https://github.com/paritytech/parity/pull/4005)
+- Add ownership checks the Registry dApp [#4001](https://github.com/paritytech/parity/pull/4001)
+- Refresh balances of contacts & contracts when syncing [#4022](https://github.com/paritytech/parity/pull/4022)
+- Show message on new chain [#4016](https://github.com/paritytech/parity/pull/4016)
+- Use TypedInputs in Contracts view [#4015](https://github.com/paritytech/parity/pull/4015)
+- Fix focus on Modal [#4014](https://github.com/paritytech/parity/pull/4014)
+- Fix newError noops when not bound to dispacher [#4013](https://github.com/paritytech/parity/pull/4013)
+- Parse testnet chain as ropsten [#4004](https://github.com/paritytech/parity/pull/4004)
+- Work on Portal Style [#4003](https://github.com/paritytech/parity/pull/4003)
+- Make Wallet first-class citizens [#3990](https://github.com/paritytech/parity/pull/3990)
+- Don't slice non-existent tags [#4000](https://github.com/paritytech/parity/pull/4000)
+- Update dev dependencies and make Webpack less verbose [#3997](https://github.com/paritytech/parity/pull/3997)
+- Correct log index in transaction receipt [#3995](https://github.com/paritytech/parity/pull/3995)
+- Add Email and Registry lookups to Address Selector [#3992](https://github.com/paritytech/parity/pull/3992)
+- Remove node journal: dead code [#3994](https://github.com/paritytech/parity/pull/3994)
+- Cleanup AddContract with store [#3981](https://github.com/paritytech/parity/pull/3981)
+- Store for EditPassword Modal [#3979](https://github.com/paritytech/parity/pull/3979)
+- Additional fetch tests [#3983](https://github.com/paritytech/parity/pull/3983)
+- Owning views of blockchain data [#3982](https://github.com/paritytech/parity/pull/3982)
+- Make test network generic over peer type [#3974](https://github.com/paritytech/parity/pull/3974)
+- Fetch tests (first batch) [#3977](https://github.com/paritytech/parity/pull/3977)
+- Fetch certifiers only when needed [#3978](https://github.com/paritytech/parity/pull/3978)
+- Visible accounts for dapps (default whitelist) [#3898](https://github.com/paritytech/parity/pull/3898)
+- Remove some old (unused/duplicate) files [#3975](https://github.com/paritytech/parity/pull/3975)
+- Port `try` macro to new `?` operator. [#3962](https://github.com/paritytech/parity/pull/3962)
+- Small UI fixes [#3966](https://github.com/paritytech/parity/pull/3966)
+- Fix wrong use of Icons [#3973](https://github.com/paritytech/parity/pull/3973)
+- Updating dependencies [#3968](https://github.com/paritytech/parity/pull/3968)
+- Web Based Dapps [#3956](https://github.com/paritytech/parity/pull/3956)
+- Contract query: render false as false [#3971](https://github.com/paritytech/parity/pull/3971)
+- Email verification: add Terms of Service [#3970](https://github.com/paritytech/parity/pull/3970)
+- Fix method decoding [#3967](https://github.com/paritytech/parity/pull/3967)
+- Store for EditMeta modal [#3959](https://github.com/paritytech/parity/pull/3959)
+- Registry dapp: cleanup, support reverse entries [#3933](https://github.com/paritytech/parity/pull/3933)
+- New Address Selector Component [#3829](https://github.com/paritytech/parity/pull/3829)
+- Limiting accounts returned by parity_accountInfo [#3931](https://github.com/paritytech/parity/pull/3931)
+- Unknown block error for RPC [#3965](https://github.com/paritytech/parity/pull/3965)
+- Remove unused fields in informant [#3963](https://github.com/paritytech/parity/pull/3963)
+- Allow contract constructors in chain spec [#3932](https://github.com/paritytech/parity/pull/3932)
+- Sync reorg up to history size [#3874](https://github.com/paritytech/parity/pull/3874)
+- Rising the limit for fetch [#3964](https://github.com/paritytech/parity/pull/3964)
+- Bring integer arithmetic up to crates.io [#3943](https://github.com/paritytech/parity/pull/3943)
+- Eslint rule for block curlies [#3955](https://github.com/paritytech/parity/pull/3955)
+- Gas exception warnings on deployment [#3938](https://github.com/paritytech/parity/pull/3938)
+- Move verification store into modal [#3951](https://github.com/paritytech/parity/pull/3951)
+- Allow setting of minBlock on sending [#3921](https://github.com/paritytech/parity/pull/3921)
+- Allow empty address [#3961](https://github.com/paritytech/parity/pull/3961)
+- Fix default import [#3960](https://github.com/paritytech/parity/pull/3960)
+- Display 0x00..00 as null [#3950](https://github.com/paritytech/parity/pull/3950)
+- Global Fetch Service [#3915](https://github.com/paritytech/parity/pull/3915)
+- Update babel-loader for WebPack 2.2-rc [#3953](https://github.com/paritytech/parity/pull/3953)
+- Fix Webpack build [#3946](https://github.com/paritytech/parity/pull/3946)
+- Fix manual input token [#3945](https://github.com/paritytech/parity/pull/3945)
+- Update Webpack [#3952](https://github.com/paritytech/parity/pull/3952)
+- Add missing Ethcore -> Parity headers [#3948](https://github.com/paritytech/parity/pull/3948)
+- Code example: do start before register_protocol [#3947](https://github.com/paritytech/parity/pull/3947)
+- Set CHAIN_ID for Classic [#3934](https://github.com/paritytech/parity/pull/3934)
+- Fixed compile error. [#3940](https://github.com/paritytech/parity/pull/3940)
+- Fix dapps not loading [#3935](https://github.com/paritytech/parity/pull/3935)
+- Fix Secure API hangs [#3927](https://github.com/paritytech/parity/pull/3927)
+- Parity_chainStatus RPC for block gap info [#3899](https://github.com/paritytech/parity/pull/3899)
+- Custom attribute for binary serialization  [#3922](https://github.com/paritytech/parity/pull/3922)
+- Split intermediate stage into two. [#3926](https://github.com/paritytech/parity/pull/3926)
+- Move release-registering to intermediate stage. [#3920](https://github.com/paritytech/parity/pull/3920)
+- Blocktime format rounding [#3894](https://github.com/paritytech/parity/pull/3894)
+- Ignore dapps_policy.json [#3919](https://github.com/paritytech/parity/pull/3919)
+- Fixing Contract Development [#3912](https://github.com/paritytech/parity/pull/3912)
+- Use rhash for non-native CI platforms and submit build. [#3911](https://github.com/paritytech/parity/pull/3911)
+- Remove -Zorbit=off from rustflags on windows [#3907](https://github.com/paritytech/parity/pull/3907)
+- Fixed upgrading keys on the first run [#3904](https://github.com/paritytech/parity/pull/3904)
+- Fix deadlock in queue drop [#3903](https://github.com/paritytech/parity/pull/3903)
+- Require only simpler methods on Provider [#3897](https://github.com/paritytech/parity/pull/3897)
+- Fix grammar ("you try" -> "you tried" + article) [#3902](https://github.com/paritytech/parity/pull/3902)
+- Remove light server capability temporarily [#3872](https://github.com/paritytech/parity/pull/3872)
+- Allow retry for future blocks [#3896](https://github.com/paritytech/parity/pull/3896)
+- Consistent engine and seal names [#3895](https://github.com/paritytech/parity/pull/3895)
+- Update email certification ABI [#3893](https://github.com/paritytech/parity/pull/3893)
+- Remove existence & length checks on passwords & phrases [#3854](https://github.com/paritytech/parity/pull/3854)
+- Refresh certifications automatically [#3878](https://github.com/paritytech/parity/pull/3878)
+- Fix Wallet Settings Modal [#3856](https://github.com/paritytech/parity/pull/3856)
+- Fix difficulty adjustment. [#3884](https://github.com/paritytech/parity/pull/3884)
+- Final fixups for updater [#3883](https://github.com/paritytech/parity/pull/3883)
+- Attempt to fix windows CI. [#3882](https://github.com/paritytech/parity/pull/3882)
+- Fixing racy test [#3881](https://github.com/paritytech/parity/pull/3881)
+- Fix updater permissions [#3880](https://github.com/paritytech/parity/pull/3880)
+- Delayed transactions [#3865](https://github.com/paritytech/parity/pull/3865)
+- Don't log auth token [#3853](https://github.com/paritytech/parity/pull/3853)
+- Loading default config from default path [#3875](https://github.com/paritytech/parity/pull/3875)
+- New paths [#3877](https://github.com/paritytech/parity/pull/3877)
+- Update tests, gitlabci [#3876](https://github.com/paritytech/parity/pull/3876)
+- Base directory option [#3868](https://github.com/paritytech/parity/pull/3868)
+- Auto-updating [#3505](https://github.com/paritytech/parity/pull/3505)
+- Fix naming collision [#3873](https://github.com/paritytech/parity/pull/3873)
+- Get rid of unecessary redirection while fetching content [#3858](https://github.com/paritytech/parity/pull/3858)
+- Fix verification stores [#3864](https://github.com/paritytech/parity/pull/3864)
+- Store subscriptionId, align with main subscription model [#3863](https://github.com/paritytech/parity/pull/3863)
+- Additional RPCs for dapps accounts management [#3792](https://github.com/paritytech/parity/pull/3792)
+- Add Ws Json rpc client and command line utils (take 2) [#3830](https://github.com/paritytech/parity/pull/3830)
+- Fix typo in method call (broken contract interface) [#3862](https://github.com/paritytech/parity/pull/3862)
+- Fix flaky test [#3860](https://github.com/paritytech/parity/pull/3860)
+- Converting traces API to AutoArgs [#3844](https://github.com/paritytech/parity/pull/3844)
+- Get certifications from BadgeReg, show them in accounts overview [#3768](https://github.com/paritytech/parity/pull/3768)
+- New directory structure [#3828](https://github.com/paritytech/parity/pull/3828)
+- First run: skip account creation if they already have accounts [#3827](https://github.com/paritytech/parity/pull/3827)
+- Tendermint seal [#3857](https://github.com/paritytech/parity/pull/3857)
+- Tendermint Engine [#3759](https://github.com/paritytech/parity/pull/3759)
+- Expand lint to catch css issues [#3852](https://github.com/paritytech/parity/pull/3852)
+- Inject exports both partiy & web3 [#3851](https://github.com/paritytech/parity/pull/3851)
+- Let Webpack talk again [#3848](https://github.com/paritytech/parity/pull/3848)
+- AuthorityRound seal and simplify Generic seal Spec [#3843](https://github.com/paritytech/parity/pull/3843)
+- Signing transactions with rotating token [#3691](https://github.com/paritytech/parity/pull/3691)
+- Bump dev chain [#3835](https://github.com/paritytech/parity/pull/3835)
+- Spelling [#3839](https://github.com/paritytech/parity/pull/3839)
+- Email verification [#3766](https://github.com/paritytech/parity/pull/3766)
+- Network configuration for Ethereum Classic [#3812](https://github.com/paritytech/parity/pull/3812)
+- Using jsonrpc-macros [#3831](https://github.com/paritytech/parity/pull/3831)
+- Fixed bool dropdown in contract execution [#3823](https://github.com/paritytech/parity/pull/3823)
+- Avoid broadcasting transactions to peers that send them [#3796](https://github.com/paritytech/parity/pull/3796)
+- Eth_sign RPC now hashes given data instead of getting the hash [#3800](https://github.com/paritytech/parity/pull/3800)
+- Add store for MethodDecoding [#3821](https://github.com/paritytech/parity/pull/3821)
+- Add store for AddAddress [#3819](https://github.com/paritytech/parity/pull/3819)
+- Fix React-Router in i18n locale change [#3815](https://github.com/paritytech/parity/pull/3815)
+- Cache fetched Dapps [#3804](https://github.com/paritytech/parity/pull/3804)
+- Authors & homepage => Parity [#3818](https://github.com/paritytech/parity/pull/3818)
+- Rename Ethcore -> Parity Technologies [#3817](https://github.com/paritytech/parity/pull/3817)
+- Allow editing of gasPrice & gas in Signer [#3777](https://github.com/paritytech/parity/pull/3777)
+- I18n string dictionaries [#3532](https://github.com/paritytech/parity/pull/3532)
+- Fix padding in App [#3813](https://github.com/paritytech/parity/pull/3813)
+- Light server improvements and protocol adjustments [#3801](https://github.com/paritytech/parity/pull/3801)
+- Tolerate errors in user_defaults [#3810](https://github.com/paritytech/parity/pull/3810)
+- Block: enforce gas limit falls within engine bounds [#3809](https://github.com/paritytech/parity/pull/3809)
+- Target Babel to latest Chrome Versions in dev [#3806](https://github.com/paritytech/parity/pull/3806)
+- Lowercase npm packages [#3807](https://github.com/paritytech/parity/pull/3807)
+- Extended publishing of libraries to npm [#3786](https://github.com/paritytech/parity/pull/3786)
+- Several Fixes to the UI [#3799](https://github.com/paritytech/parity/pull/3799)
+- Remove "s [#3805](https://github.com/paritytech/parity/pull/3805)
+- Extract CSS to file in production builds [#3783](https://github.com/paritytech/parity/pull/3783)
+- Notify user on transaction received [#3782](https://github.com/paritytech/parity/pull/3782)
+- Removing all old entries from transaction queue [#3772](https://github.com/paritytech/parity/pull/3772)
+- Status page updates [#3774](https://github.com/paritytech/parity/pull/3774)
+- Allow modifications of gas when confirming in signer [#3798](https://github.com/paritytech/parity/pull/3798)
+- Network connectivity fixes [#3794](https://github.com/paritytech/parity/pull/3794)
+- Make *ID names consistent with std Rust (Id) [#3781](https://github.com/paritytech/parity/pull/3781)
+- Update CI builds [#3780](https://github.com/paritytech/parity/pull/3780)
+- Update AuthorityRound tests to new spec [#3790](https://github.com/paritytech/parity/pull/3790)
+- Fixes to the Wallet UI [#3787](https://github.com/paritytech/parity/pull/3787)
+- Add support for wallets without getOwner() interface [#3779](https://github.com/paritytech/parity/pull/3779)
+- Update Material-UI [#3785](https://github.com/paritytech/parity/pull/3785)
+- Fixes error in Transfer modal [#3788](https://github.com/paritytech/parity/pull/3788)
+- LES Part 3: Event handlers and handling responses [#3755](https://github.com/paritytech/parity/pull/3755)
+- Basic UI rendering tests [#3743](https://github.com/paritytech/parity/pull/3743)
+- Network: process packets only after connection handler finishes [#3776](https://github.com/paritytech/parity/pull/3776)
+- AuthorityRound network simulation test [#3778](https://github.com/paritytech/parity/pull/3778)
+- GasPrice selection for contract execution [#3770](https://github.com/paritytech/parity/pull/3770)
+- Reject existing transactions [#3762](https://github.com/paritytech/parity/pull/3762)
+- Allow autoRemove from api.subscribe based on callback return values [#3752](https://github.com/paritytech/parity/pull/3752)
+- Replace misplaced & with && in gitlab-ci.yml [#3753](https://github.com/paritytech/parity/pull/3753)
+- Lower gas usage for creating a Multisig Wallet [#3773](https://github.com/paritytech/parity/pull/3773)
+- Added IO service explicit stop [#3761](https://github.com/paritytech/parity/pull/3761)
+- Be lenient around invalid owners map [#3764](https://github.com/paritytech/parity/pull/3764)
+- GasEditor component [#3750](https://github.com/paritytech/parity/pull/3750)
+- Cleanups [#3742](https://github.com/paritytech/parity/pull/3742)
+- Update babel, fix CI build due to breaking changes [#3754](https://github.com/paritytech/parity/pull/3754)
+- Small fixes to contract [#3751](https://github.com/paritytech/parity/pull/3751)
+- Make engine hold AccountProvider [#3725](https://github.com/paritytech/parity/pull/3725)
+- Properly delete addresses/contracts in addressbook [#3739](https://github.com/paritytech/parity/pull/3739)
+- Display Wallet Owners Icons in Accounts list [#3741](https://github.com/paritytech/parity/pull/3741)
+- Edit Multisig Wallet settings [#3740](https://github.com/paritytech/parity/pull/3740)
+- Replace build directory completely [#3748](https://github.com/paritytech/parity/pull/3748)
+- Add existing release files before merge [#3747](https://github.com/paritytech/parity/pull/3747)
+- Release script back to using fetch/merge [#3746](https://github.com/paritytech/parity/pull/3746)
+- Update with -X only for merge [#3745](https://github.com/paritytech/parity/pull/3745)
+- Give accounts precedence over address_book entries [#3732](https://github.com/paritytech/parity/pull/3732)
+- Enable Panic=abort [#3423](https://github.com/paritytech/parity/pull/3423)
+- Cleanups on js-precompiled [#3738](https://github.com/paritytech/parity/pull/3738)
+- Add parity_removeAddress RPC [#3735](https://github.com/paritytech/parity/pull/3735)
+- Fix up the transaction JSON serialisation for RPC. [#3633](https://github.com/paritytech/parity/pull/3633)
+- Queue: CLI for auto-scaling and num verifiers [#3709](https://github.com/paritytech/parity/pull/3709)
+- Add functionalities to multi-sig wallet [#3729](https://github.com/paritytech/parity/pull/3729)
+- PropTypes as function call [#3731](https://github.com/paritytech/parity/pull/3731)
+- Unify proptypes in util/proptypes.js [#3728](https://github.com/paritytech/parity/pull/3728)
+- Bump jsonrpc-ipc-server to fix windows build [#3730](https://github.com/paritytech/parity/pull/3730)
+- LES Part 2 [#3527](https://github.com/paritytech/parity/pull/3527)
+- First draft of the MultiSig Wallet [#3700](https://github.com/paritytech/parity/pull/3700)
+- Engine block ordering [#3719](https://github.com/paritytech/parity/pull/3719)
+- Use fdlimit utility crate from crates.io [#3716](https://github.com/paritytech/parity/pull/3716)
+- Move decoding for contract deployment logic earlier [#3714](https://github.com/paritytech/parity/pull/3714)
+- Possible fix for queue drop deadlock [#3702](https://github.com/paritytech/parity/pull/3702)
+- Encode networkid as a u64. [#3713](https://github.com/paritytech/parity/pull/3713)
+- Use valid RLP in generic genesis seal spec [#3717](https://github.com/paritytech/parity/pull/3717)
+- Update JS dependencies [#3710](https://github.com/paritytech/parity/pull/3710)
+- Use Webpack Aliases [#3711](https://github.com/paritytech/parity/pull/3711)
+- Dapps-specific accounts [#3627](https://github.com/paritytech/parity/pull/3627)
+- Signer method parameter decoding & destination info [#3671](https://github.com/paritytech/parity/pull/3671)
+- Remove invalid slice test [#3712](https://github.com/paritytech/parity/pull/3712)
+- React library update [#3704](https://github.com/paritytech/parity/pull/3704)
+- New Loading Component for the UI [#3707](https://github.com/paritytech/parity/pull/3707)
+- Refactoring Transfer Modal [#3705](https://github.com/paritytech/parity/pull/3705)
+- Fix extra scrollbars in dapps [#3706](https://github.com/paritytech/parity/pull/3706)
+- Indent state tests [#3431](https://github.com/paritytech/parity/pull/3431)
+- Filter null transactions for display (not available on node) [#3698](https://github.com/paritytech/parity/pull/3698)
+- Move recovery phrase print button [#3697](https://github.com/paritytech/parity/pull/3697)
+- Fix padding bottom needed after fixed status [#3701](https://github.com/paritytech/parity/pull/3701)
+- Don't share the snapshot while downloading old blocks [#3695](https://github.com/paritytech/parity/pull/3695)
+- Button to print recovery phrase [#3694](https://github.com/paritytech/parity/pull/3694)
+- Fix status bar to bottom of the screen [#3692](https://github.com/paritytech/parity/pull/3692)
+- Splitting serialization of signTransaction and sendTransaction confirmation requests [#3642](https://github.com/paritytech/parity/pull/3642)
+- Implement basic badges/certifications/flair [#3665](https://github.com/paritytech/parity/pull/3665)
+- Simplify Container title rendering [#3680](https://github.com/paritytech/parity/pull/3680)
+- Update loading splash to fit in with l&f [#3685](https://github.com/paritytech/parity/pull/3685)
+- Safari UI fixes [#3678](https://github.com/paritytech/parity/pull/3678)
+- Remove strict mode for DappReg (work-around for package upgrade) [#3681](https://github.com/paritytech/parity/pull/3681)
+- Bumping clippy [#3654](https://github.com/paritytech/parity/pull/3654)
+- Return of the Fat DB [#3636](https://github.com/paritytech/parity/pull/3636)
+- Invalidate blocks from future [#3652](https://github.com/paritytech/parity/pull/3652)
+- Make Modal always scrollable [#3667](https://github.com/paritytech/parity/pull/3667)
+- Display local/completed transactions [#3630](https://github.com/paritytech/parity/pull/3630)
+- Added build-essential dep to dockerfiles [#3666](https://github.com/paritytech/parity/pull/3666)
+- Strict config parsing (uknown keys are rejected) [#3663](https://github.com/paritytech/parity/pull/3663)
+- Strict deserialization [#3662](https://github.com/paritytech/parity/pull/3662)
+- Disable peer if no common block found [#3655](https://github.com/paritytech/parity/pull/3655)
+- Show snackbar on password change [#3661](https://github.com/paritytech/parity/pull/3661)
+- Bring back PV62 support [#3660](https://github.com/paritytech/parity/pull/3660)
+- Unlock expecting quantity [#3659](https://github.com/paritytech/parity/pull/3659)
+- Update Webpack => v2 [#3643](https://github.com/paritytech/parity/pull/3643)
+- Update SMS verification [#3579](https://github.com/paritytech/parity/pull/3579)
+- Simplify tx confirmations display [#3559](https://github.com/paritytech/parity/pull/3559)
+- Fixes overflow in Signer tx data [#3657](https://github.com/paritytech/parity/pull/3657)
+- Fixed tab bar not updating [#3653](https://github.com/paritytech/parity/pull/3653)
+- Set default min tx price to $0.0025 [#3617](https://github.com/paritytech/parity/pull/3617)
+- Use accountsInfo instead of eth_accounts for first check [#3618](https://github.com/paritytech/parity/pull/3618)
+- Fix Copy to Clipboard Snackbar [#3619](https://github.com/paritytech/parity/pull/3619)
+- Manually add \r to Windows phrases pre 1.4.5 [#3615](https://github.com/paritytech/parity/pull/3615)
+- Signer layouts to flexbox [#3600](https://github.com/paritytech/parity/pull/3600)
+- Fixing wrong tokens type in Redux store [#3621](https://github.com/paritytech/parity/pull/3621)
+- Add dappreg link to apps list [#3568](https://github.com/paritytech/parity/pull/3568)
+- Smarter balance fetching [#3605](https://github.com/paritytech/parity/pull/3605)
+- Dapp iframe allow forms, allow target=_blank [#3597](https://github.com/paritytech/parity/pull/3597)
+- Align copy button to input field [#3604](https://github.com/paritytech/parity/pull/3604)
+- Appending logs by default [#3609](https://github.com/paritytech/parity/pull/3609)
+- Update test, fix number. [#3612](https://github.com/paritytech/parity/pull/3612)
+- Fixing phrases generated on windows [#3614](https://github.com/paritytech/parity/pull/3614)
+- Check for network ID for live/test matching [#3602](https://github.com/paritytech/parity/pull/3602)
+- Always insert traces for genesis. [#3603](https://github.com/paritytech/parity/pull/3603)
+- Real deleting accounts [#3540](https://github.com/paritytech/parity/pull/3540)
+- Trim whitespace from input recovery phrase [#3599](https://github.com/paritytech/parity/pull/3599)
+- Fix local tx requests  [#3589](https://github.com/paritytech/parity/pull/3589)
+- Fix CPU usage when idle [#3592](https://github.com/paritytech/parity/pull/3592)
+- Don't fetch balances on every new block if syncing [#3591](https://github.com/paritytech/parity/pull/3591)
+- Work around WS in UI [#3587](https://github.com/paritytech/parity/pull/3587)
+- CLI option to disable ancient block downloading [#3573](https://github.com/paritytech/parity/pull/3573)
+- Move Signer balance queries to store for component-wide re-use [#3531](https://github.com/paritytech/parity/pull/3531)
+- Fix wrong method name in `contract.js` [#3580](https://github.com/paritytech/parity/pull/3580)
+- Smarter Tokens fetching [#3546](https://github.com/paritytech/parity/pull/3546)
+- Fix panic on importing own invalid transaction [#3550](https://github.com/paritytech/parity/pull/3550)
+- Use an adaptive number of threads in the verification queue [#2445](https://github.com/paritytech/parity/pull/2445)
+- Faster UI - React Tweaks [#3555](https://github.com/paritytech/parity/pull/3555)
+- Send value & contract execute gas limit warnings [#3512](https://github.com/paritytech/parity/pull/3512)
+- Add TxQueue visibility specifier (not added between merges) [#3566](https://github.com/paritytech/parity/pull/3566)
+- DappRegistry [#3405](https://github.com/paritytech/parity/pull/3405)
+- Import account message [#3552](https://github.com/paritytech/parity/pull/3552)
+- --testnet set to ropsten [#3551](https://github.com/paritytech/parity/pull/3551)
+- Fix flaky test [#3547](https://github.com/paritytech/parity/pull/3547)
+- Sms verification code style [#3564](https://github.com/paritytech/parity/pull/3564)
+- [Registry] Clear input and working buttons [#3563](https://github.com/paritytech/parity/pull/3563)
+- Fix peers not displaying [#3561](https://github.com/paritytech/parity/pull/3561)
+- New registry contract address for ropsten [#3549](https://github.com/paritytech/parity/pull/3549)
+- Use contract Registry fee, not a hard-coded value [#3554](https://github.com/paritytech/parity/pull/3554)
+- Don't query chain in Signer, use Redux isTest [#3524](https://github.com/paritytech/parity/pull/3524)
+- Moving fetching of hash-addressed dapps/content to separate crate. [#3543](https://github.com/paritytech/parity/pull/3543)
+- Ropsten network [#3539](https://github.com/paritytech/parity/pull/3539)
+- Add simple one-line installer to README.md [#3534](https://github.com/paritytech/parity/pull/3534)
+- Propagations & local transactions tracking [#3491](https://github.com/paritytech/parity/pull/3491)
+- Correct format of eth_signTransaction [#3503](https://github.com/paritytech/parity/pull/3503)
+- ABI can be empty and auto-fill contract name [#3518](https://github.com/paritytech/parity/pull/3518)
+- Fix versions for NPM [#3516](https://github.com/paritytech/parity/pull/3516)
+- Better GHH event display & tracking [#3498](https://github.com/paritytech/parity/pull/3498)
+- Dapp section & visibility changes [#3438](https://github.com/paritytech/parity/pull/3438)
+- Fix parity.js badly built [#3526](https://github.com/paritytech/parity/pull/3526)
+- Updated the european warp bootnode addresses [#3528](https://github.com/paritytech/parity/pull/3528)
+- Limit sync reorg to 20 blocks [#3519](https://github.com/paritytech/parity/pull/3519)
+- Revert "Limit sync reorganization to 20 blocks" [#3517](https://github.com/paritytech/parity/pull/3517)
+- Check transaction signature when adding to the queue [#3508](https://github.com/paritytech/parity/pull/3508)
+- Limit sync reorganization to 20 blocks [#3509](https://github.com/paritytech/parity/pull/3509)
+- Keep track of block gasLimit [#3506](https://github.com/paritytech/parity/pull/3506)
+- Smarter Status Polling [#3504](https://github.com/paritytech/parity/pull/3504)
+- Handle solc combined output [#3496](https://github.com/paritytech/parity/pull/3496)
+- Wallet names shouldn't use UUID [#3481](https://github.com/paritytech/parity/pull/3481)
+- Make parity.js usable by Node and Browser [#3475](https://github.com/paritytech/parity/pull/3475)
+- Sms verification modal [#3336](https://github.com/paritytech/parity/pull/3336)
+- Sudo -c is not supported on Mac [#3488](https://github.com/paritytech/parity/pull/3488)
+- Add trace_{call, rawTransaction, replayTransaction} [#3492](https://github.com/paritytech/parity/pull/3492)
+- Check for possible panics in scrypt key derivation [#3490](https://github.com/paritytech/parity/pull/3490)
+- Sync traffic optimization [#3477](https://github.com/paritytech/parity/pull/3477)
+- Wallet files shouldn't give away the address [#3378](https://github.com/paritytech/parity/pull/3378)
+- Fixing tests, fixing refreshing precompiled [#3483](https://github.com/paritytech/parity/pull/3483)
+- Better Errors Snackbar in UI [#3478](https://github.com/paritytech/parity/pull/3478)
+- Handle Signer Rejection [#3476](https://github.com/paritytech/parity/pull/3476)
+- Enhanced MethodDecoding in Transactions list [#3454](https://github.com/paritytech/parity/pull/3454)
+- Signer new-token generates a link and opens browser [#3379](https://github.com/paritytech/parity/pull/3379)
+- Make tokenreg dapp fast again [#3474](https://github.com/paritytech/parity/pull/3474)
+- Build fix [#3470](https://github.com/paritytech/parity/pull/3470)
+- Display deployed Basic token addresses [#3447](https://github.com/paritytech/parity/pull/3447)
+- Export accounts as JSON or CSV [#2866](https://github.com/paritytech/parity/pull/2866)
+- Set HF2 block number [#3466](https://github.com/paritytech/parity/pull/3466)
+- Better word list for secret phrase generation [#3461](https://github.com/paritytech/parity/pull/3461)
+- Drop spec when no longer useful [#3460](https://github.com/paritytech/parity/pull/3460)
+- Add fallback check in ABI validation [#3459](https://github.com/paritytech/parity/pull/3459)
+- Save sort order in LocalStorage [#3457](https://github.com/paritytech/parity/pull/3457)
+- Adds onPaste event to Inputs [#3456](https://github.com/paritytech/parity/pull/3456)
+- Update signer to take care of text overflows [#3450](https://github.com/paritytech/parity/pull/3450)
+- Authority round consensus engine [#3426](https://github.com/paritytech/parity/pull/3426)
+- Fix transfer token decimal calculation [#3445](https://github.com/paritytech/parity/pull/3445)
+- Restrict max code size for EIP-150 and after. [#3363](https://github.com/paritytech/parity/pull/3363)
+- Contract queries should display IdentityIcons [#3453](https://github.com/paritytech/parity/pull/3453)
+- Use Babel in vendor when needed [#3451](https://github.com/paritytech/parity/pull/3451)
+- Use signature of functions instead of names [#3448](https://github.com/paritytech/parity/pull/3448)
+- Handle contract constructor inputs [#3430](https://github.com/paritytech/parity/pull/3430)
+- Use Contract owner for unregistering Token [#3446](https://github.com/paritytech/parity/pull/3446)
+- Create directories only if feature is enabled [#3442](https://github.com/paritytech/parity/pull/3442)
+- Import AddresBook from exported JSON [#3433](https://github.com/paritytech/parity/pull/3433)
+- Scrollable accounts in autocomplete [#3427](https://github.com/paritytech/parity/pull/3427)
+- Bump ws-rs [#3428](https://github.com/paritytech/parity/pull/3428)
+- Swap TokenReg dapp from base to decimals [#3425](https://github.com/paritytech/parity/pull/3425)
+- Change beta builds to stable on Travis [#3421](https://github.com/paritytech/parity/pull/3421)
+- Refactor copy to clipboard functionality [#3420](https://github.com/paritytech/parity/pull/3420)
+- Dev chain [#3385](https://github.com/paritytech/parity/pull/3385)
+- Fetch known code from the database during restoration [#3377](https://github.com/paritytech/parity/pull/3377)
+- Fixing benches [#3422](https://github.com/paritytech/parity/pull/3422)
+- Fix chainspec storage field. [#3406](https://github.com/paritytech/parity/pull/3406)
+- Abort snapshot restoration faster [#3356](https://github.com/paritytech/parity/pull/3356)
+- Remove addresses, display non-refundable warning on registries [#3403](https://github.com/paritytech/parity/pull/3403)
+- Don't auto-unsubscribe when subscriber callback throws [#3401](https://github.com/paritytech/parity/pull/3401)
+- Fix dapp account selection [#3399](https://github.com/paritytech/parity/pull/3399)
+- Fix travis build: remove unused import [#3381](https://github.com/paritytech/parity/pull/3381)
+- Optimize memory footprint [#3376](https://github.com/paritytech/parity/pull/3376)
+- Fixing parsing passwords from file [#3367](https://github.com/paritytech/parity/pull/3367)
+- Remove some unwraps from parity/helpers [#3364](https://github.com/paritytech/parity/pull/3364)
+- Load external, builtin & local apps in parallel [#3340](https://github.com/paritytech/parity/pull/3340)
+- Solidity Compiler in UI [#3279](https://github.com/paritytech/parity/pull/3279)
+- Determine real-time HTTP connected status [#3335](https://github.com/paritytech/parity/pull/3335)
+- Clarify error message about disabled Signer [#3359](https://github.com/paritytech/parity/pull/3359)
+- Cater for home.parity hostname in dappsUrl [#3341](https://github.com/paritytech/parity/pull/3341)
+- Make sure Token is ECR20 [#3347](https://github.com/paritytech/parity/pull/3347)
+- [TokenReg dApp] Fixed Unregister for Contract Owner only [#3346](https://github.com/paritytech/parity/pull/3346)
+- LES Part 1 [#3322](https://github.com/paritytech/parity/pull/3322)
+- Make transactions load [#3348](https://github.com/paritytech/parity/pull/3348)
+- Manual bump package.json [#3345](https://github.com/paritytech/parity/pull/3345)
+- Windows app and installer fixes [#3338](https://github.com/paritytech/parity/pull/3338)
+- Fix JS API test [#3342](https://github.com/paritytech/parity/pull/3342)
+- Git pre-push checks for UI [#3072](https://github.com/paritytech/parity/pull/3072)
+- Disarm the HF and add more bootnodes [#3323](https://github.com/paritytech/parity/pull/3323)
+- Default contract type on UI [#3310](https://github.com/paritytech/parity/pull/3310)
+- In-browser signing support [#3231](https://github.com/paritytech/parity/pull/3231)
+- Handle redirects from /api/content on manifest.json gracefully [#3315](https://github.com/paritytech/parity/pull/3315)
+- Dapps interface RPC [#3311](https://github.com/paritytech/parity/pull/3311)
+- Additional snapshot sync checks [#3318](https://github.com/paritytech/parity/pull/3318)
+- Fix spurious signer tests failures [#3312](https://github.com/paritytech/parity/pull/3312)
+- Fix signer token updates [#3302](https://github.com/paritytech/parity/pull/3302)
+- Update account recovery phrase hint [#3316](https://github.com/paritytech/parity/pull/3316)
+- New transaction tests [#3313](https://github.com/paritytech/parity/pull/3313)
+- Remove 127.0.0.1 references [#3303](https://github.com/paritytech/parity/pull/3303)
+- Fix for opening UI after installation on mac [#3300](https://github.com/paritytech/parity/pull/3300)
+- Fixed uncle query [#3299](https://github.com/paritytech/parity/pull/3299)
+- Updated blance display with max decimals [#3266](https://github.com/paritytech/parity/pull/3266)
+- Refactoring Signer to auto_args + eth_signTransaction [#3261](https://github.com/paritytech/parity/pull/3261)
+- Fix typo [#3298](https://github.com/paritytech/parity/pull/3298)
+- Change to more common focused spelling [#3264](https://github.com/paritytech/parity/pull/3264)
+- Manual bump of package.json (recovery) [#3295](https://github.com/paritytech/parity/pull/3295)
+- Fix initial token generation [#3289](https://github.com/paritytech/parity/pull/3289)
+- Fixed IO service shutdown [#3286](https://github.com/paritytech/parity/pull/3286)
+- Autostart setting for windows tray app [#3269](https://github.com/paritytech/parity/pull/3269)
+- Fixes for 1.4 [#3260](https://github.com/paritytech/parity/pull/3260)
+- Build tray app for x64 [#3255](https://github.com/paritytech/parity/pull/3255)
+- Add secure flag back [#3244](https://github.com/paritytech/parity/pull/3244)
+- Verify chunk hashes in cli restore [#3241](https://github.com/paritytech/parity/pull/3241)
+- Load network apps manifests as contentHash (no coding) [#3235](https://github.com/paritytech/parity/pull/3235)
+- Fixed some typos [#3236](https://github.com/paritytech/parity/pull/3236)
+- Rename cli and config options signer->ui [#3232](https://github.com/paritytech/parity/pull/3232)
+- Add store for dapps state [#3211](https://github.com/paritytech/parity/pull/3211)
+- Fix first-time tagging of contracts [#3222](https://github.com/paritytech/parity/pull/3222)
+- Fix /parity-utils/{web3,parity}.js webpack errors [#3221](https://github.com/paritytech/parity/pull/3221)
+- Improve 'invalid raw key' error msg [#3219](https://github.com/paritytech/parity/pull/3219)
+- Cleaning up polluted namespaces [#3143](https://github.com/paritytech/parity/pull/3143)
+- Set passive mode for first run only [#3214](https://github.com/paritytech/parity/pull/3214)
+- Parity configuration settings, i.e. mode [#3212](https://github.com/paritytech/parity/pull/3212)
+- Ethash unsafety cleanup [#3210](https://github.com/paritytech/parity/pull/3210)
+- Mode improvements for UI [#3109](https://github.com/paritytech/parity/pull/3109)
+- Delay bomb for Classic (ECIP-1010) [#3179](https://github.com/paritytech/parity/pull/3179)
+- Use ethcore_dappsPort when constructing URLs [#3139](https://github.com/paritytech/parity/pull/3139)
+- Add copy address button to Contract deploy [#3199](https://github.com/paritytech/parity/pull/3199)
+- Expose Parity api as window.secureApi [#3207](https://github.com/paritytech/parity/pull/3207)
+- Add error for sendRawTransaction and estimateGas [#3194](https://github.com/paritytech/parity/pull/3194)
+- Exposing engine extra info in block RPC [#3169](https://github.com/paritytech/parity/pull/3169)
+- V1.5 [#3195](https://github.com/paritytech/parity/pull/3195)
+- Remove dapp logos (GHH points to dapp-assets) [#3192](https://github.com/paritytech/parity/pull/3192)
+- Fixing possible race in ethcore_hashContent [#3191](https://github.com/paritytech/parity/pull/3191)
+- Bump package.json version (1.5 is master) [#3193](https://github.com/paritytech/parity/pull/3193)
diff --git a/docs/CHANGELOG-1.6.md b/docs/CHANGELOG-1.6.md
new file mode 100644
index 0000000000000000000000000000000000000000..f31d6f4ee748a7df48713fa05718345d3465ccd4
--- /dev/null
+++ b/docs/CHANGELOG-1.6.md
@@ -0,0 +1,616 @@
+Note: Parity 1.6 reached End-of-Life on 2017-10-15 (EOL).
+
+## Parity [v1.6.10](https://github.com/paritytech/parity/releases/tag/v1.6.10) (2017-07-25)
+
+This is a hotfix release for the stable channel addressing the recent [multi-signature wallet vulnerability](https://blog.parity.io/security-alert-high-2/). Note, upgrading is not mandatory, and all future multi-sig wallets created by any version of Parity are secure.
+
+All Changes:
+
+- Backports for stable [#6116](https://github.com/paritytech/parity/pull/6116)
+  - Remove chunk to restore from pending set only upon successful import [#6112](https://github.com/paritytech/parity/pull/6112)
+  - Blacklist bad snapshot manifest hashes upon failure [#5874](https://github.com/paritytech/parity/pull/5874)
+  - Bump snap version and tweak importing detection logic [#6079](https://github.com/paritytech/parity/pull/6079) (modified to work)
+- Fix docker build for stable [#6118](https://github.com/paritytech/parity/pull/6118)
+- Update wallet library binaries [#6108](https://github.com/paritytech/parity/pull/6108)
+- Backported wallet fix [#6104](https://github.com/paritytech/parity/pull/6104)
+  - Fix initialisation bug. ([#6102](https://github.com/paritytech/parity/pull/6102))
+  - Update wallet library modifiers ([#6103](https://github.com/paritytech/parity/pull/6103))
+- Bump to v1.6.10
+
+## Parity [v1.6.9](https://github.com/paritytech/parity/releases/tag/v1.6.9) (2017-07-16)
+
+This is a first stable release of 1.6 series. It contains a number of minor fixes and introduces the `--reseal-on-uncles` option for miners.
+
+Full list of changes:
+
+- Backports [#6061](https://github.com/paritytech/parity/pull/6061)
+  - Ethereum Classic Monetary Policy [#5741](https://github.com/paritytech/parity/pull/5741)
+    - Update rewards for uncle miners for ECIP1017
+    - Fix an off-by-one error in ECIP1017 era calculation
+    - `ecip1017_era_rounds` missing from EthashParams when run in build bot
+    - strip out ecip1017_eras_block_reward function and add unit test
+  - JS precompiled set to stable
+- Backports [#6060](https://github.com/paritytech/parity/pull/6060)
+  - --reseal-on-uncle [#5940](https://github.com/paritytech/parity/pull/5940)
+    - Optimized uncle check
+    - Additional uncle check
+    - Updated comment
+  - Bump to v1.6.9
+  - CLI: Export error message and less verbose peer counter. [#5870](https://github.com/paritytech/parity/pull/5870)
+    - Removed numbed of active connections from informant
+    - Print error message when fatdb is required
+    - Remove peers from UI
+
+## Parity [v1.6.8](https://github.com/paritytech/parity/releases/tag/v1.6.8) (2017-06-08)
+
+This release addresses:
+
+- a rare condition where quickly creating a new account was generating an account not matching the recovery phrase.
+- compressed RLP strings caused wrong/empty transaction receipts on Classic network.
+- blacklisting the _empty phrase_ account from UI and RPC on non-development chains. See also [this blog post](https://blog.parity.io/restoring-blank-seed-phrase/).
+- canceling transactions that didn't have a condition.
+- the updated Expanse fork block and chain ID.
+
+Full changelog:
+
+- Backporting to beta [#5791](https://github.com/paritytech/parity/pull/5791)
+  - Bump to v1.6.8
+  - Update expanse json with fork at block 600000 [#5351](https://github.com/paritytech/parity/pull/5351)
+    - Update expanse json with fork at block 600000
+    - Update exp chainID to 2
+  - Bumped mio [#5763](https://github.com/paritytech/parity/pull/5763)
+  - Fixed default UI port for mac installer [#5782](https://github.com/paritytech/parity/pull/5782)
+  - Blacklist empty phrase account. [#5730](https://github.com/paritytech/parity/pull/5730)
+  - Update Cid/multihash/ring/tinykeccak [#5785](https://github.com/paritytech/parity/pull/5785)
+    - Updating ring,multihash,tiny-keccak
+    - Updating CID in ipfs.
+  - Disable compression for RLP strings [#5786](https://github.com/paritytech/parity/pull/5786)
+- Beta Backports [#5789](https://github.com/paritytech/parity/pull/5789)
+  - Fix local transactions without condition. [#5716](https://github.com/paritytech/parity/pull/5716)
+  - Block invalid account name creation [#5784](https://github.com/paritytech/parity/pull/5784)
+    - Additional non-empty phrase check (fromNew)
+    - Explicit canCreate check in create (not only on UI)
+    - BN instance check (fixes Geth imports)
+    - Fixup tests after better checks
+  - Recover from empty phrase in dev mode [#5698](https://github.com/paritytech/parity/pull/5698)
+    - Add dev chain to isTest
+    - Fix signer
+    - Fix no condition transactions
+    - Fix case: old parity
+    - Fix propTypes.
+
+## Parity [v1.6.7](https://github.com/paritytech/parity/releases/tag/v1.6.7) (2017-05-18)
+
+This release addresses:
+
+- potential usability issues with [import and recovery of existing accounts](https://blog.parity.io/restoring-blank-seed-phrase/).
+- canceling scheduled transactions via RPC or UI.
+- warp sync issues with the Kovan network.
+
+Full changelog:
+
+- Backporting to beta [#5657](https://github.com/paritytech/parity/pull/5657)
+  - Add CHANGELOG.md [#5513](https://github.com/paritytech/parity/pull/5513)
+  - Reorg into blocks before minimum history [#5558](https://github.com/paritytech/parity/pull/5558)
+  - Bump to v1.6.7
+- Cancel Transaction [#5656](https://github.com/paritytech/parity/pull/5656)
+  - option to disable persistent txqueue [#5544](https://github.com/paritytech/parity/pull/5544)
+  - Remove transaction RPC [#4949](https://github.com/paritytech/parity/pull/4949)
+  - Cancel tx JS [#4958](https://github.com/paritytech/parity/pull/4958)
+  - Updating documentation for RPCs [#5392](https://github.com/paritytech/parity/pull/5392)
+- Backport Recover button [#5654](https://github.com/paritytech/parity/pull/5654)
+  - Backport [#5645](https://github.com/paritytech/parity/pull/5645)
+- Add monotonic step to Kovan [#5630](https://github.com/paritytech/parity/pull/5630)
+  - Add monotonic transition to kovan [#5587](https://github.com/paritytech/parity/pull/5587)
+- Fix ethsign [#5600](https://github.com/paritytech/parity/pull/5600)
+- Registry backports [#5445](https://github.com/paritytech/parity/pull/5445)
+  - Fixes to the Registry dapp [#4984](https://github.com/paritytech/parity/pull/4984)
+  - Fix references to api outside of `parity.js` [#4981](https://github.com/paritytech/parity/pull/4981)
+
+## Parity [v1.6.6](https://github.com/paritytech/parity/releases/tag/v1.6.6) (2017-04-11)
+
+This release brings warp sync support for kovan network.
+
+- Beta Backports [#5434](https://github.com/paritytech/parity/pull/5434)
+  - Bump to v1.6.6
+  - Strict validation transitions [#4988](https://github.com/paritytech/parity/pull/4988)
+    - Ability to make validation stricter
+    - Fix consensus
+    - Remove logger
+  - Fix eth_sign showing as wallet account [#5309](https://github.com/paritytech/parity/pull/5309)
+    - DefaultProps for account
+    - Pass signing account
+    - Update tests for Connect(...)
+  - Add new seed nodes [#5345](https://github.com/paritytech/parity/pull/5345)
+  - Kovan warp sync fixed
+- Aura eip155 validation transition [#5363](https://github.com/paritytech/parity/pull/5363)
+  - Add eip155 validation
+  - Add transition block
+- Default eip155 validation [#5350](https://github.com/paritytech/parity/pull/5350)
+- Backport syntax libs update [#5316](https://github.com/paritytech/parity/pull/5316)
+
+## Parity [v1.6.5](https://github.com/paritytech/parity/releases/tag/v1.6.5) (2017-03-28)
+
+This release contains the following changes:
+
+- Warp sync snapshot format improvements.
+- Fix for Firefox UI issues.
+- Fix for restoring from a file snapshot.
+- Fix for auto-updater error handling.
+- Updated configuration for [Ropsten revival](https://github.com/ethereum/ropsten/blob/master/revival.md). Make sure to delete old Ropsten blockchain first with `parity db kill --chain ropsten`. After that you can sync normally with `parity --chain ropsten`.
+
+Full changes:
+
+- Beta Backports [#5299](https://github.com/paritytech/parity/pull/5299)
+  - Fix FireFox overflows [#5000](https://github.com/paritytech/parity/pull/5000)
+    - Max width for container
+    - Set min-width
+  - Switching ValidatorSet [#4961](https://github.com/paritytech/parity/pull/4961)
+    - Add multi validator set
+    - Nicer comment
+    - Validate in constructor
+    - Reporting
+  - Avoid clogging up tmp when updater dir has bad permissions. [#5024](https://github.com/paritytech/parity/pull/5024)
+  - Force earliest era set in snapshot restore [#5021](https://github.com/paritytech/parity/pull/5021)
+  - Bumb to v1.6.5
+  - Fine grained snapshot chunking
+  - Ropsten revival
+- Fix validator contract syncing [#4789](https://github.com/paritytech/parity/pull/4789) [#5011](https://github.com/paritytech/parity/pull/5011)
+  - Make validator set aware of various states
+  - Fix updater build
+  - Clean up contract call
+  - Failing sync test
+  - Adjust tests
+  - Nicer indent
+  - Revert bound divisor
+
+## Parity [v1.6.4](https://github.com/paritytech/parity/releases/tag/v1.6.4) (2017-03-22)
+
+A number of issues fixed in this release:
+
+- Ledger device connectivity issues for some users on Windows.
+- Improved vault usability.
+- Stratum mining no longer requires `--force-sealing`.
+- `evm` binary has been renamed to `parity-evm` to avoid conflict with cpp-ethereum package.
+
+Full Changes:
+
+- Backporting to beta [#4995](https://github.com/paritytech/parity/pull/4995)
+  - Bump to v1.6.4
+  - Ensure sealing work enabled if notifier registed
+  - Fix condition check
+  - Always send full chunks [#4960](https://github.com/paritytech/parity/pull/4960)
+  - Bump nanomsg [#4965](https://github.com/paritytech/parity/pull/4965)
+  - Renaming evm binary to avoid conflicts. [#4899](https://github.com/paritytech/parity/pull/4899)
+- Beta UI backports [#4993](https://github.com/paritytech/parity/pull/4993)
+  - Update js-precompiled 20170314-121823
+  - Attach hardware wallets already in addressbook [#4912](https://github.com/paritytech/parity/pull/4912)
+    - Attach hardware wallets already in addressbook
+    - Only set values changed
+  - Add Vaults logic to First Run [#4894](https://github.com/paritytech/parity/issues/4894) [#4914](https://github.com/paritytech/parity/pull/4914)
+  - Add ability to configure Secure API (for [#4885](https://github.com/paritytech/parity/issues/4885)) [#4922](https://github.com/paritytech/parity/pull/4922)
+  - Add z-index to small modals as well [#4923](https://github.com/paritytech/parity/pull/4923)
+  - Eth_sign where account === undefined [#4964](https://github.com/paritytech/parity/pull/4964)
+    - Update for case where account === undefined
+    - Update tests to not mask account === undefined
+    - Default account = {} where undefined (thanks [@tomusdrw](https://github.com/tomusdrw))
+  - Fix Password Dialog forms style issue [#4968](https://github.com/paritytech/parity/pull/4968)
+
+## Parity [v1.6.3](https://github.com/paritytech/parity/releases/tag/v1.6.3) (2017-03-14)
+
+This release fixes issue compatibility with Safari on MacOS.
+
+- Safari fixes [#4902](https://github.com/paritytech/parity/pull/4902)
+  - Add intitial max-width to sections
+  - Move background z-index to -1
+
+## Parity [v1.6.2](https://github.com/paritytech/parity/releases/tag/v1.6.2) (2017-03-13)
+
+A major release introducing a few new features:
+
+- Revamped UI.
+- Account Vaults.
+- Support for Ledger hardware wallet devices.
+- Stratum protocol for PoW mining.
+- A new MacOS installer. Parity for MacOS now includes a Menu Bar icon that allows controlling Parity service.
+- Disk backed transaction store. Pending transactions are now saved to disk and won't get lost when Parity is restarted.
+- Improved memory management.
+
+See the [blog post](https://blog.parity.io/announcing-parity-1-6/) for more details.
+
+Full Changes:
+
+- Fix auto-updater beta [#4868](https://github.com/paritytech/parity/pull/4868)
+- Beta UI backports [#4855](https://github.com/paritytech/parity/pull/4855)
+  - Added React Hot Reload to dapps + TokenDeplpoy fix ([#4846](https://github.com/paritytech/parity/pull/4846))
+  - Fix method decoding ([#4845](https://github.com/paritytech/parity/pull/4845))
+    - Fix contract deployment method decoding in Signer
+    - Linting
+  - Fix TxViewer when no `to` (contract deployment) ([#4847](https://github.com/paritytech/parity/pull/4847))
+    - Added React Hot Reload to dapps + TokenDeplpoy fix
+    - Fixes to the LocalTx dapp
+    - Don't send the nonce for mined transactions
+    - Don't encode empty to values for options
+  - Pull steps from actual available steps ([#4848](https://github.com/paritytech/parity/pull/4848))
+  - Wait for the value to have changed in the input ([#4844](https://github.com/paritytech/parity/pull/4844))
+  - Backport Regsirty changes from [#4589](https://github.com/paritytech/parity/pull/4589)
+  - Test fixes for [#4589](https://github.com/paritytech/parity/pull/4589)
+- Beta Simple score [#4852](https://github.com/paritytech/parity/pull/4852)
+  - Simple score
+  - Ignore part of a test
+- Backporting to beta [#4840](https://github.com/paritytech/parity/pull/4840)
+  - Fixes to the Registry dapp ([#4838](https://github.com/paritytech/parity/pull/4838))
+    - Fix wrong ABI methods
+    - Fix comparison
+  - Bump to v1.6.1
+- Show token icons on list summary pages ([#4826](https://github.com/paritytech/parity/pull/4826)) [#4827](https://github.com/paritytech/parity/pull/4827)
+  - Adjust balance overlay margins (no jumps)
+  - Img only balances, small verifications
+  - Invalid tests removed
+  - Always wrap display (Thanks [@ngotchac](https://github.com/ngotchac))
+  - Update tests to reflect reality
+- Beta Engine backports [#4806](https://github.com/paritytech/parity/pull/4806)
+  - Calibrate before rejection
+  - Change flag name
+  - Add eip155
+  - Make network_id default
+- Beta UI backports [#4823](https://github.com/paritytech/parity/pull/4823)
+  - Better logic for contract deployments ([#4821](https://github.com/paritytech/parity/pull/4821))
+- Beta UI backports [#4818](https://github.com/paritytech/parity/pull/4818)
+  - Update the key ([#4817](https://github.com/paritytech/parity/pull/4817))
+  - Adjust selection colours/display ([#4811](https://github.com/paritytech/parity/pull/4811))
+    - Adjust selection colours to match with mui
+    - allow -> disable (simplify selections)
+    - Only use top-border
+    - Overlay selection line
+    - Slightly more muted unselected
+    - Restore address icon
+  - Fix default values for contract queries
+- Beta UI backports [#4809](https://github.com/paritytech/parity/pull/4809)
+  - Update Wallet to new Wallet Code ([#4805](https://github.com/paritytech/parity/pull/4805))
+    - Update Wallet Version
+    - Update Wallet Library
+    - Update Wallets Bytecodes
+    - Typo
+    - Separate Deploy in Contract API
+    - Use the new Wallet ABI // Update wallet code
+    - WIP .// Deploy from Wallet
+    - Update Wallet contract
+    - Contract Deployment for Wallet
+    - Working deployments for Single Owned Wallet contracts
+    - Linting
+    - Create a Wallet from a Wallet
+    - Linting
+    - Fix Signer transactions // Add Gas Used for transactions
+    - Deploy wallet contract fix
+    - Fix too high gas estimate for Wallet Contract Deploys
+    - Final piece ; deploying from Wallet owned by wallet
+    - Update Wallet Code
+    - Updated the Wallet Codes
+    - Fixing Wallet Deployments
+    - Add Support for older wallets
+    - Linting
+  - SMS Faucet ([#4774](https://github.com/paritytech/parity/pull/4774))
+    - Faucet
+    - Remove flakey button-index testing
+    - Only display faucet when sms verified (mainnet)
+    - Simplify availability checks
+    - WIP
+    - Resuest from verified -> verified
+    - Update endpoint, display response text
+    - Error icon on errors
+    - Parse hash text response
+    - Use /api/:address endpoint
+    - Hash -> data
+    - Adjust sms-certified message
+  - Fix SectionList hovering issue ([#4749](https://github.com/paritytech/parity/pull/4749))
+    - Fix SectionList Items hover when <3 items
+    - Even easier...
+  - Lint (new)
+- Update ETC bootnodes [#4794](https://github.com/paritytech/parity/pull/4794)
+- Update comments and reg ABI [#4787](https://github.com/paritytech/parity/pull/4787)
+- Optimize signature for fallback function. [#4780](https://github.com/paritytech/parity/pull/4780)
+- Rephrasing token generation screen. [#4777](https://github.com/paritytech/parity/pull/4777)
+- Etherscan links based on netVersion identifier [#4772](https://github.com/paritytech/parity/pull/4772)
+- Update README.md  [#4762](https://github.com/paritytech/parity/pull/4762)
+- Fix invalid props to verification code [#4766](https://github.com/paritytech/parity/pull/4766)
+- Extend authority round consensus test [#4756](https://github.com/paritytech/parity/pull/4756)
+- Revert last hyper "fix" [#4752](https://github.com/paritytech/parity/pull/4752)
+- Vault Management UI (round 3) [#4652](https://github.com/paritytech/parity/pull/4652)
+- Update SelectionList indicators [#4736](https://github.com/paritytech/parity/pull/4736)
+- Update testnet detection [#4746](https://github.com/paritytech/parity/pull/4746)
+- Fix Portal in Portal ESC issue [#4745](https://github.com/paritytech/parity/pull/4745)
+- Update wiki [#4743](https://github.com/paritytech/parity/pull/4743)
+- Account selector close operations [#4728](https://github.com/paritytech/parity/pull/4728)
+- Fix Account Selection in Signer [#4744](https://github.com/paritytech/parity/pull/4744)
+- Support both V1 & V2 DataChanged events in registry [#4734](https://github.com/paritytech/parity/pull/4734)
+- Add info on forks. [#4733](https://github.com/paritytech/parity/pull/4733)
+- Add registry addr [#4732](https://github.com/paritytech/parity/pull/4732)
+- UI support for hardware wallets [#4539](https://github.com/paritytech/parity/pull/4539)
+- S/delete/forget/ for wallets [#4729](https://github.com/paritytech/parity/pull/4729)
+- New chains [#4720](https://github.com/paritytech/parity/pull/4720)
+- Enable --warp by default [#4719](https://github.com/paritytech/parity/pull/4719)
+- Update Uglify (fix to 2.8.2) to fix binary builds [#4723](https://github.com/paritytech/parity/pull/4723)
+- Extract i18n strings in modals/* [#4706](https://github.com/paritytech/parity/pull/4706)
+- Provide uncle size where available in RPC [#4713](https://github.com/paritytech/parity/pull/4713)
+- EC math functions [#4696](https://github.com/paritytech/parity/pull/4696)
+- Add registrar fields [#4716](https://github.com/paritytech/parity/pull/4716)
+- Extract i18n strings in views/* [#4695](https://github.com/paritytech/parity/pull/4695)
+- Removing network=disable from config files [#4715](https://github.com/paritytech/parity/pull/4715)
+- Fast in-place migration for adding and removing column families [#4687](https://github.com/paritytech/parity/pull/4687)
+- Display badges on summary view [#4689](https://github.com/paritytech/parity/pull/4689)
+- Consistent file uploads [#4699](https://github.com/paritytech/parity/pull/4699)
+- Rename https://mkr.market -> https://oasisdex.com [#4701](https://github.com/paritytech/parity/pull/4701)
+- Stop copy & clickthrough from list summaries [#4700](https://github.com/paritytech/parity/pull/4700)
+- Display ... for address summary overflows [#4691](https://github.com/paritytech/parity/pull/4691)
+- Less agressive grayscale/opacity in SelectionList [#4688](https://github.com/paritytech/parity/pull/4688)
+- Propagate trie errors upwards from State [#4655](https://github.com/paritytech/parity/pull/4655)
+- Generic state backend [#4632](https://github.com/paritytech/parity/pull/4632)
+- Enhance dialog layouts (round 1) [#4637](https://github.com/paritytech/parity/pull/4637)
+- Vault Management UI (round 2) [#4631](https://github.com/paritytech/parity/pull/4631)
+- Fix Portal broad event stopper [#4674](https://github.com/paritytech/parity/pull/4674)
+- Custom dev chain presets [#4671](https://github.com/paritytech/parity/pull/4671)
+- Max gas limit and min gas price [#4661](https://github.com/paritytech/parity/pull/4661)
+- Align list displays with SectionList (UI consistency) [#4621](https://github.com/paritytech/parity/pull/4621)
+- Add SelectionList component to DRY up [#4639](https://github.com/paritytech/parity/pull/4639)
+- I18n NL linting updates [#4662](https://github.com/paritytech/parity/pull/4662)
+- Misc. small UI fixes [#4657](https://github.com/paritytech/parity/pull/4657)
+- More CLI settings for IPFS API [#4608](https://github.com/paritytech/parity/pull/4608)
+- Fix Tendermint deadlock [#4654](https://github.com/paritytech/parity/pull/4654)
+- Nl translations [#4649](https://github.com/paritytech/parity/pull/4649)
+- Update transaction condition documentation [#4659](https://github.com/paritytech/parity/pull/4659)
+- Bump hyper versions [#4645](https://github.com/paritytech/parity/pull/4645)
+- Sane updater [#4658](https://github.com/paritytech/parity/pull/4658)
+- Remainder of RPC APIs implemented for the light client [#4594](https://github.com/paritytech/parity/pull/4594)
+- Preserve vault meta when changing pwd [#4650](https://github.com/paritytech/parity/pull/4650)
+- Fix Geth account import [#4641](https://github.com/paritytech/parity/pull/4641)
+- Tweak some checks. [#4633](https://github.com/paritytech/parity/pull/4633)
+- Attempt to fix subscribeToEvents test [#4638](https://github.com/paritytech/parity/pull/4638)
+- Fix selection value from RadioButtons [#4636](https://github.com/paritytech/parity/pull/4636)
+- Convert all remaining Modals to use Portal (UI consistency) [#4625](https://github.com/paritytech/parity/pull/4625)
+- Default account selection update [#4609](https://github.com/paritytech/parity/pull/4609)
+- Display ETH balance in overlay account selector [#4588](https://github.com/paritytech/parity/pull/4588)
+- Fixed minor grammar mistake in readme [#4627](https://github.com/paritytech/parity/pull/4627)
+- Extract newly available i18n strings [#4623](https://github.com/paritytech/parity/pull/4623)
+- Save pending local transactions in the database [#4566](https://github.com/paritytech/parity/pull/4566)
+- Bump CID version to allow compilation on all platforms [#4614](https://github.com/paritytech/parity/pull/4614)
+- Vault Management UI (first round) [#4446](https://github.com/paritytech/parity/pull/4446)
+- Let Engine decide if it seals internally [#4613](https://github.com/paritytech/parity/pull/4613)
+- Show only known accounts/wallets/addresses on Home [#4612](https://github.com/paritytech/parity/pull/4612)
+- Proper default accounts RPCs [#4580](https://github.com/paritytech/parity/pull/4580)
+- Hash-fetch errors in case upstream returns non-200 [#4599](https://github.com/paritytech/parity/pull/4599)
+- Added pending transaction info to eth_getTransactionByHash [#4570](https://github.com/paritytech/parity/pull/4570)
+- Secret store - initial version [#4567](https://github.com/paritytech/parity/pull/4567)
+- Handle invalid ABI retrieved from address_book gracefully [#4606](https://github.com/paritytech/parity/pull/4606)
+- Optimize key directory reloads [#4583](https://github.com/paritytech/parity/pull/4583)
+- Revert Double Click on Accounts to close in Signer Bar [#4590](https://github.com/paritytech/parity/pull/4590)
+- IPFS MVP [#4545](https://github.com/paritytech/parity/pull/4545)
+- Networking fixes [#4563](https://github.com/paritytech/parity/pull/4563)
+- Remove eth_compile* RPCs [#4577](https://github.com/paritytech/parity/pull/4577)
+- Ledger wallet signing fixed [#4578](https://github.com/paritytech/parity/pull/4578)
+- Remove vertx from Webpack config [#4576](https://github.com/paritytech/parity/pull/4576)
+- Better display of tags [#4564](https://github.com/paritytech/parity/pull/4564)
+- Added vaults support to `ethstore-cli` [#4532](https://github.com/paritytech/parity/pull/4532)
+- Fixed font URLs [#4579](https://github.com/paritytech/parity/pull/4579)
+- Explicitly set seconds to 0 from selector [#4559](https://github.com/paritytech/parity/pull/4559)
+- Fixes evmbin compilation and adding to standard build. [#4561](https://github.com/paritytech/parity/pull/4561)
+- Alias for personal_sendTransaction [#4554](https://github.com/paritytech/parity/pull/4554)
+- Key derivation in ethstore & rpc [#4515](https://github.com/paritytech/parity/pull/4515)
+- Skip OOG check for simple transfers [#4558](https://github.com/paritytech/parity/pull/4558)
+- Light Client transaction queue, initial LightDispatcher [#4501](https://github.com/paritytech/parity/pull/4501)
+- Fixes BadgeReg Middleware [#4556](https://github.com/paritytech/parity/pull/4556)
+- Fix pasting of value in Input fields [#4555](https://github.com/paritytech/parity/pull/4555)
+- Tooltips with react-intl [#4549](https://github.com/paritytech/parity/pull/4549)
+- Close on double-click for Signer Account selection [#4540](https://github.com/paritytech/parity/pull/4540)
+- Signer provenance [#4477](https://github.com/paritytech/parity/pull/4477)
+- Fix console dapp [#4544](https://github.com/paritytech/parity/pull/4544)
+- Extract i18n string into i18n/_defaults (base of translations) [#4514](https://github.com/paritytech/parity/pull/4514)
+- Fix contract queries bug [#4534](https://github.com/paritytech/parity/pull/4534)
+- Fixing namespace of couple methods in console. [#4538](https://github.com/paritytech/parity/pull/4538)
+- Home landing page [#4178](https://github.com/paritytech/parity/pull/4178)
+- Bump JSON RPC crates versions [#4530](https://github.com/paritytech/parity/pull/4530)
+- Update rust version in README [#4531](https://github.com/paritytech/parity/pull/4531)
+- Lower default pruning history and memory [#4528](https://github.com/paritytech/parity/pull/4528)
+- Serde 0.9 [#4508](https://github.com/paritytech/parity/pull/4508)
+- Fixes to Token Deploy dapp [#4513](https://github.com/paritytech/parity/pull/4513)
+- Fixed receipt decoding [#4521](https://github.com/paritytech/parity/pull/4521)
+- Several fixes to the Wallet in general [#4504](https://github.com/paritytech/parity/pull/4504)
+- Use the current contract name for Solidity compilation [#4510](https://github.com/paritytech/parity/pull/4510)
+- Preparation for Light client RPC [#4485](https://github.com/paritytech/parity/pull/4485)
+- Fix Dutch translation [#4509](https://github.com/paritytech/parity/pull/4509)
+- Fixed a warning and bumped libusb-sys [#4507](https://github.com/paritytech/parity/pull/4507)
+- Fix TnC overflows on small screens [#4505](https://github.com/paritytech/parity/pull/4505)
+- Fix no data sent in TxQueue dapp [#4502](https://github.com/paritytech/parity/pull/4502)
+- Ledger wallet support [#4486](https://github.com/paritytech/parity/pull/4486)
+- Add new Componennt for Token Images [#4498](https://github.com/paritytech/parity/pull/4498)
+- Fix address and accounts links [#4491](https://github.com/paritytech/parity/pull/4491)
+- Fix Token Reg Dapp issues in Firefox [#4489](https://github.com/paritytech/parity/pull/4489)
+- Parity.js interfaces for vaults [#4497](https://github.com/paritytech/parity/pull/4497)
+- Initial Dutch translations [#4484](https://github.com/paritytech/parity/pull/4484)
+- Fix key.meta.vault for root dir keys && read vault.meta without vault key [#4482](https://github.com/paritytech/parity/pull/4482)
+- Arbitrary labels for extended keys (u32, H256 built-in) [#4438](https://github.com/paritytech/parity/pull/4438)
+- Fix ethstore build [#4492](https://github.com/paritytech/parity/pull/4492)
+- Fixed compilation of ethstore-cli [#4493](https://github.com/paritytech/parity/pull/4493)
+- Build embedded Parity JS properly and separatly  [#4426](https://github.com/paritytech/parity/pull/4426)
+- Static link for snappy [#4487](https://github.com/paritytech/parity/pull/4487)
+- Work with string numbers in contract (Fixes #4472) [#4478](https://github.com/paritytech/parity/pull/4478)
+- Metadata support for vaults [#4475](https://github.com/paritytech/parity/pull/4475)
+- Sort gas price corpus when hitting genesis [#4470](https://github.com/paritytech/parity/pull/4470)
+- Fixing CORS headers for parity.web3.site [#4461](https://github.com/paritytech/parity/pull/4461)
+- Make signing compatible with geth. [#4468](https://github.com/paritytech/parity/pull/4468)
+- Handle registry not found errors [#4465](https://github.com/paritytech/parity/pull/4465)
+- Fix Portal scrolling getting stuck [#4455](https://github.com/paritytech/parity/pull/4455)
+- Fix AccountCard stretch to 100% [#4450](https://github.com/paritytech/parity/pull/4450)
+- Include total difficulty in CHTs and hide implementation details from consumers [#4428](https://github.com/paritytech/parity/pull/4428)
+- Fix RLP encoding for types recursively calling `RlpStream::append` [#4362](https://github.com/paritytech/parity/pull/4362)
+- Open popup without attempting inline [#4440](https://github.com/paritytech/parity/pull/4440)
+- Fixing histogram again ([#4464](https://github.com/paritytech/parity/issues/4464)) port from beta [#4467](https://github.com/paritytech/parity/pull/4467)
+- Vaults RPCs [#4366](https://github.com/paritytech/parity/pull/4366)
+- Ethkey - extended keys [#4377](https://github.com/paritytech/parity/pull/4377)
+- Use secure websocket from HTTPS clients [#4436](https://github.com/paritytech/parity/pull/4436)
+- RPC middleware: Informant & Client.keep_alive [#4384](https://github.com/paritytech/parity/pull/4384)
+- Fix eth_sign/parity_postSign [#4432](https://github.com/paritytech/parity/pull/4432)
+- Web view with web3.site support [#4313](https://github.com/paritytech/parity/pull/4313)
+- Extend Portal component with title, buttons & steps (as per Modal) [#4392](https://github.com/paritytech/parity/pull/4392)
+- Extension installation overlay [#4423](https://github.com/paritytech/parity/pull/4423)
+- Add block & timestamp conditions to Signer [#4411](https://github.com/paritytech/parity/pull/4411)
+- Transaction timestamp condition [#4419](https://github.com/paritytech/parity/pull/4419)
+- Poll for defaultAccount to update dapp & overlay subscriptions [#4417](https://github.com/paritytech/parity/pull/4417)
+- Validate dapps accounts with address book [#4407](https://github.com/paritytech/parity/pull/4407)
+- Dapps use defaultAccount instead of own selectors [#4386](https://github.com/paritytech/parity/pull/4386)
+- Fix lock and rename tracing [#4403](https://github.com/paritytech/parity/pull/4403)
+- Restarting fetch client every now and then [#4399](https://github.com/paritytech/parity/pull/4399)
+- Perform a sync between Rust and JS when generating markdown instead of in spec tests [#4408](https://github.com/paritytech/parity/pull/4408)
+- Registry dapp: make lookup use lower case [#4409](https://github.com/paritytech/parity/pull/4409)
+- Available Dapp selection alignment with Permissions (Portal) [#4374](https://github.com/paritytech/parity/pull/4374)
+- More permissive verification process [#4317](https://github.com/paritytech/parity/pull/4317)
+- Fix ParityBar account selection overflows [#4405](https://github.com/paritytech/parity/pull/4405)
+- Mac binaries signing [#4397](https://github.com/paritytech/parity/pull/4397)
+- Revert "remove [ci skip]" [#4398](https://github.com/paritytech/parity/pull/4398)
+- Registry, s/a the owner/the owner/ [#4391](https://github.com/paritytech/parity/pull/4391)
+- Fixing invalid address in docs [#4388](https://github.com/paritytech/parity/pull/4388)
+- Remove [ci skip] [#4381](https://github.com/paritytech/parity/pull/4381)
+- Fixing estimate gas in case histogram is not available [#4387](https://github.com/paritytech/parity/pull/4387)
+- Default Account selector in Signer overlay [#4375](https://github.com/paritytech/parity/pull/4375)
+- Fixing web3 in console [#4382](https://github.com/paritytech/parity/pull/4382)
+- Add parity_defaultAccount RPC (with subscription) [#4383](https://github.com/paritytech/parity/pull/4383)
+- Full JSON-RPC docs + sync tests. [#4335](https://github.com/paritytech/parity/pull/4335)
+- Expose util as Api.util [#4372](https://github.com/paritytech/parity/pull/4372)
+- Dapp Account Selection & Defaults [#4355](https://github.com/paritytech/parity/pull/4355)
+- Publish @parity/jsonrpc [#4365](https://github.com/paritytech/parity/pull/4365)
+- Fix signing [#4363](https://github.com/paritytech/parity/pull/4363)
+- Fixing embedded bar not closing in chrome extension [#4367](https://github.com/paritytech/parity/pull/4367)
+- Update AccountCard for re-use [#4350](https://github.com/paritytech/parity/pull/4350)
+- Add proper event listener to Portal [#4359](https://github.com/paritytech/parity/pull/4359)
+- Optional from field in Transaction Requests [#4332](https://github.com/paritytech/parity/pull/4332)
+- Rust 1.14 in README [ci-skip] [#4361](https://github.com/paritytech/parity/pull/4361)
+- Fix JournalDB::earliest_era on empty database [#4316](https://github.com/paritytech/parity/pull/4316)
+- Fixed race condition deadlock on fetching enode URL [#4354](https://github.com/paritytech/parity/pull/4354)
+- Allow Portal to be used as top-level modal [#4338](https://github.com/paritytech/parity/pull/4338)
+- Fix postsign [#4347](https://github.com/paritytech/parity/pull/4347)
+- Renaming signAndSendTransaction to sendTransaction [#4351](https://github.com/paritytech/parity/pull/4351)
+- Add api.util.encodeMethodCall to parity.js [#4330](https://github.com/paritytech/parity/pull/4330)
+- Initial commit for vaults [#4312](https://github.com/paritytech/parity/pull/4312)
+- Returning default account as coinbase + allow altering sender in signer [#4323](https://github.com/paritytech/parity/pull/4323)
+- Persistent tracking of dapps [#4302](https://github.com/paritytech/parity/pull/4302)
+- Exposing all RPCs over dapps port as CLI option [#4346](https://github.com/paritytech/parity/pull/4346)
+- New macOS App [#4345](https://github.com/paritytech/parity/pull/4345)
+- Display QrCode for accounts, addresses & contracts [#4329](https://github.com/paritytech/parity/pull/4329)
+- Add QrCode & Copy to ShapeShift [#4322](https://github.com/paritytech/parity/pull/4322)
+- Parity.js api.parity.chainStatus should handle { blockGap: null } [#4327](https://github.com/paritytech/parity/pull/4327)
+- DeleteAccount & LoadContract modal updates [#4320](https://github.com/paritytech/parity/pull/4320)
+- Split Tab from TabBar [#4318](https://github.com/paritytech/parity/pull/4318)
+- Contracts interface expansion [#4307](https://github.com/paritytech/parity/pull/4307)
+- HistoryStore for tracking relevant routes [#4305](https://github.com/paritytech/parity/pull/4305)
+- Split Dapp icon into ui/DappIcon (re-use) [#4308](https://github.com/paritytech/parity/pull/4308)
+- Add a Playground for the UI Components [#4301](https://github.com/paritytech/parity/pull/4301)
+- Update CreateWallet with FormattedMessage [#4298](https://github.com/paritytech/parity/pull/4298)
+- Update dates for new PRs missed [#4306](https://github.com/paritytech/parity/pull/4306)
+- EIP-98: Optional transaction state root [#4296](https://github.com/paritytech/parity/pull/4296)
+- Fix whitespace [#4299](https://github.com/paritytech/parity/pull/4299)
+- Attempt to fix console. [#4294](https://github.com/paritytech/parity/pull/4294)
+- Ui/SectionList component [#4292](https://github.com/paritytech/parity/pull/4292)
+- Stratum up [#4233](https://github.com/paritytech/parity/pull/4233)
+- Logging transaction duration [#4297](https://github.com/paritytech/parity/pull/4297)
+- Generic engine utilities [#4258](https://github.com/paritytech/parity/pull/4258)
+- JSON-RPC interfaces with documentation [#4276](https://github.com/paritytech/parity/pull/4276)
+- Dont decode seal fields [#4263](https://github.com/paritytech/parity/pull/4263)
+- Skip misbehaving test until properly fixed [#4283](https://github.com/paritytech/parity/pull/4283)
+- Additional logs for own transactions [#4278](https://github.com/paritytech/parity/pull/4278)
+- Ensure write lock isn't held when calling handlers [#4285](https://github.com/paritytech/parity/pull/4285)
+- Feature selector [#4074](https://github.com/paritytech/parity/pull/4074)
+- AccountCreate updates [#3988](https://github.com/paritytech/parity/pull/3988)
+- Extended JS interface -> Markdown generator [#4275](https://github.com/paritytech/parity/pull/4275)
+- Added 3 warpnodes for ropsten [#4289](https://github.com/paritytech/parity/pull/4289)
+- Ledger Communication JS toolkit [#4268](https://github.com/paritytech/parity/pull/4268)
+- ValidatorSet reporting [#4208](https://github.com/paritytech/parity/pull/4208)
+- Add support for api.subscribe('parity_accountsInfo') [#4273](https://github.com/paritytech/parity/pull/4273)
+- Display AccountCard name via IdentityName [#4235](https://github.com/paritytech/parity/pull/4235)
+- Dapp visibility save/load tests [#4150](https://github.com/paritytech/parity/pull/4150)
+- Fix wrong output format of peers [#4270](https://github.com/paritytech/parity/pull/4270)
+- Chain scoring [#4218](https://github.com/paritytech/parity/pull/4218)
+- Rust 1.14 for windows builds [#4269](https://github.com/paritytech/parity/pull/4269)
+- Eslint formatting updates [#4234](https://github.com/paritytech/parity/pull/4234)
+- Embeddable ParityBar [#4222](https://github.com/paritytech/parity/pull/4222)
+- Update deb-build.sh to fix libssl dependency [#4260](https://github.com/paritytech/parity/pull/4260)
+- Integration with zgp whitelist contract [#4215](https://github.com/paritytech/parity/pull/4215)
+- Adjust the location of the signer snippet [#4155](https://github.com/paritytech/parity/pull/4155)
+- Fix wrong token handling [#4254](https://github.com/paritytech/parity/pull/4254)
+- Additional building-block UI components [#4239](https://github.com/paritytech/parity/pull/4239)
+- Bump package.json to 0.3.0 (1.6 track) [#4244](https://github.com/paritytech/parity/pull/4244)
+- Disable incoming ETH notifications [#4243](https://github.com/paritytech/parity/pull/4243)
+- Memory-based pruning history size [#4114](https://github.com/paritytech/parity/pull/4114)
+- Common EngineSigner [#4189](https://github.com/paritytech/parity/pull/4189)
+- Verification: don't request a code twice [#4221](https://github.com/paritytech/parity/pull/4221)
+- S/Delete Contract/Forget Contract/ [#4237](https://github.com/paritytech/parity/pull/4237)
+- Light protocol syncing improvements [#4212](https://github.com/paritytech/parity/pull/4212)
+- LES Peer Info [#4195](https://github.com/paritytech/parity/pull/4195)
+- Don't panic on uknown git commit hash [#4231](https://github.com/paritytech/parity/pull/4231)
+- Cache registry reverses in local storage [#4182](https://github.com/paritytech/parity/pull/4182)
+- Update version numbers in README [#4223](https://github.com/paritytech/parity/pull/4223)
+- CHT calculations for full nodes [#4181](https://github.com/paritytech/parity/pull/4181)
+- Use single source of info for dapp meta (build & display) [#4217](https://github.com/paritytech/parity/pull/4217)
+- Non-secure API for DappReg [#4216](https://github.com/paritytech/parity/pull/4216)
+- Console now has admin [#4220](https://github.com/paritytech/parity/pull/4220)
+- Verification: add mainnet BadgeReg ids [#4190](https://github.com/paritytech/parity/pull/4190)
+- Fixing minimal transaction queue price [#4204](https://github.com/paritytech/parity/pull/4204)
+- Remove unnecessary Engine method [#4184](https://github.com/paritytech/parity/pull/4184)
+- Fixed --base-path on windows [#4193](https://github.com/paritytech/parity/pull/4193)
+- Fixing etherscan price parsing [#4202](https://github.com/paritytech/parity/pull/4202)
+- LES: Better timeouts + Track failed requests [#4093](https://github.com/paritytech/parity/pull/4093)
+- ESLint additional rules [#4186](https://github.com/paritytech/parity/pull/4186)
+- JsonRPC bump for IPC fix [#4200](https://github.com/paritytech/parity/pull/4200)
+- Poll for upgrades as part of global status (long) [#4197](https://github.com/paritytech/parity/pull/4197)
+- Updater fixes [#4196](https://github.com/paritytech/parity/pull/4196)
+- Prevent duplicate incoming connections [#4180](https://github.com/paritytech/parity/pull/4180)
+- Minor typo to ensure it updates only when synced. [#4188](https://github.com/paritytech/parity/pull/4188)
+- Minor refactor for clarity [#4174](https://github.com/paritytech/parity/pull/4174)
+- Secret - from hash function, also validate data [#4159](https://github.com/paritytech/parity/pull/4159)
+- Gas_limit for blocks, mined by Parity will be divisible by 37 [#4154](https://github.com/paritytech/parity/pull/4154)
+- Support HTML5-routed dapps [#4173](https://github.com/paritytech/parity/pull/4173)
+- Fix subscribeToEvents test [#4166](https://github.com/paritytech/parity/pull/4166)
+- Fix dapps not loading [#4170](https://github.com/paritytech/parity/pull/4170)
+- Fix broken token images [#4169](https://github.com/paritytech/parity/pull/4169)
+- Bumping hyper [#4167](https://github.com/paritytech/parity/pull/4167)
+- Icarus -> update, increase web timeout. [#4165](https://github.com/paritytech/parity/pull/4165)
+- Add a password strength component [#4153](https://github.com/paritytech/parity/pull/4153)
+- Stop flickering + added loader in AddressSelector [#4149](https://github.com/paritytech/parity/pull/4149)
+- On demand LES request [#4036](https://github.com/paritytech/parity/pull/4036)
+- Ropsten fork detection [#4163](https://github.com/paritytech/parity/pull/4163)
+- Pull in console dapp as builtin [#4145](https://github.com/paritytech/parity/pull/4145)
+- Optimized hash lookups [#4144](https://github.com/paritytech/parity/pull/4144)
+- UnverifiedTransaction type [#4134](https://github.com/paritytech/parity/pull/4134)
+- Verification: check if server is running [#4140](https://github.com/paritytech/parity/pull/4140)
+- Remove onSubmit of current (no auto-change on password edit) [#4151](https://github.com/paritytech/parity/pull/4151)
+- Trim spaces from InputAddress [#4126](https://github.com/paritytech/parity/pull/4126)
+- Don't pop-up notifications after network switch [#4076](https://github.com/paritytech/parity/pull/4076)
+- Use estimateGas error (as per updated implementation) [#4131](https://github.com/paritytech/parity/pull/4131)
+- Improvements and optimisations to estimate_gas [#4142](https://github.com/paritytech/parity/pull/4142)
+- New jsonrpc-core with futures and metadata support [#3859](https://github.com/paritytech/parity/pull/3859)
+- Reenable mainnet update server. [#4137](https://github.com/paritytech/parity/pull/4137)
+- Temporarily skip failing test [#4138](https://github.com/paritytech/parity/pull/4138)
+- Refactor VoteCollector [#4101](https://github.com/paritytech/parity/pull/4101)
+- Another minor estimation fix [#4133](https://github.com/paritytech/parity/pull/4133)
+- Add proper label to method decoding inputs [#4136](https://github.com/paritytech/parity/pull/4136)
+- Remove bindActionCreators({}, dispatch) (empty, unneeded) [#4135](https://github.com/paritytech/parity/pull/4135)
+- Better contract error log reporting & handling [#4128](https://github.com/paritytech/parity/pull/4128)
+- Fix broken Transfer : total account balance [#4127](https://github.com/paritytech/parity/pull/4127)
+- Test harness for lightsync [#4109](https://github.com/paritytech/parity/pull/4109)
+- Fix call/estimate_gas [#4121](https://github.com/paritytech/parity/pull/4121)
+- Fixing decoding ABI with signatures in names [#4125](https://github.com/paritytech/parity/pull/4125)
+- Get rid of unsafe code in ethkey, propagate incorrect Secret errors. [#4119](https://github.com/paritytech/parity/pull/4119)
+- Basic tests for subscribeToEvents [#4115](https://github.com/paritytech/parity/pull/4115)
+- Auto-detect hex encoded bytes in sha3 [#4108](https://github.com/paritytech/parity/pull/4108)
+- Use binary chop to estimate gas accurately [#4100](https://github.com/paritytech/parity/pull/4100)
+- V1.6 in master [#4113](https://github.com/paritytech/parity/pull/4113)
+- Ignore get_price_info test by default. [#4112](https://github.com/paritytech/parity/pull/4112)
+- Fix wrong information logging [#4106](https://github.com/paritytech/parity/pull/4106)
+- Avoid comms with not-yet-active release update server. [#4111](https://github.com/paritytech/parity/pull/4111)
+- Update Transfer logic + Better logging [#4098](https://github.com/paritytech/parity/pull/4098)
+- Fix Signer : wrong account on reload [#4104](https://github.com/paritytech/parity/pull/4104)
+- Cache registry reverses, completion in address selector [#4066](https://github.com/paritytech/parity/pull/4066)
+- Validator/authority contract [#3937](https://github.com/paritytech/parity/pull/3937)
+- No reorg limit for ancient blocks [#4099](https://github.com/paritytech/parity/pull/4099)
+- Update registration after every write [#4102](https://github.com/paritytech/parity/pull/4102)
+- Default to no auto-update. [#4092](https://github.com/paritytech/parity/pull/4092)
+- Don't remove out of date local transactions [#4094](https://github.com/paritytech/parity/pull/4094)
diff --git a/docs/CHANGELOG-1.7.md b/docs/CHANGELOG-1.7.md
new file mode 100644
index 0000000000000000000000000000000000000000..760445845ed3d07caf42c1305c860100c830ec25
--- /dev/null
+++ b/docs/CHANGELOG-1.7.md
@@ -0,0 +1,832 @@
+Note: Parity 1.7 reached End-of-Life on 2018-01-25 (EOL).
+
+### Parity [v1.7.13](https://github.com/paritytech/parity/releases/tag/v1.7.13) (2018-01-23)
+
+Parity 1.7.13 is a bug-fix release to improve stability of PoA-networks. Users on Kovan or other Aura-based networks are advised to upgrade as this release fixes an issue introduced with 1.7.12 that causes Proof-of-Authority nodes to stop synchronizing the chain.
+
+The full list of included changes:
+
+- AuRa fix for 1.7.x series ([#7666](https://github.com/paritytech/parity/pull/7666))
+  - Fix Temporarily Invalid blocks handling ([#7613](https://github.com/paritytech/parity/pull/7613))
+    - Handle temporarily invalid blocks in sync.
+    - Fix tests.
+    - Bump rustc-serialize
+    - Bump version.
+    - Update .gitlab-ci.yml
+    - Fix lint
+    - Remove slash from gitlab ci script to fix builds
+    - Start build.
+
+### Parity [v1.7.12](https://github.com/paritytech/parity/releases/tag/v1.7.12) (2018-01-09)
+
+Parity 1.7.12 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Fix stable builds for rustc 1.23.0 ([#7504](https://github.com/paritytech/parity/pull/7504))
+- Missing AuRa backports ([#7499](https://github.com/paritytech/parity/pull/7499)
+  - Wait for future blocks in AuRa ([#7368](https://github.com/paritytech/parity/pull/7368))
+    - Mark future blocks as temporarily invalid.
+    - Don't check max.
+  - Advance AuRa step as far as we can and prevent invalid blocks. ([#7451](https://github.com/paritytech/parity/pull/7451))
+    - Advance AuRa step as far as we can.
+    - Wait for future blocks.
+  -  Problem: AuRa's unsafeties around step duration ([#7282](https://github.com/paritytech/parity/pull/7282))
+  - Fix tests.
+  - Detect different node, same-key signing in aura ([#7245](https://github.com/paritytech/parity/pull/7245))
+    - Detect different node, same-key signing in aura
+    - Reduce scope of warning
+- Backports ([#7496](https://github.com/paritytech/parity/pull/7496))
+  - Advance AuRa step as far as we can. ([#7451](https://github.com/paritytech/parity/pull/7451))
+    - Advance AuRa step as far as we can.
+    - Wait for future blocks.
+  - Fixed panic when io is not available for export block, closes [#7486](https://github.com/paritytech/parity/issue/7486) ([#7495](https://github.com/paritytech/parity/pull/7495))
+  - Update Parity Mainnet Bootnodes ([#7476](https://github.com/paritytech/parity/pull/7476))
+    - Replace the Azure HDD bootnodes with the new ones :)
+  - Bump version to 1.7.12
+
+### Parity [v1.7.11](https://github.com/paritytech/parity/releases/tag/v1.7.11) (2017-12-29)
+
+Parity 1.7.11 changes the default behavior of JSON-RPC CORS setting, and updates bootnodes for the Kovan and Foundation networks.
+
+Note: The default value of `--jsonrpc-cors` option has been altered to disallow (potentially malicious) websites from accessing the low-sensitivity RPCs (viewing exposed accounts, proposing transactions for signing). Currently domains need to be whitelisted manually. To bring back previous behaviour run with `--jsonrpc-cors all` or `--jsonrpc-cors http://example.com`.
+
+The full list of included changes:
+
+- Stable Bootnodes and Warpnodes ([#7298](https://github.com/paritytech/parity/pull/7298))
+  - New warp enodes ([#7287](https://github.com/paritytech/parity/pull/7287))
+    - New warp enodes
+    - Added one more warp enode; replaced spaces with tabs
+    - Bump stable to 1.7.11
+  - Update kovan boot nodes ([#7296](https://github.com/paritytech/parity/pull/7296))
+  - Fix Cargo.lock
+  - Updating mainnet bootnodes.
+  - Update bootnodes ([#7363](https://github.com/paritytech/parity/pull/7363))
+    - Updating mainnet bootnodes.
+    - Add additional parity-beta bootnodes.
+    - Restore old parity bootnodes and update foudation bootnodes
+- Ethstore optimizations ([#6827](https://github.com/paritytech/parity/pull/6827)) ([#6844](https://github.com/paritytech/parity/pull/6844)) ([#7347](https://github.com/paritytech/parity/pull/7347))
+- Fix default CORS. ([#7389](https://github.com/paritytech/parity/pull/7389))
+
+### Parity [v1.7.10](https://github.com/paritytech/parity/releases/tag/v1.7.10) (2017-12-11)
+
+Parity 1.7.10 applies fixes for Proof-of-Authority networks and schedules the Kovan-Byzantium hard-fork.
+
+- The Kovan testnet will fork on block `5067000` at `Thu Dec 14 2017 05:40:03 UTC`.
+  - This enables Byzantium features on Kovan.
+  - This disables uncles on Kovan for stability reasons.
+- Proof-of-Authority networks are advised to set `maximumUncleCount` to 0 in a future `maximumUncleCountTransition` for stability reasons. See the [Kovan chain spec](https://github.com/paritytech/parity/blob/master/ethcore/res/ethereum/kovan.json) for an example. New PoA networks created with Parity will have this feature enabled by default.
+
+The full list of included changes:
+
+- Backports and HF block update ([#7243](https://github.com/paritytech/parity/pull/7243))
+  - Reduce max block timestamp drift to 15 seconds ([#7240](https://github.com/paritytech/parity/pull/7240))
+  - Add test for block timestamp validation within allowed drift
+  - Update kovan HF block number. ([#7259](https://github.com/paritytech/parity/pull/7259))
+- [stable] Backports and Kovan HF ([#7235](https://github.com/paritytech/parity/pull/7235))
+  - Escape inifinite loop in estimte_gas ([#7075](https://github.com/paritytech/parity/pull/7075))
+  - Disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006))
+  - Maximum uncle count transition ([#7196](https://github.com/paritytech/parity/pull/7196))
+    - Enable delayed maximum_uncle_count activation.
+    - Fix tests.
+    - Defer kovan HF.
+  - Bump version.
+  - Kovan HF.
+  - Update Kovan HF block.
+  - Fix compilation issues.
+  - Fix aura test.
+  - Add missing byzantium builtins.
+  - Fix tests.
+  - Bump version for installers.
+  - Increase allowed time drift to 10s. ([#7238](https://github.com/paritytech/parity/pull/7238))
+
+### Parity [v1.7.9](https://github.com/paritytech/parity/releases/tag/v1.7.9) (2017-11-14)
+
+Parity 1.7.9 removes the ability to deploy built-in multi-signature wallets.
+
+The full list of included changes:
+
+- Bump to v1.7.9 ([#7047](https://github.com/paritytech/parity/pull/7047))
+- Disallow built-in multi-sig deploy (only watch) ([#7017](https://github.com/paritytech/parity/pull/7017))
+
+### Parity [v1.7.8](https://github.com/paritytech/parity/releases/tag/v1.7.8) (2017-10-26)
+
+Parity 1.7.8 fixes a critical Byzantium consensus issue. Update is highly recommended.
+
+The full list of included changes:
+
+- Refactor static context check in CREATE ([#6889](https://github.com/paritytech/parity/pull/6889))
+- Bump to v1.7.8 ([#6890](https://github.com/paritytech/parity/pull/6890))
+
+## Parity [v1.7.7](https://github.com/paritytech/parity/releases/tag/v1.7.7) (2017-10-15)
+
+Parity 1.7.7 fixes an issue with auto-update system. Updating is recommended, but not required for Byzantium.
+
+The full list of included changes:
+
+- Fix auto-update ([#6769](https://github.com/paritytech/parity/pull/6759))
+  - Bump to v1.7.7
+  - Updated ethabi to fix auto-update
+- Bumped fork block number for auto-update ([#6754](https://github.com/paritytech/parity/pull/6754))
+
+## Parity [v1.7.6](https://github.com/paritytech/parity/releases/tag/v1.7.6) (2017-10-13)
+
+Parity 1.7.6 includes a critical consensus-relevant fix for the Byzantium hard-fork. Please upgrade your Ethereum client before block number `4_370_000`.
+
+The full list of included changes:
+
+- Fixed modexp gas calculation overflow ([#6746](https://github.com/paritytech/parity/pull/6746))
+ - Fixed modexp gas calculation overflow ([#6741](https://github.com/paritytech/parity/pull/6741))
+ - Bump to v1.7.6
+
+## Parity [v1.7.5](https://github.com/paritytech/parity/releases/tag/v1.7.5) (2017-10-12)
+
+Parity 1.7.5 includes a critical consensus-relevant fix for the Byzantium hard-fork. Please upgrade your Ethereum client before block number `4_370_000`.
+
+Parity 1.7.5 is the first stable release of the 1.7 branch. With this release the support for 1.6 releases ends. Please upgrade your stable nodes to 1.7.5.
+
+The full list of included changes:
+
+- Backport stable - Fixes Badges ([#6731](https://github.com/paritytech/parity/pull/6731))
+  - Fix badges not showing up ([#6730](https://github.com/paritytech/parity/pull/6730))
+  - Always fetch meta data first [badges]
+- Backport ([#6726](https://github.com/paritytech/parity/pull/6726))
+  - Check vouch status on appId in addition to contentHash ([#6719](https://github.com/paritytech/parity/pull/6719))
+    - Check vouch status on appId in addition to contentHash
+    - Simplify var expansion
+  - Merge [#6725](https://github.com/paritytech/parity/pull/6725)
+    - Update new token fetching
+    - Working Certifications Monitoring
+    - Update on Certification / Revoke
+    - Fix none-fetched tokens value display
+    - Fix tests
+  - Add updated MethodDecoding from master
+- v1.7.5 stabilized
+- Backport ([#6724](https://github.com/paritytech/parity/pull/6724))
+  - Fixed RETURNDATA out of bounds check ([#6718](https://github.com/paritytech/parity/pull/6718))
+  - Prevent going offline when restoring or taking snapshot ([#6694](https://github.com/paritytech/parity/pull/6694))
+- Bump to v1.7.5
+- Trigger beta js build & release ([#6721](https://github.com/paritytech/parity/pull/6721))
+
+## Parity [v1.7.4](https://github.com/paritytech/parity/releases/tag/v1.7.4) (2017-10-11)
+
+Parity 1.7.4 includes a critical consensus-relevant fix for the Byzantium hard-fork. Please upgrade your Ethereum client before block number `4_370_000`.
+
+The full list of included changes:
+
+- Backport ([#6715](https://github.com/paritytech/parity/pull/6715))
+  - Fix estimate gas if from is not provided. ([#6714](https://github.com/paritytech/parity/pull/6714))
+  - Display vouched overlay on dapps ([#6710](https://github.com/paritytech/parity/pull/6710))
+    - Add vouch overlays to dapps
+    - Cleanup address
+    - Only run where we have a contentHash
+- Backporting ([#6712](https://github.com/paritytech/parity/pull/6712))
+  - Bump to v1.7.4
+  - Fixed potential exp len overflow ([#6686](https://github.com/paritytech/parity/pull/6686))
+  - Fix warp sync blockers detection ([#6691](https://github.com/paritytech/parity/pull/6691))
+- Backport ([#6713](https://github.com/paritytech/parity/pull/6713))
+  - Allow signer signing display of markdown ([#6707](https://github.com/paritytech/parity/pull/6707))
+  - Fix default values for address input ([#6701](https://github.com/paritytech/parity/pull/6701))
+  - Fix asciiToHex for characters < 0x10 ([#6702](https://github.com/paritytech/parity/pull/6702))
+
+## Parity [v1.7.3](https://github.com/paritytech/parity/releases/tag/v1.7.3) (2017-10-09)
+
+Parity 1.7.3 enables the Byzantium fork for Ethereum main network on Block 4_370_000 and offers a variety of bug fixes and stability improvements. Among them:
+
+- Fixed network protocol version negotiation with Geth nodes v1.7.1+.
+- Fixed `RETURNDATA` size for built-ins. (Built-ins in some cases overwrite only a portion of the output memory slice.)
+- Multisig Wallet View now loads if multiple transactions happened within one block.
+- Improved stability of snapshot-sycns (warp).
+- Revised timeout and batch size constants for bigger blocks.
+- Renamed RPC receipt `statusCode` field to `status`.
+
+The full list of included changes:
+
+- Backporting ([#6676](https://github.com/paritytech/parity/pull/6676))
+  - Fix wallet view ([#6597](https://github.com/paritytech/parity/pull/6597))
+    - Add safe fail for empty logs
+    - Filter transactions
+    - Add more logging
+    - Fix Wallet Creation and wallet tx list
+    - Remove logs
+    - Prevent selecting twice same wallet owner
+    - Fix tests
+    - Remove unused props
+  - Disallow pasting recovery phrases on first run ([#6602](https://github.com/paritytech/parity/pull/6602))
+    - Fix disallowing paste of recovery phrase on first run, ref [#6581](https://github.com/paritytech/parity/issues/6581)
+    - Allow the leader of CATS pasting recovery phrases.
+  - Updated systemd files for linux ([#6592](https://github.com/paritytech/parity/pull/6592))
+    - Previous version put $BASE directory in root directory.
+    - This version clearly explains how to run as root or as specific user.
+    - Additional configuration:
+      - send SIGHUP for clean exit,
+      - restart on fail.
+    - Tested on Ubuntu 16.04.3 LTS with 4.10.0-33-generic x86_64 kernel
+  - Don't expose port 80 for parity anymore ([#6633](https://github.com/paritytech/parity/pull/6633))
+- Backporting ([#6675](https://github.com/paritytech/parity/pull/6675))
+  - Required validators >= num owners ([#6551](https://github.com/paritytech/parity/pull/6551))
+  - Debounce sync status. ([#6572](https://github.com/paritytech/parity/pull/6572))
+  - Fixed network protocol version negotiation ([#6649](https://github.com/paritytech/parity/pull/6649))
+  - Renamed RPC receipt statusCode field to status ([#6650](https://github.com/paritytech/parity/pull/6650))
+  - Fixed RETURNDATA size for built-ins ([#6652](https://github.com/paritytech/parity/pull/6652))
+- Byzantium fork block number ([#6661](https://github.com/paritytech/parity/pull/6661))
+- Refreshing block number on status view ([#6610](https://github.com/paritytech/parity/pull/6610))
+- Tweaked block download timeouts ([#6595](https://github.com/paritytech/parity/pull/6595))
+- Backports ([#6563](https://github.com/paritytech/parity/pull/6563))
+  - Sync progress and error handling fixes ([#6560](https://github.com/paritytech/parity/pull/6560))
+  - Fixed receipt serialization and RPC ([#6555](https://github.com/paritytech/parity/pull/6555))
+- Bump to v1.7.3
+
+## Parity [v1.7.2](https://github.com/paritytech/parity/releases/tag/v1.7.2) (2017-09-18)
+
+Parity 1.7.2 is a bug-fix release to improve performance and stability. Among others, it addresses the following:
+
+- Byzantium fork support for the Ropsten and Foundation networks.
+- Added support for the ConsenSys and Gnosis multi-signature wallets.
+- Significantly increased token registry and token balance lookup performance.
+- Fixed issues with the health status indicator in the wallet.
+- Tweaked warp-sync to quickly catch up with chains fallen back more than 10,000 blocks.
+- Fixes to the Chrome extension and macOS installer upgrades.
+
+The full list of included changes:
+
+- Fix output from eth_call. ([#6538](https://github.com/paritytech/parity/pull/6538))
+- Ropsten fork ([#6532](https://github.com/paritytech/parity/pull/6532))
+- Byzantium updates ([#6529](https://github.com/paritytech/parity/pull/6529))
+  - Fix modexp bug: return 0 if base=0 ([#6424](https://github.com/paritytech/parity/pull/6424))
+  - Running state test using parity-evm ([#6355](https://github.com/paritytech/parity/pull/6355))
+    - Initial version of state tests.
+    - Refactor state to support tracing.
+    - Unify TransactResult.
+    - Add test.
+  - Byzantium updates ([#5855](https://github.com/paritytech/parity/pull/5855))
+    - EIP-211 updates
+    - Benchmarks
+    - Blockhash instruction gas cost updated
+    - More benches
+    - EIP-684
+    - EIP-649
+    - EIP-658
+    - Updated some tests
+    - Modexp fixes
+    - STATICCALL fixes
+    - Pairing fixes
+    - More STATICALL fixes
+    - Use paritytech/bn
+    - Fixed REVERTing of contract creation
+    - Fixed more tests
+    - Fixed more tests
+    - Blockchain tests
+    - Enable previously broken tests
+    - Transition test
+    - Updated tests
+    - Fixed modexp reading huge numbers
+    - Enabled max_code_size test
+    - Review fixes
+    - Updated pairing pricing
+    - Missing commas (style)
+    - Update test.rs
+    - Small improvements
+    - Eip161abc
+- Fix extension detection ([#6452](https://github.com/paritytech/parity/pull/6452)) ([#6524](https://github.com/paritytech/parity/pull/6524))
+  - Fix extension detection.
+  - Fix mobx quirks.
+  - Update submodule.
+- Fix detecting hardware wallets. ([#6509](https://github.com/paritytech/parity/pull/6509))
+- Allow hardware device reads without lock. ([#6517](https://github.com/paritytech/parity/pull/6517))
+- Backports [#6497](https://github.com/paritytech/parity/pull/6497)
+  - Fix slow balances ([#6471](https://github.com/paritytech/parity/pull/6471))
+    - Update token updates
+    - Update token info fetching
+    - Update logger
+    - Minor fixes to updates and notifications for balances
+    - Use Pubsub
+    - Fix timeout.
+    - Use pubsub for status.
+    - Fix signer subscription.
+    - Process tokens in chunks.
+    - Fix tokens loaded by chunks
+    - Dispatch tokens asap
+    - Fix chunks processing.
+    - Better filter options
+    - Parallel log fetching.
+    - Fix signer polling.
+    - Fix initial block query.
+    - Token balances updates : the right(er) way
+    - Better tokens info fetching
+    - Fixes in token data fetching
+    - Only fetch what's needed (tokens)
+    - Fix linting issues
+    - Update wasm-tests.
+    - Fixing balances fetching
+    - Fix requests tracking in UI
+    - Fix request watching
+    - Update the Logger
+    - PR Grumbles Fixes
+  - Eth_call returns output of contract creations ([#6420](https://github.com/paritytech/parity/pull/6420))
+    - Eth_call returns output of contract creations
+    - Fix parameters order.
+    - Save outputs for light client as well.
+  - Don't accept transactions above block gas limit.
+  - Expose health status over RPC ([#6274](https://github.com/paritytech/parity/pull/6274))
+     - Node-health to a separate crate.
+     - Initialize node_health outside of dapps.
+     - Expose health over RPC.
+     - Bring back 412 and fix JS.
+     - Add health to workspace and tests.
+     - Fix compilation without default features.
+     - Fix borked merge.
+     - Revert to generics to avoid virtual calls.
+     - Fix node-health tests.
+     - Add missing trailing comma.
+  - Fixing/removing failing JS tests.
+  - Do not activate genesis epoch in immediate transition validator contract ([#6349](https://github.com/paritytech/parity/pull/6349))
+  - Fix memory tracing.
+  - Add test to cover that.
+  - Ensure balances of constructor accounts are kept
+  - Test balance of spec-constructed account is kept
+- Fix warning spam. [#6369](https://github.com/paritytech/parity/pull/6369)
+- Bump to 1.7.2
+- Fix eth_call [#6366](https://github.com/paritytech/parity/pull/6366)
+- Backporting [#6352](https://github.com/paritytech/parity/pull/6352)
+  - Better check the created accounts before showing Startup Wizard [#6331](https://github.com/paritytech/parity/pull/6331)
+  - Tweaked snapshot params [#6344](https://github.com/paritytech/parity/pull/6344)
+- Increase default gas limit for eth_call [#6337](https://github.com/paritytech/parity/pull/6337)
+  - Fix balance increase.
+  - Cap gas limit for dapp-originating requests.
+- Backports [#6333](https://github.com/paritytech/parity/pull/6333)
+  - Overflow check in addition
+  - Unexpose methods on UI RPC. [#6295](https://github.com/paritytech/parity/pull/6295)
+  - Add more descriptive error when signing/decrypting using hw wallet.
+  - Format instant change proofs correctly
+  - Propagate stratum submit share error upstream [#6260](https://github.com/paritytech/parity/pull/6260)
+  - Updated jsonrpc [#6264](https://github.com/paritytech/parity/pull/6264)
+  - Using multiple NTP servers [#6173](https://github.com/paritytech/parity/pull/6173)
+    - Small improvements to time estimation.
+    - Allow multiple NTP servers to be used.
+    - Removing boxing.
+    - Update list of servers and add reference.
+  - Fix dapps CSP when UI is exposed externally [#6178](https://github.com/paritytech/parity/pull/6178)
+    - Allow embeding on any page when ui-hosts=all and fix dev_ui
+  - Fix cache path when using --base-path [#6212](https://github.com/paritytech/parity/pull/6212)
+  - Bump to v1.7.1
+- UI backports [#6332](https://github.com/paritytech/parity/pull/6332)
+  - Time should not contribue to overall status. [#6276](https://github.com/paritytech/parity/pull/6276)
+  - Add warning to web browser and fix links. [#6232](https://github.com/paritytech/parity/pull/6232)
+  - Extension fixes [#6284](https://github.com/paritytech/parity/pull/6284)
+    - Fix token symbols in extension.
+    - Allow connections from firefox extension.
+  - Add support for ConsenSys multisig wallet [#6153](https://github.com/paritytech/parity/pull/6153)
+    - First draft of ConsenSys wallet
+    - Fix transfer store // WIP Consensys Wallet
+    - Rename walletABI JSON file
+    - Fix wrong daylimit in wallet modal
+    - Confirm/Revoke ConsensysWallet txs
+    - Change of settings for the Multisig Wallet
+- Update README for beta [#6270](https://github.com/paritytech/parity/pull/6270)
+- Fixed macOS installer upgrade [#6221](https://github.com/paritytech/parity/pull/6221)
+
+## Parity [v1.7.0](https://github.com/paritytech/parity/releases/tag/v1.7.0) (2017-07-28)
+
+Parity 1.7.0 is a major release introducing several important features:
+
+- **Experimental [Light client](https://github.com/paritytech/parity/wiki/The-Parity-Light-Protocol-(PIP)) support**. Start Parity with `--light` to enable light mode. Please, note: The wallet UI integration for the light client is not included, yet.
+- **Experimental web wallet**. A hosted version of Parity that keeps the keys and signs transactions using your browser storage. Try it at https://wallet.parity.io or run your own with `--public-node`.
+- **WASM contract support**. Private networks can run contracts compiled into WASM bytecode. _More information and documentation to follow_.
+- **DApps and RPC server merge**. DApp and RPC are now available through a single API endpoint. DApp server related settings are deprecated.
+- **Export accounts from the wallet**. Backing up your keys can now simply be managed through the wallet interface.
+- **PoA/Kovan validator set contract**. The PoA network validator-set management via smart contract is now supported by warp and, in the near future, light sync.
+- **PubSub API**. https://github.com/paritytech/parity/wiki/JSONRPC-Parity-Pub-Sub-module
+- **Signer apps for IOS and Android**.
+
+The full list of included changes:
+
+- Backports [#6163](https://github.com/paritytech/parity/pull/6163)
+  - Light client improvements ([#6156](https://github.com/paritytech/parity/pull/6156))
+    - No seal checking
+    - Import command and --no-seal-check for light client
+    - Fix eth_call
+    - Tweak registry dapps lookup
+    - Ignore failed requests to non-server peers
+  - Fix connecting to wildcard addresses. ([#6167](https://github.com/paritytech/parity/pull/6167))
+  - Don't display an overlay in case the time sync check fails. ([#6164](https://github.com/paritytech/parity/pull/6164))
+    - Small improvements to time estimation.
+    - Temporarily disable NTP time check by default.
+- Light client fixes ([#6148](https://github.com/paritytech/parity/pull/6148)) [#6151](https://github.com/paritytech/parity/pull/6151)
+  - Light client fixes
+  - Fix memory-lru-cache
+  - Clear pending reqs on disconnect
+- Filter tokens logs from current block, not genesis ([#6128](https://github.com/paritytech/parity/pull/6128)) [#6141](https://github.com/paritytech/parity/pull/6141)
+- Fix QR scanner returning null on confirm [#6122](https://github.com/paritytech/parity/pull/6122)
+- Check QR before lowercase ([#6119](https://github.com/paritytech/parity/pull/6119)) [#6120](https://github.com/paritytech/parity/pull/6120)
+- Remove chunk to restore from pending set only upon successful import [#6117](https://github.com/paritytech/parity/pull/6117)
+- Fixed node address detection on incoming connection [#6094](https://github.com/paritytech/parity/pull/6094)
+- Place RETURNDATA behind block number gate [#6095](https://github.com/paritytech/parity/pull/6095)
+- Update wallet library binaries [#6108](https://github.com/paritytech/parity/pull/6108)
+- Backported wallet fix [#6105](https://github.com/paritytech/parity/pull/6105)
+  - Fix initialisation bug. ([#6102](https://github.com/paritytech/parity/pull/6102))
+  - Update wallet library modifiers ([#6103](https://github.com/paritytech/parity/pull/6103))
+- Place RETURNDATA behind block number gate [#6095](https://github.com/paritytech/parity/pull/6095)
+- Fixed node address detection on incoming connection [#6094](https://github.com/paritytech/parity/pull/6094)
+- Bump snap version and tweak importing detection logic ([#6079](https://github.com/paritytech/parity/pull/6079)) [#6081](https://github.com/paritytech/parity/pull/6081)
+  - bump last tick just before printing info and restore sync detection
+  - bump kovan snapshot version
+  - Fixed sync tests
+  - Fixed rpc tests
+- Acquire client report under lock in informant [#6071](https://github.com/paritytech/parity/pull/6071)
+- Show busy indicator on Address forget [#6069](https://github.com/paritytech/parity/pull/6069)
+- Add CSP for worker-src ([#6059](https://github.com/paritytech/parity/pull/6059)) [#6064](https://github.com/paritytech/parity/pull/6064)
+  - Specify worker-src seperately, add blob
+  - Upgrade react-qr-scan to latest version
+- Set release channel to beta
+- Limit transaction queue memory & limit future queue [#6038](https://github.com/paritytech/parity/pull/6038)
+- Fix CI build issue [#6050](https://github.com/paritytech/parity/pull/6050)
+- New contract PoA sync fixes [#5991](https://github.com/paritytech/parity/pull/5991)
+- Fixed link to Multisig Contract Wallet on master [#5984](https://github.com/paritytech/parity/pull/5984)
+- Ethcore crate split part 1 [#6041](https://github.com/paritytech/parity/pull/6041)
+- Fix status icon [#6039](https://github.com/paritytech/parity/pull/6039)
+- Errors & warnings for inappropriate RPCs [#6029](https://github.com/paritytech/parity/pull/6029)
+- Add missing CSP for web3.site [#5992](https://github.com/paritytech/parity/pull/5992)
+- Remove cargo install --git from README.md [#6037](https://github.com/paritytech/parity/pull/6037)
+- Node Health warnings [#5951](https://github.com/paritytech/parity/pull/5951)
+- RPC cpu pool [#6023](https://github.com/paritytech/parity/pull/6023)
+- Use crates.io dependencies for parity-wasm [#6036](https://github.com/paritytech/parity/pull/6036)
+- Add test for loading the chain specs [#6028](https://github.com/paritytech/parity/pull/6028)
+- Whitelist APIs for generic Pub-Sub [#5840](https://github.com/paritytech/parity/pull/5840)
+- WASM contracts MVP [#5679](https://github.com/paritytech/parity/pull/5679)
+- Fix valid QR scan not advancing [#6033](https://github.com/paritytech/parity/pull/6033)
+- --reseal-on-uncle [#5940](https://github.com/paritytech/parity/pull/5940)
+- Support comments in reserved peers file ([#6004](https://github.com/paritytech/parity/pull/6004)) [#6012](https://github.com/paritytech/parity/pull/6012)
+- Add new md tnc [#5937](https://github.com/paritytech/parity/pull/5937)
+- Fix output of parity-evm in case of bad instruction [#5955](https://github.com/paritytech/parity/pull/5955)
+- Don't send notifications to unsubscribed clients of PubSub [#5960](https://github.com/paritytech/parity/pull/5960)
+- Proper light client informant and more verification of imported headers [#5897](https://github.com/paritytech/parity/pull/5897)
+- New Kovan bootnodes [#6017](https://github.com/paritytech/parity/pull/6017)
+- Use standard paths for Ethash cache [#5881](https://github.com/paritytech/parity/pull/5881)
+- Defer code hash calculation. [#5959](https://github.com/paritytech/parity/pull/5959)
+- Fix first run wizard. [#6000](https://github.com/paritytech/parity/pull/6000)
+- migration to serde 1.0 [#5996](https://github.com/paritytech/parity/pull/5996)
+- SecretStore: generating signatures [#5764](https://github.com/paritytech/parity/pull/5764)
+- bigint upgraded to version 3.0 [#5986](https://github.com/paritytech/parity/pull/5986)
+- config: don't allow dev chain with force sealing option [#5965](https://github.com/paritytech/parity/pull/5965)
+- Update lockfile for miniz-sys and gcc [#5969](https://github.com/paritytech/parity/pull/5969)
+- Clean up function naming in RPC error module [#5995](https://github.com/paritytech/parity/pull/5995)
+- Fix underflow in gas calculation [#5975](https://github.com/paritytech/parity/pull/5975)
+- PubSub for parity-js [#5830](https://github.com/paritytech/parity/pull/5830)
+- Report whether a peer was kept from `Handler::on_connect` [#5958](https://github.com/paritytech/parity/pull/5958)
+- Implement skeleton for transaction index and epoch transition proof PIP messages [#5908](https://github.com/paritytech/parity/pull/5908)
+- TransactionQueue improvements [#5917](https://github.com/paritytech/parity/pull/5917)
+- constant time HMAC comparison and clarify docs in ethkey [#5952](https://github.com/paritytech/parity/pull/5952)
+- Avoid pre-computing jump destinations [#5954](https://github.com/paritytech/parity/pull/5954)
+- Upgrade elastic array [#5949](https://github.com/paritytech/parity/pull/5949)
+- PoA: Wait for transition finality before applying [#5774](https://github.com/paritytech/parity/pull/5774)
+- Logs Pub-Sub [#5705](https://github.com/paritytech/parity/pull/5705)
+- Add the command to install the parity snap [#5945](https://github.com/paritytech/parity/pull/5945)
+- Reduce unnecessary allocations [#5944](https://github.com/paritytech/parity/pull/5944)
+- Clarify confusing messages. [#5935](https://github.com/paritytech/parity/pull/5935)
+- Content Security Policy [#5790](https://github.com/paritytech/parity/pull/5790)
+- CLI: Export error message and less verbose peer counter. [#5870](https://github.com/paritytech/parity/pull/5870)
+- network: make it more explicit about StreamToken and TimerToken [#5939](https://github.com/paritytech/parity/pull/5939)
+- sync: make it more idiomatic rust [#5938](https://github.com/paritytech/parity/pull/5938)
+- Prioritize accounts over address book [#5909](https://github.com/paritytech/parity/pull/5909)
+- Fixing failing compilation of RPC test on master. [#5916](https://github.com/paritytech/parity/pull/5916)
+- Empty local middleware, until explicitly requested [#5912](https://github.com/paritytech/parity/pull/5912)
+- Cancel propagated TX [#5899](https://github.com/paritytech/parity/pull/5899)
+- fix minor race condition in aura seal generation [#5910](https://github.com/paritytech/parity/pull/5910)
+- Docs for Pub-Sub, optional parameter for parity_subscribe [#5833](https://github.com/paritytech/parity/pull/5833)
+- Fix gas editor doubling-up on gas [#5820](https://github.com/paritytech/parity/pull/5820)
+- Information about used paths added to general output block [#5904](https://github.com/paritytech/parity/pull/5904)
+- Domain-locked web tokens. [#5894](https://github.com/paritytech/parity/pull/5894)
+- Removed panic handlers [#5895](https://github.com/paritytech/parity/pull/5895)
+- Latest changes from Rust RocksDB binding merged [#5905](https://github.com/paritytech/parity/pull/5905)
+- Adjust keyethereum/secp256 aliasses [#5903](https://github.com/paritytech/parity/pull/5903)
+- Keyethereum fs dependency [#5902](https://github.com/paritytech/parity/pull/5902)
+- Ethereum Classic Monetary Policy [#5741](https://github.com/paritytech/parity/pull/5741)
+- Initial token should allow full access. [#5873](https://github.com/paritytech/parity/pull/5873)
+- Fixed account selection for Dapps on public node [#5856](https://github.com/paritytech/parity/pull/5856)
+- blacklist bad snapshot manifest hashes upon failure [#5874](https://github.com/paritytech/parity/pull/5874)
+- Fix wrongly called timeouts [#5838](https://github.com/paritytech/parity/pull/5838)
+- ArchiveDB and other small fixes [#5867](https://github.com/paritytech/parity/pull/5867)
+- convert try!() to ? [#5866](https://github.com/paritytech/parity/pull/5866)
+- Make config file optional in systemd [#5847](https://github.com/paritytech/parity/pull/5847)
+- EIP-116 (214), [#4833](https://github.com/paritytech/parity/issues/4833) [#4851](https://github.com/paritytech/parity/pull/4851)
+- all executables are workspace members [#5865](https://github.com/paritytech/parity/pull/5865)
+- minor optimizations of the modexp builtin [#5860](https://github.com/paritytech/parity/pull/5860)
+- three small commits for HashDB and MemoryDB [#5766](https://github.com/paritytech/parity/pull/5766)
+- use rust 1.18's retain to boost the purge performance [#5801](https://github.com/paritytech/parity/pull/5801)
+- Allow IPFS server to accept POST requests [#5858](https://github.com/paritytech/parity/pull/5858)
+- Dutch i18n from [#5802](https://github.com/paritytech/parity/issues/5802) for master [#5836](https://github.com/paritytech/parity/pull/5836)
+- Typos in token deploy dapp ui [#5851](https://github.com/paritytech/parity/pull/5851)
+- A CLI flag to allow fast transaction signing when account is unlocked. [#5778](https://github.com/paritytech/parity/pull/5778)
+- Removing `additional` field from EVM instructions [#5821](https://github.com/paritytech/parity/pull/5821)
+- Don't fail on wrong log decoding [#5813](https://github.com/paritytech/parity/pull/5813)
+- Use randomized subscription ids for PubSub [#5756](https://github.com/paritytech/parity/pull/5756)
+- Fixed mem write for empty slice [#5827](https://github.com/paritytech/parity/pull/5827)
+- Fix party technologies [#5810](https://github.com/paritytech/parity/pull/5810)
+- Revert "Fixed mem write for empty slice" [#5826](https://github.com/paritytech/parity/pull/5826)
+- Fixed mem write for empty slice [#5825](https://github.com/paritytech/parity/pull/5825)
+- Fix JS tests [#5822](https://github.com/paritytech/parity/pull/5822)
+- Bump native-tls and openssl crates. [#5817](https://github.com/paritytech/parity/pull/5817)
+- Public node using WASM [#5734](https://github.com/paritytech/parity/pull/5734)
+- enforce block signer == author field in PoA [#5808](https://github.com/paritytech/parity/pull/5808)
+- Fix stack display in evmbin. [#5733](https://github.com/paritytech/parity/pull/5733)
+- Disable UI if it's not compiled in. [#5773](https://github.com/paritytech/parity/pull/5773)
+- Require phrase confirmation. [#5731](https://github.com/paritytech/parity/pull/5731)
+- Duration limit made optional for EthashParams [#5777](https://github.com/paritytech/parity/pull/5777)
+- Update Changelog for 1.6.8 [#5798](https://github.com/paritytech/parity/pull/5798)
+- Replace Ethcore comany name in T&C and some other places [#5796](https://github.com/paritytech/parity/pull/5796)
+- PubSub for IPC. [#5800](https://github.com/paritytech/parity/pull/5800)
+- Fix terminology distributed -> decentralized applications [#5797](https://github.com/paritytech/parity/pull/5797)
+- Disable compression for RLP strings [#5786](https://github.com/paritytech/parity/pull/5786)
+- update the source for the snapcraft package [#5781](https://github.com/paritytech/parity/pull/5781)
+- Fixed default UI port for mac installer [#5782](https://github.com/paritytech/parity/pull/5782)
+- Block invalid account name creation [#5784](https://github.com/paritytech/parity/pull/5784)
+- Update Cid/multihash/ring/tinykeccak [#5785](https://github.com/paritytech/parity/pull/5785)
+- use NULL_RLP, remove NULL_RLP_STATIC [#5742](https://github.com/paritytech/parity/pull/5742)
+- Blacklist empty phrase account. [#5730](https://github.com/paritytech/parity/pull/5730)
+- EIP-211 RETURNDATACOPY and RETURNDATASIZE [#5678](https://github.com/paritytech/parity/pull/5678)
+- Bump mio [#5763](https://github.com/paritytech/parity/pull/5763)
+- Fixing UI issues after UI server refactor [#5710](https://github.com/paritytech/parity/pull/5710)
+- Fix WS server expose issue. [#5728](https://github.com/paritytech/parity/pull/5728)
+- Fix local transactions without condition. [#5716](https://github.com/paritytech/parity/pull/5716)
+- Bump parity-wordlist. [#5748](https://github.com/paritytech/parity/pull/5748)
+- two small changes in evm [#5700](https://github.com/paritytech/parity/pull/5700)
+- Evmbin: JSON format printing pre-state. [#5712](https://github.com/paritytech/parity/pull/5712)
+- Recover from empty phrase in dev mode [#5698](https://github.com/paritytech/parity/pull/5698)
+- EIP-210 BLOCKHASH changes [#5505](https://github.com/paritytech/parity/pull/5505)
+- fixes typo [#5708](https://github.com/paritytech/parity/pull/5708)
+- Bump rocksdb [#5707](https://github.com/paritytech/parity/pull/5707)
+- Fixed --datadir option [#5697](https://github.com/paritytech/parity/pull/5697)
+- rpc -> weak to arc [#5688](https://github.com/paritytech/parity/pull/5688)
+- typo fix [#5699](https://github.com/paritytech/parity/pull/5699)
+- Revamping parity-evmbin [#5696](https://github.com/paritytech/parity/pull/5696)
+- Update dependencies and bigint api [#5685](https://github.com/paritytech/parity/pull/5685)
+- UI server refactoring [#5580](https://github.com/paritytech/parity/pull/5580)
+- Fix from/into electrum in ethkey [#5686](https://github.com/paritytech/parity/pull/5686)
+- Add unit tests [#5668](https://github.com/paritytech/parity/pull/5668)
+- Guanqun add unit tests [#5671](https://github.com/paritytech/parity/pull/5671)
+- Parity-PubSub as a separate API. [#5676](https://github.com/paritytech/parity/pull/5676)
+- EIP-140 REVERT opcode [#5477](https://github.com/paritytech/parity/pull/5477)
+- Update CHANGELOG for 1.6.7 [#5683](https://github.com/paritytech/parity/pull/5683)
+- Updated docs slightly. [#5674](https://github.com/paritytech/parity/pull/5674)
+- Fix build [#5684](https://github.com/paritytech/parity/pull/5684)
+- Back-references for the on-demand service [#5573](https://github.com/paritytech/parity/pull/5573)
+- Dynamically adjust PIP request costs based on gathered data [#5603](https://github.com/paritytech/parity/pull/5603)
+- use cargo workspace [#5601](https://github.com/paritytech/parity/pull/5601)
+- Latest headers Pub-Sub [#5655](https://github.com/paritytech/parity/pull/5655)
+- improved dockerfile builds [#5659](https://github.com/paritytech/parity/pull/5659)
+- Adding CLI options: port shift and unsafe expose. [#5677](https://github.com/paritytech/parity/pull/5677)
+- Report missing author in Aura [#5583](https://github.com/paritytech/parity/pull/5583)
+- typo fix [#5669](https://github.com/paritytech/parity/pull/5669)
+- Remove public middleware (temporary) [#5665](https://github.com/paritytech/parity/pull/5665)
+- Remove additional polyfill [#5663](https://github.com/paritytech/parity/pull/5663)
+- Importing accounts from files. [#5644](https://github.com/paritytech/parity/pull/5644)
+- remove the deprecated options in rustfmt.toml [#5616](https://github.com/paritytech/parity/pull/5616)
+- Update the Console dapp [#5602](https://github.com/paritytech/parity/pull/5602)
+- Create an account for chain=dev [#5612](https://github.com/paritytech/parity/pull/5612)
+- Use babel-runtime as opposed to babel-polyfill [#5662](https://github.com/paritytech/parity/pull/5662)
+- Connection dialog timestamp info [#5554](https://github.com/paritytech/parity/pull/5554)
+- use copy_from_slice instead of for loop [#5647](https://github.com/paritytech/parity/pull/5647)
+- Light friendly dapps [#5634](https://github.com/paritytech/parity/pull/5634)
+- Add Recover button to Accounts and warnings [#5645](https://github.com/paritytech/parity/pull/5645)
+- Update eth_sign docs. [#5631](https://github.com/paritytech/parity/pull/5631)
+- Proper signer Pub-Sub for pending requests. [#5594](https://github.com/paritytech/parity/pull/5594)
+- Bump bigint to 1.0.5 [#5641](https://github.com/paritytech/parity/pull/5641)
+- PoA warp implementation [#5488](https://github.com/paritytech/parity/pull/5488)
+- Improve on-demand dispatch and add support for batch requests [#5419](https://github.com/paritytech/parity/pull/5419)
+- Use default account for sending transactions [#5588](https://github.com/paritytech/parity/pull/5588)
+- Add peer management to the Status tab [#5566](https://github.com/paritytech/parity/pull/5566)
+- Add monotonic step transition [#5587](https://github.com/paritytech/parity/pull/5587)
+- Decrypting for external accounts. [#5581](https://github.com/paritytech/parity/pull/5581)
+- only enable warp sync when engine supports it [#5595](https://github.com/paritytech/parity/pull/5595)
+- fix the doc of installing rust [#5586](https://github.com/paritytech/parity/pull/5586)
+- Small fixes [#5584](https://github.com/paritytech/parity/pull/5584)
+- SecretStore: remove session on master node [#5545](https://github.com/paritytech/parity/pull/5545)
+- run-clean [#5607](https://github.com/paritytech/parity/pull/5607)
+- relicense RLP to MIT/Apache2 [#5591](https://github.com/paritytech/parity/pull/5591)
+- Fix eth_sign signature encoding. [#5597](https://github.com/paritytech/parity/pull/5597)
+- Check pending request on Node local transactions [#5564](https://github.com/paritytech/parity/pull/5564)
+- Add tooltips on ActionBar [#5562](https://github.com/paritytech/parity/pull/5562)
+- Can't deploy without compiling Contract [#5593](https://github.com/paritytech/parity/pull/5593)
+- Add a warning when node is syncing [#5565](https://github.com/paritytech/parity/pull/5565)
+- Update registry middleware [#5585](https://github.com/paritytech/parity/pull/5585)
+- Set block condition to BigNumber in MethodDecoding [#5592](https://github.com/paritytech/parity/pull/5592)
+- Load the sources immediately in Contract Dev [#5575](https://github.com/paritytech/parity/pull/5575)
+- Remove formal verification messages in Dev Contract [#5574](https://github.com/paritytech/parity/pull/5574)
+- Fix event params decoding when no names for parameters [#5567](https://github.com/paritytech/parity/pull/5567)
+- Do not convert to Dates twice [#5563](https://github.com/paritytech/parity/pull/5563)
+- Fix Multisig wallet settings [#5560](https://github.com/paritytech/parity/pull/5560)
+- Typo [#5547](https://github.com/paritytech/parity/pull/5547)
+- Generic PubSub implementation [#5456](https://github.com/paritytech/parity/pull/5456)
+- Fix CI paths. [#5570](https://github.com/paritytech/parity/pull/5570)
+- reorg into blocks before minimum history [#5558](https://github.com/paritytech/parity/pull/5558)
+- EIP-86 update [#5506](https://github.com/paritytech/parity/pull/5506)
+- Secretstore RPCs + integration [#5439](https://github.com/paritytech/parity/pull/5439)
+- Fixes Parity Bar position [#5557](https://github.com/paritytech/parity/pull/5557)
+- Fixes invalid log in BadgeReg events [#5556](https://github.com/paritytech/parity/pull/5556)
+- Fix issues in Contract Development view [#5555](https://github.com/paritytech/parity/pull/5555)
+- Added missing methods [#5542](https://github.com/paritytech/parity/pull/5542)
+- option to disable persistent txqueue [#5544](https://github.com/paritytech/parity/pull/5544)
+- Bump jsonrpc [#5552](https://github.com/paritytech/parity/pull/5552)
+- Retrieve block headers only for header-only info [#5480](https://github.com/paritytech/parity/pull/5480)
+- add snap to CI [#5519](https://github.com/paritytech/parity/pull/5519)
+- Pass additional data when reporting [#5527](https://github.com/paritytech/parity/pull/5527)
+- Calculate post-constructors state root in spec at load time [#5523](https://github.com/paritytech/parity/pull/5523)
+- Fix utf8 decoding [#5533](https://github.com/paritytech/parity/pull/5533)
+- Add CHANGELOG.md [#5513](https://github.com/paritytech/parity/pull/5513)
+- Change all occurrences of ethcore.io into parity.io [#5528](https://github.com/paritytech/parity/pull/5528)
+- Memory usage optimization [#5526](https://github.com/paritytech/parity/pull/5526)
+- Compose transaction RPC. [#5524](https://github.com/paritytech/parity/pull/5524)
+- Support external eth_sign  [#5481](https://github.com/paritytech/parity/pull/5481)
+- Treat block numbers as strings, not BigNums. [#5449](https://github.com/paritytech/parity/pull/5449)
+- npm cleanups [#5512](https://github.com/paritytech/parity/pull/5512)
+- Export acc js [#4973](https://github.com/paritytech/parity/pull/4973)
+- YARN [#5395](https://github.com/paritytech/parity/pull/5395)
+- Fix linting issues [#5511](https://github.com/paritytech/parity/pull/5511)
+- Chinese Translation [#5460](https://github.com/paritytech/parity/pull/5460)
+- Fixing secretstore TODOs - part 2 [#5416](https://github.com/paritytech/parity/pull/5416)
+- fix json format of state snapshot [#5504](https://github.com/paritytech/parity/pull/5504)
+- Bump jsonrpc version [#5489](https://github.com/paritytech/parity/pull/5489)
+- Groundwork for generalized warp sync [#5454](https://github.com/paritytech/parity/pull/5454)
+- Add the packaging metadata to build the parity snap [#5496](https://github.com/paritytech/parity/pull/5496)
+- Cancel tx JS [#4958](https://github.com/paritytech/parity/pull/4958)
+- EIP-212 (bn128 curve pairing) [#5307](https://github.com/paritytech/parity/pull/5307)
+- fix panickers in tree-route [#5479](https://github.com/paritytech/parity/pull/5479)
+- Update links to etherscan.io [#5455](https://github.com/paritytech/parity/pull/5455)
+- Refresh UI on nodeKind changes, e.g. personal -> public [#5312](https://github.com/paritytech/parity/pull/5312)
+- Correct contract address for EIP-86 [#5473](https://github.com/paritytech/parity/pull/5473)
+- Force two decimals for USD conversion rate [#5471](https://github.com/paritytech/parity/pull/5471)
+- Refactoring of Tokens & Balances [#5372](https://github.com/paritytech/parity/pull/5372)
+- Background-repeat round [#5475](https://github.com/paritytech/parity/pull/5475)
+- nl i18n updated [#5461](https://github.com/paritytech/parity/pull/5461)
+- Show ETH value (even 0) if ETH transfer in transaction list [#5406](https://github.com/paritytech/parity/pull/5406)
+- Store the pending requests per network version [#5405](https://github.com/paritytech/parity/pull/5405)
+- Use in-memory database for tests [#5451](https://github.com/paritytech/parity/pull/5451)
+- WebSockets RPC server [#5425](https://github.com/paritytech/parity/pull/5425)
+- Added missing docs [#5452](https://github.com/paritytech/parity/pull/5452)
+- Tests and tweaks for public node middleware [#5417](https://github.com/paritytech/parity/pull/5417)
+- Fix removal of hash-mismatched files. [#5440](https://github.com/paritytech/parity/pull/5440)
+- parity_getBlockHeaderByNumber and LightFetch utility [#5383](https://github.com/paritytech/parity/pull/5383)
+- New state tests [#5418](https://github.com/paritytech/parity/pull/5418)
+- Fix buffer length for QR code gen. [#5447](https://github.com/paritytech/parity/pull/5447)
+- Add raw hash signing [#5423](https://github.com/paritytech/parity/pull/5423)
+- Filters and block RPCs for the light client [#5320](https://github.com/paritytech/parity/pull/5320)
+- Work around mismatch for QR checksum [#5374](https://github.com/paritytech/parity/pull/5374)
+- easy to use conversion from and to string for ethstore::Crypto [#5437](https://github.com/paritytech/parity/pull/5437)
+- Tendermint fixes [#5415](https://github.com/paritytech/parity/pull/5415)
+- Adrianbrink lightclientcache branch. [#5428](https://github.com/paritytech/parity/pull/5428)
+- Add caching to HeaderChain struct [#5403](https://github.com/paritytech/parity/pull/5403)
+- Add decryption to the UI (in the Signer) [#5422](https://github.com/paritytech/parity/pull/5422)
+- Add CIDv0 RPC [#5414](https://github.com/paritytech/parity/pull/5414)
+- Updating documentation for RPCs [#5392](https://github.com/paritytech/parity/pull/5392)
+- Fixing secretstore TODOs - part 1 [#5386](https://github.com/paritytech/parity/pull/5386)
+- Fixing disappearing content. [#5399](https://github.com/paritytech/parity/pull/5399)
+- Snapshot chunks packed by size [#5318](https://github.com/paritytech/parity/pull/5318)
+- APIs wildcards and simple arithmetic. [#5402](https://github.com/paritytech/parity/pull/5402)
+- Fixing compilation without dapps. [#5410](https://github.com/paritytech/parity/pull/5410)
+- Don't use port 8080 anymore [#5397](https://github.com/paritytech/parity/pull/5397)
+- Quick'n'dirty CLI for the light client [#5002](https://github.com/paritytech/parity/pull/5002)
+- set gas limit before proving transactions [#5401](https://github.com/paritytech/parity/pull/5401)
+- Public node: perf and fixes [#5390](https://github.com/paritytech/parity/pull/5390)
+- Straight download path in the readme [#5393](https://github.com/paritytech/parity/pull/5393)
+- On-chain ACL checker for secretstore [#5015](https://github.com/paritytech/parity/pull/5015)
+- Allow empty-encoded values from QR encoding [#5385](https://github.com/paritytech/parity/pull/5385)
+- Update npm build for new inclusions [#5381](https://github.com/paritytech/parity/pull/5381)
+- Fix for Ubuntu Dockerfile [#5356](https://github.com/paritytech/parity/pull/5356)
+- Secretstore over network [#4974](https://github.com/paritytech/parity/pull/4974)
+- Dapps and RPC server merge [#5365](https://github.com/paritytech/parity/pull/5365)
+- trigger js build release [#5379](https://github.com/paritytech/parity/pull/5379)
+- Update expanse json with fork at block 600000 [#5351](https://github.com/paritytech/parity/pull/5351)
+- Futures-based native wrappers for contract ABIs [#5341](https://github.com/paritytech/parity/pull/5341)
+- Kovan warp sync fixed [#5337](https://github.com/paritytech/parity/pull/5337)
+- Aura eip155 validation transition [#5362](https://github.com/paritytech/parity/pull/5362)
+- Shared wordlist for brain wallets [#5331](https://github.com/paritytech/parity/pull/5331)
+- Allow signing via Qr [#4881](https://github.com/paritytech/parity/pull/4881)
+- Allow entry of url or hash for DappReg meta [#5360](https://github.com/paritytech/parity/pull/5360)
+- Adjust tx overlay colours [#5353](https://github.com/paritytech/parity/pull/5353)
+- Add ability to disallow API subscriptions [#5366](https://github.com/paritytech/parity/pull/5366)
+- EIP-213 (bn128 curve operations) [#4999](https://github.com/paritytech/parity/pull/4999)
+- Fix analize output file name [#5357](https://github.com/paritytech/parity/pull/5357)
+- Add default eip155 validation [#5346](https://github.com/paritytech/parity/pull/5346)
+- Add new seed nodes for Classic chain [#5345](https://github.com/paritytech/parity/pull/5345)
+- Shared wordlist for frontend [#5336](https://github.com/paritytech/parity/pull/5336)
+- fix rpc tests [#5338](https://github.com/paritytech/parity/pull/5338)
+- Public node with accounts and signing in Frontend [#5304](https://github.com/paritytech/parity/pull/5304)
+- Rename Status/Status -> Status/NodeStatus [#5332](https://github.com/paritytech/parity/pull/5332)
+- Updating paths to repos. [#5330](https://github.com/paritytech/parity/pull/5330)
+- Separate status for canceled local transactions. [#5319](https://github.com/paritytech/parity/pull/5319)
+- Cleanup the Status View [#5317](https://github.com/paritytech/parity/pull/5317)
+- Update UI minimised requests [#5324](https://github.com/paritytech/parity/pull/5324)
+- Order signer transactions FIFO [#5321](https://github.com/paritytech/parity/pull/5321)
+- updating dependencies [#5028](https://github.com/paritytech/parity/pull/5028)
+- Minimise transactions progress [#4942](https://github.com/paritytech/parity/pull/4942)
+- Fix eth_sign showing as wallet account [#5309](https://github.com/paritytech/parity/pull/5309)
+- Ropsten revival [#5302](https://github.com/paritytech/parity/pull/5302)
+- Strict validation transitions [#4988](https://github.com/paritytech/parity/pull/4988)
+- Fix default list sorting [#5303](https://github.com/paritytech/parity/pull/5303)
+- Use unique owners for multisig wallets [#5298](https://github.com/paritytech/parity/pull/5298)
+- Copy all existing i18n strings into zh (as-is translation aid) [#5305](https://github.com/paritytech/parity/pull/5305)
+- Fix booleans in Typedinput [#5295](https://github.com/paritytech/parity/pull/5295)
+- node kind RPC [#5025](https://github.com/paritytech/parity/pull/5025)
+- Fix the use of MobX in playground [#5294](https://github.com/paritytech/parity/pull/5294)
+- Fine grained snapshot chunking [#5019](https://github.com/paritytech/parity/pull/5019)
+- Add lint:i18n to find missing & extra keys [#5290](https://github.com/paritytech/parity/pull/5290)
+- Scaffolding for zh translations, including first-round by @btceth [#5289](https://github.com/paritytech/parity/pull/5289)
+- JS package bumps [#5287](https://github.com/paritytech/parity/pull/5287)
+- Auto-extract new i18n strings (update) [#5288](https://github.com/paritytech/parity/pull/5288)
+- eip100b [#5027](https://github.com/paritytech/parity/pull/5027)
+- Set earliest era in snapshot restoration [#5021](https://github.com/paritytech/parity/pull/5021)
+- Avoid clogging up tmp when updater dir has bad permissions. [#5024](https://github.com/paritytech/parity/pull/5024)
+- Resilient warp sync [#5018](https://github.com/paritytech/parity/pull/5018)
+- Create webpack analysis files (size) [#5009](https://github.com/paritytech/parity/pull/5009)
+- Dispatch an open event on drag of Parity Bar [#4987](https://github.com/paritytech/parity/pull/4987)
+- Various installer and tray apps fixes [#4970](https://github.com/paritytech/parity/pull/4970)
+- Export account RPC [#4967](https://github.com/paritytech/parity/pull/4967)
+- Switching ValidatorSet [#4961](https://github.com/paritytech/parity/pull/4961)
+- Implement PIP messages, request builder, and handlers [#4945](https://github.com/paritytech/parity/pull/4945)
+- auto lint [#5003](https://github.com/paritytech/parity/pull/5003)
+- Fix FireFox overflows [#5000](https://github.com/paritytech/parity/pull/5000)
+- Show busy indicator, focus first field in password change [#4997](https://github.com/paritytech/parity/pull/4997)
+- Consistent store naming in the Signer components [#4996](https://github.com/paritytech/parity/pull/4996)
+- second (and last) part of rlp refactor [#4901](https://github.com/paritytech/parity/pull/4901)
+- Double click to select account creation type [#4986](https://github.com/paritytech/parity/pull/4986)
+- Fixes to the Registry dapp [#4984](https://github.com/paritytech/parity/pull/4984)
+- Extend api.util [#4979](https://github.com/paritytech/parity/pull/4979)
+- Updating JSON-RPC crates [#4934](https://github.com/paritytech/parity/pull/4934)
+- splitting part of util into smaller crates [#4956](https://github.com/paritytech/parity/pull/4956)
+- Updating syntex et al [#4983](https://github.com/paritytech/parity/pull/4983)
+- EIP198 and built-in activation [#4926](https://github.com/paritytech/parity/pull/4926)
+- Fix MethodDecoding for Arrays [#4977](https://github.com/paritytech/parity/pull/4977)
+- Try to fix WS race condition connection [#4976](https://github.com/paritytech/parity/pull/4976)
+- eth_sign where account === undefined [#4964](https://github.com/paritytech/parity/pull/4964)
+- Fix references to api outside of `parity.js` [#4981](https://github.com/paritytech/parity/pull/4981)
+- Fix Password Dialog form overflow [#4968](https://github.com/paritytech/parity/pull/4968)
+- Changing Mutex into RwLock for transaction queue [#4951](https://github.com/paritytech/parity/pull/4951)
+- Disable max seal period for external sealing [#4927](https://github.com/paritytech/parity/pull/4927)
+- Attach hardware wallets already in addressbook [#4912](https://github.com/paritytech/parity/pull/4912)
+- rlp serialization refactor [#4873](https://github.com/paritytech/parity/pull/4873)
+- Bump nanomsg [#4965](https://github.com/paritytech/parity/pull/4965)
+- Fixed multi-chunk ledger transactions on windows [#4960](https://github.com/paritytech/parity/pull/4960)
+- Fix outputs in Contract Constant Queries [#4953](https://github.com/paritytech/parity/pull/4953)
+- systemd: Start parity after network.target [#4952](https://github.com/paritytech/parity/pull/4952)
+- Remove transaction RPC [#4949](https://github.com/paritytech/parity/pull/4949)
+- Swap out ethcore.io url for parity.io [#4947](https://github.com/paritytech/parity/pull/4947)
+- Don't remove confirmed requests to early. [#4933](https://github.com/paritytech/parity/pull/4933)
+- Ensure sealing work enabled in miner once subscribers added [#4930](https://github.com/paritytech/parity/pull/4930)
+- Add z-index to small modals as well [#4923](https://github.com/paritytech/parity/pull/4923)
+- Bump nanomsg [#4946](https://github.com/paritytech/parity/pull/4946)
+- Bumping multihash and libc [#4943](https://github.com/paritytech/parity/pull/4943)
+- Edit ETH value, gas and gas price in Contract Deployment [#4919](https://github.com/paritytech/parity/pull/4919)
+- Add ability to configure Secure API [#4922](https://github.com/paritytech/parity/pull/4922)
+- Add Token image from URL [#4916](https://github.com/paritytech/parity/pull/4916)
+- Use the registry fee in Token Deployment dapp [#4915](https://github.com/paritytech/parity/pull/4915)
+- Add reseal max period [#4903](https://github.com/paritytech/parity/pull/4903)
+- Detect rust compiler version in Parity build script, closes 4742 [#4907](https://github.com/paritytech/parity/pull/4907)
+- Add Vaults logic to First Run [#4914](https://github.com/paritytech/parity/pull/4914)
+- Updated gcc and rayon crates to remove outdated num_cpus dependency [#4909](https://github.com/paritytech/parity/pull/4909)
+- Renaming evm binary to avoid conflicts. [#4899](https://github.com/paritytech/parity/pull/4899)
+- Better error handling for traces RPC [#4849](https://github.com/paritytech/parity/pull/4849)
+- Safari SectionList fix [#4895](https://github.com/paritytech/parity/pull/4895)
+- Safari Dialog scrolling fix [#4893](https://github.com/paritytech/parity/pull/4893)
+- Spelling :) [#4900](https://github.com/paritytech/parity/pull/4900)
+- Additional kovan params [#4892](https://github.com/paritytech/parity/pull/4892)
+- trigger js-precompiled build [#4898](https://github.com/paritytech/parity/pull/4898)
+- Recalculate receipt roots in close_and_lock [#4884](https://github.com/paritytech/parity/pull/4884)
+- Reload UI on network switch [#4864](https://github.com/paritytech/parity/pull/4864)
+- Update parity-ui-precompiled with branch [#4850](https://github.com/paritytech/parity/pull/4850)
+- OSX Installer is no longer experimental [#4882](https://github.com/paritytech/parity/pull/4882)
+- Chain-selection from UI [#4859](https://github.com/paritytech/parity/pull/4859)
+- removed redundant (and unused) FromJson trait [#4871](https://github.com/paritytech/parity/pull/4871)
+- fix typos and grammar [#4880](https://github.com/paritytech/parity/pull/4880)
+- Remove old experimental remote-db code [#4872](https://github.com/paritytech/parity/pull/4872)
+- removed redundant FixedHash trait, fixes [#4029](https://github.com/paritytech/parity/issues/4029) [#4866](https://github.com/paritytech/parity/pull/4866)
+- Reference JSON-RPC more changes-friendly [#4870](https://github.com/paritytech/parity/pull/4870)
+- Better handling of Solidity compliation [#4860](https://github.com/paritytech/parity/pull/4860)
+- Go through contract links in Transaction List display [#4863](https://github.com/paritytech/parity/pull/4863)
+- Fix Gas Price Selector Tooltips [#4865](https://github.com/paritytech/parity/pull/4865)
+- Fix auto-updater [#4867](https://github.com/paritytech/parity/pull/4867)
+- Make the UI work offline [#4861](https://github.com/paritytech/parity/pull/4861)
+- Subscribe to accounts info in Signer / ParityBar [#4856](https://github.com/paritytech/parity/pull/4856)
+- Don't link libsnappy explicitly [#4841](https://github.com/paritytech/parity/pull/4841)
+- Fix paste in Inputs [#4854](https://github.com/paritytech/parity/pull/4854)
+- Extract i18n from shared UI components [#4834](https://github.com/paritytech/parity/pull/4834)
+- Fix paste in Inputs [#4844](https://github.com/paritytech/parity/pull/4844)
+- Pull contract deployment title from available steps [#4848](https://github.com/paritytech/parity/pull/4848)
+- Supress USB error message [#4839](https://github.com/paritytech/parity/pull/4839)
+- Fix getTransactionCount in --geth mode [#4837](https://github.com/paritytech/parity/pull/4837)
+- CI: test coverage (for core and js) [#4832](https://github.com/paritytech/parity/pull/4832)
+- Lowering threshold for transactions above gas limit [#4831](https://github.com/paritytech/parity/pull/4831)
+- Fix TxViewer when no `to` (contract deployment) [#4847](https://github.com/paritytech/parity/pull/4847)
+- Fix method decoding [#4845](https://github.com/paritytech/parity/pull/4845)
+- Add React Hot Reload to dapps + TokenDeploy fix [#4846](https://github.com/paritytech/parity/pull/4846)
+- Dapps show multiple times in some cases [#4843](https://github.com/paritytech/parity/pull/4843)
+- Fixes to the Registry dapp [#4838](https://github.com/paritytech/parity/pull/4838)
+- Show token icons on list summary pages [#4826](https://github.com/paritytech/parity/pull/4826)
+- Calibrate step before rejection [#4800](https://github.com/paritytech/parity/pull/4800)
+- Add replay protection [#4808](https://github.com/paritytech/parity/pull/4808)
+- Better icon on windows [#4804](https://github.com/paritytech/parity/pull/4804)
+- Better logic for contract deployments detection [#4821](https://github.com/paritytech/parity/pull/4821)
+- Fix wrong default values for contract queries inputs [#4819](https://github.com/paritytech/parity/pull/4819)
+- Adjust selection colours/display [#4811](https://github.com/paritytech/parity/pull/4811)
+- Update the Wallet Library Registry key [#4817](https://github.com/paritytech/parity/pull/4817)
+- Update Wallet to new Wallet Code [#4805](https://github.com/paritytech/parity/pull/4805)
diff --git a/docs/CHANGELOG-1.8.md b/docs/CHANGELOG-1.8.md
new file mode 100644
index 0000000000000000000000000000000000000000..67d6d0a89b821208de18fab62537cace382b0c62
--- /dev/null
+++ b/docs/CHANGELOG-1.8.md
@@ -0,0 +1,578 @@
+Note: Parity 1.8 reached End-of-Life on 2018-03-22 (EOL).
+
+## Parity [v1.8.11](https://github.com/paritytech/parity/releases/tag/v1.8.11) (2018-03-01)
+
+Parity 1.8.11 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Bump stable to 1.8.11 ([#8010](https://github.com/paritytech/parity/pull/8010))
+- Stable Backports ([#8008](https://github.com/paritytech/parity/pull/8008))
+  - Reject too large packets in snapshot sync. ([#7977](https://github.com/paritytech/parity/pull/7977))
+  - Increase max download limit to 128MB ([#7965](https://github.com/paritytech/parity/pull/7965))
+  - Calculate proper keccak256/sha3 using parity. ([#7953](https://github.com/paritytech/parity/pull/7953))
+  - Bump WebSockets ([#7952](https://github.com/paritytech/parity/pull/7952))
+
+## Parity [v1.8.10](https://github.com/paritytech/parity/releases/tag/v1.8.10) (2018-02-20)
+
+Parity 1.8.10 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Bump react-qr-reader ([#7941)](https://github.com/paritytech/parity/pull/7941))
+  - Bump react-qr-reader
+  - Explicit add webrtc-adapter, non-napa qrcode-generator
+- Fix feature=final ([#7914)](https://github.com/paritytech/parity/pull/7914))
+- Fix snap build stable ([#7897)](https://github.com/paritytech/parity/pull/7897))
+- Backport core PRs to stable ([#7892)](https://github.com/paritytech/parity/pull/7892))
+  - Update back-references more aggressively after answering from cache ([#7578)](https://github.com/paritytech/parity/pull/7578))
+  - Store updater metadata in a single place ([#7832)](https://github.com/paritytech/parity/pull/7832))
+  - Flush keyfiles. Resolves [#7632](https://github.com/paritytech/parity/issues/7632) ([#7868)](https://github.com/paritytech/parity/pull/7868))
+  - Fix wallet import ([#7873)](https://github.com/paritytech/parity/pull/7873))
+- Backport Master CI PRs to Stable ([#7889)](https://github.com/paritytech/parity/pull/7889))
+  - Add binary identifiers and sha256sum to builds ([#7830)](https://github.com/paritytech/parity/pull/7830))
+  - Fix checksums and auto-update push ([#7846)](https://github.com/paritytech/parity/pull/7846))
+  - Update gitlab-build.sh ([#7855)](https://github.com/paritytech/parity/pull/7855))
+  - Fix installer binary names for macos and windows ([#7881)](https://github.com/paritytech/parity/pull/7881))
+  - Update gitlab-test.sh ([#7883)](https://github.com/paritytech/parity/pull/7883))
+  - Fix snapcraft nightly ([#7884)](https://github.com/paritytech/parity/pull/7884))
+  - Bump stable to 1.8.10
+  - Make track stable
+
+## Parity [v1.8.9](https://github.com/paritytech/parity/releases/tag/v1.8.9) (2018-02-02)
+
+Parity 1.8.9 is a bug-fix release to improve performance and stability. It restores ERC-20 token balances and adds additional bootnodes for the Ropsten test network.
+
+The full list of included changes:
+
+- Update gitlab-build.sh
+- Backports stable ([#7779](https://github.com/paritytech/parity/pull/7779))
+  - Bump stable to 1.8.9
+  - Update ropsten.json ([#7776](https://github.com/paritytech/parity/pull/7776))
+- Fix tokenAddress reference ([#7777](https://github.com/paritytech/parity/pull/7777))
+- Snapcraft push stable
+
+## Parity [v1.8.8](https://github.com/paritytech/parity/releases/tag/v1.8.8) (2018-02-01)
+
+Parity 1.8.8 is a bug-fix release to improve performance and stability. It restores ERC-20 token balances, improves networking, fixes database corruptions on client shutdown, and fixes issues with the `--password` command-line flag. Happy syncing!
+
+The full list of included changes:
+
+- Gitlab stable ([#7768](https://github.com/paritytech/parity/pull/7768))
+  - Fix snapcraft build for stable
+  - Initial support push snap packages to snapcraft.io
+  - Edge-devel
+- Snapcraft push ans fix build ([#7767](https://github.com/paritytech/parity/pull/7767))
+  - Fix snapcraft build for stable
+  - Initial support push snap packages to snapcraft.io
+  - Edge-devel
+- Remove snapcraft.yml from scripts
+- Resolve conflicts
+- Token filter balances (throttle) ([#7755](https://github.com/paritytech/parity/pull/7755))
+- Fix snapcraft build (stable) ([#7763](https://github.com/paritytech/parity/pull/7763))
+  - Fix snapcraft build for stable
+  - Fix snapcraft build (stable)
+- [Stable] Backports ([#7758](https://github.com/paritytech/parity/pull/7758))
+  - Filter-out nodes.json ([#7716](https://github.com/paritytech/parity/pull/7716))
+    - Filter-out nodes.json
+    - Network: sort node table nodes by failure ratio
+    - Network: fix node table tests
+    - Network: fit node failure percentage into buckets of 5%
+    - Network: consider number of attempts in sorting of node table
+    - Network: fix node table grumbles
+  - Fix client not being dropped on shutdown ([#7695](https://github.com/paritytech/parity/pull/7695))
+    - Parity: wait for client to drop on shutdown
+    - Parity: fix grumbles in shutdown wait
+    - Parity: increase shutdown timeouts
+  - Wrap --help output to 120 characters ([#7626](https://github.com/paritytech/parity/pull/7626))
+    - Update Clap dependency and remove workarounds
+    - WIP
+    - Remove line breaks in help messages for now
+    - Multiple values can only be separated by commas (closes [#7428](https://github.com/paritytech/parity/issues/7428))
+    - Grumbles; refactor repeating code; add constant
+    - Use a single Wrapper rather than allocate a new one for each call
+    - Wrap --help to 120 characters rather than 100 characters
+- Use explicit branch name in push ([#7757](https://github.com/paritytech/parity/pull/7757))
+- Bump stable to 1.8.8 ([#7752](https://github.com/paritytech/parity/pull/7752))
+- Fix js-release in stable ([#7682](https://github.com/paritytech/parity/pull/7682))
+- Update Info.plist
+- Fix conditions in gitlab-test ([#7675](https://github.com/paritytech/parity/pull/7675))
+- Remove cargo cache
+
+## Parity [v1.8.7](https://github.com/paritytech/parity/releases/tag/v1.8.7) (2018-01-24)
+
+Parity 1.8.7 is the first stable release of the 1.8 channel. It includes various bug and stability fixes. Users on Kovan or other Aura-based networks are advised to upgrade as this release fixes an issue introduced with 1.8.6 and 1.7.12 that causes Proof-of-Authority nodes to stop synchronizing the chain.
+
+The full list of included changes:
+
+- Bump stable version ([#7665](https://github.com/paritytech/parity/pull/7665))
+  - Bump stable to 1.8.7
+- Backports to stable ([#7661](https://github.com/paritytech/parity/pull/7661))
+  - Fixed delegatecall's from/to ([#7568](https://github.com/paritytech/parity/pull/7568))
+    - Fixed delegatecall's from/to, closes [#7166](https://github.com/paritytech/parity/issues/7166)
+    - Added tests for delegatecall traces, [#7167](https://github.com/paritytech/parity/issues/7167)
+  - Fix Temporarily Invalid blocks handling ([#7613](https://github.com/paritytech/parity/pull/7613))
+    - Handle temporarily invalid blocks in sync.
+    - Fix tests.
+  - Improve handling of RocksDB corruption ([#7630](https://github.com/paritytech/parity/pull/7630))
+    - Kvdb-rocksdb: update rust-rocksdb version
+    - Kvdb-rocksdb: mark corruptions and attempt repair on db open
+    - Kvdb-rocksdb: better corruption detection on open
+    - Kvdb-rocksdb: add corruption_file_name const
+    - Kvdb-rocksdb: rename mark_corruption to check_for_corruption
+- Add docker build for stable and cargo cache ([#7672](https://github.com/paritytech/parity/pull/7672))
+- Fix snapcraft build for stable ([#7669](https://github.com/paritytech/parity/pull/7669))
+- Update .gitlab-ci.yml ([#7599](https://github.com/paritytech/parity/pull/7599))
+  - Fix cache:key
+- Make 1.8 stable ([#7532](https://github.com/paritytech/parity/pull/7532))
+  - Bump 1.8 to stable
+  - Make js-precompiled stable
+
+## Parity [v1.8.6](https://github.com/paritytech/parity/releases/tag/v1.8.6) (2018-01-10)
+
+Parity 1.8.6 fixes a critical issue with the database eventually filling up user's disks. Upgrading is highly recommended as it will significantly improve your user experience. As a bonus, this release should enable users with slower hard-disk drives to catch up with the latest block again. Also, warp-sync performance was significantly improved. Please note, that the initial database compaction after upgrading might temporarily reduce the node's performance.
+
+In addition to our gas price histogram, this version now allows you to dynamically set the default gas price as percentile from the last 100 blocks (it defaults to median: `50`).
+
+    --gas-price-percentile=[PCT]        Set PCT percentile gas price value from
+                                        last 100 blocks as default gas price
+                                        when sending transactions.
+
+Last but not least, this release also fixes consensus issues with the Expanse chain enabling Byzantium. If you run Parity configured for Expanse, you might have to resync your chain after the upgrade.
+
+The full list of included changes:
+
+- RocksDB fix ([#7508](https://github.com/paritytech/parity/pull/7508))
+  - Kvdb: update rust-rocksdb version
+- Backports to beta ([#7434](https://github.com/paritytech/parity/pull/7434))
+  - Wait for future blocks in AuRa ([#7368](https://github.com/paritytech/parity/pull/7368))
+    - Mark future blocks as temporarily invalid.
+    - Don't check max.
+  - Fix tracing failed calls. ([#7412](https://github.com/paritytech/parity/pull/7412))
+  - Problem: sending any Whisper message fails ([#7421](https://github.com/paritytech/parity/pull/7421))
+  - Strict config parsing ([#7433](https://github.com/paritytech/parity/pull/7433))
+  - Problem: AuRa's unsafeties around step duration ([#7282](https://github.com/paritytech/parity/pull/7282))
+  - Remove expanse chain ([#7437](https://github.com/paritytech/parity/pull/7437))
+    - Remove expanse from available chains
+    - Remove all EXP references from old wallet
+    - Fix tests
+  - Remove expanse chain ([#7437](https://github.com/paritytech/parity/pull/7437))
+  - Expanse Byzantium update w/ correct metropolis difficulty increment divisor ([#7463](https://github.com/paritytech/parity/pull/7463))
+    - Byzantium Update for Expanse
+    - Expip2 changes - update duration limit
+    - Fix missing EXPIP-2 fields
+    - Format numbers as hex
+    - Fix compilation errors
+    - Group expanse chain spec fields together
+    - Set metropolisDifficultyIncrementDivisor for Expanse
+    - Revert #7437
+    - Add Expanse block 900_000 hash checkpoint
+  - Advance AuRa step as far as we can and prevent invalid blocks. ([#7451](https://github.com/paritytech/parity/pull/7451))
+    - Advance AuRa step as far as we can.
+    - Wait for future blocks.
+  - Fixed panic when io is not available for export block, closes [#7486](https://github.com/paritytech/parity/issues/7486) ([#7495](https://github.com/paritytech/parity/pull/7495))
+  - Update Parity Mainnet Bootnodes ([#7476](https://github.com/paritytech/parity/pull/7476))
+    - Replace the Azure HDD bootnodes with the new ones :)
+  - Expose default gas price percentile configuration in CLI ([#7497](https://github.com/paritytech/parity/pull/7497))
+    - Expose gas price percentile.
+    - Fix light eth_call.
+    - Fix gas_price in light client
+- Backport nonces reservations ([#7439](https://github.com/paritytech/parity/pull/7439))
+  - Reserve nonces for signing ([#6834](https://github.com/paritytech/parity/pull/6834))
+    - Nonce future - reserve and dispatch
+    - Single thread nonce tests
+    - Track status of reserved nonces.
+    - Initialization of nonce reservations.
+    - Prospective Signer
+    - Fix cli tests.
+  - Fix nonce reservation ([#7025](https://github.com/paritytech/parity/pull/7025))
+    - Use nonce reservation per address
+    - Create hashmap in RPC Apis
+    - Garbage collect hashmap entries.
+    - HashMap::retain
+- Bump beta to 1.8.6 ([#7442](https://github.com/paritytech/parity/pull/7442))
+- KVDB backports ([#7438](https://github.com/paritytech/parity/pull/7438))
+  - Separated kvdb into 3 crates: kvdb, kvdb-memorydb && kvdb-rocksdb ([#6720](https://github.com/paritytech/parity/pull/6720))
+    - Separated kvdb into 3 crates: kvdb, kvdb-memorydb && kvdb-rocksdb, ref [#6693](https://github.com/paritytech/parity/issues/6693)
+      - Fixed kvdb-memorydb && kvdb-rocksdb authors
+      - Fixed wrong kvdb import in json_tests
+    - Util tests use kvdb_memorydb instead of kvdb_rocksdb, closes [#6739](https://github.com/paritytech/parity/issues/6739)
+      - Renamed kvdb_memorydb::in_memory -> kvdb_memorydb::create
+      - Docs
+      - Removed redundant mut from kvdb-memorydb
+  - Upgrade to RocksDB 5.8.8 and tune settings to reduce space amplification ([#7348](https://github.com/paritytech/parity/pull/7348))
+    - kvdb-rocksdb: update to RocksDB 5.8.8
+    - kvdb-rocksdb: tune RocksDB options
+      - Switch to level-style compaction
+      - Increase default block size (16K), and use bigger blocks for HDDs (64K)
+      - Increase default file size base (64MB SSDs, 256MB HDDs)
+      - Create a single block cache shared across all column families
+      - Tune compaction settings using RocksDB helper functions, taking into account
+      - Memory budget spread across all columns
+      - Configure backgrounds jobs based on the number of CPUs
+      - Set some default recommended settings
+    - ethcore: remove unused config blockchain.db_cache_size
+    - parity: increase default value for db_cache_size
+    - kvdb-rocksdb: enable compression on all levels
+    - kvdb-rocksdb: set global db_write_bufer_size
+    - kvdb-rocksdb: reduce db_write_bufer_size to force earlier flushing
+    - kvdb-rocksdb: use master branch for rust-rocksdb dependency
+
+## Parity [v1.8.5](https://github.com/paritytech/parity/releases/tag/v1.8.5) (2017-12-29)
+
+Parity 1.8.5 changes the default behavior of JSON-RPC CORS setting, detects same-key engine signers in Aura networks, and updates bootnodes for the Kovan and Foundation networks.
+
+Note: The default value of `--jsonrpc-cors` option has been altered to disallow (potentially malicious) websites from accessing the low-sensitivity RPCs (viewing exposed accounts, proposing transactions for signing). Currently domains need to be whitelisted manually. To bring back previous behaviour run with `--jsonrpc-cors all` or `--jsonrpc-cors http://example.com`.
+
+The full list of included changes:
+
+- Beta Backports ([#7297](https://github.com/paritytech/parity/pull/7297))
+  - New warp enodes ([#7287](https://github.com/paritytech/parity/pull/7287))
+    - New warp enodes
+    - Added one more warp enode; replaced spaces with tabs
+    - Bump beta to 1.8.5
+    - Update kovan boot nodes
+  - Detect different node, same-key signing in aura ([#7245](https://github.com/paritytech/parity/pull/7245))
+    - Detect different node, same-key signing in aura
+    - Reduce scope of warning
+    - Fix Cargo.lock
+    - Updating mainnet bootnodes.
+  - Update bootnodes ([#7363](https://github.com/paritytech/parity/pull/7363))
+    - Updating mainnet bootnodes.
+    - Add additional parity-beta bootnodes.
+    - Restore old parity bootnodes and update foudation bootnodes
+- Fix default CORS. ([#7388](https://github.com/paritytech/parity/pull/7388))
+
+## Parity [v1.8.4](https://github.com/paritytech/parity/releases/tag/v1.8.4) (2017-12-12)
+
+Parity 1.8.4 applies fixes for Proof-of-Authority networks and schedules the Kovan-Byzantium hard-fork.
+
+- The Kovan testnet will fork on block `5067000` at `Thu Dec 14 2017 05:40:03 UTC`.
+  - This enables Byzantium features on Kovan.
+  - This disables uncles on Kovan for stability reasons.
+- Proof-of-Authority networks are advised to set `maximumUncleCount` to 0 in a future `maximumUncleCountTransition` for stability reasons.
+  - See the [Kovan chain spec](https://github.com/paritytech/parity/blob/master/ethcore/res/ethereum/kovan.json) for an example.
+  - New PoA networks created with Parity will have this feature enabled by default.
+
+Furthermore, this release includes the ECIP-1039 Monetary policy rounding specification for Ethereum Classic, reduces the maximum Ethash-block timestamp drift to 15 seconds, and fixes various bugs for WASM and the RPC APIs.
+
+The full list of included changes:
+
+- Beta Backports and HF block update ([#7244](https://github.com/paritytech/parity/pull/7244))
+  - Reduce max block timestamp drift to 15 seconds ([#7240](https://github.com/paritytech/parity/pull/7240))
+    - Add test for block timestamp validation within allowed drift
+  - Update kovan HF block number.
+- Beta Kovan HF ([#7234](https://github.com/paritytech/parity/pull/7234))
+  - Kovan HF.
+  - Bump version.
+  - Fix aura difficulty race ([#7198](https://github.com/paritytech/parity/pull/7198))
+    - Fix test key
+    - Extract out score calculation
+    - Fix build
+  - Update kovan HF block number.
+  - Add missing byzantium builtins.
+  - Bump installers versions.
+  - Increase allowed time drift to 10s. ([#7238](https://github.com/paritytech/parity/pull/7238))
+- Beta Backports ([#7197](https://github.com/paritytech/parity/pull/7197))
+  - Maximum uncle count transition ([#7196](https://github.com/paritytech/parity/pull/7196))
+    - Enable delayed maximum_uncle_count activation.
+    - Fix tests.
+    - Defer kovan HF.
+  - Disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006))
+  - Escape inifinite loop in estimte_gas ([#7075](https://github.com/paritytech/parity/pull/7075))
+  - ECIP-1039: Monetary policy rounding specification ([#7067](https://github.com/paritytech/parity/pull/7067))
+  - WASM Remove blockhash error ([#7121](https://github.com/paritytech/parity/pull/7121))
+    - Remove blockhash error
+    - Update tests.
+  - WASM storage_read and storage_write don't return anything ([#7110](https://github.com/paritytech/parity/pull/7110))
+  - WASM parse payload from panics ([#7097](https://github.com/paritytech/parity/pull/7097))
+  - Fix no-default-features. ([#7096](https://github.com/paritytech/parity/pull/7096))
+
+## Parity [v1.8.3](https://github.com/paritytech/parity/releases/tag/v1.8.3) (2017-11-15)
+
+Parity 1.8.3 contains several bug-fixes and removes the ability to deploy built-in multi-signature wallets.
+
+The full list of included changes:
+
+- Backports to beta ([#7043](https://github.com/paritytech/parity/pull/7043))
+  - pwasm-std update ([#7018](https://github.com/paritytech/parity/pull/7018))
+  - Version 1.8.3
+  - Make CLI arguments parsing more backwards compatible ([#7004](https://github.com/paritytech/parity/pull/7004))
+  - Skip nonce check for gas estimation ([#6997](https://github.com/paritytech/parity/pull/6997))
+  - Events in WASM runtime ([#6967](https://github.com/paritytech/parity/pull/6967))
+  - Return decoded seal fields. ([#6932](https://github.com/paritytech/parity/pull/6932))
+  - Fix serialization of status in transaction receipts. ([#6926](https://github.com/paritytech/parity/pull/6926))
+  - Windows fixes ([#6921](https://github.com/paritytech/parity/pull/6921))
+- Disallow built-in multi-sig deploy (only watch) ([#7014](https://github.com/paritytech/parity/pull/7014))
+- Add hint in ActionParams for splitting code/data ([#6968](https://github.com/paritytech/parity/pull/6968))
+  - Action params and embedded params handling
+  - Fix name-spaces
+
+## Parity [v1.8.2](https://github.com/paritytech/parity/releases/tag/v1.8.2) (2017-10-26)
+
+Parity 1.8.2 fixes an important potential consensus issue and a few additional minor issues:
+
+- `blockNumber` transaction field is now returned correctly in RPC calls.
+- Possible crash when `--force-sealing` option is used.
+
+The full list of included changes:
+
+- Beta Backports ([#6891](https://github.com/paritytech/parity/pull/6891))
+  - Bump to v1.8.2
+  - Refactor static context check in CREATE. ([#6886](https://github.com/paritytech/parity/pull/6886))
+    - Refactor static context check in CREATE.
+    - Fix wasm.
+  - Fix serialization of non-localized transactions ([#6868](https://github.com/paritytech/parity/pull/6868))
+    - Fix serialization of non-localized transactions.
+    - Return proper SignedTransactions representation.
+  - Allow force sealing and reseal=0 for non-dev chains. ([#6878](https://github.com/paritytech/parity/pull/6878))
+
+## Parity [v1.8.1](https://github.com/paritytech/parity/releases/tag/v1.8.1) (2017-10-20)
+
+Parity 1.8.1 fixes several bugs with token balances, tweaks snapshot-sync, improves the performance of nodes with huge amounts of accounts and changes the Trezor account derivation path.
+
+**Important Note**: The **Trezor** account derivation path was changed in this release ([#6815](https://github.com/paritytech/parity/pull/6815)) to always use the first account (`m/44'/60'/0'/0/0` instead of `m/44'/60'/0'/0`). This way we enable compatibility with other Ethereum wallets supporting Trezor hardware-wallets. However, **action is required** before upgrading, if you have funds on your Parity Trezor wallet. If you already upgraded to 1.8.1, please downgrade to 1.8.0 first to recover the funds with the following steps:
+
+1. Make sure you have 1.8.0-beta and your Trezor plugged in.
+2. Create a new standard Parity account. Make sure you have backups of the recovery phrase and don't forget the password.
+3. Move your funds from the Trezor hardware-wallet account to the freshly generated Parity account.
+4. Upgrade to 1.8.1-beta and plug in your Trezor.
+5. Move your funds from your Parity account to the new Trezor account.
+6. Keep using Parity as normal.
+
+If you don't want to downgrade or move your funds off your Trezor-device, you can also use the official Trezor application or other wallets allowing to select the derivation path to access the funds.
+
+The full list of included changes:
+
+- Add ECIP1017 to Morden config ([#6845](https://github.com/paritytech/parity/pull/6845))
+- Ethstore optimizations ([#6844](https://github.com/paritytech/parity/pull/6844))
+- Bumb to v1.8.1 ([#6843](https://github.com/paritytech/parity/pull/6843))
+- Backport ([#6837](https://github.com/paritytech/parity/pull/6837))
+  - Tweaked snapshot sync threshold ([#6829](https://github.com/paritytech/parity/pull/6829))
+  - Change keypath derivation logic ([#6815](https://github.com/paritytech/parity/pull/6815))
+- Refresh cached tokens based on registry info & random balances ([#6824](https://github.com/paritytech/parity/pull/6824))
+  - Refresh cached tokens based on registry info & random balances ([#6818](https://github.com/paritytech/parity/pull/6818))
+  - Don't display errored token images
+
+## Parity [v1.8.0](https://github.com/paritytech/parity/releases/tag/v1.8.0) (2017-10-15)
+
+We are happy to announce our newest Parity 1.8 release. Among others, it enables the following features:
+
+- Full Whisper v6 integration
+- Trezor hardware-wallet support
+- WASM contract support
+- PICOPS KYC-certified accounts and vouching for community-dapps
+- Light client compatibility for Proof-of-Authority networks
+- Transaction permissioning and permissioned p2p-connections
+- Full Byzantium-fork compatibility
+- Full Musicoin MCIP-3 UBI-fork compatibility
+
+Further, users upgrading from 1.7 should acknowledge the following changes:
+
+- The chain-engine was further abstracted and chain-specs need to be upgraded. [#6134](https://github.com/paritytech/parity/pull/6134) [#6591](https://github.com/paritytech/parity/pull/6591)
+- `network_id` was renamed to `chain_id` where applicable. [#6345](https://github.com/paritytech/parity/pull/6345)
+- `trace_filter` RPC method now comes with pagination. [#6312](https://github.com/paritytech/parity/pull/6312)
+- Added tracing of rewards on closing blocks. [#6194](https://github.com/paritytech/parity/pull/6194)
+
+The full list of included changes:
+
+- Updated ethabi to fix auto-update ([#6771](https://github.com/paritytech/parity/pull/6771))
+- Fixed kovan chain validation ([#6760](https://github.com/paritytech/parity/pull/6760))
+  - Fixed kovan chain validation
+  - Fork detection
+  - Fixed typo
+- Bumped fork block number for auto-update ([#6755](https://github.com/paritytech/parity/pull/6755))
+- CLI: Reject invalid argument values rather than ignore them ([#6747](https://github.com/paritytech/parity/pull/6747))
+- Fixed modexp gas calculation overflow ([#6745](https://github.com/paritytech/parity/pull/6745))
+- Backport beta - Fixes Badges ([#6732](https://github.com/paritytech/parity/pull/6732))
+  - Fix badges not showing up ([#6730](https://github.com/paritytech/parity/pull/6730))
+  - Always fetch meta data first [badges]
+- Bump to v1.8.0 in beta
+- Fix tokens and badges ([#6725](https://github.com/paritytech/parity/pull/6725))
+  - Update new token fetching
+  - Working Certifications Monitoring
+  - Update on Certification / Revoke
+  - Fix none-fetched tokens value display
+  - Fix tests
+- Check vouch status on appId in addition to contentHash ([#6719](https://github.com/paritytech/parity/pull/6719))
+  - Check vouch status on appId in addition to contentHash
+  - Simplify var expansion
+- Prevent going offline when restoring or taking a snapshot [#6694](https://github.com/paritytech/parity/pull/6694)
+- Graceful exit when invalid CLI flags are passed (#6485) [#6711](https://github.com/paritytech/parity/pull/6711)
+- Fixed RETURNDATA out of bounds check [#6718](https://github.com/paritytech/parity/pull/6718)
+- Display vouched overlay on dapps [#6710](https://github.com/paritytech/parity/pull/6710)
+- Fix gas estimation if `from` is not provided. [#6714](https://github.com/paritytech/parity/pull/6714)
+- Emulate signer pubsub on public node [#6708](https://github.com/paritytech/parity/pull/6708)
+- Removes  dependency on rustc_serialize (#5988) [#6705](https://github.com/paritytech/parity/pull/6705)
+- Fixed potential modexp exp len overflow [#6686](https://github.com/paritytech/parity/pull/6686)
+- Fix asciiToHex for characters < 0x10 [#6702](https://github.com/paritytech/parity/pull/6702)
+- Fix address input [#6701](https://github.com/paritytech/parity/pull/6701)
+- Allow signer signing display of markdown [#6707](https://github.com/paritytech/parity/pull/6707)
+- Fixed build warnings [#6664](https://github.com/paritytech/parity/pull/6664)
+- Fix warp sync blockers detection [#6691](https://github.com/paritytech/parity/pull/6691)
+- Difficulty tests [#6687](https://github.com/paritytech/parity/pull/6687)
+- Separate migrations from util [#6690](https://github.com/paritytech/parity/pull/6690)
+- Changelog for 1.7.3 [#6678](https://github.com/paritytech/parity/pull/6678)
+- WASM gas schedule [#6638](https://github.com/paritytech/parity/pull/6638)
+- Fix wallet view [#6597](https://github.com/paritytech/parity/pull/6597)
+- Byzantium fork block number [#6660](https://github.com/paritytech/parity/pull/6660)
+- Fixed RETURNDATA size for built-ins [#6652](https://github.com/paritytech/parity/pull/6652)
+- Light Client: fetch transactions/receipts by transaction hash [#6641](https://github.com/paritytech/parity/pull/6641)
+- Add Musicoin and MCIP-3 UBI hardfork.  [#6621](https://github.com/paritytech/parity/pull/6621)
+- fix 1.8 backcompat: revert to manual encoding/decoding of transition proofs [#6665](https://github.com/paritytech/parity/pull/6665)
+- Tweaked block download timeouts (#6595) [#6655](https://github.com/paritytech/parity/pull/6655)
+- Renamed RPC receipt statusCode field to status [#6650](https://github.com/paritytech/parity/pull/6650)
+- SecretStore: session level timeout [#6631](https://github.com/paritytech/parity/pull/6631)
+- SecretStore: ShareRemove of 'isolated' nodes [#6630](https://github.com/paritytech/parity/pull/6630)
+- SecretStore: exclusive sessions [#6624](https://github.com/paritytech/parity/pull/6624)
+- Fixed network protocol version negotiation [#6649](https://github.com/paritytech/parity/pull/6649)
+- Updated systemd files for linux (Resolves #6592) [#6598](https://github.com/paritytech/parity/pull/6598)
+- move additional_params to machine, fixes registry on non-ethash chains [#6646](https://github.com/paritytech/parity/pull/6646)
+- Fix Token Transfer in transaction list [#6589](https://github.com/paritytech/parity/pull/6589)
+- Update jsonrpc dependencies and rewrite dapps to futures. [#6522](https://github.com/paritytech/parity/pull/6522)
+- Balance queries implemented in WASM runtime [#6639](https://github.com/paritytech/parity/pull/6639)
+- Don't expose port 80 for parity anymore [#6633](https://github.com/paritytech/parity/pull/6633)
+- WASM Runtime refactoring [#6596](https://github.com/paritytech/parity/pull/6596)
+- Fix compilation [#6625](https://github.com/paritytech/parity/pull/6625)
+- Downgrade futures to suppress warnings. [#6620](https://github.com/paritytech/parity/pull/6620)
+- Add pagination for trace_filter rpc method [#6312](https://github.com/paritytech/parity/pull/6312)
+- Disallow pasting recovery phrases on first run [#6602](https://github.com/paritytech/parity/pull/6602)
+- fix typo: Unkown => Unknown [#6559](https://github.com/paritytech/parity/pull/6559)
+- SecretStore: administrative sessions prototypes [#6605](https://github.com/paritytech/parity/pull/6605)
+- fix parity.io link 404 [#6617](https://github.com/paritytech/parity/pull/6617)
+- SecretStore: add node to existing session poc + discussion [#6480](https://github.com/paritytech/parity/pull/6480)
+- Generalize engine trait [#6591](https://github.com/paritytech/parity/pull/6591)
+- Add RPC eth_chainId for querying the current blockchain chain ID [#6329](https://github.com/paritytech/parity/pull/6329)
+- Debounce sync status. [#6572](https://github.com/paritytech/parity/pull/6572)
+- [Public Node] Disable tx scheduling and hardware wallets [#6588](https://github.com/paritytech/parity/pull/6588)
+- Use memmap for dag cache [#6193](https://github.com/paritytech/parity/pull/6193)
+- Rename Requests to Batch [#6582](https://github.com/paritytech/parity/pull/6582)
+- Use host as ws/dapps url if present. [#6566](https://github.com/paritytech/parity/pull/6566)
+- Sync progress and error handling fixes [#6560](https://github.com/paritytech/parity/pull/6560)
+- Fixed receipt serialization and RPC [#6555](https://github.com/paritytech/parity/pull/6555)
+- Fix number of confirmations for transaction [#6552](https://github.com/paritytech/parity/pull/6552)
+- Fix #6540 [#6556](https://github.com/paritytech/parity/pull/6556)
+- Fix failing hardware tests [#6553](https://github.com/paritytech/parity/pull/6553)
+- Required validators >= num owners in Wallet Creation [#6551](https://github.com/paritytech/parity/pull/6551)
+- Random cleanups / improvements to a state [#6472](https://github.com/paritytech/parity/pull/6472)
+- Changelog for 1.7.2 [#6363](https://github.com/paritytech/parity/pull/6363)
+- Ropsten fork [#6533](https://github.com/paritytech/parity/pull/6533)
+- Byzantium updates [#5855](https://github.com/paritytech/parity/pull/5855)
+- Fix extension detection [#6452](https://github.com/paritytech/parity/pull/6452)
+- Downgrade futures to supress warnings [#6521](https://github.com/paritytech/parity/pull/6521)
+- separate trie from util and make its dependencies into libs [#6478](https://github.com/paritytech/parity/pull/6478)
+- WASM sha3 test [#6512](https://github.com/paritytech/parity/pull/6512)
+- Fix broken JavaScript tests [#6498](https://github.com/paritytech/parity/pull/6498)
+- SecretStore: use random key to encrypt channel + session-level nonce [#6470](https://github.com/paritytech/parity/pull/6470)
+- Trezor Support [#6403](https://github.com/paritytech/parity/pull/6403)
+- Fix compiler warning [#6491](https://github.com/paritytech/parity/pull/6491)
+- Fix typo [#6505](https://github.com/paritytech/parity/pull/6505)
+- WASM: added math overflow test [#6474](https://github.com/paritytech/parity/pull/6474)
+- Fix slow balances [#6471](https://github.com/paritytech/parity/pull/6471)
+- WASM runtime update [#6467](https://github.com/paritytech/parity/pull/6467)
+- Compatibility with whisper v6 [#6179](https://github.com/paritytech/parity/pull/6179)
+- light-poa round 2: allow optional casting of engine client to full client [#6468](https://github.com/paritytech/parity/pull/6468)
+- Moved attributes under docs [#6475](https://github.com/paritytech/parity/pull/6475)
+- cleanup util dependencies [#6464](https://github.com/paritytech/parity/pull/6464)
+- removed redundant earlymergedb trace guards [#6463](https://github.com/paritytech/parity/pull/6463)
+- UtilError utilizes error_chain! [#6461](https://github.com/paritytech/parity/pull/6461)
+- fixed master [#6465](https://github.com/paritytech/parity/pull/6465)
+- Refactor and port CLI from Docopt to Clap (#2066) [#6356](https://github.com/paritytech/parity/pull/6356)
+- Add language selector in production [#6317](https://github.com/paritytech/parity/pull/6317)
+- eth_call returns output of contract creations [#6420](https://github.com/paritytech/parity/pull/6420)
+- Refactor: Don't reexport bigint from util [#6459](https://github.com/paritytech/parity/pull/6459)
+- Transaction permissioning [#6441](https://github.com/paritytech/parity/pull/6441)
+- Added missing SecretStore tests - signing session [#6411](https://github.com/paritytech/parity/pull/6411)
+- Light-client sync for contract-based PoA [#6370](https://github.com/paritytech/parity/pull/6370)
+- triehash is separated from util [#6428](https://github.com/paritytech/parity/pull/6428)
+- remove re-export of parking_lot in util [#6435](https://github.com/paritytech/parity/pull/6435)
+- fix modexp bug: return 0 if base is zero [#6424](https://github.com/paritytech/parity/pull/6424)
+- separate semantic_version from util [#6438](https://github.com/paritytech/parity/pull/6438)
+- move timer.rs to ethcore [#6437](https://github.com/paritytech/parity/pull/6437)
+- remove re-export of ansi_term in util [#6433](https://github.com/paritytech/parity/pull/6433)
+- Pub sub blocks [#6139](https://github.com/paritytech/parity/pull/6139)
+- replace trait Hashable with fn keccak [#6423](https://github.com/paritytech/parity/pull/6423)
+- add more hash backward compatibility test for bloom [#6425](https://github.com/paritytech/parity/pull/6425)
+- remove the redundant hasher in Bloom [#6404](https://github.com/paritytech/parity/pull/6404)
+- Remove re-export of HeapSizeOf in util (part of #6418) [#6419](https://github.com/paritytech/parity/pull/6419)
+- Rewards on closing blocks [#6194](https://github.com/paritytech/parity/pull/6194)
+- ensure balances of constructor accounts are kept [#6413](https://github.com/paritytech/parity/pull/6413)
+- removed recursion from triedbmut::lookup [#6394](https://github.com/paritytech/parity/pull/6394)
+- do not activate genesis epoch in immediate transition validator contract [#6349](https://github.com/paritytech/parity/pull/6349)
+- Use git for the snap version [#6271](https://github.com/paritytech/parity/pull/6271)
+- Permissioned p2p connections [#6359](https://github.com/paritytech/parity/pull/6359)
+- Don't accept transactions above block gas limit. [#6408](https://github.com/paritytech/parity/pull/6408)
+- Fix memory tracing. [#6399](https://github.com/paritytech/parity/pull/6399)
+- earlydb optimizations [#6393](https://github.com/paritytech/parity/pull/6393)
+- Optimized PlainHasher hashing. Trie insertions are >15 faster [#6321](https://github.com/paritytech/parity/pull/6321)
+- Trie optimizations [#6389](https://github.com/paritytech/parity/pull/6389)
+- small optimizations for triehash [#6392](https://github.com/paritytech/parity/pull/6392)
+- Bring back IPFS tests. [#6398](https://github.com/paritytech/parity/pull/6398)
+- Running state test using parity-evm [#6355](https://github.com/paritytech/parity/pull/6355)
+- Wasm math tests extended [#6354](https://github.com/paritytech/parity/pull/6354)
+- Expose health status over RPC [#6274](https://github.com/paritytech/parity/pull/6274)
+- fix bloom bitvecjournal storage allocation [#6390](https://github.com/paritytech/parity/pull/6390)
+- fixed pending block panic [#6391](https://github.com/paritytech/parity/pull/6391)
+- Infoline less opaque for UI/visibility [#6364](https://github.com/paritytech/parity/pull/6364)
+- Fix eth_call. [#6365](https://github.com/paritytech/parity/pull/6365)
+- updated bigint [#6341](https://github.com/paritytech/parity/pull/6341)
+- Optimize trie iter by avoiding redundant copying [#6347](https://github.com/paritytech/parity/pull/6347)
+- Only keep a single rocksdb debug log file [#6346](https://github.com/paritytech/parity/pull/6346)
+- Tweaked snapshot params [#6344](https://github.com/paritytech/parity/pull/6344)
+- Rename network_id to chain_id where applicable. [#6345](https://github.com/paritytech/parity/pull/6345)
+- Itertools are no longer reexported from util, optimized triedb iter [#6322](https://github.com/paritytech/parity/pull/6322)
+- Better check the created accounts before showing Startup Wizard [#6331](https://github.com/paritytech/parity/pull/6331)
+- Better error messages for invalid types in RPC [#6311](https://github.com/paritytech/parity/pull/6311)
+- fix panic in parity-evm json tracer [#6338](https://github.com/paritytech/parity/pull/6338)
+- WASM math test [#6305](https://github.com/paritytech/parity/pull/6305)
+- rlp_derive [#6125](https://github.com/paritytech/parity/pull/6125)
+- Fix --chain parsing in parity-evm. [#6314](https://github.com/paritytech/parity/pull/6314)
+- Unexpose RPC methods on :8180 [#6295](https://github.com/paritytech/parity/pull/6295)
+- Ignore errors from dappsUrl when starting UI. [#6296](https://github.com/paritytech/parity/pull/6296)
+- updated bigint with optimized mul and from_big_indian [#6323](https://github.com/paritytech/parity/pull/6323)
+- SecretStore: bunch of fixes and improvements [#6168](https://github.com/paritytech/parity/pull/6168)
+- Master requires rust 1.19 [#6308](https://github.com/paritytech/parity/pull/6308)
+- Add more descriptive error when signing/decrypting using hw wallet. [#6302](https://github.com/paritytech/parity/pull/6302)
+- Increase default gas limit for eth_call. [#6299](https://github.com/paritytech/parity/pull/6299)
+- rust-toolchain file on master [#6266](https://github.com/paritytech/parity/pull/6266)
+- Migrate wasm-tests to updated runtime [#6278](https://github.com/paritytech/parity/pull/6278)
+- Extension fixes [#6284](https://github.com/paritytech/parity/pull/6284)
+- Fix a hash displayed in tooltip when signing arbitrary data [#6283](https://github.com/paritytech/parity/pull/6283)
+- Time should not contribue to overall status. [#6276](https://github.com/paritytech/parity/pull/6276)
+- Add --to and --gas-price to evmbin [#6277](https://github.com/paritytech/parity/pull/6277)
+- Fix dapps CSP when UI is exposed externally [#6178](https://github.com/paritytech/parity/pull/6178)
+- Add warning to web browser and fix links. [#6232](https://github.com/paritytech/parity/pull/6232)
+- Update Settings/Proxy view to match entries in proxy.pac [#4771](https://github.com/paritytech/parity/pull/4771)
+- Dapp refresh [#5752](https://github.com/paritytech/parity/pull/5752)
+- Add support for ConsenSys multisig wallet [#6153](https://github.com/paritytech/parity/pull/6153)
+- updated jsonrpc [#6264](https://github.com/paritytech/parity/pull/6264)
+- SecretStore: encrypt messages using private key from key store [#6146](https://github.com/paritytech/parity/pull/6146)
+- Wasm storage read test [#6255](https://github.com/paritytech/parity/pull/6255)
+- propagate stratum submit share error upstream [#6260](https://github.com/paritytech/parity/pull/6260)
+- Using multiple NTP servers [#6173](https://github.com/paritytech/parity/pull/6173)
+- Add GitHub issue templates. [#6259](https://github.com/paritytech/parity/pull/6259)
+- format instant change proofs correctly [#6241](https://github.com/paritytech/parity/pull/6241)
+- price-info does not depend on util [#6231](https://github.com/paritytech/parity/pull/6231)
+- native-contracts crate does not depend on util any more [#6233](https://github.com/paritytech/parity/pull/6233)
+- Bump master to 1.8.0 [#6256](https://github.com/paritytech/parity/pull/6256)
+- SecretStore: do not cache ACL contract + on-chain key servers configuration [#6107](https://github.com/paritytech/parity/pull/6107)
+- Fix the README badges [#6229](https://github.com/paritytech/parity/pull/6229)
+- updated tiny-keccak to 1.3 [#6248](https://github.com/paritytech/parity/pull/6248)
+- Small grammatical error [#6244](https://github.com/paritytech/parity/pull/6244)
+- Multi-call RPC [#6195](https://github.com/paritytech/parity/pull/6195)
+- InstantSeal fix [#6223](https://github.com/paritytech/parity/pull/6223)
+- Untrusted RLP length overflow check  [#6227](https://github.com/paritytech/parity/pull/6227)
+- Chainspec validation [#6197](https://github.com/paritytech/parity/pull/6197)
+- Fix cache path when using --base-path [#6212](https://github.com/paritytech/parity/pull/6212)
+- removed std reexports from util && fixed broken tests [#6187](https://github.com/paritytech/parity/pull/6187)
+- WASM MVP continued [#6132](https://github.com/paritytech/parity/pull/6132)
+- Decouple virtual machines [#6184](https://github.com/paritytech/parity/pull/6184)
+- Realloc test added [#6177](https://github.com/paritytech/parity/pull/6177)
+- Re-enable wallets, fixed forgetting accounts [#6196](https://github.com/paritytech/parity/pull/6196)
+- Move more params to the common section. [#6134](https://github.com/paritytech/parity/pull/6134)
+- Whisper js [#6161](https://github.com/paritytech/parity/pull/6161)
+- typo in uninstaller [#6185](https://github.com/paritytech/parity/pull/6185)
+- fix #6052. honor --no-color for signer command [#6100](https://github.com/paritytech/parity/pull/6100)
+- Refactor --allow-ips to handle custom ip-ranges [#6144](https://github.com/paritytech/parity/pull/6144)
+- Update Changelog for 1.6.10 and 1.7.0 [#6183](https://github.com/paritytech/parity/pull/6183)
+- Fix unsoundness in ethash's unsafe code [#6140](https://github.com/paritytech/parity/pull/6140)
diff --git a/docs/CHANGELOG-1.9.md b/docs/CHANGELOG-1.9.md
new file mode 100644
index 0000000000000000000000000000000000000000..ddb7e9cee1c22c6cf3a8c227439e67fc457a7932
--- /dev/null
+++ b/docs/CHANGELOG-1.9.md
@@ -0,0 +1,478 @@
+## Parity [v1.9.5](https://github.com/paritytech/parity/releases/tag/v1.9.5) (2018-03-21)
+
+Parity 1.9.5 is a bug-fix release to improve performance and stability. This release marks the 1.9 track _stable_.
+
+We are excited to announce support for **Wasm Smart Contracts on Kovan network**. The hard-fork to activate the Wasm-VM will take place on block `6600000`.
+
+The full list of included changes:
+
+- Do a meaningful commit that does not contain the words "ci" or "skip"
+- Triggering build for stable.
+- Postpone Kovan hard fork ([#8137](https://github.com/paritytech/parity/pull/8137)) ([#8152](https://github.com/paritytech/parity/pull/8152))
+  - Postpone Kovan hard fork ([#8137](https://github.com/paritytech/parity/pull/8137))
+    - ethcore: postpone Kovan hard fork
+    - util: update version fork metadata
+  - WASM libraries bump ([#7970](https://github.com/paritytech/parity/pull/7970))
+    - update wasmi, parity-wasm, wasm-utils to latest version
+    - Update to new wasmi & error handling
+    - also utilize new stack limiter
+    - fix typo
+    - replace dependency url
+    - Cargo.lock update
+- Fix scripts. Force JS rebuild. ([#8144](https://github.com/paritytech/parity/pull/8144))
+- Stable Backports ([#8133](https://github.com/paritytech/parity/pull/8133))
+  - updater: apply exponential backoff after download failure ([#8059](https://github.com/paritytech/parity/pull/8059))
+    - updater: apply exponential backoff after download failure
+    - updater: reset backoff on new release
+  - Limit incoming connections.  ([#8060](https://github.com/paritytech/parity/pull/8060))
+    - Limit ingress connections
+    - Optimized handshakes logging
+  - Max code size on Kovan ([#8067](https://github.com/paritytech/parity/pull/8067))
+    - Enable code size limit on kovan
+    - Fix formatting.
+  - add some dos protection ([#8084](https://github.com/paritytech/parity/pull/8084))
+  - more dos protection ([#8104](https://github.com/paritytech/parity/pull/8104))
+  - Const time comparison ([#8113](https://github.com/paritytech/parity/pull/8113))
+    - Use `subtle::slices_equal` for constant time comparison.
+    - Also update the existing version of subtle in `ethcrypto` from
+    - 0.1 to 0.5
+    - Test specifically for InvalidPassword error.
+  - revert removing blooms ([#8066](https://github.com/paritytech/parity/pull/8066))
+  - Revert "fix traces, removed bloomchain crate, closes [#7228](https://github.com/paritytech/parity/pull/7228), closes [#7167](https://github.com/paritytech/parity/pull/7167)"
+  - Revert "fixed broken logs ([#7934](https://github.com/paritytech/parity/pull/7934))"
+    - fixed broken logs
+    - bring back old lock order
+    - remove migration v13
+    - revert CURRENT_VERSION to 12 in migration.rs
+    - Fix compilation.
+    - Check one step deeper if we're on release track branches
+    - add missing pr
+    - Fix blooms?
+    - Fix tests compiilation.
+    - Fix size.
+- Check one step deeper if we're on release track branches ([#8134](https://github.com/paritytech/parity/pull/8134)) ([#8140](https://github.com/paritytech/parity/pull/8140))
+- Trigger js build. ([#8121](https://github.com/paritytech/parity/pull/8121))
+- Stable backports ([#8055](https://github.com/paritytech/parity/pull/8055))
+  - CI: Fix cargo cache ([#7968](https://github.com/paritytech/parity/pull/7968))
+  - Fix cache
+Blocking waiting for file lock on the registry index
+  - Only clean locked cargo cache on windows
+  - fixed ethstore sign ([#8026](https://github.com/paritytech/parity/pull/8026))
+  - fix cache & snapcraft CI build ([#8052](https://github.com/paritytech/parity/pull/8052))
+  - Add MCIP-6 Byzyantium transition to Musicoin spec ([#7841](https://github.com/paritytech/parity/pull/7841))
+    - Add test chain spec for musicoin byzantium testnet
+    - Add MCIP-6 Byzyantium transition to Musicoin spec
+    - Update mcip6_byz.json
+    - ethcore: update musicoin byzantium block number
+    - ethcore: update musicoin bootnodes
+    - Update musicoin.json
+    - More bootnodes.
+- Optimize JS build ([#8093](https://github.com/paritytech/parity/pull/8093))
+  - Extract common chunks plugin.
+  - Fix common CSS.
+  - Fix js push for stable.
+  - Remove arguments to getPlugins.
+- Stable Backports ([#8058](https://github.com/paritytech/parity/pull/8058))
+  - fixed parsing ethash seals and verify_block_undordered ([#8031](https://github.com/paritytech/parity/pull/8031))
+  - fix for verify_block_basic crashing on invalid transaction rlp ([#8032](https://github.com/paritytech/parity/pull/8032))
+- Make 1.9 stable ([#8023](https://github.com/paritytech/parity/pull/8023))
+  - Make 1.9 stable
+  - Bump stable to 1.9.5
+  - Fix gitlab builds
+
+## Parity [v1.9.4](https://github.com/paritytech/parity/releases/tag/v1.9.4) (2018-03-01)
+
+Parity 1.9.4 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Bump beta to 1.9.4 ([#8016](https://github.com/paritytech/parity/pull/8016))
+- Beta Backports ([#8011](https://github.com/paritytech/parity/pull/8011))
+  - Fix traces, removed bloomchain crate ([#7979](https://github.com/paritytech/parity/pull/7979))
+  - Reject too large packets in snapshot sync. ([#7977](https://github.com/paritytech/parity/pull/7977))
+  - Fixed broken logs ([#7934](https://github.com/paritytech/parity/pull/7934))
+  - Increase max download limit to 128MB ([#7965](https://github.com/paritytech/parity/pull/7965))
+  - Calculate proper keccak256/sha3 using parity. ([#7953](https://github.com/paritytech/parity/pull/7953))
+  - Bump WebSockets ([#7952](https://github.com/paritytech/parity/pull/7952))
+  - Hardware-wallet/usb-subscribe-refactor ([#7860](https://github.com/paritytech/parity/pull/7860))
+  - Make block generator easier to use ([#7888](https://github.com/paritytech/parity/pull/7888))
+
+## Parity [v1.9.3](https://github.com/paritytech/parity/releases/tag/v1.9.3) (2018-02-20)
+
+Parity 1.9.3 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Backports ([#7945](https://github.com/paritytech/parity/pull/7945))
+  - ECIP 1041 - Remove Difficulty Bomb ([#7905](https://github.com/paritytech/parity/pull/7905))
+  - spec: Validate required divisor fields are not 0 ([#7933](https://github.com/paritytech/parity/pull/7933))
+  - Kovan WASM fork code ([#7849](https://github.com/paritytech/parity/pull/7849))
+- Gitlab Cargo Cache ([#7944](https://github.com/paritytech/parity/pull/7944))
+- Bump react-qr-reader ([#7943](https://github.com/paritytech/parity/pull/7943))
+  - Update react-qr-reader
+  - Explicit webrtc-adapter dependency (package-lock workaround)
+  - Iframe with allow (QR, new Chrome policy)
+- Backport of [#7844](https://github.com/paritytech/parity/pull/7844) and [#7917](https://github.com/paritytech/parity/pull/7917) to beta ([#7940](https://github.com/paritytech/parity/pull/7940))
+  - Randomize the peer we dispatch to
+  - Fix a division by zero in light client RPC handler
+- Wallet allowJsEval: true ([#7913](https://github.com/paritytech/parity/pull/7913))
+  - Wallet allowJsEval: true
+  - Fix unsafe wallet.
+  - Enable unsafe-eval for all dapps.
+- Fix CSP for dapps that require eval. ([#7867](https://github.com/paritytech/parity/pull/7867)) ([#7903](https://github.com/paritytech/parity/pull/7903))
+  - Add allowJsEval to manifest.
+  - Enable 'unsafe-eval' if requested in manifest.
+- Fix snap build beta ([#7895](https://github.com/paritytech/parity/pull/7895))
+- Fix snapcraft grade to stable ([#7894](https://github.com/paritytech/parity/pull/7894))
+- Backport Master CI PRs to Beta ([#7890](https://github.com/paritytech/parity/pull/7890))
+  - Add binary identifiers and sha256sum to builds ([#7830](https://github.com/paritytech/parity/pull/7830))
+  - Fix checksums and auto-update push ([#7846](https://github.com/paritytech/parity/pull/7846))
+  - Update gitlab-build.sh ([#7855](https://github.com/paritytech/parity/pull/7855))
+  - Fix installer binary names for macos and windows ([#7881](https://github.com/paritytech/parity/pull/7881))
+  - Update gitlab-test.sh ([#7883](https://github.com/paritytech/parity/pull/7883))
+  - Fix snapcraft nightly ([#7884](https://github.com/paritytech/parity/pull/7884))
+- Backport Core PRs to beta ([#7891](https://github.com/paritytech/parity/pull/7891))
+  - Update back-references more aggressively after answering from cache ([#7578](https://github.com/paritytech/parity/pull/7578))
+  - Updated WASM Runtime & new interpreter (wasmi) ([#7796](https://github.com/paritytech/parity/pull/7796))
+  - Adjust storage update evm-style ([#7812](https://github.com/paritytech/parity/pull/7812))
+  - Add new EF ropstens nodes ([#7824](https://github.com/paritytech/parity/pull/7824))
+  - Store updater metadata in a single place ([#7832](https://github.com/paritytech/parity/pull/7832))
+  - WASM: Disable internal memory ([#7842](https://github.com/paritytech/parity/pull/7842))
+  - Add a timeout for light client sync requests ([#7848](https://github.com/paritytech/parity/pull/7848))
+  - Flush keyfiles. Resolves [#7632](https://github.com/paritytech/parity/issues/7632) ([#7868](https://github.com/paritytech/parity/pull/7868))
+  - Fix wallet import ([#7873](https://github.com/paritytech/parity/pull/7873))
+
+## Parity [v1.9.2](https://github.com/paritytech/parity/releases/tag/v1.9.2) (2018-02-02)
+
+Parity 1.9.2 is a bug-fix release to improve performance and stability. It adds additional bootnodes for the Ropsten test network.
+
+The full list of included changes:
+
+- Backports beta ([#7780](https://github.com/paritytech/parity/pull/7780))
+  - Bump beta to 1.9.2
+  - Update ropsten.json ([#7776](https://github.com/paritytech/parity/pull/7776))
+- Snapcraft push beta
+
+## Parity [v1.9.1](https://github.com/paritytech/parity/releases/tag/v1.9.1) (2018-02-01)
+
+Parity 1.9.1 is a bug-fix release to improve performance and stability. It restores ERC-20 token balances, improves networking, fixes database corruptions on client shutdown, and fixes issues with the `--password` command-line flag. Happy syncing, fellow Ethereans!
+
+In addition, this stabilizes Kovan and other Proof-of-Authority networks. If you run a network with AuRa engine, updating is highly encouraged!
+
+The full list of included changes:
+
+- Beta Backports ([#7756](https://github.com/paritytech/parity/pull/7756))
+  - Filter-out nodes.json ([#7716](https://github.com/paritytech/parity/pull/7716))
+    - Filter-out nodes.json
+    - network: sort node table nodes by failure ratio
+    - network: fix node table tests
+    - network: fit node failure percentage into buckets of 5%
+    - network: consider number of attempts in sorting of node table
+    - network: fix node table grumbles
+  - Fix client not being dropped on shutdown ([#7695](https://github.com/paritytech/parity/pull/7695))
+    - parity: wait for client to drop on shutdown
+    - parity: fix grumbles in shutdown wait
+    - parity: increase shutdown timeouts
+  - Wrap --help output to 120 characters ([#7626](https://github.com/paritytech/parity/pull/7626))
+    - Update Clap dependency and remove workarounds
+    - WIP
+    - Remove line breaks in help messages for now
+    - Multiple values can only be separated by commas (closes [#7428](https://github.com/paritytech/parity/issues/7428))
+    - Grumbles; refactor repeating code; add constant
+    - Use a single Wrapper rather than allocate a new one for each call
+    - Wrap --help to 120 characters rather than 100 characte
+- Token filter balances (throttle) ([#7742](https://github.com/paritytech/parity/pull/7742))
+  - Token filter balances (throttle)
+  - Cleanups
+  - Remove unused uniq
+  - Update @parity/shared to 2.2.23
+  - Remove unused code paths
+- Bump beta to 1.9.1 ([#7751](https://github.com/paritytech/parity/pull/7751))
+- Explicitly add branch name ([#7754](https://github.com/paritytech/parity/pull/7754))
+  - Explicitly add branch name
+  - Fix cargo update branch to beta
+- Revert revert revert ([#7715](https://github.com/paritytech/parity/pull/7715))
+ - This reverts commit 568dc33.
+
+## Parity [v1.9.0](https://github.com/paritytech/parity/releases/tag/v1.9.0) "Velocity" (2018-01-25)
+
+We are happy to announce our newest Parity 1.9 release. Among others, it enables the following features:
+
+- It integrates the fully reworked Parity Wallet and DApps browser (a.k.a. "UI 2.0", [#6819](https://github.com/paritytech/parity/pull/6819)).
+- It enables devp2p snappy compression ([#6683](https://github.com/paritytech/parity/pull/6683)).
+- AuRa Proof-of-Authority chains now disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006)). Existing PoA chains can go through a "maximum uncle count transition" to achieve more stability ([#7196](https://github.com/paritytech/parity/pull/7196)).
+- Added Expanse's Byzantium hard-fork ([#7463](https://github.com/paritytech/parity/pull/7463)).
+- Added support for Ellaism chain ([#7222](https://github.com/paritytech/parity/pull/7222)).
+
+Further, users upgrading from 1.8 should acknowledge the following changes:
+
+- Fixed DELEGATECALL's from/to field ([#7568](https://github.com/paritytech/parity/pull/7568)).
+- Set zero nonce and gas price for calls by default ([#6954](https://github.com/paritytech/parity/pull/6954)).
+- Create pending blocks with all transactions from the queue ([#6942](https://github.com/paritytech/parity/pull/6942)).
+- Remove RPC parameter leniency now that Mist formats correctly ([#6651](https://github.com/paritytech/parity/pull/6651)). Parity stops accepting decimal-formatted block numbers and stops parsing the empty string as empty bytes.
+- Public nodes do not support the user interface anymore. If you are running a public node, please stay on the 1.8 branch of the stable releases.
+
+Additional noteworthy changes:
+
+- `ethstore` and `ethkey` have been significantly improved ([#6961](https://github.com/paritytech/parity/pull/6961)):
+  - `ethstore` now supports brute forcing pre-sale wallets given a password list for recovery.
+  - `ethkey` now supports multi-threaded generation of prefix-matching addresses.
+  - `ethkey` now supports prefix-matching brain wallets.
+  - `ethkey` now supports brain-wallets recovery-phrases lookup. This helps to find a correct phrase if you know the address you want to get yet you made a typo backing the phrase up, or forgot a word.
+
+Read more about Parity 1.9 in our [blog post](http://paritytech.io/velocity-the-fastest-parity-released/).
+
+The full list of included changes:
+
+- Add scroll when when too many accounts ([#7677](https://github.com/paritytech/parity/pull/7677)) ([#7679](https://github.com/paritytech/parity/pull/7679))
+- Update installer.nsi
+- Fix conditions in gitlab-test ([#7676](https://github.com/paritytech/parity/pull/7676))
+  - Fix conditions in gitlab-test
+  - Update gitlab-test.sh
+- Remove cargo cache
+- Backports to beta ([#7660](https://github.com/paritytech/parity/pull/7660))
+  - Improve handling of RocksDB corruption ([#7630](https://github.com/paritytech/parity/pull/7630))
+    - Kvdb-rocksdb: update rust-rocksdb version
+    - Kvdb-rocksdb: mark corruptions and attempt repair on db open
+    - Kvdb-rocksdb: better corruption detection on open
+    - Kvdb-rocksdb: add corruption_file_name const
+    - Kvdb-rocksdb: rename mark_corruption to check_for_corruption
+  - Hardening of CSP ([#7621](https://github.com/paritytech/parity/pull/7621))
+  - Fixed delegatecall's from/to ([#7568](https://github.com/paritytech/parity/pull/7568))
+    - Fixed delegatecall's from/to, closes [#7166](https://github.com/paritytech/parity/issues/7166)
+    - Added tests for delegatecall traces, [#7167](https://github.com/paritytech/parity/issues/7167)
+  - Light client RPCs ([#7603](https://github.com/paritytech/parity/pull/7603))
+    - Implement registrar.
+    - Implement eth_getCode
+    - Don't wait for providers.
+    - Don't wait for providers.
+    - Fix linting and wasm tests.
+  - Problem: AttachedProtocols don't get registered ([#7610](https://github.com/paritytech/parity/pull/7610))
+  - Fix Temporarily Invalid blocks handling ([#7613](https://github.com/paritytech/parity/pull/7613))
+    - Handle temporarily invalid blocks in sync.
+    - Fix tests.
+- Add docker build for beta ([#7671](https://github.com/paritytech/parity/pull/7671))
+  - Add docker build for beta
+  - Add cargo cache
+- Fix snapcraft build for beta ([#7670](https://github.com/paritytech/parity/pull/7670))
+- Update Parity.pkgproj
+- update gitlab build from master
+- Update references to dapp sources ([#7634](https://github.com/paritytech/parity/pull/7634)) ([#7636](https://github.com/paritytech/parity/pull/7636))
+- Update tokenreg ([#7618](https://github.com/paritytech/parity/pull/7618)) ([#7619](https://github.com/paritytech/parity/pull/7619))
+- Fix cache:key ([#7598](https://github.com/paritytech/parity/pull/7598))
+- Make 1.9 beta ([#7533](https://github.com/paritytech/parity/pull/7533))
+- Trigger js-precompiled ([#7535](https://github.com/paritytech/parity/pull/7535))
+- RocksDB fix ([#7512](https://github.com/paritytech/parity/pull/7512))
+- Update js-api ([#7510](https://github.com/paritytech/parity/pull/7510))
+- Expose default gas price percentile configuration in CLI ([#7497](https://github.com/paritytech/parity/pull/7497))
+- Use https connection ([#7503](https://github.com/paritytech/parity/pull/7503))
+- More thorough changes detection ([#7472](https://github.com/paritytech/parity/pull/7472))
+- Fix small layout issues ([#7500](https://github.com/paritytech/parity/pull/7500))
+- Show all accounts on Topbar ([#7498](https://github.com/paritytech/parity/pull/7498))
+- Update Parity Mainnet Bootnodes ([#7476](https://github.com/paritytech/parity/pull/7476))
+- Fixed panic when io is not available for export block ([#7495](https://github.com/paritytech/parity/pull/7495))
+- Advance AuRa step as far as we can and prevent invalid blocks. ([#7451](https://github.com/paritytech/parity/pull/7451))
+- Update package-lock in js-old ([#7494](https://github.com/paritytech/parity/pull/7494))
+- Update issue template and readme ([#7450](https://github.com/paritytech/parity/pull/7450))
+- Update package-lock.json pinned versions  ([#7492](https://github.com/paritytech/parity/pull/7492))
+- Explicit pre-precompiled push checkout ([#7474](https://github.com/paritytech/parity/pull/7474))
+- Trigger js-precompiled ([#7473](https://github.com/paritytech/parity/pull/7473))
+- Expanse Byzantium update w/ correct metropolis difficulty increment divisor ([#7463](https://github.com/paritytech/parity/pull/7463))
+- Updated icons ([#7469](https://github.com/paritytech/parity/pull/7469))
+- Cleanup certifications ([#7454](https://github.com/paritytech/parity/pull/7454))
+- Fix css lint (updated stylelint) ([#7471](https://github.com/paritytech/parity/pull/7471))
+- Upgrade markdown-loader & marked ([#7467](https://github.com/paritytech/parity/pull/7467))
+- Remove JS test for removed code ([#7461](https://github.com/paritytech/parity/pull/7461))
+- Pull in dapp-status ([#7457](https://github.com/paritytech/parity/pull/7457))
+- Bump openssl crate ([#7455](https://github.com/paritytech/parity/pull/7455))
+- Signer updates from global Redux state ([#7452](https://github.com/paritytech/parity/pull/7452))
+- Remove expanse chain ([#7437](https://github.com/paritytech/parity/pull/7437))
+- Store tokens with repeatable id ([#7435](https://github.com/paritytech/parity/pull/7435))
+- Strict config parsing ([#7433](https://github.com/paritytech/parity/pull/7433))
+- Upgrade to RocksDB 5.8.8 and tune settings to reduce space amplification ([#7348](https://github.com/paritytech/parity/pull/7348))
+- Fix status layout ([#7432](https://github.com/paritytech/parity/pull/7432))
+- Fix tracing failed calls. ([#7412](https://github.com/paritytech/parity/pull/7412))
+- Problem: sending any Whisper message fails ([#7421](https://github.com/paritytech/parity/pull/7421))
+- Wait for future blocks in AuRa ([#7368](https://github.com/paritytech/parity/pull/7368))
+- Fix final feature. ([#7426](https://github.com/paritytech/parity/pull/7426))
+- Use RwLock for state DB ([#7425](https://github.com/paritytech/parity/pull/7425))
+- Update branding on UI ([#7370](https://github.com/paritytech/parity/pull/7370))
+- Changelog for 1.8.5 and 1.7.11 ([#7401](https://github.com/paritytech/parity/pull/7401))
+- Added checking tx-type using transactions permission contract for miners ([#7359](https://github.com/paritytech/parity/pull/7359))
+- Standalone dir crate, replaces [#7383](https://github.com/paritytech/parity/issues/7383) ([#7409](https://github.com/paritytech/parity/pull/7409))
+- SecretStore: secretstore_signRawHash method ([#7336](https://github.com/paritytech/parity/pull/7336))
+- SecretStore: return error 404 when there's no key shares for given key on all nodes ([#7331](https://github.com/paritytech/parity/pull/7331))
+- SecretStore: PoA integration initial version ([#7101](https://github.com/paritytech/parity/pull/7101))
+- Update bootnodes ([#7363](https://github.com/paritytech/parity/pull/7363))
+- Fix default CORS settings. ([#7387](https://github.com/paritytech/parity/pull/7387))
+- Fix version ([#7390](https://github.com/paritytech/parity/pull/7390))
+- Wasm runtime update ([#7356](https://github.com/paritytech/parity/pull/7356))
+- Parity-version pr reopen ([#7136](https://github.com/paritytech/parity/pull/7136))
+- Get rid of clippy remainings. ([#7355](https://github.com/paritytech/parity/pull/7355))
+- Avoid using ok_or with allocated argument ([#7357](https://github.com/paritytech/parity/pull/7357))
+- Make accounts refresh time configurable. ([#7345](https://github.com/paritytech/parity/pull/7345))
+- Enable traces for DEV chain ([#7327](https://github.com/paritytech/parity/pull/7327))
+- Problem: AuRa's unsafeties around step duration ([#7282](https://github.com/paritytech/parity/pull/7282))
+- Problem: Cargo.toml file contains [project] key ([#7346](https://github.com/paritytech/parity/pull/7346))
+- Fix broken flex modal layouts ([#7343](https://github.com/paritytech/parity/pull/7343))
+- Fix dappIcon & Fix Signer Pending ([#7338](https://github.com/paritytech/parity/pull/7338))
+- Fix wallet token/badge icons not showing up ([#7333](https://github.com/paritytech/parity/pull/7333))
+- Add Ellaism coin in chain config ([#7222](https://github.com/paritytech/parity/pull/7222))
+- Update bootnodes ([#7296](https://github.com/paritytech/parity/pull/7296))
+- Adds `personal_signTransaction` RPC method ([#6991](https://github.com/paritytech/parity/pull/6991))
+- Fix double initialization of embeded providers. ([#7326](https://github.com/paritytech/parity/pull/7326))
+- Transaction Pool re-implementation ([#6994](https://github.com/paritytech/parity/pull/6994))
+- UI package bump ([#7318](https://github.com/paritytech/parity/pull/7318))
+- Test framework and basic test for whisper ([#7011](https://github.com/paritytech/parity/pull/7011))
+- CI js-precompiled trigger ([#7316](https://github.com/paritytech/parity/pull/7316))
+- Fix inject.js & Signer store duplication ([#7299](https://github.com/paritytech/parity/pull/7299))
+- Detect different node, same-key signing in aura ([#7245](https://github.com/paritytech/parity/pull/7245))
+- New warp enodes ([#7287](https://github.com/paritytech/parity/pull/7287))
+- CSS fixes for v1 ([#7285](https://github.com/paritytech/parity/pull/7285))
+- Wallet subscriptions & refresh ([#7283](https://github.com/paritytech/parity/pull/7283))
+- Update inject web3 dependencies ([#7286](https://github.com/paritytech/parity/pull/7286))
+- Some padding around dapp image ([#7276](https://github.com/paritytech/parity/pull/7276))
+- Expand available middleware methods ([#7275](https://github.com/paritytech/parity/pull/7275))
+- Inject parity script to all dapps // Expand dapps to any ZIP file ([#7260](https://github.com/paritytech/parity/pull/7260))
+- New Homepage ([#7266](https://github.com/paritytech/parity/pull/7266))
+- Update kovan HF block number. ([#7259](https://github.com/paritytech/parity/pull/7259))
+- CHANGELOG for 1.7.10 and 1.8.4 ([#7265](https://github.com/paritytech/parity/pull/7265))
+- Remove extraneous id hashing ([#7269](https://github.com/paritytech/parity/pull/7269))
+- Simplify status + content display overlaps/page fixing ([#7264](https://github.com/paritytech/parity/pull/7264))
+- UI redirect to 127.0.0.1 when localhost requested ([#7236](https://github.com/paritytech/parity/pull/7236))
+- Usability improvements to security token Dialog [#7112](https://github.com/paritytech/parity/issues/7112) ([#7134](https://github.com/paritytech/parity/pull/7134))
+- Don't display unneeded notifications ([#7237](https://github.com/paritytech/parity/pull/7237))
+- Reduce max block timestamp drift to 15 seconds ([#7240](https://github.com/paritytech/parity/pull/7240))
+- Increase allowed time drift to 10s. ([#7238](https://github.com/paritytech/parity/pull/7238))
+- Improve building from source ([#7239](https://github.com/paritytech/parity/pull/7239))
+- Fix/Update method permissions ([#7233](https://github.com/paritytech/parity/pull/7233))
+- Fix aura difficulty race ([#7198](https://github.com/paritytech/parity/pull/7198))
+- Dependency updates ([#7226](https://github.com/paritytech/parity/pull/7226))
+- Display all dapps (shell) & wallet tabs (v1) by default ([#7213](https://github.com/paritytech/parity/pull/7213))
+- Rework dapps list ([#7206](https://github.com/paritytech/parity/pull/7206))
+- Add contributing guidelines and code of conduct. ([#7157](https://github.com/paritytech/parity/pull/7157))
+- Make Signing Requests more visible ([#7204](https://github.com/paritytech/parity/pull/7204))
+- Send each log as a separate notification ([#7175](https://github.com/paritytech/parity/pull/7175))
+- Deleting a mistake comment in calc difficulty ([#7154](https://github.com/paritytech/parity/pull/7154))
+- Maximum uncle count transition ([#7196](https://github.com/paritytech/parity/pull/7196))
+- Update FirstRun for UI-2 ([#7195](https://github.com/paritytech/parity/pull/7195))
+- Update mocha import stubs ([#7191](https://github.com/paritytech/parity/pull/7191))
+- Escape inifinite loop in estimte_gas ([#7075](https://github.com/paritytech/parity/pull/7075))
+- New account selector UI in top bar ([#7179](https://github.com/paritytech/parity/pull/7179))
+- Removed ethcore-util dependency from ethcore-network ([#7180](https://github.com/paritytech/parity/pull/7180))
+- WASM test runner utility upgrade ([#7147](https://github.com/paritytech/parity/pull/7147))
+- React 16 ([#7174](https://github.com/paritytech/parity/pull/7174))
+- Assorted improvements for ethstore and ethkey ([#6961](https://github.com/paritytech/parity/pull/6961))
+- Delete unused package.json (dist bundles) ([#7173](https://github.com/paritytech/parity/pull/7173))
+- Remove *.css.map & *.js.map ([#7168](https://github.com/paritytech/parity/pull/7168))
+- Use git flag to remove old js artifacts ([#7165](https://github.com/paritytech/parity/pull/7165))
+- Cleanup JS build artifacts ([#7164](https://github.com/paritytech/parity/pull/7164))
+- Fixes typo in user config path ([#7159](https://github.com/paritytech/parity/pull/7159))
+- Pull in new dapp-{methods,visible} dapps ([#7150](https://github.com/paritytech/parity/pull/7150))
+- WASM test runner utility ([#7142](https://github.com/paritytech/parity/pull/7142))
+- WASM Remove blockhash error ([#7121](https://github.com/paritytech/parity/pull/7121))
+- ECIP-1039: Monetary policy rounding specification ([#7067](https://github.com/paritytech/parity/pull/7067))
+- Fixed `RotatingLogger` after migrating to new arrayvec ([#7129](https://github.com/paritytech/parity/pull/7129))
+- Push to correct shell branch ([#7135](https://github.com/paritytech/parity/pull/7135))
+- Update js-precompiled ref, trigger JS build ([#7132](https://github.com/paritytech/parity/pull/7132))
+- Fixed build && test ([#7128](https://github.com/paritytech/parity/pull/7128))
+- Update packages, pull in compiled-only repos ([#7125](https://github.com/paritytech/parity/pull/7125))
+- Cleanup top bar, add Home icon for navigation ([#7118](https://github.com/paritytech/parity/pull/7118))
+- WASM storage_read and storage_write don't return anything ([#7110](https://github.com/paritytech/parity/pull/7110))
+- Local dapp development URL ([#7100](https://github.com/paritytech/parity/pull/7100))
+- Remove unused and duplicated files in js-old ([#7082](https://github.com/paritytech/parity/pull/7082))
+- Optimize & group dapp requests ([#7083](https://github.com/paritytech/parity/pull/7083))
+- WASM parse payload from panics ([#7097](https://github.com/paritytech/parity/pull/7097))
+- Fix no-default-features. ([#7096](https://github.com/paritytech/parity/pull/7096))
+- Updated eth-secp256k1 ([#7090](https://github.com/paritytech/parity/pull/7090))
+- Improve Github Issue Template ([#7099](https://github.com/paritytech/parity/pull/7099))
+- Changes necessary to upload crates to crates.io ([#7020](https://github.com/paritytech/parity/pull/7020))
+- Reopened 6860 - iterate over both buffered and unbuffered database entries ([#7048](https://github.com/paritytech/parity/pull/7048))
+- SecretStore: servers set change session api ([#6925](https://github.com/paritytech/parity/pull/6925))
+- Disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006))
+- Squashed ethcore-network changes which introduce error-chain ([#7040](https://github.com/paritytech/parity/pull/7040))
+- Removed redundant imports ([#7057](https://github.com/paritytech/parity/pull/7057))
+- CHANGELOG for 1.7.8, 1.7.9, 1.8.2, and 1.8.3 ([#7055](https://github.com/paritytech/parity/pull/7055))
+- Properly display Signer errors (Snackbar display popup) ([#7053](https://github.com/paritytech/parity/pull/7053))
+- Add the desktop file for the snap ([#7059](https://github.com/paritytech/parity/pull/7059))
+- Small performance gain in allocations ([#7054](https://github.com/paritytech/parity/pull/7054))
+- Bump JSON-RPC version ([#7051](https://github.com/paritytech/parity/pull/7051))
+- Fix nonce reservation ([#7025](https://github.com/paritytech/parity/pull/7025))
+- Fixed ethstore-cli output ([#7052](https://github.com/paritytech/parity/pull/7052))
+- Add mui for embed compilation ([#7049](https://github.com/paritytech/parity/pull/7049))
+- Update the snap metadata to keep working strictly confined ([#6993](https://github.com/paritytech/parity/pull/6993))
+- Remove unused js packages (dapp cleanups) ([#7046](https://github.com/paritytech/parity/pull/7046))
+- Gitlog location update  ([#7042](https://github.com/paritytech/parity/pull/7042))
+- Move git logging to .git-release.log ([#7041](https://github.com/paritytech/parity/pull/7041))
+- Start from rust root in release update step ([#7039](https://github.com/paritytech/parity/pull/7039))
+- Complete token merge, remove unused files ([#7037](https://github.com/paritytech/parity/pull/7037))
+- Add missing cargo-push.sh shell variable ([#7036](https://github.com/paritytech/parity/pull/7036))
+- Fix npm start script ([#7034](https://github.com/paritytech/parity/pull/7034))
+-  Update executable flags on release scripts ([#7035](https://github.com/paritytech/parity/pull/7035))
+- Fix v1 precompiled ([#7033](https://github.com/paritytech/parity/pull/7033))
+- Push precompiled to correct branch (v1) ([#7031](https://github.com/paritytech/parity/pull/7031))
+- Update v1 Wallet Dapp ([#6935](https://github.com/paritytech/parity/pull/6935))
+- WASM tests update ([#7018](https://github.com/paritytech/parity/pull/7018))
+- Events in WASM runtime ([#6967](https://github.com/paritytech/parity/pull/6967))
+- Adds validate_node_url() and refactors boot node check ([#6907](https://github.com/paritytech/parity/pull/6907)) ([#6970](https://github.com/paritytech/parity/pull/6970))
+- Fix windows build (with ui rebuild) ([#7016](https://github.com/paritytech/parity/pull/7016))
+- Make CLI arguments parsing more backwards compatible ([#7004](https://github.com/paritytech/parity/pull/7004))
+- Fixes for parity-extension ([#6990](https://github.com/paritytech/parity/pull/6990))
+- Update ethcore-bigint ([#6992](https://github.com/paritytech/parity/pull/6992))
+- Get local transactions by hash in the light client ([#6874](https://github.com/paritytech/parity/pull/6874))
+- Warn when blacklisted account present in store ([#6875](https://github.com/paritytech/parity/pull/6875))
+- Skip nonce check for gas estimation ([#6997](https://github.com/paritytech/parity/pull/6997))
+- Creating pending block with all transactions from the queue ([#6942](https://github.com/paritytech/parity/pull/6942))
+- Removes `MAX_TX_TO_IMPORT` from `ChainSync` ([#6976](https://github.com/paritytech/parity/pull/6976))
+- SecretStore: versioned keys ([#6910](https://github.com/paritytech/parity/pull/6910))
+- Removes `FUTURE_QUEUE_LIMITS_SHIFT` ([#6962](https://github.com/paritytech/parity/pull/6962))
+- Set zero nonce and gas price for calls by default ([#6954](https://github.com/paritytech/parity/pull/6954))
+- Add hint in ActionParams for splitting code/data ([#6957](https://github.com/paritytech/parity/pull/6957))
+- Return decoded seal fields. ([#6932](https://github.com/paritytech/parity/pull/6932))
+- Fix serialization of status in transaction receipts. ([#6926](https://github.com/paritytech/parity/pull/6926))
+- Reserve nonces for signing ([#6834](https://github.com/paritytech/parity/pull/6834))
+- Windows fixes ([#6921](https://github.com/paritytech/parity/pull/6921))
+- Don't add {css,js}.map from dapps ([#6931](https://github.com/paritytech/parity/pull/6931))
+- Fix JSON tracing for sub-calls. ([#6842](https://github.com/paritytech/parity/pull/6842))
+- Shell updates (bonds, updated Dapps) ([#6897](https://github.com/paritytech/parity/pull/6897))
+- Fix [#6228](https://github.com/paritytech/parity/issues/6228): do not display eth price in cli for etc ([#6877](https://github.com/paritytech/parity/pull/6877))
+- Fix mining help ([#6885](https://github.com/paritytech/parity/pull/6885))
+- Refactor static context check in CREATE. ([#6886](https://github.com/paritytech/parity/pull/6886))
+- Cleanup some configuration options ([#6878](https://github.com/paritytech/parity/pull/6878))
+- Fix serialization of non-localized transactions ([#6868](https://github.com/paritytech/parity/pull/6868))
+- Updated ntp to version 0.3 ([#6854](https://github.com/paritytech/parity/pull/6854))
+- Align README with 1.8 and prepare CHANGELOG with 1.8.1 ([#6833](https://github.com/paritytech/parity/pull/6833))
+- Return error on timed unlock ([#6777](https://github.com/paritytech/parity/pull/6777))
+- Fix dapps tests in master ([#6866](https://github.com/paritytech/parity/pull/6866))
+- Ethstore optimizations ([#6827](https://github.com/paritytech/parity/pull/6827))
+- Add ECIP1017 to Morden config ([#6810](https://github.com/paritytech/parity/pull/6810))
+- Remove all package publishing to npm ([#6838](https://github.com/paritytech/parity/pull/6838))
+- Util crates use tempdir crate instead of devtools to create temp path ([#6807](https://github.com/paritytech/parity/pull/6807))
+- Trigger js build ([#6836](https://github.com/paritytech/parity/pull/6836))
+- Clean-up scripts. ([#6832](https://github.com/paritytech/parity/pull/6832))
+- Tweaked snapshot sync threshold ([#6829](https://github.com/paritytech/parity/pull/6829))
+- Integrate UI 2 ([#6819](https://github.com/paritytech/parity/pull/6819))
+- Refresh cached tokens based on registry info & random balances ([#6818](https://github.com/paritytech/parity/pull/6818))
+- Change keypath derivation logic ([#6815](https://github.com/paritytech/parity/pull/6815))
+- Refactors journaldb as a separate crate ([#6801](https://github.com/paritytech/parity/pull/6801))
+- Trigger UI build. ([#6817](https://github.com/paritytech/parity/pull/6817))
+- Bumped more crate versions ([#6809](https://github.com/paritytech/parity/pull/6809))
+- Fix RPC compilation warnings. ([#6808](https://github.com/paritytech/parity/pull/6808))
+- Remove internal ipc ([#6795](https://github.com/paritytech/parity/pull/6795))
+- Consistent KeyValueDB errors ([#6792](https://github.com/paritytech/parity/pull/6792))
+- Squash remaining warnings ([#6789](https://github.com/paritytech/parity/pull/6789))
+- Forward-port [#6754](https://github.com/paritytech/parity/issues/6754) [#6755](https://github.com/paritytech/parity/issues/6755) ([#6785](https://github.com/paritytech/parity/pull/6785))
+- Removed duplicated versions of clippy ([#6776](https://github.com/paritytech/parity/pull/6776))
+- Updated ethabi to version 4.0 ([#6742](https://github.com/paritytech/parity/pull/6742))
+- Updated rpc_cli and parity to rpassword 1.0 ([#6774](https://github.com/paritytech/parity/pull/6774))
+- Fix sign data typo ([#6750](https://github.com/paritytech/parity/pull/6750))
+- Refactoring/cache 6693 ([#6772](https://github.com/paritytech/parity/pull/6772))
+- Fix CHANGLOG for 1.8.0 ([#6751](https://github.com/paritytech/parity/pull/6751))
+- Removes redundant `mut` in service.rs.in ([#6775](https://github.com/paritytech/parity/pull/6775))
+- Remove redundant `mut` ([#6773](https://github.com/paritytech/parity/pull/6773))
+- Fixed kovan chain validation ([#6758](https://github.com/paritytech/parity/pull/6758))
+- Removed redundant evm deps ([#6757](https://github.com/paritytech/parity/pull/6757))
+- Fixed modexp gas calculation overflow ([#6741](https://github.com/paritytech/parity/pull/6741))
+- Use cc 1.0 instead of gcc ([#6733](https://github.com/paritytech/parity/pull/6733))
+- Version bump to 1.9.0 ([#6727](https://github.com/paritytech/parity/pull/6727))
+- Fix badges not showing up ([#6730](https://github.com/paritytech/parity/pull/6730))
diff --git a/ethash/Cargo.toml b/ethash/Cargo.toml
index 87069d6f89abc5083d4b753ea7498a2e2ef23e26..91f1ce56f700aba239fa43b86bc7f1d99ec38baf 100644
--- a/ethash/Cargo.toml
+++ b/ethash/Cargo.toml
@@ -1,16 +1,21 @@
 [package]
 name = "ethash"
-version = "1.8.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [lib]
 
 [dependencies]
 log = "0.3"
-sha3 = { path = "../util/sha3" }
+keccak-hash = { path = "../util/hash" }
 primal = "0.2.3"
-parking_lot = "0.4"
+parking_lot = "0.5"
 crunchy = "0.1.0"
+memmap = "0.6"
+either = "1.0.0"
+
+[dev-dependencies]
+tempdir = "0.3"
 
 [features]
-benches = []
\ No newline at end of file
+benches = []
diff --git a/ethash/src/cache.rs b/ethash/src/cache.rs
new file mode 100644
index 0000000000000000000000000000000000000000..eef426bcf1b95ad7fe5904f4689ab3d90c42a9e3
--- /dev/null
+++ b/ethash/src/cache.rs
@@ -0,0 +1,355 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use compute::Light;
+use either::Either;
+use keccak::{H256, keccak_512};
+use memmap::MmapMut;
+use parking_lot::Mutex;
+use seed_compute::SeedHashCompute;
+
+use shared::{ETHASH_CACHE_ROUNDS, NODE_BYTES, NODE_DWORDS, Node, epoch, get_cache_size, to_hex};
+
+use std::borrow::Cow;
+use std::fs;
+use std::io::{self, Read, Write};
+use std::path::{Path, PathBuf};
+use std::slice;
+use std::sync::Arc;
+
+type Cache = Either<Vec<Node>, MmapMut>;
+
+#[derive(PartialEq, Eq, Debug, Clone, Copy)]
+pub enum OptimizeFor {
+	Cpu,
+	Memory,
+}
+
+impl Default for OptimizeFor {
+	fn default() -> Self {
+		OptimizeFor::Cpu
+	}
+}
+
+fn byte_size(cache: &Cache) -> usize {
+	use self::Either::{Left, Right};
+
+	match *cache {
+		Left(ref vec) => vec.len() * NODE_BYTES,
+		Right(ref mmap) => mmap.len(),
+	}
+}
+
+fn new_buffer(path: &Path, num_nodes: usize, ident: &H256, optimize_for: OptimizeFor) -> Cache {
+	let memmap = match optimize_for {
+		OptimizeFor::Cpu => None,
+		OptimizeFor::Memory => make_memmapped_cache(path, num_nodes, ident).ok(),
+	};
+
+	memmap.map(Either::Right).unwrap_or_else(|| {
+		Either::Left(make_memory_cache(num_nodes, ident))
+	})
+}
+
+#[derive(Clone)]
+pub struct NodeCacheBuilder {
+	// TODO: Remove this locking and just use an `Rc`?
+	seedhash: Arc<Mutex<SeedHashCompute>>,
+	optimize_for: OptimizeFor,
+}
+
+// TODO: Abstract the "optimize for" logic
+pub struct NodeCache {
+	builder: NodeCacheBuilder,
+	cache_dir: Cow<'static, Path>,
+	cache_path: PathBuf,
+	epoch: u64,
+	cache: Cache,
+}
+
+impl NodeCacheBuilder {
+	pub fn light(&self, cache_dir: &Path, block_number: u64) -> Light {
+		Light::new_with_builder(self, cache_dir, block_number)
+	}
+
+	pub fn light_from_file(&self, cache_dir: &Path, block_number: u64) -> io::Result<Light> {
+		Light::from_file_with_builder(self, cache_dir, block_number)
+	}
+
+	pub fn new<T: Into<Option<OptimizeFor>>>(optimize_for: T) -> Self {
+		NodeCacheBuilder {
+			seedhash: Arc::new(Mutex::new(SeedHashCompute::new())),
+			optimize_for: optimize_for.into().unwrap_or_default(),
+		}
+	}
+
+	fn block_number_to_ident(&self, block_number: u64) -> H256 {
+		self.seedhash.lock().hash_block_number(block_number)
+	}
+
+	fn epoch_to_ident(&self, epoch: u64) -> H256 {
+		self.seedhash.lock().hash_epoch(epoch)
+	}
+
+	pub fn from_file<P: Into<Cow<'static, Path>>>(
+		&self,
+		cache_dir: P,
+		block_number: u64,
+	) -> io::Result<NodeCache> {
+		let cache_dir = cache_dir.into();
+		let ident = self.block_number_to_ident(block_number);
+
+		let path = cache_path(cache_dir.as_ref(), &ident);
+
+		let cache = cache_from_path(&path, self.optimize_for)?;
+		let expected_cache_size = get_cache_size(block_number);
+
+		if byte_size(&cache) == expected_cache_size {
+			Ok(NodeCache {
+				builder: self.clone(),
+				epoch: epoch(block_number),
+				cache_dir: cache_dir,
+				cache_path: path,
+				cache: cache,
+			})
+		} else {
+			Err(io::Error::new(
+				io::ErrorKind::InvalidData,
+				"Node cache is of incorrect size",
+			))
+		}
+	}
+
+	pub fn new_cache<P: Into<Cow<'static, Path>>>(
+		&self,
+		cache_dir: P,
+		block_number: u64,
+	) -> NodeCache {
+		let cache_dir = cache_dir.into();
+		let ident = self.block_number_to_ident(block_number);
+
+		let cache_size = get_cache_size(block_number);
+
+		// We use `debug_assert` since it is impossible for `get_cache_size` to return an unaligned
+		// value with the current implementation. If the implementation changes, CI will catch it.
+		debug_assert!(cache_size % NODE_BYTES == 0, "Unaligned cache size");
+		let num_nodes = cache_size / NODE_BYTES;
+
+		let path = cache_path(cache_dir.as_ref(), &ident);
+		let nodes = new_buffer(&path, num_nodes, &ident, self.optimize_for);
+
+		NodeCache {
+			builder: self.clone(),
+			epoch: epoch(block_number),
+			cache_dir: cache_dir.into(),
+			cache_path: path,
+			cache: nodes,
+		}
+	}
+}
+
+impl NodeCache {
+	pub fn cache_path(&self) -> &Path {
+		&self.cache_path
+	}
+
+	pub fn flush(&mut self) -> io::Result<()> {
+		if let Some(last) = self.epoch.checked_sub(2).map(|ep| {
+			cache_path(self.cache_dir.as_ref(), &self.builder.epoch_to_ident(ep))
+		})
+		{
+			fs::remove_file(last).unwrap_or_else(|error| match error.kind() {
+				io::ErrorKind::NotFound => (),
+				_ => warn!("Error removing stale DAG cache: {:?}", error),
+			});
+		}
+
+		consume_cache(&mut self.cache, &self.cache_path)
+	}
+}
+
+fn make_memmapped_cache(path: &Path, num_nodes: usize, ident: &H256) -> io::Result<MmapMut> {
+	use std::fs::OpenOptions;
+
+	let file = OpenOptions::new()
+		.read(true)
+		.write(true)
+		.create(true)
+		.open(&path)?;
+	file.set_len((num_nodes * NODE_BYTES) as _)?;
+
+	let mut memmap = unsafe { MmapMut::map_mut(&file)? };
+
+	unsafe { initialize_memory(memmap.as_mut_ptr() as *mut Node, num_nodes, ident) };
+
+	Ok(memmap)
+}
+
+fn make_memory_cache(num_nodes: usize, ident: &H256) -> Vec<Node> {
+	let mut nodes: Vec<Node> = Vec::with_capacity(num_nodes);
+	// Use uninit instead of unnecessarily writing `size_of::<Node>() * num_nodes` 0s
+	unsafe {
+		initialize_memory(nodes.as_mut_ptr(), num_nodes, ident);
+		nodes.set_len(num_nodes);
+	}
+
+	nodes
+}
+
+fn cache_path<'a, P: Into<Cow<'a, Path>>>(path: P, ident: &H256) -> PathBuf {
+	let mut buf = path.into().into_owned();
+	buf.push(to_hex(ident));
+	buf
+}
+
+fn consume_cache(cache: &mut Cache, path: &Path) -> io::Result<()> {
+	use std::fs::OpenOptions;
+
+	match *cache {
+		Either::Left(ref mut vec) => {
+			let mut file = OpenOptions::new()
+				.read(true)
+				.write(true)
+				.create(true)
+				.open(&path)?;
+
+			let buf = unsafe {
+				slice::from_raw_parts_mut(vec.as_mut_ptr() as *mut u8, vec.len() * NODE_BYTES)
+			};
+
+			file.write_all(buf).map(|_| ())
+		}
+		Either::Right(ref mmap) => {
+			mmap.flush()
+		}
+	}
+}
+
+fn cache_from_path(path: &Path, optimize_for: OptimizeFor) -> io::Result<Cache> {
+	let memmap = match optimize_for {
+		OptimizeFor::Cpu => None,
+		OptimizeFor::Memory => {
+			let file = fs::OpenOptions::new().read(true).write(true).create(true).open(path)?;
+			unsafe { MmapMut::map_mut(&file).ok() }
+		},
+	};
+
+	memmap.map(Either::Right).ok_or(()).or_else(|_| {
+		read_from_path(path).map(Either::Left)
+	})
+}
+
+fn read_from_path(path: &Path) -> io::Result<Vec<Node>> {
+	use std::fs::File;
+	use std::mem;
+
+	let mut file = File::open(path)?;
+
+	let mut nodes: Vec<u8> = Vec::with_capacity(file.metadata().map(|m| m.len() as _).unwrap_or(
+		NODE_BYTES * 1_000_000,
+	));
+	file.read_to_end(&mut nodes)?;
+
+	nodes.shrink_to_fit();
+
+	if nodes.len() % NODE_BYTES != 0 || nodes.capacity() % NODE_BYTES != 0 {
+		return Err(io::Error::new(
+			io::ErrorKind::Other,
+			"Node cache is not a multiple of node size",
+		));
+	}
+
+	let out: Vec<Node> = unsafe {
+		Vec::from_raw_parts(
+			nodes.as_mut_ptr() as *mut _,
+			nodes.len() / NODE_BYTES,
+			nodes.capacity() / NODE_BYTES,
+		)
+	};
+
+	mem::forget(nodes);
+
+	Ok(out)
+}
+
+impl AsRef<[Node]> for NodeCache {
+	fn as_ref(&self) -> &[Node] {
+		match self.cache {
+			Either::Left(ref vec) => vec,
+			Either::Right(ref mmap) => unsafe {
+				let bytes = mmap.as_ptr();
+				// This isn't a safety issue, so we can keep this a debug lint. We don't care about
+				// people manually messing with the files unless it can cause unsafety, but if we're
+				// generating incorrect files then we want to catch that in CI.
+				debug_assert_eq!(mmap.len() % NODE_BYTES, 0);
+				slice::from_raw_parts(bytes as _, mmap.len() / NODE_BYTES)
+			},
+		}
+	}
+}
+
+// This takes a raw pointer and a counter because `memory` may be uninitialized. `memory` _must_ be
+// a pointer to the beginning of an allocated but possibly-uninitialized block of
+// `num_nodes * NODE_BYTES` bytes
+//
+// We have to use raw pointers to read/write uninit, using "normal" indexing causes LLVM to freak
+// out. It counts as a read and causes all writes afterwards to be elided. Yes, really. I know, I
+// want to refactor this to use less `unsafe` as much as the next rustacean.
+unsafe fn initialize_memory(memory: *mut Node, num_nodes: usize, ident: &H256) {
+	let dst = memory as *mut u8;
+
+	debug_assert_eq!(ident.len(), 32);
+	keccak_512::unchecked(dst, NODE_BYTES, ident.as_ptr(), ident.len());
+
+	for i in 1..num_nodes {
+		// We use raw pointers here, see above
+		let dst = memory.offset(i as _) as *mut u8;
+		let src = memory.offset(i as isize - 1) as *mut u8;
+
+		keccak_512::unchecked(dst, NODE_BYTES, src, NODE_BYTES);
+	}
+
+	// Now this is initialized, we can treat it as a slice.
+	let nodes: &mut [Node] = slice::from_raw_parts_mut(memory, num_nodes);
+
+	// For `unroll!`, see below. If the literal in `unroll!` is not the same as the RHS here then
+	// these have got out of sync! Don't let this happen!
+	debug_assert_eq!(NODE_DWORDS, 8);
+
+	// This _should_ get unrolled by the compiler, since it's not using the loop variable.
+	for _ in 0..ETHASH_CACHE_ROUNDS {
+		for i in 0..num_nodes {
+			let data_idx = (num_nodes - 1 + i) % num_nodes;
+			let idx = nodes.get_unchecked_mut(i).as_words()[0] as usize % num_nodes;
+
+			let data = {
+				let mut data: Node = nodes.get_unchecked(data_idx).clone();
+				let rhs: &Node = nodes.get_unchecked(idx);
+
+				unroll! {
+					for w in 0..8 {
+						*data.as_dwords_mut().get_unchecked_mut(w) ^=
+							*rhs.as_dwords().get_unchecked(w);
+					}
+				}
+
+				data
+			};
+
+			keccak_512::write(&data.bytes, &mut nodes.get_unchecked_mut(i).bytes);
+		}
+	}
+}
diff --git a/ethash/src/compute.rs b/ethash/src/compute.rs
index ab2c758df30b9cda4eecb3359999053aa9483b37..48906b9edeb6b9565850631f529becf08dd5f840 100644
--- a/ethash/src/compute.rs
+++ b/ethash/src/compute.rs
@@ -19,30 +19,16 @@
 
 // TODO: fix endianess for big endian
 
-use primal::is_prime;
-use std::cell::Cell;
+use keccak::{keccak_512, keccak_256, H256};
+use cache::{NodeCache, NodeCacheBuilder};
+use seed_compute::SeedHashCompute;
+use shared::*;
+use std::io;
+
 use std::mem;
+use std::path::Path;
 use std::ptr;
-use sha3;
-use std::slice;
-use std::path::{Path, PathBuf};
-use std::io::{self, Read, Write};
-use std::fs::{self, File};
-
-use parking_lot::Mutex;
-
-pub const ETHASH_EPOCH_LENGTH: u64 = 30000;
-pub const ETHASH_CACHE_ROUNDS: usize = 3;
-pub const ETHASH_MIX_BYTES: usize = 128;
-pub const ETHASH_ACCESSES: usize = 64;
-pub const ETHASH_DATASET_PARENTS: u32 = 256;
-
-const DATASET_BYTES_INIT: u64 = 1 << 30;
-const DATASET_BYTES_GROWTH: u64 = 1 << 23;
-const CACHE_BYTES_INIT: u64 = 1 << 24;
-const CACHE_BYTES_GROWTH: u64 = 1 << 17;
-const NODE_WORDS: usize = 64 / 4;
-const NODE_BYTES: usize = 64;
+
 const MIX_WORDS: usize = ETHASH_MIX_BYTES / 4;
 const MIX_NODES: usize = MIX_WORDS / NODE_WORDS;
 const FNV_PRIME: u32 = 0x01000193;
@@ -55,48 +41,24 @@ pub struct ProofOfWork {
 	pub mix_hash: H256,
 }
 
-struct Node {
-	bytes: [u8; NODE_BYTES],
-}
-
-impl Default for Node {
-	fn default() -> Self {
-		Node { bytes: [0u8; NODE_BYTES] }
-	}
-}
-
-impl Clone for Node {
-	fn clone(&self) -> Self {
-		Node { bytes: *&self.bytes }
-	}
-}
-
-impl Node {
-	#[inline]
-	fn as_words(&self) -> &[u32; NODE_WORDS] {
-		unsafe { mem::transmute(&self.bytes) }
-	}
-
-	#[inline]
-	fn as_words_mut(&mut self) -> &mut [u32; NODE_WORDS] {
-		unsafe { mem::transmute(&mut self.bytes) }
-	}
-}
-
-pub type H256 = [u8; 32];
-
 pub struct Light {
-	cache_dir: PathBuf,
 	block_number: u64,
-	cache: Vec<Node>,
-	seed_compute: Mutex<SeedHashCompute>,
+	cache: NodeCache,
 }
 
 /// Light cache structure
 impl Light {
-	/// Create a new light cache for a given block number
-	pub fn new<T: AsRef<Path>>(cache_dir: T, block_number: u64) -> Light {
-		light_new(cache_dir, block_number)
+	pub fn new_with_builder(
+		builder: &NodeCacheBuilder,
+		cache_dir: &Path,
+		block_number: u64,
+	) -> Self {
+		let cache = builder.new_cache(cache_dir.to_path_buf(), block_number);
+
+		Light {
+			block_number: block_number,
+			cache: cache,
+		}
 	}
 
 	/// Calculate the light boundary data
@@ -106,107 +68,25 @@ impl Light {
 		light_compute(self, header_hash, nonce)
 	}
 
-	pub fn file_path<T: AsRef<Path>>(cache_dir: T, seed_hash: H256) -> PathBuf {
-		let mut cache_dir = cache_dir.as_ref().to_path_buf();
-		cache_dir.push(to_hex(&seed_hash));
-		cache_dir
-	}
-
-	pub fn from_file<T: AsRef<Path>>(cache_dir: T, block_number: u64) -> io::Result<Light> {
-		let seed_compute = SeedHashCompute::new();
-		let path = Light::file_path(&cache_dir, seed_compute.get_seedhash(block_number));
-		let mut file = File::open(path)?;
-
-		let cache_size = get_cache_size(block_number);
-		if file.metadata()?.len() != cache_size as u64 {
-			return Err(io::Error::new(io::ErrorKind::Other, "Cache file size mismatch"));
-		}
-		let num_nodes = cache_size / NODE_BYTES;
-		let mut nodes: Vec<Node> = Vec::with_capacity(num_nodes);
-
-		unsafe { nodes.set_len(num_nodes) };
-
-		let buf = unsafe { slice::from_raw_parts_mut(nodes.as_mut_ptr() as *mut u8, cache_size) };
-		file.read_exact(buf)?;
+	pub fn from_file_with_builder(
+		builder: &NodeCacheBuilder,
+		cache_dir: &Path,
+		block_number: u64,
+	) -> io::Result<Self> {
+		let cache = builder.from_file(cache_dir.to_path_buf(), block_number)?;
 		Ok(Light {
-			block_number,
-			cache_dir: cache_dir.as_ref().to_path_buf(),
-			cache: nodes,
-			seed_compute: Mutex::new(seed_compute),
+			block_number: block_number,
+			cache: cache,
 		})
 	}
 
-	pub fn to_file(&self) -> io::Result<PathBuf> {
-		let seed_compute = self.seed_compute.lock();
-		let path = Light::file_path(&self.cache_dir, seed_compute.get_seedhash(self.block_number));
-
-		if self.block_number >= ETHASH_EPOCH_LENGTH * 2 {
-			let deprecated = Light::file_path(
-				&self.cache_dir,
-				seed_compute.get_seedhash(self.block_number - ETHASH_EPOCH_LENGTH * 2)
-			);
-
-			if deprecated.exists() {
-				debug!(target: "ethash", "removing: {:?}", &deprecated);
-				fs::remove_file(deprecated)?;
-			}
-		}
-
-		fs::create_dir_all(path.parent().unwrap())?;
-		let mut file = File::create(&path)?;
-
-		let cache_size = self.cache.len() * NODE_BYTES;
-		let buf = unsafe { slice::from_raw_parts(self.cache.as_ptr() as *const u8, cache_size) };
-		file.write(buf)?;
-		Ok(path)
-	}
-}
-
-pub struct SeedHashCompute {
-	prev_epoch: Cell<u64>,
-	prev_seedhash: Cell<H256>,
-}
-
-impl SeedHashCompute {
-	#[inline]
-	pub fn new() -> SeedHashCompute {
-		SeedHashCompute {
-			prev_epoch: Cell::new(0),
-			prev_seedhash: Cell::new([0u8; 32]),
-		}
-	}
-
-	#[inline]
-	fn reset_cache(&self) {
-		self.prev_epoch.set(0);
-		self.prev_seedhash.set([0u8; 32]);
-	}
-
-	#[inline]
-	pub fn get_seedhash(&self, block_number: u64) -> H256 {
-		let epoch = block_number / ETHASH_EPOCH_LENGTH;
-		if epoch < self.prev_epoch.get() {
-			// can't build on previous hash if requesting an older block
-			self.reset_cache();
-		}
-		if epoch > self.prev_epoch.get() {
-			let seed_hash = SeedHashCompute::resume_compute_seedhash(self.prev_seedhash.get(), self.prev_epoch.get(), epoch);
-			self.prev_seedhash.set(seed_hash);
-			self.prev_epoch.set(epoch);
-		}
-		self.prev_seedhash.get()
-	}
-
-	#[inline]
-	pub fn resume_compute_seedhash(mut hash: H256, start_epoch: u64, end_epoch: u64) -> H256 {
-		for _ in start_epoch..end_epoch {
-			unsafe { sha3::sha3_256(hash[..].as_mut_ptr(), 32, hash[..].as_ptr(), 32) };
-		}
-		hash
+	pub fn to_file(&mut self) -> io::Result<&Path> {
+		self.cache.flush()?;
+		Ok(self.cache.cache_path())
 	}
 }
 
-pub fn slow_get_seedhash(block_number: u64) -> H256 {
+pub fn slow_hash_block_number(block_number: u64) -> H256 {
 	SeedHashCompute::resume_compute_seedhash([0u8; 32], 0, block_number / ETHASH_EPOCH_LENGTH)
 }
 
@@ -214,34 +94,6 @@ fn fnv_hash(x: u32, y: u32) -> u32 {
 	return x.wrapping_mul(FNV_PRIME) ^ y;
 }
 
-fn sha3_512(input: &[u8], output: &mut [u8]) {
-	unsafe { sha3::sha3_512(output.as_mut_ptr(), output.len(), input.as_ptr(), input.len()) };
-}
-
-fn sha3_512_inplace(input: &mut [u8]) {
-	// This is safe since `sha3_*` uses an internal buffer and copies the result to the output. This
-	// means that we can reuse the input buffer for both input and output.
-	unsafe { sha3::sha3_512(input.as_mut_ptr(), input.len(), input.as_ptr(), input.len()) };
-}
-
-fn get_cache_size(block_number: u64) -> usize {
-	let mut sz: u64 = CACHE_BYTES_INIT + CACHE_BYTES_GROWTH * (block_number / ETHASH_EPOCH_LENGTH);
-	sz = sz - NODE_BYTES as u64;
-	while !is_prime(sz / NODE_BYTES as u64) {
-		sz = sz - 2 * NODE_BYTES as u64;
-	}
-	sz as usize
-}
-
-fn get_data_size(block_number: u64) -> usize {
-	let mut sz: u64 = DATASET_BYTES_INIT + DATASET_BYTES_GROWTH * (block_number / ETHASH_EPOCH_LENGTH);
-	sz = sz - ETHASH_MIX_BYTES as u64;
-	while !is_prime(sz / ETHASH_MIX_BYTES as u64) {
-		sz = sz - 2 * ETHASH_MIX_BYTES as u64;
-	}
-	sz as usize
-}
-
 /// Difficulty quick check for POW preverification
 ///
 /// `header_hash`      The hash of the header
@@ -250,23 +102,23 @@ fn get_data_size(block_number: u64) -> usize {
 /// Boundary recovered from mix hash
 pub fn quick_get_difficulty(header_hash: &H256, nonce: u64, mix_hash: &H256) -> H256 {
 	unsafe {
-		// This is safe - the `sha3_512` call below reads the first 40 bytes (which we explicitly set
+		// This is safe - the `keccak_512` call below reads the first 40 bytes (which we explicitly set
 		// with two `copy_nonoverlapping` calls) but writes the first 64, and then we explicitly write
-		// the next 32 bytes before we read the whole thing with `sha3_256`.
+		// the next 32 bytes before we read the whole thing with `keccak_256`.
 		//
 		// This cannot be elided by the compiler as it doesn't know the implementation of
-		// `sha3_512`.
+		// `keccak_512`.
 		let mut buf: [u8; 64 + 32] = mem::uninitialized();
 
 		ptr::copy_nonoverlapping(header_hash.as_ptr(), buf.as_mut_ptr(), 32);
 		ptr::copy_nonoverlapping(mem::transmute(&nonce), buf[32..].as_mut_ptr(), 8);
 
-		sha3::sha3_512(buf.as_mut_ptr(), 64, buf.as_ptr(), 40);
+		keccak_512::unchecked(buf.as_mut_ptr(), 64, buf.as_ptr(), 40);
 		ptr::copy_nonoverlapping(mix_hash.as_ptr(), buf[64..].as_mut_ptr(), 32);
 
-		// This is initialized in `sha3_256`
+		// This is initialized in `keccak_256`
 		let mut hash: [u8; 32] = mem::uninitialized();
-		sha3::sha3_256(hash.as_mut_ptr(), hash.len(), buf.as_ptr(), buf.len());
+		keccak_256::unchecked(hash.as_mut_ptr(), hash.len(), buf.as_ptr(), buf.len());
 
 		hash
 	}
@@ -320,27 +172,23 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 		half_mix: unsafe {
 			// Pack `header_hash` and `nonce` together
 			// We explicitly write the first 40 bytes, leaving the last 24 as uninitialized. Then
-			// `sha3_512` reads the first 40 bytes (4th parameter) and overwrites the entire array,
+			// `keccak_512` reads the first 40 bytes (4th parameter) and overwrites the entire array,
 			// leaving it fully initialized.
 			let mut out: [u8; NODE_BYTES] = mem::uninitialized();
 
-			ptr::copy_nonoverlapping(
-				header_hash.as_ptr(),
-				out.as_mut_ptr(),
-				header_hash.len(),
-			);
+			ptr::copy_nonoverlapping(header_hash.as_ptr(), out.as_mut_ptr(), header_hash.len());
 			ptr::copy_nonoverlapping(
 				mem::transmute(&nonce),
 				out[header_hash.len()..].as_mut_ptr(),
 				mem::size_of::<u64>(),
 			);
 
-			// compute sha3-512 hash and replicate across mix
-			sha3::sha3_512(
+			// compute keccak-512 hash and replicate across mix
+			keccak_512::unchecked(
 				out.as_mut_ptr(),
 				NODE_BYTES,
 				out.as_ptr(),
-				header_hash.len() + mem::size_of::<u64>()
+				header_hash.len() + mem::size_of::<u64>(),
 			);
 
 			Node { bytes: out }
@@ -354,7 +202,7 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 	let page_size = 4 * MIX_WORDS;
 	let num_full_pages = (full_size / page_size) as u32;
 	// deref once for better performance
-	let cache: &[Node] = &light.cache;
+	let cache: &[Node] = light.cache.as_ref();
 	let first_val = buf.half_mix.as_words()[0];
 
 	debug_assert_eq!(MIX_NODES, 2);
@@ -364,14 +212,10 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 		let index = {
 			// This is trivially safe, but does not work on big-endian. The safety of this is
 			// asserted in debug builds (see the definition of `make_const_array!`).
-			let mix_words: &mut [u32; MIX_WORDS] = unsafe {
-				make_const_array!(MIX_WORDS, &mut mix)
-			};
-
-			fnv_hash(
-				first_val ^ i,
-				mix_words[i as usize % MIX_WORDS]
-			) % num_full_pages
+			let mix_words: &mut [u32; MIX_WORDS] =
+				unsafe { make_const_array!(MIX_WORDS, &mut mix) };
+
+			fnv_hash(first_val ^ i, mix_words[i as usize % MIX_WORDS]) % num_full_pages
 		};
 
 		unroll! {
@@ -403,9 +247,8 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 		// times and set each index, leaving the array fully initialized. THIS ONLY WORKS ON LITTLE-
 		// ENDIAN MACHINES. See a future PR to make this and the rest of the code work correctly on
 		// big-endian arches like mips.
-		let mut compress: &mut [u32; MIX_WORDS / 4] = unsafe {
-			make_const_array!(MIX_WORDS / 4, &mut buf.compress_bytes)
-		};
+		let compress: &mut [u32; MIX_WORDS / 4] =
+			unsafe { make_const_array!(MIX_WORDS / 4, &mut buf.compress_bytes) };
 
 		// Compress mix
 		debug_assert_eq!(MIX_WORDS / 4, 8);
@@ -427,10 +270,10 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 	let value: H256 = unsafe {
 		// We can interpret the buffer as an array of `u8`s, since it's `repr(C)`.
 		let read_ptr: *const u8 = mem::transmute(&buf);
-		// We overwrite the second half since `sha3_256` has an internal buffer and so allows
+		// We overwrite the second half since `keccak_256` has an internal buffer and so allows
 		// overlapping arrays as input.
 		let write_ptr: *mut u8 = mem::transmute(&mut buf.compress_bytes);
-		sha3::sha3_256(
+		keccak_256::unchecked(
 			write_ptr,
 			buf.compress_bytes.len(),
 			read_ptr,
@@ -439,25 +282,21 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 		buf.compress_bytes
 	};
 
-	ProofOfWork {
-		mix_hash: mix_hash,
-		value: value,
-	}
+	ProofOfWork { mix_hash: mix_hash, value: value }
 }
 
+// TODO: Use the `simd` crate
 fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node {
 	let num_parent_nodes = cache.len();
 	let mut ret = cache[node_index as usize % num_parent_nodes].clone();
 	ret.as_words_mut()[0] ^= node_index;
 
-	sha3_512_inplace(&mut ret.bytes);
+	keccak_512::inplace(ret.as_bytes_mut());
 
 	debug_assert_eq!(NODE_WORDS, 16);
 	for i in 0..ETHASH_DATASET_PARENTS as u32 {
-		let parent_index = fnv_hash(
-			node_index ^ i,
-			ret.as_words()[i as usize % NODE_WORDS],
-		) % num_parent_nodes as u32;
+		let parent_index = fnv_hash(node_index ^ i, ret.as_words()[i as usize % NODE_WORDS]) %
+			num_parent_nodes as u32;
 		let parent = &cache[parent_index as usize];
 
 		unroll! {
@@ -467,159 +306,110 @@ fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node {
 		}
 	}
 
-	sha3_512_inplace(&mut ret.bytes);
+	keccak_512::inplace(ret.as_bytes_mut());
 
 	ret
 }
 
-fn light_new<T: AsRef<Path>>(cache_dir: T, block_number: u64) -> Light {
-	let seed_compute = SeedHashCompute::new();
-	let seedhash = seed_compute.get_seedhash(block_number);
-	let cache_size = get_cache_size(block_number);
-
-	assert!(cache_size % NODE_BYTES == 0, "Unaligned cache size");
-	let num_nodes = cache_size / NODE_BYTES;
-
-	let mut nodes: Vec<Node> = Vec::with_capacity(num_nodes);
-	unsafe {
-		// Use uninit instead of unnecessarily writing `size_of::<Node>() * num_nodes` 0s
-		nodes.set_len(num_nodes);
-
-		sha3_512(&seedhash[0..32], &mut nodes.get_unchecked_mut(0).bytes);
-		for i in 1..num_nodes {
-			sha3::sha3_512(nodes.get_unchecked_mut(i).bytes.as_mut_ptr(), NODE_BYTES, nodes.get_unchecked(i - 1).bytes.as_ptr(), NODE_BYTES);
-		}
-
-		debug_assert_eq!(NODE_WORDS, 16);
-
-		// This _should_ get unrolled by the compiler, since it's not using the loop variable.
-		for _ in 0..ETHASH_CACHE_ROUNDS {
-			for i in 0..num_nodes {
-				let idx = *nodes.get_unchecked_mut(i).as_words().get_unchecked(0) as usize % num_nodes;
-				let mut data = nodes.get_unchecked((num_nodes - 1 + i) % num_nodes).clone();
-
-				unroll! {
-					for w in 0..16 {
-						*data.as_words_mut().get_unchecked_mut(w) ^= *nodes.get_unchecked(idx).as_words().get_unchecked(w);
-					}
-				}
-
-				sha3_512(&data.bytes, &mut nodes.get_unchecked_mut(i).bytes);
-			}
-		}
+#[cfg(test)]
+mod test {
+	use super::*;
+	use std::fs;
+	use tempdir::TempDir;
+
+	#[test]
+	fn test_get_cache_size() {
+		// https://github.com/ethereum/wiki/wiki/Ethash/ef6b93f9596746a088ea95d01ca2778be43ae68f#data-sizes
+		assert_eq!(16776896usize, get_cache_size(0));
+		assert_eq!(16776896usize, get_cache_size(1));
+		assert_eq!(16776896usize, get_cache_size(ETHASH_EPOCH_LENGTH - 1));
+		assert_eq!(16907456usize, get_cache_size(ETHASH_EPOCH_LENGTH));
+		assert_eq!(16907456usize, get_cache_size(ETHASH_EPOCH_LENGTH + 1));
+		assert_eq!(284950208usize, get_cache_size(2046 * ETHASH_EPOCH_LENGTH));
+		assert_eq!(285081536usize, get_cache_size(2047 * ETHASH_EPOCH_LENGTH));
+		assert_eq!(285081536usize, get_cache_size(2048 * ETHASH_EPOCH_LENGTH - 1));
 	}
 
-	Light {
-		block_number,
-		cache_dir: cache_dir.as_ref().to_path_buf(),
-		cache: nodes,
-		seed_compute: Mutex::new(seed_compute),
+	#[test]
+	fn test_get_data_size() {
+		// https://github.com/ethereum/wiki/wiki/Ethash/ef6b93f9596746a088ea95d01ca2778be43ae68f#data-sizes
+		assert_eq!(1073739904usize, get_data_size(0));
+		assert_eq!(1073739904usize, get_data_size(1));
+		assert_eq!(1073739904usize, get_data_size(ETHASH_EPOCH_LENGTH - 1));
+		assert_eq!(1082130304usize, get_data_size(ETHASH_EPOCH_LENGTH));
+		assert_eq!(1082130304usize, get_data_size(ETHASH_EPOCH_LENGTH + 1));
+		assert_eq!(18236833408usize, get_data_size(2046 * ETHASH_EPOCH_LENGTH));
+		assert_eq!(18245220736usize, get_data_size(2047 * ETHASH_EPOCH_LENGTH));
 	}
-}
 
-static CHARS: &'static [u8] = b"0123456789abcdef";
-fn to_hex(bytes: &[u8]) -> String {
-	let mut v = Vec::with_capacity(bytes.len() * 2);
-	for &byte in bytes.iter() {
-		v.push(CHARS[(byte >> 4) as usize]);
-		v.push(CHARS[(byte & 0xf) as usize]);
+	#[test]
+	fn test_difficulty_test() {
+		let hash = [
+			0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe, 0xe4, 0x0a, 0xb3,
+			0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f, 0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94,
+			0x05, 0x52, 0x7d, 0x72,
+		];
+		let mix_hash = [
+			0x1f, 0xff, 0x04, 0xce, 0xc9, 0x41, 0x73, 0xfd, 0x59, 0x1e, 0x3d, 0x89, 0x60, 0xce,
+			0x6b, 0xdf, 0x8b, 0x19, 0x71, 0x04, 0x8c, 0x71, 0xff, 0x93, 0x7b, 0xb2, 0xd3, 0x2a,
+			0x64, 0x31, 0xab, 0x6d,
+		];
+		let nonce = 0xd7b3ac70a301a249;
+		let boundary_good = [
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0x9b, 0x6c, 0x69, 0xbc, 0x2c, 0xe2, 0xa2,
+			0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a,
+			0xe9, 0x7e, 0x53, 0x84,
+		];
+		assert_eq!(quick_get_difficulty(&hash, nonce, &mix_hash)[..], boundary_good[..]);
+		let boundary_bad = [
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3a, 0x9b, 0x6c, 0x69, 0xbc, 0x2c, 0xe2, 0xa2,
+			0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a,
+			0xe9, 0x7e, 0x53, 0x84,
+		];
+		assert!(quick_get_difficulty(&hash, nonce, &mix_hash)[..] != boundary_bad[..]);
 	}
 
-	unsafe { String::from_utf8_unchecked(v) }
-}
-
-#[test]
-fn test_get_cache_size() {
-	// https://github.com/ethereum/wiki/wiki/Ethash/ef6b93f9596746a088ea95d01ca2778be43ae68f#data-sizes
-	assert_eq!(16776896usize, get_cache_size(0));
-	assert_eq!(16776896usize, get_cache_size(1));
-	assert_eq!(16776896usize, get_cache_size(ETHASH_EPOCH_LENGTH - 1));
-	assert_eq!(16907456usize, get_cache_size(ETHASH_EPOCH_LENGTH));
-	assert_eq!(16907456usize, get_cache_size(ETHASH_EPOCH_LENGTH + 1));
-	assert_eq!(284950208usize, get_cache_size(2046 * ETHASH_EPOCH_LENGTH));
-	assert_eq!(285081536usize, get_cache_size(2047 * ETHASH_EPOCH_LENGTH));
-	assert_eq!(285081536usize, get_cache_size(2048 * ETHASH_EPOCH_LENGTH - 1));
-}
-
-#[test]
-fn test_get_data_size() {
-	// https://github.com/ethereum/wiki/wiki/Ethash/ef6b93f9596746a088ea95d01ca2778be43ae68f#data-sizes
-	assert_eq!(1073739904usize, get_data_size(0));
-	assert_eq!(1073739904usize, get_data_size(1));
-	assert_eq!(1073739904usize, get_data_size(ETHASH_EPOCH_LENGTH - 1));
-	assert_eq!(1082130304usize, get_data_size(ETHASH_EPOCH_LENGTH));
-	assert_eq!(1082130304usize, get_data_size(ETHASH_EPOCH_LENGTH + 1));
-	assert_eq!(18236833408usize, get_data_size(2046 * ETHASH_EPOCH_LENGTH));
-	assert_eq!(18245220736usize, get_data_size(2047 * ETHASH_EPOCH_LENGTH));
-}
-
-#[test]
-fn test_difficulty_test() {
-	let hash = [0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe, 0xe4, 0x0a, 0xb3, 0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f, 0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94, 0x05, 0x52, 0x7d, 0x72];
-	let mix_hash = [0x1f, 0xff, 0x04, 0xce, 0xc9, 0x41, 0x73, 0xfd, 0x59, 0x1e, 0x3d, 0x89, 0x60, 0xce, 0x6b, 0xdf, 0x8b, 0x19, 0x71, 0x04, 0x8c, 0x71, 0xff, 0x93, 0x7b, 0xb2, 0xd3, 0x2a, 0x64, 0x31, 0xab, 0x6d];
-	let nonce = 0xd7b3ac70a301a249;
-	let boundary_good = [0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0x9b, 0x6c, 0x69, 0xbc, 0x2c, 0xe2, 0xa2, 0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a, 0xe9, 0x7e, 0x53, 0x84];
-	assert_eq!(quick_get_difficulty(&hash, nonce, &mix_hash)[..], boundary_good[..]);
-	let boundary_bad = [0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3a, 0x9b, 0x6c, 0x69, 0xbc, 0x2c, 0xe2, 0xa2, 0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a, 0xe9, 0x7e, 0x53, 0x84];
-	assert!(quick_get_difficulty(&hash, nonce, &mix_hash)[..] != boundary_bad[..]);
-}
-
-#[test]
-fn test_light_compute() {
-	let hash = [0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe, 0xe4, 0x0a, 0xb3, 0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f, 0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94, 0x05, 0x52, 0x7d, 0x72];
-	let mix_hash = [0x1f, 0xff, 0x04, 0xce, 0xc9, 0x41, 0x73, 0xfd, 0x59, 0x1e, 0x3d, 0x89, 0x60, 0xce, 0x6b, 0xdf, 0x8b, 0x19, 0x71, 0x04, 0x8c, 0x71, 0xff, 0x93, 0x7b, 0xb2, 0xd3, 0x2a, 0x64, 0x31, 0xab, 0x6d];
-	let boundary = [0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0x9b, 0x6c, 0x69, 0xbc, 0x2c, 0xe2, 0xa2, 0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a, 0xe9, 0x7e, 0x53, 0x84];
-	let nonce = 0xd7b3ac70a301a249;
-	// difficulty = 0x085657254bd9u64;
-	let light = Light::new(&::std::env::temp_dir(), 486382);
-	let result = light_compute(&light, &hash, nonce);
-	assert_eq!(result.mix_hash[..], mix_hash[..]);
-	assert_eq!(result.value[..], boundary[..]);
-}
-
-#[test]
-fn test_seed_compute_once() {
-	let seed_compute = SeedHashCompute::new();
-	let hash = [241, 175, 44, 134, 39, 121, 245, 239, 228, 236, 43, 160, 195, 152, 46, 7, 199, 5, 253, 147, 241, 206, 98, 43, 3, 104, 17, 40, 192, 79, 106, 162];
-	assert_eq!(seed_compute.get_seedhash(486382), hash);
-}
-
-#[test]
-fn test_seed_compute_zero() {
-	let seed_compute = SeedHashCompute::new();
-	assert_eq!(seed_compute.get_seedhash(0), [0u8; 32]);
-}
-
-#[test]
-fn test_seed_compute_after_older() {
-	let seed_compute = SeedHashCompute::new();
-	// calculating an older value first shouldn't affect the result
-	let _ = seed_compute.get_seedhash(50000);
-	let hash = [241, 175, 44, 134, 39, 121, 245, 239, 228, 236, 43, 160, 195, 152, 46, 7, 199, 5, 253, 147, 241, 206, 98, 43, 3, 104, 17, 40, 192, 79, 106, 162];
-	assert_eq!(seed_compute.get_seedhash(486382), hash);
-}
-
-#[test]
-fn test_seed_compute_after_newer() {
-	let seed_compute = SeedHashCompute::new();
-	// calculating an newer value first shouldn't affect the result
-	let _ = seed_compute.get_seedhash(972764);
-	let hash = [241, 175, 44, 134, 39, 121, 245, 239, 228, 236, 43, 160, 195, 152, 46, 7, 199, 5, 253, 147, 241, 206, 98, 43, 3, 104, 17, 40, 192, 79, 106, 162];
-	assert_eq!(seed_compute.get_seedhash(486382), hash);
-}
+	#[test]
+	fn test_light_compute() {
+		let hash = [
+			0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe, 0xe4, 0x0a, 0xb3,
+			0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f, 0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94,
+			0x05, 0x52, 0x7d, 0x72,
+		];
+		let mix_hash = [
+			0x1f, 0xff, 0x04, 0xce, 0xc9, 0x41, 0x73, 0xfd, 0x59, 0x1e, 0x3d, 0x89, 0x60, 0xce,
+			0x6b, 0xdf, 0x8b, 0x19, 0x71, 0x04, 0x8c, 0x71, 0xff, 0x93, 0x7b, 0xb2, 0xd3, 0x2a,
+			0x64, 0x31, 0xab, 0x6d,
+		];
+		let boundary = [
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0x9b, 0x6c, 0x69, 0xbc, 0x2c, 0xe2, 0xa2,
+			0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a,
+			0xe9, 0x7e, 0x53, 0x84,
+		];
+		let nonce = 0xd7b3ac70a301a249;
+
+		let tempdir = TempDir::new("").unwrap();
+		// difficulty = 0x085657254bd9u64;
+		let light = NodeCacheBuilder::new(None).light(tempdir.path(), 486382);
+		let result = light_compute(&light, &hash, nonce);
+		assert_eq!(result.mix_hash[..], mix_hash[..]);
+		assert_eq!(result.value[..], boundary[..]);
+	}
 
-#[test]
-fn test_drop_old_data() {
-	let path = ::std::env::temp_dir();
-	let first = Light::new(&path, 0).to_file().unwrap();
+	#[test]
+	fn test_drop_old_data() {
+		let tempdir = TempDir::new("").unwrap();
+		let builder = NodeCacheBuilder::new(None);
+		let first = builder.light(tempdir.path(), 0).to_file().unwrap().to_owned();
 
-	let second = Light::new(&path, ETHASH_EPOCH_LENGTH).to_file().unwrap();
-	assert!(fs::metadata(&first).is_ok());
+		let second = builder.light(tempdir.path(), ETHASH_EPOCH_LENGTH).to_file().unwrap().to_owned();
+		assert!(fs::metadata(&first).is_ok());
 
-	let _ = Light::new(&path, ETHASH_EPOCH_LENGTH * 2).to_file();
-	assert!(fs::metadata(&first).is_err());
-	assert!(fs::metadata(&second).is_ok());
+		let _ = builder.light(tempdir.path(), ETHASH_EPOCH_LENGTH * 2).to_file();
+		assert!(fs::metadata(&first).is_err());
+		assert!(fs::metadata(&second).is_ok());
 
-	let _ = Light::new(&path, ETHASH_EPOCH_LENGTH * 3).to_file();
-	assert!(fs::metadata(&second).is_err());
+		let _ = builder.light(tempdir.path(), ETHASH_EPOCH_LENGTH * 3).to_file();
+		assert!(fs::metadata(&second).is_err());
+	}
 }
diff --git a/ethash/src/keccak.rs b/ethash/src/keccak.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8ca4f543844362f13e27a73ea3efb6889f28d257
--- /dev/null
+++ b/ethash/src/keccak.rs
@@ -0,0 +1,52 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate keccak_hash as hash;
+
+pub type H256 = [u8; 32];
+
+pub mod keccak_512 {
+	use super::hash;
+
+	pub use self::hash::keccak_512 as unchecked;
+
+	pub fn write(input: &[u8], output: &mut [u8]) {
+		unsafe { hash::keccak_512(output.as_mut_ptr(), output.len(), input.as_ptr(), input.len()) };
+	}
+
+	pub fn inplace(input: &mut [u8]) {
+		// This is safe since `sha3_*` uses an internal buffer and copies the result to the output. This
+		// means that we can reuse the input buffer for both input and output.
+		unsafe { hash::keccak_512(input.as_mut_ptr(), input.len(), input.as_ptr(), input.len()) };
+	}
+}
+
+pub mod keccak_256 {
+	use super::hash;
+
+	pub use self::hash::keccak_256 as unchecked;
+
+	#[allow(dead_code)]
+	pub fn write(input: &[u8], output: &mut [u8]) {
+		unsafe { hash::keccak_256(output.as_mut_ptr(), output.len(), input.as_ptr(), input.len()) };
+	}
+
+	pub fn inplace(input: &mut [u8]) {
+		// This is safe since `sha3_*` uses an internal buffer and copies the result to the output. This
+		// means that we can reuse the input buffer for both input and output.
+		unsafe { hash::keccak_256(input.as_mut_ptr(), input.len(), input.as_ptr(), input.len()) };
+	}
+}
diff --git a/ethash/src/lib.rs b/ethash/src/lib.rs
index 9112546c443a711806fa83a93b087b733f9ef407..9d0c669d9c8c7454774d132699b4196d3a31b915 100644
--- a/ethash/src/lib.rs
+++ b/ethash/src/lib.rs
@@ -14,28 +14,38 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Ethash implementation
-//! See https://github.com/ethereum/wiki/wiki/Ethash
-
 #![cfg_attr(feature = "benches", feature(test))]
 
 extern crate primal;
-extern crate sha3;
 extern crate parking_lot;
+extern crate either;
+extern crate memmap;
 
 #[macro_use]
 extern crate crunchy;
 #[macro_use]
 extern crate log;
+
+#[cfg(test)]
+extern crate tempdir;
+
 mod compute;
+mod seed_compute;
+mod cache;
+mod keccak;
+mod shared;
 
+pub use cache::{NodeCacheBuilder, OptimizeFor};
+pub use compute::{ProofOfWork, quick_get_difficulty, slow_hash_block_number};
+use compute::Light;
+use keccak::H256;
+use parking_lot::Mutex;
+pub use seed_compute::SeedHashCompute;
+pub use shared::ETHASH_EPOCH_LENGTH;
 use std::mem;
 use std::path::{Path, PathBuf};
-use compute::Light;
-pub use compute::{ETHASH_EPOCH_LENGTH, H256, ProofOfWork, SeedHashCompute, quick_get_difficulty, slow_get_seedhash};
 
 use std::sync::Arc;
-use parking_lot::Mutex;
 
 struct LightCache {
 	recent_epoch: Option<u64>,
@@ -46,15 +56,17 @@ struct LightCache {
 
 /// Light/Full cache manager.
 pub struct EthashManager {
+	nodecache_builder: NodeCacheBuilder,
 	cache: Mutex<LightCache>,
 	cache_dir: PathBuf,
 }
 
 impl EthashManager {
 	/// Create a new new instance of ethash manager
-	pub fn new<T: AsRef<Path>>(cache_dir: T) -> EthashManager {
+	pub fn new<T: Into<Option<OptimizeFor>>>(cache_dir: &Path, optimize_for: T) -> EthashManager {
 		EthashManager {
-			cache_dir: cache_dir.as_ref().to_path_buf(),
+			cache_dir: cache_dir.to_path_buf(),
+			nodecache_builder: NodeCacheBuilder::new(optimize_for.into().unwrap_or_default()),
 			cache: Mutex::new(LightCache {
 				recent_epoch: None,
 				recent: None,
@@ -96,11 +108,17 @@ impl EthashManager {
 			};
 			match light {
 				None => {
-					let light = match Light::from_file(&self.cache_dir, block_number) {
+					let light = match self.nodecache_builder.light_from_file(
+						&self.cache_dir,
+						block_number,
+					) {
 						Ok(light) => Arc::new(light),
 						Err(e) => {
 							debug!("Light cache file not found for {}:{}", block_number, e);
-							let light = Light::new(&self.cache_dir, block_number);
+							let mut light = self.nodecache_builder.light(
+								&self.cache_dir,
+								block_number,
+							);
 							if let Err(e) = light.to_file() {
 								warn!("Light cache file write error: {}", e);
 							}
@@ -120,7 +138,10 @@ impl EthashManager {
 
 #[test]
 fn test_lru() {
-	let ethash = EthashManager::new(&::std::env::temp_dir());
+	use tempdir::TempDir;
+
+	let tempdir = TempDir::new("").unwrap();
+	let ethash = EthashManager::new(tempdir.path(), None);
 	let hash = [0u8; 32];
 	ethash.compute_light(1, &hash, 1);
 	ethash.compute_light(50000, &hash, 1);
@@ -138,24 +159,95 @@ fn test_lru() {
 mod benchmarks {
 	extern crate test;
 
-	use compute::{Light, light_compute, SeedHashCompute};
 	use self::test::Bencher;
+	use cache::{NodeCacheBuilder, OptimizeFor};
+	use compute::{Light, light_compute};
+
+	const HASH: [u8; 32] = [0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe,
+	                        0xe4, 0x0a, 0xb3, 0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f,
+	                        0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94, 0x05, 0x52, 0x7d, 0x72];
+	const NONCE: u64 = 0xd7b3ac70a301a249;
+
+	#[bench]
+	fn bench_light_compute_memmap(b: &mut Bencher) {
+		use std::env;
+
+		let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+		let light = builder.light(&env::temp_dir(), 486382);
+
+		b.iter(|| light_compute(&light, &HASH, NONCE));
+	}
 
 	#[bench]
-	fn bench_light_compute(b: &mut Bencher) {
-		use ::std::env;
+	fn bench_light_compute_memory(b: &mut Bencher) {
+		use std::env;
 
-		let hash = [0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe, 0xe4, 0x0a, 0xb3, 0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f, 0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94, 0x05, 0x52, 0x7d, 0x72];
-		let nonce = 0xd7b3ac70a301a249;
-		let light = Light::new(env::temp_dir(), 486382);
+		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+		let light = builder.light(&env::temp_dir(), 486382);
 
-		b.iter(|| light_compute(&light, &hash, nonce));
+		b.iter(|| light_compute(&light, &HASH, NONCE));
 	}
 
 	#[bench]
-	fn bench_seedhash(b: &mut Bencher) {
-		let seed_compute = SeedHashCompute::new();
+	#[ignore]
+	fn bench_light_new_round_trip_memmap(b: &mut Bencher) {
+		use std::env;
+
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+			let light = builder.light(&env::temp_dir(), 486382);
+			light_compute(&light, &HASH, NONCE);
+		});
+	}
+
+	#[bench]
+	#[ignore]
+	fn bench_light_new_round_trip_memory(b: &mut Bencher) {
+		use std::env;
+
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+			let light = builder.light(&env::temp_dir(), 486382);
+			light_compute(&light, &HASH, NONCE);
+		});
+	}
+
+	#[bench]
+	fn bench_light_from_file_round_trip_memory(b: &mut Bencher) {
+		use std::env;
+
+		let dir = env::temp_dir();
+		let height = 486382;
+		{
+			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+			let mut dummy = builder.light(&dir, height);
+			dummy.to_file().unwrap();
+		}
+
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+			let light = builder.light_from_file(&dir, 486382).unwrap();
+			light_compute(&light, &HASH, NONCE);
+		});
+	}
+
+	#[bench]
+	fn bench_light_from_file_round_trip_memmap(b: &mut Bencher) {
+		use std::env;
+
+		let dir = env::temp_dir();
+		let height = 486382;
+
+		{
+			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+			let mut dummy = builder.light(&dir, height);
+			dummy.to_file().unwrap();
+		}
 
-		b.iter(|| seed_compute.get_seedhash(486382));
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+			let light = builder.light_from_file(&dir, 486382).unwrap();
+			light_compute(&light, &HASH, NONCE);
+		});
 	}
 }
diff --git a/ethash/src/seed_compute.rs b/ethash/src/seed_compute.rs
new file mode 100644
index 0000000000000000000000000000000000000000..04774b3e39e507609c54db43ee1bccd0ca972e8a
--- /dev/null
+++ b/ethash/src/seed_compute.rs
@@ -0,0 +1,109 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use shared;
+use keccak::{keccak_256, H256};
+
+use std::cell::Cell;
+
+pub struct SeedHashCompute {
+	prev_epoch: Cell<u64>,
+	prev_seedhash: Cell<H256>,
+}
+
+impl SeedHashCompute {
+	#[inline]
+	pub fn new() -> SeedHashCompute {
+		SeedHashCompute {
+			prev_epoch: Cell::new(0),
+			prev_seedhash: Cell::new([0u8; 32]),
+		}
+	}
+
+	#[inline]
+	fn reset_cache(&self) {
+		self.prev_epoch.set(0);
+		self.prev_seedhash.set([0u8; 32]);
+	}
+
+	#[inline]
+	pub fn hash_block_number(&self, block_number: u64) -> H256 {
+		self.hash_epoch(shared::epoch(block_number))
+	}
+
+	#[inline]
+	pub fn hash_epoch(&self, epoch: u64) -> H256 {
+		if epoch < self.prev_epoch.get() {
+			// can't build on previous hash if requesting an older block
+			self.reset_cache();
+		}
+		if epoch > self.prev_epoch.get() {
+			let seed_hash = SeedHashCompute::resume_compute_seedhash(
+				self.prev_seedhash.get(),
+				self.prev_epoch.get(),
+				epoch,
+			);
+			self.prev_seedhash.set(seed_hash);
+			self.prev_epoch.set(epoch);
+		}
+		self.prev_seedhash.get()
+	}
+
+	#[inline]
+	pub fn resume_compute_seedhash(mut hash: H256, start_epoch: u64, end_epoch: u64) -> H256 {
+		for _ in start_epoch..end_epoch {
+			keccak_256::inplace(&mut hash);
+		}
+		hash
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::SeedHashCompute;
+
+	#[test]
+	fn test_seed_compute_once() {
+		let seed_compute = SeedHashCompute::new();
+		let hash = [241, 175, 44, 134, 39, 121, 245, 239, 228, 236, 43, 160, 195, 152, 46, 7, 199, 5, 253, 147, 241, 206, 98, 43, 3, 104, 17, 40, 192, 79, 106, 162];
+		assert_eq!(seed_compute.hash_block_number(486382), hash);
+	}
+
+	#[test]
+	fn test_seed_compute_zero() {
+		let seed_compute = SeedHashCompute::new();
+		assert_eq!(seed_compute.hash_block_number(0), [0u8; 32]);
+	}
+
+	#[test]
+	fn test_seed_compute_after_older() {
+		let seed_compute = SeedHashCompute::new();
+		// calculating an older value first shouldn't affect the result
+		let _ = seed_compute.hash_block_number(50000);
+		let hash = [241, 175, 44, 134, 39, 121, 245, 239, 228, 236, 43, 160, 195, 152, 46, 7, 199, 5, 253, 147, 241, 206, 98, 43, 3, 104, 17, 40, 192, 79, 106, 162];
+		assert_eq!(seed_compute.hash_block_number(486382), hash);
+	}
+
+	#[test]
+	fn test_seed_compute_after_newer() {
+		let seed_compute = SeedHashCompute::new();
+		// calculating an newer value first shouldn't affect the result
+		let _ = seed_compute.hash_block_number(972764);
+		let hash = [241, 175, 44, 134, 39, 121, 245, 239, 228, 236, 43, 160, 195, 152, 46, 7, 199, 5, 253, 147, 241, 206, 98, 43, 3, 104, 17, 40, 192, 79, 106, 162];
+		assert_eq!(seed_compute.hash_block_number(486382), hash);
+	}
+
+}
diff --git a/ethash/src/shared.rs b/ethash/src/shared.rs
new file mode 100644
index 0000000000000000000000000000000000000000..39e1c8eb88479513b64de007d8b8ed4b2e76b7bf
--- /dev/null
+++ b/ethash/src/shared.rs
@@ -0,0 +1,149 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use primal::is_prime;
+
+pub const DATASET_BYTES_INIT: u64 = 1 << 30;
+pub const DATASET_BYTES_GROWTH: u64 = 1 << 23;
+pub const CACHE_BYTES_INIT: u64 = 1 << 24;
+pub const CACHE_BYTES_GROWTH: u64 = 1 << 17;
+
+pub const ETHASH_EPOCH_LENGTH: u64 = 30000;
+pub const ETHASH_CACHE_ROUNDS: usize = 3;
+pub const ETHASH_MIX_BYTES: usize = 128;
+pub const ETHASH_ACCESSES: usize = 64;
+pub const ETHASH_DATASET_PARENTS: u32 = 256;
+pub const NODE_DWORDS: usize = NODE_WORDS / 2;
+pub const NODE_WORDS: usize = NODE_BYTES / 4;
+pub const NODE_BYTES: usize = 64;
+
+pub fn epoch(block_number: u64) -> u64 {
+	block_number / ETHASH_EPOCH_LENGTH
+}
+
+static CHARS: &'static [u8] = b"0123456789abcdef";
+pub fn to_hex(bytes: &[u8]) -> String {
+	let mut v = Vec::with_capacity(bytes.len() * 2);
+	for &byte in bytes.iter() {
+		v.push(CHARS[(byte >> 4) as usize]);
+		v.push(CHARS[(byte & 0xf) as usize]);
+	}
+
+	unsafe { String::from_utf8_unchecked(v) }
+}
+
+pub fn get_cache_size(block_number: u64) -> usize {
+	// TODO: Memoise
+	let mut sz: u64 = CACHE_BYTES_INIT + CACHE_BYTES_GROWTH * (block_number / ETHASH_EPOCH_LENGTH);
+	sz = sz - NODE_BYTES as u64;
+	while !is_prime(sz / NODE_BYTES as u64) {
+		sz = sz - 2 * NODE_BYTES as u64;
+	}
+	sz as usize
+}
+
+pub fn get_data_size(block_number: u64) -> usize {
+	// TODO: Memoise
+	let mut sz: u64 = DATASET_BYTES_INIT + DATASET_BYTES_GROWTH * (block_number / ETHASH_EPOCH_LENGTH);
+	sz = sz - ETHASH_MIX_BYTES as u64;
+	while !is_prime(sz / ETHASH_MIX_BYTES as u64) {
+		sz = sz - 2 * ETHASH_MIX_BYTES as u64;
+	}
+	sz as usize
+}
+
+pub type NodeBytes = [u8; NODE_BYTES];
+pub type NodeWords = [u32; NODE_WORDS];
+pub type NodeDwords = [u64; NODE_DWORDS];
+
+macro_rules! static_assert_size_eq {
+	(@inner $a:ty, $b:ty, $($rest:ty),*) => {
+		fn first() {
+			static_assert_size_eq!($a, $b);
+		}
+
+		fn second() {
+			static_assert_size_eq!($b, $($rest),*);
+		}
+	};
+	(@inner $a:ty, $b:ty) => {
+		unsafe {
+			let val: $b = ::std::mem::uninitialized();
+			let _: $a = ::std::mem::transmute(val);
+		}
+	};
+	($($rest:ty),*) => {
+		static_assert_size_eq!(size_eq: $($rest),*);
+	};
+	($name:ident : $($rest:ty),*) => {
+		#[allow(dead_code)]
+		fn $name() {
+			static_assert_size_eq!(@inner $($rest),*);
+		}
+	};
+}
+
+static_assert_size_eq!(Node, NodeBytes, NodeWords, NodeDwords);
+
+#[repr(C)]
+pub union Node {
+	pub dwords: NodeDwords,
+	pub words: NodeWords,
+	pub bytes: NodeBytes,
+}
+
+impl Clone for Node {
+	fn clone(&self) -> Self {
+		unsafe { Node { bytes: *&self.bytes } }
+	}
+}
+
+// We use `inline(always)` because I was experiencing an 100% slowdown and `perf` showed that these
+// calls were taking up ~30% of the runtime. Adding these annotations fixes the issue. Remove at
+// your peril, if and only if you have benchmarks to prove that this doesn't reintroduce the
+// performance regression. It's not caused by the `debug_assert_eq!` either, your guess is as good
+// as mine.
+impl Node {
+	#[inline(always)]
+	pub fn as_bytes(&self) -> &NodeBytes {
+		unsafe { &self.bytes }
+	}
+
+	#[inline(always)]
+	pub fn as_bytes_mut(&mut self) -> &mut NodeBytes {
+		unsafe { &mut self.bytes }
+	}
+
+	#[inline(always)]
+	pub fn as_words(&self) -> &NodeWords {
+		unsafe { &self.words }
+	}
+
+	#[inline(always)]
+	pub fn as_words_mut(&mut self) -> &mut NodeWords {
+		unsafe { &mut self.words }
+	}
+
+	#[inline(always)]
+	pub fn as_dwords(&self) -> &NodeDwords {
+		unsafe { &self.dwords }
+	}
+
+	#[inline(always)]
+	pub fn as_dwords_mut(&mut self) -> &mut NodeDwords {
+		unsafe { &mut self.dwords }
+	}
+}
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index c49e318989b994b5af39313e8cd7e81f0c49dcfa..065bbc5cc5999ca4fc3c3937d3f669d4eb4896f9 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -3,74 +3,84 @@ description = "Ethcore library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore"
-version = "1.8.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[build-dependencies]
-"ethcore-ipc-codegen" = { path = "../ipc/codegen" }
 
 [dependencies]
-bit-set = "0.4"
-bloomchain = "0.1"
-bn = { git = "https://github.com/paritytech/bn" }
+ansi_term = "0.10"
+bloomchain = { path = "../util/bloomchain" }
+bn = { git = "https://github.com/paritytech/bn", default-features = false }
 byteorder = "1.0"
-clippy = { version = "0.0.103", optional = true}
 common-types = { path = "types" }
-crossbeam = "0.2.9"
-env_logger = "0.4"
-ethabi = "2.0"
+crossbeam = "0.3"
 ethash = { path = "../ethash" }
 ethcore-bloom-journal = { path = "../util/bloom" }
-ethcore-devtools = { path = "../devtools" }
+ethcore-bytes = { path = "../util/bytes" }
+hashdb = { path = "../util/hashdb" }
+memorydb = { path = "../util/memorydb" }
+patricia-trie = { path = "../util/patricia_trie" }
 ethcore-io = { path = "../util/io" }
-ethcore-ipc = { path = "../ipc/rpc" }
-ethcore-ipc-nano = { path = "../ipc/nano" }
 ethcore-logger = { path = "../logger" }
+ethcore-miner = { path = "../miner" }
 ethcore-stratum = { path = "../stratum" }
-ethcore-util = { path = "../util" }
+ethcore-transaction = { path = "./transaction" }
+ethereum-types = "0.2"
+memory-cache = { path = "../util/memory_cache" }
+ethabi = "5.1"
+ethabi-derive = "5.0"
+ethabi-contract = "5.0"
 ethjson = { path = "../json" }
 ethkey = { path = "../ethkey" }
 ethstore = { path = "../ethstore" }
 evm = { path = "evm" }
-futures = "0.1"
+futures-cpupool = "0.1"
 hardware-wallet = { path = "../hw" }
-hyper = { git = "https://github.com/paritytech/hyper", default-features = false }
+heapsize = "0.4"
 itertools = "0.5"
-lazy_static = "0.2"
-linked-hash-map = "0.3.0"
+lazy_static = "1.0"
 log = "0.3"
-lru-cache = "0.1.0"
-native-contracts = { path = "native_contracts" }
-num = "0.1"
+lru-cache = "0.1"
+num = { version = "0.1", default-features = false, features = ["bigint"] }
 num_cpus = "1.2"
+parity-machine = { path = "../machine" }
+parking_lot = "0.5"
 price-info = { path = "../price-info" }
-rand = "0.3"
+rayon = "0.8"
+rand = "0.4"
 rlp = { path = "../util/rlp" }
+rlp_compress = { path = "../util/rlp_compress" }
 rlp_derive = { path = "../util/rlp_derive" }
+kvdb = { path = "../util/kvdb" }
+kvdb-rocksdb = { path = "../util/kvdb-rocksdb" }
+kvdb-memorydb = { path = "../util/kvdb-memorydb" }
+util-error = { path = "../util/error" }
+snappy = { git = "https://github.com/paritytech/rust-snappy" }
+stop-guard = { path = "../util/stop-guard" }
+migration = { path = "../util/migration" }
+macros = { path = "../util/macros" }
 rust-crypto = "0.2.34"
 rustc-hex = "1.0"
-semver = "0.6"
 stats = { path = "../util/stats" }
-time = "0.1"
-transient-hashmap = "0.4"
+trace-time = { path = "../util/trace-time" }
 using_queue = { path = "../util/using_queue" }
 table = { path = "../util/table" }
-bloomable = { path = "../util/bloomable" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
+keccak-hash = { path = "../util/hash" }
+triehash = { path = "../util/triehash" }
+unexpected = { path = "../util/unexpected" }
+journaldb = { path = "../util/journaldb" }
 
 [dev-dependencies]
-native-contracts = { path = "native_contracts", features = ["test_contracts"] }
+tempdir = "0.3"
+trie-standardmap = { path = "../util/trie-standardmap" }
 
 [features]
 jit = ["evm/jit"]
 evm-debug = ["slow-blocks"]
-evm-debug-tests = ["evm-debug"]
+evm-debug-tests = ["evm-debug", "evm/evm-debug-tests"]
 slow-blocks = [] # Use SLOW_TX_DURATION="50" (compile time!) to track transactions over 50ms
-json-tests = []
+json-tests = ["ethcore-transaction/json-tests"]
 test-heavy = []
-dev = ["clippy"]
 default = []
 benches = []
-ipc = []
diff --git a/ethcore/benches/evm.rs b/ethcore/benches/evm.rs
new file mode 100644
index 0000000000000000000000000000000000000000..324e3382e57603b6be8706fef472d1c904595d42
--- /dev/null
+++ b/ethcore/benches/evm.rs
@@ -0,0 +1,98 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![feature(test)]
+
+extern crate test;
+extern crate ethcore_util as util;
+extern crate rand;
+extern crate bn;
+extern crate crypto;
+extern crate ethkey;
+extern crate rustc_hex;
+extern crate ethcore_bigint;
+
+use self::test::{Bencher};
+use rand::{StdRng};
+
+
+#[bench]
+fn bn_128_pairing(b: &mut Bencher) {
+	use bn::{pairing, G1, G2, Fr, Group};
+
+	let rng = &mut ::rand::thread_rng();
+
+	let sk0 = Fr::random(rng);
+	let sk1 = Fr::random(rng);
+
+	let pk0 = G1::one() * sk0;
+	let pk1 = G2::one() * sk1;
+
+	b.iter(|| {
+		let _ = pairing(pk0, pk1);
+	});
+}
+
+#[bench]
+fn bn_128_mul(b: &mut Bencher) {
+	use bn::{AffineG1, G1, Fr, Group};
+
+	let mut rng = StdRng::new().unwrap();
+	let p: G1 = G1::random(&mut rng);
+	let fr = Fr::random(&mut rng);
+
+	b.iter(|| {
+		let _ = AffineG1::from_jacobian(p * fr);
+	});
+}
+
+#[bench]
+fn sha256(b: &mut Bencher) {
+	use crypto::sha2::Sha256;
+	use crypto::digest::Digest;
+
+	let mut input: [u8; 256] = [0; 256];
+	let mut out = [0; 32];
+
+	b.iter(|| {
+		let mut sha = Sha256::new();
+		sha.input(&input);
+		sha.result(&mut input[0..32]);
+	});
+}
+
+#[bench]
+fn ecrecover(b: &mut Bencher) {
+	use rustc_hex::FromHex;
+	use ethkey::{Signature, recover as ec_recover};
+	use ethcore_bigint::hash::H256;
+	let input = FromHex::from_hex("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").unwrap();
+	let hash = H256::from_slice(&input[0..32]);
+	let v = H256::from_slice(&input[32..64]);
+	let r = H256::from_slice(&input[64..96]);
+	let s = H256::from_slice(&input[96..128]);
+
+	let bit = match v[31] {
+		27 | 28 if &v.0[..31] == &[0; 31] => v[31] - 27,
+		_ => { return; },
+	};
+
+	let s = Signature::from_rsv(&r, &s, bit);
+	b.iter(|| {
+		let _ = ec_recover(&s, &hash);
+	});
+}
+
diff --git a/ethcore/build.rs b/ethcore/build.rs
deleted file mode 100644
index 8fe38e757f8ddca6c9c910fae5f8f219b10d1b66..0000000000000000000000000000000000000000
--- a/ethcore/build.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate ethcore_ipc_codegen;
-
-fn main() {
-	ethcore_ipc_codegen::derive_ipc_cond("src/client/traits.rs", cfg!(feature="ipc")).unwrap();
-	ethcore_ipc_codegen::derive_ipc_cond("src/snapshot/snapshot_service_trait.rs", cfg!(feature="ipc")).unwrap();
-	ethcore_ipc_codegen::derive_ipc_cond("src/client/chain_notify.rs", cfg!(feature="ipc")).unwrap();
-}
diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml
index 2780703da07b8498f96b5ae722ec3a486b11c775..6efc05f4e2f0484ae7d7ee6f915e14a6d224d92d 100644
--- a/ethcore/evm/Cargo.toml
+++ b/ethcore/evm/Cargo.toml
@@ -5,21 +5,20 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 bit-set = "0.4"
-byteorder = "1.0"
-common-types = { path = "../types" }
-ethcore-util = { path = "../../util" }
+ethereum-types = "0.2"
 evmjit = { path = "../../evmjit", optional = true }
-ethjson = { path = "../../json" }
-lazy_static = "0.2"
+heapsize = "0.4"
+lazy_static = "1.0"
 log = "0.3"
-rlp = { path = "../../util/rlp" }
 vm = { path = "../vm" }
-parity-wasm = "0.12"
-ethcore-logger = { path = "../../logger" }
-wasm-utils = { git = "https://github.com/paritytech/wasm-utils" }
+keccak-hash = { path = "../../util/hash" }
+parking_lot = "0.5"
+memory-cache = { path = "../../util/memory_cache" }
 
 [dev-dependencies]
 rustc-hex = "1.0"
 
 [features]
 jit = ["evmjit"]
+evm-debug = []
+evm-debug-tests = ["evm-debug"]
diff --git a/ethcore/evm/src/benches/mod.rs b/ethcore/evm/src/benches/mod.rs
index ecb7d379adf1fa2e46ef363001dcb218d4bf956a..c87fda7bbfb538a980919733c5c9b0c7c9bee847 100644
--- a/ethcore/evm/src/benches/mod.rs
+++ b/ethcore/evm/src/benches/mod.rs
@@ -24,6 +24,8 @@ extern crate test;
 
 use self::test::{Bencher, black_box};
 
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use util::*;
 use vm::ActionParams;
 use evm::{self, Factory, VMType};
diff --git a/ethcore/evm/src/evm.rs b/ethcore/evm/src/evm.rs
index d593143a6399f6a7c7b6d285860469a47dd0c91c..16dffe77c5381d9bf368b78916535c284532ea29 100644
--- a/ethcore/evm/src/evm.rs
+++ b/ethcore/evm/src/evm.rs
@@ -17,7 +17,7 @@
 //! Evm interface.
 
 use std::{ops, cmp, fmt};
-use util::{U128, U256, U512};
+use ethereum_types::{U128, U256, U512};
 use vm::{Ext, Result, ReturnData, GasLeft, Error};
 
 /// Finalization result. Gas Left: either it is a known value, or it needs to be computed by processing
@@ -45,7 +45,7 @@ impl Finalize for Result<GasLeft> {
 	fn finalize<E: Ext>(self, ext: E) -> Result<FinalizationResult> {
 		match self {
 			Ok(GasLeft::Known(gas_left)) => Ok(FinalizationResult { gas_left: gas_left, apply_state: true, return_data: ReturnData::empty() }),
-			Ok(GasLeft::NeedsReturn {gas_left, data, apply_state}) => ext.ret(&gas_left, &data).map(|gas_left| FinalizationResult {
+			Ok(GasLeft::NeedsReturn {gas_left, data, apply_state}) => ext.ret(&gas_left, &data, apply_state).map(|gas_left| FinalizationResult {
 				gas_left: gas_left,
 				apply_state: apply_state,
 				return_data: data,
@@ -149,7 +149,7 @@ impl CostType for usize {
 
 #[cfg(test)]
 mod tests {
-	use util::U256;
+	use ethereum_types::U256;
 	use super::CostType;
 
 	#[test]
diff --git a/ethcore/evm/src/factory.rs b/ethcore/evm/src/factory.rs
index 20275dbff540fd0974f37557dde23df8222edfc4..140f1620a309fd7fb1b196dafa2d0b66af4c69ce 100644
--- a/ethcore/evm/src/factory.rs
+++ b/ethcore/evm/src/factory.rs
@@ -18,7 +18,7 @@
 //!
 use std::sync::Arc;
 use vm::Vm;
-use util::U256;
+use ethereum_types::U256;
 use super::interpreter::SharedCache;
 use super::vmtype::VMType;
 
@@ -33,7 +33,7 @@ impl Factory {
 	/// Create fresh instance of VM
 	/// Might choose implementation depending on supplied gas.
 	#[cfg(feature = "jit")]
-	pub fn create(&self, gas: U256) -> Box<Vm> {
+	pub fn create(&self, gas: &U256) -> Box<Vm> {
 		match self.evm {
 			VMType::Jit => {
 				Box::new(super::jit::JitEvm::default())
@@ -49,7 +49,7 @@ impl Factory {
 	/// Create fresh instance of VM
 	/// Might choose implementation depending on supplied gas.
 	#[cfg(not(feature = "jit"))]
-	pub fn create(&self, gas: U256) -> Box<Vm> {
+	pub fn create(&self, gas: &U256) -> Box<Vm> {
 		match self.evm {
 			VMType::Interpreter => if Self::can_fit_in_usize(gas) {
 				Box::new(super::interpreter::Interpreter::<usize>::new(self.evm_cache.clone()))
@@ -68,8 +68,8 @@ impl Factory {
 		}
 	}
 
-	fn can_fit_in_usize(gas: U256) -> bool {
-		gas == U256::from(gas.low_u64() as usize)
+	fn can_fit_in_usize(gas: &U256) -> bool {
+		gas == &U256::from(gas.low_u64() as usize)
 	}
 }
 
@@ -95,7 +95,7 @@ impl Default for Factory {
 
 #[test]
 fn test_create_vm() {
-	let _vm = Factory::default().create(U256::zero());
+	let _vm = Factory::default().create(&U256::zero());
 }
 
 /// Create tests by injecting different VM factories
diff --git a/ethcore/evm/src/instructions.rs b/ethcore/evm/src/instructions.rs
index 83be0c95460e1b2cda0e670fb9e5f556d9d3e6d8..3fb9fb933962a48b2489c5684c19defc63cec6ff 100644
--- a/ethcore/evm/src/instructions.rs
+++ b/ethcore/evm/src/instructions.rs
@@ -81,7 +81,7 @@ fn test_get_swap_position() {
 	assert_eq!(get_swap_position(SWAP10), 10);
 }
 
-/// Returns number of topcis to take from stack
+/// Returns number of topics to take from stack
 /// LOG0 -> 0
 pub fn get_log_topics (i: Instruction) -> usize {
 	assert!(i >= LOG0 && i <= LOG4);
diff --git a/ethcore/evm/src/interpreter/gasometer.rs b/ethcore/evm/src/interpreter/gasometer.rs
index 161c7db39b6108dc2a712657636866edaae6e4d6..beb22447fe4c08257d27868c040e93d8d2d87db9 100644
--- a/ethcore/evm/src/interpreter/gasometer.rs
+++ b/ethcore/evm/src/interpreter/gasometer.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::cmp;
-use util::*;
+use ethereum_types::{U256, H256};
 use super::u256_to_address;
 
 use {evm, vm};
@@ -31,7 +31,6 @@ macro_rules! overflowing {
 	}}
 }
 
-#[cfg_attr(feature="dev", allow(enum_variant_names))]
 enum Request<Cost: ::evm::CostType> {
 	Gas(Cost),
 	GasMem(Cost, Cost),
@@ -100,7 +99,6 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 		}
 	}
 
-	#[cfg_attr(feature="dev", allow(cyclomatic_complexity))]
 	/// Determine how much gas is used by the given instruction, given the machine's state.
 	///
 	/// We guarantee that the final element of the returned tuple (`provided`) will be `Some`
diff --git a/ethcore/evm/src/interpreter/informant.rs b/ethcore/evm/src/interpreter/informant.rs
index a2a2c84c55690c127e03b5b8f51bca5bdb044e6d..f07d11ff7aa5f3a86f5020eff29a0bc624efb5de 100644
--- a/ethcore/evm/src/interpreter/informant.rs
+++ b/ethcore/evm/src/interpreter/informant.rs
@@ -39,11 +39,11 @@ mod inner {
 	use std::collections::HashMap;
 	use std::time::{Instant, Duration};
 
-	use evm::interpreter::stack::Stack;
-	use evm::instructions::{Instruction, InstructionInfo, INSTRUCTIONS};
-	use evm::{CostType};
+	use bigint::prelude::U256;
 
-	use util::U256;
+	use interpreter::stack::Stack;
+	use instructions::{Instruction, InstructionInfo, INSTRUCTIONS};
+	use CostType;
 
 	macro_rules! evm_debug {
 		($x: expr) => {
@@ -110,7 +110,7 @@ mod inner {
 		}
 
 		pub fn after_instruction(&mut self, instruction: Instruction) {
-			let mut stats = self.stats.entry(instruction).or_insert_with(|| Stats::default());
+			let stats = self.stats.entry(instruction).or_insert_with(|| Stats::default());
 			let took = self.last_instruction.elapsed();
 			stats.note(took);
 		}
diff --git a/ethcore/evm/src/interpreter/memory.rs b/ethcore/evm/src/interpreter/memory.rs
index 9aa9babc789c84f103eadef3fbce75065a129c97..f646d01985d83dce2f1dc95e1b25c1e729ce1844 100644
--- a/ethcore/evm/src/interpreter/memory.rs
+++ b/ethcore/evm/src/interpreter/memory.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::U256;
+use ethereum_types::U256;
 use vm::ReturnData;
 
 const MAX_RETURN_WASTE_BYTES: usize = 16384;
@@ -134,7 +134,7 @@ impl Memory for Vec<u8> {
 
 #[cfg(test)]
 mod tests {
-	use util::U256;
+	use ethereum_types::U256;
 	use super::Memory;
 
 	#[test]
diff --git a/ethcore/evm/src/interpreter/mod.rs b/ethcore/evm/src/interpreter/mod.rs
index cb8fe3a5240bfa0141fe039cdc70d5ec66c7940b..05d1fb78853fc0dfacd5bf421dd0d37c78aae8d9 100644
--- a/ethcore/evm/src/interpreter/mod.rs
+++ b/ethcore/evm/src/interpreter/mod.rs
@@ -26,6 +26,8 @@ mod shared_cache;
 use std::marker::PhantomData;
 use std::{cmp, mem};
 use std::sync::Arc;
+use hash::keccak;
+use ethereum_types::{U256, U512, H256, Address};
 
 use vm::{
 	self, ActionParams, ActionValue, CallType, MessageCallResult,
@@ -42,8 +44,6 @@ pub use self::shared_cache::SharedCache;
 
 use bit_set::BitSet;
 
-use util::*;
-
 type ProgramCounter = usize;
 
 const ONE: U256 = U256([1, 0, 0, 0]);
@@ -63,7 +63,6 @@ struct CodeReader<'a> {
 	code: &'a [u8]
 }
 
-#[cfg_attr(feature="dev", allow(len_without_is_empty))]
 impl<'a> CodeReader<'a> {
 
 	/// Create new code reader - starting at position 0.
@@ -133,7 +132,9 @@ impl<Cost: CostType> vm::Vm for Interpreter<Cost> {
 			reader.position += 1;
 
 			// TODO: make compile-time removable if too much of a performance hit.
-			do_trace = do_trace && ext.trace_next_instruction(reader.position - 1, instruction);
+			do_trace = do_trace && ext.trace_next_instruction(
+				reader.position - 1, instruction, gasometer.current_gas.as_u256(),
+			);
 
 			let info = &infos[instruction as usize];
 			self.verify_instruction(ext, instruction, info, &stack)?;
@@ -180,7 +181,7 @@ impl<Cost: CostType> vm::Vm for Interpreter<Cost> {
 			match result {
 				InstructionResult::JumpToPosition(position) => {
 					if valid_jump_destinations.is_none() {
-						let code_hash = params.code_hash.clone().unwrap_or_else(|| code.sha3());
+						let code_hash = params.code_hash.clone().unwrap_or_else(|| keccak(code.as_ref()));
 						valid_jump_destinations = Some(self.cache.jump_destinations(&code_hash, code));
 					}
 					let jump_destinations = valid_jump_destinations.as_ref().expect("jump_destinations are initialized on first jump; qed");
@@ -284,7 +285,6 @@ impl<Cost: CostType> Interpreter<Cost> {
 		}
 	}
 
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	fn exec_instruction(
 		&mut self,
 		gas: Cost,
@@ -319,27 +319,39 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let init_off = stack.pop_back();
 				let init_size = stack.pop_back();
 
-				let address_scheme = if instruction == instructions::CREATE { CreateContractAddress::FromSenderAndNonce } else { CreateContractAddress::FromSenderAndCodeHash };
 				let create_gas = provided.expect("`provided` comes through Self::exec from `Gasometer::get_gas_cost_mem`; `gas_gas_mem_cost` guarantees `Some` when instruction is `CALL`/`CALLCODE`/`DELEGATECALL`/`CREATE`; this is `CREATE`; qed");
 
-				let contract_code = self.mem.read_slice(init_off, init_size);
-				let can_create = ext.balance(&params.address)? >= endowment && ext.depth() < ext.schedule().max_depth;
+				if ext.is_static() {
+					return Err(vm::Error::MutableCallInStaticContext);
+				}
 
+				// clear return data buffer before creating new call frame.
+				self.return_data = ReturnData::empty();
+
+				let can_create = ext.balance(&params.address)? >= endowment && ext.depth() < ext.schedule().max_depth;
 				if !can_create {
 					stack.push(U256::zero());
 					return Ok(InstructionResult::UnusedGas(create_gas));
 				}
 
+				let contract_code = self.mem.read_slice(init_off, init_size);
+				let address_scheme = if instruction == instructions::CREATE { CreateContractAddress::FromSenderAndNonce } else { CreateContractAddress::FromSenderAndCodeHash };
+
 				let create_result = ext.create(&create_gas.as_u256(), &endowment, contract_code, address_scheme);
 				return match create_result {
 					ContractCreateResult::Created(address, gas_left) => {
 						stack.push(address_to_u256(address));
 						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater.")))
 					},
+					ContractCreateResult::Reverted(gas_left, return_data) => {
+						stack.push(U256::zero());
+						self.return_data = return_data;
+						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater.")))
+					},
 					ContractCreateResult::Failed => {
 						stack.push(U256::zero());
 						Ok(InstructionResult::Ok)
-					}
+					},
 				};
 			},
 			instructions::CALL | instructions::CALLCODE | instructions::DELEGATECALL | instructions::STATICCALL => {
@@ -350,8 +362,10 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let code_address = stack.pop_back();
 				let code_address = u256_to_address(&code_address);
 
-				let value = if instruction == instructions::DELEGATECALL || instruction == instructions::STATICCALL {
+				let value = if instruction == instructions::DELEGATECALL {
 					None
+				} else if instruction == instructions::STATICCALL {
+					Some(U256::zero())
 				} else {
 					Some(stack.pop_back())
 				};
@@ -370,6 +384,9 @@ impl<Cost: CostType> Interpreter<Cost> {
 				// Get sender & receive addresses, check if we have balance
 				let (sender_address, receive_address, has_balance, call_type) = match instruction {
 					instructions::CALL => {
+						if ext.is_static() && value.map_or(false, |v| !v.is_zero()) {
+							return Err(vm::Error::MutableCallInStaticContext);
+						}
 						let has_balance = ext.balance(&params.address)? >= value.expect("value set for all but delegate call; qed");
 						(&params.address, &code_address, has_balance, CallType::Call)
 					},
@@ -378,10 +395,13 @@ impl<Cost: CostType> Interpreter<Cost> {
 						(&params.address, &params.address, has_balance, CallType::CallCode)
 					},
 					instructions::DELEGATECALL => (&params.sender, &params.address, true, CallType::DelegateCall),
-					instructions::STATICCALL => (&params.sender, &params.address, true, CallType::StaticCall),
+					instructions::STATICCALL => (&params.address, &code_address, true, CallType::StaticCall),
 					_ => panic!(format!("Unexpected instruction {} in CALL branch.", instruction))
 				};
 
+				// clear return data buffer before creating new call frame.
+				self.return_data = ReturnData::empty();
+
 				let can_call = has_balance && ext.depth() < ext.schedule().max_depth;
 				if !can_call {
 					stack.push(U256::zero());
@@ -400,12 +420,17 @@ impl<Cost: CostType> Interpreter<Cost> {
 					MessageCallResult::Success(gas_left, data) => {
 						stack.push(U256::one());
 						self.return_data = data;
-						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater then current one")))
+						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater than current one")))
+					},
+					MessageCallResult::Reverted(gas_left, data) => {
+						stack.push(U256::zero());
+						self.return_data = data;
+						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater than current one")))
 					},
 					MessageCallResult::Failed  => {
 						stack.push(U256::zero());
 						Ok(InstructionResult::Ok)
-					}
+					},
 				};
 			},
 			instructions::RETURN => {
@@ -464,8 +489,8 @@ impl<Cost: CostType> Interpreter<Cost> {
 			instructions::SHA3 => {
 				let offset = stack.pop_back();
 				let size = stack.pop_back();
-				let sha3 = self.mem.read_slice(offset, size).sha3();
-				stack.push(U256::from(&*sha3));
+				let k = keccak(self.mem.read_slice(offset, size));
+				stack.push(U256::from(&*k));
 			},
 			instructions::SLOAD => {
 				let key = H256::from(&stack.pop_back());
@@ -543,6 +568,14 @@ impl<Cost: CostType> Interpreter<Cost> {
 				Self::copy_data_to_memory(&mut self.mem, stack, params.data.as_ref().map_or_else(|| &[] as &[u8], |d| &*d as &[u8]));
 			},
 			instructions::RETURNDATACOPY => {
+				{
+					let source_offset = stack.peek(1);
+					let size = stack.peek(2);
+					let return_data_len = U256::from(self.return_data.len());
+					if source_offset.saturating_add(*size) > return_data_len {
+						return Err(vm::Error::OutOfBounds);
+					}
+				}
 				Self::copy_data_to_memory(&mut self.mem, stack, &*self.return_data);
 			},
 			instructions::CODECOPY => {
@@ -880,8 +913,13 @@ mod tests {
 	use rustc_hex::FromHex;
 	use vmtype::VMType;
 	use factory::Factory;
-	use vm::{self, ActionParams, ActionValue};
+	use vm::{Vm, ActionParams, ActionValue};
 	use vm::tests::{FakeExt, test_finalize};
+	use ethereum_types::U256;
+
+	fn interpreter(gas: &U256) -> Box<Vm> {
+		Factory::new(VMType::Interpreter, 1).create(gas)
+	}
 
 	#[test]
 	fn should_not_fail_on_tracing_mem() {
@@ -898,11 +936,32 @@ mod tests {
 		ext.tracing = true;
 
 		let gas_left = {
-			let mut vm = Factory::new(VMType::Interpreter, 1).create(params.gas);
+			let mut vm = interpreter(&params.gas);
 			test_finalize(vm.exec(params, &mut ext)).unwrap()
 		};
 
 		assert_eq!(ext.calls.len(), 1);
 		assert_eq!(gas_left, 248_212.into());
 	}
+
+	#[test]
+	fn should_not_overflow_returndata() {
+		let code = "6001600160000360003e00".from_hex().unwrap();
+
+		let mut params = ActionParams::default();
+		params.address = 5.into();
+		params.gas = 300_000.into();
+		params.gas_price = 1.into();
+		params.code = Some(Arc::new(code));
+		let mut ext = FakeExt::new_byzantium();
+		ext.balances.insert(5.into(), 1_000_000_000.into());
+		ext.tracing = true;
+
+		let err = {
+			let mut vm = interpreter(&params.gas);
+			test_finalize(vm.exec(params, &mut ext)).err().unwrap()
+		};
+
+		assert_eq!(err, ::vm::Error::OutOfBounds);
+	}
 }
diff --git a/ethcore/evm/src/interpreter/shared_cache.rs b/ethcore/evm/src/interpreter/shared_cache.rs
index a93afa79a06bad5118645fdb36991da438d1c971..30bc5b677d5243a9f6d593f98923e96b680e752f 100644
--- a/ethcore/evm/src/interpreter/shared_cache.rs
+++ b/ethcore/evm/src/interpreter/shared_cache.rs
@@ -15,9 +15,11 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::Arc;
-use util::{H256, HeapSizeOf, Mutex};
-use util::sha3::*;
-use util::cache::MemoryLruCache;
+use hash::KECCAK_EMPTY;
+use heapsize::HeapSizeOf;
+use ethereum_types::H256;
+use parking_lot::Mutex;
+use memory_cache::MemoryLruCache;
 use bit_set::BitSet;
 use super::super::instructions;
 
@@ -49,7 +51,7 @@ impl SharedCache {
 
 	/// Get jump destinations bitmap for a contract.
 	pub fn jump_destinations(&self, code_hash: &H256, code: &[u8]) -> Arc<BitSet> {
-		if code_hash == &SHA3_EMPTY {
+		if code_hash == &KECCAK_EMPTY {
 			return Self::find_jump_destinations(code);
 		}
 
diff --git a/ethcore/evm/src/jit.rs b/ethcore/evm/src/jit.rs
index 22262cbb6d44f29bee3b15483d9c6566dec3a623..d94bb7b8e084a94980041ef8420036cdb87a4fe1 100644
--- a/ethcore/evm/src/jit.rs
+++ b/ethcore/evm/src/jit.rs
@@ -15,6 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Just in time compiler execution environment.
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use util::*;
 use evmjit;
 use evm::{self, GasLeft};
diff --git a/ethcore/evm/src/lib.rs b/ethcore/evm/src/lib.rs
index 833b266646911ec1030a41078e40c18968e904ac..b61c8aa2a9dc41c0a8202e1b1bd8c4d982187a43 100644
--- a/ethcore/evm/src/lib.rs
+++ b/ethcore/evm/src/lib.rs
@@ -16,20 +16,18 @@
 
 //! Ethereum virtual machine.
 
-extern crate byteorder;
 extern crate bit_set;
-extern crate common_types as types;
-extern crate ethcore_util as util;
-extern crate ethjson;
-extern crate rlp;
-extern crate parity_wasm;
-extern crate wasm_utils;
-extern crate ethcore_logger;
+extern crate ethereum_types;
+extern crate parking_lot;
+extern crate heapsize;
 extern crate vm;
+extern crate keccak_hash as hash;
+extern crate memory_cache;
 
 #[macro_use]
 extern crate lazy_static;
 
+#[cfg_attr(feature = "evm-debug", macro_use)]
 extern crate log;
 
 #[cfg(feature = "jit")]
diff --git a/ethcore/evm/src/tests.rs b/ethcore/evm/src/tests.rs
index 7263d1779d5388762b93c7b51fcc5b6aee419f59..a219ae988076f0040ef3b3dd79cd88c1a6f67f2f 100644
--- a/ethcore/evm/src/tests.rs
+++ b/ethcore/evm/src/tests.rs
@@ -20,7 +20,7 @@ use std::hash::Hash;
 use std::sync::Arc;
 use std::collections::{HashMap, HashSet};
 use rustc_hex::FromHex;
-use util::*;
+use ethereum_types::{U256, H256, Address};
 use vm::{self, ActionParams, ActionValue};
 use vm::tests::{FakeExt, FakeCall, FakeCallType, test_finalize};
 use factory::Factory;
@@ -38,7 +38,7 @@ fn test_add(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -58,7 +58,7 @@ fn test_sha3(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -78,7 +78,7 @@ fn test_address(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -100,7 +100,7 @@ fn test_origin(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -122,7 +122,7 @@ fn test_sender(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -157,7 +157,7 @@ fn test_extcodecopy(factory: super::Factory) {
 	ext.codes.insert(sender, Arc::new(sender_code));
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -177,7 +177,7 @@ fn test_log_empty(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -209,7 +209,7 @@ fn test_log_sender(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -234,7 +234,7 @@ fn test_blockhash(factory: super::Factory) {
 	ext.blockhashes.insert(U256::zero(), blockhash.clone());
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -256,7 +256,7 @@ fn test_calldataload(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -277,7 +277,7 @@ fn test_author(factory: super::Factory) {
 	ext.info.author = author;
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -297,7 +297,7 @@ fn test_timestamp(factory: super::Factory) {
 	ext.info.timestamp = timestamp;
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -317,7 +317,7 @@ fn test_number(factory: super::Factory) {
 	ext.info.number = number;
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -337,7 +337,7 @@ fn test_difficulty(factory: super::Factory) {
 	ext.info.difficulty = difficulty;
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -357,7 +357,7 @@ fn test_gas_limit(factory: super::Factory) {
 	ext.info.gas_limit = gas_limit;
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -375,7 +375,7 @@ fn test_mul(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -393,7 +393,7 @@ fn test_sub(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -411,7 +411,7 @@ fn test_div(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -429,7 +429,7 @@ fn test_div_zero(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -447,7 +447,7 @@ fn test_mod(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -466,7 +466,7 @@ fn test_smod(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -485,7 +485,7 @@ fn test_sdiv(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -504,7 +504,7 @@ fn test_exp(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -524,7 +524,7 @@ fn test_comparison(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -545,7 +545,7 @@ fn test_signed_comparison(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -566,7 +566,7 @@ fn test_bitops(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -589,7 +589,7 @@ fn test_addmod_mulmod(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -610,7 +610,7 @@ fn test_byte(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -629,7 +629,7 @@ fn test_signextend(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -649,7 +649,7 @@ fn test_badinstruction_int() {
 	let mut ext = FakeExt::new();
 
 	let err = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap_err()
 	};
 
@@ -669,7 +669,7 @@ fn test_pop(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -689,7 +689,7 @@ fn test_extops(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -712,7 +712,7 @@ fn test_jumps(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -722,7 +722,6 @@ fn test_jumps(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(54_117));
 }
 
-
 evm_test!{test_calls: test_calls_jit, test_calls_int}
 fn test_calls(factory: super::Factory) {
 	let code = "600054602d57600160005560006000600060006050610998610100f160006000600060006050610998610100f25b".from_hex().unwrap();
@@ -741,7 +740,7 @@ fn test_calls(factory: super::Factory) {
 	};
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -767,6 +766,27 @@ fn test_calls(factory: super::Factory) {
 	assert_eq!(ext.calls.len(), 2);
 }
 
+evm_test!{test_create_in_staticcall: test_create_in_staticcall_jit, test_create_in_staticcall_int}
+fn test_create_in_staticcall(factory: super::Factory) {
+	let code = "600060006064f000".from_hex().unwrap();
+
+	let address = Address::from(0x155);
+	let mut params = ActionParams::default();
+	params.gas = U256::from(100_000);
+	params.code = Some(Arc::new(code));
+	params.address = address.clone();
+	let mut ext = FakeExt::new_byzantium();
+	ext.is_static = true;
+
+	let err = {
+		let mut vm = factory.create(&params.gas);
+		test_finalize(vm.exec(params, &mut ext)).unwrap_err()
+	};
+
+	assert_eq!(err, vm::Error::MutableCallInStaticContext);
+	assert_eq!(ext.calls.len(), 0);
+}
+
 fn assert_set_contains<T : Debug + Eq + PartialEq + Hash>(set: &HashSet<T>, val: &T) {
 	let contains = set.contains(val);
 	if !contains {
diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml
index 9fda78f475c10848f1293dfbbed95a07d45fcb8e..b8f5d5fb541837a67aaf5f9a49f35fe8d498dd25 100644
--- a/ethcore/light/Cargo.toml
+++ b/ethcore/light/Cargo.toml
@@ -3,35 +3,42 @@ description = "Parity Light Client Implementation"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-light"
-version = "1.8.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[build-dependencies]
-"ethcore-ipc-codegen" = { path = "../../ipc/codegen", optional = true }
 
 [dependencies]
 log = "0.3"
 ethcore = { path = ".."}
-ethcore-util = { path = "../../util" }
+ethcore-bytes = { path = "../../util/bytes" }
+ethcore-transaction = { path = "../transaction" }
+ethereum-types = "0.2"
+memorydb = { path = "../../util/memorydb" }
+patricia-trie = { path = "../../util/patricia_trie" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
-ethcore-ipc = { path = "../../ipc/rpc", optional = true }
-ethcore-devtools = { path = "../../devtools" }
-evm = { path = "../evm" }
+hashdb = { path = "../../util/hashdb" }
+heapsize = "0.4"
 vm = { path = "../vm" }
+plain_hasher = { path = "../../util/plain_hasher" }
 rlp = { path = "../../util/rlp" }
 rlp_derive = { path = "../../util/rlp_derive" }
-time = "0.1"
 smallvec = "0.4"
 futures = "0.1"
-rand = "0.3"
+rand = "0.4"
 itertools = "0.5"
 bincode = "0.8.0"
 serde = "1.0"
 serde_derive = "1.0"
+parking_lot = "0.5"
 stats = { path = "../../util/stats" }
+keccak-hash = { path = "../../util/hash" }
+triehash = { path = "../../util/triehash" }
+kvdb = { path = "../../util/kvdb" }
+memory-cache = { path = "../../util/memory_cache" }
+
+[dev-dependencies]
+kvdb-memorydb = { path = "../../util/kvdb-memorydb" }
+tempdir = "0.3"
 
 [features]
 default = []
-ipc = ["ethcore-ipc", "ethcore-ipc-codegen"]
diff --git a/ethcore/light/build.rs b/ethcore/light/build.rs
deleted file mode 100644
index b9c79f77888ea5e0e226bdcb91d37c44b5906629..0000000000000000000000000000000000000000
--- a/ethcore/light/build.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#[cfg(feature = "ipc")]
-extern crate ethcore_ipc_codegen;
-
-#[cfg(feature = "ipc")]
-fn main() {
-	ethcore_ipc_codegen::derive_binary("src/types/mod.rs.in").unwrap();
-	ethcore_ipc_codegen::derive_ipc_cond("src/provider.rs", true).unwrap();
-}
-
-#[cfg(not(feature = "ipc"))]
-fn main() { }
\ No newline at end of file
diff --git a/ethcore/light/src/cache.rs b/ethcore/light/src/cache.rs
index 9a5a3638fb2178c63deaf5330deafb120cd81102..b63fd07576e005fd92b7058fdee045b34418aaca 100644
--- a/ethcore/light/src/cache.rs
+++ b/ethcore/light/src/cache.rs
@@ -25,9 +25,10 @@ use ethcore::header::BlockNumber;
 use ethcore::receipt::Receipt;
 
 use stats::Corpus;
-use time::{SteadyTime, Duration};
-use util::{U256, H256, HeapSizeOf};
-use util::cache::MemoryLruCache;
+use std::time::{Instant, Duration};
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, U256};
+use memory_cache::MemoryLruCache;
 
 /// Configuration for how much data to cache.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -68,7 +69,7 @@ pub struct Cache {
 	bodies: MemoryLruCache<H256, encoded::Body>,
 	receipts: MemoryLruCache<H256, Vec<Receipt>>,
 	chain_score: MemoryLruCache<H256, U256>,
-	corpus: Option<(Corpus<U256>, SteadyTime)>,
+	corpus: Option<(Corpus<U256>, Instant)>,
 	corpus_expiration: Duration,
 }
 
@@ -138,7 +139,7 @@ impl Cache {
 
 	/// Get gas price corpus, if recent enough.
 	pub fn gas_price_corpus(&self) -> Option<Corpus<U256>> {
-		let now = SteadyTime::now();
+		let now = Instant::now();
 
 		self.corpus.as_ref().and_then(|&(ref corpus, ref tm)| {
 			if *tm + self.corpus_expiration >= now {
@@ -151,7 +152,7 @@ impl Cache {
 
 	/// Set the cached gas price corpus.
 	pub fn set_gas_price_corpus(&mut self, corpus: Corpus<U256>) {
-		self.corpus = Some((corpus, SteadyTime::now()))
+		self.corpus = Some((corpus, Instant::now()))
 	}
 
 	/// Get the memory used.
@@ -174,18 +175,18 @@ impl HeapSizeOf for Cache {
 #[cfg(test)]
 mod tests {
 	use super::Cache;
-	use time::Duration;
+	use std::time::Duration;
 
 	#[test]
 	fn corpus_inaccessible() {
-		let mut cache = Cache::new(Default::default(), Duration::hours(5));
+		let mut cache = Cache::new(Default::default(), Duration::from_secs(5 * 3600));
 
 		cache.set_gas_price_corpus(vec![].into());
 		assert_eq!(cache.gas_price_corpus(), Some(vec![].into()));
 
 		{
 			let corpus_time = &mut cache.corpus.as_mut().unwrap().1;
-			*corpus_time = *corpus_time - Duration::hours(6);
+			*corpus_time = *corpus_time - Duration::from_secs(6 * 3600);
 		}
 		assert!(cache.gas_price_corpus().is_none());
 	}
diff --git a/ethcore/light/src/cht.rs b/ethcore/light/src/cht.rs
index 7f2ccc3a82c725f10319f050a9334f99d9fc38d5..6f5ebf808e886ce380e7b3bbac0a01171b3b51bc 100644
--- a/ethcore/light/src/cht.rs
+++ b/ethcore/light/src/cht.rs
@@ -21,8 +21,11 @@
 //! we discarded.
 
 use ethcore::ids::BlockId;
-use util::{Bytes, H256, U256, HashDB, MemoryDB};
-use util::trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder};
+use ethereum_types::{H256, U256};
+use hashdb::HashDB;
+use memorydb::MemoryDB;
+use bytes::Bytes;
+use trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder};
 use rlp::{RlpStream, UntrustedRlp};
 
 // encode a key.
@@ -130,7 +133,7 @@ pub fn compute_root<I>(cht_num: u64, iterable: I) -> Option<H256>
 	}
 
 	if v.len() == SIZE as usize {
-		Some(::util::triehash::trie_root(v))
+		Some(::triehash::trie_root(v))
 	} else {
 		None
 	}
diff --git a/ethcore/light/src/client/fetch.rs b/ethcore/light/src/client/fetch.rs
new file mode 100644
index 0000000000000000000000000000000000000000..86269c695fc4b6aa422a84cd5987410b52e0d7a2
--- /dev/null
+++ b/ethcore/light/src/client/fetch.rs
@@ -0,0 +1,85 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Trait for fetching chain data.
+
+use std::sync::Arc;
+
+use ethcore::encoded;
+use ethcore::engines::{EthEngine, StateDependentProof};
+use ethcore::machine::EthereumMachine;
+use ethcore::header::Header;
+use ethcore::receipt::Receipt;
+use futures::future::IntoFuture;
+use ethereum_types::H256;
+
+/// Provides full chain data.
+pub trait ChainDataFetcher: Send + Sync + 'static {
+	/// Error type when data unavailable.
+	type Error: ::std::fmt::Debug;
+
+	/// Future for fetching block body.
+	type Body: IntoFuture<Item=encoded::Block, Error=Self::Error>;
+	/// Future for fetching block receipts.
+	type Receipts: IntoFuture<Item=Vec<Receipt>, Error=Self::Error>;
+	/// Future for fetching epoch transition
+	type Transition: IntoFuture<Item=Vec<u8>, Error=Self::Error>;
+
+	/// Fetch a block body.
+	fn block_body(&self, header: &Header) -> Self::Body;
+
+	/// Fetch block receipts.
+	fn block_receipts(&self, header: &Header) -> Self::Receipts;
+
+	/// Fetch epoch transition proof at given header.
+	fn epoch_transition(
+		&self,
+		_hash: H256,
+		_engine: Arc<EthEngine>,
+		_checker: Arc<StateDependentProof<EthereumMachine>>
+	) -> Self::Transition;
+}
+
+/// Fetcher implementation which cannot fetch anything.
+pub struct Unavailable;
+
+/// Create a fetcher which has all data unavailable.
+pub fn unavailable() -> Unavailable { Unavailable }
+
+impl ChainDataFetcher for Unavailable {
+	type Error = &'static str;
+
+	type Body = Result<encoded::Block, &'static str>;
+	type Receipts = Result<Vec<Receipt>, &'static str>;
+	type Transition = Result<Vec<u8>, &'static str>;
+
+	fn block_body(&self, _header: &Header) -> Self::Body {
+		Err("fetching block bodies unavailable")
+	}
+
+	fn block_receipts(&self, _header: &Header) -> Self::Receipts {
+		Err("fetching block receipts unavailable")
+	}
+
+	fn epoch_transition(
+		&self,
+		_hash: H256,
+		_engine: Arc<EthEngine>,
+		_checker: Arc<StateDependentProof<EthereumMachine>>
+	) -> Self::Transition {
+		Err("fetching epoch transition proofs unavailable")
+	}
+}
diff --git a/ethcore/light/src/client/header_chain.rs b/ethcore/light/src/client/header_chain.rs
index d6ac109c794b8272dfca50a80b5d4bedc1cdb9a8..3bbd6cb9506a15cc75227d215f64485e27c670ee 100644
--- a/ethcore/light/src/client/header_chain.rs
+++ b/ethcore/light/src/client/header_chain.rs
@@ -18,11 +18,12 @@
 //!
 //! Unlike a full node's `BlockChain` this doesn't store much in the database.
 //! It stores candidates for the last 2048-4096 blocks as well as CHT roots for
-//! historical blocks all the way to the genesis.
+//! historical blocks all the way to the genesis. If the engine makes use
+//! of epoch transitions, those are stored as well.
 //!
 //! This is separate from the `BlockChain` for two reasons:
 //!   - It stores only headers (and a pruned subset of them)
-//!   - To allow for flexibility in the database layout once that's incorporated.
+//!   - To allow for flexibility in the database layout..
 
 use std::collections::BTreeMap;
 use std::sync::Arc;
@@ -30,17 +31,24 @@ use std::sync::Arc;
 use cht;
 
 use ethcore::block_status::BlockStatus;
-use ethcore::error::BlockError;
+use ethcore::error::{Error, BlockImportError, BlockError};
 use ethcore::encoded;
 use ethcore::header::Header;
 use ethcore::ids::BlockId;
+use ethcore::spec::{Spec, SpecHardcodedSync};
+use ethcore::engines::epoch::{
+	Transition as EpochTransition,
+	PendingTransition as PendingEpochTransition
+};
 
 use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
-use util::{H256, U256, HeapSizeOf, RwLock};
-use util::kvdb::{DBTransaction, KeyValueDB};
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, H264, U256};
+use plain_hasher::H256FastMap;
+use kvdb::{DBTransaction, KeyValueDB};
 
 use cache::Cache;
-use util::Mutex;
+use parking_lot::{Mutex, RwLock};
 
 use smallvec::SmallVec;
 
@@ -52,6 +60,9 @@ const HISTORY: u64 = 2048;
 /// The best block key. Maps to an RLP list: [best_era, last_era]
 const CURRENT_KEY: &'static [u8] = &*b"best_and_latest";
 
+/// Key storing the last canonical epoch transition.
+const LAST_CANONICAL_TRANSITION: &'static [u8] = &*b"canonical_transition";
+
 /// Information about a block.
 #[derive(Debug, Clone)]
 pub struct BlockDescriptor {
@@ -99,7 +110,6 @@ impl Encodable for Entry {
 
 impl Decodable for Entry {
 	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
-
 		let mut candidates = SmallVec::<[Candidate; 3]>::new();
 
 		for item in rlp.iter() {
@@ -129,16 +139,59 @@ fn era_key(number: u64) -> String {
 	format!("candidates_{}", number)
 }
 
+fn pending_transition_key(block_hash: H256) -> H264 {
+	const LEADING: u8 = 1;
+
+	let mut key = H264::default();
+
+	key[0] = LEADING;
+	key.0[1..].copy_from_slice(&block_hash.0[..]);
+
+	key
+}
+
+fn transition_key(block_hash: H256) -> H264 {
+	const LEADING: u8 = 2;
+
+	let mut key = H264::default();
+
+	key[0] = LEADING;
+	key.0[1..].copy_from_slice(&block_hash.0[..]);
+
+	key
+}
+
+// encode last canonical transition entry: header and proof.
+fn encode_canonical_transition(header: &Header, proof: &[u8]) -> Vec<u8> {
+	let mut stream = RlpStream::new_list(2);
+	stream.append(header).append(&proof);
+	stream.out()
+}
+
+// decode last canonical transition entry.
+fn decode_canonical_transition(t: &[u8]) -> Result<(Header, &[u8]), DecoderError> {
+	let rlp = UntrustedRlp::new(t);
+
+	Ok((rlp.val_at(0)?, rlp.at(1)?.data()?))
+}
+
 /// Pending changes from `insert` to be applied after the database write has finished.
 pub struct PendingChanges {
 	best_block: Option<BlockDescriptor>, // new best block.
 }
 
+/// Whether or not the hardcoded sync feature is allowed.
+pub enum HardcodedSync {
+	Allow,
+	Deny,
+}
+
 /// Header chain. See module docs for more details.
 pub struct HeaderChain {
 	genesis_header: encoded::Header, // special-case the genesis.
 	candidates: RwLock<BTreeMap<u64, Entry>>,
 	best_block: RwLock<BlockDescriptor>,
+	live_epoch_proofs: RwLock<H256FastMap<EpochTransition>>,
 	db: Arc<KeyValueDB>,
 	col: Option<u32>,
 	cache: Arc<Mutex<Cache>>,
@@ -146,8 +199,17 @@ pub struct HeaderChain {
 
 impl HeaderChain {
 	/// Create a new header chain given this genesis block and database to read from.
-	pub fn new(db: Arc<KeyValueDB>, col: Option<u32>, genesis: &[u8], cache: Arc<Mutex<Cache>>) -> Result<Self, String> {
-		use ethcore::views::HeaderView;
+	pub fn new(
+		db: Arc<KeyValueDB>,
+		col: Option<u32>,
+		spec: &Spec,
+		cache: Arc<Mutex<Cache>>,
+		allow_hs: HardcodedSync,
+	) -> Result<Self, Error> {
+		let mut live_epoch_proofs = ::std::collections::HashMap::default();
+
+		let genesis = ::rlp::encode(&spec.genesis_header()).into_vec();
+		let decoded_header = spec.genesis_header();
 
 		let chain = if let Some(current) = db.get(col, CURRENT_KEY)? {
 			let (best_number, highest_number) = {
@@ -158,12 +220,24 @@ impl HeaderChain {
 			let mut cur_number = highest_number;
 			let mut candidates = BTreeMap::new();
 
-			// load all era entries and referenced headers within them.
+			// load all era entries, referenced headers within them,
+			// and live epoch proofs.
 			while let Some(entry) = db.get(col, era_key(cur_number).as_bytes())? {
 				let entry: Entry = ::rlp::decode(&entry);
 				trace!(target: "chain", "loaded header chain entry for era {} with {} candidates",
 					cur_number, entry.candidates.len());
 
+				for c in &entry.candidates {
+					let key = transition_key(c.hash);
+
+					if let Some(proof) = db.get(col, &*key)? {
+						live_epoch_proofs.insert(c.hash, EpochTransition {
+							block_hash: c.hash,
+							block_number: cur_number,
+							proof: proof.into_vec(),
+						});
+					}
+				}
 				candidates.insert(cur_number, entry);
 
 				cur_number -= 1;
@@ -173,7 +247,7 @@ impl HeaderChain {
 			let best_block = {
 				let era = match candidates.get(&best_number) {
 					Some(era) => era,
-					None => return Err(format!("Database corrupt: highest block referenced but no data.")),
+					None => return Err(Error::Database("Database corrupt: highest block referenced but no data.".into())),
 				};
 
 				let best = &era.candidates[0];
@@ -185,29 +259,77 @@ impl HeaderChain {
 			};
 
 			HeaderChain {
-				genesis_header: encoded::Header::new(genesis.to_owned()),
+				genesis_header: encoded::Header::new(genesis),
 				best_block: RwLock::new(best_block),
 				candidates: RwLock::new(candidates),
+				live_epoch_proofs: RwLock::new(live_epoch_proofs),
 				db: db,
 				col: col,
 				cache: cache,
 			}
+
 		} else {
-			let g_view = HeaderView::new(genesis);
-			HeaderChain {
-				genesis_header: encoded::Header::new(genesis.to_owned()),
+			let chain = HeaderChain {
+				genesis_header: encoded::Header::new(genesis),
 				best_block: RwLock::new(BlockDescriptor {
-					hash: g_view.hash(),
+					hash: decoded_header.hash(),
 					number: 0,
-					total_difficulty: g_view.difficulty(),
+					total_difficulty: *decoded_header.difficulty(),
 				}),
 				candidates: RwLock::new(BTreeMap::new()),
-				db: db,
+				live_epoch_proofs: RwLock::new(live_epoch_proofs),
+				db: db.clone(),
 				col: col,
 				cache: cache,
+			};
+
+			// insert the hardcoded sync into the database.
+			if let (&Some(ref hardcoded_sync), HardcodedSync::Allow) = (&spec.hardcoded_sync, allow_hs) {
+				let mut batch = db.transaction();
+
+				// insert the hardcoded CHT roots into the database.
+				for (cht_num, cht_root) in hardcoded_sync.chts.iter().enumerate() {
+					batch.put(col, cht_key(cht_num as u64).as_bytes(), &::rlp::encode(cht_root));
+				}
+
+				let decoded_header = hardcoded_sync.header.decode();
+				let decoded_header_num = decoded_header.number();
+
+				// write the block in the DB.
+				info!(target: "chain", "Inserting hardcoded block #{} in chain",
+					  decoded_header_num);
+				let pending = chain.insert_with_td(&mut batch, decoded_header,
+												hardcoded_sync.total_difficulty, None)?;
+
+				// check that we have enough hardcoded CHT roots. avoids panicking later.
+				let cht_num = cht::block_to_cht_number(decoded_header_num - 1)
+					.expect("specs provided a hardcoded block with height 0");
+				if cht_num >= hardcoded_sync.chts.len() as u64 {
+					warn!(target: "chain", "specs didn't provide enough CHT roots for its \
+											hardcoded block ; falling back to non-hardcoded sync \
+											mode");
+				} else {
+					db.write_buffered(batch);
+					chain.apply_pending(pending);
+				}
 			}
+
+			chain
 		};
 
+		// instantiate genesis epoch data if it doesn't exist.
+		if let None = chain.db.get(col, LAST_CANONICAL_TRANSITION)? {
+			let genesis_data = spec.genesis_epoch_data()
+				.map_err(|s| Error::Database(s.into()))?;
+
+			{
+				let mut batch = chain.db.transaction();
+				let data = encode_canonical_transition(&decoded_header, &genesis_data);
+				batch.put_vec(col, LAST_CANONICAL_TRANSITION, data);
+				chain.db.write(batch)?;
+			}
+		}
+
 		Ok(chain)
 	}
 
@@ -216,10 +338,47 @@ impl HeaderChain {
 	/// This blindly trusts that the data given to it is sensible.
 	/// Returns a set of pending changes to be applied with `apply_pending`
 	/// before the next call to insert and after the transaction has been written.
-	pub fn insert(&self, transaction: &mut DBTransaction, header: Header) -> Result<PendingChanges, BlockError> {
+	///
+	/// If the block is an epoch transition, provide the transition along with
+	/// the header.
+	pub fn insert(
+		&self,
+		transaction: &mut DBTransaction,
+		header: Header,
+		transition_proof: Option<Vec<u8>>,
+	) -> Result<PendingChanges, BlockImportError> {
+		self.insert_inner(transaction, header, None, transition_proof)
+	}
+
+	/// Insert a pre-verified header, with a known total difficulty. Similary to `insert`.
+	///
+	/// This blindly trusts that the data given to it is sensible.
+	pub fn insert_with_td(
+		&self,
+		transaction: &mut DBTransaction,
+		header: Header,
+		total_difficulty: U256,
+		transition_proof: Option<Vec<u8>>,
+	) -> Result<PendingChanges, BlockImportError> {
+		self.insert_inner(transaction, header, Some(total_difficulty), transition_proof)
+	}
+
+	fn insert_inner(
+		&self,
+		transaction: &mut DBTransaction,
+		header: Header,
+		total_difficulty: Option<U256>,
+		transition_proof: Option<Vec<u8>>,
+	) -> Result<PendingChanges, BlockImportError> {
 		let hash = header.hash();
 		let number = header.number();
 		let parent_hash = *header.parent_hash();
+		let transition = transition_proof.map(|proof| EpochTransition {
+			block_hash: hash,
+			block_number: number,
+			proof: proof,
+		});
+
 		let mut pending = PendingChanges {
 			best_block: None,
 		};
@@ -227,18 +386,24 @@ impl HeaderChain {
 		// hold candidates the whole time to guard import order.
 		let mut candidates = self.candidates.write();
 
-		// find parent details.
-		let parent_td =
-			if number == 1 {
-				self.genesis_header.difficulty()
-			} else {
-				candidates.get(&(number - 1))
-					.and_then(|entry| entry.candidates.iter().find(|c| c.hash == parent_hash))
-					.map(|c| c.total_difficulty)
-					.ok_or_else(|| BlockError::UnknownParent(parent_hash))?
-			};
+		// find total difficulty.
+		let total_difficulty = match total_difficulty {
+			Some(td) => td,
+			None => {
+				let parent_td =
+					if number == 1 {
+						self.genesis_header.difficulty()
+					} else {
+						candidates.get(&(number - 1))
+							.and_then(|entry| entry.candidates.iter().find(|c| c.hash == parent_hash))
+							.map(|c| c.total_difficulty)
+							.ok_or_else(|| BlockError::UnknownParent(parent_hash))
+							.map_err(BlockImportError::Block)?
+					};
 
-		let total_difficulty = parent_td + *header.difficulty();
+				parent_td + *header.difficulty()
+			},
+		};
 
 		// insert headers and candidates entries and write era to disk.
 		{
@@ -260,8 +425,13 @@ impl HeaderChain {
 			transaction.put(self.col, era_key(number).as_bytes(), &::rlp::encode(&*cur_era))
 		}
 
-		let raw = ::rlp::encode(&header);
-		transaction.put(self.col, &hash[..], &*raw);
+		if let Some(transition) = transition {
+			transaction.put(self.col, &*transition_key(hash), &transition.proof);
+			self.live_epoch_proofs.write().insert(hash, transition);
+		}
+
+		let raw = header.encoded().into_inner();
+		transaction.put_vec(self.col, &hash[..], raw);
 
 		let (best_num, is_new_best) = {
 			let cur_best = self.best_block.read();
@@ -314,8 +484,10 @@ impl HeaderChain {
 				let cht_num = cht::block_to_cht_number(earliest_era)
 					.expect("fails only for number == 0; genesis never imported; qed");
 
+				let mut last_canonical_transition = None;
 				let cht_root = {
 					let mut i = earliest_era;
+					let mut live_epoch_proofs = self.live_epoch_proofs.write();
 
 					// iterable function which removes the candidates as it goes
 					// along. this will only be called until the CHT is complete.
@@ -326,7 +498,25 @@ impl HeaderChain {
 
 						i += 1;
 
+						// prune old blocks and epoch proofs.
 						for ancient in &era_entry.candidates {
+							let maybe_transition = live_epoch_proofs.remove(&ancient.hash);
+							if let Some(epoch_transition) = maybe_transition {
+								transaction.delete(self.col, &*transition_key(ancient.hash));
+
+								if ancient.hash == era_entry.canonical_hash {
+									last_canonical_transition = match self.db.get(self.col, &ancient.hash) {
+										Err(e) => {
+											warn!(target: "chain", "Error reading from DB: {}\n
+												", e);
+											None
+										}
+										Ok(None) => panic!("stored candidates always have corresponding headers; qed"),
+										Ok(Some(header)) => Some((epoch_transition, ::rlp::decode(&header))),
+									};
+								}
+							}
+
 							transaction.delete(self.col, &ancient.hash);
 						}
 
@@ -340,6 +530,12 @@ impl HeaderChain {
 				// write the CHT root to the database.
 				debug!(target: "chain", "Produced CHT {} root: {:?}", cht_num, cht_root);
 				transaction.put(self.col, cht_key(cht_num).as_bytes(), &::rlp::encode(&cht_root));
+
+				// update the last canonical transition proof
+				if let Some((epoch_transition, header)) = last_canonical_transition {
+					let x = encode_canonical_transition(&header, &epoch_transition.proof);
+					transaction.put_vec(self.col, LAST_CANONICAL_TRANSITION, x);
+				}
 			}
 		}
 
@@ -353,6 +549,65 @@ impl HeaderChain {
 		Ok(pending)
 	}
 
+	/// Generates the specifications for hardcoded sync. This is typically only called manually
+	/// from time to time by a Parity developer in order to update the chain specifications.
+	///
+	/// Returns `None` if we are at the genesis block, or if an error happens .
+	pub fn read_hardcoded_sync(&self) -> Result<Option<SpecHardcodedSync>, Error> {
+		let mut chts = Vec::new();
+		let mut cht_num = 0;
+
+		loop {
+			let cht = match self.cht_root(cht_num) {
+				Some(cht) => cht,
+				None if cht_num != 0 => {
+					// end of the iteration
+					let h_num = 1 + cht_num as u64 * cht::SIZE;
+					let header = if let Some(header) = self.block_header(BlockId::Number(h_num)) {
+						header
+					} else {
+						let msg = format!("header of block #{} not found in DB ; database in an \
+											inconsistent state", h_num);
+						return Err(Error::Database(msg.into()));
+					};
+
+					let decoded = header.decode();
+
+					let entry: Entry = {
+						let bytes = self.db.get(self.col, era_key(h_num).as_bytes())?
+							.ok_or_else(|| {
+								let msg = format!("entry for era #{} not found in DB ; database \
+													in an inconsistent state", h_num);
+								Error::Database(msg.into())
+							})?;
+						::rlp::decode(&bytes)
+					};
+
+					let total_difficulty = entry.candidates.iter()
+						.find(|c| c.hash == decoded.hash())
+						.ok_or_else(|| {
+							let msg = "no candidate matching block found in DB ; database in an \
+										inconsistent state";
+							Error::Database(msg.into())
+						})?
+						.total_difficulty;
+
+					break Ok(Some(SpecHardcodedSync {
+						header: header,
+						total_difficulty: total_difficulty,
+						chts: chts,
+					}));
+				},
+				None => {
+					break Ok(None);
+				},
+			};
+
+			chts.push(cht);
+			cht_num += 1;
+		}
+	}
+
 	/// Apply pending changes from a previous `insert` operation.
 	/// Must be done before the next `insert` call.
 	pub fn apply_pending(&self, pending: PendingChanges) {
@@ -365,13 +620,13 @@ impl HeaderChain {
 	/// will be returned.
 	pub fn block_hash(&self, id: BlockId) -> Option<H256> {
 		match id {
-			BlockId::Earliest => Some(self.genesis_hash()),
+			BlockId::Earliest | BlockId::Number(0) => Some(self.genesis_hash()),
 			BlockId::Hash(hash) => Some(hash),
 			BlockId::Number(num) => {
 				if self.best_block.read().number < num { return None }
 				self.candidates.read().get(&num).map(|entry| entry.canonical_hash)
 			}
-			BlockId::Latest | BlockId::Pending => {
+			BlockId::Latest => {
 				Some(self.best_block.read().hash)
 			}
 		}
@@ -413,7 +668,7 @@ impl HeaderChain {
 				self.candidates.read().get(&num).map(|entry| entry.canonical_hash)
 					.and_then(load_from_db)
 			}
-			BlockId::Latest | BlockId::Pending => {
+			BlockId::Latest => {
 				// hold candidates hear to prevent deletion of the header
 				// as we read it.
 				let _candidates = self.candidates.read();
@@ -449,7 +704,7 @@ impl HeaderChain {
 				if self.best_block.read().number < num { return None }
 				candidates.get(&num).map(|era| era.candidates[0].total_difficulty)
 			}
-			BlockId::Latest | BlockId::Pending => Some(self.best_block.read().total_difficulty)
+			BlockId::Latest => Some(self.best_block.read().total_difficulty)
 		}
 	}
 
@@ -486,7 +741,7 @@ impl HeaderChain {
 
 	/// Get the genesis hash.
 	pub fn genesis_hash(&self) -> H256 {
-		::util::Hashable::sha3(&self.genesis_header)
+		self.genesis_header.hash()
 	}
 
 	/// Get the best block's data.
@@ -516,6 +771,56 @@ impl HeaderChain {
 			false => BlockStatus::Unknown,
 		}
 	}
+
+	/// Insert a pending transition.
+	pub fn insert_pending_transition(&self, batch: &mut DBTransaction, hash: H256, t: PendingEpochTransition) {
+		let key = pending_transition_key(hash);
+		batch.put(self.col, &*key, &*::rlp::encode(&t));
+	}
+
+	/// Get pending transition for a specific block hash.
+	pub fn pending_transition(&self, hash: H256) -> Option<PendingEpochTransition> {
+		let key = pending_transition_key(hash);
+		match self.db.get(self.col, &*key) {
+			Ok(val) => val.map(|x| ::rlp::decode(&x)),
+			Err(e) => {
+				warn!(target: "chain", "Error reading from database: {}", e);
+				None
+			}
+		}
+	}
+
+	/// Get the transition to the epoch the given parent hash is part of
+	/// or transitions to.
+	/// This will give the epoch that any children of this parent belong to.
+	///
+	/// The header corresponding the the parent hash must be stored already.
+	pub fn epoch_transition_for(&self, parent_hash: H256) -> Option<(Header, Vec<u8>)> {
+		// slow path: loop back block by block
+		let live_proofs = self.live_epoch_proofs.read();
+
+		for hdr in self.ancestry_iter(BlockId::Hash(parent_hash)) {
+			if let Some(transition) = live_proofs.get(&hdr.hash()).cloned() {
+				return Some((hdr.decode(), transition.proof))
+			}
+		}
+
+		// any blocks left must be descendants of the last canonical transition block.
+		match self.db.get(self.col, LAST_CANONICAL_TRANSITION) {
+			Ok(x) => {
+				let x = x.expect("last canonical transition always instantiated; qed");
+
+				let (hdr, proof) = decode_canonical_transition(&x)
+					.expect("last canonical transition always encoded correctly; qed");
+
+				Some((hdr, proof.to_vec()))
+			}
+			Err(e) => {
+				warn!("Error reading from DB: {}", e);
+				None
+			}
+		}
+	}
 }
 
 impl HeapSizeOf for HeaderChain {
@@ -545,19 +850,22 @@ impl<'a> Iterator for AncestryIter<'a> {
 
 #[cfg(test)]
 mod tests {
-	use super::HeaderChain;
+	use super::{HeaderChain, HardcodedSync};
 	use std::sync::Arc;
 
+	use ethereum_types::U256;
 	use ethcore::ids::BlockId;
 	use ethcore::header::Header;
 	use ethcore::spec::Spec;
   	use cache::Cache;
+	use kvdb::KeyValueDB;
+	use kvdb_memorydb;
 
-	use time::Duration;
-	use util::Mutex;
+	use std::time::Duration;
+	use parking_lot::Mutex;
 
-	fn make_db() -> Arc<::util::KeyValueDB> {
-		Arc::new(::util::kvdb::in_memory(0))
+	fn make_db() -> Arc<KeyValueDB> {
+		Arc::new(kvdb_memorydb::create(0))
 	}
 
 	#[test]
@@ -566,9 +874,9 @@ mod tests {
 		let genesis_header = spec.genesis_header();
 		let db = make_db();
 
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache, HardcodedSync::Allow).unwrap();
 
 		let mut parent_hash = genesis_header.hash();
 		let mut rolling_timestamp = genesis_header.timestamp();
@@ -577,11 +885,11 @@ mod tests {
 			header.set_parent_hash(parent_hash);
 			header.set_number(i);
 			header.set_timestamp(rolling_timestamp);
-			header.set_difficulty(*genesis_header.difficulty() * i.into());
+			header.set_difficulty(*genesis_header.difficulty() * i as u32);
 			parent_hash = header.hash();
 
 			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, header).unwrap();
+			let pending = chain.insert(&mut tx, header, None).unwrap();
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);
 
@@ -599,9 +907,9 @@ mod tests {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
 		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache, HardcodedSync::Allow).unwrap();
 
 		let mut parent_hash = genesis_header.hash();
 		let mut rolling_timestamp = genesis_header.timestamp();
@@ -610,11 +918,11 @@ mod tests {
 			header.set_parent_hash(parent_hash);
 			header.set_number(i);
 			header.set_timestamp(rolling_timestamp);
-			header.set_difficulty(*genesis_header.difficulty() * i.into());
+			header.set_difficulty(*genesis_header.difficulty() * i as u32);
 			parent_hash = header.hash();
 
 			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, header).unwrap();
+			let pending = chain.insert(&mut tx, header, None).unwrap();
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);
 
@@ -629,11 +937,11 @@ mod tests {
 				header.set_parent_hash(parent_hash);
 				header.set_number(i);
 				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * i.into());
+				header.set_difficulty(*genesis_header.difficulty() * i as u32);
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header).unwrap();
+				let pending = chain.insert(&mut tx, header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);
 
@@ -653,11 +961,11 @@ mod tests {
 				header.set_parent_hash(parent_hash);
 				header.set_number(i);
 				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * (i * i).into());
+				header.set_difficulty(*genesis_header.difficulty() * U256::from(i * i));
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header).unwrap();
+				let pending = chain.insert(&mut tx, header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);
 
@@ -680,16 +988,13 @@ mod tests {
 	#[test]
 	fn earliest_is_latest() {
 		let spec = Spec::new_test();
-		let genesis_header = spec.genesis_header();
 		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
-
-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache).unwrap();
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache, HardcodedSync::Allow).unwrap();
 
 		assert!(chain.block_header(BlockId::Earliest).is_some());
 		assert!(chain.block_header(BlockId::Latest).is_some());
-		assert!(chain.block_header(BlockId::Pending).is_some());
 	}
 
 	#[test]
@@ -697,10 +1002,11 @@ mod tests {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
 		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
 		{
-			let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache.clone()).unwrap();
+			let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone(),
+										HardcodedSync::Allow).unwrap();
 			let mut parent_hash = genesis_header.hash();
 			let mut rolling_timestamp = genesis_header.timestamp();
 			for i in 1..10000 {
@@ -708,11 +1014,11 @@ mod tests {
 				header.set_parent_hash(parent_hash);
 				header.set_number(i);
 				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * i.into());
+				header.set_difficulty(*genesis_header.difficulty() * i as u32);
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header).unwrap();
+				let pending = chain.insert(&mut tx, header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);
 
@@ -720,7 +1026,8 @@ mod tests {
 			}
 		}
 
-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache.clone()).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone(),
+									HardcodedSync::Allow).unwrap();
 		assert!(chain.block_header(BlockId::Number(10)).is_none());
 		assert!(chain.block_header(BlockId::Number(9000)).is_some());
 		assert!(chain.cht_root(2).is_some());
@@ -733,10 +1040,11 @@ mod tests {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
 		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
 		{
-			let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache.clone()).unwrap();
+			let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone(),
+										HardcodedSync::Allow).unwrap();
 			let mut parent_hash = genesis_header.hash();
 			let mut rolling_timestamp = genesis_header.timestamp();
 
@@ -746,11 +1054,11 @@ mod tests {
 				header.set_parent_hash(parent_hash);
 				header.set_number(i);
 				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * i.into());
+				header.set_difficulty(*genesis_header.difficulty() * i as u32);
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header).unwrap();
+				let pending = chain.insert(&mut tx, header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);
 
@@ -763,11 +1071,11 @@ mod tests {
 				header.set_parent_hash(parent_hash);
 				header.set_number(i);
 				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * i.into() * 1000.into());
+				header.set_difficulty(*genesis_header.difficulty() * U256::from(i as u32 * 1000u32));
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header).unwrap();
+				let pending = chain.insert(&mut tx, header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);
 
@@ -778,7 +1086,8 @@ mod tests {
 		}
 
 		// after restoration, non-canonical eras should still be loaded.
-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache.clone()).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone(),
+									HardcodedSync::Allow).unwrap();
 		assert_eq!(chain.block_header(BlockId::Latest).unwrap().number(), 10);
 		assert!(chain.candidates.read().get(&100).is_some())
 	}
@@ -788,12 +1097,120 @@ mod tests {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
 		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache.clone()).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone(),
+									HardcodedSync::Allow).unwrap();
 
 		assert!(chain.block_header(BlockId::Earliest).is_some());
 		assert!(chain.block_header(BlockId::Number(0)).is_some());
 		assert!(chain.block_header(BlockId::Hash(genesis_header.hash())).is_some());
 	}
+
+	#[test]
+	fn epoch_transitions_available_after_cht() {
+		let spec = Spec::new_test();
+		let genesis_header = spec.genesis_header();
+		let db = make_db();
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
+
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache, HardcodedSync::Allow).unwrap();
+
+		let mut parent_hash = genesis_header.hash();
+		let mut rolling_timestamp = genesis_header.timestamp();
+		for i in 1..6 {
+			let mut header = Header::new();
+			header.set_parent_hash(parent_hash);
+			header.set_number(i);
+			header.set_timestamp(rolling_timestamp);
+			header.set_difficulty(*genesis_header.difficulty() * i as u32);
+			parent_hash = header.hash();
+
+			let mut tx = db.transaction();
+			let epoch_proof = if i == 3 {
+				Some(vec![1, 2, 3, 4])
+			} else {
+				None
+			};
+
+			let pending = chain.insert(&mut tx, header, epoch_proof).unwrap();
+			db.write(tx).unwrap();
+			chain.apply_pending(pending);
+
+			rolling_timestamp += 10;
+		}
+
+		// these 3 should end up falling back to the genesis epoch proof in DB
+		for i in 0..3 {
+			let hash = chain.block_hash(BlockId::Number(i)).unwrap();
+			assert_eq!(chain.epoch_transition_for(hash).unwrap().1, Vec::<u8>::new());
+		}
+
+		// these are live.
+		for i in 3..6 {
+			let hash = chain.block_hash(BlockId::Number(i)).unwrap();
+			assert_eq!(chain.epoch_transition_for(hash).unwrap().1, vec![1, 2, 3, 4]);
+		}
+
+		for i in 6..10000 {
+			let mut header = Header::new();
+			header.set_parent_hash(parent_hash);
+			header.set_number(i);
+			header.set_timestamp(rolling_timestamp);
+			header.set_difficulty(*genesis_header.difficulty() * i as u32);
+			parent_hash = header.hash();
+
+			let mut tx = db.transaction();
+			let pending = chain.insert(&mut tx, header, None).unwrap();
+			db.write(tx).unwrap();
+			chain.apply_pending(pending);
+
+			rolling_timestamp += 10;
+		}
+
+		// no live blocks have associated epoch proofs -- make sure we aren't leaking memory.
+		assert!(chain.live_epoch_proofs.read().is_empty());
+		assert_eq!(chain.epoch_transition_for(parent_hash).unwrap().1, vec![1, 2, 3, 4]);
+	}
+
+	#[test]
+	fn hardcoded_sync_gen() {
+		let spec = Spec::new_test();
+		let genesis_header = spec.genesis_header();
+		let db = make_db();
+
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
+
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache, HardcodedSync::Allow).unwrap();
+
+		let mut parent_hash = genesis_header.hash();
+		let mut rolling_timestamp = genesis_header.timestamp();
+		let mut total_difficulty = *genesis_header.difficulty();
+		let h_num = 3 * ::cht::SIZE + 1;
+		for i in 1..10000 {
+			let mut header = Header::new();
+			header.set_parent_hash(parent_hash);
+			header.set_number(i);
+			header.set_timestamp(rolling_timestamp);
+			let diff = *genesis_header.difficulty() * i as u32;
+			header.set_difficulty(diff);
+			if i <= h_num {
+				total_difficulty = total_difficulty + diff;
+			}
+			parent_hash = header.hash();
+
+			let mut tx = db.transaction();
+			let pending = chain.insert(&mut tx, header, None).unwrap();
+			db.write(tx).unwrap();
+			chain.apply_pending(pending);
+
+			rolling_timestamp += 10;
+		}
+
+		let hardcoded_sync = chain.read_hardcoded_sync().unwrap().unwrap();
+		assert_eq!(hardcoded_sync.chts.len(), 3);
+		assert_eq!(hardcoded_sync.total_difficulty, total_difficulty);
+		let decoded: Header = hardcoded_sync.header.decode();
+		assert_eq!(decoded.number(), h_num);
+	}
 }
diff --git a/ethcore/light/src/client/mod.rs b/ethcore/light/src/client/mod.rs
index d1cdfe9aa8a27e4191f1e6a65a28690346989f04..cf603d853f07bbe118cf30443a53e7fc87e2511e 100644
--- a/ethcore/light/src/client/mod.rs
+++ b/ethcore/light/src/client/mod.rs
@@ -19,22 +19,25 @@
 use std::sync::{Weak, Arc};
 
 use ethcore::block_status::BlockStatus;
-use ethcore::client::{ClientReport, EnvInfo};
-use ethcore::engines::Engine;
-use ethcore::error::BlockImportError;
+use ethcore::client::{ClientReport, EnvInfo, ClientIoMessage};
+use ethcore::engines::{epoch, EthEngine, EpochChange, EpochTransition, Proof};
+use ethcore::machine::EthereumMachine;
+use ethcore::error::{Error, BlockImportError};
 use ethcore::ids::BlockId;
-use ethcore::header::Header;
+use ethcore::header::{BlockNumber, Header};
 use ethcore::verification::queue::{self, HeaderQueue};
 use ethcore::blockchain_info::BlockChainInfo;
-use ethcore::spec::Spec;
-use ethcore::service::ClientIoMessage;
+use ethcore::spec::{Spec, SpecHardcodedSync};
 use ethcore::encoded;
 use io::IoChannel;
+use parking_lot::{Mutex, RwLock};
+use ethereum_types::{H256, U256};
+use futures::{IntoFuture, Future};
 
-use util::{H256, U256, Mutex, RwLock};
-use util::kvdb::{KeyValueDB, CompactionProfile};
+use kvdb::KeyValueDB;
 
-use self::header_chain::{AncestryIter, HeaderChain};
+use self::fetch::ChainDataFetcher;
+use self::header_chain::{AncestryIter, HeaderChain, HardcodedSync};
 
 use cache::Cache;
 
@@ -43,6 +46,8 @@ pub use self::service::Service;
 mod header_chain;
 mod service;
 
+pub mod fetch;
+
 /// Configuration for the light client.
 #[derive(Debug, Clone)]
 pub struct Config {
@@ -50,16 +55,12 @@ pub struct Config {
 	pub queue: queue::Config,
 	/// Chain column in database.
 	pub chain_column: Option<u32>,
-	/// Database cache size. `None` => rocksdb default.
-	pub db_cache_size: Option<usize>,
-	/// State db compaction profile
-	pub db_compaction: CompactionProfile,
-	/// Should db have WAL enabled?
-	pub db_wal: bool,
 	/// Should it do full verification of blocks?
 	pub verify_full: bool,
 	/// Should it check the seal of blocks?
 	pub check_seal: bool,
+	/// Disable hardcoded sync.
+	pub no_hardcoded_sync: bool,
 }
 
 impl Default for Config {
@@ -67,17 +68,18 @@ impl Default for Config {
 		Config {
 			queue: Default::default(),
 			chain_column: None,
-			db_cache_size: None,
-			db_compaction: CompactionProfile::default(),
-			db_wal: true,
 			verify_full: true,
 			check_seal: true,
+			no_hardcoded_sync: false,
 		}
 	}
 }
 
 /// Trait for interacting with the header chain abstractly.
 pub trait LightChainClient: Send + Sync {
+	/// Adds a new `LightChainNotify` listener.
+	fn add_listener(&self, listener: Weak<LightChainNotify>);
+
 	/// Get chain info.
 	fn chain_info(&self) -> BlockChainInfo;
 
@@ -108,7 +110,7 @@ pub trait LightChainClient: Send + Sync {
 	fn env_info(&self, id: BlockId) -> Option<EnvInfo>;
 
 	/// Get a handle to the consensus engine.
-	fn engine(&self) -> &Arc<Engine>;
+	fn engine(&self) -> &Arc<EthEngine>;
 
 	/// Query whether a block is known.
 	fn is_known(&self, hash: &H256) -> bool;
@@ -126,7 +128,7 @@ pub trait LightChainClient: Send + Sync {
 	fn cht_root(&self, i: usize) -> Option<H256>;
 
 	/// Get the EIP-86 transition block number.
-	fn eip86_transition(&self) -> u64;
+	fn eip86_transition(&self) -> BlockNumber;
 
 	/// Get a report of import activity since the last call.
 	fn report(&self) -> ClientReport;
@@ -154,47 +156,58 @@ impl<T: LightChainClient> AsLightClient for T {
 }
 
 /// Light client implementation.
-pub struct Client {
+pub struct Client<T> {
 	queue: HeaderQueue,
-	engine: Arc<Engine>,
+	engine: Arc<EthEngine>,
 	chain: HeaderChain,
 	report: RwLock<ClientReport>,
 	import_lock: Mutex<()>,
 	db: Arc<KeyValueDB>,
 	listeners: RwLock<Vec<Weak<LightChainNotify>>>,
+	fetcher: T,
 	verify_full: bool,
 }
 
-impl Client {
+impl<T: ChainDataFetcher> Client<T> {
 	/// Create a new `Client`.
-	pub fn new(config: Config, db: Arc<KeyValueDB>, chain_col: Option<u32>, spec: &Spec, io_channel: IoChannel<ClientIoMessage>, cache: Arc<Mutex<Cache>>) -> Result<Self, String> {
-		let gh = ::rlp::encode(&spec.genesis_header());
-
+	pub fn new(
+		config: Config,
+		db: Arc<KeyValueDB>,
+		chain_col: Option<u32>,
+		spec: &Spec,
+		fetcher: T,
+		io_channel: IoChannel<ClientIoMessage>,
+		cache: Arc<Mutex<Cache>>
+	) -> Result<Self, Error> {
 		Ok(Client {
 			queue: HeaderQueue::new(config.queue, spec.engine.clone(), io_channel, config.check_seal),
 			engine: spec.engine.clone(),
-			chain: HeaderChain::new(db.clone(), chain_col, &gh, cache)?,
+			chain: {
+				let hs_cfg = if config.no_hardcoded_sync { HardcodedSync::Deny } else { HardcodedSync::Allow };
+				HeaderChain::new(db.clone(), chain_col, &spec, cache, hs_cfg)?
+			},
 			report: RwLock::new(ClientReport::default()),
 			import_lock: Mutex::new(()),
 			db: db,
 			listeners: RwLock::new(vec![]),
+			fetcher: fetcher,
 			verify_full: config.verify_full,
 		})
 	}
 
+	/// Generates the specifications for hardcoded sync. This is typically only called manually
+	/// from time to time by a Parity developer in order to update the chain specifications.
+	///
+	/// Returns `None` if we are at the genesis block.
+	pub fn read_hardcoded_sync(&self) -> Result<Option<SpecHardcodedSync>, Error> {
+		self.chain.read_hardcoded_sync()
+	}
+
 	/// Adds a new `LightChainNotify` listener.
 	pub fn add_listener(&self, listener: Weak<LightChainNotify>) {
 		self.listeners.write().push(listener);
 	}
 
-	/// Create a new `Client` backed purely in-memory.
-	/// This will ignore all database options in the configuration.
-	pub fn in_memory(config: Config, spec: &Spec, io_channel: IoChannel<ClientIoMessage>, cache: Arc<Mutex<Cache>>) -> Self {
-		let db = ::util::kvdb::in_memory(0);
-
-		Client::new(config, Arc::new(db), None, spec, io_channel, cache).expect("New DB creation infallible; qed")
-	}
-
 	/// Import a header to the queue for additional verification.
 	pub fn import_header(&self, header: Header) -> Result<H256, BlockImportError> {
 		self.queue.import(header).map_err(Into::into)
@@ -291,19 +304,33 @@ impl Client {
 				continue
 			}
 
-			// TODO: `epoch_end_signal`, `is_epoch_end`.
-			// proofs we get from the network would be _complete_, whereas we need
-			// _incomplete_ signals
+			let write_proof_result = match self.check_epoch_signal(&verified_header) {
+				Ok(Some(proof)) => self.write_pending_proof(&verified_header, proof),
+				Ok(None) => Ok(()),
+				Err(e) =>
+					panic!("Unable to fetch epoch transition proof: {:?}", e),
+			};
+
+			if let Err(e) = write_proof_result {
+				warn!(target: "client", "Error writing pending transition proof to DB: {:?} \
+					The node may not be able to synchronize further.", e);
+			}
+
+			let epoch_proof =  self.engine.is_epoch_end(
+				&verified_header,
+				&|h| self.chain.block_header(BlockId::Hash(h)).map(|hdr| hdr.decode()),
+				&|h| self.chain.pending_transition(h),
+			);
 
 			let mut tx = self.db.transaction();
-			let pending = match self.chain.insert(&mut tx, verified_header) {
+			let pending = match self.chain.insert(&mut tx, verified_header, epoch_proof) {
 				Ok(pending) => {
 					good.push(hash);
 					self.report.write().blocks_imported += 1;
 					pending
 				}
 				Err(e) => {
-					debug!(target: "client", "Error importing header {:?}: {}", (num, hash), e);
+					debug!(target: "client", "Error importing header {:?}: {:?}", (num, hash), e);
 					bad.push(hash);
 					continue;
 				}
@@ -330,13 +357,13 @@ impl Client {
 
 	/// Get blockchain mem usage in bytes.
 	pub fn chain_mem_used(&self) -> usize {
-		use util::HeapSizeOf;
+		use heapsize::HeapSizeOf;
 
 		self.chain.heap_size_of_children()
 	}
 
 	/// Get a handle to the verification engine.
-	pub fn engine(&self) -> &Arc<Engine> {
+	pub fn engine(&self) -> &Arc<EthEngine> {
 		&self.engine
 	}
 
@@ -399,7 +426,7 @@ impl Client {
 		};
 
 		// Verify Block Family
-		let verify_family_result = self.engine.verify_block_family(&verified_header, &parent_header.decode(), None);
+		let verify_family_result = self.engine.verify_block_family(&verified_header, &parent_header.decode());
 		if let Err(e) = verify_family_result {
 			warn!(target: "client", "Stage 3 block verification failed for #{} ({})\nError: {:?}",
 				verified_header.number(), verified_header.hash(), e);
@@ -408,7 +435,7 @@ impl Client {
 		};
 
 		// "external" verification.
-		let verify_external_result = self.engine.verify_block_external(&verified_header, None);
+		let verify_external_result = self.engine.verify_block_external(&verified_header);
 		if let Err(e) = verify_external_result {
 			warn!(target: "client", "Stage 4 block verification failed for #{} ({})\nError: {:?}",
 				verified_header.number(), verified_header.hash(), e);
@@ -419,9 +446,80 @@ impl Client {
 
 		true
 	}
+
+	fn check_epoch_signal(&self, verified_header: &Header) -> Result<Option<Proof<EthereumMachine>>, T::Error> {
+		use ethcore::machine::{AuxiliaryRequest, AuxiliaryData};
+
+		let mut block: Option<Vec<u8>> = None;
+		let mut receipts: Option<Vec<_>> = None;
+
+		loop {
+
+
+			let is_signal = {
+				let auxiliary = AuxiliaryData {
+					bytes: block.as_ref().map(|x| &x[..]),
+					receipts: receipts.as_ref().map(|x| &x[..]),
+				};
+
+				self.engine.signals_epoch_end(verified_header, auxiliary)
+			};
+
+			// check with any auxiliary data fetched so far
+			match is_signal {
+				EpochChange::No => return Ok(None),
+				EpochChange::Yes(proof) => return Ok(Some(proof)),
+				EpochChange::Unsure(unsure) => {
+					let (b, r) = match unsure {
+						AuxiliaryRequest::Body =>
+							(Some(self.fetcher.block_body(verified_header)), None),
+						AuxiliaryRequest::Receipts =>
+							(None, Some(self.fetcher.block_receipts(verified_header))),
+						AuxiliaryRequest::Both => (
+							Some(self.fetcher.block_body(verified_header)),
+							Some(self.fetcher.block_receipts(verified_header)),
+						),
+					};
+
+					if let Some(b) = b {
+						block = Some(b.into_future().wait()?.into_inner());
+					}
+
+					if let Some(r) = r {
+						receipts = Some(r.into_future().wait()?);
+					}
+				}
+			}
+		}
+	}
+
+	// attempts to fetch the epoch proof from the network until successful.
+	fn write_pending_proof(&self, header: &Header, proof: Proof<EthereumMachine>) -> Result<(), T::Error> {
+		let proof = match proof {
+			Proof::Known(known) => known,
+			Proof::WithState(state_dependent) => {
+				self.fetcher.epoch_transition(
+					header.hash(),
+					self.engine.clone(),
+					state_dependent
+				).into_future().wait()?
+			}
+		};
+
+		let mut batch = self.db.transaction();
+		self.chain.insert_pending_transition(&mut batch, header.hash(), epoch::PendingTransition {
+			proof: proof,
+		});
+		self.db.write_buffered(batch);
+		Ok(())
+	}
 }
 
-impl LightChainClient for Client {
+impl<T: ChainDataFetcher> LightChainClient for Client<T> {
+	fn add_listener(&self, listener: Weak<LightChainNotify>) {
+		Client::add_listener(self, listener)
+	}
+
 	fn chain_info(&self) -> BlockChainInfo { Client::chain_info(self) }
 
 	fn queue_header(&self, header: Header) -> Result<H256, BlockImportError> {
@@ -456,7 +554,7 @@ impl LightChainClient for Client {
 		Client::env_info(self, id)
 	}
 
-	fn engine(&self) -> &Arc<Engine> {
+	fn engine(&self) -> &Arc<EthEngine> {
 		Client::engine(self)
 	}
 
@@ -480,7 +578,7 @@ impl LightChainClient for Client {
 		Client::cht_root(self, i)
 	}
 
-	fn eip86_transition(&self) -> u64 {
+	fn eip86_transition(&self) -> BlockNumber {
 		self.engine().params().eip86_transition
 	}
 
@@ -488,3 +586,35 @@ impl LightChainClient for Client {
 		Client::report(self)
 	}
 }
+
+impl<T: ChainDataFetcher> ::ethcore::client::ChainInfo for Client<T> {
+	fn chain_info(&self) -> BlockChainInfo {
+		Client::chain_info(self)
+	}
+}
+
+impl<T: ChainDataFetcher> ::ethcore::client::EngineClient for Client<T> {
+	fn update_sealing(&self) { }
+	fn submit_seal(&self, _block_hash: H256, _seal: Vec<Vec<u8>>) { }
+	fn broadcast_consensus_message(&self, _message: Vec<u8>) { }
+
+	fn epoch_transition_for(&self, parent_hash: H256) -> Option<EpochTransition> {
+		self.chain.epoch_transition_for(parent_hash).map(|(hdr, proof)| EpochTransition {
+			block_hash: hdr.hash(),
+			block_number: hdr.number(),
+			proof: proof,
+		})
+	}
+
+	fn as_full_client(&self) -> Option<&::ethcore::client::BlockChainClient> {
+		None
+	}
+
+	fn block_number(&self, id: BlockId) -> Option<BlockNumber> {
+		self.block_header(id).map(|hdr| hdr.number())
+	}
+
+	fn block_header(&self, id: BlockId) -> Option<encoded::Header> {
+		Client::block_header(self, id)
+	}
+}
diff --git a/ethcore/light/src/client/service.rs b/ethcore/light/src/client/service.rs
index 83949a2f18efd1f2a77a467ad7edc585c5ef5b20..3d13be16b4a8f0ab72b8b5412e0d3a75e97ec9b4 100644
--- a/ethcore/light/src/client/service.rs
+++ b/ethcore/light/src/client/service.rs
@@ -18,73 +18,68 @@
 //! Just handles block import messages and passes them to the client.
 
 use std::fmt;
-use std::path::Path;
 use std::sync::Arc;
 
+use ethcore::client::ClientIoMessage;
 use ethcore::db;
-use ethcore::service::ClientIoMessage;
+use ethcore::error::Error as CoreError;
 use ethcore::spec::Spec;
 use io::{IoContext, IoError, IoHandler, IoService};
-use util::kvdb::{Database, DatabaseConfig};
+use kvdb::KeyValueDB;
 
 use cache::Cache;
-use util::Mutex;
+use parking_lot::Mutex;
 
-use super::{Client, Config as ClientConfig};
+use super::{ChainDataFetcher, Client, Config as ClientConfig};
 
 /// Errors on service initialization.
 #[derive(Debug)]
 pub enum Error {
-	/// Database error.
-	Database(String),
+	/// Core error.
+	Core(CoreError),
 	/// I/O service error.
 	Io(IoError),
 }
 
+impl From<CoreError> for Error {
+	#[inline]
+	fn from(err: CoreError) -> Error {
+		Error::Core(err)
+	}
+}
+
 impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match *self {
-			Error::Database(ref msg) => write!(f, "Database error: {}", msg),
+			Error::Core(ref msg) => write!(f, "Core error: {}", msg),
 			Error::Io(ref err) => write!(f, "I/O service error: {}", err),
 		}
 	}
 }
 
 /// Light client service.
-pub struct Service {
-	client: Arc<Client>,
+pub struct Service<T> {
+	client: Arc<Client<T>>,
 	io_service: IoService<ClientIoMessage>,
 }
 
-impl Service {
+impl<T: ChainDataFetcher> Service<T> {
 	/// Start the service: initialize I/O workers and client itself.
-	pub fn start(config: ClientConfig, spec: &Spec, path: &Path, cache: Arc<Mutex<Cache>>) -> Result<Self, Error> {
-
-		// initialize database.
-		let mut db_config = DatabaseConfig::with_columns(db::NUM_COLUMNS);
-
-		// give all rocksdb cache to the header chain column.
-		if let Some(size) = config.db_cache_size {
-			db_config.set_cache(db::COL_LIGHT_CHAIN, size);
-		}
-
-		db_config.compaction = config.db_compaction;
-		db_config.wal = config.db_wal;
-
-		let db = Arc::new(Database::open(
-			&db_config,
-			&path.to_str().expect("DB path could not be converted to string.")
-		).map_err(Error::Database)?);
+	pub fn start(config: ClientConfig, spec: &Spec, fetcher: T, db: Arc<KeyValueDB>, cache: Arc<Mutex<Cache>>) -> Result<Self, Error> {
 
 		let io_service = IoService::<ClientIoMessage>::start().map_err(Error::Io)?;
 		let client = Arc::new(Client::new(config,
 			db,
 			db::COL_LIGHT_CHAIN,
 			spec,
+			fetcher,
 			io_service.channel(),
 			cache,
-		).map_err(Error::Database)?);
+		)?);
+
 		io_service.register_handler(Arc::new(ImportBlocks(client.clone()))).map_err(Error::Io)?;
+		spec.engine.register_client(Arc::downgrade(&client) as _);
+
 		Ok(Service {
 			client: client,
 			io_service: io_service,
@@ -97,14 +92,14 @@ impl Service {
 	}
 
 	/// Get a handle to the client.
-	pub fn client(&self) -> &Arc<Client> {
+	pub fn client(&self) -> &Arc<Client<T>> {
 		&self.client
 	}
 }
 
-struct ImportBlocks(Arc<Client>);
+struct ImportBlocks<T>(Arc<Client<T>>);
 
-impl IoHandler<ClientIoMessage> for ImportBlocks {
+impl<T: ChainDataFetcher> IoHandler<ClientIoMessage> for ImportBlocks<T> {
 	fn message(&self, _io: &IoContext<ClientIoMessage>, message: &ClientIoMessage) {
 		if let ClientIoMessage::BlockVerified = *message {
 			self.0.import_verified();
@@ -115,20 +110,22 @@ impl IoHandler<ClientIoMessage> for ImportBlocks {
 #[cfg(test)]
 mod tests {
 	use super::Service;
-	use devtools::RandomTempPath;
 	use ethcore::spec::Spec;
-	
+
 	use std::sync::Arc;
 	use cache::Cache;
-	use time::Duration;
-	use util::Mutex;
+	use client::fetch;
+	use std::time::Duration;
+	use parking_lot::Mutex;
+	use kvdb_memorydb;
+	use ethcore::db::NUM_COLUMNS;
 
 	#[test]
 	fn it_works() {
+		let db = Arc::new(kvdb_memorydb::create(NUM_COLUMNS.unwrap_or(0)));
 		let spec = Spec::new_test();
-		let temp_path = RandomTempPath::new();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
-		Service::start(Default::default(), &spec, temp_path.as_path(), cache).unwrap();
+		Service::start(Default::default(), &spec, fetch::unavailable(), db, cache).unwrap();
 	}
 }
diff --git a/ethcore/light/src/lib.rs b/ethcore/light/src/lib.rs
index c2ab483d2242d9c33492550fc3860372bc6fa751..1ffe0079c18ae398661ec969abd51d04c5be1c69 100644
--- a/ethcore/light/src/lib.rs
+++ b/ethcore/light/src/lib.rs
@@ -38,21 +38,8 @@ pub mod net;
 pub mod on_demand;
 pub mod transaction_queue;
 pub mod cache;
-
-#[cfg(not(feature = "ipc"))]
 pub mod provider;
 
-#[cfg(feature = "ipc")]
-pub mod provider {
-	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
-	include!(concat!(env!("OUT_DIR"), "/provider.rs"));
-}
-
-#[cfg(feature = "ipc")]
-pub mod remote {
-	pub use provider::LightProviderClient;
-}
-
 mod types;
 
 pub use self::cache::Cache;
@@ -69,23 +56,32 @@ extern crate log;
 extern crate bincode;
 extern crate ethcore_io as io;
 extern crate ethcore_network as network;
-extern crate ethcore_util as util;
+extern crate ethcore_bytes as bytes;
+extern crate ethcore_transaction as transaction;
+extern crate ethereum_types;
 extern crate ethcore;
-extern crate evm;
+extern crate hashdb;
+extern crate heapsize;
 extern crate futures;
 extern crate itertools;
+extern crate memorydb;
+extern crate patricia_trie as trie;
+extern crate plain_hasher;
 extern crate rand;
 extern crate rlp;
+extern crate parking_lot;
 #[macro_use]
 extern crate rlp_derive;
 extern crate serde;
 extern crate smallvec;
 extern crate stats;
-extern crate time;
 extern crate vm;
+extern crate keccak_hash as hash;
+extern crate triehash;
+extern crate kvdb;
+extern crate memory_cache;
 
-#[cfg(feature = "ipc")]
-extern crate ethcore_ipc as ipc;
-
 #[cfg(test)]
-extern crate ethcore_devtools as devtools;
+extern crate kvdb_memorydb;
+#[cfg(test)]
+extern crate tempdir;
diff --git a/ethcore/light/src/net/context.rs b/ethcore/light/src/net/context.rs
index 33009d7f60718ec8d8a407c57a584bd69f87fca7..613e26b1f1190e7829bd570615c6cb369f0f3996 100644
--- a/ethcore/light/src/net/context.rs
+++ b/ethcore/light/src/net/context.rs
@@ -47,7 +47,7 @@ pub trait IoContext {
 }
 
 
-impl<'a> IoContext for NetworkContext<'a> {
+impl<T> IoContext for T where T: ?Sized + NetworkContext {
 	fn send(&self, peer: PeerId, packet_id: u8, packet_body: Vec<u8>) {
 		if let Err(e) = self.send(peer, packet_id, packet_body) {
 			debug!(target: "pip", "Error sending packet to peer {}: {}", peer, e);
diff --git a/ethcore/light/src/net/error.rs b/ethcore/light/src/net/error.rs
index 57897834871713243e0625381faa3225565038ab..35349c553925c7e0b396762333314576111d0d12 100644
--- a/ethcore/light/src/net/error.rs
+++ b/ethcore/light/src/net/error.rs
@@ -17,10 +17,8 @@
 //! Defines error types and levels of punishment to use upon
 //! encountering.
 
-use rlp::DecoderError;
-use network::NetworkError;
-
 use std::fmt;
+use {rlp, network};
 
 /// Levels of punishment.
 ///
@@ -41,9 +39,9 @@ pub enum Punishment {
 #[derive(Debug)]
 pub enum Error {
 	/// An RLP decoding error.
-	Rlp(DecoderError),
+	Rlp(rlp::DecoderError),
 	/// A network error.
-	Network(NetworkError),
+	Network(network::Error),
 	/// Out of credits.
 	NoCredits,
 	/// Unrecognized packet code.
@@ -92,14 +90,14 @@ impl Error {
 	}
 }
 
-impl From<DecoderError> for Error {
-	fn from(err: DecoderError) -> Self {
+impl From<rlp::DecoderError> for Error {
+	fn from(err: rlp::DecoderError) -> Self {
 		Error::Rlp(err)
 	}
 }
 
-impl From<NetworkError> for Error {
-	fn from(err: NetworkError) -> Self {
+impl From<network::Error> for Error {
+	fn from(err: network::Error) -> Self {
 		Error::Network(err)
 	}
 }
diff --git a/ethcore/light/src/net/load_timer.rs b/ethcore/light/src/net/load_timer.rs
index a169b86d96f13c6e9f36b7204544ce6de801dd6d..c6e524a4412eca8142ff19aed7b6bb920d216825 100644
--- a/ethcore/light/src/net/load_timer.rs
+++ b/ethcore/light/src/net/load_timer.rs
@@ -27,12 +27,12 @@
 use std::collections::{HashMap, VecDeque};
 use std::fs::File;
 use std::path::PathBuf;
+use std::time::{Duration, Instant};
 
 use request::{CompleteRequest, Kind};
 
 use bincode;
-use time;
-use util::{RwLock, Mutex};
+use parking_lot::{RwLock, Mutex};
 
 /// Number of time periods samples should be kept for.
 pub const MOVING_SAMPLE_SIZE: usize = 256;
@@ -62,6 +62,7 @@ fn hardcoded_serve_time(kind: Kind) -> u64 {
 		Kind::Storage => 2_000_000,
 		Kind::Code => 1_500_000,
 		Kind::Execution => 250, // per gas.
+		Kind::Signal => 500_000,
 	}
 }
 
@@ -106,7 +107,7 @@ impl LoadDistribution {
 		};
 
 		LoadTimer {
-			start: time::precise_time_ns(),
+			start: Instant::now(),
 			n: n,
 			dist: self,
 			kind: kind,
@@ -150,10 +151,10 @@ impl LoadDistribution {
 		store.store(&*samples);
 	}
 
-	fn update(&self, kind: Kind, elapsed: u64, n: u64) {
+	fn update(&self, kind: Kind, elapsed: Duration, n: u64) {
 		macro_rules! update_counters {
 			($counters: expr) => {
-				$counters.0 = $counters.0.saturating_add(elapsed);
+				$counters.0 = $counters.0.saturating_add({ elapsed.as_secs() * 1_000_000_000 + elapsed.subsec_nanos() as u64 });
 				$counters.1 = $counters.1.saturating_add(n);
 			}
 		};
@@ -179,7 +180,7 @@ impl LoadDistribution {
 /// A timer for a single request.
 /// On drop, this will update the distribution.
 pub struct LoadTimer<'a> {
-	start: u64,
+	start: Instant,
 	n: u64,
 	dist: &'a LoadDistribution,
 	kind: Kind,
@@ -187,7 +188,7 @@ pub struct LoadTimer<'a> {
 
 impl<'a> Drop for LoadTimer<'a> {
 	fn drop(&mut self) {
-		let elapsed = time::precise_time_ns() - self.start;
+		let elapsed = self.start.elapsed();
 		self.dist.update(self.kind, elapsed, self.n);
 	}
 }
@@ -224,7 +225,7 @@ mod tests {
 		let dist = LoadDistribution::load(&NullStore);
 		assert_eq!(dist.expected_time_ns(Kind::Headers), hardcoded_serve_time(Kind::Headers));
 
-		dist.update(Kind::Headers, 100_000, 100);
+		dist.update(Kind::Headers, Duration::new(0, 100_000), 100);
 		dist.end_period(&NullStore);
 
 		assert_eq!(dist.expected_time_ns(Kind::Headers), 1000);
@@ -237,7 +238,7 @@ mod tests {
 		let mut sum = 0;
 
 		for (i, x) in (0..10).map(|x| x * 10_000).enumerate() {
-			dist.update(Kind::Headers, x, 1);
+			dist.update(Kind::Headers, Duration::new(0, x), 1);
 			dist.end_period(&NullStore);
 
 			sum += x;
@@ -247,7 +248,7 @@ mod tests {
 
 			// should be weighted below the maximum entry.
 			let arith_average = (sum as f64 / (i + 1) as f64) as u64;
-			assert!(moving_average < x);
+			assert!(moving_average < x as u64);
 
 			// when there are only 2 entries, they should be equal due to choice of
 			// ALPHA = 1/N.
@@ -263,8 +264,9 @@ mod tests {
 
 	#[test]
 	fn file_store() {
-		let path = ::devtools::RandomTempPath::new();
-		let store = FileStore(path.as_path().clone());
+		let tempdir = ::tempdir::TempDir::new("").unwrap();
+		let path = tempdir.path().join("file");
+		let store = FileStore(path);
 
 		let mut samples = store.load();
 		assert!(samples.is_empty());
diff --git a/ethcore/light/src/net/mod.rs b/ethcore/light/src/net/mod.rs
index 046dc68bd0943f08863f9091f2a9bda13c7666b6..60fe172e23c4e30827bb14a0df9609dab6bd6536 100644
--- a/ethcore/light/src/net/mod.rs
+++ b/ethcore/light/src/net/mod.rs
@@ -18,14 +18,15 @@
 //!
 //! This uses a "Provider" to answer requests.
 
-use ethcore::transaction::UnverifiedTransaction;
+use transaction::UnverifiedTransaction;
 
 use io::TimerToken;
 use network::{HostInfo, NetworkProtocolHandler, NetworkContext, PeerId};
 use rlp::{RlpStream, UntrustedRlp};
-use util::hash::H256;
-use util::{DBValue, Mutex, RwLock, U256};
-use time::{Duration, SteadyTime};
+use ethereum_types::{H256, U256};
+use kvdb::DBValue;
+use parking_lot::{Mutex, RwLock};
+use std::time::{Duration, Instant};
 
 use std::collections::{HashMap, HashSet};
 use std::fmt;
@@ -72,7 +73,7 @@ const RECALCULATE_COSTS_TIMEOUT: TimerToken = 3;
 const RECALCULATE_COSTS_INTERVAL_MS: u64 = 60 * 60 * 1000;
 
 // minimum interval between updates.
-const UPDATE_INTERVAL_MS: i64 = 5000;
+const UPDATE_INTERVAL_MS: u64 = 5000;
 
 /// Supported protocol versions.
 pub const PROTOCOL_VERSIONS: &'static [u8] = &[1];
@@ -102,26 +103,26 @@ mod packet {
 	// relay transactions to peers.
 	pub const SEND_TRANSACTIONS: u8 = 0x06;
 
-	// request and respond with epoch transition proof
-	pub const REQUEST_EPOCH_PROOF: u8 = 0x07;
-	pub const EPOCH_PROOF: u8 = 0x08;
+	// two packets were previously meant to be reserved for epoch proofs.
+	// these have since been moved to requests.
 }
 
 // timeouts for different kinds of requests. all values are in milliseconds.
 mod timeout {
-	pub const HANDSHAKE: i64 = 2500;
-	pub const ACKNOWLEDGE_UPDATE: i64 = 5000;
-	pub const BASE: i64 = 1500; // base timeout for packet.
+	pub const HANDSHAKE: u64 = 2500;
+	pub const ACKNOWLEDGE_UPDATE: u64 = 5000;
+	pub const BASE: u64 = 1500; // base timeout for packet.
 
 	// timeouts per request within packet.
-	pub const HEADERS: i64 = 250; // per header?
-	pub const TRANSACTION_INDEX: i64 = 100;
-	pub const BODY: i64 = 50;
-	pub const RECEIPT: i64 = 50;
-	pub const PROOF: i64 = 100; // state proof
-	pub const CONTRACT_CODE: i64 = 100;
-	pub const HEADER_PROOF: i64 = 100;
-	pub const TRANSACTION_PROOF: i64 = 1000; // per gas?
+	pub const HEADERS: u64 = 250; // per header?
+	pub const TRANSACTION_INDEX: u64 = 100;
+	pub const BODY: u64 = 50;
+	pub const RECEIPT: u64 = 50;
+	pub const PROOF: u64 = 100; // state proof
+	pub const CONTRACT_CODE: u64 = 100;
+	pub const HEADER_PROOF: u64 = 100;
+	pub const TRANSACTION_PROOF: u64 = 1000; // per gas?
+	pub const EPOCH_SIGNAL: u64 = 200;
 }
 
 /// A request id.
@@ -143,7 +144,7 @@ impl fmt::Display for ReqId {
 // may not have received one for.
 struct PendingPeer {
 	sent_head: H256,
-	last_update: SteadyTime,
+	last_update: Instant,
 }
 
 /// Relevant data to each peer. Not accessible publicly, only `pub` due to
@@ -154,13 +155,13 @@ pub struct Peer {
 	capabilities: Capabilities,
 	remote_flow: Option<(Credits, FlowParams)>,
 	sent_head: H256, // last chain head we've given them.
-	last_update: SteadyTime,
+	last_update: Instant,
 	pending_requests: RequestSet,
 	failed_requests: Vec<ReqId>,
 	propagated_transactions: HashSet<H256>,
 	skip_update: bool,
 	local_flow: Arc<FlowParams>,
-	awaiting_acknowledge: Option<(SteadyTime, Arc<FlowParams>)>,
+	awaiting_acknowledge: Option<(Instant, Arc<FlowParams>)>,
 }
 
 /// Whether or not a peer was kept by a handler
@@ -287,7 +288,7 @@ pub type PeerMap = HashMap<PeerId, Mutex<Peer>>;
 mod id_guard {
 
 	use network::PeerId;
-	use util::RwLockReadGuard;
+	use parking_lot::RwLockReadGuard;
 
 	use super::{PeerMap, ReqId};
 
@@ -428,7 +429,11 @@ impl LightProtocol {
 
 				// compute and deduct cost.
 				let pre_creds = creds.current();
-				let cost = params.compute_cost_multi(requests.requests());
+				let cost = match params.compute_cost_multi(requests.requests()) {
+					Some(cost) => cost,
+					None => return Err(Error::NotServer),
+				};
+
 				creds.deduct_cost(cost)?;
 
 				trace!(target: "pip", "requesting from peer {}. Cost: {}; Available: {}",
@@ -442,7 +447,7 @@ impl LightProtocol {
 				});
 
 				// begin timeout.
-				peer.pending_requests.insert(req_id, requests, cost, SteadyTime::now());
+				peer.pending_requests.insert(req_id, requests, cost, Instant::now());
 				Ok(req_id)
 			}
 		}
@@ -452,7 +457,7 @@ impl LightProtocol {
 	/// The announcement is expected to be valid.
 	pub fn make_announcement(&self, io: &IoContext, mut announcement: Announcement) {
 		let mut reorgs_map = HashMap::new();
-		let now = SteadyTime::now();
+		let now = Instant::now();
 
 		// update stored capabilities
 		self.capabilities.write().update_from(&announcement);
@@ -465,7 +470,7 @@ impl LightProtocol {
 			// the timer approach will skip 1 (possibly 2) in rare occasions.
 			if peer_info.sent_head == announcement.head_hash ||
 				peer_info.status.head_num >= announcement.head_num  ||
-				now - peer_info.last_update < Duration::milliseconds(UPDATE_INTERVAL_MS) {
+				now - peer_info.last_update < Duration::from_millis(UPDATE_INTERVAL_MS) {
 				continue
 			}
 
@@ -532,7 +537,7 @@ impl LightProtocol {
 			Some(peer_info) => {
 				let mut peer_info = peer_info.lock();
 				let peer_info: &mut Peer = &mut *peer_info;
-				let req_info = peer_info.pending_requests.remove(&req_id, SteadyTime::now());
+				let req_info = peer_info.pending_requests.remove(&req_id, Instant::now());
 				let last_batched = peer_info.pending_requests.is_empty();
 				let flow_info = peer_info.remote_flow.as_mut();
 
@@ -582,12 +587,6 @@ impl LightProtocol {
 
 			packet::SEND_TRANSACTIONS => self.relay_transactions(peer, io, rlp),
 
-			packet::REQUEST_EPOCH_PROOF | packet::EPOCH_PROOF => {
-				// ignore these for now, but leave them specified.
-				debug!(target: "pip", "Ignoring request/response for epoch proof");
-				Ok(())
-			}
-
 			other => {
 				Err(Error::UnrecognizedPacket(other))
 			}
@@ -600,14 +599,14 @@ impl LightProtocol {
 
 	// check timeouts and punish peers.
 	fn timeout_check(&self, io: &IoContext) {
-		let now = SteadyTime::now();
+		let now = Instant::now();
 
 		// handshake timeout
 		{
 			let mut pending = self.pending_peers.write();
 			let slowpokes: Vec<_> = pending.iter()
 				.filter(|&(_, ref peer)| {
-					peer.last_update + Duration::milliseconds(timeout::HANDSHAKE) <= now
+					peer.last_update + Duration::from_millis(timeout::HANDSHAKE) <= now
 				})
 				.map(|(&p, _)| p)
 				.collect();
@@ -620,7 +619,7 @@ impl LightProtocol {
 		}
 
 		// request and update ack timeouts
-		let ack_duration = Duration::milliseconds(timeout::ACKNOWLEDGE_UPDATE);
+		let ack_duration = Duration::from_millis(timeout::ACKNOWLEDGE_UPDATE);
 		{
 			for (peer_id, peer) in self.peers.read().iter() {
 				let peer = peer.lock();
@@ -710,7 +709,7 @@ impl LightProtocol {
 
 		self.pending_peers.write().insert(*peer, PendingPeer {
 			sent_head: chain_info.best_block_hash,
-			last_update: SteadyTime::now(),
+			last_update: Instant::now(),
 		});
 
 		trace!(target: "pip", "Sending status to peer {}", peer);
@@ -772,7 +771,7 @@ impl LightProtocol {
 		*self.flow_params.write() = new_params.clone();
 
 		let peers = self.peers.read();
-		let now = SteadyTime::now();
+		let now = Instant::now();
 
 		let packet_body = {
 			let mut stream = RlpStream::new_list(3);
@@ -903,7 +902,7 @@ impl LightProtocol {
 		// the maximum amount of requests we'll fill in a single packet.
 		const MAX_REQUESTS: usize = 256;
 
-		use ::request::RequestBuilder;
+		use ::request::Builder;
 		use ::request::CompleteRequest;
 
 		let peers = self.peers.read();
@@ -918,7 +917,7 @@ impl LightProtocol {
 		let peer: &mut Peer = &mut *peer;
 
 		let req_id: u64 = raw.val_at(0)?;
-		let mut request_builder = RequestBuilder::default();
+		let mut request_builder = Builder::default();
 
 		trace!(target: "pip", "Received requests (id: {}) from peer {}", req_id, peer_id);
 
@@ -928,7 +927,7 @@ impl LightProtocol {
 		peer.local_credits.deduct_cost(peer.local_flow.base_cost())?;
 		for request_rlp in raw.at(1)?.iter().take(MAX_REQUESTS) {
 			let request: Request = request_rlp.as_val()?;
-			let cost = peer.local_flow.compute_cost(&request);
+			let cost = peer.local_flow.compute_cost(&request).ok_or(Error::NotServer)?;
 			peer.local_credits.deduct_cost(cost)?;
 			request_builder.push(request).map_err(|_| Error::BadBackReference)?;
 		}
@@ -943,13 +942,14 @@ impl LightProtocol {
 			match complete_req {
 				CompleteRequest::Headers(req) => self.provider.block_headers(req).map(Response::Headers),
 				CompleteRequest::HeaderProof(req) => self.provider.header_proof(req).map(Response::HeaderProof),
-				CompleteRequest::TransactionIndex(_) => None, // don't answer these yet, but leave them in protocol.
+				CompleteRequest::TransactionIndex(req) => self.provider.transaction_index(req).map(Response::TransactionIndex),
 				CompleteRequest::Body(req) => self.provider.block_body(req).map(Response::Body),
 				CompleteRequest::Receipts(req) => self.provider.block_receipts(req).map(Response::Receipts),
 				CompleteRequest::Account(req) => self.provider.account_proof(req).map(Response::Account),
 				CompleteRequest::Storage(req) => self.provider.storage_proof(req).map(Response::Storage),
 				CompleteRequest::Code(req) => self.provider.contract_code(req).map(Response::Code),
 				CompleteRequest::Execution(req) => self.provider.transaction_proof(req).map(Response::Execution),
+				CompleteRequest::Signal(req) => self.provider.epoch_signal(req).map(Response::Signal),
 			}
 		});
 
@@ -1089,23 +1089,23 @@ impl NetworkProtocolHandler for LightProtocol {
 	}
 
 	fn read(&self, io: &NetworkContext, peer: &PeerId, packet_id: u8, data: &[u8]) {
-		self.handle_packet(io, peer, packet_id, data);
+		self.handle_packet(&io, peer, packet_id, data);
 	}
 
 	fn connected(&self, io: &NetworkContext, peer: &PeerId) {
-		self.on_connect(peer, io);
+		self.on_connect(peer, &io);
 	}
 
 	fn disconnected(&self, io: &NetworkContext, peer: &PeerId) {
-		self.on_disconnect(*peer, io);
+		self.on_disconnect(*peer, &io);
 	}
 
 	fn timeout(&self, io: &NetworkContext, timer: TimerToken) {
 		match timer {
-			TIMEOUT => self.timeout_check(io),
-			TICK_TIMEOUT => self.tick_handlers(io),
-			PROPAGATE_TIMEOUT => self.propagate_transactions(io),
-			RECALCULATE_COSTS_TIMEOUT => self.begin_new_cost_period(io),
+			TIMEOUT => self.timeout_check(&io),
+			TICK_TIMEOUT => self.tick_handlers(&io),
+			PROPAGATE_TIMEOUT => self.propagate_transactions(&io),
+			RECALCULATE_COSTS_TIMEOUT => self.begin_new_cost_period(&io),
 			_ => warn!(target: "pip", "received timeout on unknown token {}", timer),
 		}
 	}
diff --git a/ethcore/light/src/net/request_credits.rs b/ethcore/light/src/net/request_credits.rs
index 950fa24d804060a89d50eab644dec67f337d0d4c..f97ce85bcdfd911ddc0413bf2f5c9c1a90fcb8c3 100644
--- a/ethcore/light/src/net/request_credits.rs
+++ b/ethcore/light/src/net/request_credits.rs
@@ -30,8 +30,8 @@ use request::{self, Request};
 use super::error::Error;
 
 use rlp::*;
-use util::U256;
-use time::{Duration, SteadyTime};
+use ethereum_types::U256;
+use std::time::{Duration, Instant};
 
 /// Credits value.
 ///
@@ -41,7 +41,7 @@ use time::{Duration, SteadyTime};
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Credits {
 	estimate: U256,
-	recharge_point: SteadyTime,
+	recharge_point: Instant,
 }
 
 impl Credits {
@@ -53,7 +53,7 @@ impl Credits {
 	/// a response to a request.
 	pub fn update_to(&mut self, value: U256) {
 		self.estimate = value;
-		self.recharge_point = SteadyTime::now();
+		self.recharge_point = Instant::now();
 	}
 
 	/// Maintain ratio to current limit against an old limit.
@@ -79,18 +79,42 @@ impl Credits {
 }
 
 /// A cost table, mapping requests to base and per-request costs.
+/// Costs themselves may be missing.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct CostTable {
 	base: U256, // cost per packet.
-	headers: U256, // cost per header
-	transaction_index: U256,
-	body: U256,
-	receipts: U256,
-	account: U256,
-	storage: U256,
-	code: U256,
-	header_proof: U256,
-	transaction_proof: U256, // cost per gas.
+	headers: Option<U256>, // cost per header
+	transaction_index: Option<U256>,
+	body: Option<U256>,
+	receipts: Option<U256>,
+	account: Option<U256>,
+	storage: Option<U256>,
+	code: Option<U256>,
+	header_proof: Option<U256>,
+	transaction_proof: Option<U256>, // cost per gas.
+	epoch_signal: Option<U256>,
+}
+
+impl CostTable {
+	fn costs_set(&self) -> usize {
+		let mut num_set = 0;
+
+		{
+			let mut incr_if_set = |cost: &Option<_>| if cost.is_some() { num_set += 1 };
+			incr_if_set(&self.headers);
+			incr_if_set(&self.transaction_index);
+			incr_if_set(&self.body);
+			incr_if_set(&self.receipts);
+			incr_if_set(&self.account);
+			incr_if_set(&self.storage);
+			incr_if_set(&self.code);
+			incr_if_set(&self.header_proof);
+			incr_if_set(&self.transaction_proof);
+			incr_if_set(&self.epoch_signal);
+		}
+
+		num_set
+	}
 }
 
 impl Default for CostTable {
@@ -98,30 +122,32 @@ impl Default for CostTable {
 		// arbitrarily chosen constants.
 		CostTable {
 			base: 100000.into(),
-			headers: 10000.into(),
-			transaction_index: 10000.into(),
-			body: 15000.into(),
-			receipts: 5000.into(),
-			account: 25000.into(),
-			storage: 25000.into(),
-			code: 20000.into(),
-			header_proof: 15000.into(),
-			transaction_proof: 2.into(),
+			headers: Some(10000.into()),
+			transaction_index: Some(10000.into()),
+			body: Some(15000.into()),
+			receipts: Some(5000.into()),
+			account: Some(25000.into()),
+			storage: Some(25000.into()),
+			code: Some(20000.into()),
+			header_proof: Some(15000.into()),
+			transaction_proof: Some(2.into()),
+			epoch_signal: Some(10000.into()),
 		}
 	}
 }
 
 impl Encodable for CostTable {
 	fn rlp_append(&self, s: &mut RlpStream) {
-		fn append_cost(s: &mut RlpStream, cost: &U256, kind: request::Kind) {
-			s.begin_list(2);
-
-			// hack around https://github.com/paritytech/parity/issues/4356
-			Encodable::rlp_append(&kind, s);
-			s.append(cost);
+		fn append_cost(s: &mut RlpStream, cost: &Option<U256>, kind: request::Kind) {
+			if let Some(ref cost) = *cost {
+				s.begin_list(2);
+				// hack around https://github.com/paritytech/parity/issues/4356
+				Encodable::rlp_append(&kind, s);
+				s.append(cost);
+			}
 		}
 
-		s.begin_list(10).append(&self.base);
+		s.begin_list(1 + self.costs_set()).append(&self.base);
 		append_cost(s, &self.headers, request::Kind::Headers);
 		append_cost(s, &self.transaction_index, request::Kind::TransactionIndex);
 		append_cost(s, &self.body, request::Kind::Body);
@@ -131,6 +157,7 @@ impl Encodable for CostTable {
 		append_cost(s, &self.code, request::Kind::Code);
 		append_cost(s, &self.header_proof, request::Kind::HeaderProof);
 		append_cost(s, &self.transaction_proof, request::Kind::Execution);
+		append_cost(s, &self.epoch_signal, request::Kind::Signal);
 	}
 }
 
@@ -147,6 +174,7 @@ impl Decodable for CostTable {
 		let mut code = None;
 		let mut header_proof = None;
 		let mut transaction_proof = None;
+		let mut epoch_signal = None;
 
 		for cost_list in rlp.iter().skip(1) {
 			let cost = cost_list.val_at(1)?;
@@ -160,23 +188,29 @@ impl Decodable for CostTable {
 				request::Kind::Code => code = Some(cost),
 				request::Kind::HeaderProof => header_proof = Some(cost),
 				request::Kind::Execution => transaction_proof = Some(cost),
+				request::Kind::Signal => epoch_signal = Some(cost),
 			}
 		}
 
-		let unwrap_cost = |cost: Option<U256>| cost.ok_or(DecoderError::Custom("Not all costs specified in cost table."));
-
-		Ok(CostTable {
+		let table = CostTable {
 			base: base,
-			headers: unwrap_cost(headers)?,
-			transaction_index: unwrap_cost(transaction_index)?,
-			body: unwrap_cost(body)?,
-			receipts: unwrap_cost(receipts)?,
-			account: unwrap_cost(account)?,
-			storage: unwrap_cost(storage)?,
-			code: unwrap_cost(code)?,
-			header_proof: unwrap_cost(header_proof)?,
-			transaction_proof: unwrap_cost(transaction_proof)?,
-		})
+			headers: headers,
+			transaction_index: transaction_index,
+			body: body,
+			receipts: receipts,
+			account: account,
+			storage: storage,
+			code: code,
+			header_proof: header_proof,
+			transaction_proof: transaction_proof,
+			epoch_signal: epoch_signal,
+		};
+
+		if table.costs_set() == 0 {
+			Err(DecoderError::Custom("no cost types set."))
+		} else {
+			Ok(table)
+		}
 	}
 }
 
@@ -224,7 +258,7 @@ impl FlowParams {
 			let serve_per_second = serve_per_second.max(1.0 / 10_000.0);
 
 			// as a percentage of the recharge per second.
-			U256::from((recharge as f64 / serve_per_second) as u64)
+			Some(U256::from((recharge as f64 / serve_per_second) as u64))
 		};
 
 		let costs = CostTable {
@@ -238,6 +272,7 @@ impl FlowParams {
 			code: cost_for_kind(Kind::Code),
 			header_proof: cost_for_kind(Kind::HeaderProof),
 			transaction_proof: cost_for_kind(Kind::Execution),
+			epoch_signal: cost_for_kind(Kind::Signal),
 		};
 
 		FlowParams {
@@ -249,12 +284,12 @@ impl FlowParams {
 
 	/// Create effectively infinite flow params.
 	pub fn free() -> Self {
-		let free_cost: U256 = 0.into();
+		let free_cost: Option<U256> = Some(0.into());
 		FlowParams {
 			limit: (!0u64).into(),
 			recharge: 1.into(),
 			costs: CostTable {
-				base: free_cost.clone(),
+				base: 0.into(),
 				headers: free_cost.clone(),
 				transaction_index: free_cost.clone(),
 				body: free_cost.clone(),
@@ -263,7 +298,8 @@ impl FlowParams {
 				storage: free_cost.clone(),
 				code: free_cost.clone(),
 				header_proof: free_cost.clone(),
-				transaction_proof: free_cost,
+				transaction_proof: free_cost.clone(),
+				epoch_signal: free_cost,
 			}
 		}
 	}
@@ -282,9 +318,9 @@ impl FlowParams {
 
 	/// Compute the actual cost of a request, given the kind of request
 	/// and number of requests made.
-	pub fn compute_cost(&self, request: &Request) -> U256 {
+	pub fn compute_cost(&self, request: &Request) -> Option<U256> {
 		match *request {
-			Request::Headers(ref req) => self.costs.headers * req.max.into(),
+			Request::Headers(ref req) => self.costs.headers.map(|c| c * U256::from(req.max)),
 			Request::HeaderProof(_) => self.costs.header_proof,
 			Request::TransactionIndex(_) => self.costs.transaction_index,
 			Request::Body(_) => self.costs.body,
@@ -292,33 +328,42 @@ impl FlowParams {
 			Request::Account(_) => self.costs.account,
 			Request::Storage(_) => self.costs.storage,
 			Request::Code(_) => self.costs.code,
-			Request::Execution(ref req) => self.costs.transaction_proof * req.gas,
+			Request::Execution(ref req) => self.costs.transaction_proof.map(|c| c * req.gas),
+			Request::Signal(_) => self.costs.epoch_signal,
 		}
 	}
 
 	/// Compute the cost of a set of requests.
 	/// This is the base cost plus the cost of each individual request.
-	pub fn compute_cost_multi(&self, requests: &[Request]) -> U256 {
-		requests.iter().fold(self.costs.base, |cost, req| cost + self.compute_cost(req))
+	pub fn compute_cost_multi(&self, requests: &[Request]) -> Option<U256> {
+		let mut cost = self.costs.base;
+		for request in requests {
+			match self.compute_cost(request) {
+				Some(c) => cost = cost + c,
+				None => return None,
+			}
+		}
+
+		Some(cost)
 	}
 
 	/// Create initial credits.
 	pub fn create_credits(&self) -> Credits {
 		Credits {
 			estimate: self.limit,
-			recharge_point: SteadyTime::now(),
+			recharge_point: Instant::now(),
 		}
 	}
 
 	/// Recharge the given credits based on time passed since last
 	/// update.
 	pub fn recharge(&self, credits: &mut Credits) {
-		let now = SteadyTime::now();
+		let now = Instant::now();
 
 		// recompute and update only in terms of full seconds elapsed
 		// in order to keep the estimate as an underestimate.
-		let elapsed = (now - credits.recharge_point).num_seconds();
-		credits.recharge_point = credits.recharge_point + Duration::seconds(elapsed);
+		let elapsed = (now - credits.recharge_point).as_secs();
+		credits.recharge_point = credits.recharge_point + Duration::from_secs(elapsed);
 
 		let elapsed: U256 = elapsed.into();
 
@@ -399,6 +444,6 @@ mod tests {
 		);
 
 		assert_eq!(flow_params2.costs, flow_params3.costs);
-		assert_eq!(flow_params.costs.headers, flow_params2.costs.headers * 2.into());
+		assert_eq!(flow_params.costs.headers.unwrap(), flow_params2.costs.headers.unwrap() * 2u32);
 	}
 }
diff --git a/ethcore/light/src/net/request_set.rs b/ethcore/light/src/net/request_set.rs
index 35182f0bf81b2b997daab8ee15bf1cc972194c1f..27e6c28bc2d1171b5cd3bf3f0f0c4bb78a3c752f 100644
--- a/ethcore/light/src/net/request_set.rs
+++ b/ethcore/light/src/net/request_set.rs
@@ -23,13 +23,12 @@
 
 use std::collections::{BTreeMap, HashMap};
 use std::iter::FromIterator;
+use std::time::{Duration, Instant};
 
 use request::Request;
 use request::NetworkRequests as Requests;
 use net::{timeout, ReqId};
-use util::U256;
-
-use time::{Duration, SteadyTime};
+use ethereum_types::U256;
 
 // Request set entry: requests + cost.
 #[derive(Debug)]
@@ -40,7 +39,7 @@ struct Entry(Requests, U256);
 pub struct RequestSet {
 	counter: u64,
 	cumulative_cost: U256,
-	base: Option<SteadyTime>,
+	base: Option<Instant>,
 	ids: HashMap<ReqId, u64>,
 	reqs: BTreeMap<u64, Entry>,
 }
@@ -59,7 +58,7 @@ impl Default for RequestSet {
 
 impl RequestSet {
 	/// Push requests onto the stack.
-	pub fn insert(&mut self, req_id: ReqId, req: Requests, cost: U256, now: SteadyTime) {
+	pub fn insert(&mut self, req_id: ReqId, req: Requests, cost: U256, now: Instant) {
 		let counter = self.counter;
 		self.cumulative_cost = self.cumulative_cost + cost;
 
@@ -74,7 +73,7 @@ impl RequestSet {
 	}
 
 	/// Remove a set of requests from the stack.
-	pub fn remove(&mut self, req_id: &ReqId, now: SteadyTime) -> Option<Requests> {
+	pub fn remove(&mut self, req_id: &ReqId, now: Instant) -> Option<Requests> {
 		let id = match self.ids.remove(&req_id) {
 			Some(id) => id,
 			None => return None,
@@ -94,7 +93,7 @@ impl RequestSet {
 
 	/// Check for timeout against the given time. Returns true if
 	/// has timed out, false otherwise.
-	pub fn check_timeout(&self, now: SteadyTime) -> bool {
+	pub fn check_timeout(&self, now: Instant) -> bool {
 		let base = match self.base.as_ref().cloned() {
 			Some(base) => base,
 			None => return false,
@@ -128,7 +127,7 @@ impl RequestSet {
 // helper to calculate timeout for a specific set of requests.
 // it's a base amount + some amount per request.
 fn compute_timeout(reqs: &Requests) -> Duration {
-	Duration::milliseconds(reqs.requests().iter().fold(timeout::BASE, |tm, req| {
+	Duration::from_millis(reqs.requests().iter().fold(timeout::BASE, |tm, req| {
 		tm + match *req {
 			Request::Headers(_) => timeout::HEADERS,
 			Request::HeaderProof(_) => timeout::HEADER_PROOF,
@@ -139,6 +138,7 @@ fn compute_timeout(reqs: &Requests) -> Duration {
 			Request::Storage(_) => timeout::PROOF,
 			Request::Code(_) => timeout::CONTRACT_CODE,
 			Request::Execution(_) => timeout::TRANSACTION_PROOF,
+			Request::Signal(_) => timeout::EPOCH_SIGNAL,
 		}
 	}))
 }
@@ -146,35 +146,35 @@ fn compute_timeout(reqs: &Requests) -> Duration {
 #[cfg(test)]
 mod tests {
 	use net::ReqId;
-	use request::RequestBuilder;
-	use time::{SteadyTime, Duration};
+	use request::Builder;
+	use std::time::{Instant, Duration};
 	use super::{RequestSet, compute_timeout};
 
 	#[test]
 	fn multi_timeout() {
-		let test_begin = SteadyTime::now();
+		let test_begin = Instant::now();
 		let mut req_set = RequestSet::default();
 
-		let the_req = RequestBuilder::default().build();
+		let the_req = Builder::default().build();
 		let req_time = compute_timeout(&the_req);
 		req_set.insert(ReqId(0), the_req.clone(), 0.into(), test_begin);
-		req_set.insert(ReqId(1), the_req, 0.into(), test_begin + Duration::seconds(1));
+		req_set.insert(ReqId(1), the_req, 0.into(), test_begin + Duration::from_secs(1));
 
 		assert_eq!(req_set.base, Some(test_begin));
 
 		let test_end = test_begin + req_time;
 		assert!(req_set.check_timeout(test_end));
 
-		req_set.remove(&ReqId(0), test_begin + Duration::seconds(1)).unwrap();
+		req_set.remove(&ReqId(0), test_begin + Duration::from_secs(1)).unwrap();
 		assert!(!req_set.check_timeout(test_end));
-		assert!(req_set.check_timeout(test_end + Duration::seconds(1)));
+		assert!(req_set.check_timeout(test_end + Duration::from_secs(1)));
 	}
 
 	#[test]
 	fn cumulative_cost() {
-		let the_req = RequestBuilder::default().build();
-		let test_begin = SteadyTime::now();
-		let test_end = test_begin + Duration::seconds(1);
+		let the_req = Builder::default().build();
+		let test_begin = Instant::now();
+		let test_end = test_begin + Duration::from_secs(1);
 		let mut req_set = RequestSet::default();
 
 		for i in 0..5 {
diff --git a/ethcore/light/src/net/status.rs b/ethcore/light/src/net/status.rs
index 7328264303c603fa788f11eefa4bd3958143c05c..0f811bbe40845f96f340a0c13b6a17f8fbf71bec 100644
--- a/ethcore/light/src/net/status.rs
+++ b/ethcore/light/src/net/status.rs
@@ -17,7 +17,7 @@
 //! Peer status and capabilities.
 
 use rlp::{DecoderError, Encodable, Decodable, RlpStream, UntrustedRlp};
-use util::{H256, U256};
+use ethereum_types::{H256, U256};
 
 use super::request_credits::FlowParams;
 
@@ -373,7 +373,7 @@ pub fn write_announcement(announcement: &Announcement) -> Vec<u8> {
 mod tests {
 	use super::*;
 	use super::super::request_credits::FlowParams;
-	use util::{U256, H256};
+	use ethereum_types::{U256, H256};
 	use rlp::{RlpStream, UntrustedRlp};
 
 	#[test]
diff --git a/ethcore/light/src/net/tests/mod.rs b/ethcore/light/src/net/tests/mod.rs
index ef86c08f56ac3b1458227ae241f10a42f4a14eca..c3c792b786a5be0122b864b018cd5995294c3e4d 100644
--- a/ethcore/light/src/net/tests/mod.rs
+++ b/ethcore/light/src/net/tests/mod.rs
@@ -20,9 +20,9 @@
 use ethcore::blockchain_info::BlockChainInfo;
 use ethcore::client::{EachBlockWith, TestBlockChainClient};
 use ethcore::ids::BlockId;
-use ethcore::transaction::{Action, PendingTransaction};
 use ethcore::encoded;
 use network::{PeerId, NodeId};
+use transaction::{Action, PendingTransaction};
 
 use net::context::IoContext;
 use net::status::{Capabilities, Status};
@@ -32,14 +32,15 @@ use request;
 use request::*;
 
 use rlp::*;
-use util::{Address, H256, U256};
+use ethereum_types::{H256, U256, Address};
 
 use std::sync::Arc;
+use std::time::Instant;
 
 // helper for encoding a single request into a packet.
 // panics on bad backreference.
 fn encode_single(request: Request) -> NetworkRequests {
-	let mut builder = RequestBuilder::default();
+	let mut builder = Builder::default();
 	builder.push(request).unwrap();
 	builder.build()
 }
@@ -114,6 +115,16 @@ impl Provider for TestProvider {
 		self.0.client.block_header(id)
 	}
 
+	fn transaction_index(&self, req: request::CompleteTransactionIndexRequest)
+		-> Option<request::TransactionIndexResponse>
+	{
+		Some(request::TransactionIndexResponse {
+			num: 100,
+			hash: req.hash,
+			index: 55,
+		})
+	}
+
 	fn block_body(&self, req: request::CompleteBodyRequest) -> Option<request::BodyResponse> {
 		self.0.client.block_body(req)
 	}
@@ -156,6 +167,12 @@ impl Provider for TestProvider {
 		None
 	}
 
+	fn epoch_signal(&self, _req: request::CompleteSignalRequest) -> Option<request::SignalResponse> {
+		Some(request::SignalResponse {
+			signal: vec![1, 2, 3, 4],
+		})
+	}
+
 	fn ready_transactions(&self) -> Vec<PendingTransaction> {
 		self.0.client.ready_transactions()
 	}
@@ -300,7 +317,7 @@ fn get_block_headers() {
 		let headers: Vec<_> = (0..10).map(|i| provider.client.block_header(BlockId::Number(i + 1)).unwrap()).collect();
 		assert_eq!(headers.len(), 10);
 
-		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests());
+		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests()).unwrap();
 
 		let response = vec![Response::Headers(HeadersResponse {
 			headers: headers,
@@ -336,7 +353,7 @@ fn get_block_bodies() {
 		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
 	}
 
-	let mut builder = RequestBuilder::default();
+	let mut builder = Builder::default();
 	let mut bodies = Vec::new();
 
 	for i in 0..10 {
@@ -353,7 +370,7 @@ fn get_block_bodies() {
 	let request_body = make_packet(req_id, &requests);
 
 	let response = {
-		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests());
+		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests()).unwrap();
 
 		let mut response_stream = RlpStream::new_list(3);
 		response_stream.append(&req_id).append(&new_creds).append_list(&bodies);
@@ -392,7 +409,7 @@ fn get_block_receipts() {
 		.take(10)
 		.collect();
 
-	let mut builder = RequestBuilder::default();
+	let mut builder = Builder::default();
 	let mut receipts = Vec::new();
 	for hash in block_hashes.iter().cloned() {
 		builder.push(Request::Receipts(IncompleteReceiptsRequest { hash: hash.into() })).unwrap();
@@ -408,7 +425,7 @@ fn get_block_receipts() {
 	let response = {
 		assert_eq!(receipts.len(), 10);
 
-		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests());
+		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests()).unwrap();
 
 		let mut response_stream = RlpStream::new_list(3);
 		response_stream.append(&req_id).append(&new_creds).append_list(&receipts);
@@ -440,7 +457,7 @@ fn get_state_proofs() {
 	let key1: H256 = U256::from(11223344).into();
 	let key2: H256 = U256::from(99988887).into();
 
-	let mut builder = RequestBuilder::default();
+	let mut builder = Builder::default();
 	builder.push(Request::Account(IncompleteAccountRequest {
 		block_hash: H256::default().into(),
 		address_hash: key1.into(),
@@ -467,7 +484,7 @@ fn get_state_proofs() {
 			}).unwrap()),
 		];
 
-		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests());
+		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests()).unwrap();
 
 		let mut response_stream = RlpStream::new_list(3);
 		response_stream.append(&req_id).append(&new_creds).append_list(&responses);
@@ -509,7 +526,7 @@ fn get_contract_code() {
 			code: key1.iter().chain(key2.iter()).cloned().collect(),
 		})];
 
-		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests());
+		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests()).unwrap();
 
 		let mut response_stream = RlpStream::new_list(3);
 
@@ -521,6 +538,49 @@ fn get_contract_code() {
 	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
 }
 
+#[test]
+fn epoch_signal() {
+	let capabilities = capabilities();
+
+	let (provider, proto) = setup(capabilities.clone());
+	let flow_params = proto.flow_params.read().clone();
+
+	let cur_status = status(provider.client.chain_info());
+
+	{
+		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
+	}
+
+	let req_id = 112;
+	let request = Request::Signal(request::IncompleteSignalRequest {
+		block_hash: H256([1; 32]).into(),
+	});
+
+	let requests = encode_single(request.clone());
+	let request_body = make_packet(req_id, &requests);
+
+	let response = {
+		let response = vec![Response::Signal(SignalResponse {
+			signal: vec![1, 2, 3, 4],
+		})];
+
+		let limit = *flow_params.limit();
+		let cost = flow_params.compute_cost_multi(requests.requests()).unwrap();
+
+		let new_creds = limit - cost;
+
+		let mut response_stream = RlpStream::new_list(3);
+		response_stream.append(&req_id).append(&new_creds).append_list(&response);
+
+		response_stream.out()
+	};
+
+	let expected = Expect::Respond(packet::RESPONSE, response);
+	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
+}
+
 #[test]
 fn proof_of_execution() {
 	let capabilities = capabilities();
@@ -553,9 +613,8 @@ fn proof_of_execution() {
 
 	let response = {
 		let limit = *flow_params.limit();
-		let cost = flow_params.compute_cost_multi(requests.requests());
+		let cost = flow_params.compute_cost_multi(requests.requests()).unwrap();
 
-		println!("limit = {}, cost = {}", limit, cost);
 		let new_creds = limit - cost;
 
 		let mut response_stream = RlpStream::new_list(3);
@@ -603,16 +662,16 @@ fn id_guard() {
 
 	let mut pending_requests = RequestSet::default();
 
-	pending_requests.insert(req_id_1, req.clone(), 0.into(), ::time::SteadyTime::now());
-	pending_requests.insert(req_id_2, req, 1.into(), ::time::SteadyTime::now());
+	pending_requests.insert(req_id_1, req.clone(), 0.into(), Instant::now());
+	pending_requests.insert(req_id_2, req, 1.into(), Instant::now());
 
-	proto.peers.write().insert(peer_id, ::util::Mutex::new(Peer {
+	proto.peers.write().insert(peer_id, ::parking_lot::Mutex::new(Peer {
 		local_credits: flow_params.create_credits(),
 		status: status(provider.client.chain_info()),
 		capabilities: capabilities.clone(),
 		remote_flow: Some((flow_params.create_credits(), (&*flow_params).clone())),
 		sent_head: provider.client.chain_info().best_block_hash,
-		last_update: ::time::SteadyTime::now(),
+		last_update: Instant::now(),
 		pending_requests: pending_requests,
 		failed_requests: Vec::new(),
 		propagated_transactions: Default::default(),
@@ -661,3 +720,46 @@ fn id_guard() {
 		assert_eq!(peer_info.failed_requests, &[req_id_1]);
 	}
 }
+
+#[test]
+fn get_transaction_index() {
+	let capabilities = capabilities();
+
+	let (provider, proto) = setup(capabilities.clone());
+	let flow_params = proto.flow_params.read().clone();
+
+	let cur_status = status(provider.client.chain_info());
+
+	{
+		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
+	}
+
+	let req_id = 112;
+	let key1: H256 = U256::from(11223344).into();
+
+	let request = Request::TransactionIndex(IncompleteTransactionIndexRequest {
+		hash: key1.into(),
+	});
+
+	let requests = encode_single(request.clone());
+	let request_body = make_packet(req_id, &requests);
+	let response = {
+		let response = vec![Response::TransactionIndex(TransactionIndexResponse {
+			num: 100,
+			hash: key1,
+			index: 55,
+		})];
+
+		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests()).unwrap();
+
+		let mut response_stream = RlpStream::new_list(3);
+
+		response_stream.append(&req_id).append(&new_creds).append_list(&response);
+		response_stream.out()
+	};
+
+	let expected = Expect::Respond(packet::RESPONSE, response);
+	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
+}
diff --git a/ethcore/light/src/on_demand/mod.rs b/ethcore/light/src/on_demand/mod.rs
index 42469725bbf89b7dcbdeb159fa0b1e9654ceddfd..64794d49e720c630060ab5c646a743e4359c3ef3 100644
--- a/ethcore/light/src/on_demand/mod.rs
+++ b/ethcore/light/src/on_demand/mod.rs
@@ -18,16 +18,18 @@
 //! The request service is implemented using Futures. Higher level request handlers
 //! will take the raw data received here and extract meaningful results from it.
 
+use std::cmp;
 use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::sync::Arc;
 
 use ethcore::executed::{Executed, ExecutionError};
 
-use futures::{Async, Poll, Future};
-use futures::sync::oneshot::{self, Sender, Receiver, Canceled};
+use futures::{Poll, Future};
+use futures::sync::oneshot::{self, Receiver, Canceled};
 use network::PeerId;
-use util::{RwLock, Mutex};
+use parking_lot::{RwLock, Mutex};
+use rand;
 
 use net::{
 	self, Handler, PeerStatus, Status, Capabilities,
@@ -74,8 +76,8 @@ impl Peer {
 
 // Attempted request info and sender to put received value.
 struct Pending {
-	requests: basic_request::Requests<CheckedRequest>,
-	net_requests: basic_request::Requests<NetworkRequest>,
+	requests: basic_request::Batch<CheckedRequest>,
+	net_requests: basic_request::Batch<NetworkRequest>,
 	required_capabilities: Capabilities,
 	responses: Vec<Response>,
 	sender: oneshot::Sender<Vec<Response>>,
@@ -90,7 +92,14 @@ impl Pending {
 			match self.requests[idx].respond_local(cache) {
 				Some(response) => {
 					self.requests.supply_response_unchecked(&response);
+
+					// update header and back-references after each from-cache
+					// response to ensure that the requests are left in a consistent
+					// state and increase the likelihood of being able to answer
+					// the next request from cache.
 					self.update_header_refs(idx, &response);
+					self.fill_unanswered();
+
 					self.responses.push(response);
 				}
 				None => break,
@@ -151,7 +160,7 @@ impl Pending {
 	fn update_net_requests(&mut self) {
 		use request::IncompleteRequest;
 
-		let mut builder = basic_request::RequestBuilder::default();
+		let mut builder = basic_request::Builder::default();
 		let num_answered = self.requests.num_answered();
 		let mut mapping = move |idx| idx - num_answered;
 
@@ -195,6 +204,9 @@ fn guess_capabilities(requests: &[CheckedRequest]) -> Capabilities {
 				caps.serve_headers = true,
 			CheckedRequest::HeaderByHash(_, _) =>
 				caps.serve_headers = true,
+			CheckedRequest::TransactionIndex(_, _) => {} // hashes yield no info.
+			CheckedRequest::Signal(_, _) =>
+				caps.serve_headers = true,
 			CheckedRequest::Body(ref req, _) => if let Ok(ref hdr) = req.0.as_ref() {
 				update_since(&mut caps.serve_chain_since, hdr.number());
 			},
@@ -279,7 +291,7 @@ impl OnDemand {
 			return Ok(receiver);
 		}
 
-		let mut builder = basic_request::RequestBuilder::default();
+		let mut builder = basic_request::Builder::default();
 
 		let responses = Vec::with_capacity(requests.len());
 
@@ -342,29 +354,6 @@ impl OnDemand {
 	// dispatch pending requests, and discard those for which the corresponding
 	// receiver has been dropped.
 	fn dispatch_pending(&self, ctx: &BasicContext) {
-
-		// wrapper future for calling `poll_cancel` on our `Senders` to preserve
-		// the invariant that it's always within a task.
-		struct CheckHangup<'a, T: 'a>(&'a mut Sender<T>);
-
-		impl<'a, T: 'a> Future for CheckHangup<'a, T> {
-			type Item = bool;
-			type Error = ();
-
-			fn poll(&mut self) -> Poll<bool, ()> {
-				Ok(Async::Ready(match self.0.poll_cancel() {
-					Ok(Async::NotReady) => false, // hasn't hung up.
-					_ => true, // has hung up.
-				}))
-			}
-		}
-
-		// check whether a sender's hung up (using `wait` to preserve the task invariant)
-		// returns true if has hung up, false otherwise.
-		fn check_hangup<T>(send: &mut Sender<T>) -> bool {
-			CheckHangup(send).wait().expect("CheckHangup always returns ok; qed")
-		}
-
 		if self.pending.read().is_empty() { return }
 		let mut pending = self.pending.write();
 
@@ -374,12 +363,12 @@ impl OnDemand {
 		// then, try and find a peer who can serve it.
 		let peers = self.peers.read();
 		*pending = ::std::mem::replace(&mut *pending, Vec::new()).into_iter()
-			.filter_map(|mut pending| match check_hangup(&mut pending.sender) {
-				false => Some(pending),
-				true => None,
-			})
+			.filter(|pending| !pending.sender.is_canceled())
 			.filter_map(|pending| {
-				for (peer_id, peer) in peers.iter() { // .shuffle?
+				// the peer we dispatch to is chosen randomly
+				let num_peers = peers.len();
+				let rng = rand::random::<usize>() % cmp::max(num_peers, 1);
+				for (peer_id, peer) in peers.iter().chain(peers.iter()).skip(rng).take(num_peers) {
 					// TODO: see which requests can be answered by the cache?
 
 					if !peer.can_fulfill(&pending.required_capabilities) {
diff --git a/ethcore/light/src/on_demand/request.rs b/ethcore/light/src/on_demand/request.rs
index 6a22013494193279667ddf08bffb55b5248c3602..e7303ad884eb28e1780570f414e70f5c26624e5b 100644
--- a/ethcore/light/src/on_demand/request.rs
+++ b/ethcore/light/src/on_demand/request.rs
@@ -20,19 +20,24 @@ use std::sync::Arc;
 
 use ethcore::basic_account::BasicAccount;
 use ethcore::encoded;
-use ethcore::engines::Engine;
+use ethcore::engines::{EthEngine, StateDependentProof};
+use ethcore::machine::EthereumMachine;
 use ethcore::receipt::Receipt;
 use ethcore::state::{self, ProvedExecution};
-use ethcore::transaction::SignedTransaction;
+use transaction::SignedTransaction;
 use vm::EnvInfo;
+use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY, KECCAK_EMPTY_LIST_RLP, keccak};
 
 use request::{self as net_request, IncompleteRequest, CompleteRequest, Output, OutputKind, Field};
 
 use rlp::{RlpStream, UntrustedRlp};
-use util::{Address, Bytes, DBValue, HashDB, Mutex, H256, U256};
-use util::memorydb::MemoryDB;
-use util::sha3::{Hashable, SHA3_NULL_RLP, SHA3_EMPTY, SHA3_EMPTY_LIST_RLP};
-use util::trie::{Trie, TrieDB, TrieError};
+use ethereum_types::{H256, U256, Address};
+use parking_lot::Mutex;
+use hashdb::HashDB;
+use kvdb::DBValue;
+use bytes::Bytes;
+use memorydb::MemoryDB;
+use trie::{Trie, TrieDB, TrieError};
 
 const SUPPLIED_MATCHES: &'static str = "supplied responses always match produced requests; enforced by `check_response`; qed";
 
@@ -43,6 +48,8 @@ pub enum Request {
 	HeaderProof(HeaderProof),
 	/// A request for a header by hash.
 	HeaderByHash(HeaderByHash),
+	/// A request for the index of a transaction.
+	TransactionIndex(TransactionIndex),
 	/// A request for block receipts.
 	Receipts(BlockReceipts),
 	/// A request for a block body.
@@ -53,6 +60,8 @@ pub enum Request {
 	Code(Code),
 	/// A request for proof of execution.
 	Execution(TransactionProof),
+	/// A request for epoch change signal.
+	Signal(Signal),
 }
 
 /// A request argument.
@@ -128,11 +137,13 @@ macro_rules! impl_single {
 // implement traits for each kind of request.
 impl_single!(HeaderProof, HeaderProof, (H256, U256));
 impl_single!(HeaderByHash, HeaderByHash, encoded::Header);
+impl_single!(TransactionIndex, TransactionIndex, net_request::TransactionIndexResponse);
 impl_single!(Receipts, BlockReceipts, Vec<Receipt>);
 impl_single!(Body, Body, encoded::Block);
 impl_single!(Account, Account, Option<BasicAccount>);
 impl_single!(Code, Code, Bytes);
 impl_single!(Execution, TransactionProof, super::ExecutionResult);
+impl_single!(Signal, Signal, Vec<u8>);
 
 macro_rules! impl_args {
 	() => {
@@ -236,11 +247,13 @@ impl From<encoded::Header> for HeaderRef {
 pub enum CheckedRequest {
 	HeaderProof(HeaderProof, net_request::IncompleteHeaderProofRequest),
 	HeaderByHash(HeaderByHash, net_request::IncompleteHeadersRequest),
+	TransactionIndex(TransactionIndex, net_request::IncompleteTransactionIndexRequest),
 	Receipts(BlockReceipts, net_request::IncompleteReceiptsRequest),
 	Body(Body, net_request::IncompleteBodyRequest),
 	Account(Account, net_request::IncompleteAccountRequest),
 	Code(Code, net_request::IncompleteCodeRequest),
 	Execution(TransactionProof, net_request::IncompleteExecutionRequest),
+	Signal(Signal, net_request::IncompleteSignalRequest)
 }
 
 impl From<Request> for CheckedRequest {
@@ -261,6 +274,12 @@ impl From<Request> for CheckedRequest {
 				};
 				CheckedRequest::HeaderProof(req, net_req)
 			}
+			Request::TransactionIndex(req) => {
+				let net_req = net_request::IncompleteTransactionIndexRequest {
+					hash: req.0.clone(),
+				};
+				CheckedRequest::TransactionIndex(req, net_req)
+			}
 			Request::Body(req) =>  {
 				let net_req = net_request::IncompleteBodyRequest {
 					hash: req.0.field(),
@@ -276,7 +295,7 @@ impl From<Request> for CheckedRequest {
 			Request::Account(req) => {
 				let net_req = net_request::IncompleteAccountRequest {
 					block_hash: req.header.field(),
-					address_hash: ::util::Hashable::sha3(&req.address).into(),
+					address_hash: ::hash::keccak(&req.address).into(),
 				};
 				CheckedRequest::Account(req, net_req)
 			}
@@ -299,6 +318,12 @@ impl From<Request> for CheckedRequest {
 				};
 				CheckedRequest::Execution(req, net_req)
 			}
+			Request::Signal(req) => {
+				let net_req = net_request::IncompleteSignalRequest {
+					block_hash: req.hash.into(),
+				};
+				CheckedRequest::Signal(req, net_req)
+			}
 		}
 	}
 }
@@ -311,11 +336,13 @@ impl CheckedRequest {
 		match self {
 			CheckedRequest::HeaderProof(_, req) => NetRequest::HeaderProof(req),
 			CheckedRequest::HeaderByHash(_, req) => NetRequest::Headers(req),
+			CheckedRequest::TransactionIndex(_, req) => NetRequest::TransactionIndex(req),
 			CheckedRequest::Receipts(_, req) => NetRequest::Receipts(req),
 			CheckedRequest::Body(_, req) => NetRequest::Body(req),
 			CheckedRequest::Account(_, req) => NetRequest::Account(req),
 			CheckedRequest::Code(_, req) => NetRequest::Code(req),
 			CheckedRequest::Execution(_, req) => NetRequest::Execution(req),
+			CheckedRequest::Signal(_, req) => NetRequest::Signal(req),
 		}
 	}
 
@@ -366,7 +393,7 @@ impl CheckedRequest {
 			}
 			CheckedRequest::Receipts(ref check, ref req) => {
 				// empty transactions -> no receipts
-				if check.0.as_ref().ok().map_or(false, |hdr| hdr.receipts_root() == SHA3_NULL_RLP) {
+				if check.0.as_ref().ok().map_or(false, |hdr| hdr.receipts_root() == KECCAK_NULL_RLP) {
 					return Some(Response::Receipts(Vec::new()));
 				}
 
@@ -377,7 +404,7 @@ impl CheckedRequest {
 			CheckedRequest::Body(ref check, ref req) => {
 				// check for empty body.
 				if let Some(hdr) = check.0.as_ref().ok() {
-					if hdr.transactions_root() == SHA3_NULL_RLP && hdr.uncles_hash() == SHA3_EMPTY_LIST_RLP {
+					if hdr.transactions_root() == KECCAK_NULL_RLP && hdr.uncles_hash() == KECCAK_EMPTY_LIST_RLP {
 						let mut stream = RlpStream::new_list(3);
 						stream.append_raw(hdr.rlp().as_raw(), 1);
 						stream.begin_list(0);
@@ -422,7 +449,7 @@ impl CheckedRequest {
 					})
 			}
 			CheckedRequest::Code(_, ref req) => {
-				if req.code_hash.as_ref().map_or(false, |&h| h == SHA3_EMPTY) {
+				if req.code_hash.as_ref().map_or(false, |&h| h == KECCAK_EMPTY) {
 					Some(Response::Code(Vec::new()))
 				} else {
 					None
@@ -438,11 +465,13 @@ macro_rules! match_me {
 		match $me {
 			CheckedRequest::HeaderProof($check, $req) => $e,
 			CheckedRequest::HeaderByHash($check, $req) => $e,
+			CheckedRequest::TransactionIndex($check, $req) => $e,
 			CheckedRequest::Receipts($check, $req) => $e,
 			CheckedRequest::Body($check, $req) => $e,
 			CheckedRequest::Account($check, $req) => $e,
 			CheckedRequest::Code($check, $req) => $e,
 			CheckedRequest::Execution($check, $req) => $e,
+			CheckedRequest::Signal($check, $req) => $e,
 		}
 	}
 }
@@ -465,11 +494,13 @@ impl IncompleteRequest for CheckedRequest {
 					_ => Ok(()),
 				}
 			}
+			CheckedRequest::TransactionIndex(_, ref req) => req.check_outputs(f),
 			CheckedRequest::Receipts(_, ref req) => req.check_outputs(f),
 			CheckedRequest::Body(_, ref req) => req.check_outputs(f),
 			CheckedRequest::Account(_, ref req) => req.check_outputs(f),
 			CheckedRequest::Code(_, ref req) => req.check_outputs(f),
 			CheckedRequest::Execution(_, ref req) => req.check_outputs(f),
+			CheckedRequest::Signal(_, ref req) => req.check_outputs(f),
 		}
 	}
 
@@ -485,11 +516,13 @@ impl IncompleteRequest for CheckedRequest {
 		match self {
 			CheckedRequest::HeaderProof(_, req) => req.complete().map(CompleteRequest::HeaderProof),
 			CheckedRequest::HeaderByHash(_, req) => req.complete().map(CompleteRequest::Headers),
+			CheckedRequest::TransactionIndex(_, req) => req.complete().map(CompleteRequest::TransactionIndex),
 			CheckedRequest::Receipts(_, req) => req.complete().map(CompleteRequest::Receipts),
 			CheckedRequest::Body(_, req) => req.complete().map(CompleteRequest::Body),
 			CheckedRequest::Account(_, req) => req.complete().map(CompleteRequest::Account),
 			CheckedRequest::Code(_, req) => req.complete().map(CompleteRequest::Code),
 			CheckedRequest::Execution(_, req) => req.complete().map(CompleteRequest::Execution),
+			CheckedRequest::Signal(_, req) => req.complete().map(CompleteRequest::Signal),
 		}
 	}
 
@@ -526,6 +559,9 @@ impl net_request::CheckedRequest for CheckedRequest {
 			CheckedRequest::HeaderByHash(ref prover, _) =>
 				expect!((&NetResponse::Headers(ref res), &CompleteRequest::Headers(ref req)) =>
 					prover.check_response(cache, &req.start, &res.headers).map(Response::HeaderByHash)),
+			CheckedRequest::TransactionIndex(ref prover, _) =>
+				expect!((&NetResponse::TransactionIndex(ref res), _) =>
+					prover.check_response(cache, res).map(Response::TransactionIndex)),
 			CheckedRequest::Receipts(ref prover, _) =>
 				expect!((&NetResponse::Receipts(ref res), _) =>
 					prover.check_response(cache, &res.receipts).map(Response::Receipts)),
@@ -541,6 +577,9 @@ impl net_request::CheckedRequest for CheckedRequest {
 			CheckedRequest::Execution(ref prover, _) =>
 				expect!((&NetResponse::Execution(ref res), _) =>
 					prover.check_response(cache, &res.items).map(Response::Execution)),
+			CheckedRequest::Signal(ref prover, _) =>
+				expect!((&NetResponse::Signal(ref res), _) =>
+					prover.check_response(cache, &res.signal).map(Response::Signal)),
 		}
 	 }
 }
@@ -553,6 +592,8 @@ pub enum Response {
 	HeaderProof((H256, U256)),
 	/// Response to a header-by-hash request.
 	HeaderByHash(encoded::Header),
+	/// Response to a transaction-index request.
+	TransactionIndex(net_request::TransactionIndexResponse),
 	/// Response to a receipts request.
 	Receipts(Vec<Receipt>),
 	/// Response to a block body request.
@@ -564,6 +605,8 @@ pub enum Response {
 	Code(Vec<u8>),
 	/// Response to a request for proved execution.
 	Execution(super::ExecutionResult),
+	/// Response to a request for epoch change signal.
+	Signal(Vec<u8>),
 }
 
 impl net_request::ResponseLike for Response {
@@ -571,8 +614,8 @@ impl net_request::ResponseLike for Response {
 		match *self {
 			Response::HeaderProof((ref hash, _)) => f(0, Output::Hash(*hash)),
 			Response::Account(None) => {
-				f(0, Output::Hash(SHA3_EMPTY)); // code hash
-				f(1, Output::Hash(SHA3_NULL_RLP)); // storage root.
+				f(0, Output::Hash(KECCAK_EMPTY)); // code hash
+				f(1, Output::Hash(KECCAK_NULL_RLP)); // storage root.
 			}
 			Response::Account(Some(ref acc)) => {
 				f(0, Output::Hash(acc.code_hash));
@@ -688,7 +731,7 @@ impl HeaderByHash {
 		};
 
 		let header = headers.get(0).ok_or(Error::Empty)?;
-		let hash = header.sha3();
+		let hash = header.hash();
 		match hash == expected_hash {
 			true => {
 				cache.lock().insert_block_header(hash, header.clone());
@@ -699,6 +742,33 @@ impl HeaderByHash {
 	}
 }
 
+/// Request for a transaction index.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct TransactionIndex(pub Field<H256>);
+
+impl TransactionIndex {
+	/// Check a response for the transaction index.
+	//
+	// TODO: proper checking involves looking at canonicality of the
+	// hash w.r.t. the current best block header.
+	//
+	// unlike all other forms of request, we don't know the header to check
+	// until we make this request.
+	//
+	// This would require lookups in the database or perhaps CHT requests,
+	// which aren't currently possible.
+	//
+	// Also, returning a result that is not locally canonical doesn't necessarily
+	// indicate misbehavior, so the punishment scheme would need to be revised.
+	pub fn check_response(
+		&self,
+		_cache: &Mutex<::cache::Cache>,
+		res: &net_request::TransactionIndexResponse,
+	) -> Result<net_request::TransactionIndexResponse, Error> {
+		Ok(res.clone())
+	}
+}
+
 /// Request for a block, with header for verification.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Body(pub HeaderRef);
@@ -708,12 +778,12 @@ impl Body {
 	pub fn check_response(&self, cache: &Mutex<::cache::Cache>, body: &encoded::Body) -> Result<encoded::Block, Error> {
 		// check the integrity of the the body against the header
 		let header = self.0.as_ref()?;
-		let tx_root = ::util::triehash::ordered_trie_root(body.rlp().at(0).iter().map(|r| r.as_raw().to_vec()));
+		let tx_root = ::triehash::ordered_trie_root(body.rlp().at(0).iter().map(|r| r.as_raw()));
 		if tx_root != header.transactions_root() {
 			return Err(Error::WrongTrieRoot(header.transactions_root(), tx_root));
 		}
 
-		let uncles_hash = body.rlp().at(1).as_raw().sha3();
+		let uncles_hash = keccak(body.rlp().at(1).as_raw());
 		if uncles_hash != header.uncles_hash() {
 			return Err(Error::WrongHash(header.uncles_hash(), uncles_hash));
 		}
@@ -738,7 +808,7 @@ impl BlockReceipts {
 	/// Check a response with receipts against the stored header.
 	pub fn check_response(&self, cache: &Mutex<::cache::Cache>, receipts: &[Receipt]) -> Result<Vec<Receipt>, Error> {
 		let receipts_root = self.0.as_ref()?.receipts_root();
-		let found_root = ::util::triehash::ordered_trie_root(receipts.iter().map(|r| ::rlp::encode(r).into_vec()));
+		let found_root = ::triehash::ordered_trie_root(receipts.iter().map(|r| ::rlp::encode(r)));
 
 		match receipts_root == found_root {
 			true => {
@@ -768,7 +838,7 @@ impl Account {
 		let mut db = MemoryDB::new();
 		for node in proof { db.insert(&node[..]); }
 
-		match TrieDB::new(&db, &state_root).and_then(|t| t.get(&self.address.sha3()))? {
+		match TrieDB::new(&db, &state_root).and_then(|t| t.get(&keccak(&self.address)))? {
 			Some(val) => {
 				let rlp = UntrustedRlp::new(&val);
 				Ok(Some(BasicAccount {
@@ -800,7 +870,7 @@ impl Code {
 		code_hash: &H256,
 		code: &[u8]
 	) -> Result<Vec<u8>, Error> {
-		let found_hash = code.sha3();
+		let found_hash = keccak(code);
 		if &found_hash == code_hash {
 			Ok(code.to_vec())
 		} else {
@@ -820,7 +890,7 @@ pub struct TransactionProof {
 	// TODO: it's not really possible to provide this if the header is unknown.
 	pub env_info: EnvInfo,
 	/// Consensus engine.
-	pub engine: Arc<Engine>,
+	pub engine: Arc<EthEngine>,
 }
 
 impl TransactionProof {
@@ -835,7 +905,7 @@ impl TransactionProof {
 			state_items,
 			root,
 			&self.tx,
-			&*self.engine,
+			self.engine.machine(),
 			&self.env_info,
 		);
 
@@ -847,20 +917,45 @@ impl TransactionProof {
 	}
 }
 
+/// Request for epoch signal.
+/// Provide engine and state-dependent proof checker.
+#[derive(Clone)]
+pub struct Signal {
+	/// Block hash and number to fetch proof for.
+	pub hash: H256,
+	/// Consensus engine, used to check the proof.
+	pub engine: Arc<EthEngine>,
+	/// Special checker for the proof.
+	pub proof_check: Arc<StateDependentProof<EthereumMachine>>,
+}
+
+impl Signal {
+	/// Check the signal, returning the signal or indicate that it's bad.
+	pub fn check_response(&self, _: &Mutex<::cache::Cache>, signal: &[u8]) -> Result<Vec<u8>, Error> {
+		self.proof_check.check_proof(self.engine.machine(), signal)
+			.map(|_| signal.to_owned())
+			.map_err(|_| Error::BadProof)
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use util::{MemoryDB, Address, Mutex, H256};
-	use util::trie::{Trie, TrieMut, SecTrieDB, SecTrieDBMut};
-	use util::trie::recorder::Recorder;
-
-	use ethcore::client::{BlockChainClient, TestBlockChainClient, EachBlockWith};
+	use std::time::Duration;
+	use ethereum_types::{H256, Address};
+	use memorydb::MemoryDB;
+	use parking_lot::Mutex;
+	use trie::{Trie, TrieMut, SecTrieDB, SecTrieDBMut};
+	use trie::recorder::Recorder;
+	use hash::keccak;
+
+	use ethcore::client::{BlockChainClient, BlockInfo, TestBlockChainClient, EachBlockWith};
 	use ethcore::header::Header;
 	use ethcore::encoded;
-	use ethcore::receipt::Receipt;
+	use ethcore::receipt::{Receipt, TransactionOutcome};
 
 	fn make_cache() -> ::cache::Cache {
-		::cache::Cache::new(Default::default(), ::time::Duration::seconds(1))
+		::cache::Cache::new(Default::default(), Duration::from_secs(1))
 	}
 
 	#[test]
@@ -926,15 +1021,15 @@ mod tests {
 	#[test]
 	fn check_receipts() {
 		let receipts = (0..5).map(|_| Receipt {
-			state_root: Some(H256::random()),
+			outcome: TransactionOutcome::StateRoot(H256::random()),
 			gas_used: 21_000u64.into(),
 			log_bloom: Default::default(),
 			logs: Vec::new(),
 		}).collect::<Vec<_>>();
 
 		let mut header = Header::new();
-		let receipts_root = ::util::triehash::ordered_trie_root(
-			receipts.iter().map(|x| ::rlp::encode(x).into_vec())
+		let receipts_root = ::triehash::ordered_trie_root(
+			receipts.iter().map(|x| ::rlp::encode(x))
 		);
 
 		header.set_receipts_root(receipts_root);
@@ -998,7 +1093,7 @@ mod tests {
 	#[test]
 	fn check_code() {
 		let code = vec![1u8; 256];
-		let code_hash = ::util::Hashable::sha3(&code);
+		let code_hash = keccak(&code);
 		let header = Header::new();
 		let req = Code {
 			header: encoded::Header::new(::rlp::encode(&header).into_vec()).into(),
diff --git a/ethcore/light/src/on_demand/tests.rs b/ethcore/light/src/on_demand/tests.rs
index 10c4ceae5f19d65cdf3f69f7705913b6bf3ff5c7..999f2e669a5cecc1044135059f23a92a1b48ec82 100644
--- a/ethcore/light/src/on_demand/tests.rs
+++ b/ethcore/light/src/on_demand/tests.rs
@@ -22,8 +22,9 @@ use ethcore::header::{Header, Seal};
 use futures::Future;
 use network::{PeerId, NodeId};
 use net::*;
-use util::{H256, Mutex};
-use time::Duration;
+use ethereum_types::H256;
+use parking_lot::Mutex;
+use std::time::Duration;
 use ::request::{self as basic_request, Response};
 
 use std::sync::Arc;
@@ -87,7 +88,7 @@ struct Harness {
 
 impl Harness {
 	fn create() -> Self {
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::minutes(1))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(60))));
 		Harness {
 			service: OnDemand::new_test(cache),
 		}
diff --git a/ethcore/light/src/provider.rs b/ethcore/light/src/provider.rs
index 3632783caa95f38ef3979c5ff8512f9b9afd7bc5..1d9af0ac19b15dd4ebf41a85b1f9d2ce1f5b41e9 100644
--- a/ethcore/light/src/provider.rs
+++ b/ethcore/light/src/provider.rs
@@ -14,17 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! A provider for the LES protocol. This is typically a full node, who can
+//! A provider for the PIP protocol. This is typically a full node, who can
 //! give as much data as necessary to its peers.
 
 use std::sync::Arc;
 
 use ethcore::blockchain_info::BlockChainInfo;
-use ethcore::client::{BlockChainClient, ProvingBlockChainClient};
-use ethcore::transaction::PendingTransaction;
+use ethcore::client::{BlockChainClient, ProvingBlockChainClient, ChainInfo, BlockInfo as ClientBlockInfo};
 use ethcore::ids::BlockId;
 use ethcore::encoded;
-use util::{RwLock, H256};
+use ethereum_types::H256;
+use parking_lot::RwLock;
+use transaction::PendingTransaction;
 
 use cht::{self, BlockInfo};
 use client::{LightChainClient, AsLightClient};
@@ -33,7 +34,6 @@ use transaction_queue::TransactionQueue;
 use request;
 
 /// Defines the operations that a provider for the light subprotocol must fulfill.
-#[cfg_attr(feature = "ipc", ipc(client_ident="LightProviderClient"))]
 pub trait Provider: Send + Sync {
 	/// Provide current blockchain info.
 	fn chain_info(&self) -> BlockChainInfo;
@@ -101,6 +101,10 @@ pub trait Provider: Send + Sync {
 	/// Get a block header by id.
 	fn block_header(&self, id: BlockId) -> Option<encoded::Header>;
 
+	/// Get a transaction index by hash.
+	fn transaction_index(&self, req: request::CompleteTransactionIndexRequest)
+		-> Option<request::TransactionIndexResponse>;
+
 	/// Fulfill a block body request.
 	fn block_body(&self, req: request::CompleteBodyRequest) -> Option<request::BodyResponse>;
 
@@ -126,12 +130,15 @@ pub trait Provider: Send + Sync {
 	/// Provide a proof-of-execution for the given transaction proof request.
 	/// Returns a vector of all state items necessary to execute the transaction.
 	fn transaction_proof(&self, req: request::CompleteExecutionRequest) -> Option<request::ExecutionResponse>;
+
+	/// Provide epoch signal data at given block hash. This should be just the
+	fn epoch_signal(&self, req: request::CompleteSignalRequest) -> Option<request::SignalResponse>;
 }
 
 // Implementation of a light client data provider for a client.
 impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	fn chain_info(&self) -> BlockChainInfo {
-		BlockChainClient::chain_info(self)
+		ChainInfo::chain_info(self)
 	}
 
 	fn reorg_depth(&self, a: &H256, b: &H256) -> Option<u64> {
@@ -143,7 +150,19 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	}
 
 	fn block_header(&self, id: BlockId) -> Option<encoded::Header> {
-		BlockChainClient::block_header(self, id)
+		ClientBlockInfo::block_header(self, id)
+	}
+
+	fn transaction_index(&self, req: request::CompleteTransactionIndexRequest)
+		-> Option<request::TransactionIndexResponse>
+	{
+		use ethcore::ids::TransactionId;
+
+		self.transaction_receipt(TransactionId::Hash(req.hash)).map(|receipt| request::TransactionIndexResponse {
+			num: receipt.block_number,
+			hash: receipt.block_hash,
+			index: receipt.transaction_index as u64,
+		})
 	}
 
 	fn block_body(&self, req: request::CompleteBodyRequest) -> Option<request::BodyResponse> {
@@ -241,7 +260,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	}
 
 	fn transaction_proof(&self, req: request::CompleteExecutionRequest) -> Option<request::ExecutionResponse> {
-		use ethcore::transaction::Transaction;
+		use transaction::Transaction;
 
 		let id = BlockId::Hash(req.block_hash);
 		let nonce = match self.nonce(&req.from, id.clone()) {
@@ -264,6 +283,12 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	fn ready_transactions(&self) -> Vec<PendingTransaction> {
 		BlockChainClient::ready_transactions(self)
 	}
+
+	fn epoch_signal(&self, req: request::CompleteSignalRequest) -> Option<request::SignalResponse> {
+		self.epoch_signal(req.block_hash).map(|signal| request::SignalResponse {
+			signal: signal,
+		})
+	}
 }
 
 /// The light client "provider" implementation. This wraps a `LightClient` and
@@ -301,6 +326,12 @@ impl<L: AsLightClient + Send + Sync> Provider for LightProvider<L> {
 		self.client.as_light_client().block_header(id)
 	}
 
+	fn transaction_index(&self, _req: request::CompleteTransactionIndexRequest)
+		-> Option<request::TransactionIndexResponse>
+	{
+		None
+	}
+
 	fn block_body(&self, _req: request::CompleteBodyRequest) -> Option<request::BodyResponse> {
 		None
 	}
@@ -329,6 +360,10 @@ impl<L: AsLightClient + Send + Sync> Provider for LightProvider<L> {
 		None
 	}
 
+	fn epoch_signal(&self, _req: request::CompleteSignalRequest) -> Option<request::SignalResponse> {
+		None
+	}
+
 	fn ready_transactions(&self) -> Vec<PendingTransaction> {
 		let chain_info = self.chain_info();
 		self.txqueue.read().ready_transactions(chain_info.best_block_number, chain_info.best_block_timestamp)
diff --git a/ethcore/light/src/transaction_queue.rs b/ethcore/light/src/transaction_queue.rs
index b0e7483a3ff9b7bddf1071eff7165443088c182d..156152253dd6666708c8e3638abf8adc6d25a11d 100644
--- a/ethcore/light/src/transaction_queue.rs
+++ b/ethcore/light/src/transaction_queue.rs
@@ -23,12 +23,13 @@
 //! accounts for which they create transactions, this queue is structured in an
 //! address-wise manner.
 
+use std::fmt;
 use std::collections::{BTreeMap, HashMap};
 use std::collections::hash_map::Entry;
 
-use ethcore::error::{TransactionError, TransactionImportResult};
-use ethcore::transaction::{Condition, PendingTransaction, SignedTransaction};
-use util::{Address, U256, H256, H256FastMap};
+use transaction::{self, Condition, PendingTransaction, SignedTransaction};
+use ethereum_types::{H256, U256, Address};
+use plain_hasher::H256FastMap;
 
 // Knowledge of an account's current nonce.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -99,38 +100,57 @@ impl AccountTransactions {
 	}
 
 	// attempt to move transactions from the future queue into the current queue.
-	fn adjust_future(&mut self) {
+	fn adjust_future(&mut self) -> Vec<H256> {
+		let mut promoted = Vec::new();
 		let mut next_nonce = self.next_nonce();
 
 		loop {
 			match self.future.remove(&next_nonce) {
-				Some(tx) => self.current.push(tx),
+				Some(tx) => {
+					promoted.push(tx.hash);
+					self.current.push(tx)
+				},
 				None => break,
 			}
 
 			next_nonce = next_nonce + 1.into();
 		}
+
+		promoted
 	}
 }
 
+type Listener = Box<Fn(&[H256]) + Send + Sync>;
+
 /// Light transaction queue. See module docs for more details.
-#[derive(Debug, Default, Clone, PartialEq, Eq)]
+#[derive(Default)]
 pub struct TransactionQueue {
 	by_account: HashMap<Address, AccountTransactions>,
 	by_hash: H256FastMap<PendingTransaction>,
+	listeners: Vec<Listener>,
+}
+
+impl fmt::Debug for TransactionQueue {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		fmt.debug_struct("TransactionQueue")
+			.field("by_account", &self.by_account)
+			.field("by_hash", &self.by_hash)
+			.field("listeners", &self.listeners.len())
+			.finish()
+	}
 }
 
 impl TransactionQueue {
 	/// Import a pending transaction to be queued.
-	pub fn import(&mut self, tx: PendingTransaction) -> Result<TransactionImportResult, TransactionError>  {
+	pub fn import(&mut self, tx: PendingTransaction) -> Result<transaction::ImportResult, transaction::Error>  {
 		let sender = tx.sender();
 		let hash = tx.hash();
 		let nonce = tx.nonce;
 		let tx_info = TransactionInfo::from(&tx);
 
-		if self.by_hash.contains_key(&hash) { return Err(TransactionError::AlreadyImported) }
+		if self.by_hash.contains_key(&hash) { return Err(transaction::Error::AlreadyImported) }
 
-		let res = match self.by_account.entry(sender) {
+		let (res, promoted) = match self.by_account.entry(sender) {
 			Entry::Vacant(entry) => {
 				entry.insert(AccountTransactions {
 					cur_nonce: CurrentNonce::Assumed(nonce),
@@ -138,14 +158,14 @@ impl TransactionQueue {
 					future: BTreeMap::new(),
 				});
 
-				TransactionImportResult::Current
+				(transaction::ImportResult::Current, vec![hash])
 			}
 			Entry::Occupied(mut entry) => {
 				let acct_txs = entry.get_mut();
 				if &nonce < acct_txs.cur_nonce.value() {
 					// don't accept txs from before known current nonce.
 					if acct_txs.cur_nonce.is_known() {
-						return Err(TransactionError::Old)
+						return Err(transaction::Error::Old)
 					}
 
 					// lower our assumption until corrected later.
@@ -160,7 +180,7 @@ impl TransactionQueue {
 						let old = ::std::mem::replace(&mut acct_txs.current[idx], tx_info);
 						self.by_hash.remove(&old.hash);
 
-						TransactionImportResult::Current
+						(transaction::ImportResult::Current, vec![hash])
 					}
 					Err(idx) => {
 						let cur_len = acct_txs.current.len();
@@ -182,21 +202,22 @@ impl TransactionQueue {
 								acct_txs.future.insert(future_nonce, future);
 							}
 
-							TransactionImportResult::Current
+							(transaction::ImportResult::Current, vec![hash])
 						} else if idx == cur_len && acct_txs.current.last().map_or(false, |f| f.nonce + 1.into() != nonce) {
 							trace!(target: "txqueue", "Queued future transaction for {}, nonce={}", sender, nonce);
 							let future_nonce = nonce;
 							acct_txs.future.insert(future_nonce, tx_info);
 
-							TransactionImportResult::Future
+							(transaction::ImportResult::Future, vec![])
 						} else {
 							trace!(target: "txqueue", "Queued current transaction for {}, nonce={}", sender, nonce);
 
 							// insert, then check if we've filled any gaps.
 							acct_txs.current.insert(idx, tx_info);
-							acct_txs.adjust_future();
+							let mut promoted = acct_txs.adjust_future();
+							promoted.insert(0, hash);
 
-							TransactionImportResult::Current
+							(transaction::ImportResult::Current, promoted)
 						}
 					}
 				}
@@ -204,6 +225,7 @@ impl TransactionQueue {
 		};
 
 		self.by_hash.insert(hash, tx);
+		self.notify(&promoted);
 		Ok(res)
 	}
 
@@ -319,13 +341,30 @@ impl TransactionQueue {
 			self.by_hash.remove(&hash);
 		}
 	}
+
+	/// Get a transaction by hash.
+	pub fn get(&self, hash: &H256) -> Option<&PendingTransaction> {
+		self.by_hash.get(&hash)
+	}
+
+	/// Add a transaction queue listener.
+	pub fn add_listener(&mut self, f: Listener) {
+		self.listeners.push(f);
+	}
+
+	/// Notifies all listeners about new pending transaction.
+	fn notify(&self, hashes: &[H256]) {
+		for listener in &self.listeners {
+			listener(hashes)
+		}
+	}
 }
 
 #[cfg(test)]
 mod tests {
 	use super::TransactionQueue;
-	use util::Address;
-	use ethcore::transaction::{Transaction, PendingTransaction, Condition};
+	use ethereum_types::Address;
+	use transaction::{Transaction, PendingTransaction, Condition};
 
 	#[test]
 	fn queued_senders() {
diff --git a/ethcore/light/src/types/mod.rs b/ethcore/light/src/types/mod.rs
index 63fe7426787f11ca544fdbd7ad8f8027bd97d6e0..eba551b533c396d027c868f893165caba2d8315e 100644
--- a/ethcore/light/src/types/mod.rs
+++ b/ethcore/light/src/types/mod.rs
@@ -14,11 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Types used in the public (IPC) api which require custom code generation.
-#![cfg_attr(feature = "ipc", allow(dead_code, unused_assignments, unused_variables))] // codegen issues
-
-#[cfg(feature = "ipc")]
-include!(concat!(env!("OUT_DIR"), "/mod.rs.in"));
-
-#[cfg(not(feature = "ipc"))]
-include!("mod.rs.in");
+pub mod request;
diff --git a/ethcore/light/src/types/mod.rs.in b/ethcore/light/src/types/mod.rs.in
deleted file mode 100644
index eba551b533c396d027c868f893165caba2d8315e..0000000000000000000000000000000000000000
--- a/ethcore/light/src/types/mod.rs.in
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-pub mod request;
diff --git a/ethcore/light/src/types/request/builder.rs b/ethcore/light/src/types/request/batch.rs
similarity index 87%
rename from ethcore/light/src/types/request/builder.rs
rename to ethcore/light/src/types/request/batch.rs
index 0b413677d31284884ae3c83c6c90280155c84bc2..21f1264672dd0b97e30cc15db5da35ea4040387a 100644
--- a/ethcore/light/src/types/request/builder.rs
+++ b/ethcore/light/src/types/request/batch.rs
@@ -25,23 +25,23 @@ use request::{
 };
 
 /// Build chained requests. Push them onto the series with `push`,
-/// and produce a `Requests` object with `build`. Outputs are checked for consistency.
+/// and produce a `Batch` object with `build`. Outputs are checked for consistency.
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct RequestBuilder<T> {
+pub struct Builder<T> {
 	output_kinds: HashMap<(usize, usize), OutputKind>,
 	requests: Vec<T>,
 }
 
-impl<T> Default for RequestBuilder<T> {
+impl<T> Default for Builder<T> {
 	fn default() -> Self {
-		RequestBuilder {
+		Builder {
 			output_kinds: HashMap::new(),
 			requests: Vec::new(),
 		}
 	}
 }
 
-impl<T: IncompleteRequest> RequestBuilder<T> {
+impl<T: IncompleteRequest> Builder<T> {
 	/// Attempt to push a request onto the request chain. Fails if the request
 	/// references a non-existent output of a prior request.
 	pub fn push(&mut self, request: T) -> Result<(), NoSuchOutput> {
@@ -62,9 +62,9 @@ impl<T: IncompleteRequest> RequestBuilder<T> {
 		&self.output_kinds
 	}
 
-	/// Convert this into a "requests" object.
-	pub fn build(self) -> Requests<T> {
-		Requests {
+	/// Convert this into a "batch" object.
+	pub fn build(self) -> Batch<T> {
+		Batch {
 			outputs: HashMap::new(),
 			requests: self.requests,
 			answered: 0,
@@ -74,13 +74,13 @@ impl<T: IncompleteRequest> RequestBuilder<T> {
 
 /// Requests pending responses.
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Requests<T> {
+pub struct Batch<T> {
 	outputs: HashMap<(usize, usize), Output>,
 	requests: Vec<T>,
 	answered: usize,
 }
 
-impl<T> Requests<T> {
+impl<T> Batch<T> {
 	/// Get access to the underlying slice of requests.
 	// TODO: unimplemented -> Vec<Request>, // do we _have to_ allocate?
 	pub fn requests(&self) -> &[T] { &self.requests }
@@ -94,10 +94,10 @@ impl<T> Requests<T> {
 	}
 
 	/// Map requests from one type into another.
-	pub fn map_requests<F, U>(self, f: F) -> Requests<U>
+	pub fn map_requests<F, U>(self, f: F) -> Batch<U>
 		where F: FnMut(T) -> U, U: IncompleteRequest
 	{
-		Requests {
+		Batch {
 			outputs: self.outputs,
 			requests: self.requests.into_iter().map(f).collect(),
 			answered: self.answered,
@@ -105,7 +105,7 @@ impl<T> Requests<T> {
 	}
 }
 
-impl<T: IncompleteRequest + Clone> Requests<T> {
+impl<T: IncompleteRequest + Clone> Batch<T> {
 	/// Get the next request as a filled request. Returns `None` when all requests answered.
 	pub fn next_complete(&self) -> Option<T::Complete> {
 		if self.is_complete() {
@@ -113,7 +113,7 @@ impl<T: IncompleteRequest + Clone> Requests<T> {
 		} else {
 			Some(self.requests[self.answered].clone()
 				.complete()
-				.expect("All outputs checked as invariant of `Requests` object; qed"))
+				.expect("All outputs checked as invariant of `Batch` object; qed"))
 		}
 	}
 
@@ -149,7 +149,7 @@ impl<T: IncompleteRequest + Clone> Requests<T> {
 	}
 }
 
-impl<T: super::CheckedRequest + Clone> Requests<T> {
+impl<T: super::CheckedRequest + Clone> Batch<T> {
 	/// Supply a response for the next request.
 	/// Fails on: wrong request kind, all requests answered already.
 	pub fn supply_response(&mut self, env: &T::Environment, response: &T::Response)
@@ -170,7 +170,7 @@ impl<T: super::CheckedRequest + Clone> Requests<T> {
 	}
 }
 
-impl Requests<super::Request> {
+impl Batch<super::Request> {
 	/// For each request, produce a response.
 	/// The responses vector produced goes up to the point where the responder
 	/// first returns `None`, an invalid response, or until all requests have been responded to.
@@ -193,7 +193,7 @@ impl Requests<super::Request> {
 	}
 }
 
-impl<T: IncompleteRequest> Deref for Requests<T> {
+impl<T: IncompleteRequest> Deref for Batch<T> {
 	type Target = [T];
 
 	fn deref(&self) -> &[T] {
@@ -201,7 +201,7 @@ impl<T: IncompleteRequest> Deref for Requests<T> {
 	}
 }
 
-impl<T: IncompleteRequest> DerefMut for Requests<T> {
+impl<T: IncompleteRequest> DerefMut for Batch<T> {
 	fn deref_mut(&mut self) -> &mut [T] {
 		&mut self.requests[..]
 	}
@@ -210,12 +210,12 @@ impl<T: IncompleteRequest> DerefMut for Requests<T> {
 #[cfg(test)]
 mod tests {
 	use request::*;
-	use super::RequestBuilder;
-	use util::H256;
+	use super::Builder;
+	use ethereum_types::H256;
 
 	#[test]
 	fn all_scalar() {
-		let mut builder = RequestBuilder::default();
+		let mut builder = Builder::default();
 		builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
 			num: 100.into(),
 		})).unwrap();
@@ -227,7 +227,7 @@ mod tests {
 	#[test]
 	#[should_panic]
 	fn missing_backref() {
-		let mut builder = RequestBuilder::default();
+		let mut builder = Builder::default();
 		builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
 			num: Field::BackReference(100, 3),
 		})).unwrap();
@@ -236,7 +236,7 @@ mod tests {
 	#[test]
 	#[should_panic]
 	fn wrong_kind() {
-		let mut builder = RequestBuilder::default();
+		let mut builder = Builder::default();
 		assert!(builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
 			num: 100.into(),
 		})).is_ok());
@@ -247,7 +247,7 @@ mod tests {
 
 	#[test]
 	fn good_backreference() {
-		let mut builder = RequestBuilder::default();
+		let mut builder = Builder::default();
 		builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
 			num: 100.into(), // header proof puts hash at output 0.
 		})).unwrap();
diff --git a/ethcore/light/src/types/request/mod.rs b/ethcore/light/src/types/request/mod.rs
index 51f916b15117dcd194b68b133f53415d73979ce9..bd68c6a0a20dec74f5bda3dd846832252f3272f5 100644
--- a/ethcore/light/src/types/request/mod.rs
+++ b/ethcore/light/src/types/request/mod.rs
@@ -17,9 +17,9 @@
 //! Light protocol request types.
 
 use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
-use util::H256;
+use ethereum_types::H256;
 
-mod builder;
+mod batch;
 
 // re-exports of request types.
 pub use self::header::{
@@ -67,8 +67,13 @@ pub use self::execution::{
 	Incomplete as IncompleteExecutionRequest,
 	Response as ExecutionResponse,
 };
+pub use self::epoch_signal::{
+	Complete as CompleteSignalRequest,
+	Incomplete as IncompleteSignalRequest,
+	Response as SignalResponse,
+};
 
-pub use self::builder::{RequestBuilder, Requests};
+pub use self::batch::{Batch, Builder};
 
 /// Error indicating a reference to a non-existent or wrongly-typed output.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -199,7 +204,6 @@ pub enum OutputKind {
 
 /// Either a hash or a number.
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub enum HashOrNumber {
 	/// Block hash variant.
 	Hash(H256),
@@ -236,7 +240,7 @@ impl Encodable for HashOrNumber {
 }
 
 /// Type alias for "network requests".
-pub type NetworkRequests = Requests<Request>;
+pub type NetworkRequests = Batch<Request>;
 
 /// All request types, as they're sent over the network.
 /// They may be incomplete, with back-references to outputs
@@ -261,6 +265,8 @@ pub enum Request {
 	Code(IncompleteCodeRequest),
 	/// A request for proof of execution,
 	Execution(IncompleteExecutionRequest),
+	/// A request for an epoch signal.
+	Signal(IncompleteSignalRequest),
 }
 
 /// All request types, in an answerable state.
@@ -284,6 +290,8 @@ pub enum CompleteRequest {
 	Code(CompleteCodeRequest),
 	/// A request for proof of execution,
 	Execution(CompleteExecutionRequest),
+	/// A request for an epoch signal.
+	Signal(CompleteSignalRequest),
 }
 
 impl CompleteRequest {
@@ -299,6 +307,7 @@ impl CompleteRequest {
 			CompleteRequest::Storage(_) => Kind::Storage,
 			CompleteRequest::Code(_) => Kind::Code,
 			CompleteRequest::Execution(_) => Kind::Execution,
+			CompleteRequest::Signal(_) => Kind::Signal,
 		}
 	}
 }
@@ -316,6 +325,7 @@ impl Request {
 			Request::Storage(_) => Kind::Storage,
 			Request::Code(_) => Kind::Code,
 			Request::Execution(_) => Kind::Execution,
+			Request::Signal(_) => Kind::Signal,
 		}
 	}
 }
@@ -332,6 +342,7 @@ impl Decodable for Request {
 			Kind::Storage => Ok(Request::Storage(rlp.val_at(1)?)),
 			Kind::Code => Ok(Request::Code(rlp.val_at(1)?)),
 			Kind::Execution => Ok(Request::Execution(rlp.val_at(1)?)),
+			Kind::Signal => Ok(Request::Signal(rlp.val_at(1)?)),
 		}
 	}
 }
@@ -353,6 +364,7 @@ impl Encodable for Request {
 			Request::Storage(ref req) => s.append(req),
 			Request::Code(ref req) => s.append(req),
 			Request::Execution(ref req) => s.append(req),
+			Request::Signal(ref req) => s.append(req),
 		};
 	}
 }
@@ -374,6 +386,7 @@ impl IncompleteRequest for Request {
 			Request::Storage(ref req) => req.check_outputs(f),
 			Request::Code(ref req) => req.check_outputs(f),
 			Request::Execution(ref req) => req.check_outputs(f),
+			Request::Signal(ref req) => req.check_outputs(f),
 		}
 	}
 
@@ -388,6 +401,7 @@ impl IncompleteRequest for Request {
 			Request::Storage(ref req) => req.note_outputs(f),
 			Request::Code(ref req) => req.note_outputs(f),
 			Request::Execution(ref req) => req.note_outputs(f),
+			Request::Signal(ref req) => req.note_outputs(f),
 		}
 	}
 
@@ -402,6 +416,7 @@ impl IncompleteRequest for Request {
 			Request::Storage(ref mut req) => req.fill(oracle),
 			Request::Code(ref mut req) => req.fill(oracle),
 			Request::Execution(ref mut req) => req.fill(oracle),
+			Request::Signal(ref mut req) => req.fill(oracle),
 		}
 	}
 
@@ -416,6 +431,7 @@ impl IncompleteRequest for Request {
 			Request::Storage(req) => req.complete().map(CompleteRequest::Storage),
 			Request::Code(req) => req.complete().map(CompleteRequest::Code),
 			Request::Execution(req) => req.complete().map(CompleteRequest::Execution),
+			Request::Signal(req) => req.complete().map(CompleteRequest::Signal),
 		}
 	}
 
@@ -430,6 +446,7 @@ impl IncompleteRequest for Request {
 			Request::Storage(ref mut req) => req.adjust_refs(mapping),
 			Request::Code(ref mut req) => req.adjust_refs(mapping),
 			Request::Execution(ref mut req) => req.adjust_refs(mapping),
+			Request::Signal(ref mut req) => req.adjust_refs(mapping),
 		}
 	}
 }
@@ -471,6 +488,8 @@ pub enum Kind {
 	Code = 7,
 	/// A request for transaction execution + state proof.
 	Execution = 8,
+	/// A request for epoch transition signal.
+	Signal = 9,
 }
 
 impl Decodable for Kind {
@@ -485,6 +504,7 @@ impl Decodable for Kind {
 			6 => Ok(Kind::Storage),
 			7 => Ok(Kind::Code),
 			8 => Ok(Kind::Execution),
+			9 => Ok(Kind::Signal),
 			_ => Err(DecoderError::Custom("Unknown PIP request ID.")),
 		}
 	}
@@ -517,6 +537,8 @@ pub enum Response {
 	Code(CodeResponse),
 	/// A response for proof of execution,
 	Execution(ExecutionResponse),
+	/// A response for epoch change signal.
+	Signal(SignalResponse),
 }
 
 impl ResponseLike for Response {
@@ -532,6 +554,7 @@ impl ResponseLike for Response {
 			Response::Storage(ref res) => res.fill_outputs(f),
 			Response::Code(ref res) => res.fill_outputs(f),
 			Response::Execution(ref res) => res.fill_outputs(f),
+			Response::Signal(ref res) => res.fill_outputs(f),
 		}
 	}
 }
@@ -549,6 +572,7 @@ impl Response {
 			Response::Storage(_) => Kind::Storage,
 			Response::Code(_) => Kind::Code,
 			Response::Execution(_) => Kind::Execution,
+			Response::Signal(_) => Kind::Signal,
 		}
 	}
 }
@@ -565,6 +589,7 @@ impl Decodable for Response {
 			Kind::Storage => Ok(Response::Storage(rlp.val_at(1)?)),
 			Kind::Code => Ok(Response::Code(rlp.val_at(1)?)),
 			Kind::Execution => Ok(Response::Execution(rlp.val_at(1)?)),
+			Kind::Signal => Ok(Response::Signal(rlp.val_at(1)?)),
 		}
 	}
 }
@@ -586,6 +611,7 @@ impl Encodable for Response {
 			Response::Storage(ref res) => s.append(res),
 			Response::Code(ref res) => s.append(res),
 			Response::Execution(ref res) => s.append(res),
+			Response::Signal(ref res) => s.append(res),
 		};
 	}
 }
@@ -760,7 +786,8 @@ pub mod header {
 pub mod header_proof {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
-	use util::{Bytes, U256, H256};
+	use ethereum_types::{H256, U256};
+	use bytes::Bytes;
 
 	/// Potentially incomplete header proof request.
 	#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -854,7 +881,7 @@ pub mod header_proof {
 /// Request and response for transaction index.
 pub mod transaction_index {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use util::H256;
+	use ethereum_types::H256;
 
 	/// Potentially incomplete transaction index request.
 	#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -932,7 +959,7 @@ pub mod transaction_index {
 pub mod block_receipts {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
 	use ethcore::receipt::Receipt;
-	use util::H256;
+	use ethereum_types::H256;
 
 	/// Potentially incomplete block receipts request.
 	#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -1001,7 +1028,7 @@ pub mod block_body {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
 	use ethcore::encoded;
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
-	use util::H256;
+	use ethereum_types::H256;
 
 	/// Potentially incomplete block body request.
 	#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -1067,7 +1094,7 @@ pub mod block_body {
 	impl Decodable for Response {
 		fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
 			use ethcore::header::Header as FullHeader;
-			use ethcore::transaction::UnverifiedTransaction;
+			use transaction::UnverifiedTransaction;
 
 			// check body validity.
 			let _: Vec<UnverifiedTransaction> = rlp.list_at(0)?;
@@ -1089,7 +1116,8 @@ pub mod block_body {
 /// A request for an account proof.
 pub mod account {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use util::{Bytes, U256, H256};
+	use ethereum_types::{H256, U256};
+	use bytes::Bytes;
 
 	/// Potentially incomplete request for an account proof.
 	#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -1188,7 +1216,8 @@ pub mod account {
 /// A request for a storage proof.
 pub mod storage {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use util::{Bytes, H256};
+	use ethereum_types::H256;
+	use bytes::Bytes;
 
 	/// Potentially incomplete request for an storage proof.
 	#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -1296,7 +1325,8 @@ pub mod storage {
 /// A request for contract code.
 pub mod contract_code {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use util::{Bytes, H256};
+	use ethereum_types::H256;
+	use bytes::Bytes;
 
 	/// Potentially incomplete contract code request.
 	#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -1380,9 +1410,11 @@ pub mod contract_code {
 /// A request for proof of execution.
 pub mod execution {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use ethcore::transaction::Action;
+	use transaction::Action;
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
-	use util::{Bytes, Address, U256, H256, DBValue};
+	use ethereum_types::{H256, U256, Address};
+	use kvdb::DBValue;
+	use bytes::Bytes;
 
 	/// Potentially incomplete execution proof request.
 	#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -1501,6 +1533,105 @@ pub mod execution {
 	}
 }
 
+/// A request for epoch signal data.
+pub mod epoch_signal {
+	use super::{Field, NoSuchOutput, OutputKind, Output};
+	use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
+	use ethereum_types::H256;
+	use bytes::Bytes;
+
+	/// Potentially incomplete epoch signal request.
+	#[derive(Debug, Clone, PartialEq, Eq)]
+	pub struct Incomplete {
+		/// The block hash to request the signal for.
+		pub block_hash: Field<H256>,
+	}
+
+	impl Decodable for Incomplete {
+		fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+			Ok(Incomplete {
+				block_hash: rlp.val_at(0)?,
+			})
+		}
+	}
+
+	impl Encodable for Incomplete {
+		fn rlp_append(&self, s: &mut RlpStream) {
+			s.begin_list(1).append(&self.block_hash);
+		}
+	}
+
+	impl super::IncompleteRequest for Incomplete {
+		type Complete = Complete;
+		type Response = Response;
+
+		fn check_outputs<F>(&self, mut f: F) -> Result<(), NoSuchOutput>
+			where F: FnMut(usize, usize, OutputKind) -> Result<(), NoSuchOutput>
+		{
+			if let Field::BackReference(req, idx) = self.block_hash {
+				f(req, idx, OutputKind::Hash)?;
+			}
+
+			Ok(())
+		}
+
+		fn note_outputs<F>(&self, _: F) where F: FnMut(usize, OutputKind) {}
+
+		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
+			if let Field::BackReference(req, idx) = self.block_hash {
+				self.block_hash = match oracle(req, idx) {
+					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash.into()),
+					_ => Field::BackReference(req, idx),
+				}
+			}
+		}
+
+		fn complete(self) -> Result<Self::Complete, NoSuchOutput> {
+			Ok(Complete {
+				block_hash: self.block_hash.into_scalar()?,
+			})
+		}
+
+		fn adjust_refs<F>(&mut self, mut mapping: F) where F: FnMut(usize) -> usize {
+			self.block_hash.adjust_req(&mut mapping);
+		}
+	}
+
+	/// A complete request.
+	#[derive(Debug, Clone, PartialEq, Eq)]
+	pub struct Complete {
+		/// The block hash to request the epoch signal for.
+		pub block_hash: H256,
+	}
+
+	/// The output of a request for an epoch signal.
+	#[derive(Debug, Clone, PartialEq, Eq)]
+	pub struct Response {
+		/// The requested epoch signal.
+		pub signal: Bytes,
+	}
+
+	impl super::ResponseLike for Response {
+		/// Fill reusable outputs by providing them to the function.
+		fn fill_outputs<F>(&self, _: F) where F: FnMut(usize, Output) {}
+	}
+
+	impl Decodable for Response {
+		fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+
+			Ok(Response {
+				signal: rlp.as_val()?,
+			})
+		}
+	}
+
+	impl Encodable for Response {
+		fn rlp_append(&self, s: &mut RlpStream) {
+			s.append(&self.signal);
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -1591,7 +1722,7 @@ mod tests {
 		let full_req = Request::TransactionIndex(req.clone());
 		let res = TransactionIndexResponse {
 			num: 1000,
-			hash: ::util::H256::random(),
+			hash: ::ethereum_types::H256::random(),
 			index: 4,
 		};
 		let full_res = Response::TransactionIndex(res.clone());
@@ -1604,13 +1735,15 @@ mod tests {
 
 	#[test]
 	fn receipts_roundtrip() {
+		use ethcore::receipt::{Receipt, TransactionOutcome};
 		let req = IncompleteReceiptsRequest {
 			hash: Field::Scalar(Default::default()),
 		};
 
 		let full_req = Request::Receipts(req.clone());
+		let receipt = Receipt::new(TransactionOutcome::Unknown, Default::default(), Vec::new());
 		let res = ReceiptsResponse {
-			receipts: vec![Default::default(), Default::default()],
+			receipts: vec![receipt.clone(), receipt],
 		};
 		let full_res = Response::Receipts(res.clone());
 
@@ -1622,7 +1755,7 @@ mod tests {
 
 	#[test]
 	fn body_roundtrip() {
-		use ethcore::transaction::{Transaction, UnverifiedTransaction};
+		use transaction::{Transaction, UnverifiedTransaction};
 		let req = IncompleteBodyRequest {
 			hash: Field::Scalar(Default::default()),
 		};
@@ -1712,12 +1845,12 @@ mod tests {
 
 	#[test]
 	fn execution_roundtrip() {
-		use util::DBValue;
+		use kvdb::DBValue;
 
 		let req = IncompleteExecutionRequest {
 			block_hash: Field::Scalar(Default::default()),
 			from: Default::default(),
-			action: ::ethcore::transaction::Action::Create,
+			action: ::transaction::Action::Create,
 			gas: 100_000.into(),
 			gas_price: 0.into(),
 			value: 100_000_001.into(),
@@ -1747,7 +1880,7 @@ mod tests {
 		let reqs: Vec<_> = (0..10).map(|_| IncompleteExecutionRequest {
 			block_hash: Field::Scalar(Default::default()),
 			from: Default::default(),
-			action: ::ethcore::transaction::Action::Create,
+			action: ::transaction::Action::Create,
 			gas: 100_000.into(),
 			gas_price: 0.into(),
 			value: 100_000_001.into(),
@@ -1765,6 +1898,7 @@ mod tests {
 
 	#[test]
 	fn responses_vec() {
+		use ethcore::receipt::{Receipt, TransactionOutcome};
 		let mut stream = RlpStream::new_list(2);
 				stream.begin_list(0).begin_list(0);
 
@@ -1772,7 +1906,7 @@ mod tests {
 		let reqs = vec![
 			Response::Headers(HeadersResponse { headers: vec![] }),
 			Response::HeaderProof(HeaderProofResponse { proof: vec![], hash: Default::default(), td: 100.into()}),
-			Response::Receipts(ReceiptsResponse { receipts: vec![Default::default()] }),
+			Response::Receipts(ReceiptsResponse { receipts: vec![Receipt::new(TransactionOutcome::Unknown, Default::default(), Vec::new())] }),
 			Response::Body(BodyResponse { body: body }),
 			Response::Account(AccountResponse {
 				proof: vec![],
@@ -1789,4 +1923,22 @@ mod tests {
 		let raw = ::rlp::encode_list(&reqs);
 		assert_eq!(::rlp::decode_list::<Response>(&raw), reqs);
 	}
+
+	#[test]
+	fn epoch_signal_roundtrip() {
+		let req = IncompleteSignalRequest {
+			block_hash: Field::Scalar(Default::default()),
+		};
+
+		let full_req = Request::Signal(req.clone());
+		let res = SignalResponse {
+			signal: vec![1, 2, 3, 4, 5, 6, 7, 6, 5, 4],
+		};
+		let full_res = Response::Signal(res.clone());
+
+		check_roundtrip(req);
+		check_roundtrip(full_req);
+		check_roundtrip(res);
+		check_roundtrip(full_res);
+	}
 }
diff --git a/ethcore/migrations/Cargo.toml b/ethcore/migrations/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..561925be4c5a23f2e0a5d46ebb18fa5b40971e2e
--- /dev/null
+++ b/ethcore/migrations/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ethcore-migrations"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+migration = { path = "../../util/migration" }
diff --git a/ethcore/src/migrations/mod.rs b/ethcore/migrations/src/lib.rs
similarity index 86%
rename from ethcore/src/migrations/mod.rs
rename to ethcore/migrations/src/lib.rs
index 76b10fd1915c3608874e9468597deb7625ab396b..429c39102cb305adb184bffe35c7818c3a758ff4 100644
--- a/ethcore/src/migrations/mod.rs
+++ b/ethcore/migrations/src/lib.rs
@@ -16,18 +16,9 @@
 
 //! Database migrations.
 
-use util::migration::ChangeColumns;
+extern crate migration;
 
-pub mod state;
-pub mod blocks;
-pub mod extras;
-
-mod v9;
-pub use self::v9::ToV9;
-pub use self::v9::Extract;
-
-mod v10;
-pub use self::v10::ToV10;
+use migration::ChangeColumns;
 
 /// The migration from v10 to v11.
 /// Adds a column for node info.
diff --git a/ethcore/native_contracts/Cargo.toml b/ethcore/native_contracts/Cargo.toml
deleted file mode 100644
index 2f91a4848674ad1e1a4c18b84aaea80bf589d999..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "native-contracts"
-description = "Generated Rust code for Ethereum contract ABIs"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[dependencies]
-ethabi = "2.0"
-futures = "0.1"
-byteorder = "1.0"
-ethcore-bigint = { path = "../../util/bigint" }
-
-[build-dependencies]
-native-contract-generator = { path = "generator" }
-
-[features]
-default = []
-test_contracts = []
diff --git a/ethcore/native_contracts/build.rs b/ethcore/native_contracts/build.rs
deleted file mode 100644
index e7985b3880b2a0a0d6a0c10f45fc1f113c35cb84..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/build.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate native_contract_generator;
-
-use std::path::Path;
-use std::fs::File;
-use std::io::Write;
-
-// TODO: just walk the "res" directory and generate whole crate automatically.
-const KEY_SERVER_SET_ABI: &'static str = include_str!("res/key_server_set.json");
-const REGISTRY_ABI: &'static str = include_str!("res/registrar.json");
-const URLHINT_ABI: &'static str = include_str!("res/urlhint.json");
-const SERVICE_TRANSACTION_ABI: &'static str = include_str!("res/service_transaction.json");
-const SECRETSTORE_ACL_STORAGE_ABI: &'static str = include_str!("res/secretstore_acl_storage.json");
-const VALIDATOR_SET_ABI: &'static str = include_str!("res/validator_set.json");
-const VALIDATOR_REPORT_ABI: &'static str = include_str!("res/validator_report.json");
-const PEER_SET_ABI: &'static str = include_str!("res/peer_set.json");
-
-const TEST_VALIDATOR_SET_ABI: &'static str = include_str!("res/test_validator_set.json");
-
-fn build_file(name: &str, abi: &str, filename: &str) {
-	let code = ::native_contract_generator::generate_module(name, abi).unwrap();
-
-	let out_dir = ::std::env::var("OUT_DIR").unwrap();
-	let dest_path = Path::new(&out_dir).join(filename);
-	let mut f = File::create(&dest_path).unwrap();
-
-	f.write_all(code.as_bytes()).unwrap();
-}
-
-fn build_test_contracts() {
-	build_file("ValidatorSet", TEST_VALIDATOR_SET_ABI, "test_validator_set.rs");
-}
-
-fn main() {
-	build_file("KeyServerSet", KEY_SERVER_SET_ABI, "key_server_set.rs");
-	build_file("Registry", REGISTRY_ABI, "registry.rs");
-	build_file("Urlhint", URLHINT_ABI, "urlhint.rs");
-	build_file("ServiceTransactionChecker", SERVICE_TRANSACTION_ABI, "service_transaction.rs");
-	build_file("SecretStoreAclStorage", SECRETSTORE_ACL_STORAGE_ABI, "secretstore_acl_storage.rs");
-	build_file("ValidatorSet", VALIDATOR_SET_ABI, "validator_set.rs");
-	build_file("ValidatorReport", VALIDATOR_REPORT_ABI, "validator_report.rs");
-	build_file("PeerSet", PEER_SET_ABI, "peer_set.rs");
-
-	build_test_contracts();
-}
diff --git a/ethcore/native_contracts/generator/Cargo.toml b/ethcore/native_contracts/generator/Cargo.toml
deleted file mode 100644
index a599e756eba039cc3f36d650ccdccb7bdd614c84..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/generator/Cargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "native-contract-generator"
-description = "Generates Rust code for ethereum contract ABIs"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-ethabi = "2.0"
-heck = "0.2"
diff --git a/ethcore/native_contracts/generator/src/lib.rs b/ethcore/native_contracts/generator/src/lib.rs
deleted file mode 100644
index 996ee496926e5ad5bab2ab3ec4e111ecd3e517de..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/generator/src/lib.rs
+++ /dev/null
@@ -1,358 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Rust code contract generator.
-//! The code generated will require a dependence on the `ethcore-bigint::prelude`,
-//! `ethabi`, `byteorder`, and `futures` crates.
-//! This currently isn't hygienic, so compilation of generated code may fail
-//! due to missing crates or name collisions. This will change when
-//! it can be ported to a procedural macro.
-
-use ethabi::Contract;
-use ethabi::spec::{Interface, ParamType, Error as AbiError};
-use heck::SnakeCase;
-
-extern crate ethabi;
-extern crate heck;
-
-/// Errors in generation.
-#[derive(Debug)]
-pub enum Error {
-	/// Bad ABI.
-	Abi(AbiError),
-	/// Unsupported parameter type in given function.
-	UnsupportedType(String, ParamType),
-}
-
-/// Given an ABI string, generate code for a a Rust module containing
-/// a struct which can be used to call it.
-// TODO: make this a proc macro when that's possible.
-pub fn generate_module(struct_name: &str, abi: &str) -> Result<String, Error> {
-	let contract = Contract::new(Interface::load(abi.as_bytes()).map_err(Error::Abi)?);
-	let functions = generate_functions(&contract)?;
-
-	Ok(format!(r##"
-use byteorder::{{BigEndian, ByteOrder}};
-use futures::{{future, Future, IntoFuture, BoxFuture}};
-use ethabi::{{Contract, Interface, Token, Event}};
-use bigint;
-
-/// Generated Rust bindings to an Ethereum contract.
-#[derive(Clone, Debug)]
-pub struct {name} {{
-	contract: Contract,
-	/// Address to make calls to.
-	pub address: bigint::prelude::H160,
-}}
-
-const ABI: &'static str = r#"{abi_str}"#;
-
-impl {name} {{
-	/// Create a new instance of `{name}` with an address.
-	/// Calls can be made, given a callback for dispatching calls asynchronously.
-	pub fn new(address: bigint::prelude::H160) -> Self {{
-		let contract = Contract::new(Interface::load(ABI.as_bytes())
-			.expect("ABI checked at generation-time; qed"));
-		{name} {{
-			contract: contract,
-			address: address,
-		}}
-	}}
-
-	/// Access the underlying `ethabi` contract.
-	pub fn contract(this: &Self) -> &Contract {{
-		&this.contract
-	}}
-
-	{functions}
-}}
-"##,
-		name = struct_name,
-		abi_str = abi,
-		functions = functions,
-	))
-}
-
-// generate function bodies from the ABI.
-fn generate_functions(contract: &Contract) -> Result<String, Error> {
-	let mut functions = String::new();
-	for function in contract.functions() {
-		let name = function.name();
-		let snake_name = name.to_snake_case();
-		let inputs = function.input_params();
-		let outputs = function.output_params();
-
-		let (input_params, to_tokens) = input_params_codegen(&inputs)
-			.map_err(|bad_type| Error::UnsupportedType(name.into(), bad_type))?;
-
-		let (output_type, decode_outputs) = output_params_codegen(&outputs)
-			.map_err(|bad_type| Error::UnsupportedType(name.into(), bad_type))?;
-
-		functions.push_str(&format!(r##"
-/// Call the function "{abi_name}" on the contract.
-///
-/// Inputs: {abi_inputs:?}
-/// Outputs: {abi_outputs:?}
-pub fn {snake_name}<F, U>(&self, call: F, {params}) -> BoxFuture<{output_type}, String>
-	where
-	    F: FnOnce(bigint::prelude::H160, Vec<u8>) -> U,
-	    U: IntoFuture<Item=Vec<u8>, Error=String>,
-		U::Future: Send + 'static
-{{
-	let function = self.contract.function(r#"{abi_name}"#)
-		.expect("function existence checked at compile-time; qed");
-	let call_addr = self.address;
-
-	let call_future = match function.encode_call({to_tokens}) {{
-		Ok(call_data) => (call)(call_addr, call_data),
-		Err(e) => return future::err(format!("Error encoding call: {{:?}}", e)).boxed(),
-	}};
-
-	call_future
-		.into_future()
-		.and_then(move |out| function.decode_output(out).map_err(|e| format!("{{:?}}", e)))
-		.map(Vec::into_iter)
-		.and_then(|mut outputs| {decode_outputs})
-		.boxed()
-}}
-	"##,
-		abi_name = name,
-		abi_inputs = inputs,
-		abi_outputs = outputs,
-		snake_name = snake_name,
-		params = input_params,
-		output_type = output_type,
-		to_tokens = to_tokens,
-		decode_outputs = decode_outputs,
-		))
-	}
-
-	Ok(functions)
-}
-
-// generate code for params in function signature and turning them into tokens.
-//
-// two pieces of code are generated: the first gives input types for the function signature,
-// and the second gives code to tokenize those inputs.
-//
-// params of form `param_0: type_0, param_1: type_1, ...`
-// tokenizing code of form `{let mut tokens = Vec::new(); tokens.push({param_X}); tokens }`
-//
-// returns any unsupported param type encountered.
-fn input_params_codegen(inputs: &[ParamType]) -> Result<(String, String), ParamType> {
-	let mut params = String::new();
-	let mut to_tokens = "{ let mut tokens = Vec::new();".to_string();
-
-	for (index, param_type) in inputs.iter().enumerate() {
-		let param_name = format!("param_{}", index);
-		let rust_type = rust_type(param_type.clone())?;
-		let (needs_mut, tokenize_code) = tokenize(&param_name, param_type.clone());
-
-		params.push_str(&format!("{}{}: {}, ",
-			if needs_mut { "mut " } else { "" }, param_name, rust_type));
-
-		to_tokens.push_str(&format!("tokens.push({{ {} }});", tokenize_code));
-	}
-
-	to_tokens.push_str(" tokens }");
-	Ok((params, to_tokens))
-}
-
-// generate code for outputs of the function and detokenizing them.
-//
-// two pieces of code are generated: the first gives an output type for the function signature
-// as a tuple, and the second gives code to get that tuple from a deque of tokens.
-//
-// produce output type of the form (type_1, type_2, ...) without trailing comma.
-// produce code for getting this output type from `outputs: Vec<Token>::IntoIter`, where
-// an `Err(String)` can be returned.
-//
-// returns any unsupported param type encountered.
-fn output_params_codegen(outputs: &[ParamType]) -> Result<(String, String), ParamType> {
-	let mut output_type = "(".to_string();
-	let mut decode_outputs = "Ok((".to_string();
-
-	for (index, output) in outputs.iter().cloned().enumerate() {
-		let rust_type = rust_type(output.clone())?;
-
-		output_type.push_str(&rust_type);
-
-		decode_outputs.push_str(&format!(
-			r#"
-				outputs
-					.next()
-					.and_then(|output| {{ {} }})
-					.ok_or_else(|| "Wrong output type".to_string())?
-			"#,
-			detokenize("output", output)
-		));
-
-		// don't append trailing commas for the last element
-		// so we can reuse the same code for single-output contracts,
-		// since T == (T) != (T,)
-		if index < outputs.len() - 1 {
-			output_type.push_str(", ");
-			decode_outputs.push_str(", ");
-		}
-	}
-
-	output_type.push_str(")");
-	decode_outputs.push_str("))");
-	Ok((output_type, decode_outputs))
-}
-
-// create code for an argument type from param type.
-fn rust_type(input: ParamType) -> Result<String, ParamType> {
-	Ok(match input {
-		ParamType::Address => "bigint::prelude::H160".into(),
-		ParamType::FixedBytes(len) if len <= 32 => format!("bigint::prelude::H{}", len * 8),
-		ParamType::Bytes | ParamType::FixedBytes(_) => "Vec<u8>".into(),
-		ParamType::Int(width) => match width {
-			8 | 16 | 32 | 64 => format!("i{}", width),
-			_ => return Err(ParamType::Int(width)),
-		},
-		ParamType::Uint(width) => match width {
-			8 | 16 | 32 | 64 => format!("u{}", width),
-			128 | 160 | 256 => format!("bigint::prelude::U{}", width),
-			_ => return Err(ParamType::Uint(width)),
-		},
-		ParamType::Bool => "bool".into(),
-		ParamType::String => "String".into(),
-		ParamType::Array(kind) => format!("Vec<{}>", rust_type(*kind)?),
-		other => return Err(other),
-	})
-}
-
-// create code for tokenizing this parameter.
-// returns (needs_mut, code), where needs_mut indicates mutability required.
-// panics on unsupported types.
-fn tokenize(name: &str, input: ParamType) -> (bool, String) {
-	let mut needs_mut = false;
-	let code = match input {
-		ParamType::Address => format!("Token::Address({}.0)", name),
-		ParamType::Bytes => format!("Token::Bytes({})", name),
-		ParamType::FixedBytes(len) if len <= 32 =>
-			format!("Token::FixedBytes({}.0.to_vec())", name),
-		ParamType::FixedBytes(len) => {
-			needs_mut = true;
-			format!("{}.resize({}, 0); Token::FixedBytes({})", name, len, name)
-		}
-		ParamType::Int(width) => match width {
-			8 => format!("let mut r = [0xff; 32]; r[31] = {}; Token::Int(r)", name),
-			16 | 32 | 64 =>
-				format!("let mut r = [0xff; 32]; BigEndian::write_i{}(&mut r[{}..], {}); Token::Int(r))",
-					width, 32 - (width / 8), name),
-			_ => panic!("Signed int with more than 64 bits not supported."),
-		},
-		ParamType::Uint(width) => format!(
-			"let mut r = [0; 32]; {}.to_big_endian(&mut r); Token::Uint(r)",
-			if width <= 64 { format!("bigint::prelude::U256::from({} as u64)", name) }
-			else { format!("bigint::prelude::U256::from({})", name) }
-		),
-		ParamType::Bool => format!("Token::Bool({})", name),
-		ParamType::String => format!("Token::String({})", name),
-		ParamType::Array(kind) => {
-			let (needs_mut, code) = tokenize("i", *kind);
-			format!("Token::Array({}.into_iter().map(|{}i| {{ {} }}).collect())",
-				name, if needs_mut { "mut " } else { "" }, code)
-		}
-		ParamType::FixedArray(_, _) => panic!("Fixed-length arrays not supported."),
-	};
-
-	(needs_mut, code)
-}
-
-// create code for detokenizing this parameter.
-// takes an output type and the identifier of a token.
-// expands to code that evaluates to a Option<concrete type>
-// panics on unsupported types.
-fn detokenize(name: &str, output_type: ParamType) -> String {
-	match output_type {
-		ParamType::Address => format!("{}.to_address().map(bigint::prelude::H160)", name),
-		ParamType::Bytes => format!("{}.to_bytes()", name),
-		ParamType::FixedBytes(len) if len <= 32 => {
-			// ensure no panic on slice too small.
-			let read_hash = format!("b.resize({}, 0); bigint::prelude::H{}::from_slice(&b[..{}])",
-				len, len * 8, len);
-
-			format!("{}.to_fixed_bytes().map(|mut b| {{ {} }})",
-				name, read_hash)
-		}
-		ParamType::FixedBytes(_) => format!("{}.to_fixed_bytes()", name),
-		ParamType::Int(width) => {
-			let read_int = match width {
-				8 => "i[31] as i8".into(),
-				16 | 32 | 64 => format!("BigEndian::read_i{}(&i[{}..])", width, 32 - (width / 8)),
-				_ => panic!("Signed integers over 64 bytes not allowed."),
-			};
-			format!("{}.to_int().map(|i| {})", name, read_int)
-		}
-		ParamType::Uint(width) => {
-			let read_uint = match width {
-				8 | 16 | 32 | 64 => format!("bigint::prelude::U256(u).low_u64() as u{}", width),
-				_ => format!("bigint::prelude::U{}::from(&u[..])", width),
-			};
-
-			format!("{}.to_uint().map(|u| {})", name, read_uint)
-		}
-		ParamType::Bool => format!("{}.to_bool()", name),
-		ParamType::String => format!("{}.to_string()", name),
-		ParamType::Array(kind) => {
-			let read_array = format!("x.into_iter().map(|a| {{ {} }}).collect::<Option<Vec<_>>>()",
-				detokenize("a", *kind));
-
-			format!("{}.to_array().and_then(|x| {{ {} }})",
-				name, read_array)
-		}
-		ParamType::FixedArray(_, _) => panic!("Fixed-length arrays not supported.")
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use ethabi::spec::ParamType;
-
-	#[test]
-	fn input_types() {
-		assert_eq!(::input_params_codegen(&[]).unwrap().0, "");
-		assert_eq!(::input_params_codegen(&[ParamType::Address]).unwrap().0, "param_0: bigint::prelude::H160, ");
-		assert_eq!(::input_params_codegen(&[ParamType::Address, ParamType::Bytes]).unwrap().0,
-			"param_0: bigint::prelude::H160, param_1: Vec<u8>, ");
-	}
-
-	#[test]
-	fn output_types() {
-		assert_eq!(::output_params_codegen(&[]).unwrap().0, "()");
-		assert_eq!(::output_params_codegen(&[ParamType::Address]).unwrap().0, "(bigint::prelude::H160)");
-		assert_eq!(::output_params_codegen(&[ParamType::Address, ParamType::Array(Box::new(ParamType::Bytes))]).unwrap().0,
-			"(bigint::prelude::H160, Vec<Vec<u8>>)");
-	}
-
-	#[test]
-	fn rust_type() {
-		assert_eq!(::rust_type(ParamType::FixedBytes(32)).unwrap(), "bigint::prelude::H256");
-		assert_eq!(::rust_type(ParamType::Array(Box::new(ParamType::FixedBytes(32)))).unwrap(),
-			"Vec<bigint::prelude::H256>");
-
-		assert_eq!(::rust_type(ParamType::Uint(64)).unwrap(), "u64");
-		assert!(::rust_type(ParamType::Uint(63)).is_err());
-
-		assert_eq!(::rust_type(ParamType::Int(32)).unwrap(), "i32");
-		assert_eq!(::rust_type(ParamType::Uint(256)).unwrap(), "bigint::prelude::U256");
-	}
-
-	// codegen tests will need bootstrapping of some kind.
-}
diff --git a/ethcore/native_contracts/res/key_server_set.json b/ethcore/native_contracts/res/key_server_set.json
deleted file mode 100644
index 93f68837a7675bdffa356455e19818df8fbd35c9..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/res/key_server_set.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"keyServersList","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"keyServer","type":"address"}],"name":"getKeyServerPublic","outputs":[{"name":"","type":"bytes"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getKeyServers","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"keyServer","type":"address"}],"name":"getKeyServerAddress","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"keyServer","type":"address"}],"name":"removeKeyServer","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"keyServerPublic","type":"bytes"},{"name":"keyServerIp","type":"string"}],"name":"addKeyServer","outputs":[],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"keyServer","type":"address"}],"name":"KeyServerAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"keyServer","type":"address"}],"name":"KeyServerRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
\ No newline at end of file
diff --git a/ethcore/native_contracts/res/urlhint.json b/ethcore/native_contracts/res/urlhint.json
deleted file mode 100644
index 629f166bbb107739deea4d0f7634cd74246c3b18..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/res/urlhint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"},{"name":"_url","type":"string"}],"name":"hintURL","outputs":[],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"},{"name":"_accountSlashRepo","type":"string"},{"name":"_commit","type":"bytes20"}],"name":"hint","outputs":[],"type":"function"},
-	{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"entries","outputs":[{"name":"accountSlashRepo","type":"string"},{"name":"commit","type":"bytes20"},{"name":"owner","type":"address"}],"type":"function"},
-	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"}],"name":"unhint","outputs":[],"type":"function"}
-]
diff --git a/ethcore/native_contracts/src/key_server_set.rs b/ethcore/native_contracts/src/key_server_set.rs
deleted file mode 100644
index 60b137aae98fd497223843e7b4e9766617fe41ec..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/src/key_server_set.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(unused_mut, unused_variables, unused_imports)]
-
-//! Secret store Key Server set contract.
-
-include!(concat!(env!("OUT_DIR"), "/key_server_set.rs"));
diff --git a/ethcore/native_contracts/src/lib.rs b/ethcore/native_contracts/src/lib.rs
deleted file mode 100644
index 733dea80e6a3d29dc1a3b80f385118979e714000..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/src/lib.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Native contracts useful for Parity. These are type-safe wrappers
-//! autogenerated at compile-time from Ethereum ABIs, and can be instantiated
-//! given any closure which can dispatch calls to them asynchronously.
-
-extern crate futures;
-extern crate byteorder;
-extern crate ethabi;
-extern crate ethcore_bigint as bigint;
-
-mod key_server_set;
-mod registry;
-mod urlhint;
-mod service_transaction;
-mod secretstore_acl_storage;
-mod validator_set;
-mod validator_report;
-mod peer_set;
-
-pub mod test_contracts;
-
-pub use self::key_server_set::KeyServerSet;
-pub use self::registry::Registry;
-pub use self::urlhint::Urlhint;
-pub use self::service_transaction::ServiceTransactionChecker;
-pub use self::secretstore_acl_storage::SecretStoreAclStorage;
-pub use self::validator_set::ValidatorSet;
-pub use self::validator_report::ValidatorReport;
-pub use self::peer_set::PeerSet;
diff --git a/ethcore/native_contracts/src/peer_set.rs b/ethcore/native_contracts/src/peer_set.rs
deleted file mode 100644
index 09d0ecbb8d11e4d94e74d000d74be08b255a2a67..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/src/peer_set.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(unused_mut, unused_variables, unused_imports)]
-
-//! Peer set contract.
-
-include!(concat!(env!("OUT_DIR"), "/peer_set.rs"));
diff --git a/ethcore/native_contracts/src/registry.rs b/ethcore/native_contracts/src/registry.rs
deleted file mode 100644
index 3b3a6414d74ec7865004a675904b4c89b3f6eadb..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/src/registry.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(unused_mut, unused_variables, unused_imports)]
-
-//! Registrar contract: maps names to addresses and data.
-// TODO: testing.
-
-include!(concat!(env!("OUT_DIR"), "/registry.rs"));
diff --git a/ethcore/native_contracts/src/secretstore_acl_storage.rs b/ethcore/native_contracts/src/secretstore_acl_storage.rs
deleted file mode 100644
index 3ebfcfb750a4399480ba21889c2911f3c177beeb..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/src/secretstore_acl_storage.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(unused_mut, unused_variables, unused_imports)]
-
-//! Secret store ACL storage contract.
-// TODO: testing.
-
-include!(concat!(env!("OUT_DIR"), "/secretstore_acl_storage.rs"));
diff --git a/ethcore/native_contracts/src/service_transaction.rs b/ethcore/native_contracts/src/service_transaction.rs
deleted file mode 100644
index ee3b17552b9015e30449143aec8b2bbce8b8c2f9..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/src/service_transaction.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(unused_mut, unused_variables, unused_imports)]
-
-//! Service transaction contract.
-// TODO: testing.
-
-include!(concat!(env!("OUT_DIR"), "/service_transaction.rs"));
diff --git a/ethcore/native_contracts/src/test_contracts/mod.rs b/ethcore/native_contracts/src/test_contracts/mod.rs
deleted file mode 100644
index 44810b3b763180355f113cc9edb692926ef55d13..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/src/test_contracts/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Contracts used for testing.
-
-pub mod validator_set;
-
-pub use self::validator_set::ValidatorSet;
diff --git a/ethcore/native_contracts/src/test_contracts/validator_set.rs b/ethcore/native_contracts/src/test_contracts/validator_set.rs
deleted file mode 100644
index 8a63c90dd8e7992d856841e0ba6c1d89a505f69f..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/src/test_contracts/validator_set.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(unused_mut, unused_variables, unused_imports)]
-
-//! Test validator set contract.
-
-include!(concat!(env!("OUT_DIR"), "/test_validator_set.rs"));
diff --git a/ethcore/native_contracts/src/urlhint.rs b/ethcore/native_contracts/src/urlhint.rs
deleted file mode 100644
index d2085e5934d558b29bca157a4f85108b3a93f379..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/src/urlhint.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(unused_mut, unused_variables, unused_imports)]
-
-//! Registrar contract: maps names to arbitrary URL.
-// TODO: testing.
-
-include!(concat!(env!("OUT_DIR"), "/urlhint.rs"));
diff --git a/ethcore/native_contracts/src/validator_report.rs b/ethcore/native_contracts/src/validator_report.rs
deleted file mode 100644
index d77b07c716c7dcdaf5fe35a00c594bb2eaff5761..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/src/validator_report.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(unused_mut, unused_variables, unused_imports)]
-
-//! Validator reporting.
-// TODO: testing.
-
-include!(concat!(env!("OUT_DIR"), "/validator_report.rs"));
diff --git a/ethcore/native_contracts/src/validator_set.rs b/ethcore/native_contracts/src/validator_set.rs
deleted file mode 100644
index 0a69913e0ff615df8588fcda969e991a90ac4b2e..0000000000000000000000000000000000000000
--- a/ethcore/native_contracts/src/validator_set.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(unused_mut, unused_variables, unused_imports)]
-
-//! Validator set contract.
-// TODO: testing.
-
-include!(concat!(env!("OUT_DIR"), "/validator_set.rs"));
diff --git a/ethcore/node_filter/Cargo.toml b/ethcore/node_filter/Cargo.toml
index e885ef1d105727e5aabbdabb5782d5aec31902fb..c183853d151c52319884e286fde6bd0b9a646ead 100644
--- a/ethcore/node_filter/Cargo.toml
+++ b/ethcore/node_filter/Cargo.toml
@@ -3,14 +3,22 @@ description = "Parity smart network connections"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "node-filter"
-version = "1.8.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 ethcore = { path = ".."}
-ethcore-util = { path = "../../util" }
-ethcore-io = { path = "../../util/io" }
-ethcore-network = { path = "../../util/network" }
-native-contracts = { path = "../native_contracts" }
-futures = "0.1"
+ethcore-bytes = { path = "../../util/bytes" }
+ethcore-network-devp2p = { path = "../../util/network-devp2p" }
+ethereum-types = "0.2"
 log = "0.3"
+parking_lot = "0.5"
+ethabi = "5.1"
+ethabi-derive = "5.0"
+ethabi-contract = "5.0"
+lru-cache = "0.1"
+
+[dev-dependencies]
+kvdb-memorydb = { path = "../../util/kvdb-memorydb" }
+ethcore-io = { path = "../../util/io" }
+tempdir = "0.3"
diff --git a/ethcore/native_contracts/res/peer_set.json b/ethcore/node_filter/res/peer_set.json
similarity index 100%
rename from ethcore/native_contracts/res/peer_set.json
rename to ethcore/node_filter/res/peer_set.json
diff --git a/ethcore/node_filter/src/lib.rs b/ethcore/node_filter/src/lib.rs
index d3dcbaa3be051e83aa584cc9077501545d24e72b..945f552faf01faf15dc00a9dfd0513ec28631ddb 100644
--- a/ethcore/node_filter/src/lib.rs
+++ b/ethcore/node_filter/src/lib.rs
@@ -16,40 +16,57 @@
 
 //! Smart contract based node filter.
 
+extern crate ethabi;
 extern crate ethcore;
-extern crate ethcore_util as util;
-extern crate ethcore_network as network;
-extern crate native_contracts;
-extern crate futures;
-#[cfg(test)] extern crate ethcore_io as io;
-#[macro_use] extern crate log;
+extern crate ethcore_bytes as bytes;
+extern crate ethcore_network_devp2p as network;
+extern crate ethereum_types;
+extern crate lru_cache;
+extern crate parking_lot;
+
+#[macro_use]
+extern crate ethabi_derive;
+#[macro_use]
+extern crate ethabi_contract;
+#[cfg(test)]
+extern crate ethcore_io as io;
+#[cfg(test)]
+extern crate kvdb_memorydb;
+#[cfg(test)]
+extern crate tempdir;
+#[macro_use]
+extern crate log;
 
 use std::sync::Weak;
-use std::collections::HashMap;
-use native_contracts::PeerSet as Contract;
-use network::{NodeId, ConnectionFilter, ConnectionDirection};
+
+use lru_cache::LruCache;
+use parking_lot::Mutex;
+
+use bytes::Bytes;
 use ethcore::client::{BlockChainClient, BlockId, ChainNotify};
-use util::{Mutex, Address, H256, Bytes};
-use futures::Future;
+use ethereum_types::{H256, Address};
+use network::{NodeId, ConnectionFilter, ConnectionDirection};
+
+use_contract!(peer_set, "PeerSet", "res/peer_set.json");
 
 const MAX_CACHE_SIZE: usize = 4096;
 
 /// Connection filter that uses a contract to manage permissions.
 pub struct NodeFilter {
-	contract: Mutex<Option<Contract>>,
+	contract: peer_set::PeerSet,
 	client: Weak<BlockChainClient>,
 	contract_address: Address,
-	permission_cache: Mutex<HashMap<NodeId, bool>>,
+	permission_cache: Mutex<LruCache<NodeId, bool>>,
 }
 
 impl NodeFilter {
 	/// Create a new instance. Accepts a contract address.
 	pub fn new(client: Weak<BlockChainClient>, contract_address: Address) -> NodeFilter {
 		NodeFilter {
-			contract: Mutex::new(None),
+			contract: peer_set::PeerSet::default(),
 			client: client,
 			contract_address: contract_address,
-			permission_cache: Mutex::new(HashMap::new()),
+			permission_cache: Mutex::new(LruCache::new(MAX_CACHE_SIZE)),
 		}
 	}
 
@@ -63,40 +80,30 @@ impl ConnectionFilter for NodeFilter {
 	fn connection_allowed(&self, own_id: &NodeId, connecting_id: &NodeId, _direction: ConnectionDirection) -> bool {
 
 		let mut cache = self.permission_cache.lock();
-		if let Some(res) = cache.get(connecting_id) {
+		if let Some(res) = cache.get_mut(connecting_id) {
 			return *res;
 		}
 
-		let mut contract = self.contract.lock();
-		if contract.is_none() {
-			*contract = Some(Contract::new(self.contract_address));
-		}
-
-		let allowed = match (self.client.upgrade(), &*contract) {
-			(Some(ref client), &Some(ref contract)) => {
-				let own_low = H256::from_slice(&own_id[0..32]);
-				let own_high = H256::from_slice(&own_id[32..64]);
-				let id_low = H256::from_slice(&connecting_id[0..32]);
-				let id_high = H256::from_slice(&connecting_id[32..64]);
-				let allowed = contract.connection_allowed(
-					|addr, data| futures::done(client.call_contract(BlockId::Latest, addr, data)),
-					own_low,
-					own_high,
-					id_low,
-					id_high,
-				).wait().unwrap_or_else(|e| {
-					debug!("Error callling peer set contract: {:?}", e);
-					false
-				});
-
-				allowed
-			}
-			_ => false,
+		let client = match self.client.upgrade() {
+			Some(client) => client,
+			None => return false,
 		};
 
-		if cache.len() < MAX_CACHE_SIZE {
-			cache.insert(*connecting_id, allowed);
-		}
+		let address = self.contract_address;
+		let own_low = H256::from_slice(&own_id[0..32]);
+		let own_high = H256::from_slice(&own_id[32..64]);
+		let id_low = H256::from_slice(&connecting_id[0..32]);
+		let id_high = H256::from_slice(&connecting_id[32..64]);
+
+		let allowed = self.contract.functions()
+			.connection_allowed()
+			.call(own_low, own_high, id_low, id_high, &|data| client.call_contract(BlockId::Latest, address, data))
+			.unwrap_or_else(|e| {
+				debug!("Error callling peer set contract: {:?}", e);
+				false
+			});
+
+		cache.insert(*connecting_id, allowed);
 		allowed
 	}
 }
@@ -117,18 +124,20 @@ mod test {
 	use ethcore::spec::Spec;
 	use ethcore::client::{BlockChainClient, Client, ClientConfig};
 	use ethcore::miner::Miner;
-	use util::{Address};
+	use ethereum_types::Address;
 	use network::{ConnectionDirection, ConnectionFilter, NodeId};
 	use io::IoChannel;
 	use super::NodeFilter;
+	use tempdir::TempDir;
 
 	/// Contract code: https://gist.github.com/arkpar/467dbcc73cbb85b0997a7a10ffa0695f
 	#[test]
 	fn node_filter() {
 		let contract_addr = Address::from_str("0000000000000000000000000000000000000005").unwrap();
 		let data = include_bytes!("../res/node_filter.json");
-		let spec = Spec::load(::std::env::temp_dir(), &data[..]).unwrap();
-		let client_db = Arc::new(::util::kvdb::in_memory(::ethcore::db::NUM_COLUMNS.unwrap_or(0)));
+		let tempdir = TempDir::new("").unwrap();
+		let spec = Spec::load(&tempdir.path(), &data[..]).unwrap();
+		let client_db = Arc::new(::kvdb_memorydb::create(::ethcore::db::NUM_COLUMNS.unwrap_or(0)));
 
 		let client = Client::new(
 			ClientConfig::default(),
diff --git a/ethcore/res/authority_round.json b/ethcore/res/authority_round.json
index a56618d1c7d9a80f2f5bb7a28bf6c8bcbbec5e6b..8d54244379878a0b75f7842f2e05983063f2205c 100644
--- a/ethcore/res/authority_round.json
+++ b/ethcore/res/authority_round.json
@@ -20,7 +20,11 @@
 		"accountStartNonce": "0x0",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x69"
+		"networkID" : "0x69",
+		"eip140Transition": "0x0",
+		"eip211Transition": "0x0",
+		"eip214Transition": "0x0",
+		"eip658Transition": "0x0"
 	},
 	"genesis": {
 		"seal": {
@@ -41,6 +45,10 @@
 		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
 	}
 }
diff --git a/ethcore/res/authority_round_empty_steps.json b/ethcore/res/authority_round_empty_steps.json
new file mode 100644
index 0000000000000000000000000000000000000000..b884e8e15a349a72ce52d61cafd16c16c24d0927
--- /dev/null
+++ b/ethcore/res/authority_round_empty_steps.json
@@ -0,0 +1,51 @@
+{
+	"name": "TestAuthorityRoundEmptySteps",
+	"engine": {
+		"authorityRound": {
+			"params": {
+				"stepDuration": 1,
+				"startStep": 2,
+				"validators": {
+					"list": [
+						"0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e",
+						"0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1"
+					]
+				},
+				"blockReward": "10",
+				"immediateTransitions": true,
+				"emptyStepsTransition": "1",
+				"maximumEmptySteps": "2"
+			}
+		}
+	},
+	"params": {
+		"gasLimitBoundDivisor": "0x0400",
+		"accountStartNonce": "0x0",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID" : "0x69"
+	},
+	"genesis": {
+		"seal": {
+			"authorityRound": {
+				"step": "0x0",
+				"signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+			}
+		},
+		"difficulty": "0x20000",
+		"author": "0x0000000000000000000000000000000000000000",
+		"timestamp": "0x00",
+		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"extraData": "0x",
+		"gasLimit": "0x222222"
+	},
+	"accounts": {
+		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" },
+		"7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { "balance": "1000000000" },
+		"82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { "balance": "1000000000" }
+	}
+}
diff --git a/ethcore/res/basic_authority.json b/ethcore/res/basic_authority.json
index 192b48cada6b1f27db20b6b08775f2dbd9adc892..35711be0112663fdd375077f74a71bb1c3e3471e 100644
--- a/ethcore/res/basic_authority.json
+++ b/ethcore/res/basic_authority.json
@@ -15,7 +15,11 @@
 		"accountStartNonce": "0x0100000",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x69"
+		"networkID" : "0x69",
+		"eip140Transition": "0x0",
+		"eip211Transition": "0x0",
+		"eip214Transition": "0x0",
+		"eip658Transition": "0x0"
 	},
 	"genesis": {
 		"seal": {
@@ -33,6 +37,10 @@
 		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
 	}
 }
diff --git a/ethcore/res/constructor.json b/ethcore/res/constructor.json
index 9b1de7020700746f38b3deeecdf651e61cd11b86..f4e22ea2d82380fd649e29963e4ba5b16611418e 100644
--- a/ethcore/res/constructor.json
+++ b/ethcore/res/constructor.json
@@ -1,14 +1,21 @@
 {
 	"name": "GenesisConstructor",
 	"engine": {
-		"null": null
+		"null": {
+			"params": {}
+		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
 		"accountStartNonce": "0x0",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x2"
+		"networkID" : "0x2",
+		"registrar" : "0x0000000000000000000000000000000000001337",
+		"eip140Transition": "0x0",
+		"eip211Transition": "0x0",
+		"eip214Transition": "0x0",
+		"eip658Transition": "0x0"
 	},
 	"genesis": {
 		"seal": {
@@ -26,6 +33,10 @@
 		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"0000000000000000000000000000000000000005": { "balance": "1", "constructor": "60606040526000805460ff19166001179055346000575b6075806100246000396000f300606060405263ffffffff60e060020a60003504166394b91deb81146022575b6000565b34600057602c6040565b604080519115158252519081900360200190f35b60005460ff16815600a165627a7a723058207882eb60ebce23178b3fa06d4cd8e5adc17711937ccddacb18a04abca2a2c9ee0029" }
+		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
+		"0000000000000000000000000000000000001337": { "balance": "1", "constructor": "60606040526000805460ff19166001179055346000575b6075806100246000396000f300606060405263ffffffff60e060020a60003504166394b91deb81146022575b6000565b34600057602c6040565b604080519115158252519081900360200190f35b60005460ff16815600a165627a7a723058207882eb60ebce23178b3fa06d4cd8e5adc17711937ccddacb18a04abca2a2c9ee0029" }
 	}
 }
diff --git a/ethcore/native_contracts/res/registrar.json b/ethcore/res/contracts/registrar.json
similarity index 100%
rename from ethcore/native_contracts/res/registrar.json
rename to ethcore/res/contracts/registrar.json
diff --git a/ethcore/native_contracts/res/service_transaction.json b/ethcore/res/contracts/service_transaction.json
similarity index 100%
rename from ethcore/native_contracts/res/service_transaction.json
rename to ethcore/res/contracts/service_transaction.json
diff --git a/ethcore/native_contracts/res/test_validator_set.json b/ethcore/res/contracts/test_validator_set.json
similarity index 100%
rename from ethcore/native_contracts/res/test_validator_set.json
rename to ethcore/res/contracts/test_validator_set.json
diff --git a/ethcore/res/contracts/tx_acl.json b/ethcore/res/contracts/tx_acl.json
new file mode 100644
index 0000000000000000000000000000000000000000..cc924cafb81d9cbe6c023b87081cbc386c41c7b9
--- /dev/null
+++ b/ethcore/res/contracts/tx_acl.json
@@ -0,0 +1 @@
+[{"constant":true,"inputs":[{"name":"sender","type":"address"}],"name":"allowedTxTypes","outputs":[{"name":"","type":"uint32"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]
diff --git a/ethcore/native_contracts/res/validator_report.json b/ethcore/res/contracts/validator_report.json
similarity index 100%
rename from ethcore/native_contracts/res/validator_report.json
rename to ethcore/res/contracts/validator_report.json
diff --git a/ethcore/native_contracts/res/validator_set.json b/ethcore/res/contracts/validator_set.json
similarity index 100%
rename from ethcore/native_contracts/res/validator_set.json
rename to ethcore/res/contracts/validator_set.json
diff --git a/ethcore/res/ethereum/byzantium_test.json b/ethcore/res/ethereum/byzantium_test.json
new file mode 100644
index 0000000000000000000000000000000000000000..40c7e465991c46c30693b7ee2b88e3c3e5897ae9
--- /dev/null
+++ b/ethcore/res/ethereum/byzantium_test.json
@@ -0,0 +1,61 @@
+{
+	"name": "Byzantium (Test)",
+	"engine": {
+		"Ethash": {
+			"params": {
+				"minimumDifficulty": "0x020000",
+				"difficultyBoundDivisor": "0x0800",
+				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
+				"homesteadTransition": "0x0",
+				"eip150Transition": "0x0",
+				"eip160Transition": "0x0",
+				"eip161abcTransition": "0x0",
+				"eip161dTransition": "0x0",
+				"eip649Reward": "0x29A2241AF62C0000",
+				"eip100bTransition": "0x0",
+				"eip649Transition": "0x0"
+			}
+		}
+	},
+	"params": {
+		"gasLimitBoundDivisor": "0x0400",
+		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
+		"accountStartNonce": "0x00",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID" : "0x1",
+		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": "0x0",
+		"eip98Transition": "0xffffffffffffffff",
+		"eip140Transition": "0x0",
+		"eip211Transition": "0x0",
+		"eip214Transition": "0x0",
+		"eip155Transition": "0x0",
+		"eip658Transition": "0x0"
+	},
+	"genesis": {
+		"seal": {
+			"ethereum": {
+				"nonce": "0x0000000000000042",
+				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+			}
+		},
+		"difficulty": "0x400000000",
+		"author": "0x0000000000000000000000000000000000000000",
+		"timestamp": "0x00",
+		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+		"gasLimit": "0x1388"
+	},
+	"accounts": {
+		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0x00", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x00", "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0x00", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
+	}
+}
diff --git a/ethcore/res/ethereum/classic.json b/ethcore/res/ethereum/classic.json
index bfd64248e9022ecb809596dca5b3c98fffe99472..a4c6fe9f227737239c53cc0555c1710194a1baf2 100644
--- a/ethcore/res/ethereum/classic.json
+++ b/ethcore/res/ethereum/classic.json
@@ -7,21 +7,21 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": 1150000,
 				"eip150Transition": 2500000,
 				"eip160Transition": 3000000,
 				"ecip1010PauseTransition": 3000000,
 				"ecip1010ContinueTransition": 5000000,
 				"ecip1017EraRounds": 5000000,
-
 				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				"eip161dTransition": "0x7fffffffffffffff",
+				"bombDefuseTransition": 5900000
 			}
 		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
@@ -31,7 +31,6 @@
 		"forkBlock": "0x1d4c00",
 		"forkCanonHash": "0x94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f",
 		"eip155Transition": 3000000,
-
 		"eip98Transition": "0x7fffffffffffff",
 		"eip86Transition": "0x7fffffffffffff"
 	},
diff --git a/ethcore/res/ethereum/metropolis_test.json b/ethcore/res/ethereum/constantinople_test.json
similarity index 61%
rename from ethcore/res/ethereum/metropolis_test.json
rename to ethcore/res/ethereum/constantinople_test.json
index a452e5a80a121b35e01d85fb3c40443868bcdf7f..7b137e86fa0732b9aa25ebbcf13ac4bc42f6a450 100644
--- a/ethcore/res/ethereum/metropolis_test.json
+++ b/ethcore/res/ethereum/constantinople_test.json
@@ -1,34 +1,39 @@
 {
-	"name": "Metropolis (Test)",
+	"name": "Byzantium (Test)",
 	"engine": {
 		"Ethash": {
 			"params": {
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
-
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x0",
 				"eip150Transition": "0x0",
 				"eip160Transition": "0x0",
 				"eip161abcTransition": "0x0",
 				"eip161dTransition": "0x0",
-				"maxCodeSize": 24576
+				"eip649Reward": "0x29A2241AF62C0000",
+				"eip100bTransition": "0x0",
+				"eip649Transition": "0x0"
 			}
 		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x0",
-		"eip86Transition": "0x0",
+		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": "0x0",
+		"eip98Transition": "0xffffffffffffffff",
 		"eip140Transition": "0x0",
 		"eip210Transition": "0x0",
-		"eip155Transition": "0x0"
+		"eip211Transition": "0x0",
+		"eip214Transition": "0x0",
+		"eip155Transition": "0x0",
+		"eip658Transition": "0x0"
 	},
 	"genesis": {
 		"seal": {
@@ -48,6 +53,10 @@
 		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
 		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }
+		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 100 } } } },
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0x00", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x00", "pricing": { "linear": { "base": 2000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0x00", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
 	}
 }
diff --git a/ethcore/res/ethereum/eip150_test.json b/ethcore/res/ethereum/eip150_test.json
index 22ebf5500584053537f7a74b65e515c603aa08dd..60157c5716804ee7fda43b6a7dd8a094b75f94e7 100644
--- a/ethcore/res/ethereum/eip150_test.json
+++ b/ethcore/res/ethereum/eip150_test.json
@@ -6,18 +6,17 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x0",
 				"eip150Transition": "0x0",
 				"eip160Transition": "0x7fffffffffffffff",
 				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff",
-				"maxCodeSize": 24576
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
@@ -25,7 +24,9 @@
 		"networkID" : "0x1",
 		"eip98Transition": "0x7fffffffffffffff",
 		"eip86Transition": "0x7fffffffffffffff",
-		"eip155Transition": "0x7fffffffffffffff"
+		"eip155Transition": "0x7fffffffffffffff",
+		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": "0x7fffffffffffffff"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/eip161_test.json b/ethcore/res/ethereum/eip161_test.json
index 50d28570b78e51e4c0b32c71399bbafc56495b9d..ac1c0a5d1e3cc60fbb6ed128256209d1889d6ce4 100644
--- a/ethcore/res/ethereum/eip161_test.json
+++ b/ethcore/res/ethereum/eip161_test.json
@@ -6,18 +6,17 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x0",
 				"eip150Transition": "0x0",
 				"eip160Transition": "0x0",
 				"eip161abcTransition": "0x0",
-				"eip161dTransition": "0x0",
-				"maxCodeSize": 24576
+				"eip161dTransition": "0x0"
 			}
 		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
@@ -25,7 +24,9 @@
 		"networkID" : "0x1",
 		"eip98Transition": "0x7fffffffffffffff",
 		"eip86Transition": "0x7fffffffffffffff",
-		"eip155Transition": "0x7fffffffffffffff"
+		"eip155Transition": "0x7fffffffffffffff",
+		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": "0x0"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/ellaism.json b/ethcore/res/ethereum/ellaism.json
new file mode 100644
index 0000000000000000000000000000000000000000..3036992eb7bae4fba69fa91a9a9e893ab728c717
--- /dev/null
+++ b/ethcore/res/ethereum/ellaism.json
@@ -0,0 +1,72 @@
+{
+  "name": "Ellaism",
+  "dataDir": "ellaism",
+  "engine": {
+    "Ethash": {
+      "params": {
+        "minimumDifficulty": "0x020000",
+        "difficultyBoundDivisor": "0x0800",
+        "durationLimit": "0x0d",
+        "blockReward": "0x4563918244F40000",
+        "homesteadTransition": "0x0",
+        "bombDefuseTransition": "0x0",
+        "eip150Transition": "0x0",
+        "eip160Transition": "0x0",
+        "ecip1017EraRounds": 10000000,
+
+        "eip161abcTransition": "0x7fffffffffffffff",
+        "eip161dTransition": "0x7fffffffffffffff"
+      }
+    }
+  },
+  "params": {
+    "gasLimitBoundDivisor": "0x0400",
+    "registrar": "0x3bb2bb5c6c9c9b7f4EF430b47Dc7e026310042ea",
+    "accountStartNonce": "0x00",
+    "maximumExtraDataSize": "0x20",
+    "minGasLimit": "0x1388",
+    "networkID": "0x40",
+    "chainID": "0x40",
+    "eip155Transition": "0x0",
+    "eip98Transition": "0x7fffffffffffff",
+    "eip86Transition": "0x7fffffffffffff"
+  },
+  "genesis": {
+    "seal": {
+      "ethereum": {
+        "nonce": "0x0000000000000040",
+        "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      }
+    },
+    "difficulty": "0x40000000",
+    "author": "0x0000000000000000000000000000000000000000",
+    "timestamp": "0x00",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "gasLimit": "0x1388"
+  },
+  "nodes": [
+    "enode://98b48cc7149326d00a57994ad55014a095a3e5cd4f0144cd7b034fb667d8e8017082bd90047d72c4403798b8ece11a33bd2e344d6500faba30889ebcfa5316fa@172.104.163.204:30303",
+    "enode://834246cc2a7584df29ccdcf3b5366f118a0e291264980376769e809665a02c4caf0d68c43eecf8390dbeaf861823b05583807af0a62542a1f3f717046b958a76@45.77.106.33:30303",
+    "enode://d1373d7187a20d695220fafb5746a289786bad92469d6bbe800f07572f8f444479f507cfcb8fcd8f5bee5dd44efb6185df4a1e4f1a7170408ada9876ef5b3fe4@178.79.189.58:30303",
+    "enode://d8059dcb137cb52b8960ca82613eeba1d121105572decd8f1d3ea22b09070645eeab548d2a3cd2914f206e1331c7870bd2bd5a231ebac6b3d4886ec3b8e627e5@173.212.216.105:30303",
+    "enode://5a89c8664d29a321fd4cb1b55b0f0be832ce376b5e7feb14a2073fdbd9bd7b7394169ed289dd991112b42ecfb74ea36e436bc72a1c99dcdb50d96eaf3b0ed254@213.136.91.42:30303",
+    "enode://9215ad77bd081e35013cb42a8ceadff9d8e94a78fcc680dff1752a54e7484badff0904e331c4b40a68be593782e55acfd800f076d22f9d2832e8483733ade149@213.14.82.125:30303",
+    "enode://07913818dafbadf44d4fc796fa414ec1d720ecfb087eff37efbe7134556658e92351559de788fa319c291e40b915cc26d902069d03bd935553d4efa688bdbbf8@45.32.19.37:30303",
+    "enode://645a59b6e6e20ed8864767a1d0c731f89ae276ed4e04c4f10becce655532d95cbe1bc9e2da3f13a6564f9ca8fe46fab2781a380b3a89148bccac883d6068f684@45.77.159.123:30303",
+    "enode://7c2f43b2e7fded9469917311574d267427e62cd12e1864effd15f31c1246e4e955463d843acaa37309693a515df7986cb6d160b7e85a4ca2779a798a72d90850@108.61.194.191:30303",
+    "enode://5dd35866da95aea15211fb1f98684f6e8c4e355e6aa3cc17585680ed53fa164477b8c52cb6ca4b24ec4d80f3d48ff9212b53feb131d825c7945a3abaaf02d24d@178.79.189.58:60606",
+    "enode://6c585c18024eb902ca093278af73b04863ac904caabc39ac2920c23532307c572ad92afd828a990c980d272b1f26307f2409cc97aec3ff9fe866732cae49a8c2@144.217.163.224:31337",
+    "enode://edd90c4cc64528802ad52fd127d80b641ff80fd43fa5292fb111c8bd2914482dffee288fd1b0d26440c6b2c669b10a53cbcd37c895ba0d6194110e100a965b2d@188.166.179.159:30303",
+    "enode://d19783546438e8bfc11a35457ff1f47871a2ce4801b9b2dbe7606321a9ce29007305497eb8c98d7ae9dc5a913ee5533c3691b1080f7066697c4276e6140d2eac@45.77.47.184:30303",
+    "enode://13ed57615447bc9bf1da4e28249369babc00d2530d6c103c12350453e469a5e90cbcdb787c436977467f5864be6e64f2520180fc60b841c8c3daf84df9450190@104.207.152.17:30303",
+    "enode://59c228a6a0939a0b53edf6924bc7bd1384652dc1da0777495acd0707975f485f54a77c7b2dcbeece9340a43ccd9c7ea70f0cdfe48936537d238b50e5cb5dc0b2@45.77.233.0:30303",
+    "enode://9d960373335c1cc38ca696dea8f2893e2a071c8f21524f21e8aae22be032acc3b67797b1d21e866f9d832943ae7d9555b8466c6ab34f473d21e547114952df37@213.32.53.183:30303"
+  ],
+  "accounts": {
+    "0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+    "0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+    "0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+    "0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }
+  }
+}
diff --git a/ethcore/res/ethereum/expanse.json b/ethcore/res/ethereum/expanse.json
index d79ab6b3c3b72d170b0ece24b8f5b4225df4e9c3..b9b734e313df34f740d9e1ca23b222d6a1dcc1a3 100644
--- a/ethcore/res/ethereum/expanse.json
+++ b/ethcore/res/ethereum/expanse.json
@@ -6,8 +6,9 @@
 			"params": {
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
-				"difficultyIncrementDivisor": "60",
+				"difficultyIncrementDivisor": "0x3C",
 				"durationLimit": "0x3C",
+				"blockReward": "0x6f05b59d3b200000",
 				"homesteadTransition": "0x30d40",
 				"difficultyHardforkTransition": "0x59d9",
 				"difficultyHardforkBoundDivisor": "0x0200",
@@ -15,23 +16,34 @@
 				"eip150Transition": "0x927C0",
 				"eip160Transition": "0x927C0",
 				"eip161abcTransition": "0x927C0",
-				"eip161dTransition": "0x927C0"
+				"eip161dTransition": "0x927C0",
+				"eip100bTransition": "0xC3500",
+				"metropolisDifficultyIncrementDivisor": "0x1E",
+				"eip649Transition": "0xC3500",
+				"eip649Reward": "0x3782DACE9D900000",
+				"expip2Transition": "0xC3500",
+				"expip2DurationLimit": "0x1E"
 			}
 		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x6f05b59d3b200000",
 		"registrar" : "0x6c221ca53705f3497ec90ca7b84c59ae7382fc21",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID": "0x1",
 		"chainID": "0x2",
+		"forkBlock": "0xDBBA0",
+		"forkCanonHash": "0x8e7bed51e24f5174090408664ac476b90b5e1199a947af7442f1ac88263fc8c7",
 		"subprotocolName": "exp",
 		"eip98Transition": "0x7fffffffffffff",
 		"eip86Transition": "0x7fffffffffffff",
-		"eip155Transition": "0x927C0"
+		"eip155Transition": "0x927C0",
+		"eip140Transition": "0xC3500",
+		"eip211Transition": "0xC3500",
+		"eip214Transition": "0xC3500",
+		"eip658Transition": "0xC3500"
 	},
 	"genesis": {
 		"seal": {
@@ -53,7 +65,6 @@
 		"enode://96d3919b903e7f5ad59ac2f73c43be9172d9d27e2771355db03fd194732b795829a31fe2ea6de109d0804786c39a807e155f065b4b94c6fce167becd0ac02383@45.55.22.34:42786",
 		"enode://5f6c625bf287e3c08aad568de42d868781e961cbda805c8397cfb7be97e229419bef9a5a25a75f97632787106bba8a7caf9060fab3887ad2cfbeb182ab0f433f@46.101.182.53:42786",
 		"enode://d33a8d4c2c38a08971ed975b750f21d54c927c0bf7415931e214465a8d01651ecffe4401e1db913f398383381413c78105656d665d83f385244ab302d6138414@128.199.183.48:42786",
-		"enode://df872f81e25f72356152b44cab662caf1f2e57c3a156ecd20e9ac9246272af68a2031b4239a0bc831f2c6ab34733a041464d46b3ea36dce88d6c11714446e06b@178.62.208.109:42786",
 		"enode://f6f0d6b9b7d02ec9e8e4a16e38675f3621ea5e69860c739a65c1597ca28aefb3cec7a6d84e471ac927d42a1b64c1cbdefad75e7ce8872d57548ddcece20afdd1@159.203.64.95:42786"
 	],
 	"accounts": {
@@ -61,6 +72,10 @@
 		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0xC3500", "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0xC3500", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0xC3500", "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0xC3500", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"bb94f0ceb32257275b2a7a9c094c13e469b4563e": {
 			"balance": "10000000000000000000000000"
 		},
diff --git a/ethcore/res/ethereum/foundation.json b/ethcore/res/ethereum/foundation.json
index b30453082771a1cab1046b59d03a2d2b2bccc4de..53322e6ffecc1fb33c6c367ee3372ce606393998 100644
--- a/ethcore/res/ethereum/foundation.json
+++ b/ethcore/res/ethereum/foundation.json
@@ -7,6 +7,7 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x118c30",
 				"daoHardforkTransition": "0x1d4c00",
 				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
@@ -132,13 +133,14 @@
 				"eip160Transition": 2675000,
 				"eip161abcTransition": 2675000,
 				"eip161dTransition": 2675000,
-				"maxCodeSize": 24576
+				"eip649Reward": "0x29A2241AF62C0000",
+				"eip100bTransition": 4370000,
+				"eip649Transition": 4370000
 			}
 		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xe3389675d0338462dC76C6f9A3e432550c36A142",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
@@ -147,9 +149,14 @@
 		"forkBlock": "0x1d4c00",
 		"forkCanonHash": "0x4985f5ca3d2afbec36529aa96f74de3cc10a2a4a6c44f2157a57d2c6059a11bb",
 		"eip155Transition": 2675000,
-
 		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff"
+		"eip86Transition": "0x7fffffffffffff",
+		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": 2675000,
+		"eip140Transition": 4370000,
+		"eip211Transition": 4370000,
+		"eip214Transition": 4370000,
+		"eip658Transition": 4370000
 	},
 	"genesis": {
 		"seal": {
@@ -166,35 +173,2636 @@
 		"gasLimit": "0x1388",
 		"stateRoot": "0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
 	},
+	"hardcodedSync": {
+		"header": "f90219a061d694007fbaca6e23e73e29c8c6a60099abc740ab7e27ae3cd1b9c6a47efef7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347945a0b54d5dc17e0aadc383d2db43b0a0d3e029c4ca0a2f1bdabc1a72737de1c22a76cacc8fc162366904f759a99db7d6d19efee3090a0ac5f5b236e8977928a2ce43c7569ea5a74919643cb0b06d7540407b1ea1298f0a04356ddc5d77c83923a6541260308be167386e0969a608a017770c9e38091cfcab90100a00010002001009080011010141088000004000080081100000a002023000002204204801204084000c000010008000000000880080020c0000440200460000290005010c01c80800080004800100406003380000400402040000028084002a80087000008090a00200100544020019580022000000306100a0080100084020006809000e80000010000254810002000000a240050014200002002c10809202030006422022000203012000241089300080400000009001021020200012410348500028290230408100302000000058c0000020c08c20480081040020260004008481000080000800010010060020000e00020002140100a8988000004400201870b9af4a66df8038350a8018379d54483799eba845ab0426d984554482e45544846414e532e4f52472d3231323134313232a05eeccc80302d8fecca48a47be03654b5a41b5e5f296f271f910ebae631124f518890074810024c6c2b",
+		"totalDifficulty": "3144406426008470895785",
+		"CHTs": [
+			"0x0eb474b7721727204978e92e27d31cddff56471911e424a4c8271c35f9c982cc",
+			"0xe10e94515fb5ffb7ffa9bf50db4a959b3f50c2ff75e0b8bd5f5e038749e52a11",
+			"0x816e7463af7b5d2fcb804ba55f09e8452182b0ba6c995a34e144245d76333d55",
+			"0x3793af64c1ddc07ab61b2ba120034d91c02183ff788f07d3120fd4e6a48305b5",
+			"0x14c6106a17e041032210bfa0ca80d11860a1c6d95175d55eff39f97b8d8acded",
+			"0x396f832bfa3a9c494e9245471f0e65552613d87b6fe62128103590d95de72c2d",
+			"0xb060979f095c170a776b2b50a1e2ab0ffea80f6e522753fa36ad6f106ee32e9f",
+			"0x8f452e7cbd8a333ed04d819a143a8d3a75fe8c58418e7fc420bb2a717c0d4d2f",
+			"0x37fe1b0cf156bfc07571569af210540be753777903a308d5707538fffed75b59",
+			"0x6f0561d017cfc123b3f0d37b044e4f7231516b8731a1cab89afb569238643c33",
+			"0x3c1740c410a88c60fe8ccdc44e0ef2cf7f7314818dbf1648c01d0d94fbffc211",
+			"0xfb98115a7d6df8aaa40115f883014fe97300869bc016648e918fbf2df9608d41",
+			"0xef1099ab5ca4b79369048678d3ba78122fc081b00b6fd0f6907302a260d58266",
+			"0x969575f411dd78fdc5b4def0331fc93702029cc3c78851331a0f47dd0faae70b",
+			"0x9e53053e362be51c0fd25eaafd9e7c5c969d9f2ce8db4b3d4d830cbff347b0c8",
+			"0xf9de29944954d2b71a93532fc26916ae12fee72d42a79adaf940b0bf75d0ef89",
+			"0x28b2ce6635e60e06d643750798779023b2a807d9d089ae9ef7f223eebc15a71e",
+			"0x5295c06cbaff06f42bd8f5d9cbe94a840885caed02f9c9ba6da44a888ef796de",
+			"0x576eae673a4cbba4c7c7a56b47835ea64ae5989d67d119ebc8e568df40d908a9",
+			"0x891c0d38bc5e55620615da42ed77ab33806a042512034bcee134279dde1054be",
+			"0xbab05999d657426a11a902eb4c85ac52e2b72dd1cf38584cf2baeb2c3727bb44",
+			"0x3bd7e5a966f6dd2dc456948a8efca5584f5a4e0033f3037843a42073dda1f71b",
+			"0xc4f773ab1e34290f9a3d9ac6ede4749c5dec547353dddea494169d86f71107a3",
+			"0x993bf037ea9dd58b52027fb6f39332dab867c1e72af34a49d58a5a12f26bcca3",
+			"0x48b2d8d506eb8fc9dc0402fef26952111449aca0f90d0079f0526435d4e3183b",
+			"0xfef8f61df240e956f43759d2f481938421e064a9bd6a3be7a53b1213cc9588bb",
+			"0x5abf01f5066cf1091acdd1f99fbd5fd963633feafc42f9047534a3c1522004a5",
+			"0xa0f6205842260988161183b51bc36fae458fa184dd61844617d5c5d26fa78346",
+			"0x77309182fdc26d15dd8d9dd05040d7dc623412785708d8aac39eedee63931944",
+			"0x661c93311b94b7d4cdcbc0973225c794e71898a2b906922a6c1e8f7e9e289dc3",
+			"0x9d5d329ee8d9fffaee0111688d31a308dfaac922dcd61f818edd5303d0955be0",
+			"0x716ca25b184b64ba273b978de098f9946413f6fcc95bfba5cf1169e7e03dd611",
+			"0xa2e8d5cefa5804894fb42a106340b00de3286fee0992b5887b2cf471539d74a9",
+			"0xf846e05c9e9e9cb4cd2b7cbae7ae183a43a59ab02251954db632e538adacc357",
+			"0xbc01b4e23ea082a193e4c1012b1da91f3b4cb762009ca320bc8ed294af874e79",
+			"0x9218114a32da3ecf660d4d51b101bb51bb17c771561c1946c099be082f0a96b3",
+			"0x3b4edf03dfd53081cf40c0b90b35c1ccf7c7fe96cf131172eef5eec62f620ea8",
+			"0xb15758944263c67bdf528d4d7fe05737fbdbf7ffedce5f891a4ddf76177d2609",
+			"0x1f119374c385240f7b4ba1ec3d502be2c12c159411d5393ff2bd38cf87033625",
+			"0x8a8d5a93f3475813926b13a4d53f21b28dc79ade2b50830c0b9043e9fcd81576",
+			"0xcc22f7e2bb9c06c15ca3d82df852ed9097a2ddc687ee389e662de000db0c84fc",
+			"0xc2047e0dab711db791aadb642f8102abaacf7231b8dbdbe1f60573b0be015a31",
+			"0x1b4088ceee7783e4563945f162bd5da67020ca377a18d615923e8564d6709f85",
+			"0xd73450686e33bbda9eef53a95a86e5a0514156b98a5b7dfc6fdc0adb0b83cbcf",
+			"0xb374076ec961360e38d3486a31c3f72225440984c4c47ca790b4961d94152159",
+			"0x4f723f4fbd31d63a5421390e68aba0aff97249875688a7d9ab9a339d9aac7bc1",
+			"0x5fe51ff982edcad6c0052fcdf9a70e8f325c8140ab75848c5d7b0d670bd7edc2",
+			"0xc3ad483c7cc23bf8d6ae3e3e829bf126d5eeea9c53b566a6da95bef573b9c779",
+			"0x3c9e50ed9eb57cc055fd9a65a6cdaba2030d8b41f81348f296d7410c1d24ced0",
+			"0x0c6dfc1f626ff9e85ff072c154152bb3f122a2c1a45bc2d9e7da9b2d5278149a",
+			"0x92f4452dbdb4fe70e84ecd47af4b1af90975219797cebd451beceb6997ab024d",
+			"0x9a3d00686736b5b838308da4b8f0aa9edccfaba64621ce2988cea6ea2a267efd",
+			"0x8d602d0bef069177102726d5ccd93d19805fb5771a350a41e32755ce740b9047",
+			"0x6681e4097667a22ad3713acc27b6f87abd54583230581933bed9245c2c457ac3",
+			"0x53077caeabcd926466319a3ee5c51c32e01e1812a65313f113f814d53e9f1dd9",
+			"0x4dd4c33e99d86ba84f976c639333fc072e262c0b76dfdf2f589300af54048c0a",
+			"0xbc3b9837a6fa54616dcdb8088080e276e2e99a23c8e7de4109504293703d524e",
+			"0x24316b344cecd5e601cc0acc91ff94f481ca3fa26d8478644a9d8bcaeb0359b3",
+			"0xa7bafd3c5f4e3f6b5c078d50eb318d91e867b0e1c966027e3e7458eb104ccd63",
+			"0xc8da46b7d778980d120357c8de2bba336f5a2ac7a9f4183a0ee1f7597ed47d25",
+			"0x7469fc5d8c9c648cd10e538710e0f126542e59a82484e7fe56b73f4ec52c36c7",
+			"0x993bb7c0487ff61c97e4f1533446ae35b6346642e1230f2441da8b354111d597",
+			"0x90e3944732f86a2254dc4f30650f8438dfd0b777561fb02a8ab1c60438569c24",
+			"0x4e8472483679b54bdc600010fdd164f54771d7a99fa9272c683b610fff72507b",
+			"0xf72a861a2ebc232c25529c0f94c59996e64c59c36a1326a183cf171bddf2a75c",
+			"0x7f222999ba9113e2a64fd026a8f7244e6d2ae8f2a7e7d8d2d6fbde6fdf0b629f",
+			"0x3304e769f730522c1c5aa745c448075df026b8f82a4dece84fd70d0457050985",
+			"0x9ee5e3ccaaf94461dff9df8c4805ca831f58a1586af4ece3cab14a45f3b784db",
+			"0x21e4364859063e20153d2d06eae4d2c9e99354bf97fbff68406d8825d18dbce3",
+			"0x4805355b72b1b61b07814059f80b4da0351291cc932292f23069197a74127726",
+			"0x14474f45f38d7ea51418e5f03751c8bfbfb9b3e2957d3051e862aa3c57a63c43",
+			"0x69372cee3e2807d10ecb72d404a033568a159a5b15d2007537ed9a758164b29f",
+			"0x147223b51001166a4e65372c9c706f011f1ae94f4bdc9ba6e8960017e8898703",
+			"0x11a1e48a5c1d7088c0ccb8177d54db9e9f91a99aa7c24f702cd93f4646f181ee",
+			"0x809c902b2f4b8760c3d2e820c93d6df69a5d184a43a6c654ebe7067e7212137d",
+			"0x749367027756c27215b2f57168ef15d3b39062c9f79b3777f7fa19e8073de775",
+			"0x6a9fae37364f97e36e56df97acb1b7d066a608d8366d7e008854756dd28fe748",
+			"0xdc2f1b7a8aeda15e6bf4f5f424bc54828cc8520e2e7ba27bd8e28ba2b543aae7",
+			"0xe0fabc892d5c8b4342ff488b76a0400425ea70774f207c546fbf2f9f5b105dcb",
+			"0x151fb5e02d8eb3c3192cb8c039bcb4c121c4ebeea5e7f98927b85a730a24bbf9",
+			"0xfeb2f2ea368d0bd4c0b0bd97b444c365bdc0ac9ce2862b0d0162387727edd236",
+			"0x1eaf828231ebbae54737111bf3c7181fe3d7e9070def1313470d3f81c89f01c7",
+			"0x8a1b0565013cff488bbe3f35df86fb41c7aedf4d911130802c473f4ddb74d6d6",
+			"0xce9158b5c903312fa636e074e3efe413184652581a4877d40a0085965dc0bf9a",
+			"0x1cf602c6306affe2916fa09d3c8c018f23fc44dec8af8e83fa0008c98b4dda72",
+			"0x189dc4569e96cab937265ecaea76a0880ec97d5b84ac1fbd0cd2d2b36a8c34c3",
+			"0xd698bd07e485767c1da30bb218265e1304f6eaf426749ccba67478817af84bd4",
+			"0x47d7e101de73bb0ca97a0bb70094e81b82c63e519a6b2aa5fe10ca7351232870",
+			"0xb0d441b6c41072889c4a982306c9a40dff77b43425ecc4d771c22f3199eb7708",
+			"0x7893071deba67f2fc8e1b18bedcac4dbc05a020f37c764c555eadc42dd9d29d3",
+			"0x3c6d636db3621757d60b2d0e1804e19528ce60c9feed1ead93731820ff19b11c",
+			"0xde87aaa462b461c4a33e0739ef4cf56d442b7967ac7c5280816a959046b128b6",
+			"0xb237b17650adcbcf580b64b500ecaa7ca36921a11ad92c1e8992c57cc1a7f618",
+			"0xec379725db43fefe61f2495f7f7e0531d852e21f896ae806144c4d9b4b986e96",
+			"0x65ac5548988825831f0887b9ff0f2c13b7f3b49e4a67c39b1694e76414249f6d",
+			"0x76053b72ec9e6fcf0a28ef273d3e1b0842c3c2c0e905f5b5a3535ffab216c8db",
+			"0x2ab1e87489eb1daeaf8882c6baa0a8726aeac522e9c4eb4df71e35af2d22cc10",
+			"0x8c9c6adcabe253b311f6a9b8165ff9c5e26e4cf41f1acd80837e77fc15526a86",
+			"0xf143155230223a3f126c757b85e193a9129f1bdf97c0ce1f2785f14d40911f30",
+			"0x8c510d9dca593534f3ed316f240ffb9343d1e3cd6d005df6a75a1b354da0b36e",
+			"0x3440975cf818a718beff35a85d19bcbbd67e1b16ca9d78af34dcde31a28b3288",
+			"0xf56ef9c57109f9cb7a925bbb6d453efc19e8a45b331f76153d20a87d86a8b0d8",
+			"0x19a360772872003f08508a28a362c6e05650b385c24a928ddad4d562bfccf412",
+			"0x643720694b3773ecf20437d54a6be701810feff233f435dc701dbe88c9a6a13c",
+			"0xf8c0babe99aa26ecbfc91b304d9cd54ccfb37354c4fdbeb3207bb6d4647fabd6",
+			"0x481ccc7213d0188e817c071c4cc3a71c96befb9aa98cab964012fd7a8267834a",
+			"0x02d83ca8d92e0fe6ce7643ae93af60e38ab5659a84c04beba678ceef654aec12",
+			"0x24e6b4bcd0d97df196f2371532771593fe17be8fcb89f1e1164bcce8616088b9",
+			"0x3dc91775c50c04812f755f3b48d3d6a0cc599c586ce9d105e2cf4f3e4527b515",
+			"0xcdc215f05398ea3942d3a38078a3602cbe8ac549d4bf0e4a54191ceb2aff8f76",
+			"0xee02874e444b784f4265cc60b86a17382d277d03c8bce8a33241460ea8950699",
+			"0x35c34bc84736fdcbc4d4e2e089f30bcd186a052b2f6dcb639fc45a0aeb6969f8",
+			"0xbbb3ff849c36659bf2c00feaad9f7b3a342b5cfcf3555b7c2e467a0dc84e90e8",
+			"0x0584bc60fbe3fae9088c214fb519030646c3240f77180a0bedecd3e9c9f47f89",
+			"0x9d18a665d89439ad2c97427bdab3e598f5bc0da6a0ede2378f95c5bc31f10d12",
+			"0xe8a5bdd0ffd33a6fd03cf003c6d2afbe8493e0f0cb69e6366e22b4d1ff985101",
+			"0x7ca955f4e01eef756b680d09c25626cf50013faa20a12b0a334fd048a04e7b91",
+			"0x064254551457bd5e7a260a41ed3643746202d503813ceaf42660f9bd1983be34",
+			"0x1191044e354ea1e3daa25ed2175a6517659e96733d9065d81492ffe4472fb96f",
+			"0xc823514cf3566b1bb2e19a35e0ef0980bc483fa820d13ae2cfdbf15fd426c272",
+			"0x413f941f192d0ab77bac68268f45e2c9adbee23a3324d4ae8748d09735355a2d",
+			"0xa66c94b9603b3058b730baeba1b79d52f548ceeb5bac487903f92481060f6804",
+			"0xa84d4a8860bdff1fdae6bcefcdcf700fab7857444ef1e76d8259b005872a4636",
+			"0x9fa64d44edd9c097458d3901612a4b6f655a1421ebb68541cb1a4bdbbe24911e",
+			"0x402027770edb387510241a68a235723c6c5c95aed54dab058c43d21a6bb48c41",
+			"0x776281b7e341a66491603b7ae8ed7cc82b99febac43f94cb1c4dda73b17aab63",
+			"0xfecbaf0fc5a02dcf49095514ce26df927def3cf51f37e04471545aae2364f936",
+			"0xc477d9293f0ace7243f8b9c89f01210b8f96b4affc9d3332147ea2e2b693c99e",
+			"0x4a8b9afb9d9097831b2497296b0fd0fae76ab8a596213daed35cf87e6bbefaed",
+			"0x594c4e9851eddbb4a6c2ac72aaa244ff35d67262efb20935360360d39f7c7ecc",
+			"0x14b7ef22c46ba8400979b6c06f3b3023607145a5cc6b5b793daae758cb655245",
+			"0x3a9d233553d1ca4d9862a70ef133a5fb2df75276fb24297b0bd2927a39459450",
+			"0x22c5e227d5fa7616603bbf36c5e4ee7dbf285fb0cf403a3ae982da70c825cad0",
+			"0xc2c8d439c7bd884665da56e3b680a5e58ad1e98627fdbec6fa67d7bbfad33a9b",
+			"0x7d5682cd9f28493ba4b87be141ec99701bbcd1aaadf9840b81de1fc07d4ffb18",
+			"0x8845f626c5f78d1bea281f892727437f9de8f976e4c4fec6060b2115f1862db5",
+			"0x769fdf0bcdbaec1ffe98cd3500ce8341b4d7ea2dad5fadb0258212306ccc75f9",
+			"0x185569d1980147fcdfcd0e0068ab380f0cfa58a690334a558bc1fd0d07897e96",
+			"0x0ed70ccff752df46f981043c5279ac3f13e7f62c2bdb9a0a9817a1c119ef6402",
+			"0xbe121e28349e80d601ab997af844aa03ea6492e88d75d3d46517d8f835e3c3fd",
+			"0xa7aa5f0bb95566292d22891faa75b7ff2020b69fecc8a22d796cc3a60953d98f",
+			"0xa2611b092b00f78fe639c4fba0274ae474fa448b3f2e4b8aa4d06c654720d478",
+			"0x8e425115b98f5e41c8b5d03a9e17d56d30050d85dd06cfff12f002c546a256ba",
+			"0x988b449fbd8c35855154fb4eb22ba6b7b7095be26203d137f484c67facd40dc5",
+			"0x567c43ac5dabeff01d6997543ec7abf7998088a355a6ba8e70f41a243dd1343a",
+			"0x6f560cb650142aed532f17de763d61d021cdec2716b0d2cb27b3a64052abb874",
+			"0x7e4ce5fab8f4f1fd41f9e5f10204032ae7e0e38093b1d07699318975b33910ec",
+			"0x91a0820eec5390916bf464b1d16c00b5d94386c4c9f4cdf7e0b3cbe40747fbc9",
+			"0x9c59451a9a242123efa72c5fbd1564b7bcc0067ea9d025336d228ed26b9ba6c0",
+			"0x1043a5ab3f5a3bced84faaae0e783abb3b81c2b967bbd976042cb5d897d28146",
+			"0xfc37b3b3c0be392ad2a5e36c120eace1d14e637ac806e79a750b9a6be3c742a7",
+			"0xce2ccbada44a8db5144073e69914b322dc015273a75b85ea43fd9e21037c760c",
+			"0x6cf8336b5a410e10604f93351242cb3a6929968212abdf85b4ca9321115b8fdf",
+			"0xabbe9781950362be1e206d91ea1bdd6f32ea2c6df65b277cb89050ca1deb9296",
+			"0x922a6b85add6839494c3edff389aa1b054409c330b4a4e2a6c0e4f9bc85b36a9",
+			"0xc26dcdfa135a09b7eef1e99b445fb66aefb8bceb6ea715b81d78ba87cd56ed8d",
+			"0x87d647fa7dcde81a0e133aa949d574befefbceab24a42ae4f3809d2bb52a2d9b",
+			"0x85ee37fa7154568b9dee8a539340f99c7f1bbc7b9be1f2055636ed9dfc074e4d",
+			"0x8b0114dc9e249f1de4bb3d055790e4bf18aa28a938f39e8a457ab4a43b0dd613",
+			"0x3be36db134f4c00fc9e1bc376213c7073389c993b0b0744cba619688d6c037d1",
+			"0xfaf987eb2e066ad8871c489c23102ec5c58add2d13e62d56f2821cc1f4d66d84",
+			"0x678478da2955e6876ac49c5146e9f7c376dbf2f170f6404054ae4385e72f3f19",
+			"0x85d8d9dd6c2a8f6b6a1c0fc0cb55ca870d9a7aae1621c143c3176a3a81fcc29c",
+			"0x76f4dfa4c3387408c823a75aeb872ff39af3820375ff52f7aecb41c96e4faf2a",
+			"0x6e530647f2e4232063de2fa8f673989d7834d8cdf529791032888f2833880b80",
+			"0x64422b4dfff6cba0eb6deaeb4593eefc40a357469a7f7c3be078f80c66161333",
+			"0x5c7ab740510a4183832bd78e6d6105b0f9f928611f7d62ef96aa8dd8da48a72d",
+			"0x0bbf405e29f015d24e64f063d50ec6c616af64622b1a4132cde86f926e93850f",
+			"0xd9ba81ea0790f1f8adccd0bd203c7adeec2b490381b822d6b15293cac2f26206",
+			"0x4f78619baa34f2278022c509671a38d29366936d6860e79ab540ea46b66ba782",
+			"0x00c1f10211d7604e59a327239f00dc6d036a93416b7871cb214e8eaa52571834",
+			"0x1b6636708f97485675c0e5b21eb749ee4a5fd0dd886e6690090856bcc5178ec0",
+			"0x71366e853968c1bbbbf8e3d6e13100dd589521f8db9e561dd20ff8709b5c1a96",
+			"0x0d2c35a01646cb09e2b56b5792ac03047848bef7415ae26f787cd54ef8f327da",
+			"0x1c5b71047f99db30453e502c9acdf422d3bf97b0d42b9223ea1b8b9924bb0cb1",
+			"0x9988eb36e4a669638e3242e5ada3e6596c5e4ef36a83ed2d3348d35fbed4d3d0",
+			"0x8f00020f98f02af0749df39fb2f534d356e3dbe809bdb3f435c4a575d661d6db",
+			"0xf70a509c0d1c60afcafc7cc492c5ad575fdcadf6ca8e0e5f184c62dd52021129",
+			"0x72cdb6544dd469ab42e270e51d136b314c27ed0d6682f914cf3e0398399d2d5d",
+			"0xd5584896e649b618ab8257859e42ef7798c37cc85103a8019cec10b1524519f3",
+			"0xd70636cf5cbe78ba86b8de902f83f9c550a8ee31a019da6fcb0b1ab0a02bd31f",
+			"0x79a506d61c89cb7b1aef845484956389d5f6077fd10f8d1ede1e92474eac15cf",
+			"0xa66c0575cfea08bc6abbba03b0d10be7bdcfe6c5da9058cb34c22af2c8f3f1d9",
+			"0xfde316523b6b41fedcf11d776a53bd27fe3058c3912059197cda083a14410689",
+			"0x6774beba5e02630a7e4379fed7175f0f3d9f8fb5333451f25d5b044521ed38ed",
+			"0xb513ee7cf03529c88633176792a6b08585ff6163fe174f68e285d6315ffe33aa",
+			"0x4482f3d82f65f0fdf71fdf669403e0b835b5458e567dbd295b4f51d22f01650c",
+			"0x1cf0c0859b1839ebfb872a570e0c17886d8d7f26067bcd16af7f9f0415001aa0",
+			"0x231be14cb1cec949a4e806a7b3aebdb074d58e5a1c48b85c35138d5d3e967e0b",
+			"0xe8f0a0ef68efb2ea1bfb5d47e3c9446900329ff89a3ab7eccde41e09ec3e79b9",
+			"0x16348cb5e49e61010da09a5ad3cef83ab369ee3d0f28079584c23749cfa30238",
+			"0x6d33bc7f502436bfd0d574c3f6b1155c69f8a80e55c42c353e9e68abb46d932e",
+			"0x0e5d40ed7351b59846ca3dd8cc9c0eb71d4659e0add0dbfb0bb7f518bf45c821",
+			"0xb1ba4509de4c0f1212b2b07d949740f15ef8df9af8e7e9d765e6b407a0c5d717",
+			"0xa99615bb15371a15b92c119f8632f1ad7c29d6eb9a69e0ccf33a9dd268cffd54",
+			"0xfc3601e7f85e4b8e996bddcf1b34cb6c20462e21c715782da12d8e08a01cd21b",
+			"0x872b0f4f3ef00cc5cc6fdd71091de96c02f5898826fda4f837832f302497b51a",
+			"0xb34656439e4474e075d8ef523f6f74ef292a22281e6dc0b8fabdfd2339389919",
+			"0x048d4dc500031aa56d89e799499a86d6dacddea795ddc4571669fa55d694345f",
+			"0x684b8762b97a9d650f0f0e5edee73b60a29f6e75573bd6244518b11c4a571533",
+			"0x5d20bbacb93f7b03d92ae0ce8296bfd113a808ab3a8bd7703838d7e8356b6714",
+			"0x25efac3c3bc3d4f10ed9918fd9581d68eaa18fb72d3ce7ca8e36525d8cdcae73",
+			"0x48b593a335aa2699a5bb5a60394845c7e4c78046e050aee1c7f8831249f75b26",
+			"0x6db7243073caa6e5c0442f2f3926885fae0385e0238a69784ea8a00c854ef8c0",
+			"0x3a104e4932193c644e2135008d78c5153a9331e6d9dde878357c250a3b42b5e7",
+			"0x74b3b4666fa9811702d4eebf9680053043160be3a6c31a0105c703e07d530710",
+			"0x179f67ff0710067d3180ec03d664fb3d9936e8777603b051ebad4cbd0aad7763",
+			"0x38d5fd43ca73f66127a0166ae074324471b1a92e6f4bf99fde235ac408b35562",
+			"0x1f43748a027e7731c2fe5343ba7b61d7c6c6933ea45466b439a43eee1a3ad398",
+			"0x6b130b75bc42dbbf76ad97287a3a130ea29122ce7e48c5a8bd1e80a5f3121364",
+			"0xcd17f77d87174ab6ad6f2dc60d37144aed40b3620a9e6c9ac3e328aeae3097de",
+			"0x3b7fe9ef499348315c1a2877bd7fa44b622fcabc588687a6de4d2f75aad3f642",
+			"0x6c73525865791a7ca8410363d634f6babfaba581d7a0252c7f57dc8c8cec583d",
+			"0xdb16b0220e129be4c929888a8a46d21d422a352ac7b0360711d786eacb56598e",
+			"0x44fb22efd89e585079bca47bde1073dc052f8ddbad2c27cd8e2839bd4350b18a",
+			"0x1e6f1395d417a94162117b9371abf3f781a4b05d787f6a38fb0101bc36e548da",
+			"0x3eddd0764196fe15d7ac7069c04c4bf23070e57931493e9a0127fc521187b698",
+			"0xec104582dffc06da3cc1af1c8dc7522d26ab2408dc0f62051da2ebae1ec1cbf3",
+			"0x3616cc0faf8a5f5c19cbeb482be2ea8de01b2a3e81f067366c715607cf29078c",
+			"0xd37ca9cd5dc7c3c4e2d2f1b3c8db2a016b52444f1c088680c8544b6cea30cfe3",
+			"0xc3d85c7899da428a305d941e3637e33eb4981f071ee07c1ee1c82aba7c248167",
+			"0x62975f10a20de37466b1822859f11774efa4f37fb701f6cc0695d206bbb51582",
+			"0xd940124857e67e220e3d4dc27eb75ff048aadd9b7fb29b680cc3743b3ab6365b",
+			"0xc89ac3aa4725191e56fbc87d41caac2c692dd5adae638bf741f0ded040ca66e4",
+			"0x97454878805915bcb60c9915af0fe0558987dabe5d506e03898dede96544dec1",
+			"0x6ce55ffc54eec31d980ece5204876a3f366f3148a4b8c10cd190153cfc96defd",
+			"0xa4e923671f4ff6dfde2f11cca452ed4208808e93e1131de4ce0804cbe2e0d3ad",
+			"0x772d1c2a0e70fe37ac0ea8d7b4a789f92997bd654809f20f0ff7ad76a6d975c3",
+			"0x8d5de87bc2484465a4876b462ebc1339bc13b8229e6df4f1a9e9b458f5e9adcd",
+			"0xdb33cbb2dad0eb38613d69392951c6062eb669035691882fdafc526133d15d21",
+			"0xb22b8c0887f71de2da3d81a5fec2213ccb8a32060211077e2ed1613cf7962e94",
+			"0xffbc5a82fe0c2b3f3f34343ba6823f35884c8b1dd80fbaa68fd5f33a960034ce",
+			"0x9640ded5be08a8a7a2e6291a91bdd58bd108205f4cef5209ddd338ad764fa9b9",
+			"0xaea7f934206d00a592502b8b85159e64b56def4c72db3a790ab46ca81c75d672",
+			"0xb99ace258fe4e6be541c6e3468913f4f32ef9e9d1375c889e17ceea0c606e729",
+			"0xc54ae75381803d00b52ea6fa620766662e6f7946d550208743fa64d3aaf22c54",
+			"0x4e773cd4fb2347b796595cc67eb2b5c7be6409bd8b1944f4cafecb6fc5a60a0b",
+			"0x263f3826196c238c24d4c792c3c45fc913d4cb94c2d3871827ba43faecbf4d94",
+			"0x7ae1714256e21b9b45778795cdedfad1160d571004f5ea6debc16406bc2161f6",
+			"0x0c271dc055d8fb1ba9bf133f3c85628ac3c2b588091768380a881a6183514b51",
+			"0xa5f41cb430b02fb1027d8e99cd94dd6666516c785d7f618a0894f38f811bdeed",
+			"0xbf6665cbf1037e0085808897d8b04932a6ced6755fa52555ac00737e8029c7b5",
+			"0xaaca2ffc61693a6f379e54af473802770b3971f6accef49e5a2e8fc122e0a490",
+			"0x7a3eb7782e2c02776aa29964689cb1b880201e1b81c8cef39738d7f7235fb022",
+			"0x7bf417dda75c46efba6a8344775915d2b69f954afd66d8f52576e106d7a7eee2",
+			"0x3a324507874480d0f4e8466ed6602c99fcaa7907b61e9f2b3f100740f7866fe0",
+			"0x3589941fb7bfda9bf50ad93cfed18cfdf199a6468074416aa513cf83cc00dd2a",
+			"0x66b0965611bba105667a3990de5acdbd398d8d6e2cd0276b83814c4647bfe461",
+			"0x703258ca6154ec4cb1b9162678e3bb546ca6f9e626702f5f62dda98fdc0fcf26",
+			"0x2a9a8e3537b714cb3e158f7ecc816239786ea3787b1a3bd40482f02eb0b21595",
+			"0x46104b558f57296b0775d63ee4da42a716c234f3dbd7479204f35b31f4b3d55c",
+			"0xe7d9d0a86cc8b76526acb8e260de17508874d1db6ad19a4a84210a010212d43b",
+			"0x04af6e8bd51cf4c4307b2381b2e0c54cd991ca3c7f49b8cdcaff3aead70efe48",
+			"0xab8fe05db68e486bf2be0c507b834b6e496c1d1fe560cd3210ed7fbf0e9b867a",
+			"0x0e6b5f226d0bcfbd1f0a2f61189592d8974b16376fef3d0a67f757b796ad6854",
+			"0xaab68c29b061f8f72d9f3c6f2e318a7125a01010fb0c547835fa31e72d8eeabe",
+			"0x0446f90437150e4ec6246be5c718e5054d62cbf5878479457d522948c6e87f83",
+			"0xd1b4669e21c0b175589c0942d4423cd2b438de6665f0bca10818eb6246a07749",
+			"0xc20d1a68c015d886ef8fc3dede0d116199480164238617667280f833a4dcbb3c",
+			"0xe67504ba38aee984e9118960827ddce0eaae3d8797bfc87afd4638cb1867e41c",
+			"0xd3e985af3bf3e3ad0dbcdbed9ff1b04037bd1ff2e71886db3842a29f0ee8c4b6",
+			"0x8b809d1ae7a835f318f471ce227f7e7ff563a15d1e2463e8fce5852c9a3f9ce4",
+			"0xc232b56170a5796aa4333d29ad8ba43dab2233e0cf7b48d100aeaa4b2491d6da",
+			"0x9c338ecb25290e91a83978df4f5b7076b299ba5d87074c36ec96da0b3aa9351d",
+			"0x616a6134eee1221e531fc6d6b5861f5ced64e9b56505b169da67ca3c47cb54ad",
+			"0x4afd1e60cbeb40301c2ccc7129042f9a944f4a383a4f34b8acd7aa454fcd0e7e",
+			"0xd52d1be650ed156ba12b0d6be4b7fda1fe89927bd7626ec0ae45663848144e7d",
+			"0xa212644d968f7d3d89c6f12c3c3077184943d986dd9cd391d48f8f98eb1bc6a2",
+			"0x8e3374acfb9d1724fd7f84c22fda25f91737efde3d667f607b364e51beabecee",
+			"0xd77eb30cd87046093b27be1a09d93cfa5261b780b99116a79d6c16be7db838ec",
+			"0x05093b9e39e2d9f4fa95ff386cb2af67861359ea6228242be6b323c1eed5c7c3",
+			"0x8bb25606225d3451a981af24506a549e2bf62a362149e4c77ac72eef6316e691",
+			"0xd2749fc4a37792b3716634e3dfb8a80ba3e30fd73bc119069d507bfe7efd8a1a",
+			"0x3b58bef2d77a04b3281e6cf80f984b9067290bfe02a596b2295ccad38e887a33",
+			"0x2f69797f1800e5da4a4086909058ec857695a220644e61788b24ccfaf7e77137",
+			"0xd81872c67fbbd1a69d4805cce578b9f36bfd768d3fcbc2fd610182a7696e23b2",
+			"0x2d3bc9fd303c12ed1ca7efe27d85c7b5ffb8e079e59c86977a113bbbf863549a",
+			"0xbaef802512a7ea5006cf816c51c35fdae44a86daaeb6e9dd8fd0c37b4f744875",
+			"0x2e7fb70924e6f0b74541f2f4cb13f49bb3bd577f5bfe1bc29d805b0e7e1a3df1",
+			"0xe3918602d83478eb416dcf80103b09a051d5cffc71b0cb21461c5031d38befb7",
+			"0x87dae7dbb38501d6e84f738c11615dd9eda5f7b77e096a765caebea6a8c691c2",
+			"0xa19f74ad3f4e218fcfb15e4af95713cfff4f5f58169b789167e2b62617023697",
+			"0x744930fd0046b3f7de0ecf721e3b36e4b36c0f49eb98bb0c9ed33d40e76a2017",
+			"0x5bc7194687200989382831785b43f7f5efb23105ee2dd7a620a61622a2afec44",
+			"0x3672af2176d897cb8f64f2decfd924d74581bd85916be85e53f2542a54a24b94",
+			"0xe2e2dd1875e9265072d96bda4640ec6beefdfa9a91241ae078cec4c2a1c9b8b3",
+			"0x5866de65d88610e6123b7a57e28e196afac484045261d1a16b83fa232ba267bf",
+			"0x7224db0ae652be5fe9017454dd40c744c75e513841b5cd11d5fcaff598265c7d",
+			"0x04438fdfb56d125bb13f6b8bdaced6946299f8a32610205fabf4a8db9c06af60",
+			"0x9e9af6a569b87a4717b94d8253a0078409bbce7bc08874e091163b621a75b999",
+			"0xc8a39c68a74f23d615ad49d9d175086bf4e1047a750165bb071e3cdb70e1d639",
+			"0x10515734fb6d38cbb9a7ef33ec7831646636f845ac40cb24b08c432422763466",
+			"0x1604dce1fd615791c66246a7cd82edbfe860a5ac48d000cac1984faebc00cafe",
+			"0x56311f68cc563946e251d8c0ea74adeee6ed8dd7aba8f6ea85367defd5dbdc41",
+			"0x3fc81adf318fa6db1c4e7ff5424b235943667f2f3dce5119618e0273eb23c93b",
+			"0x38576704f6ca62083130dca418a9b68e374944d63521fc3f4b7039754d62f63f",
+			"0x56e2a402baabf470d0f9c3496d75e2c26c26ac159b996c370b118a313a9e9464",
+			"0x501af705914bfccf4ad29c38eee21641590cd8d334dce9055d90bff57b8fa556",
+			"0xa734b7f045d2a23ce602b032357a66763714c6e4785768f07d55c22d2f1de372",
+			"0xc80e2c739a3d142a4018bfe2074da8da33c471b93f5e7b44bb150b9eb63e956b",
+			"0x7a0b1355d05b1bf4c634651bbb2b6d65cb0a9772c30e4024f5e781e5d404376c",
+			"0x73827f7c7a15db5c17a986f31dd92de05579b0bb8def065e5f1cee472d00281d",
+			"0xcd64ee4b2a912d48e6beb06e7d6c9c236b5815434c0ee21cca0a13ff23dfb85f",
+			"0x768d2fa63c53689ed899f47c6f78844ace885fa18a36da427428f4af46a9e1d9",
+			"0x643c26723d5a4831d3d07f8692a6dc4456bb6190ce2abf1abf69159942d5d548",
+			"0x03e20a75c4546d5f54bbd7fd3e54c795c180b880563bf78ec55530a89188a9a6",
+			"0xa0ea4095dd9fc6f817c656913f8cde4044e2806488be48770de5574c0b5d5f8a",
+			"0xeead5fac8f3c83c5a10df161d95bcf1d27184c9fb9fbd813ec5f61347c11280e",
+			"0x5afba4426fcae0f1769e581fa6af97b5ef8fd417771f10405e1c9d09a74357d6",
+			"0x087f65be7fc2a14f216d7ce418a03fcf1e6169e8620db65c11d1ed6c0afed240",
+			"0xf9a7e93c40788db39b241e03afe329b6336187fbafa40c97ac405fefc1eccfc1",
+			"0xb02450b58c5afdd0907ee745263aa6beef662646b96b9ed28b0dbcea4f358667",
+			"0x5029f1169c92671ecaad7239f40fd93adf3ec07ce2ed0c4cac38b0cc8034def7",
+			"0xc8465a93a1ba7ec3296d98e0b01ad27bdbf16a347c5517b450905d3c3668d505",
+			"0xb85cd82c551bcb30a747b2258327dccb04094f918e36c3f120f55fc35abf59d9",
+			"0x1721b2fb8963696cdf32385fe87e8ec2c2d7fa34e099bb65498e4a030e20a1c3",
+			"0x6b6dab262c1a32a67353409d2f8b791b1799ee6a8e3c880877af0bc5cc5b812a",
+			"0xa634110e4766d3451718061efb890238796370da3c4a53a91faa96c8944d2423",
+			"0x91ec6c6f807285599e0a179d0d246caf10152e733acf3bb967bae35fb36561ec",
+			"0xc3b2012d5cc8d796d1890d39e2b1730dd53df0b98274bbfef8c93bd969912852",
+			"0xd036b9b29589cc551bf27ab95b6366d772e7d692d8fba48f473a2fc2d023dbe2",
+			"0xc51229a0306e56a53bdab1fda497281e23aba6ab17301c2eef3ce3d01f56989a",
+			"0x2652cb79e0c18dfdf545562b8569cc2775a1b0b1b465cbdc5880b40ffff22676",
+			"0xf24e0d6c03961043cb41638596c4ca02e2a2522a3e828dc4613a72ce5a535a67",
+			"0x01725e03a7cbfe2d6c5623829e4d419bbeecd1c7f925dbf1667979bb4da6650a",
+			"0x3b0c9824b726b2b556c6c46af48b84f856154490a51d775ba06aad48055bcbd7",
+			"0x2be2f1cb826d7575e53bc5e14f1882d73bfe145ed91b2ff56a885f66e136db46",
+			"0xd16752cc862f33b14f5976049dadc4f15f147f2fa76c50bafb38a7cb25c8f881",
+			"0x66b3ba188143bd421009c082031696bfd6d29fe7b9c3345e7e70bf6a470a05ec",
+			"0x83e017e8701b533c9fd22e30d63c3781b0ac9ec1dff4433fe7fb5c8f6f4e67ba",
+			"0xe4782b025953c5980653abd26eb95de1bee0524c14a74b970ec5615f98ed6768",
+			"0xeda29e9b36262e7c79ef9c0b60fddc66bae542b19caeddcdedf439573f773cf9",
+			"0xbc02ac1f023993253394ca965f4394bb40f9c7822ed6b2cbdd249e4b72f9b637",
+			"0x8e1bde0f2541d20b7f7e8179014e0f6b98eee5c1e0278ff1de38f4c13fdb4161",
+			"0x7b762d3d64aded9ff99e3423d7e676dd307b765ca6f1295e079ac53d5a4788b1",
+			"0x1027bb44ade6a1f82f11e9f298fd3957a9636bfbb97457c319e3d57ce72146b3",
+			"0x963864b3164578d4a7e58de16593273067a641de752b6df2c9b8bfaf970392f1",
+			"0x16bdf92929fe3629a57f737d83328d034c36bbdcd006301f28dcf52e1d1cb542",
+			"0x69952e47225f1aa86d952afb0fa8c668ae710a10cb6a94477d518c8f771f5c30",
+			"0xe68895f4ae2e4a35fb7e0730a5ef9c3e3030f6351ff6381f77e6311912ced98b",
+			"0xf28d799eeec538dcb2f371cfc6aa16f4a6808ddef0e6fd0cf72fde291d94f8ad",
+			"0x5a404922a9bfe57eb85deb66d8d83c869ddf96eae17e7fdfafef19c19efa1eec",
+			"0x96b735672e85aa95c2f8b4bd5ac80942923cff64a24991b3103e4ee39fb9a8d1",
+			"0x83d922f50174810fc45daa5a607a9b4fce69d8ab86f428ac57ffdcd9c2ff2908",
+			"0x3b0ce5a62116eafbf445afff0674112f01e1dca0e2af2b72d0cbbdc452177d65",
+			"0xe86cc93417c7dbcd4b5f051f4dca1394d272dcc2101a9e94a140b20f5e4c8b59",
+			"0x99b3e1d593b682e1b6454675593ed6828f8f4c5888b965981e3a7c602d89d031",
+			"0x81e0eafc2a2adf3d94938c413cd9f588e7525b91f39a689dfc3d0ce6aeb812a0",
+			"0x699e692ff89a918eee6d19a63caeb07832dabf1eb28d04ec97150c87045d9129",
+			"0x90ff00b66a14d821b05f692ee6d100dd61abef3234fd29e94bc84574439ed2e0",
+			"0x2de5779a122ccd84a88c3adc4edf7c1c03dd1d3e89ab45657885aadaa087e833",
+			"0x775a5587a907aa5ff13bafed032dd96c312b19dcda1b0e74e8a4bd327fe90e50",
+			"0x4fa48215f975442e6b9ea0629d308667242a7fe89f0cd0eae55ef1d35a3d6ab6",
+			"0x2e24c24731902f1b9e4042eae9e946b9d884dfa9f733ea5d4f7e778b68daed9b",
+			"0xf23a4a6061f45b1ff2095adf02ded238b37a0ffa9653fa9c1b0069e37e8552be",
+			"0x62b94eeb74bca8d9ea91aaeec5c13a05dae022806df28b92ecee99b47de999c7",
+			"0xbe6c1797cad2d5d9ddac3b3adcbf1622241e2560e3407139e24dde3fd8d3e435",
+			"0x7df0788058bea0911f2e30133c835515bd777f7aa9cab6bcd27eb3c0a6e360ea",
+			"0xd87066a4721ce567f44abf179184381d81c1c487158a6c57b5f2455472209a5e",
+			"0x0aec7d3081c3ee7d61f36e8c7e62ab74e41f00b664b690a341b9ff7feb5adce6",
+			"0x16345b31779e80499dc01f9ccaa0e9981b2b336500f33cb1f2943b66ccbf74d9",
+			"0x9ed6c6685dfa2b65903db0b234f4539906121330c5d55e6b2a2fd30549b2dc23",
+			"0x6539602958d9166335a7a0396ad72be611661bdd40c786cf9b0f382039c6b46a",
+			"0x72bbb4a201de75b9a4b5cf7381308953234c62f295df08b919c12535febf6fea",
+			"0x2d37293863f6b90f43979ba5944bec302008957e07b7c7f2292074a0a3934674",
+			"0x22677859ad20cf8b924d516b9f979652ac91a27459a4eba5455beac7f5f23128",
+			"0x704c898c04ead58c2fdb2c753359d10934e66b326f104be28ca7a32ef05a2bc1",
+			"0xca2b1ac29937067b761b57b58ae4069eecc799dbe089342bea274e56fde3d1bf",
+			"0x4a9773e6a2e75dcf1ff46c8f9931b8170a3609023f47c0ea9c4af000798bbc22",
+			"0x7e4dcb6c256eca2cbe9d168cc78c2702c373fd6e69c210d0713e2766baba148a",
+			"0x399ea7dbb66b95bae693402eec304f9cb6f4c6ab729d90ca569fcc2bb24d6442",
+			"0x49d0e561773458f834c96e8fb9496d4cdf83f2cfab75824cb1eabf8e8962c18d",
+			"0x80a0a209e41d0c3ff07ffe6a7f1af67997662494a327fa7f3bcb7209340974ed",
+			"0x2bdd6d6e7ae3f4386fc655817e92563e80f46e1b277be22f81a689de7637ea1f",
+			"0xb77f32374161e54c50dbc38822760874d966f9e098a2ea7aedf650adf25cc0ad",
+			"0xb49b1decd65a998a3dae2e4725eaff56276af3f0c50b2a3a35b6e94738d32808",
+			"0x319f78ae885011458f47ff1a110881cb4ac6a78c7d4d7a2656ddca73a88b58e2",
+			"0xd9fa2f47bedc0b405df34c98582b553dde76a46d38ac86d9d357ea0aca60ec2b",
+			"0x4283ac57e82bd08970ada71f4617728bcc467eeebb19c3aa20208a82b18fb508",
+			"0xf2ea3a5ac3bc77ff64f7c686305044cfe539856fb2833cbefcb283317012062c",
+			"0x840a9b8c756c3c3de7170c3597bbd085747b97419c01bbe484fc4cc7924736ce",
+			"0xa88682b957deb995307ed875c4044246d779e3f8c584cad75162fee119613806",
+			"0x7b9195c23833f65832a44d097290d8573b43e6f3e47dcb8c3826ef9a52fb4ff7",
+			"0x57bb0076c87f2e7187ea92f9f7643eb5b4b823b8eae9f6e74c8b676dd86b81a2",
+			"0x68593a8268b245a5c7506a05860755cce1be795994a7d736aba41ead4c025a68",
+			"0x90e21d5927d39329874688312eeb5296677ecccbbb9c6bdd4400c50c9bda09c4",
+			"0x773c0cde2d1f44575c89106a01881eb5d9593bc762a40be03ba979496ad7d229",
+			"0xc1dd843534e9844bcf406cc03b277e71d4e73026635412e25f3555d099f26a55",
+			"0xdf3f794bbd98096cbfa17e168c0de845383abf52fea618937ed81d31cfdd88db",
+			"0x1b05b1f316013609fbf813cae674f193a9bd8a75631b55278bbd37513b85641b",
+			"0x429321ddb251fadec6b6f794acdd8cc9d93512b98af23d20749d93c3c9fdbc36",
+			"0x6cac90b28ed13c907d094bad45574aabe2355e13e6a9504b6001e5fbb9c25235",
+			"0x89b43a3f63a2ce4f67071a121f447d7e843948395616116ddeb57a8714becd3e",
+			"0x6de560c95a0483d51410f66f38884947dfc787e1c61d14421129773010b46e0d",
+			"0xa0ba45049971dd4b906e73f917fd16312646d53c0cdfdc3eefe53628a58973e8",
+			"0x3d4a4f7155eac18fb5a126dcae2035155a140a84718f33bb20d2f1461e8cedb7",
+			"0x1cc19669bd91087d2046770cdc34e8f995cbdf2a0cc62bda70d6074ed58acefb",
+			"0x7c1c4aa1817de27c62f35d66927d924376798c954d65ba3ba02c0528d11d748d",
+			"0xf0d67a8f3c5306165cffd44476249c254898bcb26c937f10e8ae244edab1b972",
+			"0xcc20c5ecb1d3e83bd56e9213761f8320bd40982ab5fb669bed774b4490637932",
+			"0x7935073eb3e5c37ed1135cb22bfeb0e21727d170d106465fc35de75e8d56cf41",
+			"0x7d968e74212c501d0bc26ebb816b57a37a8cd2720caddb5bf66f489e13a61bc7",
+			"0x2c134dcc35d50c63a13bd8868137e0240280f049d7e392b97ff5f76d00aa1296",
+			"0xfd046f06c1d46d9125a119f786acdd76a85fc596f21cb15f367933b717ba7d83",
+			"0x9f5f067e4af3c8e92d2d54dd061620f0a13a66006b162a1eab4b1707499597df",
+			"0x8a6e1fb6205a423ec2920d448a376b95cac7233d5312287bd850471fb49e4f8b",
+			"0x2a6ea987659383f9885d24c935fe56de39d45caa89e60ba1768189318974ed7e",
+			"0xc2df6c8a4eae77eeaf11d7e5e2198ec4a33f19f5995caab4db6577fc1ce7b957",
+			"0x1e2ae8a42eb937749284820e50f11dfbfb606ddac3efb201e0b2664dd0196d63",
+			"0x4d63bb91f9f8a9965c460326f0604a27ecb0fc56f2126c6b3519b08a895747b7",
+			"0x9a46c2ec5dcef6f5c5b76d4b08b9d5085709182243cb8308a2863cca8cba13dd",
+			"0xea57019cc85f7cece4cea7eadda96dc9e464df2689957ebfe8d817b6996b2e43",
+			"0xb40e930b31dc1508480ffba351b102c8cab53c6603a0dd88bfed1b0da5347153",
+			"0xf51ceb070d8e7cb998cf4979ac985b4850949b4456980f523d8b9d72604a43da",
+			"0xddd28627f5c7bd213149bc4886bf4bcb8304f86068694fc743ac81ed749aec3c",
+			"0x9ef2b3df587caf086f4a9838a829491d1ef45db132ea71c6bc96a4a40d833e92",
+			"0xc9f7d4e19501c48dda5b0012cd93564898ad080a653e29f3563ecd40d36de84b",
+			"0x0565db36e6fb7b881eae309fef6fcdcace7c92a7ff148476b627c012aaefe4b9",
+			"0x08912abab10f16b92ddaa3663375f6e2b656e4ed89f2285aab6e410fc59e650a",
+			"0xefe9e68ca3bea929722bcccb5150884eb23c32153b14644b1c7f4e033dc3f718",
+			"0x4b33e0e078056d9efd857f909d1e409516f23da68105463167e23d71c90f6366",
+			"0x63cd4d1c69c4168798a3d9f15388207ea10ee4dc6be3681b0c7dbce5649d8f90",
+			"0xc8e7c25854d49022e9a0ae2eda8e7835a6db9ef7d612312e9deae23621ba240f",
+			"0x22c05e50f27e8bdaf4abb0a045d0639bd7f80057dfea638df6a7184ac49b738b",
+			"0x4a34356b5a447591ac66c51370fb6539bdf50fda9600082dadd91d33713a74e1",
+			"0x7147d53533ae40e886f6bc1c3b65c51570d72398f46e3266f2eba7b707b46b3b",
+			"0x1e49f75a30695e9bef14b036bd1c0f2b322042b2a02ca56604484e913b284c1b",
+			"0xf2445d48e823bfa77776234356ae0d3c1a850db236b3d2a95e5b00c4d7e687af",
+			"0x7034246c6342c26f5ae974576358f993d0e5e3c577e6aecdcc182c78082ab181",
+			"0x965067896ebcb2628ff10127508df1c811087f45ae258a0d8179d576c21e4891",
+			"0x384ebc34021ebdaf95e1bf0d8d61777b96a1ae65163cd3bd9b4311970a7918b7",
+			"0x1ca6e203cf1e058f20f5a8b1e33464801bcbbe04c79a7201ad6036bb8aa54101",
+			"0xf5aaa21a85fa9d502ef278262acf71789a3755d36dd8b3794becab7fb2d338e7",
+			"0xdeb7dec7ec133b6ac05c3bc0fea3b0002c8ffe58b135f4ae85b71fe0350dc7ce",
+			"0xd5773586ddb40d4c772541f743f7a4b08e9b419fe5b5b3536afa0b3b888725bc",
+			"0xeaff5bc016770c7cce7be21952cd8759a8d0eeb1bd849732c15dbbb82c613a74",
+			"0xb1a6a6acd39b4428accf9120a46d74cca6451ea4a182206425a8a64c6d6be5b2",
+			"0xfff27e5023fa1fc365db1e79cf3283bee2f51333059bfff47df39f12875e5fc0",
+			"0xadf1ce203b0acd4cdaf1d9a91cc158a21c823dcfb0740f089ce0830102b1cdef",
+			"0xcf20c92fcfa22d6fe7a60d1aab2d5a942db39d447d4ba1e9e76888a64694f1e7",
+			"0x210a684182ea379b50d641aed1baae3bf3752fd84feac4b3dd4e110c5cfc4ce7",
+			"0x220c5460803cc8db7a2b645dd5a4525b0703182cce173324d20e1c865a157811",
+			"0xba87b487bfae148239b44f3ad7663fd66cde8e21aac9e1a50bbca7bb7334aeff",
+			"0x2728161f9f040b4d92ba838d841404604d4d838157fc66f20d6c4c61034fdbda",
+			"0x3f8a6c7198528e5084b3e8d52d3101c27c5bed8721beb831ff921eaaca4c4282",
+			"0x2cc2574320b3c7252404db7c67b462fbc8d87bdbeb782ab1bbd257ee634a35c2",
+			"0x13aae0ecdc6a70d85412178ec12e971b2c4476d5e624938ca0284ccfa611d11f",
+			"0x6af7161831c3442db94cbe28ee9385fe79339d533b9c0fd3266213c2a5024a14",
+			"0x06185136927e5bc26ecfbf2299a0fc13cb447df6ca4a60e968be8c2b7ba1c2e3",
+			"0x70ccc84931d910a2489d50becf82383a836309bb90dddb21026d9e4e4368c85a",
+			"0x400ae9e4da0f847dcd4bb65e8f9f661a3b0deb78346b4f1f84fc712fd34410f0",
+			"0x57aacedf503300888fcd8db2138badbfcd663c63c3cf5b3e35979dad635c24d9",
+			"0x8fea6cc2da76b7cc7062af870cfacf4952b81f09c3c15d31145fbbfe1c0806c1",
+			"0x5125434cc5d4137ee31b51ed8306b4d665b8dc66504661b46c227e62a9ef1abf",
+			"0x254bc0b61211e0a57755d73ac618012938472912f855972b7ce62677f5d0e64d",
+			"0x2d231389c849ea459a7530ac1bdffa4d84908e2c61125a70bfcda932cc8e5efd",
+			"0x671ae73d4739bcd4841fdff266803117c5684c61031fff16e831a3bffb4bae4e",
+			"0x64c4db66cae82a96f29296b481619d79a739e2dfce0ac1f659d45f526ae58ee5",
+			"0x3f2f08ce2f21253f8c9a3fd650a885ca0e77f720a21ad5b4c0867150a0274efe",
+			"0x98c48268710592ee4c26620375968f2b8730a1bd1777239e6ffb9f116c6e1284",
+			"0xdc7a5c095c255e1984b4a5fa75c7a1d95d98097fc4eba898e644ff66951d8dcb",
+			"0xeee7579812ef09ae31068e8087536362a967b2893b709a458822449ea89a48fa",
+			"0x296e707796c0b9f9a2f55ad06c42d03625dab94af71c2e1c7016a7ef6645bf5a",
+			"0xd9a3eb363d4a36300dc4d1903a83447c89ec286f8d219f1156335da283992d60",
+			"0x039adf5a0cfbc394847d8014d64700ac4b6e78b531a1e0328bab256f7c407116",
+			"0xf9a92c6b1f0b0b3d7ae33cf5ddfddad516bfd7b21842d76098737533efd4f7a8",
+			"0x5a5d1fa3b8e05a81173e627f14e689c166776b93df401593db8035a65fba58f5",
+			"0x34f7fda3053b9d06e217223ee06fd194e2962c4a381482429e596df1fe319686",
+			"0xb4cfd9a71a98ad52c7705d55e96f04cb9064b1c32d3c346be51370b56ebb0f8e",
+			"0xd46a93765af68d238b776b240afd464a24d8c8bc869280ad618fd0fb6360e878",
+			"0xf3c622a4ee05d1ce27d59e7b9b3748547f4efdb1d6ff72a58fa93dccb7b76de1",
+			"0x6cb017c4bd8bb5186590cc4559fd9600399485ca917b10556b98cd7fb61441dd",
+			"0x7188f59c892b8754845d73f534587f27b7da67f42dcc1c73390fe2970bf0ad28",
+			"0xb4b17c93af08b9f587963e42703379c5e4f760502870b8096917b09b3950ee35",
+			"0x03165bf9bc20c87412a41209901d2bf3c8bc03a8586a1706fe1499641cbc4775",
+			"0x9ef57b2126a38c2dc456c13c272de53366dd1bf1fe768185a93f3562d064fa8d",
+			"0xbc3660089065220589409f7063dde34aa080179b3f22464fd9df9eed98d88b0f",
+			"0xbf1cf6eed0e0270d6be602040a97600ca7e1279db4279a9fb7ee643345a264b3",
+			"0x4cc471987bfae3b32179aac7018ba574c0315b9832915b5d0b804b38e9def6c8",
+			"0x51351557582b1d821adfdad36536b59b28f9a1f1243115486ce44d4b22d3952e",
+			"0x66d6b02183b9def37dce37b66ba4e9939241732b49dbc8addd147a89dd9e0517",
+			"0x47261859ce169e56d4e7dd75c5e2648597c7906f9264710c7e4dff74f353f739",
+			"0x38edbf1db358c82d0c945a7fc024f7fdc1165331cc19caf6b8943d3ce76b721a",
+			"0x5231560201678a39175187469f7e36c1c729ae060225012ff4f679f3fabb8237",
+			"0x763bfbeeab624de07a6e758368f8f61c0fcfc8cda088d2dfcbeb47a5eea9648a",
+			"0xce910446cce07477d424f791a71a375830ac26a2543b8bd1343e0d775d161e5f",
+			"0x950ba34133aea3c2947a5e5fc1836375e81c042ee999b60dd4a27e6492fb41fe",
+			"0xdc24f20fda563bf74ff7540a06f3631af8ab3b3722874a6b383714f463f5fb43",
+			"0xf2250ef512d3a11144370747f2c86efc73abaa81152bc6083f87aa217d16ee67",
+			"0x8760d0bc8f28eb2504f3bde3e429a47f0aed1dc2c7abbaf01c68033c07ad368e",
+			"0x7ef1c11b1f025f7e2aca2624aa9a11781cd860f24ce3fb525e7196e590fc5ff0",
+			"0x7c4e717fe77c8f9e742e312081d51418614031745b182746c7ceb4ff54deab6e",
+			"0x56c82f80b8d52128275529fffb3ccf7376f411d7cf9464a15fdecf617b4e7571",
+			"0x46f7d3ecd09c29d36a62a1a65bd3c59a14c82687b5466c9c130df14c286c2a95",
+			"0x1d04deaadcfdc7a1e5e612df6eb836f55caafb4f9bf4f1200fdfef4f14229f26",
+			"0xa0f5e65e99a22e14ebafc71f093dadc96c68883609a7460f904eb15360e3dd6d",
+			"0x8ea6c444466d4b6916a1b6dadafb87d75e2fa1ddd1836425dbaaad6e99f4d68a",
+			"0xd53d052bb709813e6dfe218dc4bd99c5ae83b6f5993b182c36a386502713c7b6",
+			"0x2e0cc1dfae87825d1a1d8946e021dc514dea384241e0a6cb66d5daee570c72fc",
+			"0xa419612e2bca19a3a8dc7fac4da86c2df4edcc2989e10d3e9050323011676b1d",
+			"0xe41649d9af504bd273b9da0fde578dc126afb55feb8b3c31a0d4eeaa9c7b83f9",
+			"0x0121be707b5666d5a78949b2ee263bbfbd013b69caa9566864711bda4c7ed0f5",
+			"0x788538d654618bcef0a63e31576e19a0872a92733ef7930ef50f8afd6caf110e",
+			"0x7777a3a4930828cc158f696e6ddcb87696115f473f219ac5582d8a38e0645430",
+			"0xe15a9f42ce5964358f862fa7a40bff0c8e8d7429a5ca923c9f0d4d0d574378a5",
+			"0x187bd59945e1cc6a877fb324b1d7ebdf661383ae7e22c56913f2e920de73dd68",
+			"0x938f100308d20611bd14372b16da0dcbc888868f8bd183d667064dfa8e67a161",
+			"0x5e61540787c83bfacbb58967280163f55f5ed00e733d6295099588557ef2dcec",
+			"0xe6625082f4039ef9dccdbeb9488baedf75fcec616ed9d5009deb4eba95cc680f",
+			"0xd01542aefe234567f106a4f057173b4f6eb5733e0ab9537af2db309edf38763c",
+			"0xee0174f3f9218a3418b8dd2bcd4132821eb91b31391b7c2c6e5a84d067d21497",
+			"0xbe26c679aafdea135aa493bab8ee348b255f50bc69592bbe017dd96b0da58b1c",
+			"0x297e6634c06193ed4725942cec32ccc9b4e77b5d02fce2ec9fbf580e3dfce248",
+			"0x820d98bcfbc008480ea32b162d15701357f094b1d7c99a1ff92fc0afd9708a06",
+			"0x82bce2be0a2d468b2fe0d3ba4ec1e5e8eac2d83f8b2e402b3043119a59cafd51",
+			"0x63ff3569d9a5661b6773a1a5fc10a522ea12a22399cd337ffef75a0d36735ab1",
+			"0x8431746d8239126bedde7d5c58aaf7f733dd1542c942d415d876ebf8a062f032",
+			"0x6bfdf119b93ef4da6f48265f4c526f0837a10c8db9c518d0dfe1edf40ae5fcdc",
+			"0x55aaba1f40c9089c65623f67eef8cdb827282a39cd0778f26e2f73106d3eee3e",
+			"0x0022a0b29d8188251bf5c6f37c76368dc9c7ed9e00376901162d1fff111273b6",
+			"0xf4bda8d3cb5b7ad50dfcf2668253e44b98e87d563ce17720dd1eb1a4e1c32628",
+			"0x994315a889329452a3e08ef029e7d902308022b74aa5a4eb2178929425c90a84",
+			"0x86a962d1d436f43f6fcad5b61b615f2bd32f10fe8c62428854ce98f4289707b6",
+			"0x3ce476498f26fd1d0b276ea639d438d7efd3c10451949efee1c91f279ef15ed9",
+			"0x199b2fef89c1edbe547e8c0b666b7b138d6f94fcfb2f09f26edc429ac163b127",
+			"0xdf3fd62e7dd0133ffa23a0da13d720373b57e85c28ee97890c355c44323ad592",
+			"0x92e0cc3bc262330ed8a1f42ad40a2db6c4e75e2d39e24a6ed5eac0855c12dd05",
+			"0x5b46f058c21b9447f8faaf78b2549f7f1459fa5ddb4211150bc26dd718f8361d",
+			"0x316b4f0e5b50cea376307236de36f3a1ebad3c59ae28dcf7838339d8711047e6",
+			"0x2b72ece0cbeaf94140b99cd9312eb891a1264a4d31fd839017e22cd4cdef058a",
+			"0x0c86b9b2da38f00150d49ac53ccb43a88a44181c90b492e886c54b0d6a93de22",
+			"0xba5a671174dfd7f877bffd7fb3179b1f3f8444ab14eaa9a0488207141bda26e8",
+			"0xecf73cee14b1a8fa5c2de5d78c058bd04772666ff455ca4225ac419606041f2c",
+			"0x1947b6adf9abeeeb55a66cad4afd016f6522faa641c4e14af94cf6e610959ad0",
+			"0x5467aaeb96dbe111a0d36fa66a71f489fb33ab8d95692695c09f4680086daff2",
+			"0xa21fd9195eaf856bd048bdb258507351e9a2c168920fd0c550a2340b5176ba26",
+			"0x9b0cf5690d3c3764f5c102fe1d5139202a1f982bd5afc8967eddaa6bcfb3af42",
+			"0x32bb410896733f9f6080a5b574b07c0af3e5ecaf69e995751e392c3905c11d20",
+			"0x5e98b3dbf58bf5adc0ccc9269aa10f9921afd44283837e7cb419ac4fb89f6164",
+			"0x051cd6e01ef3ebac9f27e1d473b0abc00d870a78cf894cfa8222d00976948b39",
+			"0x500edc8298fb83a103f5bf779d1df507644e054ef27ae61ccf31d883d85c2a0c",
+			"0x80c8fd7e50aaa14da3af3ec622adcf89eea9760ddbd5232a49ba55837be5805a",
+			"0xbb828dd031299bfd428c22110ff5d9f5612447e346e98401ab4a01278834e476",
+			"0xe2c5f408029af25cb9c130fc8fb5118660d08da399dbec0fa1709d1c0583de57",
+			"0x1be80d06b4ec5ef612e16bd8d842484039ca5663234174441f0722ca521958ee",
+			"0x21d755042a542493e44e92b4355af2f06f161c0e2583aaf6862730be7e9976b2",
+			"0x49b993b77606eb939ae485e82243e530e392af6d68be4ece5ace66a675a7a70e",
+			"0x954823b80bea8f2007503ebda5a6ae4610f94cc2c9a6ca22088a52468a960524",
+			"0x2693662c6c0961a92566deaa4a59204a0c436aadc0581b799e6255fe97d26331",
+			"0x4e80abe082c0b8ae0602c232ab0f766aefa702e744ff142cb9e101a6050acfbd",
+			"0x9c47c762c73836210a6bd78e5ddf9f2e817951d52b9fea0c823596c3df2a1fc0",
+			"0xe86094c8da0212cb0cd96f54c9f1b22c11feadc5599f6aa63285971651f11278",
+			"0x3031451f37f3e0288d61580e5b20e008a2ef5975e5d12345056949dca2c1d421",
+			"0xbdf90347d794ab3b41da6fb75b5d8d1f426ca2c4923216393e055dcbc89f3cba",
+			"0x4f7a0c9ebaa4833e7fd0ae0f3ac8dbecf3d97d0036a41ef30230e634142247e0",
+			"0xd1cdfbbf34bfcabe4a0eb90fb4d8592738203d245d68b753d418c4bfab8ae4e4",
+			"0xaa56db3fe5b2edc2ed277656deb51e15f86182de49836b4dfe2636de5488a86f",
+			"0xf67b05c233797d61eaff641e5bd35ee830bc1a8440e06f85e034902bd1023ede",
+			"0x49bb9be0064ff46c4b7820e7dd08002f3914fbf9250c96873bb3dcc7bddbe3de",
+			"0x594efbc23c0a371e3e5478c599466ff3a8d985444583b70f275afda13cc05c9b",
+			"0xd1dc59771492ee0881398f87a7c90db42874d720812c1e105b1512531d9fb1f3",
+			"0x7462bfbf8457d1df1288cbaf339861dc91c02d772f3c1ff8c215965e555d6905",
+			"0xee62a752465879dd62d08d7a15a54af1e813a1bbf2035384289bd634e2e99524",
+			"0xc7c66334011807d017e0df794df5f2f36c4cf496ce0a3589465662f8aa5433c7",
+			"0x839af48e65e3e1fd3d177d90f1dafcbb0209b107bf882cfe2fd514be625c1396",
+			"0xfb4eeb8514ede5bc952beee0e7e78c6d7ae544e6c4d935a6c92375b224e40c3d",
+			"0x38576e990356b7c44eb1dd531fe28420d01d80130e0ef0a42b9a8b01d2687822",
+			"0x434bb4312789b8cd93c5f930f4305760f86c54ab225b35bec70954aaf2fb4c2d",
+			"0x19ae08dadbf2f7da90ce777913d59e74592cacf6f385600f7d50cbbf7c4137a9",
+			"0xfc9a8ba8d7eff3a582725f8fd1539c4f77a87ecf23505de8a321ec6d568cab5f",
+			"0x20fb269b1a7908ccae92532424cc94604ca9a0908bd7c5e446a687cb3be9e0d1",
+			"0x9fe0a0e3511056762698573eee8ee2b0b87a8b6daad2141a9ad00c5b159521f4",
+			"0x3630751af37fd3ae22e78198868341e86735b03432879fb159628937c6bc28da",
+			"0x427789cffa2250d89b99d50969d8dd9917b5f4c721ed9de79cf81dc59f94d81f",
+			"0x5ad7e16bd42e35671230458f8f97c18baa5a1f81b675df259c9d2d7cbb09fb77",
+			"0x3d58c8ee704a934f6de776ef8373c653140e089b85aedd53219dc0b46ff03b58",
+			"0xa5a0719b16d8771b34e050660ba965b0ebfaa06bad1973033cbe2fd69fac5886",
+			"0xcd66e1ce23416fb4662d2b29dd72d9f8f981c66098820058451441213f2947aa",
+			"0xc7eb6f1df45136c9adeacb03eada4557326aa0a22f9ac0d73df25e21beb6bc0e",
+			"0x890eb4c610c7036e1494514e1f7ff72f414c51143fbf13cf2cd03d8d37a03662",
+			"0xa54328a1d2ffd9aa3f38a9e6a0539ad2517c4f6129f01768891acc0a2b2a721f",
+			"0x147644decd98b450b284d05d7332629e3c6444846f7c71dbcc892d3191f2efdb",
+			"0x1a19c1a8fc7f9d838cbd736243e66b1f637f49b1d8734c2af417227a11623b30",
+			"0xa8c14722a6f7e7efe695be4e6a21f2d1c8b8d71e2cf69e7645ecc5cdc7b6355a",
+			"0x8eb33cc1490499aba376f581b68766c4fd40e7d6027f223eb46e27199acc8d67",
+			"0x1b6a906a5321b057f453624693d4ae6abe79a5b8fcd63a777dffb8b2ea4184ab",
+			"0x7185ec1f19e7a84c9f914dd223b382ff56464b01a1b88dabda415a01e1d0a1c8",
+			"0xa172df0cb06617eeb95d362bb36d5e5ac52cbdb2e5f3c2cf3d9b78ef28fad82b",
+			"0xa11941ce1c866d077fdc995acf3ff2ee0ea0481eddd142f9b343c8403ed606a2",
+			"0x1958ac9a77c5b9825c401b204001dea8ee2520983fb3e738a467980a7bf9defb",
+			"0x6b24d043eab24359787ed7e93543967c9f9b7ccf99894c1ee7768f6235cb0cfe",
+			"0x6ab8c28ddda71b937d1a6feaa67b071f78ff7ead3a192ae63dac34ff24b8d929",
+			"0xf101e3da7546249b5b6d4dbe960c713cf152627a7482fc3377aa31f430c54530",
+			"0x22628e903ea9eb3eda9c93ac92d77b1b8a5ee62706dc5ddbcd079c57d5b721eb",
+			"0x0050467a543fbf0a232c8ce9f66eaec6c38c3c31b8ce3d590d1b07586374c1ed",
+			"0x4235a1330a45838b2d2aa9873dfbd59cfc0f0cd16e13ca9292f8342eec255fa3",
+			"0x2049ff9cebd379b51308220449b3568c6d7843f5b49f61b85808287f3d60441c",
+			"0x50c2ef0e832df29297dc524fcf3af4cd0988fbfea71987f3ac5cba8d4ec34102",
+			"0xe7260880b2d822d18c9ac2224d09fa18f5c324fb421470aad5af6c2605b40985",
+			"0xdf51e1b441b9809b26cd7cbdc4df27eb9c7fbb3bf764971684aab6c63e282a75",
+			"0x597b5c48840a25294feb135e0318ba6d6ca09aac476b1041748738963136a0a4",
+			"0xc710bd4b45a991f7f1387c25db70a1964ca4fbab32b738424d35a6e06e2483b3",
+			"0xd67460a50ec79c90a97e25d4cebdeafed6c897593fe8b24afe47a71c818a55b5",
+			"0x0ac1f2282e4491fdc8d28f1697026b7fa88f46204610cbaf8811d38dc84539f2",
+			"0xc3352ebc532273e4224dc0e94ec4cbb83afc2b5c364d71534344793032441006",
+			"0x42f3d39c81e118a7d515d82b6880104909a7915aeaca8ad64fe74d9fe88a7f45",
+			"0xac6fa42771e9cd6ba31dcff2455d2234c53c282251ca2399c727fd5521eeff0a",
+			"0x83ae44822213f59d34543a6d4fcf76b4e22cbe5a90674755072613550d348551",
+			"0x99cdb65200f9d1c602c5c2ded67a8cf2722cd7c1ae3f11d29a2c1b702923df93",
+			"0x2adda7cfa12bf5ecbc74ed4f4ea419ad7cd3e7cd03a0e2b32e924aa2ab98ec42",
+			"0x3da7434a58c60b7fc7fee8e30b3073ff4d3c381288fe6ba791f68d74d24ed19a",
+			"0x9dbe78f9121e6c0d99fa6d441f6aedf54be14fb39a277cbb5f19fd0b846305c3",
+			"0x2ded5acc49e2e1fcb57a66a81f59405febb50edb6b41d0fa8e445477028f422c",
+			"0xa46310f11937ce81ebe8d4c60de1a5c8787a1aac35ff3b6e2f0cc793112b7df2",
+			"0xfa693856fd1867458c335c6e903e5745a950ddf8a43cd9ee76ce8d0b3070bcbd",
+			"0xb374a194d9edb55d2946d40a16ac4617e4d0674630c6a970f58db17f21d22c12",
+			"0x651032646288a0b6fb5322626bbbc5b6b87dc5a5d59f5f39073f2f9574646c41",
+			"0x7f4346336c95c7fcfc1f849cfa63afd46dde8e346ae0801aaaffa9069f989e99",
+			"0x8bedf8e9f5095b4275635525fea6169c5afedff2ae434e42c5cde973de77ae3f",
+			"0xf92ac4f6fdd7801f15c8e0ee163241542d1359372d2189d8cd2a33f925933cd5",
+			"0x806d437ddf966fc6631a8f81a54eb82080fb2ade64a2b715872d8f648d23b57d",
+			"0x2151451d68f912b58bb510002407943ef6f2cc87a992e6df0765a4c239e63779",
+			"0x6a02bab7734d8549be10373e6395c368492b8518df793821962a940d5cf93654",
+			"0x4de627f1d096c86c1c1dcde2a314ba65700b1ac47b9db95e9ae68f8d28f52b16",
+			"0xeae202c747b699171115bb56652ed534d9ca6de0e8c3d947d63c6d60b5d658de",
+			"0x7bddba4a7c160445653f62d27c1622323c784461d52aba5a6f19964194a063c5",
+			"0xddfcf0c5ff899f19c4ed0604e7b4cc645ce5bdb7b7c7d6bcecfe7f2cfa3bdc0b",
+			"0x7d27d279f52b83afc9a115c71910d06a054fdc2e20625cd05fe35ecb03734f5b",
+			"0x415f6bcb216ad524eebd7bf177bce80cc3d5fb3e920ed65a8ba6c02f59fa88ba",
+			"0x570daa81ed1b593529a07396784c2996d5703f4124f941e99e8f9cf6b608b1f5",
+			"0xb9da28526fe8300989e16c83c4bfe418c74878be1bf3af12ff3b9a098a4c92b0",
+			"0x691938f83dd63e39be2fb03422682ee8dae8e0a95bf4d09b4727f8162b2da11a",
+			"0xde168c58358db826c9c953895b7a0419066e65eec0b7fa479c328719cf70df6b",
+			"0x65a7b2207932e96c427a6c01efd0c3f01a37e02e7dd98b18ea559c2a6c83c8d2",
+			"0xfe54ee65b1b8e21292fde2eed9ddda163036cd6745254bc7cb9f3dea737832fd",
+			"0x543d64c2a6b763cabbdc1a9316f37115fd572d96b5c75184c155e68532fdc8a2",
+			"0x31b41a4f481a786bcf4029b19e84729c699a8d742fef50040221ddf6785d7335",
+			"0xa383494d908727fc6198035c24afb3f352a16b29b0c1639062e7169618bcb38e",
+			"0x3da745966ebad677a703f5db94777fdc307f6e3e66a7c3c5ca24f35cff3f43bd",
+			"0x32fbcb24d42beb2128d95055706b767f7df7ce16c1613e3195342db84dc9955e",
+			"0x1723ae6147425f5b01b68de9847d79b918ca0f85a800d981029dcb5e3c62eb8d",
+			"0x997f18b9977469cbeeddaa1bb31472be3806c03ae77973c857e32d6fe2c4d740",
+			"0x6c27575f33b1d85fdf9643c9ddd27085f4241518cbd5b776e0d2bce19b152ef0",
+			"0xacb86fb3209fbf57c42eb86d2617eb631e0ba36da7de5b2c7ed63f168a7b112b",
+			"0xae02559f4868fbe4f114eb320ff0f3a38086f364a2ee537e6051cedfcee76d6a",
+			"0xc96e439aaa996d4ea4c276d1592fcc06e829d5f3cebf163aeb75f590896a2648",
+			"0x87debf5b6912717ec3c0846fcfb5b459a15254660cd5064180c0c514b4b15f59",
+			"0x37587d340df2b40b3f14746b72c5a72c5f51963d208b02c9671d6c623079b584",
+			"0xdff2805c029c4e3c249de3aa9f5cb3b48daae4f4496deefc91ebe3251c18629d",
+			"0xa84f66a457869dfc95d625d40496250ff33894be23a43e53ec892481f1eb4fa5",
+			"0xf8fb34bf78ad6d52be6fbb5472f13322b506f594ad3b585c04f56ed8d0d9afa1",
+			"0x546937b89a4d3b59817377b9c2ffe9579d4650cce71aa26bf2c76c571ec495b3",
+			"0x5ac921894e98005d03aa42e8fbde7ad0af0401e350c8ba98c01543a93b37dda9",
+			"0x3cc76dc057c73f0e0fdff28d484a092747ca42bc10989c599d0f597ead6024d9",
+			"0x1992cd7e94e9ecfaaebbd08d91519d6b67857db87e2e67c546371738ae0d2d0a",
+			"0x3604be694574c05c63d69cbfbbddbafe3cb425d75a13e69d61b50fd8d9c947a7",
+			"0xd1c82e40206d2a89e3a1a40c4a1b63c62ea6fa0847ddc2b25f63cb9bbb4a55b5",
+			"0x66ba114d5bf45d50e9ab9beaa879ce18d02a8b4f989c29ea7e9ae604593e860a",
+			"0x94f74c09ce5fd1c8fcb9cbbcc476af20fcfd9cf01c7ea65c14917da7b9560ffb",
+			"0xa4e154ebf83215c3843ecbff1dc8f646f221505c21d2a76f47d55466d895f1a9",
+			"0x28c20a0e95e23a023678443d7bf5b2421975b827dbd617239dcf26bf6db9b255",
+			"0x55d8ddf586d61e137482e3f4bfc1904ce4e04d21c6e7ac4d8c7d29b1483c8c0a",
+			"0xa9e1aed191a7a1a92bc99604e3b24c02356ea378b16de109362aefa2fa978451",
+			"0xd543ad635db78b2518681654f98a32d227fa6a1fa9b7043ad12cf58c91e8f729",
+			"0x102fb87da8b57948fcb763d7b797233f21523545f78388d8d05c6d7f2a4b388d",
+			"0x4e7273e2a92e897590988f38f8b899879aa1aea754fd5165364e8b98a66e0d62",
+			"0x5a06544527f88d9fbbc5905742863d873367d99e574d75496c59caa041e2b612",
+			"0x6a8957954db14594746daa61f907e4694e2a749ff53ea6b1dbe77d7d1f378d22",
+			"0x0debcd48486aa0d33a783caec0d6fb1256ffcca39071041fed7f047eecde8640",
+			"0x9d0a9b13dab1888bf0eedda217c501d76f587ee9a8765bb455cebcca0b705599",
+			"0x30693bf8c9bcb6bb4187606f98e138700e999d8824cada72d3d07f8c104fd263",
+			"0x494ef870dff64d1d65b4ae4b49ff13c145a6058876eb657751d58c06f62b5032",
+			"0xee4150e64f9ead8124d50d56fa4b6e6d185fe8ac385bd2a9db7ee991f6e34c02",
+			"0xb859d7db7abe48cbb9420d008d94e8d47753cc78962e5dabdded9438bed56b1b",
+			"0xf8b1fb734c345111704d73fe6944d0a274964a347d7dc5c7cb8677104829f5ce",
+			"0x5dc002623d9b3b872900b0b313ae8520009de730577b6eb2e2de18ae5cd4ac94",
+			"0x4d63e346ce7e654db6f067e8348c539ccf622d84020812724b936c19ff4f86af",
+			"0x2ed43f4e5d6889f5379e42d4a06de7c343080da74ff353960e4cf980f750fb90",
+			"0xfc61d0c90ecb073c022c87098045b6ca3f2b66c94f3723c679d81ac652b16f72",
+			"0x7e69914b56984b8c7cc9db1732c3d2d32969a58d6662509846e6faeb1305586c",
+			"0x0ec9b1b68efc96fc7d831ac7316e0ac0d908bac31be330d905f87b136556c241",
+			"0x32fdf6c25f6c741dfe468289cd7f019ec3a40c5d8fe882ef662b798491c0dc34",
+			"0x1ffbc6b29826aa58595d1a412fb90050f2bc3cf0ebc5462f308d4c8d85a1eb59",
+			"0xf0fc93cc2868cb9828ce16463e4cbd59637672d5815dff03aec7f3e1424eb204",
+			"0xe404321694894ab375f5a65c339f2cd2a53fb5a10f312082ce019681f6ed64e5",
+			"0x81ab1f93747c4804a85f56b0c6eb61491b958504ef7b898fb1362eda9b394e1e",
+			"0x1535d439d0043d1436de963e3eba47335bd7afcabeac4d3fc3f342396d3538be",
+			"0x42da1b95481bfab6cfec59884bb1ac7572636c8f489df2768fe2140cd2702766",
+			"0xbc3fd861f6e09efac1782d9d383c4ddb9b4268216fbdf3c25689162628e36cec",
+			"0xcc74c3d8b44a8cd23676babb4efb0e67871582cd5686fde9de6a052c5bf91ad2",
+			"0xbcd7fe80e95bbbb5ac93b1df5ff0b8e921e7ebc4960877acc1a95c478c65d64c",
+			"0x045e5918fa69606b9546f5fe83cd9212000828c54f9cab856f85d3a22536a751",
+			"0xc0f74dbb5a42bf1656698c37aeb904a33e969099f215a7efeeae0024c3a409d4",
+			"0x36d537998634f2dcab43b387edb63119c0f4cc68b1979a2ceb373089c531ecf9",
+			"0x87c20426fccdd225bd3b961c7adc1de3f9ac9640f6d26bd183f6e528089922fa",
+			"0x195ee1daad5c3d0052d6d633eda1c9f7160d488d4bc54f4ac3babdbb678eeec9",
+			"0xf9a5e6735f9c5577283e8cd717b56f69dc8306b23781755f2e513d15e6738cea",
+			"0x3e5bc3e78ae33367ce7450c5da7436f1faf3b1a62d238208df207307762688be",
+			"0x123e7b4f7e6b9338df2827a238a266376a20a1fd065e9f8a4446fcac4c6c92fa",
+			"0xf4eb14bfd197d49c42daa919322f18228d2d9ae2dac6dd7113c5e7d12d2ef866",
+			"0x78836678c20a40fbe09849fe190a9e74ee070f2056d7bef85d0f124676a93130",
+			"0x7986f7321971519933aa5dd507074c7b007328a7dadb8734eb4aecf732703fed",
+			"0x14485d24b7e90fc39d91ad6051b7f596d320b1f88f54fee132e032753e59a766",
+			"0xa80a9a5db758bfacf831a54022c85a838e30c8611ab4b17bda0641994302b59f",
+			"0xedf1814fb78abf675f3c5671c3618e5e51105647997d6dea6a0cfd1f0330bf6d",
+			"0xa91e9fcdc4f2b5e029abdc6b2523079bb4a2f5346d8a5a674e3d5582b8871d1e",
+			"0x3dbe468159a8c068285c92360cab488a4c1ec37487dd54cdc0b70e6d7cf074dd",
+			"0x69877439effb3388639ef6e1cfa132bc605bd8a0da053bcca23d82aa453d0040",
+			"0x6751d32ee3a1244532e6698ce57cdd0a59f99130e1e7e004c2751bc49d10b355",
+			"0xd1760a4f6e5a7967985125d2deae8bc783e47b1b85e19fc273e33eb2ef88d271",
+			"0xfa934c087923cc16f636615657477c48c082623d7cdd35508571655dc14efe57",
+			"0xb6b1e4387e04c4ddf88ada0aaa162345cd43e54482fddb4297e1eb6f8ba1ce74",
+			"0x3988089edd46b57c0bc83b1bfeb0050b503cbefdca83e96f1c12e7ea80688a79",
+			"0xedcb1bd8b522ba5155965cf18c25a090be2f8d7871ce60f0f371cd033d5a31d2",
+			"0x2f887b56b317e9896698ec9059d36aad63d54d95a01d389aa196ae12e562ca2e",
+			"0xe6d6b89e1d851fd24cf54f6b60c6c93a8b014ae30906c156374d73605aab3028",
+			"0x177928968fef8c6da017b177f6be85851616775be043b64f72925e6b8a4eeab2",
+			"0x71a3de323d9a600e15c25a5a6e05089d849defc3830fd69738f548fa4c57aff2",
+			"0x8e7d92f316f96b491e4831f52a799846810dd032bd720dc891195739192f3955",
+			"0x12a3433e8cadc005ac35da334d557c8cdad63576613f07df8c3ec9f528e846d9",
+			"0x1406da1f5efe9d3de6a829f1219f731f3ac875c7795f72b5a9ad25a57970b9d8",
+			"0x15a849a0ea56a777e00325b4af4d9996747486cc9893c08b0773210306193521",
+			"0x6178e69be88e7e93878b731d062b29a34bf2951082b947f35f60fba2c8de62b7",
+			"0xc4142d4fe01091e82626178b66c13243c9b35de0f07a49e3c5f2ddc15b39feb6",
+			"0x8abda6239557236af27a2cdfbb4fb91a6b136931c53067739578ed13e1b0a2ff",
+			"0xf85615d9337092e25080430cfa0b7a24c97effd422a1947a4c07239d5221418c",
+			"0xf9534d7db3b5fc1bcd7033ade59fd66bbb94a5bae91c4acebbb1540fc8bd3b67",
+			"0x5ed0f8035d3920d6e94b881cafac324ce5688f8c97668715733e0d00733b0fe7",
+			"0xeb6c474a0adfd84c79b86090c793697c0bb39d6cb007c725c2ae7afdc98df5a6",
+			"0xfbfce3e019b0b29ad03fd9146fa368f9965050b40733ce297bce6acefc4668fe",
+			"0xeda9ed65fbb1c7fcccc91de519f69933ae66c8ed59fb65f64751ca8aa06030c8",
+			"0x359ea9df33d466b5dc210ef0e99f3b4416ce03a5439f49b4cc4c1b98b22a21b8",
+			"0x14b2e8729b70abac62120541229182264b78c7ba1a1a379ac8a582aa0bb0d739",
+			"0xcec0dbdb55f92191974c2c8ed716578c5ba04c4584a0770fc0d7d5cfbdcb2717",
+			"0x07334b05a08cab079354cc1f7a945caa3c633de89a89c18244de81ed56da850b",
+			"0xc58e0bb71287fe92564d00b5094ce36b7899c346679011e52b73eae45bace19a",
+			"0x9dbef45ce9abb762bb9b30b61456a90b74b0b6f5b41af9500699542d933f9535",
+			"0x3cf848f770e15e7f682075c77f7e980da6750d3d4cb038479983e341eea3c354",
+			"0x608a4c5958ef3b0a324a7cdeebcc3abae89c1371c949d6b269b2d3936d9fbdb2",
+			"0x66422fbb9044305317d900702c2f99702317a8a83ccae0911a2832f623356c8f",
+			"0xe977f86ae4c5b350b350a3d6af7fffdc9baa96d9a7cb24834e5dc4797fe39fa8",
+			"0x6f56fc66544e099797cc3b0879dd20b21796ace01a0029e0d8464a3764d1e858",
+			"0xcaef7878c703facf29fde1467dcd08b03761872f598f42f5c56b4cb367b97255",
+			"0x9055cc0c11cbbe8477c7dd35b37a57e7994248c6bde9ac05e85717cebd2b970d",
+			"0xd7b08c0ca8abb9f07e3df1c4ebdcb03b0ac2018a905d1c78e6825d2bb5ea1ffc",
+			"0x0184cb109267e58d5bc0193a04548f0c2b87286ab6b03a1ff7b6d88a725662ef",
+			"0x3005e0af1ac0c5fd6d58328c06cc7f5d89c8c4ad173106fee1a7e37c9f2dcb95",
+			"0x8f7f8800d29c66b4fb12334b622fabe1cc4ef06e4ded44e4315efc381987cd56",
+			"0xdf74e3be6d22159e0e02ce3b8f0b405e6469557ecbd12e4432d52f4ae4637bfe",
+			"0x2fa9a889f958ddc41bae5916657f946273447add502464674658bcc257f1af15",
+			"0xbfbdf04ab62a35b2f7b038b02d8c37ee946cfee18e10ef8a4cd5409a5fe81d19",
+			"0xc4e834510182950161a75a843352b5b46e246a05b7c7e47240b6cdf7e18b4de7",
+			"0x2534be362fcc238c530f2ce8f64a3366d4003a21e6f32493a082b7efa1d413d3",
+			"0x628e5f76af96e64ff34c52cc5d07562e72c53e7bd4b7585cbc83b7c9951d0d2f",
+			"0x41687c81b22f67e4ab6ba0163da6d58c81d94c5db20569b4a42fb58b7321a442",
+			"0x50f55f58cd9768b611fce3ff13e8da9195b1eef5d0a618fd27f7052f88c8fd84",
+			"0x1b64cdcbfc12c42e9dbc7a62a1f8eeb0baaab8ccc867f7a7308c88e4968eb9a9",
+			"0x77e9fd9a5d64b66cb901c5795b9f66424638b24e457024b5e71ffbb79ed8a863",
+			"0x35644de61c2108bf9d49efef164414cd2594ad4cca6bc421699458c9bace5491",
+			"0x172ded87912492ee521f79c1ef22e42b1d22f17c3286575a5d419fc00d928199",
+			"0x3c8fdc337338b107ff5879b3e95cf285b5128ae395c4b89ccfd05a3d942887d3",
+			"0xf4b22643ebb6d46cf292531792543f9699a99674978045b0c911818211be6017",
+			"0x783fdc538e4505d4187a0f341b066007caff8030c3bcc4bf49ebd31a8f6b4794",
+			"0x38e11f176844f680e75b65d5225533639eb522f39495b9ee426135097e5e8fab",
+			"0xc5e0da94d4dd6e29c8bf3684177a62051e7555ee87007fb07581c885be598edd",
+			"0x317dc456dd095f9eef53781c214806beb31351cf78cb1854be257b4039324b8c",
+			"0x5bbf954741e453e3157dada0a69bafb9ebc63c3dbfc0cf6e3fc937a1b14b7356",
+			"0x56a5354de5acff2b904c5b6b976c473277ac2364571c54583bd682e76bb3f43d",
+			"0xc37f17385f4e6015cdc8083fc750499ec8c9063544102eb0e3e3b7e0b5046946",
+			"0xd616c205adf0ecf00c7563fda837e94a4f48be8560ddd15d93988cfd3242b40f",
+			"0x1ecefd5cb0c61b120c227274dd60b42e6d25229517b20dc3e37a7c3b436f0e92",
+			"0xcd447982c518db12b8aeba63b68d8caf1eda6bcc44400c9d83c4e4d64b4e949a",
+			"0x3763ef2d96a89a302260ea66e22e3255001ba2f003770c03905d4f39d8ef6501",
+			"0x2fcc41e9b574af5402cdce8dc66d79488cbd5cf960209918863ac9526bcb6a70",
+			"0x17b71848876a6e0a8857f1e5d04762734678ed1a8addb7e378915a7c3f37c981",
+			"0xcac9e4641f50d52d77e0e77b1a1b5fdd25cae239864367b3d99026d3fb973610",
+			"0x55eabf50cf101f65e51dd3a54321c1897a67c50512c534ee9398a716a790ffba",
+			"0x49101d5719e4de5e4e88645de3c22cb3ab794df815555d4f22d54ac6a59f73f5",
+			"0x509cd8530c28cc098b0aa80d3006a8f71ac7ad56101b880288658917173b8c8d",
+			"0xdc0e15e6d321519f34d40c6b2cf5f6955c15af815dbe02d84606ed76a01fdbb8",
+			"0x0b8e107e7abcf80e85b3288786dd79f949449225315c9125730d7d42f0ab9cb6",
+			"0x07ba997ea28711f221ba26d724a09a52b2737b8aa8532e890490ad811ffa792c",
+			"0x713775500194ec8691fb540d63e99a70cd443e5539b5f8e2a993266bb58266ef",
+			"0x3b2ccbf35ac833e845f00329c1f8d130a3f804c55aa83c35421adb83749213bc",
+			"0xee82c15eb18a075b00de8fd610621683dcad88a19c1c507351b5be0de0c6c4bb",
+			"0xf874298782be23045971092d8305c469a309a1a33f6cfde7604e6499d2384cdc",
+			"0x1a9d88cd641f6468fceb32eced3710569d511848f393c2114ae33d7f36c12f3d",
+			"0x5b2b8c2ba5d3aa8a0503d14e759154d1f2f46d819b363025a77d4cf5e3d83586",
+			"0x0082bad01acd43bc2c504f66ae28056ce352257b7ba7e2c27dd36d256c079561",
+			"0x9c6e4e01a831348ce64da4e4bf04cad5f58749573e54f1062b0e2921bacafe74",
+			"0x600e1b0101161721066952d71401f8fe6e689b66b26e2e74cc924f5e914e8eec",
+			"0x8720d215255e4d5e2a688096506d5b25c3a79c511d8c0b3dd7ad3ccf542e9abb",
+			"0x48baaec9724cadc4f7cb8f10549b8daf87b2572151cdf9308b3e96f02b048f23",
+			"0x2adf0f56fb9bcdbae394025ae949e694e01599887e50c355c90c3ee5ff32eac2",
+			"0xcf78410476d781bae1567f3d763af732d2ecf56e741cffd1bd3906af83de1f2f",
+			"0x4e7e223f6881065ee722d6ff9603f1786e4e99292e9caaa75b7b1fe9aef00109",
+			"0xfdf0b390b0395f007b1b342065096e0a8da957b26ed4cdcaba432a202ec12b65",
+			"0xcd40d2df140abc1228b2e1f45b5d65a0f3e2ab8b7e740dfb5376b036f63c1c2c",
+			"0xa491347f128d31f68cd1ae536d8f982fbfa5b58d855a95219f104db741d3d2ad",
+			"0xaa91fef9cecb842de4df61fd1650267420c8336758fa450f87ee867ff1520905",
+			"0x75d1574bf7b23319a7c8ff6a0a7cae649313aca8893ccd223f1f77fd71c9b8e1",
+			"0xc72491916b25756e3f505081b7f63e32f3289b86cbe0181ac9d33d29f666b9e4",
+			"0xd446465131b34f091673736f70fa0508ee7065c4011359c302a603b6159cb52d",
+			"0x1380689a50696e1cf0c19869b9773528f01cdf20b8f8a6c6a7165fda31ea49af",
+			"0x01cac6d9deb56473681c02dc753351feda402a1a1cc2b4cc8beeb23884f40760",
+			"0x3f622e134dc529c5cfbf58a3ce91d57850578f45b77c4683b2dfe4530ba0826c",
+			"0x016c95fc875baa0a5d1ae22c8772eaf574a6c918510875f1000d65f3a779dd04",
+			"0x86e5f579f42ea54a96e622f4a6becdc5ae85e0d0af87997fae87b6707abc8d28",
+			"0x53d403f0d0f1f30d919ad7212cc5e2e73cb4870c4fb4e6d260d2573e9bc5575e",
+			"0x961cad0d17fbec30a8f614ff3565d12698af096e61836cbf1f0ea125ae3ed72d",
+			"0xc9dcfe7844bb4ea845125bc3674f326c0f178c5cba4349b9461e40bd6ec68c3d",
+			"0x894243ff80e90c4c4676583b4e428f13e077008d225790a234ae215dc53d33a4",
+			"0xe5fddd80d3cdbafb53e0cf3c095d33904ac8db83bdeef9816111d20384aed444",
+			"0x5c7ce294d82fe6502045664f7d13d02063ef24f0f4960e4fb62bb6abf08c63eb",
+			"0xb33a5699ac121a51c0074b4783545a86a428fb239b4307f1e45108c85af88617",
+			"0x37168f3f0220f50ba3cad0a558cd8b01a7a435b6c3c5cde98b420ba3b54a1cbb",
+			"0xd50928e60d00c23adfc916e7f9a5363fc8c94c8edb3aef41ac1dc719041f92be",
+			"0xa08b27f437ade4d527d883194f79927053ac55a3293487a65060aeaf4c4e5147",
+			"0x326e2d1f45438741b63d346f0da55066dfe0284382f1b4ee54b1d5552c4f7d83",
+			"0xbd96baee5835d9d6007b0b5957e452d71d1ee31aa6fde99796cce59b17dab703",
+			"0x1cbe90df49f8929ce1052049bde7d6169efe0b289ad4e05414a8e7bd61788900",
+			"0xa0b914df37895be6f5341f3f4013ce5c61f108203dbac4ff205d5f1a581712cc",
+			"0x1582e61974c0bb5f9f2622d70e772f3e9ce145be97eaf5a87ad794268cf352ab",
+			"0xe946dda774c96c7878a0daa686e4a22e0d9d36a88dd9c93b1776432adbfd68a1",
+			"0xf88a07db8c0fd2a1354c38617c16b4d2e4f8bb43d9049321ce47a8c03c8430d9",
+			"0x2adb489b34c480267927daf3ba3ca7567d542edb83fa82e8040ec57e25e3e6d7",
+			"0xf1c28c6daa3e97466d50d9780bd3335f3dd096c3389b906bcc12426ae4862a99",
+			"0x4457a8686a3839b7d3b592a1751c25b216bc64e9d0b8a81eec55601ab8d8a98d",
+			"0x0ea5d5606c5e81f92d31b49b2e54ce6c6314b13ac223c83094280d0196e003b1",
+			"0x33a91da49deed50914d998615077c5192be56e482ab230bdb3d480d283502e2b",
+			"0x5385496abf2e351c0cbd7f6fcb5bf5b5345783b4e512bdfa23b9736e77ea43f7",
+			"0x98f808b18e5778a1bbdefa3f19991a3d008c27e9976db0ce77ddf9e4e21a0feb",
+			"0x5381dab139fbb0ad6b61afa35c541aba559e2ac25c4ab1cf8a756c2f27c6bba8",
+			"0xf4bea5f3ab0bc9ba3ad00ad79402d1d62da125d311884f225ad8abe9fc36d56c",
+			"0x6018a9f7edb5ee7ada70c3e85f22ac88924d06031cff3f61104ef52bf0baa2f1",
+			"0x01cc4300f1cd2bb4948329d42e17a277c7da52696d46a60442b6f5600d869faf",
+			"0x330240c95bec1ac1a476cd202aa74e85db562750f860a9fbd76e813f16cbb639",
+			"0x0809c487d45161c3b85cda014603ba7efd6b67a8c7aaf314cf20c880ec623a7f",
+			"0x653f53065726f9a7c1b96ce7d836acca515f563a47c9d7d47aa8c5c030a9fe6f",
+			"0x37b8dd7b2a844e519f9eadab305efa5d112266cbbc76bcd5afc119e0dd337ae5",
+			"0x385b7031eafc345ed353d9b35dc53010496db172cd906f8e0b7b891b84a65e4b",
+			"0x38259038fbf1ab3f0ffac98e6b312457f6b2631f68ae477b9302fe740cfb8e50",
+			"0x5a963aaeadd708291b41bd419cf2ce0585e162e0d46635902b58ee85e317adc3",
+			"0x881004f4fabe3e7642c8cb5e99dc3909da28451ec442a299f331790c8065e049",
+			"0x3c721f828959782052312d30d8256c9351a141923a9c2e2ca5b605f3a92cb27a",
+			"0x3429b149f860e963ed3819ddf19164977d637489eae313331c71165c7eb8f824",
+			"0x44e291345b79ff4116797899da20baf28fb9d4d2a5d6b1661a0c83b8952e481c",
+			"0x00078c007b6c0b3b6603b0838b03ee9e8944fe16f99f0a35eda286a288594806",
+			"0xbcd3506338253f0df5abf0c2866cdd319fe75bad7ac6f18d1f8201164e0b9986",
+			"0xc047f5f06cc54e4bb54c8e3bf22245d68c18b4787a01d324deb2139d7405814a",
+			"0x77ec49a04762af36eb63e2bb5c5cbbf15b580020117639ed5546749e34285195",
+			"0xfce516ae95eaee4067e95a5752494974ebdd182fa47deab70fadc5afb5ea8648",
+			"0x2ee54548e56d2cecc3e6cff4e60a7664e55d9b1c1c9a61be74bfff7635078cb3",
+			"0xa79dce8f10567e060638cb2f09ead0b191e59d972c532a7e91b33d27151cc23e",
+			"0x436b4cf10f5cdbde72be02ca16602190a56c77f1686533e643c885351d4657e1",
+			"0x9070c78384138f5e17cc9e6148c7cb7591eb9864f042b82ad38ee263383496c6",
+			"0x12a8d5285c871a0b05e370a337834458ae2159b5d8cb4bc93b6cc83bf7351b68",
+			"0x3c07d35ea209492f4aa811c51202f081a3bfd6e31705ffec497d70bd59b7a6f2",
+			"0xc0a99b851e0fc4655cb3cb43547f4ae6c36c350aa71626b61ed3ad3492f04600",
+			"0x064404380c5969d8e43d759ef990658d7cf5bcb7b4f8512fe58a7e994e199707",
+			"0x3d3a61c95ffdd3c7f05b3574370bf4cf0eec605ca27cde051b5d77e062315f36",
+			"0x9259e0113f1e009fad7454eebb238e0c7f4b7aee8118b63b6c05aaa2f0bc39df",
+			"0x76ff9818e62b25fbd698ea021e200ac9314090b801e000ecddb71bf4829aec8a",
+			"0xdf0031d6e1c55717102ca1b3a0bd389cc0d227f0f804396d4b84b5dd26abb1ea",
+			"0xd0220e77632c2353d51b92b1638e909c1f41a7ab0e6801b65e344ab594f48881",
+			"0xb15fccf30f298101d5ca0034cb8585cf14ddd76d58f3a8ca71a60aff0d0438f8",
+			"0x5dcb3817ae05b8c8490e197cfdd3f0b701e61d83b8f6423b3f24f27ba0f4c668",
+			"0xf3bbdc6651a4ba011443f6c6542b3f45b8aa2ba8bc719e7220578d6362cc441d",
+			"0x1edc95bab3c88a66246393058ad1a9557b371e726adaf261a5faa535cb8fab76",
+			"0xe02975b5ecb9fb8abecab35298704ecc476d2e6205c2df900312359d5aebdf9d",
+			"0x2a5c9b033738fe9e7ba6949df526b5a735753464b746e7d1faa29491a8e5f57b",
+			"0x46ac373df276af8af25aa1407659a8e85ae12b51ea6ae0150ee2b80a76ea6d9a",
+			"0xe85513a38b54114f4b6cda2bc81a4dcedbec22749cab6676c061d95c7f38258d",
+			"0xacfba9967af17aa94f0bf73c3b1cfff113e14625742a7398a25a01aa29bf02e3",
+			"0xd589df920ebfb3c3c1660a16f74213dd6d487ee577bdaf18f6279eefb9252c57",
+			"0xb2b66c26bd139976ffc2471f8ec71e353108828bad5094a324d1e4762f5547e5",
+			"0xeac126eb94bb1ba443373fb2556753d95804891d4763a2cdd1d297f1eba0fe6b",
+			"0xfcb52c727793003a70941fb01bf6c184890a691b70c0aac3b11feb3987de8628",
+			"0x1c1b6aeaea826ed0cc776a322454663ef555adb0d3c6f50480957ac4ab7f0672",
+			"0x187affcea64fb6195ee27cdca1096142898be0fb8f216f10913a744f2005f7ab",
+			"0xb4e42e3a4c94477a6d5d7f3de429edee7d92cff93b647c71d7a20c1e07a35117",
+			"0xf960751197118967fcea65f10b51d9568c184a8bc968c609d093a0f6c15a71b5",
+			"0x0bb9ca3521abf8fe971d371749e5c2258b1fd4c681ded047d6dc7820d303fa9b",
+			"0x52354e8e99ecb5c2dcc1214c08901d715ba62a7463d56c76a6bd1287a74f5c38",
+			"0x8768dc0cb22a0ea9fde00170783fe3741501d958c186e2c636d03fdf8a995129",
+			"0xb4204eddcc9c75372de503645bddaffd3f71e8554c3bca09ec700d928a9664aa",
+			"0x97c94c63bd30754d51abf48aa830bac3724cf77e366965e9f61a100cd0136714",
+			"0x60dff72f08506ac9ddabe3f957f88a1ef4935f187b6c536643500d65512fd393",
+			"0xa94f4c353581e474a091655c78c491c38315e93e287f848c17843d807aae3527",
+			"0x09d90469c97087fd45cf1a2c5471c6e81e0ec1e7850dd76b0d0cfa9fd49aa13b",
+			"0x298d03c60b8dfca9ecac182b5c0f6818a4c3d84e55314c083f8913a8746fe335",
+			"0xbfa7ba8daa97bc681bc6ce413494b85ccfbc10e2bc96e148713e0325e21b3b60",
+			"0xe61dde9cf0c1c6fb0a37993df24dec2f221f97bdd34f607de13fb1f947e7f284",
+			"0x91e9a9e65d5076819146b246647b9698954bcf55e7f059db32854f93b325d35a",
+			"0x7bb2fb25b881772f318a10b6ce8896712c93cc85ce9c7c371337020e86817a3f",
+			"0xbfdda2258ccd28dfc81f83ad7cba81967120257392279c7412f0bb116605a21e",
+			"0x0a626f29328872380ebf6a10468307abda5a02c3a7b9e04763c0c8c83f903df7",
+			"0xaa8ee86e9446a125356a96f8ed47c3821da54b003558f68c823c4ac1ab966c81",
+			"0xe26f3cbd95e0a26683c26adfb71b6d4fc82b034171f29836cb9bf391cf172376",
+			"0x7cb80eb383da7d8c1120fbe79cf3bff3e5bf19b9f57aebe11f79ee23dd82e611",
+			"0xc9b85149830b7a2dcc1f613f40ae232bf5cce7770780bfa7c77ecd25ae0bca6e",
+			"0x859dc28f93d2f3b17e176aa8248d6720be498fc85017491c68d6af5f4798b437",
+			"0xdcc4dc79cf88601caf6e038bea275a98208d221ac8d3efdd5db3d2181c14c947",
+			"0xe1bd63a920d45b05efe5d2fb99437a26bb7049ea5b183e99866d6dae947ff724",
+			"0x4aa94bfe1501f4d37b0c55d77add7bee9bc7f24d444a3ed1c6cf27d67026bb62",
+			"0x10931498b823a9784c4aa3ece5e88b477050927fe4016e4b10de7e2e0eadbdb9",
+			"0x7f30cca2119b5a4107cddca59a88f10ad95cfaa879d97bd1e50ae6a347e71b1d",
+			"0xcd8a0dd7a4fa9b97641d5288375105273c9025a2c9f3d7d9d04179fe3f55143b",
+			"0x6c8ec850db640544b7e5b22c19253dd1595899a7663d40c4fe13de4258cd60ca",
+			"0x06ec895b6dd7f299edab3e2e3a65322fb7f8fa8c9a6182b7af4f0fa25acdc45f",
+			"0x45f6d74f05f7b366770428b49630e836c2fbcc72133ef03a1bcf9953209e693f",
+			"0x3d868a3921aede543f2bd8ccbe3b51468e7a87f8278e4601c4a8e740e8c339cb",
+			"0xc808c8fa7b02023e5c64999a141edf6e0ce0239e37656e0fa7c5156443f555c0",
+			"0x82c273cc2afd955663515932357f19d657eaaed2824551814706ae3843fa1739",
+			"0x5785f16929a6a73b4621e75d31958e2e9b00dcbf3a6b38bf3ed59672918b68b7",
+			"0xc8f84b888e55070682103999cfc315ea3d157d0771f0f035cf2ba03f6fe1b1f1",
+			"0x343a05e1a5e75e09528f194394caf6ca8caf94904d54d89c9d22abd5cae0d83e",
+			"0xddca7f95c2d9cfdc9efd9158d29045ba92a71d45488c40d28b257425c1c56bfa",
+			"0x008a2b681c4691d7e0de476180c969aa511467f27755d0d498eb22c9b5333835",
+			"0xe33fb40ffd6253b5701d24c59a4e217197f9eb7caf7c2223722734f4c74fca4b",
+			"0x650e8f1c6c4dbc76ace7d6c29b9a659d520af9b291b389bfe3812c1ccbd07c58",
+			"0xf88c36b8042df77734f99395eb68aa9f4b67a21891c42350e4d5e3e6d8fdf168",
+			"0x882c68aaa8d1f6acf005ce2ad3a6fef7ec1212ce610dfb8a7bea9417d87431fb",
+			"0xda73d75513895d5bd5174814da25cddac9a633507960e78ae6884b92e48ee699",
+			"0xf07d98594c0ecb16cfed18adb9f7b5b1055630b43444c70e6357cd18ebc09392",
+			"0xd70c5886426c55dda997d615d325b5cb5b652f5673601a045a113d94a17715c1",
+			"0x3e8dbda1f53c55fa4de65efc7d294a02d78c69a98d59049dcfcdfff6b7eaa521",
+			"0x67b14249f9c987298fb00e0bf560a976dcaa7fc0d02e816f84c3bf7a4e7c6901",
+			"0x4f8affa83492afa72e95a36f23356b46e58a0a19ecfff6960d4d6e5b9877b1d9",
+			"0x09cd2a17655988d2d8cd5fbe44965a6c15c3f123b75e1229621b9ab74d030e53",
+			"0x30693dcabd19e89bdefff4753cbc64d00c65a4af98f782e6e67b4e84f6b015a9",
+			"0xf67db822aaef8bdf7967c0dbe25015ff6cf88ce21e8bdd25feb764828ee64951",
+			"0x9a587510721ee914cf8b9c863859629ca0c8ed22b0aa023e9efb0756d3f9ee5a",
+			"0x5d00c0a840b96a19679736a7ba555f3e9bc5263b4b8437d6c3779191eda0a7c4",
+			"0x3e01cf22757510938a5aeb2ec6cf5046b7d3c186bafad7d57b81c7d2a99415db",
+			"0x0ff2d3ed3c5acfa5db9f9820a1a314865e266a823ab42f40bef6b0276af0a108",
+			"0xd3207e322207667c614e50be784f6b4d9c3f48362dbb65b17c62f5f33e631ce8",
+			"0xc7d5e81b23b741a772af6263a7c5894d13033001fd96898f749050f6b856c94d",
+			"0x7c40099f6b0bc7f0d54650a56531b2cdefa990d3356c79a9c6bd78033a0aa1b4",
+			"0xd35ffc6c8de3c7f5d939c8476758c99201113336a6fea177c312ff1cb4f6d7cf",
+			"0xd6c9ea18bb47feb446998cf2e1374aff33e1282167318c5e5104657a69291797",
+			"0x66251f4b977561f1fa9906b2a26d31a8b7a6aa62f4b7b901220c44acb93bee11",
+			"0x1ce1b8ea8492cff1eb95135084d3334bb45394eef0dd3d87aa8b68fa9e950683",
+			"0xc3b226cc60b5af90984f3a98a55c1d608afef326e0bc504869723d545f633196",
+			"0x63f93d6ffd8e9c5779721a53d38b754faf582cccb8f5dba6f952ee079a08d8ef",
+			"0xc4dff799018abe40f08586ecf23fe06afca1791cb7968218c93eb8d70a8956d7",
+			"0x3231b329c24ca1b8e3610d8a2b5fcd0eb962f04e93bafc554c24d047cf130ba2",
+			"0xc7b393970a7126afead537405174b2146bd3b1a1e4eeff0508fc8d79b9233a4b",
+			"0x73ec83b51241245c9ba70d1c5026a226ea2b690d05a01e392225821f6cbc76a3",
+			"0x8a69ed7b352026316a74f566d9eef099341bef9afe05eab1f85d1bbcbc3499be",
+			"0xb7e26c2cc9d43bf91577fd258cb3dc7a4ff1819e69aa425d48a31c909742c78b",
+			"0x7578d8319252e136dac5b721e377463565f545a9786db38cdf048d27a6c7c8cd",
+			"0xa9136889bf85b078301ce670c54928ef29fcd6a268ded07a08becb440915cdf4",
+			"0xa5a4b8468a5aa50a2afdd44e2515faf1fe0e7ddd0456372da0db232e00d47d9f",
+			"0xf433f4018378147994bdee5603e4990f728a1838213c81e655b8b9c224f54517",
+			"0x1b387891f9ae757f62f9ce1e2f8e8a9a5c8dec29a5d045e41c924b5d3dbbc5dd",
+			"0x47b8b6748b07b33eb0237d2726325415dcecb2d038be9872834cb5278a5eadda",
+			"0x131cf8b68d0c779df85e51dbbec3f768903a3ab289a7d39b72602ee3ea7104de",
+			"0x9b6ab213619ae96805a754947644c7465274c7f686b5ae16e54f90ac0c78526a",
+			"0x2e34a90151060fc2ebc58f830a87cf33b705b4e3fedb2c5880c0f900656a9436",
+			"0x092cbefaaa923be1541c221aee81cff83650d8c5fc2503c7cf9f8ea2e7fac0f7",
+			"0x0b7b1e280b8ea2e59a8f322aa05f7c9b7e717cc21e05abb35f62432a480f1277",
+			"0xc82f74348b03897beb7c622f63976b700a2e031d0c380b3577a5ac69ce3eab25",
+			"0x232b12662086b16480d650b7ebd1fb0e5de4e7d6dfe1cca34be044456159f0b4",
+			"0x2a51e7ff6379e6ec9c3bdb4f7c867f7ba272315d5577f542738db1a4e986b219",
+			"0x09319ad108934876330c0e72e626eefa5a3d768487a90dfebac5de9df578d5c3",
+			"0x4dd72eab12d9183ac4c3692cafd33b929cbcfc6c8abf56a9fdda21fa0ae90bba",
+			"0x014c07ab6f5628be304140dbc98f639ee69914bc47eec73741c3ece25fbdb186",
+			"0x77c1f0d2effbfca82dc1c3af80124666830f84f1ae9a61399a7df9a7ee9ead8e",
+			"0xde29aa3faba8e8d7cccd3d64152d787e0957e2e02b85f8b598e27a64f85be92b",
+			"0x7c86c19f0f598c5972729b14a4a2d89490be2a5aeb9f09fbc47ae11d6e9e5589",
+			"0x58f4fe437e049d73c3a384856d7c4249d0f9084ae8a1d33e268567f7cfc1d843",
+			"0x679054ddfda36d5694034de0d9159204f67fba8dcd64ea27ae481751a6a042d9",
+			"0x00550f8a90888c1266ed3d43558087bbd255de842bb5c7ce5a0ffd7501e217ac",
+			"0x99f3cfd2d9dcab86723c6c5dde5342e3b0570c26f7f4d497054971c9e0c79714",
+			"0xb23c9a8cdf75d08c55d42dc9b5a4937c7a2ae389269921da4b0f3824f2fa4ac9",
+			"0xedb69805d643bc999dc8f42c82fda5c86dbcdeb97f8ca614ecc442b0096ce0a4",
+			"0x9732275603d65d92f1a2731e4e7f822d504175aacb333b3f011ab12c25c16e24",
+			"0x74895f04ab02583a72695faaea930e965fe5cf127e78048ee7b6fd931252ff60",
+			"0xccade78490ce81bda38fc7246986bcaa159ff4210c78a818908e7929b5d5e214",
+			"0x0f83b40f4169d073918acf1388b052b238748d6c5aeda235800403194da65756",
+			"0x2e0fc727f8fa2cc3e815eb0cdfb8fc73a8bba70c281c78a77bbe7247a1757b9a",
+			"0xca6fbe2344aab3a18e8ba3b18dcae9624c995175d77f6d9783cb73a6779d4953",
+			"0xf93234aadf9c1c1da370bc2e58dec3e40840ffc4456b7ddf7b9147ddfa5c87aa",
+			"0x7217d998d17977983d7973155777b694997ba1fd9b84c3f723917628a14a8bd3",
+			"0x81e99babe840021f79c09988425bf91745116970fff4889eac90f4d948617b45",
+			"0x6028f39dda3291724550ed9d5186328de53b442deaf1e37a01bd1e37746c2d7d",
+			"0x202131d5985bb64c2cd745f8c57ae870358a66d915fcf64322afc3e907f57a77",
+			"0xb242517abc3fce2b275d4a88a1689f836c9556ad589be1bf62e6978c042eaf93",
+			"0xa4e70eaa95e779b934269dd10085060923d9191eaae34a75fb537832140eb1ad",
+			"0x9f21679b001c396ecfe339f57c798c706c1567547f19f0390154a3419448c8e0",
+			"0x85ed1f333690e69275ce513e2d633192b0aaccc8e0b912196a154dd0ade30f72",
+			"0xdae9e867f112bff48300cabda2626cd9de0dcb249aa3ee2a7365f90541bc08ec",
+			"0x2acb02e30384ad2364b1f83784b5a785820e07ed7a7b51afdb9249d671ee6ddb",
+			"0xdf7679b1e10f8bc3191e6dbfeb777ec3d27f9bc1b6a46c146cba9a923881d9e9",
+			"0x744f20162facbc66a246476d4a8ecd50922b5d2b16823b5df599945aeb8014da",
+			"0x44b7f3359f92e5a2b6c42a443065a3f819d9c381e69bf236aa71b2f9c49631dd",
+			"0xb1a63564b8f7f9b17aac6b5f5639d9323e6df5080aad9ad0381d3cf2c8985337",
+			"0xf35537961a22dfd460b78626fdc79cb696e7c2b670e27368836e8c7d698b1ff3",
+			"0x206a5433880de275cdba7a9bdb5f4ce8ec5eee0115b793bde8071512e593731d",
+			"0x200ee9535bb4b7e8fd3e7733de7b0aa376e8c837c2955f1fce3310b147d33473",
+			"0x005bea89fd624ad0b9dad43bca25748eac78d33e786374903665081d7f7b7391",
+			"0x41f5ddfc45630fdbd7358ab65d38f14b71faec3a1ecab9ae2fd9fc685f527ade",
+			"0x7ebee909bd7ccd1ec9aefdc1b6abb98f326daf66f5b1bccc05c740f03c362268",
+			"0x8bccda1bb4f9d06b1f4ac17fb13504ba94edc3c9c833aa6400b3f003f430576d",
+			"0xc9f4d7be6782ca8377e3290ede54d3d99364173c00cc4f44b3af20d4f297d4ce",
+			"0x397db0e2df773dab48ad8b207bdecba5677cf38c460cfe3bbada407e392fc0c0",
+			"0xa3c1612387b2b51fe87bdc4d57e54fde0785fc2c7095f4343bb71b4041cce47f",
+			"0x43e9ea7beeda42d33658042f72b5e7cb33478df7b0cbe34bb424239e8ed7c695",
+			"0xeb523d35f5cbf920364d97df1129aa1aec48b0e49ec2121ff9965c34a9b1659c",
+			"0xd99698427684f0db6c0de0e18fc14136711e38cb65cbbde722d55e05105db03e",
+			"0x079e80fa24f5059276e3512debb09c453df0c957e06e42f645227622e83ecf7a",
+			"0xe8cf948ccc07327ce3fa321c5371deb0237d51f147993256246b619b75f9379a",
+			"0xbf3418e0a245da4ada0849d2fe9c934e95609e344cf4734a20d23a86466138d5",
+			"0x9c3620d280ea8e6d04f460756fd7e5d7947b15ab87b2a24e31d96384aedef5cc",
+			"0x0467892273772abede0e7efd081058c5242dc0f474c90405f987c19056d4cae7",
+			"0x432592be748af66d3b43264e00d46119f65ddff1cebe8d3853f072f21145eef1",
+			"0xb98a1dbee5daf6f25dbdf731efb0c233470eb4b44126ad8dad31b89794130bb4",
+			"0x68c7b6c356f3fdf82cff0e4b693bcd2239d72b77f08c587e9f611aa38c6cb67f",
+			"0x2b3b7b113b17f69188e71507bf5cd66685b976b5ec23ed8c9f70cfbef5b3a641",
+			"0x360b08f1be4a53a1db2ec1e068da659c3b693d956dd37c5c3ad04c935081f732",
+			"0x4f220d5102592db62c3ca6bec42a304ba2108fff69d39fb740ede163a7667df2",
+			"0xb12b9aa1524ed587b6857d0f847a22d2e0b726a253e3dcd5375411263144fa60",
+			"0x77d7006a8eccc9426be6d0d4e99d2f75db18902d4dc8bbc2a2f651b7737adee6",
+			"0x711cfeb0c16df71b7140ec86c221f08a4aac7295ef990834cb0c4c6586fcb952",
+			"0xd0ea4ee8acc3746d4949b9aea555ee8f7dad81cac48c6188526cc8a3fdca0674",
+			"0x17a460691acd145b00658639b51c9467325b02b0b0552b68111e9bc70f713963",
+			"0x3ee66ecf3c8622ccc48bff5f77ec7b6ba9bb9ae7162ab99869f4476d786750f0",
+			"0xf846ff968d826c20e10c1248121d4af6fb6e2cd86d0f8c1d2a6088cdb23c2ded",
+			"0xedd84b8243b3fe742052a421d9f3e990ba31e3ceab24f2bb5ec2d8f9d7594378",
+			"0x92cd6c59cd631f02a52434feba99dcc550f2567156a4669a5d2d98077aff7e05",
+			"0xf3557a61071097dfac3cfb0bdd8871fc759500d6aefb555292128ad785fc7d3b",
+			"0x3985a6dacd96834a54d581b38690efd4dbd50f6354e238a551aace59610c300f",
+			"0x194575b6ab2aed3d99269301408b8b9bdc765870fa312c4ecb6771b29d667398",
+			"0x0c6aca1dc3670f27093e5e3d8397d58cef4c77009c22be3524bd6c9a691ecad8",
+			"0x1b97718888aa3fbbf8c2d3159f204ad0f646b27bb18973452b9ca4ecd056fceb",
+			"0x22f223e74b95ac311f3747e410397420297ad63d5e6e7e6259345546af349bed",
+			"0x0fc0e95d219c422d2eb0bf38f28ed200f4f725a904c5bf85db7b31f609d56b43",
+			"0x74544c1e115514858a62461584e02fcde29f89ca783b3f73a55cb2d0bfe199a2",
+			"0x6f75971fd8a9d7d4518d2c3edd580643e148afd67e7c135cab6890a53cea390e",
+			"0x32ea02d2647e1e02a3a08fb4369cce33d5d7b857ba66ed9ac69411a42c8c384d",
+			"0xa2c0271cd9c3538ad012ae5c631bf8aae0f36d1c4be4c99e8b0c7dfc3777dbef",
+			"0xc7d4ae7347249377f473bfee60525031ab18e7818bf7c047dbf78fc6bf178536",
+			"0x0682d4bc9423be1aa3f07fc7d307d63243383a265e59d8fb963151046579f1d8",
+			"0x67dd80cee212ae46069b1af2ad98ebcd5a12c5ca23effb34ef48145b867f9a51",
+			"0xbdacbccb5511ffccba4ad93461ead16697944dd61820f19c88468f142ef81b36",
+			"0x078ab49dbb49bee1b70eed80685179c484e65f7999fc7f79fe3a711ffd931318",
+			"0x22a8907100fd6f6b0e3e47410aab0947091465188c3895852f849716033be524",
+			"0x6a784e15b8b309bfde5743c6b4b5006c86aee4cb56a7cba8c25a7909efc56720",
+			"0x48f1dcba97a055f366175a40966c01ee499936ebf5602117d547ea99384f3b48",
+			"0x8e1fb0be5bbfe825b57c5aaef6866794634e42a28e25df77a38348656b57020f",
+			"0xb3845ce8c6a1e1779f085f409821af631276cb413739c2412a37eda3d260200a",
+			"0x2230e2aac91929625cc9b7ecac5b84680d2978405db1565a4522d7a895ee7290",
+			"0x8c23ad236c0fb61af08b665b655313466eaf04433335130945586f8993041b58",
+			"0xdc9a50633e3b12d420663e6ea9c79c5785fd333ea0feb53567980afc1de70a05",
+			"0x6c1929f3669d42477844f993387ae6cbc37b7831bba146028ed81e5490dc758f",
+			"0x9059daec481d4ce8e2dc66c815172933e3e012a8593882a249f78056ad4b50f2",
+			"0xf9dfb03a341aaf57dff8ccb571735fa07bee708190e98ec0be1065fd66b89373",
+			"0x15a02a41a22ef5b01754bc9795e04974bcca9a3f2ae168de0c6136cf0aa2548f",
+			"0x494d825348d46c5bcaee447991111b0aa9e93657c90e268da1d9c901d4e4840a",
+			"0x3b817750bc438728bcc0b7f8252b33432cfc5453d50907ae45c62c338d2ebcd8",
+			"0xd529b68e9cfc3482d5be812a8ed91cbb55135bb25cfa9d036183deafc8e460a9",
+			"0xd6b77501125e0a57f0c0e91905debb2d024d6df612d66cc09174586b1e02bafa",
+			"0x4e0a88a3a74f58bab4f534c2545689b37548b4616ffd393f2267db8c691f88d9",
+			"0x17c75e3edf1a030852b274159fa85a77092714e370aa2f0b0127937dcd6660e6",
+			"0xb6fa7da4857701b71ecfb278cac489abbffffdabc6aa671fbade2d2efac41859",
+			"0xe8ef5fd31b9673c39399db90bce23c9ec89123aaaa1ce6015ff793d8306afe1f",
+			"0x3ffbc8309fe01232021798dde65fb6a4635bddaed77d08213203b1c65dbabac0",
+			"0x2966ce3428110d587f2d9e9809316852813e6bdb69f0a66515c8f36edc054eb9",
+			"0xcaeb39151adde827f09cdd4ac1d75f73a4b3dfa4c8608937c13f53db96aa7142",
+			"0x354b88ecead2b00b2bb215168460c2cbafec22a9ccfb84cc969ab497f9f69816",
+			"0xecff61575ffba36e15d742d45698a669febdf5f47d1677fab4a65cc3427cf01b",
+			"0x95f96355773843e7104efcfc1dffd6f298fb0a65b2c24791b9e392054f880ea3",
+			"0xb44ef0452bae93cf91664024e27170818bdcd7b6b5a181ca6959c919f8fe7cb8",
+			"0xce2a82cb562e0fa81f41ea271274d1f02eed4ea11ae750cc410fe6742be33cbf",
+			"0xd6a26e0f490eef7443b8dc8221745a02d4003f6a218997c6b796925b999b6ec5",
+			"0x8a387b6684eee474d241c1c6163a249155495da62aa52ca29aef549acb998112",
+			"0x72cea28da88a6e131ef42f2a9f757864534cc34c4136217f233e18f1eb3db4fd",
+			"0x70206a53faa4f230c5f86c891ca4337007ed930e3a7bec26209be8a13bfbc2c8",
+			"0x2f6bb3d5ab4be435fd07aaee9c2420080309526a70f52341194b7297a0456c0f",
+			"0x92b3cb4373bf691b83ab02ca22770130bd5f8bb830fa349e55692cb3b96d5107",
+			"0xceb646228b176e71f96dade90e7d21f2c7db94461b18434c7fb61502a814424e",
+			"0x1dc9aed27813fd95a2a2793073ce8572b37e18f0431e95172e6f1fc49f9cc69a",
+			"0x024b753479521357a211ceb85b78f4c3f635bb5c5b77e15bd2092b6b7fa6b0a4",
+			"0xae547ac87a1ac7be258bf1cccf3bb1e7dbb1b6db37c78e04422353421fdc83fc",
+			"0x38ddf517c3975783bdeedf862084e8f90ba3ad2df9470321b8b881cd7530738e",
+			"0xbdf262fd61c1c3bf6d5b3643b48082f57485dfd933a85cf60f6df85a38ea7701",
+			"0x828e793a6ee29d08f08263b8556468b5d0a7925e8865813628dc28928d5bf731",
+			"0xdc2f4d695b8e21df1faccaa26d3d8e1495ef7b52300903737d7ba49ad6c5fcf3",
+			"0xf0cd111e3ce41ce9fcffb27cdd58ce456574635e997751fb6fa1cfee26fddfc1",
+			"0xc9b303881045a0c4910407bbd58a9af222dba35ef790e6d3b188f3cbc04d0349",
+			"0xfb2fad6c0000e72f51a853a98cef9037339817c6d84e8cf4b067c1ad1f4221fa",
+			"0xe1414f1f8a7edfe0427ab063c0ce631ba06d5a3d9cc8dcde071f6302cb45b1e1",
+			"0x6ad5eeae009879cf0e0a3381041f25828266055220b8214928fedd2effb2801b",
+			"0x2ef44f7c5bcfc0856d215f380e8792c2bfe5c10736ef0bd0aa0ba7cacc4ed7f2",
+			"0xb5d7a0fd9101534bd504246c5ac161befdbddac49381327234a1162a7adf2391",
+			"0xafea64b36067c325fd4d884c79a9728d342cc2f756054739cdeef4ecd6dc1896",
+			"0xf2937ffe604ae91ec475b70a044ef165d2f61c0953daae90e63992cb5493a1bb",
+			"0x69a5ea452550bc85b6fd733561946b0ea8be6a1167ef6806d993c4553e02f027",
+			"0x3f99bfd16beaac4ab3a910dbf79c746ef702b745e0ba46e76332e5f64df83fb3",
+			"0x871d8703b4a1d6d946b23af9254bca992b31dbd52a54c89dc2dd3d4d9c5c61c5",
+			"0x908fd554e2e5e426772e774fc832d4b4117377d8fd1ff3f55453405b9d257128",
+			"0xac6fb9261c0b245f4dc6e7a7ce626c1c69fc57e0c29a223637a99da146e04ab0",
+			"0x9a03df9fb7a01223780b7cd27e2285102ebef4b9c087f6f32cb1f63016991764",
+			"0x5330a917aa2c137659a5ecedcd9c0f1621349cbd1ae11562f8ca4cbcfbcf5792",
+			"0xbe0c26211359510e5ab47e8fec850535e89d03301f5e083487aa421450b3e70c",
+			"0xaddfee931251ec4df67c6c5c19bf27c57e8a7a60fd6569f62681e32a50a85862",
+			"0xa1206c42a578a4088ec677eb6454a24aa4ebd427939216c4550fb7d12d51be7a",
+			"0x6c81c0799d4dd6983cf1065222dcb8c6d3bfd3ce236e3c57417a68e86defa0a8",
+			"0xc356b1cf9d36bb4e2f8bf64b03869ec7a1bd2c82d407d4df4c0a582cff5ba6e5",
+			"0xf900240cd95f9685deeaffa1b2e92e6f2211093ba83a4a6ec7c0819d04b53c17",
+			"0xcf10e728ff9ba17bd1031e4d4976127e6d2b383ee06581c57f22272ebf34e4ce",
+			"0x7aaa9304c2cfc79d2ed28aa855cf2b6f64f162e47935cfaacb83ed8f4e78fc93",
+			"0x45b6eae599001b455b5cdc82e83aa8d9ae0900e444a11e212e1a6ea39418e38a",
+			"0x57259a8fd16a85b0106bf94e360b33406305df5f93b3503d6ba5a17802ab9d31",
+			"0x59041feb40e4e0561512491b14d250fb6752092a024b70c91af3f1cab358fb9f",
+			"0xfd6047a708a0b7f7ac20d2bf38ca8873182ec6b55e4615d69073b1e839874364",
+			"0x6f0c025c2df8deae6c20f94e618d0c29caf5618503d3355fed14b8b26058757b",
+			"0xf9f5bd47da201f438fb3291b50952a9af0a4c5db743a8fb4015197cfc87793ba",
+			"0x4921ba6242c5532a45d6cfd87abc9a2f34f3ff103dd0437a26fe01e0854c3400",
+			"0xc407023695a845165b809bd12ed30227efa885faaa3a0c37633b5cf0ab83f519",
+			"0x52d0c065f1982e204d03964b362d89ec231d03c740591dff6355faf2860ebb14",
+			"0x6e2b510edb6032b08823aa67d82e7a7495fbed8b7a1c3afa5c3f901925ca785a",
+			"0xf56c13b9f11ef46043dccf99b1c40c412bf3fed6ab1c1b02106237891894d747",
+			"0x838cd04b046dc3ee6102bdd535468a10721d8be7d8dc072c6ac0c08c99124280",
+			"0x535a1d6a7354fc3d51e07ff67bbf0715ce73600fb6a4d5a966d2879ece256fee",
+			"0x07ece2732d471cf54f6388cdb24814f68e18b43536d4c0668366952c9cbe9e09",
+			"0xfca111ce286eed8ceb0aff30c8167fbbe464d528cc46c82a302d751b07367389",
+			"0x80c131302b043a3c9f03f153c262ab5fc99c1ed690d425ab842db059e820461e",
+			"0xcdf5f53634cb958038740b5c31811fbe2dff04917926750473e23396faf8651e",
+			"0x0b251bf674c097a1f6084b7d4f8f9e5fb208cc97c504e4af1c22df24b2bf8aba",
+			"0x49af2a38ab378c2d611d6142d22721341ffd4c7e4ea77208a6154f5badae0e8a",
+			"0x497c31900ea5a46025a159d2d005a6a0065f2a954f936f4163ea559a3194fcb6",
+			"0x6e11a069d89e3f9d8c606fed7666e60ca25e7abd3eb06021dc4cb98528cf5f08",
+			"0xb0a21c8206796f2f589fc76c220957da326b0ca87c26ee3bd0ec818602be6827",
+			"0x1c52c95455cc49a789ad9c91ff0fbfc080d01c44508c4f7183c5b52cd8d2a67c",
+			"0x226e0fdd735620794316a6171ee930629f51b952310b460bb9ad1af8db4c2ea9",
+			"0xf279db0c181c473379f076b3e9c1b934609983ffff2e4af4bf6bbd5e8b702db9",
+			"0x346f7dd1b2befc4f2e2394c8f260ed0b4f32e4af43c164c4ea09e96b7477ebdd",
+			"0x1e84e296acfcace1226ae4bcc983ede21c69d0783403e9c7c584ae72d6718d52",
+			"0x28afa2327f10d052012d7079d7071b56cefde51f440f82ffca9a54c25e49ca1f",
+			"0x07115beba550a7120910046697865c321ae7affe0d5eb24d4ee14c5427cfca0c",
+			"0x01d5cefc62ba9bcd1b7d07e48ac1d2cf9760a2ac4fc3d69f93c7ed347c0c3b13",
+			"0x954bba3b9e47d949d0879961e4e3c7f199d4952fbd8ac6189e2ef34362f6a42f",
+			"0x35ef992a7bf7a2b2b0acdb49cab4b9321506cda95130750f28067f04033052a0",
+			"0x7daf0ada3ad44ac8d78c311b74c664ba36af509b9440e276cc1cd115217dfb58",
+			"0x8138a1e442554341f20ae16a0f791bf562bb11bdea235ff089faea5b33ddaaf3",
+			"0x65ea5c69209e6896dba728c2409098b543f807243c9376f51eac4856c64f0487",
+			"0xfe67020e8b5d36b616c2e8a40517109b6fd06410f7168318a15c7096159910af",
+			"0xc7aebd89e64d6cb4a3a0688dd84ebf3f448a2e1814402b8391194d15208a17d5",
+			"0x81e0a798aa0a6ca4ad54a830edfe5e2e78492e5346c58c7763891818ad47b20a",
+			"0xd6f211f6248bad1e5d52013da24d79226a8e914b899fad73fc39ad9e42c103b9",
+			"0x341ad9c5497c3f930331137a5d081cdb134fcc055f85a6d50e7d03e44a593a44",
+			"0x9e2c09b2009f0ad546bcf12deb943c0936307e2d0c5c7d40c096a438a8320862",
+			"0x652e2126bf65168127ab0f92c480ff8705243bde90206096d1cd2dcd3d1e46b3",
+			"0x20be65ada96b76f93c0cb556151cee0785d7338b094f6b6f2c8a7f22f9799d49",
+			"0xfba2ed75cc2d93496e10419ad9d9ce0b33383f03465584340d5a3d1a6a90a577",
+			"0x16609893c9789ab20196bb30a19ab2bcedf47142e663a713535907ca6daf3e86",
+			"0xf0a300a152e1f3dd993dec6ff0911b8d92c67958bb0c56c4e499aff48bba3e92",
+			"0xb77b19d3b07bc7efc626f9ceb73d2f4d324902edab4aae4413250748fcdd96ba",
+			"0xe85e86b1f9f60661147aeb7df3bc40e1bf200ff1ce57f61c22c916a3203524d7",
+			"0x6bb9119c972939e3e1fae48d42527ba5dffd8833cd670113a979ef039b623499",
+			"0x0afc5ce9ac66d41de52b568dd1108727bbc4717a2f04ffeeb74ffb63bc737c82",
+			"0xe08075d030de513603957add9a27b8e76d3df7d2ef65f42fde161b0de1ee937f",
+			"0x10c0279bce16c255e8a106e0d3a0dc56981791b6214993f67316649525c85544",
+			"0x4996458c81f145a6a718cdecef773946b97e3d0c81907d3478f5516637c0fdb6",
+			"0x845c9b3662816e8c8deb911c6062a31c5296b4ec9e5e507fdd250f1b0ab45a52",
+			"0x5b5c22c142bebee8d99660e9485a54d8aa42d0c0f6cd5d870d006b0be3a24230",
+			"0x65a87e4303ad18afbe8528f7a6510ea6a7d2d9caa350a31b501db02867e3cbf4",
+			"0xb98ce6fc35c269d7cac7769db519d0219d44cce7bcf7075ef9c81878da0b0828",
+			"0x4c85a8a986de3b492aea89536dfd5312757ff01ba5dfbe51018d97b11429dc6f",
+			"0xe1822a4a922b0ac1dd66c06069f80f5c3c3a12f6ebd92f07fcdd424b2603c12e",
+			"0x0de2099a5c47c3442fcf4f294e517d3318e181e23972bfeeecaa3f0066d09206",
+			"0x0d18960691f8b4834f008832a028e84341daaa69e24ca35fcd3d4b83c10429db",
+			"0xa84ffca22d21c426548458aa96f0ac16372d5a2e91c1bd15173dab4045214b07",
+			"0x6fbb13b65eb2b1cdab20c23c627bee73f2f8ee6b1dcd4feafbc54a421c341bac",
+			"0x9fb42defaa9926a71ca5ada26aab3a0cd9f23b8c36bf542ad69ee7e7a2c139bb",
+			"0x8558a1f0a23e656c8762af69fe385ba2a4cce72119399945d60dfe7f2b1c79c2",
+			"0xa9d3f4f851a03f9fe4b1a1c85f42a07b7d7756660ced3bf43242f7750f03e374",
+			"0xa4b1e0d91f09765bb5bec63f90f3902b06b29efd9272a3248464473e9a07ab95",
+			"0xe881daae7e35e21a2add885735e54e6e847bcc8fd429a20be45ac749a15ae81f",
+			"0xc25c69e8c0a61e8103f0f952adc5c49d24368253be6e4a9e3277b9e02a2c0fc9",
+			"0xa39fc2e497a7efd9e6b0ad2775518e9d01c584cd134900e8a796056e8280330a",
+			"0xcef1c3a1ebace0a6e7ab1e402dc20ea3917c38f88f2d305cd6939e380a40f603",
+			"0xbf3bc7cbc84203db96a973047b2f4db2ad204b4c48abf5076fc8f2a0ba049c68",
+			"0xf4550102b8bc55969f17c47165605996713799aae54b4953ea539fc38a5c4055",
+			"0x852d591591504b86580e1193a4d2d6f30f1404d64cf5a53dc200b768151ee0db",
+			"0x26495cbbd2983bdb5a41d5a1b5b186dfcfbddc53e3955f2947269a50634e966e",
+			"0xd623f346b2f6aa11a73012577728a1b71ca74e3c9458da8e0ce9affb0a927b0b",
+			"0x6d2a19b145e354d56928ab1960565ab48c0fc487610f1043ad078623d606c343",
+			"0x5c612211df07f1a91909d1fe8e6cea9a2196e7c95c27445ae66649995e491fca",
+			"0xe7bea84b4850a2b7bd170c61a699f857c9685f3125c4902e9a21d2292ff926f0",
+			"0xf7c44f95c701df6a93f15ce8de008ea3c7e087d9faf437613166f226ac433254",
+			"0xdd7c4c343931c6a3c7bd49e6698e791d6dede3234075a5eb5674df621545d6b7",
+			"0xba668334a45a2c5393b4ae3feda289818ea261634e6dd277f7a9c284d4b6514c",
+			"0x019717a5c3fe560bcb9a7df209a156efe550075313c38ed8331ea4117b14987a",
+			"0xdbdb821a7354c2d64067300221a47c4936307f1a918ac4fdc716eec9b5421217",
+			"0x94500b9c93da559d73a918faf0cdc9f9cb3a90b0dc219b63bc4ef84634325aa8",
+			"0x50b4ba5b95eee9bfbbd94c71696395c3cfbac865b11a294349f1f0b57f70ddb0",
+			"0x61c4e5aa02c5b13bd7c7f8ea3c2fad8814568e822200062f88df9e87b321aadb",
+			"0xf98a11584eac3ce8032ee5617616da3a8bd897ef5b0c780eb36b4f3005636ff3",
+			"0x13b2479c0d0d452ade1ccd27f7581a257f4e21fbe7adf16b4041e4b4001af070",
+			"0x6c58a1f54b7160b42b06fd42da605d8576b82e586bc53fffa424a6ad51d5de5c",
+			"0x6be95b15b26ad33ea46f8a3d2b6f6770513ca0b315c686c86cc4e87f83257ee5",
+			"0xe9c8510f7a288699a5558f0b7a0808e568fe0093695bde1e2c7eece351d979ef",
+			"0x9822e17cbb24d2eef601ccbc3c4e9383b5189a92257159918bea131a41ae9a8d",
+			"0xfa0a7f7e8d554c6e75aa1d562406feb962394b514fbe96deb27d035219b70efa",
+			"0xbb4b62a1ebcc8f41e42ca70d570708bbc9a57bf08d5fc4287bc94729d2d391e8",
+			"0xbb949bed075fa35a9452fc76c09e600d2aa02444db336625420b61302c5b1d2b",
+			"0x9f1cf8520fdfb59122c3d8ab6e8ee9851b9e852e3ebb1ab940d7d22d1f0fd60b",
+			"0x11ef3c742cf06dfca2ddec7911e5ceca3362036177368bd15e9d4a7cd11648f6",
+			"0x9eee5f42a36978479d55632d8d86e57de7cb73c9b1961511cfe9b3bb70cb8d3b",
+			"0x7ee17dba9f383b15682beb87ab797dbb0ff002d21c898704ef92edaf7049f9da",
+			"0x5751e43effe6b2a2ab9414d732ba34acb7a7599862fcac4c8335b1e53e98fdf0",
+			"0x7f476aa4ed7c48da093dc85084df751a00dbdc6e89eeead918a0513879f7a47f",
+			"0x792ad74f008a7c2dc0b50acea37d0d9805324d7c80efd1754b0e07bc47008390",
+			"0x48653017bbc645a99e5264c4d5f781655abe4c417a9a6dc1a3e56684dcd01844",
+			"0xed182e2bc223cf015d21f540c280e9e49469e08d840fa00989dadf68ba643df4",
+			"0x7a56560bdff2aac53f0cf9c5979ccede352e1ec0f3200cd1cdea5d704e61eb04",
+			"0x37cdcc0b9f310f7f681b4d044a03d97cc09f7512399dd99b8a43a6fa80769414",
+			"0x75b7711099ba266a168f5534685ad829c011ca79c79eae892f859fbd9d5a76b1",
+			"0x1e7739d74174ffe0dc6284f046f73618eb1f854dea28aff87b18f09ad720b7e4",
+			"0xd695ff00975f61bcc48456903c764afd0ada99460f1ecc65171be258cb164115",
+			"0xe38746dc9d2544171763b0480939c1c8377102b4125f7d27d05f48d0e434a712",
+			"0x8ac00f72334ae5b017926bef6f94b5551f17a2373f0f7ac9d225651683fa5457",
+			"0x7dea798accd9318d2d92e1abdbabfaa902ec40f6c63d3ffaa78e81a5eeca2f06",
+			"0x5ff02bf62f47617330f64d1c845d5732737cbc397fd54d4167e727533dc81f65",
+			"0x0c7688c23adee0d14383cabf150933ba9cb448473feef696b4fc740840629b0e",
+			"0x2c2a277b1513d5446429068213180b0de19599b35fb6448da84dddc8c7676bcd",
+			"0xefb57782f278582d9d11c6b1972f2ce5799ba3383bffe507922052f09e6056e6",
+			"0xe308b75bc8f39250d4e02f090076c6f6e200f30904e3147e7cc57be2d8d81a5e",
+			"0x86b99886fbd1b58295709017cbe9c2143e932f8577a24f31528ffc025a7e44c2",
+			"0x643118e6e01e1311ec5b12696b59cf2ef6ac531f028b6e23f4a3025235ade454",
+			"0xe0deaf6d9c1a4da0c5e60fb586c550e30b04ef33b1aff61f9bb7491949e2ad15",
+			"0xe3ba800c9905ea8556dbb2298bec7009f633772f55f3ef5810ecfc1a391bd3db",
+			"0x06406d3f51ab5ba9096b76702130f3f27aa5890597996ec8a48954d16f4e29e9",
+			"0xc1fcb87d9c0c29b70aceefe3ed5b3608d05dde30b6d995dbd7bb7154146e8853",
+			"0xf65e31030188f5ccffe39cdcb4b847f4547924971aab5780fb446b1f08ddcdb6",
+			"0x662513354a8b56413cdfaa0b56fa031a0ab1c58b16077162174c4c8b814cb4c1",
+			"0xc1ca59f2eec9ab3839f85e742ee26e9597febd648df1a4ceb1134211bcc0ff9d",
+			"0xa454920090cd3907d585781adb9af550e4d927ab83ed88856dfba1bcb4dbdafc",
+			"0x5472afc931e445cb261e4d13cfc84e04d1c2c2a8c00120c73e055c5e8c0950cc",
+			"0x9bdd7291f4e3b0b34c20e183c8129eb4e9cdd3430cfeb3fd0047a2fad815c797",
+			"0x99959d3aa3de615b1d68e236786358a48b0b1c52ba3017a8f9545e97402ab090",
+			"0xc2a6d1dea0a6091a9f5441e1edb2c99e5a4a4bd07238662da8ffe3845d526b4a",
+			"0xe1d7948ea5adb5d7dabcef081801606b1c74230e9b7745862b2072434700050f",
+			"0xba15f27b7f2a19dffddd7f0d72285ebab40edf0fb9035336be6912d72ab5cf4b",
+			"0x61f06104ee5488bec408aca22be90b37d7b2f76abace5d8e1d9daf8488c10dca",
+			"0xa601ad3010bb154479bb7f04b3118da08ce7aa66afbb65d5700380566f7dd04d",
+			"0x87eb8b49206435fb7a6983d6d7ff92fe0cbb173c7be1c2542d6402760f98dee3",
+			"0xe1c8d190243bc91eb6012c79103d2f91e3c652fe09936b0d194a024a8ec01f1e",
+			"0x0752aaebb4b1c381e4d9747d5045cde49d99011784c0919329c81ce7d99bbc98",
+			"0xe74f74673b076b9761a10e98c8ddd456391a2216e9e658cba548ff094192ee92",
+			"0x840203d6cc8e414dca34b4736501bae836a1febc9f84589b673bc55c2ee05ad6",
+			"0xf61b094ff4320abb822307cb6501a76ca6ceddd81661531751782feeebf7cde4",
+			"0x4dda3a80f7d02dcfeb4630ad9680c37f7ea01f0ab9e5d506417f0fe4a1c82e9c",
+			"0x142f83abc309cc5bdaff2a385bd18dd96340b4d14a472c3ff64b280835b30587",
+			"0x6bee7fe1f7cf8faa01d094bec19cc20004d11d1f9408473ffde658d087999f67",
+			"0xd811c2011327ef0c434ba199fb016d491cbd7dbb8ad647967fb6427d7f72cc9c",
+			"0x4c9a5ec5e2e002c73f8e04c7eb8fa2e4c54188b71b824872234872b44f820568",
+			"0xb1520f14f6e9acee16c52de5e36d52ec19a0f90a90e8bb0e7d54f3b52c0a9398",
+			"0x52f8ebb0ab694f94d2f0baab9740b8410f581373bc4ce4bf6e7fd3e3f64685d4",
+			"0x1a9d0c5df31ecef11e6a1bb402e36fd51ac62c296ec51d1cb4612581112fe940",
+			"0xb1533ddcb0dadc809b166867c9c06c4983ad794a38014bdcd4eeedd3473dda61",
+			"0xf4a202576a94c983de3aa2ac0bf6cf403b8f22fdc39c184c702ca9a6503995c1",
+			"0x8ee1285025696b8908790fdb8fb1e06afbccc29841ff3ce9fe3bf7cd307bff09",
+			"0xe396c7b228e54e3002b042372a95debef7e9d346bc660f4c00ee5964978042e2",
+			"0x721acb1e7c918b232ecc98bff0297db492c57bb356b6a8da2673286f241c2b74",
+			"0xa4fb8ab31c31986031d223b3dbcd0a903c37173113c90da029998ff0f8031db4",
+			"0x225d7478fc19068a839b44ea477db46b6e044af11278567db75686c007ff96b3",
+			"0xab3aaa9e46b07d86a4771de32a6f4516543f0e7c8e25aaa78508c9e736b85abf",
+			"0xe16b1c4f4d0fd76588abec3c00c444c658d74cae60ea1a74c56cdc727e1b7001",
+			"0x27b8247c8d21156cfcc17d7616e218a41ea1597dfaee951dfae6ecb612140d10",
+			"0xb7930ab63a5bf124d615b21070f24ff0cd6ce807b9eacbf4f3d681f7725a4b7c",
+			"0x4811fd297a2c2731e35396886868ca3b3162f144ff4adbeae8804554d2a28de2",
+			"0xb1afd5fec04effdca7ff5801cb197eebb13d65652c641bfdc4719ceed05f70f7",
+			"0x7472cecf0bc3728c0f0ee7141ff0513395d012d3c3e1453fe01e17f44e491d6c",
+			"0x6af7dd9ef565e01df7771db29033dbe061046079886f798fa789707004f61af9",
+			"0xb0023e5e5b28da4a83187d053fc1d1cd90406f5f058c19ffe3f120cf040aa529",
+			"0x1f0cf67a9250d1ee3a9a05e3587c8c87961111b9bf10b94dc13e896c701cffc8",
+			"0x77f16085517da13e00b449abbbd217731fa12beb4364b8a7d650e44930cc16c1",
+			"0xac630ef3130001a6a6805ba5a00ae763f1f5169e32d50f8e2461e9b53ee1f37a",
+			"0xc9472d0ef3a22e37a5b5b333173ab18b5d01550cb239d47354b85f85a3dc8b39",
+			"0x10995cc8a94ed2a5ce0aba717ab0c3598a46634627ac38aeb9142f1fc04f6333",
+			"0x88f6533bb9efca7f80b6680221f2bf21ea7e8a21d798c8a461e0e8cff55ddddc",
+			"0xf342f6a8aa3b4deedb9cb461e601fb6d7f57378495f5eb3e489dbf54db3b0f59",
+			"0x7835d8c68f16abaab0abda4b6e3088a03c9426a838594cf99295bc270e6f648d",
+			"0x4ef4750a1d701da04680c6b04bd580aa189330bb83241aeed55fb55dd2cee52e",
+			"0x9f7cd9e7de4c6deb36156b37a73ea8c6dd068c3efa733be7aed94a1a801a7095",
+			"0xfe0af324ef5a44e7967bbd6de6b916e3291cbd67127356294bebd18b164388e6",
+			"0xffef694495a0c487f654af6891b9a5f585264ff3f3df7a8ea6438aec56185031",
+			"0x0c186c1b9ac25ee05118b7fc0627966136ed97e42dd5b433b4a6e732a29eba9a",
+			"0x8a13dc929b97d7861647c70e2d95546ec10c248ea2a3971e282157d1b1803ef9",
+			"0xcb332dfa5e1f0761612276bb430c84ba60a76199ebf6856c7450b3007c369d5e",
+			"0xaae70cacc2b426b77ca0dee01d7988975d73af89f4688d01f2141a06b6261032",
+			"0x6618c49567dc4b1ee6f06de4ea46f384c7f917e5353cd32910045ba2da2a2c43",
+			"0xf59ce02369f22c1dbc1480c2f99d7737974742754e49838adbdd95872377fb9c",
+			"0xa647b3029eb79001e782a6689aaffa70d0b3ad84bcd5acf6e7a0d1d1c279f854",
+			"0x56b4d39909a387fd5e4ced15060784b8236427cf6192295d98be51f988c47d56",
+			"0xa23cec0fa0bb943d9b0fe829aa0a21632328d8d67efcf507d570f170ac18200c",
+			"0x74496da6db136824f209eaa839036e3a7e94363b1e23ba39d1f3a74f43f065e6",
+			"0xfa2897c07d422fb4d81fa4b22c393ebca0cf86d03848fcef41e4f14e61d06699",
+			"0xee3020113cc21d2da50590ab8d700d9584e958af1c6289e9291670fbbb9086da",
+			"0x03121d6a6d3d46737f8010bfb658ba934bab32ae835b248b6f11cf44985b30a6",
+			"0x35a7206abca809ca24c3de74b82ab231747424aac530c31d1f93e9266d1c79ab",
+			"0x2089128abc1988f1e2ba2f294cabc7d2aae3a2be249b86fdd7cbfad5c05a3b26",
+			"0x31579e077a21db02601ea141fe21623899ffe195a3b947d2f55818140f5b9d59",
+			"0xaf1befab09595e55f83dd8a6c6722e62700ea5791211e27f5002db88bbcd806d",
+			"0x29242bf7c89946f11899e3425e7fa79d08a1a1b8bdedffd8dd02e823ce787890",
+			"0x2282493a8131f5ad82b0f5bdeb6b0f392e0f8636e50fd1ba90b09cf6ac442f02",
+			"0x39f63ff122022bb62c5d8c1421af47ef94991bf3a8a97e5f702de400ec5e1f28",
+			"0xd9f43250fc143e36f92a12a993e44674fceb81e6ac65be08361fcfe91401b3ec",
+			"0x88ae3a33d93e8627d827fa95aef374f9d9df8a7e821d3542c77b9bdf9e765cd8",
+			"0x239a22800e8b887eb6f84a1a7e09b7543e958ffaac59f226ed0b91af2afc2b09",
+			"0x8b5253760367d4d8c235f54c1cf85883b40c96d42a21e69e7055065dbc266b2a",
+			"0x48929c8d87f726ba8717a8d93e9eb0085832e900e658b5db11a0ec099915d835",
+			"0x735f49fd642ead8ced382ac68819104688c4610773d8301efa4f9ff1af9d6374",
+			"0x1473095adbdae18abd70432823099c217d15d6a394553cd6a4a20daa1867f5cd",
+			"0xb92e5530fee287bdd20a0985a22a0712ea61f1ec39e37029036aba475726e3e4",
+			"0xb16db48d134c0a4dec30f81c9f521b9fcbbce57923473d9a0a2d8ccfcd143b83",
+			"0xfb0e576a64b8f2cbb043c6d55cfd622735d9c2e8e1c73c7c85712a3555fd9300",
+			"0x0a555d959cc4c9e681ac1def25251f856b82746e568182a1802c662f8b7cf327",
+			"0xc65727c61aed82e4fc87810915807c5904fbd163722d783b6f9983823f425d7b",
+			"0x80c5689148bdac882e9b85f402f8e2ae0563f92f0e1214d706ae0f5029508145",
+			"0x3c81dd3a1e7094877f7ffed704a52a2e177f728e19858d21c0b46296054433d0",
+			"0x6e765d51cf90b7e021567584e0cdae766c20d4ea61f40d102c5b237bc831f0f3",
+			"0x184c2d3bc2bd2e96955ae40d7499886e46e2da0b9fdc3c55465f3023879738b7",
+			"0x74162a72176acab4dbc8ac904ba1ae98db539b90d6010a3f3cdd8e86f99b03a5",
+			"0xcb3ac6e8d74afc0c2a2908a1f248434026c99b89e1494f17f05717096dc44682",
+			"0xaa657accea572d043d5f4da5ddf01006748d22362d5512be8f59b849b86737b8",
+			"0x6165ad890727c2f2bfb07cb4f8bb5702c3b802e7b3608bd0985bef56bb6d8934",
+			"0xb1bf86dc2a2023f8d6664bbf47cc8f80df8bddc7c71217402d02b485fd3fd7ee",
+			"0x755f5584be60718fd8e846ecde5ddbf6d160602441f6ef0d688043f6b444decd",
+			"0xb4561e1c950702bd4248d9dbea09982512640f1fd2380be6d9274c30ad2680b2",
+			"0x460fe85ab763867e2d544c249da96b476dc97b0585f35efb9c5f75586690740f",
+			"0x3c3b9419d1d71df4469895601daf1848b25c7525ad0cf9cf84641e5dcc4013c2",
+			"0x31158f7120694fdb6c8ca57be4a4d55d1fd0dfacacdb1d114f5bc81cf3ad5b84",
+			"0x87a0735ae331643d6ee5d75ee57b8acd3c096af9fd2bdff96fe21fb2e23e4c03",
+			"0x86ee7cb0e0c1ce7d68c40bdf308765a91daf9098b6a2d0524e84dfa044319eed",
+			"0x76b78aac48f86b1698d304c27844542603f59edea7e5d4b5077bb540c4084946",
+			"0x3dfaa796235f91f05e80c5eeae3759d9044fa47164460afc8eb57b022cdab0f6",
+			"0x8c4858b78361011f7d35d81e6e5fdaff40abe6f0db70e2e7cb8b9926012b59ec",
+			"0xe1ca3ad88639975a3094f2d5f2bf812b91732c7e681aadfa9838d48acd2aedc5",
+			"0x8722628324d16f4d9d98a1c05126ed28a796927a7d92b12433f450f9dde982df",
+			"0x969ee350352d2b966a70f3ba7209d9eccd11900225f05a894c682db9e91eac37",
+			"0xa652d00076d380708fdcf9a8af53307f7e8ce8be0895a620305d2ab694a41081",
+			"0x9126ef241ef900f6eae95ea7fd48b9759fab56486dda0e847705bdea850a156f",
+			"0x545ca4cae7541ecab49f31fa795974ac2aea0a80faf71feae0a7c778490215a4",
+			"0x28507604ea28e064be5da5f6fc5fc35d9b19866cc8b349bd97791fd36319b982",
+			"0x4d81d0d091b500eb8e207c7ae8cec63c32f766b55a4193b5ba0aa505d8828ec2",
+			"0x472cdd8da3753653dc90e408bc2931296d0c96872770400754f79f63cd42dbc2",
+			"0x6bffc19062f0d63fcc842db4fb492553335d0340a329bf4b6877e1135fc87c8f",
+			"0x3bdd494804e2af4270a11defb4f90591a61722d9ab9f8e9ffa36eb2b38f31edf",
+			"0xd51e3a94dd3a847b40b81550428dc73ffc00ec66aac2751accf904355054046d",
+			"0x1d52de027023c8a53e186179c90653ad6e72816e3b5f2549776844157538d567",
+			"0x683a282516a4c1ed3f8964d616570138c545e00d1ef58e3eabaf2b5cb4017670",
+			"0xa066a6910e96e6ffda5553ec6611ea52a6dc244b4575fec2d0d294240c169173",
+			"0xce30711f7ed1859d2f9408577ad316b810e48d78f1e9500993eb89b7cef6ec4d",
+			"0x998c0d9a44997597bba2c9c9f0cf04d0b752b7c3981dbd31a37b433d559aaea4",
+			"0xe4775536fc7c8a2e15793443c9f81eb32800d339a4e54d12b621b5c3eac69c9b",
+			"0x30d47f77828169c8831dad3a5af4f59db161c8c639f9647c03af7f88fdf6a0d2",
+			"0x0d9cb6ae0f5b05ae03eae9f71fa10d8cc4a11d1b33ab4229941062a20979d2fc",
+			"0xec4b532649c0d685c05d0de3a652f3a395412bf4a67c813c573f2c261a5e143b",
+			"0x9b105824aa129d95a45c9ae21e83e89bc73f1cec89b4cacbdf81c6754e44978d",
+			"0xd4f7656af32242c24483894450a6c9a4dc39eebb7702228279a918c831bb4fcd",
+			"0xdf7d66dc72b157a57b7db88bd90cd61e7c581624847585088ab0d70fefb5be07",
+			"0xd94cb3d9320157336ebc825a669ebada765ae8d985ed3cb94b2f9344f49b5bd2",
+			"0xc92f6a9417507c04501e469189bf38dc7de37d2acb9b4b9ab444c9f7eddce74c",
+			"0x1d69f2b12610020ba4cfbdae081aa2dfd740319dd9afbe523d8885f9ea535f32",
+			"0xc931317a01775e3549639948b79d2643ba4974f46ba5da05d3a65a5276a62e75",
+			"0x7a7392150380ae3152ead78a897780eec8f20ebc3fb58c552b49b6fee307cf7e",
+			"0xd9c6a9c4e19d8d5020894b78dac2b019f53b0c5a906242a538fd105a539771e8",
+			"0x0d59d2947332b0bc87470704c4dbba5613df8c9233ee7b4810bd0c11e521c784",
+			"0x4e1e3bd3b80672e7f6ea8a9dad8faffcac275466cc3b09a409928a6c2f6c4054",
+			"0xf2ce305c9c72f5d02df8c072f1b41ac49a9f991b660a3a0ebb3884ca6e38ccfa",
+			"0xe53859f4e1ceb58901c9395e71001768d096a355d2fae64b4429889ae60d88b2",
+			"0x84ee091c71eb9406957f377d9690f2b6b74703da3798cfb801fcc404a22dac74",
+			"0x386ef8f6c5d07fe658167dfb1aa408b0f51b865e93faeba22571f981a87b4c6e",
+			"0x5e5f828788586e30ff1b6b62475b5b4510f1730d61a1774cf209be25940b85c9",
+			"0xb6b0a202ab4224f4050d6685ad2ae7eff550eadb59c34e65e551b428b2b762b1",
+			"0x1bc0293120588411e41448eed6436d52389fe915de5d99c133caea02abc1d6b9",
+			"0x8fb61c67f5dfa0bcded55375847f5e94a875a0d0d7f2522de0d0fb064ffcc31d",
+			"0x6247750212b8158b45ebea4d4e8361b0cd66fe40ce07ab208b46bcf89797be74",
+			"0x536f1586f67abd4833e3796ced30c1ecd742f9b705ab736321f96e8bd9314341",
+			"0x379a7f7c3897e4c8545d268d4f786fc92799a50652bb8c3cd60416493c9043bb",
+			"0x0593835a986174225dcb5d12b9f006e551935714d56dd639928153cd752e37cb",
+			"0x25b4a18c4e41dd881635e78261120840c9141bf0d98f23cbccdaf3704a9a8682",
+			"0xc55f91278be72dd3a066ba1b9efb1d39d011a723d5b123cf5ada81637c6279f8",
+			"0xa17e5f021b8511bb74054fc8cde1583762d36dc706612dae90d326712077af5d",
+			"0x5723f1ebe3c09c4751b843d091ec3fb2bcc6e5247eb6c9dce7fb0cac1d571a2c",
+			"0x5ad78014b5d8d35d114c0037a03e3adc7d11435d94319d078d4f8f844eb9689d",
+			"0x6e85d730f8c4c54280eef864b3c3033ba64c59331eb55ddf3486b0b54f327bae",
+			"0xa70f92be372e114b08f5e611a5de003a3f8c2f08a131bb54f45310783cf0877d",
+			"0xc6704e4b5f2344c8dcabc9885ad3eccb4db940478d33c8ab9fa44286588f2476",
+			"0x1c23d2841154a346fbd28abe3e2276dc83ebc84da8073ec82fdfa414372609cd",
+			"0x2ed8f84b7eb32b7f290c6a2363ef8d9cbd7c624440a8bc00b1adbe3f378f5619",
+			"0xf2c91d3ed1c6aa7f736ab4b936081fcaef6654a37aa28fe8b7e1b7795fcf3752",
+			"0x4275145e36f5873e14fdbaab462d3442d40a132b3975a2432cfb9a08ee083d9c",
+			"0xde5a4fc0bc197894296f63a7cee228c049e6aeb1a28f892dfca342fb35346bbb",
+			"0xf92ebf124db0be2296859cf79bbd14263db4bf5206b7dc36b63b786de7b64ab9",
+			"0x16eacba74f74c808a9902d789337826eaf445e9a131d8ccabe3bde22321c54c5",
+			"0xcafeef8dd957b566ee6f9673c81107fe9ccb499dee211345593194ad3de2b3e2",
+			"0x85ff213e7a9dd6c021ee307e6374c76dc08237ea0c08e3f2acdf94fa46a6c09c",
+			"0x4e4de2fb8adc658065aa6e54d888ada05ebaec39714bd466e1e35742c14b89db",
+			"0xb443b982f0945e0963f1cd43d85af46864f420bc47c75c59ebd515227a1a8f1d",
+			"0x5f2493aab4585f81bfef5a113985dca819c5e34693152c191ceb35e747e2141e",
+			"0x6d30f0784e1edb21a23f634ef2a2da79734ce86e84db6a201c2ea13262ff9074",
+			"0x266f276556b8b3f90c00212933c9ed2b0336d8abbc2cd8b544cf132aa516e814",
+			"0x88100121c595cde6a22f901bf8dae321fe8b12ba7a3b67b4fbaf3ca2f8b045b3",
+			"0x26350d866afab7c488f36b2b97cd252c01a9ca7daabd3932d7e6ae1ec87977df",
+			"0x7392586c92ef2eada65ef219f34c0fe65bf9042d46923dbcaac02cc3ec7704bb",
+			"0xe5bfd7a884d8a984993f6f35e4ec626883b473df444de5cb15ad9fbafaf872d8",
+			"0x6207ef43c9b95c289353d40728d56d323f99d7e815d4e8a8f20d621e4b47a0c5",
+			"0x4a757a8d31f2ab1176c4f6ce7d9f39fa882c0bac80af99cccffb5acc0b416c39",
+			"0x1aaa9fb56c4a89d19db5b71ca66f74d1dae1d3aa516f3d8971f3fe5796d4293d",
+			"0x83297fb846b8e3e76cd8a5de225b0d763b5ea7e713868d80306566fec3990852",
+			"0x018a26b285d6baf120e00091ce27f1695c58952b23020cc798b227a44bded5d7",
+			"0x1bdd73cb3f78d8d4f008345290ae5b73007ccc000574929b60007572b9105ce5",
+			"0xf3f8d1db0c6282e8359bfc61683416eb683c4a69b930b7c653ade0606a91b8e7",
+			"0xba4788f36ab573953242cfcd98b17c19eec15c25759007d8c56a3790f14f4d7c",
+			"0x351dca68df8b8386e6efdd4c9b52c00c59bce95ba4f74a851927f256d93c202f",
+			"0x91aaabedcb0e0b2a838d62f05d9856e69f6df8b417770b8ad8bebe608e327448",
+			"0x5cc4d0e86aa63c5afdb0c5b1af99354404c99139f59242ddaaab78b8795e4aaa",
+			"0x763277f6e08bc3339289d15e70fdc74ec3a7690ff0aaefc791108b4da440937a",
+			"0xde254d61b26f3a7b54e16a7b265d42874815783866151333af03f6bbfe6e7f5b",
+			"0x8bc4e31e8d5ec897751a54b914c61485bf96e6c1fc87c4b9bc0b19f935423dc5",
+			"0xf20e609f7df30958c85399402dca144944c5eed049b35b2300ee1ebb56e50077",
+			"0x7085a365683933d31e6b6b5208974a893da182c6c9ada13abd806e03d506d0dc",
+			"0x9a80b9d0aa3288bca9613ac41372f675401c5d3d230ca1b2a6add2ec68cb85e8",
+			"0x82e6d8e7b19c30fe2a651ae7729cc406d49f339f2d43766f973b9d97a25857bd",
+			"0x646ccccadee90279cfbb56b158944b553db8d9bc725258876b8a78de748f73ad",
+			"0x94cdc4f42628fdf76b0005121574a33d02a3202e6172a62dbebba6bf62c42d9b",
+			"0xa75e9362d131b54af8295567d15e8be510572e6453e25db128f74be8d85d30cd",
+			"0x5772c596993a6667dd424bb5e6666ce2625a3e1bd8e9817dfa77f7f6f3d12d07",
+			"0x19a40af4d283c39bbf558b8ca585167ec699705d2bd3c4ec407ea30cc5ad923c",
+			"0x38ad933e8bc4f3da73b32053b6fcf3b6c71ae4bc4f69a517c664ea228aef4409",
+			"0xfabd9776f037f9da5c80c4c88a160e6f139b08bef321e49c73bfd741a0654fd7",
+			"0xb072bad767d789f424ad028d5802a0a57116ed39aa831dd7831d70bb7165ece8",
+			"0x673cf8961606da36c2721d0536b8a3156860eeb08f664305e7a622104548859e",
+			"0x6c9eefefff1da960879563dae8f724144a96415e75e8a0dc54386db7d43cef7d",
+			"0xfe4be619b6f8239049e57938e5e1a3cb51bb449aacc71ed4f0d6e37976aeea93",
+			"0x98e94e7d559eeee117526394013c05745833c7effb89ef544740d775998e2611",
+			"0x442fa6baeff05720c957a896d00b60d75d7ce84bf688087a0b2a8fe3a3e1e97e",
+			"0x72789471d2b83f99b78fdf098f3567173301baeb07b5cf6ffe55acda8f9369ea",
+			"0x80fec35949e332105c99d631157f4b47f43de8bd10e45c9ad92a4acbf236029f",
+			"0x5baa59d727f7e4ea83cf23efa88110e8191cf5a89c68aba70b642c96c0b72458",
+			"0xda33eec2a35ff5ebd8ddc2541343e097320b99fb8ae2cc24d055253d3bde22ee",
+			"0x2daeb33494c6b567e787afa19f46c3573ab7896880ac064cc30c24b582099758",
+			"0xc72e07ec23ce92a0e602c03daead89176ef52171f5229ea97777e69dab16d348",
+			"0x3348c37d4fe2b489f7ba29f775c87ca8fa775c2de95dbf7c87498a78a620d76e",
+			"0x261c881f9be7b5ed77e82db8e834e7c341d942217264d7b0dac1ac29c94d8f34",
+			"0x6762ff4f6f3d5635156a3eb07f5b259c50566d7d5e42cdf52ca11549574abdff",
+			"0x4034ab592ada763d4b5e32cfc3714316a599f0949288b9aea686f5d246749197",
+			"0x40a9eaee7dcba2fc78f5435bf5051f1d9a84026206f47ef02acbb204c34038e5",
+			"0x26770fc1dd664253579e16671974104ee00835e80ae15d164ffcdd5b194fc676",
+			"0x8b8fdf4424dba145b4fa00ee2e72dd1f2950120bdcf9768d1b6b19024055807f",
+			"0x0324a4d2fd82de6bd6dd459d19b2f02a7d97755ea5dbd010be3b108b0072ba7d",
+			"0x20f243e1c374b7f7729e875af2198eaec2debcacdd513863f86e5597a5608e05",
+			"0x0b9d49c34b9ee53774fe8dc1643b59d69273b21837a720763285cecd09222186",
+			"0xc10756e8639cf67571eb0a80946e4ca859cdbc5761fb6aa5ab46cff2dedf74d5",
+			"0x390f9b716cbd49681056b9e1fca49530e51472c10c2df9397210cee0dbf7cb73",
+			"0x6bf8f1ad4d14e98e50c4e327acadf8b22002285f06d22c61ed0a574e64e6b540",
+			"0x9487c95b903f6d33e8ddac0604167fab06bf6f1a62fcfd8b38083ea15712bb7e",
+			"0xbc0a6f9f5cb5ce4727803f0a6269f14a8f267e7a3cc221f36c3ea6053ab06692",
+			"0x93de0978f4a5277ff9cc8d5d538a938a7813d1116f6f473333b7417837863cb4",
+			"0x5e2f071c171923d561fefb8353ea7029f03d0b61f443970177206e8e93e51842",
+			"0xe3008f65fa98e6231cd4cd619cdd90e613637f2a1f424ec4163efdf11bd03426",
+			"0x4f065201faf5eedac4c014b27677d00c6b0325aeb75ad5b8ed716dd0f772c774",
+			"0x077e03f083a4827da5321edc220f6b96695f7bc47212a7a0982d0215d0115308",
+			"0x21a9cf94043d38a61471a5204a4fc6967587c970632a6683fab048ea27ec54e1",
+			"0x2ec179d196277a51271fbb2d8a24597f8cb39ecd0746a32bc509187ede47dfe8",
+			"0x68ed1279809702f81463e8230122eecaf48cfc5c0eec75498985d261755c076e",
+			"0xdc3fadf8293aefe9b9b95ae2643b48e874e19d47bde7fad6f12723e1e2c9dacc",
+			"0xf861a8077feb273d45d934549b07e846a16ebb2c6555ebb7e57dd9027e6eb343",
+			"0x3fb3c7ee945d5782cdcb2f8062148f8335023a42f8a1d94ef19578df3923ae84",
+			"0xd9d6149c09826a82d19bbc0efe396629ec5265bfc6639bf49f977b971cfe11fe",
+			"0x856316f73229995d3abcb1d7c760fbfaa8ed4a824a1de6faa2adb62dea2bbf3b",
+			"0x7695527d9fbb1dd9b3d1d95f2c102937b36c69edb0ac0949895a29cb0eecd3b0",
+			"0xebd39a0511e64daf095960f4612cc97b92a98319f9c5dae9d13f56c3cabf3456",
+			"0x862aac10df3f3f8486d07015ec829f4ad2a4ebfc96d9a4c1878b9c17fcc85a43",
+			"0x921ae497e7cf40b3578d172a373c39b8cc7c05414e2a706741147b3eaa23e8c2",
+			"0xeba8def627cb48ac443fa362017cb5ce06625252475dd30e7731b94651f41975",
+			"0x8f9e9090036f690f546d90cb1f74db3804304791947603d2460e2c83e439acaa",
+			"0xc5fff2c4f0f1847a6e20f1a93e2ffcb305a2b9b34b850532623899b3d450eb57",
+			"0x4f360b307b8761f87f46e1ad725998e0f94343967cb82bbf415c11bdf81ed1d4",
+			"0xd6604a5c1de0557b6288ed612da8f3311ded595be696331abda1a121aaeec31d",
+			"0x80e9135f9f5f0ab84828493327a1f76e22abd9b47bcd765174f99a03a1330b92",
+			"0xad1896959b309904c28415c9349746a47365172ba2a9f64338b7ef27edb13bae",
+			"0xdc13ec27d5d5a9799216e01ac08f08f87f0fe27a3ded97f0c79a14490417f05d",
+			"0x131aa3e6f9de242ff71a78e411a7eac79a6388d93162030fd3e5cbe7ed94b36f",
+			"0xa2defd1306fbce126ac3fca31f72daca408160b2a8c9f1e1b333fb4735471e90",
+			"0x565c329d62c9e15a58c00f273ac372431e0948bc1085d1f867bb9d1da5584e5f",
+			"0xddee498c84407a18f7172931527b6033fe72a76a0c1da15552e83d4f8111d81e",
+			"0x21e8ad6c7085ad6d9684a6d0cb649ce7cf736aee2a5f0b000deb0562b405df42",
+			"0x45cd4e94e94e418f254673365013611ced27961529ab90ebea1bf22866ab8f98",
+			"0x21641687a64d6bb2aeb1fcd1dd6820e8a3263e8dfe1ab16cc28aefd81ef33f03",
+			"0xd5653e5636d08dcfa9eec120562dacb88362164c1e6cbf22b50b1ed763be783f",
+			"0x799d28262dd44d6edc81fb2d8ce0537bde7f17c553a793ce0339dc41ffe81604",
+			"0x056c40b65418757a9faef6e79781d952d4d7faa87f9ab8b543fce95335ce5661",
+			"0xb25dc95e4495eb262af93a71cc7d7f8c3894949564e00eba64a09393381e2308",
+			"0x2a117faab32173593c369a077551cf32a4f2ad5ff47db09b02a9c01fc9231a81",
+			"0xb97263788519d2404cd3e87b3c5f1f60bdafdcd66f90cd7f1cc6e48c91e41386",
+			"0x81cdfcd9d33a1187be2d48d01700f650a3cb5ad9015be43e5e346f1e74ac0910",
+			"0xc8def1ee952bd7c6d8e7104ed03afe3b2c3524ab0309d675e6a8440a8d30c707",
+			"0x510f4396b7b49c7a9d22030ddf7f9ba9028e48a17ff4c528aed714e77f5eaea2",
+			"0xcd498eccfbc75b2f53fa83e69ccd9609cb5b2b7776593b08b215c341814633f7",
+			"0x968f34b1265f018a2d654665176690c9a7f9c734bea5647aeeaeb30b79bdc35e",
+			"0xcc7df5e5ce5e0466d1984bd0dd141bad375efb95955f642588d6dbbca7ccf6d3",
+			"0xff24c0d896be86bf5b7a634246a697b71034b78a30f1c7180a38806e1666bc6c",
+			"0x5c7638a57f6d0719176a165f1cf0b9660dc115f1a988450148d52b8ceae47bd1",
+			"0x8f2dcb63926c2011dd70a5d4232896ddde9c484ed5c79619c1d38bbd8aa3a9ab",
+			"0xa48817b418c2f53a1df14fefd5df47d5d7d7665bbf479d8cadae010a0089c10e",
+			"0x1e0c61b8c4e6620e226de19941ba161063993af6cab00368ee08225bb197c609",
+			"0xb42e3cc1fab01739cbae6297d20d364a9dffa1c90b8090622a004036e956ee65",
+			"0x8675a534d124fa5f2aa0743ea5e7dfac1364e808e194f2b47a3be40596007fa6",
+			"0x5e6e41af664b6b76da9c492b590f135213f899cfa71f46e4817dd1e8f4825379",
+			"0xa3137844d37a0211ca70df2542ddb0515167ac2f9e8730b3f78ddd185ca1f71f",
+			"0x2c45f83c26e711693b1238e74ef925ea7ca62f8ae87a0bb56be658f50bb85f8d",
+			"0x57efda2e100f86e0cfad773efedc6b94e8433660b5505bf51a2fcfbf36693d62",
+			"0xdbddfcf9ee62dd2df5bbe3570593d35ae11174c75fdd2d9fa2a036603617bfd2",
+			"0xc1426b30576b1cdf484839e173b623bc7fb8e44512add04ae4cf09171bf287a6",
+			"0x63769d98a465a6d52457f5abd4f981335c68681277a665e5c69670c794e22048",
+			"0x84ded21d627443ce058449f621be8945fddb90126b0dc4013e020c6587e7e5fe",
+			"0xbbb52eb6ec5aac2d9ccbcb76244c6fef09ce7da0b4bd082a63f71cb904debe1a",
+			"0xbf8a7d1fe769344c7a4c1ce30ed1078d430f9b829c91eeeeffe4c512aa3d7bd4",
+			"0x8f955aa1566d88bcc72c5dc44298c7be8615cd16880551af0d5e85e1e75fc9e7",
+			"0xf13a984aed4e995a89f46f9e59ad2a0a9e6a35a366a11993e80d5409448010de",
+			"0x5f2f9addccac7a68888d9a75281a97270eace816acf9a66eb571f0b528a974b4",
+			"0xfdae3b48b794022a96168d280f966c46f27518ac2871ef5be4cded911d8c3468",
+			"0x09381a1113a9e8d4e17087b0bad6cdfe178e91b8846be88380a42b68d6c92955",
+			"0xaa0be3afcf3440d0be507bf2d7709c90dc6de0f9cf60f360996c31d9f0777a64",
+			"0x897481932de8dd0ac4d50687174fc274bba7f00def2654754c53d6a86a0cc056",
+			"0x674d3e4625ccfa18dfd8ea715f6ee536501e6935d0acdb962f5d36d185e795b9",
+			"0x2c4d74a35d981b3ac8481e9b2318b3c8f76c82fa9132d5a0df7e3003d1f56c56",
+			"0x457d591254d2f393c4c5a586dddc7ec840f27b3725a9e3d966c440e61eb1da1f",
+			"0x3bef7d4aa7d5fe18678f5cac053db4ee36f2273ec5fb11f2158777fc601311fb",
+			"0x96aade6ad2e2c5fc13a08c19986739c8c93d6107e3083c24a009728259c97f49",
+			"0x9be928c4604ecee2797c583f89d3cb730390ef41dc6a71273b051daa783c5443",
+			"0x5f0f6828a3d60a0d1fc8fce5ae884700c8b68f5ae339aed49740f44d81f3421d",
+			"0x1bebc8b98f2399e3731930a61e547e073c8e74d09c36017d88c52865240c1a93",
+			"0x89e58b2f46b86a595e0394bcf99c87f1abb1e3880b16a3eebc50a98fdb558e38",
+			"0xe9e853f496019d39b542e6d4923abd961514c75a35f1489070e8c058179ecd6e",
+			"0xc45895680db653abcee58043c646a97271e68ea6be5e440020b763814e76d8a7",
+			"0x7a9b8cc39c454fdf2c2f338bad6399f47af580d914c0529c3c78eef9c42a279e",
+			"0xfda0c1a4de2e6ab3aa415a3c0c54dfa72f8e5973f31246dc40932e5dcd2a8186",
+			"0x590f73f3733a7ad889cc51efb29cf73aab601af049e4ed42f70fb62d663ff4c7",
+			"0x9ddf5288ddc8cb7f770a9c87d3f3b7bba42b1acabc115bfdf8a210a3677a6e5c",
+			"0xdbe759f16648b0bb9cecadbfd18bf035f00908db82ea5eb89c92089fba99d20d",
+			"0xe780ce464772573bf46c8c763f15d0d3efa00f13eb046590a535683327e4d660",
+			"0x1e1a6eb209d12c4ecb97c5b0b6d4cb40ec6c48718e7f66381e6e70a070f4ecbf",
+			"0x20956a87f5127d80bf43f94c5b5e201768de55eb49eeafed759ffa93cc99e60a",
+			"0xb95002df40ab16bab3b6697b1683cca0f40f5a8a87f9cc209a7af5b2d833efdc",
+			"0x4a1dfee0a96f440c25957d4212a962c8bd105d8fda0136337a534137c84871b4",
+			"0x3706772e4b873e4901d46b9d1e3c4d47907643b9ea66c2c4a00769c379d9480b",
+			"0x54bbdab103586d5726c0fc06f4d37073d11d6643a08a7f4383fd2dbea805b22c",
+			"0x71fade35df17079aa40692fa1f4b0c06ccc923b5fbd352137fec2bc6de163766",
+			"0x6e68f8681269a5670f017489e5518c305f223d79ab8b7c0c0d8123decebb135f",
+			"0x6b2738c79521ed4aca1e2d1d1d064c9ceb7976ea419c00c1abdfc1fde2f1198d",
+			"0x768fddc96428bc51d2da8c29f0382a88ada02fad2c0722c3415e5f0124437cf9",
+			"0x073b3604346c6ab886df9a256e087fab99bddd2b63993a18d19c2f792d5d7ef9",
+			"0x0d4fd974576faff3e2b7143c7b9dd497a82fdb40cf6dc7daeb0edb92c04dcdd4",
+			"0xff968d9401495c2e6498651ded58cfd877ac2cd39a4ee76ed2d38a9df9237f48",
+			"0x941ede6edb4066a0fab64e43d32b914275bdb99d9260ccf13abac4721664a49b",
+			"0x74369258816347fc00ad9044cc978b081bff27ac93017017089eedc9d6bc0572",
+			"0xc4da7669db1532966236b6bb91efe50f8e49b0ba763eaf0edf7da01ba7403c64",
+			"0xe1f544ae2dda3252861a0a40bbdaee2e07a4853f0f769e2de4f591781b26d8b4",
+			"0xd96de0aa1e5d38c3a99207eebe8bf6a441bab660a1eae7e2f9740566e2b26624",
+			"0xe594f15b5572d594fd2d6e04c85700b2a54920a538fc46da1f435278b797026f",
+			"0x36c7f38d700166af4950cd092a7dafc0f858991cd756ba6e488cbad5733df81f",
+			"0x188ea063d9741276d6577815ad32078286c0e5935e9a4641ee6fabe86fdd261b",
+			"0xe83266d0dfe0465169535e16a6329b94334ca26a71ca8a6228bcdc5d6d9e5e3e",
+			"0x4f72f32b995c669ae359e35f853b32d78c9c10ded0090afeba135342e024c284",
+			"0xf0c349b2c53ae8922dba6635d5ad6c815cd41a18e80091fb53af888dce73fc5b",
+			"0x449c94f382b39268f70e7cd127b2e983164f4efa3a1ae7ae0457f18cc903e783",
+			"0xc2187c3ebf507e7ba02d0e9fc489742b07d5d1c6e56e952dc999543f46906bb4",
+			"0x55451070dc027493822eb1e25dacd66b4885f6e5d7696fe76054d700ba8fd7f2",
+			"0xb918488b2d6b2bbbf97132d8627b1e90644d0167b4ece38bfc72ebc59cac068e",
+			"0x8bff7b7f47013f71703b45acc6967777662d08052df955f51321539e58b9ee21",
+			"0xc588704ec672fea0cca9a37795c7beceaf977f60ef505d021cbc232e6281ac34",
+			"0xe70023b5d66c749625852e12b1716484b407d277968ae5668cc19654ff970c5d",
+			"0x9406fb501b38ac94bddf9c53299e856c4fa043971f56fa728cf02980d0053057",
+			"0xc472250a88b80bb35bafa79ad16f351c0effd4d529a0885bf308923058459d59",
+			"0xad80c5dcd33345da4dc627ab0f4db7468b7342a75153de55e527f77383d8f6e1",
+			"0x4b5a6e47d3d6e9b3e7fd72e0e8075556896415ee1bd4b5e5a803f08217f63727",
+			"0x689205df58a74261976513827cf5bda9798098a2da603990bc8ab3be295e107e",
+			"0x5e5f44891634df25e9396bac7ae80f632ce05cc717a27469c0ec3450bd86b8ef",
+			"0x45c8922e585a3ade1d9692ff7fb632ae93c887e63367e7b8719532a019c214ab",
+			"0x5656f71b6ac8a82539bb2b50e5355bc31549870f7e950c9f45443d53e5bad4b5",
+			"0x8fcb0de18049a1d68cdbd7a9986cfe683c0bfbb42cda187709fd1f657ee38305",
+			"0x3e74faf49aff89e3c73240dd61b2aaef3e9055212ab2a20bb0755cfc4e9a596d",
+			"0xe93a158e733f4c2d51407dc1cb83023df0ad632e49d1b12c6270cbf945e09559",
+			"0x7f283b0278e6e84ecd8f66bd6e0d1cd340c586a9fe0785ba454f5cc238f88b78",
+			"0xf367446836096eaa9ab4ba421edb8f0af0ef73a1fd958ad36e52fe4a98d67084",
+			"0xbc2caa4dfc803ac078b934e0fa4486438ab5d64eda0be84ac82d12782c68d3e3",
+			"0x444f24147dc65109475cd063e4a37e6c79d0facbf672e716128a48e313e44fbb",
+			"0xa6c1765069f2e38e2e3c1f40c90b674e8bf6f5e64a518a966dd158258e57b9b6",
+			"0xb5071af90877914cc565d5b76ebbde651ed6f5db76b9940ae4176cbb9fd92d18",
+			"0x29f88ef40f89c3889e159d632c941308ed5085188527a36e23606c50ebfba2a8",
+			"0xc0c02a3ddf3ad0939fc9df4d3aa48f81cf3771dacf62afc956f5faacb1bde118",
+			"0x84ec18194d7ae7654da7b1999a019bfa75f2f69e1cb2fb0fecc8f4f61e5c0b9f",
+			"0x2803dcc01f327f40d67094a16d7991defa101d8ddcef31b6d1357e11c06fa940",
+			"0x2aefb88c2671c3f2042fb93d022847b60d536a8fa14b5e7c52e9cf62fdefe486",
+			"0x83b06ea5e66be9d159d28b5851ead921d856aa64e84050ba7644218d8ea616af",
+			"0x3d00b3dce583ef2c73e8787230f3661c7a6ac2f17478d209e7eca9ef1f2421c2",
+			"0xe74bbdaf8fc7dd39d06b420393dfe0eb6de555fead817d87477a56ab0bd5c8b9",
+			"0x51ca229e7e529d7dd9278d174380d75fb7b9597e52f9ccda28c2a9563b0eca16",
+			"0xfc9c58aa8e07fdfbf2007f7cce4fd620215ac4c027da65dc2fcb173f0bd6ad5e",
+			"0x334c50b0ec398053d7b87d80d08c2c74acbdc61a3055e04856a70cac680dbc1c",
+			"0xf4913e603c18910e3058b5f65737aedcee7866b393ee319db746334e2a3efa8f",
+			"0xe9e6aac42b0fe25a9649ec83326123e05adb51cf7ab1049e984bf4e28d56cdc1",
+			"0xc8a375c04f6845b72cbaa84d22d393c7e744041495c0589850baf86a824b58c6",
+			"0x5aa08a6a75c4bf9c356a8853f30a625be8ebaa452d3686070bd9e32a70376f5c",
+			"0xf5fb959c5b65d44152e61d1b3721f286fac2eb64d5f43367dd8d81533230dbb0",
+			"0x513e2626d5ed52ec89ff88583ad765ffd9b4ffde79645c90ad2928516306f8d6",
+			"0x69319f3bf63ce64ce910f9ca90374d56f4a1a0afae4c56d0609dbcdd65570da9",
+			"0x9b1e05ed52a705140484c879821901dff8972b4fec4c8cf8b5a8ac3af20a062a",
+			"0x6e926b50a300af65a0da8fc6b36ecb6dbc0f36a322477d496bd2ae9d242e36a1",
+			"0x5a0c0243305b8258bfeb1910533b90bde09d7294de26ea1dd2c815a262dafb57",
+			"0x8f8da16c726284c5c8c773af62104728558f4c6a3fccac42226fdd381935c256",
+			"0xafeffba3c64595e4e202fa144c247f9afac6a1e8aac25628bc31628cc8b884d3",
+			"0x27c414ca1714c88451fb7ca6dcf5801a42fe6b50488986d31f4d33c8af60fbcb",
+			"0x9804e738c5d2a417b8234ca7ea552add4541c578cceeeb521f1d539d50d4277c",
+			"0x227b9cedcb8a98a8bec8429d0b6c32c1cb68ce931efa940a66b4b9a5e6e96b51",
+			"0xf6123c95f854e21044df359cff00f110dcbd86ce9784b8d428601a7755a86dd2",
+			"0x8e365936727e87c1816f427fd7f07be72d39111a51c5ff6752aad55c00cf3649",
+			"0x2ef4a4858a36b00d793bf2a207b1a952b730c3d618fc88bf797f0175b7307532",
+			"0xc577af7060fe80099f26956e63baaa34f2951b38ffe80804217b7eba2d6c441e",
+			"0x83241d8159b3b5920206dfdb5428d3dd4a4017d77b3cf1da12b68fb922ef026a",
+			"0x52532815abe951b5b1c29b31d8525aba3357441d2e7dc434666b750da5f6cb31",
+			"0xa55855e40293e6127d035383ff4a06009521d1e51ef6c3d4183f278b5209a47d",
+			"0x291825150b3582dec421ec50cb68e5121d672e353d49ad15b241e50d48f317c4",
+			"0x1ea01b3f106de9453f76c5da0ed054370ff3e09830f1537c99bbe5180bfa865f",
+			"0x97712de570a93fb5f4a65edb440ae8d40df884f1632b49cf2a2d677c23854075",
+			"0xd12d14d9dee8a1511ae6acc678264540efbfe3e0bc680d3753073bfa86237f20",
+			"0xf3babbc9ed75b5cf6237509bedcf1c5e3c4893533bb491ede3e7c0b794e6e6d2",
+			"0xe9604ce3ec312a4fa0919c3cb93974cf45b82fb58000cc35f0a9aff8640e6307",
+			"0x063aeb5ae400d73bc55b33bc48e2360e1cff6634c2a9a8282821e656f1ac186f",
+			"0x19eb4fc202d084bde1d280ffa2d47cbe13f875d131011e0efbcad50bc56510b5",
+			"0x025d0406da1470c4f4619d06f68029001e77f32c996c65a64dd19c22f5914187",
+			"0x439f8ac9ed20bb2f9e93d9ecdfa860a8728aa7f5ad3672aad0960d22ecc4990b",
+			"0x6d4e93a5cb9132f0504757531822b78552dad48e5760a28037c3160fd19f18b3",
+			"0x7b4e2fb316f3ac96382f086d9b58cc6f34d924799ddd1526b240789d7207fa25",
+			"0x206be12aafa8622da5f7073eac42c6f6a706623f771ff5f8e14c32383b256e17",
+			"0xd7bca9e89221da42f54f184dcfe3dd93705eae29844824bb73601cfcc51b5405",
+			"0xe931dfc9838059409b959382cd8fef53c26d08a509fec1672b5ae32d36a4f642",
+			"0xdfc59b76afd96f42ca5299b7d83daeb7bd99515a15fa714348d2dd737bf4123a",
+			"0x2b80ea34e8f3f334a3935aa27e7990753e0a75cc0f6d66335c449143457a9130",
+			"0x8f681bb84f9402cd3231472d3103a5fd73a0b00bdf98610a1bfa64ec3a3716bd",
+			"0x9ae86d50dedb89f36bf6ea98bdf6feac997934d0335e4d576501167624807a02",
+			"0xd610522f6bc35189643b7ca313d308bd09362310c3c242ab054cd689e9a3ceac",
+			"0x2639ec5c2d1e74d769f0dd9cebf9f97cf3f8bb7237e2557782fbef69fa289a3e",
+			"0xc3a1bf00517da2707dbf4a77254326dc7560618df58f3299b971de163cf30b5c",
+			"0x6ab2f1cce24656ed209dfbd63c50289e5314a8ab4d9a9883d94aafa90e5457a6",
+			"0xaaeefaa934fcbcde6f7d8d551bb04c59ef02044382ccffc0d391602d54bb08dc",
+			"0x1219f82ec65424420025c517665acb975e844d2e194dc2865d00b57d9c9bf6bc",
+			"0xd4a4f53312be916eb3f403246f4dc33025cbcb47932601e43f0634991198191a",
+			"0xb291089807f2361218966d187216a57e7da75a90affda3ffb9ea9686f200db48",
+			"0x495c6e323696bfbed94b7b141a412ffca903266294cdd609f9a3919a2e56106a",
+			"0x55e53a382bef3540ef569b9c4e2c4554ecea88e7f02954b5f553813b0f723f2b",
+			"0x243c3c576d45baede693313cd297000fb029ed43edef95aecf7870b807defefe",
+			"0x18605e184cfc5c1fd6deb89e469c541953921b69a1a6d60ce96a9b38477ebf87",
+			"0xb235315517748d459d6220cbe386c18b4c28afbb3ea4f0dc269def49d84c836b",
+			"0x0f92014b08ee5286e7158fdeda3e1ec128d75a454cd5377cef82dd605b85b23c",
+			"0xcc197018d000dcbb535b4d7dcaee1895613aa913910873be4dd18eb8db4d84e1",
+			"0x5272bd28803e27471c8b74c73501deead26b088337d4d108774bcd20a16e474d",
+			"0x95994b45cdd5e24d0d62ade16622a2df256b7c34bb6fc3ee1d82c8bd9c9ccaca",
+			"0xf3540d14e991c1f41f0da0752aa6beafa52b3d2dbed31b11a037fdcf95a91cb8",
+			"0x1e3f2d520c3c8a5a6a5f4dfc98e34e41b00c7f2373e77c894d2138ddaa4c48f1",
+			"0x73a32af3ff4f5e32cae216a58ce5806b2ef2c2138fc661626ead2f3594281975",
+			"0x24c7750911b78aafd028a9bfb8723c23709229228b55cecbec2be3a85e4048c7",
+			"0x6687c041b158f93684a86d7d2ad32b8fc1a2a189cc84b458acec35f421213186",
+			"0x7be2d7b949ea309c3edd3aee1df035b3b007394d508371db07e1fe7050b8fd92",
+			"0xa93cc5b8160519159b0aca9de5e3ba73df420773c43faf77aae11e808cd31444",
+			"0x48da7fe896d8a7190b88493c007446d7e45b01ec9336196fe590eb7104296890",
+			"0x00b562260930d36e8ff01819603a1fa7e47defc9afca6f694ac80e258b2259cf",
+			"0x634774d7f08b45b0a5eb7f6366cfc3d587652280e67e5530c19a59b5e3608e56",
+			"0x71210aa1bb90f98be4b5d3624aa434794ebef0036317d0ac0c81aa5989bfbc23",
+			"0x08d73574c11609a5c0d8011d88985770c7a9f6c6b13241a60e97208e70bcd8dc",
+			"0xaa8f2649733da5542c5ebd9093f6385403e54893cd20159c1904b8a65a93b0fd",
+			"0xba2b8890f1068d0814e7b9f4ec96122b2f054d9d9a00de7be6f1376588668c7e",
+			"0xdbcebb99aa1320ba6a73bbf03d0c3a6f6a5a0f448fd82f66684132f466005730",
+			"0x1bc13dbb79db619549e48b2aff6bd287770dada84871eba6cc3ada263f1fead8",
+			"0x34bd6250079d5450494313d82d55b6d67b5c88b9c327c12ccd1dc26229fec85a",
+			"0x9bb7f357e6c2fb16a1785ed1d8329dfdd1a0e153eef63a28426da32c6b3c4f21",
+			"0xa400305a3b3c3a43cf19db3a8c3bdd798bee0b3823794909c99ad169aaacb5c5",
+			"0x70e2a9779681594fa2c5134479753290cda06e381eb694b733ddef6f7d68c196",
+			"0x5310ecb256d7c062e314d3efe63c8e4aeabeb8a28deefb7082932bce1bb0ea2d",
+			"0xdb31f093dbe2d74e97f89d9d4ee90ce620b10516bb2f67f0f72083ef95a08533",
+			"0x194435831533350741d784baacfbb72bf29607cd156262b1850ccff9066b1dcb",
+			"0x34e908f1794a6b6b62cd390af76426dedccc25146ce1ed9655a419eef19ab593",
+			"0x9ebd77d7838567ecbcb9bf6e01470a6504e1d11b72ac7cfee1252a38b6fa22f5",
+			"0x890acef390032fcb941b497d0a8d9143f24a2ed38320e563f4cb00aad423f945",
+			"0x476f91830e89ca1326ecfc1aa170638f69d85ebd2d2e6925a28686ffed118269",
+			"0x05b82272e619631be587e2e9576651efa30f4aa606a602fde6ba6612c96b0204",
+			"0xbe52d8c0da80709a0f9f74733514aa89f0803a1c3d6318548db8591f04d5cb50",
+			"0x505c6cae331c6545e52479084689cc05e9402afa29c39dd2db6929b8c0f343ab",
+			"0x67a97852d6f51efe6d6936b4b46913e3155706b8bcd5cb84a2e5b4345a0c2319",
+			"0x38235c94758cbcf5f87801f7fd971307e0c0575f0fdcdb01507c3dadcd866196",
+			"0x8c8374cde00dc3c8d981e85c7abd861cba034740b088c3b3d0d902e49718fb73",
+			"0x00d8ef455db3b3176ee73881da23eec72aada4ba69d99e2e9e8854689036f719",
+			"0xf449e78106ff9feac43cd39874c96b283796703d95f3cc2310eb0891a847f5c3",
+			"0x59a55088e2bd944ccb6c765c1736680ace188ed3cb4426e7883d6a9b13fa3566",
+			"0x61a70e0b86bf6c918a7ba9e5cee5ab1b1778ee8bb0c6d95a22fd3b316cc49318",
+			"0xe76e9eae05121a7297046ce013cb15f9f9f4948f75b11080e8624d8db4c72fc6",
+			"0xe4e0fe04b626bbf1a4a3c07d83879fa431624a2379d96876d0660aa11558833e",
+			"0x4669abdd5a4414d5c3477ffbf117282ce30e3f7eb53d51a4558a53a6a218ead2",
+			"0x9047a215e32e7cfb8cd0f8ed9ee511b97ce6c6d958932f9a69de675fa40be3f5",
+			"0xe843ad9c00989e64bbc628bcd94ec33d9fb7cab7da04414bd5a8836abf3d77e0",
+			"0xf74a439fefb92fe2f4a5cbc00b5d0aab98b123ac35ce5b721c822e3f01abe919",
+			"0x2a180beafbe97688ee4776ea146b7a04e1277f34c6f590a36e757713b8fbd162",
+			"0x7e6b2b0e1f5ca1710beb9679e9a76198e8c46cd7f78e708f8a221c1b0cf8706c",
+			"0xd81eeaf24e581409b240f4c939eef367a1202a67b0f3f9624ad2b65320a5b1d8",
+			"0x0785cb4877a081b0ffe0969659e31e0cdc107e074e0f50441efd0d605e24ba50",
+			"0xd940ad268d241a3816953423ef21b00accee9ff8ecaa568b9f07d450c83b23ec",
+			"0xe9cacf9f26f9285a92d9de458f0da70df4865fa339257b9194170e47b1b8508b",
+			"0x0a609857a03ee4a9a12d4ca433dcf4b1dcce562eb8eaf680246c5677592792fb",
+			"0xdf39272007002deaf6e3e08d39c301acb019fae9fc1604045970b24ee811ff5e",
+			"0xbfdcb2fbcda60f56f4894c363616d0b618e69a65d99a28e7a97e7a3e994ffea4",
+			"0x1911b497e25ac33f47d17a3375a48429f2ed8ddaceaef5d87833200d177abdd3",
+			"0xcb567fbf2368e282fcce5eb91de6d63978ddd81fcf708a7bf72dbfc67507cc70",
+			"0x389cf86c4724fed48eb07c84ddc9eb57f6ee7f1289ff784b40b0583adbe17258",
+			"0xe4df95ab6106b76317b98743c8502f542e4c938c4bf6e7ff8333a806e5b7ce10",
+			"0x5d6011ffd07ed24f53c89f8e0b7bcbfc9d61bbc7bbf4c75b2d016ccf0ffba894",
+			"0xaf73a81601a6966ef20a3144f78b58dee5a11dcc62d9c8571bffcf47590f8390",
+			"0x0f2c2e6f8709204b16e1150113a3c21dee41e07e05c02d2a267db5ba790b9fdb",
+			"0x413625e84a39b66a76f367e93e7540ba19e449da99b20027bee22ee43d951b91",
+			"0x8c1d212a9981956be03bbeb02cc9481f49e2dc7771adf2528db022a566c1e0c5",
+			"0x931f8f9b774998cac650e051437ae2a3e283649c70c99bded3f782590507be50",
+			"0x3c921258cb54fd6749333647bad45ec2e370e6ea1717378c5c220707057489ef",
+			"0x4199f7bfa2612d7b55ef0866222e826360ac55c331bb224e1172b23b908e63bb",
+			"0xb031554c6174037e0e653c770748fe0fef7c2e07878641fd8b6172d407c96f36",
+			"0x80a29a2e5e0fbbe548688162bbe896e4779c14cc36d2cc8d79625f4e900e2e29",
+			"0xaeeb107069aabd8f5a493d4eabf07269ba8b138de2c6fc2e45c1cc51b16cd47e",
+			"0x693796fef4816ac117709bb0897f04f7a7839a63553480c58cc9c9e84819977e",
+			"0x1f7799d1703c941c22d508c77b9c675b41fc9b3458676f8b68e61bc6f782ab51",
+			"0xb77b822d6bf3c564e85a5fb807a6f2c327c8e9878f1a8bef5efcfc2b42683ccd",
+			"0xa7a18f0dfb0ea0fb324e44e3e8f4b0855909243c4d9033c049308c1b5b0230ae",
+			"0xa0510d0ea833b196befe7e7306d032dcf7118f6441b08c5368446585c2eecd6d",
+			"0x9a147ae2c6e144acb568987fd0bee3217f3b9b3e93c8838e61456bf8b86a22c4",
+			"0xe9f1a8278a5ae525ed2a36fd215c8c32d829a7d33d8b304ae5e3b1be87bc2a71",
+			"0x0b72bb9e24280b927c53ca9e0b5881692a512f5364aac34d7fcd3a74e7afd48c",
+			"0x769739b3852616af794e5da01fd9c82d4f18ba2cd83e3f4cb91abf373af2fd01",
+			"0xa08efd521c783110f8bcbd6b10e0fe88589b86cce52e74b79fcac0c2d9c0622d",
+			"0x2a92ad845e5248c29dde55744617fb89da6274b00ab81b39ca5165e7889f7c84",
+			"0x97a39e46bfa06d65b82267322c932eb47fd300c9c3ee39317490d5b2cfbefaad",
+			"0x2b069b2073de7bdd72362c3d660006c887a202455fff0a5ec829dac09317ab95",
+			"0xc589b08560639f3cf40f7ed21ae23cdb4fc6926b8107bf1c5d43bceba8b73b72",
+			"0x7e60eedd8908ae15c145697fe52bb5583450cc3823e022ffe99f6b339e26144e",
+			"0xa9aee5b233f7be5937c774181bfeb00eb1f6ddcfb15c75f32ea8ac25e8b27afa",
+			"0x3b61b38d28bfa8aa927b5bfba2eb720c458e381081ddeb272f5468e0e337127a",
+			"0x81a3e1d1085962a90b26d069802a3a222b7514c976cdaecb17991dd14c39abe1",
+			"0x1f323a73660c294067febfee61dd3ba79e6b6e44b56f3643e6abb46bf23e59f9",
+			"0xbebd2e901a90f7d00ebfa0a37d6c30fb82df35277bad3fd361bd996aab04e76f",
+			"0x540045b3dca70445378bd7a5e99e7401a6a34852178617c224070ad6168c68f6",
+			"0xbfb24b0f324aeb1ddc9896d84243304e7904a5877c2d3905e9dec916aeffb833",
+			"0xd35e90e38c97392ffd3b18f6fa3355cfe7cafa1fb42a679341d120dcbb00cfb6",
+			"0xa45d268b64eacba83a08e071a70238f6a09268d93f9ace0239f98b9b480054dd",
+			"0xf3811936dd4e523e92bece26a6ae9757d082b0c90db890d29dd6db748532146e",
+			"0xd2f0acc18ea883e914643230ded3c14ac41530a207891a60cc115788603cae9a",
+			"0x1bacd3ba7d6ede3600338ec74c93a544b53e79607706c78ab8c3628abf086000",
+			"0x84ed140ab09aea7bb06b372079cee2c55014ccdd7a86256de4203b3edb395d7f",
+			"0x1eb7929230ceae1a1eb2ad2e621ed4d96fb7519519d67690a0a02028354f5b44",
+			"0x6ea5e84a1e0044b4ebb4c9889c0f0cb8366067e83b41549fc0b566f8af18f373",
+			"0xc0a31489bec0a05ebdef2d85f63ec978c7732cd7f85363b5c0adbbc24f8b8bee",
+			"0xb411b35100cb2e46514f4cb38fbafba9b5d08deb69dd04f5f1d6242092256ad3",
+			"0xda4f3602b5186ba05a36c6801f9671bd81c0f7bab2958f92f23b53428c6d7d20",
+			"0x192955fb0de4dc5683143b58cee39643b8dbe650ffaabffaf1901c36f66c2206",
+			"0x01e6ffda8040936ecf0fb9bcb7ade2c111a1ea60d865eef26e64cf2b61c60e64",
+			"0x0f65e8a8a15d7dfa88138209a07882256d0fa29598c80565d25031fd9c457a1a",
+			"0x8d271c3e2b1f46c781d3e0b78a3e32ba6cc4a34dfa64beb67000adff81082a3a",
+			"0x1797d9d3f8ef921578e44c12e89a3603a1834979f4cb095ff97d587e3ad0fef0",
+			"0x43b8576ff5188a17105986358fd46476fadc8b012c2b5ebca1a6e2c7ed99c672",
+			"0x9cb12e9bd8ead00e00267b9059c27805d8f1183e38e77062d6e8596f3aaede4a",
+			"0x487a0d1136629756c07b721524706153dd3b6b30a99ad21524c6ad7bd1fb68cd",
+			"0x585e4e9bbec3b503e9febaf2fd948dc570a68a7d00869efec0696ee734793188",
+			"0xcd6687ecd3a89f6148ad3649b533e6bf73693c3dbc7ac8786346c28b31d46045",
+			"0x6d84a80a92c4f0e46814b781c9bf810e8951b42a3b4ffdbd069af8cf5df68e6c",
+			"0xa665dbc194d98bd3241df0a0c3a6ad0840f26b6516d7acacfb14d762dce7332c",
+			"0xe4be31ef78d1da2809a8893e184c8dfec02c9cc6cb6cf9766b24f5c751ffbdba",
+			"0xf627f2f2abba302c369d9ef1440fccb76dfe929da867e990cc0849abbbcee381",
+			"0xa0c92bf12232f1382eb20abc27d456348bed2968498b1f50af47b4ffee978dff",
+			"0x6f785f8c8ee41dee4919d36a6b93bc79358bad7c6526406572d8322d2c4caeae",
+			"0x956663cff06f54baef4916c5c1cf2fe2f74ed3adc3d037675e5f560f20fb40c3",
+			"0x254f23c420ee39fdd9a9855232983dc72ae2732df41a9f5a6f706605aeecd1b0",
+			"0x9f506bfbca58d8a3c1537223b508ab1a73fa305115d567799887ad3fa358dfd4",
+			"0x45130075968c58cbb9ff62dcf24720665cd0445b07bfcb48f258e774b7afa696",
+			"0xc82b3616bbdb734206081ffda98c7ad52c25d6e319e128db9805d47d4c0c91d3",
+			"0x5514a3752fc41d6fde6efbedc5819451b5f5c447da3165424c0b45eb45b7e05d",
+			"0xd43b0a7a8004bad15520484cbef390383d383f92fdfff2b565d9c3cce843701d",
+			"0xff3c2c98321126f95c78489407a7c1f740d91d1097a9db6e7c2956daee4ec037",
+			"0xae6f03d13a9484763007bb1747aec64fb8af07a6d2b75e4f0ca92b1e5b5cabb0",
+			"0x77c0de0b69d598bf861d6202a9aff1bf969ac530bc4ea29821f3906786bd5033",
+			"0xe5304ed9e69f36201a17a15a52b0d55172ded72e43930d07d0031f6d7930982e",
+			"0xe4d4f0914e9da6ec689721953fa6434b7a6df1ae96d5fbeeae58be9bbbafe91d",
+			"0x4ca8aa5164de5e03129e0c0fd1b25f8edc0be0095880c1be92f559c9e41088ec",
+			"0x10c0cfc83a0ce9cd01847cd6608d0d5f1e9556bd601e00daa76df36a5478b4a9",
+			"0xd3dfa0401755d52369eb3420d9f11faa30642f96ac47cd6df647832885e45255",
+			"0xc5f3e2ab30f2c04663785ebe8616d721fed26f3b0682978d8d293b71c6e679db",
+			"0x5d3a3771e375cfa767bb2f79f4eb524e24cc75edc18280f45e9b5684feb8cc21",
+			"0x5f75a61d6cc535180f4866f131a6b3765f8f887bbcbad8c2341d0f3639f670ab",
+			"0xaa92f9beedcfb4a89c40c175aae2ab7d714b9e08514521026c04c394b8e691df",
+			"0x3c308a2526b380b770b440e597ab93a9890a93aeeb0f7358e0d718b8525fd83b",
+			"0x72d99722cae34e5e98024633450eec36b5c5f210ad8d926e706130b668ed652f",
+			"0xf355aa777e1d6eb54079aadb9e01f90019f2152867ffcdcd9370890e52f78f00",
+			"0xece9a8bb68f51b68b1af494c1f9f939852f8b5f02bd8ea7d5ed6184826e53fea",
+			"0x175ce65c526df144931678b31a52c0482cae8c7c5fc257af2b67db4d3b911eed",
+			"0xbd08d3f0448c85b347293e37521be9cd023020d5f0dae65a58685c9b38b0d72d",
+			"0x7ce531279c7237fc6a5cedd136859d2dda2994798573eea5e16c9c4c1f8dd2ed",
+			"0xb9af8108c38f749245886a5c739a8a27ea4374f1e4f1f80f7cf5d75ca24388ca",
+			"0xb47fd0ca734229e031302c21e9cf9e722313af7687a017be4cfd7a126d3e3a0a",
+			"0x535c450febff97088cc5b9a2dc53322464d30ee1e1a4b637eb0af6fd9cedfc4e",
+			"0xa96eec2bbf07a5a721757c5f822cad5eccfc109ab625f60637640b593fed6e33",
+			"0x1dc48b9654e75fb0469f31920208cfb8daadc29e474c2ddea26a84e41192b7f6",
+			"0x4eaa4710b6f59a32654b551e6e6831962244adf7cfde3bcca1eb23f3fa5fd6dc",
+			"0x974fc45c5d0f29e9a435be9801216e821528d63085f91c8f32926fea6f2fe33a",
+			"0xae9258fcd4e24377f6575b1372d93c8e1f3f182d69e1dce0f34e5323bb564c40",
+			"0x936f73a8db5d27ac246628d916076f210512193fb0ed07b177f88f38f1d9f93c",
+			"0xb1d9add4e81f7e31cdcf939e96aec52343f0fcd1c3945a06fc373582cac5e3b8",
+			"0x715b33556e8d2c731a3a9f82d62de5fd888406275ee48b0aa1e667c500853f89",
+			"0xbb069b2facb78c576d0b5ac5b60cb5fd93086c8b2a8f8cc3de93b5ee0a8047c6",
+			"0x139c62086e489a6dd8df1879e40d3efbfee2a5a9a18a20be0d278eb5b6342a24",
+			"0x0ec77a5043d047ef4790229df9a6420c40bbb12591100292f7ad1cf01a1b26fd",
+			"0x3bac40b81c8200311f142b21e74e878bde0741063625f8a88255f618aa7cd33a",
+			"0x0f40ba7924103e076c023a324cdbe7a066af460e628fdae93c6cad2644af9838",
+			"0x9e78a97556487bdef14755b016b70ed5ac02de3bb49570dc43c30f356df6b659",
+			"0x3471964bafe51086c307c784b38cc06ab61f5303aee7aee894df2e7a759c40b8",
+			"0x0a3f66714a6a0b2a1d5f534be95a510f44d8d238744412a532dddaa49ffe8d7b",
+			"0x7bec733ae41397642f1f5c3d8c1ccf49b6bc9c1a518223fcf01b5f7cbf6f3705",
+			"0xb9963b533ac1898cc8bd7ec202395b1a84ffc9f2f170727db472a957404ba377",
+			"0xeeca7419303169bf94ab4b5387582f8512929e9d3987f14a6917be06195b76cc",
+			"0xcdf32b3f676c7f972fc32235c8aca016c467a67a441575d473add2ff67c101f4",
+			"0xbec739da4ef3aef4e7a8d40a58f8343fb692d9d19e5c4c6ed2e1f01910123483",
+			"0x9ca224e1f36aad793dec4eaee936330bbef547282038de374fa8f812b6ac2731",
+			"0xd8cebaf48d29db6b9bb818fe2d8e959c40d16ae328292f679bf719fba9eba43d",
+			"0xfb91283b8e72f2b65fed21efb13841cc1e845ad312275a55590f0114b2118bdc",
+			"0xd6708f204a771a6f77be76e7b7275bd10cb43bc141dee5219574e14298665087",
+			"0xcf4684a5a211f183a8ebe5ccbab97419f3cba8e9d060e7842d4d9128db5f82a4",
+			"0xd4964b9f2546dbd080b764645cfda3a5b24e30c76d30089b3da7f93793830699",
+			"0x3fde509e67bc090d74da01cfbec10c03bc456e63fad6a57593a5f534beed113c",
+			"0x70612230eb6bf9bea267f83c3bf62d0f2decd1f43653bdd00a0c7b89b0d32b59",
+			"0x40803fa27145e3e16373032c2512214f35bd7b5dfe06aea4a42104e43a58fb4b",
+			"0x0d78c2b135f282debd581c77572eac67618a27a2e72928b531d8c550a83ca95e",
+			"0x1ff6f0966557746d1dead627307711e35e21125c5356183ba6a7fe67a33dd1f7",
+			"0x2d0e54e705b6b48a0ecb260421b1b320ec6332f2326b570fc2671119c889fc83",
+			"0x931569040ddadfcfa6ebd7264a58b6d3a7200819fd83d5be3d107e8fca662fbb",
+			"0xa152c1e663ceb96c2fb4d3fe992a8df968dafe840c41171ae1115ee4c3f2189d",
+			"0xe0eaa06be11e49629e893be21e3485edf1c2d1c4e10a2ebd56771bd9c8c43128",
+			"0x4cef1726c40c846ea4b89412d0959e0c60c2d7d09aea7260c450e65b6959cd0b",
+			"0x03d60eddaf920b24db0cb177b3e87febf7ff42c70b01f19165811c02e934bac1",
+			"0x20237d9a59b4c8d7bc324055ed2c09106c5a83f80e3faf9a519ab7fe7dfda4e4",
+			"0xdeba273b77f09eef6383e543f144981ab2b0a8cf5458d53cd7b62f2f4620b5ca",
+			"0x792ca8b535585e17448d5961a53d48478f5ff3ad780b4cd5ce400155f99d47df",
+			"0x9562462d4c50af030ddc1eea7afb2daf174d37e87331012ae7809675977d19dc",
+			"0x534126a5a45d07b97f8530683387aa7b7d3c542791a591c999a3147120c9df66",
+			"0x395866222f4b9eda175fad2b5c03d8edaf7dfa8c231e1f63b50a8f7ba8ea768e",
+			"0x3b7c90bbb4c1d512f3b32c52c11df90362395458b9e5036fc115cf8c7e1fe8db",
+			"0x1b83d9a38e749c331b456700d809d2fa4d44183ac7931a5bfcc270710db5d9e6",
+			"0x0d219f3be7def7fdf0a6a4fc7b9d801fb7f82bda18480f5de4bd144b5a07699d",
+			"0x8b239ffbade64752b0753f0455f80f48bbf1759b578877b4cd633120640e368b",
+			"0x4952033d5a714fc9f00d6cf86cab40961d6f65f41cea32969015eda8bcd86d12",
+			"0x9337c08af2b8a8109fee2b5d5760dbbe0ebef717276c4e0ec366a7fbbf089133",
+			"0xf8b5d552c23243c2388cee3d830353d2617058e2564ea735f9266650e0b384b9",
+			"0x998403af8da153a188078874fd7733a4975985e478e0bffb88d32f9f73165859",
+			"0xda6b8575198343fb5e0c383c71c3237e22d8907c732324adad6a1c9a7094b364",
+			"0x6c4089d09fca65f0e08065fe76fc808da298d15c1be524faa7127bdab491bc0b",
+			"0x6a5d8d5b0d7ed439bb5794e4a9851ced8dca4b62af2c65adeeb6de85fff25ad4",
+			"0x26268391661872d1c42f455f4607ad6235e8d4d37228d6f6e68d58cb7757ee3b",
+			"0xf47c821ff8ef71b25afae26a0e7032830af23663ec7c7eaf9541215bbd0ac318",
+			"0x660e9ecae596fdbe31d4321e902e723744b036af20acfc7b07af33de3c03426e",
+			"0xc068e5ef9b354646c4c196b8f4b76f90c653de3bfe5d731b9af6a38f7e22e5bd",
+			"0x855f15c630f2779849f380f9b72f3eee4188786a14609f4523199b5674eadc90",
+			"0x184d0cf7f3411e67039040c211b63ccf65e12a34807b2adfccc6a96f2958f10c",
+			"0x100553b7852201b4cfef0c0b0e3bc9b85973570c9a15d494172f372de2f4c3b3",
+			"0x316e8756e1e2937c91e38a8dbbba3c9a8306542b2ddea63b38ac987b7cf17880",
+			"0x86d773822b5bd5a74bfeba611793bffd6b10c44ed6dc1fce06bc69b274fce579",
+			"0x70260f95b4eec1171c8b46f9a19b83ff561c0e776948f79d0c57326f622d045c",
+			"0xd2860b14214a368f32c68f4ae7deea94ea239ee0099d26c41932ce0218148271",
+			"0xeeee56e8202b193a51f2858e5d6d98eea1120343c5a9fdb6b419c732f39ccfe6",
+			"0xab9fa4a69e08fe455b209c841d02d724e6afcbc051d8c4fcf0f76e7a99baa728",
+			"0xd6cf37977456356252e1e1aab71b518d4be08713c6a4ead6e1a30f7b07b799b6",
+			"0xf5ac688debe75fa0064a5a9135fd287a5bebb62a7cf803fd6382e29b008e7ae1",
+			"0x969119e969f9c55261957f605b579e96f7e9f7ea6002466c70d08c3d72893569",
+			"0xa07f93f5a103d361989a48acece650873164d1e5f99dadc2ae72cbe8f752ebf7",
+			"0xbe03f1432dc8b8fde8107328794dbb10075acbb835a9ff9876574bd54e6fcbde",
+			"0xde96c70df84aa83b2c7c467486fba87df3e1794f48ace7ab2a58120057bbeb44",
+			"0x98c963171be9bc3cd0e851b1e925021a41ae96425bed1c9171a9806836876722",
+			"0x4ee4973b6ad260367ec2e85de7c9c488eb237386d8c0af4538480a07bbac6362",
+			"0xe55e62e4da77ff26e1b74b9cd88a4fb9f6bb09ecbf70748079ee98fd1b29e9b3",
+			"0x5668d865ec045e0caaea9173ab2e0bc243279cca9889b554bf8fb74be7edc8db",
+			"0xee0219965a896de8fbd02a9e392e41511dc01b32adc879f47e840fb16748e0ec",
+			"0x067de7534f4c63eabf619d1a723fbbaa940f59ee92100df80aeec1868cff40a6",
+			"0x701ffa3418f9232a4902df7668b1fc87ac1d9b685cce9f5d820f626540a0f89c",
+			"0x16eb30bb64ffa9ad25b579f2f019c7886184631abd0a40e82313fed29eee31ed",
+			"0x5aa8361d42f511c5a3691bb64308da2796244075e829767386f4cc70f8c2a70f",
+			"0x85eaef383b0baf4533683496c7f749cff3b07bef1bc971ea64ea3f1b8ec97ae3",
+			"0x0977f99e26f96fb31d04dbcbce8967118b51398b6f0712cdf55ada5928b5ab5c",
+			"0xf321eac1b43d232c612e059be9e98d24bab395de5406f9b514d39a614a4a143c",
+			"0x9e3e81a1e0823b9a166cfa8105d3def2789fbd4d3a2ca9871b75a05cf252f8cd",
+			"0xfed3f3d4d86bdbda79fb9c9935c65d3e980bde5e9f599ee73071cc4bb0571ada",
+			"0x864268476104f0de0dcf8a024d808a4170158e74c6ef681910e3497bdceb27c9",
+			"0xf48691090f8661e5baa46f0025730a30cf57d186fc1458628d61e8c1a847bd72",
+			"0x41656453dee2ddd1694362eae0b6b741a7ba33cdbcde666b4f7e21b087ef79eb",
+			"0x48c7cacec3e2161bc35642f96f207bf65561f8c944e2cea48651cddb8a4548ee",
+			"0x5522526dd64584467b416086a92d9e9736fa07d25d524a0dfddab3694eae37dc",
+			"0xa73f2a4d69c6cbb2426956019d86e0e278913c613bc241c20e7a04fd46475e7c",
+			"0x3828ba052d46e2cb9db1e6284d7b57af1234b19ef57e95414f76af00588f5736",
+			"0x05beff29352d466ceb0fd835239ff491da78baf0c4a49e7e86702e5ba8d9938c",
+			"0xfd1e5c44abc25920639f0d3323c7a37e187e9c3523f1bdc2f5316f58e0de3277",
+			"0x5b6e17ac5e43079e136fdf088eb0667f2ae1f3d8d74853271f6450ebf10e5f87",
+			"0x93eee544e2bfa4b257962690614d6e3b6559a30e1fdc99e2d5c9438e3ef5294e",
+			"0xa1ac97bb27493dc07b4f9c74c5cc51b06a990a016f4ae8b7b175145c49e5e8d1",
+			"0x347b031d899061ff61328052398bcd237f611fc737eb3c89a644a0f0583df6a9",
+			"0x6a21e50a143263badfc63c3558681b8dff02edb87e49cdb4ccd6dd22ee640a84",
+			"0x72a1fbd845ae2f93570b95899b5604431557b40ceb3bcea49f3a601c7dde8fc7",
+			"0x7736fa9605d1d96b1e60bc80357b42e1bc1af7ee93fd677510788986b271d8db",
+			"0x76f89a85221739882eb8868e64bf4cb5bf148c1676f40ae8c21d593448f3c35c",
+			"0x87e9ca31389a42d0333fa723cd93a414baa8785d4e1adbd60803c642ccef4354",
+			"0xdb85ecbe1e60b2b7323bfd8b9052ef598c9a3978d434587de7b0acb4e5ddfa7b",
+			"0x74ecc5544a2022d9ef644e07ab4e7bd2fbaa091a0602378e797a79fd23a39a65",
+			"0x25875438959aef4b9439837aeef040eb22182fd2eceeebd3164b0e171a4f07b6",
+			"0x7b02a31c30e1aaaadcbadffa16b5d5b726bd6e7ce69e46f131a2e2ae9028e3aa",
+			"0x4da810150fe04769897a9dcbc762e57e3143f53b988fa384e9d1e975a10daa1d",
+			"0x02e8c7c864c9099c9de03ef799ae67538e27d4e5986c2b43f24dbb1e22bf215a",
+			"0x3a2549524a0542211c9caf8d7c50bd9be376839a7835b671999ee13d16ab2a23",
+			"0xb797387ea54fd787d5f2f7422929d3fee3380752f4e6f72d8f7c3ca1c18aee53",
+			"0x591126651f4ae3f82def63d62c3f5006d274951b7d0df241f69e5531441c865d",
+			"0x25e2bce70b31419aea946dbc890957a718a09cdd51bede651135181220eb2ada",
+			"0x072e249c21a440f387ebb121db0167e690cf227afad7a79b4dabe13535dbdc3b",
+			"0xac20848b30eeb59f0e86b913a50a0bf5d16ef48294b5753a78392472d5b821f5",
+			"0x1b264fcdf4c4664716e5d15f37d30036bfabb7dde156156af0d9a3427587d946",
+			"0xd1f6eeb6648fcf7bfe2a529a1cd95397dd5637f40446d478102cf77c1b4a0a36",
+			"0xbc61fb25e983a4e72c8f0b1de3c0ce64af6f81e991a3d2503dd9cd378b307830",
+			"0xd1e5c22b81c1c97704acc88ea4defd20e38fcd33d172d2e10c88b9e61e42186a",
+			"0x62429704d8365056cd9200d4b75043c1ed888978f59cacdf4df78a77f241958c",
+			"0xc75f2eb3ae96a0cdf4bf343998acb1ceeb1698de850be9739345db110c4547d4",
+			"0x293f31fb7885b5a8b56a806ed39fd4ce21da2b2f2aa3d53ba64ebb69ad3894f5",
+			"0x25789ebc42d9fce453435b830febbdc9d96b169e58fbf123ddb4c250be46e186",
+			"0x22374e1bf486955234966e8d5749a12d3fc8f3757deb03635588ba4cbb3b6d05",
+			"0x5ef1c59731d07948379cb8a2f69bb6c85831dbf4877bcd15dbef2203c466f08b",
+			"0xc8a399261d6fb17dc44542966b6f747dd9bb79ffd9ffaa4057cab7005add231b",
+			"0xe86ae035915ddd476aa6ae8b0a5d7efe1b12299749fe26572432e9de84667b9d",
+			"0x63ad0c23be328e42265531a35cbdc4ce0cb54466c4df2d7c06cc78996cf59359",
+			"0x9f7a76b739a2c83b3707878f96d738c75339187d18692df863a3080622e521c4",
+			"0x9de463b7adc2645388e7d304e8fc3dbd41792feb3acac6df07a7e7b738f18918",
+			"0x91dde10aa2843b61d1ec9698695b2b98e36e4256f89149efa80f05c783a46703",
+			"0xd5b8ade80a8e8c0a6d3409d1487a75261c7fa09b12f42d688ec3caf2ed3fb845",
+			"0x928c920abbf2e979b8e083b2126a9e57dd32e9dee159e872132bde12572fbabe",
+			"0x0df9a734740e8e43a7a609dd1a572b34d03fb6ca0ca2bedc4156dee372d8f031",
+			"0x687bbc3fafd974f8acc6cf950602684f4dd6c18aeaa0810ba8379c69f1f93e69",
+			"0xdd0758b5ce6846d130a2a510915cd269e5bfc32190cc192c52014e8ec1152daa",
+			"0x6cb72a48fc6e2fabf87a168e068da7f2a2e2b6f283bce30ce89225da1a7c7fa0",
+			"0xc69e84506b768224407215792c4eaeef4e2637c49a3c780529263dcd06008e8a",
+			"0x3d1c651e092a51426c336aea9d67e24e539b164a6328d3e1dcfd682e308d5b57",
+			"0xce28ebe86f5c68349465570c4734e67de9077042700cb022f50a1692f86c5ac1",
+			"0xe1c0f3403dba2a0252851d0de326a77b45bd6348aa77f1fbf50ea400291b7369",
+			"0x33e8ca0dec08e4926eb078713b29f0b5e3a149c72665fc118a1b390645597872",
+			"0xa7b1db9f872acba007a3d289bb9fe6a344a598484f05b3d09f86fd8937e4a7e5",
+			"0xa167cd03858447b05f4b04c7a00dfa47ef401a591c0cd6e21dedc31c6317dd88",
+			"0x7a36596e1d467bf69fdcf89020961fe226a7a74caf3f6a301a93bb62ae04da64",
+			"0x6df1255e8d0f1dd26b4d8c2074f6fd6ebd19c63ba8d4f018981fb3c5143869be",
+			"0x405a94ca8487db8a2848ddb2626780be4d708a524333f337d3a70388911dbaaf",
+			"0xfcb3c2a50e7b705e9bac79bc767dea39a72453b624f376f2f443cca4d71fd27d",
+			"0x0df59a47ddc76021493c451a150e89a5feeadb9c0d7eaca5735adda83beeed81",
+			"0xbcbc312916bcc4384c311770513a6e25966ab0bf4c603abc2e76341bb5e0861e",
+			"0x6bdcbb81e9ccf9c3ced0b046190510b50ea39dd6f4ac7bcf93ce9460d26b1a85",
+			"0x2fcd38c30ff75f79b7ae8cea289a994c2818b182f7a717c4e00d955e94c0e4ea",
+			"0x626aa23fe71966ae5d0ebd2b243ba26a0251221db8dc72ca75128cf8496c397d",
+			"0x3bd021853dcfb8c802bea2a6fe5bf9e0d9eef8dde8ea427923d373e68690edef",
+			"0x9185a0aa01c251e8e66bcbdffab85e08beab296e611d32eac6e1df89716b65d4",
+			"0x3110ce921cde1d11185e96c7202e59557bcd0289404b5daafac3eb0c3369769b",
+			"0x48dd13aaba98e0b9fbc5bf9e7fb4fb4c2399d6c43d348e7d9bce63d552ba4b16",
+			"0x949c894608158f17b860305ec50ccb9c261bd91698b4e74d90bfdc2e6eb7f6b4",
+			"0x03a54f8f490fbb7337edc852ce4db855c23d63952b680f0c7b0b4929ac32b53a",
+			"0x1772c66225597523609caa0809b52de4a0d23986c2a5f9a10c72138fa0da513f",
+			"0xc0ebd7935a25a1562f1ee993805e91239ef0e1677c6cb193399c69489aee3372",
+			"0x92c04fe853c0b20b8818e74353f02ab732277570d53a316009197463159aa998",
+			"0xd7748a6066710d8cbfb62716bb707d70d2aa35718b0162eadf28efa167bf4247",
+			"0x40c764559b23340611f6e586c5b3ca3e34109f39e55c1013444e5fb46b6e4ae8",
+			"0x664f106f2b63400e49e27d642888c2af5c90601ac3421b16d28acffb81980552",
+			"0x94bbccc56c838a7144f550125bcb6a78239e17186986bdca310b3b567bc04eb2",
+			"0x50769670c148c4bfd4a439dcd4a439f5a3c562eeb1486beccd5e47bc7ffe7e62",
+			"0x1dd32b9d03d7db815564a3eaebe223077329a00bfa1b2fb95ce5c3e28e7e1e7b",
+			"0xda75f4e1904c0046f8b932e15f1ee75ba5b18d619c03c313f91fc67352663dee",
+			"0x26b8523d80f4b02b48e90aa144aec7b3e8dd2904ddf98026da16785411e650c4",
+			"0x3d632940e2cb210bae6c004fba156ff936ed5b899cfb8113c3fe81aff90a9d31",
+			"0x5afbc6c18455b8616f6946c0eb86e25a5958d4ee43aba602d73ddb51f95a120a",
+			"0x638a5c1e22c63a56923b20094499f7bc341a24977e2da4330b4ccfa7cbb2133f",
+			"0xd03566f2a41fa9b73dd3008e00290cce8c0b606790dd4eba6954718087b035ff",
+			"0x044eb0cdab90661aab26ccc50dcedf16bae98e1dc64eb0b3efc0823acbd9189a",
+			"0x87b06dad58a4570e111b8fca431eed1194c7d6a3d2ddde4c03af3d5dcaa73c1a",
+			"0xa4a7a4bd57d4df07fd7f724f877f1809ce58267f4cdd6e01b6ebd74a51ba4f1f",
+			"0x5a677ca1f995ff347a445b19adbc95458ff467fd6e54bc5daac6631965b0682c",
+			"0x66d2db95f8a2dd6ca5e35dd98e48d65566cd7b49295206503979e1aafd2efec8",
+			"0x2a084704906271f7b6bf58dc814947bcd7bbbfe946073ab8ed93130442c28547",
+			"0x009fedea5e258716c82c202710581078c93e5fbbfc6d309f4060b883bdcff7f2",
+			"0xd05dbac18603ec1410626621f1b9b678139131af740c7bf913e5596b4ab50afc",
+			"0xee459c9425dc5db61b17204a8f16c7e30ac2d4e0e25dbcb966b8105bb696cabe",
+			"0x4e5d309f715ece7e3cd39322b70295087a1e4aecfa09935cb1c02f11e9c0b0d5",
+			"0xf205313bcfdb532ded0a5e3449510915cb951e8b39538295bfde1529f0c8e76c",
+			"0x425af7920153f9145c21f7596856855d55a985ea3b86007641cc648f721e55d1",
+			"0x4b7e0997fae4aa62129dc7542dd9c8759b3dc83b295edea0c301c3e5d0c7047e",
+			"0x66ddd8fb6fd5eaeaca4ab30997078089fe12c23538b263b6a30bad2de240de70",
+			"0x2aae904d495d75e755879d332388e3ffb794506f7636140d5996d198f7d595d1",
+			"0x57715fbce48b3eeda882ff4795eafc9e8a78a005c7f9fe29aef34e76c532aa62",
+			"0x7e292ed2cb56a5d088454c304405ca92357048b1a2b59558cca938868a489e41",
+			"0xf7d14a8e386b97e0a1bda779de74cca484c7ba777f434e40bfaa38898816325f",
+			"0xcb97729d67e7af8af5aa450e419ddf517bc5201719c081abea25b7c1b3fd4b94",
+			"0x8ea13b5666929e667b161611016990588465731f409f27bdc594295ea18f053d",
+			"0x515ffa2fa1d02fa812ef6cf9accda980ed3de8734cb0e6b0ca779642bb9b821e",
+			"0xc0f4f27af937f1ca108a68964b99eb1ec541433fa4ed7736ccef44cb34a2e220",
+			"0xa6ba9d246099cd4ac98171014867ba2099f8af6d5960d4dba2d02ac3519d5417",
+			"0x576ceb5dcba6fd0abb933edf52c56ab1de4bcc233d84b3335abc106dee26a979",
+			"0x02756b443a7d7c0147685d3bebae7c6b8ca41e08a420ced3cf96954d35b8f8e6",
+			"0x76b256b0f219de31672ca96ef25df475cb4cd886714dfcf86ab5f583c6831cbb",
+			"0xa8b06de1a5e939f400cc040d97023593d94bd6677f775344dd7fbee523e37793",
+			"0xc7ab90bb0ad571c16f4cf04f5231bee6461bc8ad8d3341022dfec1fa4683008b",
+			"0xe5dc898a5611a5641e5668498bacad7bcbe8f2f56f5749f108e3e2edc936d612",
+			"0x3ee0715724eb91abcc8e410bd2dd62329494cb806531a50406bedc790db70163",
+			"0x2adf081b1f48b98041163816ac7cc1e3d553b90cf2f25957f18d78dbedd28e78",
+			"0x55ff274524876c6bbeb9cd741a09205be57818692d7bd1f44dbd00fd4c987167",
+			"0x5bac9d22d8224cb5aa6dcb1d1d0b8e7a19a7920f9c1d60e907dab4ed1de56030",
+			"0xcb040f8185956dca644d263514f8df9e880ee9e840d41ffebcf2b330c95e084c",
+			"0x01654829da5415a428777ad66890afa49a9f5c018e9183e75ed5e9ce33edc6f6",
+			"0x1f5c6aebbfa4a5eaa31e37a2d9e1bda3903d1e60fb9b116ba108d1e728f8d1d6",
+			"0x2e1285d3632ee31f39c213cf9ff4dd0f8f71e02f6d9e208ea1da72f17ca2efde",
+			"0xbaf1ea78d8a7059dc640aa88c834a709430a58dbf0000b008598e50c0a918d5d",
+			"0x1cf4601e3b0455845ff1bd5a69a11ba9b1cb3766552250413ab05d23031d5ddc",
+			"0x24cbe63ee67f5e46571dee67ce5231d91d37ac9e7db876fa203dd6b711f9468f",
+			"0x40a40d3e099c678b41ccc96fa40d58176c78fed3a277244296104ad34fe672b3",
+			"0x5fa9756bfeb3a1b959fa9e0eeb4be5d610d21dfe79b01da9629678a57792f785",
+			"0x831d02f9bc15c3a107fc0d02af6986e90a4e10c337173e2c694049668494d6d3",
+			"0x0dea5d14f6b970008d4c568fcaa012c666997c4403003e071398091a4430fb3f",
+			"0x55ebf8cb23fc19be6f1bc81c01d22a9d68b33ea72057088fa218f5b823d62190",
+			"0x22c432494ec0fbf4b86deaf9e315f2fe303475954dd7fb334e970f075c836d18",
+			"0xeb7c33063357ed449a7057975fba7f1534859bc7a2b0a325675c0aca06d498b6",
+			"0xd1b4c264a6b1a6c5b29053536c94f9212a5361a59ba6c347bb293e2e5f4ac3c1",
+			"0x1248e24c5585593adbe274c96b6085c27af8d9109bb9e029c990ef8fc05b7de7",
+			"0x62e71fa6bfd51005525f7022aaed1dff888b494e33811bb8ee093528d22c8e46",
+			"0x452dec3f2d5aa670be7c63495b5380dd48a740088cb0c83bf3177d95070d30de",
+			"0xd4a684ac6f08f8ddc950b2fedee72f43fd68e1e9b5c90c49d628975933b0e6fc",
+			"0x13304a80344874cfd8d3473b3417bcb0125cb51bca1b0c17b1abd273ebdb76e2",
+			"0x119725b4c9f238e1afec7a1de2486d83659078410088239d0b2dcbb2229ab4ee",
+			"0x84d0632697d03d038465c69cf09897f590f2c54d4b489cda0933ee78b305159d",
+			"0x9cb911ea27c7b78d83cd213bf51bb1e704c6f2d3301cf21f7d556461ab4b4547",
+			"0x916fcca360f78a1cc254ca6a9cc813fbab69ddceda7e2a9d9f50a6efa3807c96",
+			"0x5e372a3c9a8a9a7152e85f6daf47501c22160873f656e9cfb44f1403ddf1a33c",
+			"0x3903ee5968ff71b55b8231a2293bb77a62116de299024b237c8008f9fed354dc",
+			"0x6a06a0e8a57406f09f8491f72a65440a7e8af76f1c94944cbe4431419009a286",
+			"0x718f21ef626dc8c5d1cdc673b180f83236964a04d65c2fd920ea4ee1292f03c2",
+			"0x266f181b66322be4694ca2d29334a93cf048a55461d5ea522e3f993b10c11da5",
+			"0x1329d0ca2ea012dee3c12c1eaff3764ac129b39439f0ab31c99315b845930b7f",
+			"0x148590d22c32801674a59d19057fa7c4fc2887f8526ae1c4f115c11a94343669",
+			"0x750be336395c6f4de6ed11ea0b9b021ccba8fc06d24acb28184dbcdc1c2440dc",
+			"0x13bc3e338a318feed2536031cbb5b0b7598b943f32dc2c88fda0f388688d496d",
+			"0xa0c0dc51049562f22afdd6c7c09d742c1faa1abfb72d6f1d1af01d90c61c0e00",
+			"0x62582df180bd65aa98acaf1b92c6bc454ce1ed19839752abcda3c19e6d33d374",
+			"0xcc86df4a115333f19819b493d17cba26a43bfdbb2223e4931ee6b5eba5f38191",
+			"0xf2704da9f0b3e4323651948714f738bcd1b98b375c206047b7191e78120e7cc1",
+			"0x9b7b5c587abff319712424711c2283c63eaff7b6b612c3c3af3db2e49efdf4e8",
+			"0xf048e6ffa41ec43d6754c3d0aa4b348b8cba9c694dd642101e89bdc60f851acb",
+			"0xd54a3922322ca33d14d7a76f9112351561af5cdf6938190a9f72dbc743821d93",
+			"0x224fee97a81d25039af7bb9933154ddcaf3ec019e15e9d8b3faca76e97f5f456",
+			"0xd05af3e61e93ab21bc4acb5f5a7f5b1c65cb62a0f66418989a33cf5a022b1303",
+			"0x0b4d26d13aa33c3f18815ee500ff94e50b07744ed653e1730505f34807171fee",
+			"0x042c4d57c11f67351185f8da9d13a4eaa81c16a0562168f3bdb5dba67695ad3f",
+			"0xed23904d7f34fda2feaf767b4a159f4bffed7262e5fc6e57134fb9f9e1537179",
+			"0x86150cce44f1cbc0d70faf4a9a8ef43d4cb379502c3f093edbb23b29da7d69f8",
+			"0x8dfd33acc56528a2305927a1ee8ad4e6aeb2ad62c1617dab0e433f0349e23d68",
+			"0xb0265b1a9e0b4329e58dbd4c7330334b89f62208b564d34a36adf63b0a1edbed",
+			"0x449ad314b97b04a8fe27b49c3ceaf4f48ef4da32ebc838ec92e760cfc69ccc60",
+			"0xf8f709094f667677a51e6cbea7d80111b3dc605fe85eaa89149db75daff572f2",
+			"0x958dcbc8aaed9d26e1471decc11f45002248aa3b319474a4476c3ec3c56156a5",
+			"0x3ff1d72bddba150d37ac533d8cbc79fa0df9dced62d63788ead1f7f0e2f908d3",
+			"0x1dfd517bacff0cbed6ee00e1aa0860e1132ae0357f1c04cc7fcb3cb6c4b576af",
+			"0xf7fe6f99b1d498ed42147d0569a367453b43393383bc6766b799041f539f11b8",
+			"0xbdcf4453234b219089ff1319929db364d41acae2a6852c59324fee210f4648cf",
+			"0xdc96015b8b607582a66112acacceb00436ae99b1457738b2aaf2d4607b902bc6",
+			"0xf94d38138af0896d0a5d982d8d2f579ba22602edac3e197d955fc3fc08a1d66e",
+			"0x69905142ab72223097855fb3948f08820464acb8648d9f17889dfc4fb53f5119",
+			"0xd5f6eb135b118a63959276d91ab9a243cafad92a5224c1607ac23627459af522",
+			"0xc648f20006811f74a283f809e7870136493a922f73a570ad183c52460583be52",
+			"0xdf9ad900f0078907865fa24a2cfa43cfe463414ed730deeefd3346bacc3af191",
+			"0x4982f194d6c379706f34ce3662c88ffba3e01ad4b1531ddc06bdae8205443f1c",
+			"0x7b7711b498ba7fd9e409ffff12fb4ca0bb7a35b0a7a52fbd9f4e891fea5e19d9",
+			"0x7483501ff50750143e8c6105d110ca22e04b47fea2f52e5fe78288093126fc8f",
+			"0xfe7f95c1819c9aeea3b825223370a12198d83e9e5ea8afe3d7989576b4769207",
+			"0x7720c14c730ab8e13cc2b6210fd357f580c96fce65432b04ec787089658eec6e",
+			"0x37597a0cb5f115fbae5304cf0951633845b60c8456f0a8015d7920aa5cc4789a",
+			"0xe9e6ee709139afeb0f9b18742f10c444d982560ead60430bb6b0c7b21b823fc9",
+			"0x6b1e527db7795acbc6ab1d62a449d5df9f958ce2cce62bc75ac3c4851f30bde8",
+			"0x36934bef6115f8524890d77f087e49c6b95d832f7e5c15dd40a99e12c27a7c25",
+			"0x828f90bdc68ab754862b11e2794284b0a79130c4f9dfabf743eee463dd138210",
+			"0xc74307172a17ffe3f2b22c397fc16499af6c772c1ca4012504085304af6cb1eb",
+			"0x3ec72268a78671c0027a5d72d14ca5441a65c385961aba9d79a8b5c60f06e7a7",
+			"0xd85c033362ec66336cb685af11a577aa8c58f6970c396c1c3d01b373e28bd83d",
+			"0x4236db4114a216aa3db4ee43dabf042a4fa142f506671db79271e5e87d43dcc1",
+			"0x0994b83392c79c039ddb3a7a39af10944f9c8d110db91ac6cdd3901fd6162e3f",
+			"0x05dd8ad9cad24784c538826662c60a5b7793cce0c9b0e516d302c74caf4fbad3",
+			"0x90ff9715b49ffa4ecde93076fbb26263d5cbbb5cf1da7d733c7969a323a5efc9",
+			"0x9cdbe11208234c59c0c2d9eacdbaf71ffaa35abddb770a9173b5161aa12822c6",
+			"0x52508554b3c1774feb39569f3f1d750de3c6378ac1a00dde8d7937499a01aafd",
+			"0xb1f8172ca90c9de72134885a07e72e8fc586f15cdd939751556e1b1569827fb6",
+			"0x62c6c1cd398899b1788741c5d38b6d7e5b87ca6d7df9adebb3a7ede15773ae16",
+			"0x69f98686ed693fb4bd9c559d06cb36b1ca0049b89224a0d0989afaab75f63a73",
+			"0x922df7c6782fd8d09f8151de65da4a661888a547ea7606bd0bbcff76da9460af",
+			"0x92fe7525ac7654d9c1afaecd305bf49797c8f170c18a989fade3261859b09c90",
+			"0x9c6840e8deabcf6a4f9b6d455cce40e507bacf1d2ea21e7be5e886a7fcfca41e",
+			"0xadc0de536e5084837e63c4c9307f43d483faa0517703461198dbf6fd9d45985f",
+			"0x96cd5b306365675610295293bd8c85f131fcbe98da01d65b02d586fd0deff6db",
+			"0xf64265c5166d3e4c7b43a44e1d342ec17573f8914c890a7844b97276c1f4e9d6",
+			"0xf57e23fc51b49caee68a24cd0a44c1751e453c305559c4c5e962481960920b13",
+			"0x2a79bac7e52352c86db3d30dd2b30f9e971812e7b90524259052e4dee002022c",
+			"0xa34ce80d02bce67476c9884650e9c364b18701df17b98eb626ec8a8b8ff94c41",
+			"0x3d33046ef8bf3c6ac74809bd647125cb3649c50a683d81d189d5a3a1697d5c12",
+			"0xa9b71e759c32de96cc2e60eabb3babb2fc54ab03b0919710d0991dd96054658e",
+			"0x03943f2696bf2827b5b185273736a9f196b6b9876f872cfda33a6287a5d8b52d",
+			"0x64c3155f299850c3dd2af09764526fd1fd66441f9c9e6f5cb0a2e2301584c175",
+			"0xea2e486290caa2832e51111a84028c6e048cb75b518c01b036c10414f42f8f15",
+			"0x50a1d1408a591f87d4d68836e1000be260842c29ee01e9f7d4aac7e7d979e9de",
+			"0xacefd24443c1df58c5eeaef883152021cb4c6fc97b48ace81eea57800bef42ea",
+			"0xeb6d6aacefa2588be8c725af0e96a54ef419b955873818e7157ec33b4111122a",
+			"0xc8a041eeb0059a5471425f16584246cbd82599d149cc482c5a5f33deb8a4b51d",
+			"0x57133965ef6ea219184e9c4f2cc5dd36b06aac56c232db9f13612f29cf7452c6",
+			"0xe12e43a37f7c8af5993380c9f9d52dbc079cf6a15dfe6d5bef674bb9095522a3",
+			"0x872f41b87598ac8bd9db28030b619e821f55388e1dbde3fff91b978273dbd2c6",
+			"0x35da6ae783f5551e7db1afab49ba65064b9d498c90b020efbfd8d3bde4d9149b",
+			"0x79ca7bb0eaaaadf841b7c439347c8dd3c25eeebe59184cde665774fffdcd9d83",
+			"0x7e8fe47fffdcc9497c04c84db14ac49876bf67f343e1a86d932fd82a34fb03d2",
+			"0xf04393e39f1c99b43526b1cf831777bf45cb5bed023ffe01ce649aced0755406",
+			"0x119f7202cb5e5f6418744e3548577ea718d0cfc4af84ca2ba163932e79a74dba",
+			"0xe943792863c593b9d12ba8362ac3949f3f4d956a0ced7d36db39d08d0d6554fb",
+			"0x89374b8ba8638b278f957dde6caa5854e615e95c56f817b4b4d5d8b7578bcacd",
+			"0x5beaee31eddaaa076512f20314d86c022cb4343960c1a124a14c09d346ab1b49",
+			"0xe68cf25266b943db13b5d99c978d9a959a52a63e179b45b38abe3b75b1940dd0",
+			"0xd046209b2ac88f4a900023f47a3965e9621943365bc67398ee83d8e7f5bb9392",
+			"0x9c2129baf9e5d8ec70aa3d7fd749ecdf2a6a8176e5507e2b63cf435db7969106",
+			"0xe54d9583e0d28492f2a55a5616e1d116036ff5c79ef18d75f84330cfbc5a94c5",
+			"0x217bf1f6b520b06cd61fe846ae6238f07e2ce5b164cd0afcd300a072438d35d1",
+			"0x38c5656521ab8f20c1e3d76b16c1907c6f085d7483e65c677d5772c42f733196",
+			"0xa41794dac6ba96bf22822c510df1a6185f0091c42bb5f3d42ee52a3b0e819706",
+			"0x7a35c8be930d2cb2714a313527d0e7adef99ef4769a0923df79e4da0c7735fe7",
+			"0x641c1160852152427f30b1aa357b38e8d324383e4691ef2341aad1a804bc6ea2",
+			"0xfbaee404480be652ce473ce8373dc1ee4f0115ef3428965076308f4030663f7e",
+			"0x40c26cddaddcde3306faaaa204a7f04868701b0b257a69a0d99bd89d6d8b0af8",
+			"0x72de7931dc0fd19b44424f402956d53e640308d8161fcad541a6298c4e176a30",
+			"0x66e6aa59bf00b9816cbfa7f890af9982533786c0f79c410aaa6b4584a4fda270",
+			"0x6fb2113654b31d029496fac61ac915d6f6cf51da90e70a34afd72e8b404f8225",
+			"0xbb79f6186b2a12597e9ba6f96282c581391bcfa71c74d14d945ce47f5f630a64",
+			"0x18ef3a7a66c4287f250ae9310fe19c5331ad9b8078417c601dbe38a5f0fb151f",
+			"0xf5a098a71b8520b687d9f1901ee49d2e4930ac60b8e7d86bbef467cdfcb17600",
+			"0x295f0734697e04b2ddd7eba80401340e6f1ffb92ffdb4c419b21dfe1743d9c94",
+			"0x46ff4895f55e08564a01019056b0b8de3a125c281fb73c8d83eb33d4289721f7",
+			"0xce3b9b708997480c042a02c7c7b7743eeadc948b8d8479d39a561a2447026137",
+			"0x754977681746a986f52c71baec741978357a29fa85bf450085f048c919f90b8a",
+			"0xeb57ec1308b1a5df2d2030b42161a1614f0793637c39803951366cbfb47aacf2",
+			"0x4415343da1a3844f15e5760837e98d3429fded7bc33b994ef40937745bffbb3b",
+			"0x8518da414093c6dc7e967501e48c6f0f851c5db9fb9a766592be80bc92356a71",
+			"0x4b4336daf2468eb8268d05f15aebb687b0a93e332967af722c849dabdf8c8983",
+			"0x9744bd3239db2321672d3fad68813855cd3fbe242e8ef36055242fc38ccb46d3",
+			"0x83fd1838bf22241cd133ec22143e73f9ab6cc5d60679f069a5ecd8e1a349dfdc",
+			"0x5a49226a79fe77472836dbb1ebc3438b84913042976d50d420c61e59fca2e895",
+			"0x1ed763438ad1e3928fa0ce385e38bd686041062c28afe1ab41820ce1f3866fbf",
+			"0xe052728bdf265d0ee32484db15e1ca727bb138726d728d1b4ca192c0603b8f13",
+			"0xc80890e61f7f53b78ee423c1b9722af2b6dfdbbbad942a3108eb313a06da160d",
+			"0xf295b732773ec1a19577ca63bc1dbf6477b252cb86afd562ab95000aa9f27a5c",
+			"0x32d1c01805a2139bd8754c20ec9ebcb7bec07d2cb77e9ecca6960ebbd7f630fd",
+			"0x856165ce956f4995e1135eabf21fd9c9a3d1e8ad0acdf654dff5e08f27d74b40",
+			"0x27574b2df854573a4d349745a137df0f16ce959e6bf7d2f9d5e35a8f81393f89",
+			"0x8f473f340bc991cf773664e842168192a591f81d6878b8bafcb3a85e9853d670",
+			"0x634b934693704cbc13397f9e5dd40c290c1993ba21ba072061f67d8419374fe7",
+			"0x9e368b89eb53fa0c6957bd212caee6fb83cb3c0f3f5e2d7bf0d5e6d40c52f1be",
+			"0x666ed8a2afd6e3592ca5dc9875364d79ad998a155cc1be9f79b8531ec47be04b",
+			"0xcc5a705fc30d157b449fbca19f4c3fd090752f01a25c79398e4db09e5d608e36",
+			"0xac46b4e5fec1a5420e4225d0a06d1835878e99d608ee7dc664f0ed02aa969a26",
+			"0x75fd6803ea7ef4b76b2efa5d759a18b389808be7c77bd07855704062a409486a",
+			"0x4eac0f01ce006b9caf205d9d69ea4b7f2588c35d0d4391cd28eb2874d193060d",
+			"0xc9d114846a34430d25c3ee2787f249fb5d5c48927b0b9088b51a157d4070f1ed",
+			"0xf855abfa802a2218c6cf6ee9b83e460a10b99d9e4bb00caf401fd255e8ea84b1",
+			"0x745eaa0ab1a88ab969adbe465cbfe083cd6d9a0e16388afd55a078d319199c1c",
+			"0xd1385cceb4e842335fd43a11679a1651f5839624d6de72a6fcf62a701aeef71f",
+			"0x8ca6643f362f14de97c52daedebe7b534c3f9848e47dfbc74ff35ea22eb34509",
+			"0xa3e33679cbb620d2423ad0cf7ca0fa2392bfcabb3523e43a60768034b435671a",
+			"0xbaeef325583ddd0d70225158c339a39cae656394d8838f7366abe1e6fa92fd83",
+			"0x0fd99fd738d3ded6ca70051989b30e5b5fb4885e3250e3cacf13c8fe1a617f70",
+			"0xaa70c56b85627949399f2c6ce910b901057e27dbb3376e2ac97f5a21eb336452",
+			"0x70860c214c0902bebb4d2b63e56de710f3f64197fab1db24a55bfa76781be7b0",
+			"0x1220df73d96074db0b6c565126b1d1f34fe9aa37ea915463e3265610d92e7cef",
+			"0x30b5f6badd7a1f14f328dcbf4719a25a53c88121a7954b1bf86bdd32ebc10bae",
+			"0xb3740510fefdf78178071e675e983f50c697bf425329b6fb3d67897cb9abd956",
+			"0xbd3e1c3a296b038b039944258cc7d9fadd16e9880da82e950dbf0aa9eae1b661",
+			"0xd10c706488a87c66f225532092138f5da46a66ce2f2f033506474df57c4f6251",
+			"0x1eb08842fedec4305541a174b5f2f3a1648b51764a8a5a68abb3c3c309ee98e7",
+			"0x17ea3c35342139775b39c97b8ba3626a9db11be861b201ac3ce65077e4465510",
+			"0x2f2ad51f712bda042707f5546ae2a4780d8892092babd629100890e4b32485e6",
+			"0x3699482aca1e43c46ac13b28cddfb7d2e04fa66322b127b1e33e35a14c1ffc59",
+			"0x1a16b64e41bf3d0cb59318dd8a9860721f4165e1ad4794bbf5049a91ebe8e482",
+			"0xb0d19db2493f48c4899c88f5d3b4beaac17246ce12c3c3875db8ee3014324b8f",
+			"0x4a1563d90acfc44fc636c2d65b0064cdb066e5ecb96617f8537f42ebde87eb2d",
+			"0xa9b3aacf11bb1765cb1f8f5a0059a8620d81833f351dda8d070abcd8d31cc9e4",
+			"0x553bc48ef25bb01f179b94ee681eb3fe01cade86733cc2a329f73e9225323239",
+			"0x7f69a7ea675555481f5b48a4f257fc053000cbf11ddca208cdcd3e50b5a2c30b",
+			"0xf52022fd47313165f2155652d0df83f1144dc466828617fd66ea72e47dc45e28",
+			"0xb77889379380a01dd6297254d1aeda969ff8f77db141b4df6235b95a850d4fd2",
+			"0x017c341b5c24a304fc401abf7c4e2e35d1814549d31cc7a7e935437df5e4a0d8",
+			"0xe07f6dd48974e7eae5bfc5d61419f43cbcee5da15a5cb3562cbbcdb27109c725",
+			"0xf95c4ff89df473cd0620050518ad21437b3f68ad7ea1f5d80221b5c279d52a05",
+			"0x09fe043efac912c5ebe8b936ca7a0bbe0878e75a6397048628d0859788488664",
+			"0x821a1b9fc32182d57edeeeaa0c3e2756bdf40238f6172df71bb570b71ccbaf31",
+			"0xd550f297c4ab333e2348da72410d5e228ede1054d97619ec3f8d3daabb26cd5b",
+			"0x968ee9e7837c7f4db9eb845c0cf81e7df775dee47ffb9a78aadbd29749500adb",
+			"0x9eae40666da91873a377751549e72001b02fcd908104a8a8409920752b870015",
+			"0x4fb1d2641fa31caba1faed883f8798079010d04630dfa1b4168b0cca1d71fd04",
+			"0x4a222181b4a19b58a26d2da292e4b47a912c18b96ec276f1cab4cfd33ce17acf",
+			"0xa2b65494badf68a52576c151fb20ede37b03bd08b6b5be7c59667da48da31701",
+			"0xca9523d3c6b00be58ec473cb663263939807a4718975acbe4e818d93f5563354",
+			"0xae67a66d295c82e30b6af1c2175c6d4682c545d1d99f148569e0852915af9d2c",
+			"0x4cbb8e4c46ffb937beed22468ec09ea68d065262d4126b5f603ff4580d4f06f4",
+			"0x89d56e23737196666e3b11067f17489ea385293b6510e34343601e5eea536154",
+			"0x59656043c6c15d02709adbd4b374fd72d429494fb0fbb2d30dc50b45e832f6b3",
+			"0xe6ccb1c41796a8f25627f1c581b49609bfc0b4618e7c6b56e4ce60ef2e99723e",
+			"0x87188b1bc21774d9a6fdbf3bb31a40ce50ed6ad04f2c8bb4f68ba5b4bb0db85d",
+			"0xbcd37880bfaff5fbac65abd7ac269eb91fcacd32a718a727c1f451712975b2df",
+			"0xd356c7aee30f9a046f13081bf8cf7bd5cdef7dcdcea98ce72b8fef1bc5e18de0",
+			"0xbb58b6798bb9f141f4a2cf078ddb228e120e0bdb921238a4f55fb5d06d62d949",
+			"0x0ea0138e4e061b8c7a26235aecc4106b084f2f0a225855d01e0a0e535128f147",
+			"0xd0509b0e82ec1a686ee4ec2d234e86c2351a4da629d0dd4fa63ea8acb5c75615",
+			"0xc1dcd1f056f5f091761816a586efc14223c16eb111373fe09340a10bca313646",
+			"0xf8603b03f239bee22d6080fd4dff7247f3c4c5b840fe6550d726f9dea89d23a2",
+			"0x11aaf239138e5a91a023ad33b925051a7bef3a047ded716358a9ea37fcdfcf11",
+			"0xaf5fb28c6363585f0a9e6e07b1ca8abe25a7377c419e92e941fecb988bdd2bdb",
+			"0x97e6612b804b56899a6352721946f731307ff10ef3a3374902246b79cfe2a39e",
+			"0x1a188d5c06ce92cb047fe44b365134690d8b0f9d48bdb7c7d0b2144551f879ce",
+			"0x08326e6d088fb427d567e5f48f9bf2723273194476ab7b1f3fdbd1173da2934a",
+			"0x5d41ee7fc86758eaeaf7d2f89e129368c87d489833af34bdf6468d97aca71daf",
+			"0x6276b413f2429de12acc3891e0d6d8d6f84a0222076968ddcd1510c7e4f6360f",
+			"0x5179b0d269ac7822edd60c2433e14d0ca080e0cc69ca25160f2815b7a9dfced4",
+			"0x682a7c8e055d651718b96381a44623d3c0cd5482d5abdeb40d5240a662892721",
+			"0xb0378542ae8eca6b4c62e06bef747cf878ddc3fa02e65a6d2058b59b7346ce88",
+			"0x8d9f94b18f733b111c595d078ba1b39ea5f497493c0764946b7dc56eeb5a9cf8",
+			"0x3672c07d311f84f8cc7d3d455dd06e8329a0674158083c69b6947444d844cf4b",
+			"0x167d0eb0384565323dccba9faaf5afdf8ee69002f00cd865fbc218c3ec5c2f96",
+			"0x14a307b41d547659a9f9ad0cc99997acd148a0c93a35cb68d6b05380e15ff692",
+			"0x8ada7de0c892e08e0d77f4df240477611721555e10e57e5ce88f635baa96b1b8",
+			"0xb2ea07f4d247acd95b4c1bb3fb511100078ca8dbda6a986c5bd57baa45af8c5e",
+			"0xe7ca9d79e07576fedfcbdb57b33cadf91ae88eed90e49db4fce73ec6307e07e8",
+			"0xb29e9e28d2d1cf7192b228e0fa47b3164758a595a425493799a6e15c64197ff1",
+			"0x27108b3a76a21ca696f0e4a8cd9a3088d8f4e9aff87699d6a5f24ac599ce2c57",
+			"0x07d8bd50d0fd5072d93bb8bf577eab11abc000a7f82e7bc610b57d37d841a355",
+			"0xda6a6792b382a199336cf02e21941ddc692d37cd9d140313bb991a61e106bc39",
+			"0xdba10b67be085101d9e64fefaa961c2fb7ce88a8755600c11f36b639bcad5a6b",
+			"0x89d5fab1659e4260e1b900a051a6388eaffdb3d51c3320a275d8734cf5760f9d",
+			"0x11e25965923214834c02f7decb81d5ddfabf2b7dae609dcca8ebce3bc521edef",
+			"0x07ef19ee3a02c7d6fbabbbd446b93a2d6157a130c72a2e70fa464dd22090072d",
+			"0xc2d114d1d7c92230fda4961e566d6bbf79c59d5f6d834659d0ce541988246e9b",
+			"0xa806ae811f29b017ef1ab204ea2690cdc0b092fb44ff902d2a2eae98fca66144",
+			"0xc5d53fc3c5250443fce19ef19e7d3f8ed2846877334e2c9c6fbf6efbec646197",
+			"0x7638f3a6807181c76c2eac2f5d4121f8ff7fd9af43cd05c761229001f64426e9",
+			"0xfffa2fe996dde2034f6655108aad0d9b3c203cc165203d2e09912211b0ea45d9",
+			"0x7ad6d2fe456d57c95342ae28757e73ce3d82b780dc003f29ab49c1ed40904b95",
+			"0x0594f6bae93b268aec2cf274e02eaa31c050f9e5c83c1dfa0f57b45a92aa6429",
+			"0x390fb08a7f18f5e4b968ad5d8ea80b5344487c493797c4f244e78e40da3eff6d",
+			"0xaaa73882ad2e8871bb226de36ffb89ddb4edc83dbc03203adc30f240ccae0a1d",
+			"0xcb4f1aa82966978efb447b00adbb73bb02966991de7198b0348ab9e1d1263346",
+			"0xb6b4b5be9659ba7d846cff73a90ef523eb90debb01c09c16cacb7f12ae54d89c",
+			"0x63f763356f684e6636f3c0d756c04f431014124ab22ea6ecc3b4dc9f19f2798b",
+			"0xa540c05e13ee03659e7f4793913b17b8223a57e2a06955471abbff55d498d192",
+			"0xb495ba5f56bb27d3c3474b193d85bd940fb6817185a1e3fece930f95f7e8361e",
+			"0xec15c20e65bc42edae809d6482b9ff9833e1da3b8356dd85cc859c6cdbc9c12e",
+			"0x5d3c94aad26e00ba29f32b74f3ad1f98d37417d8e6ffd463aad71e94c2fa5af3",
+			"0x2625d4e56a57e21806600454a2f302aff282502219bae68bc46cfae2c124367e",
+			"0xb069c1ed8c1bb38e4e3f7c9b341acdaad8325ca730896f8aecf61cb90caeedac",
+			"0xa96a8794f83e8be206609673adb252ff36c73fb4b0d4fede4578a56948d7b730",
+			"0xa67c8fcd63ec561b1ea81a7c33a099ea1ae1df4763717bfc47ec373e29acccd0",
+			"0x0636616d377f1cc6e0d137dc540d8c1f4524b39c4d06c55fed4f97c5b8e84fae",
+			"0x72e9ef9eb6e09180f9138bded4cea00d4b498a678345a86b70660f965385ddb4",
+			"0xbc3934b7bce3c55baac4ca784e71647940fe55644015607a9ce7fab0271c11d0",
+			"0xdd342fde86e1eabc6454dc64855ea302ac867d6428894e864c44c0de96cfae75",
+			"0xead66979a3fd9591de9a53d9c6b72b2196e1194bf41570053086bff526101b27",
+			"0x6188160f02cb74a611ab553aabbdef66dacc06e066dc03a9b2d2fbe535a9638e",
+			"0x83f28a56f6024056ff8d1721e15a6e64b974b9eccee06b173d60317de96d1025",
+			"0xfbae5724ebff4fe9f795c9ffc082bafcc1cafadbd87c1c7f41d8a97dd7c57ee7",
+			"0x66a41f7b13f43920dc32e4331e032c25b40421ac9b76d0fafa473a6903c140ba",
+			"0x4543e01ac5f747fbb1dafe627833f6b1f7876286fa09e57f9ce4cc0dd90e3286",
+			"0xa9df713c6914563663a319e911a2345cd14093b6a06612217a474ee83113d1c7",
+			"0x171785288cad15c71818ad96b7d70aa08d245f27b681945a460fc9150436260b",
+			"0x45213365acd35d54c504bc05c94edc435601c3fb79616827ade4bef8f6146966",
+			"0x7b68dda953680a8489afcbee464c57883bb1dba89498a156085e964c0126daa6",
+			"0x56b9c263ec26fbcfcdc8aca55afd0f108fad308d97d9f1b4ecae25648a119969",
+			"0xb4a617718b2840e7304084458ed3d31472d1b17943524506b87ba373ae611e64",
+			"0xee206776b921a0b17f7e66a46d3f46bc59efd3a3d416b9baed26146392b13f2d",
+			"0x54c16e665f2a06737566a16e4e8d27f1c74bb86e4f515eff33b599d256bea030",
+			"0x9d3aa984d3593a67ecad729e9d9fabde7e083201c79248dd2b877430f32970a6",
+			"0x560c8421e918623e2e9efabebbefa77ef47cf2bfb728069a996e493b8de78648",
+			"0xc2436d5acfa0652ed88cfd6ec03644fa57892124031bd81c769b1260536641f4",
+			"0xcb5b68284216400fd63fb771dda5f0549b09543ebc2e412f715087db4ae2ca09",
+			"0xf362505d802d231bb749367d0393c76591c4ade3dd04bf0724ef661f21a24ad9",
+			"0xe6dd045892e791f52e389fd460ef342af231d2fa9a887167d8ebd099dd4c4829",
+			"0xaf8144ffe03357b30b52e9bb43221cd5180915338a41dea010d5e2069e9bcbb7",
+			"0x3b7647787ec9f714bd054673f2372083ca7e0de1538fd12119df6b2b5f72e2e3",
+			"0x632a04950b5ad2626701a0b0937116e128cd26a36725abcb40c1b847b1fc22eb",
+			"0xcc132fe637af129e51216fe39cfbe3fa2ea1ef493f9df625383d72165082026e",
+			"0x3f1af50536229e2c6b19da6e3aa711c0563dddd07e004b6cb7fbea915e3b2f96",
+			"0xe63a35f258460a52f644ae126adbc97eb267b1ec7bb40b8913ac95637cdc0bd7",
+			"0x771fc4006b7495f302d8d59d62d4f348701512465c7bcf483288b4a3cf1df544",
+			"0x00686653ddd2aa48e2982c26217a7f1428cb8df6eafbda49f44b9bceb5282ebd",
+			"0xf5d2a69a5c1700170ccf4820e7787057a0bb410e2011a835953558e69b3593c6",
+			"0x6e8c179171ff913dbb36bccfd0e37094d7684be3b3b550b95451de9a2573a337",
+			"0x21d0f292d3ace367c98d3879515f860687f9a1ddd3f736e9329b10b9566a5314",
+			"0x9a6723877470597e1c846f0fb1bb881ccfd16784e5b97f7ced6a858bde277d63",
+			"0x2379e99e79b024a882b95dd020732d620cde340eddc17e506d05a1c86b4eb953",
+			"0xc2061dcdfe6b0440dbb0b51e0165c02064ae544f5dbfe2fb6461c426982dbf38",
+			"0x63bff10713da0453a6672d489dded72ccf4526ab6c42d6fa8e94a7d1c2e83cdc",
+			"0x9b999c4c7e0ab1e6c2e4dcf90b08dc27074ff9c0e4e65e4760a314611cac06cc",
+			"0x338dd4c1a4bb139a2d7bf1fc5cbf4a5e6a0509f9883ed48989cc4cda508ca92f",
+			"0xed1c0c0a31e7d387e367d2578d9526adf0e7a95ba8bb78c917ec19e333195fc7",
+			"0xdefb920d6c97fd9deb9e253bdb0c47e973c10a6ea2e54736907abf2ff87451f1",
+			"0x2f4356e08d091074eee77a08f8151ca1cfca1b9c3fc0fe3424ec7e282c135c39",
+			"0xed00aeabd96140d2058352c5b54904033dcce4d7e674eeb70f89b36d3a6d2b82",
+			"0x0bf77f382f84de47f5d701ea8ad1162853f8fa05474a54ff5a742118a4aedfdd",
+			"0x772d24608a38fd3bca25493ed12821ed7a99eb6a79fae2e8f8fa59874c2cb1e0",
+			"0xc593c4ad7f4799665944170c88709d67b32479f0f36e82b0405745984697fad1",
+			"0xaa69e889ebd6fb54ecbc137487f6e65f9084d1586a2d4d561b03d707e15a4cfb",
+			"0x388d9dd700717aa8c19afb6e6ad6ed322271199ec9f4ba5795e612ba466a7a62",
+			"0x68df4c472e669a2477bd123a135d3e1e9fc1454ef9c4001b75041037910c6e0b",
+			"0x0f71b9f338fbdab556c5e33603f29c011f9dd3c00038e7adba9da28fa606e3e7",
+			"0x246550ae6ad91f25dc504667e98c12f076fdfc405382aa2af86708e28f011f37",
+			"0xc8e8f6e387ff32fc1a290bb5882fa4f56bccc716392fb8985cdc40a6f8145918",
+			"0xde56c970cc97055f75b49be9359cbcc1e815e1b771c51095872aa5538548d4af",
+			"0x011a5479a5192cb0c5cf2a2e58680ed771ff7d0d3128d1e4e58c7ee8684c12f1",
+			"0x6b975fe3351ef01d8e88e16ee96aadcf28aea0730eaf3a7d382d4c5b6ecc3cf4",
+			"0x66e8a35a06eedd293c10a61f79c00c2da418d372d7a41923b49aa269ed90f187",
+			"0x1ab5924225ec646903e2cc3befa65ed480e07e4bfc7b23a8112e69a898514940",
+			"0x42aae89f47915704db5614d2427bafe17d4c89f3b2f9a54af75788b0a465b581",
+			"0x6116b3cf781b5399ff85b53cdb73c8a691768b68691ce6b28f1e3814ceb67e29",
+			"0x789e62df669a8accf7fced4a94c4af70b1f99105d2fd46d1e7852737408696fd",
+			"0xf0e0efb701bd33a9cf46285439498ea610fb9fd7e497fc67a12076aae786c858",
+			"0x4b37c504b97bac7e683060f6bd731675c9a425dd1fdef61f49098fdc3a20d5ab",
+			"0x10f0cc3ea407f13c912a02f28e9a3175565d3fe3512e21ebe75c419282e609b8",
+			"0x48e24dbab06428401206805fcf50e533e596ac7f06dcc1ca78145306957ea2d9",
+			"0x43fc043bfaf30e479b15099995bbdd637678a7545318a8506257eaede34ad5c3",
+			"0x1ce6e0293bd8a48a6d65894ad0aa814bb1e220f88271d0478a1d35fdccc4368e",
+			"0x8798a23cc8be0306074e7da374760dd95ed6b3e85f7d3e1b7e08a9403738c7c9",
+			"0x05a534efd715fbdecfeb19391efb948fba524fdeb7fe5415379328cb92ee0e7a",
+			"0x8f13ed4eb277b6d570428a320918e2cbf309252a6c677dd63afbd777170cd766",
+			"0xd95418ce8a701035ca94cc2fcb44161cd1669e75d2f1912103ca52f83433c92f",
+			"0x681be568f2b05e562134aa60f5a8173cd5b49ac27645aaf3d742b11ae60cda78",
+			"0x0ead88dd38d9b21c7551fa6927e65551e491f93e17a23f05cf5ef49aff4424f8",
+			"0xde4fc8cd734fd01fe291c39ed36a3b4a51f448527d90e4bb0eee6a06dde0b976",
+			"0x95598d98d26fe0fc0b1e3b703e649386dfa52f892b176a862791c49ff1b8ee87",
+			"0xcc756753a08234dad53004649a1cbcb00a4b5582355bc072569225f8a49c1f2c",
+			"0x957aef285d8a880b736c4ea2f14d6274dde065ccc8e9c2ff674477f53d4a44a9",
+			"0xba94da4c4e497aeffbd0d0a2aeadc9e5084ef32528197dcc89c2ed9cde555c6b",
+			"0xd212db212c103136ee2e69a44e2ad8d3bcb3155170de7896cb68756aa546d5ed",
+			"0xdc61234e477321b6e7269d24b8c2b8411c7d94260961e88f5e897e534f82f8f0",
+			"0xdae46238c68e67e1dfded286230787eef026c98fadf9d29be98e0c3b74bd9541",
+			"0xdbdc6cf4b55526560ce2d4b47fff4a63b46a6f91d3f7af8711c0c2d5fe7a3a16",
+			"0x8498bb5772d8ec37456aa75752b5efcb92262fd3dc67a74ad62b0f9ea2a34bd1",
+			"0x4caf29e606a840a3f2678b145d28a29de65e4db25b5e6a7d407745a11afd9e0e",
+			"0xa422bacad4b0fc07ac3e4917fb4d86e40575b6ee59b4dc1aa22c550ddaaa4072",
+			"0x09ef8f935683b1c33a49158fca5d9e8c7521da28991ecc7b4a43d15a7f3e8179",
+			"0x868e02a322001c542de6b8874ae28c6b242d008980651fc8ec165dc26d1325f6",
+			"0x4ac2ee1b915a6a3fb22c031bf4b869785bb07af260d4aab107e4a2abf58bada5",
+			"0x9906fe76b1cb5187dab28a1e5b4ba5e3405305e937f1c88c6876ad53ec1b6c1b",
+			"0x9d6a2109384f7c9dd76271506ef0c4702e4385addfa5268e9a934b0bf4522ba2",
+			"0x899eb72af76569530958ec1f8725567a26ade27a89294b16ef4f87e8f12c051f",
+			"0xbbb2ed5029c368ce8cb34e52f36ddd99c2486b026094a9f935a04b106e1133cd",
+			"0x7835cacb5e7d39db682b8b16acf95504ae70ad08c64f205ba45b6f43998be66d",
+			"0x79c9dec734826ec7c43b8d37cd56f2a8886474b71244c0b913eeb652e2588b4c",
+			"0x574ea94ecebcdb9420c5d576a2bf4220b7cf8362ae7f92a0f5268792bb49880a",
+			"0xffdfe73b6b47fcfaf6b26c12956f96cb80505bdcfce5302d67683c5fd62197c8",
+			"0xd0cd4977c4fb430f09cd338f5df66e67a7fabce709fcec371ae13819a375b49b",
+			"0x6eafe501f49d14d093691c5f7948b53b59f38a80624440bcafa0d0308282401a",
+			"0x2b7ac65ed137696fc2ee8dbd1cb6a5fc9de6cee9748617ed436fffae6f0d9eed",
+			"0x0329936be953a4850cd53d84333e8f801906f9d5f17068faf8d2c99ed29308fe",
+			"0xf09ad47fe7e45c9e10266bfc452fa8e15ee1de2842502af44d08043899d39545",
+			"0x99166364cffd02a748be5a0a7de4590e5238b94640f68ea7c07bb0d9e0473877",
+			"0x8d37c6a259ac724cc67e8cad78c463d3505d11a14a7ffb30594918307f53deb8",
+			"0xcebfc571f69509d40dc3f15e872fcb72929245e8e66808f9cb7ae52e1c847214",
+			"0x1ac22d558b9e4a82008360050940ff6516a0f942810eae028fa4dd087d16d66c",
+			"0x8b2d70b5463cf663b2bfcf04811f6a29425de37d0fe4ddd64a5420c557a9779a",
+			"0x192a7331749e24299fa79d33b3c3bbba166d5bc9b955a3c79cba28f1a39f92e9",
+			"0x500bdd246d9d9a3376e9fef8d02d30d7b0a0950a6714a1310bd4de624b06e7dc",
+			"0x444e8465fecde8bdd1b53efaf118b3251bd4f2a65296383bbf25550fff8d36dd",
+			"0x63cd477c06e10cd5f645b93af2368cd151707051ba1e6d921d386b867efd76f6",
+			"0x6ec5468c3b201931725dab24ed6e72f89cac5dbe49a25041458c25d0d5966785",
+			"0x2b03d1bd439513feeef7697d4a58e21c5715e863e5d27a748153419a604d9fa5",
+			"0xdcf64485fe42fb0b483b81124758b61ba27b3f7d6561d449e17febeda6a01cc6",
+			"0xb557797848147314de5b34965c8756d3e797775edf51be2814b5545603b1f659",
+			"0xb3f1dbffdf4320e5fec0725cea7b3c98c8dcbccde0f1e032696e0c14d0bea7bd",
+			"0x3ffe56934a6f659f59aa128ec13c2db95a2b0df18d1a37840db869e914fdd361",
+			"0x14a51cd6559a2a6f12e903179547e3b76a10b339e978d7aba19222d7a8995e39",
+			"0xf55f41fc193413eb8dea30afb910f46536c4d2e0087101cc7a1d1945bf3f9d82",
+			"0x9afdc6e8253c623ff633f4efdbb3109d1f81468222a7de77fbf216c4b2d46734",
+			"0x2bfcb3ed3c68ac68546cb704695a479a0c15c45047e98b027a43be8c3756da80",
+			"0x65675b82c05d41a86fb8ddab438dcd0973e7d1044044542d36641ae387e6f9ef",
+			"0xe56fdcc41be235203967f4ede3bce76cb0f8e078e68ed9bf6e867bd695864c79",
+			"0xd42dab74de64242fb5eef9b4c239e4d5bde4c58d838c07dc728b3613c929deb4",
+			"0x8d52b0dc5de4452809aa787e83f76a2a650e7675aefdcc89b8e6ff34114c2a51",
+			"0xca438b0b85381752e1a066e5235e0d9838fcb375aabaef6e859888018a4557a2",
+			"0xdfab1e3a231c959d8d154f5509a167272cb647bc368413c74e411b7f35ad32da",
+			"0xae1d00fd3cd778188bd5df7627b2a02c69a612873bac8df6ba96816be0929b08",
+			"0x2dbec9851e37b9a54f0cbbdef72cde39a4368a5bfa0537b96d7ce584c5589292",
+			"0xfe67d721575913df5f0c69ad9e362462db169beb8f7277e15a09861817f0ae47",
+			"0x7d6b8267bcaede21401ebf6841f7e95a80136c41f5876a680f28e94fa89bd673",
+			"0xecbb62951ceeb9b49792afdf3323bd8607c8e0c019983babd997cd3df1f2dfe0",
+			"0x6b6a945705b609715f9e6e222e0e8145118bf97d29f3f331aac194a054a99c9c",
+			"0x56a7c6b7d616e3806452d6e8a2540f94410ef10c8b57f7f21cdc2df799bb0a02",
+			"0x73f6f889fe9d8276f2942cfccd3781e8e326e29ccd033a8273041451c9065ef4",
+			"0xec84330677c2311e85d76dffc692ed3e2d194e90fef2423609c53afe03b10a2f",
+			"0xa63916671ed57cfc053a4595a854b26aa31a84e775fd3a9d3e3b4763b6f23625",
+			"0x44e3a21e4b5b1ef0636e0e4e4775b16d4722838c3eac7062e963d46bc2946d92",
+			"0x910eb99fbd1e3afc013a5f50b475fb324d20c7aad82c602b8e9c21c7bb914d26",
+			"0xe66fe50308eae671e265d6985c346cb23594746b2c7470a0d3bc8018f3e89abb",
+			"0x68c0706f4a903432bc423c7b11ed2fd685b0c11cfcc9c7da4b17ea9fe77ea628",
+			"0x2eadf540de899a1b71827e8cecd8efe280b6f5a9e96cbd3fbdca10ecfa8c18af",
+			"0xb67b79aee1d96e626a92864a92d0e1536e4c79d1f7980c83ef53506c3795d4c5",
+			"0xf8b79fa4dcc8b6943c76a1a48ccedcabffe2a309f38682bc7dcfb6cc71900dbd",
+			"0xaba4ea033adf6944ecec4d49b886d5cf8be86576a2c30a9609292cb087bf2f30",
+			"0xa38e14dc7b081b096b93a5588e13c18156dfe90a1b0c3f294568f8fb43a1679b",
+			"0x796373232dc5595162f632d5c169ee186c48fe7c33be7e9d69af68b836e38399",
+			"0x612c5be74f0bc72c953546a6a2f70d0e7c05bb3e9806218867ebc29924b7e9f5",
+			"0x9fad004bd232cd89ce84777a1480893821a29718e464cdb662c5dd9c5a276c6e",
+			"0x4c0a8776183994e83cdd7816ae3dbff33da6754f6a4dd16405d7c44823266c5e",
+			"0xbeef52ba26b24e9c34a630fb5bceaf97f5d56577855b409bc8b27e5e25b3b870",
+			"0x020fe496c09044dffdeaccc2a90ded49031829cf75a747c7a27aca06f489283b",
+			"0xbcd6208f1eb03d16f20fe1cc19fa2992d1e0def9ba1e3c3e95f26a413153a7a6",
+			"0x45c09c2c26bf73116b2bfb8762d7837815d2ffda196517b7fe9ed23165b49eb6",
+			"0x99314aaff566a187f89b9634bb9d28325bd368e29b7a42e73653731a1fa42522",
+			"0x519db26bae12d9b532d541db13dd74c1e19b6390029f3091e99b76f85e74e33f",
+			"0xd3c0b7413873d883efdf1c42e0de66cd78a9c0a8b614dd88a2e84947a1bd0869",
+			"0xc087342fc0e8df4176bea79dae4d6b4f33ca9b398fbd357c877c7680ae39d9f0",
+			"0xce5714dc42019277e8170fa097ab567ccd88cd4e24ce511fa6e93f85ed8c3302",
+			"0x68e1064b5077861bd9839539a5529a63bc0e4df68e875e6197f6fc9616fc1c2a",
+			"0xa898f156e8de5f588480a79ee5448f6a1c3f482cbaed2ac2659459cfce08ae34",
+			"0xcdd2f9e50fbb0eea3058d3341cbe39a7274cdcb3f10df0cb5803fe1bdeba3713",
+			"0x7eee48ac933e7cafa8cabd7b2868d92f27b0210bc0810e5a1337ea32daf3ab8f",
+			"0x99e2e041e1b178b8538594e356ac7c7133f24cba67083192dd2bc30fdb3d0d69",
+			"0xa4f4e1777b831cd05440067982b48aca3b89b9c2b19ab82c788be5301856f7c4",
+			"0xa44b761db0a2a19eaa9d2086a594290eb48f8fddc3e9209f3ed8c82de35d5fe9",
+			"0x189fb24a706ede989db9a587e205b66cc4e2ca5329c4726f5cfc72dc0df4563b",
+			"0x9104e63319bd2ba428a47c170e0a310a67bd90ceab2d232dfacdfb72bee09f0d",
+			"0x219779e07435f4b4458ea8a5131e796cc79d47a30692798eeabee8c8a47a2405",
+			"0x2a946612c3dcb2da23fd7696d4d30acc3ec25e292d239f3c01b0923f62ee51c1",
+			"0x7a244c94d76d458be7acc6c885c357496a77daa119e49a3ae168908bc73bb569",
+			"0x274139b3f78e5193cf35b7f28439dc4f74e6927a795234a00262175971b99fc6",
+			"0xd138526ac6cef7792d3dc1993f364f1b0985b9dfa3db1847d785ecb81a70eefe",
+			"0x1ce8e07f1350000599c342adb2557d8ccf3fa1d4752b6cf2cc71c42fd62a7e8d",
+			"0xab8f97c1e9a65dcaaac53f799f844d831da02dcbd372b796375115ab19a32eb1",
+			"0x53a3a62994cb0391e81167207b1a25604f25dc08240666072b0f0eec0311feaf",
+			"0x786797a4a478d15b758067c82e2ebe1d0ab2240e8db29e050e6765777b2aae3e",
+			"0xf096ab958bfba2f4aaab3e1bca5bdedf276bec61516ab7602a8a54ec6219920e",
+			"0x25ae9275d83e34866d66f4896167de7e04aa6fd8070554b11ee847fff73d9e27",
+			"0x871e675b37b2ebb4f3a7ffeaa0fa6f4a47db92f517b66fda5bea400f13528071",
+			"0xe706cb07d3f90e7c4f7c9cf09401b9b82a063fec369514247db76efca5e2c640",
+			"0x0eeab1ee0c30812b9de778016821a933efd94129b13524b9558a74ae84906380",
+			"0x7f86033772f4b5265042b6ec7f3b14570415db9a148617e63b84331d0decfa25",
+			"0xd916a6a70300faea19447bde63491ebc21d8447e5a5225f18618cd44d9d25fe2",
+			"0xe5e632370370812351165ad2d82a6be86e9a2ea0a134cf0b2d92e481a282506f",
+			"0x48d4ede9a70efe12d9f21bbeccae2857dc5859d4d155da96806cbb392194aed0",
+			"0x6def1fa1beb67760b1a94ac9da22a7df6a3d3b9722c2e9c2cd503dfb14340c2a",
+			"0x0b6493b5a5798dd98ebf99f12fe714d11f78eed5800d892f50f6c80d5f9b916a",
+			"0xce7bd3ceb24946842e452057021e80b7909ab4326fb43725923f5447da7566a7",
+			"0x3d2bb2934beb966aaff7629a346cdf19c4e3671116d7e202e2fc9be7d1fa4fb3",
+			"0x07e58703bfd562eaacef11363c7f70b0609ed6d628ee58e06b11122a8254f0ef",
+			"0x26cc012c66068fa47616f5f1d9bf45751102e99519bc5cbf0b7da14eb0ecb1cc",
+			"0xcd736566d5d6c8ff5bff349d3a932b94c19f9765193c3e41f70f0345521038bf",
+			"0x1f400b109e0773845f75f99d107e6146c97172799351597abd435af18b9faa46",
+			"0x0009b529ec164e1686276b6b1dade0a82f76963c43f27919b193348bf9372bfb",
+			"0x180b4008aa291f371615cb3e2975b2b29b3db58d2ad61593a52dd9a9bd963319",
+			"0x86b7aa3798243667c0001cb9a97a7660145b3582fc2232b4625b001e4babe622",
+			"0x823312d5231a8db9211b141b2483fcb1b6d311e482efff347c9dd17a74c611d0",
+			"0xcd0e83e63db1c4a6f2638dce68677bea55e9d4b84feaadb1bb085f485318c627",
+			"0x3f34cb62b347f4930005e39a102d08d506fcf9ee1418c372dc64a70f86b7e02a",
+			"0xd03e1359280033fe74fff780447b29397894a811859929eefd4d52cf6ca40521",
+			"0xa6fb9b05db2dfbd6ff4414b5f03633b46f5db77c198e6aaf9ffb366b9bdd3af9",
+			"0x87af91f40f569df2c64e20accbd3cb7fa21c2cd24a1f9eeb1dea7a39f11ba3f9",
+			"0x20d35104742d776aee3cfbf6dc1e36a172bfbd2a8ec14f9fd016eea15e480c19",
+			"0xa388892adcd0c0109f09a3bca25c6d49f2295dac3c61c6d6cca03b8e92d253bd",
+			"0xc7189645b5cfab9cb71e3d1c671bb439e8c14eb2971bbc21fd5da08158ca07c7",
+			"0x72f695f9d98843fc4950f8ae78c2bf48c09c92660483bfcf270c2a633f05e852",
+			"0x866f028434caaf3cbe032ce693c2628295daa219b0462dcd3ae14df71fe746f2",
+			"0x5d3d16c2f16c48a442e44fcc0a04700c40c1033bb0276a1f27d264ad2fc91b6e",
+			"0x4bf7678c9db62bf4f8aa92098ff39619b2484f75fae80f6438742c3c5702c652",
+			"0x8200e4ab04b42c901a2965aa2243976e553c555ecc811ecbdf9bc470ca32351d",
+			"0x1676a43cfbf10d344c6837d1a139de56085b88acfceb3cbef0056c11ee6cfa28",
+			"0xfb3ee392b6c300a8be67d4eba8093471c77a6c6ca5682644b16bafb749d9c995",
+			"0x4887db0505d7f3c7017374a482367ecbe9b69de429d2d0965fc9a4e37093787d",
+			"0xcc00e39c22808934bc034c2ac322643668711279b300ccc561dd7381bbf094e4",
+			"0x2d906acbcfae462edd246ce62e07f29e1cc0a0cd23b510b61f4ee523a2061ba8",
+			"0xe61769fa90b6df16bab14466afc63cb1efcbe46fa54594e8c7c114ece565250b",
+			"0xae6085d35aac3488d871bee66119d05c889acb428cd5c6a2a673d85a45932ca0",
+			"0x17c004024e663872c0ba979e00490587977f2237bfd11639c4abe5e4eefd3fc6",
+			"0xe5ef57a117bec639b4885e6941aea12a6dd96aaa7849f29f000654a2c29c6b7c",
+			"0x00dee21ac9b8eec2b22982645edf796dd65fe1cc68629bf7f79ba4910b41c8f6",
+			"0x8c42ca1d5ecd86e445b0c01da6d60202b1371495ff1a3990fa880c43c4681de0",
+			"0x234e64d7baecc3e4ab3ac0982ee93dd426f8b0313e59d40be4707c40540f0c91",
+			"0xd7f8b45da51184e9ac15b373991b0c46d48c7cb5776967953e57f9e85f7880b7",
+			"0x1d895c0700d2db688ce79e987e3b35b5c0d0bf17ea5432cb1db245592054b484",
+			"0xb12cb54a7f50711f7bfbf03d57c5c1262191019ef9ce69485cdc41d7745411da",
+			"0x2f54a275e01adc7e6cd5b464f8d033007ef09a0a3ae29f9bdf179ee985d5f29b",
+			"0xc21039510b8dcbfbacfe8794826b79d3ad3c839287015857d780fb57a1ea4ea6",
+			"0xb18484c56bf516dba0e6a2b31c0b6f93cd38957a60c588e9e7fb1859d8ad18e8",
+			"0xbaceef26e6b8a5bdf0a21cda677f71239736a0544bcac5f3d9a90696b8a7b15c",
+			"0x97838a53f6996d5dff68c3439689d2f87c7e97ea6be519cf8dd70a47b023f2ea",
+			"0x882be66e5ac63dfa0f5c31789b24f6a25f6c8751ff609f86977dbd0cae890df7",
+			"0xe462a0b007f8029cc65f40ae1f42abe47f160afaf92da8470990bd94443165c4",
+			"0x37a46df02258c5965454e0374d08f3650d16f05b083190b787e7d514409daead",
+			"0x55604327bf00775ed3b2d121acd86563883f597628a76e5f1abc66309fcb09cf",
+			"0xd893ebd9fad9973e616de074827b3af3a0387fd3b9a7cd4d59f1bf98d8426027",
+			"0x2e8c05fc5ffede3b58cfbcaf62cdf334357e3786764c715c2a6980f0569aab2d",
+			"0xa50933e55e80764035403224fef71248bd1bd3c0fa3b40b485113c203ea1197c",
+			"0xed34b281864aa711320b075dad853fd035aff039490bbf3d029b647bc7ca6943",
+			"0x0d29603bcdeab05abb491caaab151e0c4fd2e3d7b9dfbb1f3f37d0869ff09862",
+			"0x49f2318fe7347589b1b0444d98dc79b31ce22225ebd2c463a29bbeb1b65d45e8",
+			"0x7cd03259ec36ececd895da05e4490770e4a354e0f84a821de440a05562220a0e",
+			"0x0bceae0593be03526c84e8979522408d01f8b553bb4e18ed9dc81ca62ec058b9",
+			"0xc4f885819cf0f8a398b59040acab517ab10d3380bd8ac69645ce27836dc19ffd",
+			"0xd3bbc4fa9b2136118179fe8eb0bd79c113a725bf6cf7c7e4f8b5f59398dc44ab",
+			"0x73e21d02abd45dc1689e24b9d25141698b683a8add128122ac3e245e23958d70",
+			"0x4b6814ba380b801a62c4a3d3e8ade70c48cc7e7a5a4d5f6a0a7e8c5d7b8ecaf4",
+			"0xacce6845fbb4ea44e2b3f81225437c7eda438029557a26419c6d76755cfaa9ca",
+			"0x8ab24bd5c8ac2081b713634b56f459db67ccd48f833cd9ff170fbf1baa476e3d",
+			"0x817faf7f5bc035d2c3684ea95ebf27a7c3048e85f0595d4cf8318192b532d2d0",
+			"0xdb867eba31c6f0b191784bb7ee4858d2db1bf3fec19dedbd08e5fbdd4e1b3559",
+			"0x4c28527c58ae5e6f29102bc5711d39e25af511bbcb02d9a87f52f76eed517f07",
+			"0xc0b8bfa43b9544a635ca96d3fafd9747d24680c81af43234dd30b65fb304322d",
+			"0xe26c80fdcca6e61411fff3991dbc44c4f3725aae057a81770fd8def73f0ce024",
+			"0x5f044013409beced775746d721dd78b45591e20d3d85dd6c9361aaf47a0ceb65",
+			"0x71e3284644d22af77474a93e268d0dd265c0c42d94c4ad9fd62430461cf3efb9",
+			"0xe2487c02ef5a9cd04fcc5544243fb7dfdf90b559bcc8277f7ad6d892753df2f3",
+			"0x09808d08c0e358c29603f83d201938377a45b543816b079f889c1fbbcb4847f8",
+			"0xb5f97d9ea4e92b9884d70bd1b0dc301b33690e64f648c770d4f9fc16e3e6fbc7",
+			"0xe7fdb278d471461a7adf3496eac82bf323a0faf62b2a4d634f56468ede626322",
+			"0xa9f79b0f2e8e7b8ec5224773f1cb2762078430d8b131a6f22cf7973252212e72",
+			"0x5cf0e6a30df29b2ad982b1db7283cc4c671488a43602b0d768177af61684124e",
+			"0x11fd4ff8d42811d05bbde1bb0769cf4cbcd03b6c99048aeee9bd1b608c3927c3",
+			"0x92b6d6e27443525cc63111623c69b46c3bbfbd9e528d876a6de043d7f82b3a50",
+			"0xd1a398f4b33acc132e854b49eb51773abf1846cde2dbacff9c4527b466bc8a26",
+			"0x95628b62aa0fa59b2b49fc6fc7e6fdcc416b59ee5229edd425b1a607e9998153",
+			"0x82f479a7ab8e6db85296f8cd3df13279ee899e1bd8df95b357ded43d4baffd6a",
+			"0xd193576f1bd139a319e1493c075e33f317a05308b93ff3ecaf5249c20e025755",
+			"0x7ad318979fbca17b06a968c11be03713d3d46c8287477723a0c97374f5ce4986",
+			"0xdd52a80097dbabfb0979368e56fb93087cf9aa1e5e3047faaf6ba475c5d3adfd",
+			"0x3f54e8d5b1ea24ef7fd8e5df54ab472b1611925df5c8431336ad647687d942e9",
+			"0x13602b947455a57cec85f485f3b06bef3268ef99f5d0d80ec3278948354dbc78",
+			"0xb6d186e6caa9662af33cb661605d18cdd96d54a62fddf40a8b59957c95794009",
+			"0xf26e692ac554a77ca5f56aa4f49dcf03a7b9706f6814f0d8e09007f81d8a79ca",
+			"0x31fbcf8df989b08262cd60f604edf8149974245f020acdedb10d274f59bf77d2",
+			"0xcb796442847e9eae7bd397c45394fca256f885c921d9757c3eb3ac6a7c4d21d4",
+			"0x29643bac94a2c041e6bac56bec1cc46acb340ed5ab34606b2fe088a804a3459e",
+			"0x4204834ffbd39aefc2a735c2f9ddd312104481866d1e7cf169eaa1d95528085c",
+			"0x86de4f25fa0c49fd019141a1386cc52e296651684d13679f4f67a814155eb215",
+			"0xcf32d0cf2c694df53580cfdbec9a6b54eb8e83c7403d3359c61ce85eb5418ce5",
+			"0xe081edea49229b8f7b276b2e3bdfd2b8ad12afbd071997a0e5443949d1f5fd7b",
+			"0xd43f8f081c96f2639add57b7d7a112106de124b7d9c504f792cd422358aeb7c5",
+			"0xec11b96266eb477f0b998ced2832efb936ca3ebc1da4146342627d9657f9d31a",
+			"0x89927e87d7b5522802f654da80dc70b8a14a3db83a8ba1c0e162d5bdd6327a00",
+			"0x052526cc801a21f0bc0b145d45be93d500f48127a6fc1970bf10ee2d5aac34ce",
+			"0x07f53db511f45a428f6508c51fc608730a53e1ab0d425c8b44196507c3288f76",
+			"0x380ff3fc61929d4297b598c725a1bfdb651e878ef0e26049648a622c126a19da",
+			"0xeb9b3e7bfc792d6ab85d00d45fee76cc84f81692d5554bee8f1790f027bc615b",
+			"0x10ef177a4d3610f9105e6b35318f2d12df4f7c248e639999961feda96a5f2f30",
+			"0xedb17228c2bde8e124c0fa9dd99e9af6bdb920b30e71ce55c3aefe30740ff377",
+			"0xcc110bc17f21ae92054bf94b3109efa6df3240fd54d7a22a87492590e5fa7c21",
+			"0xd946e901eed5e8f0ab584258f78e76436f6aeb5c16f49d0bdd5c7b1ecaaf62ea",
+			"0xc7fa65c5e8c48d4ea354f3900623950a0f6a319572381624258b5cf6b757a4af",
+			"0x262f129de130f709b4c98a31c208c2edf21b10d005507762dafdadf0195f61ab",
+			"0xb71ac11bffc2f2085699142bf75c7723624454cc3f3f44390e21c50a43918ed7",
+			"0xd0fc736551e28fef1816584f4e80fbff2b92dbbef3c6b33de9fff624c9f30050",
+			"0x423f396ef11a9100a30ad47e0953efad3014797c97b468d68e9da1cbff620ed5",
+			"0x819259e80f60bbd32cbab7027ff4ec134778f9254bd5c12020dc743b31a4ea49",
+			"0xe3306484604c7e73f844720524303484126db195e3bfa429feb6189a1685b018",
+			"0xdf1cc368134b50f3a2cfd8660e1fc8cc27e12f58c979e0416b391c140baea6c1",
+			"0xbda9fee3730f730df0ffa9c0051ce991d88e9b97106de6429d125b0b477d61ec",
+			"0x3d2fa3a51f1cc993baf397ae89fd9153e7842ff613e7b96b5e572b5a3558394d",
+			"0x3ba82a36da3d9732daa74bf593207b49a071cc4db8a1327ae0d5ef9534181697",
+			"0x19b4b261ddc43476412c8b8c537d9e26014c6c632ba98466003591cc947a5805",
+			"0x568f44291c13efc908db42d2473bc91ebb16e062e9b4368bcb770a3033d67741",
+			"0xe5ecad510448855ff0aafb92a8c7aa54aca0fb390bec3c14ad5d2ba200380aec",
+			"0xa40aa7655c1458b76c04ea5934ae171fb01c72c8c375bb61a0c27b0ebd70f21f",
+			"0x770ad5107ac47fd983979b016553ca8f340a13e2647b9140e65c980dcf349cff"
+		]
+	},
 	"nodes": [
-		"enode://efe4f2493f4aff2d641b1db8366b96ddacfe13e7a6e9c8f8f8cf49f9cdba0fdf3258d8c8f8d0c5db529f8123c8f1d95f36d54d590ca1bb366a5818b9a4ba521c@163.172.187.252:30303",
+		"enode://6a868ced2dec399c53f730261173638a93a40214cf299ccf4d42a76e3fa54701db410669e8006347a4b3a74fa090bb35af0320e4bc8d04cf5b7f582b1db285f5@163.172.131.191:30303",
+		"enode://66a483383882a518fcc59db6c017f9cd13c71261f13c8d7e67ed43adbbc82a932d88d2291f59be577e9425181fc08828dc916fdd053af935a9491edf9d6006ba@212.47.247.103:30303",
 		"enode://cd6611461840543d5b9c56fbf088736154c699c43973b3a1a32390cf27106f87e58a818a606ccb05f3866de95a4fe860786fea71bf891ea95f234480d3022aa3@163.172.157.114:30303",
-		"enode://bcc7240543fe2cf86f5e9093d05753dd83343f8fda7bf0e833f65985c73afccf8f981301e13ef49c4804491eab043647374df1c4adf85766af88a624ecc3330e@136.243.154.244:30303",
-		"enode://ed4227681ca8c70beb2277b9e870353a9693f12e7c548c35df6bca6a956934d6f659999c2decb31f75ce217822eefca149ace914f1cbe461ed5a2ebaf9501455@88.212.206.70:30303",
-		"enode://cadc6e573b6bc2a9128f2f635ac0db3353e360b56deef239e9be7e7fce039502e0ec670b595f6288c0d2116812516ad6b6ff8d5728ff45eba176989e40dead1e@37.128.191.230:30303",
-		"enode://595a9a06f8b9bc9835c8723b6a82105aea5d55c66b029b6d44f229d6d135ac3ecdd3e9309360a961ea39d7bee7bac5d03564077a4e08823acc723370aace65ec@46.20.235.22:30303",
-		"enode://029178d6d6f9f8026fc0bc17d5d1401aac76ec9d86633bba2320b5eed7b312980c0a210b74b20c4f9a8b0b2bf884b111fa9ea5c5f916bb9bbc0e0c8640a0f56c@216.158.85.185:30303",
-		"enode://fdd1b9bb613cfbc200bba17ce199a9490edc752a833f88d4134bf52bb0d858aa5524cb3ec9366c7a4ef4637754b8b15b5dc913e4ed9fdb6022f7512d7b63f181@212.47.247.103:30303",
+		"enode://78b094cb27ceeecbe311bc278f4fde8b9a265db42d268c88484c94d7a2d19b82a1bd22dfd6c2bd4d90f9b05e6d42255e6eb85de15f73848ff82ed0be9cdf5202@52.233.198.218:30303",
+		"enode://00526537cb7e1aa6cf49714f0635fd0f608904d8d0693b949eea2dcdfdb0abbe4c794003a5fe57aa662d0a9215e8dfa4d2deb6ef0101c5e185e2617721813d43@40.65.122.44:30303",
+		"enode://4a456b4b6e6ee1f51389763e51b80fe04782c762445d96c32a96ebd34bd9178c1894924d5101123eacfd4f0fc4da25b5e1ee7f18832ac0bf4c6d6ac81442d698@40.71.6.49:3030",
+		"enode://68f85e7403976aa92318eff804cbe9bc988e0f5230d9d07ae4def030cbae16603262638e272d19875b7e5c54e296ba88ab6ec6e98face9e2537346c4dce78882@52.243.47.211:30303",
+		"enode://dc72806c3aa8fda207c8c018aba8d6cf143728b3628b6ded8d5e8cdeb8aa05cbd53f710ecd014c9a8f0d1e98f2874bff8afb15a229202f510a9c0258d1f6d109@159.203.210.80:30303",
+		"enode://5a62f19d35c0da8b576c9414568c728d4744e6e9d436c0f9db27456400011414f515871f13a6b8e0468534b5116cfe765d7630f680f1707a38467940a9f62511@45.55.33.62:30303",
+		"enode://605e04a43b1156966b3a3b66b980c87b7f18522f7f712035f84576016be909a2798a438b2b17b1a8c58db314d88539a77419ca4be36148c086900fba487c9d39@188.166.255.12:30303",
+		"enode://1d1f7bcb159d308eb2f3d5e32dc5f8786d714ec696bb2f7e3d982f9bcd04c938c139432f13aadcaf5128304a8005e8606aebf5eebd9ec192a1471c13b5e31d49@138.201.223.35:30303",
 		"enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303",
+		"enode://3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99@13.93.211.84:30303",
+		"enode://78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d@191.235.84.50:30303",
+		"enode://158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6@13.75.154.138:30303",
+		"enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
+		"enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303",
+		"enode://0cc5f5ffb5d9098c8b8c62325f3797f56509bff942704687b6530992ac706e2cb946b90a34f1f19548cd3c7baccbcaea354531e5983c7d1bc0dee16ce4b6440b@40.118.3.223:30305",
+		"enode://1c7a64d76c0334b0418c004af2f67c50e36a3be60b5e4790bdac0439d21603469a85fad36f2473c9a80eb043ae60936df905fa28f1ff614c3e5dc34f15dcd2dc@40.118.3.223:30308",
+		"enode://85c85d7143ae8bb96924f2b54f1b3e70d8c4d367af305325d30a61385a432f247d2c75c45c6b4a60335060d072d7f5b35dd1d4c45f76941f62a4f83b6e75daaf@40.118.3.223:30309",
 		"enode://de471bccee3d042261d52e9bff31458daecc406142b401d4cd848f677479f73104b9fdeb090af9583d3391b7f10cb2ba9e26865dd5fca4fcdc0fb1e3b723c786@54.94.239.50:30303",
 		"enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
 		"enode://4cd540b2c3292e17cff39922e864094bf8b0741fcc8c5dcea14957e389d7944c70278d872902e3d0345927f621547efa659013c400865485ab4bfa0c6596936f@138.201.144.135:30303",
-
-		"enode://89d5dc2a81e574c19d0465f497c1af96732d1b61a41de89c2a37f35707689ac416529fae1038809852b235c2d30fd325abdc57c122feeefbeaaf802cc7e9580d@45.55.33.62:30303",
-		"enode://605e04a43b1156966b3a3b66b980c87b7f18522f7f712035f84576016be909a2798a438b2b17b1a8c58db314d88539a77419ca4be36148c086900fba487c9d39@188.166.255.12:30303",
-		"enode://016b20125f447a3b203a3cae953b2ede8ffe51290c071e7599294be84317635730c397b8ff74404d6be412d539ee5bb5c3c700618723d3b53958c92bd33eaa82@159.203.210.80:30303",
 		"enode://01f76fa0561eca2b9a7e224378dd854278735f1449793c46ad0c4e79e8775d080c21dcc455be391e90a98153c3b05dcc8935c8440de7b56fe6d67251e33f4e3c@51.15.42.252:30303",
-		"enode://8d91c8137890d29110b9463882f17ae4e279cd2c90cf56573187ed1c8546fca5f590a9f05e9f108eb1bd91767ed01ede4daad9e001b61727885eaa246ddb39c2@163.172.171.38:30303"
+		"enode://2c9059f05c352b29d559192fe6bca272d965c9f2290632a2cfda7f83da7d2634f3ec45ae3a72c54dd4204926fb8082dcf9686e0d7504257541c86fc8569bcf4b@163.172.171.38:30303",
+		"enode://efe4f2493f4aff2d641b1db8366b96ddacfe13e7a6e9c8f8f8cf49f9cdba0fdf3258d8c8f8d0c5db529f8123c8f1d95f36d54d590ca1bb366a5818b9a4ba521c@163.172.187.252:30303",
+		"enode://bcc7240543fe2cf86f5e9093d05753dd83343f8fda7bf0e833f65985c73afccf8f981301e13ef49c4804491eab043647374df1c4adf85766af88a624ecc3330e@136.243.154.244:30303",
+		"enode://ed4227681ca8c70beb2277b9e870353a9693f12e7c548c35df6bca6a956934d6f659999c2decb31f75ce217822eefca149ace914f1cbe461ed5a2ebaf9501455@88.212.206.70:30303",
+		"enode://cadc6e573b6bc2a9128f2f635ac0db3353e360b56deef239e9be7e7fce039502e0ec670b595f6288c0d2116812516ad6b6ff8d5728ff45eba176989e40dead1e@37.128.191.230:30303",
+		"enode://595a9a06f8b9bc9835c8723b6a82105aea5d55c66b029b6d44f229d6d135ac3ecdd3e9309360a961ea39d7bee7bac5d03564077a4e08823acc723370aace65ec@46.20.235.22:30303",
+		"enode://029178d6d6f9f8026fc0bc17d5d1401aac76ec9d86633bba2320b5eed7b312980c0a210b74b20c4f9a8b0b2bf884b111fa9ea5c5f916bb9bbc0e0c8640a0f56c@216.158.85.185:30303",
+		"enode://fdd1b9bb613cfbc200bba17ce199a9490edc752a833f88d4134bf52bb0d858aa5524cb3ec9366c7a4ef4637754b8b15b5dc913e4ed9fdb6022f7512d7b63f181@212.47.247.103:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
 		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x7fffffffffffff", "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": { "builtin": { "name": "bn128_add", "activate_at": "0x7fffffffffffff", "pricing": { "linear": { "base": 999999, "word": 0 } } } },
-		"0000000000000000000000000000000000000007": { "builtin": { "name": "bn128_mul", "activate_at": "0x7fffffffffffff", "pricing": { "linear": { "base": 999999, "word": 0 } } } },
-		"0000000000000000000000000000000000000008": { "builtin": { "name": "bn128_pairing", "activate_at": "0x7fffffffffffff", "pricing": { "linear": { "base": 999999, "word": 0 } } } },
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 4370000, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 4370000, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 4370000, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 4370000, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"3282791d6fd713f1e94f4bfd565eaa78b3a0599d": {
 			"balance": "1337000000000000000000"
 		},
diff --git a/ethcore/res/ethereum/frontier_like_test.json b/ethcore/res/ethereum/frontier_like_test.json
index 0f4b8850fd6be4803282bd1ad030f67e669fac68..6d2ea3693df017294ba1b54e0897c24d2c21d270 100644
--- a/ethcore/res/ethereum/frontier_like_test.json
+++ b/ethcore/res/ethereum/frontier_like_test.json
@@ -6,6 +6,7 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x118c30",
 				"daoHardforkTransition": "0x1d4c00",
 				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
@@ -136,7 +137,6 @@
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
diff --git a/ethcore/res/ethereum/frontier_test.json b/ethcore/res/ethereum/frontier_test.json
index 802a77f8da218d8b25a77bede47f21229b189a83..aae59cb071e4ae574f3b07a7bdfe9e5805eec0e4 100644
--- a/ethcore/res/ethereum/frontier_test.json
+++ b/ethcore/res/ethereum/frontier_test.json
@@ -6,6 +6,7 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x7fffffffffffffff",
 				"eip150Transition": "0x7fffffffffffffff",
 				"eip160Transition": "0x7fffffffffffffff",
@@ -16,7 +17,6 @@
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
diff --git a/ethcore/res/ethereum/homestead_test.json b/ethcore/res/ethereum/homestead_test.json
index 557a48a64034e7373a399e862b76d3cff452535a..c6d49b5455604566fca593e6b09130e327246a27 100644
--- a/ethcore/res/ethereum/homestead_test.json
+++ b/ethcore/res/ethereum/homestead_test.json
@@ -6,6 +6,7 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x0",
 				"eip150Transition": "0x7fffffffffffffff",
 				"eip160Transition": "0x7fffffffffffffff",
@@ -16,7 +17,6 @@
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
diff --git a/ethcore/res/ethereum/kovan.json b/ethcore/res/ethereum/kovan.json
index ca7638e338c56508964127f1ff269f153c71396d..0d00478c599dd8c3c9b502813dc652e2d87023ba 100644
--- a/ethcore/res/ethereum/kovan.json
+++ b/ethcore/res/ethereum/kovan.json
@@ -1,63 +1,76 @@
 {
-  "name": "Kovan",
-  "dataDir": "kovan",
-  "engine": {
-    "authorityRound": {
-      "params": {
-        "stepDuration": "4",
-        "validators" : {
-          "list": [
-            "0x00D6Cc1BA9cf89BD2e58009741f4F7325BAdc0ED",
-            "0x00427feae2419c15b89d1c21af10d1b6650a4d3d",
-            "0x4Ed9B08e6354C70fE6F8CB0411b0d3246b424d6c",
-            "0x0020ee4Be0e2027d76603cB751eE069519bA81A1",
-
-            "0x0010f94b296a852aaac52ea6c5ac72e03afd032d",
-
-            "0x007733a1FE69CF3f2CF989F81C7b4cAc1693387A",
-            "0x00E6d2b931F55a3f1701c7389d592a7778897879",
-            "0x00e4a10650e5a6D6001C38ff8E64F97016a1645c",
-
-            "0x00a0a24b9f0e5ec7aa4c7389b8302fd0123194de"
-          ]
-        },
-        "validateScoreTransition": 1000000,
-        "validateStepTransition": 1500000
-      }
-    }
-  },
-  "params": {
-    "gasLimitBoundDivisor": "0x400",
-    "registrar" : "0xfAb104398BBefbd47752E7702D9fE23047E1Bca3",
-    "blockReward": "0x4563918244F40000",
-	"maximumExtraDataSize": "0x20",
-    "minGasLimit": "0x1388",
-    "networkID" : "0x2A",
-    "validateReceiptsTransition" : 1000000,
-    "eip155Transition": 1000000
-  },
-  "genesis": {
-    "seal": {
-      "authorityRound": {
-        "step": "0x0",
-        "signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-      }
-    },
-    "difficulty": "0x20000",
-    "gasLimit": "0x5B8D80"
-  },
-  "accounts": {
-    "0x0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-    "0x0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-    "0x0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-    "0x0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-    "0x00521965e7bd230323c423d96c657db5b79d099f": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }
-  },
-  "nodes": [
-    "enode://0518a3d35d4a7b3e8c433e7ffd2355d84a1304ceb5ef349787b556197f0c87fad09daed760635b97d52179d645d3e6d16a37d2cc0a9945c2ddf585684beb39ac@40.68.248.100:30303",
-    "enode://dcf984764db421fa0cd8dc7fc02ae378545723abb94d179f55325514cc30185eaea3dcefde6e358b7cdbe970c50b7c49e841618713a9a72d6f3f59ad9949ec6b@52.165.239.18:30303",
-    "enode://7e2e7f00784f516939f94e22bdc6cf96153603ca2b5df1c7cc0f90a38e7a2f218ffb1c05b156835e8b49086d11fdd1b3e2965be16baa55204167aa9bf536a4d9@52.243.47.56:30303",
-    "enode://d51b3e98bf35addf2f1d0ea1ffc90483e24d7c60b0fb3be1701e818f3d6778c06e53fdec737a534fe222956296f9d6e909baa025916a94601897e5c7136a7d95@40.71.221.215:30303",
-    "enode://419d42e300e8fd379ff6d045d93d7e66a091441e7b3c9f1d3d10088d8634ad37721e6bf86148f78c3f1b9f1360dc566ca8ee830b2d2079bc9f7171ea6152bb64@52.166.117.77:30303"
-  ]
+	"name": "Kovan",
+	"dataDir": "kovan",
+	"engine": {
+		"authorityRound": {
+			"params": {
+			"stepDuration": "4",
+			"blockReward": "0x4563918244F40000",
+				"validators" : {
+					"list": [
+						"0x00D6Cc1BA9cf89BD2e58009741f4F7325BAdc0ED",
+						"0x00427feae2419c15b89d1c21af10d1b6650a4d3d",
+						"0x4Ed9B08e6354C70fE6F8CB0411b0d3246b424d6c",
+						"0x0020ee4Be0e2027d76603cB751eE069519bA81A1",
+						"0x0010f94b296a852aaac52ea6c5ac72e03afd032d",
+						"0x007733a1FE69CF3f2CF989F81C7b4cAc1693387A",
+						"0x00E6d2b931F55a3f1701c7389d592a7778897879",
+						"0x00e4a10650e5a6D6001C38ff8E64F97016a1645c",
+						"0x00a0a24b9f0e5ec7aa4c7389b8302fd0123194de"
+					]
+				},
+				"validateScoreTransition": 1000000,
+				"validateStepTransition": 1500000,
+				"maximumUncleCountTransition": 5067000,
+				"maximumUncleCount": 0
+			}
+		}
+	},
+	"params": {
+		"gasLimitBoundDivisor": "0x400",
+		"registrar" : "0xfAb104398BBefbd47752E7702D9fE23047E1Bca3",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID" : "0x2A",
+		"forkBlock": 4297256,
+		"forkCanonHash": "0x0a66d93c2f727dca618fabaf70c39b37018c73d78b939d8b11efbbd09034778f",
+		"eip155Transition": 1000000,
+		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": 6600000,
+		"validateChainIdTransition": 1000000,
+		"validateReceiptsTransition" : 1000000,
+		"eip140Transition": 5067000,
+		"eip211Transition": 5067000,
+		"eip214Transition": 5067000,
+		"eip658Transition": 5067000,
+		"wasmActivationTransition": 6600000
+	},
+	"genesis": {
+		"seal": {
+			"authorityRound": {
+				"step": "0x0",
+				"signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+			}
+		},
+		"difficulty": "0x20000",
+		"gasLimit": "0x5B8D80"
+	},
+	"accounts": {
+		"0x0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0x0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0x0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 5067000, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 5067000, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 5067000, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 5067000, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
+		"0x00521965e7bd230323c423d96c657db5b79d099f": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }
+	},
+	"nodes": [
+		"enode://56abaf065581a5985b8c5f4f88bd202526482761ba10be9bfdcd14846dd01f652ec33fde0f8c0fd1db19b59a4c04465681fcef50e11380ca88d25996191c52de@40.71.221.215:30303",
+		"enode://d07827483dc47b368eaf88454fb04b41b7452cf454e194e2bd4c14f98a3278fed5d819dbecd0d010407fc7688d941ee1e58d4f9c6354d3da3be92f55c17d7ce3@52.166.117.77:30303",
+		"enode://8fa162563a8e5a05eef3e1cd5abc5828c71344f7277bb788a395cce4a0e30baf2b34b92fe0b2dbbba2313ee40236bae2aab3c9811941b9f5a7e8e90aaa27ecba@52.165.239.18:30303",
+		"enode://7e2e7f00784f516939f94e22bdc6cf96153603ca2b5df1c7cc0f90a38e7a2f218ffb1c05b156835e8b49086d11fdd1b3e2965be16baa55204167aa9bf536a4d9@52.243.47.56:30303",
+		"enode://0518a3d35d4a7b3e8c433e7ffd2355d84a1304ceb5ef349787b556197f0c87fad09daed760635b97d52179d645d3e6d16a37d2cc0a9945c2ddf585684beb39ac@40.68.248.100:30303"
+	]
 }
diff --git a/ethcore/res/ethereum/kovan_wasm_test.json b/ethcore/res/ethereum/kovan_wasm_test.json
new file mode 100644
index 0000000000000000000000000000000000000000..9be03a769082544f329847d55c18b21de6d25de2
--- /dev/null
+++ b/ethcore/res/ethereum/kovan_wasm_test.json
@@ -0,0 +1,74 @@
+{
+	"name": "Kovan (Test)",
+	"dataDir": "kovan-test",
+	"engine": {
+		"authorityRound": {
+			"params": {
+			"stepDuration": "4",
+			"blockReward": "0x4563918244F40000",
+				"validators" : {
+					"list": [
+						"0x00D6Cc1BA9cf89BD2e58009741f4F7325BAdc0ED",
+						"0x00427feae2419c15b89d1c21af10d1b6650a4d3d",
+						"0x4Ed9B08e6354C70fE6F8CB0411b0d3246b424d6c",
+						"0x0020ee4Be0e2027d76603cB751eE069519bA81A1",
+						"0x0010f94b296a852aaac52ea6c5ac72e03afd032d",
+						"0x007733a1FE69CF3f2CF989F81C7b4cAc1693387A",
+						"0x00E6d2b931F55a3f1701c7389d592a7778897879",
+						"0x00e4a10650e5a6D6001C38ff8E64F97016a1645c",
+						"0x00a0a24b9f0e5ec7aa4c7389b8302fd0123194de"
+					]
+				},
+				"validateScoreTransition": 1000000,
+				"validateStepTransition": 1500000,
+				"maximumUncleCountTransition": 5067000,
+				"maximumUncleCount": 0
+			}
+		}
+	},
+	"params": {
+		"gasLimitBoundDivisor": "0x400",
+		"registrar" : "0xfAb104398BBefbd47752E7702D9fE23047E1Bca3",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID" : "0x2A",
+		"forkBlock": 4297256,
+		"forkCanonHash": "0x0a66d93c2f727dca618fabaf70c39b37018c73d78b939d8b11efbbd09034778f",
+		"validateReceiptsTransition" : 1000000,
+		"eip155Transition": 1000000,
+		"validateChainIdTransition": 1000000,
+		"eip140Transition": 5067000,
+		"eip211Transition": 5067000,
+		"eip214Transition": 5067000,
+		"eip658Transition": 5067000,
+		"wasmActivationTransition": 10
+	},
+	"genesis": {
+		"seal": {
+			"authorityRound": {
+				"step": "0x0",
+				"signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+			}
+		},
+		"difficulty": "0x20000",
+		"gasLimit": "0x5B8D80"
+	},
+	"accounts": {
+		"0x0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0x0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0x0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 5067000, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 5067000, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 5067000, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 5067000, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
+		"0x00521965e7bd230323c423d96c657db5b79d099f": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }
+	},
+	"nodes": [
+		"enode://56abaf065581a5985b8c5f4f88bd202526482761ba10be9bfdcd14846dd01f652ec33fde0f8c0fd1db19b59a4c04465681fcef50e11380ca88d25996191c52de@40.71.221.215:30303",
+		"enode://d07827483dc47b368eaf88454fb04b41b7452cf454e194e2bd4c14f98a3278fed5d819dbecd0d010407fc7688d941ee1e58d4f9c6354d3da3be92f55c17d7ce3@52.166.117.77:30303",
+		"enode://8fa162563a8e5a05eef3e1cd5abc5828c71344f7277bb788a395cce4a0e30baf2b34b92fe0b2dbbba2313ee40236bae2aab3c9811941b9f5a7e8e90aaa27ecba@52.165.239.18:30303",
+		"enode://7e2e7f00784f516939f94e22bdc6cf96153603ca2b5df1c7cc0f90a38e7a2f218ffb1c05b156835e8b49086d11fdd1b3e2965be16baa55204167aa9bf536a4d9@52.243.47.56:30303",
+		"enode://0518a3d35d4a7b3e8c433e7ffd2355d84a1304ceb5ef349787b556197f0c87fad09daed760635b97d52179d645d3e6d16a37d2cc0a9945c2ddf585684beb39ac@40.68.248.100:30303"
+	]
+}
diff --git a/ethcore/res/ethereum/mcip3_test.json b/ethcore/res/ethereum/mcip3_test.json
new file mode 100644
index 0000000000000000000000000000000000000000..d2e5ec8b6bceddde13ba10c7dba043e14c810548
--- /dev/null
+++ b/ethcore/res/ethereum/mcip3_test.json
@@ -0,0 +1,168 @@
+{
+  "name":"MCIP3 Test",
+  "dataDir":"mcip3test",
+  "engine":{
+    "Ethash":{
+      "params":{
+        "minimumDifficulty":"0x020000",
+        "difficultyBoundDivisor":"0x0800",
+        "durationLimit":"0x0d",
+        "homesteadTransition":"0x118c30",
+        "eip100bTransition":"0x7fffffffffffff",
+        "eip150Transition":"0x7fffffffffffff",
+        "eip160Transition":"0x7fffffffffffff",
+        "eip161abcTransition":"0x7fffffffffffff",
+        "eip161dTransition":"0x7fffffffffffff",
+        "eip649Transition":"0x7fffffffffffff",
+        "blockReward":"0x1105a0185b50a80000",
+        "mcip3Transition":"0x00",
+        "mcip3MinerReward":"0xd8d726b7177a80000",
+        "mcip3UbiReward":"0x2b5e3af16b1880000",
+        "mcip3UbiContract":"0x00efdd5883ec628983e9063c7d969fe268bbf310",
+        "mcip3DevReward":"0xc249fdd327780000",
+        "mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536"
+      }
+    }
+  },
+  "params":{
+    "gasLimitBoundDivisor":"0x0400",
+    "registrar":"0x5C271c4C9A67E7D73b7b3669d47504741354f21D",
+    "accountStartNonce":"0x00",
+    "maximumExtraDataSize":"0x20",
+    "minGasLimit":"0x1388",
+    "networkID":"0x76740b",
+    "forkBlock":"0x5b6",
+    "forkCanonHash":"0xa5e88ad9e34d113e264e307bc27e8471452c8fc13780324bb3abb96fd0558343",
+    "eip86Transition":"0x7fffffffffffff",
+    "eip98Transition":"0x7fffffffffffff",
+    "eip140Transition":"0x7fffffffffffff",
+    "eip155Transition":"0x7fffffffffffff",
+    "eip211Transition":"0x7fffffffffffff",
+    "eip214Transition":"0x7fffffffffffff",
+    "eip658Transition":"0x7fffffffffffff",
+    "maxCodeSize":"0x6000",
+    "maxCodeSizeTransition": "0x7fffffffffffff"
+  },
+  "genesis":{
+    "seal":{
+      "ethereum":{
+        "nonce":"0x000000000000002a",
+        "mixHash":"0x00000000000000000000000000000000000000647572616c65787365646c6578"
+      }
+    },
+    "difficulty":"0x3d0900",
+    "author":"0x0000000000000000000000000000000000000000",
+    "timestamp":"0x00",
+    "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+    "extraData":"",
+    "gasLimit":"0x7a1200"
+  },
+  "nodes":[
+    "enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303",
+    "enode://3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99@13.93.211.84:30303",
+    "enode://78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d@191.235.84.50:30303",
+    "enode://158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6@13.75.154.138:30303",
+    "enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
+    "enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303",
+    "enode://d302f52c8789ad87ee528f1431a67f1aa646c9bec17babb4665dfb3d61de5b9119a70aa77b2147a5f28854092ba09769323c1c552a6ac6f6a34cbcf767e2d2fe@158.69.248.48:30303",
+    "enode://c72564bce8331ae298fb8ece113a456e3927d7e5989c2be3e445678b3600579f722410ef9bbfe339335d676af77343cb21b5b1703b7bebc32be85fce937a2220@191.252.185.71:30303",
+    "enode://e3ae4d25ee64791ff98bf17c37acf90933359f2505c00f65c84f6863231a32a94153cadb0a462e428f18f35ded6bd91cd91033d26576a28558c22678be9cfaee@5.63.158.137:35555"
+  ],
+  "accounts":{
+    "0000000000000000000000000000000000000001":{
+      "balance":"1",
+      "builtin":{
+        "name":"ecrecover",
+        "pricing":{
+          "linear":{
+            "base":3000,
+            "word":0
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000002":{
+      "balance":"1",
+      "builtin":{
+        "name":"sha256",
+        "pricing":{
+          "linear":{
+            "base":60,
+            "word":12
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000003":{
+      "balance":"1",
+      "builtin":{
+        "name":"ripemd160",
+        "pricing":{
+          "linear":{
+            "base":600,
+            "word":120
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000004":{
+      "balance":"1",
+      "builtin":{
+        "name":"identity",
+        "pricing":{
+          "linear":{
+            "base":15,
+            "word":3
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000005":{
+      "builtin":{
+        "name":"modexp",
+        "activate_at":"0x7fffffffffffff",
+        "pricing":{
+          "modexp":{
+            "divisor":20
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000006":{
+      "builtin":{
+        "name":"alt_bn128_add",
+        "activate_at":"0x7fffffffffffff",
+        "pricing":{
+          "linear":{
+            "base":500,
+            "word":0
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000007":{
+      "builtin":{
+        "name":"alt_bn128_mul",
+        "activate_at":"0x7fffffffffffff",
+        "pricing":{
+          "linear":{
+            "base":40000,
+            "word":0
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000008":{
+      "builtin":{
+        "name":"alt_bn128_pairing",
+        "activate_at":"0x7fffffffffffff",
+        "pricing":{
+          "alt_bn128_pairing":{
+            "base":100000,
+            "pair":80000
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/ethcore/res/ethereum/mcip6_byz.json b/ethcore/res/ethereum/mcip6_byz.json
new file mode 100644
index 0000000000000000000000000000000000000000..8028e6b1bbbb52370bb7a2c765a3697c4fc08af6
--- /dev/null
+++ b/ethcore/res/ethereum/mcip6_byz.json
@@ -0,0 +1,161 @@
+{
+  "name":"Musicoin Byzantium Test",
+  "dataDir":"mcip6test",
+  "engine":{
+    "Ethash":{
+      "params":{
+        "minimumDifficulty":"0x020000",
+        "difficultyBoundDivisor":"0x0800",
+        "durationLimit":"0x0d",
+        "homesteadTransition":"0x17",
+        "eip100bTransition":"0x2a",
+        "eip150Transition":"0x2a",
+        "eip160Transition":"0x7fffffffffffff",
+        "eip161abcTransition":"0x7fffffffffffff",
+        "eip161dTransition":"0x7fffffffffffff",
+        "eip649Transition":"0x2a",
+        "blockReward":"0x1105a0185b50a80000",
+        "mcip3Transition":"0x17",
+        "mcip3MinerReward":"0xd8d726b7177a80000",
+        "mcip3UbiReward":"0x2b5e3af16b1880000",
+        "mcip3UbiContract":"0x00efdd5883ec628983e9063c7d969fe268bbf310",
+        "mcip3DevReward":"0xc249fdd327780000",
+        "mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536"
+      }
+    }
+  },
+  "params":{
+    "gasLimitBoundDivisor":"0x0400",
+    "registrar":"0x5C271c4C9A67E7D73b7b3669d47504741354f21D",
+    "accountStartNonce":"0x00",
+    "maximumExtraDataSize":"0x20",
+    "minGasLimit":"0x1388",
+    "networkID":"0x76740c",
+    "forkBlock":"0x2b",
+    "forkCanonHash":"0x23c3171e864a5d513a3ef85e4cf86dac4cc36b89e5b8e63bf0ebcca68b9e43c9",
+    "eip86Transition":"0x7fffffffffffff",
+    "eip98Transition":"0x7fffffffffffff",
+    "eip140Transition":"0x2a",
+    "eip155Transition":"0x2a",
+    "eip211Transition":"0x2a",
+    "eip214Transition":"0x2a",
+    "eip658Transition":"0x2a",
+    "maxCodeSize":"0x6000",
+    "maxCodeSizeTransition": "0x7fffffffffffff"
+  },
+  "genesis":{
+    "seal":{
+      "ethereum":{
+        "nonce":"0x000000000000002a",
+        "mixHash":"0x00000000000000000000000000000000000000647572616c65787365646c6578"
+      }
+    },
+    "difficulty":"0x3d0900",
+    "author":"0x0000000000000000000000000000000000000000",
+    "timestamp":"0x00",
+    "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+    "extraData":"",
+    "gasLimit":"0x7a1200"
+  },
+  "nodes":[
+    "enode://5ddc110733f6d34101973cdef3f9b43484159acf6f816d3b1ee92bc3c98ea453e857bb1207edf0ec0242008ab3a0f9f05eeaee99d47bd414c08a5bdf4847de13@176.9.3.148:30303",
+		"enode://38f074f4db8e64dfbaf87984bf290eef67772a901a7113d1b62f36216be152b8450c393d6fc562a5e38f04f99bc8f439a99010a230b1d92dc1df43bf0bd00615@176.9.3.148:30403"
+  ],
+  "accounts":{
+    "0000000000000000000000000000000000000001":{
+      "balance":"1",
+      "builtin":{
+        "name":"ecrecover",
+        "pricing":{
+          "linear":{
+            "base":3000,
+            "word":0
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000002":{
+      "balance":"1",
+      "builtin":{
+        "name":"sha256",
+        "pricing":{
+          "linear":{
+            "base":60,
+            "word":12
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000003":{
+      "balance":"1",
+      "builtin":{
+        "name":"ripemd160",
+        "pricing":{
+          "linear":{
+            "base":600,
+            "word":120
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000004":{
+      "balance":"1",
+      "builtin":{
+        "name":"identity",
+        "pricing":{
+          "linear":{
+            "base":15,
+            "word":3
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000005":{
+      "builtin":{
+        "name":"modexp",
+        "activate_at":"0x2a",
+        "pricing":{
+          "modexp":{
+            "divisor":20
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000006":{
+      "builtin":{
+        "name":"alt_bn128_add",
+        "activate_at":"0x2a",
+        "pricing":{
+          "linear":{
+            "base":500,
+            "word":0
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000007":{
+      "builtin":{
+        "name":"alt_bn128_mul",
+        "activate_at":"0x2a",
+        "pricing":{
+          "linear":{
+            "base":40000,
+            "word":0
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000008":{
+      "builtin":{
+        "name":"alt_bn128_pairing",
+        "activate_at":"0x2a",
+        "pricing":{
+          "alt_bn128_pairing":{
+            "base":100000,
+            "pair":80000
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/ethcore/res/ethereum/morden.json b/ethcore/res/ethereum/morden.json
index f316fdf5f950f85f054043ec37dc7307942cc061..04c5a1244418101943ed94a07cccf898d410334d 100644
--- a/ethcore/res/ethereum/morden.json
+++ b/ethcore/res/ethereum/morden.json
@@ -7,20 +7,21 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": 494000,
 				"eip150Transition": 1783000,
 				"eip160Transition": 1915000,
 				"ecip1010PauseTransition": 1915000,
 				"ecip1010ContinueTransition": 3415000,
-
+				"ecip1017EraRounds": 2000000,
 				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				"eip161dTransition": "0x7fffffffffffffff",
+				"bombDefuseTransition": 2300000
 			}
 		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar": "0x52dff57a8a1532e6afb3dc07e2af58bb9eb05b3d",
 		"accountStartNonce": "0x0100000",
 		"maximumExtraDataSize": "0x20",
@@ -30,7 +31,6 @@
 		"forkBlock": "0x1b34d8",
 		"forkCanonHash": "0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145",
 		"eip155Transition": 1915000,
-
 		"eip98Transition": "0x7fffffffffffff",
 		"eip86Transition": "0x7fffffffffffff"
 	},
@@ -49,11 +49,13 @@
 		"gasLimit": "0x2fefd8"
 	},
 	"nodes": [
-		"enode://e731347db0521f3476e6bbbb83375dcd7133a1601425ebd15fd10f3835fd4c304fba6282087ca5a0deeafadf0aa0d4fd56c3323331901c1f38bd181c283e3e35@128.199.55.137:30303",
-		"enode://ceb5c0f85eb994dbe9693bf46d99b03f6b838d17cc74e68d5eb003171ff39e5f120b17f965b267c319303f94d80b9d994b77062fb1486d76ce95d9f3d8fe1cb4@46.101.122.141:30303",
 		"enode://fb28713820e718066a2f5df6250ae9d07cff22f672dbf26be6c75d088f821a9ad230138ba492c533a80407d054b1436ef18e951bb65e6901553516c8dffe8ff0@104.155.176.151:30304",
 		"enode://afdc6076b9bf3e7d3d01442d6841071e84c76c73a7016cb4f35c0437df219db38565766234448f1592a07ba5295a867f0ce87b359bf50311ed0b830a2361392d@104.154.136.117:30403",
-		"enode://21101a9597b79e933e17bc94ef3506fe99a137808907aa8fefa67eea4b789792ad11fb391f38b00087f8800a2d3dff011572b62a31232133dd1591ac2d1502c8@104.198.71.200:30403"
+		"enode://21101a9597b79e933e17bc94ef3506fe99a137808907aa8fefa67eea4b789792ad11fb391f38b00087f8800a2d3dff011572b62a31232133dd1591ac2d1502c8@104.198.71.200:30403",
+		"enode://fd008499e9c4662f384b3cff23438879d31ced24e2d19504c6389bc6da6c882f9c2f8dbed972f7058d7650337f54e4ba17bb49c7d11882dd1731d26a6e62e3cb@35.187.57.94:30304",
+		"enode://30a1fd71f28aa6f66fe662af9ecc75f0a6980f06b71598f2b19d3dda04223fc0e53b47e40c9171d5014e9f5b59d9954de125782da592f5d95ea39066e2591d5d@104.237.131.102:30304",
+		"enode://7909d51011d8a153351169f21d3a7bbedb3be1e17d38c1f2fad06504dd5aa07a00f00845835d535fe702bf379c4d7209a51f4d1b723e0ca8b8732bd21fba3b30@139.162.133.42:30303",
+		"enode://a088dfb2f5305be9232e8071c5535f13718a4017e247a0b35074b807d43d99e022880c27302cdb5b1e98ad34c083dbbb483f2b17bdc66149bad037154d6ace96@139.162.127.72:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
diff --git a/ethcore/res/ethereum/musicoin.json b/ethcore/res/ethereum/musicoin.json
new file mode 100644
index 0000000000000000000000000000000000000000..efe81c58821e9c050353dfd1ff1347f71dda3503
--- /dev/null
+++ b/ethcore/res/ethereum/musicoin.json
@@ -0,0 +1,165 @@
+{
+  "name":"Musicoin",
+  "dataDir":"musicoin",
+  "engine":{
+    "Ethash":{
+      "params":{
+        "minimumDifficulty":"0x020000",
+        "difficultyBoundDivisor":"0x0800",
+        "durationLimit":"0x0d",
+        "homesteadTransition":"0x118c30",
+        "eip100bTransition":"0x21e88e",
+        "eip150Transition":"0x21e88e",
+        "eip160Transition":"0x7fffffffffffff",
+        "eip161abcTransition":"0x7fffffffffffff",
+        "eip161dTransition":"0x7fffffffffffff",
+        "eip649Transition":"0x21e88e",
+        "blockReward":"0x1105a0185b50a80000",
+        "mcip3Transition":"0x124f81",
+        "mcip3MinerReward":"0xd8d726b7177a80000",
+        "mcip3UbiReward":"0x2b5e3af16b1880000",
+        "mcip3UbiContract":"0x00efdd5883ec628983e9063c7d969fe268bbf310",
+        "mcip3DevReward":"0xc249fdd327780000",
+        "mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536"
+      }
+    }
+  },
+  "params":{
+    "gasLimitBoundDivisor":"0x0400",
+    "registrar":"0x5C271c4C9A67E7D73b7b3669d47504741354f21D",
+    "accountStartNonce":"0x00",
+    "maximumExtraDataSize":"0x20",
+    "minGasLimit":"0x1388",
+    "networkID":"0x76740f",
+    "forkBlock":"0x1d8015",
+    "forkCanonHash":"0x380602acf82b629a0be6b5adb2b4a801e960a07dc8261bf196d21befdbb8f2f9",
+    "eip86Transition":"0x7fffffffffffff",
+    "eip98Transition":"0x7fffffffffffff",
+    "eip140Transition":"0x21e88e",
+    "eip155Transition":"0x21e88e",
+    "eip211Transition":"0x21e88e",
+    "eip214Transition":"0x21e88e",
+    "eip658Transition":"0x21e88e",
+    "maxCodeSize":"0x6000",
+    "maxCodeSizeTransition": "0x7fffffffffffff"
+  },
+  "genesis":{
+    "seal":{
+      "ethereum":{
+        "nonce":"0x000000000000002a",
+        "mixHash":"0x00000000000000000000000000000000000000647572616c65787365646c6578"
+      }
+    },
+    "difficulty":"0x3d0900",
+    "author":"0x0000000000000000000000000000000000000000",
+    "timestamp":"0x00",
+    "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+    "extraData":"",
+    "gasLimit":"0x7a1200"
+  },
+  "nodes":[
+    "enode://09fcd36d553044c8b499b9b9e13a228ffd99572c513f77073d41f009717c464cd4399c0e665d6aff1590324254ee4e698b2b2533b1998dd04d896b9d6aff7895@35.185.67.35:30303",
+    "enode://89e51a34770a0badf8ea18c4c4d2c361cde707abd60031d99b1ab3010363e1898230a516ddb37d974af8d8db1b322779d7fe0caae0617bed4924d1b4968cf92b@35.231.48.142:30303",
+    "enode://b58c0c71f08864c0cf7fa9dea2c4cbefae5ae7a36cc30d286603b24982d25f3ccc056b589119324c51768fc2054b8c529ecf682e06e1e9980170b93ff194ed7a@132.148.132.9:30303",
+    "enode://d302f52c8789ad87ee528f1431a67f1aa646c9bec17babb4665dfb3d61de5b9119a70aa77b2147a5f28854092ba09769323c1c552a6ac6f6a34cbcf767e2d2fe@158.69.248.48:30303",
+    "enode://c72564bce8331ae298fb8ece113a456e3927d7e5989c2be3e445678b3600579f722410ef9bbfe339335d676af77343cb21b5b1703b7bebc32be85fce937a2220@191.252.185.71:30303",
+    "enode://e3ae4d25ee64791ff98bf17c37acf90933359f2505c00f65c84f6863231a32a94153cadb0a462e428f18f35ded6bd91cd91033d26576a28558c22678be9cfaee@5.63.158.137:35555"
+  ],
+  "accounts":{
+    "0000000000000000000000000000000000000001":{
+      "balance":"1",
+      "builtin":{
+        "name":"ecrecover",
+        "pricing":{
+          "linear":{
+            "base":3000,
+            "word":0
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000002":{
+      "balance":"1",
+      "builtin":{
+        "name":"sha256",
+        "pricing":{
+          "linear":{
+            "base":60,
+            "word":12
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000003":{
+      "balance":"1",
+      "builtin":{
+        "name":"ripemd160",
+        "pricing":{
+          "linear":{
+            "base":600,
+            "word":120
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000004":{
+      "balance":"1",
+      "builtin":{
+        "name":"identity",
+        "pricing":{
+          "linear":{
+            "base":15,
+            "word":3
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000005":{
+      "builtin":{
+        "name":"modexp",
+        "activate_at":"0x21e88e",
+        "pricing":{
+          "modexp":{
+            "divisor":20
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000006":{
+      "builtin":{
+        "name":"alt_bn128_add",
+        "activate_at":"0x21e88e",
+        "pricing":{
+          "linear":{
+            "base":500,
+            "word":0
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000007":{
+      "builtin":{
+        "name":"alt_bn128_mul",
+        "activate_at":"0x21e88e",
+        "pricing":{
+          "linear":{
+            "base":40000,
+            "word":0
+          }
+        }
+      }
+    },
+    "0000000000000000000000000000000000000008":{
+      "builtin":{
+        "name":"alt_bn128_pairing",
+        "activate_at":"0x21e88e",
+        "pricing":{
+          "alt_bn128_pairing":{
+            "base":100000,
+            "pair":80000
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/ethcore/res/ethereum/olympic.json b/ethcore/res/ethereum/olympic.json
index c73dcb815c53b3d82c6be3072e8fb69393e55898..6854f2b78a94ac33c6dc207dd3dac87f72253afb 100644
--- a/ethcore/res/ethereum/olympic.json
+++ b/ethcore/res/ethereum/olympic.json
@@ -6,6 +6,7 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x08",
+				"blockReward": "0x14D1120D7B160000",
 				"homesteadTransition": "0x7fffffffffffffff",
 				"eip150Transition": "0x7fffffffffffffff",
 				"eip160Transition": "0x7fffffffffffffff",
@@ -16,7 +17,6 @@
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x14D1120D7B160000",
 		"registrar": "5e70c0bbcd5636e0f9f9316e9f8633feb64d4050",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x0400",
diff --git a/ethcore/res/ethereum/ropsten.json b/ethcore/res/ethereum/ropsten.json
index 1706c433b38904fe44cbaf7f96626d83d01cae51..6aad92505d973f2e6c41cf68e41626caf68a60f2 100644
--- a/ethcore/res/ethereum/ropsten.json
+++ b/ethcore/res/ethereum/ropsten.json
@@ -7,18 +7,20 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": 0,
 				"eip150Transition": 0,
 				"eip160Transition": 10,
 				"eip161abcTransition": 10,
 				"eip161dTransition": 10,
-				"maxCodeSize": 24576
+				"eip649Reward": "0x29A2241AF62C0000",
+				"eip100bTransition": 1700000,
+				"eip649Transition": 1700000
 			}
 		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar": "0x81a4b044831c4f12ba601adb9274516939e9b8a2",
 		"accountStartNonce": "0x0",
 		"maximumExtraDataSize": "0x20",
@@ -26,10 +28,15 @@
 		"networkID" : "0x3",
 		"forkBlock": 641350,
 		"forkCanonHash": "0x8033403e9fe5811a7b6d6b469905915de1c59207ce2172cbcf5d6ff14fa6a2eb",
+		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": 10,
 		"eip155Transition": 10,
-
 		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff"
+		"eip86Transition": "0x7fffffffffffff",
+		"eip140Transition": 1700000,
+		"eip211Transition": 1700000,
+		"eip214Transition": 1700000,
+		"eip658Transition": 1700000
 	},
 	"genesis": {
 		"seal": {
@@ -46,19 +53,21 @@
 		"gasLimit": "0x1000000"
 	},
 	"nodes": [
-		"enode://20c9ad97c081d63397d7b685a412227a40e23c8bdc6688c6f37e97cfbc22d2b4d1db1510d8f61e6a8866ad7f0e17c02b14182d37ea7c3c8b9c2683aeb6b733a1@52.169.14.227:30303",
-		"enode://6ce05930c72abc632c58e2e4324f7c7ea478cec0ed4fa2528982cf34483094e9cbc9216e7aa349691242576d552a2a56aaeae426c5303ded677ce455ba1acd9d@13.84.180.240:30303"
+		"enode://6332792c4a00e3e4ee0926ed89e0d27ef985424d97b6a45bf0f23e51f0dcb5e66b875777506458aea7af6f9e4ffb69f43f3778ee73c81ed9d34c51c4b16b0b0f@52.232.243.152:30303",
+		"enode://94c15d1b9e2fe7ce56e458b9a3b672ef11894ddedd0c6f247e0f1d3487f52b66208fb4aeb8179fce6e3a749ea93ed147c37976d67af557508d199d9594c35f09@192.81.208.223:30303",
+		"enode://30b7ab30a01c124a6cceca36863ece12c4f5fa68e3ba9b0b51407ccc002eeed3b3102d20a88f1c1d3c3154e2449317b8ef95090e77b312d5cc39354f86d5d606@52.176.7.10:30303",
+		"enode://865a63255b3bb68023b6bffd5095118fcc13e79dcf014fe4e47e065c350c7cc72af2e53eff895f11ba1bbb6a2b33271c1116ee870f266618eadfc2e78aa7349c@52.176.100.77:30303"
 	],
 	"accounts": {
+		"0000000000000000000000000000000000000000": { "balance": "1" },
 		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "0", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
 		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "0", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "0", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "0", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"0000000000000000000000000000000000000000": { "balance": "1" },
-		"0000000000000000000000000000000000000005": { "balance": "1" },
-		"0000000000000000000000000000000000000006": { "balance": "1" },
-		"0000000000000000000000000000000000000007": { "balance": "1" },
-		"0000000000000000000000000000000000000008": { "balance": "1" },
+		"0000000000000000000000000000000000000005": { "balance": "1", "nonce": "0", "builtin": { "name": "modexp", "activate_at": 1700000, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "balance": "1", "nonce": "0", "builtin": { "name": "alt_bn128_add", "activate_at": 1700000, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "nonce": "0", "builtin": { "name": "alt_bn128_mul", "activate_at": 1700000, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "nonce": "0", "builtin": { "name": "alt_bn128_pairing", "activate_at": 1700000, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"0000000000000000000000000000000000000009": { "balance": "1" },
 		"000000000000000000000000000000000000000a": { "balance": "0" },
 		"000000000000000000000000000000000000000b": { "balance": "0" },
diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests
index ef191fdc61cf76cdb9cdc147465fb447304b0ed2..b6011c3fb567d7178915574de0a8d4b5331fe725 160000
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@@ -1 +1 @@
-Subproject commit ef191fdc61cf76cdb9cdc147465fb447304b0ed2
+Subproject commit b6011c3fb567d7178915574de0a8d4b5331fe725
diff --git a/ethcore/res/ethereum/transition_test.json b/ethcore/res/ethereum/transition_test.json
index 409210a7694d22831adcb780f83fa045827f1305..7c18fce4e544d08576df823f0153e45169d60ccd 100644
--- a/ethcore/res/ethereum/transition_test.json
+++ b/ethcore/res/ethereum/transition_test.json
@@ -1,150 +1,38 @@
 {
-	"name": "EIP150.1b hard-fork consensus test",
+	"name": "Transition consensus test spec template",
 	"engine": {
 		"Ethash": {
 			"params": {
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
-				"homesteadTransition": "0x5",
-				"daoHardforkTransition": "0x8",
-				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
-				"daoHardforkAccounts": [
-					"0xd4fe7bc31cedb7bfb8a345f31e668033056b2728",
-					"0xb3fb0e5aba0e20e5c49d252dfd30e102b171a425",
-					"0x2c19c7f9ae8b751e37aeb2d93a699722395ae18f",
-					"0xecd135fa4f61a655311e86238c92adcd779555d2",
-					"0x1975bd06d486162d5dc297798dfc41edd5d160a7",
-					"0xa3acf3a1e16b1d7c315e23510fdd7847b48234f6",
-					"0x319f70bab6845585f412ec7724b744fec6095c85",
-					"0x06706dd3f2c9abf0a21ddcc6941d9b86f0596936",
-					"0x5c8536898fbb74fc7445814902fd08422eac56d0",
-					"0x6966ab0d485353095148a2155858910e0965b6f9",
-					"0x779543a0491a837ca36ce8c635d6154e3c4911a6",
-					"0x2a5ed960395e2a49b1c758cef4aa15213cfd874c",
-					"0x5c6e67ccd5849c0d29219c4f95f1a7a93b3f5dc5",
-					"0x9c50426be05db97f5d64fc54bf89eff947f0a321",
-					"0x200450f06520bdd6c527622a273333384d870efb",
-					"0xbe8539bfe837b67d1282b2b1d61c3f723966f049",
-					"0x6b0c4d41ba9ab8d8cfb5d379c69a612f2ced8ecb",
-					"0xf1385fb24aad0cd7432824085e42aff90886fef5",
-					"0xd1ac8b1ef1b69ff51d1d401a476e7e612414f091",
-					"0x8163e7fb499e90f8544ea62bbf80d21cd26d9efd",
-					"0x51e0ddd9998364a2eb38588679f0d2c42653e4a6",
-					"0x627a0a960c079c21c34f7612d5d230e01b4ad4c7",
-					"0xf0b1aa0eb660754448a7937c022e30aa692fe0c5",
-					"0x24c4d950dfd4dd1902bbed3508144a54542bba94",
-					"0x9f27daea7aca0aa0446220b98d028715e3bc803d",
-					"0xa5dc5acd6a7968a4554d89d65e59b7fd3bff0f90",
-					"0xd9aef3a1e38a39c16b31d1ace71bca8ef58d315b",
-					"0x63ed5a272de2f6d968408b4acb9024f4cc208ebf",
-					"0x6f6704e5a10332af6672e50b3d9754dc460dfa4d",
-					"0x77ca7b50b6cd7e2f3fa008e24ab793fd56cb15f6",
-					"0x492ea3bb0f3315521c31f273e565b868fc090f17",
-					"0x0ff30d6de14a8224aa97b78aea5388d1c51c1f00",
-					"0x9ea779f907f0b315b364b0cfc39a0fde5b02a416",
-					"0xceaeb481747ca6c540a000c1f3641f8cef161fa7",
-					"0xcc34673c6c40e791051898567a1222daf90be287",
-					"0x579a80d909f346fbfb1189493f521d7f48d52238",
-					"0xe308bd1ac5fda103967359b2712dd89deffb7973",
-					"0x4cb31628079fb14e4bc3cd5e30c2f7489b00960c",
-					"0xac1ecab32727358dba8962a0f3b261731aad9723",
-					"0x4fd6ace747f06ece9c49699c7cabc62d02211f75",
-					"0x440c59b325d2997a134c2c7c60a8c61611212bad",
-					"0x4486a3d68fac6967006d7a517b889fd3f98c102b",
-					"0x9c15b54878ba618f494b38f0ae7443db6af648ba",
-					"0x27b137a85656544b1ccb5a0f2e561a5703c6a68f",
-					"0x21c7fdb9ed8d291d79ffd82eb2c4356ec0d81241",
-					"0x23b75c2f6791eef49c69684db4c6c1f93bf49a50",
-					"0x1ca6abd14d30affe533b24d7a21bff4c2d5e1f3b",
-					"0xb9637156d330c0d605a791f1c31ba5890582fe1c",
-					"0x6131c42fa982e56929107413a9d526fd99405560",
-					"0x1591fc0f688c81fbeb17f5426a162a7024d430c2",
-					"0x542a9515200d14b68e934e9830d91645a980dd7a",
-					"0xc4bbd073882dd2add2424cf47d35213405b01324",
-					"0x782495b7b3355efb2833d56ecb34dc22ad7dfcc4",
-					"0x58b95c9a9d5d26825e70a82b6adb139d3fd829eb",
-					"0x3ba4d81db016dc2890c81f3acec2454bff5aada5",
-					"0xb52042c8ca3f8aa246fa79c3feaa3d959347c0ab",
-					"0xe4ae1efdfc53b73893af49113d8694a057b9c0d1",
-					"0x3c02a7bc0391e86d91b7d144e61c2c01a25a79c5",
-					"0x0737a6b837f97f46ebade41b9bc3e1c509c85c53",
-					"0x97f43a37f595ab5dd318fb46e7a155eae057317a",
-					"0x52c5317c848ba20c7504cb2c8052abd1fde29d03",
-					"0x4863226780fe7c0356454236d3b1c8792785748d",
-					"0x5d2b2e6fcbe3b11d26b525e085ff818dae332479",
-					"0x5f9f3392e9f62f63b8eac0beb55541fc8627f42c",
-					"0x057b56736d32b86616a10f619859c6cd6f59092a",
-					"0x9aa008f65de0b923a2a4f02012ad034a5e2e2192",
-					"0x304a554a310c7e546dfe434669c62820b7d83490",
-					"0x914d1b8b43e92723e64fd0a06f5bdb8dd9b10c79",
-					"0x4deb0033bb26bc534b197e61d19e0733e5679784",
-					"0x07f5c1e1bc2c93e0402f23341973a0e043f7bf8a",
-					"0x35a051a0010aba705c9008d7a7eff6fb88f6ea7b",
-					"0x4fa802324e929786dbda3b8820dc7834e9134a2a",
-					"0x9da397b9e80755301a3b32173283a91c0ef6c87e",
-					"0x8d9edb3054ce5c5774a420ac37ebae0ac02343c6",
-					"0x0101f3be8ebb4bbd39a2e3b9a3639d4259832fd9",
-					"0x5dc28b15dffed94048d73806ce4b7a4612a1d48f",
-					"0xbcf899e6c7d9d5a215ab1e3444c86806fa854c76",
-					"0x12e626b0eebfe86a56d633b9864e389b45dcb260",
-					"0xa2f1ccba9395d7fcb155bba8bc92db9bafaeade7",
-					"0xec8e57756626fdc07c63ad2eafbd28d08e7b0ca5",
-					"0xd164b088bd9108b60d0ca3751da4bceb207b0782",
-					"0x6231b6d0d5e77fe001c2a460bd9584fee60d409b",
-					"0x1cba23d343a983e9b5cfd19496b9a9701ada385f",
-					"0xa82f360a8d3455c5c41366975bde739c37bfeb8a",
-					"0x9fcd2deaff372a39cc679d5c5e4de7bafb0b1339",
-					"0x005f5cee7a43331d5a3d3eec71305925a62f34b6",
-					"0x0e0da70933f4c7849fc0d203f5d1d43b9ae4532d",
-					"0xd131637d5275fd1a68a3200f4ad25c71a2a9522e",
-					"0xbc07118b9ac290e4622f5e77a0853539789effbe",
-					"0x47e7aa56d6bdf3f36be34619660de61275420af8",
-					"0xacd87e28b0c9d1254e868b81cba4cc20d9a32225",
-					"0xadf80daec7ba8dcf15392f1ac611fff65d94f880",
-					"0x5524c55fb03cf21f549444ccbecb664d0acad706",
-					"0x40b803a9abce16f50f36a77ba41180eb90023925",
-					"0xfe24cdd8648121a43a7c86d289be4dd2951ed49f",
-					"0x17802f43a0137c506ba92291391a8a8f207f487d",
-					"0x253488078a4edf4d6f42f113d1e62836a942cf1a",
-					"0x86af3e9626fce1957c82e88cbf04ddf3a2ed7915",
-					"0xb136707642a4ea12fb4bae820f03d2562ebff487",
-					"0xdbe9b615a3ae8709af8b93336ce9b477e4ac0940",
-					"0xf14c14075d6c4ed84b86798af0956deef67365b5",
-					"0xca544e5c4687d109611d0f8f928b53a25af72448",
-					"0xaeeb8ff27288bdabc0fa5ebb731b6f409507516c",
-					"0xcbb9d3703e651b0d496cdefb8b92c25aeb2171f7",
-					"0x6d87578288b6cb5549d5076a207456a1f6a63dc0",
-					"0xb2c6f0dfbb716ac562e2d85d6cb2f8d5ee87603e",
-					"0xaccc230e8a6e5be9160b8cdf2864dd2a001c28b6",
-					"0x2b3455ec7fedf16e646268bf88846bd7a2319bb2",
-					"0x4613f3bca5c44ea06337a9e439fbc6d42e501d0a",
-					"0xd343b217de44030afaa275f54d31a9317c7f441e",
-					"0x84ef4b2357079cd7a7c69fd7a37cd0609a679106",
-					"0xda2fef9e4a3230988ff17df2165440f37e8b1708",
-					"0xf4c64518ea10f995918a454158c6b61407ea345c",
-					"0x7602b46df5390e432ef1c307d4f2c9ff6d65cc97",
-					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
-					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
-				],
-				"eip150Transition": "0xa",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				"blockReward": "0x4563918244F40000",
+				"homesteadTransition": "0",
+				"eip150Transition": "0",
+				"eip160Transition": "0",
+				"eip161abcTransition": "0",
+				"eip161dTransition": "0",
+				"eip649Reward": "0x29A2241AF62C0000",
+				"eip100bTransition": "5",
+				"eip649Transition": "5"
 			}
 		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
-		"blockReward": "0x4563918244F40000",
 		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"accountStartNonce": "0x00",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
-		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff",
-		"eip155Transition": "0x7fffffffffffffff"
+		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": "0",
+		"eip98Transition": "5",
+		"eip140Transition": "5",
+		"eip211Transition": "5",
+		"eip214Transition": "5",
+		"eip155Transition": "5",
+		"eip658Transition": "5"
 	},
 	"genesis": {
 		"seal": {
@@ -161,9 +49,13 @@
 		"gasLimit": "0x1388"
 	},
 	"accounts": {
-		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }
+		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "5", "pricing": { "modexp": { "divisor": 100 } } } },
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "5", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "5", "pricing": { "linear": { "base": 2000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "5", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
 	}
 }
diff --git a/ethcore/res/instant_seal.json b/ethcore/res/instant_seal.json
index f59feb0bda464c06e3a3612bb147ec09ceeee7ae..e01c927ffdc39e9dd8d88ef475aac1496df8e4ba 100644
--- a/ethcore/res/instant_seal.json
+++ b/ethcore/res/instant_seal.json
@@ -8,7 +8,12 @@
 		"accountStartNonce": "0x0",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x11"
+		"networkID" : "0x11",
+		"registrar" : "0x0000000000000000000000000000000000001337",
+		"eip140Transition": "0x0",
+		"eip211Transition": "0x0",
+		"eip214Transition": "0x0",
+		"eip658Transition": "0x0"
 	},
 	"genesis": {
 		"seal": {
@@ -26,7 +31,11 @@
 		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"0000000000000000000000000000000000000005": { "balance": "1", "constructor": "0x606060405233600060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550670de0b6b3a764000060035534610000575b612904806100666000396000f3006060604052361561013c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306b2ff471461014157806313af40351461018c57806319362a28146101bf5780633f3935d114610248578063432ced04146102b75780634f39ca59146102eb5780636795dbcd1461032457806369fe0e2d146103c857806379ce9fac146103fd5780638da5cb5b1461045557806390b97fc1146104a457806392698814146105245780639890220b1461055d578063ac4e73f914610584578063ac72c12014610612578063c3a358251461064b578063ddca3f43146106c3578063deb931a2146106e6578063df57b74214610747578063e30bd740146107a8578063eadf976014610862578063ef5454d6146108e7578063f25eb5c114610975578063f6d339e414610984575b610000565b3461000057610172600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610a1f565b604051808215151515815260200191505060405180910390f35b34610000576101bd600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610a81565b005b346100005761022e60048080356000191690602001909190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803560001916906020019091905050610ba2565b604051808215151515815260200191505060405180910390f35b346100005761029d600480803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050610dc9565b604051808215151515815260200191505060405180910390f35b6102d1600480803560001916906020019091905050611035565b604051808215151515815260200191505060405180910390f35b346100005761030a60048080356000191690602001909190505061115f565b604051808215151515815260200191505060405180910390f35b346100005761038660048080356000191690602001909190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050611378565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34610000576103e3600480803590602001909190505061140d565b604051808215151515815260200191505060405180910390f35b346100005761043b60048080356000191690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919050506114b4565b604051808215151515815260200191505060405180910390f35b34610000576104626115fb565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b346100005761050660048080356000191690602001909190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050611621565b60405180826000191660001916815260200191505060405180910390f35b34610000576105436004808035600019169060200190919050506116b2565b604051808215151515815260200191505060405180910390f35b346100005761056a611715565b604051808215151515815260200191505060405180910390f35b34610000576105f8600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611824565b604051808215151515815260200191505060405180910390f35b3461000057610631600480803560001916906020019091905050611d8b565b604051808215151515815260200191505060405180910390f35b34610000576106ad60048080356000191690602001909190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050611dee565b6040518082815260200191505060405180910390f35b34610000576106d0611e83565b6040518082815260200191505060405180910390f35b3461000057610705600480803560001916906020019091905050611e89565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3461000057610766600480803560001916906020019091905050611ed2565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34610000576107d9600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611f1b565b6040518080602001828103825283818151815260200191508051906020019080838360008314610828575b80518252602083111561082857602082019150602081019050602083039250610804565b505050905090810190601f1680156108545780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34610000576108cd60048080356000191690602001909190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803590602001909190505061200c565b604051808215151515815260200191505060405180910390f35b346100005761095b600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050612236565b604051808215151515815260200191505060405180910390f35b3461000057610982612425565b005b3461000057610a0560048080356000191690602001909190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050612698565b604051808215151515815260200191505060405180910390f35b60006000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290049050141590505b919050565b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610add57610b9f565b8073ffffffffffffffffffffffffffffffffffffffff16600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236460405180905060405180910390a380600060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b5b50565b6000833373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515610c1d57610dc1565b82600160008760001916600019168152602001908152602001600020600201856040518082805190602001908083835b60208310610c705780518252602082019150602081019050602083039250610c4d565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390208160001916905550836040518082805190602001908083835b60208310610cdf5780518252602082019150602081019050602083039250610cbc565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902085600019167fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea866040518080602001828103825283818151815260200191508051906020019080838360008314610d82575b805182526020831115610d8257602082019150602081019050602083039250610d5e565b505050905090810190601f168015610dae5780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b509392505050565b6000813373ffffffffffffffffffffffffffffffffffffffff1660016000836040518082805190602001908083835b60208310610e1b5780518252602082019150602081019050602083039250610df8565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515610ea45761102f565b82600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000209080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10610f2d57805160ff1916838001178555610f5b565b82800160010185558215610f5b579182015b82811115610f5a578251825591602001919060010190610f3f565b5b509050610f8091905b80821115610f7c576000816000905550600101610f64565b5090565b50503373ffffffffffffffffffffffffffffffffffffffff16836040518082805190602001908083835b60208310610fcd5780518252602082019150602081019050602083039250610faa565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f098ae8581bb8bd9af1beaf7f2e9f51f31a8e5a8bfada4e303a645d71d9c9192060405180905060405180910390a3600191505b5b50919050565b600081600060016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561109b57611159565b6003543410156110aa57611158565b3360016000856000191660001916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055503373ffffffffffffffffffffffffffffffffffffffff1683600019167f4963513eca575aba66fdcd25f267aae85958fe6fb97e75fa25d783f1a091a22160405180905060405180910390a3600191505b5b5b50919050565b6000813373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415156111da57611372565b6002600060016000866000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290046000825580601f1061127c57506112b3565b601f0160209004906000526020600020908101906112b291905b808211156112ae576000816000905550600101611296565b5090565b5b5060016000846000191660001916815260200190815260200160002060006000820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556001820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905550503373ffffffffffffffffffffffffffffffffffffffff1683600019167fef1961b4d2909dc23643b309bfe5c3e5646842d98c3a58517037ef3871185af360405180905060405180910390a3600191505b5b50919050565b6000600160008460001916600019168152602001908152602001600020600201826040518082805190602001908083835b602083106113cc57805182526020820191506020810190506020830392506113a9565b6001836020036101000a0380198251168184511680821785525050505050509050019150509081526020016040518091039020546001900490505b92915050565b6000600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561146b576114af565b816003819055507f6bbc57480a46553fa4d156ce702beef5f3ad66303b0ed1a5d4cb44966c6584c3826040518082815260200191505060405180910390a1600190505b5b919050565b6000823373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561152f576115f4565b8260016000866000191660001916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1685600019167f7b97c62130aa09acbbcbf7482630e756592496f1759eaf702f469cf64dfb779460405180905060405180910390a4600191505b5b5092915050565b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000600160008460001916600019168152602001908152602001600020600201826040518082805190602001908083835b602083106116755780518252602082019150602081019050602083039250611652565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390205490505b92915050565b6000600060016000846000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141590505b919050565b6000600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561177357611821565b7fdef931299fe61d176f949118058530c1f3f539dcb6950b4e372c9b835c33ca073073ffffffffffffffffffffffffffffffffffffffff16316040518082815260200191505060405180910390a13373ffffffffffffffffffffffffffffffffffffffff166108fc3073ffffffffffffffffffffffffffffffffffffffff16319081150290604051809050600060405180830381858888f19350505050151561181b57610000565b600190505b5b90565b60006000836040518082805190602001908083835b6020831061185c5780518252602082019150602081019050602083039250611839565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390203373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561190157611d83565b846040518082805190602001908083835b602083106119355780518252602082019150602081019050602083039250611912565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390209150600060016000846000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614158015611ab4575081600019166002600060016000866000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206040518082805460018160011615610100020316600290048015611aa15780601f10611a7f576101008083540402835291820191611aa1565b820191906000526020600020905b815481529060010190602001808311611a8d575b5050915050604051809103902060001916145b15611c79576002600060016000856000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290046000825580601f10611b5b5750611b92565b601f016020900490600052602060002090810190611b9191905b80821115611b8d576000816000905550600101611b75565b5090565b5b5060016000836000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16856040518082805190602001908083835b60208310611c1c5780518252602082019150602081019050602083039250611bf9565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f12491ad95fd945e444d88a894ffad3c21959880a4dcd8af99d4ae4ffc71d4abd60405180905060405180910390a35b8360016000846000191660001916815260200190815260200160002060010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508373ffffffffffffffffffffffffffffffffffffffff16856040518082805190602001908083835b60208310611d215780518252602082019150602081019050602083039250611cfe565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f728435a0031f6a04538fcdd24922a7e06bc7bc945db03e83d22122d1bc5f28df60405180905060405180910390a3600192505b5b505092915050565b6000600060016000846000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141590505b919050565b6000600160008460001916600019168152602001908152602001600020600201826040518082805190602001908083835b60208310611e425780518252602082019150602081019050602083039250611e1f565b6001836020036101000a0380198251168184511680821785525050505050509050019150509081526020016040518091039020546001900490505b92915050565b60035481565b600060016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690505b919050565b600060016000836000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690505b919050565b6020604051908101604052806000815250600260008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015611fff5780601f10611fd457610100808354040283529160200191611fff565b820191906000526020600020905b815481529060010190602001808311611fe257829003601f168201915b505050505090505b919050565b6000833373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415156120875761222e565b82600102600160008760001916600019168152602001908152602001600020600201856040518082805190602001908083835b602083106120dd57805182526020820191506020810190506020830392506120ba565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390208160001916905550836040518082805190602001908083835b6020831061214c5780518252602082019150602081019050602083039250612129565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902085600019167fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea8660405180806020018281038252838181518152602001915080519060200190808383600083146121ef575b8051825260208311156121ef576020820191506020810190506020830392506121cb565b505050905090810190601f16801561221b5780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b509392505050565b6000600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156122945761241f565b82600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000209080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061231d57805160ff191683800117855561234b565b8280016001018555821561234b579182015b8281111561234a57825182559160200191906001019061232f565b5b50905061237091905b8082111561236c576000816000905550600101612354565b5090565b50508173ffffffffffffffffffffffffffffffffffffffff16836040518082805190602001908083835b602083106123bd578051825260208201915060208101905060208303925061239a565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f098ae8581bb8bd9af1beaf7f2e9f51f31a8e5a8bfada4e303a645d71d9c9192060405180905060405180910390a3600190505b5b92915050565b3373ffffffffffffffffffffffffffffffffffffffff16600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060405180828054600181600116156101000203166002900480156124d65780601f106124b45761010080835404028352918201916124d6565b820191906000526020600020905b8154815290600101906020018083116124c2575b505091505060405180910390207f12491ad95fd945e444d88a894ffad3c21959880a4dcd8af99d4ae4ffc71d4abd60405180905060405180910390a360016000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060405180828054600181600116156101000203166002900480156125b05780601f1061258e5761010080835404028352918201916125b0565b820191906000526020600020905b81548152906001019060200180831161259c575b505091505060405180910390206000191660001916815260200190815260200160002060010160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290046000825580601f1061265d5750612694565b601f01602090049060005260206000209081019061269391905b8082111561268f576000816000905550600101612677565b5090565b5b505b565b6000833373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515612713576128d0565b8273ffffffffffffffffffffffffffffffffffffffff16600102600160008760001916600019168152602001908152602001600020600201856040518082805190602001908083835b6020831061277f578051825260208201915060208101905060208303925061275c565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390208160001916905550836040518082805190602001908083835b602083106127ee57805182526020820191506020810190506020830392506127cb565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902085600019167fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea866040518080602001828103825283818151815260200191508051906020019080838360008314612891575b8051825260208311156128915760208201915060208101905060208303925061286d565b505050905090810190601f1680156128bd5780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b5093925050505600a165627a7a7230582066b2da4773a0f1d81efe071c66b51c46868a871661efd18c0f629353ff4c1f9b0029" },
-		"0x00a329c0648769a73afac7f9381e08fb43dbea72": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }
+		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
+		"0000000000000000000000000000000000001337": { "balance": "1", "constructor": "0x606060405233600060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550670de0b6b3a764000060035534610000575b612904806100666000396000f3006060604052361561013c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306b2ff471461014157806313af40351461018c57806319362a28146101bf5780633f3935d114610248578063432ced04146102b75780634f39ca59146102eb5780636795dbcd1461032457806369fe0e2d146103c857806379ce9fac146103fd5780638da5cb5b1461045557806390b97fc1146104a457806392698814146105245780639890220b1461055d578063ac4e73f914610584578063ac72c12014610612578063c3a358251461064b578063ddca3f43146106c3578063deb931a2146106e6578063df57b74214610747578063e30bd740146107a8578063eadf976014610862578063ef5454d6146108e7578063f25eb5c114610975578063f6d339e414610984575b610000565b3461000057610172600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610a1f565b604051808215151515815260200191505060405180910390f35b34610000576101bd600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610a81565b005b346100005761022e60048080356000191690602001909190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803560001916906020019091905050610ba2565b604051808215151515815260200191505060405180910390f35b346100005761029d600480803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050610dc9565b604051808215151515815260200191505060405180910390f35b6102d1600480803560001916906020019091905050611035565b604051808215151515815260200191505060405180910390f35b346100005761030a60048080356000191690602001909190505061115f565b604051808215151515815260200191505060405180910390f35b346100005761038660048080356000191690602001909190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050611378565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34610000576103e3600480803590602001909190505061140d565b604051808215151515815260200191505060405180910390f35b346100005761043b60048080356000191690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919050506114b4565b604051808215151515815260200191505060405180910390f35b34610000576104626115fb565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b346100005761050660048080356000191690602001909190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050611621565b60405180826000191660001916815260200191505060405180910390f35b34610000576105436004808035600019169060200190919050506116b2565b604051808215151515815260200191505060405180910390f35b346100005761056a611715565b604051808215151515815260200191505060405180910390f35b34610000576105f8600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611824565b604051808215151515815260200191505060405180910390f35b3461000057610631600480803560001916906020019091905050611d8b565b604051808215151515815260200191505060405180910390f35b34610000576106ad60048080356000191690602001909190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050611dee565b6040518082815260200191505060405180910390f35b34610000576106d0611e83565b6040518082815260200191505060405180910390f35b3461000057610705600480803560001916906020019091905050611e89565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3461000057610766600480803560001916906020019091905050611ed2565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34610000576107d9600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611f1b565b6040518080602001828103825283818151815260200191508051906020019080838360008314610828575b80518252602083111561082857602082019150602081019050602083039250610804565b505050905090810190601f1680156108545780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34610000576108cd60048080356000191690602001909190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803590602001909190505061200c565b604051808215151515815260200191505060405180910390f35b346100005761095b600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050612236565b604051808215151515815260200191505060405180910390f35b3461000057610982612425565b005b3461000057610a0560048080356000191690602001909190803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050612698565b604051808215151515815260200191505060405180910390f35b60006000600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290049050141590505b919050565b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610add57610b9f565b8073ffffffffffffffffffffffffffffffffffffffff16600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236460405180905060405180910390a380600060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b5b50565b6000833373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515610c1d57610dc1565b82600160008760001916600019168152602001908152602001600020600201856040518082805190602001908083835b60208310610c705780518252602082019150602081019050602083039250610c4d565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390208160001916905550836040518082805190602001908083835b60208310610cdf5780518252602082019150602081019050602083039250610cbc565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902085600019167fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea866040518080602001828103825283818151815260200191508051906020019080838360008314610d82575b805182526020831115610d8257602082019150602081019050602083039250610d5e565b505050905090810190601f168015610dae5780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b509392505050565b6000813373ffffffffffffffffffffffffffffffffffffffff1660016000836040518082805190602001908083835b60208310610e1b5780518252602082019150602081019050602083039250610df8565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515610ea45761102f565b82600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000209080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10610f2d57805160ff1916838001178555610f5b565b82800160010185558215610f5b579182015b82811115610f5a578251825591602001919060010190610f3f565b5b509050610f8091905b80821115610f7c576000816000905550600101610f64565b5090565b50503373ffffffffffffffffffffffffffffffffffffffff16836040518082805190602001908083835b60208310610fcd5780518252602082019150602081019050602083039250610faa565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f098ae8581bb8bd9af1beaf7f2e9f51f31a8e5a8bfada4e303a645d71d9c9192060405180905060405180910390a3600191505b5b50919050565b600081600060016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561109b57611159565b6003543410156110aa57611158565b3360016000856000191660001916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055503373ffffffffffffffffffffffffffffffffffffffff1683600019167f4963513eca575aba66fdcd25f267aae85958fe6fb97e75fa25d783f1a091a22160405180905060405180910390a3600191505b5b5b50919050565b6000813373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415156111da57611372565b6002600060016000866000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290046000825580601f1061127c57506112b3565b601f0160209004906000526020600020908101906112b291905b808211156112ae576000816000905550600101611296565b5090565b5b5060016000846000191660001916815260200190815260200160002060006000820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556001820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905550503373ffffffffffffffffffffffffffffffffffffffff1683600019167fef1961b4d2909dc23643b309bfe5c3e5646842d98c3a58517037ef3871185af360405180905060405180910390a3600191505b5b50919050565b6000600160008460001916600019168152602001908152602001600020600201826040518082805190602001908083835b602083106113cc57805182526020820191506020810190506020830392506113a9565b6001836020036101000a0380198251168184511680821785525050505050509050019150509081526020016040518091039020546001900490505b92915050565b6000600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561146b576114af565b816003819055507f6bbc57480a46553fa4d156ce702beef5f3ad66303b0ed1a5d4cb44966c6584c3826040518082815260200191505060405180910390a1600190505b5b919050565b6000823373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561152f576115f4565b8260016000866000191660001916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1685600019167f7b97c62130aa09acbbcbf7482630e756592496f1759eaf702f469cf64dfb779460405180905060405180910390a4600191505b5b5092915050565b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000600160008460001916600019168152602001908152602001600020600201826040518082805190602001908083835b602083106116755780518252602082019150602081019050602083039250611652565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390205490505b92915050565b6000600060016000846000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141590505b919050565b6000600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561177357611821565b7fdef931299fe61d176f949118058530c1f3f539dcb6950b4e372c9b835c33ca073073ffffffffffffffffffffffffffffffffffffffff16316040518082815260200191505060405180910390a13373ffffffffffffffffffffffffffffffffffffffff166108fc3073ffffffffffffffffffffffffffffffffffffffff16319081150290604051809050600060405180830381858888f19350505050151561181b57610000565b600190505b5b90565b60006000836040518082805190602001908083835b6020831061185c5780518252602082019150602081019050602083039250611839565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390203373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561190157611d83565b846040518082805190602001908083835b602083106119355780518252602082019150602081019050602083039250611912565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390209150600060016000846000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614158015611ab4575081600019166002600060016000866000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206040518082805460018160011615610100020316600290048015611aa15780601f10611a7f576101008083540402835291820191611aa1565b820191906000526020600020905b815481529060010190602001808311611a8d575b5050915050604051809103902060001916145b15611c79576002600060016000856000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290046000825580601f10611b5b5750611b92565b601f016020900490600052602060002090810190611b9191905b80821115611b8d576000816000905550600101611b75565b5090565b5b5060016000836000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16856040518082805190602001908083835b60208310611c1c5780518252602082019150602081019050602083039250611bf9565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f12491ad95fd945e444d88a894ffad3c21959880a4dcd8af99d4ae4ffc71d4abd60405180905060405180910390a35b8360016000846000191660001916815260200190815260200160002060010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508373ffffffffffffffffffffffffffffffffffffffff16856040518082805190602001908083835b60208310611d215780518252602082019150602081019050602083039250611cfe565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f728435a0031f6a04538fcdd24922a7e06bc7bc945db03e83d22122d1bc5f28df60405180905060405180910390a3600192505b5b505092915050565b6000600060016000846000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141590505b919050565b6000600160008460001916600019168152602001908152602001600020600201826040518082805190602001908083835b60208310611e425780518252602082019150602081019050602083039250611e1f565b6001836020036101000a0380198251168184511680821785525050505050509050019150509081526020016040518091039020546001900490505b92915050565b60035481565b600060016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690505b919050565b600060016000836000191660001916815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690505b919050565b6020604051908101604052806000815250600260008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015611fff5780601f10611fd457610100808354040283529160200191611fff565b820191906000526020600020905b815481529060010190602001808311611fe257829003601f168201915b505050505090505b919050565b6000833373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415156120875761222e565b82600102600160008760001916600019168152602001908152602001600020600201856040518082805190602001908083835b602083106120dd57805182526020820191506020810190506020830392506120ba565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390208160001916905550836040518082805190602001908083835b6020831061214c5780518252602082019150602081019050602083039250612129565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902085600019167fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea8660405180806020018281038252838181518152602001915080519060200190808383600083146121ef575b8051825260208311156121ef576020820191506020810190506020830392506121cb565b505050905090810190601f16801561221b5780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b509392505050565b6000600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156122945761241f565b82600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000209080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061231d57805160ff191683800117855561234b565b8280016001018555821561234b579182015b8281111561234a57825182559160200191906001019061232f565b5b50905061237091905b8082111561236c576000816000905550600101612354565b5090565b50508173ffffffffffffffffffffffffffffffffffffffff16836040518082805190602001908083835b602083106123bd578051825260208201915060208101905060208303925061239a565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f098ae8581bb8bd9af1beaf7f2e9f51f31a8e5a8bfada4e303a645d71d9c9192060405180905060405180910390a3600190505b5b92915050565b3373ffffffffffffffffffffffffffffffffffffffff16600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060405180828054600181600116156101000203166002900480156124d65780601f106124b45761010080835404028352918201916124d6565b820191906000526020600020905b8154815290600101906020018083116124c2575b505091505060405180910390207f12491ad95fd945e444d88a894ffad3c21959880a4dcd8af99d4ae4ffc71d4abd60405180905060405180910390a360016000600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060405180828054600181600116156101000203166002900480156125b05780601f1061258e5761010080835404028352918201916125b0565b820191906000526020600020905b81548152906001019060200180831161259c575b505091505060405180910390206000191660001916815260200190815260200160002060010160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805460018160011615610100020316600290046000825580601f1061265d5750612694565b601f01602090049060005260206000209081019061269391905b8082111561268f576000816000905550600101612677565b5090565b5b505b565b6000833373ffffffffffffffffffffffffffffffffffffffff1660016000836000191660001916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515612713576128d0565b8273ffffffffffffffffffffffffffffffffffffffff16600102600160008760001916600019168152602001908152602001600020600201856040518082805190602001908083835b6020831061277f578051825260208201915060208101905060208303925061275c565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390208160001916905550836040518082805190602001908083835b602083106127ee57805182526020820191506020810190506020830392506127cb565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902085600019167fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea866040518080602001828103825283818151815260200191508051906020019080838360008314612891575b8051825260208311156128915760208201915060208101905060208303925061286d565b505050905090810190601f1680156128bd5780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b5093925050505600a165627a7a7230582066b2da4773a0f1d81efe071c66b51c46868a871661efd18c0f629353ff4c1f9b0029" },
+		"00a329c0648769a73afac7f9381e08fb43dbea72": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }
 	}
 }
diff --git a/ethcore/res/null.json b/ethcore/res/null.json
index 97ce1afc5668edc478dfb80547d878a14b3ceb04..345bb02b2769a35bb6c226e3bef534ff18f1a07d 100644
--- a/ethcore/res/null.json
+++ b/ethcore/res/null.json
@@ -1,7 +1,9 @@
 {
-	"name": "Morden",
+	"name": "Null",
 	"engine": {
-		"null": null
+		"null": {
+			"params": {}
+		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
@@ -9,7 +11,11 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x2",
-		"eip86Transition": "0x7fffffffffffff"
+		"eip86Transition": "0x7fffffffffffff",
+		"eip140Transition": "0x0",
+		"eip211Transition": "0x0",
+		"eip214Transition": "0x0",
+		"eip658Transition": "0x0"
 	},
 	"genesis": {
 		"seal": {
@@ -30,6 +36,10 @@
 		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "0", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "0", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "0", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "0" }
 	}
 }
diff --git a/ethcore/res/null_morden.json b/ethcore/res/null_morden.json
index b615cdc2953bff2ec94c6c457483badc074a6cc7..87dcee6fc9b1994870130ec56713e253384356ef 100644
--- a/ethcore/res/null_morden.json
+++ b/ethcore/res/null_morden.json
@@ -1,7 +1,9 @@
 {
 	"name": "Morden",
 	"engine": {
-		"null": null
+		"null": {
+			"params": {}
+		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
diff --git a/ethcore/res/null_morden_with_reward.json b/ethcore/res/null_morden_with_reward.json
new file mode 100644
index 0000000000000000000000000000000000000000..03c09c8afa416afa4bfb509dcb016b4706ddd6df
--- /dev/null
+++ b/ethcore/res/null_morden_with_reward.json
@@ -0,0 +1,38 @@
+{
+	"name": "Morden",
+	"engine": {
+		"null": {
+			"params": {
+				"blockReward": "0x4563918244F40000"
+			}
+		}
+	},
+	"params": {
+		"gasLimitBoundDivisor": "0x0400",
+		"accountStartNonce": "0x0",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID" : "0x2"
+	},
+	"genesis": {
+		"seal": {
+			"ethereum": {
+				"nonce": "0x00006d6f7264656e",
+				"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578"
+			}
+		},
+		"difficulty": "0x20000",
+		"author": "0x0000000000000000000000000000000000000000",
+		"timestamp": "0x00",
+		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"extraData": "0x",
+		"gasLimit": "0x2fefd8"
+	},
+	"accounts": {
+		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
+	}
+}
diff --git a/ethcore/res/tendermint.json b/ethcore/res/tendermint.json
index e7fa69ea0bc02c129a404471a9f5a4a8bd016d6a..3c60097a4e4e80e3e0be9bd03d6f19cdd2b9c298 100644
--- a/ethcore/res/tendermint.json
+++ b/ethcore/res/tendermint.json
@@ -21,7 +21,11 @@
 		"accountStartNonce": "0x0",
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
-		"networkID" : "0x2323"
+		"networkID" : "0x2323",
+		"eip140Transition": "0x0",
+		"eip211Transition": "0x0",
+		"eip214Transition": "0x0",
+		"eip658Transition": "0x0"
 	},
 	"genesis": {
 		"seal": {
@@ -45,6 +49,10 @@
 		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }
 	}
 }
diff --git a/ethcore/res/wasm-tests b/ethcore/res/wasm-tests
index 519b0b967cffd7d1236ef21698b1e6e415a048e9..fb111c82deff8759f54a5038d07cecc77cb5a663 160000
--- a/ethcore/res/wasm-tests
+++ b/ethcore/res/wasm-tests
@@ -1 +1 @@
-Subproject commit 519b0b967cffd7d1236ef21698b1e6e415a048e9
+Subproject commit fb111c82deff8759f54a5038d07cecc77cb5a663
diff --git a/ethcore/service/Cargo.toml b/ethcore/service/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..634769d0b5441c7dc307013263e1a33ec56e68f9
--- /dev/null
+++ b/ethcore/service/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "ethcore-service"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+ansi_term = "0.10"
+ethcore = { path = ".." }
+ethcore-io = { path = "../../util/io" }
+kvdb = { path = "../../util/kvdb" }
+kvdb-rocksdb = { path = "../../util/kvdb-rocksdb" }
+log = "0.3"
+stop-guard = { path = "../../util/stop-guard" }
+
+[dev-dependencies]
+tempdir = "0.3"
diff --git a/js/src/parity.js b/ethcore/service/src/lib.rs
similarity index 67%
rename from js/src/parity.js
rename to ethcore/service/src/lib.rs
index 9d414f90e7f1cf73e44be5005cee09ece84e44b7..907009ba324a253aa7182922a85f1d854c929389 100644
--- a/js/src/parity.js
+++ b/ethcore/service/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -14,18 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import 'whatwg-fetch';
+extern crate ansi_term;
+extern crate ethcore;
+extern crate ethcore_io as io;
+extern crate kvdb;
+extern crate kvdb_rocksdb;
+extern crate stop_guard;
 
-import es6Promise from 'es6-promise';
-es6Promise.polyfill();
+#[macro_use]
+extern crate log;
 
-import Api from './api';
+#[cfg(test)]
+extern crate tempdir;
 
-import './dev.parity.html';
+mod service;
 
-const api = new Api(new Api.Transport.Http('/rpc/'));
-
-window.parity = {
-  Api,
-  api
-};
+pub use service::ClientService;
diff --git a/ethcore/src/service.rs b/ethcore/service/src/service.rs
similarity index 64%
rename from ethcore/src/service.rs
rename to ethcore/service/src/service.rs
index 5e65a4de8ab6a65a4a09f1d426b55d902159a64e..f190d6e6ac39e7d6cd6239970ed6feb3d3103209 100644
--- a/ethcore/src/service.rs
+++ b/ethcore/service/src/service.rs
@@ -18,40 +18,20 @@
 
 use std::sync::Arc;
 use std::path::Path;
-use util::*;
-use io::*;
-use spec::Spec;
-use error::*;
-use client::{Client, ClientConfig, ChainNotify};
-use miner::Miner;
-
-use snapshot::ManifestData;
-use snapshot::service::{Service as SnapshotService, ServiceParams as SnapServiceParams};
-use std::sync::atomic::AtomicBool;
-
-#[cfg(feature="ipc")]
-use nanoipc;
-
-/// Message type for external and internal events
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub enum ClientIoMessage {
-	/// Best Block Hash in chain has been changed
-	NewChainHead,
-	/// A block is ready
-	BlockVerified,
-	/// New transaction RLPs are ready to be imported
-	NewTransactions(Vec<Bytes>, usize),
-	/// Begin snapshot restoration
-	BeginRestoration(ManifestData),
-	/// Feed a state chunk to the snapshot service
-	FeedStateChunk(H256, Bytes),
-	/// Feed a block chunk to the snapshot service
-	FeedBlockChunk(H256, Bytes),
-	/// Take a snapshot for the block with given number.
-	TakeSnapshot(u64),
-	/// New consensus message received.
-	NewMessage(Bytes)
-}
+
+use ansi_term::Colour;
+use io::{IoContext, TimerToken, IoHandler, IoService, IoError};
+use kvdb::KeyValueDB;
+use kvdb_rocksdb::{Database, DatabaseConfig};
+use stop_guard::StopGuard;
+
+use ethcore::client::{self, Client, ClientConfig, ChainNotify, ClientIoMessage};
+use ethcore::db;
+use ethcore::error::Error;
+use ethcore::miner::Miner;
+use ethcore::snapshot::service::{Service as SnapshotService, ServiceParams as SnapServiceParams};
+use ethcore::snapshot::{RestorationStatus};
+use ethcore::spec::Spec;
 
 /// Client service setup. Creates and registers client and network services with the IO subsystem.
 pub struct ClientService {
@@ -59,7 +39,7 @@ pub struct ClientService {
 	client: Arc<Client>,
 	snapshot: Arc<SnapshotService>,
 	database: Arc<Database>,
-	_stop_guard: ::devtools::StopGuard,
+	_stop_guard: StopGuard,
 }
 
 impl ClientService {
@@ -69,7 +49,7 @@ impl ClientService {
 		spec: &Spec,
 		client_path: &Path,
 		snapshot_path: &Path,
-		ipc_path: &Path,
+		_ipc_path: &Path,
 		miner: Arc<Miner>,
 		) -> Result<ClientService, Error>
 	{
@@ -77,21 +57,16 @@ impl ClientService {
 
 		info!("Configured for {} using {} engine", Colour::White.bold().paint(spec.name.clone()), Colour::Yellow.bold().paint(spec.engine.name()));
 
-		let mut db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
-
-		// give all rocksdb cache to state column; everything else has its
-		// own caches.
-		if let Some(size) = config.db_cache_size {
-			db_config.set_cache(::db::COL_STATE, size);
-		}
+		let mut db_config = DatabaseConfig::with_columns(db::NUM_COLUMNS);
 
+		db_config.memory_budget = config.db_cache_size;
 		db_config.compaction = config.db_compaction.compaction_profile(client_path);
 		db_config.wal = config.db_wal;
 
 		let db = Arc::new(Database::open(
 			&db_config,
 			&client_path.to_str().expect("DB path could not be converted to string.")
-		).map_err(::client::Error::Database)?);
+		).map_err(client::Error::Database)?);
 
 
 		let pruning = config.pruning;
@@ -114,10 +89,9 @@ impl ClientService {
 		});
 		io_service.register_handler(client_io)?;
 
-		spec.engine.register_client(Arc::downgrade(&client));
+		spec.engine.register_client(Arc::downgrade(&client) as _);
 
-		let stop_guard = ::devtools::StopGuard::new();
-		run_ipc(ipc_path, client.clone(), snapshot.clone(), stop_guard.share());
+		let stop_guard = StopGuard::new();
 
 		Ok(ClientService {
 			io_service: Arc::new(io_service),
@@ -177,13 +151,16 @@ impl IoHandler<ClientIoMessage> for ClientIoHandler {
 
 	fn timeout(&self, _io: &IoContext<ClientIoMessage>, timer: TimerToken) {
 		match timer {
-			CLIENT_TICK_TIMER => self.client.tick(),
+			CLIENT_TICK_TIMER => {
+				use ethcore::snapshot::SnapshotService;
+				let snapshot_restoration = if let RestorationStatus::Ongoing{..} = self.snapshot.status() { true } else { false };
+				self.client.tick(snapshot_restoration)
+			},
 			SNAPSHOT_TICK_TIMER => self.snapshot.tick(),
 			_ => warn!("IO service triggered unregistered timer '{}'", timer),
 		}
 	}
 
-	#[cfg_attr(feature="dev", allow(single_match))]
 	fn message(&self, _io: &IoContext<ClientIoMessage>, net_message: &ClientIoMessage) {
 		use std::thread;
 
@@ -221,74 +198,35 @@ impl IoHandler<ClientIoMessage> for ClientIoHandler {
 	}
 }
 
-#[cfg(feature="ipc")]
-fn run_ipc(base_path: &Path, client: Arc<Client>, snapshot_service: Arc<SnapshotService>, stop: Arc<AtomicBool>) {
-	let mut path = base_path.to_owned();
-	path.push("parity-chain.ipc");
-	let socket_addr = format!("ipc://{}", path.to_string_lossy());
-	let s = stop.clone();
-	::std::thread::spawn(move || {
-		let mut worker = nanoipc::Worker::new(&(client as Arc<BlockChainClient>));
-		worker.add_reqrep(&socket_addr).expect("Ipc expected to initialize with no issues");
-
-		while !s.load(::std::sync::atomic::Ordering::Relaxed) {
-			worker.poll();
-		}
-	});
-
-	let mut path = base_path.to_owned();
-	path.push("parity-snapshot.ipc");
-	let socket_addr = format!("ipc://{}", path.to_string_lossy());
-	::std::thread::spawn(move || {
-		let mut worker = nanoipc::Worker::new(&(snapshot_service as Arc<::snapshot::SnapshotService>));
-		worker.add_reqrep(&socket_addr).expect("Ipc expected to initialize with no issues");
-
-		while !stop.load(::std::sync::atomic::Ordering::Relaxed) {
-			worker.poll();
-		}
-	});
-}
-
-#[cfg(not(feature="ipc"))]
-fn run_ipc(_base_path: &Path, _client: Arc<Client>, _snapshot_service: Arc<SnapshotService>, _stop: Arc<AtomicBool>) {
-}
-
 #[cfg(test)]
 mod tests {
-	use super::*;
-	use tests::helpers::*;
-	use devtools::*;
-	use client::ClientConfig;
 	use std::sync::Arc;
-	use miner::Miner;
+	use std::{time, thread};
+
+	use tempdir::TempDir;
+
+	use ethcore::client::ClientConfig;
+	use ethcore::miner::Miner;
+	use ethcore::spec::Spec;
+	use super::*;
 
 	#[test]
 	fn it_can_be_started() {
-		let temp_path = RandomTempPath::new();
-		let path = temp_path.as_path().to_owned();
-		let client_path = {
-			let mut path = path.to_owned();
-			path.push("client");
-			path
-		};
-
-		let snapshot_path = {
-			let mut path = path.to_owned();
-			path.push("snapshot");
-			path
-		};
+		let tempdir = TempDir::new("").unwrap();
+		let client_path = tempdir.path().join("client");
+		let snapshot_path = tempdir.path().join("snapshot");
 
-		let spec = get_test_spec();
+		let spec = Spec::new_test();
 		let service = ClientService::start(
 			ClientConfig::default(),
 			&spec,
 			&client_path,
 			&snapshot_path,
-			&path,
+			tempdir.path(),
 			Arc::new(Miner::with_spec(&spec)),
 		);
 		assert!(service.is_ok());
 		drop(service.unwrap());
-		::std::thread::park_timeout(::std::time::Duration::from_millis(100));
+		thread::park_timeout(time::Duration::from_millis(100));
 	}
 }
diff --git a/ethcore/src/account_db.rs b/ethcore/src/account_db.rs
index 5ce555aef0432998f66e7ad64c9d12a00360b3e4..4e715766d7ae66202e25feb0c0db98e46605f63a 100644
--- a/ethcore/src/account_db.rs
+++ b/ethcore/src/account_db.rs
@@ -16,9 +16,15 @@
 
 //! DB backend wrapper for Account trie
 use std::collections::HashMap;
-use util::*;
+use hash::{KECCAK_NULL_RLP, keccak};
+use ethereum_types::H256;
+use kvdb::DBValue;
+use hashdb::HashDB;
 use rlp::NULL_RLP;
 
+#[cfg(test)]
+use ethereum_types::Address;
+
 // combines a key with an address hash to ensure uniqueness.
 // leaves the first 96 bits untouched in order to support partial key lookup.
 #[inline]
@@ -79,7 +85,7 @@ impl<'db> AccountDB<'db> {
 	/// Create a new AccountDB from an address.
 	#[cfg(test)]
 	pub fn new(db: &'db HashDB, address: &Address) -> Self {
-		Self::from_hash(db, address.sha3())
+		Self::from_hash(db, keccak(address))
 	}
 
 	/// Create a new AcountDB from an address' hash.
@@ -97,14 +103,14 @@ impl<'db> HashDB for AccountDB<'db>{
 	}
 
 	fn get(&self, key: &H256) -> Option<DBValue> {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return Some(DBValue::from_slice(&NULL_RLP));
 		}
 		self.db.get(&combine_key(&self.address_hash, key))
 	}
 
 	fn contains(&self, key: &H256) -> bool {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return true;
 		}
 		self.db.contains(&combine_key(&self.address_hash, key))
@@ -133,7 +139,7 @@ impl<'db> AccountDBMut<'db> {
 	/// Create a new AccountDB from an address.
 	#[cfg(test)]
 	pub fn new(db: &'db mut HashDB, address: &Address) -> Self {
-		Self::from_hash(db, address.sha3())
+		Self::from_hash(db, keccak(address))
 	}
 
 	/// Create a new AcountDB from an address' hash.
@@ -156,14 +162,14 @@ impl<'db> HashDB for AccountDBMut<'db>{
 	}
 
 	fn get(&self, key: &H256) -> Option<DBValue> {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return Some(DBValue::from_slice(&NULL_RLP));
 		}
 		self.db.get(&combine_key(&self.address_hash, key))
 	}
 
 	fn contains(&self, key: &H256) -> bool {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return true;
 		}
 		self.db.contains(&combine_key(&self.address_hash, key))
@@ -171,16 +177,16 @@ impl<'db> HashDB for AccountDBMut<'db>{
 
 	fn insert(&mut self, value: &[u8]) -> H256 {
 		if value == &NULL_RLP {
-			return SHA3_NULL_RLP.clone();
+			return KECCAK_NULL_RLP.clone();
 		}
-		let k = value.sha3();
+		let k = keccak(value);
 		let ak = combine_key(&self.address_hash, &k);
 		self.db.emplace(ak, DBValue::from_slice(value));
 		k
 	}
 
 	fn emplace(&mut self, key: H256, value: DBValue) {
-		if key == SHA3_NULL_RLP {
+		if key == KECCAK_NULL_RLP {
 			return;
 		}
 		let key = combine_key(&self.address_hash, &key);
@@ -188,7 +194,7 @@ impl<'db> HashDB for AccountDBMut<'db>{
 	}
 
 	fn remove(&mut self, key: &H256) {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return;
 		}
 		let key = combine_key(&self.address_hash, key);
@@ -204,14 +210,14 @@ impl<'db> HashDB for Wrapping<'db> {
 	}
 
 	fn get(&self, key: &H256) -> Option<DBValue> {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return Some(DBValue::from_slice(&NULL_RLP));
 		}
 		self.0.get(key)
 	}
 
 	fn contains(&self, key: &H256) -> bool {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return true;
 		}
 		self.0.contains(key)
@@ -238,14 +244,14 @@ impl<'db> HashDB for WrappingMut<'db>{
 	}
 
 	fn get(&self, key: &H256) -> Option<DBValue> {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return Some(DBValue::from_slice(&NULL_RLP));
 		}
 		self.0.get(key)
 	}
 
 	fn contains(&self, key: &H256) -> bool {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return true;
 		}
 		self.0.contains(key)
@@ -253,20 +259,20 @@ impl<'db> HashDB for WrappingMut<'db>{
 
 	fn insert(&mut self, value: &[u8]) -> H256 {
 		if value == &NULL_RLP {
-			return SHA3_NULL_RLP.clone();
+			return KECCAK_NULL_RLP.clone();
 		}
 		self.0.insert(value)
 	}
 
 	fn emplace(&mut self, key: H256, value: DBValue) {
-		if key == SHA3_NULL_RLP {
+		if key == KECCAK_NULL_RLP {
 			return;
 		}
 		self.0.emplace(key, value)
 	}
 
 	fn remove(&mut self, key: &H256) {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return;
 		}
 		self.0.remove(key)
diff --git a/ethcore/src/account_provider/mod.rs b/ethcore/src/account_provider/mod.rs
index 752cec9649fb9d8311419c50a383be928ed816ca..74d24e7f50e95eb23c470bc7ac66e648412d851c 100755
--- a/ethcore/src/account_provider/mod.rs
+++ b/ethcore/src/account_provider/mod.rs
@@ -23,15 +23,16 @@ use self::stores::{AddressBook, DappsSettingsStore, NewDappsPolicy};
 use std::fmt;
 use std::collections::{HashMap, HashSet};
 use std::time::{Instant, Duration};
-use util::{RwLock};
+use parking_lot::RwLock;
 use ethstore::{
 	SimpleSecretStore, SecretStore, Error as SSError, EthStore, EthMultiStore,
 	random_string, SecretVaultRef, StoreAccountRef, OpaqueSecret,
 };
-use ethstore::dir::MemoryDirectory;
+use ethstore::accounts_dir::MemoryDirectory;
 use ethstore::ethkey::{Address, Message, Public, Secret, Random, Generator};
 use ethjson::misc::AccountMeta;
-use hardware_wallet::{Error as HardwareError, HardwareWalletManager, KeyPath};
+use hardware_wallet::{Error as HardwareError, HardwareWalletManager, KeyPath, TransactionInfo};
+use super::transaction::{Action, Transaction};
 pub use ethstore::ethkey::Signature;
 pub use ethstore::{Derivation, IndexDerivation, KeyFile};
 
@@ -177,6 +178,13 @@ impl AccountProvider {
 			}
 		}
 
+		if let Ok(accounts) = sstore.accounts() {
+			for account in accounts.into_iter().filter(|a| settings.blacklisted_accounts.contains(&a.address)) {
+				warn!("Local Account {} has a blacklisted (known to be weak) address and will be ignored",
+					account.address);
+			}
+		}
+
 		// Remove blacklisted accounts from address book.
 		let mut address_book = AddressBook::new(&sstore.local_path());
 		for addr in &settings.blacklisted_accounts {
@@ -256,9 +264,9 @@ impl AccountProvider {
 		Ok(Address::from(account.address).into())
 	}
 
-	/// Import a new presale wallet.
-	pub fn import_wallet(&self, json: &[u8], password: &str) -> Result<Address, Error> {
-		let account = self.sstore.import_wallet(SecretVaultRef::Root, json, password)?;
+	/// Import a new wallet.
+	pub fn import_wallet(&self, json: &[u8], password: &str, gen_id: bool) -> Result<Address, Error> {
+		let account = self.sstore.import_wallet(SecretVaultRef::Root, json, password, gen_id)?;
 		if self.blacklisted_accounts.contains(&account.address) {
 			self.sstore.remove_account(&account, password)?;
 			return Err(SSError::InvalidAccount.into());
@@ -268,7 +276,7 @@ impl AccountProvider {
 
 	/// Checks whether an account with a given address is present.
 	pub fn has_account(&self, address: Address) -> Result<bool, Error> {
-		Ok(self.accounts()?.iter().any(|&a| a == address))
+		Ok(self.sstore.account_ref(&address).is_ok() && !self.blacklisted_accounts.contains(&address))
 	}
 
 	/// Returns addresses of all accounts.
@@ -288,6 +296,24 @@ impl AccountProvider {
 		Ok(accounts.into_iter().map(|a| a.address).collect())
 	}
 
+	/// Get a list of paths to locked hardware wallets
+	pub fn locked_hardware_accounts(&self) -> Result<Vec<String>, SignError> {
+		match self.hardware_store.as_ref().map(|h| h.list_locked_wallets()) {
+			None => Err(SignError::NotFound),
+			Some(Err(e)) => Err(SignError::Hardware(e)),
+			Some(Ok(s)) => Ok(s),
+		}
+	}
+
+	/// Provide a pin to a locked hardware wallet on USB path to unlock it
+	pub fn hardware_pin_matrix_ack(&self, path: &str, pin: &str) -> Result<bool, SignError> {
+		match self.hardware_store.as_ref().map(|h| h.pin_matrix_ack(path, pin)) {
+			None => Err(SignError::NotFound),
+			Some(Err(e)) => Err(SignError::Hardware(e)),
+			Some(Ok(s)) => Ok(s),
+		}
+	}
+
 	/// Sets addresses of accounts exposed for unknown dapps.
 	/// `None` means that all accounts will be visible.
 	/// If not `None` or empty it will also override default account.
@@ -497,8 +523,8 @@ impl AccountProvider {
 	}
 
 	/// Returns each hardware account along with name and meta.
-	pub fn is_hardware_address(&self, address: Address) -> bool {
-		self.hardware_store.as_ref().and_then(|s| s.wallet_info(&address)).is_some()
+	pub fn is_hardware_address(&self, address: &Address) -> bool {
+		self.hardware_store.as_ref().and_then(|s| s.wallet_info(address)).is_some()
 	}
 
 	/// Returns each account along with name and meta.
@@ -570,7 +596,7 @@ impl AccountProvider {
 			}
 		}
 
-		if self.unlock_keep_secret && unlock != Unlock::OneTime {
+		if self.unlock_keep_secret && unlock == Unlock::Perm {
 			// verify password and get the secret
 			let secret = self.sstore.raw_secret(&account, &password)?;
 			self.unlocked_secrets.write().insert(account.clone(), secret);
@@ -620,14 +646,22 @@ impl AccountProvider {
 	}
 
 	/// Checks if given account is unlocked
-	pub fn is_unlocked(&self, address: Address) -> bool {
+	pub fn is_unlocked(&self, address: &Address) -> bool {
 		let unlocked = self.unlocked.read();
 		let unlocked_secrets = self.unlocked_secrets.read();
-		self.sstore.account_ref(&address)
+		self.sstore.account_ref(address)
 			.map(|r| unlocked.get(&r).is_some() || unlocked_secrets.get(&r).is_some())
 			.unwrap_or(false)
 	}
 
+	/// Checks if given account is unlocked permanently
+	pub fn is_unlocked_permanently(&self, address: &Address) -> bool {
+		let unlocked = self.unlocked.read();
+		self.sstore.account_ref(address)
+			.map(|r| unlocked.get(&r).map_or(false, |account| account.unlock == Unlock::Perm))
+			.unwrap_or(false)
+	}
+
 	/// Signs the message. If password is not provided the account must be unlocked.
 	pub fn sign(&self, address: Address, password: Option<String>, message: Message) -> Result<Signature, SignError> {
 		let account = self.sstore.account_ref(&address)?;
@@ -779,8 +813,20 @@ impl AccountProvider {
 	}
 
 	/// Sign transaction with hardware wallet.
-	pub fn sign_with_hardware(&self, address: Address, transaction: &[u8]) -> Result<Signature, SignError> {
-		match self.hardware_store.as_ref().map(|s| s.sign_transaction(&address, transaction)) {
+	pub fn sign_with_hardware(&self, address: Address, transaction: &Transaction, chain_id: Option<u64>, rlp_encoded_transaction: &[u8]) -> Result<Signature, SignError> {
+		let t_info = TransactionInfo {
+			nonce: transaction.nonce,
+			gas_price: transaction.gas_price,
+			gas_limit: transaction.gas,
+			to: match transaction.action {
+				Action::Create => None,
+				Action::Call(ref to) => Some(to.clone()),
+			},
+			value: transaction.value,
+			data: transaction.data.to_vec(),
+			chain_id: chain_id,
+		};
+		match self.hardware_store.as_ref().map(|s| s.sign_transaction(&address, &t_info, rlp_encoded_transaction)) {
 			None | Some(Err(HardwareError::KeyNotFound)) => Err(SignError::NotFound),
 			Some(Err(e)) => Err(From::from(e)),
 			Some(Ok(s)) => Ok(s),
@@ -794,7 +840,7 @@ mod tests {
 	use std::time::Instant;
 	use ethstore::ethkey::{Generator, Random, Address};
 	use ethstore::{StoreAccountRef, Derivation};
-	use util::H256;
+	use ethereum_types::H256;
 
 	#[test]
 	fn unlock_account_temp() {
diff --git a/ethcore/src/account_provider/stores.rs b/ethcore/src/account_provider/stores.rs
index 72bc04da65c6516878ef9691602212404e285920..1563d21bc6716384fbd2fedb42d4276f651cc688 100644
--- a/ethcore/src/account_provider/stores.rs
+++ b/ethcore/src/account_provider/stores.rs
@@ -64,7 +64,7 @@ impl AddressBook {
 	/// Sets new name for given address.
 	pub fn set_name(&mut self, a: Address, name: String) {
 		{
-			let mut x = self.cache.entry(a)
+			let x = self.cache.entry(a)
 				.or_insert_with(|| AccountMeta {name: Default::default(), meta: "{}".to_owned(), uuid: None});
 			x.name = name;
 		}
@@ -74,7 +74,7 @@ impl AddressBook {
 	/// Sets new meta for given address.
 	pub fn set_meta(&mut self, a: Address, meta: String) {
 		{
-			let mut x = self.cache.entry(a)
+			let x = self.cache.entry(a)
 				.or_insert_with(|| AccountMeta {name: "Anonymous".to_owned(), meta: Default::default(), uuid: None});
 			x.meta = meta;
 		}
@@ -253,7 +253,7 @@ impl DappsSettingsStore {
 	/// Marks recent dapp as used
 	pub fn mark_dapp_used(&mut self, dapp: DappId) {
 		{
-			let mut entry = self.history.entry(dapp).or_insert_with(|| Default::default());
+			let entry = self.history.entry(dapp).or_insert_with(|| Default::default());
 			entry.last_accessed = self.time.get();
 		}
 		// Clear extraneous entries
@@ -280,7 +280,7 @@ impl DappsSettingsStore {
 	/// Sets accounts for specific dapp.
 	pub fn set_accounts(&mut self, id: DappId, accounts: Option<Vec<Address>>) {
 		{
-			let mut settings = self.settings.entry(id).or_insert_with(DappsSettings::default);
+			let settings = self.settings.entry(id).or_insert_with(DappsSettings::default);
 			settings.accounts = accounts;
 		}
 		self.settings.save(JsonSettings::write);
@@ -289,7 +289,7 @@ impl DappsSettingsStore {
 	/// Sets a default account for specific dapp.
 	pub fn set_default(&mut self, id: DappId, default: Address) {
 		{
-			let mut settings = self.settings.entry(id).or_insert_with(DappsSettings::default);
+			let settings = self.settings.entry(id).or_insert_with(DappsSettings::default);
 			settings.default = Some(default);
 		}
 		self.settings.save(JsonSettings::write);
@@ -370,29 +370,29 @@ mod tests {
 	use account_provider::DappId;
 	use std::collections::HashMap;
 	use ethjson::misc::AccountMeta;
-	use devtools::RandomTempPath;
+	use tempdir::TempDir;
 
 	#[test]
 	fn should_save_and_reload_address_book() {
-		let path = RandomTempPath::create_dir();
-		let mut b = AddressBook::new(&path);
+		let tempdir = TempDir::new("").unwrap();
+		let mut b = AddressBook::new(tempdir.path());
 		b.set_name(1.into(), "One".to_owned());
 		b.set_meta(1.into(), "{1:1}".to_owned());
-		let b = AddressBook::new(&path);
+		let b = AddressBook::new(tempdir.path());
 		assert_eq!(b.get(), hash_map![1.into() => AccountMeta{name: "One".to_owned(), meta: "{1:1}".to_owned(), uuid: None}]);
 	}
 
 	#[test]
 	fn should_remove_address() {
-		let path = RandomTempPath::create_dir();
-		let mut b = AddressBook::new(&path);
+		let tempdir = TempDir::new("").unwrap();
+		let mut b = AddressBook::new(tempdir.path());
 
 		b.set_name(1.into(), "One".to_owned());
 		b.set_name(2.into(), "Two".to_owned());
 		b.set_name(3.into(), "Three".to_owned());
 		b.remove(2.into());
 
-		let b = AddressBook::new(&path);
+		let b = AddressBook::new(tempdir.path());
 		assert_eq!(b.get(), hash_map![
 			1.into() => AccountMeta{name: "One".to_owned(), meta: "{}".to_owned(), uuid: None},
 			3.into() => AccountMeta{name: "Three".to_owned(), meta: "{}".to_owned(), uuid: None}
@@ -402,14 +402,14 @@ mod tests {
 	#[test]
 	fn should_save_and_reload_dapps_settings() {
 		// given
-		let path = RandomTempPath::create_dir();
-		let mut b = DappsSettingsStore::new(&path);
+		let tempdir = TempDir::new("").unwrap();
+		let mut b = DappsSettingsStore::new(tempdir.path());
 
 		// when
 		b.set_accounts("dappOne".into(), Some(vec![1.into(), 2.into()]));
 
 		// then
-		let b = DappsSettingsStore::new(&path);
+		let b = DappsSettingsStore::new(tempdir.path());
 		assert_eq!(b.settings(), hash_map![
 			"dappOne".into() => DappsSettings {
 				accounts: Some(vec![1.into(), 2.into()]),
@@ -440,8 +440,8 @@ mod tests {
 	#[test]
 	fn should_store_dapps_policy() {
 		// given
-		let path = RandomTempPath::create_dir();
-		let mut store = DappsSettingsStore::new(&path);
+		let tempdir = TempDir::new("").unwrap();
+		let mut store = DappsSettingsStore::new(tempdir.path());
 
 		// Test default policy
 		assert_eq!(store.policy(), NewDappsPolicy::AllAccounts {
@@ -452,7 +452,7 @@ mod tests {
 		store.set_policy(NewDappsPolicy::Whitelist(vec![1.into(), 2.into()]));
 
 		// then
-		let store = DappsSettingsStore::new(&path);
+		let store = DappsSettingsStore::new(tempdir.path());
 		assert_eq!(store.policy.clone(), hash_map![
 			"default".into() => NewDappsPolicy::Whitelist(vec![1.into(), 2.into()])
 		]);
diff --git a/ethcore/src/basic_types.rs b/ethcore/src/basic_types.rs
deleted file mode 100644
index 1f07e748fe63a933a70f401685bf99a376be8dca..0000000000000000000000000000000000000000
--- a/ethcore/src/basic_types.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Ethcore basic typenames.
-
-/// Type for a 2048-bit log-bloom, as used by our blocks.
-pub type LogBloom = ::log_entry::LogBloom;
-
-/// Constant 2048-bit datum for 0. Often used as a default.
-pub static ZERO_LOGBLOOM: LogBloom = ::util::hash::H2048([0x00; 256]);
-
-#[cfg_attr(feature="dev", allow(enum_variant_names))]
-/// Semantic boolean for when a seal/signature is included.
-pub enum Seal {
-	/// The seal/signature is included.
-	With,
-	/// The seal/signature is not included.
-	Without,
-}
diff --git a/ethcore/src/block.rs b/ethcore/src/block.rs
index 64958700eb24b9cc6e8e885bc2211f9c2e4d0953..a0318d3e187a3126878200b1e12c9f52dc3b7c37 100644
--- a/ethcore/src/block.rs
+++ b/ethcore/src/block.rs
@@ -19,22 +19,24 @@
 use std::cmp;
 use std::sync::Arc;
 use std::collections::HashSet;
+use hash::{keccak, KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP};
+use triehash::ordered_trie_root;
 
-use rlp::{UntrustedRlp, RlpStream, Encodable, Decodable, DecoderError};
-use util::{Bytes, Address, Hashable, U256, H256, ordered_trie_root, SHA3_NULL_RLP};
-use util::error::{Mismatch, OutOfBounds};
+use rlp::{UntrustedRlp, RlpStream, Encodable, Decodable, DecoderError, encode_list};
+use ethereum_types::{H256, U256, Address, Bloom};
+use bytes::Bytes;
+use unexpected::{Mismatch, OutOfBounds};
 
-use basic_types::{LogBloom, Seal};
 use vm::{EnvInfo, LastHashes};
-use engines::Engine;
-use error::{Error, BlockError, TransactionError};
+use engines::EthEngine;
+use error::{Error, BlockError};
 use factory::Factories;
-use header::Header;
-use receipt::Receipt;
+use header::{Header, Seal};
+use receipt::{Receipt, TransactionOutcome};
 use state::State;
 use state_db::StateDB;
-use trace::FlatTrace;
-use transaction::{UnverifiedTransaction, SignedTransaction};
+use trace::Tracing;
+use transaction::{UnverifiedTransaction, SignedTransaction, Error as TransactionError};
 use verification::PreverifiedBlock;
 use views::BlockView;
 
@@ -65,7 +67,6 @@ impl Block {
 	}
 }
 
-
 impl Decodable for Block {
 	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
 		if rlp.as_raw().len() != rlp.payload_info()?.total() {
@@ -91,44 +92,13 @@ pub struct ExecutedBlock {
 	receipts: Vec<Receipt>,
 	transactions_set: HashSet<H256>,
 	state: State<StateDB>,
-	traces: Option<Vec<Vec<FlatTrace>>>,
-}
-
-/// A set of references to `ExecutedBlock` fields that are publicly accessible.
-pub struct BlockRefMut<'a> {
-	/// Block header.
-	pub header: &'a mut Header,
-	/// Block transactions.
-	pub transactions: &'a [SignedTransaction],
-	/// Block uncles.
-	pub uncles: &'a [Header],
-	/// Transaction receipts.
-	pub receipts: &'a [Receipt],
-	/// State.
-	pub state: &'a mut State<StateDB>,
-	/// Traces.
-	pub traces: &'a Option<Vec<Vec<FlatTrace>>>,
-}
-
-/// A set of immutable references to `ExecutedBlock` fields that are publicly accessible.
-pub struct BlockRef<'a> {
-	/// Block header.
-	pub header: &'a Header,
-	/// Block transactions.
-	pub transactions: &'a [SignedTransaction],
-	/// Block uncles.
-	pub uncles: &'a [Header],
-	/// Transaction receipts.
-	pub receipts: &'a [Receipt],
-	/// State.
-	pub state: &'a State<StateDB>,
-	/// Traces.
-	pub traces: &'a Option<Vec<Vec<FlatTrace>>>,
+	traces: Tracing,
+	last_hashes: Arc<LastHashes>,
 }
 
 impl ExecutedBlock {
 	/// Create a new block from the given `state`.
-	fn new(state: State<StateDB>, tracing: bool) -> ExecutedBlock {
+	fn new(state: State<StateDB>, last_hashes: Arc<LastHashes>, tracing: bool) -> ExecutedBlock {
 		ExecutedBlock {
 			header: Default::default(),
 			transactions: Default::default(),
@@ -136,32 +106,37 @@ impl ExecutedBlock {
 			receipts: Default::default(),
 			transactions_set: Default::default(),
 			state: state,
-			traces: if tracing {Some(Vec::new())} else {None},
+			traces: if tracing {
+				Tracing::enabled()
+			} else {
+				Tracing::Disabled
+			},
+			last_hashes: last_hashes,
 		}
 	}
 
-	/// Get a structure containing individual references to all public fields.
-	pub fn fields_mut(&mut self) -> BlockRefMut {
-		BlockRefMut {
-			header: &mut self.header,
-			transactions: &self.transactions,
-			uncles: &self.uncles,
-			state: &mut self.state,
-			receipts: &self.receipts,
-			traces: &self.traces,
+	/// Get the environment info concerning this block.
+	pub fn env_info(&self) -> EnvInfo {
+		// TODO: memoise.
+		EnvInfo {
+			number: self.header.number(),
+			author: self.header.author().clone(),
+			timestamp: self.header.timestamp(),
+			difficulty: self.header.difficulty().clone(),
+			last_hashes: self.last_hashes.clone(),
+			gas_used: self.receipts.last().map_or(U256::zero(), |r| r.gas_used),
+			gas_limit: self.header.gas_limit().clone(),
 		}
 	}
 
-	/// Get a structure containing individual references to all public fields.
-	pub fn fields(&self) -> BlockRef {
-		BlockRef {
-			header: &self.header,
-			transactions: &self.transactions,
-			uncles: &self.uncles,
-			state: &self.state,
-			receipts: &self.receipts,
-			traces: &self.traces,
-		}
+	/// Get mutable access to a state.
+	pub fn state_mut(&mut self) -> &mut State<StateDB> {
+		&mut self.state
+	}
+
+	/// Get mutable reference to traces.
+	pub fn traces_mut(&mut self) -> &mut Tracing {
+		&mut self.traces
 	}
 }
 
@@ -192,10 +167,13 @@ pub trait IsBlock {
 	fn receipts(&self) -> &[Receipt] { &self.block().receipts }
 
 	/// Get all information concerning transaction tracing in this block.
-	fn traces(&self) -> &Option<Vec<Vec<FlatTrace>>> { &self.block().traces }
+	fn traces(&self) -> &Tracing { &self.block().traces }
 
 	/// Get all uncles in this block.
 	fn uncles(&self) -> &[Header] { &self.block().uncles }
+
+	/// Get tracing enabled flag for this block.
+	fn tracing_enabled(&self) -> bool { self.block().traces.is_enabled() }
 }
 
 /// Trait for a object that has a state database.
@@ -208,14 +186,33 @@ impl IsBlock for ExecutedBlock {
 	fn block(&self) -> &ExecutedBlock { self }
 }
 
+impl ::parity_machine::LiveBlock for ExecutedBlock {
+	type Header = Header;
+
+	fn header(&self) -> &Header {
+		&self.header
+	}
+
+	fn uncles(&self) -> &[Header] {
+		&self.uncles
+	}
+}
+
+impl ::parity_machine::Transactions for ExecutedBlock {
+	type Transaction = SignedTransaction;
+
+	fn transactions(&self) -> &[SignedTransaction] {
+		&self.transactions
+	}
+}
+
 /// Block that is ready for transactions to be added.
 ///
 /// It's a bit like a Vec<Transaction>, except that whenever a transaction is pushed, we execute it and
 /// maintain the system `state()`. We also archive execution receipts in preparation for later block creation.
 pub struct OpenBlock<'x> {
 	block: ExecutedBlock,
-	engine: &'x Engine,
-	last_hashes: Arc<LastHashes>,
+	engine: &'x EthEngine,
 }
 
 /// Just like `OpenBlock`, except that we've applied `Engine::on_close_block`, finished up the non-seal header fields,
@@ -226,7 +223,6 @@ pub struct OpenBlock<'x> {
 pub struct ClosedBlock {
 	block: ExecutedBlock,
 	uncle_bytes: Bytes,
-	last_hashes: Arc<LastHashes>,
 	unclosed_state: State<StateDB>,
 }
 
@@ -248,10 +244,9 @@ pub struct SealedBlock {
 }
 
 impl<'x> OpenBlock<'x> {
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	/// Create a new `OpenBlock` ready for transaction pushing.
 	pub fn new(
-		engine: &'x Engine,
+		engine: &'x EthEngine,
 		factories: Factories,
 		tracing: bool,
 		db: StateDB,
@@ -265,9 +260,8 @@ impl<'x> OpenBlock<'x> {
 		let number = parent.number() + 1;
 		let state = State::from_existing(db, parent.state_root().clone(), engine.account_start_nonce(number), factories)?;
 		let mut r = OpenBlock {
-			block: ExecutedBlock::new(state, tracing),
+			block: ExecutedBlock::new(state, last_hashes, tracing),
 			engine: engine,
-			last_hashes: last_hashes.clone(),
 		};
 
 		r.block.header.set_parent_hash(parent.hash());
@@ -279,44 +273,22 @@ impl<'x> OpenBlock<'x> {
 
 		let gas_floor_target = cmp::max(gas_range_target.0, engine.params().min_gas_limit);
 		let gas_ceil_target = cmp::max(gas_range_target.1, gas_floor_target);
-		engine.populate_from_parent(&mut r.block.header, parent, gas_floor_target, gas_ceil_target);
-		engine.on_new_block(&mut r.block, last_hashes, is_epoch_begin)?;
+
+		engine.machine().populate_from_parent(&mut r.block.header, parent, gas_floor_target, gas_ceil_target);
+		engine.populate_from_parent(&mut r.block.header, parent);
+
+		engine.machine().on_new_block(&mut r.block)?;
+		engine.on_new_block(&mut r.block, is_epoch_begin)?;
 
 		Ok(r)
 	}
 
-	/// Alter the author for the block.
-	pub fn set_author(&mut self, author: Address) { self.block.header.set_author(author); }
-
 	/// Alter the timestamp of the block.
 	pub fn set_timestamp(&mut self, timestamp: u64) { self.block.header.set_timestamp(timestamp); }
 
-	/// Alter the difficulty for the block.
-	pub fn set_difficulty(&mut self, a: U256) { self.block.header.set_difficulty(a); }
-
-	/// Alter the gas limit for the block.
-	pub fn set_gas_limit(&mut self, a: U256) { self.block.header.set_gas_limit(a); }
-
-	/// Alter the gas limit for the block.
-	pub fn set_gas_used(&mut self, a: U256) { self.block.header.set_gas_used(a); }
-
-	/// Alter the uncles hash the block.
-	pub fn set_uncles_hash(&mut self, h: H256) { self.block.header.set_uncles_hash(h); }
-
-	/// Alter transactions root for the block.
-	pub fn set_transactions_root(&mut self, h: H256) { self.block.header.set_transactions_root(h); }
-
-	/// Alter the receipts root for the block.
-	pub fn set_receipts_root(&mut self, h: H256) { self.block.header.set_receipts_root(h); }
-
-	/// Alter the extra_data for the block.
-	pub fn set_extra_data(&mut self, extra_data: Bytes) -> Result<(), BlockError> {
-		if extra_data.len() > self.engine.maximum_extra_data_size() {
-			Err(BlockError::ExtraDataOutOfBounds(OutOfBounds{min: None, max: Some(self.engine.maximum_extra_data_size()), found: extra_data.len()}))
-		} else {
-			self.block.header.set_extra_data(extra_data);
-			Ok(())
-		}
+	/// Removes block gas limit.
+	pub fn remove_gas_limit(&mut self) {
+		self.block.header.set_gas_limit(U256::max_value());
 	}
 
 	/// Add an uncle to the block, if possible.
@@ -324,8 +296,13 @@ impl<'x> OpenBlock<'x> {
 	/// NOTE Will check chain constraints and the uncle number but will NOT check
 	/// that the header itself is actually valid.
 	pub fn push_uncle(&mut self, valid_uncle_header: Header) -> Result<(), BlockError> {
-		if self.block.uncles.len() + 1 > self.engine.maximum_uncle_count() {
-			return Err(BlockError::TooManyUncles(OutOfBounds{min: None, max: Some(self.engine.maximum_uncle_count()), found: self.block.uncles.len() + 1}));
+		let max_uncles = self.engine.maximum_uncle_count(self.block.header().number());
+		if self.block.uncles.len() + 1 > max_uncles {
+			return Err(BlockError::TooManyUncles(OutOfBounds{
+				min: None,
+				max: Some(max_uncles),
+				found: self.block.uncles.len() + 1,
+			}));
 		}
 		// TODO: check number
 		// TODO: check not a direct ancestor (use last_hashes for that)
@@ -335,16 +312,7 @@ impl<'x> OpenBlock<'x> {
 
 	/// Get the environment info concerning this block.
 	pub fn env_info(&self) -> EnvInfo {
-		// TODO: memoise.
-		EnvInfo {
-			number: self.block.header.number(),
-			author: self.block.header.author().clone(),
-			timestamp: self.block.header.timestamp(),
-			difficulty: self.block.header.difficulty().clone(),
-			last_hashes: self.last_hashes.clone(),
-			gas_used: self.block.receipts.last().map_or(U256::zero(), |r| r.gas_used),
-			gas_limit: self.block.header.gas_limit().clone(),
-		}
+		self.block.env_info()
 	}
 
 	/// Push a transaction into the block.
@@ -352,22 +320,19 @@ impl<'x> OpenBlock<'x> {
 	/// If valid, it will be executed, and archived together with the receipt.
 	pub fn push_transaction(&mut self, t: SignedTransaction, h: Option<H256>) -> Result<&Receipt, Error> {
 		if self.block.transactions_set.contains(&t.hash()) {
-			return Err(From::from(TransactionError::AlreadyImported));
+			return Err(TransactionError::AlreadyImported.into());
 		}
 
 		let env_info = self.env_info();
-//		info!("env_info says gas_used={}", env_info.gas_used);
-		match self.block.state.apply(&env_info, self.engine, &t, self.block.traces.is_some()) {
-			Ok(outcome) => {
-				self.block.transactions_set.insert(h.unwrap_or_else(||t.hash()));
-				self.block.transactions.push(t.into());
-				let t = outcome.trace;
-				self.block.traces.as_mut().map(|traces| traces.push(t));
-				self.block.receipts.push(outcome.receipt);
-				Ok(self.block.receipts.last().expect("receipt just pushed; qed"))
-			}
-			Err(x) => Err(From::from(x))
+		let outcome = self.block.state.apply(&env_info, self.engine.machine(), &t, self.block.traces.is_enabled())?;
+
+		self.block.transactions_set.insert(h.unwrap_or_else(||t.hash()));
+		self.block.transactions.push(t.into());
+		if let Tracing::Enabled(ref mut traces) = self.block.traces {
+			traces.push(outcome.trace.into());
 		}
+		self.block.receipts.push(outcome.receipt);
+		Ok(self.block.receipts.last().expect("receipt just pushed; qed"))
 	}
 
 	/// Push transactions onto the block.
@@ -376,14 +341,19 @@ impl<'x> OpenBlock<'x> {
 	}
 
 	/// Populate self from a header.
-	pub fn populate_from(&mut self, header: &Header) {
-		self.set_difficulty(*header.difficulty());
-		self.set_gas_limit(*header.gas_limit());
-		self.set_timestamp(header.timestamp());
-		self.set_author(header.author().clone());
-		self.set_extra_data(header.extra_data().clone()).unwrap_or_else(|e| warn!("Couldn't set extradata: {}. Ignoring.", e));
-		self.set_uncles_hash(header.uncles_hash().clone());
-		self.set_transactions_root(header.transactions_root().clone());
+	fn populate_from(&mut self, header: &Header) {
+		self.block.header.set_difficulty(*header.difficulty());
+		self.block.header.set_gas_limit(*header.gas_limit());
+		self.block.header.set_timestamp(header.timestamp());
+		self.block.header.set_author(*header.author());
+		self.block.header.set_uncles_hash(*header.uncles_hash());
+		self.block.header.set_transactions_root(*header.transactions_root());
+		// TODO: that's horrible. set only for backwards compatibility
+		if header.extra_data().len() > self.engine.maximum_extra_data_size() {
+			warn!("Couldn't set extradata. Ignoring.");
+		} else {
+			self.block.header.set_extra_data(header.extra_data().clone());
+		}
 	}
 
 	/// Turn this into a `ClosedBlock`.
@@ -395,22 +365,22 @@ impl<'x> OpenBlock<'x> {
 		if let Err(e) = s.engine.on_close_block(&mut s.block) {
 			warn!("Encountered error on closing the block: {}", e);
 		}
+
 		if let Err(e) = s.block.state.commit() {
 			warn!("Encountered error on state commit: {}", e);
 		}
-		s.block.header.set_transactions_root(ordered_trie_root(s.block.transactions.iter().map(|e| e.rlp_bytes().into_vec())));
-		let uncle_bytes = s.block.uncles.iter().fold(RlpStream::new_list(s.block.uncles.len()), |mut s, u| {s.append_raw(&u.rlp(Seal::With), 1); s} ).out();
-		s.block.header.set_uncles_hash(uncle_bytes.sha3());
+		s.block.header.set_transactions_root(ordered_trie_root(s.block.transactions.iter().map(|e| e.rlp_bytes())));
+		let uncle_bytes = encode_list(&s.block.uncles).into_vec();
+		s.block.header.set_uncles_hash(keccak(&uncle_bytes));
 		s.block.header.set_state_root(s.block.state.root().clone());
-		s.block.header.set_receipts_root(ordered_trie_root(s.block.receipts.iter().map(|r| r.rlp_bytes().into_vec())));
-		s.block.header.set_log_bloom(s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b})); //TODO: use |= operator
+		s.block.header.set_receipts_root(ordered_trie_root(s.block.receipts.iter().map(|r| r.rlp_bytes())));
+		s.block.header.set_log_bloom(s.block.receipts.iter().fold(Bloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b})); //TODO: use |= operator
 		s.block.header.set_gas_used(s.block.receipts.last().map_or(U256::zero(), |r| r.gas_used));
 
 		ClosedBlock {
 			block: s.block,
-			uncle_bytes: uncle_bytes,
-			last_hashes: s.last_hashes,
-			unclosed_state: unclosed_state,
+			uncle_bytes,
+			unclosed_state,
 		}
 	}
 
@@ -425,24 +395,24 @@ impl<'x> OpenBlock<'x> {
 		if let Err(e) = s.block.state.commit() {
 			warn!("Encountered error on state commit: {}", e);
 		}
-		if s.block.header.transactions_root().is_zero() || s.block.header.transactions_root() == &SHA3_NULL_RLP {
-			s.block.header.set_transactions_root(ordered_trie_root(s.block.transactions.iter().map(|e| e.rlp_bytes().into_vec())));
+		if s.block.header.transactions_root().is_zero() || s.block.header.transactions_root() == &KECCAK_NULL_RLP {
+			s.block.header.set_transactions_root(ordered_trie_root(s.block.transactions.iter().map(|e| e.rlp_bytes())));
 		}
-		let uncle_bytes = s.block.uncles.iter().fold(RlpStream::new_list(s.block.uncles.len()), |mut s, u| {s.append_raw(&u.rlp(Seal::With), 1); s} ).out();
-		if s.block.header.uncles_hash().is_zero() {
-			s.block.header.set_uncles_hash(uncle_bytes.sha3());
+		let uncle_bytes = encode_list(&s.block.uncles).into_vec();
+		if s.block.header.uncles_hash().is_zero() || s.block.header.uncles_hash() == &KECCAK_EMPTY_LIST_RLP {
+			s.block.header.set_uncles_hash(keccak(&uncle_bytes));
 		}
-		if s.block.header.receipts_root().is_zero() || s.block.header.receipts_root() == &SHA3_NULL_RLP {
-			s.block.header.set_receipts_root(ordered_trie_root(s.block.receipts.iter().map(|r| r.rlp_bytes().into_vec())));
+		if s.block.header.receipts_root().is_zero() || s.block.header.receipts_root() == &KECCAK_NULL_RLP {
+			s.block.header.set_receipts_root(ordered_trie_root(s.block.receipts.iter().map(|r| r.rlp_bytes())));
 		}
 
 		s.block.header.set_state_root(s.block.state.root().clone());
-		s.block.header.set_log_bloom(s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b})); //TODO: use |= operator
+		s.block.header.set_log_bloom(s.block.receipts.iter().fold(Bloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b})); //TODO: use |= operator
 		s.block.header.set_gas_used(s.block.receipts.last().map_or(U256::zero(), |r| r.gas_used));
 
 		LockedBlock {
 			block: s.block,
-			uncle_bytes: uncle_bytes,
+			uncle_bytes,
 		}
 	}
 
@@ -465,7 +435,7 @@ impl<'x> IsBlock for LockedBlock {
 
 impl ClosedBlock {
 	/// Get the hash of the header without seal arguments.
-	pub fn hash(&self) -> H256 { self.header().rlp_sha3(Seal::Without) }
+	pub fn hash(&self) -> H256 { self.header().rlp_keccak(Seal::Without) }
 
 	/// Turn this into a `LockedBlock`, unable to be reopened again.
 	pub fn lock(self) -> LockedBlock {
@@ -476,29 +446,30 @@ impl ClosedBlock {
 	}
 
 	/// Given an engine reference, reopen the `ClosedBlock` into an `OpenBlock`.
-	pub fn reopen(self, engine: &Engine) -> OpenBlock {
+	pub fn reopen(self, engine: &EthEngine) -> OpenBlock {
 		// revert rewards (i.e. set state back at last transaction's state).
 		let mut block = self.block;
 		block.state = self.unclosed_state;
 		OpenBlock {
 			block: block,
 			engine: engine,
-			last_hashes: self.last_hashes,
 		}
 	}
 }
 
 impl LockedBlock {
 	/// Get the hash of the header without seal arguments.
-	pub fn hash(&self) -> H256 { self.header().rlp_sha3(Seal::Without) }
+	pub fn hash(&self) -> H256 { self.header().rlp_keccak(Seal::Without) }
 
 	/// Provide a valid seal in order to turn this into a `SealedBlock`.
 	///
 	/// NOTE: This does not check the validity of `seal` with the engine.
-	pub fn seal(self, engine: &Engine, seal: Vec<Bytes>) -> Result<SealedBlock, BlockError> {
+	pub fn seal(self, engine: &EthEngine, seal: Vec<Bytes>) -> Result<SealedBlock, BlockError> {
+		let expected_seal_fields = engine.seal_fields(self.header());
 		let mut s = self;
-		if seal.len() != engine.seal_fields() {
-			return Err(BlockError::InvalidSealArity(Mismatch{expected: engine.seal_fields(), found: seal.len()}));
+		if seal.len() != expected_seal_fields {
+			return Err(BlockError::InvalidSealArity(
+				Mismatch { expected: expected_seal_fields, found: seal.len() }));
 		}
 		s.block.header.set_seal(seal);
 		Ok(SealedBlock { block: s.block, uncle_bytes: s.uncle_bytes })
@@ -509,12 +480,14 @@ impl LockedBlock {
 	/// Returns the `ClosedBlock` back again if the seal is no good.
 	pub fn try_seal(
 		self,
-		engine: &Engine,
+		engine: &EthEngine,
 		seal: Vec<Bytes>,
 	) -> Result<SealedBlock, (Error, LockedBlock)> {
 		let mut s = self;
 		s.block.header.set_seal(seal);
-		match engine.verify_block_seal(&s.block.header) {
+
+		// TODO: passing state context to avoid engines owning it?
+		match engine.verify_local_seal(&s.block.header) {
 			Err(e) => Err((e, s)),
 			_ => Ok(SealedBlock { block: s.block, uncle_bytes: s.uncle_bytes }),
 		}
@@ -524,9 +497,9 @@ impl LockedBlock {
 	pub fn strip_receipts(self) -> LockedBlock {
 		let mut block = self;
 		for receipt in &mut block.block.receipts {
-			receipt.state_root = None;
+			receipt.outcome = TransactionOutcome::Unknown;
 		}
-		block.block.header.set_receipts_root(ordered_trie_root(block.block.receipts.iter().map(|r| r.rlp_bytes().into_vec())));
+		block.block.header.set_receipts_root(ordered_trie_root(block.block.receipts.iter().map(|r| r.rlp_bytes())));
 		block
 	}
 }
@@ -561,12 +534,11 @@ impl IsBlock for SealedBlock {
 }
 
 /// Enact the block given by block header, transactions and uncles
-#[cfg_attr(feature="dev", allow(too_many_arguments))]
 pub fn enact(
 	header: &Header,
 	transactions: &[SignedTransaction],
 	uncles: &[Header],
-	engine: &Engine,
+	engine: &EthEngine,
 	tracing: bool,
 	db: StateDB,
 	parent: &Header,
@@ -635,10 +607,9 @@ fn push_transactions(block: &mut OpenBlock, transactions: &[SignedTransaction])
 
 // TODO [ToDr] Pass `PreverifiedBlock` by move, this will avoid unecessary allocation
 /// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
-#[cfg_attr(feature="dev", allow(too_many_arguments))]
 pub fn enact_verified(
 	block: &PreverifiedBlock,
-	engine: &Engine,
+	engine: &EthEngine,
 	tracing: bool,
 	db: StateDB,
 	parent: &Header,
@@ -664,24 +635,23 @@ pub fn enact_verified(
 
 #[cfg(test)]
 mod tests {
-	use tests::helpers::*;
+	use tests::helpers::get_temp_state_db;
 	use super::*;
-	use engines::Engine;
+	use engines::EthEngine;
 	use vm::LastHashes;
 	use error::Error;
 	use header::Header;
 	use factory::Factories;
 	use state_db::StateDB;
 	use views::BlockView;
-	use util::Address;
+	use ethereum_types::Address;
 	use std::sync::Arc;
 	use transaction::SignedTransaction;
 
 	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	fn enact_bytes(
 		block_bytes: &[u8],
-		engine: &Engine,
+		engine: &EthEngine,
 		tracing: bool,
 		db: StateDB,
 		parent: &Header,
@@ -690,7 +660,12 @@ mod tests {
 	) -> Result<LockedBlock, Error> {
 		let block = BlockView::new(block_bytes);
 		let header = block.header();
-		let transactions: Result<Vec<_>, Error> = block.transactions().into_iter().map(SignedTransaction::new).collect();
+		let transactions: Result<Vec<_>, Error> = block
+			.transactions()
+			.into_iter()
+			.map(SignedTransaction::new)
+			.map(|r| r.map_err(Into::into))
+			.collect();
 		let transactions = transactions?;
 
 		{
@@ -725,10 +700,9 @@ mod tests {
 	}
 
 	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header. Seal the block aferwards
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	fn enact_and_seal(
 		block_bytes: &[u8],
-		engine: &Engine,
+		engine: &EthEngine,
 		tracing: bool,
 		db: StateDB,
 		parent: &Header,
diff --git a/ethcore/src/blockchain/best_block.rs b/ethcore/src/blockchain/best_block.rs
index e857a99b64f69dbe4c05b844b9b1e68920c3c9e6..1436ced275de9b1017aa30ce6a91536d59b49c50 100644
--- a/ethcore/src/blockchain/best_block.rs
+++ b/ethcore/src/blockchain/best_block.rs
@@ -14,10 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::{Bytes, U256, H256};
+use ethereum_types::{H256, U256};
+use bytes::Bytes;
 use header::BlockNumber;
 
-/// Best block info.
+/// Contains information on a best block that is specific to the consensus engine.
+///
+/// For GHOST fork-choice rule it would typically describe the block with highest
+/// combined difficulty (usually the block with the highest block number).
+///
+/// Sometimes refered as 'latest block'.
 #[derive(Default)]
 pub struct BestBlock {
 	/// Best block hash.
diff --git a/ethcore/src/blockchain/block_info.rs b/ethcore/src/blockchain/block_info.rs
index e9e02de608449db6de8fc8dd108cb1cc79329b5a..ee8a50d09d9eee44fc4483447b581b7089de1f6a 100644
--- a/ethcore/src/blockchain/block_info.rs
+++ b/ethcore/src/blockchain/block_info.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::{U256,H256};
+use ethereum_types::{H256, U256};
 use header::BlockNumber;
 
 /// Brief info about inserted block.
@@ -31,7 +31,7 @@ pub struct BlockInfo {
 }
 
 /// Describes location of newly inserted block.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum BlockLocation {
 	/// It's part of the canon chain.
 	CanonChain,
@@ -43,7 +43,7 @@ pub enum BlockLocation {
 	BranchBecomingCanonChain(BranchBecomingCanonChainData),
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct BranchBecomingCanonChainData {
 	/// Hash of the newest common ancestor with old canon chain.
 	pub ancestor: H256,
diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs
index 001df861c6623005508dca9ae0269703fbcf59d4..09be1143f2ec46ad6c785b24c868e2cf7b00b604 100644
--- a/ethcore/src/blockchain/blockchain.rs
+++ b/ethcore/src/blockchain/blockchain.rs
@@ -16,22 +16,26 @@
 
 //! Blockchain database.
 
-use std::collections::{HashMap, HashSet};
+use std::collections::{HashMap, HashSet, hash_map};
 use std::sync::Arc;
 use std::mem;
 use itertools::Itertools;
 use bloomchain as bc;
-use util::*;
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, Bloom, U256};
+use parking_lot::{Mutex, RwLock};
+use bytes::Bytes;
 use rlp::*;
+use rlp_compress::{compress, decompress, blocks_swapper};
 use header::*;
-use super::extras::*;
 use transaction::*;
 use views::*;
 use log_entry::{LogEntry, LocalizedLogEntry};
 use receipt::Receipt;
-use blooms::{Bloom, BloomGroup};
-use blockchain::block_info::{BlockInfo, BlockLocation, BranchBecomingCanonChainData};
+use blooms::{BloomGroup, GroupPosition};
 use blockchain::best_block::{BestBlock, BestAncientBlock};
+use blockchain::block_info::{BlockInfo, BlockLocation, BranchBecomingCanonChainData};
+use blockchain::extras::{BlockReceipts, BlockDetails, TransactionAddress, EPOCH_KEY_PREFIX, EpochTransitions};
 use types::blockchain_info::BlockChainInfo;
 use types::tree_route::TreeRoute;
 use blockchain::update::ExtrasUpdate;
@@ -40,6 +44,9 @@ use db::{self, Writable, Readable, CacheUpdatePolicy};
 use cache_manager::CacheManager;
 use encoded;
 use engines::epoch::{Transition as EpochTransition, PendingTransition as PendingEpochTransition};
+use rayon::prelude::*;
+use ansi_term::Colour;
+use kvdb::{DBTransaction, KeyValueDB};
 
 const LOG_BLOOMS_LEVELS: usize = 3;
 const LOG_BLOOMS_ELEMENTS_PER_INDEX: usize = 16;
@@ -143,15 +150,11 @@ pub trait BlockProvider {
 	}
 
 	/// Returns numbers of blocks containing given bloom.
-	fn blocks_with_bloom(&self, bloom: &H2048, from_block: BlockNumber, to_block: BlockNumber) -> Vec<BlockNumber>;
+	fn blocks_with_bloom(&self, bloom: &Bloom, from_block: BlockNumber, to_block: BlockNumber) -> Vec<BlockNumber>;
 
 	/// Returns logs matching given filter.
 	fn logs<F>(&self, blocks: Vec<BlockNumber>, matches: F, limit: Option<usize>) -> Vec<LocalizedLogEntry>
-		where F: Fn(&LogEntry) -> bool, Self: Sized;
-}
-
-macro_rules! otry {
-	($e:expr) => { match $e { Some(x) => x, None => return None } }
+		where F: Fn(&LogEntry) -> bool + Send + Sync, Self: Sized;
 }
 
 #[derive(Debug, Hash, Eq, PartialEq, Clone)]
@@ -161,13 +164,13 @@ enum CacheId {
 	BlockDetails(H256),
 	BlockHashes(BlockNumber),
 	TransactionAddresses(H256),
-	BlocksBlooms(LogGroupPosition),
+	BlocksBlooms(GroupPosition),
 	BlockReceipts(H256),
 }
 
 impl bc::group::BloomGroupDatabase for BlockChain {
 	fn blooms_at(&self, position: &bc::group::GroupPosition) -> Option<bc::group::BloomGroup> {
-		let position = LogGroupPosition::from(position.clone());
+		let position = GroupPosition::from(position.clone());
 		let result = self.db.read_with_cache(db::COL_EXTRA, &self.blocks_blooms, &position).map(Into::into);
 		self.cache_man.lock().note_used(CacheId::BlocksBlooms(position));
 		result
@@ -197,7 +200,7 @@ pub struct BlockChain {
 	block_details: RwLock<HashMap<H256, BlockDetails>>,
 	block_hashes: RwLock<HashMap<BlockNumber, H256>>,
 	transaction_addresses: RwLock<HashMap<H256, TransactionAddress>>,
-	blocks_blooms: RwLock<HashMap<LogGroupPosition, BloomGroup>>,
+	blocks_blooms: RwLock<HashMap<GroupPosition, BloomGroup>>,
 	block_receipts: RwLock<HashMap<H256, BlockReceipts>>,
 
 	db: Arc<KeyValueDB>,
@@ -222,7 +225,7 @@ impl BlockProvider for BlockChain {
 	}
 
 	fn best_ancient_block(&self) -> Option<H256> {
-		self.best_ancient_block.read().as_ref().map(|b| b.hash.clone())
+		self.best_ancient_block.read().as_ref().map(|b| b.hash)
 	}
 
 	fn best_ancient_number(&self) -> Option<BlockNumber> {
@@ -231,17 +234,15 @@ impl BlockProvider for BlockChain {
 
 	/// Get raw block data
 	fn block(&self, hash: &H256) -> Option<encoded::Block> {
-		match (self.block_header_data(hash), self.block_body(hash)) {
-			(Some(header), Some(body)) => {
-				let mut block = RlpStream::new_list(3);
-				let body_rlp = body.rlp();
-				block.append_raw(header.rlp().as_raw(), 1);
-				block.append_raw(body_rlp.at(0).as_raw(), 1);
-				block.append_raw(body_rlp.at(1).as_raw(), 1);
-				Some(encoded::Block::new(block.out()))
-			},
-			_ => None,
-		}
+		let header = self.block_header_data(hash)?;
+		let body = self.block_body(hash)?;
+
+		let mut block = RlpStream::new_list(3);
+		let body_rlp = body.rlp();
+		block.append_raw(header.rlp().as_raw(), 1);
+		block.append_raw(body_rlp.at(0).as_raw(), 1);
+		block.append_raw(body_rlp.at(1).as_raw(), 1);
+		Some(encoded::Block::new(block.out()))
 	}
 
 	/// Get block header data
@@ -265,21 +266,15 @@ impl BlockProvider for BlockChain {
 		}
 
 		// Read from DB and populate cache
-		let opt = self.db.get(db::COL_HEADERS, hash)
-			.expect("Low level database error. Some issue with disk?");
-
-		let result = match opt {
-			Some(b) => {
-				let bytes: Bytes = UntrustedRlp::new(&b).decompress(RlpType::Blocks).into_vec();
-				let mut write = self.block_headers.write();
-				write.insert(hash.clone(), bytes.clone());
-				Some(encoded::Header::new(bytes))
-			},
-			None => None
-		};
+		let b = self.db.get(db::COL_HEADERS, hash)
+			.expect("Low level database error. Some issue with disk?")?;
 
-		self.cache_man.lock().note_used(CacheId::BlockHeader(hash.clone()));
-		result
+		let bytes = decompress(&b, blocks_swapper()).into_vec();
+		let mut write = self.block_headers.write();
+		write.insert(*hash, bytes.clone());
+
+		self.cache_man.lock().note_used(CacheId::BlockHeader(*hash));
+		Some(encoded::Header::new(bytes))
 	}
 
 	/// Get block body data
@@ -301,107 +296,106 @@ impl BlockProvider for BlockChain {
 		}
 
 		// Read from DB and populate cache
-		let opt = self.db.get(db::COL_BODIES, hash)
-			.expect("Low level database error. Some issue with disk?");
-
-		let result = match opt {
-			Some(b) => {
-				let bytes: Bytes = UntrustedRlp::new(&b).decompress(RlpType::Blocks).into_vec();
-				let mut write = self.block_bodies.write();
-				write.insert(hash.clone(), bytes.clone());
-				Some(encoded::Body::new(bytes))
-			},
-			None => None
-		};
+		let b = self.db.get(db::COL_BODIES, hash)
+			.expect("Low level database error. Some issue with disk?")?;
 
-		self.cache_man.lock().note_used(CacheId::BlockBody(hash.clone()));
+		let bytes = decompress(&b, blocks_swapper()).into_vec();
+		let mut write = self.block_bodies.write();
+		write.insert(*hash, bytes.clone());
 
-		result
+		self.cache_man.lock().note_used(CacheId::BlockBody(*hash));
+		Some(encoded::Body::new(bytes))
 	}
 
 	/// Get the familial details concerning a block.
 	fn block_details(&self, hash: &H256) -> Option<BlockDetails> {
-		let result = self.db.read_with_cache(db::COL_EXTRA, &self.block_details, hash);
-		self.cache_man.lock().note_used(CacheId::BlockDetails(hash.clone()));
-		result
+		let result = self.db.read_with_cache(db::COL_EXTRA, &self.block_details, hash)?;
+		self.cache_man.lock().note_used(CacheId::BlockDetails(*hash));
+		Some(result)
 	}
 
 	/// Get the hash of given block's number.
 	fn block_hash(&self, index: BlockNumber) -> Option<H256> {
-		let result = self.db.read_with_cache(db::COL_EXTRA, &self.block_hashes, &index);
+		let result = self.db.read_with_cache(db::COL_EXTRA, &self.block_hashes, &index)?;
 		self.cache_man.lock().note_used(CacheId::BlockHashes(index));
-		result
+		Some(result)
 	}
 
 	/// Get the address of transaction with given hash.
 	fn transaction_address(&self, hash: &H256) -> Option<TransactionAddress> {
-		let result = self.db.read_with_cache(db::COL_EXTRA, &self.transaction_addresses, hash);
-		self.cache_man.lock().note_used(CacheId::TransactionAddresses(hash.clone()));
-		result
+		let result = self.db.read_with_cache(db::COL_EXTRA, &self.transaction_addresses, hash)?;
+		self.cache_man.lock().note_used(CacheId::TransactionAddresses(*hash));
+		Some(result)
 	}
 
 	/// Get receipts of block with given hash.
 	fn block_receipts(&self, hash: &H256) -> Option<BlockReceipts> {
-		let result = self.db.read_with_cache(db::COL_EXTRA, &self.block_receipts, hash);
-		self.cache_man.lock().note_used(CacheId::BlockReceipts(hash.clone()));
-		result
+		let result = self.db.read_with_cache(db::COL_EXTRA, &self.block_receipts, hash)?;
+		self.cache_man.lock().note_used(CacheId::BlockReceipts(*hash));
+		Some(result)
 	}
 
 	/// Returns numbers of blocks containing given bloom.
-	fn blocks_with_bloom(&self, bloom: &H2048, from_block: BlockNumber, to_block: BlockNumber) -> Vec<BlockNumber> {
+	fn blocks_with_bloom(&self, bloom: &Bloom, from_block: BlockNumber, to_block: BlockNumber) -> Vec<BlockNumber> {
 		let range = from_block as bc::Number..to_block as bc::Number;
 		let chain = bc::group::BloomGroupChain::new(self.blooms_config, self);
-		chain.with_bloom(&range, &Bloom::from(bloom.clone()).into())
+		chain.with_bloom(&range, bloom)
 			.into_iter()
 			.map(|b| b as BlockNumber)
 			.collect()
 	}
 
 	fn logs<F>(&self, mut blocks: Vec<BlockNumber>, matches: F, limit: Option<usize>) -> Vec<LocalizedLogEntry>
-		where F: Fn(&LogEntry) -> bool, Self: Sized {
+		where F: Fn(&LogEntry) -> bool + Send + Sync, Self: Sized {
 		// sort in reverse order
 		blocks.sort_by(|a, b| b.cmp(a));
 
-		let mut log_index = 0;
-		let mut logs = blocks.into_iter()
-			.filter_map(|number| self.block_hash(number).map(|hash| (number, hash)))
-			.filter_map(|(number, hash)| self.block_receipts(&hash).map(|r| (number, hash, r.receipts)))
-			.filter_map(|(number, hash, receipts)| self.block_body(&hash).map(|ref b| (number, hash, receipts, b.transaction_hashes())))
-			.flat_map(|(number, hash, mut receipts, mut hashes)| {
-				if receipts.len() != hashes.len() {
-					warn!("Block {} ({}) has different number of receipts ({}) to transactions ({}). Database corrupt?", number, hash, receipts.len(), hashes.len());
-					assert!(false);
-				}
-				log_index = receipts.iter().fold(0, |sum, receipt| sum + receipt.logs.len());
-
-				let receipts_len = receipts.len();
-				hashes.reverse();
-				receipts.reverse();
-				receipts.into_iter()
-					.map(|receipt| receipt.logs)
-					.zip(hashes)
-					.enumerate()
-					.flat_map(move |(index, (mut logs, tx_hash))| {
-						let current_log_index = log_index;
-						let no_of_logs = logs.len();
-						log_index -= no_of_logs;
-
-						logs.reverse();
-						logs.into_iter()
+		let mut logs = blocks
+			.chunks(128)
+			.flat_map(move |blocks_chunk| {
+				blocks_chunk.into_par_iter()
+					.filter_map(|number| self.block_hash(*number).map(|hash| (*number, hash)))
+					.filter_map(|(number, hash)| self.block_receipts(&hash).map(|r| (number, hash, r.receipts)))
+					.filter_map(|(number, hash, receipts)| self.block_body(&hash).map(|ref b| (number, hash, receipts, b.transaction_hashes())))
+					.flat_map(|(number, hash, mut receipts, mut hashes)| {
+						if receipts.len() != hashes.len() {
+							warn!("Block {} ({}) has different number of receipts ({}) to transactions ({}). Database corrupt?", number, hash, receipts.len(), hashes.len());
+							assert!(false);
+						}
+						let mut log_index = receipts.iter().fold(0, |sum, receipt| sum + receipt.logs.len());
+
+						let receipts_len = receipts.len();
+						hashes.reverse();
+						receipts.reverse();
+						receipts.into_iter()
+							.map(|receipt| receipt.logs)
+							.zip(hashes)
 							.enumerate()
-							.map(move |(i, log)| LocalizedLogEntry {
-								entry: log,
-								block_hash: hash,
-								block_number: number,
-								transaction_hash: tx_hash,
-								// iterating in reverse order
-								transaction_index: receipts_len - index - 1,
-								transaction_log_index: no_of_logs - i - 1,
-								log_index: current_log_index - i - 1,
+							.flat_map(move |(index, (mut logs, tx_hash))| {
+								let current_log_index = log_index;
+								let no_of_logs = logs.len();
+								log_index -= no_of_logs;
+
+								logs.reverse();
+								logs.into_iter()
+									.enumerate()
+									.map(move |(i, log)| LocalizedLogEntry {
+										entry: log,
+										block_hash: hash,
+										block_number: number,
+										transaction_hash: tx_hash,
+										// iterating in reverse order
+										transaction_index: receipts_len - index - 1,
+										transaction_log_index: no_of_logs - i - 1,
+										log_index: current_log_index - i - 1,
+									})
 							})
+							.filter(|log_entry| matches(&log_entry.entry))
+							.take(limit.unwrap_or(::std::usize::MAX))
+							.collect::<Vec<_>>()
 					})
+					.collect::<Vec<_>>()
 			})
-			.filter(|log_entry| matches(&log_entry.entry))
 			.take(limit.unwrap_or(::std::usize::MAX))
 			.collect::<Vec<LocalizedLogEntry>>();
 		logs.reverse();
@@ -440,33 +434,31 @@ impl<'a> Iterator for EpochTransitionIter<'a> {
 
 	fn next(&mut self) -> Option<Self::Item> {
 		loop {
-			match self.prefix_iter.next() {
-				Some((key, val)) => {
-					// iterator may continue beyond values beginning with this
-					// prefix.
-					if !key.starts_with(&EPOCH_KEY_PREFIX[..]) { return None }
-
-					let transitions: EpochTransitions = ::rlp::decode(&val[..]);
-
-					// if there are multiple candidates, at most one will be on the
-					// canon chain.
-					for transition in transitions.candidates.into_iter() {
-						let is_in_canon_chain = self.chain.block_hash(transition.block_number)
-							.map_or(false, |hash| hash == transition.block_hash);
-
-						// if the transition is within the block gap, there will only be
-						// one candidate, and it will be from a snapshot restored from.
-						let is_ancient = self.chain.first_block_number()
-							.map_or(false, |first| first > transition.block_number);
-
-						if is_ancient || is_in_canon_chain {
-							return Some((transitions.number, transition))
-						}
-					}
+			// some epochs never occurred on the main chain.
+			let (key, val) = self.prefix_iter.next()?;
+
+			// iterator may continue beyond values beginning with this
+			// prefix.
+			if !key.starts_with(&EPOCH_KEY_PREFIX[..]) {
+				return None
+			}
+
+			let transitions: EpochTransitions = ::rlp::decode(&val[..]);
 
-					// some epochs never occurred on the main chain.
+			// if there are multiple candidates, at most one will be on the
+			// canon chain.
+			for transition in transitions.candidates.into_iter() {
+				let is_in_canon_chain = self.chain.block_hash(transition.block_number)
+					.map_or(false, |hash| hash == transition.block_hash);
+
+				// if the transition is within the block gap, there will only be
+				// one candidate, and it will be from a snapshot restored from.
+				let is_ancient = self.chain.first_block_number()
+					.map_or(false, |first| first > transition.block_number);
+
+				if is_ancient || is_in_canon_chain {
+					return Some((transitions.number, transition))
 				}
-				None => return None,
 			}
 		}
 	}
@@ -511,7 +503,7 @@ impl BlockChain {
 				// we need to insert genesis into the cache
 				let block = BlockView::new(genesis);
 				let header = block.header_view();
-				let hash = block.sha3();
+				let hash = block.hash();
 
 				let details = BlockDetails {
 					number: header.number(),
@@ -609,58 +601,6 @@ impl BlockChain {
 		self.db.read_with_cache(db::COL_EXTRA, &self.block_details, parent).map_or(false, |d| d.children.contains(hash))
 	}
 
-	/// Rewind to a previous block
-	#[cfg(test)]
-	fn rewind(&self) -> Option<H256> {
-		use db::Key;
-		let mut batch =self.db.transaction();
-		// track back to the best block we have in the blocks database
-		if let Some(best_block_hash) = self.db.get(db::COL_EXTRA, b"best").unwrap() {
-			let best_block_hash = H256::from_slice(&best_block_hash);
-			if best_block_hash == self.genesis_hash() {
-				return None;
-			}
-			if let Some(extras) = self.db.read(db::COL_EXTRA, &best_block_hash) as Option<BlockDetails> {
-				type DetailsKey = Key<BlockDetails, Target=H264>;
-				batch.delete(db::COL_EXTRA, &(DetailsKey::key(&best_block_hash)));
-				let hash = extras.parent;
-				let range = extras.number as bc::Number .. extras.number as bc::Number;
-				let chain = bc::group::BloomGroupChain::new(self.blooms_config, self);
-				let changes = chain.replace(&range, vec![]);
-				for (k, v) in changes {
-					batch.write(db::COL_EXTRA, &LogGroupPosition::from(k), &BloomGroup::from(v));
-				}
-				batch.put(db::COL_EXTRA, b"best", &hash);
-
-				let best_block_total_difficulty = self.block_details(&hash).unwrap().total_difficulty;
-				let best_block_rlp = self.block(&hash).unwrap().into_inner();
-
-				let mut best_block = self.best_block.write();
-				*best_block = BestBlock {
-					number: extras.number - 1,
-					total_difficulty: best_block_total_difficulty,
-					hash: hash,
-					timestamp: BlockView::new(&best_block_rlp).header().timestamp(),
-					block: best_block_rlp,
-				};
-				// update parent extras
-				if let Some(mut details) = self.db.read(db::COL_EXTRA, &hash) as Option<BlockDetails> {
-					details.children.clear();
-					batch.write(db::COL_EXTRA, &hash, &details);
-				}
-				self.db.write(batch).expect("Writing to db failed");
-				self.block_details.write().clear();
-				self.block_hashes.write().clear();
-				self.block_headers.write().clear();
-				self.block_bodies.write().clear();
-				self.block_receipts.write().clear();
-				return Some(hash);
-			}
-		}
-
-		None
-	}
-
 	/// Returns a tree route between `from` and `to`, which is a tuple of:
 	///
 	/// - a vector of hashes of all blocks, ordered from `from` to `to`.
@@ -710,8 +650,8 @@ impl BlockChain {
 		let mut from_branch = vec![];
 		let mut to_branch = vec![];
 
-		let mut from_details = otry!(self.block_details(&from));
-		let mut to_details = otry!(self.block_details(&to));
+		let mut from_details = self.block_details(&from)?;
+		let mut to_details = self.block_details(&to)?;
 		let mut current_from = from;
 		let mut current_to = to;
 
@@ -719,13 +659,13 @@ impl BlockChain {
 		while from_details.number > to_details.number {
 			from_branch.push(current_from);
 			current_from = from_details.parent.clone();
-			from_details = otry!(self.block_details(&from_details.parent));
+			from_details = self.block_details(&from_details.parent)?;
 		}
 
 		while to_details.number > from_details.number {
 			to_branch.push(current_to);
 			current_to = to_details.parent.clone();
-			to_details = otry!(self.block_details(&to_details.parent));
+			to_details = self.block_details(&to_details.parent)?;
 		}
 
 		assert_eq!(from_details.number, to_details.number);
@@ -734,11 +674,11 @@ impl BlockChain {
 		while current_from != current_to {
 			from_branch.push(current_from);
 			current_from = from_details.parent.clone();
-			from_details = otry!(self.block_details(&from_details.parent));
+			from_details = self.block_details(&from_details.parent)?;
 
 			to_branch.push(current_to);
 			current_to = to_details.parent.clone();
-			to_details = otry!(self.block_details(&to_details.parent));
+			to_details = self.block_details(&to_details.parent)?;
 		}
 
 		let index = from_branch.len();
@@ -758,12 +698,13 @@ impl BlockChain {
 	/// This is used by snapshot restoration and when downloading missing blocks for the chain gap.
 	/// `is_best` forces the best block to be updated to this block.
 	/// `is_ancient` forces the best block of the first block sequence to be updated to this block.
+	/// `parent_td` is a parent total diffuculty
 	/// Supply a dummy parent total difficulty when the parent block may not be in the chain.
 	/// Returns true if the block is disconnected.
 	pub fn insert_unordered_block(&self, batch: &mut DBTransaction, bytes: &[u8], receipts: Vec<Receipt>, parent_td: Option<U256>, is_best: bool, is_ancient: bool) -> bool {
 		let block = BlockView::new(bytes);
 		let header = block.header_view();
-		let hash = header.sha3();
+		let hash = header.hash();
 
 		if self.is_known(&hash) {
 			return false;
@@ -771,9 +712,8 @@ impl BlockChain {
 
 		assert!(self.pending_best_block.read().is_none());
 
-		let block_rlp = UntrustedRlp::new(bytes);
-		let compressed_header = block_rlp.at(0).unwrap().compress(RlpType::Blocks);
-		let compressed_body = UntrustedRlp::new(&Self::block_to_body(bytes)).compress(RlpType::Blocks);
+		let compressed_header = compress(block.header_rlp().as_raw(), blocks_swapper());
+		let compressed_body = compress(&Self::block_to_body(bytes), blocks_swapper());
 
 		// store block in db
 		batch.put(db::COL_HEADERS, &hash, &compressed_header);
@@ -784,7 +724,7 @@ impl BlockChain {
 		if let Some(parent_details) = maybe_parent {
 			// parent known to be in chain.
 			let info = BlockInfo {
-				hash: hash.clone(),
+				hash: hash,
 				number: header.number(),
 				total_difficulty: parent_details.total_difficulty + header.difficulty(),
 				location: BlockLocation::CanonChain,
@@ -900,8 +840,8 @@ impl BlockChain {
 	/// The block corresponding the the parent hash must be stored already.
 	pub fn epoch_transition_for(&self, parent_hash: H256) -> Option<EpochTransition> {
 		// slow path: loop back block by block
-		for hash in otry!(self.ancestry_iter(parent_hash)) {
-			let details = otry!(self.block_details(&hash));
+		for hash in self.ancestry_iter(parent_hash)? {
+			let details = self.block_details(&hash)?;
 
 			// look for transition in database.
 			if let Some(transition) = self.epoch_transition(details.number, hash) {
@@ -913,7 +853,7 @@ impl BlockChain {
 			//
 			// if `block_hash` is canonical it will only return transitions up to
 			// the parent.
-			if otry!(self.block_hash(details.number)) == hash {
+			if self.block_hash(details.number)? == hash {
 				return self.epoch_transitions()
 					.map(|(_, t)| t)
 					.take_while(|t| t.block_number <= details.number)
@@ -950,14 +890,12 @@ impl BlockChain {
 		let mut update = HashMap::new();
 		update.insert(block_hash, parent_details);
 
-
 		let mut write_details = self.block_details.write();
 		batch.extend_with_cache(db::COL_EXTRA, &mut *write_details, update, CacheUpdatePolicy::Overwrite);
 
 		self.cache_man.lock().note_used(CacheId::BlockDetails(block_hash));
 	}
 
-	#[cfg_attr(feature="dev", allow(similar_names))]
 	/// Inserts the block into backing cache database.
 	/// Expects the block to be valid and already verified.
 	/// If the block is already known, does nothing.
@@ -965,7 +903,7 @@ impl BlockChain {
 		// create views onto rlp
 		let block = BlockView::new(bytes);
 		let header = block.header_view();
-		let hash = header.sha3();
+		let hash = header.hash();
 
 		if self.is_known_child(&header.parent_hash(), &hash) {
 			return ImportRoute::none();
@@ -973,9 +911,12 @@ impl BlockChain {
 
 		assert!(self.pending_best_block.read().is_none());
 
+		let compressed_header = compress(block.header_rlp().as_raw(), blocks_swapper());
+		let compressed_body = compress(&Self::block_to_body(bytes), blocks_swapper());
+
 		// store block in db
-		batch.put_compressed(db::COL_HEADERS, &hash, block.header_rlp().as_raw().to_vec());
-		batch.put_compressed(db::COL_BODIES, &hash, Self::block_to_body(bytes));
+		batch.put(db::COL_HEADERS, &hash, &compressed_header);
+		batch.put(db::COL_BODIES, &hash, &compressed_body);
 
 		let info = self.block_info(&header);
 
@@ -1004,7 +945,7 @@ impl BlockChain {
 
 	/// Get inserted block info which is critical to prepare extras updates.
 	fn block_info(&self, header: &HeaderView) -> BlockInfo {
-		let hash = header.sha3();
+		let hash = header.hash();
 		let number = header.number();
 		let parent_hash = header.parent_hash();
 		let parent_details = self.block_details(&parent_hash).unwrap_or_else(|| panic!("Invalid parent hash: {:?}", parent_hash));
@@ -1052,27 +993,50 @@ impl BlockChain {
 
 		{
 			let mut write_blocks_blooms = self.blocks_blooms.write();
-			batch.extend_with_cache(db::COL_EXTRA, &mut *write_blocks_blooms, update.blocks_blooms, CacheUpdatePolicy::Remove);
+			// update best block
+			match update.info.location {
+				BlockLocation::Branch => (),
+				BlockLocation::BranchBecomingCanonChain(_) => {
+					// clear all existing blooms, cause they may be created for block
+					// number higher than current best block
+					*write_blocks_blooms = update.blocks_blooms;
+					for (key, value) in write_blocks_blooms.iter() {
+						batch.write(db::COL_EXTRA, key, value);
+					}
+				},
+				BlockLocation::CanonChain => {
+					// update all existing blooms groups
+					for (key, value) in update.blocks_blooms {
+						match write_blocks_blooms.entry(key) {
+							hash_map::Entry::Occupied(mut entry) => {
+								entry.get_mut().accrue_bloom_group(&value);
+								batch.write(db::COL_EXTRA, entry.key(), entry.get());
+							},
+							hash_map::Entry::Vacant(entry) => {
+								batch.write(db::COL_EXTRA, entry.key(), &value);
+								entry.insert(value);
+							},
+						}
+					}
+				},
+			}
 		}
 
 		// These cached values must be updated last with all four locks taken to avoid
 		// cache decoherence
 		{
 			let mut best_block = self.pending_best_block.write();
-			// update best block
-			match update.info.location {
-				BlockLocation::Branch => (),
-				_ => if is_best {
-					batch.put(db::COL_EXTRA, b"best", &update.info.hash);
-					*best_block = Some(BestBlock {
-						hash: update.info.hash,
-						number: update.info.number,
-						total_difficulty: update.info.total_difficulty,
-						timestamp: update.timestamp,
-						block: update.block.to_vec(),
-					});
-				},
+			if is_best && update.info.location != BlockLocation::Branch {
+				batch.put(db::COL_EXTRA, b"best", &update.info.hash);
+				*best_block = Some(BestBlock {
+					hash: update.info.hash,
+					number: update.info.number,
+					total_difficulty: update.info.total_difficulty,
+					timestamp: update.timestamp,
+					block: update.block.to_vec(),
+				});
 			}
+
 			let mut write_hashes = self.pending_block_hashes.write();
 			let mut write_details = self.pending_block_details.write();
 			let mut write_txs = self.pending_transaction_addresses.write();
@@ -1147,13 +1111,12 @@ impl BlockChain {
 
 	/// Given a block's `parent`, find every block hash which represents a valid possible uncle.
 	pub fn find_uncle_hashes(&self, parent: &H256, uncle_generations: usize) -> Option<Vec<H256>> {
-		if !self.is_known(parent) { return None; }
+		if !self.is_known(parent) {
+			return None;
+		}
 
 		let mut excluded = HashSet::new();
-		let ancestry = match self.ancestry_iter(parent.clone()) {
-			Some(iter) => iter,
-			None => return None,
-		};
+		let ancestry = self.ancestry_iter(parent.clone())?;
 
 		for a in ancestry.clone().take(uncle_generations) {
 			if let Some(uncles) = self.uncle_hashes(&a) {
@@ -1186,7 +1149,7 @@ impl BlockChain {
 		match info.location {
 			BlockLocation::Branch => (),
 			BlockLocation::CanonChain => {
-				block_hashes.insert(number, info.hash.clone());
+				block_hashes.insert(number, info.hash);
 			},
 			BlockLocation::BranchBecomingCanonChain(ref data) => {
 				let ancestor_number = self.block_number(&data.ancestor).expect("Block number of ancestor is always in DB");
@@ -1196,7 +1159,7 @@ impl BlockChain {
 					block_hashes.insert(start_number + index as BlockNumber, hash);
 				}
 
-				block_hashes.insert(number, info.hash.clone());
+				block_hashes.insert(number, info.hash);
 			}
 		}
 
@@ -1212,27 +1175,27 @@ impl BlockChain {
 
 		// update parent
 		let mut parent_details = self.block_details(&parent_hash).unwrap_or_else(|| panic!("Invalid parent hash: {:?}", parent_hash));
-		parent_details.children.push(info.hash.clone());
+		parent_details.children.push(info.hash);
 
 		// create current block details.
 		let details = BlockDetails {
 			number: header.number(),
 			total_difficulty: info.total_difficulty,
-			parent: parent_hash.clone(),
+			parent: parent_hash,
 			children: vec![],
 		};
 
 		// write to batch
 		let mut block_details = HashMap::new();
 		block_details.insert(parent_hash, parent_details);
-		block_details.insert(info.hash.clone(), details);
+		block_details.insert(info.hash, details);
 		block_details
 	}
 
 	/// This function returns modified block receipts.
 	fn prepare_block_receipts_update(&self, receipts: Vec<Receipt>, info: &BlockInfo) -> HashMap<H256, BlockReceipts> {
 		let mut block_receipts = HashMap::new();
-		block_receipts.insert(info.hash.clone(), BlockReceipts::new(receipts));
+		block_receipts.insert(info.hash, BlockReceipts::new(receipts));
 		block_receipts
 	}
 
@@ -1247,7 +1210,7 @@ impl BlockChain {
 					.enumerate()
 					.map(|(i ,tx_hash)| {
 						(tx_hash, Some(TransactionAddress {
-							block_hash: info.hash.clone(),
+							block_hash: info.hash,
 							index: i
 						}))
 					})
@@ -1261,7 +1224,7 @@ impl BlockChain {
 						hashes.into_iter()
 							.enumerate()
 							.map(|(i, tx_hash)| (tx_hash, Some(TransactionAddress {
-								block_hash: hash.clone(),
+								block_hash: *hash,
 								index: i,
 							})))
 							.collect::<HashMap<H256, Option<TransactionAddress>>>()
@@ -1271,7 +1234,7 @@ impl BlockChain {
 					.enumerate()
 					.map(|(i ,tx_hash)| {
 						(tx_hash, Some(TransactionAddress {
-							block_hash: info.hash.clone(),
+							block_hash: info.hash,
 							index: i
 						}))
 					});
@@ -1305,7 +1268,7 @@ impl BlockChain {
 	/// Later, BloomIndexer is used to map bloom location on filter layer (BloomIndex)
 	/// to bloom location in database (BlocksBloomLocation).
 	///
-	fn prepare_block_blooms_update(&self, block_bytes: &[u8], info: &BlockInfo) -> HashMap<LogGroupPosition, BloomGroup> {
+	fn prepare_block_blooms_update(&self, block_bytes: &[u8], info: &BlockInfo) -> HashMap<GroupPosition, BloomGroup> {
 		let block = BlockView::new(block_bytes);
 		let header = block.header_view();
 
@@ -1317,7 +1280,7 @@ impl BlockChain {
 					HashMap::new()
 				} else {
 					let chain = bc::group::BloomGroupChain::new(self.blooms_config, self);
-					chain.insert(info.number as bc::Number, Bloom::from(log_bloom).into())
+					chain.insert(info.number as bc::Number, log_bloom)
 				}
 			},
 			BlockLocation::BranchBecomingCanonChain(ref data) => {
@@ -1325,14 +1288,12 @@ impl BlockChain {
 				let start_number = ancestor_number + 1;
 				let range = start_number as bc::Number..self.best_block_number() as bc::Number;
 
-				let mut blooms: Vec<bc::Bloom> = data.enacted.iter()
+				let mut blooms: Vec<Bloom> = data.enacted.iter()
 					.map(|hash| self.block_header_data(hash).unwrap())
 					.map(|h| h.log_bloom())
-					.map(Bloom::from)
-					.map(Into::into)
 					.collect();
 
-				blooms.push(Bloom::from(header.log_bloom()).into());
+				blooms.push(header.log_bloom());
 
 				let chain = bc::group::BloomGroupChain::new(self.blooms_config, self);
 				chain.replace(&range, blooms)
@@ -1346,7 +1307,7 @@ impl BlockChain {
 
 	/// Get best block hash.
 	pub fn best_block_hash(&self) -> H256 {
-		self.best_block.read().hash.clone()
+		self.best_block.read().hash
 	}
 
 	/// Get best block number.
@@ -1444,43 +1405,40 @@ impl BlockChain {
 			total_difficulty: best_block.total_difficulty.clone(),
 			pending_total_difficulty: best_block.total_difficulty.clone(),
 			genesis_hash: self.genesis_hash(),
-			best_block_hash: best_block.hash.clone(),
+			best_block_hash: best_block.hash,
 			best_block_number: best_block.number,
 			best_block_timestamp: best_block.timestamp,
 			first_block_hash: self.first_block(),
 			first_block_number: From::from(self.first_block_number()),
-			ancient_block_hash: best_ancient_block.as_ref().map(|b| b.hash.clone()),
+			ancient_block_hash: best_ancient_block.as_ref().map(|b| b.hash),
 			ancient_block_number: best_ancient_block.as_ref().map(|b| b.number),
 		}
 	}
-
-	#[cfg(test)]
-	pub fn db(&self) -> &Arc<KeyValueDB> {
-		&self.db
-	}
 }
 
 #[cfg(test)]
 mod tests {
-	#![cfg_attr(feature="dev", allow(similar_names))]
+	use std::iter;
 	use std::sync::Arc;
 	use rustc_hex::FromHex;
-	use util::kvdb::KeyValueDB;
-	use util::hash::*;
-	use util::sha3::Hashable;
-	use receipt::Receipt;
+	use hash::keccak;
+	use kvdb::KeyValueDB;
+	use kvdb_memorydb;
+	use ethereum_types::*;
+	use receipt::{Receipt, TransactionOutcome};
 	use blockchain::{BlockProvider, BlockChain, Config, ImportRoute};
-	use tests::helpers::*;
-	use blockchain::generator::{ChainGenerator, ChainIterator, BlockFinalizer};
+	use tests::helpers::{
+		generate_dummy_blockchain, generate_dummy_blockchain_with_extra,
+		generate_dummy_empty_blockchain
+	};
+	use blockchain::generator::{BlockGenerator, BlockBuilder, BlockOptions};
 	use blockchain::extras::TransactionAddress;
-	use views::BlockView;
 	use transaction::{Transaction, Action};
 	use log_entry::{LogEntry, LocalizedLogEntry};
 	use ethkey::Secret;
-	use header::BlockNumber;
 
 	fn new_db() -> Arc<KeyValueDB> {
-		Arc::new(::util::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)))
+		Arc::new(kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0)))
 	}
 
 	fn new_chain(genesis: &[u8], db: Arc<KeyValueDB>) -> BlockChain {
@@ -1490,18 +1448,16 @@ mod tests {
 	#[test]
 	fn should_cache_best_block() {
 		// given
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
-		let first = canon_chain.generate(&mut finalizer).unwrap();
+		let genesis = BlockBuilder::genesis();
+		let first = genesis.add_block();
 
 		let db = new_db();
-		let bc = new_chain(&genesis, db.clone());
+		let bc = new_chain(&genesis.last().encoded(), db.clone());
 		assert_eq!(bc.best_block_number(), 0);
 
 		// when
 		let mut batch = db.transaction();
-		bc.insert_block(&mut batch, &first, vec![]);
+		bc.insert_block(&mut batch, &first.last().encoded(), vec![]);
 		assert_eq!(bc.best_block_number(), 0);
 		bc.commit();
 		// NOTE no db.write here (we want to check if best block is cached)
@@ -1513,117 +1469,104 @@ mod tests {
 
 	#[test]
 	fn basic_blockchain_insert() {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
-		let first = canon_chain.generate(&mut finalizer).unwrap();
-		let genesis_hash = BlockView::new(&genesis).header_view().sha3();
-		let first_hash = BlockView::new(&first).header_view().sha3();
+		let genesis = BlockBuilder::genesis();
+		let first = genesis.add_block();
+
+		let genesis = genesis.last();
+		let first = first.last();
+		let genesis_hash = genesis.hash();
+		let first_hash = first.hash();
 
 		let db = new_db();
-		let bc = new_chain(&genesis, db.clone());
+		let bc = new_chain(&genesis.encoded(), db.clone());
 
-		assert_eq!(bc.genesis_hash(), genesis_hash.clone());
-		assert_eq!(bc.best_block_hash(), genesis_hash.clone());
-		assert_eq!(bc.block_hash(0), Some(genesis_hash.clone()));
+		assert_eq!(bc.genesis_hash(), genesis_hash);
+		assert_eq!(bc.best_block_hash(), genesis_hash);
+		assert_eq!(bc.block_hash(0), Some(genesis_hash));
 		assert_eq!(bc.block_hash(1), None);
 		assert_eq!(bc.block_details(&genesis_hash).unwrap().children, vec![]);
 
 		let mut batch = db.transaction();
-		bc.insert_block(&mut batch, &first, vec![]);
+		bc.insert_block(&mut batch, &first.encoded(), vec![]);
 		db.write(batch).unwrap();
 		bc.commit();
 
-		assert_eq!(bc.block_hash(0), Some(genesis_hash.clone()));
+		assert_eq!(bc.block_hash(0), Some(genesis_hash));
 		assert_eq!(bc.best_block_number(), 1);
-		assert_eq!(bc.best_block_hash(), first_hash.clone());
-		assert_eq!(bc.block_hash(1), Some(first_hash.clone()));
-		assert_eq!(bc.block_details(&first_hash).unwrap().parent, genesis_hash.clone());
-		assert_eq!(bc.block_details(&genesis_hash).unwrap().children, vec![first_hash.clone()]);
+		assert_eq!(bc.best_block_hash(), first_hash);
+		assert_eq!(bc.block_hash(1), Some(first_hash));
+		assert_eq!(bc.block_details(&first_hash).unwrap().parent, genesis_hash);
+		assert_eq!(bc.block_details(&genesis_hash).unwrap().children, vec![first_hash]);
 		assert_eq!(bc.block_hash(2), None);
 	}
 
 	#[test]
 	fn check_ancestry_iter() {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
-		let genesis_hash = BlockView::new(&genesis).header_view().sha3();
+		let genesis = BlockBuilder::genesis();
+		let first_10 = genesis.add_blocks(10);
+		let generator = BlockGenerator::new(vec![first_10]);
 
 		let db = new_db();
-		let bc = new_chain(&genesis, db.clone());
+		let bc = new_chain(&genesis.last().encoded(), db.clone());
 
-		let mut block_hashes = vec![genesis_hash.clone()];
+		let mut block_hashes = vec![genesis.last().hash()];
 		let mut batch = db.transaction();
-		for _ in 0..10 {
-			let block = canon_chain.generate(&mut finalizer).unwrap();
-			block_hashes.push(BlockView::new(&block).header_view().sha3());
-			bc.insert_block(&mut batch, &block, vec![]);
+		for block in generator {
+			block_hashes.push(block.hash());
+			bc.insert_block(&mut batch, &block.encoded(), vec![]);
 			bc.commit();
 		}
 		db.write(batch).unwrap();
 
 		block_hashes.reverse();
 
-		assert_eq!(bc.ancestry_iter(block_hashes[0].clone()).unwrap().collect::<Vec<_>>(), block_hashes)
+		assert_eq!(bc.ancestry_iter(block_hashes[0].clone()).unwrap().collect::<Vec<_>>(), block_hashes);
+		assert_eq!(block_hashes.len(), 11);
 	}
 
 	#[test]
-	#[cfg_attr(feature="dev", allow(cyclomatic_complexity))]
 	fn test_find_uncles() {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
-		let b1b = canon_chain.fork(1).generate(&mut finalizer.fork()).unwrap();
-		let b1a = canon_chain.generate(&mut finalizer).unwrap();
-		let b2b = canon_chain.fork(1).generate(&mut finalizer.fork()).unwrap();
-		let b2a = canon_chain.generate(&mut finalizer).unwrap();
-		let b3b = canon_chain.fork(1).generate(&mut finalizer.fork()).unwrap();
-		let b3a = canon_chain.generate(&mut finalizer).unwrap();
-		let b4b = canon_chain.fork(1).generate(&mut finalizer.fork()).unwrap();
-		let b4a = canon_chain.generate(&mut finalizer).unwrap();
-		let b5b = canon_chain.fork(1).generate(&mut finalizer.fork()).unwrap();
-		let b5a = canon_chain.generate(&mut finalizer).unwrap();
+		let genesis = BlockBuilder::genesis();
+		let b1a = genesis.add_block();
+		let b2a = b1a.add_block();
+		let b3a = b2a.add_block();
+		let b4a = b3a.add_block();
+		let b5a = b4a.add_block();
+
+		let b1b = genesis.add_block_with_difficulty(9);
+		let b2b = b1a.add_block_with_difficulty(9);
+		let b3b = b2a.add_block_with_difficulty(9);
+		let b4b = b3a.add_block_with_difficulty(9);
+		let b5b = b4a.add_block_with_difficulty(9);
+
+		let uncle_headers = vec![b4b.last().header(), b3b.last().header(), b2b.last().header()];
+		let b4a_hash = b4a.last().hash();
+
+		let generator = BlockGenerator::new(
+			vec![b1a, b1b, b2a, b2b, b3a, b3b, b4a, b4b, b5a, b5b]
+		);
 
 		let db = new_db();
-		let bc = new_chain(&genesis, db.clone());
+		let bc = new_chain(&genesis.last().encoded(), db.clone());
 
-		let mut batch =db.transaction();
-		for b in &[&b1a, &b1b, &b2a, &b2b, &b3a, &b3b, &b4a, &b4b, &b5a, &b5b] {
-			bc.insert_block(&mut batch, b, vec![]);
+		let mut batch = db.transaction();
+		for b in generator {
+			bc.insert_block(&mut batch, &b.encoded(), vec![]);
 			bc.commit();
 		}
-		bc.insert_block(&mut batch, &b1b, vec![]);
-		bc.insert_block(&mut batch, &b2a, vec![]);
-		bc.insert_block(&mut batch, &b2b, vec![]);
-		bc.insert_block(&mut batch, &b3a, vec![]);
-		bc.insert_block(&mut batch, &b3b, vec![]);
-		bc.insert_block(&mut batch, &b4a, vec![]);
-		bc.insert_block(&mut batch, &b4b, vec![]);
-		bc.insert_block(&mut batch, &b5a, vec![]);
-		bc.insert_block(&mut batch, &b5b, vec![]);
-		db.write(batch).unwrap();
 
-		assert_eq!(
-			[&b4b, &b3b, &b2b].iter().map(|b| BlockView::new(b).header()).collect::<Vec<_>>(),
-			bc.find_uncle_headers(&BlockView::new(&b4a).header_view().sha3(), 3).unwrap()
-		);
+		db.write(batch).unwrap();
 
+		assert_eq!(uncle_headers, bc.find_uncle_headers(&b4a_hash, 3).unwrap());
 		// TODO: insert block that already includes one of them as an uncle to check it's not allowed.
 	}
 
 	fn secret() -> Secret {
-		"".sha3().into()
+		keccak("").into()
 	}
 
 	#[test]
 	fn test_fork_transaction_addresses() {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
-		let mut fork_chain = canon_chain.fork(1);
-		let mut fork_finalizer = finalizer.fork();
-
 		let t1 = Transaction {
 			nonce: 0.into(),
 			gas_price: 0.into(),
@@ -1633,42 +1576,35 @@ mod tests {
 			data: "601080600c6000396000f3006000355415600957005b60203560003555".from_hex().unwrap(),
 		}.sign(&secret(), None);
 
+		let t1_hash = t1.hash();
 
-		let b1a = canon_chain
-			.with_transaction(t1.clone())
-			.generate(&mut finalizer).unwrap();
-
-		// Empty block
-		let b1b = fork_chain
-			.generate(&mut fork_finalizer).unwrap();
-
-		let b2 = fork_chain
-			.generate(&mut fork_finalizer).unwrap();
+		let genesis = BlockBuilder::genesis();
+		let b1a = genesis.add_block_with_transactions(iter::once(t1));
+		let b1b = genesis.add_block_with_difficulty(9);
+		let b2 = b1b.add_block();
 
-		let b1a_hash = BlockView::new(&b1a).header_view().sha3();
-		let b2_hash = BlockView::new(&b2).header_view().sha3();
-
-		let t1_hash = t1.hash();
+		let b1a_hash = b1a.last().hash();
+		let b2_hash = b2.last().hash();
 
 		let db = new_db();
-		let bc = new_chain(&genesis, db.clone());
+		let bc = new_chain(&genesis.last().encoded(), db.clone());
 
 		let mut batch = db.transaction();
-		let _ = bc.insert_block(&mut batch, &b1a, vec![]);
+		let _ = bc.insert_block(&mut batch, &b1a.last().encoded(), vec![]);
 		bc.commit();
-		let _ = bc.insert_block(&mut batch, &b1b, vec![]);
+		let _ = bc.insert_block(&mut batch, &b1b.last().encoded(), vec![]);
 		bc.commit();
 		db.write(batch).unwrap();
 
 		assert_eq!(bc.best_block_hash(), b1a_hash);
 		assert_eq!(bc.transaction_address(&t1_hash), Some(TransactionAddress {
-			block_hash: b1a_hash.clone(),
+			block_hash: b1a_hash,
 			index: 0,
 		}));
 
 		// now let's make forked chain the canon chain
 		let mut batch = db.transaction();
-		let _ = bc.insert_block(&mut batch, &b2, vec![]);
+		let _ = bc.insert_block(&mut batch, &b2.last().encoded(), vec![]);
 		bc.commit();
 		db.write(batch).unwrap();
 
@@ -1677,16 +1613,8 @@ mod tests {
 		assert_eq!(bc.transaction_address(&t1_hash), None);
 	}
 
-
-
 	#[test]
 	fn test_overwriting_transaction_addresses() {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
-		let mut fork_chain = canon_chain.fork(1);
-		let mut fork_finalizer = finalizer.fork();
-
 		let t1 = Transaction {
 			nonce: 0.into(),
 			gas_price: 0.into(),
@@ -1714,104 +1642,97 @@ mod tests {
 			data: "601080600c6000396000f3006000355415600957005b60203560003555".from_hex().unwrap(),
 		}.sign(&secret(), None);
 
-		let b1a = canon_chain
-			.with_transaction(t1.clone())
-			.with_transaction(t2.clone())
-			.generate(&mut finalizer).unwrap();
-
-		// insert transactions in different order
-		let b1b = fork_chain
-			.with_transaction(t2.clone())
-			.with_transaction(t1.clone())
-			.generate(&mut fork_finalizer).unwrap();
-
-		let b2 = fork_chain
-			.with_transaction(t3.clone())
-			.generate(&mut fork_finalizer).unwrap();
+		let genesis = BlockBuilder::genesis();
+		let b1a = genesis.add_block_with_transactions(vec![t1.clone(), t2.clone()]);
+		// insert transactions in different order,
+		// the block has lower difficulty, so the hash is also different
+		let b1b = genesis.add_block_with(|| BlockOptions {
+			difficulty: 9.into(),
+			transactions: vec![t2.clone(), t1.clone()],
+			..Default::default()
+		});
+		let b2 = b1b.add_block_with_transactions(iter::once(t3.clone()));
 
-		let b1a_hash = BlockView::new(&b1a).header_view().sha3();
-		let b1b_hash = BlockView::new(&b1b).header_view().sha3();
-		let b2_hash = BlockView::new(&b2).header_view().sha3();
+		let b1a_hash = b1a.last().hash();
+		let b1b_hash = b1b.last().hash();
+		let b2_hash = b2.last().hash();
 
 		let t1_hash = t1.hash();
 		let t2_hash = t2.hash();
 		let t3_hash = t3.hash();
 
 		let db = new_db();
-		let bc = new_chain(&genesis, db.clone());
+		let bc = new_chain(&genesis.last().encoded(), db.clone());
 
 		let mut batch = db.transaction();
-		let _ = bc.insert_block(&mut batch, &b1a, vec![]);
+		let _ = bc.insert_block(&mut batch, &b1a.last().encoded(), vec![]);
 		bc.commit();
-		let _ = bc.insert_block(&mut batch, &b1b, vec![]);
+		let _ = bc.insert_block(&mut batch, &b1b.last().encoded(), vec![]);
 		bc.commit();
 		db.write(batch).unwrap();
 
 		assert_eq!(bc.best_block_hash(), b1a_hash);
 		assert_eq!(bc.transaction_address(&t1_hash), Some(TransactionAddress {
-			block_hash: b1a_hash.clone(),
+			block_hash: b1a_hash,
 			index: 0,
 		}));
 		assert_eq!(bc.transaction_address(&t2_hash), Some(TransactionAddress {
-			block_hash: b1a_hash.clone(),
+			block_hash: b1a_hash,
 			index: 1,
 		}));
 
 		// now let's make forked chain the canon chain
 		let mut batch = db.transaction();
-		let _ = bc.insert_block(&mut batch, &b2, vec![]);
+		let _ = bc.insert_block(&mut batch, &b2.last().encoded(), vec![]);
 		bc.commit();
 		db.write(batch).unwrap();
 
 		assert_eq!(bc.best_block_hash(), b2_hash);
 		assert_eq!(bc.transaction_address(&t1_hash), Some(TransactionAddress {
-			block_hash: b1b_hash.clone(),
+			block_hash: b1b_hash,
 			index: 1,
 		}));
 		assert_eq!(bc.transaction_address(&t2_hash), Some(TransactionAddress {
-			block_hash: b1b_hash.clone(),
+			block_hash: b1b_hash,
 			index: 0,
 		}));
 		assert_eq!(bc.transaction_address(&t3_hash), Some(TransactionAddress {
-			block_hash: b2_hash.clone(),
+			block_hash: b2_hash,
 			index: 0,
 		}));
 	}
 
 	#[test]
-	#[cfg_attr(feature="dev", allow(cyclomatic_complexity))]
 	fn test_small_fork() {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
-		let b1 = canon_chain.generate(&mut finalizer).unwrap();
-		let b2 = canon_chain.generate(&mut finalizer).unwrap();
-		let b3b = canon_chain.fork(1).generate(&mut finalizer.fork()).unwrap();
-		let b3a = canon_chain.generate(&mut finalizer).unwrap();
-
-		let genesis_hash = BlockView::new(&genesis).header_view().sha3();
-		let b1_hash= BlockView::new(&b1).header_view().sha3();
-		let b2_hash= BlockView::new(&b2).header_view().sha3();
-		let b3a_hash= BlockView::new(&b3a).header_view().sha3();
-		let b3b_hash= BlockView::new(&b3b).header_view().sha3();
+		let genesis = BlockBuilder::genesis();
+		let b1 = genesis.add_block();
+		let b2 = b1.add_block();
+		let b3a = b2.add_block();
+		let b3b = b2.add_block_with_difficulty(9);
+
+		let genesis_hash = genesis.last().hash();
+		let b1_hash = b1.last().hash();
+		let b2_hash = b2.last().hash();
+		let b3a_hash = b3a.last().hash();
+		let b3b_hash = b3b.last().hash();
 
 		// b3a is a part of canon chain, whereas b3b is part of sidechain
-		let best_block_hash = b3a_hash.clone();
+		let best_block_hash = b3a_hash;
 
 		let db = new_db();
-		let bc = new_chain(&genesis, db.clone());
+		let bc = new_chain(&genesis.last().encoded(), db.clone());
 
 		let mut batch = db.transaction();
-		let ir1 = bc.insert_block(&mut batch, &b1, vec![]);
+		let ir1 = bc.insert_block(&mut batch, &b1.last().encoded(), vec![]);
 		bc.commit();
-		let ir2 = bc.insert_block(&mut batch, &b2, vec![]);
+		let ir2 = bc.insert_block(&mut batch, &b2.last().encoded(), vec![]);
 		bc.commit();
-		let ir3b = bc.insert_block(&mut batch, &b3b, vec![]);
+		let ir3b = bc.insert_block(&mut batch, &b3b.last().encoded(), vec![]);
 		bc.commit();
 		db.write(batch).unwrap();
 		assert_eq!(bc.block_hash(3).unwrap(), b3b_hash);
-		let mut batch =db.transaction();
-		let ir3a = bc.insert_block(&mut batch, &b3a, vec![]);
+		let mut batch = db.transaction();
+		let ir3a = bc.insert_block(&mut batch, &b3a.last().encoded(), vec![]);
 		bc.commit();
 		db.write(batch).unwrap();
 
@@ -1852,79 +1773,78 @@ mod tests {
 		assert_eq!(bc.block_hash(3).unwrap(), b3a_hash);
 
 		// test trie route
-		let r0_1 = bc.tree_route(genesis_hash.clone(), b1_hash.clone()).unwrap();
+		let r0_1 = bc.tree_route(genesis_hash, b1_hash).unwrap();
 		assert_eq!(r0_1.ancestor, genesis_hash);
-		assert_eq!(r0_1.blocks, [b1_hash.clone()]);
+		assert_eq!(r0_1.blocks, [b1_hash]);
 		assert_eq!(r0_1.index, 0);
 
-		let r0_2 = bc.tree_route(genesis_hash.clone(), b2_hash.clone()).unwrap();
+		let r0_2 = bc.tree_route(genesis_hash, b2_hash).unwrap();
 		assert_eq!(r0_2.ancestor, genesis_hash);
-		assert_eq!(r0_2.blocks, [b1_hash.clone(), b2_hash.clone()]);
+		assert_eq!(r0_2.blocks, [b1_hash, b2_hash]);
 		assert_eq!(r0_2.index, 0);
 
-		let r1_3a = bc.tree_route(b1_hash.clone(), b3a_hash.clone()).unwrap();
+		let r1_3a = bc.tree_route(b1_hash, b3a_hash).unwrap();
 		assert_eq!(r1_3a.ancestor, b1_hash);
-		assert_eq!(r1_3a.blocks, [b2_hash.clone(), b3a_hash.clone()]);
+		assert_eq!(r1_3a.blocks, [b2_hash, b3a_hash]);
 		assert_eq!(r1_3a.index, 0);
 
-		let r1_3b = bc.tree_route(b1_hash.clone(), b3b_hash.clone()).unwrap();
+		let r1_3b = bc.tree_route(b1_hash, b3b_hash).unwrap();
 		assert_eq!(r1_3b.ancestor, b1_hash);
-		assert_eq!(r1_3b.blocks, [b2_hash.clone(), b3b_hash.clone()]);
+		assert_eq!(r1_3b.blocks, [b2_hash, b3b_hash]);
 		assert_eq!(r1_3b.index, 0);
 
-		let r3a_3b = bc.tree_route(b3a_hash.clone(), b3b_hash.clone()).unwrap();
+		let r3a_3b = bc.tree_route(b3a_hash, b3b_hash).unwrap();
 		assert_eq!(r3a_3b.ancestor, b2_hash);
-		assert_eq!(r3a_3b.blocks, [b3a_hash.clone(), b3b_hash.clone()]);
+		assert_eq!(r3a_3b.blocks, [b3a_hash, b3b_hash]);
 		assert_eq!(r3a_3b.index, 1);
 
-		let r1_0 = bc.tree_route(b1_hash.clone(), genesis_hash.clone()).unwrap();
+		let r1_0 = bc.tree_route(b1_hash, genesis_hash).unwrap();
 		assert_eq!(r1_0.ancestor, genesis_hash);
-		assert_eq!(r1_0.blocks, [b1_hash.clone()]);
+		assert_eq!(r1_0.blocks, [b1_hash]);
 		assert_eq!(r1_0.index, 1);
 
-		let r2_0 = bc.tree_route(b2_hash.clone(), genesis_hash.clone()).unwrap();
+		let r2_0 = bc.tree_route(b2_hash, genesis_hash).unwrap();
 		assert_eq!(r2_0.ancestor, genesis_hash);
-		assert_eq!(r2_0.blocks, [b2_hash.clone(), b1_hash.clone()]);
+		assert_eq!(r2_0.blocks, [b2_hash, b1_hash]);
 		assert_eq!(r2_0.index, 2);
 
-		let r3a_1 = bc.tree_route(b3a_hash.clone(), b1_hash.clone()).unwrap();
+		let r3a_1 = bc.tree_route(b3a_hash, b1_hash).unwrap();
 		assert_eq!(r3a_1.ancestor, b1_hash);
-		assert_eq!(r3a_1.blocks, [b3a_hash.clone(), b2_hash.clone()]);
+		assert_eq!(r3a_1.blocks, [b3a_hash, b2_hash]);
 		assert_eq!(r3a_1.index, 2);
 
-		let r3b_1 = bc.tree_route(b3b_hash.clone(), b1_hash.clone()).unwrap();
+		let r3b_1 = bc.tree_route(b3b_hash, b1_hash).unwrap();
 		assert_eq!(r3b_1.ancestor, b1_hash);
-		assert_eq!(r3b_1.blocks, [b3b_hash.clone(), b2_hash.clone()]);
+		assert_eq!(r3b_1.blocks, [b3b_hash, b2_hash]);
 		assert_eq!(r3b_1.index, 2);
 
-		let r3b_3a = bc.tree_route(b3b_hash.clone(), b3a_hash.clone()).unwrap();
+		let r3b_3a = bc.tree_route(b3b_hash, b3a_hash).unwrap();
 		assert_eq!(r3b_3a.ancestor, b2_hash);
-		assert_eq!(r3b_3a.blocks, [b3b_hash.clone(), b3a_hash.clone()]);
+		assert_eq!(r3b_3a.blocks, [b3b_hash, b3a_hash]);
 		assert_eq!(r3b_3a.index, 1);
 	}
 
 	#[test]
 	fn test_reopen_blockchain_db() {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
-		let first = canon_chain.generate(&mut finalizer).unwrap();
-		let genesis_hash = BlockView::new(&genesis).header_view().sha3();
-		let first_hash = BlockView::new(&first).header_view().sha3();
+		let genesis = BlockBuilder::genesis();
+		let first = genesis.add_block();
+		let genesis_hash = genesis.last().hash();
+		let first_hash = first.last().hash();
+
 		let db = new_db();
 
 		{
-			let bc = new_chain(&genesis, db.clone());
+			let bc = new_chain(&genesis.last().encoded(), db.clone());
 			assert_eq!(bc.best_block_hash(), genesis_hash);
-			let mut batch =db.transaction();
-			bc.insert_block(&mut batch, &first, vec![]);
+			let mut batch = db.transaction();
+			bc.insert_block(&mut batch, &first.last().encoded(), vec![]);
 			db.write(batch).unwrap();
 			bc.commit();
 			assert_eq!(bc.best_block_hash(), first_hash);
 		}
 
 		{
-			let bc = new_chain(&genesis, db.clone());
+			let bc = new_chain(&genesis.last().encoded(), db.clone());
 
 			assert_eq!(bc.best_block_hash(), first_hash);
 		}
@@ -1997,11 +1917,6 @@ mod tests {
 
 	#[test]
 	fn test_logs() {
-		// given
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
-		// just insert dummy transaction so that #transactions=#receipts
 		let t1 = Transaction {
 			nonce: 0.into(),
 			gas_price: 0.into(),
@@ -2029,13 +1944,19 @@ mod tests {
 		let tx_hash1 = t1.hash();
 		let tx_hash2 = t2.hash();
 		let tx_hash3 = t3.hash();
-		let b1 = canon_chain.with_transaction(t1).with_transaction(t2).generate(&mut finalizer).unwrap();
-		let b2 = canon_chain.with_transaction(t3).generate(&mut finalizer).unwrap();
+
+		let genesis = BlockBuilder::genesis();
+		let b1 = genesis.add_block_with_transactions(vec![t1, t2]);
+		let b2 = b1.add_block_with_transactions(iter::once(t3));
+		let b1_hash = b1.last().hash();
+		let b1_number = b1.last().number();
+		let b2_hash = b2.last().hash();
+		let b2_number = b2.last().number();
 
 		let db = new_db();
-		let bc = new_chain(&genesis, db.clone());
-		insert_block(&db, &bc, &b1, vec![Receipt {
-			state_root: Some(H256::default()),
+		let bc = new_chain(&genesis.last().encoded(), db.clone());
+		insert_block(&db, &bc, &b1.last().encoded(), vec![Receipt {
+			outcome: TransactionOutcome::StateRoot(H256::default()),
 			gas_used: 10_000.into(),
 			log_bloom: Default::default(),
 			logs: vec![
@@ -2044,16 +1965,16 @@ mod tests {
 			],
 		},
 		Receipt {
-			state_root: Some(H256::default()),
+			outcome: TransactionOutcome::StateRoot(H256::default()),
 			gas_used: 10_000.into(),
 			log_bloom: Default::default(),
 			logs: vec![
 				LogEntry { address: Default::default(), topics: vec![], data: vec![3], },
 			],
 		}]);
-		insert_block(&db, &bc, &b2, vec![
+		insert_block(&db, &bc, &b2.last().encoded(), vec![
 			Receipt {
-				state_root: Some(H256::default()),
+				outcome: TransactionOutcome::StateRoot(H256::default()),
 				gas_used: 10_000.into(),
 				log_bloom: Default::default(),
 				logs: vec![
@@ -2063,8 +1984,6 @@ mod tests {
 		]);
 
 		// when
-		let block1 = BlockView::new(&b1);
-		let block2 = BlockView::new(&b2);
 		let logs1 = bc.logs(vec![1, 2], |_| true, None);
 		let logs2 = bc.logs(vec![1, 2], |_| true, Some(1));
 
@@ -2072,36 +1991,36 @@ mod tests {
 		assert_eq!(logs1, vec![
 			LocalizedLogEntry {
 				entry: LogEntry { address: Default::default(), topics: vec![], data: vec![1] },
-				block_hash: block1.hash(),
-				block_number: block1.header().number(),
-				transaction_hash: tx_hash1.clone(),
+				block_hash: b1_hash,
+				block_number: b1_number,
+				transaction_hash: tx_hash1,
 				transaction_index: 0,
 				transaction_log_index: 0,
 				log_index: 0,
 			},
 			LocalizedLogEntry {
 				entry: LogEntry { address: Default::default(), topics: vec![], data: vec![2] },
-				block_hash: block1.hash(),
-				block_number: block1.header().number(),
-				transaction_hash: tx_hash1.clone(),
+				block_hash: b1_hash,
+				block_number: b1_number,
+				transaction_hash: tx_hash1,
 				transaction_index: 0,
 				transaction_log_index: 1,
 				log_index: 1,
 			},
 			LocalizedLogEntry {
 				entry: LogEntry { address: Default::default(), topics: vec![], data: vec![3] },
-				block_hash: block1.hash(),
-				block_number: block1.header().number(),
-				transaction_hash: tx_hash2.clone(),
+				block_hash: b1_hash,
+				block_number: b1_number,
+				transaction_hash: tx_hash2,
 				transaction_index: 1,
 				transaction_log_index: 0,
 				log_index: 2,
 			},
 			LocalizedLogEntry {
 				entry: LogEntry { address: Default::default(), topics: vec![], data: vec![4] },
-				block_hash: block2.hash(),
-				block_number: block2.header().number(),
-				transaction_hash: tx_hash3.clone(),
+				block_hash: b2_hash,
+				block_number: b2_number,
+				transaction_hash: tx_hash3,
 				transaction_index: 0,
 				transaction_log_index: 0,
 				log_index: 0,
@@ -2110,9 +2029,9 @@ mod tests {
 		assert_eq!(logs2, vec![
 			LocalizedLogEntry {
 				entry: LogEntry { address: Default::default(), topics: vec![], data: vec![4] },
-				block_hash: block2.hash(),
-				block_number: block2.header().number(),
-				transaction_hash: tx_hash3.clone(),
+				block_hash: b2_hash,
+				block_number: b2_number,
+				transaction_hash: tx_hash3,
 				transaction_index: 0,
 				transaction_log_index: 0,
 				log_index: 0,
@@ -2122,64 +2041,64 @@ mod tests {
 
 	#[test]
 	fn test_bloom_filter_simple() {
-		// TODO: From here
-		let bloom_b1: H2048 = "00000020000000000000000000000000000000000000000002000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000002000".into();
+		let bloom_b1: Bloom = "00000020000000000000000000000000000000000000000002000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000002000".into();
 
-		let bloom_b2: H2048 = "00000000000000000000000000000000000000000000020000001000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".into();
+		let bloom_b2: Bloom = "00000000000000000000000000000000000000000000020000001000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".into();
 
-		let bloom_ba: H2048 = "00000000000000000000000000000000000000000000020000000800000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".into();
+		let bloom_ba: Bloom = "00000000000000000000000000000000000000000000020000000800000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".into();
 
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
-		let mut fork = canon_chain.fork(1);
-		let mut fork_finalizer = finalizer.fork();
-		let b1 = fork.with_bloom(bloom_b1.clone()).generate(&mut fork_finalizer).unwrap();
-		let b2 = fork.with_bloom(bloom_b2.clone()).generate(&mut fork_finalizer).unwrap();
-		let b3 = fork.with_bloom(bloom_ba.clone()).generate(&mut fork_finalizer).unwrap();
-		let b1a = canon_chain.with_bloom(bloom_ba.clone()).generate(&mut finalizer).unwrap();
-		let b2a = canon_chain.with_bloom(bloom_ba.clone()).generate(&mut finalizer).unwrap();
+		let genesis = BlockBuilder::genesis();
+		let b1 = genesis.add_block_with(|| BlockOptions {
+			bloom: bloom_b1.clone(),
+			difficulty: 9.into(),
+			..Default::default()
+		});
+		let b2 = b1.add_block_with_bloom(bloom_b2);
+		let b3 = b2.add_block_with_bloom(bloom_ba);
+
+		let b1a = genesis.add_block_with_bloom(bloom_ba);
+		let b2a = b1a.add_block_with_bloom(bloom_ba);
 
 		let db = new_db();
-		let bc = new_chain(&genesis, db.clone());
+		let bc = new_chain(&genesis.last().encoded(), db.clone());
 
 		let blocks_b1 = bc.blocks_with_bloom(&bloom_b1, 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(&bloom_b2, 0, 5);
-		assert_eq!(blocks_b1, Vec::<BlockNumber>::new());
-		assert_eq!(blocks_b2, Vec::<BlockNumber>::new());
+		assert!(blocks_b1.is_empty());
+		assert!(blocks_b2.is_empty());
 
-		insert_block(&db, &bc, &b1, vec![]);
+		insert_block(&db, &bc, &b1.last().encoded(), vec![]);
 		let blocks_b1 = bc.blocks_with_bloom(&bloom_b1, 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(&bloom_b2, 0, 5);
 		assert_eq!(blocks_b1, vec![1]);
-		assert_eq!(blocks_b2, Vec::<BlockNumber>::new());
+		assert!(blocks_b2.is_empty());
 
-		insert_block(&db, &bc, &b2, vec![]);
+		insert_block(&db, &bc, &b2.last().encoded(), vec![]);
 		let blocks_b1 = bc.blocks_with_bloom(&bloom_b1, 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(&bloom_b2, 0, 5);
 		assert_eq!(blocks_b1, vec![1]);
 		assert_eq!(blocks_b2, vec![2]);
 
 		// hasn't been forked yet
-		insert_block(&db, &bc, &b1a, vec![]);
+		insert_block(&db, &bc, &b1a.last().encoded(), vec![]);
 		let blocks_b1 = bc.blocks_with_bloom(&bloom_b1, 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(&bloom_b2, 0, 5);
 		let blocks_ba = bc.blocks_with_bloom(&bloom_ba, 0, 5);
 		assert_eq!(blocks_b1, vec![1]);
 		assert_eq!(blocks_b2, vec![2]);
-		assert_eq!(blocks_ba, Vec::<BlockNumber>::new());
+		assert!(blocks_ba.is_empty());
 
 		// fork has happend
-		insert_block(&db, &bc, &b2a, vec![]);
+		insert_block(&db, &bc, &b2a.last().encoded(), vec![]);
 		let blocks_b1 = bc.blocks_with_bloom(&bloom_b1, 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(&bloom_b2, 0, 5);
 		let blocks_ba = bc.blocks_with_bloom(&bloom_ba, 0, 5);
-		assert_eq!(blocks_b1, Vec::<BlockNumber>::new());
-		assert_eq!(blocks_b2, Vec::<BlockNumber>::new());
+		assert!(blocks_b1.is_empty());
+		assert!(blocks_b2.is_empty());
 		assert_eq!(blocks_ba, vec![1, 2]);
 
 		// fork back
-		insert_block(&db, &bc, &b3, vec![]);
+		insert_block(&db, &bc, &b3.last().encoded(), vec![]);
 		let blocks_b1 = bc.blocks_with_bloom(&bloom_b1, 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(&bloom_b2, 0, 5);
 		let blocks_ba = bc.blocks_with_bloom(&bloom_ba, 0, 5);
@@ -2188,89 +2107,95 @@ mod tests {
 		assert_eq!(blocks_ba, vec![3]);
 	}
 
+	#[test]
+	fn test_insert_unordered() {
+		let bloom_b1: Bloom = "00000020000000000000000000000000000000000000000002000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000002000".into();
+
+		let bloom_b2: Bloom = "00000000000000000000000000000000000000000000020000001000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".into();
+
+		let bloom_b3: Bloom = "00000000000000000000000000000000000000000000020000000800000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".into();
+
+		let genesis = BlockBuilder::genesis();
+		let b1 = genesis.add_block_with_bloom(bloom_b1);
+		let b2 = b1.add_block_with_bloom(bloom_b2);
+		let b3 = b2.add_block_with_bloom(bloom_b3);
+		let b1_total_difficulty = genesis.last().difficulty() + b1.last().difficulty();
+
+		let db = new_db();
+		let bc = new_chain(&genesis.last().encoded(), db.clone());
+		let mut batch = db.transaction();
+		bc.insert_unordered_block(&mut batch, &b2.last().encoded(), vec![], Some(b1_total_difficulty), false, false);
+		bc.commit();
+		bc.insert_unordered_block(&mut batch, &b3.last().encoded(), vec![], None, true, false);
+		bc.commit();
+		bc.insert_unordered_block(&mut batch, &b1.last().encoded(), vec![], None, false, false);
+		bc.commit();
+		db.write(batch).unwrap();
+
+		assert_eq!(bc.best_block_hash(), b3.last().hash());
+		assert_eq!(bc.block_hash(1).unwrap(), b1.last().hash());
+		assert_eq!(bc.block_hash(2).unwrap(), b2.last().hash());
+		assert_eq!(bc.block_hash(3).unwrap(), b3.last().hash());
+
+		let blocks_b1 = bc.blocks_with_bloom(&bloom_b1, 0, 3);
+		let blocks_b2 = bc.blocks_with_bloom(&bloom_b2, 0, 3);
+		let blocks_b3 = bc.blocks_with_bloom(&bloom_b3, 0, 3);
+
+		assert_eq!(blocks_b1, vec![1]);
+		assert_eq!(blocks_b2, vec![2]);
+		assert_eq!(blocks_b3, vec![3]);
+	}
+
 	#[test]
 	fn test_best_block_update() {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
+		let genesis = BlockBuilder::genesis();
+		let next_5 = genesis.add_blocks(5);
+		let uncle = genesis.add_block_with_difficulty(9);
+		let generator = BlockGenerator::new(iter::once(next_5));
 
 		let db = new_db();
 		{
-			let bc = new_chain(&genesis, db.clone());
-			let uncle = canon_chain.fork(1).generate(&mut finalizer.fork()).unwrap();
+			let bc = new_chain(&genesis.last().encoded(), db.clone());
 
 			let mut batch = db.transaction();
 			// create a longer fork
-			for _ in 0..5 {
-				let canon_block = canon_chain.generate(&mut finalizer).unwrap();
-				bc.insert_block(&mut batch, &canon_block, vec![]);
+			for block in generator {
+				bc.insert_block(&mut batch, &block.encoded(), vec![]);
 				bc.commit();
 			}
 
 			assert_eq!(bc.best_block_number(), 5);
-			bc.insert_block(&mut batch, &uncle, vec![]);
+			bc.insert_block(&mut batch, &uncle.last().encoded(), vec![]);
 			db.write(batch).unwrap();
 			bc.commit();
 		}
 
 		// re-loading the blockchain should load the correct best block.
-		let bc = new_chain(&genesis, db);
+		let bc = new_chain(&genesis.last().encoded(), db);
 		assert_eq!(bc.best_block_number(), 5);
 	}
 
-	#[test]
-	fn test_rewind() {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
-		let first = canon_chain.generate(&mut finalizer).unwrap();
-		let second = canon_chain.generate(&mut finalizer).unwrap();
-		let genesis_hash = BlockView::new(&genesis).header_view().sha3();
-		let first_hash = BlockView::new(&first).header_view().sha3();
-		let second_hash = BlockView::new(&second).header_view().sha3();
-
-		let db = new_db();
-		let bc = new_chain(&genesis, db.clone());
-
-		let mut batch =db.transaction();
-		bc.insert_block(&mut batch, &first, vec![]);
-		bc.commit();
-		bc.insert_block(&mut batch, &second, vec![]);
-		bc.commit();
-		db.write(batch).unwrap();
-
-		assert_eq!(bc.rewind(), Some(first_hash.clone()));
-		assert!(!bc.is_known(&second_hash));
-		assert_eq!(bc.best_block_number(), 1);
-		assert_eq!(bc.best_block_hash(), first_hash.clone());
-
-		assert_eq!(bc.rewind(), Some(genesis_hash.clone()));
-		assert_eq!(bc.rewind(), None);
-	}
-
 	#[test]
 	fn epoch_transitions_iter() {
 		use ::engines::EpochTransition;
 
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
+		let genesis = BlockBuilder::genesis();
+		let next_5 = genesis.add_blocks(5);
+		let uncle = genesis.add_block_with_difficulty(9);
+		let generator = BlockGenerator::new(iter::once(next_5));
 
 		let db = new_db();
 		{
-			let bc = new_chain(&genesis, db.clone());
-			let uncle = canon_chain.fork(1).generate(&mut finalizer.fork()).unwrap();
+			let bc = new_chain(&genesis.last().encoded(), db.clone());
 
 			let mut batch = db.transaction();
 			// create a longer fork
-			for i in 0..5 {
-				let canon_block = canon_chain.generate(&mut finalizer).unwrap();
-				let hash = BlockView::new(&canon_block).header_view().sha3();
-
-				bc.insert_block(&mut batch, &canon_block, vec![]);
-				bc.insert_epoch_transition(&mut batch, i, EpochTransition {
-					block_hash: hash,
-					block_number: i + 1,
+			for (i, block) in generator.into_iter().enumerate() {
+
+				bc.insert_block(&mut batch, &block.encoded(), vec![]);
+				bc.insert_epoch_transition(&mut batch, i as u64, EpochTransition {
+					block_hash: block.hash(),
+					block_number: i as u64 + 1,
 					proof: vec![],
 				});
 				bc.commit();
@@ -2278,10 +2203,9 @@ mod tests {
 
 			assert_eq!(bc.best_block_number(), 5);
 
-			let hash = BlockView::new(&uncle).header_view().sha3();
-			bc.insert_block(&mut batch, &uncle, vec![]);
+			bc.insert_block(&mut batch, &uncle.last().encoded(), vec![]);
 			bc.insert_epoch_transition(&mut batch, 999, EpochTransition {
-				block_hash: hash,
+				block_hash: uncle.last().hash(),
 				block_number: 1,
 				proof: vec![],
 			});
@@ -2294,7 +2218,7 @@ mod tests {
 		}
 
 		// re-loading the blockchain should load the correct best block.
-		let bc = new_chain(&genesis, db);
+		let bc = new_chain(&genesis.last().encoded(), db);
 
 		assert_eq!(bc.best_block_number(), 5);
 		assert_eq!(bc.epoch_transitions().map(|(i, _)| i).collect::<Vec<_>>(), vec![0, 1, 2, 3, 4]);
@@ -2304,13 +2228,18 @@ mod tests {
 	fn epoch_transition_for() {
 		use ::engines::EpochTransition;
 
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let genesis = canon_chain.generate(&mut finalizer).unwrap();
+		let genesis = BlockBuilder::genesis();
+		let fork_7 = genesis.add_blocks_with(7, || BlockOptions {
+			difficulty: 9.into(),
+			..Default::default()
+		});
+		let next_10 = genesis.add_blocks(10);
+		let fork_generator = BlockGenerator::new(iter::once(fork_7));
+		let next_generator = BlockGenerator::new(iter::once(next_10));
 
 		let db = new_db();
 
-		let bc = new_chain(&genesis, db.clone());
+		let bc = new_chain(&genesis.last().encoded(), db.clone());
 
 		let mut batch = db.transaction();
 		bc.insert_epoch_transition(&mut batch, 0, EpochTransition {
@@ -2323,14 +2252,10 @@ mod tests {
 		// set up a chain where we have a canonical chain of 10 blocks
 		// and a non-canonical fork of 8 from genesis.
 		let fork_hash = {
-			let mut fork_chain = canon_chain.fork(1);
-			let mut fork_finalizer = finalizer.fork();
-
-			for _ in 0..7 {
+			for block in fork_generator {
 				let mut batch = db.transaction();
-				let fork_block = fork_chain.generate(&mut fork_finalizer).unwrap();
 
-				bc.insert_block(&mut batch, &fork_block, vec![]);
+				bc.insert_block(&mut batch, &block.encoded(), vec![]);
 				bc.commit();
 				db.write(batch).unwrap();
 			}
@@ -2339,11 +2264,9 @@ mod tests {
 			bc.chain_info().best_block_hash
 		};
 
-		for _ in 0..10 {
+		for block in next_generator {
 			let mut batch = db.transaction();
-			let canon_block = canon_chain.generate(&mut finalizer).unwrap();
-
-			bc.insert_block(&mut batch, &canon_block, vec![]);
+			bc.insert_block(&mut batch, &block.encoded(), vec![]);
 			bc.commit();
 
 			db.write(batch).unwrap();
diff --git a/ethcore/src/blockchain/config.rs b/ethcore/src/blockchain/config.rs
index 4be606b33fa664a88c4aa8b3eefe7cf0eb78c019..312289b060abdaf5b5ee738cd3a489b43283269a 100644
--- a/ethcore/src/blockchain/config.rs
+++ b/ethcore/src/blockchain/config.rs
@@ -23,8 +23,6 @@ pub struct Config {
 	pub pref_cache_size: usize,
 	/// Maximum cache size in bytes.
 	pub max_cache_size: usize,
-	/// Backing db cache_size
-	pub db_cache_size: Option<usize>,
 }
 
 impl Default for Config {
@@ -32,8 +30,6 @@ impl Default for Config {
 		Config {
 			pref_cache_size: 1 << 14,
 			max_cache_size: 1 << 20,
-			db_cache_size: None,
 		}
 	}
 }
-
diff --git a/ethcore/src/blockchain/extras.rs b/ethcore/src/blockchain/extras.rs
index 0e2396f8c699a469b7a68216a07ad91d05da8722..97583a693a6c9a72661ea00542577d30fbef1f6f 100644
--- a/ethcore/src/blockchain/extras.rs
+++ b/ethcore/src/blockchain/extras.rs
@@ -18,15 +18,15 @@
 
 use std::ops;
 use std::io::Write;
-use bloomchain;
 use blooms::{GroupPosition, BloomGroup};
 use db::Key;
 use engines::epoch::{Transition as EpochTransition};
 use header::BlockNumber;
 use receipt::Receipt;
 
-use util::{HeapSizeOf, H256, H264, U256};
-use util::kvdb::PREFIX_LEN as DB_PREFIX_LEN;
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, H264, U256};
+use kvdb::PREFIX_LEN as DB_PREFIX_LEN;
 
 /// Represents index of extra data in database
 #[derive(Copy, Debug, Hash, Eq, PartialEq, Clone)]
@@ -96,32 +96,17 @@ impl ops::Deref for LogGroupKey {
 	}
 }
 
-#[derive(Debug, PartialEq, Eq, Hash, Clone)]
-pub struct LogGroupPosition(GroupPosition);
-
-impl From<bloomchain::group::GroupPosition> for LogGroupPosition {
-	fn from(position: bloomchain::group::GroupPosition) -> Self {
-		LogGroupPosition(From::from(position))
-	}
-}
-
-impl HeapSizeOf for LogGroupPosition {
-	fn heap_size_of_children(&self) -> usize {
-		self.0.heap_size_of_children()
-	}
-}
-
-impl Key<BloomGroup> for LogGroupPosition {
+impl Key<BloomGroup> for GroupPosition {
 	type Target = LogGroupKey;
 
 	fn key(&self) -> Self::Target {
 		let mut result = [0u8; 6];
 		result[0] = ExtrasIndex::BlocksBlooms as u8;
-		result[1] = self.0.level;
-		result[2] = (self.0.index >> 24) as u8;
-		result[3] = (self.0.index >> 16) as u8;
-		result[4] = (self.0.index >> 8) as u8;
-		result[5] = self.0.index as u8;
+		result[1] = self.level;
+		result[2] = (self.index >> 24) as u8;
+		result[3] = (self.index >> 16) as u8;
+		result[4] = (self.index >> 8) as u8;
+		result[5] = self.index as u8;
 		LogGroupKey(result)
 	}
 }
diff --git a/ethcore/src/blockchain/generator.rs b/ethcore/src/blockchain/generator.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5f990a4d98050d83d618f6bcdf96f584c0c446b7
--- /dev/null
+++ b/ethcore/src/blockchain/generator.rs
@@ -0,0 +1,223 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Blockchain generator for tests.
+
+use std::collections::VecDeque;
+use ethereum_types::{U256, H256, Bloom};
+
+use bytes::Bytes;
+use header::Header;
+use rlp::encode;
+use transaction::SignedTransaction;
+use views::BlockView;
+
+/// Helper structure, used for encoding blocks.
+#[derive(Default, Clone, RlpEncodable)]
+pub struct Block {
+	pub header: Header,
+	pub transactions: Vec<SignedTransaction>,
+	pub uncles: Vec<Header>
+}
+
+impl Block {
+	#[inline]
+	pub fn header(&self) -> Header {
+		self.header.clone()
+	}
+
+	#[inline]
+	pub fn hash(&self) -> H256 {
+		BlockView::new(&self.encoded()).header_view().hash()
+	}
+
+	#[inline]
+	pub fn number(&self) -> u64 {
+		self.header.number()
+	}
+
+	#[inline]
+	pub fn encoded(&self) -> Bytes {
+		encode(self).into_vec()
+	}
+
+	#[inline]
+	pub fn difficulty(&self) -> U256 {
+		*self.header.difficulty()
+	}
+}
+
+#[derive(Debug)]
+pub struct BlockOptions {
+	pub difficulty: U256,
+	pub bloom: Bloom,
+	pub transactions: Vec<SignedTransaction>,
+}
+
+impl Default for BlockOptions {
+	fn default() -> Self {
+		BlockOptions {
+			difficulty: 10.into(),
+			bloom: Bloom::default(),
+			transactions: Vec::new(),
+		}
+	}
+}
+
+#[derive(Clone)]
+pub struct BlockBuilder {
+	blocks: VecDeque<Block>,
+}
+
+impl BlockBuilder {
+	pub fn genesis() -> Self {
+		let mut blocks = VecDeque::with_capacity(1);
+		blocks.push_back(Block::default());
+
+		BlockBuilder {
+			blocks,
+		}
+	}
+
+	#[inline]
+	pub fn add_block(&self) -> Self {
+		self.add_block_with(|| BlockOptions::default())
+	}
+
+	#[inline]
+	pub fn add_blocks(&self, count: usize) -> Self {
+		self.add_blocks_with(count, || BlockOptions::default())
+	}
+
+	#[inline]
+	pub fn add_block_with<T>(&self, get_metadata: T) -> Self where T: Fn() -> BlockOptions {
+		self.add_blocks_with(1, get_metadata)
+	}
+
+	#[inline]
+	pub fn add_block_with_difficulty<T>(&self, difficulty: T) -> Self where T: Into<U256> {
+		let difficulty = difficulty.into();
+		self.add_blocks_with(1, move || BlockOptions {
+			difficulty,
+			..Default::default()
+		})
+	}
+
+	#[inline]
+	pub fn add_block_with_transactions<T>(&self, transactions: T) -> Self
+		where T: IntoIterator<Item = SignedTransaction> {
+		let transactions = transactions.into_iter().collect::<Vec<_>>();
+		self.add_blocks_with(1, || BlockOptions {
+			transactions: transactions.clone(),
+			..Default::default()
+		})
+	}
+
+	#[inline]
+	pub fn add_block_with_bloom(&self, bloom: Bloom) -> Self {
+		self.add_blocks_with(1, move || BlockOptions {
+			bloom,
+			..Default::default()
+		})
+	}
+
+	pub fn add_blocks_with<T>(&self, count: usize, get_metadata: T) -> Self where T: Fn() -> BlockOptions {
+		assert!(count > 0, "There must be at least 1 block");
+		let mut parent_hash = self.last().hash();
+		let mut parent_number = self.last().number();
+		let mut blocks = VecDeque::with_capacity(count);
+		for _ in 0..count {
+			let mut block = Block::default();
+			let metadata = get_metadata();
+			let block_number = parent_number + 1;
+			block.header.set_parent_hash(parent_hash);
+			block.header.set_number(block_number);
+			block.header.set_log_bloom(metadata.bloom);
+			block.header.set_difficulty(metadata.difficulty);
+			block.transactions = metadata.transactions;
+
+			parent_hash = block.hash();
+			parent_number = block_number;
+
+			blocks.push_back(block);
+		}
+
+		BlockBuilder {
+			blocks,
+		}
+	}
+
+	#[inline]
+	pub fn last(&self) -> &Block {
+		self.blocks.back().expect("There is always at least 1 block")
+	}
+}
+
+#[derive(Clone)]
+pub struct BlockGenerator {
+	builders: VecDeque<BlockBuilder>,
+}
+
+impl BlockGenerator {
+	pub fn new<T>(builders: T) -> Self where T: IntoIterator<Item = BlockBuilder> {
+		BlockGenerator {
+			builders: builders.into_iter().collect(),
+		}
+	}
+}
+
+impl Iterator for BlockGenerator {
+	type Item = Block;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		loop {
+			match self.builders.front_mut() {
+				Some(ref mut builder) => {
+					if let Some(block) = builder.blocks.pop_front() {
+						return Some(block);
+					}
+				},
+				None => return None,
+			}
+			self.builders.pop_front();
+		}
+
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{BlockBuilder, BlockOptions, BlockGenerator};
+
+	#[test]
+	fn test_block_builder() {
+		let genesis = BlockBuilder::genesis();
+		let block_1 = genesis.add_block();
+		let block_1001 = block_1.add_blocks(1000);
+		let block_1002 = block_1001.add_block_with(|| BlockOptions::default());
+		let generator = BlockGenerator::new(vec![genesis, block_1, block_1001, block_1002]);
+		assert_eq!(generator.count(), 1003);
+	}
+
+	#[test]
+	fn test_block_builder_fork() {
+		let genesis = BlockBuilder::genesis();
+		let block_10a = genesis.add_blocks(10);
+		let block_11b = genesis.add_blocks(11);
+		assert_eq!(block_10a.last().number(), 10);
+		assert_eq!(block_11b.last().number(), 11);
+	}
+}
diff --git a/ethcore/src/blockchain/generator/block.rs b/ethcore/src/blockchain/generator/block.rs
deleted file mode 100644
index 05fd1503128e143543825fd17b00a9fd900ccd86..0000000000000000000000000000000000000000
--- a/ethcore/src/blockchain/generator/block.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use rlp::*;
-use util::{H256, H2048};
-use util::bytes::Bytes;
-use header::Header;
-use transaction::SignedTransaction;
-
-use super::fork::Forkable;
-use super::bloom::WithBloom;
-use super::complete::CompleteBlock;
-use super::transaction::WithTransaction;
-
-/// Helper structure, used for encoding blocks.
-#[derive(Default)]
-pub struct Block {
-	pub header: Header,
-	pub transactions: Vec<SignedTransaction>,
-	pub uncles: Vec<Header>
-}
-
-impl Encodable for Block {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		s.begin_list(3);
-		s.append(&self.header);
-		s.append_list(&self.transactions);
-		s.append_list(&self.uncles);
-	}
-}
-
-impl Forkable for Block {
-	fn fork(mut self, fork_number: usize) -> Self where Self: Sized {
-		let difficulty = self.header.difficulty().clone() - fork_number.into();
-		self.header.set_difficulty(difficulty);
-		self
-	}
-}
-
-impl WithBloom for Block {
-	fn with_bloom(mut self, bloom: H2048) -> Self where Self: Sized {
-		self.header.set_log_bloom(bloom);
-		self
-	}
-}
-
-impl WithTransaction for Block {
-	fn with_transaction(mut self, transaction: SignedTransaction) -> Self where Self: Sized {
-		self.transactions.push(transaction);
-		self
-	}
-}
-
-impl CompleteBlock for Block {
-	fn complete(mut self, parent_hash: H256) -> Bytes {
-		self.header.set_parent_hash(parent_hash);
-		encode(&self).into_vec()
-	}
-}
diff --git a/ethcore/src/blockchain/generator/bloom.rs b/ethcore/src/blockchain/generator/bloom.rs
deleted file mode 100644
index 5f39a49b847175c79ff0a33ff9fd24e92b45b74f..0000000000000000000000000000000000000000
--- a/ethcore/src/blockchain/generator/bloom.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use util::hash::H2048;
-
-pub trait WithBloom {
-	fn with_bloom(self, bloom: H2048) -> Self where Self: Sized;
-}
-
-pub struct Bloom<'a, I> where I: 'a {
-	pub iter: &'a mut I,
-	pub bloom: H2048,
-}
-
-impl<'a, I> Iterator for Bloom<'a, I> where I: Iterator, <I as Iterator>::Item: WithBloom {
-	type Item = <I as Iterator>::Item;
-
-	#[inline]
-	fn next(&mut self) -> Option<Self::Item> {
-		self.iter.next().map(|item| item.with_bloom(self.bloom.clone()))
-	}
-}
diff --git a/ethcore/src/blockchain/generator/complete.rs b/ethcore/src/blockchain/generator/complete.rs
deleted file mode 100644
index 0c22d4dfc971d4218d929d457bc3dc047635342c..0000000000000000000000000000000000000000
--- a/ethcore/src/blockchain/generator/complete.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use util::hash::H256;
-use util::bytes::Bytes;
-use util::sha3::Hashable;
-use views::BlockView;
-
-#[derive(Default, Clone)]
-pub struct BlockFinalizer {
-	parent_hash: H256
-}
-
-impl BlockFinalizer {
-	pub fn fork(&self) -> Self {
-		self.clone()
-	}
-}
-
-pub trait CompleteBlock {
-	fn complete(self, parent_hash: H256) -> Bytes;
-}
-
-pub struct Complete<'a, I> where I: 'a {
-	pub iter: &'a mut I,
-	pub finalizer: &'a mut BlockFinalizer,
-}
-
-impl<'a, I> Iterator for Complete<'a, I> where I: Iterator, <I as Iterator>::Item: CompleteBlock {
-	type Item = Bytes;
-
-	#[inline]
-	fn next(&mut self) -> Option<Self::Item> {
-		self.iter.next().map(|item| {
-			let rlp = item.complete(self.finalizer.parent_hash.clone());
-			self.finalizer.parent_hash = BlockView::new(&rlp).header_view().sha3();
-			rlp
-		})
-	}
-}
diff --git a/ethcore/src/blockchain/generator/fork.rs b/ethcore/src/blockchain/generator/fork.rs
deleted file mode 100644
index 4f09f3c0413d067581ff55d7a9b58ca937fb0395..0000000000000000000000000000000000000000
--- a/ethcore/src/blockchain/generator/fork.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-pub trait Forkable {
-	fn fork(self, fork_number: usize) -> Self where Self: Sized;
-}
-
-pub struct Fork<I> {
-	pub iter: I,
-	pub fork_number: usize,
-}
-
-impl<I> Clone for Fork<I> where I: Iterator + Clone {
-	fn clone(&self) -> Self {
-		Fork {
-			iter: self.iter.clone(),
-			fork_number: self.fork_number
-		}
-	}
-}
-
-impl<I> Iterator for Fork<I> where I: Iterator, <I as Iterator>::Item: Forkable {
-	type Item = <I as Iterator>::Item;
-
-	#[inline]
-	fn next(&mut self) -> Option<Self::Item> {
-		self.iter.next().map(|item| item.fork(self.fork_number))
-	}
-}
diff --git a/ethcore/src/blockchain/generator/generator.rs b/ethcore/src/blockchain/generator/generator.rs
deleted file mode 100644
index a2c2c441a4678a468a9e1ee6297e13cce34a8a55..0000000000000000000000000000000000000000
--- a/ethcore/src/blockchain/generator/generator.rs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use util::{U256, H2048, Bytes};
-use header::BlockNumber;
-use transaction::SignedTransaction;
-use super::fork::Fork;
-use super::bloom::Bloom;
-use super::complete::{BlockFinalizer, CompleteBlock, Complete};
-use super::block::Block;
-use super::transaction::Transaction;
-
-/// Chain iterator interface.
-pub trait ChainIterator: Iterator + Sized {
-	/// Should be called to create a fork of current iterator.
-	/// Blocks generated by fork will have lower difficulty than current chain.
-	fn fork(&self, fork_number: usize) -> Fork<Self> where Self: Clone;
-	/// Should be called to make every consecutive block have given bloom.
-	fn with_bloom(&mut self, bloom: H2048) -> Bloom<Self>;
-	/// Should be called to make every consecutive block have given transaction.
-	fn with_transaction(&mut self, transaction: SignedTransaction) -> Transaction<Self>;
-	/// Should be called to complete block. Without complete, block may have incorrect hash.
-	fn complete<'a>(&'a mut self, finalizer: &'a mut BlockFinalizer) -> Complete<'a, Self>;
-	/// Completes and generates block.
-	fn generate<'a>(&'a mut self, finalizer: &'a mut BlockFinalizer) -> Option<Bytes> where Self::Item: CompleteBlock;
-}
-
-impl<I> ChainIterator for I where I: Iterator + Sized {
-	fn fork(&self, fork_number: usize) -> Fork<Self> where I: Clone {
-		Fork {
-			iter: self.clone(),
-			fork_number: fork_number
-		}
-	}
-
-	fn with_bloom(&mut self, bloom: H2048) -> Bloom<Self> {
-		Bloom {
-			iter: self,
-			bloom: bloom
-		}
-	}
-
-	fn with_transaction(&mut self, transaction: SignedTransaction) -> Transaction<Self> {
-		Transaction {
-			iter: self,
-			transaction: transaction,
-		}
-	}
-
-	fn complete<'a>(&'a mut self, finalizer: &'a mut BlockFinalizer) -> Complete<'a, Self> {
-		Complete {
-			iter: self,
-			finalizer: finalizer
-		}
-	}
-
-	fn generate<'a>(&'a mut self, finalizer: &'a mut BlockFinalizer) -> Option<Bytes> where <I as Iterator>::Item: CompleteBlock {
-		self.complete(finalizer).next()
-	}
-}
-
-/// Blockchain generator.
-#[derive(Clone)]
-pub struct ChainGenerator {
-	/// Next block number.
-	number: BlockNumber,
-	/// Next block difficulty.
-	difficulty: U256,
-}
-
-impl ChainGenerator {
-	fn prepare_block(&self) -> Block {
-		let mut block = Block::default();
-		block.header.set_number(self.number);
-		block.header.set_difficulty(self.difficulty);
-		block
-	}
-}
-
-impl Default for ChainGenerator {
-	fn default() -> Self {
-		ChainGenerator {
-			number: 0,
-			difficulty: 1000.into(),
-		}
-	}
-}
-
-impl Iterator for ChainGenerator {
-	type Item = Block;
-
-	fn next(&mut self) -> Option<Self::Item> {
-		let block = self.prepare_block();
-		self.number += 1;
-		Some(block)
-	}
-}
-
-mod tests {
-	use util::hash::{H256, H2048};
-	use util::sha3::Hashable;
-	use views::BlockView;
-	use blockchain::generator::{ChainIterator, ChainGenerator, BlockFinalizer};
-
-	#[test]
-	fn canon_chain_generator() {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-
-		let genesis_rlp = canon_chain.generate(&mut finalizer).unwrap();
-		let genesis = BlockView::new(&genesis_rlp);
-
-		assert_eq!(genesis.header_view().parent_hash(), H256::default());
-		assert_eq!(genesis.header_view().number(), 0);
-
-		let b1_rlp = canon_chain.generate(&mut finalizer).unwrap();
-		let b1 = BlockView::new(&b1_rlp);
-
-		assert_eq!(b1.header_view().parent_hash(), genesis.header_view().sha3());
-		assert_eq!(b1.header_view().number(), 1);
-
-		let mut fork_chain = canon_chain.fork(1);
-
-		let b2_rlp_fork = fork_chain.generate(&mut finalizer.fork()).unwrap();
-		let b2_fork = BlockView::new(&b2_rlp_fork);
-
-		assert_eq!(b2_fork.header_view().parent_hash(), b1.header_view().sha3());
-		assert_eq!(b2_fork.header_view().number(), 2);
-
-		let b2_rlp = canon_chain.generate(&mut finalizer).unwrap();
-		let b2 = BlockView::new(&b2_rlp);
-
-		assert_eq!(b2.header_view().parent_hash(), b1.header_view().sha3());
-		assert_eq!(b2.header_view().number(), 2);
-		assert!(b2.header_view().difficulty() > b2_fork.header_view().difficulty());
-	}
-
-	#[test]
-	fn with_bloom_generator() {
-		let bloom = H2048([0x1; 256]);
-		let mut gen = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-
-		let block0_rlp = gen.with_bloom(bloom).generate(&mut finalizer).unwrap();
-		let block1_rlp = gen.generate(&mut finalizer).unwrap();
-		let block0 = BlockView::new(&block0_rlp);
-		let block1 = BlockView::new(&block1_rlp);
-
-		assert_eq!(block0.header_view().number(), 0);
-		assert_eq!(block0.header_view().parent_hash(), H256::default());
-
-		assert_eq!(block1.header_view().number(), 1);
-		assert_eq!(block1.header_view().parent_hash(), block0.header_view().sha3());
-
-	}
-
-	#[test]
-	fn generate_1000_blocks() {
-		let generator = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let blocks: Vec<_> = generator.take(1000).complete(&mut finalizer).collect();
-		assert_eq!(blocks.len(), 1000);
-	}
-}
-
diff --git a/ethcore/src/blockchain/generator/mod.rs b/ethcore/src/blockchain/generator/mod.rs
deleted file mode 100644
index c32c4a3d7cb139805d8c1319592039f48d9dcfec..0000000000000000000000000000000000000000
--- a/ethcore/src/blockchain/generator/mod.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Blockchain generator for tests.
-
-mod bloom;
-mod block;
-mod complete;
-mod fork;
-pub mod generator;
-mod transaction;
-
-pub use self::complete::BlockFinalizer;
-pub use self::generator::{ChainIterator, ChainGenerator};
diff --git a/ethcore/src/blockchain/import_route.rs b/ethcore/src/blockchain/import_route.rs
index e86639e73d0290ca85297088ec9521cf6e9128da..cf5d3ca1e78d2542877d97e13c8408ba9cedbc69 100644
--- a/ethcore/src/blockchain/import_route.rs
+++ b/ethcore/src/blockchain/import_route.rs
@@ -16,7 +16,7 @@
 
 //! Import route.
 
-use util::H256;
+use ethereum_types::H256;
 use blockchain::block_info::{BlockInfo, BlockLocation};
 
 /// Import route for newly inserted block.
@@ -67,7 +67,7 @@ impl From<BlockInfo> for ImportRoute {
 
 #[cfg(test)]
 mod tests {
-	use util::{U256, H256};
+	use ethereum_types::{H256, U256};
 	use blockchain::block_info::{BlockInfo, BlockLocation, BranchBecomingCanonChainData};
 	use blockchain::ImportRoute;
 
diff --git a/ethcore/src/blockchain/mod.rs b/ethcore/src/blockchain/mod.rs
index 55a67e2b65ea6bddf22616841dbd62188daaeebe..062068c704de03d2b8d049dead0525fba3d292f1 100644
--- a/ethcore/src/blockchain/mod.rs
+++ b/ethcore/src/blockchain/mod.rs
@@ -18,10 +18,10 @@
 
 mod best_block;
 mod block_info;
-pub mod blockchain;
+mod blockchain;
 mod cache;
 mod config;
-pub mod extras;
+mod extras;
 mod import_route;
 mod update;
 
@@ -31,5 +31,6 @@ pub mod generator;
 pub use self::blockchain::{BlockProvider, BlockChain};
 pub use self::cache::CacheSize;
 pub use self::config::Config;
-pub use types::tree_route::TreeRoute;
+pub use self::extras::{BlockReceipts, BlockDetails, TransactionAddress};
 pub use self::import_route::ImportRoute;
+pub use types::tree_route::TreeRoute;
diff --git a/ethcore/src/blockchain/update.rs b/ethcore/src/blockchain/update.rs
index 914b8aa996a264ddfd36844616cc2aa948e983bb..467ccc8d17b7a93dc0162aab350c3ead20bd0798 100644
--- a/ethcore/src/blockchain/update.rs
+++ b/ethcore/src/blockchain/update.rs
@@ -1,9 +1,9 @@
 use std::collections::HashMap;
-use util::H256;
+use ethereum_types::H256;
 use header::BlockNumber;
 use blockchain::block_info::BlockInfo;
-use blooms::BloomGroup;
-use super::extras::{BlockDetails, BlockReceipts, TransactionAddress, LogGroupPosition};
+use blockchain::extras::{BlockDetails, BlockReceipts, TransactionAddress};
+use blooms::{BloomGroup, GroupPosition};
 
 /// Block extras update info.
 pub struct ExtrasUpdate<'a> {
@@ -20,7 +20,7 @@ pub struct ExtrasUpdate<'a> {
 	/// Modified block receipts.
 	pub block_receipts: HashMap<H256, BlockReceipts>,
 	/// Modified blocks blooms.
-	pub blocks_blooms: HashMap<LogGroupPosition, BloomGroup>,
+	pub blocks_blooms: HashMap<GroupPosition, BloomGroup>,
 	/// Modified transaction addresses (None signifies removed transactions).
 	pub transactions_addresses: HashMap<H256, Option<TransactionAddress>>,
 }
diff --git a/ethcore/src/blooms/bloom.rs b/ethcore/src/blooms/bloom.rs
deleted file mode 100644
index c79091cb4d01be871f60216d6510d2a7f70a864d..0000000000000000000000000000000000000000
--- a/ethcore/src/blooms/bloom.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use bloomchain as bc;
-use util::HeapSizeOf;
-use basic_types::LogBloom;
-
-/// Helper structure representing bloom of the trace.
-#[derive(Debug, Clone, RlpEncodableWrapper, RlpDecodableWrapper)]
-pub struct Bloom(LogBloom);
-
-impl From<LogBloom> for Bloom {
-	fn from(bloom: LogBloom) -> Self {
-		Bloom(bloom)
-	}
-}
-
-impl From<bc::Bloom> for Bloom {
-	fn from(bloom: bc::Bloom) -> Self {
-		let bytes: [u8; 256] = bloom.into();
-		Bloom(LogBloom::from(bytes))
-	}
-}
-
-impl Into<bc::Bloom> for Bloom {
-	fn into(self) -> bc::Bloom {
-		let log = self.0;
-		bc::Bloom::from(log.0)
-	}
-}
-
-impl HeapSizeOf for Bloom {
-	fn heap_size_of_children(&self) -> usize {
-		0
-	}
-}
diff --git a/ethcore/src/blooms/bloom_group.rs b/ethcore/src/blooms/bloom_group.rs
index 087f20b6fda2f2058f07eccc3de9487fe5fcc863..4b47b1ad9473b9ff55068d34d4720c7e854e668d 100644
--- a/ethcore/src/blooms/bloom_group.rs
+++ b/ethcore/src/blooms/bloom_group.rs
@@ -15,58 +15,39 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use bloomchain::group as bc;
-use rlp::*;
-use util::HeapSizeOf;
-use super::Bloom;
+use heapsize::HeapSizeOf;
+use ethereum_types::Bloom;
 
 /// Represents group of X consecutive blooms.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, RlpEncodableWrapper, RlpDecodableWrapper)]
 pub struct BloomGroup {
 	blooms: Vec<Bloom>,
 }
 
+impl BloomGroup {
+	pub fn accrue_bloom_group(&mut self, group: &BloomGroup) {
+		for (bloom, other) in self.blooms.iter_mut().zip(group.blooms.iter()) {
+			bloom.accrue_bloom(other);
+		}
+	}
+}
+
 impl From<bc::BloomGroup> for BloomGroup {
 	fn from(group: bc::BloomGroup) -> Self {
-		let blooms = group.blooms
-			.into_iter()
-			.map(From::from)
-			.collect();
-
 		BloomGroup {
-			blooms: blooms
+			blooms: group.blooms
 		}
 	}
 }
 
 impl Into<bc::BloomGroup> for BloomGroup {
 	fn into(self) -> bc::BloomGroup {
-		let blooms = self.blooms
-			.into_iter()
-			.map(Into::into)
-			.collect();
-
 		bc::BloomGroup {
-			blooms: blooms
+			blooms: self.blooms
 		}
 	}
 }
 
-impl Decodable for BloomGroup {
-	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
-		let blooms = rlp.as_list()?;
-		let group = BloomGroup {
-			blooms: blooms
-		};
-		Ok(group)
-	}
-}
-
-impl Encodable for BloomGroup {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		s.append_list(&self.blooms);
-	}
-}
-
 impl HeapSizeOf for BloomGroup {
 	fn heap_size_of_children(&self) -> usize {
 		self.blooms.heap_size_of_children()
diff --git a/ethcore/src/blooms/group_position.rs b/ethcore/src/blooms/group_position.rs
index bb28b3c1c5da1a3c6455ef0c81838870b5801935..b1ea82792618d500052285929ad1fde41f12d647 100644
--- a/ethcore/src/blooms/group_position.rs
+++ b/ethcore/src/blooms/group_position.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use bloomchain::group as bc;
-use util::HeapSizeOf;
+use heapsize::HeapSizeOf;
 
 /// Represents `BloomGroup` position in database.
 #[derive(PartialEq, Eq, Hash, Clone, Debug)]
diff --git a/ethcore/src/blooms/mod.rs b/ethcore/src/blooms/mod.rs
index 3d021bf9f8fe9bd52578a7e1838f157aad6b4a42..a66485782b31f3373062ad636f307a737395ed30 100644
--- a/ethcore/src/blooms/mod.rs
+++ b/ethcore/src/blooms/mod.rs
@@ -16,10 +16,8 @@
 
 //! Bridge between bloomchain crate types and ethcore.
 
-mod bloom;
 mod bloom_group;
 mod group_position;
 
-pub use self::bloom::Bloom;
 pub use self::bloom_group::BloomGroup;
 pub use self::group_position::GroupPosition;
diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
index 9e49e610cbf3bb6111ef19b33b8b71ce7c39c64e..c18e1f3cd304a0ca34a9c928c6853f571e094497 100644
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -23,7 +23,9 @@ use crypto::ripemd160::Ripemd160 as Ripemd160Digest;
 use crypto::digest::Digest;
 use num::{BigUint, Zero, One};
 
-use util::{U256, H256, Hashable, BytesRef};
+use hash::keccak;
+use ethereum_types::{H256, U256};
+use bytes::BytesRef;
 use ethkey::{Signature, recover as ec_recover};
 use ethjson;
 
@@ -61,7 +63,7 @@ struct Linear {
 }
 
 /// A special pricing model for modular exponentiation.
-struct Modexp {
+struct ModexpPricer {
 	divisor: usize,
 }
 
@@ -71,7 +73,20 @@ impl Pricer for Linear {
 	}
 }
 
-impl Pricer for Modexp {
+/// A alt_bn128_parinig pricing model. This computes a price using a base cost and a cost per pair.
+struct AltBn128PairingPricer {
+	base: usize,
+	pair: usize,
+}
+
+impl Pricer for AltBn128PairingPricer {
+	fn cost(&self, input: &[u8]) -> U256 {
+		let cost = U256::from(self.base) + U256::from(self.pair) * U256::from(input.len() / 192);
+		cost
+	}
+}
+
+impl Pricer for ModexpPricer {
 	fn cost(&self, input: &[u8]) -> U256 {
 		let mut reader = input.chain(io::repeat(0));
 		let mut buf = [0; 32];
@@ -85,17 +100,51 @@ impl Pricer for Modexp {
 		let exp_len = read_len();
 		let mod_len = read_len();
 
-		// floor(max(length_of_MODULUS, length_of_BASE) ** 2 * max(length_of_EXPONENT, 1) / GQUADDIVISOR)
-		// TODO: is saturating the best behavior here?
+		if mod_len.is_zero() && base_len.is_zero() {
+			return U256::zero()
+		}
+
+		let max_len = U256::from(u32::max_value() / 2);
+		if base_len > max_len || mod_len > max_len || exp_len > max_len {
+			return U256::max_value();
+		}
+		let (base_len, exp_len, mod_len) = (base_len.low_u64(), exp_len.low_u64(), mod_len.low_u64());
+
 		let m = max(mod_len, base_len);
-		match m.overflowing_mul(m) {
-			(_, true) => U256::max_value(),
-			(val, _) => {
-				match val.overflowing_mul(max(exp_len, U256::one())) {
-					(_, true) => U256::max_value(),
-					(val, _) => val / (self.divisor as u64).into()
-				}
-			}
+		// read fist 32-byte word of the exponent.
+		let exp_low = if base_len + 96 >= input.len() as u64 { U256::zero() } else {
+			let mut buf = [0; 32];
+			let mut reader = input[(96 + base_len as usize)..].chain(io::repeat(0));
+			let len = min(exp_len, 32) as usize;
+			reader.read_exact(&mut buf[(32 - len)..]).expect("reading from zero-extended memory cannot fail; qed");
+			U256::from(H256::from_slice(&buf[..]))
+		};
+
+		let adjusted_exp_len = Self::adjusted_exp_len(exp_len, exp_low);
+
+		let (gas, overflow) = Self::mult_complexity(m).overflowing_mul(max(adjusted_exp_len, 1));
+		if overflow {
+			return U256::max_value();
+		}
+		(gas / self.divisor as u64).into()
+	}
+}
+
+impl ModexpPricer {
+	fn adjusted_exp_len(len: u64, exp_low: U256) -> u64 {
+		let bit_index = if exp_low.is_zero() { 0 } else { (255 - exp_low.leading_zeros()) as u64 };
+		if len <= 32 {
+			bit_index
+		} else {
+			8 * (len - 32) + bit_index
+		}
+	}
+
+	fn mult_complexity(x: u64) -> u64 {
+		match x {
+			x if x <= 64 => x * x,
+			x if x <= 1024 => (x * x) / 4 + 96 * x - 3072,
+			x => (x * x) / 16 + 480 * x - 199680,
 		}
 	}
 }
@@ -135,7 +184,7 @@ impl From<ethjson::spec::Builtin> for Builtin {
 				})
 			}
 			ethjson::spec::Pricing::Modexp(exp) => {
-				Box::new(Modexp {
+				Box::new(ModexpPricer {
 					divisor: if exp.divisor == 0 {
 						warn!("Zero modexp divisor specified. Falling back to default.");
 						10
@@ -144,6 +193,12 @@ impl From<ethjson::spec::Builtin> for Builtin {
 					}
 				})
 			}
+			ethjson::spec::Pricing::AltBn128Pairing(pricer) => {
+				Box::new(AltBn128PairingPricer {
+					base: pricer.base,
+					pair: pricer.pair,
+				})
+			}
 		};
 
 		Builtin {
@@ -162,9 +217,9 @@ fn ethereum_builtin(name: &str) -> Box<Impl> {
 		"sha256" => Box::new(Sha256) as Box<Impl>,
 		"ripemd160" => Box::new(Ripemd160) as Box<Impl>,
 		"modexp" => Box::new(ModexpImpl) as Box<Impl>,
-		"bn128_add" => Box::new(Bn128AddImpl) as Box<Impl>,
-		"bn128_mul" => Box::new(Bn128MulImpl) as Box<Impl>,
-		"bn128_pairing" => Box::new(Bn128PairingImpl) as Box<Impl>,
+		"alt_bn128_add" => Box::new(Bn128AddImpl) as Box<Impl>,
+		"alt_bn128_mul" => Box::new(Bn128MulImpl) as Box<Impl>,
+		"alt_bn128_pairing" => Box::new(Bn128PairingImpl) as Box<Impl>,
 		_ => panic!("invalid builtin name: {}", name),
 	}
 }
@@ -228,7 +283,7 @@ impl Impl for EcRecover {
 		let s = Signature::from_rsv(&r, &s, bit);
 		if s.is_valid() {
 			if let Ok(p) = ec_recover(&s, &hash) {
-				let r = p.sha3();
+				let r = keccak(p);
 				output.write(0, &[0; 12]);
 				output.write(12, &r[12..r.len()]);
 			}
@@ -266,6 +321,38 @@ impl Impl for Ripemd160 {
 	}
 }
 
+// calculate modexp: exponentiation by squaring. the `num` crate has pow, but not modular.
+fn modexp(mut base: BigUint, mut exp: BigUint, modulus: BigUint) -> BigUint {
+	use num::Integer;
+
+	if modulus <= BigUint::one() { // n^m % 0 || n^m % 1
+		return BigUint::zero();
+	}
+
+	if exp.is_zero() { // n^0 % m
+		return BigUint::one();
+	}
+
+	if base.is_zero() { // 0^n % m, n>0
+		return BigUint::zero();
+	}
+
+	let mut result = BigUint::one();
+	base = base % &modulus;
+
+	// fast path for base divisible by modulus.
+	if base.is_zero() { return BigUint::zero() }
+	while !exp.is_zero() {
+		if exp.is_odd() {
+			result = (result * &base) % &modulus;
+		}
+
+		exp = exp >> 1;
+		base = (base.clone() * base) % &modulus;
+	}
+	result
+}
+
 impl Impl for ModexpImpl {
 	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), Error> {
 		let mut reader = input.chain(io::repeat(0));
@@ -283,47 +370,25 @@ impl Impl for ModexpImpl {
 		let exp_len = read_len(&mut reader);
 		let mod_len = read_len(&mut reader);
 
-		// read the numbers themselves.
-		let mut buf = vec![0; max(mod_len, max(base_len, exp_len))];
-		let mut read_num = |len| {
-			reader.read_exact(&mut buf[..len]).expect("reading from zero-extended memory cannot fail; qed");
-			BigUint::from_bytes_be(&buf[..len])
-		};
-
-		let base = read_num(base_len);
-		let exp = read_num(exp_len);
-		let modulus = read_num(mod_len);
-
-		// calculate modexp: exponentiation by squaring. the `num` crate has pow, but not modular.
-		fn modexp(mut base: BigUint, mut exp: BigUint, modulus: BigUint) -> BigUint {
-			use num::Integer;
-
-			match (base.is_zero(), exp.is_zero()) {
-				(_, true) => return BigUint::one(), // n^0 % m
-				(true, false) => return BigUint::zero(), // 0^n % m, n>0
-				(false, false) if modulus <= BigUint::one() => return BigUint::zero(), // a^b % 1 = 0.
-				_ => {}
-			}
-
-			let mut result = BigUint::one();
-			base = base % &modulus;
-
-			// fast path for base divisible by modulus.
-			if base.is_zero() { return result }
-			while !exp.is_zero() {
-				if exp.is_odd() {
-					result = (result * &base) % &modulus;
-				}
-
-				exp = exp >> 1;
-				base = (base.clone() * base) % &modulus;
-			}
+		// Gas formula allows arbitrary large exp_len when base and modulus are empty, so we need to handle empty base first.
+		let r = if base_len == 0 && mod_len == 0 {
+			BigUint::zero()
+		} else {
+			// read the numbers themselves.
+			let mut buf = vec![0; max(mod_len, max(base_len, exp_len))];
+			let mut read_num = |len| {
+				reader.read_exact(&mut buf[..len]).expect("reading from zero-extended memory cannot fail; qed");
+				BigUint::from_bytes_be(&buf[..len])
+			};
 
-			result
-		}
+			let base = read_num(base_len);
+			let exp = read_num(exp_len);
+			let modulus = read_num(mod_len);
+			modexp(base, exp, modulus)
+		};
 
 		// write output to given memory, left padded and same length as the modulus.
-		let bytes = modexp(base, exp, modulus).to_bytes_be();
+		let bytes = r.to_bytes_be();
 
 		// always true except in the case of zero-length modulus, which leads to
 		// output of length and value 1.
@@ -353,7 +418,6 @@ fn read_point(reader: &mut io::Chain<&[u8], io::Repeat>) -> Result<::bn::G1, Err
 
 	reader.read_exact(&mut buf[..]).expect("reading from zero-extended memory cannot fail; qed");
 	let py = Fq::from_slice(&buf[0..32]).map_err(|_| Error::from("Invalid point y coordinate"))?;
-
 	Ok(
 		if px == Fq::zero() && py == Fq::zero() {
 			G1::zero()
@@ -404,50 +468,29 @@ impl Impl for Bn128MulImpl {
 	}
 }
 
-mod bn128_gen {
-	use bn::{AffineG1, AffineG2, Fq, Fq2, G1, G2, Gt, pairing};
-
-	lazy_static! {
-		pub static ref P1: G1 = G1::from(AffineG1::new(
-			Fq::from_str("1").expect("1 is a valid field element"),
-			Fq::from_str("2").expect("2 is a valid field element"),
-		).expect("Generator P1(1, 2) is a valid curve point"));
-	}
-
-	lazy_static! {
-		pub static ref P2: G2 = G2::from(AffineG2::new(
-			Fq2::new(
-				Fq::from_str("10857046999023057135944570762232829481370756359578518086990519993285655852781")
-					.expect("a valid field element"),
-				Fq::from_str("11559732032986387107991004021392285783925812861821192530917403151452391805634")
-					.expect("a valid field element"),
-			),
-			Fq2::new(
-				Fq::from_str("8495653923123431417604973247489272438418190587263600148770280649306958101930")
-					.expect("a valid field element"),
-				Fq::from_str("4082367875863433681332203403145435568316851327593401208105741076214120093531")
-					.expect("a valid field element"),
-			),
-		).expect("the generator P2(10857046999023057135944570762232829481370756359578518086990519993285655852781 + 11559732032986387107991004021392285783925812861821192530917403151452391805634i, 8495653923123431417604973247489272438418190587263600148770280649306958101930 + 4082367875863433681332203403145435568316851327593401208105741076214120093531i) is a valid curve point"));
-	}
-
-	lazy_static! {
-		pub static ref P1_P2_PAIRING: Gt = pairing(P1.clone(), P2.clone());
-	}
-}
-
 impl Impl for Bn128PairingImpl {
 	/// Can fail if:
 	///     - input length is not a multiple of 192
 	///     - any of odd points does not belong to bn128 curve
 	///     - any of even points does not belong to the twisted bn128 curve over the field F_p^2 = F_p[i] / (i^2 + 1)
 	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), Error> {
-		use bn::{AffineG1, AffineG2, Fq, Fq2, pairing, G1, G2, Gt};
-
-		let elements = input.len() / 192; // (a, b_a, b_b - each 64-byte affine coordinates)
 		if input.len() % 192 != 0 {
 			return Err("Invalid input length, must be multiple of 192 (3 * (32*2))".into())
 		}
+
+		if let Err(err) = self.execute_with_error(input, output) {
+			trace!("Pairining error: {:?}", err);
+			return Err(err)
+		}
+		Ok(())
+	}
+}
+
+impl Bn128PairingImpl {
+	fn execute_with_error(&self, input: &[u8], output: &mut BytesRef) -> Result<(), Error> {
+		use bn::{AffineG1, AffineG2, Fq, Fq2, pairing, G1, G2, Gt, Group};
+
+		let elements = input.len() / 192; // (a, b_a, b_b - each 64-byte affine coordinates)
 		let ret_val = if input.len() == 0 {
 			U256::one()
 		} else {
@@ -459,34 +502,36 @@ impl Impl for Bn128PairingImpl {
 				let a_y = Fq::from_slice(&input[idx*192+32..idx*192+64])
 					.map_err(|_| Error::from("Invalid a argument y coordinate"))?;
 
-				let b_b_x = Fq::from_slice(&input[idx*192+64..idx*192+96])
+				let b_a_y = Fq::from_slice(&input[idx*192+64..idx*192+96])
 					.map_err(|_| Error::from("Invalid b argument imaginary coeff x coordinate"))?;
 
-				let b_b_y = Fq::from_slice(&input[idx*192+96..idx*192+128])
+				let b_a_x = Fq::from_slice(&input[idx*192+96..idx*192+128])
 					.map_err(|_| Error::from("Invalid b argument imaginary coeff y coordinate"))?;
 
-				let b_a_x = Fq::from_slice(&input[idx*192+128..idx*192+160])
+				let b_b_y = Fq::from_slice(&input[idx*192+128..idx*192+160])
 					.map_err(|_| Error::from("Invalid b argument real coeff x coordinate"))?;
 
-				let b_a_y = Fq::from_slice(&input[idx*192+160..idx*192+192])
+				let b_b_x = Fq::from_slice(&input[idx*192+160..idx*192+192])
 					.map_err(|_| Error::from("Invalid b argument real coeff y coordinate"))?;
 
-				vals.push((
-					G1::from(
-						AffineG1::new(a_x, a_y).map_err(|_| Error::from("Invalid a argument - not on curve"))?
-					),
-					G2::from(
-						AffineG2::new(
-							Fq2::new(b_a_x, b_a_y),
-							Fq2::new(b_b_x, b_b_y),
-						).map_err(|_| Error::from("Invalid b argument - not on curve"))?
-					),
-				));
+				let b_a = Fq2::new(b_a_x, b_a_y);
+				let b_b = Fq2::new(b_b_x, b_b_y);
+				let b = if b_a.is_zero() && b_b.is_zero() {
+					G2::zero()
+				} else {
+					G2::from(AffineG2::new(b_a, b_b).map_err(|_| Error::from("Invalid b argument - not on curve"))?)
+				};
+				let a = if a_x.is_zero() && a_y.is_zero() {
+					G1::zero()
+				} else {
+					G1::from(AffineG1::new(a_x, a_y).map_err(|_| Error::from("Invalid a argument - not on curve"))?)
+				};
+				vals.push((a, b));
 			};
 
 			let mul = vals.into_iter().fold(Gt::one(), |s, (a, b)| s * pairing(a, b));
 
-			if mul == *bn128_gen::P1_P2_PAIRING {
+			if mul == Gt::one() {
 				U256::one()
 			} else {
 				U256::zero()
@@ -503,10 +548,45 @@ impl Impl for Bn128PairingImpl {
 
 #[cfg(test)]
 mod tests {
-	use super::{Builtin, Linear, ethereum_builtin, Pricer, Modexp};
+	use super::{Builtin, Linear, ethereum_builtin, Pricer, ModexpPricer, modexp as me};
 	use ethjson;
-	use util::{U256, BytesRef};
+	use ethereum_types::U256;
+	use bytes::BytesRef;
 	use rustc_hex::FromHex;
+	use num::{BigUint, Zero, One};
+
+	#[test]
+	fn modexp_func() {
+		// n^0 % m == 1
+		let mut base = BigUint::parse_bytes(b"12345", 10).unwrap();
+		let mut exp = BigUint::zero();
+		let mut modulus = BigUint::parse_bytes(b"789", 10).unwrap();
+		assert_eq!(me(base, exp, modulus), BigUint::one());
+
+		// 0^n % m == 0
+		base = BigUint::zero();
+		exp = BigUint::parse_bytes(b"12345", 10).unwrap();
+		modulus = BigUint::parse_bytes(b"789", 10).unwrap();
+		assert_eq!(me(base, exp, modulus), BigUint::zero());
+
+		// n^m % 1 == 0
+		base = BigUint::parse_bytes(b"12345", 10).unwrap();
+		exp = BigUint::parse_bytes(b"789", 10).unwrap();
+		modulus = BigUint::one();
+		assert_eq!(me(base, exp, modulus), BigUint::zero());
+
+		// if n % d == 0, then n^m % d == 0
+		base = BigUint::parse_bytes(b"12345", 10).unwrap();
+		exp = BigUint::parse_bytes(b"789", 10).unwrap();
+		modulus = BigUint::parse_bytes(b"15", 10).unwrap();
+		assert_eq!(me(base, exp, modulus), BigUint::zero());
+
+		// others
+		base = BigUint::parse_bytes(b"12345", 10).unwrap();
+		exp = BigUint::parse_bytes(b"789", 10).unwrap();
+		modulus = BigUint::parse_bytes(b"97", 10).unwrap();
+		assert_eq!(me(base, exp, modulus), BigUint::parse_bytes(b"55", 10).unwrap());
+	}
 
 	#[test]
 	fn identity() {
@@ -572,14 +652,6 @@ mod tests {
 
 	#[test]
 	fn ecrecover() {
-		/*let k = KeyPair::from_secret(b"test".sha3()).unwrap();
-		let a: Address = From::from(k.public().sha3());
-		println!("Address: {}", a);
-		let m = b"hello world".sha3();
-		println!("Message: {}", m);
-		let s = k.sign(&m).unwrap();
-		println!("Signed: {}", s);*/
-
 		let f = ethereum_builtin("ecrecover");
 
 		let i = FromHex::from_hex("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").unwrap();
@@ -632,10 +704,36 @@ mod tests {
 	fn modexp() {
 
 		let f = Builtin {
-			pricer: Box::new(Modexp { divisor: 20 }),
+			pricer: Box::new(ModexpPricer { divisor: 20 }),
 			native: ethereum_builtin("modexp"),
 			activate_at: 0,
 		};
+
+		// test for potential gas cost multiplication overflow
+		{
+			let input = FromHex::from_hex("0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000003b27bafd00000000000000000000000000000000000000000000000000000000503c8ac3").unwrap();
+			let expected_cost = U256::max_value();
+			assert_eq!(f.cost(&input[..]), expected_cost.into());
+		}
+
+
+		// test for potential exp len overflow
+		{
+			let input = FromHex::from_hex("\
+				00000000000000000000000000000000000000000000000000000000000000ff\
+				2a1e530000000000000000000000000000000000000000000000000000000000\
+				0000000000000000000000000000000000000000000000000000000000000000"
+				).unwrap();
+
+			let mut output = vec![0u8; 32];
+			let expected = FromHex::from_hex("0000000000000000000000000000000000000000000000000000000000000000").unwrap();
+			let expected_cost = U256::max_value();
+
+			f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should fail");
+			assert_eq!(output, expected);
+			assert_eq!(f.cost(&input[..]), expected_cost.into());
+		}
+
 		// fermat's little theorem example.
 		{
 			let input = FromHex::from_hex("\
@@ -649,7 +747,7 @@ mod tests {
 
 			let mut output = vec![0u8; 32];
 			let expected = FromHex::from_hex("0000000000000000000000000000000000000000000000000000000000000001").unwrap();
-			let expected_cost = 1638;
+			let expected_cost = 13056;
 
 			f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
 			assert_eq!(output, expected);
@@ -660,15 +758,15 @@ mod tests {
 		{
 			let input = FromHex::from_hex("\
 				0000000000000000000000000000000000000000000000000000000000000000\
- 				0000000000000000000000000000000000000000000000000000000000000020\
- 				0000000000000000000000000000000000000000000000000000000000000020\
- 				fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2e\
- 				fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f"
+				0000000000000000000000000000000000000000000000000000000000000020\
+				0000000000000000000000000000000000000000000000000000000000000020\
+				fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2e\
+				fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f"
 			).unwrap();
 
 			let mut output = vec![0u8; 32];
 			let expected = FromHex::from_hex("0000000000000000000000000000000000000000000000000000000000000000").unwrap();
-			let expected_cost = 1638;
+			let expected_cost = 13056;
 
 			f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
 			assert_eq!(output, expected);
@@ -688,7 +786,7 @@ mod tests {
 
 			let mut output = vec![0u8; 32];
 			let expected = FromHex::from_hex("3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab").unwrap();
-			let expected_cost = 102;
+			let expected_cost = 768;
 
 			f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
 			assert_eq!(output, expected);
@@ -719,7 +817,7 @@ mod tests {
 
 		let f = Builtin {
 			pricer: Box::new(Linear { base: 0, word: 0 }),
-			native: ethereum_builtin("bn128_add"),
+			native: ethereum_builtin("alt_bn128_add"),
 			activate_at: 0,
 		};
 
@@ -780,7 +878,7 @@ mod tests {
 
 		let f = Builtin {
 			pricer: Box::new(Linear { base: 0, word: 0 }),
-			native: ethereum_builtin("bn128_mul"),
+			native: ethereum_builtin("alt_bn128_mul"),
 			activate_at: 0,
 		};
 
@@ -820,7 +918,7 @@ mod tests {
 	fn builtin_pairing() -> Builtin {
 		Builtin {
 			pricer: Box::new(Linear { base: 0, word: 0 }),
-			native: ethereum_builtin("bn128_pairing"),
+			native: ethereum_builtin("alt_bn128_pairing"),
 			activate_at: 0,
 		}
 	}
diff --git a/ethcore/src/client/ancient_import.rs b/ethcore/src/client/ancient_import.rs
index d4d8696d2505aee2d188daebe4a772527818bfb5..13699ea5a0e5d2cc0f9c578c55c4e68aee8780e6 100644
--- a/ethcore/src/client/ancient_import.rs
+++ b/ethcore/src/client/ancient_import.rs
@@ -19,11 +19,12 @@
 use std::sync::Arc;
 
 use blockchain::BlockChain;
-use engines::{Engine, EpochVerifier};
+use engines::{EthEngine, EpochVerifier};
 use header::Header;
+use machine::EthereumMachine;
 
 use rand::Rng;
-use util::RwLock;
+use parking_lot::RwLock;
 
 // do "heavy" verification on ~1/50 blocks, randomly sampled.
 const HEAVY_VERIFY_RATE: f32 = 0.02;
@@ -31,13 +32,13 @@ const HEAVY_VERIFY_RATE: f32 = 0.02;
 /// Ancient block verifier: import an ancient sequence of blocks in order from a starting
 /// epoch.
 pub struct AncientVerifier {
-	cur_verifier: RwLock<Box<EpochVerifier>>,
-	engine: Arc<Engine>,
+	cur_verifier: RwLock<Box<EpochVerifier<EthereumMachine>>>,
+	engine: Arc<EthEngine>,
 }
 
 impl AncientVerifier {
 	/// Create a new ancient block verifier with the given engine and initial verifier.
-	pub fn new(engine: Arc<Engine>, start_verifier: Box<EpochVerifier>) -> Self {
+	pub fn new(engine: Arc<EthEngine>, start_verifier: Box<EpochVerifier<EthereumMachine>>) -> Self {
 		AncientVerifier {
 			cur_verifier: RwLock::new(start_verifier),
 			engine: engine,
diff --git a/ethcore/src/client/chain_notify.rs b/ethcore/src/client/chain_notify.rs
index 0a9bff8d73b2c71b738c09c361ecd759aaedf3fd..d05c95b8c850cfc03b829de3950da602c8278982 100644
--- a/ethcore/src/client/chain_notify.rs
+++ b/ethcore/src/client/chain_notify.rs
@@ -14,11 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use ipc::IpcConfig;
-use util::{H256, Bytes};
+use ethereum_types::H256;
+use bytes::Bytes;
 
 /// Represents what has to be handled by actor listening to chain events
-#[ipc]
 pub trait ChainNotify : Send + Sync {
 	/// fires when chain has new blocks.
 	fn new_blocks(
@@ -56,5 +55,3 @@ pub trait ChainNotify : Send + Sync {
 		// does nothing by default
 	}
 }
-
-impl IpcConfig for ChainNotify { }
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index ac8a0aea9a5d4932618aa31af4a17d911b138343..c4c2b6a2ee63f1ea2b8c6533ccbd7c1f6534b113 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -19,53 +19,56 @@ use std::str::FromStr;
 use std::sync::{Arc, Weak};
 use std::sync::atomic::{AtomicUsize, AtomicBool, Ordering as AtomicOrdering};
 use std::time::{Instant};
-use time::precise_time_ns;
 use itertools::Itertools;
 
 // util
-use util::{Bytes, PerfTimer, Mutex, RwLock, MutexGuard, Hashable};
-use util::{journaldb, DBValue, TrieFactory, Trie};
-use util::{U256, H256, Address, H2048};
-use util::trie::TrieSpec;
-use util::kvdb::*;
+use hash::keccak;
+use bytes::Bytes;
+use journaldb;
+use trie::{TrieSpec, TrieFactory, Trie};
+use kvdb::{DBValue, KeyValueDB, DBTransaction};
+use util_error::UtilError;
 
 // other
-use basic_types::Seal;
-use block::*;
-use blockchain::{BlockChain, BlockProvider,  TreeRoute, ImportRoute};
-use blockchain::extras::TransactionAddress;
+use ethereum_types::{H256, Address, U256};
+use block::{IsBlock, LockedBlock, Drain, ClosedBlock, OpenBlock, enact_verified, SealedBlock};
+use blockchain::{BlockChain, BlockProvider,  TreeRoute, ImportRoute, TransactionAddress};
 use client::ancient_import::AncientVerifier;
 use client::Error as ClientError;
+use client::{
+	Nonce, Balance, ChainInfo, BlockInfo, CallContract, TransactionInfo,
+	RegistryInfo, ReopenBlock, PrepareOpenBlock, ScheduleInfo, ImportSealedBlock,
+	BroadcastProposalBlock, ImportBlock, StateOrBlock, StateInfo, StateClient, Call,
+	AccountData, BlockChain as BlockChainTrait, BlockProducer, SealedBlockImporter,
+	ClientIoMessage
+};
 use client::{
 	BlockId, TransactionId, UncleId, TraceId, ClientConfig, BlockChainClient,
-	MiningBlockChainClient, EngineClient, TraceFilter, CallAnalytics, BlockImportError, Mode,
-	ChainNotify, PruningInfo, ProvingBlockChainClient,
+	MiningBlockChainClient, TraceFilter, CallAnalytics, BlockImportError, Mode,
+	ChainNotify, PruningInfo, ProvingBlockChainClient, EngineInfo
 };
 use encoded;
-use engines::{Engine, EpochTransition};
+use engines::{EthEngine, EpochTransition};
 use error::{ImportError, ExecutionError, CallError, BlockError, ImportResult, Error as EthcoreError};
 use vm::{EnvInfo, LastHashes};
-use evm::{Factory as EvmFactory, Schedule};
+use evm::Schedule;
 use executive::{Executive, Executed, TransactOptions, contract_address};
-use factory::Factories;
-use futures::{future, Future};
+use factory::{Factories, VmFactory};
 use header::{BlockNumber, Header};
-use io::*;
+use io::IoChannel;
 use log_entry::LocalizedLogEntry;
-use miner::{Miner, MinerService, TransactionImportResult};
-use native_contracts::Registry;
+use miner::{Miner, MinerService};
+use parking_lot::{Mutex, RwLock};
 use rand::OsRng;
 use receipt::{Receipt, LocalizedReceipt};
 use rlp::UntrustedRlp;
-use service::ClientIoMessage;
 use snapshot::{self, io as snapshot_io};
 use spec::Spec;
 use state_db::StateDB;
 use state::{self, State};
 use trace;
 use trace::{TraceDB, ImportRequest as TraceImportRequest, LocalizedTrace, Database as TraceDatabase};
-use trace::FlatTransactionTraces;
-use transaction::{LocalizedTransaction, UnverifiedTransaction, SignedTransaction, Transaction, PendingTransaction, Action};
+use transaction::{self, LocalizedTransaction, UnverifiedTransaction, SignedTransaction, Transaction, PendingTransaction, Action};
 use types::filter::Filter;
 use types::mode::Mode as IpcMode;
 use verification;
@@ -79,6 +82,8 @@ pub use types::block_status::BlockStatus;
 pub use blockchain::CacheSize as BlockChainCacheSize;
 pub use verification::queue::QueueInfo as BlockQueueInfo;
 
+use_contract!(registry, "Registry", "res/contracts/registrar.json");
+
 const MAX_TX_QUEUE_SIZE: usize = 4096;
 const MAX_QUEUE_SIZE_TO_SLEEP_ON: usize = 2;
 const MIN_HISTORY_SIZE: u64 = 8;
@@ -135,336 +140,109 @@ impl SleepState {
 	}
 }
 
+struct Importer {
+	/// Lock used during block import
+	pub import_lock: Mutex<()>, // FIXME Maybe wrap the whole `Importer` instead?
+
+	/// Used to verify blocks
+	pub verifier: Box<Verifier<Client>>,
+
+	/// Queue containing pending blocks
+	pub block_queue: BlockQueue,
+
+	/// Handles block sealing
+	pub miner: Arc<Miner>,
+
+	/// Ancient block verifier: import an ancient sequence of blocks in order from a starting epoch
+	pub ancient_verifier: Mutex<Option<AncientVerifier>>,
+
+	/// Random number generator used by `AncientVerifier`
+	pub rng: Mutex<OsRng>,
+
+	/// Ethereum engine to be used during import
+	pub engine: Arc<EthEngine>,
+}
+
 /// Blockchain database client backed by a persistent database. Owns and manages a blockchain and a block queue.
 /// Call `import_block()` to import a block asynchronously; `flush_queue()` flushes the queue.
 pub struct Client {
+	/// Flag used to disable the client forever. Not to be confused with `liveness`.
+	///
+	/// For example, auto-updater will disable client forever if there is a
+	/// hard fork registered on-chain that we don't have capability for.
+	/// When hard fork block rolls around, the client (if `update` is false)
+	/// knows it can't proceed further.
 	enabled: AtomicBool,
+
+	/// Operating mode for the client
 	mode: Mutex<Mode>,
+
 	chain: RwLock<Arc<BlockChain>>,
 	tracedb: RwLock<TraceDB<BlockChain>>,
-	engine: Arc<Engine>,
+	engine: Arc<EthEngine>,
+
+	/// Client configuration
 	config: ClientConfig,
+
+	/// Database pruning strategy to use for StateDB
 	pruning: journaldb::Algorithm,
+
+	/// Client uses this to store blocks, traces, etc.
 	db: RwLock<Arc<KeyValueDB>>,
-	state_db: Mutex<StateDB>,
-	block_queue: BlockQueue,
+
+	state_db: RwLock<StateDB>,
+
+	/// Report on the status of client
 	report: RwLock<ClientReport>,
-	import_lock: Mutex<()>,
-	verifier: Box<Verifier>,
-	miner: Arc<Miner>,
+
 	sleep_state: Mutex<SleepState>,
+
+	/// Flag changed by `sleep` and `wake_up` methods. Not to be confused with `enabled`.
 	liveness: AtomicBool,
 	io_channel: Mutex<IoChannel<ClientIoMessage>>,
+
+	/// List of actors to be notified on certain chain events
 	notify: RwLock<Vec<Weak<ChainNotify>>>,
+
+	/// Count of pending transactions in the queue
 	queue_transactions: AtomicUsize,
 	last_hashes: RwLock<VecDeque<H256>>,
 	factories: Factories,
+
+	/// Number of eras kept in a journal before they are pruned
 	history: u64,
-	rng: Mutex<OsRng>,
-	ancient_verifier: Mutex<Option<AncientVerifier>>,
+
+	/// An action to be done if a mode/spec_name change happens
 	on_user_defaults_change: Mutex<Option<Box<FnMut(Option<Mode>) + 'static + Send>>>,
-	registrar: Mutex<Option<Registry>>,
+
+	/// Link to a registry object useful for looking up names
+	registrar: registry::Registry,
+	registrar_address: Option<Address>,
+
+	/// A closure to call when we want to restart the client
 	exit_handler: Mutex<Option<Box<Fn(bool, Option<String>) + 'static + Send>>>,
+
+	importer: Importer,
 }
 
-impl Client {
-	/// Create a new client with given parameters.
-	/// The database is assumed to have been initialized with the correct columns.
+impl Importer {
 	pub fn new(
-		config: ClientConfig,
-		spec: &Spec,
-		db: Arc<KeyValueDB>,
-		miner: Arc<Miner>,
+		config: &ClientConfig,
+		engine: Arc<EthEngine>,
 		message_channel: IoChannel<ClientIoMessage>,
-	) -> Result<Arc<Client>, ::error::Error> {
-		let trie_spec = match config.fat_db {
-			true => TrieSpec::Fat,
-			false => TrieSpec::Secure,
-		};
-
-		let trie_factory = TrieFactory::new(trie_spec);
-		let factories = Factories {
-			vm: EvmFactory::new(config.vm_type.clone(), config.jump_table_size),
-			trie: trie_factory,
-			accountdb: Default::default(),
-		};
-
-		let journal_db = journaldb::new(db.clone(), config.pruning, ::db::COL_STATE);
-		let mut state_db = StateDB::new(journal_db, config.state_cache_size);
-		if state_db.journal_db().is_empty() {
-			// Sets the correct state root.
-			state_db = spec.ensure_db_good(state_db, &factories)?;
-			let mut batch = DBTransaction::new();
-			state_db.journal_under(&mut batch, 0, &spec.genesis_header().hash())?;
-			db.write(batch).map_err(ClientError::Database)?;
-		}
-
-		let gb = spec.genesis_block();
-		let chain = Arc::new(BlockChain::new(config.blockchain.clone(), &gb, db.clone()));
-		let tracedb = RwLock::new(TraceDB::new(config.tracing.clone(), db.clone(), chain.clone()));
-
-		trace!("Cleanup journal: DB Earliest = {:?}, Latest = {:?}", state_db.journal_db().earliest_era(), state_db.journal_db().latest_era());
-
-		let history = if config.history < MIN_HISTORY_SIZE {
-			info!(target: "client", "Ignoring pruning history parameter of {}\
-				, falling back to minimum of {}",
-				config.history, MIN_HISTORY_SIZE);
-			MIN_HISTORY_SIZE
-		} else {
-			config.history
-		};
-
-		if !chain.block_header(&chain.best_block_hash()).map_or(true, |h| state_db.journal_db().contains(h.state_root())) {
-			warn!("State root not found for block #{} ({})", chain.best_block_number(), chain.best_block_hash().hex());
-		}
-
-		let engine = spec.engine.clone();
-
+		miner: Arc<Miner>,
+	) -> Result<Importer, ::error::Error> {
 		let block_queue = BlockQueue::new(config.queue.clone(), engine.clone(), message_channel.clone(), config.verifier_type.verifying_seal());
 
-		let awake = match config.mode { Mode::Dark(..) | Mode::Off => false, _ => true };
-
-		let client = Arc::new(Client {
-			enabled: AtomicBool::new(true),
-			sleep_state: Mutex::new(SleepState::new(awake)),
-			liveness: AtomicBool::new(awake),
-			mode: Mutex::new(config.mode.clone()),
-			chain: RwLock::new(chain),
-			tracedb: tracedb,
-			engine: engine,
-			pruning: config.pruning.clone(),
-			verifier: verification::new(config.verifier_type.clone()),
-			config: config,
-			db: RwLock::new(db),
-			state_db: Mutex::new(state_db),
-			block_queue: block_queue,
-			report: RwLock::new(Default::default()),
+		Ok(Importer {
 			import_lock: Mutex::new(()),
-			miner: miner,
-			io_channel: Mutex::new(message_channel),
-			notify: RwLock::new(Vec::new()),
-			queue_transactions: AtomicUsize::new(0),
-			last_hashes: RwLock::new(VecDeque::new()),
-			factories: factories,
-			history: history,
-			rng: Mutex::new(OsRng::new().map_err(::util::UtilError::StdIo)?),
+			verifier: verification::new(config.verifier_type.clone()),
+			block_queue,
+			miner,
 			ancient_verifier: Mutex::new(None),
-			on_user_defaults_change: Mutex::new(None),
-			registrar: Mutex::new(None),
-			exit_handler: Mutex::new(None),
-		});
-
-		// prune old states.
-		{
-			let state_db = client.state_db.lock().boxed_clone();
-			let chain = client.chain.read();
-			client.prune_ancient(state_db, &chain)?;
-		}
-
-		// ensure genesis epoch proof in the DB.
-		{
-			let chain = client.chain.read();
-			let gh = spec.genesis_header();
-			if chain.epoch_transition(0, gh.hash()).is_none() {
-				trace!(target: "client", "No genesis transition found.");
-
-				let proof = client.with_proving_caller(
-					BlockId::Number(0),
-					|call| client.engine.genesis_epoch_data(&gh, call)
-				);
-				let proof = match proof {
-					Ok(proof) => proof,
-					Err(e) => {
-						warn!(target: "client", "Error generating genesis epoch data: {}. Snapshots generated may not be complete.", e);
-						Vec::new()
-					}
-				};
-
-				debug!(target: "client", "Obtained genesis transition proof: {:?}", proof);
-
-				let mut batch = DBTransaction::new();
-				chain.insert_epoch_transition(&mut batch, 0, EpochTransition {
-					block_hash: gh.hash(),
-					block_number: 0,
-					proof: proof,
-				});
-
-				client.db.read().write_buffered(batch);
-			}
-		}
-
-		if let Some(reg_addr) = client.additional_params().get("registrar").and_then(|s| Address::from_str(s).ok()) {
-			trace!(target: "client", "Found registrar at {}", reg_addr);
-			let registrar = Registry::new(reg_addr);
-			*client.registrar.lock() = Some(registrar);
-		}
-
-		// ensure buffered changes are flushed.
-		client.db.read().flush().map_err(ClientError::Database)?;
-		Ok(client)
-	}
-
-	/// Wakes up client if it's a sleep.
-	pub fn keep_alive(&self) {
-		let should_wake = match *self.mode.lock() {
-			Mode::Dark(..) | Mode::Passive(..) => true,
-			_ => false,
-		};
-		if should_wake {
-			self.wake_up();
-			(*self.sleep_state.lock()).last_activity = Some(Instant::now());
-		}
-	}
-
-	/// Adds an actor to be notified on certain events
-	pub fn add_notify(&self, target: Arc<ChainNotify>) {
-		self.notify.write().push(Arc::downgrade(&target));
-	}
-
-	/// Set a closure to call when we want to restart the client
-	pub fn set_exit_handler<F>(&self, f: F) where F: Fn(bool, Option<String>) + 'static + Send {
-		*self.exit_handler.lock() = Some(Box::new(f));
-	}
-
-	/// Returns engine reference.
-	pub fn engine(&self) -> &Engine {
-		&*self.engine
-	}
-
-	fn notify<F>(&self, f: F) where F: Fn(&ChainNotify) {
-		for np in self.notify.read().iter() {
-			if let Some(n) = np.upgrade() {
-				f(&*n);
-			}
-		}
-	}
-
-	/// Get the Registry object - useful for looking up names.
-	pub fn registrar(&self) -> MutexGuard<Option<Registry>> {
-		self.registrar.lock()
-	}
-
-	/// Register an action to be done if a mode/spec_name change happens.
-	pub fn on_user_defaults_change<F>(&self, f: F) where F: 'static + FnMut(Option<Mode>) + Send {
-		*self.on_user_defaults_change.lock() = Some(Box::new(f));
-	}
-
-	/// Flush the block import queue.
-	pub fn flush_queue(&self) {
-		self.block_queue.flush();
-		while !self.block_queue.queue_info().is_empty() {
-			self.import_verified_blocks();
-		}
-	}
-
-	/// The env info as of the best block.
-	pub fn latest_env_info(&self) -> EnvInfo {
-		self.env_info(BlockId::Latest).expect("Best block header always stored; qed")
-	}
-
-	/// The env info as of a given block.
-	/// returns `None` if the block unknown.
-	pub fn env_info(&self, id: BlockId) -> Option<EnvInfo> {
-		self.block_header(id).map(|header| {
-			EnvInfo {
-				number: header.number(),
-				author: header.author(),
-				timestamp: header.timestamp(),
-				difficulty: header.difficulty(),
-				last_hashes: self.build_last_hashes(header.parent_hash()),
-				gas_used: U256::default(),
-				gas_limit: header.gas_limit(),
-			}
-		})
-	}
-
-	fn build_last_hashes(&self, parent_hash: H256) -> Arc<LastHashes> {
-		{
-			let hashes = self.last_hashes.read();
-			if hashes.front().map_or(false, |h| h == &parent_hash) {
-				let mut res = Vec::from(hashes.clone());
-				res.resize(256, H256::default());
-				return Arc::new(res);
-			}
-		}
-		let mut last_hashes = LastHashes::new();
-		last_hashes.resize(256, H256::default());
-		last_hashes[0] = parent_hash;
-		let chain = self.chain.read();
-		for i in 0..255 {
-			match chain.block_details(&last_hashes[i]) {
-				Some(details) => {
-					last_hashes[i + 1] = details.parent.clone();
-				},
-				None => break,
-			}
-		}
-		let mut cached_hashes = self.last_hashes.write();
-		*cached_hashes = VecDeque::from(last_hashes.clone());
-		Arc::new(last_hashes)
-	}
-
-	fn check_and_close_block(&self, block: &PreverifiedBlock) -> Result<LockedBlock, ()> {
-		let engine = &*self.engine;
-		let header = &block.header;
-
-		let chain = self.chain.read();
-		// Check the block isn't so old we won't be able to enact it.
-		let best_block_number = chain.best_block_number();
-		if self.pruning_info().earliest_state > header.number() {
-			warn!(target: "client", "Block import failed for #{} ({})\nBlock is ancient (current best block: #{}).", header.number(), header.hash(), best_block_number);
-			return Err(());
-		}
-
-		// Verify Block Family
-		let verify_family_result = self.verifier.verify_block_family(header, &block.bytes, engine, &**chain);
-		if let Err(e) = verify_family_result {
-			warn!(target: "client", "Stage 3 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			return Err(());
-		};
-
-		let verify_external_result = self.verifier.verify_block_external(header, &block.bytes, engine);
-		if let Err(e) = verify_external_result {
-			warn!(target: "client", "Stage 4 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			return Err(());
-		};
-
-		// Check if Parent is in chain
-		let chain_has_parent = chain.block_header(header.parent_hash());
-		if let Some(parent) = chain_has_parent {
-			// Enact Verified Block
-			let last_hashes = self.build_last_hashes(header.parent_hash().clone());
-			let db = self.state_db.lock().boxed_clone_canon(header.parent_hash());
-
-			let is_epoch_begin = chain.epoch_transition(parent.number(), *header.parent_hash()).is_some();
-			let enact_result = enact_verified(block,
-				engine,
-				self.tracedb.read().tracing_enabled(),
-				db,
-				&parent,
-				last_hashes,
-				self.factories.clone(),
-				is_epoch_begin,
-			);
-			let mut locked_block = enact_result.map_err(|e| {
-				warn!(target: "client", "Block import failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			})?;
-
-			if header.number() < self.engine().params().validate_receipts_transition && header.receipts_root() != locked_block.block().header().receipts_root() {
-				locked_block = locked_block.strip_receipts();
-			}
-
-			// Final Verification
-			if let Err(e) = self.verifier.verify_block_final(header, locked_block.block().header()) {
-				warn!(target: "client", "Stage 5 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-				return Err(());
-			}
-
-			Ok(locked_block)
-		} else {
-			warn!(target: "client", "Block import failed for #{} ({}): Parent not found ({}) ", header.number(), header.hash(), header.parent_hash());
-			Err(())
-		}
+			rng: Mutex::new(OsRng::new()?),
+			engine,
+		})
 	}
 
 	fn calculate_enacted_retracted(&self, import_results: &[ImportRoute]) -> (Vec<H256>, Vec<H256>) {
@@ -494,10 +272,10 @@ impl Client {
 	}
 
 	/// This is triggered by a message coming from a block queue when the block is ready for insertion
-	pub fn import_verified_blocks(&self) -> usize {
+	pub fn import_verified_blocks(&self, client: &Client) -> usize {
 
 		// Shortcut out if we know we're incapable of syncing the chain.
-		if !self.enabled.load(AtomicOrdering::Relaxed) {
+		if !client.enabled.load(AtomicOrdering::Relaxed) {
 			return 0;
 		}
 
@@ -513,8 +291,8 @@ impl Client {
 			if blocks.is_empty() {
 				return 0;
 			}
-			let _timer = PerfTimer::new("import_verified_blocks");
-			let start = precise_time_ns();
+			trace_time!("import_verified_blocks");
+			let start = Instant::now();
 
 			for block in blocks {
 				let header = &block.header;
@@ -523,17 +301,17 @@ impl Client {
 					invalid_blocks.insert(header.hash());
 					continue;
 				}
-				if let Ok(closed_block) = self.check_and_close_block(&block) {
+				if let Ok(closed_block) = self.check_and_close_block(&block, client) {
 					if self.engine.is_proposal(&block.header) {
 						self.block_queue.mark_as_good(&[header.hash()]);
 						proposed_blocks.push(block.bytes);
 					} else {
 						imported_blocks.push(header.hash());
 
-						let route = self.commit_block(closed_block, &header, &block.bytes);
+						let route = self.commit_block(closed_block, &header, &block.bytes, client);
 						import_results.push(route);
 
-						self.report.write().accrue_block(&block);
+						client.report.write().accrue_block(&block);
 					}
 				} else {
 					invalid_blocks.insert(header.hash());
@@ -547,7 +325,10 @@ impl Client {
 				self.block_queue.mark_as_bad(&invalid_blocks);
 			}
 			let is_empty = self.block_queue.mark_as_good(&imported_blocks);
-			let duration_ns = precise_time_ns() - start;
+			let duration_ns = {
+				let elapsed = start.elapsed();
+				elapsed.as_secs() * 1_000_000_000 + elapsed.subsec_nanos() as u64
+			};
 			(imported_blocks, import_results, invalid_blocks, imported, proposed_blocks, duration_ns, is_empty)
 		};
 
@@ -556,10 +337,10 @@ impl Client {
 				let (enacted, retracted) = self.calculate_enacted_retracted(&import_results);
 
 				if is_empty {
-					self.miner.chain_new_blocks(self, &imported_blocks, &invalid_blocks, &enacted, &retracted);
+					self.miner.chain_new_blocks(client, &imported_blocks, &invalid_blocks, &enacted, &retracted);
 				}
 
-				self.notify(|notify| {
+				client.notify(|notify| {
 					notify.new_blocks(
 						imported_blocks.clone(),
 						invalid_blocks.clone(),
@@ -573,14 +354,91 @@ impl Client {
 			}
 		}
 
-		self.db.read().flush().expect("DB flush failed.");
+		client.db.read().flush().expect("DB flush failed.");
 		imported
 	}
 
+	fn check_and_close_block(&self, block: &PreverifiedBlock, client: &Client) -> Result<LockedBlock, ()> {
+		let engine = &*self.engine;
+		let header = &block.header;
+
+		let chain = client.chain.read();
+		// Check the block isn't so old we won't be able to enact it.
+		let best_block_number = chain.best_block_number();
+		if client.pruning_info().earliest_state > header.number() {
+			warn!(target: "client", "Block import failed for #{} ({})\nBlock is ancient (current best block: #{}).", header.number(), header.hash(), best_block_number);
+			return Err(());
+		}
+
+		// Check if parent is in chain
+		let parent = match chain.block_header(header.parent_hash()) {
+			Some(h) => h,
+			None => {
+				warn!(target: "client", "Block import failed for #{} ({}): Parent not found ({}) ", header.number(), header.hash(), header.parent_hash());
+				return Err(());
+			}
+		};
+
+		// Verify Block Family
+		let verify_family_result = self.verifier.verify_block_family(
+			header,
+			&parent,
+			engine,
+			Some(verification::FullFamilyParams {
+				block_bytes: &block.bytes,
+				transactions: &block.transactions,
+				block_provider: &**chain,
+				client
+			}),
+		);
+
+		if let Err(e) = verify_family_result {
+			warn!(target: "client", "Stage 3 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
+			return Err(());
+		};
+
+		let verify_external_result = self.verifier.verify_block_external(header, engine);
+		if let Err(e) = verify_external_result {
+			warn!(target: "client", "Stage 4 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
+			return Err(());
+		};
+
+		// Enact Verified Block
+		let last_hashes = client.build_last_hashes(header.parent_hash());
+		let db = client.state_db.read().boxed_clone_canon(header.parent_hash());
+
+		let is_epoch_begin = chain.epoch_transition(parent.number(), *header.parent_hash()).is_some();
+		let enact_result = enact_verified(block,
+			engine,
+			client.tracedb.read().tracing_enabled(),
+			db,
+			&parent,
+			last_hashes,
+			client.factories.clone(),
+			is_epoch_begin,
+		);
+		let mut locked_block = enact_result.map_err(|e| {
+			warn!(target: "client", "Block import failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
+		})?;
+
+		if header.number() < engine.params().validate_receipts_transition && header.receipts_root() != locked_block.block().header().receipts_root() {
+			locked_block = locked_block.strip_receipts();
+		}
+
+		// Final Verification
+		if let Err(e) = self.verifier.verify_block_final(header, locked_block.block().header()) {
+			warn!(target: "client", "Stage 5 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
+			return Err(());
+		}
+
+		Ok(locked_block)
+	}
+
 	/// Import a block with transaction receipts.
-	/// The block is guaranteed to be the next best blocks in the first block sequence.
-	/// Does no sealing or transaction validation.
-	fn import_old_block(&self, block_bytes: Bytes, receipts_bytes: Bytes) -> Result<H256, ::error::Error> {
+	///
+	/// The block is guaranteed to be the next best blocks in the
+	/// first block sequence. Does no sealing or transaction validation.
+	fn import_old_block(&self, block_bytes: Bytes, receipts_bytes: Bytes, db: &KeyValueDB, chain: &BlockChain) -> Result<H256, ::error::Error> {
 		let block = BlockView::new(&block_bytes);
 		let header = block.header();
 		let receipts = ::rlp::decode_list(&receipts_bytes);
@@ -588,8 +446,7 @@ impl Client {
 		let _import_lock = self.import_lock.lock();
 
 		{
-			let _timer = PerfTimer::new("import_old_block");
-			let chain = self.chain.read();
+			trace_time!("import_old_block");
 			let mut ancient_verifier = self.ancient_verifier.lock();
 
 			{
@@ -597,7 +454,8 @@ impl Client {
 				let verify_with = |verifier: &AncientVerifier| -> Result<(), ::error::Error> {
 					// verify the block, passing the chain for updating the epoch
 					// verifier.
-					verifier.verify(&mut *self.rng.lock(), &header, &chain)
+					let mut rng = OsRng::new().map_err(UtilError::from)?;
+					verifier.verify(&mut rng, &header, &chain)
 				};
 
 				// initialize the ancient block verifier if we don't have one already.
@@ -628,10 +486,10 @@ impl Client {
 			let mut batch = DBTransaction::new();
 			chain.insert_unordered_block(&mut batch, &block_bytes, receipts, None, false, true);
 			// Final commit to the DB
-			self.db.read().write_buffered(batch);
+			db.write_buffered(batch);
 			chain.commit();
 		}
-		self.db.read().flush().expect("DB flush failed.");
+		db.flush().expect("DB flush failed.");
 		Ok(hash)
 	}
 
@@ -639,20 +497,17 @@ impl Client {
 	// it is for reconstructing the state transition.
 	//
 	// The header passed is from the original block data and is sealed.
-	fn commit_block<B>(&self, block: B, header: &Header, block_data: &[u8]) -> ImportRoute where B: IsBlock + Drain {
+	fn commit_block<B>(&self, block: B, header: &Header, block_data: &[u8], client: &Client) -> ImportRoute where B: IsBlock + Drain {
 		let hash = &header.hash();
 		let number = header.number();
 		let parent = header.parent_hash();
-		let chain = self.chain.read();
+		let chain = client.chain.read();
 
 		// Commit results
 		let receipts = block.receipts().to_owned();
-		let traces = block.traces().clone().unwrap_or_else(Vec::new);
-		let traces: Vec<FlatTransactionTraces> = traces.into_iter()
-			.map(Into::into)
-			.collect();
+		let traces = block.traces().clone().drain();
 
-		assert_eq!(header.hash(), BlockView::new(block_data).header_view().sha3());
+		assert_eq!(header.hash(), BlockView::new(block_data).header_view().hash());
 
 		//let traces = From::from(block.traces().clone().unwrap_or_else(Vec::new));
 
@@ -672,12 +527,13 @@ impl Client {
 			&state,
 			&chain,
 			&mut batch,
+			client
 		);
 
 		state.journal_under(&mut batch, number, hash).expect("DB commit failed");
 		let route = chain.insert_block(&mut batch, block_data, receipts.clone());
 
-		self.tracedb.read().import(&mut batch, TraceImportRequest {
+		client.tracedb.read().import(&mut batch, TraceImportRequest {
 			traces: traces.into(),
 			block_hash: hash.clone(),
 			block_number: number,
@@ -688,14 +544,14 @@ impl Client {
 		let is_canon = route.enacted.last().map_or(false, |h| h == hash);
 		state.sync_cache(&route.enacted, &route.retracted, is_canon);
 		// Final commit to the DB
-		self.db.read().write_buffered(batch);
+		client.db.read().write_buffered(batch);
 		chain.commit();
 
-		self.check_epoch_end(&header, &chain);
+		self.check_epoch_end(&header, &chain, client);
 
-		self.update_last_hashes(&parent, hash);
+		client.update_last_hashes(&parent, hash);
 
-		if let Err(e) = self.prune_ancient(state, &chain) {
+		if let Err(e) = client.prune_ancient(state, &chain) {
 			warn!("Failed to prune ancient state data: {}", e);
 		}
 
@@ -712,11 +568,17 @@ impl Client {
 		state_db: &StateDB,
 		chain: &BlockChain,
 		batch: &mut DBTransaction,
+		client: &Client,
 	) {
 		use engines::EpochChange;
 
 		let hash = header.hash();
-		match self.engine.signals_epoch_end(header, Some(block_bytes), Some(&receipts)) {
+		let auxiliary = ::machine::AuxiliaryData {
+			bytes: Some(block_bytes),
+			receipts: Some(&receipts),
+		};
+
+		match self.engine.signals_epoch_end(header, auxiliary) {
 			EpochChange::Yes(proof) => {
 				use engines::epoch::PendingTransition;
 				use engines::Proof;
@@ -729,94 +591,328 @@ impl Client {
 							author: header.author().clone(),
 							timestamp: header.timestamp(),
 							difficulty: header.difficulty().clone(),
-							last_hashes: self.build_last_hashes(header.parent_hash().clone()),
+							last_hashes: client.build_last_hashes(header.parent_hash()),
 							gas_used: U256::default(),
 							gas_limit: u64::max_value().into(),
 						};
 
-						let call = move |addr, data| {
-							let mut state_db = state_db.boxed_clone();
-							let backend = ::state::backend::Proving::new(state_db.as_hashdb_mut());
+						let call = move |addr, data| {
+							let mut state_db = state_db.boxed_clone();
+							let backend = ::state::backend::Proving::new(state_db.as_hashdb_mut());
+
+							let transaction =
+								client.contract_call_tx(BlockId::Hash(*header.parent_hash()), addr, data);
+
+							let mut state = State::from_existing(
+								backend,
+								header.state_root().clone(),
+								self.engine.account_start_nonce(header.number()),
+								client.factories.clone(),
+							).expect("state known to be available for just-imported block; qed");
+
+							let options = TransactOptions::with_no_tracing().dont_check_nonce();
+							let res = Executive::new(&mut state, &env_info, self.engine.machine())
+								.transact(&transaction, options);
+
+							let res = match res {
+								Err(ExecutionError::Internal(e)) =>
+									Err(format!("Internal error: {}", e)),
+								Err(e) => {
+									trace!(target: "client", "Proved call failed: {}", e);
+									Ok((Vec::new(), state.drop().1.extract_proof()))
+								}
+								Ok(res) => Ok((res.output, state.drop().1.extract_proof())),
+							};
+
+							res.map(|(output, proof)| (output, proof.into_iter().map(|x| x.into_vec()).collect()))
+						};
+
+						match with_state.generate_proof(&call) {
+							Ok(proof) => proof,
+							Err(e) => {
+								warn!(target: "client", "Failed to generate transition proof for block {}: {}", hash, e);
+								warn!(target: "client", "Snapshots produced by this client may be incomplete");
+								Vec::new()
+							}
+						}
+					}
+				};
+
+				debug!(target: "client", "Block {} signals epoch end.", hash);
+
+				let pending = PendingTransition { proof: proof };
+				chain.insert_pending_transition(batch, hash, pending);
+			},
+			EpochChange::No => {},
+			EpochChange::Unsure(_) => {
+				warn!(target: "client", "Detected invalid engine implementation.");
+				warn!(target: "client", "Engine claims to require more block data, but everything provided.");
+			}
+		}
+	}
+
+	// check for ending of epoch and write transition if it occurs.
+	fn check_epoch_end<'a>(&self, header: &'a Header, chain: &BlockChain, client: &Client) {
+		let is_epoch_end = self.engine.is_epoch_end(
+			header,
+			&(|hash| chain.block_header(&hash)),
+			&(|hash| chain.get_pending_transition(hash)), // TODO: limit to current epoch.
+		);
+
+		if let Some(proof) = is_epoch_end {
+			debug!(target: "client", "Epoch transition at block {}", header.hash());
+
+			let mut batch = DBTransaction::new();
+			chain.insert_epoch_transition(&mut batch, header.number(), EpochTransition {
+				block_hash: header.hash(),
+				block_number: header.number(),
+				proof: proof,
+			});
+
+			// always write the batch directly since epoch transition proofs are
+			// fetched from a DB iterator and DB iterators are only available on
+			// flushed data.
+			client.db.read().write(batch).expect("DB flush failed");
+		}
+	}
+}
+
+impl Client {
+	/// Create a new client with given parameters.
+	/// The database is assumed to have been initialized with the correct columns.
+	pub fn new(
+		config: ClientConfig,
+		spec: &Spec,
+		db: Arc<KeyValueDB>,
+		miner: Arc<Miner>,
+		message_channel: IoChannel<ClientIoMessage>,
+	) -> Result<Arc<Client>, ::error::Error> {
+		let trie_spec = match config.fat_db {
+			true => TrieSpec::Fat,
+			false => TrieSpec::Secure,
+		};
+
+		let trie_factory = TrieFactory::new(trie_spec);
+		let factories = Factories {
+			vm: VmFactory::new(config.vm_type.clone(), config.jump_table_size),
+			trie: trie_factory,
+			accountdb: Default::default(),
+		};
+
+		let journal_db = journaldb::new(db.clone(), config.pruning, ::db::COL_STATE);
+		let mut state_db = StateDB::new(journal_db, config.state_cache_size);
+		if state_db.journal_db().is_empty() {
+			// Sets the correct state root.
+			state_db = spec.ensure_db_good(state_db, &factories)?;
+			let mut batch = DBTransaction::new();
+			state_db.journal_under(&mut batch, 0, &spec.genesis_header().hash())?;
+			db.write(batch).map_err(ClientError::Database)?;
+		}
+
+		let gb = spec.genesis_block();
+		let chain = Arc::new(BlockChain::new(config.blockchain.clone(), &gb, db.clone()));
+		let tracedb = RwLock::new(TraceDB::new(config.tracing.clone(), db.clone(), chain.clone()));
+
+		trace!("Cleanup journal: DB Earliest = {:?}, Latest = {:?}", state_db.journal_db().earliest_era(), state_db.journal_db().latest_era());
+
+		let history = if config.history < MIN_HISTORY_SIZE {
+			info!(target: "client", "Ignoring pruning history parameter of {}\
+				, falling back to minimum of {}",
+				config.history, MIN_HISTORY_SIZE);
+			MIN_HISTORY_SIZE
+		} else {
+			config.history
+		};
+
+		if !chain.block_header(&chain.best_block_hash()).map_or(true, |h| state_db.journal_db().contains(h.state_root())) {
+			warn!("State root not found for block #{} ({:x})", chain.best_block_number(), chain.best_block_hash());
+		}
+
+		let engine = spec.engine.clone();
+
+		let awake = match config.mode { Mode::Dark(..) | Mode::Off => false, _ => true };
+
+		let importer = Importer::new(&config, engine.clone(), message_channel.clone(), miner)?;
+
+		let registrar_address = engine.additional_params().get("registrar").and_then(|s| Address::from_str(s).ok());
+		if let Some(ref addr) = registrar_address {
+			trace!(target: "client", "Found registrar at {}", addr);
+		}
+
+		let client = Arc::new(Client {
+			enabled: AtomicBool::new(true),
+			sleep_state: Mutex::new(SleepState::new(awake)),
+			liveness: AtomicBool::new(awake),
+			mode: Mutex::new(config.mode.clone()),
+			chain: RwLock::new(chain),
+			tracedb: tracedb,
+			engine: engine,
+			pruning: config.pruning.clone(),
+			config: config,
+			db: RwLock::new(db),
+			state_db: RwLock::new(state_db),
+			report: RwLock::new(Default::default()),
+			io_channel: Mutex::new(message_channel),
+			notify: RwLock::new(Vec::new()),
+			queue_transactions: AtomicUsize::new(0),
+			last_hashes: RwLock::new(VecDeque::new()),
+			factories: factories,
+			history: history,
+			on_user_defaults_change: Mutex::new(None),
+			registrar: registry::Registry::default(),
+			registrar_address,
+			exit_handler: Mutex::new(None),
+			importer,
+		});
+
+		// prune old states.
+		{
+			let state_db = client.state_db.read().boxed_clone();
+			let chain = client.chain.read();
+			client.prune_ancient(state_db, &chain)?;
+		}
+
+		// ensure genesis epoch proof in the DB.
+		{
+			let chain = client.chain.read();
+			let gh = spec.genesis_header();
+			if chain.epoch_transition(0, gh.hash()).is_none() {
+				trace!(target: "client", "No genesis transition found.");
+
+				let proof = client.with_proving_caller(
+					BlockId::Number(0),
+					|call| client.engine.genesis_epoch_data(&gh, call)
+				);
+				let proof = match proof {
+					Ok(proof) => proof,
+					Err(e) => {
+						warn!(target: "client", "Error generating genesis epoch data: {}. Snapshots generated may not be complete.", e);
+						Vec::new()
+					}
+				};
+
+				debug!(target: "client", "Obtained genesis transition proof: {:?}", proof);
+
+				let mut batch = DBTransaction::new();
+				chain.insert_epoch_transition(&mut batch, 0, EpochTransition {
+					block_hash: gh.hash(),
+					block_number: 0,
+					proof: proof,
+				});
+
+				client.db.read().write_buffered(batch);
+			}
+		}
+
+		// ensure buffered changes are flushed.
+		client.db.read().flush().map_err(ClientError::Database)?;
+		Ok(client)
+	}
+
+	/// Wakes up client if it's a sleep.
+	pub fn keep_alive(&self) {
+		let should_wake = match *self.mode.lock() {
+			Mode::Dark(..) | Mode::Passive(..) => true,
+			_ => false,
+		};
+		if should_wake {
+			self.wake_up();
+			(*self.sleep_state.lock()).last_activity = Some(Instant::now());
+		}
+	}
+
+	/// Adds an actor to be notified on certain events
+	pub fn add_notify(&self, target: Arc<ChainNotify>) {
+		self.notify.write().push(Arc::downgrade(&target));
+	}
 
-							let transaction =
-								self.contract_call_tx(BlockId::Hash(*header.parent_hash()), addr, data);
+	/// Set a closure to call when we want to restart the client
+	pub fn set_exit_handler<F>(&self, f: F) where F: Fn(bool, Option<String>) + 'static + Send {
+		*self.exit_handler.lock() = Some(Box::new(f));
+	}
 
-							let mut state = State::from_existing(
-								backend,
-								header.state_root().clone(),
-								self.engine.account_start_nonce(header.number()),
-								self.factories.clone(),
-							).expect("state known to be available for just-imported block; qed");
+	/// Returns engine reference.
+	pub fn engine(&self) -> &EthEngine {
+		&*self.engine
+	}
 
-							let options = TransactOptions::with_no_tracing().dont_check_nonce();
-							let res = Executive::new(&mut state, &env_info, &*self.engine)
-								.transact(&transaction, options);
+	fn notify<F>(&self, f: F) where F: Fn(&ChainNotify) {
+		for np in self.notify.read().iter() {
+			if let Some(n) = np.upgrade() {
+				f(&*n);
+			}
+		}
+	}
 
-							let res = match res {
-								Err(ExecutionError::Internal(e)) =>
-									Err(format!("Internal error: {}", e)),
-								Err(e) => {
-									trace!(target: "client", "Proved call failed: {}", e);
-									Ok((Vec::new(), state.drop().1.extract_proof()))
-								}
-								Ok(res) => Ok((res.output, state.drop().1.extract_proof())),
-							};
+	/// Register an action to be done if a mode/spec_name change happens.
+	pub fn on_user_defaults_change<F>(&self, f: F) where F: 'static + FnMut(Option<Mode>) + Send {
+		*self.on_user_defaults_change.lock() = Some(Box::new(f));
+	}
 
-							res.map(|(output, proof)| (output, proof.into_iter().map(|x| x.into_vec()).collect()))
-						};
+	/// Flush the block import queue.
+	pub fn flush_queue(&self) {
+		self.importer.block_queue.flush();
+		while !self.importer.block_queue.queue_info().is_empty() {
+			self.import_verified_blocks();
+		}
+	}
 
-						match (with_state)(&call) {
-							Ok(proof) => proof,
-							Err(e) => {
-								warn!(target: "client", "Failed to generate transition proof for block {}: {}", hash, e);
-								warn!(target: "client", "Snapshots produced by this client may be incomplete");
-								Vec::new()
-							}
-						}
-					}
-				};
+	/// The env info as of the best block.
+	pub fn latest_env_info(&self) -> EnvInfo {
+		self.env_info(BlockId::Latest).expect("Best block header always stored; qed")
+	}
 
-				debug!(target: "client", "Block {} signals epoch end.", hash);
+	/// The env info as of a given block.
+	/// returns `None` if the block unknown.
+	pub fn env_info(&self, id: BlockId) -> Option<EnvInfo> {
+		self.block_header(id).map(|header| {
+			EnvInfo {
+				number: header.number(),
+				author: header.author(),
+				timestamp: header.timestamp(),
+				difficulty: header.difficulty(),
+				last_hashes: self.build_last_hashes(&header.parent_hash()),
+				gas_used: U256::default(),
+				gas_limit: header.gas_limit(),
+			}
+		})
+	}
 
-				let pending = PendingTransition { proof: proof };
-				chain.insert_pending_transition(batch, hash, pending);
-			},
-			EpochChange::No => {},
-			EpochChange::Unsure(_) => {
-				warn!(target: "client", "Detected invalid engine implementation.");
-				warn!(target: "client", "Engine claims to require more block data, but everything provided.");
+	fn build_last_hashes(&self, parent_hash: &H256) -> Arc<LastHashes> {
+		{
+			let hashes = self.last_hashes.read();
+			if hashes.front().map_or(false, |h| h == parent_hash) {
+				let mut res = Vec::from(hashes.clone());
+				res.resize(256, H256::default());
+				return Arc::new(res);
+			}
+		}
+		let mut last_hashes = LastHashes::new();
+		last_hashes.resize(256, H256::default());
+		last_hashes[0] = parent_hash.clone();
+		let chain = self.chain.read();
+		for i in 0..255 {
+			match chain.block_details(&last_hashes[i]) {
+				Some(details) => {
+					last_hashes[i + 1] = details.parent.clone();
+				},
+				None => break,
 			}
 		}
+		let mut cached_hashes = self.last_hashes.write();
+		*cached_hashes = VecDeque::from(last_hashes.clone());
+		Arc::new(last_hashes)
 	}
 
-	// check for ending of epoch and write transition if it occurs.
-	fn check_epoch_end<'a>(&self, header: &'a Header, chain: &BlockChain) {
-		let is_epoch_end = self.engine.is_epoch_end(
-			header,
-			&(|hash| chain.block_header(&hash)),
-			&(|hash| chain.get_pending_transition(hash)), // TODO: limit to current epoch.
-		);
-
-		if let Some(proof) = is_epoch_end {
-			debug!(target: "client", "Epoch transition at block {}", header.hash());
-
-			let mut batch = DBTransaction::new();
-			chain.insert_epoch_transition(&mut batch, header.number(), EpochTransition {
-				block_hash: header.hash(),
-				block_number: header.number(),
-				proof: proof,
-			});
 
-			// always write the batch directly since epoch transition proofs are
-			// fetched from a DB iterator and DB iterators are only available on
-			// flushed data.
-			self.db.read().write(batch).expect("DB flush failed");
-		}
+	/// This is triggered by a message coming from a block queue when the block is ready for insertion
+	pub fn import_verified_blocks(&self) -> usize {
+		self.importer.import_verified_blocks(self)
 	}
 
 	// use a state-proving closure for the given block.
 	fn with_proving_caller<F, T>(&self, id: BlockId, with_call: F) -> T
-		where F: FnOnce(&::engines::Call) -> T
+		where F: FnOnce(&::machine::Call) -> T
 	{
 		let call = |a, d| {
 			let tx = self.contract_call_tx(id, a, d);
@@ -878,20 +974,20 @@ impl Client {
 	/// Import transactions from the IO queue
 	pub fn import_queued_transactions(&self, transactions: &[Bytes], peer_id: usize) -> usize {
 		trace!(target: "external_tx", "Importing queued");
-		let _timer = PerfTimer::new("import_queued_transactions");
+		trace_time!("import_queued_transactions");
 		self.queue_transactions.fetch_sub(transactions.len(), AtomicOrdering::SeqCst);
 		let txs: Vec<UnverifiedTransaction> = transactions.iter().filter_map(|bytes| UntrustedRlp::new(bytes).as_val().ok()).collect();
 		let hashes: Vec<_> = txs.iter().map(|tx| tx.hash()).collect();
 		self.notify(|notify| {
 			notify.transactions_received(hashes.clone(), peer_id);
 		});
-		let results = self.miner.import_external_transactions(self, txs);
+		let results = self.importer.miner.import_external_transactions(self, txs);
 		results.len()
 	}
 
 	/// Get shared miner reference.
 	pub fn miner(&self) -> Arc<Miner> {
-		self.miner.clone()
+		self.importer.miner.clone()
 	}
 
 	/// Replace io channel. Useful for testing.
@@ -899,6 +995,18 @@ impl Client {
 		*self.io_channel.lock() = io_channel;
 	}
 
+	/// Get a copy of the best block's state.
+	pub fn latest_state(&self) -> State<StateDB> {
+		let header = self.best_block_header();
+		State::from_existing(
+			self.state_db.read().boxed_clone_canon(&header.hash()),
+			header.state_root(),
+			self.engine.account_start_nonce(header.number()),
+			self.factories.clone()
+		)
+		.expect("State root of best block header always valid.")
+	}
+
 	/// Attempt to get a copy of a specific block's final state.
 	///
 	/// This will not fail if given BlockId::Latest.
@@ -907,18 +1015,17 @@ impl Client {
 	pub fn state_at(&self, id: BlockId) -> Option<State<StateDB>> {
 		// fast path for latest state.
 		match id.clone() {
-			BlockId::Pending => return self.miner.pending_state(self.chain.read().best_block_number()).or_else(|| Some(self.state())),
-			BlockId::Latest => return Some(self.state()),
+			BlockId::Latest => return Some(self.latest_state()),
 			_ => {},
 		}
 
-		let block_number = match self.block_number(id.clone()) {
+		let block_number = match self.block_number(id) {
 			Some(num) => num,
 			None => return None,
 		};
 
 		self.block_header(id).and_then(|header| {
-			let db = self.state_db.lock().boxed_clone();
+			let db = self.state_db.read().boxed_clone();
 
 			// early exit for pruned blocks
 			if db.is_pruned() && self.pruning_info().earliest_state > block_number {
@@ -935,25 +1042,15 @@ impl Client {
 	/// This will not fail if given BlockId::Latest.
 	/// Otherwise, this can fail (but may not) if the DB prunes state.
 	pub fn state_at_beginning(&self, id: BlockId) -> Option<State<StateDB>> {
-		// fast path for latest state.
-		match id {
-			BlockId::Pending => self.state_at(BlockId::Latest),
-			id => match self.block_number(id) {
-				None | Some(0) => None,
-				Some(n) => self.state_at(BlockId::Number(n - 1)),
-			}
+		match self.block_number(id) {
+			None | Some(0) => None,
+			Some(n) => self.state_at(BlockId::Number(n - 1)),
 		}
 	}
 
 	/// Get a copy of the best block's state.
-	pub fn state(&self) -> State<StateDB> {
-		let header = self.best_block_header();
-		State::from_existing(
-			self.state_db.lock().boxed_clone_canon(&header.hash()),
-			header.state_root(),
-			self.engine.account_start_nonce(header.number()),
-			self.factories.clone())
-		.expect("State root of best block header always valid.")
+	pub fn state(&self) -> Box<StateInfo> {
+		Box::new(self.latest_state()) as Box<_>
 	}
 
 	/// Get info on the cache.
@@ -964,20 +1061,22 @@ impl Client {
 	/// Get the report.
 	pub fn report(&self) -> ClientReport {
 		let mut report = self.report.read().clone();
-		report.state_db_mem = self.state_db.lock().mem_used();
+		report.state_db_mem = self.state_db.read().mem_used();
 		report
 	}
 
 	/// Tick the client.
 	// TODO: manage by real events.
-	pub fn tick(&self) {
+	pub fn tick(&self, prevent_sleep: bool) {
 		self.check_garbage();
-		self.check_snooze();
+		if !prevent_sleep {
+			self.check_snooze();
+		}
 	}
 
 	fn check_garbage(&self) {
 		self.chain.read().collect_garbage();
-		self.block_queue.collect_garbage();
+		self.importer.block_queue.collect_garbage();
 		self.tracedb.read().collect_garbage();
 	}
 
@@ -1018,7 +1117,7 @@ impl Client {
 	/// Take a snapshot at the given block.
 	/// If the ID given is "latest", this will default to 1000 blocks behind.
 	pub fn take_snapshot<W: snapshot_io::SnapshotWriter + Send>(&self, writer: W, at: BlockId, p: &snapshot::Progress) -> Result<(), EthcoreError> {
-		let db = self.state_db.lock().journal_db().boxed_clone();
+		let db = self.state_db.read().journal_db().boxed_clone();
 		let best_block_number = self.chain_info().best_block_number;
 		let block_number = self.block_number(at).ok_or(snapshot::Error::InvalidStartingBlock(at))?;
 
@@ -1056,20 +1155,19 @@ impl Client {
 		self.history
 	}
 
-	fn block_hash(chain: &BlockChain, miner: &Miner, id: BlockId) -> Option<H256> {
+	fn block_hash(chain: &BlockChain, id: BlockId) -> Option<H256> {
 		match id {
 			BlockId::Hash(hash) => Some(hash),
 			BlockId::Number(number) => chain.block_hash(number),
 			BlockId::Earliest => chain.block_hash(0),
 			BlockId::Latest => Some(chain.best_block_hash()),
-			BlockId::Pending => miner.pending_block_header(chain.best_block_number()).map(|header| header.hash())
 		}
 	}
 
 	fn transaction_address(&self, id: TransactionId) -> Option<TransactionAddress> {
 		match id {
 			TransactionId::Hash(ref hash) => self.chain.read().transaction_address(hash),
-			TransactionId::Location(id, index) => Self::block_hash(&self.chain.read(), &self.miner, id).map(|hash| TransactionAddress {
+			TransactionId::Location(id, index) => Self::block_hash(&self.chain.read(), id).map(|hash| TransactionAddress {
 				block_hash: hash,
 				index: index,
 			})
@@ -1080,7 +1178,7 @@ impl Client {
 		if !self.liveness.load(AtomicOrdering::Relaxed) {
 			self.liveness.store(true, AtomicOrdering::Relaxed);
 			self.notify(|n| n.start());
-			trace!(target: "mode", "wake_up: Waking.");
+			info!(target: "mode", "wake_up: Waking.");
 		}
 	}
 
@@ -1090,11 +1188,11 @@ impl Client {
 			if self.queue_info().total_queue_size() <= MAX_QUEUE_SIZE_TO_SLEEP_ON {
 				self.liveness.store(false, AtomicOrdering::Relaxed);
 				self.notify(|n| n.stop());
-				trace!(target: "mode", "sleep: Sleeping.");
+				info!(target: "mode", "sleep: Sleeping.");
 			} else {
-				trace!(target: "mode", "sleep: Cannot sleep - syncing ongoing.");
+				info!(target: "mode", "sleep: Cannot sleep - syncing ongoing.");
 				// TODO: Consider uncommenting.
-				//*self.last_activity.lock() = Some(Instant::now());
+				//(*self.sleep_state.lock()).last_activity = Some(Instant::now());
 			}
 		}
 	}
@@ -1113,23 +1211,30 @@ impl Client {
 		}.fake_sign(from)
 	}
 
-	fn do_virtual_call(&self, env_info: &EnvInfo, state: &mut State<StateDB>, t: &SignedTransaction, analytics: CallAnalytics) -> Result<Executed, CallError> {
-		fn call<E, V, T>(
+	fn do_virtual_call(
+		machine: &::machine::EthereumMachine,
+		env_info: &EnvInfo,
+		state: &mut State<StateDB>,
+		t: &SignedTransaction,
+		analytics: CallAnalytics,
+	) -> Result<Executed, CallError> {
+		fn call<V, T>(
 			state: &mut State<StateDB>,
 			env_info: &EnvInfo,
-			engine: &E,
+			machine: &::machine::EthereumMachine,
 			state_diff: bool,
 			transaction: &SignedTransaction,
 			options: TransactOptions<T, V>,
-		) -> Result<Executed, CallError> where
-			E: Engine + ?Sized,
+		) -> Result<Executed<T::Output, V::Output>, CallError> where
 			T: trace::Tracer,
 			V: trace::VMTracer,
 		{
-			let options = options.dont_check_nonce();
+			let options = options
+				.dont_check_nonce()
+				.save_output_from_contract();
 			let original_state = if state_diff { Some(state.clone()) } else { None };
 
-			let mut ret = Executive::new(state, env_info, engine).transact_virtual(transaction, options)?;
+			let mut ret = Executive::new(state, env_info, machine).transact_virtual(transaction, options)?;
 
 			if let Some(original) = original_state {
 				ret.state_diff = Some(state.diff_from(original).map_err(ExecutionError::from)?);
@@ -1138,59 +1243,216 @@ impl Client {
 		}
 
 		let state_diff = analytics.state_diffing;
-		let engine = &*self.engine;
 
 		match (analytics.transaction_tracing, analytics.vm_tracing) {
-			(true, true) => call(state, env_info, engine, state_diff, t, TransactOptions::with_tracing_and_vm_tracing()),
-			(true, false) => call(state, env_info, engine, state_diff, t, TransactOptions::with_tracing()),
-			(false, true) => call(state, env_info, engine, state_diff, t, TransactOptions::with_vm_tracing()),
-			(false, false) => call(state, env_info, engine, state_diff, t, TransactOptions::with_no_tracing()),
+			(true, true) => call(state, env_info, machine, state_diff, t, TransactOptions::with_tracing_and_vm_tracing()),
+			(true, false) => call(state, env_info, machine, state_diff, t, TransactOptions::with_tracing()),
+			(false, true) => call(state, env_info, machine, state_diff, t, TransactOptions::with_vm_tracing()),
+			(false, false) => call(state, env_info, machine, state_diff, t, TransactOptions::with_no_tracing()),
+		}
+	}
+
+	fn block_number_ref(&self, id: &BlockId) -> Option<BlockNumber> {
+		match *id {
+			BlockId::Number(number) => Some(number),
+			BlockId::Hash(ref hash) => self.chain.read().block_number(hash),
+			BlockId::Earliest => Some(0),
+			BlockId::Latest => Some(self.chain.read().best_block_number()),
+		}
+	}
+}
+
+impl snapshot::DatabaseRestore for Client {
+	/// Restart the client with a new backend
+	fn restore_db(&self, new_db: &str) -> Result<(), EthcoreError> {
+		trace!(target: "snapshot", "Replacing client database with {:?}", new_db);
+
+		let _import_lock = self.importer.import_lock.lock();
+		let mut state_db = self.state_db.write();
+		let mut chain = self.chain.write();
+		let mut tracedb = self.tracedb.write();
+		self.importer.miner.clear();
+		let db = self.db.write();
+		db.restore(new_db)?;
+
+		let cache_size = state_db.cache_size();
+		*state_db = StateDB::new(journaldb::new(db.clone(), self.pruning, ::db::COL_STATE), cache_size);
+		*chain = Arc::new(BlockChain::new(self.config.blockchain.clone(), &[], db.clone()));
+		*tracedb = TraceDB::new(self.config.tracing.clone(), db.clone(), chain.clone());
+		Ok(())
+	}
+}
+
+impl Nonce for Client {
+	fn nonce(&self, address: &Address, id: BlockId) -> Option<U256> {
+		self.state_at(id).and_then(|s| s.nonce(address).ok())
+	}
+}
+
+impl Balance for Client {
+	fn balance(&self, address: &Address, state: StateOrBlock) -> Option<U256> {
+		match state {
+			StateOrBlock::State(s) => s.balance(address).ok(),
+			StateOrBlock::Block(id) => self.state_at(id).and_then(|s| s.balance(address).ok())
+		}
+	}
+}
+
+impl AccountData for Client {}
+
+impl ChainInfo for Client {
+	fn chain_info(&self) -> BlockChainInfo {
+		let mut chain_info = self.chain.read().chain_info();
+		chain_info.pending_total_difficulty = chain_info.total_difficulty + self.importer.block_queue.total_difficulty();
+		chain_info
+	}
+}
+
+impl BlockInfo for Client {
+	fn block_header(&self, id: BlockId) -> Option<::encoded::Header> {
+		let chain = self.chain.read();
+
+		Self::block_hash(&chain, id).and_then(|hash| chain.block_header_data(&hash))
+	}
+
+	fn best_block_header(&self) -> encoded::Header {
+		self.chain.read().best_block_header()
+	}
+
+	fn block(&self, id: BlockId) -> Option<encoded::Block> {
+		let chain = self.chain.read();
+
+		Self::block_hash(&chain, id).and_then(|hash| {
+			chain.block(&hash)
+		})
+	}
+
+	fn code_hash(&self, address: &Address, id: BlockId) -> Option<H256> {
+		self.state_at(id).and_then(|s| s.code_hash(address).ok())
+	}
+}
+
+impl TransactionInfo for Client {
+	fn transaction_block(&self, id: TransactionId) -> Option<H256> {
+		self.transaction_address(id).map(|addr| addr.block_hash)
+	}
+}
+
+impl BlockChainTrait for Client {}
+
+impl RegistryInfo for Client {
+	fn registry_address(&self, name: String, block: BlockId) -> Option<Address> {
+		let address = self.registrar_address?;
+
+		self.registrar.functions()
+			.get_address()
+			.call(keccak(name.as_bytes()), "A", &|data| self.call_contract(block, address, data))
+			.ok()
+			.and_then(|a| if a.is_zero() {
+				None
+			} else {
+				Some(a)
+			})
+	}
+}
+
+impl CallContract for Client {
+	fn call_contract(&self, block_id: BlockId, address: Address, data: Bytes) -> Result<Bytes, String> {
+		let state_pruned = || CallError::StatePruned.to_string();
+		let state = &mut self.state_at(block_id).ok_or_else(&state_pruned)?;
+		let header = self.block_header(block_id).ok_or_else(&state_pruned)?;
+
+		let transaction = self.contract_call_tx(block_id, address, data);
+
+		self.call(&transaction, Default::default(), state, &header.decode())
+			.map_err(|e| format!("{:?}", e))
+			.map(|executed| executed.output)
+	}
+}
+
+impl ImportBlock for Client {
+	fn import_block(&self, bytes: Bytes) -> Result<H256, BlockImportError> {
+		use verification::queue::kind::BlockLike;
+		use verification::queue::kind::blocks::Unverified;
+
+		// create unverified block here so the `keccak` calculation can be cached.
+		let unverified = Unverified::new(bytes);
+
+		{
+			if self.chain.read().is_known(&unverified.hash()) {
+				return Err(BlockImportError::Import(ImportError::AlreadyInChain));
+			}
+			let status = self.block_status(BlockId::Hash(unverified.parent_hash()));
+			if status == BlockStatus::Unknown || status == BlockStatus::Pending {
+				return Err(BlockImportError::Block(BlockError::UnknownParent(unverified.parent_hash())));
+			}
+		}
+		Ok(self.importer.block_queue.import(unverified)?)
+	}
+
+	fn import_block_with_receipts(&self, block_bytes: Bytes, receipts_bytes: Bytes) -> Result<H256, BlockImportError> {
+		{
+			// check block order
+			let header = BlockView::new(&block_bytes).header_view();
+			if self.chain.read().is_known(&header.hash()) {
+				return Err(BlockImportError::Import(ImportError::AlreadyInChain));
+			}
+			let status = self.block_status(BlockId::Hash(header.parent_hash()));
+			if  status == BlockStatus::Unknown || status == BlockStatus::Pending {
+				return Err(BlockImportError::Block(BlockError::UnknownParent(header.parent_hash())));
+			}
 		}
+
+		self.importer.import_old_block(block_bytes, receipts_bytes, &**self.db.read(), &*self.chain.read()).map_err(Into::into)
 	}
 }
 
-impl snapshot::DatabaseRestore for Client {
-	/// Restart the client with a new backend
-	fn restore_db(&self, new_db: &str) -> Result<(), EthcoreError> {
-		trace!(target: "snapshot", "Replacing client database with {:?}", new_db);
+impl StateClient for Client {
+	type State = State<::state_db::StateDB>;
 
-		let _import_lock = self.import_lock.lock();
-		let mut state_db = self.state_db.lock();
-		let mut chain = self.chain.write();
-		let mut tracedb = self.tracedb.write();
-		self.miner.clear();
-		let db = self.db.write();
-		db.restore(new_db)?;
+	fn latest_state(&self) -> Self::State {
+		Client::latest_state(self)
+	}
 
-		let cache_size = state_db.cache_size();
-		*state_db = StateDB::new(journaldb::new(db.clone(), self.pruning, ::db::COL_STATE), cache_size);
-		*chain = Arc::new(BlockChain::new(self.config.blockchain.clone(), &[], db.clone()));
-		*tracedb = TraceDB::new(self.config.tracing.clone(), db.clone(), chain.clone());
-		Ok(())
+	fn state_at(&self, id: BlockId) -> Option<Self::State> {
+		Client::state_at(self, id)
 	}
 }
 
-impl BlockChainClient for Client {
-	fn call(&self, transaction: &SignedTransaction, analytics: CallAnalytics, block: BlockId) -> Result<Executed, CallError> {
-		let mut env_info = self.env_info(block).ok_or(CallError::StatePruned)?;
-		env_info.gas_limit = U256::max_value();
-
-		// that's just a copy of the state.
-		let mut state = self.state_at(block).ok_or(CallError::StatePruned)?;
+impl Call for Client {
+	type State = State<::state_db::StateDB>;
+
+	fn call(&self, transaction: &SignedTransaction, analytics: CallAnalytics, state: &mut Self::State, header: &Header) -> Result<Executed, CallError> {
+		let env_info = EnvInfo {
+			number: header.number(),
+			author: header.author().clone(),
+			timestamp: header.timestamp(),
+			difficulty: header.difficulty().clone(),
+			last_hashes: self.build_last_hashes(header.parent_hash()),
+			gas_used: U256::default(),
+			gas_limit: U256::max_value(),
+		};
+		let machine = self.engine.machine();
 
-		self.do_virtual_call(&env_info, &mut state, transaction, analytics)
+		Self::do_virtual_call(&machine, &env_info, state, transaction, analytics)
 	}
 
-	fn call_many(&self, transactions: &[(SignedTransaction, CallAnalytics)], block: BlockId) -> Result<Vec<Executed>, CallError> {
-		let mut env_info = self.env_info(block).ok_or(CallError::StatePruned)?;
-		env_info.gas_limit = U256::max_value();
+	fn call_many(&self, transactions: &[(SignedTransaction, CallAnalytics)], state: &mut Self::State, header: &Header) -> Result<Vec<Executed>, CallError> {
+		let mut env_info = EnvInfo {
+			number: header.number(),
+			author: header.author().clone(),
+			timestamp: header.timestamp(),
+			difficulty: header.difficulty().clone(),
+			last_hashes: self.build_last_hashes(header.parent_hash()),
+			gas_used: U256::default(),
+			gas_limit: U256::max_value(),
+		};
 
-		// that's just a copy of the state.
-		let mut state = self.state_at(block).ok_or(CallError::StatePruned)?;
 		let mut results = Vec::with_capacity(transactions.len());
+		let machine = self.engine.machine();
 
 		for &(ref t, analytics) in transactions {
-			let ret = self.do_virtual_call(&env_info, &mut state, t, analytics)?;
+			let ret = Self::do_virtual_call(machine, &env_info, state, t, analytics)?;
 			env_info.gas_used = ret.cumulative_gas_used;
 			results.push(ret);
 		}
@@ -1198,36 +1460,41 @@ impl BlockChainClient for Client {
 		Ok(results)
 	}
 
-	fn estimate_gas(&self, t: &SignedTransaction, block: BlockId) -> Result<U256, CallError> {
-		const UPPER_CEILING: u64 = 1_000_000_000_000u64;
-		let (mut upper, env_info)  = {
-			let mut env_info = self.env_info(block).ok_or(CallError::StatePruned)?;
-			let initial_upper = env_info.gas_limit;
-			env_info.gas_limit = UPPER_CEILING.into();
-			(initial_upper, env_info)
+	fn estimate_gas(&self, t: &SignedTransaction, state: &Self::State, header: &Header) -> Result<U256, CallError> {
+		let (mut upper, max_upper, env_info)  = {
+			let init = *header.gas_limit();
+			let max = init * U256::from(10);
+
+			let env_info = EnvInfo {
+				number: header.number(),
+				author: header.author().clone(),
+				timestamp: header.timestamp(),
+				difficulty: header.difficulty().clone(),
+				last_hashes: self.build_last_hashes(header.parent_hash()),
+				gas_used: U256::default(),
+				gas_limit: max,
+			};
+
+			(init, max, env_info)
 		};
 
-		// that's just a copy of the state.
-		let original_state = self.state_at(block).ok_or(CallError::StatePruned)?;
 		let sender = t.sender();
-		let options = || TransactOptions::with_tracing();
+		let options = || TransactOptions::with_tracing().dont_check_nonce();
 
 		let cond = |gas| {
 			let mut tx = t.as_unsigned().clone();
 			tx.gas = gas;
 			let tx = tx.fake_sign(sender);
 
-			let mut state = original_state.clone();
-			Ok(Executive::new(&mut state, &env_info, &*self.engine)
+			let mut clone = state.clone();
+			Ok(Executive::new(&mut clone, &env_info, self.engine.machine())
 				.transact_virtual(&tx, options())
 				.map(|r| r.exception.is_none())
 				.unwrap_or(false))
 		};
 
 		if !cond(upper)? {
-			// impossible at block gas limit - try `UPPER_CEILING` instead.
-			// TODO: consider raising limit by powers of two.
-			upper = UPPER_CEILING.into();
+			upper = max_upper;
 			if !cond(upper)? {
 				trace!(target: "estimate_gas", "estimate_gas failed with {}", upper);
 				let err = ExecutionError::Internal(format!("Requires higher than upper limit of {}", upper));
@@ -1263,31 +1530,44 @@ impl BlockChainClient for Client {
 		trace!(target: "estimate_gas", "estimate_gas chopping {} .. {}", lower, upper);
 		binary_chop(lower, upper, cond)
 	}
+}
+
+impl EngineInfo for Client {
+	fn engine(&self) -> &EthEngine {
+		Client::engine(self)
+	}
+}
 
+impl BlockChainClient for Client {
 	fn replay(&self, id: TransactionId, analytics: CallAnalytics) -> Result<Executed, CallError> {
 		let address = self.transaction_address(id).ok_or(CallError::TransactionNotFound)?;
-		let mut env_info = self.env_info(BlockId::Hash(address.block_hash)).ok_or(CallError::StatePruned)?;
-		let body = self.block_body(BlockId::Hash(address.block_hash)).ok_or(CallError::StatePruned)?;
-		let mut state = self.state_at_beginning(BlockId::Hash(address.block_hash)).ok_or(CallError::StatePruned)?;
-		let mut txs = body.transactions();
+		let block = BlockId::Hash(address.block_hash);
 
-		if address.index >= txs.len() {
-			return Err(CallError::TransactionNotFound);
-		}
+		const PROOF: &'static str = "The transaction address contains a valid index within block; qed";
+		Ok(self.replay_block_transactions(block, analytics)?.nth(address.index).expect(PROOF))
+	}
+
+	fn replay_block_transactions(&self, block: BlockId, analytics: CallAnalytics) -> Result<Box<Iterator<Item = Executed>>, CallError> {
+		let mut env_info = self.env_info(block).ok_or(CallError::StatePruned)?;
+		let body = self.block_body(block).ok_or(CallError::StatePruned)?;
+		let mut state = self.state_at_beginning(block).ok_or(CallError::StatePruned)?;
+		let txs = body.transactions();
+		let engine = self.engine.clone();
 
 		const PROOF: &'static str = "Transactions fetched from blockchain; blockchain transactions are valid; qed";
-		let rest = txs.split_off(address.index);
-		for t in txs {
-			let t = SignedTransaction::new(t).expect(PROOF);
-			let x = Executive::new(&mut state, &env_info, &*self.engine).transact(&t, TransactOptions::with_no_tracing())?;
-			env_info.gas_used = env_info.gas_used + x.gas_used;
-		}
-		let first = rest.into_iter().next().expect("We split off < `address.index`; Length is checked earlier; qed");
-		let t = SignedTransaction::new(first).expect(PROOF);
+		const EXECUTE_PROOF: &'static str = "Transaction replayed; qed";
 
-		self.do_virtual_call(&env_info, &mut state, &t, analytics)
+		Ok(Box::new(txs.into_iter()
+			.map(move |t| {
+				let t = SignedTransaction::new(t).expect(PROOF);
+				let machine = engine.machine();
+				let x = Self::do_virtual_call(machine, &env_info, &mut state, &t, analytics).expect(EXECUTE_PROOF);
+				env_info.gas_used = env_info.gas_used + x.gas_used;
+				x
+			})))
 	}
 
+
 	fn mode(&self) -> IpcMode {
 		let r = self.mode.lock().clone().into();
 		trace!(target: "mode", "Asked for mode = {:?}. returning {:?}", &*self.mode.lock(), r);
@@ -1337,94 +1617,29 @@ impl BlockChainClient for Client {
 		}
 	}
 
-	fn best_block_header(&self) -> encoded::Header {
-		self.chain.read().best_block_header()
-	}
-
-	fn block_header(&self, id: BlockId) -> Option<::encoded::Header> {
-		let chain = self.chain.read();
-
-		if let BlockId::Pending = id {
-			if let Some(block) = self.miner.pending_block(chain.best_block_number()) {
-				return Some(encoded::Header::new(block.header.rlp(Seal::Without)));
-			}
-			// fall back to latest
-			return self.block_header(BlockId::Latest);
-		}
-
-		Self::block_hash(&chain, &self.miner, id).and_then(|hash| chain.block_header_data(&hash))
-	}
-
 	fn block_number(&self, id: BlockId) -> Option<BlockNumber> {
-		match id {
-			BlockId::Number(number) => Some(number),
-			BlockId::Hash(ref hash) => self.chain.read().block_number(hash),
-			BlockId::Earliest => Some(0),
-			BlockId::Latest => Some(self.chain.read().best_block_number()),
-			BlockId::Pending => Some(self.chain.read().best_block_number() + 1),
-		}
+		self.block_number_ref(&id)
 	}
 
 	fn block_body(&self, id: BlockId) -> Option<encoded::Body> {
 		let chain = self.chain.read();
 
-		if let BlockId::Pending = id {
-			if let Some(block) = self.miner.pending_block(chain.best_block_number()) {
-				return Some(encoded::Body::new(BlockChain::block_to_body(&block.rlp_bytes(Seal::Without))));
-			}
-			// fall back to latest
-			return self.block_body(BlockId::Latest);
-		}
-
-		Self::block_hash(&chain, &self.miner, id).and_then(|hash| chain.block_body(&hash))
-	}
-
-	fn block(&self, id: BlockId) -> Option<encoded::Block> {
-		let chain = self.chain.read();
-
-		if let BlockId::Pending = id {
-			if let Some(block) = self.miner.pending_block(chain.best_block_number()) {
-				return Some(encoded::Block::new(block.rlp_bytes(Seal::Without)));
-			}
-			// fall back to latest
-			return self.block(BlockId::Latest);
-		}
-
-		Self::block_hash(&chain, &self.miner, id).and_then(|hash| {
-			chain.block(&hash)
-		})
+		Self::block_hash(&chain, id).and_then(|hash| chain.block_body(&hash))
 	}
 
 	fn block_status(&self, id: BlockId) -> BlockStatus {
-		if let BlockId::Pending = id {
-			return BlockStatus::Pending;
-		}
-
 		let chain = self.chain.read();
-		match Self::block_hash(&chain, &self.miner, id) {
+		match Self::block_hash(&chain, id) {
 			Some(ref hash) if chain.is_known(hash) => BlockStatus::InChain,
-			Some(hash) => self.block_queue.status(&hash).into(),
+			Some(hash) => self.importer.block_queue.status(&hash).into(),
 			None => BlockStatus::Unknown
 		}
 	}
 
 	fn block_total_difficulty(&self, id: BlockId) -> Option<U256> {
 		let chain = self.chain.read();
-		if let BlockId::Pending = id {
-			let latest_difficulty = self.block_total_difficulty(BlockId::Latest).expect("blocks in chain have details; qed");
-			let pending_difficulty = self.miner.pending_block_header(chain.best_block_number()).map(|header| *header.difficulty());
-			if let Some(difficulty) = pending_difficulty {
-				return Some(difficulty + latest_difficulty);
-			}
-			// fall back to latest
-			return Some(latest_difficulty);
-		}
 
-		Self::block_hash(&chain, &self.miner, id).and_then(|hash| chain.block_details(&hash)).map(|d| d.total_difficulty)
-	}
-
-	fn nonce(&self, address: &Address, id: BlockId) -> Option<U256> {
-		self.state_at(id).and_then(|s| s.nonce(address).ok())
+		Self::block_hash(&chain, id).and_then(|hash| chain.block_details(&hash)).map(|d| d.total_difficulty)
 	}
 
 	fn storage_root(&self, address: &Address, id: BlockId) -> Option<H256> {
@@ -1433,19 +1648,24 @@ impl BlockChainClient for Client {
 
 	fn block_hash(&self, id: BlockId) -> Option<H256> {
 		let chain = self.chain.read();
-		Self::block_hash(&chain, &self.miner, id)
+		Self::block_hash(&chain, id)
 	}
 
-	fn code(&self, address: &Address, id: BlockId) -> Option<Option<Bytes>> {
-		self.state_at(id).and_then(|s| s.code(address).ok()).map(|c| c.map(|c| (&*c).clone()))
-	}
+	fn code(&self, address: &Address, state: StateOrBlock) -> Option<Option<Bytes>> {
+		let result = match state {
+			StateOrBlock::State(s) => s.code(address).ok(),
+			StateOrBlock::Block(id) => self.state_at(id).and_then(|s| s.code(address).ok())
+		};
 
-	fn balance(&self, address: &Address, id: BlockId) -> Option<U256> {
-		self.state_at(id).and_then(|s| s.balance(address).ok())
+		// Converting from `Option<Option<Arc<Bytes>>>` to `Option<Option<Bytes>>`
+		result.map(|c| c.map(|c| (&*c).clone()))
 	}
 
-	fn storage_at(&self, address: &Address, position: &H256, id: BlockId) -> Option<H256> {
-		self.state_at(id).and_then(|s| s.storage_at(address, position).ok())
+	fn storage_at(&self, address: &Address, position: &H256, state: StateOrBlock) -> Option<H256> {
+		match state {
+			StateOrBlock::State(s) => s.storage_at(address, position).ok(),
+			StateOrBlock::Block(id) => self.state_at(id).and_then(|s| s.storage_at(address, position).ok())
+		}
 	}
 
 	fn list_accounts(&self, id: BlockId, after: Option<&Address>, count: u64) -> Option<Vec<Address>> {
@@ -1503,7 +1723,7 @@ impl BlockChainClient for Client {
 		};
 
 		let (_, db) = state.drop();
-		let account_db = self.factories.accountdb.readonly(db.as_hashdb(), account.sha3());
+		let account_db = self.factories.accountdb.readonly(db.as_hashdb(), keccak(account));
 		let trie = match self.factories.trie.readonly(account_db.as_hashdb(), &root) {
 			Ok(trie) => trie,
 			_ => {
@@ -1534,10 +1754,6 @@ impl BlockChainClient for Client {
 		self.transaction_address(id).and_then(|address| self.chain.read().transaction(&address))
 	}
 
-	fn transaction_block(&self, id: TransactionId) -> Option<H256> {
-		self.transaction_address(id).map(|addr| addr.block_hash)
-	}
-
 	fn uncle(&self, id: UncleId) -> Option<encoded::Header> {
 		let index = id.position;
 		self.block_body(id.block).and_then(|body| body.view().uncle_rlp_at(index))
@@ -1560,7 +1776,7 @@ impl BlockChainClient for Client {
 					.collect();
 				match (transaction, previous_receipts) {
 					(Some(transaction), Some(previous_receipts)) => {
-						Some(transaction_receipt(self.engine(), transaction, previous_receipts))
+						Some(transaction_receipt(self.engine().machine(), transaction, previous_receipts))
 					},
 					_ => None,
 				}
@@ -1580,75 +1796,36 @@ impl BlockChainClient for Client {
 	}
 
 	fn state_data(&self, hash: &H256) -> Option<Bytes> {
-		self.state_db.lock().journal_db().state(hash)
+		self.state_db.read().journal_db().state(hash)
 	}
 
 	fn block_receipts(&self, hash: &H256) -> Option<Bytes> {
 		self.chain.read().block_receipts(hash).map(|receipts| ::rlp::encode(&receipts).into_vec())
 	}
 
-	fn import_block(&self, bytes: Bytes) -> Result<H256, BlockImportError> {
-		use verification::queue::kind::BlockLike;
-		use verification::queue::kind::blocks::Unverified;
-
-		// create unverified block here so the `sha3` calculation can be cached.
-		let unverified = Unverified::new(bytes);
-
-		{
-			if self.chain.read().is_known(&unverified.hash()) {
-				return Err(BlockImportError::Import(ImportError::AlreadyInChain));
-			}
-			let status = self.block_status(BlockId::Hash(unverified.parent_hash()));
-			if status == BlockStatus::Unknown || status == BlockStatus::Pending {
-				return Err(BlockImportError::Block(BlockError::UnknownParent(unverified.parent_hash())));
-			}
-		}
-		Ok(self.block_queue.import(unverified)?)
-	}
-
-	fn import_block_with_receipts(&self, block_bytes: Bytes, receipts_bytes: Bytes) -> Result<H256, BlockImportError> {
-		{
-			// check block order
-			let header = BlockView::new(&block_bytes).header_view();
-			if self.chain.read().is_known(&header.hash()) {
-				return Err(BlockImportError::Import(ImportError::AlreadyInChain));
-			}
-			let status = self.block_status(BlockId::Hash(header.parent_hash()));
-			if  status == BlockStatus::Unknown || status == BlockStatus::Pending {
-				return Err(BlockImportError::Block(BlockError::UnknownParent(header.parent_hash())));
-			}
-		}
-		self.import_old_block(block_bytes, receipts_bytes).map_err(Into::into)
-	}
-
 	fn queue_info(&self) -> BlockQueueInfo {
-		self.block_queue.queue_info()
+		self.importer.block_queue.queue_info()
 	}
 
 	fn clear_queue(&self) {
-		self.block_queue.clear();
-	}
-
-	fn chain_info(&self) -> BlockChainInfo {
-		let mut chain_info = self.chain.read().chain_info();
-		chain_info.pending_total_difficulty = chain_info.total_difficulty + self.block_queue.total_difficulty();
-		chain_info
+		self.importer.block_queue.clear();
 	}
 
 	fn additional_params(&self) -> BTreeMap<String, String> {
 		self.engine.additional_params().into_iter().collect()
 	}
 
-	fn blocks_with_bloom(&self, bloom: &H2048, from_block: BlockId, to_block: BlockId) -> Option<Vec<BlockNumber>> {
-		match (self.block_number(from_block), self.block_number(to_block)) {
-			(Some(from), Some(to)) => Some(self.chain.read().blocks_with_bloom(bloom, from, to)),
-			_ => None
-		}
-	}
-
 	fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry> {
+		let (from, to) = match (self.block_number_ref(&filter.from_block), self.block_number_ref(&filter.to_block)) {
+			(Some(from), Some(to)) => (from, to),
+			_ => return Vec::new(),
+		};
+
+		let chain = self.chain.read();
 		let blocks = filter.bloom_possibilities().iter()
-			.filter_map(|bloom| self.blocks_with_bloom(bloom, filter.from_block.clone(), filter.to_block.clone()))
+			.map(move |bloom| {
+				chain.blocks_with_bloom(bloom, from, to)
+			})
 			.flat_map(|m| m)
 			// remove duplicate elements
 			.collect::<HashSet<u64>>()
@@ -1659,22 +1836,22 @@ impl BlockChainClient for Client {
 	}
 
 	fn filter_traces(&self, filter: TraceFilter) -> Option<Vec<LocalizedTrace>> {
-		let start = self.block_number(filter.range.start);
-		let end = self.block_number(filter.range.end);
-
-		match (start, end) {
-			(Some(s), Some(e)) => {
-				let filter = trace::Filter {
-					range: s as usize..e as usize,
-					from_address: From::from(filter.from_address),
-					to_address: From::from(filter.to_address),
-				};
+		let start = self.block_number(filter.range.start)?;
+		let end = self.block_number(filter.range.end)?;
 
-				let traces = self.tracedb.read().filter(&filter);
-				Some(traces)
-			},
-			_ => None,
-		}
+		let db_filter = trace::Filter {
+			range: start as usize..end as usize,
+			from_address: filter.from_address.into(),
+			to_address: filter.to_address.into(),
+		};
+
+		let traces = self.tracedb.read()
+			.filter(&db_filter)
+			.into_iter()
+			.skip(filter.after.unwrap_or(0))
+			.take(filter.count.unwrap_or(usize::max_value()))
+			.collect();
+		Some(traces)
 	}
 
 	fn trace(&self, trace: TraceId) -> Option<LocalizedTrace> {
@@ -1700,7 +1877,7 @@ impl BlockChainClient for Client {
 	}
 
 	fn last_hashes(&self) -> LastHashes {
-		(*self.build_last_hashes(self.chain.read().best_block_hash())).clone()
+		(*self.build_last_hashes(&self.chain.read().best_block_hash())).clone()
 	}
 
 	fn queue_transactions(&self, transactions: Vec<Bytes>, peer_id: usize) {
@@ -1726,7 +1903,7 @@ impl BlockChainClient for Client {
 			let chain = self.chain.read();
 			(chain.best_block_number(), chain.best_block_timestamp())
 		};
-		self.miner.ready_transactions(number, timestamp)
+		self.importer.miner.ready_transactions(number, timestamp)
 	}
 
 	fn queue_consensus_message(&self, message: Bytes) {
@@ -1753,48 +1930,27 @@ impl BlockChainClient for Client {
 	fn pruning_info(&self) -> PruningInfo {
 		PruningInfo {
 			earliest_chain: self.chain.read().first_block_number().unwrap_or(1),
-			earliest_state: self.state_db.lock().journal_db().earliest_era().unwrap_or(0),
+			earliest_state: self.state_db.read().journal_db().earliest_era().unwrap_or(0),
 		}
 	}
 
-	fn call_contract(&self, block_id: BlockId, address: Address, data: Bytes) -> Result<Bytes, String> {
-		let transaction = self.contract_call_tx(block_id, address, data);
-
-		self.call(&transaction, Default::default(), block_id)
-			.map_err(|e| format!("{:?}", e))
-			.map(|executed| {
-				executed.output
-			})
-	}
-
-	fn transact_contract(&self, address: Address, data: Bytes) -> Result<TransactionImportResult, EthcoreError> {
+	fn transact_contract(&self, address: Address, data: Bytes) -> Result<transaction::ImportResult, EthcoreError> {
 		let transaction = Transaction {
-			nonce: self.latest_nonce(&self.miner.author()),
+			nonce: self.latest_nonce(&self.importer.miner.author()),
 			action: Action::Call(address),
-			gas: self.miner.gas_floor_target(),
-			gas_price: self.miner.sensible_gas_price(),
+			gas: self.importer.miner.gas_floor_target(),
+			gas_price: self.importer.miner.sensible_gas_price(),
 			value: U256::zero(),
 			data: data,
 		};
 		let chain_id = self.engine.signing_chain_id(&self.latest_env_info());
 		let signature = self.engine.sign(transaction.hash(chain_id))?;
 		let signed = SignedTransaction::new(transaction.with_signature(signature, chain_id))?;
-		self.miner.import_own_transaction(self, signed.into())
+		self.importer.miner.import_own_transaction(self, signed.into())
 	}
 
 	fn registrar_address(&self) -> Option<Address> {
-		self.registrar.lock().as_ref().map(|r| r.address)
-	}
-
-	fn registry_address(&self, name: String) -> Option<Address> {
-		self.registrar.lock().as_ref()
-			.and_then(|r| {
-				let dispatch = move |reg_addr, data| {
-					future::done(self.call_contract(BlockId::Latest, reg_addr, data))
-				};
-				r.get_address(dispatch, name.as_bytes().sha3(), "A".to_string()).wait().ok()
-			})
-			.and_then(|a| if a.is_zero() { None } else { Some(a) })
+		self.registrar_address.clone()
 	}
 
 	fn eip86_transition(&self) -> u64 {
@@ -1802,11 +1958,36 @@ impl BlockChainClient for Client {
 	}
 }
 
-impl MiningBlockChainClient for Client {
-	fn latest_schedule(&self) -> Schedule {
-		self.engine.schedule(self.latest_env_info().number)
+impl ReopenBlock for Client {
+	fn reopen_block(&self, block: ClosedBlock) -> OpenBlock {
+		let engine = &*self.engine;
+		let mut block = block.reopen(engine);
+		let max_uncles = engine.maximum_uncle_count(block.header().number());
+		if block.uncles().len() < max_uncles {
+			let chain = self.chain.read();
+			let h = chain.best_block_hash();
+			// Add new uncles
+			let uncles = chain
+				.find_uncle_hashes(&h, engine.maximum_uncle_age())
+				.unwrap_or_else(Vec::new);
+
+			for h in uncles {
+				if !block.uncles().iter().any(|header| header.hash() == h) {
+					let uncle = chain.block_header(&h).expect("find_uncle_hashes only returns hashes for existing headers; qed");
+					block.push_uncle(uncle).expect("pushing up to maximum_uncle_count;
+												push_uncle is not ok only if more than maximum_uncle_count is pushed;
+												so all push_uncle are Ok;
+												qed");
+					if block.uncles().len() >= max_uncles { break }
+				}
+			}
+
+		}
+		block
 	}
+}
 
+impl PrepareOpenBlock for Client {
 	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> OpenBlock {
 		let engine = &*self.engine;
 		let chain = self.chain.read();
@@ -1818,10 +1999,10 @@ impl MiningBlockChainClient for Client {
 		let mut open_block = OpenBlock::new(
 			engine,
 			self.factories.clone(),
-			false,	// TODO: this will need to be parameterised once we want to do immediate mining insertion.
-			self.state_db.lock().boxed_clone_canon(&h),
+			self.tracedb.read().tracing_enabled(),
+			self.state_db.read().boxed_clone_canon(&h),
 			best_header,
-			self.build_last_hashes(h.clone()),
+			self.build_last_hashes(&h),
 			author,
 			gas_range_target,
 			extra_data,
@@ -1833,7 +2014,7 @@ impl MiningBlockChainClient for Client {
 			.find_uncle_headers(&h, engine.maximum_uncle_age())
 			.unwrap_or_else(Vec::new)
 			.into_iter()
-			.take(engine.maximum_uncle_count())
+			.take(engine.maximum_uncle_count(open_block.header().number()))
 			.foreach(|h| {
 				open_block.push_uncle(h).expect("pushing maximum_uncle_count;
 												open_block was just created;
@@ -1844,71 +2025,36 @@ impl MiningBlockChainClient for Client {
 
 		open_block
 	}
+}
 
-	fn reopen_block(&self, block: ClosedBlock) -> OpenBlock {
-		let engine = &*self.engine;
-		let mut block = block.reopen(engine);
-		let max_uncles = engine.maximum_uncle_count();
-		if block.uncles().len() < max_uncles {
-			let chain = self.chain.read();
-			let h = chain.best_block_hash();
-			// Add new uncles
-			let uncles = chain
-				.find_uncle_hashes(&h, engine.maximum_uncle_age())
-				.unwrap_or_else(Vec::new);
-
-			for h in uncles {
-				if !block.uncles().iter().any(|header| header.hash() == h) {
-					let uncle = chain.block_header(&h).expect("find_uncle_hashes only returns hashes for existing headers; qed");
-					block.push_uncle(uncle).expect("pushing up to maximum_uncle_count;
-												push_uncle is not ok only if more than maximum_uncle_count is pushed;
-												so all push_uncle are Ok;
-												qed");
-					if block.uncles().len() >= max_uncles { break }
-				}
-			}
-
-		}
-		block
-	}
-
-	fn vm_factory(&self) -> &EvmFactory {
-		&self.factories.vm
-	}
+impl BlockProducer for Client {}
 
-	fn broadcast_proposal_block(&self, block: SealedBlock) {
-		self.notify(|notify| {
-			notify.new_blocks(
-				vec![],
-				vec![],
-				vec![],
-				vec![],
-				vec![],
-				vec![block.rlp_bytes()],
-				0,
-			);
-		});
+impl ScheduleInfo for Client {
+	fn latest_schedule(&self) -> Schedule {
+		self.engine.schedule(self.latest_env_info().number)
 	}
+}
 
+impl ImportSealedBlock for Client {
 	fn import_sealed_block(&self, block: SealedBlock) -> ImportResult {
 		let h = block.header().hash();
-		let start = precise_time_ns();
+		let start = Instant::now();
 		let route = {
 			// scope for self.import_lock
-			let _import_lock = self.import_lock.lock();
-			let _timer = PerfTimer::new("import_sealed_block");
+			let _import_lock = self.importer.import_lock.lock();
+			trace_time!("import_sealed_block");
 
 			let number = block.header().number();
 			let block_data = block.rlp_bytes();
 			let header = block.header().clone();
 
-			let route = self.commit_block(block, &header, &block_data);
+			let route = self.importer.commit_block(block, &header, &block_data, self);
 			trace!(target: "client", "Imported sealed block #{} ({})", number, h);
-			self.state_db.lock().sync_cache(&route.enacted, &route.retracted, false);
+			self.state_db.write().sync_cache(&route.enacted, &route.retracted, false);
 			route
 		};
-		let (enacted, retracted) = self.calculate_enacted_retracted(&[route]);
-		self.miner.chain_new_blocks(self, &[h.clone()], &[], &enacted, &retracted);
+		let (enacted, retracted) = self.importer.calculate_enacted_retracted(&[route]);
+		self.importer.miner.chain_new_blocks(self, &[h.clone()], &[], &enacted, &retracted);
 		self.notify(|notify| {
 			notify.new_blocks(
 				vec![h.clone()],
@@ -1917,7 +2063,10 @@ impl MiningBlockChainClient for Client {
 				retracted.clone(),
 				vec![h.clone()],
 				vec![],
-				precise_time_ns() - start,
+				{
+					let elapsed = start.elapsed();
+					elapsed.as_secs() * 1_000_000_000 + elapsed.subsec_nanos() as u64
+				},
 			);
 		});
 		self.db.read().flush().expect("DB flush failed.");
@@ -1925,13 +2074,37 @@ impl MiningBlockChainClient for Client {
 	}
 }
 
-impl EngineClient for Client {
+impl BroadcastProposalBlock for Client {
+	fn broadcast_proposal_block(&self, block: SealedBlock) {
+		self.notify(|notify| {
+			notify.new_blocks(
+				vec![],
+				vec![],
+				vec![],
+				vec![],
+				vec![],
+				vec![block.rlp_bytes()],
+				0,
+			);
+		});
+	}
+}
+
+impl SealedBlockImporter for Client {}
+
+impl MiningBlockChainClient for Client {
+	fn vm_factory(&self) -> &VmFactory {
+		&self.factories.vm
+	}
+}
+
+impl super::traits::EngineClient for Client {
 	fn update_sealing(&self) {
-		self.miner.update_sealing(self)
+		self.importer.miner.update_sealing(self)
 	}
 
 	fn submit_seal(&self, block_hash: H256, seal: Vec<Bytes>) {
-		if self.miner.submit_seal(self, block_hash, seal).is_err() {
+		if self.importer.miner.submit_seal(self, block_hash, seal).is_err() {
 			warn!(target: "poa", "Wrong internal seal submission!")
 		}
 	}
@@ -1943,6 +2116,16 @@ impl EngineClient for Client {
 	fn epoch_transition_for(&self, parent_hash: H256) -> Option<::engines::EpochTransition> {
 		self.chain.read().epoch_transition_for(parent_hash)
 	}
+
+	fn as_full_client(&self) -> Option<&BlockChainClient> { Some(self) }
+
+	fn block_number(&self, id: BlockId) -> Option<BlockNumber> {
+		BlockChainClient::block_number(self, id)
+	}
+
+	fn block_header(&self, id: BlockId) -> Option<::encoded::Header> {
+		BlockChainClient::block_header(self, id)
+	}
 }
 
 impl ProvingBlockChainClient for Client {
@@ -1957,27 +2140,30 @@ impl ProvingBlockChainClient for Client {
 	}
 
 	fn prove_transaction(&self, transaction: SignedTransaction, id: BlockId) -> Option<(Bytes, Vec<DBValue>)> {
-		let (state, mut env_info) = match (self.state_at(id), self.env_info(id)) {
+		let (header, mut env_info) = match (self.block_header(id), self.env_info(id)) {
 			(Some(s), Some(e)) => (s, e),
 			_ => return None,
 		};
 
 		env_info.gas_limit = transaction.gas.clone();
-		let mut jdb = self.state_db.lock().journal_db().boxed_clone();
-		let backend = state::backend::Proving::new(jdb.as_hashdb_mut());
-
-		let mut state = state.replace_backend(backend);
-		let options = TransactOptions::with_no_tracing().dont_check_nonce();
-		let res = Executive::new(&mut state, &env_info, &*self.engine).transact(&transaction, options);
-
-		match res {
-			Err(ExecutionError::Internal(_)) => None,
-			Err(e) => {
-				trace!(target: "client", "Proved call failed: {}", e);
-				Some((Vec::new(), state.drop().1.extract_proof()))
-			}
-			Ok(res) => Some((res.output, state.drop().1.extract_proof())),
-		}
+		let mut jdb = self.state_db.read().journal_db().boxed_clone();
+
+		state::prove_transaction(
+			jdb.as_hashdb_mut(),
+			header.state_root().clone(),
+			&transaction,
+			self.engine.machine(),
+			&env_info,
+			self.factories.clone(),
+			false,
+		)
+	}
+
+
+	fn epoch_signal(&self, hash: H256) -> Option<Vec<u8>> {
+		// pending transitions are never deleted, and do not contain
+		// finality proofs by definition.
+		self.chain.read().get_pending_transition(hash).map(|pending| pending.proof)
 	}
 }
 
@@ -1989,7 +2175,7 @@ impl Drop for Client {
 
 /// Returns `LocalizedReceipt` given `LocalizedTransaction`
 /// and a vector of receipts from given block up to transaction index.
-fn transaction_receipt(engine: &Engine, mut tx: LocalizedTransaction, mut receipts: Vec<Receipt>) -> LocalizedReceipt {
+fn transaction_receipt(machine: &::machine::EthereumMachine, mut tx: LocalizedTransaction, mut receipts: Vec<Receipt>) -> LocalizedReceipt {
 	assert_eq!(receipts.len(), tx.transaction_index + 1, "All previous receipts are provided.");
 
 	let sender = tx.sender();
@@ -2013,7 +2199,7 @@ fn transaction_receipt(engine: &Engine, mut tx: LocalizedTransaction, mut receip
 		gas_used: receipt.gas_used - prior_gas_used,
 		contract_address: match tx.action {
 			Action::Call(_) => None,
-			Action::Create => Some(contract_address(engine.create_address_scheme(block_number), &sender, &tx.nonce, &tx.data).0)
+			Action::Create => Some(contract_address(machine.create_address_scheme(block_number), &sender, &tx.nonce, &tx.data).0)
 		},
 		logs: receipt.logs.into_iter().enumerate().map(|(i, log)| LocalizedLogEntry {
 			entry: log,
@@ -2025,7 +2211,7 @@ fn transaction_receipt(engine: &Engine, mut tx: LocalizedTransaction, mut receip
 			log_index: no_of_logs + i,
 		}).collect(),
 		log_bloom: receipt.log_bloom,
-		state_root: receipt.state_root,
+		outcome: receipt.outcome,
 	}
 }
 
@@ -2034,14 +2220,14 @@ mod tests {
 
 	#[test]
 	fn should_not_cache_details_before_commit() {
-		use client::BlockChainClient;
-		use tests::helpers::*;
+		use client::{BlockChainClient, ChainInfo};
+		use tests::helpers::{generate_dummy_client, get_good_dummy_block_hash};
 
 		use std::thread;
 		use std::time::Duration;
 		use std::sync::Arc;
 		use std::sync::atomic::{AtomicBool, Ordering};
-		use util::kvdb::DBTransaction;
+		use kvdb::DBTransaction;
 
 		let client = generate_dummy_client(0);
 		let genesis = client.chain_info().best_block_hash;
@@ -2067,22 +2253,21 @@ mod tests {
 
 	#[test]
 	fn should_return_correct_log_index() {
+		use hash::keccak;
 		use super::transaction_receipt;
 		use ethkey::KeyPair;
 		use log_entry::{LogEntry, LocalizedLogEntry};
-		use receipt::{Receipt, LocalizedReceipt};
+		use receipt::{Receipt, LocalizedReceipt, TransactionOutcome};
 		use transaction::{Transaction, LocalizedTransaction, Action};
-		use util::Hashable;
-		use tests::helpers::TestEngine;
 
 		// given
-		let key = KeyPair::from_secret_slice(&"test".sha3()).unwrap();
+		let key = KeyPair::from_secret_slice(&keccak("test")).unwrap();
 		let secret = key.secret();
-		let engine = TestEngine::new(0);
+		let machine = ::ethereum::new_frontier_test_machine();
 
 		let block_number = 1;
 		let block_hash = 5.into();
-		let state_root = Some(99.into());
+		let state_root = 99.into();
 		let gas_used = 10.into();
 		let raw_tx = Transaction {
 			nonce: 0.into(),
@@ -2110,19 +2295,19 @@ mod tests {
 			data: vec![],
 		}];
 		let receipts = vec![Receipt {
-			state_root: state_root,
+			outcome: TransactionOutcome::StateRoot(state_root),
 			gas_used: 5.into(),
 			log_bloom: Default::default(),
 			logs: vec![logs[0].clone()],
 		}, Receipt {
-			state_root: state_root,
+			outcome: TransactionOutcome::StateRoot(state_root),
 			gas_used: gas_used,
 			log_bloom: Default::default(),
 			logs: logs.clone(),
 		}];
 
 		// when
-		let receipt = transaction_receipt(&engine, transaction, receipts);
+		let receipt = transaction_receipt(&machine, transaction, receipts);
 
 		// then
 		assert_eq!(receipt, LocalizedReceipt {
@@ -2151,7 +2336,7 @@ mod tests {
 				log_index: 2,
 			}],
 			log_bloom: Default::default(),
-			state_root: state_root,
+			outcome: TransactionOutcome::StateRoot(state_root),
 		});
 	}
 }
diff --git a/ethcore/src/client/config.rs b/ethcore/src/client/config.rs
index 43a7a821ae221e4ca8b693a250dceb77d4dbd687..3c26c462123c50babb53f02f4cdf3cd83d7d2eb8 100644
--- a/ethcore/src/client/config.rs
+++ b/ethcore/src/client/config.rs
@@ -20,7 +20,8 @@ use std::fmt::{Display, Formatter, Error as FmtError};
 
 use mode::Mode as IpcMode;
 use verification::{VerifierType, QueueConfig};
-use util::{journaldb, CompactionProfile};
+use journaldb;
+use kvdb_rocksdb::CompactionProfile;
 
 pub use std::time::Duration;
 pub use blockchain::Config as BlockChainConfig;
@@ -140,7 +141,7 @@ pub struct ClientConfig {
 	pub pruning: journaldb::Algorithm,
 	/// The name of the client instance.
 	pub name: String,
-	/// RocksDB state column cache-size if not default
+	/// RocksDB column cache-size if not default
 	pub db_cache_size: Option<usize>,
 	/// State db compaction profile
 	pub db_compaction: DatabaseCompactionProfile,
diff --git a/ethcore/src/client/error.rs b/ethcore/src/client/error.rs
index ff8b6d2ce107bfdf17abcc96fba1e5e2b008338f..d2af13a3b27f8da862c0431c7add05e4083f51f3 100644
--- a/ethcore/src/client/error.rs
+++ b/ethcore/src/client/error.rs
@@ -14,10 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::UtilError;
 use std::fmt::{Display, Formatter, Error as FmtError};
-
-use util::trie::TrieError;
+use util_error::UtilError;
+use kvdb;
+use trie::TrieError;
 
 /// Client configuration errors.
 #[derive(Debug)]
@@ -25,7 +25,7 @@ pub enum Error {
 	/// TrieDB-related error.
 	Trie(TrieError),
 	/// Database error
-	Database(String),
+	Database(kvdb::Error),
 	/// Util error
 	Util(UtilError),
 }
diff --git a/ethcore/src/client/evm_test_client.rs b/ethcore/src/client/evm_test_client.rs
index a455a37240195a3a7bafcae8a46b73469adea604..b91414ca8fa69ce85072908abece3bc300ffa07a 100644
--- a/ethcore/src/client/evm_test_client.rs
+++ b/ethcore/src/client/evm_test_client.rs
@@ -18,24 +18,25 @@
 
 use std::fmt;
 use std::sync::Arc;
-use util::{self, U256, H256, journaldb, trie};
-use util::kvdb::{self, KeyValueDB};
-use {state, state_db, client, executive, trace, transaction, db, spec, pod_state};
+use ethereum_types::{H256, U256, H160};
+use {factory, journaldb, trie, kvdb_memorydb, bytes};
+use kvdb::{self, KeyValueDB};
+use {state, state_db, client, executive, trace, transaction, db, spec, pod_state, log_entry, receipt};
 use factory::Factories;
-use evm::{self, VMType};
+use evm::{VMType, FinalizationResult};
 use vm::{self, ActionParams};
 
 /// EVM test Error.
 #[derive(Debug)]
 pub enum EvmTestError {
 	/// Trie integrity error.
-	Trie(util::TrieError),
+	Trie(trie::TrieError),
 	/// EVM error.
 	Evm(vm::Error),
 	/// Initialization error.
 	ClientError(::error::Error),
 	/// Low-level database error.
-	Database(String),
+	Database(kvdb::Error),
 	/// Post-condition failure,
 	PostCondition(String),
 }
@@ -68,7 +69,8 @@ lazy_static! {
 	pub static ref HOMESTEAD: spec::Spec = ethereum::new_homestead_test();
 	pub static ref EIP150: spec::Spec = ethereum::new_eip150_test();
 	pub static ref EIP161: spec::Spec = ethereum::new_eip161_test();
-	pub static ref _METROPOLIS: spec::Spec = ethereum::new_metropolis_test();
+	pub static ref BYZANTIUM: spec::Spec = ethereum::new_byzantium_test();
+	pub static ref BYZANTIUM_TRANSITION: spec::Spec = ethereum::new_transition_test();
 }
 
 /// Simplified, single-block EVM test client.
@@ -77,6 +79,15 @@ pub struct EvmTestClient<'a> {
 	spec: &'a spec::Spec,
 }
 
+impl<'a> fmt::Debug for EvmTestClient<'a> {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        fmt.debug_struct("EvmTestClient")
+            .field("state", &self.state)
+            .field("spec", &self.spec.name)
+            .finish()
+    }
+}
+
 impl<'a> EvmTestClient<'a> {
 	/// Converts a json spec definition into spec.
 	pub fn spec_from_json(spec: &ForkSpec) -> Option<&'static spec::Spec> {
@@ -85,7 +96,10 @@ impl<'a> EvmTestClient<'a> {
 			ForkSpec::Homestead => Some(&*HOMESTEAD),
 			ForkSpec::EIP150 => Some(&*EIP150),
 			ForkSpec::EIP158 => Some(&*EIP161),
-			ForkSpec::Metropolis | ForkSpec::Byzantium | ForkSpec::Constantinople => None,
+			ForkSpec::Byzantium => Some(&*BYZANTIUM),
+			ForkSpec::EIP158ToByzantiumAt5 => Some(&BYZANTIUM_TRANSITION),
+			ForkSpec::FrontierToHomesteadAt5 | ForkSpec::HomesteadToDaoAt5 | ForkSpec::HomesteadToEIP150At5 => None,
+			_ => None,
 		}
 	}
 
@@ -113,14 +127,14 @@ impl<'a> EvmTestClient<'a> {
 
 	fn factories() -> Factories {
 		Factories {
-			vm: evm::Factory::new(VMType::Interpreter, 5 * 1024),
+			vm: factory::VmFactory::new(VMType::Interpreter, 5 * 1024),
 			trie: trie::TrieFactory::new(trie::TrieSpec::Secure),
 			accountdb: Default::default(),
 		}
 	}
 
 	fn state_from_spec(spec: &'a spec::Spec, factories: &Factories) -> Result<state::State<state_db::StateDB>, EvmTestError> {
-		let db = Arc::new(kvdb::in_memory(db::NUM_COLUMNS.expect("We use column-based DB; qed")));
+		let db = Arc::new(kvdb_memorydb::create(db::NUM_COLUMNS.expect("We use column-based DB; qed")));
 		let journal_db = journaldb::new(db.clone(), journaldb::Algorithm::EarlyMerge, db::COL_STATE);
 		let mut state_db = state_db::StateDB::new(journal_db, 5 * 1024 * 1024);
 		state_db = spec.ensure_db_good(state_db, factories)?;
@@ -142,7 +156,7 @@ impl<'a> EvmTestClient<'a> {
 	}
 
 	fn state_from_pod(spec: &'a spec::Spec, factories: &Factories, pod_state: pod_state::PodState) -> Result<state::State<state_db::StateDB>, EvmTestError> {
-		let db = Arc::new(kvdb::in_memory(db::NUM_COLUMNS.expect("We use column-based DB; qed")));
+		let db = Arc::new(kvdb_memorydb::create(db::NUM_COLUMNS.expect("We use column-based DB; qed")));
 		let journal_db = journaldb::new(db.clone(), journaldb::Algorithm::EarlyMerge, db::COL_STATE);
 		let state_db = state_db::StateDB::new(journal_db, 5 * 1024 * 1024);
 		let mut state = state::State::new(
@@ -155,10 +169,19 @@ impl<'a> EvmTestClient<'a> {
 		Ok(state)
 	}
 
+	/// Return current state.
+	pub fn state(&self) -> &state::State<state_db::StateDB> {
+		&self.state
+	}
+
 	/// Execute the VM given ActionParams and tracer.
 	/// Returns amount of gas left and the output.
-	pub fn call<T: trace::VMTracer>(&mut self, params: ActionParams, vm_tracer: &mut T)
-		-> Result<(U256, Vec<u8>), EvmTestError>
+	pub fn call<T: trace::Tracer, V: trace::VMTracer>(
+		&mut self,
+		params: ActionParams,
+		tracer: &mut T,
+		vm_tracer: &mut V,
+	) -> Result<FinalizationResult, EvmTestError>
 	{
 		let genesis = self.spec.genesis_header();
 		let info = client::EnvInfo {
@@ -166,52 +189,62 @@ impl<'a> EvmTestClient<'a> {
 			author: *genesis.author(),
 			timestamp: genesis.timestamp(),
 			difficulty: *genesis.difficulty(),
-			last_hashes: Arc::new([util::H256::default(); 256].to_vec()),
+			last_hashes: Arc::new([H256::default(); 256].to_vec()),
 			gas_used: 0.into(),
 			gas_limit: *genesis.gas_limit(),
 		};
 		let mut substate = state::Substate::new();
-		let mut tracer = trace::NoopTracer;
 		let mut output = vec![];
-		let mut executive = executive::Executive::new(&mut self.state, &info, &*self.spec.engine);
-		let (gas_left, _) = executive.call(
+		let mut executive = executive::Executive::new(&mut self.state, &info, self.spec.engine.machine());
+		executive.call(
 			params,
 			&mut substate,
-			util::BytesRef::Flexible(&mut output),
-			&mut tracer,
+			bytes::BytesRef::Flexible(&mut output),
+			tracer,
 			vm_tracer,
-		).map_err(EvmTestError::Evm)?;
-
-		Ok((gas_left, output))
+		).map_err(EvmTestError::Evm)
 	}
 
 	/// Executes a SignedTransaction within context of the provided state and `EnvInfo`.
 	/// Returns the state root, gas left and the output.
-	pub fn transact<T: trace::VMTracer>(
+	pub fn transact<T: trace::Tracer, V: trace::VMTracer>(
 		&mut self,
 		env_info: &client::EnvInfo,
 		transaction: transaction::SignedTransaction,
-		vm_tracer: T,
-	) -> TransactResult {
+		tracer: T,
+		vm_tracer: V,
+	) -> TransactResult<T::Output, V::Output> {
 		let initial_gas = transaction.gas;
 		// Verify transaction
 		let is_ok = transaction.verify_basic(true, None, env_info.number >= self.spec.engine.params().eip86_transition);
 		if let Err(error) = is_ok {
 			return TransactResult::Err {
 				state_root: *self.state.root(),
-				error,
+				error: error.into(),
 			};
 		}
 
 		// Apply transaction
-		let tracer = trace::NoopTracer;
-		let result = self.state.apply_with_tracing(&env_info, &*self.spec.engine, &transaction, tracer, vm_tracer);
+		let result = self.state.apply_with_tracing(&env_info, self.spec.engine.machine(), &transaction, tracer, vm_tracer);
+		let scheme = self.spec.engine.machine().create_address_scheme(env_info.number);
 
 		match result {
-			Ok(result) => TransactResult::Ok {
-				state_root: *self.state.root(),
-				gas_left: initial_gas - result.receipt.gas_used,
-				output: result.output
+			Ok(result) => {
+				self.state.commit().ok();
+				TransactResult::Ok {
+					state_root: *self.state.root(),
+					gas_left: initial_gas - result.receipt.gas_used,
+					outcome: result.receipt.outcome,
+					output: result.output,
+					trace: result.trace,
+					vm_trace: result.vm_trace,
+					logs: result.receipt.logs,
+					contract_address: if let transaction::Action::Create = transaction.action {
+						Some(executive::contract_address(scheme, &transaction.sender(), &transaction.nonce, &transaction.data).0)
+					} else {
+						None
+					}
+				}
 			},
 			Err(error) => TransactResult::Err {
 				state_root: *self.state.root(),
@@ -222,7 +255,8 @@ impl<'a> EvmTestClient<'a> {
 }
 
 /// A result of applying transaction to the state.
-pub enum TransactResult {
+#[derive(Debug)]
+pub enum TransactResult<T, V> {
 	/// Successful execution
 	Ok {
 		/// State root
@@ -231,6 +265,16 @@ pub enum TransactResult {
 		gas_left: U256,
 		/// Output
 		output: Vec<u8>,
+		/// Traces
+		trace: Vec<T>,
+		/// VM Traces
+		vm_trace: Option<V>,
+		/// Created contract address (if any)
+		contract_address: Option<H160>,
+		/// Generated logs
+		logs: Vec<log_entry::LogEntry>,
+		/// outcome
+		outcome: receipt::TransactionOutcome,
 	},
 	/// Transaction failed to run
 	Err {
diff --git a/ethcore/src/client/io_message.rs b/ethcore/src/client/io_message.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c2823a39f652d7d18fe7fda9860393dd4f141f69
--- /dev/null
+++ b/ethcore/src/client/io_message.rs
@@ -0,0 +1,41 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use ethereum_types::H256;
+use bytes::Bytes;
+use snapshot::ManifestData;
+
+/// Message type for external and internal events
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub enum ClientIoMessage {
+	/// Best Block Hash in chain has been changed
+	NewChainHead,
+	/// A block is ready
+	BlockVerified,
+	/// New transaction RLPs are ready to be imported
+	NewTransactions(Vec<Bytes>, usize),
+	/// Begin snapshot restoration
+	BeginRestoration(ManifestData),
+	/// Feed a state chunk to the snapshot service
+	FeedStateChunk(H256, Bytes),
+	/// Feed a block chunk to the snapshot service
+	FeedBlockChunk(H256, Bytes),
+	/// Take a snapshot for the block with given number.
+	TakeSnapshot(u64),
+	/// New consensus message received.
+	NewMessage(Bytes)
+}
+
diff --git a/ethcore/src/client/mod.rs b/ethcore/src/client/mod.rs
index 9377c2f4430410725c16a3016721aa35bd8c6235..b92240591b5c5af1f5e81e24050f10972f3dc96b 100644
--- a/ethcore/src/client/mod.rs
+++ b/ethcore/src/client/mod.rs
@@ -17,22 +17,27 @@
 //! Blockchain database client.
 
 mod ancient_import;
+mod client;
 mod config;
 mod error;
 mod evm_test_client;
+mod io_message;
 mod test_client;
 mod trace;
-mod client;
 
 pub use self::client::*;
 pub use self::config::{Mode, ClientConfig, DatabaseCompactionProfile, BlockChainConfig, VMType};
 pub use self::error::Error;
 pub use self::evm_test_client::{EvmTestClient, EvmTestError, TransactResult};
+pub use self::io_message::ClientIoMessage;
 pub use self::test_client::{TestBlockChainClient, EachBlockWith};
 pub use self::chain_notify::ChainNotify;
-pub use self::traits::{BlockChainClient, MiningBlockChainClient, EngineClient};
-
-pub use self::traits::ProvingBlockChainClient;
+pub use self::traits::{
+    Nonce, Balance, ChainInfo, BlockInfo, ReopenBlock, PrepareOpenBlock, CallContract, TransactionInfo, RegistryInfo, ScheduleInfo, ImportSealedBlock, BroadcastProposalBlock, ImportBlock,
+    StateOrBlock, StateClient, Call, EngineInfo, AccountData, BlockChain, BlockProducer, SealedBlockImporter
+};
+pub use state::StateInfo;
+pub use self::traits::{BlockChainClient, MiningBlockChainClient, EngineClient, ProvingBlockChainClient};
 
 pub use types::ids::*;
 pub use types::trace_filter::Filter as TraceFilter;
@@ -42,24 +47,9 @@ pub use types::call_analytics::CallAnalytics;
 pub use executive::{Executed, Executive, TransactOptions};
 pub use vm::{LastHashes, EnvInfo};
 
-pub use error::{BlockImportError, TransactionImportError, TransactionImportResult};
+pub use error::{BlockImportError, TransactionImportError};
 pub use verification::VerifierType;
 
-/// IPC interfaces
-#[cfg(feature="ipc")]
-pub mod remote {
-	pub use super::traits::RemoteClient;
-	pub use super::chain_notify::ChainNotifyClient;
-}
-
-mod traits {
-	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
-	include!(concat!(env!("OUT_DIR"), "/traits.rs"));
-}
-
-pub mod chain_notify {
-	//! Chain notify interface
-	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
-	include!(concat!(env!("OUT_DIR"), "/chain_notify.rs"));
-}
+mod traits;
 
+mod chain_notify;
diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
index 0e7e53e4381b117bdfbfcf36283e181dbd1578c7..b806183a2c941d792a2135939a87015d597e4f98 100644
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -22,27 +22,34 @@ use std::collections::{HashMap, BTreeMap};
 use std::mem;
 use itertools::Itertools;
 use rustc_hex::FromHex;
-use util::*;
+use hash::keccak;
+use ethereum_types::{H256, U256, Address};
+use parking_lot::RwLock;
+use journaldb;
+use kvdb::DBValue;
+use kvdb_memorydb;
+use bytes::Bytes;
 use rlp::*;
 use ethkey::{Generator, Random};
-use devtools::*;
-use transaction::{Transaction, LocalizedTransaction, PendingTransaction, SignedTransaction, Action};
-use blockchain::TreeRoute;
+use transaction::{self, Transaction, LocalizedTransaction, PendingTransaction, SignedTransaction, Action};
+use blockchain::{TreeRoute, BlockReceipts};
 use client::{
-	BlockChainClient, MiningBlockChainClient, EngineClient, BlockChainInfo, BlockStatus, BlockId,
+	Nonce, Balance, ChainInfo, BlockInfo, ReopenBlock, CallContract, TransactionInfo, RegistryInfo,
+	PrepareOpenBlock, BlockChainClient, MiningBlockChainClient, BlockChainInfo, BlockStatus, BlockId,
 	TransactionId, UncleId, TraceId, TraceFilter, LastHashes, CallAnalytics, BlockImportError,
-	ProvingBlockChainClient,
+	ProvingBlockChainClient, ScheduleInfo, ImportSealedBlock, BroadcastProposalBlock, ImportBlock, StateOrBlock,
+	Call, StateClient, EngineInfo, AccountData, BlockChain, BlockProducer, SealedBlockImporter
 };
 use db::{NUM_COLUMNS, COL_STATE};
 use header::{Header as BlockHeader, BlockNumber};
 use filter::Filter;
 use log_entry::LocalizedLogEntry;
-use receipt::{Receipt, LocalizedReceipt};
-use blockchain::extras::BlockReceipts;
+use receipt::{Receipt, LocalizedReceipt, TransactionOutcome};
 use error::{ImportResult, Error as EthcoreError};
-use evm::{Factory as EvmFactory, VMType};
+use evm::VMType;
+use factory::VmFactory;
 use vm::Schedule;
-use miner::{Miner, MinerService, TransactionImportResult};
+use miner::{Miner, MinerService};
 use spec::Spec;
 use types::basic_account::BasicAccount;
 use types::mode::Mode;
@@ -54,7 +61,11 @@ use executive::Executed;
 use error::CallError;
 use trace::LocalizedTrace;
 use state_db::StateDB;
+use header::Header;
 use encoded;
+use engines::EthEngine;
+use trie;
+use state::StateInfo;
 
 /// Test client.
 pub struct TestBlockChainClient {
@@ -91,7 +102,7 @@ pub struct TestBlockChainClient {
 	/// Spec
 	pub spec: Spec,
 	/// VM Factory
-	pub vm_factory: EvmFactory,
+	pub vm_factory: VmFactory,
 	/// Timestamp assigned to latest sealed block
 	pub latest_block_timestamp: RwLock<u64>,
 	/// Ancient block info.
@@ -162,7 +173,7 @@ impl TestBlockChainClient {
 			queue_size: AtomicUsize::new(0),
 			miner: Arc::new(Miner::with_spec(&spec)),
 			spec: spec,
-			vm_factory: EvmFactory::new(VMType::Interpreter, 1024 * 1024),
+			vm_factory: VmFactory::new(VMType::Interpreter, 1024 * 1024),
 			latest_block_timestamp: RwLock::new(10_000_000),
 			ancient_block: RwLock::new(None),
 			first_block: RwLock::new(None),
@@ -241,7 +252,7 @@ impl TestBlockChainClient {
 					uncle_header.set_parent_hash(self.last_hash.read().clone());
 					uncle_header.set_number(n as BlockNumber);
 					uncles.append(&uncle_header);
-					header.set_uncles_hash(uncles.as_raw().sha3());
+					header.set_uncles_hash(keccak(uncles.as_raw()));
 					uncles
 				},
 				_ => RlpStream::new_list(0)
@@ -311,7 +322,7 @@ impl TestBlockChainClient {
 			BlockId::Hash(hash) => Some(hash),
 			BlockId::Number(n) => self.numbers.read().get(&(n as usize)).cloned(),
 			BlockId::Earliest => self.numbers.read().get(&0).cloned(),
-			BlockId::Latest | BlockId::Pending => self.numbers.read().get(&(self.numbers.read().len() - 1)).cloned()
+			BlockId::Latest => self.numbers.read().get(&(self.numbers.read().len() - 1)).cloned()
 		}
 	}
 
@@ -331,7 +342,7 @@ impl TestBlockChainClient {
 		let hash = signed_tx.hash();
 		let res = self.miner.import_external_transactions(self, vec![signed_tx.into()]);
 		let res = res.into_iter().next().unwrap().expect("Successful import");
-		assert_eq!(res, TransactionImportResult::Current);
+		assert_eq!(res, transaction::ImportResult::Current);
 		hash
 	}
 
@@ -346,27 +357,23 @@ impl TestBlockChainClient {
 	}
 }
 
-pub fn get_temp_state_db() -> GuardedTempResult<StateDB> {
-	let temp = RandomTempPath::new();
-	let db = Database::open(&DatabaseConfig::with_columns(NUM_COLUMNS), temp.as_str()).unwrap();
+pub fn get_temp_state_db() -> StateDB {
+	let db = kvdb_memorydb::create(NUM_COLUMNS.unwrap_or(0));
 	let journal_db = journaldb::new(Arc::new(db), journaldb::Algorithm::EarlyMerge, COL_STATE);
-	let state_db = StateDB::new(journal_db, 1024 * 1024);
-	GuardedTempResult {
-		_temp: temp,
-		result: Some(state_db)
-	}
+	StateDB::new(journal_db, 1024 * 1024)
 }
 
-impl MiningBlockChainClient for TestBlockChainClient {
-	fn latest_schedule(&self) -> Schedule {
-		Schedule::new_post_eip150(24576, true, true, true)
+impl ReopenBlock for TestBlockChainClient {
+	fn reopen_block(&self, block: ClosedBlock) -> OpenBlock {
+		block.reopen(&*self.spec.engine)
 	}
+}
 
+impl PrepareOpenBlock for TestBlockChainClient {
 	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> OpenBlock {
 		let engine = &*self.spec.engine;
 		let genesis_header = self.spec.genesis_header();
-		let mut db_result = get_temp_state_db();
-		let db = self.spec.ensure_db_good(db_result.take(), &Default::default()).unwrap();
+		let db = self.spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 
 		let last_hashes = vec![genesis_header.hash()];
 		let mut open_block = OpenBlock::new(
@@ -385,43 +392,229 @@ impl MiningBlockChainClient for TestBlockChainClient {
 		open_block.set_timestamp(*self.latest_block_timestamp.read());
 		open_block
 	}
+}
 
-	fn reopen_block(&self, block: ClosedBlock) -> OpenBlock {
-		block.reopen(&*self.spec.engine)
-	}
-
-	fn vm_factory(&self) -> &EvmFactory {
-		&self.vm_factory
+impl ScheduleInfo for TestBlockChainClient {
+	fn latest_schedule(&self) -> Schedule {
+		Schedule::new_post_eip150(24576, true, true, true)
 	}
+}
 
+impl ImportSealedBlock for TestBlockChainClient {
 	fn import_sealed_block(&self, _block: SealedBlock) -> ImportResult {
 		Ok(H256::default())
 	}
+}
+
+impl BlockProducer for TestBlockChainClient {}
 
+impl BroadcastProposalBlock for TestBlockChainClient {
 	fn broadcast_proposal_block(&self, _block: SealedBlock) {}
 }
 
-impl BlockChainClient for TestBlockChainClient {
-	fn call(&self, _t: &SignedTransaction, _analytics: CallAnalytics, _block: BlockId) -> Result<Executed, CallError> {
+impl SealedBlockImporter for TestBlockChainClient {}
+
+impl MiningBlockChainClient for TestBlockChainClient {
+	fn vm_factory(&self) -> &VmFactory {
+		&self.vm_factory
+	}
+}
+
+impl Nonce for TestBlockChainClient {
+	fn nonce(&self, address: &Address, id: BlockId) -> Option<U256> {
+		match id {
+			BlockId::Latest => Some(self.nonces.read().get(address).cloned().unwrap_or(self.spec.params().account_start_nonce)),
+			_ => None,
+		}
+	}
+
+	fn latest_nonce(&self, address: &Address) -> U256 {
+		self.nonce(address, BlockId::Latest).unwrap()
+	}
+}
+
+impl Balance for TestBlockChainClient {
+	fn balance(&self, address: &Address, state: StateOrBlock) -> Option<U256> {
+		match state {
+			StateOrBlock::Block(BlockId::Latest) | StateOrBlock::State(_) => Some(self.balances.read().get(address).cloned().unwrap_or_else(U256::zero)),
+			_ => None,
+		}
+	}
+
+	fn latest_balance(&self, address: &Address) -> U256 {
+		self.balance(address, BlockId::Latest.into()).unwrap()
+	}
+}
+
+impl AccountData for TestBlockChainClient {}
+
+impl ChainInfo for TestBlockChainClient {
+	fn chain_info(&self) -> BlockChainInfo {
+		let number = self.blocks.read().len() as BlockNumber - 1;
+		BlockChainInfo {
+			total_difficulty: *self.difficulty.read(),
+			pending_total_difficulty: *self.difficulty.read(),
+			genesis_hash: self.genesis_hash.clone(),
+			best_block_hash: self.last_hash.read().clone(),
+			best_block_number: number,
+			best_block_timestamp: number,
+			first_block_hash: self.first_block.read().as_ref().map(|x| x.0),
+			first_block_number: self.first_block.read().as_ref().map(|x| x.1),
+			ancient_block_hash: self.ancient_block.read().as_ref().map(|x| x.0),
+			ancient_block_number: self.ancient_block.read().as_ref().map(|x| x.1)
+		}
+	}
+}
+
+impl BlockInfo for TestBlockChainClient {
+	fn block_header(&self, id: BlockId) -> Option<encoded::Header> {
+		self.block_hash(id)
+			.and_then(|hash| self.blocks.read().get(&hash).map(|r| Rlp::new(r).at(0).as_raw().to_vec()))
+			.map(encoded::Header::new)
+	}
+
+	fn best_block_header(&self) -> encoded::Header {
+		self.block_header(BlockId::Hash(self.chain_info().best_block_hash))
+			.expect("Best block always has header.")
+	}
+
+	fn block(&self, id: BlockId) -> Option<encoded::Block> {
+		self.block_hash(id)
+			.and_then(|hash| self.blocks.read().get(&hash).cloned())
+			.map(encoded::Block::new)
+	}
+
+	fn code_hash(&self, address: &Address, id: BlockId) -> Option<H256> {
+		match id {
+			BlockId::Latest => self.code.read().get(address).map(|c| keccak(&c)),
+			_ => None,
+		}
+	}
+}
+
+impl CallContract for TestBlockChainClient {
+	fn call_contract(&self, _id: BlockId, _address: Address, _data: Bytes) -> Result<Bytes, String> { Ok(vec![]) }
+}
+
+impl TransactionInfo for TestBlockChainClient {
+	fn transaction_block(&self, _id: TransactionId) -> Option<H256> {
+		None	// Simple default.
+	}
+}
+
+impl BlockChain for TestBlockChainClient {}
+
+impl RegistryInfo for TestBlockChainClient {
+	fn registry_address(&self, _name: String, _block: BlockId) -> Option<Address> { None }
+}
+
+impl ImportBlock for TestBlockChainClient {
+	fn import_block(&self, b: Bytes) -> Result<H256, BlockImportError> {
+		let header = Rlp::new(&b).val_at::<BlockHeader>(0);
+		let h = header.hash();
+		let number: usize = header.number() as usize;
+		if number > self.blocks.read().len() {
+			panic!("Unexpected block number. Expected {}, got {}", self.blocks.read().len(), number);
+		}
+		if number > 0 {
+			match self.blocks.read().get(header.parent_hash()) {
+				Some(parent) => {
+					let parent = Rlp::new(parent).val_at::<BlockHeader>(0);
+					if parent.number() != (header.number() - 1) {
+						panic!("Unexpected block parent");
+					}
+				},
+				None => {
+					panic!("Unknown block parent {:?} for block {}", header.parent_hash(), number);
+				}
+			}
+		}
+		let len = self.numbers.read().len();
+		if number == len {
+			{
+				let mut difficulty = self.difficulty.write();
+				*difficulty = *difficulty + header.difficulty().clone();
+			}
+			mem::replace(&mut *self.last_hash.write(), h.clone());
+			self.blocks.write().insert(h.clone(), b);
+			self.numbers.write().insert(number, h.clone());
+			let mut parent_hash = header.parent_hash().clone();
+			if number > 0 {
+				let mut n = number - 1;
+				while n > 0 && self.numbers.read()[&n] != parent_hash {
+					*self.numbers.write().get_mut(&n).unwrap() = parent_hash.clone();
+					n -= 1;
+					parent_hash = Rlp::new(&self.blocks.read()[&parent_hash]).val_at::<BlockHeader>(0).parent_hash().clone();
+				}
+			}
+		}
+		else {
+			self.blocks.write().insert(h.clone(), b.to_vec());
+		}
+		Ok(h)
+	}
+
+	fn import_block_with_receipts(&self, b: Bytes, _r: Bytes) -> Result<H256, BlockImportError> {
+		self.import_block(b)
+	}
+}
+
+impl Call for TestBlockChainClient {
+	// State will not be used by test client anyway, since all methods that accept state are mocked
+	type State = ();
+
+	fn call(&self, _t: &SignedTransaction, _analytics: CallAnalytics, _state: &mut Self::State, _header: &Header) -> Result<Executed, CallError> {
 		self.execution_result.read().clone().unwrap()
 	}
 
-	fn call_many(&self, txs: &[(SignedTransaction, CallAnalytics)], block: BlockId) -> Result<Vec<Executed>, CallError> {
+	fn call_many(&self, txs: &[(SignedTransaction, CallAnalytics)], state: &mut Self::State, header: &Header) -> Result<Vec<Executed>, CallError> {
 		let mut res = Vec::with_capacity(txs.len());
 		for &(ref tx, analytics) in txs {
-			res.push(self.call(tx, analytics, block)?);
+			res.push(self.call(tx, analytics, state, header)?);
 		}
 		Ok(res)
 	}
 
-	fn estimate_gas(&self, _t: &SignedTransaction, _block: BlockId) -> Result<U256, CallError> {
+	fn estimate_gas(&self, _t: &SignedTransaction, _state: &Self::State, _header: &Header) -> Result<U256, CallError> {
 		Ok(21000.into())
 	}
+}
+
+impl StateInfo for () {
+	fn nonce(&self, _address: &Address) -> trie::Result<U256> { unimplemented!() }
+	fn balance(&self, _address: &Address) -> trie::Result<U256> { unimplemented!() }
+	fn storage_at(&self, _address: &Address, _key: &H256) -> trie::Result<H256> { unimplemented!() }
+	fn code(&self, _address: &Address) -> trie::Result<Option<Arc<Bytes>>> { unimplemented!() }
+}
+
+impl StateClient for TestBlockChainClient {
+	// State will not be used by test client anyway, since all methods that accept state are mocked
+	type State = ();
+
+	fn latest_state(&self) -> Self::State {
+		()
+	}
+
+	fn state_at(&self, _id: BlockId) -> Option<Self::State> {
+		Some(())
+	}
+}
+
+impl EngineInfo for TestBlockChainClient {
+	fn engine(&self) -> &EthEngine {
+		unimplemented!()
+	}
+}
 
+impl BlockChainClient for TestBlockChainClient {
 	fn replay(&self, _id: TransactionId, _analytics: CallAnalytics) -> Result<Executed, CallError> {
 		self.execution_result.read().clone().unwrap()
 	}
 
+	fn replay_block_transactions(&self, _block: BlockId, _analytics: CallAnalytics) -> Result<Box<Iterator<Item = Executed>>, CallError> {
+		Ok(Box::new(self.execution_result.read().clone().unwrap().into_iter()))
+	}
+
 	fn block_total_difficulty(&self, _id: BlockId) -> Option<U256> {
 		Some(U256::zero())
 	}
@@ -430,42 +623,20 @@ impl BlockChainClient for TestBlockChainClient {
 		Self::block_hash(self, id)
 	}
 
-	fn nonce(&self, address: &Address, id: BlockId) -> Option<U256> {
-		match id {
-			BlockId::Latest | BlockId::Pending => Some(self.nonces.read().get(address).cloned().unwrap_or(self.spec.params().account_start_nonce)),
-			_ => None,
-		}
-	}
-
 	fn storage_root(&self, _address: &Address, _id: BlockId) -> Option<H256> {
 		None
 	}
 
-	fn latest_nonce(&self, address: &Address) -> U256 {
-		self.nonce(address, BlockId::Latest).unwrap()
-	}
-
-	fn code(&self, address: &Address, id: BlockId) -> Option<Option<Bytes>> {
-		match id {
-			BlockId::Latest | BlockId::Pending => Some(self.code.read().get(address).cloned()),
+	fn code(&self, address: &Address, state: StateOrBlock) -> Option<Option<Bytes>> {
+		match state {
+			StateOrBlock::Block(BlockId::Latest) => Some(self.code.read().get(address).cloned()),
 			_ => None,
 		}
 	}
 
-	fn balance(&self, address: &Address, id: BlockId) -> Option<U256> {
-		match id {
-			BlockId::Latest | BlockId::Pending => Some(self.balances.read().get(address).cloned().unwrap_or_else(U256::zero)),
-			_ => None,
-		}
-	}
-
-	fn latest_balance(&self, address: &Address) -> U256 {
-		self.balance(address, BlockId::Latest).unwrap()
-	}
-
-	fn storage_at(&self, address: &Address, position: &H256, id: BlockId) -> Option<H256> {
-		match id {
-			BlockId::Latest | BlockId::Pending => Some(self.storage.read().get(&(address.clone(), position.clone())).cloned().unwrap_or_else(H256::new)),
+	fn storage_at(&self, address: &Address, position: &H256, state: StateOrBlock) -> Option<H256> {
+		match state {
+			StateOrBlock::Block(BlockId::Latest) => Some(self.storage.read().get(&(address.clone(), position.clone())).cloned().unwrap_or_else(H256::new)),
 			_ => None,
 		}
 	}
@@ -481,10 +652,6 @@ impl BlockChainClient for TestBlockChainClient {
 		None	// Simple default.
 	}
 
-	fn transaction_block(&self, _id: TransactionId) -> Option<H256> {
-		None	// Simple default.
-	}
-
 	fn uncle(&self, _id: UncleId) -> Option<encoded::Header> {
 		None	// Simple default.
 	}
@@ -497,10 +664,6 @@ impl BlockChainClient for TestBlockChainClient {
 		self.receipts.read().get(&id).cloned()
 	}
 
-	fn blocks_with_bloom(&self, _bloom: &H2048, _from_block: BlockId, _to_block: BlockId) -> Option<Vec<BlockNumber>> {
-		unimplemented!();
-	}
-
 	fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry> {
 		let mut logs = self.logs.read().clone();
 		let len = logs.len();
@@ -514,17 +677,6 @@ impl BlockChainClient for TestBlockChainClient {
 		unimplemented!();
 	}
 
-	fn best_block_header(&self) -> encoded::Header {
-		self.block_header(BlockId::Hash(self.chain_info().best_block_hash))
-			.expect("Best block always has header.")
-	}
-
-	fn block_header(&self, id: BlockId) -> Option<encoded::Header> {
-		self.block_hash(id)
-			.and_then(|hash| self.blocks.read().get(&hash).map(|r| Rlp::new(r).at(0).as_raw().to_vec()))
-			.map(encoded::Header::new)
-	}
-
 	fn block_number(&self, _id: BlockId) -> Option<BlockNumber> {
 		unimplemented!()
 	}
@@ -538,12 +690,6 @@ impl BlockChainClient for TestBlockChainClient {
 		}))
 	}
 
-	fn block(&self, id: BlockId) -> Option<encoded::Block> {
-		self.block_hash(id)
-			.and_then(|hash| self.blocks.read().get(&hash).cloned())
-			.map(encoded::Block::new)
-	}
-
 	fn block_extra_info(&self, id: BlockId) -> Option<BTreeMap<String, String>> {
 		self.block(id)
 			.map(|block| block.view().header())
@@ -556,7 +702,6 @@ impl BlockChainClient for TestBlockChainClient {
 			BlockId::Number(number) if (number as usize) < self.blocks.read().len() => BlockStatus::InChain,
 			BlockId::Hash(ref hash) if self.blocks.read().get(hash).is_some() => BlockStatus::InChain,
 			BlockId::Latest | BlockId::Earliest => BlockStatus::InChain,
-			BlockId::Pending => BlockStatus::Pending,
 			_ => BlockStatus::Unknown,
 		}
 	}
@@ -610,7 +755,7 @@ impl BlockChainClient for TestBlockChainClient {
 		// starts with 'f' ?
 		if *hash > H256::from("f000000000000000000000000000000000000000000000000000000000000000") {
 			let receipt = BlockReceipts::new(vec![Receipt::new(
-				Some(H256::zero()),
+				TransactionOutcome::StateRoot(H256::zero()),
 				U256::zero(),
 				vec![])]);
 			let mut rlp = RlpStream::new();
@@ -620,55 +765,6 @@ impl BlockChainClient for TestBlockChainClient {
 		None
 	}
 
-	fn import_block(&self, b: Bytes) -> Result<H256, BlockImportError> {
-		let header = Rlp::new(&b).val_at::<BlockHeader>(0);
-		let h = header.hash();
-		let number: usize = header.number() as usize;
-		if number > self.blocks.read().len() {
-			panic!("Unexpected block number. Expected {}, got {}", self.blocks.read().len(), number);
-		}
-		if number > 0 {
-			match self.blocks.read().get(header.parent_hash()) {
-				Some(parent) => {
-					let parent = Rlp::new(parent).val_at::<BlockHeader>(0);
-					if parent.number() != (header.number() - 1) {
-						panic!("Unexpected block parent");
-					}
-				},
-				None => {
-					panic!("Unknown block parent {:?} for block {}", header.parent_hash(), number);
-				}
-			}
-		}
-		let len = self.numbers.read().len();
-		if number == len {
-			{
-				let mut difficulty = self.difficulty.write();
-				*difficulty = *difficulty + header.difficulty().clone();
-			}
-			mem::replace(&mut *self.last_hash.write(), h.clone());
-			self.blocks.write().insert(h.clone(), b);
-			self.numbers.write().insert(number, h.clone());
-			let mut parent_hash = header.parent_hash().clone();
-			if number > 0 {
-				let mut n = number - 1;
-				while n > 0 && self.numbers.read()[&n] != parent_hash {
-					*self.numbers.write().get_mut(&n).unwrap() = parent_hash.clone();
-					n -= 1;
-					parent_hash = Rlp::new(&self.blocks.read()[&parent_hash]).val_at::<BlockHeader>(0).parent_hash().clone();
-				}
-			}
-		}
-		else {
-			self.blocks.write().insert(h.clone(), b.to_vec());
-		}
-		Ok(h)
-	}
-
-	fn import_block_with_receipts(&self, b: Bytes, _r: Bytes) -> Result<H256, BlockImportError> {
-		self.import_block(b)
-	}
-
 	fn queue_info(&self) -> QueueInfo {
 		QueueInfo {
 			verified_queue_size: self.queue_size.load(AtomicOrder::Relaxed),
@@ -687,22 +783,6 @@ impl BlockChainClient for TestBlockChainClient {
 		Default::default()
 	}
 
-	fn chain_info(&self) -> BlockChainInfo {
-		let number = self.blocks.read().len() as BlockNumber - 1;
-		BlockChainInfo {
-			total_difficulty: *self.difficulty.read(),
-			pending_total_difficulty: *self.difficulty.read(),
-			genesis_hash: self.genesis_hash.clone(),
-			best_block_hash: self.last_hash.read().clone(),
-			best_block_number: number,
-			best_block_timestamp: number,
-			first_block_hash: self.first_block.read().as_ref().map(|x| x.0),
-			first_block_number: self.first_block.read().as_ref().map(|x| x.1),
-			ancient_block_hash: self.ancient_block.read().as_ref().map(|x| x.0),
-			ancient_block_number: self.ancient_block.read().as_ref().map(|x| x.1)
-		}
-	}
-
 	fn filter_traces(&self, _filter: TraceFilter) -> Option<Vec<LocalizedTrace>> {
 		self.traces.read().clone()
 	}
@@ -754,9 +834,7 @@ impl BlockChainClient for TestBlockChainClient {
 		}
 	}
 
-	fn call_contract(&self, _id: BlockId, _address: Address, _data: Bytes) -> Result<Bytes, String> { Ok(vec![]) }
-
-	fn transact_contract(&self, address: Address, data: Bytes) -> Result<TransactionImportResult, EthcoreError> {
+	fn transact_contract(&self, address: Address, data: Bytes) -> Result<transaction::ImportResult, EthcoreError> {
 		let transaction = Transaction {
 			nonce: self.latest_nonce(&self.miner.author()),
 			action: Action::Call(address),
@@ -773,8 +851,6 @@ impl BlockChainClient for TestBlockChainClient {
 
 	fn registrar_address(&self) -> Option<Address> { None }
 
-	fn registry_address(&self, _name: String) -> Option<Address> { None }
-
 	fn eip86_transition(&self) -> u64 { u64::max_value() }
 }
 
@@ -790,9 +866,13 @@ impl ProvingBlockChainClient for TestBlockChainClient {
 	fn prove_transaction(&self, _: SignedTransaction, _: BlockId) -> Option<(Bytes, Vec<DBValue>)> {
 		None
 	}
+
+	fn epoch_signal(&self, _: H256) -> Option<Vec<u8>> {
+		None
+	}
 }
 
-impl EngineClient for TestBlockChainClient {
+impl super::traits::EngineClient for TestBlockChainClient {
 	fn update_sealing(&self) {
 		self.miner.update_sealing(self)
 	}
@@ -808,4 +888,14 @@ impl EngineClient for TestBlockChainClient {
 	fn epoch_transition_for(&self, _block_hash: H256) -> Option<::engines::EpochTransition> {
 		None
 	}
+
+	fn as_full_client(&self) -> Option<&BlockChainClient> { Some(self) }
+
+	fn block_number(&self, id: BlockId) -> Option<BlockNumber> {
+		BlockChainClient::block_number(self, id)
+	}
+
+	fn block_header(&self, id: BlockId) -> Option<::encoded::Header> {
+		BlockChainClient::block_header(self, id)
+	}
 }
diff --git a/ethcore/src/client/trace.rs b/ethcore/src/client/trace.rs
index 3ab01757ee2f211410b4d91bbc8d3b3095976839..75e0fe34a1e383342e0cb344610df0f6a225792f 100644
--- a/ethcore/src/client/trace.rs
+++ b/ethcore/src/client/trace.rs
@@ -1,11 +1,10 @@
 
 //! Bridge between Tracedb and Blockchain.
 
-use util::{H256};
+use ethereum_types::H256;
 use header::BlockNumber;
 use trace::DatabaseExtras as TraceDatabaseExtras;
-use blockchain::{BlockChain, BlockProvider};
-use blockchain::extras::TransactionAddress;
+use blockchain::{BlockChain, BlockProvider, TransactionAddress};
 pub use types::trace_filter::Filter;
 
 impl TraceDatabaseExtras for BlockChain {
diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs
index d7b7bba44abd31bcd60b4a1676b0da1d707acc5a..1228f87683c04cd97dffe957d591fd5ec50dd6c9 100644
--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -21,21 +21,24 @@ use block::{OpenBlock, SealedBlock, ClosedBlock};
 use blockchain::TreeRoute;
 use encoded;
 use vm::LastHashes;
-use error::{ImportResult, CallError, Error as EthcoreError};
-use error::{TransactionImportResult, BlockImportError};
-use evm::{Factory as EvmFactory, Schedule};
+use error::{ImportResult, CallError, Error as EthcoreError, BlockImportError};
+use evm::Schedule;
+use factory::VmFactory;
 use executive::Executed;
 use filter::Filter;
 use header::{BlockNumber};
-use ipc::IpcConfig;
 use log_entry::LocalizedLogEntry;
 use receipt::LocalizedReceipt;
 use trace::LocalizedTrace;
-use transaction::{LocalizedTransaction, PendingTransaction, SignedTransaction};
+use transaction::{LocalizedTransaction, PendingTransaction, SignedTransaction, ImportResult as TransactionImportResult};
 use verification::queue::QueueInfo as BlockQueueInfo;
+use state::StateInfo;
+use header::Header;
+use engines::EthEngine;
 
-use util::{U256, Address, H256, H2048, Bytes};
-use util::hashdb::DBValue;
+use ethereum_types::{H256, U256, Address};
+use bytes::Bytes;
+use hashdb::DBValue;
 
 use types::ids::*;
 use types::basic_account::BasicAccount;
@@ -46,13 +49,158 @@ use types::block_status::BlockStatus;
 use types::mode::Mode;
 use types::pruning_info::PruningInfo;
 
-#[ipc(client_ident="RemoteClient")]
-/// Blockchain database client. Owns and manages a blockchain and a block queue.
-pub trait BlockChainClient : Sync + Send {
+/// State information to be used during client query
+pub enum StateOrBlock {
+	/// State to be used, may be pending
+	State(Box<StateInfo>),
+
+	/// Id of an existing block from a chain to get state from
+	Block(BlockId)
+}
+
+impl<S: StateInfo + 'static> From<S> for StateOrBlock {
+	fn from(info: S) -> StateOrBlock {
+		StateOrBlock::State(Box::new(info) as Box<_>)
+	}
+}
+
+impl From<Box<StateInfo>> for StateOrBlock {
+	fn from(info: Box<StateInfo>) -> StateOrBlock {
+		StateOrBlock::State(info)
+	}
+}
+
+impl From<BlockId> for StateOrBlock {
+	fn from(id: BlockId) -> StateOrBlock {
+		StateOrBlock::Block(id)
+	}
+}
+
+/// Provides `nonce` and `latest_nonce` methods
+pub trait Nonce {
+	/// Attempt to get address nonce at given block.
+	/// May not fail on BlockId::Latest.
+	fn nonce(&self, address: &Address, id: BlockId) -> Option<U256>;
+
+	/// Get address nonce at the latest block's state.
+	fn latest_nonce(&self, address: &Address) -> U256 {
+		self.nonce(address, BlockId::Latest)
+			.expect("nonce will return Some when given BlockId::Latest. nonce was given BlockId::Latest. \
+			Therefore nonce has returned Some; qed")
+	}
+}
 
+/// Provides `balance` and `latest_balance` methods
+pub trait Balance {
+	/// Get address balance at the given block's state.
+	///
+	/// May not return None if given BlockId::Latest.
+	/// Returns None if and only if the block's root hash has been pruned from the DB.
+	fn balance(&self, address: &Address, state: StateOrBlock) -> Option<U256>;
+
+	/// Get address balance at the latest block's state.
+	fn latest_balance(&self, address: &Address) -> U256 {
+		self.balance(address, BlockId::Latest.into())
+			.expect("balance will return Some if given BlockId::Latest. balance was given BlockId::Latest \
+			Therefore balance has returned Some; qed")
+	}
+}
+
+/// Provides methods to access account info
+pub trait AccountData: Nonce + Balance {}
+
+/// Provides `chain_info` method
+pub trait ChainInfo {
+	/// Get blockchain information.
+	fn chain_info(&self) -> BlockChainInfo;
+}
+
+/// Provides various information on a block by it's ID
+pub trait BlockInfo {
 	/// Get raw block header data by block id.
 	fn block_header(&self, id: BlockId) -> Option<encoded::Header>;
 
+	/// Get the best block header.
+	fn best_block_header(&self) -> encoded::Header;
+
+	/// Get raw block data by block header hash.
+	fn block(&self, id: BlockId) -> Option<encoded::Block>;
+
+	/// Get address code hash at given block's state.
+	fn code_hash(&self, address: &Address, id: BlockId) -> Option<H256>;
+}
+
+/// Provides various information on a transaction by it's ID
+pub trait TransactionInfo {
+	/// Get the hash of block that contains the transaction, if any.
+	fn transaction_block(&self, id: TransactionId) -> Option<H256>;
+}
+
+/// Provides methods to access chain state
+pub trait StateClient {
+	/// Type representing chain state
+	type State: StateInfo;
+
+	/// Get a copy of the best block's state.
+	fn latest_state(&self) -> Self::State;
+
+	/// Attempt to get a copy of a specific block's final state.
+	///
+	/// This will not fail if given BlockId::Latest.
+	/// Otherwise, this can fail (but may not) if the DB prunes state or the block
+	/// is unknown.
+	fn state_at(&self, id: BlockId) -> Option<Self::State>;
+}
+
+/// Provides various blockchain information, like block header, chain state etc.
+pub trait BlockChain: ChainInfo + BlockInfo + TransactionInfo {}
+
+/// Provides information on a blockchain service and it's registry
+pub trait RegistryInfo {
+	/// Get the address of a particular blockchain service, if available.
+	fn registry_address(&self, name: String, block: BlockId) -> Option<Address>;
+}
+
+// FIXME Why these methods belong to BlockChainClient and not MiningBlockChainClient?
+/// Provides methods to import block into blockchain
+pub trait ImportBlock {
+	/// Import a block into the blockchain.
+	fn import_block(&self, bytes: Bytes) -> Result<H256, BlockImportError>;
+
+	/// Import a block with transaction receipts. Does no sealing and transaction validation.
+	fn import_block_with_receipts(&self, block_bytes: Bytes, receipts_bytes: Bytes) -> Result<H256, BlockImportError>;
+}
+
+/// Provides `call_contract` method
+pub trait CallContract {
+	/// Like `call`, but with various defaults. Designed to be used for calling contracts.
+	fn call_contract(&self, id: BlockId, address: Address, data: Bytes) -> Result<Bytes, String>;
+}
+
+/// Provides `call` and `call_many` methods
+pub trait Call {
+	/// Type representing chain state
+	type State: StateInfo;
+
+	/// Makes a non-persistent transaction call.
+	fn call(&self, tx: &SignedTransaction, analytics: CallAnalytics, state: &mut Self::State, header: &Header) -> Result<Executed, CallError>;
+
+	/// Makes multiple non-persistent but dependent transaction calls.
+	/// Returns a vector of successes or a failure if any of the transaction fails.
+	fn call_many(&self, txs: &[(SignedTransaction, CallAnalytics)], state: &mut Self::State, header: &Header) -> Result<Vec<Executed>, CallError>;
+
+	/// Estimates how much gas will be necessary for a call.
+	fn estimate_gas(&self, t: &SignedTransaction, state: &Self::State, header: &Header) -> Result<U256, CallError>;
+}
+
+/// Provides `engine` method
+pub trait EngineInfo {
+	/// Get underlying engine object
+	fn engine(&self) -> &EthEngine;
+}
+
+/// Blockchain database client. Owns and manages a blockchain and a block queue.
+pub trait BlockChainClient : Sync + Send + AccountData + BlockChain + CallContract + RegistryInfo + ImportBlock {
 	/// Look up the block number for the given block ID.
 	fn block_number(&self, id: BlockId) -> Option<BlockNumber>;
 
@@ -60,64 +208,39 @@ pub trait BlockChainClient : Sync + Send {
 	/// Block body is an RLP list of two items: uncles and transactions.
 	fn block_body(&self, id: BlockId) -> Option<encoded::Body>;
 
-	/// Get raw block data by block header hash.
-	fn block(&self, id: BlockId) -> Option<encoded::Block>;
-
 	/// Get block status by block header hash.
 	fn block_status(&self, id: BlockId) -> BlockStatus;
 
 	/// Get block total difficulty.
 	fn block_total_difficulty(&self, id: BlockId) -> Option<U256>;
 
-	/// Attempt to get address nonce at given block.
-	/// May not fail on BlockId::Latest.
-	fn nonce(&self, address: &Address, id: BlockId) -> Option<U256>;
-
 	/// Attempt to get address storage root at given block.
 	/// May not fail on BlockId::Latest.
 	fn storage_root(&self, address: &Address, id: BlockId) -> Option<H256>;
 
-	/// Get address nonce at the latest block's state.
-	fn latest_nonce(&self, address: &Address) -> U256 {
-		self.nonce(address, BlockId::Latest)
-			.expect("nonce will return Some when given BlockId::Latest. nonce was given BlockId::Latest. \
-			Therefore nonce has returned Some; qed")
-	}
-
 	/// Get block hash.
 	fn block_hash(&self, id: BlockId) -> Option<H256>;
 
 	/// Get address code at given block's state.
-	fn code(&self, address: &Address, id: BlockId) -> Option<Option<Bytes>>;
+	fn code(&self, address: &Address, state: StateOrBlock) -> Option<Option<Bytes>>;
 
 	/// Get address code at the latest block's state.
 	fn latest_code(&self, address: &Address) -> Option<Bytes> {
-		self.code(address, BlockId::Latest)
+		self.code(address, BlockId::Latest.into())
 			.expect("code will return Some if given BlockId::Latest; qed")
 	}
 
-	/// Get address balance at the given block's state.
-	///
-	/// May not return None if given BlockId::Latest.
-	/// Returns None if and only if the block's root hash has been pruned from the DB.
-	fn balance(&self, address: &Address, id: BlockId) -> Option<U256>;
-
-	/// Get address balance at the latest block's state.
-	fn latest_balance(&self, address: &Address) -> U256 {
-		self.balance(address, BlockId::Latest)
-			.expect("balance will return Some if given BlockId::Latest. balance was given BlockId::Latest \
-			Therefore balance has returned Some; qed")
-	}
+	/// Get address code hash at given block's state.
 
 	/// Get value of the storage at given position at the given block's state.
 	///
 	/// May not return None if given BlockId::Latest.
 	/// Returns None if and only if the block's root hash has been pruned from the DB.
-	fn storage_at(&self, address: &Address, position: &H256, id: BlockId) -> Option<H256>;
+	fn storage_at(&self, address: &Address, position: &H256, state: StateOrBlock) -> Option<H256>;
 
 	/// Get value of the storage at given position at the latest block's state.
 	fn latest_storage_at(&self, address: &Address, position: &H256) -> H256 {
-		self.storage_at(address, position, BlockId::Latest)
+		self.storage_at(address, position, BlockId::Latest.into())
 			.expect("storage_at will return Some if given BlockId::Latest. storage_at was given BlockId::Latest. \
 			Therefore storage_at has returned Some; qed")
 	}
@@ -133,9 +256,6 @@ pub trait BlockChainClient : Sync + Send {
 	/// Get transaction with given hash.
 	fn transaction(&self, id: TransactionId) -> Option<LocalizedTransaction>;
 
-	/// Get the hash of block that contains the transaction, if any.
-	fn transaction_block(&self, id: TransactionId) -> Option<H256>;
-
 	/// Get uncle with given id.
 	fn uncle(&self, id: UncleId) -> Option<encoded::Header>;
 
@@ -155,46 +275,24 @@ pub trait BlockChainClient : Sync + Send {
 	/// Get raw block receipts data by block header hash.
 	fn block_receipts(&self, hash: &H256) -> Option<Bytes>;
 
-	/// Import a block into the blockchain.
-	fn import_block(&self, bytes: Bytes) -> Result<H256, BlockImportError>;
-
-	/// Import a block with transaction receipts. Does no sealing and transaction validation.
-	fn import_block_with_receipts(&self, block_bytes: Bytes, receipts_bytes: Bytes) -> Result<H256, BlockImportError>;
-
 	/// Get block queue information.
 	fn queue_info(&self) -> BlockQueueInfo;
 
 	/// Clear block queue and abort all import activity.
 	fn clear_queue(&self);
 
-	/// Get blockchain information.
-	fn chain_info(&self) -> BlockChainInfo;
-
 	/// Get the registrar address, if it exists.
 	fn additional_params(&self) -> BTreeMap<String, String>;
 
-	/// Get the best block header.
-	fn best_block_header(&self) -> encoded::Header;
-
-	/// Returns numbers of blocks containing given bloom.
-	fn blocks_with_bloom(&self, bloom: &H2048, from_block: BlockId, to_block: BlockId) -> Option<Vec<BlockNumber>>;
-
 	/// Returns logs matching given filter.
 	fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry>;
 
-	/// Makes a non-persistent transaction call.
-	fn call(&self, tx: &SignedTransaction, analytics: CallAnalytics, block: BlockId) -> Result<Executed, CallError>;
-
-	/// Makes multiple non-persistent but dependent transaction calls.
-	/// Returns a vector of successes or a failure if any of the transaction fails.
-	fn call_many(&self, txs: &[(SignedTransaction, CallAnalytics)], block: BlockId) -> Result<Vec<Executed>, CallError>;
-
-	/// Estimates how much gas will be necessary for a call.
-	fn estimate_gas(&self, t: &SignedTransaction, block: BlockId) -> Result<U256, CallError>;
-
 	/// Replays a given transaction for inspection.
 	fn replay(&self, t: TransactionId, analytics: CallAnalytics) -> Result<Executed, CallError>;
 
+	/// Replays all the transactions in a given block for inspection.
+	fn replay_block_transactions(&self, block: BlockId, analytics: CallAnalytics) -> Result<Box<Iterator<Item = Executed>>, CallError>;
+
 	/// Returns traces matching given filter.
 	fn filter_traces(&self, filter: TraceFilter) -> Option<Vec<LocalizedTrace>>;
 
@@ -268,51 +366,64 @@ pub trait BlockChainClient : Sync + Send {
 	/// Returns information about pruning/data availability.
 	fn pruning_info(&self) -> PruningInfo;
 
-	/// Like `call`, but with various defaults. Designed to be used for calling contracts.
-	fn call_contract(&self, id: BlockId, address: Address, data: Bytes) -> Result<Bytes, String>;
-
 	/// Import a transaction: used for misbehaviour reporting.
 	fn transact_contract(&self, address: Address, data: Bytes) -> Result<TransactionImportResult, EthcoreError>;
 
 	/// Get the address of the registry itself.
 	fn registrar_address(&self) -> Option<Address>;
 
-	/// Get the address of a particular blockchain service, if available.
-	fn registry_address(&self, name: String) -> Option<Address>;
-
 	/// Get the EIP-86 transition block number.
 	fn eip86_transition(&self) -> u64;
 }
 
-impl IpcConfig for BlockChainClient { }
+/// Provides `reopen_block` method
+pub trait ReopenBlock {
+	/// Reopens an OpenBlock and updates uncles.
+	fn reopen_block(&self, block: ClosedBlock) -> OpenBlock;
+}
 
-/// Extended client interface used for mining
-pub trait MiningBlockChainClient: BlockChainClient {
+/// Provides `prepare_open_block` method
+pub trait PrepareOpenBlock {
 	/// Returns OpenBlock prepared for closing.
 	fn prepare_open_block(&self,
 		author: Address,
 		gas_range_target: (U256, U256),
 		extra_data: Bytes
 	) -> OpenBlock;
+}
 
-	/// Reopens an OpenBlock and updates uncles.
-	fn reopen_block(&self, block: ClosedBlock) -> OpenBlock;
+/// Provides methods used for sealing new state
+pub trait BlockProducer: PrepareOpenBlock + ReopenBlock {}
 
-	/// Returns EvmFactory.
-	fn vm_factory(&self) -> &EvmFactory;
+/// Provides `latest_schedule` method
+pub trait ScheduleInfo {
+	/// Returns latest schedule.
+	fn latest_schedule(&self) -> Schedule;
+}
+
+///Provides `import_sealed_block` method
+pub trait ImportSealedBlock {
+	/// Import sealed block. Skips all verifications.
+	fn import_sealed_block(&self, block: SealedBlock) -> ImportResult;
+}
 
+/// Provides `broadcast_proposal_block` method
+pub trait BroadcastProposalBlock {
 	/// Broadcast a block proposal.
 	fn broadcast_proposal_block(&self, block: SealedBlock);
+}
 
-	/// Import sealed block. Skips all verifications.
-	fn import_sealed_block(&self, block: SealedBlock) -> ImportResult;
+/// Provides methods to import sealed block and broadcast a block proposal
+pub trait SealedBlockImporter: ImportSealedBlock + BroadcastProposalBlock {}
 
-	/// Returns latest schedule.
-	fn latest_schedule(&self) -> Schedule;
+/// Extended client interface used for mining
+pub trait MiningBlockChainClient: BlockChainClient + BlockProducer + ScheduleInfo + SealedBlockImporter {
+	/// Returns EvmFactory.
+	fn vm_factory(&self) -> &VmFactory;
 }
 
 /// Client facilities used by internally sealing Engines.
-pub trait EngineClient: MiningBlockChainClient {
+pub trait EngineClient: Sync + Send + ChainInfo {
 	/// Make a new block and seal it.
 	fn update_sealing(&self);
 
@@ -328,6 +439,15 @@ pub trait EngineClient: MiningBlockChainClient {
 	///
 	/// The block corresponding the the parent hash must be stored already.
 	fn epoch_transition_for(&self, parent_hash: H256) -> Option<::engines::EpochTransition>;
+
+	/// Attempt to cast the engine client to a full client.
+	fn as_full_client(&self) -> Option<&BlockChainClient>;
+
+	/// Get a block number by ID.
+	fn block_number(&self, id: BlockId) -> Option<BlockNumber>;
+
+	/// Get raw block header data by block id.
+	fn block_header(&self, id: BlockId) -> Option<encoded::Header>;
 }
 
 /// Extended client interface for providing proofs of the state.
@@ -347,4 +467,7 @@ pub trait ProvingBlockChainClient: BlockChainClient {
 	/// Returns the output of the call and a vector of database items necessary
 	/// to reproduce it.
 	fn prove_transaction(&self, transaction: SignedTransaction, id: BlockId) -> Option<(Bytes, Vec<DBValue>)>;
+
+	/// Get an epoch change signal by block hash.
+	fn epoch_signal(&self, hash: H256) -> Option<Vec<u8>>;
 }
diff --git a/ethcore/src/db.rs b/ethcore/src/db.rs
index bccb8e943b12fd2fd8bbf10060858df204f43e2a..d11adc7710d4d334efc99ee47256453d469e3261 100644
--- a/ethcore/src/db.rs
+++ b/ethcore/src/db.rs
@@ -19,7 +19,8 @@
 use std::ops::Deref;
 use std::hash::Hash;
 use std::collections::HashMap;
-use util::{DBTransaction, KeyValueDB, RwLock};
+use parking_lot::RwLock;
+use kvdb::{DBTransaction, KeyValueDB};
 
 use rlp;
 
diff --git a/ethcore/src/encoded.rs b/ethcore/src/encoded.rs
index 125a00fd0f7d54ba56f1a09edbc26aaa715baa55..098a90a8ab467e19da3e51889741798106e77295 100644
--- a/ethcore/src/encoded.rs
+++ b/ethcore/src/encoded.rs
@@ -28,12 +28,13 @@ use header::{BlockNumber, Header as FullHeader};
 use transaction::UnverifiedTransaction;
 use views;
 
-use util::{Address, Hashable, H256, H2048, U256, HeapSizeOf};
+use hash::keccak;
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, Bloom, U256, Address};
 use rlp::Rlp;
 
 /// Owning header view.
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct Header(Vec<u8>);
 
 impl HeapSizeOf for Header {
@@ -64,7 +65,7 @@ impl Header {
 // forwarders to borrowed view.
 impl Header {
 	/// Returns the header hash.
-	pub fn hash(&self) -> H256 { self.sha3() }
+	pub fn hash(&self) -> H256 { keccak(&self.0) }
 
 	/// Returns the parent hash.
 	pub fn parent_hash(&self) -> H256 { self.view().parent_hash() }
@@ -85,7 +86,7 @@ impl Header {
 	pub fn receipts_root(&self) -> H256 { self.view().receipts_root() }
 
 	/// Returns the block log bloom
-	pub fn log_bloom(&self) -> H2048 { self.view().log_bloom() }
+	pub fn log_bloom(&self) -> Bloom { self.view().log_bloom() }
 
 	/// Difficulty of this block
 	pub fn difficulty(&self) -> U256 { self.view().difficulty() }
@@ -109,15 +110,8 @@ impl Header {
 	pub fn seal(&self) -> Vec<Vec<u8>> { self.view().seal() }
 }
 
-impl Hashable for Header {
-	fn sha3(&self) -> H256 {
-		self.0.sha3()
-	}
-}
-
 /// Owning block body view.
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct Body(Vec<u8>);
 
 impl HeapSizeOf for Body {
@@ -177,7 +171,6 @@ impl Body {
 
 /// Owning block view.
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct Block(Vec<u8>);
 
 impl HeapSizeOf for Block {
@@ -218,7 +211,7 @@ impl Block {
 // forwarders to borrowed header view.
 impl Block {
 	/// Returns the header hash.
-	pub fn hash(&self) -> H256 { self.header_view().sha3() }
+	pub fn hash(&self) -> H256 { self.header_view().hash() }
 
 	/// Returns the parent hash.
 	pub fn parent_hash(&self) -> H256 { self.header_view().parent_hash() }
@@ -239,7 +232,7 @@ impl Block {
 	pub fn receipts_root(&self) -> H256 { self.header_view().receipts_root() }
 
 	/// Returns the block log bloom
-	pub fn log_bloom(&self) -> H2048 { self.header_view().log_bloom() }
+	pub fn log_bloom(&self) -> Bloom { self.header_view().log_bloom() }
 
 	/// Difficulty of this block
 	pub fn difficulty(&self) -> U256 { self.header_view().difficulty() }
diff --git a/ethcore/src/engines/authority_round/finality.rs b/ethcore/src/engines/authority_round/finality.rs
index 4e1bdf6a32c0da10cbfd3b40a8d78d61e0dbb576..61f1c182294d4e36f411d976657691df10ea3011 100644
--- a/ethcore/src/engines/authority_round/finality.rs
+++ b/ethcore/src/engines/authority_round/finality.rs
@@ -19,7 +19,7 @@
 use std::collections::{VecDeque};
 use std::collections::hash_map::{HashMap, Entry};
 
-use util::{Address, H256};
+use ethereum_types::{H256, Address};
 
 use engines::validator_set::SimpleList;
 
@@ -30,7 +30,7 @@ pub struct UnknownValidator;
 /// Rolling finality checker for authority round consensus.
 /// Stores a chain of unfinalized hashes that can be pushed onto.
 pub struct RollingFinality {
-	headers: VecDeque<(H256, Address)>,
+	headers: VecDeque<(H256, Vec<Address>)>,
 	signers: SimpleList,
 	sign_count: HashMap<Address, usize>,
 	last_pushed: Option<H256>,
@@ -52,28 +52,31 @@ impl RollingFinality {
 	///
 	/// Fails if any provided signature isn't part of the signers set.
 	pub fn build_ancestry_subchain<I>(&mut self, iterable: I) -> Result<(), UnknownValidator>
-		where I: IntoIterator<Item=(H256, Address)>
+		where I: IntoIterator<Item=(H256, Vec<Address>)>
 	{
 		self.clear();
-		for (hash, signer) in iterable {
-			if !self.signers.contains(&signer) { return Err(UnknownValidator) }
+		for (hash, signers) in iterable {
+			if signers.iter().any(|s| !self.signers.contains(s)) { return Err(UnknownValidator) }
 			if self.last_pushed.is_none() { self.last_pushed = Some(hash) }
 
 			// break when we've got our first finalized block.
 			{
 				let current_signed = self.sign_count.len();
-				let would_be_finalized = (current_signed + 1) * 2 > self.signers.len();
 
-				let entry = self.sign_count.entry(signer);
-				if let (true, &Entry::Vacant(_)) = (would_be_finalized, &entry) {
+				let new_signers = signers.iter().filter(|s| !self.sign_count.contains_key(s)).count();
+				let would_be_finalized = (current_signed + new_signers) * 2 > self.signers.len();
+
+				if would_be_finalized {
 					trace!(target: "finality", "Encountered already finalized block {}", hash);
 					break
 				}
 
-				*entry.or_insert(0) += 1;
+				for signer in signers.iter() {
+					*self.sign_count.entry(*signer).or_insert(0) += 1;
+				}
 			}
 
-			self.headers.push_front((hash, signer));
+			self.headers.push_front((hash, signers));
 		}
 
 		trace!(target: "finality", "Rolling finality state: {:?}", self.headers);
@@ -103,30 +106,35 @@ impl RollingFinality {
 	/// Fails if `signer` isn't a member of the active validator set.
 	/// Returns a list of all newly finalized headers.
 	// TODO: optimize with smallvec.
-	pub fn push_hash(&mut self, head: H256, signer: Address) -> Result<Vec<H256>, UnknownValidator> {
-		if !self.signers.contains(&signer) { return Err(UnknownValidator) }
+	pub fn push_hash(&mut self, head: H256, signers: Vec<Address>) -> Result<Vec<H256>, UnknownValidator> {
+		if signers.iter().any(|s| !self.signers.contains(s)) { return Err(UnknownValidator) }
 
-		self.headers.push_back((head, signer));
-		*self.sign_count.entry(signer).or_insert(0) += 1;
+		for signer in signers.iter() {
+			*self.sign_count.entry(*signer).or_insert(0) += 1;
+		}
+
+		self.headers.push_back((head, signers));
 
 		let mut newly_finalized = Vec::new();
 
 		while self.sign_count.len() * 2 > self.signers.len() {
-			let (hash, signer) = self.headers.pop_front()
+			let (hash, signers) = self.headers.pop_front()
 				.expect("headers length always greater than sign count length; qed");
 
 			newly_finalized.push(hash);
 
-			match self.sign_count.entry(signer) {
-				Entry::Occupied(mut entry) => {
-					// decrement count for this signer and purge on zero.
-					*entry.get_mut() -= 1;
+			for signer in signers {
+				match self.sign_count.entry(signer) {
+					Entry::Occupied(mut entry) => {
+						// decrement count for this signer and purge on zero.
+						*entry.get_mut() -= 1;
 
-					if *entry.get() == 0 {
-						entry.remove();
+						if *entry.get() == 0 {
+							entry.remove();
+						}
 					}
+					Entry::Vacant(_) => panic!("all hashes in `header` should have entries in `sign_count` for their signers; qed"),
 				}
-				Entry::Vacant(_) => panic!("all hashes in `header` should have an entry in `sign_count` for their signer; qed"),
 			}
 		}
 
@@ -137,7 +145,7 @@ impl RollingFinality {
 	}
 }
 
-pub struct Iter<'a>(::std::collections::vec_deque::Iter<'a, (H256, Address)>);
+pub struct Iter<'a>(::std::collections::vec_deque::Iter<'a, (H256, Vec<Address>)>);
 
 impl<'a> Iterator for Iter<'a> {
 	type Item = H256;
@@ -149,14 +157,14 @@ impl<'a> Iterator for Iter<'a> {
 
 #[cfg(test)]
 mod tests {
-	use util::{Address, H256};
+	use ethereum_types::{H256, Address};
 	use super::RollingFinality;
 
 	#[test]
-	fn rejects_unknown_signer() {
-		let signers = (0..3).map(|_| Address::random()).collect();
-		let mut finality = RollingFinality::blank(signers);
-		assert!(finality.push_hash(H256::random(), Address::random()).is_err());
+	fn rejects_unknown_signers() {
+		let signers = (0..3).map(|_| Address::random()).collect::<Vec<_>>();
+		let mut finality = RollingFinality::blank(signers.clone());
+		assert!(finality.push_hash(H256::random(), vec![signers[0], Address::random()]).is_err());
 	}
 
 	#[test]
@@ -169,19 +177,29 @@ mod tests {
 		// 3 / 6 signers is < 51% so no finality.
 		for (i, hash) in hashes.iter().take(6).cloned().enumerate() {
 			let i = i % 3;
-			assert!(finality.push_hash(hash, signers[i]).unwrap().len() == 0);
+			assert!(finality.push_hash(hash, vec![signers[i]]).unwrap().len() == 0);
 		}
 
 		// after pushing a block signed by a fourth validator, the first four
 		// blocks of the unverified chain become verified.
-		assert_eq!(finality.push_hash(hashes[6], signers[4]).unwrap(),
+		assert_eq!(finality.push_hash(hashes[6], vec![signers[4]]).unwrap(),
 			vec![hashes[0], hashes[1], hashes[2], hashes[3]]);
 	}
 
+	#[test]
+	fn finalize_multiple_signers() {
+		let signers: Vec<_> = (0..6).map(|_| Address::random()).collect();
+		let mut finality = RollingFinality::blank(signers.clone());
+		let hash = H256::random();
+
+		// after pushing a block signed by four validators, it becomes verified right away.
+		assert_eq!(finality.push_hash(hash, signers[0..4].to_vec()).unwrap(), vec![hash]);
+	}
+
 	#[test]
 	fn from_ancestry() {
 		let signers: Vec<_> = (0..6).map(|_| Address::random()).collect();
-		let hashes: Vec<_> = (0..12).map(|i| (H256::random(), signers[i % 6])).collect();
+		let hashes: Vec<_> = (0..12).map(|i| (H256::random(), vec![signers[i % 6]])).collect();
 
 		let mut finality = RollingFinality::blank(signers.clone());
 		finality.build_ancestry_subchain(hashes.iter().rev().cloned()).unwrap();
@@ -189,4 +207,20 @@ mod tests {
 		assert_eq!(finality.unfinalized_hashes().count(), 3);
 		assert_eq!(finality.subchain_head(), Some(hashes[11].0));
 	}
+
+	#[test]
+	fn from_ancestry_multiple_signers() {
+		let signers: Vec<_> = (0..6).map(|_| Address::random()).collect();
+		let hashes: Vec<_> = (0..12).map(|i| {
+			(H256::random(), vec![signers[i % 6], signers[(i + 1) % 6], signers[(i + 2) % 6]])
+		}).collect();
+
+		let mut finality = RollingFinality::blank(signers.clone());
+		finality.build_ancestry_subchain(hashes.iter().rev().cloned()).unwrap();
+
+		// only the last hash has < 51% of authorities' signatures
+		assert_eq!(finality.unfinalized_hashes().count(), 1);
+		assert_eq!(finality.unfinalized_hashes().next(), Some(hashes[11].0));
+		assert_eq!(finality.subchain_head(), Some(hashes[11].0));
+	}
 }
diff --git a/ethcore/src/engines/authority_round/mod.rs b/ethcore/src/engines/authority_round/mod.rs
index 508cd3e257e9d22c33d31a51fafbd9bba4475916..0acde347e2b8aa848288a63999540ed27fce7da2 100644
--- a/ethcore/src/engines/authority_round/mod.rs
+++ b/ethcore/src/engines/authority_round/mod.rs
@@ -16,41 +16,46 @@
 
 //! A blockchain engine that supports a non-instant BFT proof-of-authority.
 
+use std::fmt;
 use std::sync::atomic::{AtomicUsize, AtomicBool, Ordering as AtomicOrdering};
 use std::sync::{Weak, Arc};
 use std::time::{UNIX_EPOCH, Duration};
-use std::collections::{BTreeMap, HashSet, HashMap};
-use std::cmp;
+use std::collections::{BTreeMap, HashSet};
+use std::iter::FromIterator;
 
 use account_provider::AccountProvider;
 use block::*;
-use builtin::Builtin;
-use client::{Client, EngineClient};
-use engines::{Call, Engine, Seal, EngineError, ConstructedVerifier};
-use error::{Error, TransactionError, BlockError};
+use client::EngineClient;
+use engines::{Engine, Seal, EngineError, ConstructedVerifier};
+use error::{Error, BlockError};
 use ethjson;
+use machine::{AuxiliaryData, Call, EthereumMachine};
+use hash::keccak;
 use header::{Header, BlockNumber};
-use spec::CommonParams;
-use state::CleanupMode;
-use transaction::UnverifiedTransaction;
 
 use super::signer::EngineSigner;
 use super::validator_set::{ValidatorSet, SimpleList, new_validator_set};
 
 use self::finality::RollingFinality;
 
-use ethkey::{verify_address, Signature};
+use ethkey::{public_to_address, recover, verify_address, Signature};
 use io::{IoContext, IoHandler, TimerToken, IoService};
 use itertools::{self, Itertools};
-use rlp::{UntrustedRlp, encode};
-use util::*;
+use rlp::{encode, Decodable, DecoderError, Encodable, RlpStream, UntrustedRlp};
+use ethereum_types::{H256, H520, Address, U128, U256};
+use parking_lot::{Mutex, RwLock};
+use unexpected::{Mismatch, OutOfBounds};
 
 mod finality;
 
 /// `AuthorityRound` params.
 pub struct AuthorityRoundParams {
-	/// Time to wait before next block or authority switching.
-	pub step_duration: Duration,
+	/// Time to wait before next block or authority switching,
+	/// in seconds.
+	///
+	/// Deliberately typed as u16 as too high of a value leads
+	/// to slow block issuance.
+	pub step_duration: u16,
 	/// Starting step,
 	pub start_step: Option<u64>,
 	/// Valid validators.
@@ -61,17 +66,39 @@ pub struct AuthorityRoundParams {
 	pub validate_step_transition: u64,
 	/// Immediate transitions.
 	pub immediate_transitions: bool,
+	/// Block reward in base units.
+	pub block_reward: U256,
+	/// Number of accepted uncles transition block.
+	pub maximum_uncle_count_transition: u64,
+	/// Number of accepted uncles.
+	pub maximum_uncle_count: usize,
+	/// Empty step messages transition block.
+	pub empty_steps_transition: u64,
+	/// Number of accepted empty steps.
+	pub maximum_empty_steps: usize,
 }
 
+const U16_MAX: usize = ::std::u16::MAX as usize;
+
 impl From<ethjson::spec::AuthorityRoundParams> for AuthorityRoundParams {
 	fn from(p: ethjson::spec::AuthorityRoundParams) -> Self {
+		let mut step_duration_usize: usize = p.step_duration.into();
+		if step_duration_usize > U16_MAX {
+			step_duration_usize = U16_MAX;
+			warn!(target: "engine", "step_duration is too high ({}), setting it to {}", step_duration_usize, U16_MAX);
+		}
 		AuthorityRoundParams {
-			step_duration: Duration::from_secs(p.step_duration.into()),
+			step_duration: step_duration_usize as u16,
 			validators: new_validator_set(p.validators),
 			start_step: p.start_step.map(Into::into),
 			validate_score_transition: p.validate_score_transition.map_or(0, Into::into),
 			validate_step_transition: p.validate_step_transition.map_or(0, Into::into),
 			immediate_transitions: p.immediate_transitions.unwrap_or(false),
+			block_reward: p.block_reward.map_or_else(Default::default, Into::into),
+			maximum_uncle_count_transition: p.maximum_uncle_count_transition.map_or(0, Into::into),
+			maximum_uncle_count: p.maximum_uncle_count.map_or(0, Into::into),
+			empty_steps_transition: p.empty_steps_transition.map_or(u64::max_value(), |n| ::std::cmp::max(n.into(), 1)),
+			maximum_empty_steps: p.maximum_empty_steps.map_or(0, Into::into),
 		}
 	}
 }
@@ -81,40 +108,83 @@ impl From<ethjson::spec::AuthorityRoundParams> for AuthorityRoundParams {
 struct Step {
 	calibrate: bool, // whether calibration is enabled.
 	inner: AtomicUsize,
-	duration: Duration,
+	duration: u16,
 }
 
 impl Step {
 	fn load(&self) -> usize { self.inner.load(AtomicOrdering::SeqCst) }
 	fn duration_remaining(&self) -> Duration {
 		let now = unix_now();
-		let step_end = self.duration * (self.load() as u32 + 1);
-		if step_end > now {
-			step_end - now
-		} else {
-			Duration::from_secs(0)
+		let expected_seconds = (self.load() as u64)
+			.checked_add(1)
+			.and_then(|ctr| ctr.checked_mul(self.duration as u64))
+			.map(Duration::from_secs);
+
+		match expected_seconds {
+			Some(step_end) if step_end > now => step_end - now,
+			Some(_) => Duration::from_secs(0),
+			None => {
+				let ctr = self.load();
+				error!(target: "engine", "Step counter is too high: {}, aborting", ctr);
+				panic!("step counter is too high: {}", ctr)
+			},
 		}
+
 	}
+
 	fn increment(&self) {
-		self.inner.fetch_add(1, AtomicOrdering::SeqCst);
+		use std::usize;
+		// fetch_add won't panic on overflow but will rather wrap
+		// around, leading to zero as the step counter, which might
+		// lead to unexpected situations, so it's better to shut down.
+		if self.inner.fetch_add(1, AtomicOrdering::SeqCst) == usize::MAX {
+			error!(target: "engine", "Step counter is too high: {}, aborting", usize::MAX);
+			panic!("step counter is too high: {}", usize::MAX);
+		}
+
 	}
+
 	fn calibrate(&self) {
 		if self.calibrate {
-			let new_step = unix_now().as_secs() / self.duration.as_secs();
+			let new_step = unix_now().as_secs() / (self.duration as u64);
 			self.inner.store(new_step as usize, AtomicOrdering::SeqCst);
 		}
 	}
-	fn is_future(&self, given: usize) -> bool {
-		if given > self.load() + 1 {
-			// Make absolutely sure that the given step is correct.
-			self.calibrate();
-			given > self.load() + 1
+
+	fn check_future(&self, given: usize) -> Result<(), Option<OutOfBounds<u64>>> {
+		const REJECTED_STEP_DRIFT: usize = 4;
+
+		// Verify if the step is correct.
+		if given <= self.load() {
+			return Ok(());
+		}
+
+		// Make absolutely sure that the given step is incorrect.
+		self.calibrate();
+		let current = self.load();
+
+		// reject blocks too far in the future
+		if given > current + REJECTED_STEP_DRIFT {
+			Err(None)
+		// wait a bit for blocks in near future
+		} else if given > current {
+			let d = self.duration as u64;
+			Err(Some(OutOfBounds {
+				min: None,
+				max: Some(d * current as u64),
+				found: d * given as u64,
+			}))
 		} else {
-			false
+			Ok(())
 		}
 	}
 }
 
+// Chain scoring: total weight is sqrt(U256::max_value())*height - step
+fn calculate_score(parent_step: U256, current_step: U256, current_empty_steps: U256) -> U256 {
+	U256::from(U128::max_value()) + parent_step - current_step + current_empty_steps
+}
+
 struct EpochManager {
 	epoch_transition_hash: H256,
 	epoch_transition_number: BlockNumber,
@@ -133,7 +203,7 @@ impl EpochManager {
 	}
 
 	// zoom to epoch for given header. returns true if succeeded, false otherwise.
-	fn zoom_to(&mut self, client: &EngineClient, engine: &Engine, validators: &ValidatorSet, header: &Header) -> bool {
+	fn zoom_to(&mut self, client: &EngineClient, machine: &EthereumMachine, validators: &ValidatorSet, header: &Header) -> bool {
 		let last_was_parent = self.finality_checker.subchain_head() == Some(header.parent_hash().clone());
 
 		// early exit for current target == chain head, but only if the epochs are
@@ -159,7 +229,6 @@ impl EpochManager {
 			}
 		};
 
-
 		// extract other epoch set if it's not the same as the last.
 		if last_transition.block_hash != self.epoch_transition_hash {
 			let (signal_number, set_proof, _) = destructure_proofs(&last_transition.proof)
@@ -171,7 +240,7 @@ impl EpochManager {
 			let first = signal_number == 0;
 			let epoch_set = validators.epoch_set(
 				first,
-				engine,
+				machine,
 				signal_number, // use signal number so multi-set first calculation is correct.
 				set_proof,
 			)
@@ -201,10 +270,112 @@ impl EpochManager {
 	}
 }
 
+/// A message broadcast by authorities when it's their turn to seal a block but there are no
+/// transactions. Other authorities accumulate these messages and later include them in the seal as
+/// proof.
+#[derive(Clone, Debug)]
+struct EmptyStep {
+	signature: H520,
+	step: usize,
+	parent_hash: H256,
+}
+
+impl EmptyStep {
+	fn from_sealed(sealed_empty_step: SealedEmptyStep, parent_hash: &H256) -> EmptyStep {
+		let signature = sealed_empty_step.signature;
+		let step = sealed_empty_step.step;
+		let parent_hash = parent_hash.clone();
+		EmptyStep { signature, step, parent_hash }
+	}
+
+	fn verify(&self, validators: &ValidatorSet) -> Result<bool, Error> {
+		let message = keccak(empty_step_rlp(self.step, &self.parent_hash));
+		let correct_proposer = step_proposer(validators, &self.parent_hash, self.step);
+
+		verify_address(&correct_proposer, &self.signature.into(), &message)
+			.map_err(|e| e.into())
+	}
+
+	fn author(&self) -> Result<Address, Error> {
+		let message = keccak(empty_step_rlp(self.step, &self.parent_hash));
+		let public = recover(&self.signature.into(), &message)?;
+		Ok(public_to_address(&public))
+	}
+
+	fn sealed(&self) -> SealedEmptyStep {
+		let signature = self.signature;
+		let step = self.step;
+		SealedEmptyStep { signature, step }
+	}
+}
+
+impl fmt::Display for EmptyStep {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		write!(f, "({}, {}, {})", self.signature, self.step, self.parent_hash)
+	}
+}
+
+impl Encodable for EmptyStep {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		let empty_step_rlp = empty_step_rlp(self.step, &self.parent_hash);
+		s.begin_list(2)
+			.append(&self.signature)
+			.append_raw(&empty_step_rlp, 1);
+	}
+}
+
+impl Decodable for EmptyStep {
+	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+		let signature = rlp.val_at(0)?;
+		let empty_step_rlp = rlp.at(1)?;
+
+		let step = empty_step_rlp.val_at(0)?;
+		let parent_hash = empty_step_rlp.val_at(1)?;
+
+		Ok(EmptyStep { signature, step, parent_hash })
+	}
+}
+
+pub fn empty_step_full_rlp(signature: &H520, empty_step_rlp: &[u8]) -> Vec<u8> {
+	let mut s = RlpStream::new_list(2);
+	s.append(signature).append_raw(empty_step_rlp, 1);
+	s.out()
+}
+
+pub fn empty_step_rlp(step: usize, parent_hash: &H256) -> Vec<u8> {
+	let mut s = RlpStream::new_list(2);
+	s.append(&step).append(parent_hash);
+	s.out()
+}
+
+/// An empty step message that is included in a seal, the only difference is that it doesn't include
+/// the `parent_hash` in order to save space. The included signature is of the original empty step
+/// message, which can be reconstructed by using the parent hash of the block in which this sealed
+/// empty message is included.
+struct SealedEmptyStep {
+	signature: H520,
+	step: usize,
+}
+
+impl Encodable for SealedEmptyStep {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.begin_list(2)
+			.append(&self.signature)
+			.append(&self.step);
+	}
+}
+
+impl Decodable for SealedEmptyStep {
+	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+		let signature = rlp.val_at(0)?;
+		let step = rlp.val_at(1)?;
+
+		Ok(SealedEmptyStep { signature, step })
+	}
+}
+
 /// Engine using `AuthorityRound` proof-of-authority BFT consensus.
 pub struct AuthorityRound {
-	params: CommonParams,
-	builtins: BTreeMap<Address, Builtin>,
 	transition_service: IoService<()>,
 	step: Arc<Step>,
 	can_propose: AtomicBool,
@@ -213,71 +384,136 @@ pub struct AuthorityRound {
 	validators: Box<ValidatorSet>,
 	validate_score_transition: u64,
 	validate_step_transition: u64,
+	empty_steps: Mutex<Vec<EmptyStep>>,
 	epoch_manager: Mutex<EpochManager>,
 	immediate_transitions: bool,
+	block_reward: U256,
+	maximum_uncle_count_transition: u64,
+	maximum_uncle_count: usize,
+	empty_steps_transition: u64,
+	maximum_empty_steps: usize,
+	machine: EthereumMachine,
 }
 
 // header-chain validator.
 struct EpochVerifier {
 	step: Arc<Step>,
 	subchain_validators: SimpleList,
+	empty_steps_transition: u64,
 }
 
-impl super::EpochVerifier for EpochVerifier {
+impl super::EpochVerifier<EthereumMachine> for EpochVerifier {
 	fn verify_light(&self, header: &Header) -> Result<(), Error> {
+		// Validate the timestamp
+		verify_timestamp(&*self.step, header_step(header, self.empty_steps_transition)?)?;
 		// always check the seal since it's fast.
 		// nothing heavier to do.
-		verify_external(header, &self.subchain_validators, &*self.step, |_| {})
+		verify_external(header, &self.subchain_validators, self.empty_steps_transition)
 	}
 
 	fn check_finality_proof(&self, proof: &[u8]) -> Option<Vec<H256>> {
-		macro_rules! otry {
-			($e: expr) => {
-				match $e {
-					Some(x) => x,
-					None => return None,
-				}
-			}
-		}
-
 		let mut finality_checker = RollingFinality::blank(self.subchain_validators.clone().into_inner());
 		let mut finalized = Vec::new();
 
-		let headers: Vec<Header> = otry!(UntrustedRlp::new(proof).as_list().ok());
+		let headers: Vec<Header> = UntrustedRlp::new(proof).as_list().ok()?;
+
+		{
+			let mut push_header = |parent_header: &Header, header: Option<&Header>| {
+				// ensure all headers have correct number of seal fields so we can `verify_external`
+				// and get `empty_steps` without panic.
+				if parent_header.seal().len() != header_expected_seal_fields(parent_header, self.empty_steps_transition) {
+					return None
+				}
+				if header.iter().any(|h| h.seal().len() != header_expected_seal_fields(h, self.empty_steps_transition)) {
+					return None
+				}
+
+				// `verify_external` checks that signature is correct and author == signer.
+				verify_external(parent_header, &self.subchain_validators, self.empty_steps_transition).ok()?;
+
+				let mut signers = match header {
+					Some(header) => header_empty_steps_signers(header, self.empty_steps_transition).ok()?,
+					_ => Vec::new(),
+				};
+				signers.push(parent_header.author().clone());
+
+				let newly_finalized = finality_checker.push_hash(parent_header.hash(), signers).ok()?;
+				finalized.extend(newly_finalized);
 
+				Some(())
+			};
 
-		for header in &headers {
-			// ensure all headers have correct number of seal fields so we can `verify_external`
-			// without panic.
-			//
-			// `verify_external` checks that signature is correct and author == signer.
-			if header.seal().len() != 2 { return None }
-			otry!(verify_external(header, &self.subchain_validators, &*self.step, |_| {}).ok());
+			for window in headers.windows(2) {
+				push_header(&window[0], Some(&window[1]))?;
+			}
 
-			let newly_finalized = otry!(finality_checker.push_hash(header.hash(), header.author().clone()).ok());
-			finalized.extend(newly_finalized);
+			if let Some(last) = headers.last() {
+				push_header(last, None)?;
+			}
 		}
 
 		if finalized.is_empty() { None } else { Some(finalized) }
 	}
 }
 
-// Report misbehavior
-#[derive(Debug)]
-#[allow(dead_code)]
-enum Report {
-	// Malicious behavior
-	Malicious(Address, BlockNumber, Bytes),
-	// benign misbehavior
-	Benign(Address, BlockNumber),
+fn header_seal_hash(header: &Header, empty_steps_rlp: Option<&[u8]>) -> H256 {
+	match empty_steps_rlp {
+		Some(empty_steps_rlp) => {
+			let mut message = header.bare_hash().to_vec();
+			message.extend_from_slice(empty_steps_rlp);
+			keccak(message)
+		},
+		None => {
+			header.bare_hash()
+		},
+	}
+}
+
+fn header_expected_seal_fields(header: &Header, empty_steps_transition: u64) -> usize {
+	if header.number() >= empty_steps_transition {
+		3
+	} else {
+		2
+	}
+}
+
+fn header_step(header: &Header, empty_steps_transition: u64) -> Result<usize, ::rlp::DecoderError> {
+	let expected_seal_fields = header_expected_seal_fields(header, empty_steps_transition);
+	UntrustedRlp::new(&header.seal().get(0).expect(
+		&format!("was either checked with verify_block_basic or is genesis; has {} fields; qed (Make sure the spec file has a correct genesis seal)", expected_seal_fields))).as_val()
+}
+
+fn header_signature(header: &Header, empty_steps_transition: u64) -> Result<Signature, ::rlp::DecoderError> {
+	let expected_seal_fields = header_expected_seal_fields(header, empty_steps_transition);
+	UntrustedRlp::new(&header.seal().get(1).expect(
+		&format!("was checked with verify_block_basic; has {} fields; qed", expected_seal_fields))).as_val::<H520>().map(Into::into)
 }
 
-fn header_step(header: &Header) -> Result<usize, ::rlp::DecoderError> {
-	UntrustedRlp::new(&header.seal().get(0).expect("was either checked with verify_block_basic or is genesis; has 2 fields; qed (Make sure the spec file has a correct genesis seal)")).as_val()
+// extracts the raw empty steps vec from the header seal. should only be called when there are 3 fields in the seal
+// (i.e. header.number() >= self.empty_steps_transition)
+fn header_empty_steps_raw(header: &Header) -> &[u8] {
+	header.seal().get(2).expect("was checked with verify_block_basic; has 3 fields; qed")
 }
 
-fn header_signature(header: &Header) -> Result<Signature, ::rlp::DecoderError> {
-	UntrustedRlp::new(&header.seal().get(1).expect("was checked with verify_block_basic; has 2 fields; qed")).as_val::<H520>().map(Into::into)
+// extracts the empty steps from the header seal. should only be called when there are 3 fields in the seal
+// (i.e. header.number() >= self.empty_steps_transition).
+fn header_empty_steps(header: &Header) -> Result<Vec<EmptyStep>, ::rlp::DecoderError> {
+	let empty_steps = UntrustedRlp::new(header_empty_steps_raw(header)).as_list::<SealedEmptyStep>()?;
+	Ok(empty_steps.into_iter().map(|s| EmptyStep::from_sealed(s, header.parent_hash())).collect())
+}
+
+// gets the signers of empty step messages for the given header, does not include repeated signers
+fn header_empty_steps_signers(header: &Header, empty_steps_transition: u64) -> Result<Vec<Address>, Error> {
+	if header.number() >= empty_steps_transition {
+		let mut signers = HashSet::new();
+		for empty_step in header_empty_steps(header)? {
+			signers.insert(empty_step.author()?);
+		}
+
+		Ok(Vec::from_iter(signers.into_iter()))
+	} else {
+		Ok(Vec::new())
+	}
 }
 
 fn step_proposer(validators: &ValidatorSet, bh: &H256, step: usize) -> Address {
@@ -290,28 +526,44 @@ fn is_step_proposer(validators: &ValidatorSet, bh: &H256, step: usize, address:
 	step_proposer(validators, bh, step) == *address
 }
 
-fn verify_external<F: Fn(Report)>(header: &Header, validators: &ValidatorSet, step: &Step, report: F)
-	-> Result<(), Error>
-{
-	let header_step = header_step(header)?;
+fn verify_timestamp(step: &Step, header_step: usize) -> Result<(), BlockError> {
+	match step.check_future(header_step) {
+		Err(None) => {
+			trace!(target: "engine", "verify_timestamp: block from the future");
+			Err(BlockError::InvalidSeal.into())
+		},
+		Err(Some(oob)) => {
+			// NOTE This error might be returned only in early stage of verification (Stage 1).
+			// Returning it further won't recover the sync process.
+			trace!(target: "engine", "verify_timestamp: block too early");
+			Err(BlockError::TemporarilyInvalid(oob).into())
+		},
+		Ok(_) => Ok(()),
+	}
+}
 
-	// Give one step slack if step is lagging, double vote is still not possible.
-	if step.is_future(header_step) {
-		trace!(target: "engine", "verify_block_external: block from the future");
-		report(Report::Benign(*header.author(), header.number()));
-		Err(BlockError::InvalidSeal)?
-	} else {
-		let proposer_signature = header_signature(header)?;
-		let correct_proposer = validators.get(header.parent_hash(), header_step);
-		let is_invalid_proposer = *header.author() != correct_proposer ||
-			!verify_address(&correct_proposer, &proposer_signature, &header.bare_hash())?;
-
-		if is_invalid_proposer {
-			trace!(target: "engine", "verify_block_external: bad proposer for step: {}", header_step);
-			Err(EngineError::NotProposer(Mismatch { expected: correct_proposer, found: header.author().clone() }))?
+fn verify_external(header: &Header, validators: &ValidatorSet, empty_steps_transition: u64) -> Result<(), Error> {
+	let header_step = header_step(header, empty_steps_transition)?;
+
+	let proposer_signature = header_signature(header, empty_steps_transition)?;
+	let correct_proposer = validators.get(header.parent_hash(), header_step);
+	let is_invalid_proposer = *header.author() != correct_proposer || {
+		let empty_steps_rlp = if header.number() >= empty_steps_transition {
+			Some(header_empty_steps_raw(header))
 		} else {
-			Ok(())
-		}
+			None
+		};
+
+		let header_seal_hash = header_seal_hash(header, empty_steps_rlp);
+		!verify_address(&correct_proposer, &proposer_signature, &header_seal_hash)?
+	};
+
+	if is_invalid_proposer {
+		trace!(target: "engine", "verify_block_external: bad proposer for step: {}", header_step);
+		validators.report_benign(header.author(), header.number(), header.number());
+		Err(EngineError::NotProposer(Mismatch { expected: correct_proposer, found: header.author().clone() }))?
+	} else {
+		Ok(())
 	}
 }
 
@@ -342,13 +594,15 @@ impl AsMillis for Duration {
 
 impl AuthorityRound {
 	/// Create a new instance of AuthorityRound engine.
-	pub fn new(params: CommonParams, our_params: AuthorityRoundParams, builtins: BTreeMap<Address, Builtin>) -> Result<Arc<Self>, Error> {
+	pub fn new(our_params: AuthorityRoundParams, machine: EthereumMachine) -> Result<Arc<Self>, Error> {
+		if our_params.step_duration == 0 {
+			error!(target: "engine", "Authority Round step duration can't be zero, aborting");
+			panic!("authority_round: step duration can't be zero")
+		}
 		let should_timeout = our_params.start_step.is_none();
-		let initial_step = our_params.start_step.unwrap_or_else(|| (unix_now().as_secs() / our_params.step_duration.as_secs())) as usize;
+		let initial_step = our_params.start_step.unwrap_or_else(|| (unix_now().as_secs() / (our_params.step_duration as u64))) as usize;
 		let engine = Arc::new(
 			AuthorityRound {
-				params: params,
-				builtins: builtins,
 				transition_service: IoService::<()>::start()?,
 				step: Arc::new(Step {
 					inner: AtomicUsize::new(initial_step),
@@ -361,8 +615,15 @@ impl AuthorityRound {
 				validators: our_params.validators,
 				validate_score_transition: our_params.validate_score_transition,
 				validate_step_transition: our_params.validate_step_transition,
+				empty_steps: Mutex::new(Vec::new()),
 				epoch_manager: Mutex::new(EpochManager::blank()),
 				immediate_transitions: our_params.immediate_transitions,
+				block_reward: our_params.block_reward,
+				maximum_uncle_count_transition: our_params.maximum_uncle_count_transition,
+				maximum_uncle_count: our_params.maximum_uncle_count,
+				empty_steps_transition: our_params.empty_steps_transition,
+				maximum_empty_steps: our_params.maximum_empty_steps,
+				machine: machine,
 			});
 
 		// Do not initialize timeouts for tests.
@@ -372,6 +633,52 @@ impl AuthorityRound {
 		}
 		Ok(engine)
 	}
+
+	fn empty_steps(&self, from_step: U256, to_step: U256, parent_hash: H256) -> Vec<EmptyStep> {
+		self.empty_steps.lock().iter().filter(|e| {
+			U256::from(e.step) > from_step &&
+				U256::from(e.step) < to_step &&
+				e.parent_hash == parent_hash
+		}).cloned().collect()
+	}
+
+
+	fn clear_empty_steps(&self, step: U256) {
+		// clear old `empty_steps` messages
+		self.empty_steps.lock().retain(|e| U256::from(e.step) > step);
+	}
+
+	fn handle_empty_step_message(&self, empty_step: EmptyStep) {
+		let mut empty_steps = self.empty_steps.lock();
+		empty_steps.push(empty_step);
+	}
+
+	fn generate_empty_step(&self, parent_hash: &H256) {
+		let step = self.step.load();
+		let empty_step_rlp = empty_step_rlp(step, parent_hash);
+
+		if let Ok(signature) = self.sign(keccak(&empty_step_rlp)).map(Into::into) {
+			let message_rlp = empty_step_full_rlp(&signature, &empty_step_rlp);
+
+			let parent_hash = *parent_hash;
+			let empty_step = EmptyStep { signature, step, parent_hash };
+
+			trace!(target: "engine", "broadcasting empty step message: {:?}", empty_step);
+			self.broadcast_message(message_rlp);
+			self.handle_empty_step_message(empty_step);
+
+		} else {
+			warn!(target: "engine", "generate_empty_step: FAIL: accounts secret key unavailable");
+		}
+	}
+
+	fn broadcast_message(&self, message: Vec<u8>) {
+		if let Some(ref weak) = *self.client.read() {
+			if let Some(c) = weak.upgrade() {
+				c.broadcast_consensus_message(message);
+			}
+		}
+	}
 }
 
 fn unix_now() -> Duration {
@@ -396,31 +703,32 @@ impl IoHandler<()> for TransitionHandler {
 	fn timeout(&self, io: &IoContext<()>, timer: TimerToken) {
 		if timer == ENGINE_TIMEOUT_TOKEN {
 			if let Some(engine) = self.engine.upgrade() {
-				engine.step();
-				let remaining = engine.step.duration_remaining();
-				io.register_timer_once(ENGINE_TIMEOUT_TOKEN, remaining.as_millis())
+				// NOTE we might be lagging by couple of steps in case the timeout
+				// has not been called fast enough.
+				// Make sure to advance up to the actual step.
+				while engine.step.duration_remaining().as_millis() == 0 {
+					engine.step();
+				}
+
+				let next_run_at = engine.step.duration_remaining().as_millis() >> 2;
+				io.register_timer_once(ENGINE_TIMEOUT_TOKEN, next_run_at)
 					.unwrap_or_else(|e| warn!(target: "engine", "Failed to restart consensus step timer: {}.", e))
 			}
 		}
 	}
 }
 
-impl Engine for AuthorityRound {
+impl Engine<EthereumMachine> for AuthorityRound {
 	fn name(&self) -> &str { "AuthorityRound" }
 
-	fn version(&self) -> SemanticVersion { SemanticVersion::new(1, 0, 0) }
-
-	/// Two fields - consensus step and the corresponding proposer signature.
-	fn seal_fields(&self) -> usize { 2 }
+	fn machine(&self) -> &EthereumMachine { &self.machine }
 
-	fn params(&self) -> &CommonParams { &self.params }
-
-	fn additional_params(&self) -> HashMap<String, String> {
-		hash_map!["registrar".to_owned() => self.params().registrar.hex()]
+	/// Three fields - consensus step and the corresponding proposer signature, and a list of empty
+	/// step messages (which should be empty if no steps are skipped)
+	fn seal_fields(&self, header: &Header) -> usize {
+		header_expected_seal_fields(header, self.empty_steps_transition)
 	}
 
-	fn builtins(&self) -> &BTreeMap<Address, Builtin> { &self.builtins }
-
 	fn step(&self) {
 		self.step.increment();
 		self.can_propose.store(true, AtomicOrdering::SeqCst);
@@ -433,43 +741,117 @@ impl Engine for AuthorityRound {
 
 	/// Additional engine-specific information for the user/developer concerning `header`.
 	fn extra_info(&self, header: &Header) -> BTreeMap<String, String> {
-		map![
-			"step".into() => header_step(header).as_ref().map(ToString::to_string).unwrap_or("".into()),
-			"signature".into() => header_signature(header).as_ref().map(ToString::to_string).unwrap_or("".into())
-		]
-	}
-
-	fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, _gas_ceil_target: U256) {
-		// Chain scoring: total weight is sqrt(U256::max_value())*height - step
-		let new_difficulty = U256::from(U128::max_value()) + header_step(parent).expect("Header has been verified; qed").into() - self.step.load().into();
-		header.set_difficulty(new_difficulty);
-		header.set_gas_limit({
-			let gas_limit = parent.gas_limit().clone();
-			let bound_divisor = self.params().gas_limit_bound_divisor;
-			if gas_limit < gas_floor_target {
-				cmp::min(gas_floor_target, gas_limit + gas_limit / bound_divisor - 1.into())
-			} else {
-				cmp::max(gas_floor_target, gas_limit - gas_limit / bound_divisor + 1.into())
-			}
-		});
+		let step = header_step(header, self.empty_steps_transition).as_ref().map(ToString::to_string).unwrap_or("".into());
+		let signature = header_signature(header, self.empty_steps_transition).as_ref().map(ToString::to_string).unwrap_or("".into());
+
+		let mut info = map![
+			"step".into() => step,
+			"signature".into() => signature
+		];
+
+		if header.number() >= self.empty_steps_transition {
+			let empty_steps =
+				if let Ok(empty_steps) = header_empty_steps(header).as_ref() {
+					format!("[{}]",
+							empty_steps.iter().fold(
+								"".to_string(),
+								|acc, e| if acc.len() > 0 { acc + ","} else { acc } + &e.to_string()))
+
+				} else {
+					"".into()
+				};
+
+			info.insert("emptySteps".into(), empty_steps);
+		}
+
+		info
+	}
+
+	fn maximum_uncle_count(&self, block: BlockNumber) -> usize {
+		if block >= self.maximum_uncle_count_transition {
+			self.maximum_uncle_count
+		} else {
+			// fallback to default value
+			2
+		}
+	}
+
+	fn populate_from_parent(&self, header: &mut Header, parent: &Header) {
+		let parent_step = header_step(parent, self.empty_steps_transition).expect("Header has been verified; qed");
+		let current_step = self.step.load();
+
+		let current_empty_steps_len = if header.number() >= self.empty_steps_transition {
+			self.empty_steps(parent_step.into(), current_step.into(), parent.hash()).len()
+		} else {
+			0
+		};
+
+		let score = calculate_score(parent_step.into(), current_step.into(), current_empty_steps_len.into());
+		header.set_difficulty(score);
 	}
 
 	fn seals_internally(&self) -> Option<bool> {
+		// TODO: accept a `&Call` here so we can query the validator set.
 		Some(self.signer.read().is_some())
 	}
 
+	fn handle_message(&self, rlp: &[u8]) -> Result<(), EngineError> {
+		fn fmt_err<T: ::std::fmt::Debug>(x: T) -> EngineError {
+			EngineError::MalformedMessage(format!("{:?}", x))
+		}
+
+		let rlp = UntrustedRlp::new(rlp);
+		let empty_step: EmptyStep = rlp.as_val().map_err(fmt_err)?;;
+
+		if empty_step.verify(&*self.validators).unwrap_or(false) {
+			if self.step.check_future(empty_step.step).is_ok() {
+				trace!(target: "engine", "handle_message: received empty step message {:?}", empty_step);
+				self.handle_empty_step_message(empty_step);
+			} else {
+				trace!(target: "engine", "handle_message: empty step message from the future {:?}", empty_step);
+			}
+		} else {
+			trace!(target: "engine", "handle_message: received invalid step message {:?}", empty_step);
+		};
+
+		Ok(())
+	}
+
 	/// Attempt to seal the block internally.
 	///
 	/// This operation is synchronous and may (quite reasonably) not be available, in which case
 	/// `Seal::None` will be returned.
-	fn generate_seal(&self, block: &ExecutedBlock) -> Seal {
+	fn generate_seal(&self, block: &ExecutedBlock, parent: &Header) -> Seal {
 		// first check to avoid generating signature most of the time
 		// (but there's still a race to the `compare_and_swap`)
 		if !self.can_propose.load(AtomicOrdering::SeqCst) { return Seal::None; }
 
 		let header = block.header();
+		let parent_step: U256 = header_step(parent, self.empty_steps_transition)
+			.expect("Header has been verified; qed").into();
+
 		let step = self.step.load();
 
+		// filter messages from old and future steps and different parents
+		let empty_steps = if header.number() >= self.empty_steps_transition {
+			self.empty_steps(parent_step.into(), step.into(), *header.parent_hash())
+		} else {
+			Vec::new()
+		};
+
+		let expected_diff = calculate_score(parent_step, step.into(), empty_steps.len().into());
+
+		if header.difficulty() != &expected_diff {
+			debug!(target: "engine", "Aborting seal generation. The step or empty_steps have changed in the meantime. {:?} != {:?}",
+				   header.difficulty(), expected_diff);
+			return Seal::None;
+		}
+
+		if parent_step > step.into() {
+			warn!(target: "engine", "Aborting seal generation for invalid step: {} > {}", parent_step, step);
+			return Seal::None;
+		}
+
 		// fetch correct validator set for current epoch, taking into account
 		// finality of previous transitions.
 		let active_set;
@@ -486,7 +868,7 @@ impl Engine for AuthorityRound {
 				}
 			};
 
-			if !epoch_manager.zoom_to(&*client, self, &*self.validators, header) {
+			if !epoch_manager.zoom_to(&*client, &self.machine, &*self.validators, header) {
 				debug!(target: "engine", "Unable to zoom to epoch.");
 				return Seal::None;
 			}
@@ -496,12 +878,49 @@ impl Engine for AuthorityRound {
 		};
 
 		if is_step_proposer(validators, header.parent_hash(), step, header.author()) {
-			if let Ok(signature) = self.sign(header.bare_hash()) {
+			// this is guarded against by `can_propose` unless the block was signed
+			// on the same step (implies same key) and on a different node.
+			if parent_step == step.into() {
+				warn!("Attempted to seal block on the same step as parent. Is this authority sealing with more than one node?");
+				return Seal::None;
+			}
+
+			// if there are no transactions to include in the block, we don't seal and instead broadcast a signed
+			// `EmptyStep(step, parent_hash)` message. If we exceed the maximum amount of `empty_step` rounds we proceed
+			// with the seal.
+			if header.number() >= self.empty_steps_transition &&
+				block.transactions().is_empty() &&
+				empty_steps.len() < self.maximum_empty_steps {
+
+				self.generate_empty_step(header.parent_hash());
+				return Seal::None;
+			}
+
+			let empty_steps_rlp = if header.number() >= self.empty_steps_transition {
+				let empty_steps: Vec<_> = empty_steps.iter().map(|e| e.sealed()).collect();
+				Some(::rlp::encode_list(&empty_steps).into_vec())
+			} else {
+				None
+			};
+
+			if let Ok(signature) = self.sign(header_seal_hash(header, empty_steps_rlp.as_ref().map(|e| &**e))) {
 				trace!(target: "engine", "generate_seal: Issuing a block for step {}.", step);
 
 				// only issue the seal if we were the first to reach the compare_and_swap.
 				if self.can_propose.compare_and_swap(true, false, AtomicOrdering::SeqCst) {
-					return Seal::Regular(vec![encode(&step).into_vec(), encode(&(&H520::from(signature) as &[u8])).into_vec()]);
+
+					self.clear_empty_steps(parent_step);
+
+					let mut fields = vec![
+						encode(&step).into_vec(),
+						encode(&(&H520::from(signature) as &[u8])).into_vec(),
+					];
+
+					if let Some(empty_steps_rlp) = empty_steps_rlp {
+						fields.push(empty_steps_rlp);
+					}
+
+					return Seal::Regular(fields);
 				}
 			} else {
 				warn!(target: "engine", "generate_seal: FAIL: Accounts secret key unavailable.");
@@ -510,31 +929,30 @@ impl Engine for AuthorityRound {
 			trace!(target: "engine", "generate_seal: {} not a proposer for step {}.",
 				header.author(), step);
 		}
+
 		Seal::None
 	}
 
+	fn verify_local_seal(&self, _header: &Header) -> Result<(), Error> {
+		Ok(())
+	}
+
 	fn on_new_block(
 		&self,
 		block: &mut ExecutedBlock,
-		last_hashes: Arc<::vm::LastHashes>,
 		epoch_begin: bool,
 	) -> Result<(), Error> {
-		let parent_hash = block.fields().header.parent_hash().clone();
-		::engines::common::push_last_hash(block, last_hashes.clone(), self, &parent_hash)?;
-
 		// with immediate transitions, we don't use the epoch mechanism anyway.
 		// the genesis is always considered an epoch, but we ignore it intentionally.
 		if self.immediate_transitions || !epoch_begin { return Ok(()) }
 
 		// genesis is never a new block, but might as well check.
-		let header = block.fields().header.clone();
+		let header = block.header().clone();
 		let first = header.number() == 0;
 
 		let mut call = |to, data| {
-			let result = ::engines::common::execute_as_system(
+			let result = self.machine.execute_as_system(
 				block,
-				last_hashes.clone(),
-				self,
 				to,
 				U256::max_value(), // unbounded gas? maybe make configurable.
 				Some(data),
@@ -548,91 +966,142 @@ impl Engine for AuthorityRound {
 
 	/// Apply the block reward on finalisation of the block.
 	fn on_close_block(&self, block: &mut ExecutedBlock) -> Result<(), Error> {
-		let fields = block.fields_mut();
-		// Bestow block reward
-		let reward = self.params().block_reward;
-		let res = fields.state.add_balance(fields.header.author(), &reward, CleanupMode::NoEmpty)
-			.map_err(::error::Error::from)
-			.and_then(|_| fields.state.commit());
-		// Commit state so that we can actually figure out the state root.
-		if let Err(ref e) = res {
-			warn!("Encountered error on closing block: {}", e);
+		use parity_machine::WithBalances;
+
+		let mut rewards = Vec::new();
+		if block.header().number() >= self.empty_steps_transition {
+			let empty_steps = if block.header().seal().is_empty() {
+				// this is a new block, calculate rewards based on the empty steps messages we have accumulated
+				let client = match self.client.read().as_ref().and_then(|weak| weak.upgrade()) {
+					Some(client) => client,
+					None => {
+						debug!(target: "engine", "Unable to close block: missing client ref.");
+						return Err(EngineError::RequiresClient.into())
+					},
+				};
+
+				let parent = client.block_header(::client::BlockId::Hash(*block.header().parent_hash()))
+					.expect("hash is from parent; parent header must exist; qed")
+					.decode();
+
+				let parent_step = header_step(&parent, self.empty_steps_transition)?;
+				let current_step = self.step.load();
+				self.empty_steps(parent_step.into(), current_step.into(), parent.hash())
+			} else {
+				// we're verifying a block, extract empty steps from the seal
+				header_empty_steps(block.header())?
+			};
+
+			for empty_step in empty_steps {
+				let author = empty_step.author()?;
+				rewards.push((author, self.block_reward));
+			}
 		}
-		res
+
+		let author = *block.header().author();
+		rewards.push((author, self.block_reward));
+
+		for &(ref author, ref block_reward) in rewards.iter() {
+			self.machine.add_balance(block, author, block_reward)?;
+		}
+		self.machine.note_rewards(block, &rewards, &[])
 	}
 
 	/// Check the number of seal fields.
-	fn verify_block_basic(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
-		if header.seal().len() != self.seal_fields() {
-			trace!(target: "engine", "verify_block_basic: wrong number of seal fields");
-			Err(From::from(BlockError::InvalidSealArity(
-				Mismatch { expected: self.seal_fields(), found: header.seal().len() }
-			)))
-		} else if header.number() >= self.validate_score_transition && *header.difficulty() >= U256::from(U128::max_value()) {
-			Err(From::from(BlockError::DifficultyOutOfBounds(
+	fn verify_block_basic(&self, header: &Header) -> Result<(), Error> {
+		if header.number() >= self.validate_score_transition && *header.difficulty() >= U256::from(U128::max_value()) {
+			return Err(From::from(BlockError::DifficultyOutOfBounds(
 				OutOfBounds { min: None, max: Some(U256::from(U128::max_value())), found: *header.difficulty() }
-			)))
-		} else {
-			Ok(())
+			)));
 		}
-	}
 
-	fn verify_block_unordered(&self, _header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
-		Ok(())
-	}
+		// TODO [ToDr] Should this go from epoch manager?
+		// If yes then probably benign reporting needs to be moved further in the verification.
+		let set_number = header.number();
 
-	/// Do the step and gas limit validation.
-	fn verify_block_family(&self, header: &Header, parent: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
-		let step = header_step(header)?;
-
-		// Do not calculate difficulty for genesis blocks.
-		if header.number() == 0 {
-			return Err(From::from(BlockError::RidiculousNumber(OutOfBounds { min: Some(1), max: None, found: header.number() })));
+		match verify_timestamp(&*self.step, header_step(header, self.empty_steps_transition)?) {
+			Err(BlockError::InvalidSeal) => {
+				self.validators.report_benign(header.author(), set_number, header.number());
+				Err(BlockError::InvalidSeal.into())
+			}
+			Err(e) => Err(e.into()),
+			Ok(()) => Ok(()),
 		}
+	}
 
-		let parent_step = header_step(parent)?;
+	/// Do the step and gas limit validation.
+	fn verify_block_family(&self, header: &Header, parent: &Header) -> Result<(), Error> {
+		let step = header_step(header, self.empty_steps_transition)?;
+		let parent_step = header_step(parent, self.empty_steps_transition)?;
+		// TODO [ToDr] Should this go from epoch manager?
+		let set_number = header.number();
 
 		// Ensure header is from the step after parent.
 		if step == parent_step
 			|| (header.number() >= self.validate_step_transition && step <= parent_step) {
 			trace!(target: "engine", "Multiple blocks proposed for step {}.", parent_step);
 
-			self.validators.report_malicious(header.author(), header.number(), header.number(), Default::default());
+			self.validators.report_malicious(header.author(), set_number, header.number(), Default::default());
 			Err(EngineError::DoubleVote(header.author().clone()))?;
 		}
-		// Report skipped primaries.
-		if let (true, Some(me)) = (step > parent_step + 1, self.signer.read().address()) {
-			debug!(target: "engine", "Author {} built block with step gap. current step: {}, parent step: {}",
-				header.author(), step, parent_step);
-			let mut reported = HashSet::new();
-			for s in parent_step + 1..step {
-				let skipped_primary = step_proposer(&*self.validators, &parent.hash(), s);
-				// Do not report this signer.
-				if skipped_primary != me {
-					self.validators.report_benign(&skipped_primary, header.number(), header.number());
+
+		// If empty step messages are enabled we will validate the messages in the seal, missing messages are not
+		// reported as there's no way to tell whether the empty step message was never sent or simply not included.
+		if header.number() >= self.empty_steps_transition {
+			let validate_empty_steps = || -> Result<(), Error> {
+				let empty_steps = header_empty_steps(header)?;
+				for empty_step in empty_steps {
+					if empty_step.step <= parent_step || empty_step.step >= step {
+						Err(EngineError::InsufficientProof(
+							format!("empty step proof for invalid step: {:?}", empty_step.step)))?;
+					}
+
+					if empty_step.parent_hash != *header.parent_hash() {
+						Err(EngineError::InsufficientProof(
+							format!("empty step proof for invalid parent hash: {:?}", empty_step.parent_hash)))?;
+					}
+
+					if !empty_step.verify(&*self.validators).unwrap_or(false) {
+						Err(EngineError::InsufficientProof(
+							format!("invalid empty step proof: {:?}", empty_step)))?;
+					}
 				}
-				// Stop reporting once validators start repeating.
-				if !reported.insert(skipped_primary) { break; }
+				Ok(())
+			};
+
+			if let err @ Err(_) = validate_empty_steps() {
+				self.validators.report_benign(header.author(), set_number, header.number());
+				return err;
 			}
-		}
 
-		let gas_limit_divisor = self.params().gas_limit_bound_divisor;
-		let min_gas = parent.gas_limit().clone() - parent.gas_limit().clone() / gas_limit_divisor;
-		let max_gas = parent.gas_limit().clone() + parent.gas_limit().clone() / gas_limit_divisor;
-		if header.gas_limit() <= &min_gas || header.gas_limit() >= &max_gas {
-			return Err(From::from(BlockError::InvalidGasLimit(OutOfBounds { min: Some(min_gas), max: Some(max_gas), found: header.gas_limit().clone() })));
+		} else {
+			// Report skipped primaries.
+			if let (true, Some(me)) = (step > parent_step + 1, self.signer.read().address()) {
+				debug!(target: "engine", "Author {} built block with step gap. current step: {}, parent step: {}",
+					   header.author(), step, parent_step);
+				let mut reported = HashSet::new();
+				for s in parent_step + 1..step {
+					let skipped_primary = step_proposer(&*self.validators, &parent.hash(), s);
+					// Do not report this signer.
+					if skipped_primary != me {
+						self.validators.report_benign(&skipped_primary, set_number, header.number());
+						// Stop reporting once validators start repeating.
+						if !reported.insert(skipped_primary) { break; }
+ 					}
+ 				}
+			}
 		}
+
 		Ok(())
 	}
 
 	// Check the validators.
-	fn verify_block_external(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
+	fn verify_block_external(&self, header: &Header) -> Result<(), Error> {
 		// fetch correct validator set for current epoch, taking into account
 		// finality of previous transitions.
 		let active_set;
-
-		let (validators, set_number) = if self.immediate_transitions {
-			(&*self.validators, header.number())
+		let validators = if self.immediate_transitions {
+			&*self.validators
 		} else {
 			// get correct validator set for epoch.
 			let client = match self.client.read().as_ref().and_then(|weak| weak.upgrade()) {
@@ -644,25 +1113,23 @@ impl Engine for AuthorityRound {
 			};
 
 			let mut epoch_manager = self.epoch_manager.lock();
-			if !epoch_manager.zoom_to(&*client, self, &*self.validators, header) {
+			if !epoch_manager.zoom_to(&*client, &self.machine, &*self.validators, header) {
 				debug!(target: "engine", "Unable to zoom to epoch.");
 				return Err(EngineError::RequiresClient.into())
 			}
 
 			active_set = epoch_manager.validators().clone();
-			(&active_set as &_, epoch_manager.epoch_transition_number)
-		};
-
-		let report = |report| match report {
-			Report::Benign(address, block_number) =>
-				self.validators.report_benign(&address, set_number, block_number),
-			Report::Malicious(address, block_number, proof) =>
-				self.validators.report_malicious(&address, set_number, block_number, proof),
+			&active_set as &_
 		};
 
 		// verify signature against fixed list, but reports should go to the
 		// contract itself.
-		verify_external(header, validators, &*self.step, report)
+		let res = verify_external(header, validators, self.empty_steps_transition);
+		if res.is_ok() {
+			let header_step = header_step(header, self.empty_steps_transition)?;
+			self.clear_empty_steps(header_step.into());
+		}
+		res
 	}
 
 	fn genesis_epoch_data(&self, header: &Header, call: &Call) -> Result<Vec<u8>, String> {
@@ -670,19 +1137,19 @@ impl Engine for AuthorityRound {
 			.map(|set_proof| combine_proofs(0, &set_proof, &[]))
 	}
 
-	fn signals_epoch_end(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
-		-> super::EpochChange
+	fn signals_epoch_end(&self, header: &Header, aux: AuxiliaryData)
+		-> super::EpochChange<EthereumMachine>
 	{
 		if self.immediate_transitions { return super::EpochChange::No }
 
 		let first = header.number() == 0;
-		self.validators.signals_epoch_end(first, header, block, receipts)
+		self.validators.signals_epoch_end(first, header, aux)
 	}
 
 	fn is_epoch_end(
 		&self,
 		chain_head: &Header,
-		chain: &super::Headers,
+		chain: &super::Headers<Header>,
 		transition_store: &super::PendingTransitionStore,
 	) -> Option<Vec<u8>> {
 		// epochs only matter if we want to support light clients.
@@ -706,7 +1173,7 @@ impl Engine for AuthorityRound {
 
 		// find most recently finalized blocks, then check transition store for pending transitions.
 		let mut epoch_manager = self.epoch_manager.lock();
-		if !epoch_manager.zoom_to(&*client, self, &*self.validators, chain_head) {
+		if !epoch_manager.zoom_to(&*client, &self.machine, &*self.validators, chain_head) {
 			return None;
 		}
 
@@ -717,20 +1184,39 @@ impl Engine for AuthorityRound {
 				chain_head.hash(), chain_head.parent_hash());
 
 			let mut hash = chain_head.parent_hash().clone();
+			let mut parent_empty_steps_signers = match header_empty_steps_signers(&chain_head, self.empty_steps_transition) {
+				Ok(empty_step_signers) => empty_step_signers,
+				Err(_) => {
+					warn!(target: "finality", "Failed to get empty step signatures from block {}", chain_head.hash());
+					return None;
+				}
+			};
+
 			let epoch_transition_hash = epoch_manager.epoch_transition_hash;
 
 			// walk the chain within current epoch backwards.
-			// author == ec_recover(sig) known since
-			// the blocks are in the DB.
+			// author == ec_recover(sig) known since the blocks are in the DB.
+			// the empty steps messages in a header signal approval of the parent header.
 			let ancestry_iter = itertools::repeat_call(move || {
 				chain(hash).and_then(|header| {
 					if header.number() == 0 { return None }
 
-					let res = (hash, header.author().clone());
-					trace!(target: "finality", "Ancestry iteration: yielding {:?}", res);
+					let mut signers = vec![header.author().clone()];
+					signers.extend(parent_empty_steps_signers.drain(..));
+
+					if let Ok(empty_step_signers) = header_empty_steps_signers(&header, self.empty_steps_transition) {
+						let res = (hash, signers);
+						trace!(target: "finality", "Ancestry iteration: yielding {:?}", res);
+
+						hash = header.parent_hash().clone();
+						parent_empty_steps_signers = empty_step_signers;
 
-					hash = header.parent_hash().clone();
-					Some(res)
+						Some(res)
+
+					} else {
+						warn!(target: "finality", "Failed to get empty step signatures from block {}", header.hash());
+						None
+					}
 				})
 			})
 				.while_some()
@@ -743,15 +1229,20 @@ impl Engine for AuthorityRound {
 		}
 
 		{
-			if let Ok(finalized) = epoch_manager.finality_checker.push_hash(chain_head.hash(), *chain_head.author()) {
+			if let Ok(finalized) = epoch_manager.finality_checker.push_hash(chain_head.hash(), vec![chain_head.author().clone()]) {
 				let mut finalized = finalized.into_iter();
-				while let Some(hash) = finalized.next() {
-					if let Some(pending) = transition_store(hash) {
-						let finality_proof = ::std::iter::once(hash)
+				while let Some(finalized_hash) = finalized.next() {
+					if let Some(pending) = transition_store(finalized_hash) {
+						let finality_proof = ::std::iter::once(finalized_hash)
 							.chain(finalized)
 							.chain(epoch_manager.finality_checker.unfinalized_hashes())
-							.map(|hash| chain(hash)
-								.expect("these headers fetched before when constructing finality checker; qed"))
+							.map(|h| if h == chain_head.hash() {
+								// chain closure only stores ancestry, but the chain head is also
+								// unfinalized.
+								chain_head.clone()
+							} else {
+								chain(h).expect("these headers fetched before when constructing finality checker; qed")
+							})
 							.collect::<Vec<Header>>();
 
 						// this gives us the block number for `hash`, assuming it's ancestry.
@@ -780,18 +1271,19 @@ impl Engine for AuthorityRound {
 		None
 	}
 
-	fn epoch_verifier<'a>(&self, _header: &Header, proof: &'a [u8]) -> ConstructedVerifier<'a> {
+	fn epoch_verifier<'a>(&self, _header: &Header, proof: &'a [u8]) -> ConstructedVerifier<'a, EthereumMachine> {
 		let (signal_number, set_proof, finality_proof) = match destructure_proofs(proof) {
 			Ok(x) => x,
 			Err(e) => return ConstructedVerifier::Err(e),
 		};
 
 		let first = signal_number == 0;
-		match self.validators.epoch_set(first, self, signal_number, set_proof) {
+		match self.validators.epoch_set(first, &self.machine, signal_number, set_proof) {
 			Ok((list, finalize)) => {
 				let verifier = Box::new(EpochVerifier {
 					step: self.step.clone(),
 					subchain_validators: list,
+					empty_steps_transition: self.empty_steps_transition,
 				});
 
 				match finalize {
@@ -803,21 +1295,9 @@ impl Engine for AuthorityRound {
 		}
 	}
 
-	fn verify_transaction_basic(&self, t: &UnverifiedTransaction, header: &Header) -> Result<(), Error> {
-		t.check_low_s()?;
-
-		if let Some(n) = t.chain_id() {
-			if header.number() >= self.params().eip155_transition && n != self.params().chain_id {
-				return Err(TransactionError::InvalidChainId.into());
-			}
-		}
-
-		Ok(())
-	}
-
-	fn register_client(&self, client: Weak<Client>) {
+	fn register_client(&self, client: Weak<EngineClient>) {
 		*self.client.write() = Some(client.clone());
-		self.validators.register_contract(client);
+		self.validators.register_client(client);
 	}
 
 	fn set_signer(&self, ap: Arc<AccountProvider>, address: Address, password: String) {
@@ -841,23 +1321,27 @@ impl Engine for AuthorityRound {
 mod tests {
 	use std::sync::Arc;
 	use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
-	use util::*;
+	use hash::keccak;
+	use ethereum_types::{Address, H520, H256, U256};
 	use header::Header;
-	use error::{Error, BlockError};
 	use rlp::encode;
 	use block::*;
-	use tests::helpers::*;
+	use tests::helpers::{
+		generate_dummy_client_with_spec_and_accounts, get_temp_state_db, generate_dummy_client,
+		TestNotify
+	};
 	use account_provider::AccountProvider;
 	use spec::Spec;
-	use engines::{Seal, Engine};
+	use transaction::{Action, Transaction};
+	use engines::{Seal, Engine, EngineError, EthEngine};
 	use engines::validator_set::TestSet;
-	use super::{AuthorityRoundParams, AuthorityRound};
+	use error::Error;
+	use super::{AuthorityRoundParams, AuthorityRound, EmptyStep, SealedEmptyStep};
 
 	#[test]
 	fn has_valid_metadata() {
 		let engine = Spec::new_test_round().engine;
 		assert!(!engine.name().is_empty());
-		assert!(engine.version().major >= 1);
 	}
 
 	#[test]
@@ -868,35 +1352,21 @@ mod tests {
 		assert!(schedule.stack_limit > 0);
 	}
 
-	#[test]
-	fn verification_fails_on_short_seal() {
-		let engine = Spec::new_test_round().engine;
-		let header: Header = Header::default();
-
-		let verify_result = engine.verify_block_basic(&header, None);
-
-		match verify_result {
-			Err(Error::Block(BlockError::InvalidSealArity(_))) => {},
-			Err(_) => { panic!("should be block seal-arity mismatch error (got {:?})", verify_result); },
-			_ => { panic!("Should be error, got Ok"); },
-		}
-	}
-
 	#[test]
 	fn can_do_signature_verification_fail() {
 		let engine = Spec::new_test_round().engine;
 		let mut header: Header = Header::default();
 		header.set_seal(vec![encode(&H520::default()).into_vec()]);
 
-		let verify_result = engine.verify_block_external(&header, None);
+		let verify_result = engine.verify_block_external(&header);
 		assert!(verify_result.is_err());
 	}
 
 	#[test]
 	fn generates_seal_and_does_not_double_propose() {
 		let tap = Arc::new(AccountProvider::transient_provider());
-		let addr1 = tap.insert_account("1".sha3().into(), "1").unwrap();
-		let addr2 = tap.insert_account("2".sha3().into(), "2").unwrap();
+		let addr1 = tap.insert_account(keccak("1").into(), "1").unwrap();
+		let addr2 = tap.insert_account(keccak("2").into(), "2").unwrap();
 
 		let spec = Spec::new_test_round();
 		let engine = &*spec.engine;
@@ -910,24 +1380,58 @@ mod tests {
 		let b2 = b2.close_and_lock();
 
 		engine.set_signer(tap.clone(), addr1, "1".into());
-		if let Seal::Regular(seal) = engine.generate_seal(b1.block()) {
+		if let Seal::Regular(seal) = engine.generate_seal(b1.block(), &genesis_header) {
 			assert!(b1.clone().try_seal(engine, seal).is_ok());
 			// Second proposal is forbidden.
-			assert!(engine.generate_seal(b1.block()) == Seal::None);
+			assert!(engine.generate_seal(b1.block(), &genesis_header) == Seal::None);
 		}
 
 		engine.set_signer(tap, addr2, "2".into());
-		if let Seal::Regular(seal) = engine.generate_seal(b2.block()) {
+		if let Seal::Regular(seal) = engine.generate_seal(b2.block(), &genesis_header) {
 			assert!(b2.clone().try_seal(engine, seal).is_ok());
 			// Second proposal is forbidden.
-			assert!(engine.generate_seal(b2.block()) == Seal::None);
+			assert!(engine.generate_seal(b2.block(), &genesis_header) == Seal::None);
+		}
+	}
+
+	#[test]
+	fn checks_difficulty_in_generate_seal() {
+		let tap = Arc::new(AccountProvider::transient_provider());
+		let addr1 = tap.insert_account(keccak("1").into(), "1").unwrap();
+		let addr2 = tap.insert_account(keccak("0").into(), "0").unwrap();
+
+		let spec = Spec::new_test_round();
+		let engine = &*spec.engine;
+
+		let genesis_header = spec.genesis_header();
+		let db1 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+		let db2 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+		let last_hashes = Arc::new(vec![genesis_header.hash()]);
+
+		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false).unwrap();
+		let b1 = b1.close_and_lock();
+		let b2 = OpenBlock::new(engine, Default::default(), false, db2, &genesis_header, last_hashes, addr2, (3141562.into(), 31415620.into()), vec![], false).unwrap();
+		let b2 = b2.close_and_lock();
+
+		engine.set_signer(tap.clone(), addr1, "1".into());
+		match engine.generate_seal(b1.block(), &genesis_header) {
+			Seal::None | Seal::Proposal(_) => panic!("wrong seal"),
+			Seal::Regular(_) => {
+				engine.step();
+
+				engine.set_signer(tap.clone(), addr2, "0".into());
+				match engine.generate_seal(b2.block(), &genesis_header) {
+					Seal::Regular(_) | Seal::Proposal(_) => panic!("sealed despite wrong difficulty"),
+					Seal::None => {}
+				}
+			}
 		}
 	}
 
 	#[test]
 	fn proposer_switching() {
 		let tap = AccountProvider::transient_provider();
-		let addr = tap.insert_account("0".sha3().into(), "0").unwrap();
+		let addr = tap.insert_account(keccak("0").into(), "0").unwrap();
 		let mut parent_header: Header = Header::default();
 		parent_header.set_seal(vec![encode(&0usize).into_vec()]);
 		parent_header.set_gas_limit("222222".parse::<U256>().unwrap());
@@ -942,17 +1446,17 @@ mod tests {
 		// Two validators.
 		// Spec starts with step 2.
 		header.set_seal(vec![encode(&2usize).into_vec(), encode(&(&*signature as &[u8])).into_vec()]);
-		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
-		assert!(engine.verify_block_external(&header, None).is_err());
+		assert!(engine.verify_block_family(&header, &parent_header).is_ok());
+		assert!(engine.verify_block_external(&header).is_err());
 		header.set_seal(vec![encode(&1usize).into_vec(), encode(&(&*signature as &[u8])).into_vec()]);
-		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
-		assert!(engine.verify_block_external(&header, None).is_ok());
+		assert!(engine.verify_block_family(&header, &parent_header).is_ok());
+		assert!(engine.verify_block_external(&header).is_ok());
 	}
 
 	#[test]
 	fn rejects_future_block() {
 		let tap = AccountProvider::transient_provider();
-		let addr = tap.insert_account("0".sha3().into(), "0").unwrap();
+		let addr = tap.insert_account(keccak("0").into(), "0").unwrap();
 
 		let mut parent_header: Header = Header::default();
 		parent_header.set_seal(vec![encode(&0usize).into_vec()]);
@@ -968,17 +1472,16 @@ mod tests {
 		// Two validators.
 		// Spec starts with step 2.
 		header.set_seal(vec![encode(&1usize).into_vec(), encode(&(&*signature as &[u8])).into_vec()]);
-		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
-		assert!(engine.verify_block_external(&header, None).is_ok());
+		assert!(engine.verify_block_family(&header, &parent_header).is_ok());
+		assert!(engine.verify_block_external(&header).is_ok());
 		header.set_seal(vec![encode(&5usize).into_vec(), encode(&(&*signature as &[u8])).into_vec()]);
-		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
-		assert!(engine.verify_block_external(&header, None).is_err());
+		assert!(engine.verify_block_basic(&header).is_err());
 	}
 
 	#[test]
 	fn rejects_step_backwards() {
 		let tap = AccountProvider::transient_provider();
-		let addr = tap.insert_account("0".sha3().into(), "0").unwrap();
+		let addr = tap.insert_account(keccak("0").into(), "0").unwrap();
 
 		let mut parent_header: Header = Header::default();
 		parent_header.set_seal(vec![encode(&4usize).into_vec()]);
@@ -994,27 +1497,33 @@ mod tests {
 		// Two validators.
 		// Spec starts with step 2.
 		header.set_seal(vec![encode(&5usize).into_vec(), encode(&(&*signature as &[u8])).into_vec()]);
-		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
+		assert!(engine.verify_block_family(&header, &parent_header).is_ok());
 		header.set_seal(vec![encode(&3usize).into_vec(), encode(&(&*signature as &[u8])).into_vec()]);
-		assert!(engine.verify_block_family(&header, &parent_header, None).is_err());
+		assert!(engine.verify_block_family(&header, &parent_header).is_err());
 	}
 
 	#[test]
 	fn reports_skipped() {
 		let last_benign = Arc::new(AtomicUsize::new(0));
 		let params = AuthorityRoundParams {
-			step_duration: Default::default(),
+			step_duration: 1,
 			start_step: Some(1),
 			validators: Box::new(TestSet::new(Default::default(), last_benign.clone())),
 			validate_score_transition: 0,
 			validate_step_transition: 0,
 			immediate_transitions: true,
+			maximum_uncle_count_transition: 0,
+			maximum_uncle_count: 0,
+			empty_steps_transition: u64::max_value(),
+			maximum_empty_steps: 0,
+			block_reward: Default::default(),
 		};
 
 		let aura = {
 			let mut c_params = ::spec::CommonParams::default();
 			c_params.gas_limit_bound_divisor = 5.into();
-			AuthorityRound::new(c_params, params, Default::default()).unwrap()
+			let machine = ::machine::EthereumMachine::regular(c_params, Default::default());
+			AuthorityRound::new(params, machine).unwrap()
 		};
 
 		let mut parent_header: Header = Header::default();
@@ -1026,12 +1535,359 @@ mod tests {
 		header.set_seal(vec![encode(&3usize).into_vec()]);
 
 		// Do not report when signer not present.
-		assert!(aura.verify_block_family(&header, &parent_header, None).is_ok());
+		assert!(aura.verify_block_family(&header, &parent_header).is_ok());
 		assert_eq!(last_benign.load(AtomicOrdering::SeqCst), 0);
 
 		aura.set_signer(Arc::new(AccountProvider::transient_provider()), Default::default(), Default::default());
 
-		assert!(aura.verify_block_family(&header, &parent_header, None).is_ok());
+		assert!(aura.verify_block_family(&header, &parent_header).is_ok());
 		assert_eq!(last_benign.load(AtomicOrdering::SeqCst), 1);
 	}
+
+	#[test]
+	fn test_uncles_transition() {
+		let last_benign = Arc::new(AtomicUsize::new(0));
+		let params = AuthorityRoundParams {
+			step_duration: 1,
+			start_step: Some(1),
+			validators: Box::new(TestSet::new(Default::default(), last_benign.clone())),
+			validate_score_transition: 0,
+			validate_step_transition: 0,
+			immediate_transitions: true,
+			maximum_uncle_count_transition: 1,
+			maximum_uncle_count: 0,
+			empty_steps_transition: u64::max_value(),
+			maximum_empty_steps: 0,
+			block_reward: Default::default(),
+		};
+
+		let aura = {
+			let mut c_params = ::spec::CommonParams::default();
+			c_params.gas_limit_bound_divisor = 5.into();
+			let machine = ::machine::EthereumMachine::regular(c_params, Default::default());
+			AuthorityRound::new(params, machine).unwrap()
+		};
+
+		assert_eq!(aura.maximum_uncle_count(0), 2);
+		assert_eq!(aura.maximum_uncle_count(1), 0);
+		assert_eq!(aura.maximum_uncle_count(100), 0);
+	}
+
+    #[test]
+    #[should_panic(expected="counter is too high")]
+    fn test_counter_increment_too_high() {
+        use super::Step;
+        let step = Step {
+            calibrate: false,
+            inner: AtomicUsize::new(::std::usize::MAX),
+            duration: 1,
+        };
+        step.increment();
+	}
+
+	#[test]
+	#[should_panic(expected="counter is too high")]
+	fn test_counter_duration_remaining_too_high() {
+		use super::Step;
+		let step = Step {
+			calibrate: false,
+			inner: AtomicUsize::new(::std::usize::MAX),
+			duration: 1,
+		};
+		step.duration_remaining();
+	}
+
+	#[test]
+	#[should_panic(expected="authority_round: step duration can't be zero")]
+	fn test_step_duration_zero() {
+		let last_benign = Arc::new(AtomicUsize::new(0));
+		let params = AuthorityRoundParams {
+			step_duration: 0,
+			start_step: Some(1),
+			validators: Box::new(TestSet::new(Default::default(), last_benign.clone())),
+			validate_score_transition: 0,
+			validate_step_transition: 0,
+			immediate_transitions: true,
+			maximum_uncle_count_transition: 0,
+			maximum_uncle_count: 0,
+			empty_steps_transition: u64::max_value(),
+			maximum_empty_steps: 0,
+			block_reward: Default::default(),
+		};
+
+		let mut c_params = ::spec::CommonParams::default();
+		c_params.gas_limit_bound_divisor = 5.into();
+		let machine = ::machine::EthereumMachine::regular(c_params, Default::default());
+		AuthorityRound::new(params, machine).unwrap();
+	}
+
+	fn setup_empty_steps() -> (Spec, Arc<AccountProvider>, Vec<Address>) {
+		let spec = Spec::new_test_round_empty_steps();
+		let tap = Arc::new(AccountProvider::transient_provider());
+
+		let addr1 = tap.insert_account(keccak("1").into(), "1").unwrap();
+		let addr2 = tap.insert_account(keccak("0").into(), "0").unwrap();
+
+		let accounts = vec![addr1, addr2];
+
+		(spec, tap, accounts)
+	}
+
+	fn empty_step(engine: &EthEngine, step: usize, parent_hash: &H256) -> EmptyStep {
+		let empty_step_rlp = super::empty_step_rlp(step, parent_hash);
+		let signature = engine.sign(keccak(&empty_step_rlp)).unwrap().into();
+		let parent_hash = parent_hash.clone();
+		EmptyStep { step, signature, parent_hash }
+	}
+
+	fn sealed_empty_step(engine: &EthEngine, step: usize, parent_hash: &H256) -> SealedEmptyStep {
+		let empty_step_rlp = super::empty_step_rlp(step, parent_hash);
+		let signature = engine.sign(keccak(&empty_step_rlp)).unwrap().into();
+		SealedEmptyStep { signature, step }
+	}
+
+	#[test]
+	fn broadcast_empty_step_message() {
+		let (spec, tap, accounts) = setup_empty_steps();
+
+		let addr1 = accounts[0];
+
+		let engine = &*spec.engine;
+		let genesis_header = spec.genesis_header();
+		let db1 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+
+		let last_hashes = Arc::new(vec![genesis_header.hash()]);
+		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false).unwrap();
+		let b1 = b1.close_and_lock();
+
+		let client = generate_dummy_client(0);
+		let notify = Arc::new(TestNotify::default());
+		client.add_notify(notify.clone());
+		engine.register_client(Arc::downgrade(&client) as _);
+
+		engine.set_signer(tap.clone(), addr1, "1".into());
+
+		// the block is empty so we don't seal and instead broadcast an empty step message
+		assert_eq!(engine.generate_seal(b1.block(), &genesis_header), Seal::None);
+
+		// spec starts with step 2
+		let empty_step_rlp = encode(&empty_step(engine, 2, &genesis_header.hash())).into_vec();
+
+		// we've received the message
+		assert!(notify.messages.read().contains(&empty_step_rlp));
+	}
+
+	#[test]
+	fn seal_with_empty_steps() {
+		let (spec, tap, accounts) = setup_empty_steps();
+
+		let addr1 = accounts[0];
+		let addr2 = accounts[1];
+
+		let engine = &*spec.engine;
+		let genesis_header = spec.genesis_header();
+		let db1 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+		let db2 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+
+		let last_hashes = Arc::new(vec![genesis_header.hash()]);
+
+		// step 2
+		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false).unwrap();
+		let b1 = b1.close_and_lock();
+
+		// since the block is empty it isn't sealed and we generate empty steps
+		engine.set_signer(tap.clone(), addr1, "1".into());
+		assert_eq!(engine.generate_seal(b1.block(), &genesis_header), Seal::None);
+		engine.step();
+
+		// step 3
+		let mut b2 = OpenBlock::new(engine, Default::default(), false, db2, &genesis_header, last_hashes.clone(), addr2, (3141562.into(), 31415620.into()), vec![], false).unwrap();
+		b2.push_transaction(Transaction {
+			action: Action::Create,
+			nonce: U256::from(0),
+			gas_price: U256::from(3000),
+			gas: U256::from(53_000),
+			value: U256::from(1),
+			data: vec![],
+		}.fake_sign(addr2), None).unwrap();
+		let b2 = b2.close_and_lock();
+
+		// we will now seal a block with 1tx and include the accumulated empty step message
+		engine.set_signer(tap.clone(), addr2, "0".into());
+		if let Seal::Regular(seal) = engine.generate_seal(b2.block(), &genesis_header) {
+			engine.set_signer(tap.clone(), addr1, "1".into());
+			let empty_step2 = sealed_empty_step(engine, 2, &genesis_header.hash());
+			let empty_steps = ::rlp::encode_list(&vec![empty_step2]);
+
+			assert_eq!(seal[0], encode(&3usize).into_vec());
+			assert_eq!(seal[2], empty_steps.into_vec());
+		}
+	}
+
+	#[test]
+	fn seal_empty_block_with_empty_steps() {
+		let (spec, tap, accounts) = setup_empty_steps();
+
+		let addr1 = accounts[0];
+		let addr2 = accounts[1];
+
+		let engine = &*spec.engine;
+		let genesis_header = spec.genesis_header();
+		let db1 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+		let db2 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+		let db3 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+
+		let last_hashes = Arc::new(vec![genesis_header.hash()]);
+
+		// step 2
+		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false).unwrap();
+		let b1 = b1.close_and_lock();
+
+		// since the block is empty it isn't sealed and we generate empty steps
+		engine.set_signer(tap.clone(), addr1, "1".into());
+		assert_eq!(engine.generate_seal(b1.block(), &genesis_header), Seal::None);
+		engine.step();
+
+		// step 3
+		let b2 = OpenBlock::new(engine, Default::default(), false, db2, &genesis_header, last_hashes.clone(), addr2, (3141562.into(), 31415620.into()), vec![], false).unwrap();
+		let b2 = b2.close_and_lock();
+		engine.set_signer(tap.clone(), addr2, "0".into());
+		assert_eq!(engine.generate_seal(b2.block(), &genesis_header), Seal::None);
+		engine.step();
+
+		// step 4
+		// the spec sets the maximum_empty_steps to 2 so we will now seal an empty block and include the empty step messages
+		let b3 = OpenBlock::new(engine, Default::default(), false, db3, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false).unwrap();
+		let b3 = b3.close_and_lock();
+
+		engine.set_signer(tap.clone(), addr1, "1".into());
+		if let Seal::Regular(seal) = engine.generate_seal(b3.block(), &genesis_header) {
+			let empty_step2 = sealed_empty_step(engine, 2, &genesis_header.hash());
+			engine.set_signer(tap.clone(), addr2, "0".into());
+			let empty_step3 = sealed_empty_step(engine, 3, &genesis_header.hash());
+
+			let empty_steps = ::rlp::encode_list(&vec![empty_step2, empty_step3]);
+
+			assert_eq!(seal[0], encode(&4usize).into_vec());
+			assert_eq!(seal[2], empty_steps.into_vec());
+		}
+	}
+
+	#[test]
+	fn reward_empty_steps() {
+		let (spec, tap, accounts) = setup_empty_steps();
+
+		let addr1 = accounts[0];
+
+		let engine = &*spec.engine;
+		let genesis_header = spec.genesis_header();
+		let db1 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+		let db2 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+
+		let last_hashes = Arc::new(vec![genesis_header.hash()]);
+
+		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_test_round_empty_steps, None);
+		engine.register_client(Arc::downgrade(&client) as _);
+
+		// step 2
+		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false).unwrap();
+		let b1 = b1.close_and_lock();
+
+		// since the block is empty it isn't sealed and we generate empty steps
+		engine.set_signer(tap.clone(), addr1, "1".into());
+		assert_eq!(engine.generate_seal(b1.block(), &genesis_header), Seal::None);
+		engine.step();
+
+		// step 3
+		// the signer of the accumulated empty step message should be rewarded
+		let b2 = OpenBlock::new(engine, Default::default(), false, db2, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false).unwrap();
+		let addr1_balance = b2.block().state().balance(&addr1).unwrap();
+
+		// after closing the block `addr1` should be reward twice, one for the included empty step message and another for block creation
+		let b2 = b2.close_and_lock();
+
+		// the spec sets the block reward to 10
+		assert_eq!(b2.block().state().balance(&addr1).unwrap(), addr1_balance + (10 * 2).into())
+	}
+
+	#[test]
+	fn verify_seal_empty_steps() {
+		let (spec, tap, accounts) = setup_empty_steps();
+		let addr1 = accounts[0];
+		let addr2 = accounts[1];
+		let engine = &*spec.engine;
+
+		let mut parent_header: Header = Header::default();
+		parent_header.set_seal(vec![encode(&0usize).into_vec()]);
+		parent_header.set_gas_limit("222222".parse::<U256>().unwrap());
+
+		let mut header: Header = Header::default();
+		header.set_parent_hash(parent_header.hash());
+		header.set_number(1);
+		header.set_gas_limit("222222".parse::<U256>().unwrap());
+		header.set_author(addr1);
+
+		let signature = tap.sign(addr1, Some("1".into()), header.bare_hash()).unwrap();
+
+		// empty step with invalid step
+		let empty_steps = vec![SealedEmptyStep { signature: 0.into(), step: 2 }];
+		header.set_seal(vec![
+			encode(&2usize).into_vec(),
+			encode(&(&*signature as &[u8])).into_vec(),
+			::rlp::encode_list(&empty_steps).into_vec(),
+		]);
+
+		assert!(match engine.verify_block_family(&header, &parent_header) {
+			Err(Error::Engine(EngineError::InsufficientProof(ref s)))
+				if s.contains("invalid step") => true,
+			_ => false,
+		});
+
+		// empty step with invalid signature
+		let empty_steps = vec![SealedEmptyStep { signature: 0.into(), step: 1 }];
+		header.set_seal(vec![
+			encode(&2usize).into_vec(),
+			encode(&(&*signature as &[u8])).into_vec(),
+			::rlp::encode_list(&empty_steps).into_vec(),
+		]);
+
+		assert!(match engine.verify_block_family(&header, &parent_header) {
+			Err(Error::Engine(EngineError::InsufficientProof(ref s)))
+				if s.contains("invalid empty step proof") => true,
+			_ => false,
+		});
+
+		// empty step with valid signature from incorrect proposer for step
+		engine.set_signer(tap.clone(), addr1, "1".into());
+		let empty_steps = vec![sealed_empty_step(engine, 1, &parent_header.hash())];
+		header.set_seal(vec![
+			encode(&2usize).into_vec(),
+			encode(&(&*signature as &[u8])).into_vec(),
+			::rlp::encode_list(&empty_steps).into_vec(),
+		]);
+
+		assert!(match engine.verify_block_family(&header, &parent_header) {
+			Err(Error::Engine(EngineError::InsufficientProof(ref s)))
+				if s.contains("invalid empty step proof") => true,
+			_ => false,
+		});
+
+		// valid empty steps
+		engine.set_signer(tap.clone(), addr1, "1".into());
+		let empty_step2 = sealed_empty_step(engine, 2, &parent_header.hash());
+		engine.set_signer(tap.clone(), addr2, "0".into());
+		let empty_step3 = sealed_empty_step(engine, 3, &parent_header.hash());
+
+		let empty_steps = vec![empty_step2, empty_step3];
+		header.set_seal(vec![
+			encode(&4usize).into_vec(),
+			encode(&(&*signature as &[u8])).into_vec(),
+			::rlp::encode_list(&empty_steps).into_vec(),
+		]);
+
+		assert!(match engine.verify_block_family(&header, &parent_header) {
+			Ok(_) => true,
+			_ => false,
+		});
+	}
 }
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index 5d6a44fc5b678f70e92fc0719214bb7d4e7877f5..4d1f38dce4cbb770e4302da6bc3b471e6c74ca67 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -17,20 +17,17 @@
 //! A blockchain engine that supports a basic, non-BFT proof-of-authority.
 
 use std::sync::{Weak, Arc};
-use std::collections::BTreeMap;
-use std::cmp;
-use util::*;
+use ethereum_types::{H256, H520, Address};
+use parking_lot::RwLock;
 use ethkey::{recover, public_to_address, Signature};
 use account_provider::AccountProvider;
 use block::*;
-use builtin::Builtin;
-use spec::CommonParams;
-use engines::{Engine, Seal, Call, ConstructedVerifier, EngineError};
+use engines::{Engine, Seal, ConstructedVerifier, EngineError};
 use error::{BlockError, Error};
-use evm::Schedule;
 use ethjson;
-use header::{Header, BlockNumber};
-use client::Client;
+use header::Header;
+use client::EngineClient;
+use machine::{AuxiliaryData, Call, EthereumMachine};
 use super::signer::EngineSigner;
 use super::validator_set::{ValidatorSet, SimpleList, new_validator_set};
 
@@ -53,7 +50,7 @@ struct EpochVerifier {
 	list: SimpleList,
 }
 
-impl super::EpochVerifier for EpochVerifier {
+impl super::EpochVerifier<EthereumMachine> for EpochVerifier {
 	fn verify_light(&self, header: &Header) -> Result<(), Error> {
 		verify_external(header, &self.list)
 	}
@@ -78,59 +75,36 @@ fn verify_external(header: &Header, validators: &ValidatorSet) -> Result<(), Err
 
 /// Engine using `BasicAuthority`, trivial proof-of-authority consensus.
 pub struct BasicAuthority {
-	params: CommonParams,
-	builtins: BTreeMap<Address, Builtin>,
+	machine: EthereumMachine,
 	signer: RwLock<EngineSigner>,
 	validators: Box<ValidatorSet>,
 }
 
 impl BasicAuthority {
 	/// Create a new instance of BasicAuthority engine
-	pub fn new(params: CommonParams, our_params: BasicAuthorityParams, builtins: BTreeMap<Address, Builtin>) -> Self {
+	pub fn new(our_params: BasicAuthorityParams, machine: EthereumMachine) -> Self {
 		BasicAuthority {
-			params: params,
-			builtins: builtins,
-			validators: new_validator_set(our_params.validators),
+			machine: machine,
 			signer: Default::default(),
+			validators: new_validator_set(our_params.validators),
 		}
 	}
 }
 
-impl Engine for BasicAuthority {
+impl Engine<EthereumMachine> for BasicAuthority {
 	fn name(&self) -> &str { "BasicAuthority" }
-	fn version(&self) -> SemanticVersion { SemanticVersion::new(1, 0, 0) }
-	// One field - the signature
-	fn seal_fields(&self) -> usize { 1 }
-
-	fn params(&self) -> &CommonParams { &self.params }
-	fn builtins(&self) -> &BTreeMap<Address, Builtin> { &self.builtins }
 
-	/// Additional engine-specific information for the user/developer concerning `header`.
-	fn extra_info(&self, _header: &Header) -> BTreeMap<String, String> { map!["signature".to_owned() => "TODO".to_owned()] }
+	fn machine(&self) -> &EthereumMachine { &self.machine }
 
-	fn schedule(&self, _block_number: BlockNumber) -> Schedule {
-		Schedule::new_homestead()
-	}
-
-	fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, _gas_ceil_target: U256) {
-		header.set_difficulty(parent.difficulty().clone());
-		header.set_gas_limit({
-			let gas_limit = parent.gas_limit().clone();
-			let bound_divisor = self.params().gas_limit_bound_divisor;
-			if gas_limit < gas_floor_target {
-				cmp::min(gas_floor_target, gas_limit + gas_limit / bound_divisor - 1.into())
-			} else {
-				cmp::max(gas_floor_target, gas_limit - gas_limit / bound_divisor + 1.into())
-			}
-		});
-	}
+	// One field - the signature
+	fn seal_fields(&self, _header: &Header) -> usize { 1 }
 
 	fn seals_internally(&self) -> Option<bool> {
 		Some(self.signer.read().is_some())
 	}
 
 	/// Attempt to seal the block internally.
-	fn generate_seal(&self, block: &ExecutedBlock) -> Seal {
+	fn generate_seal(&self, block: &ExecutedBlock, _parent: &Header) -> Seal {
 		let header = block.header();
 		let author = header.author();
 		if self.validators.contains(header.parent_hash(), author) {
@@ -144,41 +118,11 @@ impl Engine for BasicAuthority {
 		Seal::None
 	}
 
-	fn verify_block_basic(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
-		// check the seal fields.
-		// TODO: pull this out into common code.
-		if header.seal().len() != self.seal_fields() {
-			return Err(From::from(BlockError::InvalidSealArity(
-				Mismatch { expected: self.seal_fields(), found: header.seal().len() }
-			)));
-		}
-		Ok(())
-	}
-
-	fn verify_block_unordered(&self, _header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
+	fn verify_local_seal(&self, _header: &Header) -> Result<(), Error> {
 		Ok(())
 	}
 
-	fn verify_block_family(&self, header: &Header, parent: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
-		// Do not calculate difficulty for genesis blocks.
-		if header.number() == 0 {
-			return Err(From::from(BlockError::RidiculousNumber(OutOfBounds { min: Some(1), max: None, found: header.number() })));
-		}
-
-		// Check difficulty is correct given the two timestamps.
-		if header.difficulty() != parent.difficulty() {
-			return Err(From::from(BlockError::InvalidDifficulty(Mismatch { expected: *parent.difficulty(), found: *header.difficulty() })))
-		}
-		let gas_limit_divisor = self.params().gas_limit_bound_divisor;
-		let min_gas = parent.gas_limit().clone() - parent.gas_limit().clone() / gas_limit_divisor;
-		let max_gas = parent.gas_limit().clone() + parent.gas_limit().clone() / gas_limit_divisor;
-		if header.gas_limit() <= &min_gas || header.gas_limit() >= &max_gas {
-			return Err(From::from(BlockError::InvalidGasLimit(OutOfBounds { min: Some(min_gas), max: Some(max_gas), found: header.gas_limit().clone() })));
-		}
-		Ok(())
-	}
-
-	fn verify_block_external(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
+	fn verify_block_external(&self, header: &Header) -> Result<(), Error> {
 		verify_external(header, &*self.validators)
 	}
 
@@ -187,26 +131,26 @@ impl Engine for BasicAuthority {
 	}
 
 	#[cfg(not(test))]
-	fn signals_epoch_end(&self, _header: &Header, _block: Option<&[u8]>, _receipts: Option<&[::receipt::Receipt]>)
-		-> super::EpochChange
+	fn signals_epoch_end(&self, _header: &Header, _auxiliary: AuxiliaryData)
+		-> super::EpochChange<EthereumMachine>
 	{
 		// don't bother signalling even though a contract might try.
 		super::EpochChange::No
 	}
 
 	#[cfg(test)]
-	fn signals_epoch_end(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
-		-> super::EpochChange
+	fn signals_epoch_end(&self, header: &Header, auxiliary: AuxiliaryData)
+		-> super::EpochChange<EthereumMachine>
 	{
 		// in test mode, always signal even though they don't be finalized.
 		let first = header.number() == 0;
-		self.validators.signals_epoch_end(first, header, block, receipts)
+		self.validators.signals_epoch_end(first, header, auxiliary)
 	}
 
 	fn is_epoch_end(
 		&self,
 		chain_head: &Header,
-		_chain: &super::Headers,
+		_chain: &super::Headers<Header>,
 		_transition_store: &super::PendingTransitionStore,
 	) -> Option<Vec<u8>> {
 		let first = chain_head.number() == 0;
@@ -215,10 +159,10 @@ impl Engine for BasicAuthority {
 		self.validators.is_epoch_end(first, chain_head)
 	}
 
-	fn epoch_verifier<'a>(&self, header: &Header, proof: &'a [u8]) -> ConstructedVerifier<'a> {
+	fn epoch_verifier<'a>(&self, header: &Header, proof: &'a [u8]) -> ConstructedVerifier<'a, EthereumMachine> {
 		let first = header.number() == 0;
 
-		match self.validators.epoch_set(first, self, header.number(), proof) {
+		match self.validators.epoch_set(first, &self.machine, header.number(), proof) {
 			Ok((list, finalize)) => {
 				let verifier = Box::new(EpochVerifier { list: list });
 
@@ -232,8 +176,8 @@ impl Engine for BasicAuthority {
 		}
 	}
 
-	fn register_client(&self, client: Weak<Client>) {
-		self.validators.register_contract(client);
+	fn register_client(&self, client: Weak<EngineClient>) {
+		self.validators.register_client(client);
 	}
 
 	fn set_signer(&self, ap: Arc<AccountProvider>, address: Address, password: String) {
@@ -252,26 +196,27 @@ impl Engine for BasicAuthority {
 #[cfg(test)]
 mod tests {
 	use std::sync::Arc;
-	use util::*;
+	use hash::keccak;
+	use ethereum_types::H520;
 	use block::*;
-	use error::{BlockError, Error};
-	use tests::helpers::*;
+	use tests::helpers::get_temp_state_db;
 	use account_provider::AccountProvider;
 	use header::Header;
 	use spec::Spec;
 	use engines::Seal;
+	use tempdir::TempDir;
 
 	/// Create a new test chain spec with `BasicAuthority` consensus engine.
 	fn new_test_authority() -> Spec {
 		let bytes: &[u8] = include_bytes!("../../res/basic_authority.json");
-		Spec::load(::std::env::temp_dir(), bytes).expect("invalid chain spec")
+		let tempdir = TempDir::new("").unwrap();
+		Spec::load(&tempdir.path(), bytes).expect("invalid chain spec")
 	}
 
 	#[test]
 	fn has_valid_metadata() {
 		let engine = new_test_authority().engine;
 		assert!(!engine.name().is_empty());
-		assert!(engine.version().major >= 1);
 	}
 
 	#[test]
@@ -281,34 +226,20 @@ mod tests {
 		assert!(schedule.stack_limit > 0);
 	}
 
-	#[test]
-	fn can_do_seal_verification_fail() {
-		let engine = new_test_authority().engine;
-		let header: Header = Header::default();
-
-		let verify_result = engine.verify_block_basic(&header, None);
-
-		match verify_result {
-			Err(Error::Block(BlockError::InvalidSealArity(_))) => {},
-			Err(_) => { panic!("should be block seal-arity mismatch error (got {:?})", verify_result); },
-			_ => { panic!("Should be error, got Ok"); },
-		}
-	}
-
 	#[test]
 	fn can_do_signature_verification_fail() {
 		let engine = new_test_authority().engine;
 		let mut header: Header = Header::default();
 		header.set_seal(vec![::rlp::encode(&H520::default()).into_vec()]);
 
-		let verify_result = engine.verify_block_family(&header, &Default::default(), None);
+		let verify_result = engine.verify_block_external(&header);
 		assert!(verify_result.is_err());
 	}
 
 	#[test]
 	fn can_generate_seal() {
 		let tap = AccountProvider::transient_provider();
-		let addr = tap.insert_account("".sha3().into(), "").unwrap();
+		let addr = tap.insert_account(keccak("").into(), "").unwrap();
 
 		let spec = new_test_authority();
 		let engine = &*spec.engine;
@@ -318,7 +249,7 @@ mod tests {
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, addr, (3141562.into(), 31415620.into()), vec![], false).unwrap();
 		let b = b.close_and_lock();
-		if let Seal::Regular(seal) = engine.generate_seal(b.block()) {
+		if let Seal::Regular(seal) = engine.generate_seal(b.block(), &genesis_header) {
 			assert!(b.try_seal(engine, seal).is_ok());
 		}
 	}
@@ -326,7 +257,7 @@ mod tests {
 	#[test]
 	fn seals_internally() {
 		let tap = AccountProvider::transient_provider();
-		let authority = tap.insert_account("".sha3().into(), "").unwrap();
+		let authority = tap.insert_account(keccak("").into(), "").unwrap();
 
 		let engine = new_test_authority().engine;
 		assert!(!engine.seals_internally().unwrap());
diff --git a/ethcore/src/engines/epoch.rs b/ethcore/src/engines/epoch.rs
index 586059e8387a73e7689d950c459e3b4fbe4fa408..dffc822cbf819dfbe4d6cf05953d911b63741a09 100644
--- a/ethcore/src/engines/epoch.rs
+++ b/ethcore/src/engines/epoch.rs
@@ -16,12 +16,12 @@
 
 //! Epoch verifiers and transitions.
 
-use util::H256;
-use error::Error;
-use header::Header;
+use ethereum_types::H256;
+
+use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
 
 /// A full epoch transition.
-#[derive(Debug, Clone, RlpEncodable, RlpDecodable)]
+#[derive(Debug, Clone)]
 pub struct Transition {
 	/// Block hash at which the transition occurred.
 	pub block_hash: H256,
@@ -31,24 +31,54 @@ pub struct Transition {
 	pub proof: Vec<u8>,
 }
 
+impl Encodable for Transition {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.begin_list(3)
+			.append(&self.block_hash)
+			.append(&self.block_number)
+			.append(&self.proof);
+	}
+}
+
+impl Decodable for Transition {
+	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+		Ok(Transition {
+			block_hash: rlp.val_at(0)?,
+			block_number: rlp.val_at(1)?,
+			proof: rlp.val_at(2)?,
+		})
+	}
+}
+
 /// An epoch transition pending a finality proof.
 /// Not all transitions need one.
-#[derive(RlpEncodableWrapper, RlpDecodableWrapper)]
 pub struct PendingTransition {
 	/// "transition/epoch" proof from the engine.
 	pub proof: Vec<u8>,
 }
 
+impl Encodable for PendingTransition {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.append(&self.proof);
+	}
+}
+
+impl Decodable for PendingTransition {
+	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+		Ok(PendingTransition {
+			proof: rlp.as_val()?,
+		})
+	}
+}
+
 /// Verifier for all blocks within an epoch with self-contained state.
-///
-/// See docs on `Engine` relating to proving functions for more details.
-pub trait EpochVerifier: Send + Sync {
+pub trait EpochVerifier<M: ::parity_machine::Machine>: Send + Sync {
 	/// Lightly verify the next block header.
 	/// This may not be a header belonging to a different epoch.
-	fn verify_light(&self, header: &Header) -> Result<(), Error>;
+	fn verify_light(&self, header: &M::Header) -> Result<(), M::Error>;
 
 	/// Perform potentially heavier checks on the next block header.
-	fn verify_heavy(&self, header: &Header) -> Result<(), Error> {
+	fn verify_heavy(&self, header: &M::Header) -> Result<(), M::Error> {
 		self.verify_light(header)
 	}
 
@@ -63,6 +93,6 @@ pub trait EpochVerifier: Send + Sync {
 /// Special "no-op" verifier for stateless, epoch-less engines.
 pub struct NoOp;
 
-impl EpochVerifier for NoOp {
-	fn verify_light(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
+impl<M: ::parity_machine::Machine> EpochVerifier<M> for NoOp {
+	fn verify_light(&self, _header: &M::Header) -> Result<(), M::Error> { Ok(()) }
 }
diff --git a/ethcore/src/engines/instant_seal.rs b/ethcore/src/engines/instant_seal.rs
index 976f815e04ed1b8fd22b183ccdba8ad58911627b..9c2600212d09c6ed9b4f7f6ac6dc982c11617f0e 100644
--- a/ethcore/src/engines/instant_seal.rs
+++ b/ethcore/src/engines/instant_seal.rs
@@ -14,58 +14,49 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::collections::{BTreeMap, HashMap};
-use util::Address;
-use builtin::Builtin;
 use engines::{Engine, Seal};
-use spec::CommonParams;
-use block::{ExecutedBlock, IsBlock};
+use parity_machine::{Machine, Transactions};
 
 /// An engine which does not provide any consensus mechanism, just seals blocks internally.
-pub struct InstantSeal {
-	params: CommonParams,
-	builtins: BTreeMap<Address, Builtin>,
+/// Only seals blocks which have transactions.
+pub struct InstantSeal<M> {
+	machine: M,
 }
 
-impl InstantSeal {
-	/// Returns new instance of InstantSeal with default VM Factory
-	pub fn new(params: CommonParams, builtins: BTreeMap<Address, Builtin>) -> Self {
+impl<M> InstantSeal<M> {
+	/// Returns new instance of InstantSeal over the given state machine.
+	pub fn new(machine: M) -> Self {
 		InstantSeal {
-			params: params,
-			builtins: builtins,
+			machine: machine,
 		}
 	}
 }
 
-impl Engine for InstantSeal {
+impl<M: Machine> Engine<M> for InstantSeal<M>
+	where M::LiveBlock: Transactions
+{
 	fn name(&self) -> &str {
 		"InstantSeal"
 	}
 
-	fn params(&self) -> &CommonParams {
-		&self.params
-	}
-
-	fn additional_params(&self) -> HashMap<String, String> {
-		hash_map!["registrar".to_owned() => self.params().registrar.hex()]
-	}
-
-	fn builtins(&self) -> &BTreeMap<Address, Builtin> {
-		&self.builtins
-	}
+	fn machine(&self) -> &M { &self.machine }
 
 	fn seals_internally(&self) -> Option<bool> { Some(true) }
 
-	fn generate_seal(&self, block: &ExecutedBlock) -> Seal {
+	fn generate_seal(&self, block: &M::LiveBlock, _parent: &M::Header) -> Seal {
 		if block.transactions().is_empty() { Seal::None } else { Seal::Regular(Vec::new()) }
 	}
+
+	fn verify_local_seal(&self, _header: &M::Header) -> Result<(), M::Error> {
+		Ok(())
+	}
 }
 
 #[cfg(test)]
 mod tests {
 	use std::sync::Arc;
-	use util::*;
-	use tests::helpers::*;
+	use ethereum_types::{H520, Address};
+	use tests::helpers::{get_temp_state_db};
 	use spec::Spec;
 	use header::Header;
 	use block::*;
@@ -80,7 +71,7 @@ mod tests {
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::default(), (3141562.into(), 31415620.into()), vec![], false).unwrap();
 		let b = b.close_and_lock();
-		if let Seal::Regular(seal) = engine.generate_seal(b.block()) {
+		if let Seal::Regular(seal) = engine.generate_seal(b.block(), &genesis_header) {
 			assert!(b.try_seal(engine, seal).is_ok());
 		}
 	}
@@ -90,10 +81,10 @@ mod tests {
 		let engine = Spec::new_instant().engine;
 		let mut header: Header = Header::default();
 
-		assert!(engine.verify_block_basic(&header, None).is_ok());
+		assert!(engine.verify_block_basic(&header).is_ok());
 
 		header.set_seal(vec![::rlp::encode(&H520::default()).into_vec()]);
 
-		assert!(engine.verify_block_unordered(&header, None).is_ok());
+		assert!(engine.verify_block_unordered(&header).is_ok());
 	}
 }
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index 00f3223180863b764a0c2f5b400d01f75b427fce..5b2b9abb0e06c7337aaa8c2effadce73003571e6 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -42,23 +42,23 @@ use std::fmt;
 use self::epoch::PendingTransition;
 
 use account_provider::AccountProvider;
-use block::ExecutedBlock;
 use builtin::Builtin;
-use client::Client;
-use vm::{EnvInfo, LastHashes, Schedule, CreateContractAddress};
+use vm::{EnvInfo, Schedule, CreateContractAddress};
 use error::Error;
 use header::{Header, BlockNumber};
-use receipt::Receipt;
 use snapshot::SnapshotComponents;
 use spec::CommonParams;
 use transaction::{UnverifiedTransaction, SignedTransaction};
 
 use ethkey::Signature;
-use util::*;
+use parity_machine::{Machine, LocalizedMachine as Localized};
+use ethereum_types::{H256, U256, Address};
+use unexpected::{Mismatch, OutOfBounds};
+use bytes::Bytes;
 
 /// Default EIP-210 contrat code.
-/// As defined in https://github.com/ethereum/EIPs/pull/210/commits/9df24a3714af42e3bf350265bdc75b486c909d7f#diff-e02a92c2fb96c1a1bfb05e4c6e2ef5daR49
-pub const DEFAULT_BLOCKHASH_CONTRACT: &'static str = "73fffffffffffffffffffffffffffffffffffffffe33141561007a57600143036020526000356101006020510755600061010060205107141561005057600035610100610100602051050761010001555b6000620100006020510714156100755760003561010062010000602051050761020001555b610161565b436000351215801561008c5780610095565b623567e0600035125b9050156100a757600060605260206060f35b610100600035430312156100ca57610100600035075460805260206080f3610160565b62010000600035430312156100e857600061010060003507146100eb565b60005b1561010d576101006101006000350507610100015460a052602060a0f361015f565b63010000006000354303121561012d576000620100006000350714610130565b60005b1561015357610100620100006000350507610200015460c052602060c0f361015e565b600060e052602060e0f35b5b5b5b5b";
+/// As defined in https://github.com/ethereum/EIPs/pull/210
+pub const DEFAULT_BLOCKHASH_CONTRACT: &'static str = "73fffffffffffffffffffffffffffffffffffffffe33141561006a5760014303600035610100820755610100810715156100455760003561010061010083050761010001555b6201000081071515610064576000356101006201000083050761020001555b5061013e565b4360003512151561008457600060405260206040f361013d565b61010060003543031315156100a857610100600035075460605260206060f361013c565b6101006000350715156100c55762010000600035430313156100c8565b60005b156100ea576101006101006000350507610100015460805260206080f361013b565b620100006000350715156101095763010000006000354303131561010c565b60005b1561012f57610100620100006000350507610200015460a052602060a0f361013a565b600060c052602060c0f35b5b5b5b5b";
 
 /// Voting errors.
 #[derive(Debug)]
@@ -77,6 +77,8 @@ pub enum EngineError {
 	InsufficientProof(String),
 	/// Failed system call.
 	FailedSystemCall(String),
+	/// Malformed consensus message.
+	MalformedMessage(String),
 	/// Requires client ref, but none registered.
 	RequiresClient,
 }
@@ -92,6 +94,7 @@ impl fmt::Display for EngineError {
 			BadSealFieldSize(ref oob) => format!("Seal field has an unexpected length: {}", oob),
 			InsufficientProof(ref msg) => format!("Insufficient validation proof: {}", msg),
 			FailedSystemCall(ref msg) => format!("Failed to make system call: {}", msg),
+			MalformedMessage(ref msg) => format!("Received malformed consensus message: {}", msg),
 			RequiresClient => format!("Call requires client but none registered"),
 		};
 
@@ -110,39 +113,46 @@ pub enum Seal {
 	None,
 }
 
-/// Type alias for a function we can make calls through synchronously.
-/// Returns the call result and state proof for each call.
-pub type Call<'a> = Fn(Address, Bytes) -> Result<(Bytes, Vec<Vec<u8>>), String> + 'a;
-
 /// Type alias for a function we can get headers by hash through.
-pub type Headers<'a> = Fn(H256) -> Option<Header> + 'a;
+pub type Headers<'a, H> = Fn(H256) -> Option<H> + 'a;
 
 /// Type alias for a function we can query pending transitions by block hash through.
 pub type PendingTransitionStore<'a> = Fn(H256) -> Option<PendingTransition> + 'a;
 
+/// Proof dependent on state.
+pub trait StateDependentProof<M: Machine>: Send + Sync {
+	/// Generate a proof, given the state.
+	// TODO: make this into an &M::StateContext
+	fn generate_proof<'a>(&self, state: &<M as Localized<'a>>::StateContext) -> Result<Vec<u8>, String>;
+	/// Check a proof generated elsewhere (potentially by a peer).
+	// `engine` needed to check state proofs, while really this should
+	// just be state machine params.
+	fn check_proof(&self, machine: &M, proof: &[u8]) -> Result<(), String>;
+}
+
 /// Proof generated on epoch change.
-pub enum Proof {
-	/// Known proof (exctracted from signal)
+pub enum Proof<M: Machine> {
+	/// Known proof (extracted from signal)
 	Known(Vec<u8>),
-	/// Extract proof from caller.
-	WithState(Box<Fn(&Call) -> Result<Vec<u8>, String>>),
+	/// State dependent proof.
+	WithState(Arc<StateDependentProof<M>>),
 }
 
 /// Generated epoch verifier.
-pub enum ConstructedVerifier<'a> {
+pub enum ConstructedVerifier<'a, M: Machine> {
 	/// Fully trusted verifier.
-	Trusted(Box<EpochVerifier>),
+	Trusted(Box<EpochVerifier<M>>),
 	/// Verifier unconfirmed. Check whether given finality proof finalizes given hash
 	/// under previous epoch.
-	Unconfirmed(Box<EpochVerifier>, &'a [u8], H256),
+	Unconfirmed(Box<EpochVerifier<M>>, &'a [u8], H256),
 	/// Error constructing verifier.
 	Err(Error),
 }
 
-impl<'a> ConstructedVerifier<'a> {
+impl<'a, M: Machine> ConstructedVerifier<'a, M> {
 	/// Convert to a result, indicating that any necessary confirmation has been done
 	/// already.
-	pub fn known_confirmed(self) -> Result<Box<EpochVerifier>, Error> {
+	pub fn known_confirmed(self) -> Result<Box<EpochVerifier<M>>, Error> {
 		match self {
 			ConstructedVerifier::Trusted(v) | ConstructedVerifier::Unconfirmed(v, _, _) => Ok(v),
 			ConstructedVerifier::Err(e) => Err(e),
@@ -151,84 +161,49 @@ impl<'a> ConstructedVerifier<'a> {
 }
 
 /// Results of a query of whether an epoch change occurred at the given block.
-pub enum EpochChange {
+pub enum EpochChange<M: Machine> {
 	/// Cannot determine until more data is passed.
-	Unsure(Unsure),
+	Unsure(M::AuxiliaryRequest),
 	/// No epoch change.
 	No,
 	/// The epoch will change, with proof.
-	Yes(Proof),
-}
-
-/// More data required to determine if an epoch change occurred at a given block.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum Unsure {
-	/// Needs the body.
-	NeedsBody,
-	/// Needs the receipts.
-	NeedsReceipts,
-	/// Needs both body and receipts.
-	NeedsBoth,
+	Yes(Proof<M>),
 }
 
 /// A consensus mechanism for the chain. Generally either proof-of-work or proof-of-stake-based.
 /// Provides hooks into each of the major parts of block import.
-pub trait Engine : Sync + Send {
+pub trait Engine<M: Machine>: Sync + Send {
 	/// The name of this engine.
 	fn name(&self) -> &str;
-	/// The version of this engine. Should be of the form
-	fn version(&self) -> SemanticVersion { SemanticVersion::new(0, 0, 0) }
+
+	/// Get access to the underlying state machine.
+	// TODO: decouple.
+	fn machine(&self) -> &M;
 
 	/// The number of additional header fields required for this engine.
-	fn seal_fields(&self) -> usize { 0 }
+	fn seal_fields(&self, _header: &M::Header) -> usize { 0 }
 
 	/// Additional engine-specific information for the user/developer concerning `header`.
-	fn extra_info(&self, _header: &Header) -> BTreeMap<String, String> { BTreeMap::new() }
+	fn extra_info(&self, _header: &M::Header) -> BTreeMap<String, String> { BTreeMap::new() }
 
-	/// Additional information.
-	fn additional_params(&self) -> HashMap<String, String> { HashMap::new() }
-
-	/// Get the general parameters of the chain.
-	fn params(&self) -> &CommonParams;
-
-	/// Get the EVM schedule for the given `block_number`.
-	fn schedule(&self, block_number: BlockNumber) -> Schedule {
-		self.params().schedule(block_number)
-	}
-
-	/// Builtin-contracts we would like to see in the chain.
-	/// (In principle these are just hints for the engine since that has the last word on them.)
-	fn builtins(&self) -> &BTreeMap<Address, Builtin>;
-
-	/// Some intrinsic operation parameters; by default they take their value from the `spec()`'s `engine_params`.
-	fn maximum_extra_data_size(&self) -> usize { self.params().maximum_extra_data_size }
 	/// Maximum number of uncles a block is allowed to declare.
-	fn maximum_uncle_count(&self) -> usize { 2 }
+	fn maximum_uncle_count(&self, _block: BlockNumber) -> usize { 0 }
+
 	/// The number of generations back that uncles can be.
 	fn maximum_uncle_age(&self) -> usize { 6 }
-	/// The nonce with which accounts begin at given block.
-	fn account_start_nonce(&self, block: u64) -> U256 {
-		if block >= self.params().dust_protection_transition {
-			U256::from(self.params().nonce_cap_increment) * U256::from(block)
-		} else {
-			self.params().account_start_nonce
-		}
-	}
 
 	/// Block transformation functions, before the transactions.
 	/// `epoch_begin` set to true if this block kicks off an epoch.
 	fn on_new_block(
 		&self,
-		block: &mut ExecutedBlock,
-		last_hashes: Arc<LastHashes>,
+		_block: &mut M::LiveBlock,
 		_epoch_begin: bool,
-	) -> Result<(), Error> {
-		let parent_hash = block.fields().header.parent_hash().clone();
-		common::push_last_hash(block, last_hashes, self, &parent_hash)
+	) -> Result<(), M::Error> {
+		Ok(())
 	}
 
 	/// Block transformation functions, after the transactions.
-	fn on_close_block(&self, _block: &mut ExecutedBlock) -> Result<(), Error> {
+	fn on_close_block(&self, _block: &mut M::LiveBlock) -> Result<(), M::Error> {
 		Ok(())
 	}
 
@@ -236,68 +211,57 @@ pub trait Engine : Sync + Send {
 	/// Some(true) means the engine is currently prime for seal generation (i.e. node is the current validator).
 	/// Some(false) means that the node might seal internally but is not qualified now.
 	fn seals_internally(&self) -> Option<bool> { None }
+
 	/// Attempt to seal the block internally.
 	///
 	/// If `Some` is returned, then you get a valid seal.
 	///
 	/// This operation is synchronous and may (quite reasonably) not be available, in which None will
 	/// be returned.
-	fn generate_seal(&self, _block: &ExecutedBlock) -> Seal { Seal::None }
-
-	/// Phase 1 quick block verification. Only does checks that are cheap. `block` (the header's full block)
-	/// may be provided for additional checks. Returns either a null `Ok` or a general error detailing the problem with import.
-	fn verify_block_basic(&self, _header: &Header,  _block: Option<&[u8]>) -> Result<(), Error> { Ok(()) }
-
-	/// Phase 2 verification. Perform costly checks such as transaction signatures. `block` (the header's full block)
-	/// may be provided for additional checks. Returns either a null `Ok` or a general error detailing the problem with import.
-	fn verify_block_unordered(&self, _header: &Header, _block: Option<&[u8]>) -> Result<(), Error> { Ok(()) }
-
-	/// Phase 3 verification. Check block information against parent and uncles. `block` (the header's full block)
-	/// may be provided for additional checks. Returns either a null `Ok` or a general error detailing the problem with import.
-	fn verify_block_family(&self, _header: &Header, _parent: &Header, _block: Option<&[u8]>) -> Result<(), Error> { Ok(()) }
+	///
+	/// It is fine to require access to state or a full client for this function, since
+	/// light clients do not generate seals.
+	fn generate_seal(&self, _block: &M::LiveBlock, _parent: &M::Header) -> Seal { Seal::None }
 
-	/// Phase 4 verification. Verify block header against potentially external data.
-	fn verify_block_external(&self, _header: &Header, _block: Option<&[u8]>) -> Result<(), Error> { Ok(()) }
+	/// Verify a locally-generated seal of a header.
+	///
+	/// If this engine seals internally,
+	/// no checks have to be done here, since all internally generated seals
+	/// should be valid.
+	///
+	/// Externally-generated seals (e.g. PoW) will need to be checked for validity.
+	///
+	/// It is fine to require access to state or a full client for this function, since
+	/// light clients do not generate seals.
+	fn verify_local_seal(&self, header: &M::Header) -> Result<(), M::Error>;
 
-	/// Additional verification for transactions in blocks.
-	// TODO: Add flags for which bits of the transaction to check.
-	// TODO: consider including State in the params.
-	fn verify_transaction_basic(&self, t: &UnverifiedTransaction, _header: &Header) -> Result<(), Error> {
-		t.verify_basic(true, Some(self.params().chain_id), true)?;
-		Ok(())
-	}
+	/// Phase 1 quick block verification. Only does checks that are cheap. Returns either a null `Ok` or a general error detailing the problem with import.
+	fn verify_block_basic(&self, _header: &M::Header) -> Result<(), M::Error> { Ok(()) }
 
-	/// Verify a particular transaction is valid.
-	fn verify_transaction(&self, t: UnverifiedTransaction, _header: &Header) -> Result<SignedTransaction, Error> {
-		SignedTransaction::new(t)
-	}
+	/// Phase 2 verification. Perform costly checks such as transaction signatures. Returns either a null `Ok` or a general error detailing the problem with import.
+	fn verify_block_unordered(&self, _header: &M::Header) -> Result<(), M::Error> { Ok(()) }
 
-	/// The network ID that transactions should be signed with.
-	fn signing_chain_id(&self, _env_info: &EnvInfo) -> Option<u64> {
-		Some(self.params().chain_id)
-	}
+	/// Phase 3 verification. Check block information against parent. Returns either a null `Ok` or a general error detailing the problem with import.
+	fn verify_block_family(&self, _header: &M::Header, _parent: &M::Header) -> Result<(), Error> { Ok(()) }
 
-	/// Verify the seal of a block. This is an auxilliary method that actually just calls other `verify_` methods
-	/// to get the job done. By default it must pass `verify_basic` and `verify_block_unordered`. If more or fewer
-	/// methods are needed for an Engine, this may be overridden.
-	fn verify_block_seal(&self, header: &Header) -> Result<(), Error> {
-		self.verify_block_basic(header, None).and_then(|_| self.verify_block_unordered(header, None))
-	}
+	/// Phase 4 verification. Verify block header against potentially external data.
+	/// Should only be called when `register_client` has been called previously.
+	fn verify_block_external(&self, _header: &M::Header) -> Result<(), Error> { Ok(()) }
 
 	/// Genesis epoch data.
-	fn genesis_epoch_data(&self, _header: &Header, _call: &Call) -> Result<Vec<u8>, String> { Ok(Vec::new()) }
+	fn genesis_epoch_data<'a>(&self, _header: &M::Header, _state: &<M as Localized<'a>>::StateContext) -> Result<Vec<u8>, String> { Ok(Vec::new()) }
 
 	/// Whether an epoch change is signalled at the given header but will require finality.
 	/// If a change can be enacted immediately then return `No` from this function but
 	/// `Yes` from `is_epoch_end`.
 	///
-	/// If the block or receipts are required, return `Unsure` and the function will be
+	/// If auxiliary data of the block is required, return an auxiliary request and the function will be
 	/// called again with them.
 	/// Return `Yes` or `No` when the answer is definitively known.
 	///
 	/// Should not interact with state.
-	fn signals_epoch_end(&self, _header: &Header, _block: Option<&[u8]>, _receipts: Option<&[Receipt]>)
-		-> EpochChange
+	fn signals_epoch_end<'a>(&self, _header: &M::Header, _aux: <M as Localized<'a>>::AuxiliaryData)
+		-> EpochChange<M>
 	{
 		EpochChange::No
 	}
@@ -311,8 +275,8 @@ pub trait Engine : Sync + Send {
 	/// Return optional transition proof.
 	fn is_epoch_end(
 		&self,
-		_chain_head: &Header,
-		_chain: &Headers,
+		_chain_head: &M::Header,
+		_chain: &Headers<M::Header>,
 		_transition_store: &PendingTransitionStore,
 	) -> Option<Vec<u8>> {
 		None
@@ -320,35 +284,21 @@ pub trait Engine : Sync + Send {
 
 	/// Create an epoch verifier from validation proof and a flag indicating
 	/// whether finality is required.
-	fn epoch_verifier<'a>(&self, _header: &Header, _proof: &'a [u8]) -> ConstructedVerifier<'a> {
+	fn epoch_verifier<'a>(&self, _header: &M::Header, _proof: &'a [u8]) -> ConstructedVerifier<'a, M> {
 		ConstructedVerifier::Trusted(Box::new(self::epoch::NoOp))
 	}
 
 	/// Populate a header's fields based on its parent's header.
 	/// Usually implements the chain scoring rule based on weight.
-	/// The gas floor target must not be lower than the engine's minimum gas limit.
-	fn populate_from_parent(&self, header: &mut Header, parent: &Header, _gas_floor_target: U256, _gas_ceil_target: U256) {
-		header.set_difficulty(parent.difficulty().clone());
-		header.set_gas_limit(parent.gas_limit().clone());
-	}
+	fn populate_from_parent(&self, _header: &mut M::Header, _parent: &M::Header) { }
 
 	/// Handle any potential consensus messages;
 	/// updating consensus state and potentially issuing a new one.
-	fn handle_message(&self, _message: &[u8]) -> Result<(), Error> { Err(EngineError::UnexpectedMessage.into()) }
-
-	/// Attempt to get a handle to a built-in contract.
-	/// Only returns references to activated built-ins.
-	// TODO: builtin contract routing - to do this properly, it will require removing the built-in configuration-reading logic
-	// from Spec into here and removing the Spec::builtins field.
-	fn builtin(&self, a: &Address, block_number: ::header::BlockNumber) -> Option<&Builtin> {
-		self.builtins()
-			.get(a)
-			.and_then(|b| if b.is_active(block_number) { Some(b) } else { None })
-	}
+	fn handle_message(&self, _message: &[u8]) -> Result<(), EngineError> { Err(EngineError::UnexpectedMessage) }
 
 	/// Find out if the block is a proposal block and should not be inserted into the DB.
 	/// Takes a header of a fully verified block.
-	fn is_proposal(&self, _verified_header: &Header) -> bool { false }
+	fn is_proposal(&self, _verified_header: &M::Header) -> bool { false }
 
 	/// Register an account which signs consensus messages.
 	fn set_signer(&self, _account_provider: Arc<AccountProvider>, _address: Address, _password: String) {}
@@ -356,8 +306,8 @@ pub trait Engine : Sync + Send {
 	/// Sign using the EngineSigner, to be used for consensus tx signing.
 	fn sign(&self, _hash: H256) -> Result<Signature, Error> { unimplemented!() }
 
-	/// Add Client which can be used for sealing, querying the state and sending messages.
-	fn register_client(&self, _client: Weak<Client>) {}
+	/// Add Client which can be used for sealing, potentially querying the state and sending messages.
+	fn register_client(&self, _client: Weak<M::EngineClient>) {}
 
 	/// Trigger next step of the consensus engine.
 	fn step(&self) {}
@@ -375,98 +325,71 @@ pub trait Engine : Sync + Send {
 	fn supports_warp(&self) -> bool {
 		self.snapshot_components().is_some()
 	}
+}
+
+/// Common type alias for an engine coupled with an Ethereum-like state machine.
+// TODO: make this a _trait_ alias when those exist.
+// fortunately the effect is largely the same since engines are mostly used
+// via trait objects.
+pub trait EthEngine: Engine<::machine::EthereumMachine> {
+	/// Get the general parameters of the chain.
+	fn params(&self) -> &CommonParams {
+		self.machine().params()
+	}
+
+	/// Get the EVM schedule for the given block number.
+	fn schedule(&self, block_number: BlockNumber) -> Schedule {
+		self.machine().schedule(block_number)
+	}
+
+	/// Builtin-contracts for the chain..
+	fn builtins(&self) -> &BTreeMap<Address, Builtin> {
+		self.machine().builtins()
+	}
+
+	/// Attempt to get a handle to a built-in contract.
+	/// Only returns references to activated built-ins.
+	fn builtin(&self, a: &Address, block_number: BlockNumber) -> Option<&Builtin> {
+		self.machine().builtin(a, block_number)
+	}
+
+	/// Some intrinsic operation parameters; by default they take their value from the `spec()`'s `engine_params`.
+	fn maximum_extra_data_size(&self) -> usize {
+		self.machine().maximum_extra_data_size()
+	}
 
-	/// If this engine supports wasm contracts.
-	fn supports_wasm(&self) -> bool {
-		self.params().wasm
+	/// The nonce with which accounts begin at given block.
+	fn account_start_nonce(&self, block: BlockNumber) -> U256 {
+		self.machine().account_start_nonce(block)
+	}
+
+	/// The network ID that transactions should be signed with.
+	fn signing_chain_id(&self, env_info: &EnvInfo) -> Option<u64> {
+		self.machine().signing_chain_id(env_info)
 	}
 
 	/// Returns new contract address generation scheme at given block number.
 	fn create_address_scheme(&self, number: BlockNumber) -> CreateContractAddress {
-		if number >= self.params().eip86_transition {
-			CreateContractAddress::FromCodeHash
-		} else {
-			CreateContractAddress::FromSenderAndNonce
-		}
+		self.machine().create_address_scheme(number)
 	}
-}
-
-/// Common engine utilities
-pub mod common {
-	use std::sync::Arc;
-	use block::ExecutedBlock;
-	use error::Error;
-	use transaction::SYSTEM_ADDRESS;
-	use executive::Executive;
-	use vm::{CallType, ActionParams, ActionValue, EnvInfo, LastHashes};
-	use trace::{NoopTracer, NoopVMTracer};
-	use state::Substate;
-
-	use util::*;
-	use super::Engine;
-
-	/// Execute a call as the system address.
-	pub fn execute_as_system<E: Engine + ?Sized>(
-		block: &mut ExecutedBlock,
-		last_hashes: Arc<LastHashes>,
-		engine: &E,
-		contract_address: Address,
-		gas: U256,
-		data: Option<Bytes>,
-	) -> Result<Bytes, Error> {
-		let env_info = {
-			let header = block.fields().header;
-			EnvInfo {
-				number: header.number(),
-				author: header.author().clone(),
-				timestamp: header.timestamp(),
-				difficulty: header.difficulty().clone(),
-				last_hashes: last_hashes,
-				gas_used: U256::zero(),
-				gas_limit: gas,
-			}
-		};
 
-		let mut state = block.fields_mut().state;
-		let params = ActionParams {
-			code_address: contract_address.clone(),
-			address: contract_address.clone(),
-			sender: SYSTEM_ADDRESS.clone(),
-			origin: SYSTEM_ADDRESS.clone(),
-			gas: gas,
-			gas_price: 0.into(),
-			value: ActionValue::Transfer(0.into()),
-			code: state.code(&contract_address)?,
-			code_hash: Some(state.code_hash(&contract_address)?),
-			data: data,
-			call_type: CallType::Call,
-		};
-		let mut ex = Executive::new(&mut state, &env_info, engine);
-		let mut substate = Substate::new();
-		let mut output = Vec::new();
-		if let Err(e) = ex.call(params, &mut substate, BytesRef::Flexible(&mut output), &mut NoopTracer, &mut NoopVMTracer) {
-			warn!("Encountered error on making system call: {}", e);
-		}
+	/// Verify a particular transaction is valid.
+	fn verify_transaction_unordered(&self, t: UnverifiedTransaction, header: &Header) -> Result<SignedTransaction, Error> {
+		self.machine().verify_transaction_unordered(t, header)
+	}
 
-		Ok(output)
+	/// Additional verification for transactions in blocks.
+	// TODO: Add flags for which bits of the transaction to check.
+	// TODO: consider including State in the params.
+	fn verify_transaction_basic(&self, t: &UnverifiedTransaction, header: &Header) -> Result<(), Error> {
+		self.machine().verify_transaction_basic(t, header)
 	}
 
-	/// Push last known block hash to the state.
-	pub fn push_last_hash<E: Engine + ?Sized>(block: &mut ExecutedBlock, last_hashes: Arc<LastHashes>, engine: &E, hash: &H256) -> Result<(), Error> {
-		if block.fields().header.number() == engine.params().eip210_transition {
-			let state = block.fields_mut().state;
-			state.init_code(&engine.params().eip210_contract_address, engine.params().eip210_contract_code.clone())?;
-		}
-		if block.fields().header.number() >= engine.params().eip210_transition {
-			let _ = execute_as_system(
-				block,
-				last_hashes,
-				engine,
-				engine.params().eip210_contract_address,
-				engine.params().eip210_contract_gas,
-				Some(hash.to_vec()),
-			)?;
-		}
-		Ok(())
+	/// Additional information.
+	fn additional_params(&self) -> HashMap<String, String> {
+		self.machine().additional_params()
 	}
 }
+
+// convenience wrappers for existing functions.
+impl<T> EthEngine for T where T: Engine<::machine::EthereumMachine> { }
diff --git a/ethcore/src/engines/null_engine.rs b/ethcore/src/engines/null_engine.rs
index 552154580054f33e03f6fd454dabf61eea1bedeb..f20a9cdfd9d1df07f6439f1ac6940b10fbf4b25f 100644
--- a/ethcore/src/engines/null_engine.rs
+++ b/ethcore/src/engines/null_engine.rs
@@ -14,51 +14,92 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::collections::BTreeMap;
-use util::Address;
-use builtin::Builtin;
+use ethereum_types::U256;
 use engines::Engine;
-use spec::CommonParams;
-use evm::Schedule;
 use header::BlockNumber;
+use parity_machine::{Header, LiveBlock, WithBalances};
+
+/// Params for a null engine.
+#[derive(Clone, Default)]
+pub struct NullEngineParams {
+	/// base reward for a block.
+	pub block_reward: U256,
+}
+
+impl From<::ethjson::spec::NullEngineParams> for NullEngineParams {
+	fn from(p: ::ethjson::spec::NullEngineParams) -> Self {
+		NullEngineParams {
+			block_reward: p.block_reward.map_or_else(Default::default, Into::into),
+		}
+	}
+}
 
 /// An engine which does not provide any consensus mechanism and does not seal blocks.
-pub struct NullEngine {
-	params: CommonParams,
-	builtins: BTreeMap<Address, Builtin>,
+pub struct NullEngine<M> {
+	params: NullEngineParams,
+	machine: M,
 }
 
-impl NullEngine {
+impl<M> NullEngine<M> {
 	/// Returns new instance of NullEngine with default VM Factory
-	pub fn new(params: CommonParams, builtins: BTreeMap<Address, Builtin>) -> Self {
-		NullEngine{
+	pub fn new(params: NullEngineParams, machine: M) -> Self {
+		NullEngine {
 			params: params,
-			builtins: builtins,
+			machine: machine,
 		}
 	}
 }
 
-impl Default for NullEngine {
+impl<M: Default> Default for NullEngine<M> {
 	fn default() -> Self {
 		Self::new(Default::default(), Default::default())
 	}
 }
 
-impl Engine for NullEngine {
+impl<M: WithBalances> Engine<M> for NullEngine<M> {
 	fn name(&self) -> &str {
 		"NullEngine"
 	}
 
-	fn params(&self) -> &CommonParams {
-		&self.params
-	}
+	fn machine(&self) -> &M { &self.machine }
+
+	fn on_close_block(&self, block: &mut M::LiveBlock) -> Result<(), M::Error> {
+		use std::ops::Shr;
+
+		let author = *LiveBlock::header(&*block).author();
+		let number = LiveBlock::header(&*block).number();
+
+		let reward = self.params.block_reward;
+		if reward == U256::zero() { return Ok(()) }
 
-	fn builtins(&self) -> &BTreeMap<Address, Builtin> {
-		&self.builtins
+		let n_uncles = LiveBlock::uncles(&*block).len();
+
+		// Bestow block reward
+		let result_block_reward = reward + reward.shr(5) * U256::from(n_uncles);
+		let mut uncle_rewards = Vec::with_capacity(n_uncles);
+
+		self.machine.add_balance(block, &author, &result_block_reward)?;
+
+		// bestow uncle rewards.
+		for u in LiveBlock::uncles(&*block) {
+			let uncle_author = u.author();
+			let result_uncle_reward = (reward * U256::from(8 + u.number() - number)).shr(3);
+
+			uncle_rewards.push((*uncle_author, result_uncle_reward));
+		}
+
+		for &(ref a, ref reward) in &uncle_rewards {
+			self.machine.add_balance(block, a, reward)?;
+		}
+
+		// note and trace.
+		self.machine.note_rewards(block, &[(author, result_block_reward)], &uncle_rewards)
 	}
 
-	fn schedule(&self, _block_number: BlockNumber) -> Schedule {
-		Schedule::new_homestead()
+	fn maximum_uncle_count(&self, _block: BlockNumber) -> usize { 2 }
+
+	fn verify_local_seal(&self, _header: &M::Header) -> Result<(), M::Error> {
+		Ok(())
 	}
 
 	fn snapshot_components(&self) -> Option<Box<::snapshot::SnapshotComponents>> {
diff --git a/ethcore/src/engines/signer.rs b/ethcore/src/engines/signer.rs
index 4069488abfa9249e08e464afb03a95c6797f47b6..d9e97fee06ecc6ebe8e6538356fff252d6df2b16 100644
--- a/ethcore/src/engines/signer.rs
+++ b/ethcore/src/engines/signer.rs
@@ -17,7 +17,7 @@
 //! A signer used by Engines which need to sign messages.
 
 use std::sync::Arc;
-use util::{H256, Address};
+use ethereum_types::{H256, Address};
 use ethkey::Signature;
 use account_provider::{self, AccountProvider};
 
diff --git a/ethcore/src/engines/tendermint/message.rs b/ethcore/src/engines/tendermint/message.rs
index 68bdcb0f7f323d1af16e9fdf5051ff09b944586e..1f71f41bcb508c3dbc951219da9de44d03ef9328 100644
--- a/ethcore/src/engines/tendermint/message.rs
+++ b/ethcore/src/engines/tendermint/message.rs
@@ -17,7 +17,9 @@
 //! Tendermint message handling.
 
 use std::cmp;
-use util::*;
+use hash::keccak;
+use ethereum_types::{H256, H520, Address};
+use bytes::Bytes;
 use super::{Height, View, BlockHash, Step};
 use error::Error;
 use header::Header;
@@ -99,7 +101,7 @@ impl ConsensusMessage {
 	pub fn verify(&self) -> Result<Address, Error> {
 		let full_rlp = ::rlp::encode(self);
 		let block_info = Rlp::new(&full_rlp).at(1);
-		let public_key = recover(&self.signature.into(), &block_info.as_raw().sha3())?;
+		let public_key = recover(&self.signature.into(), &keccak(block_info.as_raw()))?;
 		Ok(public_to_address(&public_key))
 	}
 }
@@ -194,13 +196,13 @@ pub fn message_full_rlp(signature: &H520, vote_info: &Bytes) -> Bytes {
 }
 
 pub fn message_hash(vote_step: VoteStep, block_hash: H256) -> H256 {
-	message_info_rlp(&vote_step, Some(block_hash)).sha3()
+	keccak(message_info_rlp(&vote_step, Some(block_hash)))
 }
 
 #[cfg(test)]
 mod tests {
 	use std::sync::Arc;
-	use util::*;
+	use hash::keccak;
 	use rlp::*;
 	use account_provider::AccountProvider;
 	use header::Header;
@@ -228,7 +230,7 @@ mod tests {
 				view: 123,
 				step: Step::Precommit,
 			},
-			block_hash: Some("1".sha3())
+			block_hash: Some(keccak("1")),
 		};
 		let raw_rlp = ::rlp::encode(&message).into_vec();
 		let rlp = Rlp::new(&raw_rlp);
@@ -251,12 +253,12 @@ mod tests {
 	#[test]
 	fn generate_and_verify() {
 		let tap = Arc::new(AccountProvider::transient_provider());
-		let addr = tap.insert_account("0".sha3().into(), "0").unwrap();
+		let addr = tap.insert_account(keccak("0").into(), "0").unwrap();
 		tap.unlock_account_permanently(addr, "0".into()).unwrap();
 
 		let mi = message_info_rlp(&VoteStep::new(123, 2, Step::Precommit), Some(H256::default()));
 
-		let raw_rlp = message_full_rlp(&tap.sign(addr, None, mi.sha3()).unwrap().into(), &mi);
+		let raw_rlp = message_full_rlp(&tap.sign(addr, None, keccak(&mi)).unwrap().into(), &mi);
 
 		let rlp = UntrustedRlp::new(&raw_rlp);
 		let message: ConsensusMessage = rlp.as_val().unwrap();
diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs
index cc75e99c3e7b1902b7c89136fec29cd07ef4c633..4d0656749a35fc6c35beef3ab116835058d7c801 100644
--- a/ethcore/src/engines/tendermint/mod.rs
+++ b/ethcore/src/engines/tendermint/mod.rs
@@ -27,20 +27,20 @@ mod params;
 
 use std::sync::{Weak, Arc};
 use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
-use std::collections::{HashSet, BTreeMap, HashMap};
-use std::cmp;
-use util::*;
-use client::{Client, EngineClient};
+use std::collections::{HashSet, BTreeMap};
+use hash::keccak;
+use ethereum_types::{H256, H520, U128, U256, Address};
+use parking_lot::RwLock;
+use unexpected::{OutOfBounds, Mismatch};
+use client::EngineClient;
+use bytes::Bytes;
 use error::{Error, BlockError};
 use header::{Header, BlockNumber};
-use builtin::Builtin;
 use rlp::UntrustedRlp;
 use ethkey::{Message, public_to_address, recover, Signature};
 use account_provider::AccountProvider;
 use block::*;
-use spec::CommonParams;
 use engines::{Engine, Seal, EngineError, ConstructedVerifier};
-use state::CleanupMode;
 use io::IoService;
 use super::signer::EngineSigner;
 use super::validator_set::{ValidatorSet, SimpleList};
@@ -48,6 +48,7 @@ use super::transition::TransitionHandler;
 use super::vote_collector::VoteCollector;
 use self::message::*;
 use self::params::TendermintParams;
+use machine::{AuxiliaryData, EthereumMachine};
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
 pub enum Step {
@@ -72,8 +73,6 @@ pub type BlockHash = H256;
 
 /// Engine using `Tendermint` consensus algorithm, suitable for EVM chain.
 pub struct Tendermint {
-	params: CommonParams,
-	builtins: BTreeMap<Address, Builtin>,
 	step_service: IoService<Step>,
 	client: RwLock<Option<Weak<EngineClient>>>,
 	/// Blockchain height.
@@ -98,6 +97,10 @@ pub struct Tendermint {
 	last_proposed: RwLock<H256>,
 	/// Set used to determine the current validators.
 	validators: Box<ValidatorSet>,
+	/// Reward per block, in base units.
+	block_reward: U256,
+	/// ethereum machine descriptor
+	machine: EthereumMachine,
 }
 
 struct EpochVerifier<F>
@@ -107,7 +110,7 @@ struct EpochVerifier<F>
 	recover: F
 }
 
-impl <F> super::EpochVerifier for EpochVerifier<F>
+impl <F> super::EpochVerifier<EthereumMachine> for EpochVerifier<F>
 	where F: Fn(&Signature, &Message) -> Result<Address, Error> + Send + Sync
 {
 	fn verify_light(&self, header: &Header) -> Result<(), Error> {
@@ -161,11 +164,9 @@ fn destructure_proofs(combined: &[u8]) -> Result<(BlockNumber, &[u8], &[u8]), Er
 
 impl Tendermint {
 	/// Create a new instance of Tendermint engine
-	pub fn new(params: CommonParams, our_params: TendermintParams, builtins: BTreeMap<Address, Builtin>) -> Result<Arc<Self>, Error> {
+	pub fn new(our_params: TendermintParams, machine: EthereumMachine) -> Result<Arc<Self>, Error> {
 		let engine = Arc::new(
 			Tendermint {
-				params: params,
-				builtins: builtins,
 				client: RwLock::new(None),
 				step_service: IoService::<Step>::start()?,
 				height: AtomicUsize::new(1),
@@ -179,9 +180,13 @@ impl Tendermint {
 				proposal_parent: Default::default(),
 				last_proposed: Default::default(),
 				validators: our_params.validators,
+				block_reward: our_params.block_reward,
+				machine: machine,
 			});
-		let handler = TransitionHandler::new(Arc::downgrade(&engine) as Weak<Engine>, Box::new(our_params.timeouts));
+
+		let handler = TransitionHandler::new(Arc::downgrade(&engine) as Weak<Engine<_>>, Box::new(our_params.timeouts));
 		engine.step_service.register_handler(Arc::new(handler))?;
+
 		Ok(engine)
 	}
 
@@ -214,11 +219,11 @@ impl Tendermint {
 		let r = self.view.load(AtomicOrdering::SeqCst);
 		let s = *self.step.read();
 		let vote_info = message_info_rlp(&VoteStep::new(h, r, s), block_hash);
-		match (self.signer.read().address(), self.sign(vote_info.sha3()).map(Into::into)) {
+		match (self.signer.read().address(), self.sign(keccak(&vote_info)).map(Into::into)) {
 			(Some(validator), Ok(signature)) => {
 				let message_rlp = message_full_rlp(&signature, &vote_info);
 				let message = ConsensusMessage::new(signature, h, r, s, block_hash);
-				self.votes.vote(message.clone(), &validator);
+				self.votes.vote(message.clone(), validator);
 				debug!(target: "engine", "Generated {:?} as {}.", message, validator);
 				self.handle_valid_message(&message);
 
@@ -432,23 +437,15 @@ impl Tendermint {
 	}
 }
 
-impl Engine for Tendermint {
+impl Engine<EthereumMachine> for Tendermint {
 	fn name(&self) -> &str { "Tendermint" }
 
-	fn version(&self) -> SemanticVersion { SemanticVersion::new(1, 0, 0) }
-
 	/// (consensus view, proposal signature, authority signatures)
-	fn seal_fields(&self) -> usize { 3 }
-
-	fn params(&self) -> &CommonParams { &self.params }
-
-	fn additional_params(&self) -> HashMap<String, String> {
-		hash_map!["registrar".to_owned() => self.params().registrar.hex()]
-	}
+	fn seal_fields(&self, _header: &Header) -> usize { 3 }
 
-	fn builtins(&self) -> &BTreeMap<Address, Builtin> { &self.builtins }
+	fn machine(&self) -> &EthereumMachine { &self.machine }
 
-	fn maximum_uncle_count(&self) -> usize { 0 }
+	fn maximum_uncle_count(&self, _block: BlockNumber) -> usize { 0 }
 
 	fn maximum_uncle_age(&self) -> usize { 0 }
 
@@ -463,19 +460,13 @@ impl Engine for Tendermint {
 		]
 	}
 
-	fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, _gas_ceil_target: U256) {
+	fn populate_from_parent(&self, header: &mut Header, parent: &Header) {
 		// Chain scoring: total weight is sqrt(U256::max_value())*height - view
-		let new_difficulty = U256::from(U128::max_value()) + consensus_view(parent).expect("Header has been verified; qed").into() - self.view.load(AtomicOrdering::SeqCst).into();
+		let new_difficulty = U256::from(U128::max_value())
+			+ consensus_view(parent).expect("Header has been verified; qed").into()
+			- self.view.load(AtomicOrdering::SeqCst).into();
+
 		header.set_difficulty(new_difficulty);
-		header.set_gas_limit({
-			let gas_limit = parent.gas_limit().clone();
-			let bound_divisor = self.params().gas_limit_bound_divisor;
-			if gas_limit < gas_floor_target {
-				cmp::min(gas_floor_target, gas_limit + gas_limit / bound_divisor - 1.into())
-			} else {
-				cmp::max(gas_floor_target, gas_limit - gas_limit / bound_divisor + 1.into())
-			}
-		});
 	}
 
 	/// Should this node participate.
@@ -487,7 +478,7 @@ impl Engine for Tendermint {
 	///
 	/// This operation is synchronous and may (quite reasonably) not be available, in which case
 	/// `Seal::None` will be returned.
-	fn generate_seal(&self, block: &ExecutedBlock) -> Seal {
+	fn generate_seal(&self, block: &ExecutedBlock, _parent: &Header) -> Seal {
 		let header = block.header();
 		let author = header.author();
 		// Only proposer can generate seal if None was generated.
@@ -499,10 +490,10 @@ impl Engine for Tendermint {
 		let view = self.view.load(AtomicOrdering::SeqCst);
 		let bh = Some(header.bare_hash());
 		let vote_info = message_info_rlp(&VoteStep::new(height, view, Step::Propose), bh.clone());
-		if let Ok(signature) = self.sign(vote_info.sha3()).map(Into::into) {
+		if let Ok(signature) = self.sign(keccak(&vote_info)).map(Into::into) {
 			// Insert Propose vote.
 			debug!(target: "engine", "Submitting proposal {} at height {} view {}.", header.bare_hash(), height, view);
-			self.votes.vote(ConsensusMessage::new(signature, height, view, Step::Propose, bh), author);
+			self.votes.vote(ConsensusMessage::new(signature, height, view, Step::Propose, bh), *author);
 			// Remember the owned block.
 			*self.last_proposed.write() = header.bare_hash();
 			// Remember proposal for later seal submission.
@@ -519,19 +510,27 @@ impl Engine for Tendermint {
 		}
 	}
 
-	fn handle_message(&self, rlp: &[u8]) -> Result<(), Error> {
+	fn handle_message(&self, rlp: &[u8]) -> Result<(), EngineError> {
+		fn fmt_err<T: ::std::fmt::Debug>(x: T) -> EngineError {
+			EngineError::MalformedMessage(format!("{:?}", x))
+		}
+
 		let rlp = UntrustedRlp::new(rlp);
-		let message: ConsensusMessage = rlp.as_val()?;
+		let message: ConsensusMessage = rlp.as_val().map_err(fmt_err)?;
 		if !self.votes.is_old_or_known(&message) {
-			let sender = public_to_address(&recover(&message.signature.into(), &rlp.at(1)?.as_raw().sha3())?);
+			let msg_hash = keccak(rlp.at(1).map_err(fmt_err)?.as_raw());
+			let sender = public_to_address(
+				&recover(&message.signature.into(), &msg_hash).map_err(fmt_err)?
+			);
+
 			if !self.is_authority(&sender) {
-				return Err(EngineError::NotAuthorized(sender).into());
+				return Err(EngineError::NotAuthorized(sender));
 			}
 			self.broadcast_message(rlp.as_raw().to_vec());
-			if let Some(double) = self.votes.vote(message.clone(), &sender) {
+			if let Some(double) = self.votes.vote(message.clone(), sender) {
 				let height = message.vote_step.height as BlockNumber;
 				self.validators.report_malicious(&sender, height, height, ::rlp::encode(&double).into_vec());
-				return Err(EngineError::DoubleVote(sender).into());
+				return Err(EngineError::DoubleVote(sender));
 			}
 			trace!(target: "engine", "Handling a valid {:?} from {}.", message, sender);
 			self.handle_valid_message(&message);
@@ -539,24 +538,43 @@ impl Engine for Tendermint {
 		Ok(())
 	}
 
+	fn on_new_block(&self, block: &mut ExecutedBlock, epoch_begin: bool) -> Result<(), Error> {
+		if !epoch_begin { return Ok(()) }
+
+		// genesis is never a new block, but might as well check.
+		let header = block.header().clone();
+		let first = header.number() == 0;
+
+		let mut call = |to, data| {
+			let result = self.machine.execute_as_system(
+				block,
+				to,
+				U256::max_value(), // unbounded gas? maybe make configurable.
+				Some(data),
+			);
+
+			result.map_err(|e| format!("{}", e))
+		};
+
+		self.validators.on_epoch_begin(first, &header, &mut call)
+	}
+
 	/// Apply the block reward on finalisation of the block.
 	fn on_close_block(&self, block: &mut ExecutedBlock) -> Result<(), Error>{
-		let fields = block.fields_mut();
-		// Bestow block reward
-		let reward = self.params().block_reward;
-		let res = fields.state.add_balance(fields.header.author(), &reward, CleanupMode::NoEmpty)
-			.map_err(::error::Error::from)
-			.and_then(|_| fields.state.commit());
-		// Commit state so that we can actually figure out the state root.
-		if let Err(ref e) = res {
-			warn!("Encountered error on closing block: {}", e);
-		}
-		res
+		use parity_machine::WithBalances;
+		let author = *block.header().author();
+		self.machine.add_balance(block, &author, &self.block_reward)?;
+		self.machine.note_rewards(block, &[(author, self.block_reward)], &[])
+	}
+
+	fn verify_local_seal(&self, _header: &Header) -> Result<(), Error> {
+		Ok(())
 	}
 
-	fn verify_block_basic(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
+	fn verify_block_basic(&self, header: &Header) -> Result<(), Error> {
 		let seal_length = header.seal().len();
-		if seal_length == self.seal_fields() {
+		let expected_seal_fields = self.seal_fields(header);
+		if seal_length == expected_seal_fields {
 			// Either proposal or commit.
 			if (header.seal()[1] == ::rlp::NULL_RLP)
 				!= (header.seal()[2] == ::rlp::EMPTY_LIST_RLP) {
@@ -567,27 +585,23 @@ impl Engine for Tendermint {
 			}
 		} else {
 			Err(BlockError::InvalidSealArity(
-				Mismatch { expected: self.seal_fields(), found: seal_length }
+				Mismatch { expected: expected_seal_fields, found: seal_length }
 			).into())
 		}
 	}
 
-	fn verify_block_unordered(&self, _header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
-		Ok(())
-	}
-
-	/// Verify validators and gas limit.
-	fn verify_block_family(&self, header: &Header, parent: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
-		if header.number() == 0 {
-			return Err(BlockError::RidiculousNumber(OutOfBounds { min: Some(1), max: None, found: header.number() }).into());
-		}
-
+	fn verify_block_external(&self, header: &Header) -> Result<(), Error> {
 		if let Ok(proposal) = ConsensusMessage::new_proposal(header) {
 			let proposer = proposal.verify()?;
 			if !self.is_authority(&proposer) {
 				return Err(EngineError::NotAuthorized(proposer).into());
 			}
-			self.check_view_proposer(header.parent_hash(), proposal.vote_step.height, proposal.vote_step.view, &proposer)?;
+			self.check_view_proposer(
+				header.parent_hash(),
+				proposal.vote_step.height,
+				proposal.vote_step.view,
+				&proposer
+			).map_err(Into::into)
 		} else {
 			let vote_step = VoteStep::new(header.number() as usize, consensus_view(header)?, Step::Precommit);
 			let precommit_hash = message_hash(vote_step.clone(), header.bare_hash());
@@ -613,31 +627,21 @@ impl Engine for Tendermint {
 				}
 			}
 
-			self.check_above_threshold(origins.len())?
+			self.check_above_threshold(origins.len()).map_err(Into::into)
 		}
-
-		let gas_limit_divisor = self.params().gas_limit_bound_divisor;
-		let min_gas = parent.gas_limit().clone() - parent.gas_limit().clone() / gas_limit_divisor;
-		let max_gas = parent.gas_limit().clone() + parent.gas_limit().clone() / gas_limit_divisor;
-		if header.gas_limit() <= &min_gas || header.gas_limit() >= &max_gas {
-			self.validators.report_malicious(header.author(), header.number(), header.number(), Default::default());
-			return Err(BlockError::InvalidGasLimit(OutOfBounds { min: Some(min_gas), max: Some(max_gas), found: header.gas_limit().clone() }).into());
-		}
-
-		Ok(())
 	}
 
-	fn signals_epoch_end(&self, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
-		-> super::EpochChange
+	fn signals_epoch_end(&self, header: &Header, aux: AuxiliaryData)
+		-> super::EpochChange<EthereumMachine>
 	{
 		let first = header.number() == 0;
-		self.validators.signals_epoch_end(first, header, block, receipts)
+		self.validators.signals_epoch_end(first, header, aux)
 	}
 
 	fn is_epoch_end(
 		&self,
 		chain_head: &Header,
-		_chain: &super::Headers,
+		_chain: &super::Headers<Header>,
 		transition_store: &super::PendingTransitionStore,
 	) -> Option<Vec<u8>> {
 		let first = chain_head.number() == 0;
@@ -654,14 +658,14 @@ impl Engine for Tendermint {
 		None
 	}
 
-	fn epoch_verifier<'a>(&self, _header: &Header, proof: &'a [u8]) -> ConstructedVerifier<'a> {
+	fn epoch_verifier<'a>(&self, _header: &Header, proof: &'a [u8]) -> ConstructedVerifier<'a, EthereumMachine> {
 		let (signal_number, set_proof, finality_proof) = match destructure_proofs(proof) {
 			Ok(x) => x,
 			Err(e) => return ConstructedVerifier::Err(e),
 		};
 
 		let first = signal_number == 0;
-		match self.validators.epoch_set(first, self, signal_number, set_proof) {
+		match self.validators.epoch_set(first, &self.machine, signal_number, set_proof) {
 			Ok((list, finalize)) => {
 				let verifier = Box::new(EpochVerifier {
 					subchain_validators: list,
@@ -715,7 +719,7 @@ impl Engine for Tendermint {
 			*self.proposal.write() = proposal.block_hash.clone();
 			*self.proposal_parent.write() = header.parent_hash().clone();
 		}
-		self.votes.vote(proposal, &proposer);
+		self.votes.vote(proposal, proposer);
 		true
 	}
 
@@ -759,13 +763,12 @@ impl Engine for Tendermint {
 		self.to_step(next_step);
 	}
 
-	fn register_client(&self, client: Weak<Client>) {
-		use client::BlockChainClient;
+	fn register_client(&self, client: Weak<EngineClient>) {
 		if let Some(c) = client.upgrade() {
 			self.height.store(c.chain_info().best_block_number as usize + 1, AtomicOrdering::SeqCst);
 		}
 		*self.client.write() = Some(client.clone());
-		self.validators.register_contract(client);
+		self.validators.register_client(client);
 	}
 }
 
@@ -773,16 +776,20 @@ impl Engine for Tendermint {
 mod tests {
 	use std::str::FromStr;
 	use rustc_hex::FromHex;
-	use util::*;
+	use ethereum_types::Address;
+	use bytes::Bytes;
 	use block::*;
 	use error::{Error, BlockError};
 	use header::Header;
-	use client::chain_notify::ChainNotify;
+	use client::ChainInfo;
 	use miner::MinerService;
-	use tests::helpers::*;
+	use tests::helpers::{
+		TestNotify, get_temp_state_db, generate_dummy_client,
+		generate_dummy_client_with_spec_and_accounts
+	};
 	use account_provider::AccountProvider;
 	use spec::Spec;
-	use engines::{Engine, EngineError, Seal};
+	use engines::{EthEngine, EngineError, Seal};
 	use engines::epoch::EpochVerifier;
 	use super::*;
 
@@ -800,16 +807,16 @@ mod tests {
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(spec.engine.as_ref(), Default::default(), false, db.boxed_clone(), &genesis_header, last_hashes, proposer, (3141562.into(), 31415620.into()), vec![], false).unwrap();
 		let b = b.close();
-		if let Seal::Proposal(seal) = spec.engine.generate_seal(b.block()) {
+		if let Seal::Proposal(seal) = spec.engine.generate_seal(b.block(), &genesis_header) {
 			(b, seal)
 		} else {
 			panic!()
 		}
 	}
 
-	fn vote<F>(engine: &Engine, signer: F, height: usize, view: usize, step: Step, block_hash: Option<H256>) -> Bytes where F: FnOnce(H256) -> Result<H520, ::account_provider::SignError> {
+	fn vote<F>(engine: &EthEngine, signer: F, height: usize, view: usize, step: Step, block_hash: Option<H256>) -> Bytes where F: FnOnce(H256) -> Result<H520, ::account_provider::SignError> {
 		let mi = message_info_rlp(&VoteStep::new(height, view, step), block_hash);
-		let m = message_full_rlp(&signer(mi.sha3()).unwrap().into(), &mi);
+		let m = message_full_rlp(&signer(keccak(&mi)).unwrap().into(), &mi);
 		engine.handle_message(&m).unwrap();
 		m
 	}
@@ -817,7 +824,7 @@ mod tests {
 	fn proposal_seal(tap: &Arc<AccountProvider>, header: &Header, view: View) -> Vec<Bytes> {
 		let author = header.author();
 		let vote_info = message_info_rlp(&VoteStep::new(header.number() as Height, view, Step::Propose), Some(header.bare_hash()));
-		let signature = tap.sign(*author, None, vote_info.sha3()).unwrap();
+		let signature = tap.sign(*author, None, keccak(vote_info)).unwrap();
 		vec![
 			::rlp::encode(&view).into_vec(),
 			::rlp::encode(&H520::from(signature)).into_vec(),
@@ -826,33 +833,21 @@ mod tests {
 	}
 
 	fn insert_and_unlock(tap: &Arc<AccountProvider>, acc: &str) -> Address {
-		let addr = tap.insert_account(acc.sha3().into(), acc).unwrap();
+		let addr = tap.insert_account(keccak(acc).into(), acc).unwrap();
 		tap.unlock_account_permanently(addr, acc.into()).unwrap();
 		addr
 	}
 
-	fn insert_and_register(tap: &Arc<AccountProvider>, engine: &Engine, acc: &str) -> Address {
+	fn insert_and_register(tap: &Arc<AccountProvider>, engine: &EthEngine, acc: &str) -> Address {
 		let addr = insert_and_unlock(tap, acc);
 		engine.set_signer(tap.clone(), addr.clone(), acc.into());
 		addr
 	}
 
-	#[derive(Default)]
-	struct TestNotify {
-		messages: RwLock<Vec<Bytes>>,
-	}
-
-	impl ChainNotify for TestNotify {
-		fn broadcast(&self, data: Vec<u8>) {
-			self.messages.write().push(data);
-		}
-	}
-
 	#[test]
 	fn has_valid_metadata() {
 		let engine = Spec::new_test_tendermint().engine;
 		assert!(!engine.name().is_empty());
-		assert!(engine.version().major >= 1);
 	}
 
 	#[test]
@@ -868,7 +863,7 @@ mod tests {
 		let engine = Spec::new_test_tendermint().engine;
 		let header = Header::default();
 
-		let verify_result = engine.verify_block_basic(&header, None);
+		let verify_result = engine.verify_block_basic(&header);
 
 		match verify_result {
 			Err(Error::Block(BlockError::InvalidSealArity(_))) => {},
@@ -893,14 +888,14 @@ mod tests {
 		let seal = proposal_seal(&tap, &header, 0);
 		header.set_seal(seal);
 		// Good proposer.
-		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
+		assert!(engine.verify_block_external(&header).is_ok());
 
 		let validator = insert_and_unlock(&tap, "0");
 		header.set_author(validator);
 		let seal = proposal_seal(&tap, &header, 0);
 		header.set_seal(seal);
 		// Bad proposer.
-		match engine.verify_block_family(&header, &parent_header, None) {
+		match engine.verify_block_external(&header) {
 			Err(Error::Engine(EngineError::NotProposer(_))) => {},
 			_ => panic!(),
 		}
@@ -910,7 +905,7 @@ mod tests {
 		let seal = proposal_seal(&tap, &header, 0);
 		header.set_seal(seal);
 		// Not authority.
-		match engine.verify_block_family(&header, &parent_header, None) {
+		match engine.verify_block_external(&header) {
 			Err(Error::Engine(EngineError::NotAuthorized(_))) => {},
 			_ => panic!(),
 		};
@@ -933,34 +928,34 @@ mod tests {
 		let mut seal = proposal_seal(&tap, &header, 0);
 
 		let vote_info = message_info_rlp(&VoteStep::new(2, 0, Step::Precommit), Some(header.bare_hash()));
-		let signature1 = tap.sign(proposer, None, vote_info.sha3()).unwrap();
+		let signature1 = tap.sign(proposer, None, keccak(&vote_info)).unwrap();
 
 		seal[1] = ::rlp::NULL_RLP.to_vec();
 		seal[2] = ::rlp::encode_list(&vec![H520::from(signature1.clone())]).into_vec();
 		header.set_seal(seal.clone());
 
 		// One good signature is not enough.
-		match engine.verify_block_family(&header, &parent_header, None) {
+		match engine.verify_block_external(&header) {
 			Err(Error::Engine(EngineError::BadSealFieldSize(_))) => {},
 			_ => panic!(),
 		}
 
 		let voter = insert_and_unlock(&tap, "0");
-		let signature0 = tap.sign(voter, None, vote_info.sha3()).unwrap();
+		let signature0 = tap.sign(voter, None, keccak(&vote_info)).unwrap();
 
 		seal[2] = ::rlp::encode_list(&vec![H520::from(signature1.clone()), H520::from(signature0.clone())]).into_vec();
 		header.set_seal(seal.clone());
 
-		assert!(engine.verify_block_family(&header, &parent_header, None).is_ok());
+		assert!(engine.verify_block_external(&header).is_ok());
 
 		let bad_voter = insert_and_unlock(&tap, "101");
-		let bad_signature = tap.sign(bad_voter, None, vote_info.sha3()).unwrap();
+		let bad_signature = tap.sign(bad_voter, None, keccak(vote_info)).unwrap();
 
 		seal[2] = ::rlp::encode_list(&vec![H520::from(signature1), H520::from(bad_signature)]).into_vec();
 		header.set_seal(seal);
 
 		// One good and one bad signature.
-		match engine.verify_block_family(&header, &parent_header, None) {
+		match engine.verify_block_external(&header) {
 			Err(Error::Engine(EngineError::NotAuthorized(_))) => {},
 			_ => panic!(),
 		};
@@ -1006,7 +1001,7 @@ mod tests {
 		let client = generate_dummy_client(0);
 		let notify = Arc::new(TestNotify::default());
 		client.add_notify(notify.clone());
-		engine.register_client(Arc::downgrade(&client));
+		engine.register_client(Arc::downgrade(&client) as _);
 
 		let prevote_current = vote(engine.as_ref(), |mh| tap.sign(v0, None, mh).map(H520::from), h, r, Step::Prevote, proposal);
 
@@ -1024,7 +1019,6 @@ mod tests {
 	fn seal_submission() {
 		use ethkey::{Generator, Random};
 		use transaction::{Transaction, Action};
-		use client::BlockChainClient;
 
 		let tap = Arc::new(AccountProvider::transient_provider());
 		// Accounts for signing votes.
@@ -1037,7 +1031,7 @@ mod tests {
 
 		let notify = Arc::new(TestNotify::default());
 		client.add_notify(notify.clone());
-		engine.register_client(Arc::downgrade(&client));
+		engine.register_client(Arc::downgrade(&client) as _);
 
 		let keypair = Random.generate().unwrap();
 		let transaction = Transaction {
@@ -1087,10 +1081,10 @@ mod tests {
 		let mut seal = proposal_seal(&tap, &header, 0);
 
 		let vote_info = message_info_rlp(&VoteStep::new(2, 0, Step::Precommit), Some(header.bare_hash()));
-		let signature1 = tap.sign(proposer, None, vote_info.sha3()).unwrap();
+		let signature1 = tap.sign(proposer, None, keccak(&vote_info)).unwrap();
 
 		let voter = insert_and_unlock(&tap, "0");
-		let signature0 = tap.sign(voter, None, vote_info.sha3()).unwrap();
+		let signature0 = tap.sign(voter, None, keccak(&vote_info)).unwrap();
 
 		seal[1] = ::rlp::NULL_RLP.to_vec();
 		seal[2] = ::rlp::encode_list(&vec![H520::from(signature1.clone())]).into_vec();
@@ -1127,7 +1121,7 @@ mod tests {
 		assert!(epoch_verifier.verify_light(&header).is_ok());
 
 		let bad_voter = insert_and_unlock(&tap, "101");
-		let bad_signature = tap.sign(bad_voter, None, vote_info.sha3()).unwrap();
+		let bad_signature = tap.sign(bad_voter, None, keccak(&vote_info)).unwrap();
 
 		seal[2] = ::rlp::encode_list(&vec![H520::from(signature1), H520::from(bad_signature)]).into_vec();
 		header.set_seal(seal);
diff --git a/ethcore/src/engines/tendermint/params.rs b/ethcore/src/engines/tendermint/params.rs
index 7ff3d697f89814e441b6454bcec4b8d283817904..c1fd39eb1ca53bbb942a6ff281cae5e08f9933dc 100644
--- a/ethcore/src/engines/tendermint/params.rs
+++ b/ethcore/src/engines/tendermint/params.rs
@@ -17,7 +17,8 @@
 //! Tendermint specific parameters.
 
 use ethjson;
-use time::Duration;
+use std::time::Duration;
+use ethereum_types::U256;
 use super::super::validator_set::{ValidatorSet, new_validator_set};
 use super::super::transition::Timeouts;
 use super::Step;
@@ -28,6 +29,8 @@ pub struct TendermintParams {
 	pub validators: Box<ValidatorSet>,
 	/// Timeout durations for different steps.
 	pub timeouts: TendermintTimeouts,
+	/// Reward per block in base units.
+	pub block_reward: U256,
 }
 
 /// Base timeout of each step in ms.
@@ -42,10 +45,10 @@ pub struct TendermintTimeouts {
 impl Default for TendermintTimeouts {
 	fn default() -> Self {
 		TendermintTimeouts {
-			propose: Duration::milliseconds(1000),
-			prevote: Duration::milliseconds(1000),
-			precommit: Duration::milliseconds(1000),
-			commit: Duration::milliseconds(1000),
+			propose: Duration::from_millis(1000),
+			prevote: Duration::from_millis(1000),
+			precommit: Duration::from_millis(1000),
+			commit: Duration::from_millis(1000),
 		}
 	}
 }
@@ -67,7 +70,7 @@ impl Timeouts<Step> for TendermintTimeouts {
 
 fn to_duration(ms: ethjson::uint::Uint) -> Duration {
 	let ms: usize = ms.into();
-	Duration::milliseconds(ms as i64)
+	Duration::from_millis(ms as u64)
 }
 
 impl From<ethjson::spec::TendermintParams> for TendermintParams {
@@ -81,6 +84,7 @@ impl From<ethjson::spec::TendermintParams> for TendermintParams {
 				precommit: p.timeout_precommit.map_or(dt.precommit, to_duration),
 				commit: p.timeout_commit.map_or(dt.commit, to_duration),
 			},
+			block_reward: p.block_reward.map_or(U256::default(), Into::into),
 		}
 	}
 }
diff --git a/ethcore/src/engines/transition.rs b/ethcore/src/engines/transition.rs
index 590fb6db2410acdc023f9b1d49ef39e9194b5ce1..dc745b6e3981b2376977e49e4bdf5997d6a9b7f1 100644
--- a/ethcore/src/engines/transition.rs
+++ b/ethcore/src/engines/transition.rs
@@ -17,9 +17,10 @@
 //! Engine timeout transitioning calls `Engine.step()` on timeout.
 
 use std::sync::Weak;
-use time::Duration;
+use std::time::Duration;
 use io::{IoContext, IoHandler, TimerToken};
 use engines::Engine;
+use parity_machine::Machine;
 
 /// Timeouts lookup
 pub trait Timeouts<S: Sync + Send + Clone>: Send + Sync {
@@ -31,14 +32,14 @@ pub trait Timeouts<S: Sync + Send + Clone>: Send + Sync {
 }
 
 /// Timeout transition handling.
-pub struct TransitionHandler<S: Sync + Send + Clone>  {
-	engine: Weak<Engine>,
+pub struct TransitionHandler<S: Sync + Send + Clone, M: Machine>  {
+	engine: Weak<Engine<M>>,
 	timeouts: Box<Timeouts<S>>,
 }
 
-impl<S> TransitionHandler<S> where S: Sync + Send + Clone {
+impl<S, M: Machine> TransitionHandler<S, M> where S: Sync + Send + Clone {
 	/// New step caller by timeouts.
-	pub fn new(engine: Weak<Engine>, timeouts: Box<Timeouts<S>>) -> Self {
+	pub fn new(engine: Weak<Engine<M>>, timeouts: Box<Timeouts<S>>) -> Self {
 		TransitionHandler {
 			engine: engine,
 			timeouts: timeouts,
@@ -50,14 +51,17 @@ impl<S> TransitionHandler<S> where S: Sync + Send + Clone {
 pub const ENGINE_TIMEOUT_TOKEN: TimerToken = 23;
 
 fn set_timeout<S: Sync + Send + Clone>(io: &IoContext<S>, timeout: Duration) {
-	io.register_timer_once(ENGINE_TIMEOUT_TOKEN, timeout.num_milliseconds() as u64)
+	let ms = timeout.as_secs() * 1_000 + timeout.subsec_nanos() as u64 / 1_000_000;
+	io.register_timer_once(ENGINE_TIMEOUT_TOKEN, ms)
 		.unwrap_or_else(|e| warn!(target: "engine", "Failed to set consensus step timeout: {}.", e))
 }
 
-impl<S> IoHandler<S> for TransitionHandler<S> where S: Sync + Send + Clone + 'static {
+impl<S, M> IoHandler<S> for TransitionHandler<S, M>
+	where S: Sync + Send + Clone + 'static, M: Machine
+{
 	fn initialize(&self, io: &IoContext<S>) {
 		let initial = self.timeouts.initial();
-		trace!(target: "engine", "Setting the initial timeout to {}.", initial);
+		trace!(target: "engine", "Setting the initial timeout to {:?}.", initial);
 		set_timeout(io, initial);
 	}
 
diff --git a/ethcore/src/engines/validator_set/contract.rs b/ethcore/src/engines/validator_set/contract.rs
index 7c18903798cf09a707cb98545aefda7dfe2907e1..0e27d594d548aa0159ffd6c6d969f893cb34840e 100644
--- a/ethcore/src/engines/validator_set/contract.rs
+++ b/ethcore/src/engines/validator_set/contract.rs
@@ -18,46 +18,53 @@
 /// It can also report validators for misbehaviour with two levels: `reportMalicious` and `reportBenign`.
 
 use std::sync::Weak;
-use util::*;
 
-use futures::Future;
-use native_contracts::ValidatorReport as Provider;
+use bytes::Bytes;
+use ethereum_types::{H256, Address};
+use parking_lot::RwLock;
 
-use client::{Client, BlockChainClient};
-use engines::{Call, Engine};
+use client::EngineClient;
 use header::{Header, BlockNumber};
+use machine::{AuxiliaryData, Call, EthereumMachine};
 
 use super::{ValidatorSet, SimpleList, SystemCall};
 use super::safe_contract::ValidatorSafeContract;
 
+use_contract!(validator_report, "ValidatorReport", "res/contracts/validator_report.json");
+
 /// A validator contract with reporting.
 pub struct ValidatorContract {
+	contract_address: Address,
 	validators: ValidatorSafeContract,
-	provider: Provider,
-	client: RwLock<Option<Weak<Client>>>, // TODO [keorn]: remove
+	provider: validator_report::ValidatorReport,
+	client: RwLock<Option<Weak<EngineClient>>>, // TODO [keorn]: remove
 }
 
 impl ValidatorContract {
 	pub fn new(contract_address: Address) -> Self {
 		ValidatorContract {
+			contract_address,
 			validators: ValidatorSafeContract::new(contract_address),
-			provider: Provider::new(contract_address),
+			provider: validator_report::ValidatorReport::default(),
 			client: RwLock::new(None),
 		}
 	}
 }
 
 impl ValidatorContract {
-	// could be `impl Trait`.
-	// note: dispatches transactions to network as well as execute.
-	// TODO [keorn]: Make more general.
-	fn transact(&self) -> Box<Fn(Address, Bytes) -> Result<Bytes, String>> {
-		let client = self.client.read().clone();
-		Box::new(move |a, d| client.as_ref()
+	fn transact(&self, data: Bytes) -> Result<(), String> {
+		let client = self.client.read().as_ref()
 			.and_then(Weak::upgrade)
-			.ok_or("No client!".into())
-			.and_then(|c| c.transact_contract(a, d).map_err(|e| format!("Transaction import error: {}", e)))
-			.map(|_| Default::default()))
+			.ok_or_else(|| "No client!")?;
+
+		match client.as_full_client() {
+			Some(c) => {
+				c.transact_contract(self.contract_address, data)
+					.map_err(|e| format!("Transaction import error: {}", e))?;
+				Ok(())
+			},
+			None => Err("No full client!".into()),
+		}
 	}
 }
 
@@ -82,14 +89,13 @@ impl ValidatorSet for ValidatorContract {
 		&self,
 		first: bool,
 		header: &Header,
-		block: Option<&[u8]>,
-		receipts: Option<&[::receipt::Receipt]>,
-	) -> ::engines::EpochChange {
-		self.validators.signals_epoch_end(first, header, block, receipts)
+		aux: AuxiliaryData,
+	) -> ::engines::EpochChange<EthereumMachine> {
+		self.validators.signals_epoch_end(first, header, aux)
 	}
 
-	fn epoch_set(&self, first: bool, engine: &Engine, number: BlockNumber, proof: &[u8]) -> Result<(SimpleList, Option<H256>), ::error::Error> {
-		self.validators.epoch_set(first, engine, number, proof)
+	fn epoch_set(&self, first: bool, machine: &EthereumMachine, number: BlockNumber, proof: &[u8]) -> Result<(SimpleList, Option<H256>), ::error::Error> {
+		self.validators.epoch_set(first, machine, number, proof)
 	}
 
 	fn contains_with_caller(&self, bh: &H256, address: &Address, caller: &Call) -> bool {
@@ -105,21 +111,23 @@ impl ValidatorSet for ValidatorContract {
 	}
 
 	fn report_malicious(&self, address: &Address, _set_block: BlockNumber, block: BlockNumber, proof: Bytes) {
-		match self.provider.report_malicious(&*self.transact(), *address, block.into(), proof).wait() {
+		let data = self.provider.functions().report_malicious().input(*address, block, proof);
+		match self.transact(data) {
 			Ok(_) => warn!(target: "engine", "Reported malicious validator {}", address),
 			Err(s) => warn!(target: "engine", "Validator {} could not be reported {}", address, s),
 		}
 	}
 
 	fn report_benign(&self, address: &Address, _set_block: BlockNumber, block: BlockNumber) {
-		match self.provider.report_benign(&*self.transact(), *address, block.into()).wait() {
+		let data = self.provider.functions().report_benign().input(*address, block);
+		match self.transact(data) {
 			Ok(_) => warn!(target: "engine", "Reported benign validator misbehaviour {}", address),
 			Err(s) => warn!(target: "engine", "Validator {} could not be reported {}", address, s),
 		}
 	}
 
-	fn register_contract(&self, client: Weak<Client>) {
-		self.validators.register_contract(client.clone());
+	fn register_client(&self, client: Weak<EngineClient>) {
+		self.validators.register_client(client.clone());
 		*self.client.write() = Some(client);
 	}
 }
@@ -128,14 +136,16 @@ impl ValidatorSet for ValidatorContract {
 mod tests {
 	use std::sync::Arc;
 	use rustc_hex::FromHex;
-	use util::*;
+	use hash::keccak;
+	use ethereum_types::{H520, Address};
+	use bytes::ToPretty;
 	use rlp::encode;
 	use spec::Spec;
 	use header::Header;
 	use account_provider::AccountProvider;
 	use miner::MinerService;
 	use types::ids::BlockId;
-	use client::BlockChainClient;
+	use client::{BlockChainClient, ChainInfo, BlockInfo, CallContract};
 	use tests::helpers::generate_dummy_client_with_spec_and_accounts;
 	use super::super::ValidatorSet;
 	use super::ValidatorContract;
@@ -144,7 +154,7 @@ mod tests {
 	fn fetches_validators() {
 		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_validator_contract, None);
 		let vc = Arc::new(ValidatorContract::new("0000000000000000000000000000000000000005".parse::<Address>().unwrap()));
-		vc.register_contract(Arc::downgrade(&client));
+		vc.register_client(Arc::downgrade(&client) as _);
 		let last_hash = client.best_block_header().hash();
 		assert!(vc.contains(&last_hash, &"7d577a597b2742b498cb5cf0c26cdcd726d39e6e".parse::<Address>().unwrap()));
 		assert!(vc.contains(&last_hash, &"82a978b3f5962a5b0957d9ee9eef472ee55b42f1".parse::<Address>().unwrap()));
@@ -153,32 +163,46 @@ mod tests {
 	#[test]
 	fn reports_validators() {
 		let tap = Arc::new(AccountProvider::transient_provider());
-		let v1 = tap.insert_account("1".sha3().into(), "").unwrap();
+		let v1 = tap.insert_account(keccak("1").into(), "").unwrap();
 		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_validator_contract, Some(tap.clone()));
-		client.engine().register_client(Arc::downgrade(&client));
+		client.engine().register_client(Arc::downgrade(&client) as _);
 		let validator_contract = "0000000000000000000000000000000000000005".parse::<Address>().unwrap();
 
 		// Make sure reporting can be done.
 		client.miner().set_gas_floor_target(1_000_000.into());
-
 		client.miner().set_engine_signer(v1, "".into()).unwrap();
+
+		// Check a block that is a bit in future, reject it but don't report the validator.
 		let mut header = Header::default();
-		let seal = vec![encode(&5u8).into_vec(), encode(&(&H520::default() as &[u8])).into_vec()];
+		let seal = vec![encode(&4u8).into_vec(), encode(&(&H520::default() as &[u8])).into_vec()];
 		header.set_seal(seal);
 		header.set_author(v1);
 		header.set_number(2);
 		header.set_parent_hash(client.chain_info().best_block_hash);
+		assert!(client.engine().verify_block_external(&header).is_err());
+		client.engine().step();
+		assert_eq!(client.chain_info().best_block_number, 0);
 
+		// Now create one that is more in future. That one should be rejected and validator should be reported.
+		let mut header = Header::default();
+		let seal = vec![encode(&8u8).into_vec(), encode(&(&H520::default() as &[u8])).into_vec()];
+		header.set_seal(seal);
+		header.set_author(v1);
+		header.set_number(2);
+		header.set_parent_hash(client.chain_info().best_block_hash);
 		// `reportBenign` when the designated proposer releases block from the future (bad clock).
-		assert!(client.engine().verify_block_external(&header, None).is_err());
+		assert!(client.engine().verify_block_basic(&header).is_err());
 		// Seal a block.
 		client.engine().step();
 		assert_eq!(client.chain_info().best_block_number, 1);
 		// Check if the unresponsive validator is `disliked`.
-		assert_eq!(client.call_contract(BlockId::Latest, validator_contract, "d8f2e0bf".from_hex().unwrap()).unwrap().to_hex(), "0000000000000000000000007d577a597b2742b498cb5cf0c26cdcd726d39e6e");
+		assert_eq!(
+			client.call_contract(BlockId::Latest, validator_contract, "d8f2e0bf".from_hex().unwrap()).unwrap().to_hex(),
+			"0000000000000000000000007d577a597b2742b498cb5cf0c26cdcd726d39e6e"
+		);
 		// Simulate a misbehaving validator by handling a double proposal.
 		let header = client.best_block_header().decode();
-		assert!(client.engine().verify_block_family(&header, &header, None).is_err());
+		assert!(client.engine().verify_block_family(&header, &header).is_err());
 		// Seal a block.
 		client.engine().step();
 		client.engine().step();
diff --git a/ethcore/src/engines/validator_set/mod.rs b/ethcore/src/engines/validator_set/mod.rs
index 56cff365ffcb46aacb176cc5f84cab8f5c387e25..de2164f918f86bf93418bf603786baccca5d0317 100644
--- a/ethcore/src/engines/validator_set/mod.rs
+++ b/ethcore/src/engines/validator_set/mod.rs
@@ -25,10 +25,12 @@ mod multi;
 
 use std::sync::Weak;
 use ids::BlockId;
-use util::{Bytes, Address, H256};
+use ethereum_types::{H256, Address};
+use bytes::Bytes;
 use ethjson::spec::ValidatorSet as ValidatorSpec;
-use client::Client;
+use client::EngineClient;
 use header::{Header, BlockNumber};
+use machine::{AuxiliaryData, Call, EthereumMachine};
 
 #[cfg(test)]
 pub use self::test::TestSet;
@@ -37,8 +39,6 @@ use self::contract::ValidatorContract;
 use self::safe_contract::ValidatorSafeContract;
 use self::multi::Multi;
 
-use super::{Call, Engine};
-
 /// A system-calling closure. Enacts calls on a block's state from the system address.
 pub type SystemCall<'a> = FnMut(Address, Bytes) -> Result<Bytes, String> + 'a;
 
@@ -111,9 +111,8 @@ pub trait ValidatorSet: Send + Sync {
 		&self,
 		first: bool,
 		header: &Header,
-		block: Option<&[u8]>,
-		receipts: Option<&[::receipt::Receipt]>,
-	) -> ::engines::EpochChange;
+		aux: AuxiliaryData,
+	) -> ::engines::EpochChange<EthereumMachine>;
 
 	/// Recover the validator set from the given proof, the block number, and
 	/// whether this header is first in its set.
@@ -123,7 +122,7 @@ pub trait ValidatorSet: Send + Sync {
 	///
 	/// Returns the set, along with a flag indicating whether finality of a specific
 	/// hash should be proven.
-	fn epoch_set(&self, first: bool, engine: &Engine, number: BlockNumber, proof: &[u8])
+	fn epoch_set(&self, first: bool, machine: &EthereumMachine, number: BlockNumber, proof: &[u8])
 		-> Result<(SimpleList, Option<H256>), ::error::Error>;
 
 	/// Checks if a given address is a validator, with the given function
@@ -141,5 +140,5 @@ pub trait ValidatorSet: Send + Sync {
 	/// Notifies about benign misbehaviour.
 	fn report_benign(&self, _validator: &Address, _set_block: BlockNumber, _block: BlockNumber) {}
 	/// Allows blockchain state access.
-	fn register_contract(&self, _client: Weak<Client>) {}
+	fn register_client(&self, _client: Weak<EngineClient>) {}
 }
diff --git a/ethcore/src/engines/validator_set/multi.rs b/ethcore/src/engines/validator_set/multi.rs
index 9acf6050b9f90af03e4b2467d7b4eb70cd8fabde..2794b57a2a43361d73d6ae8e18987368612a67cb 100644
--- a/ethcore/src/engines/validator_set/multi.rs
+++ b/ethcore/src/engines/validator_set/multi.rs
@@ -18,11 +18,13 @@
 
 use std::collections::BTreeMap;
 use std::sync::Weak;
-use engines::{Call, Engine};
-use util::{Bytes, H256, Address, RwLock};
+use ethereum_types::{H256, Address};
+use parking_lot::RwLock;
+use bytes::Bytes;
 use ids::BlockId;
 use header::{BlockNumber, Header};
-use client::{Client, BlockChainClient};
+use client::EngineClient;
+use machine::{AuxiliaryData, Call, EthereumMachine};
 use super::{SystemCall, ValidatorSet};
 
 type BlockNumberLookup = Box<Fn(BlockId) -> Result<BlockNumber, String> + Send + Sync + 'static>;
@@ -90,20 +92,20 @@ impl ValidatorSet for Multi {
 		set.is_epoch_end(first, chain_head)
 	}
 
-	fn signals_epoch_end(&self, _first: bool, header: &Header, block: Option<&[u8]>, receipts: Option<&[::receipt::Receipt]>)
-		-> ::engines::EpochChange
+	fn signals_epoch_end(&self, _first: bool, header: &Header, aux: AuxiliaryData)
+		-> ::engines::EpochChange<EthereumMachine>
 	{
 		let (set_block, set) = self.correct_set_by_number(header.number());
 		let first = set_block == header.number();
 
-		set.signals_epoch_end(first, header, block, receipts)
+		set.signals_epoch_end(first, header, aux)
 	}
 
-	fn epoch_set(&self, _first: bool, engine: &Engine, number: BlockNumber, proof: &[u8]) -> Result<(super::SimpleList, Option<H256>), ::error::Error> {
+	fn epoch_set(&self, _first: bool, machine: &EthereumMachine, number: BlockNumber, proof: &[u8]) -> Result<(super::SimpleList, Option<H256>), ::error::Error> {
 		let (set_block, set) = self.correct_set_by_number(number);
 		let first = set_block == number;
 
-		set.epoch_set(first, engine, number, proof)
+		set.epoch_set(first, machine, number, proof)
 	}
 
 	fn contains_with_caller(&self, bh: &H256, address: &Address, caller: &Call) -> bool {
@@ -129,13 +131,13 @@ impl ValidatorSet for Multi {
 		self.correct_set_by_number(set_block).1.report_benign(validator, set_block, block);
 	}
 
-	fn register_contract(&self, client: Weak<Client>) {
+	fn register_client(&self, client: Weak<EngineClient>) {
 		for set in self.sets.values() {
-			set.register_contract(client.clone());
+			set.register_client(client.clone());
 		}
 		*self.block_number.write() = Box::new(move |id| client
 			.upgrade()
-			.ok_or("No client!".into())
+			.ok_or_else(|| "No client!".into())
 			.and_then(|c| c.block_number(id).ok_or("Unknown block".into())));
 	}
 }
@@ -144,8 +146,9 @@ impl ValidatorSet for Multi {
 mod tests {
 	use std::sync::Arc;
 	use std::collections::BTreeMap;
+	use hash::keccak;
 	use account_provider::AccountProvider;
-	use client::{BlockChainClient, EngineClient};
+	use client::{BlockChainClient, ChainInfo, BlockInfo, ImportBlock};
 	use engines::EpochChange;
 	use engines::validator_set::ValidatorSet;
 	use ethkey::Secret;
@@ -154,20 +157,18 @@ mod tests {
 	use spec::Spec;
 	use tests::helpers::{generate_dummy_client_with_spec_and_accounts, generate_dummy_client_with_spec_and_data};
 	use types::ids::BlockId;
-	use util::*;
+	use ethereum_types::Address;
 
 	use super::Multi;
 
 	#[test]
 	fn uses_current_set() {
-		let _ = ::env_logger::init();
-
 		let tap = Arc::new(AccountProvider::transient_provider());
-		let s0: Secret = "0".sha3().into();
+		let s0: Secret = keccak("0").into();
 		let v0 = tap.insert_account(s0.clone(), "").unwrap();
-		let v1 = tap.insert_account("1".sha3().into(), "").unwrap();
+		let v1 = tap.insert_account(keccak("1").into(), "").unwrap();
 		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_validator_multi, Some(tap));
-		client.engine().register_client(Arc::downgrade(&client));
+		client.engine().register_client(Arc::downgrade(&client) as _);
 
 		// Make sure txs go through.
 		client.miner().set_gas_floor_target(1_000_000.into());
@@ -175,27 +176,27 @@ mod tests {
 		// Wrong signer for the first block.
 		client.miner().set_engine_signer(v1, "".into()).unwrap();
 		client.transact_contract(Default::default(), Default::default()).unwrap();
-		client.update_sealing();
+		::client::EngineClient::update_sealing(&*client);
 		assert_eq!(client.chain_info().best_block_number, 0);
 		// Right signer for the first block.
 		client.miner().set_engine_signer(v0, "".into()).unwrap();
-		client.update_sealing();
+		::client::EngineClient::update_sealing(&*client);
 		assert_eq!(client.chain_info().best_block_number, 1);
 		// This time v0 is wrong.
 		client.transact_contract(Default::default(), Default::default()).unwrap();
-		client.update_sealing();
+		::client::EngineClient::update_sealing(&*client);
 		assert_eq!(client.chain_info().best_block_number, 1);
 		client.miner().set_engine_signer(v1, "".into()).unwrap();
-		client.update_sealing();
+		::client::EngineClient::update_sealing(&*client);
 		assert_eq!(client.chain_info().best_block_number, 2);
 		// v1 is still good.
 		client.transact_contract(Default::default(), Default::default()).unwrap();
-		client.update_sealing();
+		::client::EngineClient::update_sealing(&*client);
 		assert_eq!(client.chain_info().best_block_number, 3);
 
 		// Check syncing.
 		let sync_client = generate_dummy_client_with_spec_and_data(Spec::new_validator_multi, 0, 0, &[]);
-		sync_client.engine().register_client(Arc::downgrade(&sync_client));
+		sync_client.engine().register_client(Arc::downgrade(&sync_client) as _);
 		for i in 1..4 {
 			sync_client.import_block(client.block(BlockId::Number(i)).unwrap().into_inner()).unwrap();
 		}
@@ -223,7 +224,7 @@ mod tests {
 		let mut header = Header::new();
 		header.set_number(499);
 
-		match multi.signals_epoch_end(false, &header, None, None) {
+		match multi.signals_epoch_end(false, &header, Default::default()) {
 			EpochChange::No => {},
 			_ => panic!("Expected no epoch signal change."),
 		}
@@ -231,7 +232,7 @@ mod tests {
 
 		header.set_number(500);
 
-		match multi.signals_epoch_end(false, &header, None, None) {
+		match multi.signals_epoch_end(false, &header, Default::default()) {
 			EpochChange::No => {},
 			_ => panic!("Expected no epoch signal change."),
 		}
diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs
index 1abcf2c8f5702cc125aee0b898a22da0566ffe67..490a762a610b2a0f2319e24e64983c62ce1d5c8c 100644
--- a/ethcore/src/engines/validator_set/safe_contract.rs
+++ b/ethcore/src/engines/validator_set/safe_contract.rs
@@ -17,16 +17,19 @@
 /// Validator set maintained in a contract, updated using `getValidators` method.
 
 use std::sync::{Weak, Arc};
-use futures::Future;
-use native_contracts::ValidatorSet as Provider;
+use hash::keccak;
 
-use util::*;
-use util::cache::MemoryLruCache;
+use ethereum_types::{H256, U256, Address, Bloom};
+use parking_lot::{Mutex, RwLock};
+
+use bytes::Bytes;
+use memory_cache::MemoryLruCache;
+use unexpected::Mismatch;
 use rlp::{UntrustedRlp, RlpStream};
+use kvdb::DBValue;
 
-use basic_types::LogBloom;
-use client::{Client, BlockChainClient};
-use engines::{Call, Engine};
+use client::EngineClient;
+use machine::{AuxiliaryData, Call, EthereumMachine, AuxiliaryRequest};
 use header::Header;
 use ids::BlockId;
 use log_entry::LogEntry;
@@ -35,21 +38,47 @@ use receipt::Receipt;
 use super::{SystemCall, ValidatorSet};
 use super::simple_list::SimpleList;
 
+use_contract!(validator_set, "ValidatorSet", "res/contracts/validator_set.json");
+
 const MEMOIZE_CAPACITY: usize = 500;
 
 // TODO: ethabi should be able to generate this.
 const EVENT_NAME: &'static [u8] = &*b"InitiateChange(bytes32,address[])";
 
 lazy_static! {
-	static ref EVENT_NAME_HASH: H256 = EVENT_NAME.sha3();
+	static ref EVENT_NAME_HASH: H256 = keccak(EVENT_NAME);
+}
+
+// state-dependent proofs for the safe contract:
+// only "first" proofs are such.
+struct StateProof {
+	contract_address: Address,
+	header: Mutex<Header>,
+	provider: validator_set::ValidatorSet,
+}
+
+impl ::engines::StateDependentProof<EthereumMachine> for StateProof {
+	fn generate_proof(&self, caller: &Call) -> Result<Vec<u8>, String> {
+		prove_initial(&self.provider, self.contract_address, &*self.header.lock(), caller)
+	}
+
+	fn check_proof(&self, machine: &EthereumMachine, proof: &[u8]) -> Result<(), String> {
+		let (header, state_items) = decode_first_proof(&UntrustedRlp::new(proof))
+			.map_err(|e| format!("proof incorrectly encoded: {}", e))?;
+		if &header != &*self.header.lock(){
+			return Err("wrong header in proof".into());
+		}
+
+		check_first_proof(machine, &self.provider, self.contract_address, header, &state_items).map(|_| ())
+	}
 }
 
 /// The validator contract should have the following interface:
 pub struct ValidatorSafeContract {
-	pub address: Address,
+	contract_address: Address,
 	validators: RwLock<MemoryLruCache<H256, SimpleList>>,
-	provider: Provider,
-	client: RwLock<Option<Weak<Client>>>, // TODO [keorn]: remove
+	provider: validator_set::ValidatorSet,
+	client: RwLock<Option<Weak<EngineClient>>>, // TODO [keorn]: remove
 }
 
 // first proof is just a state proof call of `getValidators` at header's state.
@@ -63,6 +92,59 @@ fn encode_first_proof(header: &Header, state_items: &[Vec<u8>]) -> Bytes {
 	stream.out()
 }
 
+// check a first proof: fetch the validator set at the given block.
+fn check_first_proof(machine: &EthereumMachine, provider: &validator_set::ValidatorSet, contract_address: Address, old_header: Header, state_items: &[DBValue])
+	-> Result<Vec<Address>, String>
+{
+	use transaction::{Action, Transaction};
+
+	// TODO: match client contract_call_tx more cleanly without duplication.
+	const PROVIDED_GAS: u64 = 50_000_000;
+
+	let env_info = ::vm::EnvInfo {
+		number: old_header.number(),
+		author: *old_header.author(),
+		difficulty: *old_header.difficulty(),
+		gas_limit: PROVIDED_GAS.into(),
+		timestamp: old_header.timestamp(),
+		last_hashes: {
+			// this will break if we don't inclue all 256 last hashes.
+			let mut last_hashes: Vec<_> = (0..256).map(|_| H256::default()).collect();
+			last_hashes[255] = *old_header.parent_hash();
+			Arc::new(last_hashes)
+		},
+		gas_used: 0.into(),
+	};
+
+	// check state proof using given machine.
+	let number = old_header.number();
+	provider.functions().get_validators().call(&|data| {
+		let from = Address::default();
+		let tx = Transaction {
+			nonce: machine.account_start_nonce(number),
+			action: Action::Call(contract_address),
+			gas: PROVIDED_GAS.into(),
+			gas_price: U256::default(),
+			value: U256::default(),
+			data,
+		}.fake_sign(from);
+
+		let res = ::state::check_proof(
+			state_items,
+			*old_header.state_root(),
+			&tx,
+			machine,
+			&env_info,
+		);
+
+		match res {
+			::state::ProvedExecution::BadProof => Err("Bad proof".into()),
+			::state::ProvedExecution::Failed(e) => Err(format!("Failed call: {}", e)),
+			::state::ProvedExecution::Complete(e) => Ok(e.output),
+		}
+	}).map_err(|err| err.to_string())
+}
+
 fn decode_first_proof(rlp: &UntrustedRlp) -> Result<(Header, Vec<DBValue>), ::error::Error> {
 	let header = rlp.val_at(0)?;
 	let state_items = rlp.at(1)?.iter().map(|x| {
@@ -89,19 +171,19 @@ fn decode_proof(rlp: &UntrustedRlp) -> Result<(Header, Vec<Receipt>), ::error::E
 
 // given a provider and caller, generate proof. this will just be a state proof
 // of `getValidators`.
-fn prove_initial(provider: &Provider, header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
+fn prove_initial(provider: &validator_set::ValidatorSet, contract_address: Address, header: &Header, caller: &Call) -> Result<Vec<u8>, String> {
 	use std::cell::RefCell;
 
 	let epoch_proof = RefCell::new(None);
 	let res = {
-		let caller = |a, d| {
-			let (result, proof) = caller(a, d)?;
+		let caller = |data| {
+			let (result, proof) = caller(contract_address, data)?;
 			*epoch_proof.borrow_mut() = Some(encode_first_proof(header, &proof));
 			Ok(result)
 		};
 
-		provider.get_validators(caller)
-			.wait()
+		provider.functions().get_validators().call(&caller)
+			.map_err(|err| err.to_string())
 	};
 
 	res.map(|validators| {
@@ -120,17 +202,18 @@ fn prove_initial(provider: &Provider, header: &Header, caller: &Call) -> Result<
 impl ValidatorSafeContract {
 	pub fn new(contract_address: Address) -> Self {
 		ValidatorSafeContract {
-			address: contract_address,
+			contract_address,
 			validators: RwLock::new(MemoryLruCache::new(MEMOIZE_CAPACITY)),
-			provider: Provider::new(contract_address),
+			provider: validator_set::ValidatorSet::default(),
 			client: RwLock::new(None),
 		}
 	}
 
 	/// Queries the state and gets the set of validators.
 	fn get_list(&self, caller: &Call) -> Option<SimpleList> {
-		let caller = move |a, d| caller(a, d).map(|x| x.0);
-		match self.provider.get_validators(caller).wait() {
+		let contract_address = self.contract_address;
+		let caller = move |data| caller(contract_address, data).map(|x| x.0);
+		match self.provider.functions().get_validators().call(&caller) {
 			Ok(new) => {
 				debug!(target: "engine", "Set of validators obtained: {:?}", new);
 				Some(SimpleList::new(new))
@@ -157,14 +240,14 @@ impl ValidatorSafeContract {
 	// produce the same bloom.
 	//
 	// The log data is an array of all new validator addresses.
-	fn expected_bloom(&self, header: &Header) -> LogBloom {
+	fn expected_bloom(&self, header: &Header) -> Bloom {
 		let topics = vec![*EVENT_NAME_HASH, *header.parent_hash()];
 
 		debug!(target: "engine", "Expected topics for header {}: {:?}",
 			header.hash(), topics);
 
 		LogEntry {
-			address: self.address,
+			address: self.contract_address,
 			topics: topics,
 			data: Vec::new(), // irrelevant for bloom.
 		}.bloom()
@@ -172,54 +255,31 @@ impl ValidatorSafeContract {
 
 	// check receipts for log event. bloom should be `expected_bloom` for the
 	// header the receipts correspond to.
-	fn extract_from_event(&self, bloom: LogBloom, header: &Header, receipts: &[Receipt]) -> Option<SimpleList> {
+	fn extract_from_event(&self, bloom: Bloom, header: &Header, receipts: &[Receipt]) -> Option<SimpleList> {
 		let check_log = |log: &LogEntry| {
-			log.address == self.address &&
+			log.address == self.contract_address &&
 				log.topics.len() == 2 &&
 				log.topics[0] == *EVENT_NAME_HASH &&
 				log.topics[1] == *header.parent_hash()
 		};
 
-		let event = Provider::contract(&self.provider)
-			.event("InitiateChange".into())
-			.expect("Contract known ahead of time to have `InitiateChange` event; qed");
-
-		// iterate in reverse because only the _last_ change in a given
-		// block actually has any effect.
-		// the contract should only increment the nonce once.
+		let event = self.provider.events().initiate_change();
+		//// iterate in reverse because only the _last_ change in a given
+		//// block actually has any effect.
+		//// the contract should only increment the nonce once.
 		let mut decoded_events = receipts.iter()
 			.rev()
-			.filter(|r| &bloom & &r.log_bloom == bloom)
+			.filter(|r| r.log_bloom.contains_bloom(&bloom))
 			.flat_map(|r| r.logs.iter())
 			.filter(move |l| check_log(l))
 			.filter_map(|log| {
-				let topics = log.topics.iter().map(|x| x.0.clone()).collect();
-				event.decode_log(topics, log.data.clone()).ok()
+				event.parse_log((log.topics.clone(), log.data.clone()).into()).ok()
 			});
 
+		// only last log is taken into account
 		match decoded_events.next() {
 			None => None,
-			Some(matched_event) => {
-
-				// decode log manually until the native contract generator is
-				// good enough to do it for us.
-				let validators_token = &matched_event[1].value;
-
-				let validators = validators_token.clone().to_array()
-					.and_then(|a| a.into_iter()
-						.map(|x| x.to_address().map(H160))
-						.collect::<Option<Vec<_>>>()
-					)
-					.map(SimpleList::new);
-
-				if validators.is_none() {
-					debug!(target: "engine", "Successfully decoded log turned out to be bad.");
-				}
-
-				trace!(target: "engine", "decoded log. validators: {:?}", validators);
-
-				validators
-			}
+			Some(matched_event) => Some(SimpleList::new(matched_event.new_set))
 		}
 	}
 }
@@ -229,35 +289,46 @@ impl ValidatorSet for ValidatorSafeContract {
 		let client = self.client.read().clone();
 		Box::new(move |addr, data| client.as_ref()
 			.and_then(Weak::upgrade)
-			.ok_or("No client!".into())
-			.and_then(|c| c.call_contract(id, addr, data))
+			.ok_or_else(|| "No client!".into())
+			.and_then(|c| {
+				match c.as_full_client() {
+					Some(c) => c.call_contract(id, addr, data),
+					None => Err("No full client!".into()),
+				}
+			})
 			.map(|out| (out, Vec::new()))) // generate no proofs in general
 	}
 
 	fn on_epoch_begin(&self, _first: bool, _header: &Header, caller: &mut SystemCall) -> Result<(), ::error::Error> {
-		self.provider.finalize_change(caller)
-			.wait()
+		let data = self.provider.functions().finalize_change().input();
+		caller(self.contract_address, data)
+			.map(|_| ())
 			.map_err(::engines::EngineError::FailedSystemCall)
 			.map_err(Into::into)
 	}
 
 	fn genesis_epoch_data(&self, header: &Header, call: &Call) -> Result<Vec<u8>, String> {
-		prove_initial(&self.provider, header, call)
+		prove_initial(&self.provider, self.contract_address, header, call)
 	}
 
 	fn is_epoch_end(&self, _first: bool, _chain_head: &Header) -> Option<Vec<u8>> {
 		None // no immediate transitions to contract.
 	}
 
-	fn signals_epoch_end(&self, first: bool, header: &Header, _block: Option<&[u8]>, receipts: Option<&[Receipt]>)
-		-> ::engines::EpochChange
+	fn signals_epoch_end(&self, first: bool, header: &Header, aux: AuxiliaryData)
+		-> ::engines::EpochChange<EthereumMachine>
 	{
+		let receipts = aux.receipts;
+
 		// transition to the first block of a contract requires finality but has no log event.
 		if first {
 			debug!(target: "engine", "signalling transition to fresh contract.");
-			let (provider, header) = (self.provider.clone(), header.clone());
-			let with_caller: Box<Fn(&Call) -> _> = Box::new(move |caller| prove_initial(&provider, &header, caller));
-			return ::engines::EpochChange::Yes(::engines::Proof::WithState(with_caller))
+			let state_proof = Arc::new(StateProof {
+				contract_address: self.contract_address,
+				header: Mutex::new(header.clone()),
+				provider: validator_set::ValidatorSet::default(),
+			});
+			return ::engines::EpochChange::Yes(::engines::Proof::WithState(state_proof as Arc<_>));
 		}
 
 		// otherwise, we're checking for logs.
@@ -269,7 +340,7 @@ impl ValidatorSet for ValidatorSafeContract {
 		trace!(target: "engine", "detected epoch change event bloom");
 
 		match receipts {
-			None => ::engines::EpochChange::Unsure(::engines::Unsure::NeedsReceipts),
+			None => ::engines::EpochChange::Unsure(AuxiliaryRequest::Receipts),
 			Some(receipts) => match self.extract_from_event(bloom, header, receipts) {
 				None => ::engines::EpochChange::No,
 				Some(list) => {
@@ -283,64 +354,19 @@ impl ValidatorSet for ValidatorSafeContract {
 		}
 	}
 
-	fn epoch_set(&self, first: bool, engine: &Engine, _number: ::header::BlockNumber, proof: &[u8])
+	fn epoch_set(&self, first: bool, machine: &EthereumMachine, _number: ::header::BlockNumber, proof: &[u8])
 		-> Result<(SimpleList, Option<H256>), ::error::Error>
 	{
-		use transaction::{Action, Transaction};
-
 		let rlp = UntrustedRlp::new(proof);
 
 		if first {
 			trace!(target: "engine", "Recovering initial epoch set");
 
-			// TODO: match client contract_call_tx more cleanly without duplication.
-			const PROVIDED_GAS: u64 = 50_000_000;
-
 			let (old_header, state_items) = decode_first_proof(&rlp)?;
-			let old_hash = old_header.hash();
-
-			let env_info = ::vm::EnvInfo {
-				number: old_header.number(),
-				author: *old_header.author(),
-				difficulty: *old_header.difficulty(),
-				gas_limit: PROVIDED_GAS.into(),
-				timestamp: old_header.timestamp(),
-				last_hashes: {
-					// this will break if we don't inclue all 256 last hashes.
-					let mut last_hashes: Vec<_> = (0..256).map(|_| H256::default()).collect();
-					last_hashes[255] = *old_header.parent_hash();
-					Arc::new(last_hashes)
-				},
-				gas_used: 0.into(),
-			};
-
-			// check state proof using given engine.
 			let number = old_header.number();
-			let addresses = self.provider.get_validators(move |a, d| {
-				let from = Address::default();
-				let tx = Transaction {
-					nonce: engine.account_start_nonce(number),
-					action: Action::Call(a),
-					gas: PROVIDED_GAS.into(),
-					gas_price: U256::default(),
-					value: U256::default(),
-					data: d,
-				}.fake_sign(from);
-
-				let res = ::state::check_proof(
-					&state_items,
-					*old_header.state_root(),
-					&tx,
-					engine,
-					&env_info,
-				);
-
-				match res {
-					::state::ProvedExecution::BadProof => Err("Bad proof".into()),
-					::state::ProvedExecution::Failed(e) => Err(format!("Failed call: {}", e)),
-					::state::ProvedExecution::Complete(e) => Ok(e.output),
-				}
-			}).wait().map_err(::engines::EngineError::InsufficientProof)?;
+			let old_hash = old_header.hash();
+			let addresses = check_first_proof(machine, &self.provider, self.contract_address, old_header, &state_items)
+				.map_err(::engines::EngineError::InsufficientProof)?;
 
 			trace!(target: "engine", "extracted epoch set at #{}: {} addresses",
 				number, addresses.len());
@@ -351,8 +377,8 @@ impl ValidatorSet for ValidatorSafeContract {
 
 			// ensure receipts match header.
 			// TODO: optimize? these were just decoded.
-			let found_root = ::util::triehash::ordered_trie_root(
-				receipts.iter().map(::rlp::encode).map(|x| x.to_vec())
+			let found_root = ::triehash::ordered_trie_root(
+				receipts.iter().map(::rlp::encode)
 			);
 			if found_root != *old_header.receipts_root() {
 				return Err(::error::BlockError::InvalidReceiptsRoot(
@@ -414,7 +440,7 @@ impl ValidatorSet for ValidatorSafeContract {
 				 }))
 	}
 
-	fn register_contract(&self, client: Weak<Client>) {
+	fn register_client(&self, client: Weak<EngineClient>) {
 		trace!(target: "engine", "Setting up contract caller.");
 		*self.client.write() = Some(client);
 	}
@@ -424,12 +450,13 @@ impl ValidatorSet for ValidatorSafeContract {
 mod tests {
 	use std::sync::Arc;
 	use rustc_hex::FromHex;
-	use util::*;
+	use hash::keccak;
+	use ethereum_types::Address;
 	use types::ids::BlockId;
 	use spec::Spec;
 	use account_provider::AccountProvider;
 	use transaction::{Transaction, Action};
-	use client::{BlockChainClient, EngineClient};
+	use client::{ChainInfo, BlockInfo, ImportBlock};
 	use ethkey::Secret;
 	use miner::MinerService;
 	use tests::helpers::{generate_dummy_client_with_spec_and_accounts, generate_dummy_client_with_spec_and_data};
@@ -440,7 +467,7 @@ mod tests {
 	fn fetches_validators() {
 		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_validator_safe_contract, None);
 		let vc = Arc::new(ValidatorSafeContract::new("0000000000000000000000000000000000000005".parse::<Address>().unwrap()));
-		vc.register_contract(Arc::downgrade(&client));
+		vc.register_client(Arc::downgrade(&client) as _);
 		let last_hash = client.best_block_header().hash();
 		assert!(vc.contains(&last_hash, &"7d577a597b2742b498cb5cf0c26cdcd726d39e6e".parse::<Address>().unwrap()));
 		assert!(vc.contains(&last_hash, &"82a978b3f5962a5b0957d9ee9eef472ee55b42f1".parse::<Address>().unwrap()));
@@ -449,12 +476,12 @@ mod tests {
 	#[test]
 	fn knows_validators() {
 		let tap = Arc::new(AccountProvider::transient_provider());
-		let s0: Secret = "1".sha3().into();
+		let s0: Secret = keccak("1").into();
 		let v0 = tap.insert_account(s0.clone(), "").unwrap();
-		let v1 = tap.insert_account("0".sha3().into(), "").unwrap();
+		let v1 = tap.insert_account(keccak("0").into(), "").unwrap();
 		let chain_id = Spec::new_validator_safe_contract().chain_id();
 		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_validator_safe_contract, Some(tap));
-		client.engine().register_client(Arc::downgrade(&client));
+		client.engine().register_client(Arc::downgrade(&client) as _);
 		let validator_contract = "0000000000000000000000000000000000000005".parse::<Address>().unwrap();
 
 		client.miner().set_engine_signer(v1, "".into()).unwrap();
@@ -468,7 +495,7 @@ mod tests {
 			data: "bfc708a000000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1".from_hex().unwrap(),
 		}.sign(&s0, Some(chain_id));
 		client.miner().import_own_transaction(client.as_ref(), tx.into()).unwrap();
-		client.update_sealing();
+		::client::EngineClient::update_sealing(&*client);
 		assert_eq!(client.chain_info().best_block_number, 1);
 		// Add "1" validator back in.
 		let tx = Transaction {
@@ -480,13 +507,13 @@ mod tests {
 			data: "4d238c8e00000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1".from_hex().unwrap(),
 		}.sign(&s0, Some(chain_id));
 		client.miner().import_own_transaction(client.as_ref(), tx.into()).unwrap();
-		client.update_sealing();
+		::client::EngineClient::update_sealing(&*client);
 		// The transaction is not yet included so still unable to seal.
 		assert_eq!(client.chain_info().best_block_number, 1);
 
 		// Switch to the validator that is still there.
 		client.miner().set_engine_signer(v0, "".into()).unwrap();
-		client.update_sealing();
+		::client::EngineClient::update_sealing(&*client);
 		assert_eq!(client.chain_info().best_block_number, 2);
 		// Switch back to the added validator, since the state is updated.
 		client.miner().set_engine_signer(v1, "".into()).unwrap();
@@ -499,13 +526,13 @@ mod tests {
 			data: Vec::new(),
 		}.sign(&s0, Some(chain_id));
 		client.miner().import_own_transaction(client.as_ref(), tx.into()).unwrap();
-		client.update_sealing();
+		::client::EngineClient::update_sealing(&*client);
 		// Able to seal again.
 		assert_eq!(client.chain_info().best_block_number, 3);
 
 		// Check syncing.
 		let sync_client = generate_dummy_client_with_spec_and_data(Spec::new_validator_safe_contract, 0, 0, &[]);
-		sync_client.engine().register_client(Arc::downgrade(&sync_client));
+		sync_client.engine().register_client(Arc::downgrade(&sync_client) as _);
 		for i in 1..4 {
 			sync_client.import_block(client.block(BlockId::Number(i)).unwrap().into_inner()).unwrap();
 		}
@@ -516,7 +543,8 @@ mod tests {
 	#[test]
 	fn detects_bloom() {
 		use header::Header;
-		use engines::{EpochChange, Unsure};
+		use engines::EpochChange;
+		use machine::AuxiliaryRequest;
 		use log_entry::LogEntry;
 
 		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_validator_safe_contract, None);
@@ -536,7 +564,7 @@ mod tests {
 		};
 
 		new_header.set_log_bloom(event.bloom());
-		match engine.signals_epoch_end(&new_header, None, None) {
+		match engine.signals_epoch_end(&new_header, Default::default()) {
 			EpochChange::No => {},
 			_ => panic!("Expected bloom to be unrecognized."),
 		};
@@ -545,8 +573,8 @@ mod tests {
 		event.topics.push(last_hash);
 		new_header.set_log_bloom(event.bloom());
 
-		match engine.signals_epoch_end(&new_header, None, None) {
-			EpochChange::Unsure(Unsure::NeedsReceipts) => {},
+		match engine.signals_epoch_end(&new_header, Default::default()) {
+			EpochChange::Unsure(AuxiliaryRequest::Receipts) => {},
 			_ => panic!("Expected bloom to be recognized."),
 		};
 	}
@@ -562,7 +590,7 @@ mod tests {
 		let mut new_header = Header::default();
 		new_header.set_number(0); // so the validator set doesn't look for a log
 
-		match engine.signals_epoch_end(&new_header, None, None) {
+		match engine.signals_epoch_end(&new_header, Default::default()) {
 			EpochChange::Yes(Proof::WithState(_)) => {},
 			_ => panic!("Expected state to be required to prove initial signal"),
 		};
diff --git a/ethcore/src/engines/validator_set/simple_list.rs b/ethcore/src/engines/validator_set/simple_list.rs
index 8b8d1942d5441da1ee12b9be85d3aca81f7dfeb4..bb67c9778bf2606fefa3daa8ce5ff4e48873d40b 100644
--- a/ethcore/src/engines/validator_set/simple_list.rs
+++ b/ethcore/src/engines/validator_set/simple_list.rs
@@ -16,9 +16,10 @@
 
 /// Preconfigured validator list.
 
-use util::{H256, Address, HeapSizeOf};
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, Address};
 
-use engines::{Call, Engine};
+use machine::{AuxiliaryData, Call, EthereumMachine};
 use header::{BlockNumber, Header};
 use super::ValidatorSet;
 
@@ -74,13 +75,13 @@ impl ValidatorSet for SimpleList {
 		}
 	}
 
-	fn signals_epoch_end(&self, _: bool, _: &Header, _: Option<&[u8]>, _: Option<&[::receipt::Receipt]>)
-		-> ::engines::EpochChange
+	fn signals_epoch_end(&self, _: bool, _: &Header, _: AuxiliaryData)
+		-> ::engines::EpochChange<EthereumMachine>
 	{
 		::engines::EpochChange::No
 	}
 
-	fn epoch_set(&self, _first: bool, _: &Engine, _: BlockNumber, _: &[u8]) -> Result<(SimpleList, Option<H256>), ::error::Error> {
+	fn epoch_set(&self, _first: bool, _: &EthereumMachine, _: BlockNumber, _: &[u8]) -> Result<(SimpleList, Option<H256>), ::error::Error> {
 		Ok((self.clone(), None))
 	}
 
@@ -106,7 +107,7 @@ impl ValidatorSet for SimpleList {
 #[cfg(test)]
 mod tests {
 	use std::str::FromStr;
-	use util::Address;
+	use ethereum_types::Address;
 	use super::super::ValidatorSet;
 	use super::SimpleList;
 
diff --git a/ethcore/src/engines/validator_set/test.rs b/ethcore/src/engines/validator_set/test.rs
index 25eeff66e66cbcb75b742cafaf990351b2e0b965..a6b89304544f336e39d63720d73d1b5decb94f5e 100644
--- a/ethcore/src/engines/validator_set/test.rs
+++ b/ethcore/src/engines/validator_set/test.rs
@@ -19,9 +19,11 @@
 use std::str::FromStr;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
-use util::{Bytes, H256, Address, HeapSizeOf};
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, Address};
+use bytes::Bytes;
 
-use engines::{Call, Engine};
+use machine::{AuxiliaryData, Call, EthereumMachine};
 use header::{Header, BlockNumber};
 use super::{ValidatorSet, SimpleList};
 
@@ -55,13 +57,13 @@ impl ValidatorSet for TestSet {
 
 	fn is_epoch_end(&self, _first: bool, _chain_head: &Header) -> Option<Vec<u8>> { None }
 
-	fn signals_epoch_end(&self, _: bool, _: &Header, _: Option<&[u8]>, _: Option<&[::receipt::Receipt]>)
-		-> ::engines::EpochChange
+	fn signals_epoch_end(&self, _: bool, _: &Header, _: AuxiliaryData)
+		-> ::engines::EpochChange<EthereumMachine>
 	{
 		::engines::EpochChange::No
 	}
 
-	fn epoch_set(&self, _: bool, _: &Engine, _: BlockNumber, _: &[u8]) -> Result<(SimpleList, Option<H256>), ::error::Error> {
+	fn epoch_set(&self, _: bool, _: &EthereumMachine, _: BlockNumber, _: &[u8]) -> Result<(SimpleList, Option<H256>), ::error::Error> {
 		Ok((self.validator.clone(), None))
 	}
 
diff --git a/ethcore/src/engines/vote_collector.rs b/ethcore/src/engines/vote_collector.rs
index b934fdb2ebff182ef90ccc0bb1e27ca3aaa2ef07..7af66b30c5d27e91d50b821401ae02e6e3757d63 100644
--- a/ethcore/src/engines/vote_collector.rs
+++ b/ethcore/src/engines/vote_collector.rs
@@ -19,7 +19,9 @@
 use std::fmt::Debug;
 use std::collections::{BTreeMap, HashSet, HashMap};
 use std::hash::Hash;
-use util::*;
+use ethereum_types::{H256, H520, Address};
+use parking_lot:: RwLock;
+use bytes::Bytes;
 use rlp::{Encodable, RlpStream};
 
 pub trait Message: Clone + PartialEq + Eq + Hash + Encodable + Debug {
@@ -43,18 +45,18 @@ pub struct VoteCollector<M: Message> {
 #[derive(Debug, Default)]
 struct StepCollector<M: Message> {
 	voted: HashMap<Address, M>,
-	pub block_votes: HashMap<Option<H256>, HashMap<H520, Address>>,
+	block_votes: HashMap<Option<H256>, HashMap<H520, Address>>,
 	messages: HashSet<M>,
 }
 
 #[derive(Debug)]
-pub struct DoubleVote<'a, M: Message> {
-	pub author: &'a Address,
+pub struct DoubleVote<M: Message> {
+	author: Address,
 	vote_one: M,
 	vote_two: M,
 }
 
-impl<'a, M: Message> Encodable for DoubleVote<'a, M> {
+impl<M: Message> Encodable for DoubleVote<M> {
 	fn rlp_append(&self, s: &mut RlpStream) {
 		s.begin_list(2)
 			.append(&self.vote_one)
@@ -64,10 +66,10 @@ impl<'a, M: Message> Encodable for DoubleVote<'a, M> {
 
 impl <M: Message> StepCollector<M> {
 	/// Returns Some(&Address) when validator is double voting.
-	fn insert<'a>(&mut self, message: M, address: &'a Address) -> Option<DoubleVote<'a, M>> {
+	fn insert(&mut self, message: M, address: Address) -> Option<DoubleVote<M>> {
 		// Do nothing when message was seen.
 		if self.messages.insert(message.clone()) {
-			if let Some(previous) = self.voted.insert(address.clone(), message.clone()) {
+			if let Some(previous) = self.voted.insert(address, message.clone()) {
 				// Bad validator sent a different message.
 				return Some(DoubleVote {
 					author: address,
@@ -79,7 +81,7 @@ impl <M: Message> StepCollector<M> {
 					.block_votes
 					.entry(message.block_hash())
 					.or_insert_with(HashMap::new)
-					.insert(message.signature(), address.clone());
+					.insert(message.signature(), address);
 			}
 		}
 		None
@@ -122,7 +124,7 @@ impl <M: Message + Default> Default for VoteCollector<M> {
 
 impl <M: Message + Default + Encodable + Debug> VoteCollector<M> {
 	/// Insert vote if it is newer than the oldest one.
-	pub fn vote<'a>(&self, message: M, voter: &'a Address) -> Option<DoubleVote<'a, M>> {
+	pub fn vote(&self, message: M, voter: Address) -> Option<DoubleVote<M>> {
 		self
 			.votes
 			.write()
@@ -196,17 +198,12 @@ impl <M: Message + Default + Encodable + Debug> VoteCollector<M> {
 		let guard = self.votes.read();
 		guard.get(&message.round()).and_then(|c| c.block_votes.get(&message.block_hash())).and_then(|origins| origins.get(&message.signature()).cloned())
 	}
-
-	/// Count the number of total rounds kept track of.
-	#[cfg(test)]
-	pub fn len(&self) -> usize {
-		self.votes.read().len()
-	}
 }
 
 #[cfg(test)]
 mod tests {
-	use util::*;
+	use hash::keccak;
+	use ethereum_types::{H160, H256};
 	use rlp::*;
 	use super::*;
 
@@ -241,17 +238,17 @@ mod tests {
 	}
 
 	fn random_vote(collector: &VoteCollector<TestMessage>, signature: H520, step: TestStep, block_hash: Option<H256>) -> bool {
-		full_vote(collector, signature, step, block_hash, &H160::random())
+		full_vote(collector, signature, step, block_hash, H160::random())
 	}
 
-	fn full_vote<'a>(collector: &VoteCollector<TestMessage>, signature: H520, step: TestStep, block_hash: Option<H256>, address: &'a Address) -> bool {
+	fn full_vote(collector: &VoteCollector<TestMessage>, signature: H520, step: TestStep, block_hash: Option<H256>, address: Address) -> bool {
 		collector.vote(TestMessage { signature: signature, step: step, block_hash: block_hash }, address).is_none()
 	}
 
 	#[test]
 	fn seal_retrieval() {
 		let collector = VoteCollector::default();
-		let bh = Some("1".sha3());
+		let bh = Some(keccak("1"));
 		let mut signatures = Vec::new();
 		for _ in 0..5 {
 			signatures.push(H520::random());
@@ -263,9 +260,9 @@ mod tests {
 		// Good proposal
 		random_vote(&collector, signatures[0].clone(), propose_round.clone(), bh.clone());
 		// Wrong block proposal.
-		random_vote(&collector, signatures[0].clone(), propose_round.clone(), Some("0".sha3()));
+		random_vote(&collector, signatures[0].clone(), propose_round.clone(), Some(keccak("0")));
 		// Wrong block commit.
-		random_vote(&collector, signatures[3].clone(), commit_round.clone(), Some("0".sha3()));
+		random_vote(&collector, signatures[3].clone(), commit_round.clone(), Some(keccak("0")));
 		// Wrong round.
 		random_vote(&collector, signatures[0].clone(), 6, bh.clone());
 		// Wrong round.
@@ -291,22 +288,22 @@ mod tests {
 		let round1 = 1;
 		let round3 = 3;
 		// good 1
-		random_vote(&collector, H520::random(), round1, Some("0".sha3()));
-		random_vote(&collector, H520::random(), 0, Some("0".sha3()));
+		random_vote(&collector, H520::random(), round1, Some(keccak("0")));
+		random_vote(&collector, H520::random(), 0, Some(keccak("0")));
 		// good 3
-		random_vote(&collector, H520::random(), round3, Some("0".sha3()));
-		random_vote(&collector, H520::random(), 2, Some("0".sha3()));
+		random_vote(&collector, H520::random(), round3, Some(keccak("0")));
+		random_vote(&collector, H520::random(), 2, Some(keccak("0")));
 		// good prevote
-		random_vote(&collector, H520::random(), round1, Some("1".sha3()));
+		random_vote(&collector, H520::random(), round1, Some(keccak("1")));
 		// good prevote
 		let same_sig = H520::random();
-		random_vote(&collector, same_sig.clone(), round1, Some("1".sha3()));
-		random_vote(&collector, same_sig, round1, Some("1".sha3()));
+		random_vote(&collector, same_sig.clone(), round1, Some(keccak("1")));
+		random_vote(&collector, same_sig, round1, Some(keccak("1")));
 		// good precommit
-		random_vote(&collector, H520::random(), round3, Some("1".sha3()));
+		random_vote(&collector, H520::random(), round3, Some(keccak("1")));
 		// good prevote
-		random_vote(&collector, H520::random(), round1, Some("0".sha3()));
-		random_vote(&collector, H520::random(), 4, Some("2".sha3()));
+		random_vote(&collector, H520::random(), round1, Some(keccak("0")));
+		random_vote(&collector, H520::random(), 4, Some(keccak("2")));
 
 		assert_eq!(collector.count_round_votes(&round1), 4);
 		assert_eq!(collector.count_round_votes(&round3), 2);
@@ -314,7 +311,7 @@ mod tests {
 		let message = TestMessage {
 			signature: H520::default(),
 			step: round1,
-			block_hash: Some("1".sha3())
+			block_hash: Some(keccak("1"))
 		};
 		assert_eq!(collector.count_aligned_votes(&message), 2);
 	}
@@ -325,14 +322,18 @@ mod tests {
 		let vote = |round, hash| {
 			random_vote(&collector, H520::random(), round, hash);
 		};
-		vote(6, Some("0".sha3()));
-		vote(3, Some("0".sha3()));
-		vote(7, Some("0".sha3()));
-		vote(8, Some("1".sha3()));
-		vote(1, Some("1".sha3()));
+		vote(6, Some(keccak("0")));
+		vote(3, Some(keccak("0")));
+		vote(7, Some(keccak("0")));
+		vote(8, Some(keccak("1")));
+		vote(1, Some(keccak("1")));
 
 		collector.throw_out_old(&7);
-		assert_eq!(collector.len(), 2);
+		assert_eq!(collector.count_round_votes(&1), 0);
+		assert_eq!(collector.count_round_votes(&3), 0);
+		assert_eq!(collector.count_round_votes(&6), 0);
+		assert_eq!(collector.count_round_votes(&7), 1);
+		assert_eq!(collector.count_round_votes(&8), 1);
 	}
 
 	#[test]
@@ -340,9 +341,9 @@ mod tests {
 		let collector = VoteCollector::default();
 		let round = 3;
 		// Vote is inserted fine.
-		assert!(full_vote(&collector, H520::random(), round, Some("0".sha3()), &Address::default()));
+		assert!(full_vote(&collector, H520::random(), round, Some(keccak("0")), Address::default()));
 		// Returns the double voting address.
-		assert!(!full_vote(&collector, H520::random(), round, Some("1".sha3()), &Address::default()));
+		assert!(!full_vote(&collector, H520::random(), round, Some(keccak("1")), Address::default()));
 		assert_eq!(collector.count_round_votes(&round), 1);
 	}
 }
diff --git a/ethcore/src/error.rs b/ethcore/src/error.rs
index 172323c0da4eb4a56841121ca86a6eadd82a2960..dd4cf498673eef5bd4d27d3d737884792a4d7e8d 100644
--- a/ethcore/src/error.rs
+++ b/ethcore/src/error.rs
@@ -17,99 +17,23 @@
 //! General error types for use in ethcore.
 
 use std::fmt;
-use util::*;
+use kvdb;
+use ethereum_types::{H256, U256, Address, Bloom};
+use util_error::UtilError;
+use snappy::InvalidInput;
+use unexpected::{Mismatch, OutOfBounds};
+use trie::TrieError;
 use io::*;
 use header::BlockNumber;
-use basic_types::LogBloom;
 use client::Error as ClientError;
-use ipc::binary::{BinaryConvertError, BinaryConvertable};
 use snapshot::Error as SnapshotError;
 use engines::EngineError;
 use ethkey::Error as EthkeyError;
 use account_provider::SignError as AccountsError;
+use transaction::Error as TransactionError;
 
 pub use executed::{ExecutionError, CallError};
 
-#[derive(Debug, PartialEq, Clone, Copy)]
-/// Errors concerning transaction processing.
-pub enum TransactionError {
-	/// Transaction is already imported to the queue
-	AlreadyImported,
-	/// Transaction is not valid anymore (state already has higher nonce)
-	Old,
-	/// Transaction has too low fee
-	/// (there is already a transaction with the same sender-nonce but higher gas price)
-	TooCheapToReplace,
-	/// Transaction was not imported to the queue because limit has been reached.
-	LimitReached,
-	/// Transaction's gas price is below threshold.
-	InsufficientGasPrice {
-		/// Minimal expected gas price
-		minimal: U256,
-		/// Transaction gas price
-		got: U256,
-	},
-	/// Transaction's gas is below currently set minimal gas requirement.
-	InsufficientGas {
-		/// Minimal expected gas
-		minimal: U256,
-		/// Transaction gas
-		got: U256,
-	},
-	/// Sender doesn't have enough funds to pay for this transaction
-	InsufficientBalance {
-		/// Senders balance
-		balance: U256,
-		/// Transaction cost
-		cost: U256,
-	},
-	/// Transactions gas is higher then current gas limit
-	GasLimitExceeded {
-		/// Current gas limit
-		limit: U256,
-		/// Declared transaction gas
-		got: U256,
-	},
-	/// Transaction's gas limit (aka gas) is invalid.
-	InvalidGasLimit(OutOfBounds<U256>),
-	/// Transaction sender is banned.
-	SenderBanned,
-	/// Transaction receipient is banned.
-	RecipientBanned,
-	/// Contract creation code is banned.
-	CodeBanned,
-	/// Invalid chain ID given.
-	InvalidChainId,
-}
-
-impl fmt::Display for TransactionError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		use self::TransactionError::*;
-		let msg = match *self {
-			AlreadyImported => "Already imported".into(),
-			Old => "No longer valid".into(),
-			TooCheapToReplace => "Gas price too low to replace".into(),
-			LimitReached => "Transaction limit reached".into(),
-			InsufficientGasPrice { minimal, got } =>
-				format!("Insufficient gas price. Min={}, Given={}", minimal, got),
-			InsufficientGas { minimal, got } =>
-				format!("Insufficient gas. Min={}, Given={}", minimal, got),
-			InsufficientBalance { balance, cost } =>
-				format!("Insufficient balance for transaction. Balance={}, Cost={}",
-					balance, cost),
-			GasLimitExceeded { limit, got } =>
-				format!("Gas limit exceeded. Limit={}, Given={}", limit, got),
-			InvalidGasLimit(ref err) => format!("Invalid gas limit. {}", err),
-			SenderBanned => "Sender is temporarily banned.".into(),
-			RecipientBanned => "Recipient is temporarily banned.".into(),
-			CodeBanned => "Contract code is temporarily banned.".into(),
-			InvalidChainId => "Transaction of this chain ID is not allowed on this chain.".into(),
-		};
-
-		f.write_fmt(format_args!("Transaction error ({})", msg))
-	}
-}
-
 #[derive(Debug, PartialEq, Clone, Copy, Eq)]
 /// Errors concerning block processing.
 pub enum BlockError {
@@ -158,8 +82,10 @@ pub enum BlockError {
 	InvalidReceiptsRoot(Mismatch<H256>),
 	/// Timestamp header field is invalid.
 	InvalidTimestamp(OutOfBounds<u64>),
+	/// Timestamp header field is too far in future.
+	TemporarilyInvalid(OutOfBounds<u64>),
 	/// Log bloom header field is invalid.
-	InvalidLogBloom(Mismatch<LogBloom>),
+	InvalidLogBloom(Mismatch<Bloom>),
 	/// Parent hash field of header is invalid; this is an invalid error indicating a logic flaw in the codebase.
 	/// TODO: remove and favour an assert!/panic!.
 	InvalidParentHash(Mismatch<H256>),
@@ -203,6 +129,7 @@ impl fmt::Display for BlockError {
 			InvalidGasLimit(ref oob) => format!("Invalid gas limit: {}", oob),
 			InvalidReceiptsRoot(ref mis) => format!("Invalid receipts trie root in header: {}", mis),
 			InvalidTimestamp(ref oob) => format!("Invalid timestamp in header: {}", oob),
+			TemporarilyInvalid(ref oob) => format!("Future timestamp in header: {}", oob),
 			InvalidLogBloom(ref oob) => format!("Invalid log bloom in header: {}", oob),
 			InvalidParentHash(ref mis) => format!("Invalid parent hash: {}", mis),
 			InvalidNumber(ref mis) => format!("Invalid number in header: {}", mis),
@@ -260,15 +187,6 @@ impl From<Error> for BlockImportError {
 	}
 }
 
-/// Represents the result of importing transaction.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum TransactionImportResult {
-	/// Transaction was imported to current queue.
-	Current,
-	/// Transaction was imported to future queue.
-	Future
-}
-
 /// Api-level error for transaction import
 #[derive(Debug, Clone)]
 pub enum TransactionImportError {
@@ -292,6 +210,8 @@ impl From<Error> for TransactionImportError {
 pub enum Error {
 	/// Client configuration error.
 	Client(ClientError),
+	/// Database error.
+	Database(kvdb::Error),
 	/// Error concerning a utility.
 	Util(UtilError),
 	/// Error concerning block processing.
@@ -315,7 +235,7 @@ pub enum Error {
 	/// Standard io error.
 	StdIo(::std::io::Error),
 	/// Snappy error.
-	Snappy(::util::snappy::InvalidInput),
+	Snappy(InvalidInput),
 	/// Snapshot error.
 	Snapshot(SnapshotError),
 	/// Consensus vote error.
@@ -330,6 +250,7 @@ impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match *self {
 			Error::Client(ref err) => err.fmt(f),
+			Error::Database(ref err) => err.fmt(f),
 			Error::Util(ref err) => err.fmt(f),
 			Error::Io(ref err) => err.fmt(f),
 			Error::Block(ref err) => err.fmt(f),
@@ -363,6 +284,12 @@ impl From<ClientError> for Error {
 	}
 }
 
+impl From<kvdb::Error> for Error {
+	fn from(err: kvdb::Error) -> Error {
+		Error::Database(err)
+	}
+}
+
 impl From<TransactionError> for Error {
 	fn from(err: TransactionError) -> Error {
 		Error::Transaction(err)
@@ -389,7 +316,7 @@ impl From<ExecutionError> for Error {
 
 impl From<::rlp::DecoderError> for Error {
 	fn from(err: ::rlp::DecoderError) -> Error {
-		Error::Util(UtilError::Decoder(err))
+		Error::Util(UtilError::from(err))
 	}
 }
 
@@ -422,13 +349,13 @@ impl From<BlockImportError> for Error {
 		match err {
 			BlockImportError::Block(e) => Error::Block(e),
 			BlockImportError::Import(e) => Error::Import(e),
-			BlockImportError::Other(s) => Error::Util(UtilError::SimpleString(s)),
+			BlockImportError::Other(s) => Error::Util(UtilError::from(s)),
 		}
 	}
 }
 
-impl From<snappy::InvalidInput> for Error {
-	fn from(err: snappy::InvalidInput) -> Error {
+impl From<::snappy::InvalidInput> for Error {
+	fn from(err: ::snappy::InvalidInput) -> Error {
 		Error::Snappy(err)
 	}
 }
@@ -467,21 +394,3 @@ impl<E> From<Box<E>> for Error where Error: From<E> {
 		Error::from(*err)
 	}
 }
-
-binary_fixed_size!(BlockError);
-binary_fixed_size!(ImportError);
-binary_fixed_size!(TransactionError);
-
-// TODO: uncomment below once https://github.com/rust-lang/rust/issues/27336 sorted.
-/*#![feature(concat_idents)]
-macro_rules! assimilate {
-    ($name:ident) => (
-		impl From<concat_idents!($name, Error)> for Error {
-			fn from(err: concat_idents!($name, Error)) -> Error {
-				Error:: $name (err)
-			}
-		}
-    )
-}
-assimilate!(FromHex);
-assimilate!(BaseData);*/
diff --git a/ethcore/src/ethereum/denominations.rs b/ethcore/src/ethereum/denominations.rs
index 789c803b965c0a984511640ec12c78f31c95e319..4892770df1e9dc3324e8a58485719810040888e5 100644
--- a/ethcore/src/ethereum/denominations.rs
+++ b/ethcore/src/ethereum/denominations.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::*;
+use ethereum_types::U256;
 
 #[inline]
 /// 1 Ether in Wei
diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index fc7b274031213995d63e91ce6fe20076c4467ac1..68a07d0cda30f552e7fd6dea06f54a0dc2653889 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -16,26 +16,19 @@
 
 use std::path::Path;
 use std::cmp;
-use std::collections::{BTreeMap, HashMap};
+use std::collections::BTreeMap;
 use std::sync::Arc;
-use ethash::{quick_get_difficulty, slow_get_seedhash, EthashManager};
-use util::*;
+use hash::{KECCAK_EMPTY_LIST_RLP};
+use ethash::{quick_get_difficulty, slow_hash_block_number, EthashManager, OptimizeFor};
+use ethereum_types::{H256, H64, U256, Address};
+use unexpected::{OutOfBounds, Mismatch};
 use block::*;
-use builtin::Builtin;
-use vm::EnvInfo;
-use error::{BlockError, Error, TransactionError};
+use error::{BlockError, Error};
 use header::{Header, BlockNumber};
-use state::CleanupMode;
-use spec::CommonParams;
-use transaction::UnverifiedTransaction;
 use engines::{self, Engine};
-use evm::Schedule;
 use ethjson;
-use rlp::{self, UntrustedRlp};
-use vm::LastHashes;
-
-/// Parity tries to round block.gas_limit to multiple of this constant
-pub const PARITY_GAS_LIMIT_DETERMINANT: U256 = U256([37, 0, 0, 0]);
+use rlp::UntrustedRlp;
+use machine::EthereumMachine;
 
 /// Number of blocks in an ethash snapshot.
 // make dependent on difficulty incrment divisor?
@@ -43,6 +36,39 @@ const SNAPSHOT_BLOCKS: u64 = 5000;
 /// Maximum number of blocks allowed in an ethash snapshot.
 const MAX_SNAPSHOT_BLOCKS: u64 = 30000;
 
+const DEFAULT_EIP649_DELAY: u64 = 3_000_000;
+
+/// Ethash specific seal
+#[derive(Debug, PartialEq)]
+pub struct Seal {
+	/// Ethash seal mix_hash
+	pub mix_hash: H256,
+	/// Ethash seal nonce
+	pub nonce: H64,
+}
+
+impl Seal {
+	/// Tries to parse rlp as ethash seal.
+	pub fn parse_seal<T: AsRef<[u8]>>(seal: &[T]) -> Result<Self, Error> {
+		if seal.len() != 2 {
+			return Err(BlockError::InvalidSealArity(
+				Mismatch {
+					expected: 2,
+					found: seal.len()
+				}
+			).into());
+		}
+
+		let mix_hash = UntrustedRlp::new(seal[0].as_ref()).as_val::<H256>()?;
+		let nonce = UntrustedRlp::new(seal[1].as_ref()).as_val::<H64>()?;
+		let seal = Seal {
+			mix_hash,
+			nonce,
+		};
+
+		Ok(seal)
+	}
+}
 
 /// Ethash params.
 #[derive(Debug, PartialEq)]
@@ -59,12 +85,6 @@ pub struct EthashParams {
 	pub duration_limit: u64,
 	/// Homestead transition block number.
 	pub homestead_transition: u64,
-	/// DAO hard-fork transition block (X).
-	pub dao_hardfork_transition: u64,
-	/// DAO hard-fork refund contract address (C).
-	pub dao_hardfork_beneficiary: Address,
-	/// DAO hard-fork DAO accounts list (L)
-	pub dao_hardfork_accounts: Vec<Address>,
 	/// Transition block for a change of difficulty params (currently just bound_divisor).
 	pub difficulty_hardfork_transition: u64,
 	/// Difficulty param after the difficulty transition.
@@ -73,30 +93,36 @@ pub struct EthashParams {
 	pub bomb_defuse_transition: u64,
 	/// Number of first block where EIP-100 rules begin.
 	pub eip100b_transition: u64,
-	/// Number of first block where EIP-150 rules begin.
-	pub eip150_transition: u64,
-	/// Number of first block where EIP-160 rules begin.
-	pub eip160_transition: u64,
-	/// Number of first block where EIP-161.abc begin.
-	pub eip161abc_transition: u64,
-	/// Number of first block where EIP-161.d begins.
-	pub eip161d_transition: u64,
 	/// Number of first block where ECIP-1010 begins.
 	pub ecip1010_pause_transition: u64,
 	/// Number of first block where ECIP-1010 ends.
 	pub ecip1010_continue_transition: u64,
 	/// Total block number for one ECIP-1017 era.
 	pub ecip1017_era_rounds: u64,
-	/// Maximum amount of code that can be deploying into a contract.
-	pub max_code_size: u64,
-	/// Number of first block where the max gas limit becomes effective.
-	pub max_gas_limit_transition: u64,
-	/// Maximum valid block gas limit,
-	pub max_gas_limit: U256,
-	/// Number of first block where the minimum gas price becomes effective.
-	pub min_gas_price_transition: u64,
-	/// Do not alow transactions with lower gas price.
-	pub min_gas_price: U256,
+	/// Number of first block where MCIP-3 begins.
+	pub mcip3_transition: u64,
+	/// MCIP-3 Block reward coin-base for miners.
+	pub mcip3_miner_reward: U256,
+	/// MCIP-3 Block reward ubi-base for basic income.
+	pub mcip3_ubi_reward: U256,
+	/// MCIP-3 contract address for universal basic income.
+	pub mcip3_ubi_contract: Address,
+	/// MCIP-3 Block reward dev-base for dev funds.
+	pub mcip3_dev_reward: U256,
+	/// MCIP-3 contract address for the developer funds.
+	pub mcip3_dev_contract: Address,
+	/// Block reward in base units.
+	pub block_reward: U256,
+	/// EIP-649 transition block.
+	pub eip649_transition: u64,
+	/// EIP-649 bomb delay.
+	pub eip649_delay: u64,
+	/// EIP-649 base reward.
+	pub eip649_reward: Option<U256>,
+	/// EXPIP-2 block height
+	pub expip2_transition: u64,
+	/// EXPIP-2 duration limit
+	pub expip2_duration_limit: u64,
 }
 
 impl From<ethjson::spec::EthashParams> for EthashParams {
@@ -108,25 +134,25 @@ impl From<ethjson::spec::EthashParams> for EthashParams {
 			metropolis_difficulty_increment_divisor: p.metropolis_difficulty_increment_divisor.map_or(9, Into::into),
 			duration_limit: p.duration_limit.map_or(0, Into::into),
 			homestead_transition: p.homestead_transition.map_or(0, Into::into),
-			dao_hardfork_transition: p.dao_hardfork_transition.map_or(u64::max_value(), Into::into),
-			dao_hardfork_beneficiary: p.dao_hardfork_beneficiary.map_or_else(Address::new, Into::into),
-			dao_hardfork_accounts: p.dao_hardfork_accounts.unwrap_or_else(Vec::new).into_iter().map(Into::into).collect(),
 			difficulty_hardfork_transition: p.difficulty_hardfork_transition.map_or(u64::max_value(), Into::into),
 			difficulty_hardfork_bound_divisor: p.difficulty_hardfork_bound_divisor.map_or(p.difficulty_bound_divisor.into(), Into::into),
 			bomb_defuse_transition: p.bomb_defuse_transition.map_or(u64::max_value(), Into::into),
 			eip100b_transition: p.eip100b_transition.map_or(u64::max_value(), Into::into),
-			eip150_transition: p.eip150_transition.map_or(0, Into::into),
-			eip160_transition: p.eip160_transition.map_or(0, Into::into),
-			eip161abc_transition: p.eip161abc_transition.map_or(0, Into::into),
-			eip161d_transition: p.eip161d_transition.map_or(u64::max_value(), Into::into),
 			ecip1010_pause_transition: p.ecip1010_pause_transition.map_or(u64::max_value(), Into::into),
 			ecip1010_continue_transition: p.ecip1010_continue_transition.map_or(u64::max_value(), Into::into),
 			ecip1017_era_rounds: p.ecip1017_era_rounds.map_or(u64::max_value(), Into::into),
-			max_code_size: p.max_code_size.map_or(u64::max_value(), Into::into),
-			max_gas_limit_transition: p.max_gas_limit_transition.map_or(u64::max_value(), Into::into),
-			max_gas_limit: p.max_gas_limit.map_or(U256::max_value(), Into::into),
-			min_gas_price_transition: p.min_gas_price_transition.map_or(u64::max_value(), Into::into),
-			min_gas_price: p.min_gas_price.map_or(U256::zero(), Into::into),
+			mcip3_transition: p.mcip3_transition.map_or(u64::max_value(), Into::into),
+			mcip3_miner_reward: p.mcip3_miner_reward.map_or_else(Default::default, Into::into),
+			mcip3_ubi_reward: p.mcip3_ubi_reward.map_or(U256::from(0), Into::into),
+			mcip3_ubi_contract: p.mcip3_ubi_contract.map_or_else(Address::new, Into::into),
+			mcip3_dev_reward: p.mcip3_dev_reward.map_or(U256::from(0), Into::into),
+			mcip3_dev_contract: p.mcip3_dev_contract.map_or_else(Address::new, Into::into),
+			block_reward: p.block_reward.map_or_else(Default::default, Into::into),
+			eip649_transition: p.eip649_transition.map_or(u64::max_value(), Into::into),
+			eip649_delay: p.eip649_delay.map_or(DEFAULT_EIP649_DELAY, Into::into),
+			eip649_reward: p.eip649_reward.map(Into::into),
+			expip2_transition: p.expip2_transition.map_or(u64::max_value(), Into::into),
+			expip2_duration_limit: p.expip2_duration_limit.map_or(30, Into::into),
 		}
 	}
 }
@@ -134,25 +160,23 @@ impl From<ethjson::spec::EthashParams> for EthashParams {
 /// Engine using Ethash proof-of-work consensus algorithm, suitable for Ethereum
 /// mainnet chains in the Olympic, Frontier and Homestead eras.
 pub struct Ethash {
-	params: CommonParams,
 	ethash_params: EthashParams,
-	builtins: BTreeMap<Address, Builtin>,
 	pow: EthashManager,
+	machine: EthereumMachine,
 }
 
 impl Ethash {
 	/// Create a new instance of Ethash engine
-	pub fn new<T: AsRef<Path>>(
-		cache_dir: T,
-		params: CommonParams,
+	pub fn new<T: Into<Option<OptimizeFor>>>(
+		cache_dir: &Path,
 		ethash_params: EthashParams,
-		builtins: BTreeMap<Address, Builtin>,
+		machine: EthereumMachine,
+		optimize_for: T,
 	) -> Arc<Self> {
 		Arc::new(Ethash {
-			params,
 			ethash_params,
-			builtins,
-			pow: EthashManager::new(cache_dir),
+			machine,
+			pow: EthashManager::new(cache_dir.as_ref(), optimize_for.into()),
 		})
 	}
 }
@@ -165,170 +189,114 @@ impl Ethash {
 // for any block in the chain.
 // in the future, we might move the Ethash epoch
 // caching onto this mechanism as well.
-impl engines::EpochVerifier for Arc<Ethash> {
+impl engines::EpochVerifier<EthereumMachine> for Arc<Ethash> {
 	fn verify_light(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
 	fn verify_heavy(&self, header: &Header) -> Result<(), Error> {
-		self.verify_block_unordered(header, None)
+		self.verify_block_unordered(header)
 	}
 }
 
-impl Engine for Arc<Ethash> {
+impl Engine<EthereumMachine> for Arc<Ethash> {
 	fn name(&self) -> &str { "Ethash" }
-	fn version(&self) -> SemanticVersion { SemanticVersion::new(1, 0, 0) }
-	// Two fields - mix
-	fn seal_fields(&self) -> usize { 2 }
-
-	fn params(&self) -> &CommonParams { &self.params }
-	fn additional_params(&self) -> HashMap<String, String> { hash_map!["registrar".to_owned() => self.params().registrar.hex()] }
+	fn machine(&self) -> &EthereumMachine { &self.machine }
 
-	fn builtins(&self) -> &BTreeMap<Address, Builtin> {
-		&self.builtins
-	}
+	// Two fields - nonce and mix.
+	fn seal_fields(&self, _header: &Header) -> usize { 2 }
 
 	/// Additional engine-specific information for the user/developer concerning `header`.
 	fn extra_info(&self, header: &Header) -> BTreeMap<String, String> {
-		if header.seal().len() == self.seal_fields() {
-			map![
-				"nonce".to_owned() => format!("0x{}", header.nonce().hex()),
-				"mixHash".to_owned() => format!("0x{}", header.mix_hash().hex())
-			]
-		} else {
-			BTreeMap::default()
+		match Seal::parse_seal(header.seal()) {
+			Ok(seal) => map![
+				"nonce".to_owned() => format!("0x{:x}", seal.nonce),
+				"mixHash".to_owned() => format!("0x{:x}", seal.mix_hash)
+			],
+			_ => BTreeMap::default()
 		}
 	}
 
-	fn schedule(&self, block_number: BlockNumber) -> Schedule {
-		trace!(target: "client", "Creating schedule. fCML={}, bGCML={}", self.ethash_params.homestead_transition, self.ethash_params.eip150_transition);
-
-		if block_number < self.ethash_params.homestead_transition {
-			Schedule::new_frontier()
-		} else if block_number < self.ethash_params.eip150_transition {
-			Schedule::new_homestead()
-		} else {
-			let mut schedule = Schedule::new_post_eip150(
-				self.ethash_params.max_code_size as usize,
-				block_number >= self.ethash_params.eip160_transition,
-				block_number >= self.ethash_params.eip161abc_transition,
-				block_number >= self.ethash_params.eip161d_transition);
-
-			self.params().update_schedule(block_number, &mut schedule);
-			schedule
-		}
-	}
-
-	fn signing_chain_id(&self, env_info: &EnvInfo) -> Option<u64> {
-		if env_info.number >= self.params().eip155_transition {
-			Some(self.params().chain_id)
-		} else {
-			None
-		}
-	}
+	fn maximum_uncle_count(&self, _block: BlockNumber) -> usize { 2 }
 
-	fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, mut gas_ceil_target: U256) {
+	fn populate_from_parent(&self, header: &mut Header, parent: &Header) {
 		let difficulty = self.calculate_difficulty(header, parent);
-		if header.number() >= self.ethash_params.max_gas_limit_transition && gas_ceil_target > self.ethash_params.max_gas_limit {
-			warn!("Gas limit target is limited to {}", self.ethash_params.max_gas_limit);
-			gas_ceil_target = self.ethash_params.max_gas_limit;
-		}
-		let gas_limit = {
-			let gas_limit = parent.gas_limit().clone();
-			let bound_divisor = self.params().gas_limit_bound_divisor;
-			let lower_limit = gas_limit - gas_limit / bound_divisor + 1.into();
-			let upper_limit = gas_limit + gas_limit / bound_divisor - 1.into();
-			let gas_limit = if gas_limit < gas_floor_target {
-				let gas_limit = cmp::min(gas_floor_target, upper_limit);
-				round_block_gas_limit(gas_limit, lower_limit, upper_limit)
-			} else if gas_limit > gas_ceil_target {
-				let gas_limit = cmp::max(gas_ceil_target, lower_limit);
-				round_block_gas_limit(gas_limit, lower_limit, upper_limit)
-			} else {
-				let total_lower_limit = cmp::max(lower_limit, gas_floor_target);
-				let total_upper_limit = cmp::min(upper_limit, gas_ceil_target);
-				let gas_limit = cmp::max(gas_floor_target, cmp::min(total_upper_limit,
-					lower_limit + (header.gas_used().clone() * 6.into() / 5.into()) / bound_divisor));
-				round_block_gas_limit(gas_limit, total_lower_limit, total_upper_limit)
-			};
-			// ensure that we are not violating protocol limits
-			debug_assert!(gas_limit >= lower_limit);
-			debug_assert!(gas_limit <= upper_limit);
-			gas_limit
-		};
 		header.set_difficulty(difficulty);
-		header.set_gas_limit(gas_limit);
-		if header.number() >= self.ethash_params.dao_hardfork_transition &&
-			header.number() <= self.ethash_params.dao_hardfork_transition + 9 {
-			header.set_extra_data(b"dao-hard-fork"[..].to_owned());
-		}
-		header.note_dirty();
-//		info!("ethash: populate_from_parent #{}: difficulty={} and gas_limit={}", header.number(), header.difficulty(), header.gas_limit());
 	}
 
 	fn on_new_block(
 		&self,
-		block: &mut ExecutedBlock,
-		last_hashes: Arc<LastHashes>,
+		_block: &mut ExecutedBlock,
 		_begins_epoch: bool,
 	) -> Result<(), Error> {
-		let parent_hash = block.fields().header.parent_hash().clone();
-		engines::common::push_last_hash(block, last_hashes, self, &parent_hash)?;
-		if block.fields().header.number() == self.ethash_params.dao_hardfork_transition {
-			let state = block.fields_mut().state;
-			for child in &self.ethash_params.dao_hardfork_accounts {
-				let beneficiary = &self.ethash_params.dao_hardfork_beneficiary;
-				state.balance(child)
-					.and_then(|b| state.transfer_balance(child, beneficiary, &b, CleanupMode::NoEmpty))?;
-			}
-		}
 		Ok(())
 	}
 
 	/// Apply the block reward on finalisation of the block.
 	/// This assumes that all uncles are valid uncles (i.e. of at least one generation before the current).
 	fn on_close_block(&self, block: &mut ExecutedBlock) -> Result<(), Error> {
-		let reward = self.params().block_reward;
-		let fields = block.fields_mut();
+		use std::ops::Shr;
+		use parity_machine::{LiveBlock, WithBalances};
+
+		let author = *LiveBlock::header(&*block).author();
+		let number = LiveBlock::header(&*block).number();
+
+		// Applies EIP-649 reward.
+		let reward = if number >= self.ethash_params.eip649_transition {
+			self.ethash_params.eip649_reward.unwrap_or(self.ethash_params.block_reward)
+		} else {
+			self.ethash_params.block_reward
+		};
+
+		// Applies ECIP-1017 eras.
 		let eras_rounds = self.ethash_params.ecip1017_era_rounds;
-		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, reward, fields.header.number());
-
-		// Bestow block reward
-		fields.state.add_balance(
-			fields.header.author(),
-			&(reward + reward / U256::from(32) * U256::from(fields.uncles.len())),
-			CleanupMode::NoEmpty
-		)?;
-
-		// Bestow uncle rewards
-		let current_number = fields.header.number();
-		for u in fields.uncles.iter() {
-			if eras == 0 {
-				fields.state.add_balance(
-					u.author(),
-					&(reward * U256::from(8 + u.number() - current_number) / U256::from(8)),
-					CleanupMode::NoEmpty
-				)
+		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, reward, number);
+
+		let n_uncles = LiveBlock::uncles(&*block).len();
+
+		// Bestow block rewards.
+		let mut result_block_reward = reward + reward.shr(5) * U256::from(n_uncles);
+		let mut uncle_rewards = Vec::with_capacity(n_uncles);
+
+		if number >= self.ethash_params.mcip3_transition {
+			result_block_reward = self.ethash_params.mcip3_miner_reward;
+			let ubi_contract = self.ethash_params.mcip3_ubi_contract;
+			let ubi_reward = self.ethash_params.mcip3_ubi_reward;
+			let dev_contract = self.ethash_params.mcip3_dev_contract;
+			let dev_reward = self.ethash_params.mcip3_dev_reward;
+
+			self.machine.add_balance(block, &author, &result_block_reward)?;
+			self.machine.add_balance(block, &ubi_contract, &ubi_reward)?;
+			self.machine.add_balance(block, &dev_contract, &dev_reward)?;
+		} else {
+			self.machine.add_balance(block, &author, &result_block_reward)?;
+		}
+
+		// Bestow uncle rewards.
+		for u in LiveBlock::uncles(&*block) {
+			let uncle_author = u.author();
+			let result_uncle_reward = if eras == 0 {
+				(reward * U256::from(8 + u.number() - number)).shr(3)
 			} else {
-				fields.state.add_balance(
-					u.author(),
-					&(reward / U256::from(32)),
-					CleanupMode::NoEmpty
-				)
-			}?;
+				reward.shr(5)
+			};
+
+			uncle_rewards.push((*uncle_author, result_uncle_reward));
 		}
 
-		// Commit state so that we can actually figure out the state root.
-		fields.state.commit()?;
-		Ok(())
+		for &(ref a, ref reward) in &uncle_rewards {
+			self.machine.add_balance(block, a, reward)?;
+		}
+
+		// Note and trace.
+		self.machine.note_rewards(block, &[(author, result_block_reward)], &uncle_rewards)
 	}
 
-	fn verify_block_basic(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
+	fn verify_local_seal(&self, header: &Header) -> Result<(), Error> {
+		self.verify_block_basic(header)
+			.and_then(|_| self.verify_block_unordered(header))
+	}
+
+	fn verify_block_basic(&self, header: &Header) -> Result<(), Error> {
 		// check the seal fields.
-		if header.seal().len() != self.seal_fields() {
-			return Err(From::from(BlockError::InvalidSealArity(
-				Mismatch { expected: self.seal_fields(), found: header.seal().len() }
-			)));
-		}
-		UntrustedRlp::new(&header.seal()[0]).as_val::<H256>()?;
-		UntrustedRlp::new(&header.seal()[1]).as_val::<H64>()?;
+		let seal = Seal::parse_seal(header.seal())?;
 
 		// TODO: consider removing these lines.
 		let min_difficulty = self.ethash_params.minimum_difficulty;
@@ -338,19 +306,14 @@ impl Engine for Arc<Ethash> {
 
 		let difficulty = Ethash::boundary_to_difficulty(&H256(quick_get_difficulty(
 			&header.bare_hash().0,
-			header.nonce().low_u64(),
-			&header.mix_hash().0
+			seal.nonce.low_u64(),
+			&seal.mix_hash.0
 		)));
+
 		if &difficulty < header.difficulty() {
 			return Err(From::from(BlockError::InvalidProofOfWork(OutOfBounds { min: Some(header.difficulty().clone()), max: None, found: difficulty })));
 		}
 
-		if header.number() >= self.ethash_params.dao_hardfork_transition &&
-			header.number() <= self.ethash_params.dao_hardfork_transition + 9 &&
-			header.extra_data()[..] != b"dao-hard-fork"[..] {
-			return Err(From::from(BlockError::ExtraDataOutOfBounds(OutOfBounds { min: None, max: None, found: 0 })));
-		}
-
 		if header.gas_limit() > &0x7fffffffffffffffu64.into() {
 			return Err(From::from(BlockError::InvalidGasLimit(OutOfBounds { min: None, max: Some(0x7fffffffffffffffu64.into()), found: header.gas_limit().clone() })));
 		}
@@ -358,18 +321,21 @@ impl Engine for Arc<Ethash> {
 		Ok(())
 	}
 
-	fn verify_block_unordered(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
-		if header.seal().len() != self.seal_fields() {
-			return Err(From::from(BlockError::InvalidSealArity(
-				Mismatch { expected: self.seal_fields(), found: header.seal().len() }
-			)));
-		}
-		let result = self.pow.compute_light(header.number() as u64, &header.bare_hash().0, header.nonce().low_u64());
+	fn verify_block_unordered(&self, header: &Header) -> Result<(), Error> {
+		let seal = Seal::parse_seal(header.seal())?;
+
+		let result = self.pow.compute_light(header.number() as u64, &header.bare_hash().0, seal.nonce.low_u64());
 		let mix = H256(result.mix_hash);
 		let difficulty = Ethash::boundary_to_difficulty(&H256(result.value));
-		trace!(target: "miner", "num: {}, seed: {}, h: {}, non: {}, mix: {}, res: {}" , header.number() as u64, H256(slow_get_seedhash(header.number() as u64)), header.bare_hash(), header.nonce().low_u64(), H256(result.mix_hash), H256(result.value));
-		if mix != header.mix_hash() {
-			return Err(From::from(BlockError::MismatchedH256SealElement(Mismatch { expected: mix, found: header.mix_hash() })));
+		trace!(target: "miner", "num: {num}, seed: {seed}, h: {h}, non: {non}, mix: {mix}, res: {res}",
+			   num = header.number() as u64,
+			   seed = H256(slow_hash_block_number(header.number() as u64)),
+			   h = header.bare_hash(),
+			   non = seal.nonce.low_u64(),
+			   mix = H256(result.mix_hash),
+			   res = H256(result.value));
+		if mix != seal.mix_hash {
+			return Err(From::from(BlockError::MismatchedH256SealElement(Mismatch { expected: mix, found: seal.mix_hash })));
 		}
 		if &difficulty < header.difficulty() {
 			return Err(From::from(BlockError::InvalidProofOfWork(OutOfBounds { min: Some(header.difficulty().clone()), max: None, found: difficulty })));
@@ -377,7 +343,7 @@ impl Engine for Arc<Ethash> {
 		Ok(())
 	}
 
-	fn verify_block_family(&self, header: &Header, parent: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
+	fn verify_block_family(&self, header: &Header, parent: &Header) -> Result<(), Error> {
 		// we should not calculate difficulty for genesis blocks
 		if header.number() == 0 {
 			return Err(From::from(BlockError::RidiculousNumber(OutOfBounds { min: Some(1), max: None, found: header.number() })));
@@ -388,31 +354,11 @@ impl Engine for Arc<Ethash> {
 		if header.difficulty() != &expected_difficulty {
 			return Err(From::from(BlockError::InvalidDifficulty(Mismatch { expected: expected_difficulty, found: header.difficulty().clone() })))
 		}
-		let gas_limit_divisor = self.params().gas_limit_bound_divisor;
-		let parent_gas_limit = *parent.gas_limit();
-		let min_gas = parent_gas_limit - parent_gas_limit / gas_limit_divisor;
-		let max_gas = parent_gas_limit + parent_gas_limit / gas_limit_divisor;
-		if header.gas_limit() <= &min_gas || header.gas_limit() >= &max_gas {
-			return Err(From::from(BlockError::InvalidGasLimit(OutOfBounds { min: Some(min_gas), max: Some(max_gas), found: header.gas_limit().clone() })));
-		}
-		if header.number() >= self.ethash_params.max_gas_limit_transition && header.gas_limit() > &self.ethash_params.max_gas_limit && header.gas_limit() > &parent_gas_limit {
-			return Err(From::from(BlockError::InvalidGasLimit(OutOfBounds { min: Some(min_gas), max: Some(self.ethash_params.max_gas_limit), found: header.gas_limit().clone() })));
-		}
-		Ok(())
-	}
-
-	fn verify_transaction_basic(&self, t: &UnverifiedTransaction, header: &Header) -> Result<(), Error> {
-		if header.number() >= self.ethash_params.min_gas_price_transition && t.gas_price < self.ethash_params.min_gas_price {
-			return Err(TransactionError::InsufficientGasPrice { minimal: self.ethash_params.min_gas_price, got: t.gas_price }.into());
-		}
 
-		let check_low_s = header.number() >= self.ethash_params.homestead_transition;
-		let chain_id = if header.number() >= self.params().eip155_transition { Some(self.params().chain_id) } else { None };
-		t.verify_basic(check_low_s, chain_id, false)?;
 		Ok(())
 	}
 
-	fn epoch_verifier<'a>(&self, _header: &Header, _proof: &'a [u8]) -> engines::ConstructedVerifier<'a> {
+	fn epoch_verifier<'a>(&self, _header: &Header, _proof: &'a [u8]) -> engines::ConstructedVerifier<'a, EthereumMachine> {
 		engines::ConstructedVerifier::Trusted(Box::new(self.clone()))
 	}
 
@@ -421,44 +367,14 @@ impl Engine for Arc<Ethash> {
 	}
 }
 
-// Try to round gas_limit a bit so that:
-// 1) it will still be in desired range
-// 2) it will be a nearest (with tendency to increase) multiple of PARITY_GAS_LIMIT_DETERMINANT
-fn round_block_gas_limit(gas_limit: U256, lower_limit: U256, upper_limit: U256) -> U256 {
-	let increased_gas_limit = gas_limit + (PARITY_GAS_LIMIT_DETERMINANT - gas_limit % PARITY_GAS_LIMIT_DETERMINANT);
-	if increased_gas_limit > upper_limit {
-		let decreased_gas_limit = increased_gas_limit - PARITY_GAS_LIMIT_DETERMINANT;
-		if decreased_gas_limit < lower_limit {
-			gas_limit
-		} else {
-			decreased_gas_limit
-		}
-	} else {
-		increased_gas_limit
-	}
-}
-
-fn ecip1017_eras_block_reward(era_rounds: u64, mut reward: U256, block_number:u64) -> (u64, U256){
-	let eras = if block_number != 0 && block_number % era_rounds == 0 {
-		block_number / era_rounds - 1
-	} else {
-		block_number / era_rounds
-	};
-	for _ in 0..eras {
-		reward = reward / U256::from(5) * U256::from(4);
-	}
-	(eras, reward)
-}
-
-#[cfg_attr(feature="dev", allow(wrong_self_convention))]
 impl Ethash {
 	fn calculate_difficulty(&self, header: &Header, parent: &Header) -> U256 {
-		const EXP_DIFF_PERIOD: u64 = 100000;
+		const EXP_DIFF_PERIOD: u64 = 100_000;
 		if header.number() == 0 {
 			panic!("Can't calculate genesis block difficulty");
 		}
 
-		let parent_has_uncles = parent.uncles_hash() != &sha3::SHA3_EMPTY_LIST_RLP;
+		let parent_has_uncles = parent.uncles_hash() != &KECCAK_EMPTY_LIST_RLP;
 
 		let min_difficulty = self.ethash_params.minimum_difficulty;
 
@@ -469,7 +385,13 @@ impl Ethash {
 			self.ethash_params.difficulty_bound_divisor
 		};
 
-		let duration_limit = self.ethash_params.duration_limit;
+		let expip2_hardfork = header.number() >= self.ethash_params.expip2_transition;
+		let duration_limit = if expip2_hardfork {
+			self.ethash_params.expip2_duration_limit
+		} else {
+			self.ethash_params.duration_limit
+		};
+
 		let frontier_limit = self.ethash_params.homestead_transition;
 
 		let mut target = if header.number() < frontier_limit {
@@ -478,8 +400,7 @@ impl Ethash {
 			} else {
 				*parent.difficulty() + (*parent.difficulty() / difficulty_bound_divisor)
 			}
-		}
-		else {
+		} else {
 			trace!(target: "ethash", "Calculating difficulty parent.difficulty={}, header.timestamp={}, parent.timestamp={}", parent.difficulty(), header.timestamp(), parent.timestamp());
 			//block_diff = parent_diff + parent_diff // 2048 * max(1 - (block_timestamp - parent_timestamp) // 10, -99)
 			let (increment_divisor, threshold) = if header.number() < self.ethash_params.eip100b_transition {
@@ -492,9 +413,9 @@ impl Ethash {
 
 			let diff_inc = (header.timestamp() - parent.timestamp()) / increment_divisor;
 			if diff_inc <= threshold {
-				*parent.difficulty() + *parent.difficulty() / difficulty_bound_divisor * (threshold - diff_inc).into()
+				*parent.difficulty() + *parent.difficulty() / difficulty_bound_divisor * U256::from(threshold - diff_inc)
 			} else {
-				let multiplier = cmp::min(diff_inc - threshold, 99).into();
+				let multiplier: U256 = cmp::min(diff_inc - threshold, 99).into();
 				parent.difficulty().saturating_sub(
 					*parent.difficulty() / difficulty_bound_divisor * multiplier
 				)
@@ -503,7 +424,11 @@ impl Ethash {
 		target = cmp::max(min_difficulty, target);
 		if header.number() < self.ethash_params.bomb_defuse_transition {
 			if header.number() < self.ethash_params.ecip1010_pause_transition {
-				let period = ((parent.number() + 1) / EXP_DIFF_PERIOD) as usize;
+				let mut number = header.number();
+				if number >= self.ethash_params.eip649_transition {
+					number = number.saturating_sub(self.ethash_params.eip649_delay);
+				}
+				let period = (number / EXP_DIFF_PERIOD) as usize;
 				if period > 1 {
 					target = cmp::max(min_difficulty, target + (U256::from(1) << (period - 2)));
 				}
@@ -541,41 +466,70 @@ impl Ethash {
 	}
 }
 
-impl Header {
-	/// Get the none field of the header.
-	pub fn nonce(&self) -> H64 {
-		rlp::decode(&self.seal()[1])
-	}
-
-	/// Get the mix hash field of the header.
-	pub fn mix_hash(&self) -> H256 {
-		rlp::decode(&self.seal()[0])
-	}
-
-	/// Set the nonce and mix hash fields of the header.
-	pub fn set_nonce_and_mix_hash(&mut self, nonce: &H64, mix_hash: &H256) {
-		self.set_seal(vec![rlp::encode(mix_hash).into_vec(), rlp::encode(nonce).into_vec()]);
+fn ecip1017_eras_block_reward(era_rounds: u64, mut reward: U256, block_number:u64) -> (u64, U256) {
+	let eras = if block_number != 0 && block_number % era_rounds == 0 {
+		block_number / era_rounds - 1
+	} else {
+		block_number / era_rounds
+	};
+	let mut divi = U256::from(1);
+	for _ in 0..eras {
+		reward = reward * U256::from(4);
+		divi = divi * U256::from(5);
 	}
+	reward = reward / divi;
+	(eras, reward)
 }
 
 #[cfg(test)]
 mod tests {
 	use std::str::FromStr;
-	use std::collections::BTreeMap;
 	use std::sync::Arc;
-	use util::*;
+	use ethereum_types::{H64, H256, U256, Address};
 	use block::*;
-	use tests::helpers::*;
-	use engines::Engine;
+	use tests::helpers::get_temp_state_db;
 	use error::{BlockError, Error};
 	use header::Header;
 	use spec::Spec;
-	use super::super::{new_morden, new_homestead_test};
-	use super::{Ethash, EthashParams, PARITY_GAS_LIMIT_DETERMINANT, ecip1017_eras_block_reward};
+	use engines::Engine;
+	use super::super::{new_morden, new_mcip3_test, new_homestead_test_machine};
+	use super::{Ethash, EthashParams, ecip1017_eras_block_reward};
 	use rlp;
+	use tempdir::TempDir;
 
 	fn test_spec() -> Spec {
-		new_morden(&::std::env::temp_dir())
+		let tempdir = TempDir::new("").unwrap();
+		new_morden(&tempdir.path())
+	}
+
+	fn get_default_ethash_params() -> EthashParams {
+		EthashParams {
+			minimum_difficulty: U256::from(131072),
+			difficulty_bound_divisor: U256::from(2048),
+			difficulty_increment_divisor: 10,
+			metropolis_difficulty_increment_divisor: 9,
+			homestead_transition: 1150000,
+			duration_limit: 13,
+			block_reward: 0.into(),
+			difficulty_hardfork_transition: u64::max_value(),
+			difficulty_hardfork_bound_divisor: U256::from(0),
+			bomb_defuse_transition: u64::max_value(),
+			eip100b_transition: u64::max_value(),
+			ecip1010_pause_transition: u64::max_value(),
+			ecip1010_continue_transition: u64::max_value(),
+			ecip1017_era_rounds: u64::max_value(),
+			mcip3_transition: u64::max_value(),
+			mcip3_miner_reward: 0.into(),
+			mcip3_ubi_reward: 0.into(),
+			mcip3_ubi_contract: "0000000000000000000000000000000000000001".into(),
+			mcip3_dev_reward: 0.into(),
+			mcip3_dev_contract: "0000000000000000000000000000000000000001".into(),
+			eip649_transition: u64::max_value(),
+			eip649_delay: 3_000_000,
+			eip649_reward: None,
+			expip2_transition: u64::max_value(),
+			expip2_duration_limit: 30,
+		}
 	}
 
 	#[test]
@@ -590,6 +544,43 @@ mod tests {
 		assert_eq!(b.state().balance(&Address::zero()).unwrap(), U256::from_str("4563918244f40000").unwrap());
 	}
 
+	#[test]
+	fn has_valid_ecip1017_eras_block_reward() {
+		let eras_rounds = 5000000;
+
+		let start_reward: U256 = "4563918244F40000".parse().unwrap();
+
+		let block_number = 0;
+		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
+		assert_eq!(0, eras);
+		assert_eq!(U256::from_str("4563918244F40000").unwrap(), reward);
+
+		let block_number = 5000000;
+		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
+		assert_eq!(0, eras);
+		assert_eq!(U256::from_str("4563918244F40000").unwrap(), reward);
+
+		let block_number = 10000000;
+		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
+		assert_eq!(1, eras);
+		assert_eq!(U256::from_str("3782DACE9D900000").unwrap(), reward);
+
+		let block_number = 20000000;
+		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
+		assert_eq!(3, eras);
+		assert_eq!(U256::from_str("2386F26FC1000000").unwrap(), reward);
+
+		let block_number = 80000000;
+		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
+		assert_eq!(15, eras);
+		assert_eq!(U256::from_str("271000000000000").unwrap(), reward);
+
+		let block_number = 250000000;
+		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
+		assert_eq!(49, eras);
+		assert_eq!(U256::from_str("51212FFBAF0A").unwrap(), reward);
+	}
+
 	#[test]
 	fn on_close_block_with_uncle() {
 		let spec = test_spec();
@@ -608,11 +599,27 @@ mod tests {
 		assert_eq!(b.state().balance(&uncle_author).unwrap(), "3cb71f51fc558000".into());
 	}
 
+	#[test]
+	fn has_valid_mcip3_era_block_rewards() {
+		let spec = new_mcip3_test();
+		let engine = &*spec.engine;
+		let genesis_header = spec.genesis_header();
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+		let last_hashes = Arc::new(vec![genesis_header.hash()]);
+		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![], false).unwrap();
+		let b = b.close();
+
+		let ubi_contract: Address = "00efdd5883ec628983e9063c7d969fe268bbf310".into();
+		let dev_contract: Address = "00756cf8159095948496617f5fb17ed95059f536".into();
+		assert_eq!(b.state().balance(&Address::zero()).unwrap(), U256::from_str("d8d726b7177a80000").unwrap());
+		assert_eq!(b.state().balance(&ubi_contract).unwrap(), U256::from_str("2b5e3af16b1880000").unwrap());
+		assert_eq!(b.state().balance(&dev_contract).unwrap(), U256::from_str("c249fdd327780000").unwrap());
+	}
+
 	#[test]
 	fn has_valid_metadata() {
 		let engine = test_spec().engine;
 		assert!(!engine.name().is_empty());
-		assert!(engine.version().major >= 1);
 	}
 
 	#[test]
@@ -628,10 +635,9 @@ mod tests {
 	#[test]
 	fn can_do_seal_verification_fail() {
 		let engine = test_spec().engine;
-		//let engine = Ethash::new_test(test_spec());
 		let header: Header = Header::default();
 
-		let verify_result = engine.verify_block_basic(&header, None);
+		let verify_result = engine.verify_block_basic(&header);
 
 		match verify_result {
 			Err(Error::Block(BlockError::InvalidSealArity(_))) => {},
@@ -646,7 +652,7 @@ mod tests {
 		let mut header: Header = Header::default();
 		header.set_seal(vec![rlp::encode(&H256::zero()).into_vec(), rlp::encode(&H64::zero()).into_vec()]);
 
-		let verify_result = engine.verify_block_basic(&header, None);
+		let verify_result = engine.verify_block_basic(&header);
 
 		match verify_result {
 			Err(Error::Block(BlockError::DifficultyOutOfBounds(_))) => {},
@@ -662,7 +668,7 @@ mod tests {
 		header.set_seal(vec![rlp::encode(&H256::zero()).into_vec(), rlp::encode(&H64::zero()).into_vec()]);
 		header.set_difficulty(U256::from_str("ffffffffffffffffffffffffffffffffffffffffffffaaaaaaaaaaaaaaaaaaaa").unwrap());
 
-		let verify_result = engine.verify_block_basic(&header, None);
+		let verify_result = engine.verify_block_basic(&header);
 
 		match verify_result {
 			Err(Error::Block(BlockError::InvalidProofOfWork(_))) => {},
@@ -674,9 +680,9 @@ mod tests {
 	#[test]
 	fn can_do_seal_unordered_verification_fail() {
 		let engine = test_spec().engine;
-		let header: Header = Header::default();
+		let header = Header::default();
 
-		let verify_result = engine.verify_block_unordered(&header, None);
+		let verify_result = engine.verify_block_unordered(&header);
 
 		match verify_result {
 			Err(Error::Block(BlockError::InvalidSealArity(_))) => {},
@@ -685,12 +691,23 @@ mod tests {
 		}
 	}
 
+	#[test]
+	fn can_do_seal_unordered_verification_fail2() {
+		let engine = test_spec().engine;
+		let mut header = Header::default();
+		header.set_seal(vec![vec![], vec![]]);
+
+		let verify_result = engine.verify_block_unordered(&header);
+		// rlp error, shouldn't panic
+		assert!(verify_result.is_err());
+	}
+
 	#[test]
 	fn can_do_seal256_verification_fail() {
 		let engine = test_spec().engine;
 		let mut header: Header = Header::default();
 		header.set_seal(vec![rlp::encode(&H256::zero()).into_vec(), rlp::encode(&H64::zero()).into_vec()]);
-		let verify_result = engine.verify_block_unordered(&header, None);
+		let verify_result = engine.verify_block_unordered(&header);
 
 		match verify_result {
 			Err(Error::Block(BlockError::MismatchedH256SealElement(_))) => {},
@@ -706,7 +723,7 @@ mod tests {
 		header.set_seal(vec![rlp::encode(&H256::from("b251bd2e0283d0658f2cadfdc8ca619b5de94eca5742725e2e757dd13ed7503d")).into_vec(), rlp::encode(&H64::zero()).into_vec()]);
 		header.set_difficulty(U256::from_str("ffffffffffffffffffffffffffffffffffffffffffffaaaaaaaaaaaaaaaaaaaa").unwrap());
 
-		let verify_result = engine.verify_block_unordered(&header, None);
+		let verify_result = engine.verify_block_unordered(&header);
 
 		match verify_result {
 			Err(Error::Block(BlockError::InvalidProofOfWork(_))) => {},
@@ -721,7 +738,7 @@ mod tests {
 		let header: Header = Header::default();
 		let parent_header: Header = Header::default();
 
-		let verify_result = engine.verify_block_family(&header, &parent_header, None);
+		let verify_result = engine.verify_block_family(&header, &parent_header);
 
 		match verify_result {
 			Err(Error::Block(BlockError::RidiculousNumber(_))) => {},
@@ -738,7 +755,7 @@ mod tests {
 		let mut parent_header: Header = Header::default();
 		parent_header.set_number(1);
 
-		let verify_result = engine.verify_block_family(&header, &parent_header, None);
+		let verify_result = engine.verify_block_family(&header, &parent_header);
 
 		match verify_result {
 			Err(Error::Block(BlockError::InvalidDifficulty(_))) => {},
@@ -747,24 +764,6 @@ mod tests {
 		}
 	}
 
-	#[test]
-	fn can_verify_block_family_gas_fail() {
-		let engine = test_spec().engine;
-		let mut header: Header = Header::default();
-		header.set_number(2);
-		header.set_difficulty(U256::from_str("0000000000000000000000000000000000000000000000000000000000020000").unwrap());
-		let mut parent_header: Header = Header::default();
-		parent_header.set_number(1);
-
-		let verify_result = engine.verify_block_family(&header, &parent_header, None);
-
-		match verify_result {
-			Err(Error::Block(BlockError::InvalidGasLimit(_))) => {},
-			Err(_) => { panic!("should be invalid difficulty fail (got {:?})", verify_result); },
-			_ => { panic!("Should be error, got Ok"); },
-		}
-	}
-
 	#[test]
 	fn test_difficulty_to_boundary() {
 		// result of f(0) is undefined, so do not assert the result
@@ -777,9 +776,10 @@ mod tests {
 
 	#[test]
 	fn difficulty_frontier() {
-		let spec = new_homestead_test();
+		let machine = new_homestead_test_machine();
 		let ethparams = get_default_ethash_params();
-		let ethash = Ethash::new(&::std::env::temp_dir(), spec.params().clone(), ethparams, BTreeMap::new());
+		let tempdir = TempDir::new("").unwrap();
+		let ethash = Ethash::new(tempdir.path(), ethparams, machine, None);
 
 		let mut parent_header = Header::default();
 		parent_header.set_number(1000000);
@@ -795,9 +795,10 @@ mod tests {
 
 	#[test]
 	fn difficulty_homestead() {
-		let spec = new_homestead_test();
+		let machine = new_homestead_test_machine();
 		let ethparams = get_default_ethash_params();
-		let ethash = Ethash::new(&::std::env::temp_dir(), spec.params().clone(), ethparams, BTreeMap::new());
+		let tempdir = TempDir::new("").unwrap();
+		let ethash = Ethash::new(tempdir.path(), ethparams, machine, None);
 
 		let mut parent_header = Header::default();
 		parent_header.set_number(1500000);
@@ -811,46 +812,15 @@ mod tests {
 		assert_eq!(U256::from_str("1fc50f118efe").unwrap(), difficulty);
 	}
 
-	#[test]
-	fn has_valid_ecip1017_eras_block_reward() {
-		let eras_rounds = 5000000;
-
-		let start_reward: U256 = "4563918244F40000".parse().unwrap();
-
-		let block_number = 0;
-		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
-		assert_eq!(0, eras);
-		assert_eq!(U256::from_str("4563918244F40000").unwrap(), reward);
-
-		let block_number = 5000000;
-		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
-		assert_eq!(0, eras);
-		assert_eq!(U256::from_str("4563918244F40000").unwrap(), reward);
-
-		let block_number = 10000000;
-		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
-		assert_eq!(1, eras);
-		assert_eq!(U256::from_str("3782DACE9D900000").unwrap(), reward);
-
-		let block_number = 20000000;
-		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
-		assert_eq!(3, eras);
-		assert_eq!(U256::from_str("2386F26FC1000000").unwrap(), reward);
-
-		let block_number = 80000000;
-		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, start_reward, block_number);
-		assert_eq!(15, eras);
-		assert_eq!(U256::from_str("271000000000000").unwrap(), reward);
-	}
-
 	#[test]
 	fn difficulty_classic_bomb_delay() {
-		let spec = new_homestead_test();
+		let machine = new_homestead_test_machine();
 		let ethparams = EthashParams {
 			ecip1010_pause_transition: 3000000,
 			..get_default_ethash_params()
 		};
-		let ethash = Ethash::new(&::std::env::temp_dir(), spec.params().clone(), ethparams, BTreeMap::new());
+		let tempdir = TempDir::new("").unwrap();
+		let ethash = Ethash::new(tempdir.path(), ethparams, machine, None);
 
 		let mut parent_header = Header::default();
 		parent_header.set_number(3500000);
@@ -878,13 +848,14 @@ mod tests {
 
 	#[test]
 	fn test_difficulty_bomb_continue() {
-		let spec = new_homestead_test();
+		let machine = new_homestead_test_machine();
 		let ethparams = EthashParams {
 			ecip1010_pause_transition: 3000000,
 			ecip1010_continue_transition: 5000000,
 			..get_default_ethash_params()
 		};
-		let ethash = Ethash::new(&::std::env::temp_dir(), spec.params().clone(), ethparams, BTreeMap::new());
+		let tempdir = TempDir::new("").unwrap();
+		let ethash = Ethash::new(tempdir.path(), ethparams, machine, None);
 
 		let mut parent_header = Header::default();
 		parent_header.set_number(5000102);
@@ -926,55 +897,12 @@ mod tests {
 		);
 	}
 
-	#[test]
-	fn gas_limit_is_multiple_of_determinant() {
-		let spec = new_homestead_test();
-		let ethparams = get_default_ethash_params();
-		let ethash = Ethash::new(&::std::env::temp_dir(), spec.params().clone(), ethparams, BTreeMap::new());
-		let mut parent = Header::new();
-		let mut header = Header::new();
-		header.set_number(1);
-
-		// this test will work for this constant only
-		assert_eq!(PARITY_GAS_LIMIT_DETERMINANT, U256::from(37));
-
-		// when parent.gas_limit < gas_floor_target:
-		parent.set_gas_limit(U256::from(50_000));
-		ethash.populate_from_parent(&mut header, &parent, U256::from(100_000), U256::from(200_000));
-		assert_eq!(*header.gas_limit(), U256::from(50_024));
-
-		// when parent.gas_limit > gas_ceil_target:
-		parent.set_gas_limit(U256::from(250_000));
-		ethash.populate_from_parent(&mut header, &parent, U256::from(100_000), U256::from(200_000));
-		assert_eq!(*header.gas_limit(), U256::from(249_787));
-
-		// when parent.gas_limit is in miner's range
-		header.set_gas_used(U256::from(150_000));
-		parent.set_gas_limit(U256::from(150_000));
-		ethash.populate_from_parent(&mut header, &parent, U256::from(100_000), U256::from(200_000));
-		assert_eq!(*header.gas_limit(), U256::from(150_035));
-
-		// when parent.gas_limit is in miner's range
-		// && we can NOT increase it to be multiple of constant
-		header.set_gas_used(U256::from(150_000));
-		parent.set_gas_limit(U256::from(150_000));
-		ethash.populate_from_parent(&mut header, &parent, U256::from(100_000), U256::from(150_002));
-		assert_eq!(*header.gas_limit(), U256::from(149_998));
-
-		// when parent.gas_limit is in miner's range
-		// && we can NOT increase it to be multiple of constant
-		// && we can NOT decrease it to be multiple of constant
-		header.set_gas_used(U256::from(150_000));
-		parent.set_gas_limit(U256::from(150_000));
-		ethash.populate_from_parent(&mut header, &parent, U256::from(150_000), U256::from(150_002));
-		assert_eq!(*header.gas_limit(), U256::from(150_002));
-	}
-
 	#[test]
 	fn difficulty_max_timestamp() {
-		let spec = new_homestead_test();
+		let machine = new_homestead_test_machine();
 		let ethparams = get_default_ethash_params();
-		let ethash = Ethash::new(&::std::env::temp_dir(), spec.params().clone(), ethparams, BTreeMap::new());
+		let tempdir = TempDir::new("").unwrap();
+		let ethash = Ethash::new(tempdir.path(), ethparams, machine, None);
 
 		let mut parent_header = Header::default();
 		parent_header.set_number(1000000);
@@ -989,80 +917,15 @@ mod tests {
 	}
 
 	#[test]
-	fn rejects_blocks_over_max_gas_limit() {
-		let spec = new_homestead_test();
-		let mut ethparams = get_default_ethash_params();
-		ethparams.max_gas_limit_transition = 10;
-		ethparams.max_gas_limit = 100_000.into();
-
-		let mut parent_header = Header::default();
-		parent_header.set_number(1);
-		parent_header.set_gas_limit(100_000.into());
-		let mut header = Header::default();
-		header.set_number(parent_header.number() + 1);
-		header.set_gas_limit(100_001.into());
-		header.set_difficulty(ethparams.minimum_difficulty);
-		let ethash = Ethash::new(&::std::env::temp_dir(), spec.params().clone(), ethparams, BTreeMap::new());
-		assert!(ethash.verify_block_family(&header, &parent_header, None).is_ok());
-
-		parent_header.set_number(9);
-		header.set_number(parent_header.number() + 1);
-
-		parent_header.set_gas_limit(99_999.into());
-		header.set_gas_limit(100_000.into());
-		assert!(ethash.verify_block_family(&header, &parent_header, None).is_ok());
-
-		parent_header.set_gas_limit(200_000.into());
-		header.set_gas_limit(200_000.into());
-		assert!(ethash.verify_block_family(&header, &parent_header, None).is_ok());
-
-		parent_header.set_gas_limit(100_000.into());
-		header.set_gas_limit(100_001.into());
-		assert!(ethash.verify_block_family(&header, &parent_header, None).is_err());
-
-		parent_header.set_gas_limit(200_000.into());
-		header.set_gas_limit(200_001.into());
-		assert!(ethash.verify_block_family(&header, &parent_header, None).is_err());
-	}
-
-	#[test]
-	fn rejects_transactions_below_min_gas_price() {
-		use ethkey::{Generator, Random};
-		use transaction::{Transaction, Action};
-
-		let spec = new_homestead_test();
-		let mut ethparams = get_default_ethash_params();
-		ethparams.min_gas_price_transition = 10;
-		ethparams.min_gas_price = 100000.into();
-
+	fn test_extra_info() {
+		let machine = new_homestead_test_machine();
+		let ethparams = get_default_ethash_params();
+		let tempdir = TempDir::new("").unwrap();
+		let ethash = Ethash::new(tempdir.path(), ethparams, machine, None);
 		let mut header = Header::default();
-		header.set_number(1);
-
-		let keypair = Random.generate().unwrap();
-		let tx1 = Transaction {
-			action: Action::Create,
-			value: U256::zero(),
-			data: Vec::new(),
-			gas: 100_000.into(),
-			gas_price: 100_000.into(),
-			nonce: U256::zero(),
-		}.sign(keypair.secret(), None).into();
-
-		let tx2 = Transaction {
-			action: Action::Create,
-			value: U256::zero(),
-			data: Vec::new(),
-			gas: 100_000.into(),
-			gas_price: 99_999.into(),
-			nonce: U256::zero(),
-		}.sign(keypair.secret(), None).into();
-
-		let ethash = Ethash::new(&::std::env::temp_dir(), spec.params().clone(), ethparams, BTreeMap::new());
-		assert!(ethash.verify_transaction_basic(&tx1, &header).is_ok());
-		assert!(ethash.verify_transaction_basic(&tx2, &header).is_ok());
-
-		header.set_number(10);
-		assert!(ethash.verify_transaction_basic(&tx1, &header).is_ok());
-		assert!(ethash.verify_transaction_basic(&tx2, &header).is_err());
+		header.set_seal(vec![rlp::encode(&H256::from("b251bd2e0283d0658f2cadfdc8ca619b5de94eca5742725e2e757dd13ed7503d")).into_vec(), rlp::encode(&H64::zero()).into_vec()]);
+		let info = ethash.extra_info(&header);
+		assert_eq!(info["nonce"], "0x0000000000000000");
+		assert_eq!(info["mixHash"], "0xb251bd2e0283d0658f2cadfdc8ca619b5de94eca5742725e2e757dd13ed7503d");
 	}
 }
diff --git a/ethcore/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs
index dee86883b407a81db1320b8ab924fc645e6d5bfb..e892cf56a4b58d50710545b8bea9a56b7ba9909c 100644
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
@@ -27,45 +27,64 @@ pub mod denominations;
 pub use self::ethash::{Ethash};
 pub use self::denominations::*;
 
-use std::path::Path;
+use machine::EthereumMachine;
 use super::spec::*;
 
-/// Most recent fork block that we support on Mainnet.
-pub const FORK_SUPPORTED_FOUNDATION: u64 = 2675000;
-
-/// Most recent fork block that we support on Ropsten.
-pub const FORK_SUPPORTED_ROPSTEN: u64 = 10;
-
-/// Most recent fork block that we support on Kovan.
-pub const FORK_SUPPORTED_KOVAN: u64 = 0;
-
-fn load<'a, T: 'a + Into<Option<&'a Path>>>(cache_dir: T, b: &[u8]) -> Spec {
-	match cache_dir.into() {
-		Some(path) => Spec::load(path, b),
+fn load<'a, T: Into<Option<SpecParams<'a>>>>(params: T, b: &[u8]) -> Spec {
+	match params.into() {
+		Some(params) => Spec::load(params, b),
 		None => Spec::load(&::std::env::temp_dir(), b)
 	}.expect("chain spec is invalid")
 }
 
+fn load_machine(b: &[u8]) -> EthereumMachine {
+	Spec::load_machine(b).expect("chain spec is invalid")
+}
+
 /// Create a new Foundation Olympic chain spec.
-pub fn new_olympic(cache_dir: &Path) -> Spec { load(cache_dir, include_bytes!("../../res/ethereum/olympic.json")) }
+pub fn new_olympic<'a, T: Into<SpecParams<'a>>>(params: T) -> Spec {
+	load(params.into(), include_bytes!("../../res/ethereum/olympic.json"))
+}
 
 /// Create a new Foundation Mainnet chain spec.
-pub fn new_foundation(cache_dir: &Path) -> Spec { load(cache_dir, include_bytes!("../../res/ethereum/foundation.json")) }
+pub fn new_foundation<'a, T: Into<SpecParams<'a>>>(params: T) -> Spec {
+	load(params.into(), include_bytes!("../../res/ethereum/foundation.json"))
+}
 
 /// Create a new Classic Mainnet chain spec without the DAO hardfork.
-pub fn new_classic(cache_dir: &Path) -> Spec { load(cache_dir, include_bytes!("../../res/ethereum/classic.json")) }
+pub fn new_classic<'a, T: Into<SpecParams<'a>>>(params: T) -> Spec {
+	load(params.into(), include_bytes!("../../res/ethereum/classic.json"))
+}
 
 /// Create a new Expanse mainnet chain spec.
-pub fn new_expanse(cache_dir: &Path) -> Spec { load(cache_dir, include_bytes!("../../res/ethereum/expanse.json")) }
+pub fn new_expanse<'a, T: Into<SpecParams<'a>>>(params: T) -> Spec {
+	load(params.into(), include_bytes!("../../res/ethereum/expanse.json"))
+}
+
+/// Create a new Musicoin mainnet chain spec.
+pub fn new_musicoin<'a, T: Into<SpecParams<'a>>>(params: T) -> Spec {
+	load(params.into(), include_bytes!("../../res/ethereum/musicoin.json"))
+}
+
+/// Create a new Ellaism mainnet chain spec.
+pub fn new_ellaism<'a, T: Into<SpecParams<'a>>>(params: T) -> Spec {
+	load(params.into(), include_bytes!("../../res/ethereum/ellaism.json"))
+}
 
 /// Create a new Kovan testnet chain spec.
-pub fn new_kovan(cache_dir: &Path) -> Spec { load(cache_dir, include_bytes!("../../res/ethereum/kovan.json")) }
+pub fn new_kovan<'a, T: Into<SpecParams<'a>>>(params: T) -> Spec {
+	load(params.into(), include_bytes!("../../res/ethereum/kovan.json"))
+}
 
 /// Create a new Foundation Ropsten chain spec.
-pub fn new_ropsten(cache_dir: &Path) -> Spec { load(cache_dir, include_bytes!("../../res/ethereum/ropsten.json")) }
+pub fn new_ropsten<'a, T: Into<SpecParams<'a>>>(params: T) -> Spec {
+	load(params.into(), include_bytes!("../../res/ethereum/ropsten.json"))
+}
 
 /// Create a new Morden chain spec.
-pub fn new_morden(cache_dir: &Path) -> Spec { load(cache_dir, include_bytes!("../../res/ethereum/morden.json")) }
+pub fn new_morden<'a, T: Into<SpecParams<'a>>>(params: T) -> Spec {
+	load(params.into(), include_bytes!("../../res/ethereum/morden.json"))
+}
 
 // For tests
 
@@ -87,15 +106,41 @@ pub fn new_transition_test() -> Spec { load(None, include_bytes!("../../res/ethe
 /// Create a new Foundation Mainnet chain spec without genesis accounts.
 pub fn new_mainnet_like() -> Spec { load(None, include_bytes!("../../res/ethereum/frontier_like_test.json")) }
 
-/// Create a new Foundation Metropolis era spec.
-pub fn new_metropolis_test() -> Spec { load(None, include_bytes!("../../res/ethereum/metropolis_test.json")) }
+/// Create a new Foundation Byzantium era spec.
+pub fn new_byzantium_test() -> Spec { load(None, include_bytes!("../../res/ethereum/byzantium_test.json")) }
+
+/// Create a new Foundation Constantinople era spec.
+pub fn new_constantinople_test() -> Spec { load(None, include_bytes!("../../res/ethereum/constantinople_test.json")) }
+
+/// Create a new Musicoin-MCIP3-era spec.
+pub fn new_mcip3_test() -> Spec { load(None, include_bytes!("../../res/ethereum/mcip3_test.json")) }
+
+// For tests
+
+/// Create a new Foundation Frontier-era chain spec as though it never changes to Homestead.
+pub fn new_frontier_test_machine() -> EthereumMachine { load_machine(include_bytes!("../../res/ethereum/frontier_test.json")) }
+
+/// Create a new Foundation Homestead-era chain spec as though it never changed from Frontier.
+pub fn new_homestead_test_machine() -> EthereumMachine { load_machine(include_bytes!("../../res/ethereum/homestead_test.json")) }
+
+/// Create a new Foundation Byzantium era spec.
+pub fn new_byzantium_test_machine() -> EthereumMachine { load_machine(include_bytes!("../../res/ethereum/byzantium_test.json")) }
+
+/// Create a new Foundation Constantinople era spec.
+pub fn new_constantinople_test_machine() -> EthereumMachine { load_machine(include_bytes!("../../res/ethereum/constantinople_test.json")) }
+
+/// Create a new Musicoin-MCIP3-era spec.
+pub fn new_mcip3_test_machine() -> EthereumMachine { load_machine(include_bytes!("../../res/ethereum/mcip3_test.json")) }
+
+/// Create new Kovan spec with wasm activated at certain block
+pub fn new_kovan_wasm_test_machine() -> EthereumMachine { load_machine(include_bytes!("../../res/ethereum/kovan_wasm_test.json")) }
 
 #[cfg(test)]
 mod tests {
-	use util::*;
+	use ethereum_types::U256;
 	use state::*;
 	use super::*;
-	use tests::helpers::*;
+	use tests::helpers::get_temp_state_db;
 	use views::BlockView;
 
 	#[test]
@@ -119,7 +164,7 @@ mod tests {
 
 		assert_eq!(morden.state_root(), "f3f4696bbf3b3b07775128eb7a3763279a394e382130f27c21e70233e04946a9".into());
 		let genesis = morden.genesis_block();
-		assert_eq!(BlockView::new(&genesis).header_view().sha3(), "0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303".into());
+		assert_eq!(BlockView::new(&genesis).header_view().hash(), "0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303".into());
 
 		let _ = morden.engine;
 	}
@@ -130,7 +175,7 @@ mod tests {
 
 		assert_eq!(frontier.state_root(), "d7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544".into());
 		let genesis = frontier.genesis_block();
-		assert_eq!(BlockView::new(&genesis).header_view().sha3(), "d4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3".into());
+		assert_eq!(BlockView::new(&genesis).header_view().hash(), "d4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3".into());
 
 		let _ = frontier.engine;
 	}
diff --git a/ethcore/src/executed.rs b/ethcore/src/executed.rs
index 3154903ca0ff56ea6988b9051f8b99f69e5227b1..a787209326467ec900f369506acf34d612b9f9be 100644
--- a/ethcore/src/executed.rs
+++ b/ethcore/src/executed.rs
@@ -16,7 +16,9 @@
 
 //! Transaction execution format module.
 
-use util::{Bytes, U256, Address, U512, trie};
+use ethereum_types::{U256, U512, Address};
+use bytes::Bytes;
+use trie;
 use vm;
 use trace::{VMTrace, FlatTrace};
 use log_entry::LogEntry;
@@ -26,7 +28,7 @@ use std::fmt;
 
 /// Transaction execution receipt.
 #[derive(Debug, PartialEq, Clone)]
-pub struct Executed {
+pub struct Executed<T = FlatTrace, V = VMTrace> {
 	/// True if the outer call/create resulted in an exceptional exit.
 	pub exception: Option<vm::Error>,
 
@@ -60,9 +62,9 @@ pub struct Executed {
 	/// Transaction output.
 	pub output: Bytes,
 	/// The trace of this transaction.
-	pub trace: Vec<FlatTrace>,
+	pub trace: Vec<T>,
 	/// The VM trace of this transaction.
-	pub vm_trace: Option<VMTrace>,
+	pub vm_trace: Option<V>,
 	/// The state diff, if we traced it.
 	pub state_diff: Option<StateDiff>,
 }
diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs
index 66a770243748a2ec9541f0a28aebf995015df61c..8e792f9e2e21e8d678c165843f6b421813015bc8 100644
--- a/ethcore/src/executive.rs
+++ b/ethcore/src/executive.rs
@@ -17,16 +17,19 @@
 //! Transaction Execution environment.
 use std::cmp;
 use std::sync::Arc;
-use util::*;
+use hash::keccak;
+use ethereum_types::{H256, U256, U512, Address};
+use bytes::{Bytes, BytesRef};
 use state::{Backend as StateBackend, State, Substate, CleanupMode};
-use engines::Engine;
-use vm::EnvInfo;
+use machine::EthereumMachine as Machine;
 use error::ExecutionError;
-use evm::{CallType, Factory, Finalize, FinalizationResult};
-use vm::{self, Ext, CreateContractAddress, ReturnData, CleanDustMode, ActionParams, ActionValue};
-use wasm;
+use evm::{CallType, Finalize, FinalizationResult};
+use vm::{
+	self, Ext, EnvInfo, CreateContractAddress, ReturnData, CleanDustMode, ActionParams,
+	ActionValue, Schedule,
+};
 use externalities::*;
-use trace::{self, FlatTrace, VMTrace, Tracer, VMTracer};
+use trace::{self, Tracer, VMTracer};
 use transaction::{Action, SignedTransaction};
 use crossbeam;
 pub use executed::{Executed, ExecutionResult};
@@ -36,8 +39,6 @@ pub use executed::{Executed, ExecutionResult};
 /// Maybe something like here: `https://github.com/ethereum/libethereum/blob/4db169b8504f2b87f7d5a481819cfb959fc65f6c/libethereum/ExtVM.cpp`
 const STACK_SIZE_PER_DEPTH: usize = 24*1024;
 
-const WASM_MAGIC_NUMBER: &'static [u8; 4] = b"\0asm";
-
 /// Returns new address created from address, nonce, and code hash
 pub fn contract_address(address_scheme: CreateContractAddress, sender: &Address, nonce: &U256, code: &[u8]) -> (Address, Option<H256>) {
 	use rlp::RlpStream;
@@ -47,20 +48,20 @@ pub fn contract_address(address_scheme: CreateContractAddress, sender: &Address,
 			let mut stream = RlpStream::new_list(2);
 			stream.append(sender);
 			stream.append(nonce);
-			(From::from(stream.as_raw().sha3()), None)
+			(From::from(keccak(stream.as_raw())), None)
 		},
 		CreateContractAddress::FromCodeHash => {
-			let code_hash = code.sha3();
+			let code_hash = keccak(code);
 			let mut buffer = [0xffu8; 20 + 32];
 			&mut buffer[20..].copy_from_slice(&code_hash[..]);
-			(From::from((&buffer[..]).sha3()), Some(code_hash))
+			(From::from(keccak(&buffer[..])), Some(code_hash))
 		},
 		CreateContractAddress::FromSenderAndCodeHash => {
-			let code_hash = code.sha3();
+			let code_hash = keccak(code);
 			let mut buffer = [0u8; 20 + 32];
 			&mut buffer[..20].copy_from_slice(&sender[..]);
 			&mut buffer[20..].copy_from_slice(&code_hash[..]);
-			(From::from((&buffer[..]).sha3()), Some(code_hash))
+			(From::from(keccak(&buffer[..])), Some(code_hash))
 		},
 	}
 }
@@ -74,6 +75,8 @@ pub struct TransactOptions<T, V> {
 	pub vm_tracer: V,
 	/// Check transaction nonce before execution.
 	pub check_nonce: bool,
+	/// Records the output from init contract calls.
+	pub output_from_init_contract: bool,
 }
 
 impl<T, V> TransactOptions<T, V> {
@@ -83,6 +86,7 @@ impl<T, V> TransactOptions<T, V> {
 			tracer,
 			vm_tracer,
 			check_nonce: true,
+			output_from_init_contract: false,
 		}
 	}
 
@@ -91,6 +95,12 @@ impl<T, V> TransactOptions<T, V> {
 		self.check_nonce = false;
 		self
 	}
+
+	/// Saves the output from contract creation.
+	pub fn save_output_from_contract(mut self) -> Self {
+		self.output_from_init_contract = true;
+		self
+	}
 }
 
 impl TransactOptions<trace::ExecutiveTracer, trace::ExecutiveVMTracer> {
@@ -100,6 +110,7 @@ impl TransactOptions<trace::ExecutiveTracer, trace::ExecutiveVMTracer> {
 			tracer: trace::ExecutiveTracer::default(),
 			vm_tracer: trace::ExecutiveVMTracer::toplevel(),
 			check_nonce: true,
+			output_from_init_contract: false,
 		}
 	}
 }
@@ -111,6 +122,7 @@ impl TransactOptions<trace::ExecutiveTracer, trace::NoopVMTracer> {
 			tracer: trace::ExecutiveTracer::default(),
 			vm_tracer: trace::NoopVMTracer,
 			check_nonce: true,
+			output_from_init_contract: false,
 		}
 	}
 }
@@ -122,6 +134,7 @@ impl TransactOptions<trace::NoopTracer, trace::ExecutiveVMTracer> {
 			tracer: trace::NoopTracer,
 			vm_tracer: trace::ExecutiveVMTracer::toplevel(),
 			check_nonce: true,
+			output_from_init_contract: false,
 		}
 	}
 }
@@ -133,51 +146,38 @@ impl TransactOptions<trace::NoopTracer, trace::NoopVMTracer> {
 			tracer: trace::NoopTracer,
 			vm_tracer: trace::NoopVMTracer,
 			check_nonce: true,
+			output_from_init_contract: false,
 		}
 	}
 }
 
-pub fn executor<E>(engine: &E, vm_factory: &Factory, params: &ActionParams)
-	-> Box<vm::Vm> where E: Engine + ?Sized
-{
-	if engine.supports_wasm() && params.code.as_ref().map_or(false, |code| code.len() > 4 && &code[0..4] == WASM_MAGIC_NUMBER) {
-		Box::new(
-			wasm::WasmInterpreter::new()
-				// prefer to fail fast
-				.expect("Failed to create wasm runtime")
-		)
-	} else {
-		vm_factory.create(params.gas)
-	}
-}
-
 /// Transaction executor.
-pub struct Executive<'a, B: 'a + StateBackend, E: 'a + Engine + ?Sized> {
+pub struct Executive<'a, B: 'a + StateBackend> {
 	state: &'a mut State<B>,
 	info: &'a EnvInfo,
-	engine: &'a E,
+	machine: &'a Machine,
 	depth: usize,
 	static_flag: bool,
 }
 
-impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
+impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 	/// Basic constructor.
-	pub fn new(state: &'a mut State<B>, info: &'a EnvInfo, engine: &'a E) -> Self {
+	pub fn new(state: &'a mut State<B>, info: &'a EnvInfo, machine: &'a Machine) -> Self {
 		Executive {
 			state: state,
 			info: info,
-			engine: engine,
+			machine: machine,
 			depth: 0,
 			static_flag: false,
 		}
 	}
 
 	/// Populates executive from parent properties. Increments executive depth.
-	pub fn from_parent(state: &'a mut State<B>, info: &'a EnvInfo, engine: &'a E, parent_depth: usize, static_flag: bool) -> Self {
+	pub fn from_parent(state: &'a mut State<B>, info: &'a EnvInfo, machine: &'a Machine, parent_depth: usize, static_flag: bool) -> Self {
 		Executive {
 			state: state,
 			info: info,
-			engine: engine,
+			machine: machine,
 			depth: parent_depth + 1,
 			static_flag: static_flag,
 		}
@@ -192,23 +192,23 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 		tracer: &'any mut T,
 		vm_tracer: &'any mut V,
 		static_call: bool,
-	) -> Externalities<'any, T, V, B, E> where T: Tracer, V: VMTracer {
+	) -> Externalities<'any, T, V, B> where T: Tracer, V: VMTracer {
 		let is_static = self.static_flag || static_call;
-		Externalities::new(self.state, self.info, self.engine, self.depth, origin_info, substate, output, tracer, vm_tracer, is_static)
+		Externalities::new(self.state, self.info, self.machine, self.depth, origin_info, substate, output, tracer, vm_tracer, is_static)
 	}
 
 	/// This function should be used to execute transaction.
 	pub fn transact<T, V>(&'a mut self, t: &SignedTransaction, options: TransactOptions<T, V>)
-		-> Result<Executed, ExecutionError> where T: Tracer, V: VMTracer,
+		-> Result<Executed<T::Output, V::Output>, ExecutionError> where T: Tracer, V: VMTracer,
 	{
-		self.transact_with_tracer(t, options.check_nonce, options.tracer, options.vm_tracer)
+		self.transact_with_tracer(t, options.check_nonce, options.output_from_init_contract, options.tracer, options.vm_tracer)
 	}
 
 	/// Execute a transaction in a "virtual" context.
 	/// This will ensure the caller has enough balance to execute the desired transaction.
 	/// Used for extra-block executions for things like consensus contracts and RPCs
 	pub fn transact_virtual<T, V>(&'a mut self, t: &SignedTransaction, options: TransactOptions<T, V>)
-		-> Result<Executed, ExecutionError> where T: Tracer, V: VMTracer,
+		-> Result<Executed<T::Output, V::Output>, ExecutionError> where T: Tracer, V: VMTracer,
 	{
 		let sender = t.sender();
 		let balance = self.state.balance(&sender)?;
@@ -226,13 +226,14 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 		&'a mut self,
 		t: &SignedTransaction,
 		check_nonce: bool,
+		output_from_create: bool,
 		mut tracer: T,
 		mut vm_tracer: V
-	) -> Result<Executed, ExecutionError> where T: Tracer, V: VMTracer {
+	) -> Result<Executed<T::Output, V::Output>, ExecutionError> where T: Tracer, V: VMTracer {
 		let sender = t.sender();
 		let nonce = self.state.nonce(&sender)?;
 
-		let schedule = self.engine.schedule(self.info.number);
+		let schedule = self.machine.schedule(self.info.number);
 		let base_gas_required = U256::from(t.gas_required(&schedule));
 
 		if t.gas < base_gas_required {
@@ -273,14 +274,14 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 		let mut substate = Substate::new();
 
 		// NOTE: there can be no invalid transactions from this point.
-		if !t.is_unsigned() {
+		if !schedule.eip86 || !t.is_unsigned() {
 			self.state.inc_nonce(&sender)?;
 		}
 		self.state.sub_balance(&sender, &U256::from(gas_cost), &mut substate.to_cleanup_mode(&schedule))?;
 
 		let (result, output) = match t.action {
 			Action::Create => {
-				let (new_address, code_hash) = contract_address(self.engine.create_address_scheme(self.info.number), &sender, &nonce, &t.data);
+				let (new_address, code_hash) = contract_address(self.machine.create_address_scheme(self.info.number), &sender, &nonce, &t.data);
 				let params = ActionParams {
 					code_address: new_address.clone(),
 					code_hash: code_hash,
@@ -293,8 +294,10 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 					code: Some(Arc::new(t.data.clone())),
 					data: None,
 					call_type: CallType::None,
+					params_type: vm::ParamsType::Embedded,
 				};
-				(self.create(params, &mut substate, &mut tracer, &mut vm_tracer), vec![])
+				let mut out = if output_from_create { Some(vec![]) } else { None };
+				(self.create(params, &mut substate, &mut out, &mut tracer, &mut vm_tracer), out.unwrap_or_else(Vec::new))
 			},
 			Action::Call(ref address) => {
 				let params = ActionParams {
@@ -309,6 +312,7 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 					code_hash: Some(self.state.code_hash(address)?),
 					data: Some(t.data.clone()),
 					call_type: CallType::Call,
+					params_type: vm::ParamsType::Separate,
 				};
 				let mut out = vec![];
 				(self.call(params, &mut substate, BytesRef::Flexible(&mut out), &mut tracer, &mut vm_tracer), out)
@@ -321,6 +325,7 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 
 	fn exec_vm<T, V>(
 		&mut self,
+		schedule: Schedule,
 		params: ActionParams,
 		unconfirmed_substate: &mut Substate,
 		output_policy: OutputPolicy,
@@ -336,19 +341,20 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 			let vm_factory = self.state.vm_factory();
 			let mut ext = self.as_externalities(OriginInfo::from(&params), unconfirmed_substate, output_policy, tracer, vm_tracer, static_call);
 			trace!(target: "executive", "ext.schedule.have_delegate_call: {}", ext.schedule().have_delegate_call);
-			return executor(self.engine, &vm_factory, &params).exec(params, &mut ext).finalize(ext);
+			let mut vm = vm_factory.create(&params, &schedule);
+			return vm.exec(params, &mut ext).finalize(ext);
 		}
 
 		// Start in new thread to reset stack
 		// TODO [todr] No thread builder yet, so we need to reset once for a while
 		// https://github.com/aturon/crossbeam/issues/16
 		crossbeam::scope(|scope| {
-			let engine = self.engine;
 			let vm_factory = self.state.vm_factory();
 			let mut ext = self.as_externalities(OriginInfo::from(&params), unconfirmed_substate, output_policy, tracer, vm_tracer, static_call);
 
 			scope.spawn(move || {
-				executor(engine, &vm_factory, &params).exec(params, &mut ext).finalize(ext)
+				let mut vm = vm_factory.create(&params, &schedule);
+				vm.exec(params, &mut ext).finalize(ext)
 			})
 		}).join()
 	}
@@ -364,12 +370,12 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 		mut output: BytesRef,
 		tracer: &mut T,
 		vm_tracer: &mut V
-	) -> vm::Result<(U256, ReturnData)> where T: Tracer, V: VMTracer {
+	) -> vm::Result<FinalizationResult> where T: Tracer, V: VMTracer {
 
-		trace!("Executive::call(params={:?}) self.env_info={:?}", params, self.info);
+		trace!("Executive::call(params={:?}) self.env_info={:?}, static={}", params, self.info, self.static_flag);
 		if (params.call_type == CallType::StaticCall ||
-				((params.call_type == CallType::Call || params.call_type == CallType::DelegateCall) &&
-				 self.static_flag))
+				((params.call_type == CallType::Call) &&
+				self.static_flag))
 			&& params.value.value() > 0.into() {
 			return Err(vm::Error::MutableCallInStaticContext);
 		}
@@ -377,7 +383,7 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 		// backup used in case of running out of gas
 		self.state.checkpoint();
 
-		let schedule = self.engine.schedule(self.info.number);
+		let schedule = self.machine.schedule(self.info.number);
 
 		// at first, transfer value to destination
 		if let ActionValue::Transfer(val) = params.value {
@@ -385,7 +391,7 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 		}
 
 		// if destination is builtin, try to execute it
-		if let Some(builtin) = self.engine.builtin(&params.code_address, self.info.number) {
+		if let Some(builtin) = self.machine.builtin(&params.code_address, self.info.number) {
 			// Engines aren't supposed to return builtins until activation, but
 			// prefer to fail rather than silently break consensus.
 			if !builtin.is_active(self.info.number) {
@@ -399,18 +405,24 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 
 			let cost = builtin.cost(data);
 			if cost <= params.gas {
-				if let Err(e) = builtin.execute(data, &mut output) {
+				let mut builtin_out_buffer = Vec::new();
+				let result = {
+					let mut builtin_output = BytesRef::Flexible(&mut builtin_out_buffer);
+					builtin.execute(data, &mut builtin_output)
+				};
+				if let Err(e) = result {
 					self.state.revert_to_checkpoint();
 					let evm_err: vm::Error = e.into();
 					tracer.trace_failed_call(trace_info, vec![], evm_err.clone().into());
 					Err(evm_err)
 				} else {
 					self.state.discard_checkpoint();
+					output.write(0, &builtin_out_buffer);
 
 					// trace only top level calls to builtins to avoid DDoS attacks
 					if self.depth == 0 {
 						let mut trace_output = tracer.prepare_trace_output();
-						if let Some(mut out) = trace_output.as_mut() {
+						if let Some(out) = trace_output.as_mut() {
 							*out = output.to_owned();
 						}
 
@@ -422,7 +434,12 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 						);
 					}
 
-					Ok((params.gas - cost, ReturnData::empty()))
+					let out_len = builtin_out_buffer.len();
+					Ok(FinalizationResult {
+						gas_left: params.gas - cost,
+						return_data: ReturnData::new(builtin_out_buffer, 0, out_len),
+						apply_state: true,
+					})
 				}
 			} else {
 				// just drain the whole gas
@@ -447,7 +464,7 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 				let mut subvmtracer = vm_tracer.prepare_subtrace(params.code.as_ref().expect("scope is conditional on params.code.is_some(); qed"));
 
 				let res = {
-					self.exec_vm(params, &mut unconfirmed_substate, OutputPolicy::Return(output, trace_output.as_mut()), &mut subtracer, &mut subvmtracer)
+					self.exec_vm(schedule, params, &mut unconfirmed_substate, OutputPolicy::Return(output, trace_output.as_mut()), &mut subtracer, &mut subvmtracer)
 				};
 
 				vm_tracer.done_subtrace(subvmtracer);
@@ -456,12 +473,13 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 
 				let traces = subtracer.drain();
 				match res {
-					Ok(ref res) => tracer.trace_call(
+					Ok(ref res) if res.apply_state => tracer.trace_call(
 						trace_info,
 						gas - res.gas_left,
 						trace_output,
 						traces
 					),
+					Ok(_) => tracer.trace_failed_call(trace_info, traces, vm::Error::Reverted.into()),
 					Err(ref e) => tracer.trace_failed_call(trace_info, traces, e.into()),
 				};
 
@@ -469,13 +487,17 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 
 				self.enact_result(&res, substate, unconfirmed_substate);
 				trace!(target: "executive", "enacted: substate={:?}\n", substate);
-				res.map(|r| (r.gas_left, r.return_data))
+				res
 			} else {
 				// otherwise it's just a basic transaction, only do tracing, if necessary.
 				self.state.discard_checkpoint();
 
 				tracer.trace_call(trace_info, U256::zero(), trace_output, vec![]);
-				Ok((params.gas, ReturnData::empty()))
+				Ok(FinalizationResult {
+					gas_left: params.gas,
+					return_data: ReturnData::empty(),
+					apply_state: true,
+				})
 			}
 		}
 	}
@@ -487,15 +509,21 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 		&mut self,
 		params: ActionParams,
 		substate: &mut Substate,
+		output: &mut Option<Bytes>,
 		tracer: &mut T,
 		vm_tracer: &mut V,
-	) -> vm::Result<(U256, ReturnData)> where T: Tracer, V: VMTracer {
+	) -> vm::Result<FinalizationResult> where T: Tracer, V: VMTracer {
 
-		let scheme = self.engine.create_address_scheme(self.info.number);
-		if scheme != CreateContractAddress::FromSenderAndNonce && self.state.exists_and_has_code(&params.address)? {
+		// EIP-684: If a contract creation is attempted, due to either a creation transaction or the
+		// CREATE (or future CREATE2) opcode, and the destination address already has either
+		// nonzero nonce, or nonempty code, then the creation throws immediately, with exactly
+		// the same behavior as would arise if the first byte in the init code were an invalid
+		// opcode. This applies retroactively starting from genesis.
+		if self.state.exists_and_has_code_or_nonce(&params.address)? {
 			return Err(vm::Error::OutOfGas);
 		}
 
+		trace!("Executive::create(params={:?}) self.env_info={:?}, static={}", params, self.info, self.static_flag);
 		if params.call_type == CallType::StaticCall || self.static_flag {
 			let trace_info = tracer.prepare_trace_create(&params);
 			tracer.trace_failed_create(trace_info, vec![], vm::Error::MutableCallInStaticContext.into());
@@ -509,7 +537,7 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 		let mut unconfirmed_substate = Substate::new();
 
 		// create contract and transfer value to it if necessary
-		let schedule = self.engine.schedule(self.info.number);
+		let schedule = self.machine.schedule(self.info.number);
 		let nonce_offset = if schedule.no_empty {1} else {0}.into();
 		let prev_bal = self.state.balance(&params.address)?;
 		if let ActionValue::Transfer(val) = params.value {
@@ -527,38 +555,44 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 
 		let mut subvmtracer = vm_tracer.prepare_subtrace(params.code.as_ref().expect("two ways into create (Externalities::create and Executive::transact_with_tracer); both place `Some(...)` `code` in `params`; qed"));
 
-		let res = {
-			self.exec_vm(params, &mut unconfirmed_substate, OutputPolicy::InitContract(trace_output.as_mut()), &mut subtracer, &mut subvmtracer)
-		};
+		let res = self.exec_vm(
+			schedule,
+			params,
+			&mut unconfirmed_substate,
+			OutputPolicy::InitContract(output.as_mut().or(trace_output.as_mut())),
+			&mut subtracer,
+			&mut subvmtracer
+		);
 
 		vm_tracer.done_subtrace(subvmtracer);
 
 		match res {
-			Ok(ref res) => tracer.trace_create(
+			Ok(ref res) if res.apply_state => tracer.trace_create(
 				trace_info,
 				gas - res.gas_left,
-				trace_output,
+				trace_output.map(|data| output.as_ref().map(|out| out.to_vec()).unwrap_or(data)),
 				created,
 				subtracer.drain()
 			),
+			Ok(_) => tracer.trace_failed_create(trace_info, subtracer.drain(), vm::Error::Reverted.into()),
 			Err(ref e) => tracer.trace_failed_create(trace_info, subtracer.drain(), e.into())
 		};
 
 		self.enact_result(&res, substate, unconfirmed_substate);
-		res.map(|r| (r.gas_left, r.return_data))
+		res
 	}
 
 	/// Finalizes the transaction (does refunds and suicides).
-	fn finalize(
+	fn finalize<T, V>(
 		&mut self,
 		t: &SignedTransaction,
 		mut substate: Substate,
-		result: vm::Result<(U256, ReturnData)>,
+		result: vm::Result<FinalizationResult>,
 		output: Bytes,
-		trace: Vec<FlatTrace>,
-		vm_trace: Option<VMTrace>
-	) -> ExecutionResult {
-		let schedule = self.engine.schedule(self.info.number);
+		trace: Vec<T>,
+		vm_trace: Option<V>
+	) -> Result<Executed<T, V>, ExecutionError> {
+		let schedule = self.machine.schedule(self.info.number);
 
 		// refunds from SSTORE nonzero -> zero
 		let sstore_refunds = U256::from(schedule.sstore_refund_gas) * substate.sstore_clears_count;
@@ -567,7 +601,7 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 		let refunds_bound = sstore_refunds + suicide_refunds;
 
 		// real ammount to refund
-		let gas_left_prerefund = match result { Ok((x, _)) => x, _ => 0.into() };
+		let gas_left_prerefund = match result { Ok(FinalizationResult{ gas_left, .. }) => gas_left, _ => 0.into() };
 		let refunded = cmp::min(refunds_bound, (t.gas - gas_left_prerefund) >> 1);
 		let gas_left = gas_left_prerefund + refunded;
 
@@ -611,9 +645,9 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 					state_diff: None,
 				})
 			},
-			_ => {
+			Ok(r) => {
 				Ok(Executed {
-					exception: None,
+					exception: if r.apply_state { None } else { Some(vm::Error::Reverted) },
 					gas: t.gas,
 					gas_used: gas_used,
 					refunded: refunded,
@@ -639,6 +673,8 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> {
 				| Err(vm::Error::Wasm {..})
 				| Err(vm::Error::OutOfStack {..})
 				| Err(vm::Error::MutableCallInStaticContext)
+				| Err(vm::Error::OutOfBounds)
+				| Err(vm::Error::Reverted)
 				| Ok(FinalizationResult { apply_state: false, .. }) => {
 					self.state.revert_to_checkpoint();
 			},
@@ -658,18 +694,25 @@ mod tests {
 	use rustc_hex::FromHex;
 	use ethkey::{Generator, Random};
 	use super::*;
-	use util::{H256, U256, U512, Address};
-	use util::bytes::BytesRef;
+	use ethereum_types::{H256, U256, U512, Address};
+	use bytes::BytesRef;
 	use vm::{ActionParams, ActionValue, CallType, EnvInfo, CreateContractAddress};
 	use evm::{Factory, VMType};
 	use error::ExecutionError;
+	use machine::EthereumMachine;
 	use state::{Substate, CleanupMode};
-	use tests::helpers::*;
+	use tests::helpers::{get_temp_state_with_factory, get_temp_state};
 	use trace::trace;
 	use trace::{FlatTrace, Tracer, NoopTracer, ExecutiveTracer};
 	use trace::{VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, VMTracer, NoopVMTracer, ExecutiveVMTracer};
 	use transaction::{Action, Transaction};
 
+	fn make_frontier_machine(max_depth: usize) -> EthereumMachine {
+		let mut machine = ::ethereum::new_frontier_test_machine();
+		machine.set_schedule_creation_rules(Box::new(move |s, _| s.max_depth = max_depth));
+		machine
+	}
+
 	#[test]
 	fn test_contract_address() {
 		let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
@@ -691,12 +734,12 @@ mod tests {
 		let mut state = get_temp_state_with_factory(factory);
 		state.add_balance(&sender, &U256::from(0x100u64), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
-		let engine = TestEngine::new(0);
+		let machine = make_frontier_machine(0);
 		let mut substate = Substate::new();
 
-		let (gas_left, _) = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
-			ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap()
+		let FinalizationResult { gas_left, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine);
+			ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(79_975));
@@ -749,12 +792,12 @@ mod tests {
 		let mut state = get_temp_state_with_factory(factory);
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
-		let engine = TestEngine::new(0);
+		let machine = make_frontier_machine(0);
 		let mut substate = Substate::new();
 
-		let (gas_left, _) = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
-			ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap()
+		let FinalizationResult { gas_left, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine);
+			ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(62_976));
@@ -805,13 +848,13 @@ mod tests {
 		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 		let mut substate = Substate::new();
 		let mut tracer = ExecutiveTracer::default();
 		let mut vm_tracer = ExecutiveVMTracer::toplevel();
 
-		let (gas_left, _) = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
+		let FinalizationResult { gas_left, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine);
 			let output = BytesRef::Fixed(&mut[0u8;0]);
 			ex.call(params, &mut substate, output, &mut tracer, &mut vm_tracer).unwrap()
 		};
@@ -885,6 +928,85 @@ mod tests {
 		assert_eq!(vm_tracer.drain().unwrap(), expected_vm_trace);
 	}
 
+	#[test]
+	fn test_trace_reverted_create() {
+		// code:
+		//
+		// 65 60016000fd - push 5 bytes
+		// 60 00 - push 0
+		// 52 mstore
+		// 60 05 - push 5
+		// 60 1b - push 27
+		// 60 17 - push 23
+		// f0 - create
+		// 60 00 - push 0
+		// 55 sstore
+		//
+		// other code:
+		//
+		// 60 01
+		// 60 00
+		// fd - revert
+
+		let code = "6460016000fd6000526005601b6017f0600055".from_hex().unwrap();
+
+		let sender = Address::from_str("cd1722f3947def4cf144679da39c4c32bdc35681").unwrap();
+		let address = contract_address(CreateContractAddress::FromSenderAndNonce, &sender, &U256::zero(), &[]).0;
+		let mut params = ActionParams::default();
+		params.address = address.clone();
+		params.code_address = address.clone();
+		params.sender = sender.clone();
+		params.origin = sender.clone();
+		params.gas = U256::from(100_000);
+		params.code = Some(Arc::new(code));
+		params.value = ActionValue::Transfer(U256::from(100));
+		params.call_type = CallType::Call;
+		let mut state = get_temp_state();
+		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
+		let info = EnvInfo::default();
+		let machine = ::ethereum::new_byzantium_test_machine();
+		let mut substate = Substate::new();
+		let mut tracer = ExecutiveTracer::default();
+		let mut vm_tracer = ExecutiveVMTracer::toplevel();
+
+		let FinalizationResult { gas_left, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine);
+			let output = BytesRef::Fixed(&mut[0u8;0]);
+			ex.call(params, &mut substate, output, &mut tracer, &mut vm_tracer).unwrap()
+		};
+
+		assert_eq!(gas_left, U256::from(62967));
+
+		let expected_trace = vec![FlatTrace {
+			trace_address: Default::default(),
+			subtraces: 1,
+			action: trace::Action::Call(trace::Call {
+				from: "cd1722f3947def4cf144679da39c4c32bdc35681".into(),
+				to: "b010143a42d5980c7e5ef0e4a4416dc098a4fed3".into(),
+				value: 100.into(),
+				gas: 100_000.into(),
+				input: vec![],
+				call_type: CallType::Call,
+			}),
+			result: trace::Res::Call(trace::CallResult {
+				gas_used: U256::from(37_033),
+				output: vec![],
+			}),
+		}, FlatTrace {
+			trace_address: vec![0].into_iter().collect(),
+			subtraces: 0,
+			action: trace::Action::Create(trace::Create {
+				from: "b010143a42d5980c7e5ef0e4a4416dc098a4fed3".into(),
+				value: 23.into(),
+				gas: 66_917.into(),
+				init: vec![0x60, 0x01, 0x60, 0x00, 0xfd]
+			}),
+			result: trace::Res::FailedCreate(vm::Error::Reverted.into()),
+		}];
+
+		assert_eq!(tracer.drain(), expected_trace);
+	}
+
 	#[test]
 	fn test_create_contract() {
 		// Tracing is not supported in JIT
@@ -914,14 +1036,14 @@ mod tests {
 		let mut state = get_temp_state();
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 		let mut substate = Substate::new();
 		let mut tracer = ExecutiveTracer::default();
 		let mut vm_tracer = ExecutiveVMTracer::toplevel();
 
-		let (gas_left, _) = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
-			ex.create(params.clone(), &mut substate, &mut tracer, &mut vm_tracer).unwrap()
+		let FinalizationResult { gas_left, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine);
+			ex.create(params.clone(), &mut substate, &mut None, &mut tracer, &mut vm_tracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(96_776));
@@ -1001,12 +1123,12 @@ mod tests {
 		let mut state = get_temp_state_with_factory(factory);
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
-		let engine = TestEngine::new(0);
+		let machine = make_frontier_machine(0);
 		let mut substate = Substate::new();
 
-		let (gas_left, _) = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
-			ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap()
+		let FinalizationResult { gas_left, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine);
+			ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(62_976));
@@ -1052,12 +1174,12 @@ mod tests {
 		let mut state = get_temp_state_with_factory(factory);
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
-		let engine = TestEngine::new(1024);
+		let machine = make_frontier_machine(1024);
 		let mut substate = Substate::new();
 
 		{
-			let mut ex = Executive::new(&mut state, &info, &engine);
-			ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap();
+			let mut ex = Executive::new(&mut state, &info, &machine);
+			ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap();
 		}
 
 		assert_eq!(substate.contracts_created.len(), 1);
@@ -1112,11 +1234,11 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100_000), CleanupMode::NoEmpty).unwrap();
 
 		let info = EnvInfo::default();
-		let engine = TestEngine::new(0);
+		let machine = make_frontier_machine(0);
 		let mut substate = Substate::new();
 
-		let (gas_left, _) = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
+		let FinalizationResult { gas_left, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine);
 			ex.call(params, &mut substate, BytesRef::Fixed(&mut []), &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
 
@@ -1156,11 +1278,11 @@ mod tests {
 		let mut state = get_temp_state_with_factory(factory);
 		state.init_code(&address, code).unwrap();
 		let info = EnvInfo::default();
-		let engine = TestEngine::new(0);
+		let machine = make_frontier_machine(0);
 		let mut substate = Substate::new();
 
-		let (gas_left, _) = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
+		let FinalizationResult { gas_left, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine);
 			ex.call(params, &mut substate, BytesRef::Fixed(&mut []), &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
 
@@ -1189,10 +1311,10 @@ mod tests {
 		state.add_balance(&sender, &U256::from(18), CleanupMode::NoEmpty).unwrap();
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
-		let engine = TestEngine::new(0);
+		let machine = make_frontier_machine(0);
 
 		let executed = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
+			let mut ex = Executive::new(&mut state, &info, &machine);
 			let opts = TransactOptions::with_no_tracing();
 			ex.transact(&t, opts).unwrap()
 		};
@@ -1226,10 +1348,10 @@ mod tests {
 		state.add_balance(&sender, &U256::from(17), CleanupMode::NoEmpty).unwrap();
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
-		let engine = TestEngine::new(0);
+		let machine = make_frontier_machine(0);
 
 		let res = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
+			let mut ex = Executive::new(&mut state, &info, &machine);
 			let opts = TransactOptions::with_no_tracing();
 			ex.transact(&t, opts)
 		};
@@ -1259,10 +1381,10 @@ mod tests {
 		let mut info = EnvInfo::default();
 		info.gas_used = U256::from(20_000);
 		info.gas_limit = U256::from(100_000);
-		let engine = TestEngine::new(0);
+		let machine = make_frontier_machine(0);
 
 		let res = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
+			let mut ex = Executive::new(&mut state, &info, &machine);
 			let opts = TransactOptions::with_no_tracing();
 			ex.transact(&t, opts)
 		};
@@ -1292,10 +1414,10 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100_017), CleanupMode::NoEmpty).unwrap();
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
-		let engine = TestEngine::new(0);
+		let machine = make_frontier_machine(0);
 
 		let res = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
+			let mut ex = Executive::new(&mut state, &info, &machine);
 			let opts = TransactOptions::with_no_tracing();
 			ex.transact(&t, opts)
 		};
@@ -1307,8 +1429,8 @@ mod tests {
 		}
 	}
 
-	evm_test!{test_sha3: test_sha3_jit, test_sha3_int}
-	fn test_sha3(factory: Factory) {
+	evm_test!{test_keccak: test_keccak_jit, test_keccak_int}
+	fn test_keccak(factory: Factory) {
 		let code = "6064640fffffffff20600055".from_hex().unwrap();
 
 		let sender = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
@@ -1325,12 +1447,12 @@ mod tests {
 		let mut state = get_temp_state_with_factory(factory);
 		state.add_balance(&sender, &U256::from_str("152d02c7e14af6800000").unwrap(), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
-		let engine = TestEngine::new(0);
+		let machine = make_frontier_machine(0);
 		let mut substate = Substate::new();
 
 		let result = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
-			ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer)
+			let mut ex = Executive::new(&mut state, &info, &machine);
+			ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer)
 		};
 
 		match result {
@@ -1357,15 +1479,13 @@ mod tests {
 		params.gas = U256::from(20025);
 		params.code = Some(Arc::new(code));
 		params.value = ActionValue::Transfer(U256::zero());
-		let mut state = get_temp_state_with_factory(factory);
-		state.add_balance(&sender, &U256::from_str("152d02c7e14af68000000").unwrap(), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
-		let engine = TestEngine::new_metropolis();
+		let machine = ::ethereum::new_byzantium_test_machine();
 		let mut substate = Substate::new();
 
 		let mut output = [0u8; 14];
-		let (result, _) = {
-			let mut ex = Executive::new(&mut state, &info, &engine);
+		let FinalizationResult { gas_left: result, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine);
 			ex.call(params, &mut substate, BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
 
@@ -1373,4 +1493,60 @@ mod tests {
 		assert_eq!(output[..], returns[..]);
 		assert_eq!(state.storage_at(&contract_address, &H256::from(&U256::zero())).unwrap(), H256::from(&U256::from(0)));
 	}
+
+	fn wasm_sample_code() -> Arc<Vec<u8>> {
+		Arc::new(
+			"0061736d01000000010d0360027f7f0060017f0060000002270303656e7603726574000003656e760673656e646572000103656e76066d656d6f727902010110030201020404017000000501000708010463616c6c00020901000ac10101be0102057f017e4100410028020441c0006b22043602042004412c6a41106a220041003602002004412c6a41086a22014200370200200441186a41106a22024100360200200441186a41086a220342003703002004420037022c2004410036021c20044100360218200441186a1001200020022802002202360200200120032903002205370200200441106a2002360200200441086a200537030020042004290318220537022c200420053703002004411410004100200441c0006a3602040b0b0a010041040b0410c00000"
+			.from_hex()
+			.unwrap()
+		)
+	}
+
+	#[test]
+	fn wasm_activated_test() {
+		let contract_address = Address::from_str("cd1722f3947def4cf144679da39c4c32bdc35681").unwrap();
+		let sender = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
+
+		let mut state = get_temp_state();
+		state.add_balance(&sender, &U256::from(10000000000u64), CleanupMode::NoEmpty).unwrap();
+		state.commit().unwrap();
+
+		let mut params = ActionParams::default();
+		params.origin = sender.clone();
+		params.sender = sender.clone();
+		params.address = contract_address.clone();
+		params.gas = U256::from(20025);
+		params.code = Some(wasm_sample_code());
+
+		let mut info = EnvInfo::default();
+
+		// 100 > 10
+		info.number = 100;
+
+		// Network with wasm activated at block 10
+		let machine = ::ethereum::new_kovan_wasm_test_machine();
+
+		let mut output = [0u8; 20];
+		let FinalizationResult { gas_left: result, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine);
+			ex.call(params.clone(), &mut Substate::new(), BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer).unwrap()
+		};
+
+		assert_eq!(result, U256::from(18433));
+		// Transaction successfully returned sender
+		assert_eq!(output[..], sender[..]);
+
+		// 1 < 10
+		info.number = 1;
+
+		let mut output = [0u8; 20];
+		let FinalizationResult { gas_left: result, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine);
+			ex.call(params, &mut Substate::new(), BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer).unwrap()
+		};
+
+		assert_eq!(result, U256::from(20025));
+		// Since transaction errored due to wasm was not activated, result is just empty
+		assert_eq!(output[..], [0u8; 20][..]);
+	}
 }
diff --git a/ethcore/src/externalities.rs b/ethcore/src/externalities.rs
index eae981f1b06d2a1de7de67d71025b3a8a55edea5..732d3499a83b8ebec8105467af9d1cdc77269585 100644
--- a/ethcore/src/externalities.rs
+++ b/ethcore/src/externalities.rs
@@ -17,15 +17,17 @@
 //! Transaction Execution environment.
 use std::cmp;
 use std::sync::Arc;
-use util::*;
+use ethereum_types::{H256, U256, Address};
+use bytes::{Bytes, BytesRef};
 use state::{Backend as StateBackend, State, Substate, CleanupMode};
-use engines::Engine;
+use machine::EthereumMachine as Machine;
 use executive::*;
 use vm::{
 	self, ActionParams, ActionValue, EnvInfo, CallType, Schedule,
 	Ext, ContractCreateResult, MessageCallResult, CreateContractAddress,
 	ReturnData
 };
+use evm::FinalizationResult;
 use transaction::UNSIGNED_SENDER;
 use trace::{Tracer, VMTracer};
 
@@ -61,12 +63,12 @@ impl OriginInfo {
 }
 
 /// Implementation of evm Externalities.
-pub struct Externalities<'a, T: 'a, V: 'a, B: 'a, E: 'a + Engine + ?Sized>
+pub struct Externalities<'a, T: 'a, V: 'a, B: 'a>
 	where T: Tracer, V:  VMTracer, B: StateBackend
 {
 	state: &'a mut State<B>,
 	env_info: &'a EnvInfo,
-	engine: &'a E,
+	machine: &'a Machine,
 	depth: usize,
 	origin_info: OriginInfo,
 	substate: &'a mut Substate,
@@ -77,14 +79,13 @@ pub struct Externalities<'a, T: 'a, V: 'a, B: 'a, E: 'a + Engine + ?Sized>
 	static_flag: bool,
 }
 
-impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Externalities<'a, T, V, B, E>
-	where T: Tracer, V: VMTracer, B: StateBackend, E: Engine + ?Sized
+impl<'a, T: 'a, V: 'a, B: 'a> Externalities<'a, T, V, B>
+	where T: Tracer, V: VMTracer, B: StateBackend
 {
 	/// Basic `Externalities` constructor.
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	pub fn new(state: &'a mut State<B>,
 		env_info: &'a EnvInfo,
-		engine: &'a E,
+		machine: &'a Machine,
 		depth: usize,
 		origin_info: OriginInfo,
 		substate: &'a mut Substate,
@@ -96,11 +97,11 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Externalities<'a, T, V, B, E>
 		Externalities {
 			state: state,
 			env_info: env_info,
-			engine: engine,
+			machine: machine,
 			depth: depth,
 			origin_info: origin_info,
 			substate: substate,
-			schedule: engine.schedule(env_info.number),
+			schedule: machine.schedule(env_info.number),
 			output: output,
 			tracer: tracer,
 			vm_tracer: vm_tracer,
@@ -109,8 +110,8 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Externalities<'a, T, V, B, E>
 	}
 }
 
-impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
-	where T: Tracer, V: VMTracer, B: StateBackend, E: Engine + ?Sized
+impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
+	where T: Tracer, V: VMTracer, B: StateBackend
 {
 	fn storage_at(&self, key: &H256) -> vm::Result<H256> {
 		self.state.storage_at(&self.origin_info.address, key).map_err(Into::into)
@@ -124,6 +125,10 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
 		}
 	}
 
+	fn is_static(&self) -> bool {
+		return self.static_flag
+	}
+
 	fn exists(&self, address: &Address) -> vm::Result<bool> {
 		self.state.exists(address).map_err(Into::into)
 	}
@@ -141,8 +146,8 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
 	}
 
 	fn blockhash(&mut self, number: &U256) -> H256 {
-		if self.env_info.number + 256 >= self.engine.params().eip210_transition {
-			let blockhash_contract_address = self.engine.params().eip210_contract_address;
+		if self.env_info.number + 256 >= self.machine.params().eip210_transition {
+			let blockhash_contract_address = self.machine.params().eip210_contract_address;
 			let code_res = self.state.code(&blockhash_contract_address)
 				.and_then(|code| self.state.code_hash(&blockhash_contract_address).map(|hash| (code, hash)));
 
@@ -157,16 +162,17 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
 				value: ActionValue::Apparent(self.origin_info.value),
 				code_address: blockhash_contract_address.clone(),
 				origin: self.origin_info.origin.clone(),
-				gas: self.engine.params().eip210_contract_gas,
+				gas: self.machine.params().eip210_contract_gas,
 				gas_price: 0.into(),
 				code: code,
 				code_hash: Some(code_hash),
 				data: Some(H256::from(number).to_vec()),
 				call_type: CallType::Call,
+				params_type: vm::ParamsType::Separate,
 			};
 
 			let mut output = H256::new();
-			let mut ex = Executive::new(self.state, self.env_info, self.engine);
+			let mut ex = Executive::new(self.state, self.env_info, self.machine);
 			let r = ex.call(params, self.substate, BytesRef::Fixed(&mut output), self.tracer, self.vm_tracer);
 			trace!("ext: blockhash contract({}) -> {:?}({}) self.env_info.number={}\n", number, r, output, self.env_info.number);
 			output
@@ -211,23 +217,29 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
 			code_hash: code_hash,
 			data: None,
 			call_type: CallType::None,
+			params_type: vm::ParamsType::Embedded,
 		};
 
-		if params.sender != UNSIGNED_SENDER {
-			if let Err(e) = self.state.inc_nonce(&self.origin_info.address) {
-				debug!(target: "ext", "Database corruption encountered: {:?}", e);
-				return ContractCreateResult::Failed
+		if !self.static_flag {
+			if !self.schedule.eip86 || params.sender != UNSIGNED_SENDER {
+				if let Err(e) = self.state.inc_nonce(&self.origin_info.address) {
+					debug!(target: "ext", "Database corruption encountered: {:?}", e);
+					return ContractCreateResult::Failed
+				}
 			}
 		}
-		let mut ex = Executive::from_parent(self.state, self.env_info, self.engine, self.depth, self.static_flag);
+		let mut ex = Executive::from_parent(self.state, self.env_info, self.machine, self.depth, self.static_flag);
 
 		// TODO: handle internal error separately
-		match ex.create(params, self.substate, self.tracer, self.vm_tracer) {
-			Ok((gas_left, _)) => {
+		match ex.create(params, self.substate, &mut None, self.tracer, self.vm_tracer) {
+			Ok(FinalizationResult{ gas_left, apply_state: true, .. }) => {
 				self.substate.contracts_created.push(address.clone());
 				ContractCreateResult::Created(address, gas_left)
 			},
-			_ => ContractCreateResult::Failed
+			Ok(FinalizationResult{ gas_left, apply_state: false, return_data }) => {
+				ContractCreateResult::Reverted(gas_left, return_data)
+			},
+			_ => ContractCreateResult::Failed,
 		}
 	}
 
@@ -263,16 +275,18 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
 			code_hash: Some(code_hash),
 			data: Some(data.to_vec()),
 			call_type: call_type,
+			params_type: vm::ParamsType::Separate,
 		};
 
 		if let Some(value) = value {
 			params.value = ActionValue::Transfer(value);
 		}
 
-		let mut ex = Executive::from_parent(self.state, self.env_info, self.engine, self.depth, self.static_flag);
+		let mut ex = Executive::from_parent(self.state, self.env_info, self.machine, self.depth, self.static_flag);
 
 		match ex.call(params, self.substate, BytesRef::Fixed(output), self.tracer, self.vm_tracer) {
-			Ok((gas_left, return_data)) => MessageCallResult::Success(gas_left, return_data),
+			Ok(FinalizationResult{ gas_left, return_data, apply_state: true }) => MessageCallResult::Success(gas_left, return_data),
+			Ok(FinalizationResult{ gas_left, return_data, apply_state: false }) => MessageCallResult::Reverted(gas_left, return_data),
 			_ => MessageCallResult::Failed
 		}
 	}
@@ -285,8 +299,7 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
 		Ok(self.state.code_size(address)?.unwrap_or(0))
 	}
 
-	#[cfg_attr(feature="dev", allow(match_ref_pats))]
-	fn ret(mut self, gas: &U256, data: &ReturnData) -> vm::Result<U256>
+	fn ret(mut self, gas: &U256, data: &ReturnData, apply_state: bool) -> vm::Result<U256>
 		where Self: Sized {
 		let handle_copy = |to: &mut Option<&mut Bytes>| {
 			to.as_mut().map(|b| **b = data.to_vec());
@@ -306,7 +319,7 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
 				vec.extend_from_slice(&*data);
 				Ok(*gas)
 			},
-			OutputPolicy::InitContract(ref mut copy) => {
+			OutputPolicy::InitContract(ref mut copy) if apply_state => {
 				let return_cost = U256::from(data.len()) * U256::from(self.schedule.create_data_gas);
 				if return_cost > *gas || data.len() > self.schedule.create_data_limit {
 					return match self.schedule.exceptional_failed_code_deposit {
@@ -314,12 +327,13 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
 						false => Ok(*gas)
 					}
 				}
-
 				handle_copy(copy);
-
 				self.state.init_code(&self.origin_info.address, data.to_vec())?;
 				Ok(*gas - return_cost)
-			}
+			},
+			OutputPolicy::InitContract(_) => {
+				Ok(*gas)
+			},
 		}
 	}
 
@@ -382,8 +396,8 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
 		self.substate.sstore_clears_count = self.substate.sstore_clears_count + U256::one();
 	}
 
-	fn trace_next_instruction(&mut self, pc: usize, instruction: u8) -> bool {
-		self.vm_tracer.trace_next_instruction(pc, instruction)
+	fn trace_next_instruction(&mut self, pc: usize, instruction: u8, current_gas: U256) -> bool {
+		self.vm_tracer.trace_next_instruction(pc, instruction, current_gas)
 	}
 
 	fn trace_prepare_execute(&mut self, pc: usize, instruction: u8, gas_cost: U256) {
@@ -397,11 +411,10 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for Externalities<'a, T, V, B, E>
 
 #[cfg(test)]
 mod tests {
-	use util::*;
-	use engines::Engine;
+	use ethereum_types::{U256, Address};
 	use evm::{EnvInfo, Ext, CallType};
 	use state::{State, Substate};
-	use tests::helpers::*;
+	use tests::helpers::get_temp_state;
 	use super::*;
 	use trace::{NoopTracer, NoopVMTracer};
 
@@ -428,7 +441,7 @@ mod tests {
 
 	struct TestSetup {
 		state: State<::state_db::StateDB>,
-		engine: Arc<Engine>,
+		machine: ::machine::EthereumMachine,
 		sub_state: Substate,
 		env_info: EnvInfo
 	}
@@ -443,7 +456,7 @@ mod tests {
 		fn new() -> Self {
 			TestSetup {
 				state: get_temp_state(),
-				engine: get_test_spec().engine,
+				machine: ::spec::Spec::new_test_machine(),
 				sub_state: Substate::new(),
 				env_info: get_test_env_info()
 			}
@@ -457,7 +470,7 @@ mod tests {
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
-		let ext = Externalities::new(state, &setup.env_info, &*setup.engine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+		let ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
 
 		assert_eq!(ext.env_info().number, 100);
 	}
@@ -469,7 +482,7 @@ mod tests {
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
-		let mut ext = Externalities::new(state, &setup.env_info, &*setup.engine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+		let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
 
 		let hash = ext.blockhash(&"0000000000000000000000000000000000000000000000000000000000120000".parse::<U256>().unwrap());
 
@@ -493,7 +506,7 @@ mod tests {
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
-		let mut ext = Externalities::new(state, &setup.env_info, &*setup.engine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+		let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
 
 		let hash = ext.blockhash(&"0000000000000000000000000000000000000000000000000000000000120000".parse::<U256>().unwrap());
 
@@ -508,7 +521,7 @@ mod tests {
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
-		let mut ext = Externalities::new(state, &setup.env_info, &*setup.engine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+		let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
 
 		let mut output = vec![];
 
@@ -536,7 +549,7 @@ mod tests {
 		let mut vm_tracer = NoopVMTracer;
 
 		{
-			let mut ext = Externalities::new(state, &setup.env_info, &*setup.engine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+			let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
 			ext.log(log_topics, &log_data).unwrap();
 		}
 
@@ -553,7 +566,7 @@ mod tests {
 		let mut vm_tracer = NoopVMTracer;
 
 		{
-			let mut ext = Externalities::new(state, &setup.env_info, &*setup.engine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+			let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
 			ext.suicide(refund_account).unwrap();
 		}
 
diff --git a/ethcore/src/factory.rs b/ethcore/src/factory.rs
index e283491e16e62ef7def7b2969f3483a3f2ad90e1..68a15f164a6eb718f75ae32062eccc70bef93712 100644
--- a/ethcore/src/factory.rs
+++ b/ethcore/src/factory.rs
@@ -14,17 +14,47 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::trie::TrieFactory;
-use evm::Factory as EvmFactory;
+use trie::TrieFactory;
 use account_db::Factory as AccountFactory;
+use evm::{Factory as EvmFactory, VMType};
+use vm::{Vm, ActionParams, Schedule};
+use wasm::WasmInterpreter;
+
+const WASM_MAGIC_NUMBER: &'static [u8; 4] = b"\0asm";
+
+/// Virtual machine factory
+#[derive(Default, Clone)]
+pub struct VmFactory {
+	evm: EvmFactory,
+}
+
+impl VmFactory {
+	pub fn create(&self, params: &ActionParams, schedule: &Schedule) -> Box<Vm> {
+		if schedule.wasm.is_some() && params.code.as_ref().map_or(false, |code| code.len() > 4 && &code[0..4] == WASM_MAGIC_NUMBER) {
+			Box::new(WasmInterpreter)
+		} else {
+			self.evm.create(&params.gas)
+		}
+	}
+
+	pub fn new(evm: VMType, cache_size: usize) -> Self {
+		VmFactory { evm: EvmFactory::new(evm, cache_size) }
+	}
+}
+
+impl From<EvmFactory> for VmFactory {
+	fn from(evm: EvmFactory) -> Self {
+		VmFactory { evm: evm }
+	}
+}
 
 /// Collection of factories.
 #[derive(Default, Clone)]
 pub struct Factories {
 	/// factory for evm.
-	pub vm: EvmFactory,
+	pub vm: VmFactory,
 	/// factory for tries.
 	pub trie: TrieFactory,
 	/// factory for account databases.
 	pub accountdb: AccountFactory,
-}
\ No newline at end of file
+}
diff --git a/ethcore/src/header.rs b/ethcore/src/header.rs
index a9a4f948d4ca90908529bbdc410db779b7377042..f6f5090ef841c3fe1eca652c044d62e1c847160b 100644
--- a/ethcore/src/header.rs
+++ b/ethcore/src/header.rs
@@ -18,15 +18,23 @@
 
 use std::cmp;
 use std::cell::RefCell;
-use util::*;
-use basic_types::{LogBloom, ZERO_LOGBLOOM};
-use time::get_time;
+use std::time::{SystemTime, UNIX_EPOCH};
+use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP, keccak};
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, U256, Address, Bloom};
+use bytes::Bytes;
 use rlp::*;
 
-pub use basic_types::Seal;
-
 pub use types::BlockNumber;
 
+/// Semantic boolean for when a seal/signature is included.
+pub enum Seal {
+	/// The seal/signature is included.
+	With,
+	/// The seal/signature is not included.
+	Without,
+}
+
 /// A block header.
 ///
 /// Reflects the specific RLP fields of a block in the chain with additional room for the seal
@@ -56,7 +64,7 @@ pub struct Header {
 	/// Block receipts root.
 	receipts_root: H256,
 	/// Block bloom.
-	log_bloom: LogBloom,
+	log_bloom: Bloom,
 	/// Gas used for contracts execution.
 	gas_used: U256,
 	/// Block gas limit.
@@ -100,13 +108,13 @@ impl Default for Header {
 			number: 0,
 			author: Address::default(),
 
-			transactions_root: SHA3_NULL_RLP,
-			uncles_hash: SHA3_EMPTY_LIST_RLP,
+			transactions_root: KECCAK_NULL_RLP,
+			uncles_hash: KECCAK_EMPTY_LIST_RLP,
 			extra_data: vec![],
 
-			state_root: SHA3_NULL_RLP,
-			receipts_root: SHA3_NULL_RLP,
-			log_bloom: ZERO_LOGBLOOM.clone(),
+			state_root: KECCAK_NULL_RLP,
+			receipts_root: KECCAK_NULL_RLP,
+			log_bloom: Bloom::default(),
 			gas_used: U256::default(),
 			gas_limit: U256::default(),
 
@@ -143,7 +151,7 @@ impl Header {
 	/// Get the receipts root field of the header.
 	pub fn receipts_root(&self) -> &H256 { &self.receipts_root }
 	/// Get the log bloom field of the header.
-	pub fn log_bloom(&self) -> &LogBloom { &self.log_bloom }
+	pub fn log_bloom(&self) -> &Bloom { &self.log_bloom }
 	/// Get the transactions root field of the header.
 	pub fn transactions_root(&self) -> &H256 { &self.transactions_root }
 	/// Get the uncles hash field of the header.
@@ -157,6 +165,12 @@ impl Header {
 	pub fn difficulty(&self) -> &U256 { &self.difficulty }
 	/// Get the seal field of the header.
 	pub fn seal(&self) -> &[Bytes] { &self.seal }
+	/// Get the seal field with RLP-decoded values as bytes.
+	pub fn decode_seal<'a, T: ::std::iter::FromIterator<&'a [u8]>>(&'a self) -> Result<T, DecoderError> {
+		self.seal.iter().map(|rlp| {
+			UntrustedRlp::new(rlp).data()
+		}).collect()
+	}
 
 	// TODO: seal_at, set_seal_at &c.
 
@@ -171,11 +185,11 @@ impl Header {
 	/// Set the receipts root field of the header.
 	pub fn set_receipts_root(&mut self, a: H256) { self.receipts_root = a; self.note_dirty() }
 	/// Set the log bloom field of the header.
-	pub fn set_log_bloom(&mut self, a: LogBloom) { self.log_bloom = a; self.note_dirty() }
+	pub fn set_log_bloom(&mut self, a: Bloom) { self.log_bloom = a; self.note_dirty() }
 	/// Set the timestamp field of the header.
 	pub fn set_timestamp(&mut self, a: u64) { self.timestamp = a; self.note_dirty(); }
 	/// Set the timestamp field of the header to the current time.
-	pub fn set_timestamp_now(&mut self, but_later_than: u64) { self.timestamp = cmp::max(get_time().sec as u64, but_later_than + 1); self.note_dirty(); }
+	pub fn set_timestamp_now(&mut self, but_later_than: u64) { let now = SystemTime::now().duration_since(UNIX_EPOCH).unwrap_or_default(); self.timestamp = cmp::max(now.as_secs() as u64, but_later_than + 1); self.note_dirty(); }
 	/// Set the number field of the header.
 	pub fn set_number(&mut self, a: BlockNumber) { self.number = a; self.note_dirty(); }
 	/// Set the author field of the header.
@@ -194,13 +208,13 @@ impl Header {
 	/// Set the seal field of the header.
 	pub fn set_seal(&mut self, a: Vec<Bytes>) { self.seal = a; self.note_dirty(); }
 
-	/// Get the hash of this header (sha3 of the RLP).
+	/// Get the hash of this header (keccak of the RLP).
 	pub fn hash(&self) -> H256 {
  		let mut hash = self.hash.borrow_mut();
  		match &mut *hash {
  			&mut Some(ref h) => h.clone(),
  			hash @ &mut None => {
-				let h = self.rlp_sha3(Seal::With);
+				let h = self.rlp_keccak(Seal::With);
  				*hash = Some(h.clone());
  				h
  			}
@@ -213,7 +227,7 @@ impl Header {
 		match &mut *hash {
 			&mut Some(ref h) => h.clone(),
 			hash @ &mut None => {
-				let h = self.rlp_sha3(Seal::Without);
+				let h = self.rlp_keccak(Seal::Without);
 				*hash = Some(h.clone());
 				h
 			}
@@ -258,7 +272,12 @@ impl Header {
 	}
 
 	/// Get the SHA3 (Keccak) of this header, optionally `with_seal`.
-	pub fn rlp_sha3(&self, with_seal: Seal) -> H256 { self.rlp(with_seal).sha3() }
+	pub fn rlp_keccak(&self, with_seal: Seal) -> H256 { keccak(self.rlp(with_seal)) }
+
+	/// Encode the header, getting a type-safe wrapper around the RLP.
+	pub fn encoded(&self) -> ::encoded::Header {
+		::encoded::Header::new(self.rlp(Seal::With))
+	}
 }
 
 impl Decodable for Header {
@@ -278,7 +297,7 @@ impl Decodable for Header {
 			timestamp: cmp::min(r.val_at::<U256>(11)?, u64::max_value().into()).as_u64(),
 			extra_data: r.val_at(12)?,
 			seal: vec![],
-			hash: RefCell::new(Some(r.as_raw().sha3())),
+			hash: RefCell::new(Some(keccak(r.as_raw()))),
 			bare_hash: RefCell::new(None),
 		};
 
@@ -302,6 +321,23 @@ impl HeapSizeOf for Header {
 	}
 }
 
+impl ::parity_machine::Header for Header {
+	fn bare_hash(&self) -> H256 { Header::bare_hash(self) }
+
+	fn hash(&self) -> H256 { Header::hash(self) }
+
+	fn seal(&self) -> &[Vec<u8>] { Header::seal(self) }
+
+	fn author(&self) -> &Address { Header::author(self) }
+
+	fn number(&self) -> BlockNumber { Header::number(self) }
+}
+
+impl ::parity_machine::ScoredHeader for Header {
+	fn score(&self) -> &U256 { self.difficulty() }
+	fn set_score(&mut self, score: U256) { self.set_difficulty(score) }
+}
+
 #[cfg(test)]
 mod tests {
 	use rustc_hex::FromHex;
@@ -313,13 +349,20 @@ mod tests {
 		// that's rlp of block header created with ethash engine.
 		let header_rlp = "f901f9a0d405da4e66f1445d455195229624e133f5baafe72b5cf7b3c36c12c8146e98b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a05fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25a088d2ec6b9860aae1a2c3b299f72b6a5d70d7f7ba4722c78f2c49ba96273c2158a007c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302008003832fefba82524d84568e932a80a0a0349d8c3df71f1a48a9df7d03fd5f14aeee7d91332c009ecaff0a71ead405bd88ab4e252a7e8c2a23".from_hex().unwrap();
 		let mix_hash = "a0a0349d8c3df71f1a48a9df7d03fd5f14aeee7d91332c009ecaff0a71ead405bd".from_hex().unwrap();
+		let mix_hash_decoded = "a0349d8c3df71f1a48a9df7d03fd5f14aeee7d91332c009ecaff0a71ead405bd".from_hex().unwrap();
 		let nonce = "88ab4e252a7e8c2a23".from_hex().unwrap();
+		let nonce_decoded = "ab4e252a7e8c2a23".from_hex().unwrap();
 
 		let header: Header = rlp::decode(&header_rlp);
-		let seal_fields = header.seal;
+		let seal_fields = header.seal.clone();
 		assert_eq!(seal_fields.len(), 2);
 		assert_eq!(seal_fields[0], mix_hash);
 		assert_eq!(seal_fields[1], nonce);
+
+		let decoded_seal = header.decode_seal::<Vec<_>>().unwrap();
+		assert_eq!(decoded_seal.len(), 2);
+		assert_eq!(decoded_seal[0], &*mix_hash_decoded);
+		assert_eq!(decoded_seal[1], &*nonce_decoded);
 	}
 
 	#[test]
diff --git a/ethcore/src/json_tests/chain.rs b/ethcore/src/json_tests/chain.rs
index 7047c9882ce9a695fdadac3ec49720857e9b5a01..64414450bd5cb1babc242e94ecfd94fbd6dbc2e9 100644
--- a/ethcore/src/json_tests/chain.rs
+++ b/ethcore/src/json_tests/chain.rs
@@ -15,16 +15,14 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::Arc;
-use client::{BlockChainClient, Client, ClientConfig};
+use client::{EvmTestClient, Client, ClientConfig, ChainInfo, ImportBlock};
 use block::Block;
-use ethereum;
-use tests::helpers::*;
 use spec::Genesis;
 use ethjson;
 use miner::Miner;
 use io::IoChannel;
 
-pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
+pub fn json_chain_test(json_data: &[u8]) -> Vec<String> {
 	::ethcore_logger::init_log();
 	let tests = ethjson::blockchain::Test::load(json_data).unwrap();
 	let mut failed = Vec::new();
@@ -42,15 +40,16 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
 			flush!("   - {}...", name);
 
 			let spec = {
+				let mut spec = match EvmTestClient::spec_from_json(&blockchain.network) {
+					Some(spec) => (*spec).clone(),
+					None => {
+						println!("   - {} | {:?} Ignoring tests because of missing spec", name, blockchain.network);
+						continue;
+					}
+				};
+
 				let genesis = Genesis::from(blockchain.genesis());
 				let state = From::from(blockchain.pre_state.clone());
-				let mut spec = match era {
-					ChainEra::Frontier => ethereum::new_frontier_test(),
-					ChainEra::Homestead => ethereum::new_homestead_test(),
-					ChainEra::Eip150 => ethereum::new_eip150_test(),
-					ChainEra::_Eip161 => ethereum::new_eip161_test(),
-					ChainEra::TransitionTest => ethereum::new_transition_test(),
-				};
 				spec.set_genesis_state(state).expect("Failed to overwrite genesis state");
 				spec.overwrite_genesis_params(genesis);
 				assert!(spec.is_state_root_valid());
@@ -58,9 +57,11 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
 			};
 
 			{
-				let db = Arc::new(::util::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)));
+				let db = Arc::new(::kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0)));
+				let mut config = ClientConfig::default();
+				config.history = 8;
 				let client = Client::new(
-					ClientConfig::default(),
+					config,
 					&spec,
 					db,
 					Arc::new(Miner::with_spec(&spec)),
@@ -86,67 +87,69 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
 	failed
 }
 
-mod frontier_era_tests {
-	use tests::helpers::*;
+mod block_tests {
 	use super::json_chain_test;
 
 	fn do_json_test(json_data: &[u8]) -> Vec<String> {
-		json_chain_test(json_data, ChainEra::Frontier)
+		json_chain_test(json_data)
 	}
 
 	declare_test!{BlockchainTests_bcBlockGasLimitTest, "BlockchainTests/bcBlockGasLimitTest"}
-	declare_test!{BlockchainTests_bcForkBlockTest, "BlockchainTests/bcForkBlockTest"}
+	declare_test!{BlockchainTests_bcExploitTest, "BlockchainTests/bcExploitTest"}
+	declare_test!{BlockchainTests_bcForgedTest, "BlockchainTests/bcForgedTest"}
 	declare_test!{BlockchainTests_bcForkStressTest, "BlockchainTests/bcForkStressTest"}
-	declare_test!{BlockchainTests_bcForkUncle, "BlockchainTests/bcForkUncle"}
 	declare_test!{BlockchainTests_bcGasPricerTest, "BlockchainTests/bcGasPricerTest"}
 	declare_test!{BlockchainTests_bcInvalidHeaderTest, "BlockchainTests/bcInvalidHeaderTest"}
-	// TODO [ToDr] Ignored because of incorrect JSON (https://github.com/ethereum/tests/pull/113)
-	declare_test!{ignore => BlockchainTests_bcInvalidRLPTest, "BlockchainTests/bcInvalidRLPTest"}
 	declare_test!{BlockchainTests_bcMultiChainTest, "BlockchainTests/bcMultiChainTest"}
-	declare_test!{BlockchainTests_bcRPC_API_Test, "BlockchainTests/bcRPC_API_Test"}
-	declare_test!{BlockchainTests_bcStateTest, "BlockchainTests/bcStateTest"}
+	declare_test!{BlockchainTests_bcRandomBlockhashTest, "BlockchainTests/bcRandomBlockhashTest"}
 	declare_test!{BlockchainTests_bcTotalDifficultyTest, "BlockchainTests/bcTotalDifficultyTest"}
-	declare_test!{BlockchainTests_bcUncleHeaderValiditiy, "BlockchainTests/bcUncleHeaderValiditiy"}
+	declare_test!{BlockchainTests_bcUncleHeaderValidity, "BlockchainTests/bcUncleHeaderValidity"}
 	declare_test!{BlockchainTests_bcUncleTest, "BlockchainTests/bcUncleTest"}
 	declare_test!{BlockchainTests_bcValidBlockTest, "BlockchainTests/bcValidBlockTest"}
 	declare_test!{BlockchainTests_bcWalletTest, "BlockchainTests/bcWalletTest"}
 
-	declare_test!{BlockchainTests_RandomTests_bl10251623GO, "BlockchainTests/RandomTests/bl10251623GO"}
-	declare_test!{BlockchainTests_RandomTests_bl201507071825GO, "BlockchainTests/RandomTests/bl201507071825GO"}
+	declare_test!{BlockchainTests_GeneralStateTest_stAttackTest, "BlockchainTests/GeneralStateTests/stAttackTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stBadOpcodeTest, "BlockchainTests/GeneralStateTests/stBadOpcode/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stCallCodes, "BlockchainTests/GeneralStateTests/stCallCodes/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stCallDelegateCodesCallCodeHomestead, "BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stCallDelegateCodesHomestead, "BlockchainTests/GeneralStateTests/stCallDelegateCodesHomestead/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stChangedEIP150, "BlockchainTests/GeneralStateTests/stChangedEIP150/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stCodeSizeLimit, "BlockchainTests/GeneralStateTests/stCodeSizeLimit/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stCreateTest, "BlockchainTests/GeneralStateTests/stCreateTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stDelegatecallTestHomestead, "BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stEIP150singleCodeGasPrices, "BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stEIP150Specific, "BlockchainTests/GeneralStateTests/stEIP150Specific/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stEIP158Specific, "BlockchainTests/GeneralStateTests/stEIP158Specific/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stExample, "BlockchainTests/GeneralStateTests/stExample/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stHomesteadSpecific, "BlockchainTests/GeneralStateTests/stHomesteadSpecific/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stInitCodeTest, "BlockchainTests/GeneralStateTests/stInitCodeTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stLogTests, "BlockchainTests/GeneralStateTests/stLogTests/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stMemExpandingEIP150Calls, "BlockchainTests/GeneralStateTests/stMemExpandingEIP150Calls/"}
+	declare_test!{heavy => BlockchainTests_GeneralStateTest_stMemoryStressTest, "BlockchainTests/GeneralStateTests/stMemoryStressTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stMemoryTest, "BlockchainTests/GeneralStateTests/stMemoryTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stNonZeroCallsTest, "BlockchainTests/GeneralStateTests/stNonZeroCallsTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stPreCompiledContracts, "BlockchainTests/GeneralStateTests/stPreCompiledContracts/"}
+	declare_test!{heavy => BlockchainTests_GeneralStateTest_stQuadraticComplexityTest, "BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stRandom, "BlockchainTests/GeneralStateTests/stRandom/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stRecursiveCreate, "BlockchainTests/GeneralStateTests/stRecursiveCreate/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stRefundTest, "BlockchainTests/GeneralStateTests/stRefundTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stReturnDataTest, "BlockchainTests/GeneralStateTests/stReturnDataTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stRevertTest, "BlockchainTests/GeneralStateTests/stRevertTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stSolidityTest, "BlockchainTests/GeneralStateTests/stSolidityTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stSpecialTest, "BlockchainTests/GeneralStateTests/stSpecialTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stStackTests, "BlockchainTests/GeneralStateTests/stStackTests/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stStaticCall, "BlockchainTests/GeneralStateTests/stStaticCall/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stSystemOperationsTest, "BlockchainTests/GeneralStateTests/stSystemOperationsTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stTransactionTest, "BlockchainTests/GeneralStateTests/stTransactionTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stTransitionTest, "BlockchainTests/GeneralStateTests/stTransitionTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stWalletTest, "BlockchainTests/GeneralStateTests/stWalletTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stZeroCallsRevert, "BlockchainTests/GeneralStateTests/stZeroCallsRevert/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stZeroCallsTest, "BlockchainTests/GeneralStateTests/stZeroCallsTest/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stZeroKnowledge, "BlockchainTests/GeneralStateTests/stZeroKnowledge/"}
+
+	declare_test!{BlockchainTests_TransitionTests_bcEIP158ToByzantium, "BlockchainTests/TransitionTests/bcEIP158ToByzantium/"}
+	declare_test!{BlockchainTests_TransitionTests_bcFrontierToHomestead, "BlockchainTests/TransitionTests/bcFrontierToHomestead/"}
+	declare_test!{BlockchainTests_TransitionTests_bcHomesteadToDao, "BlockchainTests/TransitionTests/bcHomesteadToDao/"}
+	declare_test!{BlockchainTests_TransitionTests_bcHomesteadToEIP150, "BlockchainTests/TransitionTests/bcHomesteadToEIP150/"}
 }
 
-mod transition_tests {
-	use tests::helpers::*;
-	use super::json_chain_test;
-
-	fn do_json_test(json_data: &[u8]) -> Vec<String> {
-		json_chain_test(json_data, ChainEra::TransitionTest)
-	}
-
-	declare_test!{BlockchainTests_TestNetwork_bcSimpleTransitionTest, "BlockchainTests/TestNetwork/bcSimpleTransitionTest"}
-	declare_test!{BlockchainTests_TestNetwork_bcTheDaoTest, "BlockchainTests/TestNetwork/bcTheDaoTest"}
-	declare_test!{BlockchainTests_TestNetwork_bcEIP150Test, "BlockchainTests/TestNetwork/bcEIP150Test"}
-}
-
-mod eip150_blockchain_tests {
-	use tests::helpers::*;
-	use super::json_chain_test;
-
-	fn do_json_test(json_data: &[u8]) -> Vec<String> {
-		json_chain_test(json_data, ChainEra::Eip150)
-	}
-
-	declare_test!{BlockchainTests_EIP150_bcBlockGasLimitTest, "BlockchainTests/EIP150/bcBlockGasLimitTest"}
-	declare_test!{BlockchainTests_EIP150_bcForkStressTest, "BlockchainTests/EIP150/bcForkStressTest"}
-	declare_test!{BlockchainTests_EIP150_bcGasPricerTest, "BlockchainTests/EIP150/bcGasPricerTest"}
-	declare_test!{BlockchainTests_EIP150_bcInvalidHeaderTest, "BlockchainTests/EIP150/bcInvalidHeaderTest"}
-	declare_test!{BlockchainTests_EIP150_bcInvalidRLPTest, "BlockchainTests/EIP150/bcInvalidRLPTest"}
-	declare_test!{BlockchainTests_EIP150_bcMultiChainTest, "BlockchainTests/EIP150/bcMultiChainTest"}
-	declare_test!{BlockchainTests_EIP150_bcRPC_API_Test, "BlockchainTests/EIP150/bcRPC_API_Test"}
-	declare_test!{BlockchainTests_EIP150_bcStateTest, "BlockchainTests/EIP150/bcStateTest"}
-	declare_test!{BlockchainTests_EIP150_bcTotalDifficultyTest, "BlockchainTests/EIP150/bcTotalDifficultyTest"}
-	declare_test!{BlockchainTests_EIP150_bcUncleHeaderValiditiy, "BlockchainTests/EIP150/bcUncleHeaderValiditiy"}
-	declare_test!{BlockchainTests_EIP150_bcUncleTest, "BlockchainTests/EIP150/bcUncleTest"}
-	declare_test!{BlockchainTests_EIP150_bcValidBlockTest, "BlockchainTests/EIP150/bcValidBlockTest"}
-	declare_test!{BlockchainTests_EIP150_bcWalletTest, "BlockchainTests/EIP150/bcWalletTest"}
-}
diff --git a/ethcore/src/json_tests/difficulty.rs b/ethcore/src/json_tests/difficulty.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c0d03c810b467ef3fcd696800787274042d899ee
--- /dev/null
+++ b/ethcore/src/json_tests/difficulty.rs
@@ -0,0 +1,73 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use ethjson;
+use header::Header;
+use ethereum_types::U256;
+use spec::Spec;
+
+pub fn json_difficulty_test(json_data: &[u8], spec: Spec) -> Vec<String> {
+	::ethcore_logger::init_log();
+	let tests = ethjson::test::DifficultyTest::load(json_data).unwrap();
+	let engine = &spec.engine;
+
+	for (name, test) in tests.into_iter() {
+		flush!("   - {}...", name);
+		println!("   - {}...", name);
+
+		let mut parent_header = Header::new();
+		let block_number: u64 = test.current_block_number.into();
+		parent_header.set_number(block_number - 1);
+		parent_header.set_gas_limit(0x20000.into());
+		parent_header.set_timestamp(test.parent_timestamp.into());
+		parent_header.set_difficulty(test.parent_difficulty.into());
+		parent_header.set_uncles_hash(test.parent_uncles.into());
+		let mut header = Header::new();
+		header.set_number(block_number);
+		header.set_timestamp(test.current_timestamp.into());
+		engine.populate_from_parent(&mut header, &parent_header);
+		let expected_difficulty: U256 = test.current_difficulty.into();
+		assert_eq!(header.difficulty(), &expected_difficulty);
+		flushln!("ok");
+	}
+	vec![]
+}
+
+mod difficulty_test_byzantium {
+	use super::json_difficulty_test;
+
+	fn do_json_test(json_data: &[u8]) -> Vec<String> {
+		json_difficulty_test(json_data, ::ethereum::new_byzantium_test())
+	}
+
+	declare_test!{DifficultyTests_difficultyByzantium, "BasicTests/difficultyByzantium.json"}
+}
+
+
+mod difficulty_test_foundation {
+	use super::json_difficulty_test;
+	use tempdir::TempDir;
+
+	fn do_json_test(json_data: &[u8]) -> Vec<String> {
+		let tempdir = TempDir::new("").unwrap();
+		json_difficulty_test(json_data, ::ethereum::new_foundation(&tempdir.path()))
+	}
+
+	declare_test!{DifficultyTests_difficultyMainNetwork, "BasicTests/difficultyMainNetwork.json"}
+}
+
+
+
diff --git a/ethcore/src/json_tests/executive.rs b/ethcore/src/json_tests/executive.rs
index f7b4bbe81d9c4d618bce7df5cecf2cc93bbf4614..0ec60d49319f22e05f5b7f30108236280f9f66d0 100644
--- a/ethcore/src/json_tests/executive.rs
+++ b/ethcore/src/json_tests/executive.rs
@@ -18,7 +18,6 @@ use std::sync::Arc;
 use super::test_common::*;
 use state::{Backend as StateBackend, State, Substate};
 use executive::*;
-use engines::Engine;
 use evm::{VMType, Finalize};
 use vm::{
 	self, ActionParams, CallType, Schedule, Ext,
@@ -26,10 +25,15 @@ use vm::{
 	CreateContractAddress, ReturnData,
 };
 use externalities::*;
-use tests::helpers::*;
+use tests::helpers::get_temp_state;
 use ethjson;
 use trace::{Tracer, NoopTracer};
 use trace::{VMTracer, NoopVMTracer};
+use bytes::{Bytes, BytesRef};
+use trie;
+use rlp::RlpStream;
+use hash::keccak;
+use machine::EthereumMachine as Machine;
 
 #[derive(Debug, PartialEq, Clone)]
 struct CallCreate {
@@ -53,22 +57,22 @@ impl From<ethjson::vm::Call> for CallCreate {
 
 /// Tiny wrapper around executive externalities.
 /// Stores callcreates.
-struct TestExt<'a, T: 'a, V: 'a, B: 'a, E: 'a>
-	where T: Tracer, V: VMTracer, B: StateBackend, E: Engine + ?Sized
+struct TestExt<'a, T: 'a, V: 'a, B: 'a>
+	where T: Tracer, V: VMTracer, B: StateBackend
 {
-	ext: Externalities<'a, T, V, B, E>,
+	ext: Externalities<'a, T, V, B>,
 	callcreates: Vec<CallCreate>,
 	nonce: U256,
 	sender: Address,
 }
 
-impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> TestExt<'a, T, V, B, E>
-	where T: Tracer, V: VMTracer, B: StateBackend, E: Engine + ?Sized
+impl<'a, T: 'a, V: 'a, B: 'a> TestExt<'a, T, V, B>
+	where T: Tracer, V: VMTracer, B: StateBackend,
 {
 	fn new(
 		state: &'a mut State<B>,
 		info: &'a EnvInfo,
-		engine: &'a E,
+		machine: &'a Machine,
 		depth: usize,
 		origin_info: OriginInfo,
 		substate: &'a mut Substate,
@@ -80,15 +84,15 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> TestExt<'a, T, V, B, E>
 		let static_call = false;
 		Ok(TestExt {
 			nonce: state.nonce(&address)?,
-			ext: Externalities::new(state, info, engine, depth, origin_info, substate, output, tracer, vm_tracer, static_call),
+			ext: Externalities::new(state, info, machine, depth, origin_info, substate, output, tracer, vm_tracer, static_call),
 			callcreates: vec![],
 			sender: address,
 		})
 	}
 }
 
-impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for TestExt<'a, T, V, B, E>
-	where T: Tracer, V: VMTracer, B: StateBackend, E: Engine + ?Sized
+impl<'a, T: 'a, V: 'a, B: 'a> Ext for TestExt<'a, T, V, B>
+	where T: Tracer, V: VMTracer, B: StateBackend
 {
 	fn storage_at(&self, key: &H256) -> vm::Result<H256> {
 		self.ext.storage_at(key)
@@ -160,8 +164,8 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for TestExt<'a, T, V, B, E>
 		self.ext.log(topics, data)
 	}
 
-	fn ret(self, gas: &U256, data: &ReturnData) -> Result<U256, vm::Error> {
-		self.ext.ret(gas, data)
+	fn ret(self, gas: &U256, data: &ReturnData, apply_state: bool) -> Result<U256, vm::Error> {
+		self.ext.ret(gas, data, apply_state)
 	}
 
 	fn suicide(&mut self, refund_address: &Address) -> vm::Result<()> {
@@ -180,6 +184,10 @@ impl<'a, T: 'a, V: 'a, B: 'a, E: 'a> Ext for TestExt<'a, T, V, B, E>
 		0
 	}
 
+	fn is_static(&self) -> bool {
+		false
+	}
+
 	fn inc_sstore_clears(&mut self) {
 		self.ext.inc_sstore_clears()
 	}
@@ -223,7 +231,12 @@ fn do_json_test_for(vm_type: &VMType, json_data: &[u8]) -> Vec<String> {
 		let mut state = get_temp_state();
 		state.populate_from(From::from(vm.pre_state.clone()));
 		let info = From::from(vm.env);
-		let engine = TestEngine::new(1);
+		let machine = {
+			let mut machine = ::ethereum::new_frontier_test_machine();
+			machine.set_schedule_creation_rules(Box::new(move |s, _| s.max_depth = 1));
+			machine
+		};
+
 		let params = ActionParams::from(vm.transaction);
 
 		let mut substate = Substate::new();
@@ -237,7 +250,7 @@ fn do_json_test_for(vm_type: &VMType, json_data: &[u8]) -> Vec<String> {
 			let mut ex = try_fail!(TestExt::new(
 				&mut state,
 				&info,
-				&engine,
+				&machine,
 				0,
 				OriginInfo::from(&params),
 				&mut substate,
@@ -246,13 +259,21 @@ fn do_json_test_for(vm_type: &VMType, json_data: &[u8]) -> Vec<String> {
 				&mut tracer,
 				&mut vm_tracer,
 			));
-			let mut evm = vm_factory.create(params.gas);
+			let mut evm = vm_factory.create(&params, &machine.schedule(0u64.into()));
 			let res = evm.exec(params, &mut ex);
 			// a return in finalize will not alter callcreates
 			let callcreates = ex.callcreates.clone();
 			(res.finalize(ex), callcreates)
 		};
 
+		let log_hash = {
+			let mut rlp = RlpStream::new_list(substate.logs.len());
+			for l in &substate.logs {
+				rlp.append(l);
+			}
+			keccak(&rlp.drain())
+		};
+
 		match res {
 			Err(_) => fail_unless(out_of_gas, "didn't expect to run out of gas."),
 			Ok(res) => {
@@ -260,6 +281,7 @@ fn do_json_test_for(vm_type: &VMType, json_data: &[u8]) -> Vec<String> {
 				fail_unless(Some(res.gas_left) == vm.gas_left.map(Into::into), "gas_left is incorrect");
 				let vm_output: Option<Vec<u8>> = vm.output.map(Into::into);
 				fail_unless(Some(output) == vm_output, "output is incorrect");
+				fail_unless(Some(log_hash) == vm.logs.map(|h| h.0), "logs are incorrect");
 
 				for (address, account) in vm.post_state.unwrap().into_iter() {
 					let address = address.into();
@@ -293,15 +315,15 @@ fn do_json_test_for(vm_type: &VMType, json_data: &[u8]) -> Vec<String> {
 }
 
 declare_test!{ExecutiveTests_vmArithmeticTest, "VMTests/vmArithmeticTest"}
-declare_test!{ExecutiveTests_vmBitwiseLogicOperationTest, "VMTests/vmBitwiseLogicOperationTest"}
+declare_test!{ExecutiveTests_vmBitwiseLogicOperationTest, "VMTests/vmBitwiseLogicOperation"}
 declare_test!{ExecutiveTests_vmBlockInfoTest, "VMTests/vmBlockInfoTest"}
  // TODO [todr] Fails with Signal 11 when using JIT
-declare_test!{ExecutiveTests_vmEnvironmentalInfoTest, "VMTests/vmEnvironmentalInfoTest"}
-declare_test!{ExecutiveTests_vmIOandFlowOperationsTest, "VMTests/vmIOandFlowOperationsTest"}
-declare_test!{heavy => ExecutiveTests_vmInputLimits, "VMTests/vmInputLimits"}
+declare_test!{ExecutiveTests_vmEnvironmentalInfoTest, "VMTests/vmEnvironmentalInfo"}
+declare_test!{ExecutiveTests_vmIOandFlowOperationsTest, "VMTests/vmIOandFlowOperations"}
 declare_test!{ExecutiveTests_vmLogTest, "VMTests/vmLogTest"}
-declare_test!{ExecutiveTests_vmPerformanceTest, "VMTests/vmPerformanceTest"}
+declare_test!{heavy => ExecutiveTests_vmPerformance, "VMTests/vmPerformance"}
 declare_test!{ExecutiveTests_vmPushDupSwapTest, "VMTests/vmPushDupSwapTest"}
+declare_test!{ExecutiveTests_vmRandomTest, "VMTests/vmRandomTest"}
 declare_test!{ExecutiveTests_vmSha3Test, "VMTests/vmSha3Test"}
-declare_test!{ExecutiveTests_vmSystemOperationsTest, "VMTests/vmSystemOperationsTest"}
-declare_test!{ExecutiveTests_vmtests, "VMTests/vmtests"}
+declare_test!{ExecutiveTests_vmSystemOperationsTest, "VMTests/vmSystemOperations"}
+declare_test!{ExecutiveTests_vmTests, "VMTests/vmTests"}
diff --git a/ethcore/src/json_tests/homestead_chain.rs b/ethcore/src/json_tests/homestead_chain.rs
deleted file mode 100644
index 5f0fe5769ee9385eecd919356737005b04fe39fe..0000000000000000000000000000000000000000
--- a/ethcore/src/json_tests/homestead_chain.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use super::chain::json_chain_test;
-use tests::helpers::*;
-
-fn do_json_test(json_data: &[u8]) -> Vec<String> {
-	json_chain_test(json_data, ChainEra::Homestead)
-}
-
-declare_test!{BlockchainTests_Homestead_bcBlockGasLimitTest, "BlockchainTests/Homestead/bcBlockGasLimitTest"}
-declare_test!{BlockchainTests_Homestead_bcForkStressTest, "BlockchainTests/Homestead/bcForkStressTest"}
-declare_test!{BlockchainTests_Homestead_bcGasPricerTest, "BlockchainTests/Homestead/bcGasPricerTest"}
-declare_test!{BlockchainTests_Homestead_bcInvalidHeaderTest, "BlockchainTests/Homestead/bcInvalidHeaderTest"}
-declare_test!{BlockchainTests_Homestead_bcInvalidRLPTest, "BlockchainTests/Homestead/bcInvalidRLPTest"}
-declare_test!{BlockchainTests_Homestead_bcMultiChainTest, "BlockchainTests/Homestead/bcMultiChainTest"}
-declare_test!{BlockchainTests_Homestead_bcRPC_API_Test, "BlockchainTests/Homestead/bcRPC_API_Test"}
-declare_test!{BlockchainTests_Homestead_bcStateTest, "BlockchainTests/Homestead/bcStateTest"}
-declare_test!{BlockchainTests_Homestead_bcTotalDifficultyTest, "BlockchainTests/Homestead/bcTotalDifficultyTest"}
-declare_test!{BlockchainTests_Homestead_bcUncleHeaderValiditiy, "BlockchainTests/Homestead/bcUncleHeaderValiditiy"}
-declare_test!{BlockchainTests_Homestead_bcUncleTest, "BlockchainTests/Homestead/bcUncleTest"}
-declare_test!{BlockchainTests_Homestead_bcValidBlockTest, "BlockchainTests/Homestead/bcValidBlockTest"}
-declare_test!{BlockchainTests_Homestead_bcWalletTest, "BlockchainTests/Homestead/bcWalletTest"}
-declare_test!{BlockchainTests_Homestead_bcShanghaiLove, "BlockchainTests/Homestead/bcShanghaiLove"}
-declare_test!{BlockchainTests_Homestead_bcSuicideIssue, "BlockchainTests/Homestead/bcSuicideIssue"}
-declare_test!{BlockchainTests_Homestead_bcExploitTest, "BlockchainTests/Homestead/bcExploitTest"}
diff --git a/ethcore/src/json_tests/mod.rs b/ethcore/src/json_tests/mod.rs
index 40678207259f652511cd052f0336fba18d90dc06..a0966a2d29e8856196deb60a3d41332698d91e6b 100644
--- a/ethcore/src/json_tests/mod.rs
+++ b/ethcore/src/json_tests/mod.rs
@@ -21,5 +21,5 @@ mod transaction;
 mod executive;
 mod state;
 mod chain;
-mod homestead_chain;
 mod trie;
+mod difficulty;
diff --git a/ethcore/src/json_tests/state.rs b/ethcore/src/json_tests/state.rs
index 51961a2bbebd416c4987af655d5344aae5612c83..a55ab18443dad30fe20d5c56d6c58fd7fee8d224 100644
--- a/ethcore/src/json_tests/state.rs
+++ b/ethcore/src/json_tests/state.rs
@@ -51,7 +51,7 @@ pub fn json_chain_test(json_data: &[u8]) -> Vec<String> {
 
 					let result = || -> Result<_, EvmTestError> {
 						Ok(EvmTestClient::from_pod_state(spec, pre.clone())?
-							.transact(&env, transaction, trace::NoopVMTracer))
+							.transact(&env, transaction, trace::NoopTracer, trace::NoopVMTracer))
 					};
 					match result() {
 						Err(err) => {
@@ -97,9 +97,8 @@ mod state_tests {
 	}
 
 	declare_test!{GeneralStateTest_stAttackTest, "GeneralStateTests/stAttackTest/"}
-	declare_test!{GeneralStateTest_stBoundsTest, "GeneralStateTests/stBoundsTest/"}
+	declare_test!{GeneralStateTest_stBadOpcodeTest, "GeneralStateTests/stBadOpcode/"}
 	declare_test!{GeneralStateTest_stCallCodes, "GeneralStateTests/stCallCodes/"}
-	declare_test!{skip => [ "createJS_ExampleContract" ], GeneralStateTest_stCallCreateCallCodeTest, "GeneralStateTests/stCallCreateCallCodeTest/"}
 	declare_test!{GeneralStateTest_stCallDelegateCodesCallCodeHomestead, "GeneralStateTests/stCallDelegateCodesCallCodeHomestead/"}
 	declare_test!{GeneralStateTest_stCallDelegateCodesHomestead, "GeneralStateTests/stCallDelegateCodesHomestead/"}
 	declare_test!{GeneralStateTest_stChangedEIP150, "GeneralStateTests/stChangedEIP150/"}
@@ -108,6 +107,7 @@ mod state_tests {
 	declare_test!{GeneralStateTest_stDelegatecallTestHomestead, "GeneralStateTests/stDelegatecallTestHomestead/"}
 	declare_test!{GeneralStateTest_stEIP150singleCodeGasPrices, "GeneralStateTests/stEIP150singleCodeGasPrices/"}
 	declare_test!{GeneralStateTest_stEIP150Specific, "GeneralStateTests/stEIP150Specific/"}
+	declare_test!{GeneralStateTest_stEIP158Specific, "GeneralStateTests/stEIP158Specific/"}
 	declare_test!{GeneralStateTest_stExample, "GeneralStateTests/stExample/"}
 	declare_test!{GeneralStateTest_stHomesteadSpecific, "GeneralStateTests/stHomesteadSpecific/"}
 	declare_test!{GeneralStateTest_stInitCodeTest, "GeneralStateTests/stInitCodeTest/"}
@@ -121,15 +121,18 @@ mod state_tests {
 	declare_test!{GeneralStateTest_stRandom, "GeneralStateTests/stRandom/"}
 	declare_test!{GeneralStateTest_stRecursiveCreate, "GeneralStateTests/stRecursiveCreate/"}
 	declare_test!{GeneralStateTest_stRefundTest, "GeneralStateTests/stRefundTest/"}
-	declare_test!{skip => [ "RevertDepthCreateAddressCollision" ], GeneralStateTest_stRevertTest, "GeneralStateTests/stRevertTest/"}
+	declare_test!{GeneralStateTest_stReturnDataTest, "GeneralStateTests/stReturnDataTest/"}
+	declare_test!{GeneralStateTest_stRevertTest, "GeneralStateTests/stRevertTest/"}
 	declare_test!{GeneralStateTest_stSolidityTest, "GeneralStateTests/stSolidityTest/"}
 	declare_test!{GeneralStateTest_stSpecialTest, "GeneralStateTests/stSpecialTest/"}
 	declare_test!{GeneralStateTest_stStackTests, "GeneralStateTests/stStackTests/"}
+	declare_test!{GeneralStateTest_stStaticCall, "GeneralStateTests/stStaticCall/"}
 	declare_test!{GeneralStateTest_stSystemOperationsTest, "GeneralStateTests/stSystemOperationsTest/"}
 	declare_test!{GeneralStateTest_stTransactionTest, "GeneralStateTests/stTransactionTest/"}
 	declare_test!{GeneralStateTest_stTransitionTest, "GeneralStateTests/stTransitionTest/"}
 	declare_test!{GeneralStateTest_stWalletTest, "GeneralStateTests/stWalletTest/"}
 	declare_test!{GeneralStateTest_stZeroCallsRevert, "GeneralStateTests/stZeroCallsRevert/"}
 	declare_test!{GeneralStateTest_stZeroCallsTest, "GeneralStateTests/stZeroCallsTest/"}
+	declare_test!{GeneralStateTest_stZeroKnowledge, "GeneralStateTests/stZeroKnowledge/"}
 }
 
diff --git a/ethcore/src/json_tests/test_common.rs b/ethcore/src/json_tests/test_common.rs
index fa107877635d40ded20a43017bfc8e538c56adb7..83f6b55272d5e87e2ca6afdff3dc56e500f735a2 100644
--- a/ethcore/src/json_tests/test_common.rs
+++ b/ethcore/src/json_tests/test_common.rs
@@ -14,12 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-pub use util::*;
 use std::collections::HashSet;
 use std::io::Read;
 use std::fs::{File, read_dir};
 use std::path::Path;
 use std::ffi::OsString;
+pub use ethereum_types::{H256, U256, Address};
 
 pub fn run_test_path(p: &Path, skip: &[&'static str], runner: fn (json_data: &[u8]) -> Vec<String>) {
 	let path = Path::new(p);
@@ -50,7 +50,8 @@ pub fn run_test_file(path: &Path, runner: fn (json_data: &[u8]) -> Vec<String>)
 	let mut file = File::open(&path).expect("Error opening test file");
 	file.read_to_end(&mut data).expect("Error reading test file");
 	let results = runner(&data);
-	assert!(results.is_empty());
+	let empty: [String; 0] = [];
+	assert_eq!(results, empty);
 }
 
 macro_rules! test {
diff --git a/ethcore/src/json_tests/transaction.rs b/ethcore/src/json_tests/transaction.rs
index 3d71a5fafde9e2b7c55a930ef77fde05126747be..b7445c51ad3adca47889535008ddc08aceb0c019 100644
--- a/ethcore/src/json_tests/transaction.rs
+++ b/ethcore/src/json_tests/transaction.rs
@@ -25,7 +25,7 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
 	let mut failed = Vec::new();
 	let frontier_schedule = evm::Schedule::new_frontier();
 	let homestead_schedule = evm::Schedule::new_homestead();
-	let metropolis_schedule = evm::Schedule::new_metropolis();
+	let byzantium_schedule = evm::Schedule::new_byzantium();
 	for (name, test) in tests.into_iter() {
 		let mut fail_unless = |cond: bool, title: &str| if !cond { failed.push(name.clone()); println!("Transaction failed: {:?}: {:?}", name, title); };
 
@@ -34,7 +34,7 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
 			None => &frontier_schedule,
 			Some(x) if x < 1_150_000 => &frontier_schedule,
 			Some(x) if x < 3_000_000 => &homestead_schedule,
-			Some(_) => &metropolis_schedule
+			Some(_) => &byzantium_schedule
 		};
 		let allow_chain_id_of_one = number.map_or(false, |n| n >= 2_675_000);
 		let allow_unsigned = number.map_or(false, |n| n >= 3_000_000);
@@ -42,8 +42,10 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
 		let rlp: Vec<u8> = test.rlp.into();
 		let res = UntrustedRlp::new(&rlp)
 			.as_val()
-			.map_err(From::from)
-			.and_then(|t: UnverifiedTransaction| t.validate(schedule, schedule.have_delegate_call, allow_chain_id_of_one, allow_unsigned));
+			.map_err(::error::Error::from)
+			.and_then(|t: UnverifiedTransaction| {
+				t.validate(schedule, schedule.have_delegate_call, allow_chain_id_of_one, allow_unsigned).map_err(Into::into)
+			});
 
 		fail_unless(test.transaction.is_none() == res.is_err(), "Validity different");
 		if let (Some(tx), Some(sender)) = (test.transaction, test.sender) {
@@ -75,18 +77,13 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
 	failed
 }
 
-declare_test!{TransactionTests_ttTransactionTest, "TransactionTests/ttTransactionTest"}
-declare_test!{heavy => TransactionTests_tt10mbDataField, "TransactionTests/tt10mbDataField"}
-declare_test!{TransactionTests_ttWrongRLPTransaction, "TransactionTests/ttWrongRLPTransaction"}
-declare_test!{TransactionTests_Homestead_ttTransactionTest, "TransactionTests/Homestead/ttTransactionTest"}
-declare_test!{heavy => TransactionTests_Homestead_tt10mbDataField, "TransactionTests/Homestead/tt10mbDataField"}
-declare_test!{TransactionTests_Homestead_ttWrongRLPTransaction, "TransactionTests/Homestead/ttWrongRLPTransaction"}
-declare_test!{TransactionTests_RandomTests_tr201506052141PYTHON, "TransactionTests/RandomTests/tr201506052141PYTHON"}
-declare_test!{TransactionTests_Homestead_ttTransactionTestEip155VitaliksTests, "TransactionTests/Homestead/ttTransactionTestEip155VitaliksTests"}
-declare_test!{TransactionTests_EIP155_ttTransactionTest, "TransactionTests/EIP155/ttTransactionTest"}
-declare_test!{TransactionTests_EIP155_ttTransactionTestEip155VitaliksTests, "TransactionTests/EIP155/ttTransactionTestEip155VitaliksTests"}
-declare_test!{TransactionTests_EIP155_ttTransactionTestVRule, "TransactionTests/EIP155/ttTransactionTestVRule"}
-
-declare_test!{TransactionTests_Metropolis_ttMetropolisTest, "TransactionTests/Metropolis/ttMetropolisTest"}
-declare_test!{TransactionTests_Metropolis_ttTransactionTest, "TransactionTests/Metropolis/ttTransactionTest"}
-declare_test!{TransactionTests_Metropolis_ttTransactionTestZeroSig, "TransactionTests/Metropolis/ttTransactionTestZeroSig"}
+declare_test!{TransactionTests_ttEip155VitaliksHomesead, "TransactionTests/ttEip155VitaliksHomesead"}
+declare_test!{TransactionTests_ttEip155VitaliksEip158, "TransactionTests/ttEip155VitaliksEip158"}
+declare_test!{TransactionTests_ttEip158, "TransactionTests/ttEip158"}
+declare_test!{TransactionTests_ttFrontier, "TransactionTests/ttFrontier"}
+declare_test!{TransactionTests_ttHomestead, "TransactionTests/ttHomestead"}
+declare_test!{TransactionTests_ttVRuleEip158, "TransactionTests/ttVRuleEip158"}
+declare_test!{TransactionTests_ttWrongRLPFrontier, "TransactionTests/ttWrongRLPFrontier"}
+declare_test!{TransactionTests_ttWrongRLPHomestead, "TransactionTests/ttWrongRLPHomestead"}
+declare_test!{TransactionTests_ttConstantinople, "TransactionTests/ttConstantinople"}
+declare_test!{TransactionTests_ttSpecConstantinople, "TransactionTests/ttSpecConstantinople"}
diff --git a/ethcore/src/json_tests/trie.rs b/ethcore/src/json_tests/trie.rs
index 0b1fd949ae851a0566ea2e9de9560afae57e163a..f5803d2d372e5274f0833c6bde0e6977ee8275a2 100644
--- a/ethcore/src/json_tests/trie.rs
+++ b/ethcore/src/json_tests/trie.rs
@@ -15,9 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use ethjson;
-use util::trie::{TrieFactory, TrieSpec};
-use util::hash::H256;
-use util::memorydb::MemoryDB;
+use trie::{TrieFactory, TrieSpec};
+use ethereum_types::H256;
+use memorydb::MemoryDB;
 
 fn test_trie(json: &[u8], trie: TrieSpec) -> Vec<String> {
 	let tests = ethjson::trie::Test::load(json).unwrap();
@@ -49,7 +49,7 @@ fn test_trie(json: &[u8], trie: TrieSpec) -> Vec<String> {
 }
 
 mod generic {
-	use util::trie::TrieSpec;
+	use trie::TrieSpec;
 
 	fn do_json_test(json: &[u8]) -> Vec<String> {
 		super::test_trie(json, TrieSpec::Generic)
@@ -60,7 +60,7 @@ mod generic {
 }
 
 mod secure {
-	use util::trie::TrieSpec;
+	use trie::TrieSpec;
 
 	fn do_json_test(json: &[u8]) -> Vec<String> {
 		super::test_trie(json, TrieSpec::Secure)
diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
index 15d44626b2f246b7519229299b6ccf8becc770ea..343cef9f4165760cbb6e6490d33d8c4e5f3abcb5 100644
--- a/ethcore/src/lib.rs
+++ b/ethcore/src/lib.rs
@@ -16,23 +16,6 @@
 
 #![warn(missing_docs)]
 #![cfg_attr(feature="benches", feature(test))]
-#![cfg_attr(feature="dev", feature(plugin))]
-#![cfg_attr(feature="dev", plugin(clippy))]
-
-// Clippy settings
-// Most of the time much more readable
-#![cfg_attr(feature="dev", allow(needless_range_loop))]
-// Shorter than if-else
-#![cfg_attr(feature="dev", allow(match_bool))]
-// Keeps consistency (all lines with `.clone()`).
-#![cfg_attr(feature="dev", allow(clone_on_copy))]
-// Complains on Box<E> when implementing From<Box<E>>
-#![cfg_attr(feature="dev", allow(boxed_local))]
-// Complains about nested modules with same name as parent
-#![cfg_attr(feature="dev", allow(module_inception))]
-// TODO [todr] a lot of warnings to be fixed
-#![cfg_attr(feature="dev", allow(assign_op_pattern))]
-
 
 //! Ethcore library
 //!
@@ -71,58 +54,79 @@
 //!   cargo build --release
 //!   ```
 
-extern crate bit_set;
 extern crate bloomchain;
 extern crate bn;
 extern crate byteorder;
 extern crate crossbeam;
 extern crate common_types as types;
 extern crate crypto;
-extern crate env_logger;
-extern crate ethabi;
 extern crate ethash;
 extern crate ethcore_bloom_journal as bloom_journal;
-extern crate ethcore_devtools as devtools;
 extern crate ethcore_io as io;
-extern crate ethcore_ipc_nano as nanoipc;
+extern crate ethcore_bytes as bytes;
 extern crate ethcore_logger;
+extern crate ethcore_miner;
 extern crate ethcore_stratum;
+extern crate ethcore_transaction as transaction;
+extern crate ethereum_types;
 extern crate ethjson;
 extern crate ethkey;
-extern crate futures;
+extern crate futures_cpupool;
 extern crate hardware_wallet;
-extern crate hyper;
+extern crate hashdb;
 extern crate itertools;
-extern crate linked_hash_map;
 extern crate lru_cache;
-extern crate native_contracts;
 extern crate num_cpus;
 extern crate num;
+extern crate parity_machine;
+extern crate parking_lot;
 extern crate price_info;
 extern crate rand;
+extern crate rayon;
 extern crate rlp;
+extern crate rlp_compress;
+extern crate keccak_hash as hash;
+extern crate heapsize;
+extern crate memorydb;
+extern crate patricia_trie as trie;
+extern crate triehash;
+extern crate ansi_term;
+extern crate unexpected;
+extern crate kvdb;
+extern crate kvdb_rocksdb;
+extern crate kvdb_memorydb;
+extern crate util_error;
+extern crate snappy;
+extern crate migration;
+
+extern crate ethabi;
+#[macro_use]
+extern crate ethabi_derive;
+#[macro_use]
+extern crate ethabi_contract;
 
 #[macro_use]
 extern crate rlp_derive;
 extern crate rustc_hex;
-extern crate semver;
 extern crate stats;
-extern crate time;
-extern crate transient_hashmap;
+extern crate stop_guard;
 extern crate using_queue;
 extern crate table;
-extern crate bloomable;
 extern crate vm;
 extern crate wasm;
+extern crate memory_cache;
+extern crate journaldb;
+#[cfg(test)]
+extern crate tempdir;
 
 #[macro_use]
-extern crate log;
+extern crate macros;
 #[macro_use]
-extern crate ethcore_util as util;
+extern crate log;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
-extern crate ethcore_ipc as ipc;
+extern crate trace_time;
 #[cfg_attr(test, macro_use)]
 extern crate evm;
 
@@ -141,29 +145,27 @@ pub mod error;
 pub mod ethereum;
 pub mod executed;
 pub mod header;
-pub mod migrations;
+pub mod machine;
 pub mod miner;
 pub mod pod_state;
-pub mod service;
 pub mod snapshot;
 pub mod spec;
 pub mod state;
+pub mod state_db;
 pub mod trace;
-pub mod transaction;
 pub mod verification;
 pub mod views;
 
 mod cache_manager;
 mod blooms;
-mod basic_types;
 mod pod_account;
-mod state_db;
 mod account_db;
 mod builtin;
 mod executive;
 mod externalities;
 mod blockchain;
 mod factory;
+mod tx_filter;
 
 #[cfg(test)]
 mod tests;
diff --git a/ethcore/src/machine.rs b/ethcore/src/machine.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ad36aa69d795736fd81aa351c28d436b496fc9b7
--- /dev/null
+++ b/ethcore/src/machine.rs
@@ -0,0 +1,540 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Ethereum-like state machine definition.
+
+use std::collections::{BTreeMap, HashMap};
+use std::cmp;
+use std::sync::Arc;
+
+use block::{ExecutedBlock, IsBlock};
+use builtin::Builtin;
+use client::{BlockInfo, CallContract};
+use error::Error;
+use executive::Executive;
+use header::{BlockNumber, Header};
+use spec::CommonParams;
+use state::{CleanupMode, Substate};
+use trace::{NoopTracer, NoopVMTracer, Tracer, ExecutiveTracer, RewardType, Tracing};
+use transaction::{self, SYSTEM_ADDRESS, UnverifiedTransaction, SignedTransaction};
+use tx_filter::TransactionFilter;
+
+use ethereum_types::{U256, Address};
+use bytes::BytesRef;
+use vm::{CallType, ActionParams, ActionValue, ParamsType};
+use vm::{EnvInfo, Schedule, CreateContractAddress};
+
+/// Parity tries to round block.gas_limit to multiple of this constant
+pub const PARITY_GAS_LIMIT_DETERMINANT: U256 = U256([37, 0, 0, 0]);
+
+/// Ethash-specific extensions.
+#[derive(Debug, Clone)]
+pub struct EthashExtensions {
+	/// Homestead transition block number.
+	pub homestead_transition: BlockNumber,
+	/// EIP150 transition block number.
+	pub eip150_transition: BlockNumber,
+	/// Number of first block where EIP-160 rules begin.
+	pub eip160_transition: u64,
+	/// Number of first block where EIP-161.abc begin.
+	pub eip161abc_transition: u64,
+	/// Number of first block where EIP-161.d begins.
+	pub eip161d_transition: u64,
+	/// DAO hard-fork transition block (X).
+	pub dao_hardfork_transition: u64,
+	/// DAO hard-fork refund contract address (C).
+	pub dao_hardfork_beneficiary: Address,
+	/// DAO hard-fork DAO accounts list (L)
+	pub dao_hardfork_accounts: Vec<Address>,
+}
+
+impl From<::ethjson::spec::EthashParams> for EthashExtensions {
+	fn from(p: ::ethjson::spec::EthashParams) -> Self {
+		EthashExtensions {
+			homestead_transition: p.homestead_transition.map_or(0, Into::into),
+			eip150_transition: p.eip150_transition.map_or(0, Into::into),
+			eip160_transition: p.eip160_transition.map_or(0, Into::into),
+			eip161abc_transition: p.eip161abc_transition.map_or(0, Into::into),
+			eip161d_transition: p.eip161d_transition.map_or(u64::max_value(), Into::into),
+			dao_hardfork_transition: p.dao_hardfork_transition.map_or(u64::max_value(), Into::into),
+			dao_hardfork_beneficiary: p.dao_hardfork_beneficiary.map_or_else(Address::new, Into::into),
+			dao_hardfork_accounts: p.dao_hardfork_accounts.unwrap_or_else(Vec::new).into_iter().map(Into::into).collect(),
+		}
+	}
+}
+
+/// Special rules to be applied to the schedule.
+pub type ScheduleCreationRules = Fn(&mut Schedule, BlockNumber) + Sync + Send;
+
+/// An ethereum-like state machine.
+pub struct EthereumMachine {
+	params: CommonParams,
+	builtins: Arc<BTreeMap<Address, Builtin>>,
+	tx_filter: Option<Arc<TransactionFilter>>,
+	ethash_extensions: Option<EthashExtensions>,
+	schedule_rules: Option<Box<ScheduleCreationRules>>,
+}
+
+impl EthereumMachine {
+	/// Regular ethereum machine.
+	pub fn regular(params: CommonParams, builtins: BTreeMap<Address, Builtin>) -> EthereumMachine {
+		let tx_filter = TransactionFilter::from_params(&params).map(Arc::new);
+		EthereumMachine {
+			params: params,
+			builtins: Arc::new(builtins),
+			tx_filter: tx_filter,
+			ethash_extensions: None,
+			schedule_rules: None,
+		}
+	}
+
+	/// Ethereum machine with ethash extensions.
+	// TODO: either unify or specify to mainnet specifically and include other specific-chain HFs?
+	pub fn with_ethash_extensions(params: CommonParams, builtins: BTreeMap<Address, Builtin>, extensions: EthashExtensions) -> EthereumMachine {
+		let mut machine = EthereumMachine::regular(params, builtins);
+		machine.ethash_extensions = Some(extensions);
+		machine
+	}
+
+	/// Attach special rules to the creation of schedule.
+	pub fn set_schedule_creation_rules(&mut self, rules: Box<ScheduleCreationRules>) {
+		self.schedule_rules = Some(rules);
+	}
+
+	/// Get a reference to the ethash-specific extensions.
+	pub fn ethash_extensions(&self) -> Option<&EthashExtensions> {
+		self.ethash_extensions.as_ref()
+	}
+}
+
+impl EthereumMachine {
+	/// Execute a call as the system address.
+	pub fn execute_as_system(
+		&self,
+		block: &mut ExecutedBlock,
+		contract_address: Address,
+		gas: U256,
+		data: Option<Vec<u8>>,
+	) -> Result<Vec<u8>, Error> {
+		let env_info = {
+			let mut env_info = block.env_info();
+			env_info.gas_limit = env_info.gas_used + gas;
+			env_info
+		};
+
+		let mut state = block.state_mut();
+		let params = ActionParams {
+			code_address: contract_address.clone(),
+			address: contract_address.clone(),
+			sender: SYSTEM_ADDRESS.clone(),
+			origin: SYSTEM_ADDRESS.clone(),
+			gas: gas,
+			gas_price: 0.into(),
+			value: ActionValue::Transfer(0.into()),
+			code: state.code(&contract_address)?,
+			code_hash: Some(state.code_hash(&contract_address)?),
+			data: data,
+			call_type: CallType::Call,
+			params_type: ParamsType::Separate,
+		};
+		let mut ex = Executive::new(&mut state, &env_info, self);
+		let mut substate = Substate::new();
+		let mut output = Vec::new();
+		if let Err(e) = ex.call(params, &mut substate, BytesRef::Flexible(&mut output), &mut NoopTracer, &mut NoopVMTracer) {
+			warn!("Encountered error on making system call: {}", e);
+		}
+
+		Ok(output)
+	}
+
+	/// Push last known block hash to the state.
+	fn push_last_hash(&self, block: &mut ExecutedBlock) -> Result<(), Error> {
+		let params = self.params();
+		if block.header().number() == params.eip210_transition {
+			let state = block.state_mut();
+			state.init_code(&params.eip210_contract_address, params.eip210_contract_code.clone())?;
+		}
+		if block.header().number() >= params.eip210_transition {
+			let parent_hash = block.header().parent_hash().clone();
+			let _ = self.execute_as_system(
+				block,
+				params.eip210_contract_address,
+				params.eip210_contract_gas,
+				Some(parent_hash.to_vec()),
+			)?;
+		}
+		Ok(())
+	}
+
+	/// Logic to perform on a new block: updating last hashes and the DAO
+	/// fork, for ethash.
+	pub fn on_new_block(&self, block: &mut ExecutedBlock) -> Result<(), Error> {
+		self.push_last_hash(block)?;
+
+		if let Some(ref ethash_params) = self.ethash_extensions {
+			if block.header().number() == ethash_params.dao_hardfork_transition {
+				let state = block.state_mut();
+				for child in &ethash_params.dao_hardfork_accounts {
+					let beneficiary = &ethash_params.dao_hardfork_beneficiary;
+					state.balance(child)
+						.and_then(|b| state.transfer_balance(child, beneficiary, &b, CleanupMode::NoEmpty))?;
+				}
+			}
+		}
+
+		Ok(())
+	}
+
+	/// Populate a header's fields based on its parent's header.
+	/// Usually implements the chain scoring rule based on weight.
+	/// The gas floor target must not be lower than the engine's minimum gas limit.
+	pub fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, gas_ceil_target: U256) {
+		header.set_difficulty(parent.difficulty().clone());
+
+		if let Some(ref ethash_params) = self.ethash_extensions {
+			let gas_limit = {
+				let gas_limit = parent.gas_limit().clone();
+				let bound_divisor = self.params().gas_limit_bound_divisor;
+				let lower_limit = gas_limit - gas_limit / bound_divisor + 1.into();
+				let upper_limit = gas_limit + gas_limit / bound_divisor - 1.into();
+				let gas_limit = if gas_limit < gas_floor_target {
+					let gas_limit = cmp::min(gas_floor_target, upper_limit);
+					round_block_gas_limit(gas_limit, lower_limit, upper_limit)
+				} else if gas_limit > gas_ceil_target {
+					let gas_limit = cmp::max(gas_ceil_target, lower_limit);
+					round_block_gas_limit(gas_limit, lower_limit, upper_limit)
+				} else {
+					let total_lower_limit = cmp::max(lower_limit, gas_floor_target);
+					let total_upper_limit = cmp::min(upper_limit, gas_ceil_target);
+					let gas_limit = cmp::max(gas_floor_target, cmp::min(total_upper_limit,
+						lower_limit + (header.gas_used().clone() * 6u32 / 5.into()) / bound_divisor));
+					round_block_gas_limit(gas_limit, total_lower_limit, total_upper_limit)
+				};
+				// ensure that we are not violating protocol limits
+				debug_assert!(gas_limit >= lower_limit);
+				debug_assert!(gas_limit <= upper_limit);
+				gas_limit
+			};
+
+			header.set_gas_limit(gas_limit);
+			if header.number() >= ethash_params.dao_hardfork_transition &&
+				header.number() <= ethash_params.dao_hardfork_transition + 9 {
+				header.set_extra_data(b"dao-hard-fork"[..].to_owned());
+			}
+			return
+		}
+
+		header.set_gas_limit({
+			let gas_limit = parent.gas_limit().clone();
+			let bound_divisor = self.params().gas_limit_bound_divisor;
+			if gas_limit < gas_floor_target {
+				cmp::min(gas_floor_target, gas_limit + gas_limit / bound_divisor - 1.into())
+			} else {
+				cmp::max(gas_floor_target, gas_limit - gas_limit / bound_divisor + 1.into())
+			}
+		});
+	}
+
+	/// Get the general parameters of the chain.
+	pub fn params(&self) -> &CommonParams {
+		&self.params
+	}
+
+	/// Get the EVM schedule for the given block number.
+	pub fn schedule(&self, block_number: BlockNumber) -> Schedule {
+		let mut schedule = match self.ethash_extensions {
+			None => self.params.schedule(block_number),
+			Some(ref ext) => {
+				if block_number < ext.homestead_transition {
+					Schedule::new_frontier()
+				} else if block_number < ext.eip150_transition {
+					Schedule::new_homestead()
+				} else {
+					let max_code_size = self.params.max_code_size(block_number);
+					let mut schedule = Schedule::new_post_eip150(
+						max_code_size as _,
+						block_number >= ext.eip160_transition,
+						block_number >= ext.eip161abc_transition,
+						block_number >= ext.eip161d_transition
+					);
+
+					self.params.update_schedule(block_number, &mut schedule);
+					schedule
+				}
+			}
+		};
+
+		if let Some(ref rules) = self.schedule_rules {
+			(rules)(&mut schedule, block_number)
+		}
+
+		schedule
+	}
+
+	/// Builtin-contracts for the chain..
+	pub fn builtins(&self) -> &BTreeMap<Address, Builtin> {
+		&*self.builtins
+	}
+
+	/// Attempt to get a handle to a built-in contract.
+	/// Only returns references to activated built-ins.
+	// TODO: builtin contract routing - to do this properly, it will require removing the built-in configuration-reading logic
+	// from Spec into here and removing the Spec::builtins field.
+	pub fn builtin(&self, a: &Address, block_number: BlockNumber) -> Option<&Builtin> {
+		self.builtins()
+			.get(a)
+			.and_then(|b| if b.is_active(block_number) { Some(b) } else { None })
+	}
+
+	/// Some intrinsic operation parameters; by default they take their value from the `spec()`'s `engine_params`.
+	pub fn maximum_extra_data_size(&self) -> usize { self.params().maximum_extra_data_size }
+
+	/// The nonce with which accounts begin at given block.
+	pub fn account_start_nonce(&self, block: u64) -> U256 {
+		let params = self.params();
+
+		if block >= params.dust_protection_transition {
+			U256::from(params.nonce_cap_increment) * U256::from(block)
+		} else {
+			params.account_start_nonce
+		}
+	}
+
+	/// The network ID that transactions should be signed with.
+	pub fn signing_chain_id(&self, env_info: &EnvInfo) -> Option<u64> {
+		let params = self.params();
+
+		if env_info.number >= params.eip155_transition {
+			Some(params.chain_id)
+		} else {
+			None
+		}
+	}
+
+	/// Returns new contract address generation scheme at given block number.
+	pub fn create_address_scheme(&self, number: BlockNumber) -> CreateContractAddress {
+		if number >= self.params().eip86_transition {
+			CreateContractAddress::FromCodeHash
+		} else {
+			CreateContractAddress::FromSenderAndNonce
+		}
+	}
+
+	/// Verify a particular transaction is valid, regardless of order.
+	pub fn verify_transaction_unordered(&self, t: UnverifiedTransaction, _header: &Header) -> Result<SignedTransaction, Error> {
+		Ok(SignedTransaction::new(t)?)
+	}
+
+	/// Does basic verification of the transaction.
+	pub fn verify_transaction_basic(&self, t: &UnverifiedTransaction, header: &Header) -> Result<(), Error> {
+		let check_low_s = match self.ethash_extensions {
+			Some(ref ext) => header.number() >= ext.homestead_transition,
+			None => true,
+		};
+
+		let chain_id = if header.number() < self.params().validate_chain_id_transition {
+			t.chain_id()
+		} else if header.number() >= self.params().eip155_transition {
+			Some(self.params().chain_id)
+		} else {
+			None
+		};
+		t.verify_basic(check_low_s, chain_id, false)?;
+
+		Ok(())
+	}
+
+	/// Does verification of the transaction against the parent state.
+	// TODO: refine the bound here to be a "state provider" or similar as opposed
+	// to full client functionality.
+	pub fn verify_transaction<C: BlockInfo + CallContract>(&self, t: &SignedTransaction, header: &Header, client: &C) -> Result<(), Error> {
+		if let Some(ref filter) = self.tx_filter.as_ref() {
+			if !filter.transaction_allowed(header.parent_hash(), t, client) {
+				return Err(transaction::Error::NotAllowed.into())
+			}
+		}
+
+		Ok(())
+	}
+
+	/// Additional params.
+	pub fn additional_params(&self) -> HashMap<String, String> {
+		hash_map![
+			"registrar".to_owned() => format!("{:x}", self.params.registrar)
+		]
+	}
+}
+
+/// Auxiliary data fetcher for an Ethereum machine. In Ethereum-like machines
+/// there are two kinds of auxiliary data: bodies and receipts.
+#[derive(Default, Clone)]
+pub struct AuxiliaryData<'a> {
+	/// The full block bytes, including the header.
+	pub bytes: Option<&'a [u8]>,
+	/// The block receipts.
+	pub receipts: Option<&'a [::receipt::Receipt]>,
+}
+
+/// Type alias for a function we can make calls through synchronously.
+/// Returns the call result and state proof for each call.
+pub type Call<'a> = Fn(Address, Vec<u8>) -> Result<(Vec<u8>, Vec<Vec<u8>>), String> + 'a;
+
+/// Request for auxiliary data of a block.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum AuxiliaryRequest {
+	/// Needs the body.
+	Body,
+	/// Needs the receipts.
+	Receipts,
+	/// Needs both body and receipts.
+	Both,
+}
+
+impl ::parity_machine::Machine for EthereumMachine {
+	type Header = Header;
+
+	type LiveBlock = ExecutedBlock;
+	type EngineClient = ::client::EngineClient;
+	type AuxiliaryRequest = AuxiliaryRequest;
+
+	type Error = Error;
+}
+
+impl<'a> ::parity_machine::LocalizedMachine<'a> for EthereumMachine {
+	type StateContext = Call<'a>;
+	type AuxiliaryData = AuxiliaryData<'a>;
+}
+
+impl ::parity_machine::WithBalances for EthereumMachine {
+	fn balance(&self, live: &ExecutedBlock, address: &Address) -> Result<U256, Error> {
+		live.state().balance(address).map_err(Into::into)
+	}
+
+	fn add_balance(&self, live: &mut ExecutedBlock, address: &Address, amount: &U256) -> Result<(), Error> {
+		live.state_mut().add_balance(address, amount, CleanupMode::NoEmpty).map_err(Into::into)
+	}
+
+	fn note_rewards(
+		&self,
+		live: &mut Self::LiveBlock,
+		direct: &[(Address, U256)],
+		indirect: &[(Address, U256)],
+	) -> Result<(), Self::Error> {
+		if let Tracing::Enabled(ref mut traces) = *live.traces_mut() {
+			let mut tracer = ExecutiveTracer::default();
+
+			for &(address, amount) in direct {
+				tracer.trace_reward(address, amount, RewardType::Block);
+			}
+
+			for &(address, amount) in indirect {
+				tracer.trace_reward(address, amount, RewardType::Uncle);
+			}
+
+			traces.push(tracer.drain().into());
+		}
+
+		Ok(())
+	}
+}
+
+// Try to round gas_limit a bit so that:
+// 1) it will still be in desired range
+// 2) it will be a nearest (with tendency to increase) multiple of PARITY_GAS_LIMIT_DETERMINANT
+fn round_block_gas_limit(gas_limit: U256, lower_limit: U256, upper_limit: U256) -> U256 {
+	let increased_gas_limit = gas_limit + (PARITY_GAS_LIMIT_DETERMINANT - gas_limit % PARITY_GAS_LIMIT_DETERMINANT);
+	if increased_gas_limit > upper_limit {
+		let decreased_gas_limit = increased_gas_limit - PARITY_GAS_LIMIT_DETERMINANT;
+		if decreased_gas_limit < lower_limit {
+			gas_limit
+		} else {
+			decreased_gas_limit
+		}
+	} else {
+		increased_gas_limit
+	}
+}
+
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	fn get_default_ethash_extensions() -> EthashExtensions {
+		EthashExtensions {
+			homestead_transition: 1150000,
+			eip150_transition: u64::max_value(),
+			eip160_transition: u64::max_value(),
+			eip161abc_transition: u64::max_value(),
+			eip161d_transition: u64::max_value(),
+			dao_hardfork_transition: u64::max_value(),
+			dao_hardfork_beneficiary: "0000000000000000000000000000000000000001".into(),
+			dao_hardfork_accounts: Vec::new(),
+		}
+	}
+
+	#[test]
+	fn ethash_gas_limit_is_multiple_of_determinant() {
+		use ethereum_types::U256;
+
+		let spec = ::ethereum::new_homestead_test();
+		let ethparams = get_default_ethash_extensions();
+
+		let machine = EthereumMachine::with_ethash_extensions(
+			spec.params().clone(),
+			Default::default(),
+			ethparams,
+		);
+
+		let mut parent = ::header::Header::new();
+		let mut header = ::header::Header::new();
+		header.set_number(1);
+
+		// this test will work for this constant only
+		assert_eq!(PARITY_GAS_LIMIT_DETERMINANT, U256::from(37));
+
+		// when parent.gas_limit < gas_floor_target:
+		parent.set_gas_limit(U256::from(50_000));
+		machine.populate_from_parent(&mut header, &parent, U256::from(100_000), U256::from(200_000));
+		assert_eq!(*header.gas_limit(), U256::from(50_024));
+
+		// when parent.gas_limit > gas_ceil_target:
+		parent.set_gas_limit(U256::from(250_000));
+		machine.populate_from_parent(&mut header, &parent, U256::from(100_000), U256::from(200_000));
+		assert_eq!(*header.gas_limit(), U256::from(249_787));
+
+		// when parent.gas_limit is in miner's range
+		header.set_gas_used(U256::from(150_000));
+		parent.set_gas_limit(U256::from(150_000));
+		machine.populate_from_parent(&mut header, &parent, U256::from(100_000), U256::from(200_000));
+		assert_eq!(*header.gas_limit(), U256::from(150_035));
+
+		// when parent.gas_limit is in miner's range
+		// && we can NOT increase it to be multiple of constant
+		header.set_gas_used(U256::from(150_000));
+		parent.set_gas_limit(U256::from(150_000));
+		machine.populate_from_parent(&mut header, &parent, U256::from(100_000), U256::from(150_002));
+		assert_eq!(*header.gas_limit(), U256::from(149_998));
+
+		// when parent.gas_limit is in miner's range
+		// && we can NOT increase it to be multiple of constant
+		// && we can NOT decrease it to be multiple of constant
+		header.set_gas_used(U256::from(150_000));
+		parent.set_gas_limit(U256::from(150_000));
+		machine.populate_from_parent(&mut header, &parent, U256::from(150_000), U256::from(150_002));
+		assert_eq!(*header.gas_limit(), U256::from(150_002));
+	}
+}
diff --git a/ethcore/src/migrations/blocks/v8.rs b/ethcore/src/migrations/blocks/v8.rs
deleted file mode 100644
index ddade6847dfbd1c64b40f831bcdce33029501dd3..0000000000000000000000000000000000000000
--- a/ethcore/src/migrations/blocks/v8.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! This migration compresses the state db.
-
-use util::migration::{SimpleMigration, Progress};
-use rlp::{Compressible, UntrustedRlp, RlpType};
-
-/// Compressing migration.
-#[derive(Default)]
-pub struct V8(Progress);
-
-impl SimpleMigration for V8 {
-	fn version(&self) -> u32 {
-		8
-	}
-
-	fn columns(&self) -> Option<u32> { None }
-
-	fn simple_migrate(&mut self, key: Vec<u8>, value: Vec<u8>) -> Option<(Vec<u8>, Vec<u8>)> {
-		self.0.tick();
-		Some((key,UntrustedRlp::new(&value).compress(RlpType::Blocks).into_vec()))
-	}
-}
diff --git a/ethcore/src/migrations/extras/mod.rs b/ethcore/src/migrations/extras/mod.rs
deleted file mode 100644
index 01fddc66af184d5b64b106e3c01ea07e8e64a369..0000000000000000000000000000000000000000
--- a/ethcore/src/migrations/extras/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Extras database migrations.
-
-mod v6;
-
-pub use self::v6::ToV6;
\ No newline at end of file
diff --git a/ethcore/src/migrations/extras/v6.rs b/ethcore/src/migrations/extras/v6.rs
deleted file mode 100644
index 638a64a838b66ed63c0d6db55c04fda2632b6b9e..0000000000000000000000000000000000000000
--- a/ethcore/src/migrations/extras/v6.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use util::migration::SimpleMigration;
-
-/// This migration reduces the sizes of keys and moves `ExtrasIndex` byte from back to the front.
-pub struct ToV6;
-
-impl ToV6 {
-	fn migrate_old_key(&self, old_key: Vec<u8>, index: u8, len: usize) -> Vec<u8> {
-		let mut result = vec![];
-		result.reserve(len);
-		unsafe {
-			result.set_len(len);
-		}
-		result[0] = index;
-		let old_key_start = 33 - len;
-		result[1..].clone_from_slice(&old_key[old_key_start..32]);
-		result
-	}
-}
-
-impl SimpleMigration for ToV6 {
-
-	fn columns(&self) -> Option<u32> { None }
-
-	fn version(&self) -> u32 { 6 }
-
-	fn simple_migrate(&mut self, mut key: Vec<u8>, value: Vec<u8>) -> Option<(Vec<u8>, Vec<u8>)> {
-		//// at this version all extras keys are 33 bytes long.
-		if key.len() == 33 {
-			// block details key changes:
-			// - index is moved to the front
-			if key[32] == 0 {
-				return Some((self.migrate_old_key(key, 0, 33), value));
-			}
-
-			// block hash key changes:
-			// - key is shorter 33 -> 5 bytes
-			// - index is moved to the front
-			if key[32] == 1 {
-				return Some((self.migrate_old_key(key, 1, 5), value));
-			}
-
-			// transaction addresses changes:
-			// - index is moved to the front
-			if key[32] == 2 {
-				return Some((self.migrate_old_key(key, 2, 33), value));
-			}
-
-			// block log blooms are removed
-			if key[32] == 3 {
-				return None;
-			}
-
-			// blocks blooms key changes:
-			// - key is shorter 33 -> 6 bytes
-			// - index is moved to the front
-			// - index is changed 4 -> 3
-			if key[32] == 4 {
-				key.reverse();
-				// i have no idea why it was reversed
-				let reverse = key;
-				let result = vec![
-					// new extras index is 3
-					3,
-					// 9th (+ prefix) byte was the level. Now it's second.
-					reverse[9],
-					reverse[4],
-					reverse[3],
-					reverse[2],
-					reverse[1],
-				];
-
-				return Some((result, value));
-			}
-
-			// blocks receipts key changes:
-			// - index is moved to the front
-			// - index is changed 5 -> 4
-			if key[32] == 5 {
-				return Some((self.migrate_old_key(key, 4, 33), value));
-			}
-		}
-
-		Some((key, value))
-	}
-}
-
diff --git a/ethcore/src/migrations/state/mod.rs b/ethcore/src/migrations/state/mod.rs
deleted file mode 100644
index da4ef24846e149973e9f89e75104377b48afc7c6..0000000000000000000000000000000000000000
--- a/ethcore/src/migrations/state/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! State database migrations.
-
-mod v7;
-
-pub use self::v7::{ArchiveV7, OverlayRecentV7};
\ No newline at end of file
diff --git a/ethcore/src/migrations/state/v7.rs b/ethcore/src/migrations/state/v7.rs
deleted file mode 100644
index 9a9a65d7b3a17a3fae29d0f508c1ca000d70a202..0000000000000000000000000000000000000000
--- a/ethcore/src/migrations/state/v7.rs
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! This migration migrates the state db to use an accountdb which ensures uniqueness
-//! using an address' hash as opposed to the address itself.
-
-use std::collections::HashMap;
-
-use util::Bytes;
-use util::{Address, H256};
-use util::kvdb::Database;
-use util::migration::{Batch, Config, Error, Migration, SimpleMigration, Progress};
-use util::sha3::Hashable;
-use std::sync::Arc;
-
-use rlp::{decode, Rlp, RlpStream};
-
-// attempt to migrate a key, value pair. None if migration not possible.
-fn attempt_migrate(mut key_h: H256, val: &[u8]) -> Option<H256> {
-	let val_hash = val.sha3();
-
-	if key_h != val_hash {
-		// this is a key which has been xor'd with an address.
-		// recover the address.
-		let address = key_h ^ val_hash;
-
-		// check that the address is actually a 20-byte value.
-		// the leftmost 12 bytes should be zero.
-		if &address[0..12] != &[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] {
-			return None;
-		}
-
-		let address_hash = Address::from(address).sha3();
-
-		// create the xor'd key in place.
-		key_h.copy_from_slice(&*val_hash);
-		assert_eq!(key_h, val_hash);
-
-		{
-			let last_src: &[u8] = &*address_hash;
-			let last_dst: &mut [u8] = &mut *key_h;
-			for (k, a) in last_dst[12..].iter_mut().zip(&last_src[12..]) {
-				*k ^= *a;
-			}
-		}
-
-		Some(key_h)
-	} else {
-		None
-	}
-}
-
-/// Version for `ArchiveDB`.
-#[derive(Default)]
-pub struct ArchiveV7(Progress);
-
-impl SimpleMigration for ArchiveV7 {
-
-	fn columns(&self) -> Option<u32> { None }
-
-	fn version(&self) -> u32 { 7 }
-
-	fn simple_migrate(&mut self, key: Vec<u8>, value: Vec<u8>) -> Option<(Vec<u8>, Vec<u8>)> {
-		self.0.tick();
-
-		if key.len() != 32 {
-			// metadata key, ignore.
-			return Some((key, value));
-		}
-
-		let key_h = H256::from_slice(&key[..]);
-		if let Some(new_key) = attempt_migrate(key_h, &value[..]) {
-			Some((new_key[..].to_owned(), value))
-		} else {
-			Some((key, value))
-		}
-	}
-}
-
-// magic numbers and constants for overlay-recent at v6.
-// re-written here because it may change in the journaldb module.
-const V7_LATEST_ERA_KEY: &'static [u8] = &[ b'l', b'a', b's', b't', 0, 0, 0, 0, 0, 0, 0, 0 ];
-const V7_VERSION_KEY: &'static [u8] = &[ b'j', b'v', b'e', b'r', 0, 0, 0, 0, 0, 0, 0, 0 ];
-const DB_VERSION: u32 = 0x203;
-const PADDING : [u8; 10] = [0u8; 10];
-
-/// Version for `OverlayRecent` database.
-/// more involved than the archive version because of journaling.
-#[derive(Default)]
-pub struct OverlayRecentV7 {
-	migrated_keys: HashMap<H256, H256>,
-}
-
-impl OverlayRecentV7 {
-	// walk all journal entries in the database backwards.
-	// find migrations for any possible inserted keys.
-	fn walk_journal(&mut self, source: Arc<Database>) -> Result<(), Error> {
-		if let Some(val) = source.get(None, V7_LATEST_ERA_KEY).map_err(Error::Custom)? {
-			let mut era = decode::<u64>(&val);
-			loop {
-				let mut index: usize = 0;
-				loop {
-					let entry_key = {
-						let mut r = RlpStream::new_list(3);
-						r.append(&era).append(&index).append(&&PADDING[..]);
-						r.out()
-					};
-
-					if let Some(journal_raw) = source.get(None, &entry_key).map_err(Error::Custom)? {
-						let rlp = Rlp::new(&journal_raw);
-
-						// migrate all inserted keys.
-						for r in rlp.at(1).iter() {
-							let key: H256 = r.val_at(0);
-							let v: Bytes = r.val_at(1);
-
-							if self.migrated_keys.get(&key).is_none() {
-								if let Some(new_key) = attempt_migrate(key, &v) {
-									self.migrated_keys.insert(key, new_key);
-								}
-							}
-						}
-						index += 1;
-					} else {
-						break;
-					}
-				}
-
-				if index == 0 || era == 0 {
-					break;
-				}
-				era -= 1;
-			}
-		}
-		Ok(())
-	}
-
-	// walk all journal entries in the database backwards.
-	// replace all possible inserted/deleted keys with their migrated counterparts
-	// and commit the altered entries.
-	fn migrate_journal(&self, source: Arc<Database>, mut batch: Batch, dest: &mut Database) -> Result<(), Error> {
-		if let Some(val) = source.get(None, V7_LATEST_ERA_KEY).map_err(Error::Custom)? {
-			batch.insert(V7_LATEST_ERA_KEY.into(), val.clone().into_vec(), dest)?;
-
-			let mut era = decode::<u64>(&val);
-			loop {
-				let mut index: usize = 0;
-				loop {
-					let entry_key = {
-						let mut r = RlpStream::new_list(3);
-						r.append(&era).append(&index).append(&&PADDING[..]);
-						r.out()
-					};
-
-					if let Some(journal_raw) = source.get(None, &entry_key).map_err(Error::Custom)? {
-						let rlp = Rlp::new(&journal_raw);
-						let id: H256 = rlp.val_at(0);
-						let mut inserted_keys: Vec<(H256, Bytes)> = Vec::new();
-
-						// migrate all inserted keys.
-						for r in rlp.at(1).iter() {
-							let mut key: H256 = r.val_at(0);
-							let v: Bytes = r.val_at(1);
-
-							if let Some(new_key) = self.migrated_keys.get(&key) {
-								key = *new_key;
-							}
-
-							inserted_keys.push((key, v));
-						}
-
-						// migrate all deleted keys.
-						let mut deleted_keys: Vec<H256> = rlp.list_at(2);
-						for old_key in &mut deleted_keys {
-							if let Some(new) = self.migrated_keys.get(&*old_key) {
-								*old_key = new.clone();
-							}
-						}
-
-						// rebuild the journal entry rlp.
-						let mut stream = RlpStream::new_list(3);
-						stream.append(&id);
-						stream.begin_list(inserted_keys.len());
-						for (k, v) in inserted_keys {
-							stream.begin_list(2).append(&k).append(&v);
-						}
-
-						stream.append_list(&deleted_keys);
-
-						// and insert it into the new database.
-						batch.insert(entry_key, stream.out(), dest)?;
-
-						index += 1;
-					} else {
-						break;
-					}
-				}
-
-				if index == 0 || era == 0 {
-					break;
-				}
-				era -= 1;
-			}
-		}
-		batch.commit(dest)
-	}
-}
-
-impl Migration for OverlayRecentV7 {
-
-	fn columns(&self) -> Option<u32> { None }
-
-	fn version(&self) -> u32 { 7 }
-
-	// walk all records in the database, attempting to migrate any possible and
-	// keeping records of those that we do. then migrate the journal using
-	// this information.
-	fn migrate(&mut self, source: Arc<Database>, config: &Config, dest: &mut Database, col: Option<u32>) -> Result<(), Error> {
-		let mut batch = Batch::new(config, col);
-
-		// check version metadata.
-		match source.get(None, V7_VERSION_KEY).map_err(Error::Custom)? {
-			Some(ref version) if decode::<u32>(&*version) == DB_VERSION => {}
-			_ => return Err(Error::MigrationImpossible), // missing or wrong version
-		}
-
-		let mut count = 0;
-		for (key, value) in source.iter(None).into_iter().flat_map(|inner| inner) {
-			count += 1;
-			if count == 100_000 {
-				count = 0;
-				flush!(".");
-			}
-
-			let mut key = key.into_vec();
-			if key.len() == 32 {
-				let key_h = H256::from_slice(&key[..]);
-				if let Some(new_key) = attempt_migrate(key_h.clone(), &value) {
-					self.migrated_keys.insert(key_h, new_key);
-					key.copy_from_slice(&new_key[..]);
-				}
-			}
-
-			batch.insert(key, value.into_vec(), dest)?;
-		}
-
-		self.walk_journal(source.clone())?;
-		self.migrate_journal(source, batch, dest)
-	}
-}
diff --git a/ethcore/src/migrations/v10.rs b/ethcore/src/migrations/v10.rs
deleted file mode 100644
index 7982279cf5e81258a2abff62a15d00281c767c72..0000000000000000000000000000000000000000
--- a/ethcore/src/migrations/v10.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Bloom upgrade
-
-use std::sync::Arc;
-use db::{COL_EXTRA, COL_HEADERS, COL_STATE};
-use state_db::{ACCOUNT_BLOOM_SPACE, DEFAULT_ACCOUNT_PRESET, StateDB};
-use util::trie::TrieDB;
-use views::HeaderView;
-use bloom_journal::Bloom;
-use util::migration::{Error, Migration, Progress, Batch, Config};
-use util::journaldb;
-use util::{H256, Trie};
-use util::{Database, DBTransaction};
-
-/// Account bloom upgrade routine. If bloom already present, does nothing.
-/// If database empty (no best block), does nothing.
-/// Can be called on upgraded database with no issues (will do nothing).
-pub fn generate_bloom(source: Arc<Database>, dest: &mut Database) -> Result<(), Error> {
-	trace!(target: "migration", "Account bloom upgrade started");
-	let best_block_hash = match source.get(COL_EXTRA, b"best")? {
-		// no migration needed
-		None => {
-			trace!(target: "migration", "No best block hash, skipping");
-			return Ok(());
-		},
-		Some(hash) => hash,
-	};
-	let best_block_header = match source.get(COL_HEADERS, &best_block_hash)? {
-		// no best block, nothing to do
-		None => {
-			trace!(target: "migration", "No best block header, skipping");
-			return Ok(())
-		},
-		Some(x) => x,
-	};
-	let state_root = HeaderView::new(&best_block_header).state_root();
-
-	trace!("Adding accounts bloom (one-time upgrade)");
-	let bloom_journal = {
-		let mut bloom = Bloom::new(ACCOUNT_BLOOM_SPACE, DEFAULT_ACCOUNT_PRESET);
-		// no difference what algorithm is passed, since there will be no writes
-		let state_db = journaldb::new(
-			source.clone(),
-			journaldb::Algorithm::OverlayRecent,
-			COL_STATE);
-		let account_trie = TrieDB::new(state_db.as_hashdb(), &state_root).map_err(|e| Error::Custom(format!("Cannot open trie: {:?}", e)))?;
-		for item in account_trie.iter().map_err(|_| Error::MigrationImpossible)? {
-			let (ref account_key, _) = item.map_err(|_| Error::MigrationImpossible)?;
-			let account_key_hash = H256::from_slice(account_key);
-			bloom.set(&*account_key_hash);
-		}
-
-		bloom.drain_journal()
-	};
-
-	trace!(target: "migration", "Generated {} bloom updates", bloom_journal.entries.len());
-
-	let mut batch = DBTransaction::new();
-	StateDB::commit_bloom(&mut batch, bloom_journal).map_err(|_| Error::Custom("Failed to commit bloom".to_owned()))?;
-	dest.write(batch)?;
-
-	trace!(target: "migration", "Finished bloom update");
-
-
-	Ok(())
-}
-
-/// Account bloom migration.
-#[derive(Default)]
-pub struct ToV10 {
-	progress: Progress,
-}
-
-impl ToV10 {
-	/// New v10 migration
-	pub fn new() -> ToV10 { ToV10 { progress: Progress::default() } }
-}
-
-impl Migration for ToV10 {
-	fn version(&self) -> u32 {
-		10
-	}
-
-	fn pre_columns(&self) -> Option<u32> { Some(5) }
-
-	fn columns(&self) -> Option<u32> { Some(6) }
-
-	fn migrate(&mut self, source: Arc<Database>, config: &Config, dest: &mut Database, col: Option<u32>) -> Result<(), Error> {
-		let mut batch = Batch::new(config, col);
-		for (key, value) in source.iter(col).into_iter().flat_map(|inner| inner) {
-			self.progress.tick();
-			batch.insert(key.into_vec(), value.into_vec(), dest)?;
-		}
-		batch.commit(dest)?;
-
-		if col == COL_STATE {
-			generate_bloom(source, dest)?;
-		}
-
-		Ok(())
-	}
-}
diff --git a/ethcore/src/migrations/v9.rs b/ethcore/src/migrations/v9.rs
deleted file mode 100644
index 08f83f1320fcdc3bc7df0b2e832ee5f62f52606b..0000000000000000000000000000000000000000
--- a/ethcore/src/migrations/v9.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-
-//! This migration consolidates all databases into single one using Column Families.
-
-use rlp::{Rlp, RlpStream};
-use util::kvdb::Database;
-use util::migration::{Batch, Config, Error, Migration, Progress};
-use std::sync::Arc;
-
-/// Which part of block to preserve
-pub enum Extract {
-	/// Extract block header RLP.
-	Header,
-	/// Extract block body RLP.
-	Body,
-	/// Don't change the value.
-	All,
-}
-
-/// Consolidation of extras/block/state databases into single one.
-pub struct ToV9 {
-	progress: Progress,
-	column: Option<u32>,
-	extract: Extract,
-}
-
-impl ToV9 {
-	/// Creates new V9 migration and assigns all `(key,value)` pairs from `source` DB to given Column Family
-	pub fn new(column: Option<u32>, extract: Extract) -> Self {
-		ToV9 {
-			progress: Progress::default(),
-			column: column,
-			extract: extract,
-		}
-	}
-}
-
-impl Migration for ToV9 {
-	fn columns(&self) -> Option<u32> { Some(5) }
-
-	fn version(&self) -> u32 { 9 }
-
-	fn migrate(&mut self, source: Arc<Database>, config: &Config, dest: &mut Database, col: Option<u32>) -> Result<(), Error> {
-		let mut batch = Batch::new(config, self.column);
-
-		for (key, value) in source.iter(col).into_iter().flat_map(|inner| inner) {
-			self.progress.tick();
-			match self.extract {
-				Extract::Header => {
-					batch.insert(key.into_vec(), Rlp::new(&value).at(0).as_raw().to_vec(), dest)?
-				},
-				Extract::Body => {
-					let mut body = RlpStream::new_list(2);
-					let block_rlp = Rlp::new(&value);
-					body.append_raw(block_rlp.at(1).as_raw(), 1);
-					body.append_raw(block_rlp.at(2).as_raw(), 1);
-					batch.insert(key.into_vec(), body.out(), dest)?
-				},
-				Extract::All => {
-					batch.insert(key.into_vec(), value.into_vec(), dest)?
-				}
-			}
-		}
-
-		batch.commit(dest)
-	}
-}
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index 0639c645fa478e162f75283bb28735844b84bbde..58111cd741ad70c109f16593a7d87d8793cd32be 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -18,28 +18,49 @@ use std::time::{Instant, Duration};
 use std::collections::{BTreeMap, HashSet};
 use std::sync::Arc;
 
-use util::*;
-use using_queue::{UsingQueue, GetAction};
 use account_provider::{AccountProvider, SignError as AccountError};
-use state::State;
-use client::{MiningBlockChainClient, BlockId, TransactionId};
-use client::TransactionImportResult;
-use executive::contract_address;
-use block::{ClosedBlock, IsBlock, Block};
+use ansi_term::Colour;
+use ethereum_types::{H256, U256, Address};
+use parking_lot::{Mutex, RwLock};
+use bytes::Bytes;
+use engines::{EthEngine, Seal};
 use error::*;
-use transaction::{Action, UnverifiedTransaction, PendingTransaction, SignedTransaction, Condition as TransactionCondition};
-use receipt::{Receipt, RichReceipt};
-use spec::Spec;
-use engines::{Engine, Seal};
-use miner::{MinerService, MinerStatus, TransactionQueue, RemovalReason, TransactionQueueDetailsProvider, PrioritizationStrategy,
-	AccountDetails, TransactionOrigin};
-use miner::banning_queue::{BanningTransactionQueue, Threshold};
-use miner::work_notify::{WorkPoster, NotifyWork};
-use miner::local_transactions::{Status as LocalTransactionStatus};
+use ethcore_miner::banning_queue::{BanningTransactionQueue, Threshold};
+use ethcore_miner::local_transactions::{Status as LocalTransactionStatus};
+use ethcore_miner::transaction_queue::{
+	TransactionQueue,
+	RemovalReason,
+	TransactionDetailsProvider as TransactionQueueDetailsProvider,
+	PrioritizationStrategy,
+	AccountDetails,
+	TransactionOrigin,
+};
+use futures_cpupool::CpuPool;
+use ethcore_miner::work_notify::{WorkPoster, NotifyWork};
 use miner::service_transaction_checker::ServiceTransactionChecker;
-use price_info::{Client as PriceInfoClient, PriceInfo};
+use miner::{MinerService, MinerStatus};
 use price_info::fetch::Client as FetchClient;
+use price_info::{Client as PriceInfoClient, PriceInfo};
+use transaction::{
+	Action,
+	UnverifiedTransaction,
+	PendingTransaction,
+	SignedTransaction,
+	Condition as TransactionCondition,
+	ImportResult as TransactionImportResult,
+	Error as TransactionError,
+};
+use using_queue::{UsingQueue, GetAction};
+use block::{ClosedBlock, IsBlock, Block};
+use client::{
+	AccountData, BlockChain, RegistryInfo, ScheduleInfo, CallContract, BlockProducer, SealedBlockImporter
+};
+use client::{BlockId, TransactionId, MiningBlockChainClient};
+use executive::contract_address;
 use header::{Header, BlockNumber};
+use receipt::{Receipt, RichReceipt};
+use spec::Spec;
+use state::State;
 
 /// Different possible definitions for pending transaction set.
 #[derive(Debug, PartialEq)]
@@ -117,6 +138,10 @@ pub struct MinerOptions {
 	pub tx_queue_banning: Banning,
 	/// Do we refuse to accept service transactions even if sender is certified.
 	pub refuse_service_transactions: bool,
+	/// Create a pending block with maximal possible gas limit.
+	/// NOTE: Such block will contain all pending transactions but
+	/// will be invalid if mined.
+	pub infinite_pending_block: bool,
 }
 
 impl Default for MinerOptions {
@@ -139,6 +164,7 @@ impl Default for MinerOptions {
 			enable_resubmission: true,
 			tx_queue_banning: Banning::Disabled,
 			refuse_service_transactions: false,
+			infinite_pending_block: false,
 		}
 	}
 }
@@ -193,11 +219,11 @@ pub enum GasPricer {
 
 impl GasPricer {
 	/// Create a new Calibrated `GasPricer`.
-	pub fn new_calibrated(options: GasPriceCalibratorOptions, fetch: FetchClient) -> GasPricer {
+	pub fn new_calibrated(options: GasPriceCalibratorOptions, fetch: FetchClient, p: CpuPool) -> GasPricer {
 		GasPricer::Calibrated(GasPriceCalibrator {
 			options: options,
 			next_calibration: Instant::now(),
-			price_info: PriceInfoClient::new(fetch),
+			price_info: PriceInfoClient::new(fetch, p),
 		})
 	}
 
@@ -224,6 +250,7 @@ struct SealingWork {
 pub struct Miner {
 	// NOTE [ToDr]  When locking always lock in this order!
 	transaction_queue: Arc<RwLock<BanningTransactionQueue>>,
+	transaction_listener: RwLock<Vec<Box<Fn(&[H256]) + Send + Sync>>>,
 	sealing_work: Mutex<SealingWork>,
 	next_allowed_reseal: Mutex<Instant>,
 	next_mandatory_reseal: RwLock<Instant>,
@@ -234,7 +261,7 @@ pub struct Miner {
 	gas_range_target: RwLock<(U256, U256)>,
 	author: RwLock<Address>,
 	extra_data: RwLock<Bytes>,
-	engine: Arc<Engine>,
+	engine: Arc<EthEngine>,
 
 	accounts: Option<Arc<AccountProvider>>,
 	notifiers: RwLock<Vec<Box<NotifyWork>>>,
@@ -290,6 +317,7 @@ impl Miner {
 
 		Miner {
 			transaction_queue: Arc::new(RwLock::new(txq)),
+			transaction_listener: RwLock::new(vec![]),
 			next_allowed_reseal: Mutex::new(Instant::now()),
 			next_mandatory_reseal: RwLock::new(Instant::now() + options.reseal_max_period),
 			sealing_block_last_request: Mutex::new(0),
@@ -345,6 +373,11 @@ impl Miner {
 		self.map_pending_block(|b| b.header().clone(), latest_block_number)
 	}
 
+	/// Set a callback to be notified about imported transactions' hashes.
+	pub fn add_transactions_listener(&self, f: Box<Fn(&[H256]) + Send + Sync>) {
+		self.transaction_listener.write().push(f);
+	}
+
 	fn map_pending_block<F, T>(&self, f: F, latest_block_number: BlockNumber) -> Option<T> where
 		F: FnOnce(&ClosedBlock) -> T,
 	{
@@ -355,10 +388,9 @@ impl Miner {
 		)
 	}
 
-	#[cfg_attr(feature="dev", allow(match_same_arms))]
 	/// Prepares new block for sealing including top transactions from queue.
-	fn prepare_block(&self, chain: &MiningBlockChainClient) -> (ClosedBlock, Option<H256>) {
-		let _timer = PerfTimer::new("prepare_block");
+	fn prepare_block<C: AccountData + BlockChain + BlockProducer + CallContract>(&self, chain: &C) -> (ClosedBlock, Option<H256>) {
+		trace_time!("prepare_block");
 		let chain_info = chain.chain_info();
 		let (transactions, mut open_block, original_work_hash) = {
 			let nonce_cap = if chain_info.best_block_number + 1 >= self.engine.params().dust_protection_transition {
@@ -366,17 +398,16 @@ impl Miner {
 			} else { None };
 			let transactions = {self.transaction_queue.read().top_transactions_at(chain_info.best_block_number, chain_info.best_block_timestamp, nonce_cap)};
 			let mut sealing_work = self.sealing_work.lock();
-			let last_work_hash = sealing_work.queue.peek_last_ref().map(|pb| pb.block().fields().header.hash());
+			let last_work_hash = sealing_work.queue.peek_last_ref().map(|pb| pb.block().header().hash());
 			let best_hash = chain_info.best_block_hash;
-/*
+
 			// check to see if last ClosedBlock in would_seals is actually same parent block.
 			// if so
 			//   duplicate, re-open and push any new transactions.
 			//   if at least one was pushed successfully, close and enqueue new ClosedBlock;
 			//   otherwise, leave everything alone.
 			// otherwise, author a fresh block.
-*/
-			let open_block = match sealing_work.queue.pop_if(|b| b.block().fields().header.parent_hash() == &best_hash) {
+			let mut open_block = match sealing_work.queue.pop_if(|b| b.block().header().parent_hash() == &best_hash) {
 				Some(old_block) => {
 					trace!(target: "miner", "prepare_block: Already have previous work; updating and returning");
 					// add transactions to old_block
@@ -392,19 +423,33 @@ impl Miner {
 					)
 				}
 			};
+
+			if self.options.infinite_pending_block {
+				open_block.remove_gas_limit();
+			}
+
 			(transactions, open_block, last_work_hash)
 		};
 
 		let mut invalid_transactions = HashSet::new();
+		let mut non_allowed_transactions = HashSet::new();
 		let mut transactions_to_penalize = HashSet::new();
-		let block_number = open_block.block().fields().header.number();
+		let block_number = open_block.block().header().number();
 
 		let mut tx_count: usize = 0;
 		let tx_total = transactions.len();
 		for tx in transactions {
 			let hash = tx.hash();
 			let start = Instant::now();
-			let result = open_block.push_transaction(tx, None);
+			// Check whether transaction type is allowed for sender
+			let result = match self.engine.machine().verify_transaction(&tx, open_block.header(), chain) {
+				Err(Error::Transaction(TransactionError::NotAllowed)) => {
+					Err(TransactionError::NotAllowed.into())
+				}
+				_ => {
+					open_block.push_transaction(tx, None)
+				}
+			};
 			let took = start.elapsed();
 
 			// Check for heavy transactions
@@ -445,6 +490,12 @@ impl Miner {
 				},
 				// already have transaction - ignore
 				Err(Error::Transaction(TransactionError::AlreadyImported)) => {},
+				Err(Error::Transaction(TransactionError::NotAllowed)) => {
+					non_allowed_transactions.insert(hash);
+					debug!(target: "miner",
+						   "Skipping non-allowed transaction for sender {:?}",
+						   hash);
+				},
 				Err(e) => {
 					invalid_transactions.insert(hash);
 					debug!(target: "miner",
@@ -467,6 +518,9 @@ impl Miner {
 			for hash in invalid_transactions {
 				queue.remove(&hash, &fetch_nonce, RemovalReason::Invalid);
 			}
+			for hash in non_allowed_transactions {
+				queue.remove(&hash, &fetch_nonce, RemovalReason::NotAllowed);
+			}
 			for hash in transactions_to_penalize {
 				queue.penalize(&hash);
 			}
@@ -516,10 +570,18 @@ impl Miner {
 	}
 
 	/// Attempts to perform internal sealing (one that does not require work) and handles the result depending on the type of Seal.
-	fn seal_and_import_block_internally(&self, chain: &MiningBlockChainClient, block: ClosedBlock) -> bool {
+	fn seal_and_import_block_internally<C>(&self, chain: &C, block: ClosedBlock) -> bool
+		where C: BlockChain + SealedBlockImporter
+	{
 		if !block.transactions().is_empty() || self.forced_sealing() || Instant::now() > *self.next_mandatory_reseal.read() {
 			trace!(target: "miner", "seal_block_internally: attempting internal seal.");
-			match self.engine.generate_seal(block.block()) {
+
+			let parent_header = match chain.block_header(BlockId::Hash(*block.header().parent_hash())) {
+				Some(hdr) => hdr.decode(),
+				None => return false,
+			};
+
+			match self.engine.generate_seal(block.block(), &parent_header) {
 				// Save proposal for later seal submission and broadcast it.
 				Seal::Proposal(seal) => {
 					trace!(target: "miner", "Received a Proposal seal.");
@@ -561,14 +623,14 @@ impl Miner {
 	fn prepare_work(&self, block: ClosedBlock, original_work_hash: Option<H256>) {
 		let (work, is_new) = {
 			let mut sealing_work = self.sealing_work.lock();
-			let last_work_hash = sealing_work.queue.peek_last_ref().map(|pb| pb.block().fields().header.hash());
-			trace!(target: "miner", "prepare_work: Checking whether we need to reseal: orig={:?} last={:?}, this={:?}", original_work_hash, last_work_hash, block.block().fields().header.hash());
-			let (work, is_new) = if last_work_hash.map_or(true, |h| h != block.block().fields().header.hash()) {
-				trace!(target: "miner", "prepare_work: Pushing a new, refreshed or borrowed pending {}...", block.block().fields().header.hash());
-				let pow_hash = block.block().fields().header.hash();
-				let number = block.block().fields().header.number();
-				let difficulty = *block.block().fields().header.difficulty();
-				let is_new = original_work_hash.map_or(true, |h| block.block().fields().header.hash() != h);
+			let last_work_hash = sealing_work.queue.peek_last_ref().map(|pb| pb.block().header().hash());
+			trace!(target: "miner", "prepare_work: Checking whether we need to reseal: orig={:?} last={:?}, this={:?}", original_work_hash, last_work_hash, block.block().header().hash());
+			let (work, is_new) = if last_work_hash.map_or(true, |h| h != block.block().header().hash()) {
+				trace!(target: "miner", "prepare_work: Pushing a new, refreshed or borrowed pending {}...", block.block().header().hash());
+				let pow_hash = block.block().header().hash();
+				let number = block.block().header().number();
+				let difficulty = *block.block().header().difficulty();
+				let is_new = original_work_hash.map_or(true, |h| block.block().header().hash() != h);
 				sealing_work.queue.push(block);
 				// If push notifications are enabled we assume all work items are used.
 				if !self.notifiers.read().is_empty() && is_new {
@@ -578,7 +640,7 @@ impl Miner {
 			} else {
 				(None, false)
 			};
-			trace!(target: "miner", "prepare_work: leaving (last={:?})", sealing_work.queue.peek_last_ref().map(|b| b.block().fields().header.hash()));
+			trace!(target: "miner", "prepare_work: leaving (last={:?})", sealing_work.queue.peek_last_ref().map(|b| b.block().header().hash()));
 			(work, is_new)
 		};
 		if is_new {
@@ -590,18 +652,18 @@ impl Miner {
 		}
 	}
 
-	fn update_gas_limit(&self, client: &MiningBlockChainClient) {
+	fn update_gas_limit<C: BlockChain>(&self, client: &C) {
 		let gas_limit = client.best_block_header().gas_limit();
 		let mut queue = self.transaction_queue.write();
 		queue.set_gas_limit(gas_limit);
 		if let GasLimit::Auto = self.options.tx_queue_gas_limit {
 			// Set total tx queue gas limit to be 20x the block gas limit.
-			queue.set_total_gas_limit(gas_limit * 20.into());
+			queue.set_total_gas_limit(gas_limit * 20u32);
 		}
 	}
 
 	/// Returns true if we had to prepare new pending block.
-	fn prepare_work_sealing(&self, client: &MiningBlockChainClient) -> bool {
+	fn prepare_work_sealing<C: AccountData + BlockChain + BlockProducer + CallContract>(&self, client: &C) -> bool {
 		trace!(target: "miner", "prepare_work_sealing: entering");
 		let prepare_new = {
 			let mut sealing_work = self.sealing_work.lock();
@@ -633,22 +695,19 @@ impl Miner {
 		prepare_new
 	}
 
-	fn add_transactions_to_queue(
+	fn add_transactions_to_queue<C: AccountData + BlockChain + CallContract + RegistryInfo + ScheduleInfo>(
 		&self,
-		client: &MiningBlockChainClient,
+		client: &C,
 		transactions: Vec<UnverifiedTransaction>,
 		default_origin: TransactionOrigin,
 		condition: Option<TransactionCondition>,
 		transaction_queue: &mut BanningTransactionQueue,
 	) -> Vec<Result<TransactionImportResult, Error>> {
-		let accounts = self.accounts.as_ref()
-			.and_then(|provider| provider.accounts().ok())
-			.map(|accounts| accounts.into_iter().collect::<HashSet<_>>());
-
 		let best_block_header = client.best_block_header().decode();
 		let insertion_time = client.chain_info().best_block_number;
+		let mut inserted = Vec::with_capacity(transactions.len());
 
-		transactions.into_iter()
+		let results = transactions.into_iter()
 			.map(|tx| {
 				let hash = tx.hash();
 				if client.transaction_block(TransactionId::Hash(hash)).is_some() {
@@ -656,43 +715,51 @@ impl Miner {
 					return Err(Error::Transaction(TransactionError::AlreadyImported));
 				}
 				match self.engine.verify_transaction_basic(&tx, &best_block_header)
-					.and_then(|_| self.engine.verify_transaction(tx, &best_block_header))
+					.and_then(|_| self.engine.verify_transaction_unordered(tx, &best_block_header))
 				{
 					Err(e) => {
 						debug!(target: "miner", "Rejected tx {:?} with invalid signature: {:?}", hash, e);
 						Err(e)
 					},
 					Ok(transaction) => {
-						let origin = accounts.as_ref().and_then(|accounts| {
-							match accounts.contains(&transaction.sender()) {
+						// This check goes here because verify_transaction takes SignedTransaction parameter
+						self.engine.machine().verify_transaction(&transaction, &best_block_header, client)?;
+
+						let origin = self.accounts.as_ref().and_then(|accounts| {
+							match accounts.has_account(transaction.sender()).unwrap_or(false) {
 								true => Some(TransactionOrigin::Local),
 								false => None,
 							}
 						}).unwrap_or(default_origin);
 
-						// try to install service transaction checker before appending transactions
-						self.service_transaction_action.update_from_chain_client(client);
-
 						let details_provider = TransactionDetailsProvider::new(client, &self.service_transaction_action);
-						match origin {
+						let hash = transaction.hash();
+						let result = match origin {
 							TransactionOrigin::Local | TransactionOrigin::RetractedBlock => {
-								transaction_queue.add(transaction, origin, insertion_time, condition.clone(), &details_provider)
+								transaction_queue.add(transaction, origin, insertion_time, condition.clone(), &details_provider)?
 							},
 							TransactionOrigin::External => {
-								transaction_queue.add_with_banlist(transaction, insertion_time, &details_provider)
+								transaction_queue.add_with_banlist(transaction, insertion_time, &details_provider)?
 							},
-						}
+						};
+
+						inserted.push(hash);
+						Ok(result)
 					},
 				}
 			})
-			.collect()
+			.collect();
+
+		for listener in &*self.transaction_listener.read() {
+			listener(&inserted);
+		}
+
+		results
 	}
 
 	/// Are we allowed to do a non-mandatory reseal?
 	fn tx_reseal_allowed(&self) -> bool { Instant::now() > *self.next_allowed_reseal.lock() }
 
-	#[cfg_attr(feature="dev", allow(wrong_self_convention))]
-	#[cfg_attr(feature="dev", allow(redundant_closure))]
 	fn from_pending_block<H, F, G>(&self, latest_block_number: BlockNumber, from_chain: F, map_block: G) -> H
 		where F: Fn() -> H, G: FnOnce(&ClosedBlock) -> H {
 		let sealing_work = self.sealing_work.lock();
@@ -712,8 +779,9 @@ impl Miner {
 const SEALING_TIMEOUT_IN_BLOCKS : u64 = 5;
 
 impl MinerService for Miner {
+	type State = State<::state_db::StateDB>;
 
-	fn clear_and_reset(&self, chain: &MiningBlockChainClient) {
+	fn clear_and_reset<C: MiningBlockChainClient>(&self, chain: &C) {
 		self.transaction_queue.write().clear();
 		// --------------------------------------------------------------------------
 		// | NOTE Code below requires transaction_queue and sealing_work locks.     |
@@ -790,7 +858,7 @@ impl MinerService for Miner {
 
 	fn sensible_gas_price(&self) -> U256 {
 		// 10% above our minimum.
-		*self.transaction_queue.read().minimal_gas_price() * 110.into() / 100.into()
+		*self.transaction_queue.read().minimal_gas_price() * 110u32 / 100.into()
 	}
 
 	fn sensible_gas_limit(&self) -> U256 {
@@ -829,16 +897,16 @@ impl MinerService for Miner {
 		self.gas_range_target.read().1
 	}
 
-	fn import_external_transactions(
+	fn import_external_transactions<C: MiningBlockChainClient>(
 		&self,
-		chain: &MiningBlockChainClient,
+		client: &C,
 		transactions: Vec<UnverifiedTransaction>
 	) -> Vec<Result<TransactionImportResult, Error>> {
 		trace!(target: "external_tx", "Importing external transactions");
 		let results = {
 			let mut transaction_queue = self.transaction_queue.write();
 			self.add_transactions_to_queue(
-				chain, transactions, TransactionOrigin::External, None, &mut transaction_queue
+				client, transactions, TransactionOrigin::External, None, &mut transaction_queue
 			)
 		};
 
@@ -847,15 +915,14 @@ impl MinerService for Miner {
 			// | NOTE Code below requires transaction_queue and sealing_work locks.     |
 			// | Make sure to release the locks before calling that method.             |
 			// --------------------------------------------------------------------------
-			self.update_sealing(chain);
+			self.update_sealing(client);
 		}
 		results
 	}
 
-	#[cfg_attr(feature="dev", allow(collapsible_if))]
-	fn import_own_transaction(
+	fn import_own_transaction<C: MiningBlockChainClient>(
 		&self,
-		chain: &MiningBlockChainClient,
+		chain: &C,
 		pending: PendingTransaction,
 	) -> Result<TransactionImportResult, Error> {
 
@@ -979,7 +1046,7 @@ impl MinerService for Miner {
 		}
 	}
 
-	fn remove_pending_transaction(&self, chain: &MiningBlockChainClient, hash: &H256) -> Option<PendingTransaction> {
+	fn remove_pending_transaction<C: AccountData>(&self, chain: &C, hash: &H256) -> Option<PendingTransaction> {
 		let mut queue = self.transaction_queue.write();
 		let tx = queue.find(hash);
 		if tx.is_some() {
@@ -1016,7 +1083,7 @@ impl MinerService for Miner {
 							},
 							logs: receipt.logs.clone(),
 							log_bloom: receipt.log_bloom,
-							state_root: receipt.state_root,
+							outcome: receipt.outcome.clone(),
 						}
 					})
 			}
@@ -1049,7 +1116,10 @@ impl MinerService for Miner {
 
 	/// Update sealing if required.
 	/// Prepare the block and work if the Engine does not seal internally.
-	fn update_sealing(&self, chain: &MiningBlockChainClient) {
+	fn update_sealing<C>(&self, chain: &C)
+		where C: AccountData + BlockChain + RegistryInfo
+		         + CallContract + BlockProducer + SealedBlockImporter
+	{
 		trace!(target: "miner", "update_sealing");
 		const NO_NEW_CHAIN_WITH_FORKS: &str = "Your chain specification contains one or more hard forks which are required to be \
 			on by default. Please remove these forks and start your chain again.";
@@ -1064,7 +1134,7 @@ impl MinerService for Miner {
 
 			// refuse to seal the first block of the chain if it contains hard forks
 			// which should be on by default.
-			if block.block().fields().header.number() == 1 && self.engine.params().contains_bugfix_hard_fork() {
+			if block.block().header().number() == 1 && self.engine.params().contains_bugfix_hard_fork() {
 				warn!("{}", NO_NEW_CHAIN_WITH_FORKS);
 				return;
 			}
@@ -1089,17 +1159,20 @@ impl MinerService for Miner {
 		self.sealing_work.lock().queue.is_in_use()
 	}
 
-	fn map_sealing_work<F, T>(&self, chain: &MiningBlockChainClient, f: F) -> Option<T> where F: FnOnce(&ClosedBlock) -> T {
+	fn map_sealing_work<C, F, T>(&self, client: &C, f: F) -> Option<T>
+		where C: AccountData + BlockChain + BlockProducer + CallContract,
+		      F: FnOnce(&ClosedBlock) -> T
+	{
 		trace!(target: "miner", "map_sealing_work: entering");
-		self.prepare_work_sealing(chain);
+		self.prepare_work_sealing(client);
 		trace!(target: "miner", "map_sealing_work: sealing prepared");
 		let mut sealing_work = self.sealing_work.lock();
 		let ret = sealing_work.queue.use_last_ref();
-		trace!(target: "miner", "map_sealing_work: leaving use_last_ref={:?}", ret.as_ref().map(|b| b.block().fields().header.hash()));
+		trace!(target: "miner", "map_sealing_work: leaving use_last_ref={:?}", ret.as_ref().map(|b| b.block().header().hash()));
 		ret.map(f)
 	}
 
-	fn submit_seal(&self, chain: &MiningBlockChainClient, block_hash: H256, seal: Vec<Bytes>) -> Result<(), Error> {
+	fn submit_seal<C: SealedBlockImporter>(&self, chain: &C, block_hash: H256, seal: Vec<Bytes>) -> Result<(), Error> {
 		let result =
 			if let Some(b) = self.sealing_work.lock().queue.get_used_if(
 				if self.options.enable_resubmission {
@@ -1122,12 +1195,15 @@ impl MinerService for Miner {
 			let n = sealed.header().number();
 			let h = sealed.header().hash();
 			chain.import_sealed_block(sealed)?;
-			info!(target: "miner", "Submitted block imported OK. #{}: {}", Colour::White.bold().paint(format!("{}", n)), Colour::White.bold().paint(h.hex()));
+			info!(target: "miner", "Submitted block imported OK. #{}: {}", Colour::White.bold().paint(format!("{}", n)), Colour::White.bold().paint(format!("{:x}", h)));
 			Ok(())
 		})
 	}
 
-	fn chain_new_blocks(&self, chain: &MiningBlockChainClient, imported: &[H256], _invalid: &[H256], enacted: &[H256], retracted: &[H256]) {
+	fn chain_new_blocks<C>(&self, chain: &C, imported: &[H256], _invalid: &[H256], enacted: &[H256], retracted: &[H256])
+		where C: AccountData + BlockChain + CallContract + RegistryInfo
+		         + BlockProducer + ScheduleInfo + SealedBlockImporter
+	{
 		trace!(target: "miner", "chain_new_blocks");
 
 		// 1. We ignore blocks that were `imported` unless resealing on new uncles is enabled.
@@ -1173,6 +1249,18 @@ impl MinerService for Miner {
 			self.update_sealing(chain);
 		}
 	}
+
+	fn pending_state(&self, latest_block_number: BlockNumber) -> Option<Self::State> {
+		Miner::pending_state(self, latest_block_number)
+	}
+
+	fn pending_block_header(&self, latest_block_number: BlockNumber) -> Option<Header> {
+		Miner::pending_block_header(self, latest_block_number)
+	}
+
+	fn pending_block(&self, latest_block_number: BlockNumber) -> Option<Block> {
+		Miner::pending_block(self, latest_block_number)
+	}
 }
 
 /// Action when service transaction is received
@@ -1184,13 +1272,8 @@ enum ServiceTransactionAction {
 }
 
 impl ServiceTransactionAction {
-	pub fn update_from_chain_client(&self, client: &MiningBlockChainClient) {
-		if let ServiceTransactionAction::Check(ref checker) = *self {
-			checker.update_from_chain_client(client);
-		}
-	}
-
-	pub fn check(&self, client: &MiningBlockChainClient, tx: &SignedTransaction) -> Result<bool, String> {
+	pub fn check<C: CallContract + RegistryInfo>(&self, client: &C, tx: &SignedTransaction) -> Result<bool, String>
+	{
 		match *self {
 			ServiceTransactionAction::Refuse => Err("configured to refuse service transactions".to_owned()),
 			ServiceTransactionAction::Check(ref checker) => checker.check(client, tx),
@@ -1198,13 +1281,13 @@ impl ServiceTransactionAction {
 	}
 }
 
-struct TransactionDetailsProvider<'a> {
-	client: &'a MiningBlockChainClient,
+struct TransactionDetailsProvider<'a, C: 'a> {
+	client: &'a C,
 	service_transaction_action: &'a ServiceTransactionAction,
 }
 
-impl<'a> TransactionDetailsProvider<'a> {
-	pub fn new(client: &'a MiningBlockChainClient, service_transaction_action: &'a ServiceTransactionAction) -> Self {
+impl<'a, C> TransactionDetailsProvider<'a, C> {
+	pub fn new(client: &'a C, service_transaction_action: &'a ServiceTransactionAction) -> Self {
 		TransactionDetailsProvider {
 			client: client,
 			service_transaction_action: service_transaction_action,
@@ -1212,7 +1295,9 @@ impl<'a> TransactionDetailsProvider<'a> {
 	}
 }
 
-impl<'a> TransactionQueueDetailsProvider for TransactionDetailsProvider<'a> {
+impl<'a, C> TransactionQueueDetailsProvider for TransactionDetailsProvider<'a, C>
+	where C: AccountData + CallContract + RegistryInfo + ScheduleInfo
+{
 	fn fetch_account(&self, address: &Address) -> AccountDetails {
 		AccountDetails {
 			nonce: self.client.latest_nonce(address),
@@ -1231,19 +1316,18 @@ impl<'a> TransactionQueueDetailsProvider for TransactionDetailsProvider<'a> {
 
 #[cfg(test)]
 mod tests {
-
-	use std::sync::Arc;
-	use std::time::Duration;
-	use rustc_hex::FromHex;
-	use super::super::{MinerService, PrioritizationStrategy};
 	use super::*;
-	use block::IsBlock;
-	use util::U256;
+	use ethcore_miner::transaction_queue::PrioritizationStrategy;
+	use ethereum_types::U256;
 	use ethkey::{Generator, Random};
-	use client::{BlockChainClient, TestBlockChainClient, EachBlockWith, TransactionImportResult};
+	use client::{TestBlockChainClient, EachBlockWith, ChainInfo};
+	use hash::keccak;
 	use header::BlockNumber;
-	use transaction::{SignedTransaction, Transaction, PendingTransaction, Action};
+	use rustc_hex::FromHex;
 	use spec::Spec;
+	use transaction::{SignedTransaction, Transaction, PendingTransaction, Action};
+	use miner::MinerService;
+
 	use tests::helpers::{generate_dummy_client, generate_dummy_client_with_spec_and_accounts};
 
 	#[test]
@@ -1263,16 +1347,16 @@ mod tests {
 		let client = TestBlockChainClient::default();
 		let miner = Miner::with_spec(&Spec::new_test());
 
-		let res = miner.map_sealing_work(&client, |b| b.block().fields().header.hash());
+		let res = miner.map_sealing_work(&client, |b| b.block().header().hash());
 		assert!(res.is_some());
 		assert!(miner.submit_seal(&client, res.unwrap(), vec![]).is_ok());
 
 		// two more blocks mined, work requested.
 		client.add_blocks(1, EachBlockWith::Uncle);
-		miner.map_sealing_work(&client, |b| b.block().fields().header.hash());
+		miner.map_sealing_work(&client, |b| b.block().header().hash());
 
 		client.add_blocks(1, EachBlockWith::Uncle);
-		miner.map_sealing_work(&client, |b| b.block().fields().header.hash());
+		miner.map_sealing_work(&client, |b| b.block().header().hash());
 
 		// solution to original work submitted.
 		assert!(miner.submit_seal(&client, res.unwrap(), vec![]).is_ok());
@@ -1298,6 +1382,7 @@ mod tests {
 				enable_resubmission: true,
 				tx_queue_banning: Banning::Disabled,
 				refuse_service_transactions: false,
+				infinite_pending_block: false,
 			},
 			GasPricer::new_fixed(0u64.into()),
 			&Spec::new_test(),
@@ -1418,7 +1503,7 @@ mod tests {
 	fn should_fail_setting_engine_signer_on_pow() {
 		let spec = Spec::new_pow_test_spec;
 		let tap = Arc::new(AccountProvider::transient_provider());
-		let addr = tap.insert_account("1".sha3().into(), "").unwrap();
+		let addr = tap.insert_account(keccak("1").into(), "").unwrap();
 		let client = generate_dummy_client_with_spec_and_accounts(spec, Some(tap.clone()));
 		assert!(match client.miner().set_engine_signer(addr, "".into()) { Err(AccountError::InappropriateChain) => true, _ => false })
 	}
@@ -1427,7 +1512,7 @@ mod tests {
 	fn should_fail_setting_engine_signer_without_account_provider() {
 		let spec = Spec::new_instant;
 		let tap = Arc::new(AccountProvider::transient_provider());
-		let addr = tap.insert_account("1".sha3().into(), "").unwrap();
+		let addr = tap.insert_account(keccak("1").into(), "").unwrap();
 		let client = generate_dummy_client_with_spec_and_accounts(spec, None);
 		assert!(match client.miner().set_engine_signer(addr, "".into()) { Err(AccountError::NotFound) => true, _ => false });
 	}
diff --git a/ethcore/src/miner/mod.rs b/ethcore/src/miner/mod.rs
index b4cb065fd1e5f031062e449edff77d53bacd68de..5f451fdc2a630779342d1ea4098cfb027ff40659 100644
--- a/ethcore/src/miner/mod.rs
+++ b/ethcore/src/miner/mod.rs
@@ -15,8 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 #![warn(missing_docs)]
-#![cfg_attr(all(nightly, feature="dev"), feature(plugin))]
-#![cfg_attr(all(nightly, feature="dev"), plugin(clippy))]
 
 //! Miner module
 //! Keeps track of transactions and mined block.
@@ -24,7 +22,6 @@
 //! Usage example:
 //!
 //! ```rust
-//! extern crate ethcore_util as util;
 //! extern crate ethcore;
 //! use std::env;
 //! use ethcore::ethereum;
@@ -41,36 +38,34 @@
 //! }
 //! ```
 
-mod banning_queue;
-mod external;
-mod local_transactions;
 mod miner;
-mod service_transaction_checker;
-mod transaction_queue;
-mod work_notify;
 mod stratum;
-
-pub use self::external::{ExternalMiner, ExternalMinerService};
+mod service_transaction_checker;
 
 pub use self::miner::{Miner, MinerOptions, Banning, PendingSet, GasPricer, GasPriceCalibratorOptions, GasLimit};
-pub use self::transaction_queue::{TransactionQueue, RemovalReason, TransactionDetailsProvider as TransactionQueueDetailsProvider,
-	PrioritizationStrategy, AccountDetails, TransactionOrigin};
-pub use self::local_transactions::{Status as LocalTransactionStatus};
-pub use client::TransactionImportResult;
-pub use self::work_notify::NotifyWork;
 pub use self::stratum::{Stratum, Error as StratumError, Options as StratumOptions};
 
+pub use ethcore_miner::local_transactions::Status as LocalTransactionStatus;
+
 use std::collections::BTreeMap;
-use util::{H256, U256, Address, Bytes};
-use client::{MiningBlockChainClient};
-use block::ClosedBlock;
-use header::BlockNumber;
-use receipt::{RichReceipt, Receipt};
+
+use block::{ClosedBlock, Block};
+use bytes::Bytes;
+use client::{
+	MiningBlockChainClient, CallContract, RegistryInfo, ScheduleInfo,
+	BlockChain, AccountData, BlockProducer, SealedBlockImporter
+};
 use error::{Error};
-use transaction::{UnverifiedTransaction, PendingTransaction};
+use ethereum_types::{H256, U256, Address};
+use header::{BlockNumber, Header};
+use receipt::{RichReceipt, Receipt};
+use transaction::{UnverifiedTransaction, PendingTransaction, ImportResult as TransactionImportResult};
+use state::StateInfo;
 
 /// Miner client API
 pub trait MinerService : Send + Sync {
+	/// Type representing chain state
+	type State: StateInfo + 'static;
 
 	/// Returns miner's status.
 	fn status(&self) -> MinerStatus;
@@ -119,42 +114,46 @@ pub trait MinerService : Send + Sync {
 	fn set_tx_gas_limit(&self, limit: U256);
 
 	/// Imports transactions to transaction queue.
-	fn import_external_transactions(&self, chain: &MiningBlockChainClient, transactions: Vec<UnverifiedTransaction>) ->
+	fn import_external_transactions<C: MiningBlockChainClient>(&self, client: &C, transactions: Vec<UnverifiedTransaction>) ->
 		Vec<Result<TransactionImportResult, Error>>;
 
 	/// Imports own (node owner) transaction to queue.
-	fn import_own_transaction(&self, chain: &MiningBlockChainClient, transaction: PendingTransaction) ->
+	fn import_own_transaction<C: MiningBlockChainClient>(&self, chain: &C, transaction: PendingTransaction) ->
 		Result<TransactionImportResult, Error>;
 
 	/// Returns hashes of transactions currently in pending
 	fn pending_transactions_hashes(&self, best_block: BlockNumber) -> Vec<H256>;
 
 	/// Removes all transactions from the queue and restart mining operation.
-	fn clear_and_reset(&self, chain: &MiningBlockChainClient);
+	fn clear_and_reset<C: MiningBlockChainClient>(&self, chain: &C);
 
 	/// Called when blocks are imported to chain, updates transactions queue.
-	fn chain_new_blocks(&self, chain: &MiningBlockChainClient, imported: &[H256], invalid: &[H256], enacted: &[H256], retracted: &[H256]);
+	fn chain_new_blocks<C>(&self, chain: &C, imported: &[H256], invalid: &[H256], enacted: &[H256], retracted: &[H256])
+		where C: AccountData + BlockChain + CallContract + RegistryInfo + BlockProducer + ScheduleInfo + SealedBlockImporter;
 
 	/// PoW chain - can produce work package
 	fn can_produce_work_package(&self) -> bool;
 
 	/// New chain head event. Restart mining operation.
-	fn update_sealing(&self, chain: &MiningBlockChainClient);
+	fn update_sealing<C>(&self, chain: &C)
+		where C: AccountData + BlockChain + RegistryInfo + CallContract + BlockProducer + SealedBlockImporter;
 
 	/// Submit `seal` as a valid solution for the header of `pow_hash`.
 	/// Will check the seal, but not actually insert the block into the chain.
-	fn submit_seal(&self, chain: &MiningBlockChainClient, pow_hash: H256, seal: Vec<Bytes>) -> Result<(), Error>;
+	fn submit_seal<C: SealedBlockImporter>(&self, chain: &C, pow_hash: H256, seal: Vec<Bytes>) -> Result<(), Error>;
 
 	/// Get the sealing work package and if `Some`, apply some transform.
-	fn map_sealing_work<F, T>(&self, chain: &MiningBlockChainClient, f: F) -> Option<T>
-		where F: FnOnce(&ClosedBlock) -> T, Self: Sized;
+	fn map_sealing_work<C, F, T>(&self, client: &C, f: F) -> Option<T>
+		where C: AccountData + BlockChain + BlockProducer + CallContract,
+		      F: FnOnce(&ClosedBlock) -> T,
+		      Self: Sized;
 
 	/// Query pending transactions for hash.
 	fn transaction(&self, best_block: BlockNumber, hash: &H256) -> Option<PendingTransaction>;
 
 	/// Removes transaction from the queue.
 	/// NOTE: The transaction is not removed from pending block if mining.
-	fn remove_pending_transaction(&self, chain: &MiningBlockChainClient, hash: &H256) -> Option<PendingTransaction>;
+	fn remove_pending_transaction<C: AccountData>(&self, chain: &C, hash: &H256) -> Option<PendingTransaction>;
 
 	/// Get a list of all pending transactions in the queue.
 	fn pending_transactions(&self) -> Vec<PendingTransaction>;
@@ -185,6 +184,15 @@ pub trait MinerService : Send + Sync {
 
 	/// Suggested gas limit.
 	fn sensible_gas_limit(&self) -> U256 { 21000.into() }
+
+	/// Get `Some` `clone()` of the current pending block's state or `None` if we're not sealing.
+	fn pending_state(&self, latest_block_number: BlockNumber) -> Option<Self::State>;
+
+	/// Get `Some` `clone()` of the current pending block header or `None` if we're not sealing.
+	fn pending_block_header(&self, latest_block_number: BlockNumber) -> Option<Header>;
+
+	/// Get `Some` `clone()` of the current pending block or `None` if we're not sealing.
+	fn pending_block(&self, latest_block_number: BlockNumber) -> Option<Block>;
 }
 
 /// Mining status
diff --git a/ethcore/src/miner/service_transaction_checker.rs b/ethcore/src/miner/service_transaction_checker.rs
index d21643772ac319710c71f0c80a7f8e705b29ccf1..a555829c5f2d1fddb60ba90ec60cc5e9bb6bafb0 100644
--- a/ethcore/src/miner/service_transaction_checker.rs
+++ b/ethcore/src/miner/service_transaction_checker.rs
@@ -14,47 +14,35 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity. If not, see <http://www.gnu.org/licenses/>.
 
-use client::MiningBlockChainClient;
+//! A service transactions contract checker.
+
+use client::{RegistryInfo, CallContract};
 use transaction::SignedTransaction;
 use types::ids::BlockId;
 
-use futures::{future, Future};
-use native_contracts::ServiceTransactionChecker as Contract;
-use util::{U256, Mutex};
+use_contract!(service_transaction, "ServiceTransaction", "res/contracts/service_transaction.json");
 
 const SERVICE_TRANSACTION_CONTRACT_REGISTRY_NAME: &'static str = "service_transaction_checker";
 
 /// Service transactions checker.
 #[derive(Default)]
 pub struct ServiceTransactionChecker {
-	contract: Mutex<Option<Contract>>,
+	contract: service_transaction::ServiceTransaction,
 }
 
 impl ServiceTransactionChecker {
-	/// Try to create instance, reading contract address from given chain client.
-	pub fn update_from_chain_client(&self, client: &MiningBlockChainClient) {
-		let mut contract = self.contract.lock();
-		if contract.is_none() {
-			*contract = client.registry_address(SERVICE_TRANSACTION_CONTRACT_REGISTRY_NAME.to_owned())
-				.and_then(|contract_addr| {
-					trace!(target: "txqueue", "Configuring for service transaction checker contract from {}", contract_addr);
-
-					Some(Contract::new(contract_addr))
-				})
-		}
-	}
-
 	/// Checks if service transaction can be appended to the transaction queue.
-	pub fn check(&self, client: &MiningBlockChainClient, tx: &SignedTransaction) -> Result<bool, String> {
-		debug_assert_eq!(tx.gas_price, U256::zero());
-
-		if let Some(ref contract) = *self.contract.lock() {
-			contract.certified(
-				|addr, data| future::done(client.call_contract(BlockId::Latest, addr, data)),
-				tx.sender()
-			).wait()
-		} else {
-			Err("contract is not configured".to_owned())
-		}
+	pub fn check<C: CallContract + RegistryInfo>(&self, client: &C, tx: &SignedTransaction) -> Result<bool, String> {
+		assert!(tx.gas_price.is_zero());
+
+		let address = client.registry_address(SERVICE_TRANSACTION_CONTRACT_REGISTRY_NAME.to_owned(), BlockId::Latest)
+			.ok_or_else(|| "contract is not configured")?;
+
+		trace!(target: "txqueue", "Checking service transaction checker contract from {}", address);
+
+		self.contract.functions()
+			.certified()
+			.call(tx.sender(), &|data| client.call_contract(BlockId::Latest, address, data))
+			.map_err(|e| e.to_string())
 	}
 }
diff --git a/ethcore/src/miner/stratum.rs b/ethcore/src/miner/stratum.rs
index 0031bb715d8945a8f8afa8bce62f17c925ad20ff..c8c387e51066912c25ee6badb373ccdd6059b656 100644
--- a/ethcore/src/miner/stratum.rs
+++ b/ethcore/src/miner/stratum.rs
@@ -16,22 +16,22 @@
 
 //! Client-side stratum job dispatcher and mining notifier handler
 
-use ethcore_stratum::{
-	JobDispatcher, PushWorkHandler,
-	Stratum as StratumService, Error as StratumServiceError,
-};
-
 use std::sync::{Arc, Weak};
 use std::net::{SocketAddr, AddrParseError};
 use std::fmt;
 
-use util::{H256, U256, H64, clean_0x};
+use block::IsBlock;
+use client::Client;
+use ethereum_types::{H64, H256, clean_0x, U256};
 use ethereum::ethash::Ethash;
 use ethash::SeedHashCompute;
-use util::Mutex;
+use ethcore_miner::work_notify::NotifyWork;
+use ethcore_stratum::{
+	JobDispatcher, PushWorkHandler,
+	Stratum as StratumService, Error as StratumServiceError,
+};
 use miner::{self, Miner, MinerService};
-use client::Client;
-use block::IsBlock;
+use parking_lot::Mutex;
 use rlp::encode;
 
 /// Configures stratum server options.
@@ -170,11 +170,11 @@ impl StratumJobDispatcher {
 	fn payload(&self, pow_hash: H256, difficulty: U256, number: u64) -> String {
 		// TODO: move this to engine
 		let target = Ethash::difficulty_to_boundary(&difficulty);
-		let seed_hash = &self.seed_compute.lock().get_seedhash(number);
+		let seed_hash = &self.seed_compute.lock().hash_block_number(number);
 		let seed_hash = H256::from_slice(&seed_hash[..]);
 		format!(
-			r#"["0x", "0x{}","0x{}","0x{}","0x{:x}"]"#,
-			pow_hash.hex(), seed_hash.hex(), target.hex(), number
+			r#"["0x", "0x{:x}","0x{:x}","0x{:x}","0x{:x}"]"#,
+			pow_hash, seed_hash, target, number
 		)
 	}
 
@@ -213,7 +213,7 @@ impl From<AddrParseError> for Error {
 	fn from(err: AddrParseError) -> Error { Error::Address(err) }
 }
 
-impl super::work_notify::NotifyWork for Stratum {
+impl NotifyWork for Stratum {
 	fn notify(&self, pow_hash: H256, difficulty: U256, number: u64) {
 		trace!(target: "stratum", "Notify work");
 
@@ -248,7 +248,7 @@ impl Stratum {
 	/// Start STRATUM job dispatcher and register it in the miner
 	pub fn register(cfg: &Options, miner: Arc<Miner>, client: Weak<Client>) -> Result<(), Error> {
 		let stratum = miner::Stratum::start(cfg, Arc::downgrade(&miner.clone()), client)?;
-		miner.push_notifier(Box::new(stratum) as Box<miner::NotifyWork>);
+		miner.push_notifier(Box::new(stratum) as Box<NotifyWork>);
 		Ok(())
 	}
 }
diff --git a/ethcore/src/pod_account.rs b/ethcore/src/pod_account.rs
index 4204b591df67010c21fb183317377c1f5f41644e..027e2765fff2074f6c9412e86e3869af584a5334 100644
--- a/ethcore/src/pod_account.rs
+++ b/ethcore/src/pod_account.rs
@@ -17,7 +17,12 @@
 use std::fmt;
 use std::collections::BTreeMap;
 use itertools::Itertools;
-use util::*;
+use hash::{keccak};
+use ethereum_types::{H256, U256};
+use hashdb::HashDB;
+use triehash::sec_trie_root;
+use bytes::Bytes;
+use trie::TrieFactory;
 use state::Account;
 use ethjson;
 use types::account_diff::*;
@@ -38,12 +43,6 @@ pub struct PodAccount {
 }
 
 impl PodAccount {
-	/// Construct new object.
-	#[cfg(test)]
-	pub fn new(balance: U256, nonce: U256, code: Bytes, storage: BTreeMap<H256, H256>) -> PodAccount {
-		PodAccount { balance: balance, nonce: nonce, code: Some(code), storage: storage }
-	}
-
 	/// Convert Account to a PodAccount.
 	/// NOTE: This will silently fail unless the account is fully cached.
 	pub fn from_account(acc: &Account) -> PodAccount {
@@ -60,8 +59,8 @@ impl PodAccount {
 		let mut stream = RlpStream::new_list(4);
 		stream.append(&self.nonce);
 		stream.append(&self.balance);
-		stream.append(&sec_trie_root(self.storage.iter().map(|(k, v)| (k.to_vec(), rlp::encode(&U256::from(&**v)).to_vec())).collect()));
-		stream.append(&self.code.as_ref().unwrap_or(&vec![]).sha3());
+		stream.append(&sec_trie_root(self.storage.iter().map(|(k, v)| (k, rlp::encode(&U256::from(&**v))))));
+		stream.append(&keccak(&self.code.as_ref().unwrap_or(&vec![])));
 		stream.out()
 	}
 
@@ -117,7 +116,7 @@ impl fmt::Display for PodAccount {
 			self.balance,
 			self.nonce,
 			self.code.as_ref().map_or(0, |c| c.len()),
-			self.code.as_ref().map_or_else(H256::new, |c| c.sha3()),
+			self.code.as_ref().map_or_else(H256::new, |c| keccak(c)),
 			self.storage.len(),
 		)
 	}
diff --git a/ethcore/src/pod_state.rs b/ethcore/src/pod_state.rs
index 5a0265dc18ed91f634afbf38ec77d8966259b564..1bbabc98060b6c1030a240a2ae836168e1d453c9 100644
--- a/ethcore/src/pod_state.rs
+++ b/ethcore/src/pod_state.rs
@@ -19,7 +19,8 @@
 use std::fmt;
 use std::collections::BTreeMap;
 use itertools::Itertools;
-use util::*;
+use ethereum_types::{H256, Address};
+use triehash::sec_trie_root;
 use pod_account::{self, PodAccount};
 use types::state_diff::StateDiff;
 use ethjson;
@@ -40,7 +41,7 @@ impl PodState {
 
 	/// Get the root hash of the trie of the RLP of this.
 	pub fn root(&self) -> H256 {
-		sec_trie_root(self.0.iter().map(|(k, v)| (k.to_vec(), v.rlp())).collect())
+		sec_trie_root(self.0.iter().map(|(k, v)| (k, v.rlp())))
 	}
 
 	/// Drain object to get the underlying map.
@@ -75,7 +76,12 @@ impl fmt::Display for PodState {
 
 /// Calculate and return diff between `pre` state and `post` state.
 pub fn diff_pod(pre: &PodState, post: &PodState) -> StateDiff {
-	StateDiff { raw: pre.get().keys().merge(post.get().keys()).filter_map(|acc| pod_account::diff_pod(pre.get().get(acc), post.get().get(acc)).map(|d|(acc.clone(), d))).collect() }
+	StateDiff {
+		raw: pre.get().keys()
+			.merge(post.get().keys())
+			.filter_map(|acc| pod_account::diff_pod(pre.get().get(acc), post.get().get(acc)).map(|d| (acc.clone(), d)))
+			.collect()
+	}
 }
 
 #[cfg(test)]
@@ -88,7 +94,14 @@ mod test {
 
 	#[test]
 	fn create_delete() {
-		let a = PodState::from(map![ 1.into() => PodAccount::new(69.into(), 0.into(), vec![], map![]) ]);
+		let a = PodState::from(map![
+			1.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			}
+		]);
 		assert_eq!(super::diff_pod(&a, &PodState::new()), StateDiff { raw: map![
 			1.into() => AccountDiff{
 				balance: Diff::Died(69.into()),
@@ -109,10 +122,27 @@ mod test {
 
 	#[test]
 	fn create_delete_with_unchanged() {
-		let a = PodState::from(map![ 1.into() => PodAccount::new(69.into(), 0.into(), vec![], map![]) ]);
+		let a = PodState::from(map![
+			1.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			}
+		]);
 		let b = PodState::from(map![
-			1.into() => PodAccount::new(69.into(), 0.into(), vec![], map![]),
-			2.into() => PodAccount::new(69.into(), 0.into(), vec![], map![])
+			1.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			},
+			2.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			}
 		]);
 		assert_eq!(super::diff_pod(&a, &b), StateDiff { raw: map![
 			2.into() => AccountDiff{
@@ -135,12 +165,32 @@ mod test {
 	#[test]
 	fn change_with_unchanged() {
 		let a = PodState::from(map![
-			1.into() => PodAccount::new(69.into(), 0.into(), vec![], map![]),
-			2.into() => PodAccount::new(69.into(), 0.into(), vec![], map![])
+			1.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			},
+			2.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			}
 		]);
 		let b = PodState::from(map![
-			1.into() => PodAccount::new(69.into(), 1.into(), vec![], map![]),
-			2.into() => PodAccount::new(69.into(), 0.into(), vec![], map![])
+			1.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 1.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			},
+			2.into() => PodAccount {
+				balance: 69.into(),
+				nonce: 0.into(),
+				code: Some(Vec::new()),
+				storage: map![],
+			}
 		]);
 		assert_eq!(super::diff_pod(&a, &b), StateDiff { raw: map![
 			1.into() => AccountDiff{
diff --git a/ethcore/src/snapshot/account.rs b/ethcore/src/snapshot/account.rs
index a9f2ba593b5155f7aee225f40452e829825a8611..b85f8f4013f65dd72a04b45246dd8e2941d442c2 100644
--- a/ethcore/src/snapshot/account.rs
+++ b/ethcore/src/snapshot/account.rs
@@ -19,9 +19,12 @@
 use account_db::{AccountDB, AccountDBMut};
 use basic_account::BasicAccount;
 use snapshot::Error;
+use hash::{KECCAK_EMPTY, KECCAK_NULL_RLP};
 
-use util::{U256, H256, Bytes, HashDB, SHA3_EMPTY, SHA3_NULL_RLP};
-use util::trie::{TrieDB, Trie};
+use ethereum_types::{H256, U256};
+use hashdb::HashDB;
+use bytes::Bytes;
+use trie::{TrieDB, Trie};
 use rlp::{RlpStream, UntrustedRlp};
 
 use std::collections::HashSet;
@@ -30,8 +33,8 @@ use std::collections::HashSet;
 const ACC_EMPTY: BasicAccount = BasicAccount {
 	nonce: U256([0, 0, 0, 0]),
 	balance: U256([0, 0, 0, 0]),
-	storage_root: SHA3_NULL_RLP,
-	code_hash: SHA3_EMPTY,
+	storage_root: KECCAK_NULL_RLP,
+	code_hash: KECCAK_EMPTY,
 };
 
 // whether an encoded account has code and how it is referred to.
@@ -78,7 +81,7 @@ pub fn to_fat_rlps(account_hash: &H256, acc: &BasicAccount, acct_db: &AccountDB,
 					  .append(&acc.balance);
 
 		// [has_code, code_hash].
-		if acc.code_hash == SHA3_EMPTY {
+		if acc.code_hash == KECCAK_EMPTY {
 			account_stream.append(&CodeState::Empty.raw()).append_empty_data();
 		} else if used_code.contains(&acc.code_hash) {
 			account_stream.append(&CodeState::Hash.raw()).append(&acc.code_hash);
@@ -148,7 +151,7 @@ pub fn from_fat_rlp(
 	rlp: UntrustedRlp,
 	mut storage_root: H256,
 ) -> Result<(BasicAccount, Option<Bytes>), Error> {
-	use util::{TrieDBMut, TrieMut};
+	use trie::{TrieDBMut, TrieMut};
 
 	// check for special case of empty account.
 	if rlp.is_empty() {
@@ -164,7 +167,7 @@ pub fn from_fat_rlp(
 
 	// load the code if it exists.
 	let (code_hash, new_code) = match code_state {
-		CodeState::Empty => (SHA3_EMPTY, None),
+		CodeState::Empty => (KECCAK_EMPTY, None),
 		CodeState::Inline => {
 			let code: Bytes = rlp.val_at(3)?;
 			let code_hash = acct_db.insert(&code);
@@ -210,8 +213,10 @@ mod tests {
 	use tests::helpers::get_temp_state_db;
 	use snapshot::tests::helpers::fill_storage;
 
-	use util::sha3::{SHA3_EMPTY, SHA3_NULL_RLP};
-	use util::{Address, H256, HashDB, DBValue, Hashable};
+	use hash::{KECCAK_EMPTY, KECCAK_NULL_RLP, keccak};
+	use ethereum_types::{H256, Address};
+	use hashdb::HashDB;
+	use kvdb::DBValue;
 	use rlp::UntrustedRlp;
 
 	use std::collections::HashSet;
@@ -226,14 +231,14 @@ mod tests {
 		let account = BasicAccount {
 			nonce: 50.into(),
 			balance: 123456789.into(),
-			storage_root: SHA3_NULL_RLP,
-			code_hash: SHA3_EMPTY,
+			storage_root: KECCAK_NULL_RLP,
+			code_hash: KECCAK_EMPTY,
 		};
 
 		let thin_rlp = ::rlp::encode(&account);
 		assert_eq!(::rlp::decode::<BasicAccount>(&thin_rlp), account);
 
-		let fat_rlps = to_fat_rlps(&addr.sha3(), &account, &AccountDB::new(db.as_hashdb(), &addr), &mut Default::default(), usize::max_value(), usize::max_value()).unwrap();
+		let fat_rlps = to_fat_rlps(&keccak(&addr), &account, &AccountDB::new(db.as_hashdb(), &addr), &mut Default::default(), usize::max_value(), usize::max_value()).unwrap();
 		let fat_rlp = UntrustedRlp::new(&fat_rlps[0]).at(1).unwrap();
 		assert_eq!(from_fat_rlp(&mut AccountDBMut::new(db.as_hashdb_mut(), &addr), fat_rlp, H256::zero()).unwrap().0, account);
 	}
@@ -245,20 +250,20 @@ mod tests {
 
 		let account = {
 			let acct_db = AccountDBMut::new(db.as_hashdb_mut(), &addr);
-			let mut root = SHA3_NULL_RLP;
+			let mut root = KECCAK_NULL_RLP;
 			fill_storage(acct_db, &mut root, &mut H256::zero());
 			BasicAccount {
 				nonce: 25.into(),
 				balance: 987654321.into(),
 				storage_root: root,
-				code_hash: SHA3_EMPTY,
+				code_hash: KECCAK_EMPTY,
 			}
 		};
 
 		let thin_rlp = ::rlp::encode(&account);
 		assert_eq!(::rlp::decode::<BasicAccount>(&thin_rlp), account);
 
-		let fat_rlp = to_fat_rlps(&addr.sha3(), &account, &AccountDB::new(db.as_hashdb(), &addr), &mut Default::default(), usize::max_value(), usize::max_value()).unwrap();
+		let fat_rlp = to_fat_rlps(&keccak(&addr), &account, &AccountDB::new(db.as_hashdb(), &addr), &mut Default::default(), usize::max_value(), usize::max_value()).unwrap();
 		let fat_rlp = UntrustedRlp::new(&fat_rlp[0]).at(1).unwrap();
 		assert_eq!(from_fat_rlp(&mut AccountDBMut::new(db.as_hashdb_mut(), &addr), fat_rlp, H256::zero()).unwrap().0, account);
 	}
@@ -270,21 +275,21 @@ mod tests {
 
 		let account = {
 			let acct_db = AccountDBMut::new(db.as_hashdb_mut(), &addr);
-			let mut root = SHA3_NULL_RLP;
+			let mut root = KECCAK_NULL_RLP;
 			fill_storage(acct_db, &mut root, &mut H256::zero());
 			BasicAccount {
 				nonce: 25.into(),
 				balance: 987654321.into(),
 				storage_root: root,
-				code_hash: SHA3_EMPTY,
+				code_hash: KECCAK_EMPTY,
 			}
 		};
 
 		let thin_rlp = ::rlp::encode(&account);
 		assert_eq!(::rlp::decode::<BasicAccount>(&thin_rlp), account);
 
-		let fat_rlps = to_fat_rlps(&addr.sha3(), &account, &AccountDB::new(db.as_hashdb(), &addr), &mut Default::default(), 500, 1000).unwrap();
-		let mut root = SHA3_NULL_RLP;
+		let fat_rlps = to_fat_rlps(&keccak(addr), &account, &AccountDB::new(db.as_hashdb(), &addr), &mut Default::default(), 500, 1000).unwrap();
+		let mut root = KECCAK_NULL_RLP;
 		let mut restored_account = None;
 		for rlp in fat_rlps {
 			let fat_rlp = UntrustedRlp::new(&rlp).at(1).unwrap();
@@ -314,21 +319,21 @@ mod tests {
 		let account1 = BasicAccount {
 			nonce: 50.into(),
 			balance: 123456789.into(),
-			storage_root: SHA3_NULL_RLP,
+			storage_root: KECCAK_NULL_RLP,
 			code_hash: code_hash,
 		};
 
 		let account2 = BasicAccount {
 			nonce: 400.into(),
 			balance: 98765432123456789usize.into(),
-			storage_root: SHA3_NULL_RLP,
+			storage_root: KECCAK_NULL_RLP,
 			code_hash: code_hash,
 		};
 
 		let mut used_code = HashSet::new();
 
-		let fat_rlp1 = to_fat_rlps(&addr1.sha3(), &account1, &AccountDB::new(db.as_hashdb(), &addr1), &mut used_code, usize::max_value(), usize::max_value()).unwrap();
-		let fat_rlp2 = to_fat_rlps(&addr2.sha3(), &account2, &AccountDB::new(db.as_hashdb(), &addr2), &mut used_code, usize::max_value(), usize::max_value()).unwrap();
+		let fat_rlp1 = to_fat_rlps(&keccak(&addr1), &account1, &AccountDB::new(db.as_hashdb(), &addr1), &mut used_code, usize::max_value(), usize::max_value()).unwrap();
+		let fat_rlp2 = to_fat_rlps(&keccak(&addr2), &account2, &AccountDB::new(db.as_hashdb(), &addr2), &mut used_code, usize::max_value(), usize::max_value()).unwrap();
 		assert_eq!(used_code.len(), 1);
 
 		let fat_rlp1 = UntrustedRlp::new(&fat_rlp1[0]).at(1).unwrap();
diff --git a/ethcore/src/snapshot/block.rs b/ethcore/src/snapshot/block.rs
index e7b100f690516c4748d5c33a0e2c205b26c3dced..98215b3244d9f1bca80252e6792181cf21892688 100644
--- a/ethcore/src/snapshot/block.rs
+++ b/ethcore/src/snapshot/block.rs
@@ -18,11 +18,13 @@
 
 use block::Block;
 use header::Header;
+use hash::keccak;
 
 use views::BlockView;
 use rlp::{DecoderError, RlpStream, UntrustedRlp};
-use util::{Bytes, Hashable, H256};
-use util::triehash::ordered_trie_root;
+use ethereum_types::H256;
+use bytes::Bytes;
+use triehash::ordered_trie_root;
 
 const HEADER_FIELDS: usize = 8;
 const BLOCK_FIELDS: usize = 2;
@@ -105,13 +107,13 @@ impl AbridgedBlock {
 		let uncles: Vec<Header> = rlp.list_at(9)?;
 
 		header.set_transactions_root(ordered_trie_root(
-			rlp.at(8)?.iter().map(|r| r.as_raw().to_owned())
+			rlp.at(8)?.iter().map(|r| r.as_raw())
 		));
 		header.set_receipts_root(receipts_root);
 
 		let mut uncles_rlp = RlpStream::new();
 		uncles_rlp.append_list(&uncles);
-		header.set_uncles_hash(uncles_rlp.as_raw().sha3());
+		header.set_uncles_hash(keccak(uncles_rlp.as_raw()));
 
 		let mut seal_fields = Vec::new();
 		for i in (HEADER_FIELDS + BLOCK_FIELDS)..rlp.item_count()? {
@@ -133,13 +135,15 @@ impl AbridgedBlock {
 mod tests {
 	use views::BlockView;
 	use block::Block;
+	use header::Seal;
 	use super::AbridgedBlock;
 	use transaction::{Action, Transaction};
 
-	use util::{Address, H256, U256, Bytes};
+	use ethereum_types::{H256, U256, Address};
+	use bytes::Bytes;
 
 	fn encode_block(b: &Block) -> Bytes {
-		b.rlp_bytes(::basic_types::Seal::With)
+		b.rlp_bytes(Seal::With)
 	}
 
 	#[test]
@@ -189,8 +193,8 @@ mod tests {
 		b.transactions.push(t2.into());
 
 		let receipts_root = b.header.receipts_root().clone();
-		b.header.set_transactions_root(::util::triehash::ordered_trie_root(
-			b.transactions.iter().map(::rlp::encode).map(|out| out.into_vec())
+		b.header.set_transactions_root(::triehash::ordered_trie_root(
+			b.transactions.iter().map(::rlp::encode)
 		));
 
 		let encoded = encode_block(&b);
diff --git a/ethcore/src/snapshot/consensus/authority.rs b/ethcore/src/snapshot/consensus/authority.rs
index 1a1215522dedec51be97eb52292c42c7f8c991d5..46f433c00503e8992179758a1d2a73fa7787e0c7 100644
--- a/ethcore/src/snapshot/consensus/authority.rs
+++ b/ethcore/src/snapshot/consensus/authority.rs
@@ -25,15 +25,18 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 
 use blockchain::{BlockChain, BlockProvider};
-use engines::{Engine, EpochVerifier, EpochTransition};
+use engines::{EthEngine, EpochVerifier, EpochTransition};
+use machine::EthereumMachine;
 use ids::BlockId;
-use header::Header;
+use header::{Header, Seal};
 use receipt::Receipt;
 use snapshot::{Error, ManifestData};
 
 use itertools::{Position, Itertools};
 use rlp::{RlpStream, UntrustedRlp};
-use util::{Bytes, H256, KeyValueDB};
+use ethereum_types::{H256, U256};
+use kvdb::KeyValueDB;
+use bytes::Bytes;
 
 /// Snapshot creation and restoration for PoA chains.
 /// Chunk format:
@@ -166,7 +169,7 @@ struct ChunkRebuilder {
 	// and epoch data from last blocks in chunks.
 	// verification for these will be done at the end.
 	unverified_firsts: Vec<(Header, Bytes, H256)>,
-	last_epochs: Vec<(Header, Box<EpochVerifier>)>,
+	last_epochs: Vec<(Header, Box<EpochVerifier<EthereumMachine>>)>,
 }
 
 // verified data.
@@ -178,9 +181,9 @@ struct Verified {
 impl ChunkRebuilder {
 	fn verify_transition(
 		&mut self,
-		last_verifier: &mut Option<Box<EpochVerifier>>,
+		last_verifier: &mut Option<Box<EpochVerifier<EthereumMachine>>>,
 		transition_rlp: UntrustedRlp,
-		engine: &Engine,
+		engine: &EthEngine,
 	) -> Result<Verified, ::error::Error> {
 		use engines::ConstructedVerifier;
 
@@ -236,7 +239,7 @@ impl Rebuilder for ChunkRebuilder {
 	fn feed(
 		&mut self,
 		chunk: &[u8],
-		engine: &Engine,
+		engine: &EthEngine,
 		abort_flag: &AtomicBool,
 	) -> Result<(), ::error::Error> {
 		let rlp = UntrustedRlp::new(chunk);
@@ -321,7 +324,7 @@ impl Rebuilder for ChunkRebuilder {
 				transactions: last_rlp.list_at(1)?,
 				uncles: last_rlp.list_at(2)?,
 			};
-			let block_data = block.rlp_bytes(::basic_types::Seal::With);
+			let block_data = block.rlp_bytes(Seal::With);
 			let receipts: Vec<Receipt> = last_rlp.list_at(3)?;
 
 			{
@@ -332,7 +335,7 @@ impl Rebuilder for ChunkRebuilder {
 				}
 			}
 
-			let parent_td: ::util::U256 = last_rlp.val_at(4)?;
+			let parent_td: U256 = last_rlp.val_at(4)?;
 
 			let mut batch = self.db.transaction();
 			self.chain.insert_unordered_block(&mut batch, &block_data, receipts, Some(parent_td), true, false);
@@ -344,7 +347,7 @@ impl Rebuilder for ChunkRebuilder {
 		Ok(())
 	}
 
-	fn finalize(&mut self, _engine: &Engine) -> Result<(), ::error::Error> {
+	fn finalize(&mut self, _engine: &EthEngine) -> Result<(), ::error::Error> {
 		if !self.had_genesis {
 			return Err(Error::WrongChunkFormat("No genesis transition included.".into()).into());
 		}
diff --git a/ethcore/src/snapshot/consensus/mod.rs b/ethcore/src/snapshot/consensus/mod.rs
index 3f583893beb25f2889a5c7d485d15d0b0f83c67d..712c245ff37d1ca1cf4f763c3c1e971dc3dc24cb 100644
--- a/ethcore/src/snapshot/consensus/mod.rs
+++ b/ethcore/src/snapshot/consensus/mod.rs
@@ -21,11 +21,11 @@ use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 
 use blockchain::BlockChain;
-use engines::Engine;
+use engines::EthEngine;
 use snapshot::{Error, ManifestData};
 
-use util::H256;
-use util::kvdb::KeyValueDB;
+use ethereum_types::H256;
+use kvdb::KeyValueDB;
 
 mod authority;
 mod work;
@@ -84,7 +84,7 @@ pub trait Rebuilder: Send {
 	fn feed(
 		&mut self,
 		chunk: &[u8],
-		engine: &Engine,
+		engine: &EthEngine,
 		abort_flag: &AtomicBool,
 	) -> Result<(), ::error::Error>;
 
@@ -93,5 +93,5 @@ pub trait Rebuilder: Send {
 	///
 	/// This should apply the necessary "glue" between chunks,
 	/// and verify against the restored state.
-	fn finalize(&mut self, engine: &Engine) -> Result<(), ::error::Error>;
+	fn finalize(&mut self, engine: &EthEngine) -> Result<(), ::error::Error>;
 }
diff --git a/ethcore/src/snapshot/consensus/work.rs b/ethcore/src/snapshot/consensus/work.rs
index 2bf154fc48a9c0b6f8529ffef79a3b6b7a78d8ea..5b4ff4888935501fb71f54632e1349b33f682954 100644
--- a/ethcore/src/snapshot/consensus/work.rs
+++ b/ethcore/src/snapshot/consensus/work.rs
@@ -27,10 +27,12 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 
 use blockchain::{BlockChain, BlockProvider};
-use engines::Engine;
+use engines::EthEngine;
 use snapshot::{Error, ManifestData};
 use snapshot::block::AbridgedBlock;
-use util::{Bytes, H256, KeyValueDB};
+use ethereum_types::H256;
+use kvdb::KeyValueDB;
+use bytes::Bytes;
 use rlp::{RlpStream, UntrustedRlp};
 use rand::OsRng;
 
@@ -217,12 +219,12 @@ impl PowRebuilder {
 impl Rebuilder for PowRebuilder {
 	/// Feed the rebuilder an uncompressed block chunk.
 	/// Returns the number of blocks fed or any errors.
-	fn feed(&mut self, chunk: &[u8], engine: &Engine, abort_flag: &AtomicBool) -> Result<(), ::error::Error> {
-		use basic_types::Seal::With;
+	fn feed(&mut self, chunk: &[u8], engine: &EthEngine, abort_flag: &AtomicBool) -> Result<(), ::error::Error> {
+		use header::Seal;
 		use views::BlockView;
 		use snapshot::verify_old_block;
-		use util::U256;
-		use util::triehash::ordered_trie_root;
+		use ethereum_types::U256;
+		use triehash::ordered_trie_root;
 
 		let rlp = UntrustedRlp::new(chunk);
 		let item_count = rlp.item_count()?;
@@ -246,12 +248,10 @@ impl Rebuilder for PowRebuilder {
 			let abridged_rlp = pair.at(0)?.as_raw().to_owned();
 			let abridged_block = AbridgedBlock::from_raw(abridged_rlp);
 			let receipts: Vec<::receipt::Receipt> = pair.list_at(1)?;
-			let receipts_root = ordered_trie_root(
-				pair.at(1)?.iter().map(|r| r.as_raw().to_owned())
-			);
+			let receipts_root = ordered_trie_root(pair.at(1)?.iter().map(|r| r.as_raw()));
 
 			let block = abridged_block.to_block(parent_hash, cur_number, receipts_root)?;
-			let block_bytes = block.rlp_bytes(With);
+			let block_bytes = block.rlp_bytes(Seal::With);
 			let is_best = cur_number == self.best_number;
 
 			if is_best {
@@ -269,7 +269,6 @@ impl Rebuilder for PowRebuilder {
 				&block.header,
 				engine,
 				&self.chain,
-				Some(&block_bytes),
 				is_best
 			)?;
 
@@ -296,7 +295,7 @@ impl Rebuilder for PowRebuilder {
 	}
 
 	/// Glue together any disconnected chunks and check that the chain is complete.
-	fn finalize(&mut self, _: &Engine) -> Result<(), ::error::Error> {
+	fn finalize(&mut self, _: &EthEngine) -> Result<(), ::error::Error> {
 		let mut batch = self.db.transaction();
 
 		for (first_num, first_hash) in self.disconnected.drain(..) {
diff --git a/ethcore/src/snapshot/error.rs b/ethcore/src/snapshot/error.rs
index 56be84c96479a8e9cb81ac679b04f590c1ee873a..2741f648a2b917f65ce602c7f53725d61c611fc4 100644
--- a/ethcore/src/snapshot/error.rs
+++ b/ethcore/src/snapshot/error.rs
@@ -20,8 +20,8 @@ use std::fmt;
 
 use ids::BlockId;
 
-use util::H256;
-use util::trie::TrieError;
+use ethereum_types::H256;
+use trie::TrieError;
 use rlp::DecoderError;
 
 /// Snapshot-related errors.
@@ -57,6 +57,8 @@ pub enum Error {
 	VersionNotSupported(u64),
 	/// Max chunk size is to small to fit basic account data.
 	ChunkTooSmall,
+	/// Oversized chunk
+	ChunkTooLarge,
 	/// Snapshots not supported by the consensus engine.
 	SnapshotsUnsupported,
 	/// Bad epoch transition.
@@ -85,6 +87,7 @@ impl fmt::Display for Error {
 			Error::Trie(ref err) => err.fmt(f),
 			Error::VersionNotSupported(ref ver) => write!(f, "Snapshot version {} is not supprted.", ver),
 			Error::ChunkTooSmall => write!(f, "Chunk size is too small."),
+			Error::ChunkTooLarge => write!(f, "Chunk size is too large."),
 			Error::SnapshotsUnsupported => write!(f, "Snapshots unsupported by consensus engine."),
 			Error::BadEpochProof(i) => write!(f, "Bad epoch proof for transition to epoch {}", i),
 			Error::WrongChunkFormat(ref msg) => write!(f, "Wrong chunk format: {}", msg),
diff --git a/ethcore/src/snapshot/io.rs b/ethcore/src/snapshot/io.rs
index f28adcf7f26d7919c9804a4d538d203cb11360e6..7e38177ea526f955cd080ab63fee5583a3a679dd 100644
--- a/ethcore/src/snapshot/io.rs
+++ b/ethcore/src/snapshot/io.rs
@@ -25,8 +25,8 @@ use std::io::{self, Read, Seek, SeekFrom, Write};
 use std::fs::{self, File};
 use std::path::{Path, PathBuf};
 
-use util::Bytes;
-use util::hash::H256;
+use bytes::Bytes;
+use ethereum_types::H256;
 use rlp::{RlpStream, UntrustedRlp};
 
 use super::ManifestData;
@@ -156,12 +156,9 @@ impl LooseWriter {
 
 	// writing logic is the same for both kinds of chunks.
 	fn write_chunk(&mut self, hash: H256, chunk: &[u8]) -> io::Result<()> {
-		let mut file_path = self.dir.clone();
-		file_path.push(hash.hex());
-
+		let file_path = self.dir.join(format!("{:x}", hash));
 		let mut file = File::create(file_path)?;
 		file.write_all(chunk)?;
-
 		Ok(())
 	}
 }
@@ -327,22 +324,18 @@ impl SnapshotReader for LooseReader {
 	}
 
 	fn chunk(&self, hash: H256) -> io::Result<Bytes> {
-		let mut path = self.dir.clone();
-		path.push(hash.hex());
-
+		let path = self.dir.join(format!("{:x}", hash));
 		let mut buf = Vec::new();
 		let mut file = File::open(&path)?;
-
 		file.read_to_end(&mut buf)?;
-
 		Ok(buf)
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use devtools::RandomTempPath;
-	use util::sha3::Hashable;
+	use tempdir::TempDir;
+	use hash::keccak;
 
 	use snapshot::ManifestData;
 	use super::{SnapshotWriter, SnapshotReader, PackedWriter, PackedReader, LooseWriter, LooseReader, SNAPSHOT_VERSION};
@@ -352,36 +345,37 @@ mod tests {
 
 	#[test]
 	fn packed_write_and_read() {
-		let path = RandomTempPath::new();
-		let mut writer = PackedWriter::new(path.as_path()).unwrap();
+		let tempdir = TempDir::new("").unwrap();
+		let path = tempdir.path().join("packed");
+		let mut writer = PackedWriter::new(&path).unwrap();
 
 		let mut state_hashes = Vec::new();
 		let mut block_hashes = Vec::new();
 
 		for chunk in STATE_CHUNKS {
-			let hash = chunk.sha3();
+			let hash = keccak(&chunk);
 			state_hashes.push(hash.clone());
 			writer.write_state_chunk(hash, chunk).unwrap();
 		}
 
 		for chunk in BLOCK_CHUNKS {
-			let hash = chunk.sha3();
+			let hash = keccak(&chunk);
 			block_hashes.push(hash.clone());
-			writer.write_block_chunk(chunk.sha3(), chunk).unwrap();
+			writer.write_block_chunk(keccak(&chunk), chunk).unwrap();
 		}
 
 		let manifest = ManifestData {
 			version: SNAPSHOT_VERSION,
 			state_hashes: state_hashes,
 			block_hashes: block_hashes,
-			state_root: b"notarealroot".sha3(),
+			state_root: keccak(b"notarealroot"),
 			block_number: 12345678987654321,
-			block_hash: b"notarealblock".sha3(),
+			block_hash: keccak(b"notarealblock"),
 		};
 
 		writer.finish(manifest.clone()).unwrap();
 
-		let reader = PackedReader::new(path.as_path()).unwrap().unwrap();
+		let reader = PackedReader::new(&path).unwrap().unwrap();
 		assert_eq!(reader.manifest(), &manifest);
 
 		for hash in manifest.state_hashes.iter().chain(&manifest.block_hashes) {
@@ -391,36 +385,36 @@ mod tests {
 
 	#[test]
 	fn loose_write_and_read() {
-		let path = RandomTempPath::new();
-		let mut writer = LooseWriter::new(path.as_path().into()).unwrap();
+		let tempdir = TempDir::new("").unwrap();
+		let mut writer = LooseWriter::new(tempdir.path().into()).unwrap();
 
 		let mut state_hashes = Vec::new();
 		let mut block_hashes = Vec::new();
 
 		for chunk in STATE_CHUNKS {
-			let hash = chunk.sha3();
+			let hash = keccak(&chunk);
 			state_hashes.push(hash.clone());
 			writer.write_state_chunk(hash, chunk).unwrap();
 		}
 
 		for chunk in BLOCK_CHUNKS {
-			let hash = chunk.sha3();
+			let hash = keccak(&chunk);
 			block_hashes.push(hash.clone());
-			writer.write_block_chunk(chunk.sha3(), chunk).unwrap();
+			writer.write_block_chunk(keccak(&chunk), chunk).unwrap();
 		}
 
 		let manifest = ManifestData {
 			version: SNAPSHOT_VERSION,
 			state_hashes: state_hashes,
 			block_hashes: block_hashes,
-			state_root: b"notarealroot".sha3(),
+			state_root: keccak(b"notarealroot"),
 			block_number: 12345678987654321,
-			block_hash: b"notarealblock".sha3(),
+			block_hash: keccak(b"notarealblock)"),
 		};
 
 		writer.finish(manifest.clone()).unwrap();
 
-		let reader = LooseReader::new(path.as_path().into()).unwrap();
+		let reader = LooseReader::new(tempdir.path().into()).unwrap();
 		assert_eq!(reader.manifest(), &manifest);
 
 		for hash in manifest.state_hashes.iter().chain(&manifest.block_hashes) {
diff --git a/ethcore/src/snapshot/mod.rs b/ethcore/src/snapshot/mod.rs
index a15c15566ab2c0625bd234bd7e5c06a4356295db..f9a513dd17868c1a0d025dc64ed19f5e1478c873 100644
--- a/ethcore/src/snapshot/mod.rs
+++ b/ethcore/src/snapshot/mod.rs
@@ -22,20 +22,23 @@
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use hash::{keccak, KECCAK_NULL_RLP, KECCAK_EMPTY};
 
 use account_db::{AccountDB, AccountDBMut};
 use blockchain::{BlockChain, BlockProvider};
-use engines::Engine;
+use engines::EthEngine;
 use header::Header;
 use ids::BlockId;
 
-use util::{Bytes, Hashable, HashDB, DBValue, snappy, U256};
-use util::Mutex;
-use util::hash::{H256};
-use util::journaldb::{self, Algorithm, JournalDB};
-use util::kvdb::KeyValueDB;
-use util::trie::{TrieDB, TrieDBMut, Trie, TrieMut};
-use util::sha3::SHA3_NULL_RLP;
+use ethereum_types::{H256, U256};
+use hashdb::HashDB;
+use kvdb::DBValue;
+use snappy;
+use bytes::Bytes;
+use parking_lot::Mutex;
+use journaldb::{self, Algorithm, JournalDB};
+use kvdb::KeyValueDB;
+use trie::{TrieDB, TrieDBMut, Trie, TrieMut};
 use rlp::{RlpStream, UntrustedRlp};
 use bloom_journal::Bloom;
 
@@ -69,20 +72,16 @@ mod watcher;
 #[cfg(test)]
 mod tests;
 
-/// IPC interfaces
-#[cfg(feature="ipc")]
-pub mod remote {
-	pub use super::traits::RemoteSnapshotService;
-}
-
-mod traits {
-	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
-	include!(concat!(env!("OUT_DIR"), "/snapshot_service_trait.rs"));
-}
+mod traits;
 
 // Try to have chunks be around 4MB (before compression)
 const PREFERRED_CHUNK_SIZE: usize = 4 * 1024 * 1024;
 
+// Maximal chunk size (decompressed)
+// Snappy::decompressed_len estimation may sometimes yield results greater
+// than PREFERRED_CHUNK_SIZE so allow some threshold here.
+const MAX_CHUNK_SIZE: usize = PREFERRED_CHUNK_SIZE / 4 * 5;
+
 // Minimum supported state chunk version.
 const MIN_SUPPORTED_STATE_CHUNK_VERSION: u64 = 1;
 // current state chunk version.
@@ -124,7 +123,7 @@ impl Progress {
 }
 /// Take a snapshot using the given blockchain, starting block hash, and database, writing into the given writer.
 pub fn take_snapshot<W: SnapshotWriter + Send>(
-	engine: &Engine,
+	engine: &EthEngine,
 	chain: &BlockChain,
 	block_at: H256,
 	state_db: &HashDB,
@@ -183,12 +182,12 @@ pub fn chunk_secondary<'a>(mut chunker: Box<SnapshotComponents>, chain: &'a Bloc
 		let mut chunk_sink = |raw_data: &[u8]| {
 			let compressed_size = snappy::compress_into(raw_data, &mut snappy_buffer);
 			let compressed = &snappy_buffer[..compressed_size];
-			let hash = compressed.sha3();
+			let hash = keccak(&compressed);
 			let size = compressed.len();
 
 			writer.lock().write_block_chunk(hash, compressed)?;
-			trace!(target: "snapshot", "wrote secondary chunk. hash: {}, size: {}, uncompressed size: {}",
-				hash.hex(), size, raw_data.len());
+			trace!(target: "snapshot", "wrote secondary chunk. hash: {:x}, size: {}, uncompressed size: {}",
+				hash, size, raw_data.len());
 
 			progress.size.fetch_add(size, Ordering::SeqCst);
 			chunk_hashes.push(hash);
@@ -240,7 +239,7 @@ impl<'a> StateChunker<'a> {
 
 		let compressed_size = snappy::compress_into(&raw_data, &mut self.snappy_buffer);
 		let compressed = &self.snappy_buffer[..compressed_size];
-		let hash = compressed.sha3();
+		let hash = keccak(&compressed);
 
 		self.writer.lock().write_state_chunk(hash, compressed)?;
 		trace!(target: "snapshot", "wrote state chunk. size: {}, uncompressed size: {}", compressed_size, raw_data.len());
@@ -318,7 +317,7 @@ impl StateRebuilder {
 	pub fn new(db: Arc<KeyValueDB>, pruning: Algorithm) -> Self {
 		StateRebuilder {
 			db: journaldb::new(db.clone(), pruning, ::db::COL_STATE),
-			state_root: SHA3_NULL_RLP,
+			state_root: KECCAK_NULL_RLP,
 			known_code: HashMap::new(),
 			missing_code: HashMap::new(),
 			bloom: StateDB::load_bloom(&*db),
@@ -362,7 +361,7 @@ impl StateRebuilder {
 
 		// batch trie writes
 		{
-			let mut account_trie = if self.state_root != SHA3_NULL_RLP {
+			let mut account_trie = if self.state_root != KECCAK_NULL_RLP {
 				TrieDBMut::from_existing(self.db.as_hashdb_mut(), &mut self.state_root)?
 			} else {
 				TrieDBMut::new(self.db.as_hashdb_mut(), &mut self.state_root)
@@ -443,7 +442,7 @@ fn rebuild_accounts(
 				// new inline code
 				Some(code) => status.new_code.push((code_hash, code, hash)),
 				None => {
-					if code_hash != ::util::SHA3_EMPTY {
+					if code_hash != KECCAK_EMPTY {
 						// see if this code has already been included inline
 						match known_code.get(&code_hash) {
 							Some(&first_with) => {
@@ -482,13 +481,13 @@ const POW_VERIFY_RATE: f32 = 0.02;
 /// Verify an old block with the given header, engine, blockchain, body. If `always` is set, it will perform
 /// the fullest verification possible. If not, it will take a random sample to determine whether it will
 /// do heavy or light verification.
-pub fn verify_old_block(rng: &mut OsRng, header: &Header, engine: &Engine, chain: &BlockChain, body: Option<&[u8]>, always: bool) -> Result<(), ::error::Error> {
-	engine.verify_block_basic(header, body)?;
+pub fn verify_old_block(rng: &mut OsRng, header: &Header, engine: &EthEngine, chain: &BlockChain, always: bool) -> Result<(), ::error::Error> {
+	engine.verify_block_basic(header)?;
 
 	if always || rng.gen::<f32>() <= POW_VERIFY_RATE {
-		engine.verify_block_unordered(header, body)?;
+		engine.verify_block_unordered(header)?;
 		match chain.block_header(header.parent_hash()) {
-			Some(parent) => engine.verify_block_family(header, &parent, body),
+			Some(parent) => engine.verify_block_family(header, &parent),
 			None => Ok(()),
 		}
 	} else {
diff --git a/ethcore/src/snapshot/service.rs b/ethcore/src/snapshot/service.rs
index 47bbb59975d3d08b223a9e821d246e85829a0c84..7def518f35723b207ce314b74f311a6d915f69a4 100644
--- a/ethcore/src/snapshot/service.rs
+++ b/ethcore/src/snapshot/service.rs
@@ -23,22 +23,24 @@ use std::path::PathBuf;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 
-use super::{ManifestData, StateRebuilder, Rebuilder, RestorationStatus, SnapshotService};
+use super::{ManifestData, StateRebuilder, Rebuilder, RestorationStatus, SnapshotService, MAX_CHUNK_SIZE};
 use super::io::{SnapshotReader, LooseReader, SnapshotWriter, LooseWriter};
 
 use blockchain::BlockChain;
-use client::{BlockChainClient, Client};
-use engines::Engine;
+use client::{Client, ChainInfo, ClientIoMessage};
+use engines::EthEngine;
 use error::Error;
 use ids::BlockId;
-use service::ClientIoMessage;
 
 use io::IoChannel;
 
-use util::{Bytes, H256, Mutex, RwLock, RwLockReadGuard, UtilError};
-use util::journaldb::Algorithm;
-use util::kvdb::{Database, DatabaseConfig};
-use util::snappy;
+use ethereum_types::H256;
+use parking_lot::{Mutex, RwLock, RwLockReadGuard};
+use util_error::UtilError;
+use bytes::Bytes;
+use journaldb::Algorithm;
+use kvdb_rocksdb::{Database, DatabaseConfig};
+use snappy;
 
 /// Helper for removing directories in case of error.
 struct Guard(bool, PathBuf);
@@ -88,7 +90,7 @@ struct RestorationParams<'a> {
 	writer: Option<LooseWriter>, // writer for recovered snapshot.
 	genesis: &'a [u8], // genesis block of the chain.
 	guard: Guard, // guard for the restoration directory.
-	engine: &'a Engine,
+	engine: &'a EthEngine,
 }
 
 impl Restoration {
@@ -100,7 +102,7 @@ impl Restoration {
 		let block_chunks = manifest.block_hashes.iter().cloned().collect();
 
 		let raw_db = Arc::new(Database::open(params.db_config, &*params.db_path.to_string_lossy())
-			.map_err(UtilError::SimpleString)?);
+			.map_err(UtilError::from)?);
 
 		let chain = BlockChain::new(Default::default(), params.genesis, raw_db.clone());
 		let components = params.engine.snapshot_components()
@@ -127,6 +129,11 @@ impl Restoration {
 	// feeds a state chunk, aborts early if `flag` becomes false.
 	fn feed_state(&mut self, hash: H256, chunk: &[u8], flag: &AtomicBool) -> Result<(), Error> {
 		if self.state_chunks_left.contains(&hash) {
+			let expected_len = snappy::decompressed_len(chunk)?;
+			if expected_len > MAX_CHUNK_SIZE {
+				trace!(target: "snapshot", "Discarding large chunk: {} vs {}", expected_len, MAX_CHUNK_SIZE);
+				return Err(::snapshot::Error::ChunkTooLarge.into());
+			}
 			let len = snappy::decompress_into(chunk, &mut self.snappy_buffer)?;
 
 			self.state.feed(&self.snappy_buffer[..len], flag)?;
@@ -142,8 +149,13 @@ impl Restoration {
 	}
 
 	// feeds a block chunk
-	fn feed_blocks(&mut self, hash: H256, chunk: &[u8], engine: &Engine, flag: &AtomicBool) -> Result<(), Error> {
+	fn feed_blocks(&mut self, hash: H256, chunk: &[u8], engine: &EthEngine, flag: &AtomicBool) -> Result<(), Error> {
 		if self.block_chunks_left.contains(&hash) {
+			let expected_len = snappy::decompressed_len(chunk)?;
+			if expected_len > MAX_CHUNK_SIZE {
+				trace!(target: "snapshot", "Discarding large chunk: {} vs {}", expected_len, MAX_CHUNK_SIZE);
+				return Err(::snapshot::Error::ChunkTooLarge.into());
+			}
 			let len = snappy::decompress_into(chunk, &mut self.snappy_buffer)?;
 
 			self.secondary.feed(&self.snappy_buffer[..len], engine, flag)?;
@@ -158,8 +170,8 @@ impl Restoration {
 	}
 
 	// finish up restoration.
-	fn finalize(mut self, engine: &Engine) -> Result<(), Error> {
-		use util::trie::TrieError;
+	fn finalize(mut self, engine: &EthEngine) -> Result<(), Error> {
+		use trie::TrieError;
 
 		if !self.is_done() { return Ok(()) }
 
@@ -196,7 +208,7 @@ pub type Channel = IoChannel<ClientIoMessage>;
 /// Snapshot service parameters.
 pub struct ServiceParams {
 	/// The consensus engine this is built on.
-	pub engine: Arc<Engine>,
+	pub engine: Arc<EthEngine>,
 	/// The chain's genesis block.
 	pub genesis_block: Bytes,
 	/// Database configuration options.
@@ -222,7 +234,7 @@ pub struct Service {
 	pruning: Algorithm,
 	status: Mutex<RestorationStatus>,
 	reader: RwLock<Option<LooseReader>>,
-	engine: Arc<Engine>,
+	engine: Arc<EthEngine>,
 	genesis_block: Bytes,
 	state_chunks: AtomicUsize,
 	block_chunks: AtomicUsize,
@@ -517,7 +529,7 @@ impl Service {
 
 							match is_done {
 								true => {
-									db.flush().map_err(::util::UtilError::SimpleString)?;
+									db.flush().map_err(UtilError::from)?;
 									drop(db);
 									return self.finalize_restoration(&mut *restoration);
 								},
@@ -530,7 +542,7 @@ impl Service {
 				}
 			}
 		};
-		result.and_then(|_| db.flush().map_err(|e| ::util::UtilError::SimpleString(e).into()))
+		result.and_then(|_| db.flush().map_err(|e| UtilError::from(e).into()))
 	}
 
 	/// Feed a state chunk to be processed synchronously.
@@ -618,14 +630,14 @@ impl Drop for Service {
 #[cfg(test)]
 mod tests {
 	use std::sync::Arc;
-	use service::ClientIoMessage;
+	use client::ClientIoMessage;
 	use io::{IoService};
-	use devtools::RandomTempPath;
-	use tests::helpers::get_test_spec;
-	use util::journaldb::Algorithm;
+	use spec::Spec;
+	use journaldb::Algorithm;
 	use error::Error;
 	use snapshot::{ManifestData, RestorationStatus, SnapshotService};
 	use super::*;
+	use tempdir::TempDir;
 
 	struct NoopDBRestore;
 	impl DatabaseRestore for NoopDBRestore {
@@ -637,13 +649,10 @@ mod tests {
 	#[test]
 	fn sends_async_messages() {
 		let service = IoService::<ClientIoMessage>::start().unwrap();
-		let spec = get_test_spec();
+		let spec = Spec::new_test();
 
-		let dir = RandomTempPath::new();
-		let mut dir = dir.as_path().to_owned();
-		let mut client_db = dir.clone();
-		dir.push("snapshot");
-		client_db.push("client");
+		let tempdir = TempDir::new("").unwrap();
+		let dir = tempdir.path().join("snapshot");
 
 		let snapshot_params = ServiceParams {
 			engine: spec.engine.clone(),
@@ -678,11 +687,11 @@ mod tests {
 
 	#[test]
 	fn cannot_finish_with_invalid_chunks() {
-		use util::H256;
-		use util::kvdb::DatabaseConfig;
+		use ethereum_types::H256;
+		use kvdb_rocksdb::DatabaseConfig;
 
-		let spec = get_test_spec();
-		let dir = RandomTempPath::new();
+		let spec = Spec::new_test();
+		let tempdir = TempDir::new("").unwrap();
 
 		let state_hashes: Vec<_> = (0..5).map(|_| H256::random()).collect();
 		let block_hashes: Vec<_> = (0..5).map(|_| H256::random()).collect();
@@ -700,7 +709,7 @@ mod tests {
 				block_hash: H256::default(),
 			},
 			pruning: Algorithm::Archive,
-			db_path: dir.as_path().to_owned(),
+			db_path: tempdir.path().to_owned(),
 			db_config: &db_config,
 			writer: None,
 			genesis: &gb,
diff --git a/ethcore/src/snapshot/tests/helpers.rs b/ethcore/src/snapshot/tests/helpers.rs
index 6429667f584781ccca988393ccddddec8922e1a0..51f417149bf7ac7e09407227b0e0f37cb6a3f5a8 100644
--- a/ethcore/src/snapshot/tests/helpers.rs
+++ b/ethcore/src/snapshot/tests/helpers.rs
@@ -17,26 +17,28 @@
 //! Snapshot test helpers. These are used to build blockchains and state tries
 //! which can be queried before and after a full snapshot/restore cycle.
 
+extern crate trie_standardmap;
+
 use std::sync::Arc;
+use hash::{KECCAK_NULL_RLP};
 
 use account_db::AccountDBMut;
 use basic_account::BasicAccount;
 use blockchain::BlockChain;
-use client::{BlockChainClient, Client};
-use engines::Engine;
+use client::{Client, ChainInfo};
+use engines::EthEngine;
 use snapshot::{StateRebuilder};
 use snapshot::io::{SnapshotReader, PackedWriter, PackedReader};
 
-use devtools::{RandomTempPath, GuardedTempResult};
+use tempdir::TempDir;
 use rand::Rng;
 
-use util::{DBValue, KeyValueDB};
-use util::hash::H256;
-use util::hashdb::HashDB;
-use util::journaldb;
-use util::trie::{Alphabet, StandardMap, SecTrieDBMut, TrieMut, ValueMode};
-use util::trie::{TrieDB, TrieDBMut, Trie};
-use util::sha3::SHA3_NULL_RLP;
+use kvdb::{KeyValueDB, DBValue};
+use ethereum_types::H256;
+use hashdb::HashDB;
+use journaldb;
+use trie::{SecTrieDBMut, TrieMut, TrieDB, TrieDBMut, Trie};
+use self::trie_standardmap::{Alphabet, StandardMap, ValueMode};
 
 // the proportion of accounts we will alter each tick.
 const ACCOUNT_CHURN: f32 = 0.01;
@@ -51,12 +53,11 @@ impl StateProducer {
 	/// Create a new `StateProducer`.
 	pub fn new() -> Self {
 		StateProducer {
-			state_root: SHA3_NULL_RLP,
+			state_root: KECCAK_NULL_RLP,
 			storage_seed: H256::zero(),
 		}
 	}
 
-	#[cfg_attr(feature="dev", allow(let_and_return))]
 	/// Tick the state producer. This alters the state, writing new data into
 	/// the database.
 	pub fn tick<R: Rng>(&mut self, rng: &mut R, db: &mut HashDB) {
@@ -115,7 +116,7 @@ pub fn fill_storage(mut db: AccountDBMut, root: &mut H256, seed: &mut H256) {
 		count: 100,
 	};
 	{
-		let mut trie = if *root == SHA3_NULL_RLP {
+		let mut trie = if *root == KECCAK_NULL_RLP {
 			SecTrieDBMut::new(&mut db, root)
 		} else {
 			SecTrieDBMut::from_existing(&mut db, root).unwrap()
@@ -138,34 +139,32 @@ pub fn compare_dbs(one: &HashDB, two: &HashDB) {
 
 /// Take a snapshot from the given client into a temporary file.
 /// Return a snapshot reader for it.
-pub fn snap(client: &Client) -> GuardedTempResult<Box<SnapshotReader>> {
+pub fn snap(client: &Client) -> (Box<SnapshotReader>, TempDir) {
 	use ids::BlockId;
 
-	let dir = RandomTempPath::new();
-	let writer = PackedWriter::new(dir.as_path()).unwrap();
+	let tempdir = TempDir::new("").unwrap();
+	let path = tempdir.path().join("file");
+	let writer = PackedWriter::new(&path).unwrap();
 	let progress = Default::default();
 
 	let hash = client.chain_info().best_block_hash;
 	client.take_snapshot(writer, BlockId::Hash(hash), &progress).unwrap();
 
-	let reader = PackedReader::new(dir.as_path()).unwrap().unwrap();
+	let reader = PackedReader::new(&path).unwrap().unwrap();
 
-	GuardedTempResult {
-		result: Some(Box::new(reader)),
-		_temp: dir,
-	}
+	(Box::new(reader), tempdir)
 }
 
 /// Restore a snapshot into a given database. This will read chunks from the given reader
 /// write into the given database.
 pub fn restore(
 	db: Arc<KeyValueDB>,
-	engine: &Engine,
+	engine: &EthEngine,
 	reader: &SnapshotReader,
 	genesis: &[u8],
 ) -> Result<(), ::error::Error> {
 	use std::sync::atomic::AtomicBool;
-	use util::snappy;
+	use snappy;
 
 	let flag = AtomicBool::new(true);
 	let components = engine.snapshot_components().unwrap();
diff --git a/ethcore/src/snapshot/tests/proof_of_authority.rs b/ethcore/src/snapshot/tests/proof_of_authority.rs
index 7c44ec20a3af75cef2e9fe6b121bd44c7ff19401..101de5c586cbf6e4210d06d2d5bd758da82480c7 100644
--- a/ethcore/src/snapshot/tests/proof_of_authority.rs
+++ b/ethcore/src/snapshot/tests/proof_of_authority.rs
@@ -21,31 +21,32 @@ use std::sync::Arc;
 use std::str::FromStr;
 
 use account_provider::AccountProvider;
-use client::{Client, BlockChainClient};
+use client::{Client, BlockChainClient, ChainInfo};
 use ethkey::Secret;
-use futures::Future;
-use native_contracts::test_contracts::ValidatorSet;
 use snapshot::tests::helpers as snapshot_helpers;
 use spec::Spec;
 use tests::helpers;
 use transaction::{Transaction, Action, SignedTransaction};
+use tempdir::TempDir;
 
-use util::{Address, Hashable};
-use util::kvdb;
+use ethereum_types::Address;
+use kvdb_memorydb;
+
+use_contract!(test_validator_set, "ValidatorSet", "res/contracts/test_validator_set.json");
 
 const PASS: &'static str = "";
 const TRANSITION_BLOCK_1: usize = 2; // block at which the contract becomes activated.
 const TRANSITION_BLOCK_2: usize = 10; // block at which the second contract activates.
 
 macro_rules! secret {
-	($e: expr) => { Secret::from_slice(&$e.sha3()) }
+	($e: expr) => { Secret::from_slice(&$crate::hash::keccak($e)) }
 }
 
 lazy_static! {
 	// contract addresses.
 	static ref CONTRACT_ADDR_1: Address = Address::from_str("0000000000000000000000000000000000000005").unwrap();
 	static ref CONTRACT_ADDR_2: Address = Address::from_str("0000000000000000000000000000000000000006").unwrap();
-	// secret: `sha3(1)`, and initial validator.
+	// secret: `keccak(1)`, and initial validator.
 	static ref RICH_ADDR: Address = Address::from_str("7d577a597b2742b498cb5cf0c26cdcd726d39e6e").unwrap();
 	// rich address' secret.
 	static ref RICH_SECRET: Secret = secret!("1");
@@ -53,13 +54,14 @@ lazy_static! {
 
 
 /// Contract code used here: https://gist.github.com/anonymous/2a43783647e0f0dfcc359bd6fd81d6d9
-/// Account with secrets "1".sha3() is initially the validator.
+/// Account with secrets keccak("1") is initially the validator.
 /// Transitions to the contract at block 2, initially same validator set.
 /// Create a new Spec with AuthorityRound which uses a contract at address 5 to determine the current validators using `getValidators`.
-/// `native_contracts::test_contracts::ValidatorSet` provides a native wrapper for the ABi.
+/// `test_validator_set::ValidatorSet` provides a native wrapper for the ABi.
 fn spec_fixed_to_contract() -> Spec {
 	let data = include_bytes!("test_validator_contract.json");
-	Spec::load(&::std::env::temp_dir(), &data[..]).unwrap()
+	let tempdir = TempDir::new("").unwrap();
+	Spec::load(&tempdir.path(), &data[..]).unwrap()
 }
 
 // creates an account provider, filling it with accounts from all the given
@@ -93,7 +95,7 @@ fn make_chain(accounts: Arc<AccountProvider>, blocks_beyond: usize, transitions:
 	let mut cur_signers = vec![*RICH_ADDR];
 	{
 		let engine = client.engine();
-		engine.register_client(Arc::downgrade(&client));
+		engine.register_client(Arc::downgrade(&client) as _);
 	}
 
 	{
@@ -136,8 +138,7 @@ fn make_chain(accounts: Arc<AccountProvider>, blocks_beyond: usize, transitions:
 			vec![transaction]
 		};
 
-		let contract_1 = ValidatorSet::new(*CONTRACT_ADDR_1);
-		let contract_2 = ValidatorSet::new(*CONTRACT_ADDR_2);
+		let contract = test_validator_set::ValidatorSet::default();
 
 		// apply all transitions.
 		for transition in transitions {
@@ -160,34 +161,24 @@ fn make_chain(accounts: Arc<AccountProvider>, blocks_beyond: usize, transitions:
 
 			let pending = if manual {
 				trace!(target: "snapshot", "applying set transition at block #{}", num);
-				let contract = match num >= TRANSITION_BLOCK_2 {
-					true => &contract_2,
-					false => &contract_1,
+				let address = match num >= TRANSITION_BLOCK_2 {
+					true => &CONTRACT_ADDR_2 as &Address,
+					false => &CONTRACT_ADDR_1 as &Address,
 				};
 
-				let mut pending = Vec::new();
-				{
-					let mut exec = |addr, data| {
-						let mut nonce = nonce.borrow_mut();
-						let transaction = Transaction {
-							nonce: *nonce,
-							gas_price: 0.into(),
-							gas: 1_000_000.into(),
-							action: Action::Call(addr),
-							value: 0.into(),
-							data: data,
-						}.sign(&*RICH_SECRET, client.signing_chain_id());
-
-						pending.push(transaction);
-
-						*nonce = *nonce + 1.into();
-						Ok(Vec::new())
-					};
-
-					contract.set_validators(&mut exec, new_set.clone()).wait().unwrap();
-				}
-
-				pending
+				let data = contract.functions().set_validators().input(new_set.clone());
+				let mut nonce = nonce.borrow_mut();
+				let transaction = Transaction {
+					nonce: *nonce,
+					gas_price: 0.into(),
+					gas: 1_000_000.into(),
+					action: Action::Call(*address),
+					value: 0.into(),
+					data,
+				}.sign(&*RICH_SECRET, client.signing_chain_id());
+
+				*nonce = *nonce + 1.into();
+				vec![transaction]
 			} else {
 				make_useless_transactions()
 			};
@@ -236,14 +227,14 @@ fn fixed_to_contract_only() {
 	// 6, 7, 8 prove finality for transition at 6.
 	// 3 beyond gets us to 11.
 	assert_eq!(client.chain_info().best_block_number, 11);
-	let reader = snapshot_helpers::snap(&*client);
+	let (reader, _tempdir) = snapshot_helpers::snap(&*client);
 
-	let new_db = kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0));
+	let new_db = kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0));
 	let spec = spec_fixed_to_contract();
 
 	// ensure fresh engine's step matches.
 	for _ in 0..11 { spec.engine.step() }
-	snapshot_helpers::restore(Arc::new(new_db), &*spec.engine, &**reader, &spec.genesis_block()).unwrap();
+	snapshot_helpers::restore(Arc::new(new_db), &*spec.engine, &*reader, &spec.genesis_block()).unwrap();
 }
 
 #[test]
@@ -269,10 +260,10 @@ fn fixed_to_contract_to_contract() {
 	]);
 
 	assert_eq!(client.chain_info().best_block_number, 16);
-	let reader = snapshot_helpers::snap(&*client);
-	let new_db = kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0));
+	let (reader, _tempdir) = snapshot_helpers::snap(&*client);
+	let new_db = kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0));
 	let spec = spec_fixed_to_contract();
 
 	for _ in 0..16 { spec.engine.step() }
-	snapshot_helpers::restore(Arc::new(new_db), &*spec.engine, &**reader, &spec.genesis_block()).unwrap();
+	snapshot_helpers::restore(Arc::new(new_db), &*spec.engine, &*reader, &spec.genesis_block()).unwrap();
 }
diff --git a/ethcore/src/snapshot/tests/proof_of_work.rs b/ethcore/src/snapshot/tests/proof_of_work.rs
index a6c0166f53c2d9a3659e659618f65d216f94cdb0..e41b61e6e068d9ece97dc6f817aa22c6fae8861c 100644
--- a/ethcore/src/snapshot/tests/proof_of_work.rs
+++ b/ethcore/src/snapshot/tests/proof_of_work.rs
@@ -16,40 +16,40 @@
 
 //! PoW block chunker and rebuilder tests.
 
-use devtools::RandomTempPath;
+use std::sync::Arc;
+use std::sync::atomic::AtomicBool;
+use tempdir::TempDir;
 use error::Error;
 
-use blockchain::generator::{ChainGenerator, ChainIterator, BlockFinalizer};
+use blockchain::generator::{BlockGenerator, BlockBuilder};
 use blockchain::BlockChain;
 use snapshot::{chunk_secondary, Error as SnapshotError, Progress, SnapshotComponents};
 use snapshot::io::{PackedReader, PackedWriter, SnapshotReader, SnapshotWriter};
 
-use util::{Mutex, snappy};
-use util::kvdb::{self, KeyValueDB, DBTransaction};
-
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
+use parking_lot::Mutex;
+use snappy;
+use kvdb::{KeyValueDB, DBTransaction};
+use kvdb_memorydb;
 
 const SNAPSHOT_MODE: ::snapshot::PowSnapshot = ::snapshot::PowSnapshot { blocks: 30000, max_restore_blocks: 30000 };
 
 fn chunk_and_restore(amount: u64) {
-	let mut canon_chain = ChainGenerator::default();
-	let mut finalizer = BlockFinalizer::default();
-	let genesis = canon_chain.generate(&mut finalizer).unwrap();
+	let genesis = BlockBuilder::genesis();
+	let rest = genesis.add_blocks(amount as usize);
+	let generator = BlockGenerator::new(vec![rest]);
+	let genesis = genesis.last();
 
-	let engine = Arc::new(::engines::NullEngine::default());
-	let new_path = RandomTempPath::create_dir();
-	let mut snapshot_path = new_path.as_path().to_owned();
-	snapshot_path.push("SNAP");
+	let engine = ::spec::Spec::new_test().engine;
+	let tempdir = TempDir::new("").unwrap();
+	let snapshot_path = tempdir.path().join("SNAP");
 
-	let old_db = Arc::new(kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)));
-	let bc = BlockChain::new(Default::default(), &genesis, old_db.clone());
+	let old_db = Arc::new(kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0)));
+	let bc = BlockChain::new(Default::default(), &genesis.encoded(), old_db.clone());
 
 	// build the blockchain.
 	let mut batch = DBTransaction::new();
-	for _ in 0..amount {
-		let block = canon_chain.generate(&mut finalizer).unwrap();
-		bc.insert_block(&mut batch, &block, vec![]);
+	for block in generator {
+		bc.insert_block(&mut batch, &block.encoded(), vec![]);
 		bc.commit();
 	}
 
@@ -71,7 +71,7 @@ fn chunk_and_restore(amount: u64) {
 		version: 2,
 		state_hashes: Vec::new(),
 		block_hashes: block_hashes,
-		state_root: ::util::sha3::SHA3_NULL_RLP,
+		state_root: ::hash::KECCAK_NULL_RLP,
 		block_number: amount,
 		block_hash: best_hash,
 	};
@@ -79,8 +79,8 @@ fn chunk_and_restore(amount: u64) {
 	writer.into_inner().finish(manifest.clone()).unwrap();
 
 	// restore it.
-	let new_db = Arc::new(kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)));
-	let new_chain = BlockChain::new(Default::default(), &genesis, new_db.clone());
+	let new_db = Arc::new(kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0)));
+	let new_chain = BlockChain::new(Default::default(), &genesis.encoded(), new_db.clone());
 	let mut rebuilder = SNAPSHOT_MODE.rebuilder(new_chain, new_db.clone(), &manifest).unwrap();
 
 	let reader = PackedReader::new(&snapshot_path).unwrap().unwrap();
@@ -95,20 +95,24 @@ fn chunk_and_restore(amount: u64) {
 	drop(rebuilder);
 
 	// and test it.
-	let new_chain = BlockChain::new(Default::default(), &genesis, new_db);
+	let new_chain = BlockChain::new(Default::default(), &genesis.encoded(), new_db);
 	assert_eq!(new_chain.best_block_hash(), best_hash);
 }
 
 #[test]
-fn chunk_and_restore_500() { chunk_and_restore(500) }
+fn chunk_and_restore_500() {
+	chunk_and_restore(500)
+}
 
 #[test]
-fn chunk_and_restore_40k() { chunk_and_restore(40000) }
+fn chunk_and_restore_4k() {
+	chunk_and_restore(4000)
+}
 
 #[test]
 fn checks_flag() {
 	use rlp::RlpStream;
-	use util::H256;
+	use ethereum_types::H256;
 
 	let mut stream = RlpStream::new_list(5);
 
@@ -118,23 +122,18 @@ fn checks_flag() {
 
 	stream.append_empty_data().append_empty_data();
 
-	let genesis = {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		canon_chain.generate(&mut finalizer).unwrap()
-	};
-
+	let genesis = BlockBuilder::genesis();
 	let chunk = stream.out();
 
-	let db = Arc::new(kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)));
-	let engine = Arc::new(::engines::NullEngine::default());
-	let chain = BlockChain::new(Default::default(), &genesis, db.clone());
+	let db = Arc::new(kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0)));
+	let engine = ::spec::Spec::new_test().engine;
+	let chain = BlockChain::new(Default::default(), &genesis.last().encoded(), db.clone());
 
 	let manifest = ::snapshot::ManifestData {
 		version: 2,
 		state_hashes: Vec::new(),
 		block_hashes: Vec::new(),
-		state_root: ::util::sha3::SHA3_NULL_RLP,
+		state_root: ::hash::KECCAK_NULL_RLP,
 		block_number: 102,
 		block_hash: H256::default(),
 	};
diff --git a/ethcore/src/snapshot/tests/service.rs b/ethcore/src/snapshot/tests/service.rs
index 64a8407aa94ac44a38a349872a8ee562a9e108dc..52b4b3cc979f7c9d77035d46c9a3b59fefb56cb4 100644
--- a/ethcore/src/snapshot/tests/service.rs
+++ b/ethcore/src/snapshot/tests/service.rs
@@ -18,16 +18,16 @@
 
 use std::sync::Arc;
 
-use client::{BlockChainClient, Client};
+use tempdir::TempDir;
+use client::{Client, BlockInfo};
 use ids::BlockId;
 use snapshot::service::{Service, ServiceParams};
 use snapshot::{self, ManifestData, SnapshotService};
 use spec::Spec;
 use tests::helpers::generate_dummy_client_with_spec_and_data;
 
-use devtools::RandomTempPath;
 use io::IoChannel;
-use util::kvdb::{Database, DatabaseConfig};
+use kvdb_rocksdb::{Database, DatabaseConfig};
 
 struct NoopDBRestore;
 
@@ -46,12 +46,9 @@ fn restored_is_equivalent() {
 
 	let client = generate_dummy_client_with_spec_and_data(Spec::new_null, NUM_BLOCKS, TX_PER, &gas_prices);
 
-	let path = RandomTempPath::create_dir();
-	let mut path = path.as_path().clone();
-	let mut client_db = path.clone();
-
-	client_db.push("client_db");
-	path.push("snapshot");
+	let tempdir = TempDir::new("").unwrap();
+	let client_db = tempdir.path().join("client_db");
+	let path = tempdir.path().join("snapshot");
 
 	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
 	let client_db = Database::open(&db_config, client_db.to_str().unwrap()).unwrap();
@@ -69,7 +66,7 @@ fn restored_is_equivalent() {
 		engine: spec.engine.clone(),
 		genesis_block: spec.genesis_block(),
 		db_config: db_config,
-		pruning: ::util::journaldb::Algorithm::Archive,
+		pruning: ::journaldb::Algorithm::Archive,
 		channel: IoChannel::disconnected(),
 		snapshot_root: path,
 		db_restore: client2.clone(),
@@ -106,20 +103,19 @@ fn restored_is_equivalent() {
 #[test]
 fn guards_delete_folders() {
 	let spec = Spec::new_null();
-	let path = RandomTempPath::create_dir();
-	let mut path = path.as_path().clone();
+	let tempdir = TempDir::new("").unwrap();
 	let service_params = ServiceParams {
 		engine: spec.engine.clone(),
 		genesis_block: spec.genesis_block(),
 		db_config: DatabaseConfig::with_columns(::db::NUM_COLUMNS),
-		pruning: ::util::journaldb::Algorithm::Archive,
+		pruning: ::journaldb::Algorithm::Archive,
 		channel: IoChannel::disconnected(),
-		snapshot_root: path.clone(),
+		snapshot_root: tempdir.path().to_owned(),
 		db_restore: Arc::new(NoopDBRestore),
 	};
 
 	let service = Service::new(service_params).unwrap();
-	path.push("restoration");
+	let path = tempdir.path().join("restoration");
 
 	let manifest = ManifestData {
 		version: 2,
diff --git a/ethcore/src/snapshot/tests/state.rs b/ethcore/src/snapshot/tests/state.rs
index 744b86577f9c79c0ed6067b61b7a92379be7569d..f61c799933cef9771acb75c6aa8a7e227350a51d 100644
--- a/ethcore/src/snapshot/tests/state.rs
+++ b/ethcore/src/snapshot/tests/state.rs
@@ -16,6 +16,10 @@
 
 //! State snapshotting tests.
 
+use std::sync::Arc;
+use std::sync::atomic::AtomicBool;
+use hash::{KECCAK_NULL_RLP, keccak};
+
 use basic_account::BasicAccount;
 use snapshot::account;
 use snapshot::{chunk_state, Error as SnapshotError, Progress, StateRebuilder};
@@ -25,17 +29,12 @@ use super::helpers::{compare_dbs, StateProducer};
 use error::Error;
 
 use rand::{XorShiftRng, SeedableRng};
-use util::hash::H256;
-use util::journaldb::{self, Algorithm};
-use util::kvdb::{Database, DatabaseConfig};
-use util::memorydb::MemoryDB;
-use util::Mutex;
-use devtools::RandomTempPath;
-
-use util::sha3::SHA3_NULL_RLP;
-
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
+use ethereum_types::H256;
+use journaldb::{self, Algorithm};
+use kvdb_rocksdb::{Database, DatabaseConfig};
+use memorydb::MemoryDB;
+use parking_lot::Mutex;
+use tempdir::TempDir;
 
 #[test]
 fn snap_and_restore() {
@@ -48,9 +47,8 @@ fn snap_and_restore() {
 		producer.tick(&mut rng, &mut old_db);
 	}
 
-	let snap_dir = RandomTempPath::create_dir();
-	let mut snap_file = snap_dir.as_path().to_owned();
-	snap_file.push("SNAP");
+	let tempdir = TempDir::new("").unwrap();
+	let snap_file = tempdir.path().join("SNAP");
 
 	let state_root = producer.state_root();
 	let writer = Mutex::new(PackedWriter::new(&snap_file).unwrap());
@@ -66,8 +64,7 @@ fn snap_and_restore() {
 		block_hash: H256::default(),
 	}).unwrap();
 
-	let mut db_path = snap_dir.as_path().to_owned();
-	db_path.push("db");
+	let db_path = tempdir.path().join("db");
 	let db = {
 		let new_db = Arc::new(Database::open(&db_cfg, &db_path.to_string_lossy()).unwrap());
 		let mut rebuilder = StateRebuilder::new(new_db.clone(), Algorithm::OverlayRecent);
@@ -77,7 +74,7 @@ fn snap_and_restore() {
 
 		for chunk_hash in &reader.manifest().state_hashes {
 			let raw = reader.chunk(*chunk_hash).unwrap();
-			let chunk = ::util::snappy::decompress(&raw).unwrap();
+			let chunk = ::snappy::decompress(&raw).unwrap();
 
 			rebuilder.feed(&chunk, &flag).unwrap();
 		}
@@ -98,7 +95,8 @@ fn snap_and_restore() {
 fn get_code_from_prev_chunk() {
 	use std::collections::HashSet;
 	use rlp::RlpStream;
-	use util::{HashDB, H256, U256, Hashable};
+	use ethereum_types::{H256, U256};
+	use hashdb::HashDB;
 
 	use account_db::{AccountDBMut, AccountDB};
 
@@ -107,8 +105,8 @@ fn get_code_from_prev_chunk() {
 	let mut acc_stream = RlpStream::new_list(4);
 	acc_stream.append(&U256::default())
 		.append(&U256::default())
-		.append(&SHA3_NULL_RLP)
-		.append(&code.sha3());
+		.append(&KECCAK_NULL_RLP)
+		.append(&keccak(code));
 
 	let (h1, h2) = (H256::random(), H256::random());
 
@@ -131,9 +129,9 @@ fn get_code_from_prev_chunk() {
 	let chunk1 = make_chunk(acc.clone(), h1);
 	let chunk2 = make_chunk(acc, h2);
 
-	let db_path = RandomTempPath::create_dir();
+	let tempdir = TempDir::new("").unwrap();
 	let db_cfg = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
-	let new_db = Arc::new(Database::open(&db_cfg, &db_path.to_string_lossy()).unwrap());
+	let new_db = Arc::new(Database::open(&db_cfg, tempdir.path().to_str().unwrap()).unwrap());
 
 	{
 		let mut rebuilder = StateRebuilder::new(new_db.clone(), Algorithm::OverlayRecent);
@@ -160,9 +158,8 @@ fn checks_flag() {
 		producer.tick(&mut rng, &mut old_db);
 	}
 
-	let snap_dir = RandomTempPath::create_dir();
-	let mut snap_file = snap_dir.as_path().to_owned();
-	snap_file.push("SNAP");
+	let tempdir = TempDir::new("").unwrap();
+	let snap_file = tempdir.path().join("SNAP");
 
 	let state_root = producer.state_root();
 	let writer = Mutex::new(PackedWriter::new(&snap_file).unwrap());
@@ -178,8 +175,8 @@ fn checks_flag() {
 		block_hash: H256::default(),
 	}).unwrap();
 
-	let mut db_path = snap_dir.as_path().to_owned();
-	db_path.push("db");
+	let tempdir = TempDir::new("").unwrap();
+	let db_path = tempdir.path().join("db");
 	{
 		let new_db = Arc::new(Database::open(&db_cfg, &db_path.to_string_lossy()).unwrap());
 		let mut rebuilder = StateRebuilder::new(new_db.clone(), Algorithm::OverlayRecent);
@@ -189,7 +186,7 @@ fn checks_flag() {
 
 		for chunk_hash in &reader.manifest().state_hashes {
 			let raw = reader.chunk(*chunk_hash).unwrap();
-			let chunk = ::util::snappy::decompress(&raw).unwrap();
+			let chunk = ::snappy::decompress(&raw).unwrap();
 
 			match rebuilder.feed(&chunk, &flag) {
 				Err(Error::Snapshot(SnapshotError::RestorationAborted)) => {},
diff --git a/ethcore/src/snapshot/snapshot_service_trait.rs b/ethcore/src/snapshot/traits.rs
similarity index 94%
rename from ethcore/src/snapshot/snapshot_service_trait.rs
rename to ethcore/src/snapshot/traits.rs
index 9df3662507030c6be62cafbadf79378e3fe5a26d..a81c14f08d58937d78b2815d2d7aad620ce99d94 100644
--- a/ethcore/src/snapshot/snapshot_service_trait.rs
+++ b/ethcore/src/snapshot/traits.rs
@@ -15,14 +15,13 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::{ManifestData, RestorationStatus};
-use util::{Bytes, H256};
-use ipc::IpcConfig;
+use ethereum_types::H256;
+use bytes::Bytes;
 
 /// The interface for a snapshot network service.
 /// This handles:
 ///    - restoration of snapshots to temporary databases.
 ///    - responding to queries for snapshot manifests and chunks
-#[ipc(client_ident="RemoteSnapshotService")]
 pub trait SnapshotService : Sync + Send {
 	/// Query the most recent manifest data.
 	fn manifest(&self) -> Option<ManifestData>;
@@ -53,5 +52,3 @@ pub trait SnapshotService : Sync + Send {
 	/// no-op if currently restoring.
 	fn restore_block_chunk(&self, hash: H256, chunk: Bytes);
 }
-
-impl IpcConfig for SnapshotService { }
diff --git a/ethcore/src/snapshot/watcher.rs b/ethcore/src/snapshot/watcher.rs
index cff9be18cdc548f32f15e207aa42becdbd84bb5d..841fa1982acdc8488994b4936dea6633a816647a 100644
--- a/ethcore/src/snapshot/watcher.rs
+++ b/ethcore/src/snapshot/watcher.rs
@@ -16,13 +16,13 @@
 
 //! Watcher for snapshot-related chain events.
 
-use util::Mutex;
-use client::{BlockChainClient, Client, ChainNotify};
+use parking_lot::Mutex;
+use client::{BlockInfo, Client, ChainNotify, ClientIoMessage};
 use ids::BlockId;
-use service::ClientIoMessage;
 
 use io::IoChannel;
-use util::{H256, Bytes};
+use ethereum_types::H256;
+use bytes::Bytes;
 
 use std::sync::Arc;
 
@@ -133,7 +133,7 @@ mod tests {
 
 	use client::ChainNotify;
 
-	use util::{H256, U256};
+	use ethereum_types::{H256, U256};
 
 	use std::collections::HashMap;
 
diff --git a/ethcore/src/spec/genesis.rs b/ethcore/src/spec/genesis.rs
index b7db9aa90eaac72ec70237ff4bc43a83518fa25d..937d7ed8737460747973003794fa4f5f23de6c66 100644
--- a/ethcore/src/spec/genesis.rs
+++ b/ethcore/src/spec/genesis.rs
@@ -14,10 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::{Address, H256, U256};
-use util::sha3::SHA3_NULL_RLP;
+use ethereum_types::{H256, U256, Address};
 use ethjson;
-use super::seal::Seal;
+use hash::KECCAK_NULL_RLP;
+use spec::seal::Seal;
 
 /// Genesis components.
 pub struct Genesis {
@@ -54,8 +54,8 @@ impl From<ethjson::spec::Genesis> for Genesis {
 			timestamp: g.timestamp.map_or(0, Into::into),
 			parent_hash: g.parent_hash.map_or_else(H256::zero, Into::into),
 			gas_limit: g.gas_limit.into(),
-			transactions_root: g.transactions_root.map_or_else(|| SHA3_NULL_RLP.clone(), Into::into),
-			receipts_root: g.receipts_root.map_or_else(|| SHA3_NULL_RLP.clone(), Into::into),
+			transactions_root: g.transactions_root.map_or_else(|| KECCAK_NULL_RLP.clone(), Into::into),
+			receipts_root: g.receipts_root.map_or_else(|| KECCAK_NULL_RLP.clone(), Into::into),
 			state_root: g.state_root.map(Into::into),
 			gas_used: g.gas_used.map_or_else(U256::zero, Into::into),
 			extra_data: g.extra_data.map_or_else(Vec::new, Into::into),
diff --git a/ethcore/src/spec/mod.rs b/ethcore/src/spec/mod.rs
index 2658858a50badc51ea25119c827ab3e932d0f5f2..fb60e1cc858efa28746b190b9f025befd95c5131 100644
--- a/ethcore/src/spec/mod.rs
+++ b/ethcore/src/spec/mod.rs
@@ -18,7 +18,7 @@
 
 mod genesis;
 mod seal;
-pub mod spec;
+mod spec;
 
-pub use self::spec::*;
 pub use self::genesis::Genesis;
+pub use self::spec::{Spec, SpecHardcodedSync, SpecParams, CommonParams, OptimizeFor};
diff --git a/ethcore/src/spec/seal.rs b/ethcore/src/spec/seal.rs
index a1e929604e3105cdc56858bcfa125d9901737baf..2a07e69c43f37b6eb0ff7bef44a32a422bceb9cc 100644
--- a/ethcore/src/spec/seal.rs
+++ b/ethcore/src/spec/seal.rs
@@ -16,8 +16,8 @@
 
 //! Spec seal.
 
-use rlp::*;
-use util::hash::{H64, H256, H520};
+use rlp::RlpStream;
+use ethereum_types::{H64, H256, H520};
 use ethjson;
 
 /// Classic ethereum seal.
diff --git a/ethcore/src/spec/spec.rs b/ethcore/src/spec/spec.rs
index 4d10a90adf3a7270ee87cd0da2e550c482d1b04d..f0b3b9203bb26a7d41f975aad411af9714c3f5b7 100644
--- a/ethcore/src/spec/spec.rs
+++ b/ethcore/src/spec/spec.rs
@@ -16,30 +16,42 @@
 
 //! Parameters for a block chain.
 
-use std::io::Read;
 use std::collections::BTreeMap;
+use std::io::Read;
 use std::path::Path;
 use std::sync::Arc;
-use rustc_hex::FromHex;
-use super::genesis::Genesis;
-use super::seal::Generic as GenericSeal;
+
+use bytes::Bytes;
+use ethereum_types::{H256, Bloom, U256, Address};
+use ethjson;
+use hash::{KECCAK_NULL_RLP, keccak};
+use memorydb::MemoryDB;
+use parking_lot::RwLock;
+use rlp::{Rlp, RlpStream};
+use rustc_hex::{FromHex, ToHex};
+use vm::{EnvInfo, CallType, ActionValue, ActionParams, ParamsType};
 
 use builtin::Builtin;
-use engines::{Engine, NullEngine, InstantSeal, BasicAuthority, AuthorityRound, Tendermint, DEFAULT_BLOCKHASH_CONTRACT};
-use vm::{EnvInfo, CallType, ActionValue, ActionParams};
+use encoded;
+use engines::{EthEngine, NullEngine, InstantSeal, BasicAuthority, AuthorityRound, Tendermint, DEFAULT_BLOCKHASH_CONTRACT};
 use error::Error;
-use ethereum;
-use ethjson;
 use executive::Executive;
 use factory::Factories;
 use header::{BlockNumber, Header};
-use pod_state::*;
-use rlp::{Rlp, RlpStream};
-use state_db::StateDB;
-use state::{Backend, State, Substate};
+use machine::EthereumMachine;
+use pod_state::PodState;
+use spec::Genesis;
+use spec::seal::Generic as GenericSeal;
 use state::backend::Basic as BasicBackend;
+use state::{Backend, State, Substate};
 use trace::{NoopTracer, NoopVMTracer};
-use util::*;
+
+pub use ethash::OptimizeFor;
+
+// helper for formatting errors.
+fn fmt_err<F: ::std::fmt::Display>(f: F) -> String {
+	format!("Spec json is invalid: {}", f)
+}
 
 /// Parameters common to ethereum-like blockchains.
 /// NOTE: when adding bugfix hard-fork parameters,
@@ -66,10 +78,14 @@ pub struct CommonParams {
 	pub fork_block: Option<(BlockNumber, H256)>,
 	/// Number of first block where EIP-98 rules begin.
 	pub eip98_transition: BlockNumber,
+	/// Number of first block where EIP-658 rules begin.
+	pub eip658_transition: BlockNumber,
 	/// Number of first block where EIP-155 rules begin.
 	pub eip155_transition: BlockNumber,
 	/// Validate block receipts root.
 	pub validate_receipts_transition: BlockNumber,
+	/// Validate transaction chain id.
+	pub validate_chain_id_transition: BlockNumber,
 	/// Number of first block where EIP-86 (Metropolis) rules begin.
 	pub eip86_transition: BlockNumber,
 	/// Number of first block where EIP-140 (Metropolis: REVERT opcode) rules begin.
@@ -82,7 +98,8 @@ pub struct CommonParams {
 	pub eip210_contract_code: Bytes,
 	/// Gas allocated for EIP-210 blockhash update.
 	pub eip210_contract_gas: U256,
-	/// Number of first block where EIP-211 (Metropolis: RETURNDATASIZE/RETURNDATACOPY) rules begin.
+	/// Number of first block where EIP-211 (Metropolis: RETURNDATASIZE/RETURNDATACOPY) rules
+	/// begin.
 	pub eip211_transition: BlockNumber,
 	/// Number of first block where EIP-214 rules begin.
 	pub eip214_transition: BlockNumber,
@@ -92,34 +109,47 @@ pub struct CommonParams {
 	pub nonce_cap_increment: u64,
 	/// Enable dust cleanup for contracts.
 	pub remove_dust_contracts: bool,
-	/// Wasm support
-	pub wasm: bool,
+	/// Wasm activation blocknumber, if any disabled initially.
+	pub wasm_activation_transition: BlockNumber,
 	/// Gas limit bound divisor (how much gas limit can change per block)
 	pub gas_limit_bound_divisor: U256,
-	/// Block reward in wei.
-	pub block_reward: U256,
 	/// Registrar contract address.
 	pub registrar: Address,
 	/// Node permission managing contract address.
 	pub node_permission_contract: Option<Address>,
+	/// Maximum contract code size that can be deployed.
+	pub max_code_size: u64,
+	/// Number of first block where max code size limit is active.
+	pub max_code_size_transition: BlockNumber,
+	/// Transaction permission managing contract address.
+	pub transaction_permission_contract: Option<Address>,
 }
 
 impl CommonParams {
 	/// Schedule for an EVM in the post-EIP-150-era of the Ethereum main net.
 	pub fn schedule(&self, block_number: u64) -> ::vm::Schedule {
-		let mut schedule = ::vm::Schedule::new_post_eip150(usize::max_value(), true, true, true);
+		let mut schedule = ::vm::Schedule::new_post_eip150(self.max_code_size(block_number) as _, true, true, true);
 		self.update_schedule(block_number, &mut schedule);
 		schedule
 	}
 
+	/// Returns max code size at given block.
+	pub fn max_code_size(&self, block_number: u64) -> u64 {
+		if block_number >= self.max_code_size_transition {
+			self.max_code_size
+		} else {
+			u64::max_value()
+		}
+	}
+
 	/// Apply common spec config parameters to the schedule.
- 	pub fn update_schedule(&self, block_number: u64, schedule: &mut ::vm::Schedule) {
+	pub fn update_schedule(&self, block_number: u64, schedule: &mut ::vm::Schedule) {
 		schedule.have_create2 = block_number >= self.eip86_transition;
 		schedule.have_revert = block_number >= self.eip140_transition;
 		schedule.have_static_call = block_number >= self.eip214_transition;
 		schedule.have_return_data = block_number >= self.eip211_transition;
 		if block_number >= self.eip210_transition {
-			schedule.blockhash_gas = 350;
+			schedule.blockhash_gas = 800;
 		}
 		if block_number >= self.dust_protection_transition {
 			schedule.kill_dust = match self.remove_dust_contracts {
@@ -127,19 +157,18 @@ impl CommonParams {
 				false => ::vm::CleanDustMode::BasicOnly,
 			};
 		}
+		if block_number >= self.wasm_activation_transition {
+			schedule.wasm = Some(Default::default());
+		}
 	}
 
 	/// Whether these params contain any bug-fix hard forks.
 	pub fn contains_bugfix_hard_fork(&self) -> bool {
-		self.eip98_transition != 0 &&
-			self.eip155_transition != 0 &&
-			self.validate_receipts_transition != 0 &&
-			self.eip86_transition != 0 &&
-			self.eip140_transition != 0 &&
-			self.eip210_transition != 0 &&
-			self.eip211_transition != 0 &&
-			self.eip214_transition != 0 &&
-			self.dust_protection_transition != 0
+		self.eip98_transition != 0 && self.eip155_transition != 0 &&
+			self.validate_receipts_transition != 0 && self.eip86_transition != 0 &&
+			self.eip140_transition != 0 && self.eip210_transition != 0 &&
+			self.eip211_transition != 0 && self.eip214_transition != 0 &&
+			self.validate_chain_id_transition != 0 && self.dust_protection_transition != 0
 	}
 }
 
@@ -149,42 +178,121 @@ impl From<ethjson::spec::Params> for CommonParams {
 			account_start_nonce: p.account_start_nonce.map_or_else(U256::zero, Into::into),
 			maximum_extra_data_size: p.maximum_extra_data_size.into(),
 			network_id: p.network_id.into(),
-			chain_id: if let Some(n) = p.chain_id { n.into() } else { p.network_id.into() },
+			chain_id: if let Some(n) = p.chain_id {
+				n.into()
+			} else {
+				p.network_id.into()
+			},
 			subprotocol_name: p.subprotocol_name.unwrap_or_else(|| "eth".to_owned()),
 			min_gas_limit: p.min_gas_limit.into(),
-			fork_block: if let (Some(n), Some(h)) = (p.fork_block, p.fork_hash) { Some((n.into(), h.into())) } else { None },
+			fork_block: if let (Some(n), Some(h)) = (p.fork_block, p.fork_hash) {
+				Some((n.into(), h.into()))
+			} else {
+				None
+			},
 			eip98_transition: p.eip98_transition.map_or(0, Into::into),
 			eip155_transition: p.eip155_transition.map_or(0, Into::into),
 			validate_receipts_transition: p.validate_receipts_transition.map_or(0, Into::into),
-			eip86_transition: p.eip86_transition.map_or(BlockNumber::max_value(), Into::into),
-			eip140_transition: p.eip140_transition.map_or(BlockNumber::max_value(), Into::into),
-			eip210_transition: p.eip210_transition.map_or(BlockNumber::max_value(), Into::into),
+			validate_chain_id_transition: p.validate_chain_id_transition.map_or(0, Into::into),
+			eip86_transition: p.eip86_transition.map_or(
+				BlockNumber::max_value(),
+				Into::into,
+			),
+			eip140_transition: p.eip140_transition.map_or(
+				BlockNumber::max_value(),
+				Into::into,
+			),
+			eip210_transition: p.eip210_transition.map_or(
+				BlockNumber::max_value(),
+				Into::into,
+			),
 			eip210_contract_address: p.eip210_contract_address.map_or(0xf0.into(), Into::into),
 			eip210_contract_code: p.eip210_contract_code.map_or_else(
-				|| DEFAULT_BLOCKHASH_CONTRACT.from_hex().expect("Default BLOCKHASH contract is valid"),
-				Into::into),
+				|| {
+					DEFAULT_BLOCKHASH_CONTRACT.from_hex().expect(
+						"Default BLOCKHASH contract is valid",
+					)
+				},
+				Into::into,
+			),
 			eip210_contract_gas: p.eip210_contract_gas.map_or(1000000.into(), Into::into),
-			eip211_transition: p.eip211_transition.map_or(BlockNumber::max_value(), Into::into),
-			eip214_transition: p.eip214_transition.map_or(BlockNumber::max_value(), Into::into),
-			dust_protection_transition: p.dust_protection_transition.map_or(BlockNumber::max_value(), Into::into),
+			eip211_transition: p.eip211_transition.map_or(
+				BlockNumber::max_value(),
+				Into::into,
+			),
+			eip214_transition: p.eip214_transition.map_or(
+				BlockNumber::max_value(),
+				Into::into,
+			),
+			eip658_transition: p.eip658_transition.map_or(
+				BlockNumber::max_value(),
+				Into::into,
+			),
+			dust_protection_transition: p.dust_protection_transition.map_or(
+				BlockNumber::max_value(),
+				Into::into,
+			),
 			nonce_cap_increment: p.nonce_cap_increment.map_or(64, Into::into),
 			remove_dust_contracts: p.remove_dust_contracts.unwrap_or(false),
-			wasm: p.wasm.unwrap_or(false),
 			gas_limit_bound_divisor: p.gas_limit_bound_divisor.into(),
-			block_reward: p.block_reward.map_or_else(U256::zero, Into::into),
 			registrar: p.registrar.map_or_else(Address::new, Into::into),
 			node_permission_contract: p.node_permission_contract.map(Into::into),
+			max_code_size: p.max_code_size.map_or(u64::max_value(), Into::into),
+			max_code_size_transition: p.max_code_size_transition.map_or(0, Into::into),
+			transaction_permission_contract: p.transaction_permission_contract.map(Into::into),
+			wasm_activation_transition: p.wasm_activation_transition.map_or(
+				BlockNumber::max_value(),
+				Into::into
+			),
+		}
+	}
+}
+
+/// Runtime parameters for the spec that are related to how the software should run the chain,
+/// rather than integral properties of the chain itself.
+#[derive(Debug, Clone, Copy)]
+pub struct SpecParams<'a> {
+	/// The path to the folder used to cache nodes. This is typically /tmp/ on Unix-like systems
+	pub cache_dir: &'a Path,
+	/// Whether to run slower at the expense of better memory usage, or run faster while using
+	/// more
+	/// memory. This may get more fine-grained in the future but for now is simply a binary
+	/// option.
+	pub optimization_setting: Option<OptimizeFor>,
+}
+
+impl<'a> SpecParams<'a> {
+	/// Create from a cache path, with null values for the other fields
+	pub fn from_path(path: &'a Path) -> Self {
+		SpecParams {
+			cache_dir: path,
+			optimization_setting: None,
+		}
+	}
+
+	/// Create from a cache path and an optimization setting
+	pub fn new(path: &'a Path, optimization: OptimizeFor) -> Self {
+		SpecParams {
+			cache_dir: path,
+			optimization_setting: Some(optimization),
 		}
 	}
 }
 
+impl<'a, T: AsRef<Path>> From<&'a T> for SpecParams<'a> {
+	fn from(path: &'a T) -> Self {
+		Self::from_path(path.as_ref())
+	}
+}
+
+
 /// Parameters for a block chain; includes both those intrinsic to the design of the
 /// chain and those to be interpreted by the active chain engine.
 pub struct Spec {
 	/// User friendly spec name
 	pub name: String,
 	/// What engine are we using for this?
-	pub engine: Arc<Engine>,
+	pub engine: Arc<EthEngine>,
 	/// Name of the subdir inside the main data dir to use for chain data and settings.
 	pub data_dir: String,
 
@@ -203,15 +311,18 @@ pub struct Spec {
 	pub gas_used: U256,
 	/// The genesis block's timestamp field.
 	pub timestamp: u64,
-	/// Transactions root of the genesis block. Should be SHA3_NULL_RLP.
+	/// Transactions root of the genesis block. Should be KECCAK_NULL_RLP.
 	pub transactions_root: H256,
-	/// Receipts root of the genesis block. Should be SHA3_NULL_RLP.
+	/// Receipts root of the genesis block. Should be KECCAK_NULL_RLP.
 	pub receipts_root: H256,
 	/// The genesis block's extra data field.
 	pub extra_data: Bytes,
 	/// Each seal field, expressed as RLP, concatenated.
 	pub seal_rlp: Bytes,
 
+	/// Hardcoded synchronization. Allows the light client to immediately jump to a specific block.
+	pub hardcoded_sync: Option<SpecHardcodedSync>,
+
 	/// Contract constructors to be executed on genesis.
 	constructors: Vec<(Address, Bytes)>,
 
@@ -222,15 +333,109 @@ pub struct Spec {
 	genesis_state: PodState,
 }
 
-fn load_from<T: AsRef<Path>>(cache_dir: T, s: ethjson::spec::Spec) -> Result<Spec, Error> {
+#[cfg(test)]
+impl Clone for Spec {
+	fn clone(&self) -> Spec {
+		Spec {
+			name: self.name.clone(),
+			engine: self.engine.clone(),
+			data_dir: self.data_dir.clone(),
+			nodes: self.nodes.clone(),
+			parent_hash: self.parent_hash.clone(),
+			transactions_root: self.transactions_root.clone(),
+			receipts_root: self.receipts_root.clone(),
+			author: self.author.clone(),
+			difficulty: self.difficulty.clone(),
+			gas_limit: self.gas_limit.clone(),
+			gas_used: self.gas_used.clone(),
+			timestamp: self.timestamp.clone(),
+			extra_data: self.extra_data.clone(),
+			seal_rlp: self.seal_rlp.clone(),
+			hardcoded_sync: self.hardcoded_sync.clone(),
+			constructors: self.constructors.clone(),
+			state_root_memo: RwLock::new(*self.state_root_memo.read()),
+			genesis_state: self.genesis_state.clone(),
+		}
+	}
+}
+
+/// Part of `Spec`. Describes the hardcoded synchronization parameters.
+pub struct SpecHardcodedSync {
+	/// Header of the block to jump to for hardcoded sync, and total difficulty.
+	pub header: encoded::Header,
+	/// Total difficulty of the block to jump to.
+	pub total_difficulty: U256,
+	/// List of hardcoded CHTs, in order. If `hardcoded_sync` is set, the CHTs should include the
+	/// header of `hardcoded_sync`.
+	pub chts: Vec<H256>,
+}
+
+impl SpecHardcodedSync {
+	/// Turns this specifications back into JSON. Useful for pretty printing.
+	pub fn to_json(self) -> ethjson::spec::HardcodedSync {
+		self.into()
+	}
+}
+
+#[cfg(test)]
+impl Clone for SpecHardcodedSync {
+	fn clone(&self) -> SpecHardcodedSync {
+		SpecHardcodedSync {
+			header: self.header.clone(),
+			total_difficulty: self.total_difficulty.clone(),
+			chts: self.chts.clone(),
+		}
+	}
+}
+
+impl From<SpecHardcodedSync> for ethjson::spec::HardcodedSync {
+	fn from(sync: SpecHardcodedSync) -> ethjson::spec::HardcodedSync {
+		ethjson::spec::HardcodedSync {
+			header: sync.header.into_inner().to_hex(),
+			total_difficulty: ethjson::uint::Uint(sync.total_difficulty),
+			chts: sync.chts.into_iter().map(Into::into).collect(),
+		}
+	}
+}
+
+fn load_machine_from(s: ethjson::spec::Spec) -> EthereumMachine {
 	let builtins = s.accounts.builtins().into_iter().map(|p| (p.0.into(), From::from(p.1))).collect();
+	let params = CommonParams::from(s.params);
+
+	Spec::machine(&s.engine, params, builtins)
+}
+
+/// Load from JSON object.
+fn load_from(spec_params: SpecParams, s: ethjson::spec::Spec) -> Result<Spec, Error> {
+	let builtins = s.accounts
+		.builtins()
+		.into_iter()
+		.map(|p| (p.0.into(), From::from(p.1)))
+		.collect();
 	let g = Genesis::from(s.genesis);
 	let GenericSeal(seal_rlp) = g.seal.into();
 	let params = CommonParams::from(s.params);
 
+	let hardcoded_sync = if let Some(ref hs) = s.hardcoded_sync {
+		if let Ok(header) = hs.header.from_hex() {
+			Some(SpecHardcodedSync {
+				header: encoded::Header::new(header),
+				total_difficulty: hs.total_difficulty.into(),
+				chts: s.hardcoded_sync
+					.as_ref()
+					.map(|s| s.chts.iter().map(|c| c.clone().into()).collect())
+					.unwrap_or(Vec::new()),
+			})
+		} else {
+			None
+		}
+	} else {
+		None
+	};
+
 	let mut s = Spec {
 		name: s.name.clone().into(),
-		engine: Spec::engine(cache_dir, s.engine, params, builtins),
+		engine: Spec::engine(spec_params, s.engine, params, builtins),
 		data_dir: s.data_dir.unwrap_or(s.name).into(),
 		nodes: s.nodes.unwrap_or_else(Vec::new),
 		parent_hash: g.parent_hash,
@@ -243,7 +448,12 @@ fn load_from<T: AsRef<Path>>(cache_dir: T, s: ethjson::spec::Spec) -> Result<Spe
 		timestamp: g.timestamp,
 		extra_data: g.extra_data,
 		seal_rlp: seal_rlp,
-		constructors: s.accounts.constructors().into_iter().map(|(a, c)| (a.into(), c.into())).collect(),
+		hardcoded_sync: hardcoded_sync,
+		constructors: s.accounts
+			.constructors()
+			.into_iter()
+			.map(|(a, c)| (a.into(), c.into()))
+			.collect(),
 		state_root_memo: RwLock::new(Default::default()), // will be overwritten right after.
 		genesis_state: s.accounts.into(),
 	};
@@ -251,7 +461,12 @@ fn load_from<T: AsRef<Path>>(cache_dir: T, s: ethjson::spec::Spec) -> Result<Spe
 	// use memoized state root if provided.
 	match g.state_root {
 		Some(root) => *s.state_root_memo.get_mut() = root,
-		None => { let _ = s.run_constructors(&Default::default(), BasicBackend(MemoryDB::new()))?; },
+		None => {
+			let _ = s.run_constructors(
+				&Default::default(),
+				BasicBackend(MemoryDB::new()),
+			)?;
+		}
 	}
 
 	Ok(s)
@@ -266,28 +481,54 @@ macro_rules! load_bundled {
 	};
 }
 
+macro_rules! load_machine_bundled {
+	($e:expr) => {
+		Spec::load_machine(
+			include_bytes!(concat!("../../res/", $e, ".json")) as &[u8]
+		).expect(concat!("Chain spec ", $e, " is invalid."))
+	};
+}
+
 impl Spec {
+	// create an instance of an Ethereum state machine, minus consensus logic.
+	fn machine(
+		engine_spec: &ethjson::spec::Engine,
+		params: CommonParams,
+		builtins: BTreeMap<Address, Builtin>,
+	) -> EthereumMachine {
+		if let ethjson::spec::Engine::Ethash(ref ethash) = *engine_spec {
+			EthereumMachine::with_ethash_extensions(params, builtins, ethash.params.clone().into())
+		} else {
+			EthereumMachine::regular(params, builtins)
+		}
+	}
+
 	/// Convert engine spec into a arc'd Engine of the right underlying type.
 	/// TODO avoid this hard-coded nastiness - use dynamic-linked plugin framework instead.
-	fn engine<T: AsRef<Path>>(
-		cache_dir: T,
+	fn engine(
+		spec_params: SpecParams,
 		engine_spec: ethjson::spec::Engine,
 		params: CommonParams,
 		builtins: BTreeMap<Address, Builtin>,
-	) -> Arc<Engine> {
+	) -> Arc<EthEngine> {
+		let machine = Self::machine(&engine_spec, params, builtins);
+
 		match engine_spec {
-			ethjson::spec::Engine::Null => Arc::new(NullEngine::new(params, builtins)),
-			ethjson::spec::Engine::InstantSeal => Arc::new(InstantSeal::new(params, builtins)),
-			ethjson::spec::Engine::Ethash(ethash) => Arc::new(ethereum::Ethash::new(cache_dir, params, From::from(ethash.params), builtins)),
-			ethjson::spec::Engine::BasicAuthority(basic_authority) => Arc::new(BasicAuthority::new(params, From::from(basic_authority.params), builtins)),
-			ethjson::spec::Engine::AuthorityRound(authority_round) => AuthorityRound::new(params, From::from(authority_round.params), builtins).expect("Failed to start AuthorityRound consensus engine."),
-			ethjson::spec::Engine::Tendermint(tendermint) => Tendermint::new(params, From::from(tendermint.params), builtins).expect("Failed to start the Tendermint consensus engine."),
+			ethjson::spec::Engine::Null(null) => Arc::new(NullEngine::new(null.params.into(), machine)),
+			ethjson::spec::Engine::Ethash(ethash) => Arc::new(::ethereum::Ethash::new(spec_params.cache_dir, ethash.params.into(), machine, spec_params.optimization_setting)),
+			ethjson::spec::Engine::InstantSeal => Arc::new(InstantSeal::new(machine)),
+			ethjson::spec::Engine::BasicAuthority(basic_authority) => Arc::new(BasicAuthority::new(basic_authority.params.into(), machine)),
+			ethjson::spec::Engine::AuthorityRound(authority_round) => AuthorityRound::new(authority_round.params.into(), machine)
+				.expect("Failed to start AuthorityRound consensus engine."),
+			ethjson::spec::Engine::Tendermint(tendermint) => Tendermint::new(tendermint.params.into(), machine)
+				.expect("Failed to start the Tendermint consensus engine."),
 		}
 	}
 
-	// given a pre-constructor state, run all the given constructors and produce a new state and state root.
+	// given a pre-constructor state, run all the given constructors and produce a new state and
+	// state root.
 	fn run_constructors<T: Backend>(&self, factories: &Factories, mut db: T) -> Result<T, Error> {
-		let mut root = SHA3_NULL_RLP;
+		let mut root = KECCAK_NULL_RLP;
 
 		// basic accounts in spec.
 		{
@@ -301,20 +542,18 @@ impl Spec {
 		for (address, account) in self.genesis_state.get().iter() {
 			db.note_non_null_account(address);
 			account.insert_additional(
-				&mut *factories.accountdb.create(db.as_hashdb_mut(), address.sha3()),
-				&factories.trie
+				&mut *factories.accountdb.create(
+					db.as_hashdb_mut(),
+					keccak(address),
+				),
+				&factories.trie,
 			);
 		}
 
 		let start_nonce = self.engine.account_start_nonce(0);
 
 		let (root, db) = {
-			let mut state = State::from_existing(
-				db,
-				root,
-				start_nonce,
-				factories.clone(),
-			)?;
+			let mut state = State::from_existing(db, root, start_nonce, factories.clone())?;
 
 			// Execute contract constructors.
 			let env_info = EnvInfo {
@@ -333,7 +572,7 @@ impl Spec {
 				trace!(target: "spec", "  .. root before = {}", state.root());
 				let params = ActionParams {
 					code_address: address.clone(),
-					code_hash: Some(constructor.sha3()),
+					code_hash: Some(keccak(constructor)),
 					address: address.clone(),
 					sender: from.clone(),
 					origin: from.clone(),
@@ -343,14 +582,14 @@ impl Spec {
 					code: Some(Arc::new(constructor.clone())),
 					data: None,
 					call_type: CallType::None,
+					params_type: ParamsType::Embedded,
 				};
 
 				let mut substate = Substate::new();
-				state.kill_account(&address);
 
 				{
-					let mut exec = Executive::new(&mut state, &env_info, self.engine.as_ref());
-					if let Err(e) = exec.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer) {
+					let mut exec = Executive::new(&mut state, &env_info, self.engine.machine());
+					if let Err(e) = exec.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer) {
 						warn!(target: "spec", "Genesis constructor execution at {} failed: {}.", address, e);
 					}
 				}
@@ -375,22 +614,34 @@ impl Spec {
 	}
 
 	/// Get common blockchain parameters.
-	pub fn params(&self) -> &CommonParams { &self.engine.params() }
+	pub fn params(&self) -> &CommonParams {
+		&self.engine.params()
+	}
 
 	/// Get the known knodes of the network in enode format.
-	pub fn nodes(&self) -> &[String] { &self.nodes }
+	pub fn nodes(&self) -> &[String] {
+		&self.nodes
+	}
 
 	/// Get the configured Network ID.
-	pub fn network_id(&self) -> u64 { self.params().network_id }
+	pub fn network_id(&self) -> u64 {
+		self.params().network_id
+	}
 
 	/// Get the chain ID used for signing.
-	pub fn chain_id(&self) -> u64 { self.params().chain_id }
+	pub fn chain_id(&self) -> u64 {
+		self.params().chain_id
+	}
 
 	/// Get the configured subprotocol name.
-	pub fn subprotocol_name(&self) -> String { self.params().subprotocol_name.clone() }
+	pub fn subprotocol_name(&self) -> String {
+		self.params().subprotocol_name.clone()
+	}
 
 	/// Get the configured network fork block.
-	pub fn fork_block(&self) -> Option<(BlockNumber, H256)> { self.params().fork_block }
+	pub fn fork_block(&self) -> Option<(BlockNumber, H256)> {
+		self.params().fork_block
+	}
 
 	/// Get the header of the genesis block.
 	pub fn genesis_header(&self) -> Header {
@@ -400,11 +651,11 @@ impl Spec {
 		header.set_number(0);
 		header.set_author(self.author.clone());
 		header.set_transactions_root(self.transactions_root.clone());
-		header.set_uncles_hash(RlpStream::new_list(0).out().sha3());
+		header.set_uncles_hash(keccak(RlpStream::new_list(0).out()));
 		header.set_extra_data(self.extra_data.clone());
 		header.set_state_root(self.state_root());
 		header.set_receipts_root(self.receipts_root.clone());
-		header.set_log_bloom(H2048::new().clone());
+		header.set_log_bloom(Bloom::default());
 		header.set_gas_used(self.gas_used.clone());
 		header.set_gas_limit(self.gas_limit.clone());
 		header.set_difficulty(self.difficulty.clone());
@@ -445,7 +696,10 @@ impl Spec {
 	/// Alter the value of the genesis state.
 	pub fn set_genesis_state(&mut self, s: PodState) -> Result<(), Error> {
 		self.genesis_state = s;
-		let _ = self.run_constructors(&Default::default(), BasicBackend(MemoryDB::new()))?;
+		let _ = self.run_constructors(
+			&Default::default(),
+			BasicBackend(MemoryDB::new()),
+		)?;
 
 		Ok(())
 	}
@@ -459,9 +713,9 @@ impl Spec {
 	}
 
 	/// Ensure that the given state DB has the trie nodes in for the genesis state.
-	pub fn ensure_db_good(&self, db: StateDB, factories: &Factories) -> Result<StateDB, Error> {
+	pub fn ensure_db_good<T: Backend>(&self, db: T, factories: &Factories) -> Result<T, Error> {
 		if db.as_hashdb().contains(&self.state_root()) {
-			return Ok(db)
+			return Ok(db);
 		}
 
 		// TODO: could optimize so we don't re-run, but `ensure_db_good` is barely ever
@@ -470,87 +724,216 @@ impl Spec {
 		Ok(db)
 	}
 
+	/// Loads just the state machine from a json file.
+	pub fn load_machine<R: Read>(reader: R) -> Result<EthereumMachine, String> {
+		ethjson::spec::Spec::load(reader)
+			.map_err(fmt_err)
+			.map(load_machine_from)
+
+	}
+
 	/// Loads spec from json file. Provide factories for executing contracts and ensuring
 	/// storage goes to the right place.
-	pub fn load<T: AsRef<Path>, R>(cache_dir: T, reader: R) -> Result<Self, String> where R: Read {
-		fn fmt<F: ::std::fmt::Display>(f: F) -> String {
-			format!("Spec json is invalid: {}", f)
-		}
+	pub fn load<'a, T: Into<SpecParams<'a>>, R>(params: T, reader: R) -> Result<Self, String>
+	where
+		R: Read,
+	{
+		ethjson::spec::Spec::load(reader).map_err(fmt_err).and_then(
+			|x| {
+				load_from(params.into(), x).map_err(fmt_err)
+			},
+		)
+	}
+
+	/// initialize genesis epoch data, using in-memory database for
+	/// constructor.
+	pub fn genesis_epoch_data(&self) -> Result<Vec<u8>, String> {
+		use transaction::{Action, Transaction};
+		use journaldb;
+		use kvdb_memorydb;
+
+		let genesis = self.genesis_header();
+
+		let factories = Default::default();
+		let mut db = journaldb::new(
+			Arc::new(kvdb_memorydb::create(0)),
+			journaldb::Algorithm::Archive,
+			None,
+		);
+
+		self.ensure_db_good(BasicBackend(db.as_hashdb_mut()), &factories)
+			.map_err(|e| format!("Unable to initialize genesis state: {}", e))?;
 
-		ethjson::spec::Spec::load(reader).map_err(fmt)
-			.and_then(|x| load_from(cache_dir, x).map_err(fmt))
+		let call = |a, d| {
+			let mut db = db.boxed_clone();
+			let env_info = ::evm::EnvInfo {
+				number: 0,
+				author: *genesis.author(),
+				timestamp: genesis.timestamp(),
+				difficulty: *genesis.difficulty(),
+				gas_limit: *genesis.gas_limit(),
+				last_hashes: Arc::new(Vec::new()),
+				gas_used: 0.into(),
+			};
+
+			let from = Address::default();
+			let tx = Transaction {
+				nonce: self.engine.account_start_nonce(0),
+				action: Action::Call(a),
+				gas: U256::from(50_000_000), // TODO: share with client.
+				gas_price: U256::default(),
+				value: U256::default(),
+				data: d,
+			}.fake_sign(from);
+
+			let res = ::state::prove_transaction(
+				db.as_hashdb_mut(),
+				*genesis.state_root(),
+				&tx,
+				self.engine.machine(),
+				&env_info,
+				factories.clone(),
+				true,
+			);
+
+			res.map(|(out, proof)| {
+				(out, proof.into_iter().map(|x| x.into_vec()).collect())
+			}).ok_or_else(|| "Failed to prove call: insufficient state".into())
+		};
+
+		self.engine.genesis_epoch_data(&genesis, &call)
+	}
+
+	/// Create a new Spec which conforms to the Frontier-era Morden chain except that it's a
+	/// NullEngine consensus.
+	pub fn new_test() -> Spec {
+		load_bundled!("null_morden")
 	}
 
-	/// Create a new Spec which conforms to the Frontier-era Morden chain except that it's a NullEngine consensus.
-	pub fn new_test() -> Spec { load_bundled!("null_morden") }
+	/// Create the EthereumMachine corresponding to Spec::new_test.
+	pub fn new_test_machine() -> EthereumMachine { load_machine_bundled!("null_morden") }
 
-	/// Create a new Spec which is a NullEngine consensus with a premine of address whose secret is sha3('').
-	pub fn new_null() -> Spec { load_bundled!("null") }
+
+	/// Create a new Spec which conforms to the Frontier-era Morden chain except that it's a NullEngine consensus with applying reward on block close.
+	pub fn new_test_with_reward() -> Spec { load_bundled!("null_morden_with_reward") }
+
+	/// Create a new Spec which is a NullEngine consensus with a premine of address whose
+	/// secret is keccak('').
+	pub fn new_null() -> Spec {
+		load_bundled!("null")
+	}
 
 	/// Create a new Spec which constructs a contract at address 5 with storage at 0 equal to 1.
-	pub fn new_test_constructor() -> Spec { load_bundled!("constructor") }
+	pub fn new_test_constructor() -> Spec {
+		load_bundled!("constructor")
+	}
 
-	/// Create a new Spec with InstantSeal consensus which does internal sealing (not requiring work).
-	pub fn new_instant() -> Spec { load_bundled!("instant_seal") }
+	/// Create a new Spec with InstantSeal consensus which does internal sealing (not requiring
+	/// work).
+	pub fn new_instant() -> Spec {
+		load_bundled!("instant_seal")
+	}
 
-	/// Create a new Spec with AuthorityRound consensus which does internal sealing (not requiring work).
-	/// Accounts with secrets "0".sha3() and "1".sha3() are the validators.
-	pub fn new_test_round() -> Self { load_bundled!("authority_round") }
+	/// Create a new Spec with AuthorityRound consensus which does internal sealing (not
+	/// requiring work).
+	/// Accounts with secrets keccak("0") and keccak("1") are the validators.
+	pub fn new_test_round() -> Self {
+		load_bundled!("authority_round")
+	}
 
-	/// Create a new Spec with Tendermint consensus which does internal sealing (not requiring work).
-	/// Account "0".sha3() and "1".sha3() are a authorities.
-	pub fn new_test_tendermint() -> Self { load_bundled!("tendermint") }
+	/// Create a new Spec with AuthorityRound consensus which does internal sealing (not
+	/// requiring work) with empty step messages enabled.
+	/// Accounts with secrets keccak("0") and keccak("1") are the validators.
+	pub fn new_test_round_empty_steps() -> Self {
+		load_bundled!("authority_round_empty_steps")
+	}
+
+	/// Create a new Spec with Tendermint consensus which does internal sealing (not requiring
+	/// work).
+	/// Account keccak("0") and keccak("1") are a authorities.
+	pub fn new_test_tendermint() -> Self {
+		load_bundled!("tendermint")
+	}
 
 	/// TestList.sol used in both specs: https://github.com/paritytech/contracts/pull/30/files
-	/// Accounts with secrets "0".sha3() and "1".sha3() are initially the validators.
-	/// Create a new Spec with BasicAuthority which uses a contract at address 5 to determine the current validators using `getValidators`.
-	/// Second validator can be removed with "0xbfc708a000000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1" and added back in using "0x4d238c8e00000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1".
-	pub fn new_validator_safe_contract() -> Self { load_bundled!("validator_safe_contract") }
+	/// Accounts with secrets keccak("0") and keccak("1") are initially the validators.
+	/// Create a new Spec with BasicAuthority which uses a contract at address 5 to determine
+	/// the current validators using `getValidators`.
+	/// Second validator can be removed with
+	/// "0xbfc708a000000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1" and added
+	/// back in using
+	/// "0x4d238c8e00000000000000000000000082a978b3f5962a5b0957d9ee9eef472ee55b42f1".
+	pub fn new_validator_safe_contract() -> Self {
+		load_bundled!("validator_safe_contract")
+	}
 
 	/// The same as the `safeContract`, but allows reporting and uses AuthorityRound.
 	/// Account is marked with `reportBenign` it can be checked as disliked with "0xd8f2e0bf".
 	/// Validator can be removed with `reportMalicious`.
-	pub fn new_validator_contract() -> Self { load_bundled!("validator_contract") }
+	pub fn new_validator_contract() -> Self {
+		load_bundled!("validator_contract")
+	}
 
-	/// Create a new Spec with BasicAuthority which uses multiple validator sets changing with height.
-	/// Account with secrets "0".sha3() is the validator for block 1 and with "1".sha3() onwards.
-	pub fn new_validator_multi() -> Self { load_bundled!("validator_multi") }
+	/// Create a new Spec with BasicAuthority which uses multiple validator sets changing with
+	/// height.
+	/// Account with secrets keccak("0") is the validator for block 1 and with keccak("1")
+	/// onwards.
+	pub fn new_validator_multi() -> Self {
+		load_bundled!("validator_multi")
+	}
 
 	/// Create a new spec for a PoW chain
-	pub fn new_pow_test_spec() -> Self { load_bundled!("ethereum/olympic") }
+	pub fn new_pow_test_spec() -> Self {
+		load_bundled!("ethereum/olympic")
+	}
 }
 
 #[cfg(test)]
 mod tests {
-	use std::str::FromStr;
-	use util::*;
-	use views::*;
-	use tests::helpers::get_temp_state_db;
-	use state::State;
 	use super::*;
+	use state::State;
+	use tests::helpers::get_temp_state_db;
+	use views::BlockView;
+	use tempdir::TempDir;
 
 	// https://github.com/paritytech/parity/issues/1840
 	#[test]
 	fn test_load_empty() {
-		assert!(Spec::load(::std::env::temp_dir(), &[] as &[u8]).is_err());
+		let tempdir = TempDir::new("").unwrap();
+		assert!(Spec::load(&tempdir.path(), &[] as &[u8]).is_err());
 	}
 
 	#[test]
 	fn test_chain() {
 		let test_spec = Spec::new_test();
 
-		assert_eq!(test_spec.state_root(), H256::from_str("f3f4696bbf3b3b07775128eb7a3763279a394e382130f27c21e70233e04946a9").unwrap());
+		assert_eq!(
+			test_spec.state_root(),
+			"f3f4696bbf3b3b07775128eb7a3763279a394e382130f27c21e70233e04946a9".into()
+		);
 		let genesis = test_spec.genesis_block();
-		assert_eq!(BlockView::new(&genesis).header_view().sha3(), H256::from_str("0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303").unwrap());
+		assert_eq!(
+			BlockView::new(&genesis).header_view().hash(),
+			"0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303".into()
+		);
 	}
 
 	#[test]
 	fn genesis_constructor() {
 		::ethcore_logger::init_log();
 		let spec = Spec::new_test_constructor();
-		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
-		let state = State::from_existing(db.boxed_clone(), spec.state_root(), spec.engine.account_start_nonce(0), Default::default()).unwrap();
-		let expected = H256::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap();
-		assert_eq!(state.storage_at(&Address::from_str("0000000000000000000000000000000000000005").unwrap(), &H256::zero()).unwrap(), expected);
+		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default())
+			.unwrap();
+		let state = State::from_existing(
+			db.boxed_clone(),
+			spec.state_root(),
+			spec.engine.account_start_nonce(0),
+			Default::default(),
+		).unwrap();
+		let expected = "0000000000000000000000000000000000000000000000000000000000000001".into();
+		let address = "0000000000000000000000000000000000001337".into();
+
+		assert_eq!(state.storage_at(&address, &H256::zero()).unwrap(), expected);
+		assert_eq!(state.balance(&address).unwrap(), 1.into());
 	}
 }
diff --git a/ethcore/src/state/account.rs b/ethcore/src/state/account.rs
old mode 100644
new mode 100755
index 1235fd289682b83da1810c16e5acac1d121d72fe..f70b3eb6a816ac85088e68c394ae033904aee695
--- a/ethcore/src/state/account.rs
+++ b/ethcore/src/state/account.rs
@@ -18,8 +18,14 @@
 
 use std::fmt;
 use std::sync::Arc;
-use std::collections::HashMap;
-use util::*;
+use std::collections::{HashMap, BTreeMap};
+use hash::{KECCAK_EMPTY, KECCAK_NULL_RLP, keccak};
+use ethereum_types::{H256, U256, Address};
+use hashdb::HashDB;
+use kvdb::DBValue;
+use bytes::{Bytes, ToPretty};
+use trie;
+use trie::{SecTrieDB, Trie, TrieFactory, TrieError};
 use pod_account::*;
 use rlp::*;
 use lru_cache::LruCache;
@@ -29,6 +35,15 @@ use std::cell::{RefCell, Cell};
 
 const STORAGE_CACHE_ITEMS: usize = 8192;
 
+/// Boolean type for clean/dirty status.
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
+pub enum Filth {
+	/// Data has not been changed.
+	Clean,
+	/// Data has been changed.
+	Dirty,
+}
+
 /// Single account in the system.
 /// Keeps track of changes to the code and storage.
 /// The changes are applied in `commit_storage` and `commit_code`
@@ -47,7 +62,7 @@ pub struct Account {
 	storage_changes: HashMap<H256, H256>,
 	// Code hash of the account.
 	code_hash: H256,
-	// Size of the accoun code.
+	// Size of the account code.
 	code_size: Option<usize>,
 	// Code cache of the account.
 	code_cache: Arc<Bytes>,
@@ -81,10 +96,10 @@ impl Account {
 		Account {
 			balance: balance,
 			nonce: nonce,
-			storage_root: SHA3_NULL_RLP,
+			storage_root: KECCAK_NULL_RLP,
 			storage_cache: Self::empty_storage_cache(),
 			storage_changes: storage,
-			code_hash: code.sha3(),
+			code_hash: keccak(&code),
 			code_size: Some(code.len()),
 			code_cache: Arc::new(code),
 			code_filth: Filth::Dirty,
@@ -101,10 +116,10 @@ impl Account {
 		Account {
 			balance: pod.balance,
 			nonce: pod.nonce,
-			storage_root: SHA3_NULL_RLP,
+			storage_root: KECCAK_NULL_RLP,
 			storage_cache: Self::empty_storage_cache(),
 			storage_changes: pod.storage.into_iter().collect(),
-			code_hash: pod.code.as_ref().map_or(SHA3_EMPTY, |c| c.sha3()),
+			code_hash: pod.code.as_ref().map_or(KECCAK_EMPTY, |c| keccak(c)),
 			code_filth: Filth::Dirty,
 			code_size: Some(pod.code.as_ref().map_or(0, |c| c.len())),
 			code_cache: Arc::new(pod.code.map_or_else(|| { warn!("POD account with unknown code is being created! Assuming no code."); vec![] }, |c| c)),
@@ -117,10 +132,10 @@ impl Account {
 		Account {
 			balance: balance,
 			nonce: nonce,
-			storage_root: SHA3_NULL_RLP,
+			storage_root: KECCAK_NULL_RLP,
 			storage_cache: Self::empty_storage_cache(),
 			storage_changes: HashMap::new(),
-			code_hash: SHA3_EMPTY,
+			code_hash: KECCAK_EMPTY,
 			code_cache: Arc::new(vec![]),
 			code_size: Some(0),
 			code_filth: Filth::Clean,
@@ -140,10 +155,10 @@ impl Account {
 		Account {
 			balance: balance,
 			nonce: nonce,
-			storage_root: SHA3_NULL_RLP,
+			storage_root: KECCAK_NULL_RLP,
 			storage_cache: Self::empty_storage_cache(),
 			storage_changes: HashMap::new(),
-			code_hash: SHA3_EMPTY,
+			code_hash: KECCAK_EMPTY,
 			code_cache: Arc::new(vec![]),
 			code_size: None,
 			code_filth: Filth::Clean,
@@ -154,7 +169,7 @@ impl Account {
 	/// Set this account's code to the given code.
 	/// NOTE: Account should have been created with `new_contract()`
 	pub fn init_code(&mut self, code: Bytes) {
-		self.code_hash = code.sha3();
+		self.code_hash = keccak(&code);
 		self.code_cache = Arc::new(code);
 		self.code_size = Some(self.code_cache.len());
 		self.code_filth = Filth::Dirty;
@@ -171,7 +186,7 @@ impl Account {
 	}
 
 	/// Get (and cache) the contents of the trie's storage at `key`.
-	/// Takes modifed storage into account.
+	/// Takes modified storage into account.
 	pub fn storage_at(&self, db: &HashDB, key: &H256) -> trie::Result<H256> {
 		if let Some(value) = self.cached_storage_at(key) {
 			return Ok(value);
@@ -211,7 +226,7 @@ impl Account {
 	pub fn address_hash(&self, address: &Address) -> H256 {
 		let hash = self.address_hash.get();
 		hash.unwrap_or_else(|| {
-			let hash = address.sha3();
+			let hash = keccak(address);
 			self.address_hash.set(Some(hash.clone()));
 			hash
 		})
@@ -220,7 +235,7 @@ impl Account {
 	/// returns the account's code. If `None` then the code cache isn't available -
 	/// get someone who knows to call `note_code`.
 	pub fn code(&self) -> Option<Arc<Bytes>> {
-		if self.code_hash != SHA3_EMPTY && self.code_cache.is_empty() {
+		if self.code_hash != KECCAK_EMPTY && self.code_cache.is_empty() {
 			return None;
 		}
 		Some(self.code_cache.clone())
@@ -235,7 +250,7 @@ impl Account {
 	#[cfg(test)]
 	/// Provide a byte array which hashes to the `code_hash`. returns the hash as a result.
 	pub fn note_code(&mut self, code: Bytes) -> Result<(), H256> {
-		let h = code.sha3();
+		let h = keccak(&code);
 		if self.code_hash == h {
 			self.code_cache = Arc::new(code);
 			self.code_size = Some(self.code_cache.len());
@@ -247,7 +262,7 @@ impl Account {
 
 	/// Is `code_cache` valid; such that code is going to return Some?
 	pub fn is_cached(&self) -> bool {
-		!self.code_cache.is_empty() || (self.code_cache.is_empty() && self.code_hash == SHA3_EMPTY)
+		!self.code_cache.is_empty() || (self.code_cache.is_empty() && self.code_hash == KECCAK_EMPTY)
 	}
 
 	/// Provide a database to get `code_hash`. Should not be called if it is a contract without code.
@@ -284,7 +299,7 @@ impl Account {
 		// TODO: fill out self.code_cache;
 		trace!("Account::cache_code_size: ic={}; self.code_hash={:?}, self.code_cache={}", self.is_cached(), self.code_hash, self.code_cache.pretty());
 		self.code_size.is_some() ||
-			if self.code_hash != SHA3_EMPTY {
+			if self.code_hash != KECCAK_EMPTY {
 				match db.get(&self.code_hash) {
 					Some(x) => {
 						self.code_size = Some(x.len());
@@ -308,19 +323,19 @@ impl Account {
 	/// NOTE: Will panic if `!self.storage_is_clean()`
 	pub fn is_empty(&self) -> bool {
 		assert!(self.storage_is_clean(), "Account::is_empty() may only legally be called when storage is clean.");
-		self.is_null() && self.storage_root == SHA3_NULL_RLP
+		self.is_null() && self.storage_root == KECCAK_NULL_RLP
 	}
 
 	/// Check if account has zero nonce, balance, no code.
 	pub fn is_null(&self) -> bool {
 		self.balance.is_zero() &&
 		self.nonce.is_zero() &&
-		self.code_hash == SHA3_EMPTY
+		self.code_hash == KECCAK_EMPTY
 	}
 
 	/// Check if account is basic (Has no code).
 	pub fn is_basic(&self) -> bool {
-		self.code_hash == SHA3_EMPTY
+		self.code_hash == KECCAK_EMPTY
 	}
 
 	/// Return the storage root associated with this account or None if it has been altered via the overlay.
@@ -447,8 +462,8 @@ impl Account {
 	/// `storage_key` is the hash of the desired storage key, meaning
 	/// this will only work correctly under a secure trie.
 	pub fn prove_storage(&self, db: &HashDB, storage_key: H256) -> Result<(Vec<Bytes>, H256), Box<TrieError>> {
-		use util::trie::{Trie, TrieDB};
-		use util::trie::recorder::Recorder;
+		use trie::{Trie, TrieDB};
+		use trie::recorder::Recorder;
 
 		let mut recorder = Recorder::new();
 
@@ -464,24 +479,30 @@ impl Account {
 
 impl fmt::Debug for Account {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "{:?}", PodAccount::from_account(self))
+		f.debug_struct("Account")
+			.field("balance", &self.balance)
+			.field("nonce", &self.nonce)
+			.field("code", &self.code())
+			.field("storage", &self.storage_changes.iter().collect::<BTreeMap<_, _>>())
+			.finish()
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use rlp::{UntrustedRlp, RlpType, Compressible};
-	use util::*;
+	use rlp_compress::{compress, decompress, snapshot_swapper};
+	use ethereum_types::{H256, Address};
+	use memorydb::MemoryDB;
+	use bytes::Bytes;
 	use super::*;
 	use account_db::*;
 
 	#[test]
 	fn account_compress() {
 		let raw = Account::new_basic(2.into(), 4.into()).rlp();
-		let rlp = UntrustedRlp::new(&raw);
-		let compact_vec = rlp.compress(RlpType::Snapshot).into_vec();
+		let compact_vec = compress(&raw, snapshot_swapper());
 		assert!(raw.len() > compact_vec.len());
-		let again_raw = UntrustedRlp::new(&compact_vec).decompress(RlpType::Snapshot);
+		let again_raw = decompress(&compact_vec, snapshot_swapper());
 		assert_eq!(raw, again_raw.into_vec());
     }
 
@@ -491,7 +512,7 @@ mod tests {
 		let mut db = AccountDBMut::new(&mut db, &Address::new());
 		let rlp = {
 			let mut a = Account::new_contract(69.into(), 0.into());
-			a.set_storage(H256::from(&U256::from(0x00u64)), H256::from(&U256::from(0x1234u64)));
+			a.set_storage(0x00u64.into(), 0x1234u64.into());
 			a.commit_storage(&Default::default(), &mut db).unwrap();
 			a.init_code(vec![]);
 			a.commit_code(&mut db);
@@ -499,9 +520,9 @@ mod tests {
 		};
 
 		let a = Account::from_rlp(&rlp);
-		assert_eq!(a.storage_root().unwrap().hex(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2");
-		assert_eq!(a.storage_at(&db.immutable(), &H256::from(&U256::from(0x00u64))).unwrap(), H256::from(&U256::from(0x1234u64)));
-		assert_eq!(a.storage_at(&db.immutable(), &H256::from(&U256::from(0x01u64))).unwrap(), H256::new());
+		assert_eq!(*a.storage_root().unwrap(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2".into());
+		assert_eq!(a.storage_at(&db.immutable(), &0x00u64.into()).unwrap(), 0x1234u64.into());
+		assert_eq!(a.storage_at(&db.immutable(), &0x01u64.into()).unwrap(), H256::default());
 	}
 
 	#[test]
@@ -531,7 +552,7 @@ mod tests {
 		a.set_storage(0.into(), 0x1234.into());
 		assert_eq!(a.storage_root(), None);
 		a.commit_storage(&Default::default(), &mut db).unwrap();
-		assert_eq!(a.storage_root().unwrap().hex(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2");
+		assert_eq!(*a.storage_root().unwrap(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2".into());
 	}
 
 	#[test]
@@ -545,7 +566,7 @@ mod tests {
 		a.commit_storage(&Default::default(), &mut db).unwrap();
 		a.set_storage(1.into(), 0.into());
 		a.commit_storage(&Default::default(), &mut db).unwrap();
-		assert_eq!(a.storage_root().unwrap().hex(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2");
+		assert_eq!(*a.storage_root().unwrap(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2".into());
 	}
 
 	#[test]
@@ -557,7 +578,7 @@ mod tests {
 		assert_eq!(a.code_filth, Filth::Dirty);
 		assert_eq!(a.code_size(), Some(3));
 		a.commit_code(&mut db);
-		assert_eq!(a.code_hash().hex(), "af231e631776a517ca23125370d542873eca1fb4d613ed9b5d5335a46ae5b7eb");
+		assert_eq!(a.code_hash(), "af231e631776a517ca23125370d542873eca1fb4d613ed9b5d5335a46ae5b7eb".into());
 	}
 
 	#[test]
@@ -569,16 +590,16 @@ mod tests {
 		assert_eq!(a.code_filth, Filth::Dirty);
 		a.commit_code(&mut db);
 		assert_eq!(a.code_filth, Filth::Clean);
-		assert_eq!(a.code_hash().hex(), "af231e631776a517ca23125370d542873eca1fb4d613ed9b5d5335a46ae5b7eb");
+		assert_eq!(a.code_hash(), "af231e631776a517ca23125370d542873eca1fb4d613ed9b5d5335a46ae5b7eb".into());
 		a.reset_code(vec![0x55]);
 		assert_eq!(a.code_filth, Filth::Dirty);
 		a.commit_code(&mut db);
-		assert_eq!(a.code_hash().hex(), "37bf2238b11b68cdc8382cece82651b59d3c3988873b6e0f33d79694aa45f1be");
+		assert_eq!(a.code_hash(), "37bf2238b11b68cdc8382cece82651b59d3c3988873b6e0f33d79694aa45f1be".into());
 	}
 
 	#[test]
 	fn rlpio() {
-		let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new());
+		let a = Account::new(69u8.into(), 0u8.into(), HashMap::new(), Bytes::new());
 		let b = Account::from_rlp(&a.rlp());
 		assert_eq!(a.balance(), b.balance());
 		assert_eq!(a.nonce(), b.nonce());
@@ -588,17 +609,17 @@ mod tests {
 
 	#[test]
 	fn new_account() {
-		let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new());
+		let a = Account::new(69u8.into(), 0u8.into(), HashMap::new(), Bytes::new());
 		assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
-		assert_eq!(a.balance(), &U256::from(69u8));
-		assert_eq!(a.nonce(), &U256::from(0u8));
-		assert_eq!(a.code_hash(), SHA3_EMPTY);
-		assert_eq!(a.storage_root().unwrap(), &SHA3_NULL_RLP);
+		assert_eq!(*a.balance(), 69u8.into());
+		assert_eq!(*a.nonce(), 0u8.into());
+		assert_eq!(a.code_hash(), KECCAK_EMPTY);
+		assert_eq!(a.storage_root().unwrap(), &KECCAK_NULL_RLP);
 	}
 
 	#[test]
 	fn create_account() {
-		let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new());
+		let a = Account::new(69u8.into(), 0u8.into(), HashMap::new(), Bytes::new());
 		assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
 	}
 
diff --git a/ethcore/src/state/backend.rs b/ethcore/src/state/backend.rs
index ea172b5afefdd039334aa204a233b953467fb774..1e761506d95703afaac0df33f2468578f775b9ed 100644
--- a/ethcore/src/state/backend.rs
+++ b/ethcore/src/state/backend.rs
@@ -25,8 +25,10 @@ use std::collections::{HashSet, HashMap};
 use std::sync::Arc;
 
 use state::Account;
-use util::{Address, MemoryDB, Mutex, H256};
-use util::hashdb::{AsHashDB, HashDB, DBValue};
+use parking_lot::Mutex;
+use ethereum_types::{Address, H256};
+use memorydb::MemoryDB;
+use hashdb::{AsHashDB, HashDB, DBValue};
 
 /// State backend. See module docs for more details.
 pub trait Backend: Send {
diff --git a/ethcore/src/state/mod.rs b/ethcore/src/state/mod.rs
old mode 100644
new mode 100755
index 1b36c91ec206e1459964b4eca1c873c86ef6aa4e..1fe4dd4d6d990ea12dd7abe3461e195001cc3971
--- a/ethcore/src/state/mod.rs
+++ b/ethcore/src/state/mod.rs
@@ -24,9 +24,10 @@ use std::collections::hash_map::Entry;
 use std::collections::{HashMap, BTreeMap, HashSet};
 use std::fmt;
 use std::sync::Arc;
+use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY};
 
-use receipt::Receipt;
-use engines::Engine;
+use receipt::{Receipt, TransactionOutcome};
+use machine::EthereumMachine as Machine;
 use vm::EnvInfo;
 use error::Error;
 use executive::{Executive, TransactOptions};
@@ -39,12 +40,17 @@ use executed::{Executed, ExecutionError};
 use types::state_diff::StateDiff;
 use transaction::SignedTransaction;
 use state_db::StateDB;
-use evm::{Factory as EvmFactory};
+use factory::VmFactory;
 
-use util::*;
+use ethereum_types::{H256, U256, Address};
+use hashdb::{HashDB, AsHashDB};
+use kvdb::DBValue;
+use bytes::Bytes;
+
+use trie;
+use trie::{Trie, TrieError, TrieDB};
+use trie::recorder::Recorder;
 
-use util::trie;
-use util::trie::recorder::Recorder;
 
 mod account;
 mod substate;
@@ -56,19 +62,19 @@ pub use self::backend::Backend;
 pub use self::substate::Substate;
 
 /// Used to return information about an `State::apply` operation.
-pub struct ApplyOutcome {
+pub struct ApplyOutcome<T, V> {
 	/// The receipt for the applied transaction.
 	pub receipt: Receipt,
 	/// The output of the applied transaction.
 	pub output: Bytes,
 	/// The trace for the applied transaction, empty if tracing was not produced.
-	pub trace: Vec<FlatTrace>,
+	pub trace: Vec<T>,
 	/// The VM trace for the applied transaction, None if tracing was not produced.
-	pub vm_trace: Option<VMTrace>
+	pub vm_trace: Option<V>
 }
 
 /// Result type for the execution ("application") of a transaction.
-pub type ApplyResult = Result<ApplyOutcome, Error>;
+pub type ApplyResult<T, V> = Result<ApplyOutcome<T, V>, Error>;
 
 /// Return type of proof validity check.
 #[derive(Debug, Clone)]
@@ -187,10 +193,10 @@ impl AccountEntry {
 /// `Err(ExecutionError::Internal)` indicates failure, everything else indicates
 /// a successful proof (as the transaction itself may be poorly chosen).
 pub fn check_proof(
-	proof: &[::util::DBValue],
+	proof: &[DBValue],
 	root: H256,
 	transaction: &SignedTransaction,
-	engine: &Engine,
+	machine: &Machine,
 	env_info: &EnvInfo,
 ) -> ProvedExecution {
 	let backend = self::backend::ProofCheck::new(proof);
@@ -200,7 +206,7 @@ pub fn check_proof(
 	let res = State::from_existing(
 		backend,
 		root,
-		engine.account_start_nonce(env_info.number),
+		machine.account_start_nonce(env_info.number),
 		factories
 	);
 
@@ -209,13 +215,52 @@ pub fn check_proof(
 		Err(_) => return ProvedExecution::BadProof,
 	};
 
-	match state.execute(env_info, engine, transaction, TransactOptions::with_no_tracing(), true) {
+	let options = TransactOptions::with_no_tracing().save_output_from_contract();
+	match state.execute(env_info, machine, transaction, options, true) {
 		Ok(executed) => ProvedExecution::Complete(executed),
 		Err(ExecutionError::Internal(_)) => ProvedExecution::BadProof,
 		Err(e) => ProvedExecution::Failed(e),
 	}
 }
 
+/// Prove a transaction on the given state.
+/// Returns `None` when the transacion could not be proved,
+/// and a proof otherwise.
+pub fn prove_transaction<H: AsHashDB + Send + Sync>(
+	db: H,
+	root: H256,
+	transaction: &SignedTransaction,
+	machine: &Machine,
+	env_info: &EnvInfo,
+	factories: Factories,
+	virt: bool,
+) -> Option<(Bytes, Vec<DBValue>)> {
+	use self::backend::Proving;
+
+	let backend = Proving::new(db);
+	let res = State::from_existing(
+		backend,
+		root,
+		machine.account_start_nonce(env_info.number),
+		factories,
+	);
+
+	let mut state = match res {
+		Ok(state) => state,
+		Err(_) => return None,
+	};
+
+	let options = TransactOptions::with_no_tracing().dont_check_nonce().save_output_from_contract();
+	match state.execute(env_info, machine, transaction, options, virt) {
+		Err(ExecutionError::Internal(_)) => None,
+		Err(e) => {
+			trace!(target: "state", "Proved call failed: {}", e);
+			Some((Vec::new(), state.drop().1.extract_proof()))
+		}
+		Ok(res) => Some((res.output, state.drop().1.extract_proof())),
+	}
+}
+
 /// Representation of the entire state of all accounts in the system.
 ///
 /// `State` can work together with `StateDB` to share account cache.
@@ -289,6 +334,28 @@ pub enum CleanupMode<'a> {
 	TrackTouched(&'a mut HashSet<Address>),
 }
 
+/// Provides subset of `State` methods to query state information
+pub trait StateInfo {
+	/// Get the nonce of account `a`.
+	fn nonce(&self, a: &Address) -> trie::Result<U256>;
+
+	/// Get the balance of account `a`.
+	fn balance(&self, a: &Address) -> trie::Result<U256>;
+
+	/// Mutate storage of account `address` so that it is `value` for `key`.
+	fn storage_at(&self, address: &Address, key: &H256) -> trie::Result<H256>;
+
+	/// Get accounts' code.
+	fn code(&self, a: &Address) -> trie::Result<Option<Arc<Bytes>>>;
+}
+
+impl<B: Backend> StateInfo for State<B> {
+	fn nonce(&self, a: &Address) -> trie::Result<U256> { State::nonce(self, a) }
+	fn balance(&self, a: &Address) -> trie::Result<U256> { State::balance(self, a) }
+	fn storage_at(&self, address: &Address, key: &H256) -> trie::Result<H256> { State::storage_at(self, address, key) }
+	fn code(&self, address: &Address) -> trie::Result<Option<Arc<Bytes>>> { State::code(self, address) }
+}
+
 const SEC_TRIE_DB_UNWRAP_STR: &'static str = "A state can only be created with valid root. Creating a SecTrieDB with a valid root will not fail. \
 			 Therefore creating a SecTrieDB with this state's root will not fail.";
 
@@ -298,7 +365,7 @@ impl<B: Backend> State<B> {
 	pub fn new(mut db: B, account_start_nonce: U256, factories: Factories) -> State<B> {
 		let mut root = H256::new();
 		{
-			// init trie and reset root too null
+			// init trie and reset root to null
 			let _ = factories.trie.create(db.as_hashdb_mut(), &mut root);
 		}
 
@@ -331,7 +398,7 @@ impl<B: Backend> State<B> {
 	}
 
 	/// Get a VM factory that can execute on this state.
-	pub fn vm_factory(&self) -> EvmFactory {
+	pub fn vm_factory(&self) -> VmFactory {
 		self.factories.vm.clone()
 	}
 
@@ -405,22 +472,19 @@ impl<B: Backend> State<B> {
 		//
 		// In all other cases account is read as clean first, and after that made
 		// dirty in and added to the checkpoint with `note_cache`.
-		if account.is_dirty() {
+		let is_dirty = account.is_dirty();
+		let old_value = self.cache.borrow_mut().insert(*address, account);
+		if is_dirty {
 			if let Some(ref mut checkpoint) = self.checkpoints.borrow_mut().last_mut() {
-				if !checkpoint.contains_key(address) {
-					checkpoint.insert(address.clone(), self.cache.borrow_mut().insert(address.clone(), account));
-					return;
-				}
+				checkpoint.entry(*address).or_insert(old_value);
 			}
 		}
-		self.cache.borrow_mut().insert(address.clone(), account);
 	}
 
 	fn note_cache(&self, address: &Address) {
 		if let Some(ref mut checkpoint) = self.checkpoints.borrow_mut().last_mut() {
-			if !checkpoint.contains_key(address) {
-				checkpoint.insert(address.clone(), self.cache.borrow().get(address).map(AccountEntry::clone_dirty));
-			}
+			checkpoint.entry(*address)
+				.or_insert_with(|| self.cache.borrow().get(address).map(AccountEntry::clone_dirty));
 		}
 	}
 
@@ -458,9 +522,10 @@ impl<B: Backend> State<B> {
 		self.ensure_cached(a, RequireCache::None, false, |a| a.map_or(false, |a| !a.is_null()))
 	}
 
-	/// Determine whether an account exists and has code.
-	pub fn exists_and_has_code(&self, a: &Address) -> trie::Result<bool> {
-		self.ensure_cached(a, RequireCache::CodeSize, false, |a| a.map_or(false, |a| a.code_size().map_or(false, |size| size != 0)))
+	/// Determine whether an account exists and has code or non-zero nonce.
+	pub fn exists_and_has_code_or_nonce(&self, a: &Address) -> trie::Result<bool> {
+		self.ensure_cached(a, RequireCache::CodeSize, false,
+			|a| a.map_or(false, |a| a.code_hash() != KECCAK_EMPTY || *a.nonce() != self.account_start_nonce))
 	}
 
 	/// Get the balance of account `a`.
@@ -488,8 +553,8 @@ impl<B: Backend> State<B> {
 		// 2. If there's an entry for the account in the global cache check for the key or load it into that account.
 		// 3. If account is missing in the global cache load it into the local cache and cache the key there.
 
-		// check local cache first without updating
 		{
+			// check local cache first without updating
 			let local_cache = self.cache.borrow_mut();
 			let mut local_account = None;
 			if let Some(maybe_acc) = local_cache.get(address) {
@@ -513,9 +578,8 @@ impl<B: Backend> State<B> {
 				}
 			});
 
-			match trie_res {
-				None => {}
-				Some(res) => return res,
+			if let Some(res) = trie_res {
+				return res;
 			}
 
 			// otherwise cache the account localy and cache storage key there.
@@ -552,7 +616,7 @@ impl<B: Backend> State<B> {
 	/// Get an account's code hash.
 	pub fn code_hash(&self, a: &Address) -> trie::Result<H256> {
 		self.ensure_cached(a, RequireCache::None, true,
-			|a| a.as_ref().map_or(SHA3_EMPTY, |a| a.code_hash()))
+			|a| a.as_ref().map_or(KECCAK_EMPTY, |a| a.code_hash()))
 	}
 
 	/// Get accounts' code size.
@@ -562,7 +626,6 @@ impl<B: Backend> State<B> {
 	}
 
 	/// Add `incr` to the balance of account `a`.
-	#[cfg_attr(feature="dev", allow(single_match))]
 	pub fn add_balance(&mut self, a: &Address, incr: &U256, cleanup_mode: CleanupMode) -> trie::Result<()> {
 		trace!(target: "state", "add_balance({}, {}): {}", a, incr, self.balance(a)?);
 		let is_value_transfer = !incr.is_zero();
@@ -603,7 +666,7 @@ impl<B: Backend> State<B> {
 
 	/// Mutate storage of account `a` so that it is `value` for `key`.
 	pub fn set_storage(&mut self, a: &Address, key: H256, value: H256) -> trie::Result<()> {
-		trace!(target: "state", "set_storage({}:{} to {})", a, key.hex(), value.hex());
+		trace!(target: "state", "set_storage({}:{:x} to {:x})", a, key, value);
 		if self.storage_at(a, &key)? != value {
 			self.require(a, false)?.set_storage(key, value)
 		}
@@ -626,13 +689,13 @@ impl<B: Backend> State<B> {
 
 	/// Execute a given transaction, producing a receipt and an optional trace.
 	/// This will change the state accordingly.
-	pub fn apply(&mut self, env_info: &EnvInfo, engine: &Engine, t: &SignedTransaction, tracing: bool) -> ApplyResult {
+	pub fn apply(&mut self, env_info: &EnvInfo, machine: &Machine, t: &SignedTransaction, tracing: bool) -> ApplyResult<FlatTrace, VMTrace> {
 		if tracing {
 			let options = TransactOptions::with_tracing();
-			self.apply_with_tracing(env_info, engine, t, options.tracer, options.vm_tracer)
+			self.apply_with_tracing(env_info, machine, t, options.tracer, options.vm_tracer)
 		} else {
 			let options = TransactOptions::with_no_tracing();
-			self.apply_with_tracing(env_info, engine, t, options.tracer, options.vm_tracer)
+			self.apply_with_tracing(env_info, machine, t, options.tracer, options.vm_tracer)
 		}
 	}
 
@@ -641,26 +704,36 @@ impl<B: Backend> State<B> {
 	pub fn apply_with_tracing<V, T>(
 		&mut self,
 		env_info: &EnvInfo,
-		engine: &Engine,
+		machine: &Machine,
 		t: &SignedTransaction,
 		tracer: T,
 		vm_tracer: V,
-	) -> ApplyResult where
+	) -> ApplyResult<T::Output, V::Output> where
 		T: trace::Tracer,
 		V: trace::VMTracer,
 	{
 		let options = TransactOptions::new(tracer, vm_tracer);
-		let e = self.execute(env_info, engine, t, options, false)?;
-
-		let state_root = if env_info.number < engine.params().eip98_transition || env_info.number < engine.params().validate_receipts_transition {
-			self.commit()?;
-			Some(self.root().clone())
+		let e = self.execute(env_info, machine, t, options, false)?;
+		let params = machine.params();
+
+		let eip658 = env_info.number >= params.eip658_transition;
+		let no_intermediate_commits =
+			eip658 ||
+			(env_info.number >= params.eip98_transition && env_info.number >= params.validate_receipts_transition);
+
+		let outcome = if no_intermediate_commits {
+			if eip658 {
+				TransactionOutcome::StatusCode(if e.exception.is_some() { 0 } else { 1 })
+			} else {
+				TransactionOutcome::Unknown
+			}
 		} else {
-			None
+			self.commit()?;
+			TransactionOutcome::StateRoot(self.root().clone())
 		};
 
 		let output = e.output;
-		let receipt = Receipt::new(state_root, e.cumulative_gas_used, e.logs);
+		let receipt = Receipt::new(outcome, e.cumulative_gas_used, e.logs);
 		trace!(target: "state", "Transaction receipt: {:?}", receipt);
 
 		Ok(ApplyOutcome {
@@ -675,10 +748,10 @@ impl<B: Backend> State<B> {
 	//
 	// `virt` signals that we are executing outside of a block set and restrictions like
 	// gas limits and gas costs should be lifted.
-	fn execute<T, V>(&mut self, env_info: &EnvInfo, engine: &Engine, t: &SignedTransaction, options: TransactOptions<T, V>, virt: bool)
-		-> Result<Executed, ExecutionError> where T: trace::Tracer, V: trace::VMTracer,
+	fn execute<T, V>(&mut self, env_info: &EnvInfo, machine: &Machine, t: &SignedTransaction, options: TransactOptions<T, V>, virt: bool)
+		-> Result<Executed<T::Output, V::Output>, ExecutionError> where T: trace::Tracer, V: trace::VMTracer,
 	{
-		let mut e = Executive::new(self, env_info, engine);
+		let mut e = Executive::new(self, env_info, machine);
 
 		match virt {
 			true => e.transact_virtual(t, options),
@@ -692,8 +765,6 @@ impl<B: Backend> State<B> {
 	}
 
 	/// Commits our cached account changes into the trie.
-	#[cfg_attr(feature="dev", allow(match_ref_pats))]
-	#[cfg_attr(feature="dev", allow(needless_borrow))]
 	pub fn commit(&mut self) -> Result<(), Error> {
 		// first, commit the sub trees.
 		let mut accounts = self.cache.borrow_mut();
@@ -811,27 +882,29 @@ impl<B: Backend> State<B> {
 
 	// load required account data from the databases.
 	fn update_account_cache(require: RequireCache, account: &mut Account, state_db: &B, db: &HashDB) {
-		match (account.is_cached(), require) {
-			(true, _) | (false, RequireCache::None) => {}
-			(false, require) => {
-				// if there's already code in the global cache, always cache it
-				// locally.
-				let hash = account.code_hash();
-				match state_db.get_cached_code(&hash) {
-					Some(code) => account.cache_given_code(code),
-					None => match require {
-						RequireCache::None => {},
-						RequireCache::Code => {
-							if let Some(code) = account.cache_code(db) {
-								// propagate code loaded from the database to
-								// the global code cache.
-								state_db.cache_code(hash, code)
-							}
-						}
-						RequireCache::CodeSize => {
-							account.cache_code_size(db);
-						}
+		if let RequireCache::None = require {
+			return;
+		}
+
+		if account.is_cached() {
+			return;
+		}
+
+		// if there's already code in the global cache, always cache it localy
+		let hash = account.code_hash();
+		match state_db.get_cached_code(&hash) {
+			Some(code) => account.cache_given_code(code),
+			None => match require {
+				RequireCache::None => {},
+				RequireCache::Code => {
+					if let Some(code) = account.cache_code(db) {
+						// propagate code loaded from the database to
+						// the global code cache.
+						state_db.cache_code(hash, code)
 					}
+				},
+				RequireCache::CodeSize => {
+					account.cache_code_size(db);
 				}
 			}
 		}
@@ -881,7 +954,7 @@ impl<B: Backend> State<B> {
 
 	/// Pull account `a` in our cache from the trie DB. `require_code` requires that the code be cached, too.
 	fn require<'a>(&'a self, a: &Address, require_code: bool) -> trie::Result<RefMut<'a, Account>> {
-		self.require_or_from(a, require_code, || Account::new_basic(U256::from(0u8), self.account_start_nonce), |_|{})
+		self.require_or_from(a, require_code, || Account::new_basic(0u8.into(), self.account_start_nonce), |_|{})
 	}
 
 	/// Pull account `a` in our cache from the trie DB. `require_code` requires that the code be cached, too.
@@ -908,7 +981,7 @@ impl<B: Backend> State<B> {
 
 		// at this point the entry is guaranteed to be in the cache.
 		Ok(RefMut::map(self.cache.borrow_mut(), |c| {
-			let mut entry = c.get_mut(a).expect("entry known to exist in the cache; qed");
+			let entry = c.get_mut(a).expect("entry known to exist in the cache; qed");
 
 			match &mut entry.account {
 				&mut Some(ref mut acc) => not_default(acc),
@@ -938,7 +1011,7 @@ impl<B: Backend> State<B> {
 	/// Returns a merkle proof of the account's trie node omitted or an encountered trie error.
 	/// If the account doesn't exist in the trie, prove that and return defaults.
 	/// Requires a secure trie to be used for accurate results.
-	/// `account_key` == sha3(address)
+	/// `account_key` == keccak(address)
 	pub fn prove_account(&self, account_key: H256) -> trie::Result<(Vec<Bytes>, BasicAccount)> {
 		let mut recorder = Recorder::new();
 		let trie = TrieDB::new(self.db.as_hashdb(), &self.root)?;
@@ -949,8 +1022,8 @@ impl<B: Backend> State<B> {
 		let account = maybe_account.unwrap_or_else(|| BasicAccount {
 			balance: 0.into(),
 			nonce: self.account_start_nonce,
-			code_hash: SHA3_EMPTY,
-			storage_root: ::util::sha3::SHA3_NULL_RLP,
+			code_hash: KECCAK_EMPTY,
+			storage_root: KECCAK_NULL_RLP,
 		});
 
 		Ok((recorder.drain().into_iter().map(|r| r.data).collect(), account))
@@ -959,11 +1032,11 @@ impl<B: Backend> State<B> {
 	/// Prove an account's storage key's existence or nonexistence in the state.
 	/// Returns a merkle proof of the account's storage trie.
 	/// Requires a secure trie to be used for correctness.
-	/// `account_key` == sha3(address)
-	/// `storage_key` == sha3(key)
+	/// `account_key` == keccak(address)
+	/// `storage_key` == keccak(key)
 	pub fn prove_storage(&self, account_key: H256, storage_key: H256) -> trie::Result<(Vec<Bytes>, H256)> {
 		// TODO: probably could look into cache somehow but it's keyed by
-		// address, not sha3(address).
+		// address, not keccak(address).
 		let trie = TrieDB::new(self.db.as_hashdb(), &self.root)?;
 		let acc = match trie.get_with(&account_key, Account::from_rlp)? {
 			Some(acc) => acc,
@@ -1008,14 +1081,15 @@ impl Clone for State<StateDB> {
 
 #[cfg(test)]
 mod tests {
-
 	use std::sync::Arc;
 	use std::str::FromStr;
 	use rustc_hex::FromHex;
+	use hash::keccak;
 	use super::*;
 	use ethkey::Secret;
-	use util::{U256, H256, Address, Hashable};
-	use tests::helpers::*;
+	use ethereum_types::{H256, U256, Address};
+	use tests::helpers::{get_temp_state, get_temp_state_db};
+	use machine::EthereumMachine;
 	use vm::EnvInfo;
 	use spec::*;
 	use transaction::*;
@@ -1024,7 +1098,13 @@ mod tests {
 	use evm::CallType;
 
 	fn secret() -> Secret {
-		"".sha3().into()
+		keccak("").into()
+	}
+
+	fn make_frontier_machine(max_depth: usize) -> EthereumMachine {
+		let mut machine = ::ethereum::new_frontier_test_machine();
+		machine.set_schedule_creation_rules(Box::new(move |s, _| s.max_depth = max_depth));
+		machine
 	}
 
 	#[test]
@@ -1035,7 +1115,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1047,7 +1127,7 @@ mod tests {
 		}.sign(&secret(), None);
 
 		state.add_balance(&t.sender(), &(100.into()), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
 			subtraces: 0,
@@ -1093,7 +1173,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1105,7 +1185,7 @@ mod tests {
 		}.sign(&secret(), None);
 
 		state.add_balance(&t.sender(), &(100.into()), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
 			action: trace::Action::Create(trace::Create {
@@ -1129,7 +1209,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1142,7 +1222,7 @@ mod tests {
 
 		state.init_code(&0xa.into(), FromHex::from_hex("6000").unwrap()).unwrap();
 		state.add_balance(&t.sender(), &(100.into()), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
 			action: trace::Action::Call(trace::Call {
@@ -1171,7 +1251,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1183,7 +1263,7 @@ mod tests {
 		}.sign(&secret(), None);
 
 		state.add_balance(&t.sender(), &(100.into()), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
 			action: trace::Action::Call(trace::Call {
@@ -1212,7 +1292,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = &*Spec::new_test().engine;
+		let machine = Spec::new_test_machine();
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1223,7 +1303,7 @@ mod tests {
 			data: vec![],
 		}.sign(&secret(), None);
 
-		let result = state.apply(&info, engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
@@ -1253,7 +1333,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = &*Spec::new_test().engine;
+		let machine = Spec::new_test_machine();
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1265,7 +1345,7 @@ mod tests {
 		}.sign(&secret(), None);
 
 		state.init_code(&0xa.into(), FromHex::from_hex("600060006000600060006001610be0f1").unwrap()).unwrap();
-		let result = state.apply(&info, engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
@@ -1278,7 +1358,7 @@ mod tests {
 				call_type: CallType::Call,
 			}),
 			result: trace::Res::Call(trace::CallResult {
-				gas_used: U256::from(28_061),
+				gas_used: U256::from(3_721), // in post-eip150
 				output: vec![]
 			}),
 			subtraces: 0,
@@ -1295,7 +1375,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = &*Spec::new_test().engine;
+		let machine = Spec::new_test_machine();
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1308,7 +1388,7 @@ mod tests {
 
 		state.init_code(&0xa.into(), FromHex::from_hex("60006000600060006000600b611000f2").unwrap()).unwrap();
 		state.init_code(&0xb.into(), FromHex::from_hex("6000").unwrap()).unwrap();
-		let result = state.apply(&info, engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
@@ -1322,7 +1402,7 @@ mod tests {
 				call_type: CallType::Call,
 			}),
 			result: trace::Res::Call(trace::CallResult {
-				gas_used: 64.into(),
+				gas_used: 724.into(), // in post-eip150
 				output: vec![]
 			}),
 		}, FlatTrace {
@@ -1346,7 +1426,7 @@ mod tests {
 	}
 
 	#[test]
-	fn should_not_trace_delegatecall() {
+	fn should_trace_delegatecall_properly() {
 		init_log();
 
 		let mut state = get_temp_state();
@@ -1354,9 +1434,7 @@ mod tests {
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
 		info.number = 0x789b0;
-		let engine = &*Spec::new_test().engine;
-
-		println!("schedule.have_delegate_call: {:?}", engine.schedule(info.number).have_delegate_call);
+		let machine = Spec::new_test_machine();
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1368,8 +1446,8 @@ mod tests {
 		}.sign(&secret(), None);
 
 		state.init_code(&0xa.into(), FromHex::from_hex("6000600060006000600b618000f4").unwrap()).unwrap();
-		state.init_code(&0xb.into(), FromHex::from_hex("6000").unwrap()).unwrap();
-		let result = state.apply(&info, engine, &t, true).unwrap();
+		state.init_code(&0xb.into(), FromHex::from_hex("60056000526001601ff3").unwrap()).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
@@ -1383,23 +1461,23 @@ mod tests {
 				call_type: CallType::Call,
 			}),
 			result: trace::Res::Call(trace::CallResult {
-				gas_used: U256::from(61),
+				gas_used: U256::from(736), // in post-eip150
 				output: vec![]
 			}),
 		}, FlatTrace {
 			trace_address: vec![0].into_iter().collect(),
 			subtraces: 0,
 			action: trace::Action::Call(trace::Call {
-				from: "9cce34f7ab185c7aba1b7c8140d620b4bda941d6".into(),
-				to: 0xa.into(),
+				from: 0xa.into(),
+				to: 0xb.into(),
 				value: 0.into(),
 				gas: 32768.into(),
 				input: vec![],
 				call_type: CallType::DelegateCall,
 			}),
 			result: trace::Res::Call(trace::CallResult {
-				gas_used: 3.into(),
-				output: vec![],
+				gas_used: 18.into(),
+				output: vec![5],
 			}),
 		}];
 
@@ -1414,7 +1492,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1427,7 +1505,7 @@ mod tests {
 
 		state.init_code(&0xa.into(), FromHex::from_hex("5b600056").unwrap()).unwrap();
 		state.add_balance(&t.sender(), &(100.into()), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
 			action: trace::Action::Call(trace::Call {
@@ -1453,7 +1531,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1467,7 +1545,7 @@ mod tests {
 		state.init_code(&0xa.into(), FromHex::from_hex("60006000600060006000600b602b5a03f1").unwrap()).unwrap();
 		state.init_code(&0xb.into(), FromHex::from_hex("6000").unwrap()).unwrap();
 		state.add_balance(&t.sender(), &(100.into()), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
@@ -1512,7 +1590,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1525,7 +1603,7 @@ mod tests {
 
 		state.init_code(&0xa.into(), FromHex::from_hex("60006000600060006045600b6000f1").unwrap()).unwrap();
 		state.add_balance(&t.sender(), &(100.into()), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
 			subtraces: 1,
@@ -1566,7 +1644,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1579,7 +1657,7 @@ mod tests {
 
 		state.init_code(&0xa.into(), FromHex::from_hex("600060006000600060ff600b6000f1").unwrap()).unwrap();	// not enough funds.
 		state.add_balance(&t.sender(), &(100.into()), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
 			subtraces: 0,
@@ -1608,7 +1686,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1622,7 +1700,7 @@ mod tests {
 		state.init_code(&0xa.into(), FromHex::from_hex("60006000600060006000600b602b5a03f1").unwrap()).unwrap();
 		state.init_code(&0xb.into(), FromHex::from_hex("5b600056").unwrap()).unwrap();
 		state.add_balance(&t.sender(), &(100.into()), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
 			subtraces: 1,
@@ -1663,7 +1741,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1678,7 +1756,7 @@ mod tests {
 		state.init_code(&0xb.into(), FromHex::from_hex("60006000600060006000600c602b5a03f1").unwrap()).unwrap();
 		state.init_code(&0xc.into(), FromHex::from_hex("6000").unwrap()).unwrap();
 		state.add_balance(&t.sender(), &(100.into()), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
 			subtraces: 1,
@@ -1737,7 +1815,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1752,7 +1830,7 @@ mod tests {
 		state.init_code(&0xb.into(), FromHex::from_hex("60006000600060006000600c602b5a03f1505b601256").unwrap()).unwrap();
 		state.init_code(&0xc.into(), FromHex::from_hex("6000").unwrap()).unwrap();
 		state.add_balance(&t.sender(), &(100.into()), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
@@ -1809,7 +1887,7 @@ mod tests {
 
 		let mut info = EnvInfo::default();
 		info.gas_limit = 1_000_000.into();
-		let engine = TestEngine::new(5);
+		let machine = make_frontier_machine(5);
 
 		let t = Transaction {
 			nonce: 0.into(),
@@ -1823,7 +1901,7 @@ mod tests {
 		state.init_code(&0xa.into(), FromHex::from_hex("73000000000000000000000000000000000000000bff").unwrap()).unwrap();
 		state.add_balance(&0xa.into(), &50.into(), CleanupMode::NoEmpty).unwrap();
 		state.add_balance(&t.sender(), &100.into(), CleanupMode::NoEmpty).unwrap();
-		let result = state.apply(&info, &engine, &t, true).unwrap();
+		let result = state.apply(&info, &machine, &t, true).unwrap();
 		let expected_trace = vec![FlatTrace {
 			trace_address: Default::default(),
 			subtraces: 1,
@@ -2029,7 +2107,7 @@ mod tests {
 		let a = Address::zero();
 		state.require(&a, false).unwrap();
 		state.commit().unwrap();
-		assert_eq!(state.root().hex(), "0ce23f3c809de377b008a4a3ee94a0834aac8bec1f86e28ffe4fdb5a15b0c785");
+		assert_eq!(*state.root(), "0ce23f3c809de377b008a4a3ee94a0834aac8bec1f86e28ffe4fdb5a15b0c785".into());
 	}
 
 	#[test]
@@ -2066,7 +2144,7 @@ mod tests {
 	fn create_empty() {
 		let mut state = get_temp_state();
 		state.commit().unwrap();
-		assert_eq!(state.root().hex(), "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421");
+		assert_eq!(*state.root(), "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421".into());
 	}
 
 	#[test]
diff --git a/ethcore/src/state/substate.rs b/ethcore/src/state/substate.rs
index 76f6eaed7165e91c394b65861f55db42f9edb96e..e70178a36255133565b01c84a031850ebed66a44 100644
--- a/ethcore/src/state/substate.rs
+++ b/ethcore/src/state/substate.rs
@@ -16,7 +16,7 @@
 
 //! Execution environment substate.
 use std::collections::HashSet;
-use util::{Address, U256};
+use ethereum_types::{U256, Address};
 use log_entry::LogEntry;
 use evm::{Schedule, CleanDustMode};
 use super::CleanupMode;
@@ -49,15 +49,14 @@ impl Substate {
 
 	/// Merge secondary substate `s` into self, accruing each element correspondingly.
 	pub fn accrue(&mut self, s: Substate) {
-		self.suicides.extend(s.suicides.into_iter());
-		self.touched.extend(s.touched.into_iter());
-		self.logs.extend(s.logs.into_iter());
+		self.suicides.extend(s.suicides);
+		self.touched.extend(s.touched);
+		self.logs.extend(s.logs);
 		self.sstore_clears_count = self.sstore_clears_count + s.sstore_clears_count;
-		self.contracts_created.extend(s.contracts_created.into_iter());
+		self.contracts_created.extend(s.contracts_created);
 	}
 
 	/// Get the cleanup mode object from this.
-	#[cfg_attr(feature="dev", allow(wrong_self_convention))]
 	pub fn to_cleanup_mode(&mut self, schedule: &Schedule) -> CleanupMode {
 		match (schedule.kill_dust != CleanDustMode::Off, schedule.no_empty, schedule.kill_empty) {
 			(false, false, _) => CleanupMode::ForceCreate,
diff --git a/ethcore/src/state_db.rs b/ethcore/src/state_db.rs
old mode 100644
new mode 100755
index e2f6fdaf0380a2046a0994010cc617a1903ecd1e..346ad9cc2a69f9a282c431e0d6cd30d9504c4360
--- a/ethcore/src/state_db.rs
+++ b/ethcore/src/state_db.rs
@@ -14,24 +14,36 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+//! State database abstraction. For more info, see the doc for `StateDB`
+
 use std::collections::{VecDeque, HashSet};
 use std::sync::Arc;
 use lru_cache::LruCache;
-use util::cache::MemoryLruCache;
-use util::journaldb::JournalDB;
-use util::kvdb::KeyValueDB;
-use util::hash::{H256};
-use util::hashdb::HashDB;
+use memory_cache::MemoryLruCache;
+use journaldb::JournalDB;
+use kvdb::{KeyValueDB, DBTransaction};
+use ethereum_types::{H256, Address};
+use hashdb::HashDB;
 use state::{self, Account};
 use header::BlockNumber;
-use util::{Address, DBTransaction, UtilError, Mutex, Hashable};
+use hash::keccak;
+use parking_lot::Mutex;
+use util_error::UtilError;
 use bloom_journal::{Bloom, BloomJournal};
 use db::COL_ACCOUNT_BLOOM;
 use byteorder::{LittleEndian, ByteOrder};
 
+/// Value used to initialize bloom bitmap size.
+///
+/// Bitmap size is the size in bytes (not bits) that will be allocated in memory.
 pub const ACCOUNT_BLOOM_SPACE: usize = 1048576;
+
+/// Value used to initialize bloom items count.
+///
+/// Items count is an estimation of the maximum number of items to store.
 pub const DEFAULT_ACCOUNT_PRESET: usize = 1000000;
 
+/// Key for a value storing amount of hashes
 pub const ACCOUNT_BLOOM_HASHCOUNT_KEY: &'static [u8] = b"account_hash_count";
 
 const STATE_CACHE_BLOCKS: usize = 12;
@@ -55,7 +67,7 @@ struct CacheQueueItem {
 	/// Account address.
 	address: Address,
 	/// Acccount data or `None` if account does not exist.
-	account: Option<Account>,
+	account: SyncAccount,
 	/// Indicates that the account was modified before being
 	/// added to the cache.
 	modified: bool,
@@ -167,6 +179,7 @@ impl StateDB {
 		bloom
 	}
 
+	/// Commit blooms journal to the database transaction
 	pub fn commit_bloom(batch: &mut DBTransaction, journal: BloomJournal) -> Result<(), UtilError> {
 		assert!(journal.hash_functions <= 255);
 		batch.put(COL_ACCOUNT_BLOOM, ACCOUNT_BLOOM_HASHCOUNT_KEY, &[journal.hash_functions as u8]);
@@ -208,7 +221,7 @@ impl StateDB {
 	pub fn sync_cache(&mut self, enacted: &[H256], retracted: &[H256], is_best: bool) {
 		trace!("sync_cache id = (#{:?}, {:?}), parent={:?}, best={}", self.commit_number, self.commit_hash, self.parent_hash, is_best);
 		let mut cache = self.account_cache.lock();
-		let mut cache = &mut *cache;
+		let cache = &mut *cache;
 
 		// Purge changes from re-enacted and retracted blocks.
 		// Filter out commiting block if any.
@@ -265,15 +278,16 @@ impl StateDB {
 					modifications.insert(account.address.clone());
 				}
 				if is_best {
+					let acc = account.account.0;
 					if let Some(&mut Some(ref mut existing)) = cache.accounts.get_mut(&account.address) {
-						if let Some(new) = account.account {
+						if let Some(new) =  acc {
 							if account.modified {
 								existing.overwrite_with(new);
 							}
 							continue;
 						}
 					}
-					cache.accounts.insert(account.address, account.account);
+					cache.accounts.insert(account.address, acc);
 				}
 			}
 
@@ -295,10 +309,12 @@ impl StateDB {
 		}
 	}
 
+	/// Conversion method to interpret self as `HashDB` reference
 	pub fn as_hashdb(&self) -> &HashDB {
 		self.db.as_hashdb()
 	}
 
+	/// Conversion method to interpret self as mutable `HashDB` reference
 	pub fn as_hashdb_mut(&mut self) -> &mut HashDB {
 		self.db.as_hashdb_mut()
 	}
@@ -405,7 +421,7 @@ impl state::Backend for StateDB {
 	fn add_to_account_cache(&mut self, addr: Address, data: Option<Account>, modified: bool) {
 		self.local_cache.push(CacheQueueItem {
 			address: addr,
-			account: data,
+			account: SyncAccount(data),
 			modified: modified,
 		})
 	}
@@ -424,13 +440,6 @@ impl state::Backend for StateDB {
 		cache.accounts.get_mut(addr).map(|a| a.as_ref().map(|a| a.clone_basic()))
 	}
 
-	#[cfg_attr(feature="dev", allow(map_clone))]
-	fn get_cached_code(&self, hash: &H256) -> Option<Arc<Vec<u8>>> {
-		let mut cache = self.code_cache.lock();
-
-		cache.get_mut(hash).map(|code| code.clone())
-	}
-
 	fn get_cached<F, U>(&self, a: &Address, f: F) -> Option<U>
 		where F: FnOnce(Option<&mut Account>) -> U {
 		let mut cache = self.account_cache.lock();
@@ -440,24 +449,38 @@ impl state::Backend for StateDB {
 		cache.accounts.get_mut(a).map(|c| f(c.as_mut()))
 	}
 
+	fn get_cached_code(&self, hash: &H256) -> Option<Arc<Vec<u8>>> {
+		let mut cache = self.code_cache.lock();
+
+		cache.get_mut(hash).map(|code| code.clone())
+	}
+
 	fn note_non_null_account(&self, address: &Address) {
 		trace!(target: "account_bloom", "Note account bloom: {:?}", address);
 		let mut bloom = self.account_bloom.lock();
-		bloom.set(&*address.sha3());
+		bloom.set(&*keccak(address));
 	}
 
 	fn is_known_null(&self, address: &Address) -> bool {
 		trace!(target: "account_bloom", "Check account bloom: {:?}", address);
 		let bloom = self.account_bloom.lock();
-		let is_null = !bloom.check(&*address.sha3());
+		let is_null = !bloom.check(&*keccak(address));
 		is_null
 	}
 }
 
+/// Sync wrapper for the account.
+struct SyncAccount(Option<Account>);
+/// That implementation is safe because account is never modified or accessed in any way.
+/// We only need `Sync` here to allow `StateDb` to be kept in a `RwLock`.
+/// `Account` is `!Sync` by default because of `RefCell`s inside it.
+unsafe impl Sync for SyncAccount {}
+
 #[cfg(test)]
 mod tests {
-	use util::{U256, H256, Address, DBTransaction};
-	use tests::helpers::*;
+	use ethereum_types::{H256, U256, Address};
+	use kvdb::DBTransaction;
+	use tests::helpers::{get_temp_state_db};
 	use state::{Account, Backend};
 	use ethcore_logger::init_log;
 
diff --git a/ethcore/src/tests/client.rs b/ethcore/src/tests/client.rs
index ea7dd32f5d9cac6dceee0b9870919bebcadf7cc5..2fee61412f21c1c8740c0de9d8b83b9e2821eafa 100644
--- a/ethcore/src/tests/client.rs
+++ b/ethcore/src/tests/client.rs
@@ -16,29 +16,34 @@
 
 use std::str::FromStr;
 use std::sync::Arc;
+use hash::keccak;
 use io::IoChannel;
-use client::{BlockChainClient, MiningBlockChainClient, Client, ClientConfig, BlockId};
+use client::{BlockChainClient, Client, ClientConfig, BlockId, ChainInfo, BlockInfo, PrepareOpenBlock, ImportSealedBlock, ImportBlock};
 use state::{self, State, CleanupMode};
 use executive::{Executive, TransactOptions};
 use ethereum;
 use block::IsBlock;
-use tests::helpers::*;
+use tests::helpers::{
+	generate_dummy_client, push_blocks_to_client, get_test_client_with_blocks, get_good_dummy_block_seq,
+	generate_dummy_client_with_data, get_good_dummy_block, get_bad_state_dummy_block
+};
 use types::filter::Filter;
-use util::*;
-use devtools::*;
+use ethereum_types::{U256, Address};
+use kvdb_rocksdb::{Database, DatabaseConfig};
 use miner::Miner;
 use spec::Spec;
 use views::BlockView;
 use ethkey::KeyPair;
 use transaction::{PendingTransaction, Transaction, Action, Condition};
 use miner::MinerService;
+use tempdir::TempDir;
 
 #[test]
 fn imports_from_empty() {
-	let dir = RandomTempPath::new();
-	let spec = get_test_spec();
+	let tempdir = TempDir::new("").unwrap();
+	let spec = Spec::new_test();
 	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
-	let client_db = Arc::new(Database::open(&db_config, dir.as_path().to_str().unwrap()).unwrap());
+	let client_db = Arc::new(Database::open(&db_config, tempdir.path().to_str().unwrap()).unwrap());
 
 	let client = Client::new(
 		ClientConfig::default(),
@@ -53,10 +58,10 @@ fn imports_from_empty() {
 
 #[test]
 fn should_return_registrar() {
-	let dir = RandomTempPath::new();
-	let spec = ethereum::new_morden(&dir);
+	let tempdir = TempDir::new("").unwrap();
+	let spec = ethereum::new_morden(&tempdir.path().to_owned());
 	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
-	let client_db = Arc::new(Database::open(&db_config, dir.as_path().to_str().unwrap()).unwrap());
+	let client_db = Arc::new(Database::open(&db_config, tempdir.path().to_str().unwrap()).unwrap());
 
 	let client = Client::new(
 		ClientConfig::default(),
@@ -75,7 +80,7 @@ fn should_return_registrar() {
 #[test]
 fn returns_state_root_basic() {
 	let client = generate_dummy_client(6);
-	let test_spec = get_test_spec();
+	let test_spec = Spec::new_test();
 	let genesis_header = test_spec.genesis_header();
 
 	assert!(client.state_data(genesis_header.state_root()).is_some());
@@ -83,10 +88,10 @@ fn returns_state_root_basic() {
 
 #[test]
 fn imports_good_block() {
-	let dir = RandomTempPath::new();
-	let spec = get_test_spec();
+	let tempdir = TempDir::new("").unwrap();
+	let spec = Spec::new_test();
 	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
-	let client_db = Arc::new(Database::open(&db_config, dir.as_path().to_str().unwrap()).unwrap());
+	let client_db = Arc::new(Database::open(&db_config, tempdir.path().to_str().unwrap()).unwrap());
 
 	let client = Client::new(
 		ClientConfig::default(),
@@ -108,10 +113,10 @@ fn imports_good_block() {
 
 #[test]
 fn query_none_block() {
-	let dir = RandomTempPath::new();
-	let spec = get_test_spec();
+	let tempdir = TempDir::new("").unwrap();
+	let spec = Spec::new_test();
 	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
-	let client_db = Arc::new(Database::open(&db_config, dir.as_path().to_str().unwrap()).unwrap());
+	let client_db = Arc::new(Database::open(&db_config, tempdir.path().to_str().unwrap()).unwrap());
 
 	let client = Client::new(
 		ClientConfig::default(),
@@ -192,7 +197,7 @@ fn imports_block_sequence() {
 #[test]
 fn can_collect_garbage() {
 	let client = generate_dummy_client(100);
-	client.tick();
+	client.tick(true);
 	assert!(client.blockchain_cache_info().blocks < 100 * 1024);
 }
 
@@ -254,16 +259,16 @@ fn can_mine() {
 
 	let b = client.prepare_open_block(Address::default(), (3141562.into(), 31415620.into()), vec![]).close();
 
-	assert_eq!(*b.block().header().parent_hash(), BlockView::new(&dummy_blocks[0]).header_view().sha3());
+	assert_eq!(*b.block().header().parent_hash(), BlockView::new(&dummy_blocks[0]).header_view().hash());
 }
 
 #[test]
 fn change_history_size() {
-	let dir = RandomTempPath::new();
+	let tempdir = TempDir::new("").unwrap();
 	let test_spec = Spec::new_null();
 	let mut config = ClientConfig::default();
 	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
-	let client_db = Arc::new(Database::open(&db_config, dir.as_path().to_str().unwrap()).unwrap());
+	let client_db = Arc::new(Database::open(&db_config, tempdir.path().to_str().unwrap()).unwrap());
 
 	config.history = 2;
 	let address = Address::random();
@@ -278,8 +283,8 @@ fn change_history_size() {
 
 		for _ in 0..20 {
 			let mut b = client.prepare_open_block(Address::default(), (3141562.into(), 31415620.into()), vec![]);
-			b.block_mut().fields_mut().state.add_balance(&address, &5.into(), CleanupMode::NoEmpty).unwrap();
-			b.block_mut().fields_mut().state.commit().unwrap();
+			b.block_mut().state_mut().add_balance(&address, &5.into(), CleanupMode::NoEmpty).unwrap();
+			b.block_mut().state_mut().commit().unwrap();
 			let b = b.close_and_lock().seal(&*test_spec.engine, vec![]).unwrap();
 			client.import_sealed_block(b).unwrap(); // account change is in the journal overlay
 		}
@@ -298,7 +303,7 @@ fn change_history_size() {
 
 #[test]
 fn does_not_propagate_delayed_transactions() {
-	let key = KeyPair::from_secret("test".sha3().into()).unwrap();
+	let key = KeyPair::from_secret(keccak("test").into()).unwrap();
 	let secret = key.secret();
 	let tx0 = PendingTransaction::new(Transaction {
 		nonce: 0.into(),
@@ -337,8 +342,8 @@ fn transaction_proof() {
 	let test_spec = Spec::new_test();
 	for _ in 0..20 {
 		let mut b = client.prepare_open_block(Address::default(), (3141562.into(), 31415620.into()), vec![]);
-		b.block_mut().fields_mut().state.add_balance(&address, &5.into(), CleanupMode::NoEmpty).unwrap();
-		b.block_mut().fields_mut().state.commit().unwrap();
+		b.block_mut().state_mut().add_balance(&address, &5.into(), CleanupMode::NoEmpty).unwrap();
+		b.block_mut().state_mut().commit().unwrap();
 		let b = b.close_and_lock().seal(&*test_spec.engine, vec![]).unwrap();
 		client.import_sealed_block(b).unwrap(); // account change is in the journal overlay
 	}
@@ -360,7 +365,7 @@ fn transaction_proof() {
 	let root = client.best_block_header().state_root();
 
 	let mut state = State::from_existing(backend, root, 0.into(), factories.clone()).unwrap();
-	Executive::new(&mut state, &client.latest_env_info(), &*test_spec.engine)
+	Executive::new(&mut state, &client.latest_env_info(), test_spec.engine.machine())
 		.transact(&transaction, TransactOptions::with_no_tracing().dont_check_nonce()).unwrap();
 
 	assert_eq!(state.balance(&Address::default()).unwrap(), 5.into());
diff --git a/ethcore/src/tests/evm.rs b/ethcore/src/tests/evm.rs
index 7b0e03d249cb3c9ac545ea6a13065b6c8a1bbe5c..39feb1364438d7b299b69ddc186d3bca7adb6bd6 100644
--- a/ethcore/src/tests/evm.rs
+++ b/ethcore/src/tests/evm.rs
@@ -1,27 +1,45 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
 //! Tests of EVM integration with transaction execution.
 
 use std::sync::Arc;
-use vm::{EnvInfo, ActionParams, ActionValue, CallType};
+use hash::keccak;
+use vm::{EnvInfo, ActionParams, ActionValue, CallType, ParamsType};
 use evm::{Factory, VMType};
 use executive::Executive;
 use state::Substate;
-use tests::helpers::*;
+use tests::helpers::get_temp_state_with_factory;
 use trace::{NoopVMTracer, NoopTracer};
 use transaction::SYSTEM_ADDRESS;
 
 use rustc_hex::FromHex;
 
-use util::*;
+use ethereum_types::{H256, Address};
+use bytes::BytesRef;
 
 evm_test!{test_blockhash_eip210: test_blockhash_eip210_jit, test_blockhash_eip210_int}
 fn test_blockhash_eip210(factory: Factory) {
 	let get_prev_hash_code = Arc::new("600143034060205260206020f3".from_hex().unwrap()); // this returns previous block hash
-	let get_prev_hash_code_hash = get_prev_hash_code.sha3();
+	let get_prev_hash_code_hash = keccak(get_prev_hash_code.as_ref());
 	// This is same as DEFAULT_BLOCKHASH_CONTRACT except for metropolis transition block check removed.
 	let test_blockhash_contract = "73fffffffffffffffffffffffffffffffffffffffe33141561007a57600143036020526000356101006020510755600061010060205107141561005057600035610100610100602051050761010001555b6000620100006020510714156100755760003561010062010000602051050761020001555b61014a565b4360003512151561009057600060405260206040f35b610100600035430312156100b357610100600035075460605260206060f3610149565b62010000600035430312156100d157600061010060003507146100d4565b60005b156100f6576101006101006000350507610100015460805260206080f3610148565b630100000060003543031215610116576000620100006000350714610119565b60005b1561013c57610100620100006000350507610200015460a052602060a0f3610147565b600060c052602060c0f35b5b5b5b5b";
 	let blockhash_contract_code = Arc::new(test_blockhash_contract.from_hex().unwrap());
-	let blockhash_contract_code_hash = blockhash_contract_code.sha3();
-	let engine = TestEngine::new_metropolis();
+	let blockhash_contract_code_hash = keccak(blockhash_contract_code.as_ref());
+	let machine = ::ethereum::new_constantinople_test_machine();
 	let mut env_info = EnvInfo::default();
 
 	// populate state with 256 last hashes
@@ -42,8 +60,9 @@ fn test_blockhash_eip210(factory: Factory) {
 			code_hash: Some(blockhash_contract_code_hash),
 			data: Some(H256::from(i - 1).to_vec()),
 			call_type: CallType::Call,
+			params_type: ParamsType::Separate,
 		};
-		let mut ex = Executive::new(&mut state, &env_info, &engine);
+		let mut ex = Executive::new(&mut state, &env_info, &machine);
 		let mut substate = Substate::new();
 		let mut output = [];
 		if let Err(e) = ex.call(params, &mut substate, BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer) {
@@ -64,8 +83,9 @@ fn test_blockhash_eip210(factory: Factory) {
 		code_hash: Some(get_prev_hash_code_hash),
 		data: None,
 		call_type: CallType::Call,
+		params_type: ParamsType::Separate,
 	};
-	let mut ex = Executive::new(&mut state, &env_info, &engine);
+	let mut ex = Executive::new(&mut state, &env_info, &machine);
 	let mut substate = Substate::new();
 	let mut output = H256::new();
 	if let Err(e) = ex.call(params, &mut substate, BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer) {
diff --git a/ethcore/src/tests/helpers.rs b/ethcore/src/tests/helpers.rs
index d8ba8313e917347691b480e312b38de67dd59e53..fd37164dcbbd71b3d88300187db6011e4f3d35dc 100644
--- a/ethcore/src/tests/helpers.rs
+++ b/ethcore/src/tests/helpers.rs
@@ -14,85 +14,28 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::collections::BTreeMap;
-use std::sync::Arc;
-use ethkey::KeyPair;
-use io::*;
-use client::{BlockChainClient, Client, ClientConfig};
-use util::*;
-use spec::*;
 use account_provider::AccountProvider;
-use state_db::StateDB;
+use ethereum_types::{H256, U256};
 use block::{OpenBlock, Drain};
 use blockchain::{BlockChain, Config as BlockChainConfig};
-use builtin::Builtin;
-use state::*;
-use evm::{Schedule, Factory as EvmFactory};
+use bytes::Bytes;
+use client::{Client, ClientConfig, ChainInfo, ImportBlock, ChainNotify};
+use ethkey::KeyPair;
+use evm::Factory as EvmFactory;
 use factory::Factories;
-use engines::Engine;
-use ethereum;
-use ethereum::ethash::EthashParams;
-use miner::Miner;
+use hash::keccak;
 use header::Header;
-use transaction::{Action, Transaction, SignedTransaction};
+use io::*;
+use miner::Miner;
+use parking_lot::RwLock;
 use rlp::{self, RlpStream};
+use spec::Spec;
+use state_db::StateDB;
+use state::*;
+use std::sync::Arc;
+use transaction::{Action, Transaction, SignedTransaction};
 use views::BlockView;
 
-#[cfg(feature = "json-tests")]
-pub enum ChainEra {
-	Frontier,
-	Homestead,
-	Eip150,
-	_Eip161,
-	TransitionTest,
-}
-
-pub struct TestEngine {
-	engine: Arc<Engine>,
-	max_depth: usize,
-}
-
-impl TestEngine {
-	pub fn new(max_depth: usize) -> TestEngine {
-		TestEngine {
-			engine: ethereum::new_frontier_test().engine,
-			max_depth: max_depth,
-		}
-	}
-
-	pub fn new_metropolis() -> TestEngine {
-		TestEngine {
-			engine: ethereum::new_metropolis_test().engine,
-			max_depth: 0,
-		}
-	}
-}
-
-impl Engine for TestEngine {
-	fn name(&self) -> &str {
-		"TestEngine"
-	}
-
-	fn params(&self) -> &CommonParams {
-		self.engine.params()
-	}
-
-	fn builtins(&self) -> &BTreeMap<Address, Builtin> {
-		self.engine.builtins()
-	}
-
-	fn schedule(&self, _block_number: u64) -> Schedule {
-		let mut schedule = self.engine.schedule(0);
-		schedule.max_depth = self.max_depth;
-		schedule
-	}
-}
-
-// TODO: move everything over to get_null_spec.
-pub fn get_test_spec() -> Spec {
-	Spec::new_test()
-}
-
 pub fn create_test_block(header: &Header) -> Bytes {
 	let mut rlp = RlpStream::new_list(3);
 	rlp.append(header);
@@ -150,16 +93,16 @@ pub fn generate_dummy_client_with_data(block_number: u32, txs_per_block: usize,
 }
 
 
-pub fn generate_dummy_client_with_spec_and_data<F>(get_test_spec: F, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> Arc<Client> where F: Fn()->Spec {
-	generate_dummy_client_with_spec_accounts_and_data(get_test_spec, None, block_number, txs_per_block, tx_gas_prices)
+pub fn generate_dummy_client_with_spec_and_data<F>(test_spec: F, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> Arc<Client> where F: Fn()->Spec {
+	generate_dummy_client_with_spec_accounts_and_data(test_spec, None, block_number, txs_per_block, tx_gas_prices)
 }
 
-pub fn generate_dummy_client_with_spec_and_accounts<F>(get_test_spec: F, accounts: Option<Arc<AccountProvider>>) -> Arc<Client> where F: Fn()->Spec {
-	generate_dummy_client_with_spec_accounts_and_data(get_test_spec, accounts, 0, 0, &[])
+pub fn generate_dummy_client_with_spec_and_accounts<F>(test_spec: F, accounts: Option<Arc<AccountProvider>>) -> Arc<Client> where F: Fn()->Spec {
+	generate_dummy_client_with_spec_accounts_and_data(test_spec, accounts, 0, 0, &[])
 }
 
-pub fn generate_dummy_client_with_spec_accounts_and_data<F>(get_test_spec: F, accounts: Option<Arc<AccountProvider>>, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> Arc<Client> where F: Fn()->Spec {
-	let test_spec = get_test_spec();
+pub fn generate_dummy_client_with_spec_accounts_and_data<F>(test_spec: F, accounts: Option<Arc<AccountProvider>>, block_number: u32, txs_per_block: usize, tx_gas_prices: &[U256]) -> Arc<Client> where F: Fn()->Spec {
+	let test_spec = test_spec();
 	let client_db = new_db();
 
 	let client = Client::new(
@@ -178,7 +121,7 @@ pub fn generate_dummy_client_with_spec_accounts_and_data<F>(get_test_spec: F, ac
 	let mut last_hashes = vec![];
 	let mut last_header = genesis_header.clone();
 
-	let kp = KeyPair::from_secret_slice(&"".sha3()).unwrap();
+	let kp = KeyPair::from_secret_slice(&keccak("")).unwrap();
 	let author = kp.address();
 
 	let mut n = 0;
@@ -198,7 +141,6 @@ pub fn generate_dummy_client_with_spec_accounts_and_data<F>(get_test_spec: F, ac
 			vec![],
 			false,
 		).unwrap();
-		b.set_difficulty(U256::from(0x20000));
 		rolling_timestamp += 10;
 		b.set_timestamp(rolling_timestamp);
 
@@ -230,10 +172,10 @@ pub fn generate_dummy_client_with_spec_accounts_and_data<F>(get_test_spec: F, ac
 }
 
 pub fn push_blocks_to_client(client: &Arc<Client>, timestamp_salt: u64, starting_number: usize, block_number: usize) {
-	let test_spec = get_test_spec();
-	let test_engine = &test_spec.engine;
-	//let test_engine = test_spec.to_engine().unwrap();
+	let test_spec = Spec::new_test();
 	let state_root = test_spec.genesis_header().state_root().clone();
+	let genesis_gas = test_spec.genesis_header().gas_limit().clone();
+
 	let mut rolling_hash = client.chain_info().best_block_hash;
 	let mut rolling_block_number = starting_number as u64;
 	let mut rolling_timestamp = timestamp_salt + starting_number as u64 * 10;
@@ -241,7 +183,7 @@ pub fn push_blocks_to_client(client: &Arc<Client>, timestamp_salt: u64, starting
 	for _ in 0..block_number {
 		let mut header = Header::new();
 
-		header.set_gas_limit(test_engine.params().min_gas_limit);
+		header.set_gas_limit(genesis_gas);
 		header.set_difficulty(U256::from(0x20000));
 		header.set_timestamp(rolling_timestamp);
 		header.set_number(rolling_block_number);
@@ -259,7 +201,7 @@ pub fn push_blocks_to_client(client: &Arc<Client>, timestamp_salt: u64, starting
 }
 
 pub fn get_test_client_with_blocks(blocks: Vec<Bytes>) -> Arc<Client> {
-	let test_spec = get_test_spec();
+	let test_spec = Spec::new_test();
 	let client_db = new_db();
 
 	let client = Client::new(
@@ -270,9 +212,9 @@ pub fn get_test_client_with_blocks(blocks: Vec<Bytes>) -> Arc<Client> {
 		IoChannel::disconnected(),
 	).unwrap();
 
-	for block in &blocks {
-		if client.import_block(block.clone()).is_err() {
-			panic!("panic importing block which is well-formed");
+	for block in blocks {
+		if let Err(e) = client.import_block(block) {
+			panic!("error importing block which is well-formed: {:?}", e);
 		}
 	}
 	client.flush_queue();
@@ -280,8 +222,8 @@ pub fn get_test_client_with_blocks(blocks: Vec<Bytes>) -> Arc<Client> {
 	client
 }
 
-fn new_db() -> Arc<KeyValueDB> {
-	Arc::new(::util::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)))
+fn new_db() -> Arc<::kvdb::KeyValueDB> {
+	Arc::new(::kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0)))
 }
 
 pub fn generate_dummy_blockchain(block_number: u32) -> BlockChain {
@@ -325,30 +267,30 @@ pub fn get_temp_state() -> State<::state_db::StateDB> {
 pub fn get_temp_state_with_factory(factory: EvmFactory) -> State<::state_db::StateDB> {
 	let journal_db = get_temp_state_db();
 	let mut factories = Factories::default();
-	factories.vm = factory;
+	factories.vm = factory.into();
 	State::new(journal_db, U256::from(0), factories)
 }
 
 pub fn get_temp_state_db() -> StateDB {
 	let db = new_db();
-	let journal_db = journaldb::new(db, journaldb::Algorithm::EarlyMerge, ::db::COL_STATE);
+	let journal_db = ::journaldb::new(db, ::journaldb::Algorithm::EarlyMerge, ::db::COL_STATE);
 	StateDB::new(journal_db, 5 * 1024 * 1024)
 }
 
 pub fn get_good_dummy_block_seq(count: usize) -> Vec<Bytes> {
-	let test_spec = get_test_spec();
+	let test_spec = Spec::new_test();
 	get_good_dummy_block_fork_seq(1, count, &test_spec.genesis_header().hash())
 }
 
 pub fn get_good_dummy_block_fork_seq(start_number: usize, count: usize, parent_hash: &H256) -> Vec<Bytes> {
-	let test_spec = get_test_spec();
-	let test_engine = &test_spec.engine;
+	let test_spec = Spec::new_test();
+	let genesis_gas = test_spec.genesis_header().gas_limit().clone();
 	let mut rolling_timestamp = start_number as u64 * 10;
 	let mut parent = *parent_hash;
 	let mut r = Vec::new();
 	for i in start_number .. start_number + count + 1 {
 		let mut block_header = Header::new();
-		block_header.set_gas_limit(test_engine.params().min_gas_limit);
+		block_header.set_gas_limit(genesis_gas);
 		block_header.set_difficulty(U256::from(i) * U256([0, 1, 0, 0]));
 		block_header.set_timestamp(rolling_timestamp);
 		block_header.set_number(i as u64);
@@ -365,9 +307,9 @@ pub fn get_good_dummy_block_fork_seq(start_number: usize, count: usize, parent_h
 
 pub fn get_good_dummy_block_hash() -> (H256, Bytes) {
 	let mut block_header = Header::new();
-	let test_spec = get_test_spec();
-	let test_engine = &test_spec.engine;
-	block_header.set_gas_limit(test_engine.params().min_gas_limit);
+	let test_spec = Spec::new_test();
+	let genesis_gas = test_spec.genesis_header().gas_limit().clone();
+	block_header.set_gas_limit(genesis_gas);
 	block_header.set_difficulty(U256::from(0x20000));
 	block_header.set_timestamp(40);
 	block_header.set_number(1);
@@ -384,9 +326,10 @@ pub fn get_good_dummy_block() -> Bytes {
 
 pub fn get_bad_state_dummy_block() -> Bytes {
 	let mut block_header = Header::new();
-	let test_spec = get_test_spec();
-	let test_engine = &test_spec.engine;
-	block_header.set_gas_limit(test_engine.params().min_gas_limit);
+	let test_spec = Spec::new_test();
+	let genesis_gas = test_spec.genesis_header().gas_limit().clone();
+
+	block_header.set_gas_limit(genesis_gas);
 	block_header.set_difficulty(U256::from(0x20000));
 	block_header.set_timestamp(40);
 	block_header.set_number(1);
@@ -396,32 +339,13 @@ pub fn get_bad_state_dummy_block() -> Bytes {
 	create_test_block(&block_header)
 }
 
-pub fn get_default_ethash_params() -> EthashParams {
-	EthashParams {
-		minimum_difficulty: U256::from(131072),
-		difficulty_bound_divisor: U256::from(2048),
-		difficulty_increment_divisor: 10,
-		metropolis_difficulty_increment_divisor: 9,
-		duration_limit: 13,
-		homestead_transition: 1150000,
-		dao_hardfork_transition: u64::max_value(),
-		dao_hardfork_beneficiary: "0000000000000000000000000000000000000001".into(),
-		dao_hardfork_accounts: vec![],
-		difficulty_hardfork_transition: u64::max_value(),
-		difficulty_hardfork_bound_divisor: U256::from(0),
-		bomb_defuse_transition: u64::max_value(),
-		eip100b_transition: u64::max_value(),
-		eip150_transition: u64::max_value(),
-		eip160_transition: u64::max_value(),
-		eip161abc_transition: u64::max_value(),
-		eip161d_transition: u64::max_value(),
-		ecip1010_pause_transition: u64::max_value(),
-		ecip1010_continue_transition: u64::max_value(),
-		ecip1017_era_rounds: u64::max_value(),
-		max_code_size: u64::max_value(),
-		max_gas_limit_transition: u64::max_value(),
-		max_gas_limit: U256::max_value(),
-		min_gas_price_transition: u64::max_value(),
-		min_gas_price: U256::zero(),
+#[derive(Default)]
+pub struct TestNotify {
+	pub messages: RwLock<Vec<Bytes>>,
+}
+
+impl ChainNotify for TestNotify {
+	fn broadcast(&self, data: Vec<u8>) {
+		self.messages.write().push(data);
 	}
 }
diff --git a/ethcore/src/tests/mod.rs b/ethcore/src/tests/mod.rs
index 31f195725b65a10efc20a548ce34c095c07b228e..eec71efafbfc10355679f2c456223f96a8acb312 100644
--- a/ethcore/src/tests/mod.rs
+++ b/ethcore/src/tests/mod.rs
@@ -17,7 +17,4 @@
 pub mod helpers;
 mod client;
 mod evm;
-
-#[cfg(feature="ipc")]
-mod rpc;
-
+mod trace;
diff --git a/ethcore/src/tests/rpc.rs b/ethcore/src/tests/rpc.rs
deleted file mode 100644
index 6444daa56b5d156b262a2021b4a58a73930f6c75..0000000000000000000000000000000000000000
--- a/ethcore/src/tests/rpc.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Client RPC tests
-
-use nanoipc;
-use std::sync::Arc;
-use std::sync::atomic::{Ordering, AtomicBool};
-use client::{Client, BlockChainClient, ClientConfig, BlockId};
-use client::remote::RemoteClient;
-use tests::helpers::*;
-use devtools::*;
-use miner::Miner;
-use crossbeam;
-use io::IoChannel;
-use util::kvdb::DatabaseConfig;
-
-pub fn run_test_worker(scope: &crossbeam::Scope, stop: Arc<AtomicBool>, socket_path: &str) {
-	let socket_path = socket_path.to_owned();
-	scope.spawn(move || {
-		let temp = RandomTempPath::create_dir();
-		let spec = get_test_spec();
-		let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
-
-		let client = Client::new(
-			ClientConfig::default(),
-			&spec,
-			temp.as_path(),
-			Arc::new(Miner::with_spec(&spec)),
-			IoChannel::disconnected(),
-			&db_config
-		).unwrap();
-		let mut worker = nanoipc::Worker::new(&(client as Arc<BlockChainClient>));
-		worker.add_reqrep(&socket_path).unwrap();
-		while !stop.load(Ordering::Relaxed) {
-			worker.poll();
-		}
-	});
-}
-
-#[test]
-fn can_handshake() {
-	crossbeam::scope(|scope| {
-		let stop_guard = StopGuard::new();
-		let socket_path = "ipc:///tmp/parity-client-rpc-10.ipc";
-		run_test_worker(scope, stop_guard.share(), socket_path);
-		let remote_client = nanoipc::generic_client::<RemoteClient<_>>(socket_path).unwrap();
-
-		assert!(remote_client.handshake().is_ok());
-	})
-}
-
-#[test]
-fn can_query_block() {
-	crossbeam::scope(|scope| {
-		let stop_guard = StopGuard::new();
-		let socket_path = "ipc:///tmp/parity-client-rpc-20.ipc";
-		run_test_worker(scope, stop_guard.share(), socket_path);
-		let remote_client = nanoipc::generic_client::<RemoteClient<_>>(socket_path).unwrap();
-
-		let non_existant_block = remote_client.block_header(BlockId::Number(999));
-
-		assert!(non_existant_block.is_none());
-	})
-}
diff --git a/ethcore/src/tests/trace.rs b/ethcore/src/tests/trace.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5483c626342f60f7d2afb672da02991615a75b95
--- /dev/null
+++ b/ethcore/src/tests/trace.rs
@@ -0,0 +1,208 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Client tests of tracing
+
+use tempdir::TempDir;
+use ethkey::KeyPair;
+use hash::keccak;
+use block::*;
+use ethereum_types::{U256, Address};
+use io::*;
+use spec::*;
+use client::*;
+use tests::helpers::get_temp_state_db;
+use client::{BlockChainClient, Client, ClientConfig};
+use kvdb_rocksdb::{Database, DatabaseConfig};
+use std::sync::Arc;
+use header::Header;
+use miner::Miner;
+use transaction::{Action, Transaction};
+use views::BlockView;
+use trace::{RewardType, LocalizedTrace};
+use trace::trace::Action::Reward;
+
+#[test]
+fn can_trace_block_and_uncle_reward() {
+	let tempdir = TempDir::new("").unwrap();
+	let spec = Spec::new_test_with_reward();
+	let engine = &*spec.engine;
+
+	// Create client
+	let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS);
+	let mut client_config = ClientConfig::default();
+	client_config.tracing.enabled = true;
+	let client_db = Arc::new(Database::open(&db_config, tempdir.path().to_str().unwrap()).unwrap());
+	let client = Client::new(
+		client_config,
+		&spec,
+		client_db,
+		Arc::new(Miner::with_spec(&spec)),
+		IoChannel::disconnected(),
+	).unwrap();
+
+	// Create test data:
+	// genesis
+	//    |
+	// root_block
+	//    |
+	// parent_block
+	//    |
+	// block with transaction and uncle
+
+	let genesis_header = spec.genesis_header();
+	let genesis_gas = genesis_header.gas_limit().clone();
+
+	let mut db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
+	let mut rolling_timestamp = 40;
+	let mut last_hashes = vec![];
+	let mut last_header = genesis_header.clone();
+	last_hashes.push(last_header.hash());
+
+	let kp = KeyPair::from_secret_slice(&keccak("")).unwrap();
+	let author = kp.address();
+
+	// Add root block first
+	let mut root_block = OpenBlock::new(
+		engine,
+		Default::default(),
+		false,
+		db,
+		&last_header,
+		Arc::new(last_hashes.clone()),
+		author.clone(),
+		(3141562.into(), 31415620.into()),
+		vec![],
+		false,
+	).unwrap();
+	rolling_timestamp += 10;
+	root_block.set_timestamp(rolling_timestamp);
+
+	let root_block = root_block.close_and_lock().seal(engine, vec![]).unwrap();
+
+	if let Err(e) = client.import_block(root_block.rlp_bytes()) {
+		panic!("error importing block which is valid by definition: {:?}", e);
+	}
+
+	last_header = BlockView::new(&root_block.rlp_bytes()).header();
+	let root_header = last_header.clone();
+	db = root_block.drain();
+
+	last_hashes.push(last_header.hash());
+
+	// Add parent block
+	let mut parent_block = OpenBlock::new(
+		engine,
+		Default::default(),
+		false,
+		db,
+		&last_header,
+		Arc::new(last_hashes.clone()),
+		author.clone(),
+		(3141562.into(), 31415620.into()),
+		vec![],
+		false,
+	).unwrap();
+	rolling_timestamp += 10;
+	parent_block.set_timestamp(rolling_timestamp);
+
+	let parent_block = parent_block.close_and_lock().seal(engine, vec![]).unwrap();
+
+	if let Err(e) = client.import_block(parent_block.rlp_bytes()) {
+		panic!("error importing block which is valid by definition: {:?}", e);
+	}
+
+	last_header = BlockView::new(&parent_block.rlp_bytes()).header();
+	db = parent_block.drain();
+
+	last_hashes.push(last_header.hash());
+
+	// Add testing block with transaction and uncle
+	let mut block = OpenBlock::new(
+		engine,
+		Default::default(),
+		true,
+		db,
+		&last_header,
+		Arc::new(last_hashes.clone()),
+		author.clone(),
+		(3141562.into(), 31415620.into()),
+		vec![],
+		false
+		).unwrap();
+	rolling_timestamp += 10;
+	block.set_timestamp(rolling_timestamp);
+
+	let mut n = 0;
+	for _ in 0..1 {
+		block.push_transaction(Transaction {
+			nonce: n.into(),
+			gas_price: 10000.into(),
+			gas: 100000.into(),
+			action: Action::Create,
+			data: vec![],
+			value: U256::zero(),
+		}.sign(kp.secret(), Some(spec.network_id())), None).unwrap();
+		n += 1;
+	}
+
+	let mut uncle = Header::new();
+	let uncle_author: Address = "ef2d6d194084c2de36e0dabfce45d046b37d1106".into();
+	uncle.set_author(uncle_author);
+	uncle.set_parent_hash(root_header.hash());
+	uncle.set_gas_limit(genesis_gas);
+	uncle.set_number(root_header.number() + 1);
+	uncle.set_timestamp(rolling_timestamp);
+	block.push_uncle(uncle).unwrap();
+
+	let block = block.close_and_lock().seal(engine, vec![]).unwrap();
+
+	let res = client.import_block(block.rlp_bytes());
+	if res.is_err() {
+		panic!("error importing block: {:#?}", res.err().unwrap());
+	}
+
+	block.drain();
+	client.flush_queue();
+	client.import_verified_blocks();
+
+	// Test0. Check overall filter
+	let filter = TraceFilter {
+		range: (BlockId::Number(1)..BlockId::Number(3)),
+		from_address: vec![],
+		to_address: vec![],
+		after: None,
+		count: None,
+	};
+
+	let traces = client.filter_traces(filter);
+	assert!(traces.is_some(), "Filtered traces should be present");
+	let traces_vec = traces.unwrap();
+	let block_reward_traces: Vec<LocalizedTrace> = traces_vec.clone().into_iter().filter(|trace| match (trace).action {
+		Reward(ref a) => a.reward_type == RewardType::Block,
+		_ => false,
+	}).collect();
+	assert_eq!(block_reward_traces.len(), 3);
+	let uncle_reward_traces: Vec<LocalizedTrace> = traces_vec.clone().into_iter().filter(|trace| match (trace).action {
+		Reward(ref a) => a.reward_type == RewardType::Uncle,
+		_ => false,
+	}).collect();
+	assert_eq!(uncle_reward_traces.len(), 1);
+
+	// Test1. Check block filter
+	let traces = client.block_traces(BlockId::Number(3));
+	assert_eq!(traces.unwrap().len(), 3);
+}
diff --git a/ethcore/src/trace/bloom.rs b/ethcore/src/trace/bloom.rs
deleted file mode 100644
index ed34d650510c98e68657131d923f5799ff22ef95..0000000000000000000000000000000000000000
--- a/ethcore/src/trace/bloom.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use bloomchain::Bloom;
-use bloomchain::group::{BloomGroup, GroupPosition};
-use basic_types::LogBloom;
-
-/// Helper structure representing bloom of the trace.
-#[derive(Clone, RlpEncodableWrapper, RlpDecodableWrapper)]
-pub struct BlockTracesBloom(LogBloom);
-
-impl From<LogBloom> for BlockTracesBloom {
-	fn from(bloom: LogBloom) -> BlockTracesBloom {
-		BlockTracesBloom(bloom)
-	}
-}
-
-impl From<Bloom> for BlockTracesBloom {
-	fn from(bloom: Bloom) -> BlockTracesBloom {
-		let bytes: [u8; 256] = bloom.into();
-		BlockTracesBloom(LogBloom::from(bytes))
-	}
-}
-
-impl Into<Bloom> for BlockTracesBloom {
-	fn into(self) -> Bloom {
-		let log = self.0;
-		Bloom::from(log.0)
-	}
-}
-
-/// Represents group of X consecutive blooms.
-#[derive(Clone, RlpEncodableWrapper, RlpDecodableWrapper)]
-pub struct BlockTracesBloomGroup {
-	blooms: Vec<BlockTracesBloom>,
-}
-
-impl From<BloomGroup> for BlockTracesBloomGroup {
-	fn from(group: BloomGroup) -> Self {
-		let blooms = group.blooms
-			.into_iter()
-			.map(From::from)
-			.collect();
-
-		BlockTracesBloomGroup {
-			blooms: blooms
-		}
-	}
-}
-
-impl Into<BloomGroup> for BlockTracesBloomGroup {
-	fn into(self) -> BloomGroup {
-		let blooms = self.blooms
-			.into_iter()
-			.map(Into::into)
-			.collect();
-
-		BloomGroup {
-			blooms: blooms
-		}
-	}
-}
-
-/// Represents `BloomGroup` position in database.
-#[derive(PartialEq, Eq, Hash, Clone, Debug)]
-pub struct TraceGroupPosition {
-	/// Bloom level.
-	pub level: u8,
-	/// Group index.
-	pub index: u32,
-}
-
-impl From<GroupPosition> for TraceGroupPosition {
-	fn from(p: GroupPosition) -> Self {
-		TraceGroupPosition {
-			level: p.level as u8,
-			index: p.index as u32,
-		}
-	}
-}
diff --git a/ethcore/src/trace/db.rs b/ethcore/src/trace/db.rs
index fe90ffe418c00ce8dde9b8a5725f26ba1ea79056..45b9ebc150acf02c4606edf029dd51129be00d13 100644
--- a/ethcore/src/trace/db.rs
+++ b/ethcore/src/trace/db.rs
@@ -20,7 +20,10 @@ use std::collections::{HashMap, VecDeque};
 use std::sync::Arc;
 use bloomchain::{Number, Config as BloomConfig};
 use bloomchain::group::{BloomGroupDatabase, BloomGroupChain, GroupPosition, BloomGroup};
-use util::{H256, H264, KeyValueDB, DBTransaction, RwLock, HeapSizeOf};
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, H264};
+use kvdb::{KeyValueDB, DBTransaction};
+use parking_lot::RwLock;
 use header::BlockNumber;
 use trace::{LocalizedTrace, Config, Filter, Database as TraceDatabase, ImportRequest, DatabaseExtras};
 use db::{self, Key, Writable, Readable, CacheUpdatePolicy};
@@ -31,7 +34,6 @@ use cache_manager::CacheManager;
 const TRACE_DB_VER: &'static [u8] = b"1.0";
 
 #[derive(Debug, Copy, Clone)]
-#[cfg_attr(feature="dev", allow(enum_variant_names))]
 enum TraceDBIndex {
 	/// Block traces index.
 	BlockTraces = 0,
@@ -99,7 +101,12 @@ enum CacheId {
 	Bloom(TraceGroupPosition),
 }
 
-/// Trace database.
+/// Database to store transaction execution trace.
+///
+/// Whenever a transaction is executed by EVM it's execution trace is stored
+/// in trace database. Each trace has information, which contracts have been
+/// touched, which have been created during the execution of transaction, and
+/// which calls failed.
 pub struct TraceDB<T> where T: DatabaseExtras {
 	// cache
 	traces: RwLock<HashMap<H256, FlatBlockTraces>>,
@@ -215,8 +222,11 @@ impl<T> TraceDB<T> where T: DatabaseExtras {
 		block_number: BlockNumber,
 		tx_number: usize
 	) -> Vec<LocalizedTrace> {
-		let tx_hash = self.extras.transaction_hash(block_number, tx_number)
-			.expect("Expected to find transaction hash. Database is probably corrupted");
+		let (trace_tx_number, trace_tx_hash) = match self.extras.transaction_hash(block_number, tx_number) {
+			Some(hash) => (Some(tx_number), Some(hash.clone())),
+			//None means trace without transaction (reward)
+			None => (None, None),
+		};
 
 		let flat_traces: Vec<FlatTrace> = traces.into();
 		flat_traces.into_iter()
@@ -227,8 +237,8 @@ impl<T> TraceDB<T> where T: DatabaseExtras {
 						result: trace.result,
 						subtraces: trace.subtraces,
 						trace_address: trace.trace_address.into_iter().collect(),
-						transaction_number: tx_number,
-						transaction_hash: tx_hash.clone(),
+						transaction_number: trace_tx_number,
+						transaction_hash: trace_tx_hash,
 						block_number: block_number,
 						block_hash: block_hash
 					}),
@@ -274,8 +284,6 @@ impl<T> TraceDatabase for TraceDB<T> where T: DatabaseExtras {
 				} else {
 					self.traces(block_hash).expect("Traces database is incomplete.").bloom()
 				})
-				.map(blooms::Bloom::from)
-				.map(Into::into)
 				.collect();
 
 			let chain = BloomGroupChain::new(self.bloom_config, self);
@@ -321,8 +329,8 @@ impl<T> TraceDatabase for TraceDB<T> where T: DatabaseExtras {
 						result: trace.result,
 						subtraces: trace.subtraces,
 						trace_address: trace.trace_address.into_iter().collect(),
-						transaction_number: tx_position,
-						transaction_hash: tx_hash,
+						transaction_number: Some(tx_position),
+						transaction_hash: Some(tx_hash),
 						block_number: block_number,
 						block_hash: block_hash,
 					}
@@ -345,8 +353,8 @@ impl<T> TraceDatabase for TraceDB<T> where T: DatabaseExtras {
 						result: trace.result,
 						subtraces: trace.subtraces,
 						trace_address: trace.trace_address.into_iter().collect(),
-						transaction_number: tx_position,
-						transaction_hash: tx_hash.clone(),
+						transaction_number: Some(tx_position),
+						transaction_hash: Some(tx_hash.clone()),
 						block_number: block_number,
 						block_hash: block_hash
 					})
@@ -363,8 +371,11 @@ impl<T> TraceDatabase for TraceDB<T> where T: DatabaseExtras {
 						.map(Into::<Vec<FlatTrace>>::into)
 						.enumerate()
 						.flat_map(|(tx_position, traces)| {
-							let tx_hash = self.extras.transaction_hash(block_number, tx_position)
-								.expect("Expected to find transaction hash. Database is probably corrupted");
+							let (trace_tx_number, trace_tx_hash) = match self.extras.transaction_hash(block_number, tx_position) {
+								Some(hash) => (Some(tx_position), Some(hash.clone())),
+								//None means trace without transaction (reward)
+								None => (None, None),
+							};
 
 							traces.into_iter()
 								.map(|trace| LocalizedTrace {
@@ -372,8 +383,8 @@ impl<T> TraceDatabase for TraceDB<T> where T: DatabaseExtras {
 									result: trace.result,
 									subtraces: trace.subtraces,
 									trace_address: trace.trace_address.into_iter().collect(),
-									transaction_number: tx_position,
-									transaction_hash: tx_hash.clone(),
+									transaction_number: trace_tx_number,
+									transaction_hash: trace_tx_hash,
 									block_number: block_number,
 									block_hash: block_hash,
 								})
@@ -404,7 +415,9 @@ impl<T> TraceDatabase for TraceDB<T> where T: DatabaseExtras {
 mod tests {
 	use std::collections::HashMap;
 	use std::sync::Arc;
-	use util::{Address, U256, H256, DBTransaction};
+	use ethereum_types::{H256, U256, Address};
+	use kvdb::{DBTransaction, KeyValueDB};
+	use kvdb_memorydb;
 	use header::BlockNumber;
 	use trace::{Config, TraceDB, Database as TraceDatabase, DatabaseExtras, ImportRequest};
 	use trace::{Filter, LocalizedTrace, AddressesFilter, TraceError};
@@ -454,8 +467,8 @@ mod tests {
 		}
 	}
 
-	fn new_db() -> Arc<::util::kvdb::KeyValueDB> {
-		Arc::new(::util::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)))
+	fn new_db() -> Arc<KeyValueDB> {
+		Arc::new(kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0)))
 	}
 
 	#[test]
@@ -543,8 +556,8 @@ mod tests {
 			result: Res::FailedCall(TraceError::OutOfGas),
 			trace_address: vec![],
 			subtraces: 0,
-			transaction_number: 0,
-			transaction_hash: tx_hash,
+			transaction_number: Some(0),
+			transaction_hash: Some(tx_hash),
 			block_number: block_number,
 			block_hash: block_hash,
 		}
diff --git a/ethcore/src/trace/executive_tracer.rs b/ethcore/src/trace/executive_tracer.rs
index ba4d0eff997dc9205da34fcca8370ffe76e8460a..b1d116d69d59accbbbd31a07e8442472a3a0ef1e 100644
--- a/ethcore/src/trace/executive_tracer.rs
+++ b/ethcore/src/trace/executive_tracer.rs
@@ -16,9 +16,10 @@
 
 //! Simple executive tracer.
 
-use util::{Bytes, Address, U256};
+use ethereum_types::{U256, Address};
+use bytes::Bytes;
 use vm::ActionParams;
-use trace::trace::{Call, Create, Action, Res, CreateResult, CallResult, VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, Suicide};
+use trace::trace::{Call, Create, Action, Res, CreateResult, CallResult, VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, Suicide, Reward, RewardType};
 use trace::{Tracer, VMTracer, FlatTrace, TraceError};
 
 /// Simple executive tracer. Traces all calls and creates. Ignores delegatecalls.
@@ -81,6 +82,8 @@ fn should_prefix_address_properly() {
 }
 
 impl Tracer for ExecutiveTracer {
+	type Output = FlatTrace;
+
 	fn prepare_trace_call(&self, params: &ActionParams) -> Option<Call> {
 		Some(Call::from(params.clone()))
 	}
@@ -151,15 +154,22 @@ impl Tracer for ExecutiveTracer {
 	fn trace_suicide(&mut self, address: Address, balance: U256, refund_address: Address) {
 		let trace = FlatTrace {
 			subtraces: 0,
-			action: Action::Suicide(Suicide {
-				address: address,
-				refund_address: refund_address,
-				balance: balance,
-			}),
+			action: Action::Suicide(Suicide { address, refund_address, balance } ),
 			result: Res::None,
 			trace_address: Default::default(),
 		};
-		debug!(target: "trace", "Traced failed suicide {:?}", trace);
+		debug!(target: "trace", "Traced suicide {:?}", trace);
+		self.traces.push(trace);
+	}
+
+	fn trace_reward(&mut self, author: Address, value: U256, reward_type: RewardType) {
+		let trace = FlatTrace {
+			subtraces: 0,
+			action: Action::Reward(Reward { author, value, reward_type } ),
+			result: Res::None,
+			trace_address: Default::default(),
+		};
+		debug!(target: "trace", "Traced reward {:?}", trace);
 		self.traces.push(trace);
 	}
 
@@ -192,7 +202,9 @@ impl ExecutiveVMTracer {
 }
 
 impl VMTracer for ExecutiveVMTracer {
-	fn trace_next_instruction(&mut self, _pc: usize, _instruction: u8) -> bool { true }
+	type Output = VMTrace;
+
+	fn trace_next_instruction(&mut self, _pc: usize, _instruction: u8, _current_gas: U256) -> bool { true }
 
 	fn trace_prepare_execute(&mut self, pc: usize, instruction: u8, gas_cost: U256) {
 		self.data.operations.push(VMOperation {
diff --git a/ethcore/src/trace/import.rs b/ethcore/src/trace/import.rs
index 4bcc376f9933848d0eeb8e797ffb7ef56b12a0e7..fb72e220e45fb91b9a9a8c7b646c9f50854a9a24 100644
--- a/ethcore/src/trace/import.rs
+++ b/ethcore/src/trace/import.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Traces import request.
-use util::H256;
+use ethereum_types::H256;
 use header::BlockNumber;
 use trace::FlatBlockTraces;
 
diff --git a/ethcore/src/trace/mod.rs b/ethcore/src/trace/mod.rs
index c749bfd8292cd68b98d60851ebb2a6f46111e9bc..381dcd9f0d186a51fff8baad461ec96d57baabb6 100644
--- a/ethcore/src/trace/mod.rs
+++ b/ethcore/src/trace/mod.rs
@@ -16,7 +16,6 @@
 
 //! Tracing
 
-mod bloom;
 mod config;
 mod db;
 mod executive_tracer;
@@ -31,19 +30,24 @@ pub use self::executive_tracer::{ExecutiveTracer, ExecutiveVMTracer};
 pub use self::import::ImportRequest;
 pub use self::localized::LocalizedTrace;
 
-pub use self::types::{filter, flat, localized, trace};
+pub use self::types::{filter, flat, localized, trace, Tracing};
 pub use self::types::error::Error as TraceError;
-pub use self::types::trace::{VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff};
+pub use self::types::trace::{VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, RewardType};
 pub use self::types::flat::{FlatTrace, FlatTransactionTraces, FlatBlockTraces};
 pub use self::types::filter::{Filter, AddressesFilter};
 
-use util::{Bytes, Address, U256, H256, DBTransaction};
+use ethereum_types::{H256, U256, Address};
+use kvdb::DBTransaction;
+use bytes::Bytes;
 use self::trace::{Call, Create};
 use vm::ActionParams;
 use header::BlockNumber;
 
 /// This trait is used by executive to build traces.
 pub trait Tracer: Send {
+	/// Data returned when draining the Tracer.
+	type Output;
+
 	/// Prepares call trace for given params. Noop tracer should return None.
 	fn prepare_trace_call(&self, params: &ActionParams) -> Option<Call>;
 
@@ -59,7 +63,7 @@ pub trait Tracer: Send {
 		call: Option<Call>,
 		gas_used: U256,
 		output: Option<Bytes>,
-		subs: Vec<FlatTrace>,
+		subs: Vec<Self::Output>,
 	);
 
 	/// Stores trace create info.
@@ -69,32 +73,38 @@ pub trait Tracer: Send {
 		gas_used: U256,
 		code: Option<Bytes>,
 		address: Address,
-		subs: Vec<FlatTrace>
+		subs: Vec<Self::Output>
 	);
 
 	/// Stores failed call trace.
-	fn trace_failed_call(&mut self, call: Option<Call>, subs: Vec<FlatTrace>, error: TraceError);
+	fn trace_failed_call(&mut self, call: Option<Call>, subs: Vec<Self::Output>, error: TraceError);
 
 	/// Stores failed create trace.
-	fn trace_failed_create(&mut self, create: Option<Create>, subs: Vec<FlatTrace>, error: TraceError);
+	fn trace_failed_create(&mut self, create: Option<Create>, subs: Vec<Self::Output>, error: TraceError);
 
 	/// Stores suicide info.
 	fn trace_suicide(&mut self, address: Address, balance: U256, refund_address: Address);
 
+	/// Stores reward info.
+	fn trace_reward(&mut self, author: Address, value: U256, reward_type: RewardType);
+
 	/// Spawn subtracer which will be used to trace deeper levels of execution.
 	fn subtracer(&self) -> Self where Self: Sized;
 
 	/// Consumes self and returns all traces.
-	fn drain(self) -> Vec<FlatTrace>;
+	fn drain(self) -> Vec<Self::Output>;
 }
 
 /// Used by executive to build VM traces.
 pub trait VMTracer: Send {
 
+	/// Data returned when draining the VMTracer.
+	type Output;
+
 	/// Trace the progression of interpreter to next instruction.
 	/// If tracer returns `false` it won't be called again.
 	/// @returns true if `trace_prepare_execute` and `trace_executed` should be called.
-	fn trace_next_instruction(&mut self, _pc: usize, _instruction: u8) -> bool { false }
+	fn trace_next_instruction(&mut self, _pc: usize, _instruction: u8, _current_gas: U256) -> bool { false }
 
 	/// Trace the preparation to execute a single valid instruction.
 	fn trace_prepare_execute(&mut self, _pc: usize, _instruction: u8, _gas_cost: U256) {}
@@ -109,7 +119,7 @@ pub trait VMTracer: Send {
 	fn done_subtrace(&mut self, sub: Self) where Self: Sized;
 
 	/// Consumes self and returns the VM trace.
-	fn drain(self) -> Option<VMTrace>;
+	fn drain(self) -> Option<Self::Output>;
 }
 
 /// `DbExtras` provides an interface to query extra data which is not stored in tracesdb,
diff --git a/ethcore/src/trace/noop_tracer.rs b/ethcore/src/trace/noop_tracer.rs
index 03d6f57a002b5bdcc445e614ae179f31e16da1c6..ab0bf77ff1cad8e676953151aacc33ed00aca3ec 100644
--- a/ethcore/src/trace/noop_tracer.rs
+++ b/ethcore/src/trace/noop_tracer.rs
@@ -16,15 +16,18 @@
 
 //! Nonoperative tracer.
 
-use util::{Bytes, Address, U256};
+use ethereum_types::{U256, Address};
+use bytes::Bytes;
 use vm::ActionParams;
 use trace::{Tracer, VMTracer, FlatTrace, TraceError};
-use trace::trace::{Call, Create, VMTrace};
+use trace::trace::{Call, Create, VMTrace, RewardType};
 
 /// Nonoperative tracer. Does not trace anything.
 pub struct NoopTracer;
 
 impl Tracer for NoopTracer {
+	type Output = FlatTrace;
+
 	fn prepare_trace_call(&self, _: &ActionParams) -> Option<Call> {
 		None
 	}
@@ -58,6 +61,9 @@ impl Tracer for NoopTracer {
 	fn trace_suicide(&mut self, _address: Address, _balance: U256, _refund_address: Address) {
 	}
 
+	fn trace_reward(&mut self, _: Address, _: U256, _: RewardType) {
+	}
+
 	fn subtracer(&self) -> Self {
 		NoopTracer
 	}
@@ -71,7 +77,9 @@ impl Tracer for NoopTracer {
 pub struct NoopVMTracer;
 
 impl VMTracer for NoopVMTracer {
-	fn trace_next_instruction(&mut self, _pc: usize, _instruction: u8) -> bool { false }
+	type Output = VMTrace;
+
+	fn trace_next_instruction(&mut self, _pc: usize, _instruction: u8, _current_gas: U256) -> bool { false }
 
 	fn trace_prepare_execute(&mut self, _pc: usize, _instruction: u8, _gas_cost: U256) {}
 
diff --git a/ethcore/src/trace/types/error.rs b/ethcore/src/trace/types/error.rs
index 5cedefd09f407a4658f4d18319f486b7b63598a5..70a3c315ad60938ed314b009112f2b8aee4f55b6 100644
--- a/ethcore/src/trace/types/error.rs
+++ b/ethcore/src/trace/types/error.rs
@@ -43,6 +43,10 @@ pub enum Error {
 	MutableCallInStaticContext,
 	/// Wasm error
 	Wasm,
+	/// Contract tried to access past the return data buffer.
+	OutOfBounds,
+	/// Execution has been reverted with REVERT instruction.
+	Reverted,
 }
 
 impl<'a> From<&'a VmError> for Error {
@@ -57,6 +61,8 @@ impl<'a> From<&'a VmError> for Error {
 			VmError::Wasm { .. } => Error::Wasm,
 			VmError::Internal(_) => Error::Internal,
 			VmError::MutableCallInStaticContext => Error::MutableCallInStaticContext,
+			VmError::OutOfBounds => Error::OutOfBounds,
+			VmError::Reverted => Error::Reverted,
 		}
 	}
 }
@@ -80,6 +86,8 @@ impl fmt::Display for Error {
 			Wasm => "Wasm runtime error",
 			Internal => "Internal error",
 			MutableCallInStaticContext => "Mutable Call In Static Context",
+			OutOfBounds => "Out of bounds",
+			Reverted => "Reverted",
 		};
 		message.fmt(f)
 	}
@@ -98,6 +106,8 @@ impl Encodable for Error {
 			BuiltIn => 6,
 			MutableCallInStaticContext => 7,
 			Wasm => 8,
+			OutOfBounds => 9,
+			Reverted => 10,
 		};
 
 		s.append_internal(&value);
@@ -118,6 +128,8 @@ impl Decodable for Error {
 			6 => Ok(BuiltIn),
 			7 => Ok(MutableCallInStaticContext),
 			8 => Ok(Wasm),
+			9 => Ok(OutOfBounds),
+			10 => Ok(Reverted),
 			_ => Err(DecoderError::Custom("Invalid error type")),
 		}
 	}
diff --git a/ethcore/src/trace/types/filter.rs b/ethcore/src/trace/types/filter.rs
index 1b2e2077acb830888480b0501af94b56a172631d..308eb72da7b42700510989219b9aad34432c8e09 100644
--- a/ethcore/src/trace/types/filter.rs
+++ b/ethcore/src/trace/types/filter.rs
@@ -17,11 +17,8 @@
 //! Trace filters type definitions
 
 use std::ops::Range;
-use bloomchain::{Filter as BloomFilter, Bloom, Number};
-use util::Address;
-use util::sha3::Hashable;
-use bloomable::Bloomable;
-use basic_types::LogBloom;
+use bloomchain::{Filter as BloomFilter, Number};
+use ethereum_types::{Address, Bloom, BloomInput};
 use trace::flat::FlatTrace;
 use super::trace::{Action, Res};
 
@@ -51,23 +48,27 @@ impl AddressesFilter {
 	}
 
 	/// Returns blooms of this addresses filter.
-	pub fn blooms(&self) -> Vec<LogBloom> {
+	pub fn blooms(&self) -> Vec<Bloom> {
 		match self.list.is_empty() {
-			true => vec![LogBloom::default()],
+			true => vec![Bloom::default()],
 			false => self.list.iter()
-				.map(|address| LogBloom::from_bloomed(&address.sha3()))
+				.map(|address| Bloom::from(BloomInput::Raw(address)))
 				.collect(),
 		}
 	}
 
 	/// Returns vector of blooms zipped with blooms of this addresses filter.
-	pub fn with_blooms(&self, blooms: Vec<LogBloom>) -> Vec<LogBloom> {
+	pub fn with_blooms(&self, blooms: Vec<Bloom>) -> Vec<Bloom> {
 		match self.list.is_empty() {
 			true => blooms,
 			false => blooms
 				.into_iter()
 				.flat_map(|bloom| self.list.iter()
-					.map(|address| bloom.with_bloomed(&address.sha3()))
+					.map(|address| {
+						let mut bloom = bloom.clone();
+						bloom.accrue(BloomInput::Raw(address));
+						bloom
+					})
 					.collect::<Vec<_>>())
 				.collect(),
 		}
@@ -90,9 +91,6 @@ pub struct Filter {
 impl BloomFilter for Filter {
 	fn bloom_possibilities(&self) -> Vec<Bloom> {
 		self.bloom_possibilities()
-			.into_iter()
-			.map(|b| Bloom::from(b.0))
-			.collect()
 	}
 
 	fn range(&self) -> Range<Number> {
@@ -102,7 +100,7 @@ impl BloomFilter for Filter {
 
 impl Filter {
 	/// Returns combinations of each address.
-	fn bloom_possibilities(&self) -> Vec<LogBloom> {
+	fn bloom_possibilities(&self) -> Vec<Bloom> {
 		self.to_address.with_blooms(self.from_address.blooms())
 	}
 
@@ -113,7 +111,7 @@ impl Filter {
 				let from_matches = self.from_address.matches(&call.from);
 				let to_matches = self.to_address.matches(&call.to);
 				from_matches && to_matches
-			}
+			},
 			Action::Create(ref create) => {
 				let from_matches = self.from_address.matches(&create.from);
 
@@ -128,19 +126,20 @@ impl Filter {
 				let from_matches = self.from_address.matches(&suicide.address);
 				let to_matches = self.to_address.matches(&suicide.refund_address);
 				from_matches && to_matches
-			}
+			},
+			Action::Reward(ref reward) => {
+				self.from_address.matches_all() && self.to_address.matches(&reward.author)
+			},
 		}
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use util::Address;
-	use util::sha3::Hashable;
-	use bloomable::Bloomable;
-	use trace::trace::{Action, Call, Res, Create, CreateResult, Suicide};
+	use ethereum_types::{Address, Bloom, BloomInput};
+	use trace::trace::{Action, Call, Res, Create, CreateResult, Suicide, Reward};
 	use trace::flat::FlatTrace;
-	use trace::{Filter, AddressesFilter, TraceError};
+	use trace::{Filter, AddressesFilter, TraceError, RewardType};
 	use evm::CallType;
 
 	#[test]
@@ -152,7 +151,7 @@ mod tests {
 		};
 
 		let blooms = filter.bloom_possibilities();
-		assert_eq!(blooms, vec![Default::default()]);
+		assert_eq!(blooms, vec![Bloom::default()]);
 	}
 
 	#[test]
@@ -166,9 +165,9 @@ mod tests {
 		let blooms = filter.bloom_possibilities();
 		assert_eq!(blooms.len(), 1);
 
-		assert!(blooms[0].contains_bloomed(&Address::from(1).sha3()));
-		assert!(blooms[0].contains_bloomed(&Address::from(2).sha3()));
-		assert!(!blooms[0].contains_bloomed(&Address::from(3).sha3()));
+		assert!(blooms[0].contains_input(BloomInput::Raw(&Address::from(1))));
+		assert!(blooms[0].contains_input(BloomInput::Raw(&Address::from(2))));
+		assert!(!blooms[0].contains_input(BloomInput::Raw(&Address::from(3))));
 	}
 
 	#[test]
@@ -182,8 +181,8 @@ mod tests {
 		let blooms = filter.bloom_possibilities();
 		assert_eq!(blooms.len(), 1);
 
-		assert!(blooms[0].contains_bloomed(&Address::from(1).sha3()));
-		assert!(!blooms[0].contains_bloomed(&Address::from(2).sha3()));
+		assert!(blooms[0].contains_input(BloomInput::Raw(&Address::from(1))));
+		assert!(!blooms[0].contains_input(BloomInput::Raw(&Address::from(2))));
 	}
 
 	#[test]
@@ -197,8 +196,8 @@ mod tests {
 		let blooms = filter.bloom_possibilities();
 		assert_eq!(blooms.len(), 1);
 
-		assert!(blooms[0].contains_bloomed(&Address::from(1).sha3()));
-		assert!(!blooms[0].contains_bloomed(&Address::from(2).sha3()));
+		assert!(blooms[0].contains_input(BloomInput::Raw(&Address::from(1))));
+		assert!(!blooms[0].contains_input(BloomInput::Raw(&Address::from(2))));
 	}
 
 	#[test]
@@ -212,25 +211,25 @@ mod tests {
 		let blooms = filter.bloom_possibilities();
 		assert_eq!(blooms.len(), 4);
 
-		assert!(blooms[0].contains_bloomed(&Address::from(1).sha3()));
-		assert!(blooms[0].contains_bloomed(&Address::from(2).sha3()));
-		assert!(!blooms[0].contains_bloomed(&Address::from(3).sha3()));
-		assert!(!blooms[0].contains_bloomed(&Address::from(4).sha3()));
-
-		assert!(blooms[1].contains_bloomed(&Address::from(1).sha3()));
-		assert!(blooms[1].contains_bloomed(&Address::from(4).sha3()));
-		assert!(!blooms[1].contains_bloomed(&Address::from(2).sha3()));
-		assert!(!blooms[1].contains_bloomed(&Address::from(3).sha3()));
-
-		assert!(blooms[2].contains_bloomed(&Address::from(2).sha3()));
-		assert!(blooms[2].contains_bloomed(&Address::from(3).sha3()));
-		assert!(!blooms[2].contains_bloomed(&Address::from(1).sha3()));
-		assert!(!blooms[2].contains_bloomed(&Address::from(4).sha3()));
-
-		assert!(blooms[3].contains_bloomed(&Address::from(3).sha3()));
-		assert!(blooms[3].contains_bloomed(&Address::from(4).sha3()));
-		assert!(!blooms[3].contains_bloomed(&Address::from(1).sha3()));
-		assert!(!blooms[3].contains_bloomed(&Address::from(2).sha3()));
+		assert!(blooms[0].contains_input(BloomInput::Raw(&Address::from(1))));
+		assert!(blooms[0].contains_input(BloomInput::Raw(&Address::from(2))));
+		assert!(!blooms[0].contains_input(BloomInput::Raw(&Address::from(3))));
+		assert!(!blooms[0].contains_input(BloomInput::Raw(&Address::from(4))));
+
+		assert!(blooms[1].contains_input(BloomInput::Raw(&Address::from(1))));
+		assert!(blooms[1].contains_input(BloomInput::Raw(&Address::from(4))));
+		assert!(!blooms[1].contains_input(BloomInput::Raw(&Address::from(2))));
+		assert!(!blooms[1].contains_input(BloomInput::Raw(&Address::from(3))));
+
+		assert!(blooms[2].contains_input(BloomInput::Raw(&Address::from(2))));
+		assert!(blooms[2].contains_input(BloomInput::Raw(&Address::from(3))));
+		assert!(!blooms[2].contains_input(BloomInput::Raw(&Address::from(1))));
+		assert!(!blooms[2].contains_input(BloomInput::Raw(&Address::from(4))));
+
+		assert!(blooms[3].contains_input(BloomInput::Raw(&Address::from(3))));
+		assert!(blooms[3].contains_input(BloomInput::Raw(&Address::from(4))));
+		assert!(!blooms[3].contains_input(BloomInput::Raw(&Address::from(1))));
+		assert!(!blooms[3].contains_input(BloomInput::Raw(&Address::from(2))));
 	}
 
 	#[test]
@@ -341,5 +340,60 @@ mod tests {
 		assert!(f4.matches(&trace));
 		assert!(f5.matches(&trace));
 		assert!(!f6.matches(&trace));
+
+		let trace = FlatTrace {
+			action: Action::Reward(Reward {
+				author: 2.into(),
+				value: 100.into(),
+				reward_type: RewardType::Block,
+			}),
+			result: Res::None,
+			trace_address: vec![].into_iter().collect(),
+			subtraces: 0
+		};
+
+		assert!(!f0.matches(&trace));
+		assert!(!f1.matches(&trace));
+		assert!(f2.matches(&trace));
+		assert!(f3.matches(&trace));
+		assert!(f4.matches(&trace));
+		assert!(!f5.matches(&trace));
+		assert!(!f6.matches(&trace));
+	}
+
+	#[test]
+	fn filter_match_block_reward_fix_8070() {
+		let f0 = Filter {
+			range: (0..0),
+			from_address: vec![1.into()].into(),
+			to_address: vec![].into(),
+		};
+
+		let f1 = Filter {
+			range: (0..0),
+			from_address: vec![].into(),
+			to_address: vec![].into(),
+		};
+
+		let f2 = Filter {
+			range: (0..0),
+			from_address: vec![].into(),
+			to_address: vec![2.into()].into(),
+		};
+
+		let trace = FlatTrace {
+			action: Action::Reward(Reward {
+				author: 2.into(),
+				value: 10.into(),
+				reward_type: RewardType::Block,
+			}),
+			result: Res::None,
+			trace_address: vec![0].into_iter().collect(),
+			subtraces: 0,
+		};
+
+		assert!(!f0.matches(&trace));
+		assert!(f1.matches(&trace));
+		assert!(f2.matches(&trace));
 	}
 }
diff --git a/ethcore/src/trace/types/flat.rs b/ethcore/src/trace/types/flat.rs
index 8b65f1f4c3261f27d1123970baea3de22c378f53..e97f4d32359b89c0c807b1341f3d4d295e5e5f64 100644
--- a/ethcore/src/trace/types/flat.rs
+++ b/ethcore/src/trace/types/flat.rs
@@ -18,8 +18,8 @@
 
 use std::collections::VecDeque;
 use rlp::*;
-use util::HeapSizeOf;
-use basic_types::LogBloom;
+use heapsize::HeapSizeOf;
+use ethereum_types::Bloom;
 use super::trace::{Action, Res};
 
 /// Trace localized in vector of traces produced by a single transaction.
@@ -41,7 +41,7 @@ pub struct FlatTrace {
 
 impl FlatTrace {
 	/// Returns bloom of the trace.
-	pub fn bloom(&self) -> LogBloom {
+	pub fn bloom(&self) -> Bloom {
 		self.action.bloom() | self.result.bloom()
 	}
 }
@@ -94,7 +94,7 @@ impl HeapSizeOf for FlatTransactionTraces {
 
 impl FlatTransactionTraces {
 	/// Returns bloom of all traces in the collection.
-	pub fn bloom(&self) -> LogBloom {
+	pub fn bloom(&self) -> Bloom {
 		self.0.iter().fold(Default::default(), | bloom, trace | bloom | trace.bloom())
 	}
 }
@@ -123,7 +123,7 @@ impl From<Vec<FlatTransactionTraces>> for FlatBlockTraces {
 
 impl FlatBlockTraces {
 	/// Returns bloom of all traces in the block.
-	pub fn bloom(&self) -> LogBloom {
+	pub fn bloom(&self) -> Bloom {
 		self.0.iter().fold(Default::default(), | bloom, tx_traces | bloom | tx_traces.bloom())
 	}
 }
@@ -138,8 +138,9 @@ impl Into<Vec<FlatTransactionTraces>> for FlatBlockTraces {
 mod tests {
 	use rlp::*;
 	use super::{FlatBlockTraces, FlatTransactionTraces, FlatTrace};
-	use trace::trace::{Action, Res, CallResult, Call, Suicide};
+	use trace::trace::{Action, Res, CallResult, Call, Suicide, Reward};
 	use evm::CallType;
+	use trace::RewardType;
 
 	#[test]
 	fn encode_flat_transaction_traces() {
@@ -214,9 +215,32 @@ mod tests {
 			subtraces: 0,
 		};
 
+		let flat_trace3 = FlatTrace {
+			action: Action::Reward(Reward {
+				author: "412fda7643b37d436cb40628f6dbbb80a07267ed".parse().unwrap(),
+				value: 10.into(),
+				reward_type: RewardType::Uncle,
+			}),
+			result: Res::None,
+			trace_address: vec![0].into_iter().collect(),
+			subtraces: 0,
+		};
+
+		let flat_trace4 = FlatTrace {
+			action: Action::Reward(Reward {
+				author: "412fda7643b37d436cb40628f6dbbb80a07267ed".parse().unwrap(),
+				value: 10.into(),
+				reward_type: RewardType::Block,
+			}),
+			result: Res::None,
+			trace_address: vec![0].into_iter().collect(),
+			subtraces: 0,
+		};
+
 		let block_traces = FlatBlockTraces(vec![
 			FlatTransactionTraces(vec![flat_trace]),
-			FlatTransactionTraces(vec![flat_trace1, flat_trace2])
+			FlatTransactionTraces(vec![flat_trace1, flat_trace2]),
+			FlatTransactionTraces(vec![flat_trace3, flat_trace4])
 		]);
 
 		let encoded = ::rlp::encode(&block_traces);
diff --git a/ethcore/src/trace/types/localized.rs b/ethcore/src/trace/types/localized.rs
index 39a4b08cc390cf1f1f153034fa228e936753ff91..f649e169971fe62964507dd5742a79848182c3c1 100644
--- a/ethcore/src/trace/types/localized.rs
+++ b/ethcore/src/trace/types/localized.rs
@@ -16,7 +16,7 @@
 
 //! Localized traces type definitions
 
-use util::H256;
+use ethereum_types::H256;
 use super::trace::{Action, Res};
 use header::BlockNumber;
 
@@ -34,9 +34,9 @@ pub struct LocalizedTrace {
 	/// [index in root, index in first CALL, index in second CALL, ...]
 	pub trace_address: Vec<usize>,
 	/// Transaction number within the block.
-	pub transaction_number: usize,
+	pub transaction_number: Option<usize>,
 	/// Signed transaction hash.
-	pub transaction_hash: H256,
+	pub transaction_hash: Option<H256>,
 	/// Block number.
 	pub block_number: BlockNumber,
 	/// Block hash.
diff --git a/ethcore/src/trace/types/mod.rs b/ethcore/src/trace/types/mod.rs
index 434bae4e1dd8a75d6196b322ab1d8d3ec5d1f7f8..a9be2865b0fbf335dfb5ac30a8f1e81e9b76cc59 100644
--- a/ethcore/src/trace/types/mod.rs
+++ b/ethcore/src/trace/types/mod.rs
@@ -21,3 +21,37 @@ pub mod filter;
 pub mod flat;
 pub mod trace;
 pub mod localized;
+
+use self::flat::FlatTransactionTraces;
+
+/// Container for block traces.
+#[derive(Clone)]
+pub enum Tracing {
+	/// This variant should be used when tracing is enabled.
+	Enabled(Vec<FlatTransactionTraces>),
+	/// Tracing is disabled.
+	Disabled,
+}
+
+impl Tracing {
+	/// Creates new instance of enabled tracing object.
+	pub fn enabled() -> Self {
+		Tracing::Enabled(Default::default())
+	}
+
+	/// Returns true if tracing is enabled.
+	pub fn is_enabled(&self) -> bool {
+		match *self {
+			Tracing::Enabled(_) => true,
+			Tracing::Disabled => false,
+		}
+	}
+
+	/// Drain all traces.
+	pub fn drain(self) -> Vec<FlatTransactionTraces> {
+		match self {
+			Tracing::Enabled(traces) => traces,
+			Tracing::Disabled => vec![],
+		}
+	}
+}
diff --git a/ethcore/src/trace/types/trace.rs b/ethcore/src/trace/types/trace.rs
index 5fa0260c6752ee9f8d77221af1367ab73fc4eb56..18fe329c442c99e894894c2ec91d90ab861d9e2e 100644
--- a/ethcore/src/trace/types/trace.rs
+++ b/ethcore/src/trace/types/trace.rs
@@ -16,19 +16,16 @@
 
 //! Tracing datatypes.
 
-use util::{U256, Bytes, Address};
-use util::sha3::Hashable;
-use bloomable::Bloomable;
+use ethereum_types::{U256, Address, Bloom, BloomInput};
+use bytes::Bytes;
 use rlp::*;
 
 use vm::ActionParams;
-use basic_types::LogBloom;
 use evm::CallType;
 use super::error::Error;
 
 /// `Call` result.
 #[derive(Debug, Clone, PartialEq, Default, RlpEncodable, RlpDecodable)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct CallResult {
 	/// Gas used by call.
 	pub gas_used: U256,
@@ -38,7 +35,6 @@ pub struct CallResult {
 
 /// `Create` result.
 #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct CreateResult {
 	/// Gas used by create.
 	pub gas_used: U256,
@@ -50,14 +46,13 @@ pub struct CreateResult {
 
 impl CreateResult {
 	/// Returns bloom.
-	pub fn bloom(&self) -> LogBloom {
-		LogBloom::from_bloomed(&self.address.sha3())
+	pub fn bloom(&self) -> Bloom {
+		BloomInput::Raw(&self.address).into()
 	}
 }
 
 /// Description of a _call_ action, either a `CALL` operation or a message transction.
 #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct Call {
 	/// The sending account.
 	pub from: Address,
@@ -75,13 +70,23 @@ pub struct Call {
 
 impl From<ActionParams> for Call {
 	fn from(p: ActionParams) -> Self {
-		Call {
-			from: p.sender,
-			to: p.address,
-			value: p.value.value(),
-			gas: p.gas,
-			input: p.data.unwrap_or_else(Vec::new),
-			call_type: p.call_type,
+		match p.call_type {
+			CallType::DelegateCall => Call {
+				from: p.address,
+				to: p.code_address,
+				value: p.value.value(),
+				gas: p.gas,
+				input: p.data.unwrap_or_else(Vec::new),
+				call_type: p.call_type,
+			},
+			_ => Call {
+				from: p.sender,
+				to: p.address,
+				value: p.value.value(),
+				gas: p.gas,
+				input: p.data.unwrap_or_else(Vec::new),
+				call_type: p.call_type,
+			},
 		}
 	}
 }
@@ -89,15 +94,16 @@ impl From<ActionParams> for Call {
 impl Call {
 	/// Returns call action bloom.
 	/// The bloom contains from and to addresses.
-	pub fn bloom(&self) -> LogBloom {
-		LogBloom::from_bloomed(&self.from.sha3())
-			.with_bloomed(&self.to.sha3())
+	pub fn bloom(&self) -> Bloom {
+		let mut bloom = Bloom::default();
+		bloom.accrue(BloomInput::Raw(&self.from));
+		bloom.accrue(BloomInput::Raw(&self.to));
+		bloom
 	}
 }
 
 /// Description of a _create_ action, either a `CREATE` operation or a create transction.
 #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct Create {
 	/// The address of the creator.
 	pub from: Address,
@@ -123,14 +129,82 @@ impl From<ActionParams> for Create {
 impl Create {
 	/// Returns bloom create action bloom.
 	/// The bloom contains only from address.
-	pub fn bloom(&self) -> LogBloom {
-		LogBloom::from_bloomed(&self.from.sha3())
+	pub fn bloom(&self) -> Bloom {
+		BloomInput::Raw(&self.from).into()
+	}
+}
+
+/// Reward type.
+#[derive(Debug, PartialEq, Clone)]
+pub enum RewardType {
+	/// Block
+	Block,
+	/// Uncle
+	Uncle,
+}
+
+impl Encodable for RewardType {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		let v = match *self {
+			RewardType::Block => 0u32,
+			RewardType::Uncle => 1,
+		};
+		Encodable::rlp_append(&v, s);
 	}
 }
 
+impl Decodable for RewardType {
+	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+		rlp.as_val().and_then(|v| Ok(match v {
+			0u32 => RewardType::Block,
+			1 => RewardType::Uncle,
+			_ => return Err(DecoderError::Custom("Invalid value of RewardType item")),
+		}))
+	}
+}
+
+/// Reward action
+#[derive(Debug, Clone, PartialEq)]
+pub struct Reward {
+	/// Author's address.
+	pub author: Address,
+	/// Reward amount.
+	pub value: U256,
+	/// Reward type.
+	pub reward_type: RewardType,
+}
+
+impl Reward {
+	/// Return reward action bloom.
+	pub fn bloom(&self) -> Bloom {
+		BloomInput::Raw(&self.author).into()
+	}
+}
+
+impl Encodable for Reward {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.begin_list(3);
+		s.append(&self.author);
+		s.append(&self.value);
+		s.append(&self.reward_type);
+	}
+}
+
+impl Decodable for Reward {
+	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+		let res = Reward {
+			author: rlp.val_at(0)?,
+			value: rlp.val_at(1)?,
+			reward_type: rlp.val_at(2)?,
+		};
+
+		Ok(res)
+	}
+}
+
+
 /// Suicide action.
 #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct Suicide {
 	/// Suicided address.
 	pub address: Address,
@@ -142,15 +216,16 @@ pub struct Suicide {
 
 impl Suicide {
 	/// Return suicide action bloom.
-	pub fn bloom(&self) -> LogBloom {
-		LogBloom::from_bloomed(&self.address.sha3())
-			.with_bloomed(&self.refund_address.sha3())
+	pub fn bloom(&self) -> Bloom {
+		let mut bloom = Bloom::default();
+		bloom.accrue(BloomInput::Raw(&self.address));
+		bloom.accrue(BloomInput::Raw(&self.refund_address));
+		bloom
 	}
 }
 
 /// Description of an action that we trace; will be either a call or a create.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub enum Action {
 	/// It's a call action.
 	Call(Call),
@@ -158,6 +233,8 @@ pub enum Action {
 	Create(Create),
 	/// Suicide.
 	Suicide(Suicide),
+	/// Reward
+	Reward(Reward),
 }
 
 impl Encodable for Action {
@@ -175,7 +252,12 @@ impl Encodable for Action {
 			Action::Suicide(ref suicide) => {
 				s.append(&2u8);
 				s.append(suicide);
+			},
+			Action::Reward(ref reward) => {
+				s.append(&3u8);
+				s.append(reward);
 			}
+
 		}
 	}
 }
@@ -187,6 +269,7 @@ impl Decodable for Action {
 			0 => rlp.val_at(1).map(Action::Call),
 			1 => rlp.val_at(1).map(Action::Create),
 			2 => rlp.val_at(1).map(Action::Suicide),
+			3 => rlp.val_at(1).map(Action::Reward),
 			_ => Err(DecoderError::Custom("Invalid action type.")),
 		}
 	}
@@ -194,18 +277,18 @@ impl Decodable for Action {
 
 impl Action {
 	/// Returns action bloom.
-	pub fn bloom(&self) -> LogBloom {
+	pub fn bloom(&self) -> Bloom {
 		match *self {
 			Action::Call(ref call) => call.bloom(),
 			Action::Create(ref create) => create.bloom(),
 			Action::Suicide(ref suicide) => suicide.bloom(),
+			Action::Reward(ref reward) => reward.bloom(),
 		}
 	}
 }
 
 /// The result of the performed action.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub enum Res {
 	/// Successful call action result.
 	Call(CallResult),
@@ -266,7 +349,7 @@ impl Decodable for Res {
 
 impl Res {
 	/// Returns result bloom.
-	pub fn bloom(&self) -> LogBloom {
+	pub fn bloom(&self) -> Bloom {
 		match *self {
 			Res::Create(ref create) => create.bloom(),
 			Res::Call(_) | Res::FailedCall(_) | Res::FailedCreate(_) | Res::None => Default::default(),
@@ -283,7 +366,6 @@ impl Res {
 }
 
 #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)]
-#[cfg_attr(feature = "ipc", binary)]
 /// A diff of some chunk of memory.
 pub struct MemoryDiff {
 	/// Offset into memory the change begins.
@@ -293,7 +375,6 @@ pub struct MemoryDiff {
 }
 
 #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)]
-#[cfg_attr(feature = "ipc", binary)]
 /// A diff of some storage value.
 pub struct StorageDiff {
 	/// Which key in storage is changed.
@@ -303,7 +384,6 @@ pub struct StorageDiff {
 }
 
 #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)]
-#[cfg_attr(feature = "ipc", binary)]
 /// A record of an executed VM operation.
 pub struct VMExecutedOperation {
 	/// The total gas used.
@@ -317,7 +397,6 @@ pub struct VMExecutedOperation {
 }
 
 #[derive(Debug, Clone, PartialEq, Default, RlpEncodable, RlpDecodable)]
-#[cfg_attr(feature = "ipc", binary)]
 /// A record of the execution of a single VM operation.
 pub struct VMOperation {
 	/// The program counter.
@@ -331,7 +410,6 @@ pub struct VMOperation {
 }
 
 #[derive(Debug, Clone, PartialEq, Default, RlpEncodable, RlpDecodable)]
-#[cfg_attr(feature = "ipc", binary)]
 /// A record of a full VM trace for a CALL/CREATE.
 pub struct VMTrace {
 	/// The step (i.e. index into operations) at which this trace corresponds.
diff --git a/ethcore/src/tx_filter.rs b/ethcore/src/tx_filter.rs
new file mode 100644
index 0000000000000000000000000000000000000000..12e6fe3ebbbf6470bc4eded8564663361d3f8535
--- /dev/null
+++ b/ethcore/src/tx_filter.rs
@@ -0,0 +1,214 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Smart contract based transaction filter.
+
+use std::collections::HashMap;
+use std::collections::hash_map::Entry;
+use ethereum_types::{H256, Address};
+use client::{BlockInfo, CallContract, BlockId, ChainNotify};
+use bytes::Bytes;
+use parking_lot::Mutex;
+use spec::CommonParams;
+use transaction::{Action, SignedTransaction};
+use hash::KECCAK_EMPTY;
+
+use_contract!(transact_acl, "TransactAcl", "res/contracts/tx_acl.json");
+
+const MAX_CACHE_SIZE: usize = 4096;
+
+mod tx_permissions {
+	pub const _ALL: u32 = 0xffffffff;
+	pub const NONE: u32 = 0x0;
+	pub const BASIC: u32 = 0b00000001;
+	pub const CALL: u32 = 0b00000010;
+	pub const CREATE: u32 = 0b00000100;
+	pub const _PRIVATE: u32 = 0b00001000;
+}
+
+/// Connection filter that uses a contract to manage permissions.
+pub struct TransactionFilter {
+	contract: transact_acl::TransactAcl,
+	contract_address: Address,
+	permission_cache: Mutex<HashMap<(H256, Address), u32>>,
+}
+
+impl TransactionFilter {
+	/// Create a new instance if address is specified in params.
+	pub fn from_params(params: &CommonParams) -> Option<TransactionFilter> {
+		params.transaction_permission_contract.map(|address|
+			TransactionFilter {
+				contract: transact_acl::TransactAcl::default(),
+				contract_address: address,
+				permission_cache: Mutex::new(HashMap::new()),
+			}
+		)
+	}
+
+	/// Clear cached permissions.
+	pub fn clear_cache(&self) {
+		self.permission_cache.lock().clear();
+	}
+
+	/// Check if transaction is allowed at given block.
+	pub fn transaction_allowed<C: BlockInfo + CallContract>(&self, parent_hash: &H256, transaction: &SignedTransaction, client: &C) -> bool {
+		let mut cache = self.permission_cache.lock(); let len = cache.len();
+
+		let tx_type = match transaction.action {
+			Action::Create => tx_permissions::CREATE,
+			Action::Call(address) => if client.code_hash(&address, BlockId::Hash(*parent_hash)).map_or(false, |c| c != KECCAK_EMPTY) {
+				tx_permissions::CALL
+			} else {
+				tx_permissions::BASIC
+			}
+		};
+		let sender = transaction.sender();
+		match cache.entry((*parent_hash, sender)) {
+			Entry::Occupied(entry) => *entry.get() & tx_type != 0,
+			Entry::Vacant(entry) => {
+				let contract_address = self.contract_address;
+				let permissions = self.contract.functions()
+					.allowed_tx_types()
+					.call(sender, &|data| client.call_contract(BlockId::Hash(*parent_hash), contract_address, data))
+					.map(|p| p.low_u32())
+					.unwrap_or_else(|e| {
+						debug!("Error callling tx permissions contract: {:?}", e);
+						tx_permissions::NONE
+					});
+
+				if len < MAX_CACHE_SIZE {
+					entry.insert(permissions);
+				}
+				trace!("Permissions required: {}, got: {}", tx_type, permissions);
+				permissions & tx_type != 0
+			}
+		}
+	}
+}
+
+impl ChainNotify for TransactionFilter {
+	fn new_blocks(&self, imported: Vec<H256>, _invalid: Vec<H256>, _enacted: Vec<H256>, _retracted: Vec<H256>, _sealed: Vec<H256>, _proposed: Vec<Bytes>, _duration: u64) {
+		if !imported.is_empty() {
+			self.clear_cache();
+		}
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use std::sync::Arc;
+	use spec::Spec;
+	use client::{BlockChainClient, Client, ClientConfig, BlockId};
+	use miner::Miner;
+	use ethereum_types::Address;
+	use io::IoChannel;
+	use ethkey::{Secret, KeyPair};
+	use super::TransactionFilter;
+	use transaction::{Transaction, Action};
+	use tempdir::TempDir;
+
+	/// Contract code: https://gist.github.com/arkpar/38a87cb50165b7e683585eec71acb05a
+	#[test]
+	fn transaction_filter() {
+		let spec_data = r#"
+		{
+			"name": "TestNodeFilterContract",
+			"engine": {
+				"authorityRound": {
+					"params": {
+						"stepDuration": 1,
+						"startStep": 2,
+						"validators": {
+							"contract": "0x0000000000000000000000000000000000000000"
+						}
+					}
+				}
+			},
+			"params": {
+				"accountStartNonce": "0x0",
+				"maximumExtraDataSize": "0x20",
+				"minGasLimit": "0x1388",
+				"networkID" : "0x69",
+				"gasLimitBoundDivisor": "0x0400",
+				"transactionPermissionContract": "0x0000000000000000000000000000000000000005"
+			},
+			"genesis": {
+				"seal": {
+					"generic": "0xc180"
+				},
+				"difficulty": "0x20000",
+				"author": "0x0000000000000000000000000000000000000000",
+				"timestamp": "0x00",
+				"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+				"extraData": "0x",
+				"gasLimit": "0x222222"
+			},
+			"accounts": {
+				"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+				"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+				"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+				"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+				"0000000000000000000000000000000000000005": {
+					"balance": "1",
+					"constructor": "6060604052341561000f57600080fd5b5b6101868061001f6000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e17512211461003e575b600080fd5b341561004957600080fd5b610075600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610097565b604051808263ffffffff1663ffffffff16815260200191505060405180910390f35b6000737e5f4552091a69125d5dfcb7b8c2659029395bdf8273ffffffffffffffffffffffffffffffffffffffff1614156100d75763ffffffff9050610155565b732b5ad5c4795c026514f8317c7a215e218dccd6cf8273ffffffffffffffffffffffffffffffffffffffff1614156101155760026001179050610155565b736813eb9362372eef6200f3b1dbc3f819671cba698273ffffffffffffffffffffffffffffffffffffffff1614156101505760019050610155565b600090505b9190505600a165627a7a72305820f1f21cb978925a8a92c6e30c8c81adf598adff6d1ef941cf5ed6c0ec7ad1ae3d0029"
+				}
+			}
+		}
+		"#;
+
+		let tempdir = TempDir::new("").unwrap();
+		let spec = Spec::load(&tempdir.path(), spec_data.as_bytes()).unwrap();
+		let client_db = Arc::new(::kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0)));
+
+		let client = Client::new(
+			ClientConfig::default(),
+			&spec,
+			client_db,
+			Arc::new(Miner::with_spec(&spec)),
+			IoChannel::disconnected(),
+		).unwrap();
+		let key1 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000001")).unwrap();
+		let key2 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000002")).unwrap();
+		let key3 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000003")).unwrap();
+		let key4 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000004")).unwrap();
+
+		let filter = TransactionFilter::from_params(spec.params()).unwrap();
+		let mut basic_tx = Transaction::default();
+		basic_tx.action = Action::Call(Address::from("000000000000000000000000000000000000032"));
+		let create_tx = Transaction::default();
+		let mut call_tx = Transaction::default();
+		call_tx.action = Action::Call(Address::from("0000000000000000000000000000000000000005"));
+
+		let genesis = client.block_hash(BlockId::Latest).unwrap();
+
+		assert!(filter.transaction_allowed(&genesis, &basic_tx.clone().sign(key1.secret(), None), &*client));
+		assert!(filter.transaction_allowed(&genesis, &create_tx.clone().sign(key1.secret(), None), &*client));
+		assert!(filter.transaction_allowed(&genesis, &call_tx.clone().sign(key1.secret(), None), &*client));
+
+		assert!(filter.transaction_allowed(&genesis, &basic_tx.clone().sign(key2.secret(), None), &*client));
+		assert!(!filter.transaction_allowed(&genesis, &create_tx.clone().sign(key2.secret(), None), &*client));
+		assert!(filter.transaction_allowed(&genesis, &call_tx.clone().sign(key2.secret(), None), &*client));
+
+		assert!(filter.transaction_allowed(&genesis, &basic_tx.clone().sign(key3.secret(), None), &*client));
+		assert!(!filter.transaction_allowed(&genesis, &create_tx.clone().sign(key3.secret(), None), &*client));
+		assert!(!filter.transaction_allowed(&genesis, &call_tx.clone().sign(key3.secret(), None), &*client));
+
+		assert!(!filter.transaction_allowed(&genesis, &basic_tx.clone().sign(key4.secret(), None), &*client));
+		assert!(!filter.transaction_allowed(&genesis, &create_tx.clone().sign(key4.secret(), None), &*client));
+		assert!(!filter.transaction_allowed(&genesis, &call_tx.clone().sign(key4.secret(), None), &*client));
+	}
+}
+
diff --git a/ethcore/src/verification/canon_verifier.rs b/ethcore/src/verification/canon_verifier.rs
index a5d8fe73fdf75ee98031aa22d8567b2fbb179f3c..3d0fd77c6e5bc906a51be6a964365b76ef64293c 100644
--- a/ethcore/src/verification/canon_verifier.rs
+++ b/ethcore/src/verification/canon_verifier.rs
@@ -16,8 +16,8 @@
 
 //! Canonical verifier.
 
-use blockchain::BlockProvider;
-use engines::Engine;
+use client::{BlockInfo, CallContract};
+use engines::EthEngine;
 use error::Error;
 use header::Header;
 use super::Verifier;
@@ -26,16 +26,22 @@ use super::verification;
 /// A canonial verifier -- this does full verification.
 pub struct CanonVerifier;
 
-impl Verifier for CanonVerifier {
-	fn verify_block_family(&self, header: &Header, bytes: &[u8], engine: &Engine, bc: &BlockProvider) -> Result<(), Error> {
-		verification::verify_block_family(header, bytes, engine, bc)
+impl<C: BlockInfo + CallContract> Verifier<C> for CanonVerifier {
+	fn verify_block_family(
+		&self,
+		header: &Header,
+		parent: &Header,
+		engine: &EthEngine,
+		do_full: Option<verification::FullFamilyParams<C>>,
+	) -> Result<(), Error> {
+		verification::verify_block_family(header, parent, engine, do_full)
 	}
 
 	fn verify_block_final(&self, expected: &Header, got: &Header) -> Result<(), Error> {
 		verification::verify_block_final(expected, got)
 	}
 
-	fn verify_block_external(&self, header: &Header, bytes: &[u8], engine: &Engine) -> Result<(), Error> {
-		engine.verify_block_external(header, Some(bytes))
+	fn verify_block_external(&self, header: &Header, engine: &EthEngine) -> Result<(), Error> {
+		engine.verify_block_external(header)
 	}
 }
diff --git a/ethcore/src/verification/mod.rs b/ethcore/src/verification/mod.rs
index c83d9e20fdb00a53a27a869e15f6e251edcfc724..d5fd4e847610fbcda6f5e844283070955fbc6bb9 100644
--- a/ethcore/src/verification/mod.rs
+++ b/ethcore/src/verification/mod.rs
@@ -28,6 +28,8 @@ pub use self::canon_verifier::CanonVerifier;
 pub use self::noop_verifier::NoopVerifier;
 pub use self::queue::{BlockQueue, Config as QueueConfig, VerificationQueue, QueueInfo};
 
+use client::{BlockInfo, CallContract};
+
 /// Verifier type.
 #[derive(Debug, PartialEq, Clone)]
 pub enum VerifierType {
@@ -47,7 +49,7 @@ impl Default for VerifierType {
 }
 
 /// Create a new verifier based on type.
-pub fn new(v: VerifierType) -> Box<Verifier> {
+pub fn new<C: BlockInfo + CallContract>(v: VerifierType) -> Box<Verifier<C>> {
 	match v {
 		VerifierType::Canon | VerifierType::CanonNoSeal => Box::new(CanonVerifier),
 		VerifierType::Noop => Box::new(NoopVerifier),
diff --git a/ethcore/src/verification/noop_verifier.rs b/ethcore/src/verification/noop_verifier.rs
index 8464ba1e2e778bd7e3849b3f6125db212d6f8642..24b117bbc16afbfe19801cce3912741525adc535 100644
--- a/ethcore/src/verification/noop_verifier.rs
+++ b/ethcore/src/verification/noop_verifier.rs
@@ -16,18 +16,24 @@
 
 //! No-op verifier.
 
-use blockchain::BlockProvider;
-use engines::Engine;
+use client::{BlockInfo, CallContract};
+use engines::EthEngine;
 use error::Error;
 use header::Header;
-use super::Verifier;
+use super::{verification, Verifier};
 
 /// A no-op verifier -- this will verify everything it's given immediately.
 #[allow(dead_code)]
 pub struct NoopVerifier;
 
-impl Verifier for NoopVerifier {
-	fn verify_block_family(&self, _header: &Header, _bytes: &[u8], _engine: &Engine, _bc: &BlockProvider) -> Result<(), Error> {
+impl<C: BlockInfo + CallContract> Verifier<C> for NoopVerifier {
+	fn verify_block_family(
+		&self,
+		_: &Header,
+		_t: &Header,
+		_: &EthEngine,
+		_: Option<verification::FullFamilyParams<C>>
+	) -> Result<(), Error> {
 		Ok(())
 	}
 
@@ -35,7 +41,7 @@ impl Verifier for NoopVerifier {
 		Ok(())
 	}
 
-	fn verify_block_external(&self, _header: &Header, _bytes: &[u8], _engine: &Engine) -> Result<(), Error> {
+	fn verify_block_external(&self, _header: &Header, _engine: &EthEngine) -> Result<(), Error> {
 		Ok(())
 	}
 }
diff --git a/ethcore/src/verification/queue/kind.rs b/ethcore/src/verification/queue/kind.rs
index 6ab6d692e302eaff6fc0ea9d04a4612b58026595..b437dba7a047b24b135b5b04397ea62ac6f67af8 100644
--- a/ethcore/src/verification/queue/kind.rs
+++ b/ethcore/src/verification/queue/kind.rs
@@ -16,10 +16,11 @@
 
 //! Definition of valid items for the verification queue.
 
-use engines::Engine;
+use engines::EthEngine;
 use error::Error;
 
-use util::{HeapSizeOf, H256, U256};
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, U256};
 
 pub use self::blocks::Blocks;
 pub use self::headers::Headers;
@@ -57,22 +58,24 @@ pub trait Kind: 'static + Sized + Send + Sync {
 	type Verified: Sized + Send + BlockLike + HeapSizeOf;
 
 	/// Attempt to create the `Unverified` item from the input.
-	fn create(input: Self::Input, engine: &Engine) -> Result<Self::Unverified, Error>;
+	fn create(input: Self::Input, engine: &EthEngine) -> Result<Self::Unverified, Error>;
 
 	/// Attempt to verify the `Unverified` item using the given engine.
-	fn verify(unverified: Self::Unverified, engine: &Engine, check_seal: bool) -> Result<Self::Verified, Error>;
+	fn verify(unverified: Self::Unverified, engine: &EthEngine, check_seal: bool) -> Result<Self::Verified, Error>;
 }
 
 /// The blocks verification module.
 pub mod blocks {
 	use super::{Kind, BlockLike};
 
-	use engines::Engine;
+	use engines::EthEngine;
 	use error::Error;
 	use header::Header;
 	use verification::{PreverifiedBlock, verify_block_basic, verify_block_unordered};
 
-	use util::{Bytes, HeapSizeOf, H256, U256};
+	use heapsize::HeapSizeOf;
+	use ethereum_types::{H256, U256};
+	use bytes::Bytes;
 
 	/// A mode for verifying blocks.
 	pub struct Blocks;
@@ -82,7 +85,7 @@ pub mod blocks {
 		type Unverified = Unverified;
 		type Verified = PreverifiedBlock;
 
-		fn create(input: Self::Input, engine: &Engine) -> Result<Self::Unverified, Error> {
+		fn create(input: Self::Input, engine: &EthEngine) -> Result<Self::Unverified, Error> {
 			match verify_block_basic(&input.header, &input.bytes, engine) {
 				Ok(()) => Ok(input),
 				Err(e) => {
@@ -92,7 +95,7 @@ pub mod blocks {
 			}
 		}
 
-		fn verify(un: Self::Unverified, engine: &Engine, check_seal: bool) -> Result<Self::Verified, Error> {
+		fn verify(un: Self::Unverified, engine: &EthEngine, check_seal: bool) -> Result<Self::Verified, Error> {
 			let hash = un.hash();
 			match verify_block_unordered(un.header, un.bytes, engine, check_seal) {
 				Ok(verified) => Ok(verified),
@@ -162,13 +165,12 @@ pub mod blocks {
 pub mod headers {
 	use super::{Kind, BlockLike};
 
-	use engines::Engine;
+	use engines::EthEngine;
 	use error::Error;
 	use header::Header;
 	use verification::verify_header_params;
 
-	use util::hash::H256;
-	use util::U256;
+	use ethereum_types::{H256, U256};
 
 	impl BlockLike for Header {
 		fn hash(&self) -> H256 { self.hash() }
@@ -184,13 +186,13 @@ pub mod headers {
 		type Unverified = Header;
 		type Verified = Header;
 
-		fn create(input: Self::Input, engine: &Engine) -> Result<Self::Unverified, Error> {
+		fn create(input: Self::Input, engine: &EthEngine) -> Result<Self::Unverified, Error> {
 			verify_header_params(&input, engine, true).map(|_| input)
 		}
 
-		fn verify(unverified: Self::Unverified, engine: &Engine, check_seal: bool) -> Result<Self::Verified, Error> {
+		fn verify(unverified: Self::Unverified, engine: &EthEngine, check_seal: bool) -> Result<Self::Verified, Error> {
 			match check_seal {
-				true => engine.verify_block_unordered(&unverified, None).map(|_| unverified),
+				true => engine.verify_block_unordered(&unverified,).map(|_| unverified),
 				false => Ok(unverified),
 			}
 		}
diff --git a/ethcore/src/verification/queue/mod.rs b/ethcore/src/verification/queue/mod.rs
index ce0cb41791be4f0e2376a9647ca6d76f9771c777..58b1bb7bb3cf1ae906dcbb015fbb061eb544d8eb 100644
--- a/ethcore/src/verification/queue/mod.rs
+++ b/ethcore/src/verification/queue/mod.rs
@@ -22,11 +22,13 @@ use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering as AtomicOrdering};
 use std::sync::{Condvar as SCondvar, Mutex as SMutex, Arc};
 use std::cmp;
 use std::collections::{VecDeque, HashSet, HashMap};
-use util::*;
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, U256};
+use parking_lot::{Condvar, Mutex, RwLock};
 use io::*;
 use error::*;
-use engines::Engine;
-use service::*;
+use engines::EthEngine;
+use client::ClientIoMessage;
 
 use self::kind::{BlockLike, Kind};
 
@@ -138,7 +140,7 @@ struct Sizes {
 /// A queue of items to be verified. Sits between network or other I/O and the `BlockChain`.
 /// Keeps them in the same order as inserted, minus invalid items.
 pub struct VerificationQueue<K: Kind> {
-	engine: Arc<Engine>,
+	engine: Arc<EthEngine>,
 	more_to_verify: Arc<SCondvar>,
 	verification: Arc<Verification<K>>,
 	deleting: Arc<AtomicBool>,
@@ -161,7 +163,6 @@ struct QueueSignal {
 }
 
 impl QueueSignal {
-	#[cfg_attr(feature="dev", allow(bool_comparison))]
 	fn set_sync(&self) {
 		// Do not signal when we are about to close
 		if self.deleting.load(AtomicOrdering::Relaxed) {
@@ -176,7 +177,6 @@ impl QueueSignal {
 		}
 	}
 
-	#[cfg_attr(feature="dev", allow(bool_comparison))]
 	fn set_async(&self) {
 		// Do not signal when we are about to close
 		if self.deleting.load(AtomicOrdering::Relaxed) {
@@ -210,7 +210,7 @@ struct Verification<K: Kind> {
 
 impl<K: Kind> VerificationQueue<K> {
 	/// Creates a new queue instance.
-	pub fn new(config: Config, engine: Arc<Engine>, message_channel: IoChannel<ClientIoMessage>, check_seal: bool) -> Self {
+	pub fn new(config: Config, engine: Arc<EthEngine>, message_channel: IoChannel<ClientIoMessage>, check_seal: bool) -> Self {
 		let verification = Arc::new(Verification {
 			unverified: Mutex::new(VecDeque::new()),
 			verifying: Mutex::new(VecDeque::new()),
@@ -291,7 +291,7 @@ impl<K: Kind> VerificationQueue<K> {
 
 	fn verify(
 		verification: Arc<Verification<K>>,
-		engine: Arc<Engine>,
+		engine: Arc<EthEngine>,
 		wait: Arc<SCondvar>,
 		ready: Arc<QueueSignal>,
 		empty: Arc<SCondvar>,
@@ -502,7 +502,7 @@ impl<K: Kind> VerificationQueue<K> {
 			Err(err) => {
 				match err {
 					// Don't mark future blocks as bad.
-					Error::Block(BlockError::InvalidTimestamp(ref e)) if e.max.is_some() => {},
+					Error::Block(BlockError::TemporarilyInvalid(_)) => {},
 					_ => {
 						self.verification.bad.lock().insert(h.clone());
 					}
@@ -519,7 +519,7 @@ impl<K: Kind> VerificationQueue<K> {
 			return;
 		}
 		let mut verified_lock = self.verification.verified.lock();
-		let mut verified = &mut *verified_lock;
+		let verified = &mut *verified_lock;
 		let mut bad = self.verification.bad.lock();
 		let mut processing = self.processing.write();
 		bad.reserve(hashes.len());
@@ -728,17 +728,17 @@ impl<K: Kind> Drop for VerificationQueue<K> {
 #[cfg(test)]
 mod tests {
 	use io::*;
-	use spec::*;
+	use spec::Spec;
 	use super::{BlockQueue, Config, State};
 	use super::kind::blocks::Unverified;
-	use tests::helpers::*;
+	use tests::helpers::{get_good_dummy_block_seq, get_good_dummy_block};
 	use error::*;
 	use views::*;
 
 	// create a test block queue.
 	// auto_scaling enables verifier adjustment.
 	fn get_test_queue(auto_scale: bool) -> BlockQueue {
-		let spec = get_test_spec();
+		let spec = Spec::new_test();
 		let engine = spec.engine;
 
 		let mut config = Config::default();
@@ -827,7 +827,7 @@ mod tests {
 
 	#[test]
 	fn test_mem_limit() {
-		let spec = get_test_spec();
+		let spec = Spec::new_test();
 		let engine = spec.engine;
 		let mut config = Config::default();
 		config.max_mem_use = super::MIN_MEM_LIMIT;  // empty queue uses about 15000
diff --git a/ethcore/src/verification/verification.rs b/ethcore/src/verification/verification.rs
index 00976dca7cd83280ba3a0d7c2ccaac2f3a01b8ee..f78059ac8dbf25422f2011de9f6346b608ab63c4 100644
--- a/ethcore/src/verification/verification.rs
+++ b/ethcore/src/verification/verification.rs
@@ -22,15 +22,23 @@
 //! 3. Final verification against the blockchain done before enactment.
 
 use std::collections::HashSet;
-use util::*;
-use engines::Engine;
-use error::{BlockError, Error};
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use bytes::Bytes;
+use ethereum_types::{H256, U256};
+use hash::keccak;
+use heapsize::HeapSizeOf;
+use rlp::UntrustedRlp;
+use triehash::ordered_trie_root;
+use unexpected::{Mismatch, OutOfBounds};
+
 use blockchain::*;
+use client::{BlockInfo, CallContract};
+use engines::EthEngine;
+use error::{BlockError, Error};
 use header::{BlockNumber, Header};
-use rlp::UntrustedRlp;
-use transaction::SignedTransaction;
+use transaction::{SignedTransaction, UnverifiedTransaction};
 use views::BlockView;
-use time::get_time;
 
 /// Preprocessed block data gathered in `verify_block_unordered` call
 pub struct PreverifiedBlock {
@@ -51,20 +59,18 @@ impl HeapSizeOf for PreverifiedBlock {
 }
 
 /// Phase 1 quick block verification. Only does checks that are cheap. Operates on a single block
-pub fn verify_block_basic(header: &Header, bytes: &[u8], engine: &Engine) -> Result<(), Error> {
+pub fn verify_block_basic(header: &Header, bytes: &[u8], engine: &EthEngine) -> Result<(), Error> {
 	verify_header_params(&header, engine, true)?;
 	verify_block_integrity(bytes, &header.transactions_root(), &header.uncles_hash())?;
-	engine.verify_block_basic(&header, Some(bytes))?;
+	engine.verify_block_basic(&header)?;
 	for u in UntrustedRlp::new(bytes).at(2)?.iter().map(|rlp| rlp.as_val::<Header>()) {
 		let u = u?;
 		verify_header_params(&u, engine, false)?;
-		engine.verify_block_basic(&u, None)?;
+		engine.verify_block_basic(&u)?;
 	}
-	// Verify transactions.
-	// TODO: either use transaction views or cache the decoded transactions.
-	let v = BlockView::new(bytes);
-	for t in v.transactions() {
-		engine.verify_transaction_basic(&t, &header)?;
+
+	for t in UntrustedRlp::new(bytes).at(1)?.iter().map(|rlp| rlp.as_val::<UnverifiedTransaction>()) {
+		engine.verify_transaction_basic(&t?, &header)?;
 	}
 	Ok(())
 }
@@ -72,11 +78,11 @@ pub fn verify_block_basic(header: &Header, bytes: &[u8], engine: &Engine) -> Res
 /// Phase 2 verification. Perform costly checks such as transaction signatures and block nonce for ethash.
 /// Still operates on a individual block
 /// Returns a `PreverifiedBlock` structure populated with transactions
-pub fn verify_block_unordered(header: Header, bytes: Bytes, engine: &Engine, check_seal: bool) -> Result<PreverifiedBlock, Error> {
+pub fn verify_block_unordered(header: Header, bytes: Bytes, engine: &EthEngine, check_seal: bool) -> Result<PreverifiedBlock, Error> {
 	if check_seal {
-		engine.verify_block_unordered(&header, Some(&bytes))?;
+		engine.verify_block_unordered(&header)?;
 		for u in UntrustedRlp::new(&bytes).at(2)?.iter().map(|rlp| rlp.as_val::<Header>()) {
-			engine.verify_block_unordered(&u?, None)?;
+			engine.verify_block_unordered(&u?)?;
 		}
 	}
 	// Verify transactions.
@@ -87,7 +93,7 @@ pub fn verify_block_unordered(header: Header, bytes: Bytes, engine: &Engine, che
 	{
 		let v = BlockView::new(&bytes);
 		for t in v.transactions() {
-			let t = engine.verify_transaction(t, &header)?;
+			let t = engine.verify_transaction_unordered(t, &header)?;
 			if let Some(max_nonce) = nonce_cap {
 				if t.nonce >= max_nonce {
 					return Err(BlockError::TooManyTransactions(t.sender()).into());
@@ -103,17 +109,51 @@ pub fn verify_block_unordered(header: Header, bytes: Bytes, engine: &Engine, che
 	})
 }
 
+/// Parameters for full verification of block family
+pub struct FullFamilyParams<'a, C: BlockInfo + CallContract + 'a> {
+	/// Serialized block bytes
+	pub block_bytes: &'a [u8],
+
+	/// Signed transactions
+	pub transactions: &'a [SignedTransaction],
+
+	/// Block provider to use during verification
+	pub block_provider: &'a BlockProvider,
+
+	/// Engine client to use during verification
+	pub client: &'a C,
+}
+
 /// Phase 3 verification. Check block information against parent and uncles.
-pub fn verify_block_family(header: &Header, bytes: &[u8], engine: &Engine, bc: &BlockProvider) -> Result<(), Error> {
+pub fn verify_block_family<C: BlockInfo + CallContract>(header: &Header, parent: &Header, engine: &EthEngine, do_full: Option<FullFamilyParams<C>>) -> Result<(), Error> {
 	// TODO: verify timestamp
-	let parent = bc.block_header(&header.parent_hash()).ok_or_else(|| Error::from(BlockError::UnknownParent(header.parent_hash().clone())))?;
-	verify_parent(&header, &parent)?;
-	engine.verify_block_family(&header, &parent, Some(bytes))?;
+	verify_parent(&header, &parent, engine.params().gas_limit_bound_divisor)?;
+	engine.verify_block_family(&header, &parent)?;
+
+	let params = match do_full {
+		Some(x) => x,
+		None => return Ok(()),
+	};
 
+	verify_uncles(header, params.block_bytes, params.block_provider, engine)?;
+
+	for transaction in params.transactions {
+		engine.machine().verify_transaction(transaction, header, params.client)?;
+	}
+
+	Ok(())
+}
+
+fn verify_uncles(header: &Header, bytes: &[u8], bc: &BlockProvider, engine: &EthEngine) -> Result<(), Error> {
 	let num_uncles = UntrustedRlp::new(bytes).at(2)?.item_count()?;
+	let max_uncles = engine.maximum_uncle_count(header.number());
 	if num_uncles != 0 {
-		if num_uncles > engine.maximum_uncle_count() {
-			return Err(From::from(BlockError::TooManyUncles(OutOfBounds { min: None, max: Some(engine.maximum_uncle_count()), found: num_uncles })));
+		if num_uncles > max_uncles {
+			return Err(From::from(BlockError::TooManyUncles(OutOfBounds {
+				min: None,
+				max: Some(max_uncles),
+				found: num_uncles,
+			})));
 		}
 
 		let mut excluded = HashSet::new();
@@ -184,11 +224,12 @@ pub fn verify_block_family(header: &Header, bytes: &[u8], engine: &Engine, bc: &
 				return Err(From::from(BlockError::UncleParentNotInChain(uncle_parent.hash())));
 			}
 
-			verify_parent(&uncle, &uncle_parent)?;
-			engine.verify_block_family(&uncle, &uncle_parent, Some(bytes))?;
+			verify_parent(&uncle, &uncle_parent, engine.params().gas_limit_bound_divisor)?;
+			engine.verify_block_family(&uncle, &uncle_parent)?;
 			verified.insert(uncle.hash());
 		}
 	}
+
 	Ok(())
 }
 
@@ -210,7 +251,14 @@ pub fn verify_block_final(expected: &Header, got: &Header) -> Result<(), Error>
 }
 
 /// Check basic header parameters.
-pub fn verify_header_params(header: &Header, engine: &Engine, is_full: bool) -> Result<(), Error> {
+pub fn verify_header_params(header: &Header, engine: &EthEngine, is_full: bool) -> Result<(), Error> {
+	let expected_seal_fields = engine.seal_fields(header);
+	if header.seal().len() != expected_seal_fields {
+		return Err(From::from(BlockError::InvalidSealArity(
+			Mismatch { expected: expected_seal_fields, found: header.seal().len() }
+		)));
+	}
+
 	if header.number() >= From::from(BlockNumber::max_value()) {
 		return Err(From::from(BlockError::RidiculousNumber(OutOfBounds { max: Some(From::from(BlockNumber::max_value())), min: None, found: header.number() })))
 	}
@@ -225,17 +273,36 @@ pub fn verify_header_params(header: &Header, engine: &Engine, is_full: bool) ->
 	if header.number() != 0 && header.extra_data().len() > maximum_extra_data_size {
 		return Err(From::from(BlockError::ExtraDataOutOfBounds(OutOfBounds { min: None, max: Some(maximum_extra_data_size), found: header.extra_data().len() })));
 	}
+
+	if let Some(ref ext) = engine.machine().ethash_extensions() {
+		if header.number() >= ext.dao_hardfork_transition &&
+			header.number() <= ext.dao_hardfork_transition + 9 &&
+			header.extra_data()[..] != b"dao-hard-fork"[..] {
+			return Err(From::from(BlockError::ExtraDataOutOfBounds(OutOfBounds { min: None, max: None, found: 0 })));
+		}
+	}
+
 	if is_full {
-		let max_time = get_time().sec as u64 + 30;
-		if header.timestamp() > max_time {
-			return Err(From::from(BlockError::InvalidTimestamp(OutOfBounds { max: Some(max_time), min: None, found: header.timestamp() })))
+		const ACCEPTABLE_DRIFT_SECS: u64 = 15;
+		let now = SystemTime::now().duration_since(UNIX_EPOCH).unwrap_or_default();
+		let max_time = now.as_secs() + ACCEPTABLE_DRIFT_SECS;
+		let invalid_threshold = max_time + ACCEPTABLE_DRIFT_SECS * 9;
+		let timestamp = header.timestamp();
+
+		if timestamp > invalid_threshold {
+			return Err(From::from(BlockError::InvalidTimestamp(OutOfBounds { max: Some(max_time), min: None, found: timestamp })))
+		}
+
+		if timestamp > max_time {
+			return Err(From::from(BlockError::TemporarilyInvalid(OutOfBounds { max: Some(max_time), min: None, found: timestamp })))
 		}
 	}
+
 	Ok(())
 }
 
 /// Check header parameters agains parent header.
-fn verify_parent(header: &Header, parent: &Header) -> Result<(), Error> {
+fn verify_parent(header: &Header, parent: &Header, gas_limit_divisor: U256) -> Result<(), Error> {
 	if !header.parent_hash().is_zero() && &parent.hash() != header.parent_hash() {
 		return Err(From::from(BlockError::InvalidParentHash(Mismatch { expected: parent.hash(), found: header.parent_hash().clone() })))
 	}
@@ -245,6 +312,18 @@ fn verify_parent(header: &Header, parent: &Header) -> Result<(), Error> {
 	if header.number() != parent.number() + 1 {
 		return Err(From::from(BlockError::InvalidNumber(Mismatch { expected: parent.number() + 1, found: header.number() })));
 	}
+
+	if header.number() == 0 {
+		return Err(BlockError::RidiculousNumber(OutOfBounds { min: Some(1), max: None, found: header.number() }).into());
+	}
+
+	let parent_gas_limit = *parent.gas_limit();
+	let min_gas = parent_gas_limit - parent_gas_limit / gas_limit_divisor;
+	let max_gas = parent_gas_limit + parent_gas_limit / gas_limit_divisor;
+	if header.gas_limit() <= &min_gas || header.gas_limit() >= &max_gas {
+		return Err(From::from(BlockError::InvalidGasLimit(OutOfBounds { min: Some(min_gas), max: Some(max_gas), found: header.gas_limit().clone() })));
+	}
+
 	Ok(())
 }
 
@@ -252,11 +331,11 @@ fn verify_parent(header: &Header, parent: &Header) -> Result<(), Error> {
 fn verify_block_integrity(block: &[u8], transactions_root: &H256, uncles_hash: &H256) -> Result<(), Error> {
 	let block = UntrustedRlp::new(block);
 	let tx = block.at(1)?;
-	let expected_root = &ordered_trie_root(tx.iter().map(|r| r.as_raw().to_vec())); //TODO: get rid of vectors here
+	let expected_root = &ordered_trie_root(tx.iter().map(|r| r.as_raw()));
 	if expected_root != transactions_root {
 		return Err(From::from(BlockError::InvalidTransactionsRoot(Mismatch { expected: expected_root.clone(), found: transactions_root.clone() })))
 	}
-	let expected_uncles = &block.at(2)?.as_raw().sha3();
+	let expected_uncles = &keccak(block.at(2)?.as_raw());
 	if expected_uncles != uncles_hash {
 		return Err(From::from(BlockError::InvalidUnclesHash(Mismatch { expected: expected_uncles.clone(), found: uncles_hash.clone() })))
 	}
@@ -265,23 +344,23 @@ fn verify_block_integrity(block: &[u8], transactions_root: &H256, uncles_hash: &
 
 #[cfg(test)]
 mod tests {
+	use super::*;
+
 	use std::collections::{BTreeMap, HashMap};
-	use util::*;
-	use ethkey::{Random, Generator};
-	use header::*;
-	use verification::*;
-	use blockchain::extras::*;
-	use error::*;
+	use std::time::{SystemTime, UNIX_EPOCH};
+	use ethereum_types::{H256, Bloom, U256};
+	use blockchain::{BlockDetails, TransactionAddress, BlockReceipts};
+	use encoded;
+	use hash::keccak;
+	use engines::EthEngine;
 	use error::BlockError::*;
-	use views::*;
-	use blockchain::*;
-	use engines::Engine;
-	use spec::*;
-	use transaction::*;
-	use tests::helpers::*;
+	use ethkey::{Random, Generator};
+	use spec::{CommonParams, Spec};
+	use tests::helpers::{create_test_block_with_data, create_test_block};
+	use transaction::{SignedTransaction, Transaction, UnverifiedTransaction, Action};
 	use types::log_entry::{LogEntry, LocalizedLogEntry};
-	use time::get_time;
-	use encoded;
+	use rlp;
+	use triehash::ordered_trie_root;
 
 	fn check_ok(result: Result<(), Error>) {
 		result.unwrap_or_else(|e| panic!("Block verification failed: {:?}", e));
@@ -295,11 +374,13 @@ mod tests {
 		}
 	}
 
-	fn check_fail_timestamp(result: Result<(), Error>) {
+	fn check_fail_timestamp(result: Result<(), Error>, temp: bool) {
+		let name = if temp { "TemporarilyInvalid" } else { "InvalidTimestamp" };
 		match result {
-			Err(Error::Block(BlockError::InvalidTimestamp(_))) => (),
-			Err(other) => panic!("Block verification failed.\nExpected: InvalidTimestamp\nGot: {:?}", other),
-			Ok(_) => panic!("Block verification failed.\nExpected: InvalidTimestamp\nGot: Ok"),
+			Err(Error::Block(BlockError::InvalidTimestamp(_))) if !temp => (),
+			Err(Error::Block(BlockError::TemporarilyInvalid(_))) if temp => (),
+			Err(other) => panic!("Block verification failed.\nExpected: {}\nGot: {:?}", name, other),
+			Ok(_) => panic!("Block verification failed.\nExpected: {}\nGot: Ok", name),
 		}
 	}
 
@@ -324,7 +405,7 @@ mod tests {
 
 		pub fn insert(&mut self, bytes: Bytes) {
 			let number = BlockView::new(&bytes).header_view().number();
-			let hash = BlockView::new(&bytes).header_view().sha3();
+			let hash = BlockView::new(&bytes).header_view().hash();
 			self.blocks.insert(hash.clone(), bytes);
 			self.numbers.insert(number, hash.clone());
 		}
@@ -382,39 +463,79 @@ mod tests {
 			self.numbers.get(&index).cloned()
 		}
 
-		fn blocks_with_bloom(&self, _bloom: &H2048, _from_block: BlockNumber, _to_block: BlockNumber) -> Vec<BlockNumber> {
+		fn block_receipts(&self, _hash: &H256) -> Option<BlockReceipts> {
 			unimplemented!()
 		}
 
-		fn block_receipts(&self, _hash: &H256) -> Option<BlockReceipts> {
+		fn blocks_with_bloom(&self, _bloom: &Bloom, _from_block: BlockNumber, _to_block: BlockNumber) -> Vec<BlockNumber> {
 			unimplemented!()
 		}
 
-
 		fn logs<F>(&self, _blocks: Vec<BlockNumber>, _matches: F, _limit: Option<usize>) -> Vec<LocalizedLogEntry>
 			where F: Fn(&LogEntry) -> bool, Self: Sized {
 			unimplemented!()
 		}
 	}
 
-	fn basic_test(bytes: &[u8], engine: &Engine) -> Result<(), Error> {
+	fn basic_test(bytes: &[u8], engine: &EthEngine) -> Result<(), Error> {
 		let header = BlockView::new(bytes).header();
 		verify_block_basic(&header, bytes, engine)
 	}
 
-	fn family_test<BC>(bytes: &[u8], engine: &Engine, bc: &BC) -> Result<(), Error> where BC: BlockProvider {
-		let header = BlockView::new(bytes).header();
-		verify_block_family(&header, bytes, engine, bc)
+	fn family_test<BC>(bytes: &[u8], engine: &EthEngine, bc: &BC) -> Result<(), Error> where BC: BlockProvider {
+		let view = BlockView::new(bytes);
+		let header = view.header();
+		let transactions: Vec<_> = view.transactions()
+			.into_iter()
+			.map(SignedTransaction::new)
+			.collect::<Result<_,_>>()?;
+
+		// TODO: client is really meant to be used for state query here by machine
+		// additions that need access to state (tx filter in specific)
+		// no existing tests need access to test, so having this not function
+		// is fine.
+		let client = ::client::TestBlockChainClient::default();
+
+		let parent = bc.block_header(header.parent_hash())
+			.ok_or(BlockError::UnknownParent(header.parent_hash().clone()))?;
+
+		let full_params = FullFamilyParams {
+			block_bytes: bytes,
+			transactions: &transactions[..],
+			block_provider: bc as &BlockProvider,
+			client: &client,
+		};
+		verify_block_family(&header, &parent, engine, Some(full_params))
 	}
 
-	fn unordered_test(bytes: &[u8], engine: &Engine) -> Result<(), Error> {
+	fn unordered_test(bytes: &[u8], engine: &EthEngine) -> Result<(), Error> {
 		let header = BlockView::new(bytes).header();
 		verify_block_unordered(header, bytes.to_vec(), engine, false)?;
 		Ok(())
 	}
 
 	#[test]
-	#[cfg_attr(feature="dev", allow(similar_names))]
+	fn test_verify_block_basic_with_invalid_transactions() {
+		let spec = Spec::new_test();
+		let engine = &*spec.engine;
+
+		let block = {
+			let mut rlp = rlp::RlpStream::new_list(3);
+			let mut header = Header::default();
+			// that's an invalid transaction list rlp
+			let invalid_transactions = vec![vec![0u8]];
+			header.set_transactions_root(ordered_trie_root(&invalid_transactions));
+			header.set_gas_limit(engine.params().min_gas_limit);
+			rlp.append(&header);
+			rlp.append_list::<Vec<u8>, _>(&invalid_transactions);
+			rlp.append_raw(&rlp::EMPTY_LIST_RLP, 1);
+			rlp.out()
+		};
+
+		assert!(basic_test(&block, engine).is_err());
+	}
+
+	#[test]
 	fn test_verify_block() {
 		use rlp::RlpStream;
 
@@ -482,8 +603,8 @@ mod tests {
 		let good_uncles = vec![ good_uncle1.clone(), good_uncle2.clone() ];
 		let mut uncles_rlp = RlpStream::new();
 		uncles_rlp.append_list(&good_uncles);
-		let good_uncles_hash = uncles_rlp.as_raw().sha3();
-		let good_transactions_root = ordered_trie_root(good_transactions.iter().map(|t| ::rlp::encode::<UnverifiedTransaction>(t).into_vec()));
+		let good_uncles_hash = keccak(uncles_rlp.as_raw());
+		let good_transactions_root = ordered_trie_root(good_transactions.iter().map(|t| ::rlp::encode::<UnverifiedTransaction>(t)));
 
 		let mut parent = good.clone();
 		parent.set_number(9);
@@ -559,11 +680,17 @@ mod tests {
 
 		header = good.clone();
 		header.set_timestamp(2450000000);
-		check_fail_timestamp(basic_test(&create_test_block_with_data(&header, &good_transactions, &good_uncles), engine));
+		check_fail_timestamp(basic_test(&create_test_block_with_data(&header, &good_transactions, &good_uncles), engine), false);
 
 		header = good.clone();
-		header.set_timestamp(get_time().sec as u64 + 40);
-		check_fail_timestamp(basic_test(&create_test_block_with_data(&header, &good_transactions, &good_uncles), engine));
+		header.set_timestamp(SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs() + 20);
+		check_fail_timestamp(basic_test(&create_test_block_with_data(&header, &good_transactions, &good_uncles), engine), true);
+
+		header = good.clone();
+		header.set_timestamp(SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs() + 10);
+		header.set_uncles_hash(good_uncles_hash.clone());
+		header.set_transactions_root(good_transactions_root.clone());
+		check_ok(basic_test(&create_test_block_with_data(&header, &good_transactions, &good_uncles), engine));
 
 		header = good.clone();
 		header.set_number(9);
@@ -574,13 +701,22 @@ mod tests {
 		let mut bad_uncles = good_uncles.clone();
 		bad_uncles.push(good_uncle1.clone());
 		check_fail(family_test(&create_test_block_with_data(&header, &good_transactions, &bad_uncles), engine, &bc),
-			TooManyUncles(OutOfBounds { max: Some(engine.maximum_uncle_count()), min: None, found: bad_uncles.len() }));
+			TooManyUncles(OutOfBounds { max: Some(engine.maximum_uncle_count(header.number())), min: None, found: bad_uncles.len() }));
 
 		header = good.clone();
 		bad_uncles = vec![ good_uncle1.clone(), good_uncle1.clone() ];
 		check_fail(family_test(&create_test_block_with_data(&header, &good_transactions, &bad_uncles), engine, &bc),
 			DuplicateUncle(good_uncle1.hash()));
 
+		header = good.clone();
+		header.set_gas_limit(0.into());
+		header.set_difficulty("0000000000000000000000000000000000000000000000000000000000020000".parse::<U256>().unwrap());
+		match family_test(&create_test_block(&header), engine, &bc) {
+			Err(Error::Block(InvalidGasLimit(_))) => {},
+			Err(_) => { panic!("should be invalid difficulty fail"); },
+			_ => { panic!("Should be error, got Ok"); },
+		}
+
 		// TODO: some additional uncle checks
 	}
 
@@ -588,6 +724,7 @@ mod tests {
 	fn dust_protection() {
 		use ethkey::{Generator, Random};
 		use transaction::{Transaction, Action};
+		use machine::EthereumMachine;
 		use engines::NullEngine;
 
 		let mut params = CommonParams::default();
@@ -609,7 +746,8 @@ mod tests {
 
 		let good_transactions = [bad_transactions[0].clone(), bad_transactions[1].clone()];
 
-		let engine = NullEngine::new(params, BTreeMap::new());
+		let machine = EthereumMachine::regular(params, BTreeMap::new());
+		let engine = NullEngine::new(Default::default(), machine);
 		check_fail(unordered_test(&create_test_block_with_data(&header, &bad_transactions, &[]), &engine), TooManyTransactions(keypair.address()));
 		unordered_test(&create_test_block_with_data(&header, &good_transactions, &[]), &engine).unwrap();
 	}
diff --git a/ethcore/src/verification/verifier.rs b/ethcore/src/verification/verifier.rs
index 55b711c1c4a469a2b3ada1b46f12f17d295c9be6..a9ca22a4c8aa8534cd7fcb07c112606408cb361e 100644
--- a/ethcore/src/verification/verifier.rs
+++ b/ethcore/src/verification/verifier.rs
@@ -16,17 +16,27 @@
 
 //! A generic verifier trait.
 
-use blockchain::BlockProvider;
-use engines::Engine;
+use client::{BlockInfo, CallContract};
+use engines::EthEngine;
 use error::Error;
 use header::Header;
+use super::verification;
 
 /// Should be used to verify blocks.
-pub trait Verifier: Send + Sync {
+pub trait Verifier<C>: Send + Sync
+	where C: BlockInfo + CallContract
+{
 	/// Verify a block relative to its parent and uncles.
-	fn verify_block_family(&self, header: &Header, bytes: &[u8], engine: &Engine, bc: &BlockProvider) -> Result<(), Error>;
+	fn verify_block_family(
+		&self,
+		header: &Header,
+		parent: &Header,
+		engine: &EthEngine,
+		do_full: Option<verification::FullFamilyParams<C>>
+	) -> Result<(), Error>;
+
 	/// Do a final verification check for an enacted header vs its expected counterpart.
 	fn verify_block_final(&self, expected: &Header, got: &Header) -> Result<(), Error>;
 	/// Verify a block, inspecing external state.
-	fn verify_block_external(&self, header: &Header, bytes: &[u8], engine: &Engine) -> Result<(), Error>;
+	fn verify_block_external(&self, header: &Header, engine: &EthEngine) -> Result<(), Error>;
 }
diff --git a/ethcore/src/views/block.rs b/ethcore/src/views/block.rs
index f00ca548fd57d28ef9d34759c5c8c909da81de11..c60cc07c5425581304521f05d3f2d59d120d5399 100644
--- a/ethcore/src/views/block.rs
+++ b/ethcore/src/views/block.rs
@@ -16,11 +16,13 @@
 
 //! View onto block rlp.
 
-use util::*;
-use header::*;
-use transaction::*;
-use super::{TransactionView, HeaderView};
+use bytes::Bytes;
+use ethereum_types::H256;
+use hash::keccak;
+use header::Header;
 use rlp::Rlp;
+use transaction::{UnverifiedTransaction, LocalizedTransaction};
+use views::{TransactionView, HeaderView};
 
 /// View onto block rlp.
 pub struct BlockView<'a> {
@@ -44,7 +46,7 @@ impl<'a> BlockView<'a> {
 
 	/// Block header hash.
 	pub fn hash(&self) -> H256 {
-		self.sha3()
+		self.header_view().hash()
 	}
 
 	/// Return reference to underlaying rlp.
@@ -75,7 +77,7 @@ impl<'a> BlockView<'a> {
 	/// Return List of transactions with additional localization info.
 	pub fn localized_transactions(&self) -> Vec<LocalizedTransaction> {
 		let header = self.header_view();
-		let block_hash = header.sha3();
+		let block_hash = header.hash();
 		let block_number = header.number();
 		self.transactions()
 			.into_iter()
@@ -101,7 +103,7 @@ impl<'a> BlockView<'a> {
 
 	/// Return transaction hashes.
 	pub fn transaction_hashes(&self) -> Vec<H256> {
-		self.rlp.at(1).iter().map(|rlp| rlp.as_raw().sha3()).collect()
+		self.rlp.at(1).iter().map(|rlp| keccak(rlp.as_raw())).collect()
 	}
 
 	/// Returns transaction at given index without deserializing unnecessary data.
@@ -112,7 +114,7 @@ impl<'a> BlockView<'a> {
 	/// Returns localized transaction at given index.
 	pub fn localized_transaction_at(&self, index: usize) -> Option<LocalizedTransaction> {
 		let header = self.header_view();
-		let block_hash = header.sha3();
+		let block_hash = header.hash();
 		let block_number = header.number();
 		self.transaction_at(index).map(|t| LocalizedTransaction {
 			signed: t,
@@ -140,7 +142,7 @@ impl<'a> BlockView<'a> {
 
 	/// Return list of uncle hashes of given block.
 	pub fn uncle_hashes(&self) -> Vec<H256> {
-		self.rlp.at(2).iter().map(|rlp| rlp.as_raw().sha3()).collect()
+		self.rlp.at(2).iter().map(|rlp| keccak(rlp.as_raw())).collect()
 	}
 
 	/// Return nth uncle.
@@ -154,17 +156,9 @@ impl<'a> BlockView<'a> {
 	}
 }
 
-impl<'a> Hashable for BlockView<'a> {
-	fn sha3(&self) -> H256 {
-		self.header_view().sha3()
-	}
-}
-
 #[cfg(test)]
 mod tests {
-	use std::str::FromStr;
 	use rustc_hex::FromHex;
-	use util::H256;
 	use super::BlockView;
 
 	#[test]
@@ -173,7 +167,7 @@ mod tests {
 		let rlp = "f90261f901f9a0d405da4e66f1445d455195229624e133f5baafe72b5cf7b3c36c12c8146e98b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a05fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25a088d2ec6b9860aae1a2c3b299f72b6a5d70d7f7ba4722c78f2c49ba96273c2158a007c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302008003832fefba82524d84568e932a80a0a0349d8c3df71f1a48a9df7d03fd5f14aeee7d91332c009ecaff0a71ead405bd88ab4e252a7e8c2a23f862f86002018304cb2f94ec0e71ad0a90ffe1909d27dac207f7680abba42d01801ba03a347e72953c860f32b1eb2c78a680d8734b2ea08085d949d729479796f218d5a047ea6239d9e31ccac8af3366f5ca37184d26e7646e3191a3aeb81c4cf74de500c0".from_hex().unwrap();
 
 		let view = BlockView::new(&rlp);
-		assert_eq!(view.hash(), H256::from_str("2c9747e804293bd3f1a986484343f23bc88fd5be75dfe9d5c2860aff61e6f259").unwrap());
+		assert_eq!(view.hash(), "2c9747e804293bd3f1a986484343f23bc88fd5be75dfe9d5c2860aff61e6f259".into());
 		assert_eq!(view.transactions_count(), 1);
 		assert_eq!(view.uncles_count(), 0);
 	}
diff --git a/ethcore/src/views/body.rs b/ethcore/src/views/body.rs
index 038e152b04e74f94f8b2e3e201df1a7c55d1f271..433f7c2b68fd2a124f4134e601d529d59fdac030 100644
--- a/ethcore/src/views/body.rs
+++ b/ethcore/src/views/body.rs
@@ -16,11 +16,13 @@
 
 //! View onto block body rlp.
 
-use util::*;
-use header::*;
-use transaction::*;
-use super::{TransactionView, HeaderView};
+use bytes::Bytes;
+use ethereum_types::H256;
+use hash::keccak;
+use header::{Header, BlockNumber};
 use rlp::Rlp;
+use transaction::{LocalizedTransaction, UnverifiedTransaction};
+use views::{TransactionView, HeaderView};
 
 /// View onto block rlp.
 pub struct BodyView<'a> {
@@ -78,7 +80,7 @@ impl<'a> BodyView<'a> {
 
 	/// Return transaction hashes.
 	pub fn transaction_hashes(&self) -> Vec<H256> {
-		self.rlp.at(0).iter().map(|rlp| rlp.as_raw().sha3()).collect()
+		self.rlp.at(0).iter().map(|rlp| keccak(rlp.as_raw())).collect()
 	}
 
 	/// Returns transaction at given index without deserializing unnecessary data.
@@ -114,7 +116,7 @@ impl<'a> BodyView<'a> {
 
 	/// Return list of uncle hashes of given block.
 	pub fn uncle_hashes(&self) -> Vec<H256> {
-		self.rlp.at(1).iter().map(|rlp| rlp.as_raw().sha3()).collect()
+		self.rlp.at(1).iter().map(|rlp| keccak(rlp.as_raw())).collect()
 	}
 
 	/// Return nth uncle.
@@ -144,4 +146,3 @@ mod tests {
 		assert_eq!(view.uncles_count(), 0);
 	}
 }
-
diff --git a/ethcore/src/views/header.rs b/ethcore/src/views/header.rs
index 4506d98ec2c664832d0d2ad827f484979abd5519..cce4eee82814620a931f8c986d2b047342cd599f 100644
--- a/ethcore/src/views/header.rs
+++ b/ethcore/src/views/header.rs
@@ -16,9 +16,11 @@
 
 //! View onto block header rlp
 
-use util::{U256, Bytes, Hashable, H256, Address, H2048};
-use rlp::Rlp;
+use bytes::Bytes;
+use ethereum_types::{H256, Bloom, U256, Address};
+use hash::keccak;
 use header::BlockNumber;
+use rlp::{self, Rlp};
 
 /// View onto block header rlp.
 pub struct HeaderView<'a> {
@@ -41,7 +43,9 @@ impl<'a> HeaderView<'a> {
 	}
 
 	/// Returns header hash.
-	pub fn hash(&self) -> H256 { self.sha3() }
+	pub fn hash(&self) -> H256 {
+		keccak(self.rlp.as_raw())
+	}
 
 	/// Returns raw rlp.
 	pub fn rlp(&self) -> &Rlp<'a> { &self.rlp }
@@ -65,7 +69,7 @@ impl<'a> HeaderView<'a> {
 	pub fn receipts_root(&self) -> H256 { self.rlp.val_at(5) }
 
 	/// Returns block log bloom.
-	pub fn log_bloom(&self) -> H2048 { self.rlp.val_at(6) }
+	pub fn log_bloom(&self) -> Bloom { self.rlp.val_at(6) }
 
 	/// Returns block difficulty.
 	pub fn difficulty(&self) -> U256 { self.rlp.val_at(7) }
@@ -93,19 +97,20 @@ impl<'a> HeaderView<'a> {
 		}
 		seal
 	}
-}
 
-impl<'a> Hashable for HeaderView<'a> {
-	fn sha3(&self) -> H256 {
-		self.rlp.as_raw().sha3()
+	/// Returns a vector of seal fields (RLP-decoded).
+	pub fn decode_seal(&self) -> Result<Vec<Bytes>, rlp::DecoderError> {
+		let seal = self.seal();
+		seal.into_iter()
+			.map(|s| rlp::UntrustedRlp::new(&s).data().map(|x| x.to_vec()))
+			.collect()
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use std::str::FromStr;
 	use rustc_hex::FromHex;
-	use util::{H256, Address, H2048, U256};
+	use ethereum_types::Bloom;
 	use super::HeaderView;
 
 	#[test]
@@ -116,18 +121,18 @@ mod tests {
 		let nonce = "88ab4e252a7e8c2a23".from_hex().unwrap();
 
 		let view = HeaderView::new(&rlp);
-		assert_eq!(view.hash(), H256::from_str("2c9747e804293bd3f1a986484343f23bc88fd5be75dfe9d5c2860aff61e6f259").unwrap());
-		assert_eq!(view.parent_hash(), H256::from_str("d405da4e66f1445d455195229624e133f5baafe72b5cf7b3c36c12c8146e98b7").unwrap());
-		assert_eq!(view.uncles_hash(), H256::from_str("1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347").unwrap());
-		assert_eq!(view.author(), Address::from_str("8888f1f195afa192cfee860698584c030f4c9db1").unwrap());
-		assert_eq!(view.state_root(), H256::from_str("5fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25").unwrap());
-		assert_eq!(view.transactions_root(), H256::from_str("88d2ec6b9860aae1a2c3b299f72b6a5d70d7f7ba4722c78f2c49ba96273c2158").unwrap());
-		assert_eq!(view.receipts_root(), H256::from_str("07c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1").unwrap());
-		assert_eq!(view.log_bloom(), H2048::default());
-		assert_eq!(view.difficulty(), U256::from(0x02_00_80));
+		assert_eq!(view.hash(), "2c9747e804293bd3f1a986484343f23bc88fd5be75dfe9d5c2860aff61e6f259".into());
+		assert_eq!(view.parent_hash(), "d405da4e66f1445d455195229624e133f5baafe72b5cf7b3c36c12c8146e98b7".into());
+		assert_eq!(view.uncles_hash(), "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347".into());
+		assert_eq!(view.author(), "8888f1f195afa192cfee860698584c030f4c9db1".into());
+		assert_eq!(view.state_root(), "5fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25".into());
+		assert_eq!(view.transactions_root(), "88d2ec6b9860aae1a2c3b299f72b6a5d70d7f7ba4722c78f2c49ba96273c2158".into());
+		assert_eq!(view.receipts_root(), "07c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1".into());
+		assert_eq!(view.log_bloom(), Bloom::default());
+		assert_eq!(view.difficulty(), 0x020080.into());
 		assert_eq!(view.number(), 3);
-		assert_eq!(view.gas_limit(), U256::from(0x2f_ef_ba));
-		assert_eq!(view.gas_used(), U256::from(0x52_4d));
+		assert_eq!(view.gas_limit(), 0x2fefba.into());
+		assert_eq!(view.gas_used(), 0x524d.into());
 		assert_eq!(view.timestamp(), 0x56_8e_93_2a);
 		assert_eq!(view.extra_data(), vec![] as Vec<u8>);
 		assert_eq!(view.seal(), vec![mix_hash, nonce]);
diff --git a/ethcore/src/views/mod.rs b/ethcore/src/views/mod.rs
index 4e6ae34d213273a13420f5b708a842f0dc3dc557..5d3cc8cdccd78fa398272c768feb3197b8807d3a 100644
--- a/ethcore/src/views/mod.rs
+++ b/ethcore/src/views/mod.rs
@@ -17,11 +17,11 @@
 //! Block oriented views onto rlp.
 
 mod block;
+mod body;
 mod header;
 mod transaction;
-mod body;
 
 pub use self::block::BlockView;
-pub use self::header::HeaderView;
 pub use self::body::BodyView;
+pub use self::header::HeaderView;
 pub use self::transaction::TransactionView;
diff --git a/ethcore/src/views/transaction.rs b/ethcore/src/views/transaction.rs
index 11c7fc2f17ecc9b61c818e2a98a50af2359bddaf..92bd49c276835d33776ea6db85a798997ba24238 100644
--- a/ethcore/src/views/transaction.rs
+++ b/ethcore/src/views/transaction.rs
@@ -15,7 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! View onto transaction rlp
-use util::{U256, Bytes, Hashable, H256};
+use bytes::Bytes;
+use ethereum_types::{H256, U256};
+use hash::keccak;
 use rlp::Rlp;
 
 /// View onto transaction rlp.
@@ -43,6 +45,11 @@ impl<'a> TransactionView<'a> {
 		&self.rlp
 	}
 
+	/// Returns transaction hash.
+	pub fn hash(&self) -> H256 {
+		keccak(self.rlp.as_raw())
+	}
+
 	/// Get the nonce field of the transaction.
 	pub fn nonce(&self) -> U256 { self.rlp.val_at(0) }
 
@@ -68,17 +75,9 @@ impl<'a> TransactionView<'a> {
 	pub fn s(&self) -> U256 { self.rlp.val_at(8) }
 }
 
-impl<'a> Hashable for TransactionView<'a> {
-	fn sha3(&self) -> H256 {
-		self.rlp.as_raw().sha3()
-	}
-}
-
 #[cfg(test)]
 mod tests {
-	use std::str::FromStr;
 	use rustc_hex::FromHex;
-	use util::U256;
 	use super::TransactionView;
 
 	#[test]
@@ -86,13 +85,13 @@ mod tests {
 		let rlp = "f87c80018261a894095e7baea6a6c7c4c2dfeb977efac326af552d870a9d00000000000000000000000000000000000000000000000000000000001ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804".from_hex().unwrap();
 
 		let view = TransactionView::new(&rlp);
-		assert_eq!(view.nonce(), U256::from(0));
-		assert_eq!(view.gas_price(), U256::from(1));
-		assert_eq!(view.gas(), U256::from(0x61a8));
-		assert_eq!(view.value(), U256::from(0xa));
+		assert_eq!(view.nonce(), 0.into());
+		assert_eq!(view.gas_price(), 1.into());
+		assert_eq!(view.gas(), 0x61a8.into());
+		assert_eq!(view.value(), 0xa.into());
 		assert_eq!(view.data(), "0000000000000000000000000000000000000000000000000000000000".from_hex().unwrap());
-		assert_eq!(view.r(), U256::from_str("48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353").unwrap());
-		assert_eq!(view.s(), U256::from_str("efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804").unwrap());
+		assert_eq!(view.r(), "48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353".into());
+		assert_eq!(view.s(), "efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804".into());
 		assert_eq!(view.v(), 0x1b);
 	}
 }
diff --git a/ethcore/transaction/Cargo.toml b/ethcore/transaction/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..7b45cae479b5b6dea4fb92fb2d00fef4b51a65b6
--- /dev/null
+++ b/ethcore/transaction/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "ethcore-transaction"
+description = "Transaction type"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+ethjson = { path = "../../json" }
+ethkey = { path = "../../ethkey" }
+evm = { path = "../evm" }
+heapsize = "0.4"
+keccak-hash = { path = "../../util/hash" }
+rlp = { path = "../../util/rlp" }
+unexpected = { path = "../../util/unexpected" }
+ethereum-types = "0.2"
+
+[dev-dependencies]
+rustc-hex= "1.0"
+
+[features]
+json-tests = []
diff --git a/ethcore/transaction/src/error.rs b/ethcore/transaction/src/error.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4578b88acd040f8cc83055e89808ee286b91db70
--- /dev/null
+++ b/ethcore/transaction/src/error.rs
@@ -0,0 +1,114 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::fmt;
+
+use ethereum_types::U256;
+use ethkey;
+use unexpected::OutOfBounds;
+
+#[derive(Debug, PartialEq, Clone)]
+/// Errors concerning transaction processing.
+pub enum Error {
+	/// Transaction is already imported to the queue
+	AlreadyImported,
+	/// Transaction is not valid anymore (state already has higher nonce)
+	Old,
+	/// Transaction has too low fee
+	/// (there is already a transaction with the same sender-nonce but higher gas price)
+	TooCheapToReplace,
+	/// Transaction was not imported to the queue because limit has been reached.
+	LimitReached,
+	/// Transaction's gas price is below threshold.
+	InsufficientGasPrice {
+		/// Minimal expected gas price
+		minimal: U256,
+		/// Transaction gas price
+		got: U256,
+	},
+	/// Transaction's gas is below currently set minimal gas requirement.
+	InsufficientGas {
+		/// Minimal expected gas
+		minimal: U256,
+		/// Transaction gas
+		got: U256,
+	},
+	/// Sender doesn't have enough funds to pay for this transaction
+	InsufficientBalance {
+		/// Senders balance
+		balance: U256,
+		/// Transaction cost
+		cost: U256,
+	},
+	/// Transactions gas is higher then current gas limit
+	GasLimitExceeded {
+		/// Current gas limit
+		limit: U256,
+		/// Declared transaction gas
+		got: U256,
+	},
+	/// Transaction's gas limit (aka gas) is invalid.
+	InvalidGasLimit(OutOfBounds<U256>),
+	/// Transaction sender is banned.
+	SenderBanned,
+	/// Transaction receipient is banned.
+	RecipientBanned,
+	/// Contract creation code is banned.
+	CodeBanned,
+	/// Invalid chain ID given.
+	InvalidChainId,
+	/// Not enough permissions given by permission contract.
+	NotAllowed,
+	/// Signature error
+	InvalidSignature(String),
+}
+
+impl From<ethkey::Error> for Error {
+	fn from(err: ethkey::Error) -> Self {
+		Error::InvalidSignature(format!("{}", err))
+	}
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		use self::Error::*;
+		let msg = match *self {
+			AlreadyImported => "Already imported".into(),
+			Old => "No longer valid".into(),
+			TooCheapToReplace => "Gas price too low to replace".into(),
+			LimitReached => "Transaction limit reached".into(),
+			InsufficientGasPrice { minimal, got } =>
+				format!("Insufficient gas price. Min={}, Given={}", minimal, got),
+			InsufficientGas { minimal, got } =>
+				format!("Insufficient gas. Min={}, Given={}", minimal, got),
+			InsufficientBalance { balance, cost } =>
+				format!("Insufficient balance for transaction. Balance={}, Cost={}",
+					balance, cost),
+			GasLimitExceeded { limit, got } =>
+				format!("Gas limit exceeded. Limit={}, Given={}", limit, got),
+			InvalidGasLimit(ref err) => format!("Invalid gas limit. {}", err),
+			SenderBanned => "Sender is temporarily banned.".into(),
+			RecipientBanned => "Recipient is temporarily banned.".into(),
+			CodeBanned => "Contract code is temporarily banned.".into(),
+			InvalidChainId => "Transaction of this chain ID is not allowed on this chain.".into(),
+			InvalidSignature(ref err) => format!("Transaction has invalid signature: {}.", err),
+			NotAllowed => "Sender does not have permissions to execute this type of transction".into(),
+		};
+
+		f.write_fmt(format_args!("Transaction error ({})", msg))
+	}
+}
+
diff --git a/js/src/modals/DeployContract/index.js b/ethcore/transaction/src/lib.rs
similarity index 56%
rename from js/src/modals/DeployContract/index.js
rename to ethcore/transaction/src/lib.rs
index 81cd843a91b059d2947392ad6e7e3091a97f9b3a..6d6c269f30ca7797f44df606913dae255e41e2ac 100644
--- a/js/src/modals/DeployContract/index.js
+++ b/ethcore/transaction/src/lib.rs
@@ -14,4 +14,33 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './deployContract';
+//! Ethereum Transactions
+
+extern crate ethereum_types;
+extern crate ethjson;
+extern crate ethkey;
+extern crate evm;
+extern crate heapsize;
+extern crate keccak_hash as hash;
+extern crate rlp;
+extern crate unexpected;
+
+#[cfg(test)]
+extern crate rustc_hex;
+
+mod error;
+mod transaction;
+
+pub use error::Error;
+pub use transaction::*;
+
+// TODO [ToDr] Move to miner!
+
+/// Represents the result of importing transaction.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum ImportResult {
+	/// Transaction was imported to current queue.
+	Current,
+	/// Transaction was imported to future queue.
+	Future
+}
diff --git a/ethcore/src/transaction.rs b/ethcore/transaction/src/transaction.rs
similarity index 89%
rename from ethcore/src/transaction.rs
rename to ethcore/transaction/src/transaction.rs
index 0bd61dcebc3bf133cd02af181113ba644049359b..f206c549a7cd17433bc16a3e9b4452d2d7e9edf1 100644
--- a/ethcore/src/transaction.rs
+++ b/ethcore/transaction/src/transaction.rs
@@ -17,20 +17,24 @@
 //! Transaction data structure.
 
 use std::ops::Deref;
-use rlp::*;
-use util::sha3::Hashable;
-use util::{H256, Address, U256, Bytes, HeapSizeOf};
-use ethkey::{Signature, Secret, Public, recover, public_to_address, Error as EthkeyError};
-use error::*;
-use evm::Schedule;
-use header::BlockNumber;
+use ethereum_types::{H256, H160, Address, U256};
+use error;
 use ethjson;
+use ethkey::{self, Signature, Secret, Public, recover, public_to_address};
+use evm::Schedule;
+use hash::keccak;
+use heapsize::HeapSizeOf;
+use rlp::{self, RlpStream, UntrustedRlp, DecoderError, Encodable};
+// use rlp::*;
+
+type Bytes = Vec<u8>;
+type BlockNumber = u64;
 
 /// Fake address for unsigned transactions as defined by EIP-86.
-pub const UNSIGNED_SENDER: Address = ::util::H160([0xff; 20]);
+pub const UNSIGNED_SENDER: Address = H160([0xff; 20]);
 
 /// System sender address for internal state updates.
-pub const SYSTEM_ADDRESS: Address = ::util::H160([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xfe]);
+pub const SYSTEM_ADDRESS: Address = H160([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xff,0xff, 0xff, 0xff, 0xfe]);
 
 /// Transaction action type.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -46,7 +50,7 @@ impl Default for Action {
 	fn default() -> Action { Action::Create }
 }
 
-impl Decodable for Action {
+impl rlp::Decodable for Action {
 	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
 		if rlp.is_empty() {
 			Ok(Action::Create)
@@ -56,7 +60,7 @@ impl Decodable for Action {
 	}
 }
 
-impl Encodable for Action {
+impl rlp::Encodable for Action {
 	fn rlp_append(&self, s: &mut RlpStream) {
 		match *self {
 			Action::Create => s.append_internal(&""),
@@ -166,7 +170,7 @@ impl Transaction {
 	pub fn hash(&self, chain_id: Option<u64>) -> H256 {
 		let mut stream = RlpStream::new();
 		self.rlp_append_unsigned_transaction(&mut stream, chain_id);
-		stream.as_raw().sha3()
+		keccak(stream.as_raw())
 	}
 
 	/// Signs the transaction as coming from `sender`.
@@ -268,12 +272,12 @@ impl Deref for UnverifiedTransaction {
 	}
 }
 
-impl Decodable for UnverifiedTransaction {
+impl rlp::Decodable for UnverifiedTransaction {
 	fn decode(d: &UntrustedRlp) -> Result<Self, DecoderError> {
 		if d.item_count()? != 9 {
 			return Err(DecoderError::RlpIncorrectListLen);
 		}
-		let hash = d.as_raw().sha3();
+		let hash = keccak(d.as_raw());
 		Ok(UnverifiedTransaction {
 			unsigned: Transaction {
 				nonce: d.val_at(0)?,
@@ -291,14 +295,14 @@ impl Decodable for UnverifiedTransaction {
 	}
 }
 
-impl Encodable for UnverifiedTransaction {
+impl rlp::Encodable for UnverifiedTransaction {
 	fn rlp_append(&self, s: &mut RlpStream) { self.rlp_append_sealed_transaction(s) }
 }
 
 impl UnverifiedTransaction {
 	/// Used to compute hash of created transactions
 	fn compute_hash(mut self) -> UnverifiedTransaction {
-		let hash = (&*self.rlp_bytes()).sha3();
+		let hash = keccak(&*self.rlp_bytes());
 		self.hash = hash;
 		self
 	}
@@ -348,53 +352,54 @@ impl UnverifiedTransaction {
 	}
 
 	/// Checks whether the signature has a low 's' value.
-	pub fn check_low_s(&self) -> Result<(), Error> {
+	pub fn check_low_s(&self) -> Result<(), ethkey::Error> {
 		if !self.signature().is_low_s() {
-			Err(EthkeyError::InvalidSignature.into())
+			Err(ethkey::Error::InvalidSignature.into())
 		} else {
 			Ok(())
 		}
 	}
 
-	/// Get the hash of this header (sha3 of the RLP).
+	/// Get the hash of this header (keccak of the RLP).
 	pub fn hash(&self) -> H256 {
 		self.hash
 	}
 
 	/// Recovers the public key of the sender.
-	pub fn recover_public(&self) -> Result<Public, Error> {
+	pub fn recover_public(&self) -> Result<Public, ethkey::Error> {
 		Ok(recover(&self.signature(), &self.unsigned.hash(self.chain_id()))?)
 	}
 
 	/// Do basic validation, checking for valid signature and minimum gas,
 	// TODO: consider use in block validation.
-	#[cfg(test)]
 	#[cfg(feature = "json-tests")]
-	pub fn validate(self, schedule: &Schedule, require_low: bool, allow_chain_id_of_one: bool, allow_empty_signature: bool) -> Result<UnverifiedTransaction, Error> {
+	pub fn validate(self, schedule: &Schedule, require_low: bool, allow_chain_id_of_one: bool, allow_empty_signature: bool)
+		-> Result<UnverifiedTransaction, error::Error>
+	{
 		let chain_id = if allow_chain_id_of_one { Some(1) } else { None };
 		self.verify_basic(require_low, chain_id, allow_empty_signature)?;
 		if !allow_empty_signature || !self.is_unsigned() {
 			self.recover_public()?;
 		}
 		if self.gas < U256::from(self.gas_required(&schedule)) {
-			return Err(TransactionError::InvalidGasLimit(::util::OutOfBounds{min: Some(U256::from(self.gas_required(&schedule))), max: None, found: self.gas}).into())
+			return Err(error::Error::InvalidGasLimit(::unexpected::OutOfBounds{min: Some(U256::from(self.gas_required(&schedule))), max: None, found: self.gas}).into())
 		}
 		Ok(self)
 	}
 
 	/// Verify basic signature params. Does not attempt sender recovery.
-	pub fn verify_basic(&self, check_low_s: bool, chain_id: Option<u64>, allow_empty_signature: bool) -> Result<(), Error> {
+	pub fn verify_basic(&self, check_low_s: bool, chain_id: Option<u64>, allow_empty_signature: bool) -> Result<(), error::Error> {
 		if check_low_s && !(allow_empty_signature && self.is_unsigned()) {
 			self.check_low_s()?;
 		}
 		// EIP-86: Transactions of this form MUST have gasprice = 0, nonce = 0, value = 0, and do NOT increment the nonce of account 0.
 		if allow_empty_signature && self.is_unsigned() && !(self.gas_price.is_zero() && self.value.is_zero() && self.nonce.is_zero()) {
-			return Err(EthkeyError::InvalidSignature.into())
+			return Err(ethkey::Error::InvalidSignature.into())
 		}
 		match (self.chain_id(), chain_id) {
 			(None, _) => {},
 			(Some(n), Some(m)) if n == m => {},
-			_ => return Err(TransactionError::InvalidChainId.into()),
+			_ => return Err(error::Error::InvalidChainId),
 		};
 		Ok(())
 	}
@@ -414,7 +419,7 @@ impl HeapSizeOf for SignedTransaction {
 	}
 }
 
-impl Encodable for SignedTransaction {
+impl rlp::Encodable for SignedTransaction {
 	fn rlp_append(&self, s: &mut RlpStream) { self.transaction.rlp_append_sealed_transaction(s) }
 }
 
@@ -433,7 +438,7 @@ impl From<SignedTransaction> for UnverifiedTransaction {
 
 impl SignedTransaction {
 	/// Try to verify transaction and recover sender.
-	pub fn new(transaction: UnverifiedTransaction) -> Result<Self, Error> {
+	pub fn new(transaction: UnverifiedTransaction) -> Result<Self, ethkey::Error> {
 		if transaction.is_unsigned() {
 			Ok(SignedTransaction {
 				transaction: transaction,
@@ -465,6 +470,11 @@ impl SignedTransaction {
 	pub fn is_unsigned(&self) -> bool {
 		self.transaction.is_unsigned()
 	}
+
+	/// Deconstructs this transaction back into `UnverifiedTransaction`
+	pub fn deconstruct(self) -> (UnverifiedTransaction, Address, Option<Public>) {
+		(self.transaction, self.sender, self.public)
+	}
 }
 
 /// Signed Transaction that is a part of canon blockchain.
@@ -544,11 +554,12 @@ impl From<SignedTransaction> for PendingTransaction {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use util::{Hashable, U256};
+	use ethereum_types::U256;
+	use hash::keccak;
 
 	#[test]
 	fn sender_test() {
-		let t: UnverifiedTransaction = decode(&::rustc_hex::FromHex::from_hex("f85f800182520894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804").unwrap());
+		let t: UnverifiedTransaction = rlp::decode(&::rustc_hex::FromHex::from_hex("f85f800182520894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804").unwrap());
 		assert_eq!(t.data, b"");
 		assert_eq!(t.gas, U256::from(0x5208u64));
 		assert_eq!(t.gas_price, U256::from(0x01u64));
@@ -574,7 +585,7 @@ mod tests {
 			value: U256::from(1),
 			data: b"Hello!".to_vec()
 		}.sign(&key.secret(), None);
-		assert_eq!(Address::from(key.public().sha3()), t.sender());
+		assert_eq!(Address::from(keccak(key.public())), t.sender());
 		assert_eq!(t.chain_id(), None);
 	}
 
@@ -608,7 +619,7 @@ mod tests {
 			value: U256::from(1),
 			data: b"Hello!".to_vec()
 		}.sign(&key.secret(), Some(69));
-		assert_eq!(Address::from(key.public().sha3()), t.sender());
+		assert_eq!(Address::from(keccak(key.public())), t.sender());
 		assert_eq!(t.chain_id(), Some(69));
 	}
 
@@ -617,10 +628,10 @@ mod tests {
 		use rustc_hex::FromHex;
 
 		let test_vector = |tx_data: &str, address: &'static str| {
-			let signed = decode(&FromHex::from_hex(tx_data).unwrap());
+			let signed = rlp::decode(&FromHex::from_hex(tx_data).unwrap());
 			let signed = SignedTransaction::new(signed).unwrap();
 			assert_eq!(signed.sender(), address.into());
-			flushln!("chainid: {:?}", signed.chain_id());
+			println!("chainid: {:?}", signed.chain_id());
 		};
 
 		test_vector("f864808504a817c800825208943535353535353535353535353535353535353535808025a0044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116da0044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", "0xf0f6f18bca1b28cd68e4357452947e021241e9ce");
diff --git a/ethcore/types/Cargo.toml b/ethcore/types/Cargo.toml
index 82963f960973cab94f83a92499aab97b4881a222..a14929f47edbc3332c4edfbb4fe6fc3f3568fec3 100644
--- a/ethcore/types/Cargo.toml
+++ b/ethcore/types/Cargo.toml
@@ -7,9 +7,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 rlp = { path = "../../util/rlp" }
 rlp_derive = { path = "../../util/rlp_derive" }
-ethcore-util = { path = "../../util" }
+ethcore-bytes = { path = "../../util/bytes" }
+ethereum-types = "0.2"
 ethjson = { path = "../../json" }
-bloomable = { path = "../../util/bloomable" }
+keccak-hash = { path = "../../util/hash" }
+heapsize = "0.4"
 
 [dev-dependencies]
 rustc-hex= "1.0"
diff --git a/ethcore/types/src/account_diff.rs b/ethcore/types/src/account_diff.rs
index 337c5df1bfcd730a0a34a10fe76d6b0672549102..c3edb1fb1e3d18186346306dcfeacf5b207b4e24 100644
--- a/ethcore/types/src/account_diff.rs
+++ b/ethcore/types/src/account_diff.rs
@@ -19,7 +19,8 @@
 use std::cmp::*;
 use std::fmt;
 use std::collections::BTreeMap;
-use util::{U256, H256, Bytes};
+use ethereum_types::{H256, U256};
+use bytes::Bytes;
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 /// Diff type for specifying a change (or not).
@@ -49,7 +50,6 @@ impl<T> Diff<T> where T: Eq {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
-#[cfg_attr(feature = "ipc", binary)]
 /// Account diff.
 pub struct AccountDiff {
 	/// Change in balance, allowed to be `Diff::Same`.
@@ -63,7 +63,6 @@ pub struct AccountDiff {
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
-#[cfg_attr(feature = "ipc", binary)]
 /// Change in existance type.
 // TODO: include other types of change.
 pub enum Existance {
@@ -112,7 +111,7 @@ fn interpreted_hash(u: &H256) -> String {
 
 impl fmt::Display for AccountDiff {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		use util::bytes::ToPretty;
+		use bytes::ToPretty;
 
 		match self.nonce {
 			Diff::Born(ref x) => write!(f, "  non {}", x)?,
diff --git a/ethcore/types/src/basic_account.rs b/ethcore/types/src/basic_account.rs
index f30872f6b3e5c686251379329bf9c2a4ddb4b84c..79e75dfc0144a72176fd1211df57111524598e90 100644
--- a/ethcore/types/src/basic_account.rs
+++ b/ethcore/types/src/basic_account.rs
@@ -16,7 +16,7 @@
 
 //! Basic account type -- the decoded RLP from the state trie.
 
-use util::{U256, H256};
+use ethereum_types::{U256, H256};
 
 /// Basic account type.
 #[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
diff --git a/ethcore/types/src/blockchain_info.rs b/ethcore/types/src/blockchain_info.rs
index 4ab1432b7be9913bcf185e0acfb17809ca40f16d..836ee7618bd7f0ac5b18ec13ee1da34c888190e9 100644
--- a/ethcore/types/src/blockchain_info.rs
+++ b/ethcore/types/src/blockchain_info.rs
@@ -18,7 +18,7 @@
 
 use std::fmt;
 
-use util::{U256, H256};
+use ethereum_types::{U256, H256};
 use security_level::SecurityLevel;
 use {BlockNumber};
 
diff --git a/ethcore/types/src/filter.rs b/ethcore/types/src/filter.rs
index 6e344b4efb4b63b1651c63c54e5e328ebca236f7..0a37482b94e66aaf23b8ed3e4375e30ffa5a7aab 100644
--- a/ethcore/types/src/filter.rs
+++ b/ethcore/types/src/filter.rs
@@ -16,8 +16,7 @@
 
 //! Blockchain filter
 
-use util::{Address, H256, Hashable, H2048};
-use bloomable::Bloomable;
+use ethereum_types::{H256, Address, Bloom, BloomInput};
 use ids::BlockId;
 use log_entry::LogEntry;
 
@@ -73,15 +72,13 @@ impl Clone for Filter {
 
 impl Filter {
 	/// Returns combinations of each address and topic.
-	pub fn bloom_possibilities(&self) -> Vec<H2048> {
+	pub fn bloom_possibilities(&self) -> Vec<Bloom> {
 		let blooms = match self.address {
 			Some(ref addresses) if !addresses.is_empty() =>
-				addresses.iter().map(|ref address| {
-					let mut bloom = H2048::default();
-					bloom.shift_bloomed(&address.sha3());
-					bloom
-				}).collect(),
-			_ => vec![H2048::default()]
+				addresses.iter()
+					.map(|ref address| Bloom::from(BloomInput::Raw(address)))
+					.collect(),
+			_ => vec![Bloom::default()]
 		};
 
 		self.topics.iter().fold(blooms, |bs, topic| match *topic {
@@ -89,9 +86,9 @@ impl Filter {
 			Some(ref topics) => bs.into_iter().flat_map(|bloom| {
 				topics.into_iter().map(|topic| {
 					let mut b = bloom.clone();
-					b.shift_bloomed(&topic.sha3());
+					b.accrue(BloomInput::Raw(topic));
 					b
-				}).collect::<Vec<H2048>>()
+				}).collect::<Vec<Bloom>>()
 			}).collect()
 		})
 	}
@@ -112,6 +109,7 @@ impl Filter {
 
 #[cfg(test)]
 mod tests {
+	use ethereum_types::Bloom;
 	use filter::Filter;
 	use ids::BlockId;
 	use log_entry::LogEntry;
@@ -148,7 +146,7 @@ mod tests {
 		};
 
 		let possibilities = filter.bloom_possibilities();
-		assert_eq!(possibilities, vec!["00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000004000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000".into()]);
+		assert_eq!(possibilities, vec!["00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000004000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000".into()] as Vec<Bloom>);
 	}
 
 	#[test]
@@ -167,7 +165,7 @@ mod tests {
 		};
 
 		let possibilities = filter.bloom_possibilities();
-		assert_eq!(possibilities, vec!["00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000004000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000".into()]);
+		assert_eq!(possibilities, vec!["00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000004000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000".into()] as Vec<Bloom>);
 	}
 
 	#[test]
@@ -197,7 +195,7 @@ mod tests {
 		// number of possibilites should be equal 2 * 2 * 2 * 1 = 8
 		let possibilities = filter.bloom_possibilities();
 		assert_eq!(possibilities.len(), 8);
-		assert_eq!(possibilities[0], "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000004000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000".into());
+		assert_eq!(possibilities[0], Bloom::from("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000004000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000"));
 	}
 
 	#[test]
diff --git a/ethcore/types/src/ids.rs b/ethcore/types/src/ids.rs
index feda18307f32ee92cf68852bd8185c9260449554..e304698a4ca83c01506bc43b1ca1d390340a6f6d 100644
--- a/ethcore/types/src/ids.rs
+++ b/ethcore/types/src/ids.rs
@@ -16,7 +16,7 @@
 
 //! Unique identifiers.
 
-use util::hash::H256;
+use ethereum_types::H256;
 use {BlockNumber};
 
 /// Uniquely identifies block.
@@ -31,8 +31,6 @@ pub enum BlockId {
 	Earliest,
 	/// Latest mined block.
 	Latest,
-	/// Pending block.
-	Pending,
 }
 
 /// Uniquely identifies transaction.
diff --git a/ethcore/types/src/lib.rs b/ethcore/types/src/lib.rs
index 10a4ac71ef353055a99068d2d7d549bb4c54f5ba..83a1cc65579e4d8a46b11e42c2d4286011b31bf6 100644
--- a/ethcore/types/src/lib.rs
+++ b/ethcore/types/src/lib.rs
@@ -16,12 +16,14 @@
 
 //! Types used in the public API
 
-extern crate ethcore_util as util;
+extern crate ethereum_types;
+extern crate ethcore_bytes as bytes;
 extern crate ethjson;
 extern crate rlp;
 #[macro_use]
 extern crate rlp_derive;
-extern crate bloomable;
+extern crate keccak_hash as hash;
+extern crate heapsize;
 
 #[cfg(test)]
 extern crate rustc_hex;
diff --git a/ethcore/types/src/log_entry.rs b/ethcore/types/src/log_entry.rs
index 152b48a0e4d21f63ff1daf74c4d0d55cc18384e1..951a7389f2901b28179c5e85f1ea934f3eb83ec4 100644
--- a/ethcore/types/src/log_entry.rs
+++ b/ethcore/types/src/log_entry.rs
@@ -17,14 +17,13 @@
 //! Log entry type definition.
 
 use std::ops::Deref;
-use util::{H256, Address, Bytes, HeapSizeOf, Hashable};
-use bloomable::Bloomable;
+use heapsize::HeapSizeOf;
+use bytes::Bytes;
+use ethereum_types::{H256, Address, Bloom, BloomInput};
 
 use {BlockNumber};
 use ethjson;
 
-pub type LogBloom = ::util::H2048;
-
 /// A record of execution for a `LOG` operation.
 #[derive(Default, Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
 pub struct LogEntry {
@@ -44,8 +43,11 @@ impl HeapSizeOf for LogEntry {
 
 impl LogEntry {
 	/// Calculates the bloom of this log entry.
-	pub fn bloom(&self) -> LogBloom {
-		self.topics.iter().fold(LogBloom::from_bloomed(&self.address.sha3()), |b, t| b.with_bloomed(&t.sha3()))
+	pub fn bloom(&self) -> Bloom {
+		self.topics.iter().fold(Bloom::from(BloomInput::Raw(&self.address)), |mut b, t| {
+			b.accrue(BloomInput::Raw(t));
+			b
+		})
 	}
 }
 
@@ -88,12 +90,12 @@ impl Deref for LocalizedLogEntry {
 
 #[cfg(test)]
 mod tests {
-	use util::*;
+	use ethereum_types::{Bloom, Address};
 	use super::LogEntry;
 
 	#[test]
 	fn test_empty_log_bloom() {
-		let bloom = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".parse::<H2048>().unwrap();
+		let bloom = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".parse::<Bloom>().unwrap();
 		let address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse::<Address>().unwrap();
 		let log = LogEntry {
 			address: address,
diff --git a/ethcore/types/src/receipt.rs b/ethcore/types/src/receipt.rs
index 81439ecdf640ac9493186519e5db73936d74348c..29b2e909b9a57ef548a0605c27e21765936d3aae 100644
--- a/ethcore/types/src/receipt.rs
+++ b/ethcore/types/src/receipt.rs
@@ -16,45 +16,63 @@
 
 //! Receipt
 
-use util::{H256, U256, Address};
-use util::HeapSizeOf;
+use ethereum_types::{H256, U256, Address, Bloom};
+use heapsize::HeapSizeOf;
 use rlp::*;
 
 use {BlockNumber};
-use log_entry::{LogBloom, LogEntry, LocalizedLogEntry};
+use log_entry::{LogEntry, LocalizedLogEntry};
+
+/// Transaction outcome store in the receipt.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum TransactionOutcome {
+	/// Status and state root are unknown under EIP-98 rules.
+	Unknown,
+	/// State root is known. Pre EIP-98 and EIP-658 rules.
+	StateRoot(H256),
+	/// Status code is known. EIP-658 rules.
+	StatusCode(u8),
+}
 
 /// Information describing execution of a transaction.
-#[derive(Default, Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Receipt {
-	/// The state root after executing the transaction. Optional since EIP98
-	pub state_root: Option<H256>,
 	/// The total gas used in the block following execution of the transaction.
 	pub gas_used: U256,
 	/// The OR-wide combination of all logs' blooms for this transaction.
-	pub log_bloom: LogBloom,
+	pub log_bloom: Bloom,
 	/// The logs stemming from this transaction.
 	pub logs: Vec<LogEntry>,
+	/// Transaction outcome.
+	pub outcome: TransactionOutcome,
 }
 
 impl Receipt {
 	/// Create a new receipt.
-	pub fn new(state_root: Option<H256>, gas_used: U256, logs: Vec<LogEntry>) -> Receipt {
+	pub fn new(outcome: TransactionOutcome, gas_used: U256, logs: Vec<LogEntry>) -> Receipt {
 		Receipt {
-			state_root: state_root,
 			gas_used: gas_used,
-			log_bloom: logs.iter().fold(LogBloom::default(), |mut b, l| { b = &b | &l.bloom(); b }), //TODO: use |= operator
+			log_bloom: logs.iter().fold(Bloom::default(), |mut b, l| { b = &b | &l.bloom(); b }), //TODO: use |= operator
 			logs: logs,
+			outcome: outcome,
 		}
 	}
 }
 
 impl Encodable for Receipt {
 	fn rlp_append(&self, s: &mut RlpStream) {
-		if let Some(ref root) = self.state_root {
-			s.begin_list(4);
-			s.append(root);
-		} else {
-			s.begin_list(3);
+		match self.outcome {
+			TransactionOutcome::Unknown => {
+				s.begin_list(3);
+			},
+			TransactionOutcome::StateRoot(ref root) => {
+				s.begin_list(4);
+				s.append(root);
+			},
+			TransactionOutcome::StatusCode(ref status_code) => {
+				s.begin_list(4);
+				s.append(status_code);
+			},
 		}
 		s.append(&self.gas_used);
 		s.append(&self.log_bloom);
@@ -66,17 +84,24 @@ impl Decodable for Receipt {
 	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
 		if rlp.item_count()? == 3 {
 			Ok(Receipt {
-				state_root: None,
+				outcome: TransactionOutcome::Unknown,
 				gas_used: rlp.val_at(0)?,
 				log_bloom: rlp.val_at(1)?,
 				logs: rlp.list_at(2)?,
 			})
 		} else {
 			Ok(Receipt {
-				state_root: Some(rlp.val_at(0)?),
 				gas_used: rlp.val_at(1)?,
 				log_bloom: rlp.val_at(2)?,
 				logs: rlp.list_at(3)?,
+				outcome: {
+					let first = rlp.at(0)?;
+					if first.is_data() && first.data()?.len() <= 1 {
+						TransactionOutcome::StatusCode(first.as_val()?)
+					} else {
+						TransactionOutcome::StateRoot(first.as_val()?)
+					}
+				}
 			})
 		}
 	}
@@ -104,9 +129,9 @@ pub struct RichReceipt {
 	/// Logs
 	pub logs: Vec<LogEntry>,
 	/// Logs bloom
-	pub log_bloom: LogBloom,
-	/// State root
-	pub state_root: Option<H256>,
+	pub log_bloom: Bloom,
+	/// Transaction outcome.
+	pub outcome: TransactionOutcome,
 }
 
 /// Receipt with additional info.
@@ -129,21 +154,21 @@ pub struct LocalizedReceipt {
 	/// Logs
 	pub logs: Vec<LocalizedLogEntry>,
 	/// Logs bloom
-	pub log_bloom: LogBloom,
-	/// State root
-	pub state_root: Option<H256>,
+	pub log_bloom: Bloom,
+	/// Transaction outcome.
+	pub outcome: TransactionOutcome,
 }
 
 #[cfg(test)]
 mod tests {
-	use super::Receipt;
+	use super::{Receipt, TransactionOutcome};
 	use log_entry::LogEntry;
 
 	#[test]
 	fn test_no_state_root() {
 		let expected = ::rustc_hex::FromHex::from_hex("f9014183040caeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000f838f794dcf421d093428b096ca501a7cd1a740855a7976fc0a00000000000000000000000000000000000000000000000000000000000000000").unwrap();
 		let r = Receipt::new(
-			None,
+			TransactionOutcome::Unknown,
 			0x40cae.into(),
 			vec![LogEntry {
 				address: "dcf421d093428b096ca501a7cd1a740855a7976f".into(),
@@ -158,7 +183,25 @@ mod tests {
 	fn test_basic() {
 		let expected = ::rustc_hex::FromHex::from_hex("f90162a02f697d671e9ae4ee24a43c4b0d7e15f1cb4ba6de1561120d43b9a4e8c4a8a6ee83040caeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000f838f794dcf421d093428b096ca501a7cd1a740855a7976fc0a00000000000000000000000000000000000000000000000000000000000000000").unwrap();
 		let r = Receipt::new(
-			Some("2f697d671e9ae4ee24a43c4b0d7e15f1cb4ba6de1561120d43b9a4e8c4a8a6ee".into()),
+			TransactionOutcome::StateRoot("2f697d671e9ae4ee24a43c4b0d7e15f1cb4ba6de1561120d43b9a4e8c4a8a6ee".into()),
+			0x40cae.into(),
+			vec![LogEntry {
+				address: "dcf421d093428b096ca501a7cd1a740855a7976f".into(),
+				topics: vec![],
+				data: vec![0u8; 32]
+			}]
+		);
+		let encoded = ::rlp::encode(&r);
+		assert_eq!(&encoded[..], &expected[..]);
+		let decoded: Receipt = ::rlp::decode(&encoded);
+		assert_eq!(decoded, r);
+	}
+
+	#[test]
+	fn test_status_code() {
+		let expected = ::rustc_hex::FromHex::from_hex("f901428083040caeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000f838f794dcf421d093428b096ca501a7cd1a740855a7976fc0a00000000000000000000000000000000000000000000000000000000000000000").unwrap();
+		let r = Receipt::new(
+			TransactionOutcome::StatusCode(0),
 			0x40cae.into(),
 			vec![LogEntry {
 				address: "dcf421d093428b096ca501a7cd1a740855a7976f".into(),
diff --git a/ethcore/types/src/snapshot_manifest.rs b/ethcore/types/src/snapshot_manifest.rs
index 2dcce2904fad8f148712e604402bdbde795ddf4e..72f83afeb2829e75d77e37e0ba809bbbcd5a76d7 100644
--- a/ethcore/types/src/snapshot_manifest.rs
+++ b/ethcore/types/src/snapshot_manifest.rs
@@ -16,9 +16,9 @@
 
 //! Snapshot manifest type definition
 
-use util::hash::H256;
+use ethereum_types::H256;
 use rlp::*;
-use util::Bytes;
+use bytes::Bytes;
 
 /// Manifest data.
 #[derive(Debug, Clone, PartialEq, Eq)]
diff --git a/ethcore/types/src/state_diff.rs b/ethcore/types/src/state_diff.rs
index af28f550fe02a39a6c08b15537c06dc90834d168..dd976eb36c6938a326f1bc99f0e82f56cf07ee26 100644
--- a/ethcore/types/src/state_diff.rs
+++ b/ethcore/types/src/state_diff.rs
@@ -19,7 +19,7 @@
 use std::fmt;
 use std::ops::*;
 use std::collections::BTreeMap;
-use util::Address;
+use ethereum_types::Address;
 use account_diff::*;
 
 /// Expression for the delta between two system states. Encoded the
diff --git a/ethcore/types/src/trace_filter.rs b/ethcore/types/src/trace_filter.rs
index 4eed19b4c57fed10ca6648f9ad5924b729eefb89..2afa752ccbb44d054541ea1b20aa1229d944872e 100644
--- a/ethcore/types/src/trace_filter.rs
+++ b/ethcore/types/src/trace_filter.rs
@@ -17,7 +17,7 @@
 //! Trace filter related types
 
 use std::ops::Range;
-use util::{Address};
+use ethereum_types::Address;
 use ids::BlockId;
 
 /// Easy to use trace filter.
@@ -28,4 +28,8 @@ pub struct Filter {
 	pub from_address: Vec<Address>,
 	/// To address.
 	pub to_address: Vec<Address>,
+	/// Output offset
+	pub after: Option<usize>,
+	/// Output amount
+	pub count: Option<usize>,
 }
diff --git a/ethcore/types/src/tree_route.rs b/ethcore/types/src/tree_route.rs
index a47e94ee5676488adc47e1016880a46166cccb76..b3fe431ab9973bc0279fb8aaf2deeda217ac7f18 100644
--- a/ethcore/types/src/tree_route.rs
+++ b/ethcore/types/src/tree_route.rs
@@ -16,7 +16,7 @@
 
 //! Tree route info type definition
 
-use util::H256;
+use ethereum_types::H256;
 
 /// Represents a tree route between `from` block and `to` block:
 #[derive(Debug)]
diff --git a/ethcore/vm/Cargo.toml b/ethcore/vm/Cargo.toml
index 50efe936c11c0bb4f5411f6e81bb9d07a67dceca..41ff98d0a056dee2c214dc7f0937b20fe3a8ef94 100644
--- a/ethcore/vm/Cargo.toml
+++ b/ethcore/vm/Cargo.toml
@@ -5,10 +5,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 byteorder = "1.0"
-ethcore-util = { path = "../../util" }
+ethcore-bytes = { path = "../../util/bytes" }
+ethereum-types = "0.2"
+patricia-trie = { path = "../../util/patricia_trie" }
 log = "0.3"
 common-types = { path = "../types" }
-evmjit = { path = "../../evmjit", optional = true }
 ethjson = { path = "../../json" }
-lazy_static = "0.2"
-rlp = { path = "../../util/rlp" }
\ No newline at end of file
+rlp = { path = "../../util/rlp" }
+keccak-hash = { path = "../../util/hash" }
diff --git a/ethcore/vm/src/action_params.rs b/ethcore/vm/src/action_params.rs
index 401d7ee57289ecf981d74453709f1023d5fe5897..9e9a35528c89e3247ed07683a86c438bb3a3e45d 100644
--- a/ethcore/vm/src/action_params.rs
+++ b/ethcore/vm/src/action_params.rs
@@ -15,9 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Evm input params.
-use util::{Address, Bytes, U256};
-use util::hash::{H256};
-use util::sha3::{Hashable, SHA3_EMPTY};
+use ethereum_types::{U256, H256, Address};
+use bytes::Bytes;
+use hash::{keccak, KECCAK_EMPTY};
 use ethjson;
 
 use call_type::CallType;
@@ -33,6 +33,15 @@ pub enum ActionValue {
 	Apparent(U256)
 }
 
+/// Type of the way parameters encoded
+#[derive(Clone, Debug)]
+pub enum ParamsType {
+	/// Parameters are included in code
+	Embedded,
+	/// Parameters are passed in data section
+	Separate,
+}
+
 impl ActionValue {
 	/// Returns action value as U256.
 	pub fn value(&self) -> U256 {
@@ -79,7 +88,8 @@ pub struct ActionParams {
 	pub data: Option<Bytes>,
 	/// Type of call
 	pub call_type: CallType,
-
+	/// Param types encoding
+	pub params_type: ParamsType,
 }
 
 impl Default for ActionParams {
@@ -87,7 +97,7 @@ impl Default for ActionParams {
 	fn default() -> ActionParams {
 		ActionParams {
 			code_address: Address::new(),
-			code_hash: Some(SHA3_EMPTY),
+			code_hash: Some(KECCAK_EMPTY),
 			address: Address::new(),
 			sender: Address::new(),
 			origin: Address::new(),
@@ -97,6 +107,7 @@ impl Default for ActionParams {
 			code: None,
 			data: None,
 			call_type: CallType::None,
+			params_type: ParamsType::Separate,
 		}
 	}
 }
@@ -106,7 +117,7 @@ impl From<ethjson::vm::Transaction> for ActionParams {
 		let address: Address = t.address.into();
 		ActionParams {
 			code_address: Address::new(),
-			code_hash: Some((&*t.code).sha3()),
+			code_hash: Some(keccak(&*t.code)),
 			address: address,
 			sender: t.sender.into(),
 			origin: t.origin.into(),
@@ -116,6 +127,7 @@ impl From<ethjson::vm::Transaction> for ActionParams {
 			gas_price: t.gas_price.into(),
 			value: ActionValue::Transfer(t.value.into()),
 			call_type: match address.is_zero() { true => CallType::None, false => CallType::Call },	// TODO @debris is this correct?
+			params_type: ParamsType::Separate,
 		}
 	}
 }
diff --git a/ethcore/vm/src/env_info.rs b/ethcore/vm/src/env_info.rs
index 8634d9c759ef8f5e123edf288d860f1e0ddd4b12..71bb48eeb721383f127866717f6affb093db59d2 100644
--- a/ethcore/vm/src/env_info.rs
+++ b/ethcore/vm/src/env_info.rs
@@ -18,7 +18,8 @@
 
 use std::cmp;
 use std::sync::Arc;
-use util::{U256, Address, H256, Hashable};
+use hash::keccak;
+use ethereum_types::{U256, H256, Address};
 use types::BlockNumber;
 use ethjson;
 
@@ -68,7 +69,7 @@ impl From<ethjson::vm::Env> for EnvInfo {
 			difficulty: e.difficulty.into(),
 			gas_limit: e.gas_limit.into(),
 			timestamp: e.timestamp.into(),
-			last_hashes: Arc::new((1..cmp::min(number + 1, 257)).map(|i| format!("{}", number - i).as_bytes().sha3()).collect()),
+			last_hashes: Arc::new((1..cmp::min(number + 1, 257)).map(|i| keccak(format!("{}", number - i).as_bytes())).collect()),
 			gas_used: U256::default(),
 		}
 	}
@@ -78,7 +79,7 @@ impl From<ethjson::vm::Env> for EnvInfo {
 mod tests {
 	use std::str::FromStr;
 	use super::*;
-	use util::{U256, Address};
+	use ethereum_types::{U256, Address};
 	use ethjson;
 
 	#[test]
diff --git a/ethcore/vm/src/error.rs b/ethcore/vm/src/error.rs
index e4b19943830f92fdb7e70bc9d7f1e91bf1882579..fe8d7054cfe1ff8d59490fee0216f1a18dbcc7cf 100644
--- a/ethcore/vm/src/error.rs
+++ b/ethcore/vm/src/error.rs
@@ -16,7 +16,7 @@
 
 //! VM errors module
 
-use util::trie;
+use trie;
 use std::fmt;
 
 /// VM errors.
@@ -65,6 +65,10 @@ pub enum Error {
 	Internal(String),
 	/// Wasm runtime error
 	Wasm(String),
+	/// Out of bounds access in RETURNDATACOPY.
+	OutOfBounds,
+	/// Execution has been reverted with REVERT.
+	Reverted,
 }
 
 
@@ -93,6 +97,8 @@ impl fmt::Display for Error {
 			Internal(ref msg) => write!(f, "Internal error: {}", msg),
 			MutableCallInStaticContext => write!(f, "Mutable call in static context"),
 			Wasm(ref msg) => write!(f, "Internal error: {}", msg),
+			OutOfBounds => write!(f, "Out of bounds"),
+			Reverted => write!(f, "Reverted"),
 		}
 	}
 }
diff --git a/ethcore/vm/src/ext.rs b/ethcore/vm/src/ext.rs
index 54871e5119df2140c1d4550e7a0d97682b7dc965..98661e47e2f8d9c6f82de8ad5f254b7b980e3e1c 100644
--- a/ethcore/vm/src/ext.rs
+++ b/ethcore/vm/src/ext.rs
@@ -17,7 +17,8 @@
 //! Interface for Evm externalities.
 
 use std::sync::Arc;
-use util::*;
+use ethereum_types::{U256, H256, Address};
+use bytes::Bytes;
 use call_type::CallType;
 use env_info::EnvInfo;
 use schedule::Schedule;
@@ -31,7 +32,9 @@ pub enum ContractCreateResult {
 	Created(Address, U256),
 	/// Returned when contract creation failed.
 	/// VM doesn't have to know the reason.
-	Failed
+	Failed,
+	/// Reverted with REVERT.
+	Reverted(U256, ReturnData),
 }
 
 /// Result of externalities call function.
@@ -41,7 +44,10 @@ pub enum MessageCallResult {
 	Success(U256, ReturnData),
 	/// Returned when message call failed.
 	/// VM doesn't have to know the reason.
-	Failed
+	Failed,
+	/// Returned when message call was reverted.
+	/// Contains gas left and output data.
+	Reverted(U256, ReturnData),
 }
 
 /// Specifies how an address is calculated for a new contract.
@@ -88,7 +94,6 @@ pub trait Ext {
 	/// Returns Err, if we run out of gas.
 	/// Otherwise returns call_result which contains gas left
 	/// and true if subcall was successfull.
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	fn call(&mut self,
 		gas: &U256,
 		sender_address: &Address,
@@ -111,7 +116,7 @@ pub trait Ext {
 
 	/// Should be called when transaction calls `RETURN` opcode.
 	/// Returns gas_left if cost of returning the data is not too high.
-	fn ret(self, gas: &U256, data: &ReturnData) -> Result<U256>;
+	fn ret(self, gas: &U256, data: &ReturnData, apply_state: bool) -> Result<U256>;
 
 	/// Should be called when contract commits suicide.
 	/// Address to which funds should be refunded.
@@ -133,11 +138,14 @@ pub trait Ext {
 	fn inc_sstore_clears(&mut self);
 
 	/// Decide if any more operations should be traced. Passthrough for the VM trace.
-	fn trace_next_instruction(&mut self, _pc: usize, _instruction: u8) -> bool { false }
+	fn trace_next_instruction(&mut self, _pc: usize, _instruction: u8, _current_gas: U256) -> bool { false }
 
 	/// Prepare to trace an operation. Passthrough for the VM trace.
 	fn trace_prepare_execute(&mut self, _pc: usize, _instruction: u8, _gas_cost: U256) {}
 
 	/// Trace the finalised execution of a single instruction.
 	fn trace_executed(&mut self, _gas_used: U256, _stack_push: &[U256], _mem_diff: Option<(usize, &[u8])>, _store_diff: Option<(U256, U256)>) {}
+
+	/// Check if running in static context.
+	fn is_static(&self) -> bool;
 }
diff --git a/ethcore/vm/src/lib.rs b/ethcore/vm/src/lib.rs
index 0c9e32dc6630a799a35b34deee605eef6a2fd828..67fc59bab5ec02338738ea39c0bdbd59af10f443 100644
--- a/ethcore/vm/src/lib.rs
+++ b/ethcore/vm/src/lib.rs
@@ -16,10 +16,13 @@
 
 //! Virtual machines support library
 
-extern crate ethcore_util as util;
+extern crate ethereum_types;
+extern crate ethcore_bytes as bytes;
 extern crate common_types as types;
 extern crate ethjson;
 extern crate rlp;
+extern crate keccak_hash as hash;
+extern crate patricia_trie as trie;
 
 mod action_params;
 mod call_type;
@@ -31,10 +34,10 @@ mod error;
 
 pub mod tests;
 
-pub use action_params::{ActionParams, ActionValue};
+pub use action_params::{ActionParams, ActionValue, ParamsType};
 pub use call_type::CallType;
 pub use env_info::{EnvInfo, LastHashes};
-pub use schedule::{Schedule, CleanDustMode};
+pub use schedule::{Schedule, CleanDustMode, WasmCosts};
 pub use ext::{Ext, MessageCallResult, ContractCreateResult, CreateContractAddress};
 pub use return_data::{ReturnData, GasLeft};
 pub use error::{Error, Result};
@@ -45,4 +48,4 @@ pub trait Vm {
 	/// It returns either an error, a known amount of gas left, or parameters to be used
 	/// to compute the final gas left.
 	fn exec(&mut self, params: ActionParams, ext: &mut Ext) -> Result<GasLeft>;
-}
\ No newline at end of file
+}
diff --git a/ethcore/vm/src/return_data.rs b/ethcore/vm/src/return_data.rs
index 3c8bd182ff53e9a2cd47849d74c6b73930719eb2..067a26e35e33a5eb3aa0e59a3f2eef3f1b498615 100644
--- a/ethcore/vm/src/return_data.rs
+++ b/ethcore/vm/src/return_data.rs
@@ -14,7 +14,7 @@
 
 //! Return data structures
 
-use util::U256;
+use ethereum_types::U256;
 
 /// Return data buffer. Holds memory from a previous call and a slice into that memory.
 #[derive(Debug)]
@@ -65,4 +65,4 @@ pub enum GasLeft {
 		/// Apply or revert state changes on revert.
 		apply_state: bool
 	},
-}
\ No newline at end of file
+}
diff --git a/ethcore/vm/src/schedule.rs b/ethcore/vm/src/schedule.rs
index 6966c26e6a576845c453d8be2b9b2c1900307681..6cfabed0df3c4f76acb500648f551f115aa1cbbd 100644
--- a/ethcore/vm/src/schedule.rs
+++ b/ethcore/vm/src/schedule.rs
@@ -111,6 +111,57 @@ pub struct Schedule {
 	pub have_return_data: bool,
 	/// Kill basic accounts below this balance if touched.
 	pub kill_dust: CleanDustMode,
+	/// Enable EIP-86 rules
+	pub eip86: bool,
+	/// Wasm extra schedule settings, if wasm activated
+	pub wasm: Option<WasmCosts>,
+}
+
+/// Wasm cost table
+pub struct WasmCosts {
+	/// Default opcode cost
+	pub regular: u32,
+	/// Div operations multiplier.
+	pub div: u32,
+	/// Div operations multiplier.
+	pub mul: u32,
+	/// Memory (load/store) operations multiplier.
+	pub mem: u32,
+	/// General static query of U256 value from env-info
+	pub static_u256: u32,
+	/// General static query of Address value from env-info
+	pub static_address: u32,
+	/// Memory stipend. Amount of free memory (in 64kb pages) each contract can use for stack.
+	pub initial_mem: u32,
+	/// Grow memory cost, per page (64kb)
+	pub grow_mem: u32,
+	/// Memory copy cost, per byte
+	pub memcpy: u32,
+	/// Max stack height (native WebAssembly stack limiter)
+	pub max_stack_height: u32,
+	/// Cost of wasm opcode is calculated as TABLE_ENTRY_COST * `opcodes_mul` / `opcodes_div`
+	pub opcodes_mul: u32,
+	/// Cost of wasm opcode is calculated as TABLE_ENTRY_COST * `opcodes_mul` / `opcodes_div`
+	pub opcodes_div: u32,
+}
+
+impl Default for WasmCosts {
+	fn default() -> Self {
+		WasmCosts {
+			regular: 1,
+			div: 16,
+			mul: 4,
+			mem: 2,
+			static_u256: 64,
+			static_address: 40,
+			initial_mem: 4096,
+			grow_mem: 8192,
+			memcpy: 1,
+			max_stack_height: 64*1024,
+			opcodes_mul: 3,
+			opcodes_div: 8,
+		}
+	}
 }
 
 /// Dust accounts cleanup mode.
@@ -184,17 +235,18 @@ impl Schedule {
 			blockhash_gas: 20,
 			have_static_call: false,
 			kill_dust: CleanDustMode::Off,
+			eip86: false,
+			wasm: None,
 		}
 	}
 
-	/// Schedule for the Metropolis of the Ethereum main net.
-	pub fn new_metropolis() -> Schedule {
+	/// Schedule for the Byzantium fork of the Ethereum main net.
+	pub fn new_byzantium() -> Schedule {
 		let mut schedule = Self::new_post_eip150(24576, true, true, true);
 		schedule.have_create2 = true;
 		schedule.have_revert = true;
 		schedule.have_static_call = true;
 		schedule.have_return_data = true;
-		schedule.blockhash_gas = 350;
 		schedule
 	}
 
@@ -246,8 +298,18 @@ impl Schedule {
 			blockhash_gas: 20,
 			have_static_call: false,
 			kill_dust: CleanDustMode::Off,
+			eip86: false,
+			wasm: None,
 		}
 	}
+
+	/// Returns wasm schedule
+	///
+	/// May panic if there is no wasm schedule
+	pub fn wasm(&self) -> &WasmCosts {
+		// *** Prefer PANIC here instead of silently breaking consensus! ***
+		self.wasm.as_ref().expect("Wasm schedule expected to exist while checking wasm contract. Misconfigured client?")
+	}
 }
 
 impl Default for Schedule {
diff --git a/ethcore/vm/src/tests.rs b/ethcore/vm/src/tests.rs
index c3a290d4176e18aaf2c6a2b0628f2dfc30a00b29..ce47121458f998a5efb58096c20d1b2b74655a6a 100644
--- a/ethcore/vm/src/tests.rs
+++ b/ethcore/vm/src/tests.rs
@@ -17,7 +17,8 @@
 use std::sync::Arc;
 use std::collections::{HashMap, HashSet};
 
-use util::{H256, U256, Address, Bytes};
+use ethereum_types::{U256, H256, Address};
+use bytes::Bytes;
 use {
 	CallType, Schedule, EnvInfo,
 	ReturnData, Ext, ContractCreateResult, MessageCallResult,
@@ -62,6 +63,7 @@ pub struct FakeExt {
 	pub schedule: Schedule,
 	pub balances: HashMap<Address, U256>,
 	pub tracing: bool,
+	pub is_static: bool,
 }
 
 // similar to the normal `finalize` function, but ignoring NeedsReturn.
@@ -74,9 +76,23 @@ pub fn test_finalize(res: Result<GasLeft>) -> Result<U256> {
 }
 
 impl FakeExt {
+	/// New fake externalities
 	pub fn new() -> Self {
 		FakeExt::default()
 	}
+
+	/// New fake externalities with byzantium schedule rules
+	pub fn new_byzantium() -> Self {
+		let mut ext = FakeExt::default();
+		ext.schedule = Schedule::new_byzantium();
+		ext
+	}
+
+	/// Alter fake externalities to allow wasm
+	pub fn with_wasm(mut self) -> Self {
+		self.schedule.wasm = Some(Default::default());
+		self
+	}
 }
 
 impl Ext for FakeExt {
@@ -161,7 +177,7 @@ impl Ext for FakeExt {
 		Ok(())
 	}
 
-	fn ret(self, _gas: &U256, _data: &ReturnData) -> Result<U256> {
+	fn ret(self, _gas: &U256, _data: &ReturnData, _apply_state: bool) -> Result<U256> {
 		unimplemented!();
 	}
 
@@ -182,11 +198,15 @@ impl Ext for FakeExt {
 		self.depth
 	}
 
+	fn is_static(&self) -> bool {
+		self.is_static
+	}
+
 	fn inc_sstore_clears(&mut self) {
 		self.sstore_clears += 1;
 	}
 
-	fn trace_next_instruction(&mut self, _pc: usize, _instruction: u8) -> bool {
+	fn trace_next_instruction(&mut self, _pc: usize, _instruction: u8, _gas: U256) -> bool {
 		self.tracing
 	}
 }
diff --git a/ethcore/wasm/Cargo.toml b/ethcore/wasm/Cargo.toml
index bbeeeffc57e385838146ea9ee4219b3b6e8c87bb..fc820a67d4c8c623b6ad2c56b2da1119784b0836 100644
--- a/ethcore/wasm/Cargo.toml
+++ b/ethcore/wasm/Cargo.toml
@@ -5,9 +5,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 byteorder = "1.0"
-ethcore-util = { path = "../../util" }
+ethereum-types = "0.2"
 log = "0.3"
-parity-wasm = "0.12"
-wasm-utils = { git = "https://github.com/paritytech/wasm-utils" }
+parity-wasm = "0.27"
+libc = "0.2"
+pwasm-utils = "0.1"
 vm = { path = "../vm" }
-ethcore-logger = { path = "../../logger" }
\ No newline at end of file
+ethcore-logger = { path = "../../logger" }
+wasmi = { version = "0.1", features = ["opt-in-32bit"] }
diff --git a/ethcore/wasm/run/Cargo.toml b/ethcore/wasm/run/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..91cbfb996c391727878265cef79179c6d27d2c01
--- /dev/null
+++ b/ethcore/wasm/run/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "pwasm-run-test"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+serde = "1"
+serde_json = "1"
+serde_derive = "1"
+ethereum-types = "0.2"
+ethjson = { path = "../../../json" }
+vm = { path = "../../vm" }
+wasm = { path = "../" }
+clap = "2.24"
+ethcore-logger = { path = "../../../logger" }
+rustc-hex = "1"
+
+[features]
+default = ["ethereum-types/std"]
diff --git a/ethcore/wasm/run/res/sample-fixture.json b/ethcore/wasm/run/res/sample-fixture.json
new file mode 100644
index 0000000000000000000000000000000000000000..7be3e04be0337415f3e945d047787e4084d2f65a
--- /dev/null
+++ b/ethcore/wasm/run/res/sample-fixture.json
@@ -0,0 +1,45 @@
+[
+    {
+        "caption": "Sample test",
+        "source": "./res/sample1.wasm",
+        "address": "0x1000000000000000000000000000000000000001",
+        "sender": "0x1000000000000000000000000000000000000002",
+        "value": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "gasLimit": 100000,
+        "payload": "0x",
+        "asserts": [
+            { "Return": "0x01" },
+            { "UsedGas": 17 },
+            { "HasCall": { "codeAddress": "0x1000000000000000000000000000000000000002" }},
+            { "HasStorage":
+                {
+                    "key": "0x0000000000000000000000000000000000000000000000000000000000000001",
+                    "value": "0x0000000000000000000000000000000000000000000000000000000000000002"
+                }
+            }
+        ]
+    },
+    {
+        "caption": "Keccak test",
+        "source": "./res/sample2.wasm",
+        "payload": "0x736f6d657468696e67",
+        "gasLimit": 100000,
+        "asserts": [
+            { "Return": "0x68371d7e884c168ae2022c82bd837d51837718a7f7dfb7aa3f753074a35e1d87" }
+        ]
+    },
+    {
+        "caption": "Token total supply",
+        "source": {
+            "constructor": "./res/sample3.wasm",
+            "sender": "0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f",
+            "at": "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "arguments": "0x0000000000000000000000000000000000000000000000000000000010000000"
+        },
+        "payload": "0x18160ddd",
+        "gasLimit": 100000,
+        "asserts": [
+            { "Return": "0x0000000000000000000000000000000000000000000000000000000010000000" }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/ethcore/wasm/run/res/sample1.wasm b/ethcore/wasm/run/res/sample1.wasm
new file mode 100644
index 0000000000000000000000000000000000000000..6ea0c58cc77bec3f6ccec1a8d3616e28d48df29c
Binary files /dev/null and b/ethcore/wasm/run/res/sample1.wasm differ
diff --git a/ethcore/wasm/run/res/sample2.wasm b/ethcore/wasm/run/res/sample2.wasm
new file mode 100644
index 0000000000000000000000000000000000000000..baf9d17aa98fd185167448c58cc0388993dfab0a
Binary files /dev/null and b/ethcore/wasm/run/res/sample2.wasm differ
diff --git a/ethcore/wasm/run/res/sample3.wasm b/ethcore/wasm/run/res/sample3.wasm
new file mode 100644
index 0000000000000000000000000000000000000000..1811215b40f3e84c572712a6fbcec5a2830cdf4e
Binary files /dev/null and b/ethcore/wasm/run/res/sample3.wasm differ
diff --git a/ethcore/wasm/run/src/fixture.rs b/ethcore/wasm/run/src/fixture.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ba2da0670677a1d80473688ad57d0752684c1811
--- /dev/null
+++ b/ethcore/wasm/run/src/fixture.rs
@@ -0,0 +1,70 @@
+use std::borrow::Cow;
+use ethjson::uint::Uint;
+use ethjson::hash::{Address, H256};
+use ethjson::bytes::Bytes;
+
+#[derive(Deserialize)]
+#[serde(untagged)]
+pub enum Source {
+	Raw(Cow<'static, String>),
+	Constructor {
+		#[serde(rename="constructor")]
+		source: Cow<'static, String>,
+		arguments: Bytes,
+		sender: Address,
+		at: Address,
+	},
+}
+
+impl Source {
+	pub fn as_ref(&self) -> &str {
+		match *self {
+			Source::Raw(ref r) => r.as_ref(),
+			Source::Constructor { ref source, .. } => source.as_ref(),
+		}
+	}
+}
+
+#[derive(Deserialize)]
+pub struct Fixture {
+	pub caption: Cow<'static, String>,
+	pub source: Source,
+	pub address: Option<Address>,
+	pub sender: Option<Address>,
+	pub value: Option<Uint>,
+	#[serde(rename="gasLimit")]
+	pub gas_limit: Option<u64>,
+	pub payload: Option<Bytes>,
+	pub storage: Option<Vec<StorageEntry>>,
+	pub asserts: Vec<Assert>,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct StorageEntry {
+	pub key: Uint,
+	pub value: Uint,
+}
+
+#[derive(Deserialize, Debug, Clone)]
+pub struct CallLocator {
+	pub sender: Option<Address>,
+	pub receiver: Option<Address>,
+	pub value: Option<Uint>,
+	pub data: Option<Bytes>,
+	#[serde(rename="codeAddress")]
+	pub code_address: Option<Address>,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct StorageAssert {
+	pub key: H256,
+	pub value: H256,
+}
+
+#[derive(Deserialize, Debug)]
+pub enum Assert {
+	HasCall(CallLocator),
+	HasStorage(StorageAssert),
+	UsedGas(u64),
+	Return(Bytes),
+}
\ No newline at end of file
diff --git a/ethcore/wasm/run/src/main.rs b/ethcore/wasm/run/src/main.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ab8ac631df9136e8263fce5d5e3e8d9dba7a788d
--- /dev/null
+++ b/ethcore/wasm/run/src/main.rs
@@ -0,0 +1,46 @@
+extern crate serde;
+extern crate serde_json;
+#[macro_use] extern crate serde_derive;
+extern crate ethereum_types;
+extern crate ethjson;
+extern crate wasm;
+extern crate vm;
+extern crate clap;
+extern crate ethcore_logger;
+extern crate rustc_hex;
+
+mod fixture;
+mod runner;
+
+use fixture::Fixture;
+use clap::{App, Arg};
+use std::fs;
+
+fn main() {
+	::ethcore_logger::init_log();
+
+	let matches = App::new("pwasm-run-test")
+		.arg(Arg::with_name("target")
+			.index(1)
+			.required(true)
+			.multiple(true)
+			.help("JSON fixture"))
+		.get_matches();
+
+	let mut exit_code = 0;
+
+	for target in matches.values_of("target").expect("No target parameter") {
+		let mut f = fs::File::open(target).expect("Failed to open file");
+		let fixtures: Vec<Fixture> = serde_json::from_reader(&mut f).expect("Failed to deserialize json");
+
+		for fixture in fixtures.into_iter() {
+			let fails = runner::run_fixture(&fixture);
+			for fail in fails.iter() {
+				exit_code = 1;
+				println!("Failed assert in test \"{}\" ('{}'): {}", fixture.caption.as_ref(), target, fail);
+			}
+		}
+	}
+
+	std::process::exit(exit_code);
+}
diff --git a/ethcore/wasm/run/src/runner.rs b/ethcore/wasm/run/src/runner.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a30efc6f086c8d8c33a057b769bf466acdb1def8
--- /dev/null
+++ b/ethcore/wasm/run/src/runner.rs
@@ -0,0 +1,261 @@
+use fixture::{Fixture, Assert, CallLocator, Source};
+use wasm::WasmInterpreter;
+use vm::{self, Vm, GasLeft, ActionParams, ActionValue, ParamsType};
+use vm::tests::FakeExt;
+use std::io::{self, Read};
+use std::{fs, path, fmt};
+use std::sync::Arc;
+use ethereum_types::{U256, H256, H160};
+use rustc_hex::ToHex;
+
+fn load_code<P: AsRef<path::Path>>(p: P) -> io::Result<Vec<u8>> {
+	let mut result = Vec::new();
+	let mut f = fs::File::open(p)?;
+	f.read_to_end(&mut result)?;
+	Ok(result)
+}
+
+fn wasm_interpreter() -> WasmInterpreter {
+	WasmInterpreter
+}
+
+#[derive(Debug)]
+pub enum SpecNonconformity {
+	Address,
+}
+
+#[derive(Debug)]
+pub enum Fail {
+	Return { expected: Vec<u8>, actual: Vec<u8> },
+	UsedGas { expected: u64, actual: u64 },
+	Runtime(String),
+	Load(io::Error),
+	NoCall(CallLocator),
+	StorageMismatch { key: H256, expected: H256, actual: Option<H256> },
+	Nonconformity(SpecNonconformity)
+}
+
+impl Fail {
+	fn runtime(err: vm::Error) -> Vec<Fail> {
+		vec![Fail::Runtime(format!("{}", err))]
+	}
+
+	fn load(err: io::Error) -> Vec<Fail> {
+		vec![Fail::Load(err)]
+	}
+
+	fn nononformity(kind: SpecNonconformity) -> Vec<Fail> {
+		vec![Fail::Nonconformity(kind)]
+	}
+}
+
+impl fmt::Display for Fail {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		use self::Fail::*;
+		match *self {
+			Return { ref expected, ref actual } =>
+				write!(
+					f,
+					"Expected to return result: 0x{} ({} bytes), but got 0x{} ({} bytes)",
+					expected.to_hex(),
+					expected.len(),
+					actual.to_hex(),
+					actual.len()
+				),
+
+			UsedGas { expected, actual } =>
+				write!(f, "Expected to use gas: {}, but got actual gas used: {}", expected, actual),
+
+			Runtime(ref s) =>
+				write!(f, "WASM Runtime error: {}", s),
+
+			Load(ref e) =>
+				write!(f, "Load i/o error: {}", e),
+
+			NoCall(ref call) =>
+				write!(f, "Call not found: {:?}", call),
+
+			StorageMismatch { ref key, ref expected, actual: Some(ref actual)} =>
+				write!(
+					f,
+					"Storage key {} value mismatch, expected {}, got: {}",
+					key.as_ref().to_vec().to_hex(),
+					expected.as_ref().to_vec().to_hex(),
+					actual.as_ref().to_vec().to_hex(),
+				),
+
+			StorageMismatch { ref key, ref expected, actual: None} =>
+				write!(
+					f,
+					"No expected storage value for key {} found, expected {}",
+					key.as_ref().to_vec().to_hex(),
+					expected.as_ref().to_vec().to_hex(),
+				),
+
+			Nonconformity(SpecNonconformity::Address) =>
+				write!(f, "Cannot use address when constructor is specified!"),
+		}
+	}
+}
+
+pub fn construct(
+	ext: &mut vm::Ext,
+	source: Vec<u8>,
+	arguments: Vec<u8>,
+	sender: H160,
+	at: H160,
+) -> Result<Vec<u8>, vm::Error> {
+
+	let mut params = ActionParams::default();
+	params.sender = sender;
+	params.address = at;
+	params.gas = U256::from(100_000_000);
+	params.data = Some(arguments);
+	params.code = Some(Arc::new(source));
+	params.params_type = ParamsType::Separate;
+
+	Ok(
+		match wasm_interpreter().exec(params, ext)? {
+			GasLeft::Known(_) => Vec::new(),
+			GasLeft::NeedsReturn { data, .. } => data.to_vec(),
+		}
+	)
+}
+
+pub fn run_fixture(fixture: &Fixture) -> Vec<Fail> {
+	let mut params = ActionParams::default();
+
+	let source = match load_code(fixture.source.as_ref()) {
+		Ok(code) => code,
+		Err(e) => { return Fail::load(e); },
+	};
+
+	let mut ext = FakeExt::new().with_wasm();
+	params.code = Some(Arc::new(
+		if let Source::Constructor { ref arguments, ref sender, ref at, .. } = fixture.source {
+			match construct(&mut ext, source, arguments.clone().into(), sender.clone().into(), at.clone().into()) {
+				Ok(code) => code,
+				Err(e) => { return Fail::runtime(e); }
+			}
+		} else {
+			source
+		}
+	));
+
+	if let Some(ref sender) = fixture.sender {
+		params.sender = sender.clone().into();
+	}
+
+	if let Some(ref address) = fixture.address {
+		if let Source::Constructor { .. } = fixture.source {
+			return Fail::nononformity(SpecNonconformity::Address);
+		}
+
+		params.address = address.clone().into();
+	} else if let Source::Constructor { ref at, .. } = fixture.source {
+		params.address = at.clone().into();
+	}
+
+	if let Some(gas_limit) = fixture.gas_limit {
+		params.gas = U256::from(gas_limit);
+	}
+
+	if let Some(ref data) = fixture.payload {
+		params.data = Some(data.clone().into())
+	}
+
+	if let Some(value) = fixture.value {
+		params.value = ActionValue::Transfer(value.clone().into())
+	}
+
+	if let Some(ref storage) = fixture.storage {
+		for storage_entry in storage.iter() {
+			let key: U256 = storage_entry.key.into();
+			let val: U256 = storage_entry.value.into();
+			ext.store.insert(key.into(), val.into());
+		}
+	}
+
+	let mut interpreter = wasm_interpreter();
+
+	let interpreter_return = match interpreter.exec(params, &mut ext) {
+		Ok(ret) => ret,
+		Err(e) => { return Fail::runtime(e); }
+	};
+	let (gas_left, result) = match interpreter_return {
+		GasLeft::Known(gas) => { (gas, Vec::new()) },
+		GasLeft::NeedsReturn { gas_left: gas, data: result, apply_state: _apply } => (gas, result.to_vec()),
+	};
+
+	let mut fails = Vec::new();
+
+	for assert in fixture.asserts.iter() {
+		match *assert {
+			Assert::Return(ref data) => {
+				if &data[..] != &result[..] {
+					fails.push(Fail::Return { expected: (&data[..]).to_vec(), actual: (&result[..]).to_vec() })
+				}
+			},
+			Assert::UsedGas(gas) => {
+				let used_gas = fixture.gas_limit.unwrap_or(0) - gas_left.low_u64();
+				if gas != used_gas {
+					fails.push(Fail::UsedGas { expected: gas, actual: used_gas });
+				}
+			},
+			Assert::HasCall(ref locator) => {
+				let mut found = false;
+
+				for fake_call in ext.calls.iter() {
+					let mut match_ = true;
+					if let Some(ref data) = locator.data {
+						if data.as_ref() != &fake_call.data[..] { match_ = false; }
+					}
+
+					if let Some(ref code_addr) = locator.code_address {
+						if fake_call.code_address.unwrap_or(H160::zero()) != code_addr.clone().into() { match_ = false }
+					}
+
+					if let Some(ref sender) = locator.sender {
+						if fake_call.sender_address.unwrap_or(H160::zero()) != sender.clone().into() { match_ = false }
+					}
+
+					if let Some(ref receiver) = locator.receiver {
+						if fake_call.receive_address.unwrap_or(H160::zero()) != receiver.clone().into() { match_ = false }
+					}
+
+					if match_ {
+						found = true;
+						break;
+					}
+				}
+
+				if !found {
+					fails.push(Fail::NoCall(locator.clone()))
+				}
+			},
+			Assert::HasStorage(ref storage_entry) => {
+				let expected_storage_key: H256 = storage_entry.key.clone().into();
+				let expected_storage_value: H256 = storage_entry.value.clone().into();
+				let val = ext.store.get(&expected_storage_key);
+
+				if let Some(val) = val {
+					if val != &expected_storage_value {
+						fails.push(Fail::StorageMismatch {
+							key: expected_storage_key,
+							expected: expected_storage_value,
+							actual: Some(val.clone())
+						})
+					}
+				} else {
+					fails.push(Fail::StorageMismatch {
+						key: expected_storage_key,
+						expected: expected_storage_value,
+						actual: None,
+					})
+				}
+
+			},
+		}
+	}
+	fails
+}
diff --git a/ethcore/wasm/src/call_args.rs b/ethcore/wasm/src/call_args.rs
deleted file mode 100644
index b4cce4982e2465e8313cae5f6540e1c502f7c4cd..0000000000000000000000000000000000000000
--- a/ethcore/wasm/src/call_args.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Wasm evm call arguments helper
-
-use util::{U256, H160};
-
-/// Input part of the wasm call descriptor
-pub struct CallArgs {
-	/// Receiver of the transaction
-	pub address: [u8; 20],
-
-	/// Sender of the transaction
-	pub sender: [u8; 20],
-
-	/// Original transaction initiator
-	pub origin: [u8; 20],
-
-	/// Transfer value
-	pub value: [u8; 32],
-
-	/// call/create params
-	pub data: Vec<u8>,
-}
-
-impl CallArgs {
-	/// New contract call payload with known parameters
-	pub fn new(address: H160, sender: H160, origin: H160, value: U256, data: Vec<u8>) -> Self {
-		let mut descriptor = CallArgs {
-			address: [0u8; 20],
-			sender: [0u8; 20],
-			origin: [0u8; 20],
-			value: [0u8; 32],
-			data: data,
-		};
-
-		descriptor.address.copy_from_slice(&*address);
-		descriptor.sender.copy_from_slice(&*sender);
-		descriptor.origin.copy_from_slice(&*origin);
-		value.to_big_endian(&mut descriptor.value);
-
-		descriptor
-	}
-
-	/// Total call payload length in linear memory
-	pub fn len(&self) -> u32 {
-		self.data.len() as u32 + 92
-	}
-}
\ No newline at end of file
diff --git a/ethcore/wasm/src/env.rs b/ethcore/wasm/src/env.rs
index 777016a1bd58edef01cc0604ee4579f16c2a6884..7ffaaf98abd2f04797e9fcd0c30abdc51d5085cb 100644
--- a/ethcore/wasm/src/env.rs
+++ b/ethcore/wasm/src/env.rs
@@ -14,97 +14,285 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Wasm env module bindings
+//! Env module glue for wasmi interpreter
 
-use parity_wasm::elements::ValueType::*;
-use parity_wasm::interpreter::{self, UserFunctionDescriptor};
-use parity_wasm::interpreter::UserFunctionDescriptor::*;
-use super::runtime::Runtime;
+use std::cell::RefCell;
+use wasmi::{
+	self, Signature, Error, FuncRef, FuncInstance, MemoryDescriptor,
+	MemoryRef, MemoryInstance, memory_units,
+};
 
-pub const SIGNATURES: &'static [UserFunctionDescriptor] = &[
-	Static(
-		"_storage_read",
-		&[I32; 2],
+/// Internal ids all functions runtime supports. This is just a glue for wasmi interpreter
+/// that lacks high-level api and later will be factored out
+pub mod ids {
+	pub const STORAGE_WRITE_FUNC: usize = 0;
+	pub const STORAGE_READ_FUNC: usize = 10;
+	pub const RET_FUNC: usize = 20;
+	pub const GAS_FUNC: usize = 30;
+	pub const FETCH_INPUT_FUNC: usize = 40;
+	pub const INPUT_LENGTH_FUNC: usize = 50;
+	pub const CCALL_FUNC: usize = 60;
+	pub const SCALL_FUNC: usize = 70;
+	pub const DCALL_FUNC: usize = 80;
+	pub const VALUE_FUNC: usize = 90;
+	pub const CREATE_FUNC: usize = 100;
+	pub const SUICIDE_FUNC: usize = 110;
+	pub const BLOCKHASH_FUNC: usize = 120;
+	pub const BLOCKNUMBER_FUNC: usize = 130;
+	pub const COINBASE_FUNC: usize = 140;
+	pub const DIFFICULTY_FUNC: usize = 150;
+	pub const GASLIMIT_FUNC: usize = 160;
+	pub const TIMESTAMP_FUNC: usize = 170;
+	pub const ADDRESS_FUNC: usize = 180;
+	pub const SENDER_FUNC: usize = 190;
+	pub const ORIGIN_FUNC: usize = 200;
+	pub const ELOG_FUNC: usize = 210;
+
+	pub const PANIC_FUNC: usize = 1000;
+	pub const DEBUG_FUNC: usize = 1010;
+}
+
+/// Signatures of all functions runtime supports. The actual dispatch happens at
+/// impl runtime::Runtime methods.
+pub mod signatures {
+	use wasmi::{self, ValueType};
+	use wasmi::ValueType::*;
+
+	pub struct StaticSignature(pub &'static [ValueType], pub Option<ValueType>);
+
+	pub const STORAGE_READ: StaticSignature = StaticSignature(
+		&[I32, I32],
+		None,
+	);
+
+	pub const STORAGE_WRITE: StaticSignature = StaticSignature(
+		&[I32, I32],
+		None,
+	);
+
+	pub const RET: StaticSignature = StaticSignature(
+		&[I32, I32],
+		None,
+	);
+
+	pub const GAS: StaticSignature = StaticSignature(
+		&[I32],
+		None,
+	);
+
+	pub const FETCH_INPUT: StaticSignature = StaticSignature(
+		&[I32],
+		None,
+	);
+
+	pub const INPUT_LENGTH: StaticSignature = StaticSignature(
+		&[],
 		Some(I32),
-	),
-	Static(
-		"_storage_write",
-		&[I32; 2],
+	);
+
+	pub const CCALL: StaticSignature = StaticSignature(
+		&[I64, I32, I32, I32, I32, I32, I32],
 		Some(I32),
-	),
-	Static(
-		"_malloc",
+	);
+
+	pub const DCALL: StaticSignature = StaticSignature(
+		&[I64, I32, I32, I32, I32, I32],
+		Some(I32),
+	);
+
+	pub const SCALL: StaticSignature = StaticSignature(
+		&[I64, I32, I32, I32, I32, I32],
+		Some(I32),
+	);
+
+	pub const PANIC: StaticSignature = StaticSignature(
+		&[I32, I32],
+		None,
+	);
+
+	pub const DEBUG: StaticSignature = StaticSignature(
+		&[I32, I32],
+		None,
+	);
+
+	pub const VALUE: StaticSignature = StaticSignature(
 		&[I32],
+		None,
+	);
+
+	pub const CREATE: StaticSignature = StaticSignature(
+		&[I32, I32, I32, I32],
 		Some(I32),
-	),
-	Static(
-		"_free",
+	);
+
+	pub const SUICIDE: StaticSignature = StaticSignature(
+		&[I32],
+		None,
+	);
+
+	pub const BLOCKHASH: StaticSignature = StaticSignature(
+		&[I64, I32],
+		None,
+	);
+
+	pub const BLOCKNUMBER: StaticSignature = StaticSignature(
+		&[],
+		Some(I64),
+	);
+
+	pub const COINBASE: StaticSignature = StaticSignature(
 		&[I32],
 		None,
-	),
-	Static(
-		"gas",
+	);
+
+	pub const DIFFICULTY: StaticSignature = StaticSignature(
 		&[I32],
 		None,
-	),
-	Static(
-		"_debug",
-		&[I32; 2],
+	);
+
+	pub const GASLIMIT: StaticSignature = StaticSignature(
+		&[I32],
 		None,
-	),
-	Static(
-		"_suicide",
+	);
+
+	pub const TIMESTAMP: StaticSignature = StaticSignature(
+		&[],
+		Some(I64),
+	);
+
+	pub const ADDRESS: StaticSignature = StaticSignature(
 		&[I32],
 		None,
-	),
-	Static(
-		"_create",
-		&[I32; 4],
-		Some(I32),
-	),
-	Static(
-		"_ccall",
-		&[I32; 6],
-		Some(I32),
-	),
-	Static(
-		"_dcall",
-		&[I32; 5],
-		Some(I32),
-	),
-	Static(
-		"_scall",
-		&[I32; 5],
-		Some(I32),
-	),
-	Static(
-		"abort",
+	);
+
+	pub const SENDER: StaticSignature = StaticSignature(
 		&[I32],
 		None,
-	),
-	Static(
-		"_emscripten_memcpy_big",
-		&[I32; 3],
-		Some(I32),
-	),
-
-	// TODO: Get rid of it also somehow?
-	Static(
-		"_llvm_trap",
-		&[I32; 0],
-		None
-	),
-
-	Static(
-		"_llvm_bswap_i64",
-		&[I32; 2],
-		Some(I32)
-	),
-];
-
-pub fn native_bindings<'a>(runtime: &'a mut Runtime) -> interpreter::UserFunctions<'a> {
-	interpreter::UserFunctions {
-		executor: runtime,
-		functions: ::std::borrow::Cow::from(SIGNATURES),
+	);
+
+	pub const ORIGIN: StaticSignature = StaticSignature(
+		&[I32],
+		None,
+	);
+
+	pub const ELOG: StaticSignature = StaticSignature(
+		&[I32, I32, I32, I32],
+		None,
+	);
+
+	impl Into<wasmi::Signature> for StaticSignature {
+		fn into(self) -> wasmi::Signature {
+			wasmi::Signature::new(self.0, self.1)
+		}
+	}
+}
+
+fn host(signature: signatures::StaticSignature, idx: usize) -> FuncRef {
+	FuncInstance::alloc_host(signature.into(), idx)
+}
+
+/// Import resolver for wasmi
+/// Maps all functions that runtime support to the corresponding contract import
+/// entries.
+/// Also manages initial memory request from the runtime.
+#[derive(Default)]
+pub struct ImportResolver {
+	max_memory: u32,
+	memory: RefCell<Option<MemoryRef>>,
+}
+
+impl ImportResolver {
+	/// New import resolver with specifed maximum amount of inital memory (in wasm pages = 64kb)
+	pub fn with_limit(max_memory: u32) -> ImportResolver {
+		ImportResolver {
+			max_memory: max_memory,
+			memory: RefCell::new(None),
+		}
+	}
+
+	/// Returns memory that was instantiated during the contract module
+	/// start. If contract does not use memory at all, the dummy memory of length (0, 0)
+	/// will be created instead. So this method always returns memory instance
+	/// unless errored.
+	pub fn memory_ref(&self) -> MemoryRef {
+		{
+			let mut mem_ref = self.memory.borrow_mut();
+			if mem_ref.is_none() {
+				*mem_ref = Some(
+					MemoryInstance::alloc(
+						memory_units::Pages(0),
+						Some(memory_units::Pages(0)),
+					).expect("Memory allocation (0, 0) should not fail; qed")
+				);
+			}
+		}
+
+		self.memory.borrow().clone().expect("it is either existed or was created as (0, 0) above; qed")
+	}
+
+	/// Returns memory size module initially requested
+	pub fn memory_size(&self) -> Result<u32, Error> {
+		Ok(self.memory_ref().current_size().0 as u32)
+	}
+}
+
+impl wasmi::ModuleImportResolver for ImportResolver {
+	fn resolve_func(&self, field_name: &str, _signature: &Signature) -> Result<FuncRef, Error> {
+		let func_ref = match field_name {
+			"storage_read" => host(signatures::STORAGE_READ, ids::STORAGE_READ_FUNC),
+			"storage_write" => host(signatures::STORAGE_WRITE, ids::STORAGE_WRITE_FUNC),
+			"ret" => host(signatures::RET, ids::RET_FUNC),
+			"gas" => host(signatures::GAS, ids::GAS_FUNC),
+			"input_length" => host(signatures::INPUT_LENGTH, ids::INPUT_LENGTH_FUNC),
+			"fetch_input" => host(signatures::FETCH_INPUT, ids::FETCH_INPUT_FUNC),
+			"panic" => host(signatures::PANIC, ids::PANIC_FUNC),
+			"debug" => host(signatures::DEBUG, ids::DEBUG_FUNC),
+			"ccall" => host(signatures::CCALL, ids::CCALL_FUNC),
+			"dcall" => host(signatures::DCALL, ids::DCALL_FUNC),
+			"scall" => host(signatures::SCALL, ids::SCALL_FUNC),
+			"value" => host(signatures::VALUE, ids::VALUE_FUNC),
+			"create" => host(signatures::CREATE, ids::CREATE_FUNC),
+			"suicide" => host(signatures::SUICIDE, ids::SUICIDE_FUNC),
+			"blockhash" => host(signatures::BLOCKHASH, ids::BLOCKHASH_FUNC),
+			"blocknumber" => host(signatures::BLOCKNUMBER, ids::BLOCKNUMBER_FUNC),
+			"coinbase" => host(signatures::COINBASE, ids::COINBASE_FUNC),
+			"difficulty" => host(signatures::DIFFICULTY, ids::DIFFICULTY_FUNC),
+			"gaslimit" => host(signatures::GASLIMIT, ids::GASLIMIT_FUNC),
+			"timestamp" => host(signatures::TIMESTAMP, ids::TIMESTAMP_FUNC),
+			"address" => host(signatures::ADDRESS, ids::ADDRESS_FUNC),
+			"sender" => host(signatures::SENDER, ids::SENDER_FUNC),
+			"origin" => host(signatures::ORIGIN, ids::ORIGIN_FUNC),
+			"elog" => host(signatures::ELOG, ids::ELOG_FUNC),
+			_ => {
+				return Err(wasmi::Error::Instantiation(
+					format!("Export {} not found", field_name),
+				))
+			}
+		};
+
+		Ok(func_ref)
+	}
+
+	fn resolve_memory(
+		&self,
+		field_name: &str,
+		descriptor: &MemoryDescriptor,
+	) -> Result<MemoryRef, Error> {
+		if field_name == "memory" {
+			let effective_max = descriptor.maximum().unwrap_or(self.max_memory + 1);
+			if descriptor.initial() > self.max_memory || effective_max > self.max_memory
+			{
+				Err(Error::Instantiation("Module requested too much memory".to_owned()))
+			} else {
+				let mem = MemoryInstance::alloc(
+					memory_units::Pages(descriptor.initial() as usize),
+					descriptor.maximum().map(|x| memory_units::Pages(x as usize)),
+				)?;
+				*self.memory.borrow_mut() = Some(mem.clone());
+				Ok(mem)
+			}
+		} else {
+			Err(Error::Instantiation("Memory imported under unknown name".to_owned()))
+		}
 	}
 }
\ No newline at end of file
diff --git a/ethcore/wasm/src/lib.rs b/ethcore/wasm/src/lib.rs
index 3fec0f7814adf752e2223f71530c5238772dc0e2..5605a7ea185683c44d0d1e542b7624748e98d20d 100644
--- a/ethcore/wasm/src/lib.rs
+++ b/ethcore/wasm/src/lib.rs
@@ -16,130 +16,164 @@
 
 //! Wasm Interpreter
 
-extern crate vm;
-extern crate ethcore_util as util;
-#[macro_use] extern crate log;
-extern crate ethcore_logger;
 extern crate byteorder;
+extern crate ethcore_logger;
+extern crate ethereum_types;
+#[macro_use] extern crate log;
+extern crate libc;
 extern crate parity_wasm;
-extern crate wasm_utils;
+extern crate vm;
+extern crate pwasm_utils as wasm_utils;
+extern crate wasmi;
 
 mod runtime;
-mod ptr;
-mod call_args;
-mod result;
 #[cfg(test)]
 mod tests;
 mod env;
+mod panic_payload;
+mod parser;
 
-const DEFAULT_STACK_SPACE: u32 = 5 * 1024 * 1024;
+use vm::{GasLeft, ReturnData, ActionParams};
+use wasmi::{Error as InterpreterError, Trap};
 
-use parity_wasm::{interpreter, elements};
-use parity_wasm::interpreter::ModuleInstanceInterface;
+use runtime::{Runtime, RuntimeContext};
 
-use vm::{GasLeft, ReturnData, ActionParams};
-use self::runtime::{Runtime, RuntimeContext};
+use ethereum_types::U256;
 
-pub use self::runtime::Error as RuntimeError;
+/// Wrapped interpreter error
+#[derive(Debug)]
+pub enum Error {
+	Interpreter(InterpreterError),
+	Trap(Trap),
+}
 
-const DEFAULT_RESULT_BUFFER: usize = 1024;
+impl From<InterpreterError> for Error {
+	fn from(e: InterpreterError) -> Self {
+		Error::Interpreter(e)
+	}
+}
 
-/// Wasm interpreter instance
-pub struct WasmInterpreter {
-	program: interpreter::ProgramInstance,
-	result: Vec<u8>,
+impl From<Trap> for Error {
+	fn from(e: Trap) -> Self {
+		Error::Trap(e)
+	}
+}
+
+impl From<Error> for vm::Error {
+	fn from(e: Error) -> Self {
+		match e {
+			Error::Interpreter(e) => vm::Error::Wasm(format!("Wasm runtime error: {:?}", e)),
+			Error::Trap(e) => vm::Error::Wasm(format!("Wasm contract trap: {:?}", e)),
+		}
+	}
 }
 
-impl WasmInterpreter {
-	/// New wasm interpreter instance
-	pub fn new() -> Result<WasmInterpreter, RuntimeError> {
-		Ok(WasmInterpreter {
-			program: interpreter::ProgramInstance::new()?,
-			result: Vec::with_capacity(DEFAULT_RESULT_BUFFER),
-		})
+/// Wasm interpreter instance
+pub struct WasmInterpreter;
+
+impl From<runtime::Error> for vm::Error {
+	fn from(e: runtime::Error) -> Self {
+		vm::Error::Wasm(format!("Wasm runtime error: {:?}", e))
 	}
 }
 
+enum ExecutionOutcome {
+	Suicide,
+	Return,
+	NotSpecial,
+}
+
 impl vm::Vm for WasmInterpreter {
 
 	fn exec(&mut self, params: ActionParams, ext: &mut vm::Ext) -> vm::Result<GasLeft> {
-		use parity_wasm::elements::Deserialize;
+		let (module, data) = parser::payload(&params, ext.schedule().wasm())?;
 
-		let code = params.code.expect("exec is only called on contract with code; qed");
+		let loaded_module = wasmi::Module::from_parity_wasm_module(module).map_err(Error::Interpreter)?;
 
-		trace!(target: "wasm", "Started wasm interpreter with code.len={:?}", code.len());
+		let instantiation_resolver = env::ImportResolver::with_limit(16);
 
-		let env_instance = self.program.module("env")
-			// prefer explicit panic here
-			.expect("Wasm program to contain env module");
+		let module_instance = wasmi::ModuleInstance::new(
+			&loaded_module,
+			&wasmi::ImportsBuilder::new().with_resolver("env", &instantiation_resolver)
+		).map_err(Error::Interpreter)?;
 
-		let env_memory = env_instance.memory(interpreter::ItemIndex::Internal(0))
-			// prefer explicit panic here
-			.expect("Linear memory to exist in wasm runtime");
+		let adjusted_gas = params.gas * U256::from(ext.schedule().wasm().opcodes_div) /
+			U256::from(ext.schedule().wasm().opcodes_mul);
 
-		if params.gas > ::std::u64::MAX.into() {
-			return Err(vm::Error::Wasm("Wasm interpreter cannot run contracts with gas >= 2^64".to_owned()));
+		if adjusted_gas > ::std::u64::MAX.into()
+		{
+			return Err(vm::Error::Wasm("Wasm interpreter cannot run contracts with gas (wasm adjusted) >= 2^64".to_owned()));
 		}
 
-		let mut runtime = Runtime::with_params(
-			ext,
-			env_memory,
-			DEFAULT_STACK_SPACE,
-			params.gas.low_u64(),
-			RuntimeContext::new(params.address, params.sender),
-			&self.program,
-		);
-
-		let mut cursor = ::std::io::Cursor::new(&*code);
-
-		let contract_module = wasm_utils::inject_gas_counter(
-			elements::Module::deserialize(
-				&mut cursor
-			).map_err(|err| {
-				vm::Error::Wasm(format!("Error deserializing contract code ({:?})", err))
-			})?
-		);
-
-		let d_ptr = runtime.write_descriptor(
-			call_args::CallArgs::new(
-				params.address,
-				params.sender,
-				params.origin,
-				params.value.value(),
-				params.data.unwrap_or(Vec::with_capacity(0)),
+		let initial_memory = instantiation_resolver.memory_size().map_err(Error::Interpreter)?;
+		trace!(target: "wasm", "Contract requested {:?} pages of initial memory", initial_memory);
+
+		let (gas_left, result) = {
+			let mut runtime = Runtime::with_params(
+				ext,
+				instantiation_resolver.memory_ref(),
+				// cannot overflow, checked above
+				adjusted_gas.low_u64(),
+				data.to_vec(),
+				RuntimeContext {
+					address: params.address,
+					sender: params.sender,
+					origin: params.origin,
+					code_address: params.code_address,
+					value: params.value.value(),
+				},
+			);
+
+			// cannot overflow if static_region < 2^16,
+			// initial_memory ∈ [0..2^32)
+			// total_charge <- static_region * 2^32 * 2^16
+			// total_charge ∈ [0..2^64) if static_region ∈ [0..2^16)
+			// qed
+			assert!(runtime.schedule().wasm().initial_mem < 1 << 16);
+			runtime.charge(|s| initial_memory as u64 * s.wasm().initial_mem as u64)?;
+
+			let module_instance = module_instance.run_start(&mut runtime).map_err(Error::Trap)?;
+
+			let invoke_result = module_instance.invoke_export("call", &[], &mut runtime);
+
+			let mut execution_outcome = ExecutionOutcome::NotSpecial;
+			if let Err(InterpreterError::Trap(ref trap)) = invoke_result {
+				if let wasmi::TrapKind::Host(ref boxed) = *trap.kind() {
+					let ref runtime_err = boxed.downcast_ref::<runtime::Error>()
+						.expect("Host errors other than runtime::Error never produced; qed");
+
+					match **runtime_err {
+						runtime::Error::Suicide => { execution_outcome = ExecutionOutcome::Suicide; },
+						runtime::Error::Return => { execution_outcome = ExecutionOutcome::Return; },
+						_ => {}
+					}
+				}
+			}
+
+			if let (ExecutionOutcome::NotSpecial, Err(e)) = (execution_outcome, invoke_result) {
+				trace!(target: "wasm", "Error executing contract: {:?}", e);
+				return Err(vm::Error::from(Error::from(e)));
+			}
+
+			(
+				runtime.gas_left().expect("Cannot fail since it was not updated since last charge"),
+				runtime.into_result(),
 			)
-		)?;
+		};
 
-		{
-			let execution_params = runtime.execution_params()
-				.add_argument(interpreter::RuntimeValue::I32(d_ptr.as_raw() as i32));
-
-			let module_instance = self.program.add_module("contract", contract_module, Some(&execution_params.externals))
-				.map_err(|err| {
-					trace!(target: "wasm", "Error adding contract module: {:?}", err);
-					vm::Error::from(RuntimeError::Interpreter(err))
-				})?;
-
-			module_instance.execute_export("_call", execution_params)
-				.map_err(|err| {
-					trace!(target: "wasm", "Error executing contract: {:?}", err);
-					vm::Error::from(RuntimeError::Interpreter(err))
-				})?;
-		}
+		let gas_left =
+			U256::from(gas_left) * U256::from(ext.schedule().wasm().opcodes_mul)
+				/ U256::from(ext.schedule().wasm().opcodes_div);
 
-		let result = result::WasmResult::new(d_ptr);
-		if result.peek_empty(&*runtime.memory())? {
+		if result.is_empty() {
 			trace!(target: "wasm", "Contract execution result is empty.");
-			Ok(GasLeft::Known(runtime.gas_left()?.into()))
+			Ok(GasLeft::Known(gas_left))
 		} else {
-			self.result.clear();
-			// todo: use memory views to avoid copy
-			self.result.extend(result.pop(&*runtime.memory())?);
-			let len = self.result.len();
+			let len = result.len();
 			Ok(GasLeft::NeedsReturn {
-				gas_left: runtime.gas_left()?.into(),
+				gas_left: gas_left,
 				data: ReturnData::new(
-					::std::mem::replace(&mut self.result, Vec::with_capacity(DEFAULT_RESULT_BUFFER)),
+					result,
 					0,
 					len,
 				),
@@ -148,9 +182,3 @@ impl vm::Vm for WasmInterpreter {
 		}
 	}
 }
-
-impl From<runtime::Error> for vm::Error {
-	fn from(err: runtime::Error) -> vm::Error {
-		vm::Error::Wasm(format!("WASM runtime-error: {:?}", err))
-	}
-}
\ No newline at end of file
diff --git a/ethcore/wasm/src/panic_payload.rs b/ethcore/wasm/src/panic_payload.rs
new file mode 100644
index 0000000000000000000000000000000000000000..dc95f53fbfc9bca70fbb3b65c5885c120e795489
--- /dev/null
+++ b/ethcore/wasm/src/panic_payload.rs
@@ -0,0 +1,168 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use byteorder::{LittleEndian, ReadBytesExt};
+use std::io::{self, Read};
+
+#[derive(Debug, PartialEq, Eq)]
+pub struct PanicPayload {
+	pub msg: Option<String>,
+	pub file: Option<String>,
+	pub line: Option<u32>,
+	pub col: Option<u32>,
+}
+
+fn read_string(rdr: &mut io::Cursor<&[u8]>) -> io::Result<Option<String>> {
+	let string_len = rdr.read_u32::<LittleEndian>()?;
+	let string = if string_len == 0 {
+		None
+	} else {
+		let mut content = vec![0; string_len as usize];
+		rdr.read_exact(&mut content)?;
+		Some(String::from_utf8_lossy(&content).into_owned())
+	};
+	Ok(string)
+}
+
+pub fn decode(raw: &[u8]) -> PanicPayload {
+	let mut rdr = io::Cursor::new(raw);
+	let msg = read_string(&mut rdr).ok().and_then(|x| x);
+	let file = read_string(&mut rdr).ok().and_then(|x| x);
+	let line = rdr.read_u32::<LittleEndian>().ok();
+	let col = rdr.read_u32::<LittleEndian>().ok();
+	PanicPayload {
+		msg: msg,
+		file: file,
+		line: line,
+		col: col,
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use byteorder::WriteBytesExt;
+
+	fn write_u32(payload: &mut Vec<u8>, val: u32) {
+		payload.write_u32::<LittleEndian>(val).unwrap();
+	}
+
+	fn write_bytes(payload: &mut Vec<u8>, bytes: &[u8]) {
+		write_u32(payload, bytes.len() as u32);
+		payload.extend(bytes);
+	}
+
+	#[test]
+	fn it_works() {
+		let mut raw = Vec::new();
+		write_bytes(&mut raw, b"msg");
+		write_bytes(&mut raw, b"file");
+		write_u32(&mut raw, 1);
+		write_u32(&mut raw, 2);
+
+		let payload = decode(&raw);
+
+		assert_eq!(
+			payload,
+			PanicPayload {
+				msg: Some("msg".to_string()),
+				file: Some("file".to_string()),
+				line: Some(1),
+				col: Some(2),
+			}
+		);
+	}
+
+	#[test]
+	fn only_msg() {
+		let mut raw = Vec::new();
+		write_bytes(&mut raw, b"msg");
+
+		let payload = decode(&raw);
+
+		assert_eq!(
+			payload,
+			PanicPayload {
+				msg: Some("msg".to_string()),
+				file: None,
+				line: None,
+				col: None,
+			}
+		);
+	}
+
+	#[test]
+	fn invalid_utf8() {
+		let mut raw = Vec::new();
+		write_bytes(&mut raw, b"\xF0\x90\x80msg");
+		write_bytes(&mut raw, b"file");
+		write_u32(&mut raw, 1);
+		write_u32(&mut raw, 2);
+
+		let payload = decode(&raw);
+
+		assert_eq!(
+			payload,
+			PanicPayload {
+				msg: Some("�msg".to_string()),
+				file: Some("file".to_string()),
+				line: Some(1),
+				col: Some(2),
+			}
+		);
+	}
+
+	#[test]
+	fn trailing_data() {
+		let mut raw = Vec::new();
+		write_bytes(&mut raw, b"msg");
+		write_bytes(&mut raw, b"file");
+		write_u32(&mut raw, 1);
+		write_u32(&mut raw, 2);
+		write_u32(&mut raw, 0xdeadbeef);
+
+		let payload = decode(&raw);
+
+		assert_eq!(
+			payload,
+			PanicPayload {
+				msg: Some("msg".to_string()),
+				file: Some("file".to_string()),
+				line: Some(1),
+				col: Some(2),
+			}
+		);
+	}
+
+	#[test]
+	fn empty_str_is_none() {
+		let mut raw = Vec::new();
+		write_bytes(&mut raw, b"msg");
+		write_bytes(&mut raw, b"");
+
+		let payload = decode(&raw);
+
+		assert_eq!(
+			payload,
+			PanicPayload {
+				msg: Some("msg".to_string()),
+				file: None,
+				line: None,
+				col: None,
+			}
+		);
+	}
+}
diff --git a/ethcore/wasm/src/parser.rs b/ethcore/wasm/src/parser.rs
new file mode 100644
index 0000000000000000000000000000000000000000..62cd66cb98c8e50fa13f665dbc24496d11d13eb7
--- /dev/null
+++ b/ethcore/wasm/src/parser.rs
@@ -0,0 +1,98 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! ActionParams parser for wasm
+
+use vm;
+use wasm_utils::{self, rules};
+use parity_wasm::elements::{self, Deserialize};
+use parity_wasm::peek_size;
+
+fn gas_rules(wasm_costs: &vm::WasmCosts) -> rules::Set {
+	rules::Set::new(
+		wasm_costs.regular,
+		{
+			let mut vals = ::std::collections::HashMap::with_capacity(8);
+			vals.insert(rules::InstructionType::Load, rules::Metering::Fixed(wasm_costs.mem as u32));
+			vals.insert(rules::InstructionType::Store, rules::Metering::Fixed(wasm_costs.mem as u32));
+			vals.insert(rules::InstructionType::Div, rules::Metering::Fixed(wasm_costs.div as u32));
+			vals.insert(rules::InstructionType::Mul, rules::Metering::Fixed(wasm_costs.mul as u32));
+			vals
+		})
+		.with_grow_cost(wasm_costs.grow_mem)
+		.with_forbidden_floats()
+}
+
+/// Splits payload to code and data according to params.params_type, also
+/// loads the module instance from payload and injects gas counter according
+/// to schedule.
+pub fn payload<'a>(params: &'a vm::ActionParams, wasm_costs: &vm::WasmCosts)
+	-> Result<(elements::Module, &'a [u8]), vm::Error>
+{
+	let code = match params.code {
+		Some(ref code) => &code[..],
+		None => { return Err(vm::Error::Wasm("Invalid wasm call".to_owned())); }
+	};
+
+	let (mut cursor, data_position) = match params.params_type {
+		vm::ParamsType::Embedded => {
+			let module_size = peek_size(&*code);
+			(
+				::std::io::Cursor::new(&code[..module_size]),
+				module_size
+			)
+		},
+		vm::ParamsType::Separate => {
+			(::std::io::Cursor::new(&code[..]), 0)
+		},
+	};
+
+	let deserialized_module = elements::Module::deserialize(
+			&mut cursor
+		).map_err(|err| {
+			vm::Error::Wasm(format!("Error deserializing contract code ({:?})", err))
+		})?;
+
+	if deserialized_module.memory_section().map_or(false, |ms| ms.entries().len() > 0) {
+		// According to WebAssembly spec, internal memory is hidden from embedder and should not
+		// be interacted with. So we disable this kind of modules at decoding level.
+		return Err(vm::Error::Wasm(format!("Malformed wasm module: internal memory")));
+	}
+
+	let contract_module = wasm_utils::inject_gas_counter(
+		deserialized_module,
+		&gas_rules(wasm_costs),
+	).map_err(|_| vm::Error::Wasm(format!("Wasm contract error: bytecode invalid")))?;
+
+	let contract_module = wasm_utils::stack_height::inject_limiter(
+		contract_module,
+		wasm_costs.max_stack_height,
+	).map_err(|_| vm::Error::Wasm(format!("Wasm contract error: stack limiter failure")))?;
+
+	let data = match params.params_type {
+		vm::ParamsType::Embedded => {
+			if data_position < code.len() { &code[data_position..] } else { &[] }
+		},
+		vm::ParamsType::Separate => {
+			match params.data {
+				Some(ref s) => &s[..],
+				None => &[]
+			}
+		}
+	};
+
+	Ok((contract_module, data))
+}
\ No newline at end of file
diff --git a/ethcore/wasm/src/ptr.rs b/ethcore/wasm/src/ptr.rs
deleted file mode 100644
index 11edbad70086121949ac19c50e50d58f8e2aa013..0000000000000000000000000000000000000000
--- a/ethcore/wasm/src/ptr.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Wasm bound-checked ptr
-
-use parity_wasm::interpreter;
-
-/// Bound-checked wrapper for webassembly memory 
-pub struct WasmPtr(u32);
-
-/// Error in bound check
-#[derive(Debug)]
-pub enum Error {
-	AccessViolation,
-}
-
-impl From<u32> for WasmPtr {
-	fn from(raw: u32) -> Self { 
-		WasmPtr(raw)
-	}
-}
-
-impl WasmPtr {
-	// todo: use memory view when they are on
-	/// Check memory range and return data with given length starting from the current pointer value
-	pub fn slice(&self, len: u32, mem: &interpreter::MemoryInstance) -> Result<Vec<u8>, Error> {
-		mem.get(self.0, len as usize).map_err(|_| Error::AccessViolation)
-	}
-
-	// todo: maybe 2gb limit can be enhanced
-	/// Convert i32 from wasm stack to the wrapped pointer
-	pub fn from_i32(raw_ptr: i32) -> Result<Self, Error> {
-		if raw_ptr < 0 { return Err(Error::AccessViolation); }
-		Ok(WasmPtr(raw_ptr as u32))
-	}
-
-	/// Return pointer raw value
-	pub fn as_raw(&self) -> u32 { self.0 }
-}
\ No newline at end of file
diff --git a/ethcore/wasm/src/result.rs b/ethcore/wasm/src/result.rs
deleted file mode 100644
index 3d1e51f64e835b833901ee9175d46a3872a1e5bf..0000000000000000000000000000000000000000
--- a/ethcore/wasm/src/result.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Wasm evm results helper
-
-use byteorder::{LittleEndian, ByteOrder};
-
-use parity_wasm::interpreter;
-
-use super::ptr::WasmPtr;
-use super::runtime::Error as RuntimeError;
-
-/// Wrapper for wasm contract call result
-pub struct WasmResult {
-	ptr: WasmPtr,
-}
-
-impl WasmResult {
-	/// New call result from given ptr
-	pub fn new(descriptor_ptr: WasmPtr) -> WasmResult {
-		WasmResult { ptr: descriptor_ptr }
-	}
-
-	/// Check if the result contains any data
-	pub fn peek_empty(&self, mem: &interpreter::MemoryInstance) -> Result<bool, RuntimeError> {
-		let result_len = LittleEndian::read_u32(&self.ptr.slice(16, mem)?[12..16]);
-		Ok(result_len == 0)
-	}
-
-	/// Consume the result ptr and return the actual data from wasm linear memory
-	pub fn pop(self, mem: &interpreter::MemoryInstance) -> Result<Vec<u8>, RuntimeError> {
-		let result_ptr = LittleEndian::read_u32(&self.ptr.slice(16, mem)?[8..12]);
-		let result_len = LittleEndian::read_u32(&self.ptr.slice(16, mem)?[12..16]);
-		trace!(target: "wasm", "contract result: {} bytes at @{}", result_len, result_ptr);
-
-		Ok(mem.get(result_ptr, result_len as usize)?)
-	}
-}
\ No newline at end of file
diff --git a/ethcore/wasm/src/runtime.rs b/ethcore/wasm/src/runtime.rs
index e1def857e138f7b5b05a30cafdaa83e9908e46f3..71fafd671e368d05e7e7706be72299609f93b2cb 100644
--- a/ethcore/wasm/src/runtime.rs
+++ b/ethcore/wasm/src/runtime.rs
@@ -1,278 +1,433 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
+use ethereum_types::{U256, H256, Address};
+use vm::{self, CallType};
+use wasmi::{self, MemoryRef, RuntimeArgs, RuntimeValue, Error as InterpreterError, Trap, TrapKind};
+use super::panic_payload;
 
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Wasm evm program runtime intstance
-
-use std::sync::Arc;
-
-use byteorder::{LittleEndian, ByteOrder};
-
-use vm;
-use parity_wasm::interpreter;
-use util::{Address, H256, U256};
+pub struct RuntimeContext {
+	pub address: Address,
+	pub sender: Address,
+	pub origin: Address,
+	pub code_address: Address,
+	pub value: U256,
+}
 
-use vm::CallType;
-use super::ptr::{WasmPtr, Error as PtrError};
-use super::call_args::CallArgs;
+pub struct Runtime<'a> {
+	gas_counter: u64,
+	gas_limit: u64,
+	ext: &'a mut vm::Ext,
+	context: RuntimeContext,
+	memory: MemoryRef,
+	args: Vec<u8>,
+	result: Vec<u8>,
+}
 
-/// Wasm runtime error
-#[derive(Debug)]
+/// User trap in native code
+#[derive(Debug, Clone, PartialEq)]
 pub enum Error {
-	/// Storage error
-	Storage,
-	/// Allocator error
-	Allocator,
-	/// Invalid gas state during the call
-	InvalidGasState,
+	/// Storage read error
+	StorageReadError,
+	/// Storage update error
+	StorageUpdateError,
 	/// Memory access violation
-	AccessViolation,
-	/// Interpreter runtime error
-	Interpreter(interpreter::Error),
+	MemoryAccessViolation,
+	/// Native code resulted in suicide
+	Suicide,
+	/// Native code requested execution to finish
+	Return,
+	/// Suicide was requested but coudn't complete
+	SuicideAbort,
+	/// Invalid gas state inside interpreter
+	InvalidGasState,
+	/// Query of the balance resulted in an error
+	BalanceQueryError,
+	/// Failed allocation
+	AllocationFailed,
+	/// Gas limit reached
+	GasLimit,
+	/// Unknown runtime function
+	Unknown,
+	/// Passed string had invalid utf-8 encoding
+	BadUtf8,
+	/// Log event error
+	Log,
+	/// Other error in native code
+	Other,
+	/// Syscall signature mismatch
+	InvalidSyscall,
+	/// Unreachable instruction encountered
+	Unreachable,
+	/// Invalid virtual call
+	InvalidVirtualCall,
+	/// Division by zero
+	DivisionByZero,
+	/// Invalid conversion to integer
+	InvalidConversionToInt,
+	/// Stack overflow
+	StackOverflow,
+	/// Panic with message
+	Panic(String),
 }
 
-impl From<interpreter::Error> for Error {
-	fn from(err: interpreter::Error) -> Self {
-		Error::Interpreter(err)
+impl wasmi::HostError for Error { }
+
+impl From<Trap> for Error {
+	fn from(trap: Trap) -> Self {
+		match *trap.kind() {
+			TrapKind::Unreachable => Error::Unreachable,
+			TrapKind::MemoryAccessOutOfBounds => Error::MemoryAccessViolation,
+			TrapKind::TableAccessOutOfBounds | TrapKind::ElemUninitialized => Error::InvalidVirtualCall,
+			TrapKind::DivisionByZero => Error::DivisionByZero,
+			TrapKind::InvalidConversionToInt => Error::InvalidConversionToInt,
+			TrapKind::UnexpectedSignature => Error::InvalidVirtualCall,
+			TrapKind::StackOverflow => Error::StackOverflow,
+			TrapKind::Host(_) => Error::Other,
+		}
 	}
 }
 
-impl From<PtrError> for Error {
-	fn from(err: PtrError) -> Self {
+impl From<InterpreterError> for Error {
+	fn from(err: InterpreterError) -> Self {
 		match err {
-			PtrError::AccessViolation => Error::AccessViolation,
+			InterpreterError::Value(_) => Error::InvalidSyscall,
+			InterpreterError::Memory(_) => Error::MemoryAccessViolation,
+			_ => Error::Other,
 		}
 	}
 }
 
-pub struct RuntimeContext {
-	address: Address,
-	sender: Address,
-}
-
-impl RuntimeContext {
-	pub fn new(address: Address, sender: Address) -> Self {
-		RuntimeContext {
-			address: address,
-			sender: sender,
+impl ::std::fmt::Display for Error {
+	fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::result::Result<(), ::std::fmt::Error> {
+		match *self {
+			Error::StorageReadError => write!(f, "Storage read error"),
+			Error::StorageUpdateError => write!(f, "Storage update error"),
+			Error::MemoryAccessViolation => write!(f, "Memory access violation"),
+			Error::SuicideAbort => write!(f, "Attempt to suicide resulted in an error"),
+			Error::InvalidGasState => write!(f, "Invalid gas state"),
+			Error::BalanceQueryError => write!(f, "Balance query resulted in an error"),
+			Error::Suicide => write!(f, "Suicide result"),
+			Error::Return => write!(f, "Return result"),
+			Error::Unknown => write!(f, "Unknown runtime function invoked"),
+			Error::AllocationFailed => write!(f, "Memory allocation failed (OOM)"),
+			Error::BadUtf8 => write!(f, "String encoding is bad utf-8 sequence"),
+			Error::GasLimit => write!(f, "Invocation resulted in gas limit violated"),
+			Error::Log => write!(f, "Error occured while logging an event"),
+			Error::InvalidSyscall => write!(f, "Invalid syscall signature encountered at runtime"),
+			Error::Other => write!(f, "Other unspecified error"),
+			Error::Unreachable => write!(f, "Unreachable instruction encountered"),
+			Error::InvalidVirtualCall => write!(f, "Invalid virtual call"),
+			Error::DivisionByZero => write!(f, "Division by zero"),
+			Error::StackOverflow => write!(f, "Stack overflow"),
+			Error::InvalidConversionToInt => write!(f, "Invalid conversion to integer"),
+			Error::Panic(ref msg) => write!(f, "Panic: {}", msg),
 		}
 	}
 }
 
-/// Runtime enviroment data for wasm contract execution
-pub struct Runtime<'a, 'b> {
-	gas_counter: u64,
-	gas_limit: u64,
-	dynamic_top: u32,
-	ext: &'a mut vm::Ext,
-	memory: Arc<interpreter::MemoryInstance>,
-	context: RuntimeContext,
-	instance: &'b interpreter::ProgramInstance,
-}
+type Result<T> = ::std::result::Result<T, Error>;
+
+impl<'a> Runtime<'a> {
 
-impl<'a, 'b> Runtime<'a, 'b> {
 	/// New runtime for wasm contract with specified params
-	pub fn with_params<'c, 'd>(
-		ext: &'c mut vm::Ext,
-		memory: Arc<interpreter::MemoryInstance>,
-		stack_space: u32,
+	pub fn with_params(
+		ext: &mut vm::Ext,
+		memory: MemoryRef,
 		gas_limit: u64,
+		args: Vec<u8>,
 		context: RuntimeContext,
-		program_instance: &'d interpreter::ProgramInstance,
-	) -> Runtime<'c, 'd> {
+	) -> Runtime {
 		Runtime {
 			gas_counter: 0,
 			gas_limit: gas_limit,
-			dynamic_top: stack_space,
 			memory: memory,
 			ext: ext,
 			context: context,
-			instance: program_instance,
+			args: args,
+			result: Vec::new(),
+		}
+	}
+
+	/// Loads 256-bit hash from the specifed sandboxed memory pointer
+	fn h256_at(&self, ptr: u32) -> Result<H256> {
+		let mut buf = [0u8; 32];
+		self.memory.get_into(ptr, &mut buf[..])?;
+
+		Ok(H256::from(&buf[..]))
+	}
+
+	/// Loads 160-bit hash (Ethereum address) from the specified sandboxed memory pointer
+	fn address_at(&self, ptr: u32) -> Result<Address> {
+		let mut buf = [0u8; 20];
+		self.memory.get_into(ptr, &mut buf[..])?;
+
+		Ok(Address::from(&buf[..]))
+	}
+
+	/// Loads 256-bit integer represented with bigendian from the specified sandboxed memory pointer
+	fn u256_at(&self, ptr: u32) -> Result<U256> {
+		let mut buf = [0u8; 32];
+		self.memory.get_into(ptr, &mut buf[..])?;
+
+		Ok(U256::from_big_endian(&buf[..]))
+	}
+
+	/// Charge specified amount of gas
+	///
+	/// Returns false if gas limit exceeded and true if not.
+	/// Intuition about the return value sense is to aswer the question 'are we allowed to continue?'
+	fn charge_gas(&mut self, amount: u64) -> bool {
+		let prev = self.gas_counter;
+		match prev.checked_add(amount) {
+			// gas charge overflow protection
+			None => false,
+			Some(val) if val > self.gas_limit => false,
+			Some(_) => {
+				self.gas_counter = prev + amount;
+				true
+			}
+		}
+	}
+
+	/// Charge gas according to closure
+	pub fn charge<F>(&mut self, f: F) -> Result<()>
+		where F: FnOnce(&vm::Schedule) -> u64
+	{
+		let amount = f(self.ext.schedule());
+		if !self.charge_gas(amount as u64) {
+			Err(Error::GasLimit)
+		} else {
+			Ok(())
 		}
 	}
 
-	/// Write to the storage from wasm memory
-	pub fn storage_write(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
+	/// Adjusted charge of gas which scales actual charge according to the wasm opcode counting coefficient
+	pub fn adjusted_charge<F>(&mut self, f: F) -> Result<()>
+		where F: FnOnce(&vm::Schedule) -> u64
 	{
-		let mut context = context;
-		let val = self.pop_h256(&mut context)?;
-		let key = self.pop_h256(&mut context)?;
-		trace!(target: "wasm", "storage_write: value {} at @{}", &val, &key);
+		self.charge(|schedule| f(schedule) * schedule.wasm().opcodes_div as u64 / schedule.wasm().opcodes_mul as u64)
+	}
 
-		self.ext.set_storage(key, val)
-			.map_err(|_| interpreter::Error::Trap("Storage update error".to_owned()))?;
+	/// Charge gas provided by the closure
+	///
+	/// Closure also can return overflowing flag as None in gas cost.
+	pub fn overflow_charge<F>(&mut self, f: F) -> Result<()>
+		where F: FnOnce(&vm::Schedule) -> Option<u64>
+	{
+		let amount = match f(self.ext.schedule()) {
+			Some(amount) => amount,
+			None => { return Err(Error::GasLimit.into()); }
+		};
 
-		Ok(Some(0i32.into()))
+		if !self.charge_gas(amount as u64) {
+			Err(Error::GasLimit.into())
+		} else {
+			Ok(())
+		}
+	}
+
+	/// Same as overflow_charge, but with amount adjusted by wasm opcodes coeff
+	pub fn adjusted_overflow_charge<F>(&mut self, f: F) -> Result<()>
+		where F: FnOnce(&vm::Schedule) -> Option<u64>
+	{
+		self.overflow_charge(|schedule|
+			f(schedule)
+				.and_then(|x| x.checked_mul(schedule.wasm().opcodes_div as u64))
+				.map(|x| x / schedule.wasm().opcodes_mul as u64)
+		)
 	}
 
 	/// Read from the storage to wasm memory
-	pub fn storage_read(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
+	pub fn storage_read(&mut self, args: RuntimeArgs) -> Result<()>
 	{
-		let mut context = context;
-		let val_ptr = context.value_stack.pop_as::<i32>()?;
-		let key = self.pop_h256(&mut context)?;
+		let key = self.h256_at(args.nth_checked(0)?)?;
+		let val_ptr: u32 = args.nth_checked(1)?;
+
+		let val = self.ext.storage_at(&key).map_err(|_| Error::StorageReadError)?;
 
-		let val = self.ext.storage_at(&key)
-			.map_err(|_| interpreter::Error::Trap("Storage read error".to_owned()))?;
+		self.adjusted_charge(|schedule| schedule.sload_gas as u64)?;
 
 		self.memory.set(val_ptr as u32, &*val)?;
 
-		Ok(Some(0.into()))
+		Ok(())
 	}
 
-	/// Pass suicide to state runtime
-	pub fn suicide(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
+	/// Write to storage from wasm memory
+	pub fn storage_write(&mut self, args: RuntimeArgs) -> Result<()>
 	{
-		let mut context = context;
-		let refund_address = self.pop_address(&mut context)?;
+		let key = self.h256_at(args.nth_checked(0)?)?;
+		let val_ptr: u32 = args.nth_checked(1)?;
+
+		let val = self.h256_at(val_ptr)?;
+		let former_val = self.ext.storage_at(&key).map_err(|_| Error::StorageUpdateError)?;
+
+		if former_val == H256::zero() && val != H256::zero() {
+			self.adjusted_charge(|schedule| schedule.sstore_set_gas as u64)?;
+		} else {
+			self.adjusted_charge(|schedule| schedule.sstore_reset_gas as u64)?;
+		}
+
+		self.ext.set_storage(key, val).map_err(|_| Error::StorageUpdateError)?;
 
-		self.ext.suicide(&refund_address)
-			.map_err(|_| interpreter::Error::Trap("Suicide error".to_owned()))?;
+		if former_val != H256::zero() && val == H256::zero() {
+			self.ext.inc_sstore_clears();
+		}
 
-		Ok(None)
+		Ok(())
 	}
 
-	/// Invoke create in the state runtime
-	pub fn create(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		//
-		// method signature:
-		//   fn create(endowment: *const u8, code_ptr: *const u8, code_len: u32, result_ptr: *mut u8) -> i32;
-		//
+	/// Return currently used schedule
+	pub fn schedule(&self) -> &vm::Schedule {
+		self.ext.schedule()
+	}
 
-		trace!(target: "wasm", "runtime: create contract");
-		let mut context = context;
-		let result_ptr = context.value_stack.pop_as::<i32>()? as u32;
-		trace!(target: "wasm", "result_ptr: {:?}", result_ptr);
-		let code_len = context.value_stack.pop_as::<i32>()? as u32;
-		trace!(target: "wasm", "  code_len: {:?}", code_len);
-		let code_ptr = context.value_stack.pop_as::<i32>()? as u32;
-		trace!(target: "wasm", "  code_ptr: {:?}", code_ptr);
-		let endowment = self.pop_u256(&mut context)?;
-		trace!(target: "wasm", "       val: {:?}", endowment);
+	/// Sets a return value for the call
+	///
+	/// Syscall takes 2 arguments:
+	/// * pointer in sandboxed memory where result is
+	/// * the length of the result
+	pub fn ret(&mut self, args: RuntimeArgs) -> Result<()> {
+		let ptr: u32 = args.nth_checked(0)?;
+		let len: u32 = args.nth_checked(1)?;
 
-		let code = self.memory.get(code_ptr, code_len as usize)?;
+		trace!(target: "wasm", "Contract ret: {} bytes @ {}", len, ptr);
 
-		let gas_left = self.gas_left()
-			.map_err(|_| interpreter::Error::Trap("Gas state error".to_owned()))?
-			.into();
+		self.result = self.memory.get(ptr, len as usize)?;
 
-		match self.ext.create(&gas_left, &endowment, &code, vm::CreateContractAddress::FromSenderAndCodeHash) {
-			vm::ContractCreateResult::Created(address, gas_left) => {
-				self.memory.set(result_ptr, &*address)?;
-				self.gas_counter = self.gas_limit - gas_left.low_u64();
-				trace!(target: "wasm", "runtime: create contract success (@{:?})", address);
-				Ok(Some(0i32.into()))
-			},
-			vm::ContractCreateResult::Failed => {
-				trace!(target: "wasm", "runtime: create contract fail");
-				Ok(Some((-1i32).into()))
-			}
-		}
+		Err(Error::Return)
 	}
 
-	pub fn call(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		//
-		// method signature:
-		// fn (
-		// 	address: *const u8,
-		// 	val_ptr: *const u8,
-		// 	input_ptr: *const u8,
-		// 	input_len: u32,
-		// 	result_ptr: *mut u8,
-		// 	result_len: u32,
-		// ) -> i32
+	/// Destroy the runtime, returning currently recorded result of the execution
+	pub fn into_result(self) -> Vec<u8> {
+		self.result
+	}
 
-		self.do_call(true, CallType::Call, context)
+	/// Query current gas left for execution
+	pub fn gas_left(&self) -> Result<u64> {
+		if self.gas_counter > self.gas_limit { return Err(Error::InvalidGasState); }
+		Ok(self.gas_limit - self.gas_counter)
 	}
+	
+	/// General gas charging extern.
+	fn gas(&mut self, args: RuntimeArgs) -> Result<()> {
+		let amount: u32 = args.nth_checked(0)?;
+		if self.charge_gas(amount as u64) {
+			Ok(())
+		} else {
+			Err(Error::GasLimit.into())
+		}
+	}
+
+	/// Query the length of the input bytes
+	fn input_legnth(&mut self) -> RuntimeValue {
+		RuntimeValue::I32(self.args.len() as i32)
+	}
+
+	/// Write input bytes to the memory location using the passed pointer
+	fn fetch_input(&mut self, args: RuntimeArgs) -> Result<()> {
+		let ptr: u32 = args.nth_checked(0)?;
+
+		let args_len = self.args.len() as u64;
+		self.charge(|s| args_len * s.wasm().memcpy as u64)?;
 
+		self.memory.set(ptr, &self.args[..])?;
+		Ok(())
+	}
 
-	fn call_code(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
+	/// User panic
+	///
+	/// Contract can invoke this when he encounters unrecoverable error.
+	fn panic(&mut self, args: RuntimeArgs) -> Result<()>
 	{
-		//
-		// signature (same as static call):
-		// fn (
-		// 	address: *const u8,
-		// 	input_ptr: *const u8,
-		// 	input_len: u32,
-		// 	result_ptr: *mut u8,
-		// 	result_len: u32,
-		// ) -> i32
+		let payload_ptr: u32 = args.nth_checked(0)?;
+		let payload_len: u32 = args.nth_checked(1)?;
+
+		let raw_payload = self.memory.get(payload_ptr, payload_len as usize)?;
+		let payload = panic_payload::decode(&raw_payload);
+		let msg = format!(
+			"{msg}, {file}:{line}:{col}",
+			msg = payload
+				.msg
+				.as_ref()
+				.map(String::as_ref)
+				.unwrap_or("<msg was stripped>"),
+			file = payload
+				.file
+				.as_ref()
+				.map(String::as_ref)
+				.unwrap_or("<unknown>"),
+			line = payload.line.unwrap_or(0),
+			col = payload.col.unwrap_or(0)
+		);
+		trace!(target: "wasm", "Contract custom panic message: {}", msg);
 
-		self.do_call(false, CallType::CallCode, context)
+		Err(Error::Panic(msg).into())
 	}
 
 	fn do_call(
 		&mut self,
 		use_val: bool,
 		call_type: CallType,
-		context: interpreter::CallerContext,
+		args: RuntimeArgs,
 	)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
+		-> Result<RuntimeValue>
 	{
+		trace!(target: "wasm", "runtime: CALL({:?})", call_type);
 
-		trace!(target: "wasm", "runtime: call code");
-		let mut context = context;
-		let result_alloc_len = context.value_stack.pop_as::<i32>()? as u32;
-		trace!(target: "wasm", "    result_len: {:?}", result_alloc_len);
+		let gas: u64 = args.nth_checked(0)?;
+		trace!(target: "wasm", "           gas: {:?}", gas);
 
-		let result_ptr = context.value_stack.pop_as::<i32>()? as u32;
-		trace!(target: "wasm", "    result_ptr: {:?}", result_ptr);
+		let address = self.address_at(args.nth_checked(1)?)?;
+		trace!(target: "wasm", "       address: {:?}", address);
 
-		let input_len = context.value_stack.pop_as::<i32>()? as u32;
-		trace!(target: "wasm", "     input_len: {:?}", input_len);
+		let vofs = if use_val { 1 } else { 0 };
+		let val = if use_val { Some(self.u256_at(args.nth_checked(2)?)?) } else { None };
+		trace!(target: "wasm", "           val: {:?}", val);
 
-		let input_ptr = context.value_stack.pop_as::<i32>()? as u32;
+		let input_ptr: u32 = args.nth_checked(2 + vofs)?;
 		trace!(target: "wasm", "     input_ptr: {:?}", input_ptr);
 
-		let val = if use_val { Some(self.pop_u256(&mut context)?) }
-		else { None };
-		trace!(target: "wasm", "           val: {:?}", val);
+		let input_len: u32 = args.nth_checked(3 + vofs)?;
+		trace!(target: "wasm", "     input_len: {:?}", input_len);
 
-		let address = self.pop_address(&mut context)?;
-		trace!(target: "wasm", "       address: {:?}", address);
+		let result_ptr: u32 = args.nth_checked(4 + vofs)?;
+		trace!(target: "wasm", "    result_ptr: {:?}", result_ptr);
+
+		let result_alloc_len: u32 = args.nth_checked(5 + vofs)?;
+		trace!(target: "wasm", "    result_len: {:?}", result_alloc_len);
 
 		if let Some(ref val) = val {
 			let address_balance = self.ext.balance(&self.context.address)
-				.map_err(|_| interpreter::Error::Trap("Gas state error".to_owned()))?;
+				.map_err(|_| Error::BalanceQueryError)?;
 
 			if &address_balance < val {
 				trace!(target: "wasm", "runtime: call failed due to balance check");
-				return Ok(Some((-1i32).into()));
+				return Ok((-1i32).into());
 			}
 		}
 
+		self.adjusted_charge(|schedule| schedule.call_gas as u64)?;
+
 		let mut result = Vec::with_capacity(result_alloc_len as usize);
 		result.resize(result_alloc_len as usize, 0);
-		let gas = self.gas_left()
-			.map_err(|_| interpreter::Error::Trap("Gas state error".to_owned()))?
-			.into();
+
 		// todo: optimize to use memory views once it's in
 		let payload = self.memory.get(input_ptr, input_len as usize)?;
 
+		let adjusted_gas = match gas.checked_mul(self.ext.schedule().wasm().opcodes_div as u64)
+			.map(|x| x / self.ext.schedule().wasm().opcodes_mul as u64)
+		{
+			Some(x) => x,
+			None => {
+				trace!("CALL overflowed gas, call aborted with error returned");
+				return Ok(RuntimeValue::I32(-1))
+			},
+		};
+
+		self.charge(|_| adjusted_gas)?;
+
 		let call_result = self.ext.call(
-			&gas,
-			&self.context.sender,
-			&self.context.address,
+			&gas.into(),
+			match call_type { CallType::DelegateCall => &self.context.sender, _ => &self.context.address },
+			match call_type { CallType::Call | CallType::StaticCall => &address, _ => &self.context.address },
 			val,
 			&payload,
 			&address,
@@ -282,276 +437,298 @@ impl<'a, 'b> Runtime<'a, 'b> {
 
 		match call_result {
 			vm::MessageCallResult::Success(gas_left, _) => {
-				self.gas_counter = self.gas_limit - gas_left.low_u64();
+				// cannot overflow, before making call gas_counter was incremented with gas, and gas_left < gas
+				self.gas_counter = self.gas_counter -
+					gas_left.low_u64() * self.ext.schedule().wasm().opcodes_div as u64
+						/ self.ext.schedule().wasm().opcodes_mul as u64;
+
+				self.memory.set(result_ptr, &result)?;
+				Ok(0i32.into())
+			},
+			vm::MessageCallResult::Reverted(gas_left, _) => {
+				// cannot overflow, before making call gas_counter was incremented with gas, and gas_left < gas
+				self.gas_counter = self.gas_counter -
+					gas_left.low_u64() * self.ext.schedule().wasm().opcodes_div as u64
+						/ self.ext.schedule().wasm().opcodes_mul as u64;
+
 				self.memory.set(result_ptr, &result)?;
-				Ok(Some(0i32.into()))
+				Ok((-1i32).into())
 			},
 			vm::MessageCallResult::Failed  => {
-				Ok(Some((-1i32).into()))
+				Ok((-1i32).into())
 			}
 		}
 	}
 
-	pub fn static_call(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		// signature (same as code call):
-		// fn (
-		// 	address: *const u8,
-		// 	input_ptr: *const u8,
-		// 	input_len: u32,
-		// 	result_ptr: *mut u8,
-		// 	result_len: u32,
-		// ) -> i32
-
-		self.do_call(false, CallType::StaticCall, context)
+	/// Message call
+	fn ccall(&mut self, args: RuntimeArgs) -> Result<RuntimeValue> {
+		self.do_call(true, CallType::Call, args)
 	}
 
-
-	/// Allocate memory using the wasm stack params
-	pub fn malloc(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		let amount = context.value_stack.pop_as::<i32>()? as u32;
-		let previous_top = self.dynamic_top;
-		self.dynamic_top = previous_top + amount;
-		Ok(Some((previous_top as i32).into()))
+	/// Delegate call
+	fn dcall(&mut self, args: RuntimeArgs) -> Result<RuntimeValue> {
+		self.do_call(false, CallType::DelegateCall, args)
 	}
 
-	/// Allocate memory in wasm memory instance
-	pub fn alloc(&mut self, amount: u32) -> Result<u32, Error> {
-		let previous_top = self.dynamic_top;
-		self.dynamic_top = previous_top + amount;
-		Ok(previous_top.into())
+	/// Static call
+	fn scall(&mut self, args: RuntimeArgs) -> Result<RuntimeValue> {
+		self.do_call(false, CallType::StaticCall, args)
 	}
 
-	/// Report gas cost with the params passed in wasm stack
-	fn gas(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
+	fn return_address_ptr(&mut self, ptr: u32, val: Address) -> Result<()>
 	{
-		let amount = context.value_stack.pop_as::<i32>()? as u64;
-		if self.charge_gas(amount) {
-			Ok(None)
-		} else {
-			Err(interpreter::Error::Trap(format!("Gas exceeds limits of {}", self.gas_limit)))
-		}
+		self.charge(|schedule| schedule.wasm().static_address as u64)?;
+		self.memory.set(ptr, &*val)?;
+		Ok(())
 	}
 
-	fn charge_gas(&mut self, amount: u64) -> bool {
-		let prev = self.gas_counter;
-		if prev + amount > self.gas_limit {
-			// exceeds gas
-			false
-		} else {
-			self.gas_counter = prev + amount;
-			true
-		}
+	fn return_u256_ptr(&mut self, ptr: u32, val: U256) -> Result<()> {
+		let value: H256 = val.into();
+		self.charge(|schedule| schedule.wasm().static_u256 as u64)?;
+		self.memory.set(ptr, &*value)?;
+		Ok(())
 	}
 
-	fn h256_at(&self, ptr: WasmPtr) -> Result<H256, interpreter::Error> {
-		Ok(H256::from_slice(&ptr.slice(32, &*self.memory)
-			.map_err(|_| interpreter::Error::Trap("Memory access violation".to_owned()))?
-		))
+	/// Returns value (in Wei) passed to contract
+	pub fn value(&mut self, args: RuntimeArgs) -> Result<()> {
+		let val = self.context.value;
+		self.return_u256_ptr(args.nth_checked(0)?, val)
 	}
 
-	fn pop_h256(&self, context: &mut interpreter::CallerContext) -> Result<H256, interpreter::Error> {
-		let ptr = WasmPtr::from_i32(context.value_stack.pop_as::<i32>()?)
-			.map_err(|_| interpreter::Error::Trap("Memory access violation".to_owned()))?;
-		self.h256_at(ptr)
-	}
+	/// Creates a new contract
+	///
+	/// Arguments:
+	/// * endowment - how much value (in Wei) transfer to the newly created contract
+	/// * code_ptr - pointer to the code data
+	/// * code_len - lenght of the code data
+	/// * result_ptr - pointer to write an address of the newly created contract
+	pub fn create(&mut self, args: RuntimeArgs) -> Result<RuntimeValue>
+	{
+		//
+		// method signature:
+		//   fn create(endowment: *const u8, code_ptr: *const u8, code_len: u32, result_ptr: *mut u8) -> i32;
+		//
+		trace!(target: "wasm", "runtime: CREATE");
+		let endowment = self.u256_at(args.nth_checked(0)?)?;
+		trace!(target: "wasm", "       val: {:?}", endowment);
+		let code_ptr: u32 = args.nth_checked(1)?;
+		trace!(target: "wasm", "  code_ptr: {:?}", code_ptr);
+		let code_len: u32 = args.nth_checked(2)?;
+		trace!(target: "wasm", "  code_len: {:?}", code_len);
+		let result_ptr: u32 = args.nth_checked(3)?;
+		trace!(target: "wasm", "result_ptr: {:?}", result_ptr);
 
-	fn pop_u256(&self, context: &mut interpreter::CallerContext) -> Result<U256, interpreter::Error> {
-		let ptr = WasmPtr::from_i32(context.value_stack.pop_as::<i32>()?)
-			.map_err(|_| interpreter::Error::Trap("Memory access violation".to_owned()))?;
-		self.h256_at(ptr).map(Into::into)
-	}
+		let code = self.memory.get(code_ptr, code_len as usize)?;
 
-	fn address_at(&self, ptr: WasmPtr) -> Result<Address, interpreter::Error> {
-		Ok(Address::from_slice(&ptr.slice(20, &*self.memory)
-			.map_err(|_| interpreter::Error::Trap("Memory access violation".to_owned()))?
-		))
-	}
+		self.adjusted_charge(|schedule| schedule.create_gas as u64)?;
+		self.adjusted_charge(|schedule| schedule.create_data_gas as u64 * code.len() as u64)?;
+
+		let gas_left: U256 = U256::from(self.gas_left()?)
+			* U256::from(self.ext.schedule().wasm().opcodes_mul)
+			/ U256::from(self.ext.schedule().wasm().opcodes_div);
 
-	fn pop_address(&self, context: &mut interpreter::CallerContext) -> Result<Address, interpreter::Error> {
-		let ptr = WasmPtr::from_i32(context.value_stack.pop_as::<i32>()?)
-			.map_err(|_| interpreter::Error::Trap("Memory access violation".to_owned()))?;
-		self.address_at(ptr)
+		match self.ext.create(&gas_left, &endowment, &code, vm::CreateContractAddress::FromSenderAndCodeHash) {
+			vm::ContractCreateResult::Created(address, gas_left) => {
+				self.memory.set(result_ptr, &*address)?;
+				self.gas_counter = self.gas_limit -
+					// this cannot overflow, since initial gas is in [0..u64::max) range,
+					// and gas_left cannot be bigger
+					gas_left.low_u64() * self.ext.schedule().wasm().opcodes_div as u64
+						/ self.ext.schedule().wasm().opcodes_mul as u64;
+				trace!(target: "wasm", "runtime: create contract success (@{:?})", address);
+				Ok(0i32.into())
+			},
+			vm::ContractCreateResult::Failed => {
+				trace!(target: "wasm", "runtime: create contract fail");
+				Ok((-1i32).into())
+			},
+			vm::ContractCreateResult::Reverted(gas_left, _) => {
+				trace!(target: "wasm", "runtime: create contract reverted");
+				self.gas_counter = self.gas_limit -
+					// this cannot overflow, since initial gas is in [0..u64::max) range,
+					// and gas_left cannot be bigger
+					gas_left.low_u64() * self.ext.schedule().wasm().opcodes_div as u64
+						/ self.ext.schedule().wasm().opcodes_mul as u64;
+
+				Ok((-1i32).into())
+			},
+		}
 	}
 
-	fn user_trap(&mut self, _context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
+	fn debug(&mut self, args: RuntimeArgs) -> Result<()>
 	{
-		Err(interpreter::Error::Trap("unknown trap".to_owned()))
-	}
+		trace!(target: "wasm", "Contract debug message: {}", {
+			let msg_ptr: u32 = args.nth_checked(0)?;
+			let msg_len: u32 = args.nth_checked(1)?;
 
-	fn user_noop(&mut self,
-		_context: interpreter::CallerContext
-	) -> Result<Option<interpreter::RuntimeValue>, interpreter::Error> {
-		Ok(None)
-	}
+			String::from_utf8(self.memory.get(msg_ptr, msg_len as usize)?)
+				.map_err(|_| Error::BadUtf8)?
+		});
 
-	/// Write call descriptor to wasm memory
-	pub fn write_descriptor(&mut self, call_args: CallArgs) -> Result<WasmPtr, Error> {
-		let d_ptr = self.alloc(16)?;
+		Ok(())
+	}
 
-		let args_len = call_args.len();
-		let args_ptr = self.alloc(args_len)?;
+	/// Pass suicide to state runtime
+	pub fn suicide(&mut self, args: RuntimeArgs) -> Result<()>
+	{
+		let refund_address = self.address_at(args.nth_checked(0)?)?;
 
-		// write call descriptor
-		// call descriptor is [args_ptr, args_len, return_ptr, return_len]
-		//   all are 4 byte length, last 2 are zeroed
-		let mut d_buf = [0u8; 16];
-		LittleEndian::write_u32(&mut d_buf[0..4], args_ptr);
-		LittleEndian::write_u32(&mut d_buf[4..8], args_len);
-		self.memory.set(d_ptr, &d_buf)?;
+		if self.ext.exists(&refund_address).map_err(|_| Error::SuicideAbort)? {
+			trace!(target: "wasm", "Suicide: refund to existing address {}", refund_address);
+			self.adjusted_charge(|schedule| schedule.suicide_gas as u64)?;
+		} else {
+			trace!(target: "wasm", "Suicide: refund to new address {}", refund_address);
+			self.adjusted_charge(|schedule| schedule.suicide_to_new_account_cost as u64)?;
+		}
 
-		// write call args to memory
-		self.memory.set(args_ptr, &call_args.address)?;
-		self.memory.set(args_ptr+20, &call_args.sender)?;
-		self.memory.set(args_ptr+40, &call_args.origin)?;
-		self.memory.set(args_ptr+60, &call_args.value)?;
-		self.memory.set(args_ptr+92, &call_args.data)?;
+		self.ext.suicide(&refund_address).map_err(|_| Error::SuicideAbort)?;
 
-		Ok(d_ptr.into())
+		// We send trap to interpreter so it should abort further execution
+		Err(Error::Suicide.into())
 	}
 
-	fn debug_log(&mut self, context: interpreter::CallerContext)
-			-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		let msg_len = context.value_stack.pop_as::<i32>()? as u32;
-		let msg_ptr = context.value_stack.pop_as::<i32>()? as u32;
+	///	Signature: `fn blockhash(number: i64, dest: *mut u8)`
+	pub fn blockhash(&mut self, args: RuntimeArgs) -> Result<()> {
+		self.adjusted_charge(|schedule| schedule.blockhash_gas as u64)?;
+		let hash = self.ext.blockhash(&U256::from(args.nth_checked::<u64>(0)?));
+		self.memory.set(args.nth_checked(1)?, &*hash)?;
 
-		let msg = String::from_utf8(self.memory.get(msg_ptr, msg_len as usize)?)
-			.map_err(|_| interpreter::Error::Trap("Debug log utf-8 decoding error".to_owned()))?;
+		Ok(())
+	}
 
-		trace!(target: "wasm", "Contract debug message: {}", msg);
+	///	Signature: `fn blocknumber() -> i64`
+	pub fn blocknumber(&mut self) -> Result<RuntimeValue> {
+		Ok(RuntimeValue::from(self.ext.env_info().number))
+	}
 
-		Ok(None)
+	///	Signature: `fn coinbase(dest: *mut u8)`
+	pub fn coinbase(&mut self, args: RuntimeArgs) -> Result<()> {
+		let coinbase = self.ext.env_info().author;
+		self.return_address_ptr(args.nth_checked(0)?, coinbase)
 	}
 
-	/// Query current gas left for execution
-	pub fn gas_left(&self) -> Result<u64, Error> {
-		if self.gas_counter > self.gas_limit { return Err(Error::InvalidGasState); }
-		Ok(self.gas_limit - self.gas_counter)
+	///	Signature: `fn difficulty(dest: *mut u8)`
+	pub fn difficulty(&mut self, args: RuntimeArgs) -> Result<()> {
+		let difficulty = self.ext.env_info().difficulty;
+		self.return_u256_ptr(args.nth_checked(0)?, difficulty)
 	}
 
-	/// Shared memory reference
-	pub fn memory(&self) -> &interpreter::MemoryInstance {
-		&*self.memory
+	///	Signature: `fn gaslimit(dest: *mut u8)`
+	pub fn gaslimit(&mut self, args: RuntimeArgs) -> Result<()> {
+		let gas_limit = self.ext.env_info().gas_limit;
+		self.return_u256_ptr(args.nth_checked(0)?, gas_limit)
 	}
 
-	fn mem_copy(&self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		let len = context.value_stack.pop_as::<i32>()? as u32;
-		let dst = context.value_stack.pop_as::<i32>()? as u32;
-		let src = context.value_stack.pop_as::<i32>()? as u32;
+	///	Signature: `fn address(dest: *mut u8)`
+	pub fn address(&mut self, args: RuntimeArgs) -> Result<()> {
+		let address = self.context.address;
+		self.return_address_ptr(args.nth_checked(0)?, address)
+	}
 
-		let mem = self.memory().get(src, len as usize)?;
-		self.memory().set(dst, &mem)?;
+	///	Signature: `sender(dest: *mut u8)`
+	pub fn sender(&mut self, args: RuntimeArgs) -> Result<()> {
+		let sender = self.context.sender;
+		self.return_address_ptr(args.nth_checked(0)?, sender)
+	}
 
-		Ok(Some(0i32.into()))
+	///	Signature: `origin(dest: *mut u8)`
+	pub fn origin(&mut self, args: RuntimeArgs) -> Result<()> {
+		let origin = self.context.origin;
+		self.return_address_ptr(args.nth_checked(0)?, origin)
 	}
 
-	fn bswap_32(x: u32) -> u32 {
-		x >> 24 | x >> 8 & 0xff00 | x << 8 & 0xff0000 | x << 24
+	///	Signature: `timestamp() -> i64`
+	pub fn timestamp(&mut self) -> Result<RuntimeValue> {
+		let timestamp = self.ext.env_info().timestamp;
+		Ok(RuntimeValue::from(timestamp))
 	}
 
-	fn bitswap_i64(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
+	///	Signature: `fn elog(topic_ptr: *const u8, topic_count: u32, data_ptr: *const u8, data_len: u32)`
+	pub fn elog(&mut self, args: RuntimeArgs) -> Result<()>
 	{
-		let x1 = context.value_stack.pop_as::<i32>()?;
-		let x2 = context.value_stack.pop_as::<i32>()?;
-
-		let result = ((Runtime::bswap_32(x2 as u32) as u64) << 32
-			| Runtime::bswap_32(x1 as u32) as u64) as i64;
-
-		self.return_i64(result)
-	}
+		let topic_ptr: u32 = args.nth_checked(0)?;
+		let topic_count: u32 = args.nth_checked(1)?;
+		let data_ptr: u32 = args.nth_checked(2)?;
+		let data_len: u32 = args.nth_checked(3)?;
 
-	fn return_i64(&mut self, val: i64) -> Result<Option<interpreter::RuntimeValue>, interpreter::Error> {
-		let uval = val as u64;
-		let hi = (uval >> 32) as i32;
-		let lo = (uval << 32 >> 32) as i32;
+		if topic_count > 4 {
+			return Err(Error::Log.into());
+		}
 
-		let target = self.instance.module("contract")
-			.ok_or(interpreter::Error::Trap("Error locating main execution entry".to_owned()))?;
-		target.execute_export(
-			"setTempRet0",
-			self.execution_params().add_argument(
-				interpreter::RuntimeValue::I32(hi).into()
-			),
+		self.adjusted_overflow_charge(|schedule|
+			{
+				let topics_gas = schedule.log_gas as u64 + schedule.log_topic_gas as u64 * topic_count as u64;
+				(schedule.log_data_gas as u64)
+					.checked_mul(schedule.log_data_gas as u64)
+					.and_then(|data_gas| data_gas.checked_add(topics_gas))
+			}
 		)?;
-		Ok(Some(
-			(lo).into()
-		))
-	}
 
-	pub fn execution_params(&mut self) -> interpreter::ExecutionParams {
-		use super::env;
+		let mut topics: Vec<H256> = Vec::with_capacity(topic_count as usize);
+		topics.resize(topic_count as usize, H256::zero());
+		for i in 0..topic_count {
+			let offset = i.checked_mul(32).ok_or(Error::MemoryAccessViolation)?
+				.checked_add(topic_ptr).ok_or(Error::MemoryAccessViolation)?;
 
-		let env_instance = self.instance.module("env")
-			.expect("Env module always exists; qed");
+			*topics.get_mut(i as usize)
+				.expect("topics is resized to `topic_count`, i is in 0..topic count iterator, get_mut uses i as an indexer, get_mut cannot fail; qed")
+				= H256::from(&self.memory.get(offset, 32)?[..]);
+		}
+		self.ext.log(topics, &self.memory.get(data_ptr, data_len as usize)?).map_err(|_| Error::Log)?;
 
-		interpreter::ExecutionParams::with_external(
-			"env".into(),
-			Arc::new(
-				interpreter::env_native_module(env_instance, env::native_bindings(self))
-					.expect("Env module always exists; qed")
-			)
-		)
+		Ok(())
 	}
 }
 
-impl<'a, 'b> interpreter::UserFunctionExecutor for Runtime<'a, 'b> {
-	fn execute(&mut self, name: &str, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		match name {
-			"_malloc" => {
-				self.malloc(context)
-			},
-			"_free" => {
-				// Since it is arena allocator, free does nothing
-				// todo: update if changed
-				self.user_noop(context)
-			},
-			"_storage_read" => {
-				self.storage_read(context)
-			},
-			"_storage_write" => {
-				self.storage_write(context)
-			},
-			"_suicide" => {
-				self.suicide(context)
-			},
-			"_create" => {
-				self.create(context)
-			},
-			"_ccall" => {
-				self.call(context)
-			},
-			"_dcall" => {
-				self.call_code(context)
-			},
-			"_scall" => {
-			 	self.static_call(context)
-			},
-			"_debug" => {
-				self.debug_log(context)
-			},
-			"gas" => {
-				self.gas(context)
-			},
-			"_emscripten_memcpy_big" => {
-				self.mem_copy(context)
-			},
-			"_llvm_bswap_i64" => {
-				self.bitswap_i64(context)
-			},
-			_ => {
-				trace!(target: "wasm", "Trapped due to unhandled function: '{}'", name);
-				self.user_trap(context)
+mod ext_impl {
+
+	use wasmi::{Externals, RuntimeArgs, RuntimeValue, Trap};
+	use env::ids::*;
+
+	macro_rules! void {
+		{ $e: expr } => { { $e?; Ok(None) } }
+	}
+
+	macro_rules! some {
+		{ $e: expr } => { { Ok(Some($e?)) } }
+	}
+
+	macro_rules! cast {
+		{ $e: expr } => { { Ok(Some($e)) } }
+	}
+
+	impl<'a> Externals for super::Runtime<'a> {
+		fn invoke_index(
+			&mut self,
+			index: usize,
+			args: RuntimeArgs,
+		) -> Result<Option<RuntimeValue>, Trap> {
+			match index {
+				STORAGE_WRITE_FUNC => void!(self.storage_write(args)),
+				STORAGE_READ_FUNC => void!(self.storage_read(args)),
+				RET_FUNC => void!(self.ret(args)),
+				GAS_FUNC => void!(self.gas(args)),
+				INPUT_LENGTH_FUNC => cast!(self.input_legnth()),
+				FETCH_INPUT_FUNC => void!(self.fetch_input(args)),
+				PANIC_FUNC => void!(self.panic(args)),
+				DEBUG_FUNC => void!(self.debug(args)),
+				CCALL_FUNC => some!(self.ccall(args)),
+				DCALL_FUNC => some!(self.dcall(args)),
+				SCALL_FUNC => some!(self.scall(args)),
+				VALUE_FUNC => void!(self.value(args)),
+				CREATE_FUNC => some!(self.create(args)),
+				SUICIDE_FUNC => void!(self.suicide(args)),
+				BLOCKHASH_FUNC => void!(self.blockhash(args)),
+				BLOCKNUMBER_FUNC => some!(self.blocknumber()),
+				COINBASE_FUNC => void!(self.coinbase(args)),
+				DIFFICULTY_FUNC => void!(self.difficulty(args)),
+				GASLIMIT_FUNC => void!(self.gaslimit(args)),
+				TIMESTAMP_FUNC => some!(self.timestamp()),
+				ADDRESS_FUNC => void!(self.address(args)),
+				SENDER_FUNC => void!(self.sender(args)),
+				ORIGIN_FUNC => void!(self.origin(args)),
+				ELOG_FUNC => void!(self.elog(args)),
+				_ => panic!("env module doesn't provide function at index {}", index),
 			}
 		}
 	}
diff --git a/ethcore/wasm/src/tests.rs b/ethcore/wasm/src/tests.rs
index de0b528a1574cf9acc8bd57c9550298a00c04ef2..2b71a1768eb395befbb6c2d1da3b55684a1c19de 100644
--- a/ethcore/wasm/src/tests.rs
+++ b/ethcore/wasm/src/tests.rs
@@ -15,8 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::Arc;
+use std::collections::HashMap;
 use byteorder::{LittleEndian, ByteOrder};
-use util::{U256, H256, Address};
+use ethereum_types::{H256, U256, Address};
 
 use super::WasmInterpreter;
 use vm::{self, Vm, GasLeft, ActionParams, ActionValue};
@@ -28,6 +29,34 @@ macro_rules! load_sample {
 	}
 }
 
+macro_rules! reqrep_test {
+	($name: expr, $input: expr) => {
+		reqrep_test!($name, $input, vm::EnvInfo::default(), HashMap::new())
+	};
+	($name: expr, $input: expr, $info: expr, $block_hashes: expr) => {
+		{
+			::ethcore_logger::init_log();
+			let code = load_sample!($name);
+
+			let mut params = ActionParams::default();
+			params.gas = U256::from(100_000);
+			params.code = Some(Arc::new(code));
+			params.data = Some($input);
+
+			let mut fake_ext = FakeExt::new().with_wasm();
+			fake_ext.info = $info;
+			fake_ext.blockhashes = $block_hashes;
+
+			let mut interpreter = wasm_interpreter();
+			interpreter.exec(params, &mut fake_ext)
+				.map(|result| match result {
+					GasLeft::Known(_) => { panic!("Test is expected to return payload to check"); },
+					GasLeft::NeedsReturn { gas_left: gas, data: result, apply_state: _apply } => (gas, result.to_vec()),
+				})
+		}
+	};
+}
+
 fn test_finalize(res: Result<GasLeft, vm::Error>) -> Result<U256, vm::Error> {
 	match res {
 		Ok(GasLeft::Known(gas)) => Ok(gas),
@@ -37,7 +66,7 @@ fn test_finalize(res: Result<GasLeft, vm::Error>) -> Result<U256, vm::Error> {
 }
 
 fn wasm_interpreter() -> WasmInterpreter {
-	WasmInterpreter::new().expect("wasm interpreter to create without errors")
+	WasmInterpreter
 }
 
 /// Empty contract does almost nothing except producing 1 (one) local node debug log message
@@ -50,14 +79,14 @@ fn empty() {
 	params.address = address.clone();
 	params.gas = U256::from(100_000);
 	params.code = Some(Arc::new(code));
-	let mut ext = FakeExt::new();
+	let mut ext = FakeExt::new().with_wasm();
 
 	let gas_left = {
 		let mut interpreter = wasm_interpreter();
 		test_finalize(interpreter.exec(params, &mut ext)).unwrap()
 	};
 
-	assert_eq!(gas_left, U256::from(99_992));
+	assert_eq!(gas_left, U256::from(98462));
 }
 
 // This test checks if the contract deserializes payload header properly.
@@ -65,6 +94,8 @@ fn empty() {
 //   logger.wasm writes all these provided fixed header fields to some arbitrary storage keys.
 #[test]
 fn logger() {
+	::ethcore_logger::init_log();
+
 	let code = load_sample!("logger.wasm");
 	let address: Address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse().unwrap();
 	let sender: Address = "0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d".parse().unwrap();
@@ -77,15 +108,13 @@ fn logger() {
 	params.gas = U256::from(100_000);
 	params.value = ActionValue::transfer(1_000_000_000);
 	params.code = Some(Arc::new(code));
-	let mut ext = FakeExt::new();
+	let mut ext = FakeExt::new().with_wasm();
 
 	let gas_left = {
 		let mut interpreter = wasm_interpreter();
 		test_finalize(interpreter.exec(params, &mut ext)).unwrap()
 	};
 
-	println!("ext.store: {:?}", ext.store);
-	assert_eq!(gas_left, U256::from(99327));
 	let address_val: H256 = address.into();
 	assert_eq!(
 		ext.store.get(&"0100000000000000000000000000000000000000000000000000000000000000".parse().unwrap()).expect("storage key to exist"),
@@ -109,6 +138,7 @@ fn logger() {
 		U256::from(1_000_000_000),
 		"Logger sets 0x04 key to the trasferred value"
 	);
+	assert_eq!(gas_left, U256::from(17_578));
 }
 
 // This test checks if the contract can allocate memory and pass pointer to the result stream properly.
@@ -118,6 +148,8 @@ fn logger() {
 //      if it has any result.
 #[test]
 fn identity() {
+	::ethcore_logger::init_log();
+
 	let code = load_sample!("identity.wasm");
 	let sender: Address = "01030507090b0d0f11131517191b1d1f21232527".parse().unwrap();
 
@@ -125,7 +157,7 @@ fn identity() {
 	params.sender = sender.clone();
 	params.gas = U256::from(100_000);
 	params.code = Some(Arc::new(code));
-	let mut ext = FakeExt::new();
+	let mut ext = FakeExt::new().with_wasm();
 
 	let (gas_left, result) = {
 		let mut interpreter = wasm_interpreter();
@@ -136,13 +168,12 @@ fn identity() {
 		}
 	};
 
-	assert_eq!(gas_left, U256::from(99_672));
-
 	assert_eq!(
 		Address::from_slice(&result),
 		sender,
 		"Idenity test contract does not return the sender passed"
 	);
+	assert_eq!(gas_left, U256::from(98_408));
 }
 
 // Dispersion test sends byte array and expect the contract to 'disperse' the original elements with
@@ -151,6 +182,8 @@ fn identity() {
 // This also tests byte-perfect memory allocation and in/out ptr lifecycle.
 #[test]
 fn dispersion() {
+	::ethcore_logger::init_log();
+
 	let code = load_sample!("dispersion.wasm");
 
 	let mut params = ActionParams::default();
@@ -159,7 +192,7 @@ fn dispersion() {
 	params.data = Some(vec![
 		0u8, 125, 197, 255, 19
 	]);
-	let mut ext = FakeExt::new();
+	let mut ext = FakeExt::new().with_wasm();
 
 	let (gas_left, result) = {
 		let mut interpreter = wasm_interpreter();
@@ -170,12 +203,11 @@ fn dispersion() {
 		}
 	};
 
-	assert_eq!(gas_left, U256::from(99_270));
-
 	assert_eq!(
 		result,
 		vec![0u8, 0, 125, 11, 197, 7, 255, 8, 19, 0]
 	);
+	assert_eq!(gas_left, U256::from(94_013));
 }
 
 #[test]
@@ -188,7 +220,7 @@ fn suicide_not() {
 	params.data = Some(vec![
 		0u8
 	]);
-	let mut ext = FakeExt::new();
+	let mut ext = FakeExt::new().with_wasm();
 
 	let (gas_left, result) = {
 		let mut interpreter = wasm_interpreter();
@@ -199,16 +231,17 @@ fn suicide_not() {
 		}
 	};
 
-	assert_eq!(gas_left, U256::from(99_578));
-
 	assert_eq!(
 		result,
 		vec![0u8]
 	);
+	assert_eq!(gas_left, U256::from(94_984));
 }
 
 #[test]
 fn suicide() {
+	::ethcore_logger::init_log();
+
 	let code = load_sample!("suicidal.wasm");
 
 	let refund: Address = "01030507090b0d0f11131517191b1d1f21232527".parse().unwrap();
@@ -220,7 +253,7 @@ fn suicide() {
 	args.extend(refund.to_vec());
 	params.data = Some(args);
 
-	let mut ext = FakeExt::new();
+	let mut ext = FakeExt::new().with_wasm();
 
 	let gas_left = {
 		let mut interpreter = wasm_interpreter();
@@ -233,8 +266,8 @@ fn suicide() {
 		}
 	};
 
-	assert_eq!(gas_left, U256::from(99_621));
 	assert!(ext.suicides.contains(&refund));
+	assert_eq!(gas_left, U256::from(94_925));
 }
 
 #[test]
@@ -247,7 +280,7 @@ fn create() {
 	params.data = Some(vec![0u8, 2, 4, 8, 16, 32, 64, 128]);
 	params.value = ActionValue::transfer(1_000_000_000);
 
-	let mut ext = FakeExt::new();
+	let mut ext = FakeExt::new().with_wasm();
 
 	let gas_left = {
 		let mut interpreter = wasm_interpreter();
@@ -264,7 +297,7 @@ fn create() {
 	assert!(ext.calls.contains(
 		&FakeCall {
 			call_type: FakeCallType::Create,
-			gas: U256::from(99_674),
+			gas: U256::from(60_914),
 			sender_address: None,
 			receive_address: None,
 			value: Some(1_000_000_000.into()),
@@ -272,9 +305,52 @@ fn create() {
 			code_address: None,
 		}
 	));
-	assert_eq!(gas_left, U256::from(99_596));
+	assert_eq!(gas_left, U256::from(60_900));
 }
 
+#[test]
+fn call_msg() {
+	::ethcore_logger::init_log();
+
+	let sender: Address = "01030507090b0d0f11131517191b1d1f21232527".parse().unwrap();
+	let receiver: Address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse().unwrap();
+	let contract_address: Address = "0d461d4174b4ae35775c4a342f1e5e1e4e6c4db5".parse().unwrap();
+
+	let mut params = ActionParams::default();
+	params.sender = sender.clone();
+	params.address = receiver.clone();
+	params.code_address = contract_address.clone();
+	params.gas = U256::from(100_000);
+	params.code = Some(Arc::new(load_sample!("call.wasm")));
+	params.data = Some(Vec::new());
+
+	let mut ext = FakeExt::new().with_wasm();
+	ext.balances.insert(receiver.clone(), U256::from(10000000000u64));
+
+	let gas_left = {
+		let mut interpreter = wasm_interpreter();
+		let result = interpreter.exec(params, &mut ext).expect("Interpreter to execute without any errors");
+		match result {
+			GasLeft::Known(gas_left) => gas_left,
+			GasLeft::NeedsReturn { .. } => { panic!("Call test should not return payload"); },
+		}
+	};
+
+	trace!(target: "wasm", "fake_calls: {:?}", &ext.calls);
+	assert!(ext.calls.contains(
+		&FakeCall {
+			call_type: FakeCallType::Call,
+			gas: U256::from(33_000),
+			sender_address: Some(receiver),
+			receive_address: Some(Address::from([99, 88, 77, 66, 55, 44, 33, 22, 11, 0, 11, 22, 33, 44, 55, 66, 77, 88, 99, 0])),
+			value: Some(1000000000.into()),
+			data: vec![129u8, 123, 113, 107, 101, 97],
+			code_address: Some(Address::from([99, 88, 77, 66, 55, 44, 33, 22, 11, 0, 11, 22, 33, 44, 55, 66, 77, 88, 99, 0])),
+		}
+	));
+
+	assert_eq!(gas_left, U256::from(93_511));
+}
 
 #[test]
 fn call_code() {
@@ -291,7 +367,7 @@ fn call_code() {
 	params.data = Some(Vec::new());
 	params.value = ActionValue::transfer(1_000_000_000);
 
-	let mut ext = FakeExt::new();
+	let mut ext = FakeExt::new().with_wasm();
 
 	let (gas_left, result) = {
 		let mut interpreter = wasm_interpreter();
@@ -306,7 +382,7 @@ fn call_code() {
 	assert!(ext.calls.contains(
 		&FakeCall {
 			call_type: FakeCallType::Call,
-			gas: U256::from(99_069),
+			gas: U256::from(20_000),
 			sender_address: Some(sender),
 			receive_address: Some(receiver),
 			value: None,
@@ -314,11 +390,11 @@ fn call_code() {
 			code_address: Some("0d13710000000000000000000000000000000000".parse().unwrap()),
 		}
 	));
-	assert_eq!(gas_left, U256::from(94144));
 
 	// siphash result
 	let res = LittleEndian::read_u32(&result[..]);
 	assert_eq!(res, 4198595614);
+	assert_eq!(gas_left, U256::from(92_381));
 }
 
 #[test]
@@ -327,6 +403,7 @@ fn call_static() {
 
 	let sender: Address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse().unwrap();
 	let receiver: Address = "01030507090b0d0f11131517191b1d1f21232527".parse().unwrap();
+	let contract_address: Address = "0d461d4174b4ae35775c4a342f1e5e1e4e6c4db5".parse().unwrap();
 
 	let mut params = ActionParams::default();
 	params.sender = sender.clone();
@@ -335,8 +412,9 @@ fn call_static() {
 	params.code = Some(Arc::new(load_sample!("call_static.wasm")));
 	params.data = Some(Vec::new());
 	params.value = ActionValue::transfer(1_000_000_000);
+	params.code_address = contract_address.clone();
 
-	let mut ext = FakeExt::new();
+	let mut ext = FakeExt::new().with_wasm();
 
 	let (gas_left, result) = {
 		let mut interpreter = wasm_interpreter();
@@ -351,19 +429,20 @@ fn call_static() {
 	assert!(ext.calls.contains(
 		&FakeCall {
 			call_type: FakeCallType::Call,
-			gas: U256::from(99_069),
-			sender_address: Some(sender),
-			receive_address: Some(receiver),
+			gas: U256::from(20_000),
+			sender_address: Some(receiver),
+			receive_address: Some("13077bfb00000000000000000000000000000000".parse().unwrap()),
 			value: None,
 			data: vec![1u8, 2, 3, 5, 7, 11],
 			code_address: Some("13077bfb00000000000000000000000000000000".parse().unwrap()),
 		}
 	));
-	assert_eq!(gas_left, U256::from(94144));
 
 	// siphash result
 	let res = LittleEndian::read_u32(&result[..]);
 	assert_eq!(res, 317632590);
+
+	assert_eq!(gas_left, U256::from(92_381));
 }
 
 // Realloc test
@@ -375,7 +454,7 @@ fn realloc() {
 	params.gas = U256::from(100_000);
 	params.code = Some(Arc::new(code));
 	params.data = Some(vec![0u8]);
-	let mut ext = FakeExt::new();
+	let mut ext = FakeExt::new().with_wasm();
 
 	let (gas_left, result) = {
 		let mut interpreter = wasm_interpreter();
@@ -385,21 +464,45 @@ fn realloc() {
 				GasLeft::NeedsReturn { gas_left: gas, data: result, apply_state: _apply } => (gas, result.to_vec()),
 		}
 	};
-	assert_eq!(gas_left, U256::from(99432));
 	assert_eq!(result, vec![0u8; 2]);
+	assert_eq!(gas_left, U256::from(94_372));
+}
+
+#[test]
+fn alloc() {
+	let code = load_sample!("alloc.wasm");
+
+	let mut params = ActionParams::default();
+	params.gas = U256::from(10_000_000);
+	params.code = Some(Arc::new(code));
+	params.data = Some(vec![0u8]);
+	let mut ext = FakeExt::new().with_wasm();
+
+	let (gas_left, result) = {
+		let mut interpreter = wasm_interpreter();
+		let result = interpreter.exec(params, &mut ext).expect("Interpreter to execute without any errors");
+		match result {
+				GasLeft::Known(_) => { panic!("alloc test should return payload"); },
+				GasLeft::NeedsReturn { gas_left: gas, data: result, apply_state: _apply } => (gas, result.to_vec()),
+		}
+	};
+	assert_eq!(result, vec![5u8; 1024*450]);
+	assert_eq!(gas_left, U256::from(6_506_844));
 }
 
 // Tests that contract's ability to read from a storage
 // Test prepopulates address into storage, than executes a contract which read that address from storage and write this address into result
 #[test]
 fn storage_read() {
+	::ethcore_logger::init_log();
+
 	let code = load_sample!("storage_read.wasm");
 	let address: Address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse().unwrap();
 
 	let mut params = ActionParams::default();
 	params.gas = U256::from(100_000);
 	params.code = Some(Arc::new(code));
-	let mut ext = FakeExt::new();
+	let mut ext = FakeExt::new().with_wasm();
 	ext.store.insert("0100000000000000000000000000000000000000000000000000000000000000".into(), address.into());
 
 	let (gas_left, result) = {
@@ -411,33 +514,34 @@ fn storage_read() {
 		}
 	};
 
-	assert_eq!(gas_left, U256::from(99682));
 	assert_eq!(Address::from(&result[12..32]), address);
+	assert_eq!(gas_left, U256::from(98_298));
 }
 
-macro_rules! reqrep_test {
-	($name: expr, $input: expr) => {
-		{
-			::ethcore_logger::init_log();
-			let code = load_sample!($name);
-
-			let mut params = ActionParams::default();
-			params.gas = U256::from(100_000);
-			params.code = Some(Arc::new(code));
-			params.data = Some($input);
+// Tests keccak calculation
+// keccak.wasm runs wasm-std::keccak function on data param and returns hash
+#[test]
+fn keccak() {
+	::ethcore_logger::init_log();
+	let code = load_sample!("keccak.wasm");
 
-			let (gas_left, result) = {
-				let mut interpreter = wasm_interpreter();
-				let result = interpreter.exec(params, &mut FakeExt::new()).expect("Interpreter to execute without any errors");
-				match result {
-						GasLeft::Known(_) => { panic!("Test is expected to return payload to check"); },
-						GasLeft::NeedsReturn { gas_left: gas, data: result, apply_state: _apply } => (gas, result.to_vec()),
-				}
-			};
+	let mut params = ActionParams::default();
+	params.gas = U256::from(100_000);
+	params.code = Some(Arc::new(code));
+	params.data = Some(b"something".to_vec());
+	let mut ext = FakeExt::new().with_wasm();
 
-			(gas_left, result)
+	let (gas_left, result) = {
+		let mut interpreter = wasm_interpreter();
+		let result = interpreter.exec(params, &mut ext).expect("Interpreter to execute without any errors");
+		match result {
+				GasLeft::Known(_) => { panic!("keccak should return payload"); },
+				GasLeft::NeedsReturn { gas_left: gas, data: result, apply_state: _apply } => (gas, result.to_vec()),
 		}
-	}
+	};
+
+	assert_eq!(H256::from_slice(&result), H256::from("68371d7e884c168ae2022c82bd837d51837718a7f7dfb7aa3f753074a35e1d87"));
+	assert_eq!(gas_left, U256::from(84_240));
 }
 
 // math_* tests check the ability of wasm contract to perform big integer operations
@@ -460,13 +564,13 @@ fn math_add() {
 			arg_b.to_big_endian(&mut args[33..65]);
 			args.to_vec()
 		}
-	);
+	).expect("Interpreter to execute without any errors");
 
-	assert_eq!(gas_left, U256::from(98087));
 	assert_eq!(
 		U256::from_dec_str("1888888888888888888888888888887").unwrap(),
 		(&result[..]).into()
 	);
+	assert_eq!(gas_left, U256::from(93_814));
 }
 
 // multiplication
@@ -482,16 +586,16 @@ fn math_mul() {
 			arg_b.to_big_endian(&mut args[33..65]);
 			args.to_vec()
 		}
-	);
+	).expect("Interpreter to execute without any errors");
 
-	assert_eq!(gas_left, U256::from(97236));
 	assert_eq!(
 		U256::from_dec_str("888888888888888888888888888887111111111111111111111111111112").unwrap(),
 		(&result[..]).into()
 	);
+	assert_eq!(gas_left, U256::from(93_300));
 }
 
-// substraction
+// subtraction
 #[test]
 fn math_sub() {
 	let (gas_left, result) = reqrep_test!(
@@ -504,13 +608,34 @@ fn math_sub() {
 			arg_b.to_big_endian(&mut args[33..65]);
 			args.to_vec()
 		}
-	);
+	).expect("Interpreter to execute without any errors");
 
-	assert_eq!(gas_left, U256::from(98131));
 	assert_eq!(
 		U256::from_dec_str("111111111111111111111111111111").unwrap(),
 		(&result[..]).into()
 	);
+	assert_eq!(gas_left, U256::from(93_826));
+}
+
+// subtraction with overflow
+#[test]
+fn math_sub_with_overflow() {
+	let result = reqrep_test!(
+		"math.wasm",
+		{
+			let mut args = [2u8; 65];
+			let arg_a = U256::from_dec_str("888888888888888888888888888888").unwrap();
+			let arg_b = U256::from_dec_str("999999999999999999999999999999").unwrap();
+			arg_a.to_big_endian(&mut args[1..33]);
+			arg_b.to_big_endian(&mut args[33..65]);
+			args.to_vec()
+		}
+	);
+
+	match result {
+		Err(vm::Error::Wasm(_)) => {},
+		_ => panic!("Unexpected result {:?}", result),
+	}
 }
 
 #[test]
@@ -525,11 +650,207 @@ fn math_div() {
 			arg_b.to_big_endian(&mut args[33..65]);
 			args.to_vec()
 		}
-	);
+	).expect("Interpreter to execute without any errors");
 
-	assert_eq!(gas_left, U256::from(91420));
 	assert_eq!(
 		U256::from_dec_str("1125000").unwrap(),
 		(&result[..]).into()
 	);
+	assert_eq!(gas_left, U256::from(90_603));
+}
+
+#[test]
+fn storage_metering() {
+	::ethcore_logger::init_log();
+
+	// #1
+	let mut ext = FakeExt::new().with_wasm();
+
+	let code = Arc::new(load_sample!("setter.wasm"));
+	let address: Address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse().unwrap();
+
+	let mut params = ActionParams::default();
+	params.address = address.clone();
+	params.gas = U256::from(100_000);
+	params.code = Some(code.clone());
+	params.data = Some(vec![
+		0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d,
+		0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+	]);
+
+	let gas_left = {
+		let mut interpreter = wasm_interpreter();
+		test_finalize(interpreter.exec(params, &mut ext)).unwrap()
+	};
+
+	// 0 -> not 0
+	assert_eq!(gas_left, U256::from(74_338));
+
+	// #2
+
+	let mut params = ActionParams::default();
+	params.address = address.clone();
+	params.gas = U256::from(100_000);
+	params.code = Some(code.clone());
+	params.data = Some(vec![
+		0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d,
+		0x6b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+	]);
+
+	let gas_left = {
+		let mut interpreter = wasm_interpreter();
+		test_finalize(interpreter.exec(params, &mut ext)).unwrap()
+	};
+
+	// not 0 -> not 0
+	assert_eq!(gas_left, U256::from(89_338));
+}
+
+// This test checks the ability of wasm contract to invoke
+// varios blockchain runtime methods
+#[test]
+fn externs() {
+	let (gas_left, result) = reqrep_test!(
+		"externs.wasm",
+		Vec::new(),
+		vm::EnvInfo {
+			number: 0x9999999999u64.into(),
+			author: "efefefefefefefefefefefefefefefefefefefef".parse().unwrap(),
+			timestamp: 0x8888888888u64.into(),
+			difficulty: H256::from("0f1f2f3f4f5f6f7f8f9fafbfcfdfefff0d1d2d3d4d5d6d7d8d9dadbdcdddedfd").into(),
+			gas_limit: 0x777777777777u64.into(),
+			last_hashes: Default::default(),
+			gas_used: 0.into(),
+		},
+		{
+			let mut hashes = HashMap::new();
+			hashes.insert(
+				U256::from(0),
+				H256::from("9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d")
+			);
+			hashes.insert(
+				U256::from(1),
+				H256::from("7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b")
+			);
+			hashes
+		}
+	).expect("Interpreter to execute without any errors");
+
+	assert_eq!(
+		&result[0..64].to_vec(),
+		&vec![
+			0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d, 0x9d,
+			0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+		],
+		"Block hashes requested and returned do not match"
+	);
+
+	assert_eq!(
+		&result[64..84].to_vec(),
+		&vec![
+			0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef,
+		],
+		"Coinbase requested and returned does not match"
+	);
+
+	assert_eq!(
+		&result[84..92].to_vec(),
+		&vec![
+			0x88, 0x88, 0x88, 0x88, 0x88, 0x00, 0x00, 0x00
+		],
+		"Timestamp requested and returned does not match"
+	);
+
+	assert_eq!(
+		&result[92..100].to_vec(),
+		&vec![
+			0x99, 0x99, 0x99, 0x99, 0x99, 0x00, 0x00, 0x00
+		],
+		"Block number requested and returned does not match"
+	);
+
+	assert_eq!(
+		&result[100..132].to_vec(),
+		&vec![
+			0x0f, 0x1f, 0x2f, 0x3f, 0x4f, 0x5f, 0x6f, 0x7f,
+			0x8f, 0x9f, 0xaf, 0xbf, 0xcf, 0xdf, 0xef, 0xff,
+			0x0d, 0x1d, 0x2d, 0x3d, 0x4d, 0x5d, 0x6d, 0x7d,
+			0x8d, 0x9d, 0xad, 0xbd, 0xcd, 0xdd, 0xed, 0xfd,
+		],
+		"Difficulty requested and returned does not match"
+	);
+
+	assert_eq!(
+		&result[132..164].to_vec(),
+		&vec![
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+		],
+		"Gas limit requested and returned does not match"
+	);
+
+	assert_eq!(gas_left, U256::from(92_110));
+}
+
+#[test]
+fn embedded_keccak() {
+	::ethcore_logger::init_log();
+	let mut code = load_sample!("keccak.wasm");
+	code.extend_from_slice(b"something");
+
+	let mut params = ActionParams::default();
+	params.gas = U256::from(100_000);
+	params.code = Some(Arc::new(code));
+	params.params_type = vm::ParamsType::Embedded;
+
+	let mut ext = FakeExt::new().with_wasm();
+
+	let (gas_left, result) = {
+		let mut interpreter = wasm_interpreter();
+		let result = interpreter.exec(params, &mut ext).expect("Interpreter to execute without any errors");
+		match result {
+			GasLeft::Known(_) => { panic!("keccak should return payload"); },
+			GasLeft::NeedsReturn { gas_left: gas, data: result, apply_state: _apply } => (gas, result.to_vec()),
+		}
+	};
+
+	assert_eq!(H256::from_slice(&result), H256::from("68371d7e884c168ae2022c82bd837d51837718a7f7dfb7aa3f753074a35e1d87"));
+	assert_eq!(gas_left, U256::from(84_240));
+}
+
+/// This test checks the correctness of log extern
+/// Target test puts one event with two topic [keccak(input), reverse(keccak(input))]
+/// and reversed input as a data
+#[test]
+fn events() {
+	::ethcore_logger::init_log();
+	let code = load_sample!("events.wasm");
+
+	let mut params = ActionParams::default();
+	params.gas = U256::from(100_000);
+	params.code = Some(Arc::new(code));
+	params.data = Some(b"something".to_vec());
+
+	let mut ext = FakeExt::new().with_wasm();
+
+	let (gas_left, result) = {
+		let mut interpreter = wasm_interpreter();
+		let result = interpreter.exec(params, &mut ext).expect("Interpreter to execute without any errors");
+		match result {
+			GasLeft::Known(_) => { panic!("events should return payload"); },
+			GasLeft::NeedsReturn { gas_left: gas, data: result, apply_state: _apply } => (gas, result.to_vec()),
+		}
+	};
+
+	assert_eq!(ext.logs.len(), 1);
+	let log_entry = &ext.logs[0];
+	assert_eq!(log_entry.topics.len(), 2);
+	assert_eq!(&log_entry.topics[0], &H256::from("68371d7e884c168ae2022c82bd837d51837718a7f7dfb7aa3f753074a35e1d87"));
+	assert_eq!(&log_entry.topics[1], &H256::from("871d5ea37430753faab7dff7a7187783517d83bd822c02e28a164c887e1d3768"));
+	assert_eq!(&log_entry.data, b"gnihtemos");
+
+	assert_eq!(&result, b"gnihtemos");
+	assert_eq!(gas_left, U256::from(81_292));
 }
diff --git a/ethcrypto/Cargo.toml b/ethcrypto/Cargo.toml
index a84032f2624705b72b98dcb6d56eebb3ac62dab2..dfa351023cd1dce00acb8d57937c20028247d438 100644
--- a/ethcrypto/Cargo.toml
+++ b/ethcrypto/Cargo.toml
@@ -6,7 +6,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 rust-crypto = "0.2.36"
 tiny-keccak = "1.3"
-eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
-ethkey = { path = "../ethkey" }
-ethcore-bigint = { path = "../util/bigint" }
-subtle = "0.1"
+eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1", optional = true }
+ethkey = { path = "../ethkey", optional = true }
+ethereum-types = "0.2"
+subtle = "0.5"
+
+[features]
+default = ["secp256k1"]
+secp256k1 = ["eth-secp256k1", "ethkey"]
diff --git a/ethcrypto/README.md b/ethcrypto/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..130d27f3ccb65cc6fd4c2bd569acc9575f34dcd9
--- /dev/null
+++ b/ethcrypto/README.md
@@ -0,0 +1,5 @@
+# Ethcrypto
+
+General cryptographic utilities for Ethereum.
+
+By default, this library is compiled with the `secp256k1` feature, which provides ECDH and ECIES capability on that curve. It can be compiled without to avoid a dependency on the `libsecp256k1` library.
diff --git a/ethcrypto/src/lib.rs b/ethcrypto/src/lib.rs
index 3d34a7975bb2edf6827b19e6d1ce23ac97405d6c..caa4cf77c4d80bfde6824fe5e1c8c4de00ce9b11 100644
--- a/ethcrypto/src/lib.rs
+++ b/ethcrypto/src/lib.rs
@@ -17,18 +17,23 @@
 //! Crypto utils used ethstore and network.
 
 extern crate crypto as rcrypto;
-extern crate ethcore_bigint as bigint;
-extern crate ethkey;
-extern crate secp256k1;
+extern crate ethereum_types;
 extern crate subtle;
 extern crate tiny_keccak;
 
+#[cfg(feature = "secp256k1")]
+extern crate secp256k1;
+#[cfg(feature = "secp256k1")]
+extern crate ethkey;
+
 use std::fmt;
 use tiny_keccak::Keccak;
 use rcrypto::pbkdf2::pbkdf2;
 use rcrypto::scrypt::{scrypt, ScryptParams};
 use rcrypto::sha2::Sha256;
 use rcrypto::hmac::Hmac;
+
+#[cfg(feature = "secp256k1")]
 use secp256k1::Error as SecpError;
 
 pub const KEY_LENGTH: usize = 32;
@@ -59,6 +64,7 @@ impl fmt::Display for ScryptError {
 
 #[derive(PartialEq, Debug)]
 pub enum Error {
+	#[cfg(feature = "secp256k1")]
 	Secp(SecpError),
 	Scrypt(ScryptError),
 	InvalidMessage,
@@ -73,6 +79,7 @@ impl From<ScryptError> for Error {
 impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
 		let s = match *self {
+			#[cfg(feature = "secp256k1")]
 			Error::Secp(ref err) => err.to_string(),
 			Error::Scrypt(ref err) => err.to_string(),
 			Error::InvalidMessage => "Invalid message".into(),
@@ -88,6 +95,7 @@ impl Into<String> for Error {
 	}
 }
 
+#[cfg(feature = "secp256k1")]
 impl From<SecpError> for Error {
 	fn from(e: SecpError) -> Self {
 		Error::Secp(e)
@@ -174,7 +182,7 @@ pub mod aes {
 }
 
 /// ECDH functions
-#[cfg_attr(feature="dev", allow(similar_names))]
+#[cfg(feature = "secp256k1")]
 pub mod ecdh {
 	use secp256k1::{ecdh, key, Error as SecpError};
 	use ethkey::{Secret, Public, SECP256K1};
@@ -199,15 +207,15 @@ pub mod ecdh {
 }
 
 /// ECIES function
-#[cfg_attr(feature="dev", allow(similar_names))]
+#[cfg(feature = "secp256k1")]
 pub mod ecies {
 	use rcrypto::digest::Digest;
 	use rcrypto::sha2::Sha256;
 	use rcrypto::hmac::Hmac;
 	use rcrypto::mac::Mac;
-	use bigint::hash::H128;
+	use ethereum_types::H128;
 	use ethkey::{Random, Generator, Public, Secret};
-	use {Error, ecdh, aes, Keccak256};
+	use {Error, ecdh, aes};
 
 	/// Encrypt a message with a public key, writing an HMAC covering both
 	/// the plaintext and authenticated data.
@@ -227,7 +235,7 @@ pub mod ecies {
 		hasher.result(&mut mkey);
 		let ekey = &key[0..16];
 
-		let mut msg = vec![0u8; (1 + 64 + 16 + plain.len() + 32)];
+		let mut msg = vec![0u8; 1 + 64 + 16 + plain.len() + 32];
 		msg[0] = 0x04u8;
 		{
 			let msgd = &mut msg[1..];
@@ -249,33 +257,6 @@ pub mod ecies {
 		Ok(msg)
 	}
 
-	/// Encrypt a message with a public key and no HMAC
-	pub fn encrypt_single_message(public: &Public, plain: &[u8]) -> Result<Vec<u8>, Error> {
-		let r = Random.generate()
-			.expect("context known to have key-generation capabilities");
-
-		let z = ecdh::agree(r.secret(), public)?;
-		let mut key = [0u8; 32];
-		let mut mkey = [0u8; 32];
-		kdf(&z, &[0u8; 0], &mut key);
-		let mut hasher = Sha256::new();
-		let mkey_material = &key[16..32];
-		hasher.input(mkey_material);
-		hasher.result(&mut mkey);
-		let ekey = &key[0..16];
-
-		let mut msgd = vec![0u8; (64 + plain.len())];
-		{
-			r.public().copy_to(&mut msgd[0..64]);
-			let iv = H128::from_slice(&z.keccak256()[0..16]);
-			{
-				let cipher = &mut msgd[64..(64 + plain.len())];
-				aes::encrypt(ekey, &iv, plain, cipher);
-			}
-		}
-		Ok(msgd)
-	}
-
 	/// Decrypt a message with a secret key, checking HMAC for ciphertext
 	/// and authenticated data validity.
 	pub fn decrypt(secret: &Secret, auth_data: &[u8], encrypted: &[u8]) -> Result<Vec<u8>, Error> {
@@ -310,7 +291,7 @@ pub mod ecies {
 		hmac.raw_result(&mut mac);
 
 		// constant time compare to avoid timing attack.
-		if ::subtle::arrays_equal(&mac[..], msg_mac) != 1 {
+		if ::subtle::slices_equal(&mac[..], msg_mac) != 1 {
 			return Err(Error::InvalidMessage);
 		}
 
@@ -319,33 +300,6 @@ pub mod ecies {
 		Ok(msg)
 	}
 
-	/// Decrypt single message with a secret key and no HMAC.
-	pub fn decrypt_single_message(secret: &Secret, encrypted: &[u8]) -> Result<Vec<u8>, Error> {
-		let meta_len = 64;
-		if encrypted.len() < meta_len {
-			return Err(Error::InvalidMessage); //invalid message: publickey
-		}
-
-		let e = encrypted;
-		let p = Public::from_slice(&e[0..64]);
-		let z = ecdh::agree(secret, &p)?;
-		let mut key = [0u8; 32];
-		kdf(&z, &[0u8; 0], &mut key);
-		let ekey = &key[0..16];
-		let mkey_material = &key[16..32];
-		let mut hasher = Sha256::new();
-		let mut mkey = [0u8; 32];
-		hasher.input(mkey_material);
-		hasher.result(&mut mkey);
-
-		let clen = encrypted.len() - meta_len;
-		let cipher = &e[64..(64+clen)];
-		let mut msg = vec![0u8; clen];
-		let iv = H128::from_slice(&z.keccak256()[0..16]);
-		aes::decrypt(ekey, &iv, cipher, &mut msg[..]);
-		Ok(msg)
-	}
-
 	fn kdf(secret: &Secret, s1: &[u8], dest: &mut [u8]) {
 		let mut hasher = Sha256::new();
 		// SEC/ISO/Shoup specify counter size SHOULD be equivalent
@@ -386,15 +340,5 @@ mod tests {
 		let decrypted = ecies::decrypt(kp.secret(), shared, &encrypted).unwrap();
 		assert_eq!(decrypted[..message.len()], message[..]);
 	}
-
-	#[test]
-	fn ecies_shared_single() {
-		let kp = Random.generate().unwrap();
-		let message = b"So many books, so little time";
-		let encrypted = ecies::encrypt_single_message(kp.public(), message).unwrap();
-		assert!(encrypted[..] != message[..]);
-		let decrypted = ecies::decrypt_single_message(kp.secret(), &encrypted).unwrap();
-		assert_eq!(decrypted[..message.len()], message[..]);
-	}
 }
 
diff --git a/ethkey/Cargo.toml b/ethkey/Cargo.toml
index 519accadfe1eb86c462646e0c1b4bee6900920d3..a3e903271beab2208671c744479261ac170424af 100644
--- a/ethkey/Cargo.toml
+++ b/ethkey/Cargo.toml
@@ -1,14 +1,17 @@
 [package]
 name = "ethkey"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-rand = "0.3.14"
-lazy_static = "0.2"
-tiny-keccak = "1.3"
+byteorder = "1.0"
+edit-distance = "2.0"
 eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
-rustc-hex = "1.0"
-ethcore-bigint = { path = "../util/bigint" }
+ethereum-types = "0.2"
+lazy_static = "1.0"
+log = "0.3"
+parity-wordlist = "1.2"
+rand = "0.4"
 rust-crypto = "0.2"
-byteorder = "1.0"
+rustc-hex = "1.0"
+tiny-keccak = "1.3"
diff --git a/ethkey/README.md b/ethkey/README.md
index 3886338ea83118baae61ae9693c2c9d0366b7658..12161b3770db43acdf2ccfc4e4c1409da9ba9485 100644
--- a/ethkey/README.md
+++ b/ethkey/README.md
@@ -16,13 +16,13 @@ Ethereum keys generator.
   Copyright 2016, 2017 Parity Technologies (UK) Ltd
 
 Usage:
-    ethkey info <secret> [options]
+    ethkey info <secret-or-phrase> [options]
     ethkey generate random [options]
-    ethkey generate prefix <prefix> <iterations> [options]
-    ethkey generate brain <seed> [options]
+    ethkey generate prefix <prefix> [options]
     ethkey sign <secret> <message>
     ethkey verify public <public> <signature> <message>
     ethkey verify address <address> <signature> <message>
+    ethkey recover <address> <known-phrase>
     ethkey [-h | --help]
 
 Options:
@@ -30,15 +30,15 @@ Options:
     -s, --secret       Display only the secret.
     -p, --public       Display only the public.
     -a, --address      Display only the address.
+    -b, --brain        Use parity brain wallet algorithm.
 
 Commands:
     info               Display public and address of the secret.
-    generate           Generates new ethereum key.
-    random             Random generation.
-    prefix             Random generation, but address must start with a prefix
-    brain              Generate new key from string seed.
+    generate random    Generates new random ethereum key.
+    generate prefix    Random generation, but address must start with a prefix.
     sign               Sign message using secret.
     verify             Verify signer of the signature.
+    recover            Try to find brain phrase matching given address from partial phrase.
 ```
 
 ### Examples
@@ -60,20 +60,22 @@ address: 26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5
 
 --
 
-#### `generate brain <seed>`
-*Generate new brain-wallet keypair using 16384 iterations.*
 
-- `<seed>` - brain-wallet seed, any string
+#### `info --brain <phrase>`
+*Display info about private key generate from brain wallet recovery phrase.*
 
+- `<phrase>` - Parity recovery phrase, 12 words
 
 ```
-ethkey generate brain "this is sparta"
+ethkey info --brain "this is sparta"
 ```
 
 ```
-secret:  17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55
-public:  689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124
-address: 26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5
+The recover phrase was not generated by Parity: The word 'this' does not come from the dictionary.
+
+secret:  aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2
+public:  c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4
+address: 006e27b6a72e1f34c626762f3c4761547aff1421
 ```
 
 --
@@ -93,14 +95,30 @@ address: a8fa5dd30a87bb9e3288d604eb74949c515ab66e
 
 --
 
-#### `generate prefix <prefix> <iterations>`
+#### `generate random --brain`
+*Generate new keypair with recovery phrase randomly.*
+
+```
+ethkey generate random --brain
+```
+
+```
+recovery phrase: thwarting scandal creamer nuzzle asparagus blast crouch trusting anytime elixir frenzied octagon
+secret:  001ce488d50d2f7579dc190c4655f32918d505cee3de63bddc7101bc91c0c2f0
+public:  4e19a5fdae82596e1485c69b687c9cc52b5078e5b0668ef3ce8543cd90e712cb00df822489bc1f1dcb3623538a54476c7b3def44e1a51dc174e86448b63f42d0
+address: 00cf3711cbd3a1512570639280758118ba0b2bcb
+```
+
+
+--
+
+#### `generate prefix <prefix>`
 *Generate new keypair randomly with address starting with prefix.*
 
 - `<prefix>` - desired address prefix, 0 - 32 bytes long.
-- `<iterations>` - maximum number of tries before generation is assumed to be a failure.
 
 ```
-ethkey generate prefix ff 1000
+ethkey generate prefix ff
 ```
 
 ```
@@ -111,6 +129,24 @@ address: fff7e25dff2aa60f61f9d98130c8646a01f31649
 
 --
 
+#### `generate prefix --brain <prefix>`
+*Generate new keypair with recovery phrase randomly with address starting with prefix.*
+
+- `<prefix>` - desired address prefix, 0 - 32 bytes long.
+
+```
+ethkey generate prefix --brain 00cf
+```
+
+```
+recovery phrase: thwarting scandal creamer nuzzle asparagus blast crouch trusting anytime elixir frenzied octagon
+secret:  001ce488d50d2f7579dc190c4655f32918d505cee3de63bddc7101bc91c0c2f0
+public:  4e19a5fdae82596e1485c69b687c9cc52b5078e5b0668ef3ce8543cd90e712cb00df822489bc1f1dcb3623538a54476c7b3def44e1a51dc174e86448b63f42d0
+address: 00cf3711cbd3a1512570639280758118ba0b2bcb
+```
+
+--
+
 #### `sign <secret> <message>`
 *Sign a message with a secret.*
 
@@ -159,9 +195,32 @@ ethkey verify address 689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6
 true
 ```
 
+--
+
+#### `recover <address> <known-phrase>`
+*Try to recover an account given expected address and partial (too short or with invalid words) recovery phrase.*
+
+- `<address>` - ethereum address, 20 bytes long
+- `<known-phrase>` - known phrase, can be in a form of `thwarting * creamer`
+
+```
+RUST_LOG="info" ethkey recover "00cf3711cbd3a1512570639280758118ba0b2bcb" "thwarting scandal creamer nuzzle asparagus blast crouch trusting anytime elixir frenzied octag"
+```
+
+```
+INFO:ethkey::brain_recover: Invalid word 'octag', looking for potential substitutions.
+INFO:ethkey::brain_recover: Closest words: ["ocean", "octagon", "octane", "outage", "tag", "acting", "acts", "aorta", "cage", "chug"]
+INFO:ethkey::brain_recover: Starting to test 7776 possible combinations.
+
+thwarting scandal creamer nuzzle asparagus blast crouch trusting anytime elixir frenzied octagon
+secret:  001ce488d50d2f7579dc190c4655f32918d505cee3de63bddc7101bc91c0c2f0
+public:  4e19a5fdae82596e1485c69b687c9cc52b5078e5b0668ef3ce8543cd90e712cb00df822489bc1f1dcb3623538a54476c7b3def44e1a51dc174e86448b63f42d0
+address: 00cf3711cbd3a1512570639280758118ba0b2bcb
+```
+
 
-# Ethcore toolchain
-*this project is a part of the ethcore toolchain*
+# Parity toolchain
+*this project is a part of the parity toolchain*
 
 - [**ethkey**](https://github.com/paritytech/ethkey) - Ethereum keys generator and signer.
 - [**ethstore**](https://github.com/paritytech/ethstore) - Ethereum key management.
diff --git a/ethkey/cli/Cargo.toml b/ethkey/cli/Cargo.toml
index 6921af745f4fccdbd556b3fef04bec0ff954f1cf..779ca2872b95d71c95beddd175f98258b43813d5 100644
--- a/ethkey/cli/Cargo.toml
+++ b/ethkey/cli/Cargo.toml
@@ -4,12 +4,15 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
+docopt = "0.8"
+env_logger = "0.4"
 ethkey = { path = "../" }
+panic_hook = { path = "../../util/panic_hook" }
+parity-wordlist="1.2"
+rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-rustc-hex = "1.0"
-docopt = "0.8"
-panic_hook = { path = "../../panic_hook" }
+threadpool = "1.7"
 
 [[bin]]
 name = "ethkey"
diff --git a/ethkey/cli/src/main.rs b/ethkey/cli/src/main.rs
index e60b4583aebbf54538fc86705078cbb89df5b957..9298788f069f6647a193089af055618decb9984d 100644
--- a/ethkey/cli/src/main.rs
+++ b/ethkey/cli/src/main.rs
@@ -15,32 +15,36 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 extern crate docopt;
+extern crate env_logger;
+extern crate ethkey;
+extern crate panic_hook;
+extern crate parity_wordlist;
 extern crate rustc_hex;
 extern crate serde;
+extern crate threadpool;
+
 #[macro_use]
 extern crate serde_derive;
-extern crate ethkey;
-extern crate panic_hook;
 
-use std::{env, fmt, process};
 use std::num::ParseIntError;
+use std::{env, fmt, process, io, sync};
+
 use docopt::Docopt;
-use rustc_hex::{ToHex, FromHex, FromHexError};
-use ethkey::{KeyPair, Random, Brain, Prefix, Error as EthkeyError, Generator, sign, verify_public, verify_address};
-use std::io;
+use ethkey::{KeyPair, Random, Brain, BrainPrefix, Prefix, Error as EthkeyError, Generator, sign, verify_public, verify_address, brain_recover};
+use rustc_hex::{FromHex, FromHexError};
 
-pub const USAGE: &'static str = r#"
+const USAGE: &'static str = r#"
 Ethereum keys generator.
   Copyright 2016, 2017 Parity Technologies (UK) Ltd
 
 Usage:
-    ethkey info <secret> [options]
+    ethkey info <secret-or-phrase> [options]
     ethkey generate random [options]
-    ethkey generate prefix <prefix> <iterations> [options]
-    ethkey generate brain <seed> [options]
+    ethkey generate prefix <prefix> [options]
     ethkey sign <secret> <message>
     ethkey verify public <public> <signature> <message>
     ethkey verify address <address> <signature> <message>
+    ethkey recover <address> <known-phrase>
     ethkey [-h | --help]
 
 Options:
@@ -48,15 +52,15 @@ Options:
     -s, --secret       Display only the secret.
     -p, --public       Display only the public.
     -a, --address      Display only the address.
+    -b, --brain        Use parity brain wallet algorithm.
 
 Commands:
     info               Display public and address of the secret.
-    generate           Generates new ethereum key.
-    random             Random generation.
-    prefix             Random generation, but address must start with a prefix
-    brain              Generate new key from string seed.
+    generate random    Generates new random ethereum key.
+    generate prefix    Random generation, but address must start with a prefix.
     sign               Sign message using secret.
     verify             Verify signer of the signature.
+    recover            Try to find brain phrase matching given address from partial phrase.
 "#;
 
 #[derive(Debug, Deserialize)]
@@ -65,15 +69,15 @@ struct Args {
 	cmd_generate: bool,
 	cmd_random: bool,
 	cmd_prefix: bool,
-	cmd_brain: bool,
 	cmd_sign: bool,
 	cmd_verify: bool,
 	cmd_public: bool,
 	cmd_address: bool,
+	cmd_recover: bool,
 	arg_prefix: String,
-	arg_iterations: String,
-	arg_seed: String,
 	arg_secret: String,
+	arg_secret_or_phrase: String,
+	arg_known_phrase: String,
 	arg_message: String,
 	arg_public: String,
 	arg_address: String,
@@ -81,6 +85,7 @@ struct Args {
 	flag_secret: bool,
 	flag_public: bool,
 	flag_address: bool,
+	flag_brain: bool,
 }
 
 #[derive(Debug)]
@@ -157,6 +162,7 @@ impl DisplayMode {
 
 fn main() {
 	panic_hook::set();
+	env_logger::init().expect("Logger initialized only once.");
 
 	match execute(env::args()) {
 		Ok(ok) => println!("{}", ok),
@@ -167,10 +173,14 @@ fn main() {
 	}
 }
 
-fn display(keypair: KeyPair, mode: DisplayMode) -> String {
+fn display(result: (KeyPair, Option<String>), mode: DisplayMode) -> String {
+	let keypair = result.0;
 	match mode {
-		DisplayMode::KeyPair => format!("{}", keypair),
-		DisplayMode::Secret => format!("{}", keypair.secret().to_hex()),
+		DisplayMode::KeyPair => match result.1 {
+			Some(extra_data) => format!("{}\n{}", extra_data, keypair),
+			None => format!("{}", keypair)
+		},
+		DisplayMode::Secret => format!("{:?}", keypair.secret()),
 		DisplayMode::Public => format!("{:?}", keypair.public()),
 		DisplayMode::Address => format!("{:?}", keypair.address()),
 	}
@@ -182,23 +192,53 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 
 	return if args.cmd_info {
 		let display_mode = DisplayMode::new(&args);
-		let secret = args.arg_secret.parse().map_err(|_| EthkeyError::InvalidSecret)?;
-		let keypair = KeyPair::from_secret(secret)?;
-		Ok(display(keypair, display_mode))
+
+		let result = if args.flag_brain {
+			let phrase = args.arg_secret_or_phrase;
+			let phrase_info = validate_phrase(&phrase);
+			let keypair = Brain::new(phrase).generate().expect("Brain wallet generator is infallible; qed");
+			(keypair, Some(phrase_info))
+		} else {
+			let secret = args.arg_secret_or_phrase.parse().map_err(|_| EthkeyError::InvalidSecret)?;
+			(KeyPair::from_secret(secret)?, None)
+		};
+		Ok(display(result, display_mode))
 	} else if args.cmd_generate {
 		let display_mode = DisplayMode::new(&args);
-		let keypair = if args.cmd_random {
-			Random.generate()?
+		let result = if args.cmd_random {
+			if args.flag_brain {
+				let mut brain = BrainPrefix::new(vec![0], usize::max_value(), BRAIN_WORDS);
+				let keypair = brain.generate()?;
+				let phrase = format!("recovery phrase: {}", brain.phrase());
+				(keypair, Some(phrase))
+			} else {
+				(Random.generate()?, None)
+			}
 		} else if args.cmd_prefix {
 			let prefix = args.arg_prefix.from_hex()?;
-			let iterations = usize::from_str_radix(&args.arg_iterations, 10)?;
-			Prefix::new(prefix, iterations).generate()?
-		} else if args.cmd_brain {
-			Brain::new(args.arg_seed).generate().expect("Brain wallet generator is infallible; qed")
+			let brain = args.flag_brain;
+			in_threads(move || {
+				let iterations = 1024;
+				let prefix = prefix.clone();
+				move || {
+					let prefix = prefix.clone();
+					let res = if brain {
+						let mut brain = BrainPrefix::new(prefix, iterations, BRAIN_WORDS);
+						let result = brain.generate();
+						let phrase = format!("recovery phrase: {}", brain.phrase());
+						result.map(|keypair| (keypair, Some(phrase)))
+					} else {
+						let result = Prefix::new(prefix, iterations).generate();
+						result.map(|res| (res, None))
+					};
+
+					Ok(res.map(Some).unwrap_or(None))
+				}
+			})?
 		} else {
-			unreachable!();
+			return Ok(format!("{}", USAGE))
 		};
-		Ok(display(keypair, display_mode))
+		Ok(display(result, display_mode))
 	} else if args.cmd_sign {
 		let secret = args.arg_secret.parse().map_err(|_| EthkeyError::InvalidSecret)?;
 		let message = args.arg_message.parse().map_err(|_| EthkeyError::InvalidMessage)?;
@@ -214,14 +254,89 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 			let address = args.arg_address.parse().map_err(|_| EthkeyError::InvalidAddress)?;
 			verify_address(&address, &signature, &message)?
 		} else {
-			unreachable!();
+			return Ok(format!("{}", USAGE))
 		};
 		Ok(format!("{}", ok))
+	} else if args.cmd_recover {
+		let display_mode = DisplayMode::new(&args);
+		let known_phrase = args.arg_known_phrase;
+		let address = args.arg_address.parse().map_err(|_| EthkeyError::InvalidAddress)?;
+		let (phrase, keypair) = in_threads(move || {
+			let mut it = brain_recover::PhrasesIterator::from_known_phrase(&known_phrase, BRAIN_WORDS);
+			move || {
+				let mut i = 0;
+				while let Some(phrase) = it.next() {
+					i += 1;
+
+					let keypair = Brain::new(phrase.clone()).generate().unwrap();
+					if keypair.address() == address {
+						return Ok(Some((phrase, keypair)))
+					}
+
+					if i >= 1024 {
+						return Ok(None)
+					}
+				}
+
+				Err(EthkeyError::Custom("Couldn't find any results.".into()))
+			}
+		})?;
+		Ok(display((keypair, Some(phrase)), display_mode))
 	} else {
-		unreachable!();
+		Ok(format!("{}", USAGE))
 	}
 }
 
+const BRAIN_WORDS: usize = 12;
+
+fn validate_phrase(phrase: &str) -> String {
+	match Brain::validate_phrase(phrase, BRAIN_WORDS) {
+		Ok(()) => format!("The recovery phrase looks correct.\n"),
+		Err(err) => format!("The recover phrase was not generated by Parity: {}", err)
+	}
+}
+
+fn in_threads<F, X, O>(prepare: F) -> Result<O, EthkeyError> where
+	O: Send + 'static,
+	X: Send + 'static,
+	F: Fn() -> X,
+	X: FnMut() -> Result<Option<O>, EthkeyError>,
+{
+	let pool = threadpool::Builder::new().build();
+
+	let (tx, rx) = sync::mpsc::sync_channel(1);
+	let is_done = sync::Arc::new(sync::atomic::AtomicBool::default());
+
+	for _ in 0..pool.max_count() {
+		let is_done = is_done.clone();
+		let tx = tx.clone();
+		let mut task = prepare();
+		pool.execute(move || {
+			loop {
+				if is_done.load(sync::atomic::Ordering::SeqCst) {
+					return;
+				}
+
+				let res = match task() {
+					Ok(None) => continue,
+					Ok(Some(v)) => Ok(v),
+					Err(err) => Err(err),
+				};
+
+				// We are interested only in the first response.
+				let _ = tx.send(res);
+			}
+		});
+	}
+
+	if let Ok(solution) = rx.recv() {
+		is_done.store(true, sync::atomic::Ordering::SeqCst);
+		return solution;
+	}
+
+	Err(EthkeyError::Custom("No results found.".into()))
+}
+
 #[cfg(test)]
 mod tests {
 	use super::execute;
@@ -242,13 +357,15 @@ address: 26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5".to_owned();
 
 	#[test]
 	fn brain() {
-		let command = vec!["ethkey", "generate", "brain", "this is sparta"]
+		let command = vec!["ethkey", "info", "--brain", "this is sparta"]
 			.into_iter()
 			.map(Into::into)
 			.collect::<Vec<String>>();
 
 		let expected =
-"secret:  aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2
+"The recover phrase was not generated by Parity: The word 'this' does not come from the dictionary.
+
+secret:  aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2
 public:  c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4
 address: 006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
 		assert_eq!(execute(command).unwrap(), expected);
@@ -256,7 +373,7 @@ address: 006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
 
 	#[test]
 	fn secret() {
-		let command = vec!["ethkey", "generate", "brain", "this is sparta", "--secret"]
+		let command = vec!["ethkey", "info", "--brain", "this is sparta", "--secret"]
 			.into_iter()
 			.map(Into::into)
 			.collect::<Vec<String>>();
@@ -267,7 +384,7 @@ address: 006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
 
 	#[test]
 	fn public() {
-		let command = vec!["ethkey", "generate", "brain", "this is sparta", "--public"]
+		let command = vec!["ethkey", "info", "--brain", "this is sparta", "--public"]
 			.into_iter()
 			.map(Into::into)
 			.collect::<Vec<String>>();
@@ -278,7 +395,7 @@ address: 006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
 
 	#[test]
 	fn address() {
-		let command = vec!["ethkey", "generate", "brain", "this is sparta", "--address"]
+		let command = vec!["ethkey", "info", "-b", "this is sparta", "--address"]
 			.into_iter()
 			.map(Into::into)
 			.collect::<Vec<String>>();
diff --git a/ethkey/src/brain.rs b/ethkey/src/brain.rs
index 8bc9d2cd77c6140d6bc7e23cb44bdf9d6fe52abe..fffae0bed8e08ba9955e502969ec37062cd281ed 100644
--- a/ethkey/src/brain.rs
+++ b/ethkey/src/brain.rs
@@ -16,6 +16,7 @@
 
 use keccak::Keccak256;
 use super::{KeyPair, Generator, Secret};
+use parity_wordlist;
 
 /// Simple brainwallet.
 pub struct Brain(String);
@@ -24,13 +25,17 @@ impl Brain {
 	pub fn new(s: String) -> Self {
 		Brain(s)
 	}
+
+	pub fn validate_phrase(phrase: &str, expected_words: usize) -> Result<(), ::WordlistError> {
+		parity_wordlist::validate_phrase(phrase, expected_words)
+	}
 }
 
 impl Generator for Brain {
     type Error = ::Void;
 
-	fn generate(self) -> Result<KeyPair, Self::Error> {
-		let seed = self.0;
+	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
+		let seed = self.0.clone();
 		let mut secret = seed.into_bytes().keccak256();
 
 		let mut i = 0;
@@ -43,7 +48,10 @@ impl Generator for Brain {
 					if let Ok(pair) = Secret::from_unsafe_slice(&secret)
 						.and_then(KeyPair::from_secret)
 					{
-						if pair.address()[0] == 0 { return Ok(pair) }
+						if pair.address()[0] == 0 {
+							trace!("Testing: {}, got: {:?}", self.0, pair.address());
+							return Ok(pair)
+						}
 					}
 				},
 			}
diff --git a/ethkey/src/brain_prefix.rs b/ethkey/src/brain_prefix.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a4e31e989c969d063dfb36ad600700479deca63a
--- /dev/null
+++ b/ethkey/src/brain_prefix.rs
@@ -0,0 +1,70 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use super::{Generator, KeyPair, Error, Brain};
+use parity_wordlist as wordlist;
+
+/// Tries to find brain-seed keypair with address starting with given prefix.
+pub struct BrainPrefix {
+	prefix: Vec<u8>,
+	iterations: usize,
+	no_of_words: usize,
+	last_phrase: String,
+}
+
+impl BrainPrefix {
+	pub fn new(prefix: Vec<u8>, iterations: usize, no_of_words: usize) -> Self {
+		BrainPrefix {
+			prefix,
+			iterations,
+			no_of_words,
+			last_phrase: String::new(),
+		}
+	}
+
+	pub fn phrase(&self) -> &str {
+		&self.last_phrase
+	}
+}
+
+impl Generator for BrainPrefix {
+	type Error = Error;
+
+	fn generate(&mut self) -> Result<KeyPair, Error> {
+		for _ in 0..self.iterations {
+			let phrase = wordlist::random_phrase(self.no_of_words);
+			let keypair = Brain::new(phrase.clone()).generate().unwrap();
+			if keypair.address().starts_with(&self.prefix) {
+				self.last_phrase = phrase;
+				return Ok(keypair)
+			}
+		}
+
+		Err(Error::Custom("Could not find keypair".into()))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use {Generator, BrainPrefix};
+
+	#[test]
+	fn prefix_generator() {
+		let prefix = vec![0x00u8];
+		let keypair = BrainPrefix::new(prefix.clone(), usize::max_value(), 12).generate().unwrap();
+		assert!(keypair.address().starts_with(&prefix));
+	}
+}
diff --git a/ethkey/src/brain_recover.rs b/ethkey/src/brain_recover.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f064c6fd0e1bc6bf9dcc1f4134faf69ef09c66c2
--- /dev/null
+++ b/ethkey/src/brain_recover.rs
@@ -0,0 +1,175 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::HashSet;
+
+use edit_distance::edit_distance;
+use parity_wordlist;
+
+use super::{Address, Brain, Generator};
+
+
+/// Tries to find a phrase for address, given the number
+/// of expected words and a partial phrase.
+///
+/// Returns `None` if phrase couldn't be found.
+pub fn brain_recover(
+	address: &Address,
+	known_phrase: &str,
+	expected_words: usize,
+) -> Option<String> {
+	let it = PhrasesIterator::from_known_phrase(known_phrase, expected_words);
+	for phrase in it {
+		let keypair = Brain::new(phrase.clone()).generate().expect("Brain wallets are infallible; qed");
+		trace!("Testing: {}, got: {:?}", phrase, keypair.address());
+		if &keypair.address() == address {
+			return Some(phrase);
+		}
+	}
+
+	None
+}
+
+fn generate_substitutions(word: &str) -> Vec<&'static str> {
+	let mut words = parity_wordlist::WORDS.iter().cloned()
+		.map(|w| (edit_distance(w, word), w))
+		.collect::<Vec<_>>();
+	words.sort_by(|a, b| a.0.cmp(&b.0));
+
+	words.into_iter()
+		.map(|pair| pair.1)
+		.collect()
+}
+
+/// Iterator over possible
+pub struct PhrasesIterator {
+	words: Vec<Vec<&'static str>>,
+	combinations: u64,
+	indexes: Vec<usize>,
+	has_next: bool,
+}
+
+impl PhrasesIterator {
+	pub fn from_known_phrase(known_phrase: &str, expected_words: usize) -> Self {
+		let known_words = parity_wordlist::WORDS.iter().cloned().collect::<HashSet<_>>();
+		let mut words = known_phrase.split(' ')
+			.map(|word| match known_words.get(word) {
+				None => {
+					info!("Invalid word '{}', looking for potential substitutions.", word);
+					let substitutions = generate_substitutions(word);
+					info!("Closest words: {:?}", &substitutions[..10]);
+					substitutions
+				},
+				Some(word) => vec![*word],
+			})
+		.collect::<Vec<_>>();
+
+		// add missing words
+		if words.len() < expected_words {
+			let to_add = expected_words - words.len();
+			info!("Number of words is insuficcient adding {} more.", to_add);
+			for _ in 0..to_add {
+				words.push(parity_wordlist::WORDS.iter().cloned().collect());
+			}
+		}
+
+		// start searching
+		PhrasesIterator::new(words)
+	}
+
+	pub fn new(words: Vec<Vec<&'static str>>) -> Self {
+		let combinations = words.iter().fold(1u64, |acc, x| acc * x.len() as u64);
+		let indexes = words.iter().map(|_| 0).collect();
+		info!("Starting to test {} possible combinations.", combinations);
+
+		PhrasesIterator {
+			words,
+			combinations,
+			indexes,
+			has_next: combinations > 0,
+		}
+	}
+
+	pub fn combinations(&self) -> u64 {
+		self.combinations
+	}
+
+	fn current(&self) -> String {
+		let mut s = self.words[0][self.indexes[0]].to_owned();
+		for i in 1..self.indexes.len() {
+			s.push(' ');
+			s.push_str(self.words[i][self.indexes[i]]);
+		}
+		s
+	}
+
+	fn next_index(&mut self) -> bool {
+		let mut pos = self.indexes.len();
+		while pos > 0 {
+			pos -= 1;
+			self.indexes[pos] += 1;
+			if self.indexes[pos] >= self.words[pos].len() {
+				self.indexes[pos] = 0;
+			} else {
+				return true;
+			}
+		}
+
+		false
+	}
+}
+
+impl Iterator for PhrasesIterator {
+	type Item = String;
+
+	fn next(&mut self) -> Option<String> {
+		if !self.has_next {
+			return None;
+		}
+
+		let phrase = self.current();
+		self.has_next = self.next_index();
+		Some(phrase)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::PhrasesIterator;
+
+
+	#[test]
+	fn should_generate_possible_combinations() {
+		let mut it = PhrasesIterator::new(vec![
+			vec!["1", "2", "3"],
+			vec!["test"],
+			vec!["a", "b", "c"],
+		]);
+
+		assert_eq!(it.combinations(), 9);
+		assert_eq!(it.next(), Some("1 test a".to_owned()));
+		assert_eq!(it.next(), Some("1 test b".to_owned()));
+		assert_eq!(it.next(), Some("1 test c".to_owned()));
+		assert_eq!(it.next(), Some("2 test a".to_owned()));
+		assert_eq!(it.next(), Some("2 test b".to_owned()));
+		assert_eq!(it.next(), Some("2 test c".to_owned()));
+		assert_eq!(it.next(), Some("3 test a".to_owned()));
+		assert_eq!(it.next(), Some("3 test b".to_owned()));
+		assert_eq!(it.next(), Some("3 test c".to_owned()));
+		assert_eq!(it.next(), None);
+	}
+
+}
diff --git a/ethkey/src/extended.rs b/ethkey/src/extended.rs
index 45ed0547f07c05eeaeac8a4c58a06f46ab66d6a5..23aff0bee8ea3b549e8013baf414466ffe911385 100644
--- a/ethkey/src/extended.rs
+++ b/ethkey/src/extended.rs
@@ -18,7 +18,7 @@
 
 use secret::Secret;
 use Public;
-use bigint::hash::H256;
+use ethereum_types::H256;
 pub use self::derivation::Error as DerivationError;
 
 /// Represents label that can be stored as a part of key derivation
@@ -207,12 +207,10 @@ impl ExtendedKeyPair {
 // Work is based on BIP0032
 // https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki
 mod derivation {
-
 	use rcrypto::hmac::Hmac;
 	use rcrypto::mac::Mac;
 	use rcrypto::sha2::Sha512;
-	use bigint::hash::{H512, H256};
-	use bigint::prelude::{U256, U512};
+	use ethereum_types::{U256, U512, H512, H256};
 	use secp256k1::key::{SecretKey, PublicKey};
 	use SECP256K1;
 	use keccak;
@@ -388,7 +386,7 @@ mod tests {
 	use super::{ExtendedSecret, ExtendedPublic, ExtendedKeyPair};
 	use secret::Secret;
 	use std::str::FromStr;
-	use bigint::hash::{H128, H256};
+	use ethereum_types::{H128, H256};
 	use super::{derivation, Derivation};
 
 	fn master_chain_basic() -> (H256, H256) {
@@ -477,8 +475,8 @@ mod tests {
 			.expect("Seed should be valid H128")
 			.to_vec();
 
-		/// private key from bitcoin test vector
-		/// xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs
+		// private key from bitcoin test vector
+		// xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs
 		let test_private = H256::from_str("e8f32e723decf4051aefac8e2c93c9c5b214313817cdb01a1494b917c8436b35")
 			.expect("Private should be decoded ok");
 
@@ -489,8 +487,8 @@ mod tests {
 
 	#[test]
 	fn test_vector_1() {
-		/// xprv9uHRZZhk6KAJC1avXpDAp4MDc3sQKNxDiPvvkX8Br5ngLNv1TxvUxt4cV1rGL5hj6KCesnDYUhd7oWgT11eZG7XnxHrnYeSvkzY7d2bhkJ7
-		/// H(0)
+		// xprv9uHRZZhk6KAJC1avXpDAp4MDc3sQKNxDiPvvkX8Br5ngLNv1TxvUxt4cV1rGL5hj6KCesnDYUhd7oWgT11eZG7XnxHrnYeSvkzY7d2bhkJ7
+		// H(0)
 		test_extended(
 			|secret| secret.derive(2147483648.into()),
 			H256::from_str("edb2e14f9ee77d26dd93b4ecede8d16ed408ce149b6cd80b0715a2d911a0afea")
@@ -500,8 +498,8 @@ mod tests {
 
 	#[test]
 	fn test_vector_2() {
-		/// xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs
-		/// H(0)/1
+		// xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs
+		// H(0)/1
 		test_extended(
 			|secret| secret.derive(2147483648.into()).derive(1.into()),
 			H256::from_str("3c6cb8d0f6a264c91ea8b5030fadaa8e538b020f0a387421a12de9319dc93368")
diff --git a/ethkey/src/lib.rs b/ethkey/src/lib.rs
index 271a5f166c37d2520faf3e4758b7bd429d091e7c..09a100b74cd93851267abd5009808d97054064b4 100644
--- a/ethkey/src/lib.rs
+++ b/ethkey/src/lib.rs
@@ -14,18 +14,25 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+// #![warn(missing_docs)]
+
+extern crate byteorder;
+extern crate crypto as rcrypto;
+extern crate edit_distance;
+extern crate ethereum_types;
+extern crate parity_wordlist;
 extern crate rand;
-extern crate tiny_keccak;
-extern crate secp256k1;
 extern crate rustc_hex;
-extern crate ethcore_bigint as bigint;
-extern crate crypto as rcrypto;
-extern crate byteorder;
+extern crate secp256k1;
+extern crate tiny_keccak;
 
 #[macro_use]
 extern crate lazy_static;
+#[macro_use]
+extern crate log;
 
 mod brain;
+mod brain_prefix;
 mod error;
 mod keypair;
 mod keccak;
@@ -35,9 +42,12 @@ mod signature;
 mod secret;
 mod extended;
 
+pub mod brain_recover;
 pub mod math;
 
+pub use self::parity_wordlist::Error as WordlistError;
 pub use self::brain::Brain;
+pub use self::brain_prefix::BrainPrefix;
 pub use self::error::Error;
 pub use self::keypair::{KeyPair, public_to_address};
 pub use self::math::public_is_valid;
@@ -47,7 +57,10 @@ pub use self::signature::{sign, verify_public, verify_address, recover, Signatur
 pub use self::secret::Secret;
 pub use self::extended::{ExtendedPublic, ExtendedSecret, ExtendedKeyPair, DerivationError, Derivation};
 
-use bigint::hash::{H160, H256, H512};
+use ethereum_types::H256;
+
+pub use ethereum_types::{Address, Public};
+pub type Message = H256;
 
 lazy_static! {
 	pub static ref SECP256K1: secp256k1::Secp256k1 = secp256k1::Secp256k1::new();
@@ -62,9 +75,5 @@ pub trait Generator {
 	type Error;
 
 	/// Should be called to generate new keypair.
-	fn generate(self) -> Result<KeyPair, Self::Error>;
+	fn generate(&mut self) -> Result<KeyPair, Self::Error>;
 }
-
-pub type Address = H160;
-pub type Message = H256;
-pub type Public = H512;
diff --git a/ethkey/src/math.rs b/ethkey/src/math.rs
index 4c875bd8fa19ae1165606308fb2cbd16a067606e..e2426b4fbdff3b37a3166276c8a18cca62b2f41d 100644
--- a/ethkey/src/math.rs
+++ b/ethkey/src/math.rs
@@ -17,8 +17,7 @@
 use super::{SECP256K1, Public, Secret, Error};
 use secp256k1::key;
 use secp256k1::constants::{GENERATOR_X, GENERATOR_Y, CURVE_ORDER};
-use bigint::prelude::U256;
-use bigint::hash::H256;
+use ethereum_types::{U256, H256};
 
 /// Whether the public key is valid.
 pub fn public_is_valid(public: &Public) -> bool {
diff --git a/ethkey/src/prefix.rs b/ethkey/src/prefix.rs
index 25b1ab3f767bbbc0a537873b70076654fd15ccf8..f2ef0f0ffb4610d05cd37e2d9ca3f59e25cdfe58 100644
--- a/ethkey/src/prefix.rs
+++ b/ethkey/src/prefix.rs
@@ -34,7 +34,7 @@ impl Prefix {
 impl Generator for Prefix {
 	type Error = Error;
 
-	fn generate(self) -> Result<KeyPair, Error> {
+	fn generate(&mut self) -> Result<KeyPair, Error> {
 		for _ in 0..self.iterations {
 			let keypair = Random.generate()?;
 			if keypair.address().starts_with(&self.prefix) {
diff --git a/ethkey/src/random.rs b/ethkey/src/random.rs
index 715dd3cb5832e2e29f30b95fa5bcc4bcd186bee2..b44a4b2ca8015acef2b72882e1f8cafc03fc9fa9 100644
--- a/ethkey/src/random.rs
+++ b/ethkey/src/random.rs
@@ -23,7 +23,7 @@ pub struct Random;
 impl Generator for Random {
 	type Error = ::std::io::Error;
 
-	fn generate(self) -> Result<KeyPair, Self::Error> {
+	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
 		let mut rng = OsRng::new()?;
 		match rng.generate() {
 			Ok(pair) => Ok(pair),
@@ -32,10 +32,10 @@ impl Generator for Random {
 	}
 }
 
-impl<'a> Generator for &'a mut OsRng {
+impl Generator for OsRng {
 	type Error = ::Void;
 
-	fn generate(self) -> Result<KeyPair, Self::Error> {
+	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
 		let (sec, publ) = SECP256K1.generate_keypair(self)
 			.expect("context always created with full capabilities; qed");
 
diff --git a/ethkey/src/secret.rs b/ethkey/src/secret.rs
index 433d8c68e0e1efe2858b98e730afe30fcabce29a..6e0548264f934fc43ce9ba97842799ef3c2b0234 100644
--- a/ethkey/src/secret.rs
+++ b/ethkey/src/secret.rs
@@ -19,7 +19,7 @@ use std::ops::Deref;
 use std::str::FromStr;
 use rustc_hex::ToHex;
 use secp256k1::key;
-use bigint::hash::H256;
+use ethereum_types::H256;
 use {Error, SECP256K1};
 
 #[derive(Clone, PartialEq, Eq)]
@@ -34,6 +34,12 @@ impl ToHex for Secret {
 }
 
 impl fmt::Debug for Secret {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		write!(fmt, "{:?}", self.inner)
+	}
+}
+
+impl fmt::Display for Secret {
 	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
 		write!(fmt, "Secret: 0x{:x}{:x}..{:x}{:x}", self.inner[0], self.inner[1], self.inner[30], self.inner[31])
 	}
@@ -48,6 +54,11 @@ impl Secret {
 		Secret { inner: h }
 	}
 
+	/// Creates zero key, which is invalid for crypto operations, but valid for math operation.
+	pub fn zero() -> Self {
+		Secret { inner: Default::default() }
+	}
+
 	/// Imports and validates the key.
 	pub fn from_unsafe_slice(key: &[u8]) -> Result<Self, Error> {
 		let secret = key::SecretKey::from_slice(&super::SECP256K1, key)?;
@@ -61,51 +72,91 @@ impl Secret {
 
 	/// Inplace add one secret key to another (scalar + scalar)
 	pub fn add(&mut self, other: &Secret) -> Result<(), Error> {
-		let mut key_secret = self.to_secp256k1_secret()?;
-		let other_secret = other.to_secp256k1_secret()?;
-		key_secret.add_assign(&SECP256K1, &other_secret)?;
+		match (self.is_zero(), other.is_zero()) {
+			(true, true) | (false, true) => Ok(()),
+			(true, false) => {
+				*self = other.clone();
+				Ok(())
+			},
+			(false, false) => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				let other_secret = other.to_secp256k1_secret()?;
+				key_secret.add_assign(&SECP256K1, &other_secret)?;
 
-		*self = key_secret.into();
-		Ok(())
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
 	}
 
 	/// Inplace subtract one secret key from another (scalar - scalar)
 	pub fn sub(&mut self, other: &Secret) -> Result<(), Error> {
-		let mut key_secret = self.to_secp256k1_secret()?;
-		let mut other_secret = other.to_secp256k1_secret()?;
-		other_secret.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
-		key_secret.add_assign(&SECP256K1, &other_secret)?;
-
-		*self = key_secret.into();
-		Ok(())
+		match (self.is_zero(), other.is_zero()) {
+			(true, true) | (false, true) => Ok(()),
+			(true, false) => {
+				*self = other.clone();
+				self.neg()
+			},
+			(false, false) => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				let mut other_secret = other.to_secp256k1_secret()?;
+				other_secret.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+				key_secret.add_assign(&SECP256K1, &other_secret)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
 	}
 
 	/// Inplace decrease secret key (scalar - 1)
 	pub fn dec(&mut self) -> Result<(), Error> {
-		let mut key_secret = self.to_secp256k1_secret()?;
-		key_secret.add_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+		match self.is_zero() {
+			true => {
+				*self = key::MINUS_ONE_KEY.into();
+				Ok(())
+			},
+			false => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				key_secret.add_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
 
-		*self = key_secret.into();
-		Ok(())
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
 	}
 
 	/// Inplace multiply one secret key to another (scalar * scalar)
 	pub fn mul(&mut self, other: &Secret) -> Result<(), Error> {
-		let mut key_secret = self.to_secp256k1_secret()?;
-		let other_secret = other.to_secp256k1_secret()?;
-		key_secret.mul_assign(&SECP256K1, &other_secret)?;
+		match (self.is_zero(), other.is_zero()) {
+			(true, true) | (true, false) => Ok(()),
+			(false, true) => {
+				*self = Self::zero();
+				Ok(())
+			},
+			(false, false) => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				let other_secret = other.to_secp256k1_secret()?;
+				key_secret.mul_assign(&SECP256K1, &other_secret)?;
 
-		*self = key_secret.into();
-		Ok(())
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
 	}
 
 	/// Inplace negate secret key (-scalar)
 	pub fn neg(&mut self) -> Result<(), Error> {
-		let mut key_secret = self.to_secp256k1_secret()?;
-		key_secret.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
-
-		*self = key_secret.into();
-		Ok(())
+		match self.is_zero() {
+			true => Ok(()),
+			false => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				key_secret.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
 	}
 
 	/// Inplace inverse secret key (1 / scalar)
@@ -120,6 +171,10 @@ impl Secret {
 	/// Compute power of secret key inplace (secret ^ pow).
 	/// This function is not intended to be used with large powers.
 	pub fn pow(&mut self, pow: usize) -> Result<(), Error> {
+		if self.is_zero() {
+			return Ok(());
+		}
+
 		match pow {
 			0 => *self = key::ONE_KEY.into(),
 			1 => (),
diff --git a/ethkey/src/signature.rs b/ethkey/src/signature.rs
index 67115c98b48e3adfa55360a9206571b15499f25f..ec225ec011b3d78ed743d7573894401169ef868e 100644
--- a/ethkey/src/signature.rs
+++ b/ethkey/src/signature.rs
@@ -22,7 +22,7 @@ use std::hash::{Hash, Hasher};
 use secp256k1::{Message as SecpMessage, RecoverableSignature, RecoveryId, Error as SecpError};
 use secp256k1::key::{SecretKey, PublicKey};
 use rustc_hex::{ToHex, FromHex};
-use bigint::hash::{H520, H256};
+use ethereum_types::{H520, H256};
 use {Secret, Public, SECP256K1, Error, Message, public_to_address, Address};
 
 /// Signature encoded as RSV components
diff --git a/ethstore/Cargo.toml b/ethstore/Cargo.toml
index 200dec3668795b2b7cbb6b3dd10b4d93ad5ca739..a504c7f2a55fc9a3449a0c6c431223e6e4956705 100755
--- a/ethstore/Cargo.toml
+++ b/ethstore/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "ethstore"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.3"
 libc = "0.2"
-rand = "0.3"
+rand = "0.4"
 ethkey = { path = "../ethkey" }
 serde = "1.0"
 serde_json = "1.0"
@@ -16,11 +16,16 @@ rust-crypto = "0.2.36"
 tiny-keccak = "1.3"
 time = "0.1.34"
 itertools = "0.5"
-parking_lot = "0.4"
+parking_lot = "0.5"
 ethcrypto = { path = "../ethcrypto" }
-ethcore-bigint = { path = "../util/bigint" }
+ethereum-types = "0.2"
+dir = { path = "../util/dir" }
 smallvec = "0.4"
 parity-wordlist = "1.0"
+subtle = "0.5"
 tempdir = "0.3"
 
+[dev-dependencies]
+matches = "0.1"
+
 [lib]
diff --git a/ethstore/README.md b/ethstore/README.md
index 4f7daf4e26d7e6a2edc7865ad3cf434cf42abfaf..c56a24a9314309500b0f94ea55451c864867a5bc 100644
--- a/ethstore/README.md
+++ b/ethstore/README.md
@@ -21,6 +21,7 @@ Usage:
     ethstore list [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
     ethstore import [--src DIR] [--dir DIR]
     ethstore import-wallet <path> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore find-wallet-pass <path> <password>
     ethstore remove <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
     ethstore sign <address> <password> <message> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
     ethstore public <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
@@ -50,6 +51,7 @@ Commands:
     list               List accounts.
     import             Import accounts from src.
     import-wallet      Import presale wallet.
+    find-wallet-pass   Tries to open a wallet with list of passwords given.
     remove             Remove account.
     sign               Sign message.
     public             Displays public key for an address.
@@ -164,6 +166,25 @@ ethstore import-wallet ethwallet.json password.txt
 e6a3d25a7cb7cd21cb720df5b5e8afd154af1bbb
 ```
 
+
+--
+
+#### `find-wallet-pass <path> <password>`
+Try to open presale wallet given a list of passwords from a file.
+The list of passwords can be generated using e.g. [Phildo/brutedist](https://github.com/Phildo/brutedist).
+
+- `<path>` - presale wallet path
+- `<password>` - possible passwords, file path
+
+```
+ethstore find-wallet-pass ethwallet.json passwords.txt
+```
+
+```
+Found password: test
+```
+
+
 --
 
 #### `remove <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]`
@@ -318,8 +339,8 @@ OK
 
 --
 
-# Ethcore toolchain
-*this project is a part of the ethcore toolchain*
+# Parity toolchain
+*this project is a part of the parity toolchain*
 
 - [**ethkey**](https://github.com/paritytech/ethkey) - Ethereum keys generator and signer.
 - [**ethstore**](https://github.com/paritytech/ethstore) - Ethereum key management.
diff --git a/ethstore/cli/Cargo.toml b/ethstore/cli/Cargo.toml
index 71215fefefcabcafbf9fff9e47275b75ab7a18c2..f164f0a6722ce217bd779fce4c93f4e67af3f3c7 100644
--- a/ethstore/cli/Cargo.toml
+++ b/ethstore/cli/Cargo.toml
@@ -4,12 +4,15 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
+docopt = "0.8"
+num_cpus = "1.6"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-docopt = "0.8"
+parking_lot = "0.5"
 ethstore = { path = "../" }
-panic_hook = { path = "../../panic_hook" }
+dir = { path = '../../util/dir' }
+panic_hook = { path = "../../util/panic_hook" }
 
 [[bin]]
 name = "ethstore"
diff --git a/ethstore/cli/src/crack.rs b/ethstore/cli/src/crack.rs
new file mode 100644
index 0000000000000000000000000000000000000000..64eda66e56ed378ed10fb9d9a92377aee03af1bd
--- /dev/null
+++ b/ethstore/cli/src/crack.rs
@@ -0,0 +1,50 @@
+use std::{cmp, thread};
+use std::sync::Arc;
+use std::collections::VecDeque;
+use parking_lot::Mutex;
+
+use ethstore::{PresaleWallet, Error};
+use num_cpus;
+
+pub fn run(passwords: VecDeque<String>, wallet_path: &str) -> Result<(), Error> {
+	let passwords = Arc::new(Mutex::new(passwords));
+
+	let mut handles = Vec::new();
+
+	for _ in 0..num_cpus::get() {
+		let passwords = passwords.clone();
+		let wallet = PresaleWallet::open(&wallet_path)?;
+		handles.push(thread::spawn(move || {
+			look_for_password(passwords, wallet);
+		}));
+	}
+
+	for handle in handles {
+		handle.join().map_err(|err| Error::Custom(format!("Error finishing thread: {:?}", err)))?;
+	}
+
+	Ok(())
+}
+
+fn look_for_password(passwords: Arc<Mutex<VecDeque<String>>>, wallet: PresaleWallet) {
+	let mut counter = 0;
+	while !passwords.lock().is_empty() {
+		let package = {
+			let mut passwords = passwords.lock();
+			let len = passwords.len();
+			passwords.split_off(cmp::min(len, 32))
+		};
+		for pass in package {
+			counter += 1;
+			match wallet.decrypt(&pass) {
+				Ok(_) => {
+					println!("Found password: {}", &pass);
+					passwords.lock().clear();
+					return;
+				},
+				_ if counter % 100 == 0 => print!("."),
+				_ => {},
+			}
+		}
+	}
+}
diff --git a/ethstore/cli/src/main.rs b/ethstore/cli/src/main.rs
index 09ccc8cd4df0478bebbd5284d7a2284cbc495654..45f9f6920ee548599c11c28e2dfdc89f3882a98d 100644
--- a/ethstore/cli/src/main.rs
+++ b/ethstore/cli/src/main.rs
@@ -14,21 +14,28 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-extern crate rustc_hex;
+extern crate dir;
 extern crate docopt;
+extern crate ethstore;
+extern crate num_cpus;
+extern crate panic_hook;
+extern crate parking_lot;
+extern crate rustc_hex;
 extern crate serde;
+
 #[macro_use]
 extern crate serde_derive;
-extern crate ethstore;
-extern crate panic_hook;
 
-use std::{env, process, fs, fmt};
+use std::collections::VecDeque;
 use std::io::Read;
+use std::{env, process, fs, fmt};
+
 use docopt::Docopt;
+use ethstore::accounts_dir::{KeyDirectory, RootDiskDirectory};
 use ethstore::ethkey::Address;
-use ethstore::dir::{paths, KeyDirectory, RootDiskDirectory};
-use ethstore::{EthStore, SimpleSecretStore, SecretStore, import_accounts, PresaleWallet,
-	SecretVaultRef, StoreAccountRef};
+use ethstore::{EthStore, SimpleSecretStore, SecretStore, import_accounts, PresaleWallet, SecretVaultRef, StoreAccountRef};
+
+mod crack;
 
 pub const USAGE: &'static str = r#"
 Ethereum key management.
@@ -40,6 +47,7 @@ Usage:
     ethstore list [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
     ethstore import [--src DIR] [--dir DIR]
     ethstore import-wallet <path> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore find-wallet-pass <path> <password>
     ethstore remove <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
     ethstore sign <address> <password> <message> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
     ethstore public <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
@@ -69,6 +77,7 @@ Commands:
     list               List accounts.
     import             Import accounts from src.
     import-wallet      Import presale wallet.
+    find-wallet-pass   Tries to open a wallet with list of passwords given.
     remove             Remove account.
     sign               Sign message.
     public             Displays public key for an address.
@@ -86,6 +95,7 @@ struct Args {
 	cmd_list: bool,
 	cmd_import: bool,
 	cmd_import_wallet: bool,
+	cmd_find_wallet_pass: bool,
 	cmd_remove: bool,
 	cmd_sign: bool,
 	cmd_public: bool,
@@ -148,11 +158,11 @@ fn main() {
 
 fn key_dir(location: &str) -> Result<Box<KeyDirectory>, Error> {
 	let dir: Box<KeyDirectory> = match location {
-		"geth" => Box::new(RootDiskDirectory::create(paths::geth(false))?),
-		"geth-test" => Box::new(RootDiskDirectory::create(paths::geth(true))?),
+		"geth" => Box::new(RootDiskDirectory::create(dir::geth(false))?),
+		"geth-test" => Box::new(RootDiskDirectory::create(dir::geth(true))?),
 		path if path.starts_with("parity") => {
 			let chain = path.split('-').nth(1).unwrap_or("ethereum");
-			let path = paths::parity(chain);
+			let path = dir::parity(chain);
 			Box::new(RootDiskDirectory::create(path)?)
 		},
 		path => Box::new(RootDiskDirectory::create(path)?),
@@ -209,8 +219,8 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 		let secret = args.arg_secret.parse().map_err(|_| ethstore::Error::InvalidSecret)?;
 		let password = load_password(&args.arg_password)?;
 		let vault_ref = open_args_vault(&store, &args)?;
-		let address = store.insert_account(vault_ref, secret, &password)?;
-		Ok(format!("0x{:?}", address))
+		let account_ref = store.insert_account(vault_ref, secret, &password)?;
+		Ok(format!("0x{:?}", account_ref.address))
 	} else if args.cmd_change_pwd {
 		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
 		let old_pwd = load_password(&args.arg_old_pwd)?;
@@ -237,8 +247,13 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 		let password = load_password(&args.arg_password)?;
 		let kp = wallet.decrypt(&password)?;
 		let vault_ref = open_args_vault(&store, &args)?;
-		let address = store.insert_account(vault_ref, kp.secret().clone(), &password)?;
-		Ok(format!("0x{:?}", address))
+		let account_ref = store.insert_account(vault_ref, kp.secret().clone(), &password)?;
+		Ok(format!("0x{:?}", account_ref.address))
+	} else if args.cmd_find_wallet_pass {
+		let passwords = load_password(&args.arg_password)?;
+		let passwords = passwords.lines().map(str::to_owned).collect::<VecDeque<_>>();
+		crack::run(passwords, &args.arg_path)?;
+		Ok(format!("Password not found."))
 	} else if args.cmd_remove {
 		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
 		let password = load_password(&args.arg_password)?;
@@ -251,7 +266,7 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 		let password = load_password(&args.arg_password)?;
 		let account_ref = open_args_vault_account(&store, address, &args)?;
 		let signature = store.sign(&account_ref, &password, &message)?;
-		Ok(format!("0x{:?}", signature))
+		Ok(format!("0x{}", signature))
 	} else if args.cmd_public {
 		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
 		let password = load_password(&args.arg_password)?;
diff --git a/ethstore/src/account/crypto.rs b/ethstore/src/account/crypto.rs
index 7d87b1c69364816bc0e275c6f29621aa5f833f8f..967c92306ae154165553404ce534aabcb553a447 100755
--- a/ethstore/src/account/crypto.rs
+++ b/ethstore/src/account/crypto.rs
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::iter::repeat;
 use std::str;
 use ethkey::Secret;
 use {json, Error, crypto};
@@ -22,6 +21,7 @@ use crypto::Keccak256;
 use random::Random;
 use smallvec::SmallVec;
 use account::{Cipher, Kdf, Aes128Ctr, Pbkdf2, Prf};
+use subtle;
 
 /// Encrypted data
 #[derive(Debug, PartialEq, Clone)]
@@ -90,9 +90,7 @@ impl Crypto {
 		// preallocated (on-stack in case of `Secret`) buffer to hold cipher
 		// length = length(plain) as we are using CTR-approach
 		let plain_len = plain.len();
-		let mut ciphertext: SmallVec<[u8; 32]> = SmallVec::new();
-		ciphertext.grow(plain_len);
-		ciphertext.extend(repeat(0).take(plain_len));
+		let mut ciphertext: SmallVec<[u8; 32]> = SmallVec::from_vec(vec![0; plain_len]);
 
 		// aes-128-ctr with initial vector of iv
 		crypto::aes::encrypt(&derived_left_bits, &iv, plain, &mut *ciphertext);
@@ -139,13 +137,11 @@ impl Crypto {
 
 		let mac = crypto::derive_mac(&derived_right_bits, &self.ciphertext).keccak256();
 
-		if mac != self.mac {
+		if subtle::slices_equal(&mac, &self.mac) == 0 {
 			return Err(Error::InvalidPassword);
 		}
 
-		let mut plain: SmallVec<[u8; 32]> = SmallVec::new();
-		plain.grow(expected_len);
-		plain.extend(repeat(0).take(expected_len));
+		let mut plain: SmallVec<[u8; 32]> = SmallVec::from_vec(vec![0; expected_len]);
 
 		match self.cipher {
 			Cipher::Aes128Ctr(ref params) => {
@@ -163,7 +159,7 @@ impl Crypto {
 #[cfg(test)]
 mod tests {
 	use ethkey::{Generator, Random};
-	use super::Crypto;
+	use super::{Crypto, Error};
 
 	#[test]
 	fn crypto_with_secret_create() {
@@ -174,11 +170,10 @@ mod tests {
 	}
 
 	#[test]
-	#[should_panic]
 	fn crypto_with_secret_invalid_password() {
 		let keypair = Random.generate().unwrap();
 		let crypto = Crypto::with_secret(keypair.secret(), "this is sparta", 10240);
-		let _ = crypto.secret("this is sparta!").unwrap();
+		assert_matches!(crypto.secret("this is sparta!"), Err(Error::InvalidPassword))
 	}
 
 	#[test]
diff --git a/ethstore/src/dir/disk.rs b/ethstore/src/accounts_dir/disk.rs
similarity index 78%
rename from ethstore/src/dir/disk.rs
rename to ethstore/src/accounts_dir/disk.rs
index 3f56ebe4062762e80130e14aef0c83a1d7dd3647..1446118440667bcce4afec375e4e45a4009f6d39 100755
--- a/ethstore/src/dir/disk.rs
+++ b/ethstore/src/accounts_dir/disk.rs
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::{fs, io};
+use std::io::Write;
 use std::path::{PathBuf, Path};
 use std::collections::HashMap;
 use time;
@@ -122,6 +123,13 @@ impl<T> DiskDirectory<T> where T: KeyFileManager {
 		Ok(hasher.finish())
 	}
 
+	fn last_modification_date(&self) -> Result<u64, Error> {
+		use std::time::{Duration, UNIX_EPOCH};
+		let duration = fs::metadata(&self.path)?.modified()?.duration_since(UNIX_EPOCH).unwrap_or(Duration::default());
+		let timestamp = duration.as_secs() ^ (duration.subsec_nanos() as u64);
+		Ok(timestamp)
+	}
+
 	/// all accounts found in keys directory
 	fn files_content(&self) -> Result<HashMap<PathBuf, SafeAccount>, Error> {
 		// it's not done using one iterator cause
@@ -145,31 +153,39 @@ impl<T> DiskDirectory<T> where T: KeyFileManager {
 		)
 	}
 
-	/// insert account with given file name
-	pub fn insert_with_filename(&self, account: SafeAccount, filename: String) -> Result<SafeAccount, Error> {
+
+	/// insert account with given filename. if the filename is a duplicate of any stored account and dedup is set to
+	/// true, a random suffix is appended to the filename.
+	pub fn insert_with_filename(&self, account: SafeAccount, mut filename: String, dedup: bool) -> Result<SafeAccount, Error> {
+		// path to keyfile
+		let mut keyfile_path = self.path.join(filename.as_str());
+
+		// check for duplicate filename and append random suffix
+		if dedup && keyfile_path.exists() {
+			let suffix = ::random::random_string(4);
+			filename.push_str(&format!("-{}", suffix));
+			keyfile_path.set_file_name(&filename);
+		}
+
 		// update account filename
 		let original_account = account.clone();
 		let mut account = account;
-		account.filename = Some(filename.clone());
+		account.filename = Some(filename);
 
 		{
-			// Path to keyfile
-			let mut keyfile_path = self.path.clone();
-			keyfile_path.push(filename.as_str());
-
 			// save the file
 			let mut file = fs::File::create(&keyfile_path)?;
-			if let Err(err) = self.key_manager.write(original_account, &mut file).map_err(|e| Error::Custom(format!("{:?}", e))) {
-				drop(file);
-				fs::remove_file(keyfile_path).expect("Expected to remove recently created file");
-				return Err(err);
-			}
+
+			// write key content
+			self.key_manager.write(original_account, &mut file).map_err(|e| Error::Custom(format!("{:?}", e)))?;
+
+			file.flush()?;
 
 			if let Err(_) = restrict_permissions_to_owner(keyfile_path.as_path()) {
-				drop(file);
-				fs::remove_file(keyfile_path).expect("Expected to remove recently created file");
 				return Err(Error::Io(io::Error::last_os_error()));
 			}
+
+			file.sync_all()?;
 		}
 
 		Ok(account)
@@ -192,17 +208,13 @@ impl<T> KeyDirectory for DiskDirectory<T> where T: KeyFileManager {
 
 	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
 		// Disk store handles updates correctly iff filename is the same
-		self.insert(account)
+		let filename = account_filename(&account);
+		self.insert_with_filename(account, filename, false)
 	}
 
 	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
-		// build file path
-		let filename = account.filename.as_ref().cloned().unwrap_or_else(|| {
-			let timestamp = time::strftime("%Y-%m-%dT%H-%M-%S", &time::now_utc()).expect("Time-format string is valid.");
-			format!("UTC--{}Z--{}", timestamp, Uuid::from(account.id))
-		});
-
-		self.insert_with_filename(account, filename)
+		let filename = account_filename(&account);
+		self.insert_with_filename(account, filename, true)
 	}
 
 	fn remove(&self, account: &SafeAccount) -> Result<(), Error> {
@@ -226,7 +238,7 @@ impl<T> KeyDirectory for DiskDirectory<T> where T: KeyFileManager {
 	}
 
 	fn unique_repr(&self) -> Result<u64, Error> {
-		self.files_hash()
+		self.last_modification_date()
 	}
 }
 
@@ -278,13 +290,20 @@ impl KeyFileManager for DiskKeyFileManager {
 	}
 }
 
+fn account_filename(account: &SafeAccount) -> String {
+	// build file path
+	account.filename.clone().unwrap_or_else(|| {
+		let timestamp = time::strftime("%Y-%m-%dT%H-%M-%S", &time::now_utc()).expect("Time-format string is valid.");
+		format!("UTC--{}Z--{}", timestamp, Uuid::from(account.id))
+	})
+}
+
 #[cfg(test)]
 mod test {
 	extern crate tempdir;
 
 	use std::{env, fs};
-	use super::RootDiskDirectory;
-	use dir::{KeyDirectory, VaultKey};
+	use super::{KeyDirectory, RootDiskDirectory, VaultKey};
 	use account::SafeAccount;
 	use ethkey::{Random, Generator};
 	use self::tempdir::TempDir;
@@ -310,6 +329,38 @@ mod test {
 		let _ = fs::remove_dir_all(dir);
 	}
 
+	#[test]
+	fn should_handle_duplicate_filenames() {
+		// given
+		let mut dir = env::temp_dir();
+		dir.push("ethstore_should_handle_duplicate_filenames");
+		let keypair = Random.generate().unwrap();
+		let password = "hello world";
+		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
+
+		// when
+		let account = SafeAccount::create(&keypair, [0u8; 16], password, 1024, "Test".to_owned(), "{}".to_owned());
+		let filename = "test".to_string();
+		let dedup = true;
+
+		directory.insert_with_filename(account.clone(), "foo".to_string(), dedup).unwrap();
+		let file1 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
+		let file2 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
+		let file3 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
+
+		// then
+		// the first file should have the original names
+		assert_eq!(file1, filename);
+
+		// the following duplicate files should have a suffix appended
+		assert!(file2 != file3);
+		assert_eq!(file2.len(), filename.len() + 5);
+		assert_eq!(file3.len(), filename.len() + 5);
+
+		// cleanup
+		let _ = fs::remove_dir_all(dir);
+	}
+
 	#[test]
 	fn should_manage_vaults() {
 		// given
diff --git a/ethstore/src/dir/memory.rs b/ethstore/src/accounts_dir/memory.rs
similarity index 89%
rename from ethstore/src/dir/memory.rs
rename to ethstore/src/accounts_dir/memory.rs
index b8c2ad9ff5b549f154b279b4dcdc1dd53b526a0e..bd162b5ef0ce7ca7b4360c323878b32b3cd8634d 100644
--- a/ethstore/src/dir/memory.rs
+++ b/ethstore/src/accounts_dir/memory.rs
@@ -35,7 +35,7 @@ impl KeyDirectory for MemoryDirectory {
 
 	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
 		let mut lock = self.accounts.write();
-		let mut accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
+		let accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
 		// If the filename is the same we just need to replace the entry
 		accounts.retain(|acc| acc.filename != account.filename);
 		accounts.push(account.clone());
@@ -44,14 +44,14 @@ impl KeyDirectory for MemoryDirectory {
 
 	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
 		let mut lock = self.accounts.write();
-		let mut accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
+		let accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
 		accounts.push(account.clone());
 		Ok(account)
 	}
 
 	fn remove(&self, account: &SafeAccount) -> Result<(), Error> {
 		let mut accounts = self.accounts.write();
-		let is_empty = if let Some(mut accounts) = accounts.get_mut(&account.address) {
+		let is_empty = if let Some(accounts) = accounts.get_mut(&account.address) {
 			if let Some(position) = accounts.iter().position(|acc| acc == account) {
 				accounts.remove(position);
 			}
diff --git a/ethstore/src/dir/mod.rs b/ethstore/src/accounts_dir/mod.rs
similarity index 99%
rename from ethstore/src/dir/mod.rs
rename to ethstore/src/accounts_dir/mod.rs
index b6e168f6e47788f290f719ef3ef25125657864fc..ec72d05da32895864a92536df06150549153015e 100755
--- a/ethstore/src/dir/mod.rs
+++ b/ethstore/src/accounts_dir/mod.rs
@@ -22,7 +22,6 @@ use {SafeAccount, Error};
 mod disk;
 mod memory;
 mod vault;
-pub mod paths;
 
 /// `VaultKeyDirectory::set_key` error
 #[derive(Debug)]
diff --git a/ethstore/src/dir/vault.rs b/ethstore/src/accounts_dir/vault.rs
similarity index 99%
rename from ethstore/src/dir/vault.rs
rename to ethstore/src/accounts_dir/vault.rs
index a7b3516436e287e104ea0dfec4e9e817ef6f7dbd..1ef85402a7ac91b0ecd4e9a73d4ad435cafdd040 100755
--- a/ethstore/src/dir/vault.rs
+++ b/ethstore/src/accounts_dir/vault.rs
@@ -106,7 +106,7 @@ impl VaultDiskDirectory {
 	fn copy_to_vault(&self, vault: &VaultDiskDirectory) -> Result<(), Error> {
 		for account in self.load()? {
 			let filename = account.filename.clone().expect("self is instance of DiskDirectory; DiskDirectory fills filename in load; qed");
-			vault.insert_with_filename(account, filename)?;
+			vault.insert_with_filename(account, filename, true)?;
 		}
 
 		Ok(())
@@ -284,7 +284,7 @@ mod test {
 	use std::fs;
 	use std::io::Write;
 	use std::path::PathBuf;
-	use dir::VaultKey;
+	use super::VaultKey;
 	use super::{VAULT_FILE_NAME, check_vault_name, make_vault_dir_path, create_vault_file, read_vault_file, VaultDiskDirectory};
 	use self::tempdir::TempDir;
 
diff --git a/ethstore/src/dir/paths.rs b/ethstore/src/dir/paths.rs
deleted file mode 100644
index db3178cff8d54037277f7338895aff401f590970..0000000000000000000000000000000000000000
--- a/ethstore/src/dir/paths.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Common tools paths.
-
-use std::env;
-use std::path::PathBuf;
-
-fn home() -> PathBuf {
-	env::home_dir().expect("Failed to get home dir")
-}
-
-/// Geth path
-pub fn geth(testnet: bool) -> PathBuf {
-	let mut base = geth_base();
-	if testnet {
-		base.push("testnet");
-	}
-	base.push("keystore");
-	base
-}
-
-/// Parity path for specific chain
-pub fn parity(chain: &str) -> PathBuf {
-	let mut base = parity_base();
-	base.push(chain);
-	base
-}
-
-#[cfg(target_os = "macos")]
-fn parity_base() -> PathBuf {
-	let mut home = home();
-	home.push("Library");
-	home.push("Application Support");
-	home.push("io.parity.ethereum");
-	home.push("keys");
-	home
-}
-
-#[cfg(windows)]
-fn parity_base() -> PathBuf {
-	let mut home = home();
-	home.push("AppData");
-	home.push("Roaming");
-	home.push("Parity");
-	home.push("Ethereum");
-	home.push("keys");
-	home
-}
-
-#[cfg(not(any(target_os = "macos", windows)))]
-fn parity_base() -> PathBuf {
-	let mut home = home();
-	home.push(".local");
-	home.push("share");
-	home.push("io.parity.ethereum");
-	home.push("keys");
-	home
-}
-
-#[cfg(target_os = "macos")]
-fn geth_base() -> PathBuf {
-	let mut home = home();
-	home.push("Library");
-	home.push("Ethereum");
-	home
-}
-
-#[cfg(windows)]
-fn geth_base() -> PathBuf {
-	let mut home = home();
-	home.push("AppData");
-	home.push("Roaming");
-	home.push("Ethereum");
-	home
-}
-
-#[cfg(not(any(target_os = "macos", windows)))]
-fn geth_base() -> PathBuf {
-	let mut home = home();
-	home.push(".ethereum");
-	home
-}
diff --git a/ethstore/src/ethstore.rs b/ethstore/src/ethstore.rs
index f3bb2407134f4c2912fc99492bccd4c5254fd900..40a687fc9880354c8ca8bdc8208ca43662b4b7bd 100755
--- a/ethstore/src/ethstore.rs
+++ b/ethstore/src/ethstore.rs
@@ -18,11 +18,12 @@ use std::collections::{BTreeMap, HashMap};
 use std::mem;
 use std::path::PathBuf;
 use parking_lot::{Mutex, RwLock};
+use std::time::{Instant, Duration};
 
 use crypto::KEY_ITERATIONS;
 use random::Random;
 use ethkey::{self, Signature, Address, Message, Secret, Public, KeyPair, ExtendedKeyPair};
-use dir::{KeyDirectory, VaultKeyDirectory, VaultKey, SetKeyError};
+use accounts_dir::{KeyDirectory, VaultKeyDirectory, VaultKey, SetKeyError};
 use account::SafeAccount;
 use presale::PresaleWallet;
 use json::{self, Uuid, OpaqueKeyFile};
@@ -46,6 +47,16 @@ impl EthStore {
 		})
 	}
 
+	/// Modify account refresh timeout - how often they are re-read from `KeyDirectory`.
+	///
+	/// Setting this to low values (or 0) will cause new accounts to be picked up quickly,
+	/// although it may induce heavy disk reads and is not recommended if you manage many keys (say over 10k).
+	///
+	/// By default refreshing is disabled, so only accounts created using this instance of `EthStore` are taken into account.
+	pub fn set_refresh_time(&self, time: Duration) {
+		self.store.set_refresh_time(time)
+	}
+
 	fn get(&self, account: &StoreAccountRef) -> Result<SafeAccount, Error> {
 		let mut accounts = self.store.get_accounts(account)?.into_iter();
 		accounts.next().ok_or(Error::InvalidAccount)
@@ -155,9 +166,14 @@ impl SecretStore for EthStore {
 		self.insert_account(vault, keypair.secret().clone(), password)
 	}
 
-	fn import_wallet(&self, vault: SecretVaultRef, json: &[u8], password: &str) -> Result<StoreAccountRef, Error> {
+	fn import_wallet(&self, vault: SecretVaultRef, json: &[u8], password: &str, gen_id: bool) -> Result<StoreAccountRef, Error> {
 		let json_keyfile = json::KeyFile::load(json).map_err(|_| Error::InvalidKeyFile("Invalid JSON format".to_owned()))?;
 		let mut safe_account = SafeAccount::from_file(json_keyfile, None);
+
+		if gen_id {
+			safe_account.id = Random::random();
+		}
+
 		let secret = safe_account.crypto.secret(password).map_err(|_| Error::InvalidPassword)?;
 		safe_account.address = KeyPair::from_secret(secret)?.address();
 		self.store.import(vault, safe_account)
@@ -245,7 +261,13 @@ pub struct EthMultiStore {
 	// order lock: cache, then vaults
 	cache: RwLock<BTreeMap<StoreAccountRef, Vec<SafeAccount>>>,
 	vaults: Mutex<HashMap<String, Box<VaultKeyDirectory>>>,
-	dir_hash: Mutex<Option<u64>>,
+	timestamp: Mutex<Timestamp>,
+}
+
+struct Timestamp {
+	dir_hash: Option<u64>,
+	last_checked: Instant,
+	refresh_time: Duration,
 }
 
 impl EthMultiStore {
@@ -261,20 +283,39 @@ impl EthMultiStore {
 			vaults: Mutex::new(HashMap::new()),
 			iterations: iterations,
 			cache: Default::default(),
-			dir_hash: Default::default(),
+			timestamp: Mutex::new(Timestamp {
+				dir_hash: None,
+				last_checked: Instant::now(),
+				// by default we never refresh accounts
+				refresh_time: Duration::from_secs(u64::max_value()),
+			}),
 		};
 		store.reload_accounts()?;
 		Ok(store)
 	}
 
+	/// Modify account refresh timeout - how often they are re-read from `KeyDirectory`.
+	///
+	/// Setting this to low values (or 0) will cause new accounts to be picked up quickly,
+	/// although it may induce heavy disk reads and is not recommended if you manage many keys (say over 10k).
+	///
+	/// By default refreshing is disabled, so only accounts created using this instance of `EthStore` are taken into account.
+	pub fn set_refresh_time(&self, time: Duration) {
+		self.timestamp.lock().refresh_time = time;
+	}
+
 	fn reload_if_changed(&self) -> Result<(), Error> {
-		let mut last_dir_hash = self.dir_hash.lock();
-		let dir_hash = Some(self.dir.unique_repr()?);
-		if *last_dir_hash == dir_hash {
-			return Ok(())
+		let mut last_timestamp = self.timestamp.lock();
+		let now = Instant::now();
+		if now - last_timestamp.last_checked > last_timestamp.refresh_time {
+			let dir_hash = Some(self.dir.unique_repr()?);
+			last_timestamp.last_checked = now;
+			if last_timestamp.dir_hash == dir_hash {
+				return Ok(())
+			}
+			self.reload_accounts()?;
+			last_timestamp.dir_hash = dir_hash;
 		}
-		self.reload_accounts()?;
-		*last_dir_hash = dir_hash;
 		Ok(())
 	}
 
@@ -304,22 +345,23 @@ impl EthMultiStore {
 	}
 
 	fn get_accounts(&self, account: &StoreAccountRef) -> Result<Vec<SafeAccount>, Error> {
-		{
+		let from_cache = |account| {
 			let cache = self.cache.read();
 			if let Some(accounts) = cache.get(account) {
 				if !accounts.is_empty() {
-					return Ok(accounts.clone())
+					return Some(accounts.clone())
 				}
 			}
-		}
 
-		self.reload_if_changed()?;
-		let cache = self.cache.read();
-		let accounts = cache.get(account).ok_or(Error::InvalidAccount)?;
-		if accounts.is_empty() {
-			Err(Error::InvalidAccount)
-		} else {
-			Ok(accounts.clone())
+			None
+		};
+
+		match from_cache(account) {
+			Some(accounts) => Ok(accounts),
+			None => {
+				self.reload_if_changed()?;
+				from_cache(account).ok_or(Error::InvalidAccount)
+			}
 		}
 	}
 
@@ -358,7 +400,7 @@ impl EthMultiStore {
 
 		// update cache
 		let mut cache = self.cache.write();
-		let mut accounts = cache.entry(account_ref.clone()).or_insert_with(Vec::new);
+		let accounts = cache.entry(account_ref.clone()).or_insert_with(Vec::new);
 		// Remove old account
 		accounts.retain(|acc| acc != &old);
 		// And push updated to the end
@@ -455,11 +497,20 @@ impl SimpleSecretStore for EthMultiStore {
 	}
 
 	fn account_ref(&self, address: &Address) -> Result<StoreAccountRef, Error> {
-		self.reload_if_changed()?;
-		self.cache.read().keys()
-			.find(|r| &r.address == address)
-			.cloned()
-			.ok_or(Error::InvalidAccount)
+		let read_from_cache = |address: &Address| {
+			use std::collections::Bound;
+			let cache = self.cache.read();
+			let mut r = cache.range((Bound::Included(*address), Bound::Included(*address)));
+			r.next().map(|(k, _)| k.clone())
+		};
+
+		match read_from_cache(address) {
+			Some(account) => Ok(account),
+			None => {
+				self.reload_if_changed()?;
+				read_from_cache(address).ok_or(Error::InvalidAccount)
+			}
+		}
 	}
 
 	fn accounts(&self) -> Result<Vec<StoreAccountRef>, Error> {
@@ -638,12 +689,12 @@ impl SimpleSecretStore for EthMultiStore {
 mod tests {
 	extern crate tempdir;
 
-	use dir::{KeyDirectory, MemoryDirectory, RootDiskDirectory};
+	use accounts_dir::{KeyDirectory, MemoryDirectory, RootDiskDirectory};
 	use ethkey::{Random, Generator, KeyPair};
 	use secret_store::{SimpleSecretStore, SecretStore, SecretVaultRef, StoreAccountRef, Derivation};
 	use super::{EthStore, EthMultiStore};
 	use self::tempdir::TempDir;
-	use bigint::hash::H256;
+	use ethereum_types::H256;
 
 	fn keypair() -> KeyPair {
 		Random.generate().unwrap()
diff --git a/ethstore/src/import.rs b/ethstore/src/import.rs
index 2b2c34eb19f101a1bf37cad5295485caefdfc964..2aaef51f504153d9808790f48e0b281137bc6b12 100644
--- a/ethstore/src/import.rs
+++ b/ethstore/src/import.rs
@@ -19,7 +19,8 @@ use std::path::Path;
 use std::fs;
 
 use ethkey::Address;
-use dir::{paths, KeyDirectory, RootDiskDirectory, DiskKeyFileManager, KeyFileManager};
+use accounts_dir::{KeyDirectory, RootDiskDirectory, DiskKeyFileManager, KeyFileManager};
+use dir;
 use Error;
 
 /// Import an account from a file.
@@ -54,7 +55,7 @@ pub fn import_accounts(src: &KeyDirectory, dst: &KeyDirectory) -> Result<Vec<Add
 
 /// Provide a `HashSet` of all accounts available for import from the Geth keystore.
 pub fn read_geth_accounts(testnet: bool) -> Vec<Address> {
-	RootDiskDirectory::at(paths::geth(testnet))
+	RootDiskDirectory::at(dir::geth(testnet))
 		.load()
 		.map(|d| d.into_iter().map(|a| a.address).collect())
 		.unwrap_or_else(|_| Vec::new())
@@ -62,7 +63,7 @@ pub fn read_geth_accounts(testnet: bool) -> Vec<Address> {
 
 /// Import specific `desired` accounts from the Geth keystore into `dst`.
 pub fn import_geth_accounts(dst: &KeyDirectory, desired: HashSet<Address>, testnet: bool) -> Result<Vec<Address>, Error> {
-	let src = RootDiskDirectory::at(paths::geth(testnet));
+	let src = RootDiskDirectory::at(dir::geth(testnet));
 	let accounts = src.load()?;
 	let existing_accounts = dst.load()?.into_iter().map(|a| a.address).collect::<HashSet<_>>();
 
diff --git a/ethstore/src/lib.rs b/ethstore/src/lib.rs
index 65935f89ca06b72de82d180a6709c56ec0e1e013..3422a5ff72f7885a7f607854c3fca37a28abca0b 100755
--- a/ethstore/src/lib.rs
+++ b/ethstore/src/lib.rs
@@ -19,6 +19,7 @@
 #![warn(missing_docs)]
 
 extern crate crypto as rcrypto;
+extern crate dir;
 extern crate itertools;
 extern crate libc;
 extern crate parking_lot;
@@ -27,12 +28,13 @@ extern crate rustc_hex;
 extern crate serde;
 extern crate serde_json;
 extern crate smallvec;
+extern crate subtle;
 extern crate time;
 extern crate tiny_keccak;
 extern crate tempdir;
 
-extern crate ethcore_bigint as bigint;
 extern crate ethcrypto as crypto;
+extern crate ethereum_types;
 extern crate ethkey as _ethkey;
 extern crate parity_wordlist;
 
@@ -41,7 +43,11 @@ extern crate log;
 #[macro_use]
 extern crate serde_derive;
 
-pub mod dir;
+#[cfg(test)]
+#[macro_use]
+extern crate matches;
+
+pub mod accounts_dir;
 pub mod ethkey;
 
 mod account;
diff --git a/ethstore/src/secret_store.rs b/ethstore/src/secret_store.rs
index e364245b79943fa396bc7946285273f6e0610e4e..ebac2f992292cb0e79dfe6b1932aded84f752578 100755
--- a/ethstore/src/secret_store.rs
+++ b/ethstore/src/secret_store.rs
@@ -16,10 +16,11 @@
 
 use std::hash::{Hash, Hasher};
 use std::path::PathBuf;
+use std::cmp::Ordering;
 use ethkey::{Address, Message, Signature, Secret, Public};
 use Error;
 use json::{Uuid, OpaqueKeyFile};
-use bigint::hash::H256;
+use ethereum_types::H256;
 use OpaqueSecret;
 
 /// Key directory reference
@@ -32,12 +33,24 @@ pub enum SecretVaultRef {
 }
 
 /// Stored account reference
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, PartialEq, Eq, Ord)]
 pub struct StoreAccountRef {
-	/// Vault reference
-	pub vault: SecretVaultRef,
 	/// Account address
 	pub address: Address,
+	/// Vault reference
+	pub vault: SecretVaultRef,
+}
+
+impl PartialOrd for StoreAccountRef {
+	fn partial_cmp(&self, other: &StoreAccountRef) -> Option<Ordering> {
+		Some(self.address.cmp(&other.address).then_with(|| self.vault.cmp(&other.vault)))
+	}
+}
+
+impl ::std::borrow::Borrow<Address> for StoreAccountRef {
+	fn borrow(&self) -> &Address {
+		&self.address
+	}
 }
 
 /// Simple Secret Store API
@@ -103,7 +116,7 @@ pub trait SecretStore: SimpleSecretStore {
 	/// Imports presale wallet
 	fn import_presale(&self, vault: SecretVaultRef, json: &[u8], password: &str) -> Result<StoreAccountRef, Error>;
 	/// Imports existing JSON wallet
-	fn import_wallet(&self, vault: SecretVaultRef, json: &[u8], password: &str) -> Result<StoreAccountRef, Error>;
+	fn import_wallet(&self, vault: SecretVaultRef, json: &[u8], password: &str, gen_id: bool) -> Result<StoreAccountRef, Error>;
 	/// Copies account between stores and vaults.
 	fn copy_account(&self, new_store: &SimpleSecretStore, new_vault: SecretVaultRef, account: &StoreAccountRef, password: &str, new_password: &str) -> Result<(), Error>;
 	/// Checks if password matches given account.
diff --git a/ethstore/tests/api.rs b/ethstore/tests/api.rs
index a70163895a45a6c593ba4cdefd1585431baeddf3..fb24ff3367d73661ffad6718f15c7784dd2b060e 100755
--- a/ethstore/tests/api.rs
+++ b/ethstore/tests/api.rs
@@ -21,7 +21,7 @@ mod util;
 
 use ethstore::{EthStore, SimpleSecretStore, SecretVaultRef, StoreAccountRef};
 use ethstore::ethkey::{Random, Generator, Secret, KeyPair, verify_address};
-use ethstore::dir::RootDiskDirectory;
+use ethstore::accounts_dir::RootDiskDirectory;
 use util::TransientDir;
 
 #[test]
diff --git a/ethstore/tests/util/transient_dir.rs b/ethstore/tests/util/transient_dir.rs
index 45e2aab09d5771542bc8f3824eebbf71af60f553..dcc65ec6985365f918fc4aa4d2c5ecb8261cb4f9 100755
--- a/ethstore/tests/util/transient_dir.rs
+++ b/ethstore/tests/util/transient_dir.rs
@@ -17,7 +17,7 @@
 use std::path::PathBuf;
 use std::{env, fs};
 use rand::{Rng, OsRng};
-use ethstore::dir::{KeyDirectory, RootDiskDirectory};
+use ethstore::accounts_dir::{KeyDirectory, RootDiskDirectory};
 use ethstore::{Error, SafeAccount};
 
 pub fn random_dir() -> PathBuf {
diff --git a/evmbin/Cargo.toml b/evmbin/Cargo.toml
index 5538e10cc02eb447b730a9b6b69d0506f611496b..000019214a7c789efc8c8fb165e7939e3c57730e 100644
--- a/evmbin/Cargo.toml
+++ b/evmbin/Cargo.toml
@@ -9,16 +9,22 @@ name = "parity-evm"
 path = "./src/main.rs"
 
 [dependencies]
-rustc-hex = "1.0"
 docopt = "0.8"
-serde = "1.0"
-serde_derive = "1.0"
 ethcore = { path = "../ethcore" }
 ethjson = { path = "../json" }
-ethcore-util = { path = "../util" }
+ethcore-bytes = { path = "../util/bytes" }
+ethcore-transaction = { path = "../ethcore/transaction" }
+ethereum-types = "0.2"
 evm = { path = "../ethcore/evm" }
+panic_hook = { path = "../util/panic_hook" }
+rustc-hex = "1.0"
+serde = "1.0"
+serde_derive = "1.0"
 vm = { path = "../ethcore/vm" }
-panic_hook = { path = "../panic_hook" }
+
+[dev-dependencies]
+pretty_assertions = "0.1"
+tempdir = "0.3"
 
 [features]
 evm-debug = ["ethcore/evm-debug-tests"]
diff --git a/evmbin/benches/mod.rs b/evmbin/benches/mod.rs
index f4deda88e6f49a1283abaa45fc31f62a75d31923..6b6746e747b25354c3cbcf2cd6b35b3b4a697c2a 100644
--- a/evmbin/benches/mod.rs
+++ b/evmbin/benches/mod.rs
@@ -26,13 +26,14 @@ extern crate test;
 extern crate ethcore;
 extern crate evm;
 extern crate ethcore_util;
+extern crate ethcore_bigint;
 extern crate rustc_hex;
 
 use self::test::{Bencher, black_box};
 
 use evm::run_vm;
 use ethcore::vm::ActionParams;
-use ethcore_util::U256;
+use ethcore_bigint::prelude::U256;
 use rustc_hex::FromHex;
 
 #[bench]
diff --git a/evmbin/src/display/json.rs b/evmbin/src/display/json.rs
index 39147ffa34df99b8964afa1c337b2d99bbd937b4..00ca91b94fef22d9bf7de73257877f4386921969 100644
--- a/evmbin/src/display/json.rs
+++ b/evmbin/src/display/json.rs
@@ -16,9 +16,12 @@
 
 //! JSON VM output.
 
-use ethcore::trace;
 use std::collections::HashMap;
-use util::{U256, H256, ToPretty};
+use std::mem;
+
+use ethereum_types::{U256, H256};
+use bytes::ToPretty;
+use ethcore::trace;
 
 use display;
 use info as vm;
@@ -35,6 +38,9 @@ pub struct Informant {
 	stack: Vec<U256>,
 	memory: Vec<u8>,
 	storage: HashMap<H256, H256>,
+	traces: Vec<String>,
+	subtraces: Vec<String>,
+	unmatched: bool,
 }
 
 impl Informant {
@@ -43,7 +49,7 @@ impl Informant {
 	}
 
 	fn stack(&self) -> String {
-		let items = self.stack.iter().map(display::u256_as_str).collect::<Vec<_>>();
+		let items = self.stack.iter().map(|i| format!("\"0x{:x}\"", i)).collect::<Vec<_>>();
 		format!("[{}]", items.join(","))
 	}
 
@@ -56,7 +62,7 @@ impl Informant {
 }
 
 impl vm::Informant for Informant {
-	fn before_test(&self, name: &str, action: &str) {
+	fn before_test(&mut self, name: &str, action: &str) {
 		println!(
 			"{{\"test\":\"{name}\",\"action\":\"{action}\"}}",
 			name = name,
@@ -68,28 +74,43 @@ impl vm::Informant for Informant {
 		self.gas_used = gas;
 	}
 
-	fn finish(result: Result<vm::Success, vm::Failure>) {
+	fn finish(result: vm::RunResult<Self::Output>) {
 		match result {
-			Ok(success) => println!(
-				"{{\"output\":\"0x{output}\",\"gasUsed\":\"{gas:x}\",\"time\":{time}}}",
-				output = success.output.to_hex(),
-				gas = success.gas_used,
-				time = display::as_micros(&success.time),
-			),
-			Err(failure) => println!(
-				"{{\"error\":\"{error}\",\"gasUsed\":\"{gas:x}\",\"time\":{time}}}",
-				error = failure.error,
-				gas = failure.gas_used,
-				time = display::as_micros(&failure.time),
-			),
+			Ok(success) => {
+				for trace in success.traces.unwrap_or_else(Vec::new) {
+					println!("{}", trace);
+				}
+
+				println!(
+					"{{\"output\":\"0x{output}\",\"gasUsed\":\"{gas:x}\",\"time\":{time}}}",
+					output = success.output.to_hex(),
+					gas = success.gas_used,
+					time = display::as_micros(&success.time),
+				)
+			},
+			Err(failure) => {
+				for trace in failure.traces.unwrap_or_else(Vec::new) {
+					println!("{}", trace);
+				}
+
+				println!(
+					"{{\"error\":\"{error}\",\"gasUsed\":\"{gas:x}\",\"time\":{time}}}",
+					error = failure.error,
+					gas = failure.gas_used,
+					time = display::as_micros(&failure.time),
+				)
+			},
 		}
 	}
 }
 
 impl trace::VMTracer for Informant {
-	fn trace_next_instruction(&mut self, pc: usize, instruction: u8) -> bool {
+	type Output = Vec<String>;
+
+	fn trace_next_instruction(&mut self, pc: usize, instruction: u8, _current_gas: U256) -> bool {
 		self.pc = pc;
 		self.instruction = instruction;
+		self.unmatched = true;
 		true
 	}
 
@@ -102,25 +123,28 @@ impl trace::VMTracer for Informant {
 	fn trace_executed(&mut self, gas_used: U256, stack_push: &[U256], mem_diff: Option<(usize, &[u8])>, store_diff: Option<(U256, U256)>) {
 		let info = ::evm::INSTRUCTIONS[self.instruction as usize];
 
-		println!(
-			"{{\"pc\":{pc},\"op\":{op},\"opName\":\"{name}\",\"gas\":{gas},\"gasCost\":{gas_cost},\"memory\":{memory},\"stack\":{stack},\"storage\":{storage},\"depth\":{depth}}}",
+		let trace = format!(
+			"{{\"pc\":{pc},\"op\":{op},\"opName\":\"{name}\",\"gas\":\"0x{gas:x}\",\"gasCost\":\"0x{gas_cost:x}\",\"memory\":{memory},\"stack\":{stack},\"storage\":{storage},\"depth\":{depth}}}",
 			pc = self.pc,
 			op = self.instruction,
 			name = info.name,
-			gas = display::u256_as_str(&(gas_used + self.gas_cost)),
-			gas_cost = display::u256_as_str(&self.gas_cost),
+			gas = gas_used.saturating_add(self.gas_cost),
+			gas_cost = self.gas_cost,
 			memory = self.memory(),
 			stack = self.stack(),
 			storage = self.storage(),
 			depth = self.depth,
 		);
+		self.traces.push(trace);
 
+		self.unmatched = false;
 		self.gas_used = gas_used;
 
 		let len = self.stack.len();
 		self.stack.truncate(if len > info.args { len - info.args } else { 0 });
 		self.stack.extend_from_slice(stack_push);
 
+		// TODO [ToDr] Align memory?
 		if let Some((pos, data)) = mem_diff {
 			if self.memory.len() < (pos + data.len()) {
 				self.memory.resize(pos + data.len(), 0);
@@ -131,6 +155,11 @@ impl trace::VMTracer for Informant {
 		if let Some((pos, val)) = store_diff {
 			self.storage.insert(pos.into(), val.into());
 		}
+
+
+		if !self.subtraces.is_empty() {
+			self.traces.extend(mem::replace(&mut self.subtraces, vec![]));
+		}
 	}
 
 	fn prepare_subtrace(&self, code: &[u8]) -> Self where Self: Sized {
@@ -141,14 +170,117 @@ impl trace::VMTracer for Informant {
 		vm
 	}
 
-	fn done_subtrace(&mut self, mut sub: Self) {
-		if sub.depth == 1 {
+	fn done_subtrace(&mut self, sub: Self) {
+		if let Some(subtraces) = sub.drain() {
+			self.subtraces.extend(subtraces);
+		}
+	}
+
+	fn drain(mut self) -> Option<Self::Output> {
+		if self.unmatched {
 			// print last line with final state:
-			sub.gas_cost = 0.into();
-			let gas_used = sub.gas_used;
-			trace::VMTracer::trace_executed(&mut sub, gas_used, &[], None, None);
+			self.gas_cost = 0.into();
+			let gas_used = self.gas_used;
+			self.trace_executed(gas_used, &[], None, None);
+		} else if !self.subtraces.is_empty() {
+			self.traces.extend(mem::replace(&mut self.subtraces, vec![]));
 		}
+		Some(self.traces)
 	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use info::tests::run_test;
 
-	fn drain(self) -> Option<trace::VMTrace> { None }
+	fn assert_traces_eq(
+		a: &[String],
+		b: &[String],
+	) {
+		let mut ita = a.iter();
+		let mut itb = b.iter();
+
+		loop {
+			match (ita.next(), itb.next()) {
+				(Some(a), Some(b)) => {
+					assert_eq!(a, b);
+					println!("{}", a);
+				},
+				(None, None) => return,
+				e => {
+					panic!("Traces mismatch: {:?}", e);
+				}
+			}
+		}
+	}
+
+	fn compare_json(traces: Option<Vec<String>>, expected: &str) {
+		let expected = expected.split("\n")
+			.map(|x| x.trim())
+			.map(|x| x.to_owned())
+			.filter(|x| !x.is_empty())
+			.collect::<Vec<_>>();
+		assert_traces_eq(&traces.unwrap(), &expected);
+	}
+
+	#[test]
+	fn should_trace_failure() {
+		run_test(
+			Informant::default(),
+			&compare_json,
+			"60F8d6",
+			0xffff,
+			r#"
+{"pc":0,"op":96,"opName":"PUSH1","gas":"0xffff","gasCost":"0x3","memory":"0x","stack":[],"storage":{},"depth":1}
+{"pc":2,"op":214,"opName":"","gas":"0xfffc","gasCost":"0x0","memory":"0x","stack":["0xf8"],"storage":{},"depth":1}
+			"#,
+		);
+
+		run_test(
+			Informant::default(),
+			&compare_json,
+			"F8d6",
+			0xffff,
+			r#"
+{"pc":0,"op":248,"opName":"","gas":"0xffff","gasCost":"0x0","memory":"0x","stack":[],"storage":{},"depth":1}
+			"#,
+		);
+	}
+
+	#[test]
+	fn should_trace_create_correctly() {
+		run_test(
+			Informant::default(),
+			&compare_json,
+			"32343434345830f138343438323439f0",
+			0xffff,
+			r#"
+{"pc":0,"op":50,"opName":"ORIGIN","gas":"0xffff","gasCost":"0x2","memory":"0x","stack":[],"storage":{},"depth":1}
+{"pc":1,"op":52,"opName":"CALLVALUE","gas":"0xfffd","gasCost":"0x2","memory":"0x","stack":["0x0"],"storage":{},"depth":1}
+{"pc":2,"op":52,"opName":"CALLVALUE","gas":"0xfffb","gasCost":"0x2","memory":"0x","stack":["0x0","0x0"],"storage":{},"depth":1}
+{"pc":3,"op":52,"opName":"CALLVALUE","gas":"0xfff9","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0"],"storage":{},"depth":1}
+{"pc":4,"op":52,"opName":"CALLVALUE","gas":"0xfff7","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0"],"storage":{},"depth":1}
+{"pc":5,"op":88,"opName":"PC","gas":"0xfff5","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0"],"storage":{},"depth":1}
+{"pc":6,"op":48,"opName":"ADDRESS","gas":"0xfff3","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0","0x5"],"storage":{},"depth":1}
+{"pc":7,"op":241,"opName":"CALL","gas":"0xfff1","gasCost":"0x61d0","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0","0x5","0x0"],"storage":{},"depth":1}
+{"pc":8,"op":56,"opName":"CODESIZE","gas":"0x9e21","gasCost":"0x2","memory":"0x","stack":["0x1"],"storage":{},"depth":1}
+{"pc":9,"op":52,"opName":"CALLVALUE","gas":"0x9e1f","gasCost":"0x2","memory":"0x","stack":["0x1","0x10"],"storage":{},"depth":1}
+{"pc":10,"op":52,"opName":"CALLVALUE","gas":"0x9e1d","gasCost":"0x2","memory":"0x","stack":["0x1","0x10","0x0"],"storage":{},"depth":1}
+{"pc":11,"op":56,"opName":"CODESIZE","gas":"0x9e1b","gasCost":"0x2","memory":"0x","stack":["0x1","0x10","0x0","0x0"],"storage":{},"depth":1}
+{"pc":12,"op":50,"opName":"ORIGIN","gas":"0x9e19","gasCost":"0x2","memory":"0x","stack":["0x1","0x10","0x0","0x0","0x10"],"storage":{},"depth":1}
+{"pc":13,"op":52,"opName":"CALLVALUE","gas":"0x9e17","gasCost":"0x2","memory":"0x","stack":["0x1","0x10","0x0","0x0","0x10","0x0"],"storage":{},"depth":1}
+{"pc":14,"op":57,"opName":"CODECOPY","gas":"0x9e15","gasCost":"0x9","memory":"0x","stack":["0x1","0x10","0x0","0x0","0x10","0x0","0x0"],"storage":{},"depth":1}
+{"pc":15,"op":240,"opName":"CREATE","gas":"0x9e0c","gasCost":"0x9e0c","memory":"0x32343434345830f138343438323439f0","stack":["0x1","0x10","0x0","0x0"],"storage":{},"depth":1}
+{"pc":0,"op":50,"opName":"ORIGIN","gas":"0x210c","gasCost":"0x2","memory":"0x","stack":[],"storage":{},"depth":2}
+{"pc":1,"op":52,"opName":"CALLVALUE","gas":"0x210a","gasCost":"0x2","memory":"0x","stack":["0x0"],"storage":{},"depth":2}
+{"pc":2,"op":52,"opName":"CALLVALUE","gas":"0x2108","gasCost":"0x2","memory":"0x","stack":["0x0","0x0"],"storage":{},"depth":2}
+{"pc":3,"op":52,"opName":"CALLVALUE","gas":"0x2106","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0"],"storage":{},"depth":2}
+{"pc":4,"op":52,"opName":"CALLVALUE","gas":"0x2104","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0"],"storage":{},"depth":2}
+{"pc":5,"op":88,"opName":"PC","gas":"0x2102","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0"],"storage":{},"depth":2}
+{"pc":6,"op":48,"opName":"ADDRESS","gas":"0x2100","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0","0x5"],"storage":{},"depth":2}
+{"pc":7,"op":241,"opName":"CALL","gas":"0x20fe","gasCost":"0x0","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0","0x5","0xbd770416a3345f91e4b34576cb804a576fa48eb1"],"storage":{},"depth":2}
+			"#,
+		)
+	}
 }
diff --git a/evmbin/src/display/mod.rs b/evmbin/src/display/mod.rs
index 2c25fe7219fec1e0dc8ab485389a99c1c1524d7f..b9390058b6022230c745786f9cdcb32caa0dac50 100644
--- a/evmbin/src/display/mod.rs
+++ b/evmbin/src/display/mod.rs
@@ -17,9 +17,9 @@
 //! VM Output display utils.
 
 use std::time::Duration;
-use util::U256;
 
 pub mod json;
+pub mod std_json;
 pub mod simple;
 
 /// Formats duration into human readable format.
@@ -31,13 +31,3 @@ pub fn format_time(time: &Duration) -> String {
 pub fn as_micros(time: &Duration) -> u64 {
 	time.as_secs() * 1_000_000 + time.subsec_nanos() as u64 / 1_000
 }
-
-/// Converts U256 into string.
-/// TODO Overcomes: https://github.com/paritytech/bigint/issues/13
-pub fn u256_as_str(v: &U256) -> String {
-	if v.is_zero() {
-		"\"0x0\"".into()
-	} else {
-		format!("\"{:x}\"", v)
-	}
-}
diff --git a/evmbin/src/display/simple.rs b/evmbin/src/display/simple.rs
index bb4ecc12744e63cd5b83a0a9eb9e655fcd8679a0..30bb8ffcf7a286c8a6f557f3fd04efbb95764b26 100644
--- a/evmbin/src/display/simple.rs
+++ b/evmbin/src/display/simple.rs
@@ -17,7 +17,7 @@
 //! Simple VM output.
 
 use ethcore::trace;
-use util::ToPretty;
+use bytes::ToPretty;
 
 use display;
 use info as vm;
@@ -27,11 +27,11 @@ use info as vm;
 pub struct Informant;
 
 impl vm::Informant for Informant {
-	fn before_test(&self, name: &str, action: &str) {
+	fn before_test(&mut self, name: &str, action: &str) {
 		println!("Test: {} ({})", name, action);
 	}
 
-	fn finish(result: Result<vm::Success, vm::Failure>) {
+	fn finish(result: vm::RunResult<Self::Output>) {
 		match result {
 			Ok(success) => {
 				println!("Output: 0x{}", success.output.to_hex());
@@ -47,7 +47,9 @@ impl vm::Informant for Informant {
 }
 
 impl trace::VMTracer for Informant {
+	type Output = ();
+
 	fn prepare_subtrace(&self, _code: &[u8]) -> Self where Self: Sized { Default::default() }
 	fn done_subtrace(&mut self, _sub: Self) {}
-	fn drain(self) -> Option<trace::VMTrace> { None }
+	fn drain(self) -> Option<()> { None }
 }
diff --git a/evmbin/src/display/std_json.rs b/evmbin/src/display/std_json.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3d8f52dbd1f744068788aaca69d76b6e4313b0e7
--- /dev/null
+++ b/evmbin/src/display/std_json.rs
@@ -0,0 +1,265 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Standardized JSON VM output.
+
+use std::collections::HashMap;
+use std::io;
+
+use ethereum_types::{H256, U256};
+use bytes::ToPretty;
+use ethcore::trace;
+
+use display;
+use info as vm;
+
+pub trait Writer: io::Write + Send + Sized {
+	fn clone(&self) -> Self;
+}
+
+impl Writer for io::Stdout {
+	fn clone(&self) -> Self {
+		io::stdout()
+	}
+}
+
+/// JSON formatting informant.
+pub struct Informant<T: Writer = io::Stdout> {
+	code: Vec<u8>,
+	instruction: u8,
+	depth: usize,
+	stack: Vec<U256>,
+	storage: HashMap<H256, H256>,
+	sink: T,
+}
+
+impl Default for Informant {
+	fn default() -> Self {
+		Self::new(io::stdout())
+	}
+}
+
+impl<T: Writer> Informant<T> {
+	pub fn new(sink: T) -> Self {
+		Informant {
+			code: Default::default(),
+			instruction: Default::default(),
+			depth: Default::default(),
+			stack: Default::default(),
+			storage: Default::default(),
+			sink,
+		}
+	}
+}
+
+impl<T: Writer> Informant<T> {
+	fn stack(&self) -> String {
+		let items = self.stack.iter().map(|i| format!("\"0x{:x}\"", i)).collect::<Vec<_>>();
+		format!("[{}]", items.join(","))
+	}
+
+	fn storage(&self) -> String {
+		let vals = self.storage.iter()
+			.map(|(k, v)| format!("\"0x{:?}\": \"0x{:?}\"", k, v))
+			.collect::<Vec<_>>();
+		format!("{{{}}}", vals.join(","))
+	}
+}
+
+impl<T: Writer> vm::Informant for Informant<T> {
+	fn before_test(&mut self, name: &str, action: &str) {
+		writeln!(
+			&mut self.sink,
+			"{{\"test\":\"{name}\",\"action\":\"{action}\"}}",
+			name = name,
+			action = action,
+		).expect("The sink must be writeable.");
+	}
+
+	fn set_gas(&mut self, _gas: U256) {}
+
+	fn finish(result: vm::RunResult<Self::Output>) {
+		match result {
+			Ok(success) => {
+				println!("{{\"stateRoot\":\"{:?}\"}}", success.state_root);
+				println!(
+					"{{\"output\":\"0x{output}\",\"gasUsed\":\"{gas:x}\",\"time\":{time}}}",
+					output = success.output.to_hex(),
+					gas = success.gas_used,
+					time = display::as_micros(&success.time),
+				);
+			},
+			Err(failure) => {
+				println!(
+					"{{\"error\":\"{error}\",\"gasUsed\":\"{gas:x}\",\"time\":{time}}}",
+					error = failure.error,
+					gas = failure.gas_used,
+					time = display::as_micros(&failure.time),
+				)
+			},
+		}
+	}
+}
+
+impl<T: Writer> trace::VMTracer for Informant<T> {
+	type Output = ();
+
+	fn trace_next_instruction(&mut self, pc: usize, instruction: u8, current_gas: U256) -> bool {
+		let info = ::evm::INSTRUCTIONS[instruction as usize];
+		self.instruction = instruction;
+		let storage = self.storage();
+		let stack = self.stack();
+
+		writeln!(
+			&mut self.sink,
+			"{{\"pc\":{pc},\"op\":{op},\"opName\":\"{name}\",\"gas\":\"0x{gas:x}\",\"stack\":{stack},\"storage\":{storage},\"depth\":{depth}}}",
+			pc = pc,
+			op = instruction,
+			name = info.name,
+			gas = current_gas,
+			stack = stack,
+			storage = storage,
+			depth = self.depth,
+		).expect("The sink must be writeable.");
+
+		true
+	}
+
+	fn trace_prepare_execute(&mut self, _pc: usize, _instruction: u8, _gas_cost: U256) {
+	}
+
+	fn trace_executed(&mut self, _gas_used: U256, stack_push: &[U256], _mem_diff: Option<(usize, &[u8])>, store_diff: Option<(U256, U256)>) {
+		let info = ::evm::INSTRUCTIONS[self.instruction as usize];
+
+		let len = self.stack.len();
+		self.stack.truncate(if len > info.args { len - info.args } else { 0 });
+		self.stack.extend_from_slice(stack_push);
+
+		if let Some((pos, val)) = store_diff {
+			self.storage.insert(pos.into(), val.into());
+		}
+	}
+
+	fn prepare_subtrace(&self, code: &[u8]) -> Self where Self: Sized {
+		let mut vm = Informant::new(self.sink.clone());
+		vm.depth = self.depth + 1;
+		vm.code = code.to_vec();
+		vm
+	}
+
+	fn done_subtrace(&mut self, _sub: Self) {}
+
+	fn drain(self) -> Option<Self::Output> { None }
+}
+
+#[cfg(test)]
+mod tests {
+	use std::sync::{Arc, Mutex};
+	use super::*;
+	use info::tests::run_test;
+
+	#[derive(Debug, Clone, Default)]
+	struct TestWriter(pub Arc<Mutex<Vec<u8>>>);
+
+	impl Writer for TestWriter {
+		fn clone(&self) -> Self { Clone::clone(self) }
+	}
+
+	impl io::Write for TestWriter {
+		fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+			self.0.lock().unwrap().write(buf)
+		}
+
+		fn flush(&mut self) -> io::Result<()> {
+			self.0.lock().unwrap().flush()
+		}
+	}
+
+	fn informant() -> (Informant<TestWriter>, Arc<Mutex<Vec<u8>>>) {
+		let writer = TestWriter::default();
+		let res = writer.0.clone();
+		(Informant::new(writer), res)
+	}
+
+	#[test]
+	fn should_trace_failure() {
+		let (inf, res) = informant();
+		run_test(
+			inf,
+			move |_, expected| {
+				let bytes = res.lock().unwrap();
+				assert_eq!(expected, &String::from_utf8_lossy(&**bytes))
+			},
+			"60F8d6",
+			0xffff,
+			r#"{"pc":0,"op":96,"opName":"PUSH1","gas":"0xffff","stack":[],"storage":{},"depth":1}
+{"pc":2,"op":214,"opName":"","gas":"0xfffc","stack":["0xf8"],"storage":{},"depth":1}
+"#,
+		);
+
+		let (inf, res) = informant();
+		run_test(
+			inf,
+			move |_, expected| {
+				let bytes = res.lock().unwrap();
+				assert_eq!(expected, &String::from_utf8_lossy(&**bytes))
+			},
+			"F8d6",
+			0xffff,
+			r#"{"pc":0,"op":248,"opName":"","gas":"0xffff","stack":[],"storage":{},"depth":1}
+"#,
+		);
+	}
+
+	#[test]
+	fn should_trace_create_correctly() {
+		let (informant, res) = informant();
+		run_test(
+			informant,
+			move |_, expected| {
+				let bytes = res.lock().unwrap();
+				assert_eq!(expected, &String::from_utf8_lossy(&**bytes))
+			},
+			"32343434345830f138343438323439f0",
+			0xffff,
+			r#"{"pc":0,"op":50,"opName":"ORIGIN","gas":"0xffff","stack":[],"storage":{},"depth":1}
+{"pc":1,"op":52,"opName":"CALLVALUE","gas":"0xfffd","stack":["0x0"],"storage":{},"depth":1}
+{"pc":2,"op":52,"opName":"CALLVALUE","gas":"0xfffb","stack":["0x0","0x0"],"storage":{},"depth":1}
+{"pc":3,"op":52,"opName":"CALLVALUE","gas":"0xfff9","stack":["0x0","0x0","0x0"],"storage":{},"depth":1}
+{"pc":4,"op":52,"opName":"CALLVALUE","gas":"0xfff7","stack":["0x0","0x0","0x0","0x0"],"storage":{},"depth":1}
+{"pc":5,"op":88,"opName":"PC","gas":"0xfff5","stack":["0x0","0x0","0x0","0x0","0x0"],"storage":{},"depth":1}
+{"pc":6,"op":48,"opName":"ADDRESS","gas":"0xfff3","stack":["0x0","0x0","0x0","0x0","0x0","0x5"],"storage":{},"depth":1}
+{"pc":7,"op":241,"opName":"CALL","gas":"0xfff1","stack":["0x0","0x0","0x0","0x0","0x0","0x5","0x0"],"storage":{},"depth":1}
+{"pc":8,"op":56,"opName":"CODESIZE","gas":"0x9e21","stack":["0x1"],"storage":{},"depth":1}
+{"pc":9,"op":52,"opName":"CALLVALUE","gas":"0x9e1f","stack":["0x1","0x10"],"storage":{},"depth":1}
+{"pc":10,"op":52,"opName":"CALLVALUE","gas":"0x9e1d","stack":["0x1","0x10","0x0"],"storage":{},"depth":1}
+{"pc":11,"op":56,"opName":"CODESIZE","gas":"0x9e1b","stack":["0x1","0x10","0x0","0x0"],"storage":{},"depth":1}
+{"pc":12,"op":50,"opName":"ORIGIN","gas":"0x9e19","stack":["0x1","0x10","0x0","0x0","0x10"],"storage":{},"depth":1}
+{"pc":13,"op":52,"opName":"CALLVALUE","gas":"0x9e17","stack":["0x1","0x10","0x0","0x0","0x10","0x0"],"storage":{},"depth":1}
+{"pc":14,"op":57,"opName":"CODECOPY","gas":"0x9e15","stack":["0x1","0x10","0x0","0x0","0x10","0x0","0x0"],"storage":{},"depth":1}
+{"pc":15,"op":240,"opName":"CREATE","gas":"0x9e0c","stack":["0x1","0x10","0x0","0x0"],"storage":{},"depth":1}
+{"pc":0,"op":50,"opName":"ORIGIN","gas":"0x210c","stack":[],"storage":{},"depth":2}
+{"pc":1,"op":52,"opName":"CALLVALUE","gas":"0x210a","stack":["0x0"],"storage":{},"depth":2}
+{"pc":2,"op":52,"opName":"CALLVALUE","gas":"0x2108","stack":["0x0","0x0"],"storage":{},"depth":2}
+{"pc":3,"op":52,"opName":"CALLVALUE","gas":"0x2106","stack":["0x0","0x0","0x0"],"storage":{},"depth":2}
+{"pc":4,"op":52,"opName":"CALLVALUE","gas":"0x2104","stack":["0x0","0x0","0x0","0x0"],"storage":{},"depth":2}
+{"pc":5,"op":88,"opName":"PC","gas":"0x2102","stack":["0x0","0x0","0x0","0x0","0x0"],"storage":{},"depth":2}
+{"pc":6,"op":48,"opName":"ADDRESS","gas":"0x2100","stack":["0x0","0x0","0x0","0x0","0x0","0x5"],"storage":{},"depth":2}
+{"pc":7,"op":241,"opName":"CALL","gas":"0x20fe","stack":["0x0","0x0","0x0","0x0","0x0","0x5","0xbd770416a3345f91e4b34576cb804a576fa48eb1"],"storage":{},"depth":2}
+"#,
+		)
+	}
+}
diff --git a/evmbin/src/info.rs b/evmbin/src/info.rs
index 3392cb441ea158071ff1cb00c2a9b5bac5c25387..1be81d9132f9d1d80af1f42cdf46dfe77aea7cc2 100644
--- a/evmbin/src/info.rs
+++ b/evmbin/src/info.rs
@@ -17,39 +17,67 @@
 //! VM runner.
 
 use std::time::{Instant, Duration};
-use util::{U256, H256};
-use ethcore::{trace, spec, transaction, pod_state};
+use ethereum_types::{H256, U256};
 use ethcore::client::{self, EvmTestClient, EvmTestError, TransactResult};
+use ethcore::{trace, spec, pod_state};
 use ethjson;
+use transaction;
+use vm::ActionParams;
 
 /// VM execution informant
 pub trait Informant: trace::VMTracer {
 	/// Display a single run init message
-	fn before_test(&self, test: &str, action: &str);
+	fn before_test(&mut self, test: &str, action: &str);
 	/// Set initial gas.
 	fn set_gas(&mut self, _gas: U256) {}
 	/// Display final result.
-	fn finish(result: Result<Success, Failure>);
+	fn finish(result: RunResult<Self::Output>);
 }
 
 /// Execution finished correctly
-pub struct Success {
+#[derive(Debug)]
+pub struct Success<T> {
+	/// State root
+	pub state_root: H256,
 	/// Used gas
 	pub gas_used: U256,
 	/// Output as bytes
 	pub output: Vec<u8>,
 	/// Time Taken
 	pub time: Duration,
+	/// Traces
+	pub traces: Option<T>,
 }
 
 /// Execution failed
-pub struct Failure {
+#[derive(Debug)]
+pub struct Failure<T> {
 	/// Used gas
 	pub gas_used: U256,
 	/// Internal error
 	pub error: EvmTestError,
 	/// Duration
 	pub time: Duration,
+	/// Traces
+	pub traces: Option<T>,
+}
+
+/// EVM Execution result
+pub type RunResult<T> = Result<Success<T>, Failure<T>>;
+
+/// Execute given `ActionParams` and return the result.
+pub fn run_action<T: Informant>(
+	spec: &spec::Spec,
+	params: ActionParams,
+	mut informant: T,
+) -> RunResult<T::Output> {
+	informant.set_gas(params.gas);
+	run(spec, params.gas, None, |mut client| {
+		let result = client
+			.call(params, &mut trace::NoopTracer, &mut informant)
+			.map(|r| (0.into(), r.gas_left, r.return_data.to_vec()));
+		(result, informant.drain())
+	})
 }
 
 /// Execute given Transaction and verify resulting state root.
@@ -78,22 +106,22 @@ pub fn run_transaction<T: Informant>(
 	informant.set_gas(env_info.gas_limit);
 
 	let result = run(spec, env_info.gas_limit, pre_state, |mut client| {
-		let result = client.transact(env_info, transaction, informant);
+		let result = client.transact(env_info, transaction, trace::NoopTracer, informant);
 		match result {
 			TransactResult::Ok { state_root, .. } if state_root != post_root => {
-				Err(EvmTestError::PostCondition(format!(
+				(Err(EvmTestError::PostCondition(format!(
 					"State root mismatch (got: {}, expected: {})",
 					state_root,
 					post_root,
-				)))
+				))), None)
 			},
-			TransactResult::Ok { gas_left, output, .. } => {
-				Ok((gas_left, output))
+			TransactResult::Ok { state_root, gas_left, output, vm_trace, .. } => {
+				(Ok((state_root, gas_left, output)), vm_trace)
 			},
 			TransactResult::Err { error, .. } => {
-				Err(EvmTestError::PostCondition(format!(
+				(Err(EvmTestError::PostCondition(format!(
 					"Unexpected execution error: {:?}", error
-				)))
+				))), None)
 			},
 		}
 	});
@@ -102,8 +130,13 @@ pub fn run_transaction<T: Informant>(
 }
 
 /// Execute VM with given `ActionParams`
-pub fn run<'a, F, T>(spec: &'a spec::Spec, initial_gas: U256, pre_state: T, run: F) -> Result<Success, Failure> where
-	F: FnOnce(EvmTestClient) -> Result<(U256, Vec<u8>), EvmTestError>,
+pub fn run<'a, F, T, X>(
+	spec: &'a spec::Spec,
+	initial_gas: U256,
+	pre_state: T,
+	run: F,
+) -> RunResult<X> where
+	F: FnOnce(EvmTestClient) -> (Result<(H256, U256, Vec<u8>), EvmTestError>, Option<X>),
 	T: Into<Option<&'a pod_state::PodState>>,
 {
 	let test_client = match pre_state.into() {
@@ -112,23 +145,63 @@ pub fn run<'a, F, T>(spec: &'a spec::Spec, initial_gas: U256, pre_state: T, run:
 	}.map_err(|error| Failure {
 		gas_used: 0.into(),
 		error,
-		time: Duration::from_secs(0)
+		time: Duration::from_secs(0),
+		traces: None,
 	})?;
 
 	let start = Instant::now();
 	let result = run(test_client);
-	let duration = start.elapsed();
+	let time = start.elapsed();
 
 	match result {
-		Ok((gas_left, output)) => Ok(Success {
+		(Ok((state_root, gas_left, output)), traces) => Ok(Success {
+			state_root,
 			gas_used: initial_gas - gas_left,
-			output: output,
-			time: duration,
+			output,
+			time,
+			traces,
 		}),
-		Err(e) => Err(Failure {
+		(Err(error), traces) => Err(Failure {
 			gas_used: initial_gas,
-			error: e,
-			time: duration,
+			error,
+			time,
+			traces,
 		}),
 	}
 }
+
+#[cfg(test)]
+pub mod tests {
+	use std::sync::Arc;
+	use rustc_hex::FromHex;
+	use super::*;
+	use tempdir::TempDir;
+
+	pub fn run_test<T, I, F>(
+		informant: I,
+		compare: F,
+		code: &str,
+		gas: T,
+		expected: &str,
+	) where
+		T: Into<U256>,
+		I: Informant,
+		F: FnOnce(Option<I::Output>, &str),
+	{
+		let mut params = ActionParams::default();
+		params.code = Some(Arc::new(code.from_hex().unwrap()));
+		params.gas = gas.into();
+
+		let tempdir = TempDir::new("").unwrap();
+		let spec = ::ethcore::ethereum::new_foundation(&tempdir.path());
+		let result = run_action(&spec, params, informant);
+		match result {
+			Ok(Success { traces, .. }) => {
+				compare(traces, expected)
+			},
+			Err(Failure { traces, .. }) => {
+				compare(traces, expected)
+			},
+		}
+	}
+}
diff --git a/evmbin/src/main.rs b/evmbin/src/main.rs
index 5eb43ed61a4ac3c849bba7fb7f3a3d6620ccc115..bddb40ecd235c38cabe0572385381d8e69a5a964 100644
--- a/evmbin/src/main.rs
+++ b/evmbin/src/main.rs
@@ -25,17 +25,27 @@ extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 extern crate docopt;
-extern crate ethcore_util as util;
+extern crate ethcore_transaction as transaction;
+extern crate ethcore_bytes as bytes;
+extern crate ethereum_types;
 extern crate vm;
 extern crate evm;
 extern crate panic_hook;
 
+#[cfg(test)]
+#[macro_use]
+extern crate pretty_assertions;
+
+#[cfg(test)]
+extern crate tempdir;
+
 use std::sync::Arc;
 use std::{fmt, fs};
 use std::path::PathBuf;
 use docopt::Docopt;
 use rustc_hex::FromHex;
-use util::{U256, Bytes, Address};
+use ethereum_types::{U256, Address};
+use bytes::Bytes;
 use ethcore::spec;
 use vm::{ActionParams, CallType};
 
@@ -49,7 +59,7 @@ EVM implementation for Parity.
   Copyright 2016, 2017 Parity Technologies (UK) Ltd
 
 Usage:
-    parity-evm state-test <file> [--json --only NAME --chain CHAIN]
+    parity-evm state-test <file> [--json --std-json --only NAME --chain CHAIN]
     parity-evm stats [options]
     parity-evm [options]
     parity-evm [-h | --help]
@@ -68,6 +78,7 @@ State test options:
 
 General options:
     --json             Display verbose results in JSON.
+	--std-json         Display results in standardized JSON format.
     --chain CHAIN      Chain spec file path.
     -h, --help         Display this message and exit.
 "#;
@@ -82,6 +93,8 @@ fn main() {
 		run_state_test(args)
 	} else if args.flag_json {
 		run_call(args, display::json::Informant::default())
+	} else if args.flag_std_json {
+		run_call(args, display::std_json::Informant::default())
 	} else {
 		run_call(args, display::simple::Informant::default())
 	}
@@ -123,6 +136,9 @@ fn run_state_test(args: Args) {
 				if args.flag_json {
 					let i = display::json::Informant::default();
 					info::run_transaction(&name, idx, &spec, &pre, post_root, &env_info, transaction, i)
+				} else if args.flag_std_json {
+					let i = display::std_json::Informant::default();
+					info::run_transaction(&name, idx, &spec, &pre, post_root, &env_info, transaction, i)
 				} else {
 					let i = display::simple::Informant::default();
 					info::run_transaction(&name, idx, &spec, &pre, post_root, &env_info, transaction, i)
@@ -132,7 +148,7 @@ fn run_state_test(args: Args) {
 	}
 }
 
-fn run_call<T: Informant>(args: Args, mut informant: T) {
+fn run_call<T: Informant>(args: Args, informant: T) {
 	let from = arg(args.from(), "--from");
 	let to = arg(args.to(), "--to");
 	let code = arg(args.code(), "--code");
@@ -156,10 +172,7 @@ fn run_call<T: Informant>(args: Args, mut informant: T) {
 	params.code = code.map(Arc::new);
 	params.data = data;
 
-	informant.set_gas(gas);
-	let result = info::run(&spec, gas, None, |mut client| {
-		client.call(params, &mut informant)
-	});
+	let result = info::run_action(&spec, params, informant);
 	T::finish(result);
 }
 
@@ -177,13 +190,14 @@ struct Args {
 	flag_input: Option<String>,
 	flag_chain: Option<String>,
 	flag_json: bool,
+	flag_std_json: bool,
 }
 
 impl Args {
 	pub fn gas(&self) -> Result<U256, String> {
 		match self.flag_gas {
 			Some(ref gas) => gas.parse().map_err(to_string),
-			None => Ok(!U256::zero()),
+			None => Ok(U256::from(u64::max_value())),
 		}
 	}
 
@@ -226,7 +240,7 @@ impl Args {
 		Ok(match self.flag_chain {
 			Some(ref filename) =>  {
 				let file = fs::File::open(filename).map_err(|e| format!("{}", e))?;
-				spec::Spec::load(::std::env::temp_dir(), file)?
+				spec::Spec::load(&::std::env::temp_dir(), file)?
 			},
 			None => {
 				ethcore::ethereum::new_foundation(&::std::env::temp_dir())
@@ -262,6 +276,7 @@ mod tests {
 		let args = run(&[
 			"parity-evm",
 			"--json",
+			"--std-json",
 			"--gas", "1",
 			"--gas-price", "2",
 			"--from", "0000000000000000000000000000000000000003",
@@ -272,6 +287,7 @@ mod tests {
 		]);
 
 		assert_eq!(args.flag_json, true);
+		assert_eq!(args.flag_std_json, true);
 		assert_eq!(args.gas(), Ok(1.into()));
 		assert_eq!(args.gas_price(), Ok(2.into()));
 		assert_eq!(args.from(), Ok(3.into()));
@@ -290,11 +306,13 @@ mod tests {
 			"--chain", "homestead",
 			"--only=add11",
 			"--json",
+			"--std-json"
 		]);
 
 		assert_eq!(args.cmd_state_test, true);
 		assert!(args.arg_file.is_some());
 		assert_eq!(args.flag_json, true);
+		assert_eq!(args.flag_std_json, true);
 		assert_eq!(args.flag_chain, Some("homestead".to_owned()));
 		assert_eq!(args.flag_only, Some("add11".to_owned()));
 	}
diff --git a/evmjit/Cargo.toml b/evmjit/Cargo.toml
index dbc0cd51acd87ab902ef96b7ceabb172c026e5f6..c7bf1f8ba9408e56cb753dddce3f8ae9334a8194 100644
--- a/evmjit/Cargo.toml
+++ b/evmjit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "evmjit"
-version = "1.8.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [lib]
diff --git a/hash-fetch/Cargo.toml b/hash-fetch/Cargo.toml
index 502723bbb8c8f1dba6d8adf4d7ade5f8f9a98f52..d5630993670ab6e15260c9173d10d5317c6f58e9 100644
--- a/hash-fetch/Cargo.toml
+++ b/hash-fetch/Cargo.toml
@@ -3,18 +3,28 @@ description = "Fetching hash-addressed content."
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "parity-hash-fetch"
-version = "1.8.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-ethabi = "2.0"
 futures = "0.1"
+futures-cpupool = "0.1"
 log = "0.3"
-mime = "0.2"
-mime_guess = "1.6.1"
-rand = "0.3"
+mime = "0.3"
+mime_guess = "2.0.0-alpha.2"
+rand = "0.4"
 rustc-hex = "1.0"
 fetch = { path = "../util/fetch" }
-ethcore-util = { path = "../util" }
+ethcore-bytes = { path = "../util/bytes" }
+ethereum-types = "0.2"
 parity-reactor = { path = "../util/reactor" }
-native-contracts = { path = "../ethcore/native_contracts" }
+keccak-hash = { path = "../util/hash" }
+registrar = { path = "../registrar" }
+
+ethabi = "5.1"
+ethabi-derive = "5.0"
+ethabi-contract = "5.0"
+
+[dev-dependencies]
+hyper = "0.11"
+parking_lot = "0.5"
diff --git a/hash-fetch/src/client.rs b/hash-fetch/src/client.rs
index bd773e9b3fc3efba4f3a47171fee5ce33b761e4c..b3a9356ea2c5b57ee85c728fbaa6d908d1efdddf 100644
--- a/hash-fetch/src/client.rs
+++ b/hash-fetch/src/client.rs
@@ -21,11 +21,14 @@ use std::io::Write;
 use std::sync::Arc;
 use std::path::PathBuf;
 
-use fetch::{Fetch, Response, Error as FetchError, Client as FetchClient};
-use futures::Future;
+use hash::keccak_buffer;
+use fetch::{self, Fetch};
+use futures_cpupool::CpuPool;
+use futures::{Future, IntoFuture};
 use parity_reactor::Remote;
-use urlhint::{ContractClient, URLHintContract, URLHint, URLHintResult};
-use util::{H256, sha3};
+use urlhint::{URLHintContract, URLHint, URLHintResult};
+use registrar::{RegistrarClient, Asynchronous};
+use ethereum_types::H256;
 
 /// API for fetching by hash.
 pub trait HashFetch: Send + Sync + 'static {
@@ -35,7 +38,7 @@ pub trait HashFetch: Send + Sync + 'static {
 	/// 2. `on_done` - callback function invoked when the content is ready (or there was error during fetch)
 	///
 	/// This function may fail immediately when fetch cannot be initialized or content cannot be resolved.
-	fn fetch(&self, hash: H256, on_done: Box<Fn(Result<PathBuf, Error>) + Send>);
+	fn fetch(&self, hash: H256, abort: fetch::Abort, on_done: Box<Fn(Result<PathBuf, Error>) + Send>);
 }
 
 /// Hash-fetching error.
@@ -55,7 +58,7 @@ pub enum Error {
 	/// IO Error while validating hash.
 	IO(io::Error),
 	/// Error during fetch.
-	Fetch(FetchError),
+	Fetch(fetch::Error),
 }
 
 #[cfg(test)]
@@ -75,8 +78,8 @@ impl PartialEq for Error {
 	}
 }
 
-impl From<FetchError> for Error {
-	fn from(error: FetchError) -> Self {
+impl From<fetch::Error> for Error {
+	fn from(error: fetch::Error) -> Self {
 		Error::Fetch(error)
 	}
 }
@@ -87,21 +90,16 @@ impl From<io::Error> for Error {
 	}
 }
 
-fn validate_hash(path: PathBuf, hash: H256, result: Result<Response, FetchError>) -> Result<PathBuf, Error> {
-	let response = result?;
-	if !response.is_success() {
-		return Err(Error::InvalidStatus);
-	}
-
+fn validate_hash(path: PathBuf, hash: H256, body: fetch::BodyReader) -> Result<PathBuf, Error> {
 	// Read the response
-	let mut reader = io::BufReader::new(response);
+	let mut reader = io::BufReader::new(body);
 	let mut writer = io::BufWriter::new(fs::File::create(&path)?);
 	io::copy(&mut reader, &mut writer)?;
 	writer.flush()?;
 
 	// And validate the hash
 	let mut file_reader = io::BufReader::new(fs::File::open(&path)?);
-	let content_hash = sha3(&mut file_reader)?;
+	let content_hash = keccak_buffer(&mut file_reader)?;
 	if content_hash != hash {
 		Err(Error::HashMismatch{ got: content_hash, expected: hash })
 	} else {
@@ -110,24 +108,19 @@ fn validate_hash(path: PathBuf, hash: H256, result: Result<Response, FetchError>
 }
 
 /// Default Hash-fetching client using on-chain contract to resolve hashes to URLs.
-pub struct Client<F: Fetch + 'static = FetchClient> {
+pub struct Client<F: Fetch + 'static = fetch::Client> {
+	pool: CpuPool,
 	contract: URLHintContract,
 	fetch: F,
 	remote: Remote,
 	random_path: Arc<Fn() -> PathBuf + Sync + Send>,
 }
 
-impl Client {
-	/// Creates new instance of the `Client` given on-chain contract client and task runner.
-	pub fn new(contract: Arc<ContractClient>, remote: Remote) -> Self {
-		Client::with_fetch(contract, FetchClient::new().unwrap(), remote)
-	}
-}
-
 impl<F: Fetch + 'static> Client<F> {
 	/// Creates new instance of the `Client` given on-chain contract client, fetch service and task runner.
-	pub fn with_fetch(contract: Arc<ContractClient>, fetch: F, remote: Remote) -> Self {
+	pub fn with_fetch(contract: Arc<RegistrarClient<Call=Asynchronous>>, pool: CpuPool, fetch: F, remote: Remote) -> Self {
 		Client {
+			pool,
 			contract: URLHintContract::new(contract),
 			fetch: fetch,
 			remote: remote,
@@ -137,37 +130,49 @@ impl<F: Fetch + 'static> Client<F> {
 }
 
 impl<F: Fetch + 'static> HashFetch for Client<F> {
-	fn fetch(&self, hash: H256, on_done: Box<Fn(Result<PathBuf, Error>) + Send>) {
+	fn fetch(&self, hash: H256, abort: fetch::Abort, on_done: Box<Fn(Result<PathBuf, Error>) + Send>) {
 		debug!(target: "fetch", "Fetching: {:?}", hash);
 
 		let random_path = self.random_path.clone();
 		let remote_fetch = self.fetch.clone();
-		let future = self.contract.resolve(hash.to_vec())
+		let pool = self.pool.clone();
+		let future = self.contract.resolve(hash)
 			.map_err(|e| { warn!("Error resolving URL: {}", e); Error::NoResolution })
 			.and_then(|maybe_url| maybe_url.ok_or(Error::NoResolution))
 			.map(|content| match content {
 					URLHintResult::Dapp(dapp) => {
 						dapp.url()
 					},
+					URLHintResult::GithubDapp(content) => {
+						content.url
+					},
 					URLHintResult::Content(content) => {
 						content.url
 					},
 			})
+			.into_future()
 			.and_then(move |url| {
 				debug!(target: "fetch", "Resolved {:?} to {:?}. Fetching...", hash, url);
-				let future = remote_fetch.fetch(&url).then(move |result| {
-					debug!(target: "fetch", "Content fetched, validating hash ({:?})", hash);
-					let path = random_path();
-					let res = validate_hash(path.clone(), hash, result);
-					if let Err(ref err) = res {
-						trace!(target: "fetch", "Error: {:?}", err);
-						// Remove temporary file in case of error
-						let _ = fs::remove_file(&path);
-					}
-					res
-				});
-				remote_fetch.process(future)
+				remote_fetch.fetch(&url, abort).from_err()
 			})
+			.and_then(move |response| {
+				if !response.is_success() {
+					Err(Error::InvalidStatus)
+				} else {
+					Ok(response)
+				}
+			})
+			.and_then(move |response| pool.spawn_fn(move || {
+				debug!(target: "fetch", "Content fetched, validating hash ({:?})", hash);
+				let path = random_path();
+				let res = validate_hash(path.clone(), hash, fetch::BodyReader::new(response));
+				if let Err(ref err) = res {
+					trace!(target: "fetch", "Error: {:?}", err);
+					// Remove temporary file in case of error
+					let _ = fs::remove_file(&path);
+				}
+				res
+			}))
 			.then(move |res| { on_done(res); Ok(()) as Result<(), ()> });
 
 		self.remote.spawn(future);
@@ -188,14 +193,17 @@ fn random_temp_path() -> PathBuf {
 
 #[cfg(test)]
 mod tests {
+	extern crate hyper;
 	use rustc_hex::FromHex;
 	use std::sync::{Arc, mpsc};
-	use util::Mutex;
+	use parking_lot::Mutex;
 	use futures::future;
-	use fetch::{self, Fetch};
+	use futures_cpupool::CpuPool;
+	use fetch::{self, Fetch, Url};
 	use parity_reactor::Remote;
 	use urlhint::tests::{FakeRegistrar, URLHINT};
 	use super::{Error, Client, HashFetch, random_temp_path};
+	use self::hyper::StatusCode;
 
 
 	#[derive(Clone)]
@@ -206,17 +214,13 @@ mod tests {
 	impl Fetch for FakeFetch {
 		type Result = future::Ok<fetch::Response, fetch::Error>;
 
-		fn new() -> Result<Self, fetch::Error> where Self: Sized {
-			Ok(FakeFetch { return_success: true })
-		}
-
-		fn fetch_with_abort(&self, url: &str, _abort: fetch::Abort) -> Self::Result {
+		fn fetch(&self, url: &str, abort: fetch::Abort) -> Self::Result {
 			assert_eq!(url, "https://parity.io/assets/images/ethcore-black-horizontal.png");
+			let u = Url::parse(url).unwrap();
 			future::ok(if self.return_success {
-				let cursor = ::std::io::Cursor::new(b"result");
-				fetch::Response::from_reader(cursor)
+				fetch::client::Response::new(u, hyper::Response::new().with_body(&b"result"[..]), abort)
 			} else {
-				fetch::Response::not_found()
+				fetch::client::Response::new(u, hyper::Response::new().with_status(StatusCode::NotFound), abort)
 			})
 		}
 	}
@@ -235,11 +239,11 @@ mod tests {
 		// given
 		let contract = Arc::new(FakeRegistrar::new());
 		let fetch = FakeFetch { return_success: false };
-		let client = Client::with_fetch(contract.clone(), fetch, Remote::new_sync());
+		let client = Client::with_fetch(contract.clone(), CpuPool::new(1), fetch, Remote::new_sync());
 
 		// when
 		let (tx, rx) = mpsc::channel();
-		client.fetch(2.into(), Box::new(move |result| {
+		client.fetch(2.into(), Default::default(), Box::new(move |result| {
 			tx.send(result).unwrap();
 		}));
 
@@ -253,11 +257,11 @@ mod tests {
 		// given
 		let registrar = Arc::new(registrar());
 		let fetch = FakeFetch { return_success: false };
-		let client = Client::with_fetch(registrar.clone(), fetch, Remote::new_sync());
+		let client = Client::with_fetch(registrar.clone(), CpuPool::new(1), fetch, Remote::new_sync());
 
 		// when
 		let (tx, rx) = mpsc::channel();
-		client.fetch(2.into(), Box::new(move |result| {
+		client.fetch(2.into(), Default::default(), Box::new(move |result| {
 			tx.send(result).unwrap();
 		}));
 
@@ -271,14 +275,14 @@ mod tests {
 		// given
 		let registrar = Arc::new(registrar());
 		let fetch = FakeFetch { return_success: true };
-		let mut client = Client::with_fetch(registrar.clone(), fetch, Remote::new_sync());
+		let mut client = Client::with_fetch(registrar.clone(), CpuPool::new(1), fetch, Remote::new_sync());
 		let path = random_temp_path();
 		let path2 = path.clone();
 		client.random_path = Arc::new(move || path2.clone());
 
 		// when
 		let (tx, rx) = mpsc::channel();
-		client.fetch(2.into(), Box::new(move |result| {
+		client.fetch(2.into(), Default::default(), Box::new(move |result| {
 			tx.send(result).unwrap();
 		}));
 
@@ -294,16 +298,17 @@ mod tests {
 		// given
 		let registrar = Arc::new(registrar());
 		let fetch = FakeFetch { return_success: true };
-		let client = Client::with_fetch(registrar.clone(), fetch, Remote::new_sync());
+		let client = Client::with_fetch(registrar.clone(), CpuPool::new(1), fetch, Remote::new_sync());
 
 		// when
 		let (tx, rx) = mpsc::channel();
-		client.fetch("0x06b0a4f426f6713234b2d4b2468640bc4e0bb72657a920ad24c5087153c593c8".into(), Box::new(move |result| {
-			tx.send(result).unwrap();
-		}));
+		client.fetch("0x06b0a4f426f6713234b2d4b2468640bc4e0bb72657a920ad24c5087153c593c8".into(),
+			Default::default(),
+			Box::new(move |result| { tx.send(result).unwrap(); }));
 
 		// then
 		let result = rx.recv().unwrap();
 		assert!(result.is_ok(), "Should return path, got: {:?}", result);
 	}
 }
+
diff --git a/hash-fetch/src/lib.rs b/hash-fetch/src/lib.rs
index 4952ecea27e52001248594e1ec495170d9c91aa6..6e74982bb844ca32282f5e5be2adf40d3499a76e 100644
--- a/hash-fetch/src/lib.rs
+++ b/hash-fetch/src/lib.rs
@@ -20,22 +20,32 @@
 
 #[macro_use]
 extern crate log;
-#[macro_use]
-extern crate mime;
 
 extern crate ethabi;
-extern crate ethcore_util as util;
+extern crate ethcore_bytes as bytes;
+extern crate ethereum_types;
 extern crate futures;
+extern crate futures_cpupool;
+extern crate keccak_hash as hash;
+extern crate mime;
 extern crate mime_guess;
-extern crate native_contracts;
 extern crate parity_reactor;
 extern crate rand;
 extern crate rustc_hex;
+extern crate registrar;
 
 pub extern crate fetch;
 
+#[macro_use]
+extern crate ethabi_derive;
+#[macro_use]
+extern crate ethabi_contract;
+#[cfg(test)]
+extern crate parking_lot;
+
 mod client;
 
 pub mod urlhint;
 
 pub use client::{HashFetch, Client, Error};
+pub use fetch::Abort;
diff --git a/hash-fetch/src/urlhint.rs b/hash-fetch/src/urlhint.rs
index bc4b63cf2fb906b7d75753c7dce1fdcaa32b517f..d05dd40a22f225633ed574ea12c1c2886e06d806 100644
--- a/hash-fetch/src/urlhint.rs
+++ b/hash-fetch/src/urlhint.rs
@@ -18,23 +18,22 @@
 
 use std::sync::Arc;
 use rustc_hex::ToHex;
-use mime::Mime;
+use mime::{self, Mime};
 use mime_guess;
 
-use futures::{future, BoxFuture, Future};
-use native_contracts::{Registry, Urlhint};
-use util::{Address, Bytes, Hashable};
+use futures::{future, Future};
+use futures::future::Either;
+use ethereum_types::{H256, Address};
+use registrar::{Registrar, RegistrarClient, Asynchronous};
 
-const COMMIT_LEN: usize = 20;
+use_contract!(urlhint, "Urlhint", "res/urlhint.json");
 
-/// RAW Contract interface.
-/// Should execute transaction using current blockchain state.
-pub trait ContractClient: Send + Sync {
-	/// Get registrar address
-	fn registrar(&self) -> Result<Address, String>;
-	/// Call Contract
-	fn call(&self, address: Address, data: Bytes) -> BoxFuture<Bytes, String>;
-}
+const COMMIT_LEN: usize = 20;
+const GITHUB_HINT: &'static str = "githubhint";
+/// GithubHint entries with commit set as `0x0..01` should be treated
+/// as Github Dapp, downloadable zip files, than can be extracted, containing
+/// the manifest.json file along with the dapp
+static GITHUB_DAPP_COMMIT: &[u8; COMMIT_LEN] = &[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1];
 
 /// Github-hosted dapp.
 #[derive(Debug, PartialEq)]
@@ -87,6 +86,8 @@ pub struct Content {
 pub enum URLHintResult {
 	/// Dapp
 	Dapp(GithubApp),
+	/// GithubDapp
+	GithubDapp(Content),
 	/// Content
 	Content(Content),
 }
@@ -94,29 +95,37 @@ pub enum URLHintResult {
 /// URLHint Contract interface
 pub trait URLHint: Send + Sync {
 	/// Resolves given id to registrar entry.
-	fn resolve(&self, id: Bytes) -> BoxFuture<Option<URLHintResult>, String>;
+	fn resolve(&self, id: H256) -> Box<Future<Item = Option<URLHintResult>, Error = String> + Send>;
 }
 
 /// `URLHintContract` API
-#[derive(Clone)]
 pub struct URLHintContract {
-	urlhint: Arc<Urlhint>,
-	registrar: Registry,
-	client: Arc<ContractClient>,
+	urlhint: urlhint::Urlhint,
+	registrar: Registrar,
+	client: Arc<RegistrarClient<Call=Asynchronous>>,
 }
 
 impl URLHintContract {
 	/// Creates new `URLHintContract`
-	pub fn new(client: Arc<ContractClient>) -> Self {
+		pub fn new(client: Arc<RegistrarClient<Call=Asynchronous>>) -> Self {
 		URLHintContract {
-			urlhint: Arc::new(Urlhint::new(Default::default())),
-			registrar: Registry::new(Default::default()),
+			urlhint: urlhint::Urlhint::default(),
+			registrar: Registrar::new(client.clone()),
 			client: client,
 		}
 	}
 }
 
-fn decode_urlhint_output(output: (String, ::util::H160, Address)) -> Option<URLHintResult> {
+fn get_urlhint_content(account_slash_repo: String, owner: Address) -> Content {
+	let mime = guess_mime_type(&account_slash_repo).unwrap_or(mime::APPLICATION_JSON);
+	Content {
+		url: account_slash_repo,
+		mime,
+		owner,
+	}
+}
+
+fn decode_urlhint_output(output: (String, [u8; 20], Address)) -> Option<URLHintResult> {
 	let (account_slash_repo, commit, owner) = output;
 
 	if owner == Address::default() {
@@ -124,13 +133,15 @@ fn decode_urlhint_output(output: (String, ::util::H160, Address)) -> Option<URLH
 	}
 
 	let commit = GithubApp::commit(&commit);
+
 	if commit == Some(Default::default()) {
-		let mime = guess_mime_type(&account_slash_repo).unwrap_or(mime!(Application/_));
-		return Some(URLHintResult::Content(Content {
-			url: account_slash_repo,
-			mime: mime,
-			owner: owner,
-		}));
+		let content = get_urlhint_content(account_slash_repo, owner);
+		return Some(URLHintResult::Content(content));
+	}
+
+	if commit == Some(*GITHUB_DAPP_COMMIT) {
+		let content = get_urlhint_content(account_slash_repo, owner);
+		return Some(URLHintResult::GithubDapp(content));
 	}
 
 	let (account, repo) = {
@@ -150,35 +161,21 @@ fn decode_urlhint_output(output: (String, ::util::H160, Address)) -> Option<URLH
 }
 
 impl URLHint for URLHintContract {
-	fn resolve(&self, id: Bytes) -> BoxFuture<Option<URLHintResult>, String> {
-		use futures::future::Either;
-
-		let do_call = |_, data| {
-			let addr = match self.client.registrar() {
-				Ok(addr) => addr,
-				Err(e) => return future::err(e).boxed(),
-			};
-
-			self.client.call(addr, data)
-		};
-
-		let urlhint = self.urlhint.clone();
+	fn resolve(&self, id: H256) -> Box<Future<Item = Option<URLHintResult>, Error = String> + Send> {
+		let entries = self.urlhint.functions().entries();
 		let client = self.client.clone();
-		self.registrar.get_address(do_call, "githubhint".sha3(), "A".into())
-			.map(|addr| if addr == Address::default() { None } else { Some(addr) })
-			.and_then(move |address| {
-				let mut fixed_id = [0; 32];
-				let len = ::std::cmp::min(32, id.len());
-				fixed_id[..len].copy_from_slice(&id[..len]);
-
-				match address {
-					None => Either::A(future::ok(None)),
-					Some(address) => {
-						let do_call = move |_, data| client.call(address, data);
-						Either::B(urlhint.entries(do_call, ::util::H256(fixed_id)).map(decode_urlhint_output))
-					}
-				}
-			}).boxed()
+
+		let future = self.registrar.get_address(GITHUB_HINT)
+			.and_then(move |addr| if !addr.is_zero() {
+				let data = entries.input(id);
+				let result = client.call_contract(addr, data)
+					.and_then(move |output| entries.output(&output).map_err(|e| e.to_string()))
+					.map(decode_urlhint_output);
+				Either::B(result)
+			} else {
+				Either::A(future::ok(None))
+		});
+		Box::new(future)
 	}
 }
 
@@ -211,11 +208,13 @@ pub mod tests {
 	use std::str::FromStr;
 	use rustc_hex::FromHex;
 
-	use futures::{BoxFuture, Future, IntoFuture};
+	use futures::{Future, IntoFuture};
 
 	use super::*;
 	use super::guess_mime_type;
-	use util::{Bytes, Address, Mutex, ToPretty};
+	use parking_lot::Mutex;
+	use ethereum_types::Address;
+	use bytes::{Bytes, ToPretty};
 
 	pub struct FakeRegistrar {
 		pub calls: Arc<Mutex<Vec<(String, String)>>>,
@@ -239,15 +238,17 @@ pub mod tests {
 		}
 	}
 
-	impl ContractClient for FakeRegistrar {
-		fn registrar(&self) -> Result<Address, String> {
+	impl RegistrarClient for FakeRegistrar {
+		type Call = Asynchronous;
+
+		fn registrar_address(&self) -> Result<Address, String> {
 			Ok(REGISTRAR.parse().unwrap())
 		}
 
-		fn call(&self, address: Address, data: Bytes) -> BoxFuture<Bytes, String> {
+		fn call_contract(&self, address: Address, data: Bytes) -> Self::Call {
 			self.calls.lock().push((address.to_hex(), data.to_hex()));
 			let res = self.responses.lock().remove(0);
-			res.into_future().boxed()
+			Box::new(res.into_future())
 		}
 	}
 
@@ -256,8 +257,8 @@ pub mod tests {
 		// given
 		let registrar = FakeRegistrar::new();
 		let resolve_result = {
-			use ethabi::{Encoder, Token};
-			Encoder::encode(vec![Token::String(String::new()), Token::FixedBytes(vec![0; 20]), Token::Address([0; 20])])
+			use ethabi::{encode, Token};
+			encode(&[Token::String(String::new()), Token::FixedBytes(vec![0; 20]), Token::Address([0; 20].into())])
 		};
 		registrar.responses.lock()[1] = Ok(resolve_result);
 
@@ -267,7 +268,7 @@ pub mod tests {
 
 
 		// when
-		let res = urlhint.resolve("test".bytes().collect()).wait().unwrap();
+		let res = urlhint.resolve("test".as_bytes().into()).wait().unwrap();
 		let calls = calls.lock();
 		let call0 = calls.get(0).expect("Registrar resolve called");
 		let call1 = calls.get(1).expect("URLHint Resolve called");
@@ -295,7 +296,7 @@ pub mod tests {
 		let urlhint = URLHintContract::new(Arc::new(registrar));
 
 		// when
-		let res = urlhint.resolve("test".bytes().collect()).wait().unwrap();
+		let res = urlhint.resolve("test".as_bytes().into()).wait().unwrap();
 
 		// then
 		assert_eq!(res, Some(URLHintResult::Dapp(GithubApp {
@@ -317,12 +318,12 @@ pub mod tests {
 		let urlhint = URLHintContract::new(Arc::new(registrar));
 
 		// when
-		let res = urlhint.resolve("test".bytes().collect()).wait().unwrap();
+		let res = urlhint.resolve("test".as_bytes().into()).wait().unwrap();
 
 		// then
 		assert_eq!(res, Some(URLHintResult::Content(Content {
 			url: "https://parity.io/assets/images/ethcore-black-horizontal.png".into(),
-			mime: mime!(Image/Png),
+			mime: mime::IMAGE_PNG,
 			owner: Address::from_str("deadcafebeefbeefcafedeaddeedfeedffffffff").unwrap(),
 		})))
 	}
@@ -354,9 +355,9 @@ pub mod tests {
 
 
 		assert_eq!(guess_mime_type(url1), None);
-		assert_eq!(guess_mime_type(url2), Some(mime!(Image/Png)));
-		assert_eq!(guess_mime_type(url3), Some(mime!(Image/Png)));
-		assert_eq!(guess_mime_type(url4), Some(mime!(Image/Jpeg)));
-		assert_eq!(guess_mime_type(url5), Some(mime!(Image/Png)));
+		assert_eq!(guess_mime_type(url2), Some(mime::IMAGE_PNG));
+		assert_eq!(guess_mime_type(url3), Some(mime::IMAGE_PNG));
+		assert_eq!(guess_mime_type(url4), Some(mime::IMAGE_JPEG));
+		assert_eq!(guess_mime_type(url5), Some(mime::IMAGE_PNG));
 	}
 }
diff --git a/hw/Cargo.toml b/hw/Cargo.toml
index 345b1c3bbb94a4f795cb37c93a8dac7ca09e0152..c799c79c3820edeb06485ce4205438a41eacb40e 100644
--- a/hw/Cargo.toml
+++ b/hw/Cargo.toml
@@ -3,16 +3,18 @@ description = "Hardware wallet support."
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "hardware-wallet"
-version = "1.8.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.3"
-parking_lot = "0.4"
+parking_lot = "0.5"
+protobuf = "1.4"
 hidapi = { git = "https://github.com/paritytech/hidapi-rs" }
 libusb = { git = "https://github.com/paritytech/libusb-rs" }
+trezor-sys = { git = "https://github.com/paritytech/trezor-sys" }
 ethkey = { path = "../ethkey" }
-ethcore-bigint = { path = "../util/bigint" }
+ethereum-types = "0.2"
 
 [dev-dependencies]
 rustc-hex = "1.0"
diff --git a/hw/src/ledger.rs b/hw/src/ledger.rs
index 0d787588d90e2eaecb030d7e517a0b5ca28fac23..e7d616d4f9fcc473087e621458f0b94611360fac 100644
--- a/hw/src/ledger.rs
+++ b/hw/src/ledger.rs
@@ -17,19 +17,27 @@
 //! Ledger hardware wallet module. Supports Ledger Blue and Nano S.
 /// See https://github.com/LedgerHQ/blue-app-eth/blob/master/doc/ethapp.asc for protocol details.
 
-use hidapi;
-use std::fmt;
 use std::cmp::min;
+use std::fmt;
 use std::str::FromStr;
-use std::time::Duration;
-use super::WalletInfo;
-use ethkey::{Address, Signature};
-use bigint::hash::H256;
+use std::sync::{Arc, Weak};
+use std::time::{Duration, Instant};
+
+use ethereum_types::{H256, Address};
+use ethkey::Signature;
+use hidapi;
+use libusb;
+use parking_lot::{Mutex, RwLock};
+
+use super::{WalletInfo, KeyPath};
+
+/// Ledger vendor ID
+pub const LEDGER_VID: u16 = 0x2c97;
+/// Legder product IDs: [Nano S and Blue]
+pub const LEDGER_PIDS: [u16; 2] = [0x0000, 0x0001];
 
-const LEDGER_VID: u16 = 0x2c97;
-const LEDGER_PIDS: [u16; 2] = [0x0000, 0x0001]; // Nano S and Blue
-const ETH_DERIVATION_PATH_BE: [u8; 17] =  [ 4,  0x80, 0, 0, 44,  0x80, 0, 0, 60,  0x80, 0, 0, 0,  0, 0, 0, 0 ];  // 44'/60'/0'/0
-const ETC_DERIVATION_PATH_BE: [u8; 21] =  [ 5,  0x80, 0, 0, 44,  0x80, 0, 0, 60,  0x80, 0x02, 0x73, 0xd0,  0x80, 0, 0, 0,  0, 0, 0, 0 ];  // 44'/60'/160720'/0'/0
+const ETH_DERIVATION_PATH_BE: [u8; 17] = [4, 0x80, 0, 0, 44, 0x80, 0, 0, 60, 0x80, 0, 0, 0, 0, 0, 0, 0]; // 44'/60'/0'/0
+const ETC_DERIVATION_PATH_BE: [u8; 21] = [5, 0x80, 0, 0, 44, 0x80, 0, 0, 60, 0x80, 0x02, 0x73, 0xd0, 0x80, 0, 0, 0, 0, 0, 0, 0]; // 44'/60'/160720'/0'/0
 
 const APDU_TAG: u8 = 0x05;
 const APDU_CLA: u8 = 0xe0;
@@ -43,26 +51,21 @@ mod commands {
 	pub const SIGN_ETH_TRANSACTION: u8 = 0x04;
 }
 
-/// Key derivation paths used on ledger wallets.
-#[derive(Debug, Clone, Copy)]
-pub enum KeyPath {
-	/// Ethereum.
-	Ethereum,
-	/// Ethereum classic.
-	EthereumClassic,
-}
-
-/// Hardware waller error.
+/// Hardware wallet error.
 #[derive(Debug)]
 pub enum Error {
 	/// Ethereum wallet protocol error.
 	Protocol(&'static str),
 	/// Hidapi error.
 	Usb(hidapi::HidError),
+	/// Libusb error
+	LibUsb(libusb::Error),
 	/// Device with request key is not available.
 	KeyNotFound,
 	/// Signing has been cancelled by user.
 	UserCancel,
+	/// Invalid Device
+	InvalidDevice,
 }
 
 impl fmt::Display for Error {
@@ -70,8 +73,10 @@ impl fmt::Display for Error {
 		match *self {
 			Error::Protocol(ref s) => write!(f, "Ledger protocol error: {}", s),
 			Error::Usb(ref e) => write!(f, "USB communication error: {}", e),
+			Error::LibUsb(ref e) => write!(f, "LibUSB communication error: {}", e),
 			Error::KeyNotFound => write!(f, "Key not found"),
 			Error::UserCancel => write!(f, "Operation has been cancelled"),
+			Error::InvalidDevice => write!(f, "Unsupported product was entered"),
 		}
 	}
 }
@@ -82,11 +87,17 @@ impl From<hidapi::HidError> for Error {
 	}
 }
 
+impl From<libusb::Error> for Error {
+	fn from(err: libusb::Error) -> Error {
+		Error::LibUsb(err)
+	}
+}
+
 /// Ledger device manager.
 pub struct Manager {
-	usb: hidapi::HidApi,
-	devices: Vec<Device>,
-	key_path: KeyPath,
+	usb: Arc<Mutex<hidapi::HidApi>>,
+	devices: RwLock<Vec<Device>>,
+	key_path: RwLock<KeyPath>,
 }
 
 #[derive(Debug)]
@@ -97,19 +108,19 @@ struct Device {
 
 impl Manager {
 	/// Create a new instance.
-	pub fn new() -> Result<Manager, Error> {
-		let manager = Manager {
-			usb: hidapi::HidApi::new()?,
-			devices: Vec::new(),
-			key_path: KeyPath::Ethereum,
-		};
-		Ok(manager)
+	pub fn new(hidapi: Arc<Mutex<hidapi::HidApi>>) -> Manager {
+		Manager {
+			usb: hidapi,
+			devices: RwLock::new(Vec::new()),
+			key_path: RwLock::new(KeyPath::Ethereum),
+		}
 	}
 
 	/// Re-populate device list. Only those devices that have Ethereum app open will be added.
-	pub fn update_devices(&mut self) -> Result<usize, Error> {
-		self.usb.refresh_devices();
-		let devices = self.usb.devices();
+	pub fn update_devices(&self) -> Result<usize, Error> {
+		let mut usb = self.usb.lock();
+		usb.refresh_devices();
+		let devices = usb.devices();
 		let mut new_devices = Vec::new();
 		let mut num_new_devices = 0;
 		for device in devices {
@@ -117,30 +128,30 @@ impl Manager {
 			if device.vendor_id != LEDGER_VID || !LEDGER_PIDS.contains(&device.product_id) {
 				continue;
 			}
-			match self.read_device_info(&device) {
+			match self.read_device_info(&usb, &device) {
 				Ok(info) => {
 					debug!("Found device: {:?}", info);
-					if !self.devices.iter().any(|d| d.path == info.path) {
+					if !self.devices.read().iter().any(|d| d.path == info.path) {
 						num_new_devices += 1;
 					}
 					new_devices.push(info);
 
-				},
+				}
 				Err(e) => debug!("Error reading device info: {}", e),
 			};
 		}
-		self.devices = new_devices;
+		*self.devices.write() = new_devices;
 		Ok(num_new_devices)
 	}
 
 	/// Select key derivation path for a known chain.
-	pub fn set_key_path(&mut self, key_path: KeyPath) {
-		self.key_path = key_path;
+	pub fn set_key_path(&self, key_path: KeyPath) {
+		*self.key_path.write() = key_path;
 	}
 
-	fn read_device_info(&self, dev_info: &hidapi::HidDeviceInfo) -> Result<Device, Error> {
-		let mut handle = self.open_path(&dev_info.path)?;
-		let address = Self::read_wallet_address(&mut handle, self.key_path)?;
+	fn read_device_info(&self, usb: &hidapi::HidApi, dev_info: &hidapi::HidDeviceInfo) -> Result<Device, Error> {
+		let mut handle = self.open_path(|| usb.open_path(&dev_info.path))?;
+		let address = Self::read_wallet_address(&mut handle, *self.key_path.read())?;
 		let manufacturer = dev_info.manufacturer_string.clone().unwrap_or("Unknown".to_owned());
 		let name = dev_info.product_string.clone().unwrap_or("Unknown".to_owned());
 		let serial = dev_info.serial_number.clone().unwrap_or("Unknown".to_owned());
@@ -187,24 +198,24 @@ impl Manager {
 
 	/// List connected wallets. This only returns wallets that are ready to be used.
 	pub fn list_devices(&self) -> Vec<WalletInfo> {
-		self.devices.iter().map(|d| d.info.clone()).collect()
+		self.devices.read().iter().map(|d| d.info.clone()).collect()
 	}
 
 	/// Get wallet info.
 	pub fn device_info(&self, address: &Address) -> Option<WalletInfo> {
-		self.devices.iter().find(|d| &d.info.address == address).map(|d| d.info.clone())
+		self.devices.read().iter().find(|d| &d.info.address == address).map(|d| d.info.clone())
 	}
 
 	/// Sign transaction data with wallet managing `address`.
 	pub fn sign_transaction(&self, address: &Address, data: &[u8]) -> Result<Signature, Error> {
-		let device = self.devices.iter().find(|d| &d.info.address == address)
-			.ok_or(Error::KeyNotFound)?;
-
-		let handle = self.open_path(&device.path)?;
+		let usb = self.usb.lock();
+		let devices = self.devices.read();
+		let device = devices.iter().find(|d| &d.info.address == address).ok_or(Error::KeyNotFound)?;
+		let handle = self.open_path(|| usb.open_path(&device.path))?;
 
 		let eth_path = &ETH_DERIVATION_PATH_BE[..];
 		let etc_path = &ETC_DERIVATION_PATH_BE[..];
-		let derivation_path = match self.key_path {
+		let derivation_path = match *self.key_path.read() {
 			KeyPath::Ethereum => eth_path,
 			KeyPath::EthereumClassic => etc_path,
 		};
@@ -218,7 +229,7 @@ impl Manager {
 			let p1 = if data_pos == 0 { 0x00 } else { 0x80 };
 			let dest_left = MAX_CHUNK_SIZE - dest_offset;
 			let chunk_data_size = min(dest_left, data.len() - data_pos);
-			&mut chunk [dest_offset..][0..chunk_data_size].copy_from_slice(&data[data_pos..][0..chunk_data_size]);
+			&mut chunk[dest_offset..][0..chunk_data_size].copy_from_slice(&data[data_pos..][0..chunk_data_size]);
 			result = Self::send_apdu(&handle, commands::SIGN_ETH_TRANSACTION, p1, 0, &chunk[0..(dest_offset + chunk_data_size)])?;
 			dest_offset = 0;
 			data_pos += chunk_data_size;
@@ -236,50 +247,43 @@ impl Manager {
 		Ok(Signature::from_rsv(&r, &s, v))
 	}
 
-	fn open_path(&self, path: &str) -> Result<hidapi::HidDevice, Error> {
-		let mut err = Error::KeyNotFound;
-		/// Try to open device a few times.
-		for _ in 0..10 {
-			match self.usb.open_path(&path) {
-				Ok(handle) => return Ok(handle),
-				Err(e) => err = From::from(e),
-			}
-			::std::thread::sleep(Duration::from_millis(200));
-		}
-		Err(err)
+	fn open_path<R, F>(&self, f: F) -> Result<R, Error>
+		where F: Fn() -> Result<R, &'static str>
+	{
+		f().map_err(Into::into)
 	}
 
 	fn send_apdu(handle: &hidapi::HidDevice, command: u8, p1: u8, p2: u8, data: &[u8]) -> Result<Vec<u8>, Error> {
 		const HID_PACKET_SIZE: usize = 64 + HID_PREFIX_ZERO;
 		let mut offset = 0;
 		let mut chunk_index = 0;
-			loop {
-				let mut hid_chunk: [u8; HID_PACKET_SIZE] = [0; HID_PACKET_SIZE];
-				let mut chunk_size = if chunk_index == 0 { 12 } else { 5 };
-				let size = min(64 - chunk_size, data.len() - offset);
-				{
-					let mut chunk = &mut hid_chunk[HID_PREFIX_ZERO..];
-					&mut chunk[0..5].copy_from_slice(&[0x01, 0x01, APDU_TAG, (chunk_index >> 8) as u8, (chunk_index & 0xff) as u8 ]);
-
-					if chunk_index == 0 {
-						let data_len = data.len() + 5;
-						&mut chunk[5..12].copy_from_slice(&[ (data_len >> 8) as u8, (data_len & 0xff) as u8, APDU_CLA, command, p1, p2, data.len() as u8 ]);
-					}
-
-					&mut chunk[chunk_size..chunk_size + size].copy_from_slice(&data[offset..offset + size]);
-					offset += size;
-					chunk_size += size;
-				}
-				trace!("writing {:?}", &hid_chunk[..]);
-				let n = handle.write(&hid_chunk[..])?;
-				if n < chunk_size {
-					return Err(Error::Protocol("Write data size mismatch"));
-				}
-				if offset == data.len() {
-					break;
+		loop {
+			let mut hid_chunk: [u8; HID_PACKET_SIZE] = [0; HID_PACKET_SIZE];
+			let mut chunk_size = if chunk_index == 0 { 12 } else { 5 };
+			let size = min(64 - chunk_size, data.len() - offset);
+			{
+				let chunk = &mut hid_chunk[HID_PREFIX_ZERO..];
+				&mut chunk[0..5].copy_from_slice(&[0x01, 0x01, APDU_TAG, (chunk_index >> 8) as u8, (chunk_index & 0xff) as u8 ]);
+
+				if chunk_index == 0 {
+					let data_len = data.len() + 5;
+					&mut chunk[5..12].copy_from_slice(&[ (data_len >> 8) as u8, (data_len & 0xff) as u8, APDU_CLA, command, p1, p2, data.len() as u8 ]);
 				}
-				chunk_index += 1;
+
+				&mut chunk[chunk_size..chunk_size + size].copy_from_slice(&data[offset..offset + size]);
+				offset += size;
+				chunk_size += size;
+			}
+			trace!("writing {:?}", &hid_chunk[..]);
+			let n = handle.write(&hid_chunk[..])?;
+			if n < chunk_size {
+				return Err(Error::Protocol("Write data size mismatch"));
 			}
+			if offset == data.len() {
+				break;
+			}
+			chunk_index += 1;
+		}
 
 		// read response
 		chunk_index = 0;
@@ -303,7 +307,7 @@ impl Manager {
 				if chunk_size < 7 {
 					return Err(Error::Protocol("Unexpected chunk header"));
 				}
-				message_size = (chunk[5] as usize) << 8  | (chunk[6] as usize);
+				message_size = (chunk[5] as usize) << 8 | (chunk[6] as usize);
 				offset += 2;
 			}
 			message.extend_from_slice(&chunk[offset..chunk_size]);
@@ -311,12 +315,12 @@ impl Manager {
 			if message.len() == message_size {
 				break;
 			}
-			chunk_index +=1;
+			chunk_index += 1;
 		}
 		if message.len() < 2 {
 			return Err(Error::Protocol("No status word"));
 		}
-		let status = (message[message.len() - 2] as usize) << 8  | (message[message.len() - 1] as usize);
+		let status = (message[message.len() - 2] as usize) << 8 | (message[message.len() - 1] as usize);
 		debug!("Read status {:x}", status);
 		match status {
 			0x6700 => Err(Error::Protocol("Incorrect length")),
@@ -336,14 +340,74 @@ impl Manager {
 		message.truncate(new_len);
 		Ok(message)
 	}
+
+	fn is_valid_ledger(device: &libusb::Device) -> Result<(), Error> {
+		let desc = device.device_descriptor()?;
+		let vendor_id = desc.vendor_id();
+		let product_id = desc.product_id();
+
+		if vendor_id == LEDGER_VID && LEDGER_PIDS.contains(&product_id) {
+			Ok(())
+		} else {
+			Err(Error::InvalidDevice)
+		}
+	}
+}
+
+// Try to connect to the device using polling in at most the time specified by the `timeout`
+fn try_connect_polling(ledger: Arc<Manager>, timeout: Duration) -> bool {
+	let start_time = Instant::now();
+	while start_time.elapsed() <= timeout {
+		if let Ok(_) = ledger.update_devices() {
+			return true
+		}
+	}
+	false
+}
+
+/// Ledger event handler
+/// A seperate thread is hanedling incoming events
+///
+/// Note, that this run to completion and race-conditions can't occur but this can
+/// therefore starve other events for being process with a spinlock or similar
+pub struct EventHandler {
+	ledger: Weak<Manager>,
+}
+
+impl EventHandler {
+	/// Ledger event handler constructor
+	pub fn new(ledger: Weak<Manager>) -> Self {
+		Self { ledger: ledger }
+	}
+}
+
+impl libusb::Hotplug for EventHandler {
+	fn device_arrived(&mut self, device: libusb::Device) {
+		debug!(target: "hw", "Ledger arrived");
+		if let (Some(ledger), Ok(_)) = (self.ledger.upgrade(), Manager::is_valid_ledger(&device)) {
+			if try_connect_polling(ledger, Duration::from_millis(500)) != true {
+				debug!(target: "hw", "Ledger connect timeout");
+			}
+		}
+	}
+
+	fn device_left(&mut self, device: libusb::Device) {
+		debug!(target: "hw", "Ledger left");
+		if let (Some(ledger), Ok(_)) = (self.ledger.upgrade(), Manager::is_valid_ledger(&device)) {
+			if try_connect_polling(ledger, Duration::from_millis(500)) != true {
+				debug!(target: "hw", "Ledger disconnect timeout");
+			}
+		}
+	}
 }
 
 #[test]
 fn smoke() {
 	use rustc_hex::FromHex;
-	let mut manager = Manager::new().unwrap();
+	let hidapi = Arc::new(Mutex::new(hidapi::HidApi::new().unwrap()));
+	let manager = Manager::new(hidapi.clone());
 	manager.update_devices().unwrap();
-	for d in &manager.devices {
+	for d in &*manager.devices.read() {
 		println!("Device: {:?}", d);
 	}
 
diff --git a/hw/src/lib.rs b/hw/src/lib.rs
index cda6c22412d469d570242a569b2a88469833ef4b..9bfec83410b55300551f6acb448bde7a85e45471 100644
--- a/hw/src/lib.rs
+++ b/hw/src/lib.rs
@@ -16,39 +16,70 @@
 
 //! Hardware wallet management.
 
-extern crate parking_lot;
+#![warn(missing_docs)]
+
+extern crate ethereum_types;
+extern crate ethkey;
 extern crate hidapi;
 extern crate libusb;
-extern crate ethkey;
-extern crate ethcore_bigint as bigint;
+extern crate parking_lot;
+extern crate protobuf;
+extern crate trezor_sys;
 #[macro_use] extern crate log;
 #[cfg(test)] extern crate rustc_hex;
 
 mod ledger;
+mod trezor;
+
+use ethkey::{Address, Signature};
 
+use parking_lot::Mutex;
 use std::fmt;
-use std::thread;
+use std::sync::Arc;
 use std::sync::atomic;
-use std::sync::{Arc, Weak};
 use std::sync::atomic::AtomicBool;
+use std::thread;
 use std::time::Duration;
-use parking_lot::Mutex;
-use ethkey::{Address, Signature};
+use ethereum_types::U256;
 
-pub use ledger::KeyPath;
+const USB_DEVICE_CLASS_DEVICE: u8 = 0;
 
-/// Hardware waller error.
+/// Hardware wallet error.
 #[derive(Debug)]
 pub enum Error {
 	/// Ledger device error.
 	LedgerDevice(ledger::Error),
+	/// Trezor device error
+	TrezorDevice(trezor::Error),
 	/// USB error.
 	Usb(libusb::Error),
+	/// HID error
+	Hid(String),
 	/// Hardware wallet not found for specified key.
 	KeyNotFound,
 }
 
-/// Hardware waller information.
+/// This is the transaction info we need to supply to Trezor message. It's more
+/// or less a duplicate of ethcore::transaction::Transaction, but we can't
+/// import ethcore here as that would be a circular dependency.
+pub struct TransactionInfo {
+	/// Nonce
+	pub nonce: U256,
+	/// Gas price
+	pub gas_price: U256,
+	/// Gas limit
+	pub gas_limit: U256,
+	/// Receiver
+	pub to: Option<Address>,
+	/// Value
+	pub value: U256,
+	/// Data
+	pub data: Vec<u8>,
+	/// Chain ID
+	pub chain_id: Option<u64>,
+}
+
+/// Hardware wallet information.
 #[derive(Debug, Clone)]
 pub struct WalletInfo {
 	/// Wallet device name.
@@ -61,12 +92,23 @@ pub struct WalletInfo {
 	pub address: Address,
 }
 
+/// Key derivation paths used on hardware wallets.
+#[derive(Debug, Clone, Copy)]
+pub enum KeyPath {
+	/// Ethereum.
+	Ethereum,
+	/// Ethereum classic.
+	EthereumClassic,
+}
+
 impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
 		match *self {
 			Error::KeyNotFound => write!(f, "Key not found for given address."),
 			Error::LedgerDevice(ref e) => write!(f, "{}", e),
+			Error::TrezorDevice(ref e) => write!(f, "{}", e),
 			Error::Usb(ref e) => write!(f, "{}", e),
+			Error::Hid(ref e) => write!(f, "{}", e),
 		}
 	}
 }
@@ -80,6 +122,15 @@ impl From<ledger::Error> for Error {
 	}
 }
 
+impl From<trezor::Error> for Error {
+	fn from(err: trezor::Error) -> Error {
+		match err {
+			trezor::Error::KeyNotFound => Error::KeyNotFound,
+			_ => Error::TrezorDevice(err),
+		}
+	}
+}
+
 impl From<libusb::Error> for Error {
 	fn from(err: libusb::Error) -> Error {
 		Error::Usb(err)
@@ -88,96 +139,134 @@ impl From<libusb::Error> for Error {
 
 /// Hardware wallet management interface.
 pub struct HardwareWalletManager {
-	update_thread: Option<thread::JoinHandle<()>>,
 	exiting: Arc<AtomicBool>,
-	ledger: Arc<Mutex<ledger::Manager>>,
+	ledger: Arc<ledger::Manager>,
+	trezor: Arc<trezor::Manager>,
 }
 
-struct EventHandler {
-	ledger: Weak<Mutex<ledger::Manager>>,
-}
-
-impl libusb::Hotplug for EventHandler {
-	fn device_arrived(&mut self, _device: libusb::Device) {
-		debug!("USB Device arrived");
-		if let Some(l) = self.ledger.upgrade() {
-			for _ in 0..10 {
-				// The device might not be visible right away. Try a few times.
-				if l.lock().update_devices().unwrap_or_else(|e| {
-					debug!("Error enumerating Ledger devices: {}", e);
-					0
-				}) > 0 {
-					break;
-				}
-				thread::sleep(Duration::from_millis(200));
-			}
-		}
-	}
-
-	fn device_left(&mut self, _device: libusb::Device) {
-		debug!("USB Device lost");
-		if let Some(l) = self.ledger.upgrade() {
-			if let Err(e) = l.lock().update_devices() {
-				debug!("Error enumerating Ledger devices: {}", e);
-			}
-		}
-	}
-}
 
 impl HardwareWalletManager {
+	/// Hardware wallet constructor
 	pub fn new() -> Result<HardwareWalletManager, Error> {
-		let usb_context = Arc::new(libusb::Context::new()?);
-		let ledger = Arc::new(Mutex::new(ledger::Manager::new()?));
-		usb_context.register_callback(None, None, None, Box::new(EventHandler { ledger: Arc::downgrade(&ledger) }))?;
+		let usb_context_trezor = Arc::new(libusb::Context::new()?);
+		let usb_context_ledger = Arc::new(libusb::Context::new()?);
+		let hidapi = Arc::new(Mutex::new(hidapi::HidApi::new().map_err(|e| Error::Hid(e.to_string().clone()))?));
+		let ledger = Arc::new(ledger::Manager::new(hidapi.clone()));
+		let trezor = Arc::new(trezor::Manager::new(hidapi.clone()));
+
+		// Subscribe to TREZOR V1
+		// Note, this support only TREZOR V1 becasue TREZOR V2 has another vendorID for some reason
+		// Also, we now only support one product as the second argument specifies
+		usb_context_trezor.register_callback(
+			Some(trezor::TREZOR_VID), Some(trezor::TREZOR_PIDS[0]), Some(USB_DEVICE_CLASS_DEVICE),
+			Box::new(trezor::EventHandler::new(Arc::downgrade(&trezor))))?;
+
+		// Subscribe to all Ledger Devices
+		// This means that we need to check that the given productID is supported
+		// None => LIBUSB_HOTPLUG_MATCH_ANY, in other words that all are subscribed to
+		// More info can be found: http://libusb.sourceforge.net/api-1.0/group__hotplug.html#gae6c5f1add6cc754005549c7259dc35ea
+		usb_context_ledger.register_callback(
+			Some(ledger::LEDGER_VID), None, Some(USB_DEVICE_CLASS_DEVICE),
+			Box::new(ledger::EventHandler::new(Arc::downgrade(&ledger))))?;
+
 		let exiting = Arc::new(AtomicBool::new(false));
-		let thread_exiting = exiting.clone();
+		let thread_exiting_ledger = exiting.clone();
+		let thread_exiting_trezor = exiting.clone();
 		let l = ledger.clone();
-		let thread = thread::Builder::new().name("hw_wallet".to_string()).spawn(move || {
-			if let Err(e) = l.lock().update_devices() {
-				debug!("Error updating ledger devices: {}", e);
-			}
-			loop {
-				usb_context.handle_events(Some(Duration::from_millis(500))).unwrap_or_else(|e| debug!("Error processing USB events: {}", e));
-				if thread_exiting.load(atomic::Ordering::Acquire) {
-					break;
+		let t = trezor.clone();
+
+		// Ledger event thread
+		thread::Builder::new()
+			.name("hw_wallet_ledger".to_string())
+			.spawn(move || {
+				if let Err(e) = l.update_devices() {
+					debug!(target: "hw", "Ledger couldn't connect at startup, error: {}", e);
+				}
+				loop {
+					usb_context_ledger.handle_events(Some(Duration::from_millis(500)))
+					           .unwrap_or_else(|e| debug!(target: "hw", "Ledger event handler error: {}", e));
+					if thread_exiting_ledger.load(atomic::Ordering::Acquire) {
+						break;
+					}
 				}
-			}
-		}).ok();
+			})
+			.ok();
+
+		// Trezor event thread
+		thread::Builder::new()
+			.name("hw_wallet_trezor".to_string())
+			.spawn(move || {
+				if let Err(e) = t.update_devices() {
+					debug!(target: "hw", "Trezor couldn't connect at startup, error: {}", e);
+				}
+				loop {
+					usb_context_trezor.handle_events(Some(Duration::from_millis(500)))
+					           .unwrap_or_else(|e| debug!(target: "hw", "Trezor event handler error: {}", e));
+					if thread_exiting_trezor.load(atomic::Ordering::Acquire) {
+						break;
+					}
+				}
+			})
+			.ok();
+
 		Ok(HardwareWalletManager {
-			update_thread: thread,
 			exiting: exiting,
 			ledger: ledger,
+			trezor: trezor,
 		})
 	}
 
 	/// Select key derivation path for a chain.
 	pub fn set_key_path(&self, key_path: KeyPath) {
-		self.ledger.lock().set_key_path(key_path);
+		self.ledger.set_key_path(key_path);
+		self.trezor.set_key_path(key_path);
 	}
 
-
 	/// List connected wallets. This only returns wallets that are ready to be used.
 	pub fn list_wallets(&self) -> Vec<WalletInfo> {
-		self.ledger.lock().list_devices()
+		let mut wallets = Vec::new();
+		wallets.extend(self.ledger.list_devices());
+		wallets.extend(self.trezor.list_devices());
+		wallets
+	}
+
+	/// Return a list of paths to locked hardware wallets
+	pub fn list_locked_wallets(&self) -> Result<Vec<String>, Error> {
+		Ok(self.trezor.list_locked_devices())
 	}
 
 	/// Get connected wallet info.
 	pub fn wallet_info(&self, address: &Address) -> Option<WalletInfo> {
-		self.ledger.lock().device_info(address)
+		if let Some(info) = self.ledger.device_info(address) {
+			Some(info)
+		} else {
+			self.trezor.device_info(address)
+		}
 	}
 
 	/// Sign transaction data with wallet managing `address`.
-	pub fn sign_transaction(&self, address: &Address, data: &[u8]) -> Result<Signature, Error> {
-		Ok(self.ledger.lock().sign_transaction(address, data)?)
+	pub fn sign_transaction(&self, address: &Address, t_info: &TransactionInfo, encoded_transaction: &[u8]) -> Result<Signature, Error> {
+		if self.ledger.device_info(address).is_some() {
+			Ok(self.ledger.sign_transaction(address, encoded_transaction)?)
+		} else if self.trezor.device_info(address).is_some() {
+			Ok(self.trezor.sign_transaction(address, t_info)?)
+		} else {
+			Err(Error::KeyNotFound)
+		}
+	}
+
+	/// Send a pin to a device at a certain path to unlock it
+	pub fn pin_matrix_ack(&self, path: &str, pin: &str) -> Result<bool, Error> {
+		self.trezor.pin_matrix_ack(path, pin).map_err(Error::TrezorDevice)
 	}
 }
 
 impl Drop for HardwareWalletManager {
 	fn drop(&mut self) {
+		// Indicate to the USB Hotplug handlers that they
+		// shall terminate but don't wait for them to terminate.
+		// If they don't terminate for some reason USB Hotplug events will be handled
+		// even if the HardwareWalletManger has been dropped
 		self.exiting.store(true, atomic::Ordering::Release);
-		if let Some(thread) = self.update_thread.take() {
-			thread.thread().unpark();
-			thread.join().ok();
-		}
 	}
 }
diff --git a/hw/src/trezor.rs b/hw/src/trezor.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7db226718bc6681981cfea05a22ae5e93390be70
--- /dev/null
+++ b/hw/src/trezor.rs
@@ -0,0 +1,480 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Trezor hardware wallet module. Supports Trezor v1.
+//! See http://doc.satoshilabs.com/trezor-tech/api-protobuf.html
+//! and https://github.com/trezor/trezor-common/blob/master/protob/protocol.md
+//! for protocol details.
+
+use super::{WalletInfo, TransactionInfo, KeyPath};
+
+use std::cmp::{min, max};
+use std::fmt;
+use std::sync::{Arc, Weak};
+use std::time::{Duration, Instant};
+
+use ethereum_types::{U256, H256, Address};
+use ethkey::Signature;
+use hidapi;
+use libusb;
+use parking_lot::{Mutex, RwLock};
+use protobuf;
+use protobuf::{Message, ProtobufEnum};
+
+use trezor_sys::messages::{EthereumAddress, PinMatrixAck, MessageType, EthereumTxRequest, EthereumSignTx, EthereumGetAddress, EthereumTxAck, ButtonAck};
+
+/// Trezor v1 vendor ID
+pub const TREZOR_VID: u16 = 0x534c;
+/// Trezor product IDs
+pub const TREZOR_PIDS: [u16; 1] = [0x0001];
+
+const ETH_DERIVATION_PATH: [u32; 5] = [0x8000002C, 0x8000003C, 0x80000000, 0, 0]; // m/44'/60'/0'/0/0
+const ETC_DERIVATION_PATH: [u32; 5] = [0x8000002C, 0x8000003D, 0x80000000, 0, 0]; // m/44'/61'/0'/0/0
+
+/// Hardware wallet error.
+#[derive(Debug)]
+pub enum Error {
+	/// Ethereum wallet protocol error.
+	Protocol(&'static str),
+	/// Hidapi error.
+	Usb(hidapi::HidError),
+	/// Device with request key is not available.
+	KeyNotFound,
+	/// Signing has been cancelled by user.
+	UserCancel,
+	/// The Message Type given in the trezor RPC call is not something we recognize
+	BadMessageType,
+	/// Trying to read from a closed device at the given path
+	LockedDevice(String),
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		match *self {
+			Error::Protocol(ref s) => write!(f, "Trezor protocol error: {}", s),
+			Error::Usb(ref e) => write!(f, "USB communication error: {}", e),
+			Error::KeyNotFound => write!(f, "Key not found"),
+			Error::UserCancel => write!(f, "Operation has been cancelled"),
+			Error::BadMessageType => write!(f, "Bad Message Type in RPC call"),
+			Error::LockedDevice(ref s) => write!(f, "Device is locked, needs PIN to perform operations: {}", s),
+		}
+	}
+}
+
+impl From<hidapi::HidError> for Error {
+	fn from(err: hidapi::HidError) -> Error {
+		Error::Usb(err)
+	}
+}
+
+impl From<protobuf::ProtobufError> for Error {
+	fn from(_: protobuf::ProtobufError) -> Error {
+		Error::Protocol(&"Could not read response from Trezor Device")
+	}
+}
+
+/// Ledger device manager
+pub struct Manager {
+	usb: Arc<Mutex<hidapi::HidApi>>,
+	devices: RwLock<Vec<Device>>,
+	locked_devices: RwLock<Vec<String>>,
+	key_path: RwLock<KeyPath>,
+}
+
+#[derive(Debug)]
+struct Device {
+	path: String,
+	info: WalletInfo,
+}
+
+/// HID Version used for the Trezor device
+enum HidVersion {
+	V1,
+	V2,
+}
+
+impl Manager {
+	/// Create a new instance.
+	pub fn new(hidapi: Arc<Mutex<hidapi::HidApi>>) -> Manager {
+		Manager {
+			usb: hidapi,
+			devices: RwLock::new(Vec::new()),
+			locked_devices: RwLock::new(Vec::new()),
+			key_path: RwLock::new(KeyPath::Ethereum),
+		}
+	}
+
+	/// Re-populate device list
+	pub fn update_devices(&self) -> Result<usize, Error> {
+		let mut usb = self.usb.lock();
+		usb.refresh_devices();
+		let devices = usb.devices();
+		let mut new_devices = Vec::new();
+		let mut locked_devices = Vec::new();
+		let mut error = None;
+		for usb_device in devices {
+			let is_trezor = usb_device.vendor_id == TREZOR_VID;
+			let is_supported_product = TREZOR_PIDS.contains(&usb_device.product_id);
+			let is_valid = usb_device.usage_page == 0xFF00 || usb_device.interface_number == 0;
+
+			trace!(
+				"Checking device: {:?}, trezor: {:?}, prod: {:?}, valid: {:?}",
+				usb_device,
+				is_trezor,
+				is_supported_product,
+				is_valid,
+			);
+			if !is_trezor || !is_supported_product || !is_valid {
+				continue;
+			}
+			match self.read_device_info(&usb, &usb_device) {
+				Ok(device) => new_devices.push(device),
+				Err(Error::LockedDevice(path)) => locked_devices.push(path.to_string()),
+				Err(e) => {
+					warn!("Error reading device: {:?}", e);
+					error = Some(e);
+				}
+			}
+		}
+		let count = new_devices.len();
+		trace!("Got devices: {:?}, closed: {:?}", new_devices, locked_devices);
+		*self.devices.write() = new_devices;
+		*self.locked_devices.write() = locked_devices;
+		match error {
+			Some(e) => Err(e),
+			None => Ok(count),
+		}
+	}
+
+	fn read_device_info(&self, usb: &hidapi::HidApi, dev_info: &hidapi::HidDeviceInfo) -> Result<Device, Error> {
+		let handle = self.open_path(|| usb.open_path(&dev_info.path))?;
+		let manufacturer = dev_info.manufacturer_string.clone().unwrap_or("Unknown".to_owned());
+		let name = dev_info.product_string.clone().unwrap_or("Unknown".to_owned());
+		let serial = dev_info.serial_number.clone().unwrap_or("Unknown".to_owned());
+		match self.get_address(&handle) {
+			Ok(Some(addr)) => {
+				Ok(Device {
+					path: dev_info.path.clone(),
+					info: WalletInfo {
+						name: name,
+						manufacturer: manufacturer,
+						serial: serial,
+						address: addr,
+					},
+				})
+			}
+			Ok(None) => Err(Error::LockedDevice(dev_info.path.clone())),
+			Err(e) => Err(e),
+		}
+	}
+
+	/// Select key derivation path for a known chain.
+	pub fn set_key_path(&self, key_path: KeyPath) {
+		*self.key_path.write() = key_path;
+	}
+
+	/// List connected wallets. This only returns wallets that are ready to be used.
+	pub fn list_devices(&self) -> Vec<WalletInfo> {
+		self.devices.read().iter().map(|d| d.info.clone()).collect()
+	}
+
+	pub fn list_locked_devices(&self) -> Vec<String> {
+		(*self.locked_devices.read()).clone()
+	}
+
+	/// Get wallet info.
+	pub fn device_info(&self, address: &Address) -> Option<WalletInfo> {
+		self.devices.read().iter().find(|d| &d.info.address == address).map(|d| d.info.clone())
+	}
+
+	fn open_path<R, F>(&self, f: F) -> Result<R, Error>
+		where F: Fn() -> Result<R, &'static str>
+	{
+		f().map_err(Into::into)
+	}
+
+	pub fn pin_matrix_ack(&self, device_path: &str, pin: &str) -> Result<bool, Error> {
+		let unlocked = {
+			let usb = self.usb.lock();
+			let device = self.open_path(|| usb.open_path(&device_path))?;
+			let t = MessageType::MessageType_PinMatrixAck;
+			let mut m = PinMatrixAck::new();
+			m.set_pin(pin.to_string());
+			self.send_device_message(&device, &t, &m)?;
+			let (resp_type, _) = self.read_device_response(&device)?;
+			match resp_type {
+				// Getting an Address back means it's unlocked, this is undocumented behavior
+				MessageType::MessageType_EthereumAddress => Ok(true),
+				// Getting anything else means we didn't unlock it
+				_ => Ok(false),
+
+			}
+		};
+		self.update_devices()?;
+		unlocked
+	}
+
+	fn get_address(&self, device: &hidapi::HidDevice) -> Result<Option<Address>, Error> {
+		let typ = MessageType::MessageType_EthereumGetAddress;
+		let mut message = EthereumGetAddress::new();
+		match *self.key_path.read() {
+			KeyPath::Ethereum => message.set_address_n(ETH_DERIVATION_PATH.to_vec()),
+			KeyPath::EthereumClassic => message.set_address_n(ETC_DERIVATION_PATH.to_vec()),
+		}
+		message.set_show_display(false);
+		self.send_device_message(&device, &typ, &message)?;
+
+		let (resp_type, bytes) = self.read_device_response(&device)?;
+		match resp_type {
+			MessageType::MessageType_EthereumAddress => {
+				let response: EthereumAddress = protobuf::core::parse_from_bytes(&bytes)?;
+				Ok(Some(From::from(response.get_address())))
+			}
+			_ => Ok(None),
+		}
+	}
+
+	/// Sign transaction data with wallet managing `address`.
+	pub fn sign_transaction(&self, address: &Address, t_info: &TransactionInfo) -> Result<Signature, Error> {
+		let usb = self.usb.lock();
+		let devices = self.devices.read();
+		let device = devices.iter().find(|d| &d.info.address == address).ok_or(Error::KeyNotFound)?;
+		let handle = self.open_path(|| usb.open_path(&device.path))?;
+		let msg_type = MessageType::MessageType_EthereumSignTx;
+		let mut message = EthereumSignTx::new();
+		match *self.key_path.read() {
+			KeyPath::Ethereum => message.set_address_n(ETH_DERIVATION_PATH.to_vec()),
+			KeyPath::EthereumClassic => message.set_address_n(ETC_DERIVATION_PATH.to_vec()),
+		}
+		message.set_nonce(self.u256_to_be_vec(&t_info.nonce));
+		message.set_gas_limit(self.u256_to_be_vec(&t_info.gas_limit));
+		message.set_gas_price(self.u256_to_be_vec(&t_info.gas_price));
+		message.set_value(self.u256_to_be_vec(&t_info.value));
+
+		match t_info.to {
+			Some(addr) => {
+				message.set_to(addr.to_vec())
+			}
+			None => (),
+		}
+		let first_chunk_length = min(t_info.data.len(), 1024);
+		let chunk = &t_info.data[0..first_chunk_length];
+		message.set_data_initial_chunk(chunk.to_vec());
+		message.set_data_length(t_info.data.len() as u32);
+		if let Some(c_id) = t_info.chain_id {
+			message.set_chain_id(c_id as u32);
+		}
+
+		self.send_device_message(&handle, &msg_type, &message)?;
+
+		self.signing_loop(&handle, &t_info.chain_id, &t_info.data[first_chunk_length..])
+	}
+
+	fn u256_to_be_vec(&self, val: &U256) -> Vec<u8> {
+		let mut buf = [0u8; 32];
+		val.to_big_endian(&mut buf);
+		buf.iter().skip_while(|x| **x == 0).cloned().collect()
+	}
+
+	fn signing_loop(&self, handle: &hidapi::HidDevice, chain_id: &Option<u64>, data: &[u8]) -> Result<Signature, Error> {
+		let (resp_type, bytes) = self.read_device_response(&handle)?;
+		match resp_type {
+			MessageType::MessageType_Cancel => Err(Error::UserCancel),
+			MessageType::MessageType_ButtonRequest => {
+				self.send_device_message(handle, &MessageType::MessageType_ButtonAck, &ButtonAck::new())?;
+				// Signing loop goes back to the top and reading blocks
+				// for up to 5 minutes waiting for response from the device
+				// if the user doesn't click any button within 5 minutes you
+				// get a signing error and the device sort of locks up on the signing screen
+				self.signing_loop(handle, chain_id, data)
+			}
+			MessageType::MessageType_EthereumTxRequest => {
+				let resp: EthereumTxRequest = protobuf::core::parse_from_bytes(&bytes)?;
+				if resp.has_data_length() {
+					let mut msg = EthereumTxAck::new();
+					let len = resp.get_data_length() as usize;
+					msg.set_data_chunk(data[..len].to_vec());
+					self.send_device_message(handle, &MessageType::MessageType_EthereumTxAck, &msg)?;
+					self.signing_loop(handle, chain_id, &data[len..])
+				} else {
+					let v = resp.get_signature_v();
+					let r = H256::from_slice(resp.get_signature_r());
+					let s = H256::from_slice(resp.get_signature_s());
+					if let Some(c_id) = *chain_id {
+						// If there is a chain_id supplied, Trezor will return a v
+						// part of the signature that is already adjusted for EIP-155,
+						// so v' = v + 2 * chain_id + 35, but code further down the
+						// pipeline will already do this transformation, so remove it here
+						let adjustment = 35 + 2 * c_id as u32;
+						Ok(Signature::from_rsv(&r, &s, (max(v, adjustment) - adjustment) as u8))
+					} else {
+						// If there isn't a chain_id, v will be returned as v + 27
+						let adjusted_v = if v < 27 { v } else { v - 27 };
+						Ok(Signature::from_rsv(&r, &s, adjusted_v as u8))
+					}
+				}
+			}
+			MessageType::MessageType_Failure => Err(Error::Protocol("Last message sent to Trezor failed")),
+			_ => Err(Error::Protocol("Unexpected response from Trezor device.")),
+		}
+	}
+
+	fn send_device_message(&self, device: &hidapi::HidDevice, msg_type: &MessageType, msg: &Message) -> Result<usize, Error> {
+		let msg_id = *msg_type as u16;
+		let mut message = msg.write_to_bytes()?;
+		let msg_size = message.len();
+		let mut data = Vec::new();
+		let hid_version = self.probe_hid_version(device)?;
+		// Magic constants
+		data.push('#' as u8);
+		data.push('#' as u8);
+		// Convert msg_id to BE and split into bytes
+		data.push(((msg_id >> 8) & 0xFF) as u8);
+		data.push((msg_id & 0xFF) as u8);
+		// Convert msg_size to BE and split into bytes
+		data.push(((msg_size >> 24) & 0xFF) as u8);
+		data.push(((msg_size >> 16) & 0xFF) as u8);
+		data.push(((msg_size >> 8) & 0xFF) as u8);
+		data.push((msg_size & 0xFF) as u8);
+		data.append(&mut message);
+		while data.len() % 63 > 0 {
+			data.push(0);
+		}
+		let mut total_written = 0;
+		for chunk in data.chunks(63) {
+			let mut padded_chunk = match hid_version {
+				HidVersion::V1 => vec!['?' as u8],
+				HidVersion::V2 => vec![0, '?' as u8],
+			};
+			padded_chunk.extend_from_slice(&chunk);
+			total_written += device.write(&padded_chunk)?;
+		}
+		Ok(total_written)
+	}
+
+	fn probe_hid_version(&self, device: &hidapi::HidDevice) -> Result<HidVersion, Error> {
+		let mut buf2 = [0xFFu8; 65];
+		buf2[0] = 0;
+		buf2[1] = 63;
+		let mut buf1 = [0xFFu8; 64];
+		buf1[0] = 63;
+		if device.write(&buf2)? == 65 {
+			Ok(HidVersion::V2)
+		} else if device.write(&buf1)? == 64 {
+			Ok(HidVersion::V1)
+		} else {
+			Err(Error::Usb("Unable to determine HID Version"))
+		}
+	}
+
+	fn read_device_response(&self, device: &hidapi::HidDevice) -> Result<(MessageType, Vec<u8>), Error> {
+		let protocol_err = Error::Protocol(&"Unexpected wire response from Trezor Device");
+		let mut buf = vec![0; 64];
+
+		let first_chunk = device.read_timeout(&mut buf, 300_000)?;
+		if first_chunk < 9 || buf[0] != '?' as u8 || buf[1] != '#' as u8 || buf[2] != '#' as u8 {
+			return Err(protocol_err);
+		}
+		let msg_type = MessageType::from_i32(((buf[3] as i32 & 0xFF) << 8) + (buf[4] as i32 & 0xFF)).ok_or(protocol_err)?;
+		let msg_size = ((buf[5] as u32 & 0xFF) << 24) + ((buf[6] as u32 & 0xFF) << 16) + ((buf[7] as u32 & 0xFF) << 8) + (buf[8] as u32 & 0xFF);
+		let mut data = Vec::new();
+		data.extend_from_slice(&buf[9..]);
+		while data.len() < (msg_size as usize) {
+			device.read_timeout(&mut buf, 10_000)?;
+			data.extend_from_slice(&buf[1..]);
+		}
+		Ok((msg_type, data[..msg_size as usize].to_vec()))
+	}
+}
+
+// Try to connect to the device using polling in at most the time specified by the `timeout`
+fn try_connect_polling(trezor: Arc<Manager>, duration: Duration) -> bool {
+	let start_time = Instant::now();
+	while start_time.elapsed() <= duration {
+		if let Ok(_) = trezor.update_devices() {
+			return true
+		}
+	}
+	false
+}
+
+/// Trezor event handler
+/// A separate thread is handeling incoming events
+///
+/// Note, that this run to completion and race-conditions can't occur but this can
+/// therefore starve other events for being process with a spinlock or similar
+pub struct EventHandler {
+	trezor: Weak<Manager>,
+}
+
+impl EventHandler {
+	/// Trezor event handler constructor
+	pub fn new(trezor: Weak<Manager>) -> Self {
+		Self { trezor: trezor }
+	}
+}
+
+impl libusb::Hotplug for EventHandler {
+	fn device_arrived(&mut self, _device: libusb::Device) {
+		debug!(target: "hw", "Trezor V1 arrived");
+		if let Some(trezor) = self.trezor.upgrade() {
+			if try_connect_polling(trezor, Duration::from_millis(500)) != true {
+				debug!(target: "hw", "Ledger connect timeout");
+			}
+		}
+	}
+
+	fn device_left(&mut self, _device: libusb::Device) {
+		debug!(target: "hw", "Trezor V1 left");
+		if let Some(trezor) = self.trezor.upgrade() {
+			if try_connect_polling(trezor, Duration::from_millis(500)) != true {
+				debug!(target: "hw", "Ledger disconnect timeout");
+			}
+		}
+	}
+}
+
+#[test]
+#[ignore]
+/// This test can't be run without an actual trezor device connected
+/// (and unlocked) attached to the machine that's running the test
+fn test_signature() {
+	use ethereum_types::{H160, H256, U256};
+
+	let hidapi = Arc::new(Mutex::new(hidapi::HidApi::new().unwrap()));
+	let manager = Manager::new(hidapi.clone());
+	let addr: Address = H160::from("some_addr");
+
+	manager.update_devices().unwrap();
+
+	let t_info = TransactionInfo {
+		nonce: U256::from(1),
+		gas_price: U256::from(100),
+		gas_limit: U256::from(21_000),
+		to: Some(H160::from("some_other_addr")),
+		chain_id: Some(17),
+		value: U256::from(1_000_000),
+		data: (&[1u8; 3000]).to_vec(),
+	};
+	let signature = manager.sign_transaction(&addr, &t_info).unwrap();
+	let expected = Signature::from_rsv(
+		&H256::from("device_specific_r"),
+		&H256::from("device_specific_s"),
+		0x01
+		);
+
+	assert_eq!(signature, expected)
+}
diff --git a/ipc-common-types/Cargo.toml b/ipc-common-types/Cargo.toml
deleted file mode 100644
index ec9b157d5c11e7285bf65d1287a14d0e81dce97e..0000000000000000000000000000000000000000
--- a/ipc-common-types/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-description = "Types that implement IPC and are common to multiple modules."
-name = "ipc-common-types"
-version = "1.8.0"
-license = "GPL-3.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[build-dependencies]
-ethcore-ipc-codegen = { path = "../ipc/codegen" }
-
-[dependencies]
-semver = "0.6"
-ethcore-ipc = { path = "../ipc/rpc" }
-ethcore-util = { path = "../util" }
diff --git a/ipc-common-types/build.rs b/ipc-common-types/build.rs
deleted file mode 100644
index 3a51d6a215876b207501304611fc7e5ee68cb944..0000000000000000000000000000000000000000
--- a/ipc-common-types/build.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate ethcore_ipc_codegen;
-
-fn main() {
-	ethcore_ipc_codegen::derive_binary("src/types/mod.rs.in").unwrap();
-}
diff --git a/ipc-common-types/src/types/mod.rs b/ipc-common-types/src/types/mod.rs
deleted file mode 100644
index 68dfe0b252839d0b6027446bc17c3ead1ea46d7d..0000000000000000000000000000000000000000
--- a/ipc-common-types/src/types/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Types used in the public api
-
-#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues
-include!(concat!(env!("OUT_DIR"), "/mod.rs.in"));
-
diff --git a/ipc-common-types/src/types/mod.rs.in b/ipc-common-types/src/types/mod.rs.in
deleted file mode 100644
index f137d1d607bdba37c1c5b262bd866eb0d6249fd4..0000000000000000000000000000000000000000
--- a/ipc-common-types/src/types/mod.rs.in
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-pub mod release_track;
-pub mod version_info;
-
-pub use release_track::{ReleaseTrack};
-pub use version_info::{VersionInfo};
\ No newline at end of file
diff --git a/ipc/codegen/Cargo.toml b/ipc/codegen/Cargo.toml
deleted file mode 100644
index 69580e08d76f7faf55f66bc4706cc55eae324923..0000000000000000000000000000000000000000
--- a/ipc/codegen/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "ethcore-ipc-codegen"
-version = "1.8.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-license = "GPL-3.0"
-description = "Macros to auto-generate implementations for ipc call"
-build = "build.rs"
-keywords = ["ipc", "codegen"]
-
-[features]
-default = ["with-syntex"]
-nightly = ["quasi_macros"]
-nightly-testing = ["clippy"]
-with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
-
-[build-dependencies]
-quasi_codegen = { version = "0.32", optional = true }
-syntex = { version = "0.58", optional = true }
-
-[dependencies]
-aster = { version = "0.41", default-features = false }
-clippy = { version = "^0.*", optional = true }
-quasi = { version = "0.32", default-features = false }
-quasi_macros = { version = "0.32", optional = true }
-syntex = { version = "0.58", optional = true }
-syntex_syntax = { version = "0.58", optional = true }
diff --git a/ipc/codegen/build.rs b/ipc/codegen/build.rs
deleted file mode 100644
index 442abf7dfba6404c05fbf2923dbe67346457b1b1..0000000000000000000000000000000000000000
--- a/ipc/codegen/build.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-
-#[cfg(feature = "with-syntex")]
-mod inner {
-	extern crate syntex;
-	extern crate quasi_codegen;
-
-	use std::env;
-	use std::path::Path;
-
-	pub fn main() {
-		let out_dir = env::var_os("OUT_DIR").unwrap();
-
-		let src = Path::new("src/lib.rs.in");
-		let dst = Path::new(&out_dir).join("lib.rs");
-
-		quasi_codegen::expand(&src, &dst).unwrap();
-	}
-}
-
-#[cfg(not(feature = "with-syntex"))]
-mod inner {
-	pub fn main() {}
-}
-
-fn main() {
-	inner::main();
-}
diff --git a/ipc/codegen/src/codegen.rs b/ipc/codegen/src/codegen.rs
deleted file mode 100644
index 2f4752d9716407f99e954183210960ba8803e542..0000000000000000000000000000000000000000
--- a/ipc/codegen/src/codegen.rs
+++ /dev/null
@@ -1,898 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-use aster;
-
-use syntax::ast::{
-	MetaItem,
-	Item,
-	ImplItemKind,
-	MethodSig,
-	Arg,
-	PatKind,
-	FunctionRetTy,
-	Ty,
-	TraitRef,
-	Ident,
-	Generics,
-	TraitItemKind,
-};
-
-use syntax::ast;
-use syntax::codemap::Span;
-use syntax::ext::base::{Annotatable, ExtCtxt};
-use syntax::ptr::P;
-
-pub struct Error;
-
-const RESERVED_MESSAGE_IDS: u16 = 16;
-
-pub fn expand_ipc_implementation(
-	cx: &mut ExtCtxt,
-	span: Span,
-	meta_item: &MetaItem,
-	annotatable: &Annotatable,
-	push: &mut FnMut(Annotatable)
-) {
-	let item = match *annotatable {
-		Annotatable::Item(ref item) => item,
-		_ => {
-			cx.span_err(meta_item.span, "`#[ipc]` may only be applied to implementations and traits");
-			return;
-		},
-	};
-
-	let builder = aster::AstBuilder::new().span(span);
-
-	let interface_map = match implement_interface(cx, &builder, &item, push, meta_item) {
-		Ok(interface_map) => interface_map,
-		Err(Error) => { return; },
-	};
-
-	push_client(cx, &builder, &interface_map, push);
-
-	push(Annotatable::Item(interface_map.item));
-}
-
-macro_rules! literal {
-    ($builder:ident, $($arg:tt)*) => {
-	 	$builder.expr().lit().str::<&str>(&format!($($arg)*))
-    }
-}
-
-fn field_name(builder: &aster::AstBuilder, arg: &Arg) -> ast::Ident {
-	match arg.pat.node {
-		PatKind::Ident(_, ref ident, _) => builder.id(ident.node),
-		_ => { panic!("unexpected param in interface: {:?}", arg.pat.node) }
-	}
-}
-
-pub fn replace_slice_u8(builder: &aster::AstBuilder, ty: &P<ast::Ty>) -> P<ast::Ty> {
-	if ::syntax::print::pprust::ty_to_string(&strip_ptr(ty)) == "[u8]" {
-		return builder.ty().id("Vec<u8>")
-	}
-	ty.clone()
-}
-
-struct NamedSignature<'a> {
-	sig: &'a MethodSig,
-	ident: &'a Ident,
-}
-
-fn push_invoke_signature_aster(
-	builder: &aster::AstBuilder,
-	named_signature: &NamedSignature,
-	push: &mut FnMut(Annotatable),
-) -> Dispatch {
-	let inputs = &named_signature.sig.decl.inputs;
-	let (input_type_name, input_arg_names, input_arg_tys) = if inputs.len() > 0 {
-		let first_field_name = field_name(builder, &inputs[0]).name.as_str();
-		if &*first_field_name == "self" && inputs.len() == 1 { (None, vec![], vec![]) }
-		else {
-			let skip = if &*first_field_name == "self" { 2 } else { 1 };
-			let name_str = format!("{}_input", named_signature.ident.name.as_str());
-
-			let mut arg_names = Vec::new();
-			let mut arg_tys = Vec::new();
-
-			let arg_name = format!("{}", field_name(builder, &inputs[skip-1]).name);
-			let arg_ty = &inputs[skip-1].ty;
-
-			let mut tree = builder.item()
-				.attr().word("binary")
-				.attr().word("allow(non_camel_case_types)")
-				.struct_(name_str.as_str())
-				.field(arg_name.as_str())
-				.ty().build(replace_slice_u8(builder, &strip_ptr(arg_ty)));
-
-			arg_names.push(arg_name);
-			arg_tys.push(arg_ty.clone());
-			for arg in inputs.iter().skip(skip) {
-				let arg_name = format!("{}", field_name(builder, &arg));
-				let arg_ty = &arg.ty;
-
-				tree = tree.field(arg_name.as_str()).ty().build(replace_slice_u8(builder, &strip_ptr(arg_ty)));
-				arg_names.push(arg_name);
-				arg_tys.push(arg_ty.clone());
-			}
-
-			push(Annotatable::Item(tree.build()));
-			(Some(name_str.to_owned()), arg_names, arg_tys)
-		}
-	}
-	else {
-		(None, vec![], vec![])
-	};
-
-	let return_type_ty = match named_signature.sig.decl.output {
-		FunctionRetTy::Ty(ref ty) => {
-			let name_str = format!("{}_output", named_signature.ident.name.as_str());
-			let tree = builder.item()
-				.attr().word("binary")
-				.attr().word("allow(non_camel_case_types)")
-				.struct_(name_str.as_str())
-				.field(format!("payload")).ty().build(ty.clone());
-			push(Annotatable::Item(tree.build()));
-			Some(ty.clone())
-		}
-		_ => None
-	};
-
-	Dispatch {
-		function_name: format!("{}", named_signature.ident.name.as_str()),
-		input_type_name: input_type_name,
-		input_arg_names: input_arg_names,
-		input_arg_tys: input_arg_tys,
-		return_type_ty: return_type_ty,
-	}
-}
-
-struct Dispatch {
-	function_name: String,
-	input_type_name: Option<String>,
-	input_arg_names: Vec<String>,
-	input_arg_tys: Vec<P<Ty>>,
-	return_type_ty: Option<P<Ty>>,
-}
-
-//	This is the expanded version of this:
-//
-//	let invoke_serialize_stmt = quote_stmt!(cx, {
-//		::bincode::serde::serialize(& $output_type_id { payload: self. $function_name ($hand_param_a, $hand_param_b) }, ::bincode::SizeLimit::Infinite).unwrap()
-//  });
-//
-// But the above does not allow comma-separated expressions for arbitrary number
-// of parameters ...$hand_param_a, $hand_param_b, ... $hand_param_n
-fn implement_dispatch_arm_invoke_stmt(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	dispatch: &Dispatch,
-) -> ast::Stmt
-{
-	use ::syntax::tokenstream::TokenTree::Token;
-	let function_name = builder.id(dispatch.function_name.as_str());
-
-	let input_args_exprs = dispatch.input_arg_names.iter().enumerate().map(|(arg_index, arg_name)| {
-		let arg_ident = builder.id(arg_name);
-		let expr = quote_expr!(cx, input. $arg_ident);
-		if has_ptr(&dispatch.input_arg_tys[arg_index]) { quote_expr!(cx, & $expr) }
-		else { expr }
-	}).collect::<Vec<P<ast::Expr>>>();
-
-	let ext_cx = &*cx;
-	::quasi::parse_stmt_panic(&mut ::syntax::parse::new_parser_from_tts(
-		ext_cx.parse_sess(),
-		{
-			let _sp = ext_cx.call_site();
-			let mut tt = ::std::vec::Vec::new();
-
-			tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace)));
-
-			if dispatch.return_type_ty.is_some() {
-				tt.push(Token(_sp, ::syntax::parse::token::ModSep));
-				tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("ipc"))));
-				tt.push(Token(_sp, ::syntax::parse::token::ModSep));
-				tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("binary"))));
-				tt.push(Token(_sp, ::syntax::parse::token::ModSep));
-				tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("serialize"))));
-				tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren)));
-				tt.push(Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And)));
-			}
-
-			tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self"))));
-			tt.push(Token(_sp, ::syntax::parse::token::Dot));
-			tt.extend(::quasi::ToTokens::to_tokens(&function_name, ext_cx).into_iter());
-			tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren)));
-
-			for arg_expr in input_args_exprs {
-				tt.extend(::quasi::ToTokens::to_tokens(&arg_expr, ext_cx).into_iter());
-				tt.push(Token(_sp, ::syntax::parse::token::Comma));
-			}
-
-			tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren)));
-
-			if dispatch.return_type_ty.is_some() {
-				tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren)));
-				tt.push(Token(_sp, ::syntax::parse::token::Dot));
-				tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("unwrap"))));
-				tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren)));
-				tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren)));
-			}
-			else {
-				tt.push(Token(_sp, ::syntax::parse::token::Semi));
-				tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Vec"))));
-				tt.push(Token(_sp, ::syntax::parse::token::ModSep));
-				tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("new"))));
-				tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren)));
-				tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren)));
-
-			}
-			tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace)));
-
-			tt
-		}
-	)).unwrap()
-}
-
-fn implement_dispatch_arm_invoke(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	dispatch: &Dispatch,
-	buffer: bool,
-) -> P<ast::Expr>
-{
-	let deserialize_expr = if buffer {
-		quote_expr!(cx,
-			::ipc::binary::deserialize(buf)
-				.unwrap_or_else(|e| { panic!("ipc error while deserializing payload, aborting \n payload: {:?}, \n error: {:?}", buf, e); } )
-		)
-	} else {
-		quote_expr!(cx,
-			::ipc::binary::deserialize_from(r)
-				.unwrap_or_else(|e| { panic!("ipc error while deserializing payload, aborting \n error: {:?}", e); } )
-		)
-	};
-
-	let invoke_serialize_stmt = implement_dispatch_arm_invoke_stmt(cx, builder, dispatch);
-	dispatch.input_type_name.as_ref().map(|val| {
-			let input_type_id = builder.id(val.clone().as_str());
-			quote_expr!(cx, {
-				let input: $input_type_id = $deserialize_expr;
-				$invoke_serialize_stmt
-			})
-		}).unwrap_or(quote_expr!(cx, { $invoke_serialize_stmt }))
-}
-
-/// generates dispatch match for method id
-fn implement_dispatch_arm(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	index: u32,
-	dispatch: &Dispatch,
-	buffer: bool,
-) -> ast::Arm
-{
-	let index_ident = builder.id(format!("{}", index + (RESERVED_MESSAGE_IDS as u32)).as_str());
-	let invoke_expr = implement_dispatch_arm_invoke(cx, builder, dispatch, buffer);
-	let trace = literal!(builder, "Dispatching: {}", &dispatch.function_name);
-	quote_arm!(cx, $index_ident => {
-		trace!(target: "ipc", $trace);
-		$invoke_expr
-	})
-}
-
-fn implement_dispatch_arms(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	dispatches: &[Dispatch],
-	buffer: bool,
-) -> Vec<ast::Arm>
-{
-	let mut index = -1;
-	dispatches.iter()
-		.map(|dispatch| { index = index + 1; implement_dispatch_arm(cx, builder, index as u32, dispatch, buffer) }).collect()
-}
-
-pub fn strip_ptr(ty: &P<ast::Ty>) -> P<ast::Ty> {
-	if let ast::TyKind::Rptr(_, ref ptr_mut) = ty.node {
-		ptr_mut.ty.clone()
-	}
-	else { ty.clone() }
-}
-
-pub fn has_ptr(ty: &P<ast::Ty>) -> bool {
-	if let ast::TyKind::Rptr(_, ref _ptr_mut) = ty.node {
-		true
-	}
-	else { false }
-}
-
-/// returns an expression with the body for single operation that is being sent to server
-/// operation itself serializes input, writes to socket and waits for socket to respond
-/// (the latter only if original method signature returns anyting)
-///
-/// assuming expanded class contains method
-///   fn commit(&self, f: u32) -> u32
-///
-/// the expanded implementation will generate method for the client like that
-///    #[binary]
-///    struct Request<'a> {
-///	     f: &'a u32,
-///    }
-///    let payload = Request{f: &f,};
-///    let mut socket_ref = self.socket.borrow_mut();
-///    let mut socket = socket_ref.deref_mut();
-///    let serialized_payload = ::bincode::serde::serialize(&payload, ::bincode::SizeLimit::Infinite).unwrap();
-///    ::ipc::invoke(0, &Some(serialized_payload), &mut socket);
-///    while !socket.ready().load(::std::sync::atomic::Ordering::Relaxed) { }
-///    ::bincode::serde::deserialize_from::<_, u32>(&mut socket, ::bincode::SizeLimit::Infinite).unwrap()
-fn implement_client_method_body(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	index: u16,
-	interface_map: &InterfaceMap,
-) -> P<ast::Expr>
-{
-	use ::syntax::tokenstream::TokenTree::Token;
-
-	let dispatch = &interface_map.dispatches[index as usize];
-	let index_ident = builder.id(format!("{}", index + RESERVED_MESSAGE_IDS).as_str());
-
-	let request = if dispatch.input_arg_names.len() > 0 {
-
-		let arg_name = dispatch.input_arg_names[0].as_str();
-		let static_ty = strip_ptr(&dispatch.input_arg_tys[0]);
-		let arg_ty = builder
-			.ty().ref_()
-			.lifetime("'a")
-			.ty()
-			.build(static_ty.clone());
-
-		let mut tree = builder.item()
-			.attr().word("binary")
-			.struct_("Request")
-			.generics()
-			.lifetime_name("'a")
-			.build()
-			.field(arg_name).ty()
-			.build(arg_ty);
-
-		for arg_idx in 1..dispatch.input_arg_names.len() {
-			let arg_name = dispatch.input_arg_names[arg_idx].as_str();
-			let static_ty = strip_ptr(&dispatch.input_arg_tys[arg_idx]);
-
-			let arg_ty = builder
-				.ty().ref_()
-				.lifetime("'a")
-				.ty()
-				.build(static_ty);
-			tree = tree.field(arg_name).ty().build(arg_ty);
-
-		}
-		let mut request_serialization_statements = Vec::new();
-
-		let struct_tree = tree.build();
-		let struct_stmt = quote_stmt!(cx, $struct_tree);
-		request_serialization_statements.push(struct_stmt);
-
-		// actually this is just expanded version of this:
-		//   request_serialization_statements.push(quote_stmt!(cx, let payload = Request { p1: &p1, p2: &p2, ... pn: &pn, }));
-		// again, cannot dynamically create expression with arbitrary number of comma-separated members
-		request_serialization_statements.push({
-			let ext_cx = &*cx;
-			::quasi::parse_stmt_panic(&mut ::syntax::parse::new_parser_from_tts(
-				ext_cx.parse_sess(),
-				{
-					let _sp = ext_cx.call_site();
-					let mut tt = ::std::vec::Vec::new();
-					tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("let"))));
-					tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("payload"))));
-					tt.push(Token(_sp, ::syntax::parse::token::Eq));
-					tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Request"))));
-					tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace)));
-
-					for arg in dispatch.input_arg_names.iter() {
-						tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str()))));
-						tt.push(Token(_sp, ::syntax::parse::token::Colon));
-						tt.push(Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And)));
-
-						tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str()))));
-						tt.push(Token(_sp, ::syntax::parse::token::Comma));
-					}
-
-					tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace)));
-					tt
-				}))
-			});
-
-		request_serialization_statements.push(
-			quote_stmt!(cx, let mut socket = self.socket.write().unwrap(); ));
-
-		request_serialization_statements.push(
-			quote_stmt!(cx, let serialized_payload = ::ipc::binary::serialize(&payload).unwrap()));
-
-		request_serialization_statements.push(
-			quote_stmt!(cx, ::ipc::invoke($index_ident, &Some(serialized_payload), &mut *socket)));
-
-
-		request_serialization_statements
-	}
-	else {
-		let mut request_serialization_statements = Vec::new();
-		request_serialization_statements.push(
-			quote_stmt!(cx, let mut socket = self.socket.write().unwrap(); ));
-		request_serialization_statements.push(
-			quote_stmt!(cx, ::ipc::invoke($index_ident, &None, &mut *socket)));
-		request_serialization_statements
-	};
-
-	let trace = literal!(builder, "Invoking: {}", &dispatch.function_name);
-	if let Some(ref return_ty) = dispatch.return_type_ty {
-		let return_expr = quote_expr!(cx,
-			::ipc::binary::deserialize_from::<$return_ty, _>(&mut *socket).unwrap()
-		);
-		quote_expr!(cx, {
-			trace!(target: "ipc", $trace);
-			$request;
-			$return_expr
-		})
-	}
-	else {
-		quote_expr!(cx, {
-			trace!(target: "ipc", $trace);
-			$request
-		})
-	}
-}
-
-/// Generates signature and body (see `implement_client_method_body`)
-/// for the client (signature is identical to the original method)
-fn implement_client_method(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	index: u16,
-	interface_map: &InterfaceMap,
-)
-	-> ast::ImplItem
-{
-	use ::syntax::tokenstream::TokenTree::Token;
-
-	let dispatch = &interface_map.dispatches[index as usize];
-	let method_name = builder.id(dispatch.function_name.as_str());
-	let body = implement_client_method_body(cx, builder, index, interface_map);
-
-	let ext_cx = &*cx;
-	// expanded version of this
-	//   pub fn $method_name(&self, p1: p1_ty, p2: p2_ty ... pn: pn_ty, ) [-> return_ty] { $body }
-	// looks like it's tricky to build function declaration with aster if body already generated
-	let signature = ::syntax::parse::parser::Parser::parse_impl_item(
-		&mut ::syntax::parse::new_parser_from_tts(
-			ext_cx.parse_sess(),
-			{
-				let _sp = ext_cx.call_site();
-				let mut tt = ::std::vec::Vec::new();
-				tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("fn"))));
-				tt.extend(::quasi::ToTokens::to_tokens(&method_name, ext_cx).into_iter());
-				tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren)));
-				tt.push(Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And)));
-				tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self"))));
-				tt.push(Token(_sp, ::syntax::parse::token::Comma));
-
-				for arg_idx in 0..dispatch.input_arg_names.len() {
-					let arg_name = dispatch.input_arg_names[arg_idx].as_str();
-					let arg_ty = dispatch.input_arg_tys[arg_idx].clone();
-
-					tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg_name))));
-					tt.push(Token(_sp, ::syntax::parse::token::Colon));
-					tt.extend(::quasi::ToTokens::to_tokens(&arg_ty, ext_cx).into_iter());
-					tt.push(Token(_sp, ::syntax::parse::token::Comma));
-				}
-				tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren)));
-
-				if let Some(ref return_ty) = dispatch.return_type_ty {
-					tt.push(Token(_sp, ::syntax::parse::token::RArrow));
-					tt.extend(::quasi::ToTokens::to_tokens(return_ty, ext_cx).into_iter());
-				}
-
-				tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace)));
-				tt.extend(::quasi::ToTokens::to_tokens(&body, ext_cx).into_iter());
-				tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace)));
-
-				tt
-			}));
-
-	signature.unwrap()
-}
-
-fn client_generics(builder: &aster::AstBuilder, interface_map: &InterfaceMap) -> Generics {
-	let ty_param = aster::ty_param::TyParamBuilder::new(
-		builder.id("S")).trait_bound(
-			builder.path().global().ids(&["ipc", "IpcSocket"]).build()
-		).build().build();
-
-	builder.from_generics(interface_map.generics.clone())
-		.with_ty_param(ty_param)
-		.build()
-}
-
-fn client_qualified_ident(cx: &ExtCtxt, builder: &aster::AstBuilder, interface_map: &InterfaceMap) -> P<Ty> {
-	let generics = client_generics(builder, interface_map);
-	aster::ty::TyBuilder::new().path().segment(interface_map.ident_map.client_ident(cx, builder))
-		.with_generics(generics).build()
-		.build()
-}
-
-fn client_phantom_ident(builder: &aster::AstBuilder, interface_map: &InterfaceMap) -> P<Ty> {
-	let generics = client_generics(builder, interface_map);
-	aster::ty::TyBuilder::new().phantom_data()
-		.tuple().with_tys(generics.ty_params.iter().map(|x| aster::ty::TyBuilder::new().id(x.ident)))
-		.build()
-}
-
-/// generates client type for specified server type
-/// for say `Service` it generates `ServiceClient`
-fn push_client_struct(cx: &ExtCtxt, builder: &aster::AstBuilder, interface_map: &InterfaceMap, push: &mut FnMut(Annotatable)) {
-	let generics = client_generics(builder, interface_map);
-	let client_short_ident = interface_map.ident_map.client_ident(cx, builder);
-	let phantom = client_phantom_ident(builder, interface_map);
-
-	let client_struct_item = quote_item!(cx,
-		pub struct $client_short_ident $generics {
-			socket: ::std::sync::RwLock<S>,
-			phantom: $phantom,
-		});
-
-	push(Annotatable::Item(client_struct_item.expect(&format!("could not generate client struct for {:?}", client_short_ident.name))));
-}
-
-/// pushes generated code for the client class (type declaration and method invocation implementations)
-fn push_client(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	interface_map: &InterfaceMap,
-	push: &mut FnMut(Annotatable),
-) {
-	push_client_struct(cx, builder, interface_map, push);
-	push_client_implementation(cx, builder, interface_map, push);
-	push_with_socket_client_implementation(cx, builder, interface_map, push);
-}
-
-fn push_with_socket_client_implementation(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	interface_map: &InterfaceMap,
-	push: &mut FnMut(Annotatable))
-{
-	let generics = client_generics(builder, interface_map);
-	let client_ident = client_qualified_ident(cx, builder, interface_map);
-	let where_clause = &generics.where_clause;
-	let client_short_ident = interface_map.ident_map.client_ident(cx, builder);
-
-	let implement = quote_item!(cx,
-		impl $generics ::ipc::WithSocket<S> for $client_ident $where_clause {
-			fn init(socket: S) -> $client_ident {
-				$client_short_ident {
-					socket: ::std::sync::RwLock::new(socket),
-					phantom: ::std::marker::PhantomData,
-				}
-			}
-		}).unwrap();
-	push(Annotatable::Item(implement));
-}
-
-/// pushes full client side code for the original class exposed via ipc
-fn push_client_implementation(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	interface_map: &InterfaceMap,
-	push: &mut FnMut(Annotatable),
-) {
-	let mut index = -1i32;
-	let items = interface_map.dispatches.iter()
-		.map(|_| { index = index + 1; P(implement_client_method(cx, builder, index as u16, interface_map)) })
-		.collect::<Vec<P<ast::ImplItem>>>();
-
-	let generics = client_generics(builder, interface_map);
-	let client_ident = client_qualified_ident(cx, builder, interface_map);
-	let where_clause = &generics.where_clause;
-	let endpoint = interface_map.endpoint;
-
-	let handshake_item = quote_impl_item!(cx,
-		pub fn handshake(&self) -> Result<(), ::ipc::Error> {
-			let payload = ::ipc::Handshake {
-				protocol_version: $endpoint::protocol_version(),
-				api_version: $endpoint::api_version(),
-			};
-
-			::ipc::invoke(
-				0,
-				&Some(::ipc::binary::serialize(&::ipc::BinHandshake::from(payload)).unwrap()),
-				&mut *self.socket.write().unwrap());
-
-			let mut result = vec![0u8; 1];
-			if try!(self.socket.write().unwrap().read(&mut result).map_err(|_| ::ipc::Error::HandshakeFailed)) == 1 {
-				match result[0] {
-					1 => Ok(()),
-					_ => Err(::ipc::Error::RemoteServiceUnsupported),
-				}
-			}
-			else { Err(::ipc::Error::HandshakeFailed) }
-		}).unwrap();
-
-	let socket_item = quote_impl_item!(cx,
-		#[cfg(test)]
-		pub fn socket(&self) -> &::std::sync::RwLock<S> {
-			&self.socket
-		}).unwrap();
-
-	let generic_items = vec![P(handshake_item), P(socket_item)];
-
-	if interface_map.impl_trait.is_some() {
-		let trait_ty = builder.id(
-			::syntax::print::pprust::path_to_string(
-				&interface_map.impl_trait.as_ref().unwrap().path));
-
-		let implement_trait =
-			quote_item!(cx,
-				impl $generics $trait_ty for $client_ident $where_clause {
-					$items
-				}
-			).unwrap();
-		push(Annotatable::Item(implement_trait));
-
-		let implement =
-			quote_item!(cx,
-				impl $generics $client_ident $where_clause {
-					$generic_items
-				}
-			).unwrap();
-		push(Annotatable::Item(implement));
-	}
-	else {
-		let pub_items = items.iter().map(|item| {
-			let pub_item = item.clone();
-			pub_item.map(|mut val| { val.vis = ast::Visibility::Public; val })
-		}).collect::<Vec<P<ast::ImplItem>>>();
-
-		let implement = quote_item!(cx,
-			impl $generics $client_ident $where_clause {
-				$pub_items
-				$generic_items
-			}).unwrap();
-		push(Annotatable::Item(implement));
-	}
-
-}
-
-/// implements dispatching of system handshake invocation (method_num 0)
-fn implement_handshake_arm(
-	cx: &ExtCtxt,
-) -> (ast::Arm, ast::Arm)
-{
-	let handshake_deserialize = quote_stmt!(&cx,
-		let handshake_payload = ::ipc::binary::deserialize_from::<::ipc::BinHandshake, _>(r).unwrap();
-	);
-
-	let handshake_deserialize_buf = quote_stmt!(&cx,
-		let handshake_payload = ::ipc::binary::deserialize::<::ipc::BinHandshake>(buf).unwrap();
-	);
-
-	let handshake_serialize = quote_expr!(&cx,
-		::ipc::binary::serialize::<bool>(&Self::handshake(&handshake_payload.to_semver())).unwrap()
-	);
-
-	(
-		quote_arm!(&cx, 0 => {
-			$handshake_deserialize
-			$handshake_serialize
-		}),
-		quote_arm!(&cx, 0 => {
-			$handshake_deserialize_buf
-			$handshake_serialize
-		}),
-	)
-}
-
-fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<String, ()> {
-	match lit.node {
-		ast::LitKind::Str(ref s, _) => Ok(format!("{}", s)),
-		_ => {
-			cx.span_err(
-				lit.span,
-				&format!("ipc client_ident annotation `{}` must be a string, not `{}`",
-					name,
-					::syntax::print::pprust::lit_to_string(lit)));
-
-			return Err(());
-		}
-	}
-}
-
-fn client_ident_renamed(cx: &ExtCtxt, meta_item: &MetaItem) -> Option<String> {
-	if let ast::MetaItemKind::List(ref list) = meta_item.node {
-		for nested in list {
-			match nested.node {
-				ast::NestedMetaItemKind::MetaItem(ref meta_item) => {
-					let is_client_ident = &*meta_item.name.as_str() == "client_ident";
-					match meta_item.node {
-						ast::MetaItemKind::NameValue(ref lit) if is_client_ident => {
-							if let Ok(s) = get_str_from_lit(cx, "client_ident", lit) {
-								return Some(s);
-							}
-						}
-						_ => {
-							cx.span_err(
-								meta_item.span,
-								&format!("unknown client_ident container attribute `{}`",
-										 ::syntax::print::pprust::meta_item_to_string(&meta_item)));
-						}
-					}
-				},
-				_ => {},
-			}
-		}
-	}
-
-	None
-}
-
-struct InterfaceMap {
-	pub original_item: Item,
-	pub item: P<ast::Item>,
-	pub dispatches: Vec<Dispatch>,
-	pub generics: Generics,
-	pub impl_trait: Option<TraitRef>,
-	pub ident_map: IdentMap,
-	pub endpoint: Ident,
-}
-
-struct IdentMap {
-	original_path: ast::Path,
-	meta_item: MetaItem,
-}
-
-impl IdentMap {
-	fn ident(&self, builder: &aster::AstBuilder) -> Ident {
-		builder.id(format!("{}", ::syntax::print::pprust::path_to_string(&self.original_path)))
-	}
-
-	fn client_ident(&self, cx: &ExtCtxt, builder: &aster::AstBuilder) -> Ident {
-		if let Some(new_name) = client_ident_renamed(cx, &self.meta_item) {
-			builder.id(new_name)
-		}
-		else {
-			builder.id(format!("{}Client", self.original_path.segments[0].identifier))
-		}
-	}
-}
-
-fn ty_ident_map(original_ty: &P<Ty>, meta_item: &MetaItem) -> IdentMap {
-	let original_path = match original_ty.node {
-		::syntax::ast::TyKind::Path(_, ref path) => path.clone(),
-		_ => { panic!("incompatible implementation"); }
-	};
-	let ident_map = IdentMap { original_path: original_path, meta_item: meta_item.clone() };
-	ident_map
-}
-
-/// implements `IpcInterface` for the given class `C`
-fn implement_interface(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	item: &Item,
-	push: &mut FnMut(Annotatable),
-	meta_item: &MetaItem,
-) -> Result<InterfaceMap, Error> {
-	let (generics, impl_trait, original_ty, dispatch_table) = match item.node {
-		ast::ItemKind::Impl(_, _, ref generics, ref impl_trait, ref ty, ref impl_items) => {
-			let mut method_signatures = Vec::new();
-			for impl_item in impl_items {
-				if let ImplItemKind::Method(ref signature, _) = impl_item.node {
-					method_signatures.push(NamedSignature { ident: &impl_item.ident, sig: signature });
-				}
-			}
-
-			let dispatch_table = method_signatures.iter().map(|named_signature|
-				push_invoke_signature_aster(builder, named_signature, push))
-			.collect::<Vec<Dispatch>>();
-
-			(generics, impl_trait.clone(), ty.clone(), dispatch_table)
-		},
-		ast::ItemKind::Trait(_, ref generics, _, ref trait_items) => {
-			let mut method_signatures = Vec::new();
-			for trait_item  in trait_items {
-				if let TraitItemKind::Method(ref signature, _) = trait_item.node {
-					method_signatures.push(NamedSignature { ident: &trait_item.ident, sig: signature });
-				}
-			}
-
-			let dispatch_table = method_signatures.iter().map(|named_signature|
-				push_invoke_signature_aster(builder, named_signature, push))
-			.collect::<Vec<Dispatch>>();
-
-			(
-				generics,
-				Some(ast::TraitRef {
-					path: builder.path().ids(&[item.ident.name]).build(),
-					ref_id: item.id,
-				}),
-				builder.ty().id(item.ident),
-				dispatch_table
-			)
-		},
-		_ => {
-			cx.span_err(
-				item.span,
-				"`#[ipc]` may only be applied to implementations and traits");
-			return Err(Error);
-		},
-	};
-	let impl_generics = builder.from_generics(generics.clone()).build();
-	let where_clause = &impl_generics.where_clause;
-
-	let dispatch_arms = implement_dispatch_arms(cx, builder, &dispatch_table, false);
-	let dispatch_arms_buffered = implement_dispatch_arms(cx, builder, &dispatch_table, true);
-
-	let (handshake_arm, handshake_arm_buf) = implement_handshake_arm(cx);
-
-	let ty = ty_ident_map(&original_ty, meta_item).ident(builder);
-	let (interface_endpoint, host_generics) = match impl_trait {
-		Some(ref trait_) => (builder.id(::syntax::print::pprust::path_to_string(&trait_.path)), None),
-		None => (ty, Some(&impl_generics)),
-	};
-
-	let ipc_item = quote_item!(cx,
-		impl $host_generics ::ipc::IpcInterface for $interface_endpoint $where_clause {
-			fn dispatch<R>(&self, r: &mut R) -> Vec<u8>
-				where R: ::std::io::Read
-			{
-				let mut method_num = vec![0u8;2];
-				match r.read(&mut method_num) {
-					Ok(size) if size == 0 => { panic!("method id not supplied" ); }
-					Err(e) => { panic!("ipc read error: {:?}, aborting", e); }
-					_ => { }
-				}
-
-				// method_num is a 16-bit little-endian unsigned number
-				match method_num[1] as u16 + (method_num[0] as u16)*256 {
-					// handshake
-					$handshake_arm
-					// user methods
-					$dispatch_arms
-					_ => vec![]
-				}
-			}
-
-			fn dispatch_buf(&self, method_num: u16, buf: &[u8]) -> Vec<u8>
-			{
-				match method_num {
-					$handshake_arm_buf
-					$dispatch_arms_buffered
-					_ => vec![]
-				}
-			}
-		}
-	).unwrap();
-
-	Ok(InterfaceMap {
-		ident_map: ty_ident_map(&original_ty, meta_item),
-		original_item: item.clone(),
-		item: ipc_item,
-		dispatches: dispatch_table,
-		generics: generics.clone(),
-		impl_trait: impl_trait.clone(),
-		endpoint: interface_endpoint,
-	})
-}
diff --git a/ipc/codegen/src/lib.rs b/ipc/codegen/src/lib.rs
deleted file mode 100644
index 6e7fc441b324f217ce883b4d184e463f25061c74..0000000000000000000000000000000000000000
--- a/ipc/codegen/src/lib.rs
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Codegen for IPC RPC
-
-#![cfg_attr(feature = "nightly-testing", plugin(clippy))]
-#![cfg_attr(feature = "nightly-testing", feature(plugin))]
-#![cfg_attr(feature = "nightly-testing", allow(used_underscore_binding))]
-#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
-#![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))]
-
-extern crate aster;
-extern crate quasi;
-
-#[cfg(feature = "with-syntex")]
-extern crate syntex;
-
-#[cfg(feature = "with-syntex")]
-extern crate syntex_syntax as syntax;
-
-#[cfg(not(feature = "with-syntex"))]
-#[macro_use]
-extern crate syntax;
-
-#[cfg(not(feature = "with-syntex"))]
-extern crate rustc_plugin;
-
-#[cfg(not(feature = "with-syntex"))]
-use syntax::feature_gate::AttributeType;
-
-#[cfg(feature = "with-syntex")]
-use syntax::{ast, fold};
-
-
-#[cfg(feature = "with-syntex")]
-include!(concat!(env!("OUT_DIR"), "/lib.rs"));
-
-#[cfg(not(feature = "with-syntex"))]
-include!("lib.rs.in");
-
-#[cfg(feature = "with-syntex")]
-pub fn expand(src: &std::path::Path, dst: &std::path::Path) {
-	let mut registry = syntex::Registry::new();
-	register(&mut registry);
-	registry.expand("", src, dst).unwrap();
-}
-
-#[cfg(feature = "with-syntex")]
-struct StripAttributeFolder<'a> {
-	attr_title: &'a str,
-}
-
-#[cfg(feature = "with-syntex")]
-impl<'a> fold::Folder for StripAttributeFolder<'a> {
-	fn fold_attribute(&mut self, attr: ast::Attribute) -> Option<ast::Attribute> {
-		let is_self = &*attr.value.name.as_str() == self.attr_title;
-
-		match attr.value.node {
-			ast::MetaItemKind::List(_) if is_self => { return None; }
-			ast::MetaItemKind::Word if is_self => { return None; }
-			_ => {}
-		}
-
-		Some(attr)
-	}
-
-	fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac {
-		fold::noop_fold_mac(mac, self)
-	}
-}
-
-#[cfg(feature = "with-syntex")]
-pub fn register_cleaner_ipc(reg: &mut syntex::Registry) {
-	#[cfg(feature = "with-syntex")]
-	fn strip_attributes(krate: ast::Crate) -> ast::Crate {
-		let mut folder = StripAttributeFolder { attr_title: "ipc" };
-		fold::Folder::fold_crate(&mut folder, krate)
-	}
-
-	reg.add_post_expansion_pass(strip_attributes);
-}
-
-#[cfg(feature = "with-syntex")]
-pub fn register_cleaner_binary(reg: &mut syntex::Registry) {
-	#[cfg(feature = "with-syntex")]
-	fn strip_attributes(krate: ast::Crate) -> ast::Crate {
-		let mut folder = StripAttributeFolder { attr_title: "binary" };
-		fold::Folder::fold_crate(&mut folder, krate)
-	}
-
-	reg.add_post_expansion_pass(strip_attributes);
-}
-
-#[cfg(feature = "with-syntex")]
-pub fn register(reg: &mut syntex::Registry) {
-	reg.add_attr("feature(custom_derive)");
-	reg.add_attr("feature(custom_attribute)");
-
-	reg.add_decorator("ipc", codegen::expand_ipc_implementation);
-	reg.add_decorator("binary", serialization::expand_serialization_implementation);
-
-	register_cleaner_ipc(reg);
-	register_cleaner_binary(reg);
-}
-
-#[cfg(not(feature = "with-syntex"))]
-pub fn register(reg: &mut rustc_plugin::Registry) {
-	reg.register_syntax_extension(
-		syntax::parse::token::intern("ipc"),
-		syntax::ext::base::MultiDecorator(
-			Box::new(codegen::expand_ipc_implementation)));
-	reg.register_syntax_extension(
-		syntax::parse::token::intern("binary"),
-		syntax::ext::base::MultiDecorator(
-			Box::new(serialization::expand_serialization_implementation)));
-
-	reg.register_attribute("ipc".to_owned(), AttributeType::Normal);
-	reg.register_attribute("binary".to_owned(), AttributeType::Normal);
-}
-
-#[derive(Debug)]
-pub enum Error { InvalidFileName, ExpandFailure, Io(std::io::Error) }
-
-impl std::convert::From<std::io::Error> for Error {
-	fn from(err: std::io::Error) -> Self {
-		Error::Io(err)
-	}
-}
-
-pub fn derive_ipc_cond(src_path: &str, has_feature: bool) -> Result<(), Error> {
-	if has_feature { derive_ipc(src_path) }
-	else { cleanup_ipc(src_path) }
-}
-
-pub fn cleanup_ipc(src_path: &str) -> Result<(), Error> {
-	cleanup(src_path, AttributeKind::Ipc)
-}
-
-pub fn cleanup_binary(src_path: &str) -> Result<(), Error> {
-	cleanup(src_path, AttributeKind::Binary)
-}
-
-enum AttributeKind {
-	Ipc,
-	Binary,
-}
-
-fn cleanup(src_path: &str, attr: AttributeKind) -> Result<(), Error> {
-	use std::env;
-	use std::path::{Path, PathBuf};
-
-	let out_dir = env::var_os("OUT_DIR").unwrap();
-	let file_name = PathBuf::from(src_path).file_name().ok_or(Error::InvalidFileName).map(|val| val.to_str().unwrap().to_owned())?;
-	let mut registry = syntex::Registry::new();
-
-	match attr {
-		AttributeKind::Ipc => { register_cleaner_ipc(&mut registry); }
-		AttributeKind::Binary => { register_cleaner_binary(&mut registry); }
-	}
-
-	if let Err(_) = registry.expand("", &Path::new(src_path), &Path::new(&out_dir).join(&file_name))
-	{
-		// will be reported by compiler
-		return Err(Error::ExpandFailure)
-	}
-	Ok(())
-}
-
-pub fn derive_ipc(src_path: &str) -> Result<(), Error> {
-	use std::env;
-	use std::path::{Path, PathBuf};
-
-	let out_dir = env::var_os("OUT_DIR").unwrap();
-	let file_name = PathBuf::from(src_path).file_name().ok_or(Error::InvalidFileName).map(|val| val.to_str().unwrap().to_owned())?;
-
-	let final_path = Path::new(&out_dir).join(&file_name);
-
-	let mut intermediate_file_name = file_name.clone();
-	intermediate_file_name.push_str(".rpc.in");
-	let intermediate_path = Path::new(&out_dir).join(&intermediate_file_name);
-
-	{
-		let mut registry = syntex::Registry::new();
-		register(&mut registry);
-		if let Err(_) = registry.expand("", &Path::new(src_path), &intermediate_path) {
-			// will be reported by compiler
-			return Err(Error::ExpandFailure)
-		}
-	}
-
-	{
-		let mut registry = syntex::Registry::new();
-		register(&mut registry);
-		if let Err(_) = registry.expand("", &intermediate_path, &final_path) {
-			// will be reported by compiler
-			return Err(Error::ExpandFailure)
-		}
-	}
-
-	Ok(())
-}
-
-pub fn derive_binary(src_path: &str) -> Result<(), Error> {
-	use std::env;
-	use std::path::{Path, PathBuf};
-
-	let out_dir = env::var_os("OUT_DIR").unwrap();
-	let file_name = PathBuf::from(src_path).file_name().ok_or(Error::InvalidFileName).map(|val| val.to_str().unwrap().to_owned())?;
-	let final_path = Path::new(&out_dir).join(&file_name);
-
-	let mut registry = syntex::Registry::new();
-	register(&mut registry);
-	if let Err(_) = registry.expand("", &Path::new(src_path), &final_path) {
-		// will be reported by compiler
-		return Err(Error::ExpandFailure)
-	}
-
-	Ok(())
-}
-
-pub fn derive_binary_cond(src_path: &str, has_feature: bool) -> Result<(), Error> {
-	if has_feature { derive_binary(src_path) }
-	else { cleanup_binary(src_path) }
-}
diff --git a/ipc/codegen/src/lib.rs.in b/ipc/codegen/src/lib.rs.in
deleted file mode 100644
index c8aa8ebf27416c489965c6490cc98a7081ab5070..0000000000000000000000000000000000000000
--- a/ipc/codegen/src/lib.rs.in
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-mod codegen;
-mod serialization;
diff --git a/ipc/codegen/src/serialization.rs b/ipc/codegen/src/serialization.rs
deleted file mode 100644
index fd908725c9b54e98b46d94d81ff5616f55a19df2..0000000000000000000000000000000000000000
--- a/ipc/codegen/src/serialization.rs
+++ /dev/null
@@ -1,810 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-use aster;
-
-use syntax::ast::{
-	MetaItem,
-	Item,
-	Ident,
-};
-
-use syntax::ast;
-use syntax::codemap::Span;
-use syntax::ext::base::{Annotatable, ExtCtxt};
-use syntax::ptr::P;
-
-pub struct Error;
-
-use super::codegen;
-
-pub fn expand_serialization_implementation(
-	cx: &mut ExtCtxt,
-	span: Span,
-	meta_item: &MetaItem,
-	annotatable: &Annotatable,
-	push: &mut FnMut(Annotatable)
-) {
-	let item = match *annotatable {
-		Annotatable::Item(ref item) => item,
-		_ => {
-			cx.span_err(meta_item.span, "`#[derive(Binary)]` may only be applied to structs and enums");
-			return;
-		},
-	};
-
-	let builder = aster::AstBuilder::new().span(span);
-
-	let impl_item = match serialize_item(cx, &builder, &item) {
-		Ok(item) => item,
-		Err(Error) => {
-			// An error occurred, but it should have been reported already.
-			return;
-		},
-	};
-
-	push(Annotatable::Item(impl_item))
-}
-
-fn serialize_item(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	item: &Item,
-) -> Result<P<ast::Item>, Error> {
-	let generics = match item.node {
-		ast::ItemKind::Struct(_, ref generics) => generics,
-		ast::ItemKind::Enum(_, ref generics) => generics,
-		_ => {
-			cx.span_err(
-				item.span,
-				"`#[derive(Binary)]` may only be applied to structs and enums");
-			return Err(Error);
-		},
-	};
-
-	let ty = builder.ty().path()
-		.segment(item.ident).with_generics(generics.clone()).build()
-		.build();
-
-	let where_clause = &generics.where_clause;
-
-	let binary_expressions = try!(binary_expr(cx,
-		&builder,
-		&item,
-		&generics,
-		ty.clone()));
-
-	let (size_expr, read_expr, write_expr) =
-		(binary_expressions.size, binary_expressions.read, binary_expressions.write);
-
-	match quote_item!(cx,
-		impl $generics ::ipc::BinaryConvertable for $ty $where_clause {
-			fn size(&self) -> usize {
-				$size_expr
-			}
-
-			fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut ::std::collections::VecDeque<usize>) -> Result<(), ::ipc::BinaryConvertError> {
-				$write_expr
-			}
-
-			fn from_bytes(buffer: &[u8], length_stack: &mut ::std::collections::VecDeque<usize>) -> Result<Self, ::ipc::BinaryConvertError> {
-				$read_expr
-			}
-
-			fn len_params() -> usize {
-				1
-			}
-        })
-	{
-		Some(item) => Ok(item),
-		None => {
-			cx.span_err(
-				item.span,
-				"syntax error expanding serialization implementation");
-			Err(Error)
-		}
-	}
-}
-
-#[allow(unreachable_code)]
-fn binary_expr(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	item: &Item,
-	impl_generics: &ast::Generics,
-	ty: P<ast::Ty>,
-) -> Result<BinaryExpressions, Error> {
-	match item.node {
-		ast::ItemKind::Struct(ref variant_data, _) => {
-			binary_expr_item_struct(
-				cx,
-				builder,
-				impl_generics,
-				ty,
-				item.span,
-				variant_data,
-			)
-		},
-		ast::ItemKind::Enum(ref enum_def, _) => {
-			binary_expr_enum(
-				cx,
-				builder,
-				item.ident,
-				impl_generics,
-				ty,
-				item.span,
-				enum_def,
-			)
-		},
-		_ => {
-			cx.span_bug(item.span,
-						"expected ItemStruct or ItemEnum in #[derive(Binary)]");
-			Err(Error) as Result<BinaryExpressions, Error>
-		},
-	}
-}
-
-struct BinaryExpressions {
-	pub size: P<ast::Expr>,
-	pub write: P<ast::Expr>,
-	pub read: P<ast::Expr>,
-}
-
-fn replace_qualified(s: &str) -> String {
-	if let Some(pos) = s.find("<") {
-		let mut source = s.to_owned();
-		source.insert(pos, ':');
-		source.insert(pos, ':');
-		source
-	}
-	else { s.to_owned() }
-}
-
-fn binary_expr_struct(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	ty: P<ast::Ty>,
-	fields: &[ast::StructField],
-	value_ident: Option<ast::Ident>,
-	instance_ident: Option<ast::Ident>,
-) -> Result<BinaryExpressions, Error> {
-
-	let size_exprs: Vec<P<ast::Expr>> = fields.iter().enumerate().map(|(index, field)| {
-		let raw_ident = ::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty));
-		let index_ident = builder.id(format!("__field{}", index));
-		let field_id = match field.ident {
-			Some(ident) => builder.id(ident),
-			None => builder.id(format!("{}", index)),
-		};
-
-		match raw_ident.as_ref() {
-			"u8" => {
-				quote_expr!(cx, 1)
-			},
-			"[u8]" => {
-				value_ident.and_then(|x| {
-						Some(quote_expr!(cx, $x. $field_id .len()))
-					})
-					.unwrap_or_else(|| {
-						quote_expr!(cx, $index_ident .len())
-					}
-				)
-			}
-			_ => {
-				let field_type_ident = builder.id(
-					&::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty)));
-
-				let field_type_ident_qualified = builder.id(
-					replace_qualified(&::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty))));
-
-				value_ident.and_then(|x|
-					{
-						Some(quote_expr!(cx,
-							match $field_type_ident_qualified::len_params() {
-								0 => ::std::mem::size_of::<$field_type_ident>(),
-								_ => $x. $field_id .size(),
-							}))
-					})
-					.unwrap_or_else(|| {
-						quote_expr!(cx, match $field_type_ident_qualified::len_params() {
-							0 => ::std::mem::size_of::<$field_type_ident>(),
-							_ => $index_ident .size(),
-						})
-					})
-			}
-		}
-	}).collect();
-
-	let first_size_expr = size_exprs[0].clone();
-	let mut total_size_expr = quote_expr!(cx, 0usize + $first_size_expr);
-	for index in 1..size_exprs.len() {
-		let next_expr = size_exprs[index].clone();
-		total_size_expr = quote_expr!(cx, $total_size_expr + $next_expr);
-	}
-
-	let mut write_stmts = Vec::<ast::Stmt>::new();
-	write_stmts.push(quote_stmt!(cx, let mut offset = 0usize;).expect("stmt1"));
-
-	let mut map_stmts = Vec::<ast::Stmt>::new();
-	let field_amount = builder.id(&format!("{}",fields.len()));
-	map_stmts.push(quote_stmt!(cx, let mut map = vec![0usize; $field_amount];).expect("stmt2"));
-	map_stmts.push(quote_stmt!(cx, let mut total = 0usize;).expect("stmt3"));
-
-	let mut post_write_stmts = Vec::<ast::Stmt>::new();
-
-	for (index, field) in fields.iter().enumerate() {
-		let field_type_ident = builder.id(
-			&::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty)));
-
-		let field_type_ident_qualified = builder.id(
-			replace_qualified(&::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty))));
-
-		let field_id = match field.ident {
-			Some(ident) => builder.id(ident),
-			None => builder.id(format!("{}", index)),
-		};
-		let member_expr = match value_ident {
-			Some(x) => {
-				quote_expr!(cx, $x . $field_id)
-			},
-			None => {
-				let index_ident = builder.id(format!("__field{}", index));
-				quote_expr!(cx, $index_ident)
-			},
-		};
-
-		let raw_ident = ::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty));
-		let range_ident = builder.id(format!("r{}", index));
-
-		let error_message = "Error serializing member: ".to_owned() + &::syntax::print::pprust::expr_to_string(&member_expr);
-		let _error_message_literal = builder.expr().lit().str::<&str>(&error_message);
-
-		match raw_ident.as_ref() {
-			"u8" => {
-				write_stmts.push(quote_stmt!(cx, let next_line = offset + 1;).expect("stmt4"));
-				write_stmts.push(quote_stmt!(cx, buffer[offset] = $member_expr; ).expect("stm5"));
-			},
-			"[u8]" => {
-				write_stmts.push(quote_stmt!(cx, let size = $member_expr .len();).unwrap());
-				write_stmts.push(quote_stmt!(cx, let next_line = offset + size;).unwrap());
-				write_stmts.push(quote_stmt!(cx, length_stack.push_back(size);).unwrap());
-				write_stmts.push(quote_stmt!(cx, let $range_ident = offset..next_line; ).unwrap());
-				post_write_stmts.push(quote_stmt!(cx, buffer[$range_ident].clone_from_slice($member_expr); ).unwrap());
-			}
-			_ => {
-				write_stmts.push(quote_stmt!(cx, let next_line = offset + match $field_type_ident_qualified::len_params() {
-						0 => ::std::mem::size_of::<$field_type_ident>(),
-						_ => { let size = $member_expr .size(); length_stack.push_back(size); size },
-					}).unwrap());
-				write_stmts.push(quote_stmt!(cx, let $range_ident = offset..next_line; ).unwrap());
-				post_write_stmts.push(quote_stmt!(cx,
-						if $range_ident.end - $range_ident.start > 0 {
-							if let Err(e) = $member_expr .to_bytes(&mut buffer[$range_ident], length_stack) {
-								return Err(e)
-							};
-						}
-					).unwrap());
-			}
-		}
-
-		write_stmts.push(quote_stmt!(cx, offset = next_line; ).unwrap());
-
-		let field_index = builder.id(&format!("{}", index));
-		map_stmts.push(quote_stmt!(cx, map[$field_index] = total;).unwrap());
-
-		match raw_ident.as_ref() {
-			"u8" => {
-				map_stmts.push(quote_stmt!(cx, total += 1;).unwrap());
-			},
-			"[u8]" => {
-				map_stmts.push(quote_stmt!(cx, let size = length_stack.pop_front().unwrap();).unwrap());
-				map_stmts.push(quote_stmt!(cx, total += size;).unwrap());
-			},
-			_ => {
-				map_stmts.push(quote_stmt!(cx, let size = match $field_type_ident_qualified::len_params() {
-						0 => ::std::mem::size_of::<$field_type_ident>(),
-						_ => length_stack.pop_front().unwrap(),
-					}).unwrap());
-				map_stmts.push(quote_stmt!(cx, total += size;).unwrap());
-			}
-		}
-	};
-
-	let read_expr = match fields.iter().any(|f| codegen::has_ptr(&f.ty)) {
-		true => {
-			// cannot create structs with pointers
-			quote_expr!(cx, Err(::ipc::binary::BinaryConvertError::not_supported()))
-		},
-		false => {
-			if value_ident.is_some() {
-				let instance_create = named_fields_sequence(cx, &ty, fields);
-				quote_expr!(cx, { $map_stmts; $instance_create; Ok(result) })
-			}
-			else {
-				let map_variant = P(fields_sequence(cx, &ty, fields, &instance_ident.unwrap_or(builder.id("Self"))));
-				quote_expr!(cx, { $map_stmts; Ok($map_variant) })
-			}
-		},
-	};
-
-    Ok(BinaryExpressions {
-		size: total_size_expr,
-		write: quote_expr!(cx, { $write_stmts; $post_write_stmts; Ok(()) } ),
-		read: read_expr,
-	})
-}
-
-#[allow(unreachable_code)]
-fn binary_expr_item_struct(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	_impl_generics: &ast::Generics,
-	ty: P<ast::Ty>,
-	span: Span,
-	variant_data: &ast::VariantData,
-) -> Result<BinaryExpressions, Error> {
-	match *variant_data {
-		ast::VariantData::Tuple(ref fields, _) => {
-			binary_expr_struct(
-				cx,
-				&builder,
-				ty,
-				fields,
-				Some(builder.id("self")),
-				None,
-			)
-		},
-		ast::VariantData::Struct(ref fields, _) => {
-			binary_expr_struct(
-				cx,
-				&builder,
-				ty,
-				fields,
-				Some(builder.id("self")),
-				None,
-			)
-		},
-		_ => {
-			cx.span_bug(span,
-				&format!("#[derive(Binary)] Unsupported struct content, expected tuple/struct, found: {:?}",
-					variant_data));
-			Err(Error) as Result<BinaryExpressions, Error>
-		},
-	}
-}
-
-fn binary_expr_enum(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	type_ident: Ident,
-	impl_generics: &ast::Generics,
-	ty: P<ast::Ty>,
-	span: Span,
-	enum_def: &ast::EnumDef,
-) -> Result<BinaryExpressions, Error> {
-	let arms: Vec<_> = try!(enum_def.variants.iter()
-			.enumerate()
-			.map(|(variant_index, variant)| {
-				binary_expr_variant(
-					cx,
-					builder,
-					type_ident,
-					impl_generics,
-					ty.clone(),
-					span,
-					variant,
-					variant_index,
-				)
-			})
-			.collect());
-
-	let (size_arms, write_arms, mut read_arms) = (
-		arms.iter().map(|x| x.size.clone()).collect::<Vec<ast::Arm>>(),
-		arms.iter().map(|x| x.write.clone()).collect::<Vec<ast::Arm>>(),
-		arms.iter().map(|x| x.read.clone()).collect::<Vec<ast::Arm>>());
-
-	read_arms.push(quote_arm!(cx, _ => { Err(::ipc::BinaryConvertError::variant(buffer[0])) } ));
-
-	Ok(BinaryExpressions {
-		size: quote_expr!(cx, 1usize + match *self { $size_arms }),
-		write: quote_expr!(cx, match *self { $write_arms }; ),
-		read: quote_expr!(cx, match buffer[0] { $read_arms }),
-	})
-}
-
-struct BinaryArm {
-	size: ast::Arm,
-	write: ast::Arm,
-	read: ast::Arm,
-}
-
-fn fields_sequence(
-	ext_cx: &ExtCtxt,
-	_ty: &P<ast::Ty>,
-	fields: &[ast::StructField],
-	variant_ident: &ast::Ident,
-) -> ast::Expr {
-	use syntax::parse::token;
-	use syntax::tokenstream::TokenTree::Token;
-
-	let named_members = fields.iter().any(|f| f.ident.is_some());
-
-	::quasi::parse_expr_panic(&mut ::syntax::parse::new_parser_from_tts(
-		ext_cx.parse_sess(),
-		{
-			let _sp = ext_cx.call_site();
-			let mut tt = ::std::vec::Vec::new();
-			tt.push(Token(_sp, token::Ident(variant_ident.clone())));
-			if named_members {
-				tt.push(Token(_sp, token::OpenDelim(token::Brace)));
-			}
-			else {
-				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
-			}
-
-			for (idx, field) in fields.iter().enumerate() {
-				if field.ident.is_some() {
-					tt.push(Token(_sp, token::Ident(field.ident.clone().unwrap())));
-					tt.push(Token(_sp, token::Colon));
-				}
-
-				// special case for u8, it just takes byte form sequence
-				if ::syntax::print::pprust::ty_to_string(&field.ty) == "u8" {
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"))));
-
-					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
-					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)))));
-					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-
-					tt.push(Token(_sp, token::Comma));
-					continue;
-				}
-
-				// special case for [u8], it just takes a byte sequence
-				if ::syntax::print::pprust::ty_to_string(&field.ty) == "[u8]" {
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"))));
-
-					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
-					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)))));
-					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-					tt.push(Token(_sp, token::DotDot));
-
-					if idx+1 != fields.len() {
-						tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
-						tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-						tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)))));
-						tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-					}
-
-					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-
-					tt.push(Token(_sp, token::Comma));
-					continue;
-				}
-
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!"))));
-				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
-				tt.push(
-					Token(
-						_sp,
-						token::Ident(ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty))))
-					));
-				tt.push(Token(_sp, token::ModSep));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes"))));
-				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
-
-				tt.push(Token(_sp, token::BinOp(token::And)));
-
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"))));
-
-				tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
-				tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)))));
-				tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-				tt.push(Token(_sp, token::DotDot));
-
-				if idx+1 != fields.len() {
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
-					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)))));
-					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-				}
-
-				tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-
-				tt.push(Token(_sp, token::Comma));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack"))));
-				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
-
-				// name member if it has resulted in the error
-				tt.push(Token(_sp, token::Dot));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map_err"))));
-
-				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
-				tt.push(Token(_sp, token::BinOp(token::Or)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("e"))));
-				tt.push(Token(_sp, token::BinOp(token::Or)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("e"))));
-				tt.push(Token(_sp, token::Dot));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("named"))));
-				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
-				tt.push(Token(_sp, token::Literal(token::Lit::Str_(
-					field.ident.unwrap_or(ext_cx.ident_of(&format!("f{}", idx))).name),
-					None))
-				);
-				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
-				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
-
-				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
-
-				tt.push(Token(_sp, token::Comma));
-			}
-			if named_members {
-				tt.push(Token(_sp, token::CloseDelim(token::Brace)));
-			}
-			else {
-				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
-			}
-			tt
-		})
-	).unwrap()
-}
-
-fn named_fields_sequence(
-	ext_cx: &ExtCtxt,
-	ty: &P<ast::Ty>,
-	fields: &[ast::StructField],
-) -> ast::Stmt {
-	use syntax::parse::token;
-	use syntax::tokenstream::TokenTree::Token;
-
-	::quasi::parse_stmt_panic(&mut ::syntax::parse::new_parser_from_tts(
-		ext_cx.parse_sess(),
-		{
-			let _sp = ext_cx.call_site();
-			let mut tt = ::std::vec::Vec::new();
-			tt.push(Token(_sp, token::Ident(ext_cx.ident_of("let"))));
-			tt.push(Token(_sp, token::Ident(ext_cx.ident_of("result"))));
-			tt.push(Token(_sp, token::Eq));
-
-			tt.push(Token(
-				_sp,
-			  	token::Ident(
-					ext_cx.ident_of(&::syntax::print::pprust::ty_to_string(ty))
-			 		)));
-
-			tt.push(Token(_sp, token::OpenDelim(token::Brace)));
-
-			for (idx, field) in fields.iter().enumerate() {
-				tt.push(Token(_sp, match field.ident {
-					Some(ident) => token::Ident(ident),
-					None => token::Ident(ext_cx.ident_of(&format!("{}", idx))),
-				}));
-				tt.push(Token(_sp, token::Colon));
-
-				// special case for u8, it just takes byte form sequence
-				if ::syntax::print::pprust::ty_to_string(&field.ty) == "u8" {
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"))));
-
-					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
-					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)))));
-					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-
-					tt.push(Token(_sp, token::Comma));
-					continue;
-				}
-
-				// special case for [u8], it just takes a byte sequence
-				if ::syntax::print::pprust::ty_to_string(&field.ty) == "[u8]" {
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"))));
-
-					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
-					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)))));
-					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-					tt.push(Token(_sp, token::DotDot));
-
-					if idx+1 != fields.len() {
-						tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
-						tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-						tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)))));
-						tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-					}
-
-					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-
-					tt.push(Token(_sp, token::Comma));
-					continue;
-				}
-
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!"))));
-				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
-				tt.push(Token(
-					_sp,
-					token::Ident(
-						ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty)))
-						)));
-				tt.push(Token(_sp, token::ModSep));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes"))));
-				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
-
-				tt.push(Token(_sp, token::BinOp(token::And)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer"))));
-
-				tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
-				tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)))));
-				tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-				tt.push(Token(_sp, token::DotDot));
-				if idx + 1 != fields.len() {
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"))));
-					tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
-					tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)))));
-					tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-				}
-
-				tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
-
-				tt.push(Token(_sp, token::Comma));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack"))));
-				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
-
-				// name member if it has resulted in the error
-				tt.push(Token(_sp, token::Dot));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map_err"))));
-				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
-				tt.push(Token(_sp, token::BinOp(token::Or)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("e"))));
-				tt.push(Token(_sp, token::BinOp(token::Or)));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("e"))));
-				tt.push(Token(_sp, token::Dot));
-				tt.push(Token(_sp, token::Ident(ext_cx.ident_of("named"))));
-				tt.push(Token(_sp, token::OpenDelim(token::Paren)));
-				tt.push(Token(_sp, token::Literal(token::Lit::Str_(
-					field.ident.unwrap_or(ext_cx.ident_of(&format!("f{}", idx))).name),
-					None))
-				);
-				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
-				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
-
-				tt.push(Token(_sp, token::CloseDelim(token::Paren)));
-				tt.push(Token(_sp, token::Comma));
-			}
-
-			tt.push(Token(_sp, token::CloseDelim(token::Brace)));
-			tt
-		})
-	).unwrap()
-}
-
-fn binary_expr_variant(
-	cx: &ExtCtxt,
-	builder: &aster::AstBuilder,
-	type_ident: Ident,
-	_generics: &ast::Generics,
-	ty: P<ast::Ty>,
-	_span: Span,
-	variant: &ast::Variant,
-	variant_index: usize,
-) -> Result<BinaryArm, Error> {
-	let variant_ident = variant.node.name;
-	let variant_index_ident = builder.id(format!("{}", variant_index));
-
-	match variant.node.data {
-		ast::VariantData::Unit(_) => {
-			let pat = builder.pat().path()
-				.id(type_ident).id(variant_ident)
-				.build();
-
-			let variant_val = builder.id(format!("{}::{}", type_ident, variant_ident));
-
-			Ok(BinaryArm {
-				size: quote_arm!(cx, $pat => { 0usize } ),
-				write: quote_arm!(cx, $pat => { buffer[0] = $variant_index_ident; Ok(()) } ),
-				read: quote_arm!(cx, $variant_index_ident => { Ok($variant_val) } ),
-			})
-		},
-		ast::VariantData::Tuple(ref fields, _) => {
-			let field_names: Vec<ast::Ident> = (0 .. fields.len())
-				.map(|i| builder.id(format!("__field{}", i)))
-				.collect();
-
-			let pat = builder.pat().enum_()
-				.id(type_ident).id(variant_ident).build()
-				.with_pats(
-					field_names.iter()
-						.map(|field| builder.pat().ref_id(field))
-				)
-				.build();
-
-			let binary_expr = try!(binary_expr_struct(
-				cx,
-				&builder,
-				ty,
-				fields,
-				None,
-				Some(builder.id(format!("{}::{}", type_ident, variant_ident))),
-			));
-
-			let (size_expr, write_expr, read_expr) = (binary_expr.size, vec![binary_expr.write], binary_expr.read);
-			Ok(BinaryArm {
-				size: quote_arm!(cx, $pat => { $size_expr } ),
-				write: quote_arm!(cx,
-					$pat => {
-						buffer[0] = $variant_index_ident;
-						let buffer = &mut buffer[1..];
-						$write_expr
-				}),
-				read: quote_arm!(cx,
-					$variant_index_ident => {
-					 	let buffer = &buffer[1..];
-						$read_expr
-					}
-				),
-			})
-		},
-		ast::VariantData::Struct(ref fields, _) => {
-			let field_names: Vec<_> = (0 .. fields.len())
-				.map(|i| builder.id(format!("__field{}", i)))
-				.collect();
-
-			let pat = builder.pat().struct_()
-				.id(type_ident).id(variant_ident).build()
-				.with_pats(
-					field_names.iter()
-						.zip(fields.iter())
-						.map(|(id, field)|(field.ident.unwrap(), builder.pat().ref_id(id))))
-				.build();
-
-			let binary_expr = try!(binary_expr_struct(
-				cx,
-				&builder,
-				ty,
-				fields,
-				None,
-				Some(builder.id(format!("{}::{}", type_ident, variant_ident))),
-			));
-
-			let (size_expr, write_expr, read_expr) = (binary_expr.size, vec![binary_expr.write], binary_expr.read);
-
-			Ok(BinaryArm {
-				size: quote_arm!(cx, $pat => { $size_expr } ),
-				write: quote_arm!(cx,
-					$pat => {
-						buffer[0] = $variant_index_ident;
-						let buffer = &mut buffer[1..];
-						$write_expr
-				}),
-				read: quote_arm!(cx,
-					$variant_index_ident => {
-					 	let buffer = &buffer[1..];
-						$read_expr
-					}
-				),
-			})
-		},
-	}
-}
diff --git a/ipc/hypervisor/Cargo.toml b/ipc/hypervisor/Cargo.toml
deleted file mode 100644
index 1db60c904e67a612ace957ec983eb36bfbfdcf4f..0000000000000000000000000000000000000000
--- a/ipc/hypervisor/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "ethcore-ipc-hypervisor"
-version = "1.2.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-license = "GPL-3.0"
-build = "build.rs"
-
-[features]
-
-[dependencies]
-ethcore-ipc = { path = "../rpc" }
-nanomsg = { git = "https://github.com/paritytech/nanomsg.rs.git", branch = "parity-1.7" }
-ethcore-ipc-nano = { path = "../nano" }
-semver = "0.6"
-log = "0.3"
-time = "0.1"
-
-[build-dependencies]
-ethcore-ipc-codegen = { path = "../codegen" }
diff --git a/ipc/hypervisor/build.rs b/ipc/hypervisor/build.rs
deleted file mode 100644
index 097aba0464ba18220fb5d00c85682199f43c0c5a..0000000000000000000000000000000000000000
--- a/ipc/hypervisor/build.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate ethcore_ipc_codegen;
-
-fn main() {
-	ethcore_ipc_codegen::derive_ipc("src/service.rs.in").unwrap();
-}
diff --git a/ipc/hypervisor/src/lib.rs b/ipc/hypervisor/src/lib.rs
deleted file mode 100644
index b522122b5b87d1c379e9e8b57555564098569ac4..0000000000000000000000000000000000000000
--- a/ipc/hypervisor/src/lib.rs
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Parity interprocess hypervisor module
-
-#![cfg_attr(feature="dev", allow(used_underscore_binding))]
-
-extern crate ethcore_ipc as ipc;
-extern crate ethcore_ipc_nano as nanoipc;
-extern crate semver;
-#[macro_use] extern crate log;
-extern crate time;
-
-pub mod service;
-
-/// Default value for hypervisor ipc listener
-pub const HYPERVISOR_IPC_URL: &'static str = "parity-internal-hyper-status.ipc";
-
-use std::sync::{Arc,RwLock};
-use service::{HypervisorService, IpcModuleId};
-use std::process::{Command,Child};
-use std::collections::HashMap;
-
-pub use service::{HypervisorServiceClient, ControlService, CLIENT_MODULE_ID, SYNC_MODULE_ID};
-
-pub type BinaryId = &'static str;
-
-pub struct Hypervisor {
-	ipc_addr: String,
-	service: Arc<HypervisorService>,
-	ipc_worker: RwLock<nanoipc::Worker<HypervisorService>>,
-	processes: RwLock<HashMap<IpcModuleId, Child>>,
-	modules: HashMap<IpcModuleId, BootArgs>,
-	pub io_path: String,
-}
-
-/// Boot arguments for binary
-pub struct BootArgs {
-	cli: Option<Vec<String>>,
-	stdin: Option<Vec<u8>>,
-}
-
-impl BootArgs {
-	/// New empty boot arguments
-	pub fn new() -> BootArgs {
-		BootArgs {
-			cli: None,
-			stdin: None,
-		}
-	}
-
-	/// Set command-line arguments for boot
-	pub fn cli(mut self, cli: Vec<String>) -> BootArgs {
-		self.cli = Some(cli);
-		self
-	}
-
-	/// Set std-in stream for boot
-	pub fn stdin(mut self, stdin: Vec<u8>) -> BootArgs {
-		self.stdin = Some(stdin);
-		self
-	}
-}
-
-impl Hypervisor {
-	/// initializes the Hypervisor service with the open ipc socket for incoming clients
-	pub fn new() -> Hypervisor {
-		Hypervisor::with_url(HYPERVISOR_IPC_URL)
-	}
-
-	pub fn module(mut self, module_id: IpcModuleId, args: BootArgs) -> Hypervisor {
-		self.modules.insert(module_id, args);
-		self.service.add_module(module_id);
-		self
-	}
-
-	pub fn local_module(self, module_id: IpcModuleId) -> Hypervisor {
-		self.service.add_module(module_id);
-		self
-	}
-
-	pub fn io_path(mut self, directory: &str) -> Hypervisor {
-		self.io_path = directory.to_owned();
-		self
-	}
-
-	/// Starts with the specified address for the ipc listener and
-	/// the specified list of modules in form of created service
-	pub fn with_url(addr: &str) -> Hypervisor {
-		let service = HypervisorService::new();
-		let worker = nanoipc::Worker::new(&service);
-		Hypervisor{
-			ipc_addr: addr.to_owned(),
-			service: service,
-			ipc_worker: RwLock::new(worker),
-			processes: RwLock::new(HashMap::new()),
-			modules: HashMap::new(),
-			io_path: "/tmp".to_owned(),
-		}
-	}
-
-	/// Since one binary can host multiple modules
-	/// we match binaries
-	fn match_module(&self, module_id: &IpcModuleId) -> Option<&BootArgs> {
-		self.modules.get(module_id)
-	}
-
-	/// Creates IPC listener and starts all binaries
-	pub fn start(&self) {
-		let mut worker = self.ipc_worker.write().unwrap();
-		worker.add_reqrep(&self.ipc_addr).unwrap_or_else(|e| panic!("Hypervisor ipc worker can not start - critical! ({:?})", e));
-
-		for module_id in self.service.module_ids() {
-			self.start_module(module_id);
-		}
-	}
-
-	/// Start binary for the specified module
-	/// Does nothing when it is already started on module is inside the
-	/// main binary
-	fn start_module(&self, module_id: IpcModuleId) {
-		use std::io::Write;
-
-		self.match_module(&module_id).map(|boot_args| {
-			let mut processes = self.processes.write().unwrap();
-			{
-				if processes.get(&module_id).is_some() {
-					// already started for another module
-					return;
-				}
-			}
-
-			let mut command = Command::new(&std::env::current_exe().unwrap());
-			command.stderr(std::process::Stdio::inherit());
-
-			if let Some(ref cli_args) = boot_args.cli {
-				for arg in cli_args { command.arg(arg); }
-			}
-
-			command.stdin(std::process::Stdio::piped());
-
-			trace!(target: "hypervisor", "Spawn executable: {:?}", command);
-
-			let mut child = command.spawn().unwrap_or_else(
-				|e| panic!("Hypervisor cannot execute command ({:?}): {}", command, e));
-
-			if let Some(ref std_in) = boot_args.stdin {
-				trace!(target: "hypervisor", "Pushing std-in payload...");
-				child.stdin.as_mut()
-					.expect("std-in should be piped above")
-					.write(std_in)
-					.unwrap_or_else(|e| panic!(format!("Error trying to pipe stdin for {:?}: {:?}", &command, e)));
-				drop(child.stdin.take());
-			}
-
-			processes.insert(module_id, child);
-		});
-	}
-
-	/// Reports if all modules are checked in
-	pub fn modules_ready(&self) -> bool {
-		self.service.unchecked_count() == 0
-	}
-
-	pub fn modules_shutdown(&self) -> bool {
-		self.service.running_count() == 0
-	}
-
-	/// Waits for every required module to check in
-	pub fn wait_for_startup(&self) {
-		let mut worker = self.ipc_worker.write().unwrap();
-		while !self.modules_ready() {
-			worker.poll()
-		}
-	}
-
-	/// Waits for every required module to check in
-	pub fn wait_for_shutdown(&self) -> bool {
-		use time::{PreciseTime, Duration};
-
-		let mut worker = self.ipc_worker.write().unwrap();
-		let start = PreciseTime::now();
-		while !self.modules_shutdown() {
-			worker.poll();
-			if start.to(PreciseTime::now()) > Duration::seconds(30) {
-				warn!("Some modules failed to shutdown gracefully, they will be terminated.");
-				break;
-			}
-		}
-		self.modules_shutdown()
-	}
-
-	/// Shutdown the ipc and all managed child processes
-	pub fn shutdown(&self) {
-		let mut childs = self.processes.write().unwrap();
-		for (ref module, _) in childs.iter() {
-			trace!(target: "hypervisor", "Stopping process module: {}", module);
-			self.service.send_shutdown(**module);
-		}
-		trace!(target: "hypervisor", "Waiting for shutdown...");
-		if self.wait_for_shutdown() {
-			trace!(target: "hypervisor", "All modules reported shutdown");
-			return;
-		}
-
-		for (ref module, ref mut process) in childs.iter_mut()  {
-			if self.service.is_running(**module) {
-				process.kill().unwrap();
-				trace!("Terminated {}", module);
-			}
-		}
-	}
-}
-
-impl Drop for Hypervisor {
-	fn drop(&mut self) {
-		self.shutdown();
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use std::sync::atomic::{AtomicBool,Ordering};
-	use std::sync::Arc;
-	use nanoipc;
-
-	#[test]
-	fn can_init() {
-		let url = "ipc:///tmp/test-parity-hypervisor-10.ipc";
-		let test_module_id = 8080u64;
-
-		let hypervisor = Hypervisor::with_url(url).local_module(test_module_id);
-		assert_eq!(false, hypervisor.modules_ready());
-	}
-
-	#[test]
-	fn can_wait_for_startup() {
-		let url = "ipc:///tmp/test-parity-hypervisor-20.ipc";
-		let test_module_id = 8080u64;
-
-		let hypervisor_ready = Arc::new(AtomicBool::new(false));
-		let hypervisor_ready_local = hypervisor_ready.clone();
-
-		::std::thread::spawn(move || {
-			while !hypervisor_ready.load(Ordering::Relaxed) { }
-
-			let client = nanoipc::fast_client::<HypervisorServiceClient<_>>(url).unwrap();
-			client.handshake().unwrap();
-			client.module_ready(test_module_id, url.to_owned());
-		});
-
-		let hypervisor = Hypervisor::with_url(url).local_module(test_module_id);
-		hypervisor.start();
-		hypervisor_ready_local.store(true, Ordering::Relaxed);
-		hypervisor.wait_for_startup();
-
-		assert_eq!(true, hypervisor.modules_ready());
-	}
-}
diff --git a/ipc/hypervisor/src/service.rs b/ipc/hypervisor/src/service.rs
deleted file mode 100644
index 59040251e6452018c4a99454e842c54cb26a969f..0000000000000000000000000000000000000000
--- a/ipc/hypervisor/src/service.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Parity interprocess hypervisor IPC service
-#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues
-
-include!(concat!(env!("OUT_DIR"), "/service.rs.in"));
diff --git a/ipc/hypervisor/src/service.rs.in b/ipc/hypervisor/src/service.rs.in
deleted file mode 100644
index 6d6f382680cd6632060d3a0d6f4783b3099141bb..0000000000000000000000000000000000000000
--- a/ipc/hypervisor/src/service.rs.in
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::sync::{RwLock,Arc};
-use ipc::IpcConfig;
-use std::collections::HashMap;
-use nanoipc;
-
-pub type IpcModuleId = u64;
-
-/// Blockhain database module id
-pub const CLIENT_MODULE_ID: IpcModuleId = 2000;
-
-/// Sync module id
-pub const SYNC_MODULE_ID: IpcModuleId = 2100;
-
-/// IPC service that handles module management
-pub struct HypervisorService {
-	modules: RwLock<HashMap<IpcModuleId, ModuleState>>,
-}
-
-#[derive(Default)]
-pub struct ModuleState {
-	started: bool,
-	control_url: String,
-	shutdown: bool,
-}
-
-#[ipc]
-pub trait ControlService {
-	fn shutdown(&self) -> bool;
-}
-
-#[ipc]
-impl HypervisorService {
-	// return type for making method synchronous
-	fn module_ready(&self, module_id: u64, control_url: String) -> bool {
-		let mut modules = self.modules.write().unwrap();
-		modules.get_mut(&module_id).map(|mut module| {
-			module.started = true;
-			module.control_url = control_url;
-		});
-		trace!(target: "hypervisor", "Module ready: {}", module_id);
-		true
-	}
-
-	// return type for making method synchronous
-	fn module_shutdown(&self, module_id: u64) -> bool {
-		let mut modules = self.modules.write().unwrap();
-		modules.get_mut(&module_id).map(|mut module| {
-			module.shutdown = true;
-		});
-		trace!(target: "hypervisor", "Module shutdown: {}", module_id);
-		true
-	}
-}
-
-impl HypervisorService {
-	/// New service with the default list of modules
-	pub fn new() -> Arc<HypervisorService> {
-		HypervisorService::with_modules(vec![])
-	}
-
-	/// New service with list of modules that will report for being ready
-	pub fn with_modules(module_ids: Vec<IpcModuleId>) -> Arc<HypervisorService> {
-		let mut modules = HashMap::new();
-		for module_id in module_ids {
-			modules.insert(module_id, ModuleState::default());
-		}
-		Arc::new(HypervisorService {
-			modules: RwLock::new(modules),
-		})
-	}
-
-	/// Add the module to the check-list
-	pub fn add_module(&self, module_id: IpcModuleId) {
-		self.modules.write().unwrap().insert(module_id, ModuleState::default());
-	}
-
-	/// Number of modules still being waited for check-in
-	pub fn unchecked_count(&self) -> usize {
-		self.modules.read().unwrap().iter().filter(|&(_, module)| !module.started).count()
-	}
-
-	/// List of all modules within this service
-	pub fn module_ids(&self) -> Vec<IpcModuleId> {
-		self.modules.read().unwrap().iter().map(|(module_id, _)| module_id).cloned().collect()
-	}
-
-	/// Number of modules started and running
-	pub fn running_count(&self) -> usize {
-		self.modules.read().unwrap().iter().filter(|&(_, module)| module.started && !module.shutdown).count()
-	}
-
-	pub fn is_running(&self, id: IpcModuleId) -> bool {
-		self.modules.read().unwrap().get(&id).map(|module| module.started && !module.shutdown).unwrap_or(false)
-	}
-
-	pub fn send_shutdown(&self, module_id: IpcModuleId) {
-		let modules = self.modules.read().unwrap();
-		modules.get(&module_id).map(|module| {
-			trace!(target: "hypervisor", "Sending shutdown to {}({})", module_id, &module.control_url);
-			let client = nanoipc::fast_client::<ControlServiceClient<_>>(&module.control_url).unwrap();
-			client.shutdown();
-			trace!(target: "hypervisor", "Sent shutdown to {}", module_id);
-		});
-	}
-}
-
-impl ::ipc::IpcConfig for HypervisorService {}
-
-impl ::ipc::IpcConfig for ControlService {}
diff --git a/ipc/nano/Cargo.toml b/ipc/nano/Cargo.toml
deleted file mode 100644
index a714e1d008da60ab0f91167e1a3558dc1074ac27..0000000000000000000000000000000000000000
--- a/ipc/nano/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "ethcore-ipc-nano"
-version = "1.8.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-license = "GPL-3.0"
-
-[features]
-
-[dependencies]
-ethcore-ipc = { path = "../rpc" }
-nanomsg = { git = "https://github.com/paritytech/nanomsg.rs.git", branch = "parity-1.7" }
-log = "0.3"
-lazy_static = "0.2"
diff --git a/ipc/nano/src/lib.rs b/ipc/nano/src/lib.rs
deleted file mode 100644
index 9be3d2b1d26a3fd660eb0613d4747f0ea5c198a9..0000000000000000000000000000000000000000
--- a/ipc/nano/src/lib.rs
+++ /dev/null
@@ -1,355 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! IPC over nanomsg transport
-
-extern crate ethcore_ipc as ipc;
-extern crate nanomsg;
-#[macro_use] extern crate log;
-#[macro_use] extern crate lazy_static;
-
-pub use ipc::{WithSocket, IpcInterface, IpcConfig};
-pub use nanomsg::Socket as NanoSocket;
-
-use std::sync::*;
-use nanomsg::{Socket, Protocol, Error, Endpoint, PollRequest, PollFd, PollInOut};
-use std::ops::Deref;
-
-const POLL_TIMEOUT: isize = 200;
-const DEFAULT_CONNECTION_TIMEOUT: isize = 30000;
-const DEBUG_CONNECTION_TIMEOUT: isize = 5000;
-
-/// Generic worker to handle service (binded) sockets
-pub struct Worker<S: ?Sized> where S: IpcInterface {
-	service: Arc<S>,
-	sockets: Vec<(Socket, Endpoint)>,
-	polls: Vec<PollFd>,
-	buf: Vec<u8>,
-}
-
-/// struct for guarding `_endpoint` (so that it wont drop)
-/// derefs to client `S`
-pub struct GuardedSocket<S> where S: WithSocket<Socket> {
-	client: Arc<S>,
-	_endpoint: Endpoint,
-}
-
-impl<S> GuardedSocket<S> where S: WithSocket<Socket> {
-	pub fn service(&self) -> Arc<S> {
-		self.client.clone()
-	}
-}
-
-impl<S> Deref for GuardedSocket<S> where S: WithSocket<Socket> {
-    type Target = Arc<S>;
-
-    fn deref(&self) -> &Arc<S> {
-        &self.client
-    }
-}
-
-/// Spawns client <`S`> over specified address
-/// creates socket and connects endpoint to it
-/// for duplex (paired) connections with the service
-pub fn init_duplex_client<S>(socket_addr: &str) -> Result<GuardedSocket<S>, SocketError> where S: WithSocket<Socket> {
-	let mut socket = Socket::new(Protocol::Pair).map_err(|e| {
-		warn!(target: "ipc", "Failed to create ipc socket: {:?}", e);
-		SocketError::DuplexLink
-	})?;
-
-	socket.set_receive_timeout(DEFAULT_CONNECTION_TIMEOUT).unwrap();
-
-	let endpoint = socket.connect(socket_addr).map_err(|e| {
-		warn!(target: "ipc", "Failed to bind socket to address '{}': {:?}", socket_addr, e);
-		SocketError::DuplexLink
-	})?;
-
-	Ok(GuardedSocket {
-		client: Arc::new(S::init(socket)),
-		_endpoint: endpoint,
-	})
-}
-
-/// Spawns client <`S`> over specified address
-/// creates socket and connects endpoint to it
-/// for request-reply connections to the service
-pub fn client<S>(socket_addr: &str, receive_timeout: Option<isize>) -> Result<GuardedSocket<S>, SocketError> where S: WithSocket<Socket> {
-	let mut socket = Socket::new(Protocol::Req).map_err(|e| {
-		warn!(target: "ipc", "Failed to create ipc socket: {:?}", e);
-		SocketError::RequestLink
-	})?;
-
-	if let Some(timeout) = receive_timeout {
-		socket.set_receive_timeout(timeout).unwrap();
-	}
-
-	let endpoint = socket.connect(socket_addr).map_err(|e| {
-		warn!(target: "ipc", "Failed to bind socket to address '{}': {:?}", socket_addr, e);
-		SocketError::RequestLink
-	})?;
-
-	trace!(target: "ipc", "Created client for {}", socket_addr);
-	Ok(GuardedSocket {
-		client: Arc::new(S::init(socket)),
-		_endpoint: endpoint,
-	})
-}
-
-lazy_static! {
-	/// Set PARITY_IPC_DEBUG=1 for fail-fast connectivity problems diagnostic
-	pub static ref DEBUG_FLAG: bool = {
-		use std::env;
-
-		if let Ok(debug) = env::var("PARITY_IPC_DEBUG") {
-			debug == "1" || debug.to_uppercase() == "TRUE"
-		}
-		else { false }
-	};
-}
-
-/// Client with no default timeout on operations
-pub fn generic_client<S>(socket_addr: &str) -> Result<GuardedSocket<S>, SocketError> where S: WithSocket<Socket> {
-	if *DEBUG_FLAG {
-		client(socket_addr, Some(DEBUG_CONNECTION_TIMEOUT))
-	} else {
-		client(socket_addr, None)
-	}
-}
-
-/// Client over interface that is supposed to give quick almost non-blocking responses
-pub fn fast_client<S>(socket_addr: &str) -> Result<GuardedSocket<S>, SocketError> where S: WithSocket<Socket> {
-	if *DEBUG_FLAG {
-		client(socket_addr, Some(DEBUG_CONNECTION_TIMEOUT))
-	} else {
-		client(socket_addr, Some(DEFAULT_CONNECTION_TIMEOUT))
-	}
-}
-
-/// Error occurred while establising socket or endpoint
-#[derive(Debug)]
-pub enum SocketError {
-	/// Error establising duplex (paired) socket and/or endpoint
-	DuplexLink,
-	/// Error establising duplex (paired) socket and/or endpoint
-	RequestLink,
-}
-
-impl<S: ?Sized> Worker<S> where S: IpcInterface {
-	/// New worker over specified `service`
-	pub fn new(service: &Arc<S>) -> Worker<S> {
-		Worker::<S> {
-			service: service.clone(),
-			sockets: Vec::new(),
-			polls: Vec::new(),
-			buf: Vec::new(),
-		}
-	}
-
-	/// Polls all sockets, reads and dispatches method invocations
-	pub fn poll(&mut self) {
-		use std::io::Write;
-
-		let mut request = PollRequest::new(&mut self.polls[..]);
- 		let _result_guard = Socket::poll(&mut request, POLL_TIMEOUT);
-
-		for (fd_index, fd) in request.get_fds().iter().enumerate() {
-			if fd.can_read() {
-				let (ref mut socket, _) = self.sockets[fd_index];
-				unsafe { self.buf.set_len(0); }
-				match socket.nb_read_to_end(&mut self.buf) {
-					Ok(method_sign_len) => {
-						if method_sign_len >= 2 {
-
-							// method_num
-							let method_num = self.buf[0] as u16 * 256 + self.buf[1] as u16;
-							// payload
-							let payload = &self.buf[2..];
-
-							// dispatching for ipc interface
-							let result = self.service.dispatch_buf(method_num, payload);
-
-							if let Err(e) = socket.write(&result) {
-								warn!(target: "ipc", "Failed to write response: {:?}", e);
-							}
-						}
-						else {
-							warn!(target: "ipc", "Failed to read method signature from socket: unexpected message length({})", method_sign_len);
-						}
-					},
-					Err(Error::TryAgain) => {
-					},
-					Err(x) => {
-						warn!(target: "ipc", "Error polling connections {:?}", x);
-						panic!();
-					}
-				}
-			}
-		}
-	}
-
-	/// Stores nanomsg poll request for reuse
-	fn rebuild_poll_request(&mut self) {
-		self.polls = self.sockets.iter()
-			.map(|&(ref socket, _)| socket.new_pollfd(PollInOut::In))
-			.collect::<Vec<PollFd>>();
-	}
-
-	/// Add exclusive socket for paired client
-	/// Only one connection over this address is allowed
-	pub fn add_duplex(&mut self, addr: &str) -> Result<(), SocketError>  {
-		let mut socket = Socket::new(Protocol::Pair).map_err(|e| {
-			warn!(target: "ipc", "Failed to create ipc socket: {:?}", e);
-			SocketError::DuplexLink
-		})?;
-
-		let endpoint = socket.bind(addr).map_err(|e| {
-			warn!(target: "ipc", "Failed to bind socket to address '{}': {:?}", addr, e);
-			SocketError::DuplexLink
-		})?;
-
-		self.sockets.push((socket, endpoint));
-
-		self.rebuild_poll_request();
-
-		trace!(target: "ipc", "Started duplex worker at {}", addr);
-
-		Ok(())
-	}
-
-	/// Add generic socket for request-reply style communications
-	/// with multiple clients
-	pub fn add_reqrep(&mut self, addr: &str) -> Result<(), SocketError>  {
-		let mut socket = Socket::new(Protocol::Rep).map_err(|e| {
-			warn!(target: "ipc", "Failed to create ipc socket: {:?}", e);
-			SocketError::DuplexLink
-		})?;
-
-
-		let endpoint = socket.bind(addr).map_err(|e| {
-			warn!(target: "ipc", "Failed to bind socket to address '{}': {:?}", addr, e);
-			SocketError::DuplexLink
-		})?;
-
-		self.sockets.push((socket, endpoint));
-
-		self.rebuild_poll_request();
-
-		trace!(target: "ipc", "Started request-reply worker at {}", addr);
-		Ok(())
-	}
-}
-
-#[cfg(test)]
-mod service_tests {
-
-	use super::Worker;
-	use ipc::*;
-	use std::io::{Read, Write};
-	use std::sync::{Arc, RwLock};
-	use nanomsg::{Socket, Protocol, Endpoint};
-
-	struct TestInvoke {
-		method_num: u16,
-		params: Vec<u8>,
-	}
-
-	struct DummyService {
-		methods_stack: RwLock<Vec<TestInvoke>>,
-	}
-
-	impl DummyService {
-		fn new() -> DummyService {
-			DummyService { methods_stack: RwLock::new(Vec::new()) }
-		}
-	}
-
-	impl IpcInterface for DummyService {
-		fn dispatch<R>(&self, _r: &mut R) -> Vec<u8> where R: Read {
-			vec![]
-		}
-		fn dispatch_buf(&self, method_num: u16, buf: &[u8]) -> Vec<u8> {
-			self.methods_stack.write().unwrap().push(
-				TestInvoke {
-					method_num: method_num,
-					params: buf.to_vec(),
-				});
-			vec![]
-		}
-	}
-
-	impl IpcConfig for DummyService {}
-
-	fn dummy_write(addr: &str, buf: &[u8]) -> (Socket, Endpoint) {
-		let mut socket = Socket::new(Protocol::Pair).unwrap();
-		let endpoint = socket.connect(addr).unwrap();
-		socket.write(buf).unwrap();
-		(socket, endpoint)
-	}
-
-	#[test]
-	fn can_create_worker() {
-		let worker = Worker::<DummyService>::new(&Arc::new(DummyService::new()));
-		assert_eq!(0, worker.sockets.len());
-	}
-
-	#[test]
-	fn can_add_duplex_socket_to_worker() {
-		let mut worker = Worker::<DummyService>::new(&Arc::new(DummyService::new()));
-		worker.add_duplex("ipc:///tmp/parity-test10.ipc").unwrap();
-		assert_eq!(1, worker.sockets.len());
-	}
-
-	#[test]
-	fn worker_can_poll_empty() {
-		let service = Arc::new(DummyService::new());
-		let mut worker = Worker::<DummyService>::new(&service);
-		worker.add_duplex("ipc:///tmp/parity-test20.ipc").unwrap();
-		worker.poll();
-		assert_eq!(0, service.methods_stack.read().unwrap().len());
-	}
-
-	#[test]
-	fn worker_can_poll() {
-		let url = "ipc:///tmp/parity-test30.ipc";
-
-		let mut worker = Worker::<DummyService>::new(&Arc::new(DummyService::new()));
-		worker.add_duplex(url).unwrap();
-
-		let (_socket, _endpoint) = dummy_write(url, &vec![0, 0, 7, 7, 6, 6]);
-		worker.poll();
-
-		assert_eq!(1, worker.service.methods_stack.read().unwrap().len());
-		assert_eq!(0, worker.service.methods_stack.read().unwrap()[0].method_num);
-		assert_eq!([7, 7, 6, 6], worker.service.methods_stack.read().unwrap()[0].params[..]);
-	}
-
-	#[test]
-	fn worker_can_poll_long() {
-		let url = "ipc:///tmp/parity-test40.ipc";
-
-		let mut worker = Worker::<DummyService>::new(&Arc::new(DummyService::new()));
-		worker.add_duplex(url).unwrap();
-
-		let message = [0u8; 1024*1024];
-
-		let (_socket, _endpoint) = dummy_write(url, &message);
-		worker.poll();
-
-		assert_eq!(1, worker.service.methods_stack.read().unwrap().len());
-		assert_eq!(0, worker.service.methods_stack.read().unwrap()[0].method_num);
-		assert_eq!(vec![0u8; 1024*1024-2], worker.service.methods_stack.read().unwrap()[0].params);
-	}
-}
diff --git a/ipc/rpc/Cargo.toml b/ipc/rpc/Cargo.toml
deleted file mode 100644
index edfcdf103d41768be4855c2414e6c7f99aa5b3f3..0000000000000000000000000000000000000000
--- a/ipc/rpc/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "ethcore-ipc"
-version = "1.8.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-license = "GPL-3.0"
-
-[features]
-
-[dependencies]
-ethcore-devtools = { path = "../../devtools" }
-nanomsg = { git = "https://github.com/paritytech/nanomsg.rs.git", branch = "parity-1.7" }
-ethcore-util = { path = "../../util" }
-semver = "0.6"
diff --git a/ipc/rpc/src/binary.rs b/ipc/rpc/src/binary.rs
deleted file mode 100644
index b2fc4bb4b422810e175e4b999c7388deb259a430..0000000000000000000000000000000000000000
--- a/ipc/rpc/src/binary.rs
+++ /dev/null
@@ -1,1194 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Binary representation of types
-
-use util::{U256, U512, H256, H512, H2048, Address};
-use std::mem;
-use std::collections::{VecDeque, BTreeMap};
-use std::ops::Range;
-use super::Handshake;
-
-#[derive(Debug)]
-pub enum BinaryConvertErrorKind {
-	SizeMismatch {
-		expected: usize,
-		found: usize,
-	},
-	TargetPayloadEmpty,
-	UnexpectedVariant(u8),
-	MissingLengthValue,
-	InconsistentBoundaries,
-	NotSupported,
-}
-
-#[derive(Debug)]
-pub struct BinaryConvertError {
-	member_tree: Vec<&'static str>,
-	kind: BinaryConvertErrorKind,
-}
-
-impl BinaryConvertError {
-	pub fn size(expected: usize, found: usize) -> BinaryConvertError {
-		BinaryConvertError {
-			member_tree: Vec::new(),
-			kind: BinaryConvertErrorKind::SizeMismatch {
-				expected: expected,
-				found: found,
-			}
-		}
-	}
-
-	pub fn empty() -> BinaryConvertError {
-		BinaryConvertError { member_tree: Vec::new(), kind: BinaryConvertErrorKind::TargetPayloadEmpty }
-	}
-
-	pub fn variant(val: u8) -> BinaryConvertError {
-		BinaryConvertError { member_tree: Vec::new(), kind: BinaryConvertErrorKind::UnexpectedVariant(val) }
-	}
-
-	pub fn length() -> BinaryConvertError {
-		BinaryConvertError { member_tree: Vec::new(), kind: BinaryConvertErrorKind::MissingLengthValue }
-	}
-
-	pub fn boundaries() -> BinaryConvertError {
-		BinaryConvertError { member_tree: Vec::new(), kind: BinaryConvertErrorKind::InconsistentBoundaries }
-	}
-
-	pub fn not_supported() -> BinaryConvertError {
-		BinaryConvertError { member_tree: Vec::new(), kind: BinaryConvertErrorKind::NotSupported }
-	}
-
-	pub fn named(mut self, name: &'static str) -> BinaryConvertError {
-		self.member_tree.push(name);
-		self
-	}
-}
-
-#[derive(Debug)]
-pub enum BinaryError {
-	Serialization(BinaryConvertError),
-	Io(::std::io::Error),
-}
-
-impl From<::std::io::Error> for BinaryError {
-	fn from(err: ::std::io::Error) -> Self { BinaryError::Io(err) }
-}
-
-impl From<BinaryConvertError> for BinaryError {
-	fn from(err: BinaryConvertError) -> Self { BinaryError::Serialization(err) }
-}
-
-pub trait BinaryConvertable : Sized {
-	fn size(&self) -> usize {
-		mem::size_of::<Self>()
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError>;
-
-	fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError>;
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Err(BinaryConvertError::size(mem::size_of::<Self>(), 0))
-	}
-
-	fn len_params() -> usize {
-		0
-	}
-}
-
-impl<T> BinaryConvertable for Option<T> where T: BinaryConvertable {
-	fn size(&self) -> usize {
-		match * self { None => 0, Some(ref val) => val.size() }
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		match *self { None => Err(BinaryConvertError::empty()), Some(ref val) => val.to_bytes(buffer, length_stack) }
-	}
-
-	fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		if buffer.len() == 0 { return Self::from_empty_bytes(); }
-		Ok(Some(T::from_bytes(buffer, length_stack)?))
-	}
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Ok(None)
-	}
-
-	fn len_params() -> usize {
-		1
-	}
-}
-
-impl<E: BinaryConvertable> BinaryConvertable for Result<(), E> {
-	fn size(&self) -> usize {
-		match *self {
-			Ok(_) => 0,
-			Err(ref e) => e.size(),
-		}
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		match *self {
-			Ok(_) => Err(BinaryConvertError::empty()),
-			Err(ref e) => Ok(e.to_bytes(buffer, length_stack)?),
-		}
-	}
-
-	fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		Ok(Err(E::from_bytes(&buffer, length_stack)?))
-	}
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Ok(Ok(()))
-	}
-
-	fn len_params() -> usize {
-		1
-	}
-}
-
-
-impl<R: BinaryConvertable> BinaryConvertable for Result<R, ()> {
-	fn size(&self) -> usize {
-		match *self {
-			Ok(ref r) => r.size(),
-			Err(_) => 0,
-		}
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		match *self {
-			Ok(ref r) => Ok(r.to_bytes(buffer, length_stack)?),
-			Err(_) => Err(BinaryConvertError::empty()),
-		}
-	}
-
-	fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		Ok(Ok(R::from_bytes(&buffer, length_stack)?))
-	}
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Ok(Err(()))
-	}
-
-	fn len_params() -> usize {
-		1
-	}
-}
-
-impl<R: BinaryConvertable, E: BinaryConvertable> BinaryConvertable for Result<R, E> {
-	fn size(&self) -> usize {
-		1usize + match *self {
-			Ok(ref r) => r.size(),
-			Err(ref e) => e.size(),
-		}
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		match *self {
-			Ok(ref r) => {
-				buffer[0] = 0;
-				if r.size() > 0 {
-					Ok(r.to_bytes(&mut buffer[1..], length_stack)?)
-				}
-				else { Ok(()) }
-			},
-			Err(ref e) => {
-				buffer[0] = 1;
-				if e.size() > 0 {
-					Ok(e.to_bytes(&mut buffer[1..], length_stack)?)
-				}
-				else { Ok(()) }
-			},
-		}
-	}
-
-	fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		match buffer[0] {
-			0 => {
-				match buffer.len() {
-					1 => Ok(Ok(R::from_empty_bytes()?)),
-					_ => Ok(Ok(R::from_bytes(&buffer[1..], length_stack)?)),
-				}
-			}
-			1 => Ok(Err(E::from_bytes(&buffer[1..], length_stack)?)),
-			_ => Err(BinaryConvertError::variant(buffer[0]))
-		}
-	}
-
-	fn len_params() -> usize {
-		1
-	}
-}
-
-impl<K, V> BinaryConvertable for BTreeMap<K, V> where K : BinaryConvertable + Ord, V: BinaryConvertable {
-	fn size(&self) -> usize {
-		0usize + match K::len_params() {
-			0 => mem::size_of::<K>() * self.len(),
-			_ => self.iter().fold(0usize, |acc, (k, _)| acc + k.size())
-		} + match V::len_params() {
-			0 => mem::size_of::<V>() * self.len(),
-			_ => self.iter().fold(0usize, |acc, (_, v)| acc + v.size())
-		}
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		let mut offset = 0usize;
-		for (key, val) in self.iter() {
-			let key_size = match K::len_params() {
-				0 => mem::size_of::<K>(),
-				_ => { let size = key.size(); length_stack.push_back(size); size }
-			};
-			let val_size = match K::len_params() {
-				0 => mem::size_of::<V>(),
-				_ => { let size = val.size(); length_stack.push_back(size); size }
-			};
-
-			if key_size > 0 {
-				let item_end = offset + key_size;
-				key.to_bytes(&mut buffer[offset..item_end], length_stack)?;
-				offset = item_end;
-			}
-
-			if val_size > 0 {
-				let item_end = offset + key_size;
-				val.to_bytes(&mut buffer[offset..item_end], length_stack)?;
-				offset = item_end;
-			}
-		}
-		Ok(())
-	}
-
-	fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		let mut index = 0;
-		let mut result = Self::new();
-
-		if buffer.len() == 0 { return Ok(result); }
-
-		loop {
-			let key_size = match K::len_params() {
-				0 => mem::size_of::<K>(),
-				_ => length_stack.pop_front().ok_or(BinaryConvertError::length())?,
-			};
-			let key = if key_size == 0 {
-				K::from_empty_bytes()?
-			} else {
-				if index + key_size > buffer.len() {
-					return Err(BinaryConvertError::boundaries())
-				}
-				K::from_bytes(&buffer[index..index+key_size], length_stack)?
-			};
-			index = index + key_size;
-
-			let val_size = match V::len_params() {
-				0 => mem::size_of::<V>(),
-				_ => length_stack.pop_front().ok_or(BinaryConvertError::length())?,
-			};
-			let val = if val_size == 0 {
-				V::from_empty_bytes()?
-			} else {
-				if index + val_size > buffer.len() {
-					return Err(BinaryConvertError::boundaries())
-				}
-				V::from_bytes(&buffer[index..index+val_size], length_stack)?
-			};
-			result.insert(key, val);
-			index = index + val_size;
-
-			if index == buffer.len() { break; }
-			if index > buffer.len() {
-				return Err(BinaryConvertError::boundaries())
-			}
-		}
-
-		Ok(result)
-	}
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Ok(Self::new())
-	}
-
-	fn len_params() -> usize {
-		1
-	}
-}
-
-impl<T> BinaryConvertable for VecDeque<T> where T: BinaryConvertable {
-	fn size(&self) -> usize {
-		match T::len_params() {
-			0 => mem::size_of::<T>() * self.len(),
-			_ => self.iter().fold(0usize, |acc, t| acc + t.size()),
-		}
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		let mut offset = 0usize;
-		for item in self.iter() {
-			let next_size = match T::len_params() {
-				0 => mem::size_of::<T>(),
-				_ => { let size = item.size(); length_stack.push_back(size); size },
-			};
-			if next_size > 0 {
-				let item_end = offset + next_size;
-				item.to_bytes(&mut buffer[offset..item_end], length_stack)?;
-				offset = item_end;
-			}
-		}
-		Ok(())
-	}
-
-	fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		let mut index = 0;
-		let mut result = Self::with_capacity(
-			match T::len_params() {
-				0 => buffer.len() /  mem::size_of::<T>(),
-				_ => 128,
-			});
-
-		if buffer.len() == 0 { return Ok(result); }
-
-		loop {
-			let next_size = match T::len_params() {
-				0 => mem::size_of::<T>(),
-				_ => length_stack.pop_front().ok_or(BinaryConvertError::length())?,
-			};
-			let item = if next_size == 0 {
-				T::from_empty_bytes()?
-			}
-			else {
-				if index + next_size > buffer.len() {
-					return Err(BinaryConvertError::boundaries())
-				}
-				T::from_bytes(&buffer[index..index+next_size], length_stack)?
-			};
-			result.push_back(item);
-
-			index = index + next_size;
-			if index == buffer.len() { break; }
-			if index > buffer.len() {
-				return Err(BinaryConvertError::boundaries())
-			}
-		}
-
-		Ok(result)
-	}
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Ok(Self::new())
-	}
-
-	fn len_params() -> usize {
-		1
-	}
-}
-
-impl<T> BinaryConvertable for Vec<T> where T: BinaryConvertable {
-	fn size(&self) -> usize {
-		match T::len_params() {
-			0 => mem::size_of::<T>() * self.len(),
-			_ => self.iter().fold(0usize, |acc, t| acc + t.size()),
-		}
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		let mut offset = 0usize;
-		for item in self.iter() {
-			let next_size = match T::len_params() {
-				0 => mem::size_of::<T>(),
-				_ => { let size = item.size(); length_stack.push_back(size); size },
-			};
-			if next_size > 0 {
-				let item_end = offset + next_size;
-				item.to_bytes(&mut buffer[offset..item_end], length_stack)?;
-				offset = item_end;
-			}
-		}
-		Ok(())
-	}
-
-	fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		let mut index = 0;
-		let mut result = Self::with_capacity(
-			match T::len_params() {
-				0 => buffer.len() /  mem::size_of::<T>(),
-				_ => 128,
-			});
-
-		if buffer.len() == 0 { return Ok(result); }
-
-		loop {
-			let next_size = match T::len_params() {
-				0 => mem::size_of::<T>(),
-				_ => length_stack.pop_front().ok_or(BinaryConvertError::length())?,
-			};
-			let item = if next_size == 0 {
-				T::from_empty_bytes()?
-			}
-			else {
-				if index + next_size > buffer.len() {
-					return Err(BinaryConvertError::boundaries())
-				}
-				T::from_bytes(&buffer[index..index+next_size], length_stack)?
-			};
-			result.push(item);
-
-			index = index + next_size;
-			if index == buffer.len() { break; }
-			if index > buffer.len() {
-				return Err(BinaryConvertError::boundaries())
-			}
-		}
-
-		Ok(result)
-	}
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Ok(Self::new())
-	}
-
-	fn len_params() -> usize {
-		1
-	}
-}
-
-impl BinaryConvertable for String {
-	fn size(&self) -> usize {
-		self.as_bytes().len()
-	}
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Ok(String::new())
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], _length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		buffer[..].clone_from_slice(self.as_bytes());
-		Ok(())
-	}
-
-	fn from_bytes(buffer: &[u8], _length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		Ok(::std::str::from_utf8(buffer).unwrap().to_owned())
-	}
-
-	fn len_params() -> usize {
-		1
-	}
-}
-
-impl<T> BinaryConvertable for Range<T> where T: BinaryConvertable {
-	fn size(&self) -> usize {
-		mem::size_of::<T>() * 2
-	}
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Err(BinaryConvertError::empty())
-	}
-
-	fn to_bytes(&self, buffer: &mut[u8], length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		self.start.to_bytes(&mut buffer[..mem::size_of::<T>()], length_stack)?;
-		self.end.to_bytes(&mut buffer[mem::size_of::<T>() + 1..], length_stack)?;
-		Ok(())
-	}
-
-	fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		Ok(T::from_bytes(&buffer[..mem::size_of::<T>()], length_stack)?..T::from_bytes(&buffer[mem::size_of::<T>()+1..], length_stack)?)
-	}
-
-	fn len_params() -> usize {
-		assert_eq!(0, T::len_params());
-		0
-	}
-}
-
-impl<T> BinaryConvertable for ::std::cell::RefCell<T> where T: BinaryConvertable {
-	fn size(&self) -> usize {
-		self.borrow().size()
-	}
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Ok(::std::cell::RefCell::new(T::from_empty_bytes()?))
-	}
-
-	fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		Ok(::std::cell::RefCell::new(T::from_bytes(buffer, length_stack)?))
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		self.borrow().to_bytes(buffer, length_stack)?;
-		Ok(())
-	}
-
-	fn len_params() -> usize {
-		T::len_params()
-	}
-}
-
-impl<T> BinaryConvertable for ::std::cell::Cell<T> where T: BinaryConvertable + Copy {
-	fn size(&self) -> usize {
-		self.get().size()
-	}
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Ok(::std::cell::Cell::new(T::from_empty_bytes()?))
-	}
-
-	fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		Ok(::std::cell::Cell::new(T::from_bytes(buffer, length_stack)?))
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		self.get().to_bytes(buffer, length_stack)?;
-		Ok(())
-	}
-
-	fn len_params() -> usize {
-		T::len_params()
-	}
-}
-
-impl BinaryConvertable for Vec<u8> {
-	fn size(&self) -> usize {
-		self.len()
-	}
-
-	fn from_empty_bytes() -> Result<Self, BinaryConvertError> {
-		Ok(Vec::new())
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], _length_stack: &mut VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		buffer[..].clone_from_slice(&self[..]);
-		Ok(())
-	}
-
-	fn from_bytes(buffer: &[u8], _length_stack: &mut VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		let mut res = Self::with_capacity(buffer.len());
-		unsafe { res.set_len(buffer.len()) }
-		res[..].clone_from_slice(&buffer[..]);
-		Ok(res)
-	}
-
-	fn len_params() -> usize {
-		1
-	}
-}
-
-pub fn deserialize_from<T, R>(r: &mut R) -> Result<T, BinaryError>
-	where R: ::std::io::Read,
-		T: BinaryConvertable
-{
-	let mut fake_stack = VecDeque::new();
-
-	match T::len_params() {
-		0 => {
-			let fixed_size = mem::size_of::<T>();
-			let mut payload_buffer = Vec::with_capacity(fixed_size);
-			unsafe { payload_buffer.set_len(fixed_size); }
-			let bytes_read = r.read(&mut payload_buffer)?;
-			if bytes_read != mem::size_of::<T>() {
-				return Err(BinaryError::Serialization(BinaryConvertError::size(fixed_size, bytes_read)))
-			}
-			Ok(T::from_bytes(&payload_buffer[..], &mut fake_stack)?)
-		},
-		_ => {
-			let mut payload = Vec::new();
-			r.read_to_end(&mut payload)?;
-
-			let stack_len = u64::from_bytes(&payload[0..8], &mut fake_stack)? as usize;
-			let mut length_stack = VecDeque::<usize>::with_capacity(stack_len);
-
-			if stack_len > 0 {
-				for idx in 0..stack_len {
-					let stack_item = u64::from_bytes(&payload[8 + idx*8..8 + (idx+1)*8], &mut fake_stack)?;
-					length_stack.push_back(stack_item as usize);
-				}
-			}
-
-			let size = u64::from_bytes(&payload[8+stack_len*8..16+stack_len*8], &mut fake_stack)? as usize;
-			match size {
-				0 => {
-					Ok(T::from_empty_bytes()?)
-				},
-				_ => {
-					Ok(T::from_bytes(&payload[16+stack_len*8..], &mut length_stack)?)
-				}
-			}
-		},
-	}
-}
-
-pub fn deserialize<T: BinaryConvertable>(buffer: &[u8]) -> Result<T, BinaryError> {
-	use std::io::Cursor;
-	let mut buff = Cursor::new(buffer);
-	deserialize_from::<T, _>(&mut buff)
-}
-
-pub fn serialize_into<T, W>(t: &T, w: &mut W) -> Result<(), BinaryError>
-	where W: ::std::io::Write,
-		T: BinaryConvertable
-{
-	let mut fake_stack = VecDeque::new();
-
-	match T::len_params() {
-		0 => {
-			let fixed_size = mem::size_of::<T>();
-			let mut buffer = Vec::with_capacity(fixed_size);
-			unsafe { buffer.set_len(fixed_size); }
-			t.to_bytes(&mut buffer[..], &mut fake_stack)?;
-			w.write(&buffer[..])?;
-			Ok(())
-		},
-		_ => {
-			let mut length_stack = VecDeque::<usize>::new();
-			let mut size_buffer = [0u8; 8];
-
-			let size = t.size();
-			if size == 0 {
-				w.write(&size_buffer)?;
-				w.write(&size_buffer)?;
-				return Ok(());
-			}
-
-			let mut buffer = Vec::with_capacity(size);
-			unsafe { buffer.set_len(size); }
-			t.to_bytes(&mut buffer[..], &mut length_stack)?;
-
-			let stack_len = length_stack.len();
-			(stack_len as u64).to_bytes(&mut size_buffer[..], &mut fake_stack)?;
-			w.write(&size_buffer[..])?;
-			if stack_len > 0 {
-				let mut header_buffer = Vec::with_capacity(stack_len * 8);
-				unsafe {  header_buffer.set_len(stack_len * 8); };
-				(stack_len as u64).to_bytes(&mut header_buffer[0..8], &mut fake_stack)?;
-				let mut idx = 0;
-				loop {
-					match length_stack.pop_front() {
-						Some(val) => (val as u64).to_bytes(&mut header_buffer[idx * 8..(idx+1) * 8], &mut fake_stack)?,
-						None => { break; }
-					}
-					idx = idx + 1;
-				}
-				w.write(&header_buffer[..])?;
-			}
-
-			(size as u64).to_bytes(&mut size_buffer[..], &mut fake_stack)?;
-			w.write(&size_buffer[..])?;
-
-			w.write(&buffer[..])?;
-
-			Ok(())
-		},
-	}
-}
-
-pub fn serialize<T: BinaryConvertable>(t: &T) -> Result<Vec<u8>, BinaryError> {
-	use std::io::Cursor;
-	let mut buff = Cursor::new(Vec::new());
-	serialize_into(t, &mut buff)?;
-	let into_inner = buff.into_inner();
-	Ok(into_inner)
-}
-
-#[macro_export]
-macro_rules! binary_fixed_size {
-	($target_ty: ty) => {
-		impl BinaryConvertable for $target_ty where $target_ty: Copy {
-			fn from_bytes(bytes: &[u8], _length_stack: &mut ::std::collections::VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-				let size = ::std::mem::size_of::<$target_ty>();
-				match bytes.len().cmp(&size) {
-					::std::cmp::Ordering::Equal => (),
-					_ => return Err(BinaryConvertError::size(size, bytes.len())),
-				};
-				let res: Self = unsafe {
-					let mut temp = ::std::mem::zeroed();
-					let temp_ptr = &mut temp as *mut _ as *mut u8;
-					::std::ptr::copy_nonoverlapping(bytes.as_ptr(), temp_ptr, size);
-
-					temp
-				};
-
-				Ok(res)
-			}
-
-			fn to_bytes(&self, buffer: &mut [u8], _length_stack: &mut ::std::collections::VecDeque<usize>) -> Result<(), BinaryConvertError> {
-				let sz = ::std::mem::size_of::<$target_ty>();
-				let ip: *const $target_ty = self;
-				let ptr: *const u8 = ip as *const _;
-				unsafe {
-					::std::ptr::copy(ptr, buffer.as_mut_ptr(), sz);
-				}
-				Ok(())
-			}
-		}
-	}
-}
-
-/// Fixed-sized version of Handshake struct
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct BinHandshake {
-	api_version: BinVersion,
-	protocol_version: BinVersion,
-}
-
-/// Shorten version of semver Version without `pre` and `build` information
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct BinVersion {
-	pub major: u64,
-	pub minor: u64,
-	pub patch: u64,
-}
-
-impl From<Handshake> for BinHandshake {
-	fn from(other: Handshake) -> Self {
-		BinHandshake {
-			api_version: BinVersion::from(other.api_version),
-			protocol_version: BinVersion::from(other.protocol_version),
-		}
-	}
-}
-
-impl BinHandshake {
-	pub fn to_semver(self) -> Handshake {
-		Handshake {
-			api_version: self.api_version.to_semver(),
-			protocol_version: self.protocol_version.to_semver(),
-		}
-	}
-}
-
-impl BinVersion {
-	pub fn to_semver(self) -> ::semver::Version {
-		::semver::Version {
-			major: self.major,
-			minor: self.minor,
-			patch: self.patch,
-			pre: vec![],
-			build: vec![],
-		}
-	}
-}
-
-impl From<::semver::Version> for BinVersion {
-	fn from(other: ::semver::Version) -> Self {
- 		BinVersion {
-			major: other.major,
-			minor: other.minor,
-			patch: other.patch,
-		}
-	}
-}
-
-binary_fixed_size!(u16);
-binary_fixed_size!(u64);
-binary_fixed_size!(u32);
-binary_fixed_size!(usize);
-binary_fixed_size!(i32);
-binary_fixed_size!(bool);
-binary_fixed_size!(U256);
-binary_fixed_size!(U512);
-binary_fixed_size!(H256);
-binary_fixed_size!(H512);
-binary_fixed_size!(H2048);
-binary_fixed_size!(Address);
-binary_fixed_size!(BinHandshake);
-binary_fixed_size!(BinVersion);
-
-impl BinaryConvertable for ::semver::Version {
-	fn from_bytes(bytes: &[u8], length_stack: &mut ::std::collections::VecDeque<usize>) -> Result<Self, BinaryConvertError> {
-		BinVersion::from_bytes(bytes, length_stack).map(BinVersion::to_semver)
-	}
-
-	fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut ::std::collections::VecDeque<usize>) -> Result<(), BinaryConvertError> {
-		BinVersion::from(self.clone()).to_bytes(buffer, length_stack)
-	}
-}
-
-#[test]
-fn vec_serialize() {
-	let mut v = Vec::new();
-	v.push(5u64);
-	v.push(10u64);
-	let mut length_stack = VecDeque::new();
-	let mut data = Vec::with_capacity(v.size());
-	unsafe { data.set_len(v.size()); }
-	let result = v.to_bytes(&mut data[..], &mut length_stack);
-
-	assert!(result.is_ok());
-	assert_eq!(5, data[0]);
-	assert_eq!(0, data[1]);
-	assert_eq!(10, data[8]);
-	assert_eq!(0, data[12]);
-}
-
-#[test]
-fn calculates_size() {
-	let mut v = Vec::new();
-	v.push(5u64);
-	v.push(10u64);
-
-	assert_eq!(16, v.size());
-}
-
-#[test]
-fn vec_deserialize() {
-	let data = [
-		10u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
-		5u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
-	];
-
-	let mut length_stack = VecDeque::new();
-	let vec = Vec::<u64>::from_bytes(&data[..], &mut length_stack).unwrap();
-
-	assert_eq!(vec![10u64, 5u64], vec);
-}
-
-#[test]
-fn vec_deserialize_chained() {
-	let mut v = Vec::new();
-	v.push(Some(5u64));
-	v.push(Some(10u64));
-	v.push(None);
-	v.push(Some(12u64));
-
-	let mut length_stack = VecDeque::new();
-	let mut data = Vec::with_capacity(v.size());
-	unsafe { data.set_len(v.size()); }
-	let result = v.to_bytes(&mut data[..], &mut length_stack);
-
-	assert!(result.is_ok());
-	assert_eq!(4, length_stack.len());
-}
-
-#[test]
-fn vec_serialize_deserialize() {
-	let mut v = Vec::new();
-	v.push(Some(5u64));
-	v.push(None);
-	v.push(Some(10u64));
-	v.push(None);
-	v.push(Some(12u64));
-
-
-	let mut data = Vec::with_capacity(v.size());
-	unsafe { data.set_len(v.size()); }
-	let mut length_stack = VecDeque::new();
-
-	v.to_bytes(&mut data[..], &mut length_stack).unwrap();
-	let de_v = Vec::<Option<u64>>::from_bytes(&data[..], &mut length_stack).unwrap();
-
-	assert_eq!(v, de_v);
-}
-
-#[test]
-fn serialize_into_ok() {
-	use std::io::Cursor;
-    let mut buff = Cursor::new(vec![0; 128]);
-
-	let mut v = Vec::new();
-	v.push(Some(5u64));
-	v.push(None);
-	v.push(Some(10u64));
-	v.push(None);
-	v.push(Some(12u64));
-
-	serialize_into(&v, &mut buff).unwrap();
-	assert_eq!(5, buff.get_ref()[0]);
-	assert_eq!(8, buff.get_ref()[8]);
-	assert_eq!(0, buff.get_ref()[16]);
-	assert_eq!(8, buff.get_ref()[24]);
-}
-
-#[test]
-fn deserialize_from_ok() {
-	use std::io::Cursor;
-    let mut buff = Cursor::new(vec![
-		0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
-		16u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
-		10u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
-		5u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
-	]);
-
-	let vec = deserialize_from::<Vec<u64>, _>(&mut buff).unwrap();
-
-	assert_eq!(vec![10u64, 5u64], vec);
-}
-
-#[test]
-fn serialize_into_deserialize_from() {
-	use std::io::{Cursor, SeekFrom, Seek};
-
-	let mut buff = Cursor::new(Vec::new());
-	let mut v = Vec::new();
-	v.push(Some(5u64));
-	v.push(None);
-	v.push(Some(10u64));
-	v.push(None);
-	v.push(Some(12u64));
-
-	serialize_into(&v, &mut buff).unwrap();
-	buff.seek(SeekFrom::Start(0)).unwrap();
-	let de_v = deserialize_from::<Vec<Option<u64>>, _>(&mut buff).unwrap();
-	assert_eq!(v, de_v);
-}
-
-#[test]
-fn serialize_vec_str() {
-	// empty
-	let source = Vec::<String>::new();
-	let serialized = serialize(&source).unwrap();
-	let deserialized = deserialize::<Vec<String>>(&serialized).unwrap();
-
-	assert_eq!(source, deserialized);
-
-	// with few values
-	let mut source = Vec::<String>::new();
-	source.push("val1".to_owned());
-	source.push("val2".to_owned());
-	let serialized = serialize(&source).unwrap();
-	let deserialized = deserialize::<Vec<String>>(&serialized).unwrap();
-
-	assert_eq!(source, deserialized);
-}
-
-#[test]
-fn serialize_opt_str() {
-	// none
-	let source: Option<String> = None;
-	let serialized = serialize(&source).unwrap();
-	let deserialized = deserialize::<Option<String>>(&serialized).unwrap();
-
-	assert_eq!(source, deserialized);
-
-	// value
-	let source: Option<String> = Some("i have value".to_owned());
-	let serialized = serialize(&source).unwrap();
-	let deserialized = deserialize::<Option<String>>(&serialized).unwrap();
-
-	assert_eq!(source, deserialized);
-}
-
-#[test]
-fn serialize_opt_vec() {
- 	use std::io::Cursor;
-
-	let mut buff = Cursor::new(Vec::new());
-	let optional_vec: Option<Vec<u8>> = None;
-	serialize_into(&optional_vec, &mut buff).unwrap();
-
-	assert_eq!(&vec![0u8; 16], buff.get_ref());
-}
-
-#[test]
-fn serialize_opt_vec_payload() {
-	let optional_vec: Option<Vec<u8>> = None;
-	let payload = serialize(&optional_vec).unwrap();
-
-	assert_eq!(vec![0u8;16], payload);
-}
-
-#[test]
-fn deserialize_opt_vec() {
-	use std::io::Cursor;
-    let mut buff = Cursor::new(vec![0u8; 16]);
-
-	let vec = deserialize_from::<Option<Vec<u8>>, _>(&mut buff).unwrap();
-
-	assert!(vec.is_none());
-}
-
-#[test]
-fn deserialize_simple_err() {
-	use std::io::Cursor;
-    let mut buff = Cursor::new(vec![0u8; 16]);
-
-	let result = deserialize_from::<Result<(), u32>, _>(&mut buff).unwrap();
-
-	assert!(result.is_ok());
-}
-
-#[test]
-fn serialize_opt_vec_in_out() {
-	use std::io::{Cursor, SeekFrom, Seek};
-
-	let mut buff = Cursor::new(Vec::new());
-	let optional_vec: Option<Vec<u8>> = None;
-	serialize_into(&optional_vec, &mut buff).unwrap();
-
-	buff.seek(SeekFrom::Start(0)).unwrap();
-	let vec = deserialize_from::<Option<Vec<u8>>, _>(&mut buff).unwrap();
-
-	assert!(vec.is_none());
-}
-
-#[test]
-fn serialize_err_opt_vec_in_out() {
-	use std::io::{Cursor, SeekFrom, Seek};
-
-	let mut buff = Cursor::new(Vec::new());
-	let optional_vec: Result<Option<Vec<u8>>, u32> = Ok(None);
-	serialize_into(&optional_vec, &mut buff).unwrap();
-
-	buff.seek(SeekFrom::Start(0)).unwrap();
-	let vec = deserialize_from::<Result<Option<Vec<u8>>, u32>, _>(&mut buff).unwrap();
-
-	assert!(vec.is_ok());
-}
-
-#[test]
-fn serialize_btree() {
-	use std::io::{Cursor, SeekFrom, Seek};
-
-	let mut buff = Cursor::new(Vec::new());
-	let mut btree = BTreeMap::new();
-	btree.insert(1u64, 5u64);
-	serialize_into(&btree, &mut buff).unwrap();
-
-	buff.seek(SeekFrom::Start(0)).unwrap();
-	let res = deserialize_from::<BTreeMap<u64, u64>, _>(&mut buff).unwrap();
-
-	assert_eq!(res[&1u64], 5u64);
-}
-
-#[test]
-fn serialize_refcell() {
-	use std::cell::RefCell;
-
-	let source = RefCell::new(vec![5u32, 12u32, 19u32]);
-	let serialized = serialize(&source).unwrap();
-	let deserialized = deserialize::<RefCell<Vec<u32>>>(&serialized).unwrap();
-
-	assert_eq!(source, deserialized);
-}
-
-#[test]
-fn serialize_cell() {
-	use std::cell::Cell;
-	use std::str::FromStr;
-
-	let source = Cell::new(U256::from_str("01231231231239999").unwrap());
-	let serialized = serialize(&source).unwrap();
-	let deserialized = deserialize::<Cell<U256>>(&serialized).unwrap();
-
-	assert_eq!(source, deserialized);
-}
-
-#[test]
-fn serialize_handshake() {
-	use std::io::{Cursor, SeekFrom, Seek};
-
-	let mut buff = Cursor::new(Vec::new());
-
-	let handshake = Handshake {
-		api_version: ::semver::Version::parse("1.2.0").unwrap(),
-		protocol_version: ::semver::Version::parse("1.2.0").unwrap(),
-	};
-
-	serialize_into(&BinHandshake::from(handshake.clone()), &mut buff).unwrap();
-
-	buff.seek(SeekFrom::Start(0)).unwrap();
-	let res = deserialize_from::<BinHandshake, _>(&mut buff).unwrap().to_semver();
-
-	assert_eq!(res, handshake);
-}
-
-#[test]
-fn serialize_invalid_size() {
-	// value
-	let deserialized = deserialize::<u64>(&[]);
-	match deserialized {
-		Err(BinaryError::Serialization(
-			BinaryConvertError {
-				kind: BinaryConvertErrorKind::SizeMismatch { expected: 8, found: 0 },
-				member_tree: _
-			})) => {},
-		other => panic!("Not a size mismatched error but:  {:?}", other),
-	}
-}
-
-#[test]
-fn serialize_boundaries() {
-	// value
-	let deserialized = deserialize::<Vec<u32>>(
-		&[
-			// payload header
-			0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
-			2u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
-			//
-			0u8, 0u8, 0u8, 5u8,
-			0u8, 0u8, 0u8, 4u8,
-			1u8, 1u8, /* not 4 bytes */
-		]
-	);
-	match deserialized {
-		Err(BinaryError::Serialization(
-			BinaryConvertError {
-				kind: BinaryConvertErrorKind::InconsistentBoundaries,
-				member_tree: _
-			})) => {},
-		other => panic!("Not an inconsistent boundaries error but: {:?}", other),
-	}
-}
-
-#[test]
-fn serialize_empty_try() {
-	// value
-	let mut stack = VecDeque::new();
-	let mut data = vec![0u8; 16];
-	let sample: Option<Vec<u8>> = None;
-	let serialized = sample.to_bytes(&mut data, &mut stack);
-	match serialized {
-		Err(BinaryConvertError {
-				kind: BinaryConvertErrorKind::TargetPayloadEmpty,
-				member_tree: _
-			}) => {},
-		other => panic!("Not an error about empty payload to be produced but: {:?}", other),
-	}
-}
-
-#[test]
-fn serialize_not_enough_lengths() {
-	// value
-	let deserialized = deserialize::<Vec<Option<u32>>>(
-		&[
-			// payload header
-			0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
-			2u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
-			// does not matter because no length param for the first option
-			0u8,
-		]
-	);
-	match deserialized {
-		Err(BinaryError::Serialization(
-			BinaryConvertError {
-				kind: BinaryConvertErrorKind::MissingLengthValue,
-				member_tree: _
-			})) => {},
-		other => panic!("Not an missing length param error but: {:?}", other),
-	}
-}
-
-#[test]
-fn vec_of_vecs() {
-	let sample = vec![vec![5u8, 10u8], vec![], vec![9u8, 11u8]];
-	let serialized = serialize(&sample).unwrap();
-	let deserialized = deserialize::<Vec<Vec<u8>>>(&serialized).unwrap();
-	assert_eq!(sample, deserialized);
-
-	// empty
-	let sample: Vec<Vec<u8>> = vec![];
-	let serialized = serialize(&sample).unwrap();
-	let deserialized = deserialize::<Vec<Vec<u8>>>(&serialized).unwrap();
-	assert_eq!(sample, deserialized);
-}
diff --git a/ipc/rpc/src/interface.rs b/ipc/rpc/src/interface.rs
deleted file mode 100644
index c3e82fef4a63cbc029695d8fe3a7c7a7ad59654a..0000000000000000000000000000000000000000
--- a/ipc/rpc/src/interface.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! IPC RPC interface
-
-use std::io::{Read, Write};
-use std::marker::Sync;
-use semver::Version;
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-/// Handshake for client and server to negotiate api/protocol version
-pub struct Handshake {
-	pub protocol_version: Version,
-	pub api_version: Version,
-}
-
-/// Allows to configure custom version and custom handshake response for
-/// ipc host
-pub trait IpcConfig {
-	/// Current service api version
-	/// Should be increased if any of the methods changes signature
-	fn api_version() -> Version {
-		Version::parse("1.0.0").unwrap()
-	}
-
-	/// Current ipc protocol version
-	/// Should be increased only if signature of system methods changes
-	fn protocol_version() -> Version {
-		Version::parse("1.0.0").unwrap()
-	}
-
-	/// Default handshake requires exact versions match
-	fn handshake(handshake: &Handshake) -> bool {
-		handshake.protocol_version == Self::protocol_version() &&
-			handshake.api_version == Self::api_version()
-	}
-}
-
-/// Error in dispatching or invoking methods via IPC
-#[derive(Debug)]
-pub enum Error {
-	UnkownSystemCall,
-	ClientUnsupported,
-	RemoteServiceUnsupported,
-	HandshakeFailed,
-}
-
-/// Allows implementor to be attached to generic worker and dispatch rpc requests
-/// over IPC
-pub trait IpcInterface : IpcConfig {
-	/// reads the message from io, dispatches the call and returns serialized result
-	fn dispatch<R>(&self, r: &mut R) -> Vec<u8> where R: Read;
-
-	/// deserializes the payload from buffer, dispatches invoke and returns serialized result
-	/// (for non-blocking io)
-	fn dispatch_buf(&self, method_num: u16, buf: &[u8]) -> Vec<u8>;
-}
-
-/// serializes method invocation (method_num and parameters) to the stream specified by `w`
-pub fn invoke<W>(method_num: u16, params: &Option<Vec<u8>>, w: &mut W) where W: Write {
-	// creating buffer to contain all message
-	let buf_len = match *params { None => 2, Some(ref val) => val.len() + 2 };
-	let mut buf = vec![0u8; buf_len];
-
-	// writing method_num as u16
-	buf[1] = (method_num & 255) as u8;
-	buf[0] = (method_num >> 8) as u8;
-
-	// serializing parameters only if provided with any
-	if params.is_some() {
-		buf[2..buf_len].clone_from_slice(params.as_ref().unwrap());
-	}
-
-	if w.write(&buf).unwrap() != buf_len
-	{
-		// if write was inconsistent
-		panic!("failed to write to socket");
-	}
-}
-
-/// IpcSocket, read/write generalization
-pub trait IpcSocket: Read + Write + Sync + Send {
-}
-
-/// Basically something that needs only socket to be spawned
-pub trait WithSocket<S: IpcSocket> {
-	fn init(socket: S) -> Self;
-}
-
-
-impl IpcSocket for ::devtools::TestSocket {}
-
-impl IpcSocket for ::nanomsg::Socket {}
diff --git a/ipc/rpc/src/lib.rs b/ipc/rpc/src/lib.rs
deleted file mode 100644
index 61493ea362cc7ded00424f1b818d8cdf4caf4b17..0000000000000000000000000000000000000000
--- a/ipc/rpc/src/lib.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! IPC RPC interface
-
-extern crate ethcore_devtools as devtools;
-extern crate semver;
-extern crate nanomsg;
-extern crate ethcore_util as util;
-
-pub mod interface;
-pub mod binary;
-pub use interface::{IpcInterface, IpcSocket, invoke, IpcConfig, Handshake, Error, WithSocket};
-pub use binary::{BinaryConvertable, BinaryConvertError, BinVersion, BinHandshake};
diff --git a/ipc/tests/Cargo.toml b/ipc/tests/Cargo.toml
deleted file mode 100644
index 89a4f98c5b5cb17f3294d10669710196e6fa5b0d..0000000000000000000000000000000000000000
--- a/ipc/tests/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "ethcore-ipc-tests"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[lib]
-path = "run.rs"
-
-[dependencies]
-ethcore-ipc = { path = "../rpc" }
-ethcore-devtools = { path = "../../devtools" }
-semver = "0.6"
-nanomsg = { git = "https://github.com/paritytech/nanomsg.rs.git", branch = "parity-1.7" }
-ethcore-ipc-nano = { path = "../nano" }
-ethcore-util = { path = "../../util" }
-log = "0.3"
-
-[build-dependencies]
-ethcore-ipc-codegen = { path = "../codegen" }
diff --git a/ipc/tests/binary.rs b/ipc/tests/binary.rs
deleted file mode 100644
index 6eb1da8522546cd68a9e23a54c3622013784b5c3..0000000000000000000000000000000000000000
--- a/ipc/tests/binary.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues
-
-include!(concat!(env!("OUT_DIR"), "/binary.rs.in"));
diff --git a/ipc/tests/binary.rs.in b/ipc/tests/binary.rs.in
deleted file mode 100644
index dfc020c454b8d69ef3ce0e412d2311b3c1cff3cf..0000000000000000000000000000000000000000
--- a/ipc/tests/binary.rs.in
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-
-use util::Bytes;
-
-#[binary]
-pub enum Root {
-	Top,
-	Middle(u32, u64),
-}
-
-#[derive(PartialEq, Debug)]
-#[binary]
-pub struct DoubleRoot {
-	pub x1: u32,
-	pub x2: u64,
-	pub x3: u32,
-}
-
-#[derive(PartialEq, Debug)]
-#[binary]
-pub struct ReferenceStruct<'a> {
-	pub ref_data: &'a u64,
-}
-
-#[derive(PartialEq, Debug)]
-#[binary]
-pub enum EnumWithStruct {
-	Left,
-	Right { how_much: u64 },
-}
-
-#[binary]
-pub struct TwoVec {
-	v1: Vec<u8>,
-	v2: Vec<u8>,
-}
-
-#[binary]
-struct ChunkSet {
-    items: Vec<Bytes>,
-}
-
-#[test]
-fn opt_two_vec() {
-	let example: Option<TwoVec> = None;
-
-	let serialized = ::ipc::binary::serialize(&example).unwrap();
-	assert_eq!(serialized, vec![0u8; 16]);
-}
-
-#[test]
-fn enum_with_struct() {
-	let example = EnumWithStruct::Right { how_much: 15 };
-	let serialized = ::ipc::binary::serialize(&example).unwrap();
-	let deserialized = ::ipc::binary::deserialize::<EnumWithStruct>(&serialized).unwrap();
-	assert_eq!(example, deserialized);
-}
-
-#[test]
-fn chunks() {
-	let sample: Vec<u8> = vec! [
-		15, 0, 0, 0, 0, 0, 0, 0, 81, 6, 0, 0, 0, 0, 0, 0,
-		110, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0,
-		112, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0,
-		173, 0, 0, 0, 0, 0, 0, 0, 103, 0, 0, 0, 0, 0, 0, 0,
-		112, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0,
-		107, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0,
-		114, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0,
-		114, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0,
-		81, 6, 0, 0, 0, 0, 0, 0,
-
-		248, 108, 58, 133, 4, 168, 23, 200, 0, 130, 82, 8, 148, 182, 54,
-		177, 224, 198, 163, 123, 250, 122, 157, 158, 75, 138, 30, 7, 83, 91, 141, 56, 46, 136, 2,
-		197, 12, 243, 220, 69, 192, 0, 128, 28, 160, 32, 232, 123, 221, 90, 116, 93, 94, 136, 78,
-		235, 200, 167, 154, 3, 175, 74, 53, 133, 32, 239, 199, 169, 46, 95, 111, 114, 204, 19, 138,
-		15, 167, 160, 103, 72, 60, 241, 165, 248, 130, 213, 45, 166, 249, 102, 83, 87, 98, 153,
-		68, 58, 13, 83, 193, 182, 217, 182, 9, 241, 217, 28, 162, 152, 114, 136, 248, 110, 130, 6,
-		96, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 100, 131, 212, 219, 190, 174, 5, 47,
-		105, 201, 11, 11, 210, 108, 207, 242, 164, 74, 218, 19, 135, 6, 10, 36, 24, 30, 64, 0,
-		128, 27, 160, 206, 145, 163, 186, 24, 122, 126, 115, 80, 203, 152, 219, 160, 243, 1, 139,
-		109, 199, 115, 50, 159, 197, 95, 184, 174, 53, 150, 3, 200, 82, 138, 22, 160, 119, 226,
-		202, 208, 136, 165, 174, 240, 216, 222, 27, 214, 12, 213, 250, 68, 214, 144, 120, 53, 158,
-		46, 124, 105, 87, 220, 213, 192, 28, 81, 118, 6, 248, 110, 130, 6, 95, 133, 4, 168, 23,
-		200, 0, 131, 1, 95, 144, 148, 100, 131, 212, 219, 190, 174, 5, 47, 105, 201, 11, 11, 210,
-		108, 207, 242, 164, 74, 218, 19, 135, 6, 10, 36, 24, 30, 64, 0, 128, 27, 160, 19, 172, 66,
-		208, 28, 189, 213, 239, 125, 170, 127, 147, 190, 97, 171, 194, 229, 241, 178, 176, 111,
-		3, 201, 217, 9, 179, 23, 159, 159, 64, 55, 225, 160, 7, 123, 227, 76, 149, 80, 48, 130,
-		122, 23, 165, 175, 24, 89, 228, 128, 25, 106, 160, 195, 82, 204, 206, 150, 83, 70, 127,
-		34, 221, 169, 80, 43, 248, 110, 130, 6, 102, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148,
-		100, 131, 212, 219, 190, 174, 5, 47, 105, 201, 11, 11, 210, 108, 207, 242, 164, 74, 218,
-		19, 135, 6, 10, 36, 24, 30, 64, 0, 128, 27, 160, 29, 6, 237, 5, 67, 42, 51, 65, 172, 133,
-		9, 222, 160, 39, 202, 88, 230, 123, 232, 135, 234, 5, 244, 215, 99, 129, 242, 59, 63, 36,
-		26, 253, 160, 104, 178, 37, 227, 142, 255, 186, 41, 91, 108, 206, 13, 108, 24, 73, 229,
-		96, 224, 142, 230, 93, 214, 27, 60, 119, 149, 119, 56, 62, 5, 204, 179, 248, 171, 129, 136,
-		133, 4, 168, 23, 200, 0, 131, 2, 77, 248, 148, 137, 32, 90, 58, 59, 42, 105, 222, 109, 191,
-		127, 1, 237, 19, 178, 16, 139, 44, 67, 231, 128, 184, 68, 169, 5, 156, 187, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 105, 4, 134, 47, 167, 212, 79, 177, 44, 91, 97, 85, 184, 182, 222, 59, 231, 242,
-		110, 141, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 2, 28, 160, 98, 5, 133, 180, 19, 27, 159, 186, 76, 27, 159, 143, 186, 97, 124, 253, 123, 40,
-		87, 35, 184, 115, 99, 176, 68, 85, 191, 210, 218, 132, 220, 52, 160, 48, 160, 79, 26, 47, 127, 253,
-		55, 252, 196, 196, 129, 87, 131, 132, 84, 74, 166, 33, 85, 134, 25, 34, 244, 14, 1, 16, 1, 205, 34,
-		30, 3, 248, 101, 3, 133, 13, 43, 184, 47, 225, 131, 1, 95, 144, 148, 202, 110, 19, 32, 65, 111, 158,
-		204, 235, 91, 252, 213, 35, 215, 54, 91, 165, 67, 183, 171, 1, 128, 28, 160, 182, 194, 27, 223, 136,
-		182, 189, 146, 57, 61, 173, 62, 58, 241, 42, 80, 125, 174, 84, 191, 82, 124, 228, 62, 216, 233, 116,
-		117, 227, 207, 138, 56, 160, 31, 210, 242, 212, 31, 156, 129, 155, 166, 64, 102, 140, 134, 35, 176,
-		137, 201, 206, 213, 199, 238, 132, 185, 145, 220, 217, 151, 80, 243, 93, 71, 211, 248, 110, 130,
-		6, 101, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 100, 131, 212, 219, 190, 174, 5, 47, 105,
-		201, 11, 11, 210, 108, 207, 242, 164, 74, 218, 19, 135, 6, 10, 36, 24, 30, 64, 0, 128, 27, 160,
-		86, 37, 61, 45, 13, 251, 9, 19, 188, 242, 233, 83, 77, 137, 28, 185, 141, 105, 217, 54, 182, 156,
-		119, 223, 213, 112, 240, 20, 119, 167, 4, 7, 160, 95, 53, 122, 159, 6, 209, 70, 155, 122, 153, 165,
-		192, 249, 223, 219, 83, 159, 40, 242, 39, 44, 132, 182, 208, 232, 77, 64, 178, 241, 233, 230, 253,
-		248, 110, 130, 6, 99, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 100, 131, 212, 219, 190, 174,
-		5, 47, 105, 201, 11, 11, 210, 108, 207, 242, 164, 74, 218, 19, 135, 6, 10, 36, 24, 30, 64, 0, 128,
-		27, 160, 114, 33, 104, 64, 195, 12, 156, 235, 56, 59, 210, 102, 183, 210, 216, 137, 223, 207, 134,
-		63, 65, 36, 204, 121, 38, 175, 214, 106, 184, 197, 26, 173, 160, 39, 94, 238, 34, 106, 190, 22,
-		225, 95, 211, 192, 249, 95, 231, 1, 111, 8, 204, 133, 35, 84, 242, 134, 75, 61, 50, 26, 150, 46,
-		209, 129, 155, 248, 105, 106, 133, 5, 103, 130, 1, 225, 131, 2, 130, 119, 148, 191, 78, 215, 178,
-		127, 29, 102, 101, 70, 227, 13, 116, 213, 13, 23, 61, 32, 188, 167, 84, 128, 132, 60, 207, 214,
-		11, 28, 160, 3, 83, 228, 182, 32, 30, 183, 26, 157, 247, 32, 142, 60, 192, 100, 175, 106, 216,
-		144, 16, 100, 165, 95, 91, 135, 138, 14, 41, 82, 251, 207, 159, 160, 74, 160, 161, 187, 63, 216,
-		18, 23, 64, 172, 216, 238, 192, 134, 191, 204, 206, 236, 197, 134, 116, 130, 15, 85, 113, 173,
-		130, 39, 50, 160, 49, 222, 248, 110, 130, 6, 98, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148,
-		100, 131, 212, 219, 190, 174, 5, 47, 105, 201, 11, 11, 210, 108, 207, 242, 164, 74, 218, 19, 135,
-		6, 10, 36, 24, 30, 64, 0, 128, 28, 160, 138, 12, 20, 188, 112, 66, 91, 30, 216, 44, 24, 124, 242,
-		200, 111, 179, 32, 26, 37, 221, 239, 110, 1, 84, 48, 89, 86, 61, 169, 129, 90, 21, 160, 44, 172,
-		112, 11, 130, 45, 247, 188, 207, 91, 247, 195, 58, 188, 110, 127, 59, 227, 41, 151, 244, 41, 120,
-		68, 185, 238, 41, 236, 195, 141, 38, 16, 248, 112, 131, 5, 238, 44, 133, 4, 168, 23, 200, 0, 131,
-		1, 95, 144, 148, 5, 113, 9, 145, 204, 89, 103, 32, 126, 46, 182, 84, 47, 76, 28, 159, 77, 184,
-		154, 59, 136, 1, 100, 240, 147, 154, 69, 101, 18, 128, 27, 160, 130, 0, 124, 82, 177, 112, 241,
-		14, 47, 186, 67, 117, 176, 187, 147, 94, 4, 177, 218, 198, 55, 59, 245, 9, 142, 95, 88, 220, 63,
-		98, 175, 49, 160, 17, 204, 228, 24, 242, 38, 166, 219, 17, 56, 103, 244, 33, 125, 223, 45, 43,
-		252, 215, 163, 40, 1, 187, 152, 34, 229, 82, 180, 213, 148, 129, 32, 248, 110, 130, 6, 100, 133,
-		4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 100, 131, 212, 219, 190, 174, 5, 47, 105, 201, 11, 11,
-		210, 108, 207, 242, 164, 74, 218, 19, 135, 6, 10, 36, 24, 30, 64, 0, 128, 27, 160, 149, 149, 154,
-		6, 198, 127, 14, 11, 164, 0, 244, 4, 74, 83, 9, 108, 164, 66, 186, 26, 109, 69, 98, 41, 149, 33,
-		238, 137, 23, 175, 124, 226, 160, 39, 249, 210, 237, 52, 83, 110, 229, 138, 84, 199, 64, 19, 209,
-		156, 195, 9, 50, 184, 64, 78, 67, 158, 167, 121, 220, 80, 137, 104, 240, 50, 60, 248, 112, 131, 5,
-		238, 45, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 247, 0, 201, 156, 113, 12, 158, 3, 208, 61,
-		221, 91, 236, 235, 235, 195, 40, 46, 100, 73, 136, 13, 230, 68, 67, 114, 161, 197, 100, 128, 27,
-		160, 123, 206, 0, 221, 2, 87, 197, 156, 109, 157, 133, 31, 26, 145, 223, 150, 235, 160, 54, 144,
-		210, 146, 31, 173, 221, 128, 233, 148, 73, 82, 191, 220, 160, 57, 62, 114, 94, 77, 8, 116, 150,
-		51, 112, 241, 70, 149, 157, 209, 193, 213, 109, 248, 102, 177, 27, 132, 226, 77, 141, 128, 122,
-		185, 238, 188, 114, 248, 110, 130, 6, 97, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 100,
-		131, 212, 219, 190, 174, 5, 47, 105, 201, 11, 11, 210, 108, 207, 242, 164, 74, 218, 19, 135, 6,
-		10, 36, 24, 30, 64, 0, 128, 28, 160, 53, 222, 41, 101, 73, 44, 103, 26, 39, 165, 120, 194, 128,
-		67, 109, 151, 96, 42, 193, 47, 255, 23, 27, 247, 8, 125, 200, 53, 129, 69, 103, 64, 160, 49, 12,
-		64, 143, 74, 149, 161, 245, 68, 83, 89, 101, 212, 254, 81, 16, 170, 176, 33, 87, 6, 112, 34, 153,
-		6, 192, 98, 126, 188, 17, 199, 155];
-
-	let chunks = ::ipc::binary::deserialize::<ChunkSet>(&sample).unwrap();
-	let total_length = chunks.items.iter().fold(0usize, |total, item| total + item.len());
-
-	assert_eq!(1617, total_length);
-}
diff --git a/ipc/tests/build.rs b/ipc/tests/build.rs
deleted file mode 100644
index 7f68b16a892bb30e110906863186831add5e00de..0000000000000000000000000000000000000000
--- a/ipc/tests/build.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate ethcore_ipc_codegen as codegen;
-
-pub fn main() {
-	codegen::derive_ipc("nested.rs.in").unwrap();
-	codegen::derive_ipc("service.rs.in").unwrap();
-	codegen::derive_ipc("with_attrs.rs.in").unwrap();
-	codegen::derive_binary("binary.rs.in").unwrap();
-}
diff --git a/ipc/tests/examples.rs b/ipc/tests/examples.rs
deleted file mode 100644
index 8cd2d2ea5c6bceb0029253db654b6d57e1c9b4c3..0000000000000000000000000000000000000000
--- a/ipc/tests/examples.rs
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#[cfg(test)]
-mod tests {
-
-	use super::super::service::*;
-	use super::super::binary::*;
-	use super::super::nested::{DBClient, DBWriter};
-	use ipc::*;
-	use devtools::*;
-	use semver::Version;
-	use std::sync::Arc;
-
-	#[test]
-	fn call_service() {
-		// method_num = 0, f = 10 (method Service::commit)
-		let mut socket = TestSocket::new_ready(vec![
-			0, 16,
-			0, 0, 0, 0, 0, 0, 0, 0,
-			4, 0, 0, 0, 0, 0, 0, 0,
-			10, 0, 0, 0]);
-
-		let service = Arc::new(Service::new());
-		assert_eq!(0, *service.commits.read().unwrap());
-
-		service.dispatch(&mut socket);
-
-		assert_eq!(10, *service.commits.read().unwrap());
-	}
-
-	#[test]
-	fn call_service_client() {
-		let mut socket = TestSocket::new();
-		socket.read_buffer = vec![10, 0, 0, 0];
-		let service_client = ServiceClient::init(socket);
-
-		let result = service_client.commit(5);
-
-		assert_eq!(
-			vec![0, 16,
-				0, 0, 0, 0, 0, 0, 0, 0,
-				4, 0, 0, 0, 0, 0, 0, 0,
-				5, 0, 0, 0],
-			service_client.socket().write().unwrap().write_buffer.clone());
-		assert_eq!(10, result);
-	}
-
-	#[test]
-	fn call_service_client_optional() {
-		let mut socket = TestSocket::new();
-		socket.read_buffer = vec![10, 0, 0, 0];
-		let service_client = ServiceClient::init(socket);
-
-		let result = service_client.rollback(Some(5), 10);
-
-		assert_eq!(vec![
-			0, 17,
-			1, 0, 0, 0, 0, 0, 0, 0,
-			4, 0, 0, 0, 0, 0, 0, 0,
-			8, 0, 0, 0, 0, 0, 0, 0,
-			5, 0, 0, 0, 10, 0, 0, 0], service_client.socket().write().unwrap().write_buffer.clone());
-		assert_eq!(10, result);
-	}
-
-	#[test]
-	fn query_default_version() {
-		let ver = Service::protocol_version();
-		assert_eq!(ver, Version::parse("1.0.0").unwrap());
-		let ver = Service::api_version();
-		assert_eq!(ver, Version::parse("1.0.0").unwrap());
-	}
-
-	#[test]
-	fn call_service_client_handshake() {
-		let mut socket = TestSocket::new();
-		socket.read_buffer = vec![1];
-		let service_client = ServiceClient::init(socket);
-
-		let result = service_client.handshake();
-
-		assert!(result.is_ok());
-	}
-
-	#[test]
-	fn can_use_custom_params() {
-		let mut socket = TestSocket::new();
-		socket.read_buffer = vec![1];
-		let service_client = ServiceClient::init(socket);
-
-		let result = service_client.push_custom(CustomData { a: 3, b: 11});
-
-		assert_eq!(vec![
-			// message num..
-			0, 18,
-			// variable size length-s
-			1, 0, 0, 0, 0, 0, 0, 0,
-			16, 0, 0, 0, 0, 0, 0, 0,
-			// total length
-			16, 0, 0, 0, 0, 0, 0, 0,
-			// items
-			3, 0, 0, 0, 0, 0, 0, 0,
-			11, 0, 0, 0, 0, 0, 0, 0],
-			service_client.socket().write().unwrap().write_buffer.clone());
-		assert_eq!(true, result);
-	}
-
-	#[test]
-	fn can_invoke_generic_service() {
-		let mut socket = TestSocket::new();
-		socket.read_buffer = vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-		let db_client = DBClient::<u64, _>::init(socket);
-		let result = db_client.write(vec![1u8; 1]);
-		assert_eq!(vec![0, 16, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1],
-			db_client.socket().write().unwrap().write_buffer.clone());
-		assert!(result.is_ok());
-	}
-
-	#[test]
-	fn can_handshake_generic_service() {
-		let mut socket = TestSocket::new();
-		socket.read_buffer = vec![1];
-		let db_client = DBClient::<u64, _>::init(socket);
-
-		let result = db_client.handshake();
-
-		assert!(result.is_ok());
-	}
-
-	#[test]
-	fn can_serialize_dummy_structs() {
-		let mut socket = TestSocket::new();
-
-		let struct_ = DoubleRoot { x1: 0, x2: 100, x3: 100000};
-		let res = ::ipc::binary::serialize_into(&struct_, &mut socket);
-
-		assert!(res.is_ok());
-
-		let mut read_socket = TestSocket::new_ready(socket.write_buffer.clone());
-		let new_struct: DoubleRoot = ::ipc::binary::deserialize_from(&mut read_socket).unwrap();
-
-		assert_eq!(struct_, new_struct);
-	}
-
-	#[test]
-	fn can_call_void_method() {
-		let mut socket = TestSocket::new();
-		socket.read_buffer = vec![1];
-		let service_client = ServiceClient::init(socket);
-
-		service_client.void(99);
-
-		assert_eq!(vec![
-			0, 19,
-			0, 0, 0, 0, 0, 0, 0, 0,
-			8, 0, 0, 0, 0, 0, 0, 0,
-			99, 0, 0, 0, 0, 0, 0, 0],
-			service_client.socket().write().unwrap().write_buffer.clone());
-	}
-}
diff --git a/ipc/tests/nested.rs b/ipc/tests/nested.rs
deleted file mode 100644
index ab3f9fc1b9cd8595fc2ba9abdc7ee9a1528792de..0000000000000000000000000000000000000000
--- a/ipc/tests/nested.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues
-include!(concat!(env!("OUT_DIR"), "/nested.rs.in"));
diff --git a/ipc/tests/nested.rs.in b/ipc/tests/nested.rs.in
deleted file mode 100644
index e68bec0d764f84dea6dea385fee3f13c695ce5e1..0000000000000000000000000000000000000000
--- a/ipc/tests/nested.rs.in
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::sync::RwLock;
-use ipc::IpcConfig;
-
-pub struct DB<L: Sized> {
-	pub writes: RwLock<u64>,
-	pub reads: RwLock<u64>,
-	pub holdings: L,
-}
-
-pub trait DBWriter {
-	fn write(&self, data: Vec<u8>) -> Result<(), DBError>;
-	fn write_slice(&self, data: &[u8]) -> Result<(), DBError>;
-}
-
-impl IpcConfig for DBWriter {}
-
-#[binary]
-pub enum DBError { Write, Read }
-
-#[ipc]
-impl<L: Sized> DBWriter for DB<L> {
-	fn write(&self, data: Vec<u8>) -> Result<(), DBError> {
-		let mut writes = self.writes.write().unwrap();
-		*writes = *writes + data.len() as u64;
-		Ok(())
-	}
-
-	fn write_slice(&self, data: &[u8]) -> Result<(), DBError> {
-		let mut writes = self.writes.write().unwrap();
-		*writes = *writes + data.len() as u64;
-		Ok(())
-	}
-}
-
-#[ipc]
-trait DBNotify {
-	fn notify(&self, a: u64, b: u64) -> bool;
-}
-
-impl IpcConfig for DBNotify { }
diff --git a/ipc/tests/over_nano.rs b/ipc/tests/over_nano.rs
deleted file mode 100644
index 6f45dd24552a5c7117533bef4d0f6bcbb27e7bea..0000000000000000000000000000000000000000
--- a/ipc/tests/over_nano.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#[cfg(test)]
-mod tests {
-
-	use super::super::service::*;
-	use super::super::with_attrs::PrettyNamedClient;
-	use nanoipc;
-	use std::sync::Arc;
-	use std::io::Write;
-	use std::sync::atomic::{Ordering, AtomicBool};
-
-	fn dummy_write(addr: &str, buf: &[u8]) -> (::nanomsg::Socket, ::nanomsg::Endpoint) {
-		let mut socket = ::nanomsg::Socket::new(::nanomsg::Protocol::Pair).unwrap();
-		let endpoint = socket.connect(addr).unwrap();
-		socket.write(buf).unwrap();
-		(socket, endpoint)
-	}
-
-
-	fn init_worker(addr: &str) -> nanoipc::Worker<Service> {
-		let mut worker = nanoipc::Worker::<Service>::new(&Arc::new(Service::new()));
-		worker.add_duplex(addr).unwrap();
-		worker
-	}
-
-	#[test]
-	fn can_create_client() {
-		let client = nanoipc::init_duplex_client::<ServiceClient<_>>("ipc:///tmp/parity-nano-test10.ipc");
-		assert!(client.is_ok());
-	}
-
-	#[test]
-	fn can_create_renamed_client() {
-		let client = nanoipc::init_duplex_client::<PrettyNamedClient<_>>("ipc:///tmp/parity-nano-test10.ipc");
-		assert!(client.is_ok());
-	}
-
-	#[test]
-	fn can_call_handshake() {
-		let url = "ipc:///tmp/parity-test-nano-20.ipc";
-		let worker_should_exit = Arc::new(AtomicBool::new(false));
-		let worker_is_ready = Arc::new(AtomicBool::new(false));
-		let c_worker_should_exit = worker_should_exit.clone();
-		let c_worker_is_ready = worker_is_ready.clone();
-
-		::std::thread::spawn(move || {
-			let mut worker = init_worker(url);
-    		while !c_worker_should_exit.load(Ordering::Relaxed) {
-				worker.poll();
-				c_worker_is_ready.store(true, Ordering::Relaxed);
-			}
-		});
-
-		while !worker_is_ready.load(Ordering::Relaxed) { }
-		let client = nanoipc::init_duplex_client::<ServiceClient<_>>(url).unwrap();
-
-		let hs = client.handshake();
-
-		worker_should_exit.store(true, Ordering::Relaxed);
-		assert!(hs.is_ok());
-	}
-}
diff --git a/ipc/tests/run.rs b/ipc/tests/run.rs
deleted file mode 100644
index 607e20636734843459f8d997254ca3de4e6f5fdf..0000000000000000000000000000000000000000
--- a/ipc/tests/run.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(dead_code)]
-
-extern crate ethcore_ipc as ipc;
-extern crate ethcore_devtools as devtools;
-extern crate semver;
-extern crate nanomsg;
-extern crate ethcore_ipc_nano as nanoipc;
-extern crate ethcore_util as util;
-#[macro_use] extern crate log;
-
-pub mod service;
-mod examples;
-mod over_nano;
-mod nested;
-mod binary;
-mod with_attrs;
diff --git a/ipc/tests/service.rs b/ipc/tests/service.rs
deleted file mode 100644
index 56b9915db660ed1d75b219e5d19e000d8c23684a..0000000000000000000000000000000000000000
--- a/ipc/tests/service.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues
-include!(concat!(env!("OUT_DIR"), "/service.rs.in"));
diff --git a/ipc/tests/service.rs.in b/ipc/tests/service.rs.in
deleted file mode 100644
index 68d40efc402e8f4696c19fc0cc85e0cc6e441973..0000000000000000000000000000000000000000
--- a/ipc/tests/service.rs.in
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::sync::RwLock;
-use ipc::IpcConfig;
-
-pub struct Service {
-	pub commits: RwLock<usize>,
-	pub rollbacks: RwLock<usize>,
-}
-
-#[binary]
-pub struct CustomData {
-	pub a: u64,
-	pub b: u64,
-}
-
-#[ipc]
-impl Service {
-	fn commit(&self, f: u32) -> u32 {
-		let mut lock = self.commits.write().unwrap();
-		*lock = *lock + f as usize;
-		f
-	}
-
-	pub fn rollback(&self, a: Option<u32>, b: u32) -> i32 {
-		let a_0 = a.unwrap_or_else(|| 0);
-		let mut lock = self.rollbacks.write().unwrap();
-		*lock = *lock + a_0 as usize - b as usize;
-		(a_0 - b) as i32
-	}
-
-	pub fn push_custom(&self, data: CustomData) -> bool {
-		let mut clock = self.commits.write().unwrap();
-		let mut rlock = self.commits.write().unwrap();
-
-		*clock = data.a as usize;
-		*rlock = data.b as usize;
-
-		true
-	}
-
-	pub fn void(&self, a: u64) {
-	}
-}
-
-impl Service {
-	pub fn new() -> Service {
-		Service {
-			commits: RwLock::new(0usize),
-			rollbacks: RwLock::new(0usize),
-		}
-	}
-}
-
-impl ::ipc::IpcConfig for Service {}
diff --git a/ipc/tests/with_attrs.rs b/ipc/tests/with_attrs.rs
deleted file mode 100644
index 89f3575f74fb655fb84e6813461720a2ea1bb5b0..0000000000000000000000000000000000000000
--- a/ipc/tests/with_attrs.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues
-include!(concat!(env!("OUT_DIR"), "/with_attrs.rs.in"));
diff --git a/ipc/tests/with_attrs.rs.in b/ipc/tests/with_attrs.rs.in
deleted file mode 100644
index f18dedf9aa7ed5364f452673322cd17d53f40dc1..0000000000000000000000000000000000000000
--- a/ipc/tests/with_attrs.rs.in
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use ipc::IpcConfig;
-
-pub struct BadlyNamedService;
-
-#[ipc(client_ident="PrettyNamedClient")]
-impl BadlyNamedService {
-	fn is_zero(&self, x: u64) -> bool {
-		x == 0
-	}
-}
-
-impl IpcConfig for BadlyNamedService {}
diff --git a/ipfs/Cargo.toml b/ipfs/Cargo.toml
index 4b438efe7d182d3e8fcf745ce8bda23738ca568f..d8e3ef2a95bd9b4be9d51ff562a501a9fb1b40fb 100644
--- a/ipfs/Cargo.toml
+++ b/ipfs/Cargo.toml
@@ -1,15 +1,17 @@
 [package]
 description = "Parity IPFS-compatible API"
 name = "parity-ipfs-api"
-version = "1.8.0"
+version = "1.11.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 ethcore = { path = "../ethcore" }
-ethcore-util = { path = "../util" }
-jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
+ethcore-bytes = { path = "../util/bytes" }
+ethereum-types = "0.2"
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 rlp = { path = "../util/rlp" }
-mime = "0.2"
 cid = "0.2"
-multihash = "0.6"
+multihash = "0.7"
+unicase = "2.0"
diff --git a/ipfs/src/lib.rs b/ipfs/src/lib.rs
index 104c7db19ed9d4d3b74c9646a6bb768a1733f0cf..bb7d0c3897c923fb0518199de4cabb7f1796387f 100644
--- a/ipfs/src/lib.rs
+++ b/ipfs/src/lib.rs
@@ -14,41 +14,39 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-#[macro_use]
-extern crate mime;
 extern crate multihash;
 extern crate cid;
+extern crate unicase;
 
 extern crate rlp;
 extern crate ethcore;
-extern crate ethcore_util as util;
+extern crate ethcore_bytes as bytes;
+extern crate ethereum_types;
+extern crate jsonrpc_core as core;
 extern crate jsonrpc_http_server as http;
 
 pub mod error;
 mod route;
 
-use std::io::Write;
-use std::sync::Arc;
+use std::thread;
+use std::sync::{mpsc, Arc};
 use std::net::{SocketAddr, IpAddr};
+
+use core::futures::future::{self, FutureResult};
+use core::futures::{self, Future};
+use ethcore::client::BlockChainClient;
+use http::hyper::header::{self, Vary, ContentType};
+use http::hyper::{Method, StatusCode};
+use http::hyper::{self, server};
+use unicase::Ascii;
+
 use error::ServerError;
 use route::Out;
-use http::hyper::server::{Handler, Request, Response};
-use http::hyper::net::HttpStream;
-use http::hyper::header::{self, Vary, ContentLength, ContentType};
-use http::hyper::{Next, Encoder, Decoder, Method, RequestUri, StatusCode};
-use ethcore::client::BlockChainClient;
 
-pub use http::hyper::server::Listening;
 pub use http::{AccessControlAllowOrigin, Host, DomainsValidation};
 
 /// Request/response handler
 pub struct IpfsHandler {
-	/// Response to send out
-	out: Out,
-	/// How many bytes from the response have been written
-	out_progress: usize,
-	/// CORS response header
-	cors_header: Option<header::AccessControlAllowOrigin>,
 	/// Allowed CORS domains
 	cors_domains: Option<Vec<AccessControlAllowOrigin>>,
 	/// Hostnames allowed in the `Host` request header
@@ -64,124 +62,68 @@ impl IpfsHandler {
 
 	pub fn new(cors: DomainsValidation<AccessControlAllowOrigin>, hosts: DomainsValidation<Host>, client: Arc<BlockChainClient>) -> Self {
 		IpfsHandler {
-			out: Out::Bad("Invalid Request"),
-			out_progress: 0,
-			cors_header: None,
 			cors_domains: cors.into(),
 			allowed_hosts: hosts.into(),
 			client: client,
 		}
 	}
-}
-
-/// Implement Hyper's HTTP handler
-impl Handler<HttpStream> for IpfsHandler {
-	fn on_request(&mut self, req: Request<HttpStream>) -> Next {
+	pub fn on_request(&self, req: hyper::Request) -> (Option<header::AccessControlAllowOrigin>, Out) {
 		match *req.method() {
 			Method::Get | Method::Post => {},
-			_ => return Next::write()
+			_ => return (None, Out::Bad("Invalid Request")),
 		}
 
 		if !http::is_host_allowed(&req, &self.allowed_hosts) {
-			self.out = Out::Bad("Disallowed Host header");
-
-			return Next::write();
+			return (None, Out::Bad("Disallowed Host header"));
 		}
 
 		let cors_header = http::cors_header(&req, &self.cors_domains);
 		if cors_header == http::CorsHeader::Invalid {
-			self.out = Out::Bad("Disallowed Origin header");
-
-			return Next::write();
+			return (None, Out::Bad("Disallowed Origin header"));
 		}
-		self.cors_header = cors_header.into();
 
-		let (path, query) = match *req.uri() {
-			RequestUri::AbsolutePath { ref path, ref query } => (path, query.as_ref().map(AsRef::as_ref)),
-			_ => return Next::write(),
-		};
-
-		self.out = self.route(path, query);
-
-		Next::write()
+		let path = req.uri().path();
+		let query = req.uri().query();
+		return (cors_header.into(), self.route(path, query));
 	}
+}
 
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut Response) -> Next {
-		use Out::*;
-
-		match self.out {
-			OctetStream(ref bytes) => {
-				use mime::{Mime, TopLevel, SubLevel};
-
-				// `OctetStream` is not a valid variant, so need to construct
-				// the type manually.
-				let content_type = Mime(
-					TopLevel::Application,
-					SubLevel::Ext("octet-stream".into()),
-					vec![]
-				);
-
-				res.headers_mut().set(ContentLength(bytes.len() as u64));
-				res.headers_mut().set(ContentType(content_type));
-
+impl server::Service for IpfsHandler {
+	type Request = hyper::Request;
+	type Response = hyper::Response;
+	type Error = hyper::Error;
+	type Future = FutureResult<hyper::Response, hyper::Error>;
+
+	fn call(&self, request: Self::Request) -> Self::Future {
+		let (cors_header, out) = self.on_request(request);
+
+		let mut res = match out {
+			Out::OctetStream(bytes) => {
+				hyper::Response::new()
+					.with_status(StatusCode::Ok)
+					.with_header(ContentType::octet_stream())
+					.with_body(bytes)
 			},
-			NotFound(reason) => {
-				res.set_status(StatusCode::NotFound);
-
-				res.headers_mut().set(ContentLength(reason.len() as u64));
-				res.headers_mut().set(ContentType(mime!(Text/Plain)));
+			Out::NotFound(reason) => {
+				hyper::Response::new()
+					.with_status(StatusCode::NotFound)
+					.with_header(ContentType::plaintext())
+					.with_body(reason)
 			},
-			Bad(reason) => {
-				res.set_status(StatusCode::BadRequest);
-
-				res.headers_mut().set(ContentLength(reason.len() as u64));
-				res.headers_mut().set(ContentType(mime!(Text/Plain)));
+			Out::Bad(reason) => {
+				hyper::Response::new()
+					.with_status(StatusCode::BadRequest)
+					.with_header(ContentType::plaintext())
+					.with_body(reason)
 			}
-		}
+		};
 
-		if let Some(cors_header) = self.cors_header.take() {
+		if let Some(cors_header) = cors_header {
 			res.headers_mut().set(cors_header);
-			res.headers_mut().set(Vary::Items(vec!["Origin".into()]));
+			res.headers_mut().set(Vary::Items(vec![Ascii::new("Origin".into())]));
 		}
 
-		Next::write()
-	}
-
-	fn on_response_writable(&mut self, transport: &mut Encoder<HttpStream>) -> Next {
-		use Out::*;
-
-		// Get the data to write as a byte slice
-		let data = match self.out {
-			OctetStream(ref bytes) => &bytes,
-			NotFound(reason) | Bad(reason) => reason.as_bytes(),
-		};
-
-		write_chunk(transport, &mut self.out_progress, data)
-	}
-}
-
-/// Attempt to write entire `data` from current `progress`
-fn write_chunk<W: Write>(transport: &mut W, progress: &mut usize, data: &[u8]) -> Next {
-	// Skip any bytes that have already been written
-	let chunk = &data[*progress..];
-
-	// Write an get the amount of bytes written. End the connection in case of an error.
-	let written = match transport.write(chunk) {
-		Ok(written) => written,
-		Err(_) => return Next::end(),
-	};
-
-	*progress += written;
-
-	// Close the connection if the entire remaining chunk has been written
-	if written < chunk.len() {
-		Next::write()
-	} else {
-		Next::end()
+		future::ok(res)
 	}
 }
 
@@ -195,6 +137,19 @@ fn include_current_interface(mut hosts: Vec<Host>, interface: String, port: u16)
 	hosts
 }
 
+#[derive(Debug)]
+pub struct Listening {
+	close: Option<futures::sync::oneshot::Sender<()>>,
+	thread: Option<thread::JoinHandle<()>>,
+}
+
+impl Drop for Listening {
+	fn drop(&mut self) {
+		self.close.take().unwrap().send(()).unwrap();
+		let _ = self.thread.take().unwrap().join();
+	}
+}
+
 pub fn start_server(
 	port: u16,
 	interface: String,
@@ -208,67 +163,31 @@ pub fn start_server(
 	let hosts: Option<Vec<_>> = hosts.into();
 	let hosts: DomainsValidation<_> = hosts.map(move |hosts| include_current_interface(hosts, interface, port)).into();
 
-	Ok(
-		http::hyper::Server::http(&addr)?
-			.handle(move |_| IpfsHandler::new(cors.clone(), hosts.clone(), client.clone()))
-			.map(|(listening, srv)| {
-
-				::std::thread::spawn(move || {
-					srv.run();
-				});
-
-				listening
-			})?
-	)
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	#[test]
-	fn write_chunk_to_vec() {
-		let mut transport = Vec::new();
-		let mut progress = 0;
-
-		let _ = write_chunk(&mut transport, &mut progress, b"foobar");
-
-		assert_eq!(b"foobar".to_vec(), transport);
-		assert_eq!(6, progress);
-	}
-
-	#[test]
-	fn write_chunk_to_vec_part() {
-		let mut transport = Vec::new();
-		let mut progress = 3;
-
-		let _ = write_chunk(&mut transport, &mut progress, b"foobar");
-
-		assert_eq!(b"bar".to_vec(), transport);
-		assert_eq!(6, progress);
-	}
-
-	#[test]
-	fn write_chunk_to_array() {
-		use std::io::Cursor;
-
-		let mut buf = [0u8; 3];
-		let mut progress = 0;
-
-		{
-			let mut transport: Cursor<&mut [u8]> = Cursor::new(&mut buf);
-			let _ = write_chunk(&mut transport, &mut progress, b"foobar");
-		}
+	let (close, shutdown_signal) = futures::sync::oneshot::channel::<()>();
+	let (tx, rx) = mpsc::sync_channel(1);
+	let thread = thread::spawn(move || {
+		let send = |res| tx.send(res).expect("rx end is never dropped; qed");
+		let server = match server::Http::new().bind(&addr, move || {
+			Ok(IpfsHandler::new(cors.clone(), hosts.clone(), client.clone()))
+		}) {
+			Ok(server) => {
+				send(Ok(()));
+				server
+			},
+			Err(err) => {
+				send(Err(err));
+				return;
+			}
+		};
 
-		assert_eq!(*b"foo", buf);
-		assert_eq!(3, progress);
+		let _ = server.run_until(shutdown_signal.map_err(|_| {}));
+	});
 
-		{
-			let mut transport: Cursor<&mut [u8]> = Cursor::new(&mut buf);
-			let _ = write_chunk(&mut transport, &mut progress, b"foobar");
-		}
+	// Wait for server to start successfuly.
+	rx.recv().expect("tx end is never dropped; qed")?;
 
-		assert_eq!(*b"bar", buf);
-		assert_eq!(6, progress);
-	}
+	Ok(Listening {
+		close: close.into(),
+		thread: thread.into(),
+	})
 }
diff --git a/ipfs/src/route.rs b/ipfs/src/route.rs
index c72ca53c11b52e318c440844aaabc1d08d46e0ea..2beb4ccc3716d03c30ee715148074c83cfdba46b 100644
--- a/ipfs/src/route.rs
+++ b/ipfs/src/route.rs
@@ -19,7 +19,8 @@ use error::{Error, Result};
 use cid::{ToCid, Codec};
 
 use multihash::Hash;
-use util::{Bytes, H256};
+use ethereum_types::H256;
+use bytes::Bytes;
 use ethcore::client::{BlockId, TransactionId};
 
 type Reason = &'static str;
diff --git a/js/.babelrc b/js/.babelrc
deleted file mode 100644
index 127abf1436306a1dfabc24c81b7e8de3116348d4..0000000000000000000000000000000000000000
--- a/js/.babelrc
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "presets": [
-    "es2017", "es2016", "es2015",
-    "stage-0", "react"
-  ],
-  "plugins": [
-    "transform-decorators-legacy",
-    "transform-class-properties",
-    "transform-object-rest-spread",
-    "transform-es2015-modules-commonjs",
-    "transform-runtime",
-    "lodash",
-    "recharts"
-  ],
-  "retainLines": true,
-  "env": {
-    "production": {
-      "plugins": [
-        "transform-react-remove-prop-types"
-      ]
-    },
-    "development": {
-      "plugins": [
-        [ "react-intl", { "messagesDir": "./.build/i18n/" } ],
-        "react-hot-loader/babel"
-      ]
-    },
-    "test": {
-      "plugins": [
-        [ "babel-plugin-webpack-alias", { "config": "webpack/test.js" } ]
-      ]
-    }
-  }
-}
diff --git a/js/.codeclimate.yml b/js/.codeclimate.yml
deleted file mode 100644
index ca6414f5883de71b270a7f6de829837da85a2e4d..0000000000000000000000000000000000000000
--- a/js/.codeclimate.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-engines:
-  eslint:
-    enabled: true
-    channel: "eslint-2"
-
-ratings:
-   paths:
-   - "**.js"
diff --git a/js/.editorconfig b/js/.editorconfig
deleted file mode 100644
index 3c229b5dc188afe95adfd59e57d14cc599ead1eb..0000000000000000000000000000000000000000
--- a/js/.editorconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-root = true
-[*]
-indent_style=space
-indent_size=2
-tab_width=2
-end_of_line=lf
-charset=utf-8
-trim_trailing_whitespace=true
-max_line_length=120
-insert_final_newline=true
diff --git a/js/.eslintrc.json b/js/.eslintrc.json
deleted file mode 100644
index ffd4f03f3bfd4baa1e9f6c9b278a37d98307d266..0000000000000000000000000000000000000000
--- a/js/.eslintrc.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "extends": ["semistandard", "standard-react"],
-  "parser": "babel-eslint",
-  "env": {
-    "browser": true,
-    "mocha": true,
-    "node": true
-  },
-  "globals": {
-    "expect": true,
-    "FileReader": true
-  },
-  "rules": {
-    "curly": ["error", "all"],
-    "jsx-quotes": ["error", "prefer-single"],
-    "newline-after-var": ["error", "always"],
-    "no-alert": "error",
-    "no-debugger": "error",
-    "no-duplicate-imports": ["error", {
-      "includeExports": true
-    }],
-    "object-curly-spacing": ["error", "always"],
-    "object-property-newline": 0,
-    "one-var-declaration-per-line": ["error", "always"],
-    "padded-blocks": ["error", {
-      "blocks": "never",
-      "classes": "never",
-      "switches": "never"
-    }],
-    "react/jsx-closing-bracket-location": "error",
-    "react/jsx-curly-spacing": ["error", "always"]
-  }
-}
diff --git a/js/.gitignore b/js/.gitignore
deleted file mode 100644
index 555c4b4bbd451223f4c6402fed37641e70b8edf7..0000000000000000000000000000000000000000
--- a/js/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-node_modules
-npm-debug.log
-build
-docs
-.build
-.coverage
-.dist
-.happypack
-.npmjs
-.eslintcache
diff --git a/js/.istanbul.yml b/js/.istanbul.yml
deleted file mode 100644
index 4535167dbff60cc20d1452fde48a0e4aac5c841b..0000000000000000000000000000000000000000
--- a/js/.istanbul.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-instrumentation:
-  root: src
-  extensions:
-    - .js
-reporting:
-  dir: ./.coverage
diff --git a/js/.npmignore b/js/.npmignore
deleted file mode 100644
index 5093a29b859a5e7a79413a37ad397761ec16415a..0000000000000000000000000000000000000000
--- a/js/.npmignore
+++ /dev/null
@@ -1 +0,0 @@
-scripts/
diff --git a/js/.npmrc b/js/.npmrc
deleted file mode 100644
index 5dce03c654cc25b7ca3434856903175edb8e6ff3..0000000000000000000000000000000000000000
--- a/js/.npmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-save-prefix=''
-unsafe-perm=true
diff --git a/js/.stylelintrc.json b/js/.stylelintrc.json
deleted file mode 100644
index 9248483c6ed9b2b1f78d5890a7592d3090dd4343..0000000000000000000000000000000000000000
--- a/js/.stylelintrc.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "stylelint-config-standard",
-  "rules": {
-    "selector-pseudo-class-no-unknown": [
-      true, { "ignorePseudoClasses": ["global"] }
-    ]
-  }
-}
diff --git a/js/Cargo.precompiled.toml b/js/Cargo.precompiled.toml
deleted file mode 100644
index 87369005c7afec0718f5d5c55740b5456eb1d2d7..0000000000000000000000000000000000000000
--- a/js/Cargo.precompiled.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-description = "Parity built-in dapps."
-name = "parity-ui-precompiled"
-version = "1.4.0"
-license = "GPL-3.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[features]
-default = ["with-syntex", "use-precompiled-js"]
-use-precompiled-js = ["parity-dapps-glue/use-precompiled-js"]
-with-syntex = ["parity-dapps-glue/with-syntex"]
-
-[build-dependencies]
-parity-dapps-glue = "1.7"
-
-[dependencies]
-parity-dapps-glue = "1.7"
-
diff --git a/js/Cargo.toml b/js/Cargo.toml
deleted file mode 100644
index cf7ba957b865a836e8839397b66c0b6b21cff91e..0000000000000000000000000000000000000000
--- a/js/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-description = "Parity built-in dapps."
-name = "parity-ui-dev"
-version = "1.8.0"
-license = "GPL-3.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[features]
-default = ["with-syntex"]
-with-syntex = ["parity-dapps-glue/with-syntex"]
-
-[build-dependencies]
-parity-dapps-glue = "1.7"
-
-[dependencies]
-parity-dapps-glue = "1.7"
-
diff --git a/js/LICENSE b/js/LICENSE
deleted file mode 100644
index 9cecc1d4669ee8af2ca727a5d8cde10cd8b2d7cc..0000000000000000000000000000000000000000
--- a/js/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/js/README.md b/js/README.md
deleted file mode 100644
index 5ed26e0cfd3a385cb22e1c761c64e888cf179e2b..0000000000000000000000000000000000000000
--- a/js/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# parity.js
-
-JavaScript APIs and UIs for Parity.
-
-## development
-
-0. Install [Node](https://nodejs.org/) if not already available
-0. Change to the `js` directory inside `parity/`
-0. Install the npm modules via `npm install`
-0. Parity should be run with `parity --ui-no-validation [...options]` (where `options` can be `--chain testnet`)
-0. Start the development environment via `npm start`
-0. Connect to the [UI](http://localhost:3000)
diff --git a/js/assets/fonts/Roboto/LICENSE.txt b/js/assets/fonts/Roboto/LICENSE.txt
deleted file mode 100755
index 75b52484ea471f882c29e02693b4f02dba175b5e..0000000000000000000000000000000000000000
--- a/js/assets/fonts/Roboto/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/js/assets/fonts/Roboto/font.css b/js/assets/fonts/Roboto/font.css
deleted file mode 100644
index 75226e62185177b5dd8fa2102aeb36da94b69269..0000000000000000000000000000000000000000
--- a/js/assets/fonts/Roboto/font.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/* cyrillic-ext */
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Light'), local('Roboto-Light'), url(./v15/0eC6fl06luXEYWpBSJvXCIX0hVgzZQUfRDuZrPvH3D8.woff2) format('woff2');
-  unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F;
-}
-/* cyrillic */
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Light'), local('Roboto-Light'), url(./v15/Fl4y0QdOxyyTHEGMXX8kcYX0hVgzZQUfRDuZrPvH3D8.woff2) format('woff2');
-  unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-/* greek-ext */
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Light'), local('Roboto-Light'), url(./v15/-L14Jk06m6pUHB-5mXQQnYX0hVgzZQUfRDuZrPvH3D8.woff2) format('woff2');
-  unicode-range: U+1F00-1FFF;
-}
-/* greek */
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Light'), local('Roboto-Light'), url(./v15/I3S1wsgSg9YCurV6PUkTOYX0hVgzZQUfRDuZrPvH3D8.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
-}
-/* vietnamese */
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Light'), local('Roboto-Light'), url(./v15/NYDWBdD4gIq26G5XYbHsFIX0hVgzZQUfRDuZrPvH3D8.woff2) format('woff2');
-  unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Light'), local('Roboto-Light'), url(./v15/Pru33qjShpZSmG3z6VYwnYX0hVgzZQUfRDuZrPvH3D8.woff2) format('woff2');
-  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Light'), local('Roboto-Light'), url(./v15/Hgo13k-tfSpn0qi1SFdUfZBw1xU1rKptJj_0jans920.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Black.ttf b/js/assets/fonts/Roboto/ttf/Roboto-Black.ttf
deleted file mode 100755
index fbde625d403cc1fe3be06e15ae90c448c013eee5..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-Black.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-BlackItalic.ttf b/js/assets/fonts/Roboto/ttf/Roboto-BlackItalic.ttf
deleted file mode 100755
index 60f7782a2e4aba9bbc96d7634799eaa05512c927..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-BlackItalic.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Bold.ttf b/js/assets/fonts/Roboto/ttf/Roboto-Bold.ttf
deleted file mode 100755
index a355c27cde02b13da43c30ae060c5fb164b36b76..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-Bold.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-BoldItalic.ttf b/js/assets/fonts/Roboto/ttf/Roboto-BoldItalic.ttf
deleted file mode 100755
index 3c9a7a37361b6ae0571b33f09b6b55367e188cfe..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-BoldItalic.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Italic.ttf b/js/assets/fonts/Roboto/ttf/Roboto-Italic.ttf
deleted file mode 100755
index ff6046d5bfa7cd4498ad4a549d2d9028f6c73372..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-Italic.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Light.ttf b/js/assets/fonts/Roboto/ttf/Roboto-Light.ttf
deleted file mode 100755
index 94c6bcc67e09602f6d90ac10f449b5c05c2f7021..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-Light.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-LightItalic.ttf b/js/assets/fonts/Roboto/ttf/Roboto-LightItalic.ttf
deleted file mode 100755
index 04cc002302024c4e032d32319f0d40a32b54aada..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-LightItalic.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Medium.ttf b/js/assets/fonts/Roboto/ttf/Roboto-Medium.ttf
deleted file mode 100755
index 39c63d7461796094c0b8889ee8fe2706d344a99a..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-Medium.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-MediumItalic.ttf b/js/assets/fonts/Roboto/ttf/Roboto-MediumItalic.ttf
deleted file mode 100755
index dc743f0a66cf3741e90f712aba22a91197b7e59c..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-MediumItalic.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Regular.ttf b/js/assets/fonts/Roboto/ttf/Roboto-Regular.ttf
deleted file mode 100755
index 8c082c8de090865264d37594e396c4d6c0099fe4..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-Regular.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Thin.ttf b/js/assets/fonts/Roboto/ttf/Roboto-Thin.ttf
deleted file mode 100755
index d69555029c3e184189c6cf9961c9cb21205bda96..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-Thin.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/ttf/Roboto-ThinItalic.ttf b/js/assets/fonts/Roboto/ttf/Roboto-ThinItalic.ttf
deleted file mode 100755
index 07172ff666ad2d590e29324165b6c7b8e2be72ee..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/ttf/Roboto-ThinItalic.ttf and /dev/null differ
diff --git a/js/assets/fonts/Roboto/v15/-L14Jk06m6pUHB-5mXQQnYX0hVgzZQUfRDuZrPvH3D8.woff2 b/js/assets/fonts/Roboto/v15/-L14Jk06m6pUHB-5mXQQnYX0hVgzZQUfRDuZrPvH3D8.woff2
deleted file mode 100644
index 58fd4bcd24711c74b7c0ecf045cef580471f02f1..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/v15/-L14Jk06m6pUHB-5mXQQnYX0hVgzZQUfRDuZrPvH3D8.woff2 and /dev/null differ
diff --git a/js/assets/fonts/Roboto/v15/0eC6fl06luXEYWpBSJvXCIX0hVgzZQUfRDuZrPvH3D8.woff2 b/js/assets/fonts/Roboto/v15/0eC6fl06luXEYWpBSJvXCIX0hVgzZQUfRDuZrPvH3D8.woff2
deleted file mode 100644
index eacda321c795555dcaf46c05373bff8ddd7b11a8..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/v15/0eC6fl06luXEYWpBSJvXCIX0hVgzZQUfRDuZrPvH3D8.woff2 and /dev/null differ
diff --git a/js/assets/fonts/Roboto/v15/Fl4y0QdOxyyTHEGMXX8kcYX0hVgzZQUfRDuZrPvH3D8.woff2 b/js/assets/fonts/Roboto/v15/Fl4y0QdOxyyTHEGMXX8kcYX0hVgzZQUfRDuZrPvH3D8.woff2
deleted file mode 100644
index cc16b36c5848dbd0175f6fa5b4d57966f9b61a39..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/v15/Fl4y0QdOxyyTHEGMXX8kcYX0hVgzZQUfRDuZrPvH3D8.woff2 and /dev/null differ
diff --git a/js/assets/fonts/Roboto/v15/Hgo13k-tfSpn0qi1SFdUfZBw1xU1rKptJj_0jans920.woff2 b/js/assets/fonts/Roboto/v15/Hgo13k-tfSpn0qi1SFdUfZBw1xU1rKptJj_0jans920.woff2
deleted file mode 100644
index 4411cbc8754cf7ec78501ba711efabe15b936675..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/v15/Hgo13k-tfSpn0qi1SFdUfZBw1xU1rKptJj_0jans920.woff2 and /dev/null differ
diff --git a/js/assets/fonts/Roboto/v15/I3S1wsgSg9YCurV6PUkTOYX0hVgzZQUfRDuZrPvH3D8.woff2 b/js/assets/fonts/Roboto/v15/I3S1wsgSg9YCurV6PUkTOYX0hVgzZQUfRDuZrPvH3D8.woff2
deleted file mode 100644
index 0028bd81e9db90411095790d72c9568f1778bd66..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/v15/I3S1wsgSg9YCurV6PUkTOYX0hVgzZQUfRDuZrPvH3D8.woff2 and /dev/null differ
diff --git a/js/assets/fonts/Roboto/v15/NYDWBdD4gIq26G5XYbHsFIX0hVgzZQUfRDuZrPvH3D8.woff2 b/js/assets/fonts/Roboto/v15/NYDWBdD4gIq26G5XYbHsFIX0hVgzZQUfRDuZrPvH3D8.woff2
deleted file mode 100644
index a5cefc9c67e2f5e20dccc3408988f16cbd6336ea..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/v15/NYDWBdD4gIq26G5XYbHsFIX0hVgzZQUfRDuZrPvH3D8.woff2 and /dev/null differ
diff --git a/js/assets/fonts/Roboto/v15/Pru33qjShpZSmG3z6VYwnYX0hVgzZQUfRDuZrPvH3D8.woff2 b/js/assets/fonts/Roboto/v15/Pru33qjShpZSmG3z6VYwnYX0hVgzZQUfRDuZrPvH3D8.woff2
deleted file mode 100644
index feec9f1e6a187f63cbb826958bbc01c050b5b9c8..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/Roboto/v15/Pru33qjShpZSmG3z6VYwnYX0hVgzZQUfRDuZrPvH3D8.woff2 and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/LICENSE.txt b/js/assets/fonts/RobotoMono/LICENSE.txt
deleted file mode 100755
index 75b52484ea471f882c29e02693b4f02dba175b5e..0000000000000000000000000000000000000000
--- a/js/assets/fonts/RobotoMono/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/js/assets/fonts/RobotoMono/font.css b/js/assets/fonts/RobotoMono/font.css
deleted file mode 100644
index 6a86af729e4fb38974843b3c1309d9dd3eabda49..0000000000000000000000000000000000000000
--- a/js/assets/fonts/RobotoMono/font.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/* cyrillic-ext */
-@font-face {
-  font-family: 'Roboto Mono';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Mono Light'), local('RobotoMono-Light'), url(./v4/N4duVc9C58uwPiY8_59Fz0ExlR2MysFCBK8OirNw2kM.woff2) format('woff2');
-  unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F;
-}
-/* cyrillic */
-@font-face {
-  font-family: 'Roboto Mono';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Mono Light'), local('RobotoMono-Light'), url(./v4/N4duVc9C58uwPiY8_59Fz2dsm03krrxlabhmVQFB99s.woff2) format('woff2');
-  unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-/* greek-ext */
-@font-face {
-  font-family: 'Roboto Mono';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Mono Light'), local('RobotoMono-Light'), url(./v4/N4duVc9C58uwPiY8_59FzyJ0caWjaSBdV-xZbEgst_k.woff2) format('woff2');
-  unicode-range: U+1F00-1FFF;
-}
-/* greek */
-@font-face {
-  font-family: 'Roboto Mono';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Mono Light'), local('RobotoMono-Light'), url(./v4/N4duVc9C58uwPiY8_59Fz2MSHb9EAJwuSzGfuRChQzQ.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
-}
-/* vietnamese */
-@font-face {
-  font-family: 'Roboto Mono';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Mono Light'), local('RobotoMono-Light'), url(./v4/N4duVc9C58uwPiY8_59Fz-pRBTtN4E2_qSPBnw6AgMc.woff2) format('woff2');
-  unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
-  font-family: 'Roboto Mono';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Mono Light'), local('RobotoMono-Light'), url(./v4/N4duVc9C58uwPiY8_59Fz9Dnm4qiMZlH5rhYv_7LI2Y.woff2) format('woff2');
-  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: 'Roboto Mono';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Roboto Mono Light'), local('RobotoMono-Light'), url(./v4/N4duVc9C58uwPiY8_59Fz9TIkQYohD4BpHvJ3NvbHoA.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Bold.ttf b/js/assets/fonts/RobotoMono/ttf/RobotoMono-Bold.ttf
deleted file mode 100755
index 07ef607d50c2e0b48d251910fc75c7eb83a41b34..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Bold.ttf and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-BoldItalic.ttf b/js/assets/fonts/RobotoMono/ttf/RobotoMono-BoldItalic.ttf
deleted file mode 100755
index 1cca0bf456a3b6b42b3c92e81b4f4ebfa7d41f95..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/ttf/RobotoMono-BoldItalic.ttf and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Italic.ttf b/js/assets/fonts/RobotoMono/ttf/RobotoMono-Italic.ttf
deleted file mode 100755
index ef92c372cf47ec6ac92644bdc52ef131867037b3..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Italic.ttf and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Light.ttf b/js/assets/fonts/RobotoMono/ttf/RobotoMono-Light.ttf
deleted file mode 100755
index 63229b2805b102f626c06e29752fe28e1ce9471f..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Light.ttf and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-LightItalic.ttf b/js/assets/fonts/RobotoMono/ttf/RobotoMono-LightItalic.ttf
deleted file mode 100755
index f25bed56adba942784c953710324ef0bba7577fa..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/ttf/RobotoMono-LightItalic.ttf and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Medium.ttf b/js/assets/fonts/RobotoMono/ttf/RobotoMono-Medium.ttf
deleted file mode 100755
index 88ff0c15a56bd3275b7938d7e7bedc56f71ccb8f..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Medium.ttf and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-MediumItalic.ttf b/js/assets/fonts/RobotoMono/ttf/RobotoMono-MediumItalic.ttf
deleted file mode 100755
index 307efad8fcaa533cdc695b8f1aae696ba662431e..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/ttf/RobotoMono-MediumItalic.ttf and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Regular.ttf b/js/assets/fonts/RobotoMono/ttf/RobotoMono-Regular.ttf
deleted file mode 100755
index b158a334eb372a9ab2ecd4f2566e60d561e71a9f..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Regular.ttf and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Thin.ttf b/js/assets/fonts/RobotoMono/ttf/RobotoMono-Thin.ttf
deleted file mode 100755
index 309484d3239a307904ad64f95d87c38fb6d24b7b..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Thin.ttf and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-ThinItalic.ttf b/js/assets/fonts/RobotoMono/ttf/RobotoMono-ThinItalic.ttf
deleted file mode 100755
index e1bb9121ec6568d6b8772d121eafeaa5da0db928..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/ttf/RobotoMono-ThinItalic.ttf and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz-pRBTtN4E2_qSPBnw6AgMc.woff2 b/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz-pRBTtN4E2_qSPBnw6AgMc.woff2
deleted file mode 100644
index f1fdb93524e7a84934cc4f6d4b731006059705f1..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz-pRBTtN4E2_qSPBnw6AgMc.woff2 and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz0ExlR2MysFCBK8OirNw2kM.woff2 b/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz0ExlR2MysFCBK8OirNw2kM.woff2
deleted file mode 100644
index 501a4d77720aec360723de2ad0292c49eb10caf9..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz0ExlR2MysFCBK8OirNw2kM.woff2 and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2MSHb9EAJwuSzGfuRChQzQ.woff2 b/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2MSHb9EAJwuSzGfuRChQzQ.woff2
deleted file mode 100644
index 54484b1e3edcbac1fc80f13cfa4a03cb29c84bf1..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2MSHb9EAJwuSzGfuRChQzQ.woff2 and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2dsm03krrxlabhmVQFB99s.woff2 b/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2dsm03krrxlabhmVQFB99s.woff2
deleted file mode 100644
index c3f35ca2911c1db7e8afb85f28e23f7db0ae986c..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2dsm03krrxlabhmVQFB99s.woff2 and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9Dnm4qiMZlH5rhYv_7LI2Y.woff2 b/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9Dnm4qiMZlH5rhYv_7LI2Y.woff2
deleted file mode 100644
index 72a43ab3c0332b0539f230c402090fdbab079956..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9Dnm4qiMZlH5rhYv_7LI2Y.woff2 and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9TIkQYohD4BpHvJ3NvbHoA.woff2 b/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9TIkQYohD4BpHvJ3NvbHoA.woff2
deleted file mode 100644
index 62b3a15f698a5e966f5f6b4a5b6d5081e340c654..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9TIkQYohD4BpHvJ3NvbHoA.woff2 and /dev/null differ
diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59FzyJ0caWjaSBdV-xZbEgst_k.woff2 b/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59FzyJ0caWjaSBdV-xZbEgst_k.woff2
deleted file mode 100644
index 2d4fda538a22e1046718d4d158e7512eae086f69..0000000000000000000000000000000000000000
Binary files a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59FzyJ0caWjaSBdV-xZbEgst_k.woff2 and /dev/null differ
diff --git a/js/assets/images/certifications/unknown.svg b/js/assets/images/certifications/unknown.svg
deleted file mode 100644
index 1554bcc258119e20eba68341d5b81e26867aff93..0000000000000000000000000000000000000000
--- a/js/assets/images/certifications/unknown.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-	<circle fill="#4A90E2" cx="50" cy="50" r="50"/>
-	<path d="M20 45 L10 55 L35 85 L90 35 L80 25 L36 65 z" fill="#FFF"/>
-</svg>
diff --git a/js/assets/images/contracts/ethereum-black-64x64.png b/js/assets/images/contracts/ethereum-black-64x64.png
deleted file mode 100644
index 8e80e4ff134759b9cfbbc6f535791b93aac64a49..0000000000000000000000000000000000000000
Binary files a/js/assets/images/contracts/ethereum-black-64x64.png and /dev/null differ
diff --git a/js/assets/images/contracts/ethereum-black.png b/js/assets/images/contracts/ethereum-black.png
deleted file mode 100644
index d7bdc4c904012b2224306216f1d36c78eb29122a..0000000000000000000000000000000000000000
Binary files a/js/assets/images/contracts/ethereum-black.png and /dev/null differ
diff --git a/js/assets/images/contracts/ethereum-white.png b/js/assets/images/contracts/ethereum-white.png
deleted file mode 100644
index 0691d09aeaffaa78db1a267f3527a79072d71b73..0000000000000000000000000000000000000000
Binary files a/js/assets/images/contracts/ethereum-white.png and /dev/null differ
diff --git a/js/assets/images/contracts/unknown-64x64.png b/js/assets/images/contracts/unknown-64x64.png
deleted file mode 100644
index c2b39a80a372151cb98f216568917953a2b76727..0000000000000000000000000000000000000000
Binary files a/js/assets/images/contracts/unknown-64x64.png and /dev/null differ
diff --git a/js/assets/images/contracts/unknown.png b/js/assets/images/contracts/unknown.png
deleted file mode 100644
index 204ffa486372bfed2b04aca09f3f5eaa63115845..0000000000000000000000000000000000000000
Binary files a/js/assets/images/contracts/unknown.png and /dev/null differ
diff --git a/js/assets/images/dapps/blocks-350.jpg b/js/assets/images/dapps/blocks-350.jpg
deleted file mode 100644
index 524f9267c50777c162f3f2081933716329926907..0000000000000000000000000000000000000000
Binary files a/js/assets/images/dapps/blocks-350.jpg and /dev/null differ
diff --git a/js/assets/images/dapps/close.svg b/js/assets/images/dapps/close.svg
deleted file mode 100644
index d46acd872988a41bca4206aafb783e42d3d41d55..0000000000000000000000000000000000000000
--- a/js/assets/images/dapps/close.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" viewBox="0 0 512 512">
-<g>
-</g>
-  <path d="M295.516 216.494h154v78.992h-154v-78.992z" fill="#FFFFFF" />
-  <path d="M62.474 216.514h154.050v78.971h-154.050v-78.971z" fill="#FFFFFF" />
-  <path d="M216.525 295.465h79.001v154.050h-79.001v-154.050z" fill="#FFFFFF" />
-  <path d="M216.525 62.474h79.001v154.041h-79.001v-154.041z" fill="#FFFFFF" />
-  <path d="M216.525 216.514h79.001v78.971h-79.001v-78.971z" fill="#FFFFFF" />
-</svg>
diff --git a/js/assets/images/dapps/plus.svg b/js/assets/images/dapps/plus.svg
deleted file mode 100644
index 0fce86130ad3291c4930981069081102ffdd6657..0000000000000000000000000000000000000000
--- a/js/assets/images/dapps/plus.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" viewBox="0 0 512 512">
-<g>
-</g>
-	<path d="M295.516 216.494h154v78.992h-154v-78.992z" fill="#000000" />
-	<path d="M62.474 216.514h154.050v78.971h-154.050v-78.971z" fill="#000000" />
-	<path d="M216.525 295.465h79.001v154.050h-79.001v-154.050z" fill="#000000" />
-	<path d="M216.525 62.474h79.001v154.041h-79.001v-154.041z" fill="#000000" />
-	<path d="M216.525 216.514h79.001v78.971h-79.001v-78.971z" fill="#000000" />
-</svg>
diff --git a/js/assets/images/dapps/signature.png b/js/assets/images/dapps/signature.png
deleted file mode 100644
index 36b341a036642764e48a0a958077b2440f370cbe..0000000000000000000000000000000000000000
Binary files a/js/assets/images/dapps/signature.png and /dev/null differ
diff --git a/js/assets/images/parity-logo-black-no-text.ico b/js/assets/images/parity-logo-black-no-text.ico
deleted file mode 100644
index 8edfa3e6a9d902ee4b9f9ff54659a61a1b52a55c..0000000000000000000000000000000000000000
Binary files a/js/assets/images/parity-logo-black-no-text.ico and /dev/null differ
diff --git a/js/assets/images/parity-logo-black-no-text.png b/js/assets/images/parity-logo-black-no-text.png
deleted file mode 100644
index b2aea789e82472d574be6e74a9f3bb9dc92004df..0000000000000000000000000000000000000000
Binary files a/js/assets/images/parity-logo-black-no-text.png and /dev/null differ
diff --git a/js/assets/images/parity-logo-black-no-text.svg b/js/assets/images/parity-logo-black-no-text.svg
deleted file mode 100644
index a4f104838702e3a6c431cf3113f866101ddecafc..0000000000000000000000000000000000000000
--- a/js/assets/images/parity-logo-black-no-text.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="446.1044"
-   height="258.56647"
-   viewBox="0 0 446.1044 258.56647"
-   enable-background="new 0 0 599 472"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="parity-logo-black-no-text.svg"><metadata
-     id="metadata3481"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs3479" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview3477"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="0.5"
-     inkscape:cx="272.073"
-     inkscape:cy="58.797264"
-     inkscape:window-x="20"
-     inkscape:window-y="42"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="m 445.076,88.583194 c 2.758,24.580996 0.085,41.594996 -9.431,59.368996 -14.124,26.375 -35.951,43.904 -64.072,53.619 -19.164,6.621 -38.881,7.435 -58.847,4.726 -17.481,-2.375 -34.171,-7.518 -50.403,-14.276 -0.498,-0.207 -0.934,-0.569 -1.399,-0.861 0.553,0.102 1.131,0.13 1.658,0.314 15.869,5.581 32.085,9.65 48.894,11.057 22.342,1.87 43.878,-0.855 63.853,-11.815 12.879,-7.064 23.693,-16.488 32.475,-28.32 9.335,-12.588 15.155,-26.567 17.114,-42.088 2.766,-21.789996 -3.615,-40.960996 -17.278,-57.818996 -12.042,-14.857 -27.016,-25.515 -45.747,-30.25 -13.109,-3.313 -25.863,-2.27 -38.048,3.993 -5.376,2.764 -11.137,4.87 -16.252,8.039 -11.578,7.184 -20.912,16.979 -29.243,27.612 -8.093,10.323 -15.713,21.02 -23.312,31.718996 -5.111,7.205 -9.932,14.623 -14.695,22.064 -14.297,22.335 -28.348,44.819 -42.791,67.059 -12.012,18.504 -24.866,36.422 -39.294,53.15 -3.297,3.823 -6.858,7.419 -10.323,11.092 -0.284,0.303 -0.768,0.413 -1.164,0.618 0.18,-0.372 0.296,-0.78 0.527,-1.111 3.705,-5.32 7.593,-10.52 11.101,-15.961 12.652,-19.634 23.312,-40.375 33.675,-61.275 11.782,-23.759 23.403,-47.594 35.301,-71.296 10.511,-20.933996 21.896,-41.393996 35.328,-60.611996 9.289,-13.287 19.608,-25.682 32.803,-35.415 15.046,-11.10199986 31.49,-12.07299986 50.114,-11.89799986 23.358,0.215 40.052,8.64399996 55.289,20.03999986 14.101,11.029 21.479,19.407 32.723,37.906 5.807,9.563 10.563,22.785 11.444,30.62 z"
-     id="path3469"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /><path
-     d="m 105.138,224.44619 c -6.696,3.271 -13.862,5.131 -21.242,6.22 -15.885,2.35 -30.524,-0.357 -43.006,-11.177 -0.802,-0.696 -1.424,-1.589 -2.128,-2.391 0.85,0.616 1.717,1.207 2.544,1.848 10.317,7.949 22.148,10.616 34.907,10.028 11.801,-0.537 20.574,-3.503 31.22,-8.309 1.604,-0.723 5.122,-3.231 6.25,-4.62 9.183,-11.342 17.655,-22.783 24.918,-35.422 11.151,-19.417 22.103,-38.946 33.061,-58.467 10.799,-19.233 21.559,-38.490996 34.136,-56.642996 9.575,-13.811 20.079,-26.84 33.292,-37.421 9.45,-7.573 19.894,-13.174 31.854,-15.724 5.84,-1.247 11.629,-2.7329999 17.454,-4.0899999 0.341,-0.081 0.715,0.014 1.075,0.027 -0.278,0.181 -0.537,0.396 -0.837,0.538 -19.58,9.3609999 -34.218,24.4719999 -47.659,40.9739999 -10.808,13.277 -20.355,27.457 -29.294,42.019 -9.329,15.193996 -18.147,30.707996 -27.193,46.077996 -6.06,10.298 -11.988,20.676 -18.239,30.856 -6.477,10.538 -13.035,21.043 -19.989,31.272 -9.524,14.01 -19.969,27.3 -32.613,38.731 -10.294,9.313 -22.644,16.201 -34.545,18.714 -11.392,2.263 -23.047,0.876 -34.415,-3.306 -17.555,-6.459 -31.736,-17.446 -43.035,-32.267 -0.306,-0.4 -0.604,-0.813 -0.862,-1.241 -0.288,-0.495 -0.527,-1.012 -0.792,-1.521 0.411,0.378 0.856,0.719 1.218,1.129 10.842,12.341 23.84,21.479 39.555,26.548 20.167,6.502 37.77,1.897 54.265,-11.059 7.343,-5.768 10.1,-11.324 10.1,-11.324 z"
-     id="path3471"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /><path
-     d="m 393.16,88.254194 c 2.925,13.411996 0.414,26.197996 -4.771,38.658996 -0.182,0.441 -0.544,0.805 -0.822,1.202 -0.061,-0.383 -0.206,-0.775 -0.173,-1.147 2.067,-23.399 -8.303,-40.934996 -26.038,-54.907996 -10.861,-8.562 -23.228,-13.804 -36.88,-16.02 -0.697,-0.115 -1.356,-0.452 -2.033,-0.687 0.561,-0.472 1.056,-1.066 1.686,-1.398 16.729,-8.902 32.991,-7.607 48.378,2.991 10.957,7.546 17.896,18.097 20.653,31.308 z"
-     id="path3473"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /><path
-     d="m 333.73,242.84619 c -15.294,1.323 -30.865,-1.065 -46.192,-5.421 -17.569,-4.995 -34.205,-12.281 -50.317,-20.808 -0.446,-0.237 -0.793,-0.668 -1.182,-1.009 0.466,0.162 0.952,0.278 1.398,0.496 16.801,8.124 34.107,14.846 52.369,18.926 15.489,3.451 31.118,5.016 46.87,2.505 16.41,-2.615 31.281,-9.049 44.559,-19.121 6.878,-5.217 13.045,-11.14 18.482,-17.836 0.328,-0.398 0.83,-0.662 1.252,-0.991 -0.203,0.453 -0.368,0.924 -0.61,1.344 -6.534,11.047 -15.14,20.181 -25.722,27.397 -12.131,8.284 -25.608,12.958 -40.907,14.518 z"
-     id="path3475"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /></svg>
\ No newline at end of file
diff --git a/js/assets/images/parity-logo-black.svg b/js/assets/images/parity-logo-black.svg
deleted file mode 100644
index f2b2fa72633bd2de0d810e99bdc2365ebcdf4882..0000000000000000000000000000000000000000
--- a/js/assets/images/parity-logo-black.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="599px" height="472px" viewBox="0 0 599 472" enable-background="new 0 0 599 472" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M472.503,124.814c2.758,24.581,0.085,41.595-9.431,59.369
-	c-14.124,26.375-35.951,43.904-64.072,53.619c-19.164,6.621-38.881,7.435-58.847,4.726c-17.481-2.375-34.171-7.518-50.403-14.276
-	c-0.498-0.207-0.934-0.569-1.399-0.861c0.553,0.102,1.131,0.13,1.658,0.314c15.869,5.581,32.085,9.65,48.894,11.057
-	c22.342,1.87,43.878-0.855,63.853-11.815c12.879-7.064,23.693-16.488,32.475-28.32c9.335-12.588,15.155-26.567,17.114-42.088
-	c2.766-21.79-3.615-40.961-17.278-57.819c-12.042-14.857-27.016-25.515-45.747-30.25c-13.109-3.313-25.863-2.27-38.048,3.993
-	c-5.376,2.764-11.137,4.87-16.252,8.039c-11.578,7.184-20.912,16.979-29.243,27.612c-8.093,10.323-15.713,21.02-23.312,31.719
-	c-5.111,7.205-9.932,14.623-14.695,22.064c-14.297,22.335-28.348,44.819-42.791,67.059c-12.012,18.504-24.866,36.422-39.294,53.15
-	c-3.297,3.823-6.858,7.419-10.323,11.092c-0.284,0.303-0.768,0.413-1.164,0.618c0.18-0.372,0.296-0.78,0.527-1.111
-	c3.705-5.32,7.593-10.52,11.101-15.961c12.652-19.634,23.312-40.375,33.675-61.275c11.782-23.759,23.403-47.594,35.301-71.296
-	c10.511-20.934,21.896-41.394,35.328-60.612c9.289-13.287,19.608-25.682,32.803-35.415c15.046-11.102,31.49-12.073,50.114-11.898
-	c23.358,0.215,40.052,8.644,55.289,20.04c14.101,11.029,21.479,19.407,32.723,37.906
-	C466.866,103.757,471.622,116.979,472.503,124.814z"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M132.565,260.677c-6.696,3.271-13.862,5.131-21.242,6.22
-	c-15.885,2.35-30.524-0.357-43.006-11.177c-0.802-0.696-1.424-1.589-2.128-2.391c0.85,0.616,1.717,1.207,2.544,1.848
-	c10.317,7.949,22.148,10.616,34.907,10.028c11.801-0.537,20.574-3.503,31.22-8.309c1.604-0.723,5.122-3.231,6.25-4.62
-	c9.183-11.342,17.655-22.783,24.918-35.422c11.151-19.417,22.103-38.946,33.061-58.467c10.799-19.233,21.559-38.491,34.136-56.643
-	c9.575-13.811,20.079-26.84,33.292-37.421c9.45-7.573,19.894-13.174,31.854-15.724c5.84-1.247,11.629-2.733,17.454-4.09
-	c0.341-0.081,0.715,0.014,1.075,0.027c-0.278,0.181-0.537,0.396-0.837,0.538c-19.58,9.361-34.218,24.472-47.659,40.974
-	c-10.808,13.277-20.355,27.457-29.294,42.019c-9.329,15.194-18.147,30.708-27.193,46.078c-6.06,10.298-11.988,20.676-18.239,30.856
-	c-6.477,10.538-13.035,21.043-19.989,31.272c-9.524,14.01-19.969,27.3-32.613,38.731c-10.294,9.313-22.644,16.201-34.545,18.714
-	c-11.392,2.263-23.047,0.876-34.415-3.306c-17.555-6.459-31.736-17.446-43.035-32.267c-0.306-0.4-0.604-0.813-0.862-1.241
-	c-0.288-0.495-0.527-1.012-0.792-1.521c0.411,0.378,0.856,0.719,1.218,1.129c10.842,12.341,23.84,21.479,39.555,26.548
-	c20.167,6.502,37.77,1.897,54.265-11.059C129.808,266.233,132.565,260.677,132.565,260.677z"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M420.587,124.485c2.925,13.412,0.414,26.198-4.771,38.659
-	c-0.182,0.441-0.544,0.805-0.822,1.202c-0.061-0.383-0.206-0.775-0.173-1.147c2.067-23.399-8.303-40.935-26.038-54.908
-	c-10.861-8.562-23.228-13.804-36.88-16.02c-0.697-0.115-1.356-0.452-2.033-0.687c0.561-0.472,1.056-1.066,1.686-1.398
-	c16.729-8.902,32.991-7.607,48.378,2.991C410.891,100.723,417.83,111.274,420.587,124.485z"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M361.157,279.077c-15.294,1.323-30.865-1.065-46.192-5.421
-	c-17.569-4.995-34.205-12.281-50.317-20.808c-0.446-0.237-0.793-0.668-1.182-1.009c0.466,0.162,0.952,0.278,1.398,0.496
-	c16.801,8.124,34.107,14.846,52.369,18.926c15.489,3.451,31.118,5.016,46.87,2.505c16.41-2.615,31.281-9.049,44.559-19.121
-	c6.878-5.217,13.045-11.14,18.482-17.836c0.328-0.398,0.83-0.662,1.252-0.991c-0.203,0.453-0.368,0.924-0.61,1.344
-	c-6.534,11.047-15.14,20.181-25.722,27.397C389.933,272.843,376.456,277.517,361.157,279.077z"/>
-<g>
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M163.555,443.355c-1.854,0-4.338,0.024-6.14,0.024
-		c-0.759,0-0.883-0.125-0.883-0.892c0-0.614,0.015-1.113,0.015-1.73c0-25.897,0-52.348,0-78.244c1.14,0,3.522-0.024,5.606-0.024
-		c1.408,0,1.413,1.108,1.441,2.145c0.036,1.226,0.109,2.448,0.167,3.676c0.823-0.895,1.624-1.812,2.474-2.678
-		c2.747-2.803,6.056-4.375,10.02-4.401c3.944-0.025,7.892-0.066,11.836,0.018c9.824,0.21,16.31,6.568,16.463,16.351
-		c0.145,9.141,0.133,18.285,0.005,27.429c-0.137,9.914-6.669,16.337-16.633,16.467c-7.314,0.094-14.63,0.018-21.944,0.037
-		c-2.347,0.006-2.372,0.032-2.38,2.354L163.555,443.355z M197.438,391.444h-0.01c0-4.131,0.113-8.267-0.025-12.395
-		c-0.224-6.682-3.787-10.315-10.407-10.609c-3.547-0.16-7.115-0.169-10.663,0c-7.71,0.365-12.46,4.891-12.638,12.544
-		c-0.247,10.563-0.071,21.138-0.116,31.707c-0.003,1.22,0.383,1.719,1.649,1.683c2.399-0.068,4.804-0.015,7.206-0.018
-		c4.709,0,9.419,0.085,14.123-0.022c6.92-0.16,10.592-3.868,10.872-10.782c0.025-0.672,0.01-1.343,0.01-2.018
-		C197.438,398.171,197.438,394.808,197.438,391.444z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M398.145,442.797c-1.209-1.208-1.22-2.509-1.22-4.547
-		c0-1.19,0.758-1.93,2.052-1.933c0.576-0.003,1.156,0.002,1.731-0.031c3.036-0.167,5.565-1.381,7.547-3.695
-		c2.608-3.043,4.278-6.616,5.56-10.354c0.291-0.852-0.098-2.062-0.461-2.994c-4.045-10.383-8.151-20.737-12.234-31.103
-		c-2.927-7.418-5.844-14.835-8.765-22.252c-0.178-0.447-0.389-0.884-0.521-1.342c-0.421-1.462-0.103-1.961,1.343-2.151
-		c0.284-0.039,0.578-0.012,0.866-0.021c4.704-0.162,4.709-0.164,6.454,4.309c5.351,13.686,10.696,27.373,16.043,41.061
-		c0.212,0.536,0.397,1.084,0.635,1.608c0.27,0.591,0.581,1.162,0.877,1.741c0.379-0.623,0.853-1.21,1.116-1.879
-		c1.193-3.037,2.331-6.098,3.484-9.155c4.274-11.317,8.54-22.641,12.834-33.953c0.499-1.312,0.687-3.534,2.327-3.534
-		c1.709,0,3.536-0.014,5.345-0.014c0.848,0,0.833,0.972,0.833,1.494c0,0.421-0.221,0.916-0.395,1.362
-		c-7.828,20.241-15.62,40.499-23.548,60.7c-1.185,3.014-2.918,5.835-4.587,8.632c-2.562,4.291-6.279,7.338-11.113,8.61
-		C400.467,444.378,398.602,443.254,398.145,442.797z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M334.455,340.54c1.253,1.932,0.604,4.066,0.594,6.117
-		c-0.006,1.009-0.817,1.457-1.776,1.475c-1.522,0.028-3.046,0.028-4.568,0c-0.959-0.018-1.772-0.466-1.775-1.475
-		c-0.01-2.051-0.658-4.186,0.594-6.117C329.833,340.54,332.145,340.54,334.455,340.54z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M266.991,397.813c0,6.639,0.006,13.278-0.002,19.918
-		c-0.004,3.707-0.155,3.843-3.946,3.794c-0.287-0.004-0.578,0.012-0.866-0.008c-1.827-0.129-2.211-0.465-2.335-2.205
-		c-0.089-1.241-0.089-2.486-0.129-3.729c-0.825,0.88-1.636,1.778-2.48,2.642c-2.821,2.881-6.214,4.459-10.286,4.451
-		c-3.563-0.002-7.124,0.041-10.683-0.018c-9.792-0.165-16.153-6.573-16.26-16.436c-0.021-2.1,0.057-4.242,0.433-6.301
-		c1.524-8.328,7.822-12.42,15.293-12.644c6.923-0.213,13.854-0.06,20.782-0.068c0.674-0.003,1.348-0.025,2.021-0.007
-		c0.796,0.02,1.318-0.248,1.275-1.135c-0.168-3.45-0.068-6.94-0.592-10.333c-0.562-3.646-3.051-5.94-6.648-6.78
-		c-4.363-1.02-8.826-0.847-13.203-0.297c-5.176,0.651-7.679,3.432-8.587,8.657c-0.688,3.955-0.688,3.955-4.701,3.774
-		c-2.256-0.104-2.652-0.445-2.614-2.789c0.143-9.463,5.187-16.407,16.065-17.023c3.644-0.205,7.311-0.109,10.966-0.032
-		c9.804,0.205,16.27,6.584,16.454,16.361c0.127,6.734,0.024,13.472,0.024,20.207H266.991z M247.759,394.382c0,0,0,0.023,0,0.035
-		c-3.658,0-7.325-0.157-10.972,0.036c-5.828,0.309-9.347,4.026-9.617,9.832c-0.278,5.983,2.694,10.264,8.319,10.955
-		c4.945,0.609,10.004,0.773,14.942-0.307c4.769-1.044,7.935-4.068,8.77-8.872c0.591-3.379,0.421-6.888,0.62-10.338
-		c0.072-1.276-0.712-1.355-1.665-1.351C254.69,394.39,251.223,394.382,247.759,394.382z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M359.751,388.471c0-5.486-0.003-10.972,0.003-16.459
-		c0.003-2.656,0.037-2.469-2.565-2.473c-2.215-0.003-4.43,0.048-6.641-0.022c-1.827-0.057-2.271-0.451-2.324-2.198
-		c-0.16-5.277,0.016-4.997,4.506-4.948c1.731,0.017,3.468-0.066,5.196,0.021c1.353,0.068,1.894-0.367,1.85-1.787
-		c-0.088-2.885-0.037-5.775-0.02-8.662c0.018-3.273,0.174-3.419,3.441-3.432c0.48-0.003,0.965-0.027,1.442,0.011
-		c1.78,0.135,2.213,0.488,2.254,2.275c0.071,3.176,0.001,6.354,0.035,9.53c0.02,1.989,0.054,2.018,2.117,2.037
-		c2.885,0.028,5.773-0.016,8.661,0.015c2.731,0.028,3.006,0.314,3.074,2.93c0.107,4.09-0.021,4.225-4.089,4.23
-		c-2.407,0.003-4.812-0.003-7.222,0.002c-2.599,0.002-2.556-0.188-2.553,2.48c0.004,9.144,0,18.289,0.004,27.436
-		c0,1.635-0.068,3.278,0.061,4.905c0.491,6.126,3.794,9.413,9.925,9.926c1.052,0.088,2.115,0.064,3.175,0.068
-		c4.162,0.015,4.335,0.192,4.165,4.444c-0.095,2.331-0.387,2.687-2.71,2.707c-2.5,0.02-5.037,0.168-7.496-0.188
-		c-8.999-1.311-14.115-7.236-14.259-16.388c-0.087-5.486-0.014-10.974-0.014-16.461H359.751z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M286.393,391.917c0-8.468,0-16.932,0.001-25.396c0-0.771-0.055-1.551,0.041-2.308
-		c0.211-1.634,0.661-1.843,3.55-1.843c2.883,0.002,3.344,0.209,3.527,1.857c0.115,1.046,0.017,2.114,0.065,3.172
-		c0.014,0.309,0.202,0.605,0.31,0.909c0.201-0.188,0.408-0.367,0.598-0.562c1.337-1.364,2.528-2.929,4.045-4.051
-		c2.278-1.684,4.941-2.525,7.838-2.482c2.212,0.034,4.425-0.018,6.64,0.01c2.732,0.033,3.009,0.313,3.078,2.92
-		c0.109,4.096-0.022,4.249-4.075,4.249c-2.624,0-5.029-0.102-7.483,0.266c-6.56,0.98-10.189,4.94-10.854,11.543
-		c-0.126,1.239-0.108,2.498-0.109,3.75c-0.008,11.06-0.006,22.123-0.006,33.186c0,0.771,0.045,1.546-0.025,2.308
-		c-0.18,1.903-0.616,2.121-3.902,2.081c-2.676-0.033-3.059-0.281-3.219-2.193c-0.057-0.669-0.02-1.346-0.02-2.021
-		C286.393,408.848,286.393,400.381,286.393,391.917z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M334.571,391.899c0,8.742,0.01,17.484-0.004,26.226
-		c-0.005,3.236-0.184,3.389-3.459,3.397c-0.673,0.003-1.347,0.015-2.016-0.047c-0.999-0.089-1.565-0.678-1.646-1.673
-		c-0.054-0.669-0.041-1.343-0.041-2.015c-0.001-17.194-0.001-34.389-0.001-51.584c0-0.48-0.012-0.961,0.01-1.439
-		c0.016-0.383-0.044-0.825,0.123-1.137c1.173-2.185,3.239-1.004,4.919-1.212c1.22-0.15,2.021,0.507,2.083,1.821
-		c0.037,0.767,0.031,1.536,0.031,2.304C334.572,374.994,334.572,383.447,334.571,391.899z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="none" d="M197.438,391.444c0,3.363,0,6.727,0,10.09
-		c0,0.675,0.016,1.346-0.01,2.018c-0.279,6.914-3.952,10.622-10.872,10.782c-4.704,0.107-9.413,0.022-14.123,0.022
-		c-2.402,0.003-4.807-0.051-7.206,0.018c-1.267,0.036-1.652-0.463-1.649-1.683c0.045-10.569-0.13-21.144,0.116-31.707
-		c0.178-7.653,4.928-12.179,12.638-12.544c3.548-0.169,7.116-0.16,10.663,0c6.62,0.294,10.183,3.928,10.407,10.609
-		c0.139,4.128,0.025,8.264,0.025,12.395H197.438z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="none" d="M247.759,394.382c3.464,0,6.931,0.008,10.397-0.009
-		c0.953-0.005,1.737,0.074,1.665,1.351c-0.199,3.45-0.029,6.959-0.62,10.338c-0.835,4.804-4.001,7.828-8.77,8.872
-		c-4.938,1.08-9.997,0.916-14.942,0.307c-5.625-0.691-8.598-4.972-8.319-10.955c0.271-5.806,3.79-9.523,9.617-9.832
-		c3.647-0.193,7.313-0.036,10.972-0.036C247.759,394.405,247.759,394.394,247.759,394.382z"/>
-</g>
-</svg>
diff --git a/js/assets/images/parity-logo-white-no-text.svg b/js/assets/images/parity-logo-white-no-text.svg
deleted file mode 100644
index 213ab1db441d60a7bb04e4a84fef845c97020eec..0000000000000000000000000000000000000000
--- a/js/assets/images/parity-logo-white-no-text.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="446.1044"
-   height="258.56647"
-   viewBox="0 0 446.1044 258.56647"
-   enable-background="new 0 0 599 472"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="parity-logo-white-no-text.svg"
-   style="fill:#ffffff"><metadata
-     id="metadata3442"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs3440" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1363"
-     inkscape:window-height="856"
-     id="namedview3438"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="1.375"
-     inkscape:cx="272.073"
-     inkscape:cy="58.797248"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="m 445.076,88.583194 c 2.758,24.580996 0.085,41.594996 -9.431,59.368996 -14.124,26.375 -35.951,43.904 -64.072,53.619 -19.164,6.621 -38.881,7.435 -58.847,4.726 -17.481,-2.375 -34.171,-7.518 -50.403,-14.276 -0.498,-0.207 -0.934,-0.569 -1.399,-0.861 0.553,0.102 1.131,0.13 1.658,0.314 15.869,5.581 32.085,9.65 48.894,11.057 22.342,1.87 43.878,-0.855 63.853,-11.815 12.879,-7.064 23.693,-16.488 32.475,-28.32 9.335,-12.588 15.155,-26.567 17.114,-42.088 2.766,-21.789996 -3.615,-40.960996 -17.278,-57.818996 -12.042,-14.857 -27.016,-25.515 -45.747,-30.25 -13.109,-3.313 -25.863,-2.27 -38.048,3.993 -5.376,2.764 -11.137,4.87 -16.252,8.039 -11.578,7.184 -20.912,16.979 -29.243,27.612 -8.093,10.323 -15.713,21.02 -23.312,31.718996 -5.111,7.205 -9.932,14.623 -14.695,22.064 -14.297,22.335 -28.348,44.819 -42.791,67.059 -12.012,18.504 -24.866,36.422 -39.294,53.15 -3.297,3.823 -6.858,7.419 -10.323,11.092 -0.284,0.303 -0.768,0.413 -1.164,0.618 0.18,-0.372 0.296,-0.78 0.527,-1.111 3.705,-5.32 7.593,-10.52 11.101,-15.961 12.652,-19.634 23.312,-40.375 33.675,-61.275 11.782,-23.759 23.403,-47.594 35.301,-71.296 10.511,-20.933996 21.896,-41.393996 35.328,-60.611996 9.289,-13.287 19.608,-25.682 32.803,-35.415 15.046,-11.10199986 31.49,-12.07299986 50.114,-11.89799986 23.358,0.215 40.052,8.64399996 55.289,20.03999986 14.101,11.029 21.479,19.407 32.723,37.906 5.807,9.563 10.563,22.785 11.444,30.62 z"
-     id="path3410"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /><path
-     d="m 105.138,224.44619 c -6.696,3.271 -13.862,5.131 -21.242,6.22 -15.885,2.35 -30.524,-0.357 -43.006,-11.177 -0.802,-0.696 -1.424,-1.589 -2.128,-2.391 0.85,0.616 1.717,1.207 2.544,1.848 10.317,7.949 22.148,10.616 34.907,10.028 11.801,-0.537 20.574,-3.503 31.22,-8.309 1.604,-0.723 5.122,-3.231 6.25,-4.62 9.183,-11.342 17.655,-22.783 24.918,-35.422 11.151,-19.417 22.103,-38.946 33.061,-58.467 10.799,-19.233 21.559,-38.490996 34.136,-56.642996 9.575,-13.811 20.079,-26.84 33.292,-37.421 9.45,-7.573 19.894,-13.174 31.854,-15.724 5.84,-1.247 11.629,-2.7329999 17.454,-4.0899999 0.341,-0.081 0.715,0.014 1.075,0.027 -0.278,0.181 -0.537,0.396 -0.837,0.538 -19.58,9.3609999 -34.218,24.4719999 -47.659,40.9739999 -10.808,13.277 -20.355,27.457 -29.294,42.019 -9.329,15.193996 -18.147,30.707996 -27.193,46.077996 -6.06,10.298 -11.988,20.676 -18.239,30.856 -6.477,10.538 -13.035,21.043 -19.989,31.272 -9.524,14.01 -19.969,27.3 -32.613,38.731 -10.294,9.313 -22.644,16.201 -34.545,18.714 -11.392,2.263 -23.047,0.876 -34.415,-3.306 -17.555,-6.459 -31.736,-17.446 -43.035,-32.267 -0.306,-0.4 -0.604,-0.813 -0.862,-1.241 -0.288,-0.495 -0.527,-1.012 -0.792,-1.521 0.411,0.378 0.856,0.719 1.218,1.129 10.842,12.341 23.84,21.479 39.555,26.548 20.167,6.502 37.77,1.897 54.265,-11.059 7.343,-5.768 10.1,-11.324 10.1,-11.324 z"
-     id="path3412"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /><path
-     d="m 393.16,88.254194 c 2.925,13.411996 0.414,26.197996 -4.771,38.658996 -0.182,0.441 -0.544,0.805 -0.822,1.202 -0.061,-0.383 -0.206,-0.775 -0.173,-1.147 2.067,-23.399 -8.303,-40.934996 -26.038,-54.907996 -10.861,-8.562 -23.228,-13.804 -36.88,-16.02 -0.697,-0.115 -1.356,-0.452 -2.033,-0.687 0.561,-0.472 1.056,-1.066 1.686,-1.398 16.729,-8.902 32.991,-7.607 48.378,2.991 10.957,7.546 17.896,18.097 20.653,31.308 z"
-     id="path3414"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /><path
-     d="m 333.73,242.84619 c -15.294,1.323 -30.865,-1.065 -46.192,-5.421 -17.569,-4.995 -34.205,-12.281 -50.317,-20.808 -0.446,-0.237 -0.793,-0.668 -1.182,-1.009 0.466,0.162 0.952,0.278 1.398,0.496 16.801,8.124 34.107,14.846 52.369,18.926 15.489,3.451 31.118,5.016 46.87,2.505 16.41,-2.615 31.281,-9.049 44.559,-19.121 6.878,-5.217 13.045,-11.14 18.482,-17.836 0.328,-0.398 0.83,-0.662 1.252,-0.991 -0.203,0.453 -0.368,0.924 -0.61,1.344 -6.534,11.047 -15.14,20.181 -25.722,27.397 -12.131,8.284 -25.608,12.958 -40.907,14.518 z"
-     id="path3416"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /></svg>
\ No newline at end of file
diff --git a/js/assets/images/parity-logo-white.svg b/js/assets/images/parity-logo-white.svg
deleted file mode 100644
index 7360ef6a6d7c36ded131a370c71fd146226a5a84..0000000000000000000000000000000000000000
--- a/js/assets/images/parity-logo-white.svg
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="446.1044"
-   height="407.54163"
-   fill='#ffffff'
-   viewBox="0 0 446.1044 407.54163"
-   enable-background="new 0 0 599 472"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="parity-logo-white.svg"><metadata
-     id="metadata3442"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs3440" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1363"
-     inkscape:window-height="862"
-     id="namedview3438"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="1.375"
-     inkscape:cx="272.073"
-     inkscape:cy="207.77242"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="m 445.076,88.583194 c 2.758,24.580996 0.085,41.594996 -9.431,59.368996 -14.124,26.375 -35.951,43.904 -64.072,53.619 -19.164,6.621 -38.881,7.435 -58.847,4.726 -17.481,-2.375 -34.171,-7.518 -50.403,-14.276 -0.498,-0.207 -0.934,-0.569 -1.399,-0.861 0.553,0.102 1.131,0.13 1.658,0.314 15.869,5.581 32.085,9.65 48.894,11.057 22.342,1.87 43.878,-0.855 63.853,-11.815 12.879,-7.064 23.693,-16.488 32.475,-28.32 9.335,-12.588 15.155,-26.567 17.114,-42.088 2.766,-21.789996 -3.615,-40.960996 -17.278,-57.818996 -12.042,-14.857 -27.016,-25.515 -45.747,-30.25 -13.109,-3.313 -25.863,-2.27 -38.048,3.993 -5.376,2.764 -11.137,4.87 -16.252,8.039 -11.578,7.184 -20.912,16.979 -29.243,27.612 -8.093,10.323 -15.713,21.02 -23.312,31.718996 -5.111,7.205 -9.932,14.623 -14.695,22.064 -14.297,22.335 -28.348,44.819 -42.791,67.059 -12.012,18.504 -24.866,36.422 -39.294,53.15 -3.297,3.823 -6.858,7.419 -10.323,11.092 -0.284,0.303 -0.768,0.413 -1.164,0.618 0.18,-0.372 0.296,-0.78 0.527,-1.111 3.705,-5.32 7.593,-10.52 11.101,-15.961 12.652,-19.634 23.312,-40.375 33.675,-61.275 11.782,-23.759 23.403,-47.594 35.301,-71.296 10.511,-20.933996 21.896,-41.393996 35.328,-60.611996 9.289,-13.287 19.608,-25.682 32.803,-35.415 15.046,-11.10199986 31.49,-12.07299986 50.114,-11.89799986 23.358,0.215 40.052,8.64399996 55.289,20.03999986 14.101,11.029 21.479,19.407 32.723,37.906 5.807,9.563 10.563,22.785 11.444,30.62 z"
-     id="path3410"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /><path
-     d="m 105.138,224.44619 c -6.696,3.271 -13.862,5.131 -21.242,6.22 -15.885,2.35 -30.524,-0.357 -43.006,-11.177 -0.802,-0.696 -1.424,-1.589 -2.128,-2.391 0.85,0.616 1.717,1.207 2.544,1.848 10.317,7.949 22.148,10.616 34.907,10.028 11.801,-0.537 20.574,-3.503 31.22,-8.309 1.604,-0.723 5.122,-3.231 6.25,-4.62 9.183,-11.342 17.655,-22.783 24.918,-35.422 11.151,-19.417 22.103,-38.946 33.061,-58.467 10.799,-19.233 21.559,-38.490996 34.136,-56.642996 9.575,-13.811 20.079,-26.84 33.292,-37.421 9.45,-7.573 19.894,-13.174 31.854,-15.724 5.84,-1.247 11.629,-2.7329999 17.454,-4.0899999 0.341,-0.081 0.715,0.014 1.075,0.027 -0.278,0.181 -0.537,0.396 -0.837,0.538 -19.58,9.3609999 -34.218,24.4719999 -47.659,40.9739999 -10.808,13.277 -20.355,27.457 -29.294,42.019 -9.329,15.193996 -18.147,30.707996 -27.193,46.077996 -6.06,10.298 -11.988,20.676 -18.239,30.856 -6.477,10.538 -13.035,21.043 -19.989,31.272 -9.524,14.01 -19.969,27.3 -32.613,38.731 -10.294,9.313 -22.644,16.201 -34.545,18.714 -11.392,2.263 -23.047,0.876 -34.415,-3.306 -17.555,-6.459 -31.736,-17.446 -43.035,-32.267 -0.306,-0.4 -0.604,-0.813 -0.862,-1.241 -0.288,-0.495 -0.527,-1.012 -0.792,-1.521 0.411,0.378 0.856,0.719 1.218,1.129 10.842,12.341 23.84,21.479 39.555,26.548 20.167,6.502 37.77,1.897 54.265,-11.059 7.343,-5.768 10.1,-11.324 10.1,-11.324 z"
-     id="path3412"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /><path
-     d="m 393.16,88.254194 c 2.925,13.411996 0.414,26.197996 -4.771,38.658996 -0.182,0.441 -0.544,0.805 -0.822,1.202 -0.061,-0.383 -0.206,-0.775 -0.173,-1.147 2.067,-23.399 -8.303,-40.934996 -26.038,-54.907996 -10.861,-8.562 -23.228,-13.804 -36.88,-16.02 -0.697,-0.115 -1.356,-0.452 -2.033,-0.687 0.561,-0.472 1.056,-1.066 1.686,-1.398 16.729,-8.902 32.991,-7.607 48.378,2.991 10.957,7.546 17.896,18.097 20.653,31.308 z"
-     id="path3414"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /><path
-     d="m 333.73,242.84619 c -15.294,1.323 -30.865,-1.065 -46.192,-5.421 -17.569,-4.995 -34.205,-12.281 -50.317,-20.808 -0.446,-0.237 -0.793,-0.668 -1.182,-1.009 0.466,0.162 0.952,0.278 1.398,0.496 16.801,8.124 34.107,14.846 52.369,18.926 15.489,3.451 31.118,5.016 46.87,2.505 16.41,-2.615 31.281,-9.049 44.559,-19.121 6.878,-5.217 13.045,-11.14 18.482,-17.836 0.328,-0.398 0.83,-0.662 1.252,-0.991 -0.203,0.453 -0.368,0.924 -0.61,1.344 -6.534,11.047 -15.14,20.181 -25.722,27.397 -12.131,8.284 -25.608,12.958 -40.907,14.518 z"
-     id="path3416"
-     inkscape:connector-curvature="0"
-     style="clip-rule:evenodd;fill-rule:evenodd" /><g
-     id="g3418"
-     transform="translate(-27.427,-36.230806)"><path
-       d="m 163.555,443.355 c -1.854,0 -4.338,0.024 -6.14,0.024 -0.759,0 -0.883,-0.125 -0.883,-0.892 0,-0.614 0.015,-1.113 0.015,-1.73 0,-25.897 0,-52.348 0,-78.244 1.14,0 3.522,-0.024 5.606,-0.024 1.408,0 1.413,1.108 1.441,2.145 0.036,1.226 0.109,2.448 0.167,3.676 0.823,-0.895 1.624,-1.812 2.474,-2.678 2.747,-2.803 6.056,-4.375 10.02,-4.401 3.944,-0.025 7.892,-0.066 11.836,0.018 9.824,0.21 16.31,6.568 16.463,16.351 0.145,9.141 0.133,18.285 0.005,27.429 -0.137,9.914 -6.669,16.337 -16.633,16.467 -7.314,0.094 -14.63,0.018 -21.944,0.037 -2.347,0.006 -2.372,0.032 -2.38,2.354 l -0.047,19.468 z m 33.883,-51.911 -0.01,0 c 0,-4.131 0.113,-8.267 -0.025,-12.395 -0.224,-6.682 -3.787,-10.315 -10.407,-10.609 -3.547,-0.16 -7.115,-0.169 -10.663,0 -7.71,0.365 -12.46,4.891 -12.638,12.544 -0.247,10.563 -0.071,21.138 -0.116,31.707 -0.003,1.22 0.383,1.719 1.649,1.683 2.399,-0.068 4.804,-0.015 7.206,-0.018 4.709,0 9.419,0.085 14.123,-0.022 6.92,-0.16 10.592,-3.868 10.872,-10.782 0.025,-0.672 0.01,-1.343 0.01,-2.018 -0.001,-3.363 -0.001,-6.726 -0.001,-10.09 z"
-       id="path3420"
-       inkscape:connector-curvature="0"
-       style="clip-rule:evenodd;fill-rule:evenodd" /><path
-       d="m 398.145,442.797 c -1.209,-1.208 -1.22,-2.509 -1.22,-4.547 0,-1.19 0.758,-1.93 2.052,-1.933 0.576,-0.003 1.156,0.002 1.731,-0.031 3.036,-0.167 5.565,-1.381 7.547,-3.695 2.608,-3.043 4.278,-6.616 5.56,-10.354 0.291,-0.852 -0.098,-2.062 -0.461,-2.994 -4.045,-10.383 -8.151,-20.737 -12.234,-31.103 -2.927,-7.418 -5.844,-14.835 -8.765,-22.252 -0.178,-0.447 -0.389,-0.884 -0.521,-1.342 -0.421,-1.462 -0.103,-1.961 1.343,-2.151 0.284,-0.039 0.578,-0.012 0.866,-0.021 4.704,-0.162 4.709,-0.164 6.454,4.309 5.351,13.686 10.696,27.373 16.043,41.061 0.212,0.536 0.397,1.084 0.635,1.608 0.27,0.591 0.581,1.162 0.877,1.741 0.379,-0.623 0.853,-1.21 1.116,-1.879 1.193,-3.037 2.331,-6.098 3.484,-9.155 4.274,-11.317 8.54,-22.641 12.834,-33.953 0.499,-1.312 0.687,-3.534 2.327,-3.534 1.709,0 3.536,-0.014 5.345,-0.014 0.848,0 0.833,0.972 0.833,1.494 0,0.421 -0.221,0.916 -0.395,1.362 -7.828,20.241 -15.62,40.499 -23.548,60.7 -1.185,3.014 -2.918,5.835 -4.587,8.632 -2.562,4.291 -6.279,7.338 -11.113,8.61 -3.881,1.022 -5.746,-0.102 -6.203,-0.559 z"
-       id="path3422"
-       inkscape:connector-curvature="0"
-       style="clip-rule:evenodd;fill-rule:evenodd" /><path
-       d="m 334.455,340.54 c 1.253,1.932 0.604,4.066 0.594,6.117 -0.006,1.009 -0.817,1.457 -1.776,1.475 -1.522,0.028 -3.046,0.028 -4.568,0 -0.959,-0.018 -1.772,-0.466 -1.775,-1.475 -0.01,-2.051 -0.658,-4.186 0.594,-6.117 2.309,0 4.621,0 6.931,0 z"
-       id="path3424"
-       inkscape:connector-curvature="0"
-       style="clip-rule:evenodd;fill-rule:evenodd" /><path
-       d="m 266.991,397.813 c 0,6.639 0.006,13.278 -0.002,19.918 -0.004,3.707 -0.155,3.843 -3.946,3.794 -0.287,-0.004 -0.578,0.012 -0.866,-0.008 -1.827,-0.129 -2.211,-0.465 -2.335,-2.205 -0.089,-1.241 -0.089,-2.486 -0.129,-3.729 -0.825,0.88 -1.636,1.778 -2.48,2.642 -2.821,2.881 -6.214,4.459 -10.286,4.451 -3.563,-0.002 -7.124,0.041 -10.683,-0.018 -9.792,-0.165 -16.153,-6.573 -16.26,-16.436 -0.021,-2.1 0.057,-4.242 0.433,-6.301 1.524,-8.328 7.822,-12.42 15.293,-12.644 6.923,-0.213 13.854,-0.06 20.782,-0.068 0.674,-0.003 1.348,-0.025 2.021,-0.007 0.796,0.02 1.318,-0.248 1.275,-1.135 -0.168,-3.45 -0.068,-6.94 -0.592,-10.333 -0.562,-3.646 -3.051,-5.94 -6.648,-6.78 -4.363,-1.02 -8.826,-0.847 -13.203,-0.297 -5.176,0.651 -7.679,3.432 -8.587,8.657 -0.688,3.955 -0.688,3.955 -4.701,3.774 -2.256,-0.104 -2.652,-0.445 -2.614,-2.789 0.143,-9.463 5.187,-16.407 16.065,-17.023 3.644,-0.205 7.311,-0.109 10.966,-0.032 9.804,0.205 16.27,6.584 16.454,16.361 0.127,6.734 0.024,13.472 0.024,20.207 l 0.019,0 z m -19.232,-3.431 c 0,0 0,0.023 0,0.035 -3.658,0 -7.325,-0.157 -10.972,0.036 -5.828,0.309 -9.347,4.026 -9.617,9.832 -0.278,5.983 2.694,10.264 8.319,10.955 4.945,0.609 10.004,0.773 14.942,-0.307 4.769,-1.044 7.935,-4.068 8.77,-8.872 0.591,-3.379 0.421,-6.888 0.62,-10.338 0.072,-1.276 -0.712,-1.355 -1.665,-1.351 -3.466,0.018 -6.933,0.01 -10.397,0.01 z"
-       id="path3426"
-       inkscape:connector-curvature="0"
-       style="clip-rule:evenodd;fill-rule:evenodd" /><path
-       d="m 359.751,388.471 c 0,-5.486 -0.003,-10.972 0.003,-16.459 0.003,-2.656 0.037,-2.469 -2.565,-2.473 -2.215,-0.003 -4.43,0.048 -6.641,-0.022 -1.827,-0.057 -2.271,-0.451 -2.324,-2.198 -0.16,-5.277 0.016,-4.997 4.506,-4.948 1.731,0.017 3.468,-0.066 5.196,0.021 1.353,0.068 1.894,-0.367 1.85,-1.787 -0.088,-2.885 -0.037,-5.775 -0.02,-8.662 0.018,-3.273 0.174,-3.419 3.441,-3.432 0.48,-0.003 0.965,-0.027 1.442,0.011 1.78,0.135 2.213,0.488 2.254,2.275 0.071,3.176 0.001,6.354 0.035,9.53 0.02,1.989 0.054,2.018 2.117,2.037 2.885,0.028 5.773,-0.016 8.661,0.015 2.731,0.028 3.006,0.314 3.074,2.93 0.107,4.09 -0.021,4.225 -4.089,4.23 -2.407,0.003 -4.812,-0.003 -7.222,0.002 -2.599,0.002 -2.556,-0.188 -2.553,2.48 0.004,9.144 0,18.289 0.004,27.436 0,1.635 -0.068,3.278 0.061,4.905 0.491,6.126 3.794,9.413 9.925,9.926 1.052,0.088 2.115,0.064 3.175,0.068 4.162,0.015 4.335,0.192 4.165,4.444 -0.095,2.331 -0.387,2.687 -2.71,2.707 -2.5,0.02 -5.037,0.168 -7.496,-0.188 -8.999,-1.311 -14.115,-7.236 -14.259,-16.388 -0.087,-5.486 -0.014,-10.974 -0.014,-16.461 l -0.016,0 z"
-       id="path3428"
-       inkscape:connector-curvature="0"
-       style="clip-rule:evenodd;fill-rule:evenodd" /><path
-       d="m 286.393,391.917 c 0,-8.468 0,-16.932 0.001,-25.396 0,-0.771 -0.055,-1.551 0.041,-2.308 0.211,-1.634 0.661,-1.843 3.55,-1.843 2.883,0.002 3.344,0.209 3.527,1.857 0.115,1.046 0.017,2.114 0.065,3.172 0.014,0.309 0.202,0.605 0.31,0.909 0.201,-0.188 0.408,-0.367 0.598,-0.562 1.337,-1.364 2.528,-2.929 4.045,-4.051 2.278,-1.684 4.941,-2.525 7.838,-2.482 2.212,0.034 4.425,-0.018 6.64,0.01 2.732,0.033 3.009,0.313 3.078,2.92 0.109,4.096 -0.022,4.249 -4.075,4.249 -2.624,0 -5.029,-0.102 -7.483,0.266 -6.56,0.98 -10.189,4.94 -10.854,11.543 -0.126,1.239 -0.108,2.498 -0.109,3.75 -0.008,11.06 -0.006,22.123 -0.006,33.186 0,0.771 0.045,1.546 -0.025,2.308 -0.18,1.903 -0.616,2.121 -3.902,2.081 -2.676,-0.033 -3.059,-0.281 -3.219,-2.193 -0.057,-0.669 -0.02,-1.346 -0.02,-2.021 0,-8.464 0,-16.931 0,-25.395 z"
-       id="path3430"
-       inkscape:connector-curvature="0"
-       style="clip-rule:evenodd;fill-rule:evenodd" /><path
-       d="m 334.571,391.899 c 0,8.742 0.01,17.484 -0.004,26.226 -0.005,3.236 -0.184,3.389 -3.459,3.397 -0.673,0.003 -1.347,0.015 -2.016,-0.047 -0.999,-0.089 -1.565,-0.678 -1.646,-1.673 -0.054,-0.669 -0.041,-1.343 -0.041,-2.015 -10e-4,-17.194 -10e-4,-34.389 -10e-4,-51.584 0,-0.48 -0.012,-0.961 0.01,-1.439 0.016,-0.383 -0.044,-0.825 0.123,-1.137 1.173,-2.185 3.239,-1.004 4.919,-1.212 1.22,-0.15 2.021,0.507 2.083,1.821 0.037,0.767 0.031,1.536 0.031,2.304 0.002,8.454 0.002,16.907 0.001,25.359 z"
-       id="path3432"
-       inkscape:connector-curvature="0"
-       style="clip-rule:evenodd;fill-rule:evenodd" /><path
-       d="m 197.438,391.444 c 0,3.363 0,6.727 0,10.09 0,0.675 0.016,1.346 -0.01,2.018 -0.279,6.914 -3.952,10.622 -10.872,10.782 -4.704,0.107 -9.413,0.022 -14.123,0.022 -2.402,0.003 -4.807,-0.051 -7.206,0.018 -1.267,0.036 -1.652,-0.463 -1.649,-1.683 0.045,-10.569 -0.13,-21.144 0.116,-31.707 0.178,-7.653 4.928,-12.179 12.638,-12.544 3.548,-0.169 7.116,-0.16 10.663,0 6.62,0.294 10.183,3.928 10.407,10.609 0.139,4.128 0.025,8.264 0.025,12.395 l 0.011,0 z"
-       id="path3434"
-       inkscape:connector-curvature="0"
-       style="clip-rule:evenodd;fill:none;fill-rule:evenodd" /></g></svg>
diff --git a/js/assets/images/paritybar.png b/js/assets/images/paritybar.png
deleted file mode 100644
index f0b0e1457409c386690e52ab1091393de19aedc4..0000000000000000000000000000000000000000
Binary files a/js/assets/images/paritybar.png and /dev/null differ
diff --git a/js/assets/images/shapeshift-btn.png b/js/assets/images/shapeshift-btn.png
deleted file mode 100644
index 1650ecf375660f706f59ae7bf2f4455dedeb8aae..0000000000000000000000000000000000000000
Binary files a/js/assets/images/shapeshift-btn.png and /dev/null differ
diff --git a/js/assets/images/shapeshift-logo.png b/js/assets/images/shapeshift-logo.png
deleted file mode 100644
index 586a01ef13a7ce480d46b88fe6dc457d3083c966..0000000000000000000000000000000000000000
Binary files a/js/assets/images/shapeshift-logo.png and /dev/null differ
diff --git a/js/build.rs b/js/build.rs
deleted file mode 100644
index a9a5ba8a6924ba4e3432829512fc1831de0ddfcf..0000000000000000000000000000000000000000
--- a/js/build.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate parity_dapps_glue;
-
-fn main() {
-	parity_dapps_glue::js::build(env!("CARGO_MANIFEST_DIR"), "build");
-	parity_dapps_glue::generate();
-}
diff --git a/js/npm/etherscan/README.md b/js/npm/etherscan/README.md
deleted file mode 100644
index 730cb7e1d0e94744eeca3e8d33750e0a74f3d5e3..0000000000000000000000000000000000000000
--- a/js/npm/etherscan/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# @parity/etherscan
-
-A thin, lightweight promise wrapper for the api.etherscan.io/apis service, exposing a common endpoint for use in JavaScript applications.
-
-[https://github.com/paritytech/parity/tree/master/js/src/3rdparty/etherscan](https://github.com/paritytech/parity/tree/master/js/src/3rdparty/etherscan)
-
-## usage
-
-installation -
-
-```
-npm install --save @parity/etherscan
-```
-
-Usage -
-
-```
-const etherscan = require('@parity/etherscan');
-
-// api calls goes here
-```
-
-## api
-
-account (exposed on etherscan.account) -
-
-- `balance(address)`
-- `balances(addresses)` (array or addresses)
-- `transactions(address, page)` (page offset starts at 0, returns 25)
-
-stats (exposed on etherscan.stats) -
-
-- `price()`
-- `supply()`
diff --git a/js/npm/etherscan/package.json b/js/npm/etherscan/package.json
deleted file mode 100644
index 1aed97171dd9d4816a0378e641887ef176c7ffc3..0000000000000000000000000000000000000000
--- a/js/npm/etherscan/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "@parity/etherscan",
-  "description": "The Parity Promise-based library for interfacing with Etherscan over HTTP",
-  "version": "0.0.0",
-  "main": "library.js",
-  "author": "Parity Team <admin@parity.io>",
-  "maintainers": [
-    "Jaco Greeff"
-  ],
-  "contributors": [],
-  "license": "GPL-3.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/paritytech/parity.git"
-  },
-  "keywords": [
-    "Ethereum",
-    "ABI",
-    "API",
-    "RPC",
-    "Parity",
-    "Promise"
-  ],
-  "scripts": {
-  },
-  "devDependencies": {
-    "chai": "3.5.0",
-    "mocha": "3.2.0"
-  },
-  "dependencies": {
-    "node-fetch": "~1.6.3"
-  }
-}
diff --git a/js/npm/jsonrpc/README.md b/js/npm/jsonrpc/README.md
deleted file mode 100644
index e9678864b4d9f9ad13bb7eee8a0174e4f5c13919..0000000000000000000000000000000000000000
--- a/js/npm/jsonrpc/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# @parity/jsonrpc
-
-JSON and JS interface defintions for RPC calls.
-
-[https://github.com/paritytech/parity/tree/master/js/src/jsonrpc](https://github.com/paritytech/parity/tree/master/js/src/jsonrpc)
diff --git a/js/npm/jsonrpc/package.json b/js/npm/jsonrpc/package.json
deleted file mode 100644
index 90ebe1577b7e3b2b4352b463e36096936298ae16..0000000000000000000000000000000000000000
--- a/js/npm/jsonrpc/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "@parity/jsonrpc",
-  "description": "JSON and JS interface defintions for RPC",
-  "version": "0.0.0",
-  "main": "library.js",
-  "author": "Parity Team <admin@parity.io>",
-  "maintainers": [
-    "Jaco Greeff"
-  ],
-  "contributors": [],
-  "license": "GPL-3.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/paritytech/parity.git"
-  },
-  "keywords": [
-    "Ethereum",
-    "ABI",
-    "API",
-    "RPC",
-    "Parity"
-  ],
-  "scripts": {
-  },
-  "devDependencies": {
-  },
-  "dependencies": {
-  }
-}
diff --git a/js/npm/parity/README.md b/js/npm/parity/README.md
deleted file mode 100644
index 2c5396e2d6b9b54ef981f56917b5e15a1fc3cf69..0000000000000000000000000000000000000000
--- a/js/npm/parity/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# @parity/parity.js
-
-Parity.js is a thin, fast, Promise-based wrapper around the Ethereum APIs.
-
-[https://github.com/paritytech/parity/tree/master/js/src/api](https://github.com/paritytech/parity/tree/master/js/src/api)
-
-## installation
-
-Install the package with `npm install --save @parity/parity.js`
-
-## usage
-
-### initialisation
-
-```javascript
-// import the actual Api class
-import { Api } from '@parity/parity.js';
-
-// do the setup
-const transport = new Api.Transport.Http('http://localhost:8545');
-const api = new Api(transport);
-```
-
-### making calls
-
-perform a call
-
-```javascript
-api.eth
-  .coinbase()
-  .then((coinbase) => {
-    console.log(`The coinbase is ${coinbase}`);
-  });
-```
-
-multiple promises
-
-```javascript
-Promise
-  .all([
-    api.eth.coinbase(),
-    api.net.listening()
-  ])
-  .then(([coinbase, listening]) => {
-    // do stuff here
-  });
-```
-
-chaining promises
-
-```javascript
-api.eth
-  .newFilter({...})
-  .then((filterId) => api.eth.getFilterChanges(filterId))
-  .then((changes) => {
-    console.log(changes);
-  });
-```
-
-### contracts
-
-attach contract
-
-```javascript
-const abi = [{ name: 'callMe', inputs: [{ type: 'bool', ...}, { type: 'string', ...}]}, ...abi...];
-const address = '0x123456...9abc';
-const contract = new api.newContract(abi, address);
-```
-
-find & call a function
-
-```javascript
-contract.instance
-  .callMe
-  .call({ gas: 21000 }, [true, 'someString']) // or estimateGas or postTransaction
-  .then((result) => {
-    console.log(`the result was ${result}`);
-  });
-```
-
-## apis
-
-APIs implement the calls as exposed in the [Ethcore JSON Ethereum RPC](https://github.com/paritytech/ethereum-rpc-json/) definitions. Mapping follows the naming conventions of the originals, i.e. `eth_call` becomes `eth.call`, `personal_accounts` becomes `personal.accounts`, etc.
diff --git a/js/npm/parity/package.json b/js/npm/parity/package.json
deleted file mode 100644
index c43da096d3e6ad36f8a99e585cffa51a83789c91..0000000000000000000000000000000000000000
--- a/js/npm/parity/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "@parity/parity.js",
-  "description": "The Parity Promise-based API & ABI library for interfacing with Ethereum over RPC",
-  "version": "0.0.0",
-  "main": "library.js",
-  "author": "Parity Team <admin@parity.io>",
-  "maintainers": [
-    "Jaco Greeff"
-  ],
-  "contributors": [],
-  "license": "GPL-3.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/paritytech/parity.git"
-  },
-  "keywords": [
-    "Ethereum",
-    "ABI",
-    "API",
-    "RPC",
-    "Parity",
-    "Promise"
-  ],
-  "scripts": {
-  },
-  "devDependencies": {
-  },
-  "dependencies": {
-    "bignumber.js": "~2.3.0",
-    "js-sha3": "~0.5.2",
-    "node-fetch": "~1.6.3"
-  }
-}
diff --git a/js/npm/parity/test/smoke.spec.js b/js/npm/parity/test/smoke.spec.js
deleted file mode 100644
index fb1ae0d4d52a29538f50a64238d78e159aac5ffe..0000000000000000000000000000000000000000
--- a/js/npm/parity/test/smoke.spec.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const parity = require('../');
-
-describe('load the Parity library', function () {
-  it('should no throw any error', () => {
-    expect(parity).to.be.ok;
-
-    expect(parity.Api).to.be.ok;
-    expect(parity.Abi).to.be.ok;
-  });
-});
diff --git a/js/npm/shapeshift/README.md b/js/npm/shapeshift/README.md
deleted file mode 100644
index 0f9a190abc13f2c6f7431f8de22eaa6c21590b18..0000000000000000000000000000000000000000
--- a/js/npm/shapeshift/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# @parity/shapeshift
-
-A thin ES6 promise wrapper around the shapeshift.io APIs as documented at https://shapeshift.io/api
-
-[https://github.com/paritytech/parity/tree/master/js/src/3rdparty/shapeshift](https://github.com/paritytech/parity/tree/master/js/src/3rdparty/shapeshift)
-
-## usage
-
-installation -
-
-```
-npm install --save @parity/shapeshift
-```
-
-Usage -
-
-```
-const APIKEY = 'private affiliate key or undefined';
-const shapeshift = require('@parity/shapeshift')(APIKEY);
-
-// api calls goes here
-```
-
-## api
-
-queries -
-
-- `getCoins()` [https://shapeshift.io/api#api-104](https://shapeshift.io/api#api-104)
-- `getMarketInfo(pair)` [https://shapeshift.io/api#api-103](https://shapeshift.io/api#api-103)
-- `getStatus(depositAddress)` [https://shapeshift.io/api#api-5](https://shapeshift.io/api#api-5)
-
-transactions -
-
-- `shift(toAddress, returnAddress, pair)` [https://shapeshift.io/api#api-7](https://shapeshift.io/api#api-7)
diff --git a/js/npm/shapeshift/package.json b/js/npm/shapeshift/package.json
deleted file mode 100644
index 1aa2d38f315ed4ccc46fba82422e232bb6bf0d8a..0000000000000000000000000000000000000000
--- a/js/npm/shapeshift/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "@parity/shapeshift",
-  "description": "The Parity Promise-based library for interfacing with ShapeShift over HTTP",
-  "version": "0.0.0",
-  "main": "library.js",
-  "author": "Parity Team <admin@parity.io>",
-  "maintainers": [
-    "Jaco Greeff"
-  ],
-  "contributors": [],
-  "license": "GPL-3.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/paritytech/parity.git"
-  },
-  "keywords": [
-    "Ethereum",
-    "ABI",
-    "API",
-    "RPC",
-    "Parity",
-    "Promise"
-  ],
-  "scripts": {
-  },
-  "devDependencies": {
-  },
-  "dependencies": {
-    "node-fetch": "~1.6.3"
-  }
-}
diff --git a/js/npm/test/mocha.config.js b/js/npm/test/mocha.config.js
deleted file mode 100644
index fc21631b0a811e8c150e1168cea160b00380a61b..0000000000000000000000000000000000000000
--- a/js/npm/test/mocha.config.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const chai = require('chai');
-// const chaiAsPromised from 'chai-as-promised';
-// const chaiEnzyme from 'chai-enzyme';
-// const sinonChai from 'sinon-chai';
-
-// chai.use(chaiAsPromised);
-// chai.use(chaiEnzyme());
-// chai.use(sinonChai);
-
-// expose expect to global so we won't have to manually import & define it in every test
-global.expect = chai.expect;
-
-module.exports = {};
diff --git a/js/npm/test/mocha.opts b/js/npm/test/mocha.opts
deleted file mode 100644
index 0ed8269b4ff3676c83c4819eb7046804ef55804a..0000000000000000000000000000000000000000
--- a/js/npm/test/mocha.opts
+++ /dev/null
@@ -1 +0,0 @@
--r ./test/mocha.config
diff --git a/js/package-lock.json b/js/package-lock.json
deleted file mode 100644
index 707e5a67dac2e454283cc33abbd075ea17d39968..0000000000000000000000000000000000000000
--- a/js/package-lock.json
+++ /dev/null
@@ -1,13048 +0,0 @@
-{
-  "name": "parity.js",
-  "version": "1.8.17",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@parity/wordlist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@parity/wordlist/-/wordlist-1.0.1.tgz",
-      "integrity": "sha1-wn5A4as2OKCe1TtKLoHVMbXrWjE="
-    },
-    "abab": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz",
-      "integrity": "sha1-uB3l9ydOxOdW15fNg08wNkJyTl0=",
-      "dev": true
-    },
-    "abbrev": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
-    },
-    "accepts": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
-      "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
-      "dev": true,
-      "requires": {
-        "mime-types": "2.1.16",
-        "negotiator": "0.6.1"
-      }
-    },
-    "acorn": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
-      "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==",
-      "dev": true
-    },
-    "acorn-dynamic-import": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
-      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
-      "dev": true,
-      "requires": {
-        "acorn": "4.0.13"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-          "dev": true
-        }
-      }
-    },
-    "acorn-globals": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz",
-      "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=",
-      "dev": true,
-      "requires": {
-        "acorn": "4.0.13"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-          "dev": true
-        }
-      }
-    },
-    "acorn-jsx": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-      "dev": true,
-      "requires": {
-        "acorn": "3.3.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        }
-      }
-    },
-    "ajv": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
-      "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
-      "requires": {
-        "co": "4.6.0",
-        "fast-deep-equal": "1.0.0",
-        "json-schema-traverse": "0.3.1",
-        "json-stable-stringify": "1.0.1"
-      },
-      "dependencies": {
-        "co": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-        }
-      }
-    },
-    "ajv-keywords": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
-      "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
-      "dev": true
-    },
-    "align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-      "requires": {
-        "kind-of": "3.2.2",
-        "longest": "1.0.1",
-        "repeat-string": "1.6.1"
-      }
-    },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
-      "dev": true
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
-    },
-    "ansi": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
-      "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
-    },
-    "ansi-escapes": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz",
-      "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs="
-    },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-    },
-    "any-promise": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz",
-      "integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=",
-      "dev": true
-    },
-    "anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-      "dev": true,
-      "requires": {
-        "micromatch": "2.3.11",
-        "normalize-path": "2.1.1"
-      }
-    },
-    "append-transform": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
-      "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
-      "dev": true,
-      "requires": {
-        "default-require-extensions": "1.0.0"
-      }
-    },
-    "aproba": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
-      "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw=="
-    },
-    "archive-type": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
-      "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
-      "requires": {
-        "file-type": "3.9.0"
-      }
-    },
-    "are-we-there-yet": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
-      "requires": {
-        "delegates": "1.0.0",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "1.0.3"
-      }
-    },
-    "arr-diff": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-      "requires": {
-        "arr-flatten": "1.1.0"
-      }
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
-    },
-    "array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE="
-    },
-    "array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
-      "dev": true
-    },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-      "dev": true
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "1.0.3"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
-    },
-    "array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
-    },
-    "array.prototype.find": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz",
-      "integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=",
-      "dev": true,
-      "requires": {
-        "define-properties": "1.1.2",
-        "es-abstract": "1.7.0"
-      }
-    },
-    "arraybuffer-loader": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/arraybuffer-loader/-/arraybuffer-loader-0.2.2.tgz",
-      "integrity": "sha1-jnKU0VGqyO1wqC53Pq0FWQ23Dik=",
-      "requires": {
-        "loader-utils": "0.2.17"
-      }
-    },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
-    },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
-    },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
-    },
-    "asn1.js": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz",
-      "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.7",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
-      }
-    },
-    "assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-      "dev": true,
-      "requires": {
-        "util": "0.10.3"
-      }
-    },
-    "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
-    },
-    "assertion-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
-      "integrity": "sha1-E8pRXYYgbaC6xm6DTdOX2HWBCUw=",
-      "dev": true
-    },
-    "ast-types": {
-      "version": "0.9.6",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
-      "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
-      "dev": true
-    },
-    "async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-      "dev": true
-    },
-    "async-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-      "dev": true
-    },
-    "async-each-series": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-1.1.0.tgz",
-      "integrity": "sha1-9C/YFV048hpbjqB8KOBj7RcAsTg=",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "attr-accept": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.0.tgz",
-      "integrity": "sha1-tc01In8WOTWo8d4Q7T66FpQfa+Y="
-    },
-    "autoprefixer": {
-      "version": "6.7.7",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
-      "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000708",
-        "normalize-range": "0.1.2",
-        "num2fraction": "1.2.2",
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0"
-      }
-    },
-    "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
-    },
-    "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
-    },
-    "babel-cli": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.23.0.tgz",
-      "integrity": "sha1-Uv+UaisPZGRcNee9XuomeqCUjA8=",
-      "dev": true,
-      "requires": {
-        "babel-core": "6.23.1",
-        "babel-polyfill": "6.23.0",
-        "babel-register": "6.23.0",
-        "babel-runtime": "6.23.0",
-        "chokidar": "1.7.0",
-        "commander": "2.8.1",
-        "convert-source-map": "1.5.0",
-        "fs-readdir-recursive": "1.0.0",
-        "glob": "7.1.2",
-        "lodash": "4.17.2",
-        "output-file-sync": "1.1.2",
-        "path-is-absolute": "1.0.1",
-        "slash": "1.0.0",
-        "source-map": "0.5.6",
-        "v8flags": "2.1.1"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        }
-      }
-    },
-    "babel-code-frame": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
-      "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=",
-      "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.2"
-      }
-    },
-    "babel-core": {
-      "version": "6.23.1",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.23.1.tgz",
-      "integrity": "sha1-wUPLYhuy9iFxDCIMXVedFbikQt8=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.22.0",
-        "babel-generator": "6.25.0",
-        "babel-helpers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-register": "6.23.0",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0",
-        "babylon": "6.17.4",
-        "convert-source-map": "1.5.0",
-        "debug": "2.6.8",
-        "json5": "0.5.1",
-        "lodash": "4.17.2",
-        "minimatch": "3.0.4",
-        "path-is-absolute": "1.0.1",
-        "private": "0.1.7",
-        "slash": "1.0.0",
-        "source-map": "0.5.6"
-      }
-    },
-    "babel-eslint": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-7.1.1.tgz",
-      "integrity": "sha1-imqITwhapwYK9pz8dzQcL5k3D7I=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.22.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0",
-        "babylon": "6.17.4",
-        "lodash.pickby": "4.6.0"
-      }
-    },
-    "babel-generator": {
-      "version": "6.25.0",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz",
-      "integrity": "sha1-M6GvcNXyiQrrRlpKd5PB32qeqfw=",
-      "requires": {
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0",
-        "detect-indent": "4.0.0",
-        "jsesc": "1.3.0",
-        "lodash": "4.17.2",
-        "source-map": "0.5.6",
-        "trim-right": "1.0.1"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
-        }
-      }
-    },
-    "babel-helper-bindify-decorators": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
-      "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-helper-builder-binary-assignment-operator-visitor": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
-      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
-      "dev": true,
-      "requires": {
-        "babel-helper-explode-assignable-expression": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-helper-builder-react-jsx": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.24.1.tgz",
-      "integrity": "sha1-CteRfjPI11HmRtrKTnfMGTd9LLw=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0",
-        "esutils": "2.0.2"
-      }
-    },
-    "babel-helper-call-delegate": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-      "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-helper-define-map": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz",
-      "integrity": "sha1-epdH8ljYlH0y1RX2qhx70CIEoIA=",
-      "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0",
-        "lodash": "4.17.2"
-      }
-    },
-    "babel-helper-explode-assignable-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
-      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-helper-explode-class": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
-      "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
-      "dev": true,
-      "requires": {
-        "babel-helper-bindify-decorators": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-helper-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-      "requires": {
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-helper-get-function-arity": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-helper-hoist-variables": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-helper-optimise-call-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-helper-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
-      "integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0",
-        "lodash": "4.17.2"
-      }
-    },
-    "babel-helper-remap-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-helper-replace-supers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-      "requires": {
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-helpers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0"
-      }
-    },
-    "babel-loader": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-6.3.2.tgz",
-      "integrity": "sha1-GN5FZjhVeMG0+P/my8Zo9eKl7wM=",
-      "dev": true,
-      "requires": {
-        "find-cache-dir": "0.1.1",
-        "loader-utils": "0.2.17",
-        "mkdirp": "0.5.1",
-        "object-assign": "4.1.1"
-      }
-    },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-check-es2015-constants": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-lodash": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/babel-plugin-lodash/-/babel-plugin-lodash-3.2.11.tgz",
-      "integrity": "sha1-Icj97J/hg176pzeHPjkCvdZtVwE=",
-      "dev": true,
-      "requires": {
-        "glob": "7.1.2",
-        "lodash": "4.17.2"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        }
-      }
-    },
-    "babel-plugin-react-intl": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-2.3.1.tgz",
-      "integrity": "sha1-PUORLoJNoAXgjo6COdW6eEN0uwA=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "intl-messageformat-parser": "1.2.0",
-        "mkdirp": "0.5.1"
-      }
-    },
-    "babel-plugin-recharts": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-recharts/-/babel-plugin-recharts-1.1.0.tgz",
-      "integrity": "sha1-gSzISxPrWN1AWyxjoo6m97JqtKc=",
-      "dev": true,
-      "requires": {
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0",
-        "babylon": "6.17.4"
-      }
-    },
-    "babel-plugin-syntax-async-functions": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-      "dev": true
-    },
-    "babel-plugin-syntax-async-generators": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
-      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
-      "dev": true
-    },
-    "babel-plugin-syntax-class-constructor-call": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
-      "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
-      "dev": true
-    },
-    "babel-plugin-syntax-class-properties": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
-      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
-      "dev": true
-    },
-    "babel-plugin-syntax-decorators": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
-      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
-      "dev": true
-    },
-    "babel-plugin-syntax-do-expressions": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
-      "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
-      "dev": true
-    },
-    "babel-plugin-syntax-dynamic-import": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
-      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
-      "dev": true
-    },
-    "babel-plugin-syntax-exponentiation-operator": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-      "dev": true
-    },
-    "babel-plugin-syntax-export-extensions": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
-      "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
-      "dev": true
-    },
-    "babel-plugin-syntax-flow": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
-      "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
-      "dev": true
-    },
-    "babel-plugin-syntax-function-bind": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
-      "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
-      "dev": true
-    },
-    "babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
-      "dev": true
-    },
-    "babel-plugin-syntax-object-rest-spread": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
-      "dev": true
-    },
-    "babel-plugin-syntax-trailing-function-commas": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
-      "dev": true
-    },
-    "babel-plugin-transform-async-generator-functions": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
-      "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
-      "dev": true,
-      "requires": {
-        "babel-helper-remap-async-to-generator": "6.24.1",
-        "babel-plugin-syntax-async-generators": "6.13.0",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
-      "dev": true,
-      "requires": {
-        "babel-helper-remap-async-to-generator": "6.24.1",
-        "babel-plugin-syntax-async-functions": "6.13.0",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-class-constructor-call": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
-      "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-class-constructor-call": "6.18.0",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-class-properties": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.23.0.tgz",
-      "integrity": "sha1-GHt0fuQEOZATVjyZPbA480dUrDs=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-plugin-syntax-class-properties": "6.13.0",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-decorators": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
-      "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
-      "dev": true,
-      "requires": {
-        "babel-helper-explode-class": "6.24.1",
-        "babel-plugin-syntax-decorators": "6.13.0",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-decorators-legacy": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.4.tgz",
-      "integrity": "sha1-dBtY9sW86eYCfgiC2cmU8E82aSU=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-decorators": "6.13.0",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-do-expressions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz",
-      "integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-do-expressions": "6.13.0",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-es2015-arrow-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-es2015-block-scoped-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-es2015-block-scoping": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz",
-      "integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0",
-        "lodash": "4.17.2"
-      }
-    },
-    "babel-plugin-transform-es2015-classes": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-      "requires": {
-        "babel-helper-define-map": "6.24.1",
-        "babel-helper-function-name": "6.24.1",
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-es2015-computed-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-es2015-destructuring": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-es2015-duplicate-keys": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
-      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-es2015-for-of": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-es2015-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-      "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-es2015-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-amd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
-      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
-      "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-commonjs": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz",
-      "integrity": "sha1-0+MQtA72ZKNmIiAAl8bUQCmPK/4=",
-      "requires": {
-        "babel-plugin-transform-strict-mode": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-systemjs": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
-      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
-      "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-umd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
-      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
-      "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-es2015-object-super": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-      "requires": {
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-es2015-parameters": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-      "requires": {
-        "babel-helper-call-delegate": "6.24.1",
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-template": "6.25.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-es2015-shorthand-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-es2015-spread": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-es2015-sticky-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-      "requires": {
-        "babel-helper-regex": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-plugin-transform-es2015-template-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-es2015-typeof-symbol": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-es2015-unicode-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-      "requires": {
-        "babel-helper-regex": "6.24.1",
-        "babel-runtime": "6.23.0",
-        "regexpu-core": "2.0.0"
-      }
-    },
-    "babel-plugin-transform-exponentiation-operator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
-      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
-      "dev": true,
-      "requires": {
-        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
-        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-export-extensions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
-      "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-export-extensions": "6.13.0",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-flow-strip-types": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
-      "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-flow": "6.18.0",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-function-bind": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz",
-      "integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-function-bind": "6.13.0",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-object-rest-spread": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz",
-      "integrity": "sha1-h11ryb52HFiirj/u5dxIldjH+SE=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-object-rest-spread": "6.13.0",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-react-display-name": {
-      "version": "6.25.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
-      "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-react-jsx": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
-      "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
-      "dev": true,
-      "requires": {
-        "babel-helper-builder-react-jsx": "6.24.1",
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-react-jsx-self": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz",
-      "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-react-jsx-source": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
-      "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.3.2.tgz",
-      "integrity": "sha1-bajYNMbXrYqwL5VlCXkM+qAf/hk=",
-      "dev": true
-    },
-    "babel-plugin-transform-regenerator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz",
-      "integrity": "sha1-uNowWtQ8PJm0hI5P5AN7dw0jxBg=",
-      "requires": {
-        "regenerator-transform": "0.9.11"
-      }
-    },
-    "babel-plugin-transform-runtime": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
-      "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.23.0"
-      }
-    },
-    "babel-plugin-transform-strict-mode": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0"
-      }
-    },
-    "babel-plugin-webpack-alias": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-webpack-alias/-/babel-plugin-webpack-alias-2.1.2.tgz",
-      "integrity": "sha1-BaG6I8KFlWYPtupXNkJPxZa0okc=",
-      "dev": true,
-      "requires": {
-        "babel-types": "6.25.0",
-        "find-up": "2.1.0",
-        "lodash.some": "4.6.0",
-        "lodash.template": "4.4.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "lodash.template": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-          "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-          "dev": true,
-          "requires": {
-            "lodash._reinterpolate": "3.0.0",
-            "lodash.templatesettings": "4.1.0"
-          }
-        },
-        "lodash.templatesettings": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
-          "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-          "dev": true,
-          "requires": {
-            "lodash._reinterpolate": "3.0.0"
-          }
-        }
-      }
-    },
-    "babel-polyfill": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz",
-      "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "core-js": "2.4.1",
-        "regenerator-runtime": "0.10.5"
-      }
-    },
-    "babel-preset-env": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.1.9.tgz",
-      "integrity": "sha1-SUQ9zW71K0i3GR6jOGniRZCp60o=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-check-es2015-constants": "6.22.0",
-        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
-        "babel-plugin-transform-async-to-generator": "6.24.1",
-        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "6.24.1",
-        "babel-plugin-transform-es2015-classes": "6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
-        "babel-plugin-transform-es2015-for-of": "6.23.0",
-        "babel-plugin-transform-es2015-function-name": "6.24.1",
-        "babel-plugin-transform-es2015-literals": "6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "6.24.1",
-        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
-        "babel-plugin-transform-es2015-object-super": "6.24.1",
-        "babel-plugin-transform-es2015-parameters": "6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-        "babel-plugin-transform-es2015-spread": "6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-        "babel-plugin-transform-exponentiation-operator": "6.24.1",
-        "babel-plugin-transform-regenerator": "6.24.1",
-        "browserslist": "1.7.7",
-        "electron-to-chromium": "1.3.16",
-        "invariant": "2.2.2"
-      }
-    },
-    "babel-preset-es2015": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.22.0.tgz",
-      "integrity": "sha1-r1qY7LNeuK92StiloF6zbcQ4aDU=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-check-es2015-constants": "6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "6.24.1",
-        "babel-plugin-transform-es2015-classes": "6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
-        "babel-plugin-transform-es2015-for-of": "6.23.0",
-        "babel-plugin-transform-es2015-function-name": "6.24.1",
-        "babel-plugin-transform-es2015-literals": "6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "6.24.1",
-        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
-        "babel-plugin-transform-es2015-object-super": "6.24.1",
-        "babel-plugin-transform-es2015-parameters": "6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-        "babel-plugin-transform-es2015-spread": "6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-        "babel-plugin-transform-regenerator": "6.24.1"
-      }
-    },
-    "babel-preset-es2016": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2016/-/babel-preset-es2016-6.22.0.tgz",
-      "integrity": "sha1-sGGqo5g9QMn7rPo3Q7XfN/M2FWw=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-exponentiation-operator": "6.24.1"
-      }
-    },
-    "babel-preset-es2017": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2017/-/babel-preset-es2017-6.22.0.tgz",
-      "integrity": "sha1-3i+dpaMMUNKT+1SguhXW3cVz8PI=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
-        "babel-plugin-transform-async-to-generator": "6.24.1"
-      }
-    },
-    "babel-preset-flow": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz",
-      "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-flow-strip-types": "6.22.0"
-      }
-    },
-    "babel-preset-react": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.23.0.tgz",
-      "integrity": "sha1-63zuTemKP5RQLChWUzLamBlFUZU=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-jsx": "6.18.0",
-        "babel-plugin-transform-react-display-name": "6.25.0",
-        "babel-plugin-transform-react-jsx": "6.24.1",
-        "babel-plugin-transform-react-jsx-self": "6.22.0",
-        "babel-plugin-transform-react-jsx-source": "6.22.0",
-        "babel-preset-flow": "6.23.0"
-      }
-    },
-    "babel-preset-stage-0": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.22.0.tgz",
-      "integrity": "sha1-cH7rW0Fdp2nv+cQvRUf2RPkpbvk=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-do-expressions": "6.22.0",
-        "babel-plugin-transform-function-bind": "6.22.0",
-        "babel-preset-stage-1": "6.24.1"
-      }
-    },
-    "babel-preset-stage-1": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",
-      "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-class-constructor-call": "6.24.1",
-        "babel-plugin-transform-export-extensions": "6.22.0",
-        "babel-preset-stage-2": "6.24.1"
-      }
-    },
-    "babel-preset-stage-2": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
-      "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-dynamic-import": "6.18.0",
-        "babel-plugin-transform-class-properties": "6.24.1",
-        "babel-plugin-transform-decorators": "6.24.1",
-        "babel-preset-stage-3": "6.24.1"
-      },
-      "dependencies": {
-        "babel-plugin-transform-class-properties": {
-          "version": "6.24.1",
-          "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
-          "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
-          "dev": true,
-          "requires": {
-            "babel-helper-function-name": "6.24.1",
-            "babel-plugin-syntax-class-properties": "6.13.0",
-            "babel-runtime": "6.23.0",
-            "babel-template": "6.25.0"
-          }
-        }
-      }
-    },
-    "babel-preset-stage-3": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
-      "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
-        "babel-plugin-transform-async-generator-functions": "6.24.1",
-        "babel-plugin-transform-async-to-generator": "6.24.1",
-        "babel-plugin-transform-exponentiation-operator": "6.24.1",
-        "babel-plugin-transform-object-rest-spread": "6.23.0"
-      }
-    },
-    "babel-register": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.23.0.tgz",
-      "integrity": "sha1-yao9TMqUtR2jSCbEoPnggUXXT/M=",
-      "dev": true,
-      "requires": {
-        "babel-core": "6.23.1",
-        "babel-runtime": "6.23.0",
-        "core-js": "2.4.1",
-        "home-or-tmp": "2.0.0",
-        "lodash": "4.17.2",
-        "mkdirp": "0.5.1",
-        "source-map-support": "0.4.15"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
-      "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
-      "requires": {
-        "core-js": "2.4.1",
-        "regenerator-runtime": "0.10.5"
-      }
-    },
-    "babel-template": {
-      "version": "6.25.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz",
-      "integrity": "sha1-ZlJBFmt8KqTGGdceGSlpVSsQwHE=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0",
-        "babylon": "6.17.4",
-        "lodash": "4.17.2"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.25.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz",
-      "integrity": "sha1-IldJfi/NGbie3BPEyROB+VEklvE=",
-      "requires": {
-        "babel-code-frame": "6.22.0",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0",
-        "babylon": "6.17.4",
-        "debug": "2.6.8",
-        "globals": "9.18.0",
-        "invariant": "2.2.2",
-        "lodash": "4.17.2"
-      }
-    },
-    "babel-types": {
-      "version": "6.25.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz",
-      "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "esutils": "2.0.2",
-        "lodash": "4.17.2",
-        "to-fast-properties": "1.0.3"
-      }
-    },
-    "babelify": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz",
-      "integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=",
-      "requires": {
-        "babel-core": "6.25.0",
-        "object-assign": "4.1.1"
-      },
-      "dependencies": {
-        "babel-core": {
-          "version": "6.25.0",
-          "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz",
-          "integrity": "sha1-fdQrBGPHQunVKW3rPsZ6kyLa1yk=",
-          "requires": {
-            "babel-code-frame": "6.22.0",
-            "babel-generator": "6.25.0",
-            "babel-helpers": "6.24.1",
-            "babel-messages": "6.23.0",
-            "babel-register": "6.24.1",
-            "babel-runtime": "6.23.0",
-            "babel-template": "6.25.0",
-            "babel-traverse": "6.25.0",
-            "babel-types": "6.25.0",
-            "babylon": "6.17.4",
-            "convert-source-map": "1.5.0",
-            "debug": "2.6.8",
-            "json5": "0.5.1",
-            "lodash": "4.17.2",
-            "minimatch": "3.0.4",
-            "path-is-absolute": "1.0.1",
-            "private": "0.1.7",
-            "slash": "1.0.0",
-            "source-map": "0.5.6"
-          }
-        },
-        "babel-register": {
-          "version": "6.24.1",
-          "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
-          "integrity": "sha1-fhDhOi9xBlvfrVoXh7pFvKbe118=",
-          "requires": {
-            "babel-core": "6.25.0",
-            "babel-runtime": "6.23.0",
-            "core-js": "2.4.1",
-            "home-or-tmp": "2.0.0",
-            "lodash": "4.17.2",
-            "mkdirp": "0.5.1",
-            "source-map-support": "0.4.15"
-          }
-        }
-      }
-    },
-    "babylon": {
-      "version": "6.17.4",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz",
-      "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw=="
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "base32.js": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.1.0.tgz",
-      "integrity": "sha1-tYLexpPC8R6JPPBk7mrFthMaIgI="
-    },
-    "base64-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
-      "dev": true
-    },
-    "batch-processor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
-      "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg="
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "optional": true,
-      "requires": {
-        "tweetnacl": "0.14.5"
-      }
-    },
-    "beeper": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak="
-    },
-    "big.js": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz",
-      "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg="
-    },
-    "bignumber.js": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-3.0.1.tgz",
-      "integrity": "sha1-gHZS0Q453jfp40lyR+3HmLt0b3Y="
-    },
-    "bin-build": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/bin-build/-/bin-build-2.2.0.tgz",
-      "integrity": "sha1-EfjdYfcP/Por3KpbRvXo/t1CIcw=",
-      "dev": true,
-      "requires": {
-        "archive-type": "3.2.0",
-        "decompress": "3.0.0",
-        "download": "4.4.3",
-        "exec-series": "1.0.3",
-        "rimraf": "2.6.1",
-        "tempfile": "1.1.1",
-        "url-regex": "3.2.0"
-      },
-      "dependencies": {
-        "tempfile": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz",
-          "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=",
-          "dev": true,
-          "requires": {
-            "os-tmpdir": "1.0.2",
-            "uuid": "2.0.3"
-          }
-        },
-        "uuid": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true
-        }
-      }
-    },
-    "bin-check": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-2.0.0.tgz",
-      "integrity": "sha1-hvjm9CU4k99g3DFpV/WvAqywWTA=",
-      "dev": true,
-      "requires": {
-        "executable": "1.1.0"
-      }
-    },
-    "bin-version": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz",
-      "integrity": "sha1-nrSY7m/Xb3q5p8FgQ2+JV5Q1144=",
-      "dev": true,
-      "requires": {
-        "find-versions": "1.2.1"
-      }
-    },
-    "bin-version-check": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz",
-      "integrity": "sha1-5OXfKQuQaffRETJAMe/BP90RpbA=",
-      "dev": true,
-      "requires": {
-        "bin-version": "1.0.4",
-        "minimist": "1.2.0",
-        "semver": "4.3.6",
-        "semver-truncate": "1.1.2"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-          "dev": true
-        }
-      }
-    },
-    "bin-wrapper": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-3.0.2.tgz",
-      "integrity": "sha1-Z9MwYmLksaXy+I7iNGT2plVneus=",
-      "dev": true,
-      "requires": {
-        "bin-check": "2.0.0",
-        "bin-version-check": "2.1.0",
-        "download": "4.4.3",
-        "each-async": "1.1.1",
-        "lazy-req": "1.1.0",
-        "os-filter-obj": "1.0.3"
-      }
-    },
-    "binary-extensions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.9.0.tgz",
-      "integrity": "sha1-ZlBsFs5vTWkopbPNajPKQelB43s=",
-      "dev": true
-    },
-    "bindings": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
-      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw=="
-    },
-    "bip66": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
-      "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "bl": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
-      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
-      "requires": {
-        "readable-stream": "2.3.3"
-      }
-    },
-    "block-stream": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "requires": {
-        "inherits": "2.0.3"
-      }
-    },
-    "blockies": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/blockies/-/blockies-0.0.2.tgz",
-      "integrity": "sha1-Iq1Y2k9rOCvHm/Q4bFggxwBH5O0="
-    },
-    "bluebird": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-      "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
-      "dev": true
-    },
-    "bn.js": {
-      "version": "4.11.7",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz",
-      "integrity": "sha512-LxFiV5mefv0ley0SzqkOPR1bC4EbpPx8LkOz5vMe/Yi15t5hzwgO/G+tc7wOtL4PZTYjwHu8JnEiSLumuSjSfA=="
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-      "requires": {
-        "hoek": "2.16.3"
-      }
-    },
-    "bowser": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.7.1.tgz",
-      "integrity": "sha1-pN6PGKGg3JUx6yqSoVIftqm6lqU="
-    },
-    "brace": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/brace/-/brace-0.9.0.tgz",
-      "integrity": "sha1-rQNLrmUiDrZ22UnLKAOD+o4S+nI=",
-      "requires": {
-        "w3c-blob": "0.0.1"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-      "requires": {
-        "balanced-match": "1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-      "requires": {
-        "expand-range": "1.8.2",
-        "preserve": "0.2.0",
-        "repeat-element": "1.1.2"
-      }
-    },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
-    },
-    "browser-stdout": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
-      "dev": true
-    },
-    "browserify-aes": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz",
-      "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=",
-      "requires": {
-        "buffer-xor": "1.0.3",
-        "cipher-base": "1.0.4",
-        "create-hash": "1.1.3",
-        "evp_bytestokey": "1.0.0",
-        "inherits": "2.0.3"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-      "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "1.0.6",
-        "browserify-des": "1.0.0",
-        "evp_bytestokey": "1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-      "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
-      "dev": true,
-      "requires": {
-        "cipher-base": "1.0.4",
-        "des.js": "1.0.0",
-        "inherits": "2.0.3"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.7",
-        "randombytes": "2.0.5"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.7",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
-        "elliptic": "6.4.0",
-        "inherits": "2.0.3",
-        "parse-asn1": "5.1.0"
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
-      "dev": true,
-      "requires": {
-        "pako": "0.2.9"
-      }
-    },
-    "browserslist": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-      "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-      "dev": true,
-      "requires": {
-        "caniuse-db": "1.0.30000708",
-        "electron-to-chromium": "1.3.16"
-      }
-    },
-    "buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-      "dev": true,
-      "requires": {
-        "base64-js": "1.2.1",
-        "ieee754": "1.1.8",
-        "isarray": "1.0.0"
-      }
-    },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
-    },
-    "buffer-to-vinyl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
-      "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=",
-      "requires": {
-        "file-type": "3.9.0",
-        "readable-stream": "2.3.3",
-        "uuid": "2.0.3",
-        "vinyl": "1.2.0"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho="
-        }
-      }
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
-    },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
-    },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "bytes": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
-      "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk="
-    },
-    "caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "dev": true,
-      "requires": {
-        "callsites": "0.2.0"
-      }
-    },
-    "callsites": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-      "dev": true
-    },
-    "camel-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
-      "dev": true,
-      "requires": {
-        "no-case": "2.3.1",
-        "upper-case": "1.1.3"
-      }
-    },
-    "camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
-    },
-    "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "requires": {
-        "camelcase": "2.1.1",
-        "map-obj": "1.0.1"
-      }
-    },
-    "caniuse-api": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
-      "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000708",
-        "lodash.memoize": "4.1.2",
-        "lodash.uniq": "4.5.0"
-      }
-    },
-    "caniuse-db": {
-      "version": "1.0.30000708",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000708.tgz",
-      "integrity": "sha1-wuc2vTt/xfbBTkxt/mK5jtFeils=",
-      "dev": true
-    },
-    "capture-stack-trace": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
-      "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "caw": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
-      "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
-      "requires": {
-        "get-proxy": "1.1.0",
-        "is-obj": "1.0.1",
-        "object-assign": "3.0.0",
-        "tunnel-agent": "0.4.3"
-      },
-      "dependencies": {
-        "object-assign": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
-        }
-      }
-    },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-      "requires": {
-        "align-text": "0.1.4",
-        "lazy-cache": "1.0.4"
-      }
-    },
-    "chai": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
-      "integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=",
-      "dev": true,
-      "requires": {
-        "assertion-error": "1.0.2",
-        "deep-eql": "0.1.3",
-        "type-detect": "1.0.0"
-      }
-    },
-    "chai-as-promised": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-6.0.0.tgz",
-      "integrity": "sha1-GgKkM6byTa+sY7nJb6FoTbGqjaY=",
-      "dev": true,
-      "requires": {
-        "check-error": "1.0.2"
-      }
-    },
-    "chai-enzyme": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/chai-enzyme/-/chai-enzyme-0.6.1.tgz",
-      "integrity": "sha1-WFyWPG6hMxRG79Eu6DkegH11hiA=",
-      "dev": true,
-      "requires": {
-        "html": "1.0.0",
-        "react-element-to-jsx-string": "5.0.7"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-          "dev": true
-        },
-        "react-element-to-jsx-string": {
-          "version": "5.0.7",
-          "resolved": "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-5.0.7.tgz",
-          "integrity": "sha1-xmOkgAqccSEVwNhRnLAhWkah8PI=",
-          "dev": true,
-          "requires": {
-            "collapse-white-space": "1.0.3",
-            "is-plain-object": "2.0.4",
-            "lodash": "4.17.4",
-            "sortobject": "1.1.1",
-            "stringify-object": "2.4.0",
-            "traverse": "0.6.6"
-          }
-        },
-        "stringify-object": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-2.4.0.tgz",
-          "integrity": "sha1-xi0RAj6yH+LZsIe+A5om3zsioJ0=",
-          "dev": true,
-          "requires": {
-            "is-plain-obj": "1.1.0",
-            "is-regexp": "1.0.0"
-          }
-        }
-      }
-    },
-    "chain-function": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/chain-function/-/chain-function-1.0.0.tgz",
-      "integrity": "sha1-DUqzfn4Y6tC9xHuSB2QRjOWHM9w="
-    },
-    "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "requires": {
-        "ansi-styles": "2.2.1",
-        "escape-string-regexp": "1.0.5",
-        "has-ansi": "2.0.0",
-        "strip-ansi": "3.0.1",
-        "supports-color": "2.0.0"
-      }
-    },
-    "change-emitter": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz",
-      "integrity": "sha1-6LL+PX8at9aaMhma/5HqaTFAlRU="
-    },
-    "check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-      "dev": true
-    },
-    "cheerio": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
-      "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=",
-      "dev": true,
-      "requires": {
-        "css-select": "1.2.0",
-        "dom-serializer": "0.1.0",
-        "entities": "1.1.1",
-        "htmlparser2": "3.9.2",
-        "lodash.assignin": "4.2.0",
-        "lodash.bind": "4.2.1",
-        "lodash.defaults": "4.2.0",
-        "lodash.filter": "4.6.0",
-        "lodash.flatten": "4.4.0",
-        "lodash.foreach": "4.5.0",
-        "lodash.map": "4.6.0",
-        "lodash.merge": "4.6.0",
-        "lodash.pick": "4.4.0",
-        "lodash.reduce": "4.6.0",
-        "lodash.reject": "4.6.0",
-        "lodash.some": "4.6.0"
-      }
-    },
-    "chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-      "dev": true,
-      "requires": {
-        "anymatch": "1.3.2",
-        "async-each": "1.0.1",
-        "glob-parent": "2.0.0",
-        "inherits": "2.0.3",
-        "is-binary-path": "1.0.1",
-        "is-glob": "2.0.1",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.1.0"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-          "dev": true,
-          "requires": {
-            "is-glob": "2.0.1"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        }
-      }
-    },
-    "chownr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
-    },
-    "ci-info": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz",
-      "integrity": "sha1-3FKF8rTiUYIWg2gcOBwziPRuxTQ="
-    },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "circular-dependency-plugin": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-2.0.0.tgz",
-      "integrity": "sha1-wQeWyDOQSIqbzdQvAy1uZOmE9mA=",
-      "dev": true
-    },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
-    },
-    "clap": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz",
-      "integrity": "sha1-WckP4+E3EEdG/xlGmiemNP9oyFc=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3"
-      }
-    },
-    "classnames": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz",
-      "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0="
-    },
-    "clean-css": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.7.tgz",
-      "integrity": "sha1-ua6k+FZ5iJzz6ui0A0nsTr390DI=",
-      "dev": true,
-      "requires": {
-        "source-map": "0.5.6"
-      }
-    },
-    "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "requires": {
-        "restore-cursor": "2.0.0"
-      }
-    },
-    "cli-width": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz",
-      "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao="
-    },
-    "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
-      }
-    },
-    "clone": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk="
-    },
-    "clone-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz",
-      "integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=",
-      "dev": true,
-      "requires": {
-        "is-regexp": "1.0.0",
-        "is-supported-regexp-flag": "1.0.0"
-      }
-    },
-    "clone-stats": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE="
-    },
-    "cmd-shim": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz",
-      "integrity": "sha1-b8vamUg6j9FdfTChlspp1oii79s=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "mkdirp": "0.5.1"
-      }
-    },
-    "co": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
-      "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g="
-    },
-    "coa": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz",
-      "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
-      "dev": true,
-      "requires": {
-        "q": "1.5.0"
-      }
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
-    "codemirror": {
-      "version": "5.28.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.28.0.tgz",
-      "integrity": "sha512-E/Z6050shti9v9ivl0dUClVRM4xaH204jsJmEpNYC6KDTlQwAz+5DdhLzn0tjaL/Mp1P0J1uhZokcSP2RFSwlA=="
-    },
-    "collapse-white-space": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz",
-      "integrity": "sha1-S5BvZw5aljqHt2sOFolkM0G2Ajw="
-    },
-    "color": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
-      "dev": true,
-      "requires": {
-        "clone": "1.0.2",
-        "color-convert": "1.9.0",
-        "color-string": "0.3.0"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
-      "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-diff": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/color-diff/-/color-diff-0.1.7.tgz",
-      "integrity": "sha1-bbeM2UgqjkWdQIIer0tQMoPcuOI=",
-      "dev": true
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "color-string": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
-      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "colorguard": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.0.tgz",
-      "integrity": "sha1-8/rK9cquuk71RlPZ+yW7cxd8DYQ=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "color-diff": "0.1.7",
-        "log-symbols": "1.0.2",
-        "object-assign": "4.1.1",
-        "pipetteur": "2.0.3",
-        "plur": "2.1.2",
-        "postcss": "5.2.17",
-        "postcss-reporter": "1.4.1",
-        "text-table": "0.2.0",
-        "yargs": "1.3.3"
-      },
-      "dependencies": {
-        "postcss-reporter": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz",
-          "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "lodash": "4.17.2",
-            "log-symbols": "1.0.2",
-            "postcss": "5.2.17"
-          }
-        },
-        "yargs": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
-          "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=",
-          "dev": true
-        }
-      }
-    },
-    "colormin": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
-      "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
-      "dev": true,
-      "requires": {
-        "color": "0.11.4",
-        "css-color-names": "0.0.4",
-        "has": "1.0.1"
-      }
-    },
-    "colors": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-      "requires": {
-        "delayed-stream": "1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-      "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
-      "requires": {
-        "graceful-readlink": "1.0.1"
-      }
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "commonmark": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.24.0.tgz",
-      "integrity": "sha1-uA3gGCxUY1VkOqFdsSv7KCNoJ48=",
-      "requires": {
-        "entities": "1.1.1",
-        "mdurl": "1.0.1",
-        "string.prototype.repeat": "0.2.0"
-      }
-    },
-    "commonmark-react-renderer": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/commonmark-react-renderer/-/commonmark-react-renderer-4.3.3.tgz",
-      "integrity": "sha1-nEvKE4vIMoe655LM8TNzi+nLxvo=",
-      "requires": {
-        "in-publish": "2.0.0",
-        "lodash.assign": "4.2.0",
-        "lodash.isplainobject": "4.0.6",
-        "pascalcase": "0.1.1",
-        "xss-filters": "1.2.7"
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "concat-stream": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "typedarray": "0.0.6"
-      }
-    },
-    "console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "dev": true,
-      "requires": {
-        "date-now": "0.1.4"
-      },
-      "dependencies": {
-        "date-now": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-          "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
-          "dev": true
-        }
-      }
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-    },
-    "console-stream": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz",
-      "integrity": "sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=",
-      "dev": true
-    },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-      "dev": true
-    },
-    "content-type": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz",
-      "integrity": "sha1-t9ETrueo3Se9IRM8TcJSnfFyHu0=",
-      "dev": true
-    },
-    "content-type-parser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.1.tgz",
-      "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU="
-    },
-    "cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-      "dev": true
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-      "dev": true
-    },
-    "copy-to-clipboard": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz",
-      "integrity": "sha512-c3GdeY8qxCHGezVb1EFQfHYK/8NZRemgcTIzPq7PuxjHAf/raKibn2QdhHPb/y6q74PMgH6yizaDZlRmw6QyKw==",
-      "requires": {
-        "toggle-selection": "1.0.6"
-      }
-    },
-    "copy-webpack-plugin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz",
-      "integrity": "sha1-lyjjg7lDFgUNDHRjlY8rhcCqggA=",
-      "dev": true,
-      "requires": {
-        "bluebird": "2.11.0",
-        "fs-extra": "0.26.7",
-        "glob": "6.0.4",
-        "is-glob": "3.1.0",
-        "loader-utils": "0.2.17",
-        "lodash": "4.17.2",
-        "minimatch": "3.0.4",
-        "node-dir": "0.1.17"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "6.0.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-          "dev": true,
-          "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        }
-      }
-    },
-    "core-js": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-      "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4="
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "cosmiconfig": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
-      "dev": true,
-      "requires": {
-        "is-directory": "0.3.1",
-        "js-yaml": "3.6.1",
-        "minimist": "1.2.0",
-        "object-assign": "4.1.1",
-        "os-homedir": "1.0.2",
-        "parse-json": "2.2.0",
-        "require-from-string": "1.2.1"
-      }
-    },
-    "coveralls": {
-      "version": "2.11.16",
-      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.11.16.tgz",
-      "integrity": "sha1-2pBhJlFC3e6VT2g3kSK+l76KtLE=",
-      "dev": true,
-      "requires": {
-        "js-yaml": "3.6.1",
-        "lcov-parse": "0.0.10",
-        "log-driver": "1.2.5",
-        "minimist": "1.2.0",
-        "request": "2.79.0"
-      },
-      "dependencies": {
-        "caseless": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-          "dev": true
-        },
-        "commander": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-          "dev": true
-        },
-        "extend": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-          "dev": true
-        },
-        "har-validator": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "commander": "2.11.0",
-            "is-my-json-valid": "2.16.0",
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "request": {
-          "version": "2.79.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-          "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-          "dev": true,
-          "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "caseless": "0.11.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "2.0.6",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.16",
-            "oauth-sign": "0.8.2",
-            "qs": "6.3.0",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
-            "tunnel-agent": "0.4.3",
-            "uuid": "3.0.0"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true
-        }
-      }
-    },
-    "create-ecdh": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-      "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.7",
-        "elliptic": "6.4.0"
-      }
-    },
-    "create-error-class": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-      "requires": {
-        "capture-stack-trace": "1.0.0"
-      }
-    },
-    "create-hash": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
-      "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
-      "requires": {
-        "cipher-base": "1.0.4",
-        "inherits": "2.0.3",
-        "ripemd160": "2.0.1",
-        "sha.js": "2.4.8"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
-      "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
-      "requires": {
-        "cipher-base": "1.0.4",
-        "create-hash": "1.1.3",
-        "inherits": "2.0.3",
-        "ripemd160": "2.0.1",
-        "safe-buffer": "5.1.1",
-        "sha.js": "2.4.8"
-      }
-    },
-    "create-thenable": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/create-thenable/-/create-thenable-1.0.2.tgz",
-      "integrity": "sha1-4gMXIMzJV12M+jH1wUbnYqgMBTQ=",
-      "dev": true,
-      "requires": {
-        "object.omit": "2.0.1",
-        "unique-concat": "0.2.2"
-      }
-    },
-    "cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-      "dev": true,
-      "requires": {
-        "lru-cache": "4.1.1",
-        "shebang-command": "1.2.0",
-        "which": "1.2.14"
-      }
-    },
-    "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-      "requires": {
-        "boom": "2.10.1"
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.11.1",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz",
-      "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "1.0.0",
-        "browserify-sign": "4.0.4",
-        "create-ecdh": "4.0.0",
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
-        "diffie-hellman": "5.0.2",
-        "inherits": "2.0.3",
-        "pbkdf2": "3.0.12",
-        "public-encrypt": "4.0.0",
-        "randombytes": "2.0.5"
-      }
-    },
-    "crypto-js": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.8.tgz",
-      "integrity": "sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU="
-    },
-    "css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-      "dev": true
-    },
-    "css-loader": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.26.1.tgz",
-      "integrity": "sha1-K6fyATG5NZdJaz6btQB4WknNKeo=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.22.0",
-        "css-selector-tokenizer": "0.7.0",
-        "cssnano": "3.10.0",
-        "loader-utils": "0.2.17",
-        "lodash.camelcase": "4.3.0",
-        "object-assign": "4.1.1",
-        "postcss": "5.2.17",
-        "postcss-modules-extract-imports": "1.1.0",
-        "postcss-modules-local-by-default": "1.2.0",
-        "postcss-modules-scope": "1.1.0",
-        "postcss-modules-values": "1.3.0",
-        "source-list-map": "0.1.8"
-      }
-    },
-    "css-rule-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
-      "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
-      "dev": true,
-      "requires": {
-        "css-tokenize": "1.0.1",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "1.2.1",
-        "through2": "0.6.5"
-      },
-      "dependencies": {
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "1.1.14"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "css-select": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-      "dev": true,
-      "requires": {
-        "boolbase": "1.0.0",
-        "css-what": "2.1.0",
-        "domutils": "1.5.1",
-        "nth-check": "1.0.1"
-      }
-    },
-    "css-selector-tokenizer": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
-      "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
-      "dev": true,
-      "requires": {
-        "cssesc": "0.1.0",
-        "fastparse": "1.1.1",
-        "regexpu-core": "1.0.0"
-      },
-      "dependencies": {
-        "regexpu-core": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
-          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
-          "dev": true,
-          "requires": {
-            "regenerate": "1.3.2",
-            "regjsgen": "0.2.0",
-            "regjsparser": "0.1.5"
-          }
-        }
-      }
-    },
-    "css-tokenize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
-      "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "1.1.14"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "css-what": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
-      "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
-      "dev": true
-    },
-    "cssesc": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
-      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
-      "dev": true
-    },
-    "cssnano": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
-      "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
-      "dev": true,
-      "requires": {
-        "autoprefixer": "6.7.7",
-        "decamelize": "1.2.0",
-        "defined": "1.0.0",
-        "has": "1.0.1",
-        "object-assign": "4.1.1",
-        "postcss": "5.2.17",
-        "postcss-calc": "5.3.1",
-        "postcss-colormin": "2.2.2",
-        "postcss-convert-values": "2.6.1",
-        "postcss-discard-comments": "2.0.4",
-        "postcss-discard-duplicates": "2.1.0",
-        "postcss-discard-empty": "2.1.0",
-        "postcss-discard-overridden": "0.1.1",
-        "postcss-discard-unused": "2.2.3",
-        "postcss-filter-plugins": "2.0.2",
-        "postcss-merge-idents": "2.1.7",
-        "postcss-merge-longhand": "2.0.2",
-        "postcss-merge-rules": "2.1.2",
-        "postcss-minify-font-values": "1.0.5",
-        "postcss-minify-gradients": "1.0.5",
-        "postcss-minify-params": "1.2.2",
-        "postcss-minify-selectors": "2.1.1",
-        "postcss-normalize-charset": "1.1.1",
-        "postcss-normalize-url": "3.0.8",
-        "postcss-ordered-values": "2.2.3",
-        "postcss-reduce-idents": "2.4.0",
-        "postcss-reduce-initial": "1.0.1",
-        "postcss-reduce-transforms": "1.0.4",
-        "postcss-svgo": "2.1.6",
-        "postcss-unique-selectors": "2.0.2",
-        "postcss-value-parser": "3.3.0",
-        "postcss-zindex": "2.2.0"
-      }
-    },
-    "csso": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
-      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
-      "dev": true,
-      "requires": {
-        "clap": "1.2.0",
-        "source-map": "0.5.6"
-      }
-    },
-    "cssom": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
-      "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=",
-      "dev": true
-    },
-    "cssstyle": {
-      "version": "0.2.37",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
-      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
-      "dev": true,
-      "requires": {
-        "cssom": "0.3.2"
-      }
-    },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "requires": {
-        "array-find-index": "1.0.2"
-      }
-    },
-    "d": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-      "dev": true,
-      "requires": {
-        "es5-ext": "0.10.24"
-      }
-    },
-    "d3-array": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.0.tgz",
-      "integrity": "sha1-FH0mlyDhdMQFen9CvosPPyulMQg="
-    },
-    "d3-collection": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.4.tgz",
-      "integrity": "sha1-NC39EoN8kJdPM/HMCnha6lcNzcI="
-    },
-    "d3-color": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.0.3.tgz",
-      "integrity": "sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs="
-    },
-    "d3-format": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.0.tgz",
-      "integrity": "sha1-a0gLqohohdRlHcJIqPSsnaFtsHo="
-    },
-    "d3-interpolate": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.5.tgz",
-      "integrity": "sha1-aeCZ/zkhRxblY8muw+qdHqS4p58=",
-      "requires": {
-        "d3-color": "1.0.3"
-      }
-    },
-    "d3-path": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.5.tgz",
-      "integrity": "sha1-JB6xhJvZ6egCHA0KeZ+KDo5EF2Q="
-    },
-    "d3-scale": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.0.tgz",
-      "integrity": "sha1-C0F1yjHL5l4lRCfkZi3678NzRi0=",
-      "requires": {
-        "d3-array": "1.2.0",
-        "d3-collection": "1.0.4",
-        "d3-color": "1.0.3",
-        "d3-format": "1.2.0",
-        "d3-interpolate": "1.1.5",
-        "d3-time": "1.0.7",
-        "d3-time-format": "2.0.5"
-      }
-    },
-    "d3-shape": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.0.0.tgz",
-      "integrity": "sha1-zKMySHV55Fc1TIg4oKKDvmOEWbo=",
-      "requires": {
-        "d3-path": "1.0.5"
-      }
-    },
-    "d3-time": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.7.tgz",
-      "integrity": "sha1-lMr27bt4ebuAnQ0fdXK8SEgvcnA="
-    },
-    "d3-time-format": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.0.5.tgz",
-      "integrity": "sha1-nXeAIE98kRnJFwsaVttN6aivly4=",
-      "requires": {
-        "d3-time": "1.0.7"
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
-    },
-    "date-difference": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/date-difference/-/date-difference-1.0.0.tgz",
-      "integrity": "sha1-0+bog8DK0tydv8vxLgYpe5cpiXQ=",
-      "requires": {
-        "get-stdin": "3.0.2",
-        "meow": "3.7.0"
-      }
-    },
-    "date-now": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-1.0.1.tgz",
-      "integrity": "sha1-u30IZDjevkGCpIX7PfP7+5nWFTw="
-    },
-    "dateformat": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz",
-      "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc="
-    },
-    "death": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/death/-/death-1.1.0.tgz",
-      "integrity": "sha1-AaqcQB7dknUFFEcLgmY5DGbGcxg="
-    },
-    "debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.0.0.tgz",
-      "integrity": "sha1-CUivUT0uTOQHkW+FBqQj0/nPctg=",
-      "requires": {
-        "date-now": "1.0.1"
-      }
-    },
-    "debug": {
-      "version": "2.6.8",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-    },
-    "decompress": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
-      "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
-      "requires": {
-        "buffer-to-vinyl": "1.1.0",
-        "concat-stream": "1.6.0",
-        "decompress-tar": "3.1.0",
-        "decompress-tarbz2": "3.1.0",
-        "decompress-targz": "3.1.0",
-        "decompress-unzip": "3.4.0",
-        "stream-combiner2": "1.1.1",
-        "vinyl-assign": "1.2.1",
-        "vinyl-fs": "2.4.4"
-      }
-    },
-    "decompress-tar": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
-      "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
-      "requires": {
-        "is-tar": "1.0.0",
-        "object-assign": "2.1.1",
-        "strip-dirs": "1.1.1",
-        "tar-stream": "1.5.4",
-        "through2": "0.6.5",
-        "vinyl": "0.4.6"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8="
-        },
-        "object-assign": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
-        },
-        "vinyl": {
-          "version": "0.4.6",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-          "requires": {
-            "clone": "0.2.0",
-            "clone-stats": "0.0.1"
-          }
-        }
-      }
-    },
-    "decompress-tarbz2": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
-      "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
-      "requires": {
-        "is-bzip2": "1.0.0",
-        "object-assign": "2.1.1",
-        "seek-bzip": "1.0.5",
-        "strip-dirs": "1.1.1",
-        "tar-stream": "1.5.4",
-        "through2": "0.6.5",
-        "vinyl": "0.4.6"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8="
-        },
-        "object-assign": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
-        },
-        "vinyl": {
-          "version": "0.4.6",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-          "requires": {
-            "clone": "0.2.0",
-            "clone-stats": "0.0.1"
-          }
-        }
-      }
-    },
-    "decompress-targz": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
-      "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
-      "requires": {
-        "is-gzip": "1.0.0",
-        "object-assign": "2.1.1",
-        "strip-dirs": "1.1.1",
-        "tar-stream": "1.5.4",
-        "through2": "0.6.5",
-        "vinyl": "0.4.6"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8="
-        },
-        "object-assign": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
-        },
-        "vinyl": {
-          "version": "0.4.6",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-          "requires": {
-            "clone": "0.2.0",
-            "clone-stats": "0.0.1"
-          }
-        }
-      }
-    },
-    "decompress-unzip": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
-      "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
-      "requires": {
-        "is-zip": "1.0.0",
-        "read-all-stream": "3.1.0",
-        "stat-mode": "0.2.2",
-        "strip-dirs": "1.1.1",
-        "through2": "2.0.3",
-        "vinyl": "1.2.0",
-        "yauzl": "2.8.0"
-      },
-      "dependencies": {
-        "through2": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-          "requires": {
-            "readable-stream": "2.3.3",
-            "xtend": "4.0.1"
-          }
-        }
-      }
-    },
-    "deep-eql": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
-      "integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=",
-      "dev": true,
-      "requires": {
-        "type-detect": "0.1.1"
-      },
-      "dependencies": {
-        "type-detect": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
-          "integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=",
-          "dev": true
-        }
-      }
-    },
-    "deep-equal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
-    },
-    "deep-extend": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "default-require-extensions": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
-      "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
-      "dev": true,
-      "requires": {
-        "strip-bom": "2.0.0"
-      }
-    },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "requires": {
-        "clone": "1.0.2"
-      }
-    },
-    "define-properties": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-      "dev": true,
-      "requires": {
-        "foreach": "2.0.5",
-        "object-keys": "1.0.11"
-      }
-    },
-    "defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-      "dev": true
-    },
-    "del": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-      "dev": true,
-      "requires": {
-        "globby": "5.0.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.0",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "rimraf": "2.6.1"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-    },
-    "depd": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-      "dev": true
-    },
-    "des.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
-      }
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
-    },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "requires": {
-        "repeating": "2.0.1"
-      }
-    },
-    "diff": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
-      "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
-      "dev": true
-    },
-    "diffie-hellman": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
-      "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.7",
-        "miller-rabin": "4.0.0",
-        "randombytes": "2.0.5"
-      }
-    },
-    "doctrine": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-      "dev": true,
-      "requires": {
-        "esutils": "2.0.2",
-        "isarray": "1.0.0"
-      }
-    },
-    "doiuse": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-2.6.0.tgz",
-      "integrity": "sha1-GJLRC2Gpo1at2/K2FJM+gfi7ODQ=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000708",
-        "css-rule-stream": "1.1.0",
-        "duplexer2": "0.0.2",
-        "jsonfilter": "1.1.2",
-        "ldjson-stream": "1.2.1",
-        "lodash": "4.17.2",
-        "multimatch": "2.1.0",
-        "postcss": "5.2.17",
-        "source-map": "0.4.4",
-        "through2": "0.6.5",
-        "yargs": "3.32.0"
-      },
-      "dependencies": {
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "1.1.14"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "requires": {
-            "amdefine": "1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "window-size": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
-          "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "3.32.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
-          "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
-          "dev": true,
-          "requires": {
-            "camelcase": "2.1.1",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "os-locale": "1.4.0",
-            "string-width": "1.0.2",
-            "window-size": "0.1.4",
-            "y18n": "3.2.1"
-          }
-        }
-      }
-    },
-    "dom-converter": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz",
-      "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=",
-      "dev": true,
-      "requires": {
-        "utila": "0.3.3"
-      },
-      "dependencies": {
-        "utila": {
-          "version": "0.3.3",
-          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
-          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
-          "dev": true
-        }
-      }
-    },
-    "dom-helpers": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.2.1.tgz",
-      "integrity": "sha1-MgPgf+0he9H0JLAZc1WC/Deyglo="
-    },
-    "dom-serializer": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1.1.3",
-        "entities": "1.1.1"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-          "dev": true
-        }
-      }
-    },
-    "dom-walk": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
-      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=",
-      "dev": true
-    },
-    "domain-browser": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
-      "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
-      "dev": true
-    },
-    "domelementtype": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1.3.0"
-      }
-    },
-    "domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0.1.0",
-        "domelementtype": "1.3.0"
-      }
-    },
-    "download": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
-      "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
-      "requires": {
-        "caw": "1.2.0",
-        "concat-stream": "1.6.0",
-        "each-async": "1.1.1",
-        "filenamify": "1.2.1",
-        "got": "5.7.1",
-        "gulp-decompress": "1.2.0",
-        "gulp-rename": "1.2.2",
-        "is-url": "1.2.2",
-        "object-assign": "4.1.1",
-        "read-all-stream": "3.1.0",
-        "readable-stream": "2.3.3",
-        "stream-combiner2": "1.1.1",
-        "vinyl": "1.2.0",
-        "vinyl-fs": "2.4.4",
-        "ware": "1.3.0"
-      }
-    },
-    "drbg.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
-      "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=",
-      "requires": {
-        "browserify-aes": "1.0.6",
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6"
-      }
-    },
-    "duplexer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-      "dev": true
-    },
-    "duplexer2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-      "requires": {
-        "readable-stream": "2.3.3"
-      }
-    },
-    "duplexify": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
-      "integrity": "sha1-GqdzAC4VeEV+nZ1KULDMquvL1gQ=",
-      "requires": {
-        "end-of-stream": "1.0.0",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "stream-shift": "1.0.0"
-      },
-      "dependencies": {
-        "end-of-stream": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
-          "integrity": "sha1-1FlucCc0qT5A6a+GQxnqvZn/Lw4=",
-          "requires": {
-            "once": "1.3.3"
-          }
-        },
-        "once": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-          "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        }
-      }
-    },
-    "each-async": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
-      "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=",
-      "requires": {
-        "onetime": "1.1.0",
-        "set-immediate-shim": "1.0.1"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "optional": true,
-      "requires": {
-        "jsbn": "0.1.1"
-      }
-    },
-    "editions": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz",
-      "integrity": "sha1-CQcQG92iD6w8vjNMJ8vQaI3Jmls="
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "ejs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-1.0.0.tgz",
-      "integrity": "sha1-ycYKSKRu5FL7MqccMXuV5aofyz0=",
-      "dev": true
-    },
-    "ejs-loader": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/ejs-loader/-/ejs-loader-0.3.0.tgz",
-      "integrity": "sha1-aHNv3CMaSQ7fkZpkRq2dkFWlh74=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "0.2.17",
-        "lodash": "3.10.1"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true
-        }
-      }
-    },
-    "ejsify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ejsify/-/ejsify-1.0.0.tgz",
-      "integrity": "sha1-NxlPWoXBKuQ4QpOVeZ7Ee0O8RT8=",
-      "dev": true,
-      "requires": {
-        "ejs": "1.0.0",
-        "through": "2.3.8"
-      }
-    },
-    "electron-to-chromium": {
-      "version": "1.3.16",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.16.tgz",
-      "integrity": "sha1-0OAmc1dUdwkBrjAaIWZMukXZL30=",
-      "dev": true
-    },
-    "element-resize-detector": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.1.12.tgz",
-      "integrity": "sha1-iz/W7t2hf5wAs2Cg6i35knroC6I=",
-      "requires": {
-        "batch-processor": "1.0.0"
-      }
-    },
-    "elliptic": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
-      "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
-      "requires": {
-        "bn.js": "4.11.7",
-        "brorand": "1.1.0",
-        "hash.js": "1.1.3",
-        "hmac-drbg": "1.0.1",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0",
-        "minimalistic-crypto-utils": "1.0.1"
-      }
-    },
-    "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
-    },
-    "empty-module": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/empty-module/-/empty-module-0.0.2.tgz",
-      "integrity": "sha1-E7TdjUr+3dNeUMGNzXiMUQh/FUU=",
-      "dev": true
-    },
-    "encodeurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
-      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=",
-      "dev": true
-    },
-    "encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-      "requires": {
-        "iconv-lite": "0.4.18"
-      }
-    },
-    "end-of-stream": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-      "requires": {
-        "once": "1.4.0"
-      }
-    },
-    "enhanced-resolve": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
-      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "memory-fs": "0.4.1",
-        "object-assign": "4.1.1",
-        "tapable": "0.2.7"
-      }
-    },
-    "entities": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
-    },
-    "enzyme": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-2.7.1.tgz",
-      "integrity": "sha1-djcOHZnpH3MJG7jEMUt8EozC1iE=",
-      "dev": true,
-      "requires": {
-        "cheerio": "0.22.0",
-        "function.prototype.name": "1.0.3",
-        "is-subset": "0.1.1",
-        "lodash": "4.17.2",
-        "object-is": "1.0.1",
-        "object.assign": "4.0.4",
-        "object.entries": "1.0.4",
-        "object.values": "1.0.4",
-        "uuid": "2.0.3"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true
-        }
-      }
-    },
-    "errno": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
-      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
-      "dev": true,
-      "requires": {
-        "prr": "0.0.0"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-      "requires": {
-        "is-arrayish": "0.2.1"
-      }
-    },
-    "error-stack-parser": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz",
-      "integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=",
-      "dev": true,
-      "requires": {
-        "stackframe": "0.3.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.7.0.tgz",
-      "integrity": "sha1-363ndOAb/Nl/lhgCmMRJyGI/uUw=",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "1.1.1",
-        "function-bind": "1.1.0",
-        "is-callable": "1.1.3",
-        "is-regex": "1.0.4"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-      "dev": true,
-      "requires": {
-        "is-callable": "1.1.3",
-        "is-date-object": "1.0.1",
-        "is-symbol": "1.0.1"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.24",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz",
-      "integrity": "sha1-pVh3yZJLwMjZvTwsvhdJWsFwmxQ=",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "2.0.1",
-        "es6-symbol": "3.1.1"
-      }
-    },
-    "es6-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.0.0.tgz",
-      "integrity": "sha1-8JTHBB9mJZm7EnINoFnWucf/D0A="
-    },
-    "es6-iterator": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
-      "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.24",
-        "es6-symbol": "3.1.1"
-      }
-    },
-    "es6-map": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.24",
-        "es6-iterator": "2.0.1",
-        "es6-set": "0.1.5",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "0.3.5"
-      }
-    },
-    "es6-promise": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz",
-      "integrity": "sha1-eILzCt3lskDM+n99eMVIMwlRrkI="
-    },
-    "es6-set": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.24",
-        "es6-iterator": "2.0.1",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "0.3.5"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.24"
-      }
-    },
-    "es6-templates": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz",
-      "integrity": "sha1-XLmsn7He1usSOTQrgdeSu7QHjuQ=",
-      "dev": true,
-      "requires": {
-        "recast": "0.11.23",
-        "through": "2.3.8"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
-      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.24",
-        "es6-iterator": "2.0.1",
-        "es6-symbol": "3.1.1"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "escodegen": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-      "dev": true,
-      "requires": {
-        "esprima": "2.7.3",
-        "estraverse": "1.9.3",
-        "esutils": "2.0.2",
-        "optionator": "0.8.2",
-        "source-map": "0.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "amdefine": "1.0.1"
-          }
-        }
-      }
-    },
-    "escope": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-      "dev": true,
-      "requires": {
-        "es6-map": "0.1.5",
-        "es6-weak-map": "2.0.2",
-        "esrecurse": "4.2.0",
-        "estraverse": "4.2.0"
-      }
-    },
-    "eslint": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.16.1.tgz",
-      "integrity": "sha1-m8MfxzQWks93LoBgdQj2fXEcVgk=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.22.0",
-        "chalk": "1.1.3",
-        "concat-stream": "1.6.0",
-        "debug": "2.6.8",
-        "doctrine": "1.5.0",
-        "escope": "3.6.0",
-        "espree": "3.4.3",
-        "estraverse": "4.2.0",
-        "esutils": "2.0.2",
-        "file-entry-cache": "2.0.0",
-        "glob": "7.1.2",
-        "globals": "9.18.0",
-        "ignore": "3.3.3",
-        "imurmurhash": "0.1.4",
-        "inquirer": "0.12.0",
-        "is-my-json-valid": "2.16.0",
-        "is-resolvable": "1.0.0",
-        "js-yaml": "3.6.1",
-        "json-stable-stringify": "1.0.1",
-        "levn": "0.3.0",
-        "lodash": "4.17.2",
-        "mkdirp": "0.5.1",
-        "natural-compare": "1.4.0",
-        "optionator": "0.8.2",
-        "path-is-inside": "1.0.2",
-        "pluralize": "1.2.1",
-        "progress": "1.1.8",
-        "require-uncached": "1.0.3",
-        "shelljs": "0.7.8",
-        "strip-bom": "3.0.0",
-        "strip-json-comments": "2.0.1",
-        "table": "3.8.3",
-        "text-table": "0.2.0",
-        "user-home": "2.0.0"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-          "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-          "dev": true
-        },
-        "cli-cursor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-          "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-          "dev": true,
-          "requires": {
-            "restore-cursor": "1.0.1"
-          }
-        },
-        "figures": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "1.0.5",
-            "object-assign": "4.1.1"
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "inquirer": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
-          "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-          "dev": true,
-          "requires": {
-            "ansi-escapes": "1.4.0",
-            "ansi-regex": "2.1.1",
-            "chalk": "1.1.3",
-            "cli-cursor": "1.0.2",
-            "cli-width": "2.1.0",
-            "figures": "1.7.0",
-            "lodash": "4.17.2",
-            "readline2": "1.0.1",
-            "run-async": "0.1.0",
-            "rx-lite": "3.1.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "through": "2.3.8"
-          }
-        },
-        "restore-cursor": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-          "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-          "dev": true,
-          "requires": {
-            "exit-hook": "1.1.1",
-            "onetime": "1.1.0"
-          }
-        },
-        "run-async": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-          "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-          "dev": true,
-          "requires": {
-            "once": "1.4.0"
-          }
-        },
-        "rx-lite": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
-          "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
-          "dev": true
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "user-home": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
-          "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
-          "dev": true,
-          "requires": {
-            "os-homedir": "1.0.2"
-          }
-        }
-      }
-    },
-    "eslint-config-semistandard": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-semistandard/-/eslint-config-semistandard-7.0.0.tgz",
-      "integrity": "sha1-+ANJP1alFy9/WcNa5kg2C0Hy/3E=",
-      "dev": true
-    },
-    "eslint-config-standard": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-6.2.1.tgz",
-      "integrity": "sha1-06aKr8cZFjnn7kQec0hzkCY1QpI=",
-      "dev": true
-    },
-    "eslint-config-standard-jsx": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-3.3.0.tgz",
-      "integrity": "sha1-yrCAGhWjYL9j+suXqyL73YjYpeA=",
-      "dev": true
-    },
-    "eslint-config-standard-react": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard-react/-/eslint-config-standard-react-4.2.0.tgz",
-      "integrity": "sha1-0V/SXoN+IK/w2zL2T7VdEYgOuNA=",
-      "dev": true,
-      "requires": {
-        "eslint-config-standard-jsx": "3.3.0"
-      }
-    },
-    "eslint-plugin-promise": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz",
-      "integrity": "sha1-G+J5Pq/i0YtbEjuBNsJp+AT+cSI=",
-      "dev": true
-    },
-    "eslint-plugin-react": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.10.0.tgz",
-      "integrity": "sha1-nEi0jRAVVLU1VBPnxkI4q95u8e8=",
-      "dev": true,
-      "requires": {
-        "array.prototype.find": "2.0.4",
-        "doctrine": "1.5.0",
-        "has": "1.0.1",
-        "jsx-ast-utils": "1.4.1",
-        "object.assign": "4.0.4"
-      }
-    },
-    "eslint-plugin-standard": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz",
-      "integrity": "sha1-NYlpn/nJF/LCX3apFmh/ZBw2n/M=",
-      "dev": true
-    },
-    "espree": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz",
-      "integrity": "sha1-KRC1zNSc6JPC//+qtP2LOjG4I3Q=",
-      "dev": true,
-      "requires": {
-        "acorn": "5.1.1",
-        "acorn-jsx": "3.0.1"
-      }
-    },
-    "esprima": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-      "dev": true
-    },
-    "esrecurse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
-      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
-      "dev": true,
-      "requires": {
-        "estraverse": "4.2.0",
-        "object-assign": "4.1.1"
-      }
-    },
-    "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
-    },
-    "etag": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz",
-      "integrity": "sha1-A9MLX2fdbmMtKUXTDWZScxo01dg=",
-      "dev": true
-    },
-    "ethereum-common": {
-      "version": "0.0.18",
-      "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz",
-      "integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8="
-    },
-    "ethereumjs-tx": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-1.2.5.tgz",
-      "integrity": "sha1-7TbX/+uXvIicYe7xq3b0emE9goY=",
-      "requires": {
-        "ethereum-common": "0.0.18",
-        "ethereumjs-util": "5.1.2"
-      }
-    },
-    "ethereumjs-util": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.1.2.tgz",
-      "integrity": "sha1-JboCFcu0wvCxCKb5avKi5i5Fkh8=",
-      "requires": {
-        "babel-preset-es2015": "6.24.1",
-        "babelify": "7.3.0",
-        "bn.js": "4.11.7",
-        "create-hash": "1.1.3",
-        "ethjs-util": "0.1.4",
-        "keccak": "1.3.0",
-        "rlp": "2.0.0",
-        "secp256k1": "3.3.0"
-      },
-      "dependencies": {
-        "babel-preset-es2015": {
-          "version": "6.24.1",
-          "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
-          "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
-          "requires": {
-            "babel-plugin-check-es2015-constants": "6.22.0",
-            "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-            "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-            "babel-plugin-transform-es2015-block-scoping": "6.24.1",
-            "babel-plugin-transform-es2015-classes": "6.24.1",
-            "babel-plugin-transform-es2015-computed-properties": "6.24.1",
-            "babel-plugin-transform-es2015-destructuring": "6.23.0",
-            "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
-            "babel-plugin-transform-es2015-for-of": "6.23.0",
-            "babel-plugin-transform-es2015-function-name": "6.24.1",
-            "babel-plugin-transform-es2015-literals": "6.22.0",
-            "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-            "babel-plugin-transform-es2015-modules-commonjs": "6.24.1",
-            "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
-            "babel-plugin-transform-es2015-modules-umd": "6.24.1",
-            "babel-plugin-transform-es2015-object-super": "6.24.1",
-            "babel-plugin-transform-es2015-parameters": "6.24.1",
-            "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-            "babel-plugin-transform-es2015-spread": "6.22.0",
-            "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-            "babel-plugin-transform-es2015-template-literals": "6.22.0",
-            "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-            "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-            "babel-plugin-transform-regenerator": "6.24.1"
-          }
-        }
-      }
-    },
-    "ethjs-util": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.4.tgz",
-      "integrity": "sha1-HItoeSV0RO9NPz+7rC3tEs2ZfZM=",
-      "requires": {
-        "is-hex-prefixed": "1.0.0",
-        "strip-hex-prefix": "1.0.0"
-      }
-    },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.24"
-      }
-    },
-    "eventemitter3": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz",
-      "integrity": "sha1-IM5IkZCc6fNbCIyU+rQOLJb0c6w="
-    },
-    "events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
-      "dev": true
-    },
-    "evp_bytestokey": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz",
-      "integrity": "sha1-SXtmrZ/vZc18CKYYCCS6FHa2blM=",
-      "requires": {
-        "create-hash": "1.1.3"
-      }
-    },
-    "exec-buffer": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
-      "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==",
-      "dev": true,
-      "requires": {
-        "execa": "0.7.0",
-        "p-finally": "1.0.0",
-        "pify": "3.0.0",
-        "rimraf": "2.6.1",
-        "tempfile": "2.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
-      }
-    },
-    "exec-series": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/exec-series/-/exec-series-1.0.3.tgz",
-      "integrity": "sha1-bSV6m+rEgqhyx3g7yGFYOfx3FDo=",
-      "dev": true,
-      "requires": {
-        "async-each-series": "1.1.0",
-        "object-assign": "4.1.1"
-      }
-    },
-    "execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "5.1.0",
-        "get-stream": "3.0.0",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
-      }
-    },
-    "execall": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
-      "integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=",
-      "dev": true,
-      "requires": {
-        "clone-regexp": "1.0.0"
-      }
-    },
-    "executable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/executable/-/executable-1.1.0.tgz",
-      "integrity": "sha1-h3mA6REvM5EGbaNyZd562ENKtNk=",
-      "dev": true,
-      "requires": {
-        "meow": "3.7.0"
-      }
-    },
-    "exit-hook": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
-      "dev": true
-    },
-    "expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-      "requires": {
-        "is-posix-bracket": "0.1.1"
-      }
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-      "requires": {
-        "fill-range": "2.2.3"
-      }
-    },
-    "expand-template": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-1.0.3.tgz",
-      "integrity": "sha1-bDAzIxd6YrGyLAcCefeGEoe2mxo="
-    },
-    "express": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.14.1.tgz",
-      "integrity": "sha1-ZGwjf3ZvFIwhIK/wc4F7nk1+DTM=",
-      "dev": true,
-      "requires": {
-        "accepts": "1.3.3",
-        "array-flatten": "1.1.1",
-        "content-disposition": "0.5.2",
-        "content-type": "1.0.2",
-        "cookie": "0.3.1",
-        "cookie-signature": "1.0.6",
-        "debug": "2.2.0",
-        "depd": "1.1.1",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "etag": "1.7.0",
-        "finalhandler": "0.5.1",
-        "fresh": "0.3.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "1.1.2",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.1",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "1.1.5",
-        "qs": "6.2.0",
-        "range-parser": "1.2.0",
-        "send": "0.14.2",
-        "serve-static": "1.11.2",
-        "type-is": "1.6.15",
-        "utils-merge": "1.0.0",
-        "vary": "1.1.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.1"
-          }
-        },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-          "dev": true
-        },
-        "path-to-regexp": {
-          "version": "0.1.7",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz",
-          "integrity": "sha1-O3hIwDwt7OaalSKw+ujEEm10Xzs=",
-          "dev": true
-        }
-      }
-    },
-    "extend": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz",
-      "integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w="
-    },
-    "extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "requires": {
-        "is-extendable": "0.1.1"
-      }
-    },
-    "external-editor": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz",
-      "integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=",
-      "requires": {
-        "iconv-lite": "0.4.18",
-        "jschardet": "1.5.0",
-        "tmp": "0.0.31"
-      }
-    },
-    "extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-      "requires": {
-        "is-extglob": "1.0.0"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-        }
-      }
-    },
-    "extract-loader": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/extract-loader/-/extract-loader-0.1.0.tgz",
-      "integrity": "sha1-ocFGkVJBzEhtUpImPHVV1aoZdm4=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "0.2.17"
-      }
-    },
-    "extract-text-webpack-plugin": {
-      "version": "2.0.0-beta.4",
-      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0-beta.4.tgz",
-      "integrity": "sha1-0yOTBp59kMgxjUg5IwJhi1a8G6k=",
-      "dev": true,
-      "requires": {
-        "async": "1.5.2",
-        "loader-utils": "0.2.17",
-        "webpack-sources": "0.1.5"
-      }
-    },
-    "extsprintf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
-    },
-    "fancy-log": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz",
-      "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=",
-      "requires": {
-        "chalk": "1.1.3",
-        "time-stamp": "1.1.0"
-      }
-    },
-    "fast-deep-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "fastparse": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
-      "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=",
-      "dev": true
-    },
-    "fbjs": {
-      "version": "0.8.14",
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.14.tgz",
-      "integrity": "sha1-0dviviVMNakeCfMfnNUKQLKg7Rw=",
-      "requires": {
-        "core-js": "1.2.7",
-        "isomorphic-fetch": "2.2.1",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1",
-        "promise": "7.3.1",
-        "setimmediate": "1.0.5",
-        "ua-parser-js": "0.7.14"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
-        }
-      }
-    },
-    "fd-slicer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-      "requires": {
-        "pend": "1.2.0"
-      }
-    },
-    "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "requires": {
-        "escape-string-regexp": "1.0.5"
-      }
-    },
-    "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-      "dev": true,
-      "requires": {
-        "flat-cache": "1.2.2",
-        "object-assign": "4.1.1"
-      }
-    },
-    "file-loader": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.10.0.tgz",
-      "integrity": "sha1-u+bbdHSsksf1T9wZfPVH6YtrjhI=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "0.2.17"
-      }
-    },
-    "file-saver": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz",
-      "integrity": "sha1-zdTETTqiZOrC9o7BZbx5HDSvEjI="
-    },
-    "file-type": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
-      "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
-    },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
-    },
-    "filename-reserved-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
-      "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q="
-    },
-    "filenamify": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
-      "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
-      "requires": {
-        "filename-reserved-regex": "1.0.0",
-        "strip-outer": "1.0.0",
-        "trim-repeated": "1.0.0"
-      }
-    },
-    "fileset": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
-      "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
-      "dev": true,
-      "requires": {
-        "glob": "7.1.2",
-        "minimatch": "3.0.4"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        }
-      }
-    },
-    "filesize": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.10.tgz",
-      "integrity": "sha1-/I+iPdtO+eXgq24eZPZ5okpWdh8=",
-      "dev": true
-    },
-    "fill-range": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-      "requires": {
-        "is-number": "2.1.0",
-        "isobject": "2.1.0",
-        "randomatic": "1.1.7",
-        "repeat-element": "1.1.2",
-        "repeat-string": "1.6.1"
-      }
-    },
-    "finalhandler": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz",
-      "integrity": "sha1-LEANjUUwk1vCMlScX6OF7Afeb80=",
-      "dev": true,
-      "requires": {
-        "debug": "2.2.0",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "statuses": "1.3.1",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.1"
-          }
-        },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-          "dev": true
-        }
-      }
-    },
-    "find-cache-dir": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
-      "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
-      "dev": true,
-      "requires": {
-        "commondir": "1.0.1",
-        "mkdirp": "0.5.1",
-        "pkg-dir": "1.0.0"
-      }
-    },
-    "find-parent-dir": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
-      "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
-      "dev": true
-    },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "find-versions": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz",
-      "integrity": "sha1-y96fEuOFdaCvG+G5osXV/Y8Ya2I=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "1.0.3",
-        "get-stdin": "4.0.1",
-        "meow": "3.7.0",
-        "semver-regex": "1.0.0"
-      },
-      "dependencies": {
-        "get-stdin": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-          "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-          "dev": true
-        }
-      }
-    },
-    "first-chunk-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
-      "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04="
-    },
-    "flat": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-2.0.1.tgz",
-      "integrity": "sha1-cOKRiKdL4MPIlAnu0fqVd5B64y8=",
-      "requires": {
-        "is-buffer": "1.1.5"
-      }
-    },
-    "flat-cache": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
-      "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=",
-      "dev": true,
-      "requires": {
-        "circular-json": "0.3.3",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
-      }
-    },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-      "dev": true
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
-    },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-      "requires": {
-        "for-in": "1.0.2"
-      }
-    },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.16"
-      }
-    },
-    "format-json": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/format-json/-/format-json-1.0.3.tgz",
-      "integrity": "sha1-Jo49PhaXkv9Ju1sDDyLIfKHCzZ8="
-    },
-    "format-number": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/format-number/-/format-number-2.0.1.tgz",
-      "integrity": "sha1-6SMah0PKZLR9CVVdzkApY0O+Zus="
-    },
-    "formatio": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
-      "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=",
-      "dev": true,
-      "requires": {
-        "samsam": "1.1.2"
-      }
-    },
-    "forwarded": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz",
-      "integrity": "sha1-Ge+YdMSuHCl7zweP3mOgm2aoQ2M=",
-      "dev": true
-    },
-    "fresh": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz",
-      "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=",
-      "dev": true
-    },
-    "fs-extra": {
-      "version": "0.26.7",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
-      "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "2.4.0",
-        "klaw": "1.3.1",
-        "path-is-absolute": "1.0.1",
-        "rimraf": "2.6.1"
-      }
-    },
-    "fs-readdir-recursive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz",
-      "integrity": "sha1-jNF0XItPiinIyuw5JHaSG6GV9WA=",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "inherits": "2.0.3",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.1"
-      }
-    },
-    "fstream-ignore": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-      "requires": {
-        "fstream": "1.0.11",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4"
-      }
-    },
-    "function-bind": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-      "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E=",
-      "dev": true
-    },
-    "function.prototype.name": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.0.3.tgz",
-      "integrity": "sha512-5EblxZUdioXi2JiMZ9FUbwYj40eQ9MFHyzFLBSPdlRl3SO8l7SLWuAnQ/at/1Wi4hjJwME/C5WpF2ZfAc8nGNw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "1.1.2",
-        "function-bind": "1.1.0",
-        "is-callable": "1.1.3"
-      }
-    },
-    "gather-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
-      "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
-      "dev": true
-    },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "requires": {
-        "aproba": "1.1.2",
-        "console-control-strings": "1.1.0",
-        "has-unicode": "2.0.1",
-        "object-assign": "4.1.1",
-        "signal-exit": "3.0.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wide-align": "1.1.2"
-      }
-    },
-    "generate-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-      "dev": true
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-      "dev": true,
-      "requires": {
-        "is-property": "1.0.2"
-      }
-    },
-    "geopattern": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/geopattern/-/geopattern-1.2.3.tgz",
-      "integrity": "sha1-3pZgLkbbqQlcpXdL+zs2MI9+Y/4=",
-      "requires": {
-        "extend": "1.2.1"
-      }
-    },
-    "get-caller-file": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
-      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U="
-    },
-    "get-own-enumerable-property-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-1.0.1.tgz",
-      "integrity": "sha1-8dTjrRQC4DmJjlbR6bmqkkwm5IQ="
-    },
-    "get-proxy": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
-      "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
-      "requires": {
-        "rc": "1.2.1"
-      }
-    },
-    "get-stdin": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz",
-      "integrity": "sha1-wc7SS5A5s43thb3xYeV3E7bdSr4="
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
-    },
-    "gifsicle": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-3.0.4.tgz",
-      "integrity": "sha1-9Fy17RAWW2ZdySng6TKLbIId+js=",
-      "dev": true,
-      "requires": {
-        "bin-build": "2.2.0",
-        "bin-wrapper": "3.0.2",
-        "logalot": "2.1.0"
-      }
-    },
-    "github-from-package": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
-    },
-    "glob": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-      "requires": {
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
-      }
-    },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-      "requires": {
-        "glob-parent": "2.0.0",
-        "is-glob": "2.0.1"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-          "requires": {
-            "is-glob": "2.0.1"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        }
-      }
-    },
-    "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "requires": {
-        "is-glob": "3.1.0",
-        "path-dirname": "1.0.2"
-      }
-    },
-    "glob-stream": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
-      "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
-      "requires": {
-        "extend": "3.0.1",
-        "glob": "5.0.15",
-        "glob-parent": "3.1.0",
-        "micromatch": "2.3.11",
-        "ordered-read-streams": "0.3.0",
-        "through2": "0.6.5",
-        "to-absolute-glob": "0.1.1",
-        "unique-stream": "2.2.1"
-      },
-      "dependencies": {
-        "extend": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-        }
-      }
-    },
-    "global": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
-      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
-      "dev": true,
-      "requires": {
-        "min-document": "2.19.0",
-        "process": "0.5.2"
-      }
-    },
-    "globals": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
-    },
-    "globby": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-      "dev": true,
-      "requires": {
-        "array-union": "1.0.2",
-        "arrify": "1.0.1",
-        "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        }
-      }
-    },
-    "globjoin": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-      "dev": true
-    },
-    "glogg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-      "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
-      "requires": {
-        "sparkles": "1.0.0"
-      }
-    },
-    "got": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
-      "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
-      "requires": {
-        "create-error-class": "3.0.2",
-        "duplexer2": "0.1.4",
-        "is-redirect": "1.0.0",
-        "is-retry-allowed": "1.1.0",
-        "is-stream": "1.1.0",
-        "lowercase-keys": "1.0.0",
-        "node-status-codes": "1.0.0",
-        "object-assign": "4.1.1",
-        "parse-json": "2.2.0",
-        "pinkie-promise": "2.0.1",
-        "read-all-stream": "3.1.0",
-        "readable-stream": "2.3.3",
-        "timed-out": "3.1.3",
-        "unzip-response": "1.0.2",
-        "url-parse-lax": "1.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
-    },
-    "growl": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
-      "dev": true
-    },
-    "gulp-decompress": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
-      "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
-      "requires": {
-        "archive-type": "3.2.0",
-        "decompress": "3.0.0",
-        "gulp-util": "3.0.8",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "gulp-rename": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz",
-      "integrity": "sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc="
-    },
-    "gulp-sourcemaps": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
-      "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
-      "requires": {
-        "convert-source-map": "1.5.0",
-        "graceful-fs": "4.1.11",
-        "strip-bom": "2.0.0",
-        "through2": "2.0.3",
-        "vinyl": "1.2.0"
-      },
-      "dependencies": {
-        "through2": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-          "requires": {
-            "readable-stream": "2.3.3",
-            "xtend": "4.0.1"
-          }
-        }
-      }
-    },
-    "gulp-util": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-      "requires": {
-        "array-differ": "1.0.0",
-        "array-uniq": "1.0.3",
-        "beeper": "1.1.1",
-        "chalk": "1.1.3",
-        "dateformat": "2.0.0",
-        "fancy-log": "1.3.0",
-        "gulplog": "1.0.0",
-        "has-gulplog": "0.1.0",
-        "lodash._reescape": "3.0.0",
-        "lodash._reevaluate": "3.0.0",
-        "lodash._reinterpolate": "3.0.0",
-        "lodash.template": "3.6.2",
-        "minimist": "1.2.0",
-        "multipipe": "0.1.2",
-        "object-assign": "3.0.0",
-        "replace-ext": "0.0.1",
-        "through2": "2.0.3",
-        "vinyl": "0.5.3"
-      },
-      "dependencies": {
-        "object-assign": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
-        },
-        "through2": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-          "requires": {
-            "readable-stream": "2.3.3",
-            "xtend": "4.0.1"
-          }
-        },
-        "vinyl": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-          "requires": {
-            "clone": "1.0.2",
-            "clone-stats": "0.0.1",
-            "replace-ext": "0.0.1"
-          }
-        }
-      }
-    },
-    "gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "requires": {
-        "glogg": "1.0.0"
-      }
-    },
-    "handlebars": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
-      "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
-      "dev": true,
-      "requires": {
-        "async": "1.5.2",
-        "optimist": "0.6.1",
-        "source-map": "0.4.4",
-        "uglify-js": "2.8.16"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "requires": {
-            "amdefine": "1.0.1"
-          }
-        }
-      }
-    },
-    "happypack": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/happypack/-/happypack-3.0.3.tgz",
-      "integrity": "sha1-IveMh6MlzbeYyVjPTsOD/NTW/cc=",
-      "dev": true,
-      "requires": {
-        "async": "1.5.0",
-        "json-stringify-safe": "5.0.1",
-        "loader-utils": "0.2.16",
-        "mkdirp": "0.5.1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz",
-          "integrity": "sha1-J5ZkJyNXOFlWVjP8YnRES+4vjOM=",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "0.2.16",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz",
-          "integrity": "sha1-8IYyBm7YKCg13/iN+1JwR2Wt7m0=",
-          "dev": true,
-          "requires": {
-            "big.js": "3.1.3",
-            "emojis-list": "2.1.0",
-            "json5": "0.5.1",
-            "object-assign": "4.1.1"
-          }
-        }
-      }
-    },
-    "har-schema": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
-    },
-    "har-validator": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-      "requires": {
-        "ajv": "4.11.8",
-        "har-schema": "1.0.5"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "co": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-        }
-      }
-    },
-    "has": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-      "dev": true,
-      "requires": {
-        "function-bind": "1.1.0"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "requires": {
-        "ansi-regex": "2.1.1"
-      }
-    },
-    "has-flag": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
-    },
-    "has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-      "requires": {
-        "sparkles": "1.0.0"
-      }
-    },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-    },
-    "hash-base": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
-      "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
-      "requires": {
-        "inherits": "2.0.3"
-      }
-    },
-    "hash.js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
-      "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
-      }
-    },
-    "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-      "requires": {
-        "boom": "2.10.1",
-        "cryptiles": "2.0.5",
-        "hoek": "2.16.3",
-        "sntp": "1.0.9"
-      }
-    },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-      "dev": true
-    },
-    "history": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/history/-/history-3.3.0.tgz",
-      "integrity": "sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw=",
-      "requires": {
-        "invariant": "2.2.2",
-        "loose-envify": "1.3.1",
-        "query-string": "4.3.4",
-        "warning": "3.0.0"
-      }
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "requires": {
-        "hash.js": "1.1.3",
-        "minimalistic-assert": "1.0.0",
-        "minimalistic-crypto-utils": "1.0.1"
-      }
-    },
-    "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
-    },
-    "hoist-non-react-statics": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz",
-      "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs="
-    },
-    "home-or-tmp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-      "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg=="
-    },
-    "html": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/html/-/html-1.0.0.tgz",
-      "integrity": "sha1-pUT6nqVJK/s6LMqCEKEL57WvH2E=",
-      "dev": true,
-      "requires": {
-        "concat-stream": "1.6.0"
-      }
-    },
-    "html-comment-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz",
-      "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=",
-      "dev": true
-    },
-    "html-encoding-sniffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz",
-      "integrity": "sha1-eb96eF6klf5mFl5zQVPzY/9UN9o=",
-      "dev": true,
-      "requires": {
-        "whatwg-encoding": "1.0.1"
-      }
-    },
-    "html-entities": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-      "dev": true
-    },
-    "html-loader": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.4.4.tgz",
-      "integrity": "sha1-8rW5rNXgNf86tf02nBPJenuwFNo=",
-      "dev": true,
-      "requires": {
-        "es6-templates": "0.2.3",
-        "fastparse": "1.1.1",
-        "html-minifier": "3.5.3",
-        "loader-utils": "0.2.17",
-        "object-assign": "4.1.1"
-      }
-    },
-    "html-minifier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.3.tgz",
-      "integrity": "sha512-iKRzQQDuTCsq0Ultbi/mfJJnR0D3AdZKTq966Gsp92xkmAPCV4Xi08qhJ0Dl3ZAWemSgJ7qZK+UsZc0gFqK6wg==",
-      "dev": true,
-      "requires": {
-        "camel-case": "3.0.0",
-        "clean-css": "4.1.7",
-        "commander": "2.11.0",
-        "he": "1.1.1",
-        "ncname": "1.0.0",
-        "param-case": "2.1.1",
-        "relateurl": "0.2.7",
-        "uglify-js": "3.0.27"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-          "dev": true
-        },
-        "uglify-js": {
-          "version": "3.0.27",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.27.tgz",
-          "integrity": "sha512-HD8CmxPXUI62v5tweiulMcP/apAtx1DXGcNZkhKQZyC+MTrTsoCBb8yPAwVrbvpgw3EpRU76bRe6axjIiCYcQg==",
-          "dev": true,
-          "requires": {
-            "commander": "2.11.0",
-            "source-map": "0.5.6"
-          }
-        }
-      }
-    },
-    "html-tags": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-1.2.0.tgz",
-      "integrity": "sha1-x43mW1Zjqll5id0rerSSANfk25g=",
-      "dev": true
-    },
-    "html-webpack-plugin": {
-      "version": "2.28.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz",
-      "integrity": "sha1-LnhjtX5f1I/iYzA+L/yTTDBk0Ak=",
-      "dev": true,
-      "requires": {
-        "bluebird": "3.5.0",
-        "html-minifier": "3.5.3",
-        "loader-utils": "0.2.17",
-        "lodash": "4.17.4",
-        "pretty-error": "2.1.1",
-        "toposort": "1.0.3"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-          "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
-          "dev": true
-        },
-        "lodash": {
-          "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-          "dev": true
-        }
-      }
-    },
-    "htmlparser2": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1.3.0",
-        "domhandler": "2.4.1",
-        "domutils": "1.5.1",
-        "entities": "1.1.1",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "http-errors": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz",
-      "integrity": "sha1-eIwNLB3iyBuebowBhDtrl+uSB1A=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "setprototypeof": "1.0.2",
-        "statuses": "1.3.1"
-      }
-    },
-    "http-proxy": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
-      "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "1.2.0",
-        "requires-port": "1.0.0"
-      },
-      "dependencies": {
-        "eventemitter3": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
-          "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
-          "dev": true
-        }
-      }
-    },
-    "http-proxy-middleware": {
-      "version": "0.17.3",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz",
-      "integrity": "sha1-lAOCFHFJuFYIT1U0dS1bWoFozR0=",
-      "dev": true,
-      "requires": {
-        "http-proxy": "1.16.2",
-        "is-glob": "3.1.0",
-        "lodash": "4.17.2",
-        "micromatch": "2.3.11"
-      }
-    },
-    "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-      "requires": {
-        "assert-plus": "0.2.0",
-        "jsprim": "1.4.0",
-        "sshpk": "1.13.1"
-      }
-    },
-    "https-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-      "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
-      "dev": true
-    },
-    "humanize": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz",
-      "integrity": "sha1-GZT/rs3+nEQe0r2sdFK3u0yeQaQ=",
-      "dev": true
-    },
-    "husky": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-0.13.1.tgz",
-      "integrity": "sha1-Ee/G/BDg7E54l3b2WCvjfXG6TM8=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "find-parent-dir": "0.3.0",
-        "is-ci": "1.0.10",
-        "normalize-path": "1.0.0"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
-          "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=",
-          "dev": true
-        }
-      }
-    },
-    "hyphenate-style-name": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz",
-      "integrity": "sha1-MRYKNpMK2vH8BMYHT360FGXU7Es="
-    },
-    "iconv-lite": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz",
-      "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA=="
-    },
-    "icss-replace-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
-      "dev": true
-    },
-    "ieee754": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
-      "dev": true
-    },
-    "ignore": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz",
-      "integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0=",
-      "dev": true
-    },
-    "ignore-styles": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ignore-styles/-/ignore-styles-5.0.1.tgz",
-      "integrity": "sha1-tJ7yJ0va/NikiAqWa/440aC/RnE=",
-      "dev": true
-    },
-    "image-webpack-loader": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/image-webpack-loader/-/image-webpack-loader-3.2.0.tgz",
-      "integrity": "sha1-8mMG1gSNOi9ajYROyu3StxSPCk4=",
-      "dev": true,
-      "requires": {
-        "file-loader": "0.9.0",
-        "imagemin": "5.3.1",
-        "imagemin-gifsicle": "5.2.0",
-        "imagemin-mozjpeg": "6.0.0",
-        "imagemin-optipng": "5.2.1",
-        "imagemin-pngquant": "5.0.1",
-        "imagemin-svgo": "5.2.2",
-        "loader-utils": "0.2.17"
-      },
-      "dependencies": {
-        "file-loader": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.9.0.tgz",
-          "integrity": "sha1-HS2t3UJM5tGwfP4/eXMb7TYXq0I=",
-          "dev": true,
-          "requires": {
-            "loader-utils": "0.2.17"
-          }
-        }
-      }
-    },
-    "imagemin": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-5.3.1.tgz",
-      "integrity": "sha1-8Zwu7h5xumxlWMUV+fyWaAGJptQ=",
-      "dev": true,
-      "requires": {
-        "file-type": "4.4.0",
-        "globby": "6.1.0",
-        "make-dir": "1.0.0",
-        "p-pipe": "1.2.0",
-        "pify": "2.3.0",
-        "replace-ext": "1.0.0"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
-          "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU=",
-          "dev": true
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "dev": true,
-          "requires": {
-            "array-union": "1.0.2",
-            "glob": "7.1.2",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "replace-ext": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-          "dev": true
-        }
-      }
-    },
-    "imagemin-gifsicle": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/imagemin-gifsicle/-/imagemin-gifsicle-5.2.0.tgz",
-      "integrity": "sha512-K01m5QuPK+0en8oVhiOOAicF7KjrHlCZxS++mfLI2mV/Ksfq/Y9nCXCWDz6jRv13wwlqe5T7hXT+ji2DnLc2yQ==",
-      "dev": true,
-      "requires": {
-        "exec-buffer": "3.2.0",
-        "gifsicle": "3.0.4",
-        "is-gif": "1.0.0"
-      }
-    },
-    "imagemin-mozjpeg": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/imagemin-mozjpeg/-/imagemin-mozjpeg-6.0.0.tgz",
-      "integrity": "sha1-caMqRXqhsmEXpo7u8tmxkMLlCR4=",
-      "dev": true,
-      "requires": {
-        "exec-buffer": "3.2.0",
-        "is-jpg": "1.0.0",
-        "mozjpeg": "4.1.1"
-      }
-    },
-    "imagemin-optipng": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-5.2.1.tgz",
-      "integrity": "sha1-0i2kEsCfX/AKQzmWC5ioix2+hpU=",
-      "dev": true,
-      "requires": {
-        "exec-buffer": "3.2.0",
-        "is-png": "1.1.0",
-        "optipng-bin": "3.1.4"
-      }
-    },
-    "imagemin-pngquant": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/imagemin-pngquant/-/imagemin-pngquant-5.0.1.tgz",
-      "integrity": "sha1-2KMp2lU6+iJrEc5i3r4Lfje0OeY=",
-      "dev": true,
-      "requires": {
-        "exec-buffer": "3.2.0",
-        "is-png": "1.1.0",
-        "pngquant-bin": "3.1.1"
-      }
-    },
-    "imagemin-svgo": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/imagemin-svgo/-/imagemin-svgo-5.2.2.tgz",
-      "integrity": "sha1-UBaZ9XiXMKV5IrhzbqFcU/e1WDg=",
-      "dev": true,
-      "requires": {
-        "is-svg": "2.1.0",
-        "svgo": "0.7.2"
-      }
-    },
-    "immediate": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-    },
-    "in-publish": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E="
-    },
-    "indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "requires": {
-        "repeating": "2.0.1"
-      }
-    },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-    },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "ini": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
-    },
-    "inline-style-prefixer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz",
-      "integrity": "sha1-wVPH6I/YT+9cYC6VqBaLJ3BnH+c=",
-      "requires": {
-        "bowser": "1.7.1",
-        "hyphenate-style-name": "1.0.2"
-      }
-    },
-    "inquirer": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.1.tgz",
-      "integrity": "sha512-QgW3eiPN8gpj/K5vVpHADJJgrrF0ho/dZGylikGX7iqAdRgC9FVKYKWFLx6hZDBFcOLEoSqINYrVPeFAeG/PdA==",
-      "requires": {
-        "ansi-escapes": "2.0.0",
-        "chalk": "2.0.1",
-        "cli-cursor": "2.1.0",
-        "cli-width": "2.1.0",
-        "external-editor": "2.0.4",
-        "figures": "2.0.0",
-        "lodash": "4.17.2",
-        "mute-stream": "0.0.7",
-        "run-async": "2.3.0",
-        "rx-lite": "4.0.8",
-        "rx-lite-aggregates": "4.0.8",
-        "string-width": "2.1.1",
-        "strip-ansi": "4.0.0",
-        "through": "2.3.8"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "requires": {
-            "color-convert": "1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
-          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
-          "requires": {
-            "ansi-styles": "3.2.0",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.2.1"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
-          "requires": {
-            "has-flag": "2.0.0"
-          }
-        }
-      }
-    },
-    "interpret": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
-      "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=",
-      "dev": true
-    },
-    "intl-format-cache": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-2.0.5.tgz",
-      "integrity": "sha1-tITO/Lk1PzdPJd44mjzuoa8Y18k="
-    },
-    "intl-messageformat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-1.3.0.tgz",
-      "integrity": "sha1-99kmre16OrGbLcYB79VOmaS9Tq4=",
-      "requires": {
-        "intl-messageformat-parser": "1.2.0"
-      }
-    },
-    "intl-messageformat-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.2.0.tgz",
-      "integrity": "sha1-WQa3+VOrdHDg3IVJCXtki5kYkv8="
-    },
-    "intl-relativeformat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-1.3.0.tgz",
-      "integrity": "sha1-iT3HB2/M04DPCRojAMOA+les5Fs=",
-      "requires": {
-        "intl-messageformat": "1.3.0"
-      }
-    },
-    "invariant": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-      "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
-      "requires": {
-        "loose-envify": "1.3.1"
-      }
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
-    },
-    "ip-regex": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
-      "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=",
-      "dev": true
-    },
-    "ipaddr.js": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz",
-      "integrity": "sha1-KWrKh4qCGBbluF0KKFqZvP9FgvA=",
-      "dev": true
-    },
-    "irregular-plurals": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.3.0.tgz",
-      "integrity": "sha512-njf5A+Mxb3kojuHd1DzISjjIl+XhyzovXEOyPPSzdQozq/Lf2tN27mOrAAsxEPZxpn6I4MGzs1oo9TxXxPFpaA==",
-      "dev": true
-    },
-    "is-absolute": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-      "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
-      "requires": {
-        "is-relative": "0.1.3"
-      }
-    },
-    "is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
-      "dev": true
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "1.9.0"
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw="
-    },
-    "is-builtin-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "requires": {
-        "builtin-modules": "1.1.1"
-      }
-    },
-    "is-bzip2": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
-      "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w="
-    },
-    "is-callable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
-      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
-      "dev": true
-    },
-    "is-ci": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz",
-      "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=",
-      "requires": {
-        "ci-info": "1.0.0"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-      "dev": true
-    },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-      "dev": true
-    },
-    "is-dom": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/is-dom/-/is-dom-1.0.9.tgz",
-      "integrity": "sha1-SDgy1SlyBz3hK5/j9gMghw2oNw0="
-    },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-      "requires": {
-        "is-primitive": "2.0.0"
-      }
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
-    },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "requires": {
-        "number-is-nan": "1.0.1"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "requires": {
-        "number-is-nan": "1.0.1"
-      }
-    },
-    "is-gif": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-gif/-/is-gif-1.0.0.tgz",
-      "integrity": "sha1-ptKumIkwB7/6l6HYwB1jIFgyCX4=",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "requires": {
-        "is-extglob": "2.1.1"
-      }
-    },
-    "is-gzip": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
-      "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM="
-    },
-    "is-hex-prefixed": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz",
-      "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ="
-    },
-    "is-jpg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-1.0.0.tgz",
-      "integrity": "sha1-KVnBfnNDDbOCZNp1uQ3VTy2G2hw=",
-      "dev": true
-    },
-    "is-my-json-valid": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
-      "integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=",
-      "dev": true,
-      "requires": {
-        "generate-function": "2.0.0",
-        "generate-object-property": "1.2.0",
-        "jsonpointer": "4.0.1",
-        "xtend": "4.0.1"
-      }
-    },
-    "is-natural-number": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
-      "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec="
-    },
-    "is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-      "requires": {
-        "kind-of": "3.2.2"
-      }
-    },
-    "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
-    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
-      "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "1.0.2"
-      }
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "requires": {
-        "isobject": "3.0.1"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-        }
-      }
-    },
-    "is-png": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-png/-/is-png-1.1.0.tgz",
-      "integrity": "sha1-1XSxK/J1wDUEVVcLDltXqwYgd84=",
-      "dev": true
-    },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
-    },
-    "is-property": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-      "dev": true
-    },
-    "is-redirect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "dev": true,
-      "requires": {
-        "has": "1.0.1"
-      }
-    },
-    "is-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk="
-    },
-    "is-relative": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
-      "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI="
-    },
-    "is-resolvable": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
-      "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
-      "dev": true,
-      "requires": {
-        "tryit": "1.0.3"
-      }
-    },
-    "is-retry-allowed": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "is-subset": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
-      "dev": true
-    },
-    "is-supported-regexp-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz",
-      "integrity": "sha1-i1IMhfrnolM4LUsCZS4EVXbhO7g=",
-      "dev": true
-    },
-    "is-svg": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
-      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
-      "dev": true,
-      "requires": {
-        "html-comment-regex": "1.1.1"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-      "dev": true
-    },
-    "is-tar": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
-      "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0="
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "is-url": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz",
-      "integrity": "sha1-SYkFpZO/R8wtnn9zg3K792lsfyY="
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
-    },
-    "is-valid-glob": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
-      "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4="
-    },
-    "is-zip": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
-      "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "requires": {
-        "isarray": "1.0.0"
-      }
-    },
-    "isomorphic-fetch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
-      "requires": {
-        "node-fetch": "1.7.1",
-        "whatwg-fetch": "2.0.1"
-      }
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "istanbul": {
-      "version": "1.0.0-alpha.2",
-      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-1.0.0-alpha.2.tgz",
-      "integrity": "sha1-BglrwI6Yuq10Sq5Gli2N+frGPQg=",
-      "dev": true,
-      "requires": {
-        "abbrev": "1.0.9",
-        "async": "1.5.2",
-        "istanbul-api": "1.1.11",
-        "js-yaml": "3.6.1",
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6",
-        "which": "1.2.14",
-        "wordwrap": "1.0.0"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-          "dev": true
-        },
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-api": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.11.tgz",
-      "integrity": "sha1-/MC0YeKzvaceMFFVE4I4doJX2d4=",
-      "dev": true,
-      "requires": {
-        "async": "2.5.0",
-        "fileset": "2.0.3",
-        "istanbul-lib-coverage": "1.1.1",
-        "istanbul-lib-hook": "1.0.7",
-        "istanbul-lib-instrument": "1.7.4",
-        "istanbul-lib-report": "1.1.1",
-        "istanbul-lib-source-maps": "1.2.1",
-        "istanbul-reports": "1.1.1",
-        "js-yaml": "3.9.1",
-        "mkdirp": "0.5.1",
-        "once": "1.4.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
-          "dev": true,
-          "requires": {
-            "lodash": "4.17.2"
-          }
-        },
-        "esprima": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "3.9.1",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz",
-          "integrity": "sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww==",
-          "dev": true,
-          "requires": {
-            "argparse": "1.0.9",
-            "esprima": "4.0.0"
-          }
-        }
-      }
-    },
-    "istanbul-lib-coverage": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz",
-      "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==",
-      "dev": true
-    },
-    "istanbul-lib-hook": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz",
-      "integrity": "sha512-3U2HB9y1ZV9UmFlE12Fx+nPtFqIymzrqCksrXujm3NVbAZIJg/RfYgO1XiIa0mbmxTjWpVEVlkIZJ25xVIAfkQ==",
-      "dev": true,
-      "requires": {
-        "append-transform": "0.4.0"
-      }
-    },
-    "istanbul-lib-instrument": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz",
-      "integrity": "sha1-6f2SDkdn89Ge3HZeLWs/XMvQ7qg=",
-      "dev": true,
-      "requires": {
-        "babel-generator": "6.25.0",
-        "babel-template": "6.25.0",
-        "babel-traverse": "6.25.0",
-        "babel-types": "6.25.0",
-        "babylon": "6.17.4",
-        "istanbul-lib-coverage": "1.1.1",
-        "semver": "5.4.1"
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz",
-      "integrity": "sha512-tvF+YmCmH4thnez6JFX06ujIA19WPa9YUiwjc1uALF2cv5dmE3It8b5I8Ob7FHJ70H9Y5yF+TDkVa/mcADuw1Q==",
-      "dev": true,
-      "requires": {
-        "istanbul-lib-coverage": "1.1.1",
-        "mkdirp": "0.5.1",
-        "path-parse": "1.0.5",
-        "supports-color": "3.2.3"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "istanbul-lib-source-maps": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz",
-      "integrity": "sha512-mukVvSXCn9JQvdJl8wP/iPhqig0MRtuWuD4ZNKo6vB2Ik//AmhAKe3QnPN02dmkRe3lTudFk3rzoHhwU4hb94w==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.8",
-        "istanbul-lib-coverage": "1.1.1",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.1",
-        "source-map": "0.5.6"
-      }
-    },
-    "istanbul-reports": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
-      "integrity": "sha512-P8G873A0kW24XRlxHVGhMJBhQ8gWAec+dae7ZxOBzxT4w+a9ATSPvRVK3LB1RAJ9S8bg2tOyWHAGW40Zd2dKfw==",
-      "dev": true,
-      "requires": {
-        "handlebars": "4.0.10"
-      }
-    },
-    "js-base64": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
-      "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
-      "dev": true
-    },
-    "js-sha3": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz",
-      "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko="
-    },
-    "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
-    },
-    "js-yaml": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz",
-      "integrity": "sha1-bl/mfYsgXOTSL60Ft3geja3MSzA=",
-      "dev": true,
-      "requires": {
-        "argparse": "1.0.9",
-        "esprima": "2.7.3"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "optional": true
-    },
-    "jschardet": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.0.tgz",
-      "integrity": "sha512-+Q8JsoEQbrdE+a/gg1F9XO92gcKXgpE5UACqr0sIubjDmBEkd+OOWPGzQeMrWSLxd73r4dHxBeRW7edHu5LmJQ=="
-    },
-    "jsdom": {
-      "version": "9.11.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.11.0.tgz",
-      "integrity": "sha1-qVsDBOUhospaY8bqR793CKeoRZE=",
-      "dev": true,
-      "requires": {
-        "abab": "1.0.3",
-        "acorn": "4.0.13",
-        "acorn-globals": "3.1.0",
-        "array-equal": "1.0.0",
-        "content-type-parser": "1.0.1",
-        "cssom": "0.3.2",
-        "cssstyle": "0.2.37",
-        "escodegen": "1.8.1",
-        "html-encoding-sniffer": "1.0.1",
-        "nwmatcher": "1.4.1",
-        "parse5": "1.5.1",
-        "request": "2.81.0",
-        "sax": "1.2.4",
-        "symbol-tree": "3.2.2",
-        "tough-cookie": "2.3.2",
-        "webidl-conversions": "4.0.1",
-        "whatwg-encoding": "1.0.1",
-        "whatwg-url": "4.8.0",
-        "xml-name-validator": "2.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-          "dev": true
-        }
-      }
-    },
-    "jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
-    },
-    "json-loader": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz",
-      "integrity": "sha1-i6oTZaYy9Yo8RtIBdfxgAsluN94=",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
-    },
-    "json-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "requires": {
-        "jsonify": "0.0.0"
-      }
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "json3": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-      "dev": true
-    },
-    "json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
-    },
-    "jsonfile": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11"
-      }
-    },
-    "jsonfilter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/jsonfilter/-/jsonfilter-1.1.2.tgz",
-      "integrity": "sha1-Ie987cdRk4E8dZMulqmL4gW6WhE=",
-      "dev": true,
-      "requires": {
-        "JSONStream": "0.8.4",
-        "minimist": "1.2.0",
-        "stream-combiner": "0.2.2",
-        "through2": "0.6.5"
-      }
-    },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-    },
-    "jsonparse": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
-      "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
-      "dev": true
-    },
-    "jsonpointer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-      "dev": true
-    },
-    "JSONStream": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-      "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-      "dev": true,
-      "requires": {
-        "jsonparse": "0.0.5",
-        "through": "2.3.8"
-      }
-    },
-    "jsprim": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.0.2",
-        "json-schema": "0.2.3",
-        "verror": "1.3.6"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
-    },
-    "jsqr": {
-      "version": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b"
-    },
-    "jsx-ast-utils": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
-      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
-      "dev": true
-    },
-    "keccak": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.3.0.tgz",
-      "integrity": "sha512-JgsKPxYhcJxKrV+TrCyg/GwZbOjhpRPrz2kG8xbAsUaIDelUlKjm08YcwBO9Fm8sqf/Kg8ZWkk6nWujhLykfvw==",
-      "requires": {
-        "bindings": "1.3.0",
-        "inherits": "2.0.3",
-        "nan": "2.6.2",
-        "prebuild-install": "2.2.1",
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "keycode": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.1.9.tgz",
-      "integrity": "sha1-lkojxU5IiUBbSGGlyfBIDUUUHfo="
-    },
-    "keythereum": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/keythereum/-/keythereum-0.4.6.tgz",
-      "integrity": "sha1-D97Hz5OK455eMGGy9uFmd7dmxdo=",
-      "requires": {
-        "elliptic": "6.4.0",
-        "ethereumjs-util": "5.1.1",
-        "sjcl": "1.0.6",
-        "uuid": "3.0.0",
-        "validator": "4.0.2"
-      },
-      "dependencies": {
-        "ethereumjs-util": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.1.1.tgz",
-          "integrity": "sha1-Ei+zjep0fcYrOuv8Nl0b1Ivktz4=",
-          "requires": {
-            "bn.js": "4.11.7",
-            "create-hash": "1.1.3",
-            "ethjs-util": "0.1.4",
-            "keccak": "1.3.0",
-            "rlp": "2.0.0",
-            "secp256k1": "3.3.0"
-          }
-        },
-        "validator": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/validator/-/validator-4.0.2.tgz",
-          "integrity": "sha1-cKHCUl7EdE5AmXHBspiqaadTQlE="
-        }
-      }
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "requires": {
-        "is-buffer": "1.1.5"
-      }
-    },
-    "klaw": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11"
-      }
-    },
-    "known-css-properties": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.0.6.tgz",
-      "integrity": "sha1-caC4/eG240McRx77w9lzP667z78=",
-      "dev": true
-    },
-    "laggard": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/laggard/-/laggard-0.1.0.tgz",
-      "integrity": "sha1-Lv1kX38tjz0nrICAOcqGqO40EHU=",
-      "dev": true,
-      "requires": {
-        "minimist": "1.2.0",
-        "pixrem": "3.0.2",
-        "postcss": "5.2.17",
-        "postcss-color-rgba-fallback": "2.2.0",
-        "postcss-opacity": "3.0.0",
-        "postcss-pseudoelements": "3.0.0",
-        "postcss-reporter": "1.4.1",
-        "postcss-vmin": "2.0.0",
-        "postcss-will-change": "1.1.0",
-        "read-file-stdin": "0.2.1",
-        "write-file-stdout": "0.0.2"
-      },
-      "dependencies": {
-        "postcss-opacity": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-opacity/-/postcss-opacity-3.0.0.tgz",
-          "integrity": "sha1-eHm8xzRAW/dKpsgcORdiBS/FWyk=",
-          "dev": true,
-          "requires": {
-            "postcss": "5.2.17"
-          }
-        },
-        "postcss-reporter": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz",
-          "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "lodash": "4.17.2",
-            "log-symbols": "1.0.2",
-            "postcss": "5.2.17"
-          }
-        }
-      }
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
-    },
-    "lazy-req": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz",
-      "integrity": "sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=",
-      "dev": true
-    },
-    "lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-      "requires": {
-        "readable-stream": "2.3.3"
-      }
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "requires": {
-        "invert-kv": "1.0.0"
-      }
-    },
-    "lcov-parse": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz",
-      "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=",
-      "dev": true
-    },
-    "ldjson-stream": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz",
-      "integrity": "sha1-kb7O2lrE7SsX5kn7d356v6AYnCs=",
-      "dev": true,
-      "requires": {
-        "split2": "0.2.1",
-        "through2": "0.6.5"
-      }
-    },
-    "leven": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
-      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA="
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2"
-      }
-    },
-    "lie": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
-      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
-      "requires": {
-        "immediate": "3.0.6"
-      }
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "parse-json": "2.2.0",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "strip-bom": "2.0.0"
-      }
-    },
-    "loader-runner": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz",
-      "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "0.2.17",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-      "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
-      "requires": {
-        "big.js": "3.1.3",
-        "emojis-list": "2.1.0",
-        "json5": "0.5.1",
-        "object-assign": "4.1.1"
-      }
-    },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "requires": {
-        "p-locate": "2.0.0",
-        "path-exists": "3.0.0"
-      },
-      "dependencies": {
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        }
-      }
-    },
-    "lodash": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz",
-      "integrity": "sha1-NKMFW6vgTOQkZ7YH1wAHLH/2v0I="
-    },
-    "lodash-es": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.4.tgz",
-      "integrity": "sha1-3MHXVS4VCgZABzupyzHXDwMpUOc="
-    },
-    "lodash._baseassign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-      "dev": true,
-      "requires": {
-        "lodash._basecopy": "3.0.1",
-        "lodash.keys": "3.1.2"
-      }
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
-    },
-    "lodash._basecreate": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-      "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
-      "dev": true
-    },
-    "lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U="
-    },
-    "lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc="
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
-    },
-    "lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo="
-    },
-    "lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0="
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
-    },
-    "lodash._root": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
-    },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
-    },
-    "lodash.assignin": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
-      "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=",
-      "dev": true
-    },
-    "lodash.bind": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
-      "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=",
-      "dev": true
-    },
-    "lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
-      "dev": true
-    },
-    "lodash.create": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-      "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
-      "dev": true,
-      "requires": {
-        "lodash._baseassign": "3.2.0",
-        "lodash._basecreate": "3.0.3",
-        "lodash._isiterateecall": "3.0.9"
-      }
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
-    },
-    "lodash.defaults": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-      "dev": true
-    },
-    "lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-      "requires": {
-        "lodash._root": "3.0.1"
-      }
-    },
-    "lodash.filter": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
-      "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=",
-      "dev": true
-    },
-    "lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-      "dev": true
-    },
-    "lodash.foreach": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
-      "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=",
-      "dev": true
-    },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
-    },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "requires": {
-        "lodash._getnative": "3.9.1",
-        "lodash.isarguments": "3.1.0",
-        "lodash.isarray": "3.0.4"
-      }
-    },
-    "lodash.map": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
-      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=",
-      "dev": true
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-      "dev": true
-    },
-    "lodash.merge": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz",
-      "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU="
-    },
-    "lodash.pad": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz",
-      "integrity": "sha1-QzCUmoM6fI2iLMIPaibE1Z3runA="
-    },
-    "lodash.padend": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
-      "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4="
-    },
-    "lodash.padstart": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz",
-      "integrity": "sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs="
-    },
-    "lodash.pick": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
-      "dev": true
-    },
-    "lodash.pickby": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
-      "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=",
-      "dev": true
-    },
-    "lodash.reduce": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
-      "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=",
-      "dev": true
-    },
-    "lodash.reject": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
-      "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=",
-      "dev": true
-    },
-    "lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
-    },
-    "lodash.some": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
-      "dev": true
-    },
-    "lodash.template": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-      "requires": {
-        "lodash._basecopy": "3.0.1",
-        "lodash._basetostring": "3.0.1",
-        "lodash._basevalues": "3.0.0",
-        "lodash._isiterateecall": "3.0.9",
-        "lodash._reinterpolate": "3.0.0",
-        "lodash.escape": "3.2.0",
-        "lodash.keys": "3.1.2",
-        "lodash.restparam": "3.6.1",
-        "lodash.templatesettings": "3.1.1"
-      }
-    },
-    "lodash.templatesettings": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-      "requires": {
-        "lodash._reinterpolate": "3.0.0",
-        "lodash.escape": "3.2.0"
-      }
-    },
-    "lodash.throttle": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
-      "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
-    },
-    "lodash.toarray": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
-      "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE="
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "log-driver": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
-      "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=",
-      "dev": true
-    },
-    "log-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3"
-      }
-    },
-    "logalot": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz",
-      "integrity": "sha1-X46MkNME7fElMJUaVVSruMXj9VI=",
-      "dev": true,
-      "requires": {
-        "figures": "1.7.0",
-        "squeak": "1.3.0"
-      },
-      "dependencies": {
-        "figures": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "1.0.5",
-            "object-assign": "4.1.1"
-          }
-        }
-      }
-    },
-    "loglevel": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.4.1.tgz",
-      "integrity": "sha1-lbOD+Ro8J1b9SrCTZn5DCRYfK80="
-    },
-    "lolex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
-      "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=",
-      "dev": true
-    },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
-    },
-    "loose-envify": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-      "requires": {
-        "js-tokens": "3.0.2"
-      }
-    },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "requires": {
-        "currently-unhandled": "0.4.1",
-        "signal-exit": "3.0.2"
-      }
-    },
-    "lower-case": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
-      "dev": true
-    },
-    "lowercase-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-      "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY="
-    },
-    "lpad-align": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz",
-      "integrity": "sha1-IfYArBwwlcPG5JfuZyce4ISB/p4=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "4.0.1",
-        "indent-string": "2.1.0",
-        "longest": "1.0.1",
-        "meow": "3.7.0"
-      },
-      "dependencies": {
-        "get-stdin": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-          "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-          "dev": true
-        }
-      }
-    },
-    "lru-cache": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
-      "dev": true,
-      "requires": {
-        "pseudomap": "1.0.2",
-        "yallist": "2.1.2"
-      }
-    },
-    "macaddress": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz",
-      "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=",
-      "dev": true
-    },
-    "make-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-      "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
-      "dev": true,
-      "requires": {
-        "pify": "2.3.0"
-      }
-    },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
-    },
-    "markdown-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-loader/-/markdown-loader-2.0.0.tgz",
-      "integrity": "sha1-Qhhi04xCJP02FetkgBfqOFtWLXg=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "0.2.17",
-        "marked": "0.3.6"
-      }
-    },
-    "marked": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
-      "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
-    },
-    "material-ui": {
-      "version": "0.16.5",
-      "resolved": "https://registry.npmjs.org/material-ui/-/material-ui-0.16.5.tgz",
-      "integrity": "sha1-u4ZhqsfKyMsiOj529PV+4YpK78E=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "inline-style-prefixer": "2.0.5",
-        "keycode": "2.1.9",
-        "lodash.merge": "4.6.0",
-        "lodash.throttle": "4.1.1",
-        "react-addons-create-fragment": "15.6.0",
-        "react-addons-transition-group": "15.6.0",
-        "react-event-listener": "0.4.1",
-        "recompose": "0.20.2",
-        "simple-assign": "0.1.0",
-        "warning": "3.0.0"
-      }
-    },
-    "material-ui-chip-input": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/material-ui-chip-input/-/material-ui-chip-input-0.11.1.tgz",
-      "integrity": "sha1-6Sssxcl0HNddaxgi8cd3GtTObBA="
-    },
-    "math-expression-evaluator": {
-      "version": "1.2.17",
-      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
-      "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw="
-    },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "requires": {
-        "errno": "0.1.4",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "memorystream": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
-      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI="
-    },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "requires": {
-        "camelcase-keys": "2.1.0",
-        "decamelize": "1.2.0",
-        "loud-rejection": "1.6.0",
-        "map-obj": "1.0.1",
-        "minimist": "1.2.0",
-        "normalize-package-data": "2.4.0",
-        "object-assign": "4.1.1",
-        "read-pkg-up": "1.0.1",
-        "redent": "1.0.0",
-        "trim-newlines": "1.0.0"
-      }
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
-    },
-    "merge-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-      "requires": {
-        "readable-stream": "2.3.3"
-      }
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-      "requires": {
-        "arr-diff": "2.0.0",
-        "array-unique": "0.2.1",
-        "braces": "1.8.5",
-        "expand-brackets": "0.1.5",
-        "extglob": "0.3.2",
-        "filename-regex": "2.0.1",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1",
-        "kind-of": "3.2.2",
-        "normalize-path": "2.1.1",
-        "object.omit": "2.0.1",
-        "parse-glob": "3.0.4",
-        "regex-cache": "0.4.3"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        }
-      }
-    },
-    "miller-rabin": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
-      "integrity": "sha1-SmL7HUKTPAVYOYL0xxb2+55sbT0=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.7",
-        "brorand": "1.1.0"
-      }
-    },
-    "mime": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
-      "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.29.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
-      "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg="
-    },
-    "mime-types": {
-      "version": "2.1.16",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
-      "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=",
-      "requires": {
-        "mime-db": "1.29.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
-      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg="
-    },
-    "min-document": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
-      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
-      "dev": true,
-      "requires": {
-        "dom-walk": "0.1.1"
-      }
-    },
-    "minimalistic-assert": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
-      "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M="
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-      "requires": {
-        "brace-expansion": "1.1.8"
-      }
-    },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-        }
-      }
-    },
-    "mobx": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/mobx/-/mobx-2.6.4.tgz",
-      "integrity": "sha1-4FqRpbLJfaw/2rNAJOa3Sn9DEas="
-    },
-    "mobx-react": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-4.0.3.tgz",
-      "integrity": "sha1-QOsx0l4LjWMEjtojdsxWv6vRT3U=",
-      "requires": {
-        "hoist-non-react-statics": "1.2.0"
-      }
-    },
-    "mobx-react-devtools": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/mobx-react-devtools/-/mobx-react-devtools-4.2.10.tgz",
-      "integrity": "sha1-eSdL2NRLoE2VByhzihRFQfoqYBI="
-    },
-    "mocha": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz",
-      "integrity": "sha1-fcT0XlCIB1FxpoiWgU5q6et6heM=",
-      "dev": true,
-      "requires": {
-        "browser-stdout": "1.3.0",
-        "commander": "2.9.0",
-        "debug": "2.2.0",
-        "diff": "1.4.0",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.0.5",
-        "growl": "1.9.2",
-        "json3": "3.3.2",
-        "lodash.create": "3.1.1",
-        "mkdirp": "0.5.1",
-        "supports-color": "3.1.2"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-          "dev": true,
-          "requires": {
-            "graceful-readlink": "1.0.1"
-          }
-        },
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.1"
-          }
-        },
-        "glob": {
-          "version": "7.0.5",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz",
-          "integrity": "sha1-tCAqaQmbu00pKnwblbZoK2fr3JU=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-          "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "mock-local-storage": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/mock-local-storage/-/mock-local-storage-1.0.2.tgz",
-      "integrity": "sha1-plplzdq0cHQz1Suk6fa2MIS4wpg=",
-      "dev": true,
-      "requires": {
-        "core-js": "0.8.4"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-0.8.4.tgz",
-          "integrity": "sha1-wiZl8eDRucPF4bCNq9HxCGleT88=",
-          "dev": true
-        }
-      }
-    },
-    "mock-socket": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-6.0.4.tgz",
-      "integrity": "sha1-hfWKCqg7wdtMp9FLQtj53WY+dWk=",
-      "dev": true
-    },
-    "moment": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz",
-      "integrity": "sha1-pMKS4CqsXd77Kabu0k9Rk43Tt08="
-    },
-    "mozjpeg": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/mozjpeg/-/mozjpeg-4.1.1.tgz",
-      "integrity": "sha1-hZAwsk9omlPbm0DwFg2JGVuI/VA=",
-      "dev": true,
-      "requires": {
-        "bin-build": "2.2.0",
-        "bin-wrapper": "3.0.2",
-        "logalot": "2.1.0"
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "multimatch": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
-      "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
-      "dev": true,
-      "requires": {
-        "array-differ": "1.0.0",
-        "array-union": "1.0.2",
-        "arrify": "1.0.1",
-        "minimatch": "3.0.4"
-      }
-    },
-    "multipipe": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-      "requires": {
-        "duplexer2": "0.0.2"
-      },
-      "dependencies": {
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-          "requires": {
-            "readable-stream": "1.1.14"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        }
-      }
-    },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
-    },
-    "nan": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U="
-    },
-    "napa": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/napa/-/napa-2.3.0.tgz",
-      "integrity": "sha1-QZZUbRoLa7lPNwQgU8xd3XlzHlM=",
-      "requires": {
-        "download": "4.4.3",
-        "extend": "3.0.1",
-        "load-json-file": "1.1.0",
-        "minimist": "1.2.0",
-        "mkdirp": "0.5.1",
-        "npm-cache-filename": "1.0.2",
-        "npmlog": "2.0.4",
-        "rimraf": "2.6.1",
-        "tar-pack": "3.4.0",
-        "write-json-file": "1.2.0"
-      },
-      "dependencies": {
-        "extend": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-        },
-        "gauge": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz",
-          "integrity": "sha1-6c7FSD09TuDvRLYKfZnkk14TbZM=",
-          "requires": {
-            "ansi": "0.3.1",
-            "has-unicode": "2.0.1",
-            "lodash.pad": "4.5.1",
-            "lodash.padend": "4.6.1",
-            "lodash.padstart": "4.6.1"
-          }
-        },
-        "npmlog": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz",
-          "integrity": "sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI=",
-          "requires": {
-            "ansi": "0.3.1",
-            "are-we-there-yet": "1.1.4",
-            "gauge": "1.2.7"
-          }
-        }
-      }
-    },
-    "native-promise-only": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz",
-      "integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE=",
-      "dev": true
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "ncname": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz",
-      "integrity": "sha1-W1etGLHKCShk72Kwse2BlPODtxw=",
-      "dev": true,
-      "requires": {
-        "xml-char-classes": "1.0.0"
-      }
-    },
-    "negotiator": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-      "dev": true
-    },
-    "no-case": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz",
-      "integrity": "sha1-euuhxzpSGEJlVUt9wDuvcg34AIE=",
-      "dev": true,
-      "requires": {
-        "lower-case": "1.1.4"
-      }
-    },
-    "nock": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/nock/-/nock-9.0.7.tgz",
-      "integrity": "sha1-zJNIG7FfOL7Co5xEQr4HglI1saE=",
-      "dev": true,
-      "requires": {
-        "chai": "3.5.0",
-        "debug": "2.6.8",
-        "deep-equal": "1.0.1",
-        "json-stringify-safe": "5.0.1",
-        "lodash": "4.17.2",
-        "mkdirp": "0.5.1",
-        "propagate": "0.4.0",
-        "qs": "6.3.0"
-      }
-    },
-    "node-abi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.0.tgz",
-      "integrity": "sha512-AbW35CPRE4vdieOse46V+16dKispLNv3PQwgqlcfg7GQeQHcLu3gvp3fbU2gTh7d8NfGjp5CJh+j4Hpyb0XzaA=="
-    },
-    "node-dir": {
-      "version": "0.1.17",
-      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
-      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
-      "dev": true,
-      "requires": {
-        "minimatch": "3.0.4"
-      }
-    },
-    "node-emoji": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz",
-      "integrity": "sha512-+ktMAh1Jwas+TnGodfCfjUbJKoANqPaJFN0z0iqh41eqD8dvguNzcitVSBSVK1pidz0AqGbLKcoVuVLRVZ/aVg==",
-      "requires": {
-        "lodash.toarray": "4.4.0"
-      }
-    },
-    "node-fetch": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz",
-      "integrity": "sha512-j8XsFGCLw79vWXkZtMSmmLaOk9z5SQ9bV/tkbZVCqvgwzrjAGq66igobLofHtF63NvMTp2WjytpsNTGKa+XRIQ==",
-      "requires": {
-        "encoding": "0.1.12",
-        "is-stream": "1.1.0"
-      }
-    },
-    "node-gyp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
-      "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
-      "requires": {
-        "fstream": "1.0.11",
-        "glob": "7.1.2",
-        "graceful-fs": "4.1.11",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6",
-        "npmlog": "4.1.2",
-        "osenv": "0.1.4",
-        "request": "2.81.0",
-        "rimraf": "2.6.1",
-        "semver": "5.3.0",
-        "tar": "2.2.1",
-        "which": "1.2.14"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
-        }
-      }
-    },
-    "node-libs-browser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz",
-      "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=",
-      "dev": true,
-      "requires": {
-        "assert": "1.4.1",
-        "browserify-zlib": "0.1.4",
-        "buffer": "4.9.1",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.11.1",
-        "domain-browser": "1.1.7",
-        "events": "1.1.1",
-        "https-browserify": "0.0.1",
-        "os-browserify": "0.2.1",
-        "path-browserify": "0.0.0",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "readable-stream": "2.3.3",
-        "stream-browserify": "2.0.1",
-        "stream-http": "2.7.2",
-        "string_decoder": "0.10.31",
-        "timers-browserify": "2.0.3",
-        "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.10.3",
-        "vm-browserify": "0.0.4"
-      },
-      "dependencies": {
-        "process": {
-          "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "node-status-codes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
-      "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8="
-    },
-    "noop-logger": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
-      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI="
-    },
-    "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "requires": {
-        "abbrev": "1.1.0"
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-      "requires": {
-        "hosted-git-info": "2.5.0",
-        "is-builtin-module": "1.0.0",
-        "semver": "5.4.1",
-        "validate-npm-package-license": "3.0.1"
-      }
-    },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "requires": {
-        "remove-trailing-separator": "1.0.2"
-      }
-    },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true
-    },
-    "normalize-selector": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-      "dev": true
-    },
-    "normalize-url": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-      "dev": true,
-      "requires": {
-        "object-assign": "4.1.1",
-        "prepend-http": "1.0.4",
-        "query-string": "4.3.4",
-        "sort-keys": "1.1.2"
-      }
-    },
-    "npm-cache-filename": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz",
-      "integrity": "sha1-3tMGxbC/yHCp6fr4I7xfKD4FrhE="
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
-      "requires": {
-        "path-key": "2.0.1"
-      }
-    },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "requires": {
-        "are-we-there-yet": "1.1.4",
-        "console-control-strings": "1.1.0",
-        "gauge": "2.7.4",
-        "set-blocking": "2.0.0"
-      }
-    },
-    "nth-check": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
-      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-      "dev": true,
-      "requires": {
-        "boolbase": "1.0.0"
-      }
-    },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-    },
-    "nwmatcher": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.1.tgz",
-      "integrity": "sha1-eumwew6oBNt+JfBctf5Al9TklJ8=",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "object-is": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
-      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
-      "dev": true
-    },
-    "object-path": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
-      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk="
-    },
-    "object.assign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz",
-      "integrity": "sha1-scnMBE7xuf5jYG/BQau7MuFHMMw=",
-      "dev": true,
-      "requires": {
-        "define-properties": "1.1.2",
-        "function-bind": "1.1.0",
-        "object-keys": "1.0.11"
-      }
-    },
-    "object.entries": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz",
-      "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
-      "dev": true,
-      "requires": {
-        "define-properties": "1.1.2",
-        "es-abstract": "1.7.0",
-        "function-bind": "1.1.0",
-        "has": "1.0.1"
-      }
-    },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-      "requires": {
-        "for-own": "0.1.5",
-        "is-extendable": "0.1.1"
-      }
-    },
-    "object.values": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz",
-      "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=",
-      "dev": true,
-      "requires": {
-        "define-properties": "1.1.2",
-        "es-abstract": "1.7.0",
-        "function-bind": "1.1.0",
-        "has": "1.0.1"
-      }
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1.0.2"
-      }
-    },
-    "onecolor": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.0.4.tgz",
-      "integrity": "sha1-daRvgNpseqpbTarhekcZi9llJJQ=",
-      "dev": true
-    },
-    "onetime": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.10",
-        "wordwrap": "0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-          "dev": true
-        }
-      }
-    },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-      "dev": true,
-      "requires": {
-        "deep-is": "0.1.3",
-        "fast-levenshtein": "2.0.6",
-        "levn": "0.3.0",
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2",
-        "wordwrap": "1.0.0"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-          "dev": true
-        }
-      }
-    },
-    "optipng-bin": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/optipng-bin/-/optipng-bin-3.1.4.tgz",
-      "integrity": "sha1-ldNPLEiHBPb9cGBr/qDGWfHZXYQ=",
-      "dev": true,
-      "requires": {
-        "bin-build": "2.2.0",
-        "bin-wrapper": "3.0.2",
-        "logalot": "2.1.0"
-      }
-    },
-    "ordered-read-streams": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
-      "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
-      "requires": {
-        "is-stream": "1.1.0",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "os-browserify": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
-      "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
-      "dev": true
-    },
-    "os-filter-obj": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-1.0.3.tgz",
-      "integrity": "sha1-WRUzDZDs7VV9LZOKMcbdIU2cY60=",
-      "dev": true
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
-    },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "requires": {
-        "lcid": "1.0.0"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-    },
-    "osenv": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-      "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
-      }
-    },
-    "output-file-sync": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
-      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "mkdirp": "0.5.1",
-        "object-assign": "4.1.1"
-      }
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
-      "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
-      "dev": true
-    },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "requires": {
-        "p-limit": "1.1.0"
-      }
-    },
-    "p-pipe": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz",
-      "integrity": "sha1-SxoROZoRUgpneQ7loMHViB1r7+k=",
-      "dev": true
-    },
-    "pako": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-      "dev": true
-    },
-    "param-case": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
-      "dev": true,
-      "requires": {
-        "no-case": "2.3.1"
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
-      "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
-      "dev": true,
-      "requires": {
-        "asn1.js": "4.9.1",
-        "browserify-aes": "1.0.6",
-        "create-hash": "1.1.3",
-        "evp_bytestokey": "1.0.0",
-        "pbkdf2": "3.0.12"
-      }
-    },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-      "requires": {
-        "glob-base": "0.3.0",
-        "is-dotfile": "1.0.3",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        }
-      }
-    },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "requires": {
-        "error-ex": "1.3.1"
-      }
-    },
-    "parse5": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-      "dev": true
-    },
-    "parseurl": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz",
-      "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=",
-      "dev": true
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
-    },
-    "path-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
-    },
-    "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "requires": {
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-      "dev": true
-    },
-    "path-to-regexp": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
-      "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
-      "requires": {
-        "isarray": "0.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        }
-      }
-    },
-    "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "pbkdf2": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz",
-      "integrity": "sha1-vjZ4XFBn6kjYBv+SMojF91C2uKI=",
-      "dev": true,
-      "requires": {
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
-        "ripemd160": "2.0.1",
-        "safe-buffer": "5.1.1",
-        "sha.js": "2.4.8"
-      }
-    },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "phoneformat.js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/phoneformat.js/-/phoneformat.js-1.0.3.tgz",
-      "integrity": "sha1-Eb40dOdkdFQP43NMwz8aZYQdX4c="
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "requires": {
-        "pinkie": "2.0.4"
-      }
-    },
-    "pipetteur": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pipetteur/-/pipetteur-2.0.3.tgz",
-      "integrity": "sha1-GVV2CVno0aEcsqUOyD7sRwYz5J8=",
-      "dev": true,
-      "requires": {
-        "onecolor": "3.0.4",
-        "synesthesia": "1.0.1"
-      }
-    },
-    "pixrem": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/pixrem/-/pixrem-3.0.2.tgz",
-      "integrity": "sha1-MNG6+0w73Ojpu0vVahOYVhkyDDQ=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "postcss": "5.2.17",
-        "reduce-css-calc": "1.3.0"
-      }
-    },
-    "pkg-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-      "dev": true,
-      "requires": {
-        "find-up": "1.1.2"
-      }
-    },
-    "plur": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
-      "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-      "dev": true,
-      "requires": {
-        "irregular-plurals": "1.3.0"
-      }
-    },
-    "pluralize": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-      "dev": true
-    },
-    "pngquant-bin": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/pngquant-bin/-/pngquant-bin-3.1.1.tgz",
-      "integrity": "sha1-0STZinWpSH9AwWQLTb/Lsr1aH9E=",
-      "dev": true,
-      "requires": {
-        "bin-build": "2.2.0",
-        "bin-wrapper": "3.0.2",
-        "logalot": "2.1.0"
-      }
-    },
-    "postcss": {
-      "version": "5.2.17",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-      "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "js-base64": "2.1.9",
-        "source-map": "0.5.6",
-        "supports-color": "3.2.3"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-alias": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-alias/-/postcss-alias-1.0.0.tgz",
-      "integrity": "sha1-Bwxh7hGXr27l63XSat9IiZudL3s=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-calc": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
-      "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17",
-        "postcss-message-helpers": "2.0.0",
-        "reduce-css-calc": "1.3.0"
-      }
-    },
-    "postcss-clearfix": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-clearfix/-/postcss-clearfix-1.0.0.tgz",
-      "integrity": "sha1-r+xqDgHSXaw2pUrbif/Uv+HSGa8=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-color-rgba-fallback": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-2.2.0.tgz",
-      "integrity": "sha1-bSlJG+WZCpMXPUfnx29YELCUAro=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0",
-        "rgb-hex": "1.0.0"
-      }
-    },
-    "postcss-colormin": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz",
-      "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
-      "dev": true,
-      "requires": {
-        "colormin": "1.1.2",
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0"
-      }
-    },
-    "postcss-convert-values": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz",
-      "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0"
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
-      "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-discard-duplicates": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz",
-      "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-discard-empty": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
-      "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-discard-overridden": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
-      "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-discard-unused": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
-      "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17",
-        "uniqs": "2.0.0"
-      }
-    },
-    "postcss-easings": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-easings/-/postcss-easings-0.3.0.tgz",
-      "integrity": "sha1-I9zL+XWH4o1doZw7rktQaYxarV4=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-filter-plugins": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz",
-      "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17",
-        "uniqid": "4.1.1"
-      }
-    },
-    "postcss-fontpath": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-fontpath/-/postcss-fontpath-0.3.0.tgz",
-      "integrity": "sha1-KBQqed0Y8snwv1yH96PreUxTkp4=",
-      "dev": true,
-      "requires": {
-        "object-assign": "4.1.1",
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-hexrgba": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-hexrgba/-/postcss-hexrgba-0.2.1.tgz",
-      "integrity": "sha1-XGGrukOcCjjknn+8CzzZNhGewiU=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-import": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-9.1.0.tgz",
-      "integrity": "sha1-lf6YdqHnmvSfvcNYnwH+WqfMHoA=",
-      "dev": true,
-      "requires": {
-        "object-assign": "4.1.1",
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0",
-        "promise-each": "2.2.0",
-        "read-cache": "1.0.0",
-        "resolve": "1.4.0"
-      }
-    },
-    "postcss-input-style": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-input-style/-/postcss-input-style-0.3.0.tgz",
-      "integrity": "sha1-47T9sKpEG+0ZMMu0TYrVY0zzhUA=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-less": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-0.14.0.tgz",
-      "integrity": "sha1-xjGwicbM5CK5oQ86lY0r7dOBkyQ=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-load-config": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz",
-      "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1",
-        "postcss-load-options": "1.2.0",
-        "postcss-load-plugins": "2.3.0"
-      }
-    },
-    "postcss-load-options": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz",
-      "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1"
-      }
-    },
-    "postcss-load-plugins": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz",
-      "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1"
-      }
-    },
-    "postcss-loader": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-1.3.2.tgz",
-      "integrity": "sha1-xWi2HC5I4nThwiSiWH+1ZvTsJvU=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "1.1.0",
-        "object-assign": "4.1.1",
-        "postcss": "5.2.17",
-        "postcss-load-config": "1.2.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
-          "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
-          "dev": true,
-          "requires": {
-            "big.js": "3.1.3",
-            "emojis-list": "2.1.0",
-            "json5": "0.5.1"
-          }
-        }
-      }
-    },
-    "postcss-media-query-parser": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
-      "dev": true
-    },
-    "postcss-merge-idents": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
-      "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
-      "dev": true,
-      "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0"
-      }
-    },
-    "postcss-merge-longhand": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz",
-      "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-merge-rules": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz",
-      "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-api": "1.6.1",
-        "postcss": "5.2.17",
-        "postcss-selector-parser": "2.2.3",
-        "vendors": "1.0.1"
-      }
-    },
-    "postcss-message-helpers": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
-      "dev": true
-    },
-    "postcss-minify-font-values": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
-      "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
-      "dev": true,
-      "requires": {
-        "object-assign": "4.1.1",
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0"
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
-      "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0"
-      }
-    },
-    "postcss-minify-params": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
-      "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "1.0.2",
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0",
-        "uniqs": "2.0.0"
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
-      "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "1.0.2",
-        "has": "1.0.1",
-        "postcss": "5.2.17",
-        "postcss-selector-parser": "2.2.3"
-      }
-    },
-    "postcss-modules-extract-imports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
-      "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
-      "dev": true,
-      "requires": {
-        "postcss": "6.0.8"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
-          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.0",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.2.1"
-          }
-        },
-        "postcss": {
-          "version": "6.0.8",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz",
-          "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==",
-          "dev": true,
-          "requires": {
-            "chalk": "2.0.1",
-            "source-map": "0.5.6",
-            "supports-color": "4.2.1"
-          }
-        },
-        "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
-          "dev": true,
-          "requires": {
-            "has-flag": "2.0.0"
-          }
-        }
-      }
-    },
-    "postcss-modules-local-by-default": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
-      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
-      "dev": true,
-      "requires": {
-        "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.8"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
-          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.0",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.2.1"
-          }
-        },
-        "postcss": {
-          "version": "6.0.8",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz",
-          "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==",
-          "dev": true,
-          "requires": {
-            "chalk": "2.0.1",
-            "source-map": "0.5.6",
-            "supports-color": "4.2.1"
-          }
-        },
-        "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
-          "dev": true,
-          "requires": {
-            "has-flag": "2.0.0"
-          }
-        }
-      }
-    },
-    "postcss-modules-scope": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
-      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
-      "dev": true,
-      "requires": {
-        "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.8"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
-          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.0",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.2.1"
-          }
-        },
-        "postcss": {
-          "version": "6.0.8",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz",
-          "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==",
-          "dev": true,
-          "requires": {
-            "chalk": "2.0.1",
-            "source-map": "0.5.6",
-            "supports-color": "4.2.1"
-          }
-        },
-        "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
-          "dev": true,
-          "requires": {
-            "has-flag": "2.0.0"
-          }
-        }
-      }
-    },
-    "postcss-modules-values": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
-      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
-      "dev": true,
-      "requires": {
-        "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.8"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
-          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.0",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.2.1"
-          }
-        },
-        "postcss": {
-          "version": "6.0.8",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz",
-          "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==",
-          "dev": true,
-          "requires": {
-            "chalk": "2.0.1",
-            "source-map": "0.5.6",
-            "supports-color": "4.2.1"
-          }
-        },
-        "supports-color": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
-          "dev": true,
-          "requires": {
-            "has-flag": "2.0.0"
-          }
-        }
-      }
-    },
-    "postcss-nested": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-1.0.0.tgz",
-      "integrity": "sha1-0Ta9S1dr1WMt8ULBKyGYqcz3lN8=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
-      "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
-      "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
-      "dev": true,
-      "requires": {
-        "is-absolute-url": "2.1.0",
-        "normalize-url": "1.9.1",
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0"
-      }
-    },
-    "postcss-opacity": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-opacity/-/postcss-opacity-4.0.0.tgz",
-      "integrity": "sha1-qlYgQ9ozlMlKOs7c9D8MMj0JhqE=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-ordered-values": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz",
-      "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0"
-      }
-    },
-    "postcss-position": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/postcss-position/-/postcss-position-0.5.0.tgz",
-      "integrity": "sha1-hlPU8LhP+wflRPt/fq4IxlUbc6A=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-pseudoelements": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-3.0.0.tgz",
-      "integrity": "sha1-bGghd8eQC6BTtt8X+MWQKEx7i7w=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-quantity-queries": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/postcss-quantity-queries/-/postcss-quantity-queries-0.4.0.tgz",
-      "integrity": "sha1-vhNwp76TEqFzY5wIaapCECRPhs4=",
-      "dev": true,
-      "requires": {
-        "balanced-match": "0.2.1",
-        "postcss": "5.2.17"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
-          "integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=",
-          "dev": true
-        }
-      }
-    },
-    "postcss-reduce-idents": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
-      "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0"
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
-      "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-reduce-transforms": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
-      "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
-      "dev": true,
-      "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0"
-      }
-    },
-    "postcss-reporter": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-2.0.0.tgz",
-      "integrity": "sha1-0l50un/OkR4qpy7BrlkvrebsNnE=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "lodash": "4.17.2",
-        "log-symbols": "1.0.2",
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
-      "dev": true
-    },
-    "postcss-responsive-type": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/postcss-responsive-type/-/postcss-responsive-type-0.5.1.tgz",
-      "integrity": "sha1-J0EzvARjWeVCpYu8YhhH0ED9EOY=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-scss": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-0.4.1.tgz",
-      "integrity": "sha1-rXcbgfD3L19IRdCKpg+TVXZT1Uw=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-      "dev": true,
-      "requires": {
-        "flatten": "1.0.2",
-        "indexes-of": "1.0.1",
-        "uniq": "1.0.1"
-      }
-    },
-    "postcss-simple-vars": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-simple-vars/-/postcss-simple-vars-3.0.0.tgz",
-      "integrity": "sha1-H6TMtLcVHZ8NUvuOoZoVwTGVmdY=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-svgo": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
-      "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
-      "dev": true,
-      "requires": {
-        "is-svg": "2.1.0",
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0",
-        "svgo": "0.7.2"
-      }
-    },
-    "postcss-unique-selectors": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
-      "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "1.0.2",
-        "postcss": "5.2.17",
-        "uniqs": "2.0.0"
-      }
-    },
-    "postcss-value-parser": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
-      "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
-      "dev": true
-    },
-    "postcss-vmin": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-vmin/-/postcss-vmin-2.0.0.tgz",
-      "integrity": "sha1-UyfCEZE3ElaGj9enOZF/FHTVf+4=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-will-change": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-will-change/-/postcss-will-change-1.1.0.tgz",
-      "integrity": "sha1-plHdWoHoLEEtOabPkKkrsyaa8Yw=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "postcss-zindex": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
-      "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
-      "dev": true,
-      "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.17",
-        "uniqs": "2.0.0"
-      }
-    },
-    "prebuild-install": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.2.1.tgz",
-      "integrity": "sha512-y/sgNJ49vjXQ3qYdSI/jTRZq6D7g5Q2euK6x0/L8dvwK1EGvNLidtg2t4PZzTgkR6LahkzpYVshOmHKYtp0AlQ==",
-      "requires": {
-        "expand-template": "1.0.3",
-        "github-from-package": "0.0.0",
-        "minimist": "1.2.0",
-        "mkdirp": "0.5.1",
-        "node-abi": "2.1.0",
-        "noop-logger": "0.1.1",
-        "npmlog": "4.1.2",
-        "os-homedir": "1.0.2",
-        "pump": "1.0.2",
-        "rc": "1.2.1",
-        "simple-get": "1.4.3",
-        "tar-fs": "1.15.3",
-        "tunnel-agent": "0.6.0",
-        "xtend": "4.0.1"
-      }
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
-    },
-    "prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
-    },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
-    },
-    "pretty-error": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
-      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
-      "dev": true,
-      "requires": {
-        "renderkid": "2.0.1",
-        "utila": "0.4.0"
-      }
-    },
-    "private": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE="
-    },
-    "process": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
-      "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-    },
-    "progress": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-      "dev": true
-    },
-    "progress-bar-webpack-plugin": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.9.3.tgz",
-      "integrity": "sha1-gfuL2OONpu2vmiC+7Xm9l43WPCo=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "object.assign": "4.0.4",
-        "progress": "1.1.8"
-      }
-    },
-    "promise": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "requires": {
-        "asap": "2.0.6"
-      }
-    },
-    "promise-each": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz",
-      "integrity": "sha1-M1MXTv8mlEgQN+BOAfd6oPttG2A=",
-      "dev": true,
-      "requires": {
-        "any-promise": "0.1.0"
-      }
-    },
-    "promise-worker": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/promise-worker/-/promise-worker-1.1.1.tgz",
-      "integrity": "sha1-wrddBF0kliXAImTi3/mtIuAxxps=",
-      "requires": {
-        "is-promise": "2.1.0",
-        "lie": "3.1.1"
-      }
-    },
-    "prop-types": {
-      "version": "15.5.10",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz",
-      "integrity": "sha1-J5ffwxJhguOpXj37suiT3ddFYVQ=",
-      "requires": {
-        "fbjs": "0.8.14",
-        "loose-envify": "1.3.1"
-      }
-    },
-    "propagate": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/propagate/-/propagate-0.4.0.tgz",
-      "integrity": "sha1-8/zKCm/gZzanulcpZgaWF8EwtIE=",
-      "dev": true
-    },
-    "proper-lockfile": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz",
-      "integrity": "sha1-FZ+wYZPTIAP0s2kd0uwaY0qoDR0=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "retry": "0.10.1"
-      }
-    },
-    "proxy-addr": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz",
-      "integrity": "sha1-ccDuOxAt4/IC87ZPYI0XP8uhqRg=",
-      "dev": true,
-      "requires": {
-        "forwarded": "0.1.0",
-        "ipaddr.js": "1.4.0"
-      }
-    },
-    "prr": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
-      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
-      "dev": true
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
-    },
-    "public-encrypt": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-      "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.7",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.1.3",
-        "parse-asn1": "5.1.0",
-        "randombytes": "2.0.5"
-      }
-    },
-    "pump": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
-      "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
-      "requires": {
-        "end-of-stream": "1.4.0",
-        "once": "1.4.0"
-      }
-    },
-    "punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-    },
-    "push.js": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/push.js/-/push.js-0.0.11.tgz",
-      "integrity": "sha1-T606n5CEQhLiqmfQc6I9Rw4yqJE="
-    },
-    "q": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz",
-      "integrity": "sha1-9AOyZPI7wBIox0ExtAfxjV6l1EI="
-    },
-    "query-string": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-      "requires": {
-        "object-assign": "4.1.1",
-        "strict-uri-encode": "1.1.0"
-      }
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true
-    },
-    "raf": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.3.2.tgz",
-      "integrity": "sha1-DBO+C1tJtG921maSSNUnzysC/ic=",
-      "requires": {
-        "performance-now": "2.1.0"
-      }
-    },
-    "randomatic": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-      "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "requires": {
-            "kind-of": "3.2.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "requires": {
-                "is-buffer": "1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "requires": {
-            "is-buffer": "1.1.5"
-          }
-        }
-      }
-    },
-    "randombytes": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
-      "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "range-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-      "dev": true
-    },
-    "raw-loader": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
-      "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
-      "dev": true
-    },
-    "rc": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-      "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
-      "requires": {
-        "deep-extend": "0.4.2",
-        "ini": "1.3.4",
-        "minimist": "1.2.0",
-        "strip-json-comments": "2.0.1"
-      }
-    },
-    "react": {
-      "version": "15.4.2",
-      "resolved": "https://registry.npmjs.org/react/-/react-15.4.2.tgz",
-      "integrity": "sha1-QfeZGyYYU5K6m66WyIiefgGDl+8=",
-      "requires": {
-        "fbjs": "0.8.14",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1"
-      }
-    },
-    "react-ace": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-4.1.0.tgz",
-      "integrity": "sha1-ZZ+qAQ0XP2DWqJQPCzJcXkIsq1Q=",
-      "requires": {
-        "brace": "0.8.0",
-        "lodash.isequal": "4.5.0"
-      },
-      "dependencies": {
-        "brace": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/brace/-/brace-0.8.0.tgz",
-          "integrity": "sha1-6CbG1QVMrl9getexyBI23SzwGXg=",
-          "requires": {
-            "w3c-blob": "0.0.1"
-          }
-        }
-      }
-    },
-    "react-addons-create-fragment": {
-      "version": "15.6.0",
-      "resolved": "https://registry.npmjs.org/react-addons-create-fragment/-/react-addons-create-fragment-15.6.0.tgz",
-      "integrity": "sha1-r5GiKx+wld0B8a+6Q7/Q71idiyA=",
-      "requires": {
-        "fbjs": "0.8.14",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1"
-      }
-    },
-    "react-addons-css-transition-group": {
-      "version": "15.4.2",
-      "resolved": "https://registry.npmjs.org/react-addons-css-transition-group/-/react-addons-css-transition-group-15.4.2.tgz",
-      "integrity": "sha1-t4KINN+hQin+B3UOMx6KjLb7d0U=",
-      "requires": {
-        "fbjs": "0.8.14",
-        "object-assign": "4.1.1"
-      }
-    },
-    "react-addons-perf": {
-      "version": "15.4.2",
-      "resolved": "https://registry.npmjs.org/react-addons-perf/-/react-addons-perf-15.4.2.tgz",
-      "integrity": "sha1-EQvc9cRZxPd8uF7WNLzTOXU2ODs=",
-      "dev": true,
-      "requires": {
-        "fbjs": "0.8.14",
-        "object-assign": "4.1.1"
-      }
-    },
-    "react-addons-shallow-compare": {
-      "version": "15.6.0",
-      "resolved": "https://registry.npmjs.org/react-addons-shallow-compare/-/react-addons-shallow-compare-15.6.0.tgz",
-      "integrity": "sha1-t6Tl/58nBMIM9obdigXdCLJt4lI=",
-      "requires": {
-        "fbjs": "0.8.14",
-        "object-assign": "4.1.1"
-      }
-    },
-    "react-addons-test-utils": {
-      "version": "15.4.2",
-      "resolved": "https://registry.npmjs.org/react-addons-test-utils/-/react-addons-test-utils-15.4.2.tgz",
-      "integrity": "sha1-k7yqcY/K5zYNQuj7HAl1bMNjAqI=",
-      "dev": true,
-      "requires": {
-        "fbjs": "0.8.14",
-        "object-assign": "4.1.1"
-      }
-    },
-    "react-addons-transition-group": {
-      "version": "15.6.0",
-      "resolved": "https://registry.npmjs.org/react-addons-transition-group/-/react-addons-transition-group-15.6.0.tgz",
-      "integrity": "sha1-DyILn5WX2zqAqI29b+gF/GRM4hw=",
-      "requires": {
-        "react-transition-group": "1.2.0"
-      }
-    },
-    "react-codemirror": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/react-codemirror/-/react-codemirror-0.3.0.tgz",
-      "integrity": "sha1-zWvW70WOweA1z9iz/nswyMeIPGw=",
-      "requires": {
-        "classnames": "2.2.5",
-        "codemirror": "5.28.0",
-        "lodash.debounce": "4.0.8"
-      }
-    },
-    "react-container-dimensions": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-container-dimensions/-/react-container-dimensions-1.2.0.tgz",
-      "integrity": "sha1-v7XnDhCqgtLsukkUfRS7TCLK/ao=",
-      "requires": {
-        "element-resize-detector": "1.1.12",
-        "invariant": "2.2.2"
-      }
-    },
-    "react-copy-to-clipboard": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-4.2.3.tgz",
-      "integrity": "sha1-JoxaD73pqV2WFFAU5/hRELDn+44=",
-      "requires": {
-        "copy-to-clipboard": "3.0.8"
-      }
-    },
-    "react-deep-force-update": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz",
-      "integrity": "sha1-T39sEsPn3kLzRZkqPFGCNvoeytM=",
-      "dev": true
-    },
-    "react-dom": {
-      "version": "15.4.2",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.4.2.tgz",
-      "integrity": "sha1-AVNj8FsKH9Uq6e/dOgBg2QaVII8=",
-      "requires": {
-        "fbjs": "0.8.14",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1"
-      }
-    },
-    "react-dropzone": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-3.7.3.tgz",
-      "integrity": "sha1-eFK2ZSpDr8f6ByAh8zaRI+pKYeA=",
-      "requires": {
-        "attr-accept": "1.1.0"
-      }
-    },
-    "react-element-to-jsx-string": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-6.0.0.tgz",
-      "integrity": "sha1-8sFRR27o3YF4ke01K+Ss6fs2McI=",
-      "requires": {
-        "collapse-white-space": "1.0.3",
-        "is-plain-object": "2.0.4",
-        "lodash": "4.17.4",
-        "sortobject": "1.1.1",
-        "stringify-object": "3.2.0",
-        "traverse": "0.6.6"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
-        }
-      }
-    },
-    "react-event-listener": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.4.1.tgz",
-      "integrity": "sha1-hrU5dMPfZRhXdmt7F3aC7Xx8gxg=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "react-addons-shallow-compare": "15.6.0",
-        "warning": "3.0.0"
-      }
-    },
-    "react-hot-loader": {
-      "version": "3.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-3.0.0-beta.6.tgz",
-      "integrity": "sha1-Rj+sC/yLY6g4UlivIMkWNqvOdfQ=",
-      "dev": true,
-      "requires": {
-        "babel-template": "6.25.0",
-        "global": "4.3.2",
-        "react-deep-force-update": "2.0.1",
-        "react-proxy": "3.0.0-alpha.1",
-        "redbox-react": "1.4.3",
-        "source-map": "0.4.4"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "requires": {
-            "amdefine": "1.0.1"
-          }
-        }
-      }
-    },
-    "react-inspector": {
-      "version": "github:paritytech/react-inspector#73b5214261a5131821eb9088f58d7e5f31210c23",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "is-dom": "1.0.9"
-      }
-    },
-    "react-intl": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.1.5.tgz",
-      "integrity": "sha1-+Xleo0t5DctdDY73Bg3dvoW/h2M=",
-      "requires": {
-        "intl-format-cache": "2.0.5",
-        "intl-messageformat": "1.3.0",
-        "intl-relativeformat": "1.3.0",
-        "invariant": "2.2.2"
-      }
-    },
-    "react-intl-aggregate-webpack-plugin": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/react-intl-aggregate-webpack-plugin/-/react-intl-aggregate-webpack-plugin-0.0.1.tgz",
-      "integrity": "sha1-wplYhg17zfpvRg3sefVa4CIEiMY=",
-      "dev": true,
-      "requires": {
-        "mkdirp": "0.5.1"
-      }
-    },
-    "react-markdown": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-2.4.4.tgz",
-      "integrity": "sha1-JtglQ40pLnym4pL+diAeHb8s/u4=",
-      "requires": {
-        "commonmark": "0.24.0",
-        "commonmark-react-renderer": "4.3.3",
-        "in-publish": "2.0.0"
-      }
-    },
-    "react-portal": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-portal/-/react-portal-3.0.0.tgz",
-      "integrity": "sha1-kwT86DbooyFrIliPjckbRHco8K4="
-    },
-    "react-proxy": {
-      "version": "3.0.0-alpha.1",
-      "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz",
-      "integrity": "sha1-RABCa8+oDKpnJMd1VpUxUgn6Swc=",
-      "dev": true,
-      "requires": {
-        "lodash": "4.17.2"
-      }
-    },
-    "react-qr-reader": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-1.1.3.tgz",
-      "integrity": "sha1-dDmnZvyZPLj17u/HLCnblh1AswI=",
-      "requires": {
-        "jsqr": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b",
-        "prop-types": "15.5.10",
-        "webrtc-adapter": "2.1.0"
-      }
-    },
-    "react-redux": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-4.4.6.tgz",
-      "integrity": "sha1-S50ymFMHoRCWot1hVhmABE/MYgk=",
-      "requires": {
-        "hoist-non-react-statics": "1.2.0",
-        "invariant": "2.2.2",
-        "lodash": "4.17.2",
-        "loose-envify": "1.3.1"
-      }
-    },
-    "react-router": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-3.0.0.tgz",
-      "integrity": "sha1-PzE+Tbr1cEjEjdCow8rCTZNmff8=",
-      "requires": {
-        "history": "3.3.0",
-        "hoist-non-react-statics": "1.2.0",
-        "invariant": "2.2.2",
-        "loose-envify": "1.3.1",
-        "warning": "3.0.0"
-      }
-    },
-    "react-router-redux": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/react-router-redux/-/react-router-redux-4.0.7.tgz",
-      "integrity": "sha1-mx/eTnAQbFD0chThK92IjPuW4qY="
-    },
-    "react-smooth": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-0.1.11.tgz",
-      "integrity": "sha1-84n45Yy7VGq7SSHKDL57B5vFGg0=",
-      "requires": {
-        "lodash": "4.13.1",
-        "raf": "3.3.2",
-        "react-addons-transition-group": "15.6.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.13.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz",
-          "integrity": "sha1-g+SxCRP0hJbU0W/sSlYK8u50S2g="
-        }
-      }
-    },
-    "react-tap-event-plugin": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/react-tap-event-plugin/-/react-tap-event-plugin-2.0.1.tgz",
-      "integrity": "sha1-MWvrO8ZVbinshppyk+icgmqQdNI=",
-      "requires": {
-        "fbjs": "0.8.14"
-      }
-    },
-    "react-tooltip": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.2.2.tgz",
-      "integrity": "sha1-OlmcDqu9nrlZeqLXKyF/17o1h2c=",
-      "requires": {
-        "classnames": "2.2.5"
-      }
-    },
-    "react-transition-group": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-1.2.0.tgz",
-      "integrity": "sha1-tR/JIbDDg1p+98Vxx5/ILHPpIE8=",
-      "requires": {
-        "chain-function": "1.0.0",
-        "dom-helpers": "3.2.1",
-        "loose-envify": "1.3.1",
-        "prop-types": "15.5.10",
-        "warning": "3.0.0"
-      }
-    },
-    "read": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-      "requires": {
-        "mute-stream": "0.0.7"
-      }
-    },
-    "read-all-stream": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
-      "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
-      "requires": {
-        "pinkie-promise": "2.0.1",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "read-cache": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
-      "dev": true,
-      "requires": {
-        "pify": "2.3.0"
-      }
-    },
-    "read-file-stdin": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/read-file-stdin/-/read-file-stdin-0.2.1.tgz",
-      "integrity": "sha1-JezP86FTtoCa+ssj7hU4fbng7mE=",
-      "dev": true,
-      "requires": {
-        "gather-stream": "1.0.0"
-      }
-    },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "requires": {
-        "load-json-file": "1.1.0",
-        "normalize-package-data": "2.4.0",
-        "path-type": "1.1.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-      "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "1.0.7",
-        "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
-        "util-deprecate": "1.0.2"
-      }
-    },
-    "readdirp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "minimatch": "3.0.4",
-        "readable-stream": "2.3.3",
-        "set-immediate-shim": "1.0.1"
-      }
-    },
-    "readline2": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-      "dev": true,
-      "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "mute-stream": "0.0.5"
-      },
-      "dependencies": {
-        "mute-stream": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-          "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-          "dev": true
-        }
-      }
-    },
-    "recast": {
-      "version": "0.11.23",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
-      "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
-      "dev": true,
-      "requires": {
-        "ast-types": "0.9.6",
-        "esprima": "3.1.3",
-        "private": "0.1.7",
-        "source-map": "0.5.6"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true
-        }
-      }
-    },
-    "recharts": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-0.15.2.tgz",
-      "integrity": "sha1-Y28ho0HwCzHJJXOe1K73CttV2A8=",
-      "requires": {
-        "classnames": "2.2.5",
-        "core-js": "2.4.0",
-        "d3-scale": "1.0.0",
-        "d3-shape": "1.0.0",
-        "lodash": "4.13.1",
-        "react-container-dimensions": "1.2.0",
-        "react-smooth": "0.1.11",
-        "recharts-scale": "0.2.1",
-        "reduce-css-calc": "1.3.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.0.tgz",
-          "integrity": "sha1-30CKtG0Br/kcAcPnlxk11CLFT4E="
-        },
-        "lodash": {
-          "version": "4.13.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz",
-          "integrity": "sha1-g+SxCRP0hJbU0W/sSlYK8u50S2g="
-        }
-      }
-    },
-    "recharts-scale": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.2.1.tgz",
-      "integrity": "sha1-N49UPtF8MkXk2a+xCq9imCQNL8s="
-    },
-    "rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
-      "requires": {
-        "resolve": "1.4.0"
-      }
-    },
-    "recompose": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.20.2.tgz",
-      "integrity": "sha1-ET1qx+KcpmTP/+wWtoHd3fFSULw=",
-      "requires": {
-        "change-emitter": "0.1.6",
-        "fbjs": "0.8.14",
-        "hoist-non-react-statics": "1.2.0",
-        "symbol-observable": "0.2.4"
-      }
-    },
-    "redbox-react": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/redbox-react/-/redbox-react-1.4.3.tgz",
-      "integrity": "sha512-P/N+y57/FVUQWbgpfTf/2wjgxEhxQuA6FRLv0ipZKLFv5v8mp6qs5inFyBwJQYAgaMrntZRCvKdz1vGwkCNs7A==",
-      "dev": true,
-      "requires": {
-        "error-stack-parser": "1.3.6",
-        "object-assign": "4.1.1",
-        "prop-types": "15.5.10",
-        "sourcemapped-stacktrace": "1.1.7"
-      }
-    },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "requires": {
-        "indent-string": "2.1.0",
-        "strip-indent": "1.0.1"
-      }
-    },
-    "reduce-css-calc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
-      "requires": {
-        "balanced-match": "0.4.2",
-        "math-expression-evaluator": "1.2.17",
-        "reduce-function-call": "1.0.2"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
-        }
-      }
-    },
-    "reduce-function-call": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
-      "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
-      "requires": {
-        "balanced-match": "0.4.2"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
-        }
-      }
-    },
-    "reduce-reducers": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/reduce-reducers/-/reduce-reducers-0.1.2.tgz",
-      "integrity": "sha1-+htHGLxSkqcd3R5dg5yb6pdw8Us="
-    },
-    "redux": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-3.6.0.tgz",
-      "integrity": "sha1-iHwrPQub2G7KK+cFccJ2VMGeGI0=",
-      "requires": {
-        "lodash": "4.17.2",
-        "lodash-es": "4.17.4",
-        "loose-envify": "1.3.1",
-        "symbol-observable": "1.0.4"
-      },
-      "dependencies": {
-        "symbol-observable": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
-          "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
-        }
-      }
-    },
-    "redux-actions": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/redux-actions/-/redux-actions-1.1.0.tgz",
-      "integrity": "sha1-347HkdniZ1ROWKi6K3L8XDCvujs=",
-      "requires": {
-        "invariant": "2.2.2",
-        "lodash": "4.17.2",
-        "reduce-reducers": "0.1.2"
-      }
-    },
-    "redux-thunk": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.1.0.tgz",
-      "integrity": "sha1-xyS/7nXb41LaLjupvBQwK63Ympg="
-    },
-    "regenerate": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
-      "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA="
-    },
-    "regenerator-runtime": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
-    },
-    "regenerator-transform": {
-      "version": "0.9.11",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz",
-      "integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "babel-types": "6.25.0",
-        "private": "0.1.7"
-      }
-    },
-    "regex-cache": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-      "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
-      "requires": {
-        "is-equal-shallow": "0.1.3",
-        "is-primitive": "2.0.0"
-      }
-    },
-    "regexpu-core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-      "requires": {
-        "regenerate": "1.3.2",
-        "regjsgen": "0.2.0",
-        "regjsparser": "0.1.5"
-      }
-    },
-    "regjsgen": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
-    },
-    "regjsparser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "requires": {
-        "jsesc": "0.5.0"
-      }
-    },
-    "relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true
-    },
-    "remove-trailing-separator": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz",
-      "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE="
-    },
-    "renderkid": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz",
-      "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=",
-      "dev": true,
-      "requires": {
-        "css-select": "1.2.0",
-        "dom-converter": "0.1.4",
-        "htmlparser2": "3.3.0",
-        "strip-ansi": "3.0.1",
-        "utila": "0.3.3"
-      },
-      "dependencies": {
-        "domhandler": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz",
-          "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=",
-          "dev": true,
-          "requires": {
-            "domelementtype": "1.3.0"
-          }
-        },
-        "domutils": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz",
-          "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
-          "dev": true,
-          "requires": {
-            "domelementtype": "1.3.0"
-          }
-        },
-        "htmlparser2": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
-          "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
-          "dev": true,
-          "requires": {
-            "domelementtype": "1.3.0",
-            "domhandler": "2.1.0",
-            "domutils": "1.1.6",
-            "readable-stream": "1.0.34"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "utila": {
-          "version": "0.3.3",
-          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
-          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
-          "dev": true
-        }
-      }
-    },
-    "repeat-element": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo="
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
-    },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "requires": {
-        "is-finite": "1.0.2"
-      }
-    },
-    "replace-ext": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ="
-    },
-    "request": {
-      "version": "2.81.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-      "requires": {
-        "aws-sign2": "0.6.0",
-        "aws4": "1.6.0",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.5",
-        "extend": "3.0.1",
-        "forever-agent": "0.6.1",
-        "form-data": "2.1.4",
-        "har-validator": "4.2.1",
-        "hawk": "3.1.3",
-        "http-signature": "1.1.1",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.16",
-        "oauth-sign": "0.8.2",
-        "performance-now": "0.2.0",
-        "qs": "6.4.0",
-        "safe-buffer": "5.1.1",
-        "stringstream": "0.0.5",
-        "tough-cookie": "2.3.2",
-        "tunnel-agent": "0.6.0",
-        "uuid": "3.0.0"
-      },
-      "dependencies": {
-        "extend": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-        },
-        "performance-now": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-          "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
-        },
-        "qs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
-        }
-      }
-    },
-    "request-capture-har": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.2.2.tgz",
-      "integrity": "sha1-zWks+yzHRP2EozWKrG7lFSjPcg0="
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-    },
-    "require-from-string": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
-      "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg="
-    },
-    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-    },
-    "require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true,
-      "requires": {
-        "caller-path": "0.1.0",
-        "resolve-from": "1.0.1"
-      }
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
-      "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
-      "dev": true,
-      "requires": {
-        "path-parse": "1.0.5"
-      }
-    },
-    "resolve-from": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "requires": {
-        "onetime": "2.0.1",
-        "signal-exit": "3.0.2"
-      },
-      "dependencies": {
-        "onetime": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-          "requires": {
-            "mimic-fn": "1.1.0"
-          }
-        }
-      }
-    },
-    "retry": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q="
-    },
-    "rgb-hex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-1.0.0.tgz",
-      "integrity": "sha1-v6+M2c2RZLWibXHrTxWgllMks8E=",
-      "dev": true
-    },
-    "right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-      "requires": {
-        "align-text": "0.1.4"
-      }
-    },
-    "rimraf": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-      "requires": {
-        "glob": "7.1.2"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        }
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
-      "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
-      "requires": {
-        "hash-base": "2.0.2",
-        "inherits": "2.0.3"
-      }
-    },
-    "rlp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.0.0.tgz",
-      "integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A="
-    },
-    "roadrunner": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz",
-      "integrity": "sha1-EYCjDWThlw2PVd2MsNqP/M7K1x4="
-    },
-    "rucksack-css": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/rucksack-css/-/rucksack-css-0.9.1.tgz",
-      "integrity": "sha1-2n66TGe9BbAMv0yDQwXF/lU3XeE=",
-      "dev": true,
-      "requires": {
-        "autoprefixer": "6.7.7",
-        "laggard": "0.1.0",
-        "minimist": "1.2.0",
-        "postcss": "5.2.17",
-        "postcss-alias": "1.0.0",
-        "postcss-clearfix": "1.0.0",
-        "postcss-color-rgba-fallback": "2.2.0",
-        "postcss-easings": "0.3.0",
-        "postcss-fontpath": "0.3.0",
-        "postcss-hexrgba": "0.2.1",
-        "postcss-input-style": "0.3.0",
-        "postcss-opacity": "4.0.0",
-        "postcss-position": "0.5.0",
-        "postcss-pseudoelements": "3.0.0",
-        "postcss-quantity-queries": "0.4.0",
-        "postcss-reporter": "2.0.0",
-        "postcss-responsive-type": "0.5.1",
-        "postcss-vmin": "2.0.0",
-        "read-file-stdin": "0.2.1",
-        "write-file-stdout": "0.0.2"
-      }
-    },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "requires": {
-        "is-promise": "2.1.0"
-      }
-    },
-    "rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
-    },
-    "rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
-      "requires": {
-        "rx-lite": "4.0.8"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-    },
-    "samsam": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
-      "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
-      "dev": true
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "schema-utils": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-      "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-      "requires": {
-        "ajv": "5.2.2"
-      }
-    },
-    "script-ext-html-webpack-plugin": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.7.1.tgz",
-      "integrity": "sha1-rpwOJtd2fUqnk8duNVA0TsCLbRA=",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.8"
-      }
-    },
-    "scryptsy": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.0.0.tgz",
-      "integrity": "sha1-Jiw28CMc+nZU4jY/o5TNLexm83g="
-    },
-    "sdp": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/sdp/-/sdp-1.5.4.tgz",
-      "integrity": "sha1-jgOPbdsUvXZa4fS1IW4SCUUR4NA="
-    },
-    "secp256k1": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.3.0.tgz",
-      "integrity": "sha512-CbrQoeGG5V0kQ1ohEMGI+J7oKerapLTpivLICBaXR0R4HyQcN3kM9itLsV5fdpV1UR1bD14tOkJ1xughmlDIiQ==",
-      "requires": {
-        "bindings": "1.3.0",
-        "bip66": "1.1.5",
-        "bn.js": "4.11.7",
-        "create-hash": "1.1.3",
-        "drbg.js": "1.0.1",
-        "elliptic": "6.4.0",
-        "nan": "2.6.2",
-        "prebuild-install": "2.2.1",
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "seek-bzip": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
-      "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
-      "requires": {
-        "commander": "2.8.1"
-      }
-    },
-    "semver": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
-    },
-    "semver-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz",
-      "integrity": "sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk=",
-      "dev": true
-    },
-    "semver-truncate": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz",
-      "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=",
-      "dev": true,
-      "requires": {
-        "semver": "5.4.1"
-      }
-    },
-    "send": {
-      "version": "0.14.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.14.2.tgz",
-      "integrity": "sha1-ObBDiz9RC+Xcb2Z6EfcWiTaM3u8=",
-      "dev": true,
-      "requires": {
-        "debug": "2.2.0",
-        "depd": "1.1.1",
-        "destroy": "1.0.4",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "etag": "1.7.0",
-        "fresh": "0.3.0",
-        "http-errors": "1.5.1",
-        "mime": "1.3.4",
-        "ms": "0.7.2",
-        "on-finished": "2.3.0",
-        "range-parser": "1.2.0",
-        "statuses": "1.3.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.1"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "0.7.1",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-              "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-              "dev": true
-            }
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz",
-      "integrity": "sha1-LPmIm9RDWjIMw2iVyapXvWYuasc=",
-      "dev": true,
-      "requires": {
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "parseurl": "1.3.1",
-        "send": "0.14.2"
-      }
-    },
-    "serviceworker-cache-polyfill": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz",
-      "integrity": "sha1-3hnuc77yGrPAdAo3sz22JGS6ves="
-    },
-    "serviceworker-webpack-plugin": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/serviceworker-webpack-plugin/-/serviceworker-webpack-plugin-0.2.0.tgz",
-      "integrity": "sha1-beneyC7RRMdUxvFbND57h2SsWyg=",
-      "dev": true,
-      "requires": {
-        "minimatch": "3.0.4"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "set-immediate-shim": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
-    },
-    "setprototypeof": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz",
-      "integrity": "sha1-gaVSFB7BBLiOic44MQOtXGZWTQg=",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.8",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz",
-      "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=",
-      "requires": {
-        "inherits": "2.0.3"
-      }
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
-    },
-    "shelljs": {
-      "version": "0.7.8",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
-      "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
-      "dev": true,
-      "requires": {
-        "glob": "7.1.2",
-        "interpret": "1.0.3",
-        "rechoir": "0.6.2"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        }
-      }
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-    },
-    "simple-assign": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/simple-assign/-/simple-assign-0.1.0.tgz",
-      "integrity": "sha1-F/0wZqXz13OPUDIbsPFMooHMS6o="
-    },
-    "simple-get": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz",
-      "integrity": "sha1-6XVe2kB+ltpAxeUVjJ6jezO+y+s=",
-      "requires": {
-        "once": "1.4.0",
-        "unzip-response": "1.0.2",
-        "xtend": "4.0.1"
-      }
-    },
-    "sinon": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz",
-      "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=",
-      "dev": true,
-      "requires": {
-        "formatio": "1.1.1",
-        "lolex": "1.3.2",
-        "samsam": "1.1.2",
-        "util": "0.10.3"
-      }
-    },
-    "sinon-as-promised": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/sinon-as-promised/-/sinon-as-promised-4.0.2.tgz",
-      "integrity": "sha1-Eg6c4DPao5ZI3EKQYv5mC+G1tBI=",
-      "dev": true,
-      "requires": {
-        "create-thenable": "1.0.2",
-        "native-promise-only": "0.8.1"
-      }
-    },
-    "sinon-chai": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-2.8.0.tgz",
-      "integrity": "sha1-Qyqbv9Uab8AHmPTSUmqCnAYGh6w=",
-      "dev": true
-    },
-    "sjcl": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/sjcl/-/sjcl-1.0.6.tgz",
-      "integrity": "sha1-ZBVGKmPMDUIVxJuuydP6DBtTUg8="
-    },
-    "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
-    },
-    "slice-ansi": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-      "dev": true
-    },
-    "slide": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc="
-    },
-    "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-      "requires": {
-        "hoek": "2.16.3"
-      }
-    },
-    "solc": {
-      "version": "github:ngotchac/solc-js#04eb38cc3003fba8cb3656653a7941ed36408818",
-      "requires": {
-        "memorystream": "0.3.1",
-        "require-from-string": "1.2.1",
-        "yargs": "4.8.1"
-      },
-      "dependencies": {
-        "yargs": {
-          "version": "4.8.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",
-          "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=",
-          "requires": {
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "lodash.assign": "4.2.0",
-            "os-locale": "1.4.0",
-            "read-pkg-up": "1.0.1",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "1.0.2",
-            "which-module": "1.0.0",
-            "window-size": "0.2.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "2.4.1"
-          }
-        }
-      }
-    },
-    "sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-      "requires": {
-        "is-plain-obj": "1.1.0"
-      }
-    },
-    "sortobject": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/sortobject/-/sortobject-1.1.1.tgz",
-      "integrity": "sha1-T2ldTUTtCkwGSCw0wlgqLc3CqzQ=",
-      "requires": {
-        "editions": "1.3.3"
-      }
-    },
-    "source-list-map": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-      "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
-    },
-    "source-map-support": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
-      "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=",
-      "requires": {
-        "source-map": "0.5.6"
-      }
-    },
-    "sourcemapped-stacktrace": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.7.tgz",
-      "integrity": "sha512-pgHNUACbafkQ+M5zR00NSOtSKBc/i40prgN+SY07J/pghClwVNWNTTMa0JuXj4lriR2TvMKcPAHw5KN9tVFRhA==",
-      "dev": true,
-      "requires": {
-        "source-map": "0.5.6"
-      }
-    },
-    "sparkles": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
-      "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM="
-    },
-    "spdx-correct": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-      "requires": {
-        "spdx-license-ids": "1.2.2"
-      }
-    },
-    "spdx-expression-parse": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw="
-    },
-    "spdx-license-ids": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc="
-    },
-    "specificity": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.1.tgz",
-      "integrity": "sha1-8bBoQkzjF64HR42V3jwhz4Xo1Wc=",
-      "dev": true
-    },
-    "split2": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz",
-      "integrity": "sha1-At2smtwD7Au3jBKC7Aecpuha6QA=",
-      "dev": true,
-      "requires": {
-        "through2": "0.6.5"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "squeak": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/squeak/-/squeak-1.3.0.tgz",
-      "integrity": "sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "console-stream": "0.1.1",
-        "lpad-align": "1.1.2"
-      }
-    },
-    "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-      "requires": {
-        "asn1": "0.2.3",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.1",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.1",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "tweetnacl": "0.14.5"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
-    },
-    "stackframe": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
-      "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=",
-      "dev": true
-    },
-    "stat-mode": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
-      "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI="
-    },
-    "statuses": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-      "dev": true
-    },
-    "store": {
-      "version": "1.3.20",
-      "resolved": "https://registry.npmjs.org/store/-/store-1.3.20.tgz",
-      "integrity": "sha1-E+p+P7LWwjmGgmXWhrHYTpnFvj4="
-    },
-    "stream-browserify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "stream-combiner": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
-      "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
-      "dev": true,
-      "requires": {
-        "duplexer": "0.1.1",
-        "through": "2.3.8"
-      }
-    },
-    "stream-combiner2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
-      "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
-      "requires": {
-        "duplexer2": "0.1.4",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "stream-http": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
-      "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==",
-      "dev": true,
-      "requires": {
-        "builtin-status-codes": "3.0.0",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "to-arraybuffer": "1.0.1",
-        "xtend": "4.0.1"
-      }
-    },
-    "stream-shift": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
-    },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
-    },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
-      }
-    },
-    "string.prototype.repeat": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz",
-      "integrity": "sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8="
-    },
-    "stringify-object": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.2.0.tgz",
-      "integrity": "sha1-lDcKE15BvASDWIE7+ZSB8TFcaqY=",
-      "requires": {
-        "get-own-enumerable-property-symbols": "1.0.1",
-        "is-obj": "1.0.1",
-        "is-regexp": "1.0.0"
-      }
-    },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "requires": {
-        "ansi-regex": "2.1.1"
-      }
-    },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "requires": {
-        "is-utf8": "0.2.1"
-      }
-    },
-    "strip-bom-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
-      "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
-      "requires": {
-        "first-chunk-stream": "1.0.0",
-        "strip-bom": "2.0.0"
-      }
-    },
-    "strip-dirs": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
-      "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
-      "requires": {
-        "chalk": "1.1.3",
-        "get-stdin": "4.0.1",
-        "is-absolute": "0.1.7",
-        "is-natural-number": "2.1.1",
-        "minimist": "1.2.0",
-        "sum-up": "1.0.3"
-      },
-      "dependencies": {
-        "get-stdin": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-          "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
-        }
-      }
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true
-    },
-    "strip-hex-prefix": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz",
-      "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=",
-      "requires": {
-        "is-hex-prefixed": "1.0.0"
-      }
-    },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "requires": {
-        "get-stdin": "4.0.1"
-      },
-      "dependencies": {
-        "get-stdin": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-          "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
-        }
-      }
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
-    },
-    "strip-outer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.0.tgz",
-      "integrity": "sha1-qsC6YNLpDF1PJ1/Yhp/ZotMQ/7g=",
-      "requires": {
-        "escape-string-regexp": "1.0.5"
-      }
-    },
-    "style-loader": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.1.tgz",
-      "integrity": "sha1-RoKA77wEcwI806bNVuM7Wh1/w6k=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "0.2.17"
-      }
-    },
-    "style-search": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
-      "dev": true
-    },
-    "stylehacks": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-2.3.2.tgz",
-      "integrity": "sha1-ZMg+BDimjJ7fRJ6MVSp9mrYAmws=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "chalk": "1.1.3",
-        "log-symbols": "1.0.2",
-        "minimist": "1.2.0",
-        "plur": "2.1.2",
-        "postcss": "5.2.17",
-        "postcss-reporter": "1.4.1",
-        "postcss-selector-parser": "2.2.3",
-        "read-file-stdin": "0.2.1",
-        "text-table": "0.2.0",
-        "write-file-stdout": "0.0.2"
-      },
-      "dependencies": {
-        "postcss-reporter": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz",
-          "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "lodash": "4.17.2",
-            "log-symbols": "1.0.2",
-            "postcss": "5.2.17"
-          }
-        }
-      }
-    },
-    "stylelint": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-7.9.0.tgz",
-      "integrity": "sha1-uNnqIPiHqzUQdcat7ZUo3iRQkyc=",
-      "dev": true,
-      "requires": {
-        "autoprefixer": "6.7.7",
-        "balanced-match": "0.4.2",
-        "chalk": "1.1.3",
-        "colorguard": "1.2.0",
-        "cosmiconfig": "2.2.2",
-        "doiuse": "2.6.0",
-        "execall": "1.0.0",
-        "get-stdin": "5.0.1",
-        "globby": "6.1.0",
-        "globjoin": "0.1.4",
-        "html-tags": "1.2.0",
-        "ignore": "3.3.3",
-        "known-css-properties": "0.0.6",
-        "lodash": "4.17.4",
-        "log-symbols": "1.0.2",
-        "meow": "3.7.0",
-        "micromatch": "2.3.11",
-        "normalize-selector": "0.2.0",
-        "postcss": "5.2.17",
-        "postcss-less": "0.14.0",
-        "postcss-media-query-parser": "0.2.3",
-        "postcss-reporter": "3.0.0",
-        "postcss-resolve-nested-selector": "0.1.1",
-        "postcss-scss": "0.4.1",
-        "postcss-selector-parser": "2.2.3",
-        "postcss-value-parser": "3.3.0",
-        "resolve-from": "2.0.0",
-        "specificity": "0.3.1",
-        "string-width": "2.1.1",
-        "style-search": "0.1.0",
-        "stylehacks": "2.3.2",
-        "sugarss": "0.2.0",
-        "svg-tags": "1.0.0",
-        "table": "4.0.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-          "dev": true
-        },
-        "co": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-          "dev": true
-        },
-        "get-stdin": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
-          "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
-          "dev": true
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "dev": true,
-          "requires": {
-            "array-union": "1.0.2",
-            "glob": "7.1.2",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "lodash": {
-          "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-          "dev": true
-        },
-        "postcss-reporter": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-3.0.0.tgz",
-          "integrity": "sha1-CeoPN6RExWk4eGBuCbAY6+/3z48=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "lodash": "4.17.4",
-            "log-symbols": "1.0.2",
-            "postcss": "5.2.17"
-          }
-        },
-        "resolve-from": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
-          "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        },
-        "table": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/table/-/table-4.0.1.tgz",
-          "integrity": "sha1-qBFsEz+sLGH0pCCrbN9cTWHw5DU=",
-          "dev": true,
-          "requires": {
-            "ajv": "4.11.8",
-            "ajv-keywords": "1.5.1",
-            "chalk": "1.1.3",
-            "lodash": "4.17.4",
-            "slice-ansi": "0.0.4",
-            "string-width": "2.1.1"
-          }
-        }
-      }
-    },
-    "stylelint-config-standard": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-16.0.0.tgz",
-      "integrity": "sha1-u3OHv/HX3XGGpSs+v4hbJAXWkb8=",
-      "dev": true
-    },
-    "sugarss": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-0.2.0.tgz",
-      "integrity": "sha1-rDQjdWMyfG/4l7ZHQr9q7BkK054=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.17"
-      }
-    },
-    "sum-up": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
-      "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
-      "requires": {
-        "chalk": "1.1.3"
-      }
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-    },
-    "svg-tags": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
-      "dev": true
-    },
-    "svgo": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
-      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
-      "dev": true,
-      "requires": {
-        "coa": "1.0.4",
-        "colors": "1.1.2",
-        "csso": "2.3.2",
-        "js-yaml": "3.7.0",
-        "mkdirp": "0.5.1",
-        "sax": "1.2.4",
-        "whet.extend": "0.9.9"
-      },
-      "dependencies": {
-        "js-yaml": {
-          "version": "3.7.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
-          "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
-          "dev": true,
-          "requires": {
-            "argparse": "1.0.9",
-            "esprima": "2.7.3"
-          }
-        }
-      }
-    },
-    "sw-toolbox": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/sw-toolbox/-/sw-toolbox-3.6.0.tgz",
-      "integrity": "sha1-Jt8dHHA0hljk3qKIQxkUm3sxg7U=",
-      "requires": {
-        "path-to-regexp": "1.7.0",
-        "serviceworker-cache-polyfill": "4.0.0"
-      }
-    },
-    "symbol-observable": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-0.2.4.tgz",
-      "integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A="
-    },
-    "symbol-tree": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
-      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=",
-      "dev": true
-    },
-    "synesthesia": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/synesthesia/-/synesthesia-1.0.1.tgz",
-      "integrity": "sha1-XvlepUjA1cbm+btLDQcx3/hkp3c=",
-      "dev": true,
-      "requires": {
-        "css-color-names": "0.0.3"
-      },
-      "dependencies": {
-        "css-color-names": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.3.tgz",
-          "integrity": "sha1-3gzvFvTYqoIioyDVttfpu62nufY=",
-          "dev": true
-        }
-      }
-    },
-    "table": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
-      "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
-      "dev": true,
-      "requires": {
-        "ajv": "4.11.8",
-        "ajv-keywords": "1.5.1",
-        "chalk": "1.1.3",
-        "lodash": "4.17.2",
-        "slice-ansi": "0.0.4",
-        "string-width": "2.1.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "co": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        }
-      }
-    },
-    "tapable": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.7.tgz",
-      "integrity": "sha1-5GwNqsuyuKmLmwzqD0BSEFgX7Vw=",
-      "dev": true
-    },
-    "tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-      "requires": {
-        "block-stream": "0.0.9",
-        "fstream": "1.0.11",
-        "inherits": "2.0.3"
-      }
-    },
-    "tar-fs": {
-      "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz",
-      "integrity": "sha1-7M+TXpQUk9gVECjmNuUc5MPKfyA=",
-      "requires": {
-        "chownr": "1.0.1",
-        "mkdirp": "0.5.1",
-        "pump": "1.0.2",
-        "tar-stream": "1.5.4"
-      }
-    },
-    "tar-pack": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-      "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-      "requires": {
-        "debug": "2.6.8",
-        "fstream": "1.0.11",
-        "fstream-ignore": "1.0.5",
-        "once": "1.4.0",
-        "readable-stream": "2.3.3",
-        "rimraf": "2.6.1",
-        "tar": "2.2.1",
-        "uid-number": "0.0.6"
-      }
-    },
-    "tar-stream": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz",
-      "integrity": "sha1-NlSc8E7RrumyowwBQyUiONr5QBY=",
-      "requires": {
-        "bl": "1.2.1",
-        "end-of-stream": "1.4.0",
-        "readable-stream": "2.3.3",
-        "xtend": "4.0.1"
-      }
-    },
-    "temp-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
-      "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=",
-      "dev": true
-    },
-    "tempfile": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz",
-      "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=",
-      "dev": true,
-      "requires": {
-        "temp-dir": "1.0.0",
-        "uuid": "3.1.0"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-          "dev": true
-        }
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-      "requires": {
-        "readable-stream": "1.0.34",
-        "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        }
-      }
-    },
-    "through2-filter": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
-      "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
-      "requires": {
-        "through2": "2.0.3",
-        "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "through2": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-          "requires": {
-            "readable-stream": "2.3.3",
-            "xtend": "4.0.1"
-          }
-        }
-      }
-    },
-    "time-stamp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM="
-    },
-    "timed-out": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
-      "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc="
-    },
-    "timers-browserify": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.3.tgz",
-      "integrity": "sha512-+JAqyNgg+M8+gXIrq2EeUr4kZqRz47Ysco7X5QKRGScRE9HIHckyHD1asozSFGeqx2nmPCgA8T5tIGVO0ML7/w==",
-      "dev": true,
-      "requires": {
-        "global": "4.3.2",
-        "setimmediate": "1.0.5"
-      }
-    },
-    "tmp": {
-      "version": "0.0.31",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
-      "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
-      "requires": {
-        "os-tmpdir": "1.0.2"
-      }
-    },
-    "to-absolute-glob": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
-      "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
-      "requires": {
-        "extend-shallow": "2.0.1"
-      }
-    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
-    },
-    "to-source": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/to-source/-/to-source-2.0.3.tgz",
-      "integrity": "sha1-U4f4JZzzV2Kz4+m1wtzY49uaLRU=",
-      "dev": true
-    },
-    "toggle-selection": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
-      "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI="
-    },
-    "toposort": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.3.tgz",
-      "integrity": "sha1-8CzYp0vYvi/A6YYRw7rLlaFxhpw=",
-      "dev": true
-    },
-    "tough-cookie": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-      "requires": {
-        "punycode": "1.4.1"
-      }
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
-      "dev": true
-    },
-    "traverse": {
-      "version": "0.6.6",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
-      "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc="
-    },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
-    },
-    "trim-repeated": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
-      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
-      "requires": {
-        "escape-string-regexp": "1.0.5"
-      }
-    },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
-    },
-    "tryit": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
-      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
-      "dev": true
-    },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "optional": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "1.1.2"
-      }
-    },
-    "type-detect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz",
-      "integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI=",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.15",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
-      "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "2.1.16"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
-    },
-    "typedarray-to-buffer": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.2.tgz",
-      "integrity": "sha1-EBezLZhP9VbroQD1AViauhrOLgQ=",
-      "dev": true,
-      "requires": {
-        "is-typedarray": "1.0.0"
-      }
-    },
-    "u2f-api": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/u2f-api/-/u2f-api-0.0.9.tgz",
-      "integrity": "sha1-ve1Fe6Wpqe6bWLPeKR+MH4/qy3o="
-    },
-    "u2f-api-polyfill": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/u2f-api-polyfill/-/u2f-api-polyfill-0.4.3.tgz",
-      "integrity": "sha1-t60WWm+WJVhReoZ8XEv5OZ/Pfpg="
-    },
-    "ua-parser-js": {
-      "version": "0.7.14",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz",
-      "integrity": "sha1-EQ1T+kw/MmwSEpK76skE0uAzh8o="
-    },
-    "uglify-js": {
-      "version": "2.8.16",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.16.tgz",
-      "integrity": "sha1-0oYZC27vxv1l6w7KxlUeCw6IOaQ=",
-      "requires": {
-        "source-map": "0.5.6",
-        "uglify-to-browserify": "1.0.2",
-        "yargs": "3.10.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
-        },
-        "cliui": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-          "requires": {
-            "center-align": "0.1.3",
-            "right-align": "0.1.3",
-            "wordwrap": "0.0.2"
-          }
-        },
-        "window-size": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-          "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0="
-        },
-        "yargs": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-          "requires": {
-            "camelcase": "1.2.1",
-            "cliui": "2.1.0",
-            "decamelize": "1.2.0",
-            "window-size": "0.1.0"
-          }
-        }
-      }
-    },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "optional": true
-    },
-    "uid-number": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-      "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
-    },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-    },
-    "uniqid": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz",
-      "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=",
-      "dev": true,
-      "requires": {
-        "macaddress": "0.2.8"
-      }
-    },
-    "uniqs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
-      "dev": true
-    },
-    "unique-concat": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/unique-concat/-/unique-concat-0.2.2.tgz",
-      "integrity": "sha1-khD5vcqsxeHjkpSQ18AZ35bxhxI=",
-      "dev": true
-    },
-    "unique-stream": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
-      "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
-      "requires": {
-        "json-stable-stringify": "1.0.1",
-        "through2-filter": "2.0.0"
-      }
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "unzip-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
-      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4="
-    },
-    "upper-case": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
-    "url-loader": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.7.tgz",
-      "integrity": "sha1-Z+h3l1n4AA2nSZSQZoDJQ6mwkl0=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "0.2.17",
-        "mime": "1.2.11"
-      },
-      "dependencies": {
-        "mime": {
-          "version": "1.2.11",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-          "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=",
-          "dev": true
-        }
-      }
-    },
-    "url-parse-lax": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-      "requires": {
-        "prepend-http": "1.0.4"
-      }
-    },
-    "url-regex": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz",
-      "integrity": "sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=",
-      "dev": true,
-      "requires": {
-        "ip-regex": "1.0.3"
-      }
-    },
-    "user-home": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
-      "dev": true
-    },
-    "useragent.js": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/useragent.js/-/useragent.js-0.5.6.tgz",
-      "integrity": "sha1-p2rvEB4kg3AlI/9vtYpACvd+Iqk="
-    },
-    "utf8": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz",
-      "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY="
-    },
-    "util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.1"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-      "dev": true
-    },
-    "utils-merge": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
-      "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz",
-      "integrity": "sha1-Zyj8BFnEUNeWqZwxg3VpvfZy1yg="
-    },
-    "v8flags": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
-      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
-      "dev": true,
-      "requires": {
-        "user-home": "1.1.1"
-      }
-    },
-    "vali-date": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
-      "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY="
-    },
-    "valid-url": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
-      "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-      "requires": {
-        "spdx-correct": "1.0.2",
-        "spdx-expression-parse": "1.0.4"
-      }
-    },
-    "validator": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-6.2.0.tgz",
-      "integrity": "sha1-sszNxJ/w9LjuTmHbot3T3eE/I+c="
-    },
-    "vary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz",
-      "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc=",
-      "dev": true
-    },
-    "vendors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz",
-      "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
-      "requires": {
-        "extsprintf": "1.0.2"
-      }
-    },
-    "vinyl": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-      "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-      "requires": {
-        "clone": "1.0.2",
-        "clone-stats": "0.0.1",
-        "replace-ext": "0.0.1"
-      }
-    },
-    "vinyl-assign": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
-      "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=",
-      "requires": {
-        "object-assign": "4.1.1",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "vinyl-fs": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
-      "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
-      "requires": {
-        "duplexify": "3.5.0",
-        "glob-stream": "5.3.5",
-        "graceful-fs": "4.1.11",
-        "gulp-sourcemaps": "1.6.0",
-        "is-valid-glob": "0.3.0",
-        "lazystream": "1.0.0",
-        "lodash.isequal": "4.5.0",
-        "merge-stream": "1.0.1",
-        "mkdirp": "0.5.1",
-        "object-assign": "4.1.1",
-        "readable-stream": "2.3.3",
-        "strip-bom": "2.0.0",
-        "strip-bom-stream": "1.0.0",
-        "through2": "2.0.3",
-        "through2-filter": "2.0.0",
-        "vali-date": "1.0.0",
-        "vinyl": "1.2.0"
-      },
-      "dependencies": {
-        "through2": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-          "requires": {
-            "readable-stream": "2.3.3",
-            "xtend": "4.0.1"
-          }
-        }
-      }
-    },
-    "vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true,
-      "requires": {
-        "indexof": "0.0.1"
-      }
-    },
-    "w3c-blob": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/w3c-blob/-/w3c-blob-0.0.1.tgz",
-      "integrity": "sha1-sM01KhpQ9RVWNCD/1YYflQ8dhbg="
-    },
-    "ware": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
-      "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=",
-      "requires": {
-        "wrap-fn": "0.1.5"
-      }
-    },
-    "warning": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
-      "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
-      "requires": {
-        "loose-envify": "1.3.1"
-      }
-    },
-    "watchpack": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz",
-      "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=",
-      "dev": true,
-      "requires": {
-        "async": "2.5.0",
-        "chokidar": "1.7.0",
-        "graceful-fs": "4.1.11"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
-          "dev": true,
-          "requires": {
-            "lodash": "4.17.2"
-          }
-        }
-      }
-    },
-    "web3": {
-      "version": "0.17.0-beta",
-      "resolved": "https://registry.npmjs.org/web3/-/web3-0.17.0-beta.tgz",
-      "integrity": "sha1-V684JFv/ejIJn3zleA+tW7wA2ls=",
-      "requires": {
-        "bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2",
-        "crypto-js": "3.1.8",
-        "utf8": "2.1.2",
-        "xmlhttprequest": "1.8.0"
-      },
-      "dependencies": {
-        "bignumber.js": {
-          "version": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
-        }
-      }
-    },
-    "webidl-conversions": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.1.tgz",
-      "integrity": "sha1-gBWherg+fhsxFjhIas6B2mziBqA=",
-      "dev": true
-    },
-    "webpack": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz",
-      "integrity": "sha1-e7HXKuIIfdGkr1Jq/sFe7RfdpHU=",
-      "dev": true,
-      "requires": {
-        "acorn": "4.0.13",
-        "acorn-dynamic-import": "2.0.2",
-        "ajv": "4.11.8",
-        "ajv-keywords": "1.5.1",
-        "async": "2.5.0",
-        "enhanced-resolve": "3.4.1",
-        "interpret": "1.0.3",
-        "json-loader": "0.5.4",
-        "loader-runner": "2.3.0",
-        "loader-utils": "0.2.17",
-        "memory-fs": "0.4.1",
-        "mkdirp": "0.5.1",
-        "node-libs-browser": "2.0.0",
-        "source-map": "0.5.6",
-        "supports-color": "3.2.3",
-        "tapable": "0.2.7",
-        "uglify-js": "2.8.16",
-        "watchpack": "1.4.0",
-        "webpack-sources": "0.1.5",
-        "yargs": "6.6.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-          "dev": true
-        },
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "async": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
-          "dev": true,
-          "requires": {
-            "lodash": "4.17.2"
-          }
-        },
-        "co": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "webpack-bundle-size-analyzer": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-size-analyzer/-/webpack-bundle-size-analyzer-2.5.0.tgz",
-      "integrity": "sha1-k56kZeRVk1Op/OQK9RGCDyFqnIA=",
-      "dev": true,
-      "requires": {
-        "commander": "2.8.1",
-        "filesize": "3.5.10",
-        "humanize": "0.0.9"
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz",
-      "integrity": "sha1-xrTPQoE5zxrvvgagwA/bT42i+JM=",
-      "dev": true,
-      "requires": {
-        "memory-fs": "0.4.1",
-        "mime": "1.3.4",
-        "path-is-absolute": "1.0.1",
-        "range-parser": "1.2.0"
-      }
-    },
-    "webpack-error-notification": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/webpack-error-notification/-/webpack-error-notification-0.1.6.tgz",
-      "integrity": "sha1-6/y9TvRrg0ZrWcEv3oeQFo9Holc=",
-      "dev": true
-    },
-    "webpack-hot-middleware": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.17.1.tgz",
-      "integrity": "sha1-DI+/b5P/KcCV1oSwerbWwPL5Udc=",
-      "dev": true,
-      "requires": {
-        "ansi-html": "0.0.7",
-        "html-entities": "1.2.1",
-        "querystring": "0.2.0",
-        "strip-ansi": "3.0.1"
-      }
-    },
-    "webpack-sources": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz",
-      "integrity": "sha1-qh86vw8NdNtxEcQOUAuE+WZkB1A=",
-      "dev": true,
-      "requires": {
-        "source-list-map": "0.1.8",
-        "source-map": "0.5.6"
-      }
-    },
-    "webrtc-adapter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-2.1.0.tgz",
-      "integrity": "sha1-YStbxs6Oc8nQZgA4oh+SVahnvz4=",
-      "requires": {
-        "sdp": "1.5.4"
-      }
-    },
-    "websocket": {
-      "version": "1.0.24",
-      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.24.tgz",
-      "integrity": "sha1-dJA+dfJUW2suHeFCW8HJBZF6GJA=",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.8",
-        "nan": "2.6.2",
-        "typedarray-to-buffer": "3.1.2",
-        "yaeti": "0.0.6"
-      }
-    },
-    "whatwg-encoding": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz",
-      "integrity": "sha1-PGxFGhmO567FWx7GHQkgxngBpfQ=",
-      "dev": true,
-      "requires": {
-        "iconv-lite": "0.4.13"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.13",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz",
-          "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=",
-          "dev": true
-        }
-      }
-    },
-    "whatwg-fetch": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.1.tgz",
-      "integrity": "sha1-B4uUYbvpHOpzy86LsSKgX56St3I="
-    },
-    "whatwg-url": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-4.8.0.tgz",
-      "integrity": "sha1-0pgaqRSMHgCkHFphMRZqtGg7vMA=",
-      "dev": true,
-      "requires": {
-        "tr46": "0.0.3",
-        "webidl-conversions": "3.0.1"
-      },
-      "dependencies": {
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
-          "dev": true
-        }
-      }
-    },
-    "whet.extend": {
-      "version": "0.9.9",
-      "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
-      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=",
-      "dev": true
-    },
-    "which": {
-      "version": "1.2.14",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
-      "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
-      "requires": {
-        "isexe": "2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
-    },
-    "wide-align": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
-      "requires": {
-        "string-width": "1.0.2"
-      }
-    },
-    "window-size": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz",
-      "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
-    },
-    "wordwrap": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
-    },
-    "worker-loader": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-0.8.1.tgz",
-      "integrity": "sha1-6OmVMx6jTfW/aCloJL+38K1XjUM=",
-      "requires": {
-        "loader-utils": "1.1.0",
-        "schema-utils": "0.3.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
-          "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
-          "requires": {
-            "big.js": "3.1.3",
-            "emojis-list": "2.1.0",
-            "json5": "0.5.1"
-          }
-        }
-      }
-    },
-    "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1"
-      }
-    },
-    "wrap-fn": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
-      "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
-      "requires": {
-        "co": "3.1.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-      "dev": true,
-      "requires": {
-        "mkdirp": "0.5.1"
-      }
-    },
-    "write-file-atomic": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
-      "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "imurmurhash": "0.1.4",
-        "slide": "1.1.6"
-      }
-    },
-    "write-file-stdout": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-stdout/-/write-file-stdout-0.0.2.tgz",
-      "integrity": "sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=",
-      "dev": true
-    },
-    "write-json-file": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-1.2.0.tgz",
-      "integrity": "sha1-LV3+lqvDyIkFfJOXGqQAXvtUgTQ=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "mkdirp": "0.5.1",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "sort-keys": "1.1.2",
-        "write-file-atomic": "1.3.4"
-      }
-    },
-    "xml-char-classes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz",
-      "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=",
-      "dev": true
-    },
-    "xml-name-validator": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz",
-      "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=",
-      "dev": true
-    },
-    "xmlhttprequest": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
-      "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw="
-    },
-    "xss-filters": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/xss-filters/-/xss-filters-1.2.7.tgz",
-      "integrity": "sha1-Wfod4gHzby80cNysX1jMwoMLCpo="
-    },
-    "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
-    },
-    "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
-    },
-    "yaeti": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
-      "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=",
-      "dev": true
-    },
-    "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
-    },
-    "yargs": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
-      "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
-      "dev": true,
-      "requires": {
-        "camelcase": "3.0.0",
-        "cliui": "3.2.0",
-        "decamelize": "1.2.0",
-        "get-caller-file": "1.0.2",
-        "os-locale": "1.4.0",
-        "read-pkg-up": "1.0.1",
-        "require-directory": "2.1.1",
-        "require-main-filename": "1.0.1",
-        "set-blocking": "2.0.0",
-        "string-width": "1.0.2",
-        "which-module": "1.0.0",
-        "y18n": "3.2.1",
-        "yargs-parser": "4.2.1"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "yargs-parser": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
-          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
-          "dev": true,
-          "requires": {
-            "camelcase": "3.0.0"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz",
-      "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=",
-      "requires": {
-        "camelcase": "3.0.0",
-        "lodash.assign": "4.2.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-        }
-      }
-    },
-    "yarn": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz",
-      "integrity": "sha1-jdo6Y8eYs4PPpXdFLCs8s+Sqh+A=",
-      "requires": {
-        "babel-runtime": "6.23.0",
-        "bytes": "2.4.0",
-        "camelcase": "3.0.0",
-        "chalk": "1.1.3",
-        "cmd-shim": "2.0.2",
-        "commander": "2.11.0",
-        "death": "1.1.0",
-        "debug": "2.6.8",
-        "defaults": "1.0.3",
-        "detect-indent": "5.0.0",
-        "ini": "1.3.4",
-        "inquirer": "3.2.1",
-        "invariant": "2.2.2",
-        "is-builtin-module": "1.0.0",
-        "is-ci": "1.0.10",
-        "leven": "2.1.0",
-        "loud-rejection": "1.6.0",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "node-emoji": "1.8.1",
-        "node-gyp": "3.6.2",
-        "object-path": "0.11.4",
-        "proper-lockfile": "2.0.1",
-        "read": "1.0.7",
-        "request": "2.81.0",
-        "request-capture-har": "1.2.2",
-        "rimraf": "2.6.1",
-        "roadrunner": "1.1.0",
-        "semver": "5.4.1",
-        "strip-bom": "3.0.0",
-        "tar": "2.2.1",
-        "tar-stream": "1.5.4",
-        "validate-npm-package-license": "3.0.1"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-        },
-        "commander": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
-        },
-        "detect-indent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
-          "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50="
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        }
-      }
-    },
-    "yauzl": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz",
-      "integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=",
-      "requires": {
-        "buffer-crc32": "0.2.13",
-        "fd-slicer": "1.0.1"
-      }
-    },
-    "zxcvbn": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.1.tgz",
-      "integrity": "sha1-I4Gq3X8HiiWoayFTJ1YmR7gKqKw="
-    }
-  }
-}
diff --git a/js/package.json b/js/package.json
deleted file mode 100644
index 1bb76b21c90ce185462eddf8b3d0e43e69e8da2e..0000000000000000000000000000000000000000
--- a/js/package.json
+++ /dev/null
@@ -1,240 +0,0 @@
-{
-  "name": "parity.js",
-  "version": "1.8.17",
-  "main": "release/index.js",
-  "jsnext:main": "src/index.js",
-  "author": "Parity Team <admin@parity.io>",
-  "maintainers": [
-    "Jaco Greeff",
-    "Nicolas Gotchac"
-  ],
-  "contributors": [
-    "Jannis Redmann"
-  ],
-  "license": "GPL-3.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/paritytech/parity.git"
-  },
-  "keywords": [
-    "Ethereum",
-    "ABI",
-    "API",
-    "Web3",
-    "RPC",
-    "Parity",
-    "Promise"
-  ],
-  "scripts": {
-    "install": "napa",
-    "analize": "npm run analize:lib && npm run analize:dll && npm run analize:app",
-    "analize:app": "WPANALIZE=1 webpack --config webpack/app --json > .build/analize.app.json && cat .build/analize.app.json | webpack-bundle-size-analyzer",
-    "analize:lib": "WPANALIZE=1 webpack --config webpack/libraries --json > .build/analize.lib.json && cat .build/analize.lib.json | webpack-bundle-size-analyzer",
-    "analize:dll": "WPANALIZE=1 webpack --config webpack/vendor --json > .build/analize.dll.json && cat .build/analize.dll.json | webpack-bundle-size-analyzer",
-    "build": "npm run build:lib && npm run build:dll && npm run build:app && npm run build:embed",
-    "build:app": "webpack --config webpack/app",
-    "build:lib": "webpack --config webpack/libraries",
-    "build:dll": "webpack --config webpack/vendor",
-    "build:markdown": "babel-node ./scripts/build-rpc-markdown.js",
-    "build:json": "babel-node ./scripts/build-rpc-json.js",
-    "build:embed": "EMBED=1 node webpack/embed",
-    "build:i18n": "npm run clean && npm run build && babel-node ./scripts/build-i18n.js",
-    "ci:build": "npm run ci:build:lib && npm run ci:build:dll && npm run ci:build:app && npm run ci:build:embed",
-    "ci:build:app": "NODE_ENV=production webpack --config webpack/app",
-    "ci:build:lib": "NODE_ENV=production webpack --config webpack/libraries",
-    "ci:build:dll": "NODE_ENV=production webpack --config webpack/vendor",
-    "ci:build:npm": "NODE_ENV=production webpack --config webpack/npm",
-    "ci:build:jsonrpc": "babel-node ./scripts/build-rpc-json.js --output .npmjs/jsonrpc",
-    "ci:build:embed": "NODE_ENV=production EMBED=1 node webpack/embed",
-    "start": "npm run clean && npm install && npm run build:lib && npm run build:dll && npm run start:app",
-    "start:app": "node webpack/dev.server",
-    "clean": "rm -rf ./.build ./.coverage ./.happypack ./.npmjs ./build ./node_modules/.cache ./node_modules/@parity",
-    "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info",
-    "lint": "npm run lint:css && npm run lint:js",
-    "lint:cached": "npm run lint:css && npm run lint:js:cached",
-    "lint:css": "stylelint ./src/**/*.css",
-    "lint:fix": "npm run lint:js:fix",
-    "lint:i18n": "babel-node ./scripts/lint-i18n.js",
-    "lint:js": "eslint --ignore-path .gitignore ./src/",
-    "lint:js:cached": "eslint --cache --ignore-path .gitignore ./src/",
-    "lint:js:fix": "eslint --fix --ignore-path .gitignore ./src/",
-    "test": "NODE_ENV=test mocha --compilers ejs:ejsify 'src/**/*.spec.js'",
-    "test:coverage": "NODE_ENV=test istanbul cover _mocha -- --compilers ejs:ejsify 'src/**/*.spec.js'",
-    "test:e2e": "NODE_ENV=test mocha 'src/**/*.e2e.js'",
-    "test:npm": "(cd .npmjs && npm i) && node test/npmParity && node test/npmJsonRpc && (rm -rf .npmjs/node_modules)",
-    "prepush": "npm run lint:cached"
-  },
-  "napa": {
-    "qrcode-generator": "kazuhikoarase/qrcode-generator"
-  },
-  "devDependencies": {
-    "babel-cli": "6.23.0",
-    "babel-core": "6.23.1",
-    "babel-eslint": "7.1.1",
-    "babel-loader": "6.3.2",
-    "babel-plugin-lodash": "3.2.11",
-    "babel-plugin-react-intl": "2.3.1",
-    "babel-plugin-recharts": "1.1.0",
-    "babel-plugin-transform-class-properties": "6.23.0",
-    "babel-plugin-transform-decorators-legacy": "1.3.4",
-    "babel-plugin-transform-es2015-modules-commonjs": "6.24.1",
-    "babel-plugin-transform-object-rest-spread": "6.23.0",
-    "babel-plugin-transform-react-remove-prop-types": "0.3.2",
-    "babel-plugin-transform-runtime": "6.23.0",
-    "babel-plugin-webpack-alias": "2.1.2",
-    "babel-preset-env": "1.1.9",
-    "babel-preset-es2015": "6.22.0",
-    "babel-preset-es2016": "6.22.0",
-    "babel-preset-es2017": "6.22.0",
-    "babel-preset-react": "6.23.0",
-    "babel-preset-stage-0": "6.22.0",
-    "babel-register": "6.23.0",
-    "babel-runtime": "6.23.0",
-    "chai": "3.5.0",
-    "chai-as-promised": "6.0.0",
-    "chai-enzyme": "0.6.1",
-    "chalk": "1.1.3",
-    "circular-dependency-plugin": "2.0.0",
-    "copy-webpack-plugin": "4.0.1",
-    "core-js": "2.4.1",
-    "coveralls": "2.11.16",
-    "css-loader": "0.26.1",
-    "ejs-loader": "0.3.0",
-    "ejsify": "1.0.0",
-    "empty-module": "0.0.2",
-    "enzyme": "2.7.1",
-    "eslint": "3.16.1",
-    "eslint-config-semistandard": "7.0.0",
-    "eslint-config-standard": "6.2.1",
-    "eslint-config-standard-react": "4.2.0",
-    "eslint-plugin-promise": "3.4.2",
-    "eslint-plugin-react": "6.10.0",
-    "eslint-plugin-standard": "2.0.1",
-    "express": "4.14.1",
-    "extract-loader": "0.1.0",
-    "extract-text-webpack-plugin": "2.0.0-beta.4",
-    "file-loader": "0.10.0",
-    "happypack": "3.0.3",
-    "html-loader": "0.4.4",
-    "html-webpack-plugin": "2.28.0",
-    "http-proxy-middleware": "0.17.3",
-    "husky": "0.13.1",
-    "ignore-styles": "5.0.1",
-    "image-webpack-loader": "3.2.0",
-    "istanbul": "1.0.0-alpha.2",
-    "jsdom": "9.11.0",
-    "json-loader": "0.5.4",
-    "markdown-loader": "2.0.0",
-    "mocha": "3.2.0",
-    "mock-local-storage": "1.0.2",
-    "mock-socket": "6.0.4",
-    "nock": "9.0.7",
-    "postcss-import": "9.1.0",
-    "postcss-loader": "1.3.2",
-    "postcss-nested": "1.0.0",
-    "postcss-simple-vars": "3.0.0",
-    "progress": "1.1.8",
-    "progress-bar-webpack-plugin": "1.9.3",
-    "raw-loader": "0.5.1",
-    "react-addons-perf": "15.4.2",
-    "react-addons-test-utils": "15.4.2",
-    "react-hot-loader": "3.0.0-beta.6",
-    "react-intl-aggregate-webpack-plugin": "0.0.1",
-    "rucksack-css": "0.9.1",
-    "script-ext-html-webpack-plugin": "1.7.1",
-    "serviceworker-webpack-plugin": "0.2.0",
-    "sinon": "1.17.7",
-    "sinon-as-promised": "4.0.2",
-    "sinon-chai": "2.8.0",
-    "style-loader": "0.13.1",
-    "stylelint": "7.9.0",
-    "stylelint-config-standard": "16.0.0",
-    "to-source": "2.0.3",
-    "url-loader": "0.5.7",
-    "webpack": "2.2.1",
-    "webpack-bundle-size-analyzer": "2.5.0",
-    "webpack-dev-middleware": "1.10.1",
-    "webpack-error-notification": "0.1.6",
-    "webpack-hot-middleware": "2.17.1",
-    "websocket": "1.0.24",
-    "yargs": "6.6.0"
-  },
-  "dependencies": {
-    "@parity/wordlist": "1.0.1",
-    "arraybuffer-loader": "0.2.2",
-    "babel-runtime": "6.23.0",
-    "base32.js": "0.1.0",
-    "bignumber.js": "3.0.1",
-    "blockies": "0.0.2",
-    "brace": "0.9.0",
-    "bytes": "2.4.0",
-    "date-difference": "1.0.0",
-    "debounce": "1.0.0",
-    "es6-error": "4.0.0",
-    "es6-promise": "4.0.5",
-    "ethereumjs-tx": "1.2.5",
-    "eventemitter3": "2.0.2",
-    "file-saver": "1.3.3",
-    "flat": "2.0.1",
-    "format-json": "1.0.3",
-    "format-number": "2.0.1",
-    "geopattern": "1.2.3",
-    "isomorphic-fetch": "2.2.1",
-    "js-sha3": "0.5.5",
-    "keythereum": "0.4.6",
-    "lodash": "4.17.2",
-    "loglevel": "1.4.1",
-    "marked": "0.3.6",
-    "material-ui": "0.16.5",
-    "material-ui-chip-input": "0.11.1",
-    "mobx": "2.6.4",
-    "mobx-react": "4.0.3",
-    "mobx-react-devtools": "4.2.10",
-    "moment": "2.17.0",
-    "napa": "2.3.0",
-    "phoneformat.js": "1.0.3",
-    "promise-worker": "1.1.1",
-    "push.js": "0.0.11",
-    "qs": "6.3.0",
-    "react": "15.4.2",
-    "react-ace": "4.1.0",
-    "react-addons-css-transition-group": "15.4.2",
-    "react-codemirror": "^0.3.0",
-    "react-copy-to-clipboard": "4.2.3",
-    "react-dom": "15.4.2",
-    "react-dropzone": "3.7.3",
-    "react-element-to-jsx-string": "6.0.0",
-    "react-event-listener": "0.4.1",
-    "react-inspector": "paritytech/react-inspector",
-    "react-intl": "2.1.5",
-    "react-markdown": "2.4.4",
-    "react-portal": "3.0.0",
-    "react-qr-reader": "1.1.3",
-    "react-redux": "4.4.6",
-    "react-router": "3.0.0",
-    "react-router-redux": "4.0.7",
-    "react-tap-event-plugin": "2.0.1",
-    "react-tooltip": "3.2.2",
-    "recharts": "0.15.2",
-    "redux": "3.6.0",
-    "redux-actions": "1.1.0",
-    "redux-thunk": "2.1.0",
-    "rlp": "2.0.0",
-    "scryptsy": "2.0.0",
-    "solc": "ngotchac/solc-js",
-    "store": "1.3.20",
-    "sw-toolbox": "^3.6.0",
-    "u2f-api": "0.0.9",
-    "u2f-api-polyfill": "0.4.3",
-    "uglify-js": "2.8.16",
-    "useragent.js": "0.5.6",
-    "utf8": "2.1.2",
-    "valid-url": "1.0.9",
-    "validator": "6.2.0",
-    "web3": "0.17.0-beta",
-    "whatwg-fetch": "2.0.1",
-    "worker-loader": "^0.8.0",
-    "yarn": "^0.21.3",
-    "zxcvbn": "4.4.1"
-  }
-}
diff --git a/js/scripts/build-i18n.js b/js/scripts/build-i18n.js
deleted file mode 100644
index 1acf2c852f50c4c369e81009d33f2516ccb9faff..0000000000000000000000000000000000000000
--- a/js/scripts/build-i18n.js
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const fs = require('fs');
-const _ = require('lodash');
-const path = require('path');
-const toSource = require('to-source');
-
-const FILE_HEADER = `// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.\n\n`;
-const SECTION_HEADER = 'export default ';
-const SECTION_FOOTER = ';\n';
-const INDENT = '  ';
-const DESTPATH = path.join(__dirname, '../src/i18n/_default');
-const ENPATH = path.join(__dirname, '../src/i18n/en');
-const SRCPATH = path.join(__dirname, '../.build/i18n/i18n/en.json');
-
-// main entry point
-(function main () {
-  const { sections, sectionNames } = createSectionMap();
-
-  sectionNames.forEach((name) => outputSection(name, sections[name]));
-  outputIndex(sectionNames);
-})();
-
-// sort an object based on its keys
-function sortObject (object) {
-  return Object
-    .keys(object)
-    .sort()
-    .reduce((sorted, key) => {
-      if (typeof object[key] === 'object') {
-        sorted[key] = sortObject(object[key]);
-      } else {
-        sorted[key] = object[key];
-      }
-
-      return sorted;
-    }, {});
-}
-
-// create an object map of the actual inputs
-function createSectionMap () {
-  console.log(`Reading strings from ${SRCPATH}`);
-
-  const i18nstrings = require(SRCPATH);
-  const sections = sortObject(
-    Object
-      .keys(i18nstrings)
-      .reduce((sections, fullKey) => {
-        const defaultMessage = i18nstrings[fullKey].defaultMessage;
-        const keys = fullKey.split('.');
-        let outputs = sections;
-
-        keys.forEach((key, index) => {
-          if (index === keys.length - 1) {
-            outputs[key] = defaultMessage;
-          } else {
-            if (!outputs[key]) {
-              outputs[key] = {};
-            }
-
-            outputs = outputs[key];
-          }
-        });
-
-        return sections;
-      }, {})
-  );
-  const sectionNames = Object.keys(sections);
-
-  console.log(`Found ${sectionNames.length} sections`);
-
-  return {
-    sections,
-    sectionNames
-  };
-}
-
-// load the available deafults (non-exported strings) for a section
-function readDefaults (sectionName) {
-  let defaults = {};
-
-  try {
-    defaults = require(path.join(ENPATH, `${sectionName}.js`)).default;
-  } catch (error) {
-    defaults = {};
-  }
-
-  return defaults;
-}
-
-// create the index.js file
-function outputIndex (sectionNames) {
-  console.log(`Writing index.js to ${DESTPATH}`);
-
-  const defaults = readDefaults('index');
-  const dest = path.join(DESTPATH, 'index.js');
-  const exports = _.uniq(Object.keys(defaults).concat(sectionNames))
-    .sort()
-    .map((name) => `export ${name} from './${name}';`)
-    .join('\n');
-
-  fs.writeFileSync(dest, `${FILE_HEADER}${exports}\n`, 'utf8');
-}
-
-// export a section as a flatenned JS export string
-function createJSSection (section) {
-  const source = toSource(section, {
-    enclose: true,
-    quoteChar: '`',
-    tabChar: INDENT,
-    tabDepth: 0
-  });
-
-  return `${SECTION_HEADER}${source}${SECTION_FOOTER}`;
-}
-
-// create the individual section files
-function outputSection (sectionName, section) {
-  console.log(`Writing ${sectionName}.js to ${DESTPATH}`);
-
-  const defaults = readDefaults(sectionName);
-  const dest = path.join(DESTPATH, `${sectionName}.js`);
-  const sectionText = createJSSection(_.defaultsDeep(section, defaults));
-
-  fs.writeFileSync(dest, `${FILE_HEADER}${sectionText}`, 'utf8');
-}
diff --git a/js/scripts/build-rpc-json.js b/js/scripts/build-rpc-json.js
deleted file mode 100644
index 740f96aa104365293fb59ab2f88bff87afe05b6a..0000000000000000000000000000000000000000
--- a/js/scripts/build-rpc-json.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import fs from 'fs';
-import path from 'path';
-import yargs from 'yargs';
-
-import interfaces from '../src/jsonrpc';
-
-const argv = yargs.default('output', 'release').argv;
-
-const INDEX_JSON = path.join(__dirname, `../${argv.output}/index.json`);
-const methods = [];
-
-function formatDescription (obj) {
-  const optional = obj.optional ? '(optional) ' : '';
-  const defaults = obj.default ? `(default: ${obj.default}) ` : '';
-
-  return `${obj.type.name} - ${optional}${defaults}${obj.desc}`;
-}
-
-function formatType (obj) {
-  if (obj.type === Object && obj.details) {
-    const formatted = {};
-
-    Object.keys(obj.details).sort().forEach((key) => {
-      formatted[key] = formatType(obj.details[key]);
-    });
-
-    return {
-      desc: formatDescription(obj),
-      details: formatted
-    };
-  } else if (obj.type && obj.type.name) {
-    return formatDescription(obj);
-  }
-
-  return obj;
-}
-
-Object.keys(interfaces).sort().forEach((group) => {
-  Object.keys(interfaces[group]).sort().forEach((name) => {
-    const method = interfaces[group][name];
-    const deprecated = method.deprecated ? ' (Deprecated and not supported, to be removed in a future version)' : '';
-
-    methods.push({
-      name: `${group}_${name}`,
-      desc: `${method.desc}${deprecated}`,
-      params: method.params.map(formatType),
-      returns: formatType(method.returns),
-      inputFormatters: method.params.map((param) => param.format || null),
-      outputFormatter: method.returns.format || null
-    });
-  });
-});
-
-fs.writeFileSync(INDEX_JSON, JSON.stringify({ methods: methods }, null, 2), 'utf8');
diff --git a/js/scripts/build-rpc-markdown.js b/js/scripts/build-rpc-markdown.js
deleted file mode 100644
index 7a78e1ce96c3c52ae764a6b8899e8b700407811b..0000000000000000000000000000000000000000
--- a/js/scripts/build-rpc-markdown.js
+++ /dev/null
@@ -1,328 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import fs from 'fs';
-import path from 'path';
-import { isPlainObject } from 'lodash';
-
-import { info, warn, error } from './helpers/log';
-import { Dummy } from '../src/jsonrpc/helpers';
-import interfaces from '../src/jsonrpc';
-import rustMethods from './helpers/parsed-rpc-traits';
-
-const ROOT_DIR = path.join(__dirname, '../docs');
-
-if (!fs.existsSync(ROOT_DIR)) {
-  fs.mkdirSync(ROOT_DIR);
-}
-
-Object.keys(rustMethods).forEach((group) => {
-  Object.keys(rustMethods[group]).forEach((method) => {
-    if (interfaces[group] == null || interfaces[group][method] == null) {
-      error(`${group}_${method} is defined in Rust traits, but not in js/src/jsonrpc/interfaces`);
-    }
-  });
-});
-
-function printType (type, obj) {
-  if (!type) {
-    throw new Error(`Invalid type in ${JSON.stringify(obj)}`);
-  }
-
-  return type.print || `\`${type.name}\``;
-}
-
-function formatDescription (obj, prefix = '', indent = '') {
-  const optional = obj.optional ? '(optional) ' : '';
-  const defaults = obj.default ? `(default: \`${obj.default}\`) ` : '';
-
-  return `${indent}${prefix}${printType(obj.type, obj)} - ${optional}${defaults}${obj.desc}`;
-}
-
-function formatType (obj) {
-  if (obj == null || obj.type == null) {
-    return obj;
-  }
-
-  const details = obj.details || obj.type.details;
-
-  if (details) {
-    const sub = Object.keys(details).map((key) => {
-      return formatDescription(details[key], `\`${key}\`: `, '    - ');
-    }).join('\n');
-
-    return `${formatDescription(obj)}\n${sub}`;
-  } else if (obj.type && obj.type.name) {
-    return formatDescription(obj);
-  }
-
-  return obj;
-}
-
-const rpcReqTemplate = {
-  method: 'web3_clientVersion',
-  params: [],
-  id: 1,
-  jsonrpc: '2.0'
-};
-
-const { isDummy } = Dummy;
-const { isArray } = Array;
-
-// Checks if a field definition has an example,
-// or describes an object with fields that recursively have examples of their own,
-// or is optional.
-function hasExample ({ optional, example, details } = {}) {
-  if (optional || example !== undefined) {
-    return true;
-  }
-
-  if (details !== undefined) {
-    const values = Object.keys(details).map((key) => details[key]);
-
-    return values.every(hasExample);
-  }
-
-  return false;
-}
-
-// Remove all optional (trailing) params without examples from an array
-function removeOptionalWithoutExamples (arr) {
-  return arr.filter(({ optional, example, details }) => {
-    return !optional || example !== undefined || details !== undefined;
-  });
-}
-
-// Grabs JSON compatible
-function getExample (obj) {
-  if (isArray(obj)) {
-    return removeOptionalWithoutExamples(obj).map(getExample);
-  }
-
-  const { example, details } = obj;
-
-  if (example === undefined && details !== undefined) {
-    const nested = {};
-
-    Object.keys(details).forEach((key) => {
-      nested[key] = getExample(details[key]);
-    });
-
-    return nested;
-  }
-
-  return example;
-}
-
-function stringifyExample (example, dent = '') {
-  const indent = `${dent}  `;
-
-  if (isDummy(example)) {
-    return example.toString();
-  }
-
-  if (isArray(example)) {
-    const last = example.length - 1;
-
-    // If all elements are dummies, print out a single line.
-    // Also covers empty arrays.
-    if (example.every(isDummy)) {
-      const dummies = example.map(d => d.toString());
-
-      return `[${dummies.join(', ')}]`;
-    }
-
-    // For arrays containing just one object or string, don't unwind the array to multiline
-    if (last === 0 && (isPlainObject(example[0]) || typeof example[0] === 'string')) {
-      return `[${stringifyExample(example[0], dent)}]`;
-    }
-
-    const elements = example.map((value, index) => {
-      const comma = index !== last ? ',' : '';
-      const comment = value != null && value._comment ? ` // ${value._comment}` : '';
-
-      return `${stringifyExample(value, indent)}${comma}${comment}`;
-    });
-
-    return `[\n${indent}${elements.join(`\n${indent}`)}\n${dent}]`;
-  }
-
-  if (isPlainObject(example)) {
-    const keys = Object.keys(example);
-    const last = keys.length - 1;
-
-    // print out an empty object
-    if (last === -1) {
-      return '{}';
-    }
-
-    const elements = keys.map((key, index) => {
-      const value = example[key];
-      const comma = index !== last ? ',' : '';
-      const comment = value && value._comment ? ` // ${example[key]._comment}` : '';
-
-      return `${JSON.stringify(key)}: ${stringifyExample(value, indent)}${comma}${comment}`;
-    });
-
-    return `{\n${indent}${elements.join(`\n${indent}`)}\n${dent}}`;
-  }
-
-  return JSON.stringify(example);
-}
-
-function buildExample (name, method) {
-  // deprecated, don't care
-  if (method.deprecated) {
-    return '';
-  }
-
-  const logPostfix = method.subdoc ? ` (${method.subdoc})` : '';
-
-  const hasReqExample = method.params.every(hasExample);
-  const hasResExample = hasExample(method.returns);
-
-  if (!hasReqExample && !hasResExample) {
-    error(`${name} has no examples${logPostfix}`);
-
-    return '';
-  }
-
-  const examples = [];
-
-  if (hasReqExample) {
-    const params = getExample(method.params);
-    const req = Dummy.stringifyJSON(Object.assign({}, rpcReqTemplate, { method: name, params }));
-
-    examples.push(`Request\n\`\`\`bash\ncurl --data '${req}' -H "Content-Type: application/json" -X POST localhost:8545\n\`\`\``);
-  } else {
-    warn(`${name} has a response example but not a request example${logPostfix}`);
-  }
-
-  if (hasResExample) {
-    const res = stringifyExample({
-      id: 1,
-      jsonrpc: '2.0',
-      result: getExample(method.returns)
-    });
-
-    examples.push(`Response\n\`\`\`js\n${res}\n\`\`\``);
-  } else {
-    if (typeof method.returns === 'string') {
-      info(`${name} has a request example and only text description for response${logPostfix}`);
-    } else {
-      warn(`${name} has a request example but not a response example${logPostfix}`);
-    }
-  }
-
-  return `\n\n#### Example\n\n${examples.join('\n\n')}`;
-}
-
-function buildParameters (params) {
-  if (params.length === 0) {
-    return '';
-  }
-
-  let md = `0. ${params.map(formatType).join('\n0. ')}`;
-
-  if (params.length > 0 && params.every(hasExample) && !isDummy(params[0].example)) {
-    const example = getExample(params);
-
-    md = `${md}\n\n\`\`\`js\nparams: ${stringifyExample(example)}\n\`\`\``;
-  }
-
-  return md;
-}
-
-Object.keys(interfaces).sort().forEach((group) => {
-  const spec = interfaces[group];
-
-  for (const key in spec) {
-    const method = spec[key];
-
-    if (!method || !method.subdoc) {
-      continue;
-    }
-
-    const subgroup = `${group}_${method.subdoc}`;
-
-    interfaces[subgroup] = interfaces[subgroup] || {};
-
-    interfaces[subgroup][key] = method;
-    delete spec[key];
-  }
-});
-
-Object.keys(interfaces).sort().forEach((group) => {
-  let preamble = `# The \`${group}\` Module`;
-  let markdown = `## JSON-RPC methods\n`;
-
-  const spec = interfaces[group];
-
-  if (spec._preamble) {
-    preamble = `${preamble}\n\n${spec._preamble}`;
-  }
-
-  const content = [];
-  const tocMain = [];
-  const tocSections = {};
-
-  // Comparator that will sort by sections first, names second
-  function methodComparator (a, b) {
-    const sectionA = spec[a].section || '';
-    const sectionB = spec[b].section || '';
-
-    return sectionA.localeCompare(sectionB) || a.localeCompare(b);
-  }
-
-  Object.keys(spec).sort(methodComparator).forEach((iname) => {
-    const method = spec[iname];
-    const groupName = group.replace(/_.*$/, '');
-    const name = `${groupName}_${iname}`;
-
-    if (method.nodoc || method.deprecated) {
-      info(`Skipping ${name}: ${method.nodoc || 'Deprecated'}`);
-
-      return;
-    }
-
-    if (rustMethods[groupName] == null || rustMethods[groupName][iname] == null) {
-      error(`${name} is defined in js/src/jsonrpc/interfaces, but not in Rust traits`);
-    }
-
-    const desc = method.desc;
-    const params = buildParameters(method.params);
-    const returns = `- ${formatType(method.returns)}`;
-    const example = buildExample(name, method);
-
-    const { section } = method;
-    const toc = section ? tocSections[section] = tocSections[section] || [] : tocMain;
-
-    toc.push(`- [${name}](#${name.toLowerCase()})`);
-    content.push(`### ${name}\n\n${desc}\n\n#### Parameters\n\n${params || 'None'}\n\n#### Returns\n\n${returns || 'None'}${example}`);
-  });
-
-  markdown = `${markdown}\n${tocMain.join('\n')}`;
-
-  Object.keys(tocSections).sort().forEach((section) => {
-    markdown = `${markdown}\n\n#### ${section}\n${tocSections[section].join('\n')}`;
-  });
-
-  markdown = `${markdown}\n\n## JSON-RPC API Reference\n\n${content.join('\n\n***\n\n')}\n\n`;
-
-  const mdFile = path.join(ROOT_DIR, `${group}.md`);
-
-  fs.writeFileSync(mdFile, `${preamble}\n\n${markdown}`, 'utf8');
-});
diff --git a/js/scripts/build.sh b/js/scripts/build.sh
deleted file mode 100755
index a6f4a913c02b488940066affd7009e10868f9697..0000000000000000000000000000000000000000
--- a/js/scripts/build.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# change into the js directory (one down from scripts)
-pushd `dirname $0`
-cd ..
-
-# run build (production) and store the exit code
-EXITCODE=0
-BUILDDIR=./.dist
-rm -rf $BUILDDIR
-mkdir -p $BUILDDIR/src
-BUILD_DEST=$BUILDDIR/build npm run ci:build || EXITCODE=1
-
-# Copy rust files
-cp Cargo.precompiled.toml $BUILDDIR/Cargo.toml
-cp build.rs $BUILDDIR
-cp src/lib.rs* $BUILDDIR/src
-
-# back to root
-popd
-
-# exit with exit code
-exit $EXITCODE
diff --git a/js/scripts/dryrun-npm.sh b/js/scripts/dryrun-npm.sh
deleted file mode 100755
index bf8a151a8b08d6bf8b8f9f87a3eca3a5499b1472..0000000000000000000000000000000000000000
--- a/js/scripts/dryrun-npm.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-set -e
-
-# variables
-PACKAGES=( "parity" "etherscan" "shapeshift" "jsonrpc" )
-
-# change into the build directory
-BASEDIR=`dirname $0`
-cd $BASEDIR/..
-
-# build jsonrpc
-echo "*** Building JSONRPC .json"
-mkdir -p .npmjs/jsonrpc
-npm run ci:build:jsonrpc
-
-# build all packages
-echo "*** Building packages for npmjs"
-echo "$NPM_TOKEN" >> ~/.npmrc
-
-for PACKAGE in ${PACKAGES[@]}
-do
-  echo "*** Building $PACKAGE"
-  LIBRARY=$PACKAGE npm run ci:build:npm
-  DIRECTORY=.npmjs/$PACKAGE
-
-  cd $DIRECTORY
-
-  echo "*** Publishing $PACKAGE from $DIRECTORY"
-  echo "npm publish --access public || true"
-  cd ../..
-
-done
-cd ..
-
-# exit with exit code
-exit 0
diff --git a/js/scripts/helpers/log.js b/js/scripts/helpers/log.js
deleted file mode 100644
index dc495564995c1e8198c06ea4937d846cb2e0a2ad..0000000000000000000000000000000000000000
--- a/js/scripts/helpers/log.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import chalk from 'chalk';
-
-// INFO Logging helper
-export function info (log) {
-  console.log(chalk.blue(`INFO:\t${log}`));
-}
-
-// WARN Logging helper
-export function warn (log) {
-  console.warn(chalk.yellow(`WARN:\t${log}`));
-}
-
-// ERROR Logging helper
-export function error (log) {
-  console.error(chalk.red(`ERROR:\t${log}`));
-}
diff --git a/js/scripts/helpers/parsed-rpc-traits.js b/js/scripts/helpers/parsed-rpc-traits.js
deleted file mode 100644
index 9f2d4ea8a47a07183f8979643d5ad5fda516651d..0000000000000000000000000000000000000000
--- a/js/scripts/helpers/parsed-rpc-traits.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import fs from 'fs';
-import path from 'path';
-
-// ```js
-// rustMethods['eth']['call'] === true
-// ```
-const rustMethods = {};
-
-export default rustMethods;
-
-// Get a list of JSON-RPC from Rust trait source code
-function parseMethodsFromRust (source) {
-  // Matching the custom `rpc` attribute with it's doc comment
-  const attributePattern = /((?:\s*\/\/\/.*$)*)\s*#\[rpc\(([^)]+)\)]/gm;
-  const commentPattern = /\s*\/\/\/\s*/g;
-  const separatorPattern = /\s*,\s*/g;
-  const assignPattern = /([\S]+)\s*=\s*"([^"]*)"/;
-  const ignorePattern = /@(ignore|deprecated|unimplemented|alias)\b/i;
-
-  const methods = [];
-
-  source.toString().replace(attributePattern, (match, comment, props) => {
-    comment = comment.replace(commentPattern, '\n').trim();
-
-    // Skip deprecated methods
-    if (ignorePattern.test(comment)) {
-      return match;
-    }
-
-    props.split(separatorPattern).forEach((prop) => {
-      const [, key, value] = prop.split(assignPattern) || [];
-
-      if (key === 'name' && value != null) {
-        methods.push(value);
-      }
-    });
-
-    return match;
-  });
-
-  return methods;
-}
-
-// Get a list of all JSON-RPC methods from all defined traits
-function getMethodsFromRustTraits () {
-  const traitsDir = path.join(__dirname, '../../../rpc/src/v1/traits');
-
-  return fs.readdirSync(traitsDir)
-            .filter((name) => name !== 'mod.rs' && /\.rs$/.test(name))
-            .map((name) => fs.readFileSync(path.join(traitsDir, name)))
-            .map(parseMethodsFromRust)
-            .reduce((a, b) => a.concat(b));
-}
-
-getMethodsFromRustTraits().sort().forEach((method) => {
-  const [group, name] = method.split('_');
-
-  // Skip methods with malformed names
-  if (group == null || name == null) {
-    return;
-  }
-
-  rustMethods[group] = rustMethods[group] || {};
-  rustMethods[group][name] = true;
-});
diff --git a/js/scripts/install-deps.sh b/js/scripts/install-deps.sh
deleted file mode 100755
index 96c2f36b11cef4e927f5f234d849b27bb983e4e4..0000000000000000000000000000000000000000
--- a/js/scripts/install-deps.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# change into the js directory (one down from scripts)
-pushd `dirname $0`
-cd ..
-
-# install deps and store the exit code
-EXITCODE=0
-node --version
-npm --version
-npm install --progress=false || EXITCODE=1
-
-# back to root
-popd
-
-# exit with exit code
-exit $EXITCODE
diff --git a/js/scripts/lint-i18n.js b/js/scripts/lint-i18n.js
deleted file mode 100644
index d392353d0e0ee887f0f30dfe96855e7a57b5f434..0000000000000000000000000000000000000000
--- a/js/scripts/lint-i18n.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import flatten from 'flat';
-
-import * as defaults from '../src/i18n/_default';
-import { LANGUAGES, MESSAGES } from '../src/i18n/store';
-
-const SKIP_LANG = ['en'];
-const defaultKeys = Object.keys(flatten(Object.assign({}, defaults, LANGUAGES)));
-
-Object
-  .keys(MESSAGES)
-  .filter((lang) => !SKIP_LANG.includes(lang))
-  .forEach((lang) => {
-    const messageKeys = Object.keys(MESSAGES[lang]);
-    let extra = 0;
-    let found = 0;
-    let missing = 0;
-
-    console.log(`*** Checking translations for ${lang}`);
-
-    defaultKeys.forEach((key) => {
-      if (messageKeys.includes(key)) {
-        found++;
-      } else {
-        missing++;
-        console.log(`  Missing ${key}`);
-      }
-    });
-
-    messageKeys.forEach((key) => {
-      if (!defaultKeys.includes(key)) {
-        extra++;
-        console.log(`  Extra ${key}`);
-      }
-    });
-
-    console.log(`Found ${found} keys, missing ${missing} keys, ${extra} extraneous keys\n`);
-  });
diff --git a/js/scripts/lint.sh b/js/scripts/lint.sh
deleted file mode 100755
index 147bb0a2d01fd36bc94cabba51e3eba947e42824..0000000000000000000000000000000000000000
--- a/js/scripts/lint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# change into the js directory (one down from scripts)
-pushd `dirname $0`
-cd ..
-
-# run lint & tests and store the exit code
-EXITCODE=0
-npm run lint || EXITCODE=1
-
-# back to root
-popd
-
-# exit with exit code
-exit $EXITCODE
diff --git a/js/scripts/release.sh b/js/scripts/release.sh
deleted file mode 100755
index d1d9cfacb545cf94e6b46760851c41806215607f..0000000000000000000000000000000000000000
--- a/js/scripts/release.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-set -e
-
-# variables
-UTCDATE=`date -u "+%Y%m%d-%H%M%S"`
-PACKAGES=( "parity" "etherscan" "shapeshift" "jsonrpc" )
-BRANCH=$CI_BUILD_REF_NAME
-GIT_JS_PRECOMPILED="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/js-precompiled.git"
-GIT_PARITY="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/parity.git"
-
-# setup the git user defaults for the current repo
-function setup_git_user {
-  git config push.default simple
-  git config merge.ours.driver true
-  git config user.email "$GITHUB_EMAIL"
-  git config user.name "GitLab Build Bot"
-}
-
-# change into the build directory
-BASEDIR=`dirname $0`
-GITLOG=./.git/gitcommand.log
-pushd $BASEDIR
-cd ../.dist
-
-# add local files and send it up
-echo "*** Setting up GitHub config for js-precompiled"
-rm -rf ./.git
-git init
-setup_git_user
-
-echo "*** Checking out $BRANCH branch"
-git remote add origin $GIT_JS_PRECOMPILED
-git fetch origin 2>$GITLOG
-git checkout -b $BRANCH
-
-echo "*** Committing compiled files for $UTCDATE"
-mv build ../build.new
-git add .
-git commit -m "$UTCDATE [update]"
-git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]"
-git rm -r build
-rm -rf build
-git commit -m "$UTCDATE [cleanup]"
-mv ../build.new build
-git add .
-git commit -m "$UTCDATE [release]"
-
-echo "*** Merging remote"
-git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
-PRECOMPILED_HASH=`git rev-parse HEAD`
-
-# move to root
-cd ../..
-
-echo "*** Setting up GitHub config for parity"
-setup_git_user
-git remote set-url origin $GIT_PARITY
-git reset --hard origin/$BRANCH 2>$GITLOG
-
-if [ "$BRANCH" == "master" ]; then
-  cd js
-
-  echo "*** Bumping package.json patch version"
-  npm --no-git-tag-version version
-  npm version patch
-
-  echo "*** Building packages for npmjs"
-  echo "$NPM_TOKEN" >> ~/.npmrc
-
-  # build jsonrpc
-  echo "*** Building JSONRPC .json"
-  mkdir -p .npmjs/jsonrpc
-  npm run ci:build:jsonrpc
-
-  for PACKAGE in ${PACKAGES[@]}
-  do
-    echo "*** Building $PACKAGE"
-    LIBRARY=$PACKAGE npm run ci:build:npm
-    DIRECTORY=.npmjs/$PACKAGE
-
-    echo "*** Publishing $PACKAGE from $DIRECTORY"
-    cd $DIRECTORY
-    npm publish --access public || true
-    cd ../..
-  done
-
-  cd ..
-fi
-
-echo "*** Updating cargo parity-ui-precompiled#$PRECOMPILED_HASH"
-git submodule update
-sed -i "/^parity-ui-precompiled/ { s/branch = \".*\"/branch = \"$BRANCH\"/g; }" dapps/ui/Cargo.toml
-cargo update -p parity-ui-precompiled
-# --precise "$PRECOMPILED_HASH"
-
-echo "*** Committing updated files"
-git add js
-git add dapps/ui/Cargo.toml
-git add Cargo.lock
-git commit -m "[ci skip] js-precompiled $UTCDATE"
-git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
-
-# back to root
-echo "*** Release completed"
-popd
-
-# exit with exit code
-exit 0
diff --git a/js/scripts/test.js b/js/scripts/test.js
deleted file mode 100644
index e426642db0b0e95332b63cbe52e72feddab150b7..0000000000000000000000000000000000000000
--- a/js/scripts/test.js
+++ /dev/null
@@ -1 +0,0 @@
-// test script 10
diff --git a/js/scripts/test.sh b/js/scripts/test.sh
deleted file mode 100755
index 6827b243ca64bdacd03691100dafc65a68bc5e65..0000000000000000000000000000000000000000
--- a/js/scripts/test.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# change into the js directory (one down from scripts)
-pushd `dirname $0`
-cd ..
-
-# run lint & tests and store the exit code
-EXITCODE=0
-npm run test || EXITCODE=1
-
-# back to root
-popd
-
-# exit with exit code
-exit $EXITCODE
diff --git a/js/scripts/update-precompiled.sh b/js/scripts/update-precompiled.sh
deleted file mode 100755
index 0b9461bf0b1f29ce20ac8cacc8ccea0e9d83b813..0000000000000000000000000000000000000000
--- a/js/scripts/update-precompiled.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -e
-
-# change into main dir
-pushd `dirname $0`
-cd ../../
-
-cargo update -p parity-ui-precompiled
-
-popd
-exit 0
diff --git a/js/src/3rdparty/email-verification/index.js b/js/src/3rdparty/email-verification/index.js
deleted file mode 100644
index 9e79547ec66bb22d9c6f7e8c4eeba0da358945e9..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/email-verification/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { stringify } from 'querystring';
-
-export const isServerRunning = (isTestnet = false) => {
-  const port = isTestnet ? 28443 : 18443;
-
-  return fetch(`https://email-verification.parity.io:${port}/health`, {
-    mode: 'cors',
-    cache: 'no-store'
-  })
-    .then((res) => {
-      return res.ok;
-    })
-    .catch(() => {
-      return false;
-    });
-};
-
-export const hasReceivedCode = (email, address, isTestnet = false) => {
-  const port = isTestnet ? 28443 : 18443;
-  const query = stringify({ email, address });
-
-  return fetch(`https://email-verification.parity.io:${port}/?${query}`, {
-    mode: 'cors',
-    cache: 'no-store'
-  })
-    .then((res) => {
-      return res.ok;
-    })
-    .catch(() => {
-      return false; // todo: check for 404
-    });
-};
-
-export const postToServer = (query, isTestnet = false) => {
-  const port = isTestnet ? 28443 : 18443;
-
-  query = stringify(query);
-
-  return fetch(`https://email-verification.parity.io:${port}/?${query}`, {
-    method: 'POST',
-    mode: 'cors',
-    cache: 'no-store'
-  })
-  .then((res) => {
-    return res.json().then((data) => {
-      if (res.ok) {
-        return data.message;
-      }
-      throw new Error(data.message || 'unknown error');
-    });
-  });
-};
diff --git a/js/src/3rdparty/email-verification/terms-of-service.js b/js/src/3rdparty/email-verification/terms-of-service.js
deleted file mode 100644
index 8826be0329090acaca3dd1b63caaed221eb1e6f2..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/email-verification/terms-of-service.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-
-export default (
-  <ul>
-    <li>This privacy notice relates to your use of the Parity email verification service. We take your privacy seriously and deal in an honest, direct and transparent way when it comes to your data.</li>
-    <li>We collect your email address when you use this service. This is temporarily kept in memory, and then encrypted and stored in our EU servers. We only retain the cryptographic hash of the email address to prevent duplicated accounts. The cryptographic hash of your email address is also stored on the blockchain which is public by design. You consent to this use.</li>
-    <li>You pay a fee for the cost of this service using the account you want to verify.</li>
-    <li>Your email address is transmitted to a third party EU email verification service mailjet for the sole purpose of the email verification. You consent to this use. Mailjet's privacy policy is here: <a href='https://www.mailjet.com/privacy-policy'>https://www.mailjet.com/privacy-policy</a>.</li>
-    <li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:admin@parity.io' }>admin@parity.io</a>. Our general privacy policy can be found here: <a href={ 'https://parity.io/legal.html' }>https://parity.io/legal.html</a>.</li>
-  </ul>
-);
diff --git a/js/src/3rdparty/etherscan/account.js b/js/src/3rdparty/etherscan/account.js
deleted file mode 100644
index 7a6844759117bca1289bfbf5df4ee2b78411fb16..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/etherscan/account.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-const PAGE_SIZE = 25;
-
-import util from '../../api/util';
-import { call } from './call';
-
-function _call (method, params, test, netVersion) {
-  return call('account', method, params, test, netVersion);
-}
-
-function balance (address, test, netVersion) {
-  return _call('balance', {
-    address: address,
-    tag: 'latest'
-  }, test, netVersion).then((balance) => {
-    // same format as balancemulti below
-    return {
-      account: address,
-      balance: balance
-    };
-  });
-}
-
-function balances (addresses, test, netVersion) {
-  return _call('balancemulti', {
-    address: addresses.join(','),
-    tag: 'latest'
-  }, test, netVersion);
-}
-
-function transactions (address, page, test, netVersion) {
-  // page offset from 0
-  return _call('txlist', {
-    address: address,
-    offset: PAGE_SIZE,
-    page: (page || 0) + 1,
-    sort: 'desc'
-  }, test, netVersion).then((transactions) => {
-    return transactions.map((tx) => {
-      return {
-        blockNumber: new BigNumber(tx.blockNumber || 0),
-        from: util.toChecksumAddress(tx.from),
-        hash: tx.hash,
-        timeStamp: tx.timeStamp,
-        to: util.toChecksumAddress(tx.to),
-        value: tx.value
-      };
-    });
-  });
-}
-
-const account = {
-  balance,
-  balances,
-  transactions
-};
-
-export { account };
diff --git a/js/src/3rdparty/etherscan/account.spec.js b/js/src/3rdparty/etherscan/account.spec.js
deleted file mode 100644
index 54eff9f9cd5ca0cda0ece385a820fa1dd8d4bf49..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/etherscan/account.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const etherscan = require('./');
-
-const TESTADDR = '0xbf885e2b55c6bcc84556a3c5f07d3040833c8d00';
-
-describe.skip('etherscan/account', function () {
-  this.timeout(60 * 1000);
-
-  const checkBalance = function (balance, addr) {
-    expect(balance).to.be.ok;
-    expect(balance.account).to.equal(addr);
-    expect(balance.balance).to.be.ok;
-  };
-
-  it('retrieves an account balance', () => {
-    return etherscan.account
-      .balance(TESTADDR)
-      .then((balance) => {
-        checkBalance(balance, TESTADDR);
-      });
-  });
-
-  it('retrieves multi account balances', () => {
-    const addresses = ['0xde0b295669a9fd93d5f28d9ec85e40f4cb697bae', TESTADDR];
-
-    return etherscan.account
-      .balances(addresses)
-      .then((balances) => {
-        expect(balances).to.be.ok;
-        expect(balances.length).to.equal(2);
-        balances.forEach((balance, idx) => {
-          checkBalance(balance, addresses[idx]);
-        });
-      });
-  });
-
-  describe('transactions', () => {
-    it('retrieves a list of transactions (default)', () => {
-      return etherscan.account
-        .transactions(TESTADDR)
-        .then((transactions) => {
-          expect(transactions).to.be.ok;
-          expect(transactions.length).to.equal(25);
-        });
-    });
-
-    it('retrieves a list of transactions (page 1)', () => {
-      return etherscan.account
-        .transactions(TESTADDR, 1)
-        .then((transactions) => {
-          expect(transactions).to.be.ok;
-          expect(transactions.length).to.equal(25);
-        });
-    });
-  });
-});
diff --git a/js/src/3rdparty/etherscan/call.js b/js/src/3rdparty/etherscan/call.js
deleted file mode 100644
index 069627d78567fbbe1c001d1db777997a4a9e81be..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/etherscan/call.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { stringify } from 'qs';
-import { apiLink } from './links';
-
-const options = {
-  method: 'GET',
-  headers: {
-    'Accept': 'application/json'
-  }
-};
-
-export function call (module, action, _params, test, netVersion) {
-  const query = stringify(Object.assign({
-    module, action
-  }, _params || {}));
-
-  return fetch(apiLink(query, test, netVersion), options)
-    .then((response) => {
-      if (!response.ok) {
-        throw { code: response.status, message: response.statusText }; // eslint-disable-line
-      }
-
-      return response.json();
-    })
-    .then((result) => {
-      if (result.message === 'NOTOK') {
-        throw { code: -1, message: result.result }; // eslint-disable-line
-      }
-
-      return result.result;
-    });
-}
diff --git a/js/src/3rdparty/etherscan/helpers.spec.js b/js/src/3rdparty/etherscan/helpers.spec.js
deleted file mode 100644
index fa29c3d97715003893163b11bae6b13db043a2cb..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/etherscan/helpers.spec.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import nock from 'nock';
-import { stringify } from 'qs';
-
-import { url } from './links';
-
-function mockget (requests, test, netVersion) {
-  let scope = nock(url(test, netVersion));
-
-  requests.forEach((request) => {
-    scope = scope
-      .get(`/api?${stringify(request.query)}`)
-      .reply(request.code || 200, () => {
-        return { result: request.reply };
-      });
-  });
-
-  return scope;
-}
-
-export {
-  mockget
-};
diff --git a/js/src/3rdparty/etherscan/index.js b/js/src/3rdparty/etherscan/index.js
deleted file mode 100644
index 594e833a8f8de02c0046d79db8a1b1b66d3bfdc1..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/etherscan/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { account } from './account';
-import { stats } from './stats';
-import { txLink, addressLink } from './links';
-
-const etherscan = {
-  account: account,
-  stats: stats,
-  txLink: txLink,
-  addressLink: addressLink
-};
-
-export default etherscan;
diff --git a/js/src/3rdparty/etherscan/links.js b/js/src/3rdparty/etherscan/links.js
deleted file mode 100644
index 3b08d60e835455fdd5dbea702c41deae02a324bd..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/etherscan/links.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-// NOTE: Keep 'isTestnet' for backwards library compatibility
-const getUrlPrefix = (isTestnet = false, netVersion = '0', defaultPrefix = '') => {
-  if (isTestnet) {
-    return 'ropsten.';
-  }
-
-  switch (netVersion) {
-    case '1':
-      return defaultPrefix;
-
-    case '3':
-      return 'ropsten.';
-
-    case '4':
-      return 'rinkeby.';
-
-    case '42':
-      return 'kovan.';
-
-    default:
-      return 'testnet.';
-  }
-};
-
-export const url = (isTestnet = false, netVersion = '0', defaultPrefix = '') => {
-  return `https://${getUrlPrefix(isTestnet, netVersion, defaultPrefix)}etherscan.io`;
-};
-
-export const txLink = (hash, isTestnet = false, netVersion = '0') => {
-  return `${url(isTestnet, netVersion)}/tx/${hash}`;
-};
-
-export const addressLink = (address, isTestnet = false, netVersion = '0') => {
-  return `${url(isTestnet, netVersion)}/address/${address}`;
-};
-
-export const apiLink = (query, isTestnet = false, netVersion = '0') => {
-  return `${url(isTestnet, netVersion, 'api.')}/api?${query}`;
-};
diff --git a/js/src/3rdparty/etherscan/links.spec.js b/js/src/3rdparty/etherscan/links.spec.js
deleted file mode 100644
index c906940cbd9ca7fe2caedcf630a111a2795616a6..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/etherscan/links.spec.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const { url, txLink, addressLink, apiLink } = require('./links');
-
-describe('etherscan/links', function () {
-  it('builds link with a prefix', () => {
-    expect(url(false, '1', 'api.')).to.be.equal('https://api.etherscan.io');
-  });
-
-  it('builds link to main network', () => {
-    expect(url(false, '1')).to.be.equal('https://etherscan.io');
-  });
-
-  it('builds link to ropsten', () => {
-    expect(url(false, '3')).to.be.equal('https://ropsten.etherscan.io');
-    expect(url(true)).to.be.equal('https://ropsten.etherscan.io');
-  });
-
-  it('builds link to kovan', () => {
-    expect(url(false, '42')).to.be.equal('https://kovan.etherscan.io');
-  });
-
-  it('builds link to rinkeby', () => {
-    expect(url(false, '4')).to.be.equal('https://rinkeby.etherscan.io');
-  });
-
-  it('builds link to the testnet selector for unknown networks', () => {
-    expect(url(false, '10042')).to.be.equal('https://testnet.etherscan.io');
-    expect(url(false, '51224')).to.be.equal('https://testnet.etherscan.io');
-  });
-
-  it('builds transaction link', () => {
-    expect(txLink('aTxHash', false, '1')).to.be.equal('https://etherscan.io/tx/aTxHash');
-  });
-
-  it('builds address link', () => {
-    expect(addressLink('anAddress', false, '1')).to.be.equal('https://etherscan.io/address/anAddress');
-  });
-
-  it('builds api link', () => {
-    expect(apiLink('answer=42', false, '1')).to.be.equal('https://api.etherscan.io/api?answer=42');
-  });
-});
diff --git a/js/src/3rdparty/etherscan/stats.js b/js/src/3rdparty/etherscan/stats.js
deleted file mode 100644
index 282376c5ee1449aecd2621fd4f4c5f7120d8f073..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/etherscan/stats.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { call } from './call';
-
-function _call (action, test) {
-  return call('stats', action, null, test);
-}
-
-function price (test = false) {
-  return _call('ethprice', test);
-}
-
-function supply (test = false) {
-  return _call('ethsupply', test);
-}
-
-const stats = {
-  price: price,
-  supply: supply
-};
-
-export { stats };
diff --git a/js/src/3rdparty/etherscan/stats.spec.js b/js/src/3rdparty/etherscan/stats.spec.js
deleted file mode 100644
index d837f17f768198cddad9a48c2fbde66da108295a..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/etherscan/stats.spec.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const etherscan = require('./');
-
-describe.skip('etherscan/stats', function () {
-  this.timeout(60 * 1000);
-
-  it('retrieves the latest price', () => {
-    return etherscan.stats
-      .price()
-      .then((price) => {
-        expect(price).to.be.ok;
-      });
-  });
-
-  it('retrieves the ether total', () => {
-    return etherscan.stats
-      .supply()
-      .then((supply) => {
-        expect(supply).to.be.ok;
-      });
-  });
-});
diff --git a/js/src/3rdparty/ledger/index.js b/js/src/3rdparty/ledger/index.js
deleted file mode 100644
index a5b876dcac816e26d88312735ad58d1871c23480..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/ledger/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './ledger';
diff --git a/js/src/3rdparty/ledger/ledger.js b/js/src/3rdparty/ledger/ledger.js
deleted file mode 100644
index 13a67199857c82ab10fd303665c4962478f7c9ed..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/ledger/ledger.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import 'u2f-api-polyfill';
-
-import BigNumber from 'bignumber.js';
-import Transaction from 'ethereumjs-tx';
-import u2fapi from 'u2f-api';
-
-import Ledger3 from './vendor/ledger3';
-import LedgerEth from './vendor/ledger-eth';
-
-const LEDGER_PATH_ETC = "44’/60’/160720'/0'/0";
-const LEDGER_PATH_ETH = "44'/60'/0'/0";
-const SCRAMBLE_KEY = 'w0w';
-
-function numberToHex (number) {
-  return `0x${new BigNumber(number).toString(16)}`;
-}
-
-export default class Ledger {
-  constructor (api, ledger) {
-    this._api = api;
-    this._ledger = ledger;
-
-    this._isSupported = false;
-
-    this.checkJSSupport();
-  }
-
-  // FIXME: Until we have https support from Parity u2f will not work. Here we mark it completely
-  // as unsupported until a full end-to-end environment is available.
-  get isSupported () {
-    return false && this._isSupported;
-  }
-
-  checkJSSupport () {
-    return u2fapi
-      .isSupported()
-      .then((isSupported) => {
-        console.log('Ledger:checkJSSupport', isSupported);
-
-        this._isSupported = isSupported;
-      });
-  }
-
-  getAppConfiguration () {
-    return new Promise((resolve, reject) => {
-      this._ledger.getAppConfiguration((response, error) => {
-        if (error) {
-          reject(error);
-          return;
-        }
-
-        resolve(response);
-      });
-    });
-  }
-
-  scan () {
-    return new Promise((resolve, reject) => {
-      this._ledger.getAddress(LEDGER_PATH_ETH, (response, error) => {
-        if (error) {
-          reject(error);
-          return;
-        }
-
-        resolve([response.address]);
-      }, true, false);
-    });
-  }
-
-  signTransaction (transaction) {
-    return this._api.net.version().then((_chainId) => {
-      return new Promise((resolve, reject) => {
-        const chainId = new BigNumber(_chainId).toNumber();
-        const tx = new Transaction({
-          data: transaction.data || transaction.input,
-          gasPrice: numberToHex(transaction.gasPrice),
-          gasLimit: numberToHex(transaction.gasLimit),
-          nonce: numberToHex(transaction.nonce),
-          to: transaction.to ? transaction.to.toLowerCase() : undefined,
-          value: numberToHex(transaction.value),
-          v: Buffer.from([chainId]), // pass the chainId to the ledger
-          r: Buffer.from([]),
-          s: Buffer.from([])
-        });
-        const rawTransaction = tx.serialize().toString('hex');
-
-        this._ledger.signTransaction(LEDGER_PATH_ETH, rawTransaction, (response, error) => {
-          if (error) {
-            reject(error);
-            return;
-          }
-
-          tx.v = Buffer.from(response.v, 'hex');
-          tx.r = Buffer.from(response.r, 'hex');
-          tx.s = Buffer.from(response.s, 'hex');
-
-          if (chainId !== Math.floor((tx.v[0] - 35) / 2)) {
-            reject(new Error('Invalid EIP155 signature received from Ledger.'));
-            return;
-          }
-
-          resolve(`0x${tx.serialize().toString('hex')}`);
-        });
-      });
-    });
-  }
-
-  static create (api, ledger) {
-    if (!ledger) {
-      ledger = new LedgerEth(new Ledger3(SCRAMBLE_KEY));
-    }
-
-    return new Ledger(api, ledger);
-  }
-}
-
-export {
-  LEDGER_PATH_ETC,
-  LEDGER_PATH_ETH
-};
diff --git a/js/src/3rdparty/ledger/ledger.spec.js b/js/src/3rdparty/ledger/ledger.spec.js
deleted file mode 100644
index 406a4bfcd07e4f738e8d68e128ad0980bbabbe27..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/ledger/ledger.spec.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Ledger from './';
-
-const TEST_ADDRESS = '0x63Cf90D3f0410092FC0fca41846f596223979195';
-
-let api;
-let ledger;
-let vendor;
-
-function createApi () {
-  api = {
-    net: {
-      version: sinon.stub().resolves('2')
-    }
-  };
-
-  return api;
-}
-
-function createVendor (error = null) {
-  vendor = {
-    getAddress: (path, callback) => {
-      callback({
-        address: TEST_ADDRESS
-      }, error);
-    },
-    getAppConfiguration: (callback) => {
-      callback({}, error);
-    },
-    signTransaction: (path, rawTransaction, callback) => {
-      callback({
-        v: [39],
-        r: [0],
-        s: [0]
-      }, error);
-    }
-  };
-
-  return vendor;
-}
-
-function create (error) {
-  ledger = new Ledger(createApi(), createVendor(error));
-
-  return ledger;
-}
-
-describe('3rdparty/ledger', () => {
-  beforeEach(() => {
-    create();
-
-    sinon.spy(vendor, 'getAddress');
-    sinon.spy(vendor, 'getAppConfiguration');
-    sinon.spy(vendor, 'signTransaction');
-  });
-
-  afterEach(() => {
-    vendor.getAddress.restore();
-    vendor.getAppConfiguration.restore();
-    vendor.signTransaction.restore();
-  });
-
-  describe('getAppConfiguration', () => {
-    beforeEach(() => {
-      return ledger.getAppConfiguration();
-    });
-
-    it('calls into getAppConfiguration', () => {
-      expect(vendor.getAppConfiguration).to.have.been.called;
-    });
-  });
-
-  describe('scan', () => {
-    beforeEach(() => {
-      return ledger.scan();
-    });
-
-    it('calls into getAddress', () => {
-      expect(vendor.getAddress).to.have.been.called;
-    });
-  });
-
-  describe('signTransaction', () => {
-    beforeEach(() => {
-      return ledger.signTransaction({
-        data: '0x0',
-        gasPrice: 20000000,
-        gasLimit: 1000000,
-        nonce: 2,
-        to: '0x63Cf90D3f0410092FC0fca41846f596223979195',
-        value: 1
-      });
-    });
-
-    it('retrieves chainId via API', () => {
-      expect(api.net.version).to.have.been.called;
-    });
-
-    it('calls into signTransaction', () => {
-      expect(vendor.signTransaction).to.have.been.called;
-    });
-  });
-});
diff --git a/js/src/3rdparty/ledger/vendor/README.md b/js/src/3rdparty/ledger/vendor/README.md
deleted file mode 100644
index a44c3521bdf91b539c8841425d02f463cc0972f2..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/ledger/vendor/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Description
-
-Vendor files (c) 2016 [Ledger](https://github.com/LedgerHQ) for [Ledger Nano-S](https://www.ledgerwallet.com/) integration
-
-# Origin
-
-Files originally created via [https://github.com/kvhnuke/etherwallet/pull/248/files](https://github.com/kvhnuke/etherwallet/pull/248/files)
-
-# License
-
-Files in this directory is licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) by their original author
diff --git a/js/src/3rdparty/ledger/vendor/ledger-eth.js b/js/src/3rdparty/ledger/vendor/ledger-eth.js
deleted file mode 100644
index 80ff0d0a6a62f2c4866fd7d71eb4658c111d636a..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/ledger/vendor/ledger-eth.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/********************************************************************************
-*   Ledger Communication toolkit
-*   (c) 2016 Ledger
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-********************************************************************************/
-
-/* eslint-disable */
-
-'use strict';
-
-var LedgerEth = function(comm) {
-	this.comm = comm;
-}
-
-LedgerEth.splitPath = function(path) {
-	var result = [];
-	var components = path.split('/');
-	components.forEach(function (element, index) {
-		var number = parseInt(element, 10);
-		if (isNaN(number)) {
-			return;
-		}
-		if ((element.length > 1) && (element[element.length - 1] == "'")) {
-			number += 0x80000000;
-		}
-		result.push(number);
-	});
-	return result;
-}
-
-// callback is function(response, error)
-LedgerEth.prototype.getAddress = function(path, callback, boolDisplay, boolChaincode) {
-	var splitPath = LedgerEth.splitPath(path);
-	var buffer = new Buffer(5 + 1 + splitPath.length * 4);
-	buffer[0] = 0xe0;
-	buffer[1] = 0x02;
-	buffer[2] = (boolDisplay ? 0x01 : 0x00);
-	buffer[3] = (boolChaincode ? 0x01 : 0x00);
-	buffer[4] = 1 + splitPath.length * 4;
-	buffer[5] = splitPath.length;
-	splitPath.forEach(function (element, index) {
-		buffer.writeUInt32BE(element, 6 + 4 * index);
-	});
-	var self = this;
-	var localCallback = function(response, error) {
-		if (typeof error != "undefined") {
-			callback(undefined, error);
-		}
-		else {
-			var result = {};
-			response = new Buffer(response, 'hex');
-			var sw = response.readUInt16BE(response.length - 2);
-			if (sw != 0x9000) {
-				callback(undefined, "Invalid status " + sw.toString(16));
-				return;
-			}
-			var publicKeyLength = response[0];
-			var addressLength = response[1 + publicKeyLength];
-			result['publicKey'] = response.slice(1, 1 + publicKeyLength).toString('hex');
-			result['address'] = "0x" + response.slice(1 + publicKeyLength + 1, 1 + publicKeyLength + 1 + addressLength).toString('ascii');
-			if (boolChaincode) {
-				result['chainCode'] = response.slice(1 + publicKeyLength + 1 + addressLength, 1 + publicKeyLength + 1 + addressLength + 32).toString('hex');
-			}
-			callback(result);
-		}
-	};
-	this.comm.exchange(buffer.toString('hex'), localCallback);
-}
-
-// callback is function(response, error)
-LedgerEth.prototype.signTransaction = function(path, rawTxHex, callback) {
-	var splitPath = LedgerEth.splitPath(path);
-	var offset = 0;
-	var rawTx = new Buffer(rawTxHex, 'hex');
-	var apdus = [];
-	while (offset != rawTx.length) {
-		var maxChunkSize = (offset == 0 ? (150 - 1 - splitPath.length * 4) : 150)
-		var chunkSize = (offset + maxChunkSize > rawTx.length ? rawTx.length - offset : maxChunkSize);
-		var buffer = new Buffer(offset == 0 ? 5 + 1 + splitPath.length * 4 + chunkSize : 5 + chunkSize);
-		buffer[0] = 0xe0;
-		buffer[1] = 0x04;
-		buffer[2] = (offset == 0 ? 0x00 : 0x80);
-		buffer[3] = 0x00;
-		buffer[4] = (offset == 0 ? 1 + splitPath.length * 4 + chunkSize : chunkSize);
-		if (offset == 0) {
-			buffer[5] = splitPath.length;
-			splitPath.forEach(function (element, index) {
-				buffer.writeUInt32BE(element, 6 + 4 * index);
-			});
-			rawTx.copy(buffer, 6 + 4 * splitPath.length, offset, offset + chunkSize);
-		}
-		else {
-			rawTx.copy(buffer, 5, offset, offset + chunkSize);
-		}
-		apdus.push(buffer.toString('hex'));
-		offset += chunkSize;
-	}
-	var self = this;
-	var localCallback = function(response, error) {
-		if (typeof error != "undefined") {
-			callback(undefined, error);
-		}
-		else {
-			response = new Buffer(response, 'hex');
-			var sw = response.readUInt16BE(response.length - 2);
-			if (sw != 0x9000) {
-				callback(undefined, "Invalid status " + sw.toString(16));
-				return;
-			}
-			if (apdus.length == 0) {
-					var result = {};
-					result['v'] = response.slice(0, 1).toString('hex');
-					result['r'] = response.slice(1, 1 + 32).toString('hex');
-					result['s'] = response.slice(1 + 32, 1 + 32 + 32).toString('hex');
-					callback(result);
-			}
-			else {
-				self.comm.exchange(apdus.shift(), localCallback);
-			}
-		}
-	};
-	self.comm.exchange(apdus.shift(), localCallback);
-}
-
-// callback is function(response, error)
-LedgerEth.prototype.getAppConfiguration = function(callback) {
-	var buffer = new Buffer(5);
-	buffer[0] = 0xe0;
-	buffer[1] = 0x06;
-	buffer[2] = 0x00;
-	buffer[3] = 0x00;
-	buffer[4] = 0x00;
-	var localCallback = function(response, error) {
-		if (typeof error != "undefined") {
-			callback(undefined, error);
-		}
-		else {
-			response = new Buffer(response, 'hex');
-			var result = {};
-			var sw = response.readUInt16BE(response.length - 2);
-			if (sw != 0x9000) {
-				callback(undefined, "Invalid status " + sw.toString(16));
-				return;
-			}
-			result['arbitraryDataEnabled'] = (response[0] & 0x01);
-			result['version'] = "" + response[1] + '.' + response[2] + '.' + response[3];
-			callback(result);
-		}
-	};
-	this.comm.exchange(buffer.toString('hex'), localCallback);
-}
-
-module.exports = LedgerEth;
-
-/* eslint-enable */
diff --git a/js/src/3rdparty/ledger/vendor/ledger3.js b/js/src/3rdparty/ledger/vendor/ledger3.js
deleted file mode 100644
index 9601279ad6b10cc39aac904e1ad9308a967b794b..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/ledger/vendor/ledger3.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/********************************************************************************
-*   Ledger Communication toolkit
-*   (c) 2016 Ledger
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-********************************************************************************/
-
-/* eslint-disable */
-
-'use strict';
-
-var Ledger3 = function(scrambleKey, timeoutSeconds) {
-	this.scrambleKey = new Buffer(scrambleKey, 'ascii');
-	this.timeoutSeconds = timeoutSeconds;
-}
-
-Ledger3.wrapApdu = function(apdu, key) {
-	var result = new Buffer(apdu.length);
-	for (var i=0; i<apdu.length; i++) {
-		result[i] = apdu[i] ^ key[i % key.length];
-	}
-	return result;
-}
-
-// Convert from normal to web-safe, strip trailing "="s
-Ledger3.webSafe64 = function(base64) {
-    return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
-}
-
-// Convert from web-safe to normal, add trailing "="s
-Ledger3.normal64 = function(base64) {
-    return base64.replace(/\-/g, '+').replace(/_/g, '/') + '=='.substring(0, (3*base64.length)%4);
-}
-
-Ledger3.prototype.u2fCallback = function(response, callback) {
-	if (typeof response['signatureData'] != "undefined") {
-		var data = new Buffer((Ledger3.normal64(response['signatureData'])), 'base64');
-		callback(data.toString('hex', 5));
-	}
-	else {
-		callback(undefined, response);
-	}
-}
-
-// callback is function(response, error)
-Ledger3.prototype.exchange = function(apduHex, callback) {
-	var apdu = new Buffer(apduHex, 'hex');
-	var keyHandle = Ledger3.wrapApdu(apdu, this.scrambleKey);
-	var challenge = new Buffer("0000000000000000000000000000000000000000000000000000000000000000", 'hex');
-	var key = {};
-	key['version'] = 'U2F_V2';
-	key['keyHandle'] = Ledger3.webSafe64(keyHandle.toString('base64'));
-	var self = this;
-	var localCallback = function(result) {
-		self.u2fCallback(result, callback);
-	}
-	u2f.sign(location.origin, Ledger3.webSafe64(challenge.toString('base64')), [key], localCallback, this.timeoutSeconds);
-}
-
-module.exports = Ledger3
-
-/* eslint-enable */
diff --git a/js/src/3rdparty/shapeshift/helpers.spec.js b/js/src/3rdparty/shapeshift/helpers.spec.js
deleted file mode 100644
index 5dd292486dd59fb57bc4a89413c185e4639abb92..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/shapeshift/helpers.spec.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const nock = require('nock');
-
-const APIKEY = '0x123454321';
-
-function mockget (shapeshift, requests) {
-  let scope = nock(shapeshift.getRpc().ENDPOINT);
-
-  requests.forEach((request) => {
-    scope = scope
-      .get(`/${request.path}`)
-      .reply(request.code || 200, () => {
-        return request.reply;
-      });
-  });
-
-  return scope;
-}
-
-function mockpost (shapeshift, requests) {
-  let scope = nock(shapeshift.getRpc().ENDPOINT);
-
-  requests.forEach((request) => {
-    scope = scope
-      .post(`/${request.path}`)
-      .reply(request.code || 200, (uri, body) => {
-        scope.body = scope.body || {};
-        scope.body[request.path] = body;
-
-        return request.reply;
-      });
-  });
-
-  return scope;
-}
-
-module.exports = {
-  APIKEY,
-  mockget,
-  mockpost
-};
diff --git a/js/src/3rdparty/shapeshift/index.js b/js/src/3rdparty/shapeshift/index.js
deleted file mode 100644
index aac05d3ebbb040b9df59f64c9480f1d3698e0845..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/shapeshift/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import initRpc from './rpc';
-import initShapeshift from './shapeshift';
-
-export default function (apikey) {
-  return initShapeshift(initRpc(apikey));
-}
diff --git a/js/src/3rdparty/shapeshift/rpc.js b/js/src/3rdparty/shapeshift/rpc.js
deleted file mode 100644
index 711a41c51be3ea981400c08d889900ab6d52d429..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/shapeshift/rpc.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const ENDPOINT = 'https://cors.shapeshift.io';
-
-function call (method, options) {
-  return fetch(`${ENDPOINT}/${method}`, options)
-    .then((response) => {
-      if (!response.ok) {
-        throw new Error(response.statusText);
-      }
-
-      return response.json();
-    })
-    .then((result) => {
-      if (result.error) {
-        throw new Error(result.error);
-      }
-
-      return result;
-    });
-}
-
-export default function (apiKey) {
-  function get (method) {
-    return call(method, {
-      method: 'GET',
-      headers: {
-        'Accept': 'application/json'
-      }
-    });
-  }
-
-  function post (method, data) {
-    const params = Object.assign({}, { apiKey }, data);
-    const body = JSON.stringify(params);
-
-    return call(method, {
-      method: 'POST',
-      headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json',
-        'Content-Length': body.length
-      },
-      body
-    });
-  }
-
-  return {
-    ENDPOINT,
-    get,
-    post
-  };
-}
diff --git a/js/src/3rdparty/shapeshift/rpc.spec.js b/js/src/3rdparty/shapeshift/rpc.spec.js
deleted file mode 100644
index d445fbb050833e32dc683c72c7ce95f15fefb6bd..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/shapeshift/rpc.spec.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const helpers = require('./helpers.spec.js');
-
-const ShapeShift = require('./');
-const initShapeshift = (ShapeShift.default || ShapeShift);
-
-const mockget = helpers.mockget;
-const mockpost = helpers.mockpost;
-
-describe('shapeshift/rpc', () => {
-  let rpc;
-  let shapeshift;
-
-  beforeEach(() => {
-    shapeshift = initShapeshift(helpers.APIKEY);
-    rpc = shapeshift.getRpc();
-  });
-
-  describe('GET', () => {
-    const REPLY = { test: 'this is some result' };
-
-    let scope;
-    let result;
-
-    beforeEach(() => {
-      scope = mockget(shapeshift, [{ path: 'test', reply: REPLY }]);
-
-      return rpc
-        .get('test')
-        .then((_result) => {
-          result = _result;
-        });
-    });
-
-    it('does GET', () => {
-      expect(scope.isDone()).to.be.true;
-    });
-
-    it('retrieves the info', () => {
-      expect(result).to.deep.equal(REPLY);
-    });
-  });
-
-  describe('POST', () => {
-    const REPLY = { test: 'this is some result' };
-
-    let scope;
-    let result;
-
-    beforeEach(() => {
-      scope = mockpost(shapeshift, [{ path: 'test', reply: REPLY }]);
-
-      return rpc
-        .post('test', { input: 'stuff' })
-        .then((_result) => {
-          result = _result;
-        });
-    });
-
-    it('does POST', () => {
-      expect(scope.isDone()).to.be.true;
-    });
-
-    it('retrieves the info', () => {
-      expect(result).to.deep.equal(REPLY);
-    });
-
-    it('passes the input object', () => {
-      expect(scope.body.test.input).to.equal('stuff');
-    });
-
-    it('passes the apikey specified', () => {
-      expect(scope.body.test.apiKey).to.equal(helpers.APIKEY);
-    });
-  });
-});
diff --git a/js/src/3rdparty/shapeshift/shapeshift.js b/js/src/3rdparty/shapeshift/shapeshift.js
deleted file mode 100644
index 5ecf141daa8d7c76b171966452fc1985462a2e7e..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/shapeshift/shapeshift.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default function (rpc) {
-  let _subscriptions = [];
-  let _pollStatusIntervalId = null;
-  let _subscriptionPromises = null;
-
-  function getCoins () {
-    return rpc.get('getcoins');
-  }
-
-  function getMarketInfo (pair) {
-    return rpc.get(`marketinfo/${pair}`);
-  }
-
-  function getRpc () {
-    return rpc;
-  }
-
-  function getStatus (depositAddress) {
-    return rpc.get(`txStat/${depositAddress}`);
-  }
-
-  function shift (toAddress, returnAddress, pair) {
-    return rpc.post('shift', {
-      pair,
-      returnAddress,
-      withdrawal: toAddress
-    });
-  }
-
-  function subscribe (depositAddress, callback) {
-    if (!depositAddress || !callback) {
-      return;
-    }
-
-    const index = _subscriptions.length;
-
-    _subscriptions.push({
-      callback,
-      depositAddress,
-      index
-    });
-
-    if (_pollStatusIntervalId === null) {
-      _pollStatusIntervalId = setInterval(_pollStatus, 2000);
-    }
-  }
-
-  function unsubscribe (depositAddress) {
-    _subscriptions = _subscriptions.filter((sub) => sub.depositAddress !== depositAddress);
-
-    if (_subscriptions.length === 0) {
-      clearInterval(_pollStatusIntervalId);
-      _pollStatusIntervalId = null;
-    }
-
-    return true;
-  }
-
-  function _getSubscriptionStatus (subscription) {
-    if (!subscription) {
-      return Promise.resolve();
-    }
-
-    return getStatus(subscription.depositAddress)
-      .then((result) => {
-        switch (result.status) {
-          case 'no_deposits':
-          case 'received':
-            subscription.callback(null, result);
-            return true;
-
-          case 'complete':
-            subscription.callback(null, result);
-            unsubscribe(subscription.depositAddress);
-            return true;
-
-          case 'failed':
-            subscription.callback({
-              message: status.error,
-              fatal: true
-            });
-            unsubscribe(subscription.depositAddress);
-            return true;
-        }
-      })
-      .catch(() => {
-        return true;
-      });
-  }
-
-  function _pollStatus () {
-    _subscriptionPromises = Promise.all(_subscriptions.map(_getSubscriptionStatus));
-  }
-
-  function _getSubscriptions () {
-    return _subscriptions;
-  }
-
-  function _getSubscriptionPromises () {
-    return _subscriptionPromises;
-  }
-
-  function _isPolling () {
-    return _pollStatusIntervalId !== null;
-  }
-
-  return {
-    _getSubscriptions,
-    _getSubscriptionPromises,
-    _isPolling,
-    getCoins,
-    getMarketInfo,
-    getRpc,
-    getStatus,
-    shift,
-    subscribe,
-    unsubscribe
-  };
-}
diff --git a/js/src/3rdparty/shapeshift/shapeshift.spec.js b/js/src/3rdparty/shapeshift/shapeshift.spec.js
deleted file mode 100644
index 0fa6639d8e4f824cae2db5ee12c7fe33bb61e98e..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/shapeshift/shapeshift.spec.js
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const sinon = require('sinon');
-
-const ShapeShift = require('./');
-const initShapeshift = (ShapeShift.default || ShapeShift);
-
-const helpers = require('./helpers.spec.js');
-
-const mockget = helpers.mockget;
-const mockpost = helpers.mockpost;
-
-describe('shapeshift/calls', () => {
-  let clock;
-  let shapeshift;
-
-  beforeEach(() => {
-    clock = sinon.useFakeTimers();
-    shapeshift = initShapeshift(helpers.APIKEY);
-  });
-
-  afterEach(() => {
-    clock.restore();
-  });
-
-  describe('getCoins', () => {
-    const REPLY = {
-      BTC: {
-        name: 'Bitcoin',
-        symbol: 'BTC',
-        image: 'https://shapeshift.io/images/coins/bitcoin.png',
-        status: 'available'
-      },
-      ETH: {
-        name: 'Ether',
-        symbol: 'ETH',
-        image: 'https://shapeshift.io/images/coins/ether.png',
-        status: 'available'
-      }
-    };
-
-    let scope;
-
-    beforeEach(() => {
-      scope = mockget(shapeshift, [{ path: 'getcoins', reply: REPLY }]);
-
-      return shapeshift.getCoins();
-    });
-
-    it('makes the call', () => {
-      expect(scope.isDone()).to.be.ok;
-    });
-  });
-
-  describe('getMarketInfo', () => {
-    const REPLY = {
-      pair: 'btc_ltc',
-      rate: 128.17959917,
-      minerFee: 0.003,
-      limit: 0,
-      minimum: 0.00004632
-    };
-
-    let scope;
-
-    beforeEach(() => {
-      scope = mockget(shapeshift, [{ path: 'marketinfo/btc_ltc', reply: REPLY }]);
-
-      return shapeshift.getMarketInfo('btc_ltc');
-    });
-
-    it('makes the call', () => {
-      expect(scope.isDone()).to.be.ok;
-    });
-  });
-
-  describe('getStatus', () => {
-    const REPLY = {
-      status: '0x123',
-      address: '0x123'
-    };
-
-    let scope;
-
-    beforeEach(() => {
-      scope = mockget(shapeshift, [{ path: 'txStat/0x123', reply: REPLY }]);
-
-      return shapeshift.getStatus('0x123');
-    });
-
-    it('makes the call', () => {
-      expect(scope.isDone()).to.be.ok;
-    });
-  });
-
-  describe('shift', () => {
-    const REPLY = {
-      deposit: '1BTC',
-      depositType: 'btc',
-      withdrawal: '0x456',
-      withdrawalType: 'eth'
-    };
-
-    let scope;
-
-    beforeEach(() => {
-      scope = mockpost(shapeshift, [{ path: 'shift', reply: REPLY }]);
-
-      return shapeshift.shift('0x456', '1BTC', 'btc_eth');
-    });
-
-    it('makes the call', () => {
-      expect(scope.isDone()).to.be.ok;
-    });
-
-    describe('body', () => {
-      it('has withdrawal set', () => {
-        expect(scope.body.shift.withdrawal).to.equal('0x456');
-      });
-
-      it('has returnAddress set', () => {
-        expect(scope.body.shift.returnAddress).to.equal('1BTC');
-      });
-
-      it('has pair set', () => {
-        expect(scope.body.shift.pair).to.equal('btc_eth');
-      });
-    });
-  });
-
-  describe('subscriptions', () => {
-    const ADDRESS = '0123456789abcdef';
-    const REPLY = {
-      status: 'complete',
-      address: ADDRESS
-    };
-
-    let callback;
-
-    beforeEach(() => {
-      mockget(shapeshift, [{ path: `txStat/${ADDRESS}`, reply: REPLY }]);
-      callback = sinon.stub();
-      shapeshift.subscribe(ADDRESS, callback);
-    });
-
-    describe('subscribe', () => {
-      it('adds the depositAddress to the list', () => {
-        const subscriptions = shapeshift._getSubscriptions();
-
-        expect(subscriptions.length).to.equal(1);
-        expect(subscriptions[0].depositAddress).to.equal(ADDRESS);
-      });
-
-      it('starts the polling timer', () => {
-        expect(shapeshift._isPolling()).to.be.true;
-      });
-
-      it('calls the callback once the timer has elapsed', () => {
-        clock.tick(2222);
-
-        return shapeshift._getSubscriptionPromises().then(() => {
-          expect(callback).to.have.been.calledWith(null, REPLY);
-        });
-      });
-
-      it('auto-unsubscribes on completed', () => {
-        clock.tick(2222);
-
-        return shapeshift._getSubscriptionPromises().then(() => {
-          expect(shapeshift._getSubscriptions().length).to.equal(0);
-        });
-      });
-    });
-
-    describe('unsubscribe', () => {
-      it('unbsubscribes when requested', () => {
-        expect(shapeshift._getSubscriptions().length).to.equal(1);
-        shapeshift.unsubscribe(ADDRESS);
-        expect(shapeshift._getSubscriptions().length).to.equal(0);
-      });
-
-      it('clears the polling on no subscriptions', () => {
-        shapeshift.unsubscribe(ADDRESS);
-        expect(shapeshift._isPolling()).to.be.false;
-      });
-
-      it('handles unsubscribe of auto-unsubscribe', () => {
-        clock.tick(2222);
-
-        return shapeshift._getSubscriptionPromises().then(() => {
-          expect(shapeshift.unsubscribe(ADDRESS)).to.be.true;
-        });
-      });
-
-      it('handles unsubscribe when multiples listed', () => {
-        const ADDRESS2 = 'abcdef0123456789';
-
-        shapeshift.subscribe(ADDRESS2, sinon.stub());
-        expect(shapeshift._getSubscriptions().length).to.equal(2);
-        expect(shapeshift._getSubscriptions()[0].depositAddress).to.equal(ADDRESS);
-        shapeshift.unsubscribe(ADDRESS);
-        expect(shapeshift._getSubscriptions()[0].depositAddress).to.equal(ADDRESS2);
-      });
-    });
-  });
-});
diff --git a/js/src/3rdparty/sms-verification/index.js b/js/src/3rdparty/sms-verification/index.js
deleted file mode 100644
index 79cbf13d2fe7499401ffdd0baa20d253172cb6ed..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/sms-verification/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { stringify } from 'querystring';
-
-export const isServerRunning = (isTestnet = false) => {
-  const port = isTestnet ? 8443 : 443;
-
-  return fetch(`https://sms-verification.parity.io:${port}/health`, {
-    mode: 'cors',
-    cache: 'no-store'
-  })
-    .then((res) => {
-      return res.ok;
-    })
-    .catch(() => {
-      return false;
-    });
-};
-
-export const hasReceivedCode = (number, address, isTestnet = false) => {
-  const port = isTestnet ? 8443 : 443;
-  const query = stringify({ number, address });
-
-  return fetch(`https://sms-verification.parity.io:${port}/?${query}`, {
-    mode: 'cors',
-    cache: 'no-store'
-  })
-    .then((res) => {
-      return res.ok;
-    })
-    .catch(() => {
-      return false; // todo: check for 404
-    });
-};
-
-export const postToServer = (query, isTestnet = false) => {
-  const port = isTestnet ? 8443 : 443;
-
-  query = stringify(query);
-
-  return fetch(`https://sms-verification.parity.io:${port}/?${query}`, {
-    method: 'POST',
-    mode: 'cors',
-    cache: 'no-store'
-  })
-  .then((res) => {
-    return res.json().then((data) => {
-      if (res.ok) {
-        return data.message;
-      }
-      throw new Error(data.message || 'unknown error');
-    });
-  });
-};
diff --git a/js/src/3rdparty/sms-verification/terms-of-service.js b/js/src/3rdparty/sms-verification/terms-of-service.js
deleted file mode 100644
index 9451a382b7b1c3cbd3c860ca00e2df3ebd981547..0000000000000000000000000000000000000000
--- a/js/src/3rdparty/sms-verification/terms-of-service.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-
-export default (
-  <ul>
-    <li>This privacy notice relates to your use of the Parity SMS verification service. We take your privacy seriously and deal in an honest, direct and transparent way when it comes to your data.</li>
-    <li>We collect your phone number when you use this service. This is temporarily kept in memory, and then encrypted and stored in our EU servers. We only retain the cryptographic hash of the number to prevent duplicated accounts. You consent to this use.</li>
-    <li>You pay a fee for the cost of this service using the account you want to verify.</li>
-    <li>Your phone number is transmitted to a third party US SMS verification service Twilio for the sole purpose of the SMS verification. You consent to this use. Twilio’s privacy policy is here: <a href={ 'https://www.twilio.com/legal/privacy/developer' }>https://www.twilio.com/legal/privacy/developer</a>.</li>
-    <li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:admin@parity.io' }>admin@parity.io</a>. Our general privacy policy can be found here: <a href={ 'https://parity.io/legal.html' }>https://parity.io/legal.html</a>.</li>
-  </ul>
-);
diff --git a/js/src/abi/README.md b/js/src/abi/README.md
deleted file mode 100644
index 20bc094ded6d8e4d90e77847174add1914262e65..0000000000000000000000000000000000000000
--- a/js/src/abi/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# ethabi-js
-
-A very early, very POC-type port of [https://github.com/paritytech/ethabi](https://github.com/paritytech/ethabi) to JavaScript
-
-[![Build Status](https://travis-ci.org/jacogr/ethabi-js.svg?branch=master)](https://travis-ci.org/jacogr/ethabi-js)
-[![Coverage Status](https://coveralls.io/repos/github/jacogr/ethabi-js/badge.svg?branch=master)](https://coveralls.io/github/jacogr/ethabi-js?branch=master)
-[![Dependency Status](https://david-dm.org/jacogr/ethabi-js.svg)](https://david-dm.org/jacogr/ethabi-js)
-[![devDependency Status](https://david-dm.org/jacogr/ethabi-js/dev-status.svg)](https://david-dm.org/jacogr/ethabi-js#info=devDependencies)
-
-## contributing
-
-Clone the repo and install dependencies via `npm install`. Tests can be executed via
-
-- `npm run testOnce` (100% covered unit tests)
-
-## installation
-
-Install the package with `npm install --save ethabi-js` from the [npm registry ethabi-js](https://www.npmjs.com/package/ethabi-js)
-
-
-## implementation
-### approach
-
-- this version tries to stay as close to the original Rust version in intent, function names & purpose
-- it is a basic port of the Rust version, relying on effectively the same test-suite (expanded where deemed appropriate)
-- it is meant as a library to be used in other projects, i.e. [ethapi-js](https://www.npmjs.com/package/ethapi-js)
-
-### differences to original Rust version
-
-- internally the library operates on string binary representations as opposed to Vector bytes, lengths are therefore 64 bytes as opposed to 32 bytes
-- function names are adapted from the Rust standard snake_case to the JavaScript standard camelCase
-- due to the initial library focus, the cli component (as implemented by the original) is not supported nor mplemented
diff --git a/js/src/abi/abi.js b/js/src/abi/abi.js
deleted file mode 100644
index 892f531fa0feabd36068e48d31bc4ce8a8733d12..0000000000000000000000000000000000000000
--- a/js/src/abi/abi.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Interface from './spec/interface';
-
-export default class Abi extends Interface {
-}
diff --git a/js/src/abi/decoder/bytesTaken.js b/js/src/abi/decoder/bytesTaken.js
deleted file mode 100644
index dbf766f4bf136674168b38719bba0588293671c4..0000000000000000000000000000000000000000
--- a/js/src/abi/decoder/bytesTaken.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default class BytesTaken {
-  constructor (bytes, newOffset) {
-    this._bytes = bytes;
-    this._newOffset = newOffset;
-  }
-
-  get bytes () {
-    return this._bytes;
-  }
-
-  get newOffset () {
-    return this._newOffset;
-  }
-}
diff --git a/js/src/abi/decoder/bytesTaken.spec.js b/js/src/abi/decoder/bytesTaken.spec.js
deleted file mode 100644
index 9329657e48a62e23a2a20dfc6e14665a6773e394..0000000000000000000000000000000000000000
--- a/js/src/abi/decoder/bytesTaken.spec.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BytesTaken from './bytesTaken';
-
-describe('abi/decoder/BytesTaken', () => {
-  describe('constructor', () => {
-    it('sets the bytes of the object', () => {
-      expect((new BytesTaken(1, 2)).bytes).to.equal(1);
-    });
-
-    it('sets the newOffset of the object', () => {
-      expect((new BytesTaken(3, 4)).newOffset).to.equal(4);
-    });
-  });
-});
diff --git a/js/src/abi/decoder/decodeResult.js b/js/src/abi/decoder/decodeResult.js
deleted file mode 100644
index 5e41da4b60aa8595f8a1e451e4f3f02f54e5361f..0000000000000000000000000000000000000000
--- a/js/src/abi/decoder/decodeResult.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default class DecodeResult {
-  constructor (token, newOffset) {
-    this._token = token;
-    this._newOffset = newOffset;
-  }
-
-  get token () {
-    return this._token;
-  }
-
-  get newOffset () {
-    return this._newOffset;
-  }
-}
diff --git a/js/src/abi/decoder/decodeResult.spec.js b/js/src/abi/decoder/decodeResult.spec.js
deleted file mode 100644
index 0c4c81c5c4ffb46ec8fa6ce79f7b6e030ab9c466..0000000000000000000000000000000000000000
--- a/js/src/abi/decoder/decodeResult.spec.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import DecodeResult from './decodeResult';
-
-describe('abi/decoder/DecodeResult', () => {
-  describe('constructor', () => {
-    it('sets the token of the object', () => {
-      expect((new DecodeResult('token', 2)).token).to.equal('token');
-    });
-
-    it('sets the newOffset of the object', () => {
-      expect((new DecodeResult('baz', 4)).newOffset).to.equal(4);
-    });
-  });
-});
diff --git a/js/src/abi/decoder/decoder.js b/js/src/abi/decoder/decoder.js
deleted file mode 100644
index 6922c91e800924e0664ccc2fcb88484e3f9b1962..0000000000000000000000000000000000000000
--- a/js/src/abi/decoder/decoder.js
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import utf8 from 'utf8';
-
-import Token from '../token/token';
-import BytesTaken from './bytesTaken';
-import DecodeResult from './decodeResult';
-import ParamType from '../spec/paramType/paramType';
-import { sliceData } from '../util/slice';
-import { asAddress, asBool, asI32, asU32 } from '../util/sliceAs';
-import { isArray, isInstanceOf } from '../util/types';
-
-const NULL = '0000000000000000000000000000000000000000000000000000000000000000';
-
-export default class Decoder {
-  static decode (params, data) {
-    if (!isArray(params)) {
-      throw new Error('Parameters should be array of ParamType');
-    }
-
-    const slices = sliceData(data);
-    let offset = 0;
-
-    return params.map((param) => {
-      const result = Decoder.decodeParam(param, slices, offset);
-
-      offset = result.newOffset;
-      return result.token;
-    });
-  }
-
-  static peek (slices, position) {
-    if (!slices || !slices[position]) {
-      return NULL;
-    }
-
-    return slices[position];
-  }
-
-  static takeBytes (slices, position, length) {
-    const slicesLength = Math.floor((length + 31) / 32);
-    let bytesStr = '';
-
-    for (let idx = 0; idx < slicesLength; idx++) {
-      bytesStr = `${bytesStr}${Decoder.peek(slices, position + idx)}`;
-    }
-
-    const bytes = (bytesStr.substr(0, length * 2).match(/.{1,2}/g) || []).map((code) => parseInt(code, 16));
-
-    return new BytesTaken(bytes, position + slicesLength);
-  }
-
-  static decodeParam (param, slices, offset) {
-    if (!isInstanceOf(param, ParamType)) {
-      throw new Error('param should be instanceof ParamType');
-    }
-
-    const tokens = [];
-    let taken;
-    let lengthOffset;
-    let length;
-    let newOffset;
-
-    switch (param.type) {
-      case 'address':
-        return new DecodeResult(new Token(param.type, asAddress(Decoder.peek(slices, offset))), offset + 1);
-
-      case 'bool':
-        return new DecodeResult(new Token(param.type, asBool(Decoder.peek(slices, offset))), offset + 1);
-
-      case 'int':
-        return new DecodeResult(new Token(param.type, asI32(Decoder.peek(slices, offset))), offset + 1);
-
-      case 'uint':
-        return new DecodeResult(new Token(param.type, asU32(Decoder.peek(slices, offset))), offset + 1);
-
-      case 'fixedBytes':
-        taken = Decoder.takeBytes(slices, offset, param.length);
-
-        return new DecodeResult(new Token(param.type, taken.bytes), taken.newOffset);
-
-      case 'bytes':
-        lengthOffset = asU32(Decoder.peek(slices, offset)).div(32).toNumber();
-        length = asU32(Decoder.peek(slices, lengthOffset)).toNumber();
-        taken = Decoder.takeBytes(slices, lengthOffset + 1, length);
-
-        return new DecodeResult(new Token(param.type, taken.bytes), offset + 1);
-
-      case 'string':
-        if (param.indexed) {
-          taken = Decoder.takeBytes(slices, offset, 32);
-
-          return new DecodeResult(new Token('fixedBytes', taken.bytes), offset + 1);
-        }
-
-        lengthOffset = asU32(Decoder.peek(slices, offset)).div(32).toNumber();
-        length = asU32(Decoder.peek(slices, lengthOffset)).toNumber();
-        taken = Decoder.takeBytes(slices, lengthOffset + 1, length);
-
-        const str = taken.bytes.map((code) => String.fromCharCode(code)).join('');
-
-        let decoded;
-
-        try {
-          decoded = utf8.decode(str);
-        } catch (error) {
-          decoded = str;
-        }
-
-        return new DecodeResult(new Token(param.type, decoded), offset + 1);
-
-      case 'array':
-        lengthOffset = asU32(Decoder.peek(slices, offset)).div(32).toNumber();
-        length = asU32(Decoder.peek(slices, lengthOffset)).toNumber();
-        newOffset = lengthOffset + 1;
-
-        for (let idx = 0; idx < length; idx++) {
-          const result = Decoder.decodeParam(param.subtype, slices, newOffset);
-
-          newOffset = result.newOffset;
-          tokens.push(result.token);
-        }
-
-        return new DecodeResult(new Token(param.type, tokens), offset + 1);
-
-      case 'fixedArray':
-        newOffset = offset;
-
-        for (let idx = 0; idx < param.length; idx++) {
-          const result = Decoder.decodeParam(param.subtype, slices, newOffset);
-
-          newOffset = result.newOffset;
-          tokens.push(result.token);
-        }
-
-        return new DecodeResult(new Token(param.type, tokens), newOffset);
-
-      default:
-        throw new Error(`Invalid param type ${param.type} in decodeParam`);
-    }
-  }
-}
diff --git a/js/src/abi/decoder/decoder.spec.js b/js/src/abi/decoder/decoder.spec.js
deleted file mode 100644
index 5065be3a7ee603ca487e53aa5d72542e44b944fa..0000000000000000000000000000000000000000
--- a/js/src/abi/decoder/decoder.spec.js
+++ /dev/null
@@ -1,319 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import Decoder from './decoder';
-import ParamType from '../spec/paramType';
-import Token from '../token';
-import { padU32 } from '../util/pad';
-
-describe('abi/decoder/Decoder', () => {
-  const stringToBytes = function (str) {
-    return str.match(/.{1,2}/g).map((code) => parseInt(code, 16));
-  };
-
-  const address1 = '0000000000000000000000001111111111111111111111111111111111111111';
-  const address2 = '0000000000000000000000002222222222222222222222222222222222222222';
-  const address3 = '0000000000000000000000003333333333333333333333333333333333333333';
-  const address4 = '0000000000000000000000004444444444444444444444444444444444444444';
-  const bool1 = '0000000000000000000000000000000000000000000000000000000000000001';
-  const bytes1 = '1234000000000000000000000000000000000000000000000000000000000000';
-  const bytes2 = '1000000000000000000000000000000000000000000000000000000000000000';
-  const bytes3 = '10000000000000000000000000000000000000000000000000000000000002';
-  const bytes4 = '0010000000000000000000000000000000000000000000000000000000000002';
-  const int1 = '0111111111111111111111111111111111111111111111111111111111111111';
-  const intn = 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff85';
-  const string1 = '6761766f66796f726b0000000000000000000000000000000000000000000000';
-  const string2 = '4665726ee16e64657a0000000000000000000000000000000000000000000000';
-  const tokenAddress1 = new Token('address', `0x${address1.slice(-40)}`);
-  const tokenAddress2 = new Token('address', `0x${address2.slice(-40)}`);
-  const tokenAddress3 = new Token('address', `0x${address3.slice(-40)}`);
-  const tokenAddress4 = new Token('address', `0x${address4.slice(-40)}`);
-  const tokenBool1 = new Token('bool', true);
-  const tokenFixedBytes1 = new Token('fixedBytes', [0x12, 0x34]);
-  const tokenBytes1 = new Token('bytes', [0x12, 0x34]);
-  const tokenBytes2 = new Token('bytes', stringToBytes(bytes2).concat(stringToBytes(bytes2)));
-  const tokenBytes3 = new Token('bytes', stringToBytes(bytes3));
-  const tokenBytes4 = new Token('bytes', stringToBytes(bytes4));
-  const tokenInt1 = new Token('int', new BigNumber(int1, 16));
-  const tokenIntn = new Token('int', new BigNumber(-123));
-  const tokenUint1 = new Token('uint', new BigNumber(int1, 16));
-  const tokenUintn = new Token('uint', new BigNumber(intn, 16));
-  const tokenString1 = new Token('string', 'gavofyork');
-  const tokenString2 = new Token('string', 'Fernández');
-  const slices = [ address1, address2, address3, address4 ];
-
-  describe('peek', () => {
-    it('returns the slice at the correct position', () => {
-      expect(Decoder.peek(slices, 1)).to.equal(slices[1]);
-    });
-
-    it('returns empty on invalid slices', () => {
-      expect(Decoder.peek(null, 4)).to.equal('0000000000000000000000000000000000000000000000000000000000000000');
-    });
-  });
-
-  describe('takeBytes', () => {
-    it('returns a single slice', () => {
-      expect(Decoder.takeBytes(slices, 0, 32).bytes).to.deep.equal(stringToBytes(slices[0]));
-    });
-
-    it('returns a single partial slice', () => {
-      expect(Decoder.takeBytes(slices, 0, 20).bytes).to.deep.equal(stringToBytes(slices[0].substr(0, 40)));
-    });
-
-    it('returns multiple slices', () => {
-      expect(Decoder.takeBytes(slices, 0, 64).bytes).to.deep.equal(stringToBytes(`${slices[0]}${slices[1]}`));
-    });
-
-    it('returns a single offset slice', () => {
-      expect(Decoder.takeBytes(slices, 1, 32).bytes).to.deep.equal(stringToBytes(slices[1]));
-    });
-
-    it('returns multiple offset slices', () => {
-      expect(Decoder.takeBytes(slices, 1, 64).bytes).to.deep.equal(stringToBytes(`${slices[1]}${slices[2]}`));
-    });
-
-    it('returns the requires length from slices', () => {
-      expect(
-        Decoder.takeBytes(slices, 1, 75).bytes
-      ).to.deep.equal(stringToBytes(`${slices[1]}${slices[2]}${slices[3]}`.substr(0, 150)));
-    });
-  });
-
-  describe('decodeParam', () => {
-    it('throws an error on non ParamType param', () => {
-      expect(() => Decoder.decodeParam({})).to.throw(/ParamType/);
-    });
-
-    it('throws an error on invalid param type', () => {
-      const pt = new ParamType('address');
-
-      pt._type = 'noMatch';
-
-      expect(() => Decoder.decodeParam(pt)).to.throw(/noMatch/);
-    });
-
-    it('decodes an address', () => {
-      expect(
-        Decoder.decodeParam(new ParamType('address'), [address1], 0).token
-      ).to.deep.equal(tokenAddress1);
-    });
-
-    it('decodes a bool', () => {
-      expect(
-        Decoder.decodeParam(new ParamType('bool'), [bool1], 0).token
-      ).to.deep.equal(tokenBool1);
-    });
-
-    it('decodes an int', () => {
-      expect(
-        Decoder.decodeParam(new ParamType('int'), [int1], 0).token
-      ).to.deep.equal(tokenInt1);
-    });
-
-    it('decodes a negative int', () => {
-      expect(
-        Decoder.decodeParam(new ParamType('int'), [intn], 0).token
-      ).to.deep.equal(tokenIntn);
-    });
-
-    it('decodes an uint', () => {
-      expect(
-        Decoder.decodeParam(new ParamType('uint'), [int1], 0).token
-      ).to.deep.equal(tokenUint1);
-    });
-
-    it('decodes an uint (negative as int)', () => {
-      expect(
-        Decoder.decodeParam(new ParamType('uint'), [intn], 0).token
-      ).to.deep.equal(tokenUintn);
-    });
-
-    it('decodes fixedBytes', () => {
-      expect(
-        Decoder.decodeParam(new ParamType('fixedBytes', null, 2), [bytes1], 0).token
-      ).to.deep.equal(tokenFixedBytes1);
-    });
-
-    it('decodes bytes', () => {
-      expect(
-        Decoder.decodeParam(new ParamType('bytes'), [padU32(0x20), padU32(2), bytes1], 0).token
-      ).to.deep.equal(tokenBytes1);
-    });
-
-    it('decodes string', () => {
-      expect(
-        Decoder.decodeParam(new ParamType('string'), [padU32(0x20), padU32(9), string1], 0).token
-      ).to.deep.equal(tokenString1);
-    });
-
-    it('decodes utf8-invalid string', () => {
-      expect(
-        Decoder.decodeParam(new ParamType('string'), [padU32(0x20), padU32(9), string2], 0).token
-      ).to.deep.equal(tokenString2);
-    });
-
-    it('decodes string (indexed)', () => {
-      expect(
-        Decoder.decodeParam(new ParamType('string', null, 0, true), [bytes1], 0)
-      ).to.deep.equal(Decoder.decodeParam(new ParamType('fixedBytes', null, 32, true), [bytes1], 0));
-    });
-  });
-
-  describe('decode', () => {
-    it('throws an error on invalid params', () => {
-      expect(() => Decoder.decode(null, '123')).to.throw(/array/);
-    });
-
-    describe('address', () => {
-      it('decodes an address', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('address')],
-            `${address1}`
-          )
-        ).to.deep.equal([tokenAddress1]);
-      });
-
-      it('decodes 2 addresses', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('address'), new ParamType('address')],
-            `${address1}${address2}`
-          )
-        ).to.deep.equal([tokenAddress1, tokenAddress2]);
-      });
-
-      it('decodes a fixedArray of addresses', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('fixedArray', new ParamType('address'), 2)],
-            `${address1}${address2}`
-          )
-        ).to.deep.equal([new Token('fixedArray', [tokenAddress1, tokenAddress2])]);
-      });
-
-      it('decodes a dynamic array of addresses', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('array', new ParamType('address'))],
-            `${padU32(0x20)}${padU32(2)}${address1}${address2}`
-          )
-        ).to.deep.equal([new Token('array', [tokenAddress1, tokenAddress2])]);
-      });
-
-      it('decodes a dynamic array of fixed arrays', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('array', new ParamType('fixedArray', new ParamType('address'), 2))],
-            `${padU32(0x20)}${padU32(2)}${address1}${address2}${address3}${address4}`
-          )
-        ).to.deep.equal([
-          new Token('array', [
-            new Token('fixedArray', [tokenAddress1, tokenAddress2]),
-            new Token('fixedArray', [tokenAddress3, tokenAddress4])
-          ])
-        ]);
-      });
-    });
-
-    describe('int', () => {
-      it('decodes an int', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('int')],
-            `${int1}`
-          )
-        ).to.deep.equal([tokenInt1]);
-      });
-    });
-
-    describe('uint', () => {
-      it('decodes an uint', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('uint')],
-            `${int1}`
-          )
-        ).to.deep.equal([tokenUint1]);
-      });
-    });
-
-    describe('fixedBytes', () => {
-      it('decodes fixedBytes', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('fixedBytes', null, 2)],
-            `${bytes1}`
-          )
-        ).to.deep.equal([tokenFixedBytes1]);
-      });
-    });
-
-    describe('bytes', () => {
-      it('decodes bytes', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('bytes')],
-            `${padU32(0x20)}${padU32(2)}${bytes1}`
-          )
-        ).to.deep.equal([tokenBytes1]);
-      });
-
-      it('decodes bytes sequence', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('bytes')],
-            `${padU32(0x20)}${padU32(0x40)}${bytes2}${bytes2}`
-          )
-        ).to.deep.equal([tokenBytes2]);
-      });
-
-      it('decodes bytes seuence (2)', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('bytes'), new ParamType('bytes')],
-            `${padU32(0x40)}${padU32(0x80)}${padU32(0x1f)}${bytes3}00${padU32(0x20)}${bytes4}`
-          )
-        ).to.deep.equal([tokenBytes3, tokenBytes4]);
-      });
-    });
-
-    describe('bool', () => {
-      it('decodes a single bool', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('bool')],
-            bool1
-          )
-        ).to.deep.equal([tokenBool1]);
-      });
-    });
-
-    describe('string', () => {
-      it('decodes a string', () => {
-        expect(
-          Decoder.decode(
-            [new ParamType('string')],
-            `${padU32(0x20)}${padU32(9)}${string1}`
-          )
-        ).to.deep.equal([tokenString1]);
-      });
-    });
-  });
-});
diff --git a/js/src/abi/decoder/index.js b/js/src/abi/decoder/index.js
deleted file mode 100644
index 2ead31504180855d0ee4e5e1192bf9135c2cbc7c..0000000000000000000000000000000000000000
--- a/js/src/abi/decoder/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './decoder';
diff --git a/js/src/abi/encoder/encoder.js b/js/src/abi/encoder/encoder.js
deleted file mode 100644
index fa1aa04538a4164c2199591653aa1f668ede0cf6..0000000000000000000000000000000000000000
--- a/js/src/abi/encoder/encoder.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { padAddress, padBool, padBytes, padFixedBytes, padU32, padString } from '../util/pad';
-import Mediate from './mediate';
-import Token from '../token/token';
-import { isArray, isInstanceOf } from '../util/types';
-
-export default class Encoder {
-  static encode (tokens) {
-    if (!isArray(tokens)) {
-      throw new Error('tokens should be array of Token');
-    }
-
-    const mediates = tokens.map((token, index) => Encoder.encodeToken(token, index));
-    const inits = mediates
-      .map((mediate, idx) => mediate.init(Mediate.offsetFor(mediates, idx)))
-      .join('');
-    const closings = mediates
-      .map((mediate, idx) => mediate.closing(Mediate.offsetFor(mediates, idx)))
-      .join('');
-
-    return `${inits}${closings}`;
-  }
-
-  static encodeToken (token, index = 0) {
-    if (!isInstanceOf(token, Token)) {
-      throw new Error('token should be instanceof Token');
-    }
-
-    try {
-      switch (token.type) {
-        case 'address':
-          return new Mediate('raw', padAddress(token.value));
-
-        case 'int':
-        case 'uint':
-          return new Mediate('raw', padU32(token.value));
-
-        case 'bool':
-          return new Mediate('raw', padBool(token.value));
-
-        case 'fixedBytes':
-          return new Mediate('raw', padFixedBytes(token.value));
-
-        case 'bytes':
-          return new Mediate('prefixed', padBytes(token.value));
-
-        case 'string':
-          return new Mediate('prefixed', padString(token.value));
-
-        case 'fixedArray':
-        case 'array':
-          return new Mediate(token.type, token.value.map((token) => Encoder.encodeToken(token)));
-      }
-    } catch (e) {
-      throw new Error(`Cannot encode token #${index} [${token.type}: ${token.value}]. ${e.message}`);
-    }
-
-    throw new Error(`Invalid token type ${token.type} in encodeToken`);
-  }
-}
diff --git a/js/src/abi/encoder/encoder.spec.js b/js/src/abi/encoder/encoder.spec.js
deleted file mode 100644
index 9a4a24361ffc226cde3c7cbaf2b79150bea0bba3..0000000000000000000000000000000000000000
--- a/js/src/abi/encoder/encoder.spec.js
+++ /dev/null
@@ -1,291 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Encoder from './encoder';
-import Token from '../token';
-import { padAddress, padFixedBytes, padU32 } from '../util/pad';
-
-describe('abi/encoder/Encoder', () => {
-  describe('encodeToken', () => {
-    it('requires token as Token', () => {
-      expect(() => Encoder.encodeToken()).to.throw(/Token/);
-    });
-
-    it('encodes address tokens in Mediate(raw)', () => {
-      const mediate = Encoder.encodeToken(new Token('address', '123'));
-
-      expect(mediate.type).to.equal('raw');
-      expect(mediate.value).to.be.ok;
-    });
-
-    it('encodes bool tokens in Mediate(raw)', () => {
-      const mediatet = Encoder.encodeToken(new Token('bool', true));
-      const mediatef = Encoder.encodeToken(new Token('bool', false));
-
-      expect(mediatet.type).to.equal('raw');
-      expect(mediatet.value).to.be.ok;
-
-      expect(mediatef.type).to.equal('raw');
-      expect(mediatef.value).to.be.ok;
-    });
-
-    it('encodes int tokens in Mediate(raw)', () => {
-      const mediate = Encoder.encodeToken(new Token('int', '123'));
-
-      expect(mediate.type).to.equal('raw');
-      expect(mediate.value).to.be.ok;
-    });
-
-    it('encodes uint tokens in Mediate(raw)', () => {
-      const mediate = Encoder.encodeToken(new Token('uint', '123'));
-
-      expect(mediate.type).to.equal('raw');
-      expect(mediate.value).to.be.ok;
-    });
-
-    it('encodes fixedBytes tokens in Mediate(raw)', () => {
-      const mediate = Encoder.encodeToken(new Token('fixedBytes', '123'));
-
-      expect(mediate.type).to.equal('raw');
-      expect(mediate.value).to.be.ok;
-    });
-
-    it('encodes bytes tokens in Mediate(prefixed)', () => {
-      const mediate = Encoder.encodeToken(new Token('bytes', '123'));
-
-      expect(mediate.type).to.equal('prefixed');
-      expect(mediate.value).to.be.ok;
-    });
-
-    it('encodes string tokens in Mediate(prefixed)', () => {
-      const mediate = Encoder.encodeToken(new Token('string', '123'));
-
-      expect(mediate.type).to.equal('prefixed');
-      expect(mediate.value).to.be.ok;
-    });
-
-    it('encodes fixedArray tokens in Mediate(fixedArray)', () => {
-      const mediate = Encoder.encodeToken(new Token('fixedArray', [new Token('uint', '123')]));
-
-      expect(mediate.type).to.equal('fixedArray');
-      expect(mediate.value).to.be.ok;
-    });
-
-    it('encodes array tokens in Mediate(array)', () => {
-      const mediate = Encoder.encodeToken(new Token('array', [new Token('uint', '123')]));
-
-      expect(mediate.type).to.equal('array');
-      expect(mediate.value).to.be.ok;
-    });
-
-    it('throws an Error on invalid tokens', () => {
-      const token = new Token('address');
-
-      token._type = 'noMatch';
-
-      expect(() => Encoder.encodeToken(token)).to.throw(/noMatch/);
-    });
-  });
-
-  describe('encode', () => {
-    it('requires tokens array', () => {
-      expect(() => Encoder.encode()).to.throw(/array/);
-    });
-
-    describe('addresses', () => {
-      const address1 = '1111111111111111111111111111111111111111';
-      const address2 = '2222222222222222222222222222222222222222';
-      const address3 = '3333333333333333333333333333333333333333';
-      const address4 = '4444444444444444444444444444444444444444';
-      const encAddress1 = padAddress(address1);
-      const encAddress2 = padAddress(address2);
-      const encAddress3 = padAddress(address3);
-      const encAddress4 = padAddress(address4);
-      const tokenAddress1 = new Token('address', address1);
-      const tokenAddress2 = new Token('address', address2);
-      const tokenAddress3 = new Token('address', address3);
-      const tokenAddress4 = new Token('address', address4);
-
-      it('encodes an address', () => {
-        const token = tokenAddress1;
-
-        expect(Encoder.encode([token])).to.equal(encAddress1);
-      });
-
-      it('encodes an array of addresses', () => {
-        const expected = `${padU32(0x20)}${padU32(2)}${encAddress1}${encAddress2}`;
-        const token = new Token('array', [tokenAddress1, tokenAddress2]);
-
-        expect(Encoder.encode([token])).to.equal(expected);
-      });
-
-      it('encodes an fixedArray of addresses', () => {
-        const expected = `${encAddress1}${encAddress2}`;
-        const token = new Token('fixedArray', [tokenAddress1, tokenAddress2]);
-
-        expect(Encoder.encode([token])).to.equal(expected);
-      });
-
-      it('encodes two addresses', () => {
-        const expected = `${encAddress1}${encAddress2}`;
-        const tokens = [tokenAddress1, tokenAddress2];
-
-        expect(Encoder.encode(tokens)).to.equal(expected);
-      });
-
-      it('encodes fixed array of dynamic array addresses', () => {
-        const tokens1 = new Token('array', [tokenAddress1, tokenAddress2]);
-        const tokens2 = new Token('array', [tokenAddress3, tokenAddress4]);
-        const fixed = new Token('fixedArray', [tokens1, tokens2]);
-        const expected = `${padU32(0x40)}${padU32(0xa0)}${padU32(2)}${encAddress1}${encAddress2}${padU32(2)}${encAddress3}${encAddress4}`;
-
-        expect(Encoder.encode([fixed])).to.equal(expected);
-      });
-
-      it('encodes dynamic array of fixed array addresses', () => {
-        const tokens1 = new Token('fixedArray', [tokenAddress1, tokenAddress2]);
-        const tokens2 = new Token('fixedArray', [tokenAddress3, tokenAddress4]);
-        const dynamic = new Token('array', [tokens1, tokens2]);
-        const expected = `${padU32(0x20)}${padU32(2)}${encAddress1}${encAddress2}${encAddress3}${encAddress4}`;
-
-        expect(Encoder.encode([dynamic])).to.equal(expected);
-      });
-
-      it('encodes dynamic array of dynamic array addresses', () => {
-        const tokens1 = new Token('array', [tokenAddress1]);
-        const tokens2 = new Token('array', [tokenAddress2]);
-        const dynamic = new Token('array', [tokens1, tokens2]);
-        const expected = `${padU32(0x20)}${padU32(2)}${padU32(0x80)}${padU32(0xc0)}${padU32(1)}${encAddress1}${padU32(1)}${encAddress2}`;
-
-        expect(Encoder.encode([dynamic])).to.equal(expected);
-      });
-
-      it('encodes dynamic array of dynamic array addresses (2)', () => {
-        const tokens1 = new Token('array', [tokenAddress1, tokenAddress2]);
-        const tokens2 = new Token('array', [tokenAddress3, tokenAddress4]);
-        const dynamic = new Token('array', [tokens1, tokens2]);
-        const expected = `${padU32(0x20)}${padU32(2)}${padU32(0x80)}${padU32(0xe0)}${padU32(2)}${encAddress1}${encAddress2}${padU32(2)}${encAddress3}${encAddress4}`;
-
-        expect(Encoder.encode([dynamic])).to.equal(expected);
-      });
-
-      it('encodes fixed array of fixed array addresses', () => {
-        const tokens1 = new Token('fixedArray', [tokenAddress1, tokenAddress2]);
-        const tokens2 = new Token('fixedArray', [tokenAddress3, tokenAddress4]);
-        const dynamic = new Token('fixedArray', [tokens1, tokens2]);
-        const expected = `${encAddress1}${encAddress2}${encAddress3}${encAddress4}`;
-
-        expect(Encoder.encode([dynamic])).to.equal(expected);
-      });
-    });
-
-    describe('bytes', () => {
-      const bytes1 = '0x1234';
-      const bytes2 = '0x10000000000000000000000000000000000000000000000000000000000002';
-      const bytes3 = '0x1000000000000000000000000000000000000000000000000000000000000000';
-
-      it('encodes fixed bytes', () => {
-        const token = new Token('fixedBytes', bytes1);
-
-        expect(Encoder.encode([token])).to.equal(padFixedBytes(bytes1));
-      });
-
-      it('encodes bytes', () => {
-        const token = new Token('bytes', bytes1);
-
-        expect(Encoder.encode([token])).to.equal(`${padU32(0x20)}${padU32(2)}${padFixedBytes(bytes1)}`);
-      });
-
-      it('encodes bytes (short of boundary)', () => {
-        const token = new Token('bytes', bytes2);
-
-        expect(Encoder.encode([token])).to.equal(`${padU32(0x20)}${padU32(0x1f)}${padFixedBytes(bytes2)}`);
-      });
-
-      it('encodes bytes (two blocks)', () => {
-        const input = `${bytes3}${bytes3.slice(-64)}`;
-        const token = new Token('bytes', input);
-
-        expect(Encoder.encode([token])).to.equal(`${padU32(0x20)}${padU32(0x40)}${padFixedBytes(input)}`);
-      });
-
-      it('encodes two consecutive bytes', () => {
-        const in1 = '0x10000000000000000000000000000000000000000000000000000000000002';
-        const in2 = '0x0010000000000000000000000000000000000000000000000000000000000002';
-        const tokens = [new Token('bytes', in1), new Token('bytes', in2)];
-
-        expect(Encoder.encode(tokens)).to.equal(`${padU32(0x40)}${padU32(0x80)}${padU32(0x1f)}${padFixedBytes(in1)}${padU32(0x20)}${padFixedBytes(in2)}`);
-      });
-    });
-
-    describe('string', () => {
-      it('encodes a string', () => {
-        const string = 'gavofyork';
-        const stringEnc = padFixedBytes('0x6761766f66796f726b');
-        const token = new Token('string', string);
-
-        expect(Encoder.encode([token])).to.equal(`${padU32(0x20)}${padU32(string.length.toString(16))}${stringEnc}`);
-      });
-    });
-
-    describe('uint', () => {
-      it('encodes a uint', () => {
-        const token = new Token('uint', 4);
-
-        expect(Encoder.encode([token])).to.equal(padU32(4));
-      });
-    });
-
-    describe('int', () => {
-      it('encodes a int', () => {
-        const token = new Token('int', 4);
-
-        expect(Encoder.encode([token])).to.equal(padU32(4));
-      });
-    });
-
-    describe('bool', () => {
-      it('encodes a bool (true)', () => {
-        const token = new Token('bool', true);
-
-        expect(Encoder.encode([token])).to.equal(padU32(1));
-      });
-
-      it('encodes a bool (false)', () => {
-        const token = new Token('bool', false);
-
-        expect(Encoder.encode([token])).to.equal(padU32(0));
-      });
-    });
-
-    describe('comprehensive test', () => {
-      it('encodes a complex sequence', () => {
-        const bytes = '0x131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b';
-        const tokens = [new Token('int', 5), new Token('bytes', bytes), new Token('int', 3), new Token('bytes', bytes)];
-
-        expect(Encoder.encode(tokens)).to.equal(`${padU32(5)}${padU32(0x80)}${padU32(3)}${padU32(0xe0)}${padU32(0x40)}${bytes.substr(2)}${padU32(0x40)}${bytes.substr(2)}`);
-      });
-
-      it('encodes a complex sequence (nested)', () => {
-        const array = [new Token('int', 5), new Token('int', 6), new Token('int', 7)];
-        const tokens = [new Token('int', 1), new Token('string', 'gavofyork'), new Token('int', 2), new Token('int', 3), new Token('int', 4), new Token('array', array)];
-        const stringEnc = padFixedBytes('0x6761766f66796f726b');
-
-        expect(Encoder.encode(tokens)).to.equal(`${padU32(1)}${padU32(0xc0)}${padU32(2)}${padU32(3)}${padU32(4)}${padU32(0x100)}${padU32(9)}${stringEnc}${padU32(3)}${padU32(5)}${padU32(6)}${padU32(7)}`);
-      });
-    });
-  });
-});
diff --git a/js/src/abi/encoder/index.js b/js/src/abi/encoder/index.js
deleted file mode 100644
index 5ac3c0a6b2150912c3f423c718e1923581004884..0000000000000000000000000000000000000000
--- a/js/src/abi/encoder/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './encoder';
diff --git a/js/src/abi/encoder/mediate.js b/js/src/abi/encoder/mediate.js
deleted file mode 100644
index 90cc28881d793a36216143b5972d665aede6b724..0000000000000000000000000000000000000000
--- a/js/src/abi/encoder/mediate.js
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const TYPES = ['raw', 'prefixed', 'fixedArray', 'array'];
-
-import { padU32 } from '../util/pad';
-
-export default class Mediate {
-  constructor (type, value) {
-    Mediate.validateType(type);
-
-    this._type = type;
-    this._value = value;
-  }
-
-  initLength () {
-    switch (this._type) {
-      case 'raw':
-        return this._value.length / 2;
-
-      case 'array':
-      case 'prefixed':
-        return 32;
-
-      case 'fixedArray':
-        return this._value
-          .reduce((total, mediate) => {
-            return total + mediate.initLength();
-          }, 0);
-    }
-  }
-
-  closingLength () {
-    switch (this._type) {
-      case 'raw':
-        return 0;
-
-      case 'prefixed':
-        return this._value.length / 2;
-
-      case 'array':
-        return this._value
-          .reduce((total, mediate) => {
-            return total + mediate.initLength();
-          }, 32);
-
-      case 'fixedArray':
-        return this._value
-          .reduce((total, mediate) => {
-            return total + mediate.initLength() + mediate.closingLength();
-          }, 0);
-    }
-  }
-
-  init (suffixOffset) {
-    switch (this._type) {
-      case 'raw':
-        return this._value;
-
-      case 'fixedArray':
-        return this._value
-          .map((mediate, idx) => mediate.init(Mediate.offsetFor(this._value, idx)).toString(16))
-          .join('');
-
-      case 'prefixed':
-      case 'array':
-        return padU32(suffixOffset);
-    }
-  }
-
-  closing (offset) {
-    switch (this._type) {
-      case 'raw':
-        return '';
-
-      case 'prefixed':
-        return this._value;
-
-      case 'fixedArray':
-        return this._value
-          .map((mediate, idx) => mediate.closing(Mediate.offsetFor(this._value, idx)).toString(16))
-          .join('');
-
-      case 'array':
-        const prefix = padU32(this._value.length);
-        const inits = this._value
-          .map((mediate, idx) => mediate.init(offset + Mediate.offsetFor(this._value, idx) + 32).toString(16))
-          .join('');
-        const closings = this._value
-          .map((mediate, idx) => mediate.closing(offset + Mediate.offsetFor(this._value, idx)).toString(16))
-          .join('');
-
-        return `${prefix}${inits}${closings}`;
-    }
-  }
-
-  get type () {
-    return this._type;
-  }
-
-  get value () {
-    return this._value;
-  }
-
-  static offsetFor (mediates, position) {
-    if (position < 0 || position >= mediates.length) {
-      throw new Error(`Invalid position ${position} specified for Mediate.offsetFor`);
-    }
-
-    const initLength = mediates
-      .reduce((total, mediate) => {
-        return total + mediate.initLength();
-      }, 0);
-
-    return mediates
-      .slice(0, position)
-      .reduce((total, mediate) => {
-        return total + mediate.closingLength();
-      }, initLength);
-  }
-
-  static validateType (type) {
-    if (TYPES.filter((_type) => type === _type).length) {
-      return true;
-    }
-
-    throw new Error(`Invalid type ${type} received for Mediate.validateType`);
-  }
-}
diff --git a/js/src/abi/encoder/mediate.spec.js b/js/src/abi/encoder/mediate.spec.js
deleted file mode 100644
index ab89909b1ed96fdfba04fa0f4f22f3f79e99a25b..0000000000000000000000000000000000000000
--- a/js/src/abi/encoder/mediate.spec.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Mediate from './mediate';
-
-describe('abi/encoder/Mediate', () => {
-  const LONG15 = '1234567890abcdef000000000000000000000000000000000000000000000000';
-  const DOUBLE15 = `${LONG15}${LONG15}`;
-  const ARRAY = [new Mediate('raw', DOUBLE15), new Mediate('raw', LONG15)];
-
-  describe('validateType', () => {
-    it('validates raw', () => {
-      expect(Mediate.validateType('raw')).to.be.true;
-    });
-
-    it('validates prefixed', () => {
-      expect(Mediate.validateType('prefixed')).to.be.true;
-    });
-
-    it('validates fixedArray', () => {
-      expect(Mediate.validateType('fixedArray')).to.be.true;
-    });
-
-    it('validates array', () => {
-      expect(Mediate.validateType('array')).to.be.true;
-    });
-
-    it('throws an error on invalid types', () => {
-      expect(() => Mediate.validateType('noMatch')).to.throw(/noMatch/);
-    });
-  });
-
-  describe('offsetFor', () => {
-    it('thows an error when offset < 0', () => {
-      expect(() => Mediate.offsetFor([1], -1)).to.throw(/Invalid position/);
-    });
-
-    it('throws an error when offset >= length', () => {
-      expect(() => Mediate.offsetFor([1], 1)).to.throw(/Invalid position/);
-    });
-  });
-
-  describe('constructor', () => {
-    it('throws an error on invalid types', () => {
-      expect(() => new Mediate('noMatch', '1')).to.throw(/noMatch/);
-    });
-
-    it('sets the type of the object', () => {
-      expect((new Mediate('raw', '1')).type).to.equal('raw');
-    });
-
-    it('sets the value of the object', () => {
-      expect((new Mediate('raw', '1')).value).to.equal('1');
-    });
-  });
-
-  describe('initLength', () => {
-    it('returns correct variable byte length for raw', () => {
-      expect(new Mediate('raw', DOUBLE15).initLength()).to.equal(64);
-    });
-
-    it('returns correct fixed byte length for array', () => {
-      expect(new Mediate('array', [1, 2, 3, 4]).initLength()).to.equal(32);
-    });
-
-    it('returns correct fixed byte length for prefixed', () => {
-      expect(new Mediate('prefixed', 0).initLength()).to.equal(32);
-    });
-
-    it('returns correct variable byte length for fixedArray', () => {
-      expect(new Mediate('fixedArray', ARRAY).initLength()).to.equal(96);
-    });
-  });
-
-  describe('closingLength', () => {
-    it('returns 0 byte length for raw', () => {
-      expect(new Mediate('raw', DOUBLE15).closingLength()).to.equal(0);
-    });
-
-    it('returns prefix + size for prefixed', () => {
-      expect(new Mediate('prefixed', DOUBLE15).closingLength()).to.equal(64);
-    });
-
-    it('returns prefix + size for array', () => {
-      expect(new Mediate('array', ARRAY).closingLength()).to.equal(128);
-    });
-
-    it('returns total length for fixedArray', () => {
-      expect(new Mediate('fixedArray', ARRAY).closingLength()).to.equal(96);
-    });
-  });
-});
diff --git a/js/src/abi/index.js b/js/src/abi/index.js
deleted file mode 100644
index 703ed1c7884ecfbaf917f28799d1b75fb980df1d..0000000000000000000000000000000000000000
--- a/js/src/abi/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './abi';
diff --git a/js/src/abi/spec/constructor.js b/js/src/abi/spec/constructor.js
deleted file mode 100644
index e9b23b593df2dfc38d3878ba7d5d49b6abefbadc..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/constructor.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Encoder from '../encoder/encoder';
-import Param from './param';
-
-export default class Constructor {
-  constructor (abi) {
-    this._inputs = Param.toParams(abi.inputs || []);
-  }
-
-  get inputs () {
-    return this._inputs;
-  }
-
-  inputParamTypes () {
-    return this._inputs.map((input) => input.kind);
-  }
-
-  encodeCall (tokens) {
-    return Encoder.encode(tokens);
-  }
-}
diff --git a/js/src/abi/spec/constructor.spec.js b/js/src/abi/spec/constructor.spec.js
deleted file mode 100644
index 7c7414bdc8a6422f1df35377e9cff25fcd90a2d2..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/constructor.spec.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Constructor from './constructor';
-import Param from './param';
-import Token from '../token';
-
-describe('abi/spec/Constructor', () => {
-  const inputsArr = [{ name: 'boolin', type: 'bool' }, { name: 'stringin', type: 'string' }];
-  const bool = new Param('boolin', 'bool');
-  const string = new Param('stringin', 'string');
-
-  const inputs = [bool, string];
-  const cr = new Constructor({ inputs: inputsArr });
-
-  describe('constructor', () => {
-    it('stores the inputs as received', () => {
-      expect(cr.inputs).to.deep.equal(inputs);
-    });
-
-    it('matches empty inputs with []', () => {
-      expect(new Constructor({}).inputs).to.deep.equal([]);
-    });
-  });
-
-  describe('inputParamTypes', () => {
-    it('retrieves the input types as received', () => {
-      expect(cr.inputParamTypes()).to.deep.equal([bool.kind, string.kind]);
-    });
-  });
-
-  describe('encodeCall', () => {
-    it('encodes correctly', () => {
-      const result = cr.encodeCall([new Token('bool', true), new Token('string', 'jacogr')]);
-
-      expect(result).to.equal('0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000066a61636f67720000000000000000000000000000000000000000000000000000');
-    });
-  });
-});
diff --git a/js/src/abi/spec/event/decodedLog.js b/js/src/abi/spec/event/decodedLog.js
deleted file mode 100644
index e398c5a1bf552cee88cf7d6e33aa103a428da1ec..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/event/decodedLog.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default class DecodedLog {
-  constructor (params, address) {
-    this._params = params;
-    this._address = address;
-  }
-
-  get address () {
-    return this._address;
-  }
-
-  get params () {
-    return this._params;
-  }
-}
diff --git a/js/src/abi/spec/event/decodedLog.spec.js b/js/src/abi/spec/event/decodedLog.spec.js
deleted file mode 100644
index f448af011c0afbb42a8b5adde8f3e52ed5c0298c..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/event/decodedLog.spec.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import DecodedLog from './decodedLog';
-
-const log = new DecodedLog('someParams', 'someAddress');
-
-describe('abi/spec/event/DecodedLog', () => {
-  describe('constructor', () => {
-    it('sets internal state', () => {
-      expect(log.params).to.equal('someParams');
-      expect(log.address).to.equal('someAddress');
-    });
-  });
-});
diff --git a/js/src/abi/spec/event/decodedLogParam.js b/js/src/abi/spec/event/decodedLogParam.js
deleted file mode 100644
index 422fbaac84fa03facdfcfc82bc4a4070f9c2a7f3..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/event/decodedLogParam.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ParamType from '../paramType/paramType';
-import Token from '../../token/token';
-import { isInstanceOf } from '../../util/types';
-
-export default class DecodedLogParam {
-  constructor (name, kind, token) {
-    if (!isInstanceOf(kind, ParamType)) {
-      throw new Error('kind not instanceof ParamType');
-    } else if (!isInstanceOf(token, Token)) {
-      throw new Error('token not instanceof Token');
-    }
-
-    this._name = name;
-    this._kind = kind;
-    this._token = token;
-  }
-
-  get name () {
-    return this._name;
-  }
-
-  get kind () {
-    return this._kind;
-  }
-
-  get token () {
-    return this._token;
-  }
-}
diff --git a/js/src/abi/spec/event/decodedLogParam.spec.js b/js/src/abi/spec/event/decodedLogParam.spec.js
deleted file mode 100644
index 6a7f5204495dfbdaec05d0f9d4f6c14c05379562..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/event/decodedLogParam.spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import DecodedLogParam from './decodedLogParam';
-import ParamType from '../paramType';
-import Token from '../../token';
-
-describe('abi/spec/event/DecodedLogParam', () => {
-  describe('constructor', () => {
-    const pt = new ParamType('bool');
-    const tk = new Token('bool');
-
-    it('disallows kind not instanceof ParamType', () => {
-      expect(() => new DecodedLogParam('test', 'param')).to.throw(/ParamType/);
-    });
-
-    it('disallows token not instanceof Token', () => {
-      expect(() => new DecodedLogParam('test', pt, 'token')).to.throw(/Token/);
-    });
-
-    it('stores all parameters received', () => {
-      const log = new DecodedLogParam('test', pt, tk);
-
-      expect(log.name).to.equal('test');
-      expect(log.kind).to.equal(pt);
-      expect(log.token).to.equal(tk);
-    });
-  });
-});
diff --git a/js/src/abi/spec/event/event.js b/js/src/abi/spec/event/event.js
deleted file mode 100644
index 604f58cb18b163b6bbe1da2ccda9f7196177a300..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/event/event.js
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Decoder from '../../decoder/decoder';
-import DecodedLog from './decodedLog';
-import DecodedLogParam from './decodedLogParam';
-import EventParam from './eventParam';
-import { asAddress } from '../../util/sliceAs';
-import { eventSignature } from '../../util/signature';
-
-export default class Event {
-  constructor (abi) {
-    this._inputs = EventParam.toEventParams(abi.inputs || []);
-    this._anonymous = !!abi.anonymous;
-
-    const { id, name, signature } = eventSignature(abi.name, this.inputParamTypes());
-
-    this._id = id;
-    this._name = name;
-    this._signature = signature;
-  }
-
-  get name () {
-    return this._name;
-  }
-
-  get id () {
-    return this._id;
-  }
-
-  get inputs () {
-    return this._inputs;
-  }
-
-  get anonymous () {
-    return this._anonymous;
-  }
-
-  get signature () {
-    return this._signature;
-  }
-
-  inputParamTypes () {
-    return this._inputs.map((input) => input.kind);
-  }
-
-  inputParamNames () {
-    return this._inputs.map((input) => input.name);
-  }
-
-  indexedParams (indexed) {
-    return this._inputs.filter((input) => input.indexed === indexed);
-  }
-
-  decodeLog (topics, data) {
-    const topicParams = this.indexedParams(true);
-    const dataParams = this.indexedParams(false);
-
-    let address;
-    let toSkip;
-
-    if (!this.anonymous) {
-      address = asAddress(topics[0]);
-      toSkip = 1;
-    } else {
-      toSkip = 0;
-    }
-
-    const topicTypes = topicParams.map((param) => param.kind);
-    const flatTopics = topics
-      .filter((topic, idx) => idx >= toSkip)
-      .map((topic) => {
-        return (topic.substr(0, 2) === '0x')
-          ? topic.substr(2)
-          : topic;
-      }).join('');
-    const topicTokens = Decoder.decode(topicTypes, flatTopics);
-
-    if (topicTokens.length !== (topics.length - toSkip)) {
-      throw new Error('Invalid topic data');
-    }
-
-    const dataTypes = dataParams.map((param) => param.kind);
-    const dataTokens = Decoder.decode(dataTypes, data);
-
-    const namedTokens = {};
-
-    topicParams.forEach((param, idx) => {
-      namedTokens[param.name || idx] = topicTokens[idx];
-    });
-    dataParams.forEach((param, idx) => {
-      namedTokens[param.name || idx] = dataTokens[idx];
-    });
-
-    const inputParamTypes = this.inputParamTypes();
-    const decodedParams = this.inputParamNames()
-      .map((name, idx) => new DecodedLogParam(name, inputParamTypes[idx], namedTokens[name || idx]));
-
-    return new DecodedLog(decodedParams, address);
-  }
-}
diff --git a/js/src/abi/spec/event/event.spec.js b/js/src/abi/spec/event/event.spec.js
deleted file mode 100644
index bf47980fc6441631ffc07a32ab885ac918abbde0..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/event/event.spec.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import Event from './event';
-import EventParam from './eventParam';
-import DecodedLogParam from './decodedLogParam';
-import ParamType from '../paramType';
-import Token from '../../token';
-
-describe('abi/spec/event/Event', () => {
-  const inputArr = [{ name: 'a', type: 'bool' }, { name: 'b', type: 'uint', indexed: true }];
-  const inputs = [new EventParam('a', 'bool', false), new EventParam('b', 'uint', true)];
-  const event = new Event({ name: 'test', inputs: inputArr, anonymous: true });
-
-  describe('constructor', () => {
-    it('stores the parameters as received', () => {
-      expect(event.name).to.equal('test');
-      expect(event.inputs).to.deep.equal(inputs);
-      expect(event.anonymous).to.be.true;
-    });
-
-    it('matches empty inputs with []', () => {
-      expect(new Event({ name: 'test' }).inputs).to.deep.equal([]);
-    });
-
-    it('sets the event signature', () => {
-      expect(new Event({ name: 'baz' }).signature)
-        .to.equal('a7916fac4f538170f7cd12c148552e2cba9fcd72329a2dd5b07a6fa906488ddf');
-    });
-  });
-
-  describe('inputParamTypes', () => {
-    it('returns all the types', () => {
-      expect(event.inputParamTypes()).to.deep.equal([new ParamType('bool'), new ParamType('uint', null, 256, true)]);
-    });
-  });
-
-  describe('inputParamNames', () => {
-    it('returns all the names', () => {
-      expect(event.inputParamNames()).to.deep.equal(['a', 'b']);
-    });
-  });
-
-  describe('indexedParams', () => {
-    it('returns all indexed parameters (indexed)', () => {
-      expect(event.indexedParams(true)).to.deep.equal([inputs[1]]);
-    });
-
-    it('returns all indexed parameters (non-indexed)', () => {
-      expect(event.indexedParams(false)).to.deep.equal([inputs[0]]);
-    });
-  });
-
-  describe('decodeLog', () => {
-    it('decodes an event', () => {
-      const event = new Event({
-        name: 'foo',
-        inputs: [
-          { name: 'a', type: 'int' },
-          { name: 'b', type: 'int', indexed: true },
-          { name: 'c', type: 'address' },
-          { name: 'd', type: 'address', indexed: true }
-        ]
-      });
-      const decoded = event.decodeLog([
-        '0000000000000000000000004444444444444444444444444444444444444444',
-        '0000000000000000000000000000000000000000000000000000000000000002',
-        '0000000000000000000000001111111111111111111111111111111111111111' ],
-        '00000000000000000000000000000000000000000000000000000000000000030000000000000000000000002222222222222222222222222222222222222222');
-
-      expect(decoded.address).to.equal('0x4444444444444444444444444444444444444444');
-      expect(decoded.params).to.deep.equal([
-        new DecodedLogParam('a', new ParamType('int', null, 256), new Token('int', new BigNumber(3))),
-        new DecodedLogParam('b', new ParamType('int', null, 256, true), new Token('int', new BigNumber(2))),
-        new DecodedLogParam('c', new ParamType('address'), new Token('address', '0x2222222222222222222222222222222222222222')),
-        new DecodedLogParam('d', new ParamType('address', null, 0, true), new Token('address', '0x1111111111111111111111111111111111111111'))
-      ]);
-    });
-
-    it('decodes an anonymous event', () => {
-      const event = new Event({ name: 'foo', inputs: [{ name: 'a', type: 'int' }], anonymous: true });
-      const decoded = event.decodeLog([], '0000000000000000000000000000000000000000000000000000000000000003');
-
-      expect(decoded.address).to.not.be.ok;
-      expect(decoded.params).to.deep.equal([
-        new DecodedLogParam('a', new ParamType('int', null, 256), new Token('int', new BigNumber(3)))
-      ]);
-    });
-
-    it('throws on invalid topics', () => {
-      const event = new Event({ name: 'foo', inputs: [{ name: 'a', type: 'int' }], anonymous: true });
-
-      expect(() => event.decodeLog(['0000000000000000000000004444444444444444444444444444444444444444'], '0000000000000000000000000000000000000000000000000000000000000003')).to.throw(/Invalid/);
-    });
-  });
-});
diff --git a/js/src/abi/spec/event/eventParam.js b/js/src/abi/spec/event/eventParam.js
deleted file mode 100644
index b49b778141183c8be180ae0a141f2975a3492a4c..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/event/eventParam.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { toParamType } from '../paramType/format';
-
-export default class EventParam {
-  constructor (name, type, indexed = false) {
-    this._name = name;
-    this._indexed = indexed;
-    this._kind = toParamType(type, indexed);
-  }
-
-  get name () {
-    return this._name;
-  }
-
-  get kind () {
-    return this._kind;
-  }
-
-  get indexed () {
-    return this._indexed;
-  }
-
-  static toEventParams (params) {
-    return params.map((param) => new EventParam(param.name, param.type, param.indexed));
-  }
-}
diff --git a/js/src/abi/spec/event/eventParam.spec.js b/js/src/abi/spec/event/eventParam.spec.js
deleted file mode 100644
index e35ebcebcce2f87d890670544c176a8fab3f75c7..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/event/eventParam.spec.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import EventParam from './eventParam';
-
-describe('abi/spec/event/EventParam', () => {
-  describe('constructor', () => {
-    it('sets the properties', () => {
-      const param = new EventParam('foo', 'uint', true);
-
-      expect(param.name).to.equal('foo');
-      expect(param.kind.type).to.equal('uint');
-      expect(param.indexed).to.be.true;
-    });
-
-    it('uses defaults for indexed', () => {
-      expect(new EventParam('foo', 'uint').indexed).to.be.false;
-    });
-  });
-
-  describe('toEventParams', () => {
-    it('maps an array of params', () => {
-      const params = EventParam.toEventParams([{ name: 'foo', type: 'uint' }]);
-
-      expect(params.length).to.equal(1);
-      expect(params[0].indexed).to.be.false;
-      expect(params[0].name).to.equal('foo');
-      expect(params[0].kind.type).to.equal('uint');
-    });
-  });
-});
diff --git a/js/src/abi/spec/event/index.js b/js/src/abi/spec/event/index.js
deleted file mode 100644
index 25441954b4837428bc895fc61c48f5f81cd24e58..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/event/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './event';
diff --git a/js/src/abi/spec/function.js b/js/src/abi/spec/function.js
deleted file mode 100644
index 6010f4e598f898c980a389f810057c2c893e21af..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/function.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Decoder from '../decoder/decoder';
-import Encoder from '../encoder/encoder';
-import Param from './param';
-import { methodSignature } from '../util/signature';
-
-export default class Func {
-  constructor (abi) {
-    this._abi = abi;
-    this._constant = !!abi.constant;
-    this._payable = abi.payable;
-    this._inputs = Param.toParams(abi.inputs || []);
-    this._outputs = Param.toParams(abi.outputs || []);
-
-    const { id, name, signature } = methodSignature(abi.name, this.inputParamTypes());
-
-    this._id = id;
-    this._name = name;
-    this._signature = signature;
-  }
-
-  get abi () {
-    return this._abi;
-  }
-
-  get constant () {
-    return this._constant;
-  }
-
-  get name () {
-    return this._name;
-  }
-
-  get id () {
-    return this._id;
-  }
-
-  get payable () {
-    return this._payable;
-  }
-
-  get inputs () {
-    return this._inputs;
-  }
-
-  get outputs () {
-    return this._outputs;
-  }
-
-  get signature () {
-    return this._signature;
-  }
-
-  inputParamTypes () {
-    return this._inputs.map((input) => input.kind);
-  }
-
-  outputParamTypes () {
-    return this._outputs.map((output) => output.kind);
-  }
-
-  encodeCall (tokens) {
-    return `${this._signature}${Encoder.encode(tokens)}`;
-  }
-
-  decodeInput (data) {
-    return Decoder.decode(this.inputParamTypes(), data);
-  }
-
-  decodeOutput (data) {
-    return Decoder.decode(this.outputParamTypes(), data);
-  }
-}
diff --git a/js/src/abi/spec/function.spec.js b/js/src/abi/spec/function.spec.js
deleted file mode 100644
index 436ca73650b1cf1014bbfb6d54f9a04001a8aa24..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/function.spec.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Func from './function';
-import Param from './param';
-import Token from '../token';
-
-describe('abi/spec/Function', () => {
-  const inputsArr = [{ name: 'boolin', type: 'bool' }, { name: 'stringin', type: 'string' }];
-  const outputsArr = [{ name: 'output', type: 'uint' }];
-
-  const uint = new Param('output', 'uint');
-  const bool = new Param('boolin', 'bool');
-  const string = new Param('stringin', 'string');
-  const inputs = [bool, string];
-  const outputs = [uint];
-
-  const func = new Func({
-    name: 'test',
-    inputs: inputsArr,
-    outputs: outputsArr
-  });
-
-  describe('constructor', () => {
-    it('returns signature correctly if name already contains it', () => {
-      const func = new Func({
-        name: 'test(bool,string)',
-        inputs: inputsArr,
-        outputs: outputsArr
-      });
-
-      expect(func.name).to.equal('test');
-      expect(func.id).to.equal('test(bool,string)');
-      expect(func.signature).to.equal('02356205');
-    });
-
-    it('stores the parameters as received', () => {
-      expect(func.name).to.equal('test');
-      expect(func.constant).to.be.false;
-      expect(func.inputs).to.deep.equal(inputs);
-      expect(func.outputs).to.deep.equal(outputs);
-    });
-
-    it('matches empty inputs with []', () => {
-      expect(new Func({ name: 'test', outputs: outputsArr }).inputs).to.deep.equal([]);
-    });
-
-    it('matches empty outputs with []', () => {
-      expect(new Func({ name: 'test', inputs: inputsArr }).outputs).to.deep.equal([]);
-    });
-
-    it('sets the method signature', () => {
-      expect(new Func({ name: 'baz' }).signature).to.equal('a7916fac');
-    });
-
-    it('allows constant functions', () => {
-      expect(new Func({ name: 'baz', constant: true }).constant).to.be.true;
-    });
-  });
-
-  describe('inputParamTypes', () => {
-    it('retrieves the input types as received', () => {
-      expect(func.inputParamTypes()).to.deep.equal([bool.kind, string.kind]);
-    });
-  });
-
-  describe('outputParamTypes', () => {
-    it('retrieves the output types as received', () => {
-      expect(func.outputParamTypes()).to.deep.equal([uint.kind]);
-    });
-  });
-
-  describe('encodeCall', () => {
-    it('encodes the call correctly', () => {
-      const result = func.encodeCall([new Token('bool', true), new Token('string', 'jacogr')]);
-
-      expect(result).to.equal('023562050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000066a61636f67720000000000000000000000000000000000000000000000000000');
-    });
-  });
-
-  describe('decodeOutput', () => {
-    it('decodes the result correctly', () => {
-      const result = func.decodeOutput('1111111111111111111111111111111111111111111111111111111111111111');
-
-      expect(result[0].value.toString(16)).to.equal('1111111111111111111111111111111111111111111111111111111111111111');
-    });
-  });
-});
diff --git a/js/src/abi/spec/index.js b/js/src/abi/spec/index.js
deleted file mode 100644
index 87852d4880307162ae8dd143843878be5c7077b8..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './interface';
diff --git a/js/src/abi/spec/interface.js b/js/src/abi/spec/interface.js
deleted file mode 100644
index b24569525dbf4b8def78debea25fab04a56eaea1..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/interface.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Constructor from './constructor';
-import Event from './event/event';
-import Func from './function';
-import Token from '../token';
-
-export default class Interface {
-  constructor (abi) {
-    this._interface = Interface.parseABI(abi);
-  }
-
-  get interface () {
-    return this._interface;
-  }
-
-  get constructors () {
-    return this._interface.filter((item) => item instanceof Constructor);
-  }
-
-  get events () {
-    return this._interface.filter((item) => item instanceof Event);
-  }
-
-  get functions () {
-    return this._interface.filter((item) => item instanceof Func);
-  }
-
-  encodeTokens (paramTypes, values) {
-    return Interface.encodeTokens(paramTypes, values);
-  }
-
-  static encodeTokens (paramTypes, values) {
-    const createToken = function (paramType, value) {
-      if (paramType.subtype) {
-        return new Token(paramType.type, value.map((entry) => createToken(paramType.subtype, entry)));
-      }
-
-      return new Token(paramType.type, value);
-    };
-
-    return paramTypes.map((paramType, idx) => createToken(paramType, values[idx]));
-  }
-
-  static parseABI (abi) {
-    return abi.map((item) => {
-      switch (item.type) {
-        case 'constructor':
-          return new Constructor(item);
-
-        case 'event':
-          return new Event(item);
-
-        case 'function':
-        case 'fallback':
-          return new Func(item);
-
-        default:
-          throw new Error(`Unknown ABI type ${item.type}`);
-      }
-    });
-  }
-}
diff --git a/js/src/abi/spec/interface.spec.js b/js/src/abi/spec/interface.spec.js
deleted file mode 100644
index ebaa323ed526644517e06eb55e696466f82f0019..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/interface.spec.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Interface from './interface';
-import ParamType from './paramType';
-import Token from '../token';
-
-describe('abi/spec/Interface', () => {
-  const construct = {
-    type: 'constructor',
-    inputs: []
-  };
-  const event = {
-    type: 'event',
-    name: 'Event2',
-    anonymous: false,
-    inputs: [{ name: 'a', type: 'uint256', indexed: true }, { name: 'b', type: 'bytes32', indexed: false }]
-  };
-  const func = {
-    type: 'function',
-    name: 'foo',
-    inputs: [{ name: 'a', type: 'uint256' }],
-    outputs: []
-  };
-
-  describe('parseABI', () => {
-    it('throws on invalid types', () => {
-      expect(() => Interface.parseABI([{ type: 'noMatch' }])).to.throw(/noMatch/);
-    });
-
-    it('creates constructors', () => {
-      expect(Interface.parseABI([ construct ])).to.deep.equal([{ _inputs: [] }]);
-    });
-
-    it('creates events', () => {
-      expect(Interface.parseABI([ event ])[0].name).to.equal('Event2');
-    });
-
-    it('creates functions', () => {
-      expect(Interface.parseABI([ func ])[0].name).to.equal('foo');
-    });
-
-    it('parse complex interfaces', () => {
-      expect(Interface.parseABI([ construct, event, func ]).length).to.equal(3);
-    });
-  });
-
-  describe('constructor', () => {
-    const int = new Interface([ construct, event, func ]);
-
-    it('contains the full interface', () => {
-      expect(int.interface.length).to.equal(3);
-    });
-
-    it('contains the constructors', () => {
-      expect(int.constructors.length).to.equal(1);
-    });
-
-    it('contains the events', () => {
-      expect(int.events.length).to.equal(1);
-    });
-
-    it('contains the functions', () => {
-      expect(int.functions.length).to.equal(1);
-    });
-  });
-
-  describe('encodeTokens', () => {
-    const int = new Interface([ construct, event, func ]);
-
-    it('encodes simple types', () => {
-      expect(
-        int.encodeTokens(
-          [new ParamType('bool'), new ParamType('string'), new ParamType('int'), new ParamType('uint')],
-          [true, 'gavofyork', -123, 123]
-        )
-      ).to.deep.equal([
-        new Token('bool', true), new Token('string', 'gavofyork'), new Token('int', -123), new Token('uint', 123)
-      ]);
-    });
-
-    it('encodes array', () => {
-      expect(
-        int.encodeTokens(
-          [new ParamType('array', new ParamType('bool'))],
-          [[true, false, true]]
-        )
-      ).to.deep.equal([
-        new Token('array', [
-          new Token('bool', true), new Token('bool', false), new Token('bool', true)
-        ])
-      ]);
-    });
-
-    it('encodes simple with array of array', () => {
-      expect(
-        int.encodeTokens(
-          [
-            new ParamType('bool'),
-            new ParamType('fixedArray', new ParamType('array', new ParamType('uint')), 2)
-          ],
-          [true, [[0, 1], [2, 3]]]
-        )
-      ).to.deep.equal([
-        new Token('bool', true),
-        new Token('fixedArray', [
-          new Token('array', [new Token('uint', 0), new Token('uint', 1)]),
-          new Token('array', [new Token('uint', 2), new Token('uint', 3)])
-        ])
-      ]);
-    });
-  });
-});
diff --git a/js/src/abi/spec/param.js b/js/src/abi/spec/param.js
deleted file mode 100644
index e02b99100389273b68f79835855bd2540ec2efa1..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/param.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { toParamType } from './paramType/format';
-
-export default class Param {
-  constructor (name, type) {
-    this._name = name;
-    this._kind = toParamType(type);
-  }
-
-  get name () {
-    return this._name;
-  }
-
-  get kind () {
-    return this._kind;
-  }
-
-  static toParams (params) {
-    return params.map((param) => {
-      if (param instanceof Param) {
-        return param;
-      }
-
-      return new Param(param.name, param.type);
-    });
-  }
-}
diff --git a/js/src/abi/spec/param.spec.js b/js/src/abi/spec/param.spec.js
deleted file mode 100644
index 0ecdb0319b19d08a766b55c9bdbf33a3f00b99fc..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/param.spec.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Param from './param';
-
-describe('abi/spec/Param', () => {
-  describe('constructor', () => {
-    const param = new Param('foo', 'uint');
-
-    it('sets the properties', () => {
-      expect(param.name).to.equal('foo');
-      expect(param.kind.type).to.equal('uint');
-    });
-  });
-
-  describe('toParams', () => {
-    it('maps an array of params', () => {
-      const params = Param.toParams([{ name: 'foo', type: 'uint' }]);
-
-      expect(params.length).to.equal(1);
-      expect(params[0].name).to.equal('foo');
-      expect(params[0].kind.type).to.equal('uint');
-    });
-
-    it('converts only if needed', () => {
-      const _params = Param.toParams([{ name: 'foo', type: 'uint' }]);
-      const params = Param.toParams(_params);
-
-      expect(params.length).to.equal(1);
-      expect(params[0].name).to.equal('foo');
-      expect(params[0].kind.type).to.equal('uint');
-    });
-  });
-});
diff --git a/js/src/abi/spec/paramType/format.js b/js/src/abi/spec/paramType/format.js
deleted file mode 100644
index 5aafd5e3070cdc47eaa27ba9ef4ea2e62419aad4..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/paramType/format.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ParamType from './paramType';
-
-export function toParamType (type, indexed) {
-  if (type[type.length - 1] === ']') {
-    const last = type.lastIndexOf('[');
-    const length = type.substr(last + 1, type.length - last - 2);
-    const subtype = toParamType(type.substr(0, last));
-
-    if (length.length === 0) {
-      return new ParamType('array', subtype, 0, indexed);
-    }
-
-    return new ParamType('fixedArray', subtype, parseInt(length, 10), indexed);
-  }
-
-  switch (type) {
-    case 'address':
-    case 'bool':
-    case 'bytes':
-    case 'string':
-      return new ParamType(type, null, 0, indexed);
-
-    case 'int':
-    case 'uint':
-      return new ParamType(type, null, 256, indexed);
-
-    default:
-      if (type.indexOf('uint') === 0) {
-        return new ParamType('uint', null, parseInt(type.substr(4), 10), indexed);
-      } else if (type.indexOf('int') === 0) {
-        return new ParamType('int', null, parseInt(type.substr(3), 10), indexed);
-      } else if (type.indexOf('bytes') === 0) {
-        return new ParamType('fixedBytes', null, parseInt(type.substr(5), 10), indexed);
-      }
-
-      throw new Error(`Cannot convert ${type} to valid ParamType`);
-  }
-}
-
-export function fromParamType (paramType) {
-  switch (paramType.type) {
-    case 'address':
-    case 'bool':
-    case 'bytes':
-    case 'string':
-      return paramType.type;
-
-    case 'int':
-    case 'uint':
-      return `${paramType.type}${paramType.length}`;
-
-    case 'fixedBytes':
-      return `bytes${paramType.length}`;
-
-    case 'fixedArray':
-      return `${fromParamType(paramType.subtype)}[${paramType.length}]`;
-
-    case 'array':
-      return `${fromParamType(paramType.subtype)}[]`;
-
-    default:
-      throw new Error(`Cannot convert from ParamType ${paramType.type}`);
-  }
-}
diff --git a/js/src/abi/spec/paramType/format.spec.js b/js/src/abi/spec/paramType/format.spec.js
deleted file mode 100644
index cb000473380546c50f4289119f95e30d840085a8..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/paramType/format.spec.js
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ParamType from './paramType';
-import { fromParamType, toParamType } from './format';
-
-describe('abi/spec/paramType/format', () => {
-  describe('fromParamType', () => {
-    it('errors on invalid types', () => {
-      expect(() => fromParamType({ type: 'noMatch' })).to.throw(/noMatch/);
-    });
-
-    describe('simple types', () => {
-      it('converts address to address', () => {
-        const pt = new ParamType('address');
-
-        expect(fromParamType(pt)).to.equal('address');
-      });
-
-      it('converts bool to bool', () => {
-        const pt = new ParamType('bool');
-
-        expect(fromParamType(pt)).to.equal('bool');
-      });
-
-      it('converts bytes to bytes', () => {
-        const pt = new ParamType('bytes');
-
-        expect(fromParamType(pt)).to.equal('bytes');
-      });
-
-      it('converts string to string', () => {
-        const pt = new ParamType('string');
-
-        expect(fromParamType(pt)).to.equal('string');
-      });
-    });
-
-    describe('length types', () => {
-      it('converts int32 to int32', () => {
-        const pt = new ParamType('int', null, 32);
-
-        expect(fromParamType(pt)).to.equal('int32');
-      });
-
-      it('converts uint64 to int64', () => {
-        const pt = new ParamType('uint', null, 64);
-
-        expect(fromParamType(pt)).to.equal('uint64');
-      });
-
-      it('converts fixedBytes8 to bytes8', () => {
-        const pt = new ParamType('fixedBytes', null, 8);
-
-        expect(fromParamType(pt)).to.equal('bytes8');
-      });
-    });
-
-    describe('arrays', () => {
-      it('converts string[2] to string[2]', () => {
-        const pt = new ParamType('fixedArray', new ParamType('string'), 2);
-
-        expect(fromParamType(pt)).to.equal('string[2]');
-      });
-
-      it('converts bool[] to bool[]', () => {
-        const pt = new ParamType('array', new ParamType('bool'));
-
-        expect(fromParamType(pt)).to.equal('bool[]');
-      });
-
-      it('converts bool[][2] to bool[][2]', () => {
-        const pt = new ParamType('fixedArray', new ParamType('array', new ParamType('bool')), 2);
-
-        expect(fromParamType(pt)).to.equal('bool[][2]');
-      });
-
-      it('converts bool[2][] to bool[2][]', () => {
-        const pt = new ParamType('array', new ParamType('fixedArray', new ParamType('bool'), 2));
-
-        expect(fromParamType(pt)).to.equal('bool[2][]');
-      });
-    });
-  });
-
-  describe('toParamType', () => {
-    it('errors on invalid types', () => {
-      expect(() => toParamType('noMatch')).to.throw(/noMatch/);
-    });
-
-    describe('simple mapping', () => {
-      it('converts address to address', () => {
-        const pt = toParamType('address');
-
-        expect(pt.type).to.equal('address');
-      });
-
-      it('converts bool to bool', () => {
-        const pt = toParamType('bool');
-
-        expect(pt.type).to.equal('bool');
-      });
-
-      it('converts bytes to bytes', () => {
-        const pt = toParamType('bytes');
-
-        expect(pt.type).to.equal('bytes');
-      });
-
-      it('converts string to string', () => {
-        const pt = toParamType('string');
-
-        expect(pt.type).to.equal('string');
-      });
-    });
-
-    describe('number', () => {
-      it('converts int to int256', () => {
-        const pt = toParamType('int');
-
-        expect(pt.type).to.equal('int');
-        expect(pt.length).to.equal(256);
-      });
-
-      it('converts uint to uint256', () => {
-        const pt = toParamType('uint');
-
-        expect(pt.type).to.equal('uint');
-        expect(pt.length).to.equal(256);
-      });
-    });
-
-    describe('sized types', () => {
-      it('converts int32 to int32', () => {
-        const pt = toParamType('int32');
-
-        expect(pt.type).to.equal('int');
-        expect(pt.length).to.equal(32);
-      });
-
-      it('converts uint16 to uint16', () => {
-        const pt = toParamType('uint32');
-
-        expect(pt.type).to.equal('uint');
-        expect(pt.length).to.equal(32);
-      });
-
-      it('converts bytes8 to fixedBytes8', () => {
-        const pt = toParamType('bytes8');
-
-        expect(pt.type).to.equal('fixedBytes');
-        expect(pt.length).to.equal(8);
-      });
-    });
-
-    describe('arrays', () => {
-      describe('fixed arrays', () => {
-        it('creates fixed array', () => {
-          const pt = toParamType('bytes[8]');
-
-          expect(pt.type).to.equal('fixedArray');
-          expect(pt.subtype.type).to.equal('bytes');
-          expect(pt.length).to.equal(8);
-        });
-
-        it('creates fixed arrays of fixed arrays', () => {
-          const pt = toParamType('bytes[45][3]');
-
-          expect(pt.type).to.equal('fixedArray');
-          expect(pt.length).to.equal(3);
-          expect(pt.subtype.type).to.equal('fixedArray');
-          expect(pt.subtype.length).to.equal(45);
-          expect(pt.subtype.subtype.type).to.equal('bytes');
-        });
-      });
-
-      describe('dynamic arrays', () => {
-        it('creates a dynamic array', () => {
-          const pt = toParamType('bytes[]');
-
-          expect(pt.type).to.equal('array');
-          expect(pt.subtype.type).to.equal('bytes');
-        });
-
-        it('creates a dynamic array of dynamic arrays', () => {
-          const pt = toParamType('bool[][]');
-
-          expect(pt.type).to.equal('array');
-          expect(pt.subtype.type).to.equal('array');
-          expect(pt.subtype.subtype.type).to.equal('bool');
-        });
-      });
-
-      describe('mixed arrays', () => {
-        it('creates a fixed dynamic array', () => {
-          const pt = toParamType('bool[][3]');
-
-          expect(pt.type).to.equal('fixedArray');
-          expect(pt.length).to.equal(3);
-          expect(pt.subtype.type).to.equal('array');
-          expect(pt.subtype.subtype.type).to.equal('bool');
-        });
-
-        it('creates a dynamic fixed array', () => {
-          const pt = toParamType('bool[3][]');
-
-          expect(pt.type).to.equal('array');
-          expect(pt.subtype.type).to.equal('fixedArray');
-          expect(pt.subtype.length).to.equal(3);
-          expect(pt.subtype.subtype.type).to.equal('bool');
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/abi/spec/paramType/index.js b/js/src/abi/spec/paramType/index.js
deleted file mode 100644
index 123e198e8ea99cb0fe915794b3199dd135d2b2df..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/paramType/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './paramType';
diff --git a/js/src/abi/spec/paramType/paramType.js b/js/src/abi/spec/paramType/paramType.js
deleted file mode 100644
index b65465d94edd8171c57a989bfc178797ea0aad5f..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/paramType/paramType.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import TYPES from './types';
-
-export default class ParamType {
-  constructor (type, subtype = null, length = 0, indexed = false) {
-    ParamType.validateType(type);
-
-    this._type = type;
-    this._subtype = subtype;
-    this._length = length;
-    this._indexed = indexed;
-  }
-
-  get type () {
-    return this._type;
-  }
-
-  get subtype () {
-    return this._subtype;
-  }
-
-  get length () {
-    return this._length;
-  }
-
-  get indexed () {
-    return this._indexed;
-  }
-
-  static validateType (type) {
-    if (TYPES.filter((_type) => type === _type).length) {
-      return true;
-    }
-
-    throw new Error(`Invalid type ${type} received for ParamType`);
-  }
-}
diff --git a/js/src/abi/spec/paramType/paramType.spec.js b/js/src/abi/spec/paramType/paramType.spec.js
deleted file mode 100644
index dc71147211441a5991c9d3abe2cde6490bb72422..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/paramType/paramType.spec.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ParamType from './paramType';
-
-describe('abi/spec/paramType/ParamType', () => {
-  describe('validateType', () => {
-    it('validates address', () => {
-      expect(ParamType.validateType('address')).to.be.true;
-    });
-
-    it('validates fixedArray', () => {
-      expect(ParamType.validateType('fixedArray')).to.be.true;
-    });
-
-    it('validates array', () => {
-      expect(ParamType.validateType('array')).to.be.true;
-    });
-
-    it('validates fixedBytes', () => {
-      expect(ParamType.validateType('fixedBytes')).to.be.true;
-    });
-
-    it('validates bytes', () => {
-      expect(ParamType.validateType('bytes')).to.be.true;
-    });
-
-    it('validates bool', () => {
-      expect(ParamType.validateType('bool')).to.be.true;
-    });
-
-    it('validates int', () => {
-      expect(ParamType.validateType('int')).to.be.true;
-    });
-
-    it('validates uint', () => {
-      expect(ParamType.validateType('uint')).to.be.true;
-    });
-
-    it('validates string', () => {
-      expect(ParamType.validateType('string')).to.be.true;
-    });
-
-    it('throws an error on invalid types', () => {
-      expect(() => ParamType.validateType('noMatch')).to.throw(/noMatch/);
-    });
-  });
-
-  describe('constructor', () => {
-    it('throws an error on invalid types', () => {
-      expect(() => new ParamType('noMatch')).to.throw(/noMatch/);
-    });
-
-    it('sets the type of the object', () => {
-      expect((new ParamType('bool', null, 1)).type).to.equal('bool');
-    });
-
-    it('sets the subtype of the object', () => {
-      expect((new ParamType('array', 'bool', 1)).subtype).to.equal('bool');
-    });
-
-    it('sets the length of the object', () => {
-      expect((new ParamType('array', 'bool', 1)).length).to.equal(1);
-    });
-
-    it('sets the index of the object', () => {
-      expect((new ParamType('array', 'bool', 1, true)).indexed).to.be.true;
-    });
-
-    it('sets default values where none supplied', () => {
-      expect(Object.values(new ParamType('string'))).to.deep.equal(['string', null, 0, false]);
-    });
-  });
-});
diff --git a/js/src/abi/spec/paramType/types.js b/js/src/abi/spec/paramType/types.js
deleted file mode 100644
index e9749c5886fbb6787774b12c2af09482ca065944..0000000000000000000000000000000000000000
--- a/js/src/abi/spec/paramType/types.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const TYPES = ['address', 'bytes', 'int', 'uint', 'bool', 'string', 'array', 'fixedBytes', 'fixedArray'];
-
-export default TYPES;
diff --git a/js/src/abi/token/index.js b/js/src/abi/token/index.js
deleted file mode 100644
index 6a636c3c89f4314c14616993035b021746b517c5..0000000000000000000000000000000000000000
--- a/js/src/abi/token/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './token';
diff --git a/js/src/abi/token/token.js b/js/src/abi/token/token.js
deleted file mode 100644
index 7242248ab29272744cba03f25a812b8a67046875..0000000000000000000000000000000000000000
--- a/js/src/abi/token/token.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import TYPES from '../spec/paramType/types';
-
-export default class Token {
-  constructor (type, value) {
-    Token.validateType(type);
-
-    this._type = type;
-    this._value = value;
-  }
-
-  get type () {
-    return this._type;
-  }
-
-  get value () {
-    return this._value;
-  }
-
-  static validateType (type) {
-    if (TYPES.filter((_type) => type === _type).length) {
-      return true;
-    }
-
-    throw new Error(`Invalid type ${type} received for Token`);
-  }
-}
diff --git a/js/src/abi/token/token.spec.js b/js/src/abi/token/token.spec.js
deleted file mode 100644
index cf5fc51bf798a82da16b27a2e7ccace52c809f7c..0000000000000000000000000000000000000000
--- a/js/src/abi/token/token.spec.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Token from './token';
-
-describe('abi/token/token', () => {
-  describe('validateType', () => {
-    it('validates address', () => {
-      expect(Token.validateType('address')).to.be.true;
-    });
-
-    it('validates fixedArray', () => {
-      expect(Token.validateType('fixedArray')).to.be.true;
-    });
-
-    it('validates array', () => {
-      expect(Token.validateType('array')).to.be.true;
-    });
-
-    it('validates fixedBytes', () => {
-      expect(Token.validateType('fixedBytes')).to.be.true;
-    });
-
-    it('validates bytes', () => {
-      expect(Token.validateType('bytes')).to.be.true;
-    });
-
-    it('validates bool', () => {
-      expect(Token.validateType('bool')).to.be.true;
-    });
-
-    it('validates int', () => {
-      expect(Token.validateType('int')).to.be.true;
-    });
-
-    it('validates uint', () => {
-      expect(Token.validateType('uint')).to.be.true;
-    });
-
-    it('validates string', () => {
-      expect(Token.validateType('string')).to.be.true;
-    });
-
-    it('throws an error on invalid types', () => {
-      expect(() => Token.validateType('noMatch')).to.throw(/noMatch/);
-    });
-  });
-
-  describe('constructor', () => {
-    it('throws an error on invalid types', () => {
-      expect(() => new Token('noMatch', '1')).to.throw(/noMatch/);
-    });
-
-    it('sets the type of the object', () => {
-      expect((new Token('bool', '1')).type).to.equal('bool');
-    });
-
-    it('sets the value of the object', () => {
-      expect((new Token('bool', '1')).value).to.equal('1');
-    });
-  });
-});
diff --git a/js/src/abi/util/address.js b/js/src/abi/util/address.js
deleted file mode 100644
index c0153ee5daab229aadc18f0e21fe2e315b8ab33f..0000000000000000000000000000000000000000
--- a/js/src/abi/util/address.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { keccak_256 } from 'js-sha3'; // eslint-disable-line camelcase
-
-export function isChecksumValid (_address) {
-  const address = _address.replace('0x', '');
-  const hash = keccak_256(address.toLowerCase());
-
-  for (let n = 0; n < 40; n++) {
-    const char = address[n];
-    const isLower = char !== char.toUpperCase();
-    const isUpper = char !== char.toLowerCase();
-    const hashval = parseInt(hash[n], 16);
-
-    if ((hashval > 7 && isLower) || (hashval <= 7 && isUpper)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-export function isAddress (address) {
-  if (address && address.length === 42) {
-    if (!/^(0x)?[0-9a-f]{40}$/i.test(address)) {
-      return false;
-    } else if (/^(0x)?[0-9a-f]{40}$/.test(address) || /^(0x)?[0-9A-F]{40}$/.test(address)) {
-      return true;
-    }
-
-    return isChecksumValid(address);
-  }
-
-  return false;
-}
-
-export function toChecksumAddress (_address) {
-  const address = (_address || '').toLowerCase();
-
-  if (!isAddress(address)) {
-    return '';
-  }
-
-  const hash = keccak_256(address.slice(-40));
-  let result = '0x';
-
-  for (let n = 0; n < 40; n++) {
-    result = `${result}${parseInt(hash[n], 16) > 7 ? address[n + 2].toUpperCase() : address[n + 2]}`;
-  }
-
-  return result;
-}
diff --git a/js/src/abi/util/address.spec.js b/js/src/abi/util/address.spec.js
deleted file mode 100644
index 324ba163da9aa4a6d51d4263e9d6969a8e5b2b00..0000000000000000000000000000000000000000
--- a/js/src/abi/util/address.spec.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isChecksumValid, isAddress, toChecksumAddress } from './address';
-
-describe('abi/util/address', () => {
-  const value = '63Cf90D3f0410092FC0fca41846f596223979195';
-  const address = `0x${value}`;
-  const lowercase = `0x${value.toLowerCase()}`;
-  const uppercase = `0x${value.toUpperCase()}`;
-  const invalid = '0x' + value.split('').map((char) => {
-    if (char >= 'a' && char <= 'f') {
-      return char.toUpperCase();
-    } else if (char >= 'A' && char <= 'F') {
-      return char.toLowerCase();
-    }
-
-    return char;
-  }).join('');
-  const invalidhex = '0x01234567890123456789012345678901234567gh';
-
-  describe('isChecksumValid', () => {
-    it('returns false when fully lowercase', () => {
-      expect(isChecksumValid(lowercase)).to.be.false;
-    });
-
-    it('returns false when fully uppercase', () => {
-      expect(isChecksumValid(uppercase)).to.be.false;
-    });
-
-    it('returns false on a mixed-case address', () => {
-      expect(isChecksumValid(invalid)).to.be.false;
-    });
-
-    it('returns true on a checksummed address', () => {
-      expect(isChecksumValid(address)).to.be.true;
-    });
-  });
-
-  describe('isAddress', () => {
-    it('returns true when fully lowercase', () => {
-      expect(isAddress(lowercase)).to.be.true;
-    });
-
-    it('returns true when fully uppercase', () => {
-      expect(isAddress(uppercase)).to.be.true;
-    });
-
-    it('returns true when checksummed', () => {
-      expect(isAddress(address)).to.be.true;
-    });
-
-    it('returns false when invalid checksum', () => {
-      expect(isAddress(invalid)).to.be.false;
-    });
-
-    it('returns false on valid length, non-hex', () => {
-      expect(isAddress(invalidhex)).to.be.false;
-    });
-  });
-
-  describe('toChecksumAddress', () => {
-    it('returns empty when no address specified', () => {
-      expect(toChecksumAddress()).to.equal('');
-    });
-
-    it('returns empty on invalid address structure', () => {
-      expect(toChecksumAddress('0xnotaddress')).to.equal('');
-    });
-
-    it('returns formatted address on checksum input', () => {
-      expect(toChecksumAddress(address)).to.equal(address);
-    });
-
-    it('returns formatted address on lowercase input', () => {
-      expect(toChecksumAddress(lowercase)).to.equal(address);
-    });
-
-    it('returns formatted address on uppercase input', () => {
-      expect(toChecksumAddress(uppercase)).to.equal(address);
-    });
-
-    it('returns formatted address on mixed input', () => {
-      expect(toChecksumAddress(invalid)).to.equal(address);
-    });
-  });
-});
diff --git a/js/src/abi/util/pad.js b/js/src/abi/util/pad.js
deleted file mode 100644
index 476a27445e2e3db3a1e0613e4c00a84470b9c2e6..0000000000000000000000000000000000000000
--- a/js/src/abi/util/pad.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import utf8 from 'utf8';
-
-import { isArray } from './types';
-
-const ZERO_64 = '0000000000000000000000000000000000000000000000000000000000000000';
-
-export function padAddress (_input) {
-  const input = _input.substr(0, 2) === '0x' ? _input.substr(2) : _input;
-
-  return `${ZERO_64}${input}`.slice(-64);
-}
-
-export function padBool (input) {
-  return `${ZERO_64}${input ? '1' : '0'}`.slice(-64);
-}
-
-export function padU32 (input) {
-  let bn = new BigNumber(input);
-
-  if (bn.lessThan(0)) {
-    bn = new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16)
-      .plus(bn).plus(1);
-  }
-
-  return `${ZERO_64}${bn.toString(16)}`.slice(-64);
-}
-
-function stringToBytes (input) {
-  if (isArray(input)) {
-    return input;
-  } else if (input.substr(0, 2) === '0x') {
-    const matches = input.substr(2).toLowerCase().match(/.{1,2}/g) || [];
-
-    return matches.map((value) => parseInt(value, 16));
-  } else {
-    return input.split('').map((char) => char.charCodeAt(0));
-  }
-}
-
-export function padBytes (_input) {
-  const input = stringToBytes(_input);
-
-  return `${padU32(input.length)}${padFixedBytes(input)}`;
-}
-
-export function padFixedBytes (_input) {
-  const input = stringToBytes(_input);
-  const sinput = input.map((code) => `0${code.toString(16)}`.slice(-2)).join('');
-  const max = Math.floor((sinput.length + 63) / 64) * 64;
-
-  return `${sinput}${ZERO_64}`.substr(0, max);
-}
-
-export function padString (input) {
-  const array = utf8.encode(input)
-    .split('')
-    .map((char) => char.charCodeAt(0));
-
-  return padBytes(array);
-}
diff --git a/js/src/abi/util/pad.spec.js b/js/src/abi/util/pad.spec.js
deleted file mode 100644
index 74463b438c1ea0801bf42fe79aca2a44148ead6f..0000000000000000000000000000000000000000
--- a/js/src/abi/util/pad.spec.js
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { padAddress, padBool, padBytes, padFixedBytes, padString, padU32 } from './pad';
-
-describe('abi/util/pad', () => {
-  const SHORT15 = '1234567890abcdef';
-  const BYTES15 = [0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef];
-  const LONG15 = `${SHORT15}000000000000000000000000000000000000000000000000`;
-  const PAD123 = '0000000000000000000000000000000000000000000000000000000000000123';
-
-  describe('padAddress', () => {
-    it('pads to 64 characters', () => {
-      expect(padAddress('123')).to.equal(PAD123);
-    });
-
-    it('strips leading 0x when passed in', () => {
-      expect(padFixedBytes(`0x${PAD123}`)).to.equal(PAD123);
-    });
-  });
-
-  describe('padBool', () => {
-    const TRUE = '0000000000000000000000000000000000000000000000000000000000000001';
-    const FALSE = '0000000000000000000000000000000000000000000000000000000000000000';
-
-    it('pads true to 64 characters', () => {
-      expect(padBool(true)).to.equal(TRUE);
-    });
-
-    it('pads false to 64 characters', () => {
-      expect(padBool(false)).to.equal(FALSE);
-    });
-  });
-
-  describe('padU32', () => {
-    it('left pads length < 64 bytes to 64 bytes', () => {
-      expect(padU32(1)).to.equal('0000000000000000000000000000000000000000000000000000000000000001');
-    });
-
-    it('pads hex representation', () => {
-      expect(padU32(0x123)).to.equal(PAD123);
-    });
-
-    it('pads decimal representation', () => {
-      expect(padU32(291)).to.equal(PAD123);
-    });
-
-    it('pads string representation', () => {
-      expect(padU32('0x123')).to.equal(PAD123);
-    });
-
-    it('pads BigNumber representation', () => {
-      expect(padU32(new BigNumber(0x123))).to.equal(PAD123);
-    });
-
-    it('converts negative numbers to 2s complement', () => {
-      expect(padU32(-123)).to.equal('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff85');
-    });
-  });
-
-  describe('padFixedBytes', () => {
-    it('right pads length < 64 bytes to 64 bytes (string)', () => {
-      expect(padFixedBytes(`0x${SHORT15}`)).to.equal(LONG15);
-    });
-
-    it('right pads length < 64 bytes to 64 bytes (array)', () => {
-      expect(padFixedBytes(BYTES15)).to.equal(LONG15);
-    });
-
-    it('right pads length > 64 bytes (64 byte multiples)', () => {
-      expect(padFixedBytes(`0x${LONG15}${SHORT15}`)).to.equal(`${LONG15}${LONG15}`);
-    });
-
-    it('strips leading 0x when passed in', () => {
-      expect(padFixedBytes(`0x${SHORT15}`)).to.equal(LONG15);
-    });
-  });
-
-  describe('padBytes', () => {
-    it('right pads length < 64, adding the length (string)', () => {
-      const result = padBytes(`0x${SHORT15}`);
-
-      expect(result.length).to.equal(128);
-      expect(result).to.equal(`${padU32(8)}${LONG15}`);
-    });
-
-    it('right pads length < 64, adding the length (array)', () => {
-      const result = padBytes(BYTES15);
-
-      expect(result.length).to.equal(128);
-      expect(result).to.equal(`${padU32(8)}${LONG15}`);
-    });
-
-    it('right pads length > 64, adding the length', () => {
-      const result = padBytes(`0x${LONG15}${SHORT15}`);
-
-      expect(result.length).to.equal(192);
-      expect(result).to.equal(`${padU32(0x28)}${LONG15}${LONG15}`);
-    });
-  });
-
-  describe('padString', () => {
-    it('correctly converts & pads strings', () => {
-      const result = padString('gavofyork');
-
-      expect(result.length).to.equal(128);
-      expect(result).to.equal(padBytes('0x6761766f66796f726b'));
-    });
-  });
-});
diff --git a/js/src/abi/util/signature.js b/js/src/abi/util/signature.js
deleted file mode 100644
index 86ed6f2657fe4adbaae471099ba53db97408e946..0000000000000000000000000000000000000000
--- a/js/src/abi/util/signature.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { keccak_256 } from 'js-sha3'; // eslint-disable-line camelcase
-import { fromParamType } from '../spec/paramType/format';
-
-export function eventSignature (eventName, params) {
-  const { strName, name } = parseName(eventName);
-  const types = (params || []).map(fromParamType).join(',');
-  const id = `${strName}(${types})`;
-  const signature = strName ? keccak_256(id) : '';
-
-  return { id, name, signature };
-}
-
-export function methodSignature (methodName, params) {
-  const { id, name, signature } = eventSignature(methodName, params);
-
-  return { id, name, signature: signature.substr(0, 8) };
-}
-
-function parseName (name) {
-  const strName = `${name || ''}`;
-  const idx = strName.indexOf('(');
-
-  if (idx === -1) {
-    return { strName, name };
-  }
-
-  const trimmedName = strName.slice(0, idx);
-
-  return {
-    strName: trimmedName,
-    name: trimmedName
-  };
-}
diff --git a/js/src/abi/util/signature.spec.js b/js/src/abi/util/signature.spec.js
deleted file mode 100644
index 118ebf4e510faf77b7a2a30a99b8cba8f524c9fb..0000000000000000000000000000000000000000
--- a/js/src/abi/util/signature.spec.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { eventSignature, methodSignature } from './signature';
-
-describe('abi/util/signature', () => {
-  describe('eventSignature', () => {
-    it('encodes signature baz() correctly', () => {
-      expect(eventSignature('baz', [])).to.deep.equal({
-        id: 'baz()',
-        name: 'baz',
-        signature: 'a7916fac4f538170f7cd12c148552e2cba9fcd72329a2dd5b07a6fa906488ddf'
-      });
-    });
-
-    it('encodes signature baz(uint32) correctly', () => {
-      expect(eventSignature('baz', [{ type: 'uint', length: 32 }])).to.deep.equal({
-        id: 'baz(uint32)',
-        name: 'baz',
-        signature: '7d68785e8fc871be024b75964bd86d093511d4bc2dc7cf7bea32c48a0efaecb1'
-      });
-    });
-
-    it('encodes signature baz(uint32, bool) correctly', () => {
-      expect(eventSignature('baz', [{ type: 'uint', length: 32 }, { type: 'bool' }])).to.deep.equal({
-        id: 'baz(uint32,bool)',
-        name: 'baz',
-        signature: 'cdcd77c0992ec5bbfc459984220f8c45084cc24d9b6efed1fae540db8de801d2'
-      });
-    });
-
-    it('encodes no-name signature correctly as ()', () => {
-      expect(eventSignature(undefined, [])).to.deep.equal({
-        id: '()',
-        name: undefined,
-        signature: ''
-      });
-    });
-
-    it('encodes no-params signature correctly as ()', () => {
-      expect(eventSignature(undefined, undefined)).to.deep.equal({
-        id: '()',
-        name: undefined,
-        signature: ''
-      });
-    });
-  });
-
-  describe('methodSignature', () => {
-    it('encodes signature baz() correctly', () => {
-      expect(methodSignature('baz', [])).to.deep.equal({
-        id: 'baz()',
-        name: 'baz',
-        signature: 'a7916fac'
-      });
-    });
-
-    it('encodes signature baz(uint32) correctly', () => {
-      expect(methodSignature('baz', [{ type: 'uint', length: 32 }])).to.deep.equal({
-        id: 'baz(uint32)',
-        name: 'baz',
-        signature: '7d68785e'
-      });
-    });
-
-    it('encodes signature baz(uint32, bool) correctly', () => {
-      expect(methodSignature('baz', [{ type: 'uint', length: 32 }, { type: 'bool' }])).to.deep.equal({
-        id: 'baz(uint32,bool)',
-        name: 'baz',
-        signature: 'cdcd77c0'
-      });
-    });
-
-    it('encodes signature in name correctly', () => {
-      expect(methodSignature('baz(uint32,bool)', [{ type: 'uint', length: 32 }, { type: 'bool' }])).to.deep.equal({
-        id: 'baz(uint32,bool)',
-        name: 'baz',
-        signature: 'cdcd77c0'
-      });
-    });
-
-    it('encodes no-name signature correctly as ()', () => {
-      expect(methodSignature(undefined, [])).to.deep.equal({
-        id: '()',
-        name: undefined,
-        signature: ''
-      });
-    });
-
-    it('encodes no-params signature correctly as ()', () => {
-      expect(methodSignature(undefined, undefined)).to.deep.equal({
-        id: '()',
-        name: undefined,
-        signature: ''
-      });
-    });
-  });
-});
diff --git a/js/src/abi/util/slice.js b/js/src/abi/util/slice.js
deleted file mode 100644
index daab54f1ce2d569bef6a60cdcbfb9fd1659172d6..0000000000000000000000000000000000000000
--- a/js/src/abi/util/slice.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { padAddress } from './pad';
-
-export function sliceData (_data) {
-  if (!_data || !_data.length) {
-    return [];
-  }
-
-  let data = (_data.substr(0, 2) === '0x') ? _data.substr(2) : _data;
-
-  if (!data.length) {
-    data = padAddress('');
-  }
-
-  return data.match(/.{1,64}/g);
-}
diff --git a/js/src/abi/util/slice.spec.js b/js/src/abi/util/slice.spec.js
deleted file mode 100644
index 1b754ccbb22fd88f7c244efd1bd4dcb7273c017d..0000000000000000000000000000000000000000
--- a/js/src/abi/util/slice.spec.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { sliceData } from './slice';
-
-describe('abi/util/slice', () => {
-  describe('sliceData', () => {
-    const slice1 = '131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b';
-    const slice2 = '2124768576358735263578356373526387638357635873563586353756358763';
-
-    it('returns an empty array when length === 0', () => {
-      expect(sliceData('')).to.deep.equal([]);
-    });
-
-    it('returns an array with the slices otherwise', () => {
-      const sliced = sliceData(`${slice1}${slice2}`);
-
-      expect(sliced.length).to.equal(2);
-      expect(sliced[0]).to.equal(slice1);
-      expect(sliced[1]).to.equal(slice2);
-    });
-
-    it('removes leading 0x when passed in', () => {
-      const sliced = sliceData(`0x${slice1}${slice2}`);
-
-      expect(sliced.length).to.equal(2);
-      expect(sliced[0]).to.equal(slice1);
-      expect(sliced[1]).to.equal(slice2);
-    });
-  });
-});
diff --git a/js/src/abi/util/sliceAs.js b/js/src/abi/util/sliceAs.js
deleted file mode 100644
index e177897a197f34f31dcc9c74e36a0f4e9254a335..0000000000000000000000000000000000000000
--- a/js/src/abi/util/sliceAs.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import { toChecksumAddress } from './address';
-
-export function asU32 (slice) {
-  // TODO: validation
-
-  return new BigNumber(slice, 16);
-}
-
-export function asI32 (slice) {
-  if (new BigNumber(slice.substr(0, 1), 16).toString(2)[0] === '1') {
-    return new BigNumber(slice, 16)
-      .minus(new BigNumber('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', 16))
-      .minus(1);
-  }
-
-  return new BigNumber(slice, 16);
-}
-
-export function asAddress (slice) {
-  // TODO: address validation?
-
-  return toChecksumAddress(`0x${slice.slice(-40)}`);
-}
-
-export function asBool (slice) {
-  // TODO: everything else should be 0
-
-  return new BigNumber(slice[63]).eq(1);
-}
diff --git a/js/src/abi/util/sliceAs.spec.js b/js/src/abi/util/sliceAs.spec.js
deleted file mode 100644
index c29e345547bbc1684ae7e38eb37616352e1b0316..0000000000000000000000000000000000000000
--- a/js/src/abi/util/sliceAs.spec.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { asAddress, asBool, asI32, asU32 } from './sliceAs';
-
-describe('abi/util/sliceAs', () => {
-  const MAX_INT = 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff';
-
-  describe('asAddress', () => {
-    it('correctly returns the last 0x40 characters', () => {
-      const address = '1111111111222222222233333333334444444444';
-
-      expect(asAddress(`000000000000000000000000${address}`)).to.equal(`0x${address}`);
-    });
-  });
-
-  describe('asBool', () => {
-    it('correctly returns true', () => {
-      expect(asBool('0000000000000000000000000000000000000000000000000000000000000001')).to.be.true;
-    });
-
-    it('correctly returns false', () => {
-      expect(asBool('0000000000000000000000000000000000000000000000000000000000000000')).to.be.false;
-    });
-  });
-
-  describe('asI32', () => {
-    it('correctly decodes positive numbers', () => {
-      expect(asI32('000000000000000000000000000000000000000000000000000000000000007b').toString()).to.equal('123');
-    });
-
-    it('correctly decodes negative numbers', () => {
-      expect(asI32('ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff85').toString()).to.equal('-123');
-    });
-  });
-
-  describe('asU32', () => {
-    it('returns a maxium U32', () => {
-      expect(asU32(MAX_INT).toString(16)).to.equal(MAX_INT);
-    });
-  });
-});
diff --git a/js/src/abi/util/types.js b/js/src/abi/util/types.js
deleted file mode 100644
index dd408f3716fbc2e5bd065c2afcdbe94d07a6ae85..0000000000000000000000000000000000000000
--- a/js/src/abi/util/types.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function isArray (test) {
-  return Object.prototype.toString.call(test) === '[object Array]';
-}
-
-export function isString (test) {
-  return Object.prototype.toString.call(test) === '[object String]';
-}
-
-export function isInstanceOf (test, clazz) {
-  return test instanceof clazz;
-}
diff --git a/js/src/abi/util/types.spec.js b/js/src/abi/util/types.spec.js
deleted file mode 100644
index 177662ae271479390e5309ed5a9dbd542c6399a8..0000000000000000000000000000000000000000
--- a/js/src/abi/util/types.spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isArray, isString, isInstanceOf } from './types';
-import Token from '../token';
-
-describe('abi/util/types', () => {
-  describe('isArray', () => {
-    it('correctly identifies empty arrays as Array', () => {
-      expect(isArray([])).to.be.true;
-    });
-
-    it('correctly identifies non-empty arrays as Array', () => {
-      expect(isArray([1, 2, 3])).to.be.true;
-    });
-
-    it('correctly identifies strings as non-Array', () => {
-      expect(isArray('not an array')).to.be.false;
-    });
-
-    it('correctly identifies objects as non-Array', () => {
-      expect(isArray({})).to.be.false;
-    });
-  });
-
-  describe('isString', () => {
-    it('correctly identifies empty string as string', () => {
-      expect(isString('')).to.be.true;
-    });
-
-    it('correctly identifies string as string', () => {
-      expect(isString('123')).to.be.true;
-    });
-  });
-
-  describe('isInstanceOf', () => {
-    it('correctly identifies build-in instanceof', () => {
-      expect(isInstanceOf(new String('123'), String)).to.be.true; // eslint-disable-line no-new-wrappers
-    });
-
-    it('correctly identifies own instanceof', () => {
-      expect(isInstanceOf(new Token('int', 123), Token)).to.be.true;
-    });
-
-    it('correctly reports false for own', () => {
-      expect(isInstanceOf({ type: 'int' }, Token)).to.be.false;
-    });
-  });
-});
diff --git a/js/src/api/README.md b/js/src/api/README.md
deleted file mode 100644
index 1a2051eaf499ace119526ca218df7266d2e6f9c2..0000000000000000000000000000000000000000
--- a/js/src/api/README.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# ethapi-js
-
-A thin, fast, low-level Promise-based wrapper around the Ethereum APIs.
-
-[![Build Status](https://travis-ci.org/jacogr/ethapi-js.svg?branch=master)](https://travis-ci.org/jacogr/ethapi-js)
-[![Coverage Status](https://coveralls.io/repos/github/jacogr/ethapi-js/badge.svg?branch=master)](https://coveralls.io/github/jacogr/ethapi-js?branch=master)
-[![Dependency Status](https://david-dm.org/jacogr/ethapi-js.svg)](https://david-dm.org/jacogr/ethapi-js)
-[![devDependency Status](https://david-dm.org/jacogr/ethapi-js/dev-status.svg)](https://david-dm.org/jacogr/ethapi-js#info=devDependencies)
-
-## contributing
-
-Clone the repo and install dependencies via `npm install`. Tests can be executed via
-
-- `npm run testOnce` (100% covered unit tests)
-- `npm run testE2E` (E2E against a running RPC-enabled testnet Parity/Geth instance, `parity --testnet` and for WebScokets, `geth --testnet --ws --wsorigins '*' --rpc`)
-- setting the environment `DEBUG=true` will display the RPC POST bodies and responses on E2E tests
-
-## installation
-
-Install the package with `npm install --save ethapi-js` from the [npm registry ethapi-js](https://www.npmjs.com/package/ethapi-js)
-
-## usage
-
-### initialisation
-
-```javascript
-// import the actual EthApi class
-import EthApi from 'ethapi-js';
-
-// do the setup
-const transport = new EthApi.Transport.Http('http://localhost:8545');  // or .Ws('ws://localhost:8546')
-const ethapi = new EthApi(transport);
-```
-
-You will require native Promises and fetch support (latest browsers only), they can be utilised by
-
-```javascript
-import 'isomorphic-fetch';
-
-import es6Promise from 'es6-promise';
-es6Promise.polyfill();
-```
-
-### making calls
-
-perform a call
-
-```javascript
-ethapi.eth
-  .coinbase()
-  .then((coinbase) => {
-    console.log(`The coinbase is ${coinbase}`);
-  });
-```
-
-multiple promises
-
-```javascript
-Promise
-  .all([
-    ethapi.eth.coinbase(),
-    ethapi.net.listening()
-  ])
-  .then(([coinbase, listening]) => {
-    // do stuff here
-  });
-```
-
-chaining promises
-
-```javascript
-ethapi.eth
-  .newFilter({...})
-  .then((filterId) => ethapi.eth.getFilterChanges(filterId))
-  .then((changes) => {
-    console.log(changes);
-  });
-```
-
-### contracts
-
-attach contract
-
-```javascript
-const abi = [{ name: 'callMe', inputs: [{ type: 'bool', ...}, { type: 'string', ...}]}, ...abi...];
-const contract = new ethapi.newContract(abi);
-```
-
-deploy
-
-```javascript
-contract
-  .deploy('0xc0de', [params], 'superPassword')
-  .then((address) => {
-    console.log(`the contract was deployed at ${address}`);
-  });
-```
-
-attach a contract at address
-
-```javascript
-// via the constructor & .at function
-const contract = api.newContract(abi).at('0xa9280...7347b');
-// or on an already initialised contract
-contract.at('0xa9280...7347b');
-// perform calls here
-```
-
-find & call a function
-
-```javascript
-contract.instance
-  .myContractMethodName
-  .call({}, [myContractMethodParameter]) // or estimateGas or sendTransaction
-  .then((result) => {
-    console.log(`the result was ${result}`);
-  });
-```
-
-parse events from transaction receipt
-
-```javascript
-contract
-  .parseTransactionEvents(txReceipt)
-  .then((receipt) => {
-    receipt.logs.forEach((log) => {
-      console.log('log parameters', log.params);
-    });
-  });
-```
-
-## apis
-
-APIs implement the calls as exposed in the [Ethcore JSON Ethereum RPC](https://github.com/paritytech/ethereum-rpc-json/) definitions. Mapping follows the naming conventions of the originals, i.e. `eth_call` becomes `eth.call`, `personal_accounts` becomes `personal.accounts`, etc.
-
-- [ethapi.db](https://github.com/paritytech/ethereum-rpc-json/blob/master/interfaces.md#db)
-- [ethapi.eth](https://github.com/paritytech/ethereum-rpc-json/blob/master/interfaces.md#eth)
-- [ethapi.parity](https://github.com/paritytech/ethereum-rpc-json/blob/master/interfaces.md#parity)
-- [ethapi.net](https://github.com/paritytech/ethereum-rpc-json/blob/master/interfaces.md#net)
-- [ethapi.personal](https://github.com/paritytech/ethereum-rpc-json/blob/master/interfaces.md#personal)
-- [ethapi.shh](https://github.com/paritytech/ethereum-rpc-json/blob/master/interfaces.md#shh)
-- [ethapi.signer](https://github.com/paritytech/ethereum-rpc-json/blob/master/interfaces.md#signer)
-- [ethapi.trace](https://github.com/paritytech/ethereum-rpc-json/blob/master/interfaces.md#trace)
-- [ethapi.web3](https://github.com/paritytech/ethereum-rpc-json/blob/master/interfaces.md#web3)
-
-As a verification step, all exposed interfaces are tested for existing and pointing to the correct endpoints by using the generated interfaces from the above repo.
diff --git a/js/src/api/api.js b/js/src/api/api.js
deleted file mode 100644
index 220c3be294158d1ba2fcd93c60ab1382a1cece02..0000000000000000000000000000000000000000
--- a/js/src/api/api.js
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import EventEmitter from 'eventemitter3';
-
-import { Http, Ws } from './transport';
-import Contract from './contract';
-
-import { Db, Eth, Parity, Net, Personal, Shh, Signer, Trace, Web3 } from './rpc';
-import Subscriptions from './subscriptions';
-import Pubsub from './pubsub';
-import util from './util';
-import { isFunction } from './util/types';
-
-import LocalAccountsMiddleware from '~/api/local';
-
-export default class Api extends EventEmitter {
-  constructor (transport, allowSubscriptions = true) {
-    super();
-
-    if (!transport || !isFunction(transport.execute)) {
-      throw new Error('EthApi needs transport with execute() function defined');
-    }
-
-    this._transport = transport;
-
-    this._db = new Db(transport);
-    this._eth = new Eth(transport);
-    this._net = new Net(transport);
-    this._parity = new Parity(transport);
-    this._personal = new Personal(transport);
-    this._shh = new Shh(transport);
-    this._signer = new Signer(transport);
-    this._trace = new Trace(transport);
-    this._web3 = new Web3(transport);
-
-    if (isFunction(transport.subscribe)) {
-      this._pubsub = new Pubsub(transport);
-    }
-
-    if (allowSubscriptions) {
-      this._subscriptions = new Subscriptions(this);
-    }
-    // Doing a request here in test env would cause an error
-    if (LocalAccountsMiddleware && process.env.NODE_ENV !== 'test') {
-      const middleware = this.parity
-        .nodeKind()
-        .then((nodeKind) => {
-          if (nodeKind.availability === 'public') {
-            return LocalAccountsMiddleware;
-          }
-
-          return null;
-        })
-        .catch(() => null);
-
-      transport.addMiddleware(middleware);
-    }
-  }
-
-  get pubsub () {
-    if (!this._pubsub) {
-      throw Error('Pubsub is only available with a subscribing-supported transport injected!');
-    }
-    return this._pubsub;
-  }
-
-  get db () {
-    return this._db;
-  }
-
-  get eth () {
-    return this._eth;
-  }
-
-  get parity () {
-    return this._parity;
-  }
-
-  get net () {
-    return this._net;
-  }
-
-  get personal () {
-    return this._personal;
-  }
-
-  get shh () {
-    return this._shh;
-  }
-
-  get signer () {
-    return this._signer;
-  }
-
-  get trace () {
-    return this._trace;
-  }
-
-  get transport () {
-    return this._transport;
-  }
-
-  get web3 () {
-    return this._web3;
-  }
-
-  get util () {
-    return util;
-  }
-
-  newContract (abi, address) {
-    return new Contract(this, abi).at(address);
-  }
-
-  subscribe (subscriptionName, callback) {
-    if (!this._subscriptions) {
-      return Promise.resolve(1);
-    }
-
-    return this._subscriptions.subscribe(subscriptionName, callback);
-  }
-
-  unsubscribe (subscriptionId) {
-    if (!this._subscriptions) {
-      return Promise.resolve(true);
-    }
-
-    return this._subscriptions.unsubscribe(subscriptionId);
-  }
-
-  pollMethod (method, input, validate) {
-    const [_group, endpoint] = method.split('_');
-    const group = `_${_group}`;
-
-    return new Promise((resolve, reject) => {
-      const timeout = () => {
-        this[group][endpoint](input)
-          .then((result) => {
-            if (validate ? validate(result) : result) {
-              resolve(result);
-            } else {
-              setTimeout(timeout, 500);
-            }
-          })
-          .catch((error) => {
-            // Don't print if the request is rejected: that's ok
-            if (error.type !== 'REQUEST_REJECTED') {
-              console.error('pollMethod', error);
-            }
-
-            reject(error);
-          });
-      };
-
-      timeout();
-    });
-  }
-
-  static util = util
-
-  static Transport = {
-    Http: Http,
-    Ws: Ws
-  }
-}
diff --git a/js/src/api/api.spec.js b/js/src/api/api.spec.js
deleted file mode 100644
index c72b2284922cc5e0d069755bdbbd5847fd7328b9..0000000000000000000000000000000000000000
--- a/js/src/api/api.spec.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { TEST_HTTP_URL, endpointTest } from '../../test/mockRpc';
-
-import util from './util';
-import Api from './api';
-
-import ethereumRpc from '../jsonrpc/';
-
-describe('api/Api', () => {
-  describe('constructor', () => {
-    it('requires defined/non-null transport object', () => {
-      expect(() => new Api()).to.throw(/Api needs transport/);
-      expect(() => new Api(null)).to.throw(/Api needs transport/);
-    });
-
-    it('requires an execute function on the transport object', () => {
-      expect(() => new Api({})).to.throw(/Api needs transport/);
-      expect(() => new Api({ execute: true })).to.throw(/Api needs transport/);
-    });
-  });
-
-  describe('interface', () => {
-    const api = new Api(new Api.Transport.Http(TEST_HTTP_URL, -1));
-    const ignored = [
-      'eth_subscribe', 'eth_unsubscribe',
-      'parity_subscribe', 'parity_unsubscribe',
-      'signer_subscribePending', 'signer_unsubscribePending'
-    ];
-
-    Object.keys(ethereumRpc).sort().forEach((endpoint) => {
-      describe(endpoint, () => {
-        Object.keys(ethereumRpc[endpoint]).sort()
-          .filter(method => ignored.indexOf(method) !== -1)
-          .forEach((method) => {
-            endpointTest(api, endpoint, method);
-          });
-      });
-    });
-  });
-
-  it('exposes util as static property', () => {
-    expect(Api.util).to.equal(util);
-  });
-});
diff --git a/js/src/api/contract/contract.js b/js/src/api/contract/contract.js
deleted file mode 100644
index dee4d6d777b6405ead63261d3db8a24bf8368c14..0000000000000000000000000000000000000000
--- a/js/src/api/contract/contract.js
+++ /dev/null
@@ -1,561 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Abi from '~/abi';
-
-let nextSubscriptionId = 0;
-
-export default class Contract {
-  constructor (api, abi) {
-    if (!api) {
-      throw new Error('API instance needs to be provided to Contract');
-    }
-
-    if (!abi) {
-      throw new Error('ABI needs to be provided to Contract instance');
-    }
-
-    this._api = api;
-    this._abi = new Abi(abi);
-
-    this._subscriptions = {};
-    this._constructors = this._abi.constructors.map(this._bindFunction);
-    this._functions = this._abi.functions.map(this._bindFunction);
-    this._events = this._abi.events.map(this._bindEvent);
-
-    this._instance = {};
-
-    this._events.forEach((evt) => {
-      this._instance[evt.name] = evt;
-      this._instance[evt.signature] = evt;
-    });
-
-    this._functions.forEach((fn) => {
-      this._instance[fn.name] = fn;
-      this._instance[fn.signature] = fn;
-    });
-
-    this._subscribedToPendings = false;
-    this._pendingsSubscriptionId = null;
-
-    this._subscribedToBlock = false;
-    this._blockSubscriptionId = null;
-
-    if (api && api.patch && api.patch.contract) {
-      api.patch.contract(this);
-    }
-  }
-
-  get address () {
-    return this._address;
-  }
-
-  get constructors () {
-    return this._constructors;
-  }
-
-  get events () {
-    return this._events;
-  }
-
-  get functions () {
-    return this._functions;
-  }
-
-  get receipt () {
-    return this._receipt;
-  }
-
-  get instance () {
-    this._instance.address = this._address;
-    return this._instance;
-  }
-
-  get api () {
-    return this._api;
-  }
-
-  get abi () {
-    return this._abi;
-  }
-
-  at (address) {
-    this._address = address;
-    return this;
-  }
-
-  deployEstimateGas (options, values) {
-    const _options = this._encodeOptions(this.constructors[0], options, values);
-
-    return this._api.eth
-      .estimateGas(_options)
-      .then((gasEst) => {
-        return [gasEst, gasEst.mul(1.2)];
-      });
-  }
-
-  deploy (options, values, statecb = () => {}, skipGasEstimate = false) {
-    let gasEstPromise;
-
-    if (skipGasEstimate) {
-      gasEstPromise = Promise.resolve(null);
-    } else {
-      statecb(null, { state: 'estimateGas' });
-
-      gasEstPromise = this.deployEstimateGas(options, values)
-        .then(([gasEst, gas]) => gas);
-    }
-
-    return gasEstPromise
-      .then((_gas) => {
-        if (_gas) {
-          options.gas = _gas.toFixed(0);
-        }
-
-        const gas = _gas || options.gas;
-
-        statecb(null, { state: 'postTransaction', gas });
-
-        const encodedOptions = this._encodeOptions(this.constructors[0], options, values);
-
-        return this._api.parity
-          .postTransaction(encodedOptions)
-          .then((requestId) => {
-            statecb(null, { state: 'checkRequest', requestId });
-            return this._pollCheckRequest(requestId);
-          })
-          .then((txhash) => {
-            statecb(null, { state: 'getTransactionReceipt', txhash });
-            return this._pollTransactionReceipt(txhash, gas);
-          })
-          .then((receipt) => {
-            if (receipt.gasUsed.eq(gas)) {
-              throw new Error(`Contract not deployed, gasUsed == ${gas.toFixed(0)}`);
-            }
-
-            statecb(null, { state: 'hasReceipt', receipt });
-            this._receipt = receipt;
-            this._address = receipt.contractAddress;
-            return this._address;
-          })
-          .then((address) => {
-            statecb(null, { state: 'getCode' });
-            return this._api.eth.getCode(this._address);
-          })
-          .then((code) => {
-            if (code === '0x') {
-              throw new Error('Contract not deployed, getCode returned 0x');
-            }
-
-            statecb(null, { state: 'completed' });
-            return this._address;
-          });
-      });
-  }
-
-  parseEventLogs (logs) {
-    return logs
-      .map((log) => {
-        const signature = log.topics[0].substr(2);
-        const event = this.events.find((evt) => evt.signature === signature);
-
-        if (!event) {
-          console.warn(`Unable to find event matching signature ${signature}`);
-          return null;
-        }
-
-        try {
-          const decoded = event.decodeLog(log.topics, log.data);
-
-          log.params = {};
-          log.event = event.name;
-
-          decoded.params.forEach((param, index) => {
-            const { type, value } = param.token;
-            const key = param.name || index;
-
-            log.params[key] = { type, value };
-          });
-
-          return log;
-        } catch (error) {
-          console.warn('Error decoding log', log);
-          console.warn(error);
-
-          return null;
-        }
-      })
-      .filter((log) => log);
-  }
-
-  parseTransactionEvents (receipt) {
-    receipt.logs = this.parseEventLogs(receipt.logs);
-
-    return receipt;
-  }
-
-  _pollCheckRequest = (requestId) => {
-    return this._api.pollMethod('parity_checkRequest', requestId);
-  }
-
-  _pollTransactionReceipt = (txhash, gas) => {
-    return this.api.pollMethod('eth_getTransactionReceipt', txhash, (receipt) => {
-      if (!receipt || !receipt.blockNumber || receipt.blockNumber.eq(0)) {
-        return false;
-      }
-
-      return true;
-    });
-  }
-
-  getCallData = (func, options, values) => {
-    let data = options.data;
-
-    const tokens = func ? Abi.encodeTokens(func.inputParamTypes(), values) : null;
-    const call = tokens ? func.encodeCall(tokens) : null;
-
-    if (data && data.substr(0, 2) === '0x') {
-      data = data.substr(2);
-    }
-
-    return `0x${data || ''}${call || ''}`;
-  }
-
-  _encodeOptions (func, options, values) {
-    const data = this.getCallData(func, options, values);
-
-    return {
-      ...options,
-      data
-    };
-  }
-
-  _addOptionsTo (options = {}) {
-    return {
-      to: this._address,
-      ...options
-    };
-  }
-
-  _bindFunction = (func) => {
-    func.contract = this;
-
-    func.call = (_options = {}, values = []) => {
-      const rawTokens = !!_options.rawTokens;
-      const options = {
-        ..._options
-      };
-
-      delete options.rawTokens;
-
-      let callParams;
-
-      try {
-        callParams = this._encodeOptions(func, this._addOptionsTo(options), values);
-      } catch (error) {
-        return Promise.reject(error);
-      }
-
-      return this._api.eth
-        .call(callParams)
-        .then((encoded) => func.decodeOutput(encoded))
-        .then((tokens) => {
-          if (rawTokens) {
-            return tokens;
-          }
-
-          return tokens.map((token) => token.value);
-        })
-        .then((returns) => returns.length === 1 ? returns[0] : returns)
-        .catch((error) => {
-          console.warn(`${func.name}.call`, values, error);
-          throw error;
-        });
-    };
-
-    if (!func.constant) {
-      func.postTransaction = (options, values = []) => {
-        let _options;
-
-        try {
-          _options = this._encodeOptions(func, this._addOptionsTo(options), values);
-        } catch (error) {
-          return Promise.reject(error);
-        }
-
-        return this._api.parity
-          .postTransaction(_options)
-          .catch((error) => {
-            console.warn(`${func.name}.postTransaction`, values, error);
-            throw error;
-          });
-      };
-
-      func.estimateGas = (options, values = []) => {
-        const _options = this._encodeOptions(func, this._addOptionsTo(options), values);
-
-        return this._api.eth
-          .estimateGas(_options)
-          .catch((error) => {
-            console.warn(`${func.name}.estimateGas`, values, error);
-            throw error;
-          });
-      };
-    }
-
-    return func;
-  }
-
-  _bindEvent = (event) => {
-    event.subscribe = (options = {}, callback, autoRemove) => {
-      return this._subscribe(event, options, callback, autoRemove);
-    };
-
-    event.unsubscribe = (subscriptionId) => {
-      return this.unsubscribe(subscriptionId);
-    };
-
-    event.getAllLogs = (options = {}) => {
-      return this.getAllLogs(event);
-    };
-
-    return event;
-  }
-
-  getAllLogs (event, _options) {
-    // Options as first parameter
-    if (!_options && event && event.topics) {
-      return this.getAllLogs(null, event);
-    }
-
-    const options = this._getFilterOptions(event, _options);
-
-    options.fromBlock = 0;
-    options.toBlock = 'latest';
-
-    return this._api.eth
-      .getLogs(options)
-      .then((logs) => this.parseEventLogs(logs));
-  }
-
-  _findEvent (eventName = null) {
-    const event = eventName
-      ? this._events.find((evt) => evt.name === eventName)
-      : null;
-
-    if (eventName && !event) {
-      const events = this._events.map((evt) => evt.name).join(', ');
-
-      throw new Error(`${eventName} is not a valid eventName, subscribe using one of ${events} (or null to include all)`);
-    }
-
-    return event;
-  }
-
-  _getFilterOptions (event = null, _options = {}) {
-    const optionTopics = _options.topics || [];
-    const signature = event && event.signature || null;
-
-    // If event provided, remove the potential event signature
-    // as the first element of the topics
-    const topics = signature
-      ? [ signature ].concat(optionTopics.filter((t, idx) => idx > 0 || t !== signature))
-      : optionTopics;
-
-    const options = Object.assign({}, _options, {
-      address: this._address,
-      topics
-    });
-
-    return options;
-  }
-
-  _createEthFilter (event = null, _options) {
-    const options = this._getFilterOptions(event, _options);
-
-    return this._api.eth.newFilter(options);
-  }
-
-  subscribe (eventName = null, options = {}, callback, autoRemove) {
-    try {
-      const event = this._findEvent(eventName);
-
-      return this._subscribe(event, options, callback, autoRemove);
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  }
-
-  _sendData (subscriptionId, error, logs) {
-    const { autoRemove, callback } = this._subscriptions[subscriptionId];
-    let result = true;
-
-    try {
-      result = callback(error, logs);
-    } catch (error) {
-      console.warn('_sendData', subscriptionId, error);
-    }
-
-    if (autoRemove && result && typeof result === 'boolean') {
-      this.unsubscribe(subscriptionId);
-    }
-  }
-
-  _subscribe (event = null, _options, callback, autoRemove = false) {
-    const subscriptionId = nextSubscriptionId++;
-    const { skipInitFetch } = _options;
-
-    delete _options['skipInitFetch'];
-
-    return this
-      ._createEthFilter(event, _options)
-      .then((filterId) => {
-        this._subscriptions[subscriptionId] = {
-          options: _options,
-          autoRemove,
-          callback,
-          filterId,
-          id: subscriptionId
-        };
-
-        if (skipInitFetch) {
-          this._subscribeToChanges();
-          return subscriptionId;
-        }
-
-        return this._api.eth
-          .getFilterLogs(filterId)
-          .then((logs) => {
-            this._sendData(subscriptionId, null, this.parseEventLogs(logs));
-            this._subscribeToChanges();
-            return subscriptionId;
-          });
-      })
-      .catch((error) => {
-        console.warn('subscribe', event, _options, error);
-        throw error;
-      });
-  }
-
-  unsubscribe (subscriptionId) {
-    return this._api.eth
-      .uninstallFilter(this._subscriptions[subscriptionId].filterId)
-      .catch((error) => {
-        console.error('unsubscribe', error);
-      })
-      .then(() => {
-        delete this._subscriptions[subscriptionId];
-        this._unsubscribeFromChanges();
-      });
-  }
-
-  _subscribeToChanges = () => {
-    const subscriptions = Object.values(this._subscriptions);
-
-    const pendingSubscriptions = subscriptions
-      .filter((s) => s.options.toBlock && s.options.toBlock === 'pending');
-
-    const otherSubscriptions = subscriptions
-      .filter((s) => !(s.options.toBlock && s.options.toBlock === 'pending'));
-
-    if (pendingSubscriptions.length > 0 && !this._subscribedToPendings) {
-      this._subscribedToPendings = true;
-      this._subscribeToPendings();
-    }
-
-    if (otherSubscriptions.length > 0 && !this._subscribedToBlock) {
-      this._subscribedToBlock = true;
-      this._subscribeToBlock();
-    }
-  }
-
-  _unsubscribeFromChanges = () => {
-    const subscriptions = Object.values(this._subscriptions);
-
-    const pendingSubscriptions = subscriptions
-      .filter((s) => s.options.toBlock && s.options.toBlock === 'pending');
-
-    const otherSubscriptions = subscriptions
-      .filter((s) => !(s.options.toBlock && s.options.toBlock === 'pending'));
-
-    if (pendingSubscriptions.length === 0 && this._subscribedToPendings) {
-      this._subscribedToPendings = false;
-      clearTimeout(this._pendingsSubscriptionId);
-    }
-
-    if (otherSubscriptions.length === 0 && this._subscribedToBlock) {
-      this._subscribedToBlock = false;
-      this._api.unsubscribe(this._blockSubscriptionId);
-    }
-  }
-
-  _subscribeToBlock = () => {
-    this._api
-      .subscribe('eth_blockNumber', (error) => {
-        if (error) {
-          console.error('::_subscribeToBlock', error, error && error.stack);
-        }
-
-        const subscriptions = Object.values(this._subscriptions)
-          .filter((s) => !(s.options.toBlock && s.options.toBlock === 'pending'));
-
-        this._sendSubscriptionChanges(subscriptions);
-      })
-      .then((blockSubId) => {
-        this._blockSubscriptionId = blockSubId;
-      })
-      .catch((e) => {
-        console.error('::_subscribeToBlock', e, e && e.stack);
-      });
-  }
-
-  _subscribeToPendings = () => {
-    const subscriptions = Object.values(this._subscriptions)
-      .filter((s) => s.options.toBlock && s.options.toBlock === 'pending');
-
-    const timeout = () => setTimeout(() => this._subscribeToPendings(), 1000);
-
-    this._sendSubscriptionChanges(subscriptions)
-      .then(() => {
-        this._pendingsSubscriptionId = timeout();
-      });
-  }
-
-  _sendSubscriptionChanges = (subscriptions) => {
-    return Promise
-      .all(
-        subscriptions.map((subscription) => {
-          return this._api.eth.getFilterChanges(subscription.filterId);
-        })
-      )
-      .then((logsArray) => {
-        logsArray.forEach((logs, index) => {
-          if (!logs || !logs.length) {
-            return;
-          }
-
-          try {
-            this._sendData(subscriptions[index].id, null, this.parseEventLogs(logs));
-          } catch (error) {
-            console.error('_sendSubscriptionChanges', error);
-          }
-        });
-      })
-      .catch((error) => {
-        console.error('_sendSubscriptionChanges', error);
-      });
-  }
-}
diff --git a/js/src/api/contract/contract.spec.js b/js/src/api/contract/contract.spec.js
deleted file mode 100644
index bd8b0fbdae711a384b37bc1f3e4ae81d8e824ccc..0000000000000000000000000000000000000000
--- a/js/src/api/contract/contract.spec.js
+++ /dev/null
@@ -1,597 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import sinon from 'sinon';
-
-import { TEST_HTTP_URL, mockHttp } from '../../../test/mockRpc';
-
-import Abi from '../../abi';
-import { sha3 } from '../util/sha3';
-
-import Api from '../api';
-import Contract from './contract';
-import { isInstanceOf, isFunction } from '../util/types';
-
-const transport = new Api.Transport.Http(TEST_HTTP_URL, -1);
-const eth = new Api(transport);
-
-describe('api/contract/Contract', () => {
-  const ADDR = '0x0123456789';
-
-  const ABI = [
-    {
-      type: 'function', name: 'test',
-      inputs: [{ name: 'boolin', type: 'bool' }, { name: 'stringin', type: 'string' }],
-      outputs: [{ type: 'uint' }]
-    },
-    {
-      type: 'function', name: 'test2',
-      outputs: [{ type: 'uint' }, { type: 'uint' }]
-    },
-    {
-      type: 'constructor',
-      inputs: [{ name: 'boolin', type: 'bool' }, { name: 'stringin', type: 'string' }]
-    },
-    { type: 'event', name: 'baz' },
-    { type: 'event', name: 'foo' }
-  ];
-
-  const ABI_NO_PARAMS = [
-    {
-      type: 'function', name: 'test',
-      inputs: [{ name: 'boolin', type: 'bool' }, { name: 'stringin', type: 'string' }],
-      outputs: [{ type: 'uint' }]
-    },
-    {
-      type: 'function', name: 'test2',
-      outputs: [{ type: 'uint' }, { type: 'uint' }]
-    },
-    {
-      type: 'constructor'
-    },
-    { type: 'event', name: 'baz' },
-    { type: 'event', name: 'foo' }
-  ];
-
-  const VALUES = [ true, 'jacogr' ];
-  const CALLDATA = `
-    0000000000000000000000000000000000000000000000000000000000000001
-    0000000000000000000000000000000000000000000000000000000000000040
-    0000000000000000000000000000000000000000000000000000000000000006
-    6a61636f67720000000000000000000000000000000000000000000000000000
-  `.replace(/\s/g, '');
-  const SIGNATURE = '02356205';
-
-  const ENCODED = `0x${SIGNATURE}${CALLDATA}`;
-
-  const RETURN1 = '0000000000000000000000000000000000000000000000000000000000123456';
-  const RETURN2 = '0000000000000000000000000000000000000000000000000000000000456789';
-  let scope;
-
-  describe('constructor', () => {
-    it('needs an EthAbi instance', () => {
-      expect(() => new Contract()).to.throw(/API instance needs to be provided to Contract/);
-    });
-
-    it('needs an ABI', () => {
-      expect(() => new Contract(eth)).to.throw(/ABI needs to be provided to Contract instance/);
-    });
-
-    describe('internal setup', () => {
-      const contract = new Contract(eth, ABI);
-
-      it('sets EthApi & parsed interface', () => {
-        expect(contract.address).to.not.be.ok;
-        expect(contract.api).to.deep.equal(eth);
-        expect(isInstanceOf(contract.abi, Abi)).to.be.ok;
-      });
-
-      it('attaches functions', () => {
-        expect(contract.functions.length).to.equal(2);
-        expect(contract.functions[0].name).to.equal('test');
-      });
-
-      it('attaches constructors', () => {
-        expect(contract.constructors.length).to.equal(1);
-      });
-
-      it('attaches events', () => {
-        expect(contract.events.length).to.equal(2);
-        expect(contract.events[0].name).to.equal('baz');
-      });
-    });
-  });
-
-  describe('at', () => {
-    it('sets returns the functions, events & sets the address', () => {
-      const contract = new Contract(eth, [
-        {
-          constant: true,
-          inputs: [{
-            name: '_who',
-            type: 'address'
-          }],
-          name: 'balanceOf',
-          outputs: [{
-            name: '',
-            type: 'uint256'
-          }],
-          type: 'function'
-        },
-        {
-          anonymous: false,
-          inputs: [{
-            indexed: false,
-            name: 'amount',
-            type: 'uint256'
-          }],
-          name: 'Drained',
-          type: 'event'
-        }
-      ]);
-
-      contract.at('6789');
-
-      expect(Object.keys(contract.instance)).to.deep.equal([
-        'Drained',
-        /^(?:0x)(.+)$/.exec(sha3('Drained(uint256)'))[1],
-        'balanceOf',
-        /^(?:0x)(.+)$/.exec(sha3('balanceOf(address)'))[1].substr(0, 8),
-        'address'
-      ]);
-      expect(contract.address).to.equal('6789');
-    });
-  });
-
-  describe('parseTransactionEvents', () => {
-    it('parses a transaction log into the data', () => {
-      const contract = new Contract(eth, [
-        {
-          anonymous: false, name: 'Message', type: 'event',
-          inputs: [
-            { indexed: true, name: 'postId', type: 'uint256' },
-            { indexed: false, name: 'parentId', type: 'uint256' },
-            { indexed: false, name: 'sender', type: 'address' },
-            { indexed: false, name: 'at', type: 'uint256' },
-            { indexed: false, name: 'messageId', type: 'uint256' },
-            { indexed: false, name: 'message', type: 'string' }
-          ]
-        }
-      ]);
-      const decoded = contract.parseTransactionEvents({
-        blockHash: '0xa9280530a3b47bee2fc80f2862fd56502ae075350571d724d6442ea4c597347b',
-        blockNumber: '0x4fcd',
-        cumulativeGasUsed: '0xb57f',
-        gasUsed: '0xb57f',
-        logs: [{
-          address: '0x22bff18ec62281850546a664bb63a5c06ac5f76c',
-          blockHash: '0xa9280530a3b47bee2fc80f2862fd56502ae075350571d724d6442ea4c597347b',
-          blockNumber: '0x4fcd',
-          data: '0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000063cf90d3f0410092fc0fca41846f5962239791950000000000000000000000000000000000000000000000000000000056e6c85f0000000000000000000000000000000000000000000000000001000000004fcd00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000d706f7374286d6573736167652900000000000000000000000000000000000000',
-          logIndex: '0x0',
-          topics: [
-            '0x954ba6c157daf8a26539574ffa64203c044691aa57251af95f4b48d85ec00dd5',
-            '0x0000000000000000000000000000000000000000000000000001000000004fe0'
-          ],
-          transactionHash: '0xca16f537d761d13e4e80953b754e2b15541f267d6cad9381f750af1bae1e4917',
-          transactionIndex: '0x0'
-        }],
-        to: '0x22bff18ec62281850546a664bb63a5c06ac5f76c',
-        transactionHash: '0xca16f537d761d13e4e80953b754e2b15541f267d6cad9381f750af1bae1e4917',
-        transactionIndex: '0x0'
-      });
-      const log = decoded.logs[0];
-
-      expect(log.event).to.equal('Message');
-      expect(log.address).to.equal('0x22bff18ec62281850546a664bb63a5c06ac5f76c');
-      expect(log.params).to.deep.equal({
-        at: { type: 'uint', value: new BigNumber('1457965151') },
-        message: { type: 'string', value: 'post(message)' },
-        messageId: { type: 'uint', value: new BigNumber('281474976731085') },
-        parentId: { type: 'uint', value: new BigNumber(0) },
-        postId: { type: 'uint', value: new BigNumber('281474976731104') },
-        sender: { type: 'address', value: '0x63Cf90D3f0410092FC0fca41846f596223979195' }
-      });
-    });
-  });
-
-  describe('_pollTransactionReceipt', () => {
-    const contract = new Contract(eth, ABI);
-    const ADDRESS = '0xD337e80eEdBdf86eDBba021797d7e4e00Bb78351';
-    const BLOCKNUMBER = '555000';
-    const RECEIPT = { contractAddress: ADDRESS.toLowerCase(), blockNumber: BLOCKNUMBER };
-    const EXPECT = { contractAddress: ADDRESS, blockNumber: new BigNumber(BLOCKNUMBER) };
-
-    let scope;
-    let receipt;
-
-    describe('success', () => {
-      before(() => {
-        scope = mockHttp([
-          { method: 'eth_getTransactionReceipt', reply: { result: null } },
-          { method: 'eth_getTransactionReceipt', reply: { result: null } },
-          { method: 'eth_getTransactionReceipt', reply: { result: RECEIPT } }
-        ]);
-
-        return contract
-          ._pollTransactionReceipt('0x123')
-          .then((_receipt) => {
-            receipt = _receipt;
-          });
-      });
-
-      it('sends multiple getTransactionReceipt calls', () => {
-        expect(scope.isDone()).to.be.true;
-      });
-
-      it('passes the txhash through', () => {
-        expect(scope.body.eth_getTransactionReceipt.params[0]).to.equal('0x123');
-      });
-
-      it('receives the final receipt', () => {
-        expect(receipt).to.deep.equal(EXPECT);
-      });
-    });
-
-    describe('error', () => {
-      before(() => {
-        scope = mockHttp([{ method: 'eth_getTransactionReceipt', reply: { error: { code: -1, message: 'failure' } } }]);
-      });
-
-      it('returns the errors', () => {
-        return contract
-          ._pollTransactionReceipt('0x123')
-          .catch((error) => {
-            expect(error.message).to.match(/failure/);
-          });
-      });
-    });
-  });
-
-  describe('deploy without parameters', () => {
-    const contract = new Contract(eth, ABI_NO_PARAMS);
-    const CODE = '0x123';
-    const ADDRESS = '0xD337e80eEdBdf86eDBba021797d7e4e00Bb78351';
-    const RECEIPT_DONE = { contractAddress: ADDRESS.toLowerCase(), gasUsed: 50, blockNumber: 2500 };
-
-    let scope;
-
-    describe('success', () => {
-      before(() => {
-        scope = mockHttp([
-          { method: 'eth_estimateGas', reply: { result: 1000 } },
-          { method: 'parity_postTransaction', reply: { result: '0x678' } },
-          { method: 'parity_checkRequest', reply: { result: '0x890' } },
-          { method: 'eth_getTransactionReceipt', reply: { result: RECEIPT_DONE } },
-          { method: 'eth_getCode', reply: { result: CODE } }
-        ]);
-
-        return contract.deploy({ data: CODE }, []);
-      });
-
-      it('passes the options through to postTransaction (incl. gas calculation)', () => {
-        expect(scope.body.parity_postTransaction.params[0].data).to.equal(CODE);
-      });
-    });
-  });
-
-  describe('deploy', () => {
-    const contract = new Contract(eth, ABI);
-    const ADDRESS = '0xD337e80eEdBdf86eDBba021797d7e4e00Bb78351';
-    const RECEIPT_PEND = { contractAddress: ADDRESS.toLowerCase(), gasUsed: 50, blockNumber: 0 };
-    const RECEIPT_DONE = { contractAddress: ADDRESS.toLowerCase(), gasUsed: 50, blockNumber: 2500 };
-    const RECEIPT_EXCP = { contractAddress: ADDRESS.toLowerCase(), gasUsed: 1200, blockNumber: 2500 };
-
-    let scope;
-
-    describe('success', () => {
-      before(() => {
-        scope = mockHttp([
-          { method: 'eth_estimateGas', reply: { result: 1000 } },
-          { method: 'parity_postTransaction', reply: { result: '0x678' } },
-          { method: 'parity_checkRequest', reply: { result: null } },
-          { method: 'parity_checkRequest', reply: { result: '0x890' } },
-          { method: 'eth_getTransactionReceipt', reply: { result: null } },
-          { method: 'eth_getTransactionReceipt', reply: { result: RECEIPT_PEND } },
-          { method: 'eth_getTransactionReceipt', reply: { result: RECEIPT_DONE } },
-          { method: 'eth_getCode', reply: { result: '0x456' } }
-        ]);
-
-        return contract.deploy({ data: '0x123' }, VALUES);
-      });
-
-      it('calls estimateGas, postTransaction, checkRequest, getTransactionReceipt & getCode in order', () => {
-        expect(scope.isDone()).to.be.true;
-      });
-
-      it('passes the options through to postTransaction (incl. gas calculation)', () => {
-        expect(scope.body.parity_postTransaction.params).to.deep.equal([
-          { data: `0x123${CALLDATA}`, gas: '0x4b0' }
-        ]);
-      });
-
-      it('sets the address of the contract', () => {
-        expect(contract.address).to.equal(ADDRESS);
-      });
-    });
-
-    describe('error', () => {
-      it('fails when gasUsed == gas', () => {
-        mockHttp([
-          { method: 'eth_estimateGas', reply: { result: 1000 } },
-          { method: 'parity_postTransaction', reply: { result: '0x678' } },
-          { method: 'parity_checkRequest', reply: { result: '0x789' } },
-          { method: 'eth_getTransactionReceipt', reply: { result: RECEIPT_EXCP } }
-        ]);
-
-        return contract
-          .deploy({ data: '0x123' }, VALUES)
-          .catch((error) => {
-            expect(error.message).to.match(/not deployed, gasUsed/);
-          });
-      });
-
-      it('fails when no code was deployed', () => {
-        mockHttp([
-          { method: 'eth_estimateGas', reply: { result: 1000 } },
-          { method: 'parity_postTransaction', reply: { result: '0x678' } },
-          { method: 'parity_checkRequest', reply: { result: '0x789' } },
-          { method: 'eth_getTransactionReceipt', reply: { result: RECEIPT_DONE } },
-          { method: 'eth_getCode', reply: { result: '0x' } }
-        ]);
-
-        return contract
-          .deploy({ data: '0x123' }, VALUES)
-          .catch((error) => {
-            expect(error.message).to.match(/not deployed, getCode/);
-          });
-      });
-    });
-  });
-
-  describe('bindings', () => {
-    let contract;
-    let cons;
-    let func;
-
-    beforeEach(() => {
-      contract = new Contract(eth, ABI);
-      contract.at(ADDR);
-      cons = contract.constructors[0];
-      func = contract.functions.find((fn) => fn.name === 'test');
-    });
-
-    describe('_addOptionsTo', () => {
-      it('works on no object specified', () => {
-        expect(contract._addOptionsTo()).to.deep.equal({ to: ADDR });
-      });
-
-      it('uses the contract address when none specified', () => {
-        expect(contract._addOptionsTo({ from: 'me' })).to.deep.equal({ to: ADDR, from: 'me' });
-      });
-
-      it('overrides the contract address when specified', () => {
-        expect(contract._addOptionsTo({ to: 'you', from: 'me' })).to.deep.equal({ to: 'you', from: 'me' });
-      });
-    });
-
-    describe('attachments', () => {
-      it('attaches .call, .postTransaction & .estimateGas to constructors', () => {
-        expect(isFunction(cons.call)).to.be.true;
-        expect(isFunction(cons.postTransaction)).to.be.true;
-        expect(isFunction(cons.estimateGas)).to.be.true;
-      });
-
-      it('attaches .call, .postTransaction & .estimateGas to functions', () => {
-        expect(isFunction(func.call)).to.be.true;
-        expect(isFunction(func.postTransaction)).to.be.true;
-        expect(isFunction(func.estimateGas)).to.be.true;
-      });
-
-      it('attaches .call only to constant functions', () => {
-        func = (new Contract(eth, [{ type: 'function', name: 'test', constant: true }])).functions[0];
-
-        expect(isFunction(func.call)).to.be.true;
-        expect(isFunction(func.postTransaction)).to.be.false;
-        expect(isFunction(func.estimateGas)).to.be.false;
-      });
-    });
-
-    describe('postTransaction', () => {
-      beforeEach(() => {
-        scope = mockHttp([{ method: 'parity_postTransaction', reply: { result: ['hashId'] } }]);
-      });
-
-      it('encodes options and mades an parity_postTransaction call', () => {
-        return func
-          .postTransaction({ someExtras: 'foo' }, VALUES)
-          .then(() => {
-            expect(scope.isDone()).to.be.true;
-            expect(scope.body.parity_postTransaction.params[0]).to.deep.equal({
-              someExtras: 'foo',
-              to: ADDR,
-              data: ENCODED
-            });
-          });
-      });
-    });
-
-    describe('estimateGas', () => {
-      beforeEach(() => {
-        scope = mockHttp([{ method: 'eth_estimateGas', reply: { result: ['0x123'] } }]);
-      });
-
-      it('encodes options and mades an eth_estimateGas call', () => {
-        return func
-          .estimateGas({ someExtras: 'foo' }, VALUES)
-          .then((amount) => {
-            expect(scope.isDone()).to.be.true;
-            expect(amount.toString(16)).to.equal('123');
-            expect(scope.body.eth_estimateGas.params).to.deep.equal([{
-              someExtras: 'foo',
-              to: ADDR,
-              data: ENCODED
-            }]);
-          });
-      });
-    });
-
-    describe('call', () => {
-      it('encodes options and mades an eth_call call', () => {
-        scope = mockHttp([{ method: 'eth_call', reply: { result: RETURN1 } }]);
-
-        return func
-          .call({ someExtras: 'foo' }, VALUES)
-          .then((result) => {
-            expect(scope.isDone()).to.be.true;
-            expect(scope.body.eth_call.params).to.deep.equal([{
-              someExtras: 'foo',
-              to: ADDR,
-              data: ENCODED
-            }, 'latest']);
-            expect(result.toString(16)).to.equal('123456');
-          });
-      });
-
-      it('encodes options and mades an eth_call call (multiple returns)', () => {
-        scope = mockHttp([{ method: 'eth_call', reply: { result: `${RETURN1}${RETURN2}` } }]);
-
-        return contract.functions[1]
-          .call({}, [])
-          .then((result) => {
-            expect(scope.isDone()).to.be.true;
-            expect(result.length).to.equal(2);
-            expect(result[0].toString(16)).to.equal('123456');
-            expect(result[1].toString(16)).to.equal('456789');
-          });
-      });
-    });
-  });
-
-  describe('subscribe', () => {
-    const abi = [
-      {
-        anonymous: false, name: 'Message', type: 'event',
-        inputs: [
-          { indexed: true, name: 'postId', type: 'uint256' },
-          { indexed: false, name: 'parentId', type: 'uint256' },
-          { indexed: false, name: 'sender', type: 'address' },
-          { indexed: false, name: 'at', type: 'uint256' },
-          { indexed: false, name: 'messageId', type: 'uint256' },
-          { indexed: false, name: 'message', type: 'string' }
-        ]
-      }
-    ];
-
-    const logs = [{
-      address: '0x22bff18ec62281850546a664bb63a5c06ac5f76c',
-      blockHash: '0xa9280530a3b47bee2fc80f2862fd56502ae075350571d724d6442ea4c597347b',
-      blockNumber: '0x4fcd',
-      data: '0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000063cf90d3f0410092fc0fca41846f5962239791950000000000000000000000000000000000000000000000000000000056e6c85f0000000000000000000000000000000000000000000000000001000000004fcd00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000d706f7374286d6573736167652900000000000000000000000000000000000000',
-      logIndex: '0x0',
-      topics: [
-        '0x954ba6c157daf8a26539574ffa64203c044691aa57251af95f4b48d85ec00dd5',
-        '0x0000000000000000000000000000000000000000000000000001000000004fe0'
-      ],
-      transactionHash: '0xca16f537d761d13e4e80953b754e2b15541f267d6cad9381f750af1bae1e4917',
-      transactionIndex: '0x0'
-    }];
-
-    const parsed = [{
-      address: '0x22bfF18ec62281850546a664bb63a5C06AC5F76C',
-      blockHash: '0xa9280530a3b47bee2fc80f2862fd56502ae075350571d724d6442ea4c597347b',
-      blockNumber: new BigNumber(20429),
-      data: '0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000063cf90d3f0410092fc0fca41846f5962239791950000000000000000000000000000000000000000000000000000000056e6c85f0000000000000000000000000000000000000000000000000001000000004fcd00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000d706f7374286d6573736167652900000000000000000000000000000000000000',
-      event: 'Message',
-      logIndex: new BigNumber(0),
-      params: {
-        at: { type: 'uint', value: new BigNumber(1457965151) },
-        message: { type: 'string', value: 'post(message)' },
-        messageId: { type: 'uint', value: new BigNumber(281474976731085) },
-        parentId: { type: 'uint', value: new BigNumber(0) },
-        postId: { type: 'uint', value: new BigNumber(281474976731104) },
-        sender: { type: 'address', value: '0x63Cf90D3f0410092FC0fca41846f596223979195' }
-      },
-      topics: [
-        '0x954ba6c157daf8a26539574ffa64203c044691aa57251af95f4b48d85ec00dd5',
-        '0x0000000000000000000000000000000000000000000000000001000000004fe0'
-      ],
-      transactionHash: '0xca16f537d761d13e4e80953b754e2b15541f267d6cad9381f750af1bae1e4917',
-      transactionIndex: new BigNumber(0)
-    }];
-
-    let contract;
-
-    beforeEach(() => {
-      contract = new Contract(eth, abi);
-      contract.at(ADDR);
-    });
-
-    describe('invalid events', () => {
-      it('fails to subscribe to an invalid names', () => {
-        return contract
-          .subscribe('invalid')
-          .catch((error) => {
-            expect(error.message).to.match(/invalid is not a valid eventName/);
-          });
-      });
-    });
-
-    describe('valid events', () => {
-      let cbb;
-      let cbe;
-
-      beforeEach(() => {
-        scope = mockHttp([
-          { method: 'eth_newFilter', reply: { result: '0x123' } },
-          { method: 'eth_getFilterLogs', reply: { result: logs } },
-          { method: 'eth_getFilterChanges', reply: { result: logs } },
-          { method: 'eth_newFilter', reply: { result: '0x123' } },
-          { method: 'eth_getFilterLogs', reply: { result: logs } }
-        ]);
-        cbb = sinon.stub();
-        cbe = sinon.stub();
-
-        return contract.subscribe('Message', { toBlock: 'pending' }, cbb);
-      });
-
-      it('sets the subscriptionId returned', () => {
-        return contract
-          .subscribe('Message', { toBlock: 'pending' }, cbe)
-          .then((subscriptionId) => {
-            expect(subscriptionId).to.equal(1);
-          });
-      });
-
-      it('creates a new filter and retrieves the logs on it', () => {
-        return contract
-          .subscribe('Message', { toBlock: 'pending' }, cbe)
-          .then((subscriptionId) => {
-            expect(scope.isDone()).to.be.true;
-          });
-      });
-
-      it('returns the logs to the callback', () => {
-        return contract
-          .subscribe('Message', { toBlock: 'pending' }, cbe)
-          .then((subscriptionId) => {
-            expect(cbe).to.have.been.calledWith(null, parsed);
-          });
-      });
-    });
-  });
-});
diff --git a/js/src/api/contract/index.js b/js/src/api/contract/index.js
deleted file mode 100644
index 74c58e942d4f23ba7637a544b403a1e1f88ffb37..0000000000000000000000000000000000000000
--- a/js/src/api/contract/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './contract';
diff --git a/js/src/api/format/input.js b/js/src/api/format/input.js
deleted file mode 100644
index 0ccd10604bfe3d218553d006b9caf89b7e10b001..0000000000000000000000000000000000000000
--- a/js/src/api/format/input.js
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import { isArray, isHex, isInstanceOf, isString } from '../util/types';
-import { padLeft, toHex } from '../util/format';
-
-export function inAddress (address) {
-  // TODO: address validation if we have upper-lower addresses
-  return inHex(address);
-}
-
-export function inAddresses (addresses) {
-  return (addresses || []).map(inAddress);
-}
-
-export function inBlockNumber (blockNumber) {
-  if (isString(blockNumber)) {
-    switch (blockNumber) {
-      case 'earliest':
-      case 'latest':
-      case 'pending':
-        return blockNumber;
-    }
-  }
-
-  return inNumber16(blockNumber);
-}
-
-export function inData (data) {
-  if (data && data.length && !isHex(data)) {
-    data = data.split('').map((chr) => {
-      return `0${chr.charCodeAt(0).toString(16)}`.slice(-2);
-    }).join('');
-  }
-
-  return inHex(data);
-}
-
-export function inHash (hash) {
-  return inHex(hash);
-}
-
-export function inTopics (_topics) {
-  let topics = (_topics || [])
-    .filter((topic) => topic === null || topic)
-    .map((topic) => {
-      if (topic === null) {
-        return null;
-      }
-
-      if (Array.isArray(topic)) {
-        return inTopics(topic);
-      }
-
-      return padLeft(topic, 32);
-    });
-
-  return topics;
-}
-
-export function inFilter (options) {
-  if (options) {
-    Object.keys(options).forEach((key) => {
-      switch (key) {
-        case 'address':
-          if (isArray(options[key])) {
-            options[key] = options[key].map(inAddress);
-          } else {
-            options[key] = inAddress(options[key]);
-          }
-          break;
-
-        case 'fromBlock':
-        case 'toBlock':
-          options[key] = inBlockNumber(options[key]);
-          break;
-
-        case 'limit':
-          options[key] = inNumber10(options[key]);
-          break;
-
-        case 'topics':
-          options[key] = inTopics(options[key]);
-      }
-    });
-  }
-
-  return options;
-}
-
-export function inHex (str) {
-  return toHex(str);
-}
-
-export function inNumber10 (number) {
-  if (isInstanceOf(number, BigNumber)) {
-    return number.toNumber();
-  }
-
-  return (new BigNumber(number || 0)).toNumber();
-}
-
-export function inNumber16 (number) {
-  const bn = isInstanceOf(number, BigNumber)
-    ? number
-    : (new BigNumber(number || 0));
-
-  if (!bn.isInteger()) {
-    throw new Error(`[format/input::inNumber16] the given number is not an integer: ${bn.toFormat()}`);
-  }
-
-  return inHex(bn.toString(16));
-}
-
-export function inOptionsCondition (condition) {
-  if (condition) {
-    if (condition.block) {
-      condition.block = condition.block ? inNumber10(condition.block) : null;
-    } else if (condition.time) {
-      condition.time = inNumber10(Math.floor(condition.time.getTime() / 1000));
-    }
-  }
-
-  return condition;
-}
-
-export function inOptions (_options = {}) {
-  const options = { ..._options };
-
-  Object.keys(options).forEach((key) => {
-    switch (key) {
-      case 'to':
-        // Don't encode the `to` option if it's empty
-        // (eg. contract deployments)
-        if (options[key]) {
-          options.to = inAddress(options[key]);
-        }
-        break;
-
-      case 'from':
-        options[key] = inAddress(options[key]);
-        break;
-
-      case 'condition':
-        options[key] = inOptionsCondition(options[key]);
-        break;
-
-      case 'gas':
-      case 'gasPrice':
-        options[key] = inNumber16((new BigNumber(options[key])).round());
-        break;
-
-      case 'value':
-      case 'nonce':
-        options[key] = inNumber16(options[key]);
-        break;
-
-      case 'data':
-        options[key] = inData(options[key]);
-        break;
-    }
-  });
-
-  return options;
-}
-
-export function inTraceFilter (filterObject) {
-  if (filterObject) {
-    Object.keys(filterObject).forEach((key) => {
-      switch (key) {
-        case 'fromAddress':
-        case 'toAddress':
-          filterObject[key] = [].concat(filterObject[key])
-            .map(address => inAddress(address));
-          break;
-
-        case 'toBlock':
-        case 'fromBlock':
-          filterObject[key] = inBlockNumber(filterObject[key]);
-          break;
-      }
-    });
-  }
-
-  return filterObject;
-}
-
-export function inTraceType (whatTrace) {
-  if (isString(whatTrace)) {
-    return [whatTrace];
-  }
-
-  return whatTrace;
-}
-
-function inDeriveType (derive) {
-  return derive && derive.type === 'hard' ? 'hard' : 'soft';
-}
-
-export function inDeriveHash (derive) {
-  const hash = derive && derive.hash ? derive.hash : derive;
-  const type = inDeriveType(derive);
-
-  return {
-    hash: inHex(hash),
-    type
-  };
-}
-
-export function inDeriveIndex (derive) {
-  if (!derive) {
-    return [];
-  }
-
-  if (!isArray(derive)) {
-    derive = [derive];
-  }
-
-  return derive.map(item => {
-    const index = inNumber10(item && item.index ? item.index : item);
-
-    return {
-      index,
-      type: inDeriveType(item)
-    };
-  });
-}
diff --git a/js/src/api/format/input.spec.js b/js/src/api/format/input.spec.js
deleted file mode 100644
index eb74b7bd67cef4c96f0d35273107076e0c5cb478..0000000000000000000000000000000000000000
--- a/js/src/api/format/input.spec.js
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import {
-  inAddress, inBlockNumber, inData, inFilter, inHex,
-  inNumber10, inNumber16, inOptions, inTraceType,
-  inDeriveHash, inDeriveIndex
-} from './input';
-import { isAddress } from '../../../test/types';
-
-describe('api/format/input', () => {
-  const address = '0x63cf90d3f0410092fc0fca41846f596223979195';
-
-  describe('inAddress', () => {
-    const address = '63cf90d3f0410092fc0fca41846f596223979195';
-
-    it('adds the leading 0x as required', () => {
-      expect(inAddress(address)).to.equal(`0x${address}`);
-    });
-
-    it('returns verified addresses as-is', () => {
-      expect(inAddress(`0x${address}`)).to.equal(`0x${address}`);
-    });
-
-    it('returns lowercase equivalents', () => {
-      expect(inAddress(address.toUpperCase())).to.equal(`0x${address}`);
-    });
-
-    it('returns 0x on null addresses', () => {
-      expect(inAddress()).to.equal('0x');
-    });
-  });
-
-  describe('inBlockNumber()', () => {
-    it('returns earliest as-is', () => {
-      expect(inBlockNumber('earliest')).to.equal('earliest');
-    });
-
-    it('returns latest as-is', () => {
-      expect(inBlockNumber('latest')).to.equal('latest');
-    });
-
-    it('returns pending as-is', () => {
-      expect(inBlockNumber('pending')).to.equal('pending');
-    });
-
-    it('formats existing BigNumber into hex', () => {
-      expect(inBlockNumber(new BigNumber(0x123456))).to.equal('0x123456');
-    });
-
-    it('formats hex strings into hex', () => {
-      expect(inBlockNumber('0x123456')).to.equal('0x123456');
-    });
-
-    it('formats numbers into hex', () => {
-      expect(inBlockNumber(0x123456)).to.equal('0x123456');
-    });
-  });
-
-  describe('inData', () => {
-    it('formats to hex', () => {
-      expect(inData('123456')).to.equal('0x123456');
-    });
-
-    it('converts a string to a hex representation', () => {
-      expect(inData('jaco')).to.equal('0x6a61636f');
-    });
-  });
-
-  describe('inHex', () => {
-    it('leaves leading 0x as-is', () => {
-      expect(inHex('0x123456')).to.equal('0x123456');
-    });
-
-    it('adds a leading 0x', () => {
-      expect(inHex('123456')).to.equal('0x123456');
-    });
-
-    it('returns uppercase as lowercase (leading 0x)', () => {
-      expect(inHex('0xABCDEF')).to.equal('0xabcdef');
-    });
-
-    it('returns uppercase as lowercase (no leading 0x)', () => {
-      expect(inHex('ABCDEF')).to.equal('0xabcdef');
-    });
-
-    it('handles empty & null', () => {
-      expect(inHex()).to.equal('0x');
-      expect(inHex('')).to.equal('0x');
-    });
-  });
-
-  describe('inFilter', () => {
-    ['address'].forEach((input) => {
-      it(`formats ${input} address as address`, () => {
-        const block = {};
-
-        block[input] = address;
-        const formatted = inFilter(block)[input];
-
-        expect(isAddress(formatted)).to.be.true;
-        expect(formatted).to.equal(address);
-      });
-    });
-
-    ['fromBlock', 'toBlock'].forEach((input) => {
-      it(`formats ${input} number as blockNumber`, () => {
-        const block = {};
-
-        block[input] = 0x123;
-        const formatted = inFilter(block)[input];
-
-        expect(formatted).to.equal('0x123');
-      });
-    });
-
-    it('ignores and passes through unknown keys', () => {
-      expect(inFilter({ someRandom: 'someRandom' })).to.deep.equal({ someRandom: 'someRandom' });
-    });
-
-    it('formats an filter options object with relevant entries converted', () => {
-      expect(
-        inFilter({
-          address: address,
-          fromBlock: 'latest',
-          toBlock: 0x101,
-          extraData: 'someExtraStuffInHere',
-          limit: 0x32
-        })
-      ).to.deep.equal({
-        address: address,
-        fromBlock: 'latest',
-        toBlock: '0x101',
-        extraData: 'someExtraStuffInHere',
-        limit: 50
-      });
-    });
-  });
-
-  describe('inNumber10()', () => {
-    it('formats existing BigNumber into number', () => {
-      expect(inNumber10(new BigNumber(123))).to.equal(123);
-    });
-
-    it('formats hex strings into decimal', () => {
-      expect(inNumber10('0x0a')).to.equal(10);
-    });
-
-    it('formats numbers into number', () => {
-      expect(inNumber10(123)).to.equal(123);
-    });
-
-    it('formats undefined into 0', () => {
-      expect(inNumber10()).to.equal(0);
-    });
-  });
-
-  describe('inNumber16()', () => {
-    it('formats existing BigNumber into hex', () => {
-      expect(inNumber16(new BigNumber(0x123456))).to.equal('0x123456');
-    });
-
-    it('formats hex strings into hex', () => {
-      expect(inNumber16('0x123456')).to.equal('0x123456');
-    });
-
-    it('formats numbers into hex', () => {
-      expect(inNumber16(0x123456)).to.equal('0x123456');
-    });
-
-    it('formats undefined into 0', () => {
-      expect(inNumber16()).to.equal('0x0');
-    });
-  });
-
-  describe('inOptions', () => {
-    ['data'].forEach((input) => {
-      it(`converts ${input} to hex data`, () => {
-        const block = {};
-
-        block[input] = '1234';
-        const formatted = inData(block[input]);
-
-        expect(formatted).to.equal('0x1234');
-      });
-    });
-
-    ['from', 'to'].forEach((input) => {
-      it(`formats ${input} address as address`, () => {
-        const block = {};
-
-        block[input] = address;
-        const formatted = inOptions(block)[input];
-
-        expect(isAddress(formatted)).to.be.true;
-        expect(formatted).to.equal(address);
-      });
-    });
-
-    it('does not encode an empty `to` value', () => {
-      const options = { to: '' };
-      const formatted = inOptions(options);
-
-      expect(formatted.to).to.equal('');
-    });
-
-    ['gas', 'gasPrice', 'value', 'nonce'].forEach((input) => {
-      it(`formats ${input} number as hexnumber`, () => {
-        const block = {};
-
-        block[input] = 0x123;
-        const formatted = inOptions(block)[input];
-
-        expect(formatted).to.equal('0x123');
-      });
-    });
-
-    it('passes condition as null when specified as such', () => {
-      expect(inOptions({ condition: null })).to.deep.equal({ condition: null });
-    });
-
-    it('ignores and passes through unknown keys', () => {
-      expect(inOptions({ someRandom: 'someRandom' })).to.deep.equal({ someRandom: 'someRandom' });
-    });
-
-    it('formats an options object with relevant entries converted', () => {
-      expect(
-        inOptions({
-          from: address,
-          to: address,
-          gas: new BigNumber('0x100'),
-          gasPrice: 0x101,
-          value: 258,
-          nonce: '0x104',
-          data: '0123456789',
-          extraData: 'someExtraStuffInHere'
-        })
-      ).to.deep.equal({
-        from: address,
-        to: address,
-        gas: '0x100',
-        gasPrice: '0x101',
-        value: '0x102',
-        nonce: '0x104',
-        data: '0x0123456789',
-        extraData: 'someExtraStuffInHere'
-      });
-    });
-  });
-
-  describe('inTraceType', () => {
-    it('returns array of types as is', () => {
-      const types = ['vmTrace', 'trace', 'stateDiff'];
-
-      expect(inTraceType(types)).to.deep.equal(types);
-    });
-
-    it('formats single string type into array', () => {
-      const type = 'vmTrace';
-
-      expect(inTraceType(type)).to.deep.equal([type]);
-    });
-  });
-
-  describe('inDeriveHash', () => {
-    it('returns derive hash', () => {
-      expect(inDeriveHash(1)).to.deep.equal({
-        hash: '0x1',
-        type: 'soft'
-      });
-
-      expect(inDeriveHash(null)).to.deep.equal({
-        hash: '0x',
-        type: 'soft'
-      });
-
-      expect(inDeriveHash({
-        hash: 5
-      })).to.deep.equal({
-        hash: '0x5',
-        type: 'soft'
-      });
-
-      expect(inDeriveHash({
-        hash: 5,
-        type: 'hard'
-      })).to.deep.equal({
-        hash: '0x5',
-        type: 'hard'
-      });
-    });
-  });
-
-  describe('inDeriveIndex', () => {
-    it('returns derive hash', () => {
-      expect(inDeriveIndex(null)).to.deep.equal([]);
-      expect(inDeriveIndex([])).to.deep.equal([]);
-
-      expect(inDeriveIndex([1])).to.deep.equal([{
-        index: 1,
-        type: 'soft'
-      }]);
-
-      expect(inDeriveIndex({
-        index: 1
-      })).to.deep.equal([{
-        index: 1,
-        type: 'soft'
-      }]);
-
-      expect(inDeriveIndex([{
-        index: 1,
-        type: 'hard'
-      }, 5])).to.deep.equal([
-        {
-          index: 1,
-          type: 'hard'
-        },
-        {
-          index: 5,
-          type: 'soft'
-        }
-      ]);
-    });
-  });
-});
diff --git a/js/src/api/format/output.js b/js/src/api/format/output.js
deleted file mode 100644
index 7bf39d17c675b8292c7428776067915d54a0c255..0000000000000000000000000000000000000000
--- a/js/src/api/format/output.js
+++ /dev/null
@@ -1,414 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import { toChecksumAddress } from '../../abi/util/address';
-import { isString } from '../util/types';
-
-export function outAccountInfo (infos) {
-  return Object
-    .keys(infos)
-    .reduce((ret, _address) => {
-      const info = infos[_address];
-      const address = outAddress(_address);
-
-      ret[address] = {
-        name: info.name
-      };
-
-      if (info.meta) {
-        ret[address].uuid = info.uuid;
-        ret[address].meta = JSON.parse(info.meta);
-      }
-
-      return ret;
-    }, {});
-}
-
-export function outAddress (address) {
-  return toChecksumAddress(address);
-}
-
-export function outAddresses (addresses) {
-  return (addresses || []).map(outAddress);
-}
-
-export function outBlock (block) {
-  if (block) {
-    Object.keys(block).forEach((key) => {
-      switch (key) {
-        case 'author':
-        case 'miner':
-          block[key] = outAddress(block[key]);
-          break;
-
-        case 'difficulty':
-        case 'gasLimit':
-        case 'gasUsed':
-        case 'nonce':
-        case 'number':
-        case 'totalDifficulty':
-          block[key] = outNumber(block[key]);
-          break;
-
-        case 'timestamp':
-          block[key] = outDate(block[key]);
-          break;
-      }
-    });
-  }
-
-  return block;
-}
-
-export function outChainStatus (status) {
-  if (status) {
-    Object.keys(status).forEach((key) => {
-      switch (key) {
-        case 'blockGap':
-          status[key] = status[key]
-            ? status[key].map(outNumber)
-            : status[key];
-          break;
-      }
-    });
-  }
-
-  return status;
-}
-
-export function outDate (date) {
-  if (typeof date.toISOString === 'function') {
-    return date;
-  }
-
-  try {
-    if (typeof date === 'string' && (new Date(date)).toISOString() === date) {
-      return new Date(date);
-    }
-  } catch (error) {}
-
-  return new Date(outNumber(date).toNumber() * 1000);
-}
-
-export function outHistogram (histogram) {
-  if (histogram) {
-    Object.keys(histogram).forEach((key) => {
-      switch (key) {
-        case 'bucketBounds':
-        case 'counts':
-          histogram[key] = histogram[key].map(outNumber);
-          break;
-      }
-    });
-  }
-
-  return histogram;
-}
-
-export function outLog (log) {
-  Object.keys(log).forEach((key) => {
-    switch (key) {
-      case 'blockNumber':
-      case 'logIndex':
-      case 'transactionIndex':
-        log[key] = outNumber(log[key]);
-        break;
-
-      case 'address':
-        log[key] = outAddress(log[key]);
-        break;
-    }
-  });
-
-  return log;
-}
-
-export function outHwAccountInfo (infos) {
-  return Object
-    .keys(infos)
-    .reduce((ret, _address) => {
-      const address = outAddress(_address);
-
-      ret[address] = infos[_address];
-
-      return ret;
-    }, {});
-}
-
-export function outNodeKind (info) {
-  return info;
-}
-
-export function outNumber (number) {
-  return new BigNumber(number || 0);
-}
-
-export function outPeer (peer) {
-  const protocols = Object.keys(peer.protocols)
-    .reduce((obj, key) => {
-      if (peer.protocols[key]) {
-        obj[key] = {
-          ...peer.protocols[key],
-          difficulty: outNumber(peer.protocols[key].difficulty)
-        };
-      }
-
-      return obj;
-    }, {});
-
-  return {
-    ...peer,
-    protocols
-  };
-}
-
-export function outPeers (peers) {
-  return {
-    active: outNumber(peers.active),
-    connected: outNumber(peers.connected),
-    max: outNumber(peers.max),
-    peers: peers.peers.map((peer) => outPeer(peer))
-  };
-}
-
-export function outReceipt (receipt) {
-  if (receipt) {
-    Object.keys(receipt).forEach((key) => {
-      switch (key) {
-        case 'blockNumber':
-        case 'cumulativeGasUsed':
-        case 'gasUsed':
-        case 'transactionIndex':
-          receipt[key] = outNumber(receipt[key]);
-          break;
-
-        case 'contractAddress':
-          receipt[key] = outAddress(receipt[key]);
-          break;
-      }
-    });
-  }
-
-  return receipt;
-}
-
-export function outRecentDapps (recentDapps) {
-  if (recentDapps) {
-    Object.keys(recentDapps).forEach((url) => {
-      recentDapps[url] = outDate(recentDapps[url]);
-    });
-  }
-
-  return recentDapps;
-}
-
-export function outSignerRequest (request) {
-  if (request) {
-    Object.keys(request).forEach((key) => {
-      switch (key) {
-        case 'id':
-          request[key] = outNumber(request[key]);
-          break;
-
-        case 'payload':
-          request[key].decrypt = outSigningPayload(request[key].decrypt);
-          request[key].sign = outSigningPayload(request[key].sign);
-          request[key].signTransaction = outTransaction(request[key].signTransaction);
-          request[key].sendTransaction = outTransaction(request[key].sendTransaction);
-          break;
-
-        case 'origin':
-          const type = Object.keys(request[key])[0];
-          const details = request[key][type];
-
-          request[key] = { type, details };
-          break;
-      }
-    });
-  }
-
-  return request;
-}
-
-export function outSyncing (syncing) {
-  if (syncing && syncing !== 'false') {
-    Object.keys(syncing).forEach((key) => {
-      switch (key) {
-        case 'currentBlock':
-        case 'highestBlock':
-        case 'startingBlock':
-        case 'warpChunksAmount':
-        case 'warpChunksProcessed':
-          syncing[key] = outNumber(syncing[key]);
-          break;
-
-        case 'blockGap':
-          syncing[key] = syncing[key] ? syncing[key].map(outNumber) : syncing[key];
-          break;
-      }
-    });
-  }
-
-  return syncing;
-}
-
-export function outTransactionCondition (condition) {
-  if (condition) {
-    if (condition.block) {
-      condition.block = outNumber(condition.block);
-    } else if (condition.time) {
-      condition.time = outDate(condition.time);
-    }
-  }
-
-  return condition;
-}
-
-export function outTransaction (tx) {
-  if (tx) {
-    Object.keys(tx).forEach((key) => {
-      switch (key) {
-        case 'blockNumber':
-        case 'gasPrice':
-        case 'gas':
-        case 'nonce':
-        case 'transactionIndex':
-        case 'value':
-          tx[key] = outNumber(tx[key]);
-          break;
-
-        case 'condition':
-          tx[key] = outTransactionCondition(tx[key]);
-          break;
-
-        case 'creates':
-        case 'from':
-        case 'to':
-          tx[key] = outAddress(tx[key]);
-          break;
-      }
-    });
-  }
-
-  return tx;
-}
-
-export function outSigningPayload (payload) {
-  if (payload) {
-    Object.keys(payload).forEach((key) => {
-      switch (key) {
-        case 'address':
-          payload[key] = outAddress(payload[key]);
-          break;
-      }
-    });
-  }
-
-  return payload;
-}
-
-export function outTrace (trace) {
-  if (trace) {
-    if (trace.action) {
-      Object.keys(trace.action).forEach(key => {
-        switch (key) {
-          case 'gas':
-          case 'value':
-          case 'balance':
-            trace.action[key] = outNumber(trace.action[key]);
-            break;
-
-          case 'from':
-          case 'to':
-          case 'address':
-          case 'refundAddress':
-            trace.action[key] = outAddress(trace.action[key]);
-            break;
-        }
-      });
-    }
-
-    if (trace.result) {
-      Object.keys(trace.result).forEach(key => {
-        switch (key) {
-          case 'gasUsed':
-            trace.result[key] = outNumber(trace.result[key]);
-            break;
-
-          case 'address':
-            trace.action[key] = outAddress(trace.action[key]);
-            break;
-        }
-      });
-    }
-
-    if (trace.traceAddress) {
-      trace.traceAddress.forEach((address, index) => {
-        trace.traceAddress[index] = outNumber(address);
-      });
-    }
-
-    Object.keys(trace).forEach((key) => {
-      switch (key) {
-        case 'subtraces':
-        case 'transactionPosition':
-        case 'blockNumber':
-          trace[key] = outNumber(trace[key]);
-          break;
-      }
-    });
-  }
-
-  return trace;
-}
-
-export function outTraces (traces) {
-  if (traces) {
-    return traces.map(outTrace);
-  }
-
-  return traces;
-}
-
-export function outTraceReplay (trace) {
-  if (trace) {
-    Object.keys(trace).forEach((key) => {
-      switch (key) {
-        case 'trace':
-          trace[key] = outTraces(trace[key]);
-          break;
-      }
-    });
-  }
-
-  return trace;
-}
-
-export function outVaultMeta (meta) {
-  if (isString(meta)) {
-    try {
-      const obj = JSON.parse(meta);
-
-      return obj;
-    } catch (error) {
-      return {};
-    }
-  }
-
-  return meta || {};
-}
diff --git a/js/src/api/format/output.spec.js b/js/src/api/format/output.spec.js
deleted file mode 100644
index 6ffefaedcc7e5a646546962defab3f1681ea0ce9..0000000000000000000000000000000000000000
--- a/js/src/api/format/output.spec.js
+++ /dev/null
@@ -1,502 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import { outBlock, outAccountInfo, outAddress, outChainStatus, outDate, outHistogram, outHwAccountInfo, outNodeKind, outNumber, outPeer, outPeers, outReceipt, outRecentDapps, outSyncing, outTransaction, outTrace, outVaultMeta } from './output';
-import { isAddress, isBigNumber, isInstanceOf } from '../../../test/types';
-
-describe('api/format/output', () => {
-  const address = '0x63cf90d3f0410092fc0fca41846f596223979195';
-  const checksum = '0x63Cf90D3f0410092FC0fca41846f596223979195';
-
-  describe('outAccountInfo', () => {
-    it('returns meta objects parsed', () => {
-      expect(outAccountInfo(
-        { '0x63cf90d3f0410092fc0fca41846f596223979195': {
-          name: 'name', uuid: 'uuid', meta: '{"name":"456"}' }
-        }
-      )).to.deep.equal({
-        '0x63Cf90D3f0410092FC0fca41846f596223979195': {
-          name: 'name', uuid: 'uuid', meta: { name: '456' }
-        }
-      });
-    });
-
-    it('returns objects without meta & uuid as required', () => {
-      expect(outAccountInfo(
-        { '0x63cf90d3f0410092fc0fca41846f596223979195': { name: 'name' } }
-      )).to.deep.equal({
-        '0x63Cf90D3f0410092FC0fca41846f596223979195': { name: 'name' }
-      });
-    });
-  });
-
-  describe('outAddress', () => {
-    it('retuns the address as checksummed', () => {
-      expect(outAddress(address)).to.equal(checksum);
-    });
-
-    it('retuns the checksum as checksummed', () => {
-      expect(outAddress(checksum)).to.equal(checksum);
-    });
-  });
-
-  describe('outBlock', () => {
-    ['author', 'miner'].forEach((input) => {
-      it(`formats ${input} address as address`, () => {
-        const block = {};
-
-        block[input] = address;
-        const formatted = outBlock(block)[input];
-
-        expect(isAddress(formatted)).to.be.true;
-        expect(formatted).to.equal(checksum);
-      });
-    });
-
-    ['difficulty', 'gasLimit', 'gasUsed', 'number', 'nonce', 'totalDifficulty'].forEach((input) => {
-      it(`formats ${input} number as hexnumber`, () => {
-        const block = {};
-
-        block[input] = 0x123;
-        const formatted = outBlock(block)[input];
-
-        expect(isInstanceOf(formatted, BigNumber)).to.be.true;
-        expect(formatted.toString(16)).to.equal('123');
-      });
-    });
-
-    ['timestamp'].forEach((input) => {
-      it(`formats ${input} number as Date`, () => {
-        const block = {};
-
-        block[input] = 0x57513668;
-        const formatted = outBlock(block)[input];
-
-        expect(isInstanceOf(formatted, Date)).to.be.true;
-        expect(formatted.getTime()).to.equal(1464940136000);
-      });
-    });
-
-    it('ignores and passes through unknown keys', () => {
-      expect(outBlock({ someRandom: 'someRandom' })).to.deep.equal({ someRandom: 'someRandom' });
-    });
-
-    it('formats a block with all the info converted', () => {
-      expect(
-        outBlock({
-          author: address,
-          miner: address,
-          difficulty: '0x100',
-          gasLimit: '0x101',
-          gasUsed: '0x102',
-          number: '0x103',
-          nonce: '0x104',
-          totalDifficulty: '0x105',
-          timestamp: '0x57513668',
-          extraData: 'someExtraStuffInHere'
-        })
-      ).to.deep.equal({
-        author: checksum,
-        miner: checksum,
-        difficulty: new BigNumber('0x100'),
-        gasLimit: new BigNumber('0x101'),
-        gasUsed: new BigNumber('0x102'),
-        number: new BigNumber('0x103'),
-        nonce: new BigNumber('0x104'),
-        totalDifficulty: new BigNumber('0x105'),
-        timestamp: new Date('2016-06-03T07:48:56.000Z'),
-        extraData: 'someExtraStuffInHere'
-      });
-    });
-  });
-
-  describe('outChainStatus', () => {
-    it('formats blockGap values', () => {
-      const status = {
-        blockGap: [0x1234, '0x5678']
-      };
-
-      expect(outChainStatus(status)).to.deep.equal({
-        blockGap: [new BigNumber(0x1234), new BigNumber(0x5678)]
-      });
-    });
-
-    it('handles null blockGap values', () => {
-      const status = {
-        blockGap: null
-      };
-
-      expect(outChainStatus(status)).to.deep.equal(status);
-    });
-  });
-
-  describe('outDate', () => {
-    it('converts a second date in unix timestamp', () => {
-      expect(outDate(0x57513668)).to.deep.equal(new Date('2016-06-03T07:48:56.000Z'));
-    });
-  });
-
-  describe('outHistogram', () => {
-    ['bucketBounds', 'counts'].forEach((type) => {
-      it(`formats ${type} as number arrays`, () => {
-        expect(
-          outHistogram({ [type]: [0x123, 0x456, 0x789] })
-        ).to.deep.equal({
-          [type]: [new BigNumber(0x123), new BigNumber(0x456), new BigNumber(0x789)]
-        });
-      });
-    });
-  });
-
-  describe('outHwAccountInfo', () => {
-    it('returns objects with formatted addresses', () => {
-      expect(outHwAccountInfo(
-        { '0x63cf90d3f0410092fc0fca41846f596223979195': { manufacturer: 'mfg', name: 'type' } }
-      )).to.deep.equal({
-        '0x63Cf90D3f0410092FC0fca41846f596223979195': { manufacturer: 'mfg', name: 'type' }
-      });
-    });
-  });
-
-  describe('outNodeKind', () => {
-    it('formats the input as received', () => {
-      const kind = { availability: 'personal', capability: 'full' };
-
-      expect(outNodeKind(kind)).to.deep.equal(kind);
-    });
-  });
-
-  describe('outNumber', () => {
-    it('returns a BigNumber equalling the value', () => {
-      const bn = outNumber('0x123456');
-
-      expect(isBigNumber(bn)).to.be.true;
-      expect(bn.eq(0x123456)).to.be.true;
-    });
-
-    it('assumes 0 when ivalid input', () => {
-      expect(outNumber().eq(0)).to.be.true;
-    });
-  });
-
-  describe('outPeer', () => {
-    it('converts all internal numbers to BigNumbers', () => {
-      expect(outPeer({
-        caps: ['par/1'],
-        id: '0x01',
-        name: 'Parity',
-        network: {
-          localAddress: '10.0.0.1',
-          remoteAddress: '10.0.0.1'
-        },
-        protocols: {
-          par: {
-            difficulty: '0x0f',
-            head: '0x02',
-            version: 63
-          }
-        }
-      })).to.deep.equal({
-        caps: ['par/1'],
-        id: '0x01',
-        name: 'Parity',
-        network: {
-          localAddress: '10.0.0.1',
-          remoteAddress: '10.0.0.1'
-        },
-        protocols: {
-          par: {
-            difficulty: new BigNumber(15),
-            head: '0x02',
-            version: 63
-          }
-        }
-      });
-    });
-
-    it('does not output null protocols', () => {
-      expect(outPeer({
-        caps: ['par/1'],
-        id: '0x01',
-        name: 'Parity',
-        network: {
-          localAddress: '10.0.0.1',
-          remoteAddress: '10.0.0.1'
-        },
-        protocols: {
-          les: null
-        }
-      })).to.deep.equal({
-        caps: ['par/1'],
-        id: '0x01',
-        name: 'Parity',
-        network: {
-          localAddress: '10.0.0.1',
-          remoteAddress: '10.0.0.1'
-        },
-        protocols: {}
-      });
-    });
-  });
-
-  describe('outPeers', () => {
-    it('converts all internal numbers to BigNumbers', () => {
-      expect(outPeers({
-        active: 789,
-        connected: '456',
-        max: 0x7b,
-        peers: [
-          {
-            caps: ['par/1'],
-            id: '0x01',
-            name: 'Parity',
-            network: {
-              localAddress: '10.0.0.1',
-              remoteAddress: '10.0.0.1'
-            },
-            protocols: {
-              par: {
-                difficulty: '0x0f',
-                head: '0x02',
-                version: 63
-              },
-              les: null
-            }
-          }
-        ]
-      })).to.deep.equal({
-        active: new BigNumber(789),
-        connected: new BigNumber(456),
-        max: new BigNumber(123),
-        peers: [
-          {
-            caps: ['par/1'],
-            id: '0x01',
-            name: 'Parity',
-            network: {
-              localAddress: '10.0.0.1',
-              remoteAddress: '10.0.0.1'
-            },
-            protocols: {
-              par: {
-                difficulty: new BigNumber(15),
-                head: '0x02',
-                version: 63
-              }
-            }
-          }
-        ]
-      });
-    });
-  });
-
-  describe('outReceipt', () => {
-    ['contractAddress'].forEach((input) => {
-      it(`formats ${input} address as address`, () => {
-        const block = {};
-
-        block[input] = address;
-        const formatted = outReceipt(block)[input];
-
-        expect(isAddress(formatted)).to.be.true;
-        expect(formatted).to.equal(checksum);
-      });
-    });
-
-    ['blockNumber', 'cumulativeGasUsed', 'cumulativeGasUsed', 'gasUsed', 'transactionIndex'].forEach((input) => {
-      it(`formats ${input} number as hexnumber`, () => {
-        const block = {};
-
-        block[input] = 0x123;
-        const formatted = outReceipt(block)[input];
-
-        expect(isInstanceOf(formatted, BigNumber)).to.be.true;
-        expect(formatted.toString(16)).to.equal('123');
-      });
-    });
-
-    it('ignores and passes through unknown keys', () => {
-      expect(outReceipt({ someRandom: 'someRandom' })).to.deep.equal({ someRandom: 'someRandom' });
-    });
-
-    it('formats a receipt with all the info converted', () => {
-      expect(
-        outReceipt({
-          contractAddress: address,
-          blockNumber: '0x100',
-          cumulativeGasUsed: '0x101',
-          gasUsed: '0x102',
-          transactionIndex: '0x103',
-          extraData: 'someExtraStuffInHere'
-        })
-      ).to.deep.equal({
-        contractAddress: checksum,
-        blockNumber: new BigNumber('0x100'),
-        cumulativeGasUsed: new BigNumber('0x101'),
-        gasUsed: new BigNumber('0x102'),
-        transactionIndex: new BigNumber('0x103'),
-        extraData: 'someExtraStuffInHere'
-      });
-    });
-  });
-
-  describe('outRecentDapps', () => {
-    it('formats the URLs with timestamps', () => {
-      expect(outRecentDapps({ testing: 0x57513668 })).to.deep.equal({
-        testing: new Date('2016-06-03T07:48:56.000Z')
-      });
-    });
-  });
-
-  describe('outSyncing', () => {
-    ['currentBlock', 'highestBlock', 'startingBlock', 'warpChunksAmount', 'warpChunksProcessed'].forEach((input) => {
-      it(`formats ${input} numbers as a number`, () => {
-        expect(outSyncing({ [input]: '0x123' })).to.deep.equal({
-          [input]: new BigNumber('0x123')
-        });
-      });
-    });
-
-    it('formats blockGap properly', () => {
-      expect(outSyncing({ blockGap: [0x123, 0x456] })).to.deep.equal({
-        blockGap: [new BigNumber(0x123), new BigNumber(0x456)]
-      });
-    });
-  });
-
-  describe('outTransaction', () => {
-    ['from', 'to'].forEach((input) => {
-      it(`formats ${input} address as address`, () => {
-        const block = {};
-
-        block[input] = address;
-        const formatted = outTransaction(block)[input];
-
-        expect(isAddress(formatted)).to.be.true;
-        expect(formatted).to.equal(checksum);
-      });
-    });
-
-    ['blockNumber', 'gasPrice', 'gas', 'nonce', 'transactionIndex', 'value'].forEach((input) => {
-      it(`formats ${input} number as hexnumber`, () => {
-        const block = {};
-
-        block[input] = 0x123;
-        const formatted = outTransaction(block)[input];
-
-        expect(isInstanceOf(formatted, BigNumber)).to.be.true;
-        expect(formatted.toString(16)).to.equal('123');
-      });
-    });
-
-    it('passes condition as null when null', () => {
-      expect(outTransaction({ condition: null })).to.deep.equal({ condition: null });
-    });
-
-    it('ignores and passes through unknown keys', () => {
-      expect(outTransaction({ someRandom: 'someRandom' })).to.deep.equal({ someRandom: 'someRandom' });
-    });
-
-    it('formats a transaction with all the info converted', () => {
-      expect(
-        outTransaction({
-          from: address,
-          to: address,
-          blockNumber: '0x100',
-          gasPrice: '0x101',
-          gas: '0x102',
-          nonce: '0x103',
-          transactionIndex: '0x104',
-          value: '0x105',
-          extraData: 'someExtraStuffInHere'
-        })
-      ).to.deep.equal({
-        from: checksum,
-        to: checksum,
-        blockNumber: new BigNumber('0x100'),
-        gasPrice: new BigNumber('0x101'),
-        gas: new BigNumber('0x102'),
-        nonce: new BigNumber('0x103'),
-        transactionIndex: new BigNumber('0x104'),
-        value: new BigNumber('0x105'),
-        extraData: 'someExtraStuffInHere'
-      });
-    });
-  });
-
-  describe('outTrace', () => {
-    it('ignores and passes through unknown keys', () => {
-      expect(outTrace({ someRandom: 'someRandom' })).to.deep.equal({ someRandom: 'someRandom' });
-    });
-
-    it('formats a trace with all the info converted', () => {
-      const formatted = outTrace({
-        type: 'call',
-        action: {
-          from: address,
-          to: address,
-          value: '0x06',
-          gas: '0x07',
-          input: '0x1234',
-          callType: 'call'
-        },
-        result: {
-          gasUsed: '0x08',
-          output: '0x5678'
-        },
-        traceAddress: [ '0x2' ],
-        subtraces: 3,
-        transactionPosition: '0xb',
-        transactionHash: '0x000000000000000000000000000000000000000000000000000000000000000c',
-        blockNumber: '0x0d',
-        blockHash: '0x000000000000000000000000000000000000000000000000000000000000000e'
-      });
-
-      expect(isBigNumber(formatted.action.gas)).to.be.true;
-      expect(formatted.action.gas.toNumber()).to.equal(7);
-      expect(isBigNumber(formatted.action.value)).to.be.true;
-      expect(formatted.action.value.toNumber()).to.equal(6);
-
-      expect(formatted.action.from).to.equal(checksum);
-      expect(formatted.action.to).to.equal(checksum);
-
-      expect(isBigNumber(formatted.blockNumber)).to.be.true;
-      expect(formatted.blockNumber.toNumber()).to.equal(13);
-      expect(isBigNumber(formatted.transactionPosition)).to.be.true;
-      expect(formatted.transactionPosition.toNumber()).to.equal(11);
-    });
-  });
-
-  describe('outVaultMeta', () => {
-    it('returns an exmpt object on null', () => {
-      expect(outVaultMeta(null)).to.deep.equal({});
-    });
-
-    it('returns the original value if not string', () => {
-      expect(outVaultMeta({ test: 123 })).to.deep.equal({ test: 123 });
-    });
-
-    it('returns an object from JSON string', () => {
-      expect(outVaultMeta('{"test":123}')).to.deep.equal({ test: 123 });
-    });
-
-    it('returns an empty object on invalid JSON', () => {
-      expect(outVaultMeta('{"test"}')).to.deep.equal({});
-    });
-  });
-});
diff --git a/js/src/api/index.js b/js/src/api/index.js
deleted file mode 100644
index 978d98fecaf151b8755a8d9869287774f7a63200..0000000000000000000000000000000000000000
--- a/js/src/api/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './api';
diff --git a/js/src/api/local/accounts/account.js b/js/src/api/local/accounts/account.js
deleted file mode 100644
index 224a05cd9f81f1e399d727615298f4840c68e822..0000000000000000000000000000000000000000
--- a/js/src/api/local/accounts/account.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createKeyObject, decryptPrivateKey } from '../ethkey';
-
-export default class Account {
-  constructor (persist, data = {}) {
-    const {
-      keyObject = null,
-      meta = {},
-      name = ''
-    } = data;
-
-    this._persist = persist;
-    this._keyObject = keyObject;
-    this._name = name;
-    this._meta = meta;
-  }
-
-  isValidPassword (password) {
-    if (!this._keyObject) {
-      return false;
-    }
-
-    return decryptPrivateKey(this._keyObject, password)
-      .then((privateKey) => {
-        if (!privateKey) {
-          return false;
-        }
-
-        return true;
-      });
-  }
-
-  export () {
-    const exported = Object.assign({}, this._keyObject);
-
-    exported.meta = JSON.stringify(this._meta);
-    exported.name = this._name;
-
-    return exported;
-  }
-
-  get address () {
-    return `0x${this._keyObject.address.toLowerCase()}`;
-  }
-
-  get name () {
-    return this._name;
-  }
-
-  set name (name) {
-    this._name = name;
-
-    this._persist();
-  }
-
-  get meta () {
-    return JSON.stringify(this._meta);
-  }
-
-  set meta (meta) {
-    this._meta = JSON.parse(meta);
-
-    this._persist();
-  }
-
-  get uuid () {
-    if (!this._keyObject) {
-      return null;
-    }
-
-    return this._keyObject.id;
-  }
-
-  decryptPrivateKey (password) {
-    return decryptPrivateKey(this._keyObject, password);
-  }
-
-  changePassword (key, password) {
-    return createKeyObject(key, password).then((keyObject) => {
-      this._keyObject = keyObject;
-
-      this._persist();
-    });
-  }
-
-  static fromPrivateKey (persist, key, password) {
-    return createKeyObject(key, password).then((keyObject) => {
-      const account = new Account(persist, { keyObject });
-
-      return account;
-    });
-  }
-
-  toJSON () {
-    return {
-      keyObject: this._keyObject,
-      name: this._name,
-      meta: this._meta
-    };
-  }
-}
diff --git a/js/src/api/local/accounts/accounts.js b/js/src/api/local/accounts/accounts.js
deleted file mode 100644
index d11ea2badb65c571dea36bb45bda8b4196b5c787..0000000000000000000000000000000000000000
--- a/js/src/api/local/accounts/accounts.js
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Account from './account';
-import localStore from 'store';
-import { debounce } from 'lodash';
-import { decryptPrivateKey } from '../ethkey';
-
-const NULL_ADDRESS = '0x0000000000000000000000000000000000000000';
-const LS_STORE_KEY = '_parity::localAccounts';
-
-export default class Accounts {
-  persist = debounce(() => {
-    this._lastState = JSON.stringify(this);
-
-    localStore.set(LS_STORE_KEY, this);
-  }, 100);
-
-  constructor (data = localStore.get(LS_STORE_KEY) || {}) {
-    this._lastState = JSON.stringify(data);
-
-    window.addEventListener('storage', ({ key, newValue }) => {
-      if (key !== LS_STORE_KEY) {
-        return;
-      }
-
-      if (newValue !== this._lastState) {
-        console.log('Data changed in a second tab, syncing state');
-
-        this.restore(JSON.parse(newValue));
-      }
-    });
-
-    this.restore(data);
-  }
-
-  restore (data) {
-    const {
-      last = NULL_ADDRESS,
-      dappsDefault = NULL_ADDRESS,
-      store = {}
-    } = data;
-
-    this._last = last;
-    this._dappsDefaultAddress = dappsDefault;
-    this._store = {};
-
-    if (Array.isArray(store)) {
-      // Recover older version that stored accounts as an array
-      store.forEach((data) => {
-        const account = new Account(this.persist, data);
-
-        this._store[account.address] = account;
-      });
-    } else {
-      Object.keys(store).forEach((key) => {
-        this._store[key] = new Account(this.persist, store[key]);
-      });
-    }
-  }
-
-  _addAccount = (account) => {
-    const { address } = account;
-
-    if (address in this._store && this._store[address].uuid) {
-      throw new Error(`Account ${address} already exists!`);
-    }
-
-    this._store[address] = account;
-    this.lastAddress = address;
-
-    this.persist();
-
-    return account.address;
-  }
-
-  create (secret, password) {
-    const privateKey = Buffer.from(secret.slice(2), 'hex');
-
-    return Account
-      .fromPrivateKey(this.persist, privateKey, password)
-      .then(this._addAccount);
-  }
-
-  restoreFromWallet (wallet, password) {
-    return decryptPrivateKey(wallet, password)
-      .then((privateKey) => {
-        if (!privateKey) {
-          throw new Error('Invalid password');
-        }
-
-        return Account.fromPrivateKey(this.persist, privateKey, password);
-      })
-      .then(this._addAccount);
-  }
-
-  set lastAddress (value) {
-    this._last = value.toLowerCase();
-  }
-
-  get lastAddress () {
-    return this._last;
-  }
-
-  get dappsDefaultAddress () {
-    if (this._dappsDefaultAddress === NULL_ADDRESS) {
-      return this._last;
-    }
-
-    if (this._dappsDefaultAddress in this._store) {
-      return this._dappsDefaultAddress;
-    }
-
-    return NULL_ADDRESS;
-  }
-
-  set dappsDefaultAddress (value) {
-    this._dappsDefaultAddress = value.toLowerCase();
-
-    this.persist();
-  }
-
-  get (address) {
-    address = address.toLowerCase();
-
-    const account = this._store[address];
-
-    if (!account) {
-      throw new Error(`Account not found: ${address}`);
-    }
-
-    this.lastAddress = address;
-
-    return account;
-  }
-
-  getLazyCreate (address) {
-    address = address.toLowerCase();
-
-    this.lastAddress = address;
-
-    if (!(address in this._store)) {
-      this._store[address] = new Account(this.persist);
-    }
-
-    return this._store[address];
-  }
-
-  remove (address, password) {
-    address = address.toLowerCase();
-
-    const account = this.get(address);
-
-    if (!account) {
-      return false;
-    }
-
-    if (!account.uuid) {
-      this.removeUnsafe(address);
-
-      return true;
-    }
-
-    return account
-      .isValidPassword(password)
-      .then((isValid) => {
-        if (!isValid) {
-          return false;
-        }
-
-        if (address === this.lastAddress) {
-          this.lastAddress = NULL_ADDRESS;
-        }
-
-        this.removeUnsafe(address);
-
-        return true;
-      });
-  }
-
-  removeUnsafe (address) {
-    address = address.toLowerCase();
-
-    delete this._store[address];
-
-    this.persist();
-  }
-
-  allAddresses () {
-    return Object.keys(this._store);
-  }
-
-  accountAddresses () {
-    return Object
-      .keys(this._store)
-      .filter((address) => this._store[address].uuid);
-  }
-
-  map (mapper) {
-    const result = {};
-
-    Object.keys(this._store).forEach((key) => {
-      result[key] = mapper(this._store[key]);
-    });
-
-    return result;
-  }
-
-  toJSON () {
-    return {
-      last: this._last,
-      dappsDefault: this._dappsDefaultAddress,
-      store: this._store
-    };
-  }
-}
diff --git a/js/src/api/local/accounts/index.js b/js/src/api/local/accounts/index.js
deleted file mode 100644
index 800cf95f6a02f7c5eb978fadf7cdc2932d40ec37..0000000000000000000000000000000000000000
--- a/js/src/api/local/accounts/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Accounts from './accounts';
-
-const accounts = new Accounts();
-
-export default accounts;
diff --git a/js/src/api/local/ethkey/ethkey.js b/js/src/api/local/ethkey/ethkey.js
deleted file mode 100644
index f8395b007abc3e0be2daccfff388baf07c6c1218..0000000000000000000000000000000000000000
--- a/js/src/api/local/ethkey/ethkey.js
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-/* global WebAssembly */
-
-import wasmBuffer from './ethkey.wasm.js';
-
-const NOOP = () => {};
-
-// WASM memory setup
-const WASM_PAGE_SIZE = 65536;
-const STATIC_BASE = 1024;
-const STATICTOP = STATIC_BASE + WASM_PAGE_SIZE * 2;
-const STACK_BASE = align(STATICTOP + 16);
-const STACKTOP = STACK_BASE;
-const TOTAL_STACK = 5 * 1024 * 1024;
-const TOTAL_MEMORY = 16777216;
-const STACK_MAX = STACK_BASE + TOTAL_STACK;
-const DYNAMIC_BASE = STACK_MAX + 64;
-const DYNAMICTOP_PTR = STACK_MAX;
-
-function mockWebAssembly () {
-  function throwWasmError () {
-    throw new Error('Missing WebAssembly support');
-  }
-
-  // Simple mock replacement
-  return {
-    Memory: class { buffer = new ArrayBuffer(2048) },
-    Table: class {},
-    Module: class {},
-    Instance: class {
-      exports = {
-        '_input_ptr': () => 0,
-        '_secret_ptr': () => 0,
-        '_public_ptr': () => 0,
-        '_address_ptr': () => 0,
-        '_ecpointg': NOOP,
-        '_brain': throwWasmError,
-        '_verify_secret': throwWasmError
-      }
-    }
-  };
-}
-
-const { Memory, Table, Module, Instance } = typeof WebAssembly !== 'undefined' ? WebAssembly : mockWebAssembly();
-
-const wasmMemory = new Memory({
-  initial: TOTAL_MEMORY / WASM_PAGE_SIZE,
-  maximum: TOTAL_MEMORY / WASM_PAGE_SIZE
-});
-
-const wasmTable = new Table({
-  initial: 8,
-  maximum: 8,
-  element: 'anyfunc'
-});
-
-// TypedArray views into the memory
-const wasmMemoryU8 = new Uint8Array(wasmMemory.buffer);
-const wasmMemoryU32 = new Uint32Array(wasmMemory.buffer);
-
-// Keep DYNAMIC_BASE in memory
-wasmMemoryU32[DYNAMICTOP_PTR >> 2] = align(DYNAMIC_BASE);
-
-function align (mem) {
-  const ALIGN_SIZE = 16;
-
-  return (Math.ceil(mem / ALIGN_SIZE) * ALIGN_SIZE) | 0;
-}
-
-export function slice (ptr, len) {
-  return wasmMemoryU8.subarray(ptr, ptr + len);
-}
-
-// Required by emscripten
-function abort (what) {
-  throw new Error(what || 'WASM abort');
-}
-
-// Required by emscripten
-function abortOnCannotGrowMemory () {
-  abort(`Cannot enlarge memory arrays.`);
-}
-
-// Required by emscripten
-function enlargeMemory () {
-  abortOnCannotGrowMemory();
-}
-
-// Required by emscripten
-function getTotalMemory () {
-  return TOTAL_MEMORY;
-}
-
-// Required by emscripten - used to perform memcpy on large data
-function memcpy (dest, src, len) {
-  wasmMemoryU8.set(wasmMemoryU8.subarray(src, src + len), dest);
-
-  return dest;
-}
-
-// Synchronously compile WASM from the buffer
-const module = new Module(wasmBuffer);
-
-// Instantiated WASM module
-const instance = new Instance(module, {
-  global: {},
-  env: {
-    DYNAMICTOP_PTR,
-    STACKTOP,
-    STACK_MAX,
-    abort,
-    enlargeMemory,
-    getTotalMemory,
-    abortOnCannotGrowMemory,
-    ___lock: NOOP,
-    ___syscall6: () => 0,
-    ___setErrNo: (no) => no,
-    _abort: abort,
-    ___syscall140: () => 0,
-    _emscripten_memcpy_big: memcpy,
-    ___syscall54: () => 0,
-    ___unlock: NOOP,
-    _llvm_trap: abort,
-    ___syscall146: () => 0,
-    'memory': wasmMemory,
-    'table': wasmTable,
-    tableBase: 0,
-    memoryBase: STATIC_BASE
-  }
-});
-
-export const extern = instance.exports;
diff --git a/js/src/api/local/ethkey/ethkey.wasm.js b/js/src/api/local/ethkey/ethkey.wasm.js
deleted file mode 100644
index d426f0e0c46e5a947183538170fb44a56e01fb1b..0000000000000000000000000000000000000000
--- a/js/src/api/local/ethkey/ethkey.wasm.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = new Buffer('AGFzbQEAAAABOgpgA39/fwF/YAF/AX9gAn9/AX9gAX8AYAABf2AAAGACf38AYAR/f39/AGADf39/AGAGf39/f39/AX8CyQELA2VudghTVEFDS1RPUAN/AANlbnYFYWJvcnQAAwNlbnYLX19fc3lzY2FsbDYAAgNlbnYNX19fc3lzY2FsbDE0MAACA2VudhZfZW1zY3JpcHRlbl9tZW1jcHlfYmlnAAADZW52DF9fX3N5c2NhbGw1NAACA2VudgpfbGx2bV90cmFwAAUDZW52DV9fX3N5c2NhbGwxNDYAAgNlbnYGbWVtb3J5AgGAAoACA2VudgV0YWJsZQFwAQgIA2Vudgl0YWJsZUJhc2UDfwADOjkEBAQEBAQDBwMICAgIAwYGBgIIAwMDBgMDCAYGBgMCBwYIAgICBgkDBgEAAAEEBAQAAQAAAQABAAIGBgF/ASMACwdfBw5fdmVyaWZ5X3NlY3JldAAMC19wdWJsaWNfcHRyAAoLX3NlY3JldF9wdHIACQpfaW5wdXRfcHRyAAgJX2VjcG9pbnRnAAcGX2JyYWluAA0MX2FkZHJlc3NfcHRyAAsJDgEAIwELCD0wPjEyNz8rCpClAzlJAQJ/An8jAiEAIwJB0JgBaiQCQagZKAIAQQFGBEAgACQCQawZDwsgACIBEB9BqBlBATYCAEGsGSABQdCYARA8GiAAJAJBrBkLCwYAQbi2AQsGAEG4vgELBgBB2L4BCwYAQZi/AQsKAEG4vgFBIBAlC74HAQt/AkAjAiEIIwJBoJwBaiQCIABBgAhLBEAgAEGACBAnCyAIQaACaiEFQagZKAIAQQFHBEAgBRAfQagZQQE2AgBBrBkgBUHQmAEQPBoLIAghCSAIQcgAaiIEEBQgCEH4mwFqIgFCADcAACABQgA3AAggAUIANwAQIAFCADcAGCAEQbi2ASAAEBAgBSAEQdgBEDwaIAUgAUEgEBIgCEHwmgFqIgMgASkAADcAACADIAEpAAg3AAggAyABKQAQNwAQIAMgASkAGDcAGCAIQZCbAWoiBkEBaiEHIAhB2JsBaiICQQxqIQpBACEAA0AgBBAUIAFCADcAACABQgA3AAggAUIANwAQIAFCADcAGCAEIANBIBAQIAUgBEHYARA8GiAFIAFBIBASIAIgASkAADcAACACIAEpAAg3AAggAiABKQAQNwAQIAIgASkAGDcAGCADIAIpAAA3AAAgAyACKQAINwAIIAMgAikAEDcAECADIAIpABg3ABggAEEBaiELIABBgYABRwRAIAshAAwBCwsgCUEBaiEAA0ACQCAJQawZIANBIBAmIAksAABBAUYEQCAGIAApAAA3AAAgBiAAKQAINwAIIAYgACkAEDcAECAGIAApABg3ABggBiAAKQAgNwAgIAYgACkAKDcAKCAGIAApADA3ADAgBiAAKQA4NwA4IAYgACwAQDoAQCAEEBQgAUIANwAAIAFCADcACCABQgA3ABAgAUIANwAYIAQgB0HAABAQIAUgBEHYARA8GiAFIAFBIBASIAIgASkAADcAACACIAEpAAg3AAggAiABKQAQNwAQIAIgASkAGDcAGEGYvwEgCikAADcAAEGgvwEgCikACDcAAEGovwEgCigAEDYAAEGYvwEsAABFDQELIAQQFCABQgA3AAAgAUIANwAIIAFCADcAECABQgA3ABggBCADQSAQECAFIARB2AEQPBogBSABQSAQEiACIAEpAAA3AAAgAiABKQAINwAIIAIgASkAEDcAECACIAEpABg3ABggAyACKQAANwAAIAMgAikACDcACCADIAIpABA3ABAgAyACKQAYNwAYDAELC0HYvgEgBykAADcAAEHgvgEgBykACDcAAEHovgEgBykAEDcAAEHwvgEgBykAGDcAAEH4vgEgBykAIDcAAEGAvwEgBykAKDcAAEGIvwEgBykAMDcAAEGQvwEgBykAODcAAEG4vgEgAykAADcAAEHAvgEgAykACDcAAEHIvgEgAykAEDcAAEHQvgEgAykAGDcAACAIJAILCwQAEAUL1wsCGX8tfgJAIAApAwAhJCAAQShqIgIpAwAhJSAAQdAAaiIDKQMAITAgAEH4AGoiBCkDACE+IABBoAFqIgUpAwAhJiAAQQhqIgYpAwAhMSAAQTBqIgcpAwAhMiAAQdgAaiIIKQMAIScgAEGAAWoiCSkDACEgIABBqAFqIgopAwAhPyAAQRBqIgspAwAhMyAAQThqIgwpAwAhHSAAQeAAaiINKQMAISEgAEGIAWoiDikDACE0IABBsAFqIg8pAwAhHiAAQRhqIhApAwAhNSAAQcAAaiIRKQMAISggAEHoAGoiEikDACE2IABBkAFqIhMpAwAhGyAAQbgBaiIUKQMAISIgAEEgaiIVKQMAITcgAEHIAGoiFikDACE4IABB8ABqIhcpAwAhHCAAQZgBaiIYKQMAISMgAEHAAWoiGSkDACEaQQAhAQNAICQgGiAjIBwgOCA3hYWFhSIphSA/ICAgJyAyIDGFhYWFIipCAYYgKkI/iIQiOYUhQCAxICYgPiAwICUgJIWFhYUiK4UgHiA0ICEgHSAzhYWFhSIsQgGGICxCP4iEIjqFIUEgMyAqhSAiIBsgNiAoIDWFhYWFIi1CAYYgLUI/iIQiO4UhQiA1ICyFIClCAYYgKUI/iIQiPIUhLiA3IC2FICtCAYYgK0I/iIQiPYUhQyAbICyFIDyFIhtCFYYgG0IriIQiHyAhICqFIDuFIhtCK4YgG0IViIQiREJ/hYMgMiArhSA6hSIbQiyGIBtCFIiEIiSFITEgGiAthSA9hSIaQg6GIBpCMoiEIhogH0J/hYMgRIUhMyBAIBpCf4WDIB+FITUgJCBAQn+FgyAahSE3IDAgKYUgOYUiGkIDhiAaQj2IhCIvIDggLYUgPYUiGkIUhiAaQiyIhCIhQn+FgyAuQhyGIC5CJIiEIh+FIUUgICArhSA6hSIaQi2GIBpCE4iEIhsgL0J/hYMgIYUhMiAeICqFIDuFIhpCPYYgGkIDiIQiGiAbQn+FgyAvhSFGIB8gGkJ/hYMgG4UhLiAhIB9Cf4WDIBqFITggNiAshSA8hSIaQhmGIBpCJ4iEIiAgHSAqhSA7hSIaQgaGIBpCOoiEIhtCf4WDIEFCAYYgQUI/iIQiHYUhMCAjIC2FID2FIhpCCIYgGkI4iIQiHiAgQn+FgyAbhSEvICYgKYUgOYUiGkIShiAaQi6IhCIaIB5Cf4WDICCFISEgHSAaQn+FgyAehSE2IBsgHUJ/hYMgGoUhHyAnICuFIDqFIhpCCoYgGkI2iIQiGyAlICmFIDmFIhpCJIYgGkIciIQiI0J/hYMgQ0IbhiBDQiWIhCIdhSEnIDQgKoUgO4UiGkIPhiAaQjGIhCIeIBtCf4WDICOFISAgIiAshSA8hSIaQjiGIBpCCIiEIhogHkJ/hYMgG4UhNCAdIBpCf4WDIB6FIRsgIyAdQn+FgyAahSEjIBwgLYUgPYUiHEInhiAcQhmIhCIiICggLIUgPIUiHEI3hiAcQgmIhCIlQn+FgyBCQj6GIEJCAoiEIiaFIR0gPiAphSA5hSIcQimGIBxCF4iEIhogIkJ/hYMgJYUhHiA/ICuFIDqFIhxCAoYgHEI+iIQiHCAaQn+FgyAihSEoICYgHEJ/hYMgGoUhIiAlICZCf4WDIByFIRogRCAkQn+FgyBAhSABQQN0QYAIaikDAIUhHCABQQFqIgFBGEcEQCAcISQgRSElICchPiAdISYgLyEnIB4hPyBGIR0gKCEeIC4hKCAfIRwMAQsLIAAgHDcDACACIEU3AwAgAyAwNwMAIAQgJzcDACAFIB03AwAgBiAxNwMAIAcgMjcDACAIIC83AwAgCSAgNwMAIAogHjcDACALIDM3AwAgDCBGNwMAIA0gITcDACAOIDQ3AwAgDyAoNwMAIBAgNTcDACARIC43AwAgEiA2NwMAIBMgGzcDACAUICI3AwAgFSA3NwMAIBYgODcDACAXIB83AwAgGCAjNwMAIBkgGjcDAAsLCgAgACABIAIQEQu9AwEPfwJAIABByAFqIgooAgAiA0HIAUsEQCADQcgBEC8LIAAgA2ohC0HIASADayEEAkAgAEHMAWoiECgCACADayIFIAJLBEAgBCEMIAshDSADIQ9BACEIIAIhBgUgBCEJQQAhByACIQ4gBSEEAkACQAJAA0AgBCAJSw0BIAcgAksNAiABIAdqIREgBCACIAdrIgNNBH8gBAUgAwsiCQRAIAshA0EAIQUDQCADIAMsAAAgESAFaiwAAHM6AAAgCyAFQQFqIgVqIQMgBSAJSQ0ACwsgABAPIAQgB2ohAyAQKAIAIQUgCkEANgIAIA4gBGsiDiAFSQRAQcgBIQwgACENQQAhDyADIQggDiEGDAYFQcgBIQkgACELIAMhByAFIQQMAQsACwALIAQgCRAnDAELIAcgAhAvCwsLIAYgDEsEQCAGIAwQJwsgCCACSwRAIAggAhAvCyAGIAIgCGsiAE0EfyAGBSAACyIEBEAgDSEAQQAhAgUgCiAPIAZqNgIADwsgASAIaiEBA0AgACAALAAAIAEgAmosAABzOgAAIA0gAkEBaiICaiEAIAIgBEkNAAsgCiAKKAIAIAZqNgIACwuSAQEDfwJAIwIhBCMCQeABaiQCIAQiAyAAQdgBEDwaIAMoAsgBIgBByAFPBEBB3AogAEHIARAoCyADKALMASEFIAMgAGoiACAALAAAIAMsANABczoAACAFQX9qIgBByAFJBEAgAyAAaiIAIAAsAABBgH9zOgAAIAMQDyADIAEgAhATIAQkAgVB0AogAEHIARAoCwsLygEBB38CQAJAIAAoAswBIgNByAFLBEAgAyACSwRAIAEhCCACIQYFIANByAEQJwsFIAIhBEEAIQUCQAJAAkACQANAIAEgBWohCSACIAVrIQcgBCADSQ0DIAMgB0sNAiAJIAAgAxA8GiAAEA8gBCADayEEIAUgA2oiBSACTQ0ADAELAAsgBSACEC8MAgsgAyAHECcMAQsgBCAHTQRAIAkhCCAEIQYMAwsgBCAHECcLCwsgBkHIAUsEQCAGQcgBECcFIAggACAGEDwaCwsLIAACQCAAQQBBzAEQOhogAEGIATYCzAEgAEEBOgDQAQsLgQUCCH8DfgJAIwIhBSMCQdAAaiQCIAUhAiAAQcQAaiIDLAAAIgcgASwAREcEQCAHBEAgA0EAOgAAIAAgARAWIAMgAywAAEEBczoAAAUgAiABKQIANwIAIAIgASkCCDcCCCACIAEpAhA3AhAgAiABKQIYNwIYIAIgASkCIDcCICACIAEpAig3AiggAiABKQIwNwIwIAIgASkCODcCOCACIAEpAkA3AkAgAkEAOgBEIAAgAhAWCyAAKAIABEAgBSQCDwsgACgCBARAIAUkAg8LIANBADoAACAFJAIPCwJAIAEoAgAiAyAAKAIAIgJLBEACQAJAA0AgAkEQTw0CIABBBGogAkECdGpBADYCACACQQFqIgIgA0kNAAwBCwALIAAgAzYCAEIAIQtBACEEDAILQcgLIAJBEBAoBSADBEBCACELQQAhBAUgBSQCDwsLCwJAAkADQCAEQRBPDQEgAEEEaiAEQQJ0aiICKAIArSALfCABQQRqIARBAnRqKAIArXwhCiACIAo+AgAgCkIgiCEKIARBAWoiBiADSQRAIAohCyAGIQQMAQsLDAELQdQLIARBEBAoCyAKQgBSIgQgBiAAKAIAIgFJcQRAIAYhAQJAAkADQCABQRBPDQEgAEEEaiABQQJ0aiICKAIArSAKfCEKIAIgCj4CACAKQiCIIgxCAFIiCCABQQFqIgEgACgCACIJSXEEQCAMIQoMAQsLDAELQeALIAFBEBAoCyAMpyECIAgEQCAJIQEFIAUkAg8LBSAKpyECIARFBEAgBSQCDwsLIAFBEE8EQEHsCyABQRAQKAsgAEEEaiABQQJ0aiACNgIAIAAgACgCAEEBajYCACAFJAILC+YHAg1/An4CQCMCIQUjAkHQAGokAiAFIQIgAEHEAGoiBiwAACIDIAEsAERHBEAgAwRAIAZBADoAACAAIAEQFSAGQQE6AAAFIAIgASkCADcCACACIAEpAgg3AgggAiABKQIQNwIQIAIgASkCGDcCGCACIAEpAiA3AiAgAiABKQIoNwIoIAIgASkCMDcCMCACIAEpAjg3AjggAiABKQJANwJAIAJBADoARCAAIAIQFQsgACgCAARAIAUkAg8LIAAoAgQEQCAFJAIPCyAGQQA6AAAgBSQCDwsgACgCACIHQRBLBEAgB0EQECcLIAEoAgAiCEEQSwRAIAhBEBAnCyAAQQRqIQsCQAJAIAcgCEYEQCAAIAFHBEAgCyABQQRqIAdBAnQQOQRAIAchAwJAAkACQANAIANBf2ohCSADRQ0IIAlBEE8NASABQQRqIAlBAnRqKAIAIgMgAEEEaiAJQQJ0aigCACIORw0CIAkhAwwACwALQbwLIAlBEBAoDAELIAMgDkkNBQwECwsLIABBATYCACAGQQA6AAAgC0EANgIAIAUkAg8FIAggB08NAQsMAQsgAiAAKQIANwIAIAIgACkCCDcCCCACIAApAhA3AhAgAiAAKQIYNwIYIAIgACkCIDcCICACIAApAig3AiggAiAAKQIwNwIwIAIgACkCODcCOCACIAApAkA3AkAgACABKQIANwIAIAAgASkCCDcCCCAAIAEpAhA3AhAgACABKQIYNwIYIAAgASkCIDcCICAAIAEpAig3AiggACABKQIwNwIwIAAgASkCODcCOCAAIAEpAkA3AkAgACACEBYgBkEBOgAAIAUkAg8LAkAgCAR/QgAhD0EAIQMCQAJAA0AgA0EQTw0BIABBBGogA0ECdGoiBCgCAK0gAUEEaiADQQJ0aigCAK19IA98Ig9CIIchECAEIA8+AgAgA0EBaiIEIAhJBEAgECEPIAQhAwwBCwsMAQtB+AsgA0EQECgLAkAgEEIAUiAEIAAoAgAiAUlxBEADQCAEQRBJBEAgAEEEaiAEQQJ0aiIBKAIArSAQfCIPQiCHIRAgASAPPgIAIBBCAFIgBEEBaiIEIAAoAgAiAUlxDQEgASEMIAQhCgwDCwtBhAwgBEEQECgFIAEhDCAEIQoLCyAKIAxLBH8gACAKNgIAIAoFIAwLBSAHCyIBQQFLBEACQAJAA0AgAUF/aiIBQRBPDQIgAEEEaiABQQJ0aigCAA0BIAAgATYCACABQQFLDQAgASENDAQLAAsgBSQCDwtBsAsgAUEQECgFIAEhDQsLIA0gCygCAHIEQCAFJAIPCyAGQQA6AAAgBSQCCwv1GwIofwN+AkAjAiEgIwJB0ABqJAIgACgCACIKQQhGIAEoAgAiA0EIRnEEQCAAQQRqIg0oAgAiDkH//wNxIQQgAEEIaiIPKAIAIhBB//8DcSEIIABBDGoiESgCACISQf//A3EhBSAAQRBqIhMoAgAiFEH//wNxIQkgAEEUaiIVKAIAIhZB//8DcSEGIABBGGoiFygCACIYQf//A3EhAiAAQRxqIhkoAgAiGkH//wNxIQcgAEEgaiIbKAIAIiFB//8DcSELIAEoAgQiIkH//wNxIQMgASgCCCIjQf//A3EhCiABKAIMIiRB//8DcSEMIAEoAhAiJUH//wNxIRwgASgCFCImQf//A3EhHSABKAIYIidB//8DcSEeIAEoAhwiKEH//wNxIR8gASgCICIpQf//A3EhASANICJBEHYiDSAEbK0gAyAOQRB2Ig5srXwiKkIQhkKAgPz/D4MgAyAEbK18Iis+AgAgDyANIA5srSADIAhsrXwgCiAEbK18ICpCEIh8ICtCIIh8IA0gCGytIAMgEEEQdiIPbK18ICNBEHYiECAEbK18IAogDmytfCIqQhCGQoCA/P8Pg3wiKz4CACARIA0gD2ytIAMgBWytfCAKIAhsrXwgECAObK18IAwgBGytfCAqQhCIfCANIAVsrSADIBJBEHYiEWytfCAQIAhsrXwgCiAPbK18ICRBEHYiEiAEbK18IAwgDmytfCIqQhCGQoCA/P8Pg3wgK0IgiHwiKz4CACATIA0gEWytIAMgCWytfCAKIAVsrXwgECAPbK18IAwgCGytfCASIA5srXwgHCAEbK18ICpCEIh8IA0gCWytIAMgFEEQdiITbK18IBAgBWytfCAKIBFsrXwgEiAIbK18IAwgD2ytfCAlQRB2IhQgBGytfCAcIA5srXwiKkIQhkKAgPz/D4N8ICtCIIh8Iis+AgAgFSANIBNsrSADIAZsrXwgCiAJbK18IBAgEWytfCAMIAVsrXwgEiAPbK18IBwgCGytfCAUIA5srXwgHSAEbK18ICpCEIh8IA0gBmytIAMgFkEQdiIVbK18IBAgCWytfCAKIBNsrXwgEiAFbK18IAwgEWytfCAUIAhsrXwgHCAPbK18ICZBEHYiFiAEbK18IB0gDmytfCIqQhCGQoCA/P8Pg3wgK0IgiHwiKz4CACAXIA0gFWytIAMgAmytfCAKIAZsrXwgECATbK18IAwgCWytfCASIBFsrXwgHCAFbK18IBQgD2ytfCAdIAhsrXwgFiAObK18IB4gBGytfCAqQhCIfCANIAJsrSADIBhBEHYiF2ytfCAQIAZsrXwgCiAVbK18IBIgCWytfCAMIBNsrXwgFCAFbK18IBwgEWytfCAWIAhsrXwgHSAPbK18ICdBEHYiGCAEbK18IB4gDmytfCIqQhCGQoCA/P8Pg3wgK0IgiHwiKz4CACAZIA0gF2ytIAMgB2ytfCAKIAJsrXwgECAVbK18IAwgBmytfCASIBNsrXwgHCAJbK18IBQgEWytfCAdIAVsrXwgFiAPbK18IB4gCGytfCAYIA5srXwgHyAEbK18ICpCEIh8IA0gB2ytIAMgGkEQdiIZbK18IBAgAmytfCAKIBdsrXwgEiAGbK18IAwgFWytfCAUIAlsrXwgHCATbK18IBYgBWytfCAdIBFsrXwgGCAIbK18IB4gD2ytfCAoQRB2IhogBGytfCAfIA5srXwiKkIQhkKAgPz/D4N8ICtCIIh8Iis+AgAgGyANIBlsrSADIAtsrXwgCiAHbK18IBAgF2ytfCAMIAJsrXwgEiAVbK18IBwgBmytfCAUIBNsrXwgHSAJbK18IBYgEWytfCAeIAVsrXwgGCAPbK18IB8gCGytfCAaIA5srXwgASAEbK18ICpCEIh8IA0gC2ytIAMgIUEQdiIDbK18IBAgB2ytfCAKIBlsrXwgEiACbK18IAwgF2ytfCAUIAZsrXwgHCAVbK18IBYgCWytfCAdIBNsrXwgGCAFbK18IB4gEWytfCAaIAhsrXwgHyAPbK18IClBEHYiGyAEbK18IAEgDmytfCIqQhCGQoCA/P8Pg3wgK0IgiHwiKz4CACAAIAogC2ytIA0gA2ytfCAQIBlsrXwgDCAHbK18IBIgF2ytfCAcIAJsrXwgFCAVbK18IB0gBmytfCAWIBNsrXwgHiAJbK18IBggEWytfCAfIAVsrXwgGiAPbK18IAEgCGytfCAbIA5srXwgKkIQiHwgECALbK0gCiADbK18IBIgB2ytfCAMIBlsrXwgFCACbK18IBwgF2ytfCAWIAZsrXwgHSAVbK18IBggCWytfCAeIBNsrXwgGiAFbK18IB8gEWytfCAbIAhsrXwgASAPbK18IipCEIZCgID8/w+DfCArQiCIfCIrPgIkIAAgDCALbK0gECADbK18IBIgGWytfCAcIAdsrXwgFCAXbK18IB0gAmytfCAWIBVsrXwgHiAGbK18IBggE2ytfCAfIAlsrXwgGiARbK18IAEgBWytfCAbIA9srXwgKkIQiHwgEiALbK0gDCADbK18IBQgB2ytfCAcIBlsrXwgFiACbK18IB0gF2ytfCAYIAZsrXwgHiAVbK18IBogCWytfCAfIBNsrXwgGyAFbK18IAEgEWytfCIqQhCGQoCA/P8Pg3wgK0IgiHwiKz4CKCAAIBwgC2ytIBIgA2ytfCAUIBlsrXwgHSAHbK18IBYgF2ytfCAeIAJsrXwgGCAVbK18IB8gBmytfCAaIBNsrXwgASAJbK18IBsgEWytfCAqQhCIfCAUIAtsrSAcIANsrXwgFiAHbK18IB0gGWytfCAYIAJsrXwgHiAXbK18IBogBmytfCAfIBVsrXwgGyAJbK18IAEgE2ytfCIqQhCGQoCA/P8Pg3wgK0IgiHwiKz4CLCAAIB0gC2ytIBQgA2ytfCAWIBlsrXwgHiAHbK18IBggF2ytfCAfIAJsrXwgGiAVbK18IAEgBmytfCAbIBNsrXwgKkIQiHwgFiALbK0gHSADbK18IBggB2ytfCAeIBlsrXwgGiACbK18IB8gF2ytfCAbIAZsrXwgASAVbK18IipCEIZCgID8/w+DfCArQiCIfCIrPgIwIAAgHiALbK0gFiADbK18IBggGWytfCAfIAdsrXwgGiAXbK18IAEgAmytfCAbIBVsrXwgKkIQiHwgGCALbK0gHiADbK18IBogB2ytfCAfIBlsrXwgGyACbK18IAEgF2ytfCIqQhCGQoCA/P8Pg3wgK0IgiHwiKz4CNCAAIB8gC2ytIBggA2ytfCAaIBlsrXwgASAHbK18IBsgF2ytfCAqQhCIfCAaIAtsrSAfIANsrXwgGyAHbK18IAEgGWytfCIqQhCGQoCA/P8Pg3wgK0IgiHwiKz4COCAAIBsgGWytIBogA2ytfCABIAtsrXwgKkIQiHwgGyALbK0gASADbK18IipCEIZCgID8/w+DfCArQiCIfCIrPgI8IABBDzYCACAqQhCIIBsgA2ytfCArQiCIfCIqQgBRBEAgICQCDwsgACAqPgJAIABBEDYCACAgJAIPCyAgIQIgA0EBRgRAIAEoAgQhCCACIAApAgA3AgAgAiAAKQIINwIIIAIgACkCEDcCECACIAApAhg3AhggAiAAKQIgNwIgIAIgACkCKDcCKCACIAApAjA3AjAgAiAAKQI4NwI4IAIgACkCQDcCQCACKAIAIgFBEEsEQCABQRAQJwsgAkEEaiABQQJ0aiEEIAEEQCAIrSErQgAhKiACQQRqIQADQCAAIAAoAgCtICt+IixC/////w+DICp8Iio+AgAgKkIgiCAsQiCIfCEqIABBBGoiACAERw0ACyAqQgBSBEAgAUEQSQRAIAQgKj4CACACIAFBAWo2AgAFQZwMIAFBEBAoCwsLICAkAg8LIAJBADoARCACIApBf2ogA2oiBzYCACACQQhqIgRCADcCACAEQgA3AgggBEIANwIQIARCADcCGCAEQgA3AiAgBEIANwIoIARCADcCMCAEQQA2AjggAiABKAIErSAAKAIErX4iKj4CBCAqQiCIISoCQCAHQQFLBEBBAiEEQQEhBgJAAkACQAJAA0AgKkIgiCEsICqnIQkgBkEBaiILIAprIQUgBiAKSwR/IAUFQQAiBQsgAyAGSwR/IAsFIAMiCwtJBEAgLCEqA0AgBiAFayIMQRBPDQMgBUEQTw0EIAFBBGogBUECdGooAgCtIABBBGogDEECdGooAgCtfiAJrXwiLEIgiCAqfCEqICynIQkgBUEBaiIFIAtJDQALBSAsISoLIAZBEE8NAyACQQRqIAZBAnRqIAk2AgAgBEEBaiEJIAQgB0kEQCAEIQUgCSEEIAUhBgwBBSAqISsMBwsACwALQagMIAxBEBAoDAILQbQMIAVBEBAoDAELQcAMIAZBEBAoCwUgKiErCwsgK0IAUQRAIAchCAUgB0EQSQRAIAJBBGogB0ECdGogKz4CACACIAogA2oiCDYCAAVBzAwgB0EQECgLCyAIQQFLBEAgCCEBAkACQAJAA0AgAUF/aiIEQRBPDQEgAkEEaiAEQQJ0aigCAA0CIARBAUsEQCAEIQEMAQUgBCEBDAMLAAsAC0GwCyAEQRAQKAwBCyACIAE2AgALCyAAIAIpAgA3AgAgACACKQIINwIIIAAgAikCEDcCECAAIAIpAhg3AhggACACKQIgNwIgIAAgAikCKDcCKCAAIAIpAjA3AjAgACACKQI4NwI4IAAgAikCQDcCQCAgJAILCyQAIAEEfyAAQYCAgIB4RiABQX9GcQR/QQAFIAAgAW0LBUEACwv5CQIOfwZ+AkAjAiEJIwJB0ARqJAIgCSIIQQBBhAQQOhpBASACQQFqQRh0QRh1QR9xdCIFQQIQGCEOIAlBiARqIgMgASkCADcCACADIAEpAgg3AgggAyABKQIQNwIQIAMgASkCGDcCGCADIAEpAiA3AiAgAyABKQIoNwIoIAMgASkCMDcCMCADIAEpAjg3AjggAyABKQJANwJAIAMoAgAiAUEBRyADQQRqIgcoAgAiBEEAR3JFBEAgACAIQYQEEDwaIAkkAg8LIAVBf2ohECAIQYAEaiEFIAJB/wFxIg9BP3GtIRNBICAPa0E/ca0hFCABIQIDQAJAAkACQCAEaCIBBEAgBSAFKAIAIAFqNgIAIAJBEEsEQEEGIQEMBAtBICABayEEIAIEQCABrSEVIARBP3GtIRZCACERIANBBGogAkECdGohAQNAIAFBfGoiASgCAK0hEiABIBIgFYggEYQ+AgAgEiAWhiERIAEgB0cNAAsgAygCACIBQQFNDQMgAUF/aiINQRBPBEBBDCEBDAULIANBBGogDUECdGooAgAEQCABIQIFIAMgDTYCACANIQEMBAsFQQAhAgsFIAUoAgAiCkGABEkhBiAEIBBxIgEgDkwEQCAGRQRAQSUhAQwFCyAIIApqIAE6AAAgBSAFKAIAIgZBAWo2AgAgByAEIAFrIgE2AgAgAUEARyACQQFHckUEQEEBIQEMBAsgBSAPIAZqNgIAIAJBEEsEQEEqIQEMBQsgAkUEQEEAIQIMAwtCACERIANBBGogAkECdGohAQNAIAFBfGoiASgCAK0hEiABIBIgE4ggEYQ+AgAgEiAUhiERIAEgB0cNAAsgAygCACIBQQFNDQMgAUF/aiILQRBPBEBBMCEBDAULIANBBGogC0ECdGooAgAEQCABIQIMAwsgAyALNgIAIAshAQwDCyAGRQRAQREhAQwECyAIIApqIA4gAWs6AAAgBSAFKAIAQQFqNgIAIAJBEEsEQEETIQEMBAsgA0EEaiACQQJ0aiEGIAEgDmutIREgByEBAkACQAJAA0AgASAGRg0BIAFBBGohBCABIAEoAgCtIBF8IhE+AgAgEUIgiCIRQgBRDQIgBCEBDAALAAsgAkEQTwRAQRkhAQwGCyAGIBE+AgAgAyACQQFqIgE2AgAMAQsgAkEQSwRAQRshAQwFCyACBEAgAiEBBUEAIQIMAwsLQQAhBCADQQRqIAFBAnRqIQEDQCABQXxqIgEoAgAhBiABIAZBAXYgBHI2AgAgBkEfdCEEIAEgB0cNAAsgAygCACIBQQFNDQIgAUF/aiIMQRBPBEBBISEBDAQLIANBBGogDEECdGooAgAEQCABIQIFIAMgDDYCACAMIQEMAwsLCyAHKAIAIQQMAgsgAUEBRyAHKAIAIgRyBEAgASECDAIFQQMhAQsLCwJAAkACQAJAAkACQAJAAkACQAJAAkACQCABQQNrDi4ACwsBCwsLCwsCCwsLCwMLBAsLCwsLBQsGCwsLCwsHCwsLCAsLCwsJCwsLCwsKCwsgACAIQYQEEDwaIAkkAg8LIAJBEBAnDAkLQbALIA1BEBAoDAgLQawNIApBgAQQKAwHCyACQRAQJwwGC0GQDCACQRAQKAwFCyACQRAQJwwEC0GwCyAMQRAQKAwDC0GsDSAKQYAEECgMAgsgAkEQECcMAQtBsAsgC0EQECgLCwuhAgIFfwF+AkAgACgCACIBQRBLBEAgAUEQECcLIAFFBEAPCyAAQQRqIAFBAnRqIQNCACEGIABBBGohAQNAIAEgASgCAK1CAYYgBnwiBj4CACAGQiCIIQYgAUEEaiIBIANHDQALIAAoAgAhASAGQgBRBEAgASECBSABQRBJBEAgAEEEaiABQQJ0aiAGPgIAIAAgACgCAEEBaiICNgIABUGgDSABQRAQKAsLAkAgAkEIRgRAQQghAgJAAkADQCACQX9qIQEgAkUNBCABQRBPDQEgAEEEaiABQQJ0aigCACIEIAFBAnRBxAlqKAIAIgVGBEAgASECDAELCwwBC0G8CyABQRAQKAsgBCAFSQRADwsFIAJBCEkEQA8LCwsgAEHACRAWCwukBQEHfwJAIwIhBCMCQZABaiQCIAQhASAAKAIAIgJBCUkEQCABQdgMKQIANwIAIAFB4AwpAgA3AgggAUHoDCkCADcCECABQfAMKQIANwIYIAFB+AwpAgA3AiAgAUGADSkCADcCKCABQYgNKQIANwIwIAFBkA0pAgA3AjggAUGYDSkCADcCQAUgAEEINgIAIAEgAkF4ajYCACABQQRqIgIgAEEkaiIDKQIANwIAIAIgAykCCDcCCCACIAMpAhA3AhAgAiADKQIYNwIYIAFBJGoiAkIANwIAIAJCADcCCCACQgA3AhAgAkIANwIYIAJBADoAIAsgBEHIAGohAiABEBwgACABEBUgACgCACIBQQhLBEAgAEEINgIAIAIgAUF4ajYCACACQQRqIgEgAEEkaiIDKQIANwIAIAEgAykCCDcCCCABIAMpAhA3AhAgASADKQIYNwIYIAJBJGoiAUIANwIAIAFCADcCCCABQgA3AhAgAUIANwIYIAFBADoAICACEBwgACACEBUgACgCACEBCyABQQhGBEBBCCEDA0ACQCADQX9qIQIgA0UEQEEUIQMMAQsgAkEQTwRAQQshAwwBCyAAQQRqIAJBAnRqKAIAIgYgAkECdEHECWooAgAiB0YEQCACIQMMAgVBDCEDCwsLIANBC0YEQEG8CyACQRAQKAUgA0EMRgRAIAYgB0khBQUgA0EURgRAIAQkAg8LCwsFIAFBCEkhBQsgBUUEQCAAQcAJEBYgBCQCDwsgAUEBTQRAIAQkAg8LA0ACQCABQX9qIgFBEE8EQEERIQMMAQsgAEEEaiABQQJ0aigCAARAQRQhAwwBCyAAIAE2AgAgAUEBSw0BQRQhAwsLIANBEUYEQEGwCyABQRAQKAUgA0EURgRAIAQkAgsLCwuQAgICfwJ+AkAgACgCACIBQRBPBEBBxA0gAUEQECgLIABBBGogAUECdGpBADYCACAAKAIAQQFqIgFBEE8EQEG4DSABQRAQKAsgAEEEaiABQQJ0akEANgIAIAAgACgCAEECaiICNgIAIAJBEEsEQCACQRAQJwsgAEEEaiEBIAIEQEIAIQMFDwsgAEEEaiACQQJ0aiECA0AgASABKAIArSIEQtEHfiADfCIDPgIAIANCIIggBHwhAyABQQRqIgEgAkcNAAsgACgCACIBQQFNBEAPCwJAAkADQCABQX9qIgFBEE8NASAAQQRqIAFBAnRqKAIADQIgACABNgIAIAFBAUsNAAwCCwALQbALIAFBEBAoCwsL0BACD38EfgJAIwIhByMCQfACaiQCIAciAyABKQIANwIAIAMgASkCCDcCCCADIAEpAhA3AhAgAyABKQIYNwIYIAMgASkCIDcCICADIAEpAig3AiggAyABKQIwNwIwIAMgASkCODcCOCADIAEpAkA3AkAgB0HIAGoiBkHACSkDADcDACAGQcgJKQMANwMIIAZB0AkpAwA3AxAgBkHYCSkDADcDGCAGQeAJKQMANwMgIAZB6AkpAwA3AyggBkHwCSkDADcDMCAGQfgJKQMANwM4IAZBgAopAwA3A0AgB0GQAWoiBEGICikDADcDACAEQZAKKQMANwMIIARBmAopAwA3AxAgBEGgCikDADcDGCAEQagKKQMANwMgIARBsAopAwA3AyggBEG4CikDADcDMCAEQcAKKQMANwM4IARByAopAwA3A0AgB0HYAWoiBUHYDCkCADcCACAFQeAMKQIANwIIIAVB6AwpAgA3AhAgBUHwDCkCADcCGCAFQfgMKQIANwIgIAVBgA0pAgA3AiggBUGIDSkCADcCMCAFQZANKQIANwI4IAVBmA0pAgA3AkACQCADQQRqIgsoAgAiASADKAIAIgJyQQFLBEAgBkEEaiEMIAVBBGohDyAEQQRqIRACQAJAAkACQAJAAkACQAJAAkACQANAIAFoIggEQCACQRBLDQJBICAIayEBIAIEfyAIrSETIAFBP3GtIRRCACERIANBBGogAkECdGohAQNAIAFBfGoiASgCAK0hEiABIBIgE4ggEYQ+AgAgEiAUhiERIAEgC0cNAAsgAygCACIBQQFLBH8gAUF/aiIBQRBPDQUgA0EEaiABQQJ0aigCAAR/QQEFIAMgATYCAEEBCwVBAQsFQQELIQEDQCAQKAIAQQFxBEAgBEHACRAVCyAEKAIAIgJBEEsNBSACBEBBACEJIARBBGogAkECdGohAgNAIAJBfGoiAigCACEKIAIgCkEBdiAJcjYCACAKQR90IQkgAiAQRw0ACyAEKAIAIgJBAUsEQCACQX9qIgJBEE8NCCAEQQRqIAJBAnRqKAIARQRAIAQgAjYCAAsLCyABQQFqIQIgASAISQRAIAIhAQwBCwsLIAwoAgBoIggEQCAGKAIAIgFBEEsNBkEgIAhrIQIgAQR/IAitIRMgAkE/ca0hFEIAIREgBkEEaiABQQJ0aiEBA0AgAUF8aiIBKAIArSESIAEgEiATiCARhD4CACASIBSGIREgASAMRw0ACyAGKAIAIgFBAUsEfyABQX9qIgFBEE8NCSAGQQRqIAFBAnRqKAIABH9BAQUgBiABNgIAQQELBUEBCwVBAQshAQNAIA8oAgBBAXEEQCAFQcAJEBULIAUoAgAiAkEQSw0JIAIEQEEAIQkgBUEEaiACQQJ0aiECA0AgAkF8aiICKAIAIQogAiAKQQF2IAlyNgIAIApBH3QhCSACIA9HDQALIAUoAgAiAkEBSwRAIAJBf2oiAkEQTw0MIAVBBGogAkECdGooAgBFBEAgBSACNgIACwsLIAFBAWohAiABIAhJBEAgAiEBDAELCwsCQAJAAkAgAygCACIBIAYoAgAiAkYEQANAIAFBf2ohAiABRQ0CIAJBEE8NDiADQQRqIAJBAnRqKAIAIgEgBkEEaiACQQJ0aigCACIJRgRAIAIhAQwBCwsgASAJSQ0CBSABIAJJDQILCyADIAYQFiAEIAUQFgwBCyAGIAMQFiAFIAQQFgsgCygCACIBIAMoAgAiAnJBAU0EQCACIQ0gASEODA0LIAwoAgAgBigCAHJBAUsNACACIQ0gASEODAwLAAsgAkEQECcMCAtBsAsgAUEQECgMBwsgAkEQECcMBgtBsAsgAkEQECgMBQsgAUEQECcMBAtBsAsgAUEQECgMAwsgAkEQECcMAgtBsAsgAkEQECgMAQtBvAsgAkEQECgLBSACIQ0gASEOCwsgDUEBRiAOQQFGcQRAIAMgBCkDADcDACADIAQpAwg3AwggAyAEKQMQNwMQIAMgBCkDGDcDGCADIAQpAyA3AyAgAyAEKQMoNwMoIAMgBCkDMDcDMCADIAQpAzg3AzggAyAEKQNANwNABSADIAUpAwA3AwAgAyAFKQMINwMIIAMgBSkDEDcDECADIAUpAxg3AxggAyAFKQMgNwMgIAMgBSkDKDcDKCADIAUpAzA3AzAgAyAFKQM4NwM4IAMgBSkDQDcDQAsgB0GgAmohASADQcQAaiICLAAABEAgA0HACRAVIAIsAAAEQCACQQA6AAAgAxAbIAMoAgBBAUYgCygCAEVxBEAgAEHYDCkCADcCACAAQeAMKQIANwIIIABB6AwpAgA3AhAgAEHwDCkCADcCGCAAQfgMKQIANwIgIABBgA0pAgA3AiggAEGIDSkCADcCMCAAQZANKQIANwI4IABBmA0pAgA3AkAgByQCDwUgAUHACSkDADcDACABQcgJKQMANwMIIAFB0AkpAwA3AxAgAUHYCSkDADcDGCABQeAJKQMANwMgIAFB6AkpAwA3AyggAUHwCSkDADcDMCABQfgJKQMANwM4IAFBgAopAwA3A0AgASADEBYgACABKQIANwIAIAAgASkCCDcCCCAAIAEpAhA3AhAgACABKQIYNwIYIAAgASkCIDcCICAAIAEpAig3AiggACABKQIwNwIwIAAgASkCODcCOCAAIAEpAkA3AkAgByQCDwsACwsgAxAbIAAgAykCADcCACAAIAMpAgg3AgggACADKQIQNwIQIAAgAykCGDcCGCAAIAMpAiA3AiAgACADKQIoNwIoIAAgAykCMDcCMCAAIAMpAjg3AjggACADKQJANwJAIAckAgsLzx8BD38CQCMCIQwjAkGABWokAiAAQZABaiIELAAABEAgDCQCDwsgDCELIAxBuARqIgIgAEHIAGoiCikCADcCACACIAopAgg3AgggAiAKKQIQNwIQIAIgCikCGDcCGCACIAopAiA3AiAgAiAKKQIoNwIoIAIgCikCMDcCMCACIAopAjg3AjggAiAKKQJANwJAIAIgChAVIAxB8ANqIgEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAAkACQCABKAIAIgNBCEYEQEEIIQcCQAJAAkADQCAHQX9qIQMgB0UNBSADQRBPDQEgAUEEaiADQQJ0aigCACIHIANBAnRBxAlqKAIAIgVHDQIgAyEHDAALAAtBvAsgA0EQECgMAQsgByAFTw0CQQghDQsFIANBCE8NASADIQ0LDAELIAFBwAkQFiABKAIAIQ0LIAEoAgQhDiALIAFBCGoiAykCADcCACALIAMpAgg3AgggCyADKQIQNwIQIAsgAykCGDcCGCALIAMpAiA3AiAgCyADKQIoNwIoIAsgAykCMDcCMCALIAMpAjg3AjggDUEBRiAORXEEQCAEQQE6AAAgDCQCDwsgDEGoA2ohCCAMQeACaiEEIAxBmAJqIQUgDEGIAWohBiACIAApAgA3AgAgAiAAKQIINwIIIAIgACkCEDcCECACIAApAhg3AhggAiAAKQIgNwIgIAIgACkCKDcCKCACIAApAjA3AjAgAiAAKQI4NwI4IAIgACkCQDcCQCACIAAQFyABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABEBsgDEHAAGoiCSABKQMANwMAIAkgASkDCDcDCCAJIAEpAxA3AxAgCSABKQMYNwMYIAkgASkDIDcDICAJIAEpAyg3AyggCSABKQMwNwMwIAkgASkDODcDOCAJIAEpA0A3A0AgAiAJKQMANwMAIAIgCSkDCDcDCCACIAkpAxA3AxAgAiAJKQMYNwMYIAIgCSkDIDcDICACIAkpAyg3AyggAiAJKQMwNwMwIAIgCSkDODcDOCACIAkpA0A3A0AgAiAJEBUgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0ACQAJAIAEoAgAiA0EIRgRAQQghBwJAAkACQANAIAdBf2ohAyAHRQ0FIANBEE8NASABQQRqIANBAnRqKAIAIgcgA0ECdEHECWooAgAiD0cNAiADIQcMAAsAC0G8CyADQRAQKAwBCyAHIA9PDQILBSADQQhPDQELDAELIAFBwAkQFgsgBCABKQMANwMAIAQgASkDCDcDCCAEIAEpAxA3AxAgBCABKQMYNwMYIAQgASkDIDcDICAEIAEpAyg3AyggBCABKQMwNwMwIAQgASkDODcDOCAEIAEpA0A3A0AgAiAEKQMANwMAIAIgBCkDCDcDCCACIAQpAxA3AxAgAiAEKQMYNwMYIAIgBCkDIDcDICACIAQpAyg3AyggAiAEKQMwNwMwIAIgBCkDODcDOCACIAQpA0A3A0AgAiAJEBUgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0ACQAJAIAEoAgAiA0EIRgRAQQghBwJAAkACQANAIAdBf2ohAyAHRQ0FIANBEE8NASABQQRqIANBAnRqKAIAIgcgA0ECdEHECWooAgAiCUcNAiADIQcMAAsAC0G8CyADQRAQKAwBCyAHIAlPDQILBSADQQhPDQELDAELIAFBwAkQFgsgBSABKQMANwMAIAUgASkDCDcDCCAFIAEpAxA3AxAgBSABKQMYNwMYIAUgASkDIDcDICAFIAEpAyg3AyggBSABKQMwNwMwIAUgASkDODcDOCAFIAEpA0A3A0AgAiANNgIAIAIgDjYCBCACQQhqIgMgCykDADcDACADIAspAwg3AwggAyALKQMQNwMQIAMgCykDGDcDGCADIAspAyA3AyAgAyALKQMoNwMoIAMgCykDMDcDMCADIAspAzg3AzggCCACEB0gAiAFKQMANwMAIAIgBSkDCDcDCCACIAUpAxA3AxAgAiAFKQMYNwMYIAIgBSkDIDcDICACIAUpAyg3AyggAiAFKQMwNwMwIAIgBSkDODcDOCACIAUpA0A3A0AgAiAIEBcgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgARAbIAYgASkDADcDACAGIAEpAwg3AwggBiABKQMQNwMQIAYgASkDGDcDGCAGIAEpAyA3AyAgBiABKQMoNwMoIAYgASkDMDcDMCAGIAEpAzg3AzggBiABKQNANwNAIAIgBikDADcDACACIAYpAwg3AwggAiAGKQMQNwMQIAIgBikDGDcDGCACIAYpAyA3AyAgAiAGKQMoNwMoIAIgBikDMDcDMCACIAYpAzg3AzggAiAGKQNANwNAIAIgBhAXIAEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAIAEQGyAEIAEpAwA3AwAgBCABKQMINwMIIAQgASkDEDcDECAEIAEpAxg3AxggBCABKQMgNwMgIAQgASkDKDcDKCAEIAEpAzA3AzAgBCABKQM4NwM4IAQgASkDQDcDQCACIAApAgA3AgAgAiAAKQIINwIIIAIgACkCEDcCECACIAApAhg3AhggAiAAKQIgNwIgIAIgACkCKDcCKCACIAApAjA3AjAgAiAAKQI4NwI4IAIgACkCQDcCQCACIAAQFSABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQAJAAkAgASgCACIDQQhGBEBBCCEHAkACQAJAA0AgB0F/aiEDIAdFDQUgA0EQTw0BIAFBBGogA0ECdGooAgAiByADQQJ0QcQJaigCACILRw0CIAMhBwwACwALQbwLIANBEBAoDAELIAcgC08NAgsFIANBCE8NAQsMAQsgAUHACRAWCyAIIAEpAwA3AwAgCCABKQMINwMIIAggASkDEDcDECAIIAEpAxg3AxggCCABKQMgNwMgIAggASkDKDcDKCAIIAEpAzA3AzAgCCABKQM4NwM4IAggASkDQDcDQCACIAQpAwA3AwAgAiAEKQMINwMIIAIgBCkDEDcDECACIAQpAxg3AxggAiAEKQMgNwMgIAIgBCkDKDcDKCACIAQpAzA3AzAgAiAEKQM4NwM4IAIgBCkDQDcDQCACIAgQFiABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABLABEBEAgAUHACRAVCyAMQdABaiIDIAEpAwA3AwAgAyABKQMINwMIIAMgASkDEDcDECADIAEpAxg3AxggAyABKQMgNwMgIAMgASkDKDcDKCADIAEpAzA3AzAgAyABKQM4NwM4IAMgASkDQDcDQCACIAApAgA3AgAgAiAAKQIINwIIIAIgACkCEDcCECACIAApAhg3AhggAiAAKQIgNwIgIAIgACkCKDcCKCACIAApAjA3AjAgAiAAKQI4NwI4IAIgACkCQDcCQCACIAMQFiABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABLABEBEAgAUHACRAVCyAIIAEpAwA3AwAgCCABKQMINwMIIAggASkDEDcDECAIIAEpAxg3AxggCCABKQMgNwMgIAggASkDKDcDKCAIIAEpAzA3AzAgCCABKQM4NwM4IAggASkDQDcDQCACIAYpAwA3AwAgAiAGKQMINwMIIAIgBikDEDcDECACIAYpAxg3AxggAiAGKQMgNwMgIAIgBikDKDcDKCACIAYpAzA3AzAgAiAGKQM4NwM4IAIgBikDQDcDQCACIAgQFyABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABEBsgBCABKQMANwMAIAQgASkDCDcDCCAEIAEpAxA3AxAgBCABKQMYNwMYIAQgASkDIDcDICAEIAEpAyg3AyggBCABKQMwNwMwIAQgASkDODcDOCAEIAEpA0A3A0AgAiAEKQMANwMAIAIgBCkDCDcDCCACIAQpAxA3AxAgAiAEKQMYNwMYIAIgBCkDIDcDICACIAQpAyg3AyggAiAEKQMwNwMwIAIgBCkDODcDOCACIAQpA0A3A0AgAiAKEBYgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgASwARARAIAFBwAkQFQsgBSABKQMANwMAIAUgASkDCDcDCCAFIAEpAxA3AxAgBSABKQMYNwMYIAUgASkDIDcDICAFIAEpAyg3AyggBSABKQMwNwMwIAUgASkDODcDOCAFIAEpA0A3A0AgCiAFKQIANwIAIAogBSkCCDcCCCAKIAUpAhA3AhAgCiAFKQIYNwIYIAogBSkCIDcCICAKIAUpAig3AiggCiAFKQIwNwIwIAogBSkCODcCOCAKIAUpAkA3AkAgACADKQIANwIAIAAgAykCCDcCCCAAIAMpAhA3AhAgACADKQIYNwIYIAAgAykCIDcCICAAIAMpAig3AiggACADKQIwNwIwIAAgAykCODcCOCAAIAMpAkA3AkAgDCQCCwvCFgETfwJAIwIhCSMCQfC1AmokAiAJQZC0AmohAyAJQcizAmohBSAJQbiyAmohByAJQey1AmohCyAJIgRBCDYCACAEQZiv4LcBNgIEIARB24LKzwU2AgggBEHZ0bjuAjYCDCAEQdv57xQ2AhAgBEGHlpz0fDYCFCAEQZXFga0FNgIYIARBrPfyTjYCHCAEQf7M+c0HNgIgIARBJGoiBkIANwIAIAZCADcCCCAGQgA3AhAgBkIANwIYIAZBADoAICAEQQg2AkggBEHMAGoiD0G4qcNYNgIAIARBj6Gf4nk2AlAgBEGZqJW0ejYCVCAEQcjo3mg2AlggBEGokcTwADYCXCAEQfz3k+0FNgJgIARB5YiPtQI2AmQgBEH3tOvBBDYCaCAEQewAaiIGQgA3AgAgBkIANwIIIAZCADcCECAGQgA3AhggBkEAOgAgIARBkAFqIhBBADoAACAJQdi0AmoiASAEQZQBEDwaIAlB6JkBaiICIARBlAEQPBogAkGUAWogAUGUARA8GiACQagCaiABQZQBEDwaIAJBvANqIAFBlAEQPBogAkHQBGogAUGUARA8GiACQeQFaiABQZQBEDwaIAJB+AZqIAFBlAEQPBogAkGMCGogAUGUARA8GiACQaAJaiABQZQBEDwaIAJBtApqIAFBlAEQPBogAkHIC2ogAUGUARA8GiACQdwMaiABQZQBEDwaIAJB8A1qIAFBlAEQPBogAkGED2ogAUGUARA8GiACQZgQaiABQZQBEDwaIAJBrBFqIAFBlAEQPBogAkHAEmogAUGUARA8GiACQdQTaiABQZQBEDwaIAJB6BRqIAFBlAEQPBogAkH8FWogAUGUARA8GiACQZAXaiABQZQBEDwaIAJBpBhqIAFBlAEQPBogAkG4GWogAUGUARA8GiACQcwaaiABQZQBEDwaIAJB4BtqIAFBlAEQPBogAkH0HGogAUGUARA8GiACQYgeaiABQZQBEDwaIAJBnB9qIAFBlAEQPBogAkGwIGogAUGUARA8GiACQcQhaiABQZQBEDwaIAJB2CJqIAFBlAEQPBogAkHsI2ogAUGUARA8GiACQYAlaiABQZQBEDwaIAJBlCZqIAFBlAEQPBogAkGoJ2ogAUGUARA8GiACQbwoaiABQZQBEDwaIAJB0ClqIAFBlAEQPBogAkHkKmogAUGUARA8GiACQfgraiABQZQBEDwaIAJBjC1qIAFBlAEQPBogAkGgLmogAUGUARA8GiACQbQvaiABQZQBEDwaIAJByDBqIAFBlAEQPBogAkHcMWogAUGUARA8GiACQfAyaiABQZQBEDwaIAJBhDRqIAFBlAEQPBogAkGYNWogAUGUARA8GiACQaw2aiABQZQBEDwaIAJBwDdqIAFBlAEQPBogAkHUOGogAUGUARA8GiACQeg5aiABQZQBEDwaIAJB/DpqIAFBlAEQPBogAkGQPGogAUGUARA8GiACQaQ9aiABQZQBEDwaIAJBuD5qIAFBlAEQPBogAkHMP2ogAUGUARA8GiACQeDAAGogAUGUARA8GiACQfTBAGogAUGUARA8GiACQYjDAGogAUGUARA8GiACQZzEAGogAUGUARA8GiACQbDFAGogAUGUARA8GiACQcTGAGogAUGUARA8GiACQdjHAGogAUGUARA8GiACQezIAGogAUGUARA8GiACQYDKAGogAUGUARA8GiACQZTLAGogAUGUARA8GiAQLAAABH8gByAEQZABEDwaIAsgBEGRAWoiBi4AADsAACALIAYsAAI6AAJBAQUgBSAEKQMANwMAIAUgBCkDCDcDCCAFIAQpAxA3AxAgBSAEKQMYNwMYIAUgBCkDIDcDICAFIAQpAyg3AyggBSAEKQMwNwMwIAUgBCkDODcDOCAFIAQpA0A3A0AgBEHIAGoiBigCAEEBRiAPKAIARXEEQCADQdgMKQIANwIAIANB4AwpAgA3AgggA0HoDCkCADcCECADQfAMKQIANwIYIANB+AwpAgA3AiAgA0GADSkCADcCKCADQYgNKQIANwIwIANBkA0pAgA3AjggA0GYDSkCADcCQAUgAUHACSkDADcDACABQcgJKQMANwMIIAFB0AkpAwA3AxAgAUHYCSkDADcDGCABQeAJKQMANwMgIAFB6AkpAwA3AyggAUHwCSkDADcDMCABQfgJKQMANwM4IAFBgAopAwA3A0AgASAGEBYgAyABKQMANwMAIAMgASkDCDcDCCADIAEpAxA3AxAgAyABKQMYNwMYIAMgASkDIDcDICADIAEpAyg3AyggAyABKQMwNwMwIAMgASkDODcDOCADIAEpA0A3A0ALIAcgBSkDADcDACAHIAUpAwg3AwggByAFKQMQNwMQIAcgBSkDGDcDGCAHIAUpAyA3AyAgByAFKQMoNwMoIAcgBSkDMDcDMCAHIAUpAzg3AzggByAFKQNANwNAIAdByABqIgYgAykDADcDACAGIAMpAwg3AwggBiADKQMQNwMQIAYgAykDGDcDGCAGIAMpAyA3AyAgBiADKQMoNwMoIAYgAykDMDcDMCAGIAMpAzg3AzggBiADKQNANwNAQQALIQwgCUGYAWohDSAJQZDmAWoiCkGozABqIQggCiEGA0AgBiAHQZABEDwaIAYgDDoAkAEgBkGRAWoiDiALLgAAOwAAIA4gCywAAjoAAiAGQZQBaiIGIAhHDQALIA0gAkGozAAQPBogDUGozABqIApBqMwAEDwaIA1BlAFqIRMgBEHIAGohESAHQcgAaiEIIARBkQFqIRIgDUG8zQBqIg4hAkEBIQZBACEKA0AgBBAeIAQQHiAEEB4gBBAeIBMgCkGUAWxqIARBlAEQPBogECwAAAR/IAcgBEGQARA8GiALIBIuAAA7AAAgCyASLAACOgACQQEFIAUgBCkDADcDACAFIAQpAwg3AwggBSAEKQMQNwMQIAUgBCkDGDcDGCAFIAQpAyA3AyAgBSAEKQMoNwMoIAUgBCkDMDcDMCAFIAQpAzg3AzggBSAEKQNANwNAIBEoAgBBAUYgDygCAEVxBEAgA0HYDCkCADcCACADQeAMKQIANwIIIANB6AwpAgA3AhAgA0HwDCkCADcCGCADQfgMKQIANwIgIANBgA0pAgA3AiggA0GIDSkCADcCMCADQZANKQIANwI4IANBmA0pAgA3AkAFIAFBwAkpAwA3AwAgAUHICSkDADcDCCABQdAJKQMANwMQIAFB2AkpAwA3AxggAUHgCSkDADcDICABQegJKQMANwMoIAFB8AkpAwA3AzAgAUH4CSkDADcDOCABQYAKKQMANwNAIAEgERAWIAMgASkDADcDACADIAEpAwg3AwggAyABKQMQNwMQIAMgASkDGDcDGCADIAEpAyA3AyAgAyABKQMoNwMoIAMgASkDMDcDMCADIAEpAzg3AzggAyABKQNANwNACyAHIAUpAwA3AwAgByAFKQMINwMIIAcgBSkDEDcDECAHIAUpAxg3AxggByAFKQMgNwMgIAcgBSkDKDcDKCAHIAUpAzA3AzAgByAFKQM4NwM4IAcgBSkDQDcDQCAIIAMpAwA3AwAgCCADKQMINwMIIAggAykDEDcDECAIIAMpAxg3AxggCCADKQMgNwMgIAggAykDKDcDKCAIIAMpAzA3AzAgCCADKQM4NwM4IAggAykDQDcDQEEACyEMIAIgB0GQARA8GiAOIApBlAFsaiAMOgCQASAOIApBlAFsakGRAWoiCiALLgAAOwAAIAogCywAAjoAAiAOIAZBlAFsaiECIAZBAWoiDEHCAEcEQCAGIQogDCEGDAELCyAAIA1B0JgBEDwaIAkkAgsLwgwBEH8CQCMCIQsjAkGQCmokAiALIgcgAkEBEBkgC0GQCWoiBkIANwAAIAZCADcACCAGQgA3ABAgBkIANwAYIAZCADcAICAGQgA3ACggBkIANwAwIAZCADcAOCAGQgA3AEAgBkIANwBIIAZCADcAUCAGQgA3AFggBkIANwBgIAZCADcAaCAGQgA3AHAgBkIANwB4IAcoAoAEIglBgARLBEAgCUGABBAnCyALQbgHaiEOIAtB4AVqIQQgC0GIBGohBSAJRSEDIAlBBEkEfyAJBUEECyECAkAgAwRAQQAhDQUgCSACayEIIAchAyACIQkgByACaiECQQAhBwJAAkACQANAAkACQAJAAkACQAJAIAlBAWsOBAMCAQAECyADLAACQQJ0Qf8BcSADLAADQQN0Qf8BcWpBGHRBGHUgAywAAUEBdEH/AXFqQRh0QRh1IAMsAABqQRh0QRh1IQMMBAsgAywAAUEBdEH/AXEgAywAAkECdEH/AXFqQRh0QRh1IAMsAABqQRh0QRh1IQMMAwsgAywAAUEBdEH/AXEgAywAAGpBGHRBGHUhAwwCCyADLAAAIQMMAQsMAgsgB0GAAU8NAiAGIAdqIAM6AAAgB0EBaiEHIAhFIQwgCCAIQQRJBH8gCAVBBAsiCmshCCACIgMgCmohDyAMBEBBACEICyAMBEAgAiEPCyAMRQRAIAohCQsgDCACRXIEQCAHIQ0MBgUgDyECDAELAAsAC0HQDRAuDAELQeQNIAdBgAEQKAsLCyAFQYgKKQMANwMAIAVBkAopAwA3AwggBUGYCikDADcDECAFQaAKKQMANwMYIAVBqAopAwA3AyAgBUGwCikDADcDKCAFQbgKKQMANwMwIAVBwAopAwA3AzggBUHICikDADcDQCAFQcgAaiICQYgKKQMANwMAIAJBkAopAwA3AwggAkGYCikDADcDECACQaAKKQMANwMYIAJBqAopAwA3AyAgAkGwCikDADcDKCACQbgKKQMANwMwIAJBwAopAwA3AzggAkHICikDADcDQCAFQZABaiICQdgMKQIANwIAIAJB4AwpAgA3AgggAkHoDCkCADcCECACQfAMKQIANwIYIAJB+AwpAgA3AiAgAkGADSkCADcCKCACQYgNKQIANwIwIAJBkA0pAgA3AjggAkGYDSkCADcCQCAEQYgKKQMANwMAIARBkAopAwA3AwggBEGYCikDADcDECAEQaAKKQMANwMYIARBqAopAwA3AyAgBEGwCikDADcDKCAEQbgKKQMANwMwIARBwAopAwA3AzggBEHICikDADcDQCAEQcgAaiICQYgKKQMANwMAIAJBkAopAwA3AwggAkGYCikDADcDECACQaAKKQMANwMYIAJBqAopAwA3AyAgAkGwCikDADcDKCACQbgKKQMANwMwIAJBwAopAwA3AzggAkHICikDADcDQCAEQZABaiICQdgMKQIANwIAIAJB4AwpAgA3AgggAkHoDCkCADcCECACQfAMKQIANwIYIAJB+AwpAgA3AiAgAkGADSkCADcCKCACQYgNKQIANwIwIAJBkA0pAgA3AjggAkGYDSkCADcCQCANRSICBEAgBSAEECEgBSAEECEgBSAEECEgBSAEECEgBSAEECEgBSAEECEgBSAEECEgBSAEECEgBSAEECEgBSAEECEgDiAFQdgBEDwaIAAgDhAiIAskAg8FQQohCgsgBiANaiERIAYhCSAGQQFqIQMgAgR/IAkFIAMLIQYgAkEBc0EBcSEMAkACQAJAAkADQEEAIAprQRh0QRh1IRJBACEIIAYhAiAJIQMgDCEHA0AgAywAACIDIApBGHRBGHVGBEAgCEHCAE8NBCAEIAEgCEGUAWxqECMFIAMgEkYEQCAIQcIATw0GIAQgAUGozABqIAhBlAFsahAjCwsgAiIDIBFGIRAgA0EBaiEDIBAEfyACBSADCyEPIBBBAXMgB2ohDSAQRQRAIAchCAsgAkUgEHJFBEAgAiEDIA8hAiANIQcMAQsLIAUgBBAhIApBf2pBGHRBGHUhAiAKQRh0QRh1QQFMDQEgAiEKDAALAAsgDiAFQdgBEDwaIAAgDhAiIAskAg8LQfANIAhBwgAQKAwBC0H8DSAIQcIAECgLCwu9OgEPfwJAIwIhDCMCQeAKaiQCIAAoApABQQFGBEAgACgClAFFBEAgACABQdgBEDwaIAwkAg8LCyABKAKQAUEBRgRAIAEoApQBRQRAIAwkAg8LCyAMQYAJaiICIAFBkAFqIg4pAgA3AgAgAiAOKQIINwIIIAIgDikCEDcCECACIA4pAhg3AhggAiAOKQIgNwIgIAIgDikCKDcCKCACIA4pAjA3AjAgAiAOKQI4NwI4IAIgDikCQDcCQCACIA4QFyAMQbgIaiIDIAIpAwA3AwAgAyACKQMINwMIIAMgAikDEDcDECADIAIpAxg3AxggAyACKQMgNwMgIAMgAikDKDcDKCADIAIpAzA3AzAgAyACKQM4NwM4IAMgAikDQDcDQCADEBsgDCIGIAMpAwA3AwAgBiADKQMINwMIIAYgAykDEDcDECAGIAMpAxg3AxggBiADKQMgNwMgIAYgAykDKDcDKCAGIAMpAzA3AzAgBiADKQM4NwM4IAYgAykDQDcDQCACIABBkAFqIgkpAgA3AgAgAiAJKQIINwIIIAIgCSkCEDcCECACIAkpAhg3AhggAiAJKQIgNwIgIAIgCSkCKDcCKCACIAkpAjA3AjAgAiAJKQI4NwI4IAIgCSkCQDcCQCACIAkQFyADIAIpAwA3AwAgAyACKQMINwMIIAMgAikDEDcDECADIAIpAxg3AxggAyACKQMgNwMgIAMgAikDKDcDKCADIAIpAzA3AzAgAyACKQM4NwM4IAMgAikDQDcDQCADEBsgDEHIAGoiBSADKQMANwMAIAUgAykDCDcDCCAFIAMpAxA3AxAgBSADKQMYNwMYIAUgAykDIDcDICAFIAMpAyg3AyggBSADKQMwNwMwIAUgAykDODcDOCAFIAMpA0A3A0AgAiAAKQIANwIAIAIgACkCCDcCCCACIAApAhA3AhAgAiAAKQIYNwIYIAIgACkCIDcCICACIAApAig3AiggAiAAKQIwNwIwIAIgACkCODcCOCACIAApAkA3AkAgAiAGEBcgAyACKQMANwMAIAMgAikDCDcDCCADIAIpAxA3AxAgAyACKQMYNwMYIAMgAikDIDcDICADIAIpAyg3AyggAyACKQMwNwMwIAMgAikDODcDOCADIAIpA0A3A0AgAxAbIAxBkAFqIgcgAykDADcDACAHIAMpAwg3AwggByADKQMQNwMQIAcgAykDGDcDGCAHIAMpAyA3AyAgByADKQMoNwMoIAcgAykDMDcDMCAHIAMpAzg3AzggByADKQNANwNAIAIgASkCADcCACACIAEpAgg3AgggAiABKQIQNwIQIAIgASkCGDcCGCACIAEpAiA3AiAgAiABKQIoNwIoIAIgASkCMDcCMCACIAEpAjg3AjggAiABKQJANwJAIAIgBRAXIAMgAikDADcDACADIAIpAwg3AwggAyACKQMQNwMQIAMgAikDGDcDGCADIAIpAyA3AyAgAyACKQMoNwMoIAMgAikDMDcDMCADIAIpAzg3AzggAyACKQNANwNAIAMQGyAMQdgBaiIIIAMpAwA3AwAgCCADKQMINwMIIAggAykDEDcDECAIIAMpAxg3AxggCCADKQMgNwMgIAggAykDKDcDKCAIIAMpAzA3AzAgCCADKQM4NwM4IAggAykDQDcDQCACIABByABqIg0pAgA3AgAgAiANKQIINwIIIAIgDSkCEDcCECACIA0pAhg3AhggAiANKQIgNwIgIAIgDSkCKDcCKCACIA0pAjA3AjAgAiANKQI4NwI4IAIgDSkCQDcCQCACIAYQFyADIAIpAwA3AwAgAyACKQMINwMIIAMgAikDEDcDECADIAIpAxg3AxggAyACKQMgNwMgIAMgAikDKDcDKCADIAIpAzA3AzAgAyACKQM4NwM4IAMgAikDQDcDQCADEBsgDEHwB2oiBCADKQMANwMAIAQgAykDCDcDCCAEIAMpAxA3AxAgBCADKQMYNwMYIAQgAykDIDcDICAEIAMpAyg3AyggBCADKQMwNwMwIAQgAykDODcDOCAEIAMpA0A3A0AgAiAEKQMANwMAIAIgBCkDCDcDCCACIAQpAxA3AxAgAiAEKQMYNwMYIAIgBCkDIDcDICACIAQpAyg3AyggAiAEKQMwNwMwIAIgBCkDODcDOCACIAQpA0A3A0AgAiAOEBcgAyACKQMANwMAIAMgAikDCDcDCCADIAIpAxA3AxAgAyACKQMYNwMYIAMgAikDIDcDICADIAIpAyg3AyggAyACKQMwNwMwIAMgAikDODcDOCADIAIpA0A3A0AgAxAbIAxBoAJqIgogAykDADcDACAKIAMpAwg3AwggCiADKQMQNwMQIAogAykDGDcDGCAKIAMpAyA3AyAgCiADKQMoNwMoIAogAykDMDcDMCAKIAMpAzg3AzggCiADKQNANwNAIAIgAUHIAGoiASkCADcCACACIAEpAgg3AgggAiABKQIQNwIQIAIgASkCGDcCGCACIAEpAiA3AiAgAiABKQIoNwIoIAIgASkCMDcCMCACIAEpAjg3AjggAiABKQJANwJAIAIgBRAXIAMgAikDADcDACADIAIpAwg3AwggAyACKQMQNwMQIAMgAikDGDcDGCADIAIpAyA3AyAgAyACKQMoNwMoIAMgAikDMDcDMCADIAIpAzg3AzggAyACKQNANwNAIAMQGyAEIAMpAwA3AwAgBCADKQMINwMIIAQgAykDEDcDECAEIAMpAxg3AxggBCADKQMgNwMgIAQgAykDKDcDKCAEIAMpAzA3AzAgBCADKQM4NwM4IAQgAykDQDcDQCACIAQpAwA3AwAgAiAEKQMINwMIIAIgBCkDEDcDECACIAQpAxg3AxggAiAEKQMgNwMgIAIgBCkDKDcDKCACIAQpAzA3AzAgAiAEKQM4NwM4IAIgBCkDQDcDQCACIAkQFyADIAIpAwA3AwAgAyACKQMINwMIIAMgAikDEDcDECADIAIpAxg3AxggAyACKQMgNwMgIAMgAikDKDcDKCADIAIpAzA3AzAgAyACKQM4NwM4IAMgAikDQDcDQCADEBsgDEHoAmoiASADKQMANwMAIAEgAykDCDcDCCABIAMpAxA3AxAgASADKQMYNwMYIAEgAykDIDcDICABIAMpAyg3AyggASADKQMwNwMwIAEgAykDODcDOCABIAMpA0A3A0AgAiAHKQMANwMAIAIgBykDCDcDCCACIAcpAxA3AxAgAiAHKQMYNwMYIAIgBykDIDcDICACIAcpAyg3AyggAiAHKQMwNwMwIAIgBykDODcDOCACIAcpA0A3A0AgAiAIEBYgAyACKQMANwMAIAMgAikDCDcDCCADIAIpAxA3AxAgAyACKQMYNwMYIAMgAikDIDcDICADIAIpAyg3AyggAyACKQMwNwMwIAMgAikDODcDOCADIAIpA0A3A0AgAywARARAIANBwAkQFQsgDEGwA2oiCyADKQMANwMAIAsgAykDCDcDCCALIAMpAxA3AxAgCyADKQMYNwMYIAsgAykDIDcDICALIAMpAyg3AyggCyADKQMwNwMwIAsgAykDODcDOCALIAMpA0A3A0AgAiAKKQMANwMAIAIgCikDCDcDCCACIAopAxA3AxAgAiAKKQMYNwMYIAIgCikDIDcDICACIAopAyg3AyggAiAKKQMwNwMwIAIgCikDODcDOCACIAopA0A3A0AgAiABEBYgAyACKQMANwMAIAMgAikDCDcDCCADIAIpAxA3AxAgAyACKQMYNwMYIAMgAikDIDcDICADIAIpAyg3AyggAyACKQMwNwMwIAMgAikDODcDOCADIAIpA0A3A0AgAywARARAIANBwAkQFQsgDEH4A2oiCCADKQMANwMAIAggAykDCDcDCCAIIAMpAxA3AxAgCCADKQMYNwMYIAggAykDIDcDICAIIAMpAyg3AyggCCADKQMwNwMwIAggAykDODcDOCAIIAMpA0A3A0AgCygCAEEBRgRAIAsoAgRFBEACQAJAIAgoAgBBAUcNACAIKAIEDQAgABAkDAELIAJBiAopAwA3AwAgAkGQCikDADcDCCACQZgKKQMANwMQIAJBoAopAwA3AxggAkGoCikDADcDICACQbAKKQMANwMoIAJBuAopAwA3AzAgAkHACikDADcDOCACQcgKKQMANwNAIAJByABqIgFBiAopAwA3AwAgAUGQCikDADcDCCABQZgKKQMANwMQIAFBoAopAwA3AxggAUGoCikDADcDICABQbAKKQMANwMoIAFBuAopAwA3AzAgAUHACikDADcDOCABQcgKKQMANwNAIAJBkAFqIgFB2AwpAgA3AgAgAUHgDCkCADcCCCABQegMKQIANwIQIAFB8AwpAgA3AhggAUH4DCkCADcCICABQYANKQIANwIoIAFBiA0pAgA3AjAgAUGQDSkCADcCOCABQZgNKQIANwJAIAAgAkHYARA8GgsgDCQCDwsLIAxBqAdqIQUgAiALKQMANwMAIAIgCykDCDcDCCACIAspAxA3AxAgAiALKQMYNwMYIAIgCykDIDcDICACIAspAyg3AyggAiALKQMwNwMwIAIgCykDODcDOCACIAspA0A3A0AgAiALEBcgAyACKQMANwMAIAMgAikDCDcDCCADIAIpAxA3AxAgAyACKQMYNwMYIAMgAikDIDcDICADIAIpAyg3AyggAyACKQMwNwMwIAMgAikDODcDOCADIAIpA0A3A0AgAxAbIAxBwARqIgEgAykDADcDACABIAMpAwg3AwggASADKQMQNwMQIAEgAykDGDcDGCABIAMpAyA3AyAgASADKQMoNwMoIAEgAykDMDcDMCABIAMpAzg3AzggASADKQNANwNAIAIgBykDADcDACACIAcpAwg3AwggAiAHKQMQNwMQIAIgBykDGDcDGCACIAcpAyA3AyAgAiAHKQMoNwMoIAIgBykDMDcDMCACIAcpAzg3AzggAiAHKQNANwNAIAIgARAXIAMgAikDADcDACADIAIpAwg3AwggAyACKQMQNwMQIAMgAikDGDcDGCADIAIpAyA3AyAgAyACKQMoNwMoIAMgAikDMDcDMCADIAIpAzg3AzggAyACKQNANwNAIAMQGyAMQYgFaiIHIAMpAwA3AwAgByADKQMINwMIIAcgAykDEDcDECAHIAMpAxg3AxggByADKQMgNwMgIAcgAykDKDcDKCAHIAMpAzA3AzAgByADKQM4NwM4IAcgAykDQDcDQCACIAEpAwA3AwAgAiABKQMINwMIIAIgASkDEDcDECACIAEpAxg3AxggAiABKQMgNwMgIAIgASkDKDcDKCACIAEpAzA3AzAgAiABKQM4NwM4IAIgASkDQDcDQCACIAsQFyADIAIpAwA3AwAgAyACKQMINwMIIAMgAikDEDcDECADIAIpAxg3AxggAyACKQMgNwMgIAMgAikDKDcDKCADIAIpAzA3AzAgAyACKQM4NwM4IAMgAikDQDcDQCADEBsgDEHQBWoiDyADKQMANwMAIA8gAykDCDcDCCAPIAMpAxA3AxAgDyADKQMYNwMYIA8gAykDIDcDICAPIAMpAyg3AyggDyADKQMwNwMwIA8gAykDODcDOCAPIAMpA0A3A0AgAiAIKQMANwMAIAIgCCkDCDcDCCACIAgpAxA3AxAgAiAIKQMYNwMYIAIgCCkDIDcDICACIAgpAyg3AyggAiAIKQMwNwMwIAIgCCkDODcDOCACIAgpA0A3A0AgAiAIEBcgAyACKQMANwMAIAMgAikDCDcDCCADIAIpAxA3AxAgAyACKQMYNwMYIAMgAikDIDcDICADIAIpAyg3AyggAyACKQMwNwMwIAMgAikDODcDOCADIAIpA0A3A0AgAxAbIAQgAykDADcDACAEIAMpAwg3AwggBCADKQMQNwMQIAQgAykDGDcDGCAEIAMpAyA3AyAgBCADKQMoNwMoIAQgAykDMDcDMCAEIAMpAzg3AzggBCADKQNANwNAIAIgBCkDADcDACACIAQpAwg3AwggAiAEKQMQNwMQIAIgBCkDGDcDGCACIAQpAyA3AyAgAiAEKQMoNwMoIAIgBCkDMDcDMCACIAQpAzg3AzggAiAEKQNANwNAIAIgDxAVIAMgAikDADcDACADIAIpAwg3AwggAyACKQMQNwMQIAMgAikDGDcDGCADIAIpAyA3AyAgAyACKQMoNwMoIAMgAikDMDcDMCADIAIpAzg3AzggAyACKQNANwNAAkACQCADKAIAIgFBCEYEQEEIIQYCQAJAAkADQCAGQX9qIQEgBkUNBSABQRBPDQEgA0EEaiABQQJ0aigCACIGIAFBAnRBxAlqKAIAIhBHDQIgASEGDAALAAtBvAsgAUEQECgMAQsgBiAQTw0CCwUgAUEITw0BCwwBCyADQcAJEBYLIAUgAykDADcDACAFIAMpAwg3AwggBSADKQMQNwMQIAUgAykDGDcDGCAFIAMpAyA3AyAgBSADKQMoNwMoIAUgAykDMDcDMCAFIAMpAzg3AzggBSADKQNANwNAIAIgBSkDADcDACACIAUpAwg3AwggAiAFKQMQNwMQIAIgBSkDGDcDGCACIAUpAyA3AyAgAiAFKQMoNwMoIAIgBSkDMDcDMCACIAUpAzg3AzggAiAFKQNANwNAIAIgBxAWIAMgAikDADcDACADIAIpAwg3AwggAyACKQMQNwMQIAMgAikDGDcDGCADIAIpAyA3AyAgAyACKQMoNwMoIAMgAikDMDcDMCADIAIpAzg3AzggAyACKQNANwNAIAMsAEQEQCADQcAJEBULIAxB4AZqIgEgAykDADcDACABIAMpAwg3AwggASADKQMQNwMQIAEgAykDGDcDGCABIAMpAyA3AyAgASADKQMoNwMoIAEgAykDMDcDMCABIAMpAzg3AzggASADKQNANwNAIAIgASkDADcDACACIAEpAwg3AwggAiABKQMQNwMQIAIgASkDGDcDGCACIAEpAyA3AyAgAiABKQMoNwMoIAIgASkDMDcDMCACIAEpAzg3AzggAiABKQNANwNAIAIgBxAWIAMgAikDADcDACADIAIpAwg3AwggAyACKQMQNwMQIAMgAikDGDcDGCADIAIpAyA3AyAgAyACKQMoNwMoIAMgAikDMDcDMCADIAIpAzg3AzggAyACKQNANwNAIAMsAEQEQCADQcAJEBULIAxBmAZqIgYgAykDADcDACAGIAMpAwg3AwggBiADKQMQNwMQIAYgAykDGDcDGCAGIAMpAyA3AyAgBiADKQMoNwMoIAYgAykDMDcDMCAGIAMpAzg3AzggBiADKQNANwNAIAAgBikCADcCACAAIAYpAgg3AgggACAGKQIQNwIQIAAgBikCGDcCGCAAIAYpAiA3AiAgACAGKQIoNwIoIAAgBikCMDcCMCAAIAYpAjg3AjggACAGKQJANwJAIAIgBykDADcDACACIAcpAwg3AwggAiAHKQMQNwMQIAIgBykDGDcDGCACIAcpAyA3AyAgAiAHKQMoNwMoIAIgBykDMDcDMCACIAcpAzg3AzggAiAHKQNANwNAIAIgABAWIAMgAikDADcDACADIAIpAwg3AwggAyACKQMQNwMQIAMgAikDGDcDGCADIAIpAyA3AyAgAyACKQMoNwMoIAMgAikDMDcDMCADIAIpAzg3AzggAyACKQNANwNAIAMsAEQEQCADQcAJEBULIAUgAykDADcDACAFIAMpAwg3AwggBSADKQMQNwMQIAUgAykDGDcDGCAFIAMpAyA3AyAgBSADKQMoNwMoIAUgAykDMDcDMCAFIAMpAzg3AzggBSADKQNANwNAIAIgCCkDADcDACACIAgpAwg3AwggAiAIKQMQNwMQIAIgCCkDGDcDGCACIAgpAyA3AyAgAiAIKQMoNwMoIAIgCCkDMDcDMCACIAgpAzg3AzggAiAIKQNANwNAIAIgBRAXIAMgAikDADcDACADIAIpAwg3AwggAyACKQMQNwMQIAMgAikDGDcDGCADIAIpAyA3AyAgAyACKQMoNwMoIAMgAikDMDcDMCADIAIpAzg3AzggAyACKQNANwNAIAMQGyABIAMpAwA3AwAgASADKQMINwMIIAEgAykDEDcDECABIAMpAxg3AxggASADKQMgNwMgIAEgAykDKDcDKCABIAMpAzA3AzAgASADKQM4NwM4IAEgAykDQDcDQCACIAopAwA3AwAgAiAKKQMINwMIIAIgCikDEDcDECACIAopAxg3AxggAiAKKQMgNwMgIAIgCikDKDcDKCACIAopAzA3AzAgAiAKKQM4NwM4IAIgCikDQDcDQCACIA8QFyADIAIpAwA3AwAgAyACKQMINwMIIAMgAikDEDcDECADIAIpAxg3AxggAyACKQMgNwMgIAMgAikDKDcDKCADIAIpAzA3AzAgAyACKQM4NwM4IAMgAikDQDcDQCADEBsgBCADKQMANwMAIAQgAykDCDcDCCAEIAMpAxA3AxAgBCADKQMYNwMYIAQgAykDIDcDICAEIAMpAyg3AyggBCADKQMwNwMwIAQgAykDODcDOCAEIAMpA0A3A0AgAiABKQMANwMAIAIgASkDCDcDCCACIAEpAxA3AxAgAiABKQMYNwMYIAIgASkDIDcDICACIAEpAyg3AyggAiABKQMwNwMwIAIgASkDODcDOCACIAEpA0A3A0AgAiAEEBYgAyACKQMANwMAIAMgAikDCDcDCCADIAIpAxA3AxAgAyACKQMYNwMYIAMgAikDIDcDICADIAIpAyg3AyggAyACKQMwNwMwIAMgAikDODcDOCADIAIpA0A3A0AgAywARARAIANBwAkQFQsgBiADKQMANwMAIAYgAykDCDcDCCAGIAMpAxA3AxAgBiADKQMYNwMYIAYgAykDIDcDICAGIAMpAyg3AyggBiADKQMwNwMwIAYgAykDODcDOCAGIAMpA0A3A0AgDSAGKQIANwIAIA0gBikCCDcCCCANIAYpAhA3AhAgDSAGKQIYNwIYIA0gBikCIDcCICANIAYpAig3AiggDSAGKQIwNwIwIA0gBikCODcCOCANIAYpAkA3AkAgAiAJKQIANwIAIAIgCSkCCDcCCCACIAkpAhA3AhAgAiAJKQIYNwIYIAIgCSkCIDcCICACIAkpAig3AiggAiAJKQIwNwIwIAIgCSkCODcCOCACIAkpAkA3AkAgAiAOEBcgAyACKQMANwMAIAMgAikDCDcDCCADIAIpAxA3AxAgAyACKQMYNwMYIAMgAikDIDcDICADIAIpAyg3AyggAyACKQMwNwMwIAMgAikDODcDOCADIAIpA0A3A0AgAxAbIAQgAykDADcDACAEIAMpAwg3AwggBCADKQMQNwMQIAQgAykDGDcDGCAEIAMpAyA3AyAgBCADKQMoNwMoIAQgAykDMDcDMCAEIAMpAzg3AzggBCADKQNANwNAIAIgBCkDADcDACACIAQpAwg3AwggAiAEKQMQNwMQIAIgBCkDGDcDGCACIAQpAyA3AyAgAiAEKQMoNwMoIAIgBCkDMDcDMCACIAQpAzg3AzggAiAEKQNANwNAIAIgCxAXIAMgAikDADcDACADIAIpAwg3AwggAyACKQMQNwMQIAMgAikDGDcDGCADIAIpAyA3AyAgAyACKQMoNwMoIAMgAikDMDcDMCADIAIpAzg3AzggAyACKQNANwNAIAMQGyAFIAMpAwA3AwAgBSADKQMINwMIIAUgAykDEDcDECAFIAMpAxg3AxggBSADKQMgNwMgIAUgAykDKDcDKCAFIAMpAzA3AzAgBSADKQM4NwM4IAUgAykDQDcDQCAJIAUpAgA3AgAgCSAFKQIINwIIIAkgBSkCEDcCECAJIAUpAhg3AhggCSAFKQIgNwIgIAkgBSkCKDcCKCAJIAUpAjA3AjAgCSAFKQI4NwI4IAkgBSkCQDcCQCAMJAILC94KAQt/AkAjAiEJIwJBgAVqJAIgCUG4BGohAiAJQfADaiEDIAlBqANqIQQgCUHgAmohBSAJQZgCaiEIIAlB0AFqIQcgCUHAAGoiCiABQZABEDwaIAEoApABIQsgASgClAEhDCAJIgYgAUGYAWoiASkCADcCACAGIAEpAgg3AgggBiABKQIQNwIQIAYgASkCGDcCGCAGIAEpAiA3AiAgBiABKQIoNwIoIAYgASkCMDcCMCAGIAEpAjg3AjggC0EBRiAMRXEEQCAAQYgOQZQBEDwaIAkkAgUgAiALNgIAIAIgDDYCBCACQQhqIgEgBikDADcDACABIAYpAwg3AwggASAGKQMQNwMQIAEgBikDGDcDGCABIAYpAyA3AyAgASAGKQMoNwMoIAEgBikDMDcDMCABIAYpAzg3AzggByACEB0gAiAHKQMANwMAIAIgBykDCDcDCCACIAcpAxA3AxAgAiAHKQMYNwMYIAIgBykDIDcDICACIAcpAyg3AyggAiAHKQMwNwMwIAIgBykDODcDOCACIAcpA0A3A0AgAiAHEBcgAyACKQMANwMAIAMgAikDCDcDCCADIAIpAxA3AxAgAyACKQMYNwMYIAMgAikDIDcDICADIAIpAyg3AyggAyACKQMwNwMwIAMgAikDODcDOCADIAIpA0A3A0AgAxAbIAggAykDADcDACAIIAMpAwg3AwggCCADKQMQNwMQIAggAykDGDcDGCAIIAMpAyA3AyAgCCADKQMoNwMoIAggAykDMDcDMCAIIAMpAzg3AzggCCADKQNANwNAIAIgCikDADcDACACIAopAwg3AwggAiAKKQMQNwMQIAIgCikDGDcDGCACIAopAyA3AyAgAiAKKQMoNwMoIAIgCikDMDcDMCACIAopAzg3AzggAiAKKQNANwNAIAIgCBAXIAMgAikDADcDACADIAIpAwg3AwggAyACKQMQNwMQIAMgAikDGDcDGCADIAIpAyA3AyAgAyACKQMoNwMoIAMgAikDMDcDMCADIAIpAzg3AzggAyACKQNANwNAIAMQGyAFIAMpAwA3AwAgBSADKQMINwMIIAUgAykDEDcDECAFIAMpAxg3AxggBSADKQMgNwMgIAUgAykDKDcDKCAFIAMpAzA3AzAgBSADKQM4NwM4IAUgAykDQDcDQCACIApByABqIgEpAwA3AwAgAiABKQMINwMIIAIgASkDEDcDECACIAEpAxg3AxggAiABKQMgNwMgIAIgASkDKDcDKCACIAEpAzA3AzAgAiABKQM4NwM4IAIgASkDQDcDQCACIAgQFyADIAIpAwA3AwAgAyACKQMINwMIIAMgAikDEDcDECADIAIpAxg3AxggAyACKQMgNwMgIAMgAikDKDcDKCADIAIpAzA3AzAgAyACKQM4NwM4IAMgAikDQDcDQCADEBsgBCADKQMANwMAIAQgAykDCDcDCCAEIAMpAxA3AxAgBCADKQMYNwMYIAQgAykDIDcDICAEIAMpAyg3AyggBCADKQMwNwMwIAQgAykDODcDOCAEIAMpA0A3A0AgBCAHEBcgBBAbIAAgBSkCADcCACAAIAUpAgg3AgggACAFKQIQNwIQIAAgBSkCGDcCGCAAIAUpAiA3AiAgACAFKQIoNwIoIAAgBSkCMDcCMCAAIAUpAjg3AjggACAFKQJANwJAIABByABqIgEgBCkCADcCACABIAQpAgg3AgggASAEKQIQNwIQIAEgBCkCGDcCGCABIAQpAiA3AiAgASAEKQIoNwIoIAEgBCkCMDcCMCABIAQpAjg3AjggASAEKQJANwJAIABBADoAkAEgCSQCCwsLhC0BDX8CQCMCIQwjAkHQCWokAiAMQbgIaiEDIAxB4AZqIQIgACgCkAFBAUYEQCAAKAKUAUUEQCABLACQASEHIAMgAUGQARA8GiAHQQFxBEAgAkGICikDADcDACACQZAKKQMANwMIIAJBmAopAwA3AxAgAkGgCikDADcDGCACQagKKQMANwMgIAJBsAopAwA3AyggAkG4CikDADcDMCACQcAKKQMANwM4IAJByAopAwA3A0AgAkHIAGoiAUGICikDADcDACABQZAKKQMANwMIIAFBmAopAwA3AxAgAUGgCikDADcDGCABQagKKQMANwMgIAFBsAopAwA3AyggAUG4CikDADcDMCABQcAKKQMANwM4IAFByAopAwA3A0AgAkGQAWoiAUHYDCkCADcCACABQeAMKQIANwIIIAFB6AwpAgA3AhAgAUHwDCkCADcCGCABQfgMKQIANwIgIAFBgA0pAgA3AiggAUGIDSkCADcCMCABQZANKQIANwI4IAFBmA0pAgA3AkAFIAIgAykDADcDACACIAMpAwg3AwggAiADKQMQNwMQIAIgAykDGDcDGCACIAMpAyA3AyAgAiADKQMoNwMoIAIgAykDMDcDMCACIAMpAzg3AzggAiADKQNANwNAIAJByABqIgEgA0HIAGoiBykDADcDACABIAcpAwg3AwggASAHKQMQNwMQIAEgBykDGDcDGCABIAcpAyA3AyAgASAHKQMoNwMoIAEgBykDMDcDMCABIAcpAzg3AzggASAHKQNANwNAIAJBkAFqIgFBiAopAwA3AwAgAUGQCikDADcDCCABQZgKKQMANwMQIAFBoAopAwA3AxggAUGoCikDADcDICABQbAKKQMANwMoIAFBuAopAwA3AzAgAUHACikDADcDOCABQcgKKQMANwNACyAAIAJB2AEQPBogDCQCDwsLIAEsAJABBEAgDCQCDwsgAyAAQZABaiIKKQIANwIAIAMgCikCCDcCCCADIAopAhA3AhAgAyAKKQIYNwIYIAMgCikCIDcCICADIAopAig3AiggAyAKKQIwNwIwIAMgCikCODcCOCADIAopAkA3AkAgAyAKEBcgAiADKQMANwMAIAIgAykDCDcDCCACIAMpAxA3AxAgAiADKQMYNwMYIAIgAykDIDcDICACIAMpAyg3AyggAiADKQMwNwMwIAIgAykDODcDOCACIAMpA0A3A0AgAhAbIAwiByACKQMANwMAIAcgAikDCDcDCCAHIAIpAxA3AxAgByACKQMYNwMYIAcgAikDIDcDICAHIAIpAyg3AyggByACKQMwNwMwIAcgAikDODcDOCAHIAIpA0A3A0AgAyABKQIANwIAIAMgASkCCDcCCCADIAEpAhA3AhAgAyABKQIYNwIYIAMgASkCIDcCICADIAEpAig3AiggAyABKQIwNwIwIAMgASkCODcCOCADIAEpAkA3AkAgAyAHEBcgAiADKQMANwMAIAIgAykDCDcDCCACIAMpAxA3AxAgAiADKQMYNwMYIAIgAykDIDcDICACIAMpAyg3AyggAiADKQMwNwMwIAIgAykDODcDOCACIAMpA0A3A0AgAhAbIAxByABqIgQgAikDADcDACAEIAIpAwg3AwggBCACKQMQNwMQIAQgAikDGDcDGCAEIAIpAyA3AyAgBCACKQMoNwMoIAQgAikDMDcDMCAEIAIpAzg3AzggBCACKQNANwNAIAMgAUHIAGoiASkCADcCACADIAEpAgg3AgggAyABKQIQNwIQIAMgASkCGDcCGCADIAEpAiA3AiAgAyABKQIoNwIoIAMgASkCMDcCMCADIAEpAjg3AjggAyABKQJANwJAIAMgBxAXIAIgAykDADcDACACIAMpAwg3AwggAiADKQMQNwMQIAIgAykDGDcDGCACIAMpAyA3AyAgAiADKQMoNwMoIAIgAykDMDcDMCACIAMpAzg3AzggAiADKQNANwNAIAIQGyAMQZABaiIBIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABIAoQFyABEBsgAyAAKQIANwIAIAMgACkCCDcCCCADIAApAhA3AhAgAyAAKQIYNwIYIAMgACkCIDcCICADIAApAig3AiggAyAAKQIwNwIwIAMgACkCODcCOCADIAApAkA3AkAgAyAEEBYgAiADKQMANwMAIAIgAykDCDcDCCACIAMpAxA3AxAgAiADKQMYNwMYIAIgAykDIDcDICACIAMpAyg3AyggAiADKQMwNwMwIAIgAykDODcDOCACIAMpA0A3A0AgAiwARARAIAJBwAkQFQsgDEHYAWoiCSACKQMANwMAIAkgAikDCDcDCCAJIAIpAxA3AxAgCSACKQMYNwMYIAkgAikDIDcDICAJIAIpAyg3AyggCSACKQMwNwMwIAkgAikDODcDOCAJIAIpA0A3A0AgAyAAQcgAaiIEKQIANwIAIAMgBCkCCDcCCCADIAQpAhA3AhAgAyAEKQIYNwIYIAMgBCkCIDcCICADIAQpAig3AiggAyAEKQIwNwIwIAMgBCkCODcCOCADIAQpAkA3AkAgAyABEBYgAiADKQMANwMAIAIgAykDCDcDCCACIAMpAxA3AxAgAiADKQMYNwMYIAIgAykDIDcDICACIAMpAyg3AyggAiADKQMwNwMwIAIgAykDODcDOCACIAMpA0A3A0AgAiwARARAIAJBwAkQFQsgDEGgAmoiBSACKQMANwMAIAUgAikDCDcDCCAFIAIpAxA3AxAgBSACKQMYNwMYIAUgAikDIDcDICAFIAIpAyg3AyggBSACKQMwNwMwIAUgAikDODcDOCAFIAIpA0A3A0AgCSgCAEEBRgRAIAkoAgRFBEACQAJAIAUoAgBBAUcNACAFKAIEDQAgABAkDAELIABBiAopAgA3AgAgAEGQCikCADcCCCAAQZgKKQIANwIQIABBoAopAgA3AhggAEGoCikCADcCICAAQbAKKQIANwIoIABBuAopAgA3AjAgAEHACikCADcCOCAAQcgKKQIANwJAIARBiAopAgA3AgAgBEGQCikCADcCCCAEQZgKKQIANwIQIARBoAopAgA3AhggBEGoCikCADcCICAEQbAKKQIANwIoIARBuAopAgA3AjAgBEHACikCADcCOCAEQcgKKQIANwJAIApB2AwpAgA3AgAgCkHgDCkCADcCCCAKQegMKQIANwIQIApB8AwpAgA3AhggCkH4DCkCADcCICAKQYANKQIANwIoIApBiA0pAgA3AjAgCkGQDSkCADcCOCAKQZgNKQIANwJACyAMJAIPCwsgDEHQBWohBiADIAkpAwA3AwAgAyAJKQMINwMIIAMgCSkDEDcDECADIAkpAxg3AxggAyAJKQMgNwMgIAMgCSkDKDcDKCADIAkpAzA3AzAgAyAJKQM4NwM4IAMgCSkDQDcDQCADIAkQFyACIAMpAwA3AwAgAiADKQMINwMIIAIgAykDEDcDECACIAMpAxg3AxggAiADKQMgNwMgIAIgAykDKDcDKCACIAMpAzA3AzAgAiADKQM4NwM4IAIgAykDQDcDQCACEBsgDEHoAmoiASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgAyAAKQIANwIAIAMgACkCCDcCCCADIAApAhA3AhAgAyAAKQIYNwIYIAMgACkCIDcCICADIAApAig3AiggAyAAKQIwNwIwIAMgACkCODcCOCADIAApAkA3AkAgAyABEBcgAiADKQMANwMAIAIgAykDCDcDCCACIAMpAxA3AxAgAiADKQMYNwMYIAIgAykDIDcDICACIAMpAyg3AyggAiADKQMwNwMwIAIgAykDODcDOCACIAMpA0A3A0AgAhAbIAxBsANqIgsgAikDADcDACALIAIpAwg3AwggCyACKQMQNwMQIAsgAikDGDcDGCALIAIpAyA3AyAgCyACKQMoNwMoIAsgAikDMDcDMCALIAIpAzg3AzggCyACKQNANwNAIAMgASkDADcDACADIAEpAwg3AwggAyABKQMQNwMQIAMgASkDGDcDGCADIAEpAyA3AyAgAyABKQMoNwMoIAMgASkDMDcDMCADIAEpAzg3AzggAyABKQNANwNAIAMgCRAXIAIgAykDADcDACACIAMpAwg3AwggAiADKQMQNwMQIAIgAykDGDcDGCACIAMpAyA3AyAgAiADKQMoNwMoIAIgAykDMDcDMCACIAMpAzg3AzggAiADKQNANwNAIAIQGyAMQfgDaiINIAIpAwA3AwAgDSACKQMINwMIIA0gAikDEDcDECANIAIpAxg3AxggDSACKQMgNwMgIA0gAikDKDcDKCANIAIpAzA3AzAgDSACKQM4NwM4IA0gAikDQDcDQCADIAUpAwA3AwAgAyAFKQMINwMIIAMgBSkDEDcDECADIAUpAxg3AxggAyAFKQMgNwMgIAMgBSkDKDcDKCADIAUpAzA3AzAgAyAFKQM4NwM4IAMgBSkDQDcDQCADIAUQFyACIAMpAwA3AwAgAiADKQMINwMIIAIgAykDEDcDECACIAMpAxg3AxggAiADKQMgNwMgIAIgAykDKDcDKCACIAMpAzA3AzAgAiADKQM4NwM4IAIgAykDQDcDQCACEBsgDEGYBmoiCCACKQMANwMAIAggAikDCDcDCCAIIAIpAxA3AxAgCCACKQMYNwMYIAggAikDIDcDICAIIAIpAyg3AyggCCACKQMwNwMwIAggAikDODcDOCAIIAIpA0A3A0AgAyAIKQMANwMAIAMgCCkDCDcDCCADIAgpAxA3AxAgAyAIKQMYNwMYIAMgCCkDIDcDICADIAgpAyg3AyggAyAIKQMwNwMwIAMgCCkDODcDOCADIAgpA0A3A0AgAyANEBUgAiADKQMANwMAIAIgAykDCDcDCCACIAMpAxA3AxAgAiADKQMYNwMYIAIgAykDIDcDICACIAMpAyg3AyggAiADKQMwNwMwIAIgAykDODcDOCACIAMpA0A3A0ACQAJAIAIoAgAiAUEIRgRAQQghBwJAAkACQANAIAdBf2ohASAHRQ0FIAFBEE8NASACQQRqIAFBAnRqKAIAIgcgAUECdEHECWooAgAiDkcNAiABIQcMAAsAC0G8CyABQRAQKAwBCyAHIA5PDQILBSABQQhPDQELDAELIAJBwAkQFgsgBiACKQMANwMAIAYgAikDCDcDCCAGIAIpAxA3AxAgBiACKQMYNwMYIAYgAikDIDcDICAGIAIpAyg3AyggBiACKQMwNwMwIAYgAikDODcDOCAGIAIpA0A3A0AgAyAGKQMANwMAIAMgBikDCDcDCCADIAYpAxA3AxAgAyAGKQMYNwMYIAMgBikDIDcDICADIAYpAyg3AyggAyAGKQMwNwMwIAMgBikDODcDOCADIAYpA0A3A0AgAyALEBYgAiADKQMANwMAIAIgAykDCDcDCCACIAMpAxA3AxAgAiADKQMYNwMYIAIgAykDIDcDICACIAMpAyg3AyggAiADKQMwNwMwIAIgAykDODcDOCACIAMpA0A3A0AgAiALEBYgAkHEAGoiASwAAARAA0AgAkHACRAVIAEsAAANAAsLIAxBiAVqIgEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAIAAgASkCADcCACAAIAEpAgg3AgggACABKQIQNwIQIAAgASkCGDcCGCAAIAEpAiA3AiAgACABKQIoNwIoIAAgASkCMDcCMCAAIAEpAjg3AjggACABKQJANwJAIAMgCykDADcDACADIAspAwg3AwggAyALKQMQNwMQIAMgCykDGDcDGCADIAspAyA3AyAgAyALKQMoNwMoIAMgCykDMDcDMCADIAspAzg3AzggAyALKQNANwNAIAMgABAWIAIgAykDADcDACACIAMpAwg3AwggAiADKQMQNwMQIAIgAykDGDcDGCACIAMpAyA3AyAgAiADKQMoNwMoIAIgAykDMDcDMCACIAMpAzg3AzggAiADKQNANwNAIAIsAEQEQCACQcAJEBULIAYgAikDADcDACAGIAIpAwg3AwggBiACKQMQNwMQIAYgAikDGDcDGCAGIAIpAyA3AyAgBiACKQMoNwMoIAYgAikDMDcDMCAGIAIpAzg3AzggBiACKQNANwNAIAMgBSkDADcDACADIAUpAwg3AwggAyAFKQMQNwMQIAMgBSkDGDcDGCADIAUpAyA3AyAgAyAFKQMoNwMoIAMgBSkDMDcDMCADIAUpAzg3AzggAyAFKQNANwNAIAMgBhAXIAIgAykDADcDACACIAMpAwg3AwggAiADKQMQNwMQIAIgAykDGDcDGCACIAMpAyA3AyAgAiADKQMoNwMoIAIgAykDMDcDMCACIAMpAzg3AzggAiADKQNANwNAIAIQGyABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCADIAQpAgA3AgAgAyAEKQIINwIIIAMgBCkCEDcCECADIAQpAhg3AhggAyAEKQIgNwIgIAMgBCkCKDcCKCADIAQpAjA3AjAgAyAEKQI4NwI4IAMgBCkCQDcCQCADIA0QFyACIAMpAwA3AwAgAiADKQMINwMIIAIgAykDEDcDECACIAMpAxg3AxggAiADKQMgNwMgIAIgAykDKDcDKCACIAMpAzA3AzAgAiADKQM4NwM4IAIgAykDQDcDQCACEBsgCCACKQMANwMAIAggAikDCDcDCCAIIAIpAxA3AxAgCCACKQMYNwMYIAggAikDIDcDICAIIAIpAyg3AyggCCACKQMwNwMwIAggAikDODcDOCAIIAIpA0A3A0AgAyABKQMANwMAIAMgASkDCDcDCCADIAEpAxA3AxAgAyABKQMYNwMYIAMgASkDIDcDICADIAEpAyg3AyggAyABKQMwNwMwIAMgASkDODcDOCADIAEpA0A3A0AgAyAIEBYgAiADKQMANwMAIAIgAykDCDcDCCACIAMpAxA3AxAgAiADKQMYNwMYIAIgAykDIDcDICACIAMpAyg3AyggAiADKQMwNwMwIAIgAykDODcDOCACIAMpA0A3A0AgAiwARARAIAJBwAkQFQsgDEHABGoiACACKQMANwMAIAAgAikDCDcDCCAAIAIpAxA3AxAgACACKQMYNwMYIAAgAikDIDcDICAAIAIpAyg3AyggACACKQMwNwMwIAAgAikDODcDOCAAIAIpA0A3A0AgBCAAKQIANwIAIAQgACkCCDcCCCAEIAApAhA3AhAgBCAAKQIYNwIYIAQgACkCIDcCICAEIAApAig3AiggBCAAKQIwNwIwIAQgACkCODcCOCAEIAApAkA3AkAgCiAJEBcgChAbIAwkAgsLklcBE38CQCMCIREjAkHwB2okAiAAKAKQAUEBRiIIBEAgACgClAFFBEAgESQCDwsLIBFBqAdqIQIgEUHgBmohASARQZgGaiEDIBFB0AVqIQUgEUGIBWohBiARQcAEaiEOIBFB+ANqIQcgEUGwA2ohCyARQegCaiENIBFBoAJqIQQgEUHYAWohCSARQZABaiEKIBFByABqIRAgESEPIABBkAFqIRICfwJAIAhFDQAgACgClAFBAUcNACACIAApAgA3AgAgAiAAKQIINwIIIAIgACkCEDcCECACIAApAhg3AhggAiAAKQIgNwIgIAIgACkCKDcCKCACIAApAjA3AjAgAiAAKQI4NwI4IAIgACkCQDcCQCACIAAQFyABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABEBsgCSABKQMANwMAIAkgASkDCDcDCCAJIAEpAxA3AxAgCSABKQMYNwMYIAkgASkDIDcDICAJIAEpAyg3AyggCSABKQMwNwMwIAkgASkDODcDOCAJIAEpA0A3A0AgAiAAQcgAaiIMKQIANwIAIAIgDCkCCDcCCCACIAwpAhA3AhAgAiAMKQIYNwIYIAIgDCkCIDcCICACIAwpAig3AiggAiAMKQIwNwIwIAIgDCkCODcCOCACIAwpAkA3AkAgAiAMEBcgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgARAbIAQgASkDADcDACAEIAEpAwg3AwggBCABKQMQNwMQIAQgASkDGDcDGCAEIAEpAyA3AyAgBCABKQMoNwMoIAQgASkDMDcDMCAEIAEpAzg3AzggBCABKQNANwNAIAIgBCkDADcDACACIAQpAwg3AwggAiAEKQMQNwMQIAIgBCkDGDcDGCACIAQpAyA3AyAgAiAEKQMoNwMoIAIgBCkDMDcDMCACIAQpAzg3AzggAiAEKQNANwNAIAIgBBAXIAEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAIAEQGyANIAEpAwA3AwAgDSABKQMINwMIIA0gASkDEDcDECANIAEpAxg3AxggDSABKQMgNwMgIA0gASkDKDcDKCANIAEpAzA3AzAgDSABKQM4NwM4IA0gASkDQDcDQCACIAApAgA3AgAgAiAAKQIINwIIIAIgACkCEDcCECACIAApAhg3AhggAiAAKQIgNwIgIAIgACkCKDcCKCACIAApAjA3AjAgAiAAKQI4NwI4IAIgACkCQDcCQCACIAQQFSABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQAJAAkAgASgCACIEQQhGBEBBCCEIAkACQAJAA0AgCEF/aiEEIAhFDQUgBEEQTw0BIAFBBGogBEECdGooAgAiCCAEQQJ0QcQJaigCACITRw0CIAQhCAwACwALQbwLIARBEBAoDAELIAggE08NAgsFIARBCE8NAQsMAQsgAUHACRAWCyADIAEpAwA3AwAgAyABKQMINwMIIAMgASkDEDcDECADIAEpAxg3AxggAyABKQMgNwMgIAMgASkDKDcDKCADIAEpAzA3AzAgAyABKQM4NwM4IAMgASkDQDcDQCACIAMpAwA3AwAgAiADKQMINwMIIAIgAykDEDcDECACIAMpAxg3AxggAiADKQMgNwMgIAIgAykDKDcDKCACIAMpAzA3AzAgAiADKQM4NwM4IAIgAykDQDcDQCACIAMQFyABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABEBsgBSABKQMANwMAIAUgASkDCDcDCCAFIAEpAxA3AxAgBSABKQMYNwMYIAUgASkDIDcDICAFIAEpAyg3AyggBSABKQMwNwMwIAUgASkDODcDOCAFIAEpA0A3A0AgAiAFKQMANwMAIAIgBSkDCDcDCCACIAUpAxA3AxAgAiAFKQMYNwMYIAIgBSkDIDcDICACIAUpAyg3AyggAiAFKQMwNwMwIAIgBSkDODcDOCACIAUpA0A3A0AgAiAJEBYgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgASwARARAIAFBwAkQFQsgBiABKQMANwMAIAYgASkDCDcDCCAGIAEpAxA3AxAgBiABKQMYNwMYIAYgASkDIDcDICAGIAEpAyg3AyggBiABKQMwNwMwIAYgASkDODcDOCAGIAEpA0A3A0AgAiAGKQMANwMAIAIgBikDCDcDCCACIAYpAxA3AxAgAiAGKQMYNwMYIAIgBikDIDcDICACIAYpAyg3AyggAiAGKQMwNwMwIAIgBikDODcDOCACIAYpA0A3A0AgAiANEBYgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgASwARARAIAFBwAkQFQsgCyABKQMANwMAIAsgASkDCDcDCCALIAEpAxA3AxAgCyABKQMYNwMYIAsgASkDIDcDICALIAEpAyg3AyggCyABKQMwNwMwIAsgASkDODcDOCALIAEpA0A3A0AgCxAaIAIgCSkDADcDACACIAkpAwg3AwggAiAJKQMQNwMQIAIgCSkDGDcDGCACIAkpAyA3AyAgAiAJKQMoNwMoIAIgCSkDMDcDMCACIAkpAzg3AzggAiAJKQNANwNAIAIgCRAVIAEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAAkACQCABKAIAIgRBCEYEQEEIIQgCQAJAAkADQCAIQX9qIQQgCEUNBSAEQRBPDQEgAUEEaiAEQQJ0aigCACIIIARBAnRBxAlqKAIAIhNHDQIgBCEIDAALAAtBvAsgBEEQECgMAQsgCCATTw0CCwUgBEEITw0BCwwBCyABQcAJEBYLIAMgASkDADcDACADIAEpAwg3AwggAyABKQMQNwMQIAMgASkDGDcDGCADIAEpAyA3AyAgAyABKQMoNwMoIAMgASkDMDcDMCADIAEpAzg3AzggAyABKQNANwNAIAIgAykDADcDACACIAMpAwg3AwggAiADKQMQNwMQIAIgAykDGDcDGCACIAMpAyA3AyAgAiADKQMoNwMoIAIgAykDMDcDMCACIAMpAzg3AzggAiADKQNANwNAIAIgCRAVIAEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAAkACQCABKAIAIgRBCEYEQEEIIQgCQAJAAkADQCAIQX9qIQQgCEUNBSAEQRBPDQEgAUEEaiAEQQJ0aigCACIIIARBAnRBxAlqKAIAIglHDQIgBCEIDAALAAtBvAsgBEEQECgMAQsgCCAJTw0CCwUgBEEITw0BCwwBCyABQcAJEBYLIAcgASkDADcDACAHIAEpAwg3AwggByABKQMQNwMQIAcgASkDGDcDGCAHIAEpAyA3AyAgByABKQMoNwMoIAcgASkDMDcDMCAHIAEpAzg3AzggByABKQNANwNAIAIgBykDADcDACACIAcpAwg3AwggAiAHKQMQNwMQIAIgBykDGDcDGCACIAcpAyA3AyAgAiAHKQMoNwMoIAIgBykDMDcDMCACIAcpAzg3AzggAiAHKQNANwNAIAIgBxAXIAEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAIAEQGyADIAEpAwA3AwAgAyABKQMINwMIIAMgASkDEDcDECADIAEpAxg3AxggAyABKQMgNwMgIAMgASkDKDcDKCADIAEpAzA3AzAgAyABKQM4NwM4IAMgASkDQDcDQCACIAMpAwA3AwAgAiADKQMINwMIIAIgAykDEDcDECACIAMpAxg3AxggAiADKQMgNwMgIAIgAykDKDcDKCACIAMpAzA3AzAgAiADKQM4NwM4IAIgAykDQDcDQCACIAsQFiABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABLABEBEAgAUHACRAVCyAFIAEpAwA3AwAgBSABKQMINwMIIAUgASkDEDcDECAFIAEpAxg3AxggBSABKQMgNwMgIAUgASkDKDcDKCAFIAEpAzA3AzAgBSABKQM4NwM4IAUgASkDQDcDQCACIAUpAwA3AwAgAiAFKQMINwMIIAIgBSkDEDcDECACIAUpAxg3AxggAiAFKQMgNwMgIAIgBSkDKDcDKCACIAUpAzA3AzAgAiAFKQM4NwM4IAIgBSkDQDcDQCACIAsQFiABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABLABEBEAgAUHACRAVCyAOIAEpAwA3AwAgDiABKQMINwMIIA4gASkDEDcDECAOIAEpAxg3AxggDiABKQMgNwMgIA4gASkDKDcDKCAOIAEpAzA3AzAgDiABKQM4NwM4IA4gASkDQDcDQCAGIA0pAwA3AwAgBiANKQMINwMIIAYgDSkDEDcDECAGIA0pAxg3AxggBiANKQMgNwMgIAYgDSkDKDcDKCAGIA0pAzA3AzAgBiANKQM4NwM4IAYgDSkDQDcDQCAGEBogBhAaIAYQGiAPIA4pAwA3AwAgDyAOKQMINwMIIA8gDikDEDcDECAPIA4pAxg3AxggDyAOKQMgNwMgIA8gDikDKDcDKCAPIA4pAzA3AzAgDyAOKQM4NwM4IA8gDikDQDcDQCACIAspAwA3AwAgAiALKQMINwMIIAIgCykDEDcDECACIAspAxg3AxggAiALKQMgNwMgIAIgCykDKDcDKCACIAspAzA3AzAgAiALKQM4NwM4IAIgCykDQDcDQCACIA4QFiABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABLABEBEAgAUHACRAVCyADIAEpAwA3AwAgAyABKQMINwMIIAMgASkDEDcDECADIAEpAxg3AxggAyABKQMgNwMgIAMgASkDKDcDKCADIAEpAzA3AzAgAyABKQM4NwM4IAMgASkDQDcDQCACIAcpAwA3AwAgAiAHKQMINwMIIAIgBykDEDcDECACIAcpAxg3AxggAiAHKQMgNwMgIAIgBykDKDcDKCACIAcpAzA3AzAgAiAHKQM4NwM4IAIgBykDQDcDQCACIAMQFyABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABEBsgBSABKQMANwMAIAUgASkDCDcDCCAFIAEpAxA3AxAgBSABKQMYNwMYIAUgASkDIDcDICAFIAEpAyg3AyggBSABKQMwNwMwIAUgASkDODcDOCAFIAEpA0A3A0AgAiAFKQMANwMAIAIgBSkDCDcDCCACIAUpAxA3AxAgAiAFKQMYNwMYIAIgBSkDIDcDICACIAUpAyg3AyggAiAFKQMwNwMwIAIgBSkDODcDOCACIAUpA0A3A0AgAiAGEBYgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgASwARARAIAFBwAkQFQsgECABKQMANwMAIBAgASkDCDcDCCAQIAEpAxA3AxAgECABKQMYNwMYIBAgASkDIDcDICAQIAEpAyg3AyggECABKQMwNwMwIBAgASkDODcDOCAQIAEpA0A3A0AgAiAMKQIANwIAIAIgDCkCCDcCCCACIAwpAhA3AhAgAiAMKQIYNwIYIAIgDCkCIDcCICACIAwpAig3AiggAiAMKQIwNwIwIAIgDCkCODcCOCACIAwpAkA3AkAgAiAMEBUgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0ACQAJAIAEoAgAiBEEIRgRAQQghCAJAAkACQANAIAhBf2ohBCAIRQ0FIARBEE8NASABQQRqIARBAnRqKAIAIgggBEECdEHECWooAgAiAkcNAiAEIQgMAAsAC0G8CyAEQRAQKAwBCyAIIAJPDQILBSAEQQhPDQELDAELIAFBwAkQFgsgCiABKQMANwMAIAogASkDCDcDCCAKIAEpAxA3AxAgCiABKQMYNwMYIAogASkDIDcDICAKIAEpAyg3AyggCiABKQMwNwMwIAogASkDODcDOCAKIAEpA0A3A0AgDAwBCyACIAApAgA3AgAgAiAAKQIINwIIIAIgACkCEDcCECACIAApAhg3AhggAiAAKQIgNwIgIAIgACkCKDcCKCACIAApAjA3AjAgAiAAKQI4NwI4IAIgACkCQDcCQCACIAAQFyABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABEBsgCSABKQMANwMAIAkgASkDCDcDCCAJIAEpAxA3AxAgCSABKQMYNwMYIAkgASkDIDcDICAJIAEpAyg3AyggCSABKQMwNwMwIAkgASkDODcDOCAJIAEpA0A3A0AgAiAAQcgAaiIMKQIANwIAIAIgDCkCCDcCCCACIAwpAhA3AhAgAiAMKQIYNwIYIAIgDCkCIDcCICACIAwpAig3AiggAiAMKQIwNwIwIAIgDCkCODcCOCACIAwpAkA3AkAgAiAMEBcgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgARAbIAQgASkDADcDACAEIAEpAwg3AwggBCABKQMQNwMQIAQgASkDGDcDGCAEIAEpAyA3AyAgBCABKQMoNwMoIAQgASkDMDcDMCAEIAEpAzg3AzggBCABKQNANwNAIAIgBCkDADcDACACIAQpAwg3AwggAiAEKQMQNwMQIAIgBCkDGDcDGCACIAQpAyA3AyAgAiAEKQMoNwMoIAIgBCkDMDcDMCACIAQpAzg3AzggAiAEKQNANwNAIAIgBBAXIAEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAIAEQGyANIAEpAwA3AwAgDSABKQMINwMIIA0gASkDEDcDECANIAEpAxg3AxggDSABKQMgNwMgIA0gASkDKDcDKCANIAEpAzA3AzAgDSABKQM4NwM4IA0gASkDQDcDQCACIAApAgA3AgAgAiAAKQIINwIIIAIgACkCEDcCECACIAApAhg3AhggAiAAKQIgNwIgIAIgACkCKDcCKCACIAApAjA3AjAgAiAAKQI4NwI4IAIgACkCQDcCQCACIAQQFSABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQAJAAkAgASgCACIEQQhGBEBBCCEIAkACQAJAA0AgCEF/aiEEIAhFDQUgBEEQTw0BIAFBBGogBEECdGooAgAiCCAEQQJ0QcQJaigCACITRw0CIAQhCAwACwALQbwLIARBEBAoDAELIAggE08NAgsFIARBCE8NAQsMAQsgAUHACRAWCyADIAEpAwA3AwAgAyABKQMINwMIIAMgASkDEDcDECADIAEpAxg3AxggAyABKQMgNwMgIAMgASkDKDcDKCADIAEpAzA3AzAgAyABKQM4NwM4IAMgASkDQDcDQCACIAMpAwA3AwAgAiADKQMINwMIIAIgAykDEDcDECACIAMpAxg3AxggAiADKQMgNwMgIAIgAykDKDcDKCACIAMpAzA3AzAgAiADKQM4NwM4IAIgAykDQDcDQCACIAMQFyABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABEBsgBSABKQMANwMAIAUgASkDCDcDCCAFIAEpAxA3AxAgBSABKQMYNwMYIAUgASkDIDcDICAFIAEpAyg3AyggBSABKQMwNwMwIAUgASkDODcDOCAFIAEpA0A3A0AgAiAFKQMANwMAIAIgBSkDCDcDCCACIAUpAxA3AxAgAiAFKQMYNwMYIAIgBSkDIDcDICACIAUpAyg3AyggAiAFKQMwNwMwIAIgBSkDODcDOCACIAUpA0A3A0AgAiAJEBYgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgASwARARAIAFBwAkQFQsgBiABKQMANwMAIAYgASkDCDcDCCAGIAEpAxA3AxAgBiABKQMYNwMYIAYgASkDIDcDICAGIAEpAyg3AyggBiABKQMwNwMwIAYgASkDODcDOCAGIAEpA0A3A0AgAiAGKQMANwMAIAIgBikDCDcDCCACIAYpAxA3AxAgAiAGKQMYNwMYIAIgBikDIDcDICACIAYpAyg3AyggAiAGKQMwNwMwIAIgBikDODcDOCACIAYpA0A3A0AgAiANEBYgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgASwARARAIAFBwAkQFQsgCyABKQMANwMAIAsgASkDCDcDCCALIAEpAxA3AxAgCyABKQMYNwMYIAsgASkDIDcDICALIAEpAyg3AyggCyABKQMwNwMwIAsgASkDODcDOCALIAEpA0A3A0AgCxAaIAIgCSkDADcDACACIAkpAwg3AwggAiAJKQMQNwMQIAIgCSkDGDcDGCACIAkpAyA3AyAgAiAJKQMoNwMoIAIgCSkDMDcDMCACIAkpAzg3AzggAiAJKQNANwNAIAIgCRAVIAEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAAkACQCABKAIAIgRBCEYEQEEIIQgCQAJAAkADQCAIQX9qIQQgCEUNBSAEQRBPDQEgAUEEaiAEQQJ0aigCACIIIARBAnRBxAlqKAIAIhNHDQIgBCEIDAALAAtBvAsgBEEQECgMAQsgCCATTw0CCwUgBEEITw0BCwwBCyABQcAJEBYLIAMgASkDADcDACADIAEpAwg3AwggAyABKQMQNwMQIAMgASkDGDcDGCADIAEpAyA3AyAgAyABKQMoNwMoIAMgASkDMDcDMCADIAEpAzg3AzggAyABKQNANwNAIAIgAykDADcDACACIAMpAwg3AwggAiADKQMQNwMQIAIgAykDGDcDGCACIAMpAyA3AyAgAiADKQMoNwMoIAIgAykDMDcDMCACIAMpAzg3AzggAiADKQNANwNAIAIgCRAVIAEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAAkACQCABKAIAIgRBCEYEQEEIIQgCQAJAAkADQCAIQX9qIQQgCEUNBSAEQRBPDQEgAUEEaiAEQQJ0aigCACIIIARBAnRBxAlqKAIAIglHDQIgBCEIDAALAAtBvAsgBEEQECgMAQsgCCAJTw0CCwUgBEEITw0BCwwBCyABQcAJEBYLIAcgASkDADcDACAHIAEpAwg3AwggByABKQMQNwMQIAcgASkDGDcDGCAHIAEpAyA3AyAgByABKQMoNwMoIAcgASkDMDcDMCAHIAEpAzg3AzggByABKQNANwNAIAIgBykDADcDACACIAcpAwg3AwggAiAHKQMQNwMQIAIgBykDGDcDGCACIAcpAyA3AyAgAiAHKQMoNwMoIAIgBykDMDcDMCACIAcpAzg3AzggAiAHKQNANwNAIAIgBxAXIAEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAIAEQGyAOIAEpAwA3AwAgDiABKQMINwMIIA4gASkDEDcDECAOIAEpAxg3AxggDiABKQMgNwMgIA4gASkDKDcDKCAOIAEpAzA3AzAgDiABKQM4NwM4IA4gASkDQDcDQCAGIA0pAwA3AwAgBiANKQMINwMIIAYgDSkDEDcDECAGIA0pAxg3AxggBiANKQMgNwMgIAYgDSkDKDcDKCAGIA0pAzA3AzAgBiANKQM4NwM4IAYgDSkDQDcDQCAGEBogBhAaIAYQGiACIA4pAwA3AwAgAiAOKQMINwMIIAIgDikDEDcDECACIA4pAxg3AxggAiAOKQMgNwMgIAIgDikDKDcDKCACIA4pAzA3AzAgAiAOKQM4NwM4IAIgDikDQDcDQCACIAsQFiABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABLABEBEAgAUHACRAVCyADIAEpAwA3AwAgAyABKQMINwMIIAMgASkDEDcDECADIAEpAxg3AxggAyABKQMgNwMgIAMgASkDKDcDKCADIAEpAzA3AzAgAyABKQM4NwM4IAMgASkDQDcDQCACIAMpAwA3AwAgAiADKQMINwMIIAIgAykDEDcDECACIAMpAxg3AxggAiADKQMgNwMgIAIgAykDKDcDKCACIAMpAzA3AzAgAiADKQM4NwM4IAIgAykDQDcDQCACIAsQFiABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABLABEBEAgAUHACRAVCyAPIAEpAwA3AwAgDyABKQMINwMIIA8gASkDEDcDECAPIAEpAxg3AxggDyABKQMgNwMgIA8gASkDKDcDKCAPIAEpAzA3AzAgDyABKQM4NwM4IA8gASkDQDcDQCACIAspAwA3AwAgAiALKQMINwMIIAIgCykDEDcDECACIAspAxg3AxggAiALKQMgNwMgIAIgCykDKDcDKCACIAspAzA3AzAgAiALKQM4NwM4IAIgCykDQDcDQCACIA8QFiABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABLABEBEAgAUHACRAVCyADIAEpAwA3AwAgAyABKQMINwMIIAMgASkDEDcDECADIAEpAxg3AxggAyABKQMgNwMgIAMgASkDKDcDKCADIAEpAzA3AzAgAyABKQM4NwM4IAMgASkDQDcDQCACIAcpAwA3AwAgAiAHKQMINwMIIAIgBykDEDcDECACIAcpAxg3AxggAiAHKQMgNwMgIAIgBykDKDcDKCACIAcpAzA3AzAgAiAHKQM4NwM4IAIgBykDQDcDQCACIAMQFyABIAIpAwA3AwAgASACKQMINwMIIAEgAikDEDcDECABIAIpAxg3AxggASACKQMgNwMgIAEgAikDKDcDKCABIAIpAzA3AzAgASACKQM4NwM4IAEgAikDQDcDQCABEBsgBSABKQMANwMAIAUgASkDCDcDCCAFIAEpAxA3AxAgBSABKQMYNwMYIAUgASkDIDcDICAFIAEpAyg3AyggBSABKQMwNwMwIAUgASkDODcDOCAFIAEpA0A3A0AgAiAFKQMANwMAIAIgBSkDCDcDCCACIAUpAxA3AxAgAiAFKQMYNwMYIAIgBSkDIDcDICACIAUpAyg3AyggAiAFKQMwNwMwIAIgBSkDODcDOCACIAUpA0A3A0AgAiAGEBYgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgASwARARAIAFBwAkQFQsgECABKQMANwMAIBAgASkDCDcDCCAQIAEpAxA3AxAgECABKQMYNwMYIBAgASkDIDcDICAQIAEpAyg3AyggECABKQMwNwMwIBAgASkDODcDOCAQIAEpA0A3A0AgAiAMKQIANwIAIAIgDCkCCDcCCCACIAwpAhA3AhAgAiAMKQIYNwIYIAIgDCkCIDcCICACIAwpAig3AiggAiAMKQIwNwIwIAIgDCkCODcCOCACIAwpAkA3AkAgAiASEBcgASACKQMANwMAIAEgAikDCDcDCCABIAIpAxA3AxAgASACKQMYNwMYIAEgAikDIDcDICABIAIpAyg3AyggASACKQMwNwMwIAEgAikDODcDOCABIAIpA0A3A0AgARAbIAogASkDADcDACAKIAEpAwg3AwggCiABKQMQNwMQIAogASkDGDcDGCAKIAEpAyA3AyAgCiABKQMoNwMoIAogASkDMDcDMCAKIAEpAzg3AzggCiABKQNANwNAIAIgCikDADcDACACIAopAwg3AwggAiAKKQMQNwMQIAIgCikDGDcDGCACIAopAyA3AyAgAiAKKQMoNwMoIAIgCikDMDcDMCACIAopAzg3AzggAiAKKQNANwNAIAIgChAVIAEgAikDADcDACABIAIpAwg3AwggASACKQMQNwMQIAEgAikDGDcDGCABIAIpAyA3AyAgASACKQMoNwMoIAEgAikDMDcDMCABIAIpAzg3AzggASACKQNANwNAAkACQCABKAIAIgRBCEYEQEEIIQgCQAJAAkADQCAIQX9qIQQgCEUNBSAEQRBPDQEgAUEEaiAEQQJ0aigCACIIIARBAnRBxAlqKAIAIgJHDQIgBCEIDAALAAtBvAsgBEEQECgMAQsgCCACTw0CCwUgBEEITw0BCwwBCyABQcAJEBYLIAogASkDADcDACAKIAEpAwg3AwggCiABKQMQNwMQIAogASkDGDcDGCAKIAEpAyA3AyAgCiABKQMoNwMoIAogASkDMDcDMCAKIAEpAzg3AzggCiABKQNANwNAIAwLIQQgACAPKQIANwIAIAAgDykCCDcCCCAAIA8pAhA3AhAgACAPKQIYNwIYIAAgDykCIDcCICAAIA8pAig3AiggACAPKQIwNwIwIAAgDykCODcCOCAAIA8pAkA3AkAgBCAQKQIANwIAIAQgECkCCDcCCCAEIBApAhA3AhAgBCAQKQIYNwIYIAQgECkCIDcCICAEIBApAig3AiggBCAQKQIwNwIwIAQgECkCODcCOCAEIBApAkA3AkAgEiAKKQIANwIAIBIgCikCCDcCCCASIAopAhA3AhAgEiAKKQIYNwIYIBIgCikCIDcCICASIAopAig3AiggEiAKKQIwNwIwIBIgCikCODcCOCASIAopAkA3AkAgESQCCwukBAEQfwJ/IwIhAyMCQZABaiQCIAFBIEcEQCADJAJBAA8LIAAoAhwQOyEBIAAoAhgiAhA7IQQgACgCFCIFEDshByAAKAIQIggQOyEJIAAoAgwiChA7IQsgACgCCCIMEDshDSAAKAIEIg4QOyEPIAAoAgAiEBA7IREgA0HIAGoiAEEAOgBEIABBCDYCACAAIAE2AgQgACAENgIIIAAgBzYCDCAAIAk2AhAgACALNgIUIAAgDTYCGCAAIA82AhwgACARNgIgIABBJGoiAUIANwIAIAFCADcCCCABQgA3AhAgAUIANwIYIAAgEAR/QQgFIA4Ef0EHBSAMBH9BBgUgCgR/QQUFIAgEf0EEBSAFBH9BAwUgAgR/QQIFQQELCwsLCwsLIgE2AgAgAyICIAApAwA3AwAgAiAAKQMINwMIIAIgACkDEDcDECACIAApAxg3AxggAiAAKQMgNwMgIAIgACkDKDcDKCACIAApAzA3AzAgAiAAKQM4NwM4IAIgACkDQDcDQAJAAkACQCACKAIAIgRBCEYEQEEIIQECQAJAAkADQCABQX9qIQAgAUUNBiAAQRBPDQEgAkEEaiAAQQJ0aigCACIBIABBAnRB7ApqKAIAIgVHDQIgACEBDAALAAtBvAsgAEEQECgMAQsgASAFSQ0CDAMLBSAEQQhJDQEMAgsMAgsgBEEBRyACKAIEQQBHckUNAEEBIQYMAQtBACEGCyADJAIgBgsLvQYBD38CQCMCIQgjAkHgAWokAiADQSBJBEBBICADECcLIAghBSACKAIcEDshCSACKAIYEDshCiACKAIUEDshCyACKAIQEDshDCACKAIMEDshDSACKAIIEDshDiACKAIEEDshDyACKAIAEDshBiAIQcgAaiIEQQA6AEQgBCADQQJ2IgI2AgAgBCAJNgIEIAQgCjYCCCAEIAs2AgwgBCAMNgIQIAQgDTYCFCAEIA42AhggBCAPNgIcIAQgBjYCICAEQSRqIgNCADcCACADQgA3AgggA0IANwIQIANCADcCGAJAAkADQAJAIAJBf2oiA0EQTw0CIARBBGogA0ECdGooAgAEQCACIQcMAQsgA0EBSwRAIAMhAgwCBSADIQcLCwsMAQtBsAsgA0EQECgLIAQgBzYCACAFIAQpAwA3AwAgBSAEKQMINwMIIAUgBCkDEDcDECAFIAQpAxg3AxggBSAEKQMgNwMgIAUgBCkDKDcDKCAFIAQpAzA3AzAgBSAEKQM4NwM4IAUgBCkDQDcDQAJAAkAgBSgCACIGQQhGBEBBCCECAkACQAJAA0AgAkF/aiEDIAJFDQYgA0EQTw0BIAVBBGogA0ECdGooAgAiByADQQJ0QewKaigCACICRw0CIAMhAgwACwALQbwLIANBEBAoDAELIAcgAkkNAgsFIAZBCEkNAQsMAQsgBkEBRgRAIAUoAgRFDQELIAQgASAFECAgBCgCBBA7IRAgBCgCCBA7IREgBCgCDBA7IRIgBCgCEBA7IQkgBCgCFBA7IQogBCgCGBA7IQsgBCgCHBA7IQwgBCgCIBA7IQ0gBCgCTBA7IQ4gBCgCUBA7IQ8gBCgCVBA7IQYgBCgCWBA7IQUgBCgCXBA7IQcgBCgCYBA7IQMgBCgCZBA7IQIgBCgCaBA7IQEgAEEBOgAAIABBBDoAASAAIA02AAIgACAMNgAGIAAgCzYACiAAIAo2AA4gACAJNgASIAAgEjYAFiAAIBE2ABogACAQNgAeIAAgATYAIiAAIAI2ACYgACADNgAqIAAgBzYALiAAIAU2ADIgACAGNgA2IAAgDzYAOiAAIA42AD4gCCQCDwsgAEEAOgAAIAgkAgsLdgECfwJAIwIhAiMCQTBqJAIgAkEoaiIDIAA2AgAgAkEsaiIAIAE2AgAgAkEYaiIBIAM2AgAgAUEBNgIEIAEgADYCCCABQQE2AgwgAkGsDzYCACACQQI2AgQgAkEANgIIIAIgATYCECACQQI2AhQgAkG8DxAsCwt1AQJ/AkAjAiEDIwJBMGokAiADQShqIgQgATYCACADQSxqIgEgAjYCACADQRhqIgIgATYCACACQQE2AgQgAiAENgIIIAJBATYCDCADQZwPNgIAIANBAjYCBCADQQA2AgggAyACNgIQIANBAjYCFCADIAAQLAsLDwAgAQR/IAAgAXAFQQALCw8AIAEEfyAAIAFuBUEACwvNAgEHfwJ/IwIhBSMCQTBqJAIgBSEEIAAoAgAiAEGPzgBLBEBBJyEGA0AgAEGQzgAQKSECIABBkM4AECohAyACQeQAECpBAXQhByACQeQAEClBAXQhCCAEIAZBfGoiAmogB0GQF2ouAAA7AAAgBCAGQX5qaiAIQZAXai4AADsAACAAQf/B1y9LBEAgAiEGIAMhAAwBBSADIQALCwVBJyECCyAAQeMASgRAIABB5AAQKUEBdCEDIABB5AAQKiEAIAQgAkF+aiICaiADQZAXai4AADsAAAsgAEEKSAR/IAQgAkF/aiIDaiAAQf8BcUEwajoAACABQQFBrL8BQQAgBCADIgBqQScgAGsQLSEAIAUkAiAABSAEIAJBfmoiA2ogAEEBdEGQF2ouAAA7AAAgAUEBQay/AUEAIAQgAyIAakEnIABrEC0hACAFJAIgAAsLC3QBBH8CQCMCIQIjAkEwaiQCIAEoAgAhAyABKAIEIQQgASgCCCEFIAIiASAAKQIANwIAIAEgACkCCDcCCCABIAApAhA3AhAgAkEYaiIAIAEpAgA3AgAgACABKQIINwIIIAAgASkCEDcCECAAIAMgBCAFEA4LC/cRAQ1/An8jAiEMIwJBEGokAiAAKAIAIQgCQAJAIAEEQCAIQQFxBEBBKyEGDAIFQQAhDkEAIQYgBSEHCwVBLSEGDAELDAELQQEhDiAFQQFqIQcLIAhBBHEEfyACIANqIQsgAwRAIAIhAUEAIQkDQCABLAAAQcABcUGAAUYgCWohCSABQQFqIgEgC0cNAAsFQQAhCQsgByADaiAJayEHQQEFQQALIREgDEEEaiEBIAAoAghFBEAgDkEBRgRAIAAoAhghDSAAKAIcIQogAUEANgIAIAZBgAFJBEAgASAGOgAAQQEhBwUgBkGAEEkEf0FAIQhBASELQQIhByABBSAGQYCABEkEfyABQWA6AABBgH8hCEECIQtBAyEHIAFBAWoFIAFBcDoAACABQYB/OgABQYB/IQhBAyELQQQhByABQQJqCwsiCSAIOgAAIAEgC2ogBkE/cUGAf3I6AAALIA0gASAHIAooAgxBA3FBAmoRAABB/wFxBEAgDCQCQQEPCwsgAEEYaiEBIBEEQCABKAIAIAIgAyAAQRxqIgAoAgAoAgxBA3FBAmoRAABB/wFxBEAgDCQCQQEPCwUgAEEcaiEACyABKAIAIAQgBSAAKAIAKAIMQQNxQQJqEQAAIQAgDCQCIAAPCyAAKAIMIgogB00EQCAOQQFGBEAgACgCGCENIAAoAhwhCiABQQA2AgAgBkGAAUkEQCABIAY6AABBASEHBSAGQYAQSQR/QUAhCEEBIQtBAiEHIAEFIAZBgIAESQR/IAFBYDoAAEGAfyEIQQIhC0EDIQcgAUEBagUgAUFwOgAAIAFBgH86AAFBgH8hCEEDIQtBBCEHIAFBAmoLCyIJIAg6AAAgASALaiAGQT9xQYB/cjoAAAsgDSABIAcgCigCDEEDcUECahEAAEH/AXEEQCAMJAJBAQ8LCyAAQRhqIQEgEQRAIAEoAgAgAiADIABBHGoiACgCACgCDEEDcUECahEAAEH/AXEEQCAMJAJBAQ8LBSAAQRxqIQALIAEoAgAgBCAFIAAoAgAoAgxBA3FBAmoRAAAhACAMJAIgAA8LIAwhCSAIQQhxRQRAIAogB2shBwJAAkACQAJAIAAsADAiCEEDRgR/QQEFIAgLQQNxDgMAAgECCyAHIQhBACEHDAILIAdBAWpBAXYhCCAHQQF2IQcMAQtBACEICyAJQQA2AgAgACgCBCIKQYABSQR/IAkgCjoAAEEBBSAKQYAQSQR/IApBBnZBH3FBQHIhD0EBIRBBAiENIAkFIApBgIAESQR/IAkgCkEMdkEPcUFgcjoAACAKQQZ2QT9xQYB/ciEPQQIhEEEDIQ0gCUEBagUgCSAKQRJ2Qf8BcUFwcjoAACAJIApBDHZBP3FBgH9yOgABIApBBnZBP3FBgH9yIQ9BAyEQQQQhDSAJQQJqCwsiCyAPOgAAIAkgEGogCkE/cUGAf3I6AAAgDQshCyAAQRhqIQ0gAEEcaiEKQQAhAAJAAkADQCAAIAdJBEAgAEEBaiEAIA0oAgAgCSALIAooAgAoAgxBA3FBAmoRAABB/wFxDQIMAQsLDAELIAwkAkEBDwsCQAJAIA5BAUcNACANKAIAIRAgCigCACESIAFBADYCACAGQYABSQRAIAEgBjoAAEEBIQcFIAZBgBBJBH9BQCEOQQEhD0ECIQcgAQUgBkGAgARJBH8gAUFgOgAAQYB/IQ5BAiEPQQMhByABQQFqBSABQXA6AAAgAUGAfzoAAUGAfyEOQQMhD0EEIQcgAUECagsLIgAgDjoAACABIA9qIAZBP3FBgH9yOgAACyAQIAEgByASKAIMQQNxQQJqEQAAQf8BcUUNAAwBCyARBEAgDSgCACACIAMgCigCACgCDEEDcUECahEAAEH/AXENAQsgDSgCACAEIAUgCigCACgCDEEDcUECahEAAEH/AXFFBEBBACEAAkACQANAIAAgCE8NASAAQQFqIQAgDSgCACAJIAsgCigCACgCDEEDcUECahEAAEH/AXFFDQAMAgsACyAMJAJBAA8LIAwkAkEBDwsLIAwkAkEBDwsgAEEEaiIPQTA2AgAgAEEwaiIQQQE6AAAgDkEBRgRAIAAoAhghDiAAKAIcIRIgAUEANgIAIAZBgAFJBEAgASAGOgAAQQEhCAUgBkGAEEkEf0FAIQtBASENQQIhCCABBSAGQYCABEkEfyABQWA6AABBgH8hC0ECIQ1BAyEIIAFBAWoFIAFBcDoAACABQYB/OgABQYB/IQtBAyENQQQhCCABQQJqCwsiCSALOgAAIAEgDWogBkE/cUGAf3I6AAALIA4gASAIIBIoAgxBA3FBAmoRAABB/wFxBEAgDCQCQQEPCwsgEQRAIAAoAhggAiADIAAoAhwoAgxBA3FBAmoRAABB/wFxBEAgDCQCQQEPCwsgCiAHayECAkACQAJAAkAgECwAACIDQQNGBH9BAQUgAwtBA3EOAwACAQILIAIhA0EAIQIMAgsgAkEBakEBdiEDIAJBAXYhAgwBC0EAIQMLIAFBADYCACAPKAIAIgZBgAFJBH8gASAGOgAAQQEFIAZBgBBJBH8gBkEGdkEfcUFAciEIQQEhC0ECIQcgAQUgBkGAgARJBH8gASAGQQx2QQ9xQWByOgAAIAZBBnZBP3FBgH9yIQhBAiELQQMhByABQQFqBSABIAZBEnZB/wFxQXByOgAAIAEgBkEMdkE/cUGAf3I6AAEgBkEGdkE/cUGAf3IhCEEDIQtBBCEHIAFBAmoLCyIJIAg6AAAgASALaiAGQT9xQYB/cjoAACAHCyEJIABBGGohByAAQRxqIQZBACEAAkACQANAIAAgAkkEQCAAQQFqIQAgBygCACABIAkgBigCACgCDEEDcUECahEAAEH/AXENAgwBCwsMAQsgDCQCQQEPCyAHKAIAIAQgBSAGKAIAKAIMQQNxQQJqEQAAQf8BcQRAIAwkAkEBDwVBACEACwJAAkADQCAAIANPDQEgAEEBaiEAIAcoAgAgASAJIAYoAgAoAgxBA3FBAmoRAABB/wFxRQ0ADAILAAsgDCQCQQAPCyAMJAJBAQsLiwEBBn8CQCMCIQEjAkEwaiQCIAAoAgQhAyAAKAIIIQQgACgCDCEFIAAoAhAhBiABQRhqIgIgACgCADYCACACIAM2AgQgASIAIAI2AgAgAEEBNgIEIABBADYCCCAAQfyxATYCECAAQQA2AhQgAUEgaiIBIAQ2AgAgASAFNgIEIAEgBjYCCCAAIAEQLAsLdgECfwJAIwIhAiMCQTBqJAIgAkEoaiIDIAA2AgAgAkEsaiIAIAE2AgAgAkEYaiIBIAM2AgAgAUEBNgIEIAEgADYCCCABQQE2AgwgAkHIDzYCACACQQI2AgQgAkEANgIIIAIgATYCECACQQI2AhQgAkHYDxAsCwswAQJ/An8jAiEBIwJBEGokAiABIgIgACgCPBA4NgIAQQYgAhABEDMhACABJAIgAAsLawEDfwJ/IwIhBCMCQSBqJAIgBCEDIARBEGohBSAAQQM2AiQgACgCAEHAAHFFBEAgAyAAKAI8NgIAIANBk6gBNgIEIAMgBTYCCEE2IAMQBARAIABBfzoASwsLIAAgASACEDchACAEJAIgAAsLZQECfwJ/IwIhBCMCQSBqJAIgBCIDIAAoAjw2AgAgA0EANgIEIAMgATYCCCADIARBFGoiADYCDCADIAI2AhBBjAEgAxACEDNBAEgEfyAAQX82AgBBfwUgACgCAAshACAEJAIgAAsLGgAgAEGAYEsEfxA0QQAgAGs2AgBBfwUgAAsLCAAQNUHAAGoLBAAQNgsFAEHgEAv9AgELfwJ/IwIhBSMCQTBqJAIgBUEQaiEGIAVBIGoiAyAAQRxqIgkoAgAiBDYCACADIABBFGoiCigCACAEayIENgIEIAMgATYCCCADIAI2AgwgBSIBIABBPGoiDCgCADYCACABIAM2AgQgAUECNgIIAkACQCAEIAJqIgRBkgEgARAGEDMiAUYNAEECIQcDQCABQQBOBEAgBCABayEEIANBCGohCCABIAMoAgQiDUsiCwRAIAghAwsgC0EfdEEfdSAHaiEHIAMgAygCACABIAsEfyANBUEAC2siAWo2AgAgA0EEaiIIIAgoAgAgAWs2AgAgBiAMKAIANgIAIAYgAzYCBCAGIAc2AgggBEGSASAGEAYQMyIBRg0CDAELCyAAQQA2AhAgCUEANgIAIApBADYCACAAIAAoAgBBIHI2AgAgB0ECRgR/QQAFIAIgAygCBGsLIQIMAQsgACAAKAIsIgEgACgCMGo2AhAgCSABNgIAIAogATYCAAsgBSQCIAILCwQAIAALUAECfwJ/IAIEfwNAIAAsAAAiAyABLAAAIgRGBEAgAEEBaiEAIAFBAWohAUEAIAJBf2oiAkUNAxoMAQsLIANB/wFxIARB/wFxawVBAAsLIgALnQIBBH8CfyAAIAJqIQQgAUH/AXEhASACQcMATgRAA0AgAEEDcQRAIAAgAToAACAAQQFqIQAMAQsLIARBfHEiBUHAAGshBiABIAFBCHRyIAFBEHRyIAFBGHRyIQMDQCAAIAZMBEAgACADNgIAIAAgAzYCBCAAIAM2AgggACADNgIMIAAgAzYCECAAIAM2AhQgACADNgIYIAAgAzYCHCAAIAM2AiAgACADNgIkIAAgAzYCKCAAIAM2AiwgACADNgIwIAAgAzYCNCAAIAM2AjggACADNgI8IABBwABqIQAMAQsLA0AgACAFSARAIAAgAzYCACAAQQRqIQAMAQsLCwNAIAAgBEgEQCAAIAE6AAAgAEEBaiEADAELCyAEIAJrCwsrACAAQf8BcUEYdCAAQQh1Qf8BcUEQdHIgAEEQdUH/AXFBCHRyIABBGHZyC8kDAQN/An8gAkGAwABOBEAgACABIAIQAw8LIAAhBCAAIAJqIQMgAEEDcSABQQNxRgRAA0AgAEEDcQRAIAJFBEAgBA8LIAAgASwAADoAACAAQQFqIQAgAUEBaiEBIAJBAWshAgwBCwsgA0F8cSICQcAAayEFA0AgACAFTARAIAAgASgCADYCACAAIAEoAgQ2AgQgACABKAIINgIIIAAgASgCDDYCDCAAIAEoAhA2AhAgACABKAIUNgIUIAAgASgCGDYCGCAAIAEoAhw2AhwgACABKAIgNgIgIAAgASgCJDYCJCAAIAEoAig2AiggACABKAIsNgIsIAAgASgCMDYCMCAAIAEoAjQ2AjQgACABKAI4NgI4IAAgASgCPDYCPCAAQcAAaiEAIAFBwABqIQEMAQsLA0AgACACSARAIAAgASgCADYCACAAQQRqIQAgAUEEaiEBDAELCwUgA0EEayECA0AgACACSARAIAAgASwAADoAACAAIAEsAAE6AAEgACABLAACOgACIAAgASwAAzoAAyAAQQRqIQAgAUEEaiEBDAELCwsDQCAAIANIBEAgACABLAAAOgAAIABBAWohACABQQFqIQEMAQsLIAQLCwsAAn9BABAAQQALCwsAAn9BARAAQQALCwsAAn9BAhAAQQALCwu9DA0AQYAIC+QBAQAAAAAAAACCgAAAAAAAAIqAAAAAAACAAIAAgAAAAICLgAAAAAAAAAEAAIAAAAAAgYAAgAAAAIAJgAAAAAAAgIoAAAAAAAAAiAAAAAAAAAAJgACAAAAAAAoAAIAAAAAAi4AAgAAAAACLAAAAAAAAgImAAAAAAACAA4AAAAAAAIACgAAAAAAAgIAAAAAAAACACoAAAAAAAAAKAACAAAAAgIGAAIAAAACAgIAAAAAAAIABAACAAAAAAAiAAIAAAACACAAAAC/8///+////////////////////////////////////AEGICgsFAQAAAAEAQdAKCzyxCQAAIgAAAPYCAABYCQAAWQAAADwBAAAIAAAAQUE20Ixe0r87oEiv5tyuuv7///////////////////8AQbALC6kBMwoAACIAAADwAgAA0wkAAGAAAAA9AAAA0wkAAGAAAACBAAAA0wkAAGAAAACLAAAA0wkAAGAAAACTAAAA0wkAAGAAAACbAAAA0wkAAGAAAADvAAAA0wkAAGAAAAD3AAAA0wkAAGAAAAC6AAAA0wkAAGAAAABeAQAA0wkAAGAAAAAxAQAA0wkAAGAAAAAyAQAA0wkAAGAAAAA4AQAA0wkAAGAAAAA9AQAAAQBBoA0LadMJAABgAAAAbgMAAFUKAABcAAAAEAAAADMKAAAiAAAA9gIAANMJAABgAAAAHgQAABQLAAAoAAAAsQoAAGMAAABCAAAAsQoAAGMAAAA9AAAAsQoAAGMAAABQAAAAsQoAAGMAAABSAAAAAQBB0A4LAQEAQZgPC00BAAAAXgsAACAAAAB+CwAAEgAAAFgMAAAGAAAAXgwAACIAAAA8CwAAIgAAAKACAACADAAAFgAAAJYMAAANAAAAPAsAACIAAACmAgAABQBB8A8LAQEAQYgQCw4BAAAAAgAAALRfAAAABABBoBALAQEAQa8QCwUK/////wBBnBILAiRZAEHUEgvPBuQHAAAvaG9tZS9tYWNpZWovLmNhcmdvL3JlZ2lzdHJ5L3NyYy9naXRodWIuY29tLTFlY2M2Mjk5ZGI5ZWM4MjMvdGlueS1rZWNjYWstMS4yLjEvc3JjL2xpYi5ycy9jaGVja291dC9zcmMvbGliY29yZS9zbGljZS9tb2QucnMvaG9tZS9tYWNpZWovLmNhcmdvL3JlZ2lzdHJ5L3NyYy9naXRodWIuY29tLTFlY2M2Mjk5ZGI5ZWM4MjMvdGlueS1zZWNwMjU2azEtMC4xLjAvc3JjL2JpZ19udW0ucnMvY2hlY2tvdXQvc3JjL2xpYmNvcmUvc2xpY2UvbW9kLnJzL2hvbWUvbWFjaWVqLy5jYXJnby9yZWdpc3RyeS9zcmMvZ2l0aHViLmNvbS0xZWNjNjI5OWRiOWVjODIzL3Rpbnktc2VjcDI1NmsxLTAuMS4wL3NyYy9uYWYucnMvaG9tZS9tYWNpZWovLmNhcmdvL3JlZ2lzdHJ5L3NyYy9naXRodWIuY29tLTFlY2M2Mjk5ZGI5ZWM4MjMvdGlueS1zZWNwMjU2azEtMC4xLjAvc3JjL2VjX3BvaW50X2cucnNpbnRlcm5hbCBlcnJvcjogZW50ZXJlZCB1bnJlYWNoYWJsZSBjb2RlL2NoZWNrb3V0L3NyYy9saWJjb3JlL3NsaWNlL21vZC5yc2luZGV4IG91dCBvZiBib3VuZHM6IHRoZSBsZW4gaXMgIGJ1dCB0aGUgaW5kZXggaXMgMDAwMTAyMDMwNDA1MDYwNzA4MDkxMDExMTIxMzE0MTUxNjE3MTgxOTIwMjEyMjIzMjQyNTI2MjcyODI5MzAzMTMyMzMzNDM1MzYzNzM4Mzk0MDQxNDI0MzQ0NDU0NjQ3NDg0OTUwNTE1MjUzNTQ1NTU2NTc1ODU5NjA2MTYyNjM2NDY1NjY2NzY4Njk3MDcxNzI3Mzc0NzU3Njc3Nzg3OTgwODE4MjgzODQ4NTg2ODc4ODg5OTA5MTkyOTM5NDk1OTY5Nzk4OTlpbmRleCAgb3V0IG9mIHJhbmdlIGZvciBzbGljZSBvZiBsZW5ndGggc2xpY2UgaW5kZXggc3RhcnRzIGF0ICBidXQgZW5kcyBhdCA=', 'base64');
diff --git a/js/src/api/local/ethkey/index.js b/js/src/api/local/ethkey/index.js
deleted file mode 100644
index 07ca34ba11ed1128d5c9e8d7ad6e9732eb95e780..0000000000000000000000000000000000000000
--- a/js/src/api/local/ethkey/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import workerPool from './workerPool';
-
-export function createKeyObject (key, password) {
-  return workerPool.action('createKeyObject', { key, password })
-    .then((obj) => JSON.parse(obj));
-}
-
-export function decryptPrivateKey (keyObject, password) {
-  return workerPool
-    .action('decryptPrivateKey', { keyObject, password })
-    .then((privateKey) => {
-      if (privateKey) {
-        return Buffer.from(privateKey);
-      }
-
-      return null;
-    });
-}
-
-export function phraseToAddress (phrase) {
-  return phraseToWallet(phrase)
-    .then((wallet) => wallet.address);
-}
-
-export function phraseToWallet (phrase) {
-  return workerPool.action('phraseToWallet', phrase);
-}
-
-export function verifySecret (secret) {
-  return workerPool.action('verifySecret', secret);
-}
diff --git a/js/src/api/local/ethkey/index.spec.js b/js/src/api/local/ethkey/index.spec.js
deleted file mode 100644
index ce4cc29df9ba1ed70481740a70e9b1a5e1cc525e..0000000000000000000000000000000000000000
--- a/js/src/api/local/ethkey/index.spec.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { randomPhrase } from '@parity/wordlist';
-import { phraseToAddress, phraseToWallet } from './';
-
-// TODO: Skipping until Node.js 8.0 comes out and we can test WebAssembly
-describe.skip('api/local/ethkey', () => {
-  describe('phraseToAddress', function () {
-    this.timeout(30000);
-
-    it('generates a valid address', () => {
-      const phrase = randomPhrase(12);
-
-      return phraseToAddress(phrase).then((address) => {
-        expect(address.length).to.be.equal(42);
-        expect(address.slice(0, 4)).to.be.equal('0x00');
-      });
-    });
-
-    it('generates valid address for empty phrase', () => {
-      return phraseToAddress('').then((address) => {
-        expect(address).to.be.equal('0x00a329c0648769a73afac7f9381e08fb43dbea72');
-      });
-    });
-  });
-
-  describe('phraseToWallet', function () {
-    this.timeout(30000);
-
-    it('generates a valid wallet object', () => {
-      const phrase = randomPhrase(12);
-
-      return phraseToWallet(phrase).then((wallet) => {
-        expect(wallet.address.length).to.be.equal(42);
-        expect(wallet.secret.length).to.be.equal(66);
-        expect(wallet.public.length).to.be.equal(130);
-
-        expect(wallet.address.slice(0, 4)).to.be.equal('0x00');
-        expect(wallet.secret.slice(0, 2)).to.be.equal('0x');
-        expect(wallet.public.slice(0, 2)).to.be.equal('0x');
-      });
-    });
-  });
-});
diff --git a/js/src/api/local/ethkey/worker.js b/js/src/api/local/ethkey/worker.js
deleted file mode 100644
index 76ccf06b2271a6645d7bb365b065ed37116e7aa0..0000000000000000000000000000000000000000
--- a/js/src/api/local/ethkey/worker.js
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { bytesToHex } from '~/api/util/format';
-import { extern, slice } from './ethkey.js';
-
-const isWorker = typeof self !== 'undefined';
-
-// Stay compatible between environments
-if (!isWorker) {
-  const scope = typeof global === 'undefined' ? window : global;
-
-  scope.self = scope;
-}
-
-// keythereum should never be used outside of the browser
-let keythereum = require('keythereum');
-
-if (isWorker) {
-  keythereum = self.keythereum;
-}
-
-function route ({ action, payload }) {
-  if (action in actions) {
-    return actions[action](payload);
-  }
-
-  return null;
-}
-
-const input = slice(extern._input_ptr(), 1024);
-const secret = slice(extern._secret_ptr(), 32);
-const publicKey = slice(extern._public_ptr(), 64);
-const address = slice(extern._address_ptr(), 20);
-
-extern._ecpointg();
-
-const actions = {
-  phraseToWallet (phrase) {
-    const phraseUtf8 = Buffer.from(phrase, 'utf8');
-
-    if (phraseUtf8.length > input.length) {
-      throw new Error('Phrase is too long!');
-    }
-
-    input.set(phraseUtf8);
-
-    extern._brain(phraseUtf8.length);
-
-    const wallet = {
-      secret: bytesToHex(secret),
-      public: bytesToHex(publicKey),
-      address: bytesToHex(address)
-    };
-
-    return wallet;
-  },
-
-  verifySecret (key) {
-    const keyBuf = Buffer.from(key.slice(2), 'hex');
-
-    secret.set(keyBuf);
-
-    return extern._verify_secret();
-  },
-
-  createKeyObject ({ key, password }) {
-    key = Buffer.from(key);
-    password = Buffer.from(password);
-
-    const iv = keythereum.crypto.randomBytes(16);
-    const salt = keythereum.crypto.randomBytes(32);
-    const keyObject = keythereum.dump(password, key, salt, iv);
-
-    return JSON.stringify(keyObject);
-  },
-
-  decryptPrivateKey ({ keyObject, password }) {
-    password = Buffer.from(password);
-
-    try {
-      const key = keythereum.recover(password, keyObject);
-
-      // Convert to array to safely send from the worker
-      return Array.from(key);
-    } catch (e) {
-      return null;
-    }
-  }
-};
-
-self.onmessage = function ({ data }) {
-  try {
-    const result = route(data);
-
-    postMessage([null, result]);
-  } catch (err) {
-    console.error(err);
-    postMessage([err.toString(), null]);
-  }
-};
-
-// Emulate a web worker in Node.js
-class KeyWorker {
-  postMessage (data) {
-    // Force async
-    setTimeout(() => {
-      try {
-        const result = route(data);
-
-        this.onmessage({ data: [null, result] });
-      } catch (err) {
-        this.onmessage({ data: [err, null] });
-      }
-    }, 0);
-  }
-
-  onmessage (event) {
-    // no-op to be overriden
-  }
-}
-
-if (exports != null) {
-  exports.KeyWorker = KeyWorker;
-}
diff --git a/js/src/api/local/ethkey/workerPool.js b/js/src/api/local/ethkey/workerPool.js
deleted file mode 100644
index d7db73b419be0ac35fd9cddf67ff5bf24c37802b..0000000000000000000000000000000000000000
--- a/js/src/api/local/ethkey/workerPool.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-// Allow a web worker in the browser, with a fallback for Node.js
-const hasWebWorkers = typeof Worker !== 'undefined';
-const KeyWorker = hasWebWorkers ? require('worker-loader!./worker')
-                                : require('./worker').KeyWorker;
-
-class WorkerContainer {
-  busy = false;
-  _worker = new KeyWorker();
-
-  action (action, payload) {
-    if (this.busy) {
-      throw new Error('Cannot issue an action on a busy worker!');
-    }
-
-    this.busy = true;
-
-    return new Promise((resolve, reject) => {
-      this._worker.postMessage({ action, payload });
-      this._worker.onmessage = ({ data }) => {
-        const [err, result] = data;
-
-        this.busy = false;
-
-        if (err) {
-          // `err` ought to be a String
-          reject(new Error(err));
-        } else {
-          resolve(result);
-        }
-      };
-    });
-  }
-}
-
-class WorkerPool {
-  pool = [
-    new WorkerContainer(),
-    new WorkerContainer()
-  ];
-
-  queue = [];
-
-  _getContainer () {
-    return this.pool.find((container) => !container.busy);
-  }
-
-  action (action, payload) {
-    let container = this.pool.find((container) => !container.busy);
-
-    let promise;
-
-    // const start = Date.now();
-
-    if (container) {
-      promise = container.action(action, payload);
-    } else {
-      promise = new Promise((resolve, reject) => {
-        this.queue.push([action, payload, resolve]);
-      });
-    }
-
-    return promise
-      .catch((err) => {
-        this.processQueue();
-
-        throw err;
-      })
-      .then((result) => {
-        this.processQueue();
-
-        // console.log('Work done in ', Date.now() - start);
-
-        return result;
-      });
-  }
-
-  processQueue () {
-    let container = this._getContainer();
-
-    while (container && this.queue.length > 0) {
-      const [action, payload, resolve] = this.queue.shift();
-
-      resolve(container.action(action, payload));
-      container = this._getContainer();
-    }
-  }
-}
-
-export default new WorkerPool();
diff --git a/js/src/api/local/index.js b/js/src/api/local/index.js
deleted file mode 100644
index 190a38ea4f612115624cd8533a842c4cecfbe24b..0000000000000000000000000000000000000000
--- a/js/src/api/local/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default null;
diff --git a/js/src/api/local/localAccountsMiddleware.js b/js/src/api/local/localAccountsMiddleware.js
deleted file mode 100644
index c452f541afa5fcb332ccb1b465b4ec86908b83f5..0000000000000000000000000000000000000000
--- a/js/src/api/local/localAccountsMiddleware.js
+++ /dev/null
@@ -1,288 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import EthereumTx from 'ethereumjs-tx';
-import accounts from './accounts';
-import transactions from './transactions';
-import { Middleware } from '../transport';
-import { inNumber16 } from '../format/input';
-import { phraseToWallet, phraseToAddress, verifySecret } from './ethkey';
-import { randomPhrase } from '@parity/wordlist';
-
-export default class LocalAccountsMiddleware extends Middleware {
-  constructor (transport) {
-    super(transport);
-
-    const register = this.register.bind(this);
-
-    register('eth_accounts', () => {
-      return accounts.accountAddresses();
-    });
-
-    register('eth_coinbase', () => {
-      return accounts.lastAddress;
-    });
-
-    register('parity_accountsInfo', () => {
-      return accounts.map(({ name }) => {
-        return { name };
-      });
-    });
-
-    register('parity_allAccountsInfo', () => {
-      return accounts.map(({ name, meta, uuid }) => {
-        return { name, meta, uuid };
-      });
-    });
-
-    register('parity_changePassword', ([address, oldPassword, newPassword]) => {
-      const account = accounts.get(address);
-
-      return account
-        .decryptPrivateKey(oldPassword)
-        .then((privateKey) => {
-          if (!privateKey) {
-            return false;
-          }
-
-          account.changePassword(privateKey, newPassword);
-
-          return true;
-        });
-    });
-
-    register('parity_checkRequest', ([id]) => {
-      return transactions.hash(id) || Promise.resolve(null);
-    });
-
-    register('parity_dappsList', () => {
-      return [];
-    });
-
-    register('parity_defaultAccount', () => {
-      return accounts.dappsDefaultAddress;
-    });
-
-    register('parity_exportAccount', ([address, password]) => {
-      const account = accounts.get(address);
-
-      if (!password) {
-        password = '';
-      }
-
-      return account.isValidPassword(password)
-        .then((isValid) => {
-          if (!isValid) {
-            throw new Error('Invalid password');
-          }
-
-          return account.export();
-        });
-    });
-
-    register('parity_generateSecretPhrase', () => {
-      return randomPhrase(12);
-    });
-
-    register('parity_getNewDappsAddresses', () => {
-      return accounts.accountAddresses();
-    });
-
-    register('parity_getNewDappsDefaultAddress', () => {
-      return accounts.dappsDefaultAddress;
-    });
-
-    register('parity_hardwareAccountsInfo', () => {
-      return {};
-    });
-
-    register('parity_newAccountFromPhrase', ([phrase, password]) => {
-      return phraseToWallet(phrase)
-        .then((wallet) => {
-          return accounts.create(wallet.secret, password);
-        });
-    });
-
-    register('parity_newAccountFromSecret', ([secret, password]) => {
-      return verifySecret(secret)
-        .then((isValid) => {
-          if (!isValid) {
-            throw new Error('Invalid secret key');
-          }
-
-          return accounts.create(secret, password);
-        });
-    });
-
-    register('parity_newAccountFromWallet', ([json, password]) => {
-      if (!password) {
-        password = '';
-      }
-
-      return accounts.restoreFromWallet(JSON.parse(json), password);
-    });
-
-    register('parity_setAccountMeta', ([address, meta]) => {
-      accounts.getLazyCreate(address).meta = meta;
-
-      return true;
-    });
-
-    register('parity_setAccountName', ([address, name]) => {
-      accounts.getLazyCreate(address).name = name;
-
-      return true;
-    });
-
-    register('parity_setNewDappsDefaultAddress', ([address]) => {
-      accounts.dappsDefaultAddress = address;
-
-      return true;
-    });
-
-    register('parity_postTransaction', ([tx]) => {
-      if (!tx.from) {
-        tx.from = accounts.lastAddress;
-      }
-
-      tx.nonce = null;
-      tx.condition = null;
-
-      return transactions.add(tx);
-    });
-
-    register('parity_phraseToAddress', ([phrase]) => {
-      return phraseToAddress(phrase);
-    });
-
-    register('parity_useLocalAccounts', () => {
-      return true;
-    });
-
-    register('parity_listGethAccounts', () => {
-      return [];
-    });
-
-    register('parity_listOpenedVaults', () => {
-      return [];
-    });
-
-    register('parity_listRecentDapps', () => {
-      return {};
-    });
-
-    register('parity_listVaults', () => {
-      return [];
-    });
-
-    register('parity_wsUrl', () => {
-      // This is a hack, will be replaced by a `hostname` setting on the node itself
-      return `${window.location.hostname}:8546`;
-    });
-
-    register('parity_dappsUrl', () => {
-      // This is a hack, will be replaced by a `hostname` setting on the node itself
-      return `${window.location.hostname}:8545`;
-    });
-
-    register('parity_hashContent', () => {
-      throw new Error('Functionality unavailable on a public wallet.');
-    });
-
-    register('parity_killAccount', ([address, password]) => {
-      return accounts.remove(address, password);
-    });
-
-    register('parity_removeAddress', ([address]) => {
-      return accounts.remove(address, null);
-    });
-
-    register('parity_testPassword', ([address, password]) => {
-      const account = accounts.get(address);
-
-      return account.isValidPassword(password);
-    });
-
-    register('parity_upgradeReady', () => {
-      return false;
-    });
-
-    register('signer_confirmRequest', ([id, modify, password]) => {
-      const {
-        gasPrice,
-        gas: gasLimit,
-        from,
-        to,
-        value,
-        data
-      } = Object.assign(transactions.get(id), modify);
-
-      transactions.lock(id);
-
-      const account = accounts.get(from);
-
-      return Promise.all([
-        this.rpcRequest('parity_nextNonce', [from]),
-        account.decryptPrivateKey(password)
-      ])
-      .catch((err) => {
-        transactions.unlock(id);
-
-        // transaction got unlocked, can propagate rejection further
-        throw err;
-      })
-      .then(([nonce, privateKey]) => {
-        if (!privateKey) {
-          transactions.unlock(id);
-
-          throw new Error('Invalid password');
-        }
-
-        const tx = new EthereumTx({
-          nonce,
-          to,
-          data,
-          gasLimit: inNumber16(gasLimit),
-          gasPrice: inNumber16(gasPrice),
-          value: inNumber16(value)
-        });
-
-        tx.sign(privateKey);
-
-        const serializedTx = `0x${tx.serialize().toString('hex')}`;
-
-        return this.rpcRequest('eth_sendRawTransaction', [serializedTx]);
-      })
-      .then((hash) => {
-        transactions.confirm(id, hash);
-
-        return {};
-      });
-    });
-
-    register('signer_generateAuthorizationToken', () => {
-      return '';
-    });
-
-    register('signer_rejectRequest', ([id]) => {
-      return transactions.reject(id);
-    });
-
-    register('signer_requestsToConfirm', () => {
-      return transactions.requestsToConfirm();
-    });
-  }
-}
diff --git a/js/src/api/local/localAccountsMiddleware.spec.js b/js/src/api/local/localAccountsMiddleware.spec.js
deleted file mode 100644
index b3de3992d1d064137d844333d33b30d800422899..0000000000000000000000000000000000000000
--- a/js/src/api/local/localAccountsMiddleware.spec.js
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import LocalAccountsMiddleware from './localAccountsMiddleware';
-import JsonRpcBase from '../transport/jsonRpcBase';
-
-const RPC_RESPONSE = Symbol('RPC response');
-const ADDRESS = '0x00a329c0648769a73afac7f9381e08fb43dbea72';
-const SECRET = '0x4d5db4107d237df6a3d58ee5f70ae63d73d7658d4026f2eefd2f204c81682cb7';
-const PASSWORD = 'password';
-
-const FOO_PHRASE = 'foobar';
-const FOO_PASSWORD = 'foopass';
-const FOO_ADDRESS = '0x007ef7ac1058e5955e366ab9d6b6c4ebcc937e7e';
-
-class MockedTransport extends JsonRpcBase {
-  _execute (method, params) {
-    return RPC_RESPONSE;
-  }
-}
-
-// Skip till all CI runs on Node 8+
-describe.skip('api/local/LocalAccountsMiddleware', function () {
-  this.timeout(30000);
-
-  let transport;
-
-  beforeEach(() => {
-    transport = new MockedTransport();
-    transport.addMiddleware(LocalAccountsMiddleware);
-
-    // Same as `parity_newAccountFromPhrase` with empty phrase
-    return transport
-      .execute('parity_newAccountFromSecret', SECRET, PASSWORD)
-      .catch((_err) => {
-        // Ignore the error - all instances of LocalAccountsMiddleware
-        // share account storage
-      });
-  });
-
-  it('registers all necessary methods', () => {
-    return Promise
-      .all([
-        'eth_accounts',
-        'eth_coinbase',
-        'parity_accountsInfo',
-        'parity_allAccountsInfo',
-        'parity_changePassword',
-        'parity_checkRequest',
-        'parity_defaultAccount',
-        'parity_generateSecretPhrase',
-        'parity_getNewDappsAddresses',
-        'parity_hardwareAccountsInfo',
-        'parity_newAccountFromPhrase',
-        'parity_newAccountFromSecret',
-        'parity_setAccountMeta',
-        'parity_setAccountName',
-        'parity_postTransaction',
-        'parity_phraseToAddress',
-        'parity_useLocalAccounts',
-        'parity_listGethAccounts',
-        'parity_listOpenedVaults',
-        'parity_listRecentDapps',
-        'parity_listVaults',
-        'parity_killAccount',
-        'parity_testPassword',
-        'signer_confirmRequest',
-        'signer_rejectRequest',
-        'signer_requestsToConfirm'
-      ].map((method) => {
-        return transport
-          .execute(method)
-          .then((result) => {
-            expect(result).not.to.be.equal(RPC_RESPONSE);
-          })
-          // Some errors are expected here since we are calling methods
-          // without parameters.
-          .catch((_) => {});
-      }));
-  });
-
-  it('allows non-registered methods through', () => {
-    return transport
-      .execute('eth_getBalance', '0x407d73d8a49eeb85d32cf465507dd71d507100c1')
-      .then((result) => {
-        expect(result).to.be.equal(RPC_RESPONSE);
-      });
-  });
-
-  it('can handle `eth_accounts`', () => {
-    return transport
-      .execute('eth_accounts')
-      .then((accounts) => {
-        expect(accounts.length).to.be.equal(1);
-        expect(accounts[0]).to.be.equal(ADDRESS);
-      });
-  });
-
-  it('can handle `parity_defaultAccount`', () => {
-    return transport
-      .execute('parity_defaultAccount')
-      .then((address) => {
-        expect(address).to.be.equal(ADDRESS);
-      });
-  });
-
-  it('can handle `parity_phraseToAddress`', () => {
-    return transport
-      .execute('parity_phraseToAddress', '')
-      .then((address) => {
-        expect(address).to.be.equal(ADDRESS);
-
-        return transport.execute('parity_phraseToAddress', FOO_PHRASE);
-      })
-      .then((address) => {
-        expect(address).to.be.equal(FOO_ADDRESS);
-      });
-  });
-
-  it('can create and kill an account', () => {
-    return transport
-      .execute('parity_newAccountFromPhrase', FOO_PHRASE, FOO_PASSWORD)
-      .then((address) => {
-        expect(address).to.be.equal(FOO_ADDRESS);
-
-        return transport.execute('eth_accounts');
-      })
-      .then((accounts) => {
-        expect(accounts.length).to.be.equal(2);
-        expect(accounts.includes(FOO_ADDRESS)).to.be.true;
-
-        return transport.execute('parity_killAccount', FOO_ADDRESS, FOO_PASSWORD);
-      })
-      .then((result) => {
-        expect(result).to.be.true;
-
-        return transport.execute('eth_accounts');
-      })
-      .then((accounts) => {
-        expect(accounts.length).to.be.equal(1);
-        expect(accounts.includes(FOO_ADDRESS)).to.be.false;
-      });
-  });
-});
diff --git a/js/src/api/local/transactions.js b/js/src/api/local/transactions.js
deleted file mode 100644
index 421e730123d9eadb6ecd3d0140a1bc53d1d4e986..0000000000000000000000000000000000000000
--- a/js/src/api/local/transactions.js
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { toHex } from '../util/format';
-import { TransportError } from '../transport';
-
-const AWAITING = Symbol('awaiting');
-const LOCKED = Symbol('locked');
-const CONFIRMED = Symbol('confirmed');
-const REJECTED = Symbol('rejected');
-
-class Transactions {
-  constructor () {
-    this.reset();
-  }
-
-  // should only really be needed in the constructor and tests
-  reset () {
-    this._id = 1;
-    this._states = {};
-  }
-
-  nextId () {
-    return toHex(this._id++);
-  }
-
-  add (tx) {
-    const id = this.nextId();
-
-    this._states[id] = {
-      status: AWAITING,
-      transaction: tx
-    };
-
-    return id;
-  }
-
-  get (id) {
-    const state = this._states[id];
-
-    if (!state || state.status !== AWAITING) {
-      return null;
-    }
-
-    return state.transaction;
-  }
-
-  lock (id) {
-    const state = this._states[id];
-
-    if (!state || state.status !== AWAITING) {
-      throw new Error('Trying to lock an invalid transaction');
-    }
-
-    state.status = LOCKED;
-  }
-
-  unlock (id) {
-    const state = this._states[id];
-
-    if (!state || state.status !== LOCKED) {
-      throw new Error('Trying to unlock an invalid transaction');
-    }
-
-    state.status = AWAITING;
-  }
-
-  hash (id) {
-    const state = this._states[id];
-
-    if (!state) {
-      return null;
-    }
-
-    switch (state.status) {
-      case REJECTED:
-        throw TransportError.requestRejected();
-      case CONFIRMED:
-        return state.hash;
-      default:
-        return null;
-    }
-  }
-
-  confirm (id, hash) {
-    const state = this._states[id];
-    const status = state ? state.status : null;
-
-    switch (status) {
-      case AWAITING: break;
-      case LOCKED: break;
-      default: throw new Error('Trying to confirm an invalid transaction');
-    }
-
-    state.hash = hash;
-    state.status = CONFIRMED;
-  }
-
-  reject (id) {
-    const state = this._states[id];
-
-    if (!state) {
-      return false;
-    }
-
-    state.status = REJECTED;
-
-    return true;
-  }
-
-  requestsToConfirm () {
-    const result = [];
-
-    Object.keys(this._states).forEach((id) => {
-      const state = this._states[id];
-
-      if (state.status === AWAITING) {
-        result.push({
-          id,
-          origin: {
-            signer: '0x0'
-          },
-          payload: {
-            sendTransaction: state.transaction
-          }
-        });
-      }
-    });
-
-    return result;
-  }
-}
-
-export default new Transactions();
diff --git a/js/src/api/local/transactions.spec.js b/js/src/api/local/transactions.spec.js
deleted file mode 100644
index 65f2d8ddc3951d66d35bc83c38037e14002de647..0000000000000000000000000000000000000000
--- a/js/src/api/local/transactions.spec.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import transactions from './transactions';
-import { TransportError } from '../transport/error';
-
-const DUMMY_TX = 'dummy';
-
-describe('api/local/transactions', () => {
-  beforeEach(() => {
-    transactions.reset();
-  });
-
-  it('can store transactions', () => {
-    const id1 = transactions.add(DUMMY_TX);
-    const id2 = transactions.add(DUMMY_TX);
-    const requests = transactions.requestsToConfirm();
-
-    expect(id1).to.be.equal('0x1');
-    expect(id2).to.be.equal('0x2');
-    expect(requests.length).to.be.equal(2);
-    expect(requests[0].id).to.be.equal(id1);
-    expect(requests[1].id).to.be.equal(id2);
-    expect(requests[0].payload.sendTransaction).to.be.equal(DUMMY_TX);
-    expect(requests[1].payload.sendTransaction).to.be.equal(DUMMY_TX);
-  });
-
-  it('can confirm transactions', () => {
-    const id1 = transactions.add(DUMMY_TX);
-    const id2 = transactions.add(DUMMY_TX);
-
-    const hash1 = '0x1111111111111111111111111111111111111111';
-    const hash2 = '0x2222222222222222222222222222222222222222';
-
-    transactions.confirm(id1, hash1);
-    transactions.confirm(id2, hash2);
-
-    const requests = transactions.requestsToConfirm();
-
-    expect(requests.length).to.be.equal(0);
-    expect(transactions.hash(id1)).to.be.equal(hash1);
-    expect(transactions.hash(id2)).to.be.equal(hash2);
-  });
-
-  it('can reject transactions', () => {
-    const id = transactions.add(DUMMY_TX);
-
-    transactions.reject(id);
-
-    const requests = transactions.requestsToConfirm();
-
-    expect(requests.length).to.be.equal(0);
-    expect(() => transactions.hash(id)).to.throw(TransportError);
-  });
-
-  it('can lock and confirm transactions', () => {
-    const id = transactions.add(DUMMY_TX);
-    const hash = '0x1111111111111111111111111111111111111111';
-
-    transactions.lock(id);
-
-    const requests = transactions.requestsToConfirm();
-
-    expect(requests.length).to.be.equal(0);
-    expect(transactions.get(id)).to.be.null;
-    expect(transactions.hash(id)).to.be.null;
-
-    transactions.confirm(id, hash);
-
-    expect(transactions.hash(id)).to.be.equal(hash);
-  });
-});
diff --git a/js/src/api/pubsub/eth/eth.js b/js/src/api/pubsub/eth/eth.js
deleted file mode 100644
index 0bbc85bec395f0fb955c3f9da8ba56dba4676edd..0000000000000000000000000000000000000000
--- a/js/src/api/pubsub/eth/eth.js
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-import PubsubBase from '../pubsubBase';
-
-import { inAddress, inBlockNumber, inHex, inNumber16, inOptions, inFilter } from '../../format/input';
-import { outAddress, outBlock, outNumber, outTransaction, outSyncing, outReceipt, outLog } from '../../format/output';
-
-export default class Eth extends PubsubBase {
-  constructor (transport) {
-    super(transport);
-    this._api = 'parity';
-  }
-
-  newHeads (callback) {
-    return this.addListener('eth', 'newHeads', callback);
-  }
-
-  logs (callback) {
-    throw Error('not supported yet');
-  }
-
-  //  eth API
-  protocolVersion (callback) {
-    return this.addListener(this._api, 'eth_protocolVersion', callback);
-  }
-
-  syncing (callback) {
-    return this.addListener(this._api, 'eth_syncing', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outSyncing(data));
-    });
-  }
-
-  hashrate (callback) {
-    return this.addListener(this._api, 'eth_hashrate', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    });
-  }
-
-  coinbase (callback) {
-    return this.addListener(this._api, 'eth_coinbase', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outAddress(data));
-    });
-  }
-
-  mining (callback) {
-    return this.addListener(this._api, 'eth_mining', callback);
-  }
-
-  gasPrice (callback) {
-    return this.addListener(this._api, 'eth_gasPrice', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    });
-  }
-
-  accounts (callback) {
-    return this.addListener(this._api, 'eth_accounts', (error, accounts) => {
-      error
-        ? callback(error)
-        : callback(null, (accounts || []).map(outAddress));
-    });
-  }
-
-  blockNumber (callback) {
-    return this.addListener(this._api, 'eth_blockNumber', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    });
-  }
-
-  getBalance (callback, address, blockNumber = 'latest') {
-    return this.addListener(this._api, 'eth_getBalance', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    }, [inAddress(address), inBlockNumber(blockNumber)]);
-  }
-
-  getStorageAt (callback, address, index = 0, blockNumber = 'latest') {
-    return this.addListener(this._api, 'eth_getStorageAt', callback, [inAddress(address), inNumber16(index), inBlockNumber(blockNumber)]);
-  }
-
-  getBlockByHash (callback, hash, full = false) {
-    return this.addListener(this._api, 'eth_getBlockByHash', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outBlock(data));
-    }, [inHex(hash), full]);
-  }
-
-  getBlockByNumber (callback, blockNumber = 'latest', full = false) {
-    return this.addListener(this._api, 'eth_getBlockByNumber', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outBlock(data));
-    }, [inBlockNumber(blockNumber), full]);
-  }
-
-  getTransactionCount (callback, address, blockNumber = 'latest') {
-    return this.addListener(this._api, 'eth_getTransactionCount', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    }, [inAddress(address), inBlockNumber(blockNumber)]);
-  }
-
-  getBlockTransactionCountByHash (callback, hash) {
-    return this.addListener(this._api, 'eth_getBlockTransactionCountByHash', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    }, [inHex(hash)]);
-  }
-
-  getBlockTransactionCountByNumber (callback, blockNumber = 'latest') {
-    return this.addListener(this._api, 'eth_getBlockTransactionCountByNumber', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    }, [inBlockNumber(blockNumber)]);
-  }
-
-  getUncleCountByBlockHash (callback, hash) {
-    return this.addListener(this._api, 'eth_getUncleCountByBlockHash', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    }, [inHex(hash)]);
-  }
-
-  getUncleCountByBlockNumber (callback, blockNumber = 'latest') {
-    return this.addListener(this._api, 'eth_getUncleCountByBlockNumber', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    }, [inBlockNumber(blockNumber)]);
-  }
-
-  getCode (callback, address, blockNumber = 'latest') {
-    return this.addListener(this._api, 'eth_getCode', callback, [inAddress(address), inBlockNumber(blockNumber)]);
-  }
-
-  call (callback, options, blockNumber = 'latest') {
-    return this.addListener(this._api, 'eth_call', callback, [inOptions(options), inBlockNumber(blockNumber)]);
-  }
-
-  estimateGas (callback, options) {
-    return this.addListener(this._api, 'eth_estimateGas', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    }, [inOptions(options)]);
-  }
-
-  getTransactionByHash (callback, hash) {
-    return this.addListener(this._api, 'eth_getTransactionByHash', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outTransaction(data));
-    }, [inHex(hash)]);
-  }
-
-  getTransactionByBlockHashAndIndex (callback, hash, index = 0) {
-    return this.addListener(this._api, 'eth_getTransactionByBlockHashAndIndex', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outTransaction(data));
-    }, [inHex(hash), inNumber16(index)]);
-  }
-
-  getTransactionByBlockNumberAndIndex (callback, blockNumber = 'latest', index = 0) {
-    return this.addListener(this._api, 'eth_getTransactionByBlockNumberAndIndex', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outTransaction(data));
-    }, [inBlockNumber(blockNumber), inNumber16(index)]);
-  }
-
-  getTransactionReceipt (callback, txhash) {
-    return this.addListener(this._api, 'eth_getTransactionReceipt', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outReceipt(data));
-    }, [inHex(txhash)]);
-  }
-
-  getUncleByBlockHashAndIndex (callback, hash, index = 0) {
-    return this.addListener(this._api, 'eth_getUncleByBlockHashAndIndex', callback, [inHex(hash), inNumber16(index)]);
-  }
-
-  getUncleByBlockNumberAndIndex (callback, blockNumber = 'latest', index = 0) {
-    return this.addListener(this._api, 'eth_getUncleByBlockNumberAndIndex', callback, [inBlockNumber(blockNumber), inNumber16(index)]);
-  }
-
-  getLogs (callback, options) {
-    return this.addListener(this._api, 'eth_getLogs', (error, logs) => {
-      error
-        ? callback(error)
-        : callback(null, (logs) => logs.map(outLog));
-    }, [inFilter(options)]);
-  }
-
-  getWork (callback) {
-    return this.addListener(this._api, 'eth_getWork', callback);
-  }
-}
diff --git a/js/src/api/pubsub/eth/index.js b/js/src/api/pubsub/eth/index.js
deleted file mode 100644
index 3b8d1994c3401a1acd24fbe0a336682141bca548..0000000000000000000000000000000000000000
--- a/js/src/api/pubsub/eth/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-export default from './eth';
diff --git a/js/src/api/pubsub/index.js b/js/src/api/pubsub/index.js
deleted file mode 100644
index bf342e1de95317686b7b6458499e96cbcbd81e0e..0000000000000000000000000000000000000000
--- a/js/src/api/pubsub/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-export default from './pubsub';
diff --git a/js/src/api/pubsub/net/index.js b/js/src/api/pubsub/net/index.js
deleted file mode 100644
index 6d13847c5352357752b98cb9e9c0a62c24c679d5..0000000000000000000000000000000000000000
--- a/js/src/api/pubsub/net/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-export default from './net';
diff --git a/js/src/api/pubsub/net/net.js b/js/src/api/pubsub/net/net.js
deleted file mode 100644
index e1dc3c4e16e8b5f0a83340c5e2db7e7a295836eb..0000000000000000000000000000000000000000
--- a/js/src/api/pubsub/net/net.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-import PubsubBase from '../pubsubBase';
-
-import { outNumber } from '../../format/output';
-
-export default class Net extends PubsubBase {
-  constructor (transport) {
-    super(transport);
-    this._api = 'parity';
-  }
-
-  // net API
-  version (callback) {
-    return this.addListener(this._api, 'net_version', callback);
-  }
-
-  peerCount (callback) {
-    return this.addListener(this._api, 'net_peerCount', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    });
-  }
-
-  listening (callback) {
-    return this.addListener(this._api, 'net_listening', callback);
-  }
-}
diff --git a/js/src/api/pubsub/parity/index.js b/js/src/api/pubsub/parity/index.js
deleted file mode 100644
index 33ce7aa7fa412dec16c81ee75a722a841eaeb4ba..0000000000000000000000000000000000000000
--- a/js/src/api/pubsub/parity/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-export default from './parity';
diff --git a/js/src/api/pubsub/parity/parity.js b/js/src/api/pubsub/parity/parity.js
deleted file mode 100644
index bf18effa18e6ec1255be82b0b9c7a5902194f042..0000000000000000000000000000000000000000
--- a/js/src/api/pubsub/parity/parity.js
+++ /dev/null
@@ -1,355 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import PubsubBase from '../pubsubBase';
-import { inAddress, inBlockNumber, inData, inHex, inDeriveHash, inDeriveIndex } from '../../format/input';
-import { outAccountInfo, outAddress, outBlock, outChainStatus, outHistogram, outHwAccountInfo, outNodeKind, outNumber, outPeers, outTransaction, outAddresses, outRecentDapps, outVaultMeta } from '../../format/output';
-
-export default class Parity extends PubsubBase {
-  constructor (transport) {
-    super(transport);
-    this._api = 'parity';
-  }
-
-  // parity API
-  accountsInfo (callback) {
-    return this.addListener(this._api, 'parity_accountsInfo', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outAccountInfo(data));
-    });
-  }
-
-  hardwareAccountsInfo (callback) {
-    return this.addListener(this._api, 'parity_hardwareAccountsInfo', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outHwAccountInfo(data));
-    });
-  }
-
-  defaultAccount (callback) {
-    return this.addListener(this._api, 'parity_defaultAccount', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outAddress(data));
-    });
-  }
-
-  transactionsLimit (callback) {
-    return this.addListener(this._api, 'parity_transactionsLimit', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    });
-  }
-
-  extraData (callback) {
-    return this.addListener(this._api, 'parity_extraData', callback);
-  }
-
-  gasFloorTarget (callback) {
-    return this.addListener(this._api, 'parity_gasFloorTarget', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    });
-  }
-
-  gasCeilTarget (callback) {
-    return this.addListener(this._api, 'parity_gasCeilTarget', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    });
-  }
-
-  minGasPrice (callback) {
-    return this.addListener(this._api, 'parity_minGasPrice', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    });
-  }
-
-  devLogs (callback) {
-    return this.addListener(this._api, 'parity_devLogs', callback);
-  }
-
-  devLogsLevels (callback) {
-    return this.addListener(this._api, 'parity_devLogsLevels', callback);
-  }
-
-  netChain (callback) {
-    return this.addListener(this._api, 'parity_netChain', callback);
-  }
-
-  netPeers (callback) {
-    return this.addListener(this._api, 'parity_netPeers', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outPeers(data));
-    });
-  }
-
-  netPort (callback) {
-    return this.addListener(this._api, 'parity_netPort', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    });
-  }
-
-  rpcSettings (callback) {
-    return this.addListener(this._api, 'parity_rpcSettings', callback);
-  }
-
-  nodeName (callback) {
-    return this.addListener(this._api, 'parity_nodeName', callback);
-  }
-
-  defaultExtraData (callback) {
-    return this.addListener(this._api, 'parity_defaultExtraData', callback);
-  }
-
-  gasPriceHistogram (callback) {
-    return this.addListener(this._api, 'parity_gasPriceHistogram', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outHistogram(data));
-    });
-  }
-
-  unsignedTransactionsCount (callback) {
-    return this.addListener(this._api, 'parity_unsignedTransactionsCount', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    });
-  }
-
-  registryAddress (callback) {
-    return this.addListener(this._api, 'parity_registryAddress', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outAddress(data));
-    });
-  }
-
-  listAccounts (callback, count, offset = null, blockNumber = 'latest') {
-    return this.addListener(this._api, 'parity_listAccounts', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, (data) => (data || []).map(outAddress));
-    }, [count, inAddress(offset), inBlockNumber(blockNumber)]);
-  }
-
-  listStorageKeys (callback, address, count, hash = null, blockNumber = 'latest') {
-    return this.addListener(this._api, 'parity_listStorageKeys', callback, [inAddress(address), count, inHex(hash), inBlockNumber(blockNumber)]);
-  }
-
-  pendingTransactions (callback) {
-    return this.addListener(this._api, 'parity_pendingTransactions', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outTransaction(data));
-    });
-  }
-
-  futureTransactions (callback) {
-    return this.addListener(this._api, 'parity_futureTransactions', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outTransaction(data));
-    });
-  }
-
-  pendingTransactionsStats (callback) {
-    return this.addListener(this._api, 'parity_pendingTransactionsStats', callback);
-  }
-
-  localTransactions (callback) {
-    return this.addListener(this._api, 'parity_localTransactions', (error, transactions) => {
-      error
-        ? callback(error)
-        : callback(null, transactions => {
-          Object.values(transactions)
-            .filter(tx => tx.transaction)
-            .map(tx => {
-              tx.transaction = outTransaction(tx.transaction);
-            });
-          return transactions;
-        });
-    });
-  }
-
-  dappsUrl (callback) {
-    return this.addListener(this._api, 'parity_dappsUrl', callback);
-  }
-
-  wsUrl (callback) {
-    return this.addListener(this._api, 'parity_wsUrl', callback);
-  }
-
-  nextNonce (callback, account) {
-    return this.addListener(this._api, 'parity_nextNonce', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNumber(data));
-    }, [inAddress(account)]);
-  }
-
-  mode (callback) {
-    return this.addListener(this._api, 'parity_mode', callback);
-  }
-
-  chain (callback) {
-    return this.addListener(this._api, 'parity_chain', callback);
-  }
-
-  enode (callback) {
-    return this.addListener(this._api, 'parity_enode', callback);
-  }
-
-  consensusCapability (callback) {
-    return this.addListener(this._api, 'parity_consensusCapability', callback);
-  }
-
-  versionInfo (callback) {
-    return this.addListener(this._api, 'parity_versionInfo', callback);
-  }
-
-  releasesInfo (callback) {
-    return this.addListener(this._api, 'parity_releasesInfo', callback);
-  }
-
-  chainStatus (callback) {
-    return this.addListener(this._api, 'parity_chainStatus', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outChainStatus(data));
-    });
-  }
-
-  nodeKind (callback) {
-    return this.addListener(this._api, 'parity_nodeKind', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outNodeKind(data));
-    });
-  }
-
-  getBlockHeaderByNumber (callback, blockNumber = 'latest') {
-    return this.addListener(this._api, 'parity_getBlockHeaderByNumber', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outBlock(data));
-    }, [inBlockNumber(blockNumber)]);
-  }
-
-  cidV0 (callback, data) {
-    return this.addListener(this._api, 'parity_cidV0', callback, [inData(data)]);
-  }
-
-  // parity accounts API (only secure API or configured to be exposed)
-  allAccountsInfo (callback) {
-    return this._addListener(this._api, 'parity_allAccountsInfo', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outAccountInfo(data));
-    });
-  }
-
-  getDappAddresses (callback, dappId) {
-    return this._addListener(this._api, 'parity_getDappAddresses', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outAddresses(data));
-    }, [dappId]);
-  }
-
-  getDappDefaultAddress (callback, dappId) {
-    return this._addListener(this._api, 'parity_getDappDefaultAddress', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outAddress(data));
-    }, [dappId]);
-  }
-
-  getNewDappsAddresses (callback) {
-    return this._addListener(this._api, 'parity_getDappDefaultAddress', (error, addresses) => {
-      error
-        ? callback(error)
-        : callback(null, addresses ? addresses.map(outAddress) : null);
-    });
-  }
-
-  getNewDappsDefaultAddress (callback) {
-    return this._addListener(this._api, 'parity_getNewDappsDefaultAddress', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outAddress(data));
-    });
-  }
-
-  listRecentDapps (callback) {
-    return this._addListener(this._api, 'parity_listRecentDapps', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outRecentDapps(data));
-    });
-  }
-
-  listGethAccounts (callback) {
-    return this._addListener(this._api, 'parity_listGethAccounts', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outAddresses(data));
-    });
-  }
-
-  listVaults (callback) {
-    return this._addListener(this._api, 'parity_listVaults', callback);
-  }
-
-  listOpenedVaults (callback) {
-    return this._addListener(this._api, 'parity_listOpenedVaults', callback);
-  }
-
-  getVaultMeta (callback, vaultName) {
-    return this._addListener(this._api, 'parity_getVaultMeta', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outVaultMeta(data));
-    }, [vaultName]);
-  }
-
-  deriveAddressHash (callback, address, password, hash, shouldSave) {
-    return this._addListener(this._api, 'parity_deriveAddressHash', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outAddress(data));
-    }, [inAddress(address), password, inDeriveHash(hash), !!shouldSave]);
-  }
-
-  deriveAddressIndex (callback, address, password, index, shouldSave) {
-    return this._addListener(this._api, 'parity_deriveAddressIndex', (error, data) => {
-      error
-        ? callback(error)
-        : callback(null, outAddress(data));
-    }, [inAddress(address), password, inDeriveIndex(index), !!shouldSave]);
-  }
-}
diff --git a/js/src/api/pubsub/pubsub.js b/js/src/api/pubsub/pubsub.js
deleted file mode 100644
index edbc201ae5c3ca1e766349b449a4256dcba1d2d7..0000000000000000000000000000000000000000
--- a/js/src/api/pubsub/pubsub.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Eth from './eth';
-import Parity from './parity';
-import Net from './net';
-
-import { isFunction } from '../util/types';
-
-export default class Pubsub {
-  constructor (transport) {
-    if (!transport || !isFunction(transport.subscribe)) {
-      throw new Error('Pubsub API needs transport with subscribe() function defined. (WebSocket)');
-    }
-
-    this._eth = new Eth(transport);
-    this._net = new Net(transport);
-    this._parity = new Parity(transport);
-  }
-
-  get net () {
-    return this._net;
-  }
-
-  get eth () {
-    return this._eth;
-  }
-
-  get parity () {
-    return this._parity;
-  }
-
-  unsubscribe (subscriptionIds) {
-    // subscriptions are namespace independent. Thus we can simply removeListener from any.
-    return this._parity.removeListener(subscriptionIds);
-  }
-}
diff --git a/js/src/api/pubsub/pubsub.spec.js b/js/src/api/pubsub/pubsub.spec.js
deleted file mode 100644
index 10fcd2edb7a58c91ad5d3fd732755fda8c3dcd63..0000000000000000000000000000000000000000
--- a/js/src/api/pubsub/pubsub.spec.js
+++ /dev/null
@@ -1,613 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { TEST_WS_URL, mockWs } from '../../../test/mockRpc';
-import { isBigNumber } from '../../../test/types';
-
-import Ws from '../transport/ws';
-import Pubsub from './pubsub';
-
-describe('api/pubsub/Pubsub', () => {
-  let scope;
-  let instance;
-  const address = '0x63Cf90D3f0410092FC0fca41846f596223979195';
-
-  describe('accountsInfo', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: {
-            '0x63cf90d3f0410092fc0fca41846f596223979195': {
-              name: 'name', uuid: 'uuid', meta: '{"data":"data"}'
-            }
-          },
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('retrieves the available account info', (done) => {
-      instance.parity.accountsInfo((error, result) => {
-        expect(error).to.be.null;
-        expect(result).to.deep.equal({
-          '0x63Cf90D3f0410092FC0fca41846f596223979195': {
-            name: 'name', uuid: 'uuid', meta: {
-              data: 'data'
-            }
-          }
-        });
-        done();
-      });
-    });
-  });
-
-  describe('Unsubscribe', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2 },
-                      { method: 'parity_unsubscribe', reply: true }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('Promise gets resolved on success.', (done) => {
-      instance.parity.accountsInfo().then(s => {
-        instance.parity.unsubscribe(s).then(b => {
-          expect(b).to.be.true;
-        });
-      });
-      done();
-    });
-  });
-
-  describe('chainStatus', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: {
-            'blockGap': [0x123, 0x456]
-          },
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('retrieves the chain status', (done) => {
-      instance.parity.chainStatus((error, result) => {
-        expect(error).to.be.null;
-        expect(result).to.deep.equal({
-          'blockGap': [new BigNumber(0x123), new BigNumber(0x456)]
-        });
-        done();
-      });
-    });
-  });
-
-  describe('gasFloorTarget', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: '0x123456',
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('returns the gasfloor, formatted', (done) => {
-      instance.parity.gasFloorTarget((error, result) => {
-        expect(error).to.be.null;
-        expect(isBigNumber(result)).to.be.true;
-        expect(result.eq(0x123456)).to.be.true;
-        done();
-      });
-    });
-  });
-
-  describe('transactionsLimit', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: 1024,
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('returns the tx limit, formatted', (done) => {
-      instance.parity.transactionsLimit((error, result) => {
-        expect(error).to.be.null;
-        expect(isBigNumber(result)).to.be.true;
-        expect(result.eq(1024)).to.be.true;
-        done();
-      });
-    });
-  });
-
-  describe('minGasPrice', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: '0x123456',
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('returns the min gasprice, formatted', (done) => {
-      instance.parity.minGasPrice((error, result) => {
-        expect(error).to.be.null;
-        expect(isBigNumber(result)).to.be.true;
-        expect(result.eq(0x123456)).to.be.true;
-        done();
-      });
-    });
-  });
-
-  describe('netPeers', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: { active: 123, connected: 456, max: 789, peers: [] },
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('returns the peer structure, formatted', (done) => {
-      instance.parity.netPeers((error, peers) => {
-        expect(error).to.be.null;
-        expect(peers.active.eq(123)).to.be.true;
-        expect(peers.connected.eq(456)).to.be.true;
-        expect(peers.max.eq(789)).to.be.true;
-        done();
-      });
-    });
-  });
-
-  describe('netPort', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: 33030,
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('returns the connected port, formatted', (done) => {
-      instance.parity.netPort((error, count) => {
-        expect(error).to.be.null;
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.eq(33030)).to.be.true;
-        done();
-      });
-    });
-  });
-
-// Eth API
-  describe('accounts', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: [address.toLowerCase()],
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('returns a list of accounts, formatted', (done) => {
-      instance.eth.accounts((error, accounts) => {
-        expect(error).to.be.null;
-        expect(accounts).to.deep.equal([address]);
-        done();
-      });
-    });
-  });
-
-  describe('newHeads', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'eth_subscribe', reply: 2, subscription: {
-        method: 'eth_subscription',
-        params: {
-          result: '0x123456',
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('returns newHeads for eth_subscribe', (done) => {
-      instance.eth.newHeads((error, blockNumber) => {
-        expect(error).to.be.null;
-        expect(blockNumber).to.equal('0x123456');
-        done();
-      });
-    });
-  });
-
-  describe('blockNumber', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: '0x123456',
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('returns the current blockNumber, formatted', (done) => {
-      instance.eth.blockNumber((error, blockNumber) => {
-        expect(error).to.be.null;
-        expect(isBigNumber(blockNumber)).to.be.true;
-        expect(blockNumber.toString(16)).to.equal('123456');
-        done();
-      });
-    });
-  });
-
-  describe('call', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: [],
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('formats the input options & blockNumber', (done) => {
-      instance.eth.call((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_call', [{ data: '0x12345678' }, 'earliest']]);
-        done();
-      }, { data: '12345678' }, 'earliest');
-    });
-
-    it('provides a latest blockNumber when not specified', (done) => {
-      instance.eth.call((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_call', [{ data: '0x12345678' }, 'latest']]);
-        done();
-      }, { data: '12345678' });
-    });
-  });
-
-  describe('coinbase', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: address.toLowerCase(),
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('returns the coinbase, formatted', (done) => {
-      instance.eth.coinbase((error, account) => {
-        expect(error).to.be.null;
-        expect(account).to.deep.equal(address);
-        done();
-      });
-    });
-  });
-
-  describe('estimateGas', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: '0x123',
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('converts the options correctly', (done) => {
-      instance.eth.estimateGas((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_estimateGas', [{ gas: '0x5208' }]]);
-        done();
-      }, { gas: 21000 });
-    });
-
-    it('returns the gas used, formatted', (done) => {
-      instance.eth.estimateGas((error, gas) => {
-        expect(error).to.be.null;
-        expect(isBigNumber(gas)).to.be.true;
-        expect(gas.toString(16)).to.deep.equal('123');
-        done();
-      });
-    });
-  });
-
-  describe('gasPrice', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: '0x123',
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('returns the gas price, formatted', (done) => {
-      instance.eth.gasPrice((error, price) => {
-        expect(error).to.be.null;
-        expect(isBigNumber(price)).to.be.true;
-        expect(price.toString(16)).to.deep.equal('123');
-        done();
-      });
-    });
-  });
-
-  describe('getBalance', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: '0x123',
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('passes in the address (default blockNumber)', (done) => {
-      instance.eth.getBalance((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_getBalance', [address.toLowerCase(), 'latest']]);
-        done();
-      }, address);
-    });
-
-    it('passes in the address & blockNumber', (done) => {
-      instance.eth.getBalance((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_getBalance', [address.toLowerCase(), '0x456']]);
-        done();
-      }, address, 0x456);
-    });
-
-    it('returns the balance', (done) => {
-      instance.eth.getBalance((error, balance) => {
-        expect(error).to.be.null;
-        expect(isBigNumber(balance)).to.be.true;
-        expect(balance.toString(16)).to.deep.equal('123');
-        done();
-      }, address);
-    });
-  });
-
-  describe('getBlockByHash', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: { miner: address.toLowerCase() },
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('formats the input hash as a hash, default full', (done) => {
-      instance.eth.getBlockByHash((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_getBlockByHash', ['0x1234', false]]);
-        done();
-      }, '1234');
-    });
-
-    it('formats the input hash as a hash, full true', (done) => {
-      instance.eth.getBlockByHash((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_getBlockByHash', ['0x1234', true]]);
-        done();
-      }, '1234', true);
-    });
-
-    it('formats the output into block', (done) => {
-      instance.eth.getBlockByHash((error, block) => {
-        expect(error).to.be.null;
-        expect(block.miner).to.equal(address);
-        done();
-      }, '1234');
-    });
-  });
-
-  describe('getBlockByNumber', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: { miner: address.toLowerCase() },
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('assumes blockNumber latest & full false', (done) => {
-      instance.eth.getBlockByNumber((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_getBlockByNumber', ['latest', false]]);
-        done();
-      });
-    });
-
-    it('uses input blockNumber & full false', (done) => {
-      instance.eth.getBlockByNumber((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_getBlockByNumber', ['0x1234', false]]);
-        done();
-      }, '0x1234');
-    });
-
-    it('formats the input blockNumber, full true', (done) => {
-      instance.eth.getBlockByNumber((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_getBlockByNumber', ['0x1234', true]]);
-        done();
-      }, 0x1234, true);
-    });
-
-    it('formats the output into block', (done) => {
-      instance.eth.getBlockByNumber((error, block) => {
-        expect(error).to.be.null;
-        expect(block.miner).to.equal(address);
-        done();
-      }, 0x1234);
-    });
-  });
-
-  describe('getTransactionCount', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'parity_subscribe', reply: 2, subscription: {
-        method: 'parity_subscription',
-        params: {
-          result: '0x123',
-          subscription: 2
-        }
-      } }]);
-      instance = new Pubsub(new Ws(TEST_WS_URL));
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('passes in the address (default blockNumber)', (done) => {
-      instance.eth.getTransactionCount((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_getTransactionCount', [address.toLowerCase(), 'latest']]);
-        done();
-      }, address);
-    });
-
-    it('passes in the address & blockNumber', (done) => {
-      instance.eth.getTransactionCount((error) => {
-        expect(error).to.be.null;
-        expect(scope.body.parity_subscribe.params).to.deep.equal(['eth_getTransactionCount', [address.toLowerCase(), '0x456']]);
-        done();
-      }, address, 0x456);
-    });
-
-    it('returns the count, formatted', (done) => {
-      instance.eth.getTransactionCount((error, count) => {
-        expect(error).to.be.null;
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.toString(16)).to.equal('123');
-        done();
-      }, address, 0x456);
-    });
-  });
-});
diff --git a/js/src/api/pubsub/pubsubBase.js b/js/src/api/pubsub/pubsubBase.js
deleted file mode 100644
index fcc7525d5b8d5451c797319bc823b1671ff6cd5f..0000000000000000000000000000000000000000
--- a/js/src/api/pubsub/pubsubBase.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default class PubsubBase {
-  // Provider for websocket pubsub transport
-  constructor (transport) {
-    this._transport = transport;
-  }
-
-  addListener (module, eventName, callback, eventParams) {
-    return eventParams
-     ? this._transport.subscribe(module, callback, eventName, eventParams)
-     : this._transport.subscribe(module, callback, eventName, []);
-    // this._transport.subscribe(module, callback, eventName);  After Patch from tomac is merged to master! =>  eth_subscribe does not support empty array as params
-  }
-
-  removeListener (subscriptionIds) {
-    return this._transport.unsubscribe(subscriptionIds);
-  }
-
-  unsubscribe (subscriptionIds) {
-    return this.removeListener(subscriptionIds);
-  }
-}
diff --git a/js/src/api/rpc/db/db.js b/js/src/api/rpc/db/db.js
deleted file mode 100644
index c87911b8d76ab6484f6048bdd0d43682bfead41f..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/db/db.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { inHex } from '../../format/input';
-
-export default class Db {
-  constructor (transport) {
-    this._transport = transport;
-  }
-
-  getHex (dbName, keyName) {
-    return this._transport
-      .execute('db_getHex', dbName, keyName);
-  }
-
-  getString (dbName, keyName) {
-    return this._transport
-      .execute('db_getString', dbName, keyName);
-  }
-
-  putHex (dbName, keyName, hexData) {
-    return this._transport
-      .execute('db_putHex', dbName, keyName, inHex(hexData));
-  }
-
-  putString (dbName, keyName, stringData) {
-    return this._transport
-      .execute('db_putString', dbName, keyName, stringData);
-  }
-}
diff --git a/js/src/api/rpc/db/db.spec.js b/js/src/api/rpc/db/db.spec.js
deleted file mode 100644
index 94256931b97e1e338a14562770bba79548ce717e..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/db/db.spec.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
-
-import Http from '../../transport/http';
-import Db from './db';
-
-const instance = new Db(new Http(TEST_HTTP_URL, -1));
-
-describe('api/rpc/Db', () => {
-  let scope;
-
-  describe('putHex', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'db_putHex', reply: { result: [] } }]);
-    });
-
-    it('formats the inputs correctly', () => {
-      return instance.putHex('db', 'key', '1234').then(() => {
-        expect(scope.body.db_putHex.params).to.deep.equal(['db', 'key', '0x1234']);
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/db/index.js b/js/src/api/rpc/db/index.js
deleted file mode 100644
index 0dc25441b61df7d795517891723c5ee987095590..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/db/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './db';
diff --git a/js/src/api/rpc/eth/eth.e2e.js b/js/src/api/rpc/eth/eth.e2e.js
deleted file mode 100644
index 1c8d95a0b9701566b8a27827a07744f19b9c4f43..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/eth/eth.e2e.js
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createHttpApi } from '../../../../test/e2e/ethapi';
-import { isAddress } from '../../../../test/types';
-
-describe('ethapi.eth', () => {
-  const ethapi = createHttpApi();
-  const address = '0x63cf90d3f0410092fc0fca41846f596223979195';
-
-  let latestBlockNumber;
-  let latestBlockHash;
-
-  describe('accounts', () => {
-    it('returns the available accounts', () => {
-      return ethapi.eth.accounts().then((accounts) => {
-        accounts.forEach((account) => {
-          expect(isAddress(account)).to.be.true;
-        });
-      });
-    });
-  });
-
-  describe('blockNumber', () => {
-    it('returns the current blockNumber', () => {
-      return ethapi.eth.blockNumber().then((blockNumber) => {
-        latestBlockNumber = blockNumber;
-        expect(blockNumber.gt(0xabcde)).to.be.true;
-      });
-    });
-  });
-
-  describe('coinbase', () => {
-    it('returns the coinbase', () => {
-      return ethapi.eth.coinbase().then((coinbase) => {
-        expect(isAddress(coinbase)).to.be.true;
-      });
-    });
-  });
-
-  describe('gasPrice', () => {
-    it('returns the current gasPrice', () => {
-      return ethapi.eth.gasPrice().then((gasPrice) => {
-        expect(gasPrice.gt(0)).to.be.true;
-      });
-    });
-  });
-
-  describe('getBalance', () => {
-    it('returns the balance for latest block', () => {
-      return ethapi.eth.getBalance(address).then((balance) => {
-        expect(balance.gt(0)).to.be.true;
-      });
-    });
-
-    it('returns the balance for a very early block', () => {
-      const atBlock = '0x65432';
-      const atValue = '18e07120a6e164fee1b';
-
-      return ethapi.eth
-        .getBalance(address, atBlock)
-        .then((balance) => {
-          expect(balance.toString(16)).to.equal(atValue);
-        })
-        .catch((error) => {
-          // Parity doesn't support pruned-before-block balance lookups
-          expect(error.message).to.match(/not supported/);
-        });
-    });
-
-    it('returns the balance for a recent/out-of-pruning-range block', () => {
-      return ethapi.eth
-        .getBalance(address, latestBlockNumber.minus(1000))
-        .then((balance) => {
-          expect(balance.gt(0)).to.be.true;
-        });
-    });
-  });
-
-  describe('getBlockByNumber', () => {
-    it('returns the latest block', () => {
-      return ethapi.eth.getBlockByNumber().then((block) => {
-        expect(block).to.be.ok;
-      });
-    });
-
-    it('returns a block by blockNumber', () => {
-      return ethapi.eth.getBlockByNumber(latestBlockNumber).then((block) => {
-        latestBlockHash = block.hash;
-        expect(block).to.be.ok;
-      });
-    });
-
-    it('returns a block by blockNumber (full)', () => {
-      return ethapi.eth.getBlockByNumber(latestBlockNumber, true).then((block) => {
-        expect(block).to.be.ok;
-      });
-    });
-  });
-
-  describe('getBlockByHash', () => {
-    it('returns the specified block', () => {
-      return ethapi.eth.getBlockByHash(latestBlockHash).then((block) => {
-        expect(block).to.be.ok;
-        expect(block.hash).to.equal(latestBlockHash);
-      });
-    });
-
-    it('returns the specified block (full)', () => {
-      return ethapi.eth.getBlockByHash(latestBlockHash, true).then((block) => {
-        expect(block).to.be.ok;
-        expect(block.hash).to.equal(latestBlockHash);
-      });
-    });
-  });
-
-  describe('getBlockTransactionCountByHash', () => {
-    it('returns the transactions of the specified hash', () => {
-      return ethapi.eth.getBlockTransactionCountByHash(latestBlockHash).then((count) => {
-        expect(count).to.be.ok;
-        expect(count.gte(0)).to.be.true;
-      });
-    });
-  });
-
-  describe('getBlockTransactionCountByNumber', () => {
-    it('returns the transactions of latest', () => {
-      return ethapi.eth.getBlockTransactionCountByNumber().then((count) => {
-        expect(count).to.be.ok;
-        expect(count.gte(0)).to.be.true;
-      });
-    });
-
-    it('returns the transactions of a specified number', () => {
-      return ethapi.eth.getBlockTransactionCountByNumber(latestBlockNumber).then((count) => {
-        expect(count).to.be.ok;
-        expect(count.gte(0)).to.be.true;
-      });
-    });
-  });
-
-  describe('getTransactionCount', () => {
-    it('returns the count for an address', () => {
-      return ethapi.eth.getTransactionCount(address).then((count) => {
-        expect(count).to.be.ok;
-        expect(count.gte(0x1000c2)).to.be.ok;
-      });
-    });
-
-    it('returns the count for an address at specified blockNumber', () => {
-      return ethapi.eth.getTransactionCount(address, latestBlockNumber).then((count) => {
-        expect(count).to.be.ok;
-        expect(count.gte(0x1000c2)).to.be.ok;
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/eth/eth.js b/js/src/api/rpc/eth/eth.js
deleted file mode 100644
index ffde938ea954ca5fe8d1182ae4d4bcad0a424d26..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/eth/eth.js
+++ /dev/null
@@ -1,321 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { inAddress, inBlockNumber, inData, inFilter, inHash, inHex, inNumber16, inOptions } from '../../format/input';
-import { outAddress, outBlock, outLog, outNumber, outReceipt, outSyncing, outTransaction } from '../../format/output';
-
-export default class Eth {
-  constructor (transport) {
-    this._transport = transport;
-  }
-
-  accounts () {
-    return this._transport
-      .execute('eth_accounts')
-      .then((accounts) => (accounts || []).map(outAddress));
-  }
-
-  blockNumber () {
-    return this._transport
-      .execute('eth_blockNumber')
-      .then(outNumber);
-  }
-
-  call (options, blockNumber = 'latest') {
-    return this._transport
-      .execute('eth_call', inOptions(options), inBlockNumber(blockNumber));
-  }
-
-  coinbase () {
-    return this._transport
-      .execute('eth_coinbase')
-      .then(outAddress);
-  }
-
-  compileLLL (code) {
-    return this._transport
-      .execute('eth_compileLLL', inData(code));
-  }
-
-  compileSerpent (code) {
-    return this._transport
-      .execute('eth_compileSerpent', inData(code));
-  }
-
-  compileSolidity (code) {
-    return this._transport
-      .execute('eth_compileSolidity', inData(code));
-  }
-
-  estimateGas (options) {
-    return this._transport
-      .execute('eth_estimateGas', inOptions(options))
-      .then(outNumber);
-  }
-
-  fetchQueuedTransactions () {
-    return this._transport
-      .execute('eth_fetchQueuedTransactions');
-  }
-
-  flush () {
-    return this._transport
-      .execute('eth_flush');
-  }
-
-  gasPrice () {
-    return this._transport
-      .execute('eth_gasPrice')
-      .then(outNumber);
-  }
-
-  getBalance (address, blockNumber = 'latest') {
-    return this._transport
-      .execute('eth_getBalance', inAddress(address), inBlockNumber(blockNumber))
-      .then(outNumber);
-  }
-
-  getBlockByHash (hash, full = false) {
-    return this._transport
-      .execute('eth_getBlockByHash', inHex(hash), full)
-      .then(outBlock);
-  }
-
-  getBlockByNumber (blockNumber = 'latest', full = false) {
-    return this._transport
-      .execute('eth_getBlockByNumber', inBlockNumber(blockNumber), full)
-      .then(outBlock);
-  }
-
-  getBlockTransactionCountByHash (hash) {
-    return this._transport
-      .execute('eth_getBlockTransactionCountByHash', inHex(hash))
-      .then(outNumber);
-  }
-
-  getBlockTransactionCountByNumber (blockNumber = 'latest') {
-    return this._transport
-      .execute('eth_getBlockTransactionCountByNumber', inBlockNumber(blockNumber))
-      .then(outNumber);
-  }
-
-  getCode (address, blockNumber = 'latest') {
-    return this._transport
-      .execute('eth_getCode', inAddress(address), inBlockNumber(blockNumber));
-  }
-
-  getCompilers () {
-    return this._transport
-      .execute('eth_getCompilers');
-  }
-
-  getFilterChanges (filterId) {
-    return this._transport
-      .execute('eth_getFilterChanges', inNumber16(filterId))
-      .then((logs) => logs.map(outLog));
-  }
-
-  getFilterChangesEx (filterId) {
-    return this._transport
-      .execute('eth_getFilterChangesEx', inNumber16(filterId));
-  }
-
-  getFilterLogs (filterId) {
-    return this._transport
-      .execute('eth_getFilterLogs', inNumber16(filterId))
-      .then((logs) => logs.map(outLog));
-  }
-
-  getFilterLogsEx (filterId) {
-    return this._transport
-      .execute('eth_getFilterLogsEx', inNumber16(filterId));
-  }
-
-  getLogs (options) {
-    return this._transport
-      .execute('eth_getLogs', inFilter(options))
-      .then((logs) => logs.map(outLog));
-  }
-
-  getLogsEx (options) {
-    return this._transport
-      .execute('eth_getLogsEx', inFilter(options));
-  }
-
-  getStorageAt (address, index = 0, blockNumber = 'latest') {
-    return this._transport
-      .execute('eth_getStorageAt', inAddress(address), inNumber16(index), inBlockNumber(blockNumber));
-  }
-
-  getTransactionByBlockHashAndIndex (hash, index = 0) {
-    return this._transport
-      .execute('eth_getTransactionByBlockHashAndIndex', inHex(hash), inNumber16(index))
-      .then(outTransaction);
-  }
-
-  getTransactionByBlockNumberAndIndex (blockNumber = 'latest', index = 0) {
-    return this._transport
-      .execute('eth_getTransactionByBlockNumberAndIndex', inBlockNumber(blockNumber), inNumber16(index))
-      .then(outTransaction);
-  }
-
-  getTransactionByHash (hash) {
-    return this._transport
-      .execute('eth_getTransactionByHash', inHex(hash))
-      .then(outTransaction);
-  }
-
-  getTransactionCount (address, blockNumber = 'latest') {
-    return this._transport
-      .execute('eth_getTransactionCount', inAddress(address), inBlockNumber(blockNumber))
-      .then(outNumber);
-  }
-
-  getTransactionReceipt (txhash) {
-    return this._transport
-      .execute('eth_getTransactionReceipt', inHex(txhash))
-      .then(outReceipt);
-  }
-
-  getUncleByBlockHashAndIndex (hash, index = 0) {
-    return this._transport
-      .execute('eth_getUncleByBlockHashAndIndex', inHex(hash), inNumber16(index));
-  }
-
-  getUncleByBlockNumberAndIndex (blockNumber = 'latest', index = 0) {
-    return this._transport
-      .execute('eth_getUncleByBlockNumberAndIndex', inBlockNumber(blockNumber), inNumber16(index));
-  }
-
-  getUncleCountByBlockHash (hash) {
-    return this._transport
-      .execute('eth_getUncleCountByBlockHash', inHex(hash))
-      .then(outNumber);
-  }
-
-  getUncleCountByBlockNumber (blockNumber = 'latest') {
-    return this._transport
-      .execute('eth_getUncleCountByBlockNumber', inBlockNumber(blockNumber))
-      .then(outNumber);
-  }
-
-  getWork () {
-    return this._transport
-      .execute('eth_getWork');
-  }
-
-  hashrate () {
-    return this._transport
-      .execute('eth_hashrate')
-      .then(outNumber);
-  }
-
-  inspectTransaction () {
-    return this._transport
-      .execute('eth_inspectTransaction');
-  }
-
-  mining () {
-    return this._transport
-      .execute('eth_mining');
-  }
-
-  newBlockFilter () {
-    return this._transport
-      .execute('eth_newBlockFilter');
-  }
-
-  newFilter (options) {
-    return this._transport
-      .execute('eth_newFilter', inFilter(options));
-  }
-
-  newFilterEx (options) {
-    return this._transport
-      .execute('eth_newFilterEx', inFilter(options));
-  }
-
-  newPendingTransactionFilter () {
-    return this._transport
-      .execute('eth_newPendingTransactionFilter');
-  }
-
-  notePassword () {
-    return this._transport
-      .execute('eth_notePassword');
-  }
-
-  pendingTransactions () {
-    return this._transport
-      .execute('eth_pendingTransactions');
-  }
-
-  protocolVersion () {
-    return this._transport
-      .execute('eth_protocolVersion');
-  }
-
-  register () {
-    return this._transport
-      .execute('eth_register');
-  }
-
-  sendRawTransaction (data) {
-    return this._transport
-      .execute('eth_sendRawTransaction', inData(data));
-  }
-
-  sendTransaction (options) {
-    return this._transport
-      .execute('eth_sendTransaction', inOptions(options));
-  }
-
-  sign (address, hash) {
-    return this._transport
-      .execute('eth_sign', inAddress(address), inHash(hash));
-  }
-
-  signTransaction (options) {
-    return this._transport
-      .execute('eth_signTransaction', inOptions(options));
-  }
-
-  submitHashrate (hashrate, clientId) {
-    return this._transport
-      .execute('eth_submitHashrate', inNumber16(hashrate), clientId);
-  }
-
-  submitWork (nonce, powHash, mixDigest) {
-    return this._transport
-      .execute('eth_submitWork', inNumber16(nonce), powHash, mixDigest);
-  }
-
-  syncing () {
-    return this._transport
-      .execute('eth_syncing')
-      .then(outSyncing);
-  }
-
-  uninstallFilter (filterId) {
-    return this._transport
-      .execute('eth_uninstallFilter', inHex(filterId));
-  }
-
-  unregister () {
-    return this._transport
-      .execute('eth_unregister');
-  }
-}
diff --git a/js/src/api/rpc/eth/eth.spec.js b/js/src/api/rpc/eth/eth.spec.js
deleted file mode 100644
index 2738fd2dea73e9e57d0635bbd5c8dabd54130fe2..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/eth/eth.spec.js
+++ /dev/null
@@ -1,474 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
-import { isBigNumber } from '../../../../test/types';
-
-import Http from '../../transport/http';
-import Eth from './eth';
-
-const instance = new Eth(new Http(TEST_HTTP_URL, -1));
-
-describe('rpc/Eth', () => {
-  const address = '0x63Cf90D3f0410092FC0fca41846f596223979195';
-  let scope;
-
-  describe('accounts', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_accounts', reply: { result: [address.toLowerCase()] } }]);
-    });
-
-    it('returns a list of accounts, formatted', () => {
-      return instance.accounts().then((accounts) => {
-        expect(accounts).to.deep.equal([address]);
-      });
-    });
-  });
-
-  describe('blockNumber', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_blockNumber', reply: { result: '0x123456' } }]);
-    });
-
-    it('returns the current blockNumber, formatted', () => {
-      return instance.blockNumber().then((blockNumber) => {
-        expect(isBigNumber(blockNumber)).to.be.true;
-        expect(blockNumber.toString(16)).to.equal('123456');
-      });
-    });
-  });
-
-  describe('call', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_call', reply: { result: [] } }]);
-    });
-
-    it('formats the input options & blockNumber', () => {
-      return instance.call({ data: '12345678' }, 'earliest').then(() => {
-        expect(scope.body.eth_call.params).to.deep.equal([{ data: '0x12345678' }, 'earliest']);
-      });
-    });
-
-    it('provides a latest blockNumber when not specified', () => {
-      return instance.call({ data: '12345678' }).then(() => {
-        expect(scope.body.eth_call.params).to.deep.equal([{ data: '0x12345678' }, 'latest']);
-      });
-    });
-  });
-
-  describe('coinbase', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_coinbase', reply: { result: address.toLowerCase() } }]);
-    });
-
-    it('returns the coinbase, formatted', () => {
-      return instance.coinbase().then((account) => {
-        expect(account).to.deep.equal(address);
-      });
-    });
-  });
-
-  ['LLL', 'Serpent', 'Solidity'].forEach((type) => {
-    const method = `compile${type}`;
-
-    describe(method, () => {
-      beforeEach(() => {
-        scope = mockHttp([{ method: `eth_${method}`, reply: { result: '0x123' } }]);
-      });
-
-      it('formats the input as data, returns the output', () => {
-        return instance[method]('0xabcdef').then((result) => {
-          expect(scope.body[`eth_${method}`].params).to.deep.equal(['0xabcdef']);
-          expect(result).to.equal('0x123');
-        });
-      });
-    });
-  });
-
-  describe('estimateGas', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_estimateGas', reply: { result: '0x123' } }]);
-    });
-
-    it('converts the options correctly', () => {
-      return instance.estimateGas({ gas: 21000 }).then(() => {
-        expect(scope.body.eth_estimateGas.params).to.deep.equal([{ gas: '0x5208' }]);
-      });
-    });
-
-    it('returns the gas used', () => {
-      return instance.estimateGas({}).then((gas) => {
-        expect(isBigNumber(gas)).to.be.true;
-        expect(gas.toString(16)).to.deep.equal('123');
-      });
-    });
-  });
-
-  describe('gasPrice', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_gasPrice', reply: { result: '0x123' } }]);
-    });
-
-    it('returns the fomratted price', () => {
-      return instance.gasPrice().then((price) => {
-        expect(isBigNumber(price)).to.be.true;
-        expect(price.toString(16)).to.deep.equal('123');
-      });
-    });
-  });
-
-  describe('getBalance', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getBalance', reply: { result: '0x123' } }]);
-    });
-
-    it('passes in the address (default blockNumber)', () => {
-      return instance.getBalance(address).then(() => {
-        expect(scope.body.eth_getBalance.params).to.deep.equal([address.toLowerCase(), 'latest']);
-      });
-    });
-
-    it('passes in the address & blockNumber', () => {
-      return instance.getBalance(address, 0x456).then(() => {
-        expect(scope.body.eth_getBalance.params).to.deep.equal([address.toLowerCase(), '0x456']);
-      });
-    });
-
-    it('returns the balance', () => {
-      return instance.getBalance(address, 0x123).then((balance) => {
-        expect(isBigNumber(balance)).to.be.true;
-        expect(balance.toString(16)).to.deep.equal('123');
-      });
-    });
-  });
-
-  describe('getBlockByHash', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getBlockByHash', reply: { result: { miner: address.toLowerCase() } } }]);
-    });
-
-    it('formats the input hash as a hash, default full', () => {
-      return instance.getBlockByHash('1234').then(() => {
-        expect(scope.body.eth_getBlockByHash.params).to.deep.equal(['0x1234', false]);
-      });
-    });
-
-    it('formats the input hash as a hash, full true', () => {
-      return instance.getBlockByHash('1234', true).then(() => {
-        expect(scope.body.eth_getBlockByHash.params).to.deep.equal(['0x1234', true]);
-      });
-    });
-
-    it('formats the output into block', () => {
-      return instance.getBlockByHash('1234').then((block) => {
-        expect(block.miner).to.equal(address);
-      });
-    });
-  });
-
-  describe('getBlockByNumber', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getBlockByNumber', reply: { result: { miner: address.toLowerCase() } } }]);
-    });
-
-    it('assumes blockNumber latest & full false', () => {
-      return instance.getBlockByNumber().then(() => {
-        expect(scope.body.eth_getBlockByNumber.params).to.deep.equal(['latest', false]);
-      });
-    });
-
-    it('uses input blockNumber & full false', () => {
-      return instance.getBlockByNumber('0x1234').then(() => {
-        expect(scope.body.eth_getBlockByNumber.params).to.deep.equal(['0x1234', false]);
-      });
-    });
-
-    it('formats the input blockNumber, full true', () => {
-      return instance.getBlockByNumber(0x1234, true).then(() => {
-        expect(scope.body.eth_getBlockByNumber.params).to.deep.equal(['0x1234', true]);
-      });
-    });
-
-    it('formats the output into block', () => {
-      return instance.getBlockByNumber(0x1234).then((block) => {
-        expect(block.miner).to.equal(address);
-      });
-    });
-  });
-
-  describe('getBlockTransactionCountByHash', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getBlockTransactionCountByHash', reply: { result: '0x123' } }]);
-    });
-
-    it('formats input hash properly', () => {
-      return instance.getBlockTransactionCountByHash('abcdef').then(() => {
-        expect(scope.body.eth_getBlockTransactionCountByHash.params).to.deep.equal(['0xabcdef']);
-      });
-    });
-
-    it('formats the output number', () => {
-      return instance.getBlockTransactionCountByHash('0x1234').then((count) => {
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.toString(16)).to.equal('123');
-      });
-    });
-  });
-
-  describe('getBlockTransactionCountByNumber', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getBlockTransactionCountByNumber', reply: { result: '0x123' } }]);
-    });
-
-    it('specified blockNumber latest when none specified', () => {
-      return instance.getBlockTransactionCountByNumber().then(() => {
-        expect(scope.body.eth_getBlockTransactionCountByNumber.params).to.deep.equal(['latest']);
-      });
-    });
-
-    it('formats input blockNumber properly', () => {
-      return instance.getBlockTransactionCountByNumber(0xabcdef).then(() => {
-        expect(scope.body.eth_getBlockTransactionCountByNumber.params).to.deep.equal(['0xabcdef']);
-      });
-    });
-
-    it('formats the output number', () => {
-      return instance.getBlockTransactionCountByNumber('0x1234').then((count) => {
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.toString(16)).to.equal('123');
-      });
-    });
-  });
-
-  describe('getCode', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getCode', reply: { result: '0x1234567890' } }]);
-    });
-
-    it('passes in the address (default blockNumber)', () => {
-      return instance.getCode(address).then(() => {
-        expect(scope.body.eth_getCode.params).to.deep.equal([address.toLowerCase(), 'latest']);
-      });
-    });
-
-    it('passes in the address & blockNumber', () => {
-      return instance.getCode(address, 0x456).then(() => {
-        expect(scope.body.eth_getCode.params).to.deep.equal([address.toLowerCase(), '0x456']);
-      });
-    });
-
-    it('returns the code', () => {
-      return instance.getCode(address, 0x123).then((code) => {
-        expect(code).to.equal('0x1234567890');
-      });
-    });
-  });
-
-  describe('getStorageAt', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getStorageAt', reply: { result: '0x1234567890' } }]);
-    });
-
-    it('passes in the address (default index& blockNumber)', () => {
-      return instance.getStorageAt(address).then(() => {
-        expect(scope.body.eth_getStorageAt.params).to.deep.equal([address.toLowerCase(), '0x0', 'latest']);
-      });
-    });
-
-    it('passes in the address, index & blockNumber', () => {
-      return instance.getStorageAt(address, 15, 0x456).then(() => {
-        expect(scope.body.eth_getStorageAt.params).to.deep.equal([address.toLowerCase(), '0xf', '0x456']);
-      });
-    });
-
-    it('returns the storage', () => {
-      return instance.getStorageAt(address, 0x123).then((storage) => {
-        expect(storage).to.equal('0x1234567890');
-      });
-    });
-  });
-
-  describe('getTransactionByBlockHashAndIndex', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getTransactionByBlockHashAndIndex', reply: { result: { to: address.toLowerCase() } } }]);
-    });
-
-    it('passes in the hash (default index)', () => {
-      return instance.getTransactionByBlockHashAndIndex('12345').then(() => {
-        expect(scope.body.eth_getTransactionByBlockHashAndIndex.params).to.deep.equal(['0x12345', '0x0']);
-      });
-    });
-
-    it('passes in the hash & specified index', () => {
-      return instance.getTransactionByBlockHashAndIndex('6789', 0x456).then(() => {
-        expect(scope.body.eth_getTransactionByBlockHashAndIndex.params).to.deep.equal(['0x6789', '0x456']);
-      });
-    });
-
-    it('returns the formatted transaction', () => {
-      return instance.getTransactionByBlockHashAndIndex('6789', 0x123).then((tx) => {
-        expect(tx).to.deep.equal({ to: address });
-      });
-    });
-  });
-
-  describe('getTransactionByBlockNumberAndIndex', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getTransactionByBlockNumberAndIndex', reply: { result: { to: address.toLowerCase() } } }]);
-    });
-
-    it('passes in the default parameters', () => {
-      return instance.getTransactionByBlockNumberAndIndex().then(() => {
-        expect(scope.body.eth_getTransactionByBlockNumberAndIndex.params).to.deep.equal(['latest', '0x0']);
-      });
-    });
-
-    it('passes in the blockNumber & specified index', () => {
-      return instance.getTransactionByBlockNumberAndIndex('0x6789', 0x456).then(() => {
-        expect(scope.body.eth_getTransactionByBlockNumberAndIndex.params).to.deep.equal(['0x6789', '0x456']);
-      });
-    });
-
-    it('returns the formatted transaction', () => {
-      return instance.getTransactionByBlockNumberAndIndex('0x6789', 0x123).then((tx) => {
-        expect(tx).to.deep.equal({ to: address });
-      });
-    });
-  });
-
-  describe('getTransactionByHash', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getTransactionByHash', reply: { result: { to: address.toLowerCase() } } }]);
-    });
-
-    it('passes in the hash', () => {
-      return instance.getTransactionByHash('12345').then(() => {
-        expect(scope.body.eth_getTransactionByHash.params).to.deep.equal(['0x12345']);
-      });
-    });
-
-    it('returns the formatted transaction', () => {
-      return instance.getTransactionByHash('6789').then((tx) => {
-        expect(tx).to.deep.equal({ to: address });
-      });
-    });
-  });
-
-  describe('getTransactionCount', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getTransactionCount', reply: { result: '0x123' } }]);
-    });
-
-    it('passes in the address (default blockNumber)', () => {
-      return instance.getTransactionCount(address).then(() => {
-        expect(scope.body.eth_getTransactionCount.params).to.deep.equal([address.toLowerCase(), 'latest']);
-      });
-    });
-
-    it('passes in the address & blockNumber', () => {
-      return instance.getTransactionCount(address, 0x456).then(() => {
-        expect(scope.body.eth_getTransactionCount.params).to.deep.equal([address.toLowerCase(), '0x456']);
-      });
-    });
-
-    it('returns the count, formatted', () => {
-      return instance.getTransactionCount(address, 0x123).then((count) => {
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.toString(16)).to.equal('123');
-      });
-    });
-  });
-
-  describe('getUncleByBlockHashAndIndex', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getUncleByBlockHashAndIndex', reply: { result: [] } }]);
-    });
-
-    it('passes in the hash (default index)', () => {
-      return instance.getUncleByBlockHashAndIndex('12345').then(() => {
-        expect(scope.body.eth_getUncleByBlockHashAndIndex.params).to.deep.equal(['0x12345', '0x0']);
-      });
-    });
-
-    it('passes in the hash & specified index', () => {
-      return instance.getUncleByBlockHashAndIndex('6789', 0x456).then(() => {
-        expect(scope.body.eth_getUncleByBlockHashAndIndex.params).to.deep.equal(['0x6789', '0x456']);
-      });
-    });
-  });
-
-  describe('getUncleByBlockNumberAndIndex', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getUncleByBlockNumberAndIndex', reply: { result: [] } }]);
-    });
-
-    it('passes in the default parameters', () => {
-      return instance.getUncleByBlockNumberAndIndex().then(() => {
-        expect(scope.body.eth_getUncleByBlockNumberAndIndex.params).to.deep.equal(['latest', '0x0']);
-      });
-    });
-
-    it('passes in the blockNumber & specified index', () => {
-      return instance.getUncleByBlockNumberAndIndex('0x6789', 0x456).then(() => {
-        expect(scope.body.eth_getUncleByBlockNumberAndIndex.params).to.deep.equal(['0x6789', '0x456']);
-      });
-    });
-  });
-
-  describe('getUncleCountByBlockHash', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getUncleCountByBlockHash', reply: { result: '0x123' } }]);
-    });
-
-    it('passes in the hash', () => {
-      return instance.getUncleCountByBlockHash('12345').then(() => {
-        expect(scope.body.eth_getUncleCountByBlockHash.params).to.deep.equal(['0x12345']);
-      });
-    });
-
-    it('formats the output number', () => {
-      return instance.getUncleCountByBlockHash('0x1234').then((count) => {
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.toString(16)).to.equal('123');
-      });
-    });
-  });
-
-  describe('getUncleCountByBlockNumber', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_getUncleCountByBlockNumber', reply: { result: '0x123' } }]);
-    });
-
-    it('passes in the default parameters', () => {
-      return instance.getUncleCountByBlockNumber().then(() => {
-        expect(scope.body.eth_getUncleCountByBlockNumber.params).to.deep.equal(['latest']);
-      });
-    });
-
-    it('passes in the blockNumber', () => {
-      return instance.getUncleCountByBlockNumber('0x6789').then(() => {
-        expect(scope.body.eth_getUncleCountByBlockNumber.params).to.deep.equal(['0x6789']);
-      });
-    });
-
-    it('formats the output number', () => {
-      return instance.getUncleCountByBlockNumber('0x1234').then((count) => {
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.toString(16)).to.equal('123');
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/eth/index.js b/js/src/api/rpc/eth/index.js
deleted file mode 100644
index 25a7b3cb459cc2d1bb6d624fca666fe10fa1b889..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/eth/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './eth';
diff --git a/js/src/api/rpc/index.js b/js/src/api/rpc/index.js
deleted file mode 100644
index c8fa0032bc749a172242a8d69cab7a47032eec49..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export Db from './db';
-export Eth from './eth';
-export Parity from './parity';
-export Net from './net';
-export Personal from './personal';
-export Shh from './shh';
-export Signer from './signer';
-export Trace from './trace';
-export Web3 from './web3';
diff --git a/js/src/api/rpc/net/index.js b/js/src/api/rpc/net/index.js
deleted file mode 100644
index 457eeed79a2dd4c7aff4bcc891fc2ea8b010586f..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/net/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './net';
diff --git a/js/src/api/rpc/net/net.e2e.js b/js/src/api/rpc/net/net.e2e.js
deleted file mode 100644
index c477e2605befb9e6931f36f8dda32e6fb9bfdee2..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/net/net.e2e.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createHttpApi } from '../../../../test/e2e/ethapi';
-import { isBoolean } from '../../../../test/types';
-
-describe('ethapi.net', () => {
-  const ethapi = createHttpApi();
-
-  describe('listening', () => {
-    it('returns the listening status', () => {
-      return ethapi.net.listening().then((status) => {
-        expect(isBoolean(status)).to.be.true;
-      });
-    });
-  });
-
-  describe('peerCount', () => {
-    it('returns the peer count', () => {
-      return ethapi.net.peerCount().then((count) => {
-        expect(count.gte(0)).to.be.true;
-      });
-    });
-  });
-
-  describe('version', () => {
-    it('returns the version', () => {
-      return ethapi.net.version().then((version) => {
-        expect(version).to.be.ok;
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/net/net.js b/js/src/api/rpc/net/net.js
deleted file mode 100644
index 9b14f69d520003d8101c0e861dabdd9c2fbc5ded..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/net/net.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { outNumber } from '../../format/output';
-
-export default class Net {
-  constructor (transport) {
-    this._transport = transport;
-  }
-
-  listening () {
-    return this._transport
-      .execute('net_listening');
-  }
-
-  peerCount () {
-    return this._transport
-      .execute('net_peerCount')
-      .then(outNumber);
-  }
-
-  version () {
-    return this._transport
-      .execute('net_version');
-  }
-}
diff --git a/js/src/api/rpc/net/net.spec.js b/js/src/api/rpc/net/net.spec.js
deleted file mode 100644
index 07ad52076d9500696245a4ae430a6cc35a51b958..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/net/net.spec.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
-import { isBigNumber } from '../../../../test/types';
-
-import Http from '../../transport/http';
-import Net from './net';
-
-const instance = new Net(new Http(TEST_HTTP_URL, -1));
-
-describe('api/rpc/Net', () => {
-  describe('peerCount', () => {
-    it('returns the connected peers, formatted', () => {
-      mockHttp([{ method: 'net_peerCount', reply: { result: '0x123456' } }]);
-
-      return instance.peerCount().then((count) => {
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.eq(0x123456)).to.be.true;
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/parity/index.js b/js/src/api/rpc/parity/index.js
deleted file mode 100644
index 7fe520c606fa64436bb8b833267a26d839f943f4..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/parity/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './parity';
diff --git a/js/src/api/rpc/parity/parity.e2e.js b/js/src/api/rpc/parity/parity.e2e.js
deleted file mode 100644
index 8820d570a648e6f4eb51ad1b21c3945a62f16f9a..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/parity/parity.e2e.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createHttpApi } from '../../../../test/e2e/ethapi';
-
-describe('ethapi.parity', () => {
-  const ethapi = createHttpApi();
-
-  describe('chainStatus', () => {
-    it('returns and translates the status', () => {
-      return ethapi.parity.chainStatus().then((value) => {
-        expect(value).to.be.ok;
-      });
-    });
-  });
-
-  describe('gasFloorTarget', () => {
-    it('returns and translates the target', () => {
-      return ethapi.parity.gasFloorTarget().then((value) => {
-        expect(value.gt(0)).to.be.true;
-      });
-    });
-  });
-
-  describe('gasPriceHistogram', () => {
-    it('returns and translates the target', () => {
-      return ethapi.parity.gasPriceHistogram().then((result) => {
-        expect(Object.keys(result)).to.deep.equal(['bucketBounds', 'counts']);
-        expect(result.bucketBounds.length > 0).to.be.true;
-        expect(result.counts.length > 0).to.be.true;
-      });
-    });
-  });
-
-  describe('netChain', () => {
-    it('returns and the chain', () => {
-      return ethapi.parity.netChain().then((value) => {
-        expect(value).to.equal('morden');
-      });
-    });
-  });
-
-  describe('netPort', () => {
-    it('returns and translates the port', () => {
-      return ethapi.parity.netPort().then((value) => {
-        expect(value.gt(0)).to.be.true;
-      });
-    });
-  });
-
-  describe('transactionsLimit', () => {
-    it('returns and translates the limit', () => {
-      return ethapi.parity.transactionsLimit().then((value) => {
-        expect(value.gt(0)).to.be.true;
-      });
-    });
-  });
-
-  describe('rpcSettings', () => {
-    it('returns and translates the settings', () => {
-      return ethapi.parity.rpcSettings().then((value) => {
-        expect(value).to.be.ok;
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/parity/parity.js b/js/src/api/rpc/parity/parity.js
deleted file mode 100644
index 59ccb58845a68696bfcd8efaf5a860539eba590e..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/parity/parity.js
+++ /dev/null
@@ -1,578 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { inAddress, inAddresses, inBlockNumber, inData, inDeriveHash, inDeriveIndex, inHex, inNumber16, inOptions } from '../../format/input';
-import { outAccountInfo, outAddress, outAddresses, outBlock, outChainStatus, outHistogram, outHwAccountInfo, outNodeKind, outNumber, outPeers, outRecentDapps, outTransaction, outVaultMeta } from '../../format/output';
-
-export default class Parity {
-  constructor (transport) {
-    this._transport = transport;
-  }
-
-  acceptNonReservedPeers () {
-    return this._transport
-      .execute('parity_acceptNonReservedPeers');
-  }
-
-  accountsInfo () {
-    return this._transport
-      .execute('parity_accountsInfo')
-      .then(outAccountInfo);
-  }
-
-  allAccountsInfo () {
-    return this._transport
-      .execute('parity_allAccountsInfo')
-      .then(outAccountInfo);
-  }
-
-  addReservedPeer (enode) {
-    return this._transport
-      .execute('parity_addReservedPeer', enode);
-  }
-
-  chainStatus () {
-    return this._transport
-      .execute('parity_chainStatus')
-      .then(outChainStatus);
-  }
-
-  changePassword (account, password, newPassword) {
-    return this._transport
-      .execute('parity_changePassword', inAddress(account), password, newPassword);
-  }
-
-  changeVault (account, vaultName) {
-    return this._transport
-      .execute('parity_changeVault', inAddress(account), vaultName);
-  }
-
-  changeVaultPassword (vaultName, password) {
-    return this._transport
-      .execute('parity_changeVaultPassword', vaultName, password);
-  }
-
-  checkRequest (requestId) {
-    return this._transport
-      .execute('parity_checkRequest', inNumber16(requestId));
-  }
-
-  cidV0 (data) {
-    return this._transport
-      .execute('parity_cidV0', inData(data));
-  }
-
-  closeVault (vaultName) {
-    return this._transport
-      .execute('parity_closeVault', vaultName);
-  }
-
-  composeTransaction (options) {
-    return this._transport
-      .execute('parity_composeTransaction', inOptions(options));
-  }
-
-  consensusCapability () {
-    return this._transport
-      .execute('parity_consensusCapability');
-  }
-
-  dappsList () {
-    return this._transport
-      .execute('parity_dappsList');
-  }
-
-  dappsRefresh () {
-    return this._transport
-      .execute('parity_dappsRefresh');
-  }
-
-  dappsUrl () {
-    return this._transport
-      .execute('parity_dappsUrl');
-  }
-
-  decryptMessage (address, data) {
-    return this._transport
-      .execute('parity_decryptMessage', inAddress(address), inHex(data));
-  }
-
-  defaultAccount () {
-    return this._transport
-      .execute('parity_defaultAccount')
-      .then(outAddress);
-  }
-
-  defaultExtraData () {
-    return this._transport
-      .execute('parity_defaultExtraData');
-  }
-
-  devLogs () {
-    return this._transport
-      .execute('parity_devLogs');
-  }
-
-  devLogsLevels () {
-    return this._transport
-      .execute('parity_devLogsLevels');
-  }
-
-  deriveAddressHash (address, password, hash, shouldSave) {
-    return this._transport
-      .execute('parity_deriveAddressHash', inAddress(address), password, inDeriveHash(hash), !!shouldSave)
-      .then(outAddress);
-  }
-
-  deriveAddressIndex (address, password, index, shouldSave) {
-    return this._transport
-      .execute('parity_deriveAddressIndex', inAddress(address), password, inDeriveIndex(index), !!shouldSave)
-      .then(outAddress);
-  }
-
-  dropNonReservedPeers () {
-    return this._transport
-      .execute('parity_dropNonReservedPeers');
-  }
-
-  enode () {
-    return this._transport
-      .execute('parity_enode');
-  }
-
-  encryptMessage (pubkey, data) {
-    return this._transport
-      .execute('parity_encryptMessage', inHex(pubkey), inHex(data));
-  }
-
-  executeUpgrade () {
-    return this._transport
-      .execute('parity_executeUpgrade');
-  }
-
-  exportAccount (address, password) {
-    return this._transport
-      .execute('parity_exportAccount', inAddress(address), password);
-  }
-
-  extraData () {
-    return this._transport
-      .execute('parity_extraData');
-  }
-
-  futureTransactions () {
-    return this._transport
-      .execute('parity_futureTransactions');
-  }
-
-  gasCeilTarget () {
-    return this._transport
-      .execute('parity_gasCeilTarget')
-      .then(outNumber);
-  }
-
-  gasFloorTarget () {
-    return this._transport
-      .execute('parity_gasFloorTarget')
-      .then(outNumber);
-  }
-
-  gasPriceHistogram () {
-    return this._transport
-      .execute('parity_gasPriceHistogram')
-      .then(outHistogram);
-  }
-
-  generateSecretPhrase () {
-    return this._transport
-      .execute('parity_generateSecretPhrase');
-  }
-
-  getBlockHeaderByNumber (blockNumber = 'latest') {
-    return this._transport
-      .execute('parity_getBlockHeaderByNumber', inBlockNumber(blockNumber))
-      .then(outBlock);
-  }
-
-  getDappAddresses (dappId) {
-    return this._transport
-      .execute('parity_getDappAddresses', dappId)
-      .then(outAddresses);
-  }
-
-  getDappDefaultAddress (dappId) {
-    return this._transport
-      .execute('parity_getDappDefaultAddress', dappId)
-      .then(outAddress);
-  }
-
-  getNewDappsAddresses () {
-    return this._transport
-      .execute('parity_getNewDappsAddresses')
-      .then((addresses) => addresses ? addresses.map(outAddress) : null);
-  }
-
-  getNewDappsDefaultAddress () {
-    return this._transport
-      .execute('parity_getNewDappsDefaultAddress')
-      .then(outAddress);
-  }
-
-  getVaultMeta (vaultName) {
-    return this._transport
-      .execute('parity_getVaultMeta', vaultName)
-      .then(outVaultMeta);
-  }
-
-  hardwareAccountsInfo () {
-    return this._transport
-      .execute('parity_hardwareAccountsInfo')
-      .then(outHwAccountInfo);
-  }
-
-  hashContent (url) {
-    return this._transport
-      .execute('parity_hashContent', url);
-  }
-
-  importGethAccounts (accounts) {
-    return this._transport
-      .execute('parity_importGethAccounts', inAddresses(accounts))
-      .then(outAddresses);
-  }
-
-  killAccount (account, password) {
-    return this._transport
-      .execute('parity_killAccount', inAddress(account), password);
-  }
-
-  listAccounts (count, offset = null, blockNumber = 'latest') {
-    return this._transport
-      .execute('parity_listAccounts', count, inAddress(offset), inBlockNumber(blockNumber))
-      .then((accounts) => (accounts || []).map(outAddress));
-  }
-
-  listOpenedVaults () {
-    return this._transport
-      .execute('parity_listOpenedVaults');
-  }
-
-  listVaults () {
-    return this._transport
-      .execute('parity_listVaults');
-  }
-
-  listRecentDapps () {
-    return this._transport
-      .execute('parity_listRecentDapps')
-      .then(outRecentDapps);
-  }
-
-  listStorageKeys (address, count, hash = null, blockNumber = 'latest') {
-    return this._transport
-      .execute('parity_listStorageKeys', inAddress(address), count, inHex(hash), inBlockNumber(blockNumber));
-  }
-
-  removeAddress (address) {
-    return this._transport
-      .execute('parity_removeAddress', inAddress(address));
-  }
-
-  listGethAccounts () {
-    return this._transport
-      .execute('parity_listGethAccounts')
-      .then(outAddresses);
-  }
-
-  localTransactions () {
-    return this._transport
-      .execute('parity_localTransactions')
-      .then(transactions => {
-        Object.values(transactions)
-          .filter(tx => tx.transaction)
-          .map(tx => {
-            tx.transaction = outTransaction(tx.transaction);
-          });
-        return transactions;
-      });
-  }
-
-  minGasPrice () {
-    return this._transport
-      .execute('parity_minGasPrice')
-      .then(outNumber);
-  }
-
-  mode () {
-    return this._transport
-      .execute('parity_mode');
-  }
-
-  // DEPRECATED - use chain instead.
-  netChain () {
-    return this._transport
-      .execute('parity_chain');
-  }
-
-  nodeKind () {
-    return this._transport
-      .execute('parity_nodeKind')
-      .then(outNodeKind);
-  }
-
-  chain () {
-    return this._transport
-      .execute('parity_chain');
-  }
-
-  netPeers () {
-    return this._transport
-      .execute('parity_netPeers')
-      .then(outPeers);
-  }
-
-  netMaxPeers () {
-    return this._transport
-      .execute('parity_netMaxPeers')
-      .then(outNumber);
-  }
-
-  netPort () {
-    return this._transport
-      .execute('parity_netPort')
-      .then(outNumber);
-  }
-
-  newAccountFromPhrase (phrase, password) {
-    return this._transport
-      .execute('parity_newAccountFromPhrase', phrase, password)
-      .then(outAddress);
-  }
-
-  newAccountFromSecret (secret, password) {
-    return this._transport
-      .execute('parity_newAccountFromSecret', inHex(secret), password)
-      .then(outAddress);
-  }
-
-  newAccountFromWallet (json, password) {
-    return this._transport
-      .execute('parity_newAccountFromWallet', json, password)
-      .then(outAddress);
-  }
-
-  newVault (vaultName, password) {
-    return this._transport
-      .execute('parity_newVault', vaultName, password);
-  }
-
-  nextNonce (account) {
-    return this._transport
-      .execute('parity_nextNonce', inAddress(account))
-      .then(outNumber);
-  }
-
-  nodeHealth () {
-    return this._transport
-      .execute('parity_nodeHealth');
-  }
-
-  nodeName () {
-    return this._transport
-      .execute('parity_nodeName');
-  }
-
-  openVault (vaultName, password) {
-    return this._transport
-      .execute('parity_openVault', vaultName, password);
-  }
-
-  pendingTransactions () {
-    return this._transport
-      .execute('parity_pendingTransactions')
-      .then(data => data.map(outTransaction));
-  }
-
-  pendingTransactionsStats () {
-    return this._transport
-      .execute('parity_pendingTransactionsStats');
-  }
-
-  phraseToAddress (phrase) {
-    return this._transport
-      .execute('parity_phraseToAddress', phrase)
-      .then(outAddress);
-  }
-
-  postSign (address, hash) {
-    return this._transport
-      .execute('parity_postSign', inAddress(address), inHex(hash));
-  }
-
-  postTransaction (options = {}) {
-    return this._transport
-      .execute('parity_postTransaction', inOptions(options));
-  }
-
-  registryAddress () {
-    return this._transport
-      .execute('parity_registryAddress')
-      .then(outAddress);
-  }
-
-  releasesInfo () {
-    return this._transport
-      .execute('parity_releasesInfo');
-  }
-
-  removeReservedPeer (enode) {
-    return this._transport
-      .execute('parity_removeReservedPeer', enode);
-  }
-
-  removeTransaction (hash) {
-    return this._transport
-      .execute('parity_removeTransaction', inHex(hash))
-      .then(outTransaction);
-  }
-
-  rpcSettings () {
-    return this._transport
-      .execute('parity_rpcSettings');
-  }
-
-  setAccountName (address, name) {
-    return this._transport
-      .execute('parity_setAccountName', inAddress(address), name);
-  }
-
-  setAccountMeta (address, meta) {
-    return this._transport
-      .execute('parity_setAccountMeta', inAddress(address), JSON.stringify(meta));
-  }
-
-  setAuthor (address) {
-    return this._transport
-      .execute('parity_setAuthor', inAddress(address));
-  }
-
-  setDappAddresses (dappId, addresses) {
-    return this._transport
-      .execute('parity_setDappAddresses', dappId, inAddresses(addresses));
-  }
-
-  setDappDefaultAddress (dappId, address) {
-    return this._transport
-      .execute('parity_setDappDefaultAddress', dappId, address ? inAddress(address) : null);
-  }
-
-  setEngineSigner (address, password) {
-    return this._transport
-      .execute('parity_setEngineSigner', inAddress(address), password);
-  }
-
-  setExtraData (data) {
-    return this._transport
-      .execute('parity_setExtraData', inData(data));
-  }
-
-  setGasCeilTarget (quantity) {
-    return this._transport
-      .execute('parity_setGasCeilTarget', inNumber16(quantity));
-  }
-
-  setGasFloorTarget (quantity) {
-    return this._transport
-      .execute('parity_setGasFloorTarget', inNumber16(quantity));
-  }
-
-  setMaxTransactionGas (quantity) {
-    return this._transport
-      .execute('parity_setMaxTransactionGas', inNumber16(quantity));
-  }
-
-  setMinGasPrice (quantity) {
-    return this._transport
-      .execute('parity_setMinGasPrice', inNumber16(quantity));
-  }
-
-  setMode (mode) {
-    return this._transport
-      .execute('parity_setMode', mode);
-  }
-
-  setChain (specName) {
-    return this._transport
-      .execute('parity_setChain', specName);
-  }
-
-  setNewDappsAddresses (addresses) {
-    return this._transport
-      .execute('parity_setNewDappsAddresses', addresses ? inAddresses(addresses) : null);
-  }
-
-  setNewDappsDefaultAddress (address) {
-    return this._transport
-      .execute('parity_setNewDappsDefaultAddress', inAddress(address));
-  }
-
-  setTransactionsLimit (quantity) {
-    return this._transport
-      .execute('parity_setTransactionsLimit', inNumber16(quantity));
-  }
-
-  setVaultMeta (vaultName, meta) {
-    return this._transport
-      .execute('parity_setVaultMeta', vaultName, JSON.stringify(meta));
-  }
-
-  signMessage (address, password, messageHash) {
-    return this._transport
-      .execute('parity_signMessage', inAddress(address), password, inHex(messageHash));
-  }
-
-  testPassword (account, password) {
-    return this._transport
-      .execute('parity_testPassword', inAddress(account), password);
-  }
-
-  transactionsLimit () {
-    return this._transport
-      .execute('parity_transactionsLimit')
-      .then(outNumber);
-  }
-
-  unsignedTransactionsCount () {
-    return this._transport
-      .execute('parity_unsignedTransactionsCount')
-      .then(outNumber);
-  }
-
-  upgradeReady () {
-    return this._transport
-      .execute('parity_upgradeReady');
-  }
-
-  versionInfo () {
-    return this._transport
-      .execute('parity_versionInfo');
-  }
-
-  wsUrl () {
-    return this._transport
-      .execute('parity_wsUrl');
-  }
-}
diff --git a/js/src/api/rpc/parity/parity.spec.js b/js/src/api/rpc/parity/parity.spec.js
deleted file mode 100644
index 6ba7a1c83f9ab40488fcf7986fd42f617e78f490..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/parity/parity.spec.js
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
-import { isBigNumber } from '../../../../test/types';
-
-import Http from '../../transport/http';
-import Parity from './parity';
-
-const instance = new Parity(new Http(TEST_HTTP_URL, -1));
-
-describe('api/rpc/parity', () => {
-  describe('accountsInfo', () => {
-    it('retrieves the available account info', () => {
-      mockHttp([{ method: 'parity_accountsInfo', reply: {
-        result: {
-          '0x63cf90d3f0410092fc0fca41846f596223979195': {
-            name: 'name', uuid: 'uuid', meta: '{"data":"data"}'
-          }
-        }
-      } }]);
-
-      return instance.accountsInfo().then((result) => {
-        expect(result).to.deep.equal({
-          '0x63Cf90D3f0410092FC0fca41846f596223979195': {
-            name: 'name', uuid: 'uuid', meta: {
-              data: 'data'
-            }
-          }
-        });
-      });
-    });
-  });
-
-  describe('chainStatus', () => {
-    it('retrieves the chain status', () => {
-      mockHttp([{ method: 'parity_chainStatus', reply: {
-        result: {
-          'blockGap': [0x123, 0x456]
-        }
-      } }]);
-
-      return instance.chainStatus().then((result) => {
-        expect(result).to.deep.equal({
-          'blockGap': [new BigNumber(0x123), new BigNumber(0x456)]
-        });
-      });
-    });
-  });
-
-  describe('gasFloorTarget', () => {
-    it('returns the gasfloor, formatted', () => {
-      mockHttp([{ method: 'parity_gasFloorTarget', reply: { result: '0x123456' } }]);
-
-      return instance.gasFloorTarget().then((count) => {
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.eq(0x123456)).to.be.true;
-      });
-    });
-  });
-
-  describe('importGethAccounts', () => {
-    const ACCOUNTS = ['0x63cf90d3f0410092fc0fca41846f596223979195'];
-    let scope;
-
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'parity_importGethAccounts', reply: { result: ACCOUNTS } }]);
-    });
-
-    it('passes the addresses through', () => {
-      return instance.importGethAccounts(ACCOUNTS).then((result) => {
-        expect(scope.body['parity_importGethAccounts'].params).to.deep.equal([ACCOUNTS]);
-      });
-    });
-  });
-
-  describe('minGasPrice', () => {
-    it('returns the min gasprice, formatted', () => {
-      mockHttp([{ method: 'parity_minGasPrice', reply: { result: '0x123456' } }]);
-
-      return instance.minGasPrice().then((count) => {
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.eq(0x123456)).to.be.true;
-      });
-    });
-  });
-
-  describe('netMaxPeers', () => {
-    it('returns the max peers, formatted', () => {
-      mockHttp([{ method: 'parity_netMaxPeers', reply: { result: 25 } }]);
-
-      return instance.netMaxPeers().then((count) => {
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.eq(25)).to.be.true;
-      });
-    });
-  });
-
-  describe('netPeers', () => {
-    it('returns the peer structure, formatted', () => {
-      mockHttp([{ method: 'parity_netPeers', reply: { result: { active: 123, connected: 456, max: 789, peers: [] } } }]);
-
-      return instance.netPeers().then((peers) => {
-        expect(peers.active.eq(123)).to.be.true;
-        expect(peers.connected.eq(456)).to.be.true;
-        expect(peers.max.eq(789)).to.be.true;
-      });
-    });
-  });
-
-  describe('netPort', () => {
-    it('returns the connected port, formatted', () => {
-      mockHttp([{ method: 'parity_netPort', reply: { result: 33030 } }]);
-
-      return instance.netPort().then((count) => {
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.eq(33030)).to.be.true;
-      });
-    });
-  });
-
-  describe('transactionsLimit', () => {
-    it('returns the tx limit, formatted', () => {
-      mockHttp([{ method: 'parity_transactionsLimit', reply: { result: 1024 } }]);
-
-      return instance.transactionsLimit().then((count) => {
-        expect(isBigNumber(count)).to.be.true;
-        expect(count.eq(1024)).to.be.true;
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/personal/index.js b/js/src/api/rpc/personal/index.js
deleted file mode 100644
index ec999344202ffe8de88b0b14c6fb9f0ad42862e1..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/personal/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './personal';
diff --git a/js/src/api/rpc/personal/personal.e2e.js b/js/src/api/rpc/personal/personal.e2e.js
deleted file mode 100644
index d83e9b81114b4e34087d714dfa37188a060f242a..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/personal/personal.e2e.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createHttpApi } from '../../../../test/e2e/ethapi';
-import { isAddress, isBoolean } from '../../../../test/types';
-
-describe.skip('ethapi.personal', () => {
-  const ethapi = createHttpApi();
-  const password = 'P@55word';
-  let address;
-
-  describe('newAccount', () => {
-    it('creates a new account', () => {
-      return ethapi.personal.newAccount(password).then((_address) => {
-        address = _address;
-        expect(isAddress(address)).to.be.ok;
-      });
-    });
-  });
-
-  describe('listAccounts', () => {
-    it('has the newly-created account', () => {
-      return ethapi.personal.listAccounts(password).then((accounts) => {
-        expect(accounts.filter((_address) => _address === address)).to.deep.equal([address]);
-        accounts.forEach((account) => {
-          expect(isAddress(account)).to.be.true;
-        });
-      });
-    });
-  });
-
-  describe('unlockAccount', () => {
-    it('unlocks the newly-created account', () => {
-      return ethapi.personal.unlockAccount(address, password).then((result) => {
-        expect(isBoolean(result)).to.be.true;
-        expect(result).to.be.true;
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/personal/personal.js b/js/src/api/rpc/personal/personal.js
deleted file mode 100644
index dd9c40f6262a8f1a9eaa28b65e437b3827ec4f6f..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/personal/personal.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { inAddress, inNumber10, inOptions } from '../../format/input';
-import { outAddress } from '../../format/output';
-
-export default class Personal {
-  constructor (transport) {
-    this._transport = transport;
-  }
-
-  listAccounts () {
-    return this._transport
-      .execute('personal_listAccounts')
-      .then((accounts) => (accounts || []).map(outAddress));
-  }
-
-  newAccount (password) {
-    return this._transport
-      .execute('personal_newAccount', password)
-      .then(outAddress);
-  }
-
-  sendTransaction (options, password) {
-    return this._transport
-      .execute('personal_sendTransaction', inOptions(options), password);
-  }
-
-  unlockAccount (account, password, duration = 1) {
-    return this._transport
-      .execute('personal_unlockAccount', inAddress(account), password, inNumber10(duration));
-  }
-}
diff --git a/js/src/api/rpc/personal/personal.spec.js b/js/src/api/rpc/personal/personal.spec.js
deleted file mode 100644
index d67bb9dec8ff4f9d9477dc8aa79ce42a2c5a6900..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/personal/personal.spec.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
-
-import Http from '../../transport/http';
-import Personal from './personal';
-
-const instance = new Personal(new Http(TEST_HTTP_URL, -1));
-
-describe('rpc/Personal', () => {
-  const account = '0x63cf90d3f0410092fc0fca41846f596223979195';
-  const checksum = '0x63Cf90D3f0410092FC0fca41846f596223979195';
-  let scope;
-
-  describe('listAccounts', () => {
-    it('retrieves a list of available accounts', () => {
-      scope = mockHttp([{ method: 'personal_listAccounts', reply: { result: [account] } }]);
-
-      return instance.listAccounts().then((result) => {
-        expect(result).to.deep.equal([checksum]);
-      });
-    });
-
-    it('returns an empty list when none available', () => {
-      scope = mockHttp([{ method: 'personal_listAccounts', reply: { result: null } }]);
-
-      return instance.listAccounts().then((result) => {
-        expect(result).to.deep.equal([]);
-      });
-    });
-  });
-
-  describe('newAccount', () => {
-    it('passes the password, returning the address', () => {
-      scope = mockHttp([{ method: 'personal_newAccount', reply: { result: account } }]);
-
-      return instance.newAccount('password').then((result) => {
-        expect(scope.body.personal_newAccount.params).to.deep.equal(['password']);
-        expect(result).to.equal(checksum);
-      });
-    });
-  });
-
-  describe('unlockAccount', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'personal_unlockAccount', reply: { result: [] } }]);
-    });
-
-    it('passes account, password & duration', () => {
-      return instance.unlockAccount(account, 'password', 0xf).then(() => {
-        expect(scope.body.personal_unlockAccount.params).to.deep.equal([account, 'password', 15]);
-      });
-    });
-
-    it('provides a default duration when not specified', () => {
-      return instance.unlockAccount(account, 'password').then(() => {
-        expect(scope.body.personal_unlockAccount.params).to.deep.equal([account, 'password', 1]);
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/shh/index.js b/js/src/api/rpc/shh/index.js
deleted file mode 100644
index 1094fe4379e2b57a51017feec499ee61485de497..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/shh/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './shh';
diff --git a/js/src/api/rpc/shh/shh.js b/js/src/api/rpc/shh/shh.js
deleted file mode 100644
index c58754abfb0059aaad898e93bc6c3a536d894f3a..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/shh/shh.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default class Shh {
-  constructor (transport) {
-    this._transport = transport;
-  }
-
-  info () {
-    return this._transport
-      .execute('shh_info');
-  }
-
-  newKeyPair () {
-    return this._transport
-      .execute('shh_newKeyPair');
-  }
-
-  addPrivateKey (privKey) {
-    return this._transport
-      .execute('shh_addPrivateKey', privKey);
-  }
-
-  newSymKey () {
-    return this._transport
-      .execute('shh_newSymKey');
-  }
-
-  getPublicKey (identity) {
-    return this._transport
-      .execute('shh_getPublicKey', identity);
-  }
-
-  getPrivateKey (identity) {
-    return this._transport
-      .execute('shh_getPrivateKey', identity);
-  }
-
-  getSymKey (identity) {
-    return this._transport
-      .execute('shh_getSymKey', identity);
-  }
-
-  deleteKey (identity) {
-    return this._transport
-      .execute('shh_deleteKey', identity);
-  }
-
-  post (messageObj) {
-    return this._transport
-      .execute('shh_post', messageObj);
-  }
-
-  newMessageFilter (filterObj) {
-    return this._transport
-      .execute('shh_newMessageFilter', filterObj);
-  }
-
-  getFilterMessages (filterId) {
-    return this._transport
-      .execute('shh_getFilterMessages', filterId);
-  }
-
-  deleteMessageFilter (filterId) {
-    return this._transport
-      .execute('shh_deleteMessageFilter', filterId);
-  }
-
-  subscribe (filterObj, callback) {
-    return this._transport
-      .subscribe('shh', callback, filterObj);
-  }
-
-  unsubscribe (subscriptionId) {
-    return this._transport
-      .unsubscribe(subscriptionId);
-  }
-}
diff --git a/js/src/api/rpc/signer/index.js b/js/src/api/rpc/signer/index.js
deleted file mode 100644
index cc1e4dc1c57e2cb118cec7f9694fb48cf160351f..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/signer/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './signer';
diff --git a/js/src/api/rpc/signer/signer.js b/js/src/api/rpc/signer/signer.js
deleted file mode 100644
index 915b811589e75b3541fcadb28d90ea2b989e93d3..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/signer/signer.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { inData, inNumber16, inOptions } from '../../format/input';
-import { outSignerRequest } from '../../format/output';
-
-export default class Signer {
-  constructor (transport) {
-    this._transport = transport;
-  }
-
-  confirmRequest (requestId, options, password) {
-    return this._transport
-      .execute('signer_confirmRequest', inNumber16(requestId), inOptions(options), password);
-  }
-
-  confirmRequestRaw (requestId, data) {
-    return this._transport
-      .execute('signer_confirmRequestRaw', inNumber16(requestId), inData(data));
-  }
-
-  confirmRequestWithToken (requestId, options, password) {
-    return this._transport
-      .execute('signer_confirmRequestWithToken', inNumber16(requestId), inOptions(options), password);
-  }
-
-  generateAuthorizationToken () {
-    return this._transport
-      .execute('signer_generateAuthorizationToken');
-  }
-
-  generateWebProxyAccessToken (domain) {
-    return this._transport
-      .execute('signer_generateWebProxyAccessToken', domain);
-  }
-
-  rejectRequest (requestId) {
-    return this._transport
-      .execute('signer_rejectRequest', inNumber16(requestId));
-  }
-
-  requestsToConfirm () {
-    return this._transport
-      .execute('signer_requestsToConfirm')
-      .then((requests) => (requests || []).map(outSignerRequest));
-  }
-
-  signerEnabled () {
-    return this._transport
-      .execute('signer_signerEnabled');
-  }
-}
diff --git a/js/src/api/rpc/trace/index.js b/js/src/api/rpc/trace/index.js
deleted file mode 100644
index 8d02aed452147c04224bec40853d04fd0a405951..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/trace/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './trace';
diff --git a/js/src/api/rpc/trace/trace.e2e.js b/js/src/api/rpc/trace/trace.e2e.js
deleted file mode 100644
index ffbef0ed68b5f3e530384e84b1d93515741ef620..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/trace/trace.e2e.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createHttpApi } from '../../../../test/e2e/ethapi';
-
-describe('ethapi.trace', () => {
-  const ethapi = createHttpApi();
-
-  describe('block', () => {
-    it('returns the latest block traces', () => {
-      return ethapi.trace.block().then((traces) => {
-        expect(traces).to.be.ok;
-      });
-    });
-
-    it('returns traces for a specified block', () => {
-      return ethapi.trace.block('0x65432').then((traces) => {
-        expect(traces).to.be.ok;
-      });
-    });
-  });
-
-  describe('replayTransaction', () => {
-    it('returns traces for a specific transaction', () => {
-      return ethapi.eth.getBlockByNumber().then((latestBlock) => {
-        return ethapi.trace.replayTransaction(latestBlock.transactions[0]).then((traces) => {
-          expect(traces).to.be.ok;
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/trace/trace.js b/js/src/api/rpc/trace/trace.js
deleted file mode 100644
index 26b19b378926cb666e2c629f855855c7ea2a039b..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/trace/trace.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { inBlockNumber, inData, inHex, inNumber16, inOptions, inTraceFilter, inTraceType } from '../../format/input';
-import { outTraces, outTraceReplay } from '../../format/output';
-
-export default class Trace {
-  constructor (transport) {
-    this._transport = transport;
-  }
-
-  block (blockNumber = 'latest') {
-    return this._transport
-      .execute('trace_block', inBlockNumber(blockNumber))
-      .then(outTraces);
-  }
-
-  call (options, whatTrace = ['trace'], blockNumber = 'latest') {
-    return this._transport
-      .execute('trace_call', inOptions(options), inTraceType(whatTrace), inBlockNumber(blockNumber))
-      .then(outTraceReplay);
-  }
-
-  filter (filterObj) {
-    return this._transport
-      .execute('trace_filter', inTraceFilter(filterObj))
-      .then(outTraces);
-  }
-
-  get (txHash, position) {
-    return this._transport
-      .execute('trace_get', inHex(txHash), inNumber16(position))
-      .then(outTraces);
-  }
-
-  rawTransaction (data, whatTrace = ['trace']) {
-    return this._transport
-      .execute('trace_rawTransaction', inData(data), inTraceType(whatTrace))
-      .then(outTraceReplay);
-  }
-
-  replayTransaction (txHash, whatTrace = ['trace']) {
-    return this._transport
-      .execute('trace_replayTransaction', txHash, inTraceType(whatTrace))
-      .then(outTraceReplay);
-  }
-
-  transaction (txHash) {
-    return this._transport
-      .execute('trace_transaction', inHex(txHash))
-      .then(outTraces);
-  }
-}
diff --git a/js/src/api/rpc/trace/trace.spec.js b/js/src/api/rpc/trace/trace.spec.js
deleted file mode 100644
index 267d1240f1b0c2b14668b7d01dc00744f05115fe..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/trace/trace.spec.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
-
-import Http from '../../transport/http';
-import Trace from './trace';
-
-const instance = new Trace(new Http(TEST_HTTP_URL, -1));
-
-describe('api/rpc/Trace', () => {
-  let scope;
-
-  describe('block', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'trace_block', reply: { result: [] } }]);
-    });
-
-    it('assumes latest blockNumber when not specified', () => {
-      return instance.block().then(() => {
-        expect(scope.body.trace_block.params).to.deep.equal(['latest']);
-      });
-    });
-
-    it('passed specified blockNumber', () => {
-      return instance.block(0x123).then(() => {
-        expect(scope.body.trace_block.params).to.deep.equal(['0x123']);
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/web3/index.js b/js/src/api/rpc/web3/index.js
deleted file mode 100644
index c2590ec1150dd0ed0c57c1ed3cd9f7deb287e183..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/web3/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './web3';
diff --git a/js/src/api/rpc/web3/web3.e2e.js b/js/src/api/rpc/web3/web3.e2e.js
deleted file mode 100644
index 2c8243a4fb933fb263d2acc13ecc5cf44a7cd591..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/web3/web3.e2e.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createHttpApi } from '../../../../test/e2e/ethapi';
-import { isHexNumber } from '../../../../test/types';
-
-describe('ethapi.web3', () => {
-  const ethapi = createHttpApi();
-
-  describe('clientVersion', () => {
-    it('returns the client version', () => {
-      return ethapi.web3.clientVersion().then((version) => {
-        const [client] = version.split('/');
-
-        expect(client === 'Parity' || client === 'Geth').to.be.ok;
-      });
-    });
-  });
-
-  describe('sha3', () => {
-    it('returns a keccak256 sha', () => {
-      const sha = '0xa7916fac4f538170f7cd12c148552e2cba9fcd72329a2dd5b07a6fa906488ddf';
-      const hexStr = 'baz()'.split('').map((char) => char.charCodeAt(0).toString(16)).join('');
-
-      return ethapi.web3.sha3(`0x${hexStr}`).then((hash) => {
-        expect(isHexNumber(hash)).to.be.true;
-        expect(hash).to.equal(sha);
-      });
-    });
-  });
-});
diff --git a/js/src/api/rpc/web3/web3.js b/js/src/api/rpc/web3/web3.js
deleted file mode 100644
index 21b2d77f1e359b10e0df5da14185ad948656e630..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/web3/web3.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { inHex } from '../../format/input';
-
-export default class Web3 {
-  constructor (transport) {
-    this._transport = transport;
-  }
-
-  clientVersion () {
-    return this._transport
-      .execute('web3_clientVersion');
-  }
-
-  sha3 (hexStr) {
-    return this._transport
-      .execute('web3_sha3', inHex(hexStr));
-  }
-}
diff --git a/js/src/api/rpc/web3/web3.spec.js b/js/src/api/rpc/web3/web3.spec.js
deleted file mode 100644
index b46679b82a7a8a2285ba7afc0f07bf9f135a20d2..0000000000000000000000000000000000000000
--- a/js/src/api/rpc/web3/web3.spec.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
-
-import Http from '../../transport/http';
-import Web3 from './web3';
-
-const instance = new Web3(new Http(TEST_HTTP_URL, -1));
-
-describe('api/rpc/Web3', () => {
-  let scope;
-
-  describe('sha3', () => {
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'web3_sha3', reply: { result: [] } }]);
-    });
-
-    it('formats the inputs correctly', () => {
-      return instance.sha3('1234').then(() => {
-        expect(scope.body.web3_sha3.params).to.deep.equal(['0x1234']);
-      });
-    });
-  });
-});
diff --git a/js/src/api/subscriptions/eth.js b/js/src/api/subscriptions/eth.js
deleted file mode 100644
index 8e56f335f7e527a90107efb0efff6ba0a26440ec..0000000000000000000000000000000000000000
--- a/js/src/api/subscriptions/eth.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-export default class Eth {
-  constructor (updateSubscriptions, api) {
-    this._api = api;
-    this._updateSubscriptions = updateSubscriptions;
-    this._started = false;
-
-    this._lastBlock = new BigNumber(-1);
-    this._pollTimerId = null;
-  }
-
-  get isStarted () {
-    return this._started;
-  }
-
-  start () {
-    this._started = true;
-
-    return this._blockNumber();
-  }
-
-  _blockNumber = () => {
-    const nextTimeout = (timeout = 1000) => {
-      this._pollTimerId = setTimeout(() => {
-        this._blockNumber();
-      }, timeout);
-    };
-
-    if (!this._api.transport.isConnected) {
-      nextTimeout(500);
-      return;
-    }
-
-    return this._api.eth
-      .blockNumber()
-      .then((blockNumber) => {
-        if (!blockNumber.eq(this._lastBlock)) {
-          this._lastBlock = blockNumber;
-          this._updateSubscriptions('eth_blockNumber', null, blockNumber);
-        }
-
-        nextTimeout();
-      })
-      .catch(() => nextTimeout());
-  }
-}
diff --git a/js/src/api/subscriptions/eth.spec.js b/js/src/api/subscriptions/eth.spec.js
deleted file mode 100644
index 3f5ee81d66f8a4c51ea67adbf94fd405cf792998..0000000000000000000000000000000000000000
--- a/js/src/api/subscriptions/eth.spec.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import sinon from 'sinon';
-
-import Eth from './eth';
-
-const START_BLOCK = 5000;
-
-function stubApi (blockNumber) {
-  const _calls = {
-    blockNumber: []
-  };
-
-  return {
-    _calls,
-    transport: {
-      isConnected: true
-    },
-    eth: {
-      blockNumber: () => {
-        const stub = sinon.stub().resolves(new BigNumber(blockNumber || START_BLOCK))();
-
-        _calls.blockNumber.push(stub);
-        return stub;
-      }
-    }
-  };
-}
-
-describe('api/subscriptions/eth', () => {
-  let api;
-  let eth;
-  let cb;
-
-  beforeEach(() => {
-    api = stubApi();
-    cb = sinon.stub();
-    eth = new Eth(cb, api);
-  });
-
-  describe('constructor', () => {
-    it('starts the instance in a stopped state', () => {
-      expect(eth.isStarted).to.be.false;
-    });
-  });
-
-  describe('start', () => {
-    describe('blockNumber available', () => {
-      beforeEach(() => {
-        return eth.start();
-      });
-
-      it('sets the started status', () => {
-        expect(eth.isStarted).to.be.true;
-      });
-
-      it('calls eth_blockNumber', () => {
-        expect(api._calls.blockNumber.length).to.be.ok;
-      });
-
-      it('updates subscribers', () => {
-        expect(cb).to.have.been.calledWith('eth_blockNumber', null, new BigNumber(START_BLOCK));
-      });
-    });
-
-    describe('blockNumber not available', () => {
-      beforeEach(() => {
-        api = stubApi(-1);
-        eth = new Eth(cb, api);
-        return eth.start();
-      });
-
-      it('sets the started status', () => {
-        expect(eth.isStarted).to.be.true;
-      });
-
-      it('calls eth_blockNumber', () => {
-        expect(api._calls.blockNumber.length).to.be.ok;
-      });
-
-      it('does not update subscribers', () => {
-        expect(cb).not.to.been.called;
-      });
-    });
-  });
-});
diff --git a/js/src/api/subscriptions/index.js b/js/src/api/subscriptions/index.js
deleted file mode 100644
index 07856faefd7c84c6d4fd71d229c7728f281ab5c1..0000000000000000000000000000000000000000
--- a/js/src/api/subscriptions/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export Logging from './logging';
-
-export default from './manager';
diff --git a/js/src/api/subscriptions/logging.js b/js/src/api/subscriptions/logging.js
deleted file mode 100644
index 545742dff7f75f7ebdf41fc7e608ed6288ced2ee..0000000000000000000000000000000000000000
--- a/js/src/api/subscriptions/logging.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-let instance = null;
-
-export default class Logging {
-  constructor (updateSubscriptions) {
-    this._updateSubscriptions = updateSubscriptions;
-
-    instance = this;
-  }
-
-  get isStarted () {
-    return true;
-  }
-
-  start () {
-  }
-
-  static send (method, params, json) {
-    if (!instance) {
-      return;
-    }
-
-    return instance._updateSubscriptions('logging', null, {
-      method,
-      params,
-      json
-    });
-  }
-}
diff --git a/js/src/api/subscriptions/logging.spec.js b/js/src/api/subscriptions/logging.spec.js
deleted file mode 100644
index f155696b779277dc9851f6a04f66c90e4d02db13..0000000000000000000000000000000000000000
--- a/js/src/api/subscriptions/logging.spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Logging from './logging';
-
-describe('api/subscriptions/logging', () => {
-  let cb;
-  let logging;
-
-  beforeEach(() => {
-    cb = sinon.stub();
-    logging = new Logging(cb);
-  });
-
-  describe('constructor', () => {
-    it('starts the instance in a started state', () => {
-      expect(logging.isStarted).to.be.true;
-    });
-  });
-
-  describe('send', () => {
-    const method = 'method';
-    const params = 'params';
-    const json = 'json';
-
-    beforeEach(() => {
-      Logging.send(method, params, json);
-    });
-
-    it('calls the subscription update', () => {
-      expect(cb).to.have.been.calledWith('logging', null, { method, params, json });
-    });
-  });
-});
diff --git a/js/src/api/subscriptions/manager.js b/js/src/api/subscriptions/manager.js
deleted file mode 100644
index 6ca2f401502be3c45dff9c19de5174b457aad8b6..0000000000000000000000000000000000000000
--- a/js/src/api/subscriptions/manager.js
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isError } from '../util/types';
-
-import Eth from './eth';
-import Logging from './logging';
-import Personal from './personal';
-import Signer from './signer';
-
-const events = {
-  'logging': { module: 'logging' },
-  'eth_blockNumber': { module: 'eth' },
-  'parity_accountsInfo': { module: 'personal' },
-  'parity_allAccountsInfo': { module: 'personal' },
-  'parity_defaultAccount': { module: 'personal' },
-  'parity_postTransaction': { module: 'signer' },
-  'eth_accounts': { module: 'personal' },
-  'signer_requestsToConfirm': { module: 'signer' }
-};
-
-export default class Manager {
-  constructor (api) {
-    this._api = api;
-
-    this.subscriptions = [];
-    this.values = {};
-
-    Object.keys(events).forEach((subscriptionName) => {
-      this.values[subscriptionName] = {
-        error: null,
-        data: null
-      };
-    });
-
-    this._logging = new Logging(this._updateSubscriptions);
-    this._eth = new Eth(this._updateSubscriptions, api);
-    this._personal = new Personal(this._updateSubscriptions, api, this);
-    this._signer = new Signer(this._updateSubscriptions, api, this);
-  }
-
-  _validateType (subscriptionName) {
-    const subscription = events[subscriptionName];
-
-    if (!subscription) {
-      return new Error(`${subscriptionName} is not a valid interface, subscribe using one of ${Object.keys(events).join(', ')}`);
-    }
-
-    return subscription;
-  }
-
-  subscribe (subscriptionName, callback, autoRemove = false) {
-    return new Promise((resolve, reject) => {
-      const subscription = this._validateType(subscriptionName);
-
-      if (isError(subscription)) {
-        reject(subscription);
-        return;
-      }
-
-      const subscriptionId = this.subscriptions.length;
-      const { error, data } = this.values[subscriptionName];
-      const engine = this[`_${subscription.module}`];
-
-      this.subscriptions[subscriptionId] = {
-        name: subscriptionName,
-        id: subscriptionId,
-        autoRemove,
-        callback
-      };
-
-      if (!engine.isStarted) {
-        engine.start();
-      } else if (error !== null || data !== null) {
-        this._sendData(subscriptionId, error, data);
-      }
-
-      resolve(subscriptionId);
-    });
-  }
-
-  unsubscribe (subscriptionId) {
-    return new Promise((resolve, reject) => {
-      if (!this.subscriptions[subscriptionId]) {
-        reject(new Error(`Cannot find subscription ${subscriptionId}`));
-        return;
-      }
-
-      delete this.subscriptions[subscriptionId];
-      resolve();
-    });
-  }
-
-  _sendData (subscriptionId, error, data) {
-    const { autoRemove, callback } = this.subscriptions[subscriptionId];
-    let result = true;
-
-    try {
-      result = callback(error, data);
-    } catch (error) {
-      console.error(`Unable to update callback for subscriptionId ${subscriptionId}`, error);
-    }
-
-    if (autoRemove && result && typeof result === 'boolean') {
-      this.unsubscribe(subscriptionId);
-    }
-  }
-
-  _updateSubscriptions = (subscriptionName, error, data) => {
-    const subscriptions = this.subscriptions
-      .filter(subscription => subscription.name === subscriptionName);
-
-    this.values[subscriptionName] = { error, data };
-
-    subscriptions
-      .forEach((subscription) => {
-        this._sendData(subscription.id, error, data);
-      });
-  }
-}
-
-export {
-  events
-};
diff --git a/js/src/api/subscriptions/manager.spec.js b/js/src/api/subscriptions/manager.spec.js
deleted file mode 100644
index df708a36dcbb933f23c20185c07ccae3dabb3874..0000000000000000000000000000000000000000
--- a/js/src/api/subscriptions/manager.spec.js
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Manager, { events } from './manager';
-
-function newStub () {
-  const start = () => manager._updateSubscriptions(manager.__test, null, 'test');
-
-  const manager = new Manager({
-    transport: {
-      isConnected: true
-    }
-  });
-
-  manager._eth = {
-    isStarted: false,
-    start
-  };
-
-  manager._personal = {
-    isStarted: false,
-    start
-  };
-
-  manager._signer = {
-    isStarted: false,
-    start
-  };
-
-  return manager;
-}
-
-describe('api/subscriptions/manager', () => {
-  let manager;
-
-  beforeEach(() => {
-    manager = newStub();
-  });
-
-  describe('constructor', () => {
-    it('sets up the subscription types & defaults', () => {
-      expect(manager.subscriptions).to.be.an.array;
-      expect(Object.keys(manager.values)).to.deep.equal(Object.keys(events));
-    });
-  });
-
-  describe('subscriptions', () => {
-    Object
-      .keys(events)
-      .filter((eventName) => eventName.indexOf('_') !== -1)
-      .forEach((eventName) => {
-        const { module } = events[eventName];
-        let engine;
-        let cb;
-        let subscriptionId;
-
-        describe(eventName, () => {
-          beforeEach(() => {
-            engine = manager[`_${module}`];
-            manager.__test = eventName;
-            cb = sinon.stub();
-            sinon.spy(engine, 'start');
-
-            return manager
-              .subscribe(eventName, cb)
-              .then((_subscriptionId) => {
-                subscriptionId = _subscriptionId;
-              });
-          });
-
-          it(`puts the ${module} engine in a started state`, () => {
-            expect(engine.start).to.have.been.called;
-          });
-
-          it('returns a subscriptionId', () => {
-            expect(subscriptionId).to.be.a.number;
-          });
-
-          it('calls the subscription callback with updated values', () => {
-            expect(cb).to.have.been.calledWith(null, 'test');
-          });
-        });
-      });
-  });
-
-  describe('unsubscriptions', () => {
-    Object
-      .keys(events)
-      .filter((eventName) => eventName.indexOf('_') !== -1)
-      .forEach((eventName) => {
-        const { module } = events[eventName];
-        let engine;
-        let cb;
-
-        describe(eventName, () => {
-          beforeEach(() => {
-            engine = manager[`_${module}`];
-            manager.__test = eventName;
-            cb = sinon.stub();
-            sinon.spy(engine, 'start');
-
-            return manager
-              .subscribe(eventName, cb)
-              .then((_subscriptionId) => {
-                manager.unsubscribe(_subscriptionId);
-              })
-              .then(() => {
-                manager._updateSubscriptions(manager.__test, null, 'test2');
-              });
-          });
-
-          it('does not call the callback after unsubscription', () => {
-            expect(cb).to.have.been.calledWith(null, 'test');
-            expect(cb).to.not.have.been.calledWith(null, 'test2');
-          });
-        });
-      });
-  });
-});
diff --git a/js/src/api/subscriptions/personal.js b/js/src/api/subscriptions/personal.js
deleted file mode 100644
index fa7ae823ca99a1283a155e778c3453dcb7ebbc01..0000000000000000000000000000000000000000
--- a/js/src/api/subscriptions/personal.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default class Personal {
-  constructor (updateSubscriptions, api, subscriber) {
-    this._subscriber = subscriber;
-    this._api = api;
-    this._updateSubscriptions = updateSubscriptions;
-    this._started = false;
-
-    this._lastDefaultAccount = '0x0';
-    this._pollTimerId = null;
-  }
-
-  get isStarted () {
-    return this._started;
-  }
-
-  start () {
-    this._started = true;
-
-    return Promise.all([
-      this._defaultAccount(),
-      this._listAccounts(),
-      this._accountsInfo(),
-      this._loggingSubscribe()
-    ]);
-  }
-
-  // FIXME: Because of the different API instances, the "wait for valid changes" approach
-  // doesn't work. Since the defaultAccount is critical to operation, we poll in exactly
-  // same way we do in ../eth (ala eth_blockNumber) and update. This should be moved
-  // to pub-sub as it becomes available
-  _defaultAccount = (timerDisabled = false) => {
-    const nextTimeout = (timeout = 1000) => {
-      if (!timerDisabled) {
-        this._pollTimerId = setTimeout(() => {
-          this._defaultAccount();
-        }, timeout);
-      }
-    };
-
-    if (!this._api.transport.isConnected) {
-      nextTimeout(500);
-      return;
-    }
-
-    return this._api.parity
-      .defaultAccount()
-      .then((defaultAccount) => {
-        if (this._lastDefaultAccount !== defaultAccount) {
-          this._lastDefaultAccount = defaultAccount;
-          this._updateSubscriptions('parity_defaultAccount', null, defaultAccount);
-        }
-
-        nextTimeout();
-      })
-      .catch(() => nextTimeout());
-  }
-
-  _listAccounts = () => {
-    return this._api.eth
-      .accounts()
-      .then((accounts) => {
-        this._updateSubscriptions('eth_accounts', null, accounts);
-      });
-  }
-
-  _accountsInfo = () => {
-    return this._api.parity
-      .accountsInfo()
-      .then((info) => {
-        this._updateSubscriptions('parity_accountsInfo', null, info);
-
-        return this._api.parity
-          .allAccountsInfo()
-          .catch(() => {
-            // NOTE: This fails on non-secure APIs, swallow error
-            return {};
-          })
-          .then((allInfo) => {
-            this._updateSubscriptions('parity_allAccountsInfo', null, allInfo);
-          });
-      });
-  }
-
-  _loggingSubscribe () {
-    return this._subscriber.subscribe('logging', (error, data) => {
-      if (error || !data) {
-        return;
-      }
-
-      switch (data.method) {
-        case 'parity_closeVault':
-        case 'parity_openVault':
-        case 'parity_killAccount':
-        case 'parity_importGethAccounts':
-        case 'parity_newAccountFromPhrase':
-        case 'parity_newAccountFromWallet':
-        case 'personal_newAccount':
-          this._defaultAccount(true);
-          this._listAccounts();
-          this._accountsInfo();
-          return;
-
-        case 'parity_removeAddress':
-        case 'parity_setAccountName':
-        case 'parity_setAccountMeta':
-          this._accountsInfo();
-          return;
-
-        case 'parity_setDappAddresses':
-        case 'parity_setDappDefaultAddress':
-        case 'parity_setNewDappsAddresses':
-        case 'parity_setNewDappsDefaultAddress':
-          this._defaultAccount(true);
-          this._listAccounts();
-          return;
-      }
-    });
-  }
-}
diff --git a/js/src/api/subscriptions/personal.spec.js b/js/src/api/subscriptions/personal.spec.js
deleted file mode 100644
index ac046d25099dc78af3c4e2b54b191d008e58ab64..0000000000000000000000000000000000000000
--- a/js/src/api/subscriptions/personal.spec.js
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Personal from './personal';
-
-const TEST_DEFAULT = '0xfa64203C044691aA57251aF95f4b48d85eC00Dd5';
-const TEST_INFO = {
-  [TEST_DEFAULT]: {
-    name: 'test'
-  }
-};
-const TEST_LIST = [TEST_DEFAULT];
-
-function stubApi (accounts, info) {
-  const _calls = {
-    accountsInfo: [],
-    allAccountsInfo: [],
-    listAccounts: [],
-    defaultAccount: []
-  };
-
-  return {
-    _calls,
-    transport: {
-      isConnected: true
-    },
-    parity: {
-      accountsInfo: () => {
-        const stub = sinon.stub().resolves(info || TEST_INFO)();
-
-        _calls.accountsInfo.push(stub);
-        return stub;
-      },
-      allAccountsInfo: () => {
-        const stub = sinon.stub().resolves(info || TEST_INFO)();
-
-        _calls.allAccountsInfo.push(stub);
-        return stub;
-      },
-      defaultAccount: () => {
-        const stub = sinon.stub().resolves(Object.keys(info || TEST_INFO)[0])();
-
-        _calls.defaultAccount.push(stub);
-        return stub;
-      }
-    },
-    eth: {
-      accounts: () => {
-        const stub = sinon.stub().resolves(accounts || TEST_LIST)();
-
-        _calls.listAccounts.push(stub);
-        return stub;
-      }
-    }
-  };
-}
-
-function stubLogging () {
-  return {
-    subscribe: sinon.stub()
-  };
-}
-
-describe('api/subscriptions/personal', () => {
-  let api;
-  let cb;
-  let logging;
-  let personal;
-
-  beforeEach(() => {
-    api = stubApi();
-    cb = sinon.stub();
-    logging = stubLogging();
-    personal = new Personal(cb, api, logging);
-  });
-
-  describe('constructor', () => {
-    it('starts the instance in a stopped state', () => {
-      expect(personal.isStarted).to.be.false;
-    });
-  });
-
-  describe('start', () => {
-    describe('info available', () => {
-      beforeEach(() => {
-        return personal.start();
-      });
-
-      it('sets the started status', () => {
-        expect(personal.isStarted).to.be.true;
-      });
-
-      it('calls parity_accountsInfo', () => {
-        expect(api._calls.accountsInfo.length).to.be.ok;
-      });
-
-      it('calls parity_allAccountsInfo', () => {
-        expect(api._calls.allAccountsInfo.length).to.be.ok;
-      });
-
-      it('calls eth_accounts', () => {
-        expect(api._calls.listAccounts.length).to.be.ok;
-      });
-
-      it('updates subscribers', () => {
-        expect(cb).to.have.been.calledWith('parity_defaultAccount', null, TEST_DEFAULT);
-        expect(cb).to.have.been.calledWith('eth_accounts', null, TEST_LIST);
-        expect(cb).to.have.been.calledWith('parity_accountsInfo', null, TEST_INFO);
-        expect(cb).to.have.been.calledWith('parity_allAccountsInfo', null, TEST_INFO);
-      });
-    });
-
-    describe('info not available', () => {
-      beforeEach(() => {
-        api = stubApi([], {});
-        personal = new Personal(cb, api, logging);
-        return personal.start();
-      });
-
-      it('sets the started status', () => {
-        expect(personal.isStarted).to.be.true;
-      });
-
-      it('calls parity_defaultAccount', () => {
-        expect(api._calls.defaultAccount.length).to.be.ok;
-      });
-
-      it('calls personal_accountsInfo', () => {
-        expect(api._calls.accountsInfo.length).to.be.ok;
-      });
-
-      it('calls personal_allAccountsInfo', () => {
-        expect(api._calls.allAccountsInfo.length).to.be.ok;
-      });
-
-      it('calls personal_listAccounts', () => {
-        expect(api._calls.listAccounts.length).to.be.ok;
-      });
-    });
-  });
-});
diff --git a/js/src/api/subscriptions/signer.js b/js/src/api/subscriptions/signer.js
deleted file mode 100644
index 2215ed7f3df6e312df49446d85ec67879fdea163..0000000000000000000000000000000000000000
--- a/js/src/api/subscriptions/signer.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { outTransaction } from '../format/output';
-
-export default class Signer {
-  constructor (updateSubscriptions, api, subscriber) {
-    this._subscriber = subscriber;
-    this._api = api;
-    this._updateSubscriptions = updateSubscriptions;
-    this._started = false;
-  }
-
-  get isStarted () {
-    return this._started;
-  }
-
-  start () {
-    this._started = true;
-
-    return Promise.all([
-      this._listRequests(true),
-      this._loggingSubscribe()
-    ]);
-  }
-
-  _listRequests = (doTimeout) => {
-    const nextTimeout = (timeout = 1000) => {
-      if (doTimeout) {
-        setTimeout(() => {
-          this._listRequests(true);
-        }, timeout);
-      }
-    };
-
-    if (!this._api.transport.isConnected) {
-      nextTimeout(500);
-      return;
-    }
-
-    return this._api.signer
-      .requestsToConfirm()
-      .then((requests) => {
-        this._updateSubscriptions('signer_requestsToConfirm', null, requests);
-        nextTimeout();
-      })
-      .catch(() => nextTimeout());
-  }
-
-  _postTransaction (data) {
-    const request = {
-      transaction: outTransaction(data.params[0]),
-      requestId: data.json.result.result
-    };
-
-    this._updateSubscriptions('parity_postTransaction', null, request);
-  }
-
-  _loggingSubscribe () {
-    return this._subscriber.subscribe('logging', (error, data) => {
-      if (error || !data) {
-        return;
-      }
-
-      switch (data.method) {
-        case 'eth_sendTransaction':
-        case 'eth_sendRawTransaction':
-          this._listRequests(false);
-          return;
-
-        case 'parity_postTransaction':
-          this._postTransaction(data);
-          this._listRequests(false);
-          return;
-      }
-    });
-  }
-}
diff --git a/js/src/api/transport/error.js b/js/src/api/transport/error.js
deleted file mode 100644
index 9049705fab5bcca78a0d63d20a3b73076bf8a4de..0000000000000000000000000000000000000000
--- a/js/src/api/transport/error.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ExtendableError from 'es6-error';
-
-export const ERROR_CODES = {
-  UNSUPPORTED_REQUEST: -32000,
-  NO_WORK: -32001,
-  NO_AUTHOR: -32002,
-  NO_NEW_WORK: -32003,
-  NO_WORK_REQUIRED: -32004,
-  NOT_ENOUGH_DATA: -32006,
-  UNKNOWN_ERROR: -32009,
-  TRANSACTION_ERROR: -32010,
-  EXECUTION_ERROR: -32015,
-  EXCEPTION_ERROR: -32016,
-  ACCOUNT_LOCKED: -32020,
-  PASSWORD_INVALID: -32021,
-  ACCOUNT_ERROR: -32023,
-  SIGNER_DISABLED: -32030,
-  DAPPS_DISABLED: -32031,
-  NETWORK_DISABLED: -32035,
-  REQUEST_REJECTED: -32040,
-  REQUEST_REJECTED_LIMIT: -32041,
-  REQUEST_NOT_FOUND: -32042,
-  COMPILATION_ERROR: -32050,
-  ENCRYPTION_ERROR: -32055,
-  FETCH_ERROR: -32060,
-  INVALID_PARAMS: -32602
-};
-
-export default class TransportError extends ExtendableError {
-  static requestRejected (method = null) {
-    return new TransportError(method, ERROR_CODES.REQUEST_REJECTED, 'Request has been rejected.');
-  }
-
-  constructor (method, code, message) {
-    const m = `${method}: ${code}: ${message}`;
-
-    super(m);
-
-    this.code = code;
-    this.type = Object.keys(ERROR_CODES).find((k) => ERROR_CODES[k] === code) || '';
-
-    this.method = method;
-    this.text = message;
-  }
-}
diff --git a/js/src/api/transport/http/http.e2e.js b/js/src/api/transport/http/http.e2e.js
deleted file mode 100644
index af2fb1fbb31332c3bce258212b0e1a32fd4226cb..0000000000000000000000000000000000000000
--- a/js/src/api/transport/http/http.e2e.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Http from './http';
-
-const http = new Http('http://localhost:8545');
-
-describe('transport/Http', () => {
-  it('connects and makes a call to web3_clientVersion', () => {
-    return http.execute('web3_clientVersion').then((version) => {
-      const [client] = version.split('/');
-
-      expect(client === 'Geth' || client === 'Parity').to.be.ok;
-    });
-  });
-});
diff --git a/js/src/api/transport/http/http.js b/js/src/api/transport/http/http.js
deleted file mode 100644
index 66ef2dec7908543f2191d45dd89708563d58681c..0000000000000000000000000000000000000000
--- a/js/src/api/transport/http/http.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Logging } from '../../subscriptions';
-import JsonRpcBase from '../jsonRpcBase';
-import TransportError from '../error';
-
-/* global fetch */
-export default class Http extends JsonRpcBase {
-  constructor (url, connectTimeout = 1000) {
-    super();
-
-    this._connected = true;
-    this._url = url;
-    this._connectTimeout = connectTimeout;
-
-    this._pollConnection();
-  }
-
-  _encodeOptions (method, params) {
-    const json = this.encode(method, params);
-
-    this.log(json);
-
-    return {
-      method: 'POST',
-      headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json',
-        'Content-Length': json.length
-      },
-      body: json
-    };
-  }
-
-  _execute (method, params) {
-    const request = this._encodeOptions(method, params);
-
-    return fetch(this._url, request)
-      .catch((error) => {
-        this._setDisconnected();
-        throw error;
-      })
-      .then((response) => {
-        this._setConnected();
-
-        if (response.status !== 200) {
-          this._setDisconnected();
-          this.error(JSON.stringify({ status: response.status, statusText: response.statusText }));
-          console.error(`${method}(${JSON.stringify(params)}): ${response.status}: ${response.statusText}`);
-
-          throw new Error(`${response.status}: ${response.statusText}`);
-        }
-
-        return response.json();
-      })
-      .then((response) => {
-        Logging.send(method, params, { request, response });
-
-        if (response.error) {
-          this.error(JSON.stringify(response));
-          console.error(`${method}(${JSON.stringify(params)}): ${response.error.code}: ${response.error.message}`);
-
-          const error = new TransportError(method, response.error.code, response.error.message);
-
-          throw error;
-        }
-
-        this.log(JSON.stringify(response));
-        return response.result;
-      });
-  }
-
-  _pollConnection = () => {
-    if (this._connectTimeout <= 0) {
-      return;
-    }
-
-    const nextTimeout = () => setTimeout(this._pollConnection, this._connectTimeout);
-
-    this
-      .execute('net_listening')
-      .then(() => nextTimeout())
-      .catch(() => nextTimeout());
-  }
-
-  set url (url) {
-    this._url = url;
-  }
-}
diff --git a/js/src/api/transport/http/http.spec.js b/js/src/api/transport/http/http.spec.js
deleted file mode 100644
index 3d08e17a4493cbf16b87851b011f9ae4986ccdc8..0000000000000000000000000000000000000000
--- a/js/src/api/transport/http/http.spec.js
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
-import Http from './http';
-
-const transport = new Http(TEST_HTTP_URL, -1);
-
-describe('api/transport/Http', () => {
-  describe('instance', () => {
-    it('encodes the options correctly', () => {
-      const opt = transport._encodeOptions('someMethod', ['param']);
-      const enc = {
-        method: 'POST',
-        headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/json',
-          'Content-Length': 65
-        },
-        body: `{"jsonrpc":"2.0","method":"someMethod","params":["param"],"id":${transport._id - 1}}`
-      };
-
-      expect(opt).to.deep.equal(enc);
-    });
-  });
-
-  describe('transport emitter', () => {
-    it('emits close event', (done) => {
-      transport.once('close', () => {
-        done();
-      });
-
-      transport.execute('eth_call');
-    });
-
-    it('emits open event', (done) => {
-      mockHttp([{ method: 'eth_call', reply: { result: '' } }]);
-
-      transport.once('open', () => {
-        done();
-      });
-
-      transport.execute('eth_call');
-    });
-  });
-
-  describe('transport', () => {
-    const RESULT = ['this is some result'];
-
-    let scope;
-    let result;
-
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_call', reply: { result: RESULT } }]);
-
-      return transport
-        .execute('eth_call', 1, 2, 3, 'test')
-        .then((_result) => {
-          result = _result;
-        });
-    });
-
-    it('makes POST', () => {
-      expect(scope.isDone()).to.be.true;
-    });
-
-    it('sets jsonrpc', () => {
-      expect(scope.body.eth_call.jsonrpc).to.equal('2.0');
-    });
-
-    it('sets the method', () => {
-      expect(scope.body.eth_call.method).to.equal('eth_call');
-    });
-
-    it('passes the params', () => {
-      expect(scope.body.eth_call.params).to.deep.equal([1, 2, 3, 'test']);
-    });
-
-    it('increments the id', () => {
-      expect(scope.body.eth_call.id).not.to.equal(0);
-    });
-
-    it('passes the actual result back', () => {
-      expect(result).to.deep.equal(RESULT);
-    });
-  });
-
-  describe('HTTP errors', () => {
-    let scope;
-    let error;
-
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_call', reply: {}, code: 500 }]);
-
-      return transport
-        .execute('eth_call')
-        .catch((_error) => {
-          error = _error;
-        });
-    });
-
-    it('returns HTTP errors as throws', () => {
-      expect(scope.isDone()).to.be.true;
-      expect(error.message).to.match(/Internal Server Error/);
-    });
-  });
-
-  describe('RPC errors', () => {
-    const ERROR = { code: -1, message: 'ERROR: RPC failure' };
-
-    let scope;
-    let error;
-
-    beforeEach(() => {
-      scope = mockHttp([{ method: 'eth_call', reply: { error: ERROR } }]);
-
-      return transport
-        .execute('eth_call')
-        .catch((_error) => {
-          error = _error;
-        });
-    });
-
-    it('returns RPC errors as throws', () => {
-      expect(scope.isDone()).to.be.true;
-      expect(error.message).to.match(/RPC failure/);
-    });
-  });
-});
diff --git a/js/src/api/transport/http/index.js b/js/src/api/transport/http/index.js
deleted file mode 100644
index dfd1721653582cd273d0313bdadb6de30c251ed8..0000000000000000000000000000000000000000
--- a/js/src/api/transport/http/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './http';
diff --git a/js/src/api/transport/index.js b/js/src/api/transport/index.js
deleted file mode 100644
index fdd3861a84e051a32470025ac32f1a10a78c85ea..0000000000000000000000000000000000000000
--- a/js/src/api/transport/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export Http from './http';
-export Ws from './ws';
-export TransportError from './error';
-export Middleware from './middleware';
diff --git a/js/src/api/transport/jsonRpcBase.js b/js/src/api/transport/jsonRpcBase.js
deleted file mode 100644
index 819e1f496ff723aea7c2b995c83052d25d0f10a9..0000000000000000000000000000000000000000
--- a/js/src/api/transport/jsonRpcBase.js
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import EventEmitter from 'eventemitter3';
-import { Logging } from '../subscriptions';
-
-export default class JsonRpcBase extends EventEmitter {
-  constructor () {
-    super();
-
-    this._id = 1;
-    this._debug = false;
-    this._connected = false;
-    this._middlewareList = Promise.resolve([]);
-  }
-
-  encode (method, params) {
-    const json = JSON.stringify({
-      jsonrpc: '2.0',
-      method: method,
-      params: params,
-      id: this._id++
-    });
-
-    return json;
-  }
-
-  addMiddleware (Middleware) {
-    this._middlewareList = Promise
-      .all([
-        Middleware,
-        this._middlewareList
-      ])
-      .then(([Middleware, middlewareList]) => {
-        // Do nothing if `handlerPromise` resolves to a null-y value.
-        if (Middleware == null) {
-          return middlewareList;
-        }
-
-        // don't mutate the original array
-        return middlewareList.concat([new Middleware(this)]);
-      });
-  }
-
-  _wrapSuccessResult (result) {
-    return {
-      id: this._id,
-      jsonrpc: '2.0',
-      result
-    };
-  }
-
-  _wrapErrorResult (error) {
-    return {
-      id: this._id,
-      jsonrpc: '2.0',
-      error: {
-        code: error.code,
-        message: error.text
-      }
-    };
-  }
-
-  execute (method, ...params) {
-    return this._middlewareList.then((middlewareList) => {
-      for (const middleware of middlewareList) {
-        const res = middleware.handle(method, params);
-
-        if (res != null) {
-          return Promise
-            .resolve(res)
-            .then((res) => {
-              const result = this._wrapSuccessResult(res);
-              const json = this.encode(method, params);
-
-              Logging.send(method, params, { json, result });
-
-              return res;
-            });
-        }
-      }
-
-      return this._execute(method, params);
-    });
-  }
-
-  _execute () {
-    throw new Error('Missing implementation of JsonRpcBase#_execute');
-  }
-
-  _setConnected () {
-    if (!this._connected) {
-      this._connected = true;
-      this.emit('open');
-    }
-  }
-
-  _setDisconnected () {
-    if (this._connected) {
-      this._connected = false;
-      this.emit('close');
-    }
-  }
-
-  get id () {
-    return this._id;
-  }
-
-  get isDebug () {
-    return this._debug;
-  }
-
-  get isConnected () {
-    return this._connected;
-  }
-
-  setDebug (flag) {
-    this._debug = flag;
-  }
-
-  error (error) {
-    if (this.isDebug) {
-      console.error(error);
-    }
-  }
-
-  log (log) {
-    if (this.isDebug) {
-      console.log(log);
-    }
-  }
-}
diff --git a/js/src/api/transport/jsonRpcBase.spec.js b/js/src/api/transport/jsonRpcBase.spec.js
deleted file mode 100644
index 6c3b955647eaa1dcc3b81a8d4d1a62edf3a40360..0000000000000000000000000000000000000000
--- a/js/src/api/transport/jsonRpcBase.spec.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import JsonRpcBase from './jsonRpcBase';
-
-const base = new JsonRpcBase();
-
-describe('api/transport/JsonRpcBase', () => {
-  describe('encode', () => {
-    it('encodes the body correctly, incrementing id', () => {
-      const id = base.id;
-      const bdy = base.encode('someMethod', ['param1', 'param2']);
-      const enc = `{"jsonrpc":"2.0","method":"someMethod","params":["param1","param2"],"id":${id}}`;
-
-      expect(bdy).to.equal(enc);
-      expect(base.id - id).to.equal(1);
-    });
-  });
-
-  describe('setDebug', () => {
-    it('starts with disabled flag', () => {
-      expect(base.isDebug).to.be.false;
-    });
-
-    it('true flag switches on', () => {
-      base.setDebug(true);
-      expect(base.isDebug).to.be.true;
-    });
-
-    it('false flag switches off', () => {
-      base.setDebug(true);
-      expect(base.isDebug).to.be.true;
-      base.setDebug(false);
-      expect(base.isDebug).to.be.false;
-    });
-
-    describe('logging', () => {
-      beforeEach(() => {
-        sinon.spy(console, 'log');
-        sinon.spy(console, 'error');
-      });
-
-      afterEach(() => {
-        console.log.restore();
-        console.error.restore();
-      });
-
-      it('does not log errors with flag off', () => {
-        base.setDebug(false);
-        base.log('error');
-        expect(console.log).to.not.be.called;
-      });
-
-      it('does not log errors with flag off', () => {
-        base.setDebug(false);
-        base.error('error');
-        expect(console.error).to.not.be.called;
-      });
-
-      it('does log errors with flag on', () => {
-        base.setDebug(true);
-        base.log('error');
-        expect(console.log).to.be.called;
-      });
-
-      it('does log errors with flag on', () => {
-        base.setDebug(true);
-        base.error('error');
-        expect(console.error).to.be.called;
-      });
-    });
-  });
-});
diff --git a/js/src/api/transport/middleware.js b/js/src/api/transport/middleware.js
deleted file mode 100644
index ef029b1cbc8db9b3ca94c2cd4915e77ec2426a67..0000000000000000000000000000000000000000
--- a/js/src/api/transport/middleware.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default class Middleware {
-  constructor (transport) {
-    this._transport = transport;
-    this._handlers = {};
-  }
-
-  register (method, handler) {
-    if (method in this._handlers) {
-      throw new Error(`${method} is already defined in the middleware!`);
-    }
-
-    this._handlers[method] = handler;
-  }
-
-  handle (method, params) {
-    const handler = this._handlers[method];
-
-    if (handler != null) {
-      return handler(params);
-    }
-
-    return null;
-  }
-
-  rpcRequest (method, params) {
-    return this._transport._execute(method, params);
-  }
-}
diff --git a/js/src/api/transport/middleware.spec.js b/js/src/api/transport/middleware.spec.js
deleted file mode 100644
index 4ae894135bcc79c7bb8177eb8ac26cc5e1fc3cca..0000000000000000000000000000000000000000
--- a/js/src/api/transport/middleware.spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Middleware from './middleware';
-import JsonRpcBase from './jsonRpcBase';
-
-const MOCKED = 'mocked!';
-
-class MockTransport extends JsonRpcBase {
-  _execute () {
-    return Promise.resolve(MOCKED);
-  }
-}
-
-class MockMiddleware extends Middleware {
-  constructor (transport) {
-    super(transport);
-
-    this.register('mock_rpc', ([num]) => num);
-    this.register('mock_null', () => null);
-  }
-}
-
-describe('api/transport/Middleware', () => {
-  let transport;
-
-  beforeEach(() => {
-    transport = new MockTransport();
-    transport.addMiddleware(MockMiddleware);
-  });
-
-  it('Routes requests to middleware', () => {
-    return transport.execute('mock_rpc', 100).then((num) => {
-      expect(num).to.be.equal(100);
-    });
-  });
-
-  it('Passes non-mocked requests through', () => {
-    return transport.execute('not_moced', 200).then((result) => {
-      expect(result).to.be.equal(MOCKED);
-    });
-  });
-
-  it('Passes mocked requests through, if middleware returns null', () => {
-    return transport.execute('mock_null', 300).then((result) => {
-      expect(result).to.be.equal(MOCKED);
-    });
-  });
-});
diff --git a/js/src/api/transport/ws/index.js b/js/src/api/transport/ws/index.js
deleted file mode 100644
index 7ab0be1310c387b669817e2bc9f1387a86d7b68a..0000000000000000000000000000000000000000
--- a/js/src/api/transport/ws/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './ws';
diff --git a/js/src/api/transport/ws/ws.e2e.js b/js/src/api/transport/ws/ws.e2e.js
deleted file mode 100644
index 42e47451c3bba3d8c44436d73997f94e21653274..0000000000000000000000000000000000000000
--- a/js/src/api/transport/ws/ws.e2e.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Ws from './ws';
-
-const ws = new Ws('ws://localhost:8546/');
-
-describe('transport/Ws', () => {
-  it('connects and makes a call to web3_clientVersion', () => {
-    return ws.execute('web3_clientVersion').then((version) => {
-      const [client] = version.split('/');
-
-      expect(client === 'Geth' || client === 'Parity').to.be.ok;
-    });
-  });
-});
diff --git a/js/src/api/transport/ws/ws.js b/js/src/api/transport/ws/ws.js
deleted file mode 100644
index 9c276772dc366cd297110a0f62c9ba0f33b84005..0000000000000000000000000000000000000000
--- a/js/src/api/transport/ws/ws.js
+++ /dev/null
@@ -1,387 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { keccak_256 } from 'js-sha3'; // eslint-disable-line camelcase
-
-import { Logging } from '../../subscriptions';
-import JsonRpcBase from '../jsonRpcBase';
-import TransportError from '../error';
-
-/* global WebSocket */
-export default class Ws extends JsonRpcBase {
-  // token is optional (secure API)
-  constructor (url, token = null, autoconnect = true) {
-    super();
-
-    this._url = url;
-    this._token = token;
-    this._messages = {};
-    this._subscriptions = { 'eth_subscription': [], 'parity_subscription': [], 'shh_subscription': [] };
-    this._sessionHash = null;
-
-    this._connecting = false;
-    this._connected = false;
-    this._lastError = null;
-    this._autoConnect = autoconnect;
-    this._retries = 0;
-    this._reconnectTimeoutId = null;
-
-    this._connectPromise = null;
-    this._connectPromiseFunctions = {};
-
-    if (autoconnect) {
-      this.connect();
-    }
-  }
-
-  updateToken (token, connect = true) {
-    this._token = token;
-    // this._autoConnect = true;
-
-    if (connect) {
-      this.connect();
-    }
-  }
-
-  connect () {
-    if (this._connected) {
-      return Promise.resolve();
-    }
-
-    if (this._connecting) {
-      return this._connectPromise || Promise.resolve();
-    }
-
-    if (this._reconnectTimeoutId) {
-      window.clearTimeout(this._reconnectTimeoutId);
-      this._reconnectTimeoutId = null;
-    }
-
-    if (this._ws) {
-      this._ws.onerror = null;
-      this._ws.onopen = null;
-      this._ws.onclose = null;
-      this._ws.onmessage = null;
-      this._ws.close();
-      this._ws = null;
-      this._sessionHash = null;
-    }
-    this._connecting = true;
-    this._connected = false;
-    this._lastError = null;
-
-    // rpc secure API
-    if (this._token) {
-      const time = parseInt(new Date().getTime() / 1000, 10);
-      const sha3 = keccak_256(`${this._token}:${time}`);
-      const hash = `${sha3}_${time}`;
-
-      this._sessionHash = sha3;
-      this._ws = new WebSocket(this._url, hash);
-    // non-secure API
-    } else {
-      this._ws = new WebSocket(this._url);
-    }
-
-    this._ws.onerror = this._onError;
-    this._ws.onopen = this._onOpen;
-    this._ws.onclose = this._onClose;
-    this._ws.onmessage = this._onMessage;
-
-    // Get counts in dev mode only
-    if (process.env.NODE_ENV === 'development') {
-      this._count = 0;
-      this._lastCount = {
-        timestamp: Date.now(),
-        count: 0
-      };
-
-      window.setInterval(() => {
-        const n = this._count - this._lastCount.count;
-        const t = (Date.now() - this._lastCount.timestamp) / 1000;
-        const s = Math.round(1000 * n / t) / 1000;
-
-        if (this._debug) {
-          console.log('::parityWS', `speed: ${s} req/s`, `count: ${this._count}`, `(+${n})`);
-        }
-
-        this._lastCount = {
-          timestamp: Date.now(),
-          count: this._count
-        };
-      }, 5000);
-
-      window._parityWS = this;
-    }
-
-    this._connectPromise = new Promise((resolve, reject) => {
-      this._connectPromiseFunctions = { resolve, reject };
-    });
-
-    return this._connectPromise;
-  }
-
-  _onOpen = (event) => {
-    this._setConnected();
-    this._connecting = false;
-    this._retries = 0;
-
-    Object.keys(this._messages)
-      .filter((id) => this._messages[id].queued)
-      .forEach(this._send);
-
-    this._connectPromiseFunctions.resolve();
-
-    this._connectPromise = null;
-    this._connectPromiseFunctions = {};
-  }
-
-  _onClose = (event) => {
-    this._setDisconnected();
-    this._connecting = false;
-
-    event.timestamp = Date.now();
-    this._lastError = event;
-
-    if (this._autoConnect) {
-      const timeout = this.retryTimeout;
-
-      const time = timeout < 1000
-        ? Math.round(timeout) + 'ms'
-        : (Math.round(timeout / 10) / 100) + 's';
-
-      console.log('ws:onClose', `trying again in ${time}...`);
-
-      this._reconnectTimeoutId = setTimeout(() => {
-        this.connect();
-      }, timeout);
-
-      return;
-    }
-
-    if (this._connectPromise) {
-      this._connectPromiseFunctions.reject(event);
-
-      this._connectPromise = null;
-      this._connectPromiseFunctions = {};
-    }
-
-    console.log('ws:onClose');
-  }
-
-  _onError = (event) => {
-    // Only print error if the WS is connected
-    // ie. don't print if error == closed
-    window.setTimeout(() => {
-      if (this._connected) {
-        console.error('ws:onError');
-
-        event.timestamp = Date.now();
-        this._lastError = event;
-
-        if (this._connectPromise) {
-          this._connectPromiseFunctions.reject(event);
-
-          this._connectPromise = null;
-          this._connectPromiseFunctions = {};
-        }
-      }
-    }, 50);
-  }
-
-  _extract = (result) => {
-    const { result: res, id, method, params } = result;
-    const msg = this._messages[id];
-
-    // initial pubsub ACK
-    if (id && msg.subscription) {
-      // save subscription to map subId -> messageId
-      this._subscriptions[msg.subscription][res] = id;
-      // resolve promise with messageId because subId's can collide (eth/parity)
-      msg.resolve(id);
-      // save subId for unsubscribing later
-      msg.subId = res;
-      return msg;
-    }
-
-    // normal message
-    if (id) {
-      return msg;
-    }
-
-    // pubsub format
-    if (method.includes('subscription')) {
-      const messageId = this._messages[this._subscriptions[method][params.subscription]];
-
-      if (messageId) {
-        return messageId;
-      } else {
-        throw Error(`Received Subscription which is already unsubscribed ${JSON.stringify(result)}`);
-      }
-    }
-
-    throw Error(`Unknown message format: No ID or subscription ${JSON.stringify(result)}`);
-  }
-
-  _onMessage = (event) => {
-    try {
-      const result = JSON.parse(event.data);
-      const { method, params, json, resolve, reject, callback, subscription } = this._extract(result);
-
-      Logging.send(method, params, { json, result });
-
-      result.error = (result.params && result.params.error) || result.error;
-      if (result.error) {
-        this.error(event.data);
-
-        // Don't print error if request rejected or not is not yet up...
-        if (!/(rejected|not yet up)/.test(result.error.message)) {
-          console.error(`${method}(${JSON.stringify(params)}): ${result.error.code}: ${result.error.message}`);
-        }
-
-        const error = new TransportError(method, result.error.code, result.error.message);
-
-        if (result.id) {
-          reject(error);
-        } else {
-          callback(error);
-        }
-
-        delete this._messages[result.id];
-        return;
-      }
-
-      // if not initial subscription message resolve & delete
-      if (result.id && !subscription) {
-        resolve(result.result);
-        delete this._messages[result.id];
-      } else if (result.params) {
-        callback(null, result.params.result);
-      }
-    } catch (e) {
-      console.error('ws::_onMessage', event.data, e);
-    }
-  }
-
-  _send = (id) => {
-    const message = this._messages[id];
-
-    if (this._connected) {
-      if (process.env.NODE_ENV === 'development') {
-        this._count++;
-      }
-
-      return this._ws.send(message.json);
-    }
-
-    message.queued = !this._connected;
-    message.timestamp = Date.now();
-  }
-
-  _execute (method, params) {
-    return new Promise((resolve, reject) => {
-      const id = this.id;
-      const json = this.encode(method, params);
-
-      this._messages[id] = { id, method, params, json, resolve, reject };
-      this._send(id);
-    });
-  }
-
-  _methodsFromApi (api) {
-    const method = `${api}_subscribe`;
-    const uMethod = `${api}_unsubscribe`;
-    const subscription = `${api}_subscription`;
-
-    return { method, uMethod, subscription };
-  }
-
-  subscribe (api, callback, ...params) {
-    return new Promise((resolve, reject) => {
-      const id = this.id;
-      const { method, uMethod, subscription } = this._methodsFromApi(api);
-      const json = this.encode(method, params);
-
-      this._messages[id] = { id, method, uMethod, params, json, resolve, reject, callback, subscription };
-
-      this._send(id);
-    });
-  }
-
-  unsubscribe (messageId) {
-    return new Promise((resolve, reject) => {
-      const id = this.id;
-      const { subId, uMethod, subscription } = this._messages[messageId];
-      const params = [subId];
-      const json = this.encode(uMethod, params);
-      const uResolve = (v) => {
-        delete this._messages[messageId];
-        delete this._subscriptions[subscription][subId];
-        resolve(v);
-      };
-
-      this._messages[id] = { id, method: uMethod, params, json, resolve: uResolve, reject };
-      this._send(id);
-    });
-  }
-
-  set url (url) {
-    this._url = url;
-  }
-
-  get token () {
-    return this._token;
-  }
-
-  get sessionHash () {
-    return this._sessionHash;
-  }
-
-  get isAutoConnect () {
-    return this._autoConnect;
-  }
-
-  get isConnecting () {
-    return this._connecting;
-  }
-
-  get lastError () {
-    return this._lastError;
-  }
-
-  /**
-   * Exponential Timeout for Retries
-   *
-   * @see http://dthain.blogspot.de/2009/02/exponential-backoff-in-distributed.html
-   */
-  get retryTimeout () {
-    // R between 1 and 2
-    const R = Math.random() + 1;
-    // Initial timeout (100ms)
-    const T = 100;
-    // Exponential Factor
-    const F = 2;
-    // Max timeout (4s)
-    const M = 4000;
-    // Current number of retries
-    const N = this._retries;
-
-    // Increase retries number
-    this._retries++;
-
-    return Math.min(R * T * Math.pow(F, N), M);
-  }
-}
diff --git a/js/src/api/transport/ws/ws.spec.js b/js/src/api/transport/ws/ws.spec.js
deleted file mode 100644
index 0d3c9836f5e7941af3544f19845427b2c0fd3d26..0000000000000000000000000000000000000000
--- a/js/src/api/transport/ws/ws.spec.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { TEST_WS_URL, mockWs } from '../../../../test/mockRpc';
-import Ws from './ws';
-
-describe('api/transport/Ws', () => {
-  let transport;
-  let scope;
-
-  describe('transport emitter', () => {
-    const connect = () => {
-      const scope = mockWs();
-      const transport = new Ws(TEST_WS_URL);
-
-      return { transport, scope };
-    };
-
-    it('emits open event', (done) => {
-      const { transport, scope } = connect();
-
-      transport.once('open', () => {
-        done();
-      });
-
-      scope.stop();
-    });
-
-    it('emits close event', (done) => {
-      const { transport, scope } = connect();
-
-      transport.once('open', () => {
-        scope.server.close();
-      });
-
-      transport.once('close', () => {
-        done();
-      });
-    });
-  });
-
-  describe('transport', () => {
-    let result;
-
-    beforeEach(() => {
-      scope = mockWs([{ method: 'test_anyCall', reply: 'TestResult' }]);
-      transport = new Ws(TEST_WS_URL);
-
-      return transport
-        .execute('test_anyCall', 1, 2, 3)
-        .then((_result) => {
-          result = _result;
-        });
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('makes call', () => {
-      expect(scope.isDone()).to.be.true;
-    });
-
-    it('sets jsonrpc', () => {
-      expect(scope.body.test_anyCall.jsonrpc).to.equal('2.0');
-    });
-
-    it('sets the method', () => {
-      expect(scope.body.test_anyCall.method).to.equal('test_anyCall');
-    });
-
-    it('passes the params', () => {
-      expect(scope.body.test_anyCall.params).to.deep.equal([1, 2, 3]);
-    });
-
-    it('increments the id', () => {
-      expect(scope.body.test_anyCall.id).not.to.equal(0);
-    });
-
-    it('passes the actual result back', () => {
-      expect(result).to.equal('TestResult');
-    });
-  });
-
-  describe('errors', () => {
-    beforeEach(() => {
-      scope = mockWs([{ method: 'test_anyCall', reply: { error: { code: 1, message: 'TestError' } } }]);
-      transport = new Ws(TEST_WS_URL);
-    });
-
-    afterEach(() => {
-      scope.stop();
-    });
-
-    it('returns RPC errors when encountered', () => {
-      return transport
-        .execute('test_anyCall')
-        .catch((error) => {
-          expect(error).to.match(/TestError/);
-        });
-    });
-  });
-});
diff --git a/js/src/api/util/decode.js b/js/src/api/util/decode.js
deleted file mode 100644
index 926a5a8a15439b8c49ac3b27cd66c2e190ece91d..0000000000000000000000000000000000000000
--- a/js/src/api/util/decode.js
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isHex } from './types';
-
-import Func from '../../abi/spec/function';
-import { fromParamType, toParamType } from '../../abi/spec/paramType/format';
-
-export function decodeCallData (data) {
-  if (!isHex(data)) {
-    throw new Error('Input to decodeCallData should be a hex value');
-  }
-
-  if (data.substr(0, 2) === '0x') {
-    return decodeCallData(data.slice(2));
-  }
-
-  if (data.length < 8) {
-    throw new Error('Input to decodeCallData should be method signature + data');
-  }
-
-  const signature = data.substr(0, 8);
-  const paramdata = data.substr(8);
-
-  return {
-    signature: `0x${signature}`,
-    paramdata: `0x${paramdata}`
-  };
-}
-
-export function decodeMethodInput (methodAbi, paramdata) {
-  if (!methodAbi) {
-    throw new Error('decodeMethodInput should receive valid method-specific ABI');
-  }
-
-  if (paramdata && paramdata.length) {
-    if (!isHex(paramdata)) {
-      throw new Error('Input to decodeMethodInput should be a hex value');
-    }
-
-    if (paramdata.substr(0, 2) === '0x') {
-      return decodeMethodInput(methodAbi, paramdata.slice(2));
-    }
-  }
-
-  return new Func(methodAbi).decodeInput(paramdata).map((decoded) => decoded.value);
-}
-
-// takes a method in form name(...,types) and returns the inferred abi definition
-export function methodToAbi (method) {
-  const length = method.length;
-  const typesStart = method.indexOf('(');
-  const typesEnd = method.indexOf(')');
-
-  if (typesStart === -1) {
-    throw new Error(`Missing start ( in call to decodeMethod with ${method}`);
-  } else if (typesEnd === -1) {
-    throw new Error(`Missing end ) in call to decodeMethod with ${method}`);
-  } else if (typesEnd < typesStart) {
-    throw new Error(`End ) is before start ( in call to decodeMethod with ${method}`);
-  } else if (typesEnd !== length - 1) {
-    throw new Error(`Extra characters after end ) in call to decodeMethod with ${method}`);
-  }
-
-  const name = method.substr(0, typesStart);
-  const types = method.substr(typesStart + 1, length - (typesStart + 1) - 1).split(',');
-  const inputs = types.filter((_type) => _type.length).map((_type) => {
-    const type = fromParamType(toParamType(_type));
-
-    return { type };
-  });
-
-  return { type: 'function', name, inputs };
-}
-
-export function abiDecode (inputTypes, data) {
-  return decodeMethodInput({
-    inputs: inputTypes.map((type) => {
-      return { type };
-    })
-  }, data);
-}
diff --git a/js/src/api/util/decode.spec.js b/js/src/api/util/decode.spec.js
deleted file mode 100644
index 006c6a86392f78c99123e399b16d19ab195a94f7..0000000000000000000000000000000000000000
--- a/js/src/api/util/decode.spec.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { abiDecode, decodeCallData, decodeMethodInput, methodToAbi } from './decode';
-
-describe('api/util/decode', () => {
-  const METH = '0x70a08231';
-  const ENCO = '0x70a082310000000000000000000000005A5eFF38DA95b0D58b6C616f2699168B480953C9';
-  const DATA = '0x0000000000000000000000005A5eFF38DA95b0D58b6C616f2699168B480953C9';
-
-  describe('decodeCallData', () => {
-    it('throws on non-hex inputs', () => {
-      expect(() => decodeCallData('invalid')).to.throw(/should be a hex value/);
-    });
-
-    it('throws when invalid signature length', () => {
-      expect(() => decodeCallData(METH.slice(-6))).to.throw(/should be method signature/);
-    });
-
-    it('splits valid inputs properly', () => {
-      expect(decodeCallData(ENCO)).to.deep.equal({
-        signature: METH,
-        paramdata: DATA
-      });
-    });
-  });
-
-  describe('decodeMethodInput', () => {
-    it('expects a valid ABI', () => {
-      expect(() => decodeMethodInput(null, null)).to.throw(/should receive valid method/);
-    });
-
-    it('expect valid hex parameter data', () => {
-      expect(() => decodeMethodInput({}, 'invalid')).to.throw(/should be a hex value/);
-    });
-
-    it('correctly decodes valid inputs', () => {
-      expect(
-        decodeMethodInput({
-          type: 'function',
-          inputs: [
-            { type: 'uint' }
-          ]
-        }, DATA)
-      ).to.deep.equal(
-        [ new BigNumber('0x5a5eff38da95b0d58b6c616f2699168b480953c9') ]
-      );
-    });
-  });
-
-  describe('methodToAbi', () => {
-    it('throws when no start ( specified', () => {
-      expect(() => methodToAbi('invalid,uint,bool)')).to.throw(/Missing start \(/);
-    });
-
-    it('throws when no end ) specified', () => {
-      expect(() => methodToAbi('invalid(uint,bool')).to.throw(/Missing end \)/);
-    });
-
-    it('throws when end ) is not in the last position', () => {
-      expect(() => methodToAbi('invalid(uint,bool)2')).to.throw(/Extra characters after end \)/);
-    });
-
-    it('throws when start ( is after end )', () => {
-      expect(() => methodToAbi('invalid)uint,bool(')).to.throw(/End \) is before start \(/);
-    });
-
-    it('throws when invalid types are present', () => {
-      expect(() => methodToAbi('method(invalidType,bool,uint)')).to.throw(/Cannot convert invalidType/);
-    });
-
-    it('returns a valid methodabi for a valid method', () => {
-      expect(methodToAbi('valid(uint,bool)')).to.deep.equals({
-        type: 'function',
-        name: 'valid',
-        inputs: [
-          { type: 'uint256' },
-          { type: 'bool' }
-        ]
-      });
-    });
-  });
-
-  describe('abiDecode', () => {
-    it('correctly decodes valid inputs', () => {
-      expect(abiDecode(['uint'], DATA)).to.deep.equal(
-        [ new BigNumber('0x5a5eff38da95b0d58b6c616f2699168b480953c9') ]
-      );
-    });
-  });
-});
diff --git a/js/src/api/util/encode.js b/js/src/api/util/encode.js
deleted file mode 100644
index f18fbbe2b7b1045765449333ce052861df995440..0000000000000000000000000000000000000000
--- a/js/src/api/util/encode.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Abi from '~/abi';
-import Func from '~/abi/spec/function';
-
-import { abiDecode } from './decode';
-import { cleanupValue } from './format';
-import { sha3 } from './sha3';
-
-export function encodeMethodCallAbi (methodAbi = {}, values = []) {
-  const func = new Func(methodAbi);
-  const tokens = Abi.encodeTokens(func.inputParamTypes(), values);
-  const call = func.encodeCall(tokens);
-
-  return `0x${call}`;
-}
-
-export function abiEncode (methodName, inputTypes, data) {
-  const result = encodeMethodCallAbi({
-    name: methodName || '',
-    type: 'function',
-    inputs: inputTypes.map((type) => {
-      return { type };
-    })
-  }, data);
-
-  return result;
-}
-
-export function abiUnencode (abi, data) {
-  const callsig = data.substr(2, 8);
-  const op = abi.find((field) => {
-    return field.type === 'function' &&
-      abiSignature(field.name, field.inputs.map((input) => input.type)).substr(2, 8) === callsig;
-  });
-
-  if (!op) {
-    console.warn(`Unknown function ID: ${callsig}`);
-    return null;
-  }
-
-  let argsByIndex = abiDecode(op.inputs.map((field) => field.type), '0x' + data.substr(10))
-    .map((value, index) => cleanupValue(value, op.inputs[index].type));
-  const argsByName = op.inputs.reduce((result, field, index) => {
-    result[field.name] = argsByIndex[index];
-
-    return result;
-  }, {});
-
-  return [op.name, argsByName, argsByIndex];
-}
-
-export function abiSignature (name, inputs) {
-  return sha3(`${name}(${inputs.join()})`);
-}
diff --git a/js/src/api/util/encode.spec.js b/js/src/api/util/encode.spec.js
deleted file mode 100644
index 7847f06ecc804fe6bd89c731c279e114e0086419..0000000000000000000000000000000000000000
--- a/js/src/api/util/encode.spec.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { abiEncode, abiUnencode, abiSignature, encodeMethodCallAbi } from './encode';
-
-const ABI = {
-  type: 'function',
-  name: 'valid',
-  inputs: [
-    { type: 'uint256' },
-    { type: 'bool' }
-  ]
-};
-
-const RESULT = [
-  'f87fa141',
-  '0000000000000000000000000000000000000000000000000000000000000123',
-  '0000000000000000000000000000000000000000000000000000000000000001'
-].join('');
-const VARIABLE = [
-  '5a6fbce0',
-  'c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470',
-  '0000000000000000000000000000000000000000000000000000000000000040',
-  '000000000000000000000000000000000000000000000000000000000000000f',
-  '687474703a2f2f666f6f2e6261722f0000000000000000000000000000000000'
-].join('');
-
-describe('api/util/encode', () => {
-  describe('encodeMethodCallAbi', () => {
-    it('encodes calls with the correct result', () => {
-      expect(encodeMethodCallAbi(ABI, [0x123, true])).to.equal(`0x${RESULT}`);
-    });
-  });
-
-  describe('abiEncode', () => {
-    it('encodes calls with the correct result', () => {
-      expect(abiEncode('valid', ['uint256', 'bool'], [0x123, true])).to.equal(`0x${RESULT}`);
-    });
-
-    it('encodes variable values', () => {
-      expect(
-        abiEncode(
-          'hintUrl', ['bytes32', 'string'], ['0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470', 'http://foo.bar/']
-        )
-      ).to.equal(`0x${VARIABLE}`);
-    });
-
-    it('encodes only the data with null name', () => {
-      expect(
-        abiEncode(null, ['uint256', 'bool'], [0x123, true])
-      ).to.equal(`0x${RESULT.substr(8)}`);
-    });
-  });
-
-  describe('abiUnencode', () => {
-    it('decodes data correctly from abi', () => {
-      expect(
-        abiUnencode([{
-          name: 'test',
-          type: 'function',
-          inputs: [
-            { type: 'uint', name: 'arga' }
-          ]
-        }], '0x1acb6f7700000000000000000000000000000038')
-      ).to.deep.equal(['test', { arga: 56 }, [56]]);
-    });
-  });
-
-  // Same example as in abi/util/signature.spec.js
-  describe('abiSignature', () => {
-    it('encodes baz(uint32,bool) correctly', () => {
-      expect(
-        abiSignature('baz', ['uint32', 'bool'])
-      ).to.equal('0xcdcd77c0992ec5bbfc459984220f8c45084cc24d9b6efed1fae540db8de801d2');
-    });
-  });
-});
diff --git a/js/src/api/util/format.js b/js/src/api/util/format.js
deleted file mode 100644
index 6a4a81d4004dee944817fde894c2eaeb9169269f..0000000000000000000000000000000000000000
--- a/js/src/api/util/format.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { range } from 'lodash';
-
-export function bytesToHex (bytes) {
-  return '0x' + Buffer.from(bytes).toString('hex');
-}
-
-export function cleanupValue (value, type) {
-  // TODO: make work with arbitrary depth arrays
-  if (value instanceof Array && type.match(/bytes[0-9]+/)) {
-    // figure out if it's an ASCII string hiding in there:
-    let ascii = '';
-
-    for (let index = 0, ended = false; index < value.length && ascii !== null; ++index) {
-      const val = value[index];
-
-      if (val === 0) {
-        ended = true;
-      } else {
-        ascii += String.fromCharCode(val);
-      }
-
-      if ((ended && val !== 0) || (!ended && (val < 32 || val >= 128))) {
-        ascii = null;
-      }
-    }
-
-    value = ascii === null
-      ? bytesToHex(value)
-      : ascii;
-  }
-
-  if (type.substr(0, 4) === 'uint' && +type.substr(4) <= 48) {
-    value = +value;
-  }
-
-  return value;
-}
-
-export function hexToBytes (hex) {
-  const raw = toHex(hex).slice(2);
-  const bytes = [];
-
-  for (let i = 0; i < raw.length; i += 2) {
-    bytes.push(parseInt(raw.substr(i, 2), 16));
-  }
-
-  return bytes;
-}
-
-export function hexToAscii (hex) {
-  const bytes = hexToBytes(hex);
-  const str = bytes.map((byte) => String.fromCharCode(byte)).join('');
-
-  return str;
-}
-
-export function bytesToAscii (bytes) {
-  return bytes.map((b) => String.fromCharCode(b % 512)).join('');
-}
-
-export function asciiToHex (string) {
-  return '0x' + string.split('')
-    .map(s => s.charCodeAt(0))
-    .map(s => s < 0x10 ? '0' + s.toString(16) : s.toString(16))
-    .join('');
-}
-
-export function padRight (input, length) {
-  const value = toHex(input).substr(2, length * 2);
-
-  return '0x' + value + range(length * 2 - value.length).map(() => '0').join('');
-}
-
-export function padLeft (input, length) {
-  const value = toHex(input).substr(2, length * 2);
-
-  return '0x' + range(length * 2 - value.length).map(() => '0').join('') + value;
-}
-
-export function toHex (str) {
-  if (str && str.toString) {
-    str = str.toString(16);
-  }
-
-  if (str && str.substr(0, 2) === '0x') {
-    return str.toLowerCase();
-  }
-
-  return `0x${(str || '').toLowerCase()}`;
-}
diff --git a/js/src/api/util/format.spec.js b/js/src/api/util/format.spec.js
deleted file mode 100644
index ba7a3994e049b7762626df5dbca12c599de8bc8c..0000000000000000000000000000000000000000
--- a/js/src/api/util/format.spec.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { bytesToHex, cleanupValue, hexToBytes, hexToAscii, bytesToAscii, asciiToHex } from './format';
-
-describe('api/util/format', () => {
-  describe('bytesToHex', () => {
-    it('correctly converts an empty array', () => {
-      expect(bytesToHex([])).to.equal('0x');
-    });
-
-    it('correctly converts a non-empty array', () => {
-      expect(bytesToHex([0, 15, 16])).to.equal('0x000f10');
-    });
-  });
-
-  describe('cleanupValue', () => {
-    it('returns unknown values as the original', () => {
-      expect(cleanupValue('original', 'unknown')).to.equal('original');
-    });
-
-    it('returns ascii arrays as ascii', () => {
-      expect(cleanupValue([97, 115, 99, 105, 105, 0], 'bytes32')).to.equal('ascii');
-    });
-
-    it('returns non-ascii arrays as hex strings', () => {
-      expect(cleanupValue([97, 200, 0, 0], 'bytes4')).to.equal('0x61c80000');
-    });
-
-    it('returns uint (>48) as the original', () => {
-      expect(cleanupValue('original', 'uint49')).to.equal('original');
-    });
-
-    it('returns uint (<=48) as the number value', () => {
-      expect(cleanupValue('12345', 'uint48')).to.equal(12345);
-    });
-  });
-
-  describe('hexToBytes', () => {
-    it('correctly converts an empty string', () => {
-      expect(hexToBytes('')).to.deep.equal([]);
-      expect(hexToBytes('0x')).to.deep.equal([]);
-    });
-
-    it('correctly converts a non-empty string', () => {
-      expect(hexToBytes('0x000f10')).to.deep.equal([0, 15, 16]);
-    });
-  });
-
-  describe('asciiToHex', () => {
-    it('correctly converts an empty string', () => {
-      expect(asciiToHex('')).to.equal('0x');
-    });
-
-    it('correctly converts a non-empty string', () => {
-      expect(asciiToHex('abc')).to.equal('0x616263');
-      expect(asciiToHex('a\nb')).to.equal('0x610a62');
-    });
-  });
-
-  describe('hexToAscii', () => {
-    it('correctly converts an empty string', () => {
-      expect(hexToAscii('')).to.equal('');
-      expect(hexToAscii('0x')).to.equal('');
-    });
-
-    it('correctly converts a non-empty string', () => {
-      expect(hexToAscii('0x616263')).to.equal('abc');
-    });
-  });
-
-  describe('bytesToAscii', () => {
-    it('correctly converts an empty string', () => {
-      expect(bytesToAscii([])).to.equal('');
-    });
-
-    it('correctly converts a non-empty string', () => {
-      expect(bytesToAscii([97, 98, 99])).to.equal('abc');
-    });
-  });
-});
diff --git a/js/src/api/util/identity.js b/js/src/api/util/identity.js
deleted file mode 100644
index 4df7ab9bb23a4af8e7eed248aed752a432831256..0000000000000000000000000000000000000000
--- a/js/src/api/util/identity.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import blockies from 'blockies';
-
-// jsdom doesn't have all the browser features, blockies fail
-const TEST_ENV = process.env.NODE_ENV === 'test';
-
-export function createIdentityImg (address, scale = 8) {
-  return TEST_ENV
-    ? 'test-createIdentityImg'
-    : blockies({
-      seed: (address || '').toLowerCase(),
-      size: 8,
-      scale
-    }).toDataURL();
-}
diff --git a/js/src/api/util/index.js b/js/src/api/util/index.js
deleted file mode 100644
index 30328856bd59215d6a9d0b853d1080ed5c9f87ab..0000000000000000000000000000000000000000
--- a/js/src/api/util/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isAddress as isAddressValid, toChecksumAddress } from '../../abi/util/address';
-import { abiDecode, decodeCallData, decodeMethodInput, methodToAbi } from './decode';
-import { abiEncode, abiUnencode, abiSignature, encodeMethodCallAbi } from './encode';
-import { bytesToHex, hexToAscii, hexToBytes, asciiToHex, cleanupValue } from './format';
-import { fromWei, toWei } from './wei';
-import { sha3 } from './sha3';
-import { isArray, isFunction, isHex, isInstanceOf, isString } from './types';
-import { createIdentityImg } from './identity';
-
-export default {
-  abiDecode,
-  abiEncode,
-  abiUnencode,
-  abiSignature,
-  cleanupValue,
-  isAddressValid,
-  isArray,
-  isFunction,
-  isHex,
-  isInstanceOf,
-  isString,
-  bytesToHex,
-  hexToAscii,
-  hexToBytes,
-  asciiToHex,
-  createIdentityImg,
-  decodeCallData,
-  decodeMethodInput,
-  encodeMethodCallAbi,
-  methodToAbi,
-  fromWei,
-  toChecksumAddress,
-  toWei,
-  sha3
-};
diff --git a/js/src/api/util/sha3.js b/js/src/api/util/sha3.js
deleted file mode 100644
index 3ca49cc8e6f54aa60bd66801769ab4c5938803a8..0000000000000000000000000000000000000000
--- a/js/src/api/util/sha3.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { keccak_256 } from 'js-sha3'; // eslint-disable-line
-
-import { hexToBytes } from './format';
-import { isHex } from './types';
-
-export function sha3 (value, options) {
-  const forceHex = options && options.encoding === 'hex';
-
-  if (forceHex || (!options && isHex(value))) {
-    const bytes = hexToBytes(value);
-
-    return sha3(bytes);
-  }
-
-  const hash = keccak_256(value);
-
-  return `0x${hash}`;
-}
-
-sha3.text = (val) => sha3(val, { encoding: 'raw' });
diff --git a/js/src/api/util/sha3.spec.js b/js/src/api/util/sha3.spec.js
deleted file mode 100644
index a5c93d9404aa157a7cd000c983b1f2799ee45d41..0000000000000000000000000000000000000000
--- a/js/src/api/util/sha3.spec.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { sha3 } from './sha3';
-
-describe('api/util/sha3', () => {
-  describe('sha3', () => {
-    it('constructs a correct sha3 value', () => {
-      expect(sha3('jacogr')).to.equal('0x2f4ff4b5a87abbd2edfed699db48a97744e028c7f7ce36444d40d29d792aa4dc');
-    });
-
-    it('constructs a correct sha3 encoded as hex', () => {
-      const key = '000000000000000000000000391694e7e0b0cce554cb130d723a9d27458f9298' + '0000000000000000000000000000000000000000000000000000000000000001';
-
-      expect(sha3(key, { encoding: 'hex' })).to.equal('0x6661e9d6d8b923d5bbaab1b96e1dd51ff6ea2a93520fdc9eb75d059238b8c5e9');
-      expect(sha3(`0x${key}`, { encoding: 'hex' })).to.equal('0x6661e9d6d8b923d5bbaab1b96e1dd51ff6ea2a93520fdc9eb75d059238b8c5e9');
-    });
-
-    it('constructs a correct sha3 from Uint8Array', () => {
-      expect(sha3('01020304', { encoding: 'hex' })).to.equal('0xa6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b');
-      expect(sha3(Uint8Array.from([1, 2, 3, 4]))).to.equal('0xa6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b');
-    });
-
-    it('should interpret as bytes by default', () => {
-      expect(sha3('0x01020304')).to.equal('0xa6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b');
-    });
-
-    it('should force text if option is passed', () => {
-      expect(sha3('0x01020304', { encoding: 'raw' })).to.equal('0x16bff43de576d28857dcba65a56fc17c5e93c09bd6a709268eff8e62025ae869');
-      expect(sha3.text('0x01020304')).to.equal('0x16bff43de576d28857dcba65a56fc17c5e93c09bd6a709268eff8e62025ae869');
-    });
-  });
-});
diff --git a/js/src/api/util/types.js b/js/src/api/util/types.js
deleted file mode 100644
index f4278cb5179de20bcb1c0668de9c4c58eab304bd..0000000000000000000000000000000000000000
--- a/js/src/api/util/types.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const HEXDIGITS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
-
-export function isArray (test) {
-  return Object.prototype.toString.call(test) === '[object Array]';
-}
-
-export function isError (test) {
-  return Object.prototype.toString.call(test) === '[object Error]';
-}
-
-export function isFunction (test) {
-  return Object.prototype.toString.call(test) === '[object Function]';
-}
-
-export function isHex (_test) {
-  if (!isString(_test)) {
-    return false;
-  }
-
-  if (_test.substr(0, 2) === '0x') {
-    return isHex(_test.slice(2));
-  }
-
-  const test = _test.toLowerCase();
-  let hex = true;
-
-  for (let idx = 0; hex && idx < test.length; idx++) {
-    hex = HEXDIGITS.includes(test[idx]);
-  }
-
-  return hex;
-}
-
-export function isObject (test) {
-  return Object.prototype.toString.call(test) === '[object Object]';
-}
-
-export function isString (test) {
-  return Object.prototype.toString.call(test) === '[object String]';
-}
-
-export function isInstanceOf (test, clazz) {
-  return test instanceof clazz;
-}
diff --git a/js/src/api/util/types.spec.js b/js/src/api/util/types.spec.js
deleted file mode 100644
index c8672f8884ffb43300bc2a5f426c115b41c1f1ae..0000000000000000000000000000000000000000
--- a/js/src/api/util/types.spec.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import { isArray, isError, isFunction, isHex, isInstanceOf, isObject, isString } from './types';
-import Eth from '../rpc/eth';
-
-describe('api/util/types', () => {
-  describe('isArray', () => {
-    it('correctly identifies null as false', () => {
-      expect(isArray(null)).to.be.false;
-    });
-
-    it('correctly identifies empty array as true', () => {
-      expect(isArray([])).to.be.true;
-    });
-
-    it('correctly identifies array as true', () => {
-      expect(isArray([1, 2, 3])).to.be.true;
-    });
-  });
-
-  describe('isError', () => {
-    it('correctly identifies null as false', () => {
-      expect(isError(null)).to.be.false;
-    });
-
-    it('correctly identifies Error as true', () => {
-      expect(isError(new Error('an error'))).to.be.true;
-    });
-  });
-
-  describe('isFunction', () => {
-    it('correctly identifies null as false', () => {
-      expect(isFunction(null)).to.be.false;
-    });
-
-    it('correctly identifies function as true', () => {
-      expect(isFunction(sinon.stub())).to.be.true;
-    });
-  });
-
-  describe('isHex', () => {
-    it('correctly identifies hex by leading 0x', () => {
-      expect(isHex('0x123')).to.be.true;
-    });
-
-    it('correctly identifies hex without leading 0x', () => {
-      expect(isHex('123')).to.be.true;
-    });
-
-    it('correctly identifies non-hex values', () => {
-      expect(isHex('123j')).to.be.false;
-    });
-
-    it('correctly indentifies non-string values', () => {
-      expect(isHex(false)).to.be.false;
-      expect(isHex()).to.be.false;
-      expect(isHex([1, 2, 3])).to.be.false;
-    });
-  });
-
-  describe('isInstanceOf', () => {
-    it('correctly identifies build-in instanceof', () => {
-      expect(isInstanceOf(new String('123'), String)).to.be.true; // eslint-disable-line no-new-wrappers
-    });
-
-    it('correctly identifies own instanceof', () => {
-      expect(isInstanceOf(new Eth({}), Eth)).to.be.true;
-    });
-
-    it('correctly reports false for own', () => {
-      expect(isInstanceOf({}, Eth)).to.be.false;
-    });
-  });
-
-  describe('isObject', () => {
-    it('correctly identifies empty object as object', () => {
-      expect(isObject({})).to.be.true;
-    });
-
-    it('correctly identifies non-empty object as object', () => {
-      expect(isObject({ data: '123' })).to.be.true;
-    });
-
-    it('correctly identifies Arrays as non-objects', () => {
-      expect(isObject([1, 2, 3])).to.be.false;
-    });
-
-    it('correctly identifies Strings as non-objects', () => {
-      expect(isObject('123')).to.be.false;
-    });
-  });
-
-  describe('isString', () => {
-    it('correctly identifies empty string as string', () => {
-      expect(isString('')).to.be.true;
-    });
-
-    it('correctly identifies string as string', () => {
-      expect(isString('123')).to.be.true;
-    });
-  });
-});
diff --git a/js/src/api/util/wei.js b/js/src/api/util/wei.js
deleted file mode 100644
index d17df69583715ded6e8af71673c0fedf723a649e..0000000000000000000000000000000000000000
--- a/js/src/api/util/wei.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-const UNITS = ['wei', 'ada', 'babbage', 'shannon', 'szabo', 'finney', 'ether', 'kether', 'mether', 'gether', 'tether'];
-
-export function _getUnitMultiplier (unit) {
-  const position = UNITS.indexOf(unit.toLowerCase());
-
-  if (position === -1) {
-    throw new Error(`Unknown unit ${unit} passed to wei formatter`);
-  }
-
-  return 10 ** (position * 3);
-}
-
-export function fromWei (value, unit = 'ether') {
-  return new BigNumber(value).div(_getUnitMultiplier(unit));
-}
-
-export function toWei (value, unit = 'ether') {
-  return new BigNumber(value).mul(_getUnitMultiplier(unit));
-}
diff --git a/js/src/api/util/wei.spec.js b/js/src/api/util/wei.spec.js
deleted file mode 100644
index 4476a4db6106e68ef5b3412dae12ab7772a71e6e..0000000000000000000000000000000000000000
--- a/js/src/api/util/wei.spec.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { _getUnitMultiplier, fromWei, toWei } from './wei';
-
-describe('api/util/wei', () => {
-  describe('_getUnitMultiplier', () => {
-    it('returns 10^0 for wei', () => {
-      expect(_getUnitMultiplier('wei')).to.equal(10 ** 0);
-    });
-
-    it('returns 10^15 for finney', () => {
-      expect(_getUnitMultiplier('finney')).to.equal(10 ** 15);
-    });
-
-    it('returns 10^18 for ether', () => {
-      expect(_getUnitMultiplier('ether')).to.equal(10 ** 18);
-    });
-
-    it('throws an error on invalid units', () => {
-      expect(() => _getUnitMultiplier('invalid')).to.throw(/passed to wei formatter/);
-    });
-  });
-
-  describe('fromWei', () => {
-    it('formats into ether when nothing specified', () => {
-      expect(fromWei('1230000000000000000').toString()).to.equal('1.23');
-    });
-
-    it('formats into finney when specified', () => {
-      expect(fromWei('1230000000000000000', 'finney').toString()).to.equal('1230');
-    });
-  });
-
-  describe('toWei', () => {
-    it('formats from ether when nothing specified', () => {
-      expect(toWei(1.23).toString()).to.equal('1230000000000000000');
-    });
-
-    it('formats from finney when specified', () => {
-      expect(toWei(1230, 'finney').toString()).to.equal('1230000000000000000');
-    });
-  });
-});
diff --git a/js/src/config.js b/js/src/config.js
deleted file mode 100644
index 5113e9399b68530fe7a9c96e3b2bbf568447271f..0000000000000000000000000000000000000000
--- a/js/src/config.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import LogLevel from 'loglevel';
-
-export const LOG_KEYS = {
-  Balances: {
-    key: 'balances',
-    desc: 'Balances fetching'
-  },
-  CertificationsMiddleware: {
-    key: 'certifications.middleware',
-    desc: 'Certifications Middleware'
-  },
-  TransferModalStore: {
-    key: 'modalsTransferStore',
-    desc: 'Transfer modal MobX store'
-  },
-  Signer: {
-    key: 'secureApi',
-    desc: 'The Signer and the Secure API'
-  }
-};
-
-export const getLogger = (LOG_KEY) => {
-  return LogLevel.getLogger(LOG_KEY.key);
-};
diff --git a/js/src/contracts/abi/badgereg.json b/js/src/contracts/abi/badgereg.json
deleted file mode 100644
index 6ae56393be3b3c4a091b7fe56e885521d34a57b7..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/badgereg.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_addr","type":"address"},{"name":"_name","type":"bytes32"}],"name":"register","outputs":[{"name":"","type":"bool"}],"payable":true,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"fromName","outputs":[{"name":"id","type":"uint256"},{"name":"addr","type":"address"},{"name":"owner","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"badgeCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_id","type":"uint256"},{"name":"_key","type":"bytes32"}],"name":"meta","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"uint256"}],"name":"unregister","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"uint256"},{"name":"_newAddr","type":"address"}],"name":"setAddress","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_addr","type":"address"}],"name":"fromAddress","outputs":[{"name":"id","type":"uint256"},{"name":"name","type":"bytes32"},{"name":"owner","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_id","type":"uint256"}],"name":"badge","outputs":[{"name":"addr","type":"address"},{"name":"name","type":"bytes32"},{"name":"owner","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"uint256"},{"name":"_key","type":"bytes32"},{"name":"_value","type":"bytes32"}],"name":"setMeta","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_addr","type":"address"},{"name":"_name","type":"bytes32"},{"name":"_owner","type":"address"}],"name":"registerAs","outputs":[{"name":"","type":"bool"}],"payable":true,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"id","type":"uint256"},{"indexed":false,"name":"addr","type":"address"}],"name":"Registered","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"id","type":"uint256"}],"name":"Unregistered","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"id","type":"uint256"},{"indexed":true,"name":"key","type":"bytes32"},{"indexed":false,"name":"value","type":"bytes32"}],"name":"MetaChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"id","type":"uint256"},{"indexed":false,"name":"addr","type":"address"}],"name":"AddressChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
diff --git a/js/src/contracts/abi/basiccoin.json b/js/src/contracts/abi/basiccoin.json
deleted file mode 100644
index 0bdc66666fcb4e4f15ca48dbe128c62474367415..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/basiccoin.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"base","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"inputs":[{"name":"_totalSupply","type":"uint256"},{"name":"_owner","type":"address"}],"type":"constructor"},{"payable":false,"type":"fallback"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
diff --git a/js/src/contracts/abi/basiccoinmanager.json b/js/src/contracts/abi/basiccoinmanager.json
deleted file mode 100644
index cafe09735c6d4f425e302f60001402d668fad002..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/basiccoinmanager.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"countByOwner","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"count","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"base","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_index","type":"uint256"}],"name":"get","outputs":[{"name":"coin","type":"address"},{"name":"owner","type":"address"},{"name":"tokenreg","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_totalSupply","type":"uint256"},{"name":"_tla","type":"string"},{"name":"_name","type":"string"},{"name":"_tokenreg","type":"address"}],"name":"deploy","outputs":[{"name":"","type":"bool"}],"payable":true,"type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_index","type":"uint256"}],"name":"getByOwner","outputs":[{"name":"coin","type":"address"},{"name":"owner","type":"address"},{"name":"tokenreg","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"tokenreg","type":"address"},{"indexed":true,"name":"coin","type":"address"}],"name":"Created","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
diff --git a/js/src/contracts/abi/certifier.json b/js/src/contracts/abi/certifier.json
deleted file mode 100644
index 905ddde6cb3346948ddedaaa0f089058d1c5c5f0..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/certifier.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"certified","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Confirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Revoked","type":"event"}]
\ No newline at end of file
diff --git a/js/src/contracts/abi/consensys-multisig-wallet.json b/js/src/contracts/abi/consensys-multisig-wallet.json
deleted file mode 100644
index 79623637d1c7e051e15aba65ae59c020f9821b20..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/consensys-multisig-wallet.json
+++ /dev/null
@@ -1,510 +0,0 @@
-[
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "owners",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "removeOwner",
-    "outputs": [],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "name": "revokeConfirmation",
-    "outputs": [],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "isOwner",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      },
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "confirmations",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "pending",
-        "type": "bool"
-      },
-      {
-        "name": "executed",
-        "type": "bool"
-      }
-    ],
-    "name": "getTransactionCount",
-    "outputs": [
-      {
-        "name": "count",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "addOwner",
-    "outputs": [],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "name": "isConfirmed",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "name": "getConfirmationCount",
-    "outputs": [
-      {
-        "name": "count",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "transactions",
-    "outputs": [
-      {
-        "name": "destination",
-        "type": "address"
-      },
-      {
-        "name": "value",
-        "type": "uint256"
-      },
-      {
-        "name": "data",
-        "type": "bytes"
-      },
-      {
-        "name": "executed",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getOwners",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address[]"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "from",
-        "type": "uint256"
-      },
-      {
-        "name": "to",
-        "type": "uint256"
-      },
-      {
-        "name": "pending",
-        "type": "bool"
-      },
-      {
-        "name": "executed",
-        "type": "bool"
-      }
-    ],
-    "name": "getTransactionIds",
-    "outputs": [
-      {
-        "name": "_transactionIds",
-        "type": "uint256[]"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "name": "getConfirmations",
-    "outputs": [
-      {
-        "name": "_confirmations",
-        "type": "address[]"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "transactionCount",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_required",
-        "type": "uint256"
-      }
-    ],
-    "name": "changeRequirement",
-    "outputs": [],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "name": "confirmTransaction",
-    "outputs": [],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "destination",
-        "type": "address"
-      },
-      {
-        "name": "value",
-        "type": "uint256"
-      },
-      {
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "submitTransaction",
-    "outputs": [
-      {
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "MAX_OWNER_COUNT",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "required",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "replaceOwner",
-    "outputs": [],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "name": "executeTransaction",
-    "outputs": [],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "name": "_owners",
-        "type": "address[]"
-      },
-      {
-        "name": "_required",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "type": "constructor"
-  },
-  {
-    "payable": true,
-    "type": "fallback"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "name": "Confirmation",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "name": "Revocation",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "name": "Submission",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "name": "Execution",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "transactionId",
-        "type": "uint256"
-      }
-    ],
-    "name": "ExecutionFailure",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Deposit",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnerAddition",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnerRemoval",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "required",
-        "type": "uint256"
-      }
-    ],
-    "name": "RequirementChange",
-    "type": "event"
-  }
-]
diff --git a/js/src/contracts/abi/dappreg.json b/js/src/contracts/abi/dappreg.json
deleted file mode 100644
index f6bec35af13d798dd239543bc1b0673ef12a4fdd..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/dappreg.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":true,"inputs":[{"name":"_id","type":"bytes32"},{"name":"_key","type":"bytes32"}],"name":"meta","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"count","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"bytes32"}],"name":"unregister","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_id","type":"bytes32"}],"name":"get","outputs":[{"name":"id","type":"bytes32"},{"name":"owner","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"bytes32"},{"name":"_key","type":"bytes32"},{"name":"_value","type":"bytes32"}],"name":"setMeta","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"bytes32"},{"name":"_owner","type":"address"}],"name":"setDappOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_index","type":"uint256"}],"name":"at","outputs":[{"name":"id","type":"bytes32"},{"name":"owner","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"bytes32"}],"name":"register","outputs":[],"payable":true,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"id","type":"bytes32"},{"indexed":true,"name":"key","type":"bytes32"},{"indexed":false,"name":"value","type":"bytes32"}],"name":"MetaChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"id","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"OwnerChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"id","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Registered","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"id","type":"bytes32"}],"name":"Unregistered","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
diff --git a/js/src/contracts/abi/eip20.json b/js/src/contracts/abi/eip20.json
deleted file mode 100644
index 6937e28c85b0e428e092fe89ae54c950b6899baa..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/eip20.json
+++ /dev/null
@@ -1,163 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_spender",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "approve",
-    "outputs": [
-      {
-        "name": "success",
-        "type": "bool"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "totalSupply",
-    "outputs": [
-      {
-        "name": "total",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_from",
-        "type": "address"
-      },
-      {
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "name": "success",
-        "type": "bool"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "_owner",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "name": "balance",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "transfer",
-    "outputs": [
-      {
-        "name": "success",
-        "type": "bool"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "_owner",
-        "type": "address"
-      },
-      {
-        "name": "_spender",
-        "type": "address"
-      }
-    ],
-    "name": "allowance",
-    "outputs": [
-      {
-        "name": "remaining",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Transfer",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Approval",
-    "type": "event"
-  }
-]
diff --git a/js/src/contracts/abi/email-verification.json b/js/src/contracts/abi/email-verification.json
deleted file mode 100644
index 3bb0fe65004bc729912526b39c6e4d5573bc7288..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/email-verification.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"reverse","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"},{"name":"_puzzle","type":"bytes32"},{"name":"_emailHash","type":"bytes32"}],"name":"puzzle","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_emailHash","type":"bytes32"}],"name":"request","outputs":[],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_code","type":"bytes32"}],"name":"confirm","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"certified","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":true,"name":"emailHash","type":"bytes32"}],"name":"Requested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":true,"name":"emailHash","type":"bytes32"},{"indexed":false,"name":"puzzle","type":"bytes32"}],"name":"Puzzled","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Confirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Revoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
\ No newline at end of file
diff --git a/js/src/contracts/abi/foundation-multisig-wallet.json b/js/src/contracts/abi/foundation-multisig-wallet.json
deleted file mode 100644
index 752407e62521735187cfb94d932bf37cbd30baef..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/foundation-multisig-wallet.json
+++ /dev/null
@@ -1,476 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_owner",
-        "type": "address"
-      }
-    ],
-    "name": "removeOwner",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "isOwner",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "m_numOwners",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "m_lastDay",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "resetSpentToday",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "m_spentToday",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_owner",
-        "type": "address"
-      }
-    ],
-    "name": "addOwner",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "m_required",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_h",
-        "type": "bytes32"
-      }
-    ],
-    "name": "confirm",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_newLimit",
-        "type": "uint256"
-      }
-    ],
-    "name": "setDailyLimit",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      },
-      {
-        "name": "_data",
-        "type": "bytes"
-      }
-    ],
-    "name": "execute",
-    "outputs": [
-      {
-        "name": "_r",
-        "type": "bytes32"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_operation",
-        "type": "bytes32"
-      }
-    ],
-    "name": "revoke",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_newRequired",
-        "type": "uint256"
-      }
-    ],
-    "name": "changeRequirement",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "_operation",
-        "type": "bytes32"
-      },
-      {
-        "name": "_owner",
-        "type": "address"
-      }
-    ],
-    "name": "hasConfirmed",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "ownerIndex",
-        "type": "uint256"
-      }
-    ],
-    "name": "getOwner",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_to",
-        "type": "address"
-      }
-    ],
-    "name": "kill",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_from",
-        "type": "address"
-      },
-      {
-        "name": "_to",
-        "type": "address"
-      }
-    ],
-    "name": "changeOwner",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "m_dailyLimit",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "name": "_owners",
-        "type": "address[]"
-      },
-      {
-        "name": "_required",
-        "type": "uint256"
-      },
-      {
-        "name": "_daylimit",
-        "type": "uint256"
-      }
-    ],
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "operation",
-        "type": "bytes32"
-      }
-    ],
-    "name": "Confirmation",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "operation",
-        "type": "bytes32"
-      }
-    ],
-    "name": "Revoke",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "oldOwner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnerChanged",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnerAdded",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "oldOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnerRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "newRequirement",
-        "type": "uint256"
-      }
-    ],
-    "name": "RequirementChanged",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "_from",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Deposit",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "data",
-        "type": "bytes"
-      },
-      {
-        "indexed": false,
-        "name": "created",
-        "type": "address"
-      }
-    ],
-    "name": "SingleTransact",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "operation",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "data",
-        "type": "bytes"
-      },
-      {
-        "indexed": false,
-        "name": "created",
-        "type": "address"
-      }
-    ],
-    "name": "MultiTransact",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "operation",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "name": "initiator",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "ConfirmationNeeded",
-    "type": "event"
-  }
-]
diff --git a/js/src/contracts/abi/gavcoin.json b/js/src/contracts/abi/gavcoin.json
deleted file mode 100644
index 5170326f5a4b58fe3b64ff40b306ae2e297e062a..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/gavcoin.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"},{"name":"_maxPrice","type":"uint256"}],"name":"buyin","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"remaining","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_price","type":"uint256"},{"name":"_units","type":"uint256"}],"name":"refund","outputs":[{"name":"","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"price","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"remaining","type":"uint256"}],"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":true,"name":"price","type":"uint256"},{"indexed":true,"name":"amount","type":"uint256"}],"name":"Buyin","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":true,"name":"price","type":"uint256"},{"indexed":true,"name":"amount","type":"uint256"}],"name":"Refund","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"price","type":"uint256"}],"name":"NewTranch","type":"event"}]
diff --git a/js/src/contracts/abi/githubhint.json b/js/src/contracts/abi/githubhint.json
deleted file mode 100644
index bdbc162e4e516fa8732371a846465d199b1504cd..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/githubhint.json
+++ /dev/null
@@ -1,81 +0,0 @@
-[
-   {
-      "constant":false,
-      "inputs":[
-         {
-            "name":"_content",
-            "type":"bytes32"
-         },
-         {
-            "name":"_url",
-            "type":"string"
-         }
-      ],
-      "name":"hintURL",
-      "outputs":[
-
-      ],
-      "type":"function"
-   },
-   {
-      "constant":false,
-      "inputs":[
-         {
-            "name":"_content",
-            "type":"bytes32"
-         },
-         {
-            "name":"_accountSlashRepo",
-            "type":"string"
-         },
-         {
-            "name":"_commit",
-            "type":"bytes20"
-         }
-      ],
-      "name":"hint",
-      "outputs":[
-
-      ],
-      "type":"function"
-   },
-   {
-      "constant":true,
-      "inputs":[
-         {
-            "name":"",
-            "type":"bytes32"
-         }
-      ],
-      "name":"entries",
-      "outputs":[
-         {
-            "name":"accountSlashRepo",
-            "type":"string"
-         },
-         {
-            "name":"commit",
-            "type":"bytes20"
-         },
-         {
-            "name":"owner",
-            "type":"address"
-         }
-      ],
-      "type":"function"
-   },
-   {
-      "constant":false,
-      "inputs":[
-         {
-            "name":"_content",
-            "type":"bytes32"
-         }
-      ],
-      "name":"unhint",
-      "outputs":[
-
-      ],
-      "type":"function"
-   }
-]
diff --git a/js/src/contracts/abi/index.js b/js/src/contracts/abi/index.js
deleted file mode 100644
index f475cce070b8b813008721987ccaa19c3497be0e..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/index.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export badgereg from './badgereg.json';
-export basiccoin from './basiccoin.json';
-export basiccoinmanager from './basiccoinmanager.json';
-export dappreg from './dappreg.json';
-export eip20 from './eip20.json';
-export emailverification from './email-verification.json';
-export gavcoin from './gavcoin.json';
-export githubhint from './githubhint.json';
-export owned from './owned.json';
-export registry from './registry.json';
-export registry2 from './registry2.json';
-export signaturereg from './signaturereg.json';
-export smsverification from './sms-verification.json';
-export tokenreg from './tokenreg.json';
-export foundationWallet from './foundation-multisig-wallet.json';
diff --git a/js/src/contracts/abi/old-wallet.json b/js/src/contracts/abi/old-wallet.json
deleted file mode 100644
index 9300697422f5c730aff1d7a802cf6b2e6777b04f..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/old-wallet.json
+++ /dev/null
@@ -1,466 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_owner",
-        "type": "address"
-      }
-    ],
-    "name": "removeOwner",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "isOwner",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "m_numOwners",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "m_lastDay",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "resetSpentToday",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "m_spentToday",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_owner",
-        "type": "address"
-      }
-    ],
-    "name": "addOwner",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "m_required",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_h",
-        "type": "bytes32"
-      }
-    ],
-    "name": "confirm",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_newLimit",
-        "type": "uint256"
-      }
-    ],
-    "name": "setDailyLimit",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      },
-      {
-        "name": "_data",
-        "type": "bytes"
-      }
-    ],
-    "name": "execute",
-    "outputs": [
-      {
-        "name": "_r",
-        "type": "bytes32"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_operation",
-        "type": "bytes32"
-      }
-    ],
-    "name": "revoke",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_newRequired",
-        "type": "uint256"
-      }
-    ],
-    "name": "changeRequirement",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "_operation",
-        "type": "bytes32"
-      },
-      {
-        "name": "_owner",
-        "type": "address"
-      }
-    ],
-    "name": "hasConfirmed",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "ownerIndex",
-        "type": "uint256"
-      }
-    ],
-    "name": "getOwner",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_to",
-        "type": "address"
-      }
-    ],
-    "name": "kill",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_from",
-        "type": "address"
-      },
-      {
-        "name": "_to",
-        "type": "address"
-      }
-    ],
-    "name": "changeOwner",
-    "outputs": [],
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "m_dailyLimit",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "name": "_owners",
-        "type": "address[]"
-      },
-      {
-        "name": "_required",
-        "type": "uint256"
-      },
-      {
-        "name": "_daylimit",
-        "type": "uint256"
-      }
-    ],
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "operation",
-        "type": "bytes32"
-      }
-    ],
-    "name": "Confirmation",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "operation",
-        "type": "bytes32"
-      }
-    ],
-    "name": "Revoke",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "oldOwner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnerChanged",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnerAdded",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "oldOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnerRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "newRequirement",
-        "type": "uint256"
-      }
-    ],
-    "name": "RequirementChanged",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "_from",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Deposit",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "SingleTransact",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "operation",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "MultiTransact",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "operation",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "name": "initiator",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "ConfirmationNeeded",
-    "type": "event"
-  }
-]
diff --git a/js/src/contracts/abi/owned.json b/js/src/contracts/abi/owned.json
deleted file mode 100644
index ccfeed85d06bc7e2bc78498968eaab93d88fde24..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/owned.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
diff --git a/js/src/contracts/abi/registry.json b/js/src/contracts/abi/registry.json
deleted file mode 100644
index f97dc20c72abad7ffb31de847af50f1a26b4e0af..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/registry.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"confirmReverse","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"bytes32"}],"name":"set","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"drop","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"setFee","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_to","type":"address"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserved","outputs":[{"name":"reserved","type":"bool"}],"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"proposeReverse","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"reverse","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"uint256"}],"name":"setUint","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[],"name":"removeReverse","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"address"}],"name":"setAddress","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"Drained","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"FeeChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Reserved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"oldOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"Transferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Dropped","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"key","type":"string"},{"indexed":false,"name":"plainKey","type":"string"}],"name":"DataChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseProposed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseConfirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
diff --git a/js/src/contracts/abi/registry2.json b/js/src/contracts/abi/registry2.json
deleted file mode 100644
index 922b9b7e24ab05ff864e83fda4ddb124acfc246b..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/registry2.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":true,"inputs":[{"name":"_data","type":"address"}],"name":"canReverse","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"bytes32"}],"name":"setData","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"confirmReverse","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[{"name":"success","type":"bool"}],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"drop","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"setFee","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_to","type":"address"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getData","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserved","outputs":[{"name":"reserved","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"proposeReverse","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"hasReverse","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"getOwner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"getReverse","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_data","type":"address"}],"name":"reverse","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"uint256"}],"name":"setUint","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"confirmReverseAs","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"removeReverse","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"address"}],"name":"setAddress","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"Drained","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"FeeChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseProposed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseConfirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Reserved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"oldOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"Transferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Dropped","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"key","type":"string"},{"indexed":false,"name":"plainKey","type":"string"}],"name":"DataChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
diff --git a/js/src/contracts/abi/signaturereg.json b/js/src/contracts/abi/signaturereg.json
deleted file mode 100644
index a9b109ecd463a4873c3597eec690e20819132ef7..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/signaturereg.json
+++ /dev/null
@@ -1,128 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_new",
-        "type": "address"
-      }
-    ],
-    "name": "setOwner",
-    "outputs": [],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "totalSignatures",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "owner",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "drain",
-    "outputs": [],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "",
-        "type": "bytes4"
-      }
-    ],
-    "name": "entries",
-    "outputs": [
-      {
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_method",
-        "type": "string"
-      }
-    ],
-    "name": "register",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "creator",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "signature",
-        "type": "bytes4"
-      },
-      {
-        "indexed": false,
-        "name": "method",
-        "type": "string"
-      }
-    ],
-    "name": "Registered",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "old",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "current",
-        "type": "address"
-      }
-    ],
-    "name": "NewOwner",
-    "type": "event"
-  }
-]
diff --git a/js/src/contracts/abi/sms-verification.json b/js/src/contracts/abi/sms-verification.json
deleted file mode 100644
index 3eb5492a41d893bfc4ba09d63e5879be9f44f826..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/sms-verification.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"certify","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"request","outputs":[],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"},{"name":"_puzzle","type":"bytes32"}],"name":"puzzle","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"revoke","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_code","type":"bytes32"}],"name":"confirm","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"delegate","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setDelegate","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"certified","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Requested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":false,"name":"puzzle","type":"bytes32"}],"name":"Puzzled","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Confirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Revoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
\ No newline at end of file
diff --git a/js/src/contracts/abi/tokenreg.json b/js/src/contracts/abi/tokenreg.json
deleted file mode 100644
index e56a13eec48aa4dc1ae9f558b3a080c24174c065..0000000000000000000000000000000000000000
--- a/js/src/contracts/abi/tokenreg.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":true,"inputs":[{"name":"_id","type":"uint256"}],"name":"token","outputs":[{"name":"addr","type":"address"},{"name":"tla","type":"string"},{"name":"base","type":"uint256"},{"name":"name","type":"string"},{"name":"owner","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_addr","type":"address"},{"name":"_tla","type":"string"},{"name":"_base","type":"uint256"},{"name":"_name","type":"string"}],"name":"register","outputs":[{"name":"","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"type":"function"},{"constant":true,"inputs":[{"name":"_id","type":"uint256"},{"name":"_key","type":"bytes32"}],"name":"meta","outputs":[{"name":"","type":"bytes32"}],"type":"function"},{"constant":false,"inputs":[{"name":"_addr","type":"address"},{"name":"_tla","type":"string"},{"name":"_base","type":"uint256"},{"name":"_name","type":"string"},{"name":"_owner","type":"address"}],"name":"registerAs","outputs":[{"name":"","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"_tla","type":"string"}],"name":"fromTLA","outputs":[{"name":"id","type":"uint256"},{"name":"addr","type":"address"},{"name":"base","type":"uint256"},{"name":"name","type":"string"},{"name":"owner","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"tokenCount","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"uint256"}],"name":"unregister","outputs":[],"type":"function"},{"constant":true,"inputs":[{"name":"_addr","type":"address"}],"name":"fromAddress","outputs":[{"name":"id","type":"uint256"},{"name":"tla","type":"string"},{"name":"base","type":"uint256"},{"name":"name","type":"string"},{"name":"owner","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"uint256"},{"name":"_key","type":"bytes32"},{"name":"_value","type":"bytes32"}],"name":"setMeta","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"tla","type":"string"},{"indexed":true,"name":"id","type":"uint256"},{"indexed":false,"name":"addr","type":"address"},{"indexed":false,"name":"name","type":"string"}],"name":"Registered","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"tla","type":"string"},{"indexed":true,"name":"id","type":"uint256"}],"name":"Unregistered","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"id","type":"uint256"},{"indexed":true,"name":"key","type":"bytes32"},{"indexed":false,"name":"value","type":"bytes32"}],"name":"MetaChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
diff --git a/js/src/contracts/badgereg.js b/js/src/contracts/badgereg.js
deleted file mode 100644
index a1782cb30174443013ffcad17f7b00f9c9dec50c..0000000000000000000000000000000000000000
--- a/js/src/contracts/badgereg.js
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { bytesToHex, hexToAscii } from '~/api/util/format';
-
-import ABI from './abi/certifier.json';
-
-const ZERO20 = '0x0000000000000000000000000000000000000000';
-const ZERO32 = '0x0000000000000000000000000000000000000000000000000000000000000000';
-
-export default class BadgeReg {
-  constructor (api, registry) {
-    this._api = api;
-    this._registry = registry;
-
-    registry.getContract('badgereg');
-    this.certifiers = []; // by id
-    this.contracts = {}; // by name
-  }
-
-  getContract () {
-    return this._registry.getContract('badgereg');
-  }
-
-  certifierCount () {
-    return this
-      .getContract()
-      .then((badgeReg) => {
-        return badgeReg.instance.badgeCount.call({}, [])
-          .then((count) => count.valueOf());
-      });
-  }
-
-  fetchCertifier (id) {
-    if (this.certifiers[id]) {
-      return Promise.resolve(this.certifiers[id]);
-    }
-
-    return this
-      .getContract()
-      .then((badgeReg) => {
-        return badgeReg.instance.badge.call({}, [ id ]);
-      })
-      .then(([ address, name ]) => {
-        if (address === ZERO20) {
-          throw new Error(`Certifier ${id} does not exist.`);
-        }
-
-        name = bytesToHex(name);
-        name = name === ZERO32
-          ? null
-          : hexToAscii(name);
-
-        return this.fetchMeta(id)
-          .then(({ title, icon }) => {
-            const data = { address, id, name, title, icon };
-
-            this.certifiers[id] = data;
-            return data;
-          });
-      });
-  }
-
-  fetchCertifierByName (name) {
-    return this
-      .getContract()
-      .then((badgeReg) => {
-        return badgeReg.instance.fromName.call({}, [ name ]);
-      })
-      .then(([ id, address, owner ]) => {
-        if (address === ZERO20) {
-          throw new Error(`Certifier ${name} does not exist.`);
-        }
-
-        return this.fetchMeta(id)
-          .then(({ title, icon }) => {
-            const data = { address, id, name, title, icon };
-
-            this.certifiers[id] = data;
-            return data;
-          });
-      });
-  }
-
-  fetchMeta (id) {
-    return this
-      .getContract()
-      .then((badgeReg) => {
-        return Promise.all([
-          badgeReg.instance.meta.call({}, [id, 'TITLE']),
-          badgeReg.instance.meta.call({}, [id, 'IMG'])
-        ]);
-      })
-      .then(([ title, icon ]) => {
-        title = bytesToHex(title);
-        title = title === ZERO32 ? null : hexToAscii(title);
-
-        if (bytesToHex(icon) === ZERO32) {
-          icon = null;
-        }
-
-        return { title, icon };
-      });
-  }
-
-  checkIfCertified (certifier, address) {
-    if (!this.contracts[certifier]) {
-      this.contracts[certifier] = this._api.newContract(ABI, certifier);
-    }
-
-    const contract = this.contracts[certifier];
-
-    return contract.instance.certified.call({}, [address]);
-  }
-}
diff --git a/js/src/contracts/code/index.js b/js/src/contracts/code/index.js
deleted file mode 100644
index 1081c9afa4752209a12e5035b1ecba24de7cf7f2..0000000000000000000000000000000000000000
--- a/js/src/contracts/code/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { wallet } from './wallet';
-
-export {
-  wallet
-};
diff --git a/js/src/contracts/code/wallet.js b/js/src/contracts/code/wallet.js
deleted file mode 100644
index ab60bfc9831c2df74c905372da3ad5f482baacb5..0000000000000000000000000000000000000000
--- a/js/src/contracts/code/wallet.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * @version Solidity v0.4.10 - Optimized
- * @from https://github.com/paritytech/parity/blob/6b0e4f9098be6b841353e7c4f116aa86b7c2e3d6/js/src/contracts/snippets/enhanced-wallet.sol
- * @date 20-Jul-2017 @ 16h00 UTC
- */
-export const walletCompiler = 'v0.4.10+commit.f0d539ae';
-export const walletSource = 'https://github.com/paritytech/parity/blob/c4196a5de31e0b97ec42d5263d9db404cea4a776/js/src/contracts/snippets/enhanced-wallet.sol';
-export const wallet = '0x6060604052341561000c57fe5b60405161048538038061048583398101604090815281516020830151918301519201915b604080517f696e697457616c6c657428616464726573735b5d2c75696e743235362c75696e81527f7432353629000000000000000000000000000000000000000000000000000000602080830191909152915190819003602501902084516000829052909173_____________WalletLibrary______________91600281019160049182010290819038829003903960006000600483016000866127105a03f45b505050505050505b61039d806100e86000396000f300606060405236156100725763ffffffff60e060020a6000350416632f54bf6e811461012d5780634123cb6b1461015d578063523750931461017f578063659010e7146101a1578063746c9171146101c3578063c2cf7326146101e5578063c41a360a14610218578063f1736d8614610247575b61012b5b60003411156100c75760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a1610127565b60003611156101275773_____________WalletLibrary______________600160a060020a0316600036600060405160200152604051808383808284378201915050925050506020604051808303818560325a03f4151561012457fe5b50505b5b5b565b005b341561013557fe5b610149600160a060020a0360043516610269565b604080519115158252519081900360200190f35b341561016557fe5b61016d6102cd565b60408051918252519081900360200190f35b341561018757fe5b61016d6102d3565b60408051918252519081900360200190f35b34156101a957fe5b61016d6102d9565b60408051918252519081900360200190f35b34156101cb57fe5b61016d6102df565b60408051918252519081900360200190f35b34156101ed57fe5b610149600435600160a060020a03602435166102e5565b604080519115158252519081900360200190f35b341561022057fe5b61022b60043561034a565b60408051600160a060020a039092168252519081900360200190f35b341561024f57fe5b61016d61036b565b60408051918252519081900360200190f35b600073_____________WalletLibrary______________600160a060020a0316600036600060405160200152604051808383808284378201915050925050506020604051808303818560325a03f415156102bf57fe5b50506040515190505b919050565b60015481565b60045481565b60035481565b60005481565b600073_____________WalletLibrary______________600160a060020a0316600036600060405160200152604051808383808284378201915050925050506020604051808303818560325a03f4151561033b57fe5b50506040515190505b92915050565b6000600560018301610100811061035d57fe5b0160005b505490505b919050565b600254815600a165627a7a72305820c20a8475c42598c198f6629bada37e1b234da85ac2c0cbac3d96089030b180400029';
-export const walletLibrary = '0x6060604052341561000c57fe5b5b61170f8061001c6000396000f300606060405236156101015763ffffffff60e060020a600035041663173825d981146101575780632f54bf6e146101755780634123cb6b146101a557806352375093146101c75780635c52c2f5146101e9578063659010e7146101fb5780637065cb481461021d578063746c91711461023b578063797af6271461025d5780639da5e0eb14610284578063b20d30a914610299578063b61d27f6146102ae578063b75c7dc6146102ec578063ba51a6df14610301578063c2cf732614610316578063c41a360a14610349578063c57c5f6014610378578063cbf0b0c0146103cf578063e46dcfeb146103ed578063f00d4b5d14610449578063f1736d861461046d575b6101555b60003411156101525760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b5b565b005b341561015f57fe5b610155600160a060020a036004351661048f565b005b341561017d57fe5b610191600160a060020a036004351661057d565b604080519115158252519081900360200190f35b34156101ad57fe5b6101b561059e565b60408051918252519081900360200190f35b34156101cf57fe5b6101b56105a4565b60408051918252519081900360200190f35b34156101f157fe5b6101556105aa565b005b341561020357fe5b6101b56105e1565b60408051918252519081900360200190f35b341561022557fe5b610155600160a060020a03600435166105e7565b005b341561024357fe5b6101b56106d7565b60408051918252519081900360200190f35b341561026557fe5b6101916004356106dd565b604080519115158252519081900360200190f35b341561028c57fe5b610155600435610a30565b005b34156102a157fe5b610155600435610a56565b005b34156102b657fe5b6101b560048035600160a060020a0316906024803591604435918201910135610a8e565b60408051918252519081900360200190f35b34156102f457fe5b610155600435610d71565b005b341561030957fe5b610155600435610e1c565b005b341561031e57fe5b610191600435600160a060020a0360243516610e9e565b604080519115158252519081900360200190f35b341561035157fe5b61035c600435610ef3565b60408051600160a060020a039092168252519081900360200190f35b341561038057fe5b6101556004808035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437509496505093359350610f1492505050565b005b34156103d757fe5b610155600160a060020a0360043516610ff9565b005b34156103f557fe5b6101556004808035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437509496505084359460200135935061103792505050565b005b341561045157fe5b610155600160a060020a0360043581169060243516611062565b005b341561047557fe5b6101b561115c565b60408051918252519081900360200190f35b60006000366040518083838082843782019150509250505060405180910390206104b881611162565b1561057657600160a060020a0383166000908152610105602052604090205491508115156104e557610576565b60016001540360005411156104f957610576565b6000600583610100811061050957fe5b0160005b5055600160a060020a038316600090815261010560205260408120556105316112cd565b6105396113bd565b60408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15b5b5b505050565b600160a060020a03811660009081526101056020526040812054115b919050565b60015481565b60045481565b6000366040518083838082843782019150509250505060405180910390206105d181611162565b156105dc5760006003555b5b5b50565b60035481565b60003660405180838380828437820191505092505050604051809103902061060e81611162565b156106d15761061c8261057d565b15610626576106d1565b61062e6112cd565b60015460fa9010610641576106416113bd565b5b60015460fa9010610652576106d1565b60018054810190819055600160a060020a03831690600590610100811061067557fe5b0160005b5055600154600160a060020a03831660008181526101056020908152604091829020939093558051918252517f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3929181900390910190a15b5b5b5050565b60005481565b60006000826106eb81611162565b15610a265760008481526101086020526040902054600160a060020a031615158061072757506000848152610108602052604090206001015415155b80610754575060008481526101086020526040902060029081015461010060018216150260001901160415155b15610a265760008481526101086020526040902054600160a060020a0316151561082c57600084815261010860209081526040918290206001808201546002928301805486516000199482161561010002949094011693909304601f810185900485028301850190955284825261082594909391929183018282801561081b5780601f106107f05761010080835404028352916020019161081b565b820191906000526020600020905b8154815290600101906020018083116107fe57829003601f168201915b50505050506114f9565b91506108e4565b60008481526101086020526040908190208054600180830154935160029384018054600160a060020a0390941695949093919283928592918116156101000260001901160480156108be5780601f10610893576101008083540402835291602001916108be565b820191906000526020600020905b8154815290600101906020018083116108a157829003601f168201915b505091505060006040518083038185876185025a03f19250505015156108e45760006000fd5b5b6000848152610108602090815260409182902060018082015482548551600160a060020a033381811683529682018c90529681018390529086166060820181905295881660a082015260c06080820181815260029586018054958616156101000260001901909516959095049082018190527fe3a3a4111a84df27d76b68dc721e65c7711605ea5eee4afd3a9c58195217365c968b959394909390928a9290919060e0830190859080156109da5780601f106109af576101008083540402835291602001916109da565b820191906000526020600020905b8154815290600101906020018083116109bd57829003601f168201915b505097505050505050505060405180910390a16000848152610108602052604081208054600160a060020a03191681556001810182905590610a1f600283018261158e565b5050600192505b5b5b5b5050919050565b60006001541115610a415760006000fd5b6002819055610a4e611513565b6004555b5b50565b600036604051808383808284378201915050925050506040518091039020610a7d81611162565b156106d15760028290555b5b5b5050565b60006000610a9b3361057d565b15610d645782158015610ab25750610ab285611522565b5b80610ac057506000546001145b15610c0357600160a060020a0386161515610b1657610b0f8585858080601f016020809104026020016040519081016040528093929190818152602001838380828437506114f9945050505050565b9050610b57565b85600160a060020a03168585856040518083838082843782019150509250505060006040518083038185876185025a03f1925050501515610b575760006000fd5b5b7f9738cd1a8777c86b011f7b01d87d484217dc6ab5154a9d41eda5d14af8caf2923386888787866040518087600160a060020a0316600160a060020a0316815260200186815260200185600160a060020a0316600160a060020a031681526020018060200183600160a060020a0316600160a060020a0316815260200182810382528585828181526020019250808284376040519201829003995090975050505050505050a1610d64565b600036436040518084848082843791909101928352505060408051602092819003830190206000818152610108909352912054909450600160a060020a0316159150508015610c62575060008281526101086020526040902060010154155b8015610c8f5750600082815261010860205260409020600290810154610100600182161502600019011604155b15610cd3576000828152610108602052604090208054600160a060020a031916600160a060020a03881617815560018101869055610cd19060020185856115d6565b505b610cdc826106dd565b1515610d645760408051838152600160a060020a033381811660208401529282018890528816606082015260a0608082018181529082018690527f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf32928592909189918b918a918a9160c082018484808284376040519201829003995090975050505050505050a15b5b5b5b5b50949350505050565b600160a060020a033316600090815261010560205260408120549080821515610d9957610e15565b50506000828152610106602052604081206001810154600284900a929083161115610e155780546001908101825581018054839003905560408051600160a060020a03331681526020810186905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5b50505050565b600036604051808383808284378201915050925050506040518091039020610e4381611162565b156106d157600154821115610e57576106d1565b6000829055610e646112cd565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15b5b5b5050565b600082815261010660209081526040808320600160a060020a038516845261010590925282205482811515610ed65760009350610eea565b8160020a9050808360010154166000141593505b50505092915050565b60006005600183016101008110610f0657fe5b0160005b505490505b919050565b600060006001541115610f275760006000fd5b825160019081018155600160a060020a033316906005905b0160005b505550600160a060020a033316600090815261010560205260408120600190555b8251811015610fed578281815181101515610f7b57fe5b60209081029091010151600160a060020a03166005600283016101008110610f9f57fe5b0160005b50819055508060020161010560008584815181101515610fbf57fe5b90602001906020020151600160a060020a03168152602001908152602001600020819055505b600101610f64565b60008290555b5b505050565b60003660405180838380828437820191505092505050604051809103902061102081611162565b156106d15781600160a060020a0316ff5b5b5b5050565b600060015411156110485760006000fd5b61105181610a30565b6105768383610f14565b5b5b505050565b600060003660405180838380828437820191505092505050604051809103902061108b81611162565b15610e15576110998361057d565b156110a357610e15565b600160a060020a0384166000908152610105602052604090205491508115156110cb57610e15565b6110d36112cd565b600160a060020a03831660058361010081106110eb57fe5b0160005b5055600160a060020a0380851660008181526101056020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b5b5b50505050565b60025481565b600160a060020a03331660009081526101056020526040812054818082151561118a576112c3565b600085815261010660205260409020805490925015156111ed576000805483556001808401919091556101078054916111c591908301611655565b60028301819055610107805487929081106111dc57fe5b906000526020600020900160005b50555b8260020a905080826001015416600014156112c35760408051600160a060020a03331681526020810187905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18154600190116112b057600085815261010660205260409020600201546101078054909190811061127357fe5b906000526020600020900160005b5060009081905585815261010660205260408120818155600180820183905560029091019190915593506112c3565b8154600019018255600182018054821790555b5b5b505050919050565b6101075460005b818110156113ab576101086000610107838154811015156112f157fe5b906000526020600020900160005b50548152602081019190915260400160009081208054600160a060020a03191681556001810182905590611336600283018261158e565b505061010780548290811061134757fe5b906000526020600020900160005b5054156113a25761010660006101078381548110151561137157fe5b906000526020600020900160005b505481526020810191909152604001600090812081815560018101829055600201555b5b6001016112d4565b6106d1610107600061167f565b5b5050565b60015b6001548110156105dc575b600154811080156113ee575060058161010081106113e557fe5b0160005b505415155b156113fb576001016113cb565b5b60016001541180156114225750600154600590610100811061141a57fe5b0160005b5054155b1561143657600180546000190190556113fb565b6001548110801561145c5750600154600590610100811061145357fe5b0160005b505415155b80156114795750600581610100811061147157fe5b0160005b5054155b156114f057600154600590610100811061148f57fe5b0160005b505460058261010081106114a357fe5b0160005b505580610105600060058361010081106114bd57fe5b0160005b505481526020019081526020016000208190555060006005600154610100811015156114e957fe5b0160005b50555b6113c0565b5b50565b600081516020830184f09050803b15610000575b92915050565b600062015180425b0490505b90565b600061152d3361057d565b156105995760045461153d611513565b1115611554576000600355611550611513565b6004555b6003548281011080159061156e5750600254826003540111155b15611583575060038054820190556001610599565b5060005b5b5b919050565b50805460018160011615610100020316600290046000825580601f106115b457506105dc565b601f0160209004906000526020600020908101906105dc91906116a1565b5b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106116175782800160ff19823516178555611644565b82800160010185558215611644579182015b82811115611644578235825591602001919060010190611629565b5b506116519291506116a1565b5090565b815481835581811511610576576000838152602090206105769181019083016116a1565b5b505050565b50805460008255906000526020600020908101906105dc91906116a1565b5b50565b61151f91905b8082111561165157600081556001016116a7565b5090565b90565b61151f91905b8082111561165157600081556001016116a7565b5090565b905600a165627a7a723058209a3af51063f944081cd5ee8601e4e655f25cf7bc219a7983cda60f163f1709a70029';
-export const walletLibraryABI = '[{"constant":false,"inputs":[{"name":"_owner","type":"address"}],"name":"removeOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_addr","type":"address"}],"name":"isOwner","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"m_numOwners","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"m_lastDay","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"resetSpentToday","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"m_spentToday","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_owner","type":"address"}],"name":"addOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"m_required","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_h","type":"bytes32"}],"name":"confirm","outputs":[{"name":"o_success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_limit","type":"uint256"}],"name":"initDaylimit","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_newLimit","type":"uint256"}],"name":"setDailyLimit","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"},{"name":"_data","type":"bytes"}],"name":"execute","outputs":[{"name":"o_hash","type":"bytes32"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_operation","type":"bytes32"}],"name":"revoke","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_newRequired","type":"uint256"}],"name":"changeRequirement","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_operation","type":"bytes32"},{"name":"_owner","type":"address"}],"name":"hasConfirmed","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"ownerIndex","type":"uint256"}],"name":"getOwner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_owners","type":"address[]"},{"name":"_required","type":"uint256"}],"name":"initMultiowned","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"}],"name":"kill","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_owners","type":"address[]"},{"name":"_required","type":"uint256"},{"name":"_daylimit","type":"uint256"}],"name":"initWallet","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"}],"name":"changeOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"m_dailyLimit","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"payable":true,"type":"fallback"},{"anonymous":false,"inputs":[{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"operation","type":"bytes32"}],"name":"Confirmation","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"operation","type":"bytes32"}],"name":"Revoke","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"oldOwner","type":"address"},{"indexed":false,"name":"newOwner","type":"address"}],"name":"OwnerChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"newOwner","type":"address"}],"name":"OwnerAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"oldOwner","type":"address"}],"name":"OwnerRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"newRequirement","type":"uint256"}],"name":"RequirementChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_from","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Deposit","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"value","type":"uint256"},{"indexed":false,"name":"to","type":"address"},{"indexed":false,"name":"data","type":"bytes"},{"indexed":false,"name":"created","type":"address"}],"name":"SingleTransact","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"operation","type":"bytes32"},{"indexed":false,"name":"value","type":"uint256"},{"indexed":false,"name":"to","type":"address"},{"indexed":false,"name":"data","type":"bytes"},{"indexed":false,"name":"created","type":"address"}],"name":"MultiTransact","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"operation","type":"bytes32"},{"indexed":false,"name":"initiator","type":"address"},{"indexed":false,"name":"value","type":"uint256"},{"indexed":false,"name":"to","type":"address"},{"indexed":false,"name":"data","type":"bytes"}],"name":"ConfirmationNeeded","type":"event"}]';
-export const walletSourceURL = 'https://github.com/paritytech/parity/blob/6b0e4f9098be6b841353e7c4f116aa86b7c2e3d6/js/src/contracts/snippets/enhanced-wallet.sol';
-export const walletLibraryRegKey = 'walletLibrary.v.2';
-
-// Used if no Wallet Library found in registry...
-// Compiled from `wallet.sol` using Solidity v0.4.9 - Optimized
-export const fullWalletCode = '0x6060604052341561000c57fe5b60405161166d38038061166d83398101604090815281516020830151918301519201915b805b83835b815160019081018155600090600160a060020a033316906002905b0160005b505550600160a060020a033316600090815261010260205260408120600190555b82518110156100fd57828181518110151561008c57fe5b60209081029091010151600160a060020a0316600282810161010081106100af57fe5b0160005b508190555080600201610102600085848151811015156100cf57fe5b90602001906020020151600160a060020a03168152602001908152602001600020819055505b600101610075565b60008290555b50505061010581905561012164010000000061138f61013082021704565b610107555b505b50505061013f565b600062015180425b0490505b90565b61151f8061014e6000396000f300606060405236156100e05763ffffffff60e060020a600035041663173825d981146101365780632f54bf6e146101545780634123cb6b1461018457806352375093146101a65780635c52c2f5146101c8578063659010e7146101da5780637065cb48146101fc578063746c91711461021a578063797af6271461023c578063b20d30a914610263578063b61d27f614610278578063b75c7dc6146102b6578063ba51a6df146102cb578063c2cf7326146102e0578063c41a360a14610313578063cbf0b0c014610342578063f00d4b5d14610360578063f1736d8614610384575b6101345b60003411156101315760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b5b565b005b341561013e57fe5b610134600160a060020a03600435166103a6565b005b341561015c57fe5b610170600160a060020a0360043516610494565b604080519115158252519081900360200190f35b341561018c57fe5b6101946104b5565b60408051918252519081900360200190f35b34156101ae57fe5b6101946104bb565b60408051918252519081900360200190f35b34156101d057fe5b6101346104c2565b005b34156101e257fe5b6101946104fa565b60408051918252519081900360200190f35b341561020457fe5b610134600160a060020a0360043516610501565b005b341561022257fe5b6101946105f1565b60408051918252519081900360200190f35b341561024457fe5b6101706004356105f7565b604080519115158252519081900360200190f35b341561026b57fe5b610134600435610949565b005b341561028057fe5b61019460048035600160a060020a0316906024803591604435918201910135610982565b60408051918252519081900360200190f35b34156102be57fe5b610134600435610c64565b005b34156102d357fe5b610134600435610d0f565b005b34156102e857fe5b610170600435600160a060020a0360243516610d91565b604080519115158252519081900360200190f35b341561031b57fe5b610326600435610de6565b60408051600160a060020a039092168252519081900360200190f35b341561034a57fe5b610134600160a060020a0360043516610e07565b005b341561036857fe5b610134600160a060020a0360043581169060243516610e45565b005b341561038c57fe5b610194610f3f565b60408051918252519081900360200190f35b60006000366040518083838082843782019150509250505060405180910390206103cf81610f46565b1561048d57600160a060020a0383166000908152610102602052604090205491508115156103fc5761048d565b60016001540360005411156104105761048d565b6000600283610100811061042057fe5b0160005b5055600160a060020a038316600090815261010260205260408120556104486110b1565b610450611132565b60408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15b5b5b505050565b600160a060020a03811660009081526101026020526040812054115b919050565b60015481565b6101075481565b6000366040518083838082843782019150509250505060405180910390206104e981610f46565b156104f5576000610106555b5b5b50565b6101065481565b60003660405180838380828437820191505092505050604051809103902061052881610f46565b156105eb5761053682610494565b15610540576105eb565b6105486110b1565b60015460fa901061055b5761055b611132565b5b60015460fa901061056c576105eb565b60018054810190819055600160a060020a03831690600290610100811061058f57fe5b0160005b5055600154600160a060020a03831660008181526101026020908152604091829020939093558051918252517f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3929181900390910190a15b5b5b5050565b60005481565b600060008261060581610f46565b1561093f5760008481526101086020526040902054600160a060020a031615158061064157506000848152610108602052604090206001015415155b8061066e575060008481526101086020526040902060029081015461010060018216150260001901160415155b1561093f5760008481526101086020526040902054600160a060020a0316151561074657600084815261010860209081526040918290206001808201546002928301805486516000199482161561010002949094011693909304601f810185900485028301850190955284825261073f9490939192918301828280156107355780601f1061070a57610100808354040283529160200191610735565b820191906000526020600020905b81548152906001019060200180831161071857829003601f168201915b505050505061126e565b91506107fd565b60008481526101086020526040908190208054600180830154935160029384018054600160a060020a0390941695949093919283928592918116156101000260001901160480156107d85780601f106107ad576101008083540402835291602001916107d8565b820191906000526020600020905b8154815290600101906020018083116107bb57829003601f168201915b505091505060006040518083038185876185025a03f19250505015156107fd57610000565b5b6000848152610108602090815260409182902060018082015482548551600160a060020a033381811683529682018c90529681018390529086166060820181905295881660a082015260c06080820181815260029586018054958616156101000260001901909516959095049082018190527fe3a3a4111a84df27d76b68dc721e65c7711605ea5eee4afd3a9c58195217365c968b959394909390928a9290919060e0830190859080156108f35780601f106108c8576101008083540402835291602001916108f3565b820191906000526020600020905b8154815290600101906020018083116108d657829003601f168201915b505097505050505050505060405180910390a16000848152610108602052604081208054600160a060020a03191681556001810182905590610938600283018261139e565b5050600192505b5b5b5b5050919050565b60003660405180838380828437820191505092505050604051809103902061097081610f46565b156105eb576101058290555b5b5b5050565b6000600061098f33610494565b15610c5757821580156109a657506109a685611288565b5b806109b457506000546001145b15610af657600160a060020a0386161515610a0a57610a038585858080601f0160208091040260200160405190810160405280939291908181526020018383808284375061126e945050505050565b9050610a4a565b85600160a060020a03168585856040518083838082843782019150509250505060006040518083038185876185025a03f1925050501515610a4a57610000565b5b7f9738cd1a8777c86b011f7b01d87d484217dc6ab5154a9d41eda5d14af8caf2923386888787866040518087600160a060020a0316600160a060020a0316815260200186815260200185600160a060020a0316600160a060020a031681526020018060200183600160a060020a0316600160a060020a0316815260200182810382528585828181526020019250808284376040519201829003995090975050505050505050a1610c57565b600036436040518084848082843791909101928352505060408051602092819003830190206000818152610108909352912054909450600160a060020a0316159150508015610b55575060008281526101086020526040902060010154155b8015610b825750600082815261010860205260409020600290810154610100600182161502600019011604155b15610bc6576000828152610108602052604090208054600160a060020a031916600160a060020a03881617815560018101869055610bc49060020185856113e6565b505b610bcf826105f7565b1515610c575760408051838152600160a060020a033381811660208401529282018890528816606082015260a0608082018181529082018690527f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf32928592909189918b918a918a9160c082018484808284376040519201829003995090975050505050505050a15b5b5b5b5b50949350505050565b600160a060020a033316600090815261010260205260408120549080821515610c8c57610d08565b50506000828152610103602052604081206001810154600284900a929083161115610d085780546001908101825581018054839003905560408051600160a060020a03331681526020810186905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5b50505050565b600036604051808383808284378201915050925050506040518091039020610d3681610f46565b156105eb57600154821115610d4a576105eb565b6000829055610d576110b1565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15b5b5b5050565b600082815261010360209081526040808320600160a060020a038516845261010290925282205482811515610dc95760009350610ddd565b8160020a9050808360010154166000141593505b50505092915050565b60006002600183016101008110610df957fe5b0160005b505490505b919050565b600036604051808383808284378201915050925050506040518091039020610e2e81610f46565b156105eb5781600160a060020a0316ff5b5b5b5050565b6000600036604051808383808284378201915050925050506040518091039020610e6e81610f46565b15610d0857610e7c83610494565b15610e8657610d08565b600160a060020a038416600090815261010260205260409020549150811515610eae57610d08565b610eb66110b1565b600160a060020a0383166002836101008110610ece57fe5b0160005b5055600160a060020a0380851660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b5b5b50505050565b6101055481565b600160a060020a033316600090815261010260205260408120548180821515610f6e576110a7565b60008581526101036020526040902080549092501515610fd157600080548355600180840191909155610104805491610fa991908301611465565b6002830181905561010480548792908110610fc057fe5b906000526020600020900160005b50555b8260020a905080826001015416600014156110a75760408051600160a060020a03331681526020810187905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a181546001901161109457600085815261010360205260409020600201546101048054909190811061105757fe5b906000526020600020900160005b5060009081905585815261010360205260408120818155600180820183905560029091019190915593506110a7565b8154600019018255600182018054821790555b5b5b505050919050565b6101045460005b81811015611125576101086000610104838154811015156110d557fe5b906000526020600020900160005b50548152602081019190915260400160009081208054600160a060020a0319168155600181018290559061111a600283018261139e565b50505b6001016110b8565b6105eb6112fb565b5b5050565b60015b6001548110156104f5575b600154811080156111635750600281610100811061115a57fe5b0160005b505415155b1561117057600101611140565b5b60016001541180156111975750600154600290610100811061118f57fe5b0160005b5054155b156111ab5760018054600019019055611170565b600154811080156111d1575060015460029061010081106111c857fe5b0160005b505415155b80156111ee575060028161010081106111e657fe5b0160005b5054155b1561126557600154600290610100811061120457fe5b0160005b5054600282610100811061121857fe5b0160005b5055806101026000600283610100811061123257fe5b0160005b5054815260200190815260200160002081905550600060026001546101008110151561125e57fe5b0160005b50555b611135565b5b50565b600081516020830184f09050803b15610000575b92915050565b600061129333610494565b156104b057610107546112a461138f565b11156112bd576000610106556112b861138f565b610107555b61010654828101108015906112da57506101055482610106540111155b156112f0575061010680548201905560016104b0565b5060005b5b5b919050565b6101045460005b8181101561137d5761010480548290811061131957fe5b906000526020600020900160005b5054156113745761010360006101048381548110151561134357fe5b906000526020600020900160005b505481526020810191909152604001600090812081815560018101829055600201555b5b600101611302565b6105eb610104600061148f565b5b5050565b600062015180425b0490505b90565b50805460018160011615610100020316600290046000825580601f106113c457506104f5565b601f0160209004906000526020600020908101906104f591906114b1565b5b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106114275782800160ff19823516178555611454565b82800160010185558215611454579182015b82811115611454578235825591602001919060010190611439565b5b506114619291506114b1565b5090565b81548183558181151161048d5760008381526020902061048d9181019083016114b1565b5b505050565b50805460008255906000526020600020908101906104f591906114b1565b5b50565b61139b91905b8082111561146157600081556001016114b7565b5090565b90565b61139b91905b8082111561146157600081556001016114b7565b5090565b905600a165627a7a723058203a7ac7072dc640002704b704af82b742650362cd55debf72fca105c2b916e01d0029';
diff --git a/js/src/contracts/contracts.js b/js/src/contracts/contracts.js
deleted file mode 100644
index 59b3bccfc3e69e7c2439ec18487f1c63d058b990..0000000000000000000000000000000000000000
--- a/js/src/contracts/contracts.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import DappReg from './dappreg';
-import Registry from './registry';
-import SignatureReg from './signaturereg';
-import TokenReg from './tokenreg';
-import GithubHint from './githubhint';
-import * as verification from './verification';
-import BadgeReg from './badgereg';
-
-let instance = null;
-
-export default class Contracts {
-  constructor (api) {
-    instance = this;
-
-    this._api = api;
-    this._registry = new Registry(api);
-    this._dappreg = new DappReg(api, this._registry);
-    this._signaturereg = new SignatureReg(api, this._registry);
-    this._tokenreg = new TokenReg(api, this._registry);
-    this._githubhint = new GithubHint(api, this._registry);
-    this._badgeReg = new BadgeReg(api, this._registry);
-  }
-
-  get registry () {
-    return this._registry;
-  }
-
-  get badgeReg () {
-    return this._badgeReg;
-  }
-
-  get dappReg () {
-    return this._dappreg;
-  }
-
-  get signatureReg () {
-    return this._signaturereg;
-  }
-
-  get tokenReg () {
-    return this._tokenreg;
-  }
-
-  get githubHint () {
-    return this._githubhint;
-  }
-
-  get smsVerification () {
-    return verification;
-  }
-
-  get emailVerification () {
-    return verification;
-  }
-
-  static create (api) {
-    if (instance) {
-      return instance;
-    }
-
-    return new Contracts(api);
-  }
-
-  static get () {
-    return instance;
-  }
-}
diff --git a/js/src/contracts/dappreg.js b/js/src/contracts/dappreg.js
deleted file mode 100644
index 18af9c1635eb6b9b60e6d4c0e52f38bdd782f168..0000000000000000000000000000000000000000
--- a/js/src/contracts/dappreg.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default class DappReg {
-  constructor (api, registry) {
-    this._api = api;
-    this._registry = registry;
-
-    this.getInstance();
-  }
-
-  getContract () {
-    return this._registry.getContract('dappreg');
-  }
-
-  getInstance () {
-    return this.getContract().then((contract) => contract.instance);
-  }
-
-  count () {
-    return this.getInstance().then((instance) => {
-      return instance.count.call();
-    });
-  }
-
-  at (index) {
-    return this.getInstance().then((instance) => {
-      return instance.at.call({}, [index]);
-    });
-  }
-
-  get (id) {
-    return this.getInstance().then((instance) => {
-      return instance.get.call({}, [id]);
-    });
-  }
-
-  meta (id, key) {
-    return this.getInstance().then((instance) => {
-      return instance.meta.call({}, [id, key]);
-    });
-  }
-
-  getImage (id) {
-    return this.meta(id, 'IMG');
-  }
-
-  getContent (id) {
-    return this.meta(id, 'CONTENT');
-  }
-
-  getManifest (id) {
-    return this.meta(id, 'MANIFEST');
-  }
-}
diff --git a/js/src/contracts/githubhint.js b/js/src/contracts/githubhint.js
deleted file mode 100644
index dfc3d5fb7e866daff48b0d6b495751a393f3b636..0000000000000000000000000000000000000000
--- a/js/src/contracts/githubhint.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default class GithubHint {
-  constructor (api, registry) {
-    this._api = api;
-    this._registry = registry;
-    this._instance = null;
-
-    this.getInstance();
-  }
-
-  getContract () {
-    return this._registry.getContract('githubhint');
-  }
-
-  getInstance () {
-    if (this._instance) {
-      return Promise.resolve(this._instance);
-    }
-
-    return this.getContract().then((contract) => {
-      this._instance = contract.instance;
-      return this._instance;
-    });
-  }
-
-  getEntry (entryId) {
-    return this.getInstance().then((instance) => {
-      return instance.entries.call({}, [entryId]);
-    });
-  }
-}
diff --git a/js/src/contracts/githubhint.spec.js b/js/src/contracts/githubhint.spec.js
deleted file mode 100644
index f3385078237633bd0fdca77cb73f10bc6b188046..0000000000000000000000000000000000000000
--- a/js/src/contracts/githubhint.spec.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import GithubHint from './githubhint';
-
-let githubHint;
-let instance;
-let registry;
-
-function create () {
-  instance = {
-    __id: 'testInstance',
-    entries: {
-      call: sinon.stub().resolves('testValue')
-    }
-  };
-  registry = {
-    getContract: sinon.stub().resolves({ instance })
-  };
-  githubHint = new GithubHint({}, registry);
-
-  return githubHint;
-}
-
-describe('contracts/GithubHint', () => {
-  beforeEach(() => {
-    create();
-
-    return githubHint.getInstance();
-  });
-
-  it('instantiates successfully', () => {
-    expect(githubHint).to.be.ok;
-  });
-
-  it('attaches the instance on create', () => {
-    expect(githubHint._instance.__id).to.equal('testInstance');
-  });
-
-  describe('interface', () => {
-    describe('getEntry', () => {
-      beforeEach(() => {
-        return githubHint.getEntry('testId');
-      });
-
-      it('calls entries on the instance', () => {
-        expect(instance.entries.call).to.have.been.calledWith({}, ['testId']);
-      });
-    });
-  });
-});
diff --git a/js/src/contracts/index.js b/js/src/contracts/index.js
deleted file mode 100644
index 8714ff544deb1aa555d2086247c09fc8d99532de..0000000000000000000000000000000000000000
--- a/js/src/contracts/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './contracts';
diff --git a/js/src/contracts/registry.js b/js/src/contracts/registry.js
deleted file mode 100644
index cef31785e061210b8094fbee20e827259123eb14..0000000000000000000000000000000000000000
--- a/js/src/contracts/registry.js
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import * as abis from './abi';
-
-const REGISTRY_V1_HASHES = [
-  '0x34f7c51bbb1b1902fbdabfdf04811100f5c9f998f26dd535d2f6f977492c748e', // ropsten
-  '0x64c3ee34851517a9faecd995c102b339f03e564ad6772dc43a26f993238b20ec' // homestead
-];
-
-export default class Registry {
-  _registryContract = null;
-
-  constructor (api) {
-    this._api = api;
-
-    this._contracts = {};
-    this._pendingContracts = {};
-
-    this._instance = null;
-    this._fetching = false;
-    this._queue = [];
-
-    this.getInstance();
-  }
-
-  getInstance () {
-    if (this._instance) {
-      return Promise.resolve(this._instance);
-    }
-
-    if (this._fetching) {
-      return new Promise((resolve) => {
-        this._queue.push({ resolve });
-      });
-    }
-
-    this._fetching = true;
-
-    return this.fetchContract()
-      .then((contract) => {
-        this._fetching = false;
-        this._instance = contract.instance;
-
-        this._queue.forEach((queued) => {
-          queued.resolve(this._instance);
-        });
-
-        this._queue = [];
-
-        return this._instance;
-      });
-  }
-
-  getContract (_name) {
-    const name = _name.toLowerCase();
-
-    if (this._contracts[name]) {
-      return Promise.resolve(this._contracts[name]);
-    }
-
-    if (this._pendingContracts[name]) {
-      return this._pendingContracts[name];
-    }
-
-    const promise = this
-      .lookupAddress(name)
-      .then((address) => {
-        this._contracts[name] = this._api.newContract(abis[name], address);
-        delete this._pendingContracts[name];
-        return this._contracts[name];
-      });
-
-    this._pendingContracts[name] = promise;
-
-    return promise;
-  }
-
-  getContractInstance (_name) {
-    return this
-      .getContract(_name)
-      .then((contract) => contract.instance);
-  }
-
-  fetchContract () {
-    if (this._registryContract) {
-      return Promise.resolve(this._registryContract);
-    }
-
-    return this._api.parity
-      .registryAddress()
-      .then((address) => Promise.all([ address, this._api.eth.getCode(address) ]))
-      .then(([ address, code ]) => {
-        const codeHash = this._api.util.sha3(code);
-        const version = REGISTRY_V1_HASHES.includes(codeHash)
-          ? 1
-          : 2;
-        const abi = version === 1
-            ? abis.registry
-            : abis.registry2;
-        const contract = this._api.newContract(abi, address);
-
-        // Add support for previous `set` and `get` methods
-        if (!contract.instance.get && contract.instance.getData) {
-          contract.instance.get = contract.instance.getData;
-        }
-
-        if (contract.instance.get && !contract.instance.getData) {
-          contract.instance.getData = contract.instance.get;
-        }
-
-        if (!contract.instance.set && contract.instance.setData) {
-          contract.instance.set = contract.instance.setData;
-        }
-
-        if (contract.instance.set && !contract.instance.setData) {
-          contract.instance.setData = contract.instance.set;
-        }
-
-        console.log(`registry at ${address}, code ${codeHash}, version ${version}`);
-        this._registryContract = contract;
-        return this._registryContract;
-      });
-  }
-
-  _createGetParams (_name, key) {
-    const name = _name.toLowerCase();
-    const sha3 = this._api.util.sha3.text(name);
-
-    return [sha3, key];
-  }
-
-  lookupAddress (name) {
-    return this
-      .getInstance()
-      .then((instance) => {
-        return instance.getAddress.call({}, this._createGetParams(name, 'A'));
-      })
-      .then((address) => {
-        console.log('[lookupAddress]', `${name}: ${address}`);
-        return address;
-      });
-  }
-
-  lookupMeta (name, key) {
-    return this
-      .getInstance()
-      .then((instance) => {
-        return instance.get.call({}, this._createGetParams(name, key));
-      });
-  }
-}
diff --git a/js/src/contracts/registry.spec.js b/js/src/contracts/registry.spec.js
deleted file mode 100644
index cf81a2b7210ab9d3b2e29a46147c68df371b8f19..0000000000000000000000000000000000000000
--- a/js/src/contracts/registry.spec.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import apiutil from '~/api/util';
-
-import Registry from './registry';
-
-const GHH_NAME = 'githubhint';
-const GHH_SHA3 = '0x058740ee9a5a3fb9f1cfa10752baec87e09cc45cd7027fd54708271aca300c75';
-
-let api;
-let instance;
-let registry;
-
-function create () {
-  instance = {
-    __id: 'testInstance',
-    get: {
-      call: sinon.stub().resolves('testGet')
-    }
-  };
-  api = {
-    eth: {
-      getCode: sinon.stub().resolves('0x123456')
-    },
-    parity: {
-      registryAddress: sinon.stub().resolves('testRegistryAddress')
-    },
-    util: apiutil,
-    newContract: sinon.stub().returns({ instance })
-  };
-  registry = new Registry(api);
-
-  return registry;
-}
-
-describe('contracts/Registry', () => {
-  beforeEach(() => {
-    create();
-
-    return registry.getInstance();
-  });
-
-  it('instantiates successfully', () => {
-    expect(registry).to.be.ok;
-  });
-
-  it('retrieves the registry on create', () => {
-    expect(api.parity.registryAddress).to.have.been.called;
-  });
-
-  it('attaches the instance on create', () => {
-    expect(registry._instance.__id).to.equal('testInstance');
-  });
-
-  describe('interface', () => {
-    describe('lookupMeta', () => {
-      it('calls get on the contract', () => {
-        return registry.lookupMeta(GHH_NAME, 'key').then(() => {
-          expect(instance.get.call).to.have.been.calledWith({}, [GHH_SHA3, 'key']);
-        });
-      });
-
-      it('converts names to lowercase', () => {
-        return registry.lookupMeta(GHH_NAME.toUpperCase(), 'key').then(() => {
-          expect(instance.get.call).to.have.been.calledWith({}, [GHH_SHA3, 'key']);
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/contracts/signaturereg.js b/js/src/contracts/signaturereg.js
deleted file mode 100644
index 9fa3eab069f639194c8bd04b5cf03fdc6aebd1c0..0000000000000000000000000000000000000000
--- a/js/src/contracts/signaturereg.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default class SignatureReg {
-  constructor (api, registry) {
-    this._api = api;
-    this._registry = registry;
-
-    this.getInstance();
-  }
-
-  getInstance () {
-    return this._registry.getContractInstance('signaturereg');
-  }
-
-  lookup (signature) {
-    return this.getInstance().then((instance) => {
-      return instance.entries.call({}, [signature]);
-    });
-  }
-}
diff --git a/js/src/contracts/snippets/enhanced-wallet.sol b/js/src/contracts/snippets/enhanced-wallet.sol
deleted file mode 100644
index 90a15c070ba26db27c4190a6287f6c34446d123f..0000000000000000000000000000000000000000
--- a/js/src/contracts/snippets/enhanced-wallet.sol
+++ /dev/null
@@ -1,464 +0,0 @@
-//sol Wallet
-// Multi-sig, daily-limited account proxy/wallet.
-// @authors:
-// Gav Wood <g@ethdev.com>
-// inheritable "property" contract that enables methods to be protected by requiring the acquiescence of either a
-// single, or, crucially, each of a number of, designated owners.
-// usage:
-// use modifiers onlyowner (just own owned) or onlymanyowners(hash), whereby the same hash must be provided by
-// some number (specified in constructor) of the set of owners (specified in the constructor, modifiable) before the
-// interior is executed.
-
-pragma solidity ^0.4.9;
-
-contract WalletEvents {
-  // EVENTS
-
-  // this contract only has six types of events: it can accept a confirmation, in which case
-  // we record owner and operation (hash) alongside it.
-  event Confirmation(address owner, bytes32 operation);
-  event Revoke(address owner, bytes32 operation);
-
-  // some others are in the case of an owner changing.
-  event OwnerChanged(address oldOwner, address newOwner);
-  event OwnerAdded(address newOwner);
-  event OwnerRemoved(address oldOwner);
-
-  // the last one is emitted if the required signatures change
-  event RequirementChanged(uint newRequirement);
-
-  // Funds has arrived into the wallet (record how much).
-  event Deposit(address _from, uint value);
-  // Single transaction going out of the wallet (record who signed for it, how much, and to whom it's going).
-  event SingleTransact(address owner, uint value, address to, bytes data, address created);
-  // Multi-sig transaction going out of the wallet (record who signed for it last, the operation hash, how much, and to whom it's going).
-  event MultiTransact(address owner, bytes32 operation, uint value, address to, bytes data, address created);
-  // Confirmation still needed for a transaction.
-  event ConfirmationNeeded(bytes32 operation, address initiator, uint value, address to, bytes data);
-}
-
-contract WalletAbi {
-  // Revokes a prior confirmation of the given operation
-  function revoke(bytes32 _operation) external;
-
-  // Replaces an owner `_from` with another `_to`.
-  function changeOwner(address _from, address _to) external;
-
-  function addOwner(address _owner) external;
-
-  function removeOwner(address _owner) external;
-
-  function changeRequirement(uint _newRequired) external;
-
-  function isOwner(address _addr) constant returns (bool);
-
-  function hasConfirmed(bytes32 _operation, address _owner) external constant returns (bool);
-
-  // (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
-  function setDailyLimit(uint _newLimit) external;
-
-  function execute(address _to, uint _value, bytes _data) external returns (bytes32 o_hash);
-  function confirm(bytes32 _h) returns (bool o_success);
-}
-
-contract WalletLibrary is WalletEvents {
-  // TYPES
-
-  // struct for the status of a pending operation.
-  struct PendingState {
-    uint yetNeeded;
-    uint ownersDone;
-    uint index;
-  }
-
-  // Transaction structure to remember details of transaction lest it need be saved for a later call.
-  struct Transaction {
-    address to;
-    uint value;
-    bytes data;
-  }
-
-  // MODIFIERS
-
-  // simple single-sig function modifier.
-  modifier onlyowner {
-    if (isOwner(msg.sender))
-      _;
-  }
-  // multi-sig function modifier: the operation must have an intrinsic hash in order
-  // that later attempts can be realised as the same underlying operation and
-  // thus count as confirmations.
-  modifier onlymanyowners(bytes32 _operation) {
-    if (confirmAndCheck(_operation))
-      _;
-  }
-
-  // METHODS
-
-  // gets called when no other function matches
-  function() payable {
-    // just being sent some cash?
-    if (msg.value > 0)
-      Deposit(msg.sender, msg.value);
-  }
-
-  // constructor is given number of sigs required to do protected "onlymanyowners" transactions
-  // as well as the selection of addresses capable of confirming them.
-  function initMultiowned(address[] _owners, uint _required) only_uninitialized {
-    m_numOwners = _owners.length + 1;
-    m_owners[1] = uint(msg.sender);
-    m_ownerIndex[uint(msg.sender)] = 1;
-    for (uint i = 0; i < _owners.length; ++i)
-    {
-      m_owners[2 + i] = uint(_owners[i]);
-      m_ownerIndex[uint(_owners[i])] = 2 + i;
-    }
-    m_required = _required;
-  }
-
-  // Revokes a prior confirmation of the given operation
-  function revoke(bytes32 _operation) external {
-    uint ownerIndex = m_ownerIndex[uint(msg.sender)];
-    // make sure they're an owner
-    if (ownerIndex == 0) return;
-    uint ownerIndexBit = 2**ownerIndex;
-    var pending = m_pending[_operation];
-    if (pending.ownersDone & ownerIndexBit > 0) {
-      pending.yetNeeded++;
-      pending.ownersDone -= ownerIndexBit;
-      Revoke(msg.sender, _operation);
-    }
-  }
-
-  // Replaces an owner `_from` with another `_to`.
-  function changeOwner(address _from, address _to) onlymanyowners(sha3(msg.data)) external {
-    if (isOwner(_to)) return;
-    uint ownerIndex = m_ownerIndex[uint(_from)];
-    if (ownerIndex == 0) return;
-
-    clearPending();
-    m_owners[ownerIndex] = uint(_to);
-    m_ownerIndex[uint(_from)] = 0;
-    m_ownerIndex[uint(_to)] = ownerIndex;
-    OwnerChanged(_from, _to);
-  }
-
-  function addOwner(address _owner) onlymanyowners(sha3(msg.data)) external {
-    if (isOwner(_owner)) return;
-
-    clearPending();
-    if (m_numOwners >= c_maxOwners)
-      reorganizeOwners();
-    if (m_numOwners >= c_maxOwners)
-      return;
-    m_numOwners++;
-    m_owners[m_numOwners] = uint(_owner);
-    m_ownerIndex[uint(_owner)] = m_numOwners;
-    OwnerAdded(_owner);
-  }
-
-  function removeOwner(address _owner) onlymanyowners(sha3(msg.data)) external {
-    uint ownerIndex = m_ownerIndex[uint(_owner)];
-    if (ownerIndex == 0) return;
-    if (m_required > m_numOwners - 1) return;
-
-    m_owners[ownerIndex] = 0;
-    m_ownerIndex[uint(_owner)] = 0;
-    clearPending();
-    reorganizeOwners(); //make sure m_numOwner is equal to the number of owners and always points to the optimal free slot
-    OwnerRemoved(_owner);
-  }
-
-  function changeRequirement(uint _newRequired) onlymanyowners(sha3(msg.data)) external {
-    if (_newRequired > m_numOwners) return;
-    m_required = _newRequired;
-    clearPending();
-    RequirementChanged(_newRequired);
-  }
-
-  // Gets an owner by 0-indexed position (using numOwners as the count)
-  function getOwner(uint ownerIndex) external constant returns (address) {
-    return address(m_owners[ownerIndex + 1]);
-  }
-
-  function isOwner(address _addr) constant returns (bool) {
-    return m_ownerIndex[uint(_addr)] > 0;
-  }
-
-  function hasConfirmed(bytes32 _operation, address _owner) external constant returns (bool) {
-    var pending = m_pending[_operation];
-    uint ownerIndex = m_ownerIndex[uint(_owner)];
-
-    // make sure they're an owner
-    if (ownerIndex == 0) return false;
-
-    // determine the bit to set for this owner.
-    uint ownerIndexBit = 2**ownerIndex;
-    return !(pending.ownersDone & ownerIndexBit == 0);
-  }
-
-  // constructor - stores initial daily limit and records the present day's index.
-  function initDaylimit(uint _limit) only_uninitialized {
-    m_dailyLimit = _limit;
-    m_lastDay = today();
-  }
-  // (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
-  function setDailyLimit(uint _newLimit) onlymanyowners(sha3(msg.data)) external {
-    m_dailyLimit = _newLimit;
-  }
-  // resets the amount already spent today. needs many of the owners to confirm.
-  function resetSpentToday() onlymanyowners(sha3(msg.data)) external {
-    m_spentToday = 0;
-  }
-
-  // throw unless the contract is not yet initialized.
-  modifier only_uninitialized { if (m_numOwners > 0) throw; _; }
-
-  // constructor - just pass on the owner array to the multiowned and
-  // the limit to daylimit
-  function initWallet(address[] _owners, uint _required, uint _daylimit) only_uninitialized {
-    initDaylimit(_daylimit);
-    initMultiowned(_owners, _required);
-  }
-
-  // kills the contract sending everything to `_to`.
-  function kill(address _to) onlymanyowners(sha3(msg.data)) external {
-    suicide(_to);
-  }
-
-  // Outside-visible transact entry point. Executes transaction immediately if below daily spend limit.
-  // If not, goes into multisig process. We provide a hash on return to allow the sender to provide
-  // shortcuts for the other confirmations (allowing them to avoid replicating the _to, _value
-  // and _data arguments). They still get the option of using them if they want, anyways.
-  function execute(address _to, uint _value, bytes _data) external onlyowner returns (bytes32 o_hash) {
-    // first, take the opportunity to check that we're under the daily limit.
-    if ((_data.length == 0 && underLimit(_value)) || m_required == 1) {
-      // yes - just execute the call.
-      address created;
-      if (_to == 0) {
-        created = create(_value, _data);
-      } else {
-        if (!_to.call.value(_value)(_data))
-          throw;
-      }
-      SingleTransact(msg.sender, _value, _to, _data, created);
-    } else {
-      // determine our operation hash.
-      o_hash = sha3(msg.data, block.number);
-      // store if it's new
-      if (m_txs[o_hash].to == 0 && m_txs[o_hash].value == 0 && m_txs[o_hash].data.length == 0) {
-        m_txs[o_hash].to = _to;
-        m_txs[o_hash].value = _value;
-        m_txs[o_hash].data = _data;
-      }
-      if (!confirm(o_hash)) {
-        ConfirmationNeeded(o_hash, msg.sender, _value, _to, _data);
-      }
-    }
-  }
-
-  function create(uint _value, bytes _code) internal returns (address o_addr) {
-    assembly {
-      o_addr := create(_value, add(_code, 0x20), mload(_code))
-      jumpi(invalidJumpLabel, iszero(extcodesize(o_addr)))
-    }
-  }
-
-  // confirm a transaction through just the hash. we use the previous transactions map, m_txs, in order
-  // to determine the body of the transaction from the hash provided.
-  function confirm(bytes32 _h) onlymanyowners(_h) returns (bool o_success) {
-    if (m_txs[_h].to != 0 || m_txs[_h].value != 0 || m_txs[_h].data.length != 0) {
-      address created;
-      if (m_txs[_h].to == 0) {
-        created = create(m_txs[_h].value, m_txs[_h].data);
-      } else {
-        if (!m_txs[_h].to.call.value(m_txs[_h].value)(m_txs[_h].data))
-          throw;
-      }
-
-      MultiTransact(msg.sender, _h, m_txs[_h].value, m_txs[_h].to, m_txs[_h].data, created);
-      delete m_txs[_h];
-      return true;
-    }
-  }
-
-  // INTERNAL METHODS
-
-  function confirmAndCheck(bytes32 _operation) internal returns (bool) {
-    // determine what index the present sender is:
-    uint ownerIndex = m_ownerIndex[uint(msg.sender)];
-    // make sure they're an owner
-    if (ownerIndex == 0) return;
-
-    var pending = m_pending[_operation];
-    // if we're not yet working on this operation, switch over and reset the confirmation status.
-    if (pending.yetNeeded == 0) {
-      // reset count of confirmations needed.
-      pending.yetNeeded = m_required;
-      // reset which owners have confirmed (none) - set our bitmap to 0.
-      pending.ownersDone = 0;
-      pending.index = m_pendingIndex.length++;
-      m_pendingIndex[pending.index] = _operation;
-    }
-    // determine the bit to set for this owner.
-    uint ownerIndexBit = 2**ownerIndex;
-    // make sure we (the message sender) haven't confirmed this operation previously.
-    if (pending.ownersDone & ownerIndexBit == 0) {
-      Confirmation(msg.sender, _operation);
-      // ok - check if count is enough to go ahead.
-      if (pending.yetNeeded <= 1) {
-        // enough confirmations: reset and run interior.
-        delete m_pendingIndex[m_pending[_operation].index];
-        delete m_pending[_operation];
-        return true;
-      }
-      else
-      {
-        // not enough: record that this owner in particular confirmed.
-        pending.yetNeeded--;
-        pending.ownersDone |= ownerIndexBit;
-      }
-    }
-  }
-
-  function reorganizeOwners() private {
-    uint free = 1;
-    while (free < m_numOwners)
-    {
-      while (free < m_numOwners && m_owners[free] != 0) free++;
-      while (m_numOwners > 1 && m_owners[m_numOwners] == 0) m_numOwners--;
-      if (free < m_numOwners && m_owners[m_numOwners] != 0 && m_owners[free] == 0)
-      {
-        m_owners[free] = m_owners[m_numOwners];
-        m_ownerIndex[m_owners[free]] = free;
-        m_owners[m_numOwners] = 0;
-      }
-    }
-  }
-
-  // checks to see if there is at least `_value` left from the daily limit today. if there is, subtracts it and
-  // returns true. otherwise just returns false.
-  function underLimit(uint _value) internal onlyowner returns (bool) {
-    // reset the spend limit if we're on a different day to last time.
-    if (today() > m_lastDay) {
-      m_spentToday = 0;
-      m_lastDay = today();
-    }
-    // check to see if there's enough left - if so, subtract and return true.
-    // overflow protection                    // dailyLimit check
-    if (m_spentToday + _value >= m_spentToday && m_spentToday + _value <= m_dailyLimit) {
-      m_spentToday += _value;
-      return true;
-    }
-    return false;
-  }
-
-  // determines today's index.
-  function today() private constant returns (uint) { return now / 1 days; }
-
-  function clearPending() internal {
-    uint length = m_pendingIndex.length;
-
-    for (uint i = 0; i < length; ++i) {
-      delete m_txs[m_pendingIndex[i]];
-
-      if (m_pendingIndex[i] != 0)
-        delete m_pending[m_pendingIndex[i]];
-    }
-
-    delete m_pendingIndex;
-  }
-
-  // FIELDS
-  address constant _walletLibrary = 0xcafecafecafecafecafecafecafecafecafecafe;
-
-  // the number of owners that must confirm the same operation before it is run.
-  uint public m_required;
-  // pointer used to find a free slot in m_owners
-  uint public m_numOwners;
-
-  uint public m_dailyLimit;
-  uint public m_spentToday;
-  uint public m_lastDay;
-
-  // list of owners
-  uint[256] m_owners;
-
-  uint constant c_maxOwners = 250;
-  // index on the list of owners to allow reverse lookup
-  mapping(uint => uint) m_ownerIndex;
-  // the ongoing operations.
-  mapping(bytes32 => PendingState) m_pending;
-  bytes32[] m_pendingIndex;
-
-  // pending transactions we have at present.
-  mapping (bytes32 => Transaction) m_txs;
-}
-
-contract Wallet is WalletEvents {
-
-  // WALLET CONSTRUCTOR
-  //   calls the `initWallet` method of the Library in this context
-  function Wallet(address[] _owners, uint _required, uint _daylimit) {
-    // Signature of the Wallet Library's init function
-    bytes4 sig = bytes4(sha3("initWallet(address[],uint256,uint256)"));
-    address target = _walletLibrary;
-
-    // Compute the size of the call data : arrays has 2
-    // 32bytes for offset and length, plus 32bytes per element ;
-    // plus 2 32bytes for each uint
-    uint argarraysize = (2 + _owners.length);
-    uint argsize = (2 + argarraysize) * 32;
-
-    assembly {
-      // Add the signature first to memory
-      mstore(0x0, sig)
-      // Add the call data, which is at the end of the
-      // code
-      codecopy(0x4,  sub(codesize, argsize), argsize)
-      // Delegate call to the library
-      delegatecall(sub(gas, 10000), target, 0x0, add(argsize, 0x4), 0x0, 0x0)
-    }
-  }
-
-  // METHODS
-
-  // gets called when no other function matches
-  function() payable {
-    // just being sent some cash?
-    if (msg.value > 0)
-      Deposit(msg.sender, msg.value);
-    else if (msg.data.length > 0)
-      _walletLibrary.delegatecall(msg.data);
-  }
-
-  // Gets an owner by 0-indexed position (using numOwners as the count)
-  function getOwner(uint ownerIndex) constant returns (address) {
-    return address(m_owners[ownerIndex + 1]);
-  }
-
-  // As return statement unavailable in fallback, explicit the method here
-
-  function hasConfirmed(bytes32 _operation, address _owner) external constant returns (bool) {
-    return _walletLibrary.delegatecall(msg.data);
-  }
-
-  function isOwner(address _addr) constant returns (bool) {
-    return _walletLibrary.delegatecall(msg.data);
-  }
-
-  // FIELDS
-  address constant _walletLibrary = 0xcafecafecafecafecafecafecafecafecafecafe;
-
-  // the number of owners that must confirm the same operation before it is run.
-  uint public m_required;
-  // pointer used to find a free slot in m_owners
-  uint public m_numOwners;
-
-  uint public m_dailyLimit;
-  uint public m_spentToday;
-  uint public m_lastDay;
-
-  // list of owners
-  uint[256] m_owners;
-}
diff --git a/js/src/contracts/snippets/human-standard-token.sol b/js/src/contracts/snippets/human-standard-token.sol
deleted file mode 100644
index db05bbc7df9fdbc78b40629c31a79eae1acf0ba2..0000000000000000000000000000000000000000
--- a/js/src/contracts/snippets/human-standard-token.sol
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-This Token Contract implements the standard token functionality (https://github.com/ethereum/EIPs/issues/20) as well as the following OPTIONAL extras intended for use by humans.
-
-In other words. This is intended for deployment in something like a Token Factory or Mist wallet, and then used by humans.
-Imagine coins, currencies, shares, voting weight, etc.
-Machine-based, rapid creation of many tokens would not necessarily need these extra features or will be minted in other manners.
-
-1) Initial Finite Supply (upon creation one specifies how much is minted).
-2) In the absence of a token registry: Optional Decimal, Symbol & Name.
-3) Optional approveAndCall() functionality to notify a contract if an approval() has occurred.
-
-.*/
-
-import "StandardToken.sol";
-
-contract HumanStandardToken is StandardToken {
-
-    function () {
-        //if ether is sent to this address, send it back.
-        throw;
-    }
-
-    /* Public variables of the token */
-
-    /*
-    NOTE:
-    The following variables are OPTIONAL vanities. One does not have to include them.
-    They allow one to customise the token contract & in no way influences the core functionality.
-    Some wallets/interfaces might not even bother to look at this information.
-    */
-    string public name;                   //fancy name: eg Simon Bucks
-    uint8 public decimals;                //How many decimals to show. ie. There could 1000 base units with 3 decimals. Meaning 0.980 SBX = 980 base units. It's like comparing 1 wei to 1 ether.
-    string public symbol;                 //An identifier: eg SBX
-    string public version = 'H0.1';       //human 0.1 standard. Just an arbitrary versioning scheme.
-
-    function HumanStandardToken(
-        uint256 _initialAmount,
-        string _tokenName,
-        uint8 _decimalUnits,
-        string _tokenSymbol
-        ) {
-        balances[msg.sender] = _initialAmount;               // Give the creator all initial tokens
-        totalSupply = _initialAmount;                        // Update total supply
-        name = _tokenName;                                   // Set the name for display purposes
-        decimals = _decimalUnits;                            // Amount of decimals for display purposes
-        symbol = _tokenSymbol;                               // Set the symbol for display purposes
-    }
-
-    /* Approves and then calls the receiving contract */
-    function approveAndCall(address _spender, uint256 _value, bytes _extraData) returns (bool success) {
-        allowed[msg.sender][_spender] = _value;
-        Approval(msg.sender, _spender, _value);
-
-        //call the receiveApproval function on the contract you want to be notified. This crafts the function signature manually so one doesn't have to include a contract in here just for this.
-        //receiveApproval(address _from, uint256 _value, address _tokenContract, bytes _extraData)
-        //it is assumed that when does this that the call *should* succeed, otherwise one would use vanilla approve instead.
-        if(!_spender.call(bytes4(bytes32(sha3("receiveApproval(address,uint256,address,bytes)"))), msg.sender, _value, this, _extraData)) { throw; }
-        return true;
-    }
-}
diff --git a/js/src/contracts/snippets/standard-token.sol b/js/src/contracts/snippets/standard-token.sol
deleted file mode 100644
index 3d91e5510d2956b13bbb46a979fddea53647af2d..0000000000000000000000000000000000000000
--- a/js/src/contracts/snippets/standard-token.sol
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-You should inherit from StandardToken or, for a token like you would want to
-deploy in something like Mist, see HumanStandardToken.sol.
-(This implements ONLY the standard functions and NOTHING else.
-If you deploy this, you won't have anything useful.)
-
-Implements ERC 20 Token standard: https://github.com/ethereum/EIPs/issues/20
-.*/
-
-import "Token.sol";
-
-contract StandardToken is Token {
-
-    function transfer(address _to, uint256 _value) returns (bool success) {
-        //Default assumes totalSupply can't be over max (2^256 - 1).
-        //If your token leaves out totalSupply and can issue more tokens as time goes on, you need to check if it doesn't wrap.
-        //Replace the if with this one instead.
-        //if (balances[msg.sender] >= _value && balances[_to] + _value > balances[_to]) {
-        if (balances[msg.sender] >= _value && _value > 0) {
-            balances[msg.sender] -= _value;
-            balances[_to] += _value;
-            Transfer(msg.sender, _to, _value);
-            return true;
-        } else { return false; }
-    }
-
-    function transferFrom(address _from, address _to, uint256 _value) returns (bool success) {
-        //same as above. Replace this line with the following if you want to protect against wrapping uints.
-        //if (balances[_from] >= _value && allowed[_from][msg.sender] >= _value && balances[_to] + _value > balances[_to]) {
-        if (balances[_from] >= _value && allowed[_from][msg.sender] >= _value && _value > 0) {
-            balances[_to] += _value;
-            balances[_from] -= _value;
-            allowed[_from][msg.sender] -= _value;
-            Transfer(_from, _to, _value);
-            return true;
-        } else { return false; }
-    }
-
-    function balanceOf(address _owner) constant returns (uint256 balance) {
-        return balances[_owner];
-    }
-
-    function approve(address _spender, uint256 _value) returns (bool success) {
-        allowed[msg.sender][_spender] = _value;
-        Approval(msg.sender, _spender, _value);
-        return true;
-    }
-
-    function allowance(address _owner, address _spender) constant returns (uint256 remaining) {
-      return allowed[_owner][_spender];
-    }
-
-    mapping (address => uint256) balances;
-    mapping (address => mapping (address => uint256)) allowed;
-}
diff --git a/js/src/contracts/snippets/token.sol b/js/src/contracts/snippets/token.sol
deleted file mode 100644
index d54c5c42434c10a36bfafc80cf6781b28896a40b..0000000000000000000000000000000000000000
--- a/js/src/contracts/snippets/token.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-// Abstract contract for the full ERC 20 Token standard
-// https://github.com/ethereum/EIPs/issues/20
-
-contract Token {
-    /* This is a slight change to the ERC20 base standard.
-    function totalSupply() constant returns (uint256 supply);
-    is replaced with:
-    uint256 public totalSupply;
-    This automatically creates a getter function for the totalSupply.
-    This is moved to the base contract since public getter functions are not
-    currently recognised as an implementation of the matching abstract
-    function by the compiler.
-    */
-    /// total amount of tokens
-    uint256 public totalSupply;
-
-    /// @param _owner The address from which the balance will be retrieved
-    /// @return The balance
-    function balanceOf(address _owner) constant returns (uint256 balance);
-
-    /// @notice send `_value` token to `_to` from `msg.sender`
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    /// @return Whether the transfer was successful or not
-    function transfer(address _to, uint256 _value) returns (bool success);
-
-    /// @notice send `_value` token to `_to` from `_from` on the condition it is approved by `_from`
-    /// @param _from The address of the sender
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    /// @return Whether the transfer was successful or not
-    function transferFrom(address _from, address _to, uint256 _value) returns (bool success);
-
-    /// @notice `msg.sender` approves `_addr` to spend `_value` tokens
-    /// @param _spender The address of the account able to transfer the tokens
-    /// @param _value The amount of wei to be approved for transfer
-    /// @return Whether the approval was successful or not
-    function approve(address _spender, uint256 _value) returns (bool success);
-
-    /// @param _owner The address of the account owning tokens
-    /// @param _spender The address of the account able to transfer the tokens
-    /// @return Amount of remaining tokens allowed to spent
-    function allowance(address _owner, address _spender) constant returns (uint256 remaining);
-
-    event Transfer(address indexed _from, address indexed _to, uint256 _value);
-    event Approval(address indexed _owner, address indexed _spender, uint256 _value);
-}
diff --git a/js/src/contracts/snippets/wallet.sol b/js/src/contracts/snippets/wallet.sol
deleted file mode 100644
index a8f1ba93872c20c659978347eff0130480ee51d6..0000000000000000000000000000000000000000
--- a/js/src/contracts/snippets/wallet.sol
+++ /dev/null
@@ -1,403 +0,0 @@
-//sol Wallet
-// Multi-sig, daily-limited account proxy/wallet.
-// @authors:
-// Gav Wood <g@ethdev.com>
-// inheritable "property" contract that enables methods to be protected by requiring the acquiescence of either a
-// single, or, crucially, each of a number of, designated owners.
-// usage:
-// use modifiers onlyowner (just own owned) or onlymanyowners(hash), whereby the same hash must be provided by
-// some number (specified in constructor) of the set of owners (specified in the constructor, modifiable) before the
-// interior is executed.
-
-pragma solidity ^0.4.9;
-
-contract multiowned {
-
-  // TYPES
-
-  // struct for the status of a pending operation.
-  struct PendingState {
-    uint yetNeeded;
-    uint ownersDone;
-    uint index;
-  }
-
-  // EVENTS
-
-  // this contract only has six types of events: it can accept a confirmation, in which case
-  // we record owner and operation (hash) alongside it.
-  event Confirmation(address owner, bytes32 operation);
-  event Revoke(address owner, bytes32 operation);
-  // some others are in the case of an owner changing.
-  event OwnerChanged(address oldOwner, address newOwner);
-  event OwnerAdded(address newOwner);
-  event OwnerRemoved(address oldOwner);
-  // the last one is emitted if the required signatures change
-  event RequirementChanged(uint newRequirement);
-
-  // MODIFIERS
-
-  // simple single-sig function modifier.
-  modifier onlyowner {
-    if (isOwner(msg.sender))
-      _;
-  }
-  // multi-sig function modifier: the operation must have an intrinsic hash in order
-  // that later attempts can be realised as the same underlying operation and
-  // thus count as confirmations.
-  modifier onlymanyowners(bytes32 _operation) {
-    if (confirmAndCheck(_operation))
-      _;
-  }
-
-  // METHODS
-
-  // constructor is given number of sigs required to do protected "onlymanyowners" transactions
-  // as well as the selection of addresses capable of confirming them.
-  function multiowned(address[] _owners, uint _required) {
-    m_numOwners = _owners.length + 1;
-    m_owners[1] = uint(msg.sender);
-    m_ownerIndex[uint(msg.sender)] = 1;
-    for (uint i = 0; i < _owners.length; ++i)
-    {
-      m_owners[2 + i] = uint(_owners[i]);
-      m_ownerIndex[uint(_owners[i])] = 2 + i;
-    }
-    m_required = _required;
-  }
-
-  // Revokes a prior confirmation of the given operation
-  function revoke(bytes32 _operation) external {
-    uint ownerIndex = m_ownerIndex[uint(msg.sender)];
-    // make sure they're an owner
-    if (ownerIndex == 0) return;
-    uint ownerIndexBit = 2**ownerIndex;
-    var pending = m_pending[_operation];
-    if (pending.ownersDone & ownerIndexBit > 0) {
-      pending.yetNeeded++;
-      pending.ownersDone -= ownerIndexBit;
-      Revoke(msg.sender, _operation);
-    }
-  }
-
-  // Replaces an owner `_from` with another `_to`.
-  function changeOwner(address _from, address _to) onlymanyowners(sha3(msg.data)) external {
-    if (isOwner(_to)) return;
-    uint ownerIndex = m_ownerIndex[uint(_from)];
-    if (ownerIndex == 0) return;
-
-    clearPending();
-    m_owners[ownerIndex] = uint(_to);
-    m_ownerIndex[uint(_from)] = 0;
-    m_ownerIndex[uint(_to)] = ownerIndex;
-    OwnerChanged(_from, _to);
-  }
-
-  function addOwner(address _owner) onlymanyowners(sha3(msg.data)) external {
-    if (isOwner(_owner)) return;
-
-    clearPending();
-    if (m_numOwners >= c_maxOwners)
-      reorganizeOwners();
-    if (m_numOwners >= c_maxOwners)
-      return;
-    m_numOwners++;
-    m_owners[m_numOwners] = uint(_owner);
-    m_ownerIndex[uint(_owner)] = m_numOwners;
-    OwnerAdded(_owner);
-  }
-
-  function removeOwner(address _owner) onlymanyowners(sha3(msg.data)) external {
-    uint ownerIndex = m_ownerIndex[uint(_owner)];
-    if (ownerIndex == 0) return;
-    if (m_required > m_numOwners - 1) return;
-
-    m_owners[ownerIndex] = 0;
-    m_ownerIndex[uint(_owner)] = 0;
-    clearPending();
-    reorganizeOwners(); //make sure m_numOwner is equal to the number of owners and always points to the optimal free slot
-    OwnerRemoved(_owner);
-  }
-
-  function changeRequirement(uint _newRequired) onlymanyowners(sha3(msg.data)) external {
-    if (_newRequired > m_numOwners) return;
-    m_required = _newRequired;
-    clearPending();
-    RequirementChanged(_newRequired);
-  }
-
-  // Gets an owner by 0-indexed position (using numOwners as the count)
-  function getOwner(uint ownerIndex) external constant returns (address) {
-    return address(m_owners[ownerIndex + 1]);
-  }
-
-  function isOwner(address _addr) constant returns (bool) {
-    return m_ownerIndex[uint(_addr)] > 0;
-  }
-
-  function hasConfirmed(bytes32 _operation, address _owner) constant returns (bool) {
-    var pending = m_pending[_operation];
-    uint ownerIndex = m_ownerIndex[uint(_owner)];
-
-    // make sure they're an owner
-    if (ownerIndex == 0) return false;
-
-    // determine the bit to set for this owner.
-    uint ownerIndexBit = 2**ownerIndex;
-    return !(pending.ownersDone & ownerIndexBit == 0);
-  }
-
-  // INTERNAL METHODS
-
-  function confirmAndCheck(bytes32 _operation) internal returns (bool) {
-    // determine what index the present sender is:
-    uint ownerIndex = m_ownerIndex[uint(msg.sender)];
-    // make sure they're an owner
-    if (ownerIndex == 0) return;
-
-    var pending = m_pending[_operation];
-    // if we're not yet working on this operation, switch over and reset the confirmation status.
-    if (pending.yetNeeded == 0) {
-      // reset count of confirmations needed.
-      pending.yetNeeded = m_required;
-      // reset which owners have confirmed (none) - set our bitmap to 0.
-      pending.ownersDone = 0;
-      pending.index = m_pendingIndex.length++;
-      m_pendingIndex[pending.index] = _operation;
-    }
-    // determine the bit to set for this owner.
-    uint ownerIndexBit = 2**ownerIndex;
-    // make sure we (the message sender) haven't confirmed this operation previously.
-    if (pending.ownersDone & ownerIndexBit == 0) {
-      Confirmation(msg.sender, _operation);
-      // ok - check if count is enough to go ahead.
-      if (pending.yetNeeded <= 1) {
-        // enough confirmations: reset and run interior.
-        delete m_pendingIndex[m_pending[_operation].index];
-        delete m_pending[_operation];
-        return true;
-      }
-      else
-      {
-        // not enough: record that this owner in particular confirmed.
-        pending.yetNeeded--;
-        pending.ownersDone |= ownerIndexBit;
-      }
-    }
-  }
-
-  function reorganizeOwners() private {
-    uint free = 1;
-    while (free < m_numOwners)
-    {
-      while (free < m_numOwners && m_owners[free] != 0) free++;
-      while (m_numOwners > 1 && m_owners[m_numOwners] == 0) m_numOwners--;
-      if (free < m_numOwners && m_owners[m_numOwners] != 0 && m_owners[free] == 0)
-      {
-        m_owners[free] = m_owners[m_numOwners];
-        m_ownerIndex[m_owners[free]] = free;
-        m_owners[m_numOwners] = 0;
-      }
-    }
-  }
-
-  function clearPending() internal {
-    uint length = m_pendingIndex.length;
-    for (uint i = 0; i < length; ++i)
-      if (m_pendingIndex[i] != 0)
-        delete m_pending[m_pendingIndex[i]];
-    delete m_pendingIndex;
-  }
-
-  // FIELDS
-
-  // the number of owners that must confirm the same operation before it is run.
-  uint public m_required;
-  // pointer used to find a free slot in m_owners
-  uint public m_numOwners;
-
-  // list of owners
-  uint[256] m_owners;
-  uint constant c_maxOwners = 250;
-  // index on the list of owners to allow reverse lookup
-  mapping(uint => uint) m_ownerIndex;
-  // the ongoing operations.
-  mapping(bytes32 => PendingState) m_pending;
-  bytes32[] m_pendingIndex;
-}
-
-// inheritable "property" contract that enables methods to be protected by placing a linear limit (specifiable)
-// on a particular resource per calendar day. is multiowned to allow the limit to be altered. resource that method
-// uses is specified in the modifier.
-contract daylimit is multiowned {
-
-  // METHODS
-
-  // constructor - stores initial daily limit and records the present day's index.
-  function daylimit(uint _limit) {
-    m_dailyLimit = _limit;
-    m_lastDay = today();
-  }
-  // (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
-  function setDailyLimit(uint _newLimit) onlymanyowners(sha3(msg.data)) external {
-    m_dailyLimit = _newLimit;
-  }
-  // resets the amount already spent today. needs many of the owners to confirm.
-  function resetSpentToday() onlymanyowners(sha3(msg.data)) external {
-    m_spentToday = 0;
-  }
-
-  // INTERNAL METHODS
-
-  // checks to see if there is at least `_value` left from the daily limit today. if there is, subtracts it and
-  // returns true. otherwise just returns false.
-  function underLimit(uint _value) internal onlyowner returns (bool) {
-    // reset the spend limit if we're on a different day to last time.
-    if (today() > m_lastDay) {
-      m_spentToday = 0;
-      m_lastDay = today();
-    }
-    // check to see if there's enough left - if so, subtract and return true.
-    // overflow protection                    // dailyLimit check
-    if (m_spentToday + _value >= m_spentToday && m_spentToday + _value <= m_dailyLimit) {
-      m_spentToday += _value;
-      return true;
-    }
-    return false;
-  }
-  // determines today's index.
-  function today() private constant returns (uint) { return now / 1 days; }
-
-  // FIELDS
-
-  uint public m_dailyLimit;
-  uint public m_spentToday;
-  uint public m_lastDay;
-}
-
-// interface contract for multisig proxy contracts; see below for docs.
-contract multisig {
-
-  // EVENTS
-
-  // logged events:
-  // Funds has arrived into the wallet (record how much).
-  event Deposit(address _from, uint value);
-  // Single transaction going out of the wallet (record who signed for it, how much, and to whom it's going).
-  event SingleTransact(address owner, uint value, address to, bytes data, address created);
-  // Multi-sig transaction going out of the wallet (record who signed for it last, the operation hash, how much, and to whom it's going).
-  event MultiTransact(address owner, bytes32 operation, uint value, address to, bytes data, address created);
-  // Confirmation still needed for a transaction.
-  event ConfirmationNeeded(bytes32 operation, address initiator, uint value, address to, bytes data);
-
-  // FUNCTIONS
-
-  // TODO: document
-  function execute(address _to, uint _value, bytes _data) external returns (bytes32 o_hash);
-  function confirm(bytes32 _h) returns (bool o_success);
-}
-
-// usage:
-// bytes32 h = Wallet(w).from(oneOwner).execute(to, value, data);
-// Wallet(w).from(anotherOwner).confirm(h);
-contract Wallet is multisig, multiowned, daylimit {
-
-  // TYPES
-
-  // Transaction structure to remember details of transaction lest it need be saved for a later call.
-  struct Transaction {
-    address to;
-    uint value;
-    bytes data;
-  }
-
-  // METHODS
-
-  // constructor - just pass on the owner array to the multiowned and
-  // the limit to daylimit
-  function Wallet(address[] _owners, uint _required, uint _daylimit)
-      multiowned(_owners, _required) daylimit(_daylimit) {
-  }
-
-  // kills the contract sending everything to `_to`.
-  function kill(address _to) onlymanyowners(sha3(msg.data)) external {
-    suicide(_to);
-  }
-
-  // gets called when no other function matches
-  function() payable {
-    // just being sent some cash?
-    if (msg.value > 0)
-      Deposit(msg.sender, msg.value);
-  }
-
-  // Outside-visible transact entry point. Executes transaction immediately if below daily spend limit.
-  // If not, goes into multisig process. We provide a hash on return to allow the sender to provide
-  // shortcuts for the other confirmations (allowing them to avoid replicating the _to, _value
-  // and _data arguments). They still get the option of using them if they want, anyways.
-  function execute(address _to, uint _value, bytes _data) external onlyowner returns (bytes32 o_hash) {
-    // first, take the opportunity to check that we're under the daily limit.
-    if ((_data.length == 0 && underLimit(_value)) || m_required == 1) {
-      // yes - just execute the call.
-      address created;
-      if (_to == 0) {
-        created = create(_value, _data);
-      } else {
-        if (!_to.call.value(_value)(_data))
-          throw;
-      }
-      SingleTransact(msg.sender, _value, _to, _data, created);
-    } else {
-      // determine our operation hash.
-      o_hash = sha3(msg.data, block.number);
-      // store if it's new
-      if (m_txs[o_hash].to == 0 && m_txs[o_hash].value == 0 && m_txs[o_hash].data.length == 0) {
-        m_txs[o_hash].to = _to;
-        m_txs[o_hash].value = _value;
-        m_txs[o_hash].data = _data;
-      }
-      if (!confirm(o_hash)) {
-        ConfirmationNeeded(o_hash, msg.sender, _value, _to, _data);
-      }
-    }
-  }
-
-  function create(uint _value, bytes _code) internal returns (address o_addr) {
-    assembly {
-      o_addr := create(_value, add(_code, 0x20), mload(_code))
-      jumpi(invalidJumpLabel, iszero(extcodesize(o_addr)))
-    }
-  }
-
-  // confirm a transaction through just the hash. we use the previous transactions map, m_txs, in order
-  // to determine the body of the transaction from the hash provided.
-  function confirm(bytes32 _h) onlymanyowners(_h) returns (bool o_success) {
-    if (m_txs[_h].to != 0 || m_txs[_h].value != 0 || m_txs[_h].data.length != 0) {
-      address created;
-      if (m_txs[_h].to == 0) {
-        created = create(m_txs[_h].value, m_txs[_h].data);
-      } else {
-        if (!m_txs[_h].to.call.value(m_txs[_h].value)(m_txs[_h].data))
-          throw;
-      }
-
-      MultiTransact(msg.sender, _h, m_txs[_h].value, m_txs[_h].to, m_txs[_h].data, created);
-      delete m_txs[_h];
-      return true;
-    }
-  }
-
-  // INTERNAL METHODS
-
-  function clearPending() internal {
-    uint length = m_pendingIndex.length;
-    for (uint i = 0; i < length; ++i)
-      delete m_txs[m_pendingIndex[i]];
-    super.clearPending();
-  }
-
-  // FIELDS
-
-  // pending transactions we have at present.
-  mapping (bytes32 => Transaction) m_txs;
-}
diff --git a/js/src/contracts/tokenreg.js b/js/src/contracts/tokenreg.js
deleted file mode 100644
index 2bbf639bfd342d1c29739a5e612b9b398853726b..0000000000000000000000000000000000000000
--- a/js/src/contracts/tokenreg.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default class TokenReg {
-  constructor (api, registry) {
-    this._api = api;
-    this._registry = registry;
-
-    this.getInstance();
-  }
-
-  getContract () {
-    return this._registry.getContract('tokenreg');
-  }
-
-  getInstance () {
-    return this.getContract().then((contract) => contract.instance);
-  }
-
-  tokenCount () {
-    return this.getInstance().then((instance) => {
-      return instance.tokenCount.call();
-    });
-  }
-
-  token (index) {
-    return this.getInstance().then((instance) => {
-      return instance.token.call({}, [index]);
-    });
-  }
-}
diff --git a/js/src/contracts/verification.js b/js/src/contracts/verification.js
deleted file mode 100644
index 8101565dbdbeb748b4e39065ec7b778e91f7bec6..0000000000000000000000000000000000000000
--- a/js/src/contracts/verification.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import subscribeToEvents from '../util/subscribe-to-events';
-
-export const checkIfVerified = (contract, account) => {
-  return contract.instance.certified.call({}, [account]);
-};
-
-export const findLastRequested = (contract, account) => {
-  let subId = null;
-  let resolved = false;
-
-  return new Promise((resolve, reject) => {
-    contract
-      .subscribe('Requested', {
-        fromBlock: 0,
-        toBlock: 'pending',
-        limit: 1,
-        topics: [account]
-      }, (err, logs) => {
-        if (err) {
-          return reject(err);
-        }
-
-        resolve(logs[0] || null);
-        resolved = true;
-
-        if (subId) {
-          contract.unsubscribe(subId);
-        }
-      })
-      .then((_subId) => {
-        subId = _subId;
-
-        if (resolved) {
-          contract.unsubscribe(subId);
-        }
-      });
-  });
-};
-
-const blockNumber = (api) => {
-  return new Promise((resolve, reject) => {
-    api.subscribe('eth_blockNumber', (err, block) => {
-      if (err) {
-        return reject(err);
-      }
-      resolve(block);
-    })
-    .then((subscription) => {
-      api.unsubscribe(subscription);
-    })
-    .catch(reject);
-  });
-};
-
-export const awaitPuzzle = (api, contract, account) => {
-  return blockNumber(api)
-    .then((block) => {
-      return new Promise((resolve, reject) => {
-        const subscription = subscribeToEvents(contract, ['Puzzled'], {
-          from: block.toNumber(),
-          filter: (log) => log.params.who.value === account
-        });
-
-        subscription.once('error', reject);
-        subscription.once('log', subscription.unsubscribe);
-        subscription.once('log', resolve);
-        subscription.once('timeout', () => {
-          reject(new Error('Timed out waiting for the puzzle.'));
-        });
-      });
-    });
-};
diff --git a/js/src/dapps/chaindeploy.js b/js/src/dapps/chaindeploy.js
deleted file mode 100644
index c3dd420085af151b3623b9f19947b058f88038fa..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ReactDOM from 'react-dom';
-import React from 'react';
-
-import Application from './chaindeploy/Application';
-
-import '../../assets/fonts/Roboto/font.css';
-import '../../assets/fonts/RobotoMono/font.css';
-import './style.css';
-
-ReactDOM.render(
-  <Application />,
-  document.querySelector('#container')
-);
diff --git a/js/src/dapps/chaindeploy/Application/application.css b/js/src/dapps/chaindeploy/Application/application.css
deleted file mode 100644
index f6db5da2919079ca82b17ae52f0487a79aa877bb..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/Application/application.css
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.body {
-  font-size: 0.8em;
-
-  .buttons {
-    position: fixed;
-    right: 0.5em;
-    top: 0.5em;
-    z-index: 100;
-
-    button {
-      background: rgb(0, 200, 255);
-      border: 2px solid rgba(0, 200, 255, 0.5);
-      border-radius: 0.25em;
-      color: white;
-      cursor: pointer;
-      font-size: 1em;
-      margin: 0 0 0 0.5em;
-      outline: none;
-      padding: 0.75em 1.5em;
-      white-space: nowrap;
-
-      &:disabled {
-        background: rgb(230, 230, 230);
-        border: 2px solid rgba(230, 230, 230, 0.5);
-        cursor: default;
-      }
-
-      .icon {
-        fill: white !important;
-        margin-right: 0.5em;
-      }
-
-      .text {
-        display: inline-block;
-        line-height: 24px;
-        vertical-align: top;
-      }
-    }
-  }
-
-  .section {
-    margin: 0 1em 3em 1em;
-
-    h3 {
-      background: rgba(0, 0, 0, 0.025);
-      border-radius: 0.25em;
-      padding: 0.75em 1em;
-      margin-bottom: 0.5em;
-
-      small {
-        vertical-align: middle;
-      }
-    }
-
-    .list {
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-    }
-  }
-}
diff --git a/js/src/dapps/chaindeploy/Application/application.js b/js/src/dapps/chaindeploy/Application/application.js
deleted file mode 100644
index 9e6fa588f6de03da37d62a746b6009735198642d..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/Application/application.js
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-
-import Contract from '../Contract';
-import Dapp from '../Dapp';
-import Store from '../store';
-
-import styles from './application.css';
-
-@observer
-export default class Application extends Component {
-  store = new Store();
-
-  render () {
-    return (
-      <div className={ styles.body }>
-        { this.renderContracts(false) }
-        { this.renderContracts(true) }
-        { this.renderApps() }
-        { this.renderContracts(false, true) }
-        { this.renderApps(true) }
-        { this.renderButtons() }
-      </div>
-    );
-  }
-
-  renderButton (text, clickHandler, disabled) {
-    const onClick = (event) => {
-      if (!disabled) {
-        clickHandler(event);
-      }
-    };
-
-    return (
-      <button
-        disabled={ disabled }
-        onClick={ onClick }
-      >
-        <div className={ styles.text }>
-          { text }
-        </div>
-      </button>
-    );
-  }
-
-  renderButtons () {
-    const { contractBadgereg, contractDappreg, isBadgeDeploying, isContractDeploying, isDappDeploying, haveAllBadges, haveAllContracts, haveAllDapps, registry } = this.store;
-    const disableRegistry = registry.address || registry.isDeploying;
-    const disableContracts = !registry.address || isContractDeploying || haveAllContracts;
-    const disableDapps = !contractDappreg.address || isDappDeploying || haveAllDapps;
-    const disableBadges = !registry.address || !contractBadgereg.address || isBadgeDeploying || haveAllBadges;
-
-    return (
-      <div className={ styles.buttons }>
-        { this.renderButton('registry', this.deployRegistry, disableRegistry) }
-        { this.renderButton('contracts', this.deployContracts, disableContracts) }
-        { this.renderButton('badges', this.deployBadges, disableBadges) }
-        { this.renderButton('apps', this.deployApps, disableDapps) }
-      </div>
-    );
-  }
-
-  renderContracts (isBadges, isExternal) {
-    const { badges, contracts, contractBadgereg, registry } = this.store;
-    const regaddress = isBadges
-      ? contractBadgereg.address
-      : registry.address;
-
-    return (
-      <div className={ styles.section }>
-        <h3>
-          {
-            isExternal
-              ? 'External '
-              : ''
-          }{
-            isBadges
-              ? 'Badges '
-              : 'Contracts '
-          }<small>(registry { regaddress || 'unknown' })</small>
-        </h3>
-        <div className={ styles.list }>
-          {
-            isExternal || isBadges
-              ? null
-              : (
-                <Contract
-                  contract={ registry }
-                  key='registry'
-                />
-              )
-          }
-          {
-            (isBadges ? badges : contracts)
-              .filter((contract) => contract.isExternal === isExternal)
-              .map((contract) => {
-                return (
-                  <Contract
-                    contract={ contract }
-                    disabled={ !registry.address }
-                    key={ contract.id }
-                  />
-                );
-              })
-          }
-        </div>
-      </div>
-    );
-  }
-
-  renderApps (isExternal) {
-    const { apps, contractDappreg, contractGithubhint } = this.store;
-    const isDisabled = !contractDappreg.isOnChain || !contractGithubhint.isOnChain;
-
-    return (
-      <div className={ styles.section }>
-        <h3>
-          {
-            isExternal
-              ? 'External '
-              : ''
-          }Applications <small>(registry {
-            contractDappreg.address
-              ? contractDappreg.address
-              : 'unknown'
-          })</small>
-        </h3>
-        <div className={ styles.list }>
-          {
-            apps
-              .filter((app) => app.isExternal === isExternal)
-              .map((app) => {
-                return (
-                  <Dapp
-                    dapp={ app }
-                    disabled={ isDisabled }
-                    key={ app.id }
-                  />
-                );
-              })
-          }
-        </div>
-      </div>
-    );
-  }
-
-  deployApps = () => {
-    return this.store.deployApps();
-  }
-
-  deployBadges = () => {
-    return this.store.deployBadges();
-  }
-
-  deployContracts = () => {
-    return this.store.deployContracts();
-  }
-
-  deployRegistry = () => {
-    return this.store.deployRegistry();
-  }
-}
diff --git a/js/src/dapps/chaindeploy/Application/index.js b/js/src/dapps/chaindeploy/Application/index.js
deleted file mode 100644
index 3d8d1ca3b851e5bfed73373e82eff06b5d9ea46c..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/Application/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './application';
diff --git a/js/src/dapps/chaindeploy/Contract/contract.js b/js/src/dapps/chaindeploy/Contract/contract.js
deleted file mode 100644
index 1f0b158d2b49ee843a5a415038874b1e4ee29b13..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/Contract/contract.js
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import ListItem, { Header, Row } from '../ListItem';
-
-export default class Contract extends Component {
-  static propTypes = {
-    contract: PropTypes.object.isRequired,
-    disabled: PropTypes.bool
-  }
-
-  render () {
-    const { contract, disabled } = this.props;
-    const location = contract.id === 'registry'
-      ? 'chain'
-      : 'registry';
-
-    return (
-      <ListItem
-        disabled={ disabled }
-        status={ contract.status }
-      >
-        <Header
-          isBusy={ contract.isDeploying }
-          isOk={ !!contract.instance && contract.isOnChain && contract.hasLatestCode }
-        >
-          { contract.id } was {
-            contract.address
-              ? 'deployed'
-              : 'not found'
-          }
-        </Header>
-        <Row
-          disabled={ !contract.instance }
-          isBusy={ contract.isDeploying }
-          isOk={ !!contract.address }
-        >
-          {
-            contract.address
-              ? contract.address
-              : 'no address'
-          }
-        </Row>
-        <Row
-          disabled={ !contract.instance }
-          isBusy={ contract.isDeploying }
-          isOk={ contract.hasLatestCode }
-        >
-          {
-            contract.hasLatestCode
-              ? 'has latest available code'
-              : 'does not have latest code'
-          }
-        </Row>
-        <Row
-          disabled={ !contract.instance }
-          isBusy={ contract.isDeploying }
-          isOk={ !!contract.isOnChain }
-        >
-          {
-            contract.isOnChain
-              ? `registered on ${location}`
-              : `not registered on ${location}`
-          }
-        </Row>
-        { this.renderBadgeInfo() }
-      </ListItem>
-    );
-  }
-
-  renderBadgeInfo () {
-    const { contract } = this.props;
-
-    if (!contract.isBadge) {
-      return null;
-    }
-
-    return [
-      <Row
-        disabled={ !contract.instance }
-        isBusy={ contract.isDeploying }
-        isOk={ contract.isBadgeRegistered }
-        key='isBadgeRegistered'
-      >
-        {
-          contract.isBadgeRegistered
-            ? 'found in badgereg'
-            : 'not found in badgereg'
-        }
-      </Row>,
-      <Row
-        disabled={ !contract.instance }
-        isBusy={ contract.isDeploying }
-        isOk={ !!contract.badgeImageHash }
-        key='imageHash'
-      >
-        {
-          contract.badgeImageHash
-            ? `badge imageHash ${contract.badgeImageHash}`
-            : 'has not registered a badge imageHash'
-        }
-      </Row>,
-      <Row
-        disabled={ !contract.instance }
-        isBusy={ contract.isDeploying }
-        isOk={ contract.badgeImageMatch }
-        key='imageMatch'
-      >
-        {
-          contract.badgeImageMatch
-            ? 'has latest badge imageHash'
-            : 'does not have latest badge imageHash'
-        }
-      </Row>
-    ];
-  }
-}
diff --git a/js/src/dapps/chaindeploy/Contract/index.js b/js/src/dapps/chaindeploy/Contract/index.js
deleted file mode 100644
index 74c58e942d4f23ba7637a544b403a1e1f88ffb37..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/Contract/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './contract';
diff --git a/js/src/dapps/chaindeploy/Dapp/dapp.js b/js/src/dapps/chaindeploy/Dapp/dapp.js
deleted file mode 100644
index 5a997c295afd827273421839d6194e45ec5189d8..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/Dapp/dapp.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import ListItem, { Header, Row } from '../ListItem';
-
-export default class Dapp extends Component {
-  static propTypes = {
-    dapp: PropTypes.object.isRequired,
-    disabled: PropTypes.bool
-  }
-
-  render () {
-    const { dapp, disabled } = this.props;
-
-    return (
-      <ListItem
-        disabled={ disabled }
-        status={ dapp.status }
-      >
-        <Header
-          isBusy={ dapp.isDeploying }
-          isOk={
-            dapp.isOnChain &&
-            !!dapp.imageHash && !!dapp.imageMatch &&
-            (!dapp.source.contentHash || !!dapp.contentMatch) &&
-            (!dapp.source.manifestHash || !!dapp.manifestMatch)
-          }
-        >
-          { dapp.name }
-        </Header>
-        <Row
-          isBusy={ dapp.isDeploying }
-          isOk={ dapp.isOnChain }
-        >
-          {
-            dapp.isOnChain
-              ? 'found in dappreg'
-              : 'not found in dappreg'
-          }
-        </Row>
-        { this.renderHash(dapp, 'image') }
-        { this.renderHash(dapp, 'manifest') }
-        { this.renderHash(dapp, 'content') }
-      </ListItem>
-    );
-  }
-
-  renderHash (dapp, type) {
-    if (!dapp.source[`${type}Hash`]) {
-      return null;
-    }
-
-    const isMatch = dapp[`${type}Match`];
-    const hash = dapp[`${type}Hash`];
-
-    return [
-      <Row
-        disabled={ !dapp.isOnChain }
-        isBusy={ dapp.isDeploying }
-        isOk={ !!hash }
-        key={ `${type}Hash` }
-      >
-        {
-          hash
-            ? `${type}Hash ${hash}`
-            : `has not registered an ${type}Hash`
-        }
-      </Row>,
-      <Row
-        disabled={ !dapp.isOnChain }
-        isBusy={ dapp.isDeploying }
-        isOk={ isMatch }
-        key={ `${type}Match` }
-      >
-        {
-          isMatch
-            ? `has latest ${type}Hash`
-            : `does not have latest ${type}Hash`
-        }
-      </Row>
-    ];
-  }
-}
diff --git a/js/src/dapps/chaindeploy/Dapp/index.js b/js/src/dapps/chaindeploy/Dapp/index.js
deleted file mode 100644
index 3d32813894b4befb9df2b554942ed8998f7bc49b..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/Dapp/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dapp';
diff --git a/js/src/dapps/chaindeploy/ListItem/Header/header.js b/js/src/dapps/chaindeploy/ListItem/Header/header.js
deleted file mode 100644
index e9be01eeab406226b8ef37fcb3762736ffa2f53f..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/ListItem/Header/header.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import Icon from '../Icon';
-
-import styles from '../listItem.css';
-
-export default class Header extends Component {
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-    isBusy: PropTypes.bool,
-    isOk: PropTypes.bool
-  }
-
-  render () {
-    const { children, isBusy, isOk } = this.props;
-
-    return (
-      <div className={ styles.header }>
-        <Icon
-          isBusy={ isBusy }
-          isOk={ isOk }
-        />
-        <div className={ styles.title }>
-          { children }
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/chaindeploy/ListItem/Header/index.js b/js/src/dapps/chaindeploy/ListItem/Header/index.js
deleted file mode 100644
index aef90266f940a3c7f8915c7ba910b62bec54317c..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/ListItem/Header/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './header';
diff --git a/js/src/dapps/chaindeploy/ListItem/Icon/icon.js b/js/src/dapps/chaindeploy/ListItem/Icon/icon.js
deleted file mode 100644
index 1f32622e54c4d013edc0e6f26dc4d9a893ab2f03..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/ListItem/Icon/icon.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from '../listItem.css';
-
-export default class Icon extends Component {
-  static propTypes = {
-    isBusy: PropTypes.bool,
-    isOk: PropTypes.bool
-  }
-
-  render () {
-    const { isBusy, isOk } = this.props;
-
-    return (
-      <div
-        className={
-          [
-            styles.icon,
-            isOk
-              ? styles.ok
-              : styles.error
-          ].join(' ')
-        }
-      >
-        {
-          isOk
-            ? '\u2714'
-            : (
-              isBusy
-                ? '\u29d6'
-                : '\u2716'
-              )
-        }
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/chaindeploy/ListItem/Icon/index.js b/js/src/dapps/chaindeploy/ListItem/Icon/index.js
deleted file mode 100644
index f43e02c49782af1cde49703f410b789d056b29d0..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/ListItem/Icon/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './icon';
diff --git a/js/src/dapps/chaindeploy/ListItem/Row/index.js b/js/src/dapps/chaindeploy/ListItem/Row/index.js
deleted file mode 100644
index 5f2c62dee40946e0794e10be34bbc9374435c2e2..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/ListItem/Row/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './row';
diff --git a/js/src/dapps/chaindeploy/ListItem/Row/row.js b/js/src/dapps/chaindeploy/ListItem/Row/row.js
deleted file mode 100644
index 0982e0321b0c1a1cb2dd49da3945152c9392ebf6..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/ListItem/Row/row.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import Icon from '../Icon';
-
-import styles from '../listItem.css';
-
-export default class Row extends Component {
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-    disabled: PropTypes.bool,
-    isBusy: PropTypes.bool,
-    isOk: PropTypes.bool
-  }
-
-  render () {
-    const { children, disabled, isBusy, isOk } = this.props;
-
-    return (
-      <div
-        className={
-          [
-            styles.details,
-            disabled
-              ? styles.muted
-              : ''
-          ].join(' ') }
-      >
-        <Icon
-          isBusy={ isBusy }
-          isOk={ isOk }
-        />
-        <div className={ styles.title }>
-          { children }
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/chaindeploy/ListItem/index.js b/js/src/dapps/chaindeploy/ListItem/index.js
deleted file mode 100644
index 7c79e3241c49c0215f637097706c87f375616988..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/ListItem/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export Header from './Header';
-export Row from './Row';
-
-export default from './listItem';
diff --git a/js/src/dapps/chaindeploy/ListItem/listItem.css b/js/src/dapps/chaindeploy/ListItem/listItem.css
deleted file mode 100644
index 47d6d481d27b69e206eea6e3931043360642a4d0..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/ListItem/listItem.css
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.listItem {
-  box-sizing: border-box;
-  flex: 0 1 33.33%;
-  max-width: 33.33%;
-  padding: 0.5em;
-  position: relative;
-
-  .body {
-    background: rgba(0, 0, 0, 0.025);
-    border-radius: 0.25em;
-    box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-    overflow: hidden;
-    padding: 0.75em;
-  }
-
-  .status {
-    background: #f80;
-    border-radius: 0.25em;
-    color: white;
-    font-size: 0.75em;
-    line-height: 1em;
-    opacity: 0.9;
-    padding: 0.5em;
-    position: absolute;
-    right: 1em;
-    top: 1em;
-  }
-}
-
-.header,
-.details {
-  display: flex;
-  line-height: 1.5em;
-  padding: 0.125em 0;
-  position: relative;
-  white-space: nowrap;
-
-  .title {
-    display: inline-block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    vertical-align: top;
-  }
-}
-
-.details {
-  margin-left: 2em;
-}
-
-.icon {
-  border-radius: 0.25em;
-  display: inline-block;
-  flex: 0 0 1.5em;
-  height: 1.5em;
-  margin-right: 0.5em;
-  opacity: 0.75;
-  text-align: center;
-  vertical-align: middle;
-  width: 1.5em;
-
-  &.error {
-    box-shadow: inset 0 0 0 2px rgb(200, 0, 0);
-    color: rgb(200, 0, 0);
-  }
-
-  &.ok {
-    box-shadow: inset 0 0 0 2px rgb(0, 200, 0);
-    color: rgb(0, 200, 0);
-  }
-}
-
-.muted {
-  opacity: 0.25;
-}
diff --git a/js/src/dapps/chaindeploy/ListItem/listItem.js b/js/src/dapps/chaindeploy/ListItem/listItem.js
deleted file mode 100644
index c670123f9241a1c24ea0145857910c89a6ff2459..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/ListItem/listItem.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './listItem.css';
-
-export default class ListItem extends Component {
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-    disabled: PropTypes.bool,
-    status: PropTypes.string
-  }
-
-  render () {
-    const { children, disabled } = this.props;
-
-    return (
-      <div
-        className={
-          [
-            styles.listItem,
-            disabled
-              ? styles.muted
-              : ''
-          ].join(' ')
-        }
-      >
-        <div className={ styles.body }>
-          { children }
-        </div>
-        { this.renderStatus() }
-      </div>
-    );
-  }
-
-  renderStatus () {
-    const { status } = this.props;
-
-    if (!status) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.status }>
-        { status }
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/chaindeploy/_dapps.js b/js/src/dapps/chaindeploy/_dapps.js
deleted file mode 100644
index 4a8da242f680d611ecea7f66324068a3a11ac0ce..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/_dapps.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import builtinsJson from '~/views/Dapps/builtin.json';
-
-const REGISTER_URLS = {
-  console: 'https://raw.githubusercontent.com/paritytech/console/3ea0dbfefded359ccdbea37bc4cf350c0aa16948/console.jpeg',
-  dappreg: 'https://raw.githubusercontent.com/paritytech/dapp-assets/cdd6ac4f1e2f11619bed72a53ae71217dffe19ad/dapps/legos-64x64.png',
-  githubhint: 'https://raw.githubusercontent.com/paritytech/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/dapps/link-64x64.jpg',
-  localtx: 'https://raw.githubusercontent.com/paritytech/dapp-assets/cdd6ac4f1e2f11619bed72a53ae71217dffe19ad/dapps/stack-64x64.png',
-  registry: 'https://raw.githubusercontent.com/paritytech/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/dapps/register-64x64.jpg',
-  signaturereg: 'https://raw.githubusercontent.com/paritytech/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/dapps/hex-64x64.jpg',
-  tokendeploy: 'https://raw.githubusercontent.com/paritytech/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/dapps/interlock-64x64.png',
-  tokenreg: 'https://raw.githubusercontent.com/paritytech/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/dapps/coins-64x64.jpg',
-  web: 'https://raw.githubusercontent.com/paritytech/dapp-assets/ec6138115d0e1f45258969cd90b3b274e0ff2258/dapps/earth-64x64.jpg'
-};
-
-const builtins = builtinsJson
-  .filter((app) => app.id)
-  .map((app) => {
-    app.source = {
-      imageUrl: REGISTER_URLS[app.id]
-    };
-
-    return app;
-  });
-
-export {
-  builtins
-};
diff --git a/js/src/dapps/chaindeploy/contracts/abi/jg-voting.json b/js/src/dapps/chaindeploy/contracts/abi/jg-voting.json
deleted file mode 100644
index 83a07ef7cbefb4e69d23dee9765dc2dd108229e1..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/abi/jg-voting.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":true,"inputs":[],"name":"count","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalVotes","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_newOwner","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_index","type":"uint256"}],"name":"hasSenderVoted","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_index","type":"uint256"},{"name":"_answer","type":"uint256"}],"name":"newAnswer","outputs":[{"name":"","type":"bool"}],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_fee","type":"uint256"}],"name":"setQuestionFee","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"questionFee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_index","type":"uint256"}],"name":"get","outputs":[{"name":"closed","type":"bool"},{"name":"owner","type":"address"},{"name":"question","type":"string"},{"name":"balanceNo","type":"uint256"},{"name":"balanceYes","type":"uint256"},{"name":"balanceMaybe","type":"uint256"},{"name":"votesNo","type":"uint256"},{"name":"votesYes","type":"uint256"},{"name":"votesMaybe","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_question","type":"string"}],"name":"newQuestion","outputs":[{"name":"","type":"bool"}],"payable":true,"type":"function"},{"constant":true,"inputs":[],"name":"totalBalance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"answerFee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_index","type":"uint256"}],"name":"closeQuestion","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_fee","type":"uint256"}],"name":"setAnswerFee","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"inputs":[],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"index","type":"uint256"},{"indexed":false,"name":"question","type":"string"}],"name":"NewQuestion","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"index","type":"uint256"},{"indexed":true,"name":"answer","type":"uint256"},{"indexed":false,"name":"value","type":"uint256"}],"name":"NewAnswer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
diff --git a/js/src/dapps/chaindeploy/contracts/badgereg.js b/js/src/dapps/chaindeploy/contracts/badgereg.js
deleted file mode 100644
index ccd6b28c19b32faa0736e352cd78cafb30664af5..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/badgereg.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import abi from '~/contracts/abi/badgereg';
-import { compiler, source as sourceUrl, output as byteCode } from './code/badgereg';
-
-const id = 'badgereg';
-const deployParams = [];
-
-export {
-  abi,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/code/badgereg.json b/js/src/dapps/chaindeploy/contracts/code/badgereg.json
deleted file mode 100644
index e7801722a43c1f4e0abb7e58d8da9c7bba223145..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/code/badgereg.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compiler": "v0.4.9+commit.364da425",
-  "source": "https://github.com/paritytech/contracts/blob/58842b92c00e3c45a84b6d0ac9b842f016dde50a/BadgeReg.sol",
-  "output": "0x606060405260008054600160a060020a03191633600160a060020a0316179055670de0b6b3a7640000600455341561003357fe5b5b610a6f806100436000396000f300606060405236156100bf5763ffffffff60e060020a60003504166313af403581146100c15780631e7a505f146100df5780632c0f5f591461010a5780635b8066451461014557806369fe0e2d146101675780637958533a1461017c5780638da5cb5b146101a45780639890220b146101d0578063a02b161e146101e2578063ac4ce2c6146101f7578063b72e717d14610218578063c0f6faed1461025b578063dd93890b14610299578063ddbcb5cb146102b4578063ddca3f43146102e6575bfe5b34156100c957fe5b6100dd600160a060020a0360043516610308565b005b6100f6600160a060020a036004351660243561037c565b604080519115158252519081900360200190f35b341561011257fe5b61011d600435610392565b60408051938452600160a060020a039283166020850152911682820152519081900360600190f35b341561014d57fe5b6101556103ef565b60408051918252519081900360200190f35b341561016f57fe5b6100dd6004356103f6565b005b341561018457fe5b61015560043560243561041b565b60408051918252519081900360200190f35b34156101ac57fe5b6101b461045a565b60408051600160a060020a039092168252519081900360200190f35b34156101d857fe5b6100dd610469565b005b34156101ea57fe5b6100dd6004356104bc565b005b34156101ff57fe5b6100dd600435600160a060020a03602435166105ee565b005b341561022057fe5b610234600160a060020a0360043516610721565b604080519384526020840192909252600160a060020a031682820152519081900360600190f35b341561026357fe5b61026e600435610789565b60408051600160a060020a039485168152602081019390935292168183015290519081900360600190f35b34156102a157fe5b6100dd6004356024356044356107dc565b005b6100f6600160a060020a036004358116906024359060443516610899565b604080519115158252519081900360200190f35b34156102ee57fe5b6101556109cc565b60408051918252519081900360200190f35b60005433600160a060020a0390811691161461032357610378565b60008054604051600160a060020a03808516939216917f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236491a360008054600160a060020a031916600160a060020a0383161790555b5b50565b6000610389838333610899565b90505b92915050565b60008181526002602052604081205460038054600019909201929182918291859081106103bb57fe5b906000526020600020906004020160005b5080546002820154600160a060020a03918216955016925090505b509193909250565b6003545b90565b60005433600160a060020a0390811691161461041157610378565b60048190555b5b50565b600060038381548110151561042c57fe5b906000526020600020906004020160005b506000838152600391909101602052604090205490505b92915050565b600054600160a060020a031681565b60005433600160a060020a03908116911614610484576104b8565b604051600160a060020a0333811691309091163180156108fc02916000818181858888f1935050505015156104b857610000565b5b5b565b60005433600160a060020a039081169116146104d757610378565b806003828154811015156104e757fe5b906000526020600020906004020160005b50600101546040517f844e89a9d524dabb877007aa0e9c395e8938fcfee93ece70c2cd0353db79c8e590600090a36001600060038381548110151561053957fe5b906000526020600020906004020160005b5054600160a060020a03168152602081019190915260400160009081208190556003805460029291908490811061057d57fe5b906000526020600020906004020160005b50600101548152602081019190915260400160009081205560038054829081106105b457fe5b906000526020600020906004020160005b508054600160a060020a03199081168255600060018301556002909101805490911690555b5b50565b60008233600160a060020a031660038281548110151561060a57fe5b906000526020600020906004020160005b5060020154600160a060020a0316146106335761071b565b600160a060020a03831660009081526001602052604090205483901561065857610718565b600380548690811061066657fe5b906000526020600020906004020160005b505460038054600160a060020a03909216945085918790811061069657fe5b906000526020600020906004020160005b508054600160a060020a031916600160a060020a039283161790558381166000908152600160209081526040808320839055928716808352918390208890558251918252915187927fa5d871c0e725767cd5aefc99c53aeca35f09dcc268145cbb13b74a7e2f48f196928290030190a25b5b505b50505050565b600160a060020a038116600090815260016020526040812054600380546000199092019291829182918590811061075457fe5b906000526020600020906004020160005b5060018101546002820154909450600160a060020a0316925090505b509193909250565b60006000600060006003858154811015156107a057fe5b906000526020600020906004020160005b50805460018201546002830154600160a060020a03928316975090955016925090505b509193909250565b8233600160a060020a03166003828154811015156107f657fe5b906000526020600020906004020160005b5060020154600160a060020a03161461081f5761071b565b8160038581548110151561082f57fe5b906000526020600020906004020160005b50600085815260039190910160209081526040918290209290925580518481529051859287927f7991c63a749706fd298fc2387764d640be6e714307b6357b1d3c2ce35cba3b52929081900390910190a35b5b50505050565b60006004543410156108aa576109c5565b600160a060020a0384166000908152600160205260409020548490156108cf576109c3565b6000848152600260205260409020548490156108ea576109c0565b60038054600181016108fc83826109d2565b916000526020600020906004020160005b5060408051606081018252600160a060020a03808b1680835260208084018c9052918a169284018390528454600160a060020a03199081168217865560018087018d905560029687018054909216909417905560035460008281529383528484208190558b8452948252918390208490558251918252915160001993909301935088927febbfb6376bef000063e6e33494e4c543a6197091a04eb6a6f55013d85a1c5386929181900390910190a3600192505b5b505b505b9392505050565b60045481565b8154818355818115116109fe576004028160040283600052602060002091820191016109fe9190610a04565b5b505050565b6103f391905b80821115610a3c578054600160a060020a03199081168255600060018301556002820180549091169055600401610a0a565b5090565b905600a165627a7a72305820526fc95faec325cec5dd3e1bb67c165265282c5fc6db21e96197060b823aaa490029"
-}
diff --git a/js/src/dapps/chaindeploy/contracts/code/dappreg.json b/js/src/dapps/chaindeploy/contracts/code/dappreg.json
deleted file mode 100644
index 48739a59d282b8aa9397c8a2b677ffa75f223044..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/code/dappreg.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compiler": "v0.4.9+commit.364da425",
-  "source": "https://github.com/paritytech/contracts/blob/225bf022ddd967af2b9ea188e8f611489ca5d7fe/DappReg.sol",
-  "output": "0x606060405260008054600160a060020a03191633600160a060020a0316179055670de0b6b3a7640000600355341561003357fe5b5b6106ee806100436000396000f300606060405236156100a95763ffffffff60e060020a6000350416630257c48c81146100ab57806306661abd146100d357806313af4035146100f55780631a0919dc1461011357806369fe0e2d146101285780638da5cb5b1461013d5780638eaa6ac01461016957806391cd242d1461019d5780639890220b146101b8578063c52bd836146101ca578063ddca3f43146101eb578063e0886f901461020d578063e1fa8e8414610241575bfe5b34156100b357fe5b6100c160043560243561024e565b60408051918252519081900360200190f35b34156100db57fe5b6100c1610272565b60408051918252519081900360200190f35b34156100fd57fe5b610111600160a060020a0360043516610279565b005b341561011b57fe5b6101116004356102ed565b005b341561013057fe5b610111600435610388565b005b341561014557fe5b61014d6103ad565b60408051600160a060020a039092168252519081900360200190f35b341561017157fe5b61017c6004356103bc565b60408051928352600160a060020a0390911660208301528051918290030190f35b34156101a557fe5b6101116004356024356044356103e4565b005b34156101c057fe5b61011161046d565b005b34156101d257fe5b610111600435600160a060020a03602435166104c0565b005b34156101f357fe5b6100c161054e565b60408051918252519081900360200190f35b341561021557fe5b61017c600435610554565b60408051928352600160a060020a0390911660208301528051918290030190f35b6101116004356105ab565b005b60008281526001602090815260408083208484526002019091529020545b92915050565b6002545b90565b60005433600160a060020a0390811691161461029457610000565b60008054604051600160a060020a03808516939216917f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236491a360008054600160a060020a031916600160a060020a0383161790555b5b50565b60008181526001602081905260409091200154819033600160a060020a0390811691161480159061032d575060005433600160a060020a03908116911614155b1561033757610000565b60008281526001602081905260408083208381559091018054600160a060020a03191690555183917fe17fec26316aebe957e188549d659a89f359c49766bcc0ae2fb7ded274ffe14691a25b5b5050565b60005433600160a060020a039081169116146103a357610000565b60038190555b5b50565b600054600160a060020a031681565b6000818152600160208190526040909120805491810154600160a060020a0316905b50915091565b60008381526001602081905260409091200154839033600160a060020a0390811691161461041157610000565b600084815260016020908152604080832086845260020182529182902084905581518481529151859287927f4dcd4fb147bb133a0da8fbf4e5fc3ddd64f04d4b3f6cbee584374b889d28c78d92918290030190a35b5b50505050565b60005433600160a060020a0390811691161461048857610000565b604051600160a060020a0333811691309091163180156108fc02916000818181858888f1935050505015156104bc57610000565b5b5b565b60008281526001602081905260409091200154829033600160a060020a039081169116146104ed57610000565b60008381526001602081905260408083209091018054600160a060020a031916600160a060020a0386169081179091559051909185917fd3d10d874a10020c2bce719499d1fd8756d880b128eb2945dd01b3830854e7169190a35b5b505050565b60035481565b6000600060006001600060028681548110151561056d57fe5b906000526020600020900160005b50548152602081019190915260400160002080546001820154909450600160a060020a0316925090505b50915091565b6003543410156105ba57610000565b6000818152600160205260409020548190156105d557610000565b60028054600181016105e78382610677565b916000526020600020900160005b508390555060408051808201825283815233600160a060020a0390811660208084018281526000888152600192839052868120955186559051949091018054600160a060020a0319169490931693909317909155915184917f7d917fcbc9a29a9705ff9936ffa599500e4fd902e4486bae317414fe967b307c91a35b5b505b50565b815481835581811511610548576000838152602090206105489181019083016106a1565b5b505050565b61027691905b808211156106bb57600081556001016106a7565b5090565b905600a165627a7a7230582011d8a45e381635e9de17e14cc4de97a1e17758cfac1fd25e8a5bc1d5f4d1da9d0029"
-}
diff --git a/js/src/dapps/chaindeploy/contracts/code/gavcoin.json b/js/src/dapps/chaindeploy/contracts/code/gavcoin.json
deleted file mode 100644
index f0ead4a35d64da94491a929a5e454c3d8e0983ce..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/code/gavcoin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compiler": "v0.4.9+commit.364da425",
-  "source": "https://github.com/paritytech/contracts/blob/58842b92c00e3c45a84b6d0ac9b842f016dde50a/GavCoin.sol",
-  "output": "0x606060405266038d7ea4c680006002556305f5e100600355341561001f57fe5b5b6108008061002f6000396000f300606060405236156100885763ffffffff60e060020a600035041663095ea7b3811461009f57806318160ddd146100d257806323b872dd146100f457806329cbdc861461012d57806355234ec0146101465780635af36e3e1461016857806370a0823114610192578063a035b1fe146101c0578063a9059cbb146101e2578063dd62ed3e14610215575b61009d5b61009a3360ff60020a610249565b5b565b005b34156100a757fe5b6100be600160a060020a0360043516602435610390565b604080519115158252519081900360200190f35b34156100da57fe5b6100e2610416565b60408051918252519081900360200190f35b34156100fc57fe5b6100be600160a060020a036004358116906024351660443561041c565b604080519115158252519081900360200190f35b61009d600160a060020a036004351660243561052a565b005b341561014e57fe5b6100e2610539565b60408051918252519081900360200190f35b341561017057fe5b6100be60043560243561053f565b604080519115158252519081900360200190f35b341561019a57fe5b6100e2600160a060020a03600435166106d0565b60408051918252519081900360200190f35b34156101c857fe5b6100e26106ef565b60408051918252519081900360200190f35b34156101ea57fe5b6100be600160a060020a03600435166024356106f5565b604080519115158252519081900360200190f35b341561021d57fe5b6100e2600160a060020a03600435811690602435166107a3565b60408051918252519081900360200190f35b34600080805b60008411801561026157508460025411155b1561038757600354600254620f424091025b0492508284116102835783610285565b825b9150600254620f4240830281151561029957fe5b33600160a060020a03166000818152600160208181526040808420805497909604968701865560028054855295830190915280832080548701905584548352808320909101805463ffffffff191662093a80420163ffffffff161790558154850182559254925193945084937f689dcb02b6a65e0e2f1d23ef47c1ec86604ffbed0bcb65f20150cfc7d5e5a9489190a4600380548290039081905593829003931515610382576002805466038d7ea4c6800001908190556305f5e1006003556040517f23c3dae768238f239632b5c4acb89485b440e0fa72481c4aad9f9b4f9b5a0a5f90600090a25b61024f565b5b505050505050565b600082600160a060020a031633600160a060020a03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a350600160a060020a0333811660009081526001602081815260408084209487168452600290940190529190208054830190555b92915050565b60005481565b600160a060020a038316600090815260016020526040812054849083908190101561044657610521565b600160a060020a0380871660009081526001602090815260408083203394851684526002019091529020548791908690819010156104835761051c565b87600160a060020a031689600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef896040518082815260200191505060405180910390a3600160a060020a03808a166000908152600160208181526040808420338616855260028101835281852080548e900390559183905281548c9003909155928b16825291902080548901905595505b5b5050505b50509392505050565b6105348282610249565b5b5050565b60035481565b600160a060020a0333166000908152600160208181526040808420868552909201905281205483908390819010806105a35750600160a060020a03331660009081526001602081815260408084208685528301909152909120015463ffffffff1642105b156105ad576106c8565b33600160a060020a0381166000908152600160205260409020548590819010156105d6576106c4565b60405186908890600160a060020a033316907f73f04af9dcc582a923ec15d3eea990fe34adabfff2879e28d44572e01a54abb690600090a433600160a060020a0316600090815260016020818152604080842080548b9003815584548b0185558b855290920190529020805487900390819055151561068457600160a060020a03331660009081526001602081815260408084208b85528301909152822091825501805463ffffffff191690555b600160a060020a0333166108fc620f4240888a025b604051919004801590920291906000818181858888f1935050505015156106bf57610000565b600194505b5b50505b505092915050565b600160a060020a0381166000908152600160205260409020545b919050565b60025481565b33600160a060020a038116600090815260016020526040812054909190839081901015610721576106c8565b84600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef866040518082815260200191505060405180910390a3600160a060020a03338116600090815260016020526040808220805488900390559187168152208054850190555b5b505092915050565b600160a060020a03808316600090815260016020908152604080832093851683526002909301905220545b929150505600a165627a7a72305820ca533a37c92e41888bda66ae0e66415d21a61c60027b269bca633d85b727875c0029"
-}
diff --git a/js/src/dapps/chaindeploy/contracts/code/githubhint.json b/js/src/dapps/chaindeploy/contracts/code/githubhint.json
deleted file mode 100644
index 3470ccef0b4f346c233b1280794cfc447b27edd8..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/code/githubhint.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compiler": "v0.4.9+commit.364da425",
-  "source": "https://github.com/paritytech/contracts/blob/58842b92c00e3c45a84b6d0ac9b842f016dde50a/GithubHint.sol",
-  "output": "0x6060604052341561000c57fe5b5b6105868061001c6000396000f300606060405263ffffffff60e060020a60003504166302f2008d81146100425780632196ae0d1461009b578063267b6922146101055780637c8c6643146101c9575bfe5b341561004a57fe5b60408051602060046024803582810135601f810185900485028601850190965285855261009995833595939460449493929092019181908401838280828437509496506101de95505050505050565b005b34156100a357fe5b60408051602060046024803582810135601f81018590048502860185019096528585526100999583359593946044949392909201918190840183828082843750949650505092356bffffffffffffffffffffffff191692506102be915050565b005b341561010d57fe5b6101186004356103b1565b604080516bffffffffffffffffffffffff1984166020820152600160a060020a03831691810191909152606080825284546002600019610100600184161502019091160490820181905281906080820190869080156101b85780601f1061018d576101008083540402835291602001916101b8565b820191906000526020600020905b81548152906001019060200180831161019b57829003601f168201915b505094505050505060405180910390f35b34156101d157fe5b6100996004356103de565b005b6000828152602081905260409020600201548290600160a060020a031615801590610227575060008181526020819052604090206002015433600160a060020a03908116911614155b15610231576102b8565b6040805160608101825283815260006020808301829052600160a060020a0333168385015286825281815292902081518051929391926102749284920190610472565b506020820151600182018054606060020a909204600160a060020a031992831617905560409092015160029091018054600160a060020a0392909216919092161790555b5b505050565b6000838152602081905260409020600201548390600160a060020a031615801590610307575060008181526020819052604090206002015433600160a060020a03908116911614155b15610311576103aa565b604080516060810182528481526bffffffffffffffffffffffff198416602080830191909152600160a060020a0333168284015260008781528082529290922081518051929391926103669284920190610472565b506020820151600182018054606060020a909204600160a060020a031992831617905560409092015160029091018054600160a060020a0392909216919092161790555b5b50505050565b600060208190529081526040902060018101546002820154606060020a90910290600160a060020a031683565b6000818152602081905260409020600201548190600160a060020a031615801590610427575060008181526020819052604090206002015433600160a060020a03908116911614155b156104315761046d565b60008281526020819052604081209061044a82826104f1565b50600181018054600160a060020a03199081169091556002909101805490911690555b5b5050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106104b357805160ff19168380011785556104e0565b828001600101855582156104e0579182015b828111156104e05782518255916020019190600101906104c5565b5b506104ed929150610539565b5090565b50805460018160011615610100020316600290046000825580601f106105175750610535565b601f0160209004906000526020600020908101906105359190610539565b5b50565b61055791905b808211156104ed576000815560010161053f565b5090565b905600a165627a7a72305820a83571409e7b0cc4fe48edd09087f315930ab4e017c62b6d100462285a8f4ae70029"
-}
diff --git a/js/src/dapps/chaindeploy/contracts/code/jg-voting.json b/js/src/dapps/chaindeploy/contracts/code/jg-voting.json
deleted file mode 100644
index 08ec4d0ed4b17340d98e9002ccb6be0545d7a637..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/code/jg-voting.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compiler": "v0.4.9+commit.364da425",
-  "source": "https://github.com/jacogr/dapp-voting/blob/9b20754b13b9a387704c0955d88b51d2e0e1896d/src/solidity/Voting.sol",
-  "output": "0x606060405260008054600160a060020a03191633600160a060020a0316178155600281905560038190556004556611c37937e0800060055534156200004057fe5b5b60408051808201909152600781527f48756e6772793f0000000000000000000000000000000000000000000000000060208201526200008e906401000000006200090a6200009682021704565b505b620003af565b60008054819033600160a060020a03908116911614801590620000ba575060055434105b15620000c65762000000565b82600481511080620000d9575060a08151115b15620000e55762000000565b60018054925082810190620000fb908262000244565b50336001838154811015156200010d57fe5b906000526020600020906005020160005b508054600160a060020a03929092166101000261010060a860020a031990921691909117905560018054859190849081106200015657fe5b906000526020600020906005020160005b5060010190805190602001906200018092919062000279565b508133600160a060020a03167f7793f929911ad07e07894a20378f1eccce0fb493486c569d74045731fb583b8e866040518080602001828103825283818151815260200191508051906020019080838360008314620001fc575b805182526020831115620001fc57601f199092019160209182019101620001da565b505050905090810190601f168015620002295780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600192505b5b505b50919050565b8154818355818115116200027357600502816005028360005260206000209182019101620002739190620002ff565b5b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10620002bc57805160ff1916838001178555620002ec565b82800160010185558215620002ec579182015b82811115620002ec578251825591602001919060010190620002cf565b5b50620002fb9291506200033f565b5090565b6200033c91905b80821115620002fb578054600160a860020a031916815560006200032e600183018262000363565b5060050162000306565b5090565b90565b6200033c91905b80821115620002fb576000815560010162000346565b5090565b90565b50805460018160011615610100020316600290046000825580601f106200038b5750620003ab565b601f016020900490600052602060002090810190620003ab91906200033f565b5b50565b610d2f80620003bf6000396000f300606060405236156100bf5763ffffffff60e060020a60003504166306661abd81146100c15780630d15fd77146100e357806313af40351461010557806331d3164714610123578063476c494c1461014a5780634df6ca2a1461016c5780638a55b54d146101935780638da5cb5b146101b55780639507d39a146101e15780639890220b146102c7578063a3f66b46146102eb578063ad7a672f1461034d578063bd12b4b51461036f578063c09f32e814610391578063f41c1c93146103b8575bfe5b34156100c957fe5b6100d16103df565b60408051918252519081900360200190f35b34156100eb57fe5b6100d16103e6565b60408051918252519081900360200190f35b341561010d57fe5b610121600160a060020a03600435166103ec565b005b341561012b57fe5b61013660043561046d565b604080519115158252519081900360200190f35b6101366004356024356104b8565b604080519115158252519081900360200190f35b341561017457fe5b6101366004356106c3565b604080519115158252519081900360200190f35b341561019b57fe5b6100d16106ee565b60408051918252519081900360200190f35b34156101bd57fe5b6101c56106f4565b60408051600160a060020a039092168252519081900360200190f35b34156101e957fe5b6101f4600435610703565b604051808a15151515815260200189600160a060020a0316600160a060020a0316815260200180602001888152602001878152602001868152602001858152602001848152602001838152602001828103825289818151815260200191508051906020019080838360008314610285575b80518252602083111561028557601f199092019160209182019101610265565b505050905090810190601f1680156102b15780820380516001836020036101000a031916815260200191505b509a505050505050505050505060405180910390f35b34156102cf57fe5b6101366108b2565b604080519115158252519081900360200190f35b610136600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284375094965061090a95505050505050565b604080519115158252519081900360200190f35b341561035557fe5b6100d1610ab5565b60408051918252519081900360200190f35b341561037757fe5b6100d1610abb565b60408051918252519081900360200190f35b341561039957fe5b610136600435610ac1565b604080519115158252519081900360200190f35b34156103c057fe5b610136600435610b63565b604080519115158252519081900360200190f35b6001545b90565b60035481565b60005433600160a060020a0390811691161461040757610000565b60008054604051600160a060020a03808516939216917f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236491a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b5b50565b600060018281548110151561047e57fe5b906000526020600020906005020160005b50600160a060020a0333166000908152600491909101602052604090205460ff1690505b919050565b6000805433600160a060020a039081169116148015906104d9575060045434105b156104e357610000565b600154839081106104f357610000565b8360018181548110151561050357fe5b906000526020600020906005020160005b505460ff1615156001141561052857610000565b8460018181548110151561053857fe5b906000526020600020906005020160005b50600160a060020a0333166000908152600491909101602052604090205460ff1615156001141561057957610000565b84600281111561058857610000565b60038054600190810190915560028054600160a060020a0333163101905580548190899081106105b457fe5b906000526020600020906005020160005b5033600160a060020a031660008181526004929092016020526040909120805460ff191692151592909217909155600180549131918990811061060457fe5b906000526020600020906005020160005b50600088815260029190910160205260409020805490910190556001805481908990811061063f57fe5b906000526020600020906005020160005b506000888152600391909101602090815260409182902080549093019092558051600160a060020a033316318152905188928a927f8b8ed2ef61b90da02f78bd8647287f46833d5b11467db4451e5c4b165485bf46929081900390910190a3600194505b5b505b505b505b505b92915050565b6000805433600160a060020a039081169116146106df57610000565b50600581905560015b5b919050565b60055481565b600054600160a060020a031681565b6000600061070f610b8e565b600060006000600060006000600060018b81548110151561072c57fe5b906000526020600020906005020160005b5090508060000160009054906101000a900460ff1699508060000160019054906101000a9004600160a060020a03169850806001018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156108065780601f106107db57610100808354040283529160200191610806565b820191906000526020600020905b8154815290600101906020018083116107e957829003601f168201915b505050505097508060020160006000815260200190815260200160002054965080600201600060018152602001908152602001600020549550806002016000600281526020019081526020016000205494508060030160006000815260200190815260200160002054935080600301600060018152602001908152602001600020549250806003016000600281526020019081526020016000205491505b509193959799909294969850565b6000805433600160a060020a039081169116146108ce57610000565b604051600160a060020a0333811691309091163180156108fc02916000818181858888f19350505050151561090257610000565b5060015b5b90565b60008054819033600160a060020a0390811691161480159061092d575060055434105b1561093757610000565b82600481511080610949575060a08151115b1561095357610000565b600180549250828101906109679082610ba0565b503360018381548110151561097857fe5b906000526020600020906005020160005b508054600160a060020a03929092166101000274ffffffffffffffffffffffffffffffffffffffff001990921691909117905560018054859190849081106109cd57fe5b906000526020600020906005020160005b5060010190805190602001906109f5929190610bd2565b508133600160a060020a03167f7793f929911ad07e07894a20378f1eccce0fb493486c569d74045731fb583b8e866040518080602001828103825283818151815260200191508051906020019080838360008314610a6e575b805182526020831115610a6e57601f199092019160209182019101610a4e565b505050905090810190601f168015610a9a5780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600192505b5b505b50919050565b60025481565b60045481565b60008133600160a060020a0316600182815481101515610add57fe5b906000526020600020906005020160005b50546101009004600160a060020a031614801590610b1b575060005433600160a060020a03908116911614155b15610b2557610000565b6001600184815481101515610b3657fe5b906000526020600020906005020160005b50805460ff1916911515919091179055600191505b5b50919050565b6000805433600160a060020a03908116911614610b7f57610000565b50600481905560015b5b919050565b60408051602081019091526000815290565b815481835581811511610bcc57600502816005028360005260206000209182019101610bcc9190610c51565b5b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10610c1357805160ff1916838001178555610c40565b82800160010185558215610c40579182015b82811115610c40578251825591602001919060010190610c25565b5b50610c4d929150610c9a565b5090565b6103e391905b80821115610c4d57805474ffffffffffffffffffffffffffffffffffffffffff191681556000610c8a6001830182610cbb565b50600501610c57565b5090565b90565b6103e391905b80821115610c4d5760008155600101610ca0565b5090565b90565b50805460018160011615610100020316600290046000825580601f10610ce15750610469565b601f0160209004906000526020600020908101906104699190610c9a565b5b505600a165627a7a72305820b084dcce4e3d78f8a86c925f6c3f2ed689e3674655482541076a1a22f6cdedad0029"
-}
diff --git a/js/src/dapps/chaindeploy/contracts/code/registry.json b/js/src/dapps/chaindeploy/contracts/code/registry.json
deleted file mode 100644
index 809e7bcfb3c1e37c2e452a0f13cea7e6ce0e3c97..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/code/registry.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compiler": "v0.4.9+commit.364da425",
-  "source": "https://github.com/paritytech/contracts/blob/b1e0348144793e4ce6f7d6d2c4c7d0bb4ae9765e/SimpleRegistry.sol",
-  "output": "0x606060405260008054600160a060020a03191633600160a060020a0316179055670de0b6b3a7640000600355341561003357fe5b5b611b2f806100436000396000f300606060405236156101225763ffffffff60e060020a60003504166306b2ff47811461012457806313af40351461015457806319362a28146101725780633f3935d1146101df578063432ced04146102495780634f39ca59146102685780636795dbcd1461028f57806369fe0e2d1461030257806379ce9fac146103295780638da5cb5b1461035c57806390b97fc11461038857806392698814146103f15780639890220b14610418578063ac4e73f91461043c578063ac72c120146104b1578063c3a3582514610388578063ddca3f4314610541578063deb931a214610563578063df57b74214610592578063e30bd740146105c1578063eadf976014610172578063ef5454d6146106ca578063f25eb5c11461073f578063f6d339e414610751575bfe5b341561012c57fe5b610140600160a060020a03600435166107c7565b604080519115158252519081900360200190f35b341561015c57fe5b610170600160a060020a03600435166107fa565b005b341561017a57fe5b60408051602060046024803582810135601f81018590048502860185019096528585526101409583359593946044949392909201918190840183828082843750949650509335935061086e92505050565b604080519115158252519081900360200190f35b34156101e757fe5b610140600480803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843750949650610a1495505050505050565b604080519115158252519081900360200190f35b610140600435610b6e565b604080519115158252519081900360200190f35b341561027057fe5b610140600435610c03565b604080519115158252519081900360200190f35b341561029757fe5b60408051602060046024803582810135601f81018590048502860185019096528585526102e69583359593946044949392909201918190840183828082843750949650610cc495505050505050565b60408051600160a060020a039092168252519081900360200190f35b341561030a57fe5b610140600435610d40565b604080519115158252519081900360200190f35b341561033157fe5b610140600435600160a060020a0360243516610d9e565b604080519115158252519081900360200190f35b341561036457fe5b6102e6610e2e565b60408051600160a060020a039092168252519081900360200190f35b341561039057fe5b60408051602060046024803582810135601f81018590048502860185019096528585526103df9583359593946044949392909201918190840183828082843750949650610cc495505050505050565b60408051918252519081900360200190f35b34156103f957fe5b610140600435610eb9565b604080519115158252519081900360200190f35b341561042057fe5b610140610ed9565b604080519115158252519081900360200190f35b341561044457fe5b610140600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284375094965050509235600160a060020a03169250610f6e915050565b604080519115158252519081900360200190f35b34156104b957fe5b6101406004356112ac565b604080519115158252519081900360200190f35b341561039057fe5b60408051602060046024803582810135601f81018590048502860185019096528585526103df9583359593946044949392909201918190840183828082843750949650610cc495505050505050565b60408051918252519081900360200190f35b341561054957fe5b6103df61134c565b60408051918252519081900360200190f35b341561056b57fe5b6102e6600435611352565b60408051600160a060020a039092168252519081900360200190f35b341561059a57fe5b6102e6600435611370565b60408051600160a060020a039092168252519081900360200190f35b34156105c957fe5b6105dd600160a060020a0360043516611392565b604080516020808252835181830152835191928392908301918501908083838215610623575b80518252602083111561062357601f199092019160209182019101610603565b505050905090810190601f16801561064f5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017a57fe5b60408051602060046024803582810135601f81018590048502860185019096528585526101409583359593946044949392909201918190840183828082843750949650509335935061086e92505050565b604080519115158252519081900360200190f35b34156106d257fe5b610140600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284375094965050509235600160a060020a031692506115e8915050565b604080519115158252519081900360200190f35b341561074757fe5b6101706116c6565b005b341561075957fe5b60408051602060046024803582810135601f8101859004850286018501909652858552610140958335959394604494939290920191819084018382808284375094965050509235600160a060020a0316925061185a915050565b604080519115158252519081900360200190f35b600160a060020a03811660009081526002602081905260409091205460001961010060018316150201160415155b919050565b60005433600160a060020a039081169116146108155761086a565b60008054604051600160a060020a03808516939216917f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236491a360008054600160a060020a031916600160a060020a0383161790555b5b50565b600083815260016020526040812054849033600160a060020a0390811691161461089757610a0b565b6000858152600160209081526040918290209151865186936002019288929182918401908083835b602083106108de5780518252601f1990920191602091820191016108bf565b51815160209384036101000a60001901801990921691161790529201948552506040519384900381018420949094555050855186928291908401908083835b6020831061093c5780518252601f19909201916020918201910161091d565b51815160209384036101000a6000190180199092169116179052604080519290940182900382208183528a51838301528a519096508b95507fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea948b94508392908301919085019080838382156109cd575b8051825260208311156109cd57601f1990920191602091820191016109ad565b505050905090810190601f1680156109f95780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b509392505050565b60008133600160a060020a031660016000836040518082805190602001908083835b60208310610a555780518252601f199092019160209182019101610a36565b51815160209384036101000a6000190180199092169116179052604080519290940182900390912086528501959095529290920160002060010154600160a060020a0316939093149250610aab91505057610b67565b600160a060020a03331660009081526002602090815260409091208451610ad492860190611a09565b5033600160a060020a0316836040518082805190602001908083835b60208310610b0f5780518252601f199092019160209182019101610af0565b5181516020939093036101000a60001901801990911692169190911790526040519201829003822093507f098ae8581bb8bd9af1beaf7f2e9f51f31a8e5a8bfada4e303a645d71d9c9192092506000919050a3600191505b5b50919050565b6000818152600160205260408120548290600160a060020a031615610b9257610b67565b600354341015610ba157610b67565b6000838152600160205260408082208054600160a060020a03191633600160a060020a03169081179091559051909185917f4963513eca575aba66fdcd25f267aae85958fe6fb97e75fa25d783f1a091a2219190a3600191505b5b5b50919050565b600081815260016020526040812054829033600160a060020a03908116911614610c2c57610b67565b600083815260016020818152604080842090920154600160a060020a03168352600290528120610c5b91611a88565b60008381526001602081905260408083208054600160a060020a03199081168255920180549092169091555133600160a060020a03169185917fef1961b4d2909dc23643b309bfe5c3e5646842d98c3a58517037ef3871185af39190a3600191505b5b50919050565b600082815260016020908152604080832090518451600290920192859282918401908083835b60208310610d095780518252601f199092019160209182019101610cea565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054925050505b92915050565b6000805433600160a060020a03908116911614610d5c576107f5565b60038290556040805183815290517f6bbc57480a46553fa4d156ce702beef5f3ad66303b0ed1a5d4cb44966c6584c39181900360200190a15060015b5b919050565b600082815260016020526040812054839033600160a060020a03908116911614610dc757610e26565b6000848152600160205260408082208054600160a060020a031916600160a060020a0387811691821790925591519192339091169187917f7b97c62130aa09acbbcbf7482630e756592496f1759eaf702f469cf64dfb779491a4600191505b5b5092915050565b600054600160a060020a031681565b600082815260016020908152604080832090518451600290920192859282918401908083835b60208310610d095780518252601f199092019160209182019101610cea565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054925050505b92915050565b600081815260016020526040902054600160a060020a031615155b919050565b6000805433600160a060020a03908116911614610ef557610f6a565b60408051600160a060020a03301631815290517fdef931299fe61d176f949118058530c1f3f539dcb6950b4e372c9b835c33ca079181900360200190a1604051600160a060020a0333811691309091163180156108fc02916000818181858888f193505050501515610f6657610000565b5060015b5b90565b60006000836040518082805190602001908083835b60208310610fa25780518252601f199092019160209182019101610f83565b51815160209384036101000a6000190180199092169116179052604080519290940182900390912060008181526001909252929020549193505033600160a060020a039081169116149050610ff6576112a3565b846040518082805190602001908083835b602083106110265780518252601f199092019160209182019101611007565b51815160209384036101000a60001901801990921691161790526040805192909401829003909120600081815260019283905293909320015491955050600160a060020a03161580159250905061111257506000828152600160208181526040808420830154600160a060020a031684526002918290529283902092518354869493919283928592908116156101000260001901160480156110ff5780601f106110dd5761010080835404028352918201916110ff565b820191906000526020600020905b8154815290600101906020018083116110eb575b5050915050604051809103902060001916145b156111eb57600082815260016020818152604080842090920154600160a060020a0316835260029052812061114691611a88565b6000828152600160208181526040928390209091015491518751600160a060020a039093169288928291908401908083835b602083106111975780518252601f199092019160209182019101611178565b5181516020939093036101000a60001901801990911692169190911790526040519201829003822093507f12491ad95fd945e444d88a894ffad3c21959880a4dcd8af99d4ae4ffc71d4abd92506000919050a35b6000828152600160208181526040928390209091018054600160a060020a031916600160a060020a0388169081179091559151875188928291908401908083835b6020831061124b5780518252601f19909201916020918201910161122c565b5181516020939093036101000a60001901801990911692169190911790526040519201829003822093507f728435a0031f6a04538fcdd24922a7e06bc7bc945db03e83d22122d1bc5f28df92506000919050a3600192505b5b505092915050565b60008181526001602081905260409091200154600160a060020a031615155b919050565b600082815260016020908152604080832090518451600290920192859282918401908083835b60208310610d095780518252601f199092019160209182019101610cea565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054925050505b92915050565b60035481565b600081815260016020526040902054600160a060020a03165b919050565b60008181526001602081905260409091200154600160a060020a03165b919050565b61139a611ad0565b600160a060020a038216600090815260026020818152604092839020805484516001821615610100026000190190911693909304601f81018390048302840183019094528383529192908301828280156114355780601f1061140a57610100808354040283529160200191611435565b820191906000526020600020905b81548152906001019060200180831161141857829003601f168201915b505050505090505b919050565b600083815260016020526040812054849033600160a060020a0390811691161461089757610a0b565b6000858152600160209081526040918290209151865186936002019288929182918401908083835b602083106108de5780518252601f1990920191602091820191016108bf565b51815160209384036101000a60001901801990921691161790529201948552506040519384900381018420949094555050855186928291908401908083835b6020831061093c5780518252601f19909201916020918201910161091d565b51815160209384036101000a6000190180199092169116179052604080519290940182900382208183528a51838301528a519096508b95507fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea948b94508392908301919085019080838382156109cd575b8051825260208311156109cd57601f1990920191602091820191016109ad565b505050905090810190601f1680156109f95780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b509392505050565b6000805433600160a060020a0390811691161461160457610d3a565b600160a060020a0382166000908152600260209081526040909120845161162d92860190611a09565b5081600160a060020a0316836040518082805190602001908083835b602083106116685780518252601f199092019160209182019101611649565b5181516020939093036101000a60001901801990911692169190911790526040519201829003822093507f098ae8581bb8bd9af1beaf7f2e9f51f31a8e5a8bfada4e303a645d71d9c9192092506000919050a35060015b5b92915050565b33600160a060020a03166002600033600160a060020a0316600160a060020a0316815260200190815260200160002060405180828054600181600116156101000203166002900480156117505780601f1061172e576101008083540402835291820191611750565b820191906000526020600020905b81548152906001019060200180831161173c575b505060405190819003812092507f12491ad95fd945e444d88a894ffad3c21959880a4dcd8af99d4ae4ffc71d4abd9150600090a3600160006002600033600160a060020a0316600160a060020a0316815260200190815260200160002060405180828054600181600116156101000203166002900480156118085780601f106117e6576101008083540402835291820191611808565b820191906000526020600020905b8154815290600101906020018083116117f4575b50506040805191829003909120845260208085019590955292830160009081206001018054600160a060020a031916905533600160a060020a0316815260029094525050812061185791611a88565b5b565b600083815260016020526040812054849033600160a060020a0390811691161461188357610a0b565b60008581526001602090815260409182902091518651600160a060020a038716936002019288929182918401908083835b602083106108de5780518252601f1990920191602091820191016108bf565b51815160209384036101000a60001901801990921691161790529201948552506040519384900381018420949094555050855186928291908401908083835b6020831061093c5780518252601f19909201916020918201910161091d565b51815160209384036101000a6000190180199092169116179052604080519290940182900382208183528a51838301528a519096508b95507fb829c3e412537bbe794c048ccb9e4605bb4aaaa8e4d4c15c1a6e0c2adc1716ea948b94508392908301919085019080838382156109cd575b8051825260208311156109cd57601f1990920191602091820191016109ad565b505050905090810190601f1680156109f95780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b509392505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10611a4a57805160ff1916838001178555611a77565b82800160010185558215611a77579182015b82811115611a77578251825591602001919060010190611a5c565b5b50611a84929150611ae2565b5090565b50805460018160011615610100020316600290046000825580601f10611aae575061086a565b601f01602090049060005260206000209081019061086a9190611ae2565b5b50565b60408051602081019091526000815290565b610f6a91905b80821115611a845760008155600101611ae8565b5090565b905600a165627a7a723058202a8f09bd2a20f43dfe4c6adb69bf4bfa211cda23787d972cd6e33eee989cafc50029"
-}
diff --git a/js/src/dapps/chaindeploy/contracts/code/signaturereg.json b/js/src/dapps/chaindeploy/contracts/code/signaturereg.json
deleted file mode 100644
index 3dd4fe07d28b3385291bc328d26d500dff694530..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/code/signaturereg.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compiler": "v0.4.9+commit.364da425",
-  "source": "https://github.com/paritytech/contracts/blob/58842b92c00e3c45a84b6d0ac9b842f016dde50a/SignatureReg.sol",
-  "output": "0x606060405260008054600160a060020a03191633600160a060020a0316178155600255341561002a57fe5b5b60408051808201909152601081527f726567697374657228737472696e67290000000000000000000000000000000060208201526100759064010000000061036661007c82021704565b505b61031c565b60006100f7826040518082805190602001908083835b602083106100b15780518252601f199092019160209182019101610092565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020836100ff640100000000026103d6176401000000009004565b90505b919050565b7fffffffff000000000000000000000000000000000000000000000000000000008216600090815260016020819052604082205484916002908216156101000260001901909116041561015157610274565b7fffffffff000000000000000000000000000000000000000000000000000000008416600090815260016020908152604090912084516101939286019061027c565b5060028054600101905560408051602080825285518183015285517fffffffff00000000000000000000000000000000000000000000000000000000881693600160a060020a033316937f50e01e16719d6c699e516c57f4c514e77f6bc21a978d33f23980acdddbcbd0b293899391928392908301918501908083838215610236575b80518252602083111561023657601f199092019160209182019101610216565b505050905090810190601f1680156102625780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b5092915050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106102bd57805160ff19168380011785556102ea565b828001600101855582156102ea579182015b828111156102ea5782518255916020019190600101906102cf565b5b506102f79291506102fb565b5090565b61031991905b808211156102f75760008155600101610301565b5090565b90565b6105d78061032b6000396000f3006060604052361561005c5763ffffffff60e060020a60003504166313af4035811461005e5780633015a5211461007c5780638da5cb5b1461009e5780639890220b146100ca578063b46bcdaa146100dc578063f2c298be14610179575bfe5b341561006657fe5b61007a600160a060020a03600435166101e3565b005b341561008457fe5b61008c610264565b60408051918252519081900360200190f35b34156100a657fe5b6100ae61026a565b60408051600160a060020a039092168252519081900360200190f35b34156100d257fe5b61007a610279565b005b34156100e457fe5b6100f9600160e060020a0319600435166102cc565b60408051602080825283518183015283519192839290830191850190808383821561013f575b80518252602083111561013f57601f19909201916020918201910161011f565b505050905090810190601f16801561016b5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561018157fe5b6101cf600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284375094965061036695505050505050565b604080519115158252519081900360200190f35b60005433600160a060020a039081169116146101fe57610260565b60008054604051600160a060020a03808516939216917f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236491a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b5b50565b60025481565b600054600160a060020a031681565b60005433600160a060020a03908116911614610294576102c8565b604051600160a060020a0333811691309091163180156108fc02916000818181858888f1935050505015156102c857610000565b5b5b565b60016020818152600092835260409283902080548451600294821615610100026000190190911693909304601f810183900483028401830190945283835291929083018282801561035e5780601f106103335761010080835404028352916020019161035e565b820191906000526020600020905b81548152906001019060200180831161034157829003601f168201915b505050505081565b60006103ce826040518082805190602001908083835b6020831061039b5780518252601f19909201916020918201910161037c565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020836103d6565b90505b919050565b600160e060020a03198216600090815260016020819052604082205484916002908216156101000260001901909116041561041057610503565b600160e060020a031984166000908152600160209081526040909120845161043a9286019061050b565b506002805460010190556040805160208082528551818301528551600160e060020a0319881693600160a060020a033316937f50e01e16719d6c699e516c57f4c514e77f6bc21a978d33f23980acdddbcbd0b2938993919283929083019185019080838382156104c5575b8051825260208311156104c557601f1990920191602091820191016104a5565b505050905090810190601f1680156104f15780820380516001836020036101000a031916815260200191505b509250505060405180910390a3600191505b5b5092915050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061054c57805160ff1916838001178555610579565b82800160010185558215610579579182015b8281111561057957825182559160200191906001019061055e565b5b5061058692915061058a565b5090565b6105a891905b808211156105865760008155600101610590565b5090565b905600a165627a7a723058206830357dde798fafa19dd78a4460c047f76cc132713db13442c5da7485fc0ff40029"
-}
diff --git a/js/src/dapps/chaindeploy/contracts/code/tokendeploy.json b/js/src/dapps/chaindeploy/contracts/code/tokendeploy.json
deleted file mode 100644
index 7dd0391b18c88113bf80094e59f236962417379b..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/code/tokendeploy.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compiler": "v0.4.9+commit.364da425",
-  "source": "https://github.com/paritytech/contracts/blob/0ca02d60066202432305c8e9b1cbf33267478ab3/BasicCoin.sol",
-  "output": "0x606060405260008054600160a060020a03191633600160a060020a0316179055341561002757fe5b5b610f43806100376000396000f3006060604052361561007d5763ffffffff60e060020a600035041663061ea8cc811461007f57806306661abd146100ad57806313af4035146100cf5780635001f3b5146100ed5780638da5cb5b1461010f5780639507d39a1461013b5780639890220b14610179578063acfdfd1c1461018b578063c00ca38314610236575bfe5b341561008757fe5b61009b600160a060020a0360043516610280565b60408051918252519081900360200190f35b34156100b557fe5b61009b61029f565b60408051918252519081900360200190f35b34156100d757fe5b6100eb600160a060020a03600435166102a6565b005b34156100f557fe5b61009b610327565b60408051918252519081900360200190f35b341561011757fe5b61011f61032e565b60408051600160a060020a039092168252519081900360200190f35b341561014357fe5b61014e60043561033d565b60408051600160a060020a039485168152928416602084015292168183015290519081900360600190f35b341561018157fe5b6100eb610392565b005b60408051602060046024803582810135601f8101859004850286018501909652858552610222958335959394604494939290920191819084018382808284375050604080516020601f89358b0180359182018390048302840183019094528083529799988101979196509182019450925082915084018382808284375094965050509235600160a060020a031692506103e5915050565b604080519115158252519081900360200190f35b341561023e57fe5b61014e600160a060020a036004351660243561079b565b60408051600160a060020a039485168152928416602084015292168183015290519081900360600190f35b600160a060020a0381166000908152600260205260409020545b919050565b6001545b90565b60005433600160a060020a039081169116146102c157610000565b60008054604051600160a060020a03808516939216917f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236491a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b5b50565b620f424081565b600054600160a060020a031681565b600060006000600060018581548110151561035457fe5b906000526020600020906003020160005b50805460018201546002830154600160a060020a039283169750908216955016925090505b509193909250565b60005433600160a060020a039081169116146103ad57610000565b604051600160a060020a0333811691309091163180156108fc02916000818181858888f1935050505015156103e157610000565b5b5b565b60008181808088336103f56107eb565b918252600160a060020a03166020820152604080519182900301906000f080151561041c57fe5b925061042733610280565b915083600160a060020a031663ddca3f436000604051602001526040518163ffffffff1660e060020a028152600401809050602060405180830381600087803b151561046f57fe5b60325a03f1151561047c57fe5b50506040805151600160a060020a03331660009081526002602052919091209092506001840191506104ae90826107fb565b50600154600160a060020a03331660009081526002602052604090208054849081106104d657fe5b906000526020600020900160005b5055600180548082016104f78382610825565b916000526020600020906003020160005b60606040519081016040528087600160a060020a0316815260200133600160a060020a0316815260200188600160a060020a0316815250909190915060008201518160000160006101000a815481600160a060020a030219169083600160a060020a0316021790555060208201518160010160006101000a815481600160a060020a030219169083600160a060020a0316021790555060408201518160020160006101000a815481600160a060020a030219169083600160a060020a0316021790555050505083600160a060020a0316637b1a547c82858b620f42408c336000604051602001526040518763ffffffff1660e060020a0281526004018086600160a060020a0316600160a060020a03168152602001806020018581526020018060200184600160a060020a0316600160a060020a03168152602001838103835287818151815260200191508051906020019080838360008314610686575b80518252602083111561068657601f199092019160209182019101610666565b505050905090810190601f1680156106b25780820380516001836020036101000a031916815260200191505b50838103825285518152855160209182019187019080838382156106f1575b8051825260208311156106f157601f1990920191602091820191016106d1565b505050905090810190601f16801561071d5780820380516001836020036101000a031916815260200191505b509750505050505050506020604051808303818588803b151561073c57fe5b61235a5a03f1151561074a57fe5b5050604051600160a060020a03808716935087811692503316907f454b0172f64812df0cd504c2bd7df7aab8ff328a54d946b4bd0fa7c527adf9cc90600090a4600194505b50505050949350505050565b600160a060020a03821660009081526002602052604081208054829182916107dd9190869081106107c857fe5b906000526020600020900160005b505461033d565b9250925092505b9250925092565b604051610650806108c883390190565b81548183558181151161081f5760008381526020902061081f918101908301610857565b5b505050565b81548183558181151161081f5760030281600302836000526020600020918201910161081f9190610878565b5b505050565b6102a391905b80821115610871576000815560010161085d565b5090565b90565b6102a391905b8082111561087157805473ffffffffffffffffffffffffffffffffffffffff19908116825560018201805482169055600282018054909116905560030161087e565b5090565b905600606060405260008054600160a060020a03191633600160a060020a0316179055341561002757fe5b6040516040806106508339810160405280516020909101515b600034111561004e57610000565b8180151561005b57610000565b600183905560008054600160a060020a031916600160a060020a038416908117825581526002602052604090208390555b5b505b50505b6105af806100a16000396000f3006060604052361561007d5763ffffffff60e060020a600035041663095ea7b3811461009257806313af4035146100c557806318160ddd146100e357806323b872dd146101055780635001f3b51461013e57806370a08231146101605780638da5cb5b1461018e578063a9059cbb146101ba578063dd62ed3e146101ed575b341561008557fe5b6100905b610000565b565b005b341561009a57fe5b6100b1600160a060020a0360043516602435610221565b604080519115158252519081900360200190f35b34156100cd57fe5b610090600160a060020a03600435166102b6565b005b34156100eb57fe5b6100f3610337565b60408051918252519081900360200190f35b341561010d57fe5b6100b1600160a060020a036004358116906024351660443561033d565b604080519115158252519081900360200190f35b341561014657fe5b6100f361045d565b60408051918252519081900360200190f35b341561016857fe5b6100f3600160a060020a0360043516610464565b60408051918252519081900360200190f35b341561019657fe5b61019e610483565b60408051600160a060020a039092168252519081900360200190f35b34156101c257fe5b6100b1600160a060020a0360043516602435610492565b604080519115158252519081900360200190f35b34156101f557fe5b6100f3600160a060020a0360043581169060243516610552565b60408051918252519081900360200190f35b6000600034111561023157610000565b82600160a060020a031633600160a060020a03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a350600160a060020a0333811660009081526002602090815260408083209386168352600193840190915290208054830190555b5b92915050565b60005433600160a060020a039081169116146102d157610000565b60008054604051600160a060020a03808516939216917f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236491a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b5b50565b60015481565b6000600034111561034d57610000565b600160a060020a038416600090815260026020526040902054849083908190101561037757610000565b600160a060020a0380871660009081526002602090815260408083203394851684526001019091529020548791908690819010156103b457610000565b87600160a060020a031689600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef896040518082815260200191505060405180910390a3600160a060020a03808a16600090815260026020818152604080842033861685526001808201845282862080548f900390559390925281548c9003909155928b16825291902080548901905595505b5b5050505b50505b9392505050565b620f424081565b600160a060020a0381166000908152600260205260409020545b919050565b600054600160a060020a031681565b600060003411156104a257610000565b33600160a060020a0381166000908152600260205260409020548390819010156104cb57610000565b84600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef866040518082815260200191505060405180910390a3600160a060020a0333811660009081526002602052604080822080548890039055918716815220805485019055600192505b5b50505b92915050565b600160a060020a03808316600090815260026020908152604080832093851683526001909301905220545b929150505600a165627a7a72305820b5bf89a0a85c15df1e9717e49be06fe1a4f9dcc1e0cebf5483dd1c0bcd14a0910029a165627a7a723058207f96b7ad40c02cfaeaf29e65c79456dd3fd9828c9d3fbaf801fb60010456c3880029"
-}
diff --git a/js/src/dapps/chaindeploy/contracts/code/tokenreg.json b/js/src/dapps/chaindeploy/contracts/code/tokenreg.json
deleted file mode 100644
index bcba3412738ab5799e8a5e481926ba4e9f6d7b3a..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/code/tokenreg.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compiler": "v0.4.9+commit.364da425",
-  "source": "https://github.com/paritytech/contracts/blob/58842b92c00e3c45a84b6d0ac9b842f016dde50a/TokenReg.sol",
-  "output": "0x606060405260008054600160a060020a03191633600160a060020a0316179055670de0b6b3a7640000600455341561003357fe5b5b611473806100436000396000f300606060405236156100b45763ffffffff60e060020a600035041663044215c681146100b657806313af4035146101df57806366b42dcb146101fd57806369fe0e2d146102ab5780637958533a146102c05780637b1a547c146102e8578063891de9ed146103a15780638da5cb5b146104bc5780639890220b146104e85780639f181b5e146104fa578063a02b161e1461051c578063b72e717d14610531578063dd93890b1461066a578063ddca3f4314610685575bfe5b34156100be57fe5b6100c96004356106a7565b60408051600160a060020a038088168252918101859052908216608082015260a060208083018281528751928401929092528651606084019160c0850191908901908083838215610135575b80518252602083111561013557601f199092019160209182019101610115565b505050905090810190601f1680156101615780820380516001836020036101000a031916815260200191505b50838103825285518152855160209182019187019080838382156101a0575b8051825260208311156101a057601f199092019160209182019101610180565b505050905090810190601f1680156101cc5780820380516001836020036101000a031916815260200191505b5097505050505050505060405180910390f35b34156101e757fe5b6101fb600160a060020a036004351661083a565b005b60408051602060046024803582810135601f8101859004850286018501909652858552610297958335600160a060020a0316959394604494939290920191819084018382808284375050604080516020601f818a01358b0180359182018390048302840183018552818452989a8a359a9099940197509195509182019350915081908401838280828437509496506108ae95505050505050565b604080519115158252519081900360200190f35b34156102b357fe5b6101fb6004356108c8565b005b34156102c857fe5b6102d66004356024356108ed565b60408051918252519081900360200190f35b60408051602060046024803582810135601f8101859004850286018501909652858552610297958335600160a060020a0316959394604494939290920191819084018382808284375050604080516020601f818a01358b0180359182018390048302840183018552818452989a8a359a90999401975091955091820193509150819084018382808284375094965050509235600160a060020a0316925061092c915050565b604080519115158252519081900360200190f35b34156103a957fe5b6103f7600480803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843750949650610c6695505050505050565b6040518086815260200185600160a060020a0316600160a060020a031681526020018481526020018060200183600160a060020a0316600160a060020a0316815260200182810382528481815181526020019150805190602001908083836000831461047e575b80518252602083111561047e57601f19909201916020918201910161045e565b505050905090810190601f1680156104aa5780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390f35b34156104c457fe5b6104cc610dca565b60408051600160a060020a039092168252519081900360200190f35b34156104f057fe5b6101fb610dd9565b005b341561050257fe5b6102d6610e2c565b60408051918252519081900360200190f35b341561052457fe5b6101fb600435610e33565b005b341561053957fe5b61054d600160a060020a0360043516611047565b60405180868152602001806020018581526020018060200184600160a060020a0316600160a060020a03168152602001838103835287818151815260200191508051906020019080838360008314610135575b80518252602083111561013557601f199092019160209182019101610115565b505050905090810190601f1680156101615780820380516001836020036101000a031916815260200191505b50838103825285518152855160209182019187019080838382156101a0575b8051825260208311156101a057601f199092019160209182019101610180565b505050905090810190601f1680156101cc5780820380516001836020036101000a031916815260200191505b5097505050505050505060405180910390f35b341561067257fe5b6101fb6004356024356044356111f3565b005b341561068d57fe5b6102d66112b0565b60408051918252519081900360200190f35b60006106b16112b6565b60006106bb6112b6565b600060006003878154811015156106ce57fe5b906000526020600020906006020160005b50805460018083018054604080516020601f600260001997861615610100029790970190941695909504928301859004850281018501909152818152600160a060020a039094169a5093945091929083018282801561077f5780601f106107545761010080835404028352916020019161077f565b820191906000526020600020905b81548152906001019060200180831161076257829003601f168201915b505050600280850154600386018054604080516020601f6000196101006001871615020190941696909604928301869004860281018601909152818152969b50919950935091508301828280156108175780601f106107ec57610100808354040283529160200191610817565b820191906000526020600020905b8154815290600101906020018083116107fa57829003601f168201915b50505050600483015491945050600160a060020a031691505b5091939590929450565b60005433600160a060020a03908116911614610855576108aa565b60008054604051600160a060020a03808516939216917f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236491a360008054600160a060020a031916600160a060020a0383161790555b5b50565b60006108bd858585853361092c565b90505b949350505050565b60005433600160a060020a039081169116146108e3576108aa565b60048190555b5b50565b60006003838154811015156108fe57fe5b906000526020600020906006020160005b506000838152600591909101602052604090205490505b92915050565b600060045434101561093d57610c5d565b600160a060020a03861660009081526001602052604090205486901561096257610c5b565b8551869060031461097257610c59565b866002816040518082805190602001908083835b602083106109a55780518252601f199092019160209182019101610986565b51815160209384036101000a60001901801990921691161790529201948552506040519384900301909220541591506109df905057610c56565b60038054600181016109f183826112c8565b916000526020600020906006020160005b506040805160a081018252600160a060020a03808e1680835260208084018f90529383018d9052606083018c9052908a1660808301528354600160a060020a0319161783558b51909291610a5d9160018401918e01906112fa565b506040820151600282015560608201518051610a839160038401916020909101906112fa565b506080919091015160049091018054600160a060020a031916600160a060020a03928316179055600354908b1660009081526001602090815260409182902083905590518b519293506002928c928291908401908083835b60208310610afa5780518252601f199092019160209182019101610adb565b51815160001960209485036101000a81019182169119929092161790915293909101958652604051958690038101862096909655506003548d519101948d9493508392508401908083835b60208310610b645780518252601f199092019160209182019101610b45565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390207f25074d730da65a10e171fe5589d2182313ef00da38d23a9ae3b78923568bdf2d8b896040518083600160a060020a0316600160a060020a0316815260200180602001828103825283818151815260200191508051906020019080838360008314610c17575b805182526020831115610c1757601f199092019160209182019101610bf7565b505050905090810190601f168015610c435780820380516001836020036101000a031916815260200191505b50935050505060405180910390a3600193505b5b505b505b505b95945050505050565b600060006000610c746112b6565b6000600060016002886040518082805190602001908083835b60208310610cac5780518252601f199092019160209182019101610c8d565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902054039550600386815481101515610cf257fe5b906000526020600020906006020160005b5080546002808301546003840180546040805160206101006001851615026000190190931695909504601f8101839004830286018301909152808552600160a060020a039095169a50919850939450909291908301828280156108175780601f106107ec57610100808354040283529160200191610817565b820191906000526020600020905b8154815290600101906020018083116107fa57829003601f168201915b50505050600483015491945050600160a060020a031691505b5091939590929450565b600054600160a060020a031681565b60005433600160a060020a03908116911614610df457610e28565b604051600160a060020a0333811691309091163180156108fc02916000818181858888f193505050501515610e2857610000565b5b5b565b6003545b90565b60005433600160a060020a03908116911614610e4e576108aa565b80600382815481101515610e5e57fe5b906000526020600020906006020160005b506001016040518082805460018160011615610100020316600290048015610ece5780601f10610eac576101008083540402835291820191610ece565b820191906000526020600020905b815481529060010190602001808311610eba575b505060405190819003812092507f96e76fa77fea85d8abeb7533fdb8288c214bb1dcf1f867c8f36a95f1f509c1759150600090a360016000600383815481101515610f1557fe5b906000526020600020906006020160005b5054600160a060020a031681526020810191909152604001600090812055600380546002919083908110610f5657fe5b906000526020600020906006020160005b506001016040518082805460018160011615610100020316600290048015610fc65780601f10610fa4576101008083540402835291820191610fc6565b820191906000526020600020905b815481529060010190602001808311610fb2575b50509283525050604051908190036020019020600090556003805482908110610feb57fe5b906000526020600020906006020160005b8154600160a060020a0319168255611018600183016000611379565b60028201600090556003820160006110309190611379565b506004018054600160a060020a03191690555b5b50565b60006110516112b6565b600061105b6112b6565b600160a060020a03851660009081526001602052604081205460038054600019909201965082918790811061108c57fe5b906000526020600020906006020160005b509050806001018054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561077f5780601f106107545761010080835404028352916020019161077f565b820191906000526020600020905b81548152906001019060200180831161076257829003601f168201915b505050600280850154600386018054604080516020601f6000196101006001871615020190941696909604928301869004860281018601909152818152969b50919950935091508301828280156108175780601f106107ec57610100808354040283529160200191610817565b820191906000526020600020905b8154815290600101906020018083116107fa57829003601f168201915b50505050600483015491945050600160a060020a031691505b5091939590929450565b8233600160a060020a031660038281548110151561120d57fe5b906000526020600020906006020160005b5060040154600160a060020a031614611236576112a9565b8160038581548110151561124657fe5b906000526020600020906006020160005b50600085815260059190910160209081526040918290209290925580518481529051859287927f7991c63a749706fd298fc2387764d640be6e714307b6357b1d3c2ce35cba3b52929081900390910190a35b5b50505050565b60045481565b60408051602081019091526000815290565b8154818355818115116112f4576006028160060283600052602060002091820191016112f491906113c1565b5b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061133b57805160ff1916838001178555611368565b82800160010185558215611368579182015b8281111561136857825182559160200191906001019061134d565b5b50611375929150611426565b5090565b50805460018160011615610100020316600290046000825580601f1061139f57506108aa565b601f0160209004906000526020600020908101906108aa9190611426565b5b50565b610e3091905b80821115611375578054600160a060020a031916815560006113ec6001830182611379565b60028201600090556003820160006114049190611379565b50600481018054600160a060020a03191690556006016113c7565b5090565b90565b610e3091905b80821115611375576000815560010161142c565b5090565b905600a165627a7a72305820ab1d1a18270ba278cc2f74cd1b7b547cdcd6308a9df1dec1120fa9f6199b1f480029"
-}
diff --git a/js/src/dapps/chaindeploy/contracts/code/verifyEmail.json b/js/src/dapps/chaindeploy/contracts/code/verifyEmail.json
deleted file mode 100644
index a87fb0a2284f0e161a19edf84fcf9bfd8eeb8885..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/code/verifyEmail.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compiler": "v0.4.9+commit.364da425",
-  "source": "https://github.com/paritytech/contracts/blob/e5afdacc716ca743ceddf80978d4e6b2b465dbe9/ProofOfEmail.sol",
-  "output": "0x606060405260008054600160a060020a03191633600160a060020a0316178155600355341561002a57fe5b5b6108a48061003a6000396000f300606060405236156100ca5763ffffffff60e060020a60003504166306b2ff4781146100cc57806313af4035146100fc5780632650b9881461011a5780634b59e8801461018c57806359c87d70146101b05780636795dbcd146101bd57806369fe0e2d1461023057806370c4d5f214610245578063797af627146103255780638da5cb5b1461034c5780639890220b14610378578063ac72c1201461038a578063cc1d4c02146103b1578063ddca3f43146103e1578063df57b74214610403578063e30bd74014610432575bfe5b34156100d457fe5b6100e8600160a060020a03600435166104ce565b604080519115158252519081900360200190f35b341561010457fe5b610118600160a060020a03600435166104d6565b005b341561012257fe5b60408051602060046024803582810135601f810185900485028601850190965285855261017a958335600160a060020a0316959394604494939290920191819084018382808284375094965061055795505050505050565b60408051918252519081900360200190f35b341561019457fe5b610118600160a060020a0360043516602435604435610577565b005b6101186004356105eb565b005b34156101c557fe5b60408051602060046024803582810135601f8101859004850286018501909652858552610214958335959394604494939290920191819084018382808284375094965061063595505050505050565b60408051600160a060020a039092168252519081900360200190f35b341561023857fe5b610118600435610654565b005b341561024d57fe5b60408051602060046024803582810135601f81018590048502860185019096528585526102a5958335600160a060020a0316959394604494939290920191819084018382808284375094965061067995505050505050565b6040805160208082528351818301528351919283929083019185019080838382156102eb575b8051825260208311156102eb57601f1990920191602091820191016102cb565b505050905090810190601f1680156103175780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561032d57fe5b6100e8600435610688565b604080519115158252519081900360200190f35b341561035457fe5b610214610791565b60408051600160a060020a039092168252519081900360200190f35b341561038057fe5b6101186107a0565b005b341561039257fe5b6100e86004356107f3565b604080519115158252519081900360200190f35b34156103b957fe5b6100e8600160a060020a0360043516610813565b604080519115158252519081900360200190f35b34156103e957fe5b61017a610834565b60408051918252519081900360200190f35b341561040b57fe5b61021460043561083a565b60408051600160a060020a039092168252519081900360200190f35b341561043a57fe5b6102a5600160a060020a0360043516610858565b6040805160208082528351818301528351919283929083019185019080838382156102eb575b8051825260208311156102eb57601f1990920191602091820191016102cb565b505050905090810190601f1680156103175780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60005b919050565b60005433600160a060020a039081169116146104f157610553565b60008054604051600160a060020a03808516939216917f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236491a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b5b50565b600160a060020a0382166000908152600260205260409020545b92915050565b60005433600160a060020a03908116911614610592576105e5565b600082815260046020908152604091829020839055815184815291518392600160a060020a038716927f76babef7e9f1065118be3f9d7094016a1cc06dd12811501c7712deb22144f37b92918290030190a35b5b505050565b6003543410156105fa57610553565b6040518190600160a060020a033316907f070669e6be82aa9b077a096b0f9617893a4dc5cb05897e27fd7a6112c8e6629e90600090a35b5b50565b600082815260016020526040902054600160a060020a03165b92915050565b60005433600160a060020a0390811691161461066f57610553565b60038190555b5b50565b610571610866565b5b92915050565b6040805182815281516020918190038201902060009081526004909152908120548015156106b55761078b565b6040805184815281516020918190038201902060009081526004825282812081905583815260019091522054600160a060020a031615158061070e5750600160a060020a03331660009081526002602052604090205415155b156107185761078b565b6000818152600160209081526040808320805473ffffffffffffffffffffffffffffffffffffffff191633600160a060020a031690811790915580845260029092528083208490555190917fd415b905d4dd806bfba99a7a0e6351bd0c9db3a9912add21c0e6bef4479f673f91a2600191505b50919050565b600054600160a060020a031681565b60005433600160a060020a039081169116146107bb576107ef565b604051600160a060020a0333811691309091163180156108fc02916000818181858888f1935050505015156107ef57610000565b5b5b565b600081815260016020526040902054600160a060020a031615155b919050565b600160a060020a03811660009081526002602052604090205415155b919050565b60035481565b600081815260016020526040902054600160a060020a03165b919050565b6104d1610866565b5b919050565b604080516020810190915260008152905600a165627a7a7230582081d03388dd06c78ee4098c4f1e23cd3c25e38d249d5da59962c6b28ec6e20ea70029"
-}
diff --git a/js/src/dapps/chaindeploy/contracts/code/verifySms.json b/js/src/dapps/chaindeploy/contracts/code/verifySms.json
deleted file mode 100644
index 0cfc43f9d6a73897056edb27e97b15b149a07167..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/code/verifySms.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compiler": "v0.4.9+commit.364da425",
-  "source": "https://github.com/paritytech/contracts/blob/58842b92c00e3c45a84b6d0ac9b842f016dde50a/SMSVerification.sol",
-  "output": "0x606060405260008054600160a060020a033316600160a060020a03199182168117909255600280549091169091179055666a94d74f430000600455341561004257fe5b5b6109a0806100526000396000f300606060405236156100ca5763ffffffff60e060020a60003504166313af403581146100cc57806314253887146100ea578063338cdca1146101085780633da5c3ce146101125780635283f3391461013357806369fe0e2d146101af57806374a8f103146101c4578063797af627146101e25780638da5cb5b146102095780639890220b14610235578063c89e436114610247578063ca4cbf6714610273578063ca5eb5e1146102e5578063cc1d4c0214610303578063ddca3f4314610333578063fc2525ab14610273575bfe5b34156100d457fe5b6100e8600160a060020a03600435166103c7565b005b34156100f257fe5b6100e8600160a060020a0360043516610448565b005b6100e86104b4565b005b341561011a57fe5b6100e8600160a060020a0360043516602435610521565b005b341561013b57fe5b60408051602060046024803582810135601f8101859004850286018501909652858552610193958335600160a060020a0316959394604494939290920191819084018382808284375094965061059295505050505050565b60408051600160a060020a039092168252519081900360200190f35b34156101b757fe5b6100e8600435610623565b005b34156101cc57fe5b6100e8600160a060020a0360043516610648565b005b34156101ea57fe5b6101f56004356106d9565b604080519115158252519081900360200190f35b341561021157fe5b610193610771565b60408051600160a060020a039092168252519081900360200190f35b341561023d57fe5b6100e8610780565b005b341561024f57fe5b6101936107d3565b60408051600160a060020a039092168252519081900360200190f35b341561027b57fe5b60408051602060046024803582810135601f81018590048502860185019096528585526102d3958335600160a060020a0316959394604494939290920191819084018382808284375094965061059295505050505050565b60408051918252519081900360200190f35b34156102ed57fe5b6100e8600160a060020a0360043516610873565b005b341561030b57fe5b6101f5600160a060020a03600435166108bb565b604080519115158252519081900360200190f35b341561033b57fe5b6102d36108dd565b60408051918252519081900360200190f35b341561027b57fe5b60408051602060046024803582810135601f81018590048502860185019096528585526102d3958335600160a060020a0316959394604494939290920191819084018382808284375094965061059295505050505050565b60408051918252519081900360200190f35b60005433600160a060020a039081169116146103e257610444565b60008054604051600160a060020a03808516939216917f70aea8d848e8a90fb7661b227dc522eb6395c3dac71b63cb59edd5c9899b236491a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b5b50565b60025433600160a060020a0390811691161461046357610444565b600160a060020a0381166000818152600160208190526040808320805460ff1916909217909155517fd415b905d4dd806bfba99a7a0e6351bd0c9db3a9912add21c0e6bef4479f673f9190a25b5b50565b6004543410156104c35761051e565b600160a060020a03331660009081526001602052604090205460ff16156104e95761051e565b604051600160a060020a033316907f039f711c9c18dd815b225b1424855e6118e746c6b5d688907f10c4dd29ebe92a90600090a25b5b565b60025433600160a060020a0390811691161461053c5761058d565b600160a060020a038216600081815260036020908152604091829020849055815184815291517fa9a343b39eac85ffb326e93ecd46785b814e72dc9f2b33bb0b4a315ba2859f439281900390910190a25b5b5050565b60006001600084600160a060020a0316600160a060020a03168152602001908152602001600020600101826040518082805190602001908083835b602083106105ec5780518252601f1990920191602091820191016105cd565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054925050505b92915050565b60005433600160a060020a0390811691161461063e57610444565b60048190555b5b50565b60025433600160a060020a0390811691161461066357610444565b600160a060020a038116600090815260016020526040902054819060ff16151561068c5761058d565b600160a060020a038216600081815260016020526040808220805460ff19169055517fb6fa8b8bd5eab60f292eca876e3ef90722275b785309d84b1de113ce0b8c4e749190a25b5b505b50565b6040805182815281516020918190038201902033600160a060020a031660009081526003909252918120549091146107105761076c565b600160a060020a0333166000818152600360209081526040808320839055600191829052808320805460ff1916909217909155517fd415b905d4dd806bfba99a7a0e6351bd0c9db3a9912add21c0e6bef4479f673f9190a25060015b919050565b600054600160a060020a031681565b60005433600160a060020a0390811691161461079b5761051e565b604051600160a060020a0333811691309091163180156108fc02916000818181858888f19350505050151561051e57610000565b5b5b565b600254600160a060020a031681565b60006001600084600160a060020a0316600160a060020a03168152602001908152602001600020600101826040518082805190602001908083835b602083106105ec5780518252601f1990920191602091820191016105cd565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054925050505b92915050565b60005433600160a060020a0390811691161461088e57610444565b6002805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0383161790555b5b50565b600160a060020a03811660009081526001602052604090205460ff165b919050565b60045481565b60006001600084600160a060020a0316600160a060020a03168152602001908152602001600020600101826040518082805190602001908083835b602083106105ec5780518252601f1990920191602091820191016105cd565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054925050505b929150505600a165627a7a72305820f6beb9c0ae3b45609ad6fc26c1b74600cbaa5f0088ca07be3e9c392a12b2c6150029"
-}
diff --git a/js/src/dapps/chaindeploy/contracts/dappreg.js b/js/src/dapps/chaindeploy/contracts/dappreg.js
deleted file mode 100644
index 71379bf8bf873f44f718831b9a351ef21c99130b..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/dappreg.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import abi from '~/contracts/abi/dappreg';
-import { compiler, source as sourceUrl, output as byteCode } from './code/dappreg';
-
-const id = 'dappreg'; // 7bbc4f1a27628781b96213e781a1b8eec6982c1db8fac739af6e4c5a55862c03
-const deployParams = [];
-
-export {
-  abi,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/gavcoin.js b/js/src/dapps/chaindeploy/contracts/gavcoin.js
deleted file mode 100644
index f7518ef53f01441fef1e343cbc3d9663a00162db..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/gavcoin.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import abi from '~/contracts/abi/gavcoin';
-import { compiler, source as sourceUrl, output as byteCode } from './code/gavcoin';
-
-const isExternal = true;
-const id = 'gavcoin';
-const deployParams = [];
-
-export {
-  abi,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  isExternal,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/githubhint.js b/js/src/dapps/chaindeploy/contracts/githubhint.js
deleted file mode 100644
index 5198e38b5db9e8520ff3870d33c7698dfe74c55c..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/githubhint.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import abi from '~/contracts/abi/githubhint';
-import { compiler, source as sourceUrl, output as byteCode } from './code/githubhint';
-
-const id = 'githubhint';
-const deployParams = [];
-
-export {
-  abi,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/index.js b/js/src/dapps/chaindeploy/contracts/index.js
deleted file mode 100644
index 5e066f758c449e08f8a2fad3b0448d7309921824..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import * as badgereg from './badgereg';
-import * as dappreg from './dappreg';
-import * as gavcoin from './gavcoin';
-import * as githubhint from './githubhint';
-import * as jgvoting from './jg-voting';
-import * as registry from './registry';
-import * as signaturereg from './signaturereg';
-import * as tokendeployMgr from './tokendeployMgr';
-import * as tokendeployReg from './tokendeployReg';
-import * as tokenreg from './tokenreg';
-import * as verifyEmail from './verifyEmail';
-import * as verifySms from './verifySms';
-import * as wallet from './wallet';
-
-const contracts = [
-  // builtin
-  githubhint,
-  badgereg,
-  dappreg,
-  signaturereg,
-  tokenreg,
-  tokendeployReg,
-  tokendeployMgr,
-  verifyEmail,
-  verifySms,
-  wallet,
-
-  // external
-  gavcoin,
-  jgvoting
-];
-
-export {
-  contracts,
-  registry
-};
diff --git a/js/src/dapps/chaindeploy/contracts/jg-voting.js b/js/src/dapps/chaindeploy/contracts/jg-voting.js
deleted file mode 100644
index 8ffbed3c565bb0af593fce9d60ff16b42d58dff8..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/jg-voting.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import abi from './abi/jg-voting';
-import { compiler, source as sourceUrl, output as byteCode } from './code/jg-voting';
-
-const isExternal = true;
-const id = 'jg-voting';
-const deployParams = [];
-
-export {
-  abi,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  isExternal,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/registry.js b/js/src/dapps/chaindeploy/contracts/registry.js
deleted file mode 100644
index 1b44f4245ac737dab241fdf6ca8b26784a2c5bb4..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/registry.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import abi from '~/contracts/abi/registry2';
-import { compiler, source as sourceUrl, output as byteCode } from './code/registry';
-
-const id = 'registry';
-const deployParams = [];
-
-export {
-  abi,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/signaturereg.js b/js/src/dapps/chaindeploy/contracts/signaturereg.js
deleted file mode 100644
index 6d9f9bf609cbfd5b8a537fe60a88ed879ffa5417..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/signaturereg.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import abi from '~/contracts/abi/signaturereg';
-import { compiler, source as sourceUrl, output as byteCode } from './code/signaturereg';
-
-const id = 'signaturereg';
-const deployParams = [];
-
-export {
-  abi,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/tokendeployMgr.js b/js/src/dapps/chaindeploy/contracts/tokendeployMgr.js
deleted file mode 100644
index d07435fdddbda6842c8515dbae2bad5a5c6e01c8..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/tokendeployMgr.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import abi from '~/contracts/abi/basiccoinmanager';
-import { compiler, source as sourceUrl, output as byteCode } from './code/tokendeploy';
-
-const id = 'basiccoinmgr';
-const deployParams = [];
-
-export {
-  abi,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/tokendeployReg.js b/js/src/dapps/chaindeploy/contracts/tokendeployReg.js
deleted file mode 100644
index 1db07e91a50d494982e8c081dfcca35476716b71..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/tokendeployReg.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { abi, sourceUrl, deployParams, compiler, byteCode } from './tokenreg';
-
-const id = 'basiccoinreg';
-
-export {
-  abi,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/tokenreg.js b/js/src/dapps/chaindeploy/contracts/tokenreg.js
deleted file mode 100644
index 11ee29fa1f881c9e3bd7cfae1f77109a3fd8bb5c..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/tokenreg.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import abi from '~/contracts/abi/tokenreg';
-import { compiler, source as sourceUrl, output as byteCode } from './code/tokenreg';
-
-const id = 'tokenreg';
-const deployParams = [];
-
-export {
-  abi,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/verifyEmail.js b/js/src/dapps/chaindeploy/contracts/verifyEmail.js
deleted file mode 100644
index 0176d594954de0b3445c5bbcb95a34d0cd720758..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/verifyEmail.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import abi from '~/contracts/abi/email-verification';
-import { compiler, source as sourceUrl, output as byteCode } from './code/verifyEmail';
-
-const isBadge = true;
-const id = 'emailverification';
-const deployParams = [];
-const badgeSource = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/dapp-assets/c4721a87cb95375da91f8699438d8d7907b3f5e9/certifications/email-verification.svg',
-  imageHash: '0x5617a14da2a0c210939da6eafb734e60906f64a504c3e107812668860a752dc6'
-};
-
-export {
-  abi,
-  badgeSource,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  isBadge,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/verifySms.js b/js/src/dapps/chaindeploy/contracts/verifySms.js
deleted file mode 100644
index d7ea509022f90e8eddcd0922076f65aab044820e..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/verifySms.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import abi from '~/contracts/abi/sms-verification';
-import { compiler, source as sourceUrl, output as byteCode } from './code/verifySms';
-
-const isBadge = true;
-const id = 'smsverification';
-const deployParams = [];
-const badgeSource = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/dapp-assets/1b1beb57ab1f4d3a93a12711b233b5cded791a2f/certifications/sms-verification.svg',
-  imageHash: '0x49fa653c35c0a9ce128579883babd673ad4cfc94bf9f1cfe96a2bbc30a7552c6'
-};
-
-export {
-  abi,
-  badgeSource,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  isBadge,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/contracts/wallet.js b/js/src/dapps/chaindeploy/contracts/wallet.js
deleted file mode 100644
index 6639cba801716d00956b1ea689c8239b94425396..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/contracts/wallet.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { walletCompiler as compiler, walletLibrary as byteCode, walletLibraryABI as abiJson, walletLibraryRegKey as id, walletSource as sourceUrl } from '~/contracts/code/wallet';
-
-const abi = JSON.parse(abiJson);
-const deployParams = [];
-
-export {
-  abi,
-  byteCode,
-  compiler,
-  deployParams,
-  id,
-  sourceUrl
-};
diff --git a/js/src/dapps/chaindeploy/dapps/console.js b/js/src/dapps/chaindeploy/dapps/console.js
deleted file mode 100644
index 4e599b2faa3e2506d92479beefc7a75b96289d21..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/console.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import builtins from '~/views/Dapps/builtin.json';
-
-const id = 'console';
-const app = builtins.find((app) => app.url === id);
-const hashId = app.id;
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/console/3ea0dbfefded359ccdbea37bc4cf350c0aa16948/console.jpeg',
-  imageHash: '0xc3962e2eab7afaeb9cd11522381723afbafdc41dc7ba31bee472e187c4459e81'
-};
-const name = app.name;
-
-export {
-  hashId,
-  id,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/dapps/dappreg.js b/js/src/dapps/chaindeploy/dapps/dappreg.js
deleted file mode 100644
index fec35ef763170e0b270ab79f76f0c535ac4cf014..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/dappreg.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import builtins from '~/views/Dapps/builtin.json';
-
-const id = 'dappreg';
-const app = builtins.find((app) => app.url === id);
-const hashId = app.id;
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/dapp-assets/cdd6ac4f1e2f11619bed72a53ae71217dffe19ad/dapps/legos-64x64.png',
-  imageHash: '0xa8feea35c761cc6c2fe862fe336419f11ca5421f578757720a899b89fc1df154'
-};
-const name = app.name;
-
-export {
-  hashId,
-  id,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/dapps/gavcoin.js b/js/src/dapps/chaindeploy/dapps/gavcoin.js
deleted file mode 100644
index 148c6fb8ed04866eb6225bd4732030667515597c..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/gavcoin.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { api } from '../parity';
-
-const isExternal = true;
-const id = 'gavcoin';
-const hashId = api.util.sha3(id);
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/dapp-assets/9e135f76fe9ba61e2d8ccbd72ed144c26c450780/tokens/gavcoin-64x64.png',
-  imageHash: '0xd40679a3a234d8421c678d64f4df3308859e8ad07ac95ce4a228aceb96955287',
-  manifestUrl: 'https://raw.githubusercontent.com/gavofyork/gavcoin/eb2f8dc4d3ad4dd5f4562690525b7cfedc9681ba/manifest.json',
-  manifestHash: '0xd582c572fbef8015837f2c1a8798f2c3149a1d9d655b4020edb1bbece725371d',
-  contentUrl: {
-    repo: 'gavofyork/gavcoin',
-    commit: '0xeb2f8dc4d3ad4dd5f4562690525b7cfedc9681ba'
-  },
-  contentHash: '0x0b6c7b3fc8dad3edb39fd1465904ce9a11938ef18f08f8115f275047ba249530'
-};
-const name = 'GavCoin';
-
-export {
-  hashId,
-  id,
-  isExternal,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/dapps/githubhint.js b/js/src/dapps/chaindeploy/dapps/githubhint.js
deleted file mode 100644
index 49fb4be9cd1351d5af19dfed81db86dafa5aa309..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/githubhint.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import builtins from '~/views/Dapps/builtin.json';
-
-const id = 'githubhint';
-const app = builtins.find((app) => app.url === id);
-const hashId = app.id;
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/dapps/link-64x64.jpg',
-  imageHash: '0x6568901e711886e2c61eef1bbc7e2d8d37a27b9eb3e9e270eda8548f2ec796e8'
-};
-const name = app.name;
-
-export {
-  hashId,
-  id,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/dapps/index.js b/js/src/dapps/chaindeploy/dapps/index.js
deleted file mode 100644
index e95bf5648089806523bdf2e3aaa25aad157987d8..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import * as consolejs from './console';
-import * as dappreg from './dappreg';
-import * as gavcoin from './gavcoin';
-import * as githubhint from './githubhint';
-import * as jgvoting from './jg-voting';
-import * as jgwhenblock from './jg-whenblock';
-import * as localtx from './localtx';
-import * as registry from './registry';
-import * as signaturereg from './signaturereg';
-import * as tokendeploy from './tokendeploy';
-import * as tokenreg from './tokenreg';
-import * as web from './web';
-
-const apps = [
-  // builtin
-  consolejs,
-  dappreg,
-  githubhint,
-  localtx,
-  registry,
-  signaturereg,
-  tokendeploy,
-  tokenreg,
-  web,
-
-  // external
-  gavcoin,
-  jgvoting,
-  jgwhenblock
-];
-
-export {
-  apps
-};
diff --git a/js/src/dapps/chaindeploy/dapps/jg-voting.js b/js/src/dapps/chaindeploy/dapps/jg-voting.js
deleted file mode 100644
index 899e95894d25a38bcee3041b7a0816440359fb3f..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/jg-voting.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { api } from '../parity';
-
-const isExternal = true;
-const id = 'jg-voting';
-const hashId = api.util.sha3(id);
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/jacogr/dapp-voting/038ff4074544f2babc7aed9c4ac3dc070b85b804/assets/images/vote.jpg',
-  imageHash: '0x3620828e1a745d2714e9f37dc2d47cdab5ef9982190a845b5e7665b7a7767661',
-  manifestUrl: 'https://raw.githubusercontent.com/jacogr/dapp-voting/682f0fe4b86508a1a2487de6c7c61f7b100ba5b2/manifest.json',
-  manifestHash: '0x9b83e01f87d225e7bfdd305c51319504ff9b4cf8d517ca4b64f606762e72f59e',
-  contentUrl: {
-    repo: 'jacogr/dapp-voting',
-    commit: '0x7d941597e862a600a60b9d6ecd3a6f606d96cd7b'
-  },
-  contentHash: '0x9fcc0910f6a8c4e45715d41aea2d287da31bf1d7321003fc66df6a012ce2d753'
-};
-const name = 'Yes, No, Maybe';
-
-export {
-  hashId,
-  id,
-  isExternal,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/dapps/jg-whenblock.js b/js/src/dapps/chaindeploy/dapps/jg-whenblock.js
deleted file mode 100644
index 0005ca454a89473bd343efef0f7e63c5d03928d9..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/jg-whenblock.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const isExternal = true;
-const id = 'whenarewethere';
-const hashId = '0xfef3bfded03695e38a9ff476a0999e1fa421e72d1fb3b55a87d6c2bdb6fc18ef';
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/jacogr/dapp-when-are-we-there/167aa4d904c5aa6246d0d6d6f41c4ed8a56889cd/assets/images/clock.jpg',
-  imageHash: '0x2534b44f685b6399bf63f86679128216c43e9a58be1dfb58533923f0bcffeba7',
-  manifestUrl: 'https://raw.githubusercontent.com/jacogr/dapp-when-are-we-there/bf72dc3033711a3ab41bec3c1249638f70bae768/manifest.json',
-  manifestHash: '0xfe26f6a19ea9393d69bc5d8c73c5072ccf126f51c10c135b42d6bf162d774fd9',
-  contentUrl: {
-    repo: 'jacogr/dapp-when-are-we-there',
-    commit: '0xbf72dc3033711a3ab41bec3c1249638f70bae768'
-  },
-  contentHash: '0x3505cbbef5c2243eedba07d340d4abccfaa3cfb799f51827e33c9721a5254d13'
-};
-const name = 'When are we there';
-
-export {
-  hashId,
-  id,
-  isExternal,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/dapps/localtx.js b/js/src/dapps/chaindeploy/dapps/localtx.js
deleted file mode 100644
index 6fc275a134a6d8d6530787991803faf71bd62437..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/localtx.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import builtins from '~/views/Dapps/builtin.json';
-
-const id = 'localtx';
-const app = builtins.find((app) => app.url === id);
-const hashId = app.id;
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/dapp-assets/cdd6ac4f1e2f11619bed72a53ae71217dffe19ad/dapps/stack-64x64.png',
-  imageHash: '0x22b924801e1971659a51956dcdfc5a2d592d8bdd03780dd72d5bc4c84b595b4c'
-};
-const name = app.name;
-
-export {
-  hashId,
-  id,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/dapps/registry.js b/js/src/dapps/chaindeploy/dapps/registry.js
deleted file mode 100644
index 49ff4757bb73b21ea2bee3a7905962e4764ab36c..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/registry.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import builtins from '~/views/Dapps/builtin.json';
-
-const id = 'registry';
-const app = builtins.find((app) => app.url === id);
-const hashId = app.id;
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/dapps/register-64x64.jpg',
-  imageHash: '0xf7100024052cd78b5e043287c05392b5db0bfce5caedd6d39555d40283ef0a1c'
-};
-const name = app.name;
-
-export {
-  hashId,
-  id,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/dapps/signaturereg.js b/js/src/dapps/chaindeploy/dapps/signaturereg.js
deleted file mode 100644
index 12efcff3622759e63819f386d11db0a7cb6fd6d2..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/signaturereg.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import builtins from '~/views/Dapps/builtin.json';
-
-const id = 'signaturereg';
-const app = builtins.find((app) => app.url === id);
-const hashId = app.id;
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/dapps/hex-64x64.jpg',
-  imageHash: '0x26f7f2415cd5cbbffa58e8119fdbdd7181cac79119dd7f6ba6ee99d7f4445640'
-};
-const name = app.name;
-
-export {
-  hashId,
-  id,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/dapps/tokendeploy.js b/js/src/dapps/chaindeploy/dapps/tokendeploy.js
deleted file mode 100644
index 43ea8f22b0ef6c1353a00f5001f8c4a40ef2f352..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/tokendeploy.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import builtins from '~/views/Dapps/builtin.json';
-
-const id = 'tokendeploy';
-const app = builtins.find((app) => app.url === id);
-const hashId = app.id;
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/dapps/interlock-64x64.png',
-  imageHash: '0xde104baf02aec783e0bffc624514ee267dbcb455382375e3ffa715790c1c939f'
-};
-const name = app.name;
-
-export {
-  hashId,
-  id,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/dapps/tokenreg.js b/js/src/dapps/chaindeploy/dapps/tokenreg.js
deleted file mode 100644
index 784febba05b896604409537dd8177121f87c2baf..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/tokenreg.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import builtins from '~/views/Dapps/builtin.json';
-
-const id = 'tokenreg';
-const app = builtins.find((app) => app.url === id);
-const hashId = app.id;
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/dapps/coins-64x64.jpg',
-  imageHash: '0xe23d429d15de98c7878d92bc90b79c7afabe1b04c2ad5e3e2c89adc8f439edc9'
-};
-const name = app.name;
-
-export {
-  hashId,
-  id,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/dapps/web.js b/js/src/dapps/chaindeploy/dapps/web.js
deleted file mode 100644
index 0726e2bf71e5bab32e9ce2c2dc5e1b24cd0a9e53..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/dapps/web.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import builtins from '~/views/Dapps/builtin.json';
-
-const id = 'web';
-const app = builtins.find((app) => app.url === id);
-const hashId = app.id;
-const source = {
-  imageUrl: 'https://raw.githubusercontent.com/paritytech/dapp-assets/ec6138115d0e1f45258969cd90b3b274e0ff2258/dapps/earth-64x64.jpg',
-  imageHash: '0x0b9b62a9262f75461191d4e8bf686c56528cbc0fe885c1f5878052ca8b2f65bf'
-};
-const name = app.name;
-
-export {
-  hashId,
-  id,
-  name,
-  source
-};
diff --git a/js/src/dapps/chaindeploy/parity.js b/js/src/dapps/chaindeploy/parity.js
deleted file mode 100644
index 1dea0d696b4e72b51441b269c560d7316bf64784..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/parity.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const api = window.parity.api;
-
-export {
-  api
-};
diff --git a/js/src/dapps/chaindeploy/store.js b/js/src/dapps/chaindeploy/store.js
deleted file mode 100644
index 07b6931354555308b91579db947c7d3622da02f1..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/store.js
+++ /dev/null
@@ -1,714 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, observable } from 'mobx';
-
-import { contracts as contractsInfo, registry as registryInfo } from './contracts';
-import { apps } from './dapps';
-import { api } from './parity';
-import { executeContract, isValidNumber, validateCode } from './utils';
-
-export default class ContractsStore {
-  @observable apps = null;
-  @observable badges = null;
-  @observable contracts = null;
-  @observable error = null;
-  @observable registry = null;
-
-  constructor () {
-    this.apps = apps;
-    this.badges = contractsInfo.filter((contract) => contract.isBadge);
-    this.contracts = contractsInfo.filter((contract) => !contract.isBadge);
-    this.registry = registryInfo;
-
-    api.subscribe('eth_blockNumber', this.onNewBlockNumber);
-  }
-
-  @computed get contractBadgereg () {
-    return this.contracts.find((contract) => contract.id === 'badgereg');
-  }
-
-  @computed get contractDappreg () {
-    return this.contracts.find((contract) => contract.id === 'dappreg');
-  }
-
-  @computed get contractGithubhint () {
-    return this.contracts.find((contract) => contract.id === 'githubhint');
-  }
-
-  @computed get contractTokenreg () {
-    return this.contracts.find((contract) => contract.id === 'tokenreg');
-  }
-
-  @computed get isBadgeDeploying () {
-    return this.badges
-      .filter((contract) => contract.isDeploying)
-      .length !== 0;
-  }
-
-  @computed get isContractDeploying () {
-    return this.contracts
-      .filter((contract) => contract.isDeploying)
-      .length !== 0;
-  }
-
-  @computed get isDappDeploying () {
-    return this.apps
-      .filter((app) => app.isDeploying)
-      .length !== 0;
-  }
-
-  @computed get haveAllBadges () {
-    return this.badges
-      .filter((contract) => !contract.instance || !contract.hasLatestCode || !contract.badgeImageHash || !contract.badgeImageMatch || !contract.isBadgeRegistered)
-      .length === 0;
-  }
-
-  @computed get haveAllContracts () {
-    return this.contracts
-      .filter((contract) => !contract.instance || !contract.hasLatestCode)
-      .length === 0;
-  }
-
-  @computed get haveAllDapps () {
-    return this.apps
-      .filter((app) => {
-        return !app.isOnChain ||
-          !app.imageHash || !app.imageMatch ||
-          (app.source.contentHash && !app.contentMatch) ||
-          (app.source.manifestHash && !app.manifestMatch);
-      })
-      .length === 0;
-  }
-
-  @action refreshApps = () => {
-    this.apps = [].concat(this.apps.peek());
-  }
-
-  @action refreshContracts = () => {
-    this.badges = [].concat(this.badges.peek());
-    this.contracts = [].concat(this.contracts.peek());
-  }
-
-  @action setError = (error) => {
-    console.error(error);
-
-    this.error = error.message
-      ? error.message
-      : error;
-  }
-
-  @action setRegistryAddress = (address, isOnChain = false) => {
-    if (this.registry.address !== address || !this.registry.instance) {
-      console.log(`registry found at ${address}`);
-
-      this.registry = Object.assign({}, this.registry, {
-        address,
-        instance: api.newContract(this.registry.abi, address).instance,
-        isOnChain
-      });
-    }
-  }
-
-  @action setRegistryCode (byteCode) {
-    this.registry.hasLatestCode = validateCode(this.registry.byteCode, byteCode);
-  }
-
-  @action setRegistryDeploying = (isDeploying = false) => {
-    this.registry = Object.assign({}, this.registry, {
-      isDeploying,
-      status: isDeploying
-        ? 'Deploying contract'
-        : null
-    });
-  }
-
-  @action setBadgeId = (badge, badgeId) => {
-    badge.badgeId = badgeId;
-    badge.isBadgeRegistered = true;
-
-    this.refreshContracts();
-  }
-
-  @action setBadgeImageHash = (badge, imageHash) => {
-    badge.badgeImageHash = imageHash;
-    badge.badgeImageMatch = badge.badgeSource.imageHash === imageHash;
-
-    this.refreshContracts();
-  }
-
-  @action setContractAddress = (contract, address, isOnChain = false) => {
-    if (contract.address !== address || !contract.instance || contract.isOnChain !== isOnChain) {
-      console.log(`${contract.id} found at ${address}`);
-
-      contract.address = address;
-      contract.instance = api.newContract(contract.abi, address).instance;
-      contract.isOnChain = isOnChain;
-
-      this.refreshContracts();
-    }
-  }
-
-  @action setContractCode (contract, byteCode) {
-    contract.hasLatestCode = validateCode(contract.byteCode, byteCode);
-
-    this.refreshContracts();
-  }
-
-  @action setContractDeploying = (contract, isDeploying = false) => {
-    contract.isDeploying = isDeploying;
-    contract.status = isDeploying
-      ? 'Deploying contract'
-      : null;
-
-    this.refreshContracts();
-  }
-
-  @action setContractStatus = (contract, status) => {
-    contract.status = status;
-
-    this.refreshContracts();
-  }
-
-  @action setAppDeploying = (app, isDeploying = false) => {
-    app.isDeploying = isDeploying;
-    app.status = isDeploying
-      ? 'Registering app'
-      : null;
-
-    this.refreshApps();
-  }
-
-  @action setAppFound = (app, isOnChain = false) => {
-    if (app.isOnChain !== isOnChain) {
-      console.log(`${app.name} found on dappreg`);
-
-      app.isOnChain = isOnChain;
-
-      this.refreshApps();
-    }
-  }
-
-  @action setAppContentHash = (app, contentHash) => {
-    if (app.contentHash !== contentHash) {
-      console.log(`${app.name} has contentHash ${contentHash}`);
-
-      app.contentHash = contentHash;
-      app.contentMatch = contentHash === app.source.contentHash;
-
-      this.refreshApps();
-    }
-  }
-
-  @action setAppImageHash = (app, imageHash) => {
-    if (app.imageHash !== imageHash) {
-      console.log(`${app.name} has imageHash ${imageHash}`);
-
-      app.imageHash = imageHash;
-      app.imageMatch = imageHash === app.source.imageHash;
-
-      this.refreshApps();
-    }
-  }
-
-  @action setAppManifestHash = (app, manifestHash) => {
-    if (app.manifestHash !== manifestHash) {
-      console.log(`${app.name} has manifestHash ${manifestHash}`);
-
-      app.manifestHash = manifestHash;
-      app.manifestMatch = manifestHash === app.source.manifestHash;
-
-      this.refreshApps();
-    }
-  }
-
-  @action setAppStatus = (app, status) => {
-    console.log(app.id, status);
-
-    app.status = status;
-
-    this.refreshApps();
-  }
-
-  deployApp = (app) => {
-    console.log(`Registering application ${app.id}`);
-
-    this.setAppDeploying(app, true);
-
-    const options = {};
-    const values = [app.hashId];
-
-    return api.parity
-      .defaultAccount()
-      .then((defaultAccount) => {
-        options.from = defaultAccount;
-
-        if (app.isOnChain) {
-          return true;
-        }
-
-        return this.contractDappreg.instance
-          .fee.call({}, [])
-          .then((fee) => {
-            options.value = fee;
-
-            return executeContract(app.id, this.contractDappreg, 'register', options, values);
-          });
-      })
-      .then(() => {
-        if (app.imageHash && app.imageMatch) {
-          return true;
-        }
-
-        this.setAppStatus(app, 'Registering image url');
-
-        return this
-          .registerHash(app.source.imageHash, app.source.imageUrl, options.from)
-          .then(() => this.setAppMeta(app, 'IMG', app.source.imageHash, options.from));
-      })
-      .then(() => {
-        if (!app.source.manifestHash || app.manifestMatch) {
-          return true;
-        }
-
-        this.setAppStatus(app, 'Registering manifest url');
-
-        return this
-          .registerHash(app.source.manifestHash, app.source.manifestUrl, options.from)
-          .then(() => this.setAppMeta(app, 'MANIFEST', app.source.manifestHash, options.from));
-      })
-      .then(() => {
-        if (!app.source.contentHash || app.contentMatch) {
-          return true;
-        }
-
-        this.setAppStatus(app, 'Registering content url');
-
-        return this
-          .registerRepo(app.source.contentHash, app.source.contentUrl, options.from)
-          .then(() => this.setAppMeta(app, 'CONTENT', app.source.contentHash, options.from));
-      })
-      .catch(() => {
-        return null;
-      })
-      .then(() => {
-        this.setAppDeploying(app, false);
-      });
-  }
-
-  deployApps = () => {
-    this.apps
-      .filter((app) => {
-        return !app.isDeploying &&
-          (
-            !app.isOnChain ||
-            (!app.imageHash || !app.imageMatch) ||
-            (app.source.contentHash && !app.contentMatch) ||
-            (app.source.manifestHash && !app.manifestMatch)
-          );
-      })
-      .forEach(this.deployApp);
-  }
-
-  _deployContract = (contract) => {
-    console.log(`Deploying contract ${contract.id}`);
-
-    const options = {
-      data: contract.byteCode
-    };
-
-    return api.parity
-      .defaultAccount()
-      .then((defaultAccount) => {
-        options.from = defaultAccount;
-
-        return api
-          .newContract(contract.abi)
-          .deploy(options, contract.deployParams, (error, data) => {
-            if (error) {
-              console.error(contract.id, error);
-            } else {
-              console.log(contract.id, data);
-            }
-          })
-          .then((contractAddress) => {
-            return [contractAddress, defaultAccount];
-          });
-      });
-  }
-
-  deployContract = (contract) => {
-    if (contract.hasLatestCode) {
-      return Promise.resolve(false);
-    }
-
-    let defaultAccount = '0x0';
-
-    this.setContractDeploying(contract, true);
-
-    return this
-      ._deployContract(contract)
-      .then(([address, _defaultAccount]) => {
-        const isOnChain = contract.isOnChain;
-
-        defaultAccount = _defaultAccount;
-
-        this.setContractAddress(contract, address);
-
-        return isOnChain
-          ? true
-          : this.reserveAddress(contract, defaultAccount);
-      })
-      .then(() => {
-        return this.registerAddress(contract, defaultAccount);
-      })
-      .catch(() => {
-        return null;
-      })
-      .then(() => {
-        this.setContractDeploying(contract, false);
-      });
-  }
-
-  deployBadge = (badge) => {
-    let defaultAccount;
-
-    return this
-      .deployContract(badge)
-      .then(() => {
-        this.setContractDeploying(badge, true);
-
-        return api.parity.defaultAccount();
-      })
-      .then((_defaultAccount) => {
-        defaultAccount = _defaultAccount;
-
-        if (badge.isBadgeRegistered) {
-          return true;
-        }
-
-        this.setContractStatus(badge, 'Registering with badgereg');
-
-        return this.registerBadge(badge, defaultAccount);
-      })
-      .then(() => {
-        if (badge.badgeImageMatch) {
-          return true;
-        }
-
-        this.setContractStatus(badge, 'Registering image url');
-
-        return this
-          .registerHash(badge.badgeSource.imageHash, badge.badgeSource.imageUrl, defaultAccount)
-          .then(() => this.registerBadgeImage(badge, badge.badgeSource.imageHash, defaultAccount));
-      })
-      .then(() => {
-        this.setContractDeploying(badge, false);
-      });
-  }
-
-  deployContracts = () => {
-    this.contracts
-      .filter((contract) => !contract.isDeploying && (!contract.instance || !contract.hasLatestCode))
-      .forEach(this.deployContract);
-  }
-
-  deployBadges = () => {
-    this.badges
-      .filter((contract) => !contract.isDeploying && (!contract.instance || !contract.hasLatestCode || !contract.badgeImageHash || !contract.badgeImageMatch || !contract.isBadgeRegistered))
-      .forEach(this.deployBadge);
-  }
-
-  deployRegistry = () => {
-    this.setRegistryDeploying(true);
-
-    return this
-      ._deployContract(this.registry)
-      .then(([address]) => {
-        this.setRegistryDeploying(false);
-        this.setRegistryAddress(address);
-      });
-  }
-
-  registerBadge = (badge, fromAddress) => {
-    const options = {
-      from: fromAddress
-    };
-    const values = [badge.address, api.util.sha3.text(badge.id.toLowerCase())];
-
-    return this.contractBadgereg.instance
-      .fee.call({}, [])
-      .then((fee) => {
-        options.value = fee;
-
-        return executeContract(badge.id, this.contractBadgereg, 'register', options, values);
-      });
-  }
-
-  registerBadgeImage = (badge, hash, fromAddress) => {
-    const options = {
-      from: fromAddress
-    };
-    const values = [badge.badgeId, 'IMG', hash];
-
-    this.setContractStatus(badge, 'Setting meta IMG');
-
-    return executeContract(badge.id, this.contractBadgereg, 'setMeta', options, values);
-  }
-
-  setAppMeta = (app, key, meta, fromAddress) => {
-    const options = {
-      from: fromAddress
-    };
-    const values = [app.hashId, key, meta];
-
-    this.setAppStatus(app, `Setting meta ${key}`);
-
-    return executeContract(app.id, this.contractDappreg, 'setMeta', options, values);
-  }
-
-  reserveAddress = (contract, fromAddress) => {
-    const options = { from: fromAddress };
-    const values = [api.util.sha3.text(contract.id.toLowerCase())];
-
-    this.setContractStatus(contract, 'Reserving name');
-
-    return this.registry.instance
-      .fee.call({}, [])
-      .then((value) => {
-        options.value = value;
-
-        return executeContract(contract.id, this.registry, 'reserve', options, values);
-      });
-  }
-
-  registerAddress = (contract, fromAddress) => {
-    const options = { from: fromAddress };
-    const values = [api.util.sha3.text(contract.id.toLowerCase()), 'A', contract.address];
-
-    this.setContractStatus(contract, 'Setting lookup address');
-
-    return executeContract(contract.id, this.registry, 'setAddress', options, values);
-  }
-
-  registerRepo = (hash, content, fromAddress) => {
-    const options = {
-      from: fromAddress
-    };
-    const values = [hash, content.repo || content, content.commit || 0];
-
-    return this.contractGithubhint.instance
-      .entries.call({}, [hash])
-      .then(([imageUrl, commit, owner]) => {
-        if (isValidNumber(owner)) {
-          return true;
-        }
-
-        return executeContract(hash, this.contractGithubhint, 'hint', options, values);
-      })
-      .catch(() => false);
-  }
-
-  registerHash = (hash, url, fromAddress) => {
-    const options = {
-      from: fromAddress
-    };
-    const values = [hash, url];
-
-    return this.contractGithubhint.instance
-      .entries.call({}, [hash])
-      .then(([imageUrl, commit, owner]) => {
-        if (isValidNumber(owner)) {
-          return true;
-        }
-
-        return executeContract(hash, this.contractGithubhint, 'hintURL', options, values);
-      })
-      .catch(() => false);
-  }
-
-  findRegistry = () => {
-    if (this.registry.address && this.registry.hasLatestCode) {
-      return Promise.resolve(this.registry);
-    }
-
-    return api.parity
-      .registryAddress()
-      .then((address) => {
-        if (isValidNumber(address)) {
-          this.setRegistryAddress(address, true);
-        }
-
-        return api.eth.getCode(address);
-      })
-      .then((byteCode) => {
-        this.setRegistryCode(byteCode);
-      });
-  }
-
-  findApps = () => {
-    if (!this.contractDappreg.instance) {
-      return Promise.resolve(false);
-    }
-
-    return Promise
-      .all(
-        this.apps.map((app) => {
-          return app.isOnChain
-            ? Promise.resolve([[0]])
-            : this.contractDappreg.instance.get.call({}, [app.hashId]);
-        })
-      )
-      .then((apps) => {
-        apps.forEach(([_id, owner], index) => {
-          const id = api.util.bytesToHex(_id);
-
-          if (isValidNumber(id)) {
-            this.setAppFound(this.apps[index], true);
-          }
-        });
-
-        return Promise.all(
-          this.apps.map((app) => {
-            return !app.isOnChain || (app.imageHash && app.imageMatch)
-              ? Promise.resolve([[0], [0], [0]])
-              : Promise.all([
-                this.contractDappreg.instance.meta.call({}, [app.hashId, 'CONTENT']),
-                this.contractDappreg.instance.meta.call({}, [app.hashId, 'IMG']),
-                this.contractDappreg.instance.meta.call({}, [app.hashId, 'MANIFEST'])
-              ]);
-          })
-        );
-      })
-      .then((hashes) => {
-        hashes.forEach(([content, image, manifest], index) => {
-          const contentHash = api.util.bytesToHex(content);
-          const imageHash = api.util.bytesToHex(image);
-          const manifestHash = api.util.bytesToHex(manifest);
-
-          if (isValidNumber(contentHash)) {
-            this.setAppContentHash(this.apps[index], contentHash);
-          }
-
-          if (isValidNumber(imageHash)) {
-            this.setAppImageHash(this.apps[index], imageHash);
-          }
-
-          if (isValidNumber(manifestHash)) {
-            this.setAppManifestHash(this.apps[index], manifestHash);
-          }
-        });
-      });
-  }
-
-  findBadges = () => {
-    if (!this.contractBadgereg.instance) {
-      return Promise.resolve(false);
-    }
-
-    return this
-      .findContracts(this.badges)
-      .then(() => {
-        return Promise.all(
-          this.badges.map((badge) => {
-            return badge.isBadgeRegistered
-              ? Promise.resolve([0, 0, 0])
-              : this.contractBadgereg.instance.fromAddress.call({}, [badge.address]);
-          })
-        );
-      })
-      .then((badgeInfos) => {
-        badgeInfos.forEach(([id, name, owner], index) => {
-          if (isValidNumber(owner)) {
-            this.setBadgeId(this.badges[index], id);
-          }
-        });
-
-        return Promise
-          .all(
-            this.badges.map((badge) => {
-              return !badge.isBadgeRegistered
-                ? Promise.resolve([0])
-                : this.contractBadgereg.instance.meta.call({}, [badge.badgeId, 'IMG']);
-            })
-          );
-      })
-      .then((images) => {
-        images.forEach((imageBytes, index) => {
-          const imageHash = api.util.bytesToHex(imageBytes);
-
-          if (isValidNumber(imageHash)) {
-            this.setBadgeImageHash(this.badges[index], imageHash);
-          }
-        });
-      });
-  }
-
-  findContracts = (contracts = this.contracts) => {
-    if (!this.registry.instance) {
-      return Promise.resolve(false);
-    }
-
-    return Promise
-      .all(
-        contracts.map((contract) => {
-          const hashId = api.util.sha3.text(contract.id.toLowerCase());
-
-          return contract.isOnChain
-            ? Promise.resolve([0, 0])
-            : Promise.all([
-              this.registry.instance.getAddress.call({}, [hashId, 'A']),
-              this.registry.instance.getOwner.call({}, [hashId])
-            ]);
-        })
-      )
-      .then((addresses) => {
-        addresses.forEach(([address, owner], index) => {
-          if (isValidNumber(owner) && isValidNumber(address)) {
-            this.setContractAddress(contracts[index], address, true);
-          }
-        });
-
-        return Promise.all(
-          contracts.map((contract) => {
-            return !contract.address || contract.hasLatestCode
-              ? Promise.resolve(null)
-              : api.eth.getCode(contract.address);
-          })
-        );
-      })
-      .then((codes) => {
-        codes.forEach((byteCode, index) => {
-          if (byteCode) {
-            this.setContractCode(contracts[index], byteCode);
-          }
-        });
-      });
-  }
-
-  onNewBlockNumber = (error, blockNumber) => {
-    if (error) {
-      return;
-    }
-
-    return this
-      .findRegistry()
-      .then(this.findContracts)
-      .then(this.findApps)
-      .then(this.findBadges)
-      .catch(this.setError);
-  }
-}
diff --git a/js/src/dapps/chaindeploy/utils.js b/js/src/dapps/chaindeploy/utils.js
deleted file mode 100644
index 87e7279e33fd6d9eab3ca0a82a42fbd0928ee44e..0000000000000000000000000000000000000000
--- a/js/src/dapps/chaindeploy/utils.js
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import { api } from './parity';
-
-export function validateCode (source, retrieved) {
-  const original = source.substr(12);
-  const bytecode = retrieved.substr(12);
-
-  const knownHash = api.util.sha3(original.slice(-1 * bytecode.length));
-  const codeHash = api.util.sha3(bytecode);
-
-  return knownHash === codeHash;
-}
-
-export function isValidNumber (number) {
-  return number && !(new BigNumber(number)).isZero();
-}
-
-export function executeContract (logId, contract, funcName, options, values) {
-  const func = contract.instance[funcName];
-
-  return func
-    .estimateGas(options, values)
-    .then((gasEst) => {
-      options.gas = gasEst.mul(1.2);
-
-      return trackRequest(
-        func.postTransaction(options, values),
-        (error, data) => {
-          if (error) {
-            console.error(logId, error);
-          } else {
-            console.log(logId, data);
-          }
-        }
-      );
-    });
-}
-
-export function trackRequest (promise, callback) {
-  return promise
-    .then((requestId) => {
-      callback(null, { state: 'checkRequest', requestId });
-
-      return api.pollMethod('parity_checkRequest', requestId);
-    })
-    .then((txHash) => {
-      callback(null, { state: 'getTransactionReceipt', txHash });
-
-      return api.pollMethod('eth_getTransactionReceipt', txHash, (receipt) => {
-        if (!receipt || !receipt.blockNumber || receipt.blockNumber.eq(0)) {
-          return false;
-        }
-
-        return true;
-      });
-    })
-    .then((receipt) => {
-      callback(null, { state: 'hasReceipt', receipt });
-    })
-    .catch((error) => {
-      callback(error);
-
-      throw error;
-    });
-}
diff --git a/js/src/dapps/console.js b/js/src/dapps/console.js
deleted file mode 100644
index 44b6dcb9c4dd7df4270e03cb8306cb3575c32feb..0000000000000000000000000000000000000000
--- a/js/src/dapps/console.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { AppContainer } from 'react-hot-loader';
-
-import 'codemirror/addon/dialog/dialog';
-import 'codemirror/addon/dialog/dialog.css';
-import 'codemirror/addon/hint/javascript-hint';
-import 'codemirror/addon/hint/show-hint';
-import 'codemirror/addon/hint/show-hint.css';
-import 'codemirror/addon/search/match-highlighter';
-import 'codemirror/addon/search/search';
-import 'codemirror/addon/search/searchcursor';
-import 'codemirror/keymap/sublime';
-import 'codemirror/lib/codemirror.css';
-import 'codemirror/mode/javascript/javascript';
-// Custom codemirror style
-import './console/codemirror.css';
-
-import Application from './console/Application';
-
-import '../../assets/fonts/Roboto/font.css';
-import '../../assets/fonts/RobotoMono/font.css';
-import './style.css';
-
-ReactDOM.render(
-  <AppContainer>
-    <Application />
-  </AppContainer>,
-  document.querySelector('#container')
-);
-
-if (module.hot) {
-  module.hot.accept('./console/Application/index.js', () => {
-    require('./console/Application/index.js');
-
-    ReactDOM.render(
-      <AppContainer>
-        <Application />
-      </AppContainer>,
-      document.querySelector('#container')
-    );
-  });
-}
diff --git a/js/src/dapps/console/Application/application.css b/js/src/dapps/console/Application/application.css
deleted file mode 100644
index eea2c030db3db07e19f74482d5202c56b5442954..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Application/application.css
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.app {
-  display: flex;
-  flex-direction: column;
-  font-family: Arial, sans-serif;
-  font-size: 11px;
-  height: 100vh;
-  overflow: hidden;
-}
-
-textarea,
-input {
-  font-family: dejavu sans mono, monospace;
-  outline: none;
-}
-
-code,
-pre {
-  font-family: dejavu sans mono, monospace;
-  font-size: 11px;
-}
-
-.header {
-  flex: 0 0 auto;
-}
-
-.view {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-}
-
-.eval {
-  flex: 0 1 auto;
-  font-family: dejavu sans mono, monospace;
-  overflow: auto;
-}
-
-.input {
-  border-top: 1px solid #eee;
-  display: flex;
-  flex: 1 1 auto;
-  min-height: 50px;
-}
-
-.status {
-  flex: 0 0 auto;
-  font-family: dejavu sans mono, monospace;
-}
diff --git a/js/src/dapps/console/Application/application.js b/js/src/dapps/console/Application/application.js
deleted file mode 100644
index 5a591e710a882c0c60e8ec3f2b21703266abcba3..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Application/application.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-
-import { api } from '../parity';
-
-import Console from '../Console';
-import Header from '../Header';
-import Input from '../Input';
-import Settings from '../Settings';
-import Snippets from '../Snippets';
-import Watches from '../Watches';
-
-import ApplicationStore from './application.store';
-import WatchesStore from '../Watches/watches.store';
-
-import styles from './application.css';
-
-@observer
-export default class Application extends Component {
-  application = ApplicationStore.get();
-  watches = WatchesStore.get();
-
-  componentWillMount () {
-    this.watches.add('time', () => new Date());
-    this.watches.add('blockNumber', api.eth.blockNumber, api);
-  }
-
-  render () {
-    return (
-      <div className={ styles.app }>
-        <div className={ styles.header }>
-          <Header />
-        </div>
-
-        { this.renderView() }
-
-        <div className={ styles.status }>
-          <Watches />
-        </div>
-      </div>
-    );
-  }
-
-  renderView () {
-    const { view } = this.application;
-
-    if (view === 'console') {
-      return (
-        <div className={ styles.view }>
-          <div className={ styles.eval }>
-            <Console />
-          </div>
-          <div className={ styles.input }>
-            <Input />
-          </div>
-        </div>
-      );
-    }
-
-    if (view === 'settings') {
-      return (
-        <div className={ styles.view }>
-          <Settings />
-        </div>
-      );
-    }
-
-    if (view === 'snippets') {
-      return (
-        <div className={ styles.view }>
-          <Snippets />
-        </div>
-      );
-    }
-
-    return null;
-  }
-}
diff --git a/js/src/dapps/console/Application/application.store.js b/js/src/dapps/console/Application/application.store.js
deleted file mode 100644
index c10be46c66404d1dd96361c6d0fa1cf5174ce2c5..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Application/application.store.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-
-let instance;
-
-export default class ApplicationStore {
-  @observable view = this.views[0].id;
-
-  views = [
-    { label: 'Console', id: 'console' },
-    { label: 'Snippets', id: 'snippets' },
-    { label: 'Settings', id: 'settings' }
-  ];
-
-  static get () {
-    if (!instance) {
-      instance = new ApplicationStore();
-    }
-
-    return instance;
-  }
-
-  @action
-  setView (view) {
-    this.view = view;
-  }
-}
diff --git a/js/src/dapps/console/Application/index.js b/js/src/dapps/console/Application/index.js
deleted file mode 100644
index 3d8d1ca3b851e5bfed73373e82eff06b5d9ea46c..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Application/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './application';
diff --git a/js/src/dapps/console/Autocomplete/autocomplete.css b/js/src/dapps/console/Autocomplete/autocomplete.css
deleted file mode 100644
index 8d4585e7a7ca86800e6f531d7598995960fe3c48..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Autocomplete/autocomplete.css
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  background: #f8f8f8;
-  box-shadow: 0 0.125em 0.25em rgba(0, 0, 0, 0.5);
-  font-family: dejavu sans mono, monospace;
-  left: 20px;
-  position: absolute;
-  max-height: 300px;
-  overflow: auto;
-}
-
-.item {
-  background-color: white;
-  padding: 0.25em 0.25em 0.25em 0.35em;
-  display: flex;
-  justify-content: space-between;
-
-  &.selected {
-    background-color: rgb(64, 115, 244);
-
-    &,
-    .proto {
-      color: white;
-    }
-  }
-
-  &:hover {
-    cursor: default;
-  }
-
-  &:hover:not(.selected) {
-    background-color: rgb(230, 236, 255);
-  }
-
-  .proto {
-    color: gray;
-    margin-left: 1em;
-  }
-}
diff --git a/js/src/dapps/console/Autocomplete/autocomplete.js b/js/src/dapps/console/Autocomplete/autocomplete.js
deleted file mode 100644
index e2938f23dc457ef9fe87d8a5b60dd097c14254d4..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Autocomplete/autocomplete.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-import ReactDOM from 'react-dom';
-
-import AutocompleteStore from './autocomplete.store';
-
-import styles from './autocomplete.css';
-
-@observer
-export default class Autocomplete extends Component {
-  autocompleteStore = AutocompleteStore.get();
-
-  render () {
-    if (!this.autocompleteStore.show) {
-      return null;
-    }
-
-    return (
-      <div
-        className={ styles.container }
-        style={ this.autocompleteStore.position }
-      >
-        { this.renderAutocompletes() }
-      </div>
-    );
-  }
-
-  renderAutocompletes () {
-    const { selected, values } = this.autocompleteStore;
-    const displayedProto = {};
-
-    return values.map((autocomplete, index) => {
-      const { name, prototypeName } = autocomplete;
-      const onClick = () => this.handleClick(index);
-      const setRef = (node) => this.setRef(index, node);
-
-      const proto = !displayedProto[prototypeName]
-        ? (
-          <span className={ styles.proto }>
-            { prototypeName }
-          </span>
-        )
-        : null;
-
-      if (!displayedProto[prototypeName]) {
-        displayedProto[prototypeName] = true;
-      }
-
-      const classes = [ styles.item ];
-
-      if (index === selected) {
-        classes.push(styles.selected);
-      }
-
-      return (
-        <div
-          className={ classes.join(' ') }
-          key={ index }
-          onClick={ onClick }
-          ref={ setRef }
-        >
-          <span>
-            { name }
-          </span>
-          { proto }
-        </div>
-      );
-    });
-  }
-
-  handleClick = (index) => {
-    this.autocompleteStore.select(index);
-  };
-
-  setRef = (index, node) => {
-    const element = ReactDOM.findDOMNode(node);
-
-    this.autocompleteStore.setElement(index, element);
-  };
-}
diff --git a/js/src/dapps/console/Autocomplete/autocomplete.store.js b/js/src/dapps/console/Autocomplete/autocomplete.store.js
deleted file mode 100644
index 82ff2f24dc8e1c27312ce0bedb32e0d79e620e8d..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Autocomplete/autocomplete.store.js
+++ /dev/null
@@ -1,234 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-
-import { evaluate } from '../utils';
-
-let instance;
-
-export default class AutocompleteStore {
-  @observable values = [];
-  @observable position = {};
-  @observable show = false;
-  @observable selected = null;
-
-  elements = {};
-  inputNode = null;
-  lastObject = null;
-  lastObjectPropertyNames = [];
-
-  static get () {
-    if (!instance) {
-      instance = new AutocompleteStore();
-    }
-
-    return instance;
-  }
-
-  get hasSelected () {
-    return this.selected !== null;
-  }
-
-  clearCache () {
-    this.lastObject = null;
-    this.lastObjectPropertyNames = null;
-  }
-
-  @action
-  focus (offset = 1) {
-    if (this.values.length === 0) {
-      this.selected = null;
-      return;
-    }
-
-    this.selected = this.selected === null
-      ? (
-        offset === 1
-          ? 0
-          : this.values.length - 1
-      )
-      : (this.values.length + this.selected + offset) % (this.values.length);
-
-    if (this.isVisible(this.selected)) {
-      return;
-    }
-
-    const element = this.elements[this.selected];
-
-    if (!element) {
-      return;
-    }
-
-    element.scrollIntoView(offset === -1);
-  }
-
-  focusOnInput () {
-    if (!this.inputNode) {
-      return;
-    }
-
-    this.inputNode.focus();
-  }
-
-  @action
-  hide () {
-    this.show = false;
-    this.selected = null;
-  }
-
-  isVisible (index) {
-    const element = this.elements[index];
-
-    if (!element) {
-      return false;
-    }
-
-    const eBoundings = element.getBoundingClientRect();
-    const pBoundings = element.parentElement.getBoundingClientRect();
-
-    if (eBoundings.top < pBoundings.top || eBoundings.bottom > pBoundings.bottom) {
-      return false;
-    }
-
-    return true;
-  }
-
-  select (inputStore, _index = this.selected) {
-    const index = _index === null
-      ? 0
-      : _index;
-
-    if (!this.values[index]) {
-      console.warn(`autocomplete::select has been called on AutocompleteStore with wrong value ${index}`);
-      return;
-    }
-
-    const { name } = this.values[index];
-    const { input } = inputStore;
-    const objects = input.split('.');
-
-    objects[objects.length - 1] = name;
-    const nextInput = objects.join('.');
-
-    this.hide();
-    this.focusOnInput();
-    return inputStore.updateInput(nextInput, false);
-  }
-
-  setElement (index, element) {
-    this.elements[index] = element;
-  }
-
-  setInputNode (node) {
-    this.inputNode = node;
-  }
-
-  @action
-  setPosition () {
-    if (!this.inputNode) {
-      return;
-    }
-
-    const inputBoundings = this.inputNode.getBoundingClientRect();
-    const bodyBoundings = document.body.getBoundingClientRect();
-
-    // display on bottom of input
-    if (inputBoundings.top < bodyBoundings.height / 2) {
-      const nextPosition = {
-        top: 20
-      };
-
-      this.position = nextPosition;
-      return;
-    }
-
-    // display on top of input
-    const nextPosition = {
-      bottom: inputBoundings.height
-    };
-
-    this.position = nextPosition;
-    return;
-  }
-
-  @action
-  setValues (values) {
-    this.values = values;
-    this.selected = null;
-    const show = values.length > 0;
-
-    // Reveal autocomplete
-    if (!this.show && show) {
-      this.setPosition();
-    }
-
-    this.show = show;
-  }
-
-  update (input) {
-    if (input.length === 0) {
-      return this.setValues([]);
-    }
-
-    const objects = input.split('.');
-    const suffix = objects.pop().toLowerCase();
-    const prefix = objects.join('.');
-    const object = prefix.length > 0
-      ? prefix
-      : 'window';
-
-    if (object !== this.lastObject) {
-      const evalResult = evaluate(object);
-
-      if (evalResult.error) {
-        this.lastObjectProperties = [];
-      } else {
-        this.lastObjectProperties = getAllProperties(evalResult.result);
-      }
-
-      this.lastObject = object;
-    }
-
-    const autocompletes = this.lastObjectProperties.filter((property) => {
-      return property.name.toLowerCase().includes(suffix);
-    });
-
-    return this.setValues(autocompletes);
-  }
-}
-
-function getAllProperties (object) {
-  const propertyNames = {};
-
-  while (object) {
-    const prototypeName = object && object.constructor && object.constructor.name || '';
-
-    Object.getOwnPropertyNames(object)
-      .sort()
-      .forEach((name) => {
-        if (Object.prototype.hasOwnProperty.call(propertyNames, name)) {
-          return;
-        }
-
-        propertyNames[name] = { name, prototypeName };
-      });
-
-    object = Object.getPrototypeOf(object);
-  }
-
-  return Object.values(propertyNames);
-}
diff --git a/js/src/dapps/console/Autocomplete/index.js b/js/src/dapps/console/Autocomplete/index.js
deleted file mode 100644
index 5761be0e3ed50cb72fa427bf953c240a2de1bf80..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Autocomplete/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './autocomplete';
diff --git a/js/src/dapps/console/Console/console.css b/js/src/dapps/console/Console/console.css
deleted file mode 100644
index a0b3db4ff36d9a2e2cb26e6268aadacdfa4e53a6..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Console/console.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.result {
-  border-top: 1px solid #eee;
-  display: flex;
-  font-family: dejavu sans mono, monospace;
-  padding: 0.35em 0.25em;
-
-  &.error {
-    background-color: hsl(0, 100%, 97%);
-
-    .text {
-      color: red;
-    }
-  }
-
-  &.warn {
-    background-color: hsl(50, 100%, 95%);
-  }
-}
-
-.type {
-  font-weight: bold !important;
-  font-size: 8pt;
-  padding: 0 0.5em 0 0.25em;
-}
-
-.time {
-  color: gray;
-  padding: 0 1em 0 0.5em;
-}
-
-.token {
-  white-space: pre-wrap;
-}
-
-.text {
-  display: flex;
-}
-
-.text .token:not(:first-child) {
-  margin-left: 0.5em;
-}
diff --git a/js/src/dapps/console/Console/console.js b/js/src/dapps/console/Console/console.js
deleted file mode 100644
index 75f9713a6661248f5b8ead2211a2a9d4453477c1..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Console/console.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-import ReactDOM from 'react-dom';
-import { ObjectInspector } from 'react-inspector';
-
-import ConsoleStore from './console.store';
-import SettingsStore from '../Settings/settings.store';
-
-import styles from './console.css';
-
-const ICONS = {
-  debug: '&nbsp;',
-  error: '✖',
-  info: 'ℹ',
-  input: '&gt;',
-  log: '&nbsp;',
-  result: '&lt;',
-  warn: '⚠'
-};
-
-@observer
-export default class Console extends Component {
-  consoleStore = ConsoleStore.get();
-  settingsStore = SettingsStore.get();
-
-  render () {
-    return (
-      <div ref={ this.setRef }>
-        { this.renderResults() }
-      </div>
-    );
-  }
-
-  renderResults () {
-    const { logs } = this.consoleStore;
-
-    return logs.map((data, index) => {
-      const { type, timestamp } = data;
-      const values = this.consoleStore.logValues[index];
-      const classes = [ styles.result, styles[type] ];
-
-      return (
-        <div
-          className={ classes.join(' ') }
-          key={ index }
-        >
-          <span
-            className={ styles.type }
-            dangerouslySetInnerHTML={ { __html: ICONS[type] || '' } }
-          />
-          { this.renderTimestamp(timestamp) }
-          <span className={ styles.text }>
-            {
-              values.map((value, valueIndex) => (
-                <span
-                  className={ styles.token }
-                  key={ valueIndex }
-                >
-                  { this.toString(value) }
-                </span>
-              ))
-            }
-          </span>
-        </div>
-      );
-    });
-  }
-
-  renderTimestamp (timestamp) {
-    const { displayTimestamps } = this.settingsStore;
-
-    if (!displayTimestamps) {
-      return null;
-    }
-
-    return (
-      <span className={ styles.time }>
-        { new Date(timestamp).toISOString().slice(11, 23) }
-      </span>
-    );
-  }
-
-  setRef = (node) => {
-    const element = ReactDOM.findDOMNode(node);
-
-    this.consoleStore.setNode(element);
-  };
-
-  toString (value) {
-    if (typeof value === 'string') {
-      return value;
-    }
-
-    if (value instanceof Error) {
-      return value.toString();
-    }
-
-    return (
-      <ObjectInspector data={ value } />
-    );
-  }
-}
diff --git a/js/src/dapps/console/Console/console.store.js b/js/src/dapps/console/Console/console.store.js
deleted file mode 100644
index dc2fc6db4cac53fd26c31abc67e82f52559d3556..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Console/console.store.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-
-import AutocompleteStore from '../Autocomplete/autocomplete.store';
-import { evaluate } from '../utils';
-
-let instance;
-
-export default class ConsoleStore {
-  @observable logs = [];
-
-  autocompleteStore = AutocompleteStore.get();
-  logValues = [];
-  node = null;
-
-  constructor () {
-    this.attachConsole();
-  }
-
-  static get () {
-    if (!instance) {
-      instance = new ConsoleStore();
-    }
-
-    return instance;
-  }
-
-  attachConsole () {
-    ['debug', 'error', 'info', 'log', 'warn'].forEach((level) => {
-      const old = window.console[level].bind(window.console);
-
-      window.console[level] = (...args) => {
-        old(...args);
-        this.log({ type: level, values: args });
-      };
-    });
-  }
-
-  @action
-  clear () {
-    this.logs = [];
-    this.logValues = [];
-  }
-
-  evaluate (input) {
-    this.log({ type: 'input', value: input });
-
-    setTimeout(() => {
-      const { result, error } = evaluate(input);
-      let value = error || result;
-      const type = error
-        ? 'error'
-        : 'result';
-
-      if (typeof value === 'string') {
-        value = `"${value}"`;
-      }
-
-      if (value && typeof value === 'object' && typeof value.then === 'function') {
-        return value
-          .then((result) => {
-            this.log({ type: 'result', value: result });
-          })
-          .catch((error) => {
-            this.log({ type: 'error', value: error });
-          });
-      }
-
-      this.log({ type, value });
-    });
-  }
-
-  @action
-  log ({ type, value, values }) {
-    this.logs.push({
-      type,
-      timestamp: Date.now()
-    });
-
-    if (values) {
-      this.logValues.push(values);
-    } else {
-      this.logValues.push([ value ]);
-    }
-
-    this.autocompleteStore.setPosition();
-    this.scroll();
-  }
-
-  setNode (node) {
-    this.node = node;
-    this.scroll();
-  }
-
-  scroll () {
-    if (!this.node) {
-      return;
-    }
-
-    setTimeout(() => {
-      if (this.node.children.length === 0) {
-        return;
-      }
-
-      // Scroll to the last child
-      this.node
-        .children[this.node.children.length - 1]
-        .scrollIntoView(false);
-    }, 50);
-  }
-}
diff --git a/js/src/dapps/console/Console/index.js b/js/src/dapps/console/Console/index.js
deleted file mode 100644
index 2956b330fe4e777e1a44304040d6b6b1324c8f16..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Console/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './console';
diff --git a/js/src/dapps/console/Header/header.css b/js/src/dapps/console/Header/header.css
deleted file mode 100644
index 116de6b8c91c8c4d285a1bf56ba5ec0cf8c107e9..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Header/header.css
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  background-color: #f3f3f3;
-  border-bottom: 1px solid #ccc;
-  font-size: 12px;
-  padding: 0 0.5em;
-}
-
-.tabs {
-  display: flex;
-}
-
-.tab {
-  align-items: center;
-  box-sizing: border-box;
-  border: 1px solid transparent;
-  color: #333;
-  cursor: default;
-  display: flex;
-  height: 24px;
-  line-height: 15px;
-  margin-top: 2px;
-  padding: 2px 6px 2px 4px;
-
-  &:hover,
-  &.active:hover {
-    background-color: #e5e5e5;
-  }
-
-  &.active {
-    background-color: white;
-    border: 1px solid #ccc;
-    border-bottom: none;
-  }
-}
diff --git a/js/src/dapps/console/Header/header.js b/js/src/dapps/console/Header/header.js
deleted file mode 100644
index c422b825604f9381d9797cac505e734107dbe693..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Header/header.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-
-import ApplicationStore from '../Application/application.store';
-
-import styles from './header.css';
-
-@observer
-export default class Header extends Component {
-  application = ApplicationStore.get();
-
-  render () {
-    return (
-      <div className={ styles.container }>
-        <div className={ styles.tabs }>
-          { this.renderTabs() }
-        </div>
-      </div>
-    );
-  }
-
-  renderTabs () {
-    const { view } = this.application;
-
-    return this.application.views.map((tab) => {
-      const { label, id } = tab;
-      const classes = [ styles.tab ];
-      const onClick = () => this.handleClickTab(id);
-
-      if (id === view) {
-        classes.push(styles.active);
-      }
-
-      return (
-        <div
-          className={ classes.join(' ') }
-          key={ id }
-          onClick={ onClick }
-        >
-          { label }
-        </div>
-      );
-    });
-  }
-
-  handleClickTab = (id) => {
-    this.application.setView(id);
-  };
-}
diff --git a/js/src/dapps/console/Header/index.js b/js/src/dapps/console/Header/index.js
deleted file mode 100644
index aef90266f940a3c7f8915c7ba910b62bec54317c..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Header/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './header';
diff --git a/js/src/dapps/console/Input/index.js b/js/src/dapps/console/Input/index.js
deleted file mode 100644
index 29e00f72b19f9481ced013481cbec51dc551898c..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Input/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './input';
diff --git a/js/src/dapps/console/Input/input.css b/js/src/dapps/console/Input/input.css
deleted file mode 100644
index 7b0c2306e48610966ee5a07638c1ad0fc9c45c51..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Input/input.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.type {
-  color: #59f;
-  font-weight: bold !important;
-  font-size: 11px;
-  padding: 0 0.5em 0 0.25em;
-}
-
-.inputContainer {
-  flex: 1;
-}
-
-.input {
-  border: 0;
-  margin: 0;
-  padding: 0;
-  color: black;
-  height: 100%;
-  font-size: 11px;
-  resize: none;
-  width: 100%;
-}
-
-.container {
-  border-top: 1px solid lightgray;
-  display: flex;
-  flex: 1;
-  padding: 0.25em;
-  position: relative;
-}
diff --git a/js/src/dapps/console/Input/input.js b/js/src/dapps/console/Input/input.js
deleted file mode 100644
index 3263aff38487ef50c0fd84fe456611c2e981ff6f..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Input/input.js
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import keycode from 'keycode';
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-import ReactDOM from 'react-dom';
-
-import Autocomplete from '../Autocomplete';
-
-import AutocompleteStore from '../Autocomplete/autocomplete.store';
-import ConsoleStore from '../Console/console.store';
-import InputStore from './input.store';
-import SettingsStore from '../Settings/settings.store';
-
-import styles from './input.css';
-
-@observer
-export default class Input extends Component {
-  autocompleteStore = AutocompleteStore.get();
-  consoleStore = ConsoleStore.get();
-  inputStore = InputStore.get();
-  settingsStore = SettingsStore.get();
-
-  render () {
-    const { input } = this.inputStore;
-
-    return (
-      <div className={ styles.container }>
-        <Autocomplete />
-        <span className={ styles.type }>&gt;</span>
-        <div className={ styles.inputContainer }>
-          <textarea
-            autoFocus
-            className={ styles.input }
-            onChange={ this.handleChange }
-            onKeyDown={ this.handleKeyDown }
-            ref={ this.setRef }
-            rows={ input.split('\n').length }
-            type='text'
-            value={ input }
-          />
-        </div>
-      </div>
-    );
-  }
-
-  handleChange = (event) => {
-    const { value } = event.target;
-
-    this.inputStore.updateInput(value);
-  };
-
-  handleKeyDown = (event) => {
-    const { executeOnEnter } = this.settingsStore;
-    const { input } = this.inputStore;
-    const codeName = keycode(event);
-    const multilines = input.split('\n').length > 1;
-
-    // Clear console with CTRL+L
-    if (codeName === 'l' && event.ctrlKey) {
-      event.preventDefault();
-      event.stopPropagation();
-      return this.consoleStore.clear();
-    }
-
-    if (codeName === 'esc') {
-      event.preventDefault();
-      event.stopPropagation();
-      return this.autocompleteStore.hide();
-    }
-
-    if (codeName === 'enter') {
-      if (event.shiftKey) {
-        return;
-      }
-
-      // If not execute on enter: execute on
-      // enter + CTRL
-      if (!executeOnEnter && !event.ctrlKey) {
-        return;
-      }
-
-      event.preventDefault();
-      event.stopPropagation();
-
-      if (this.autocompleteStore.hasSelected) {
-        return this.autocompleteStore.select(this.inputStore);
-      }
-
-      if (input.length > 0) {
-        return this.inputStore.execute();
-      }
-    }
-
-    if (codeName === 'up' && !multilines) {
-      event.preventDefault();
-      event.stopPropagation();
-
-      if (this.autocompleteStore.show) {
-        return this.autocompleteStore.focus(-1);
-      }
-
-      return this.inputStore.selectHistory(-1);
-    }
-
-    if (codeName === 'down' && !multilines) {
-      event.preventDefault();
-      event.stopPropagation();
-
-      if (this.autocompleteStore.show) {
-        return this.autocompleteStore.focus(1);
-      }
-
-      return this.inputStore.selectHistory(1);
-    }
-
-    if (codeName === 'left' && this.autocompleteStore.show) {
-      return this.autocompleteStore.hide();
-    }
-
-    if (codeName === 'right' && this.autocompleteStore.show) {
-      event.preventDefault();
-      event.stopPropagation();
-      return this.autocompleteStore.select(this.inputStore);
-    }
-  };
-
-  setRef = (node) => {
-    this.inputStore.setInputNode(ReactDOM.findDOMNode(node));
-  };
-}
diff --git a/js/src/dapps/console/Input/input.store.js b/js/src/dapps/console/Input/input.store.js
deleted file mode 100644
index 9d8c2b51a80a987c7c33e4ea0365468840899d8e..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Input/input.store.js
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-import store from 'store';
-
-import AutocompleteStore from '../Autocomplete/autocomplete.store';
-import ConsoleStore from '../Console/console.store';
-
-const LS_HISTORY_KEY = '_console::history';
-const MAX_HISTORY_LINES = 5;
-
-let instance;
-
-export default class InputStore {
-  @observable input = '';
-
-  autocompleteStore = AutocompleteStore.get();
-  consoleStore = ConsoleStore.get();
-  history = [];
-  historyOffset = null;
-  inputNode = null;
-  lastInput = '';
-
-  constructor () {
-    this.loadHistory();
-  }
-
-  static get () {
-    if (!instance) {
-      instance = new InputStore();
-    }
-
-    return instance;
-  }
-
-  setInputNode (node) {
-    this.inputNode = node;
-    this.autocompleteStore.setInputNode(node);
-  }
-
-  @action
-  updateInput (nextValue = '', updateAutocomplete = true) {
-    this.input = nextValue;
-    const multilines = nextValue.split('\n').length > 1;
-
-    if (updateAutocomplete && !multilines) {
-      this.autocompleteStore.update(nextValue);
-    }
-  }
-
-  selectHistory (_offset) {
-    // No history
-    if (this.history.length === 0) {
-      return;
-    }
-
-    if (this.historyOffset === null) {
-      // Can't go down if no history selected
-      if (_offset === 1) {
-        return;
-      }
-
-      this.historyOffset = this.history.length - 1;
-      this.lastInput = this.input;
-      return this.updateInput(this.history[this.historyOffset], false);
-    }
-
-    if (_offset === 1 && this.historyOffset === this.history.length - 1) {
-      this.historyOffset = null;
-      return this.updateInput(this.lastInput);
-    }
-
-    this.historyOffset = Math.max(0, this.historyOffset + _offset);
-    const nextInput = this.history[this.historyOffset];
-
-    this.updateInput(nextInput, false);
-  }
-
-  execute () {
-    const { input } = this;
-
-    this.pushToHistory(input);
-    this.consoleStore.evaluate(input);
-    this.updateInput('');
-    this.historyOffset = null;
-    this.autocompleteStore.clearCache();
-  }
-
-  pushToHistory (input) {
-    // Don't stack twice the same input in
-    // history
-    if (this.history[this.history.length - 1] !== input) {
-      this.history.push(input);
-    }
-
-    this.saveHistory();
-  }
-
-  loadHistory () {
-    this.history = store.get(LS_HISTORY_KEY) || [];
-  }
-
-  saveHistory () {
-    if (this.history.length > MAX_HISTORY_LINES) {
-      this.history = this.history.slice(-1 * MAX_HISTORY_LINES);
-    }
-
-    store.set(LS_HISTORY_KEY, this.history.slice());
-  }
-}
diff --git a/js/src/dapps/console/Settings/index.js b/js/src/dapps/console/Settings/index.js
deleted file mode 100644
index a148ded7a4c28c618b5699acc61100877ebb155d..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Settings/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './settings';
diff --git a/js/src/dapps/console/Settings/settings.css b/js/src/dapps/console/Settings/settings.css
deleted file mode 100644
index 8dbe7e743628f0689bcbf6dab448d326dece18d4..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Settings/settings.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  display: flex;
-  flex-direction: row;
-  font-family: Arial, sans-serif;
-  font-size: 12px;
-  padding: 0.5em 1em;
-}
-
-.option {
-  align-items: center;
-  display: flex;
-  flex: 0 0 50%;
-  flex-direction: row;
-  margin: 0.5em 0;
-}
diff --git a/js/src/dapps/console/Settings/settings.js b/js/src/dapps/console/Settings/settings.js
deleted file mode 100644
index 63ae9023f9cc95dca0fe5d697bb0a725a87449d1..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Settings/settings.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-
-import SettingsStore from './settings.store';
-
-import styles from './settings.css';
-
-@observer
-export default class Settings extends Component {
-  settingsStore = SettingsStore.get();
-
-  render () {
-    const { displayTimestamps, executeOnEnter } = this.settingsStore;
-
-    return (
-      <div className={ styles.container }>
-        <div className={ styles.option }>
-          <input
-            checked={ executeOnEnter }
-            id='executeOnEnter'
-            onChange={ this.handleExecuteOnEnterChange }
-            type='checkbox'
-          />
-          <label htmlFor='executeOnEnter'>
-            Execute on <code>Enter</code>
-          </label>
-        </div>
-        <div className={ styles.option }>
-          <input
-            checked={ displayTimestamps }
-            id='displayTimestamps'
-            onChange={ this.handleDisplayTimestampsChange }
-            type='checkbox'
-          />
-          <label htmlFor='displayTimestamps'>
-            Show timestamps
-          </label>
-        </div>
-      </div>
-    );
-  }
-
-  handleDisplayTimestampsChange = (event) => {
-    const { checked } = event.target;
-
-    this.settingsStore.setDisplayTimestamps(checked);
-  };
-
-  handleExecuteOnEnterChange = (event) => {
-    const { checked } = event.target;
-
-    this.settingsStore.setExecuteOnEnter(checked);
-  };
-}
diff --git a/js/src/dapps/console/Settings/settings.store.js b/js/src/dapps/console/Settings/settings.store.js
deleted file mode 100644
index 4c23f834173d5c0c0faeb202761e5e71e07c88d8..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Settings/settings.store.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-import store from 'store';
-
-const LS_SETTINGS_KEY = '_console::settings';
-
-let instance;
-
-export default class SettingsStore {
-  @observable displayTimestamps = true;
-  @observable executeOnEnter = true;
-
-  constructor () {
-    this.load();
-  }
-
-  static get () {
-    if (!instance) {
-      instance = new SettingsStore();
-    }
-
-    return instance;
-  }
-
-  load () {
-    const settings = store.get(LS_SETTINGS_KEY) || {};
-    const { executeOnEnter, displayTimestamps } = settings;
-
-    if (executeOnEnter !== undefined) {
-      this.setExecuteOnEnter(executeOnEnter);
-    }
-
-    if (displayTimestamps !== undefined) {
-      this.setDisplayTimestamps(displayTimestamps);
-    }
-  }
-
-  save () {
-    const { executeOnEnter, displayTimestamps } = this;
-    const settings = { executeOnEnter, displayTimestamps };
-
-    store.set(LS_SETTINGS_KEY, settings);
-  }
-
-  @action
-  setDisplayTimestamps (value) {
-    this.displayTimestamps = value;
-    this.save();
-  }
-
-  @action
-  setExecuteOnEnter (value) {
-    this.executeOnEnter = value;
-    this.save();
-  }
-}
diff --git a/js/src/dapps/console/Snippets/index.js b/js/src/dapps/console/Snippets/index.js
deleted file mode 100644
index 48dd4460115512adf2199895d5dde67ff027727e..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Snippets/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './snippets';
diff --git a/js/src/dapps/console/Snippets/snippets.css b/js/src/dapps/console/Snippets/snippets.css
deleted file mode 100644
index a5004de1c86bc8b84e69bd4a3ec93498a272f7a5..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Snippets/snippets.css
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-}
-
-.panel {
-  border-right: 1px solid lightgray;
-  display: flex;
-  flex-direction: column;
-  min-width: 200px;
-}
-
-.add {
-  align-items: center;
-  background-color: #fcfcfc;
-  border-bottom: 1px solid lightgray;
-  cursor: default;
-  display: flex;
-  padding: 0.5em 1em;
-
-  .plus {
-    font-size: 15px;
-    font-weight: bold !important;
-    margin-right: 5px;
-  }
-
-  &:hover {
-    background-color: #f0f0f0;
-  }
-}
-
-.list {
-  display: flex;
-  flex-direction: column;
-  margin-top: 3px;
-}
-
-.code {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-
-  .console {
-    border-top: 1px solid lightgray;
-    max-height: 200px;
-    flex: 0 0 0;
-
-    > * {
-      overflow: auto;
-      height: 100%;
-    }
-  }
-
-  > * {
-    flex: 1;
-  }
-
-  :global(.CodeMirror) {
-    height: 100%;
-  }
-}
-
-.file {
-  align-items: center;
-  cursor: default;
-  display: flex;
-  padding: 0.5em 0.5em 0.5em 1em;
-
-  &.selected {
-    background-color: #f0f0f0;
-  }
-
-  &:hover {
-    background-color: rgb(230, 236, 255);
-  }
-
-  .pristine {
-    font-size: 20px;
-    margin-right: 3px;
-    height: 13px;
-  }
-
-  .remove {
-    cursor: default;
-    display: inline-flex;
-    font-size: 14px;
-    margin-left: -0.25em;
-    margin-right: 0.25em;
-  }
-}
-
-.inputContainer {
-  background-color: white;
-  border: solid 1px #d8d8d8;
-  margin-right: 0.5em;
-  padding: 3px;
-  width: 100%;
-}
-
-.input {
-  border: none;
-  font: 11px Arial;
-  width: 100%;
-}
diff --git a/js/src/dapps/console/Snippets/snippets.js b/js/src/dapps/console/Snippets/snippets.js
deleted file mode 100644
index eeb9459cf72c10446ab22487218454d00e261ff6..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Snippets/snippets.js
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import keycode from 'keycode';
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-import CodeMirror from 'react-codemirror';
-import EventListener from 'react-event-listener';
-
-import Console from '../Console';
-import SnippetsStore from './snippets.store';
-
-import styles from './snippets.css';
-
-@observer
-export default class Snippets extends Component {
-  snippetsStore = SnippetsStore.get();
-
-  render () {
-    const { code } = this.snippetsStore;
-
-    return (
-      <div className={ styles.container }>
-        <EventListener
-          onKeyDown={ this.handleKeyDown }
-          target='window'
-        />
-        <div className={ styles.panel }>
-          <div
-            className={ styles.add }
-            onClick={ this.handleAddFile }
-          >
-            <span className={ styles.plus }>+</span>
-            <span>New Snippet</span>
-          </div>
-          <div className={ styles.list }>
-            { this.renderFiles() }
-          </div>
-        </div>
-        <div className={ styles.code }>
-          <CodeMirror
-            ref={ this.setRef }
-            onChange={ this.handleChange }
-            options={ {
-              autofocus: true,
-              extraKeys: {
-                'Ctrl-Space': 'autocomplete'
-              },
-              keyMap: 'sublime',
-              highlightSelectionMatches: {
-                delay: 0,
-                showToken: false
-              },
-              lineNumbers: true,
-              mode: 'javascript'
-            } }
-            value={ code }
-          />
-          <div className={ styles.console }>
-            <Console />
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderFiles () {
-    const { files } = this.snippetsStore;
-
-    return files
-      .values()
-      .sort((fa, fb) => fa.name.localeCompare(fb.name))
-      .map((file) => this.renderFile(file));
-  }
-
-  renderFile (file) {
-    const { nextName, renaming, selected } = this.snippetsStore;
-    const { id, name } = file;
-    const classes = [ styles.file ];
-
-    if (renaming === id) {
-      return (
-        <div
-          className={ classes.join(' ') }
-          key={ id }
-        >
-          <EventListener
-            onClick={ this.handleSaveName }
-            target='window'
-          />
-          <div className={ styles.inputContainer }>
-            <input
-              autoFocus
-              className={ styles.input }
-              onClick={ this.stopPropagation }
-              onChange={ this.handleNameChange }
-              onKeyDown={ this.handleRenameKeyDown }
-              type='text'
-              value={ nextName }
-            />
-          </div>
-        </div>
-      );
-    }
-
-    const onClick = () => this.handleSelectFile(id);
-    const onDoubleClick = () => this.handleRenameFile(id);
-    const onRemove = (event) => this.handleRemove(id, event);
-
-    if (selected === id) {
-      classes.push(styles.selected);
-    }
-
-    return (
-      <div
-        className={ classes.join(' ') }
-        key={ id }
-        onClick={ onClick }
-        onDoubleClick={ onDoubleClick }
-      >
-        <span
-          className={ styles.remove }
-          onClick={ onRemove }
-          title={ `Remove ${name}` }
-        >
-          ✖
-        </span>
-        <span className={ styles.pristine }>
-          {
-            file.isPristine
-            ? null
-            : '*'
-          }
-        </span>
-        <span>
-          { name }
-        </span>
-      </div>
-    );
-  }
-
-  handleAddFile = () => {
-    this.snippetsStore.create();
-  };
-
-  handleSaveName = (event) => {
-    this.snippetsStore.saveName();
-    return event;
-  };
-
-  handleChange = (value) => {
-    this.snippetsStore.edit(value);
-  };
-
-  handleKeyDown = (event) => {
-    const codeName = keycode(event);
-
-    if (codeName === 's' && event.ctrlKey) {
-      event.preventDefault();
-      event.stopPropagation();
-
-      return this.snippetsStore.save();
-    }
-  };
-
-  handleNameChange = (event) => {
-    const { value } = event.target;
-
-    this.snippetsStore.updateName(value);
-  };
-
-  handleRemove = (id, event) => {
-    this.snippetsStore.remove(id);
-    event.stopPropagation();
-  };
-
-  handleRenameFile = (id) => {
-    this.snippetsStore.startRename(id);
-  };
-
-  handleRenameKeyDown = (event) => {
-    const codeName = keycode(event);
-
-    if (codeName === 'enter') {
-      return this.snippetsStore.saveName();
-    }
-
-    if (codeName === 'esc') {
-      return this.snippetsStore.cancelRename();
-    }
-  };
-
-  handleSelectFile = (id) => {
-    this.snippetsStore.select(id);
-  };
-
-  setRef = (node) => {
-    const codeMirror = node
-      ? node.getCodeMirror()
-      : null;
-
-    this.snippetsStore.setCodeMirror(codeMirror);
-  };
-
-  stopPropagation = (event) => {
-    event.stopPropagation();
-  };
-}
diff --git a/js/src/dapps/console/Snippets/snippets.store.js b/js/src/dapps/console/Snippets/snippets.store.js
deleted file mode 100644
index 117d021e8734d21ed6d81492016ab2d7ce8f5008..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Snippets/snippets.store.js
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import keycode from 'keycode';
-import { action, computed, map, observable, transaction } from 'mobx';
-import store from 'store';
-
-import { evaluate } from '../utils';
-
-const LS_SNIPPETS_KEY = '_console::snippets';
-
-let instance;
-
-export default class SnippetsStore {
-  @observable files = map();
-  @observable nextName = null;
-  @observable renaming = null;
-  @observable selected = null;
-
-  codeMirror = null;
-
-  constructor () {
-    this.load();
-  }
-
-  static get () {
-    if (!instance) {
-      instance = new SnippetsStore();
-    }
-
-    return instance;
-  }
-
-  @computed
-  get code () {
-    if (!this.selected) {
-      return '';
-    }
-
-    return this.files.get(this.selected).content;
-  }
-
-  @action
-  cancelRename () {
-    if (!this.renaming || !this.nextName) {
-      return;
-    }
-
-    this.renaming = null;
-    this.nextName = null;
-  }
-
-  clearCodeHistory () {
-    if (this.codeMirror) {
-      this.codeMirror.doc.clearHistory();
-    }
-  }
-
-  @action
-  create () {
-    const id = this.getNewId();
-    const file = {
-      content: '',
-      isPristine: false,
-      name: `Snippet #${id}`,
-      id
-    };
-
-    transaction(() => {
-      this.files.set(id, file);
-      this.select(id);
-    });
-  }
-
-  edit (value) {
-    if (!this.selected) {
-      this.create();
-    }
-
-    const file = this.files.get(this.selected);
-
-    file.content = value;
-    this.updateFile(file);
-  }
-
-  evaluate () {
-    const code = this.code;
-
-    if (!code) {
-      return;
-    }
-
-    const { result, error } = evaluate(code);
-
-    if (error) {
-      console.error(error);
-    } else {
-      console.log(result);
-    }
-  }
-
-  getFromStorage () {
-    return store.get(LS_SNIPPETS_KEY) || [];
-  }
-
-  getNewId () {
-    if (this.files.size === 0) {
-      return 1;
-    }
-
-    const ids = this.files.values().map((file) => file.id);
-
-    return Math.max(...ids) + 1;
-  }
-
-  load () {
-    const files = this.getFromStorage();
-
-    transaction(() => {
-      files.forEach((file) => {
-        this.files.set(file.id, file);
-      });
-    });
-  }
-
-  @action
-  remove (id) {
-    transaction(() => {
-      if (id === this.selected) {
-        this.selected = null;
-      }
-
-      this.files.delete(id);
-
-      const files = this.getFromStorage()
-        .filter((f) => f.id !== id);
-
-      return store.set(LS_SNIPPETS_KEY, files);
-    });
-  }
-
-  save (_file) {
-    let file;
-
-    if (!_file) {
-      if (!this.selected) {
-        return false;
-      }
-
-      file = this.files.get(this.selected);
-    } else {
-      file = _file;
-    }
-
-    file.savedContent = file.content;
-    this.updateFile(file);
-    this.saveToStorage(file);
-  }
-
-  saveName () {
-    if (!this.renaming || !this.nextName) {
-      return;
-    }
-
-    const file = this.files.get(this.renaming);
-
-    file.name = this.nextName;
-
-    this.save(file);
-    this.cancelRename();
-  }
-
-  saveToStorage (file) {
-    const files = this.getFromStorage();
-    const index = files.findIndex((f) => file.id === f.id);
-
-    if (index === -1) {
-      files.push(file);
-    } else {
-      files[index] = file;
-    }
-
-    return store.set(LS_SNIPPETS_KEY, files);
-  }
-
-  @action
-  select (id) {
-    this.selected = id;
-
-    // Wait for the file content to be loaded
-    setTimeout(() => {
-      this.clearCodeHistory();
-    }, 50);
-  }
-
-  setCodeMirror (codeMirror) {
-    this.codeMirror = codeMirror;
-
-    if (!codeMirror) {
-      return;
-    }
-
-    this.codeMirror
-      .on('keydown', (_, event) => {
-        const codeName = keycode(event);
-
-        if (codeName === 'enter' && event.ctrlKey) {
-          event.preventDefault();
-          event.stopPropagation();
-          return this.evaluate();
-        }
-      });
-  }
-
-  @action
-  startRename (id) {
-    const file = this.files.get(id);
-
-    transaction(() => {
-      this.renaming = id;
-      this.nextName = file.name;
-    });
-  }
-
-  @action
-  updateFile (file) {
-    file.isPristine = (file.content === file.savedContent);
-
-    this.files.set(file.id, file);
-  }
-
-  @action
-  updateName (value) {
-    this.nextName = value;
-  }
-}
diff --git a/js/src/dapps/console/Watches/index.js b/js/src/dapps/console/Watches/index.js
deleted file mode 100644
index 97795733e3b4c9fa16cd43189305384ccf0c7798..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Watches/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './watches';
diff --git a/js/src/dapps/console/Watches/watches.css b/js/src/dapps/console/Watches/watches.css
deleted file mode 100644
index bcc8aa73d018ef7d2d79bab22faa6a6eb1d6da10..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Watches/watches.css
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  background: #eee;
-  border-top: 1px solid lightgray;
-  display: flex;
-  flex-direction: row;
-  padding: 0.25em;
-  font-size: 8pt;
-  color: #888;
-}
-
-.watch {
-  align-items: flex-end;
-  border-left: 1px solid #ccc;
-  display: flex;
-  padding: 0 1em;
-
-  &.error .result {
-    color: red;
-  }
-
-  .result {
-    color: #00f;
-    font-weight: bold;
-    margin-left: 0.5em;
-  }
-}
-
-.add {
-  color: green;
-  cursor: default;
-  font-size: 14px;
-  font-weight: bold !important;
-  padding: 0 1em;
-
-  &:hover {
-    background-color: #fcfcfc;
-  }
-
-  &.selected {
-    background-color: rgb(230, 236, 255);
-  }
-}
-
-.addContainer {
-  position: relative;
-}
-
-.addForm {
-  bottom: 100%;
-  display: flex;
-  padding: 0.5em 0;
-  position: absolute;
-  width: 100vw;
-
-  .inputContainer {
-    border: solid 1px #d8d8d8;
-    margin-right: 0.5em;
-    padding: 3px;
-  }
-
-  .input {
-    border: none;
-    font: 12px Arial;
-
-    &.big {
-      width: 300px;
-    }
-  }
-
-  .button {
-    color: black;
-    font: 12px Arial;
-    padding: 0 1em;
-  }
-}
-
-.remove {
-  cursor: default;
-  display: inline-flex;
-  font-size: 14px;
-  margin-right: 0.75em;
-
-  * {
-    line-height: 13px;
-  }
-
-  &:hover {
-    background-color: #fcfcfc;
-  }
-}
diff --git a/js/src/dapps/console/Watches/watches.js b/js/src/dapps/console/Watches/watches.js
deleted file mode 100644
index 9eb0c9494d3248300aefd0d08c9122d97425d7b3..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Watches/watches.js
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-
-import WatchesStore from './watches.store';
-
-import styles from './watches.css';
-
-@observer
-export default class Watches extends Component {
-  watchesStore = WatchesStore.get();
-
-  render () {
-    return (
-      <div className={ styles.container }>
-        { this.renderAddWatch() }
-        { this.renderWatches() }
-      </div>
-    );
-  }
-
-  renderAddForm () {
-    const { showAdd } = this.watchesStore;
-
-    if (!showAdd) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.addForm }>
-        <div className={ styles.inputContainer }>
-          <input
-            className={ styles.input }
-            onChange={ this.handleAddNameChange }
-            placeholder='Name'
-            type='text'
-          />
-        </div>
-        <div className={ styles.inputContainer }>
-          <input
-            className={ [ styles.input, styles.big ].join(' ') }
-            onChange={ this.handleAddFunctionChange }
-            placeholder='Function'
-            type='text'
-          />
-        </div>
-        <div className={ styles.inputContainer }>
-          <input
-            className={ styles.input }
-            onChange={ this.handleAddContextChange }
-            placeholder='Context'
-            type='text'
-          />
-        </div>
-        <button
-          className={ styles.button }
-          onClick={ this.handleAddWatch }
-        >
-          Add
-        </button>
-      </div>
-    );
-  }
-
-  renderAddWatch () {
-    const { showAdd } = this.watchesStore;
-    const classes = [ styles.add ];
-
-    if (showAdd) {
-      classes.push(styles.selected);
-    }
-
-    return (
-      <div className={ styles.addContainer }>
-        { this.renderAddForm() }
-        <span
-          className={ classes.join(' ') }
-          onClick={ this.handleToggleAdd }
-        >
-          +
-        </span>
-      </div>
-    );
-  }
-
-  renderWatches () {
-    const { names } = this.watchesStore;
-
-    return names.map((name) => {
-      const { result, error } = this.watchesStore.get(name);
-      const classes = [ styles.watch ];
-      const resultStr = error
-        ? error.toString()
-        : this.toString(result);
-
-      const onClick = () => this.handleRemoveWatch(name);
-
-      if (error) {
-        classes.push(styles.error);
-      }
-
-      return (
-        <div
-          className={ classes.join(' ') }
-          key={ name }
-        >
-          <span
-            className={ styles.remove }
-            onClick={ onClick }
-            title={ `Remove "${name}" watch` }
-          >
-            <span>✖</span>
-          </span>
-
-          <span>{ name }</span>
-          <span className={ styles.result }>{ resultStr.toString() }</span>
-        </div>
-      );
-    });
-  }
-
-  handleAddFunctionChange = (event) => {
-    const { value } = event.target;
-
-    this.watchesStore.updateAddFunction(value);
-  };
-
-  handleAddContextChange = (event) => {
-    const { value } = event.target;
-
-    this.watchesStore.updateAddContext(value);
-  };
-
-  handleAddNameChange = (event) => {
-    const { value } = event.target;
-
-    this.watchesStore.updateAddName(value);
-  };
-
-  handleAddWatch = () => {
-    this.watchesStore.addWatch();
-  };
-
-  handleRemoveWatch = (name) => {
-    this.watchesStore.remove(name);
-  };
-
-  handleToggleAdd = () => {
-    this.watchesStore.toggleAdd();
-  };
-
-  toString (result) {
-    if (result === undefined) {
-      return 'undefined';
-    }
-
-    if (result === null) {
-      return 'null';
-    }
-
-    if (typeof result.toFormat === 'function') {
-      return result.toFormat();
-    }
-
-    if (typeof result.toString === 'function') {
-      return result.toString();
-    }
-
-    return result;
-  }
-}
diff --git a/js/src/dapps/console/Watches/watches.store.js b/js/src/dapps/console/Watches/watches.store.js
deleted file mode 100644
index 2875588ece0dda17002efbc13d9bd0e5edd572bf..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/Watches/watches.store.js
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, map, observable } from 'mobx';
-
-import { api } from '../parity';
-import { evaluate } from '../utils';
-
-let instance;
-
-export default class WatchesStore {
-  @observable showAdd = false;
-  @observable watches = map();
-
-  watchesFunctions = {};
-
-  constructor () {
-    api.subscribe('eth_blockNumber', () => {
-      this.refreshWatches();
-    });
-  }
-
-  static get () {
-    if (!instance) {
-      instance = new WatchesStore();
-
-      window.watch = instance.add.bind(instance);
-      window.unwatch = instance.remove.bind(instance);
-    }
-
-    return instance;
-  }
-
-  @action
-  add (name, func, context) {
-    if (!func || (typeof func !== 'function' && typeof func.then !== 'function')) {
-      return console.error(Error(`cannot watch ${name} ; not a Function/Promise given`));
-    }
-
-    this.watchesFunctions[name] = { func, context };
-    this.watches.set(name, {});
-    this.refreshWatches();
-  }
-
-  addWatch () {
-    this.toggleAdd();
-
-    const { addContext, addFunction, addName } = this;
-
-    const evaluatedFunction = evaluate(addFunction);
-    const evaluatedContext = addContext
-      ? evaluate(addContext)
-      : {};
-
-    this.add(addName, evaluatedFunction.result, evaluatedContext.result);
-  }
-
-  get (name) {
-    return this.watches.get(name);
-  }
-
-  get names () {
-    return this.watches.keys();
-  }
-
-  refreshWatches () {
-    const names = this.watches.keys();
-    const promises = names
-      .map((name) => {
-        const { context, func } = this.watchesFunctions[name];
-        let result;
-
-        try {
-          if (typeof func === 'function') {
-            result = func.apply(context || this);
-          } else {
-            result = func;
-          }
-
-          return Promise.resolve(result);
-        } catch (error) {
-          return Promise.reject(error);
-        }
-      })
-      .map((promise, index) => {
-        const name = names[index];
-
-        return promise
-          .then((result) => {
-            this.updateWatch(name, result);
-          })
-          .catch((error) => {
-            this.updateWatch(name, error, true);
-          });
-      });
-
-    return Promise.all(promises);
-  }
-
-  @action
-  remove (name) {
-    this.watches.delete(name);
-    delete this.watchesFunctions[name];
-  }
-
-  @action
-  toggleAdd () {
-    this.showAdd = !this.showAdd;
-  }
-
-  updateAddContext (value) {
-    this.addContext = value;
-  }
-
-  updateAddFunction (value) {
-    this.addFunction = value;
-  }
-
-  updateAddName (value) {
-    this.addName = value;
-  }
-
-  @action
-  updateWatch (name, result, isError = false) {
-    const next = {};
-
-    if (isError) {
-      next.error = result;
-    } else {
-      next.result = result;
-    }
-
-    this.watches.set(name, { ...next });
-  }
-}
diff --git a/js/src/dapps/console/codemirror.css b/js/src/dapps/console/codemirror.css
deleted file mode 100644
index 3199cd80dcc68a5c1142947d0f7d71d0be4839df..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/codemirror.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-:global {
-  .cm-matchhighlight {
-    background-color: rgba(255, 255, 0, 0.4);
-  }
-
-  .CodeMirror-hints {
-    font-family: dejavu sans mono, monospace;
-    font-size: 11px;
-    border-radius: 0;
-    border: none;
-    padding: 0;
-  }
-
-  .CodeMirror-hint {
-    border-radius: 0;
-    cursor: default;
-    padding: 0.25em 0.25em 0.25em 0.35em;
-  }
-}
diff --git a/js/src/dapps/console/parity.js b/js/src/dapps/console/parity.js
deleted file mode 100644
index d05cc2350d0cabfb004006a5ab9fb03c839df48d..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/parity.js
+++ /dev/null
@@ -1,331 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Web3 from 'web3';
-
-const api = window.parent.secureApi;
-let web3;
-
-api.parity.dappsUrl().then(url => {
-  web3 = new Web3(new Web3.providers.HttpProvider(`${window.location.protocol}//${url}/rpc/`));
-  window.web3 = web3;
-
-  // Usage example:
-  // web3.eth.traceCall({
-  //     to: theChicken.address,
-  //     data: theChicken.withdraw.getData(100000000000000000),
-  //     gas: 100000
-  //   },
-  //   `["trace", "vmTrace", "stateDiff"]
-  //  )
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'traceCall',
-        call: 'trace_call',
-        params: 2,
-        inputFormatter: [web3._extend.formatters.inputCallFormatter, null]
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'traceSendRawTransaction',
-        call: 'trace_rawTransaction',
-        params: 2,
-        inputFormatter: [null, null]
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'traceReplayTransaction',
-        call: 'trace_replayTransaction',
-        params: 2,
-        inputFormatter: [null, null]
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'setMode',
-        call: 'parity_setMode',
-        params: 1
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'mode',
-        call: 'parity_mode',
-        params: 0
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'traceTransaction',
-        call: 'trace_Transaction',
-        params: 1,
-        inputFormatter: [null]
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'gasPriceStatistics',
-        call: 'parity_gasPriceStatistics',
-        params: 0,
-        outputFormatter: function (a) { return a.map(web3.toBigNumber); }
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'registryAddress',
-        call: 'parity_registryAddress',
-        params: 0
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'accountsInfo',
-        call: 'personal_accountsInfo',
-        outputFormatter: function (m) {
-          Object.keys(m).forEach(k => {
-            m[k].meta = JSON.parse(m[k].meta);
-            m[k].meta.name = m[k].name;
-            m[k].meta.uuid = m[k].uuid;
-            m[k] = m[k].meta;
-          }); return m;
-        },
-        params: 0
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'setAccountName',
-        call: 'personal_setAccountName',
-        params: 2
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'setAccountMeta',
-        call: 'personal_setAccountMeta',
-        params: 2,
-        inputFormatter: [a => a, JSON.stringify]
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'postTransaction',
-        call: 'eth_postTransaction',
-        params: 1,
-        inputFormatter: [web3._extend.formatters.inputCallFormatter]
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'postSign',
-        call: 'eth_postSign',
-        params: 1
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'encryptMessage',
-        call: 'parity_encryptMessage',
-        params: 2
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'checkRequest',
-        call: 'eth_checkRequest',
-        params: 1
-      })
-    ]
-  });
-
-  web3._extend({
-    property: 'eth',
-    methods: [
-      new web3._extend.Method({
-        name: 'listAccounts',
-        call: 'parity_listAccounts',
-        params: 0
-      })
-    ]
-  });
-
-  {
-    let postTransaction = web3.eth.postTransaction.bind(web3.eth);
-    let sendTransaction = web3.eth.sendTransaction.bind(web3.eth);
-
-    web3.eth.sendTransaction = function (options, f) {
-      // No callback - do sync API.
-      if (typeof f !== 'function') {
-        return sendTransaction(options);
-      }
-      // Callback - use async API.
-      let id = postTransaction(options);
-
-      console.log('Posted trasaction id=' + id);
-      let timerId = window.setInterval(check, 500);
-
-      function check () {
-        try {
-          let r = web3.eth.checkRequest(id);
-
-          if (typeof r === 'string') {
-            clearInterval(timerId);
-            if (r === '0x0000000000000000000000000000000000000000000000000000000000000000') {
-              f('Rejected', r);
-            } else {
-              f(null, r);
-            }
-          } else if (r !== null) {
-            console.log('checkRequest returned: ' + r);
-          }
-        } catch (e) {
-          clearInterval(timerId);
-          f('Rejected', null);
-        }
-      }
-    };
-  }
-
-  web3.eth.installInterceptor = function (interceptor) {
-    let oldSendTransaction = web3.eth.sendTransaction.bind(web3.eth);
-
-    web3.eth.sendTransaction = function (options, f) {
-      if (!interceptor(options)) {
-        return '0x0000000000000000000000000000000000000000000000000000000000000000';
-      }
-
-      return oldSendTransaction(options, f);
-    };
-  };
-
-  web3.eth.reporter = function (e, r) {
-    if (e) {
-      console.log('Error confirming transaction: ' + e);
-    } else {
-      let addr = r;
-      let confirmed = false;
-      let timerId = window.setInterval(function check () {
-        let receipt = web3.eth.getTransactionReceipt(addr);
-
-        if (receipt != null) {
-          if (!confirmed) {
-            console.log('Transaction confirmed (' + r + '); used ' + receipt.gasUsed + ' gas; left ' + receipt.logs.length + ' logs; mining...');
-            confirmed = true;
-          }
-          if (typeof receipt.blockHash === 'string') {
-            clearInterval(timerId);
-            console.log('Mined into block ' + receipt.blockNumber);
-          }
-        }
-      }, 500);
-    }
-  };
-
-  {
-    let oldSha3 = web3.sha3;
-
-    web3.sha3 = function (data, format) {
-      if (typeof format !== 'string' || (format !== 'hex' && format !== 'bin')) {
-        format = data.startsWith('0x') ? 'hex' : 'bin';
-      }
-      return oldSha3(data, { encoding: format });
-    };
-  }
-
-  {
-    let Registry = web3.eth.contract([{ 'constant': false, 'inputs': [{ 'name': '_new', 'type': 'address' }], 'name': 'setOwner', 'outputs': [], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_name', 'type': 'string' }], 'name': 'confirmReverse', 'outputs': [{ 'name': 'success', 'type': 'bool' }], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_name', 'type': 'bytes32' }], 'name': 'reserve', 'outputs': [{ 'name': 'success', 'type': 'bool' }], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_name', 'type': 'bytes32' }, { 'name': '_key', 'type': 'string' }, { 'name': '_value', 'type': 'bytes32' }], 'name': 'set', 'outputs': [{ 'name': 'success', 'type': 'bool' }], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_name', 'type': 'bytes32' }], 'name': 'drop', 'outputs': [{ 'name': 'success', 'type': 'bool' }], 'type': 'function' }, { 'constant': true, 'inputs': [{ 'name': '_name', 'type': 'bytes32' }, { 'name': '_key', 'type': 'string' }], 'name': 'getAddress', 'outputs': [{ 'name': '', 'type': 'address' }], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_amount', 'type': 'uint256' }], 'name': 'setFee', 'outputs': [], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_name', 'type': 'bytes32' }, { 'name': '_to', 'type': 'address' }], 'name': 'transfer', 'outputs': [{ 'name': 'success', 'type': 'bool' }], 'type': 'function' }, { 'constant': true, 'inputs': [], 'name': 'owner', 'outputs': [{ 'name': '', 'type': 'address' }], 'type': 'function' }, { 'constant': true, 'inputs': [{ 'name': '_name', 'type': 'bytes32' }], 'name': 'reserved', 'outputs': [{ 'name': 'reserved', 'type': 'bool' }], 'type': 'function' }, { 'constant': false, 'inputs': [], 'name': 'drain', 'outputs': [], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_name', 'type': 'string' }, { 'name': '_who', 'type': 'address' }], 'name': 'proposeReverse', 'outputs': [{ 'name': 'success', 'type': 'bool' }], 'type': 'function' }, { 'constant': true, 'inputs': [{ 'name': '_name', 'type': 'bytes32' }, { 'name': '_key', 'type': 'string' }], 'name': 'getUint', 'outputs': [{ 'name': '', 'type': 'uint256' }], 'type': 'function' }, { 'constant': true, 'inputs': [{ 'name': '_name', 'type': 'bytes32' }, { 'name': '_key', 'type': 'string' }], 'name': 'get', 'outputs': [{ 'name': '', 'type': 'bytes32' }], 'type': 'function' }, { 'constant': true, 'inputs': [], 'name': 'fee', 'outputs': [{ 'name': '', 'type': 'uint256' }], 'type': 'function' }, { 'constant': true, 'inputs': [{ 'name': '', 'type': 'address' }], 'name': 'reverse', 'outputs': [{ 'name': '', 'type': 'string' }], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_name', 'type': 'bytes32' }, { 'name': '_key', 'type': 'string' }, { 'name': '_value', 'type': 'uint256' }], 'name': 'setUint', 'outputs': [{ 'name': 'success', 'type': 'bool' }], 'type': 'function' }, { 'constant': false, 'inputs': [], 'name': 'removeReverse', 'outputs': [], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_name', 'type': 'bytes32' }, { 'name': '_key', 'type': 'string' }, { 'name': '_value', 'type': 'address' }], 'name': 'setAddress', 'outputs': [{ 'name': 'success', 'type': 'bool' }], 'type': 'function' }, { 'anonymous': false, 'inputs': [{ 'indexed': false, 'name': 'amount', 'type': 'uint256' }], 'name': 'Drained', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': false, 'name': 'amount', 'type': 'uint256' }], 'name': 'FeeChanged', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'name', 'type': 'bytes32' }, { 'indexed': true, 'name': 'owner', 'type': 'address' }], 'name': 'Reserved', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'name', 'type': 'bytes32' }, { 'indexed': true, 'name': 'oldOwner', 'type': 'address' }, { 'indexed': true, 'name': 'newOwner', 'type': 'address' }], 'name': 'Transferred', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'name', 'type': 'bytes32' }, { 'indexed': true, 'name': 'owner', 'type': 'address' }], 'name': 'Dropped', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'name', 'type': 'bytes32' }, { 'indexed': true, 'name': 'owner', 'type': 'address' }, { 'indexed': true, 'name': 'key', 'type': 'string' }, { 'indexed': false, 'name': 'plainKey', 'type': 'string' }], 'name': 'DataChanged', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'name', 'type': 'string' }, { 'indexed': true, 'name': 'reverse', 'type': 'address' }], 'name': 'ReverseProposed', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'name', 'type': 'string' }, { 'indexed': true, 'name': 'reverse', 'type': 'address' }], 'name': 'ReverseConfirmed', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'name', 'type': 'string' }, { 'indexed': true, 'name': 'reverse', 'type': 'address' }], 'name': 'ReverseRemoved', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'old', 'type': 'address' }, { 'indexed': true, 'name': 'current', 'type': 'address' }], 'name': 'NewOwner', 'type': 'event' }]);
-
-    web3.eth.registry = Registry.at(web3.eth.registryAddress());
-    web3.eth.registry.lookup = (name, field) => web3.eth.registry.get(web3.sha3(name), field);
-    web3.eth.registry.lookupAddress = (name, field) => web3.eth.registry.getAddress(web3.sha3(name), field);
-    web3.eth.registry.lookupUint = (name, field) => web3.eth.registry.getUint(web3.sha3(name), field);
-
-    let TokenReg = web3.eth.contract([{ 'constant': true, 'inputs': [{ 'name': '_id', 'type': 'uint256' }], 'name': 'token', 'outputs': [{ 'name': 'addr', 'type': 'address' }, { 'name': 'tla', 'type': 'string' }, { 'name': 'base', 'type': 'uint256' }, { 'name': 'name', 'type': 'string' }, { 'name': 'owner', 'type': 'address' }], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_new', 'type': 'address' }], 'name': 'setOwner', 'outputs': [], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_addr', 'type': 'address' }, { 'name': '_tla', 'type': 'string' }, { 'name': '_base', 'type': 'uint256' }, { 'name': '_name', 'type': 'string' }], 'name': 'register', 'outputs': [{ 'name': '', 'type': 'bool' }], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_fee', 'type': 'uint256' }], 'name': 'setFee', 'outputs': [], 'type': 'function' }, { 'constant': true, 'inputs': [{ 'name': '_id', 'type': 'uint256' }, { 'name': '_key', 'type': 'bytes32' }], 'name': 'meta', 'outputs': [{ 'name': '', 'type': 'bytes32' }], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_addr', 'type': 'address' }, { 'name': '_tla', 'type': 'string' }, { 'name': '_base', 'type': 'uint256' }, { 'name': '_name', 'type': 'string' }, { 'name': '_owner', 'type': 'address' }], 'name': 'registerAs', 'outputs': [{ 'name': '', 'type': 'bool' }], 'type': 'function' }, { 'constant': true, 'inputs': [{ 'name': '_tla', 'type': 'string' }], 'name': 'fromTLA', 'outputs': [{ 'name': 'id', 'type': 'uint256' }, { 'name': 'addr', 'type': 'address' }, { 'name': 'base', 'type': 'uint256' }, { 'name': 'name', 'type': 'string' }, { 'name': 'owner', 'type': 'address' }], 'type': 'function' }, { 'constant': true, 'inputs': [], 'name': 'owner', 'outputs': [{ 'name': '', 'type': 'address' }], 'type': 'function' }, { 'constant': false, 'inputs': [], 'name': 'drain', 'outputs': [], 'type': 'function' }, { 'constant': true, 'inputs': [], 'name': 'tokenCount', 'outputs': [{ 'name': '', 'type': 'uint256' }], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_id', 'type': 'uint256' }], 'name': 'unregister', 'outputs': [], 'type': 'function' }, { 'constant': true, 'inputs': [{ 'name': '_addr', 'type': 'address' }], 'name': 'fromAddress', 'outputs': [{ 'name': 'id', 'type': 'uint256' }, { 'name': 'tla', 'type': 'string' }, { 'name': 'base', 'type': 'uint256' }, { 'name': 'name', 'type': 'string' }, { 'name': 'owner', 'type': 'address' }], 'type': 'function' }, { 'constant': false, 'inputs': [{ 'name': '_id', 'type': 'uint256' }, { 'name': '_key', 'type': 'bytes32' }, { 'name': '_value', 'type': 'bytes32' }], 'name': 'setMeta', 'outputs': [], 'type': 'function' }, { 'constant': true, 'inputs': [], 'name': 'fee', 'outputs': [{ 'name': '', 'type': 'uint256' }], 'type': 'function' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'tla', 'type': 'string' }, { 'indexed': true, 'name': 'id', 'type': 'uint256' }, { 'indexed': false, 'name': 'addr', 'type': 'address' }, { 'indexed': false, 'name': 'name', 'type': 'string' }], 'name': 'Registered', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'tla', 'type': 'string' }, { 'indexed': true, 'name': 'id', 'type': 'uint256' }], 'name': 'Unregistered', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'id', 'type': 'uint256' }, { 'indexed': true, 'name': 'key', 'type': 'bytes32' }, { 'indexed': false, 'name': 'value', 'type': 'bytes32' }], 'name': 'MetaChanged', 'type': 'event' }, { 'anonymous': false, 'inputs': [{ 'indexed': true, 'name': 'old', 'type': 'address' }, { 'indexed': true, 'name': 'current', 'type': 'address' }], 'name': 'NewOwner', 'type': 'event' }]);
-
-    web3.eth.tokenReg = TokenReg.at(web3.eth.registry.lookupAddress('tokenreg', 'A'));
-  }
-})
-.catch((error) => {
-  console.error(error);
-});
-
-window.api = api;
-window.web3 = web3;
-
-export {
-  api,
-  web3
-};
diff --git a/js/src/dapps/console/utils.js b/js/src/dapps/console/utils.js
deleted file mode 100644
index c61bb2713246cedca573a16a027f5c98fc3aac55..0000000000000000000000000000000000000000
--- a/js/src/dapps/console/utils.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-/* eslint-disable no-eval */
-
-export function evaluate (input) {
-  try {
-    const result = eval.apply(window, [ `${input}` ]);
-
-    return { result };
-  } catch (err) {
-    try {
-      const result = eval.apply(window, [ `(function () {
-        var x = ${input};
-        return x;
-      })()` ]);
-
-      return { result };
-    } catch (error) {
-      return { error };
-    }
-  }
-}
diff --git a/js/src/dapps/dappreg.js b/js/src/dapps/dappreg.js
deleted file mode 100644
index 68d2ab30a56d4c838e279f15e99acd7cffdc23f6..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import injectTapEventPlugin from 'react-tap-event-plugin';
-import { AppContainer } from 'react-hot-loader';
-
-injectTapEventPlugin();
-
-import Application from './dappreg/Application';
-
-import '../../assets/fonts/Roboto/font.css';
-import '../../assets/fonts/RobotoMono/font.css';
-import './style.css';
-
-ReactDOM.render(
-  <AppContainer>
-    <Application />
-  </AppContainer>,
-  document.querySelector('#container')
-);
-
-if (module.hot) {
-  module.hot.accept('./dappreg/Application/index.js', () => {
-    require('./dappreg/Application/index.js');
-
-    ReactDOM.render(
-      <AppContainer>
-        <Application />
-      </AppContainer>,
-      document.querySelector('#container')
-    );
-  });
-}
diff --git a/js/src/dapps/dappreg/Application/application.css b/js/src/dapps/dappreg/Application/application.css
deleted file mode 100644
index c6057e8ccc27eae6ac77a34ce0a2016da765056f..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Application/application.css
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../_colors.css';
-
-.body {
-  color: $text-color;
-  background: $background-color;
-  padding: 3em 0 6em;
-  text-align: center;
-}
-
-.apps {
-  background: white;
-  border-radius: 0.5em;
-  margin: 0 auto;
-  max-width: 980px;
-  padding: 1.5em;
-  text-align: left;
-}
-
-.footer {
-  font-size: 0.75em;
-  margin: 1em;
-  padding: 1.5em;
-  text-align: center;
-}
-
-.header {
-  background: $blue;
-  color: white;
-  left: 0;
-  padding: 1em;
-  position: fixed;
-  right: 0;
-  top: 0;
-  z-index: 25;
-}
-
-.loading {
-  text-align: center;
-  padding-top: 5em;
-  font-size: 2em;
-  color: $loading-color;
-}
diff --git a/js/src/dapps/dappreg/Application/application.js b/js/src/dapps/dappreg/Application/application.js
deleted file mode 100644
index b33aa0b965eb828a64a92cc10f08b705d86f94b1..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Application/application.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import { observer } from 'mobx-react';
-
-import DappsStore from '../dappsStore';
-
-import Dapps from '../Dapps';
-import Transactions from '../Transactions';
-import Warning from '../Warning';
-import styles from './application.css';
-
-@observer
-export default class Application extends Component {
-  dappsStore = DappsStore.get();
-
-  render () {
-    if (this.dappsStore.isLoading) {
-      return (
-        <div className={ styles.loading }>
-          Loading application
-        </div>
-      );
-    }
-
-    const { ownDapps, otherDapps } = this.dappsStore;
-
-    return (
-      <div className={ styles.body }>
-        <div className={ styles.header }>
-          DAPP REGISTRY, a global view of decentralized applications available on the network. Putting the puzzle together.
-        </div>
-
-        <div>
-          <Dapps
-            dapps={ ownDapps }
-            own
-            title='My Dapps'
-          />
-          <Dapps
-            dapps={ otherDapps }
-            title='Other Dapps'
-          />
-        </div>
-
-        <div className={ styles.footer }>
-          { this.dappsStore.count } applications registered, { this.dappsStore.ownedCount } owned by user
-        </div>
-
-        <Transactions />
-        <Warning />
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/dappreg/Application/index.js b/js/src/dapps/dappreg/Application/index.js
deleted file mode 100644
index 3d8d1ca3b851e5bfed73373e82eff06b5d9ea46c..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Application/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './application';
diff --git a/js/src/dapps/dappreg/Button/button.css b/js/src/dapps/dappreg/Button/button.css
deleted file mode 100644
index be2028c7ae876a5fea03ddbb25ae7b9663c63614..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Button/button.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../_colors.css';
-@import '../_utils.css';
-
-.button {
-  composes: bezier-transform;
-
-  background: $blue;
-  border: none;
-  border-radius: 0.25em;
-  color: white;
-  cursor: pointer;
-  font-size: 1em;
-  margin: 1em 0.375em;
-  opacity: 0.85;
-  padding: 0.75em 2em;
-
-  &[disabled] {
-    opacity: 0.5;
-    cursor: default;
-    background: $disabled-bg;
-  }
-
-  &[data-warning="true"] {
-    background: $warning-bg;
-  }
-
-  &:focus {
-    transform: scale(1.05);
-  }
-}
diff --git a/js/src/dapps/dappreg/Button/button.js b/js/src/dapps/dappreg/Button/button.js
deleted file mode 100644
index 40d84b5424d1128c0feb149730578dba1fc10a5c..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Button/button.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './button.css';
-
-export default class Button extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    label: PropTypes.string.isRequired,
-    warning: PropTypes.bool,
-    onClick: PropTypes.func
-  }
-
-  render () {
-    const { className, disabled, label, warning } = this.props;
-    const classes = [ styles.button, className ];
-
-    return (
-      <button
-        className={ classes.join(' ') }
-        data-warning={ warning }
-        disabled={ disabled }
-        onClick={ this.handleClick }
-      >
-        { label }
-      </button>
-    );
-  }
-
-  handleClick = (event) => {
-    if (this.props.disabled) {
-      event.preventDefault();
-      event.stopPropagation();
-      return;
-    }
-
-    this.props.onClick(event);
-  }
-}
diff --git a/js/src/dapps/dappreg/Button/index.js b/js/src/dapps/dappreg/Button/index.js
deleted file mode 100644
index 0c2be07ee37bab6a47298e29240a8ebdb094b646..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Button/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './button';
diff --git a/js/src/dapps/dappreg/Card/card.css b/js/src/dapps/dappreg/Card/card.css
deleted file mode 100644
index 05f9710a763ff35087598fae5fee780e87f266c7..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Card/card.css
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../_utils.css';
-
-$imgSize: 6rem;
-
-.container {
-  display: flex;
-}
-
-.card {
-  composes: bezier-transform;
-
-  align-items: center;
-  background-color: rgba(240, 240, 240, 0.75);
-  display: flex;
-  flex-direction: column;
-  margin: 1rem;
-  padding: 1rem;
-  width: 10rem;
-
-  &:hover,
-  &:focus {
-    cursor: pointer;
-    transform: scale(1.05);
-  }
-}
-
-.dashed {
-  border: 1px dashed black;
-}
-
-.icon {
-  margin-bottom: 0.75rem;
-  overflow: hidden;
-
-  img {
-    border-radius: 50%;
-    height: $imgSize;
-    width: $imgSize;
-  }
-}
-
-.name {
-  font-size: 1.25rem;
-  margin-bottom: 0.5rem;
-  overflow: hidden;
-  text-align: center;
-  text-overflow: ellipsis;
-  width: 100%;
-}
diff --git a/js/src/dapps/dappreg/Card/card.js b/js/src/dapps/dappreg/Card/card.js
deleted file mode 100644
index d3201425c47023a8bfea287dcc26402affa41005..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Card/card.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import keycode from 'keycode';
-import React, { Component, PropTypes } from 'react';
-import ReactDOM from 'react-dom';
-
-import styles from './card.css';
-
-export default class Card extends Component {
-  static propTypes = {
-    children: PropTypes.any,
-    dashed: PropTypes.bool,
-    focus: PropTypes.bool,
-    icon: PropTypes.object,
-    name: PropTypes.object,
-    onClick: PropTypes.func.isRequired
-  };
-
-  static defaultProps = {
-    dashed: false,
-    focus: false,
-    name: { value: '' }
-  };
-
-  componentWillReceiveProps (nextProps) {
-    if (nextProps.focus && !this.props.focus) {
-      this.handleFocus();
-    }
-  }
-
-  render () {
-    const { children, dashed, icon, name } = this.props;
-
-    const cardClasses = [ styles.card ];
-
-    if (dashed) {
-      cardClasses.push(styles.dashed);
-    }
-
-    return (
-      <div className={ styles.container }>
-        <div
-          className={ cardClasses.join(' ') }
-          onClick={ this.handleClick }
-          onKeyPress={ this.handleKeyPress }
-          ref='card'
-          tabIndex={ 0 }
-        >
-          <div className={ styles.icon }>
-            { icon }
-          </div>
-          <span
-            className={ styles.name }
-            title={ name.title || name.value }
-          >
-            { name.value }
-          </span>
-          { children }
-        </div>
-      </div>
-    );
-  }
-
-  handleKeyPress = (event) => {
-    const codeName = keycode(event);
-
-    if (codeName === 'enter') {
-      return this.handleClick();
-    }
-
-    return event;
-  }
-
-  handleFocus = () => {
-    setTimeout(() => {
-      const element = ReactDOM.findDOMNode(this.refs.card);
-
-      element && element.focus();
-    }, 50);
-  }
-
-  handleClick = () => {
-    this.props.onClick();
-  }
-}
diff --git a/js/src/dapps/dappreg/Card/index.js b/js/src/dapps/dappreg/Card/index.js
deleted file mode 100644
index 30b58580637f618a433eed374f806b58323fae1f..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Card/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './card';
diff --git a/js/src/dapps/dappreg/CreateDappCard/createDappCard.js b/js/src/dapps/dappreg/CreateDappCard/createDappCard.js
deleted file mode 100644
index 105789c11b1df6359ac5c77432003a9e250fdb67..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/CreateDappCard/createDappCard.js
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import DappsStore from '../dappsStore';
-import Card from '../Card';
-import ModalRegister from '../ModalRegister';
-
-import PlusImage from '~/../assets/images/dapps/plus.svg';
-
-export default class CreateDappCard extends Component {
-  state = {
-    dappId: null,
-    focus: false,
-    open: false
-  };
-
-  dappsStore = DappsStore.get();
-
-  render () {
-    const { focus } = this.state;
-
-    return (
-      <div>
-        { this.renderModal() }
-
-        <Card
-          dashed
-          focus={ focus }
-          icon={ (<img src={ PlusImage } />) }
-          name={ { value: 'Register a dapp' } }
-          onClick={ this.handleOpen }
-        />
-      </div>
-    );
-  }
-
-  renderModal () {
-    const { dappId, open } = this.state;
-
-    if (!open) {
-      return null;
-    }
-
-    return (
-      <ModalRegister
-        dappId={ dappId }
-        onClose={ this.handleClose }
-        onRegister={ this.handleRegister }
-      />
-    );
-  }
-
-  handleOpen = () => {
-    const dappId = this.dappsStore.createDappId();
-
-    this.setState({ focus: false, open: true, dappId });
-  }
-
-  handleClose = () => {
-    this.setState({ focus: true, open: false, dappId: null });
-  }
-
-  handleRegister = () => {
-    const { dappId } = this.state;
-
-    this.dappsStore.register(dappId);
-    this.handleClose();
-  }
-}
diff --git a/js/src/dapps/dappreg/CreateDappCard/index.js b/js/src/dapps/dappreg/CreateDappCard/index.js
deleted file mode 100644
index 4181f8dccbe70bbe2c433d10615ec4d0b102741f..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/CreateDappCard/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './createDappCard';
diff --git a/js/src/dapps/dappreg/DappCard/dappCard.css b/js/src/dapps/dappreg/DappCard/dappCard.css
deleted file mode 100644
index ed4b483ae52a88bff18ad681c4b2e610394405b2..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/DappCard/dappCard.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.author,
-.version {
-  font-size: 0.75rem;
-  text-align: center;
-}
diff --git a/js/src/dapps/dappreg/DappCard/dappCard.js b/js/src/dapps/dappreg/DappCard/dappCard.js
deleted file mode 100644
index deccde9fca79af0dfa58224458e355cef70c5ede..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/DappCard/dappCard.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import Card from '../Card';
-import DappsStore from '../dappsStore';
-import DappModal from '../DappModal';
-
-import styles from './dappCard.css';
-
-export default class DappCard extends Component {
-  dappsStore = DappsStore.get();
-
-  static propTypes = {
-    dapp: PropTypes.object.isRequired
-  };
-
-  state = {
-    focus: false,
-    open: false
-  };
-
-  render () {
-    const { dapp } = this.props;
-    const { focus } = this.state;
-    const { id, image } = dapp;
-    const manifest = dapp.manifest.content;
-
-    return (
-      <div>
-        { this.renderModal() }
-
-        <Card
-          focus={ focus }
-          icon={ this.renderImage(image.url) }
-          name={ { title: id, value: manifest && manifest.name || id } }
-          onClick={ this.handleOpen }
-        >
-          { this.renderVersion(manifest) }
-          { this.renderAuthor(manifest) }
-        </Card>
-      </div>
-    );
-  }
-
-  renderModal () {
-    const { dapp } = this.props;
-    const { open } = this.state;
-
-    return (
-      <DappModal
-        dapp={ dapp }
-        onClose={ this.handleClose }
-        open={ open }
-      />
-    );
-  }
-
-  renderImage (url) {
-    return (
-      <img src={ url } />
-    );
-  }
-
-  renderVersion (manifest) {
-    if (!manifest || !manifest.version) {
-      return null;
-    }
-
-    return (
-      <span className={ styles.version }>
-        v{ manifest.version }
-      </span>
-    );
-  }
-
-  renderAuthor (manifest) {
-    if (!manifest || !manifest.author) {
-      return null;
-    }
-
-    return (
-      <span className={ styles.author }>
-        by { manifest && manifest.author }
-      </span>
-    );
-  }
-
-  handleClose = () => {
-    this.setState({ focus: true, open: false });
-  }
-
-  handleOpen = () => {
-    this.setState({ focus: false, open: true });
-  }
-}
diff --git a/js/src/dapps/dappreg/DappCard/index.js b/js/src/dapps/dappreg/DappCard/index.js
deleted file mode 100644
index eed38ca781cf96b8c1473bb2a2dcf78a16b7bb32..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/DappCard/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dappCard';
diff --git a/js/src/dapps/dappreg/DappModal/dappModal.css b/js/src/dapps/dappreg/DappModal/dappModal.css
deleted file mode 100644
index 5b7e18f9bbae24bc3e8561292ce80d08732b0a5b..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/DappModal/dappModal.css
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../_colors.css';
-@import '../_utils.css';
-
-$imgSize: 5rem;
-
-.code {
-  color: $code-color;
-  font-family: 'Roboto Mono', monospace;
-  margin-top: 1rem;
-
-  .codeTitle {
-    align-items: center;
-    background-color: $code-title-bg;
-    color: $code-title-color;
-    display: inline-flex;
-    height: 2rem;
-    padding: 0 0.5rem;
-  }
-
-  .codeContainer {
-    background-color: $code-bg;
-    padding: 0.5rem 1rem;
-  }
-
-  code {
-    font-size: 0.75rem;
-    white-space: pre-wrap;
-  }
-}
-
-.actions {
-  height: 0.5rem;
-  position: relative;
-  text-align: right;
-  top: 0.5rem;
-
-  .button {
-    margin-bottom: 0;
-    margin-top: 0;
-    padding: 0.5rem 1.5rem;
-  }
-}
-
-.icon {
-  margin-right: 1.5rem;
-  overflow: hidden;
-
-  img {
-    border: 2px solid #ddd;
-    border-radius: 50%;
-    height: $imgSize;
-    width: $imgSize;
-  }
-}
-
-.name {
-  font-size: 1.25rem;
-  margin-bottom: 0.25rem;
-}
-
-.info {
-  color: #ddd;
-  font-size: 0.75rem;
-  margin-top: 0.25rem;
-}
diff --git a/js/src/dapps/dappreg/DappModal/dappModal.js b/js/src/dapps/dappreg/DappModal/dappModal.js
deleted file mode 100644
index 28597aba93ea3f56b1f28e3ed433b525193349f6..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/DappModal/dappModal.js
+++ /dev/null
@@ -1,423 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../parity';
-import DappsStore from '../dappsStore';
-import Button from '../Button';
-import Input from '../Input';
-import Modal from '../Modal';
-import ModalDelete from '../ModalDelete';
-import ModalUpdate from '../ModalUpdate';
-import SelectAccount from '../SelectAccount';
-
-import styles from './dappModal.css';
-
-@observer
-export default class DappModal extends Component {
-  static propTypes = {
-    dapp: PropTypes.object.isRequired,
-    open: PropTypes.bool.isRequired,
-    onClose: PropTypes.func.isRequired
-  };
-
-  state = {
-    showDelete: false,
-    showUpdate: false,
-    updates: null,
-    updating: false
-  };
-
-  dappsStore = DappsStore.get();
-
-  render () {
-    const { dapp, open } = this.props;
-    const { showDelete, showUpdate, updates } = this.state;
-
-    if (!open) {
-      return null;
-    }
-
-    return (
-      <div>
-        {
-          showDelete
-          ? (
-            <ModalDelete
-              dappId={ dapp.id }
-              onClose={ this.handleDeleteClose }
-              onDelete={ this.handleDeleteConfirm }
-            />
-          )
-          : null
-        }
-        {
-          showUpdate
-          ? (
-            <ModalUpdate
-              dappId={ dapp.id }
-              onClose={ this.handleUpdateClose }
-              onConfirm={ this.handleUpdateConfirm }
-              updates={ updates }
-            />
-          )
-          : null
-        }
-
-        <Modal
-          header={ this.renderHeader(dapp) }
-          onClose={ this.handleClose }
-        >
-          { this.renderContent(dapp) }
-        </Modal>
-      </div>
-    );
-  }
-
-  renderContent (dapp) {
-    const manifest = dapp.manifest.content || {};
-
-    return (
-      <div>
-        <div>
-          { this.renderInputs(dapp) }
-        </div>
-
-        { this.renderActions(dapp) }
-
-        <div className={ styles.code }>
-          <div className={ styles.codeTitle }>manifest.json</div>
-          <div className={ styles.codeContainer }>
-            <code>{ JSON.stringify(manifest, null, 2) }</code>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderActions (dapp) {
-    if (!dapp.isOwner && !dapp.isContractOwner) {
-      return null;
-    }
-
-    if (!dapp.isOwner && dapp.isContractOwner) {
-      return (
-        <div className={ styles.actions }>
-          <Button
-            className={ styles.button }
-            label='Delete'
-            onClick={ this.handleDelete }
-            warning
-          />
-        </div>
-      );
-    }
-
-    const { isEditing } = dapp;
-    const { updating } = this.state;
-
-    if (updating) {
-      return (
-        <div className={ styles.actions }>
-          <Button
-            className={ styles.button }
-            disabled
-            label='Updating...'
-          />
-        </div>
-      );
-    }
-
-    if (isEditing) {
-      return (
-        <div className={ styles.actions }>
-          <Button
-            className={ styles.button }
-            disabled={ !dapp.canSave }
-            label='Save'
-            onClick={ this.handleSave }
-          />
-          <Button
-            className={ styles.button }
-            label='Fetch Registry'
-            onClick={ this.handleFetchRegistry }
-          />
-          <Button
-            className={ styles.button }
-            label='Cancel'
-            onClick={ this.handleCancel }
-            warning
-          />
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.actions }>
-        <Button
-          className={ styles.button }
-          label='Edit'
-          onClick={ this.handleEdit }
-        />
-        <Button
-          className={ styles.button }
-          label='Delete'
-          onClick={ this.handleDelete }
-          warning
-        />
-      </div>
-    );
-  }
-
-  renderHeader (dapp) {
-    const { id, image } = dapp;
-    const manifest = dapp.manifest.content || {};
-
-    const infos = [];
-
-    if (manifest.version) {
-      infos.push(`v${manifest.version}`);
-    }
-
-    if (manifest.author) {
-      infos.push(`by ${manifest.author}`);
-    }
-
-    return (
-      <div>
-        <div className={ styles.icon }>
-          <img src={ image.url } />
-        </div>
-        <div>
-          <div className={ styles.name }>
-            { manifest.name || 'Unnamed' }
-          </div>
-          <div className={ styles.info }>
-            { id }
-          </div>
-          <div className={ styles.info }>
-            { infos.length > 0 ? infos.join(', ') : null }
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderInputs (dapp) {
-    return [
-      this.renderOwner(dapp),
-      this.renderHashInput(dapp, 'image', 'Image URL', true),
-      this.renderHashInput(dapp, 'manifest', 'Manifest URL'),
-      this.renderHashInput(dapp, 'content', 'Content URL')
-    ];
-  }
-
-  renderOwner (dapp) {
-    const { isEditing } = dapp;
-
-    if (isEditing) {
-      return this.renderOwnerSelect(dapp);
-    }
-
-    return this.renderOwnerStatic(dapp);
-  }
-
-  renderOwnerSelect (dapp) {
-    const overlayImage = (
-      <img
-        className={ styles.overlayImage }
-        src={ api.util.createIdentityImg(this.props.dapp.wip.owner.address, 4) }
-      />
-    );
-
-    return (
-      <Input
-        key='owner_select'
-        hint={ this.props.dapp.wip.owner.address }
-        label='Owner, select the application owner and editor'
-        overlay={ overlayImage }
-      >
-        <SelectAccount
-          onSelect={ this.handleSelectOwner }
-          value={ dapp.wip.owner.address }
-        />
-      </Input>
-    );
-  }
-
-  renderOwnerStatic (dapp) {
-    const overlayImage = (
-      <img
-        className={ styles.overlayImage }
-        src={ api.util.createIdentityImg(dapp.owner.address, 4) }
-      />
-    );
-
-    return (
-      <Input
-        key='owner_static'
-        hint={ dapp.owner.address }
-        label='Owner, the application owner and editor'
-        overlay={ overlayImage }
-      >
-        <input
-          readOnly
-          tabIndex={ -1 }
-          value={ dapp.owner.name || dapp.owner.address }
-        />
-      </Input>
-    );
-  }
-
-  renderHashInput (dapp, type, label, isImage = false) {
-    const handleChange = (event) => {
-      return this.handleChangeHash(event, type);
-    };
-
-    const { isEditing, wip } = dapp;
-
-    const changed = wip && wip[type].changed;
-    const error = wip && wip[type].error;
-
-    const hash = dapp[type].hash;
-    const url = dapp[type].url;
-
-    const overlayImage = (isImage && hash)
-      ? (
-        <img
-          className={ styles.overlayImage }
-          src={ `/api/content/${hash.substr(2)}` }
-        />
-      )
-      : null;
-
-    const wipUrl = isEditing && wip && wip[type].url;
-
-    const hint = error || (!changed && hash) || '...';
-    const value = typeof wipUrl !== 'string'
-      ? url || ''
-      : wipUrl;
-
-    return (
-      <Input
-        key={ `${type}Edit` }
-        hint={ hint }
-        label={ label }
-        overlay={ overlayImage }
-      >
-        <input
-          data-dirty={ changed }
-          data-error={ !!error }
-          onChange={ handleChange }
-          readOnly={ !isEditing }
-          tabIndex={ isEditing ? 0 : -1 }
-          value={ value }
-        />
-      </Input>
-    );
-  }
-
-  handleClose = () => {
-    this.handleCancel();
-    this.props.onClose();
-  }
-
-  handleSelectOwner = (event) => {
-    const { value } = event.target;
-
-    const changed = (this.props.dapp.owner.address !== value);
-
-    this.props.dapp.handleChange({
-      owner: {
-        address: value,
-        changed
-      }
-    });
-  }
-
-  handleChangeHash = (event, type) => {
-    if (!this.props.dapp.isEditing) {
-      return;
-    }
-
-    const url = event.target.value;
-    const changed = (this.props.dapp[type].url !== url);
-
-    this.props.dapp.handleChange({
-      [ type ]: {
-        error: null,
-        changed,
-        url
-      }
-    });
-  }
-
-  handleFetchRegistry = () => {
-    this.dappsStore.fetchRegistryData(this.props.dapp);
-  }
-
-  handleCancel = () => {
-    this.props.dapp.setEditing(false);
-  }
-
-  handleEdit = () => {
-    this.props.dapp.setEditing(true);
-  }
-
-  handleDelete = () => {
-    this.setState({ showDelete: true });
-  }
-
-  handleDeleteClose = () => {
-    this.setState({ showDelete: false });
-  }
-
-  handleDeleteConfirm = () => {
-    this.dappsStore.delete(this.props.dapp);
-    this.handleDeleteClose();
-    this.handleClose();
-  }
-
-  handleSave = () => {
-    const updates = this.props.dapp.handleSave();
-
-    this.setState({ showUpdate: true, updates });
-  }
-
-  handleUpdateClose = () => {
-    this.setState({ showUpdate: false, updates: null });
-  }
-
-  handleUpdateConfirm = () => {
-    const { id, owner } = this.props.dapp;
-    const { updates } = this.state;
-
-    this.handleUpdateClose();
-    this.handleCancel();
-    this.setState({ updating: true });
-
-    return this.dappsStore.update(id, owner.address, updates)
-      .then(() => {
-        this.setState({ updating: false });
-      })
-      .catch((error) => {
-        this.setState({ updating: false });
-        throw error;
-      });
-  }
-}
diff --git a/js/src/dapps/dappreg/DappModal/index.js b/js/src/dapps/dappreg/DappModal/index.js
deleted file mode 100644
index 4d14ecd275ce6224f7e06b8b272317e2f73538c3..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/DappModal/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dappModal';
diff --git a/js/src/dapps/dappreg/Dapps/dapps.css b/js/src/dapps/dappreg/Dapps/dapps.css
deleted file mode 100644
index 77ab087c028a741a9293434956cf234320ebe43f..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Dapps/dapps.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.dapps {
-  background-color: rgba(255, 255, 255, 0.9);
-  margin: 1rem;
-  padding: 1rem;
-  text-align: left;
-}
-
-.container {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-
-  > * {
-    flex: 0 0 auto;
-    display: flex;
-  }
-}
-
-.title {
-  margin: 0 0 0.5rem;
-}
diff --git a/js/src/dapps/dappreg/Dapps/dapps.js b/js/src/dapps/dappreg/Dapps/dapps.js
deleted file mode 100644
index da9675bcbe91f6c01ac71aa9dbe254fe36bff36c..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Dapps/dapps.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import CreateDappCard from '../CreateDappCard';
-import DappCard from '../DappCard';
-
-import styles from './dapps.css';
-
-export default class Dapps extends Component {
-  static propTypes = {
-    dapps: PropTypes.array.isRequired,
-    title: PropTypes.string.isRequired,
-    own: PropTypes.bool
-  };
-
-  static defaultProps = {
-    own: false
-  };
-
-  render () {
-    const { dapps, title } = this.props;
-
-    return (
-      <div className={ styles.dapps }>
-        <h2 className={ styles.title }>{ title }</h2>
-        <div className={ styles.container }>
-          { this.renderAddDapp() }
-          { this.renderDapps(dapps) }
-        </div>
-      </div>
-    );
-  }
-
-  renderAddDapp () {
-    const { own } = this.props;
-
-    if (!own) {
-      return null;
-    }
-
-    return (
-      <CreateDappCard />
-    );
-  }
-
-  renderDapps (dapps) {
-    return dapps.map((dapp) => {
-      const { id } = dapp;
-
-      return (
-        <DappCard
-          dapp={ dapp }
-          key={ id }
-        />
-      );
-    });
-  }
-}
diff --git a/js/src/dapps/dappreg/Dapps/index.js b/js/src/dapps/dappreg/Dapps/index.js
deleted file mode 100644
index 9e6dddb632c8c6ec841221c3398d20e76b3e10c8..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Dapps/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dapps';
diff --git a/js/src/dapps/dappreg/Input/index.js b/js/src/dapps/dappreg/Input/index.js
deleted file mode 100644
index 29e00f72b19f9481ced013481cbec51dc551898c..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Input/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './input';
diff --git a/js/src/dapps/dappreg/Input/input.css b/js/src/dapps/dappreg/Input/input.css
deleted file mode 100644
index c553387a6a9028aeb4315736eca323446dc95952..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Input/input.css
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.input {
-  position: relative;
-
-  input, select {
-    background: rgba(255, 255, 255, 0.85);
-    border: 4px solid rgba(223, 223, 223, 0.85);
-    border-radius: 0.25em;
-    box-sizing: border-box;
-    color: #333;
-    font-size: 1em;
-    margin: 0.25em 0 0.25em 0;
-    padding: 0.5em 0.5em 1.5em 0.5em;
-    width: 100%;
-  }
-
-  &.withOverlay input {
-    padding-right: 3em;
-  }
-
-  input {
-    padding-bottom: 1.5em;
-
-    &[data-dirty="true"] {
-      background: rgba(255, 255, 203, 0.85);
-      border-color: rgba(203, 203, 151, 0.85);
-    }
-
-    &[data-error="true"] {
-      background: rgba(255, 223, 223, 0.85) !important;
-      border-color: rgba(223, 191, 191, 0.85) !important;
-    }
-
-    &[readonly] {
-      background: rgba(239, 239, 239, 0.85);
-      border-color: rgba(223, 223, 223, 0.85);
-    }
-  }
-
-  label {
-    color: #888;
-    display: block;
-    font-size: 0.75em;
-    margin-top: 1.5em;
-  }
-
-  select {
-    -moz-appearance: none;
-    -webkit-appearance: none;
-    appearance: none;
-    height: 58px;
-
-    &[disabled] {
-      background: rgba(239, 239, 239, 0.85);
-      border-color: rgba(223, 223, 223, 0.85);
-    }
-  }
-
-  .hint {
-    color: #888;
-    display: block;
-    font-size: 0.75em;
-    position: absolute;
-    right: 52px;
-    text-align: right;
-    top: 52px;
-  }
-
-  .overlay {
-    right: 10px;
-    position: absolute;
-    top: 30px;
-
-    img {
-      border-radius: 50%;
-      height: 32px;
-      width: 32px;
-    }
-  }
-}
diff --git a/js/src/dapps/dappreg/Input/input.js b/js/src/dapps/dappreg/Input/input.js
deleted file mode 100644
index 27084c3ed1951d332d155f52a2053f2d9179611b..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Input/input.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './input.css';
-
-export default class Input extends Component {
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-    hint: PropTypes.string,
-    label: PropTypes.string.isRequired,
-    overlay: PropTypes.node
-  }
-
-  render () {
-    const { children, hint, label, overlay } = this.props;
-
-    const inputClasses = [ styles.input ];
-
-    if (overlay) {
-      inputClasses.push(styles.withOverlay);
-    }
-
-    return (
-      <div className={ inputClasses.join(' ') }>
-        <label>
-          { label }
-        </label>
-        { children }
-        <div className={ styles.hint }>
-          { hint }
-        </div>
-        <div className={ styles.overlay }>
-          { overlay }
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/dappreg/Modal/index.js b/js/src/dapps/dappreg/Modal/index.js
deleted file mode 100644
index 7e9d10c91b5e39085a6b9a44c878ebf5e9b2019d..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Modal/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './modal';
diff --git a/js/src/dapps/dappreg/Modal/modal.css b/js/src/dapps/dappreg/Modal/modal.css
deleted file mode 100644
index 73bffc9e781b832789d0beae8b84cec4566423f3..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Modal/modal.css
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../_colors.css';
-@import '../_utils.css';
-
-.modal {
-  align-items: center;
-  background-color: $modal-bg;
-  bottom: 0;
-  display: flex;
-  justify-content: center;
-  left: 0;
-  position: fixed;
-  right: 0;
-  top: 0;
-  z-index: 150;
-
-  &.secondary {
-    align-items: flex-start;
-    z-index: 200;
-
-    .content {
-      line-height: 1.5rem;
-      padding: 2rem;
-      text-align: center;
-    }
-
-    .dialog {
-      max-width: 840px;
-      width: 85vw;
-    }
-  }
-}
-
-.close {
-  composes: bezier-transform;
-
-  color: white;
-  display: inline-block;
-  font-family: 'Roboto Mono', monospace;
-  font-size: 4rem;
-  opacity: 0.75;
-  padding: 0;
-  position: fixed;
-  right: 1rem;
-  top: 0.25rem;
-
-  &:hover {
-    cursor: pointer;
-    opacity: 1;
-
-    .closeIcon {
-      transform: rotate(135deg);
-    }
-  }
-}
-
-.closeIcon {
-  composes: bezier-transform;
-
-  height: 3rem;
-  width: 3rem;
-  transform: rotate(45deg);
-}
-
-.dialog {
-  background-color: rgba(255, 255, 255, 0.95);
-  display: flex;
-  flex-direction: column;
-  max-height: 90vh;
-  overflow: hidden;
-  position: relative;
-  max-width: 740px;
-  width: 75vw;
-
-  > * {
-    padding: 0.5rem 1rem;
-  }
-}
-
-.content {
-  flex: 1 1 auto;
-  overflow: auto;
-
-  .section {
-    margin: 0;
-    padding: 0;
-
-    * {
-      overflow-x: hidden;
-      text-overflow: ellipsis;
-    }
-  }
-
-  .section + .section {
-    margin-top: 1em;
-  }
-}
-
-.footer {
-  padding: 0.5em 1.625em;
-  text-align: right;
-}
-
-.header {
-  background-color: $blue;
-  color: white;
-  min-height: 3rem;
-
-  &,
-  & > * {
-    align-items: center;
-    display: flex;
-    flex: 0 0 auto;
-    flex-direction: row;
-  }
-}
-
-.heading {
-  color: #888;
-  font-size: 0.75em;
-}
-
-.light {
-  color: #888;
-}
diff --git a/js/src/dapps/dappreg/Modal/modal.js b/js/src/dapps/dappreg/Modal/modal.js
deleted file mode 100644
index d70ac1090c20c8b982c20af39cf7e192ef5a33a2..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Modal/modal.js
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import keycode from 'keycode';
-import React, { Component, PropTypes } from 'react';
-import ReactDOM from 'react-dom';
-
-import Button from '../Button';
-
-import styles from './modal.css';
-import CloseImage from '~/../assets/images/dapps/close.svg';
-
-export default class Modal extends Component {
-  static propTypes = {
-    actions: PropTypes.array,
-    children: PropTypes.node,
-    header: PropTypes.node,
-    secondary: PropTypes.bool,
-    onClose: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func
-  };
-
-  static defaultProps = {
-    actions: null,
-    secondary: false
-  };
-
-  render () {
-    const { children, actions, header, secondary } = this.props;
-
-    const modalClasses = [ styles.modal ];
-
-    if (secondary) {
-      modalClasses.push(styles.secondary);
-    }
-
-    return (
-      <div
-        className={ modalClasses.join(' ') }
-        onClick={ this.handleClose }
-        onKeyUp={ this.handleKeyPress }
-      >
-        <div
-          className={ styles.dialog }
-          onClick={ this.stopEvent }
-          ref={ this.handleSetRef }
-          tabIndex={ open ? 0 : null }
-        >
-          <div className={ styles.header }>
-            { header }
-            <div
-              className={ styles.close }
-              onClick={ this.handleClose }
-              onKeyPress={ this.handleCloseKeyPress }
-              tabIndex={ open ? 0 : null }
-              title='close'
-            >
-              <img
-                className={ styles.closeIcon }
-                src={ CloseImage }
-              />
-            </div>
-          </div>
-
-          <div className={ styles.content }>
-            { children }
-          </div>
-
-          { actions ? this.renderActions(actions) : null }
-        </div>
-      </div>
-    );
-  }
-
-  renderActions (actions) {
-    return (
-      <div className={ styles.footer }>
-        { actions.map((action) => {
-          let onClick = () => {};
-
-          switch (action.type) {
-            case 'confirm':
-              onClick = this.handleConfirm;
-              break;
-
-            case 'close':
-              onClick = this.handleClose;
-              break;
-          }
-
-          return (
-            <Button
-              key={ action.type }
-              label={ action.label }
-              warning={ action.warning }
-              onClick={ onClick }
-            />
-          );
-        }) }
-      </div>
-    );
-  }
-
-  stopEvent = (event) => {
-    event.stopPropagation();
-    event.preventDefault();
-
-    return false;
-  }
-
-  handleKeyPress = (event) => {
-    const codeName = keycode(event);
-
-    if (codeName === 'esc') {
-      return this.handleClose();
-    }
-
-    return event;
-  }
-
-  handleCloseKeyPress = (event) => {
-    const codeName = keycode(event);
-
-    if (codeName === 'enter') {
-      return this.handleClose();
-    }
-
-    return event;
-  }
-
-  handleSetRef = (containerRef) => {
-    // Focus after the modal is open
-    setTimeout(() => {
-      const element = ReactDOM.findDOMNode(containerRef);
-
-      element && element.focus();
-    }, 100);
-  }
-
-  handleConfirm = () => {
-    this.props.onConfirm && this.props.onConfirm();
-  }
-
-  handleClose = () => {
-    this.props.onClose();
-  }
-}
diff --git a/js/src/dapps/dappreg/ModalDelete/index.js b/js/src/dapps/dappreg/ModalDelete/index.js
deleted file mode 100644
index 4047f9dafae5dd62d08beed55f2febb901e4e521..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/ModalDelete/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './modalDelete';
diff --git a/js/src/dapps/dappreg/ModalDelete/modalDelete.js b/js/src/dapps/dappreg/ModalDelete/modalDelete.js
deleted file mode 100644
index 20ca64067ff864494e810c1da9336a43d3120700..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/ModalDelete/modalDelete.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import Modal from '../Modal';
-
-import styles from '../Modal/modal.css';
-
-export default class ModalDelete extends Component {
-  static propTypes = {
-    dappId: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onDelete: PropTypes.func.isRequired
-  };
-
-  render () {
-    const { dappId, onClose, onDelete } = this.props;
-    const actions = [
-      { type: 'close', label: 'No, Cancel' },
-      { type: 'confirm', label: 'Yes, Delete', warning: true }
-    ];
-
-    return (
-      <Modal
-        actions={ actions }
-        header='Confirm Application Deletion'
-        onClose={ onClose }
-        onConfirm={ onDelete }
-        secondary
-      >
-        <div className={ styles.section }>
-          You are about to remove a decentralized application from the registry,
-          the details of this application is given below. Removal does not return any fees,
-          however the application will not be available to users anymore.
-        </div>
-        <div className={ styles.section }>
-          <div className={ styles.heading }>
-            Application identifier
-          </div>
-          <div>
-            { dappId }
-          </div>
-        </div>
-      </Modal>
-    );
-  }
-}
diff --git a/js/src/dapps/dappreg/ModalRegister/index.js b/js/src/dapps/dappreg/ModalRegister/index.js
deleted file mode 100644
index 19b37586b61a6f473c34a56083f1bb09ca96b602..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/ModalRegister/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './modalRegister';
diff --git a/js/src/dapps/dappreg/ModalRegister/modalRegister.js b/js/src/dapps/dappreg/ModalRegister/modalRegister.js
deleted file mode 100644
index ee4d2a3745421f2d4f386751b23c44bc8454bbb8..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/ModalRegister/modalRegister.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { observer } from 'mobx-react';
-
-import { api } from '../parity';
-import DappsStore from '../dappsStore';
-
-import Modal from '../Modal';
-
-import styles from '../Modal/modal.css';
-
-@observer
-export default class ModalRegister extends Component {
-  static propTypes = {
-    dappId: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onRegister: PropTypes.func.isRequired
-  };
-
-  dappsStore = DappsStore.get();
-
-  render () {
-    const { onClose, onRegister } = this.props;
-    const actions = [
-      { type: 'close', label: 'No, Cancel' },
-      { type: 'confirm', label: 'Yes, Register', warning: true }
-    ];
-
-    return (
-      <Modal
-        actions={ actions }
-        header='Confirm Application Registration'
-        onClose={ onClose }
-        onConfirm={ onRegister }
-        secondary
-      >
-        <div className={ styles.section }>
-          You are about to register a new decentralized application on the network, the details of
-          this application is given below. This will require a non-refundable fee
-          of { api.util.fromWei(this.dappsStore.fee).toFormat(3) } <small>ETH</small>
-        </div>
-        <div className={ styles.section }>
-          <div className={ styles.heading }>
-            Unique assigned application identifier
-          </div>
-          <div>
-            { this.props.dappId }
-          </div>
-        </div>
-      </Modal>
-    );
-  }
-}
diff --git a/js/src/dapps/dappreg/ModalUpdate/index.js b/js/src/dapps/dappreg/ModalUpdate/index.js
deleted file mode 100644
index b8232275bdebf29231429b6a5575072d83cb8f08..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/ModalUpdate/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './modalUpdate';
diff --git a/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js b/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js
deleted file mode 100644
index 051e56ddc51b0facd255c75c46e1b47a2c42127a..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import Modal from '../Modal';
-
-import styles from '../Modal/modal.css';
-
-export default class ModalUpdate extends Component {
-  static propTypes = {
-    dappId: PropTypes.string.isRequired,
-    updates: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired
-  };
-
-  render () {
-    const { dappId, onClose, onConfirm } = this.props;
-    const actions = [
-      { type: 'close', label: 'No, Cancel' },
-      { type: 'confirm', label: 'Yes, Update', warning: true }
-    ];
-
-    return (
-      <Modal
-        actions={ actions }
-        header='Confirm Application Update'
-        onClose={ onClose }
-        onConfirm={ onConfirm }
-        secondary
-      >
-        <div className={ styles.section }>
-          You are about to update the application details in the registry,
-          the details of these updates are given below. Please note that each
-          update will generate a seperate transaction.
-        </div>
-        <div className={ styles.section }>
-          <div className={ styles.heading }>
-            Application identifier
-          </div>
-          <div>
-            { dappId }
-          </div>
-        </div>
-        { this.renderChanges() }
-      </Modal>
-    );
-  }
-
-  renderChanges () {
-    const { updates } = this.props;
-
-    return Object.keys(updates)
-      .map((type) => {
-        return (
-          <div
-            className={ styles.section }
-            key={ `${type}Update` }
-          >
-            <div className={ styles.heading }>
-              Updates to { type }
-            </div>
-            <div>
-              <div>{ updates[type] || '(removed)' }</div>
-            </div>
-          </div>
-        );
-      });
-  }
-}
diff --git a/js/src/dapps/dappreg/SelectAccount/index.js b/js/src/dapps/dappreg/SelectAccount/index.js
deleted file mode 100644
index 92c974a8f4a7f3855adc454c54c760f93c544e42..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/SelectAccount/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './selectAccount';
diff --git a/js/src/dapps/dappreg/SelectAccount/selectAccount.js b/js/src/dapps/dappreg/SelectAccount/selectAccount.js
deleted file mode 100644
index b875ad8241ebbcd9b7ceff12e253e066ff02b756..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/SelectAccount/selectAccount.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { observer } from 'mobx-react';
-
-import DappsStore from '../dappsStore';
-
-@observer
-export default class SelectAccount extends Component {
-  dappsStore = DappsStore.get();
-
-  static propTypes = {
-    value: PropTypes.string.isRequired,
-    onSelect: PropTypes.func.isRequired
-  };
-
-  render () {
-    const { value } = this.props;
-
-    return (
-      <select
-        value={ value }
-        onChange={ this.handleSelect }
-      >
-        { this.renderOptions() }
-      </select>
-    );
-  }
-
-  renderOptions () {
-    return this.dappsStore.accounts.map((account) => {
-      return (
-        <option value={ account.address } key={ account.address }>
-          { account.name }
-        </option>
-      );
-    });
-  }
-
-  handleSelect = (event) => {
-    this.props.onSelect && this.props.onSelect(event);
-  }
-}
diff --git a/js/src/dapps/dappreg/Transactions/index.js b/js/src/dapps/dappreg/Transactions/index.js
deleted file mode 100644
index 0ba7422c9a6dd433a4c2874070e8ba0c0bcea52a..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Transactions/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './transactions';
diff --git a/js/src/dapps/dappreg/Transactions/transactions.css b/js/src/dapps/dappreg/Transactions/transactions.css
deleted file mode 100644
index e421e2a67d477d33c62fcbd9fb2186b7d42f3b23..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Transactions/transactions.css
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  bottom: 4rem;
-  position: fixed;
-  right: 0;
-  z-index: 150;
-}
-
-.transaction {
-  display: flex;
-  flex-direction: column;
-  margin-top: 0.5rem;
-  width: 30rem;
-
-  .header {
-    flex: 0 0 auto;
-    height: 1.5rem;
-    position: relative;
-    width: 100%;
-
-    > * {
-      display: inline-block;
-      font-family: 'Roboto Mono', monospace;
-      font-size: 0.75rem;
-      overflow: hidden;
-      padding: 0.25rem 0.5rem;
-      position: absolute;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-
-  .name {
-    background-color: rgba(40, 40, 40, 0.95);
-    color: white;
-    left: 0.5rem;
-    margin-right: 1.5rem;
-    max-width: 20rem;
-  }
-
-  .date {
-    background-color: rgba(215, 215, 215, 0.95);
-    color: black;
-    max-width: 5rem;
-    right: 0.5rem;
-  }
-
-  .content {
-    align-items: center;
-    background-color: rgba(80, 80, 80, 0.95);
-    color: white;
-    display: flex;
-    flex: 1 1 auto;
-    padding: 1rem 0.75rem;
-
-    > * {
-      max-width: 100%;
-      white-space: pre-wrap;
-      word-wrap: break-word;
-    }
-
-    &:hover {
-      cursor: pointer;
-    }
-
-    &.error {
-      background-color: rgba(255, 68, 68, 0.95);
-    }
-
-    &.pending {
-      background-color: rgba(243, 156, 18, 0.95);
-    }
-
-    &.confirmed {
-      background-color: rgba(39, 174, 96, 0.95);
-      color: white;
-    }
-  }
-}
diff --git a/js/src/dapps/dappreg/Transactions/transactions.js b/js/src/dapps/dappreg/Transactions/transactions.js
deleted file mode 100644
index db15d0b2abbb98ab5672b3f998c1ebc764ac941a..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Transactions/transactions.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import { observer } from 'mobx-react';
-
-import DappsStore from '../dappsStore';
-
-import styles from './transactions.css';
-
-@observer
-export default class Transactions extends Component {
-  dappsStore = DappsStore.get();
-
-  render () {
-    const { transactions } = this.dappsStore;
-    const displayedTransactions = Object.values(transactions)
-      .filter((tx) => !tx.hide)
-      .sort((txA, txB) => txB.start - txA.start);
-
-    return (
-      <div className={ styles.container }>
-        { displayedTransactions.map((transaction) => this.renderTransaction(transaction)) }
-      </div>
-    );
-  }
-
-  renderTransaction (transaction) {
-    const { error, name, requestId, start, transactionHash, transactionReceipt } = transaction;
-
-    const date = new Date(start);
-    const isError = !!error;
-    const isPendingNetwork = transactionHash && !transactionReceipt;
-    const isConfirmed = !!transactionReceipt;
-
-    const transactionClasses = [ styles.content ];
-    const handleHideTransaction = (event) => this.handleHideTransaction(event, requestId);
-
-    if (isError) {
-      transactionClasses.push(styles.error);
-    }
-
-    if (isPendingNetwork) {
-      transactionClasses.push(styles.pending);
-    }
-
-    if (isConfirmed) {
-      transactionClasses.push(styles.confirmed);
-    }
-
-    return (
-      <div
-        className={ styles.transaction }
-        key={ requestId }
-      >
-        <div className={ styles.header }>
-          {
-            name
-            ? (
-              <div
-                className={ styles.name }
-                title={ name }
-              >
-                { name }
-              </div>
-            )
-            : null
-          }
-          <div
-            className={ styles.date }
-            title={ date.toISOString() }
-          >
-            { date.toLocaleTimeString() }
-          </div>
-        </div>
-        <div
-          className={ transactionClasses.join(' ') }
-          onClick={ handleHideTransaction }
-        >
-          { this.renderTransactionContent(transaction) }
-        </div>
-      </div>
-    );
-  }
-
-  renderTransactionContent (transaction) {
-    const { error, transactionHash, transactionReceipt } = transaction;
-
-    if (error) {
-      return (
-        <div>
-          { error.text || error.message || error.toString() }
-        </div>
-      );
-    }
-
-    if (transactionReceipt) {
-      return (
-        <div>
-          Transaction mined at block { transactionReceipt.blockNumber.toFormat(0) }
-        </div>
-      );
-    }
-
-    if (transactionHash) {
-      return (
-        <div>
-          Transaction sent to network with hash { transactionHash }..
-        </div>
-      );
-    }
-
-    return (
-      <div>
-        Transaction waiting to be signed...
-      </div>
-    );
-  }
-
-  handleHideTransaction = (event, requestId) => {
-    this.dappsStore.updateTransaction(requestId, { hide: true });
-  }
-}
diff --git a/js/src/dapps/dappreg/Warning/index.js b/js/src/dapps/dappreg/Warning/index.js
deleted file mode 100644
index b0096ae624396dcf711d0090ae7675edb602cd28..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Warning/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './warning';
diff --git a/js/src/dapps/dappreg/Warning/warning.css b/js/src/dapps/dappreg/Warning/warning.css
deleted file mode 100644
index 296fa10fcd2003e4ea14de89d452787df09d6b2f..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Warning/warning.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../_colors.css';
-
-.warning {
-  background: $warning-bg;
-  border-top-right-radius: 0.25em;
-  bottom: 0;
-  color: white;
-  cursor: pointer;
-  font-size: 0.75em;
-  left: 0;
-  line-height: 1.5em;
-  opacity: 1;
-  padding: 1.5em;
-  position: fixed;
-  max-width: 540px;
-  z-index: 100;
-
-  div+div {
-    margin-top: 1.5em;
-  }
-}
diff --git a/js/src/dapps/dappreg/Warning/warning.js b/js/src/dapps/dappreg/Warning/warning.js
deleted file mode 100644
index 2dbbca688ce705a87c6ed2fc0916b987b6907b72..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/Warning/warning.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import { api } from '../parity';
-import DappsStore from '../dappsStore';
-
-import styles from './warning.css';
-
-export default class Warning extends Component {
-  dappsStore = DappsStore.get();
-
-  state = {
-    show: true
-  };
-
-  render () {
-    if (!this.state.show) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.warning } onClick={ this.onClose }>
-        <div>
-          WARNING: Registering a dapp is for developers only. Please ensure you understand the
-          steps needed to develop and deploy applications, should you wish to use this dapp for
-          anything apart from queries.
-        </div>
-        <div>
-          A non-refundable fee
-          of { api.util.fromWei(this.dappsStore.fee).toFormat(3) } <small>ETH</small> is required
-          for any registration.
-        </div>
-      </div>
-    );
-  }
-
-  onClose = () => {
-    this.setState({ show: false });
-  }
-}
diff --git a/js/src/dapps/dappreg/_colors.css b/js/src/dapps/dappreg/_colors.css
deleted file mode 100644
index 7bfc5591d87de38af9647e57664743cdb0c7585e..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/_colors.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$blue: rgb(41, 128, 185);
-$disabled-bg: #aaa;
-$warning-bg: #e44;
-$modal-bg: rgba(40, 40, 40, 0.75);
-
-$background-color: #eee;
-$text-color: #333;
-$loading-color: #999;
-
-$code-bg: #002b36;
-$code-color: #b58900;
-$code-title-bg: #073642;
-$code-title-color: #859900;
diff --git a/js/src/dapps/dappreg/_utils.css b/js/src/dapps/dappreg/_utils.css
deleted file mode 100644
index 682120f7cd9e1c92b0780cbb5f39227f5c07c127..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/_utils.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.bezier-transform {
-  transition-duration: 0.1s;
-  transition-property: all;
-  transition-timing-function: cubic-bezier(0.7, 0, 0.3, 1);
-}
diff --git a/js/src/dapps/dappreg/dappStore.js b/js/src/dapps/dappreg/dappStore.js
deleted file mode 100644
index bef02729d033746919d1828e15cc080d977303e9..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/dappStore.js
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, observable, transaction } from 'mobx';
-
-export default class DappStore {
-  @observable id = null;
-  @observable content = null;
-  @observable image = null;
-  @observable manifest = null;
-  @observable owner = null;
-  @observable isOwner = false;
-
-  @observable isEditing = false;
-  @observable wip = null;
-
-  contractOwner = '';
-  isContractOwner = false;
-
-  constructor (data) {
-    const { id, content = {}, image = {}, manifest = {}, owner = {}, isOwner = false, contractOwner = '', isContractOwner = false } = data;
-
-    transaction(() => {
-      this.id = id;
-      this.content = content;
-      this.image = image;
-      this.manifest = manifest;
-      this.owner = owner;
-      this.isOwner = isOwner;
-
-      this.copyToWip();
-    });
-
-    this.contractOwner = contractOwner;
-    this.isContractOwner = isContractOwner;
-  }
-
-  @computed get canSave () {
-    if (!this.wip) {
-      return false;
-    }
-
-    const { content, image, manifest, owner } = this.wip;
-    const fields = [ content, image, manifest, owner ];
-
-    const hasError = !!fields.find((field) => field.error);
-    const hasChanged = !!fields.find((field) => field.changed);
-    const isEditMode = this.isEditing;
-
-    return isEditMode && hasChanged && !hasError;
-  }
-
-  @action copyToWip = () => {
-    const defaults = {
-      changed: false,
-      error: null
-    };
-
-    const wip = {
-      id: this.id,
-      content: {
-        ...defaults,
-        url: this.content.url
-      },
-      image: {
-        ...defaults,
-        url: this.image.url
-      },
-      manifest: {
-        ...defaults,
-        url: this.manifest.url
-      },
-      owner: {
-        ...defaults,
-        address: this.owner.address
-      }
-    };
-
-    this.wip = { ...wip };
-  }
-
-  @action handleChange = (details) => {
-    if (!this.isEditing) {
-      return false;
-    }
-
-    this.wip = {
-      ...this.wip,
-      ...details
-    };
-
-    return this.wip;
-  }
-
-  @action handleSave = () => {
-    const updates = {};
-
-    if (this.wip.content.url !== this.content.url) {
-      updates.content = this.wip.content.url;
-    }
-
-    if (this.wip.image.url !== this.image.url) {
-      updates.image = this.wip.image.url;
-    }
-
-    if (this.wip.manifest.url !== this.manifest.url) {
-      updates.manifest = this.wip.manifest.url;
-    }
-
-    if (this.wip.owner.address !== this.owner.address) {
-      updates.owner = this.wip.owner.address;
-    }
-
-    return updates;
-  }
-
-  @action setEditing = (mode) => {
-    transaction(() => {
-      this.isEditing = mode;
-      this.copyToWip();
-    });
-
-    return mode;
-  }
-
-  update = (updates) => {
-    const { image, content } = updates;
-    const changes = {};
-
-    if (image && image !== this.wip.image.url) {
-      changes.image = { url: image, changed: true };
-    }
-
-    if (content && content !== this.wip.content.url) {
-      changes.content = { url: content, changed: true };
-    }
-
-    return this.handleChange(changes);
-  }
-}
diff --git a/js/src/dapps/dappreg/dappsStore.js b/js/src/dapps/dappreg/dappsStore.js
deleted file mode 100644
index c6f45922a8c275728d0b814db53a685e6572f797..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/dappsStore.js
+++ /dev/null
@@ -1,522 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { action, computed, observable, transaction } from 'mobx';
-import { flatten } from 'lodash';
-
-import * as abis from '~/contracts/abi';
-import Contracts from '~/contracts';
-import builtinJson from '~/views/Dapps/builtin.json';
-
-import Dapp from './dappStore.js';
-import { deleteDapp, registerDapp, updateDapp } from './utils';
-
-import { api, trackRequest } from './parity';
-
-const builtins = builtinJson.filter((app) => app.id);
-
-let instance = null;
-
-export default class DappsStore {
-  @observable accounts = [];
-  @observable apps = [];
-  @observable contractOwner = null;
-  @observable count = 0;
-  @observable fee = new BigNumber(0);
-  @observable isContractOwner = false;
-  @observable isLoading = true;
-  @observable transactions = {};
-
-  _instanceGhh = null;
-  _instanceReg = null;
-  _registry = null;
-  _startTime = Date.now();
-
-  constructor () {
-    this._loadDapps();
-  }
-
-  static get () {
-    if (!instance) {
-      instance = new DappsStore();
-    }
-
-    return instance;
-  }
-
-  createDappId () {
-    return api.util.sha3(`${this._startTime}_${Date.now()}`);
-  }
-
-  @computed get ownedCount () {
-    return this.ownDapps.length;
-  }
-
-  @computed get ownDapps () {
-    return this.apps.filter((app) => app.isOwner);
-  }
-
-  @computed get otherDapps () {
-    return this.apps.filter((app) => !app.isOwner);
-  }
-
-  @action sortApps = () => {
-    // Sort dapps per name, then per id
-    const sort = (a, b) => {
-      if (a.name && b.name) {
-        return a.name.localeCompare(b.name);
-      }
-
-      if (a.name) {
-        return -1;
-      }
-
-      if (b.name) {
-        return 1;
-      }
-
-      return a.id - b.id;
-    };
-
-    transaction(() => {
-      const ownDapps = this.ownDapps.sort(sort);
-      const otherDapps = this.otherDapps.sort(sort);
-
-      this.apps = ownDapps.concat(otherDapps);
-    });
-  }
-
-  @action setApps = (dapps) => {
-    const filteredDapps = dapps.filter((dapp) => {
-      return new BigNumber(dapp.id).gt(0);
-    });
-
-    transaction(() => {
-      this.apps = filteredDapps;
-      this.sortApps();
-    });
-  }
-
-  @action refreshApp = (dappId) => {
-    const dapp = this.apps.find((dapp) => dapp.id === dappId);
-
-    this._loadDapp(dapp);
-  }
-
-  @action removeApp = (dappId) => {
-    const dapps = this.apps.filter((dapp) => dapp.id !== dappId);
-
-    this.setApps(dapps);
-  }
-
-  @action setAccounts = (accountsInfo) => {
-    transaction(() => {
-      this.accounts = Object
-        .keys(accountsInfo)
-        .map((address) => {
-          const account = accountsInfo[address];
-
-          account.address = address;
-          return account;
-        });
-    });
-
-    return this.accounts;
-  }
-
-  @action setContractOwner = (contractOwner) => {
-    transaction(() => {
-      this.contractOwner = contractOwner;
-      this.isContractOwner = !!this.accounts.find((account) => account.address === contractOwner);
-    });
-    return contractOwner;
-  }
-
-  @action setCount = (count) => {
-    this.count = count;
-    return count;
-  }
-
-  @action setFee = (fee) => {
-    this.fee = fee;
-    return fee;
-  }
-
-  @action setLoading = (loading) => {
-    this.isLoading = loading;
-    return loading;
-  }
-
-  @action updateTransaction = (requestId, nextData) => {
-    const prevTransaction = this.transactions[requestId] || { requestId };
-    const nextTransaction = {
-      ...prevTransaction,
-      hide: false,
-      ...nextData
-    };
-
-    this.transactions = {
-      ...this.transactions,
-      [ requestId ]: nextTransaction
-    };
-  }
-
-  fetchRegistryData (dapp) {
-    const ownerAddress = (dapp.wip && dapp.wip.owner.address) || dapp.owner.address;
-
-    this._registry.reverse
-      .call({}, [ ownerAddress ])
-      .then((name) => {
-        if (!name) {
-          return;
-        }
-
-        const key = api.util.sha3.text(name);
-
-        return Promise
-          .all([
-            this._registry.get.call({}, [ key, 'IMG' ])
-              .then((bytes) => api.util.bytesToHex(bytes))
-              .then((hash) => this._instanceGhh.entries.call({}, [ hash ])),
-            this._registry.get.call({}, [ key, 'CONTENT' ])
-              .then((bytes) => api.util.bytesToHex(bytes))
-              .then((hash) => this._instanceGhh.entries.call({}, [ hash ]))
-          ])
-          .then(([ imageGHH, contentGHH ]) => {
-            const imageUrl = imageGHH[0];
-            const contentUrl = contentGHH[0];
-
-            return dapp.update({
-              image: imageUrl,
-              content: contentUrl
-            });
-          });
-      });
-  }
-
-  register (dappId) {
-    const dappRegInstance = this._instanceReg;
-    const dappRegFee = this.fee;
-
-    return registerDapp(dappId, dappRegInstance, dappRegFee)
-      .then((request) => this.trackRequest(request, `Registering ${dappId}`))
-      .then(() => this._loadDapps());
-  }
-
-  delete (dapp) {
-    const dappRegInstance = this._instanceReg;
-
-    return deleteDapp(dapp, dappRegInstance)
-      .then((request) => this.trackRequest(request, `Deleting ${dapp.id}`))
-      .then(() => this._loadDapps());
-  }
-
-  update (dappId, dappOwner, updates) {
-    const dappRegInstance = this._instanceReg;
-    const ghhRegInstance = this._instanceGhh;
-
-    const promises = updateDapp(dappId, dappOwner, updates, dappRegInstance, ghhRegInstance);
-    const handledPromises = promises.map((promise) => {
-      return promise
-        .then((requests) => {
-          const requestPromises = flatten([].concat(requests))
-            .filter((request) => request)
-            .map((request) => this.trackRequest(request.id, request.name));
-
-          return Promise.all(requestPromises);
-        })
-        .catch((error) => {
-          const randomRequestId = api.util.sha3(Date.now()).slice(0, 5);
-
-          this.updateTransaction(randomRequestId, { start: Date.now(), error });
-        });
-    });
-
-    return Promise.all(handledPromises)
-      .then(() => this._loadDapps());
-  }
-
-  trackRequest (requestId, name) {
-    const statusCallback = (error, data) => {
-      if (error) {
-        return this.updateTransaction(requestId, { error });
-      }
-
-      return this.updateTransaction(requestId, data);
-    };
-
-    this.updateTransaction(requestId, { name, start: Date.now() });
-    return trackRequest(requestId, statusCallback);
-  }
-
-  lookupHash (hash) {
-    return this._retrieveUrl(hash);
-  }
-
-  _getCount () {
-    return this._instanceReg
-      .count.call()
-      .then((count) => {
-        this.setCount(count.toNumber());
-      })
-      .catch((error) => {
-        console.error('Store:getCount', error);
-      });
-  }
-
-  _getFee () {
-    return this._instanceReg
-      .fee.call()
-      .then(this.setFee)
-      .catch((error) => {
-        console.error('Store:getFee', error);
-      });
-  }
-
-  _getOwner () {
-    return this._instanceReg
-      .owner.call()
-      .then(this.setContractOwner)
-      .catch((error) => {
-        console.error('Store:getOwner', error);
-      });
-  }
-
-  _loadDapps () {
-    return this._loadRegistry()
-      .then(() => Promise.all([
-        this._attachContracts(),
-        this._loadAccounts()
-      ]))
-      .then(() => Promise.all([
-        this._getCount(),
-        this._getFee(),
-        this._getOwner()
-      ]))
-      .then(() => {
-        const promises = [];
-
-        for (let index = 0; index < this.count; index++) {
-          promises.push(this._instanceReg.at.call({}, [index]));
-        }
-
-        return Promise.all(promises);
-      })
-      .then((dappsInfo) => {
-        const dapps = dappsInfo.reduce((dapps, [dappId, ownerAddress]) => {
-          const id = api.util.bytesToHex(dappId);
-          const owner = this.accounts.find((account) => account.address === ownerAddress);
-          const isOwner = !!owner;
-          const dapp = {
-            id,
-            owner: owner || { address: ownerAddress },
-            isOwner
-          };
-
-          dapps[id] = dapp;
-          return dapps;
-        }, {});
-
-        const promises = Object.values(dapps)
-          // Only show dapps with id and owners
-          .filter((dapp) => dapp.id && dapp.owner && !/^(0x)?0*$/.test(dapp.owner.address))
-          .map((dapp) => this._loadDapp(dapp));
-
-        return Promise.all(promises);
-      })
-      .then((dapps) => {
-        this.setApps(dapps);
-        this.sortApps();
-        this.setLoading(false);
-      })
-      .catch((error) => {
-        console.error('Store:loadDapps', error);
-      });
-  }
-
-  _loadDapp = (dappData) => {
-    const { id, owner, isOwner } = dappData;
-
-    return Promise
-      .all([
-        this._loadMeta(id, 'CONTENT'),
-        this._loadMeta(id, 'IMG'),
-        this._loadMeta(id, 'MANIFEST')
-      ])
-      .then(([contentHash, imageHash, manifestHash]) => {
-        return Promise
-          .all([
-            this._retrieveUrl(contentHash),
-            this._retrieveUrl(imageHash),
-            this._retrieveUrl(manifestHash)
-          ])
-          .then(([contentUrl, imageUrl, manifestUrl]) => {
-            return this
-              ._loadManifest(id, manifestHash, manifestUrl)
-              .then((manifestContent) => {
-                const content = {
-                  hash: contentHash,
-                  url: contentUrl
-                };
-
-                const image = {
-                  hash: imageHash,
-                  url: imageUrl
-                };
-
-                const manifest = {
-                  content: manifestContent,
-                  hash: manifestHash,
-                  url: manifestUrl
-                };
-
-                return { content, image, manifest };
-              });
-          });
-      })
-      .catch((error) => {
-        console.error('dappsStore::loadDapp', error);
-        return {};
-      })
-      .then((data) => {
-        const { content, image, manifest } = data;
-
-        const dapp = new Dapp({
-          contractOwner: this.contractOwner,
-          isContractOwner: this.isContractOwner,
-          id,
-          content,
-          image,
-          manifest,
-          owner,
-          isOwner
-        });
-
-        return dapp;
-      });
-  }
-
-  _loadMeta (appId, key) {
-    return this._instanceReg
-      .meta.call({}, [appId, key])
-      .then((meta) => {
-        const hash = api.util.bytesToHex(meta);
-        const bnhash = new BigNumber(hash);
-
-        return bnhash.gt(0)
-          ? hash
-          : null;
-      })
-      .catch((error) => {
-        console.error('Store:loadMeta', error);
-        return null;
-      });
-  }
-
-  _loadManifest (appId, manifestHash) {
-    const builtin = builtins.find((app) => app.id === appId);
-
-    if (builtin) {
-      return Promise.resolve(builtin);
-    }
-
-    if (!manifestHash) {
-      return Promise.resolve(null);
-    }
-
-    return fetch(`/api/content/${manifestHash.substr(2)}/`, { redirect: 'follow', mode: 'cors' })
-      .then((response) => {
-        return response.ok
-          ? response.json()
-          : null;
-      })
-      .catch((error) => {
-        console.error('Store:loadManifest', error);
-        return null;
-      });
-  }
-
-  _retrieveUrl (urlHash) {
-    if (!urlHash) {
-      return Promise.resolve(null);
-    }
-
-    return this._instanceGhh
-      .entries.call({}, [urlHash])
-      .then(([repo, _commit, owner]) => {
-        const bnowner = new BigNumber(owner);
-
-        if (bnowner.eq(0)) {
-          return null;
-        }
-
-        const commit = api.util.bytesToHex(_commit);
-        const bncommit = new BigNumber(commit);
-
-        if (bncommit.eq(0)) {
-          return repo;
-        } else {
-          return `https://codeload.github.com/${repo}/zip/${commit.substr(2)}`;
-        }
-      })
-      .catch((error) => {
-        console.error('Store:retriveUrl', error);
-        return null;
-      });
-  }
-
-  _loadAccounts () {
-    return api.parity
-      .accountsInfo()
-      .then(this.setAccounts)
-      .catch((error) => {
-        console.error('Store:loadAccounts', error);
-      });
-  }
-
-  _loadRegistry () {
-    return Contracts.create(api).registry
-      .fetchContract()
-      .then((contract) => {
-        this._registry = contract.instance;
-      })
-      .catch((error) => {
-        console.error('Store:loadRegistry', error);
-      });
-  }
-
-  _attachContracts () {
-    return Promise
-      .all([
-        this._registry.getAddress.call({}, [api.util.sha3('dappreg'), 'A']),
-        this._registry.getAddress.call({}, [api.util.sha3('githubhint'), 'A'])
-      ])
-      .then(([dappregAddress, ghhAddress]) => {
-        console.log(`dappreg was found at ${dappregAddress}`);
-        console.log(`githubhint was found at ${ghhAddress}`);
-
-        this._contractReg = api.newContract(abis.dappreg, dappregAddress);
-        this._instanceReg = this._contractReg.instance;
-
-        this._contractGhh = api.newContract(abis.githubhint, ghhAddress);
-        this._instanceGhh = this._contractGhh.instance;
-      })
-      .catch((error) => {
-        console.error('Store:attachContract', error);
-      });
-  }
-}
diff --git a/js/src/dapps/dappreg/parity.js b/js/src/dapps/dappreg/parity.js
deleted file mode 100644
index a17966bd1c2b2720f789cd750c2a4967ced48d07..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/parity.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const api = window.parent.secureApi;
-
-function trackRequest (signerRequestId, statusCallback) {
-  return api.pollMethod('parity_checkRequest', signerRequestId)
-    .then((transactionHash) => {
-      console.log('trackRequest', `received transaction hash ${transactionHash}`);
-      statusCallback(null, { transactionHash });
-
-      return api.pollMethod('eth_getTransactionReceipt', transactionHash, (receipt) => {
-        if (!receipt || !receipt.blockNumber || receipt.blockNumber.eq(0)) {
-          return false;
-        }
-
-        return true;
-      });
-    })
-    .then((transactionReceipt) => {
-      console.log('trackRequest', 'received transaction receipt', transactionReceipt);
-      statusCallback(null, { transactionReceipt });
-    })
-    .catch((error) => {
-      statusCallback(error);
-    });
-}
-
-export {
-  api,
-  trackRequest
-};
diff --git a/js/src/dapps/dappreg/utils.js b/js/src/dapps/dappreg/utils.js
deleted file mode 100644
index 74ece1b95701ed2a75736d6b2c07515e002a8a5c..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/utils.js
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { api } from './parity';
-
-export const INVALID_URL_HASH = '0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470';
-export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
-
-export function isContentHash (url) {
-  return /^0x[0-9a-f]{64}/.test(url);
-}
-
-/**
- * Convert the given URL to a content hash,
- * and checks if it is already registered in GHH
- */
-export const urlToHash = (api, instance, url) => {
-  if (!url || !url.length) {
-    return Promise.resolve(null);
-  }
-
-  const hashPromise = isContentHash(url)
-    ? Promise.resolve(url)
-    : api.parity.hashContent(url);
-
-  return hashPromise
-    .catch((error) => {
-      const message = error.text || error.message || error.toString();
-
-      throw new Error(`${message} (${url})`);
-    })
-    .then((contentHash) => {
-      console.log('lookupHash', url, contentHash);
-
-      if (contentHash === INVALID_URL_HASH) {
-        throw new Error(`"${url}" is not a valid URL`);
-      }
-
-      return instance.entries
-        .call({}, [contentHash])
-        .then(([accountSlashRepo, commit, contentHashOwner]) => {
-          const registered = (contentHashOwner !== ZERO_ADDRESS);
-
-          return {
-            hash: contentHash,
-            registered
-          };
-        });
-    });
-};
-
-/**
- * Register the given URL to GithubHint
- * registry contract
- */
-export const registerGHH = (instance, url, hash, owner) => {
-  const values = [ hash, url ];
-  const options = {
-    from: owner
-  };
-
-  return instance
-    .hintURL.estimateGas(options, values)
-    .then((gas) => {
-      options.gas = gas.mul(1.2).toFixed(0);
-      return instance.hintURL.postTransaction(options, values);
-    });
-};
-
-export const registerDapp = (dappId, dappRegInstance) => {
-  const values = [ dappId ];
-  const options = {};
-
-  return dappRegInstance
-    .fee.call({}, [])
-    .then((fee) => {
-      options.value = fee;
-
-      return dappRegInstance
-        .register.estimateGas(options, values)
-        .then((gas) => {
-          options.gas = gas.mul(1.2).toFixed(0);
-          return dappRegInstance.register.postTransaction(options, values);
-        });
-    });
-};
-
-export const deleteDapp = (dapp, dappRegInstance) => {
-  const { id, owner } = dapp;
-
-  const fromAddress = dapp.isOwner
-    ? owner.address
-    : dapp.contractOwner;
-
-  const values = [ id ];
-  const options = {
-    from: fromAddress
-  };
-
-  return dappRegInstance
-    .unregister.estimateGas(options, values)
-    .then((gas) => {
-      options.gas = gas.mul(1.2).toFixed(0);
-
-      return dappRegInstance.unregister.postTransaction(options, values);
-    });
-};
-
-export const updateDappOwner = (dappId, dappOwner, nextOwnerAddress, dappRegInstance) => {
-  const options = {
-    from: dappOwner
-  };
-
-  const values = [ dappId, nextOwnerAddress ];
-
-  return dappRegInstance.setDappOwner
-    .estimateGas(options, values)
-    .then((gas) => {
-      options.gas = gas.mul(1.2);
-
-      return dappRegInstance.setDappOwner.postTransaction(options, values);
-    });
-};
-
-export const updateDapp = (dappId, dappOwner, updates, dappRegInstance, ghhRegInstance) => {
-  const options = {
-    from: dappOwner
-  };
-
-  const types = {
-    content: 'CONTENT',
-    image: 'IMG',
-    manifest: 'MANIFEST'
-  };
-
-  const promises = Object
-    .keys(updates)
-    .map((type) => {
-      const key = types[type];
-      const url = updates[type];
-      let promise;
-
-      if (!url) {
-        promise = Promise.resolve([ null, '' ]);
-      } else {
-        promise = urlToHash(api, ghhRegInstance, url)
-          .then((ghhResult) => {
-            const { hash, registered } = ghhResult;
-
-            if (!registered) {
-              return registerGHH(ghhRegInstance, url, hash, dappOwner)
-                .then((requestId) => [ { id: requestId, name: `Registering ${url}` }, hash ]);
-            }
-
-            return [ null, hash ];
-          });
-      }
-
-      return promise
-        .then(([ ghhRequest, hash ]) => {
-          const values = [ dappId, key, hash ];
-
-          return dappRegInstance.setMeta.estimateGas(options, values)
-            .then((gas) => {
-              options.gas = gas.mul(1.2).toFixed(0);
-              return dappRegInstance.setMeta.postTransaction(options, values);
-            })
-            .then((requestId) => [ ghhRequest, { id: requestId, name: `Updating ${type} of ${dappId}` } ]);
-        });
-    });
-
-  if (updates.owner) {
-    promises.push(updateDappOwner(updates.owner).then((reqId) => ({ id: reqId, name: `Updating owner of ${dappId}` })));
-  }
-
-  return promises;
-};
diff --git a/js/src/dapps/dappreg/utils.spec.js b/js/src/dapps/dappreg/utils.spec.js
deleted file mode 100644
index 6101ff97665b45ac3a3a5962f2abb2fd38d19d10..0000000000000000000000000000000000000000
--- a/js/src/dapps/dappreg/utils.spec.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { INVALID_URL_HASH, ZERO_ADDRESS, isContentHash } from './utils';
-
-describe('dapps/dappreg/utils', () => {
-  describe('isContentHash', () => {
-    it('returns true on valid hashes', () => {
-      expect(isContentHash(INVALID_URL_HASH)).to.be.true;
-    });
-
-    it('returns false on valid hex, invalid hash', () => {
-      expect(isContentHash(ZERO_ADDRESS)).to.be.false;
-    });
-
-    it('returns false on invalid hex', () => {
-      expect(isContentHash('something')).to.be.false;
-    });
-  });
-});
diff --git a/js/src/dapps/githubhint.js b/js/src/dapps/githubhint.js
deleted file mode 100644
index 1e55b91f517c9e4648a91f7c942e5c18b546072a..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ReactDOM from 'react-dom';
-import React from 'react';
-import { AppContainer } from 'react-hot-loader';
-
-import injectTapEventPlugin from 'react-tap-event-plugin';
-injectTapEventPlugin();
-
-import Application from './githubhint/Application';
-
-import '../../assets/fonts/Roboto/font.css';
-import '../../assets/fonts/RobotoMono/font.css';
-import './style.css';
-
-ReactDOM.render(
-  <AppContainer>
-    <Application />
-  </AppContainer>,
-  document.querySelector('#container')
-);
-
-if (module.hot) {
-  module.hot.accept('./githubhint/Application/index.js', () => {
-    require('./githubhint/Application/index.js');
-
-    ReactDOM.render(
-      <AppContainer>
-        <Application />
-      </AppContainer>,
-      document.querySelector('#container')
-    );
-  });
-}
diff --git a/js/src/dapps/githubhint/Application/application.css b/js/src/dapps/githubhint/Application/application.css
deleted file mode 100644
index 509b3fd2034bfde461cb73d55ac66d4f629fb448..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Application/application.css
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.body {
-  text-align: center;
-  background: #333;
-  color: #fff;
-}
-
-.container {
-  font-family: 'Roboto';
-  vertical-align: middle;
-  padding: 4em 0;
-  margin: 0 0 2em 0;
-}
-
-.form {
-  text-align: right;
-  margin: 0 auto;
-  border-radius: 5px;
-  width: 44em;
-  color: #eee;
-}
-
-.box {
-  padding: 2em;
-  background: rgba(255, 255, 255, 0.1);
-  border-radius: 5px;
-  margin-bottom: 2em;
-}
-
-.buttons {
-  text-align: center;
-  margin: 0 auto 2em auto;
-}
-
-.box .buttons {
-  text-align: right;
-  margin: 2em 0 0 0;
-  position: relative;
-}
-
-.box .buttons .addressSelect {
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-.box .description {
-  margin: 0 0 2em 0;
-  text-align: center;
-  opacity: 0.75;
-}
-
-.progress {
-  margin: 2em 0 0 0;
-  opacity: 0.75;
-  text-align: center;
-}
-
-.statusHeader {
-  font-size: 1em;
-}
-
-.statusState, .statusError {
-  padding: 1em 0 0 0;
-}
-
-.statusError {
-  color: #f66;
-}
-
-.capture {
-}
-
-.capture+.capture {
-  margin-top: 0.5em;
-}
-
-.capture * {
-  display: inline-block;
-  padding: 0.75em;
-  vertical-align: middle;
-  box-sizing: border-box;
-  width: 20em;
-}
-
-.capture input {
-  color: #333;
-  background: #eee;
-  border: none;
-  border-radius: 0.5em;
-  width: 100%;
-  font-size: 1em;
-  text-align: center;
-}
-
-.capture input[disabled] {
-  opacity: 0.5;
-}
-
-.capture input.error {
-  background: #fcc;
-}
-
-.hashError, .hashWarning, .hashOk {
-  margin: 0.5em 0;
-  text-align: center;
-  padding: 1em 0;
-  border: 0.25em solid #333;
-  border-radius: 0.5em;
-}
-
-.hashError {
-  border-color: #f66;
-  color: #f66;
-  background: rgba(255, 102, 102, 0.25);
-}
-
-.hashWarning {
-  border-color: #f80;
-  color: #f80;
-  background: rgba(255, 236, 0, 0.25);
-}
-
-.hashOk {
-  border-color: #6f6;
-  color: #6f6;
-  background: rgba(102, 255, 102, 0.25);
-}
-
-.typeButtons {
-  text-align: center;
-  padding: 0 0 1em 0;
-}
-
-.typeButtons>div {
-  border-radius: 0 !important;
-
-  &:first-child {
-    border-radius: 5px 0 0 5px !important;
-  }
-
-  &:last-child {
-    border-radius: 0 5px 5px 0 !important;
-  }
-}
diff --git a/js/src/dapps/githubhint/Application/application.js b/js/src/dapps/githubhint/Application/application.js
deleted file mode 100644
index f09f9c2fa42b68af1737d86c15f88765b5ce6444..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Application/application.js
+++ /dev/null
@@ -1,521 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import { api } from '../parity';
-import { attachInterface, subscribeDefaultAddress, unsubscribeDefaultAddress } from '../services';
-import Button from '../Button';
-import Events from '../Events';
-import Loading from '../Loading';
-
-import styles from './application.css';
-
-const INVALID_URL_HASH = '0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470';
-const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
-
-let nextEventId = 0;
-
-export default class Application extends Component {
-  state = {
-    defaultAddress: null,
-    loading: true,
-    url: '',
-    urlError: null,
-    commit: '',
-    commitError: null,
-    contentHash: '',
-    contentHashError: null,
-    contentHashOwner: null,
-    registerBusy: false,
-    registerError: null,
-    registerState: '',
-    registerType: 'file',
-    repo: '',
-    repoError: null,
-    subscriptionId: null,
-    events: {},
-    eventIds: []
-  }
-
-  componentDidMount () {
-    return Promise
-      .all([
-        attachInterface(),
-        subscribeDefaultAddress((error, defaultAddress) => {
-          if (!error) {
-            this.setState({ defaultAddress });
-          }
-        })
-      ])
-      .then(([state]) => {
-        this.setState(Object.assign({}, state, {
-          loading: false
-        }));
-      });
-  }
-
-  componentWillUnmount () {
-    return unsubscribeDefaultAddress();
-  }
-
-  render () {
-    const { loading } = this.state;
-
-    return loading
-      ? this.renderLoading()
-      : this.renderPage();
-  }
-
-  renderLoading () {
-    return (
-      <Loading />
-    );
-  }
-
-  renderPage () {
-    const { defaultAddress, registerBusy, url, urlError, contentHash, contentHashError, contentHashOwner, commit, commitError, registerType, repo, repoError } = this.state;
-
-    let hashClass = null;
-
-    if (contentHashError) {
-      hashClass = contentHashOwner !== defaultAddress
-        ? styles.hashError
-        : styles.hashWarning;
-    } else if (contentHash) {
-      hashClass = styles.hashOk;
-    }
-
-    let valueInputs = null;
-
-    if (registerType === 'content') {
-      valueInputs = [
-        <div className={ styles.capture } key='repo'>
-          <input
-            type='text'
-            placeholder='owner/repo'
-            disabled={ registerBusy }
-            value={ repo }
-            className={ repoError ? styles.error : null }
-            onChange={ this.onChangeRepo }
-          />
-        </div>,
-        <div className={ styles.capture } key='hash'>
-          <input
-            type='text'
-            placeholder='commit hash sha3'
-            disabled={ registerBusy }
-            value={ commit }
-            className={ commitError ? styles.error : null }
-            onChange={ this.onChangeCommit }
-          />
-        </div>
-      ];
-    } else {
-      valueInputs = (
-        <div className={ styles.capture } key='url'>
-          <input
-            type='text'
-            placeholder='http://domain/filename'
-            disabled={ registerBusy }
-            value={ url }
-            className={ urlError ? styles.error : null }
-            onChange={ this.onChangeUrl }
-          />
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.body }>
-        <div className={ styles.container }>
-          <div className={ styles.form }>
-            <div className={ styles.typeButtons }>
-              <Button
-                disabled={ registerBusy }
-                invert={ registerType !== 'file' }
-                onClick={ this.onClickTypeNormal }
-              >
-                File Link
-              </Button>
-              <Button
-                disabled={ registerBusy }
-                invert={ registerType !== 'content' }
-                onClick={ this.onClickTypeContent }
-              >
-                Content Bundle
-              </Button>
-            </div>
-            <div className={ styles.box }>
-              <div className={ styles.description }>
-                Provide a valid URL to register. The content information can be used in other contracts that allows for reverse lookups, e.g. image registries, dapp registries, etc.
-              </div>
-              { valueInputs }
-              <div className={ hashClass }>
-                { contentHashError || contentHash }
-              </div>
-              { registerBusy ? this.renderProgress() : this.renderButtons() }
-            </div>
-          </div>
-        </div>
-        <Events
-          eventIds={ this.state.eventIds }
-          events={ this.state.events }
-        />
-      </div>
-    );
-  }
-
-  renderButtons () {
-    const { defaultAddress, urlError, repoError, commitError, contentHashError, contentHashOwner } = this.state;
-
-    return (
-      <div className={ styles.buttons }>
-        <Button
-          onClick={ this.onClickRegister }
-          disabled={ (contentHashError && contentHashOwner !== defaultAddress) || urlError || repoError || commitError }
-        >register url</Button>
-      </div>
-    );
-  }
-
-  renderProgress () {
-    const { registerError, registerState } = this.state;
-
-    if (registerError) {
-      return (
-        <div className={ styles.progress }>
-          <div className={ styles.statusHeader }>
-            Your registration has encountered an error
-          </div>
-          <div className={ styles.statusError }>
-            { registerError }
-          </div>
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.progress }>
-        <div className={ styles.statusHeader }>
-          Your URL is being registered
-        </div>
-        <div className={ styles.statusState }>
-          { registerState }
-        </div>
-      </div>
-    );
-  }
-
-  onClickTypeNormal = () => {
-    const { url } = this.state;
-
-    this.setState({ registerType: 'file', commitError: null, repoError: null }, () => {
-      this.onChangeUrl({ target: { value: url } });
-    });
-  }
-
-  onClickTypeContent = () => {
-    const { repo, commit } = this.state;
-
-    this.setState({ registerType: 'content', urlError: null }, () => {
-      this.onChangeRepo({ target: { value: repo } });
-      this.onChangeCommit({ target: { value: commit } });
-    });
-  }
-
-  onChangeCommit = (event) => {
-    let commit = event.target.value;
-    const commitError = null;
-    let hasContent = false;
-
-    this.setState({ commit, commitError, contentHashError: null }, () => {
-      const { repo } = this.state || '';
-      const parts = repo.split('/');
-
-      hasContent = commit.length !== 0 && parts.length === 2 && parts[0].length !== 0 && parts[1].length !== 0;
-      if (!commitError && hasContent) {
-        this.setState({ contentHashError: 'hash lookup in progress' });
-        this.lookupHash(`https://codeload.github.com/${repo}/zip/${commit}`);
-      }
-    });
-  }
-
-  onChangeRepo = (event) => {
-    let repo = event.target.value;
-    const repoError = null;
-    let hasContent = false;
-
-    // TODO: field validation
-    if (!repoError) {
-      repo = repo.replace('https://github.com/', '');
-    }
-
-    this.setState({ repo, repoError, contentHashError: null }, () => {
-      const { commit } = this.state || '';
-      const parts = repo.split('/');
-
-      hasContent = commit.length !== 0 && parts.length === 2 && parts[0].length !== 0 && parts[1].length !== 0;
-      if (!repoError && hasContent) {
-        this.setState({ contentHashError: 'hash lookup in progress' });
-        this.lookupHash(`https://codeload.github.com/${repo}/zip/${commit}`);
-      }
-    });
-  }
-
-  onChangeUrl = (event) => {
-    let url = event.target.value;
-    const urlError = null;
-    let hasContent = false;
-
-    // TODO: field validation
-    if (!urlError) {
-      const parts = url.split('/');
-
-      hasContent = parts.length !== 0;
-
-      if (parts[2] === 'github.com' || parts[2] === 'raw.githubusercontent.com') {
-        url = `https://raw.githubusercontent.com/${parts.slice(3).join('/')}`.replace('/blob/', '/');
-      }
-    }
-
-    this.setState({ url, urlError, contentHashError: null }, () => {
-      if (!urlError && hasContent) {
-        this.setState({ contentHashError: 'hash lookup in progress' });
-        this.lookupHash(url);
-      }
-    });
-  }
-
-  onClickRegister = () => {
-    const { defaultAddress, commit, commitError, contentHashError, contentHashOwner, url, urlError, registerType, repo, repoError } = this.state;
-
-    // TODO: No errors are currently set, validation to be expanded and added for each
-    // field (query is fast to pick up the issues, so not burning atm)
-    if ((contentHashError && contentHashOwner !== defaultAddress) || repoError || urlError || commitError) {
-      return;
-    }
-
-    if (registerType === 'file') {
-      this.registerUrl(url);
-    } else {
-      this.registerContent(repo, commit);
-    }
-  }
-
-  trackRequest (eventId, promise) {
-    return promise
-      .then((signerRequestId) => {
-        this.setState({
-          events: Object.assign({}, this.state.events, {
-            [eventId]: Object.assign({}, this.state.events[eventId], {
-              signerRequestId,
-              registerState: 'Transaction posted, Waiting for transaction authorization'
-            })
-          })
-        });
-
-        return api.pollMethod('parity_checkRequest', signerRequestId);
-      })
-      .then((txHash) => {
-        this.setState({
-          events: Object.assign({}, this.state.events, {
-            [eventId]: Object.assign({}, this.state.events[eventId], {
-              txHash,
-              registerState: 'Transaction authorized, Waiting for network confirmations'
-            })
-          })
-        });
-
-        return api.pollMethod('eth_getTransactionReceipt', txHash, (receipt) => {
-          if (!receipt || !receipt.blockNumber || receipt.blockNumber.eq(0)) {
-            return false;
-          }
-
-          return true;
-        });
-      })
-      .then((txReceipt) => {
-        this.setState({
-          events: Object.assign({}, this.state.events, {
-            [eventId]: Object.assign({}, this.state.events[eventId], {
-              txReceipt,
-              registerBusy: false,
-              registerState: 'Network confirmed, Received transaction receipt'
-            })
-          })
-        });
-      })
-      .catch((error) => {
-        console.error('onSend', error);
-
-        this.setState({
-          events: Object.assign({}, this.state.events, {
-            [eventId]: Object.assign({}, this.state.events[eventId], {
-              registerState: error.message,
-              registerError: true,
-              registerBusy: false
-            })
-          })
-        });
-      });
-  }
-
-  registerContent (contentRepo, contentCommit) {
-    const { defaultAddress, contentHash, instance } = this.state;
-
-    contentCommit = contentCommit.substr(0, 2) === '0x'
-      ? contentCommit
-      : `0x${contentCommit}`;
-
-    const eventId = nextEventId++;
-    const values = [contentHash, contentRepo, contentCommit];
-    const options = { from: defaultAddress };
-
-    this.setState({
-      eventIds: [eventId].concat(this.state.eventIds),
-      events: Object.assign({}, this.state.events, {
-        [eventId]: {
-          contentHash,
-          contentRepo,
-          contentCommit,
-          defaultAddress,
-          registerBusy: true,
-          registerState: 'Estimating gas for the transaction',
-          timestamp: new Date()
-        }
-      }),
-      url: '',
-      commit: '',
-      repo: '',
-      commitError: null,
-      contentHash: '',
-      contentHashOwner: null,
-      contentHashError: null
-    });
-
-    this.trackRequest(
-      eventId, instance
-        .hint.estimateGas(options, values)
-        .then((gas) => {
-          this.setState({
-            events: Object.assign({}, this.state.events, {
-              [eventId]: Object.assign({}, this.state.events[eventId], {
-                registerState: 'Gas estimated, Posting transaction to the network'
-              })
-            })
-          });
-
-          const gasPassed = gas.mul(1.2);
-
-          options.gas = gasPassed.toFixed(0);
-          console.log(`gas estimated at ${gas.toFormat(0)}, passing ${gasPassed.toFormat(0)}`);
-
-          return instance.hint.postTransaction(options, values);
-        })
-    );
-  }
-
-  registerUrl (contentUrl) {
-    const { contentHash, defaultAddress, instance } = this.state;
-
-    const eventId = nextEventId++;
-    const values = [contentHash, contentUrl];
-    const options = { from: defaultAddress };
-
-    this.setState({
-      eventIds: [eventId].concat(this.state.eventIds),
-      events: Object.assign({}, this.state.events, {
-        [eventId]: {
-          contentHash,
-          contentUrl,
-          defaultAddress,
-          registerBusy: true,
-          registerState: 'Estimating gas for the transaction',
-          timestamp: new Date()
-        }
-      }),
-      url: '',
-      commit: '',
-      repo: '',
-      commitError: null,
-      contentHash: '',
-      contentHashOwner: null,
-      contentHashError: null
-    });
-
-    this.trackRequest(
-      eventId, instance
-        .hintURL.estimateGas(options, values)
-        .then((gas) => {
-          this.setState({
-            events: Object.assign({}, this.state.events, {
-              [eventId]: Object.assign({}, this.state.events[eventId], {
-                registerState: 'Gas estimated, Posting transaction to the network'
-              })
-            })
-          });
-
-          const gasPassed = gas.mul(1.2);
-
-          options.gas = gasPassed.toFixed(0);
-          console.log(`gas estimated at ${gas.toFormat(0)}, passing ${gasPassed.toFormat(0)}`);
-
-          return instance.hintURL.postTransaction(options, values);
-        })
-    );
-  }
-
-  lookupHash (url) {
-    const { instance } = this.state;
-
-    if (!url || !url.length) {
-      return;
-    }
-
-    console.log(`lookupHash ${url}`);
-
-    api.parity
-      .hashContent(url)
-      .then((contentHash) => {
-        console.log('lookupHash', contentHash);
-        if (contentHash === INVALID_URL_HASH) {
-          this.setState({ contentHashError: 'invalid url endpoint', contentHash: null });
-          return;
-        }
-
-        instance.entries
-          .call({}, [contentHash])
-          .then(([accountSlashRepo, commit, contentHashOwner]) => {
-            console.log('lookupHash', accountSlashRepo, api.util.bytesToHex(commit), contentHashOwner);
-
-            if (contentHashOwner !== ZERO_ADDRESS) {
-              this.setState({
-                contentHashError: contentHash,
-                contentHashOwner,
-                contentHash
-              });
-            } else {
-              this.setState({ contentHashError: null, contentHashOwner, contentHash });
-            }
-          });
-      })
-      .catch((error) => {
-        console.error('lookupHash', error);
-        this.setState({ contentHashError: error.message, contentHash: null });
-      });
-  }
-}
diff --git a/js/src/dapps/githubhint/Application/index.js b/js/src/dapps/githubhint/Application/index.js
deleted file mode 100644
index 3d8d1ca3b851e5bfed73373e82eff06b5d9ea46c..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Application/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './application';
diff --git a/js/src/dapps/githubhint/Button/button.css b/js/src/dapps/githubhint/Button/button.css
deleted file mode 100644
index c2f88ba77619752c11c6caf5da84ff5858773421..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Button/button.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.button {
-  background: #08a;
-  color: white;
-  border-radius: 5px;
-  font-size: 1em;
-  line-height: 24px;
-  height: 24px;
-  padding: 0.75em 1.5em;
-  cursor: pointer;
-  display: inline-block;
-  text-align: center;
-}
-
-.button.first {
-  border-radius: 5px 0 0 5px;
-}
-
-.button.middle {
-  border-radius: 0;
-}
-
-.button.last {
-  border-radius: 0 5px 5px 0;
-}
-
-.button.disabled {
-  opacity: 0.25;
-  cursor: default;
-}
-
-.button.inverse {
-  color: #08a;
-  background: white;
-}
-
-.button * {
-  display: inline-block;
-  vertical-align: top;
-}
diff --git a/js/src/dapps/githubhint/Button/button.js b/js/src/dapps/githubhint/Button/button.js
deleted file mode 100644
index 32bf006c405bba6bd9a6dc2bf3542ec468723bf5..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Button/button.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './button.css';
-
-export default class Button extends Component {
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    invert: PropTypes.bool,
-    first: PropTypes.bool,
-    last: PropTypes.bool,
-    middle: PropTypes.bool,
-    onClick: PropTypes.func.isRequired
-  }
-
-  render () {
-    const { children, className, disabled, invert, first, last, middle } = this.props;
-    const classes = `${styles.button} ${disabled ? styles.disabled : ''} ${invert ? styles.inverse : ''} ${first ? styles.first : ''} ${last ? styles.last : ''} ${middle ? styles.middle : ''} ${className}`;
-
-    return (
-      <div className={ classes } onTouchTap={ this.onClick }>
-        { children }
-      </div>
-    );
-  }
-
-  onClick = (event) => {
-    const { disabled, onClick } = this.props;
-
-    if (disabled) {
-      return;
-    }
-
-    onClick(event);
-  }
-}
diff --git a/js/src/dapps/githubhint/Button/index.js b/js/src/dapps/githubhint/Button/index.js
deleted file mode 100644
index 0c2be07ee37bab6a47298e29240a8ebdb094b646..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Button/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './button';
diff --git a/js/src/dapps/githubhint/Events/events.css b/js/src/dapps/githubhint/Events/events.css
deleted file mode 100644
index e83cb8f525130b4bbc9e862ccdc3e261a26cf863..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Events/events.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.list {
-  border: none;
-  margin: 0 auto;
-  text-align: left;
-  vertical-align: top;
-
-  tr {
-    &[data-busy="true"] {
-      opacity: 0.5;
-    }
-
-    &[data-error="true"] {
-      color: #f66;
-    }
-  }
-
-  td {
-    padding: 0.5em;
-  }
-}
diff --git a/js/src/dapps/githubhint/Events/events.js b/js/src/dapps/githubhint/Events/events.js
deleted file mode 100644
index e674d93d1eeb8bf095bfc474aa3d3335716b5862..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Events/events.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import moment from 'moment';
-
-import styles from './events.css';
-
-export default class Events extends Component {
-  static propTypes = {
-    eventIds: PropTypes.array.isRequired,
-    events: PropTypes.array.isRequired
-  }
-
-  render () {
-    return (
-      <table className={ styles.list }>
-        <tbody>
-          { this.props.eventIds.map((id) => this.renderEvent(id, this.props.events[id])) }
-        </tbody>
-      </table>
-    );
-  }
-
-  renderEvent = (eventId, event) => {
-    return (
-      <tr key={ `event_${eventId}` } data-busy={ event.registerBusy } data-error={ event.registerError }>
-        <td>
-          <div>{ moment(event.timestamp).fromNow() }</div>
-          <div>{ event.registerState }</div>
-        </td>
-        <td>
-          <div>{ event.contentUrl || `${event.contentRepo}/${event.contentCommit}` }</div>
-          <div>{ event.contentHash }</div>
-        </td>
-      </tr>
-    );
-  }
-}
diff --git a/js/src/dapps/githubhint/Events/index.js b/js/src/dapps/githubhint/Events/index.js
deleted file mode 100644
index d2d0080b3542ce7eef9405c4c01348a1181898e7..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Events/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './events';
diff --git a/js/src/dapps/githubhint/Loading/index.js b/js/src/dapps/githubhint/Loading/index.js
deleted file mode 100644
index 5eb10a7d4cd0c92498e3fdcdd87663a7209e1cf5..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Loading/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './loading';
diff --git a/js/src/dapps/githubhint/Loading/loading.css b/js/src/dapps/githubhint/Loading/loading.css
deleted file mode 100644
index 36d792c7d99a850bf31cef66eaf6d92a30aab071..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Loading/loading.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.loading {
-  width: 100%;
-  text-align: center;
-  padding-top: 5em;
-  font-size: 2em;
-  color: #999;
-}
diff --git a/js/src/dapps/githubhint/Loading/loading.js b/js/src/dapps/githubhint/Loading/loading.js
deleted file mode 100644
index f716214d2b3d08dbab651ec1cca0e0eb76b9c7eb..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/Loading/loading.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import styles from './loading.css';
-
-export default class Loading extends Component {
-  render () {
-    return (
-      <div className={ styles.loading }>
-        Attaching to contract ...
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/githubhint/parity.js b/js/src/dapps/githubhint/parity.js
deleted file mode 100644
index 7118ce08780e0304708fbe3dc627f53513574b3c..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/parity.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const api = window.parent.secureApi;
-
-export {
-  api
-};
diff --git a/js/src/dapps/githubhint/services.js b/js/src/dapps/githubhint/services.js
deleted file mode 100644
index a4a4a6891cd08d74b6ffb681faf57ddb827b5637..0000000000000000000000000000000000000000
--- a/js/src/dapps/githubhint/services.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import * as abis from '~/contracts/abi';
-import { api } from './parity';
-
-let defaultSubscriptionId;
-
-export function attachInterface () {
-  return api.parity
-    .registryAddress()
-    .then((registryAddress) => {
-      console.log(`the registry was found at ${registryAddress}`);
-
-      return api
-        .newContract(abis.registry, registryAddress).instance
-        .getAddress.call({}, [api.util.sha3('githubhint'), 'A']);
-    })
-    .then((address) => {
-      console.log(`githubhint was found at ${address}`);
-
-      const contract = api.newContract(abis.githubhint, address);
-
-      return {
-        address,
-        contract,
-        instance: contract.instance
-      };
-    })
-    .catch((error) => {
-      console.error('attachInterface', error);
-    });
-}
-
-export function subscribeDefaultAddress (callback) {
-  return api
-    .subscribe('parity_defaultAccount', callback)
-    .then((subscriptionId) => {
-      defaultSubscriptionId = subscriptionId;
-
-      return defaultSubscriptionId;
-    });
-}
-
-export function unsubscribeDefaultAddress () {
-  return api.unsubscribe(defaultSubscriptionId);
-}
diff --git a/js/src/dapps/index.ejs b/js/src/dapps/index.ejs
deleted file mode 100644
index aab652fa66e07a761023e5d20344216358349bdd..0000000000000000000000000000000000000000
--- a/js/src/dapps/index.ejs
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title><%= htmlWebpackPlugin.options.title %></title>
-    <style>
-      html, body, #container {
-        width: 100%;
-        min-height: 100%;
-        margin: 0;
-        padding: 0;
-        background: white;
-        font-family: 'Roboto', sans-serif;
-        font-size: 16px;
-        font-weight: 300;
-      }
-
-      .loading {
-        text-align: center;
-        padding-top: 5em;
-        font-size: 2em;
-        color: #999;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="container">
-      <div class="loading">Loading</div>
-    </div>
-    <script src="vendor.js"></script>
-    <% if (!htmlWebpackPlugin.options.secure) { %>
-      <script src="/parity-utils/parity.js"></script>
-    <% } %>
-  </body>
-</html>
diff --git a/js/src/dapps/localtx.js b/js/src/dapps/localtx.js
deleted file mode 100644
index 4625ded208cd16c6e917e6b15841427952c628d1..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ReactDOM from 'react-dom';
-import React from 'react';
-import { AppContainer } from 'react-hot-loader';
-
-import injectTapEventPlugin from 'react-tap-event-plugin';
-injectTapEventPlugin();
-
-import Application from './localtx/Application';
-
-import '../../assets/fonts/Roboto/font.css';
-import '../../assets/fonts/RobotoMono/font.css';
-import './style.css';
-
-ReactDOM.render(
-  <AppContainer>
-    <Application />
-  </AppContainer>,
-  document.querySelector('#container')
-);
-
-if (module.hot) {
-  module.hot.accept('./localtx/Application/index.js', () => {
-    require('./localtx/Application/index.js');
-
-    ReactDOM.render(
-      <AppContainer>
-        <Application />
-      </AppContainer>,
-      document.querySelector('#container')
-    );
-  });
-}
diff --git a/js/src/dapps/localtx/Application/application.css b/js/src/dapps/localtx/Application/application.css
deleted file mode 100644
index 15762c5d47780964415ce3e81f7ba624cb7fd8ae..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/Application/application.css
+++ /dev/null
@@ -1,43 +0,0 @@
-.container {
-  padding: 1rem 2rem;
-  text-align: center;
-
-  h1 {
-    margin-top: 3rem;
-    margin-bottom: 1rem;
-  }
-
-  table {
-    text-align: left;
-    margin: auto;
-    max-width: 90vw;
-
-    th {
-      text-align: center;
-    }
-
-    td {
-      text-align: center;
-    }
-  }
-
-  button {
-    background-color: rgba(0, 136, 170, 1);
-    border: none;
-    border-radius: 5px;
-    color: white;
-    font-size: 1rem;
-    padding: 0.5em 1em;
-    width: 100%;
-
-    &:hover {
-      background-color: rgba(0, 136, 170, 0.8);
-      cursor: pointer;
-    }
-  }
-
-  input {
-    font-size: 1rem;
-    padding: 0.5em 1em;
-  }
-}
diff --git a/js/src/dapps/localtx/Application/application.js b/js/src/dapps/localtx/Application/application.js
deleted file mode 100644
index 27dc41b3edb91e186c3d01e9e371b06fd8f4d6b9..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/Application/application.js
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import React, { Component } from 'react';
-
-import { api } from '../parity';
-
-import styles from './application.css';
-
-import { Transaction, LocalTransaction } from '../Transaction';
-
-export default class Application extends Component {
-  state = {
-    loading: true,
-    transactions: [],
-    localTransactions: {},
-    blockNumber: 0
-  }
-
-  componentDidMount () {
-    const poll = () => {
-      this._timeout = window.setTimeout(() => {
-        this.fetchTransactionData().then(poll).catch(poll);
-      }, 1000);
-    };
-
-    poll();
-  }
-
-  componentWillUnmount () {
-    clearTimeout(this._timeout);
-  }
-
-  fetchTransactionData () {
-    return Promise.all([
-      api.parity.pendingTransactions(),
-      api.parity.pendingTransactionsStats(),
-      api.parity.localTransactions(),
-      api.eth.blockNumber()
-    ]).then(([pending, stats, local, blockNumber]) => {
-      // Combine results together
-      const transactions = pending.map(tx => {
-        return {
-          transaction: tx,
-          stats: stats[tx.hash],
-          isLocal: !!local[tx.hash]
-        };
-      });
-
-      // Add transaction data to locals
-      transactions
-        .filter(tx => tx.isLocal)
-        .map(data => {
-          const tx = data.transaction;
-
-          local[tx.hash].transaction = tx;
-          local[tx.hash].stats = data.stats;
-        });
-      // Convert local transactions to array
-      const localTransactions = Object.keys(local).map(hash => {
-        const data = local[hash];
-
-        data.txHash = hash;
-        return data;
-      });
-
-      // Sort local transactions by nonce (move future to the end)
-      localTransactions.sort((a, b) => {
-        a = a.transaction || {};
-        b = b.transaction || {};
-
-        if (a.from && b.from && a.from !== b.from) {
-          return a.from < b.from;
-        }
-
-        if (!a.nonce || !b.nonce) {
-          return !a.nonce ? 1 : -1;
-        }
-
-        return new BigNumber(a.nonce).comparedTo(new BigNumber(b.nonce));
-      });
-
-      this.setState({
-        loading: false,
-        transactions,
-        localTransactions,
-        blockNumber
-      });
-    });
-  }
-
-  render () {
-    const { loading } = this.state;
-
-    if (loading) {
-      return (
-        <div className={ styles.container }>Loading...</div>
-      );
-    }
-
-    return (
-      <div className={ styles.container }>
-        <h1>Your local transactions</h1>
-        { this.renderLocals() }
-        <h1>Transactions in the queue</h1>
-        { this.renderQueueSummary() }
-        { this.renderQueue() }
-      </div>
-    );
-  }
-
-  renderQueueSummary () {
-    const { transactions } = this.state;
-
-    if (!transactions.length) {
-      return null;
-    }
-
-    const count = transactions.length;
-    const locals = transactions.filter(tx => tx.isLocal).length;
-    const fee = transactions
-      .map(tx => tx.transaction)
-      .map(tx => tx.gasPrice.mul(tx.gas))
-      .reduce((sum, fee) => sum.add(fee), new BigNumber(0));
-
-    return (
-      <h3>
-        Count: <strong>{ locals ? `${count} (${locals})` : count }</strong>
-        &nbsp;
-        Total Fee: <strong>{ api.util.fromWei(fee).toFixed(3) } ETH</strong>
-      </h3>
-    );
-  }
-
-  renderQueue () {
-    const { blockNumber, transactions } = this.state;
-
-    if (!transactions.length) {
-      return (
-        <h3>The queue seems empty.</h3>
-      );
-    }
-
-    return (
-      <table cellSpacing='0'>
-        <thead>
-          { Transaction.renderHeader() }
-        </thead>
-        <tbody>
-          {
-            transactions.map((tx, idx) => (
-              <Transaction
-                key={ tx.transaction.hash }
-                idx={ idx + 1 }
-                isLocal={ tx.isLocal }
-                transaction={ tx.transaction }
-                stats={ tx.stats }
-                blockNumber={ blockNumber }
-              />
-            ))
-          }
-        </tbody>
-      </table>
-    );
-  }
-
-  renderLocals () {
-    const { localTransactions } = this.state;
-
-    if (!localTransactions.length) {
-      return (
-        <h3>You haven't sent any transactions yet.</h3>
-      );
-    }
-
-    return (
-      <table cellSpacing='0'>
-        <thead>
-          { LocalTransaction.renderHeader() }
-        </thead>
-        <tbody>
-          {
-            localTransactions.map(tx => (
-              <LocalTransaction
-                key={ tx.txHash }
-                hash={ tx.txHash }
-                transaction={ tx.transaction }
-                status={ tx.status }
-                stats={ tx.stats }
-                details={ tx }
-              />
-            ))
-          }
-        </tbody>
-      </table>
-    );
-  }
-}
diff --git a/js/src/dapps/localtx/Application/application.spec.js b/js/src/dapps/localtx/Application/application.spec.js
deleted file mode 100644
index 64d1d8872f8666f9d81085d05666c7f2c45e26d7..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/Application/application.spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import '../../../environment/tests';
-
-import Application from './application';
-
-describe('dapps/localtx/Application', () => {
-  describe('rendering', () => {
-    it('renders without crashing', () => {
-      const rendered = shallow(<Application />);
-
-      expect(rendered).to.be.defined;
-    });
-  });
-});
diff --git a/js/src/dapps/localtx/Application/index.js b/js/src/dapps/localtx/Application/index.js
deleted file mode 100644
index 3d8d1ca3b851e5bfed73373e82eff06b5d9ea46c..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/Application/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './application';
diff --git a/js/src/dapps/localtx/IdentityIcon/identityIcon.css b/js/src/dapps/localtx/IdentityIcon/identityIcon.css
deleted file mode 100644
index 01aba746d2005b91133e8aaef46fac130f10f748..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/IdentityIcon/identityIcon.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.icon {
-  width: 24px;
-  height: 24px;
-  border-radius: 50%;
-  margin-right: 0.5em;
-}
diff --git a/js/src/dapps/localtx/IdentityIcon/identityIcon.js b/js/src/dapps/localtx/IdentityIcon/identityIcon.js
deleted file mode 100644
index c442c45851fe1f11aafb91f4a67d387d84f88243..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/IdentityIcon/identityIcon.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../parity';
-import styles from './identityIcon.css';
-
-export default class IdentityIcon extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired
-  }
-
-  render () {
-    const { address } = this.props;
-
-    return (
-      <img
-        className={ styles.icon }
-        src={ api.util.createIdentityImg(address, 3) }
-      />
-    );
-  }
-}
diff --git a/js/src/dapps/localtx/IdentityIcon/index.js b/js/src/dapps/localtx/IdentityIcon/index.js
deleted file mode 100644
index 09191356420c1b472cb6ed005a3e9af4a8adb151..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/IdentityIcon/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './identityIcon';
diff --git a/js/src/dapps/localtx/Transaction/index.js b/js/src/dapps/localtx/Transaction/index.js
deleted file mode 100644
index fd940c68d6f0b7b5c16844bd066589df2f655f98..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/Transaction/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export { Transaction, LocalTransaction } from './transaction';
diff --git a/js/src/dapps/localtx/Transaction/transaction.css b/js/src/dapps/localtx/Transaction/transaction.css
deleted file mode 100644
index b06942ed768113c5166e420d8c2185f58cfb5285..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/Transaction/transaction.css
+++ /dev/null
@@ -1,39 +0,0 @@
-.from {
-  white-space: nowrap;
-
-  img {
-    vertical-align: middle;
-  }
-}
-
-.txhash {
-  display: inline-block;
-  overflow: hidden;
-  padding-right: 3ch;
-  text-overflow: ellipsis;
-  width: 10ch;
-}
-
-.transaction {
-  td {
-    padding: 7px 15px;
-  }
-
-  td:first-child {
-    padding: 7px 0;
-  }
-
-  &.local {
-    background: #8bc34a;
-  }
-}
-
-.nowrap {
-  white-space: nowrap;
-}
-
-.edit {
-  label, input {
-    display: block;
-  }
-}
diff --git a/js/src/dapps/localtx/Transaction/transaction.js b/js/src/dapps/localtx/Transaction/transaction.js
deleted file mode 100644
index 554c2b757ccde2d9fedda0fd4fbb96bc4d578777..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/Transaction/transaction.js
+++ /dev/null
@@ -1,395 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import React, { Component, PropTypes } from 'react';
-import classnames from 'classnames';
-
-import { api } from '../parity';
-
-import styles from './transaction.css';
-
-import IdentityIcon from '../IdentityIcon';
-
-class BaseTransaction extends Component {
-  shortHash (hash) {
-    return `${hash.substr(0, 5)}..${hash.substr(hash.length - 3)}`;
-  }
-
-  renderHash (hash) {
-    return (
-      <code title={ hash } className={ styles.txhash }>
-        { hash }
-      </code>
-    );
-  }
-
-  renderFrom (transaction) {
-    if (!transaction) {
-      return '-';
-    }
-
-    return (
-      <div title={ transaction.from } className={ styles.from }>
-        <IdentityIcon
-          address={ transaction.from }
-        />
-      </div>
-    );
-  }
-
-  renderGasPrice (transaction) {
-    if (!transaction) {
-      return '-';
-    }
-
-    return (
-      <span title={ `${transaction.gasPrice.toFormat(0)} wei` }>
-        { api.util.fromWei(transaction.gasPrice, 'shannon').toFormat(2) }&nbsp;shannon
-      </span>
-    );
-  }
-
-  renderGas (transaction) {
-    if (!transaction) {
-      return '-';
-    }
-
-    return (
-      <span title={ `${transaction.gas.toFormat(0)} Gas` }>
-        { transaction.gas.div(10 ** 6).toFormat(3) }&nbsp;MGas
-      </span>
-    );
-  }
-
-  renderPropagation (stats) {
-    const noOfPeers = Object.keys(stats.propagatedTo).length;
-    const noOfPropagations = Object.values(stats.propagatedTo).reduce((sum, val) => sum + val, 0);
-
-    return (
-      <span className={ styles.nowrap }>
-        { noOfPropagations } ({ noOfPeers } peers)
-      </span>
-    );
-  }
-}
-
-export class Transaction extends BaseTransaction {
-  static propTypes = {
-    idx: PropTypes.number.isRequired,
-    transaction: PropTypes.object.isRequired,
-    blockNumber: PropTypes.object.isRequired,
-    isLocal: PropTypes.bool,
-    stats: PropTypes.object
-  };
-
-  static defaultProps = {
-    isLocal: false,
-    stats: {
-      firstSeen: 0,
-      propagatedTo: {}
-    }
-  };
-
-  static renderHeader () {
-    return (
-      <tr className={ styles.header }>
-        <th />
-        <th>
-          Transaction
-        </th>
-        <th>
-          From
-        </th>
-        <th>
-          Gas Price
-        </th>
-        <th>
-          Gas
-        </th>
-        <th>
-          First propagation
-        </th>
-        <th>
-          # Propagated
-        </th>
-        <th />
-      </tr>
-    );
-  }
-
-  render () {
-    const { isLocal, stats, transaction, idx } = this.props;
-    const blockNo = new BigNumber(stats.firstSeen);
-
-    const clazz = classnames(styles.transaction, {
-      [styles.local]: isLocal
-    });
-
-    return (
-      <tr className={ clazz }>
-        <td>
-          { idx }.
-        </td>
-        <td>
-          { this.renderHash(transaction.hash) }
-        </td>
-        <td>
-          { this.renderFrom(transaction) }
-        </td>
-        <td>
-          { this.renderGasPrice(transaction) }
-        </td>
-        <td>
-          { this.renderGas(transaction) }
-        </td>
-        <td title={ blockNo.toFormat(0) }>
-          { this.renderTime(stats.firstSeen) }
-        </td>
-        <td>
-          { this.renderPropagation(stats) }
-        </td>
-      </tr>
-    );
-  }
-
-  renderTime (firstSeen) {
-    const { blockNumber } = this.props;
-
-    if (!firstSeen) {
-      return 'never';
-    }
-
-    const timeInMinutes = blockNumber.sub(firstSeen).mul(14).div(60).toFormat(1);
-
-    return `${timeInMinutes} minutes ago`;
-  }
-}
-
-export class LocalTransaction extends BaseTransaction {
-  static propTypes = {
-    hash: PropTypes.string.isRequired,
-    status: PropTypes.string.isRequired,
-    transaction: PropTypes.object,
-    isLocal: PropTypes.bool,
-    stats: PropTypes.object,
-    details: PropTypes.object
-  };
-
-  static defaultProps = {
-    stats: {
-      propagatedTo: {}
-    }
-  };
-
-  static renderHeader () {
-    return (
-      <tr className={ styles.header }>
-        <th />
-        <th>
-          Transaction
-        </th>
-        <th>
-          From
-        </th>
-        <th>
-          Gas Price
-        </th>
-        <th>
-          Gas
-        </th>
-        <th>
-          Status
-        </th>
-      </tr>
-    );
-  }
-
-  state = {
-    isSending: false,
-    isResubmitting: false,
-    gasPrice: null,
-    gas: null
-  };
-
-  toggleResubmit = () => {
-    const { transaction } = this.props;
-    const { isResubmitting } = this.state;
-
-    const nextState = {
-      isResubmitting: !isResubmitting
-    };
-
-    if (!isResubmitting) {
-      nextState.gasPrice = api.util.fromWei(transaction.gasPrice, 'shannon').toNumber();
-      nextState.gas = transaction.gas.div(1000000).toNumber();
-    }
-
-    this.setState(nextState);
-  };
-
-  setGasPrice = el => {
-    this.setState({
-      gasPrice: el.target.value
-    });
-  };
-
-  setGas = el => {
-    this.setState({
-      gas: el.target.value
-    });
-  };
-
-  sendTransaction = () => {
-    const { transaction, status } = this.props;
-    const { gasPrice, gas } = this.state;
-
-    const newTransaction = {
-      from: transaction.from,
-      value: transaction.value,
-      data: transaction.input,
-      gasPrice: api.util.toWei(gasPrice, 'shannon'),
-      gas: new BigNumber(gas).mul(1000000)
-    };
-
-    this.setState({
-      isResubmitting: false,
-      isSending: true
-    });
-
-    const closeSending = () => {
-      this.setState({
-        isSending: false,
-        gasPrice: null,
-        gas: null
-      });
-    };
-
-    if (transaction.to) {
-      newTransaction.to = transaction.to;
-    }
-
-    if (!['mined', 'replaced'].includes(status)) {
-      newTransaction.nonce = transaction.nonce;
-    }
-
-    api.eth.sendTransaction(newTransaction)
-      .then(closeSending)
-      .catch(closeSending);
-  };
-
-  render () {
-    if (this.state.isResubmitting) {
-      return this.renderResubmit();
-    }
-
-    const { stats, transaction, hash, status } = this.props;
-    const { isSending } = this.state;
-
-    const resubmit = isSending ? (
-      'sending...'
-    ) : (
-      <button onClick={ this.toggleResubmit }>
-        resubmit
-      </button>
-    );
-
-    return (
-      <tr className={ styles.transaction }>
-        <td>
-          { !transaction ? null : resubmit }
-        </td>
-        <td>
-          { this.renderHash(hash) }
-        </td>
-        <td>
-          { this.renderFrom(transaction) }
-        </td>
-        <td>
-          { this.renderGasPrice(transaction) }
-        </td>
-        <td>
-          { this.renderGas(transaction) }
-        </td>
-        <td>
-          { this.renderStatus() }
-          <br />
-          { status === 'pending' ? this.renderPropagation(stats) : null }
-        </td>
-      </tr>
-    );
-  }
-
-  renderStatus () {
-    const { details } = this.props;
-
-    let state = {
-      'pending': () => 'In queue: Pending',
-      'future': () => 'In queue: Future',
-      'mined': () => 'Mined',
-      'dropped': () => 'Dropped because of queue limit',
-      'invalid': () => 'Transaction is invalid',
-      'rejected': () => `Rejected: ${details.error}`,
-      'replaced': () => `Replaced by ${this.shortHash(details.hash)}`
-    }[this.props.status];
-
-    return state ? state() : 'unknown';
-  }
-
-  // TODO [ToDr] Gas Price / Gas selection is not needed
-  // when signer supports gasPrice/gas tunning.
-  renderResubmit () {
-    const { transaction } = this.props;
-    const { gasPrice, gas } = this.state;
-
-    return (
-      <tr className={ styles.transaction }>
-        <td>
-          <button onClick={ this.toggleResubmit }>
-            cancel
-          </button>
-        </td>
-        <td>
-          { this.renderHash(transaction.hash) }
-        </td>
-        <td>
-          { this.renderFrom(transaction) }
-        </td>
-        <td className={ styles.edit }>
-          <input
-            type='number'
-            value={ gasPrice }
-            onChange={ this.setGasPrice }
-          />
-          <span>shannon</span>
-        </td>
-        <td className={ styles.edit }>
-          <input
-            type='number'
-            value={ gas }
-            onChange={ this.setGas }
-          />
-          <span>MGas</span>
-        </td>
-        <td colSpan='2'>
-          <button onClick={ this.sendTransaction }>
-            Send
-          </button>
-        </td>
-      </tr>
-    );
-  }
-}
diff --git a/js/src/dapps/localtx/Transaction/transaction.spec.js b/js/src/dapps/localtx/Transaction/transaction.spec.js
deleted file mode 100644
index af2edf2d4e0914b93612c2a8ee4ea80b1e63326b..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/Transaction/transaction.spec.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import '../../../environment/tests';
-import EthApi from '../../../api';
-
-// Mock API for tests
-import * as Api from '../parity';
-Api.api = {
-  util: EthApi.prototype.util
-};
-
-import BigNumber from 'bignumber.js';
-import { Transaction, LocalTransaction } from './transaction';
-
-describe('dapps/localtx/Transaction', () => {
-  describe('rendering', () => {
-    it('renders without crashing', () => {
-      const transaction = {
-        hash: '0x1234567890',
-        nonce: new BigNumber(15),
-        gasPrice: new BigNumber(10),
-        gas: new BigNumber(10)
-      };
-      const rendered = shallow(
-        <Transaction
-          isLocal={ false }
-          transaction={ transaction }
-          blockNumber={ new BigNumber(0) }
-        />
-      );
-
-      expect(rendered).to.be.defined;
-    });
-  });
-});
-
-describe('dapps/localtx/LocalTransaction', () => {
-  describe('rendering', () => {
-    it('renders without crashing', () => {
-      const rendered = shallow(
-        <LocalTransaction
-          hash={ '0x1234567890' }
-          status={ 'pending' }
-        />
-      );
-
-      expect(rendered).to.be.defined;
-    });
-  });
-});
diff --git a/js/src/dapps/localtx/parity.js b/js/src/dapps/localtx/parity.js
deleted file mode 100644
index 7118ce08780e0304708fbe3dc627f53513574b3c..0000000000000000000000000000000000000000
--- a/js/src/dapps/localtx/parity.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const api = window.parent.secureApi;
-
-export {
-  api
-};
diff --git a/js/src/dapps/registry.js b/js/src/dapps/registry.js
deleted file mode 100644
index 3be005184c868650953b4b461bd6f9ac083877b9..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { Provider } from 'react-redux';
-
-import injectTapEventPlugin from 'react-tap-event-plugin';
-injectTapEventPlugin();
-
-import store from './registry/store';
-import Container from './registry/Container';
-
-import '../../assets/fonts/Roboto/font.css';
-import '../../assets/fonts/RobotoMono/font.css';
-import './style.css';
-
-ReactDOM.render(
-  <Provider store={ store }>
-    <Container />
-  </Provider>,
-  document.querySelector('#container')
-);
-
-if (module.hot) {
-  module.hot.accept('./registry/Container', () => {
-    require('./registry/Container');
-
-    ReactDOM.render(
-      <Provider store={ store }>
-        <Container />
-      </Provider>,
-      document.querySelector('#container')
-    );
-  });
-}
diff --git a/js/src/dapps/registry/Accounts/accounts.css b/js/src/dapps/registry/Accounts/accounts.css
deleted file mode 100644
index d886138f0d063b463f98b379d5d8af31a5e93cfc..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Accounts/accounts.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.icon {
-  /* TODO remove !important once material design lite is used */
-  height: 30px !important;
-  margin: 0 !important;
-  padding: 0 !important;
-  width: 30px !important;
-}
diff --git a/js/src/dapps/registry/Accounts/accounts.js b/js/src/dapps/registry/Accounts/accounts.js
deleted file mode 100644
index b17ad63b1bdc0dddf4c3a82950c66fd2aacae6d1..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Accounts/accounts.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import AccountIcon from 'material-ui/svg-icons/action/account-circle';
-
-import { init } from './actions';
-import IdentityIcon from '../IdentityIcon';
-
-import styles from './accounts.css';
-
-class Accounts extends Component {
-  static propTypes = {
-    selected: PropTypes.oneOfType([
-      PropTypes.oneOf([ null ]),
-      PropTypes.string
-    ]),
-    onInit: PropTypes.func.isRequired
-  };
-
-  componentWillMount () {
-    this.props.onInit();
-  }
-
-  render () {
-    const { selected } = this.props;
-
-    if (!selected) {
-      return (
-        <AccountIcon
-          className={ styles.icon }
-          color='white'
-        />
-      );
-    }
-
-    return (
-      <IdentityIcon
-        className={ styles.icon }
-        address={ selected }
-      />
-    );
-  }
-}
-
-const mapStateToProps = (state) => state.accounts;
-const mapDispatchToProps = (dispatch) => bindActionCreators({
-  onInit: init
-}, dispatch);
-
-export default connect(mapStateToProps, mapDispatchToProps)(Accounts);
diff --git a/js/src/dapps/registry/Accounts/actions.js b/js/src/dapps/registry/Accounts/actions.js
deleted file mode 100644
index 7f38de5799109ae2c8c90ffa5a3cda7d1c87976b..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Accounts/actions.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { api } from '../parity';
-
-export const select = (address) => ({ type: 'accounts select', address });
-
-export const init = () => (dispatch) => {
-  api.subscribe('parity_defaultAccount', (error, accountAddress) => {
-    if (error) {
-      return console.error(error);
-    }
-
-    if (accountAddress) {
-      dispatch(select(accountAddress));
-    }
-  });
-
-  return api.parity
-    .defaultAccount()
-    .then((accountAddress) => {
-      dispatch(select(accountAddress));
-    })
-    .catch((error) => {
-      console.error(error);
-    });
-};
diff --git a/js/src/dapps/registry/Accounts/index.js b/js/src/dapps/registry/Accounts/index.js
deleted file mode 100644
index 027387e709e83bcecb50fa82770e5bb7950277ce..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Accounts/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './accounts';
diff --git a/js/src/dapps/registry/Application/application.css b/js/src/dapps/registry/Application/application.css
deleted file mode 100644
index b9fac12ae24137b968a3951e18a89927e66135d0..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Application/application.css
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.header {
-  align-items: center;
-  display: flex;
-  justify-content: space-between;
-  margin: 0;
-  padding: 0.3em 1em;
-  color: #fff;
-  background-color: #333;
-}
-
-.header h1 {
-  margin-top: 0;
-  margin-bottom: 0;
-  line-height: 50px;
-  font-size: 200%;
-  text-transform: uppercase;
-}
-
-.address {
-  margin-bottom: 0;
-  padding: 1rem;
-  font-size: 80%;
-  background-color: #f0f0f0;
-}
-
-.actions {
-  margin: 1em;
-
-  * {
-    font-size: 1.3rem !important;
-  }
-
-  > * {
-    padding-bottom: 0 !important;
-  }
-}
-
-.warning {
-  background: #f80;
-  bottom: 0;
-  color: #fff;
-  cursor: pointer;
-  left: 0;
-  opacity: 1;
-  padding: 1.5em;
-  position: fixed;
-  right: 50%;
-  z-index: 100;
-}
diff --git a/js/src/dapps/registry/Application/application.js b/js/src/dapps/registry/Application/application.js
deleted file mode 100644
index 7857b1ad140ce9a55f30625f6518dbd059bdc6bb..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Application/application.js
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-import React, { Component, PropTypes } from 'react';
-
-import getMuiTheme from 'material-ui/styles/getMuiTheme';
-import lightBaseTheme from 'material-ui/styles/baseThemes/lightBaseTheme';
-const muiTheme = getMuiTheme(lightBaseTheme);
-
-import CircularProgress from 'material-ui/CircularProgress';
-import { Card, CardText } from 'material-ui/Card';
-
-import { nullableProptype } from '~/util/proptypes';
-import { api } from '../parity';
-
-import styles from './application.css';
-import Accounts from '../Accounts';
-import Events from '../Events';
-import Lookup from '../Lookup';
-import Names from '../Names';
-import Records from '../Records';
-import Reverse from '../Reverse';
-
-export default class Application extends Component {
-  static childContextTypes = {
-    muiTheme: PropTypes.object.isRequired,
-    api: PropTypes.object.isRequired
-  };
-
-  getChildContext () {
-    return { muiTheme, api };
-  }
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    contract: nullableProptype(PropTypes.object.isRequired),
-    fee: nullableProptype(PropTypes.object.isRequired)
-  };
-
-  state = {
-    showWarning: true
-  };
-
-  render () {
-    const { contract, fee } = this.props;
-    let warning = null;
-
-    return (
-      <div>
-        { warning }
-        <div className={ styles.header }>
-          <h1>RΞgistry</h1>
-          <Accounts />
-        </div>
-        { contract && fee ? (
-          <div>
-            <Lookup />
-            { this.renderActions() }
-            <Events />
-            { this.renderWarning() }
-          </div>
-        ) : (
-          <CircularProgress size={ 60 } />
-        ) }
-      </div>
-    );
-  }
-
-  renderActions () {
-    const hasAccount = !!this.props.accounts.selected;
-
-    if (!hasAccount) {
-      return (
-        <Card className={ styles.actions }>
-          <CardText>
-            Please select a valid account in order
-            to execute actions.
-          </CardText>
-        </Card>
-      );
-    }
-
-    return (
-      <div>
-        <Names />
-        <Records />
-        <Reverse />
-      </div>
-    );
-  }
-
-  renderWarning () {
-    const { showWarning } = this.state;
-    const { fee } = this.props;
-
-    if (!showWarning) {
-      return null;
-    }
-
-    return (
-      <div
-        className={ styles.warning }
-        onClick={ this.handleHideWarning }
-      >
-        <span>
-          WARNING: The name registry is experimental. Please ensure that you understand the risks,
-          benefits & consequences of registering a name before doing so.
-        </span>
-        {
-          fee && api.util.fromWei(fee).gt(0)
-          ? (
-            <span>
-                &nbsp;A non-refundable fee of { api.util.fromWei(fee).toFormat(3) } <small>ETH</small>
-              &nbsp;is required for all registrations.
-            </span>
-          )
-          : null
-        }
-      </div>
-    );
-  }
-
-  handleHideWarning = () => {
-    this.setState({ showWarning: false });
-  }
-}
diff --git a/js/src/dapps/registry/Application/index.js b/js/src/dapps/registry/Application/index.js
deleted file mode 100644
index 3d8d1ca3b851e5bfed73373e82eff06b5d9ea46c..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Application/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './application';
diff --git a/js/src/dapps/registry/Container.js b/js/src/dapps/registry/Container.js
deleted file mode 100644
index 6a945a99c4c5dbfd05773907c96b3ad365558dd2..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Container.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { nullableProptype } from '~/util/proptypes';
-
-import Application from './Application';
-import * as actions from './actions';
-
-class Container extends Component {
-  static propTypes = {
-    actions: PropTypes.object.isRequired,
-    accounts: PropTypes.object.isRequired,
-    contacts: PropTypes.object.isRequired,
-    contract: nullableProptype(PropTypes.object.isRequired),
-    owner: nullableProptype(PropTypes.string.isRequired),
-    fee: nullableProptype(PropTypes.object.isRequired),
-    lookup: PropTypes.object.isRequired,
-    events: PropTypes.object.isRequired
-  };
-
-  componentDidMount () {
-    Promise.all([
-      this.props.actions.fetchIsTestnet(),
-      this.props.actions.addresses.fetch(),
-      this.props.actions.fetchContract()
-    ]).then(() => {
-      this.props.actions.events.subscribe('Reserved');
-    });
-  }
-
-  render () {
-    return (<Application { ...this.props } />);
-  }
-}
-
-export default connect(
-  // redux -> react connection
-  (state) => state,
-  // react -> redux connection
-  (dispatch) => {
-    const bound = bindActionCreators(actions, dispatch);
-
-    bound.addresses = bindActionCreators(actions.addresses, dispatch);
-    bound.accounts = bindActionCreators(actions.accounts, dispatch);
-    bound.lookup = bindActionCreators(actions.lookup, dispatch);
-    bound.events = bindActionCreators(actions.events, dispatch);
-    bound.names = bindActionCreators(actions.names, dispatch);
-    bound.records = bindActionCreators(actions.records, dispatch);
-    return { actions: bound };
-  }
-)(Container);
diff --git a/js/src/dapps/registry/Events/actions.js b/js/src/dapps/registry/Events/actions.js
deleted file mode 100644
index e1f3167186eb0b422c5770a9e75fa72bbee07807..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Events/actions.js
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { api } from '../parity.js';
-
-export const start = (name, from, to) => ({ type: 'events subscribe start', name, from, to });
-export const fail = (name) => ({ type: 'events subscribe fail', name });
-export const success = (name, subscription) => ({ type: 'events subscribe success', name, subscription });
-
-export const event = (name, event) => ({ type: 'events event', name, event });
-
-export const subscribe = (name, from = 0, to = 'pending') =>
-  (dispatch, getState) => {
-    const { contract } = getState();
-
-    if (!contract) {
-      return;
-    }
-
-    const opt = { fromBlock: from, toBlock: to, limit: 50 };
-
-    dispatch(start(name, from, to));
-
-    contract
-      .subscribe(name, opt, (error, events) => {
-        if (error) {
-          console.error(`error receiving events for ${name}`, error);
-          return;
-        }
-
-        events.forEach((e) => {
-          Promise.all([
-            api.parity.getBlockHeaderByNumber(e.blockNumber),
-            api.eth.getTransactionByHash(e.transactionHash)
-          ])
-          .then(([block, tx]) => {
-            const data = {
-              type: name,
-              key: '' + e.transactionHash + e.logIndex,
-              state: e.type,
-              block: e.blockNumber,
-              index: e.logIndex,
-              transaction: e.transactionHash,
-              from: tx.from,
-              to: tx.to,
-              parameters: e.params,
-              timestamp: block.timestamp
-            };
-
-            dispatch(event(name, data));
-          })
-          .catch((err) => {
-            console.error(`could not fetch block ${e.blockNumber}.`);
-            console.error(err);
-          });
-        });
-      })
-      .then((subscriptionId) => {
-        dispatch(success(name, subscriptionId));
-      })
-      .catch((error) => {
-        console.error('event subscription failed', error);
-        dispatch(fail(name));
-      });
-  };
-
-export const unsubscribe = (name) =>
-  (dispatch, getState) => {
-    const state = getState();
-
-    if (!state.contract) {
-      return;
-    }
-
-    const subscriptions = state.events.subscriptions;
-
-    if (!(name in subscriptions) || subscriptions[name] === null) {
-      return;
-    }
-
-    state.contract
-      .unsubscribe(subscriptions[name])
-      .then(() => {
-        dispatch({ type: 'events unsubscribe', name });
-      })
-      .catch((error) => {
-        console.error('event unsubscribe failed', error);
-      });
-  };
diff --git a/js/src/dapps/registry/Events/events.css b/js/src/dapps/registry/Events/events.css
deleted file mode 100644
index a7439c3885c28aa326ab8118988b1b3ab046daba..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Events/events.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.events {
-  margin: 1em;
-}
-
-.options {
-  margin: 0 .5em;
-}
-
-.reserved, .dropped, .dataChanged {
-}
-
-.reserved abbr, .dropped abbr {
-  cursor: help;
-}
-
-.pending {
-  opacity: .6;
-}
-
-.owner code {
-  display: inline-block;
-  vertical-align: top;
-  line-height: 32px;
-  word-wrap: break-word;
-}
-
-.eventsList {
-  width: 100%;
-  boder: none;
-}
-
-.eventsList td {
-  padding: 0.25em 0.5em;
-}
-
-.inline {
-  display: inline-block;
-  width: auto;
-  margin-right: 1em;
-}
diff --git a/js/src/dapps/registry/Events/events.js b/js/src/dapps/registry/Events/events.js
deleted file mode 100644
index 05b138bc5f0a062752eeaf95e606878297687bb0..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Events/events.js
+++ /dev/null
@@ -1,315 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { Card, CardHeader, CardActions, CardText } from 'material-ui/Card';
-import Toggle from 'material-ui/Toggle';
-import moment from 'moment';
-
-import { bytesToHex } from '../parity';
-import Hash from '../ui/hash';
-import Address from '../ui/address';
-
-import { subscribe, unsubscribe } from './actions';
-import styles from './events.css';
-
-const inlineButton = {
-  display: 'inline-block',
-  width: 'auto',
-  marginRight: '1em'
-};
-
-const renderStatus = (timestamp, isPending) => {
-  timestamp = moment(timestamp);
-  if (isPending) {
-    return (<abbr title='This transaction has not been synced with the network yet.'>pending</abbr>);
-  }
-  return (
-    <time dateTime={ timestamp.toISOString() }>
-      <abbr title={ timestamp.format('MMMM Do YYYY, h:mm:ss a') }>{ timestamp.fromNow() }</abbr>
-    </time>
-  );
-};
-
-const renderEvent = (classNames, verb) => (e) => {
-  const classes = e.state === 'pending'
-    ? classNames + ' ' + styles.pending : classNames;
-
-  return (
-    <tr key={ e.key } className={ classes }>
-      <td>
-        <Address
-          address={
-            e.parameters.owner
-              ? e.parameters.owner.value
-              : e.from
-          }
-        />
-      </td>
-      <td>
-        <abbr title={ e.transaction }>{ verb }</abbr>
-      </td>
-      <td>
-        <code>
-          <Hash hash={ bytesToHex(e.parameters.name.value) } />
-        </code>
-      </td>
-      <td>
-        { renderStatus(e.timestamp, e.state === 'pending') }
-      </td>
-    </tr>
-  );
-};
-
-const renderDataChanged = (e) => {
-  let classNames = styles.dataChanged;
-
-  if (e.state === 'pending') {
-    classNames += ' ' + styles.pending;
-  }
-
-  return (
-    <tr key={ e.key } className={ classNames }>
-      <td>
-        <Address
-          address={
-            e.parameters.owner
-              ? e.parameters.owner.value
-              : e.from
-          }
-        />
-      </td>
-      <td>
-        <abbr title={ e.transaction }>updated</abbr>
-      </td>
-      <td>
-        key&nbsp;
-        <code>
-          { new Buffer(e.parameters.plainKey.value).toString('utf8') }
-        </code>
-        &nbsp;of&nbsp;
-        <code>
-          <Hash hash={ bytesToHex(e.parameters.name.value) } />
-        </code>
-      </td>
-      <td>
-        { renderStatus(e.timestamp, e.state === 'pending') }
-      </td>
-    </tr>
-  );
-};
-
-const renderReverse = (e) => {
-  const verb = ({
-    ReverseProposed: 'proposed',
-    ReverseConfirmed: 'confirmed',
-    ReverseRemoved: 'removed'
-  })[e.type];
-
-  if (!verb) {
-    return null;
-  }
-
-  const classes = [ styles.reverse ];
-
-  if (e.state === 'pending') {
-    classes.push(styles.pending);
-  }
-
-  // TODO: `name` is an indexed param, cannot display as plain text
-  return (
-    <tr key={ e.key } className={ classes.join(' ') }>
-      <td>
-        <Address address={ e.from } />
-      </td>
-      <td>{ verb }</td>
-      <td>
-        { 'name ' }
-        <code key='name'>{ bytesToHex(e.parameters.name.value) }</code>
-        { ' for ' }
-        <Address key='reverse' address={ e.parameters.reverse.value } />
-      </td>
-      <td>
-        { renderStatus(e.timestamp, e.state === 'pending') }
-      </td>
-    </tr>
-  );
-};
-
-const eventTypes = {
-  Reserved: renderEvent(styles.reserved, 'reserved'),
-  Dropped: renderEvent(styles.dropped, 'dropped'),
-  DataChanged: renderDataChanged,
-  ReverseProposed: renderReverse,
-  ReverseConfirmed: renderReverse,
-  ReverseRemoved: renderReverse
-};
-
-class Events extends Component {
-  static propTypes = {
-    events: PropTypes.array.isRequired,
-    pending: PropTypes.object.isRequired,
-    subscriptions: PropTypes.object.isRequired,
-
-    subscribe: PropTypes.func.isRequired,
-    unsubscribe: PropTypes.func.isRequired
-  }
-
-  render () {
-    const { subscriptions, pending } = this.props;
-
-    const eventsObject = this.props.events
-      .filter((e) => eventTypes[e.type])
-      .reduce((eventsObject, event) => {
-        const txHash = event.transaction;
-
-        if (
-          (eventsObject[txHash] && eventsObject[txHash].state === 'pending') ||
-          !eventsObject[txHash]
-        ) {
-          eventsObject[txHash] = event;
-        }
-
-        return eventsObject;
-      }, {});
-
-    const events = Object
-      .values(eventsObject)
-      .sort((evA, evB) => {
-        if (evA.state === 'pending') {
-          return -1;
-        }
-
-        if (evB.state === 'pending') {
-          return 1;
-        }
-
-        return evB.timestamp - evA.timestamp;
-      })
-      .map((e) => eventTypes[e.type](e));
-
-    const reverseToggled =
-      subscriptions.ReverseProposed !== null &&
-      subscriptions.ReverseConfirmed !== null &&
-      subscriptions.ReverseRemoved !== null;
-    const reverseDisabled =
-      pending.ReverseProposed ||
-      pending.ReverseConfirmed ||
-      pending.ReverseRemoved;
-
-    return (
-      <Card className={ styles.events }>
-        <CardHeader title='Event Log' />
-        <CardActions className={ styles.options }>
-          <Toggle
-            label='Reserved'
-            toggled={ subscriptions.Reserved !== null }
-            disabled={ pending.Reserved }
-            onToggle={ this.onReservedToggle }
-            style={ inlineButton }
-          />
-          <Toggle
-            label='Dropped'
-            toggled={ subscriptions.Dropped !== null }
-            disabled={ pending.Dropped }
-            onToggle={ this.onDroppedToggle }
-            style={ inlineButton }
-          />
-          <Toggle
-            label='DataChanged'
-            toggled={ subscriptions.DataChanged !== null }
-            disabled={ pending.DataChanged }
-            onToggle={ this.onDataChangedToggle }
-            style={ inlineButton }
-          />
-          <Toggle
-            label='Reverse Lookup'
-            toggled={ reverseToggled }
-            disabled={ reverseDisabled }
-            onToggle={ this.onReverseToggle }
-            style={ inlineButton }
-          />
-        </CardActions>
-        <CardText>
-          <table className={ styles.eventsList }>
-            <tbody>
-              { events }
-            </tbody>
-          </table>
-        </CardText>
-      </Card>
-    );
-  }
-
-  onReservedToggle = (e, isToggled) => {
-    const { pending, subscriptions, subscribe, unsubscribe } = this.props;
-
-    if (!pending.Reserved) {
-      if (isToggled && subscriptions.Reserved === null) {
-        subscribe('Reserved');
-      } else if (!isToggled && subscriptions.Reserved !== null) {
-        unsubscribe('Reserved');
-      }
-    }
-  };
-
-  onDroppedToggle = (e, isToggled) => {
-    const { pending, subscriptions, subscribe, unsubscribe } = this.props;
-
-    if (!pending.Dropped) {
-      if (isToggled && subscriptions.Dropped === null) {
-        subscribe('Dropped');
-      } else if (!isToggled && subscriptions.Dropped !== null) {
-        unsubscribe('Dropped');
-      }
-    }
-  };
-
-  onDataChangedToggle = (e, isToggled) => {
-    const { pending, subscriptions, subscribe, unsubscribe } = this.props;
-
-    if (!pending.DataChanged) {
-      if (isToggled && subscriptions.DataChanged === null) {
-        subscribe('DataChanged');
-      } else if (!isToggled && subscriptions.DataChanged !== null) {
-        unsubscribe('DataChanged');
-      }
-    }
-  };
-
-  onReverseToggle = (e, isToggled) => {
-    const { pending, subscriptions, subscribe, unsubscribe } = this.props;
-
-    for (let e of ['ReverseProposed', 'ReverseConfirmed', 'ReverseRemoved']) {
-      if (pending[e]) {
-        continue;
-      }
-
-      if (isToggled && subscriptions[e] === null) {
-        subscribe(e);
-      } else if (!isToggled && subscriptions[e] !== null) {
-        unsubscribe(e);
-      }
-    }
-  };
-}
-
-const mapStateToProps = (state) => state.events;
-const mapDispatchToProps = (dispatch) => bindActionCreators({ subscribe, unsubscribe }, dispatch);
-
-export default connect(mapStateToProps, mapDispatchToProps)(Events);
diff --git a/js/src/dapps/registry/Events/index.js b/js/src/dapps/registry/Events/index.js
deleted file mode 100644
index a2c765eb52490de3034e5ef534bb415428e559b5..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Events/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './events.js';
diff --git a/js/src/dapps/registry/Events/reducers.js b/js/src/dapps/registry/Events/reducers.js
deleted file mode 100644
index 4d23e9123d9cebf3cb5edf77316170e8d51268a3..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Events/reducers.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const initialState = {
-  subscriptions: {
-    Reserved: null,
-    Dropped: null,
-    DataChanged: null,
-    ReverseProposed: null,
-    ReverseConfirmed: null,
-    ReverseRemoved: null
-  },
-  pending: {
-    Reserved: false,
-    Dropped: false,
-    DataChanged: false,
-    ReverseProposed: false,
-    ReverseConfirmed: false,
-    ReverseRemoved: false
-  },
-  events: []
-};
-
-const sortEvents = (a, b) => {
-  if (a.state === 'pending' && b.state !== 'pending') {
-    return -1;
-  } else if (a.state !== 'pending' && b.state === 'pending') {
-    return 1;
-  }
-
-  const d = b.block.minus(a.block).toFixed(0);
-
-  if (d === 0) {
-    return b.index.minus(a.index).toFixed(0);
-  }
-
-  return d;
-};
-
-export default (state = initialState, action) => {
-  if (!(action.name in state.subscriptions)) { // invalid event name
-    return state;
-  }
-
-  if (action.type === 'events subscribe start') {
-    return { ...state, pending: { ...state.pending, [action.name]: true } };
-  }
-  if (action.type === 'events subscribe fail') {
-    return { ...state, pending: { ...state.pending, [action.name]: false } };
-  }
-  if (action.type === 'events subscribe success') {
-    return {
-      ...state,
-      pending: { ...state.pending, [action.name]: false },
-      subscriptions: { ...state.subscriptions, [action.name]: action.subscription }
-    };
-  }
-
-  if (action.type === 'events unsubscribe') {
-    return {
-      ...state,
-      pending: { ...state.pending, [action.name]: false },
-      subscriptions: { ...state.subscriptions, [action.name]: null },
-      events: state.events.filter((event) => event.type !== action.name)
-    };
-  }
-
-  if (action.type === 'events event') {
-    return { ...state, events: state.events
-      .filter((event) => event.key !== action.event.key)
-      .concat(action.event)
-      .sort(sortEvents)
-    };
-  }
-
-  return state;
-};
diff --git a/js/src/dapps/registry/IdentityIcon/identityIcon.css b/js/src/dapps/registry/IdentityIcon/identityIcon.css
deleted file mode 100644
index 01aba746d2005b91133e8aaef46fac130f10f748..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/IdentityIcon/identityIcon.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.icon {
-  width: 24px;
-  height: 24px;
-  border-radius: 50%;
-  margin-right: 0.5em;
-}
diff --git a/js/src/dapps/registry/IdentityIcon/identityIcon.js b/js/src/dapps/registry/IdentityIcon/identityIcon.js
deleted file mode 100644
index aac1043ae0de4bbbb372120160db435b79a8c867..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/IdentityIcon/identityIcon.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../parity';
-import styles from './identityIcon.css';
-
-export default class IdentityIcon extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    className: PropTypes.string,
-    style: PropTypes.object
-  }
-
-  render () {
-    const { address, className, style } = this.props;
-
-    return (
-      <img
-        className={ styles.icon + ' ' + className }
-        style={ style }
-        src={ api.util.createIdentityImg(address, 3) }
-      />
-    );
-  }
-}
diff --git a/js/src/dapps/registry/IdentityIcon/index.js b/js/src/dapps/registry/IdentityIcon/index.js
deleted file mode 100644
index 09191356420c1b472cb6ed005a3e9af4a8adb151..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/IdentityIcon/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './identityIcon';
diff --git a/js/src/dapps/registry/Lookup/actions.js b/js/src/dapps/registry/Lookup/actions.js
deleted file mode 100644
index 514039272bf67cd14e5a17bff92f5bc05d3d5001..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Lookup/actions.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { api, sha3 } from '../parity.js';
-import { getOwner } from '../util/registry';
-
-export const clear = () => ({ type: 'lookup clear' });
-
-export const lookupStart = (name, key) => ({ type: 'lookup start', name, key });
-export const reverseLookupStart = (address) => ({ type: 'reverseLookup start', address });
-export const ownerLookupStart = (name) => ({ type: 'ownerLookup start', name });
-
-export const success = (action, result) => ({ type: `${action} success`, result: result });
-
-export const fail = (action) => ({ type: `${action} error` });
-
-export const lookup = (name, key) => (dispatch, getState) => {
-  const { contract } = getState();
-
-  if (!contract) {
-    return;
-  }
-
-  const method = key === 'A'
-    ? contract.instance.getAddress
-    : contract.instance.getData;
-
-  name = name.toLowerCase();
-  dispatch(lookupStart(name, key));
-
-  method.call({}, [ sha3.text(name), key ])
-    .then((result) => {
-      if (key !== 'A') {
-        result = api.util.bytesToHex(result);
-      }
-
-      dispatch(success('lookup', result));
-    })
-    .catch((err) => {
-      console.error(`could not lookup ${key} for ${name}`);
-      if (err) {
-        console.error(err.stack);
-      }
-      dispatch(fail('lookup'));
-    });
-};
-
-export const reverseLookup = (lookupAddress) => (dispatch, getState) => {
-  const { contract } = getState();
-
-  if (!contract) {
-    return;
-  }
-
-  dispatch(reverseLookupStart(lookupAddress));
-
-  contract.instance
-    .reverse
-    .call({}, [ lookupAddress ])
-    .then((address) => {
-      dispatch(success('reverseLookup', address));
-    })
-    .catch((err) => {
-      console.error(`could not lookup reverse for ${lookupAddress}`);
-      if (err) {
-        console.error(err.stack);
-      }
-      dispatch(fail('reverseLookup'));
-    });
-};
-
-export const ownerLookup = (name) => (dispatch, getState) => {
-  const { contract } = getState();
-
-  if (!contract) {
-    return;
-  }
-
-  name = name.toLowerCase();
-  dispatch(ownerLookupStart(name));
-
-  return getOwner(contract, name)
-    .then((owner) => {
-      dispatch(success('ownerLookup', owner));
-    })
-    .catch((err) => {
-      console.error(`could not lookup owner for ${name}`);
-
-      if (err) {
-        console.error(err.stack);
-      }
-
-      dispatch(fail('ownerLookup'));
-    });
-};
diff --git a/js/src/dapps/registry/Lookup/index.js b/js/src/dapps/registry/Lookup/index.js
deleted file mode 100644
index 9e3166ec5bbb1f11ef5daceb62d00424240b8cfa..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Lookup/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './lookup.js';
diff --git a/js/src/dapps/registry/Lookup/lookup.css b/js/src/dapps/registry/Lookup/lookup.css
deleted file mode 100644
index 135db09056624e9c02ea10a3788f2ff157df972c..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Lookup/lookup.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.lookup {
-  margin: 1em;
-}
-
-.box {
-  display: flex;
-  margin: 0 1em;
-  align-items: baseline;
-}
diff --git a/js/src/dapps/registry/Lookup/lookup.js b/js/src/dapps/registry/Lookup/lookup.js
deleted file mode 100644
index 3371d17e4f732518914b86bcdd455bdd4ba2e0e0..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Lookup/lookup.js
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { Card, CardHeader, CardText } from 'material-ui/Card';
-import TextField from 'material-ui/TextField';
-import DropDownMenu from 'material-ui/DropDownMenu';
-import MenuItem from 'material-ui/MenuItem';
-import RaisedButton from 'material-ui/RaisedButton';
-import SearchIcon from 'material-ui/svg-icons/action/search';
-import keycode from 'keycode';
-
-import { nullableProptype } from '~/util/proptypes';
-
-import Address from '../ui/address.js';
-import renderImage from '../ui/image.js';
-
-import { clear, lookup, ownerLookup, reverseLookup } from './actions';
-import styles from './lookup.css';
-
-class Lookup extends Component {
-  static propTypes = {
-    result: nullableProptype(PropTypes.string.isRequired),
-
-    clear: PropTypes.func.isRequired,
-    lookup: PropTypes.func.isRequired,
-    ownerLookup: PropTypes.func.isRequired,
-    reverseLookup: PropTypes.func.isRequired
-  }
-
-  state = {
-    input: '', type: 'A'
-  };
-
-  render () {
-    const { input, type } = this.state;
-    const { result } = this.props;
-
-    return (
-      <Card className={ styles.lookup }>
-        <CardHeader title={ 'Query the Registry' } />
-        <div className={ styles.box }>
-          <TextField
-            hintText={ type === 'reverse' ? 'address' : 'name' }
-            value={ input }
-            onChange={ this.onInputChange }
-            onKeyDown={ this.onKeyDown }
-          />
-          <DropDownMenu
-            value={ type }
-            onChange={ this.onTypeChange }
-          >
-            <MenuItem value='A' primaryText='A – Ethereum address' />
-            <MenuItem value='IMG' primaryText='IMG – hash of a picture in the blockchain' />
-            <MenuItem value='CONTENT' primaryText='CONTENT – hash of a data in the blockchain' />
-            <MenuItem value='reverse' primaryText='reverse – find a name for an address' />
-            <MenuItem value='owner' primaryText='owner – find the owner' />
-          </DropDownMenu>
-          <RaisedButton
-            label='Lookup'
-            primary
-            icon={ <SearchIcon /> }
-            onTouchTap={ this.onLookupClick }
-          />
-        </div>
-        <CardText>
-          { this.renderOutput(type, result) }
-        </CardText>
-      </Card>
-    );
-  }
-
-  renderOutput (type, result) {
-    if (result === null) {
-      return null;
-    }
-
-    if (type === 'A') {
-      return (
-        <code>
-          <Address
-            address={ result }
-            shortenHash={ false }
-          />
-        </code>
-      );
-    }
-
-    if (type === 'owner') {
-      if (!result) {
-        return (
-          <code>Not reserved yet</code>
-        );
-      }
-
-      return (
-        <code>
-          <Address
-            address={ result }
-            shortenHash={ false }
-          />
-        </code>
-      );
-    }
-
-    if (type === 'IMG') {
-      return renderImage(result);
-    }
-
-    if (type === 'CONTENT') {
-      return (
-        <div>
-          <code>{ result }</code>
-          <p>Keep in mind that this is most likely the hash of the content you are looking for.</p>
-        </div>
-      );
-    }
-
-    return (
-      <code>{ result || 'No data' }</code>
-    );
-  }
-
-  onInputChange = (e) => {
-    this.setState({ input: e.target.value });
-  }
-
-  onKeyDown = (event) => {
-    const codeName = keycode(event);
-
-    if (codeName !== 'enter') {
-      return;
-    }
-
-    this.onLookupClick();
-  }
-
-  onTypeChange = (e, i, type) => {
-    this.setState({ type });
-    this.props.clear();
-  }
-
-  onLookupClick = () => {
-    const { input, type } = this.state;
-
-    if (type === 'reverse') {
-      return this.props.reverseLookup(input);
-    }
-
-    if (type === 'owner') {
-      return this.props.ownerLookup(input);
-    }
-
-    return this.props.lookup(input, type);
-  }
-}
-
-const mapStateToProps = (state) => state.lookup;
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators({
-    clear, lookup, ownerLookup, reverseLookup
-  }, dispatch);
-
-export default connect(mapStateToProps, mapDispatchToProps)(Lookup);
diff --git a/js/src/dapps/registry/Lookup/reducers.js b/js/src/dapps/registry/Lookup/reducers.js
deleted file mode 100644
index 0a8c2e486cb2f75fb911eedf92fdf0bda24174ed..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Lookup/reducers.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isStage } from '../util/actions';
-
-const initialState = {
-  pending: false,
-  result: null
-};
-
-export default (state = initialState, action) => {
-  const { type } = action;
-
-  if (!/^(lookup|reverseLookup|ownerLookup)/.test(type)) {
-    return state;
-  }
-
-  if (isStage('clear', action)) {
-    return { pending: state.pending, result: null };
-  }
-
-  if (isStage('start', action)) {
-    return { pending: true, result: null };
-  }
-
-  if (isStage('error', action)) {
-    return { pending: false, result: null };
-  }
-
-  if (isStage('success', action)) {
-    return { pending: false, result: action.result };
-  }
-
-  return state;
-};
diff --git a/js/src/dapps/registry/Names/actions.js b/js/src/dapps/registry/Names/actions.js
deleted file mode 100644
index 9e5ff4fc6adaaaa47516a5549638b4294f275b86..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Names/actions.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { sha3, api } from '../parity.js';
-import { getOwner, isOwned } from '../util/registry';
-import postTx from '../util/post-tx';
-
-export const clearError = () => ({
-  type: 'clearError'
-});
-
-const alreadyQueued = (queue, action, name) =>
-  !!queue.find((entry) => entry.action === action && entry.name === name);
-
-export const reserveStart = (name) => ({ type: 'names reserve start', name });
-
-export const reserveSuccess = (name) => ({ type: 'names reserve success', name });
-
-export const reserveFail = (name, error) => ({ type: 'names reserve fail', name, error });
-
-export const reserve = (name) => (dispatch, getState) => {
-  const state = getState();
-  const accountAddress = state.accounts.selected;
-  const contract = state.contract;
-  const fee = state.fee;
-
-  if (!contract || !accountAddress) {
-    return;
-  }
-
-  name = name.toLowerCase();
-
-  if (alreadyQueued(state.names.queue, 'reserve', name)) {
-    return;
-  }
-
-  dispatch(reserveStart(name));
-
-  return isOwned(contract, name)
-    .then((owned) => {
-      if (owned) {
-        throw new Error(`"${name}" has already been reserved`);
-      }
-
-      const { reserve } = contract.instance;
-
-      const options = {
-        from: accountAddress,
-        value: fee
-      };
-      const values = [
-        sha3.text(name)
-      ];
-
-      return postTx(api, reserve, options, values);
-    })
-    .then((txHash) => {
-      dispatch(reserveSuccess(name));
-    })
-    .catch((err) => {
-      if (err.type !== 'REQUEST_REJECTED') {
-        console.error(`error rerserving ${name}`, err);
-        return dispatch(reserveFail(name, err));
-      }
-
-      dispatch(reserveFail(name));
-    });
-};
-
-export const dropStart = (name) => ({ type: 'names drop start', name });
-
-export const dropSuccess = (name) => ({ type: 'names drop success', name });
-
-export const dropFail = (name, error) => ({ type: 'names drop fail', name, error });
-
-export const drop = (name) => (dispatch, getState) => {
-  const state = getState();
-  const accountAddress = state.accounts.selected;
-  const contract = state.contract;
-
-  if (!contract || !accountAddress) {
-    return;
-  }
-
-  name = name.toLowerCase();
-
-  if (alreadyQueued(state.names.queue, 'drop', name)) {
-    return;
-  }
-
-  dispatch(dropStart(name));
-
-  return getOwner(contract, name)
-    .then((owner) => {
-      if (owner.toLowerCase() !== accountAddress.toLowerCase()) {
-        throw new Error(`you are not the owner of "${name}"`);
-      }
-
-      const { drop } = contract.instance;
-
-      const options = {
-        from: accountAddress
-      };
-
-      const values = [
-        sha3.text(name)
-      ];
-
-      return postTx(api, drop, options, values);
-    })
-    .then((txhash) => {
-      dispatch(dropSuccess(name));
-    })
-    .catch((err) => {
-      if (err.type !== 'REQUEST_REJECTED') {
-        console.error(`error dropping ${name}`, err);
-        return dispatch(dropFail(name, err));
-      }
-
-      dispatch(dropFail(name));
-    });
-};
diff --git a/js/src/dapps/registry/Names/index.js b/js/src/dapps/registry/Names/index.js
deleted file mode 100644
index dd9471827b903ef4c5fadf374dff6d3ae72006ab..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Names/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './names.js';
diff --git a/js/src/dapps/registry/Names/names.css b/js/src/dapps/registry/Names/names.css
deleted file mode 100644
index cbbb33e607abaee30b1ba2be20df3627f98a8c55..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Names/names.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.names {
-  margin: 1em;
-}
-
-.box {
-  display: flex;
-  align-items: baseline;
-}
-
-.spacing {
-  margin-left: 1em;
-}
-
-.noSpacing {
-  margin-top: 0;
-}
-
-.link {
-  color: #00BCD4;
-  text-decoration: none;
-
-  &:hover {
-    text-decoration: underline;
-  }
-}
-
-.error {
-  color: red;
-}
diff --git a/js/src/dapps/registry/Names/names.js b/js/src/dapps/registry/Names/names.js
deleted file mode 100644
index b6e629d39dc01fa4690a9a3183c0ab96c831ce05..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Names/names.js
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { Card, CardHeader, CardText } from 'material-ui/Card';
-import TextField from 'material-ui/TextField';
-import DropDownMenu from 'material-ui/DropDownMenu';
-import MenuItem from 'material-ui/MenuItem';
-import RaisedButton from 'material-ui/RaisedButton';
-import CheckIcon from 'material-ui/svg-icons/navigation/check';
-
-import { nullableProptype } from '~/util/proptypes';
-import { fromWei } from '../parity.js';
-
-import { clearError, reserve, drop } from './actions';
-import styles from './names.css';
-
-const useSignerText = (<p>Use the <a href='/#/signer' className={ styles.link } target='_blank'>Signer</a> to authenticate the following changes.</p>);
-
-const renderNames = (names) => {
-  const values = Object.values(names);
-
-  return values
-    .map((name, index) => (
-      <span key={ index }>
-        <code>{ name }</code>
-        {
-          index < values.length - 1
-          ? (<span>, </span>)
-          : null
-        }
-      </span>
-    ));
-};
-
-const renderQueue = (queue) => {
-  if (queue.length === 0) {
-    return null;
-  }
-
-  const grouped = queue.reduce((grouped, change) => {
-    const last = grouped[grouped.length - 1];
-
-    if (last && last.action === change.action) {
-      last.names.push(change.name);
-    } else {
-      grouped.push({ action: change.action, names: [change.name] });
-    }
-    return grouped;
-  }, []);
-
-  return (
-    <ul>
-      { grouped.map(({ action, names }) => (
-        <li key={ action + '-' + names.join('-') }>
-          { renderNames(names) }
-          { ' will be ' }
-          { action === 'reserve' ? 'reserved' : 'dropped' }
-        </li>
-      )) }
-    </ul>
-  );
-};
-
-class Names extends Component {
-  static propTypes = {
-    error: nullableProptype(PropTypes.object.isRequired),
-    fee: PropTypes.object.isRequired,
-    pending: PropTypes.bool.isRequired,
-    queue: PropTypes.array.isRequired,
-
-    clearError: PropTypes.func.isRequired,
-    reserve: PropTypes.func.isRequired,
-    drop: PropTypes.func.isRequired
-  };
-
-  state = {
-    action: 'reserve',
-    name: ''
-  };
-
-  render () {
-    const { action, name } = this.state;
-    const { fee, pending, queue } = this.props;
-
-    return (
-      <Card className={ styles.names }>
-        <CardHeader title={ 'Manage Names' } />
-        <CardText>
-          { (action === 'reserve'
-              ? (<p className={ styles.noSpacing }>
-                The fee to reserve a name is <code>{ fromWei(fee).toFixed(3) }</code>ETH.
-              </p>)
-              : (<p className={ styles.noSpacing }>To drop a name, you have to be the owner.</p>)
-            )
-          }
-          { this.renderError() }
-          <div className={ styles.box }>
-            <TextField
-              hintText='name'
-              value={ name }
-              onChange={ this.onNameChange }
-            />
-            <DropDownMenu
-              disabled={ pending }
-              value={ action }
-              onChange={ this.onActionChange }
-            >
-              <MenuItem value='reserve' primaryText='reserve this name' />
-              <MenuItem value='drop' primaryText='drop this name' />
-            </DropDownMenu>
-            <RaisedButton
-              disabled={ pending }
-              className={ styles.spacing }
-              label={ action === 'reserve' ? 'Reserve' : 'Drop' }
-              primary
-              icon={ <CheckIcon /> }
-              onTouchTap={ this.onSubmitClick }
-            />
-          </div>
-          { queue.length > 0
-            ? (<div>{ useSignerText }{ renderQueue(queue) }</div>)
-            : null
-          }
-        </CardText>
-      </Card>
-    );
-  }
-
-  renderError () {
-    const { error } = this.props;
-
-    if (!error) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.error }>
-        <code>{ error.message }</code>
-      </div>
-    );
-  }
-
-  onNameChange = (e) => {
-    this.clearError();
-    this.setState({ name: e.target.value });
-  };
-
-  onActionChange = (e, i, action) => {
-    this.clearError();
-    this.setState({ action });
-  };
-
-  onSubmitClick = () => {
-    const { action, name } = this.state;
-
-    if (action === 'reserve') {
-      return this.props.reserve(name);
-    }
-
-    if (action === 'drop') {
-      return this.props.drop(name);
-    }
-  };
-
-  clearError = () => {
-    if (this.props.error) {
-      this.props.clearError();
-    }
-  };
-}
-
-const mapStateToProps = (state) => ({ ...state.names, fee: state.fee });
-const mapDispatchToProps = (dispatch) => bindActionCreators({ clearError, reserve, drop }, dispatch);
-
-export default connect(mapStateToProps, mapDispatchToProps)(Names);
diff --git a/js/src/dapps/registry/Names/reducers.js b/js/src/dapps/registry/Names/reducers.js
deleted file mode 100644
index 63a18e79dc691616469558044ea445896b35cce1..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Names/reducers.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isAction, isStage, addToQueue, removeFromQueue } from '../util/actions';
-
-const initialState = {
-  error: null,
-  pending: false,
-  queue: []
-};
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-    case 'clearError':
-      return {
-        ...state,
-        error: null
-      };
-  }
-
-  if (isAction('names', 'reserve', action)) {
-    if (isStage('start', action)) {
-      return {
-        ...state,
-        error: null,
-        pending: true,
-        queue: addToQueue(state.queue, 'reserve', action.name)
-      };
-    }
-
-    if (isStage('success', action) || isStage('fail', action)) {
-      return {
-        ...state,
-        error: action.error || null,
-        pending: false,
-        queue: removeFromQueue(state.queue, 'reserve', action.name)
-      };
-    }
-  }
-
-  if (isAction('names', 'drop', action)) {
-    if (isStage('start', action)) {
-      return {
-        ...state,
-        error: null,
-        pending: true,
-        queue: addToQueue(state.queue, 'drop', action.name)
-      };
-    }
-
-    if (isStage('success', action) || isStage('fail', action)) {
-      return {
-        ...state,
-        error: action.error || null,
-        pending: false,
-        queue: removeFromQueue(state.queue, 'drop', action.name)
-      };
-    }
-  }
-
-  return state;
-};
diff --git a/js/src/dapps/registry/Records/actions.js b/js/src/dapps/registry/Records/actions.js
deleted file mode 100644
index 4b7ef51d1fbe8d0bf44795c35603bb65ae151b59..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Records/actions.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { sha3, api } from '../parity.js';
-import postTx from '../util/post-tx';
-import { getOwner } from '../util/registry';
-
-export const clearError = () => ({
-  type: 'clearError'
-});
-
-export const start = (name, key, value) => ({ type: 'records update start', name, key, value });
-
-export const success = () => ({ type: 'records update success' });
-
-export const fail = (error) => ({ type: 'records update fail', error });
-
-export const update = (name, key, value) => (dispatch, getState) => {
-  const state = getState();
-  const accountAddress = state.accounts.selected;
-  const contract = state.contract;
-
-  if (!contract || !accountAddress) {
-    return;
-  }
-
-  name = name.toLowerCase();
-  dispatch(start(name, key, value));
-
-  return getOwner(contract, name)
-    .then((owner) => {
-      if (owner.toLowerCase() !== accountAddress.toLowerCase()) {
-        throw new Error(`you are not the owner of "${name}"`);
-      }
-
-      const method = key === 'A'
-        ? contract.instance.setAddress
-        : contract.instance.setData || contract.instance.set;
-
-      const options = {
-        from: accountAddress
-      };
-
-      const values = [
-        sha3.text(name),
-        key,
-        value
-      ];
-
-      return postTx(api, method, options, values);
-    })
-    .then((txHash) => {
-      dispatch(success());
-    }).catch((err) => {
-      if (err.type !== 'REQUEST_REJECTED') {
-        console.error(`error updating ${name}`, err);
-        return dispatch(fail(err));
-      }
-
-      dispatch(fail());
-    });
-};
diff --git a/js/src/dapps/registry/Records/index.js b/js/src/dapps/registry/Records/index.js
deleted file mode 100644
index e2528968e5ec80aaf5ac8272102a83cace4e5608..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Records/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './records.js';
diff --git a/js/src/dapps/registry/Records/records.css b/js/src/dapps/registry/Records/records.css
deleted file mode 100644
index a94f222c79f79fa5181b4b476472306b60b02286..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Records/records.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.records {
-  margin: 1em;
-}
-
-.noSpacing {
-  margin-top: 0;
-}
-
-.box {
-  display: flex;
-  align-items: baseline;
-}
-
-.spacing {
-  margin-left: 1em;
-}
-
-.button {
-  flex-grow: 0;
-  flex-shrink: 0;
-}
-
-.error {
-  color: red;
-}
diff --git a/js/src/dapps/registry/Records/records.js b/js/src/dapps/registry/Records/records.js
deleted file mode 100644
index e1deda6cd859689999deed48d07645da8902e4e7..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Records/records.js
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { Card, CardHeader, CardText } from 'material-ui/Card';
-import TextField from 'material-ui/TextField';
-import DropDownMenu from 'material-ui/DropDownMenu';
-import MenuItem from 'material-ui/MenuItem';
-import RaisedButton from 'material-ui/RaisedButton';
-import SaveIcon from 'material-ui/svg-icons/content/save';
-
-import { nullableProptype } from '~/util/proptypes';
-import { clearError, update } from './actions';
-import styles from './records.css';
-
-class Records extends Component {
-  static propTypes = {
-    error: nullableProptype(PropTypes.object.isRequired),
-    pending: PropTypes.bool.isRequired,
-    name: PropTypes.string.isRequired,
-    type: PropTypes.string.isRequired,
-    value: PropTypes.string.isRequired,
-
-    clearError: PropTypes.func.isRequired,
-    update: PropTypes.func.isRequired
-  }
-
-  state = { name: '', type: 'A', value: '' };
-
-  render () {
-    const { pending } = this.props;
-    const name = this.state.name || this.props.name;
-    const type = this.state.type || this.props.type;
-    const value = this.state.value || this.props.value;
-
-    return (
-      <Card className={ styles.records }>
-        <CardHeader title={ 'Manage Entries of a Name' } />
-        <CardText>
-          <p className={ styles.noSpacing }>
-            You can only modify entries of names that you previously registered.
-          </p>
-          { this.renderError() }
-          <div className={ styles.box }>
-            <TextField
-              hintText='name'
-              value={ name }
-              onChange={ this.onNameChange }
-            />
-            <DropDownMenu
-              value={ type }
-              onChange={ this.onTypeChange }
-            >
-              <MenuItem value='A' primaryText='A – Ethereum address' />
-              <MenuItem value='IMG' primaryText='IMG – hash of a picture in the blockchain' />
-              <MenuItem value='CONTENT' primaryText='CONTENT – hash of a data in the blockchain' />
-            </DropDownMenu>
-            <TextField
-              hintText='value'
-              value={ value }
-              onChange={ this.onValueChange }
-            />
-            <div className={ styles.button }>
-              <RaisedButton
-                disabled={ pending }
-                className={ styles.spacing }
-                label='Save'
-                primary
-                icon={ <SaveIcon /> }
-                onTouchTap={ this.onSaveClick }
-              />
-            </div>
-          </div>
-        </CardText>
-      </Card>
-    );
-  }
-
-  renderError () {
-    const { error } = this.props;
-
-    if (!error) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.error }>
-        <code>{ error.message }</code>
-      </div>
-    );
-  }
-
-  onNameChange = (e) => {
-    this.clearError();
-    this.setState({ name: e.target.value });
-  };
-
-  onTypeChange = (e, i, type) => {
-    this.setState({ type });
-  };
-
-  onValueChange = (e) => {
-    this.setState({ value: e.target.value });
-  };
-
-  onSaveClick = () => {
-    const { name, type, value } = this.state;
-
-    this.props.update(name, type, value);
-  };
-
-  clearError = () => {
-    if (this.props.error) {
-      this.props.clearError();
-    }
-  };
-}
-
-const mapStateToProps = (state) => state.records;
-const mapDispatchToProps = (dispatch) => bindActionCreators({ clearError, update }, dispatch);
-
-export default connect(mapStateToProps, mapDispatchToProps)(Records);
diff --git a/js/src/dapps/registry/Records/reducers.js b/js/src/dapps/registry/Records/reducers.js
deleted file mode 100644
index 08042d63c71123df63b7f8ba78fb0a59e4d0c262..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Records/reducers.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isAction, isStage } from '../util/actions';
-
-const initialState = {
-  error: null,
-  pending: false,
-  name: '', type: '', value: ''
-};
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-    case 'clearError':
-      return {
-        ...state,
-        error: null
-      };
-  }
-
-  if (!isAction('records', 'update', action)) {
-    return state;
-  }
-
-  if (isStage('start', action)) {
-    return {
-      ...state, pending: true,
-      error: null,
-      name: action.name, type: action.key, value: action.value
-    };
-  }
-
-  if (isStage('success', action) || isStage('fail', action)) {
-    return {
-      ...state, pending: false,
-      error: action.error || null,
-      name: initialState.name, type: initialState.type, value: initialState.value
-    };
-  }
-
-  return state;
-};
diff --git a/js/src/dapps/registry/Reverse/actions.js b/js/src/dapps/registry/Reverse/actions.js
deleted file mode 100644
index f78ff3434c96b7cc2cd76886bcc8bf909f843975..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Reverse/actions.js
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { api } from '../parity.js';
-import postTx from '../util/post-tx';
-import { getOwner } from '../util/registry';
-
-export const clearError = () => ({
-  type: 'clearError'
-});
-
-export const start = (action, name, address) => ({ type: `reverse ${action} start`, name, address });
-
-export const success = (action) => ({ type: `reverse ${action} success` });
-
-export const fail = (action, error) => ({ type: `reverse ${action} fail`, error });
-
-export const propose = (name, address) => (dispatch, getState) => {
-  const state = getState();
-  const accountAddress = state.accounts.selected;
-  const contract = state.contract;
-
-  if (!contract || !accountAddress) {
-    return;
-  }
-
-  name = name.toLowerCase();
-  dispatch(start('propose', name, address));
-
-  return getOwner(contract, name)
-    .then((owner) => {
-      if (owner.toLowerCase() !== accountAddress.toLowerCase()) {
-        throw new Error(`you are not the owner of "${name}"`);
-      }
-
-      const { proposeReverse } = contract.instance;
-
-      const options = {
-        from: accountAddress
-      };
-
-      const values = [
-        name,
-        address
-      ];
-
-      return postTx(api, proposeReverse, options, values);
-    })
-    .then((txHash) => {
-      dispatch(success('propose'));
-    })
-    .catch((err) => {
-      if (err.type !== 'REQUEST_REJECTED') {
-        console.error(`error proposing ${name}`, err);
-        return dispatch(fail('propose', err));
-      }
-
-      dispatch(fail('propose'));
-    });
-};
-
-export const confirm = (name) => (dispatch, getState) => {
-  const state = getState();
-  const accountAddress = state.accounts.selected;
-  const contract = state.contract;
-
-  if (!contract || !accountAddress) {
-    return;
-  }
-
-  name = name.toLowerCase();
-  dispatch(start('confirm', name));
-
-  return getOwner(contract, name)
-    .then((owner) => {
-      if (owner.toLowerCase() !== accountAddress.toLowerCase()) {
-        throw new Error(`you are not the owner of "${name}"`);
-      }
-
-      const { confirmReverse } = contract.instance;
-
-      const options = {
-        from: accountAddress
-      };
-
-      const values = [
-        name
-      ];
-
-      return postTx(api, confirmReverse, options, values);
-    })
-    .then((txHash) => {
-      dispatch(success('confirm'));
-    })
-    .catch((err) => {
-      if (err.type !== 'REQUEST_REJECTED') {
-        console.error(`error confirming ${name}`, err);
-        return dispatch(fail('confirm', err));
-      }
-
-      dispatch(fail('confirm'));
-    });
-};
-
diff --git a/js/src/dapps/registry/Reverse/index.js b/js/src/dapps/registry/Reverse/index.js
deleted file mode 100644
index ecaf9c3db56c3f0b85df2b76b199c79a98a3983e..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Reverse/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './reverse';
diff --git a/js/src/dapps/registry/Reverse/reducers.js b/js/src/dapps/registry/Reverse/reducers.js
deleted file mode 100644
index 51b44ab6f6e4ee9ce5667357264f6b47befcf205..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Reverse/reducers.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isAction, isStage } from '../util/actions';
-
-const initialState = {
-  error: null,
-  pending: false,
-  queue: []
-};
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-    case 'clearError':
-      return {
-        ...state,
-        error: null
-      };
-  }
-
-  if (isAction('reverse', 'propose', action)) {
-    if (isStage('start', action)) {
-      return {
-        ...state, pending: true,
-        error: null,
-        queue: state.queue.concat({
-          action: 'propose',
-          name: action.name,
-          address: action.address
-        })
-      };
-    }
-
-    if (isStage('success', action) || isStage('fail', action)) {
-      return {
-        ...state, pending: false,
-        error: action.error || null,
-        queue: state.queue.filter((e) =>
-          e.action === 'propose' &&
-          e.name === action.name &&
-          e.address === action.address
-        )
-      };
-    }
-  }
-
-  if (isAction('reverse', 'confirm', action)) {
-    if (isStage('start', action)) {
-      return {
-        ...state, pending: true,
-        error: null,
-        queue: state.queue.concat({
-          action: 'confirm',
-          name: action.name
-        })
-      };
-    }
-
-    if (isStage('success', action) || isStage('fail', action)) {
-      return {
-        ...state, pending: false,
-        error: action.error || null,
-        queue: state.queue.filter((e) =>
-          e.action === 'confirm' &&
-          e.name === action.name
-        )
-      };
-    }
-  }
-
-  return state;
-};
diff --git a/js/src/dapps/registry/Reverse/reverse.css b/js/src/dapps/registry/Reverse/reverse.css
deleted file mode 100644
index fc2089d5e3a766760ff31e86d574f5c47ab45f70..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Reverse/reverse.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.reverse {
-  margin: 1em;
-}
-
-.noSpacing {
-  margin-top: 0;
-}
-
-.box {
-  display: flex;
-  align-items: baseline;
-}
-
-.spacing {
-  margin-right: 1em;
-}
-
-.button {
-  flex-grow: 0;
-  flex-shrink: 0;
-}
-
-.error {
-  color: red;
-}
diff --git a/js/src/dapps/registry/Reverse/reverse.js b/js/src/dapps/registry/Reverse/reverse.js
deleted file mode 100644
index a17f9a22cbd271296747fa113d229ec95fdcc607..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/Reverse/reverse.js
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import {
-  Card, CardHeader, CardText, TextField, DropDownMenu, MenuItem, RaisedButton
-} from 'material-ui';
-
-import { nullableProptype } from '~/util/proptypes';
-import { AddIcon, CheckIcon } from '~/ui/Icons';
-import { clearError, confirm, propose } from './actions';
-import styles from './reverse.css';
-
-class Reverse extends Component {
-  static propTypes = {
-    error: nullableProptype(PropTypes.object.isRequired),
-    pending: PropTypes.bool.isRequired,
-    queue: PropTypes.array.isRequired,
-
-    clearError: PropTypes.func.isRequired,
-    confirm: PropTypes.func.isRequired,
-    propose: PropTypes.func.isRequired
-  }
-
-  state = {
-    action: 'propose',
-    name: '',
-    address: ''
-  };
-
-  render () {
-    const { pending } = this.props;
-    const { action, address, name } = this.state;
-
-    const explanation = action === 'propose'
-      ? (
-        <p className={ styles.noSpacing }>
-          To propose a reverse entry for <code>foo</code>, you have to be the owner of it.
-        </p>
-      ) : (
-        <p className={ styles.noSpacing }>
-          To confirm a proposal, send the transaction from the account that the name has been proposed for.
-        </p>
-      );
-
-    let addressInput = null;
-
-    if (action === 'propose') {
-      addressInput = (
-        <TextField
-          className={ styles.spacing }
-          hintText='address'
-          value={ address }
-          onChange={ this.onAddressChange }
-        />
-      );
-    }
-
-    return (
-      <Card className={ styles.reverse }>
-        <CardHeader title={ 'Manage Reverse Names' } />
-        <CardText>
-          <p className={ styles.noSpacing }>
-            <strong>
-              To make others to find the name of an address using the registry, you can propose & confirm reverse entries.
-            </strong>
-          </p>
-          { explanation }
-          { this.renderError() }
-          <div className={ styles.box }>
-            <DropDownMenu
-              disabled={ pending }
-              value={ action }
-              onChange={ this.onActionChange }
-            >
-              <MenuItem value='propose' primaryText='propose a reverse entry' />
-              <MenuItem value='confirm' primaryText='confirm a reverse entry' />
-            </DropDownMenu>
-            { addressInput }
-            <TextField
-              className={ styles.spacing }
-              hintText='name'
-              value={ name }
-              onChange={ this.onNameChange }
-            />
-            <div className={ styles.button }>
-              <RaisedButton
-                disabled={ pending }
-                label={ action === 'propose' ? 'Propose' : 'Confirm' }
-                primary
-                icon={ action === 'propose' ? <AddIcon /> : <CheckIcon /> }
-                onTouchTap={ this.onSubmitClick }
-              />
-            </div>
-          </div>
-        </CardText>
-      </Card>
-    );
-  }
-
-  renderError () {
-    const { error } = this.props;
-
-    if (!error) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.error }>
-        <code>{ error.message }</code>
-      </div>
-    );
-  }
-
-  onNameChange = (e) => {
-    this.setState({ name: e.target.value });
-  };
-
-  onAddressChange = (e) => {
-    this.setState({ address: e.target.value });
-  };
-
-  onActionChange = (e, i, action) => {
-    this.setState({ action });
-  };
-
-  onSubmitClick = () => {
-    const { action, name, address } = this.state;
-
-    if (action === 'propose') {
-      this.props.propose(name, address);
-    } else if (action === 'confirm') {
-      this.props.confirm(name);
-    }
-  };
-
-  clearError = () => {
-    if (this.props.error) {
-      this.props.clearError();
-    }
-  };
-}
-
-const mapStateToProps = (state) => state.reverse;
-const mapDispatchToProps = (dispatch) => bindActionCreators({ clearError, confirm, propose }, dispatch);
-
-export default connect(mapStateToProps, mapDispatchToProps)(Reverse);
diff --git a/js/src/dapps/registry/actions.js b/js/src/dapps/registry/actions.js
deleted file mode 100644
index 8c777439765d1d7eec41e1f35871a65c81fe55b1..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/actions.js
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Contracts from '~/contracts';
-
-import { api } from './parity.js';
-import * as addresses from './addresses/actions.js';
-import * as accounts from './Accounts/actions.js';
-import * as lookup from './Lookup/actions.js';
-import * as events from './Events/actions.js';
-import * as names from './Names/actions.js';
-import * as records from './Records/actions.js';
-import * as reverse from './Reverse/actions.js';
-
-export { addresses, accounts, lookup, events, names, records, reverse };
-
-export const setNetVersion = (netVersion) => ({ type: 'set netVersion', netVersion });
-
-export const fetchIsTestnet = () => (dispatch) =>
-  api.net.version()
-    .then((netVersion) => {
-      dispatch(setNetVersion(netVersion));
-    })
-    .catch((err) => {
-      console.error('could not check if testnet');
-      if (err) {
-        console.error(err.stack);
-      }
-    });
-
-export const setContract = (contract) => ({ type: 'set contract', contract });
-
-export const fetchContract = () => (dispatch) => {
-  return Contracts.create(api).registry
-    .fetchContract()
-    .then((contract) => {
-      dispatch(setContract(contract));
-      dispatch(fetchFee());
-      dispatch(fetchOwner());
-    })
-    .catch((error) => {
-      console.error('could not fetch contract', error);
-    });
-};
-
-export const setFee = (fee) => ({ type: 'set fee', fee });
-
-const fetchFee = () => (dispatch, getState) => {
-  const { contract } = getState();
-
-  if (!contract) {
-    return;
-  }
-
-  contract.instance.fee.call()
-    .then((fee) => dispatch(setFee(fee)))
-    .catch((err) => {
-      console.error('could not fetch fee');
-      if (err) {
-        console.error(err.stack);
-      }
-    });
-};
-
-export const setOwner = (owner) => ({ type: 'set owner', owner });
-
-export const fetchOwner = () => (dispatch, getState) => {
-  const { contract } = getState();
-
-  if (!contract) {
-    return;
-  }
-
-  contract.instance.owner.call()
-    .then((owner) => dispatch(setOwner(owner)))
-    .catch((err) => {
-      console.error('could not fetch owner');
-      if (err) {
-        console.error(err.stack);
-      }
-    });
-};
diff --git a/js/src/dapps/registry/addresses/accounts-reducer.js b/js/src/dapps/registry/addresses/accounts-reducer.js
deleted file mode 100644
index 2ff11ae27a5576fa14766020830ebd417779809b..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/addresses/accounts-reducer.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const initialState = {
-  all: {},
-  selected: null
-};
-
-export default (state = initialState, action) => {
-  if (action.type === 'addresses set') {
-    const accounts = action.addresses
-      .filter((address) => address.isAccount)
-      .reduce((accounts, account) => {
-        accounts[account.address] = account;
-        return accounts;
-      }, {});
-
-    return { ...state, all: accounts };
-  }
-
-  if (action.type === 'accounts select') {
-    return { ...state, selected: action.address };
-  }
-
-  return state;
-};
diff --git a/js/src/dapps/registry/addresses/actions.js b/js/src/dapps/registry/addresses/actions.js
deleted file mode 100644
index 0c0817f97528dcac461989a69061ab31c6d24b96..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/addresses/actions.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { api } from '../parity';
-
-export const set = (addresses) => ({ type: 'addresses set', addresses });
-
-export const fetch = () => (dispatch) => {
-  return api.parity
-    .accountsInfo()
-    .then((accountsInfo) => {
-      const addresses = Object
-        .keys(accountsInfo)
-        .map((address) => ({
-          ...accountsInfo[address],
-          address,
-          isAccount: true
-        }));
-
-      dispatch(set(addresses));
-    })
-    .catch((error) => {
-      console.error('could not fetch addresses', error);
-    });
-};
diff --git a/js/src/dapps/registry/addresses/contacts-reducer.js b/js/src/dapps/registry/addresses/contacts-reducer.js
deleted file mode 100644
index 80880a92336314f0d4cd7a718ea11c40ed1455d7..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/addresses/contacts-reducer.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const initialState = {};
-
-export default (state = initialState, action) => {
-  if (action.type === 'addresses set') {
-    const contacts = action.addresses
-      .filter((address) => !address.isAccount)
-      .reduce((contacts, contact) => {
-        contacts[contact.address] = contact;
-        return contacts;
-      }, {});
-
-    return contacts;
-  }
-
-  return state;
-};
diff --git a/js/src/dapps/registry/parity.js b/js/src/dapps/registry/parity.js
deleted file mode 100644
index a9139c992a6fe6b58d5851c832b2860ce892ef69..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/parity.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const api = window.parity.api;
-const { bytesToHex, sha3, toWei, fromWei } = window.parity.api.util;
-
-export {
-  api,
-  bytesToHex, sha3, toWei, fromWei
-};
diff --git a/js/src/dapps/registry/reducers.js b/js/src/dapps/registry/reducers.js
deleted file mode 100644
index 6d0816273fd98406048f1bce3b68f80aafdde897..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/reducers.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import accountsReducer from './addresses/accounts-reducer.js';
-import contactsReducer from './addresses/contacts-reducer.js';
-import lookupReducer from './Lookup/reducers.js';
-import eventsReducer from './Events/reducers.js';
-import namesReducer from './Names/reducers.js';
-import recordsReducer from './Records/reducers.js';
-import reverseReducer from './Reverse/reducers.js';
-
-const netVersionReducer = (state = null, action) =>
-  action.type === 'set netVersion' ? action.netVersion : state;
-
-const contractReducer = (state = null, action) =>
-  action.type === 'set contract' ? action.contract : state;
-
-const feeReducer = (state = null, action) =>
-  action.type === 'set fee' ? action.fee : state;
-
-const ownerReducer = (state = null, action) =>
-  action.type === 'set owner' ? action.owner : state;
-
-const initialState = {
-  netVersion: netVersionReducer(undefined, { type: '' }),
-  accounts: accountsReducer(undefined, { type: '' }),
-  contacts: contactsReducer(undefined, { type: '' }),
-  contract: contractReducer(undefined, { type: '' }),
-  fee: feeReducer(undefined, { type: '' }),
-  owner: ownerReducer(undefined, { type: '' }),
-  lookup: lookupReducer(undefined, { type: '' }),
-  events: eventsReducer(undefined, { type: '' }),
-  names: namesReducer(undefined, { type: '' }),
-  records: recordsReducer(undefined, { type: '' }),
-  reverse: reverseReducer(undefined, { type: '' })
-};
-
-export default (state = initialState, action) => ({
-  netVersion: netVersionReducer(state.netVersion, action),
-  accounts: accountsReducer(state.accounts, action),
-  contacts: contactsReducer(state.contacts, action),
-  contract: contractReducer(state.contract, action),
-  fee: feeReducer(state.fee, action),
-  owner: ownerReducer(state.owner, action),
-  lookup: lookupReducer(state.lookup, action),
-  events: eventsReducer(state.events, action),
-  names: namesReducer(state.names, action),
-  records: recordsReducer(state.records, action),
-  reverse: reverseReducer(state.reverse, action)
-});
diff --git a/js/src/dapps/registry/store.js b/js/src/dapps/registry/store.js
deleted file mode 100644
index ced7a5bae12be17e4de0cc72b3971b41678ee0dc..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/store.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createStore, applyMiddleware } from 'redux';
-import thunk from 'redux-thunk';
-
-import reducer from './reducers';
-
-export default createStore(reducer, applyMiddleware(thunk));
diff --git a/js/src/dapps/registry/ui/address.css b/js/src/dapps/registry/ui/address.css
deleted file mode 100644
index 89a140348b4e3502841fdb818050f75e611df1eb..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/ui/address.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  display: inline-block;
-  vertical-align: middle;
-  line-height: 24px;
-}
-
-.align {
-  display: inline-block;
-  vertical-align: top;
-  line-height: 24px;
-}
-
-.link {
-  text-decoration: none;
-  color: inherit;
-
-  &:hover {
-    text-decoration: underline;
-  }
-
-  & abbr {
-    text-decoration: inherit;
-  }
-}
diff --git a/js/src/dapps/registry/ui/address.js b/js/src/dapps/registry/ui/address.js
deleted file mode 100644
index a01811fc433d42a7ebe0b40d05b84a3e35494b2d..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/ui/address.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import Hash from './hash';
-import etherscanUrl from '../util/etherscan-url';
-import IdentityIcon from '../IdentityIcon';
-import { nullableProptype } from '~/util/proptypes';
-
-import styles from './address.css';
-
-class Address extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    account: nullableProptype(PropTypes.object.isRequired),
-    netVersion: PropTypes.string.isRequired,
-    key: PropTypes.string,
-    shortenHash: PropTypes.bool
-  };
-
-  static defaultProps = {
-    key: 'address',
-    shortenHash: true
-  };
-
-  render () {
-    const { address, key } = this.props;
-
-    return (
-      <div
-        key={ key }
-        className={ styles.container }
-      >
-        <IdentityIcon
-          address={ address }
-          className={ styles.align }
-        />
-        { this.renderCaption() }
-      </div>
-    );
-  }
-
-  renderCaption () {
-    const { address, account, netVersion, shortenHash } = this.props;
-
-    if (account) {
-      const { name } = account;
-
-      return (
-        <a
-          className={ styles.link }
-          href={ etherscanUrl(address, false, netVersion) }
-          target='_blank'
-        >
-          <abbr
-            title={ address }
-            className={ styles.align }
-          >
-            { name || address }
-          </abbr>
-        </a>
-      );
-    }
-
-    return (
-      <code className={ styles.align }>
-        { shortenHash ? (
-          <Hash
-            hash={ address }
-            linked
-          />
-        ) : address }
-      </code>
-    );
-  }
-}
-
-function mapStateToProps (initState, initProps) {
-  const { accounts, contacts } = initState;
-
-  const allAccounts = Object.assign({}, accounts.all, contacts);
-
-  // Add lower case addresses to map
-  Object
-    .keys(allAccounts)
-    .forEach((address) => {
-      allAccounts[address.toLowerCase()] = allAccounts[address];
-    });
-
-  return (state, props) => {
-    const { netVersion } = state;
-    const { address = '' } = props;
-
-    const account = allAccounts[address] || null;
-
-    return {
-      account,
-      netVersion
-    };
-  };
-}
-
-export default connect(
-  mapStateToProps
-)(Address);
diff --git a/js/src/dapps/registry/ui/hash.css b/js/src/dapps/registry/ui/hash.css
deleted file mode 100644
index d44e2d2866e4949d53dbba0fab650015c388f52a..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/ui/hash.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.link {
-  text-decoration: none;
-  color: inherit;
-
-  &:hover {
-    text-decoration: underline;
-  }
-}
diff --git a/js/src/dapps/registry/ui/hash.js b/js/src/dapps/registry/ui/hash.js
deleted file mode 100644
index fe404f5b2d78af6943d08590d3f16a28f0971832..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/ui/hash.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import etherscanUrl from '../util/etherscan-url';
-
-import styles from './hash.css';
-
-const leading0x = /^0x/;
-
-class Hash extends Component {
-  static propTypes = {
-    hash: PropTypes.string.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    linked: PropTypes.bool
-  }
-
-  static defaultProps = {
-    linked: false
-  }
-
-  render () {
-    const { hash, netVersion, linked } = this.props;
-
-    let shortened = hash.toLowerCase().replace(leading0x, '');
-
-    shortened = shortened.length > (6 + 6)
-      ? shortened.substr(0, 6) + '...' + shortened.slice(-6)
-      : shortened;
-
-    if (linked) {
-      return (
-        <a
-          className={ styles.link }
-          href={ etherscanUrl(hash, false, netVersion) }
-          target='_blank'
-        >
-          <abbr title={ hash }>{ shortened }</abbr>
-        </a>
-      );
-    }
-
-    return (<abbr title={ hash }>{ shortened }</abbr>);
-  }
-}
-
-export default connect(
-  (state) => ({ // mapStateToProps
-    netVersion: state.netVersion
-  }),
-  null // mapDispatchToProps
-)(Hash);
diff --git a/js/src/dapps/registry/ui/image.js b/js/src/dapps/registry/ui/image.js
deleted file mode 100644
index 88cae4e308c62924896aa45d68f508f5ab89168a..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/ui/image.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-
-const styles = {
-  padding: '.5em',
-  border: '1px solid #777'
-};
-
-export default (address) => {
-  if (!address || /^(0x)?0*$/.test(address)) {
-    return (
-      <code>
-        No image
-      </code>
-    );
-  }
-
-  return (
-    <img
-      src={ `/api/content/${address.replace(/^0x/, '')}` }
-      alt={ address }
-      style={ styles }
-    />
-  );
-};
diff --git a/js/src/dapps/registry/util/actions.js b/js/src/dapps/registry/util/actions.js
deleted file mode 100644
index c152848bc93a6bd859e2c180489d8a3b34467f40..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/util/actions.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export const isAction = (ns, type, action) => {
-  return action.type.slice(0, ns.length + 1 + type.length) === `${ns} ${type}`;
-};
-
-export const isStage = (stage, action) => {
-  return (new RegExp(`${stage}$`)).test(action.type);
-};
-
-export const addToQueue = (queue, action, name) => {
-  return queue.concat({ action, name });
-};
-
-export const removeFromQueue = (queue, action, name) => {
-  return queue.filter((e) => !(e.action === action && e.name === name));
-};
diff --git a/js/src/dapps/registry/util/etherscan-url.js b/js/src/dapps/registry/util/etherscan-url.js
deleted file mode 100644
index 68e765c17ed3fbcebcf6073868946966da4342c7..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/util/etherscan-url.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { url as externalUrl } from '~/3rdparty/etherscan/links';
-
-const leading0x = /^0x/;
-
-const etherscanUrl = (hash, isTestnet, netVersion) => {
-  hash = hash.toLowerCase().replace(leading0x, '');
-  const type = hash.length === 40 ? 'address' : 'tx';
-
-  return `${externalUrl(isTestnet, netVersion)}/${type}/0x${hash}`;
-};
-
-export default etherscanUrl;
diff --git a/js/src/dapps/registry/util/post-tx.js b/js/src/dapps/registry/util/post-tx.js
deleted file mode 100644
index 46fdb1403d18a1f554a366f73ee75b2efc467a59..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/util/post-tx.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const postTx = (api, method, opt = {}, values = []) => {
-  opt = Object.assign({}, opt);
-
-  return method.estimateGas(opt, values)
-    .then((gas) => {
-      opt.gas = gas.mul(1.2).toFixed(0);
-      return method.postTransaction(opt, values);
-    })
-    .then((reqId) => {
-      return api.pollMethod('parity_checkRequest', reqId);
-    });
-};
-
-export default postTx;
diff --git a/js/src/dapps/registry/util/registry.js b/js/src/dapps/registry/util/registry.js
deleted file mode 100644
index b818966dc5600d16bba1a4b7a7d8576120c8f5bf..0000000000000000000000000000000000000000
--- a/js/src/dapps/registry/util/registry.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export const getOwner = (contract, name) => {
-  const { address, api } = contract;
-
-  const key = api.util.sha3.text(name) + '0000000000000000000000000000000000000000000000000000000000000001';
-  const position = api.util.sha3(key, { encoding: 'hex' });
-
-  return api
-    .eth
-    .getStorageAt(address, position)
-    .then((result) => {
-      if (/^(0x)?0*$/.test(result)) {
-        return '';
-      }
-
-      return '0x' + result.slice(-40);
-    });
-};
-
-export const isOwned = (contract, name) => {
-  return getOwner(contract, name).then((owner) => !!owner);
-};
diff --git a/js/src/dapps/signaturereg.js b/js/src/dapps/signaturereg.js
deleted file mode 100644
index 61b67aab02733c53b539dc6b967a71491ab17fcf..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ReactDOM from 'react-dom';
-import React from 'react';
-import { AppContainer } from 'react-hot-loader';
-
-import injectTapEventPlugin from 'react-tap-event-plugin';
-injectTapEventPlugin();
-
-import Application from './signaturereg/Application';
-
-import '../../assets/fonts/Roboto/font.css';
-import '../../assets/fonts/RobotoMono/font.css';
-import './style.css';
-
-ReactDOM.render(
-  <AppContainer>
-    <Application />
-  </AppContainer>,
-  document.querySelector('#container')
-);
-
-if (module.hot) {
-  module.hot.accept('./signaturereg/Application/index.js', () => {
-    require('./signaturereg/Application/index.js');
-
-    ReactDOM.render(
-      <AppContainer>
-        <Application />
-      </AppContainer>,
-      document.querySelector('#container')
-    );
-  });
-}
diff --git a/js/src/dapps/signaturereg/Application/application.css b/js/src/dapps/signaturereg/Application/application.css
deleted file mode 100644
index f09b5986dc4db6c28df0b0324297d03993157fe9..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Application/application.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  background: black;
-  color: #eee;
-  font-family: 'Roboto';
-  vertical-align: middle;
-}
-
-.actions {
-  position: absolute;
-  top: 1.5em;
-  right: 1.5em;
-}
diff --git a/js/src/dapps/signaturereg/Application/application.js b/js/src/dapps/signaturereg/Application/application.js
deleted file mode 100644
index 21e36994e99b4068de236d777170ef3bdbe25bc9..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Application/application.js
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import React, { Component } from 'react';
-
-import { attachInterface, attachBlockNumber } from '../services';
-import Button from '../Button';
-import Events from '../Events';
-import Header from '../Header';
-import Import from '../Import';
-import Loading from '../Loading';
-
-import styles from './application.css';
-
-export default class Application extends Component {
-  state = {
-    accounts: {},
-    address: null,
-    accountsInfo: {},
-    blockNumber: new BigNumber(0),
-    contract: null,
-    instance: null,
-    loading: true,
-    totalSignatures: new BigNumber(0),
-    showImport: false
-  }
-
-  componentDidMount () {
-    return attachInterface()
-      .then((state) => {
-        this.setState(Object.assign({}, state, { loading: false }));
-
-        return attachBlockNumber(state.instance, (state) => {
-          this.setState(state);
-        });
-      })
-      .catch((error) => {
-        console.error('componentDidMount', error);
-      });
-  }
-
-  render () {
-    const { loading } = this.state;
-
-    if (loading) {
-      return (
-        <Loading />
-      );
-    }
-
-    return (
-      <div className={ styles.container }>
-        { this.renderHeader() }
-        { this.renderImport() }
-        { this.renderEvents() }
-      </div>
-    );
-  }
-
-  renderHeader () {
-    const { blockNumber, totalSignatures } = this.state;
-
-    return (
-      <Header
-        blockNumber={ blockNumber }
-        totalSignatures={ totalSignatures }
-      />
-    );
-  }
-
-  renderImport () {
-    const { instance, showImport } = this.state;
-
-    if (showImport) {
-      return (
-        <Import
-          instance={ instance }
-          visible={ showImport }
-          onClose={ this.toggleImport }
-        />
-      );
-    }
-
-    return (
-      <div className={ styles.actions }>
-        <Button invert onClick={ this.toggleImport }>import abi</Button>
-      </div>
-    );
-  }
-
-  renderEvents () {
-    const { accountsInfo, contract } = this.state;
-
-    return (
-      <Events
-        accountsInfo={ accountsInfo }
-        contract={ contract }
-      />
-    );
-  }
-
-  toggleImport = () => {
-    this.setState({
-      showImport: !this.state.showImport
-    });
-  }
-}
diff --git a/js/src/dapps/signaturereg/Application/index.js b/js/src/dapps/signaturereg/Application/index.js
deleted file mode 100644
index 3d8d1ca3b851e5bfed73373e82eff06b5d9ea46c..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Application/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './application';
diff --git a/js/src/dapps/signaturereg/Button/button.css b/js/src/dapps/signaturereg/Button/button.css
deleted file mode 100644
index b4891eaa0759b2ea89a1e819f81cfec4a251f702..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Button/button.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.button {
-  background: #f80;
-  color: white;
-  border-radius: 5px;
-  font-size: 1em;
-  line-height: 24px;
-  height: 24px;
-  padding: 0.75em 1.5em;
-  cursor: pointer;
-  display: inline-block;
-}
-
-.button.disabled {
-  opacity: 0.25;
-  cursor: default;
-}
-
-.button.inverse {
-  color: #f80;
-  background: white;
-}
-
-.button * {
-  display: inline-block;
-  vertical-align: top;
-}
diff --git a/js/src/dapps/signaturereg/Button/button.js b/js/src/dapps/signaturereg/Button/button.js
deleted file mode 100644
index 802f6f8b772e1c916dbb5d88fa53949069dc48bb..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Button/button.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './button.css';
-
-export default class Button extends Component {
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    invert: PropTypes.bool,
-    onClick: PropTypes.func.isRequired
-  }
-
-  render () {
-    const { children, className, disabled, invert } = this.props;
-    const classes = `${styles.button} ${disabled ? styles.disabled : ''} ${invert ? styles.inverse : ''} ${className}`;
-
-    return (
-      <div className={ classes } onTouchTap={ this.onClick }>
-        { children }
-      </div>
-    );
-  }
-
-  onClick = (event) => {
-    const { disabled, onClick } = this.props;
-
-    if (disabled) {
-      return;
-    }
-
-    onClick(event);
-  }
-}
diff --git a/js/src/dapps/signaturereg/Button/index.js b/js/src/dapps/signaturereg/Button/index.js
deleted file mode 100644
index 0c2be07ee37bab6a47298e29240a8ebdb094b646..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Button/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './button';
diff --git a/js/src/dapps/signaturereg/Events/events.css b/js/src/dapps/signaturereg/Events/events.css
deleted file mode 100644
index 543fdb3865ef4b57edd96f63b5506b1784863b27..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Events/events.css
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.events {
-  padding: 3em;
-  text-align: center;
-}
-
-.header {
-  font-size: 1.3em;
-  line-height: 1.3em;
-  vertical-align: middle;
-  text-align: center;
-  padding-bottom: 24px;
-  color: #f80;
-}
-
-.events table {
-  border: none;
-  margin: 0 auto;
-  border-collapse: collapse;
-}
-
-.events td {
-  padding: 0 0.5em 0.5em 0.5em;
-  white-space: nowrap;
-  text-align: left;
-  line-height: 24px;
-}
-
-.events td * {
-  display: inline-block;
-  vertical-align: top;
-}
-
-.pending {
-  opacity: 0.5;
-}
-
-.mined {
-}
-
-td.methodName {
-  color: #f80;
-}
-
-td.signature {
-  color: #888;
-  text-align: right;
-}
-
-td.timestamp {
-  text-align: right;
-}
-
-td.blockNumber {
-  text-align: center;
-}
-
-td.owner {
-  text-overflow: ellipsis;
-}
diff --git a/js/src/dapps/signaturereg/Events/events.js b/js/src/dapps/signaturereg/Events/events.js
deleted file mode 100644
index 9cc9ca4830ea26d26cc11bac0113fc56a97d4a09..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Events/events.js
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { formatBlockNumber, formatBlockTimestamp, formatSignature } from '../format';
-import { attachEvents } from '../services';
-import IdentityIcon from '../IdentityIcon';
-
-import styles from './events.css';
-
-export default class Events extends Component {
-  static propTypes = {
-    accountsInfo: PropTypes.object.isRequired,
-    contract: PropTypes.object.isRequired
-  }
-
-  state = {
-    events: []
-  }
-
-  componentDidMount () {
-    const { contract } = this.props;
-
-    attachEvents(contract, (state) => {
-      this.setState(state);
-    });
-  }
-
-  render () {
-    const { events } = this.state;
-
-    if (!events.length) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.events }>
-        <table>
-          <tbody>
-            { this.renderEvents() }
-          </tbody>
-        </table>
-      </div>
-    );
-  }
-
-  renderEvents () {
-    const { accountsInfo } = this.props;
-    const { events } = this.state;
-
-    return events.map((event) => {
-      const name = accountsInfo[event.params.creator]
-        ? accountsInfo[event.params.creator].name
-        : event.params.creator;
-
-      return (
-        <tr className={ styles[event.state] } key={ event.key }>
-          <td className={ styles.timestamp }>{ formatBlockTimestamp(event.block) }</td>
-          <td className={ styles.blockNumber }>{ formatBlockNumber(event.blockNumber) }</td>
-          <td className={ styles.owner }>
-            <IdentityIcon address={ event.params.creator } />
-            <div>{ name }</div>
-          </td>
-          <td className={ styles.signature }>{ formatSignature(event.params.signature) }</td>
-          <td className={ styles.methodName }>{ event.params.method }</td>
-        </tr>
-      );
-    });
-  }
-}
diff --git a/js/src/dapps/signaturereg/Events/index.js b/js/src/dapps/signaturereg/Events/index.js
deleted file mode 100644
index d2d0080b3542ce7eef9405c4c01348a1181898e7..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Events/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './events';
diff --git a/js/src/dapps/signaturereg/Header/header.css b/js/src/dapps/signaturereg/Header/header.css
deleted file mode 100644
index 8687ad30a8e83a2e60b3dc5d3a6be48718f44c24..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Header/header.css
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.header {
-  position: relative;
-  height: 13.69em;
-  color: white;
-  border-bottom: 4px solid white;
-  overflow: hidden;
-}
-
-.banner {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  font-size: 1.3em;
-  line-height: 1.3em;
-  padding: 24px;
-  background: #f80;
-}
-
-.header img,
-.content {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-
-.header img {
-  opacity: 0.2;
-  width: 100%;
-}
-
-.content {
-  text-align: center;
-  padding: 3em;
-}
-
-.hero {
-  font-size: 5em;
-  line-height: 1.2em;
-  vertical-align: middle;
-}
-
-.byline {
-  font-size: 1.3em;
-  line-height: 1.3em;
-  vertical-align: middle;
-}
diff --git a/js/src/dapps/signaturereg/Header/header.js b/js/src/dapps/signaturereg/Header/header.js
deleted file mode 100644
index 667e99778aca09fcecfb304ba38f5509b0282580..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Header/header.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './header.css';
-import blocks from '../../../../assets/images/dapps/blocks-350.jpg';
-
-export default class Header extends Component {
-  static propTypes = {
-    blockNumber: PropTypes.object.isRequired,
-    totalSignatures: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { totalSignatures } = this.props;
-
-    return (
-      <div className={ styles.header }>
-        <div className={ styles.banner }>
-          contract signature registry
-        </div>
-        <img src={ blocks } />
-        <div className={ styles.content }>
-          <div className={ styles.hero }>
-            { totalSignatures.toFormat(0) }
-          </div>
-          <div className={ styles.byline }>
-            signatures registered
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/signaturereg/Header/index.js b/js/src/dapps/signaturereg/Header/index.js
deleted file mode 100644
index 6394066f7b2bc2c8031480f220d1ec1e972c1836..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Header/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './header.js';
diff --git a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.css b/js/src/dapps/signaturereg/IdentityIcon/identityIcon.css
deleted file mode 100644
index 01aba746d2005b91133e8aaef46fac130f10f748..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.icon {
-  width: 24px;
-  height: 24px;
-  border-radius: 50%;
-  margin-right: 0.5em;
-}
diff --git a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js b/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js
deleted file mode 100644
index c442c45851fe1f11aafb91f4a67d387d84f88243..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../parity';
-import styles from './identityIcon.css';
-
-export default class IdentityIcon extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired
-  }
-
-  render () {
-    const { address } = this.props;
-
-    return (
-      <img
-        className={ styles.icon }
-        src={ api.util.createIdentityImg(address, 3) }
-      />
-    );
-  }
-}
diff --git a/js/src/dapps/signaturereg/IdentityIcon/index.js b/js/src/dapps/signaturereg/IdentityIcon/index.js
deleted file mode 100644
index 09191356420c1b472cb6ed005a3e9af4a8adb151..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/IdentityIcon/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './identityIcon';
diff --git a/js/src/dapps/signaturereg/Import/import.css b/js/src/dapps/signaturereg/Import/import.css
deleted file mode 100644
index c86f00d60e3eb0fd1804a28e09fe1dcfa021c1ab..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Import/import.css
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.modal {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-}
-
-.overlay {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background: rgba(55, 55, 55, 0.75);
-  text-align: center;
-}
-
-.dialog {
-  margin-top: 1.5em;
-  border-radius: 5px;
-  width: 750px;
-  background: rgba(0, 0, 0, 0.9);
-  display: inline-block;
-}
-
-.close {
-  top: 4px;
-  right: 4px;
-  position: absolute;
-  background: transparent;
-}
-
-.header {
-  font-size: 1.3em;
-  line-height: 1.3em;
-  padding: 16px 24px;
-  background: #f80;
-  color: white;
-  position: relative;
-  margin-bottom: 24px;
-  border-radius: 5px 5px 0 0;
-}
-
-.body {
-  padding: 0 24px;
-}
-
-.body div {
-  text-align: center;
-}
-
-.info {
-  padding: 0 24px 24px 24px;
-  line-height: 1.618em;
-}
-
-.info textarea {
-  background: rgba(80, 80, 80, 0.25);
-  border-radius: 5px;
-  resize: none;
-  padding: 1em;
-  color: #eee;
-  font-size: 0.75em;
-  font-family: 'Roboto Mono';
-  width: 100%;
-  border: none;
-  box-sizing: border-box;
-}
-
-.info textarea.error {
-  background: rgba(255, 0, 0, 0.25);
-}
-
-.info .error {
-  color: rgba(255, 0, 0, 1);
-  font-size: 0.75em;
-  line-height: 1.5em;
-}
-
-.buttonrow {
-  position: relative;
-  padding: 24px 0;
-  margin: 0;
-  text-align: right !important;
-}
-
-.addressSelect {
-  position: absolute;
-  top: 24px;
-  left: 0;
-}
-
-.keys {
-  position: absolute;
-  left: 24px;
-  top: 16px;
-  padding: 4px 0;
-}
-
-.fnconstant,
-.fnexists,
-.fnunknown,
-.fntodo {
-  display: inline-block;
-  margin: 0.25em;
-  padding: 0.5em 1em;
-  border-radius: 2px;
-  color: white;
-  line-height: 1em;
-  font-size: 0.8em;
-}
-
-.fnconstant {
-  color: #888;
-  background: #333;
-}
-
-.fnexists {
-  color: #f80;
-  background: #333;
-}
-
-.fnunknown {
-  color: #eee;
-}
-
-.fntodo {
-  background: #f80;
-}
-
-.hide {
-  opacity: 0;
-}
diff --git a/js/src/dapps/signaturereg/Import/import.js b/js/src/dapps/signaturereg/Import/import.js
deleted file mode 100644
index c1fcc3997ac908cc0a8cec1539b77bf59ec5a917..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Import/import.js
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../parity';
-import { callRegister, postRegister } from '../services';
-import Button from '../Button';
-
-import styles from './import.css';
-
-export default class Import extends Component {
-  static propTypes = {
-    instance: PropTypes.object.isRequired,
-    visible: PropTypes.bool.isRequired,
-    onClose: PropTypes.func.isRequired
-  }
-
-  state = {
-    abi: null,
-    abiParsed: null,
-    abiError: 'Please add a valid ABI definition',
-    functions: null,
-    fnstate: {}
-  }
-
-  render () {
-    const { visible, onClose } = this.props;
-    const { abiError } = this.state;
-
-    if (!visible) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.modal }>
-        <div className={ styles.overlay }>
-          <div className={ styles.dialog }>
-            <div className={ styles.header }>
-              <div>abi import</div>
-              <Button className={ styles.close } onClick={ onClose }>&times;</Button>
-            </div>
-            { abiError ? this.renderCapture() : this.renderRegister() }
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderCapture () {
-    const { abiError } = this.state;
-
-    return (
-      <div className={ styles.body }>
-        <div className={ styles.info }>
-          Provide the ABI (Contract Interface) in the space provided below. Only non-constant functions (names &amp; types) will be imported, while constant functions and existing signatures will be ignored.
-        </div>
-        <div className={ styles.info }>
-          <textarea rows='8' className={ styles.error } onChange={ this.onAbiEdit } />
-          <div className={ styles.error }>
-            { abiError }
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderRegister () {
-    const count = this.countFunctions();
-    let buttons = null;
-
-    if (count) {
-      buttons = (
-        <div className={ styles.buttonrow }>
-          <Button onClick={ this.onRegister }>
-            register functions
-          </Button>
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.body }>
-        <div className={ styles.info }>
-          The following functions have been extracted from the ABI provided and the state has been determined from interacting with the signature contract.
-        </div>
-        <div className={ styles.info }>
-          <div className={ styles.fnkeys }>
-            { this.renderFunctions() }
-          </div>
-        </div>
-        <div className={ styles.info }>
-          { count || 'no' } functions available for registration
-        </div>
-        { buttons }
-      </div>
-    );
-  }
-
-  renderFunctions () {
-    const { functions, fnstate } = this.state;
-
-    if (!functions) {
-      return null;
-    }
-
-    return functions.map((fn) => {
-      if (fn.constant) {
-        fnstate[fn.signature] = 'fnconstant';
-      } else if (!fnstate[fn.signature]) {
-        this.testFunction(fn);
-      }
-
-      return (
-        <div key={ fn.signature } className={ styles[fnstate[fn.signature] || 'fnunknown'] }>
-          { fn.id }
-        </div>
-      );
-    });
-  }
-
-  sortFunctions = (a, b) => {
-    return (a.name || '').localeCompare(b.name || '');
-  }
-
-  countFunctions () {
-    const { functions, fnstate } = this.state;
-
-    if (!functions) {
-      return 0;
-    }
-
-    return functions.filter((fn) => fnstate[fn.signature] === 'fntodo').length;
-  }
-
-  testFunction (fn) {
-    const { instance } = this.props;
-    const { fnstate } = this.state;
-
-    callRegister(instance, fn.id)
-      .then((result) => {
-        fnstate[fn.signature] = result ? 'fntodo' : 'fnexists';
-        this.setState(fnstate);
-      })
-      .catch((error) => {
-        console.error(error);
-      });
-  }
-
-  onAbiEdit = (event) => {
-    let functions = null;
-    let abiError = null;
-    let abiParsed = null;
-    let abi = null;
-
-    try {
-      abiParsed = JSON.parse(event.target.value);
-      functions = api.newContract(abiParsed).functions.sort(this.sortFunctions);
-      abi = JSON.stringify(abiParsed);
-    } catch (error) {
-      console.error('onAbiEdit', error);
-      abiError = error.message;
-    }
-
-    this.setState({
-      functions,
-      abiError,
-      abiParsed,
-      abi
-    });
-  }
-
-  onRegister = () => {
-    const { instance, onClose } = this.props;
-    const { functions, fnstate } = this.state;
-
-    return Promise
-      .all(
-        functions
-          .filter((fn) => !fn.constant)
-          .filter((fn) => fnstate[fn.signature] === 'fntodo')
-          .map((fn) => postRegister(instance, fn.id, {}))
-      )
-      .then(() => {
-        onClose();
-      })
-      .catch((error) => {
-        console.error('onRegister', error);
-      });
-  }
-}
diff --git a/js/src/dapps/signaturereg/Import/index.js b/js/src/dapps/signaturereg/Import/index.js
deleted file mode 100644
index 52deb93f01d2e105698fe540373af99a5d57885d..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Import/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './import';
diff --git a/js/src/dapps/signaturereg/Loading/index.js b/js/src/dapps/signaturereg/Loading/index.js
deleted file mode 100644
index 5eb10a7d4cd0c92498e3fdcdd87663a7209e1cf5..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Loading/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './loading';
diff --git a/js/src/dapps/signaturereg/Loading/loading.css b/js/src/dapps/signaturereg/Loading/loading.css
deleted file mode 100644
index 36d792c7d99a850bf31cef66eaf6d92a30aab071..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Loading/loading.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.loading {
-  width: 100%;
-  text-align: center;
-  padding-top: 5em;
-  font-size: 2em;
-  color: #999;
-}
diff --git a/js/src/dapps/signaturereg/Loading/loading.js b/js/src/dapps/signaturereg/Loading/loading.js
deleted file mode 100644
index f716214d2b3d08dbab651ec1cca0e0eb76b9c7eb..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/Loading/loading.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import styles from './loading.css';
-
-export default class Loading extends Component {
-  render () {
-    return (
-      <div className={ styles.loading }>
-        Attaching to contract ...
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/signaturereg/format.js b/js/src/dapps/signaturereg/format.js
deleted file mode 100644
index 1b766d3177e258f5f766e5e7ac02b6024ce1d48d..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/format.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import moment from 'moment';
-
-import { api } from './parity';
-
-const ZERO = new BigNumber(0);
-
-export function formatBlockNumber (blockNumber) {
-  return ZERO.eq(blockNumber || 0)
-    ? 'Pending'
-    : `${blockNumber.toFormat()}`;
-}
-
-export function formatSignature (signature) {
-  return api.util.bytesToHex(signature);
-}
-
-export function formatBlockTimestamp (block) {
-  if (!block || !block.timestamp) {
-    return null;
-  }
-
-  return moment(block.timestamp).fromNow();
-}
diff --git a/js/src/dapps/signaturereg/parity.js b/js/src/dapps/signaturereg/parity.js
deleted file mode 100644
index 6c861780a9a34ae4e4e9d87b6b390b727a1a480f..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/parity.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const { api } = window.parity;
-
-export {
-  api
-};
diff --git a/js/src/dapps/signaturereg/services.js b/js/src/dapps/signaturereg/services.js
deleted file mode 100644
index 9c01e49fb955494b431b3538de8f26d6ae6286a3..0000000000000000000000000000000000000000
--- a/js/src/dapps/signaturereg/services.js
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import * as abis from '~/contracts/abi';
-import { api } from './parity';
-
-const sortEvents = (a, b) => b.blockNumber.cmp(a.blockNumber) || b.logIndex.cmp(a.logIndex);
-
-const logToEvent = (log) => {
-  const key = api.util.sha3(JSON.stringify(log));
-  const { blockNumber, logIndex, transactionHash, transactionIndex, params, type } = log;
-
-  return {
-    type: log.event,
-    state: type,
-    blockNumber,
-    logIndex,
-    transactionHash,
-    transactionIndex,
-    params: Object.keys(params).reduce((data, name) => {
-      data[name] = params[name].value;
-      return data;
-    }, {}),
-    key
-  };
-};
-
-export function attachInterface (callback) {
-  return api.parity
-    .registryAddress()
-    .then((registryAddress) => {
-      console.log(`the registry was found at ${registryAddress}`);
-
-      const registry = api.newContract(abis.registry, registryAddress).instance;
-
-      return Promise
-        .all([
-          registry.getAddress.call({}, [api.util.sha3('signaturereg'), 'A']),
-          api.parity.accountsInfo()
-        ]);
-    })
-    .then(([address, accountsInfo]) => {
-      console.log(`signaturereg was found at ${address}`);
-
-      const contract = api.newContract(abis.signaturereg, address);
-      const accounts = Object
-        .keys(accountsInfo)
-        .reduce((obj, address) => {
-          const info = accountsInfo[address] || {};
-
-          return Object.assign(obj, {
-            [address]: {
-              address,
-              name: info.name || 'Unnamed'
-            }
-          });
-        }, {});
-      const fromAddress = Object.keys(accounts)[0];
-
-      return {
-        accounts,
-        address,
-        accountsInfo,
-        contract,
-        instance: contract.instance,
-        fromAddress
-      };
-    })
-    .catch((error) => {
-      console.error('attachInterface', error);
-    });
-}
-
-export function attachBlockNumber (instance, callback) {
-  return api.subscribe('eth_blockNumber', (error, blockNumber) => {
-    if (error) {
-      console.error('blockNumber', error);
-      return;
-    }
-
-    instance.totalSignatures
-      .call()
-      .then((totalSignatures) => {
-        callback({
-          blockNumber,
-          totalSignatures
-        });
-      })
-      .catch((error) => {
-        console.error('totalSignatures', error);
-      });
-  });
-}
-
-export function attachEvents (contract, callback) {
-  const blocks = { '0': {} };
-  let mined = [];
-  let pending = [];
-  let events = [];
-
-  const options = {
-    fromBlock: 0,
-    toBlock: 'pending',
-    limit: 50
-  };
-
-  return contract.subscribe('Registered', options, (error, _logs) => {
-    if (error) {
-      console.error('events', error);
-      return;
-    }
-
-    const logs = _logs.map(logToEvent);
-
-    mined = logs
-      .filter((log) => log.state === 'mined')
-      .map((log) => {
-        const blockNumber = log.blockNumber.toString();
-
-        if (!blocks[blockNumber]) {
-          blocks[blockNumber] = {};
-          getBlock(blockNumber).then((block) => {
-            Object.assign(blocks[blockNumber], block);
-          });
-        }
-
-        return Object.assign(log, { block: blocks[blockNumber] });
-      })
-      .reverse()
-      .concat(mined)
-      .sort(sortEvents);
-
-    pending = logs
-      .filter((log) => log.state === 'pending')
-      .reverse()
-      .filter((event) => !pending.find((log) => log.params.method === event.params.method))
-      .concat(pending)
-      .filter((event) => !mined.find((log) => log.params.method === event.params.method))
-      .sort(sortEvents);
-
-    events = pending.concat(mined);
-
-    callback({ events });
-  });
-}
-
-export function getBlock (blockNumber) {
-  return api.parity.getBlockHeaderByNumber(blockNumber);
-}
-
-export function callRegister (instance, id, options = {}) {
-  return instance.register.call(options, [id]);
-}
-
-export function postRegister (instance, id, options = {}) {
-  return api.parity
-    .defaultAccount()
-    .then((defaultAddress) => {
-      options.from = defaultAddress;
-
-      return instance.register.estimateGas(options, [id]);
-    })
-    .then((gas) => {
-      options.gas = gas.mul(1.2).toFixed(0);
-      console.log('postRegister', `gas estimated at ${gas.toFormat(0)}, setting to ${gas.mul(1.2).toFormat(0)}`);
-      instance.register.postTransaction(options, [id]);
-    });
-}
diff --git a/js/src/dapps/static/.gitkeep b/js/src/dapps/static/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/js/src/dapps/style.css b/js/src/dapps/style.css
deleted file mode 100644
index d5337d56641d72655a437042842d28b99f45ad1e..0000000000000000000000000000000000000000
--- a/js/src/dapps/style.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-:root,
-:root body {
-  background: #fff;
-  border: 0;
-  color: #333;
-  font-size: 16px;
-  font-family: 'Roboto', sans-serif;
-  font-weight: 300;
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-}
-
-:root,
-:root body,
-:root :global(#container) {
-  min-height: 100%;
-  width: 100%;
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-}
-
-:root * {
-  font-weight: 300;
-}
-
-:root :global(#container) > div {
-  flex: 1;
-  flex-direction: column;
-}
diff --git a/js/src/dapps/tokendeploy.js b/js/src/dapps/tokendeploy.js
deleted file mode 100644
index b6de05d0581bf5627a110dde69bb1841101de617..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ReactDOM from 'react-dom';
-import React from 'react';
-import { Redirect, Router, Route, hashHistory } from 'react-router';
-import { AppContainer } from 'react-hot-loader';
-
-import injectTapEventPlugin from 'react-tap-event-plugin';
-injectTapEventPlugin();
-
-import Deploy from './tokendeploy/Deploy';
-import Application from './tokendeploy/Application';
-import Overview from './tokendeploy/Overview';
-import Transfer from './tokendeploy/Transfer';
-
-import '../../assets/fonts/Roboto/font.css';
-import '../../assets/fonts/RobotoMono/font.css';
-import './style.css';
-
-ReactDOM.render(
-  <AppContainer>
-    <Router history={ hashHistory }>
-      <Redirect from='/' to='/overview' />
-      <Route path='/' component={ Application }>
-        <Route path='deploy' component={ Deploy } />
-        <Route path='overview' component={ Overview } />
-        <Route path='transfer' component={ Transfer } />
-      </Route>
-    </Router>
-  </AppContainer>,
-  document.querySelector('#container')
-);
-
-if (module.hot) {
-  module.hot.accept('./tokendeploy/Application/index.js', () => {
-    require('./tokendeploy/Application/index.js');
-    require('./tokendeploy/Overview/index.js');
-    require('./tokendeploy/Transfer/index.js');
-
-    ReactDOM.render(
-      <AppContainer>
-        <Router history={ hashHistory }>
-          <Redirect from='/' to='/overview' />
-          <Route path='/' component={ Application }>
-            <Route path='deploy' component={ Deploy } />
-            <Route path='overview' component={ Overview } />
-            <Route path='transfer' component={ Transfer } />
-          </Route>
-        </Router>
-      </AppContainer>,
-      document.querySelector('#container')
-    );
-  });
-}
diff --git a/js/src/dapps/tokendeploy/AddressSelect/addressSelect.css b/js/src/dapps/tokendeploy/AddressSelect/addressSelect.css
deleted file mode 100644
index b4b88684a1ddb9cf52f3b1b40818945e0a43943f..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/AddressSelect/addressSelect.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.iconMenu {
-}
-
-.iconMenu option {
-  padding-left: 30px;
-}
-
-.menu {
-  display: none;
-}
diff --git a/js/src/dapps/tokendeploy/AddressSelect/addressSelect.js b/js/src/dapps/tokendeploy/AddressSelect/addressSelect.js
deleted file mode 100644
index 04c37b10ccb812bfcc16548e8613f6aed858a359..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/AddressSelect/addressSelect.js
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../parity';
-import styles from './addressSelect.css';
-
-export default class AddressSelect extends Component {
-  static contextTypes = {
-    accounts: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    addresses: PropTypes.array.isRequired,
-    onChange: PropTypes.func.isRequired
-  }
-
-  state = {
-    selected: null
-  }
-
-  componentDidMount () {
-    const { addresses } = this.props;
-
-    this.onChange({
-      target: {
-        value: addresses[0]
-      }
-    });
-  }
-
-  componentWillReceiveProps (newProps) {
-    const { addresses } = this.props;
-    let changed = addresses.length !== newProps.addresses.length;
-
-    if (!changed) {
-      changed = addresses.filter((address, index) => newProps.addresses[index] !== address).length;
-    }
-
-    if (changed) {
-      this.onChange({ target: { value: newProps.addresses[0] } });
-    }
-  }
-
-  render () {
-    const { addresses } = this.props;
-    const { selectedAddress } = this.state;
-    const style = {
-      background: `rgba(255, 255, 255, 0.75) url(${api.util.createIdentityImg(selectedAddress, 3)}) no-repeat 98% center`
-    };
-
-    return (
-      <select
-        className={ styles.iconMenu }
-        style={ style }
-        onChange={ this.onChange }
-      >
-        { addresses.map(this.renderOption) }
-      </select>
-    );
-  }
-
-  renderOption = (address) => {
-    const { accounts } = this.context;
-    const account = accounts[address];
-
-    return (
-      <option
-        key={ account.address }
-        value={ account.address }
-      >
-        { account.name }
-      </option>
-    );
-  }
-
-  onChange = (event) => {
-    this.setState({ selectedAddress: event.target.value });
-    this.props.onChange(event);
-  }
-}
diff --git a/js/src/dapps/tokendeploy/AddressSelect/index.js b/js/src/dapps/tokendeploy/AddressSelect/index.js
deleted file mode 100644
index 9ae382b9331541c7f615ddbc716f65ef20cc0301..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/AddressSelect/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './addressSelect';
diff --git a/js/src/dapps/tokendeploy/Application/Header/header.css b/js/src/dapps/tokendeploy/Application/Header/header.css
deleted file mode 100644
index fb149db9690ce52152f0d50905eb235c48a2f595..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Application/Header/header.css
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.header {
-}
-
-.titlebar {
-  padding: 0.5em 1em;
-  margin: 0;
-  color: white;
-}
-
-.navigation {
-  table-layout: fixed;
-  width: 100%;
-  border-spacing: 0.25em;
-  border-collapse: separate;
-  border-color: white;
-  background: white;
-}
-
-.navigation tr {
-  height: 10em;
-}
-
-.title {
-  font-size: 1.25em;
-  margin-bottom: 0.25em;
-}
-
-.byline {
-  font-size: 1em;
-  opacity: 0.75;
-  margin-bottom: 0.25em;
-}
-
-.description {
-  font-size: 0.5em;
-  opacity: 0.5;
-  line-height: 1.5em;
-}
-
-.navNext,
-.navCurrent {
-  color: white;
-  padding: 1em 2em;
-  vertical-align: middle;
-}
-
-.navNext:hover {
-  cursor: pointer;
-  opacity: 0.8;
-}
-
-.navCurrent {
-  font-size: 2em;
-}
diff --git a/js/src/dapps/tokendeploy/Application/Header/header.js b/js/src/dapps/tokendeploy/Application/Header/header.js
deleted file mode 100644
index e8dd3d04d4b21930ee6f014e250cd236463120b0..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Application/Header/header.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import PAGES from '../pages';
-import styles from './header.css';
-
-export default class Header extends Component {
-  static contextTypes = {
-    router: PropTypes.object.isRequired
-  }
-
-  render () {
-    const path = (window.location.hash || '').split('?')[0].split('/')[1];
-    const offset = PAGES.findIndex((header) => header.path === path);
-
-    return (
-      <div className={ styles.header }>
-        <table className={ styles.navigation }>
-          <tbody>
-            <tr>
-              { this.renderHeader(0, offset) }
-              { this.renderHeader(1, offset) }
-            </tr>
-            <tr>
-              { this.renderHeader(2, offset) }
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    );
-  }
-
-  renderHeader (position, offset) {
-    const index = (position + offset) % PAGES.length;
-    const page = PAGES[index];
-    const background = `rgba(102, 34, 34, ${1 - (0.1 * position)})`;
-
-    return (
-      <td
-        className={ position ? styles.navNext : styles.navCurrent }
-        style={ { background } }
-        colSpan={ position ? 1 : 2 }
-        rowSpan={ position ? 1 : 2 }
-        onClick={ this.onNavigate(page.path) }
-      >
-        <div className={ styles.title }>
-          { page.title }
-        </div>
-        <div className={ styles.byline }>
-          { page.byline }
-        </div>
-        <div className={ styles.description }>
-          { position ? null : page.description }
-        </div>
-      </td>
-    );
-  }
-
-  onNavigate = (route) => {
-    const { router } = this.context;
-
-    return (event) => {
-      router.push(`/${route}`);
-    };
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Application/Header/index.js b/js/src/dapps/tokendeploy/Application/Header/index.js
deleted file mode 100644
index aef90266f940a3c7f8915c7ba910b62bec54317c..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Application/Header/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './header';
diff --git a/js/src/dapps/tokendeploy/Application/Loading/index.js b/js/src/dapps/tokendeploy/Application/Loading/index.js
deleted file mode 100644
index 5eb10a7d4cd0c92498e3fdcdd87663a7209e1cf5..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Application/Loading/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './loading';
diff --git a/js/src/dapps/tokendeploy/Application/Loading/loading.css b/js/src/dapps/tokendeploy/Application/Loading/loading.css
deleted file mode 100644
index 2c305c729a413610f97dcd1098a212bf4920be72..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Application/Loading/loading.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.body {
-  width: 100%;
-  text-align: center;
-  padding-top: 5em;
-  font-size: 2em;
-  color: #999;
-}
diff --git a/js/src/dapps/tokendeploy/Application/Loading/loading.js b/js/src/dapps/tokendeploy/Application/Loading/loading.js
deleted file mode 100644
index 2ac4ffb0d8ee429a07a532704c6b85f7da13cd75..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Application/Loading/loading.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import styles from './loading.css';
-
-export default class Loading extends Component {
-  render () {
-    return (
-      <div className={ styles.body }>
-        Attaching to contract ...
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Application/application.css b/js/src/dapps/tokendeploy/Application/application.css
deleted file mode 100644
index 46ae4d5a4413c23cb2d959d9a3749c97e3b35374..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Application/application.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  color: #444;
-  font-family: 'Roboto';
-  vertical-align: middle;
-  min-height: 100vh;
-  position:relative;
-}
-
-.body {
-  padding: 0 0.25em;
-}
diff --git a/js/src/dapps/tokendeploy/Application/application.js b/js/src/dapps/tokendeploy/Application/application.js
deleted file mode 100644
index 24c6202cc41ac3212f84456fce0d1fac63edefbb..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Application/application.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../parity';
-import { attachInstances } from '../services';
-
-import Header from './Header';
-import Loading from './Loading';
-
-import styles from './application.css';
-
-export default class Application extends Component {
-  static childContextTypes = {
-    accounts: PropTypes.object,
-    managerInstance: PropTypes.object,
-    registryInstance: PropTypes.object,
-    tokenregInstance: PropTypes.object
-  }
-
-  static propTypes = {
-    children: PropTypes.node.isRequired
-  }
-
-  state = {
-    accounts: null,
-    loading: true,
-    managerInstance: null,
-    registryInstance: null,
-    tokenregInstance: null
-  }
-
-  componentDidMount () {
-    return this.attachInstance();
-  }
-
-  render () {
-    const { children } = this.props;
-    const { loading } = this.state;
-
-    if (loading) {
-      return (
-        <Loading />
-      );
-    }
-
-    return (
-      <div className={ styles.container }>
-        <Header />
-        <div className={ styles.body }>
-          { children }
-        </div>
-      </div>
-    );
-  }
-
-  getChildContext () {
-    const { accounts, managerInstance, registryInstance, tokenregInstance } = this.state;
-
-    return {
-      accounts,
-      managerInstance,
-      registryInstance,
-      tokenregInstance
-    };
-  }
-
-  attachInstance () {
-    return Promise
-      .all([
-        api.parity.accountsInfo(),
-        attachInstances()
-      ])
-      .then(([accountsInfo, { managerInstance, registryInstance, tokenregInstance }]) => {
-        accountsInfo = accountsInfo || {};
-        this.setState({
-          loading: false,
-          managerInstance,
-          registryInstance,
-          tokenregInstance,
-          accounts: Object
-            .keys(accountsInfo)
-            .sort((a, b) => {
-              return (accountsInfo[b].name || '').localeCompare(accountsInfo[a].name || '');
-            })
-            .reduce((accounts, address) => {
-              accounts[address] = Object.assign(accountsInfo[address], { address });
-              return accounts;
-            }, {})
-        });
-      });
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Application/index.js b/js/src/dapps/tokendeploy/Application/index.js
deleted file mode 100644
index 3d8d1ca3b851e5bfed73373e82eff06b5d9ea46c..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Application/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './application';
diff --git a/js/src/dapps/tokendeploy/Application/pages.js b/js/src/dapps/tokendeploy/Application/pages.js
deleted file mode 100644
index 2839cb4d1e423d90cbb15d49455461f95fdf4086..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Application/pages.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const PAGES = [
-  {
-    path: 'overview',
-    title: 'Overview',
-    byline: 'Display all the current information relating to your own deployed tokens',
-    description: 'View the total number of tokens in circulation, the number of different tokens associated with your accounts, as well as the types of tokens created by you. In addition, view the balances associated with your accounts in relation to the total in circulation.'
-  },
-  {
-    path: 'transfer',
-    title: 'Transfer',
-    byline: 'Send tokens associated with your accounts to other addresses',
-    description: 'Send any tokens created by you or received from others. In addition, have a bird\'s eye view of all events relating to token transfers, be it yours, created by others, either local or globally available on the network.'
-  },
-  {
-    path: 'deploy',
-    title: 'Deploy',
-    byline: 'Deploy a new token to the network',
-    description: 'Token registration has never been this easy. Select the name for your token, the TLA and the number of tokens in circulation. Start sending the tokens to contacts right from this interface. Optionally you can register the token with the Token Registry which would allow you to transact in tokens from anywhere these transactions are allowed.'
-  }
-];
-
-export default PAGES;
diff --git a/js/src/dapps/tokendeploy/Container/container.css b/js/src/dapps/tokendeploy/Container/container.css
deleted file mode 100644
index b42ef522c7e53a159040302b6aadc730d40cb673..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Container/container.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.content {
-  padding: 4em;
-  margin-bottom: 0.25em;
-  text-align: center;
-}
-
-.content:nth-child(odd) {
-  background: rgba(102, 34, 34, 0.075);
-}
diff --git a/js/src/dapps/tokendeploy/Container/container.js b/js/src/dapps/tokendeploy/Container/container.js
deleted file mode 100644
index f7171b8635f3b1f30108b3c0d7882e3b792a3d73..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Container/container.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './container.css';
-
-export default class Container extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    children: PropTypes.node.isRequired
-  }
-
-  render () {
-    const { className, children } = this.props;
-    const classes = `${styles.content} ${className}`;
-
-    return (
-      <div className={ classes }>
-        { children }
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Container/index.js b/js/src/dapps/tokendeploy/Container/index.js
deleted file mode 100644
index 0deedaecc7762f78d94ef12f5d7fdeb29d22ac95..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Container/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './container';
diff --git a/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.css b/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.css
deleted file mode 100644
index 1403a3df18f7615bf82db60d09f35185f709c0b7..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../../_form.css';
-@import '../../_status.css';
diff --git a/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.js b/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.js
deleted file mode 100644
index 51dcd2f5b0ab02dadcc6064f598c04c42eee8a40..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.js
+++ /dev/null
@@ -1,321 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../../parity';
-import Container from '../../Container';
-import styles from './deployment.css';
-
-const DECIMALS = 6;
-const BASE = Math.pow(10, DECIMALS);
-
-const ERRORS = {
-  name: 'specify a valid name >2 & <32 characters',
-  tla: 'specify a valid TLA, 3 characters in length',
-  usedtla: 'the TLA used is not available for registration',
-  supply: `supply needs to be > 1 & <1 trillion, with no more than ${DECIMALS} decimals`
-};
-
-export default class Deployment extends Component {
-  static contextTypes = {
-    accounts: PropTypes.object.isRequired,
-    router: PropTypes.object.isRequired,
-    managerInstance: PropTypes.object.isRequired,
-    registryInstance: PropTypes.object.isRequired,
-    tokenregInstance: PropTypes.object.isRequired
-  };
-
-  static initState = {
-    base: null,
-    deployBusy: false,
-    deployDone: false,
-    deployError: null,
-    deployState: null,
-    globalReg: false,
-    globalFee: 0,
-    globalFeeText: '1.000',
-    fromAddress: null,
-    name: '',
-    nameError: ERRORS.name,
-    tla: '',
-    tlaError: ERRORS.tla,
-    totalSupply: '5000000',
-    totalSupplyError: null,
-    signerRequestId: null,
-    txHash: null
-  };
-
-  state = Deployment.initState
-
-  componentDidMount () {
-    const { managerInstance, tokenregInstance } = this.context;
-
-    Promise
-      .all([
-        managerInstance.base.call(),
-        tokenregInstance.fee.call()
-      ])
-      .then(([base, globalFee]) => {
-        this.setState({
-          base,
-          baseText: base.toFormat(0),
-          globalFee,
-          globalFeeText: api.util.fromWei(globalFee).toFormat(3)
-        });
-      });
-  }
-
-  reset () {
-    this.setState(Deployment.initState, () => this.componentDidMount());
-  }
-
-  render () {
-    const { deployBusy } = this.state;
-
-    return deployBusy
-      ? this.renderDeploying()
-      : this.renderForm();
-  }
-
-  renderDeploying () {
-    const { deployDone, deployError, deployState } = this.state;
-
-    if (deployDone) {
-      return (
-        <Container>
-          <div className={ styles.statusHeader }>
-            Your token has been deployed
-          </div>
-        </Container>
-      );
-    }
-
-    if (deployError) {
-      return (
-        <Container>
-          <div className={ styles.statusHeader }>
-            Your deployment has encountered an error
-          </div>
-          <div className={ styles.statusError }>
-            { deployError.message }
-          </div>
-        </Container>
-      );
-    }
-
-    return (
-      <Container>
-        <div className={ styles.statusHeader }>
-          Your token is currently being deployed to the network
-        </div>
-        <div className={ styles.statusState }>
-          { deployState }
-        </div>
-      </Container>
-    );
-  }
-
-  renderForm () {
-    const { baseText, name, nameError, tla, tlaError, totalSupply, totalSupplyError } = this.state;
-    const hasError = !!(nameError || tlaError || totalSupplyError);
-    const error = `${styles.input} ${styles.error}`;
-
-    return (
-      <Container>
-        <div className={ styles.form }>
-          <div className={ nameError ? error : styles.input }>
-            <label>token name</label>
-            <input
-              value={ name }
-              name='name'
-              onChange={ this.onChangeName }
-            />
-            <div className={ styles.hint }>
-              { nameError || 'an identifying name for the token' }
-            </div>
-          </div>
-          <div className={ tlaError ? error : styles.input }>
-            <label>token TLA</label>
-            <input
-              className={ styles.small }
-              name='tla'
-              value={ tla }
-              onChange={ this.onChangeTla }
-            />
-            <div className={ styles.hint }>
-              { tlaError || 'unique network acronym for this token' }
-            </div>
-          </div>
-          <div className={ totalSupplyError ? error : styles.input }>
-            <label>token supply</label>
-            <input
-              type='number'
-              step={ 1 }
-              min={ 1 }
-              max='999999999999999'
-              name='totalSupply'
-              value={ totalSupply }
-              onChange={ this.onChangeSupply }
-            />
-            <div className={ styles.hint }>
-              { totalSupplyError || `number of tokens (base: ${baseText})` }
-            </div>
-          </div>
-          <div className={ styles.input }>
-            <label />
-            <div className={ styles.buttonRow }>
-              <div
-                className={ styles.button }
-                disabled={ hasError }
-                onClick={ this.onDeploy }
-              >
-                Deploy Token
-              </div>
-            </div>
-          </div>
-        </div>
-      </Container>
-    );
-  }
-
-  onChangeName = (event) => {
-    const name = event.target.value;
-    const nameError = name && (name.length > 2) && (name.length < 32)
-      ? null
-      : ERRORS.name;
-
-    this.setState({ name, nameError });
-  }
-
-  onChangeRegistrar = (event) => {
-    this.setState({ globalReg: event.target.value === 'yes' }, this.testTlaAvailability);
-  }
-
-  onChangeSupply = (event) => {
-    const { value } = event.target;
-    const floatValue = parseFloat(value, 10);
-    const convertedTotalSupply = floatValue * BASE;
-    const totalSupplyError = Number.isInteger(convertedTotalSupply) && floatValue >= 1
-      ? null
-      : ERRORS.supply;
-
-    this.setState({ totalSupply: value, totalSupplyError });
-  }
-
-  onChangeTla = (event) => {
-    const _tla = event.target.value;
-    const tla = _tla && (_tla.length > 3)
-      ? _tla.substr(0, 3)
-      : _tla;
-    const tlaError = tla && (tla.length === 3)
-      ? null
-      : ERRORS.tla;
-
-    this.setState({ tla, tlaError }, this.testTlaAvailability);
-  }
-
-  testTlaAvailability = () => {
-    const { registryInstance, tokenregInstance } = this.context;
-    const { globalReg, tla, tlaError } = this.state;
-    const tokenreg = globalReg ? tokenregInstance : registryInstance;
-
-    if (tlaError && tlaError !== ERRORS.usedtla) {
-      return;
-    }
-
-    tokenreg
-      .fromTLA.call({}, [tla])
-      .then(([id, addr, base, name, owner]) => {
-        if (owner !== '0x0000000000000000000000000000000000000000') {
-          this.setState({ tlaError: ERRORS.usedtla });
-        } else if (tlaError === ERRORS.usedtla) {
-          this.setState({ tlaError: null });
-        }
-      })
-      .catch((error) => {
-        console.log('testTlaAvailability', error);
-      });
-  }
-
-  onDeploy = () => {
-    const { managerInstance, registryInstance, tokenregInstance } = this.context;
-    const { base, deployBusy, globalReg, name, nameError, tla, tlaError, totalSupply, totalSupplyError } = this.state;
-    const hasError = !!(nameError || tlaError || totalSupplyError);
-
-    if (hasError || deployBusy) {
-      return;
-    }
-
-    const registry = globalReg ? tokenregInstance : registryInstance;
-    const tokenreg = registry.address;
-
-    const values = [base.mul(totalSupply), tla, name, tokenreg];
-    const options = {};
-
-    this.setState({ deployBusy: true, deployState: 'Estimating gas for the transaction' });
-
-    return registry.fee.call({}, [])
-      .then((fee) => {
-        console.log('deploying with fee of', fee.toFixed());
-        options.value = fee;
-
-        return api.parity.defaultAccount();
-      })
-      .then((defaultAddress) => {
-        options.from = defaultAddress;
-
-        return managerInstance.deploy.estimateGas(options, values);
-      })
-      .then((gas) => {
-        this.setState({ deployState: 'Gas estimated, Posting transaction to the network' });
-
-        const gasPassed = gas.mul(1.2);
-
-        options.gas = gasPassed.toFixed(0);
-        console.log(`gas estimated at ${gas.toFormat(0)}, passing ${gasPassed.toFormat(0)}`);
-
-        return managerInstance.deploy.postTransaction(options, values);
-      })
-      .then((signerRequestId) => {
-        this.setState({ signerRequestId, deployState: 'Transaction posted, Waiting for transaction authorization' });
-
-        return api.pollMethod('parity_checkRequest', signerRequestId);
-      })
-      .then((txHash) => {
-        this.setState({ txHash, deployState: 'Transaction authorized, Waiting for network confirmations' });
-
-        return api.pollMethod('eth_getTransactionReceipt', txHash, (receipt) => {
-          if (!receipt || !receipt.blockNumber || receipt.blockNumber.eq(0)) {
-            return false;
-          }
-
-          return true;
-        });
-      })
-      .then((txReceipt) => {
-        this.setState({ txReceipt, deployDone: true, deployState: 'Network confirmed, Received transaction receipt' });
-      })
-      .catch((error) => {
-        if (error.type === 'REQUEST_REJECTED') {
-          return this.reset();
-        }
-
-        console.error('onDeploy', error);
-        this.setState({ deployError: error });
-      });
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Deploy/Deployment/index.js b/js/src/dapps/tokendeploy/Deploy/Deployment/index.js
deleted file mode 100644
index 92eb616dbd24c41ec4d032a62a0d6679a6efcae6..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Deploy/Deployment/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './deployment';
diff --git a/js/src/dapps/tokendeploy/Deploy/Event/event.css b/js/src/dapps/tokendeploy/Deploy/Event/event.css
deleted file mode 100644
index ace6e90cb1b4ad17616c00dade117a6eead602bb..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Deploy/Event/event.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-a.link, a.link:visited {
-  text-decoration: none;
-}
-
-a.link:hover {
-  text-decoration: underline;
-}
-
-a.link, a.link:hover, a.link:visited {
-  color: #822;
-  cursor: pointer;
-}
-
-.mined {
-}
-
-.pending {
-  opacity: 0.5;
-}
-
-.mined td,
-.pending td {
-  padding: 0.5em 1em;
-  line-height: 24px;
-}
-
-.blocknumber {
-  text-align: right;
-}
-
-.address {
-  max-width: 250px;
-  text-align: left;
-
-  div {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-}
-
-.description {
-  text-align: left;
-
-  div {
-    white-space: nowrap;
-  }
-}
-
-.center {
-  text-align: right;
-}
diff --git a/js/src/dapps/tokendeploy/Deploy/Event/event.js b/js/src/dapps/tokendeploy/Deploy/Event/event.js
deleted file mode 100644
index 9503c67c22ac278969e1233aef860910937a08b0..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Deploy/Event/event.js
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../../parity';
-import { getCoin, txLink } from '../../services';
-import IdentityIcon from '../../IdentityIcon';
-
-import styles from './event.css';
-
-export default class Event extends Component {
-  static contextTypes = {
-    accounts: PropTypes.object.isRequired,
-    registryInstance: PropTypes.object.isRequired,
-    tokenregInstance: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    event: PropTypes.object.isRequired
-  }
-
-  state = {
-    block: null,
-    coin: {}
-  }
-
-  componentDidMount () {
-    this.lookup();
-  }
-
-  render () {
-    const { event } = this.props;
-    const { block, coin } = this.state;
-    const isPending = event.type === 'pending';
-
-    return (
-      <tr className={ isPending ? styles.pending : styles.mined }>
-        <td className={ styles.blocknumber }>
-          <div>{ (isPending || !block) ? '' : moment(block.timestamp).fromNow() }</div>
-          <div>{ isPending ? 'Pending' : event.blockNumber.toFormat() }</div>
-        </td>
-        <td>{ event.event }</td>
-        <td className={ styles.description }>
-          <div>{ isPending ? '' : coin.tla }</div>
-          <div>{ isPending ? '' : coin.name }</div>
-          <div>{ this.renderAddress(event.params.coin) }</div>
-        </td>
-        <td className={ styles.address }>
-          { this.renderAddress(event.params.owner) }
-          <div><a href={ txLink(event.transactionHash) } target='_blank' className={ styles.link }>{ this.renderHash(event.transactionHash) }</a></div>
-        </td>
-        <td>{ isPending || !coin.isGlobal ? '' : 'global' }</td>
-      </tr>
-    );
-  }
-
-  renderAddress (address) {
-    const { accounts } = this.context;
-    const account = accounts[address];
-
-    return (
-      <div>
-        <IdentityIcon address={ address } />
-        <span>{ account ? account.name : address }</span>
-      </div>
-    );
-  }
-
-  renderHash (hash) {
-    return `${hash.substr(0, 10)}...${hash.slice(-10)}`;
-  }
-
-  lookup () {
-    const { event } = this.props;
-
-    if (event.type === 'pending') {
-      return;
-    }
-
-    Promise
-      .all([
-        api.parity.getBlockHeaderByNumber(event.blockNumber),
-        getCoin(event.params.tokenreg, event.params.coin)
-      ])
-      .then(([block, coin]) => {
-        this.setState({ block, coin });
-      });
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Deploy/Event/index.js b/js/src/dapps/tokendeploy/Deploy/Event/index.js
deleted file mode 100644
index 25441954b4837428bc895fc61c48f5f81cd24e58..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Deploy/Event/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './event';
diff --git a/js/src/dapps/tokendeploy/Deploy/Events/events.css b/js/src/dapps/tokendeploy/Deploy/Events/events.css
deleted file mode 100644
index 48c107e0aab84dce450cdc48ecd2d80dd7499faa..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Deploy/Events/events.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.statusHeader {
-  font-size: 1.25em;
-}
-
-.eventList {
-  border: none;
-  margin: 0 auto;
-  border-collapse: collapse;
-  display: flex;
-  overflow: auto;
-
-  > * {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-  }
-}
-
-.eventList tr:nth-child(even) {
-  background: rgba(102, 34, 34, 0.075);
-}
-
-.eventList tr:nth-child(odd) {
-}
diff --git a/js/src/dapps/tokendeploy/Deploy/Events/events.js b/js/src/dapps/tokendeploy/Deploy/Events/events.js
deleted file mode 100644
index b9ec66c771ffd6f9ab82199fb700b6138d0f4dc5..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Deploy/Events/events.js
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../../parity';
-import Container from '../../Container';
-import Event from '../Event';
-
-import styles from './events.css';
-
-export default class Events extends Component {
-  static contextTypes = {
-    managerInstance: PropTypes.object.isRequired
-  }
-
-  state = {
-    blocks: {},
-    loading: true,
-    events: [],
-    minedEvents: [],
-    pendingEvents: []
-  }
-
-  componentDidMount () {
-    const { managerInstance } = this.context;
-    const options = {
-      fromBlock: 0,
-      toBlock: 'pending',
-      limit: 50
-    };
-
-    managerInstance.Created
-      .subscribe(options, this.receiveCreatedEvents)
-      .then((subscriptionIdCreated) => {
-        this.setState({ subscriptionIdCreated });
-      });
-  }
-
-  componentWillUnmount () {
-    const { managerInstance } = this.context;
-    const { subscriptionIdCreated } = this.state;
-
-    managerInstance.Created.unsubscribe(subscriptionIdCreated);
-  }
-
-  render () {
-    const { loading } = this.state;
-
-    return (
-      <Container>
-        { loading ? this.renderLoading() : this.renderEvents() }
-      </Container>
-    );
-  }
-
-  renderEvents () {
-    const { events } = this.state;
-
-    return events.length
-      ? this.renderEventsList()
-      : this.renderEventsNone();
-  }
-
-  renderEventsNone () {
-    return (
-      <div className={ styles.statusHeader }>
-        There are currently no events available
-      </div>
-    );
-  }
-
-  renderEventsList () {
-    const { events } = this.state;
-    const rows = events.map((event) => {
-      return (
-        <Event key={ event.key } event={ event } />
-      );
-    });
-
-    return (
-      <table className={ styles.eventList }>
-        <tbody>
-          { rows }
-        </tbody>
-      </table>
-    );
-  }
-
-  renderLoading () {
-    return (
-      <div className={ styles.statusHeader }>
-        Loading events
-      </div>
-    );
-  }
-
-  logToEvent = (log) => {
-    log.key = api.util.sha3(JSON.stringify(log));
-    log.params = Object.keys(log.params).reduce((params, name) => {
-      params[name] = log.params[name].value;
-      return params;
-    }, {});
-
-    return log;
-  }
-
-  receiveCreatedEvents = (error, logs) => {
-    if (error) {
-      console.error('receiveLogs', error);
-      return;
-    }
-
-    const { minedEvents, pendingEvents } = this.state;
-    const minedNew = logs
-      .filter((log) => log.type === 'mined')
-      .map(this.logToEvent)
-      .filter((log) => !minedEvents.find((event) => event.transactionHash === log.transactionHash))
-      .reverse()
-      .concat(minedEvents);
-    const pendingNew = logs
-      .filter((log) => log.type === 'pending')
-      .map(this.logToEvent)
-      .filter((log) => !pendingEvents.find((event) => event.transactionHash === log.transactionHash))
-      .reverse()
-      .concat(pendingEvents)
-      .filter((log) => !minedNew.find((event) => event.transactionHash === log.transactionHash));
-    const events = [].concat(pendingNew).concat(minedNew);
-
-    this.setState({ loading: false, events, minedEvents: minedNew, pendingEvents: pendingNew });
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Deploy/Events/index.js b/js/src/dapps/tokendeploy/Deploy/Events/index.js
deleted file mode 100644
index d2d0080b3542ce7eef9405c4c01348a1181898e7..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Deploy/Events/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './events';
diff --git a/js/src/dapps/tokendeploy/Deploy/deploy.js b/js/src/dapps/tokendeploy/Deploy/deploy.js
deleted file mode 100644
index c83f4bf933d27bb746e10e2e66fc6bcbafbd8191..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Deploy/deploy.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import Deployment from './Deployment';
-import Events from './Events';
-
-export default class Deploy extends Component {
-  render () {
-    return (
-      <div>
-        <Deployment />
-        <Events />
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Deploy/index.js b/js/src/dapps/tokendeploy/Deploy/index.js
deleted file mode 100644
index 3b7668834020696ef4513de8a9adb3fb649c2f25..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Deploy/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './deploy';
diff --git a/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.css b/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.css
deleted file mode 100644
index 1edc36a4a21b4cc5a58bcd6d005e69588df65fa1..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.icon {
-  width: 24px;
-  height: 24px;
-  margin: 0 0.5em -4px 0;
-}
diff --git a/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.js b/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.js
deleted file mode 100644
index 81a8d0ede90aecf976e1c578b533b9602e82a28e..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../parity';
-import styles from './identityIcon.css';
-
-export default class IdentityIcon extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    className: PropTypes.string
-  }
-
-  render () {
-    const { address, className } = this.props;
-    const classes = `${styles.icon} ${className}`;
-
-    return (
-      <img
-        className={ classes }
-        src={ api.util.createIdentityImg(address, 3) }
-      />
-    );
-  }
-}
diff --git a/js/src/dapps/tokendeploy/IdentityIcon/index.js b/js/src/dapps/tokendeploy/IdentityIcon/index.js
deleted file mode 100644
index 09191356420c1b472cb6ed005a3e9af4a8adb151..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/IdentityIcon/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './identityIcon';
diff --git a/js/src/dapps/tokendeploy/Overview/Owner/index.js b/js/src/dapps/tokendeploy/Overview/Owner/index.js
deleted file mode 100644
index 19a28e266d164686e275d7a1c639115bf197c7e1..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Overview/Owner/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './owner';
diff --git a/js/src/dapps/tokendeploy/Overview/Owner/owner.css b/js/src/dapps/tokendeploy/Overview/Owner/owner.css
deleted file mode 100644
index 06211ca9eef76a35a9c6743d25099846e6b3780a..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Overview/Owner/owner.css
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.info {
-}
-
-.owner {
-  vertical-align: top;
-  text-align: right;
-}
-
-.owner>div {
-  border-radius: 1px;
-  padding: 1em 2em;
-  white-space: nowrap;
-}
-
-.tokens {
-  text-align: left;
-}
-
-.tokens>div {
-  border-radius: 1px;
-  background: #988;
-  padding: 1em;
-  margin: 0 0 0.25em 0.25em;
-  display: inline-block;
-  white-space: nowrap;
-  color: white;
-}
-
-.icon {
-  margin: 0 0 -4px 1em;
-}
-
-.byline {
-  opacity: 0.75;
-  font-size: 0.75em;
-  padding-top: 0.25em;
-}
diff --git a/js/src/dapps/tokendeploy/Overview/Owner/owner.js b/js/src/dapps/tokendeploy/Overview/Owner/owner.js
deleted file mode 100644
index 3e1530e05d77864744a61a8a5be7907fa94b14ca..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Overview/Owner/owner.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import IdentityIcon from '../../IdentityIcon';
-import Token from '../Token';
-import styles from './owner.css';
-
-export default class Owner extends Component {
-  static contextTypes = {
-    accounts: PropTypes.object.isRequired,
-    managerInstance: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    tokens: PropTypes.array.isRequired
-  }
-
-  state = {
-    tokens: []
-  }
-
-  render () {
-    const { accounts } = this.context;
-    const { address, tokens } = this.props;
-
-    if (!tokens.length) {
-      return null;
-    }
-
-    return (
-      <tr className={ styles.info }>
-        <td className={ styles.owner }>
-          <div>
-            <span>{ accounts[address].name }</span>
-            <IdentityIcon
-              className={ styles.icon }
-              address={ address }
-            />
-          </div>
-        </td>
-        <td className={ styles.tokens }>
-          { this.renderTokens() }
-        </td>
-      </tr>
-    );
-  }
-
-  renderTokens () {
-    const { tokens } = this.props;
-
-    return tokens.map((token) => (
-      <div key={ token.address }>
-        <Token
-          address={ token.address }
-          tokenreg={ token.tokenreg }
-        />
-        <div className={ styles.byline }>
-          { token.address }
-        </div>
-      </div>
-    ));
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Overview/Token/index.js b/js/src/dapps/tokendeploy/Overview/Token/index.js
deleted file mode 100644
index 6a636c3c89f4314c14616993035b021746b517c5..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Overview/Token/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './token';
diff --git a/js/src/dapps/tokendeploy/Overview/Token/token.css b/js/src/dapps/tokendeploy/Overview/Token/token.css
deleted file mode 100644
index 48153a4b2e48bfc311b40542fcd48106c61d0e8b..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Overview/Token/token.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.info {
-}
-
-.info>div {
-  display: inline-block;
-  padding: 0.25em 0.5em;
-  vertical-align: middle;
-}
-
-.address {
-}
-
-.tla {
-  background: #766;
-  border-radius: 1px;
-}
-
-.name {
-}
-
-.supply {
-}
-
-.supply div {
-  display: block;
-  text-align: center;
-}
-
-.supply .info {
-  font-size: 0.75em;
-  opacity: 0.75;
-}
-
-.global {
-  font-size: 0.75em;
-}
diff --git a/js/src/dapps/tokendeploy/Overview/Token/token.js b/js/src/dapps/tokendeploy/Overview/Token/token.js
deleted file mode 100644
index 181484ac9d1d1cb819cd08a98a5be627aa0096e4..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Overview/Token/token.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { totalSupply, getCoin } from '../../services';
-import styles from './token.css';
-
-export default class Token extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    tokenreg: PropTypes.string.isRequired
-  }
-
-  state = {
-    coin: null,
-    totalSupply: null
-  }
-
-  componentDidMount () {
-    this.lookupToken();
-  }
-
-  render () {
-    const { coin, totalSupply } = this.state;
-
-    if (!coin) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.info }>
-        <div className={ styles.tla }>{ coin.tla }</div>
-        <div className={ styles.name }>{ coin.name }</div>
-        <div className={ styles.supply }>
-          <div>{ totalSupply.div(1000000).toFormat(0) }</div>
-          <div className={ styles.info }>total supply</div>
-        </div>
-      </div>
-    );
-  }
-
-  lookupToken () {
-    const { address, tokenreg } = this.props;
-
-    Promise
-      .all([
-        getCoin(tokenreg, address),
-        totalSupply(address)
-      ])
-      .then(([coin, totalSupply]) => {
-        this.setState({ coin, totalSupply });
-      });
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Overview/index.js b/js/src/dapps/tokendeploy/Overview/index.js
deleted file mode 100644
index b6317c834e59d2535ef15f79ece6a771f5b9645c..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Overview/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './overview';
diff --git a/js/src/dapps/tokendeploy/Overview/overview.css b/js/src/dapps/tokendeploy/Overview/overview.css
deleted file mode 100644
index c1c05fd3dfe6df6c460fa50741f43ec592110e70..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Overview/overview.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../_status.css';
-
-.body {
-}
-
-.ownerTable {
-  margin: 0 auto;
-  border-collapse: collapse;
-}
diff --git a/js/src/dapps/tokendeploy/Overview/overview.js b/js/src/dapps/tokendeploy/Overview/overview.js
deleted file mode 100644
index 58333e17ec0ea4758fc0ede1ae23a52581826ead..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Overview/overview.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import React, { Component, PropTypes } from 'react';
-
-import { loadOwnedTokens } from '../services';
-import Container from '../Container';
-import Owner from './Owner';
-
-import styles from './overview.css';
-
-export default class Overview extends Component {
-  static contextTypes = {
-    accounts: PropTypes.object.isRequired,
-    managerInstance: PropTypes.object.isRequired
-  }
-
-  state = {
-    loading: true,
-    total: new BigNumber(0),
-    tokenOwners: []
-  }
-
-  componentDidMount () {
-    this.loadOwners();
-  }
-
-  render () {
-    const { loading } = this.state;
-
-    return (
-      <Container>
-        { loading ? this.renderLoading() : this.renderBody() }
-      </Container>
-    );
-  }
-
-  renderLoading () {
-    return (
-      <div className={ styles.statusHeader }>
-        Loading tokens
-      </div>
-    );
-  }
-
-  renderBody () {
-    const { total } = this.state;
-    let owners = null;
-
-    if (total.gt(0)) {
-      owners = (
-        <table className={ styles.ownerTable }>
-          <tbody>
-            { this.renderOwners() }
-          </tbody>
-        </table>
-      );
-    }
-
-    return (
-      <div className={ styles.body }>
-        <div className={ styles.statusHeader }>
-          You have { total.toFormat(0) } tokens created by your accounts
-        </div>
-        { owners }
-      </div>
-    );
-  }
-
-  renderOwners () {
-    const { tokens } = this.state;
-
-    return Object.keys(tokens).map((address) => (
-      <Owner
-        key={ address }
-        tokens={ tokens[address] }
-        address={ address }
-      />
-    ));
-  }
-
-  loadOwners () {
-    const { accounts } = this.context;
-    const addresses = Object.keys(accounts);
-
-    loadOwnedTokens(addresses)
-      .then(({ tokens, total }) => {
-        this.setState({ tokens, total, loading: false });
-      });
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Transfer/Event/event.js b/js/src/dapps/tokendeploy/Transfer/Event/event.js
deleted file mode 100644
index bc28bd8b1915e1579d2758dc98f976b17e0f0aba..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Transfer/Event/event.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-// TODO: This is a copy & paste for Deploy/Event -> render() different. Not very DRY
-import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../../parity';
-import { txLink } from '../../services';
-import IdentityIcon from '../../IdentityIcon';
-import styles from '../../Deploy/Event/event.css';
-
-export default class Event extends Component {
-  static contextTypes = {
-    accounts: PropTypes.object.isRequired,
-    registryInstance: PropTypes.object.isRequired,
-    tokenregInstance: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    event: PropTypes.object.isRequired,
-    token: PropTypes.object.isRequired
-  }
-
-  state = {
-    block: null
-  }
-
-  componentDidMount () {
-    this.lookup();
-  }
-
-  render () {
-    const { event, token } = this.props;
-    const { block } = this.state;
-    const isPending = event.type === 'pending';
-
-    return (
-      <tr className={ isPending ? styles.pending : styles.mined }>
-        <td className={ styles.blocknumber }>
-          <div>{ (isPending || !block) ? '' : moment(block.timestamp).fromNow() }</div>
-          <div>{ isPending ? 'Pending' : event.blockNumber.toFormat() }</div>
-        </td>
-        <td>{ event.event }</td>
-        <td className={ styles.description }>
-          <div>{ isPending ? '' : token.coin.tla }</div>
-          <div>{ isPending ? '' : token.coin.name }</div>
-        </td>
-        <td className={ styles.address }>
-          { this.renderAddress(event.params.from) }
-        </td>
-        <td className={ styles.value }>
-          <div>{ event.params.value.div(1000000).toFormat(6) }</div>
-          <div>⇒</div>
-          <div><a href={ txLink(event.transactionHash) } target='_blank' className={ styles.link }>{ this.renderHash(event.transactionHash) }</a></div>
-        </td>
-        <td className={ styles.address }>
-          { this.renderAddress(event.params.to) }
-        </td>
-      </tr>
-    );
-  }
-
-  renderAddress (address) {
-    const { accounts } = this.context;
-    const account = accounts[address];
-
-    return (
-      <div>
-        <IdentityIcon address={ address } />
-        <span>{ account ? account.name : address }</span>
-      </div>
-    );
-  }
-
-  renderHash (hash) {
-    return `${hash.substr(0, 10)}...${hash.slice(-10)}`;
-  }
-
-  lookup () {
-    const { event } = this.props;
-
-    if (event.type === 'pending') {
-      return;
-    }
-
-    api.parity
-      .getBlockHeaderByNumber(event.blockNumber)
-      .then((block) => {
-        this.setState({ block });
-      });
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Transfer/Event/index.js b/js/src/dapps/tokendeploy/Transfer/Event/index.js
deleted file mode 100644
index 25441954b4837428bc895fc61c48f5f81cd24e58..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Transfer/Event/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './event';
diff --git a/js/src/dapps/tokendeploy/Transfer/Events/events.js b/js/src/dapps/tokendeploy/Transfer/Events/events.js
deleted file mode 100644
index d6b3591338e4b257781bac5b5be262866cd952f6..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Transfer/Events/events.js
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import { api } from '../../parity';
-import { loadAllTokens, subscribeEvents, unsubscribeEvents } from '../../services';
-import Container from '../../Container';
-import Event from '../Event';
-
-import styles from '../../Deploy/Events/events.css';
-
-export default class Events extends Component {
-  state = {
-    subscriptionId: 0,
-    loading: true,
-    events: [],
-    pendingEvents: [],
-    minedEvents: [],
-    tokens: []
-  }
-
-  componentDidMount () {
-    loadAllTokens()
-      .then((tokens) => {
-        const addresses = tokens.map((token) => token.address);
-
-        this.setState({ tokens });
-        return subscribeEvents(addresses, this.eventCallback);
-      })
-      .then((subscriptionId) => {
-        this.setState({ subscriptionId, loading: false });
-      })
-      .catch((error) => {
-        console.error('componentDidMount', error);
-      });
-  }
-
-  componentWillUnmount () {
-    const { subscriptionId } = this.state;
-
-    if (subscriptionId) {
-      unsubscribeEvents(subscriptionId);
-    }
-  }
-
-  render () {
-    const { loading } = this.state;
-
-    return (
-      <Container>
-        { loading ? this.renderLoading() : this.renderEvents() }
-      </Container>
-    );
-  }
-
-  renderLoading () {
-    return (
-      <div className={ styles.statusHeader }>
-        Attaching events
-      </div>
-    );
-  }
-
-  renderEvents () {
-    const { events } = this.state;
-
-    return events.length
-      ? this.renderEventsList()
-      : this.renderEventsNone();
-  }
-
-  renderEventsNone () {
-    return (
-      <div className={ styles.statusHeader }>
-        There are currently no events available
-      </div>
-    );
-  }
-
-  renderEventsList () {
-    const { events, tokens } = this.state;
-    const rows = events.map((event) => {
-      const token = tokens.find((token) => token.address === event.address);
-
-      return (
-        <Event
-          key={ event.key }
-          token={ token }
-          event={ event }
-        />
-      );
-    });
-
-    return (
-      <table className={ styles.eventList }>
-        <tbody>
-          { rows }
-        </tbody>
-      </table>
-    );
-  }
-
-  logToEvent = (log) => {
-    log.key = api.util.sha3(JSON.stringify(log));
-    log.params = Object.keys(log.params).reduce((params, name) => {
-      params[name] = log.params[name].value;
-      return params;
-    }, {});
-
-    return log;
-  }
-
-  eventCallback = (error, logs) => {
-    if (error) {
-      console.error('eventCallback', error);
-      return;
-    }
-
-    const { minedEvents, pendingEvents } = this.state;
-    const minedNew = logs
-      .filter((log) => log.type === 'mined')
-      .map(this.logToEvent)
-      .filter((log) => !minedEvents.find((event) => event.transactionHash === log.transactionHash))
-      .reverse()
-      .concat(minedEvents);
-    const pendingNew = logs
-      .filter((log) => log.type === 'pending')
-      .map(this.logToEvent)
-      .filter((log) => !pendingEvents.find((event) => event.transactionHash === log.transactionHash))
-      .reverse()
-      .concat(pendingEvents)
-      .filter((log) => !minedNew.find((event) => event.transactionHash === log.transactionHash));
-    const events = [].concat(pendingNew).concat(minedNew);
-
-    this.setState({ loading: false, events, minedEvents: minedNew, pendingEvents: pendingNew });
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Transfer/Events/index.js b/js/src/dapps/tokendeploy/Transfer/Events/index.js
deleted file mode 100644
index d2d0080b3542ce7eef9405c4c01348a1181898e7..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Transfer/Events/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './events';
diff --git a/js/src/dapps/tokendeploy/Transfer/Send/index.js b/js/src/dapps/tokendeploy/Transfer/Send/index.js
deleted file mode 100644
index 58c273dc72d418b12aa93d9baaec16ff49276376..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Transfer/Send/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './send';
diff --git a/js/src/dapps/tokendeploy/Transfer/Send/send.css b/js/src/dapps/tokendeploy/Transfer/Send/send.css
deleted file mode 100644
index 1403a3df18f7615bf82db60d09f35185f709c0b7..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Transfer/Send/send.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../../_form.css';
-@import '../../_status.css';
diff --git a/js/src/dapps/tokendeploy/Transfer/Send/send.js b/js/src/dapps/tokendeploy/Transfer/Send/send.js
deleted file mode 100644
index 9595e20457323a572d9eca64b37da13dddb76ea3..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Transfer/Send/send.js
+++ /dev/null
@@ -1,345 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import React, { Component, PropTypes } from 'react';
-
-import { eip20 } from '~/contracts/abi';
-
-import { api } from '../../parity';
-import { loadBalances } from '../../services';
-import AddressSelect from '../../AddressSelect';
-import Container from '../../Container';
-
-import styles from './send.css';
-
-export default class Send extends Component {
-  static contextTypes = {
-    accounts: PropTypes.object.isRequired
-  }
-
-  state = {
-    loading: true,
-    tokens: null,
-    selectedToken: null,
-    availableBalances: [],
-    fromAddress: null,
-    fromBalance: null,
-    toAddress: null,
-    toKnown: true,
-    amount: 0,
-    amountError: null,
-    sendBusy: false,
-    sendError: null,
-    sendState: null,
-    sendDone: false,
-    signerRequestId: null,
-    txHash: null,
-    txReceipt: null
-  }
-
-  componentDidMount () {
-    this.loadBalances();
-    this.onAmountChange({ target: { value: '0' } });
-  }
-
-  render () {
-    const { loading } = this.state;
-
-    return loading
-      ? this.renderLoading()
-      : this.renderBody();
-  }
-
-  renderBody () {
-    const { sendBusy } = this.state;
-
-    return sendBusy
-      ? this.renderSending()
-      : this.renderForm();
-  }
-
-  renderSending () {
-    const { sendDone, sendError, sendState } = this.state;
-
-    if (sendDone) {
-      return (
-        <Container>
-          <div className={ styles.statusHeader }>
-            Your token value transfer has been completed
-          </div>
-        </Container>
-      );
-    }
-
-    if (sendError) {
-      return (
-        <Container>
-          <div className={ styles.statusHeader }>
-            Your deployment has encountered an error
-          </div>
-          <div className={ styles.statusError }>
-            { sendError }
-          </div>
-        </Container>
-      );
-    }
-
-    return (
-      <Container>
-        <div className={ styles.statusHeader }>
-          Your token value is being transferred
-        </div>
-        <div className={ styles.statusState }>
-          { sendState }
-        </div>
-      </Container>
-    );
-  }
-
-  renderLoading () {
-    return (
-      <Container>
-        <div className={ styles.statusHeader }>
-          Loading available tokens
-        </div>
-      </Container>
-    );
-  }
-
-  renderForm () {
-    const { tokens } = this.state;
-
-    if (!tokens || tokens.length === 0) {
-      return (
-        <Container>
-          <div className={ styles.statusHeader }>
-            There are no tokens to transfer
-          </div>
-        </Container>
-      );
-    }
-
-    const { accounts } = this.context;
-    const { availableBalances, fromAddress, amount, amountError, toKnown, toAddress } = this.state;
-
-    const fromBalance = availableBalances.find((balance) => balance.address === fromAddress);
-    const fromAddresses = availableBalances.map((balance) => balance.address);
-    const toAddresses = Object.keys(accounts);
-    const toInput = toKnown
-      ? <AddressSelect addresses={ toAddresses } onChange={ this.onChangeTo } />
-      : <input value={ toAddress } onChange={ this.onChangeTo } />;
-    const hasError = amountError;
-    const error = `${styles.input} ${styles.error}`;
-    const maxAmountHint = `Value to transfer (max: ${fromBalance ? fromBalance.balance.div(1000000).toFormat(6) : '1'})`;
-
-    return (
-      <Container>
-        <div className={ styles.form }>
-          <div className={ styles.input }>
-            <label>token type</label>
-            <select onChange={ this.onSelectToken }>
-              { this.renderTokens() }
-            </select>
-            <div className={ styles.hint }>
-              type of token to transfer
-            </div>
-          </div>
-          <div className={ styles.input }>
-            <label>transfer from</label>
-            <AddressSelect
-              addresses={ fromAddresses }
-              onChange={ this.onSelectFrom }
-            />
-            <div className={ styles.hint }>
-              account to transfer from
-            </div>
-          </div>
-          <div className={ styles.input }>
-            <label>transfer to</label>
-            <select onChange={ this.onChangeToType }>
-              <option value='known'>Known, Select from list</option>
-              <option value='unknown'>Unknown, Keyboard input</option>
-            </select>
-            <div className={ styles.hint }>
-              the type of address input
-            </div>
-          </div>
-          <div className={ styles.input }>
-            <label />
-            { toInput }
-            <div className={ styles.hint }>
-              account to transfer to
-            </div>
-          </div>
-          <div className={ amountError ? error : styles.input }>
-            <label>amount</label>
-            <input
-              type='number'
-              min='0'
-              step='0.1'
-              value={ amount }
-              max={ fromBalance ? fromBalance.balance.div(1000000).toFixed(6) : 1 }
-              onChange={ this.onAmountChange }
-            />
-            <div className={ styles.hint }>
-              { amountError || maxAmountHint }
-            </div>
-          </div>
-          <div className={ styles.input }>
-            <label />
-            <div className={ styles.buttonRow }>
-              <div
-                className={ styles.button }
-                disabled={ hasError }
-                onClick={ this.onSend }
-              >
-                Transfer Tokens
-              </div>
-            </div>
-          </div>
-        </div>
-      </Container>
-    );
-  }
-
-  renderTokens () {
-    const { tokens } = this.state;
-
-    return tokens.map((token) => (
-      <option
-        key={ token.address }
-        value={ token.address }
-      >
-        { token.coin.tla } / { token.coin.name }
-      </option>
-    ));
-  }
-
-  onSelectFrom = (event) => {
-    const fromAddress = event.target.value;
-
-    this.setState({ fromAddress });
-  }
-
-  onChangeTo = (event) => {
-    const toAddress = event.target.value;
-
-    this.setState({ toAddress });
-  }
-
-  onChangeToType = (event) => {
-    const toKnown = event.target.value === 'known';
-
-    this.setState({ toKnown });
-  }
-
-  onSelectToken = (event) => {
-    const { tokens } = this.state;
-    const address = event.target.value;
-    const selectedToken = tokens.find((_token) => _token.address === address);
-    const availableBalances = selectedToken.balances.filter((balance) => balance.balance.gt(0));
-
-    this.setState({ selectedToken, availableBalances });
-    this.onSelectFrom({ target: { value: availableBalances[0].address } });
-  }
-
-  onAmountChange = (event) => {
-    const amount = parseFloat(event.target.value);
-    const amountError = !isFinite(amount) || amount <= 0
-      ? 'amount needs to be > 0'
-      : null;
-
-    this.setState({ amount, amountError });
-  }
-
-  onSend = () => {
-    const { amount, fromAddress, toAddress, amountError, selectedToken, sendBusy } = this.state;
-    const hasError = amountError;
-
-    if (hasError || sendBusy) {
-      return;
-    }
-
-    const values = [toAddress, new BigNumber(amount).mul(1000000).toFixed(0)];
-    const options = {
-      from: fromAddress
-    };
-    const instance = api.newContract(eip20, selectedToken.address).instance;
-
-    this.setState({ sendBusy: true, sendState: 'Estimating gas for the transaction' });
-
-    instance
-      .transfer.estimateGas(options, values)
-      .then((gas) => {
-        this.setState({ sendState: 'Gas estimated, Posting transaction to the network' });
-
-        const gasPassed = gas.mul(1.2);
-
-        options.gas = gasPassed.toFixed(0);
-        console.log(`gas estimated at ${gas.toFormat(0)}, passing ${gasPassed.toFormat(0)}`);
-
-        return instance.transfer.postTransaction(options, values);
-      })
-      .then((signerRequestId) => {
-        this.setState({ signerRequestId, sendState: 'Transaction posted, Waiting for transaction authorization' });
-
-        return api.pollMethod('parity_checkRequest', signerRequestId);
-      })
-      .then((txHash) => {
-        this.setState({ txHash, sendState: 'Transaction authorized, Waiting for network confirmations' });
-
-        return api.pollMethod('eth_getTransactionReceipt', txHash, (receipt) => {
-          if (!receipt || !receipt.blockNumber || receipt.blockNumber.eq(0)) {
-            return false;
-          }
-
-          return true;
-        });
-      })
-      .then((txReceipt) => {
-        this.setState({ txReceipt, sendDone: true, sendState: 'Network confirmed, Received transaction receipt' });
-      })
-      .catch((error) => {
-        console.error('onSend', error);
-        this.setState({ sendError: error.message });
-      });
-  }
-
-  loadBalances () {
-    const { accounts } = this.context;
-    const addresses = Object.keys(accounts);
-
-    loadBalances(addresses)
-      .then((_tokens) => {
-        const tokens = _tokens.filter((token) => {
-          for (let index = 0; index < token.balances.length; index++) {
-            if (token.balances[index].balance.gt(0)) {
-              return true;
-            }
-          }
-
-          return false;
-        });
-
-        this.setState({ tokens, loading: false });
-
-        if (tokens.length > 0) {
-          this.onSelectToken({ target: { value: tokens[0].address } });
-        }
-      });
-  }
-}
diff --git a/js/src/dapps/tokendeploy/Transfer/index.js b/js/src/dapps/tokendeploy/Transfer/index.js
deleted file mode 100644
index e366ead6d02bb22bff53dfe84447dc5d1ae485b6..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Transfer/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './transfer';
diff --git a/js/src/dapps/tokendeploy/Transfer/transfer.js b/js/src/dapps/tokendeploy/Transfer/transfer.js
deleted file mode 100644
index 2c5fc03082280a5a1546b643b905c1ddbecb1f84..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/Transfer/transfer.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import Events from './Events';
-import Send from './Send';
-
-export default class Transfer extends Component {
-  render () {
-    return (
-      <div>
-        <Send />
-        <Events />
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/tokendeploy/_form.css b/js/src/dapps/tokendeploy/_form.css
deleted file mode 100644
index 13e127276ca6d9e488f1273fe0875fb89dc0ada2..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/_form.css
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.button {
-  background: #622;
-}
-
-.form {
-  text-align: left;
-  margin: 0 auto;
-  display: inline-block;
-}
-
-.form .input {
-  align-items: center;
-  display: flex;
-  flex-wrap: wrap;
-  margin-bottom: 1.5em;
-}
-
-.form .input * {
-  display: inline-block;
-  margin: 0 0.5em;
-  font-size: 1em;
-}
-
-.form .input label {
-  width: 25em;
-  opacity: 0.8;
-  text-align: right;
-}
-
-.form .hint {
-  width: 25em;
-  opacity: 0.5;
-}
-
-.form .input input,
-.form .input select {
-  width: 18em;
-  color: #444;
-  background: rgba(255, 255, 255, 0.75);
-  border-radius: 1px;
-  border: 1px solid rgba(0, 0, 0, 0.25);
-  box-sizing: border-box;
-  -moz-appearance: none;
-  -webkit-appearance: none;
-  appearance: none;
-  padding: 0.5em;
-}
-
-.form select {
-  height: 36px;
-}
-
-.form input.small {
-  width: 9em;
-  margin-right: 9.5em;
-}
-
-.form .error input {
-  border: 1px solid rgba(255, 0, 0, 0.5);
-  color: red;
-  background: rgba(255, 0, 0, 0.1);
-}
-
-.form .error label {
-  color: red;
-}
-
-.form .error .hint {
-  color: red;
-}
-
-.buttonRow {
-  text-align: right;
-  width: 18em;
-}
-
-.button {
-  color: white;
-  border: none;
-  border-radius: 1px;
-  padding: 1em 2em !important;
-  display: inline-block;
-  margin-left: 1em !important;
-  cursor: pointer;
-  position: relative;
-}
-
-.button[disabled] {
-  opacity: 0.5;
-  cursor: default;
-}
diff --git a/js/src/dapps/tokendeploy/_status.css b/js/src/dapps/tokendeploy/_status.css
deleted file mode 100644
index 2d93e1c0a5d95911533976ec3e9457392d9017fd..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/_status.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.statusHeader {
-  font-size: 1.25em;
-  margin-bottom: 1.25em;
-  opacity: 0.75;
-}
-
-.statusInfo {
-  margin-bottom: 0.25em;
-}
-
-.statusState {
-  opacity: 0.75;
-  margin-top: 1em;
-}
-
-.statusError {
-  color: red;
-  margin-top: 1em;
-}
diff --git a/js/src/dapps/tokendeploy/background.jpg b/js/src/dapps/tokendeploy/background.jpg
deleted file mode 100644
index c873064f581cff2718a31fd1dad77e11651a679c..0000000000000000000000000000000000000000
Binary files a/js/src/dapps/tokendeploy/background.jpg and /dev/null differ
diff --git a/js/src/dapps/tokendeploy/parity.js b/js/src/dapps/tokendeploy/parity.js
deleted file mode 100644
index 6c861780a9a34ae4e4e9d87b6b390b727a1a480f..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/parity.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const { api } = window.parity;
-
-export {
-  api
-};
diff --git a/js/src/dapps/tokendeploy/services.js b/js/src/dapps/tokendeploy/services.js
deleted file mode 100644
index 6cfeff05f7635d4cf784eeb132f438a078b6237f..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokendeploy/services.js
+++ /dev/null
@@ -1,293 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import { url as etherscanUrl } from '~/3rdparty/etherscan/links';
-import * as abis from '~/contracts/abi';
-import { api } from './parity';
-
-let managerInstance;
-let tokenregInstance;
-let registryInstance;
-
-const registries = {};
-const subscriptions = {};
-
-let defaultSubscriptionId;
-let nextSubscriptionId = 1000;
-let netVersion = '0';
-
-export function subscribeEvents (addresses, callback) {
-  const subscriptionId = nextSubscriptionId++;
-  const contract = api.newContract(abis.eip20);
-  const event = contract.events.filter((evt) => evt.name === 'Transfer');
-  const options = {
-    address: addresses,
-    fromBlock: 0,
-    toBlock: 'pending',
-    limit: 50,
-    topics: [event.signature]
-  };
-
-  return api.eth
-    .newFilter(options)
-    .then((filterId) => {
-      subscriptions[subscriptionId] = { subscriptionId, filterId, addresses, callback, contract };
-
-      return api.eth.getFilterLogs(filterId);
-    })
-    .then((logs) => callback(null, contract.parseEventLogs(logs)))
-    .then(() => subscriptionId)
-    .catch((error) => {
-      console.error('subscribeEvents', error);
-      throw error;
-    });
-}
-
-export function unsubscribeEvents (subscriptionId) {
-  api.eth
-    .uninstallFilter(subscriptions[subscriptionId].filterId)
-    .catch((error) => {
-      console.error('unsubscribeEvents', error);
-    });
-
-  delete subscriptions[subscriptionId];
-}
-
-export function subscribeDefaultAddress (callback) {
-  return api
-    .subscribe('parity_defaultAccount', callback)
-    .then((subscriptionId) => {
-      defaultSubscriptionId = subscriptionId;
-
-      return defaultSubscriptionId;
-    });
-}
-
-export function unsubscribeDefaultAddress () {
-  return api.unsubscribe(defaultSubscriptionId);
-}
-
-function pollEvents () {
-  const loop = Object.values(subscriptions);
-  const timeout = () => setTimeout(pollEvents, 1000);
-
-  Promise
-    .all(loop.map((subscription) => api.eth.getFilterChanges(subscription.filterId)))
-    .then((logsArray) => {
-      logsArray.forEach((logs, index) => {
-        const subscription = loop[index];
-
-        if (!logs || !logs.length) {
-          return;
-        }
-
-        try {
-          subscription.callback(null, subscription.contract.parseEventLogs(logs));
-        } catch (error) {
-          unsubscribeEvents(loop.subscriptionId);
-          console.error('pollEvents', error);
-        }
-      });
-
-      timeout();
-    })
-    .catch((error) => {
-      console.error('pollEvents', error);
-      timeout();
-    });
-}
-
-export function attachInstances () {
-  pollEvents();
-
-  return Promise
-    .all([
-      api.parity.registryAddress(),
-      api.parity.netChain(),
-      api.net.version()
-    ])
-    .then(([registryAddress, netChain, _netVersion]) => {
-      const registry = api.newContract(abis.registry, registryAddress).instance;
-
-      netVersion = _netVersion;
-
-      console.log(`contract was found at registry=${registryAddress}`);
-      console.log(`running on ${netChain}, network ${netVersion}`);
-
-      return Promise
-        .all([
-          registry.getAddress.call({}, [api.util.sha3('basiccoinmgr'), 'A']),
-          registry.getAddress.call({}, [api.util.sha3('basiccoinreg'), 'A']),
-          registry.getAddress.call({}, [api.util.sha3('tokenreg'), 'A'])
-        ]);
-    })
-    .then(([managerAddress, registryAddress, tokenregAddress]) => {
-      console.log(`contracts were found at basiccoinmgr=${managerAddress}, basiccoinreg=${registryAddress}, tokenreg=${tokenregAddress}`);
-
-      managerInstance = api.newContract(abis.basiccoinmanager, managerAddress).instance;
-      registryInstance = api.newContract(abis.tokenreg, registryAddress).instance;
-      tokenregInstance = api.newContract(abis.tokenreg, tokenregAddress).instance;
-
-      registries[registryInstance.address] = registryInstance;
-      registries[tokenregInstance.address] = tokenregInstance;
-
-      return {
-        managerInstance,
-        registryInstance,
-        tokenregInstance
-      };
-    })
-    .catch((error) => {
-      console.error('attachInstances', error);
-      throw error;
-    });
-}
-
-export function totalSupply (address) {
-  return api.newContract(abis.eip20, address)
-    .instance.totalSupply.call();
-}
-
-export function getCoin (tokenreg, address) {
-  return registries[tokenreg].fromAddress
-    .call({}, [address])
-    .then(([id, tla, base, name, owner]) => {
-      return {
-        id, tla, base, name, owner,
-        isGlobal: tokenregInstance.address === tokenreg
-      };
-    })
-    .catch((error) => {
-      console.error('getCoin', error);
-      throw error;
-    });
-}
-
-export function loadOwnedTokens (addresses) {
-  let total = new BigNumber(0);
-
-  return Promise
-    .all(
-      addresses.map((address) => managerInstance.countByOwner.call({}, [address]))
-    )
-    .then((counts) => {
-      return Promise.all(
-        addresses.reduce((promises, address, index) => {
-          total = counts[index].add(total);
-          for (let i = 0; counts[index].gt(i); i++) {
-            promises.push(managerInstance.getByOwner.call({}, [address, i]));
-          }
-          return promises;
-        }, [])
-      );
-    })
-    .then((_tokens) => {
-      const tokens = _tokens.reduce((tokens, token) => {
-        const [address, owner, tokenreg] = token;
-
-        tokens[owner] = tokens[owner] || [];
-        tokens[owner].push({ address, owner, tokenreg });
-        return tokens;
-      }, {});
-
-      return { tokens, total };
-    })
-    .catch((error) => {
-      console.error('loadTokens', error);
-      throw error;
-    });
-}
-
-export function loadAllTokens () {
-  return managerInstance
-    .count.call()
-    .then((count) => {
-      const promises = [];
-
-      for (let index = 0; count.gt(index); index++) {
-        promises.push(managerInstance.get.call({}, [index]));
-      }
-
-      return Promise.all(promises);
-    })
-    .then((_tokens) => {
-      const tokens = [];
-
-      return Promise
-        .all(
-          _tokens.map(([address, owner, tokenreg]) => {
-            const isGlobal = tokenreg === tokenregInstance.address;
-
-            tokens.push({ address, owner, tokenreg, isGlobal });
-            return registries[tokenreg].fromAddress.call({}, [address]);
-          })
-        )
-        .then((coins) => {
-          return tokens.map((token, index) => {
-            const [id, tla, base, name, owner] = coins[index];
-
-            token.coin = { id, tla, base, name, owner };
-            return token;
-          });
-        });
-    })
-    .catch((error) => {
-      console.log('loadAllTokens', error);
-      throw error;
-    });
-}
-
-export function loadBalances (addresses) {
-  return loadAllTokens()
-    .then((tokens) => {
-      return Promise.all(
-        tokens.map((token) => {
-          return Promise.all(
-            addresses.map((address) => loadTokenBalance(token.address, address))
-          );
-        })
-      )
-      .then((_balances) => {
-        return tokens.map((token, tindex) => {
-          const balances = _balances[tindex];
-
-          token.balances = addresses.map((address, aindex) => {
-            return { address, balance: balances[aindex] };
-          });
-          return token;
-        });
-      });
-    })
-    .catch((error) => {
-      console.error('loadBalances', error);
-      throw error;
-    });
-}
-
-export function loadTokenBalance (tokenAddress, address) {
-  return api.newContract(abis.eip20, tokenAddress).instance
-    .balanceOf.call({}, [address])
-    .catch((error) => {
-      console.error('loadTokenBalance', error);
-      throw error;
-    });
-}
-
-export function txLink (txHash) {
-  return `https://${etherscanUrl(false, netVersion)}/tx/${txHash}`;
-}
diff --git a/js/src/dapps/tokenreg.js b/js/src/dapps/tokenreg.js
deleted file mode 100644
index 3e8dc9b1942da48db36d3103c554f92dff740108..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ReactDOM from 'react-dom';
-import React from 'react';
-import { Provider } from 'react-redux';
-import { AppContainer } from 'react-hot-loader';
-
-import injectTapEventPlugin from 'react-tap-event-plugin';
-injectTapEventPlugin();
-
-import store from './tokenreg/store';
-import Container from './tokenreg/Container';
-
-import '../../assets/fonts/Roboto/font.css';
-import '../../assets/fonts/RobotoMono/font.css';
-import './style.css';
-
-ReactDOM.render(
-  <AppContainer>
-    <Provider store={ store }>
-      <Container />
-    </Provider>
-  </AppContainer>,
-  document.querySelector('#container')
-);
-
-if (module.hot) {
-  module.hot.accept('./tokenreg/Container.js', () => {
-    require('./tokenreg/Container.js');
-
-    ReactDOM.render(
-      <AppContainer>
-        <Provider store={ store }>
-          <Container />
-        </Provider>
-      </AppContainer>,
-      document.querySelector('#container')
-    );
-  });
-}
diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.css b/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.css
deleted file mode 100644
index 85f57699bdc301ab960750124a79abe0edc57cc8..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.account-selector {
-}
-
-.avatar > img {
-  margin: 0;
-  width: 100%;
-  height: 100%;
-}
diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js b/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js
deleted file mode 100644
index cd568f2ed78f725dac6854a2f573eba6b88624c8..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { List, ListItem } from 'material-ui/List';
-import Subheader from 'material-ui/Subheader';
-import Avatar from 'material-ui/Avatar';
-
-import IdentityIcon from '../../IdentityIcon';
-
-import styles from './account-selector.css';
-
-class AccountSelectorItem extends Component {
-  static propTypes = {
-    onSelectAccount: PropTypes.func.isRequired,
-    account: PropTypes.object.isRequired
-  };
-
-  render () {
-    const account = this.props.account;
-
-    const props = Object.assign({}, this.props);
-
-    delete props.account;
-    delete props.onSelectAccount;
-
-    const icon = (
-      <IdentityIcon
-        inline center
-        address={ account.address }
-      />
-    );
-
-    const avatar = (
-      <Avatar
-        className={ styles.avatar }
-        backgroundColor='none'
-        icon={ icon }
-      />
-    );
-
-    return (
-      <ListItem
-        onClick={ this.onSelectAccount }
-        value={ account.address }
-        primaryText={ account.name }
-        secondaryText={ account.address }
-        leftAvatar={ avatar }
-        { ...props }
-      />
-    );
-  }
-
-  onSelectAccount = () => {
-    this.props.onSelectAccount(this.props.account.address);
-  }
-}
-
-export default class AccountSelector extends Component {
-  static propTypes = {
-    list: PropTypes.array.isRequired,
-    selected: PropTypes.object.isRequired,
-    handleSetSelected: PropTypes.func.isRequired,
-    onAccountChange: PropTypes.func
-  };
-
-  state = {
-    open: false
-  };
-
-  render () {
-    const nestedAccounts = this.renderAccounts(this.props.list);
-    const selectedAccount = (
-      <AccountSelectorItem
-        account={ this.props.selected }
-        nestedItems={ nestedAccounts }
-        open={ this.state.open }
-        onSelectAccount={ this.onToggleOpen }
-        autoGenerateNestedIndicator={ false }
-        nestedListStyle={ { maxHeight: '14em', overflow: 'auto' } }
-      />
-    );
-
-    return (
-      <div className={ styles['account-selector'] }>
-        <List>
-          <Subheader>Select an account</Subheader>
-          { selectedAccount }
-        </List>
-      </div>
-    );
-  }
-
-  renderAccounts (accounts) {
-    return accounts
-      .map((account, index) => (
-        <AccountSelectorItem
-          account={ account }
-          onSelectAccount={ this.onSelectAccount }
-          key={ index }
-        />
-      ));
-  }
-
-  onToggleOpen = () => {
-    this.setState({ open: !this.state.open });
-
-    if (typeof this.props.onAccountChange === 'function') {
-      this.props.onAccountChange();
-    }
-  }
-
-  onSelectAccount = (address) => {
-    this.props.handleSetSelected(address);
-    this.onToggleOpen();
-  }
-}
diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js b/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js
deleted file mode 100644
index 2ad420478e47b7732ae31e260d5463cf233d5aaf..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-
-import AccountSelector from './account-selector';
-
-import { setSelectedAccount } from '../actions';
-
-class AccountSelectorContainer extends Component {
-  render () {
-    return (
-      <AccountSelector
-        { ...this.props }
-      />
-    );
-  }
-}
-
-const mapStateToProps = (state) => {
-  const { accounts } = state;
-
-  return { ...accounts };
-};
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    handleSetSelected: (address) => {
-      dispatch(setSelectedAccount(address));
-    }
-  };
-};
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(AccountSelectorContainer);
diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/index.js b/js/src/dapps/tokenreg/Accounts/AccountSelector/index.js
deleted file mode 100644
index 0deedaecc7762f78d94ef12f5d7fdeb29d22ac95..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Accounts/AccountSelector/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './container';
diff --git a/js/src/dapps/tokenreg/Accounts/actions.js b/js/src/dapps/tokenreg/Accounts/actions.js
deleted file mode 100644
index 538f1a831c19d20ea0777752bede5dada10fb721..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Accounts/actions.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { api } from '../parity';
-
-export const SET_ACCOUNTS = 'SET_ACCOUNTS';
-export const setAccounts = (accounts) => ({
-  type: SET_ACCOUNTS,
-  accounts
-});
-
-export const SET_ACCOUNTS_INFO = 'SET_ACCOUNTS_INFO';
-export const setAccountsInfo = (accountsInfo) => ({
-  type: SET_ACCOUNTS_INFO,
-  accountsInfo
-});
-
-export const SET_SELECTED_ACCOUNT = 'SET_SELECTED_ACCOUNT';
-export const setSelectedAccount = (address) => ({
-  type: SET_SELECTED_ACCOUNT,
-  address
-});
-
-export const loadAccounts = () => (dispatch) => {
-  api.parity
-    .accountsInfo()
-    .then((accountsInfo) => {
-      const accountsList = Object
-        .keys(accountsInfo)
-        .map((address) => ({
-          ...accountsInfo[address],
-          address
-        }));
-
-      dispatch(setAccounts(accountsList));
-      dispatch(setAccountsInfo(accountsInfo));
-      dispatch(setSelectedAccount(accountsList[0].address));
-    })
-    .catch(e => {
-      console.error('loadAccounts error', e);
-    });
-};
diff --git a/js/src/dapps/tokenreg/Accounts/reducer.js b/js/src/dapps/tokenreg/Accounts/reducer.js
deleted file mode 100644
index 06a0cae920e589de5c26b0de9acf5a52aa67a99a..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Accounts/reducer.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import {
-  SET_ACCOUNTS,
-  SET_SELECTED_ACCOUNT,
-  SET_ACCOUNTS_INFO
-} from './actions';
-
-const initialState = {
-  list: [],
-  accountsInfo: {},
-  selected: null
-};
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-    case SET_ACCOUNTS:
-      return {
-        ...state,
-        list: [].concat(action.accounts)
-      };
-
-    case SET_ACCOUNTS_INFO:
-      return {
-        ...state,
-        accountsInfo: { ...action.accountsInfo }
-      };
-
-    case SET_SELECTED_ACCOUNT: {
-      const address = action.address;
-      const account = state.list.find(a => a.address === address);
-
-      return {
-        ...state,
-        selected: account
-      };
-    }
-
-    default:
-      return state;
-  }
-};
-
diff --git a/js/src/dapps/tokenreg/Actions/Query/index.js b/js/src/dapps/tokenreg/Actions/Query/index.js
deleted file mode 100644
index a0bf54b4b2ce57e0f00a6835e55a0328b4c0e7d4..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Actions/Query/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './query';
diff --git a/js/src/dapps/tokenreg/Actions/Query/query.js b/js/src/dapps/tokenreg/Actions/Query/query.js
deleted file mode 100644
index 60166b66d7717380e3aadea1f12d7f6c17ecda38..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Actions/Query/query.js
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { Dialog, FlatButton, SelectField, MenuItem } from 'material-ui';
-
-import InputText from '../../Inputs/Text';
-import Loading from '../../Loading';
-import Token from '../../Tokens/Token';
-
-import { SIMPLE_TOKEN_ADDRESS_TYPE, SIMPLE_TLA_TYPE } from '../../Inputs/validation';
-
-import styles from '../actions.css';
-
-const initState = {
-  queryKey: 'tla',
-  form: {
-    valid: false,
-    value: ''
-  }
-};
-
-export default class QueryAction extends Component {
-  static propTypes = {
-    show: PropTypes.bool.isRequired,
-    loading: PropTypes.bool.isRequired,
-
-    onClose: PropTypes.func.isRequired,
-    handleQueryToken: PropTypes.func.isRequired,
-
-    data: PropTypes.object,
-    notFound: PropTypes.bool
-  }
-
-  state = initState;
-
-  render () {
-    return (
-      <Dialog
-        title={ 'search for a token' }
-        open={ this.props.show }
-        className={ styles.dialog }
-        onRequestClose={ this.onClose }
-        actions={ this.renderActions() }
-      >
-        { this.renderContent() }
-      </Dialog>
-    );
-  }
-
-  renderActions () {
-    const { loading, data, notFound } = this.props;
-
-    if (loading) {
-      return (
-        <FlatButton
-          label='Loading...'
-          primary
-          disabled
-        />
-      );
-    }
-
-    const complete = data || notFound;
-
-    if (complete) {
-      return ([
-        <FlatButton
-          label='Close'
-          primary
-          onTouchTap={ this.onClose }
-        />
-      ]);
-    }
-
-    const isValid = this.state.form.valid;
-
-    return ([
-      <FlatButton
-        label='Cancel'
-        primary
-        onTouchTap={ this.onClose }
-      />,
-      <FlatButton
-        label='Query'
-        primary
-        disabled={ !isValid }
-        onTouchTap={ this.onQuery }
-      />
-    ]);
-  }
-
-  renderContent () {
-    const { loading, notFound, data } = this.props;
-
-    if (loading) {
-      return (
-        <Loading size={ 1 } />
-      );
-    }
-
-    if (notFound) {
-      return (
-        <p>No token has been found in the registry...</p>
-      );
-    }
-
-    if (data) {
-      return this.renderData();
-    }
-
-    return this.renderForm();
-  }
-
-  renderData () {
-    const { data } = this.props;
-
-    return (
-      <Token
-        fullWidth
-        tla={ data.tla }
-      />
-    );
-  }
-
-  renderForm () {
-    return (
-      <div>
-        <SelectField
-          floatingLabelText='Select which field to query'
-          fullWidth
-          value={ this.state.queryKey }
-          onChange={ this.onQueryKeyChange }
-        >
-          <MenuItem value='tla' label='TLA' primaryText='TLA' />
-          <MenuItem value='address' label='Address' primaryText='Address' />
-        </SelectField>
-
-        {
-          this.state.queryKey !== 'tla'
-          ? (
-            <InputText
-              key={ 0 }
-
-              floatingLabelText="Token's address"
-              hintText='0xdeadbeef...'
-
-              validationType={ SIMPLE_TOKEN_ADDRESS_TYPE }
-              onChange={ this.onChange }
-              onEnter={ this.onQuery }
-            />
-          )
-          : (
-            <InputText
-              key={ 1 }
-
-              floatingLabelText="Token's TLA"
-              hintText='GAV'
-
-              validationType={ SIMPLE_TLA_TYPE }
-              onChange={ this.onChange }
-              onEnter={ this.onQuery }
-            />
-          )
-        }
-      </div>
-    );
-  }
-
-  onQueryKeyChange = (event, index, queryKey) => {
-    this.setState({
-      queryKey,
-      form: {
-        valid: false,
-        value: ''
-      }
-    });
-  }
-
-  onChange = (valid, value) => {
-    this.setState({
-      form: {
-        valid,
-        value
-      }
-    });
-  }
-
-  onQuery = () => {
-    if (!this.state.form.valid) {
-      return;
-    }
-
-    const { queryKey, form } = this.state;
-
-    this.props.handleQueryToken(queryKey, form.value);
-  }
-
-  onClose = () => {
-    this.setState(initState);
-    this.props.onClose();
-  }
-}
diff --git a/js/src/dapps/tokenreg/Actions/Register/index.js b/js/src/dapps/tokenreg/Actions/Register/index.js
deleted file mode 100644
index a13b62779208565d3c3605fd5ba6a435e6417798..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Actions/Register/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './register';
diff --git a/js/src/dapps/tokenreg/Actions/Register/register.js b/js/src/dapps/tokenreg/Actions/Register/register.js
deleted file mode 100644
index 4c9ca212b22868d13a44aad080a5f5c8841b90cd..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Actions/Register/register.js
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { Dialog, FlatButton } from 'material-ui';
-
-import AccountSelector from '../../Accounts/AccountSelector';
-import InputText from '../../Inputs/Text';
-
-import { TOKEN_ADDRESS_TYPE, TLA_TYPE, DECIMAL_TYPE, STRING_TYPE } from '../../Inputs/validation';
-
-import styles from '../actions.css';
-
-const defaultField = { value: '', valid: false };
-const initState = {
-  isFormValid: false,
-  fields: {
-    address: {
-      ...defaultField,
-      type: TOKEN_ADDRESS_TYPE,
-      floatingLabelText: 'Token address',
-      hintText: 'The token address'
-    },
-    tla: {
-      ...defaultField,
-      type: TLA_TYPE,
-      floatingLabelText: 'Token TLA',
-      hintText: 'The token short name (3 characters)'
-    },
-    decimals: {
-      ...defaultField,
-      type: DECIMAL_TYPE,
-      floatingLabelText: 'Token Decimals',
-      hintText: 'The number of decimals (0-18)'
-    },
-    name: {
-      ...defaultField,
-      type: STRING_TYPE,
-      floatingLabelText: 'Token name',
-      hintText: 'The token name'
-    }
-  }
-};
-
-export default class RegisterAction extends Component {
-  static propTypes = {
-    show: PropTypes.bool.isRequired,
-    sending: PropTypes.bool.isRequired,
-    complete: PropTypes.bool.isRequired,
-    onClose: PropTypes.func.isRequired,
-    handleRegisterToken: PropTypes.func.isRequired,
-
-    error: PropTypes.object
-  }
-
-  state = initState;
-
-  render () {
-    const { sending, error, complete } = this.props;
-
-    return (
-      <Dialog
-        title={ error ? 'error' : 'register a new token' }
-        open={ this.props.show }
-        modal={ sending || complete }
-        className={ styles.dialog }
-        onRequestClose={ this.onClose }
-        actions={ this.renderActions() }
-        ref='dialog'
-        autoScrollBodyContent
-      >
-        { this.renderContent() }
-      </Dialog>
-    );
-  }
-
-  renderActions () {
-    const { complete, sending, error } = this.props;
-
-    if (error) {
-      return (
-        <FlatButton
-          label='Close'
-          primary
-          onTouchTap={ this.onClose }
-        />
-      );
-    }
-
-    if (complete) {
-      return (
-        <FlatButton
-          label='Done'
-          primary
-          onTouchTap={ this.onClose }
-        />
-      );
-    }
-
-    const isValid = this.state.isFormValid;
-
-    return ([
-      <FlatButton
-        label='Cancel'
-        primary
-        onTouchTap={ this.onClose }
-      />,
-      <FlatButton
-        label={ sending ? 'Sending...' : 'Register' }
-        primary
-        disabled={ !isValid || sending }
-        onTouchTap={ this.onRegister }
-      />
-    ]);
-  }
-
-  renderContent () {
-    const { error, complete } = this.props;
-
-    if (error) {
-      return this.renderError();
-    } else if (complete) {
-      return this.renderComplete();
-    }
-
-    return this.renderForm();
-  }
-
-  renderError () {
-    const { error } = this.props;
-
-    return (<div>
-      <p className={ styles.error }>{ error.toString() }</p>
-    </div>);
-  }
-
-  renderComplete () {
-    return (<div>
-      <p>Your transaction has been posted. Please visit the Parity Signer to authenticate the transfer.</p>
-    </div>);
-  }
-
-  renderForm () {
-    return (
-      <div>
-        <AccountSelector
-          onAccountChange={ this.onAccountChange }
-        />
-        { this.renderInputs() }
-      </div>
-    );
-  }
-
-  renderInputs () {
-    const { fields } = this.state;
-
-    return Object.keys(fields).map((fieldKey, index) => {
-      const onChange = this.onChange.bind(this, fieldKey);
-      const field = fields[fieldKey];
-
-      return (
-        <InputText
-          key={ index }
-
-          floatingLabelText={ field.floatingLabelText }
-          hintText={ field.hintText }
-
-          validationType={ field.type }
-          onChange={ onChange }
-        />
-      );
-    });
-  }
-
-  onAccountChange = () => {
-    const { dialog } = this.refs;
-
-    dialog.forceUpdate();
-  }
-
-  onChange (fieldKey, valid, value) {
-    const { fields } = this.state;
-    const field = fields[fieldKey];
-
-    const newFields = {
-      ...fields,
-      [ fieldKey ]: {
-        ...field,
-        valid, value
-      }
-    };
-
-    const isFormValid = Object.keys(newFields)
-      .map(key => newFields[key].valid)
-      .reduce((current, fieldValid) => {
-        return current && fieldValid;
-      }, true);
-
-    this.setState({
-      fields: newFields,
-      isFormValid
-    });
-  }
-
-  onRegister = () => {
-    const { fields } = this.state;
-
-    const data = Object.keys(fields)
-      .reduce((dataObject, fieldKey) => {
-        dataObject[fieldKey] = fields[fieldKey].value;
-        return dataObject;
-      }, {});
-
-    this.props.handleRegisterToken(data);
-  }
-
-  onClose = () => {
-    this.setState(initState);
-    this.props.onClose();
-  }
-}
diff --git a/js/src/dapps/tokenreg/Actions/actions.css b/js/src/dapps/tokenreg/Actions/actions.css
deleted file mode 100644
index aa6fb8d18a99b71f2feb78ce8d80c0b2bf6d586c..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Actions/actions.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.actions {
-  padding-top: 2rem;
-}
-
-.button {
-  margin: 0 0.5em;
-}
-
-.button button {
-  background-color: #27ae60 !important;
-  height: 56px !important;
-  padding: 0 10px !important;
-}
-
-.button button[disabled] {
-  background-color: rgba(50, 50, 50, 0.25) !important;
-}
-
-.dialog {
-}
-
-.dialog h3 {
-  color: rgba(50, 100, 150, 1) !important;
-  text-transform: uppercase;
-}
-
-.dialogtext {
-  padding-top: 1em;
-}
-
-.error {
-  color: red;
-}
diff --git a/js/src/dapps/tokenreg/Actions/actions.js b/js/src/dapps/tokenreg/Actions/actions.js
deleted file mode 100644
index b490e22fbc3fea44a7b5fac34b297b751bbf82ec..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Actions/actions.js
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { getTokenTotalSupply } from '../utils';
-
-export const SET_REGISTER_SENDING = 'SET_REGISTER_SENDING';
-export const setRegisterSending = (isSending) => ({
-  type: SET_REGISTER_SENDING,
-  isSending
-});
-
-export const SET_REGISTER_ERROR = 'SET_REGISTER_ERROR';
-export const setRegisterError = (e) => ({
-  type: SET_REGISTER_ERROR,
-  error: e
-});
-
-export const REGISTER_RESET = 'REGISTER_RESET';
-export const registerReset = () => ({
-  type: REGISTER_RESET
-});
-
-export const REGISTER_COMPLETED = 'REGISTER_COMPLETED';
-export const registerCompleted = () => ({
-  type: REGISTER_COMPLETED
-});
-
-export const registerToken = (tokenData) => (dispatch, getState) => {
-  const state = getState();
-  const contractInstance = state.status.contract.instance;
-  const fee = state.status.contract.fee;
-
-  const { address, decimals, name, tla } = tokenData;
-  const base = Math.pow(10, decimals);
-
-  dispatch(setRegisterSending(true));
-
-  const values = [ address, tla, base, name ];
-  const options = {
-    from: state.accounts.selected.address,
-    value: fee
-  };
-
-  Promise.resolve()
-    .then(() => {
-      return contractInstance
-        .fromTLA.call({}, [ tla ])
-        .then(([id, address, base, name, owner]) => {
-          if (owner !== '0x0000000000000000000000000000000000000000') {
-            throw new Error(`A Token has already been registered with the TLA ${tla}`);
-          }
-        });
-    })
-    .then(() => {
-      return contractInstance
-        .fromAddress.call({}, [ address ])
-        .then(([id, tla, base, name, owner]) => {
-          if (owner !== '0x0000000000000000000000000000000000000000') {
-            throw new Error(`A Token has already been registered with the Address ${address}`);
-          }
-        });
-    })
-    .then(() => {
-      return contractInstance
-        .register.estimateGas(options, values);
-    })
-    .then((gasEstimate) => {
-      options.gas = gasEstimate.mul(1.2).toFixed(0);
-      return contractInstance.register.postTransaction(options, values);
-    })
-    .then((result) => {
-      dispatch(registerCompleted());
-    })
-    .catch((e) => {
-      console.error('registerToken error', e);
-      dispatch(setRegisterError(e));
-    });
-};
-
-export const SET_QUERY_LOADING = 'SET_QUERY_LOADING';
-export const setQueryLoading = (isLoading) => ({
-  type: SET_QUERY_LOADING,
-  isLoading
-});
-
-export const SET_QUERY_RESULT = 'SET_QUERY_RESULT';
-export const setQueryResult = (data) => ({
-  type: SET_QUERY_RESULT,
-  data
-});
-
-export const SET_QUERY_NOT_FOUND = 'SET_QUERY_NOT_FOUND';
-export const setQueryNotFound = () => ({
-  type: SET_QUERY_NOT_FOUND
-});
-
-export const QUERY_RESET = 'QUERY_RESET';
-export const queryReset = () => ({
-  type: QUERY_RESET
-});
-
-export const SET_QUERY_META_LOADING = 'SET_QUERY_META_LOADING';
-export const setQueryMetaLoading = (isLoading) => ({
-  type: SET_QUERY_META_LOADING,
-  isLoading
-});
-
-export const SET_QUERY_META = 'SET_QUERY_META';
-export const setQueryMeta = (data) => ({
-  type: SET_QUERY_META,
-  data
-});
-
-export const queryToken = (key, query) => (dispatch, getState) => {
-  const state = getState();
-  const contractInstance = state.status.contract.instance;
-
-  const contractFunc = (key === 'tla') ? 'fromTLA' : 'fromAddress';
-
-  dispatch(setQueryLoading(true));
-
-  contractInstance[contractFunc]
-    .call({}, [ query ])
-    .then((result) => {
-      const data = {
-        index: result[0].toNumber(),
-        base: result[2].toNumber(),
-        name: result[3],
-        owner: result[4]
-      };
-
-      if (key === 'tla') {
-        data.tla = query;
-        data.address = result[1];
-      }
-
-      if (key === 'address') {
-        data.address = query;
-        data.tla = result[1];
-      }
-
-      return data;
-    })
-    .then(data => {
-      return getTokenTotalSupply(data.address)
-        .then(totalSupply => {
-          data.totalSupply = totalSupply;
-          return data;
-        });
-    })
-    .then(data => {
-      if (data.totalSupply === null) {
-        dispatch(setQueryNotFound());
-        dispatch(setQueryLoading(false));
-
-        return false;
-      }
-
-      data.totalSupply = data.totalSupply.toNumber();
-      dispatch(setQueryResult(data));
-      dispatch(setQueryLoading(false));
-    }, () => {
-      dispatch(setQueryNotFound());
-      dispatch(setQueryLoading(false));
-    });
-};
diff --git a/js/src/dapps/tokenreg/Actions/component.js b/js/src/dapps/tokenreg/Actions/component.js
deleted file mode 100644
index eb01efbaadc3fcdd3ca102d7a3548fb13f87813d..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Actions/component.js
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { RaisedButton } from 'material-ui';
-import ActionSearchIcon from 'material-ui/svg-icons/action/search';
-import ContentSendIcon from 'material-ui/svg-icons/content/send';
-
-import Register from './Register';
-import Query from './Query';
-
-import styles from './actions.css';
-
-const REGISTER_ACTION = 'REGISTER_ACTION';
-const QUERY_ACTION = 'QUERY_ACTION';
-
-export default class Actions extends Component {
-  static propTypes = {
-    handleRegisterToken: PropTypes.func.isRequired,
-    handleRegisterClose: PropTypes.func.isRequired,
-    register: PropTypes.object.isRequired,
-
-    handleQueryToken: PropTypes.func.isRequired,
-    handleQueryClose: PropTypes.func.isRequired,
-    query: PropTypes.object.isRequired
-  };
-
-  state = {
-    show: {
-      [ REGISTER_ACTION ]: false,
-      [ QUERY_ACTION ]: false
-    }
-  }
-
-  constructor () {
-    super();
-
-    this.onShowRegister = this.onShow.bind(this, REGISTER_ACTION);
-    this.onShowQuery = this.onShow.bind(this, QUERY_ACTION);
-  }
-
-  render () {
-    return (
-      <div className={ styles.actions }>
-        <RaisedButton
-          className={ styles.button }
-          icon={ <ContentSendIcon /> }
-          label='Register Token'
-          primary
-          onTouchTap={ this.onShowRegister }
-        />
-
-        <RaisedButton
-          className={ styles.button }
-          icon={ <ActionSearchIcon /> }
-          label='Search Token'
-          primary
-          onTouchTap={ this.onShowQuery }
-        />
-
-        <Register
-          show={ this.state.show[ REGISTER_ACTION ] }
-          onClose={ this.onRegisterClose }
-          handleRegisterToken={ this.props.handleRegisterToken }
-          { ...this.props.register }
-        />
-
-        <Query
-          show={ this.state.show[ QUERY_ACTION ] }
-          onClose={ this.onQueryClose }
-          handleQueryToken={ this.props.handleQueryToken }
-          { ...this.props.query }
-        />
-      </div>
-    );
-  }
-
-  onRegisterClose = () => {
-    this.onHide(REGISTER_ACTION);
-    this.props.handleRegisterClose();
-  }
-
-  onQueryClose = () => {
-    this.onHide(QUERY_ACTION);
-    this.props.handleQueryClose();
-  }
-
-  onShow (key) {
-    this.setState({
-      show: {
-        ...this.state.show,
-        [ key ]: true
-      }
-    });
-  }
-
-  onHide (key) {
-    this.setState({
-      show: {
-        ...this.state.show,
-        [ key ]: false
-      }
-    });
-  }
-}
diff --git a/js/src/dapps/tokenreg/Actions/container.js b/js/src/dapps/tokenreg/Actions/container.js
deleted file mode 100644
index c531af778a6d9ad0fd05596ad55d858a3185621b..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Actions/container.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-
-import Actions from './component';
-
-import { registerToken, registerReset, queryToken, queryReset } from './actions';
-
-class TokensContainer extends Component {
-  render () {
-    return (
-      <Actions
-        { ...this.props }
-      />
-    );
-  }
-}
-
-const mapStateToProps = (state) => {
-  const { register, query } = state.actions;
-
-  return { register, query };
-};
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    handleRegisterToken: (tokenData) => {
-      dispatch(registerToken(tokenData));
-    },
-    handleRegisterClose: () => {
-      dispatch(registerReset());
-    },
-    handleQueryToken: (key, query) => {
-      dispatch(queryToken(key, query));
-    },
-    handleQueryClose: () => {
-      dispatch(queryReset());
-    }
-  };
-};
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(TokensContainer);
diff --git a/js/src/dapps/tokenreg/Actions/index.js b/js/src/dapps/tokenreg/Actions/index.js
deleted file mode 100644
index 070a6080e1f3fe781153de210c23cafbaaa914ce..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Actions/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './container.js';
diff --git a/js/src/dapps/tokenreg/Actions/reducer.js b/js/src/dapps/tokenreg/Actions/reducer.js
deleted file mode 100644
index e052ac0274422b9d768138768433e56cd2630c82..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Actions/reducer.js
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import {
-  SET_REGISTER_SENDING,
-  SET_REGISTER_ERROR,
-  REGISTER_RESET,
-  REGISTER_COMPLETED,
-
-  SET_QUERY_LOADING,
-  SET_QUERY_RESULT,
-  SET_QUERY_NOT_FOUND,
-  SET_QUERY_META_LOADING,
-  SET_QUERY_META,
-  QUERY_RESET
-} from './actions';
-
-const initialState = {
-  register: {
-    sending: false,
-    error: null,
-    complete: false
-  },
-  query: {
-    loading: false,
-    data: null,
-    notFound: false,
-    metaLoading: false,
-    metaData: null
-  }
-};
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-    case SET_REGISTER_SENDING: {
-      const registerState = state.register;
-
-      return {
-        ...state,
-        register: {
-          ...registerState,
-          sending: action.isSending
-        }
-      };
-    }
-
-    case REGISTER_COMPLETED: {
-      const registerState = state.register;
-
-      return {
-        ...state,
-        register: {
-          ...registerState,
-          sending: false,
-          complete: true
-        }
-      };
-    }
-
-    case SET_REGISTER_ERROR: {
-      const registerState = state.register;
-
-      return {
-        ...state,
-        register: {
-          ...registerState,
-          sending: false,
-          error: action.error
-        }
-      };
-    }
-
-    case REGISTER_RESET: {
-      return {
-        ...state,
-        register: initialState.register
-      };
-    }
-
-    case SET_QUERY_LOADING: {
-      return {
-        ...state,
-        query: {
-          ...state.query,
-          loading: action.isLoading
-        }
-      };
-    }
-
-    case SET_QUERY_RESULT: {
-      return {
-        ...state,
-        query: {
-          ...state.query,
-          data: action.data
-        }
-      };
-    }
-
-    case SET_QUERY_NOT_FOUND: {
-      return {
-        ...state,
-        query: {
-          ...state.query,
-          notFound: true
-        }
-      };
-    }
-
-    case SET_QUERY_META_LOADING: {
-      return {
-        ...state,
-        query: {
-          ...state.query,
-          metaLoading: action.isLoading
-        }
-      };
-    }
-
-    case SET_QUERY_META: {
-      return {
-        ...state,
-        query: {
-          ...state.query,
-          metaData: action.data
-        }
-      };
-    }
-
-    case QUERY_RESET: {
-      return {
-        ...state,
-        query: {
-          ...initialState.query
-        }
-      };
-    }
-
-    default:
-      return state;
-  }
-};
diff --git a/js/src/dapps/tokenreg/Application/application.css b/js/src/dapps/tokenreg/Application/application.css
deleted file mode 100644
index b1eef22e45b3977c440165568b1dfe3c476c7558..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Application/application.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.application {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding-bottom: 10em;
-}
-
-.warning {
-  background: #f80;
-  bottom: 0;
-  color: #fff;
-  left: 0;
-  opacity: 1;
-  padding: 1.5em;
-  position: fixed;
-  right: 50%;
-  z-index: 100;
-}
diff --git a/js/src/dapps/tokenreg/Application/application.js b/js/src/dapps/tokenreg/Application/application.js
deleted file mode 100644
index 71081c7ee57a3a15d7a19d09dce8dc58c626b3f0..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Application/application.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import getMuiTheme from 'material-ui/styles/getMuiTheme';
-
-import { api } from '../parity';
-
-import Loading from '../Loading';
-import Status from '../Status';
-import Tokens from '../Tokens';
-import Actions from '../Actions';
-
-import styles from './application.css';
-
-const muiTheme = getMuiTheme({
-  palette: {
-    primary1Color: '#27ae60'
-  }
-});
-
-export default class Application extends Component {
-  static childContextTypes = {
-    muiTheme: PropTypes.object
-  }
-
-  static propTypes = {
-    isLoading: PropTypes.bool.isRequired,
-
-    contract: PropTypes.object
-  };
-
-  render () {
-    const { isLoading, contract } = this.props;
-
-    if (isLoading) {
-      return (
-        <Loading />
-      );
-    }
-
-    return (
-      <div className={ styles.application }>
-        <Status
-          address={ contract.address }
-          fee={ contract.fee }
-        />
-
-        <Actions />
-
-        <Tokens />
-        <div className={ styles.warning }>
-          WARNING: The token registry is experimental. Please ensure that you understand the steps, risks, benefits & consequences of registering a token before doing so. A non-refundable fee of { api.util.fromWei(contract.fee).toFormat(3) }<small>ETH</small> is required for all registrations.
-        </div>
-      </div>
-    );
-  }
-
-  getChildContext () {
-    return {
-      muiTheme
-    };
-  }
-}
diff --git a/js/src/dapps/tokenreg/Application/index.js b/js/src/dapps/tokenreg/Application/index.js
deleted file mode 100644
index 3d8d1ca3b851e5bfed73373e82eff06b5d9ea46c..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Application/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './application';
diff --git a/js/src/dapps/tokenreg/Chip/chip.css b/js/src/dapps/tokenreg/Chip/chip.css
deleted file mode 100644
index 955d6809f9f46e9c5877a7651a41d3d9815c2716..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Chip/chip.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.chip > span {
-  flex: 1;
-  display: flex;
-  flex-direction: row;
-}
-
-.chip img {
-  margin-bottom: -11px;
-  margin-left: -11px;
-}
-
-.value {
-  font-family: 'Roboto Mono', monospace;
-  color: rgba(255, 255, 255, 1);
-  -webkit-user-select: text;
-  cursor: text;
-  flex: 1;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.label {
-  color: rgba(255, 255, 255, 0.7);
-  margin-left: 1em;
-  margin-right: 0.5em;
-  text-transform: uppercase;
-}
diff --git a/js/src/dapps/tokenreg/Chip/chip.js b/js/src/dapps/tokenreg/Chip/chip.js
deleted file mode 100644
index 7c19a671caefe83ed90cf744ede22a943b8a8037..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Chip/chip.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { Chip } from 'material-ui';
-
-import IdentityIcon from '../IdentityIcon';
-
-import styles from './chip.css';
-
-export default class CustomChip extends Component {
-  static propTypes = {
-    value: PropTypes.string.isRequired,
-    label: PropTypes.string.isRequired,
-
-    isAddress: PropTypes.bool,
-    displayValue: PropTypes.string
-  };
-
-  render () {
-    const { isAddress, value, label } = this.props;
-
-    const displayValue = this.props.displayValue || value;
-
-    return (
-      <Chip
-        className={ styles.chip }
-        style={ {
-          margin: '0.5em',
-          background: '#27ae60',
-          display: 'flex',
-          flexDirection: 'column'
-        } }
-      >
-        { this.renderIcon(isAddress, value) }
-        <span className={ styles.value } title={ value }>
-          { displayValue }
-        </span>
-        <span className={ styles.label }>
-          { label }
-        </span>
-      </Chip>
-    );
-  }
-
-  renderIcon (isAddress, address) {
-    if (!isAddress) {
-      return;
-    }
-
-    return (
-      <IdentityIcon
-        inline center
-        address={ address }
-      />
-    );
-  }
-}
diff --git a/js/src/dapps/tokenreg/Chip/index.js b/js/src/dapps/tokenreg/Chip/index.js
deleted file mode 100644
index 2ce753c5f8986fca2ed8a8877f5b4b0d1b86322a..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Chip/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './chip';
diff --git a/js/src/dapps/tokenreg/Container.js b/js/src/dapps/tokenreg/Container.js
deleted file mode 100644
index 4eccaca86509e32c71578a9c28f5381082c81995..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Container.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import Application from './Application';
-
-import { loadContract } from './Status/actions';
-import { loadAccounts } from './Accounts/actions';
-
-class Container extends Component {
-  static propTypes = {
-    isLoading: PropTypes.bool.isRequired,
-    contract: PropTypes.object.isRequired,
-    onLoad: PropTypes.func.isRequired
-  };
-
-  componentDidMount () {
-    this.props.onLoad();
-  }
-
-  render () {
-    const { isLoading, contract } = this.props;
-
-    return (
-      <Application
-        isLoading={ isLoading }
-        contract={ contract }
-      />
-    );
-  }
-}
-
-const mapStateToProps = (state) => {
-  const { isLoading, contract } = state.status;
-
-  return {
-    isLoading,
-    contract
-  };
-};
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    onLoad: () => {
-      dispatch(loadContract());
-      dispatch(loadAccounts());
-    }
-  };
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Container);
diff --git a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.css b/js/src/dapps/tokenreg/IdentityIcon/identityIcon.css
deleted file mode 100644
index 7f748da520d316289049918cd01035261a3949a1..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.icon {
-  width: 32px;
-  height: 32px;
-  border-radius: 50%;
-  margin-right: 0.5em;
-}
diff --git a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js b/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js
deleted file mode 100644
index bbba1cb44298bf9bf8dac601e9fb5bf44c7dee08..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../parity';
-import styles from './identityIcon.css';
-
-export default class IdentityIcon extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired
-  }
-
-  render () {
-    const { address } = this.props;
-
-    return (
-      <img
-        className={ styles.icon }
-        src={ api.util.createIdentityImg(address, 4) }
-      />
-    );
-  }
-}
diff --git a/js/src/dapps/tokenreg/IdentityIcon/index.js b/js/src/dapps/tokenreg/IdentityIcon/index.js
deleted file mode 100644
index 09191356420c1b472cb6ed005a3e9af4a8adb151..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/IdentityIcon/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './identityIcon';
diff --git a/js/src/dapps/tokenreg/Inputs/Text/container.js b/js/src/dapps/tokenreg/Inputs/Text/container.js
deleted file mode 100644
index 43ec03939cb2b96891267ceab207bcd1a6ab68ec..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Inputs/Text/container.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-
-import InputText from './input-text';
-
-class InputTextContainer extends Component {
-  render () {
-    return (
-      <InputText
-        { ...this.props }
-      />
-    );
-  }
-}
-
-const mapStateToProps = (state) => {
-  const { contract } = state.status;
-
-  return { contract };
-};
-
-export default connect(mapStateToProps)(InputTextContainer);
diff --git a/js/src/dapps/tokenreg/Inputs/Text/index.js b/js/src/dapps/tokenreg/Inputs/Text/index.js
deleted file mode 100644
index 0deedaecc7762f78d94ef12f5d7fdeb29d22ac95..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Inputs/Text/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './container';
diff --git a/js/src/dapps/tokenreg/Inputs/Text/input-text.js b/js/src/dapps/tokenreg/Inputs/Text/input-text.js
deleted file mode 100644
index 0862c64434b792aafed5c021faf7e5ee78710d2e..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Inputs/Text/input-text.js
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { TextField } from 'material-ui';
-import CheckIcon from 'material-ui/svg-icons/navigation/check';
-import { green500 } from 'material-ui/styles/colors';
-
-import Loading from '../../Loading';
-
-import { validate } from '../validation';
-
-import styles from '../inputs.css';
-
-const initState = {
-  error: null,
-  value: '',
-  valid: false,
-  disabled: false,
-  loading: false
-};
-
-export default class InputText extends Component {
-  static propTypes = {
-    validationType: PropTypes.string.isRequired,
-    onChange: PropTypes.func.isRequired,
-    onEnter: PropTypes.func,
-
-    floatingLabelText: PropTypes.string,
-    hintText: PropTypes.string,
-
-    contract: PropTypes.object
-  }
-
-  state = initState;
-
-  render () {
-    const { disabled, error } = this.state;
-
-    return (
-      <div className={ styles['input-container'] }>
-        <TextField
-          floatingLabelText={ this.props.floatingLabelText }
-          hintText={ this.props.hintText }
-
-          autoComplete='off'
-          floatingLabelFixed
-          fullWidth
-          disabled={ disabled }
-          errorText={ error }
-          onChange={ this.onChange }
-          onKeyDown={ this.onKeyDown }
-        />
-
-        { this.renderLoading() }
-        { this.renderIsValid() }
-      </div>
-    );
-  }
-
-  renderLoading () {
-    if (!this.state.loading) {
-      return;
-    }
-
-    return (
-      <div className={ styles['input-loading'] }>
-        <Loading size={ 0.3 } />
-      </div>
-    );
-  }
-
-  renderIsValid () {
-    if (this.state.loading || !this.state.valid) {
-      return;
-    }
-
-    return (
-      <div className={ styles['input-icon'] }>
-        <CheckIcon color={ green500 } />
-      </div>
-    );
-  }
-
-  onChange = (event) => {
-    const value = event.target.value;
-
-    // So we can focus on the input after async validation
-    event.persist();
-
-    const { validationType, contract } = this.props;
-    const validation = validate(value, validationType, contract);
-
-    const loadingTimeout = setTimeout(() => {
-      this.setState({ disabled: true, loading: true });
-    }, 50);
-
-    return Promise.resolve(validation)
-      .then((validation) => {
-        clearTimeout(loadingTimeout);
-
-        this.setValidation({
-          ...validation,
-          disabled: false,
-          loading: false
-        });
-
-        event.target.focus();
-      });
-  }
-
-  onKeyDown = (event) => {
-    if (!this.props.onEnter) {
-      return;
-    }
-
-    if (event.keyCode !== 13) {
-      return;
-    }
-
-    this.props.onEnter();
-  }
-
-  setValidation = (validation) => {
-    const { value } = validation;
-
-    this.setState({ ...validation });
-
-    if (validation.valid) {
-      return this.props.onChange(true, value);
-    }
-
-    return this.props.onChange(false, value);
-  }
-}
diff --git a/js/src/dapps/tokenreg/Inputs/inputs.css b/js/src/dapps/tokenreg/Inputs/inputs.css
deleted file mode 100644
index 6aefe90e3eee2fb024f5565d71b8afcb17e0f8d5..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Inputs/inputs.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.input-container {
-  width: 100%;
-  position: relative;
-}
-
-.input-loading {
-  position: absolute;
-  right: -5px;
-  top: 20px;
-}
-
-.input-icon {
-  position: absolute;
-  right: 5px;
-  bottom: 10px;
-}
diff --git a/js/src/dapps/tokenreg/Inputs/validation.js b/js/src/dapps/tokenreg/Inputs/validation.js
deleted file mode 100644
index 4b2f1df1a4a9a8a1342fc0fe7d533e1240d06d91..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Inputs/validation.js
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import isURL from 'validator/lib/isURL';
-
-import { api } from '../parity';
-
-import { getTokenTotalSupply } from '../utils';
-
-const {
-  isHex,
-  isAddressValid,
-  toChecksumAddress
-} = api.util;
-
-export const ADDRESS_TYPE = 'ADDRESS_TYPE';
-export const TOKEN_ADDRESS_TYPE = 'TOKEN_ADDRESS_TYPE';
-export const SIMPLE_TOKEN_ADDRESS_TYPE = 'SIMPLE_TOKEN_ADDRESS_TYPE';
-export const TLA_TYPE = 'TLA_TYPE';
-export const SIMPLE_TLA_TYPE = 'SIMPLE_TLA_TYPE';
-export const UINT_TYPE = 'UINT_TYPE';
-export const DECIMAL_TYPE = 'DECIMAL_TYPE';
-export const STRING_TYPE = 'STRING_TYPE';
-export const HEX_TYPE = 'HEX_TYPE';
-export const URL_TYPE = 'URL_TYPE';
-
-export const ERRORS = {
-  invalidTLA: 'The TLA should be 3 characters long',
-  invalidUint: 'Please enter a non-negative integer',
-  invalidDecimal: 'Please enter a value between 0 and 18',
-  invalidString: 'Please enter at least a character',
-  invalidAccount: 'Please select an account to transact with',
-  invalidRecipient: 'Please select an account to send to',
-  invalidAddress: 'The address is not in the correct format',
-  invalidTokenAddress: 'The address is not a regular token contract address',
-  invalidHex: 'Please enter an hexadecimal string (digits and letters from a to z)',
-  invalidAmount: 'Please enter a positive amount > 0',
-  invalidTotal: 'The amount is greater than the availale balance',
-  tlaAlreadyTaken: 'This TLA address is already registered',
-  addressAlreadyTaken: 'This Token address is already registered',
-  invalidURL: 'Please enter a valid URL'
-};
-
-const validateAddress = (address) => {
-  if (!isAddressValid(address)) {
-    return {
-      error: ERRORS.invalidAddress,
-      valid: false
-    };
-  }
-
-  return {
-    value: toChecksumAddress(address),
-    error: null,
-    valid: true
-  };
-};
-
-const validateTokenAddress = (address, contract, simple) => {
-  const addressValidation = validateAddress(address);
-
-  if (!addressValidation.valid) {
-    return addressValidation;
-  }
-
-  if (simple) {
-    return addressValidation;
-  }
-
-  return getTokenTotalSupply(address)
-    .then(balance => {
-      if (balance === null || balance.equals(0)) {
-        return {
-          error: ERRORS.invalidTokenAddress,
-          valid: false
-        };
-      }
-
-      return contract.instance
-        .fromAddress.call({}, [ address ])
-        .then(([id, tla, base, name, owner]) => {
-          if (owner !== '0x0000000000000000000000000000000000000000') {
-            return {
-              error: ERRORS.addressAlreadyTaken,
-              valid: false
-            };
-          }
-        });
-    })
-    .then((result) => {
-      if (result) {
-        return result;
-      }
-
-      return addressValidation;
-    });
-};
-
-const validateTLA = (tla, contract, simple) => {
-  if (tla.toString().length !== 3) {
-    return {
-      error: ERRORS.invalidTLA,
-      valid: false
-    };
-  }
-
-  const fTLA = tla.toString().toUpperCase();
-
-  if (simple) {
-    return {
-      value: fTLA,
-      error: null,
-      valid: true
-    };
-  }
-
-  return contract.instance
-    .fromTLA.call({}, [ fTLA ])
-    .then(([id, address, base, name, owner]) => {
-      if (owner !== '0x0000000000000000000000000000000000000000') {
-        return {
-          error: ERRORS.tlaAlreadyTaken,
-          valid: false
-        };
-      }
-    })
-    .then((result) => {
-      if (result) {
-        return result;
-      }
-
-      return {
-        value: fTLA,
-        error: null,
-        valid: true
-      };
-    });
-};
-
-const validateUint = (uint) => {
-  if (!/^\d+$/.test(uint) || parseInt(uint) <= 0) {
-    return {
-      error: ERRORS.invalidUint,
-      valid: false
-    };
-  }
-
-  return {
-    value: parseInt(uint),
-    error: null,
-    valid: true
-  };
-};
-
-const validateDecimal = (decimal) => {
-  if (!/^\d+$/.test(decimal) || parseInt(decimal) < 0 || parseInt(decimal) > 18) {
-    return {
-      error: ERRORS.invalidDecimal,
-      valid: false
-    };
-  }
-
-  return {
-    value: parseInt(decimal),
-    error: null,
-    valid: true
-  };
-};
-
-const validateString = (string) => {
-  if (string.toString().length === 0) {
-    return {
-      error: ERRORS.invalidString,
-      valid: false
-    };
-  }
-
-  return {
-    value: string.toString(),
-    error: null,
-    valid: true
-  };
-};
-
-const validateHex = (string) => {
-  if (!isHex(string.toString())) {
-    return {
-      error: ERRORS.invalidHex,
-      valid: false
-    };
-  }
-
-  return {
-    value: string.toString(),
-    error: null,
-    valid: true
-  };
-};
-
-const validateURL = (string) => {
-  if (!isURL(string.toString())) {
-    return {
-      error: ERRORS.invalidURL,
-      valid: false
-    };
-  }
-
-  return {
-    value: string.toString(),
-    error: null,
-    valid: true
-  };
-};
-
-export const validate = (value, type, contract) => {
-  switch (type) {
-    case ADDRESS_TYPE:
-      return validateAddress(value);
-    case TOKEN_ADDRESS_TYPE:
-      return validateTokenAddress(value, contract);
-    case SIMPLE_TOKEN_ADDRESS_TYPE:
-      return validateTokenAddress(value, contract, true);
-    case TLA_TYPE:
-      return validateTLA(value, contract);
-    case SIMPLE_TLA_TYPE:
-      return validateTLA(value, contract, true);
-    case UINT_TYPE:
-      return validateUint(value);
-    case DECIMAL_TYPE:
-      return validateDecimal(value);
-    case STRING_TYPE:
-      return validateString(value);
-    case HEX_TYPE:
-      return validateHex(value);
-    case URL_TYPE:
-      return validateURL(value);
-    default:
-      return { valid: true, error: null };
-  }
-};
diff --git a/js/src/dapps/tokenreg/Loading/index.js b/js/src/dapps/tokenreg/Loading/index.js
deleted file mode 100644
index 5eb10a7d4cd0c92498e3fdcdd87663a7209e1cf5..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Loading/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './loading';
diff --git a/js/src/dapps/tokenreg/Loading/loading.css b/js/src/dapps/tokenreg/Loading/loading.css
deleted file mode 100644
index dd9e392e1a5fc380a815bb5ce2bdc3779d6e7a0a..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Loading/loading.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.loading {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
diff --git a/js/src/dapps/tokenreg/Loading/loading.js b/js/src/dapps/tokenreg/Loading/loading.js
deleted file mode 100644
index ceec2de3cbe94fea3f3b447c67c697e906ee5954..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Loading/loading.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import CircularProgress from 'material-ui/CircularProgress';
-
-import styles from './loading.css';
-
-export default class Loading extends Component {
-  static propTypes = {
-    size: PropTypes.number
-  };
-
-  render () {
-    const size = (this.props.size || 2) * 60;
-
-    return (
-      <div className={ styles.loading }>
-        <CircularProgress size={ size } />
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/tokenreg/Status/actions.js b/js/src/dapps/tokenreg/Status/actions.js
deleted file mode 100644
index deb473d9b0a51b670238d6fb0858293e1d85eee6..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Status/actions.js
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Contracts from '~/contracts';
-
-import { loadToken, setTokenPending, deleteToken, setTokenData } from '../Tokens/actions';
-import { api } from '../parity';
-
-export const SET_LOADING = 'SET_LOADING';
-export const setLoading = (isLoading) => ({
-  type: SET_LOADING,
-  isLoading
-});
-
-export const FIND_CONTRACT = 'FIND_CONTRACT';
-export const loadContract = () => (dispatch) => {
-  dispatch(setLoading(true));
-
-  const { tokenReg, githubHint } = new Contracts(api);
-
-  return Promise
-    .all([
-      tokenReg.getContract(),
-      githubHint.getContract()
-    ])
-    .then(([ tokenRegContract, githubHintContract ]) => {
-      dispatch(setContractDetails({
-        address: tokenRegContract.address,
-        instance: tokenRegContract.instance,
-        raw: tokenRegContract
-      }));
-
-      dispatch(setGithubhintDetails({
-        address: githubHintContract.address,
-        instance: githubHintContract.instance,
-        raw: githubHintContract
-      }));
-
-      dispatch(loadContractDetails());
-      dispatch(subscribeEvents());
-    })
-    .catch((error) => {
-      throw error;
-    });
-};
-
-export const LOAD_CONTRACT_DETAILS = 'LOAD_CONTRACT_DETAILS';
-export const loadContractDetails = () => (dispatch, getState) => {
-  const state = getState();
-
-  const { instance } = state.status.contract;
-
-  Promise
-    .all([
-      api.eth.accounts(),
-      instance.owner.call(),
-      instance.fee.call()
-    ])
-    .then(([accounts, owner, fee]) => {
-      const isOwner = accounts.filter(a => a === owner).length > 0;
-
-      dispatch(setContractDetails({
-        fee,
-        owner,
-        isOwner
-      }));
-
-      dispatch(setLoading(false));
-    })
-    .catch((error) => {
-      console.error('loadContractDetails error', error);
-    });
-};
-
-export const SET_CONTRACT_DETAILS = 'SET_CONTRACT_DETAILS';
-export const setContractDetails = (details) => ({
-  type: SET_CONTRACT_DETAILS,
-  details
-});
-
-export const SET_GITHUBHINT_CONTRACT = 'SET_GITHUBHINT_CONTRACT';
-export const setGithubhintDetails = (details) => ({
-  type: SET_GITHUBHINT_CONTRACT,
-  details
-});
-
-export const subscribeEvents = () => (dispatch, getState) => {
-  const state = getState();
-
-  const { raw } = state.status.contract;
-  const previousSubscriptionId = state.status.subscriptionId;
-
-  if (previousSubscriptionId) {
-    raw.unsubscribe(previousSubscriptionId);
-  }
-
-  raw
-    .subscribe(null, {
-      fromBlock: 'latest',
-      toBlock: 'pending',
-      limit: 50
-    }, (error, logs) => {
-      if (error) {
-        console.error('setupFilters', error);
-        return;
-      }
-
-      if (!logs || logs.length === 0) {
-        return;
-      }
-
-      logs.forEach(log => {
-        const event = log.event;
-        const type = log.type;
-        const params = log.params;
-
-        if (event === 'Registered' && type === 'pending') {
-          return dispatch(setTokenData(params.id.value.toNumber(), {
-            tla: '...',
-            base: -1,
-            address: params.addr.value,
-            name: params.name.value,
-            isPending: true
-          }));
-        }
-
-        if (event === 'Registered' && type === 'mined') {
-          return dispatch(loadToken(params.id.value.toNumber()));
-        }
-
-        if (event === 'Unregistered' && type === 'pending') {
-          return dispatch(setTokenPending(params.id.value.toNumber(), true));
-        }
-
-        if (event === 'Unregistered' && type === 'mined') {
-          return dispatch(deleteToken(params.id.value.toNumber()));
-        }
-
-        if (event === 'MetaChanged' && type === 'pending') {
-          return dispatch(setTokenData(
-            params.id.value.toNumber(),
-            { metaPending: true, metaMined: false }
-          ));
-        }
-
-        if (event === 'MetaChanged' && type === 'mined') {
-          setTimeout(() => {
-            dispatch(setTokenData(
-              params.id.value.toNumber(),
-              { metaPending: false, metaMined: false }
-            ));
-          }, 5000);
-
-          return dispatch(setTokenData(
-            params.id.value.toNumber(),
-            { metaPending: false, metaMined: true }
-          ));
-        }
-
-        console.warn('unknown log event', log);
-      });
-    })
-    .then((subscriptionId) => {
-      dispatch(setSubscriptionId(subscriptionId));
-    });
-};
-
-export const SET_SUBSCRIPTION_ID = 'SET_SUBSCRIPTION_ID';
-export const setSubscriptionId = subscriptionId => ({
-  type: SET_SUBSCRIPTION_ID,
-  subscriptionId
-});
diff --git a/js/src/dapps/tokenreg/Status/index.js b/js/src/dapps/tokenreg/Status/index.js
deleted file mode 100644
index b41557c1ce4ca1d37324cd49b11916a9776f5566..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Status/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './status';
diff --git a/js/src/dapps/tokenreg/Status/reducer.js b/js/src/dapps/tokenreg/Status/reducer.js
deleted file mode 100644
index e3bcd85b563286159f985446cb4e8c7359e0ef1d..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Status/reducer.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import {
-  SET_LOADING,
-  SET_CONTRACT_DETAILS,
-  SET_GITHUBHINT_CONTRACT,
-  SET_SUBSCRIPTION_ID
-} from './actions';
-
-const initialState = {
-  isLoading: true,
-  subscriptionId: null,
-  contract: {
-    address: null,
-    instance: null,
-    owner: null,
-    isOwner: false,
-    fee: null
-  },
-  githubhint: {
-    address: null,
-    instance: null
-  }
-};
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-    case SET_LOADING:
-      return { ...state, isLoading: action.isLoading };
-
-    case SET_SUBSCRIPTION_ID:
-      return { ...state, subscriptionId: action.subscriptionId };
-
-    case SET_CONTRACT_DETAILS:
-      return { ...state, contract: {
-        ...state.contract,
-        ...action.details
-      } };
-
-    case SET_GITHUBHINT_CONTRACT:
-      return { ...state, githubhint: {
-        ...state.githubhint,
-        ...action.details
-      } };
-
-    default:
-      return state;
-  }
-};
diff --git a/js/src/dapps/tokenreg/Status/status.css b/js/src/dapps/tokenreg/Status/status.css
deleted file mode 100644
index 1f277ea793daded011e6b20a80d4b0c7e93761e9..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Status/status.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.status {
-  background: rgba(46, 204, 113, 0.85);
-  color: rgba(255, 255, 255, 1);
-  padding: 4em 0 2em 0;
-
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-
-  width: 100%;
-}
-
-.title {
-  font-size: 3rem;
-  font-weight: 300;
-  margin: 0;
-  text-transform: uppercase;
-}
-
-.byline {
-  font-size: 1.25em;
-  opacity: 0.75;
-  margin: 0 0 1.75em 0;
-}
diff --git a/js/src/dapps/tokenreg/Status/status.js b/js/src/dapps/tokenreg/Status/status.js
deleted file mode 100644
index 6f77f386b9a6fd2d0eab044ce9f8c972cbb55224..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Status/status.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { api } from '../parity';
-import Chip from '../Chip';
-
-import styles from './status.css';
-
-export default class Status extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    fee: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { fee } = this.props;
-
-    return (
-      <div className={ styles.status }>
-        <h1 className={ styles.title }>Token Registry</h1>
-        <h3 className={ styles.byline }>A global registry of all recognised tokens on the network</h3>
-        <Chip
-          isAddress={ false }
-          value={ api.util.fromWei(fee).toFixed(3) + 'ETH' }
-          label='Fee'
-        />
-      </div>
-    );
-  }
-}
diff --git a/js/src/dapps/tokenreg/Tokens/Token/add-meta.js b/js/src/dapps/tokenreg/Tokens/Token/add-meta.js
deleted file mode 100644
index 0f73179d9a4e0a273da6eb881a3f21392983aa3b..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Tokens/Token/add-meta.js
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { Dialog, RaisedButton, FlatButton, SelectField, MenuItem } from 'material-ui';
-import AddIcon from 'material-ui/svg-icons/content/add';
-
-import InputText from '../../Inputs/Text';
-import { ADDRESS_TYPE, URL_TYPE } from '../../Inputs/validation';
-
-import styles from './token.css';
-
-import { metaDataKeys } from '../../constants';
-
-const initState = {
-  showDialog: false,
-  complete: false,
-  metaKeyIndex: 0,
-
-  form: {
-    valid: false,
-    value: ''
-  }
-};
-
-export default class AddMeta extends Component {
-  static propTypes = {
-    isTokenOwner: PropTypes.bool,
-    handleAddMeta: PropTypes.func,
-    index: PropTypes.number
-  };
-
-  state = initState;
-
-  render () {
-    if (!this.props.isTokenOwner) {
-      return null;
-    }
-
-    return (<div className={ styles['add-meta'] }>
-      <RaisedButton
-        label='Add Meta-Data'
-        icon={ <AddIcon /> }
-        primary
-        fullWidth
-        onTouchTap={ this.onShowDialog }
-      />
-
-      <Dialog
-        title='add meta data'
-        open={ this.state.showDialog }
-        modal={ this.state.complete }
-        className={ styles.dialog }
-        onRequestClose={ this.onClose }
-        actions={ this.renderActions() }
-      >
-        { this.renderContent() }
-      </Dialog>
-    </div>);
-  }
-
-  renderActions () {
-    const { complete } = this.state;
-
-    if (complete) {
-      return (
-        <FlatButton
-          label='Done'
-          primary
-          onTouchTap={ this.onClose }
-        />
-      );
-    }
-
-    const isValid = this.state.form.valid;
-
-    return ([
-      <FlatButton
-        label='Cancel'
-        primary
-        onTouchTap={ this.onClose }
-      />,
-      <FlatButton
-        label='Add'
-        primary
-        disabled={ !isValid }
-        onTouchTap={ this.onAdd }
-      />
-    ]);
-  }
-
-  renderContent () {
-    const { complete } = this.state;
-
-    if (complete) {
-      return this.renderComplete();
-    }
-
-    return this.renderForm();
-  }
-
-  renderComplete () {
-    if (metaDataKeys[this.state.metaKeyIndex].value === 'IMG') {
-      return (<div>
-        <p>
-        Your transactions has been posted.
-        Two transactions are needed to add an Image.
-        Please visit the Parity Signer to authenticate the transfer.</p>
-      </div>);
-    }
-    return (<div>
-      <p>Your transaction has been posted. Please visit the Parity Signer to authenticate the transfer.</p>
-    </div>);
-  }
-
-  renderForm () {
-    const selectedMeta = metaDataKeys[this.state.metaKeyIndex];
-    const metaLabel = selectedMeta.label.toLowerCase();
-    let metaType;
-
-    switch (selectedMeta.validation) {
-      case ADDRESS_TYPE:
-        metaType = 'Address';
-        break;
-
-      case URL_TYPE:
-        metaType = 'URL';
-        break;
-
-      default:
-        metaType = 'URL Hint';
-        break;
-    }
-
-    return (
-      <div>
-        <SelectField
-          floatingLabelText='Choose the meta-data to add'
-          fullWidth
-          value={ this.state.metaKeyIndex }
-          onChange={ this.onMetaKeyChange }
-        >
-
-          { this.renderMetaKeyItems() }
-
-        </SelectField>
-
-        <InputText
-          key={ selectedMeta.value }
-          floatingLabelText={ `${selectedMeta.label} value` }
-          hintText={ `The value of the ${metaLabel} (${metaType})` }
-
-          validationType={ selectedMeta.validation }
-          onChange={ this.onChange }
-        />
-      </div>
-    );
-  }
-
-  renderMetaKeyItems () {
-    return metaDataKeys.map((key, index) => (
-      <MenuItem
-        value={ index }
-        key={ index }
-        label={ key.label } primaryText={ key.label }
-      />
-    ));
-  }
-
-  onShowDialog = () => {
-    this.setState({ showDialog: true });
-  }
-
-  onClose = () => {
-    this.setState(initState);
-  }
-
-  onAdd = () => {
-    const { index } = this.props;
-    const { form, metaKeyIndex } = this.state;
-
-    const selectedMeta = metaDataKeys[metaKeyIndex];
-
-    const keyIndex = this.state.metaKeyIndex;
-    const key = metaDataKeys[keyIndex].value;
-    const value = form.value;
-    const validationType = selectedMeta.validation;
-
-    this.props.handleAddMeta(
-      index,
-      key,
-      value,
-      validationType
-    );
-
-    this.setState({ complete: true });
-  }
-
-  onChange = (valid, value) => {
-    this.setState({
-      form: {
-        valid, value
-      }
-    });
-  }
-
-  onMetaKeyChange = (event, metaKeyIndex) => {
-    this.setState({ metaKeyIndex, form: {
-      ...[this.state.form],
-      valid: false,
-      value: ''
-    } });
-  }
-}
diff --git a/js/src/dapps/tokenreg/Tokens/Token/index.js b/js/src/dapps/tokenreg/Tokens/Token/index.js
deleted file mode 100644
index 7c1ac356ac46642513d052acfcad1044eeb136eb..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Tokens/Token/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './tokenContainer';
diff --git a/js/src/dapps/tokenreg/Tokens/Token/token.css b/js/src/dapps/tokenreg/Tokens/Token/token.css
deleted file mode 100644
index 990a16fbac982d7d61962fa6e09d656048b755c7..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Tokens/Token/token.css
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.token{
-  position: relative;
-  display: flex;
-
-  width: 20rem;
-  margin: 1rem;
-  padding: 1rem;
-  padding-bottom: 1.5rem;
-}
-
-.token-container, .token-content, .token-meta {
-  width: 100%;
-
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.token-content, .token-meta {
-  z-index: 50;
-}
-
-.token-bg {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  left: 0;
-  -webkit-filter: blur(5px);
-  filter: blur(5px);
-  background-color: rgba(255, 255, 255, 0.85);
-}
-
-.token-container {
-  flex: 1 1 auto;
-}
-
-.full-width .token-container {
-  flex-direction: row;
-  align-items: flex-start;
-}
-
-.full-width .token-content {
-  width: 20rem;
-  margin-right: 1rem;
-}
-
-.token-content > div, .token-meta > div {
-  max-width: 100%;
-}
-
-.loading {
-  margin: 1rem 0;
-}
-
-.name {
-  padding-bottom: 0.75rem;
-}
-
-.title {
-  font-size: 2rem;
-  padding: 0 0 0.5rem;
-}
-
-.meta-query {
-  font-size: 0.9rem;
-  margin-top: 1.5rem;
-  margin-bottom: 0;
-}
-
-.meta-key {
-  font-weight: bold;
-}
-
-.meta-value {
-  margin-top: 0.5rem;
-  max-width: 100%;
-  overflow-wrap: break-word;
-}
-
-.meta-info {
-  margin-top: 1.5rem;
-  margin-bottom: -0.5rem;
-  font-size: 0.9rem;
-  color: gray;
-}
-
-.meta-image {
-  width: 100%;
-  margin-top: 1rem;
-}
-
-.meta-image img {
-  width: 100%;
-}
-
-.meta-form {
-  width: 100%;
-}
-
-.unregister {
-  margin-top: 1rem;
-}
-
-.add-meta {
-  margin-top: 1rem;
-  width: 100%;
-}
-
-.pending {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  left: 0;
-  z-index: 100;
-  background-color: rgba(0, 0, 0, 0.35);
-}
-
-.dialog h3 {
-  color: rgba(50, 100, 150, 1) !important;
-  text-transform: uppercase;
-}
diff --git a/js/src/dapps/tokenreg/Tokens/Token/token.js b/js/src/dapps/tokenreg/Tokens/Token/token.js
deleted file mode 100644
index 9d60d45802cd3315bc6826d26c9f4dd8cc1d7e39..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Tokens/Token/token.js
+++ /dev/null
@@ -1,399 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import Paper from 'material-ui/Paper';
-import { RaisedButton, SelectField, MenuItem } from 'material-ui';
-
-import FindIcon from 'material-ui/svg-icons/action/find-in-page';
-import DeleteIcon from 'material-ui/svg-icons/action/delete';
-
-import Loading from '../../Loading';
-import Chip from '../../Chip';
-import AddMeta from './add-meta';
-
-import styles from './token.css';
-
-import { metaDataKeys } from '../../constants';
-
-import { api } from '../../parity';
-
-export default class Token extends Component {
-  static propTypes = {
-    handleMetaLookup: PropTypes.func.isRequired,
-    address: PropTypes.string.isRequired,
-    name: PropTypes.string.isRequired,
-    index: PropTypes.number.isRequired,
-    owner: PropTypes.string.isRequired,
-
-    handleAddMeta: PropTypes.func,
-    handleUnregister: PropTypes.func,
-
-    tla: PropTypes.string,
-    base: PropTypes.number,
-    totalSupply: PropTypes.number,
-    meta: PropTypes.object,
-    isMetaLoading: PropTypes.bool,
-    ownerAccountInfo: PropTypes.shape({
-      name: PropTypes.string,
-      meta: PropTypes.object
-    }),
-    metaPending: PropTypes.bool,
-    metaMined: PropTypes.bool,
-    isLoading: PropTypes.bool,
-    isPending: PropTypes.bool,
-    isTokenOwner: PropTypes.bool.isRequired,
-    isContractOwner: PropTypes.bool,
-
-    fullWidth: PropTypes.bool
-  };
-
-  static defaultProps = {
-    isContractOwner: false
-  };
-
-  state = {
-    metaKeyIndex: 0,
-    showMeta: false
-  };
-
-  shouldComponentUpdate (nextProps) {
-    if (nextProps.isLoading && this.props.isLoading) {
-      return false;
-    }
-
-    return true;
-  }
-
-  render () {
-    const { isLoading, fullWidth } = this.props;
-
-    if (isLoading) {
-      return (
-        <div className={ [ styles.token, styles.loading ].join(' ') }>
-          <Loading size={ 1 } />
-        </div>
-      );
-    }
-
-    if (fullWidth) {
-      return (<div className={ styles['full-width'] }>
-        { this.renderContent() }
-      </div>);
-    }
-
-    return (<div>
-      <Paper zDepth={ 1 } className={ styles.token } style={ {
-        backgroundColor: 'none'
-      } }
-      >
-        <div className={ styles['token-bg'] } />
-        { this.renderContent() }
-      </Paper>
-    </div>);
-  }
-
-  renderContent () {
-    const { address, tla, base, name, meta, owner, totalSupply } = this.props;
-
-    return (<div className={ styles['token-container'] }>
-      { this.renderIsPending() }
-
-      <div className={ styles['token-content'] }>
-        <div className={ styles.title }>{ tla }</div>
-        <div className={ styles.name }>"{ name }"</div>
-
-        { this.renderBase(base) }
-        { this.renderTotalSupply(totalSupply, base, tla) }
-        { this.renderAddress(address) }
-        { this.renderOwner(owner) }
-      </div>
-
-      <div className={ styles['token-meta'] }>
-        <div className={ styles['meta-form'] }>
-          <SelectField
-            floatingLabelText='Choose the meta-data to look-up'
-            fullWidth
-            value={ this.state.metaKeyIndex }
-            onChange={ this.onMetaKeyChange }
-          >
-
-            { this.renderMetaKeyItems() }
-
-          </SelectField>
-
-          <RaisedButton
-            label='Lookup'
-            icon={ <FindIcon /> }
-            primary
-            fullWidth
-            onTouchTap={ this.onMetaLookup }
-          />
-        </div>
-
-        { this.renderMeta(meta) }
-        { this.renderAddMeta() }
-        { this.renderUnregister() }
-      </div>
-
-      { this.renderMetaPending() }
-      { this.renderMetaMined() }
-    </div>);
-  }
-
-  renderMetaKeyItems () {
-    return metaDataKeys.map((key, index) => (
-      <MenuItem
-        value={ index }
-        key={ index }
-        label={ key.label } primaryText={ key.label }
-      />
-    ));
-  }
-
-  renderBase (base) {
-    if (!base || base < 0) {
-      return null;
-    }
-
-    return (
-      <Chip
-        value={ Math.log10(base).toString() }
-        label='Decimals'
-      />
-    );
-  }
-
-  renderAddress (address) {
-    if (!address) {
-      return null;
-    }
-
-    return (
-      <Chip
-        isAddress
-        value={ address }
-        label='Address'
-      />
-    );
-  }
-
-  renderTotalSupply (totalSupply, base, tla) {
-    const balance = Math.round((totalSupply / base) * 100) / 100;
-
-    return (
-      <Chip
-        value={ `${balance.toString()} ${tla}` }
-        label='Total'
-      />
-    );
-  }
-
-  renderOwner (owner) {
-    if (!owner) {
-      return null;
-    }
-
-    const ownerInfo = this.props.ownerAccountInfo;
-
-    const displayValue = (ownerInfo && ownerInfo.name)
-      ? ownerInfo.name
-      : owner;
-
-    return (
-      <Chip
-        isAddress
-        displayValue={ displayValue }
-        value={ owner }
-        label='Owner'
-      />
-    );
-  }
-
-  renderIsPending () {
-    const { isPending } = this.props;
-
-    if (!isPending) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.pending } />
-    );
-  }
-
-  renderAddMeta () {
-    if (!this.props.isTokenOwner) {
-      return null;
-    }
-
-    return (
-      <AddMeta
-        handleAddMeta={ this.props.handleAddMeta }
-        isTokenOwner={ this.props.isTokenOwner }
-        index={ this.props.index }
-      />
-    );
-  }
-
-  renderUnregister () {
-    if (!this.props.isContractOwner) {
-      return null;
-    }
-
-    return (
-      <RaisedButton
-        className={ styles.unregister }
-        label='Unregister'
-        icon={ <DeleteIcon /> }
-        secondary
-        fullWidth
-        onTouchTap={ this.onUnregister }
-      />
-    );
-  }
-
-  renderMeta (meta) {
-    const { isMetaLoading } = this.props;
-    const { showMeta } = this.state;
-
-    if (!showMeta) {
-      return null;
-    }
-
-    if (isMetaLoading) {
-      return (
-        <div>
-          <Loading size={ 0.5 } />
-        </div>
-      );
-    }
-
-    if (!meta) {
-      return null;
-    }
-
-    const metaData = metaDataKeys.find(m => m.value === meta.query);
-
-    if (!meta.value) {
-      return (
-        <div>
-          <p className={ styles['meta-query'] }>
-            No <span className={ styles['meta-key'] }>
-              { metaData.label.toLowerCase() }
-            </span> meta-data...
-          </p>
-        </div>
-      );
-    }
-
-    if (meta.query === 'IMG') {
-      const imageHash = meta.value.replace(/^0x/, '');
-
-      return (
-        <div>
-          <p className={ styles['meta-query'] }>
-            <span className={ styles['meta-key'] }>
-              { metaData.label }
-            </span> meta-data:
-          </p>
-          <div className={ styles['meta-image'] }>
-            <img src={ `/api/content/${imageHash}/` } />
-          </div>
-        </div>
-      );
-    }
-
-    if (meta.query === 'A') {
-      const address = meta.value.slice(0, 42);
-
-      return (
-        <div>
-          <p className={ styles['meta-query'] }>
-            <span className={ styles['meta-key'] }>
-              { metaData.label }
-            </span> meta-data:
-          </p>
-          <p className={ styles['meta-value'] }>
-            { api.util.toChecksumAddress(address) }
-          </p>
-        </div>
-      );
-    }
-
-    return (
-      <div>
-        <p className={ styles['meta-query'] }>
-          <span className={ styles['meta-key'] }>
-            { metaData.label }
-          </span> meta-data:
-        </p>
-        <p className={ styles['meta-value'] }>{ meta.value }</p>
-      </div>
-    );
-  }
-
-  renderMetaPending () {
-    const isMetaPending = this.props.metaPending;
-
-    if (!isMetaPending) {
-      return null;
-    }
-
-    return (
-      <div>
-        <p className={ styles['meta-info'] }>
-          Meta-Data pending...
-        </p>
-      </div>
-    );
-  }
-
-  renderMetaMined () {
-    const isMetaMined = this.props.metaMined;
-
-    if (!isMetaMined) {
-      return null;
-    }
-
-    return (
-      <div>
-        <p className={ styles['meta-info'] }>
-          Meta-Data saved on the blockchain!
-        </p>
-      </div>
-    );
-  }
-
-  onUnregister = () => {
-    const index = this.props.index;
-
-    this.props.handleUnregister(index);
-  }
-
-  onMetaLookup = () => {
-    const keyIndex = this.state.metaKeyIndex;
-    const key = metaDataKeys[keyIndex].value;
-    const index = this.props.index;
-
-    this.setState({ showMeta: true });
-    this.props.handleMetaLookup(index, key);
-  }
-
-  onMetaKeyChange = (event, metaKeyIndex) => {
-    this.setState({ metaKeyIndex });
-  }
-}
diff --git a/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js b/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js
deleted file mode 100644
index dc15f68d902bc226e06fe585b4bfe6c6617ddbc0..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import Token from './token';
-
-import { queryTokenMeta, unregisterToken, addTokenMeta } from '../actions';
-
-class TokenContainer extends Component {
-  static propTypes = {
-    handleMetaLookup: PropTypes.func.isRequired,
-    handleUnregister: PropTypes.func.isRequired,
-    handleAddMeta: PropTypes.func.isRequired,
-
-    tla: PropTypes.string.isRequired
-  };
-
-  render () {
-    return (
-      <Token
-        { ...this.props }
-      />
-    );
-  }
-}
-
-const mapStateToProps = (_, initProps) => {
-  const { tla } = initProps;
-
-  return (state) => {
-    const { isOwner } = state.status.contract;
-    const { tokens } = state.tokens;
-    const token = tokens.find((t) => t.tla === tla);
-
-    return { ...token, isContractOwner: isOwner };
-  };
-};
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    handleMetaLookup: (index, query) => {
-      dispatch(queryTokenMeta(index, query));
-    },
-
-    handleUnregister: (index) => {
-      dispatch(unregisterToken(index));
-    },
-
-    handleAddMeta: (index, key, value, validationType) => {
-      dispatch(addTokenMeta(index, key, value, validationType));
-    }
-  };
-};
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(TokenContainer);
diff --git a/js/src/dapps/tokenreg/Tokens/actions.js b/js/src/dapps/tokenreg/Tokens/actions.js
deleted file mode 100644
index 57581e651ec942400edd798c97c16eeb055828f8..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Tokens/actions.js
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { URL_TYPE } from '../Inputs/validation';
-import { getTokenTotalSupply, urlToHash } from '../utils';
-import { api } from '../parity';
-
-const { bytesToHex } = api.util;
-
-export const SET_TOKENS_LOADING = 'SET_TOKENS_LOADING';
-export const setTokensLoading = (isLoading) => ({
-  type: SET_TOKENS_LOADING,
-  isLoading
-});
-
-export const SET_TOKEN_COUNT = 'SET_TOKEN_COUNT';
-export const setTokenCount = (tokenCount) => ({
-  type: SET_TOKEN_COUNT,
-  tokenCount
-});
-
-export const SET_TOKEN_DATA = 'SET_TOKEN_DATA';
-export const setTokenData = (index, tokenData) => ({
-  type: SET_TOKEN_DATA,
-  index, tokenData
-});
-
-export const SET_TOKEN_META = 'SET_TOKEN_META';
-export const setTokenMeta = (index, meta) => ({
-  type: SET_TOKEN_META,
-  index, meta
-});
-
-export const SET_TOKEN_LOADING = 'SET_TOKEN_LOADING';
-export const setTokenLoading = (index, isLoading) => ({
-  type: SET_TOKEN_LOADING,
-  index, isLoading
-});
-
-export const SET_TOKEN_META_LOADING = 'SET_TOKEN_META_LOADING';
-export const setTokenMetaLoading = (index, isMetaLoading) => ({
-  type: SET_TOKEN_META_LOADING,
-  index, isMetaLoading
-});
-
-export const SET_TOKEN_PENDING = 'SET_TOKEN_PENDING';
-export const setTokenPending = (index, isPending) => ({
-  type: SET_TOKEN_PENDING,
-  index, isPending
-});
-
-export const DELETE_TOKEN = 'DELETE_TOKEN';
-export const deleteToken = (index) => ({
-  type: DELETE_TOKEN,
-  index
-});
-
-export const loadTokens = () => (dispatch, getState) => {
-  const state = getState();
-  const contractInstance = state.status.contract.instance;
-
-  dispatch(setTokensLoading(true));
-
-  contractInstance
-    .tokenCount
-    .call()
-    .then((count) => {
-      const tokenCount = parseInt(count);
-
-      dispatch(setTokenCount(tokenCount));
-
-      for (let i = 0; i < tokenCount; i++) {
-        dispatch(loadToken(i));
-      }
-
-      dispatch(setTokensLoading(false));
-    })
-    .catch((e) => {
-      console.error('loadTokens error', e);
-    });
-};
-
-export const loadToken = (index) => (dispatch, getState) => {
-  const state = getState();
-  const contractInstance = state.status.contract.instance;
-  const userAccounts = state.accounts.list;
-  const accountsInfo = state.accounts.accountsInfo;
-
-  dispatch(setTokenLoading(index, true));
-
-  contractInstance
-    .token
-    .call({}, [ parseInt(index) ])
-    .then((result) => {
-      const tokenOwner = result[4];
-      const isTokenOwner = userAccounts
-        .filter(a => a.address === tokenOwner)
-        .length > 0;
-      const data = {
-        index: parseInt(index),
-        address: result[0],
-        tla: result[1],
-        base: result[2].toNumber(),
-        name: result[3],
-        owner: tokenOwner,
-        ownerAccountInfo: accountsInfo[tokenOwner],
-        isPending: false,
-        isTokenOwner
-      };
-
-      return data;
-    })
-    .then(data => {
-      return getTokenTotalSupply(data.address)
-        .then(totalSupply => {
-          data.totalSupply = totalSupply;
-          return data;
-        });
-    })
-    .then(data => {
-      // If no total supply, must not be a proper token
-      if (data.totalSupply === null) {
-        dispatch(setTokenData(index, null));
-        dispatch(setTokenLoading(index, false));
-        return;
-      }
-
-      data.totalSupply = data.totalSupply.toNumber();
-
-      dispatch(setTokenData(index, data));
-      dispatch(setTokenLoading(index, false));
-    })
-    .catch((e) => {
-      dispatch(setTokenData(index, null));
-      dispatch(setTokenLoading(index, false));
-
-      if (!(e instanceof TypeError)) {
-        console.error(`loadToken #${index} error`, e);
-      }
-    });
-};
-
-export const queryTokenMeta = (index, query) => (dispatch, getState) => {
-  const state = getState();
-  const contractInstance = state.status.contract.instance;
-  const startDate = Date.now();
-
-  dispatch(setTokenMetaLoading(index, true));
-
-  contractInstance
-    .meta
-    .call({}, [ index, query ])
-    .then((value) => {
-      const meta = {
-        query,
-        value: value.find(v => v !== 0) ? bytesToHex(value) : null
-      };
-
-      dispatch(setTokenMeta(index, meta));
-
-      setTimeout(() => {
-        dispatch(setTokenMetaLoading(index, false));
-      }, 500 - (Date.now() - startDate));
-    })
-    .catch((e) => {
-      console.error(`loadToken #${index} error`, e);
-    });
-};
-
-export const addTokenMeta = (index, key, value, validationType) => (dispatch, getState) => {
-  const state = getState();
-
-  const contractInstance = state.status.contract.instance;
-  const ghhInstance = state.status.githubhint.instance;
-
-  const token = state.tokens.tokens.find(t => t.index === index);
-  const options = { from: token.owner };
-  let valuesPromise;
-
-  // Get the right values (could be a hashed URL from GHH)
-  if (validationType === URL_TYPE) {
-    valuesPromise = addGithubhintURL(ghhInstance, options, value)
-      .then((hash) => [ index, key, hash ]);
-  } else {
-    valuesPromise = Promise.resolve([ index, key, value ]);
-  }
-
-  return valuesPromise
-    .then((values) => {
-      return contractInstance
-        .setMeta
-        .estimateGas(options, values)
-        .then((gasEstimate) => {
-          options.gas = gasEstimate.mul(1.2).toFixed(0);
-          return contractInstance.setMeta.postTransaction(options, values);
-        });
-    })
-    .catch((e) => {
-      console.error(`addTokenMeta: #${index} error`, e);
-    });
-};
-
-export const addGithubhintURL = (ghhInstance, _options, url) => {
-  return urlToHash(ghhInstance, url)
-    .then((result) => {
-      const { hash, registered } = result;
-
-      if (registered) {
-        return hash;
-      }
-
-      const options = { from: _options.from };
-      const values = [ hash, url ];
-
-      ghhInstance
-        .hintURL
-        .estimateGas(options, values)
-        .then((gasEstimate) => {
-          options.gas = gasEstimate.mul(1.2).toFixed(0);
-          return ghhInstance.hintURL.postTransaction(options, values);
-        })
-        .catch((error) => {
-          console.error(`registering "${url}" to GHH`, error);
-        });
-
-      return hash;
-    });
-};
-
-export const unregisterToken = (index) => (dispatch, getState) => {
-  const { contract } = getState().status;
-  const { instance, owner } = contract;
-  const values = [ index ];
-  const options = {
-    from: owner
-  };
-
-  instance
-    .unregister
-    .estimateGas(options, values)
-    .then((gasEstimate) => {
-      options.gas = gasEstimate.mul(1.2).toFixed(0);
-      return instance.unregister.postTransaction(options, values);
-    })
-    .catch((e) => {
-      console.error(`unregisterToken #${index} error`, e);
-    });
-};
diff --git a/js/src/dapps/tokenreg/Tokens/container.js b/js/src/dapps/tokenreg/Tokens/container.js
deleted file mode 100644
index 452a84dbfd09fcd02ebae6207c116d8f668cc17a..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Tokens/container.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import Tokens from './tokens';
-
-import { loadTokens } from './actions';
-
-class TokensContainer extends Component {
-  static propTypes = {
-    isLoading: PropTypes.bool,
-    tokens: PropTypes.array,
-    onLoadTokens: PropTypes.func
-  };
-
-  componentDidMount () {
-    this.props.onLoadTokens();
-  }
-
-  render () {
-    return (
-      <Tokens
-        { ...this.props }
-      />
-    );
-  }
-}
-
-const mapStateToProps = (state) => {
-  const { isLoading, tokens } = state.tokens;
-
-  const filteredTokens = tokens
-    .filter((token) => token && token.tla)
-    .map((token) => ({ tla: token.tla, owner: token.owner }));
-
-  return { isLoading, tokens: filteredTokens };
-};
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    onLoadTokens: () => {
-      dispatch(loadTokens());
-    }
-  };
-};
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(TokensContainer);
diff --git a/js/src/dapps/tokenreg/Tokens/index.js b/js/src/dapps/tokenreg/Tokens/index.js
deleted file mode 100644
index 0deedaecc7762f78d94ef12f5d7fdeb29d22ac95..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Tokens/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './container';
diff --git a/js/src/dapps/tokenreg/Tokens/reducer.js b/js/src/dapps/tokenreg/Tokens/reducer.js
deleted file mode 100644
index 55660daf2a65cd0e1292d782b9cf333e12caa354..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Tokens/reducer.js
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import {
-  SET_TOKENS_LOADING,
-  SET_TOKEN_COUNT,
-  SET_TOKEN_DATA,
-  SET_TOKEN_META,
-  SET_TOKEN_LOADING,
-  SET_TOKEN_META_LOADING,
-  SET_TOKEN_PENDING,
-  DELETE_TOKEN
-} from './actions';
-
-const initialState = {
-  isLoading: true,
-  tokens: [],
-  tokenCount: 0
-};
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-    case SET_TOKENS_LOADING:
-      return { ...state, isLoading: action.isLoading };
-
-    case SET_TOKEN_COUNT:
-      return { ...state, tokenCount: action.tokenCount };
-
-    case SET_TOKEN_DATA: {
-      const index = action.index;
-      const tokens = [].concat(state.tokens);
-
-      tokens[index] = {
-        ...tokens[index],
-        ...action.tokenData
-      };
-
-      return { ...state, tokens: tokens };
-    }
-
-    case SET_TOKEN_META: {
-      const index = action.index;
-      const tokens = [].concat(state.tokens);
-
-      tokens[index] = {
-        ...tokens[index],
-        meta: action.meta
-      };
-
-      return { ...state, tokens: tokens };
-    }
-
-    case SET_TOKEN_LOADING: {
-      const index = action.index;
-      const tokens = [].concat(state.tokens);
-
-      tokens[index] = {
-        ...tokens[index],
-        isLoading: action.isLoading
-      };
-
-      return { ...state, tokens: tokens };
-    }
-
-    case SET_TOKEN_META_LOADING: {
-      const index = action.index;
-      const tokens = [].concat(state.tokens);
-
-      tokens[index] = {
-        ...tokens[index],
-        isMetaLoading: action.isMetaLoading
-      };
-
-      return { ...state, tokens: tokens };
-    }
-
-    case SET_TOKEN_PENDING: {
-      const index = action.index;
-      const tokens = [].concat(state.tokens);
-
-      tokens[index] = {
-        ...tokens[index],
-        isPending: action.isPending
-      };
-
-      return { ...state, tokens: tokens };
-    }
-
-    case DELETE_TOKEN: {
-      const index = action.index;
-      const tokens = [].concat(state.tokens);
-
-      delete tokens[index];
-
-      return { ...state, tokens: tokens };
-    }
-
-    default:
-      return state;
-  }
-};
diff --git a/js/src/dapps/tokenreg/Tokens/tokens.css b/js/src/dapps/tokenreg/Tokens/tokens.css
deleted file mode 100644
index 86bb348a444534cff3fab776cd2e0f421c5619e5..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Tokens/tokens.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.tokens {
-  width: 90%;
-  padding-top: 2rem;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-around;
-}
diff --git a/js/src/dapps/tokenreg/Tokens/tokens.js b/js/src/dapps/tokenreg/Tokens/tokens.js
deleted file mode 100644
index fe0207075a5c8010f9dadfa4488221ca43fe83fd..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/Tokens/tokens.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import Token from './Token';
-import Loading from '../Loading';
-
-import styles from './tokens.css';
-
-export default class Tokens extends Component {
-  static propTypes = {
-    isLoading: PropTypes.bool.isRequired,
-    tokens: PropTypes.array
-  };
-
-  render () {
-    const { isLoading, tokens } = this.props;
-    const loading = isLoading ? (<Loading size={ 2 } />) : null;
-
-    return (
-      <div className={ styles.tokens }>
-        { this.renderTokens(tokens) }
-        { loading }
-      </div>
-    );
-  }
-
-  renderTokens (tokens) {
-    return tokens.map((token) => {
-      return (
-        <Token
-          key={ token.tla }
-          tla={ token.tla }
-        />
-      );
-    });
-  }
-}
diff --git a/js/src/dapps/tokenreg/constants.js b/js/src/dapps/tokenreg/constants.js
deleted file mode 100644
index a4d2e39388fc4ed67971904763f9268480837740..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/constants.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { URL_TYPE, ADDRESS_TYPE } from './Inputs/validation';
-
-export const metaDataKeys = [
-  {
-    label: 'Image',
-    value: 'IMG',
-    validation: URL_TYPE
-  },
-  {
-    label: 'Address',
-    value: 'A',
-    validation: ADDRESS_TYPE
-  }
-];
diff --git a/js/src/dapps/tokenreg/parity.js b/js/src/dapps/tokenreg/parity.js
deleted file mode 100644
index 7118ce08780e0304708fbe3dc627f53513574b3c..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/parity.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const api = window.parent.secureApi;
-
-export {
-  api
-};
diff --git a/js/src/dapps/tokenreg/reducers.js b/js/src/dapps/tokenreg/reducers.js
deleted file mode 100644
index 0f0a27c15a765620a119b32098de6c16c1436672..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/reducers.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { combineReducers } from 'redux';
-
-import status from './Status/reducer';
-import tokens from './Tokens/reducer';
-import actions from './Actions/reducer';
-import accounts from './Accounts/reducer';
-
-const rootReducer = combineReducers({
-  status, tokens, actions, accounts
-});
-
-export default rootReducer;
diff --git a/js/src/dapps/tokenreg/store.js b/js/src/dapps/tokenreg/store.js
deleted file mode 100644
index ced7a5bae12be17e4de0cc72b3971b41678ee0dc..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/store.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createStore, applyMiddleware } from 'redux';
-import thunk from 'redux-thunk';
-
-import reducer from './reducers';
-
-export default createStore(reducer, applyMiddleware(thunk));
diff --git a/js/src/dapps/tokenreg/utils.js b/js/src/dapps/tokenreg/utils.js
deleted file mode 100644
index 82d71a6d065b5f1e4f1c53c363e8ff04613c6ccf..0000000000000000000000000000000000000000
--- a/js/src/dapps/tokenreg/utils.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { api } from './parity';
-
-import { eip20 as eip20Abi } from '~/contracts/abi';
-
-export const INVALID_URL_HASH = '0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470';
-export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
-
-/**
- * Convert the given URL to a content hash,
- * and checks if it is already registered in GHH
- */
-export const urlToHash = (ghhInstance, url) => {
-  if (!url || !url.length) {
-    return Promise.resolve(null);
-  }
-
-  return api.parity
-    .hashContent(url)
-    .catch((error) => {
-      const message = error.text || error.message || error.toString();
-
-      throw new Error(`${message} (${url})`);
-    })
-    .then((contentHash) => {
-      console.log('lookupHash', url, contentHash);
-
-      if (contentHash === INVALID_URL_HASH) {
-        throw new Error(`"${url}" is not a valid URL`);
-      }
-
-      return ghhInstance.entries
-        .call({}, [contentHash])
-        .then(([accountSlashRepo, commit, contentHashOwner]) => {
-          const registered = (contentHashOwner !== ZERO_ADDRESS);
-
-          return {
-            hash: contentHash,
-            registered
-          };
-        });
-    });
-};
-
-export const getTokenTotalSupply = (tokenAddress) => {
-  return api
-    .eth
-    .getCode(tokenAddress)
-    .then(code => {
-      if (!code || /^(0x)?0?$/.test(code)) {
-        return null;
-      }
-
-      const contract = api.newContract(eip20Abi, tokenAddress);
-
-      return contract
-        .instance
-        .totalSupply
-        .call({}, []);
-    });
-};
diff --git a/js/src/dev.parity.html b/js/src/dev.parity.html
deleted file mode 100644
index 504dfbb7079d4a2f4ccbde46b021b7b5e2a8040a..0000000000000000000000000000000000000000
--- a/js/src/dev.parity.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
-    <title>dev::Parity.js</title>
-    <script src="/parity-utils/parity.js"></script>
-    <style>
-      .box {
-        font-size: 1.5em;
-        text-align: center;
-        border-radius: 0.5em;
-        background: #eee;
-        padding: 1em;
-        margin: 1em;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="box">
-      best block #<span id="blockNumber">unknown</span>
-    </div>
-    <script>
-      window.parity.api.subscribe('eth_blockNumber', function (error, blockNumber) {
-        if (error) {
-          console.log('error', error);
-          return;
-        }
-
-        document.getElementById('blockNumber').innerHTML = blockNumber.toFormat(0);
-      });
-    </script>
-  </body>
-</html>
diff --git a/js/src/dev.web3.html b/js/src/dev.web3.html
deleted file mode 100644
index f4006160a039d192e0083ef83a5edc0c88998343..0000000000000000000000000000000000000000
--- a/js/src/dev.web3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
-    <title>dev::Web3</title>
-    <script src="/parity-utils/web3.js"></script>
-    <style>
-      .box {
-        font-size: 1.5em;
-        text-align: center;
-        border-radius: 0.5em;
-        background: #eee;
-        padding: 1em;
-        margin: 1em;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="box">
-      best block #<span id="blockNumber">unknown</span>
-    </div>
-    <script>
-      window.setInterval(function () {
-        window.web3.eth.getBlockNumber(function (error, blockNumber) {
-          if (error) {
-            console.error('error', error);
-            return;
-          }
-
-          document.getElementById('blockNumber').innerHTML = blockNumber;
-        });
-      }, 1000);
-    </script>
-  </body>
-</html>
diff --git a/js/src/embed.js b/js/src/embed.js
deleted file mode 100644
index 0413fb4663bc942f17f1979c4a634ae046d0cef2..0000000000000000000000000000000000000000
--- a/js/src/embed.js
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import 'whatwg-fetch';
-
-import es6Promise from 'es6-promise';
-es6Promise.polyfill();
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { AppContainer } from 'react-hot-loader';
-
-import injectTapEventPlugin from 'react-tap-event-plugin';
-
-import SecureApi from '~/secureApi';
-import ContractInstances from '~/contracts';
-
-import { initStore } from '~/redux';
-import ContextProvider from '~/ui/ContextProvider';
-import muiTheme from '~/ui/Theme';
-
-import { patchApi } from '~/util/tx';
-import { setApi } from '~/redux/providers/apiActions';
-
-import '~/environment';
-
-import '../assets/fonts/Roboto/font.css';
-import '../assets/fonts/RobotoMono/font.css';
-
-injectTapEventPlugin();
-
-import ParityBar from '~/views/ParityBar';
-
-// Test transport (std transport should be provided as global object)
-class FakeTransport {
-  constructor () {
-    console.warn('Secure Transport not provided. Falling back to FakeTransport');
-  }
-
-  execute (method, ...params) {
-    console.log('Calling', method, params);
-    return Promise.reject('not connected');
-  }
-
-  addMiddleware () {
-  }
-
-  on () {
-  }
-}
-
-class FrameSecureApi extends SecureApi {
-  constructor (transport) {
-    super(
-      transport.uiUrl,
-      null,
-      () => transport,
-      () => 'http:'
-    );
-  }
-
-  connect () {
-    // Do nothing - this API does not need connecting
-    this.emit('connecting');
-    // Fetch settings
-    this._fetchSettings();
-    // Fire connected event with some delay.
-    setTimeout(() => {
-      this.emit('connected');
-    });
-  }
-
-  needsToken () {
-    return false;
-  }
-
-  isConnecting () {
-    return false;
-  }
-
-  isConnected () {
-    return true;
-  }
-}
-
-const transport = window.secureTransport || new FakeTransport();
-const uiUrl = transport.uiUrl || 'http://127.0.0.1:8180';
-
-transport.uiUrlWithProtocol = uiUrl;
-transport.uiUrl = uiUrl.replace('http://', '').replace('https://', '');
-const api = new FrameSecureApi(transport);
-
-patchApi(api);
-ContractInstances.create(api);
-
-const store = initStore(api, null, true);
-
-store.dispatch({ type: 'initAll', api });
-store.dispatch(setApi(api));
-
-window.secureApi = api;
-
-const app = (
-  <ParityBar dapp externalLink={ uiUrl } />
-);
-const container = document.querySelector('#container');
-
-ReactDOM.render(
-  <AppContainer>
-    <ContextProvider
-      api={ api }
-      muiTheme={ muiTheme }
-      store={ store }
-    >
-      { app }
-    </ContextProvider>
-  </AppContainer>,
-  container
-);
diff --git a/js/src/environment/empty.js b/js/src/environment/empty.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/js/src/environment/index.js b/js/src/environment/index.js
deleted file mode 100644
index 8eaa6519d35295d283f184ef1ce8e0f8a4031917..0000000000000000000000000000000000000000
--- a/js/src/environment/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-// import './integration-tests';
-// import './perf-debug';
-
-import './tests';
-
-export {};
diff --git a/js/src/environment/integration-tests/fake-backend.js b/js/src/environment/integration-tests/fake-backend.js
deleted file mode 100644
index dcb32513035dba5208e9bbe9932a0f79e740c5d8..0000000000000000000000000000000000000000
--- a/js/src/environment/integration-tests/fake-backend.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon/pkg/sinon';
-import mockedResponses from '../../../test/mocked-responses.json';
-
-class FakeRpcServer {
-  constructor () {
-    this.xhr = null;
-    this.middlewares = [];
-  }
-
-  start () {
-    this.xhr = sinon.useFakeXMLHttpRequest();
-    this.xhr.onCreate = this.handleRequest;
-    return () => this.xhr.restore();
-  }
-
-  simpleRpc (rpcMethod, result) {
-    this.rpc(rpcMethod, req => result);
-  }
-
-  rpc (rpcMethod, middleware) {
-    this.middlewares.unshift({
-      rpcMethod, middleware
-    });
-  }
-
-  handleRequest = req => {
-    setTimeout(() => {
-      req.body = JSON.parse(req.requestBody);
-      const middlewaresForMethod = this.middlewares
-        .filter(m => m.rpcMethod === req.body.method);
-
-      const response = middlewaresForMethod
-        .map(m => m.middleware)
-        .reduce((replied, middleware) => {
-          if (replied) {
-            return replied;
-          }
-
-          return middleware(req);
-        }, false);
-
-      if (!response) {
-        return req.respond(405, {
-          'Content-Type': 'application/json'
-        }, JSON.stringify({
-          jsonrpc: '2.0',
-          id: req.body.id,
-          result: null
-        }));
-      }
-
-      return req.respond(200, {
-        'Content-Type': 'application/json'
-      }, JSON.stringify({
-        jsonrpc: '2.0',
-        id: req.body.id,
-        result: response
-      }));
-    });
-  }
-}
-
-const fakeRpc = new FakeRpcServer();
-
-fakeRpc.start();
-mockedResponses.rpc.forEach(method => fakeRpc.simpleRpc(method.name, method.response));
-
-// export fakeRpc to mock stuff in tests
-window.fakeRpc = fakeRpc;
diff --git a/js/src/environment/integration-tests/index.js b/js/src/environment/integration-tests/index.js
deleted file mode 100644
index 0d504878e3e5f3465bbeab2b891b2914e8a82377..0000000000000000000000000000000000000000
--- a/js/src/environment/integration-tests/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import './fake-backend';
diff --git a/js/src/environment/perf-debug/index.js b/js/src/environment/perf-debug/index.js
deleted file mode 100644
index d25ef1cc822bbcc225850a54d1660beb1f41f2ba..0000000000000000000000000000000000000000
--- a/js/src/environment/perf-debug/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import './why-update';
diff --git a/js/src/environment/perf-debug/why-update.js b/js/src/environment/perf-debug/why-update.js
deleted file mode 100644
index 061c6df1d1b82bec7bb2890b1edc8a381b84abff..0000000000000000000000000000000000000000
--- a/js/src/environment/perf-debug/why-update.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { whyDidYouUpdate } from 'why-did-you-update';
-
-whyDidYouUpdate(React);
diff --git a/js/src/environment/tests/index.js b/js/src/environment/tests/index.js
deleted file mode 100644
index ea80e6b9ecb9fe67c899b4b97295ccc8c5823661..0000000000000000000000000000000000000000
--- a/js/src/environment/tests/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import './test-utils';
diff --git a/js/src/environment/tests/test-utils.js b/js/src/environment/tests/test-utils.js
deleted file mode 100644
index e18e461eb535ef067ff777cda6f57d37c0235de9..0000000000000000000000000000000000000000
--- a/js/src/environment/tests/test-utils.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Component } from 'react';
-
-const isProd = process.env.NODE_ENV === 'production';
-
-// Component utils for integration tests hooks.
-const TEST_HOOK = 'data-test';
-
-Component.prototype._test = isProd ? noop : testHook;
-Component.prototype._testInherit = isProd ? noop : testHookInherit;
-
-function noop (name) {}
-
-function testHookInherit (name) {
-  let hook = this.props[TEST_HOOK];
-
-  if (name) {
-    hook += `-${name}`;
-  }
-  return {
-    [TEST_HOOK]: hook
-  };
-}
-
-function testHook (name) {
-  let hook = this.constructor.name;
-
-  if (name) {
-    hook += `-${name}`;
-  }
-  return {
-    [TEST_HOOK]: hook
-  };
-}
diff --git a/js/src/error_pages.css b/js/src/error_pages.css
deleted file mode 100644
index 305f9caaadc7229e2730237a8fee9d81ebe710e5..0000000000000000000000000000000000000000
--- a/js/src/error_pages.css
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@font-face {
-  font-family: "Roboto";
-  src: url('~roboto-font/fonts/Roboto/roboto-light-webfont.eot');
-  src: url('~roboto-font/fonts/Roboto/roboto-light-webfont.eot?#iefix') format('embedded-opentype'), url('~roboto-font/fonts/Roboto/roboto-light-webfont.woff') format('woff'), url('~roboto-font/fonts/Roboto/roboto-light-webfont.ttf') format('truetype');
-  font-weight: 300;
-  font-style: normal;
-}
-
-@font-face {
-    font-family: 'Roboto Mono';
-    src: url('~roboto-mono-webfont/fonts/RobotoMono-Light.ttf') format('truetype');
-    font-style: normal;
-    font-weight: 300;
-    text-rendering: optimizeLegibility;
-}
-
-:root, :root body {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-  background: rgb(95, 95, 95);
-  color: rgba(255, 255, 255, 0.75);
-  font-size: 16px;
-  font-family: 'Roboto', sans-serif;
-  font-weight: 300;
-}
-
-:root a, :root a:visited {
-  text-decoration: none;
-  cursor: pointer;
-  color: rgb(0, 151, 167); /* #f80 */
-}
-
-:root a:hover {
-  color: rgb(0, 174, 193);
-}
-
-h1,h2,h3,h4,h5,h6 {
-  font-weight: 300;
-  text-transform: uppercase;
-  text-decoration: none;
-}
-
-h1 {
-  font-size: 24px;
-  line-height: 36px;
-  color: rgb(0, 151, 167);
-}
-
-h2 {
-  font-size: 20px;
-  line-height: 34px;
-}
-
-code,kbd,pre,samp {
-  font-family: 'Roboto Mono', monospace;
-}
-
-.parity-navbar {
-  background: rgb(65, 65, 65);
-  height: 72px;
-  padding: 0 1rem;
-  display: flex;
-  justify-content: space-between;
-}
-
-.parity-status {
-  clear: both;
-  padding: 1rem;
-  margin: 1rem 0;
-  text-align: right;
-  opacity: 0.75;
-}
-
-.parity-box {
-  margin: 1rem;
-  padding: 1rem;
-  background-color: rgb(48, 48, 48);
-  box-sizing: border-box;
-  box-shadow: rgba(0, 0, 0, 0.117647) 0px 1px 6px, rgba(0, 0, 0, 0.117647) 0px 1px 4px;
-  border-radius: 2px;
-  z-index: 1;
-  color: #aaa;
-}
-
-.parity-box h1,
-.parity-box h2,
-.parity-box h3,
-.parity-box h4,
-.parity-box h5,
-.parity-box h6 {
-  margin: 0;
-}
diff --git a/js/src/i18n/_default/account.js b/js/src/i18n/_default/account.js
deleted file mode 100644
index 7c9d255204317327e7380484f7918991b4c0b950..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/account.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    delete: `delete`,
-    edit: `edit`,
-    faucet: `Kovan ETH`,
-    password: `password`,
-    shapeshift: `shapeshift`,
-    transfer: `transfer`,
-    verify: `verify`
-  },
-  hardware: {
-    confirmDelete: `Are you sure you want to remove the following hardware address from your account list?`
-  },
-  header: {
-    outgoingTransactions: `{count} outgoing transactions`,
-    uuid: `uuid: {uuid}`
-  },
-  title: `Account Management`,
-  transactions: {
-    poweredBy: `Transaction list powered by {etherscan}`,
-    title: `transactions`
-  }
-};
diff --git a/js/src/i18n/_default/accounts.js b/js/src/i18n/_default/accounts.js
deleted file mode 100644
index 2db3d5fd983860ef10bbb5d33d4db927a2343206..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/accounts.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    newAccount: `account`,
-    newWallet: `wallet`,
-    vaults: `vaults`
-  },
-  summary: {
-    minedBlock: `Mined at block #{blockNumber}`
-  },
-  title: `Accounts Overview`,
-  tooltip: {
-    actions: `actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item`,
-    overview: `your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account`
-  },
-  tooltips: {
-    owner: `{name} (owner)`
-  }
-};
diff --git a/js/src/i18n/_default/addAddress.js b/js/src/i18n/_default/addAddress.js
deleted file mode 100644
index 59ae71518b72c07e174ce53632e6fcb75efed7cc..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/addAddress.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    add: `Save Address`,
-    close: `Cancel`
-  },
-  header: `To add a new entry to your addressbook, you need the network address of the account and can supply an optional description. Once added it will reflect in your address book.`,
-  input: {
-    address: {
-      hint: `the network address for the entry`,
-      label: `network address`
-    },
-    description: {
-      hint: `an expanded description for the entry`,
-      label: `(optional) address description`
-    },
-    name: {
-      hint: `a descriptive name for the entry`,
-      label: `address name`
-    }
-  },
-  label: `add saved address`
-};
diff --git a/js/src/i18n/_default/addContract.js b/js/src/i18n/_default/addContract.js
deleted file mode 100644
index edbecf1183969631d33364463ea8829ed9aa2e93..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/addContract.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  abi: {
-    hint: `the abi for the contract`,
-    label: `contract abi`
-  },
-  abiType: {
-    custom: {
-      description: `Contract created from custom ABI`,
-      label: `Custom Contract`
-    },
-    multisigWallet: {
-      description: `Ethereum Multisig contract {link}`,
-      label: `Multisig Wallet`,
-      link: `see contract code`
-    },
-    token: {
-      description: `A standard {erc20} token`,
-      erc20: `ERC 20`,
-      label: `Token`
-    }
-  },
-  address: {
-    hint: `the network address for the contract`,
-    label: `network address`
-  },
-  button: {
-    add: `Add Contract`,
-    cancel: `Cancel`,
-    next: `Next`,
-    prev: `Back`
-  },
-  description: {
-    hint: `an expanded description for the entry`,
-    label: `(optional) contract description`
-  },
-  name: {
-    hint: `a descriptive name for the contract`,
-    label: `contract name`
-  },
-  title: {
-    details: `enter contract details`,
-    type: `choose a contract type`
-  }
-};
diff --git a/js/src/i18n/_default/address.js b/js/src/i18n/_default/address.js
deleted file mode 100644
index ec06d4237b5dd9e785204a70d463fdd558be12b0..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/address.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    edit: `edit`,
-    forget: `forget`,
-    save: `save`
-  },
-  delete: {
-    confirmInfo: `Are you sure you want to remove the following address from your addressbook?`,
-    title: `confirm removal`
-  },
-  title: `Address Information`
-};
diff --git a/js/src/i18n/_default/addressSelect.js b/js/src/i18n/_default/addressSelect.js
deleted file mode 100644
index 108ac80f56c3785a3027efaae88bc07b42af1517..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/addressSelect.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  fromEmail: `Verified using email {email}`,
-  fromRegistry: `{name} (from registry)`,
-  labels: {
-    accounts: `accounts`,
-    contacts: `contacts`,
-    contracts: `contracts`
-  },
-  noAccount: `No account matches this query...`
-};
diff --git a/js/src/i18n/_default/addresses.js b/js/src/i18n/_default/addresses.js
deleted file mode 100644
index 00bb282727f980868bb41ab10770485b5809d07b..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/addresses.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    add: `address`
-  },
-  errors: {
-    invalidFile: `The provided file is invalid...`
-  },
-  title: `Saved Addresses`
-};
diff --git a/js/src/i18n/_default/application.js b/js/src/i18n/_default/application.js
deleted file mode 100644
index f2e6be1ee1900e2d16e12ff6790e58c4c27a1d59..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/application.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  frame: {
-    error: `ERROR: This application cannot and should not be loaded in an embedded iFrame`
-  },
-  status: {
-    consensus: {
-      capable: `Upgrade not required.`,
-      capableUntil: `Upgrade required before #{blockNumber}`,
-      incapableSince: `Upgrade required since #{blockNumber}`,
-      unknown: `Upgrade status is unknown.`
-    },
-    upgrade: `Upgrade`
-  }
-};
diff --git a/js/src/i18n/_default/connection.js b/js/src/i18n/_default/connection.js
deleted file mode 100644
index e51943178e738e974ab10e5533b3a97c7f92a251..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/connection.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  connectingAPI: `Connecting to the Parity Secure API.`,
-  connectingNode: `Connecting to the Parity Node. If this informational message persists, please ensure that your Parity node is running and reachable on the network.`,
-  invalidToken: `invalid signer token`,
-  noConnection: `Unable to make a connection to the Parity Secure API. To update your secure token or to generate a new one, run {newToken} and paste the generated token into the space below.`,
-  token: {
-    hint: `a generated token from Parity`,
-    label: `secure token`
-  }
-};
diff --git a/js/src/i18n/_default/contract.js b/js/src/i18n/_default/contract.js
deleted file mode 100644
index bf7f00298d1273712f7fcce46a1dc550073e8a8c..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/contract.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    close: `Close`,
-    details: `details`,
-    edit: `edit`,
-    execute: `execute`,
-    forget: `forget`
-  },
-  details: {
-    title: `contract details`
-  },
-  events: {
-    eventPending: `pending`,
-    noEvents: `No events has been sent from this contract.`,
-    title: `events`
-  },
-  minedBlock: `Mined at block #{blockNumber}`,
-  queries: {
-    buttons: {
-      query: `Query`
-    },
-    title: `queries`
-  },
-  title: `Contract Information`
-};
diff --git a/js/src/i18n/_default/createAccount.js b/js/src/i18n/_default/createAccount.js
deleted file mode 100644
index 8930fc7b40a7c43bd84c3a61548d2b2f02b863c6..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/createAccount.js
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  accountDetails: {
-    address: {
-      hint: `the network address for the account`,
-      label: `address`
-    },
-    phrase: {
-      hint: `the account recovery phrase`,
-      label: `owner recovery phrase (keep private and secure, it allows full and unlimited access to the account)`
-    }
-  },
-  accountDetailsGeth: {
-    imported: `You have completed the import of {number} addresses from the Geth keystore. These will now be available in your accounts list as a normal account, along with their associated balances on the network.`
-  },
-  button: {
-    back: `Back`,
-    cancel: `Cancel`,
-    create: `Create`,
-    done: `Done`,
-    import: `Import`,
-    next: `Next`,
-    print: `Print Phrase`
-  },
-  creationType: {
-    fromGeth: {
-      description: `Import accounts from the Geth keystore with the original password`,
-      label: `Geth keystore`
-    },
-    fromJSON: {
-      description: `Import an industry-standard JSON keyfile with the original password`,
-      label: `JSON file`
-    },
-    fromNew: {
-      description: `Selecting your identity icon and specifying the password`,
-      label: `New Account`
-    },
-    fromPhrase: {
-      description: `Recover using a previously stored recovery phrase and new password`,
-      label: `Recovery phrase`
-    },
-    fromPresale: {
-      description: `Import an Ethereum presale wallet file with the original password`,
-      label: `Presale wallet`
-    },
-    fromRaw: {
-      description: `Enter a previously created raw private key with a new password`,
-      label: `Private key`
-    },
-    info: `Please select the type of account you want to create. Either create an account via name & password, or import it from a variety of existing sources. From here the wizard will guide you through the process of completing your account creation.`
-  },
-  newAccount: {
-    hint: {
-      hint: `(optional) a hint to help with remembering the password`,
-      label: `password hint`
-    },
-    name: {
-      hint: `a descriptive name for the account`,
-      label: `account name`
-    },
-    password: {
-      hint: `a strong, unique password`,
-      label: `password`
-    },
-    password2: {
-      hint: `verify your password`,
-      label: `password (repeat)`
-    }
-  },
-  newGeth: {
-    available: `There are currently {count} importable keys available from the Geth keystore which are not already available on your Parity instance. Select the accounts you wish to import and move to the next step to complete the import.`,
-    noKeys: `There are currently no importable keys available from the Geth keystore, which are not already available on your Parity instance`
-  },
-  newImport: {
-    file: {
-      hint: `the wallet file for import`,
-      label: `wallet file`
-    },
-    hint: {
-      hint: `(optional) a hint to help with remembering the password`,
-      label: `password hint`
-    },
-    name: {
-      hint: `a descriptive name for the account`,
-      label: `account name`
-    },
-    password: {
-      hint: `the password to unlock the wallet`,
-      label: `password`
-    }
-  },
-  rawKey: {
-    hint: {
-      hint: `(optional) a hint to help with remembering the password`,
-      label: `password hint`
-    },
-    name: {
-      hint: `a descriptive name for the account`,
-      label: `account name`
-    },
-    password: {
-      hint: `a strong, unique password`,
-      label: `password`
-    },
-    password2: {
-      hint: `verify your password`,
-      label: `password (repeat)`
-    },
-    private: {
-      hint: `the raw hex encoded private key`,
-      label: `private key`
-    }
-  },
-  recoveryPhrase: {
-    hint: {
-      hint: `(optional) a hint to help with remembering the password`,
-      label: `password hint`
-    },
-    name: {
-      hint: `a descriptive name for the account`,
-      label: `account name`
-    },
-    password: {
-      hint: `a strong, unique password`,
-      label: `password`
-    },
-    password2: {
-      hint: `verify your password`,
-      label: `password (repeat)`
-    },
-    phrase: {
-      hint: `the account recovery phrase`,
-      label: `account recovery phrase`
-    },
-    windowsKey: {
-      label: `Key was created with Parity <1.4.5 on Windows`
-    }
-  },
-  title: {
-    accountInfo: `account information`,
-    createAccount: `create account`,
-    createType: `creation type`,
-    importWallet: `import wallet`
-  }
-};
diff --git a/js/src/i18n/_default/createWallet.js b/js/src/i18n/_default/createWallet.js
deleted file mode 100644
index eeb9e9a9832494d1a8a9c05f513de71ceaa72749..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/createWallet.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    add: `Add`,
-    cancel: `Cancel`,
-    close: `Close`,
-    create: `Create`,
-    done: `Done`,
-    next: `Next`,
-    sending: `Sending...`
-  },
-  deployment: {
-    message: `The deployment is currently in progress`
-  },
-  details: {
-    address: {
-      hint: `the wallet contract address`,
-      label: `wallet address`
-    },
-    dayLimitMulti: {
-      hint: `amount of ETH spendable without confirmations`,
-      label: `wallet day limit`
-    },
-    description: {
-      hint: `the local description for this wallet`,
-      label: `wallet description (optional)`
-    },
-    descriptionMulti: {
-      hint: `the local description for this wallet`,
-      label: `wallet description (optional)`
-    },
-    name: {
-      hint: `the local name for this wallet`,
-      label: `wallet name`
-    },
-    nameMulti: {
-      hint: `the local name for this wallet`,
-      label: `wallet name`
-    },
-    ownerMulti: {
-      hint: `the owner account for this contract`,
-      label: `from account (contract owner)`
-    },
-    ownersMulti: {
-      label: `other wallet owners`
-    },
-    ownersMultiReq: {
-      hint: `number of required owners to accept a transaction`,
-      label: `required owners`
-    }
-  },
-  info: {
-    added: `added`,
-    copyAddress: `copy address to clipboard`,
-    created: `{name} has been {deployedOrAdded} at`,
-    dayLimit: `The daily limit is set to {dayLimit} ETH.`,
-    deployed: `deployed`,
-    numOwners: `{numOwners} owners are required to confirm a transaction.`,
-    owners: `The following are wallet owners`
-  },
-  rejected: {
-    message: `The deployment has been rejected`,
-    state: `The wallet will not be created. You can safely close this window.`,
-    title: `rejected`
-  },
-  states: {
-    completed: `The contract deployment has been completed`,
-    confirmationNeeded: `The contract deployment needs confirmations from other owners of the Wallet`,
-    preparing: `Preparing transaction for network transmission`,
-    validatingCode: `Validating the deployed contract code`,
-    waitingConfirm: `Waiting for confirmation of the transaction in the Parity Secure Signer`,
-    waitingReceipt: `Waiting for the contract deployment transaction receipt`
-  },
-  steps: {
-    deployment: `wallet deployment`,
-    details: `wallet details`,
-    info: `wallet informaton`,
-    type: `wallet type`
-  },
-  type: {
-    multisig: {
-      description: `Create/Deploy a {link} Wallet`,
-      label: `Multi-Sig wallet`,
-      link: `standard multi-signature`
-    },
-    watch: {
-      description: `Add an existing wallet to your accounts`,
-      label: `Watch a wallet`
-    }
-  }
-};
diff --git a/js/src/i18n/_default/dapp.js b/js/src/i18n/_default/dapp.js
deleted file mode 100644
index 29dd2fd16b743a5f8d443c3f7db0939bc6e79bde..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/dapp.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  loading: `Loading`,
-  unavailable: `The dapp cannot be reached`
-};
diff --git a/js/src/i18n/_default/dapps.js b/js/src/i18n/_default/dapps.js
deleted file mode 100644
index 9ed3415d16842ef143b0cdd30ef800a5526da703..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/dapps.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  add: {
-    builtin: {
-      desc: `Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.`,
-      label: `Applications bundled with Parity`
-    },
-    label: `visible applications`,
-    local: {
-      desc: `All applications installed locally on the machine by the user for access by the Parity client.`,
-      label: `Applications locally available`
-    },
-    network: {
-      desc: `These applications are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each application before interacting.`,
-      label: `Applications on the global network`
-    }
-  },
-  button: {
-    edit: `edit`,
-    permissions: `permissions`
-  },
-  external: {
-    accept: `I understand that these applications are not affiliated with Parity`,
-    warning: `Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.`
-  },
-  label: `Decentralized Applications`,
-  permissions: {
-    label: `visible dapp accounts`
-  }
-};
diff --git a/js/src/i18n/_default/deleteAccount.js b/js/src/i18n/_default/deleteAccount.js
deleted file mode 100644
index 4818a785abb5af815a6ae1eddc6f6258bf20b0fb..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/deleteAccount.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  password: {
-    hint: `provide the account password to confirm the account deletion`,
-    label: `account password`
-  },
-  question: `Are you sure you want to permanently delete the following account?`,
-  title: `confirm removal`
-};
diff --git a/js/src/i18n/_default/deployContract.js b/js/src/i18n/_default/deployContract.js
deleted file mode 100644
index 0b5a05503c6729891ce5ea8ebe1855c6c9b2d810..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/deployContract.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: {
-    title: `The deployment is currently in progress`
-  },
-  button: {
-    cancel: `Cancel`,
-    close: `Close`,
-    create: `Create`,
-    done: `Done`,
-    next: `Next`
-  },
-  completed: {
-    description: `Your contract has been deployed at`
-  },
-  details: {
-    abi: {
-      hint: `the abi of the contract to deploy or solc combined-output`,
-      label: `abi / solc combined-output`
-    },
-    address: {
-      hint: `the owner account for this contract`,
-      label: `from account (contract owner)`
-    },
-    advanced: {
-      label: `advanced sending options`
-    },
-    amount: {
-      hint: `the amount to transfer to the contract`,
-      label: `amount to transfer (in {tag})`
-    },
-    code: {
-      hint: `the compiled code of the contract to deploy`,
-      label: `code`
-    },
-    contract: {
-      label: `select a contract`
-    },
-    description: {
-      hint: `a description for the contract`,
-      label: `contract description (optional)`
-    },
-    name: {
-      hint: `a name for the deployed contract`,
-      label: `contract name`
-    }
-  },
-  owner: {
-    noneSelected: `a valid account as the contract owner needs to be selected`
-  },
-  parameters: {
-    choose: `Choose the contract parameters`
-  },
-  rejected: {
-    description: `You can safely close this window, the contract deployment will not occur.`,
-    title: `The deployment has been rejected`
-  },
-  state: {
-    completed: `The contract deployment has been completed`,
-    confirmationNeeded: `The operation needs confirmations from the other owners of the contract`,
-    preparing: `Preparing transaction for network transmission`,
-    validatingCode: `Validating the deployed contract code`,
-    waitReceipt: `Waiting for the contract deployment transaction receipt`,
-    waitSigner: `Waiting for confirmation of the transaction in the Parity Secure Signer`
-  },
-  title: {
-    completed: `completed`,
-    deployment: `deployment`,
-    details: `contract details`,
-    extras: `extra information`,
-    failed: `deployment failed`,
-    parameters: `contract parameters`,
-    rejected: `rejected`
-  }
-};
diff --git a/js/src/i18n/_default/details_windows.js b/js/src/i18n/_default/details_windows.js
deleted file mode 100644
index fcc5700665db8ae92fc1906d7ac966c2d9783bed..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/details_windows.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default `Windows`;
diff --git a/js/src/i18n/_default/editMeta.js b/js/src/i18n/_default/editMeta.js
deleted file mode 100644
index b5b5213417d0b8b0515a6db62f3b2ea1b24afca1..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/editMeta.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  description: {
-    hint: `description for this address`,
-    label: `address description`
-  },
-  name: {
-    label: `name`
-  },
-  passwordHint: {
-    hint: `a hint to allow password recovery`,
-    label: `(optional) password hint`
-  },
-  tags: {
-    hint: `press <Enter> to add a tag`,
-    label: `(optional) tags`
-  },
-  title: `edit metadata`
-};
diff --git a/js/src/i18n/_default/errors.js b/js/src/i18n/_default/errors.js
deleted file mode 100644
index 76fed24cd61ab0b6628a105b28ac6f0b477adaa6..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/errors.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  duplicateName: `the name already exists`,
-  invalidKey: `the raw key needs to be hex, 64 characters in length and contain the prefix "0x"`,
-  noFile: `select a valid wallet file to import`,
-  noKey: `you need to provide the raw private key`,
-  noMatchPassword: `the supplied passwords does not match`,
-  noName: `you need to specify a valid name`
-};
diff --git a/js/src/i18n/_default/executeContract.js b/js/src/i18n/_default/executeContract.js
deleted file mode 100644
index 011264d3fe6cb1b2e265568f6ecf0943670ac95b..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/executeContract.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: {
-    posted: `Your transaction has been posted to the network`,
-    title: `The function execution is in progress`,
-    waitAuth: `Waiting for authorization in the Parity Signer`
-  },
-  button: {
-    cancel: `cancel`,
-    done: `done`,
-    next: `next`,
-    post: `post transaction`,
-    prev: `prev`
-  },
-  details: {
-    address: {
-      hint: `from account`,
-      label: `the account to transact with`
-    },
-    advancedCheck: {
-      label: `advanced sending options`
-    },
-    amount: {
-      hint: `the amount to send to with the transaction`,
-      label: `transaction value (in ETH)`
-    },
-    function: {
-      hint: `the function to call on the contract`,
-      label: `function to execute`
-    }
-  },
-  rejected: {
-    state: `You can safely close this window, the function execution will not occur.`,
-    title: `The execution has been rejected`
-  },
-  steps: {
-    advanced: `advanced options`,
-    complete: `complete`,
-    rejected: `rejected`,
-    sending: `sending`,
-    transfer: `function details`
-  }
-};
diff --git a/js/src/i18n/_default/extension.js b/js/src/i18n/_default/extension.js
deleted file mode 100644
index baa2efd4e9d627ce7c8307a439ced13288ad9202..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/extension.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  install: `Install the extension now`,
-  intro: `Parity now has an extension available for Chrome that allows safe browsing of Ethereum-enabled decentralized applications. It is highly recommended that you install this extension to further enhance your Parity experience.`
-};
diff --git a/js/src/i18n/_default/faucet.js b/js/src/i18n/_default/faucet.js
deleted file mode 100644
index 11aacef9caebda0753a6622a0ae3fc2b715f89ef..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/faucet.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    close: `close`,
-    done: `close`,
-    request: `request`
-  },
-  summary: {
-    done: `Your Kovan ETH has been requested from the faucet which responded with -`,
-    info: `To request a deposit of Kovan ETH to this address, you need to ensure that the address is sms-verified on the mainnet. Once executed the faucet will deposit Kovan ETH into the current account.`
-  },
-  title: `Kovan ETH Faucet`
-};
diff --git a/js/src/i18n/_default/firstRun.js b/js/src/i18n/_default/firstRun.js
deleted file mode 100644
index 5f41fa9c4487e710f6a756958087f733d1123cf3..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/firstRun.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    close: `Close`,
-    create: `Create`,
-    next: `Next`,
-    print: `Print Phrase`,
-    skip: `Skip`
-  },
-  completed: {
-    congrats: `Congratulations! Your node setup has been completed successfully and you are ready to use the application.`,
-    next: `Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.`
-  },
-  title: {
-    completed: `completed`,
-    newAccount: `new account`,
-    recovery: `recovery`,
-    terms: `terms`,
-    welcome: `welcome`
-  },
-  tnc: {
-    accept: `I accept these terms and conditions`
-  },
-  welcome: {
-    description: `As part of a new installation, the next few steps will guide you through the process of setting up your Parity instance and your associated accounts. Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us. Once completed you will have -`,
-    greeting: `Welcome to Parity, the fastest and simplest way to run your node.`,
-    next: `Click Next to continue your journey.`,
-    step: {
-      account: `Created your first Parity account`,
-      privacy: `Understood our privacy policy & terms of operation`,
-      recovery: `Have the ability to recover your account`
-    }
-  }
-};
diff --git a/js/src/i18n/_default/home.js b/js/src/i18n/_default/home.js
deleted file mode 100644
index 0b5e68c04ec62f82cdc2c644e3e1e114b616ccc4..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/home.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  account: {
-    visited: `accessed {when}`
-  },
-  accounts: {
-    none: `No recent accounts history available`,
-    title: `Recent Accounts`
-  },
-  dapp: {
-    visited: `accessed {when}`
-  },
-  dapps: {
-    none: `No recent Applications history available`,
-    title: `Recent Dapps`
-  },
-  title: `Parity Home`,
-  url: {
-    none: `No recent URL history available`,
-    title: `Web Applications`,
-    visited: `visited {when}`
-  }
-};
diff --git a/js/src/i18n/_default/index.js b/js/src/i18n/_default/index.js
deleted file mode 100644
index 687e558dc170a0c5b495e3b36ceba4ba379f110f..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export account from './account';
-export accounts from './accounts';
-export addAddress from './addAddress';
-export addContract from './addContract';
-export address from './address';
-export addressSelect from './addressSelect';
-export addresses from './addresses';
-export application from './application';
-export connection from './connection';
-export contract from './contract';
-export contracts from './contracts';
-export createAccount from './createAccount';
-export createWallet from './createWallet';
-export dapp from './dapp';
-export dapps from './dapps';
-export deleteAccount from './deleteAccount';
-export deployContract from './deployContract';
-export editMeta from './editMeta';
-export errors from './errors';
-export executeContract from './executeContract';
-export extension from './extension';
-export faucet from './faucet';
-export firstRun from './firstRun';
-export home from './home';
-export loadContract from './loadContract';
-export parityBar from './parityBar';
-export passwordChange from './passwordChange';
-export saveContract from './saveContract';
-export settings from './settings';
-export shapeshift from './shapeshift';
-export signer from './signer';
-export status from './status';
-export tabBar from './tabBar';
-export transfer from './transfer';
-export txEditor from './txEditor';
-export ui from './ui';
-export upgradeParity from './upgradeParity';
-export vaults from './vaults';
-export verification from './verification';
-export wallet from './wallet';
-export walletSettings from './walletSettings';
-export web from './web';
-export writeContract from './writeContract';
diff --git a/js/src/i18n/_default/loadContract.js b/js/src/i18n/_default/loadContract.js
deleted file mode 100644
index d4edb3a81dd2c78bab93f844db6dfa5525274ca3..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/loadContract.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `Cancel`,
-    load: `Load`,
-    no: `No`,
-    yes: `Yes`
-  },
-  contract: {
-    savedAt: `Saved {when}`
-  },
-  header: {
-    saved: `Saved Contracts`,
-    snippets: `Contract Snippets`
-  },
-  removal: {
-    confirm: `Are you sure you want to remove the following contract from your saved contracts?`,
-    savedAt: `Saved {when}`
-  },
-  tab: {
-    local: `Local`,
-    snippets: `Snippets`
-  },
-  title: {
-    remove: `confirm removal`,
-    view: `view contracts`
-  }
-};
diff --git a/js/src/i18n/_default/parityBar.js b/js/src/i18n/_default/parityBar.js
deleted file mode 100644
index 94090a961240f100ddc2098ebb5f55ae3b3860a4..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/parityBar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    close: `Close`
-  },
-  label: {
-    parity: `Parity`,
-    signer: `Signer`
-  },
-  title: {
-    accounts: `Default Account`,
-    signer: `Parity Signer: Pending`
-  }
-};
diff --git a/js/src/i18n/_default/passwordChange.js b/js/src/i18n/_default/passwordChange.js
deleted file mode 100644
index 714a6e25b338af0344e6b3be7cd42b0737a3b66e..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/passwordChange.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `Cancel`,
-    change: `Change`,
-    test: `Test`,
-    wait: `Wait...`
-  },
-  currentPassword: {
-    hint: `your current password for this account`,
-    label: `current password`
-  },
-  newPassword: {
-    hint: `the new password for this account`,
-    label: `new password`
-  },
-  passwordHint: {
-    display: `Hint {hint}`,
-    hint: `hint for the new password`,
-    label: `(optional) new password hint`
-  },
-  repeatPassword: {
-    error: `the supplied passwords do not match`,
-    hint: `repeat the new password for this account`,
-    label: `repeat new password`
-  },
-  success: `Your password has been successfully changed`,
-  tabChange: {
-    label: `Change Password`
-  },
-  tabTest: {
-    label: `Test Password`
-  },
-  testPassword: {
-    hint: `your account password`,
-    label: `password`
-  },
-  title: `Password Manager`
-};
diff --git a/js/src/i18n/_default/saveContract.js b/js/src/i18n/_default/saveContract.js
deleted file mode 100644
index 62ce1e33fb70736a67c787ccfae2a82988214cb0..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/saveContract.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    cancel: `Cancel`,
-    save: `Save`
-  },
-  name: {
-    hint: `choose a name for this contract`,
-    label: `contract name`
-  },
-  title: `save contract`
-};
diff --git a/js/src/i18n/_default/settings.js b/js/src/i18n/_default/settings.js
deleted file mode 100644
index ea447e4a99db4fe284d6b4ac50d46685e1381daa..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/settings.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  background: {
-    button_more: `generate more`,
-    overview_0: `The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new Signer token. This is so that decentralized applications cannot pretend to be trustworthy.`,
-    overview_1: `Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or use a new Signer token.`,
-    label: `background`
-  },
-  parity: {
-    chains: {
-      chain_classic: `Parity syncs to the Ethereum Classic network`,
-      chain_dev: `Parity uses a local development chain`,
-      chain_expanse: `Parity syncs to the Expanse network`,
-      chain_foundation: `Parity syncs to the Ethereum network launched by the Ethereum Foundation`,
-      chain_kovan: `Parity syncs to the Kovan test network`,
-      chain_olympic: `Parity syncs to the Olympic test network`,
-      chain_ropsten: `Parity syncs to the Ropsten test network`,
-      cmorden_kovan: `Parity syncs to Morden (Classic) test network`,
-      hint: `the chain for the Parity node to sync to`,
-      label: `chain/network to sync`
-    },
-    languages: {
-      hint: `the language this interface is displayed with`,
-      label: `UI language`
-    },
-    loglevels: `Choose the different logs level.`,
-    modes: {
-      hint: `the syncing mode for the Parity node`,
-      label: `mode of operation`,
-      mode_active: `Parity continuously syncs the chain`,
-      mode_dark: `Parity syncs only when the RPC is active`,
-      mode_offline: `Parity doesn't sync`,
-      mode_passive: `Parity syncs initially, then sleeps and wakes regularly to resync`
-    },
-    overview_0: `Control the Parity node settings and nature of syncing via this interface.`,
-    label: `parity`
-  },
-  proxy: {
-    details_0: `Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,`,
-    details_1: `To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}.`,
-    details_macos: `macOS`,
-    details_ubuntu: `Ubuntu`,
-    details_windows: `Windows`,
-    overview_0: `The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.`,
-    label: `proxy`
-  },
-  views: {
-    accounts: {
-      description: `A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, manage your balances and fund your accounts.`,
-      label: `Accounts`
-    },
-    addresses: {
-      description: `A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available at the click of a button when transacting.`,
-      label: `Addressbook`
-    },
-    apps: {
-      description: `Decentralized applications that interact with the underlying network. Add applications, manage you application portfolio and interact with application from around the network.`,
-      label: `Applications`
-    },
-    contracts: {
-      description: `Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, specifically for advanced users that understand the inner working of certain contracts.`,
-      label: `Contracts`
-    },
-    overview_0: `Manage the available application views using only the parts of the application applicable to you.`,
-    overview_1: `Are you an end-user? The defaults are setup for both beginner and advanced users alike.`,
-    overview_2: `Are you a developer? Add some features to manage contracts and interact with application deployments.`,
-    overview_3: `Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.`,
-    settings: {
-      description: `This view. Allows you to customize the application in term of options, operation and look and feel.`,
-      label: `Settings`
-    },
-    signer: {
-      description: `The secure transaction management area of the application where you can approve any outgoing transactions made from the application as well as those placed into the queue by decentralized applications.`,
-      label: `Signer`
-    },
-    status: {
-      description: `See how the Parity node is performing in terms of connections to the network, logs from the actual running instance and details of mining (if enabled and configured).`,
-      label: `Status`
-    },
-    label: `views`,
-    home: {
-      label: `Home`
-    }
-  },
-  label: `settings`
-};
diff --git a/js/src/i18n/_default/shapeshift.js b/js/src/i18n/_default/shapeshift.js
deleted file mode 100644
index 2479278349d0baa115eae93f47bf9a0af8d4df3a..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/shapeshift.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  awaitingDepositStep: {
-    awaitingConfirmation: `Awaiting confirmation of the deposit address for your {typeSymbol} funds exchange`,
-    awaitingDeposit: `{shapeshiftLink} is awaiting a {typeSymbol} deposit. Send the funds from your {typeSymbol} network client to -`,
-    minimumMaximum: `{minimum} minimum, {maximum} maximum`
-  },
-  awaitingExchangeStep: {
-    awaitingCompletion: `Awaiting the completion of the funds exchange and transfer of funds to your Parity account.`,
-    receivedInfo: `{shapeshiftLink} has received a deposit of -`
-  },
-  button: {
-    cancel: `Cancel`,
-    done: `Close`,
-    shift: `Shift Funds`
-  },
-  completedStep: {
-    completed: `{shapeshiftLink} has completed the funds exchange.`,
-    parityFunds: `The change in funds will be reflected in your Parity account shortly.`
-  },
-  errorStep: {
-    info: `The funds shifting via {shapeshiftLink} failed with a fatal error on the exchange. The error message received from the exchange is as follow:`
-  },
-  optionsStep: {
-    noPairs: `There are currently no exchange pairs/coins available to fund with.`,
-    returnAddr: {
-      hint: `the return address for send failures`,
-      label: `(optional) {coinSymbol} return address`
-    },
-    terms: {
-      label: `I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is completely out of the control of Parity`
-    },
-    typeSelect: {
-      hint: `the type of crypto conversion to do`,
-      label: `fund account from`
-    }
-  },
-  price: {
-    minMax: `({minimum} minimum, {maximum} maximum)`
-  },
-  title: {
-    completed: `completed`,
-    deposit: `awaiting deposit`,
-    details: `details`,
-    error: `exchange failed`,
-    exchange: `awaiting exchange`
-  },
-  warning: {
-    noPrice: `No price match was found for the selected type`
-  }
-};
diff --git a/js/src/i18n/_default/signer.js b/js/src/i18n/_default/signer.js
deleted file mode 100644
index 3f8615c52be9d6e4851ec86065032a57ff63bfcb..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/signer.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  embedded: {
-    noPending: `There are currently no pending requests awaiting your confirmation`
-  },
-  mainDetails: {
-    editTx: `Edit conditions/gas/gasPrice`,
-    tooltips: {
-      total1: `The value of the transaction including the mining fee is {total} {type}.`,
-      total2: `(This includes a mining fee of {fee} {token})`,
-      value1: `The value of the transaction.`
-    }
-  },
-  requestOrigin: {
-    dapp: `by a dapp at {url}`,
-    ipc: `via IPC session`,
-    rpc: `via RPC {rpc}`,
-    signerCurrent: `via current tab`,
-    signerUI: `via UI session`,
-    unknownInterface: `via unknown interface`,
-    unknownRpc: `unidentified`,
-    unknownUrl: `unknown URL`
-  },
-  requestsPage: {
-    noPending: `There are no requests requiring your confirmation.`,
-    pendingTitle: `Pending Requests`,
-    queueTitle: `Local Transactions`
-  },
-  sending: {
-    hardware: {
-      confirm: `Please confirm the transaction on your attached hardware device`,
-      connect: `Please attach your hardware device before confirming the transaction`
-    }
-  },
-  signRequest: {
-    request: `A request to sign data using your account:`,
-    state: {
-      confirmed: `Confirmed`,
-      rejected: `Rejected`
-    },
-    unknownBinary: `(Unknown binary data)`,
-    warning: `WARNING: This consequences of doing this may be grave. Confirm the request only if you are sure.`
-  },
-  title: `Trusted Signer`,
-  txPending: {
-    buttons: {
-      viewToggle: `view transaction`
-    }
-  },
-  txPendingConfirm: {
-    buttons: {
-      confirmBusy: `Confirming...`,
-      confirmRequest: `Confirm Request`
-    },
-    errors: {
-      invalidWallet: `Given wallet file is invalid.`
-    },
-    password: {
-      decrypt: {
-        hint: `decrypt the key`,
-        label: `Key Password`
-      },
-      unlock: {
-        hint: `unlock the account`,
-        label: `Account Password`
-      }
-    },
-    passwordHint: `(hint) {passwordHint}`,
-    selectKey: {
-      hint: `The keyfile to use for this account`,
-      label: `Select Local Key`
-    },
-    tooltips: {
-      password: `Please provide a password for this account`
-    }
-  },
-  txPendingForm: {
-    changedMind: `I've changed my mind`,
-    reject: `reject request`
-  },
-  txPendingReject: {
-    buttons: {
-      reject: `Reject Request`
-    },
-    info: `Are you sure you want to reject request?`,
-    undone: `This cannot be undone`
-  }
-};
diff --git a/js/src/i18n/_default/status.js b/js/src/i18n/_default/status.js
deleted file mode 100644
index 536c0ff909b102b8bca21631566c0307fc8a1a7e..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/status.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  debug: {
-    reverse: `Reverse Order`,
-    stopped: `Refresh and display of logs from Parity is currently stopped via the UI, start it to see the latest updates.`,
-    title: `Node Logs`
-  },
-  miningSettings: {
-    input: {
-      author: {
-        hint: `the mining author`,
-        label: `author`
-      },
-      extradata: {
-        hint: `extra data for mined blocks`,
-        label: `extradata`
-      },
-      gasFloor: {
-        hint: `the gas floor target for mining`,
-        label: `gas floor target`
-      },
-      gasPrice: {
-        hint: `the minimum gas price for mining`,
-        label: `minimal gas price`
-      }
-    },
-    title: `mining settings`
-  },
-  status: {
-    hashrate: `{hashrate} H/s`,
-    input: {
-      chain: `chain`,
-      enode: `enode`,
-      no: `no`,
-      peers: `peers`,
-      port: `network port`,
-      rpcEnabled: `rpc enabled`,
-      rpcInterface: `rpc interface`,
-      rpcPort: `rpc port`,
-      yes: `yes`
-    },
-    title: {
-      bestBlock: `best block`,
-      hashRate: `hash rate`,
-      network: `network settings`,
-      node: `Node`,
-      peers: `peers`
-    }
-  },
-  title: `Status`
-};
diff --git a/js/src/i18n/_default/tabBar.js b/js/src/i18n/_default/tabBar.js
deleted file mode 100644
index b704879e091cde4e84347daaaa7d77a1e508cbaa..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/tabBar.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  tooltip: {
-    overview: `navigate between the different parts and views of the application, switching between an account view, token view and decentralized application view`
-  }
-};
diff --git a/js/src/i18n/_default/transfer.js b/js/src/i18n/_default/transfer.js
deleted file mode 100644
index 3207f5b067bae12e8d1ab47fc8e699769c8f5b7d..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/transfer.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  advanced: {
-    data: {
-      hint: `the data to pass through with the transaction`,
-      label: `transaction data`
-    }
-  },
-  buttons: {
-    back: `Back`,
-    cancel: `Cancel`,
-    close: `Close`,
-    next: `Next`,
-    send: `Send`
-  },
-  details: {
-    advanced: {
-      label: `advanced sending options`
-    },
-    amount: {
-      hint: `the amount to transfer to the recipient`,
-      label: `amount to transfer (in {tag})`
-    },
-    fullBalance: {
-      label: `full account balance`
-    },
-    recipient: {
-      hint: `the recipient address`,
-      label: `recipient address`
-    },
-    sender: {
-      hint: `the sender address`,
-      label: `sender address`
-    },
-    total: {
-      label: `total transaction amount`
-    }
-  },
-  wallet: {
-    confirmation: `This transaction needs confirmation from other owners.`,
-    operationHash: `operation hash`
-  },
-  warning: {
-    wallet_spent_limit: `This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.`
-  }
-};
diff --git a/js/src/i18n/_default/txEditor.js b/js/src/i18n/_default/txEditor.js
deleted file mode 100644
index 7dab159a8a7229f0bd8279daeed37226ab5c4f0e..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/txEditor.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  condition: {
-    block: {
-      hint: `The minimum block to send from`,
-      label: `Transaction send block`
-    },
-    blocknumber: `Send after BlockNumber`,
-    date: {
-      hint: `The minimum date to send from`,
-      label: `Transaction send date`
-    },
-    datetime: `Send after Date & Time`,
-    label: `Condition where transaction activates`,
-    none: `No conditions`,
-    time: {
-      hint: `The minimum time to send from`,
-      label: `Transaction send time`
-    }
-  },
-  gas: {
-    info: `You can choose the gas price based on the distribution of recent included transaction gas prices. The lower the gas price is, the cheaper the transaction will be. The higher the gas price is, the faster it should get mined by the network.`
-  }
-};
diff --git a/js/src/i18n/_default/ui.js b/js/src/i18n/_default/ui.js
deleted file mode 100644
index d84e7bd13bbe6bc413074bdd8bbec6548a92201c..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/ui.js
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  actionbar: {
-    export: {
-      button: {
-        export: `export`
-      }
-    },
-    import: {
-      button: {
-        cancel: `Cancel`,
-        confirm: `Confirm`,
-        import: `import`
-      },
-      confirm: `Confirm that this is what was intended to import.`,
-      error: `An error occured: {errorText}`,
-      step: {
-        error: `error`,
-        select: `select a file`,
-        validate: `validate`
-      },
-      title: `Import from a file`
-    },
-    search: {
-      hint: `Enter search input...`
-    },
-    sort: {
-      sortBy: `Sort by {label}`,
-      typeDefault: `Default`,
-      typeEth: `Sort by ETH`,
-      typeName: `Sort by name`,
-      typeTags: `Sort by tags`
-    }
-  },
-  balance: {
-    none: `No balances associated with this account`
-  },
-  blockStatus: {
-    bestBlock: `{blockNumber} best block`,
-    syncStatus: `{currentBlock}/{highestBlock} syncing`,
-    warpRestore: `{percentage}% warp restore`,
-    warpStatus: `, {percentage}% historic`
-  },
-  confirmDialog: {
-    no: `no`,
-    yes: `yes`
-  },
-  copyToClipboard: {
-    copied: `copied {data} to clipboard`
-  },
-  errors: {
-    close: `close`
-  },
-  fileSelect: {
-    defaultLabel: `Drop a file here, or click to select a file to upload`
-  },
-  gasPriceSelector: {
-    customTooltip: {
-      transactions: `{number} {number, plural, one {transaction} other {transactions}} with gas price set from {minPrice} to {maxPrice}`
-    }
-  },
-  identityName: {
-    null: `NULL`,
-    unnamed: `UNNAMED`
-  },
-  methodDecoding: {
-    condition: {
-      block: `, {historic, select, true {Submitted} false {Submission}} at block {blockNumber}`,
-      time: `, {historic, select, true {Submitted} false {Submission}} at {timestamp}`
-    },
-    deploy: {
-      address: `Deployed a contract at address`,
-      params: `with the following parameters:`,
-      willDeploy: `Will deploy a contract`,
-      withValue: `, sending {value}`
-    },
-    gasUsed: `({gas} gas used)`,
-    gasValues: `{gas} gas ({gasPrice}M/{tag})`,
-    input: {
-      data: `data`,
-      input: `input`,
-      withInput: `with the {inputDesc} {inputValue}`
-    },
-    receive: {
-      contract: `the contract`,
-      info: `{historic, select, true {Received} false {Will receive}} {valueEth} from {aContract}{address}`
-    },
-    signature: {
-      info: `{historic, select, true {Executed} false {Will execute}} the {method} function on the contract {address} trsansferring {ethValue}{inputLength, plural, zero {,} other {passing the following {inputLength, plural, one {parameter} other {parameters}}}}`
-    },
-    token: {
-      transfer: `{historic, select, true {Transferred} false {Will transfer}} {value} to {address}`
-    },
-    transfer: {
-      contract: `the contract`,
-      info: `{historic, select, true {Transferred} false {Will transfer}} {valueEth} to {aContract}{address}`
-    },
-    txValues: `{historic, select, true {Provided} false {Provides}} {gasProvided}{gasUsed} for a total transaction value of {totalEthValue}`,
-    unknown: {
-      info: `{historic, select, true {Executed} false {Will execute}} the {method} on the contract {address} transferring {ethValue}.`
-    }
-  },
-  passwordStrength: {
-    label: `password strength`
-  },
-  tooltips: {
-    button: {
-      done: `Done`,
-      next: `Next`,
-      skip: `Skip`
-    }
-  },
-  txHash: {
-    confirmations: `{count} {value, plural, one {confirmation} other {confirmations}}`,
-    oog: `The transaction might have gone out of gas. Try again with more gas.`,
-    posted: `The transaction has been posted to the network with a hash of {hashLink}`,
-    waiting: `waiting for confirmations`
-  },
-  vaultSelect: {
-    hint: `the vault this account is attached to`,
-    label: `associated vault`
-  },
-  verification: {
-    gatherData: {
-      accountHasRequested: {
-        false: `You did not request verification from this account yet.`,
-        pending: `Checking if you requested verification…`,
-        true: `You already requested verification from this account.`
-      },
-      accountIsVerified: {
-        false: `Your account is not verified yet.`,
-        pending: `Checking if your account is verified…`,
-        true: `Your account is already verified.`
-      },
-      fee: `The additional fee is {amount} ETH.`,
-      isAbleToRequest: {
-        pending: `Validating your input…`
-      },
-      isServerRunning: {
-        false: `The verification server is not running.`,
-        pending: `Checking if the verification server is running…`,
-        true: `The verification server is running.`
-      },
-      nofee: `There is no additional fee.`,
-      termsOfService: `I agree to the terms and conditions below.`
-    }
-  }
-};
diff --git a/js/src/i18n/_default/upgradeParity.js b/js/src/i18n/_default/upgradeParity.js
deleted file mode 100644
index b3d87145283f3a189700d80dfae76b400e6c3676..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/upgradeParity.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: `Your upgrade to Parity {newversion} is currently in progress. Please wait until the process completes.`,
-  button: {
-    close: `close`,
-    done: `done`,
-    upgrade: `upgrade now`
-  },
-  completed: `Your upgrade to Parity {newversion} has been successfully completed. Click "done" to automatically reload the application.`,
-  consensus: {
-    capable: `Your current Parity version is capable of handling the network requirements.`,
-    capableUntil: `Your current Parity version is capable of handling the network requirements until block {blockNumber}`,
-    incapableSince: `Your current Parity version is incapable of handling the network requirements since block {blockNumber}`,
-    unknown: `Your current Parity version is capable of handling the network requirements.`
-  },
-  failed: `Your upgrade to Parity {newversion} has failed with an error.`,
-  info: {
-    currentVersion: `You are currently running {currentversion}`,
-    next: `Proceed with "upgrade now" to start your Parity upgrade.`,
-    upgrade: `An upgrade to version {newversion} is available`,
-    welcome: `Welcome to the Parity upgrade wizard, allowing you a completely seamless upgrade experience to the next version of Parity.`
-  },
-  step: {
-    completed: `upgrade completed`,
-    error: `error`,
-    info: `upgrade available`,
-    updating: `upgrading parity`
-  },
-  version: {
-    unknown: `unknown`
-  }
-};
diff --git a/js/src/i18n/_default/vaults.js b/js/src/i18n/_default/vaults.js
deleted file mode 100644
index 04ff4d558dd780c60e9bb2f3c5bbb9e779991af7..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/vaults.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  accounts: {
-    button: {
-      cancel: `Cancel`,
-      execute: `Set`
-    },
-    empty: `There are no accounts in this vault`,
-    title: `Manage Vault Accounts`
-  },
-  button: {
-    accounts: `accounts`,
-    add: `create vault`,
-    close: `close`,
-    edit: `edit`,
-    open: `open`
-  },
-  confirmClose: {
-    info: `You are about to close a vault. Any accounts associated with the vault won't be visible after this operation concludes. To view the associated accounts, open the vault again.`,
-    title: `Close Vault`
-  },
-  confirmOpen: {
-    info: `You are about to open a vault. After confirming your password, all accounts associated with this vault will be visible. Closing the vault will remove the accounts from view until the vault is opened again.`,
-    password: {
-      hint: `the password specified when creating the vault`,
-      label: `vault password`
-    },
-    title: `Open Vault`
-  },
-  create: {
-    button: {
-      close: `close`,
-      vault: `create vault`
-    },
-    description: {
-      hint: `an extended description for the vault`
-    },
-    descriptions: {
-      label: `(optional) description`
-    },
-    hint: {
-      hint: `(optional) a hint to help with remembering the password`,
-      label: `password hint`
-    },
-    name: {
-      hint: `a name for the vault`,
-      label: `vault name`
-    },
-    password: {
-      hint: `a strong, unique password`,
-      label: `password`
-    },
-    password2: {
-      hint: `verify your password`,
-      label: `password (repeat)`
-    },
-    title: `Create a new vault`
-  },
-  editMeta: {
-    allowPassword: `Change vault password`,
-    button: {
-      close: `close`,
-      save: `save`
-    },
-    currentPassword: {
-      hint: `your current vault password`,
-      label: `current password`
-    },
-    description: {
-      hint: `the description for this vault`,
-      label: `vault description`
-    },
-    password: {
-      hint: `a strong, unique password`,
-      label: `new password`
-    },
-    password2: {
-      hint: `verify your new password`,
-      label: `new password (repeat)`
-    },
-    passwordHint: {
-      hint: `your password hint for this vault`,
-      label: `password hint`
-    },
-    title: `Edit Vault Metadata`
-  },
-  empty: `There are currently no vaults to display.`,
-  selector: {
-    noneAvailable: `There are currently no vaults opened and available for selection. Create and open some first before attempting to select a vault for an account move.`,
-    title: `Select Account Vault`
-  },
-  title: `Vault Management`
-};
diff --git a/js/src/i18n/_default/verification.js b/js/src/i18n/_default/verification.js
deleted file mode 100644
index 2d98ed82aa38dc5c419d18a90a488c520c9ed0c4..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/verification.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `Cancel`,
-    done: `Done`,
-    next: `Next`
-  },
-  code: {
-    error: `invalid code`,
-    hint: `Enter the code you received.`,
-    label: `verification code`,
-    sent: `The verification code has been sent to {receiver}.`
-  },
-  confirmation: {
-    authorise: `The verification code will be sent to the contract. Please authorize this using the Parity Signer.`,
-    windowOpen: `Please keep this window open.`
-  },
-  done: {
-    message: `Congratulations, your account is verified!`
-  },
-  email: {
-    enterCode: `Enter the code you received via e-mail.`
-  },
-  gatherData: {
-    email: {
-      hint: `the code will be sent to this address`,
-      label: `e-mail address`
-    },
-    phoneNumber: {
-      hint: `the SMS will be sent to this number`,
-      label: `phone number in international format`
-    }
-  },
-  gatherDate: {
-    email: {
-      error: `invalid e-mail`
-    },
-    phoneNumber: {
-      error: `invalid number`
-    }
-  },
-  loading: `Loading verification data.`,
-  request: {
-    authorise: `A verification request will be sent to the contract. Please authorize this using the Parity Signer.`,
-    requesting: `Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.`,
-    windowOpen: `Please keep this window open.`
-  },
-  sms: {
-    enterCode: `Enter the code you received via SMS.`
-  },
-  steps: {
-    code: `Enter Code`,
-    completed: `Completed`,
-    confirm: `Confirm`,
-    data: `Enter Data`,
-    method: `Method`,
-    request: `Request`
-  },
-  title: `verify your account`,
-  types: {
-    email: {
-      description: `The hash of the e-mail address you prove control over will be stored on the blockchain.`,
-      label: `E-mail Verification`
-    },
-    sms: {
-      description: `It will be stored on the blockchain that you control a phone number (not <em>which</em>).`,
-      label: `SMS Verification`
-    }
-  }
-};
diff --git a/js/src/i18n/_default/wallet.js b/js/src/i18n/_default/wallet.js
deleted file mode 100644
index 92063af8ba7e6a14b9e1a47e005e3eef806fdffb..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/wallet.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    edit: `edit`,
-    forget: `forget`,
-    settings: `settings`,
-    transfer: `transfer`
-  },
-  confirmations: {
-    buttons: {
-      confirmAs: `Confirm As...`,
-      revokeAs: `Revoke As...`
-    },
-    none: `No transactions needs confirmation right now.`,
-    tooltip: {
-      confirmed: `Confirmed by {number}/{required} owners`
-    }
-  },
-  details: {
-    requiredOwners: `This wallet requires at least {owners} to validate any action (transactions, modifications).`,
-    requiredOwnersNumber: `{number} {numberValue, plural, one {owner} other {owners}}`,
-    spent: `{spent} has been spent today, out of {limit} set as the daily limit, which has been reset on {date}`,
-    title: `Details`
-  },
-  title: `Wallet Management`,
-  transactions: {
-    none: `No transactions has been sent.`,
-    title: `Transactions`
-  }
-};
diff --git a/js/src/i18n/_default/walletSettings.js b/js/src/i18n/_default/walletSettings.js
deleted file mode 100644
index ddeae3798a736373d00bf923079d9518b8131545..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/walletSettings.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  addOwner: {
-    title: `Add Owner`
-  },
-  buttons: {
-    cancel: `Cancel`,
-    close: `Close`,
-    next: `Next`,
-    send: `Send`,
-    sending: `Sending...`
-  },
-  changes: {
-    modificationString: `For your modifications to be taken into account,
-              other owners have to send the same modifications. They can paste
-              this string to make it easier:`,
-    none: `No modifications have been made to the Wallet settings.`,
-    overview: `You are about to make the following modifications`
-  },
-  edit: {
-    message: `In order to edit this contract's settings, at
-                  least {owners, number} {owners, plural, one {owner } other {owners }} have to
-                  send the very same modifications. You can paste a stringified version
-                  of the modifications here.`
-  },
-  modifications: {
-    daylimit: {
-      hint: `amount of ETH spendable without confirmations`,
-      label: `wallet day limit`
-    },
-    fromString: {
-      label: `modifications`
-    },
-    owners: {
-      label: `other wallet owners`
-    },
-    required: {
-      hint: `number of required owners to accept a transaction`,
-      label: `required owners`
-    },
-    sender: {
-      hint: `send modifications as this owner`,
-      label: `from account (wallet owner)`
-    }
-  },
-  ownersChange: {
-    details: `from {from} to {to}`,
-    title: `Change Required Owners`
-  },
-  rejected: `The transaction #{txid} has been rejected`,
-  removeOwner: {
-    title: `Remove Owner`
-  }
-};
diff --git a/js/src/i18n/_default/web.js b/js/src/i18n/_default/web.js
deleted file mode 100644
index 6136d387f60ba80287a0ee05016b5577306726e3..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/web.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  requestToken: `Requesting access token...`
-};
diff --git a/js/src/i18n/_default/writeContract.js b/js/src/i18n/_default/writeContract.js
deleted file mode 100644
index fc1100b7786ad303dd56fa6ff745da56490145b2..0000000000000000000000000000000000000000
--- a/js/src/i18n/_default/writeContract.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    autoCompile: `Auto-Compile`,
-    compile: `Compile`,
-    deploy: `Deploy`,
-    import: `Import Solidity`,
-    load: `Load`,
-    new: `New`,
-    optimise: `Optimise`,
-    save: `Save`
-  },
-  compiling: {
-    action: `Please compile the source code.`,
-    busy: `Compiling...`
-  },
-  details: {
-    saved: `(saved {timestamp})`
-  },
-  error: {
-    noContract: `No contract has been found.`,
-    params: `An error occurred with the following description`
-  },
-  input: {
-    abi: `ABI Interface`,
-    code: `Bytecode`,
-    metadata: `Metadata`,
-    swarm: `Swarm Metadata Hash`
-  },
-  title: {
-    contract: `Select a contract`,
-    loading: `Loading...`,
-    main: `Write a Contract`,
-    messages: `Compiler messages`,
-    new: `New Solidity Contract`,
-    parameters: `Parameters`,
-    saved: `saved @ {timestamp}`,
-    selectSolidity: `Select a Solidity version`,
-    solidity: `Loading Solidity {version}`
-  },
-  type: {
-    humanErc20: `Implementation of the Human Token Contract`,
-    implementErc20: `Implementation of ERC20 Token Contract`,
-    multisig: `Implementation of a multisig Wallet`,
-    standardErc20: `Standard ERC20 Token Contract`
-  }
-};
diff --git a/js/src/i18n/constants.js b/js/src/i18n/constants.js
deleted file mode 100644
index 54693f81b11dbee65c89c8e7e129c7c01ce0bb9a..0000000000000000000000000000000000000000
--- a/js/src/i18n/constants.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const DEFAULT_LOCALE = 'en';
-const DEFAULT_LOCALES = process.env.NODE_ENV === 'production'
-  ? ['en']
-  : ['en', 'de', 'nl', 'zh', 'zh-Hant-TW'];
-const LS_STORE_KEY = '_parity::locale';
-
-export {
-  DEFAULT_LOCALE,
-  DEFAULT_LOCALES,
-  LS_STORE_KEY
-};
diff --git a/js/src/i18n/de/index.js b/js/src/i18n/de/index.js
deleted file mode 100644
index 6b50c2d5344b780e8ec21d9f490741be4968957e..0000000000000000000000000000000000000000
--- a/js/src/i18n/de/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import settings from './settings';
-
-export default {
-  settings
-};
diff --git a/js/src/i18n/de/settings.js b/js/src/i18n/de/settings.js
deleted file mode 100644
index 1fa6b233d4c3e210a0008029ef5fc26601db8a9d..0000000000000000000000000000000000000000
--- a/js/src/i18n/de/settings.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  label: 'Einstellungen',
-
-  background: {
-    label: 'Hintergrund',
-
-    overview_0: 'Dein Hintergrundmuster ist einzigartig und beruht auf deiner Parity-Installation. Es ändert sich immer dann, wenn du ein neues Signer-Token erstellst. So können dezentrale Applicationen keine Vertrauenswürdigkeit vortäuschen.',
-    overview_1: 'Such dir ein Muster aus und merke es dir. Dieses Muster wird dir von nun an immer angezeigt, es sei denn du löschst deinen Browser-Cache oder benutzt ein neues Signer-Token.',
-
-    button_more: 'weitere generieren'
-  },
-
-  parity: {
-    label: 'Parity',
-
-    overview_0: 'Diese Einstellungen verändern das Verhalten deines Parity-Knotens.',
-
-    languages: {
-      label: 'Anzeigesprache',
-      hint: 'Die Sprache, in der dir diese Obefläche angezeigt wird'
-    },
-
-    modes: {
-      label: 'Betriebsmodus',
-      hint: 'Der Synchronisations-Modus deines Parity-Knotens',
-
-      mode_active: 'Parity synchronisiert kontinuierlich die Blockchain',
-      mode_passive: 'Parity synchronisiert zu Beginn, schläft dann und wacht regelmäßig zum Synchronisieren auf',
-      mode_dark: 'Parity synchronisiert nur falls erforderlich, etwa wenn es aus der Ferne aufgerufen wird',
-      mode_offline: 'Parity synchronisiert nicht'
-    }
-  },
-
-  proxy: {
-    label: 'Proxy',
-
-    overview_0: 'Die Proxy-Einstellungen ermöglichen dir einen einfachen Zugriff über einprägsame Adressen, auf die Oberfläche mit all ihren dezentralen Anwendungen.',
-
-    details_0: 'Anstelle des Zugriffs über IP-Adresse und Port wirst du über die .parity-Subdomain auf die Parity-Oberfläche zugreifen können, indem du {homeProxy} besuchst. Dafür musst du folgenden Eintrag in den Proxy-Einstellungen deines Browsers hinzufügen:',
-    details_1: 'Hier findest du Anleitungen zum Anpassen der Proxy-Einstellungen in {windowsLink}, {macOSLink} oder {ubuntuLink}.'
-  },
-
-  views: {
-    label: 'Ansicht',
-
-    overview_0: 'Hier kannst du entscheiden, welche Teile der Parity-Oberfläche dir angezeigt werden sollen.',
-    overview_1: 'Benutzt du Parity ganz normal? Die Standardeinstellungen sind gleichermaßen für Einsteigende als auch für Fortgeschrittene gedacht.',
-    overview_2: 'Entwickelst du mit Parity? Füge zum Beispiel den Reiter "Contracts" zu deiner Ansicht hinzu.',
-    overview_3: 'Bist du Miner oder betreibst du einen großen Knoten? Füge den Reiter "Status" hinzu, um alle Information über den Betrieb deines Knotens im Blick zu halten.',
-
-    accounts: {
-      label: 'Konten',
-      description: 'Eine Liste aller Konten, die mit dieser Parity-Installation verbunden sind. Sende Transaktionen, empfange eingehende Beträge, verwalte deine Kontostände oder lade deine Konten auf.'
-    },
-    addresses: {
-      label: 'Adressbuch',
-      description: 'Eine Liste all deiner Kontakte und der Adressen, die von dieser Parity-Installation verwaltet werden. Überwache Konten und gelange mit nur einem Klick zu Details deiner Transaktionen.'
-    },
-    apps: {
-      label: 'Anwendungen',
-      description: 'Dezentrale Anwendungen, die mit dem Netzwerk interagieren. Füge Anwendungen hinzu, entferne oder öffne Anwendungen.'
-    },
-    contracts: {
-      label: 'Contracts',
-      description: 'Interagiere mit Smart Contracts im Netzwerk. Diese Umgebung ist auf Fortgeschrittene mit gutem Verständnis der Fuktionsweise von Smart Contracts zugeschnitten.'
-    },
-    status: {
-      label: 'Status',
-      description: 'Schau dir an, wie sich dein Parity-Knoten schlägt. Hier findest du zum Beispiel die Anzahl der aktuellen Verbindungen zum Netzwerk, Logs deiner laufenden Instanz und (sofern konfiguriert) Details zum Mining.'
-    },
-    signer: {
-      label: 'Signer',
-      description: 'In diesem sicheren Bereich kannst du Transaktionen, die von dir oder von dezentralen Anwendungen erstellt wurden, prüfen und dann genehmigen oder ablehnen.'
-    },
-    settings: {
-      label: 'Einstellungen',
-      description: 'Diese Seite. Pass die Parity-Oberfläche nach deinen Wünschen an.'
-    }
-  }
-};
diff --git a/js/src/i18n/en/index.js b/js/src/i18n/en/index.js
deleted file mode 100644
index 6b50c2d5344b780e8ec21d9f490741be4968957e..0000000000000000000000000000000000000000
--- a/js/src/i18n/en/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import settings from './settings';
-
-export default {
-  settings
-};
diff --git a/js/src/i18n/en/settings.js b/js/src/i18n/en/settings.js
deleted file mode 100644
index 48a656b934d9fc33a9fc78759ec5da17acb2cdc0..0000000000000000000000000000000000000000
--- a/js/src/i18n/en/settings.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  label: 'settings',
-
-  background: {
-    label: 'background'
-  },
-
-  parity: {
-    label: 'parity'
-  },
-
-  proxy: {
-    label: 'proxy'
-  },
-
-  views: {
-    label: 'views',
-
-    accounts: {
-      label: 'Accounts'
-    },
-
-    addresses: {
-      label: 'Addressbook'
-    },
-
-    apps: {
-      label: 'Applications'
-    },
-
-    contracts: {
-      label: 'Contracts'
-    },
-
-    home: {
-      label: 'Home'
-    },
-
-    status: {
-      label: 'Status'
-    },
-
-    signer: {
-      label: 'Signer'
-    },
-
-    settings: {
-      label: 'Settings'
-    }
-  }
-};
diff --git a/js/src/i18n/index.js b/js/src/i18n/index.js
deleted file mode 100644
index 2b396381bc797e604ebe421c3ffdab9edf93af89..0000000000000000000000000000000000000000
--- a/js/src/i18n/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import LocaleStore from './store';
-
-export {
-  LocaleStore
-};
diff --git a/js/src/i18n/languages.js b/js/src/i18n/languages.js
deleted file mode 100644
index 65265b69009e0573fae7c267bc08098141f22542..0000000000000000000000000000000000000000
--- a/js/src/i18n/languages.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  de: 'Deutsch',
-  en: 'English',
-  nl: 'Nederlands',
-  zh: '简体中文',
-  'zh-Hant-TW': '繁體中文'
-};
diff --git a/js/src/i18n/languages.spec.js b/js/src/i18n/languages.spec.js
deleted file mode 100644
index ef97e3badf39912202976029c508ae61785e4e78..0000000000000000000000000000000000000000
--- a/js/src/i18n/languages.spec.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { DEFAULT_LOCALE } from './constants';
-import languages from './languages';
-
-const keys = Object.keys(languages);
-
-describe('i18n/languages', () => {
-  it('has a language list', () => {
-    expect(keys.length > 1).to.be.true;
-  });
-
-  it('includes DEFAULT_LOCALE as a language', () => {
-    expect(keys.includes(DEFAULT_LOCALE)).to.be.true;
-  });
-});
diff --git a/js/src/i18n/nl/account.js b/js/src/i18n/nl/account.js
deleted file mode 100755
index ee211bbca83e94156e46afcc4ee55f8407fed4ac..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/account.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    delete: `verwijder`,
-    edit: `bewerk`,
-    faucet: `Kovan ETH`,
-    password: `wachtwoord`,
-    shapeshift: `shapeshift`,
-    transfer: `verzend`,
-    verify: `verifieer`
-  },
-  hardware: {
-    confirmDelete: `Weet je zeker dat je de volgende hardware adressen van je account lijst wilt verwijderen?`
-  },
-  header: {
-    outgoingTransactions: `{count} uitgaande transacties`,
-    uuid: `uuid: {uuid}`
-  },
-  title: `Account Beheer`,
-  transactions: {
-    poweredBy: `Transactie lijst mede mogelijk door {etherscan}`,
-    title: `transacties`
-  }
-};
diff --git a/js/src/i18n/nl/accounts.js b/js/src/i18n/nl/accounts.js
deleted file mode 100755
index e213bddb2c89678979e36d76edc4ed9c68c87bc7..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/accounts.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    newAccount: `account`,
-    newWallet: `wallet`,
-    vaults: `kluizen`
-  },
-  summary: {
-    minedBlock: `Opgenomen in blok #{blockNumber}`
-  },
-  title: `Accounts Overzicht`,
-  tooltip: {
-    actions: `voor de huidige weergave zijn koppelingen beschikbaar op de werkbalk voor snelle toegang: het uitvoeren van acties of het creëren van een nieuw item`,
-    overview: `hier vind je een overzichtelijke weergave van je accounts, waarin je meta informatie kunt bewerken en transacties kunt uitvoeren en bekijken`
-  },
-  tooltips: {
-    owner: `{name} (eigenaar)`
-  }
-};
diff --git a/js/src/i18n/nl/addAddress.js b/js/src/i18n/nl/addAddress.js
deleted file mode 100755
index e048988e977f6286894bd62f49dd89fe4a267e31..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/addAddress.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    add: `Adres Opslaan`,
-    close: `Annuleer`
-  },
-  header: `Om een nieuwe invoer aan je adresboek toe te voegen, heb je het netwerk adres van het account nodig en kun je optioneel een beschrijving toevoegen. Zodra de nieuwe invoer is toegevoegd, zal het in je adresboek verschijnen.`,
-  input: {
-    address: {
-      hint: `het netwerk adres van het item`,
-      label: `Netwerk Adres`
-    },
-    description: {
-      hint: `een uitgebereide beschrijving voor het adres`,
-      label: `(optioneel) adres beschrijving`
-    },
-    name: {
-      hint: `een beschrijvende naam van het adres`,
-      label: `Adres Naam`
-    }
-  },
-  label: `voeg een opgeslagen adres toe`
-};
diff --git a/js/src/i18n/nl/addContract.js b/js/src/i18n/nl/addContract.js
deleted file mode 100755
index c0b60806ccbf1c3344322c1e5a7bdb314556ee4d..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/addContract.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  abi: {
-    hint: `de abi van het contract`,
-    label: `contract abi`
-  },
-  abiType: {
-    custom: {
-      description: `Contract aangemaakt met een custom ABI`,
-      label: `Custom Contract`
-    },
-    multisigWallet: {
-      description: `Ethereum Multisig contract {link}`,
-      label: `Multisig Wallet`,
-      link: `zie contract code`
-    },
-    token: {
-      description: `Een standaard {erc20} token`,
-      erc20: `ERC 20`,
-      label: `Token`
-    }
-  },
-  address: {
-    hint: `het netwerk adres van het contract`,
-    label: `netwerk adres`
-  },
-  button: {
-    add: `Voeg Contract toe`,
-    cancel: `Annuleer`,
-    next: `Volgende`,
-    prev: `Terug`
-  },
-  description: {
-    hint: `een uitgebreide omschrijving van het contract`,
-    label: `(optioneel) contract beschrijving`
-  },
-  name: {
-    hint: `een beschrijvende naam van het contract`,
-    label: `contract naam`
-  },
-  title: {
-    details: `voer contract details in`,
-    type: `kies een contract type`
-  }
-};
diff --git a/js/src/i18n/nl/address.js b/js/src/i18n/nl/address.js
deleted file mode 100644
index fc9d2eab11341cabe6170f2afa19f61b702d01df..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/address.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    edit: `bewerken`,
-    forget: `vergeten`,
-    save: `opslaan`
-  },
-  delete: {
-    confirmInfo: `Weet je zeker dat je het volgende adres uit je adresboek wilt verwijderen?`,
-    title: `bevestig verwijderen`
-  },
-  title: `Adres Informatie`
-};
diff --git a/js/src/i18n/nl/addressSelect.js b/js/src/i18n/nl/addressSelect.js
deleted file mode 100755
index f447ee08871fd76ed4298132c25984a6513fc53e..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/addressSelect.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  fromEmail: `Geverifieerd met behulp van e-mail {email}`,
-  fromRegistry: `{name} (from registry)`,
-  labels: {
-    accounts: `accounts`,
-    contacts: `contacten`,
-    contracts: `contracts`
-  },
-  noAccount: `Geen account gevonden voor deze zoekopdracht...`
-};
diff --git a/js/src/i18n/nl/addresses.js b/js/src/i18n/nl/addresses.js
deleted file mode 100644
index c16c5f234dc7dfd00482b3e5e94045498cb903c6..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/addresses.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    add: `adres`
-  },
-  errors: {
-    invalidFile: `Het opgegeven bestand is ongeldig...`
-  },
-  title: `Opgeslagen Adressen`
-};
diff --git a/js/src/i18n/nl/application.js b/js/src/i18n/nl/application.js
deleted file mode 100755
index bcb110b8885b6ff3eaf091f4c34677a6d989f2a8..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/application.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  frame: {
-    error: `FOUT: Deze applicatie kan niet en zou niet geladen moeten worden in een embedded iFrame`
-  },
-  status: {
-    consensus: {
-      capable: `Capable`,
-      capableUntil: `Capable tot #{blockNumber}`,
-      incapableSince: `Incapable sinds #{blockNumber}`,
-      unknown: `Onbekende capability`
-    },
-    upgrade: `Upgrade`
-  }
-};
diff --git a/js/src/i18n/nl/connection.js b/js/src/i18n/nl/connection.js
deleted file mode 100755
index 3fa28effea6bb16f6e12b015a7d71110befcb8c4..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/connection.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  connectingAPI: `Verbinden met de Parity Secure API.`,
-  connectingNode: `Verbinden met de Parity Node. Conroleer of je Parity node actief en op het netwerk bereikbaar is als dit bericht op je scherm blijft staan.`,
-  invalidToken: `ongeldige signer token`,
-  noConnection: `Kan geen verbinding maken met de Parity Secure API. Voer {newToken} uit en geef het token hieronder in om het secure token bij te werken of een nieuwe te genereren.`,
-  token: {
-    hint: `een Parity gegenereerd token`,
-    label: `secure token`
-  }
-};
diff --git a/js/src/i18n/nl/contract.js b/js/src/i18n/nl/contract.js
deleted file mode 100755
index 9818f5eddeaf1dbf135a545082b35520568c7362..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/contract.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    close: `Sluit`,
-    details: `details`,
-    edit: `bewerken`,
-    execute: `uitvoeren`,
-    forget: `vergeten`
-  },
-  details: {
-    title: `contract details`
-  },
-  events: {
-    eventPending: `pending`,
-    noEvents: `Er zijn vanuit dit contract nog geen events verzonden.`,
-    title: `events`
-  },
-  minedBlock: `Opgenomen in blok #{blockNumber}`,
-  queries: {
-    buttons: {
-      query: `Query`
-    },
-    title: `queries`
-  },
-  title: `Contract Informatie`
-};
diff --git a/js/src/i18n/nl/contracts.js b/js/src/i18n/nl/contracts.js
deleted file mode 100644
index 18ab842a0298b99171e66135de439856cf800d31..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/contracts.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    deploy: `publiceer`,
-    develop: `ontwikkel`,
-    watch: `bekijk`
-  },
-  sortOrder: {
-    date: `datum`,
-    minedBlock: `opgenomen blok`
-  },
-  title: `Contracten`
-};
diff --git a/js/src/i18n/nl/createAccount.js b/js/src/i18n/nl/createAccount.js
deleted file mode 100755
index 98b7ac26bf1f353ce42f1ae203bf2d14a3d3b015..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/createAccount.js
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  accountDetails: {
-    address: {
-      hint: `Het netwerk adres van het account`,
-      label: `adres`
-    },
-    phrase: {
-      hint: `De account herstel zin`,
-      label: `Eigenaar's herstel zin (houd deze woorden veilig en prive want hiermee kun je volledige, ongelimiteerde toegang tot het account verkrijgen).`
-    }
-  },
-  accountDetailsGeth: {
-    imported: `Je hebt {number} adressen geïmporteerd uit de Geth keystore:`
-  },
-  button: {
-    back: `Terug`,
-    cancel: `Annuleer`,
-    create: `Aanmaken`,
-    done: `Klaar`,
-    import: `Importeer`,
-    next: `Volgende`,
-    print: `Herstel zin afdrukken`
-  },
-  creationType: {
-    fromGeth: {
-      description: `Importeer accounts uit Geth keystore met het originele wachtwoord`,
-      label: `Geth keystore`
-    },
-    fromJSON: {
-      description: `Importeer account uit een JSON sleutelbestand met het originele wachtwoord`,
-      label: `JSON bestand`
-    },
-    fromNew: {
-      description: `Selecteer je identiteits-icoon en kies je wachtwoord`,
-      label: `Nieuw Account`
-    },
-    fromPhrase: {
-      description: `Herstel je account met een eerder bewaarde herstel zin en een nieuw wachtwoord`,
-      label: `Herstel zin`
-    },
-    fromPresale: {
-      description: `Importeer een Ethereum voor-verkoop (pre-sale) wallet bestand met het originele wachtwoord`,
-      label: `voor-verkoop wallet`
-    },
-    fromRaw: {
-      description: `Importeer een eerder gemaakte prive sleutel (raw private key) met een nieuw wachtwoord`,
-      label: `Prive sleutel`
-    },
-    info: `Selecteer de manier waarop je je account wilt aanmaken of importeren. Maak een nieuw account aan met een naam en wachtwoord, of importeer/herstel een bestaand account vanuit verschillende bronnen zoals een herstel zin of een sleutelbestand. Met behulp van deze wizard word je door het proces begeleid om een account aan te maken.`
-  },
-  newAccount: {
-    hint: {
-      hint: `(optioneel) een hint om je te helpen het wachtwoord te herinneren`,
-      label: `wachtwoord hint`
-    },
-    name: {
-      hint: `een beschrijvende naam van het account`,
-      label: `account naam`
-    },
-    password: {
-      hint: `een sterk en uniek wachtwoord`,
-      label: `wachtwoord`
-    },
-    password2: {
-      hint: `bevestig je wachtwoord`,
-      label: `wachtwoord (herhaal)`
-    }
-  },
-  newGeth: {
-    available: `Er zijn momenteel {count} importeerbare sleutels (keys) beschikbaar vanuit Geth keystore, welke nog niet in je Parity installatie beschikbaar zijn. Selecteer de accounts die je wilt importeren en ga verder naar de volgende stap om het importeren te voltooien.`,
-    noKeys: `Er zijn momenteel geen importeerbare sleutels (keys) beschikbaar in de Geth keystore; of ze zijn al in je Parity installatie beschikbaar`
-  },
-  newImport: {
-    file: {
-      hint: `het te importeren wallet bestand`,
-      label: `wallet bestand`
-    },
-    hint: {
-      hint: `(optioneel) een hint om je te helpen het wachtwoord te herinneren`,
-      label: `wachtwoord hint`
-    },
-    name: {
-      hint: `een beschrijvende naam van het account`,
-      label: `account naam`
-    },
-    password: {
-      hint: `het wachtwoord om je wallet te openen`,
-      label: `wachtwoord`
-    }
-  },
-  rawKey: {
-    hint: {
-      hint: `(optioneel) een hint om je te helpen het wachtwoord te herinneren`,
-      label: `wachtwoord hint`
-    },
-    name: {
-      hint: `een beschrijvende naam van het account`,
-      label: `account naam`
-    },
-    password: {
-      hint: `een sterk en uniek wachtwoord`,
-      label: `wachtwoord`
-    },
-    password2: {
-      hint: `herhaal je wachtwoord ter controle`,
-      label: `wachtwoord (herhaling)`
-    },
-    private: {
-      hint: `de hexadecimaal gecodeerde prive sleutel (raw private key)`,
-      label: `prive sleutel`
-    }
-  },
-  recoveryPhrase: {
-    hint: {
-      hint: `(optioneel) een hint om je te helpen het wachtwoord te herinneren`,
-      label: `wachtwoord hint`
-    },
-    name: {
-      hint: `een beschrijvende naam van het account`,
-      label: `account naam`
-    },
-    password: {
-      hint: `een sterk en uniek wachtwoord`,
-      label: `wachtwoord`
-    },
-    password2: {
-      hint: `herhaal je wachtwoord ter controle`,
-      label: `wachtwoord (herhaling)`
-    },
-    phrase: {
-      hint: `de account herstel zin opgebouwd uit een aantal willekeurige woorden`,
-      label: `account herstel zin`
-    },
-    windowsKey: {
-      label: `Sleutel (key) is aangemaakt met Parity <1.4.5 op Windows`
-    }
-  },
-  title: {
-    accountInfo: `account informatie`,
-    createAccount: `account aanmaken`,
-    createType: `manier van aanmaken`,
-    importWallet: `importeer wallet`
-  }
-};
diff --git a/js/src/i18n/nl/createWallet.js b/js/src/i18n/nl/createWallet.js
deleted file mode 100644
index 9f34194978d0cc6028d1262bee9d11fdb5d6e961..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/createWallet.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    add: `Voeg toe`,
-    cancel: `Annuleer`,
-    close: `Sluit`,
-    create: `Creëer`,
-    done: `Klaar`,
-    next: `Volgende`,
-    sending: `Verzenden...`
-  },
-  deployment: {
-    message: `Het aanmaken wordt momenteel uitgevoerd`
-  },
-  details: {
-    address: {
-      hint: `het wallet contract adres`,
-      label: `wallet adres`
-    },
-    dayLimitMulti: {
-      hint: `hoeveelheid ETH die dagelijks kan worden uitgegeven zonder bevestigingen`,
-      label: `wallet dag limiet`
-    },
-    description: {
-      hint: `de lokale omschrijving voor dit wallet`,
-      label: `wallet omschrijving (optioneel)`
-    },
-    descriptionMulti: {
-      hint: `de lokale omschrijving voor dit wallet`,
-      label: `wallet omschrijving (optioneel)`
-    },
-    name: {
-      hint: `de lokale naam voor dit wallet`,
-      label: `wallet naam`
-    },
-    nameMulti: {
-      hint: `de lokale naam voor dit wallet`,
-      label: `wallet naam`
-    },
-    ownerMulti: {
-      hint: `het account wat eigenaar is van dit contract`,
-      label: `van account (contract eigenaar)`
-    },
-    ownersMulti: {
-      label: `andere wallet eigenaren`
-    },
-    ownersMultiReq: {
-      hint: `vereiste aantal eigenaren om de transactie goed te keuren`,
-      label: `vereiste eigenaren`
-    }
-  },
-  info: {
-    added: `toegevoegd`,
-    copyAddress: `kopier adres naar klembord`,
-    created: `{name} is {deployedOrAdded} in`,
-    dayLimit: `De dag limiet is ingestel op {dayLimit} ETH.`,
-    deployed: `aangemaakt`,
-    numOwners: `{numOwners} eigenaren zijn vereist om de transactie goed te keuren.`,
-    owners: `De wallet eigenaren zijn:`
-  },
-  rejected: {
-    message: `Het aanmaken is mislukt`,
-    state: `Je wallet zal niet worden aangemaakt. Je kunt dit venster nu veilig sluiten.`,
-    title: `mislukt`
-  },
-  states: {
-    completed: `Het contract is succesvol aangemaakt`,
-    confirmationNeeded: `Voor het aanmaken van dit contract is bevestiging door andere eigenaren van het Wallet vereist`,
-    preparing: `Transactie aan het voorbereiden voor verzending op het netwerk`,
-    validatingCode: `De contract code van het aangemaakte contract wordt gevalideerd`,
-    waitingConfirm: `Wachten tot de transactie bevestigd is in de Parity Secure Signer`,
-    waitingReceipt: `Wachten tot het aanmaken van het contract bevestigd is`
-  },
-  steps: {
-    deployment: `wallet aanmaken`,
-    details: `wallet details`,
-    info: `wallet informatie`,
-    type: `wallet type`
-  },
-  type: {
-    multisig: {
-      description: `Maak een {link} Wallet aan`,
-      label: `Multi-Sig wallet`,
-      link: `standaard multi-signature`
-    },
-    watch: {
-      description: `Voeg een bestaand wallet toe aan je accounts`,
-      label: `Monitor/volg een wallet`
-    }
-  }
-};
diff --git a/js/src/i18n/nl/dapp.js b/js/src/i18n/nl/dapp.js
deleted file mode 100755
index b57a6ca16b15b4717308181e0119d164b779ea5c..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/dapp.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  loading: `Bezig met laden`,
-  unavailable: `De dapp is niet bereikbaar`
-};
diff --git a/js/src/i18n/nl/dapps.js b/js/src/i18n/nl/dapps.js
deleted file mode 100644
index 6949c4d48e1e852838bc0ec1437a82030c77415f..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/dapps.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  add: {
-    builtin: {
-      desc: `Experimentele applicaties, ontwikkeld door het Parity team om te demonstreren wat de dapp mogelijkheden, integratie en experimentele opties zijn; en om netwerkbreed client gedrag te controleren.`,
-      label: `Applicaties gebundeld met Parity`
-    },
-    label: `zichtbare applicaties`,
-    local: {
-      desc: `Alle lokaal door de gebruiker geinstalleerde applicaties die toegang hebben tot de Parity client.`,
-      label: `Lokaal beschikbare applicaties`
-    },
-    network: {
-      desc: `Deze applicaties zijn niet bij Parity aangesloten, noch worden ze gepubliceerd door Parity. Alle applicaties blijven in beheer van hun eigen auteur. Zorg ervoor dat je snapt wat het doel van een applicatie is, voordat je ermee aan de slag gaat.`,
-      label: `Applicaties op het wereldwijde netwerk`
-    }
-  },
-  button: {
-    edit: `bewerk`,
-    permissions: `toestemming`
-  },
-  external: {
-    accept: `Ik begrijp dat deze toepassingen niet bij Parity zijn aangesloten`,
-    warning: `Deze applicaties zijn gepuliceerd door derde partijen welke niet verwant zijn aan Parity en zijn dus ook niet door Parity uitgebracht. Alle applicaties blijven in beheer van hun eigen auteur. Zorg ervoor dat je snapt wat het doel van een applicatie is voordat je ermee aan de slag gaat.`
-  },
-  label: `Gedecentraliseerde Applicaties`,
-  permissions: {
-    label: `zichtbare dapp accounts`
-  }
-};
diff --git a/js/src/i18n/nl/deleteAccount.js b/js/src/i18n/nl/deleteAccount.js
deleted file mode 100755
index e9e17faedc495eef5b31417fe0e646eb73022409..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/deleteAccount.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  password: {
-    hint: `Voer ter bevestiging het wachtwoord in om je account te verwijderen`,
-    label: `account wachtwoord`
-  },
-  question: `Weet je zeker dat je het volgende account permanent wilt verwijderen?`,
-  title: `bevestig verwijderen`
-};
diff --git a/js/src/i18n/nl/deployContract.js b/js/src/i18n/nl/deployContract.js
deleted file mode 100644
index 042d52276603389e0c5915db6ee918e421dffea4..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/deployContract.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: {
-    title: `Het contract wordt momenteel aangemaakt`
-  },
-  button: {
-    cancel: `Annuleer`,
-    close: `Sluit`,
-    create: `Creëer`,
-    done: `Klaar`,
-    next: `Volgende`
-  },
-  completed: {
-    description: `Je contract is aangemaakt en opgenomen in`
-  },
-  details: {
-    abi: {
-      hint: `de abi van het aan te maken contract of solc combined-output`,
-      label: `abi / solc combined-output`
-    },
-    address: {
-      hint: `het account wat eigenaar is van dit contract`,
-      label: `van account (contract eigenaar)`
-    },
-    advanced: {
-      label: `geavanceerde verzend opties`
-    },
-    amount: {
-      hint: `de naar het contract te verzenden hoeveelheid`,
-      label: `te verzenden hoeveelheid (in {tag})`
-    },
-    code: {
-      hint: `de gecompileerde code van het aan te maken contract`,
-      label: `code`
-    },
-    contract: {
-      label: `selecteer een contract`
-    },
-    description: {
-      hint: `een beschrijving van het contract`,
-      label: `contract omschrijving (optioneel)`
-    },
-    name: {
-      hint: `een naam voor het aangemaakte contract`,
-      label: `contract naam`
-    }
-  },
-  owner: {
-    noneSelected: `er dient een geldig account als contract eigenaar geselecteerd te zijn`
-  },
-  parameters: {
-    choose: `Kies de contract parameters`
-  },
-  rejected: {
-    description: `Je kunt dit scherm veilig sluiten, het contract zal niet worden aangemaakt.`,
-    title: `Het aanmaken van het contract is afgewezen`
-  },
-  state: {
-    completed: `Het contract is succesvol aangemaakt`,
-    confirmationNeeded: `Deze actie vereist de bevestiging van de andere eigenaren van het contract`,
-    preparing: `Transactie aan het voorbereiden om te verzenden op het netwerk`,
-    validatingCode: `De contract code van het aangemaakte contract valideren`,
-    waitReceipt: `Wachten tot het aanmaken van het contract bevestigd is`,
-    waitSigner: `Wachten tot de transactie bevestigd is in de Parity Secure Signer`
-  },
-  title: {
-    completed: `voltooid`,
-    deployment: `aangemaakt`,
-    details: `contract details`,
-    extras: `extra informatie`,
-    failed: `aanmaken mislukt`,
-    parameters: `contract parameters`,
-    rejected: `afgewezen`
-  }
-};
diff --git a/js/src/i18n/nl/details_windows.js b/js/src/i18n/nl/details_windows.js
deleted file mode 100644
index fcc5700665db8ae92fc1906d7ac966c2d9783bed..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/details_windows.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default `Windows`;
diff --git a/js/src/i18n/nl/editMeta.js b/js/src/i18n/nl/editMeta.js
deleted file mode 100644
index 9ab84af9d4f2ed6b46f435d44e88b84dca213854..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/editMeta.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  description: {
-    hint: `omschrijving van dit adres`,
-    label: `adres omschrijving`
-  },
-  name: {
-    label: `naam`
-  },
-  passwordHint: {
-    hint: `een hint om je wachtwoord te herstellen`,
-    label: `(optioneel) wachtwoord hint`
-  },
-  tags: {
-    hint: `druk op <Enter> om een label toe te voegen`,
-    label: `(optional) labels`
-  },
-  title: `bewerk metadata`
-};
diff --git a/js/src/i18n/nl/errors.js b/js/src/i18n/nl/errors.js
deleted file mode 100644
index 02f7ae6bc517482762834595373eb2a363c59a23..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/errors.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  duplicateName: `deze naam bestaat al`,
-  invalidKey: `de prive sleutel (raw key) is hexadecimaal, 64 karakters lang en en begint met "0x"`,
-  noFile: `selecteer een geldig wallet bestand om te importeren`,
-  noKey: `je dient de prive sleutel (raw private key) in te voeren`,
-  noMatchPassword: `het ingevoerde wachtwoord is onjuist`,
-  noName: `je dient een geldige naam voor het account op te geven`
-};
diff --git a/js/src/i18n/nl/executeContract.js b/js/src/i18n/nl/executeContract.js
deleted file mode 100644
index c11c799edd3a43d3d99e405e226f1ad891897c01..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/executeContract.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: {
-    posted: `Je transactie is op het netwerk gepubliceerd`,
-    title: `De functie wordt uitgevoerd`,
-    waitAuth: `Wachten op autorisatie in de Parity Signer`
-  },
-  button: {
-    cancel: `annuleer`,
-    done: `klaar`,
-    next: `volgende`,
-    post: `verzend transactie`,
-    prev: `vorige`
-  },
-  details: {
-    address: {
-      hint: `van account`,
-      label: `het account waarmee je de transactie wilt uitvoeren`
-    },
-    advancedCheck: {
-      label: `geavanceerde verzend opties`
-    },
-    amount: {
-      hint: `de in deze transactie te verzenden hoeveelheid`,
-      label: `transactie waarde (in ETH)`
-    },
-    function: {
-      hint: `de uit het contract aan te roepen functie`,
-      label: `uit te voeren functie`
-    }
-  },
-  rejected: {
-    state: `Je kunt dit venster veilig sluiten, de functie zal niet worden uitgevoerd.`,
-    title: `De uitvoering is afgewezen`
-  },
-  steps: {
-    advanced: `geavanceerde opties`,
-    complete: `voltooi`,
-    rejected: `afgewezen`,
-    sending: `verzenden`,
-    transfer: `functie details`
-  }
-};
diff --git a/js/src/i18n/nl/extension.js b/js/src/i18n/nl/extension.js
deleted file mode 100644
index fbc12210b8fe5177b90a60ab061ddde4676e3491..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/extension.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  install: `Installeer de extensie nu`,
-  intro: `Parity heeft nu een extensie voor Chrome beschikbaar waarmee je veillig Ethereum-enabled decentrale applicaties kunt bekijken. Het wordt ten zeerste aanbevolen om deze extensie te installeren om je Parity ervaring nog beter te maken.`
-};
diff --git a/js/src/i18n/nl/faucet.js b/js/src/i18n/nl/faucet.js
deleted file mode 100644
index f35acc0b7be9de245b11ab53071933593d456b56..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/faucet.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    close: `sluit`,
-    done: `klaar`,
-    request: `verzoek`
-  },
-  summary: {
-    done: `Jouw Kovan ETH is aangevraagd bij het faucet, wat reageerde met het volgende bericht -`,
-    info: `Om een hoeveelheid Kovan ETH aan te vragen voor dit adres, moet je ervoor zorgen dat het adres op het mainnet sms-geverifieerd is. Zodra je dit uitvoert, zal het faucet Kovan ETH naar je huidige account verzenden.`
-  },
-  title: `Kovan ETH Faucet`
-};
diff --git a/js/src/i18n/nl/firstRun.js b/js/src/i18n/nl/firstRun.js
deleted file mode 100755
index 9c7c4cf5debf0ada928044b7896239f57b1051bd..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/firstRun.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    close: `Sluiten`,
-    create: `Creëer`,
-    next: `Volgende`,
-    print: `Woorden Afdrukken`,
-    skip: `Overslaan`
-  },
-  completed: {
-    congrats: `Gefeliciteerd! Je node configuratie is succesvol afgerond en het programma is klaar voor gebruikt.`,
-    next: `Om je snel aan de slag te laten gaan krijg je in de volgende stap een korte algemene inleiding in het gebruik van het programma en lopen we door de beschikbare funcies.`
-  },
-  title: {
-    completed: `voltooid`,
-    newAccount: `nieuw account`,
-    recovery: `herstelzin`,
-    terms: `voorwaarden`,
-    welcome: `welkom`
-  },
-  tnc: {
-    accept: `Ik accepteer de voorwaarden en condities`
-  },
-  welcome: {
-    description: `Als onderdeel van een nieuwe installatie, begeleiden we je in de enkele hierna volgende stappen met het configureren van je Parity node en jouw bijbehorende accounts. Ons doel hiervan is om het je zo gemakkelijk mogelijk te maken and zodat je binnen de kortste tijd klaar bent voor gebruik, dus heb even geduld en blijf bij ons. Zodra je de wizard voltooid hebt, heb je -`,
-    greeting: `Welkom bij Parity, de snelste en makkelijkste manier om je eigen node te draaien.`,
-    next: `Klik volgende om door te gaan.`,
-    step: {
-      account: `Je eerste Parity account aangemaakt;`,
-      privacy: `Onze privacybeleid en bedrijfsvoorwaarden begrepen;`,
-      recovery: `De mogelijkheid om je account te herstellen.`
-    }
-  }
-};
diff --git a/js/src/i18n/nl/home.js b/js/src/i18n/nl/home.js
deleted file mode 100644
index 4a55894d7e2c23e6643b09091227e30cb45a8194..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/home.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  account: {
-    visited: `bekeken {when}`
-  },
-  accounts: {
-    none: `Geen recente account geschiedenis beschikbaar`,
-    title: `Recente Accounts`
-  },
-  dapp: {
-    visited: `bekeken {when}`
-  },
-  dapps: {
-    none: `Geen recente applicatie geschiedenis beschikbaar`,
-    title: `Recente Dapps`
-  },
-  title: `Parity Home`,
-  url: {
-    none: `Geen recente URL geschiedenis beschikbaar`,
-    title: `Web Applicaties`,
-    visited: `bezocht {when}`
-  }
-};
diff --git a/js/src/i18n/nl/index.js b/js/src/i18n/nl/index.js
deleted file mode 100755
index 0d11be8f10db002d1636a8f71fc2c3599fcf6ffd..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/index.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import account from './account';
-import accounts from './accounts';
-import addAddress from './addAddress';
-import addContract from './addContract';
-import address from './address';
-import addresses from './addresses';
-import addressSelect from './addressSelect';
-import application from './application';
-import connection from './connection';
-import contract from './contract';
-import contracts from './contracts';
-import createAccount from './createAccount';
-import createWallet from './createWallet';
-import dapp from './dapp';
-import dapps from './dapps';
-import deleteAccount from './deleteAccount';
-import deployContract from './deployContract';
-import editMeta from './editMeta';
-import errors from './errors';
-import executeContract from './executeContract';
-import extension from './extension';
-import faucet from './faucet';
-import firstRun from './firstRun';
-import home from './home';
-import loadContract from './loadContract';
-import parityBar from './parityBar';
-import passwordChange from './passwordChange';
-import saveContract from './saveContract';
-import settings from './settings';
-import shapeshift from './shapeshift';
-import signer from './signer';
-import status from './status';
-import tabBar from './tabBar';
-import transfer from './transfer';
-import txEditor from './txEditor';
-import ui from './ui';
-import upgradeParity from './upgradeParity';
-import vaults from './vaults';
-import verification from './verification';
-import wallet from './wallet';
-import walletSettings from './walletSettings';
-import web from './web';
-import writeContract from './writeContract';
-
-export default {
-  account,
-  accounts,
-  addAddress,
-  addContract,
-  address,
-  addresses,
-  addressSelect,
-  application,
-  connection,
-  contract,
-  contracts,
-  createAccount,
-  createWallet,
-  dapp,
-  dapps,
-  deleteAccount,
-  deployContract,
-  editMeta,
-  errors,
-  executeContract,
-  extension,
-  faucet,
-  firstRun,
-  home,
-  loadContract,
-  parityBar,
-  passwordChange,
-  saveContract,
-  settings,
-  shapeshift,
-  signer,
-  status,
-  tabBar,
-  transfer,
-  txEditor,
-  ui,
-  upgradeParity,
-  vaults,
-  verification,
-  wallet,
-  walletSettings,
-  web,
-  writeContract
-};
diff --git a/js/src/i18n/nl/loadContract.js b/js/src/i18n/nl/loadContract.js
deleted file mode 100644
index fc3f43c3b171cf631117fff0459265adf5f088b9..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/loadContract.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `Annuleer`,
-    load: `Laad`,
-    no: `Nee`,
-    yes: `Ja`
-  },
-  contract: {
-    savedAt: `Opgeslagen {when}`
-  },
-  header: {
-    saved: `Opgeslagen Contracten`,
-    snippets: `Contract Snippets`
-  },
-  removal: {
-    confirm: `Weet je zeker dat je het volgende contract van je opgeslagen contracten wilt verwijderen?`,
-    savedAt: `Opgeslagen {when}`
-  },
-  tab: {
-    local: `Lokaal`,
-    snippets: `Snippets`
-  },
-  title: {
-    remove: `bevestig verwijderen`,
-    view: `bekijk contracten`
-  }
-};
diff --git a/js/src/i18n/nl/parityBar.js b/js/src/i18n/nl/parityBar.js
deleted file mode 100644
index eb10fe569b786f4911dc14ff4043fc4d4395acf9..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/parityBar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    close: `Sluit`
-  },
-  label: {
-    parity: `Parity`,
-    signer: `Signer`
-  },
-  title: {
-    accounts: `Standaard Account`,
-    signer: `Parity Signer: Wachten`
-  }
-};
diff --git a/js/src/i18n/nl/passwordChange.js b/js/src/i18n/nl/passwordChange.js
deleted file mode 100644
index eca3fd919563d400024dc802590d3c6dd4cff693..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/passwordChange.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `Annuleer`,
-    change: `Wijzig`,
-    test: `Test`,
-    wait: `Wacht...`
-  },
-  currentPassword: {
-    hint: `je huidige wachtwoord voor dit account`,
-    label: `huidig wachtwoord`
-  },
-  newPassword: {
-    hint: `het nieuwe wachtwoord vor dit account`,
-    label: `nieuw wachtwoord`
-  },
-  passwordHint: {
-    display: `Hint {hint}`,
-    hint: `hint voor het nieuwe wachtwoord`,
-    label: `(optioneel) nieuwe wachtwoord hint`
-  },
-  repeatPassword: {
-    error: `de ingevoerde wachtwoorden zijn niet gelijk`,
-    hint: `herhaal het nieuwe wachtwoord voor dit account`,
-    label: `herhaal nieuw wachtwoord`
-  },
-  success: `Je wachtwoord is succesvol aangepast`,
-  tabChange: {
-    label: `Wijzig wachtwoord`
-  },
-  tabTest: {
-    label: `Test wachtwoord`
-  },
-  testPassword: {
-    hint: `je account wachtwoord`,
-    label: `wachtwoord`
-  },
-  title: `Wachtwoord Manager`
-};
diff --git a/js/src/i18n/nl/saveContract.js b/js/src/i18n/nl/saveContract.js
deleted file mode 100644
index e51a3be3db8371c63eabaedd54edd1a31d38c461..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/saveContract.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    cancel: `Annuleer`,
-    save: `Opslaan`
-  },
-  name: {
-    hint: `kies een naam voor dit contract`,
-    label: `contract naam`
-  },
-  title: `contract opslaan`
-};
diff --git a/js/src/i18n/nl/settings.js b/js/src/i18n/nl/settings.js
deleted file mode 100644
index f436d39c652415e28e0b5a0b1be27a37c8a2bc22..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/settings.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  background: {
-    button_more: `genereer meer`,
-    overview_0: `Het achtergrond patroon dat je nu kunt zien is uniek voor jouw Parity installatie. Het veranderd elke keer als je een nieuw Signer token genereerd. Op deze manier kunnen gedecentraliseerde applicaties niet doen alsof ze betrouwbaar zijn.`,
-    overview_1: `Kies het patroon dat je wilt en onthoud het. Dit patroon wordt vanaf nu altijd getoond, tenzij je je browser cache wist of een nieuw Signer token genereerd.`,
-    label: `achtergrond`
-  },
-  parity: {
-    chains: {
-      chain_classic: `Parity synchroniseert met het Ethereum Classic netwerk`,
-      chain_dev: `Parity gebruikt een lokale ontwikkelaars chain`,
-      chain_expanse: `Parity synchroniseert met het Expanse netwerk`,
-      chain_foundation: `Parity synchroniseert met het Ethereum netwerk wat door de Ethereum Foundation is uitgebracht`,
-      chain_kovan: `Parity synchroniseert met het Kovan test netwerk`,
-      chain_olympic: `Parity synchroniseert met het Olympic test netwerk`,
-      chain_ropsten: `Parity synchroniseert met het Ropsten test netwerk`,
-      cmorden_kovan: `Parity synchroniseert met het Morden (Classic) test netwerk`,
-      hint: `de chain waarmee de Parity node synchroniseert`,
-      label: `te synchroniseren chain/netwerk`
-    },
-    languages: {
-      hint: `de taal waarin deze interface wordt weergegeven`,
-      label: `Weergave taal`
-    },
-    loglevels: `Kies hoeveel details er in het logboek worden bijgehouden.`,
-    modes: {
-      hint: `de synchronisatie modus van de Parity node`,
-      label: `Synchronisatie modus`,
-      mode_active: `Parity synchroniseert de chain continu`,
-      mode_dark: `Parity synchroniseert alleen als de RPC actief is`,
-      mode_offline: `Parity synchroniseert niet`,
-      mode_passive: `Parity synchroniseert in het begin. Daarna slaapt Parity en wordt regelmatig wakker voor synchronisatie`
-    },
-    overview_0: `Pas de Parity node instellingen aan en kies de manier van synchroniseren in dit menu.`,
-    label: `parity`
-  },
-  proxy: {
-    details_0: `In plaats van Parity te openen via het IP adres en poort-nummer, kun je toegang verkrijgen tot het .parity sub-domein door {homeProxy} te bezoeken. Om sub-domein gebaseerde routing in te stellen, dien je de proxy vermelding aan je browser proxy instellingen toe te voegen,`,
-    details_1: `Om je te helpen met het configureren van je proxy, zijn er instructies beschikbaar voor {windowsLink}, {macOSLink} or {ubuntuLink}.`,
-    details_macos: `macOS`,
-    details_ubuntu: `Ubuntu`,
-    details_windows: `Windows`,
-    overview_0: `Met de proxy instellingen heb je de mogelijkheid om via een makkelijk te onthouden adres toegang te verkrijgen tot Parity en alle onderliggende decentrale applicaties.`,
-    label: `proxy`
-  },
-  views: {
-    accounts: {
-      description: `Een overzicht van alle aan deze Parity installatie verbonden accounts, inclusief geimporteerde accounts. Verzend transacties, ontvang inkomende transacties, berheer je saldo en financier je accounts.`,
-      label: `Accounts`
-    },
-    addresses: {
-      description: `Een overzicht van alle door deze Parity installatie beheerde contacten en adresboek items. Monitor en volg accounts waarbij je transactie details met slechts een muisklik kunt weergeven.`,
-      label: `Adresboek`
-    },
-    apps: {
-      description: `Decentrale applicaties die gebruik maken van het onderliggende Ethereum netwerk. Voeg applicaties toe, beheer je applicatie portfolio en maak gebruik van applicaties op het wereldwijde netwerk.`,
-      label: `Applicaties`
-    },
-    contracts: {
-      description: `Monitor, volg en maak gebruik van specifieke contracten die op het netwerk zijn gezet. Dit is een meer technisch gerichte omgeving, voornamelijk bedoeld voor geavanceerde gebruikers die de werking van bepaalde contracten goed begrijpen.`,
-      label: `Contracten`
-    },
-    overview_0: `Beheer de beschikbare weergaven van deze interface, en selecteer enkel de delen van de applicatie die voor jou van belang zijn.`,
-    overview_1: `Ben je een eind gebruiker? De standaard instellingen zijn geschikt voor zowel beginners als gevorderde gebruikers.`,
-    overview_2: `Ben je een ontwikkelaar? Voeg enkele functies toe om je contracten te beheren en gebruik te maken van gedecentraliseerde applicaties.`,
-    overview_3: `Ben je een miner of draai je een grootschalige node? Voeg enkele functies toe om je alle informatie te geven die je nodig hebt om je node te monitoren.`,
-    settings: {
-      description: `Deze weergave. Hiermee kun je Parity aan passen in termen van opties, bediening en look en feel.`,
-      label: `Instellingen`
-    },
-    signer: {
-      description: `Het beveiligde transactie beheergebied van de applicatie waar je goedkeuring kunt verlenen aan elke uitgaande transactie die je hebt gemaakt met Parity evenals de transacties die in de wachtrij zijn geplaatst door decentrale applicaties.`,
-      label: `Signer`
-    },
-    status: {
-      description: `Volg hoe de Parity node zijn werk doet en je verbind met het netwerk en bekijk de logboeken van de momenteel draaiende node met mining details (indien geconfigureerd en ingeschakeld).`,
-      label: `Status`
-    },
-    label: `weergaven`,
-    home: {
-      label: `Thuis`
-    }
-  },
-  label: `instellingen`
-};
diff --git a/js/src/i18n/nl/shapeshift.js b/js/src/i18n/nl/shapeshift.js
deleted file mode 100755
index caa28adafeb85506c8b516e8870b73b1694cd776..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/shapeshift.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  awaitingDepositStep: {
-    awaitingConfirmation: `Wachten tot bevestigd is dat je {typeSymbol} storting op het account van het wisselkantoor is aangekomen.`,
-    awaitingDeposit: `{shapeshiftLink} is aan het wachten op {typeSymbol} storting. Verzend de valuta vanuit je {typeSymbol} netwerk client naar -`,
-    minimumMaximum: `{minimum} minimum, {maximum} maximum`
-  },
-  awaitingExchangeStep: {
-    awaitingCompletion: `Wachten op de voltooiing van het omwisselen van de valuta en op de overschrijving van de valuta naar je Parity account.`,
-    receivedInfo: `{shapeshiftLink} heeft een storting ontvangen van -`
-  },
-  button: {
-    cancel: `Annuleer`,
-    done: `Sluit`,
-    shift: `Wissel valuta om`
-  },
-  completedStep: {
-    completed: `{shapeshiftLink} heeft het omwisselen van de valuta voltooid.`,
-    parityFunds: `De saldo wijziging zal spoedig in je Parity client worden weergegeven.`
-  },
-  errorStep: {
-    info: `Het omwisselen van de valuta via {shapeshiftLink} is mislukt door een fout bij het wisselkantoor. De ontvangen foutmelding van het wisselkantoor is als volgt:`
-  },
-  optionsStep: {
-    noPairs: `Er is momenteel geen wisselkoers voor het valuta-paar beschikbaar om de transactie mee uit te voeren.`,
-    returnAddr: {
-      hint: `het retouradres voor wanneer het verzenden mislukt`,
-      label: `(optioneel) {coinSymbol} retouradres`
-    },
-    terms: {
-      label: `Ik begrijp dat ShapeShift.io een dienst is van een derde partij en dat bij gebruik van deze service de overdracht van informatie en/of financiele middelen volledig buiten het beheer van Parity vallen`
-    },
-    typeSelect: {
-      hint: `het type crypto valuta om te wisselen`,
-      label: `verzend naar account vanuit`
-    }
-  },
-  price: {
-    minMax: `({minimum} minimum, {maximum} maximum)`
-  },
-  title: {
-    completed: `voltooid`,
-    deposit: `wachten op storting`,
-    details: `details`,
-    error: `omwisselen mislukt`,
-    exchange: `wachten op omwisselen`
-  },
-  warning: {
-    noPrice: `Geen prijs gevonden voor het gekozen type`
-  }
-};
diff --git a/js/src/i18n/nl/signer.js b/js/src/i18n/nl/signer.js
deleted file mode 100644
index ec7ee96f834991476deee331e566c9bf11ef8082..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/signer.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  embedded: {
-    noPending: `Er zijn momenteel geen lopende verzoeken die op je goedkeuring wachten`
-  },
-  mainDetails: {
-    editTx: `Bewerk condities/gas/gasprijs`,
-    tooltips: {
-      total1: `De waarde van de transactie inclusief de miningskosten is {total} {type}.`,
-      total2: `(Dit is inclusief een miners vergoeding van {fee} {token})`,
-      value1: `De waarde van de transactie.`
-    }
-  },
-  requestOrigin: {
-    dapp: `door een dapp op {url}`,
-    ipc: `via IPC sessie`,
-    rpc: `via RPC {rpc}`,
-    signerCurrent: `via huidige tab`,
-    signerUI: `via UI sessie`,
-    unknownInterface: `via onbekende interface`,
-    unknownRpc: `niet geïdentificeerd`,
-    unknownUrl: `onbekende URL`
-  },
-  requestsPage: {
-    noPending: `Er zijn geen verzoeken die je goedkeuring vereisen.`,
-    pendingTitle: `Openstaande Verzoeken`,
-    queueTitle: `Lokale Transacties`
-  },
-  sending: {
-    hardware: {
-      confirm: `Bevestig de transactie op je aangesloten hardware wallet`,
-      connect: `Sluit je hardware wallet aan voordat je de transactie bevestigd`
-    }
-  },
-  signRequest: {
-    request: `Een verzoek om data te ondertekenen met jouw account:`,
-    state: {
-      confirmed: `Bevestigd`,
-      rejected: `Afgewezen`
-    },
-    unknownBinary: `(Onbekende binary data)`,
-    warning: `WAARSCHUWING: Deze gevolgen hiervan kunnen ernstig zijn. Bevestig het verzoek alleen als je het zeker weet.`
-  },
-  title: `Trusted Signer`,
-  txPending: {
-    buttons: {
-      viewToggle: `bekijk transactie`
-    }
-  },
-  txPendingConfirm: {
-    buttons: {
-      confirmBusy: `Bevestigen...`,
-      confirmRequest: `Bevestig Verzoek`
-    },
-    errors: {
-      invalidWallet: `Opgegeven wallet bestand is ongeldig.`
-    },
-    password: {
-      decrypt: {
-        hint: `open (decrypt) de sleutel met je wachtwoord`,
-        label: `Sleutel Wachtwoord`
-      },
-      unlock: {
-        hint: `ontgrendel het account`,
-        label: `Account Wachtwoord`
-      }
-    },
-    passwordHint: `(hint) {passwordHint}`,
-    selectKey: {
-      hint: `De sleutelbestand (keyfile) die je voor dit account wilt gebruiken`,
-      label: `Selecteer Lokale Sleutel (key)`
-    },
-    tooltips: {
-      password: `Geef een wachtwoord voor dit account`
-    }
-  },
-  txPendingForm: {
-    changedMind: `Ik heb me bedacht`,
-    reject: `wijs verzoek af`
-  },
-  txPendingReject: {
-    buttons: {
-      reject: `Wijs Verzoek Af`
-    },
-    info: `Weet je zeker dat je dit verzoek wilt afwijzen?`,
-    undone: `Dit kan niet ongedaan gemaakt worden`
-  }
-};
diff --git a/js/src/i18n/nl/status.js b/js/src/i18n/nl/status.js
deleted file mode 100644
index 9c0294ab0291ff239b587e211707b9fdec7d3749..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/status.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  debug: {
-    reverse: `Omgekeerde volgorde`,
-    stopped: `De live weergave van de Parity logboeken is momenteel gestopt via de UI, start de live weergave om de laatste updates te zien.`,
-    title: `Node Logboeken`
-  },
-  miningSettings: {
-    input: {
-      author: {
-        hint: `de mining auteur`,
-        label: `auteur`
-      },
-      extradata: {
-        hint: `extra data voor mined blokken`,
-        label: `extra data`
-      },
-      gasFloor: {
-        hint: `het gas-floor doel voor mining`,
-        label: `gas-floor doel`
-      },
-      gasPrice: {
-        hint: `de minimale gas prijs voor mining`,
-        label: `minimale gas prijs`
-      }
-    },
-    title: `mining instellingen`
-  },
-  status: {
-    hashrate: `{hashrate} H/s`,
-    input: {
-      chain: `chain`,
-      enode: `enode`,
-      no: `nee`,
-      peers: `peers`,
-      port: `netwerk poort`,
-      rpcEnabled: `rpc ingeschakeld`,
-      rpcInterface: `rpc interface`,
-      rpcPort: `rpc poort`,
-      yes: `ja`
-    },
-    title: {
-      bestBlock: `beste block`,
-      hashRate: `hash rate`,
-      network: `netwerk instellingen`,
-      node: `Node`,
-      peers: `peers`
-    }
-  },
-  title: `Status`
-};
diff --git a/js/src/i18n/nl/tabBar.js b/js/src/i18n/nl/tabBar.js
deleted file mode 100644
index 378b536c9201a8034a0b2e52a533aada28a9b7da..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/tabBar.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  tooltip: {
-    overview: `navigeer tussen de verschillende onderdelen en weergaven in de applicatie, wissel tussen de account weergave, token weergave en decentrale applicatie weergave`
-  }
-};
diff --git a/js/src/i18n/nl/transfer.js b/js/src/i18n/nl/transfer.js
deleted file mode 100644
index 29866470b3244d3a3b04e5fbe70767cbd1fedfb2..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/transfer.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  advanced: {
-    data: {
-      hint: `de data om door te geven met de transactie`,
-      label: `transactie data`
-    }
-  },
-  buttons: {
-    back: `Terug`,
-    cancel: `Annuleer`,
-    close: `Sluit`,
-    next: `Volgende`,
-    send: `Verzend`
-  },
-  details: {
-    advanced: {
-      label: `geavanceerde verzend opties`
-    },
-    amount: {
-      hint: `de naar de ontvanger te verzenden hoeveelheid`,
-      label: `te verzenden hoeveelheid (in {tag})`
-    },
-    fullBalance: {
-      label: `volledige account balans`
-    },
-    recipient: {
-      hint: `het ontvangende adres`,
-      label: `ontvanger adres`
-    },
-    sender: {
-      hint: `het verzendende adres`,
-      label: `Verzender adres`
-    },
-    total: {
-      label: `totale transactie hoeveelheid`
-    }
-  },
-  wallet: {
-    confirmation: `Deze transactie vereist bevestiging van andere eigenaren.`,
-    operationHash: `hash van deze bewerking`
-  },
-  warning: {
-    wallet_spent_limit: `De waarde van deze transactie is hoger dan de toegestane dag limiet en zal moeten worden bevestigd door andere eigenaren.`
-  }
-};
diff --git a/js/src/i18n/nl/txEditor.js b/js/src/i18n/nl/txEditor.js
deleted file mode 100644
index 2cf0b2bbd45f086e9ab45f6c0beaced01aa37413..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/txEditor.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  condition: {
-    block: {
-      hint: `Het minimum blok voor het verzenden`,
-      label: `Transactie verzend blok`
-    },
-    blocknumber: `Verzend na bloknummer`,
-    date: {
-      hint: `De minimale datum voor het verzenden`,
-      label: `Transactie verzend datum`
-    },
-    datetime: `Verzend na datum & tijdstip`,
-    label: `Conditie waarbij transactie activeert`,
-    none: `Geen condities`,
-    time: {
-      hint: `Het minimale tijdstip voor het verzenden`,
-      label: `Transactie verzend tijdstip`
-    }
-  },
-  gas: {
-    info: `Je kunt de gas prijs kiezen op basis van de gas prijs van de transacties die recentelijk in de blokken werden opgenomen. Een lagere gas prijs betekend een goedkopere transactie. Een hogere gas prijs betekend dat je transactie sneller in een blok wordt opgenomen.`
-  }
-};
diff --git a/js/src/i18n/nl/ui.js b/js/src/i18n/nl/ui.js
deleted file mode 100644
index 1b7a9163b6a38cf5b6547a7002ab1ff834a9d64a..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/ui.js
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  actionbar: {
-    export: {
-      button: {
-        export: `exporteer`
-      }
-    },
-    import: {
-      button: {
-        cancel: `Annuleer`,
-        confirm: `Bevestig`,
-        import: `importeer`
-      },
-      confirm: `Bevestig dat dit is wat je wilt importeren.`,
-      error: `Er is een fout opgetreden: {errorText}`,
-      step: {
-        error: `fout`,
-        select: `selecteer een bestand`,
-        validate: `valideer`
-      },
-      title: `Importeer vanuit een bestand`
-    },
-    search: {
-      hint: `Voer zoekopdracht in...`
-    },
-    sort: {
-      sortBy: `Sorteer op {label}`,
-      typeDefault: `Standaard`,
-      typeEth: `Sorteer op ETH`,
-      typeName: `Sorteer op naam`,
-      typeTags: `Sorteer op tags`
-    }
-  },
-  balance: {
-    none: `Geen tegoeden gekoppeld aan dit account`
-  },
-  blockStatus: {
-    bestBlock: `{blockNumber} beste blok`,
-    syncStatus: `{currentBlock}/{highestBlock} synchroniseren`,
-    warpRestore: `{percentage}% warp restore`,
-    warpStatus: `, {percentage}% historic`
-  },
-  confirmDialog: {
-    no: `nee`,
-    yes: `ja`
-  },
-  copyToClipboard: {
-    copied: `{data} is naar het klembord gekopierd`
-  },
-  errors: {
-    close: `sluit`
-  },
-  fileSelect: {
-    defaultLabel: `Sleep hier een bestand naartoe, of klik om een bestand te selecteren voor uploaden`
-  },
-  gasPriceSelector: {
-    customTooltip: {
-      transactions: `{number} {number, plural, one {transaction} other {transactions}} met een ingestelde gasprijs tussen de {minPrice} en {maxPrice}`
-    }
-  },
-  identityName: {
-    null: `NUL`,
-    unnamed: `NAAMLOOS`
-  },
-  methodDecoding: {
-    condition: {
-      block: `, {historic, select, true {Submitted} false {Submission}} in blok {blockNumber}`,
-      time: `, {historic, select, true {Submitted} false {Submission}} op {timestamp}`
-    },
-    deploy: {
-      address: `Een contract aangemaakt op adres`,
-      params: `met de volgende parameters:`,
-      willDeploy: `Zal een contract aanmaken`,
-      withValue: `, verzenden van {value}`
-    },
-    gasUsed: `({gas} gas gebruikt)`,
-    gasValues: `{gas} gas ({gasPrice}M/{tag})`,
-    input: {
-      data: `data`,
-      input: `input`,
-      withInput: `met de {inputDesc} {inputValue}`
-    },
-    receive: {
-      contract: `het contract`,
-      info: `{historic, select, true {Received} false {Will receive}} {valueEth} van {aContract}{address}`
-    },
-    signature: {
-      info: `{historic, select, true {Executed} false {Will execute}} the {method} function on the contract {address} transferring {ethValue}{inputLength, plural, zero {,} other {passing the following {inputLength, plural, one {parameter} other {parameters}}}}`
-    },
-    token: {
-      transfer: `{historic, select, true {Transferred} false {Will transfer}} {value} naar {address}`
-    },
-    transfer: {
-      contract: `het contract`,
-      info: `{historic, select, true {Transferred} false {Will transfer}} {valueEth} naar {aContract}{address}`
-    },
-    txValues: `{historic, select, true {Provided} false {Provides}} {gasProvided}{gasUsed} voor een totale transactie waarde van {totalEthValue}`,
-    unknown: {
-      info: `{historic, select, true {Executed} false {Will execute}} the {method} on the contract {address} transferring {ethValue}.`
-    }
-  },
-  passwordStrength: {
-    label: `wachtwoord sterkte`
-  },
-  tooltips: {
-    button: {
-      done: `Klaar`,
-      next: `Volgende`,
-      skip: `Overslaan`
-    }
-  },
-  txHash: {
-    confirmations: `{count} {value, plural, one {confirmation} other {confirmations}}`,
-    oog: `De transactie heeft misschien al zijn gas verbruikt. Probeer het opnieuw met meer gas.`,
-    posted: `De transactie is op het netwerk geplaatst met hash {hashLink}`,
-    waiting: `wachten op bevestigingen`
-  },
-  vaultSelect: {
-    hint: `de kluis waaraan dit account gekoppeld is`,
-    label: `gekoppelde kluis`
-  },
-  verification: {
-    gatherData: {
-      accountHasRequested: {
-        false: `Je hebt nog geen verificatie aangevraagd voor dit account.`,
-        pending: `Aan het controleren of je verificatie hebt aangevraagd…`,
-        true: `Je hebt al verificatie aangevraagd voor dit account.`
-      },
-      accountIsVerified: {
-        false: `Je account is nog niet geverifieerd`,
-        pending: `Aan het controleren of je account is geverifieerd…`,
-        true: `Je account is al geverifieerd.`
-      },
-      fee: `De extra vergoeding is {amount} ETH.`,
-      isAbleToRequest: {
-        pending: `Valideren van je invoer…`
-      },
-      isServerRunning: {
-        false: `De verificatie server is niet actief.`,
-        pending: `Controleren of de verificatie server actief is…`,
-        true: `De verificatie server is actief.`
-      },
-      nofee: `Er zijn geen extra kosten.`,
-      termsOfService: `Ik ga akkoord met de voorwaarden en condities hieronder.`
-    }
-  }
-};
diff --git a/js/src/i18n/nl/upgradeParity.js b/js/src/i18n/nl/upgradeParity.js
deleted file mode 100644
index 732a7b267d93214560f0b489baa6995e0ce09e1c..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/upgradeParity.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: `Parity wordt momenteel bijgewerkt naar versie {newversion}. Wacht tot het proces is voltooid.`,
-  button: {
-    close: `sluiten`,
-    done: `klaar`,
-    upgrade: `werk nu bij`
-  },
-  completed: `Het bijwerken naar Parity {newversion} is succesvol voltooid. Klik op "klaar" om het programma automatisch opnieuw op te starten.`,
-  consensus: {
-    capable: `Je huidige versie van Parity voldoet aan de netwerk vereisten.`,
-    capableUntil: `Je huidige versie van Parity voldoet aan de netwerk vereisten tot aan blok {blockNumber}`,
-    incapableSince: `Je huidige versie van Parity voldoet aan de netwerk vereisten vanaf blok {blockNumber}`,
-    unknown: `Je huidige versie van Parity voldoet aan de netwerk vereisten.`
-  },
-  failed: `Het bijwerken naar Parity {newversion} gaf een fout en is mislukt.`,
-  info: {
-    currentVersion: `Je huidige versie is {currentversion}`,
-    next: `Klik op "werk nu bij" om het bijwerken van je Parity te starten.`,
-    upgrade: `Een nieuwe versie {newversion} is beschikbaar`,
-    welcome: `Welkom bij de Parity upgrade wizard, deze stelt je in staat om Parity op zeer eenvoudige wijze bij te werken naar de nieuwste versie.`
-  },
-  step: {
-    completed: `bijwerken voltooid`,
-    error: `fout`,
-    info: `nieuwe versie beschikbaar`,
-    updating: `Parity bijwerken`
-  },
-  version: {
-    unknown: `onbekend`
-  }
-};
diff --git a/js/src/i18n/nl/vaults.js b/js/src/i18n/nl/vaults.js
deleted file mode 100644
index 3659fb7d7f80692b2f04b15afa088e95386e46d5..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/vaults.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  accounts: {
-    button: {
-      cancel: `Annuleer`,
-      execute: `Stel in`
-    },
-    empty: `Er zitten geen accounts in deze kluis`,
-    title: `Beheer Kluis Accounts`
-  },
-  button: {
-    accounts: `accounts`,
-    add: `Maak kluis`,
-    close: `sluit`,
-    edit: `bewerk`,
-    open: `open`
-  },
-  confirmClose: {
-    info: `Je staat op het punt op een kluis te sluiten. Alle aan deze kluis verbonden accounts zullen niet meer zichtbaar zijn na het voltooien van deze actie. Om deze accounts weer zichtbaar te maken dien je de kluis weer te openen.`,
-    title: `Sluit Kluis`
-  },
-  confirmOpen: {
-    info: `Je staat op het punt om een kluis te openen. Na de bevestiging met je wachtwoord zullen alle aan deze kluis verbonden account zichtbaar worden. Wanneer je de kluis weer sluit zullen deze accounts weer onzichtbaar worden, tot je de kluis weer opent.`,
-    password: {
-      hint: `het wachtwoord wat je hebt gekozen bij het aanmaken van de kluis`,
-      label: `kluis wachtwoord`
-    },
-    title: `Open Kluis`
-  },
-  create: {
-    button: {
-      close: `sluit`,
-      vault: `maak kluis`
-    },
-    description: {
-      hint: `een uitgebereide omschrijving voor de kluis`
-    },
-    descriptions: {
-      label: `(optioneel) omschrijving`
-    },
-    hint: {
-      hint: `(optioneel) een hint om je het wachtwoord te helpen herinneren`,
-      label: `wachtwoord hint`
-    },
-    name: {
-      hint: `een naam voor de kluis`,
-      label: `kluis naam`
-    },
-    password: {
-      hint: `een sterk en uniek wachtwoord`,
-      label: `wachtwoord`
-    },
-    password2: {
-      hint: `verifieer je wachtwoord`,
-      label: `wachtwoord (herhaal)`
-    },
-    title: `Maak een nieuwe kluis aan`
-  },
-  editMeta: {
-    allowPassword: `Wijzig kluis wachtwoord`,
-    button: {
-      close: `sluit`,
-      save: `opslaan`
-    },
-    currentPassword: {
-      hint: `je huidige kluis wachtwoord`,
-      label: `huidige wachtwoord`
-    },
-    description: {
-      hint: `de  omschrijving van deze kluis`,
-      label: `kluis omschrijving`
-    },
-    password: {
-      hint: `een sterk, uniek wachtwoord`,
-      label: `nieuw wachtwoord`
-    },
-    password2: {
-      hint: `verifieer je nieuwe wachtwoord`,
-      label: `nieuw wachtwoord (herhaal)`
-    },
-    passwordHint: {
-      hint: `je wachtwoord hint voor deze kluis`,
-      label: `wachtwoord hint`
-    },
-    title: `Bewerk Kluis Metadata`
-  },
-  empty: `Er zijn momenteel geen kluizen om weer tegeven.`,
-  selector: {
-    noneAvailable: `Er zijn momenteel geen kluizen geopend en beschikbaar voor selectie. Maak eerst een kluis aan en open deze, voordat je een kluis selecteert voor het verplaatsen van een account.`,
-    title: `Selecteer Account Kluis`
-  },
-  title: `Kluis Beheer`
-};
diff --git a/js/src/i18n/nl/verification.js b/js/src/i18n/nl/verification.js
deleted file mode 100644
index bd0ba1c286ac4e8485a5750eca679c945654c1d7..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/verification.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `Annuleer`,
-    done: `Klaar`,
-    next: `Volgende`
-  },
-  code: {
-    error: `ongeldige code`,
-    hint: `Voer de ontvangen code in.`,
-    label: `verificatie code`,
-    sent: `De verificatie code is verstuurd naar {receiver}.`
-  },
-  confirmation: {
-    authorise: `De verificatie code zal naar het contract worden verzonden. Gebruik de Parity Signer om dit goed te keuren.`,
-    windowOpen: `Houd dit scherm open.`
-  },
-  done: {
-    message: `Gefeliciteerd, je account is geverifieerd!`
-  },
-  email: {
-    enterCode: `Voer de code in die je per e-email hebt ontvangen.`
-  },
-  gatherData: {
-    email: {
-      hint: `de code zal naar dit adres worden verstuurd`,
-      label: `e-mail adres`
-    },
-    phoneNumber: {
-      hint: `De SMS zal naar dit nummer worden verstuurd`,
-      label: `telefoon nummer in internationaal formaat`
-    }
-  },
-  gatherDate: {
-    email: {
-      error: `ongeldig e-mail adres`
-    },
-    phoneNumber: {
-      error: `ongeldig telefoon nummer`
-    }
-  },
-  loading: `Laden van verificatie data.`,
-  request: {
-    authorise: `Een verificatie verzoek zal naar het contract worden verzonden. Gebruik de Parity Signer om dit goed te keuren.`,
-    requesting: `Een code aanvragen bij de Parity-server en wachten tot de puzzel in het contract opgenomen wordt.`,
-    windowOpen: `Houd dit scherm open.`
-  },
-  sms: {
-    enterCode: `Voer de code in die je per SMS hebt ontvangen.`
-  },
-  steps: {
-    code: `Voer Code in`,
-    completed: `Voltooi`,
-    confirm: `Bevestig`,
-    data: `Voer Data in`,
-    method: `Methode`,
-    request: `Verzoek`
-  },
-  title: `verifieer je account`,
-  types: {
-    email: {
-      description: `De hash van het e-mail adres waarvan je bewijst dat het van jou is, zal worden opgeslagen in de blockchain.`,
-      label: `E-mail Verificatie`
-    },
-    sms: {
-      description: `Het zal in de blockchain worden vast gelegd dat jij in het bezit bent van een telefoon nummer (not <em>which</em>).`,
-      label: `SMS Verificatie`
-    }
-  }
-};
diff --git a/js/src/i18n/nl/wallet.js b/js/src/i18n/nl/wallet.js
deleted file mode 100644
index d0460e58f7854aaa97057ab40d19930a7fa5525e..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/wallet.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    edit: `bewerk`,
-    forget: `vergeet`,
-    settings: `instellingen`,
-    transfer: `verzend`
-  },
-  confirmations: {
-    buttons: {
-      confirmAs: `Bevestig als...`,
-      revokeAs: `Herroep als...`
-    },
-    none: `Er zijn momenteel geen transacties die op bevestiging wachten.`,
-    tooltip: {
-      confirmed: `Bevestigd door {number}/{required} eigenaren`
-    }
-  },
-  details: {
-    requiredOwners: `Dit wallet vereist ten minste {owners} voor de goedkeuring van elke actie (transactions, modifications).`,
-    requiredOwnersNumber: `{number} {numberValue, plural, one {owner} other {owners}}`,
-    spent: `{spent} is vandaag besteed, van de {limit} ingestelde daglimiet. De daglimiet is op {date} opnieuw ingesteld`,
-    title: `Details`
-  },
-  title: `Wallet Beheer`,
-  transactions: {
-    none: `Er zijn geen verzonden transacties.`,
-    title: `Transacties`
-  }
-};
diff --git a/js/src/i18n/nl/walletSettings.js b/js/src/i18n/nl/walletSettings.js
deleted file mode 100644
index 66fd70001d98404ee004c96ad52584e447538da2..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/walletSettings.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  addOwner: {
-    title: `Eigenaar toevoegen`
-  },
-  buttons: {
-    cancel: `Annuleer`,
-    close: `Sluit`,
-    next: `Volgende`,
-    send: `Verzend`,
-    sending: `Verzenden...`
-  },
-  changes: {
-    modificationString: `Om je wijzigingen door te voeren zullen
-              andere eigenaren deze zelfde wijzigingen moeten verzenden. Om het
-              makkelijk te maken kunnen ze deze string kopieren-plakken:`,
-    none: `Er zijn van deze Wallet geen instellingen gewijzigd.`,
-    overview: `Je staat op het punt om de volgende wijzignen te maken`
-  },
-  edit: {
-    message: `Om de instellingen van dit contract de wijzigen zullen
-                  minimaal {owners, number} {owners, plural, one {owner } other {owners }} precies dezelfde
-                  wijzigingen moeten verzenden. Je kunt de wijzigingen hier
-                  in string-vorm plakken.`
-  },
-  modifications: {
-    daylimit: {
-      hint: `hoeveelheid uit te geven ETH zonder bevestiging met wachtwoord`,
-      label: `wallet dag limiet`
-    },
-    fromString: {
-      label: `wijzigingen`
-    },
-    owners: {
-      label: `andere wallet eigenaren`
-    },
-    required: {
-      hint: `vereiste aantal eigenaren om een transactie goed te keuren`,
-      label: `vereiste eigenaren`
-    },
-    sender: {
-      hint: `verzend wijzigingen als deze eigenaar`,
-      label: `van account (wallet eigenaar)`
-    }
-  },
-  ownersChange: {
-    details: `van {from} naar {to}`,
-    title: `Wijzig Vereiste Eigenaren`
-  },
-  rejected: `De transactie #{txid} is afgewezen`,
-  removeOwner: {
-    title: `Verwijder Eigenaar`
-  }
-};
diff --git a/js/src/i18n/nl/web.js b/js/src/i18n/nl/web.js
deleted file mode 100644
index 359d956157d8c44a2e33dcb22494fcd6b07121ad..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/web.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  requestToken: `Aanvragen toegangs token...`
-};
diff --git a/js/src/i18n/nl/writeContract.js b/js/src/i18n/nl/writeContract.js
deleted file mode 100644
index e264ac83af3dfb0cac638b51381b5ddc215d5390..0000000000000000000000000000000000000000
--- a/js/src/i18n/nl/writeContract.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    autoCompile: `Auto-Compile`,
-    compile: `Compileer`,
-    deploy: `Maak Aan`,
-    import: `Importeer Solidity`,
-    load: `Laad`,
-    new: `Nieuw`,
-    optimise: `Optimaliseer`,
-    save: `Opslaan`
-  },
-  compiling: {
-    action: `Compileer de bron code.`,
-    busy: `Compileren...`
-  },
-  details: {
-    saved: `(opgeslagen {timestamp})`
-  },
-  error: {
-    noContract: `Er is geen contract gevonden.`,
-    params: `Een fout is opgetreden met de volgende omschrijving`
-  },
-  input: {
-    abi: `ABI Interface`,
-    code: `Bytecode`,
-    metadata: `Metadata`,
-    swarm: `Swarm Metadata Hash`
-  },
-  title: {
-    contract: `Selecteer een contract`,
-    loading: `Laden...`,
-    main: `Schrijf een Contract`,
-    messages: `Compiler berichten`,
-    new: `Nieuw Solidity Contract`,
-    parameters: `Parameters`,
-    saved: `opgeslagen @ {timestamp}`,
-    selectSolidity: `Selecteer een Solidity versie`,
-    solidity: `Solidity {version} laden`
-  },
-  type: {
-    humanErc20: `Implementatie van het Human Token Contract`,
-    implementErc20: `Implementatie van ERC20 Token Contract`,
-    multisig: `Implementatie van een multisig Wallet`,
-    standardErc20: `Standaard ERC20 Token Contract`
-  }
-};
diff --git a/js/src/i18n/store.js b/js/src/i18n/store.js
deleted file mode 100644
index f2506950ec827e3fc987d6ea3160bf175c07257f..0000000000000000000000000000000000000000
--- a/js/src/i18n/store.js
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import flatten from 'flat';
-import { action, observable, transaction } from 'mobx';
-import { addLocaleData } from 'react-intl';
-import de from 'react-intl/locale-data/de';
-import en from 'react-intl/locale-data/en';
-import nl from 'react-intl/locale-data/nl';
-import zh from 'react-intl/locale-data/zh';
-import store from 'store';
-
-import { DEFAULT_LOCALE, DEFAULT_LOCALES, LS_STORE_KEY } from './constants';
-import languages from './languages';
-import deMessages from './de';
-import enMessages from './en';
-import nlMessages from './nl';
-import zhMessages from './zh';
-import zhHantTWMessages from './zh-Hant-TW';
-
-let instance = null;
-
-const LANGUAGES = flatten({ languages });
-const MESSAGES = {
-  de: Object.assign(flatten(deMessages), LANGUAGES),
-  en: Object.assign(flatten(enMessages), LANGUAGES),
-  nl: Object.assign(flatten(nlMessages), LANGUAGES),
-  zh: Object.assign(flatten(zhMessages), LANGUAGES),
-  'zh-Hant-TW': Object.assign(flatten(zhHantTWMessages), LANGUAGES)
-};
-
-addLocaleData([...de, ...en, ...nl, ...zh]);
-
-export default class Store {
-  @observable locale = DEFAULT_LOCALE;
-  @observable locales = DEFAULT_LOCALES;
-  @observable messages = MESSAGES[DEFAULT_LOCALE];
-
-  constructor () {
-    const savedLocale = store.get(LS_STORE_KEY);
-
-    this.locale = (savedLocale && DEFAULT_LOCALES.includes(savedLocale))
-      ? savedLocale
-      : DEFAULT_LOCALE;
-    this.messages = MESSAGES[this.locale];
-  }
-
-  @action setLocale (locale) {
-    transaction(() => {
-      this.locale = locale;
-      this.messages = MESSAGES[locale];
-
-      store.set(LS_STORE_KEY, locale);
-    });
-  }
-
-  static get () {
-    if (!instance) {
-      instance = new Store();
-    }
-
-    return instance;
-  }
-}
-
-export {
-  LANGUAGES,
-  MESSAGES
-};
diff --git a/js/src/i18n/store.spec.js b/js/src/i18n/store.spec.js
deleted file mode 100644
index 1d80a2f78b814ac551ce9597005896f1e73d3fd9..0000000000000000000000000000000000000000
--- a/js/src/i18n/store.spec.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import store from 'store';
-
-import { DEFAULT_LOCALE, DEFAULT_LOCALES, LS_STORE_KEY } from './constants';
-import { LocaleStore } from './';
-
-let localeStore;
-
-describe('i18n/Store', () => {
-  before(() => {
-    localeStore = LocaleStore.get();
-    store.set(LS_STORE_KEY, 'testing');
-  });
-
-  it('creates a default instance', () => {
-    expect(localeStore).to.be.ok;
-  });
-
-  it('sets the default locale to default (invalid localStorage)', () => {
-    expect(localeStore.locale).to.equal(DEFAULT_LOCALE);
-  });
-
-  it('loads the locale from localStorage (valid localStorage)', () => {
-    const testLocale = DEFAULT_LOCALES[DEFAULT_LOCALES.length - 1];
-
-    store.set(LS_STORE_KEY, testLocale);
-
-    const testStore = new LocaleStore();
-
-    expect(testStore.locale).to.equal(testLocale);
-  });
-
-  it('lists the locales', () => {
-    expect(localeStore.locales.length > 1).to.be.true;
-  });
-
-  it('lists locals including default', () => {
-    expect(localeStore.locales.includes(DEFAULT_LOCALE)).to.be.true;
-  });
-
-  describe('@action', () => {
-    describe('setLocale', () => {
-      const testLocale = DEFAULT_LOCALES[DEFAULT_LOCALES.length - 1];
-
-      beforeEach(() => {
-        localeStore.setLocale(testLocale);
-      });
-
-      it('sets the locale as passed', () => {
-        expect(localeStore.locale).to.equal(testLocale);
-      });
-
-      it('sets the locale in localStorage', () => {
-        expect(store.get(LS_STORE_KEY)).to.equal(testLocale);
-      });
-    });
-  });
-});
diff --git a/js/src/i18n/zh-Hant-TW/account.js b/js/src/i18n/zh-Hant-TW/account.js
deleted file mode 100644
index c1ddb288de1fa410178f59dfb21bf34a90af2fcf..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/account.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    delete: `刪除`, // delete
-    edit: `編輯`, // edit
-    faucet: `Kovan測試網路以太幣`, // Kovan ETH
-    password: `密碼`, // password
-    shapeshift: `shapeshift`,
-    transfer: `轉帳`, // transfer
-    verify: `確認`// verify
-  },
-  hardware: {
-    confirmDelete: `你確定從你的帳戶列表中移除下面的硬體地址嗎？`
-  }, // Are you sure you want to remove the following hardware address from your account list?
-  header: {
-    outgoingTransactions: `{count}筆正在發生的轉帳`, // {count} outgoing transactions
-    uuid: `uuid: {uuid}`
-  },
-  title: `帳戶管理`, // Account Management
-  transactions: {
-    poweredBy: `Transaction list powered by {etherscan}提供的交易列表`,
-    title: `交易`// transactions
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/accounts.js b/js/src/i18n/zh-Hant-TW/accounts.js
deleted file mode 100644
index d717b3583b8e4fc36fe6a453235de1296f25d9bb..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/accounts.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    newAccount: `帳戶`, // account
-    newWallet: `錢包`, // wallet
-    vaults: `保險庫`// vaults
-  },
-  summary: {
-    minedBlock: `在第#{blockNumber}個區塊被挖出`// Mined at block #{blockNumber}
-  },
-  title: `帳戶總覽`, // Accounts Overview
-  tooltip: {
-    actions: `與當前視窗有關的操作可以在工具欄中快速被找到，不論是執行操作還是建立新項`,
-    // actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item
-    overview: `你的帳戶很容易使用，使你可以編輯元資訊、轉帳、檢視交易和向帳戶充值`
-    // your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account
-  },
-  tooltips: {
-    owner: `{name}持有者`// {name} (owner)
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/addAddress.js b/js/src/i18n/zh-Hant-TW/addAddress.js
deleted file mode 100644
index 5d18e441fc41197f514da47c7a4617b7e0a32390..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/addAddress.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    add: `儲存地址`, // Save Address
-    close: `取消` // Cancel
-  },
-  header: `如果想在地址簿中新增一條新的記錄，你需要擁有帳戶的網路地址並提供一個的描述（可選）。一旦新增，記錄就可以體現在你的地址簿中。`,
-  // To add a new entry to your addressbook, you need the network
-  // address of the account and can supply an optional description.
-  // Once added it will reflect in your address book.
-  input: {
-    address: {
-      hint: `記錄的網路地址`, // the network address for the entry
-      label: `網路地址` // network address
-    },
-    description: {
-      hint: `記錄的詳細描述`, // an expanded description for the entry
-      label: `（可選）地址描述` // (optional) address description
-    },
-    name: {
-      hint: `記錄的名字`, // a descriptive name for the entry
-      label: `地址名` // address name
-    }
-  },
-  label: `新增已儲存的地址` // add saved address
-};
diff --git a/js/src/i18n/zh-Hant-TW/addContract.js b/js/src/i18n/zh-Hant-TW/addContract.js
deleted file mode 100644
index 314779896be64ca552796e354d58e98e43444dac..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/addContract.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  abi: {
-    hint: `合約的ABI`, // the abi for the contract
-    label: `合約ABI` // contract abi
-  },
-  abiType: {
-    custom: {
-      description: `通過自定義ABI創造的合約`, // Contract created from custom ABI
-      label: `自定義合約` // Custom Contract
-    },
-    multisigWallet: {
-      description: `以太坊多重簽名合約{link}`, // Ethereum Multisig contract {link}
-      label: `多重簽名錢包`, // Multisig Wallet
-      link: `參考合約程式碼` // see contract code
-    },
-    token: {
-      description: `一個標準的{erc20}代幣`, // A standard {erc20} token
-      erc20: `ERC 20`, // ERC 20
-      label: `代幣` // Token
-    }
-  },
-  address: {
-    hint: `合約的網路地址`, // the network address for the contract
-    label: `網路地址` // network address
-  },
-  button: {
-    add: `新增合約`, // Add Contract
-    cancel: `取消`, // Cancel
-    next: `下一步`, // Next
-    prev: `上一步` // Back
-  },
-  description: {
-    hint: `記錄的詳細描述`, // an expanded description for the entry
-    label: `（可選）合約描述` // (optional) contract description
-  },
-  name: {
-    hint: `合約的描述性名稱`, // a descriptive name for the contract
-    label: `合約名` // contract name
-  },
-  title: {
-    details: `輸入合約細節`, // enter contract details
-    type: `選擇合約種類` // choose a contract type
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/address.js b/js/src/i18n/zh-Hant-TW/address.js
deleted file mode 100644
index 11cb4ab07f2b43ccce57f52abe8666f17a2dcb2e..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/address.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    edit: `編輯`, // edit
-    forget: `忘記`, // forget
-    save: `儲存`// save
-  },
-  delete: {
-    confirmInfo: `你確定你想把下面的地址從你的地址簿中移除嗎？`, // Are you sure you want to remove the following address from your addressbook?
-    title: `確認移除`// confirm removal
-  },
-  title: `地址資訊`// Address Information
-};
diff --git a/js/src/i18n/zh-Hant-TW/addressSelect.js b/js/src/i18n/zh-Hant-TW/addressSelect.js
deleted file mode 100644
index bc3194019d452b545331128b1972303afc100a7e..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/addressSelect.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  fromEmail: `使用郵箱{email}進行確認`, // Verified using email {email}
-  fromRegistry: `{name}（來自注冊）`, // {name} (from registry)
-  labels: {
-    accounts: `帳戶`, // accounts
-    contacts: `合約`, // contacts
-    contracts: `合約`// contracts
-  },
-  noAccount: `查不到這個帳戶`// No account matches this query...
-};
diff --git a/js/src/i18n/zh-Hant-TW/addresses.js b/js/src/i18n/zh-Hant-TW/addresses.js
deleted file mode 100644
index bacbb79db9c700bbf84c919bc1cde79df7877cee..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/addresses.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    add: `地址` // address
-  },
-  errors: {
-    invalidFile: `提供的檔案是無效的`// The provided file is invalid...
-  },
-  title: `儲存的地址`// Saved Addresses
-};
diff --git a/js/src/i18n/zh-Hant-TW/application.js b/js/src/i18n/zh-Hant-TW/application.js
deleted file mode 100644
index f5f0e9a239bcdc2c8ecd3428f84d31f7d782c87a..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/application.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  frame: {
-    error: `錯誤：這個應用不能也不應該載入到內建框架中`// ERROR: This application cannot and should not be loaded in an embedded iFrame
-  },
-  status: {
-    consensus: {
-      capable: `可行`, // Capable
-      capableUntil: `到第 #{blockNumber} 區塊前可行`, // Capable until #{blockNumber}
-      incapableSince: `自第 #{blockNumber} 區塊後不可行`, // Incapable since #{blockNumber}
-      unknown: `未知能力`// Unknown capability
-    },
-    upgrade: `升級`// Upgrade
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/connection.js b/js/src/i18n/zh-Hant-TW/connection.js
deleted file mode 100644
index ed48452e54b5d489bf8c5d2dd8ef552c14eb322d..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/connection.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-export default {
-  connectingAPI: `正在連線至Parity Secure API`, // Connecting to the Parity Secure API.
-  connectingNode: `正在連線Parity節點。如果彈出任何資訊，請確認你的Parity節點正在執行並連線至網際網路。`,
-  // Connecting to the Parity Node. If this informational message persists,
-  // please ensure that your Parity node is running and reachable on the network.
-  invalidToken: `無效的簽名令牌`, // invalid signer token
-  noConnection: `無法連線至Parity Secure API。請升級的你的安全令牌或者生成一個新的，執行{newToken}並貼上生成的令牌到下方。`,
-  // Unable to make a connection to the Parity Secure API. To update your secure
-  // token or to generate a new one, run {newToken} and paste the generated token
-  // into the space below.
-  token: {
-    hint: `一個Parity生成的令牌`, // a generated token from Parity
-    label: `安全令牌` // secure token
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/contract.js b/js/src/i18n/zh-Hant-TW/contract.js
deleted file mode 100644
index 9f5b40f0a03c6874a9bcde74eff1981130af347c..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/contract.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    close: `關閉`, // close
-    details: `詳細資料`, // details
-    edit: `編輯`, // edit
-    execute: `執行`, // execute
-    forget: `forget` // forget
-  },
-  details: {
-    title: `合約細節` // contract details
-  },
-  events: {
-    eventPending: `待定中`, // pending
-    noEvents: `此合約沒有傳送過任何事件`, // No events has been sent from this contract.
-    title: `事件`  // events
-  },
-  minedBlock: `挖到了第{blockNumber}個區塊`, // Mined at block #{blockNumber}
-  queries: {
-    buttons: {
-      query: `查詢` // Query
-    },
-    title: `查詢` // queries
-  },
-  title: `合約資訊` // Contract Information
-};
diff --git a/js/src/i18n/zh-Hant-TW/contracts.js b/js/src/i18n/zh-Hant-TW/contracts.js
deleted file mode 100644
index a81387f2856815cc49dc62f2f5000f4e6595b971..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/contracts.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    deploy: `部署`, // deploy
-    develop: `開發`, // develop
-    watch: `觀察` // watch
-  },
-  sortOrder: {
-    date: `日期`, // date
-    minedBlock: `挖到的區塊` // mined block
-  },
-  title: `合約` // Contracts
-};
diff --git a/js/src/i18n/zh-Hant-TW/createAccount.js b/js/src/i18n/zh-Hant-TW/createAccount.js
deleted file mode 100644
index 81e7b81b5d26f11dc7c99d6da8b7c1dacc0a2246..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/createAccount.js
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  accountDetails: {
-    address: {
-      hint: `帳戶地址`,
-      label: `地址`
-    },
-    name: {
-      hint: `描述帳戶的名字`,
-      label: `帳戶名`
-    },
-    phrase: {
-      hint: `帳戶恢復詞`,
-      label: `帳戶恢復詞（安全儲存，別人擁有它就可以完全控制你的帳戶）`
-    }
-  },
-  accountDetailsGeth: {
-    imported: `你已經從Geth keystore匯入了{number}個地址`
-  },
-  button: {
-    back: `返回`,
-    cancel: `取消`,
-    close: `關閉`,
-    create: `建立`,
-    done: `Done`,
-    import: `匯入`,
-    next: `下一步`,
-    print: `列印恢復詞`
-  },
-  creationType: {
-    fromGeth: {
-      description: `Import accounts from the Geth keystore with the original password`,
-      label: `從Geth keystore匯入帳戶`
-    },
-    fromJSON: {
-      description: `Import an industry-standard JSON keyfile with the original password`,
-      label: `從JSON檔案匯入帳戶`
-    },
-    fromNew: {
-      description: `Selecting your identity icon and specifying the password`,
-      label: `手動建立新帳戶`
-    },
-    fromPhrase: {
-      description: `Recover using a previously stored recovery phrase and new password`,
-      label: `通過恢復詞恢復帳戶`
-    },
-    fromPresale: {
-      description: `Import an Ethereum presale wallet file with the original password`,
-      label: `從以太坊預售錢包匯入帳戶`
-    },
-    fromRaw: {
-      description: `Enter a previously created raw private key with a new password`,
-      label: `匯入私鑰`
-    },
-    info: `Please select the type of account you want to create. Either create an account via name & password, or import it from a variety of existing sources. From here the wizard will guide you through the process of completing your account creation.`
-  },
-  newAccount: {
-    hint: {
-      hint: `（可選）幫助你記住密碼的提示`,
-      label: `密碼提示`
-    },
-    name: {
-      hint: `描述帳戶的名字`,
-      label: `帳戶名`
-    },
-    password: {
-      hint: `足夠強的密碼`,
-      label: `密碼`
-    },
-    password2: {
-      hint: `確認你的密碼`,
-      label: `再次輸入密碼`
-    }
-  },
-  newGeth: {
-    available: `There are currently {count} importable keys available from the Geth keystore which are not already available on your Parity instance. Select the accounts you wish to import and move to the next step to complete the import.`,
-    noKeys: `現在Geth keystore中沒有可匯入的私鑰`
-  },
-  newImport: {
-    file: {
-      hint: `要匯入的錢包檔案`,
-      label: `錢包檔案`
-    },
-    hint: {
-      hint: `（可選）幫助你記住密碼的提示`,
-      label: `密碼提示`
-    },
-    name: {
-      hint: `描述帳戶的名字`,
-      label: `帳戶名`
-    },
-    password: {
-      hint: `輸入密碼，解鎖錢包`,
-      label: `密碼`
-    }
-  },
-  rawKey: {
-    hint: {
-      hint: `（可選）幫助你記住密碼的提示`,
-      label: `密碼提示`
-    },
-    name: {
-      hint: `描述帳戶的名字`,
-      label: `帳戶名`
-    },
-    password: {
-      hint: `足夠強的密碼`,
-      label: `密碼`
-    },
-    password2: {
-      hint: `確認密碼`,
-      label: `再次輸入密碼`
-    },
-    private: {
-      hint: `原始的十六進位制編碼私鑰`,
-      label: `私鑰`
-    }
-  },
-  recoveryPhrase: {
-    hint: {
-      hint: `（可選）幫助你記住密碼的提示`,
-      label: `密碼提示`
-    },
-    name: {
-      hint: `描述帳戶的名字`,
-      label: `帳戶名`
-    },
-    password: {
-      hint: `足夠強的密碼`,
-      label: `密碼`
-    },
-    password2: {
-      hint: `確認密碼`,
-      label: `再次輸入密碼`
-    },
-    phrase: {
-      hint: `帳戶恢復詞`,
-      label: `帳戶恢復詞`
-    },
-    windowsKey: {
-      label: `在Windows系統上由Parity 1.4.5以前的版本建立的私鑰`
-    }
-  },
-  title: {
-    accountInfo: `帳戶資訊`,
-    createAccount: `建立帳戶`,
-    createType: `建立型別`,
-    importWallet: `匯入錢包`
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/createWallet.js b/js/src/i18n/zh-Hant-TW/createWallet.js
deleted file mode 100644
index 55dbc6da52e112f927d66f729e119d6422eeff32..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/createWallet.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    add: `新增`, // Add
-    cancel: `取消`, // Cancel
-    close: `關閉`, // Close
-    create: `建立`, // Create
-    done: `完成`, // Done
-    next: `下一步`, // Next
-    sending: `傳送中...` // Sending...
-  },
-  deployment: {
-    message: `部署正在進行中` // The deployment is currently in progress
-  },
-  details: {
-    address: {
-      hint: `錢包的合約地址`, // the wallet contract address
-      label: `錢包地址` // wallet address
-    },
-    dayLimitMulti: {
-      hint: `無需確認即可使用的ETH數量`, // amount of ETH spendable without confirmations
-      label: `錢包每日限額` // wallet day limit
-    },
-    description: {
-      hint: `本地錢包描述`, // the local description for this wallet
-      label: `錢包描述（可選）` // wallet description (optional)
-    },
-    descriptionMulti: {
-      hint: `本地錢包描述`, // the local description for this wallet
-      label: `錢包描述（可選）` // wallet description (optional)
-    },
-    name: {
-      hint: `錢包本地名稱`,  // the local name for this wallet
-      label: `錢包名稱` // wallet name
-    },
-    nameMulti: {
-      hint: `錢包本地名稱`, // the local name for this wallet
-      label: `錢包名稱` // wallet name
-    },
-    ownerMulti: {
-      hint: `合約的持有者帳戶`, // the owner account for this contract
-      label: `從帳戶 (contract owner)` // from account (contract owner)
-    },
-    ownersMulti: {
-      label: `其他錢包持有者` // other wallet owners
-    },
-    ownersMultiReq: {
-      hint: `接受交易所需的持有者人數`, // number of required owners to accept a transaction
-      label: `所需持有者` // required owners
-    }
-  },
-  info: {
-    added: `已新增`, // added
-    copyAddress: `複製地址至貼上板`, // copy address to clipboard
-    created: `{name}已被{deployedOrAdded}至`, // {name} has been {deployedOrAdded} at
-    dayLimit: `每日限額已被設定為{dayLimit}ETH`, // The daily limit is set to {dayLimit} ETH.
-    deployed: `已部署`, // deployed
-    numOwners: `需要{numOwners}個持有者才能確認一個交易`, // {numOwners} owners are required to confirm a transaction.
-    owners: `以下為錢包持有者` // The following are wallet owners
-  },
-  rejected: {
-    message: `部署被拒絕`, // The deployment has been rejected
-    state: `錢包不會被建立。你可以安全地關閉本視窗`, // The wallet will not be created. You can safely close this window.
-    title: `失敗` // rejected
-  },
-  states: {
-    completed: `合約部署已完成`, // The contract deployment has been completed
-    confirmationNeeded: `合約部署需要來自本錢包的其他持有者的確認`, // The contract deployment needs confirmations from other owners of the Wallet
-    preparing: `交易正在準備被網路廣播`, // Preparing transaction for network transmission
-    validatingCode: `正在驗證已部署的程式碼`, // Validating the deployed contract code
-    waitingConfirm: `正在等待Parity Secure Signer確認本交易`, // Waiting for confirmation of the transaction in the Parity Secure Signer
-    waitingReceipt: `正在等待合約部署交易收據` // Waiting for the contract deployment transaction receipt
-  },
-  steps: {
-    deployment: `錢包部署`, // wallet deployment
-    details: `錢包詳情`, // wallet details
-    info: `錢包資訊`, // wallet informaton
-    type: `錢包類別` // wallet type
-  },
-  type: {
-    multisig: {
-      description: `建立/部署一個{link}錢包`, // Create/Deploy a {link} Wallet
-      label: `多重簽名錢包`, // Multi-Sig Wallet
-      link: `標準多重簽名` // standard multi-signature
-    },
-    watch: {
-      description: `新增一個已有錢包到你的帳戶`, // Add an existing wallet to your accounts
-      label: `觀察錢包` // Watch a wallet
-    }
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/dapp.js b/js/src/i18n/zh-Hant-TW/dapp.js
deleted file mode 100644
index 967ad542bfa95f6a4519266a087b7c169a341e1f..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/dapp.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  loading: `正在載入`, // Loading
-  unavailable: `不能獲取這個dapp`// The dapp cannot be reached
-};
diff --git a/js/src/i18n/zh-Hant-TW/dapps.js b/js/src/i18n/zh-Hant-TW/dapps.js
deleted file mode 100644
index 44e97d55b90a19fe2dfc2283e25ec4c4c34a6419..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/dapps.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  add: {
-    builtin: {
-      desc: `Parity團隊開發的實驗性的，用以展示dapp的效能、整合、實驗性特性和控制特定網路的的客戶端行為`,
-      // Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.
-      label: `與Parity繫結的應用`// Applications bundled with Parity
-    },
-    label: `visible applications可見的應用`, // visible applications
-    local: {
-      desc: `All applications installed locally on the machine by the user for access by the Parity client.`,
-      label: `本地可用的應用`// Applications locally available
-    },
-    network: {
-      desc: `這些應用與Parity沒有關聯，也不是Parity釋出的。 它們是由各自的作者控制的。 在使用以前，請確保你理解每個應用的目標。`,
-      // These applications are not affiliated with Parity nor are they published by Parity.Each remain under the control of their respective authors.Please ensure that you understand the goals for each application before interacting.
-      label: `全球網路上的應用`// Applications on the global network
-    }
-  },
-  button: {
-    edit: `編輯`, // edit
-    permissions: `許可`// permissions
-  },
-  external: {
-    accept: `我理解這些應用和Parity沒有關聯`, // I understand that these applications are not affiliated with Parity
-    warning: `第三方開發者開發的應用與Parity沒有關聯，也不是Parity釋出的。 它們是由各自的作者控制的。 在使用以前，請確保你理解每個應用的目標。`
-    // Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.
-  },
-  label: `去中心化應用`, // Decentralized Applications
-  permissions: {
-    label: `可見的dapp帳戶`// visible dapp accounts
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/deleteAccount.js b/js/src/i18n/zh-Hant-TW/deleteAccount.js
deleted file mode 100644
index e9f49cd3c57e855d997ffe7dd8cd42a9cc208800..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/deleteAccount.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  password: {
-    hint: `提供帳戶密碼，確認刪除帳戶`, // provide the account password to confirm the account deletion
-    label: `帳戶密碼`// account password
-  },
-  question: `你確定你想永久地刪除下面的帳戶？`, // Are you sure you want to permanently delete the following account?
-  title: `確認刪除`// confirm removal
-};
diff --git a/js/src/i18n/zh-Hant-TW/deployContract.js b/js/src/i18n/zh-Hant-TW/deployContract.js
deleted file mode 100644
index 05af22f9f1e4ed30e5d7c751f40947fa4d5c3fed..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/deployContract.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: {
-    title: `部署正在進行中`// The deployment is currently in progress
-  },
-  button: {
-    cancel: `取消`, // Cancel
-    close: `關閉`, // Close
-    create: `建立`, // Create
-    done: `完成`, // Done
-    next: `下一個`// Next
-  },
-  completed: {
-    description: `你的合約已經被部署在`// Your contract has been deployed at
-  },
-  details: {
-    abi: {
-      hint: `合約的abi或者solc 組合輸出`, // the abi of the contract to deploy or solc combined-output
-      label: `abi / solc 組合輸出 `// abi / solc combined-output
-    },
-    address: {
-      hint: `這個合約所有者的帳戶`, // the owner account for this contract
-      label: `來自帳戶（合約所有者）`// from account (contract owner)
-    },
-    advanced: {
-      label: `高階的傳送選項`// advanced sending options
-    },
-    amount: {
-      hint: `轉到這個合約中的數額`, // the amount to transfer to the contract
-      label: `傳送數額{tag}`// amount to transfer (in {tag})
-    },
-    code: {
-      hint: `編譯好的合約程式碼`, // the compiled code of the contract to deploy
-      label: `程式碼`// code
-    },
-    contract: {
-      label: `選擇一個合約`// select a contract
-    },
-    description: {
-      hint: `對這個合約的描述`, // a description for the contract
-      label: `合約描述（可選）`// contract description (optional)
-    },
-    name: {
-      hint: `已經部署合約的名字`, // a name for the deployed contract
-      label: `合約名字`// contract name
-    }
-  },
-  owner: {
-    noneSelected: `選擇一個有效的地址作為合約的所有者`// a valid account as the contract owner needs to be selected
-  },
-  parameters: {
-    choose: `選擇合約引數`// Choose the contract parameters
-  },
-  rejected: {
-    description: `你可以安全地關閉視窗，合約部署不會發生。`, // You can safely close this window, the contract deployment will not occur.
-    title: `部署已經被拒絕`// The deployment has been rejected
-  },
-  state: {
-    completed: `合約部署已經完成`, // The contract deployment has been completed
-    confirmationNeeded: `這一操作需要這個合約其他所有人的確認。`, // The operation needs confirmations from the other owners of the contract
-    preparing: `為網路傳輸準備交易`, // Preparing transaction for network transmission
-    validatingCode: `驗證已經部署的合約的程式碼`, // Validating the deployed contract code
-    waitReceipt: `等待合約部署交易收據`, // Waiting for the contract deployment transaction receipt
-    waitSigner: `等待Parity Secure Signer中的交易被確認 `// Waiting for confirmation of the transaction in the Parity Secure Signer
-  },
-  title: {
-    completed: `完成`, // completed
-    deployment: `部署`, // deployment
-    details: `合約細節`, // contract details
-    extras: `額外資訊`, // extra information
-    failed: `部署失敗`, // deployment failed
-    parameters: `s合約引數`, // contract parameter
-    rejected: `拒絕`// rejected
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/details_windows.js b/js/src/i18n/zh-Hant-TW/details_windows.js
deleted file mode 100644
index fcc5700665db8ae92fc1906d7ac966c2d9783bed..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/details_windows.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default `Windows`;
diff --git a/js/src/i18n/zh-Hant-TW/editMeta.js b/js/src/i18n/zh-Hant-TW/editMeta.js
deleted file mode 100644
index 6da3683fbfb996bfa8b64788658c943b6630a45f..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/editMeta.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  description: {
-    hint: `此地址的描述`, // description for this address
-    label: `地址描述` // address description
-  },
-  name: {
-    label: `名稱` // name
-  },
-  passwordHint: {
-    hint: `密碼恢復提示`, // a hint to allow password recovery
-    label: `（可選）密碼提示` // (optional) password hint
-  },
-  tags: {
-    hint: `按<Enter>來新增一個標籤`, // press <Enter> to add a tag
-    label: `（可選）標籤` // (optional) tags
-  },
-  title: `編輯元資料` // edit metadata
-};
diff --git a/js/src/i18n/zh-Hant-TW/errors.js b/js/src/i18n/zh-Hant-TW/errors.js
deleted file mode 100644
index 82c41218f03a92b739fe1583b71a5b973ac20345..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/errors.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  duplicateName: `名稱已存在`, // the name already exists
-  invalidKey: `原始私鑰需要被16進位制，64個字元長度並以"0x"開頭`, // the raw key needs to be hex, 64 characters in length and contain the prefix "0x"
-  noFile: `選擇一個可用的錢包檔案來輸入`, // select a valid wallet file to import
-  noKey: `你需要提供原始私鑰`, // you need to provide the raw private key
-  noMatchPassword: `所提供的密碼不正確`, // the supplied passwords does not match
-  noName: `你需要明確一個可用的名稱` // you need to specify a valid name
-};
diff --git a/js/src/i18n/zh-Hant-TW/executeContract.js b/js/src/i18n/zh-Hant-TW/executeContract.js
deleted file mode 100644
index 1c84414ef001b7e95b8fe389528f62456e6caf03..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/executeContract.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: {
-    posted: `你的交易已被公佈至網路`, // Your transaction has been posted to the network
-    title: `函式執行正在進行中`, // The function execution is in progress
-    waitAuth: `正在等待Parity Signer授權` // Waiting for authorization in the Parity Signer
-  },
-  button: {
-    cancel: `取消`, // cancel
-    done: `完成`, // done
-    next: `下一步`, // next
-    post: `公佈交易`, // post transaction
-    prev: `上一步` // prev
-  },
-  details: {
-    address: {
-      hint: `來自帳戶`, // from account
-      label: `將要交易的帳戶` // the account to transact with
-    },
-    advancedCheck: {
-      label: `高階傳送選項` // advanced sending options
-    },
-    amount: {
-      hint: `此交易將會發送的數量`, // the amount to send to with the transaction
-      label: `交易價值（ETH）` // transaction value (in ETH)
-    },
-    function: {
-      hint: `此合約將會呼叫的函式`, // the function to call on the contract
-      label: `將執行的函式` // function to execute
-    }
-  },
-  rejected: {
-    state: `你可以安全的關閉此視窗，函式將不會被執行。`, // You can safely close this window, the function execution will not occur.
-    title: `執行失敗` // The execution has been rejected
-  },
-  steps: {
-    advanced: `高階選項`, // advanced options
-    complete: `完成`, // complete
-    rejected: `失敗`, // rejected
-    sending: `傳送中`, // sending
-    transfer: `函式詳情` // function details
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/extension.js b/js/src/i18n/zh-Hant-TW/extension.js
deleted file mode 100644
index 0f017aa0f6a847f96ce0e47003673ad42d2698b1..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/extension.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  install: `現在就安裝這個擴充套件`, // Install the extension now
-  intro: `Parity現在有一個Chrome的擴充套件，可以安全的瀏覽以太坊所支援的分散式應用。我們強烈推薦你安裝這個擴充套件來進一步提升你的Parity使用體驗。`
-  // Parity now has an extension available for Chrome that allows safe browsing of Ethereum-enabled decentralized applications.
-  // It is highly recommended that you install this extension to further enhance your Parity experience.
-};
diff --git a/js/src/i18n/zh-Hant-TW/faucet.js b/js/src/i18n/zh-Hant-TW/faucet.js
deleted file mode 100644
index 46474e13a6ec6232ba9fddbdb17243087fa1c9aa..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/faucet.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    close: `關閉`, // close
-    done: `關閉`, // close
-    request: `請求`// request
-  },
-  summary: {
-    done: `你已經向水龍頭請求Kovan ETH測試幣`, // Your Kovan ETH has been requested from the faucet which responded with -
-    info: `如果請求將Kovan ETH測試幣存入這個地址，你需要確定這個地址在主網路上已經用簡訊驗證過了。 一旦執行水龍頭將向當前帳戶存入Kovan ETH測試幣。`
-    // To request a deposit of Kovan ETH to this address, you need to ensure that the address is sms-verified on the mainnet.Once executed the faucet will deposit Kovan ETH into the current account.
-  },
-  title: `Kovan ETH測試幣水龍頭`// Kovan ETH Faucet Kovan
-};
diff --git a/js/src/i18n/zh-Hant-TW/firstRun.js b/js/src/i18n/zh-Hant-TW/firstRun.js
deleted file mode 100644
index 7b0513d9288a2ecba97fc5af6960bec6c3690790..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/firstRun.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    close: `關閉`, // Close
-    create: `建立`, // Create
-    next: `下一步`, // Next
-    print: `列印片語`, // Print Phrase
-    skip: `跳過`// Skip
-  },
-  completed: {
-    congrats: `恭喜！你的節點設定已經完成，你現在可以使用應用了。`,
-    // Congratulations! Your node setup has been completed successfully and you are ready to use the application.
-    next: `下面你將瀏覽可用的功能和通用的應用介面，讓你最快速地使用Parity。`
-    // Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.
-  },
-  title: {
-    completed: `完成`, // completed
-    newAccount: `新帳戶`, // new account
-    recovery: `恢復`, // recovery
-    terms: `條款`, // terms
-    welcome: `歡迎`// welcome
-  },
-  tnc: {
-    accept: `我接受這些條款和條件`// I accept these terms and conditions
-  },
-  welcome: {
-    description: `作為初次安裝的一部分，下面的幾個步驟將指導你如何設定你的Parity和相關帳戶。我們的目標是使得使用Parity變得儘可能的簡單，讓你成功執行，所以請有點耐心。 一旦完成，你將擁有`,
-    // As part of a new installation, the next few steps will guide you through the process of setting up your Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
-    greeting: `歡迎使用Parity，這是執行以太坊節點的最快和最簡單的方式。`, // Welcome to Parity, the fastest and simplest way to run your node.
-    next: `點選下一步繼續`, // Click Next to continue your journey.
-    step: {
-      account: `建立你的第一個Parity帳戶`, // Created your first Parity account
-      privacy: `理解你的隱私政策和運作條款`, // Understood our privacy policy & terms of operation
-      recovery: `有能力可以恢復你的帳戶`// Have the ability to recover your account
-    }
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/home.js b/js/src/i18n/zh-Hant-TW/home.js
deleted file mode 100644
index 7e5592c1595974e0140b7dd2c9ad1a79a1de5469..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/home.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  account: {
-    visited: `已訪問{when}` // accessed {when}
-  },
-  accounts: {
-    none: `沒有可用的近期帳戶歷史`, // No recent accounts history available
-    title: `近期帳戶` // Recent Accounts
-  },
-  dapp: {
-    visited: `已訪問{when}` // accessed {when}
-  },
-  dapps: {
-    none: `沒有可用的近期應用歷史`, // No recent Applications history available
-    title: `近期Dapps` // Recent Dapps
-  },
-  title: `Parity首頁`, // Parity Home
-  url: {
-    none: `沒有可用的近期URL歷史`, // No recent URL history available
-    title: `網頁應用`, // Web Applications
-    visited: `已訪問{when}` //  visited {when}
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/index.js b/js/src/i18n/zh-Hant-TW/index.js
deleted file mode 100644
index 7b20b6249df7fa4d63534c7d4312cbe217cd4880..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/index.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import account from './account';
-import accounts from './accounts';
-import addAddress from './addAddress';
-import addContract from './addContract';
-import address from './address';
-import addressSelect from './addressSelect';
-import addresses from './addresses';
-import application from './application';
-import connection from './connection';
-import contract from './contract';
-import contracts from './contracts';
-import createAccount from './createAccount';
-import createWallet from './createWallet';
-import dapp from './dapp';
-import dapps from './dapps';
-import deleteAccount from './deleteAccount';
-import deployContract from './deployContract';
-import editMeta from './editMeta';
-import errors from './errors';
-import executeContract from './executeContract';
-import extension from './extension';
-import faucet from './faucet';
-import firstRun from './firstRun';
-import home from './home';
-import loadContract from './loadContract';
-import parityBar from './parityBar';
-import passwordChange from './passwordChange';
-import saveContract from './saveContract';
-import settings from './settings';
-import shapeshift from './shapeshift';
-import signer from './signer';
-import status from './status';
-import tabBar from './tabBar';
-import transfer from './transfer';
-import txEditor from './txEditor';
-import ui from './ui';
-import upgradeParity from './upgradeParity';
-import vaults from './vaults';
-import verification from './verification';
-import wallet from './wallet';
-import walletSettings from './walletSettings';
-import web from './web';
-import writeContract from './writeContract';
-
-export default {
-  account,
-  accounts,
-  addAddress,
-  addContract,
-  address,
-  addresses,
-  addressSelect,
-  application,
-  connection,
-  contract,
-  contracts,
-  createAccount,
-  createWallet,
-  dapp,
-  dapps,
-  deleteAccount,
-  deployContract,
-  editMeta,
-  errors,
-  executeContract,
-  extension,
-  faucet,
-  firstRun,
-  home,
-  loadContract,
-  parityBar,
-  passwordChange,
-  saveContract,
-  settings,
-  signer,
-  shapeshift,
-  status,
-  tabBar,
-  transfer,
-  txEditor,
-  ui,
-  upgradeParity,
-  vaults,
-  verification,
-  wallet,
-  walletSettings,
-  web,
-  writeContract
-};
diff --git a/js/src/i18n/zh-Hant-TW/loadContract.js b/js/src/i18n/zh-Hant-TW/loadContract.js
deleted file mode 100644
index b99054349143b21d78df7b0a6d332a0e175a0dc1..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/loadContract.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `取消`, // Cancel
-    load: `載入`, // Load
-    no: `否`, // No
-    yes: `是` // Yes
-  },
-  contract: {
-    savedAt: `已儲存{when}` // Saved {when}
-  },
-  header: {
-    saved: `已儲存的合約`, // Saved Contracts
-    snippets: `合約片段` // Contract Snippets
-  },
-  removal: {
-    confirm: `你確定要將以下合約從已儲存的合約中刪除嗎？`, // Are you sure you want to remove the following contract from your saved contracts?
-    savedAt: `已儲存{when}` // Saved {when}
-  },
-  tab: {
-    local: `本地`, // Local
-    snippets: `片段` // Snippets
-  },
-  title: {
-    remove: `確認刪除`, // confirm removal
-    view: `檢視合約` // view contracts
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/parityBar.js b/js/src/i18n/zh-Hant-TW/parityBar.js
deleted file mode 100644
index e68b27a54a1fadfa9641ed65fce9b5ea63799117..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/parityBar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    close: `關閉` // Close
-  },
-  label: {
-    parity: `Parity`, // Parity
-    signer: `Signer` // Singer
-  },
-  title: {
-    accounts: `預設帳戶`, // Default Account
-    signer: `Parity Signer：待處理` // Parity Signer: Pending
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/passwordChange.js b/js/src/i18n/zh-Hant-TW/passwordChange.js
deleted file mode 100644
index e6e54b9b4910c86e16e9f2f790885a7356722c09..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/passwordChange.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `取消`, // Cancel
-    change: `更改`, // Change
-    test: `測試`, // Test
-    wait: `請等待...` // Wait...
-  },
-  currentPassword: {
-    hint: `此帳戶的原密碼`, // your current password for this account
-    label: `原密碼` // current password
-  },
-  newPassword: {
-    hint: `此帳戶的新密碼`, // the new password for this account
-    label: `新密碼` // new password
-  },
-  passwordHint: {
-    display: `提示{hint}`, // Hint {hint}
-    hint: `新密碼的提示`, // hint for the new password
-    label: `（可選）新的密碼提示` // (optional) new password hint
-  },
-  repeatPassword: {
-    error: `所提供的密碼不正確`, // the supplied passwords do not match
-    hint: `請重複此帳戶的新密碼`, // repeat the new password for this account
-    label: `重複新密碼` // repeat new password
-  },
-  success: `你的密碼已經成功更改`, // Your password has been successfully changed
-  tabChange: {
-    label: `更改密碼` // Change Password
-  },
-  tabTest: {
-    label: `測試密碼` // Test Password
-  },
-  testPassword: {
-    hint: `你的帳戶密碼`, // your account password
-    label: `密碼` // password
-  },
-  title: `密碼管理器` // Password Manager
-};
diff --git a/js/src/i18n/zh-Hant-TW/saveContract.js b/js/src/i18n/zh-Hant-TW/saveContract.js
deleted file mode 100644
index 10075e62d760fd1281653325db776de45e3d0b74..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/saveContract.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    cancel: `取消`, // Cancel
-    save: `儲存` // Save
-  },
-  name: {
-    hint: `為此合約選擇一個名稱`, // choose a name for this contract
-    label: `合約名稱` // contract name
-  },
-  title: `儲存合約` // save contract
-};
diff --git a/js/src/i18n/zh-Hant-TW/settings.js b/js/src/i18n/zh-Hant-TW/settings.js
deleted file mode 100644
index 8841279dc018f671caf38e6abc151042bcabbede..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/settings.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  background: {
-    button_more: `生成更多`, // generate more
-    overview_0: `你現在所看到的背景圖案在你的Parity安裝中是獨一無二的。每次創造一個新的Signer令牌都會改變一次圖案。這也保證了去中性化應用不能偽裝成可信的樣子。`,
-    // The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new
-    // Signer token. This is so that decentralized applications cannot pretend to be trustworthy.
-    overview_1: `選擇一個你喜歡的圖案並記住它的樣子。這個圖案從現在開始會經常出現，除非你清空了瀏覽器的快取或者使用了新的Signer令牌。`,
-    // Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or
-    // use a new Signer token.
-    label: `背景` // background
-  },
-  parity: {
-    chains: {
-      chain_classic: `將Parity同步至以太坊經典網路`, // Parity syncs to the Ethereum Classic network
-      chain_dev: `將Parity使用一條本地開發用區塊鏈`, // Parity uses a local development chain
-      chain_expanse: `將Parity同步至Expanse網路`, // Parity syncs to the Expanse network
-      chain_foundation: `將Parity同步至以太坊基金會發起的以太坊網路`, // Parity syncs to the Ethereum network launched by the Ethereum Foundation
-      chain_kovan: `將Parity同步至Kovan測試網路`, // Parity syncs to the Kovan test network
-      chain_olympic: `將Parity同步至Olympic測試網路`, // Parity syncs to the Olympic test network
-      chain_ropsten: `將Parity同步至Ropsten測試網路`, // Parity syncs to the Ropsten test network
-      cmorden_kovan: `將Parity同步至Morden（經典）測試網路`, // Parity syncs to Morden (Classic) test network
-      hint: `Parity節點同步的區塊鏈`, // the chain for the Parity node to sync to
-      label: `將同步的區塊鏈/網路` // chain/network to sync
-    },
-    languages: {
-      hint: `此介面顯示的語言`, // the language this interface is displayed with
-      label: `介面語言` // UI language
-    },
-    loglevels: `選擇一個不同的logs層次`, // Choose the different logs level.
-    modes: {
-      hint: `Parity節點的同步模式`, // the syncing mode for the Parity node
-      label: `執行模式`, // mode of operation
-      mode_active: `Parity持續地同步區塊鏈`, // Parity continuously syncs the chain
-      mode_dark: `Parity只有在RPC啟用時才同步`, // Parity syncs only when the RPC is active
-      mode_offline: `Parity不同步`, // Parity doesn't sync
-      mode_passive: `Parity初始同步，然後進入休眠並有規律地再同步` // Parity syncs initially, then sleeps and wakes regularly to resync
-    },
-    overview_0: `通過此介面控制Parity節點設定和同步設定`, // Control the Parity node settings and nature of syncing via this interface.
-    label: `parity` // parity
-  },
-  proxy: {
-    details_0: `除了通過IP地址和埠來訪問Parity，你也能通過.parity子域名來使用Parity，訪問 {homeProxy}。為了設定基於子域名的路由，你需要新增相關的代理記錄至你的瀏覽器。`,
-    // Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting
-    // {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,
-    details_1: `如果想了解如何配置代理，教程已提供在{windowsLink}，{macOSLink}和{ubuntuLink}。`,
-    // To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}.
-    details_macos: `macOS`, // macOS
-    details_ubuntu: `Ubuntu`, // Ubuntu
-    details_windows: `Windows`, // Windows
-    overview_0: `代理設定使你可以通過一個可記憶的地址來訪問Parity和所有相關的去中性化應用。`,
-    // The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.
-    label: `代理` // proxy
-  },
-  views: {
-    accounts: {
-      description: `一個此Parity例項所關聯和匯入的所有帳戶的列表。傳送交易、接收流入價值、管理你的帳目和資助你的帳戶。`,
-      // A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values,
-      // manage your balances and fund your accounts.
-      label: `帳戶` // Accounts
-    },
-    addresses: {
-      description: `一個此Parity例項管理的所有聯絡人和地址簿記錄的列表。只需點選一個按鈕就可以觀察帳戶並獲得所有交易相關的資訊。`,
-      // A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available
-      // at the click of a button when transacting.
-      label: `地址簿` // Addressbook
-    },
-    apps: {
-      description: `與整個底層網路交流的分散式應用。新增應用，管理你的應用庫和與網路上的其他應用進行互動。`,
-      // Decentralized applications that interact with the underlying network. Add applications, manage you application portfolio and
-      // interact with application from around the network.
-      label: `應用` // Applications
-    },
-    contracts: {
-      description: `觀察和互動已經被部署在網路上的特定合約。這是一個更注重技術的環境，特別為可以理解合約內部執行機制的高階使用者所設立。`,
-      // Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment,
-      // specifically for advanced users that understand the inner working of certain contracts.
-      label: `合約` // Contracts
-    },
-    overview_0: `僅可視部分對你可用的應用來管理應用介面`,
-    // Manage the available application views using only the parts of the application applicable to you.
-    overview_1: `你是終端使用者？預設設定為初學者和高階使用者進行了相同的設定。`,
-    // Are you an end-user? The defaults are setup for both beginner and advanced users alike.
-    overview_2: `你是開發者？新增一些功能來管理合約和與應用部署互動。`,
-    // Are you a developer? Add some features to manage contracts and interact with application deployments.
-    overview_3: `你是礦工或者運營一個大型節點？新增一些功能來讓你獲得更多有關節點執行的資訊。`,
-    // Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.
-    settings: {
-      description: `此介面。允許你自定義應用的選項、執行、視覺化和感官。`,
-      // This view. Allows you to customize the application in term of options, operation and look and feel.
-      label: `設定` // Settings
-    },
-    signer: {
-      description: `這個應用安全交易管理區域，你可以通過任何從本應用和其他分散式應用發起的即將傳送的交易`,
-      // The secure transaction management area of the application where you can approve any outgoing transactions made
-      // from the application as well as those placed into the queue by decentralized applications.
-      label: `Signer` // Signer
-    },
-    status: {
-      description: `觀察Parity節點現在的執行情況：網路連線數、實際執行例項的Logs和具體挖礦資訊（如果已開啟並設定）`,
-      // See how the Parity node is performing in terms of connections to the network, logs from the actual running instance
-      // and details of mining (if enabled and configured).
-      label: `狀態` // Status
-    },
-    label: `視窗`, // views
-    home: {
-      label: `首頁` // Home
-    }
-  },
-  label: `設定` // settings
-};
diff --git a/js/src/i18n/zh-Hant-TW/shapeshift.js b/js/src/i18n/zh-Hant-TW/shapeshift.js
deleted file mode 100644
index bbcf0c94f27118c89c94d2257da40ca276f082b3..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/shapeshift.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  awaitingDepositStep: {
-    awaitingConfirmation: `正在等待你的{typeSymbol}資金交易的存款地址的確認資訊`,
-    // Awaiting confirmation of the deposit address for your {typeSymbol} funds exchange
-    awaitingDeposit: `{shapeshiftLink}正在等待{typeSymbol}的存入.從你的{typeSymbol}網路客戶端傳送資金至-`,
-    // {shapeshiftLink} is awaiting a {typeSymbol} deposit. Send the funds from your {typeSymbol} network client to -
-    minimumMaximum: `{minimum}至少, {maximum}至多` // {minimum} minimum, {maximum} maximum
-  },
-  awaitingExchangeStep: {
-    awaitingCompletion: `正在完成資金交易併發送資金至你的Parity帳戶`,
-    // Awaiting the completion of the funds exchange and transfer of funds to your Parity account.
-    receivedInfo: `{shapeshiftLink}已經收到存款-`
-    // {shapeshiftLink} has received a deposit of -
-  },
-  button: {
-    cancel: `取消`, // Cancel
-    done: `關閉`, // Close
-    shift: `轉換資金` // Shift Funds
-  },
-  completedStep: {
-    completed: `{shapeshiftLink}已經完成了資金交易。`, // {shapeshiftLink} has completed the funds exchange.
-    parityFunds: `資金的改變會馬上在你的Parity帳戶裡體現。`
-    // The change in funds will be reflected in your Parity account shortly.
-  },
-  errorStep: {
-    info: `通過{shapeshiftLink}進行的資金轉換因為一個交易的致命錯誤失敗了。交易提供的錯誤資訊如下：`
-    // The funds shifting via {shapeshiftLink} failed with a fatal error on the exchange. The error message received from the exchange
-    // is as follow:
-  },
-  optionsStep: {
-    noPairs: `目前沒有可匹配的交易/貨幣可用來進行轉換`,
-    // There are currently no exchange pairs/coins available to fund with.
-    returnAddr: {
-      hint: `轉換錯誤後的發回地址`, // the return address for send failures
-      label: `（可選）{coinSymbol}發回地址` // (optional) {coinSymbol} return address
-    },
-    terms: {
-      label: `我理解ShapeShift.io是一個第三方服務，使用此服務發生的任何資訊/資金髮送是完全不受Parity控制的`
-      // I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is
-      // completely out of the control of Parity
-    },
-    typeSelect: {
-      hint: `數字貨幣轉換的種類`, // the type of crypto conversion to do
-      label: `來自資金帳戶` // fund account from
-    }
-  },
-  price: {
-    minMax: `({minimum}至小, {maximum}至大)` // ({minimum} minimum, {maximum} maximum)
-  },
-  title: {
-    completed: `完成`, // completed
-    deposit: `等待存款`, // awaiting deposit
-    details: `詳情`, // details
-    error: `交易失敗`, // exchange failed
-    exchange: `等待交易` // awaiting exchange
-  },
-  warning: {
-    noPrice: `所選擇的型別沒有匹配的價格` // No price match was found for the selected type
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/signer.js b/js/src/i18n/zh-Hant-TW/signer.js
deleted file mode 100644
index df816d73483e2ad4a05febea027009984df2435a..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/signer.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  embedded: {
-    noPending: `目前沒有待處理的確認等待你的處理`
-    // There are currently no pending requests awaiting your confirmation
-  },
-  mainDetails: {
-    editTx: `編輯條款/gas/gasPrice`, // Edit conditions/gas/gasPrice
-    tooltips: {
-      total1: `包括交易費的交易的總價值是{total} {type}`,
-      // The value of the transaction including the mining fee is {total} {type}.
-      total2: `(包括了交易費 {fee} {token})`,
-      // (This includes a mining fee of {fee} {token})
-      value1: `交易價值` // The value of the transaction.
-    }
-  },
-  requestOrigin: {
-    dapp: `來自dapp {url}`, // by a dapp at {url}
-    ipc: `通過IPC會話`, // via IPC session
-    rpc: `通過RPC{rpc}`, // via RPC {rpc}
-    signerCurrent: `通過當前標籤頁`, // via current tab
-    signerUI: `通過互動會話`, // via UI session
-    unknownInterface: `通過未知互動`, // via unknown interface
-    unknownRpc: `未明確的`, // unidentified
-    unknownUrl: `未知URL` // unknown URL
-  },
-  requestsPage: {
-    noPending: `沒有請求需要你的確認`, // There are no requests requiring your confirmation.
-    pendingTitle: `待處理請求`, // Pending Requests
-    queueTitle: `本地交易` // Local Transactions
-  },
-  sending: {
-    hardware: {
-      confirm: `請在你連線的硬體裝置上確認交易`, // Please confirm the transaction on your attached hardware device
-      connect: `請在確認交易前連線你的硬體裝置` // Please attach your hardware device before confirming the transaction
-    }
-  },
-  signRequest: {
-    request: `一個簽名資料在請求你的帳號：`, // A request to sign data using your account:
-    state: {
-      confirmed: `通過`, // Confirmed
-      rejected: `拒絕` // Rejected
-    },
-    unknownBinary: `（未知二進位制資料）`, // (Unknown binary data)
-    warning: `警告：此操作的結果是不可逆的。請在確認資訊後再通過請求。`
-    // WARNING: This consequences of doing this may be grave. Confirm the request only if you are sure.
-  },
-  title: `可信的Signer`, // Trusted Signer
-  txPending: {
-    buttons: {
-      viewToggle: `檢視交易` // view transaction
-    }
-  },
-  txPendingConfirm: {
-    buttons: {
-      confirmBusy: `通過中...`, // Confirming...
-      confirmRequest: `通過請求` // Confirm Request
-    },
-    errors: {
-      invalidWallet: `所提供的錢包檔案不可用` // Given wallet file is invalid.
-    },
-    password: {
-      decrypt: {
-        hint: `解金鑰匙`, // decrypt the key
-        label: `鑰匙密碼` // Key Password
-      },
-      unlock: {
-        hint: `解鎖帳戶`, // unlock the account
-        label: `帳戶密碼` // Account Password
-      }
-    },
-    passwordHint: `（提示）{passwordHint}`, // (hint) {passwordHint}
-    selectKey: {
-      hint: `此帳戶的鑰匙檔案`, // The keyfile to use for this account
-      label: `選擇本地鑰匙` // Select Local Key
-    },
-    tooltips: {
-      password: `請為此帳戶提供密碼` // Please provide a password for this account
-    }
-  },
-  txPendingForm: {
-    changedMind: `我改主意了`, // I've changed my mind
-    reject: `拒絕請求` // reject request
-  },
-  txPendingReject: {
-    buttons: {
-      reject: `拒絕請求` // Reject Request
-    },
-    info: `你確定要拒絕請求嗎？`, // Are you sure you want to reject request?
-    undone: `此操作是不可逆的`  // This cannot be undone
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/status.js b/js/src/i18n/zh-Hant-TW/status.js
deleted file mode 100644
index 1c98f8a0bd7318ea65c363f9f76ef5913fe805ea..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/status.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  debug: {
-    reverse: `翻轉訂單`, // Reverse Order
-    stopped: `Parity的互動目前停止了重新整理和顯示Logs，請啟動它來檢視最新的更新。`,
-    // Refresh and display of logs from Parity is currently stopped via the UI, start it to see the latest updates.
-    title: `節點Logs` // Node Logs
-  },
-  miningSettings: {
-    input: {
-      author: {
-        hint: `礦工名字`, // the mining author
-        label: `礦工` // author
-      },
-      extradata: {
-        hint: `提取挖到區塊的資料`, // extra data for mined blocks
-        label: `提取資料` // extradata
-      },
-      gasFloor: {
-        hint: `挖礦的gas下限目標`, // the gas floor target for mining
-        label: `gas下限目標` // gas floor target
-      },
-      gasPrice: {
-        hint: `挖礦的最低gas價格`, // the minimum gas price for mining
-        label: `最低gas價格` // minimal gas price
-      }
-    },
-    title: `挖礦設定` // mining settings
-  },
-  status: {
-    hashrate: `{hashrate} H/s`, // {hashrate} H/s
-    input: {
-      chain: `鏈`, // chain
-      enode: `enode`, // enode
-      no: `否`, // no
-      peers: `同步節點`, // peers
-      port: `網路埠`, // network port
-      rpcEnabled: `rpc開啟`, // rpc enabled
-      rpcInterface: `rpc互動`, // rpc interface
-      rpcPort: `rpc埠`, // rpc port
-      yes: `是` // yes
-    },
-    title: {
-      bestBlock: `最新區塊`, // best block
-      hashRate: `雜湊率`, // hash rate
-      network: `網路設定`, // network settings
-      node: `節點`, // Node
-      peers: `同步節點` // peers
-    }
-  },
-  title: `狀態` // Status
-};
diff --git a/js/src/i18n/zh-Hant-TW/tabBar.js b/js/src/i18n/zh-Hant-TW/tabBar.js
deleted file mode 100644
index 482c230fb43dd746917fc9e7fbe2f8e640d3a745..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/tabBar.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  tooltip: {
-    overview: `在應用的不同部分和不同介面進行導航，在帳戶介面、代幣介面和分散式應用介面之間切換。`
-    // navigate between the different parts and views of the application, switching between an account view, token view and decentralized application view
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/transfer.js b/js/src/i18n/zh-Hant-TW/transfer.js
deleted file mode 100644
index 76bb1f701deae0e5a2af587ad791e1f30e9c8bf3..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/transfer.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  advanced: {
-    data: {
-      hint: `交易附帶資料`, // the data to pass through with the transaction
-      label: `交易資料`// transaction data
-    }
-  },
-  buttons: {
-    back: `返回`, // Back
-    cancel: `取消`, // Cancel
-    close: `關閉`, // Close
-    next: `下一步`, // Next
-    send: `傳送`// Send
-  },
-  details: {
-    advanced: {
-      label: `高階傳送選項`// advanced sending options
-    },
-    amount: {
-      hint: `傳送數額`, // the amount to transfer to the recipient
-      label: `傳送數額{tag}`// amount to transfer (in {tag})
-    },
-    fullBalance: {
-      label: `所有的餘額`// full account balance
-    },
-    recipient: {
-      hint: `收款人地址`, // the recipient address
-      label: `收款人地址`// recipient address
-    },
-    sender: {
-      hint: `傳送人地址`, // the sender address
-      label: `傳送人地址`// sender address
-    },
-    total: {
-      label: `傳送數額`// total transaction amount
-    }
-  },
-  wallet: {
-    confirmation: `這筆交易需要其他人的確認。`, // This transaction needs confirmation from other owners.
-    operationHash: `操作雜湊`// operation hash
-  },
-  warning: {
-    wallet_spent_limit: `這筆轉帳的數額超過了每日轉帳數額上限。此交易需要其他人的確認才可以傳送成功。`
-    // This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/txEditor.js b/js/src/i18n/zh-Hant-TW/txEditor.js
deleted file mode 100644
index 812d9be3875becd9ddca0d9602da528f39deb62e..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/txEditor.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  condition: {
-    block: {
-      hint: `在某個區塊高度後傳送`, // The minimum block to send from
-      label: `交易傳送區塊`// Transaction send block
-    },
-    blocknumber: `在某個區塊後傳送`, // Send after BlockNumber
-    date: {
-      hint: `在某日後傳送`, // The minimum date to send from
-      label: `交易傳送日期`// Transaction send date
-    },
-    datetime: `在某日某時後傳送`, // Send after Date & Tim
-    label: `交易啟用的條件`, // Condition where transaction activates
-    none: `無條件`, // No conditions
-    time: {
-      hint: `在某時間後傳送`, // The minimum time to send from
-      label: `交易傳送時間`// Transaction send time
-    }
-  },
-  gas: {
-    info: `你可以基於最近的交易gas價格的分佈選擇gas價格。 gas價格越低，交易費用越便宜。 gas 價格越高，交易被網路打包的速度越快。`
-    // You can choose the gas price based on the distribution of recent included transaction gas prices.The lower the gas price is, the cheaper the transaction will be.The higher the gas price is, the faster it should get mined by the network.
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/ui.js b/js/src/i18n/zh-Hant-TW/ui.js
deleted file mode 100644
index c7e4e3790c51268958299479349e2e21fd4563d8..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/ui.js
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  actionbar: {
-    export: {
-      button: {
-        export: `匯出`// export
-      }
-    },
-    import: {
-      button: {
-        cancel: `取消`, // Cancel
-        confirm: `確認`, // Confirm
-        import: `匯入`// import
-      },
-      confirm: `確認這是你想匯入的`, // Confirm that this is what was intended to import.
-      error: `發生錯誤：{errorText}`, // An error occured: {errorText}
-      step: {
-        error: `錯誤`, // error
-        select: `選擇一個檔案`, // select a file
-        validate: `確認`// validate
-      },
-      title: `從一個檔案匯入`// Import from a file
-    },
-    search: {
-      hint: `輸入搜尋內容……`// Enter search input...
-    },
-    sort: {
-      sortBy: `根據{label}排序`, // Sort by {label}
-      typeDefault: `預設`, // Default
-      typeEth: `根據以太幣數額排序`, // Sort by ETH
-      typeName: `根據帳戶名字排序`, // Sort by name
-      typeTags: `根據標籤排序`// Sort by tags
-    }
-  },
-  balance: {
-    none: `這個帳戶沒有餘額`// No balances associated with this account
-  },
-  blockStatus: {
-    bestBlock: `最新區塊{blockNumber}`, // {blockNumber} best block
-    syncStatus: `currentBlock}/{highestBlock}區塊同步`, // {currentBlock}/{highestBlock} syncing{
-    warpRestore: `{percentage}%恢復`, // {percentage}% warp restore
-    warpStatus: `, {percentage}%歷史`// {percentage}% historic
-  },
-  confirmDialog: {
-    no: `不是`, // no
-    yes: `是`// yes
-  },
-  copyToClipboard: {
-    copied: `複製{data}到貼上板`// copied {data} to clipboard
-  },
-  errors: {
-    close: `關閉`// close
-  },
-  fileSelect: {
-    defaultLabel: `拉一個檔案到這裡，或者選擇一個檔案上傳`// Drop a file here, or click to select a file to upload
-  },
-  gasPriceSelector: {
-    customTooltip: {
-      transactions: `{number} {number, plural, one {transaction} other {transactions}} with gas price set from {minPrice} to {maxPrice}`
-    }
-  },
-  identityName: {
-    null: `空`, // NULL
-    unnamed: `未命名`// UNNAMED
-  },
-  methodDecoding: {
-    condition: {
-      block: `, {historic, select, true {Submitted} false {Submission}} at block {blockNumber}`,
-      time: `, {historic, select, true {Submitted} false {Submission}} at {timestamp}`
-    },
-    deploy: {
-      address: `在地址上部署一個合約`, // Deployed a contract at address
-      params: `附帶下面的引數：`, // with the following parameters:
-      willDeploy: `將要部署一個合約`, // Will deploy a contract
-      withValue: `, 傳送{value}`// sending {value}
-    },
-    gasUsed: `({gas}gas消耗)`, // {gas} gas used
-    gasValues: `{gas} gas ({gasPrice}M/{tag})`,
-    input: {
-      data: `資料`, // data
-      input: `輸入`, // input
-      withInput: `with the {inputDesc} {inputValue}`
-    },
-    receive: {
-      contract: `合約`, // the contract
-      info: `{historic, select, true {Received} false {Will receive}} {valueEth} from {aContract}{address}`
-    },
-    signature: {
-      info: `{historic, select, true {Executed} false {Will execute}} the {method} function on the contract {address} trsansferring {ethValue}{inputLength, plural, zero {,} other {passing the following {inputLength, plural, one {parameter} other {parameters}}}}`
-    },
-    token: {
-      transfer: `{historic, select, true {Transferred} false {Will transfer}} {value} to {address}`
-    },
-    transfer: {
-      contract: `the contract`,
-      info: `{historic, select, true {Transferred} false {Will transfer}} {valueEth} to {aContract}{address}`
-    },
-    txValues: `{historic, select, true {Provided} false {Provides}} {gasProvided}{gasUsed} for a total transaction value of {totalEthValue}`,
-    unknown: {
-      info: `{historic, select, true {Executed} false {Will execute}} the {method} on the contract {address} transferring {ethValue}.`
-    }
-  },
-  passwordStrength: {
-    label: `密碼強度`// password strength
-  },
-  tooltips: {
-    button: {
-      done: `完成`, // Done
-      next: `下一步`, // Next
-      skip: `跳過`// Skip
-    }
-  },
-  txHash: {
-    confirmations: `{count} {value, plural, one {confirmation} other {confirmations}}`,
-    oog: `這筆交易已經耗光了gas。請用更多的gas嘗試。`, // The transaction might have gone out of gas. Try again with more gas.
-    posted: `這筆交易已經被髮送到網路，附帶雜湊是{hashLink}`, // The transaction has been posted to the network with a hash of {hashLink}
-    waiting: `等待確認`// waiting for confirmations
-  },
-  vaultSelect: {
-    hint: `這個帳戶繫結的保險庫是`, // the vault this account is attached to
-    label: `相關保險庫`// associated vault
-  },
-  verification: {
-    gatherData: {
-      accountHasRequested: {
-        false: `.你還沒有從這個帳戶請求確認。`, // You did not request verification from this account yet
-        pending: `檢查一下你是否請求了驗證……`, // Checking if you requested verification…
-        true: `你已經從這個帳戶請求到驗證。`// You already requested verification from this account.
-      },
-      accountIsVerified: {
-        false: `你的帳戶還沒有被驗證。`, // Your account is not verified yet.
-        pending: `檢查一下你的帳戶是否已經被驗證……`, // Checking if your account is verified…
-        true: `你的帳戶已經被驗證。`// Your account is already verified.
-      },
-      fee: `額外的費用是{amount}ETH`, // The additional fee is {amount} ETH.
-      isAbleToRequest: {
-        pending: `驗證你的輸入……`// Validating your input…
-      },
-      isServerRunning: {
-        false: `驗證伺服器沒有在執行。`, // The verification server is not running.
-        pending: `檢查一下驗證伺服器是否在執行……`, // Checking if the verification server is running…
-        true: `驗證伺服器正在執行。`// The verification server is running.
-      },
-      nofee: `沒有額外的費用。`, // There is no additional fee.
-      termsOfService: `我同意下面的條款和條件。`// I agree to the terms and conditions below.
-    }
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/upgradeParity.js b/js/src/i18n/zh-Hant-TW/upgradeParity.js
deleted file mode 100644
index fc6a603045c64ec08991dfdd725bb4637c1cd6ce..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/upgradeParity.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: `你正在升級到Parity最新版本{newversion}。請等待升級過程完成。`,
-  // Your upgrade to Parity {newversion} is currently in progress. Please wait until the process completes.
-  button: {
-    close: `關閉`, // close
-    done: `完成`, // done
-    upgrade: `現在升級`// upgrade now
-  },
-  completed: `你升級到Parity最新版本{newversion}的操作已經完成。點選“完成”將自動重新載入這個應用。`,
-  // Your upgrade to Parity {newversion} has been successfully completed. Click "done" to automatically reload the application.
-  consensus: {
-    capable: `你當前的Parity版本能夠處理網路請求。`,
-    // Your current Parity version is capable of handling the network requirements.
-    capableUntil: `你當前的Parity版本能夠處理直到第{blockNumber}個區塊的網路請求。`,
-    // Your current Parity version is capable of handling the network requirements until block {blockNumber}
-    incapableSince: `你當前的Parity版本能夠處理第{blockNumber}個區塊以後的網路請求。`,
-    // Your current Parity version is incapable of handling the network requirements since block {blockNumber}
-    unknown: `你當前的Parity版本能夠處理網路請求。`
-    // Your current Parity version is capable of handling the network requirements.
-  },
-  failed: `升級到Parity最新版本{newversion}遇到錯誤，升級失敗。`,
-  // Your upgrade to Parity {newversion} has failed with an error.
-  info: {
-    currentVersion: `你現在正在執行{currentversion}版本。`, // You are currently running {currentversion}
-    next: `點選“現在升級”，開始Parity升級。`, // Proceed with "upgrade now" to start your Parity upgrade.
-    upgrade: `可以升級到最新版本{newversion}`, // An upgrade to version {newversion} is available
-    welcome: `迎來到Parity升級指南，讓你享受無縫升級到Parity最新版本的體驗。`
-    // Welcome to the Parity upgrade wizard, allowing you a completely seamless upgrade experience to the next version of Parity.歡
-  },
-  step: {
-    completed: `升級完成`, // upgrade completed
-    error: `錯誤`, // error
-    info: `可以升級`, // upgrade available
-    updating: `升級Parity`// upgrading parity
-  },
-  version: {
-    unknown: `未知`// unknown
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/vaults.js b/js/src/i18n/zh-Hant-TW/vaults.js
deleted file mode 100644
index ffd6c4646dfe099303695dc003bcf6503791bef0..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/vaults.js
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  accounts: {
-    button: {
-      cancel: `取消`, // Cancel
-      execute: `設定` // Set
-    },
-    empty: `此保險庫中沒有帳戶`, // There are no accounts in this vault
-    title: `管理保險庫帳戶` // Manage Vault Accounts
-  },
-  button: {
-    accounts: `帳戶`, // accounts
-    add: `建立保險庫`, // create vault
-    close: `關閉`, // close
-    edit: `編輯`, // edit
-    open: `開啟` // open
-  },
-  confirmClose: {
-    info: `你即將關閉一個保險庫。所有與這個保險庫相關的帳戶在這個操作完成後都不再可見。如果想再見到關聯帳戶，請重新開啟保險庫。`,
-    // You are about to close a vault. Any accounts associated with the vault won't be visible after this operation concludes. To view
-    // the associated accounts, open the vault again.
-    title: `關閉保險庫` // Close Vault
-  },
-  confirmOpen: {
-    info: `你即將開啟一個保險庫。在確認了你的密碼之後，所有與這個保險庫關聯的帳戶都會可見。關閉保險庫會在介面中移除所有帳戶，直到保險庫被再次開啟。`,
-    // You are about to open a vault. After confirming your password, all accounts associated with this vault will be visible. Closing
-    // the vault will remove the accounts from view until the vault is opened again.
-    password: {
-      hint: `建立保險庫時設定的密碼`, // the password specified when creating the vault
-      label: `保險庫密碼` // vault password
-    },
-    title: `開啟保險庫` // Open Vault
-  },
-  create: {
-    button: {
-      close: `關閉`, // close
-      vault: `建立保險庫` // create valut
-    },
-    description: {
-      hint: `該保險庫更詳細的描述` // an extended description for the vault
-    },
-    descriptions: {
-      label: `（可選）描述` // (optional) description
-    },
-    hint: {
-      hint: `（可選）一個幫助記憶密碼的提示`, // (optional) a hint to help with remembering the password
-      label: `密碼提示` // password hint
-    },
-    name: {
-      hint: `一個保險庫的名字`, // a name for the vault
-      label: `保險庫名稱` // vault name
-    },
-    password: {
-      hint: `一個高強度且獨一無二的密碼`, // a strong, unique password
-      label: `密碼` // password
-    },
-    password2: {
-      hint: `驗證你的密碼`, // verify your password
-      label: `密碼（重複）` // password (repeat)
-    },
-    title: `建立一個新的保險庫` // Create a new vault
-  },
-  editMeta: {
-    allowPassword: `更改保險庫密碼`, // Change vault password
-    button: {
-      close: `關閉`, // close
-      save: `儲存` // save
-    },
-    currentPassword: {
-      hint: `保險庫的原密碼`, // your current vault password
-      label: `原密碼` // current password
-    },
-    description: {
-      hint: `此保險庫的描述`, // the description for this vault
-      label: `保險庫描述` // vault description
-    },
-    password: {
-      hint: `一個高強度且獨一無二的密碼`, // a strong, unique password
-      label: `新密碼` // new password
-    },
-    password2: {
-      hint: `驗證你的新密碼`, // verify your new password
-      label: `新密碼（重複）` // new password (repeat)
-    },
-    passwordHint: {
-      hint: `此保險庫的密碼提示`, // your password hint for this vault
-      label: `密碼提示` // password hint
-    },
-    title: `編輯保險庫元資料` // Edit Vault Metadata
-  },
-  empty: `目前沒有任何可顯示的保險庫`, // There are currently no vaults to display.
-  selector: {
-    noneAvailable: `目前沒有任何開啟、可選的保險庫。請在移動帳戶之前建立並開啟一個保險庫。`,
-    // There are currently no vaults opened and available for selection. Create and open some first before attempting to select
-    // a vault for an account move.
-    title: `選擇帳戶保險庫` // Select Account Vault
-  },
-  title: `保險庫管理` // Vault Management
-};
diff --git a/js/src/i18n/zh-Hant-TW/verification.js b/js/src/i18n/zh-Hant-TW/verification.js
deleted file mode 100644
index d5efa8fac9ea7085fc55accc94a09a0362edc00c..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/verification.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `取消`, // Cancel
-    done: `完成`, // Done
-    next: `下一步`// Next
-  },
-  code: {
-    error: `無效驗證碼`, // invalid code
-    hint: `輸入你收到的驗證碼。`, // Enter the code you received.
-    label: `驗證碼`, // verification code
-    sent: `驗證碼被髮送到接收者{receiver}.`// The verification code has been sent to {receiver}
-  },
-  confirmation: {
-    authorise: `驗證碼將被髮送到合約。請使用Parity Signer進行授權。`, // The verification code will be sent to the contract. Please authorize this using the Parity Signer.
-    windowOpen: `請保持這個視窗開啟狀態。`// Please keep this window open.
-  },
-  done: {
-    message: `恭喜，你的帳戶已經被認證。`// Congratulations, your account is verified!
-  },
-  email: {
-    enterCode: `輸入你從郵箱獲得驗證碼。`// Enter the code you received via e-mail.
-  },
-  gatherData: {
-    email: {
-      hint: `驗證碼將被髮送到這個地址`, // the code will be sent to this address
-      label: `郵箱地址`// e-mail address
-    },
-    phoneNumber: {
-      hint: `簡訊將被髮送到這個號碼`, // the SMS will be sent to this number
-      label: `國際格式的手機號碼`// phone number in international format
-    }
-  },
-  gatherDate: {
-    email: {
-      error: `無效郵箱`// invalid e-mail
-    },
-    phoneNumber: {
-      error: `無效數字`// invalid number
-    }
-  },
-  loading: `載入驗證資料`, // Loading verification data.
-  request: {
-    authorise: `驗證請求將被髮送到這個合約。請使用Parity Signer進行授權。`, // A verification request will be sent to the contract. Please authorize this using the Parity Signer.
-    requesting: `正在從Parity伺服器請求一個驗證碼，等待它被輸入到合約。`, // Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.
-    windowOpen: `請保持視窗為開啟狀態。`// Please keep this window open.
-  },
-  sms: {
-    enterCode: `輸入你從簡訊收到的驗證碼。`// Enter the code you received via SMS.
-  },
-  steps: {
-    code: `輸入驗證碼`, // Enter Code
-    completed: `完成`, // Completed
-    confirm: `確認`, // Confirm
-    data: `輸入資料`, // Enter Data
-    method: `方式`, // Method
-    request: `請求`// Request
-  },
-  title: `t驗證你的帳戶`, // verify your accoun
-  types: {
-    email: {
-      description: `你所控制的郵箱地址的雜湊值將被儲存在區塊鏈。`, // The hash of the e-mail address you prove control over will be stored on the blockchain.
-      label: `郵箱驗證`// E-mail Verification
-    },
-    sms: {
-      description: `你所控制的手機號碼將被儲存在區塊鏈。`, // It will be stored on the blockchain that you control a phone number (not <em>which</em>).
-      label: `簡訊驗證`// SMS Verification
-    }
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/wallet.js b/js/src/i18n/zh-Hant-TW/wallet.js
deleted file mode 100644
index 4c864e40f659a323f5cdd0e57f6c6a351652e8bc..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/wallet.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    edit: `編輯`, // edit
-    forget: `forget`,
-    settings: `設定`, // settings
-    transfer: `轉帳`// transfer
-  },
-  confirmations: {
-    buttons: {
-      confirmAs: `確定為……`, // Confirm As...
-      revokeAs: `撤回為……`// Revoke As...
-    },
-    none: `現在沒有交易需要確認。`, // No transactions needs confirmation right now.
-    tooltip: {
-      confirmed: `被{number}/{required}所有人確認`// Confirmed by {number}/{required} owners
-    }
-  },
-  details: {
-    requiredOwners: `這個錢包需要至少{owners}所有人驗證所有的操作（交易，修改）`,
-    // This wallet requires at least {owners} to validate any action (transactions, modifications).
-    requiredOwnersNumber: `{number} {numberValue, plural, one {owner} other {owners}}`,
-    spent: `{spent} has been spent today, out of {limit} set as the daily limit, which has been reset on {date}`,
-    title: `細節`// Details
-  },
-  title: `錢包管理`, // Wallet Management
-  transactions: {
-    none: `沒有交易被髮送。`, // No transactions has been sent.
-    title: `交易`// Transactions
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/walletSettings.js b/js/src/i18n/zh-Hant-TW/walletSettings.js
deleted file mode 100644
index f59b2bb6a3d665cd457751aad4595e26bafc5de0..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/walletSettings.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  addOwner: {
-    title: `新增持有人` // Add Owner
-  },
-  buttons: {
-    cancel: `取消`, // Cancel
-    close: `關閉`, // Close
-    next: `下一個`, // Next
-    send: `傳送`, // Send
-    sending: `正在傳送...` // Sending...
-  },
-  changes: {
-    modificationString: `為了保證你做的修改會被執行，
-                        其他的帳戶持有人也需要傳送相同的修改。
-                        他們可以通過貼上以下字串來簡單的完成更改：`,
-                        // For your modifications to be taken into account,
-              // other owners have to send the same modifications. They can paste
-              // this string to make it easier:
-    none: `錢包設定沒有發生任何更改。`, // No modifications have been made to the Wallet settings.
-    overview: `你將會造成以下更改` // You are about to make the following modifications
-  },
-  edit: {
-    message: `為了編輯這個合約的設定，至少{owners, number} 
-              {owners, plural, one {owner } other {owners }}必須傳送完全相同的修改
-              你可以將字串化的修改貼上在這裡。`
-                  // In order to edit this contract's settings, at
-                  // least {owners, number} {owners, plural, one {owner } other {owners }} have to
-                  // send the very same modifications. You can paste a stringified version
-                  // of the modifications here.
-  },
-  modifications: {
-    daylimit: {
-      hint: `不需要確認即可傳送的ETH數量`, // amount of ETH spendable without confirmations
-      label: `錢包每日限額` // wallet day limit
-    },
-    fromString: {
-      label: `修改` // modifications
-    },
-    owners: {
-      label: `其他錢包持有人` // other wallet owners
-    },
-    required: {
-      hint: `確認交易所需的通過持有人人數`, // number of required owners to accept a transaction
-      label: `所需持有人` // required owners
-    },
-    sender: {
-      hint: `作為此持有人傳送修改`, // send modifications as this owner
-      label: `來自帳戶 (wallet owner)` // from account (wallet owner)
-    }
-  },
-  ownersChange: {
-    details: `從 {from} 至 {to}`, // from {from} to {to}
-    title: `改變所需持有人`
-  },
-  rejected: `交易#{txid}已經被拒絕`, // The transaction #{txid} has been rejected
-  removeOwner: {
-    title: `移除持有人` // Remove Owner
-  }
-};
diff --git a/js/src/i18n/zh-Hant-TW/web.js b/js/src/i18n/zh-Hant-TW/web.js
deleted file mode 100644
index 290b3e0a36c6b090b53906c5b586c5eea2aab4e7..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/web.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  requestToken: `正在請求使用代幣` // Requesting access token...
-};
diff --git a/js/src/i18n/zh-Hant-TW/writeContract.js b/js/src/i18n/zh-Hant-TW/writeContract.js
deleted file mode 100644
index 37656b56de4def141993b8217b4f4c8c1eecb914..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh-Hant-TW/writeContract.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    autoCompile: `自動編譯`, // Auto-Compile
-    compile: `編譯`, // Compile
-    deploy: `部署`, // Deploy
-    import: `載入Solidity`, // Import Solidity
-    load: `載入`, // Load
-    new: `新建`, // New
-    optimise: `優化`, // Optimise
-    save: `儲存` // Save
-  },
-  compiling: {
-    action: `請編譯原始碼`, // Please compile the source code.
-    busy: `編譯中...` // Compiling...
-  },
-  details: {
-    saved: `(已儲存 {timestamp})` // (saved {timestamp})
-  },
-  error: {
-    noContract: `沒有找到合約`, // No contract has been found.
-    params: `發生瞭如下描述的一個錯誤` // An error occurred with the following description
-  },
-  input: {
-    abi: `ABI介面`, // ABI Interface
-    code: `位元組碼`, // Bytecode
-    metadata: `元資料`, // Metadata
-    swarm: `Swarm元資料雜湊` // Sarm Metadata Hash
-  },
-  title: {
-    contract: `選擇一個合約`, // Select a contract
-    loading: `載入中...`, // Loading...
-    main: `寫一個合約`, // Write a Contract
-    messages: `編譯器訊息`, // Compiler messages
-    new: `新建Solidity合約`, // New Solidity Contract
-    parameters: `變數`, // Parameters
-    saved: `已儲存 @ {timestamp}`, // saved @ {timestamp}
-    selectSolidity: `選擇Solidity版本`, // Select a Solidity version
-    solidity: `正在載入Solidity {version}` // Loading Solidity {version}
-  },
-  type: {
-    humanErc20: `Human代幣合約編碼`, // Implementation of the Human Token Contract
-    implementErc20: `ERC20代幣合約編碼`, // Implementation of the ERC20 Token Contract
-    multisig: `多籤錢包編碼`, // Implementation of a multisig Wallet
-    standardErc20: `標準ERC20代幣合約` // Standard ERC20 Token Contract
-  }
-};
diff --git a/js/src/i18n/zh/account.js b/js/src/i18n/zh/account.js
deleted file mode 100644
index 2a8febc28dbdee018f2f6505f6652c1a662fc962..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/account.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    delete: `删除`, // delete
-    edit: `编辑`, // edit
-    faucet: `Kovan测试网络以太币`, // Kovan ETH
-    password: `密码`, // password
-    shapeshift: `shapeshift`,
-    transfer: `转账`, // transfer
-    verify: `确认`// verify
-  },
-  hardware: {
-    confirmDelete: `你确定从你的账户列表中移除下面的硬件地址吗？`
-  }, // Are you sure you want to remove the following hardware address from your account list?
-  header: {
-    outgoingTransactions: `{count}笔正在发生的转账`, // {count} outgoing transactions
-    uuid: `uuid: {uuid}`
-  },
-  title: `账户管理`, // Account Management
-  transactions: {
-    poweredBy: `Transaction list powered by {etherscan}提供的交易列表`,
-    title: `交易`// transactions
-  }
-};
diff --git a/js/src/i18n/zh/accounts.js b/js/src/i18n/zh/accounts.js
deleted file mode 100644
index 78b18fc4b70f45c3f7cbb585a50c32018153846e..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/accounts.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    newAccount: `账户`, // account
-    newWallet: `钱包`, // wallet
-    vaults: `保险库`// vaults
-  },
-  summary: {
-    minedBlock: `在第#{blockNumber}个区块被挖出`// Mined at block #{blockNumber}
-  },
-  title: `账户总览`, // Accounts Overview
-  tooltip: {
-    actions: `与当前视窗有关的操作可以在工具栏中快速被找到，不论是执行操作还是创建新项`,
-    // actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item
-    overview: `你的账户很容易使用，使你可以编辑元信息、转账、查看交易和向账户充值`
-    // your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account
-  },
-  tooltips: {
-    owner: `{name}持有者`// {name} (owner)
-  }
-};
diff --git a/js/src/i18n/zh/addAddress.js b/js/src/i18n/zh/addAddress.js
deleted file mode 100644
index f80042102ff0a6c3b8b38d279028f50cb42ee27b..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/addAddress.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    add: `保存地址`, // Save Address
-    close: `取消` // Cancel
-  },
-  header: `如果想在地址簿中添加一条新的记录，你需要拥有账户的网络地址并提供一个的描述（可选）。一旦添加，记录就可以体现在你的地址簿中。`,
-  // To add a new entry to your addressbook, you need the network
-  // address of the account and can supply an optional description.
-  // Once added it will reflect in your address book.
-  input: {
-    address: {
-      hint: `记录的网络地址`, // the network address for the entry
-      label: `网络地址` // network address
-    },
-    description: {
-      hint: `记录的详细描述`, // an expanded description for the entry
-      label: `（可选）地址描述` // (optional) address description
-    },
-    name: {
-      hint: `记录的名字`, // a descriptive name for the entry
-      label: `地址名` // address name
-    }
-  },
-  label: `添加已保存的地址` // add saved address
-};
diff --git a/js/src/i18n/zh/addContract.js b/js/src/i18n/zh/addContract.js
deleted file mode 100644
index c45a37b3ae1ac9358ac76cd1efedc372fe103eae..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/addContract.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  abi: {
-    hint: `合约的ABI`, // the abi for the contract
-    label: `合约ABI` // contract abi
-  },
-  abiType: {
-    custom: {
-      description: `通过自定义ABI创造的合约`, // Contract created from custom ABI
-      label: `自定义合约` // Custom Contract
-    },
-    multisigWallet: {
-      description: `以太坊多重签名合约{link}`, // Ethereum Multisig contract {link}
-      label: `多重签名钱包`, // Multisig Wallet
-      link: `参考合约代码` // see contract code
-    },
-    token: {
-      description: `一个标准的{erc20}代币`, // A standard {erc20} token
-      erc20: `ERC 20`, // ERC 20
-      label: `代币` // Token
-    }
-  },
-  address: {
-    hint: `合约的网络地址`, // the network address for the contract
-    label: `网络地址` // network address
-  },
-  button: {
-    add: `添加合约`, // Add Contract
-    cancel: `取消`, // Cancel
-    next: `下一步`, // Next
-    prev: `上一步` // Back
-  },
-  description: {
-    hint: `记录的详细描述`, // an expanded description for the entry
-    label: `（可选）合约描述` // (optional) contract description
-  },
-  name: {
-    hint: `合约的描述性名称`, // a descriptive name for the contract
-    label: `合约名` // contract name
-  },
-  title: {
-    details: `输入合约细节`, // enter contract details
-    type: `选择合约种类` // choose a contract type
-  }
-};
diff --git a/js/src/i18n/zh/address.js b/js/src/i18n/zh/address.js
deleted file mode 100644
index f9328afed4e934db470de7271caab46a647f2546..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/address.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    edit: `编辑`, // edit
-    forget: `忘记`, // forget
-    save: `保存`// save
-  },
-  delete: {
-    confirmInfo: `你确定你想把下面的地址从你的地址簿中移除吗？`, // Are you sure you want to remove the following address from your addressbook?
-    title: `确认移除`// confirm removal
-  },
-  title: `地址信息`// Address Information
-};
diff --git a/js/src/i18n/zh/addressSelect.js b/js/src/i18n/zh/addressSelect.js
deleted file mode 100644
index 5c45a49a169c972252cd5ff67d31b996a977e934..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/addressSelect.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  fromEmail: `使用邮箱{email}进行确认`, // Verified using email {email}
-  fromRegistry: `{name}（来自注册）`, // {name} (from registry)
-  labels: {
-    accounts: `账户`, // accounts
-    contacts: `合约`, // contacts
-    contracts: `合约`// contracts
-  },
-  noAccount: `查不到这个账户`// No account matches this query...
-};
diff --git a/js/src/i18n/zh/addresses.js b/js/src/i18n/zh/addresses.js
deleted file mode 100644
index 5e3bd26f00c1b99580611935bff93f51f116dc5f..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/addresses.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    add: `地址` // address
-  },
-  errors: {
-    invalidFile: `提供的文件是无效的`// The provided file is invalid...
-  },
-  title: `保存的地址`// Saved Addresses
-};
diff --git a/js/src/i18n/zh/application.js b/js/src/i18n/zh/application.js
deleted file mode 100644
index 62412c2d27e8cc34a2b94a42321358cdf005fb23..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/application.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  frame: {
-    error: `错误：这个应用不能也不应该载入到内置框架中`// ERROR: This application cannot and should not be loaded in an embedded iFrame
-  },
-  status: {
-    consensus: {
-      capable: `可行`, // Capable
-      capableUntil: `到第 #{blockNumber} 区块前可行`, // Capable until #{blockNumber}
-      incapableSince: `自第 #{blockNumber} 区块后不可行`, // Incapable since #{blockNumber}
-      unknown: `未知能力`// Unknown capability
-    },
-    upgrade: `升级`// Upgrade
-  }
-};
diff --git a/js/src/i18n/zh/connection.js b/js/src/i18n/zh/connection.js
deleted file mode 100644
index 45cf05cf5719149854564248b80bdc37d412c59e..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/connection.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-export default {
-  connectingAPI: `正在连接至Parity Secure API`, // Connecting to the Parity Secure API.
-  connectingNode: `正在连接Parity节点。如果弹出任何信息，请确认你的Parity节点正在运行并连接至互联网。`,
-  // Connecting to the Parity Node. If this informational message persists,
-  // please ensure that your Parity node is running and reachable on the network.
-  invalidToken: `无效的签名令牌`, // invalid signer token
-  noConnection: `无法连接至Parity Secure API。请升级的你的安全令牌或者生成一个新的，运行{newToken}并粘贴生成的令牌到下方。`,
-  // Unable to make a connection to the Parity Secure API. To update your secure
-  // token or to generate a new one, run {newToken} and paste the generated token
-  // into the space below.
-  token: {
-    hint: `一个Parity生成的令牌`, // a generated token from Parity
-    label: `安全令牌` // secure token
-  }
-};
diff --git a/js/src/i18n/zh/contract.js b/js/src/i18n/zh/contract.js
deleted file mode 100644
index ad97a85fbf064095368e415656690949dfeffb59..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/contract.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    close: `关闭`, // close
-    details: `详细资料`, // details
-    edit: `编辑`, // edit
-    execute: `运行`, // execute
-    forget: `forget` // forget
-  },
-  details: {
-    title: `合约细节` // contract details
-  },
-  events: {
-    eventPending: `待定中`, // pending
-    noEvents: `此合约没有发送过任何事件`, // No events has been sent from this contract.
-    title: `事件`  // events
-  },
-  minedBlock: `挖到了第{blockNumber}个区块`, // Mined at block #{blockNumber}
-  queries: {
-    buttons: {
-      query: `查询` // Query
-    },
-    title: `查询` // queries
-  },
-  title: `合约信息` // Contract Information
-};
diff --git a/js/src/i18n/zh/contracts.js b/js/src/i18n/zh/contracts.js
deleted file mode 100644
index a1cdec5af1a697f12c5864bd93b481a13bb5683c..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/contracts.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    deploy: `部署`, // deploy
-    develop: `开发`, // develop
-    watch: `观察` // watch
-  },
-  sortOrder: {
-    date: `日期`, // date
-    minedBlock: `挖到的区块` // mined block
-  },
-  title: `合约` // Contracts
-};
diff --git a/js/src/i18n/zh/createAccount.js b/js/src/i18n/zh/createAccount.js
deleted file mode 100644
index 5bae9e2753a473861c281a32f8894e88ae84a687..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/createAccount.js
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  accountDetails: {
-    address: {
-      hint: `账户地址`,
-      label: `地址`
-    },
-    name: {
-      hint: `描述账户的名字`,
-      label: `账户名`
-    },
-    phrase: {
-      hint: `账户恢复词`,
-      label: `账户恢复词（安全保存，别人拥有它就可以完全控制你的账户）`
-    }
-  },
-  accountDetailsGeth: {
-    imported: `你已经从Geth keystore导入了{number}个地址`
-  },
-  button: {
-    back: `返回`,
-    cancel: `取消`,
-    close: `关闭`,
-    create: `创建`,
-    done: `Done`,
-    import: `导入`,
-    next: `下一步`,
-    print: `打印恢复词`
-  },
-  creationType: {
-    fromGeth: {
-      description: `Import accounts from the Geth keystore with the original password`,
-      label: `从Geth keystore导入账户`
-    },
-    fromJSON: {
-      description: `Import an industry-standard JSON keyfile with the original password`,
-      label: `从JSON文件导入账户`
-    },
-    fromNew: {
-      description: `Selecting your identity icon and specifying the password`,
-      label: `手动创建新账户`
-    },
-    fromPhrase: {
-      description: `Recover using a previously stored recovery phrase and new password`,
-      label: `通过恢复词恢复账户`
-    },
-    fromPresale: {
-      description: `Import an Ethereum presale wallet file with the original password`,
-      label: `从以太坊预售钱包导入账户`
-    },
-    fromRaw: {
-      description: `Enter a previously created raw private key with a new password`,
-      label: `导入私钥`
-    },
-    info: `Please select the type of account you want to create. Either create an account via name & password, or import it from a variety of existing sources. From here the wizard will guide you through the process of completing your account creation.`
-  },
-  newAccount: {
-    hint: {
-      hint: `（可选）帮助你记住密码的提示`,
-      label: `密码提示`
-    },
-    name: {
-      hint: `描述账户的名字`,
-      label: `账户名`
-    },
-    password: {
-      hint: `足够强的密码`,
-      label: `密码`
-    },
-    password2: {
-      hint: `确认你的密码`,
-      label: `再次输入密码`
-    }
-  },
-  newGeth: {
-    available: `There are currently {count} importable keys available from the Geth keystore which are not already available on your Parity instance. Select the accounts you wish to import and move to the next step to complete the import.`,
-    noKeys: `现在Geth keystore中没有可导入的私钥`
-  },
-  newImport: {
-    file: {
-      hint: `要导入的钱包文件`,
-      label: `钱包文件`
-    },
-    hint: {
-      hint: `（可选）帮助你记住密码的提示`,
-      label: `密码提示`
-    },
-    name: {
-      hint: `描述账户的名字`,
-      label: `账户名`
-    },
-    password: {
-      hint: `输入密码，解锁钱包`,
-      label: `密码`
-    }
-  },
-  rawKey: {
-    hint: {
-      hint: `（可选）帮助你记住密码的提示`,
-      label: `密码提示`
-    },
-    name: {
-      hint: `描述账户的名字`,
-      label: `账户名`
-    },
-    password: {
-      hint: `足够强的密码`,
-      label: `密码`
-    },
-    password2: {
-      hint: `确认密码`,
-      label: `再次输入密码`
-    },
-    private: {
-      hint: `原始的十六进制编码私钥`,
-      label: `私钥`
-    }
-  },
-  recoveryPhrase: {
-    hint: {
-      hint: `（可选）帮助你记住密码的提示`,
-      label: `密码提示`
-    },
-    name: {
-      hint: `描述账户的名字`,
-      label: `账户名`
-    },
-    password: {
-      hint: `足够强的密码`,
-      label: `密码`
-    },
-    password2: {
-      hint: `确认密码`,
-      label: `再次输入密码`
-    },
-    phrase: {
-      hint: `账户恢复词`,
-      label: `账户恢复词`
-    },
-    windowsKey: {
-      label: `在Windows系统上由Parity 1.4.5以前的版本创建的私钥`
-    }
-  },
-  title: {
-    accountInfo: `账户信息`,
-    createAccount: `创建账户`,
-    createType: `创建类型`,
-    importWallet: `导入钱包`
-  }
-};
diff --git a/js/src/i18n/zh/createWallet.js b/js/src/i18n/zh/createWallet.js
deleted file mode 100644
index 76a0e27978fa24eb54147779ab62c64c62e48f0d..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/createWallet.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    add: `添加`, // Add
-    cancel: `取消`, // Cancel
-    close: `关闭`, // Close
-    create: `创建`, // Create
-    done: `完成`, // Done
-    next: `下一步`, // Next
-    sending: `发送中...` // Sending...
-  },
-  deployment: {
-    message: `部署正在进行中` // The deployment is currently in progress
-  },
-  details: {
-    address: {
-      hint: `钱包的合约地址`, // the wallet contract address
-      label: `钱包地址` // wallet address
-    },
-    dayLimitMulti: {
-      hint: `无需确认即可使用的ETH数量`, // amount of ETH spendable without confirmations
-      label: `钱包每日限额` // wallet day limit
-    },
-    description: {
-      hint: `本地钱包描述`, // the local description for this wallet
-      label: `钱包描述（可选）` // wallet description (optional)
-    },
-    descriptionMulti: {
-      hint: `本地钱包描述`, // the local description for this wallet
-      label: `钱包描述（可选）` // wallet description (optional)
-    },
-    name: {
-      hint: `钱包本地名称`,  // the local name for this wallet
-      label: `钱包名称` // wallet name
-    },
-    nameMulti: {
-      hint: `钱包本地名称`, // the local name for this wallet
-      label: `钱包名称` // wallet name
-    },
-    ownerMulti: {
-      hint: `合约的持有者账户`, // the owner account for this contract
-      label: `从账户 (contract owner)` // from account (contract owner)
-    },
-    ownersMulti: {
-      label: `其他钱包持有者` // other wallet owners
-    },
-    ownersMultiReq: {
-      hint: `接受交易所需的持有者人数`, // number of required owners to accept a transaction
-      label: `所需持有者` // required owners
-    }
-  },
-  info: {
-    added: `已添加`, // added
-    copyAddress: `复制地址至粘贴板`, // copy address to clipboard
-    created: `{name}已被{deployedOrAdded}至`, // {name} has been {deployedOrAdded} at
-    dayLimit: `每日限额已被设置为{dayLimit}ETH`, // The daily limit is set to {dayLimit} ETH.
-    deployed: `已部署`, // deployed
-    numOwners: `需要{numOwners}个持有者才能确认一个交易`, // {numOwners} owners are required to confirm a transaction.
-    owners: `以下为钱包持有者` // The following are wallet owners
-  },
-  rejected: {
-    message: `部署被拒绝`, // The deployment has been rejected
-    state: `钱包不会被创建。你可以安全地关闭本窗口`, // The wallet will not be created. You can safely close this window.
-    title: `失败` // rejected
-  },
-  states: {
-    completed: `合约部署已完成`, // The contract deployment has been completed
-    confirmationNeeded: `合约部署需要来自本钱包的其他持有者的确认`, // The contract deployment needs confirmations from other owners of the Wallet
-    preparing: `交易正在准备被网络广播`, // Preparing transaction for network transmission
-    validatingCode: `正在验证已部署的代码`, // Validating the deployed contract code
-    waitingConfirm: `正在等待Parity Secure Signer确认本交易`, // Waiting for confirmation of the transaction in the Parity Secure Signer
-    waitingReceipt: `正在等待合约部署交易收据` // Waiting for the contract deployment transaction receipt
-  },
-  steps: {
-    deployment: `钱包部署`, // wallet deployment
-    details: `钱包详情`, // wallet details
-    info: `钱包信息`, // wallet informaton
-    type: `钱包类别` // wallet type
-  },
-  type: {
-    multisig: {
-      description: `创建/部署一个{link}钱包`, // Create/Deploy a {link} Wallet
-      label: `多重签名钱包`, // Multi-Sig Wallet
-      link: `标准多重签名` // standard multi-signature
-    },
-    watch: {
-      description: `添加一个已有钱包到你的账户`, // Add an existing wallet to your accounts
-      label: `观察钱包` // Watch a wallet
-    }
-  }
-};
diff --git a/js/src/i18n/zh/dapp.js b/js/src/i18n/zh/dapp.js
deleted file mode 100644
index c23e47f1371754e4014b60ac07a4636c94b83565..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/dapp.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  loading: `正在加载`, // Loading
-  unavailable: `不能获取这个dapp`// The dapp cannot be reached
-};
diff --git a/js/src/i18n/zh/dapps.js b/js/src/i18n/zh/dapps.js
deleted file mode 100644
index 74fea9b0de61415e3774bd7c76757aef4c59b53a..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/dapps.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  add: {
-    builtin: {
-      desc: `Parity团队开发的实验性的，用以展示dapp的性能、集成、实验性特性和控制特定网络的的客户端行为`,
-      // Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.
-      label: `与Parity绑定的应用`// Applications bundled with Parity
-    },
-    label: `visible applications可见的应用`, // visible applications
-    local: {
-      desc: `All applications installed locally on the machine by the user for access by the Parity client.`,
-      label: `本地可用的应用`// Applications locally available
-    },
-    network: {
-      desc: `这些应用与Parity没有关联，也不是Parity发布的。 它们是由各自的作者控制的。 在使用以前，请确保你理解每个应用的目标。`,
-      // These applications are not affiliated with Parity nor are they published by Parity.Each remain under the control of their respective authors.Please ensure that you understand the goals for each application before interacting.
-      label: `全球网络上的应用`// Applications on the global network
-    }
-  },
-  button: {
-    edit: `编辑`, // edit
-    permissions: `许可`// permissions
-  },
-  external: {
-    accept: `我理解这些应用和Parity没有关联`, // I understand that these applications are not affiliated with Parity
-    warning: `第三方开发者开发的应用与Parity没有关联，也不是Parity发布的。 它们是由各自的作者控制的。 在使用以前，请确保你理解每个应用的目标。`
-    // Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.
-  },
-  label: `去中心化应用`, // Decentralized Applications
-  permissions: {
-    label: `可见的dapp账户`// visible dapp accounts
-  }
-};
diff --git a/js/src/i18n/zh/deleteAccount.js b/js/src/i18n/zh/deleteAccount.js
deleted file mode 100644
index f879c60a192a1a4ae7597f080f54f250e05d0675..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/deleteAccount.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  password: {
-    hint: `提供账户密码，确认删除账户`, // provide the account password to confirm the account deletion
-    label: `账户密码`// account password
-  },
-  question: `你确定你想永久地删除下面的账户？`, // Are you sure you want to permanently delete the following account?
-  title: `确认删除`// confirm removal
-};
diff --git a/js/src/i18n/zh/deployContract.js b/js/src/i18n/zh/deployContract.js
deleted file mode 100644
index a07047d1c0dff334381af8ee0875c60360bc7a0a..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/deployContract.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: {
-    title: `部署正在进行中`// The deployment is currently in progress
-  },
-  button: {
-    cancel: `取消`, // Cancel
-    close: `关闭`, // Close
-    create: `创建`, // Create
-    done: `完成`, // Done
-    next: `下一个`// Next
-  },
-  completed: {
-    description: `你的合约已经被部署在`// Your contract has been deployed at
-  },
-  details: {
-    abi: {
-      hint: `合约的abi或者solc 组合输出`, // the abi of the contract to deploy or solc combined-output
-      label: `abi / solc 组合输出 `// abi / solc combined-output
-    },
-    address: {
-      hint: `这个合约所有者的账户`, // the owner account for this contract
-      label: `来自账户（合约所有者）`// from account (contract owner)
-    },
-    advanced: {
-      label: `高级的发送选项`// advanced sending options
-    },
-    amount: {
-      hint: `转到这个合约中的数额`, // the amount to transfer to the contract
-      label: `发送数额{tag}`// amount to transfer (in {tag})
-    },
-    code: {
-      hint: `编译好的合约代码`, // the compiled code of the contract to deploy
-      label: `代码`// code
-    },
-    contract: {
-      label: `选择一个合约`// select a contract
-    },
-    description: {
-      hint: `对这个合约的描述`, // a description for the contract
-      label: `合约描述（可选）`// contract description (optional)
-    },
-    name: {
-      hint: `已经部署合约的名字`, // a name for the deployed contract
-      label: `合约名字`// contract name
-    }
-  },
-  owner: {
-    noneSelected: `选择一个有效的地址作为合约的所有者`// a valid account as the contract owner needs to be selected
-  },
-  parameters: {
-    choose: `选择合约参数`// Choose the contract parameters
-  },
-  rejected: {
-    description: `你可以安全地关闭窗口，合约部署不会发生。`, // You can safely close this window, the contract deployment will not occur.
-    title: `部署已经被拒绝`// The deployment has been rejected
-  },
-  state: {
-    completed: `合约部署已经完成`, // The contract deployment has been completed
-    confirmationNeeded: `这一操作需要这个合约其他所有人的确认。`, // The operation needs confirmations from the other owners of the contract
-    preparing: `为网络传输准备交易`, // Preparing transaction for network transmission
-    validatingCode: `验证已经部署的合约的代码`, // Validating the deployed contract code
-    waitReceipt: `等待合约部署交易收据`, // Waiting for the contract deployment transaction receipt
-    waitSigner: `等待Parity Secure Signer中的交易被确认 `// Waiting for confirmation of the transaction in the Parity Secure Signer
-  },
-  title: {
-    completed: `完成`, // completed
-    deployment: `部署`, // deployment
-    details: `合约细节`, // contract details
-    extras: `额外信息`, // extra information
-    failed: `部署失败`, // deployment failed
-    parameters: `s合约参数`, // contract parameter
-    rejected: `拒绝`// rejected
-  }
-};
diff --git a/js/src/i18n/zh/details_windows.js b/js/src/i18n/zh/details_windows.js
deleted file mode 100644
index fcc5700665db8ae92fc1906d7ac966c2d9783bed..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/details_windows.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default `Windows`;
diff --git a/js/src/i18n/zh/editMeta.js b/js/src/i18n/zh/editMeta.js
deleted file mode 100644
index 29efa726e941197c7808a5c120efc5803a8ecffc..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/editMeta.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  description: {
-    hint: `此地址的描述`, // description for this address
-    label: `地址描述` // address description
-  },
-  name: {
-    label: `名称` // name
-  },
-  passwordHint: {
-    hint: `密码恢复提示`, // a hint to allow password recovery
-    label: `（可选）密码提示` // (optional) password hint
-  },
-  tags: {
-    hint: `按<Enter>来添加一个标签`, // press <Enter> to add a tag
-    label: `（可选）标签` // (optional) tags
-  },
-  title: `编辑元数据` // edit metadata
-};
diff --git a/js/src/i18n/zh/errors.js b/js/src/i18n/zh/errors.js
deleted file mode 100644
index 8d908acd34a1ef0ea1fc35803614901c97d7150a..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/errors.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  duplicateName: `名称已存在`, // the name already exists
-  invalidKey: `原始私钥需要被16进制，64个字符长度并以"0x"开头`, // the raw key needs to be hex, 64 characters in length and contain the prefix "0x"
-  noFile: `选择一个可用的钱包文件来输入`, // select a valid wallet file to import
-  noKey: `你需要提供原始私钥`, // you need to provide the raw private key
-  noMatchPassword: `所提供的密码不正确`, // the supplied passwords does not match
-  noName: `你需要明确一个可用的名称` // you need to specify a valid name
-};
diff --git a/js/src/i18n/zh/executeContract.js b/js/src/i18n/zh/executeContract.js
deleted file mode 100644
index 847670edc994a9b3c0c7f70fdf0a246fa1fa832f..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/executeContract.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: {
-    posted: `你的交易已被公布至网络`, // Your transaction has been posted to the network
-    title: `函数执行正在进行中`, // The function execution is in progress
-    waitAuth: `正在等待Parity Signer授权` // Waiting for authorization in the Parity Signer
-  },
-  button: {
-    cancel: `取消`, // cancel
-    done: `完成`, // done
-    next: `下一步`, // next
-    post: `公布交易`, // post transaction
-    prev: `上一步` // prev
-  },
-  details: {
-    address: {
-      hint: `来自账户`, // from account
-      label: `将要交易的账户` // the account to transact with
-    },
-    advancedCheck: {
-      label: `高级发送选项` // advanced sending options
-    },
-    amount: {
-      hint: `此交易将会发送的数量`, // the amount to send to with the transaction
-      label: `交易价值（ETH）` // transaction value (in ETH)
-    },
-    function: {
-      hint: `此合约将会调用的函数`, // the function to call on the contract
-      label: `将执行的函数` // function to execute
-    }
-  },
-  rejected: {
-    state: `你可以安全的关闭此视窗，函数将不会被执行。`, // You can safely close this window, the function execution will not occur.
-    title: `执行失败` // The execution has been rejected
-  },
-  steps: {
-    advanced: `高级选项`, // advanced options
-    complete: `完成`, // complete
-    rejected: `失败`, // rejected
-    sending: `发送中`, // sending
-    transfer: `函数详情` // function details
-  }
-};
diff --git a/js/src/i18n/zh/extension.js b/js/src/i18n/zh/extension.js
deleted file mode 100644
index 609b76bcfca8d844b4ddfbb6ebce559bbb5152ba..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/extension.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  install: `现在就安装这个扩展`, // Install the extension now
-  intro: `Parity现在有一个Chrome的扩展，可以安全的浏览以太坊所支持的分布式应用。我们强烈推荐你安装这个扩展来进一步提升你的Parity使用体验。`
-  // Parity now has an extension available for Chrome that allows safe browsing of Ethereum-enabled decentralized applications.
-  // It is highly recommended that you install this extension to further enhance your Parity experience.
-};
diff --git a/js/src/i18n/zh/faucet.js b/js/src/i18n/zh/faucet.js
deleted file mode 100644
index e371b49a26bacf8e05d1bfe7a578158db47c4677..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/faucet.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    close: `关闭`, // close
-    done: `关闭`, // close
-    request: `请求`// request
-  },
-  summary: {
-    done: `你已经向水龙头请求Kovan ETH测试币`, // Your Kovan ETH has been requested from the faucet which responded with -
-    info: `如果请求将Kovan ETH测试币存入这个地址，你需要确定这个地址在主网络上已经用短信验证过了。 一旦执行水龙头将向当前账户存入Kovan ETH测试币。`
-    // To request a deposit of Kovan ETH to this address, you need to ensure that the address is sms-verified on the mainnet.Once executed the faucet will deposit Kovan ETH into the current account.
-  },
-  title: `Kovan ETH测试币水龙头`// Kovan ETH Faucet Kovan
-};
diff --git a/js/src/i18n/zh/firstRun.js b/js/src/i18n/zh/firstRun.js
deleted file mode 100644
index 54a7d26b2273b2ca9bdb5d9a9820219b2bacd739..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/firstRun.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    close: `关闭`, // Close
-    create: `创建`, // Create
-    next: `下一步`, // Next
-    print: `打印词组`, // Print Phrase
-    skip: `跳过`// Skip
-  },
-  completed: {
-    congrats: `恭喜！你的节点设置已经完成，你现在可以使用应用了。`,
-    // Congratulations! Your node setup has been completed successfully and you are ready to use the application.
-    next: `下面你将浏览可用的功能和通用的应用界面，让你最快速地使用Parity。`
-    // Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.
-  },
-  title: {
-    completed: `完成`, // completed
-    newAccount: `新账户`, // new account
-    recovery: `恢复`, // recovery
-    terms: `条款`, // terms
-    welcome: `欢迎`// welcome
-  },
-  tnc: {
-    accept: `我接受这些条款和条件`// I accept these terms and conditions
-  },
-  welcome: {
-    description: `作为初次安装的一部分，下面的几个步骤将指导你如何设置你的Parity和相关账户。我们的目标是使得使用Parity变得尽可能的简单，让你成功运行，所以请有点耐心。 一旦完成，你将拥有`,
-    // As part of a new installation, the next few steps will guide you through the process of setting up your Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
-    greeting: `欢迎使用Parity，这是运行以太坊节点的最快和最简单的方式。`, // Welcome to Parity, the fastest and simplest way to run your node.
-    next: `点击下一步继续`, // Click Next to continue your journey.
-    step: {
-      account: `创建你的第一个Parity账户`, // Created your first Parity account
-      privacy: `理解你的隐私政策和运作条款`, // Understood our privacy policy & terms of operation
-      recovery: `有能力可以恢复你的账户`// Have the ability to recover your account
-    }
-  }
-};
diff --git a/js/src/i18n/zh/home.js b/js/src/i18n/zh/home.js
deleted file mode 100644
index a17c06ddc1c5cb734afcaa075a8d6167c72b3366..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/home.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  account: {
-    visited: `已访问{when}` // accessed {when}
-  },
-  accounts: {
-    none: `没有可用的近期账户历史`, // No recent accounts history available
-    title: `近期账户` // Recent Accounts
-  },
-  dapp: {
-    visited: `已访问{when}` // accessed {when}
-  },
-  dapps: {
-    none: `没有可用的近期应用历史`, // No recent Applications history available
-    title: `近期Dapps` // Recent Dapps
-  },
-  title: `Parity首页`, // Parity Home
-  url: {
-    none: `没有可用的近期URL历史`, // No recent URL history available
-    title: `网页应用`, // Web Applications
-    visited: `已访问{when}` //  visited {when}
-  }
-};
diff --git a/js/src/i18n/zh/index.js b/js/src/i18n/zh/index.js
deleted file mode 100644
index 7b20b6249df7fa4d63534c7d4312cbe217cd4880..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/index.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import account from './account';
-import accounts from './accounts';
-import addAddress from './addAddress';
-import addContract from './addContract';
-import address from './address';
-import addressSelect from './addressSelect';
-import addresses from './addresses';
-import application from './application';
-import connection from './connection';
-import contract from './contract';
-import contracts from './contracts';
-import createAccount from './createAccount';
-import createWallet from './createWallet';
-import dapp from './dapp';
-import dapps from './dapps';
-import deleteAccount from './deleteAccount';
-import deployContract from './deployContract';
-import editMeta from './editMeta';
-import errors from './errors';
-import executeContract from './executeContract';
-import extension from './extension';
-import faucet from './faucet';
-import firstRun from './firstRun';
-import home from './home';
-import loadContract from './loadContract';
-import parityBar from './parityBar';
-import passwordChange from './passwordChange';
-import saveContract from './saveContract';
-import settings from './settings';
-import shapeshift from './shapeshift';
-import signer from './signer';
-import status from './status';
-import tabBar from './tabBar';
-import transfer from './transfer';
-import txEditor from './txEditor';
-import ui from './ui';
-import upgradeParity from './upgradeParity';
-import vaults from './vaults';
-import verification from './verification';
-import wallet from './wallet';
-import walletSettings from './walletSettings';
-import web from './web';
-import writeContract from './writeContract';
-
-export default {
-  account,
-  accounts,
-  addAddress,
-  addContract,
-  address,
-  addresses,
-  addressSelect,
-  application,
-  connection,
-  contract,
-  contracts,
-  createAccount,
-  createWallet,
-  dapp,
-  dapps,
-  deleteAccount,
-  deployContract,
-  editMeta,
-  errors,
-  executeContract,
-  extension,
-  faucet,
-  firstRun,
-  home,
-  loadContract,
-  parityBar,
-  passwordChange,
-  saveContract,
-  settings,
-  signer,
-  shapeshift,
-  status,
-  tabBar,
-  transfer,
-  txEditor,
-  ui,
-  upgradeParity,
-  vaults,
-  verification,
-  wallet,
-  walletSettings,
-  web,
-  writeContract
-};
diff --git a/js/src/i18n/zh/loadContract.js b/js/src/i18n/zh/loadContract.js
deleted file mode 100644
index ab86e5a2514ab26b03a0d63ef8eaef38680eea02..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/loadContract.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `取消`, // Cancel
-    load: `加载`, // Load
-    no: `否`, // No
-    yes: `是` // Yes
-  },
-  contract: {
-    savedAt: `已保存{when}` // Saved {when}
-  },
-  header: {
-    saved: `已保存的合约`, // Saved Contracts
-    snippets: `合约片段` // Contract Snippets
-  },
-  removal: {
-    confirm: `你确定要将以下合约从已保存的合约中删除吗？`, // Are you sure you want to remove the following contract from your saved contracts?
-    savedAt: `已保存{when}` // Saved {when}
-  },
-  tab: {
-    local: `本地`, // Local
-    snippets: `片段` // Snippets
-  },
-  title: {
-    remove: `确认删除`, // confirm removal
-    view: `查看合约` // view contracts
-  }
-};
diff --git a/js/src/i18n/zh/parityBar.js b/js/src/i18n/zh/parityBar.js
deleted file mode 100644
index fb7c7433c8381e842bfa1bb93e5cd00fce1f4b4a..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/parityBar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    close: `关闭` // Close
-  },
-  label: {
-    parity: `Parity`, // Parity
-    signer: `Signer` // Singer
-  },
-  title: {
-    accounts: `默认账户`, // Default Account
-    signer: `Parity Signer：待处理` // Parity Signer: Pending
-  }
-};
diff --git a/js/src/i18n/zh/passwordChange.js b/js/src/i18n/zh/passwordChange.js
deleted file mode 100644
index d25ffd5f03bfede81d1e468c474f1c0dd7eece2d..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/passwordChange.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `取消`, // Cancel
-    change: `更改`, // Change
-    test: `测试`, // Test
-    wait: `请等待...` // Wait...
-  },
-  currentPassword: {
-    hint: `此账户的原密码`, // your current password for this account
-    label: `原密码` // current password
-  },
-  newPassword: {
-    hint: `此账户的新密码`, // the new password for this account
-    label: `新密码` // new password
-  },
-  passwordHint: {
-    display: `提示{hint}`, // Hint {hint}
-    hint: `新密码的提示`, // hint for the new password
-    label: `（可选）新的密码提示` // (optional) new password hint
-  },
-  repeatPassword: {
-    error: `所提供的密码不正确`, // the supplied passwords do not match
-    hint: `请重复此账户的新密码`, // repeat the new password for this account
-    label: `重复新密码` // repeat new password
-  },
-  success: `你的密码已经成功更改`, // Your password has been successfully changed
-  tabChange: {
-    label: `更改密码` // Change Password
-  },
-  tabTest: {
-    label: `测试密码` // Test Password
-  },
-  testPassword: {
-    hint: `你的账户密码`, // your account password
-    label: `密码` // password
-  },
-  title: `密码管理器` // Password Manager
-};
diff --git a/js/src/i18n/zh/saveContract.js b/js/src/i18n/zh/saveContract.js
deleted file mode 100644
index b92ecf4010834abc1c7cd3074775ca856035ec3f..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/saveContract.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    cancel: `取消`, // Cancel
-    save: `保存` // Save
-  },
-  name: {
-    hint: `为此合约选择一个名称`, // choose a name for this contract
-    label: `合约名称` // contract name
-  },
-  title: `保存合约` // save contract
-};
diff --git a/js/src/i18n/zh/settings.js b/js/src/i18n/zh/settings.js
deleted file mode 100644
index 4081a06d61d2fb6ef3288d4d316201af8ec061ec..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/settings.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  background: {
-    button_more: `生成更多`, // generate more
-    overview_0: `你现在所看到的背景图案在你的Parity安装中是独一无二的。每次创造一个新的Signer令牌都会改变一次图案。这也保证了去中性化应用不能伪装成可信的样子。`,
-    // The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new
-    // Signer token. This is so that decentralized applications cannot pretend to be trustworthy.
-    overview_1: `选择一个你喜欢的图案并记住它的样子。这个图案从现在开始会经常出现，除非你清空了浏览器的缓存或者使用了新的Signer令牌。`,
-    // Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or
-    // use a new Signer token.
-    label: `背景` // background
-  },
-  parity: {
-    chains: {
-      chain_classic: `将Parity同步至以太坊经典网络`, // Parity syncs to the Ethereum Classic network
-      chain_dev: `将Parity使用一条本地开发用区块链`, // Parity uses a local development chain
-      chain_expanse: `将Parity同步至Expanse网络`, // Parity syncs to the Expanse network
-      chain_foundation: `将Parity同步至以太坊基金会发起的以太坊网络`, // Parity syncs to the Ethereum network launched by the Ethereum Foundation
-      chain_kovan: `将Parity同步至Kovan测试网络`, // Parity syncs to the Kovan test network
-      chain_olympic: `将Parity同步至Olympic测试网络`, // Parity syncs to the Olympic test network
-      chain_ropsten: `将Parity同步至Ropsten测试网络`, // Parity syncs to the Ropsten test network
-      cmorden_kovan: `将Parity同步至Morden（经典）测试网络`, // Parity syncs to Morden (Classic) test network
-      hint: `Parity节点同步的区块链`, // the chain for the Parity node to sync to
-      label: `将同步的区块链/网络` // chain/network to sync
-    },
-    languages: {
-      hint: `此界面显示的语言`, // the language this interface is displayed with
-      label: `界面语言` // UI language
-    },
-    loglevels: `选择一个不同的logs层次`, // Choose the different logs level.
-    modes: {
-      hint: `Parity节点的同步模式`, // the syncing mode for the Parity node
-      label: `运行模式`, // mode of operation
-      mode_active: `Parity持续地同步区块链`, // Parity continuously syncs the chain
-      mode_dark: `Parity只有在RPC激活时才同步`, // Parity syncs only when the RPC is active
-      mode_offline: `Parity不同步`, // Parity doesn't sync
-      mode_passive: `Parity初始同步，然后进入休眠并有规律地再同步` // Parity syncs initially, then sleeps and wakes regularly to resync
-    },
-    overview_0: `通过此界面控制Parity节点设置和同步设置`, // Control the Parity node settings and nature of syncing via this interface.
-    label: `parity` // parity
-  },
-  proxy: {
-    details_0: `除了通过IP地址和端口来访问Parity，你也能通过.parity子域名来使用Parity，访问 {homeProxy}。为了设置基于子域名的路由，你需要添加相关的代理记录至你的浏览器。`,
-    // Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting
-    // {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,
-    details_1: `如果想了解如何配置代理，教程已提供在{windowsLink}，{macOSLink}和{ubuntuLink}。`,
-    // To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}.
-    details_macos: `macOS`, // macOS
-    details_ubuntu: `Ubuntu`, // Ubuntu
-    details_windows: `Windows`, // Windows
-    overview_0: `代理设置使你可以通过一个可记忆的地址来访问Parity和所有相关的去中性化应用。`,
-    // The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.
-    label: `代理` // proxy
-  },
-  views: {
-    accounts: {
-      description: `一个此Parity实例所关联和导入的所有账户的列表。发送交易、接收流入价值、管理你的账目和资助你的账户。`,
-      // A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values,
-      // manage your balances and fund your accounts.
-      label: `账户` // Accounts
-    },
-    addresses: {
-      description: `一个此Parity实例管理的所有联系人和地址簿记录的列表。只需点击一个按钮就可以观察账户并获得所有交易相关的信息。`,
-      // A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available
-      // at the click of a button when transacting.
-      label: `地址簿` // Addressbook
-    },
-    apps: {
-      description: `与整个底层网络交流的分布式应用。添加应用，管理你的应用库和与网络上的其他应用进行交互。`,
-      // Decentralized applications that interact with the underlying network. Add applications, manage you application portfolio and
-      // interact with application from around the network.
-      label: `应用` // Applications
-    },
-    contracts: {
-      description: `观察和交互已经被部署在网络上的特定合约。这是一个更注重技术的环境，特别为可以理解合约内部运行机制的高级用户所设立。`,
-      // Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment,
-      // specifically for advanced users that understand the inner working of certain contracts.
-      label: `合约` // Contracts
-    },
-    overview_0: `仅可视部分对你可用的应用来管理应用界面`,
-    // Manage the available application views using only the parts of the application applicable to you.
-    overview_1: `你是终端用户？默认设置为初学者和高级用户进行了相同的设置。`,
-    // Are you an end-user? The defaults are setup for both beginner and advanced users alike.
-    overview_2: `你是开发者？添加一些功能来管理合约和与应用部署交互。`,
-    // Are you a developer? Add some features to manage contracts and interact with application deployments.
-    overview_3: `你是矿工或者运营一个大型节点？添加一些功能来让你获得更多有关节点运行的信息。`,
-    // Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.
-    settings: {
-      description: `此界面。允许你自定义应用的选项、运行、可视化和感官。`,
-      // This view. Allows you to customize the application in term of options, operation and look and feel.
-      label: `设置` // Settings
-    },
-    signer: {
-      description: `这个应用安全交易管理区域，你可以通过任何从本应用和其他分布式应用发起的即将发送的交易`,
-      // The secure transaction management area of the application where you can approve any outgoing transactions made
-      // from the application as well as those placed into the queue by decentralized applications.
-      label: `Signer` // Signer
-    },
-    status: {
-      description: `观察Parity节点现在的运行情况：网络连接数、实际运行实例的Logs和具体挖矿信息（如果已开启并设置）`,
-      // See how the Parity node is performing in terms of connections to the network, logs from the actual running instance
-      // and details of mining (if enabled and configured).
-      label: `状态` // Status
-    },
-    label: `视窗`, // views
-    home: {
-      label: `首页` // Home
-    }
-  },
-  label: `设置` // settings
-};
diff --git a/js/src/i18n/zh/shapeshift.js b/js/src/i18n/zh/shapeshift.js
deleted file mode 100644
index 7af706d27e8c6a8badbbaefa4e3fe653d288f462..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/shapeshift.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  awaitingDepositStep: {
-    awaitingConfirmation: `正在等待你的{typeSymbol}资金交易的存款地址的确认信息`,
-    // Awaiting confirmation of the deposit address for your {typeSymbol} funds exchange
-    awaitingDeposit: `{shapeshiftLink}正在等待{typeSymbol}的存入.从你的{typeSymbol}网络客户端发送资金至-`,
-    // {shapeshiftLink} is awaiting a {typeSymbol} deposit. Send the funds from your {typeSymbol} network client to -
-    minimumMaximum: `{minimum}至少, {maximum}至多` // {minimum} minimum, {maximum} maximum
-  },
-  awaitingExchangeStep: {
-    awaitingCompletion: `正在完成资金交易并发送资金至你的Parity账户`,
-    // Awaiting the completion of the funds exchange and transfer of funds to your Parity account.
-    receivedInfo: `{shapeshiftLink}已经收到存款-`
-    // {shapeshiftLink} has received a deposit of -
-  },
-  button: {
-    cancel: `取消`, // Cancel
-    done: `关闭`, // Close
-    shift: `转换资金` // Shift Funds
-  },
-  completedStep: {
-    completed: `{shapeshiftLink}已经完成了资金交易。`, // {shapeshiftLink} has completed the funds exchange.
-    parityFunds: `资金的改变会马上在你的Parity账户里体现。`
-    // The change in funds will be reflected in your Parity account shortly.
-  },
-  errorStep: {
-    info: `通过{shapeshiftLink}进行的资金转换因为一个交易的致命错误失败了。交易提供的错误信息如下：`
-    // The funds shifting via {shapeshiftLink} failed with a fatal error on the exchange. The error message received from the exchange
-    // is as follow:
-  },
-  optionsStep: {
-    noPairs: `目前没有可匹配的交易/货币可用来进行转换`,
-    // There are currently no exchange pairs/coins available to fund with.
-    returnAddr: {
-      hint: `转换错误后的发回地址`, // the return address for send failures
-      label: `（可选）{coinSymbol}发回地址` // (optional) {coinSymbol} return address
-    },
-    terms: {
-      label: `我理解ShapeShift.io是一个第三方服务，使用此服务发生的任何信息/资金发送是完全不受Parity控制的`
-      // I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is
-      // completely out of the control of Parity
-    },
-    typeSelect: {
-      hint: `数字货币转换的种类`, // the type of crypto conversion to do
-      label: `来自资金账户` // fund account from
-    }
-  },
-  price: {
-    minMax: `({minimum}至小, {maximum}至大)` // ({minimum} minimum, {maximum} maximum)
-  },
-  title: {
-    completed: `完成`, // completed
-    deposit: `等待存款`, // awaiting deposit
-    details: `详情`, // details
-    error: `交易失败`, // exchange failed
-    exchange: `等待交易` // awaiting exchange
-  },
-  warning: {
-    noPrice: `所选择的类型没有匹配的价格` // No price match was found for the selected type
-  }
-};
diff --git a/js/src/i18n/zh/signer.js b/js/src/i18n/zh/signer.js
deleted file mode 100644
index ab3b99e53f18148648f05410d12e5429e0f09b3e..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/signer.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  embedded: {
-    noPending: `目前没有待处理的确认等待你的处理`
-    // There are currently no pending requests awaiting your confirmation
-  },
-  mainDetails: {
-    editTx: `编辑条款/gas/gasPrice`, // Edit conditions/gas/gasPrice
-    tooltips: {
-      total1: `包括交易费的交易的总价值是{total} {type}`,
-      // The value of the transaction including the mining fee is {total} {type}.
-      total2: `(包括了交易费 {fee} {token})`,
-      // (This includes a mining fee of {fee} {token})
-      value1: `交易价值` // The value of the transaction.
-    }
-  },
-  requestOrigin: {
-    dapp: `来自dapp {url}`, // by a dapp at {url}
-    ipc: `通过IPC会话`, // via IPC session
-    rpc: `通过RPC{rpc}`, // via RPC {rpc}
-    signerCurrent: `通过当前标签页`, // via current tab
-    signerUI: `通过交互会话`, // via UI session
-    unknownInterface: `通过未知交互`, // via unknown interface
-    unknownRpc: `未明确的`, // unidentified
-    unknownUrl: `未知URL` // unknown URL
-  },
-  requestsPage: {
-    noPending: `没有请求需要你的确认`, // There are no requests requiring your confirmation.
-    pendingTitle: `待处理请求`, // Pending Requests
-    queueTitle: `本地交易` // Local Transactions
-  },
-  sending: {
-    hardware: {
-      confirm: `请在你连接的硬件设备上确认交易`, // Please confirm the transaction on your attached hardware device
-      connect: `请在确认交易前连接你的硬件设备` // Please attach your hardware device before confirming the transaction
-    }
-  },
-  signRequest: {
-    request: `一个签名数据在请求你的账号：`, // A request to sign data using your account:
-    state: {
-      confirmed: `通过`, // Confirmed
-      rejected: `拒绝` // Rejected
-    },
-    unknownBinary: `（未知二进制数据）`, // (Unknown binary data)
-    warning: `警告：此操作的结果是不可逆的。请在确认信息后再通过请求。`
-    // WARNING: This consequences of doing this may be grave. Confirm the request only if you are sure.
-  },
-  title: `可信的Signer`, // Trusted Signer
-  txPending: {
-    buttons: {
-      viewToggle: `查看交易` // view transaction
-    }
-  },
-  txPendingConfirm: {
-    buttons: {
-      confirmBusy: `通过中...`, // Confirming...
-      confirmRequest: `通过请求` // Confirm Request
-    },
-    errors: {
-      invalidWallet: `所提供的钱包文件不可用` // Given wallet file is invalid.
-    },
-    password: {
-      decrypt: {
-        hint: `解密钥匙`, // decrypt the key
-        label: `钥匙密码` // Key Password
-      },
-      unlock: {
-        hint: `解锁账户`, // unlock the account
-        label: `账户密码` // Account Password
-      }
-    },
-    passwordHint: `（提示）{passwordHint}`, // (hint) {passwordHint}
-    selectKey: {
-      hint: `此账户的钥匙文件`, // The keyfile to use for this account
-      label: `选择本地钥匙` // Select Local Key
-    },
-    tooltips: {
-      password: `请为此账户提供密码` // Please provide a password for this account
-    }
-  },
-  txPendingForm: {
-    changedMind: `我改主意了`, // I've changed my mind
-    reject: `拒绝请求` // reject request
-  },
-  txPendingReject: {
-    buttons: {
-      reject: `拒绝请求` // Reject Request
-    },
-    info: `你确定要拒绝请求吗？`, // Are you sure you want to reject request?
-    undone: `此操作是不可逆的`  // This cannot be undone
-  }
-};
diff --git a/js/src/i18n/zh/status.js b/js/src/i18n/zh/status.js
deleted file mode 100644
index 395a2a190ea9c6a00f67b7a25307fabeb673586d..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/status.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  debug: {
-    reverse: `翻转订单`, // Reverse Order
-    stopped: `Parity的交互目前停止了刷新和显示Logs，请启动它来查看最新的更新。`,
-    // Refresh and display of logs from Parity is currently stopped via the UI, start it to see the latest updates.
-    title: `节点Logs` // Node Logs
-  },
-  miningSettings: {
-    input: {
-      author: {
-        hint: `矿工名字`, // the mining author
-        label: `矿工` // author
-      },
-      extradata: {
-        hint: `提取挖到区块的数据`, // extra data for mined blocks
-        label: `提取数据` // extradata
-      },
-      gasFloor: {
-        hint: `挖矿的gas下限目标`, // the gas floor target for mining
-        label: `gas下限目标` // gas floor target
-      },
-      gasPrice: {
-        hint: `挖矿的最低gas价格`, // the minimum gas price for mining
-        label: `最低gas价格` // minimal gas price
-      }
-    },
-    title: `挖矿设置` // mining settings
-  },
-  status: {
-    hashrate: `{hashrate} H/s`, // {hashrate} H/s
-    input: {
-      chain: `链`, // chain
-      enode: `enode`, // enode
-      no: `否`, // no
-      peers: `同步节点`, // peers
-      port: `网络端口`, // network port
-      rpcEnabled: `rpc开启`, // rpc enabled
-      rpcInterface: `rpc交互`, // rpc interface
-      rpcPort: `rpc端口`, // rpc port
-      yes: `是` // yes
-    },
-    title: {
-      bestBlock: `最新区块`, // best block
-      hashRate: `哈希率`, // hash rate
-      network: `网络设置`, // network settings
-      node: `节点`, // Node
-      peers: `同步节点` // peers
-    }
-  },
-  title: `状态` // Status
-};
diff --git a/js/src/i18n/zh/tabBar.js b/js/src/i18n/zh/tabBar.js
deleted file mode 100644
index 08a0a816f544895eb1667d6341283731c1feb27e..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/tabBar.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  tooltip: {
-    overview: `在应用的不同部分和不同界面进行导航，在账户界面、代币界面和分布式应用界面之间切换。`
-    // navigate between the different parts and views of the application, switching between an account view, token view and decentralized application view
-  }
-};
diff --git a/js/src/i18n/zh/transfer.js b/js/src/i18n/zh/transfer.js
deleted file mode 100644
index 79c88671994ac1df1cbeecb18ff77322a9f3d36d..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/transfer.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  advanced: {
-    data: {
-      hint: `交易附带数据`, // the data to pass through with the transaction
-      label: `交易数据`// transaction data
-    }
-  },
-  buttons: {
-    back: `返回`, // Back
-    cancel: `取消`, // Cancel
-    close: `关闭`, // Close
-    next: `下一步`, // Next
-    send: `发送`// Send
-  },
-  details: {
-    advanced: {
-      label: `高级发送选项`// advanced sending options
-    },
-    amount: {
-      hint: `发送数额`, // the amount to transfer to the recipient
-      label: `发送数额{tag}`// amount to transfer (in {tag})
-    },
-    fullBalance: {
-      label: `所有的余额`// full account balance
-    },
-    recipient: {
-      hint: `收款人地址`, // the recipient address
-      label: `收款人地址`// recipient address
-    },
-    sender: {
-      hint: `发送人地址`, // the sender address
-      label: `发送人地址`// sender address
-    },
-    total: {
-      label: `发送数额`// total transaction amount
-    }
-  },
-  wallet: {
-    confirmation: `这笔交易需要其他人的确认。`, // This transaction needs confirmation from other owners.
-    operationHash: `操作哈希`// operation hash
-  },
-  warning: {
-    wallet_spent_limit: `这笔转账的数额超过了每日转账数额上限。此交易需要其他人的确认才可以发送成功。`
-    // This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.
-  }
-};
diff --git a/js/src/i18n/zh/txEditor.js b/js/src/i18n/zh/txEditor.js
deleted file mode 100644
index da55c7b238cb91012efb508945ad64a62060aa5a..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/txEditor.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  condition: {
-    block: {
-      hint: `在某个区块高度后发送`, // The minimum block to send from
-      label: `交易发送区块`// Transaction send block
-    },
-    blocknumber: `在某个区块后发送`, // Send after BlockNumber
-    date: {
-      hint: `在某日后发送`, // The minimum date to send from
-      label: `交易发送日期`// Transaction send date
-    },
-    datetime: `在某日某时后发送`, // Send after Date & Tim
-    label: `交易激活的条件`, // Condition where transaction activates
-    none: `无条件`, // No conditions
-    time: {
-      hint: `在某时间后发送`, // The minimum time to send from
-      label: `交易发送时间`// Transaction send time
-    }
-  },
-  gas: {
-    info: `你可以基于最近的交易gas价格的分布选择gas价格。 gas价格越低，交易费用越便宜。 gas 价格越高，交易被网络打包的速度越快。`
-    // You can choose the gas price based on the distribution of recent included transaction gas prices.The lower the gas price is, the cheaper the transaction will be.The higher the gas price is, the faster it should get mined by the network.
-  }
-};
diff --git a/js/src/i18n/zh/ui.js b/js/src/i18n/zh/ui.js
deleted file mode 100644
index 694372f0021a48c0dfc938d6553e3cb9de15b0cf..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/ui.js
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  actionbar: {
-    export: {
-      button: {
-        export: `导出`// export
-      }
-    },
-    import: {
-      button: {
-        cancel: `取消`, // Cancel
-        confirm: `确认`, // Confirm
-        import: `导入`// import
-      },
-      confirm: `确认这是你想导入的`, // Confirm that this is what was intended to import.
-      error: `发生错误：{errorText}`, // An error occured: {errorText}
-      step: {
-        error: `错误`, // error
-        select: `选择一个文件`, // select a file
-        validate: `确认`// validate
-      },
-      title: `从一个文件导入`// Import from a file
-    },
-    search: {
-      hint: `输入搜索内容……`// Enter search input...
-    },
-    sort: {
-      sortBy: `根据{label}排序`, // Sort by {label}
-      typeDefault: `默认`, // Default
-      typeEth: `根据以太币数额排序`, // Sort by ETH
-      typeName: `根据账户名字排序`, // Sort by name
-      typeTags: `根据标签排序`// Sort by tags
-    }
-  },
-  balance: {
-    none: `这个账户没有余额`// No balances associated with this account
-  },
-  blockStatus: {
-    bestBlock: `最新区块{blockNumber}`, // {blockNumber} best block
-    syncStatus: `currentBlock}/{highestBlock}区块同步`, // {currentBlock}/{highestBlock} syncing{
-    warpRestore: `{percentage}%恢复`, // {percentage}% warp restore
-    warpStatus: `, {percentage}%历史`// {percentage}% historic
-  },
-  confirmDialog: {
-    no: `不是`, // no
-    yes: `是`// yes
-  },
-  copyToClipboard: {
-    copied: `复制{data}到粘贴板`// copied {data} to clipboard
-  },
-  errors: {
-    close: `关闭`// close
-  },
-  fileSelect: {
-    defaultLabel: `拉一个文件到这里，或者选择一个文件上传`// Drop a file here, or click to select a file to upload
-  },
-  gasPriceSelector: {
-    customTooltip: {
-      transactions: `{number} {number, plural, one {transaction} other {transactions}} with gas price set from {minPrice} to {maxPrice}`
-    }
-  },
-  identityName: {
-    null: `空`, // NULL
-    unnamed: `未命名`// UNNAMED
-  },
-  methodDecoding: {
-    condition: {
-      block: `, {historic, select, true {Submitted} false {Submission}} at block {blockNumber}`,
-      time: `, {historic, select, true {Submitted} false {Submission}} at {timestamp}`
-    },
-    deploy: {
-      address: `在地址上部署一个合约`, // Deployed a contract at address
-      params: `附带下面的参数：`, // with the following parameters:
-      willDeploy: `将要部署一个合约`, // Will deploy a contract
-      withValue: `, 发送{value}`// sending {value}
-    },
-    gasUsed: `({gas}gas消耗)`, // {gas} gas used
-    gasValues: `{gas} gas ({gasPrice}M/{tag})`,
-    input: {
-      data: `数据`, // data
-      input: `输入`, // input
-      withInput: `with the {inputDesc} {inputValue}`
-    },
-    receive: {
-      contract: `合约`, // the contract
-      info: `{historic, select, true {Received} false {Will receive}} {valueEth} from {aContract}{address}`
-    },
-    signature: {
-      info: `{historic, select, true {Executed} false {Will execute}} the {method} function on the contract {address} trsansferring {ethValue}{inputLength, plural, zero {,} other {passing the following {inputLength, plural, one {parameter} other {parameters}}}}`
-    },
-    token: {
-      transfer: `{historic, select, true {Transferred} false {Will transfer}} {value} to {address}`
-    },
-    transfer: {
-      contract: `the contract`,
-      info: `{historic, select, true {Transferred} false {Will transfer}} {valueEth} to {aContract}{address}`
-    },
-    txValues: `{historic, select, true {Provided} false {Provides}} {gasProvided}{gasUsed} for a total transaction value of {totalEthValue}`,
-    unknown: {
-      info: `{historic, select, true {Executed} false {Will execute}} the {method} on the contract {address} transferring {ethValue}.`
-    }
-  },
-  passwordStrength: {
-    label: `密码强度`// password strength
-  },
-  tooltips: {
-    button: {
-      done: `完成`, // Done
-      next: `下一步`, // Next
-      skip: `跳过`// Skip
-    }
-  },
-  txHash: {
-    confirmations: `{count} {value, plural, one {confirmation} other {confirmations}}`,
-    oog: `这笔交易已经耗光了gas。请用更多的gas尝试。`, // The transaction might have gone out of gas. Try again with more gas.
-    posted: `这笔交易已经被发送到网络，附带哈希是{hashLink}`, // The transaction has been posted to the network with a hash of {hashLink}
-    waiting: `等待确认`// waiting for confirmations
-  },
-  vaultSelect: {
-    hint: `这个账户绑定的保险库是`, // the vault this account is attached to
-    label: `相关保险库`// associated vault
-  },
-  verification: {
-    gatherData: {
-      accountHasRequested: {
-        false: `.你还没有从这个账户请求确认。`, // You did not request verification from this account yet
-        pending: `检查一下你是否请求了验证……`, // Checking if you requested verification…
-        true: `你已经从这个账户请求到验证。`// You already requested verification from this account.
-      },
-      accountIsVerified: {
-        false: `你的账户还没有被验证。`, // Your account is not verified yet.
-        pending: `检查一下你的账户是否已经被验证……`, // Checking if your account is verified…
-        true: `你的账户已经被验证。`// Your account is already verified.
-      },
-      fee: `额外的费用是{amount}ETH`, // The additional fee is {amount} ETH.
-      isAbleToRequest: {
-        pending: `验证你的输入……`// Validating your input…
-      },
-      isServerRunning: {
-        false: `验证服务器没有在运行。`, // The verification server is not running.
-        pending: `检查一下验证服务器是否在运行……`, // Checking if the verification server is running…
-        true: `验证服务器正在运行。`// The verification server is running.
-      },
-      nofee: `没有额外的费用。`, // There is no additional fee.
-      termsOfService: `我同意下面的条款和条件。`// I agree to the terms and conditions below.
-    }
-  }
-};
diff --git a/js/src/i18n/zh/upgradeParity.js b/js/src/i18n/zh/upgradeParity.js
deleted file mode 100644
index a3ddd27bd57d6d5a66f8f315600a9b6d6d35bb6b..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/upgradeParity.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  busy: `你正在升级到Parity最新版本{newversion}。请等待升级过程完成。`,
-  // Your upgrade to Parity {newversion} is currently in progress. Please wait until the process completes.
-  button: {
-    close: `关闭`, // close
-    done: `完成`, // done
-    upgrade: `现在升级`// upgrade now
-  },
-  completed: `你升级到Parity最新版本{newversion}的操作已经完成。点击“完成”将自动重新加载这个应用。`,
-  // Your upgrade to Parity {newversion} has been successfully completed. Click "done" to automatically reload the application.
-  consensus: {
-    capable: `你当前的Parity版本能够处理网络请求。`,
-    // Your current Parity version is capable of handling the network requirements.
-    capableUntil: `你当前的Parity版本能够处理直到第{blockNumber}个区块的网络请求。`,
-    // Your current Parity version is capable of handling the network requirements until block {blockNumber}
-    incapableSince: `你当前的Parity版本能够处理第{blockNumber}个区块以后的网络请求。`,
-    // Your current Parity version is incapable of handling the network requirements since block {blockNumber}
-    unknown: `你当前的Parity版本能够处理网络请求。`
-    // Your current Parity version is capable of handling the network requirements.
-  },
-  failed: `升级到Parity最新版本{newversion}遇到错误，升级失败。`,
-  // Your upgrade to Parity {newversion} has failed with an error.
-  info: {
-    currentVersion: `你现在正在运行{currentversion}版本。`, // You are currently running {currentversion}
-    next: `点击“现在升级”，开始Parity升级。`, // Proceed with "upgrade now" to start your Parity upgrade.
-    upgrade: `可以升级到最新版本{newversion}`, // An upgrade to version {newversion} is available
-    welcome: `迎来到Parity升级指南，让你享受无缝升级到Parity最新版本的体验。`
-    // Welcome to the Parity upgrade wizard, allowing you a completely seamless upgrade experience to the next version of Parity.欢
-  },
-  step: {
-    completed: `升级完成`, // upgrade completed
-    error: `错误`, // error
-    info: `可以升级`, // upgrade available
-    updating: `升级Parity`// upgrading parity
-  },
-  version: {
-    unknown: `未知`// unknown
-  }
-};
diff --git a/js/src/i18n/zh/vaults.js b/js/src/i18n/zh/vaults.js
deleted file mode 100644
index 7d31ca64b71bd4b1920eaafba5f42ae9bb9c73d5..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/vaults.js
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  accounts: {
-    button: {
-      cancel: `取消`, // Cancel
-      execute: `设定` // Set
-    },
-    empty: `此保险库中没有账户`, // There are no accounts in this vault
-    title: `管理保险库账户` // Manage Vault Accounts
-  },
-  button: {
-    accounts: `账户`, // accounts
-    add: `创建保险库`, // create vault
-    close: `关闭`, // close
-    edit: `编辑`, // edit
-    open: `打开` // open
-  },
-  confirmClose: {
-    info: `你即将关闭一个保险库。所有与这个保险库相关的账户在这个操作完成后都不再可见。如果想再见到关联账户，请重新打开保险库。`,
-    // You are about to close a vault. Any accounts associated with the vault won't be visible after this operation concludes. To view
-    // the associated accounts, open the vault again.
-    title: `关闭保险库` // Close Vault
-  },
-  confirmOpen: {
-    info: `你即将打开一个保险库。在确认了你的密码之后，所有与这个保险库关联的账户都会可见。关闭保险库会在界面中移除所有账户，直到保险库被再次打开。`,
-    // You are about to open a vault. After confirming your password, all accounts associated with this vault will be visible. Closing
-    // the vault will remove the accounts from view until the vault is opened again.
-    password: {
-      hint: `创建保险库时设置的密码`, // the password specified when creating the vault
-      label: `保险库密码` // vault password
-    },
-    title: `打开保险库` // Open Vault
-  },
-  create: {
-    button: {
-      close: `关闭`, // close
-      vault: `创建保险库` // create valut
-    },
-    description: {
-      hint: `该保险库更详细的描述` // an extended description for the vault
-    },
-    descriptions: {
-      label: `（可选）描述` // (optional) description
-    },
-    hint: {
-      hint: `（可选）一个帮助记忆密码的提示`, // (optional) a hint to help with remembering the password
-      label: `密码提示` // password hint
-    },
-    name: {
-      hint: `一个保险库的名字`, // a name for the vault
-      label: `保险库名称` // vault name
-    },
-    password: {
-      hint: `一个高强度且独一无二的密码`, // a strong, unique password
-      label: `密码` // password
-    },
-    password2: {
-      hint: `验证你的密码`, // verify your password
-      label: `密码（重复）` // password (repeat)
-    },
-    title: `创建一个新的保险库` // Create a new vault
-  },
-  editMeta: {
-    allowPassword: `更改保险库密码`, // Change vault password
-    button: {
-      close: `关闭`, // close
-      save: `保存` // save
-    },
-    currentPassword: {
-      hint: `保险库的原密码`, // your current vault password
-      label: `原密码` // current password
-    },
-    description: {
-      hint: `此保险库的描述`, // the description for this vault
-      label: `保险库描述` // vault description
-    },
-    password: {
-      hint: `一个高强度且独一无二的密码`, // a strong, unique password
-      label: `新密码` // new password
-    },
-    password2: {
-      hint: `验证你的新密码`, // verify your new password
-      label: `新密码（重复）` // new password (repeat)
-    },
-    passwordHint: {
-      hint: `此保险库的密码提示`, // your password hint for this vault
-      label: `密码提示` // password hint
-    },
-    title: `编辑保险库元数据` // Edit Vault Metadata
-  },
-  empty: `目前没有任何可显示的保险库`, // There are currently no vaults to display.
-  selector: {
-    noneAvailable: `目前没有任何打开、可选的保险库。请在移动账户之前创建并打开一个保险库。`,
-    // There are currently no vaults opened and available for selection. Create and open some first before attempting to select
-    // a vault for an account move.
-    title: `选择账户保险库` // Select Account Vault
-  },
-  title: `保险库管理` // Vault Management
-};
diff --git a/js/src/i18n/zh/verification.js b/js/src/i18n/zh/verification.js
deleted file mode 100644
index b46d9077ad656706f541872407e059726630d0d9..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/verification.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  button: {
-    cancel: `取消`, // Cancel
-    done: `完成`, // Done
-    next: `下一步`// Next
-  },
-  code: {
-    error: `无效验证码`, // invalid code
-    hint: `输入你收到的验证码。`, // Enter the code you received.
-    label: `验证码`, // verification code
-    sent: `验证码被发送到接收者{receiver}.`// The verification code has been sent to {receiver}
-  },
-  confirmation: {
-    authorise: `验证码将被发送到合约。请使用Parity Signer进行授权。`, // The verification code will be sent to the contract. Please authorize this using the Parity Signer.
-    windowOpen: `请保持这个窗口打开状态。`// Please keep this window open.
-  },
-  done: {
-    message: `恭喜，你的账户已经被认证。`// Congratulations, your account is verified!
-  },
-  email: {
-    enterCode: `输入你从邮箱获得验证码。`// Enter the code you received via e-mail.
-  },
-  gatherData: {
-    email: {
-      hint: `验证码将被发送到这个地址`, // the code will be sent to this address
-      label: `邮箱地址`// e-mail address
-    },
-    phoneNumber: {
-      hint: `短信将被发送到这个号码`, // the SMS will be sent to this number
-      label: `国际格式的手机号码`// phone number in international format
-    }
-  },
-  gatherDate: {
-    email: {
-      error: `无效邮箱`// invalid e-mail
-    },
-    phoneNumber: {
-      error: `无效数字`// invalid number
-    }
-  },
-  loading: `加载验证数据`, // Loading verification data.
-  request: {
-    authorise: `验证请求将被发送到这个合约。请使用Parity Signer进行授权。`, // A verification request will be sent to the contract. Please authorize this using the Parity Signer.
-    requesting: `正在从Parity服务器请求一个验证码，等待它被输入到合约。`, // Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.
-    windowOpen: `请保持窗口为打开状态。`// Please keep this window open.
-  },
-  sms: {
-    enterCode: `输入你从短信收到的验证码。`// Enter the code you received via SMS.
-  },
-  steps: {
-    code: `输入验证码`, // Enter Code
-    completed: `完成`, // Completed
-    confirm: `确认`, // Confirm
-    data: `输入数据`, // Enter Data
-    method: `方式`, // Method
-    request: `请求`// Request
-  },
-  title: `t验证你的账户`, // verify your accoun
-  types: {
-    email: {
-      description: `你所控制的邮箱地址的哈希值将被存储在区块链。`, // The hash of the e-mail address you prove control over will be stored on the blockchain.
-      label: `邮箱验证`// E-mail Verification
-    },
-    sms: {
-      description: `你所控制的手机号码将被存储在区块链。`, // It will be stored on the blockchain that you control a phone number (not <em>which</em>).
-      label: `短信验证`// SMS Verification
-    }
-  }
-};
diff --git a/js/src/i18n/zh/wallet.js b/js/src/i18n/zh/wallet.js
deleted file mode 100644
index fd391ad4370baa9382cef5d7f6160818a62e04e4..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/wallet.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    edit: `编辑`, // edit
-    forget: `forget`,
-    settings: `设置`, // settings
-    transfer: `转账`// transfer
-  },
-  confirmations: {
-    buttons: {
-      confirmAs: `确定为……`, // Confirm As...
-      revokeAs: `撤回为……`// Revoke As...
-    },
-    none: `现在没有交易需要确认。`, // No transactions needs confirmation right now.
-    tooltip: {
-      confirmed: `被{number}/{required}所有人确认`// Confirmed by {number}/{required} owners
-    }
-  },
-  details: {
-    requiredOwners: `这个钱包需要至少{owners}所有人验证所有的操作（交易，修改）`,
-    // This wallet requires at least {owners} to validate any action (transactions, modifications).
-    requiredOwnersNumber: `{number} {numberValue, plural, one {owner} other {owners}}`,
-    spent: `{spent} has been spent today, out of {limit} set as the daily limit, which has been reset on {date}`,
-    title: `细节`// Details
-  },
-  title: `钱包管理`, // Wallet Management
-  transactions: {
-    none: `没有交易被发送。`, // No transactions has been sent.
-    title: `交易`// Transactions
-  }
-};
diff --git a/js/src/i18n/zh/walletSettings.js b/js/src/i18n/zh/walletSettings.js
deleted file mode 100644
index 429542a371132e991a4cf44495dce9dc9532dac7..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/walletSettings.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  addOwner: {
-    title: `添加持有人` // Add Owner
-  },
-  buttons: {
-    cancel: `取消`, // Cancel
-    close: `关闭`, // Close
-    next: `下一个`, // Next
-    send: `发送`, // Send
-    sending: `正在发送...` // Sending...
-  },
-  changes: {
-    modificationString: `为了保证你做的修改会被执行，
-                        其他的账户持有人也需要发送相同的修改。
-                        他们可以通过粘贴以下字符串来简单的完成更改：`,
-                        // For your modifications to be taken into account,
-              // other owners have to send the same modifications. They can paste
-              // this string to make it easier:
-    none: `钱包设置没有发生任何更改。`, // No modifications have been made to the Wallet settings.
-    overview: `你将会造成以下更改` // You are about to make the following modifications
-  },
-  edit: {
-    message: `为了编辑这个合约的设置，至少{owners, number} 
-              {owners, plural, one {owner } other {owners }}必须发送完全相同的修改
-              你可以将字符串化的修改粘贴在这里。`
-                  // In order to edit this contract's settings, at
-                  // least {owners, number} {owners, plural, one {owner } other {owners }} have to
-                  // send the very same modifications. You can paste a stringified version
-                  // of the modifications here.
-  },
-  modifications: {
-    daylimit: {
-      hint: `不需要确认即可发送的ETH数量`, // amount of ETH spendable without confirmations
-      label: `钱包每日限额` // wallet day limit
-    },
-    fromString: {
-      label: `修改` // modifications
-    },
-    owners: {
-      label: `其他钱包持有人` // other wallet owners
-    },
-    required: {
-      hint: `确认交易所需的通过持有人人数`, // number of required owners to accept a transaction
-      label: `所需持有人` // required owners
-    },
-    sender: {
-      hint: `作为此持有人发送修改`, // send modifications as this owner
-      label: `来自账户 (wallet owner)` // from account (wallet owner)
-    }
-  },
-  ownersChange: {
-    details: `从 {from} 至 {to}`, // from {from} to {to}
-    title: `改变所需持有人`
-  },
-  rejected: `交易#{txid}已经被拒绝`, // The transaction #{txid} has been rejected
-  removeOwner: {
-    title: `移除持有人` // Remove Owner
-  }
-};
diff --git a/js/src/i18n/zh/web.js b/js/src/i18n/zh/web.js
deleted file mode 100644
index 55aef547fe040e41226bdd32b3c0c10a50154050..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/web.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  requestToken: `正在请求使用代币` // Requesting access token...
-};
diff --git a/js/src/i18n/zh/writeContract.js b/js/src/i18n/zh/writeContract.js
deleted file mode 100644
index c258b468066f233e9d17dd57e22bd95bd130dabe..0000000000000000000000000000000000000000
--- a/js/src/i18n/zh/writeContract.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default {
-  buttons: {
-    autoCompile: `自动编译`, // Auto-Compile
-    compile: `编译`, // Compile
-    deploy: `部署`, // Deploy
-    import: `载入Solidity`, // Import Solidity
-    load: `加载`, // Load
-    new: `新建`, // New
-    optimise: `优化`, // Optimise
-    save: `保存` // Save
-  },
-  compiling: {
-    action: `请编译源代码`, // Please compile the source code.
-    busy: `编译中...` // Compiling...
-  },
-  details: {
-    saved: `(已保存 {timestamp})` // (saved {timestamp})
-  },
-  error: {
-    noContract: `没有找到合约`, // No contract has been found.
-    params: `发生了如下描述的一个错误` // An error occurred with the following description
-  },
-  input: {
-    abi: `ABI界面`, // ABI Interface
-    code: `字节码`, // Bytecode
-    metadata: `元数据`, // Metadata
-    swarm: `Swarm元数据哈希` // Sarm Metadata Hash
-  },
-  title: {
-    contract: `选择一个合约`, // Select a contract
-    loading: `加载中...`, // Loading...
-    main: `写一个合约`, // Write a Contract
-    messages: `编译器消息`, // Compiler messages
-    new: `新建Solidity合约`, // New Solidity Contract
-    parameters: `变量`, // Parameters
-    saved: `已保存 @ {timestamp}`, // saved @ {timestamp}
-    selectSolidity: `选择Solidity版本`, // Select a Solidity version
-    solidity: `正在加载Solidity {version}` // Loading Solidity {version}
-  },
-  type: {
-    humanErc20: `Human代币合约编码`, // Implementation of the Human Token Contract
-    implementErc20: `ERC20代币合约编码`, // Implementation of the ERC20 Token Contract
-    multisig: `多签钱包编码`, // Implementation of a multisig Wallet
-    standardErc20: `标准ERC20代币合约` // Standard ERC20 Token Contract
-  }
-};
diff --git a/js/src/index.ejs b/js/src/index.ejs
deleted file mode 100644
index 305568f5b3f1fd1b3c06f175d863cd7e5a05bfc2..0000000000000000000000000000000000000000
--- a/js/src/index.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title><%= htmlWebpackPlugin.options.title %></title>
-    <style>
-      html {
-        background: white;
-        background-repeat: round;
-      }
-
-      html, body, #container {
-        width: 100%;
-        height: 100%;
-        margin: 0;
-        padding: 0;
-        font-family: 'Roboto', sans-serif;
-        font-size: 16px;
-        font-weight: 300;
-      }
-
-      .loading {
-        text-align: center;
-        padding-top: 5em;
-        font-size: 2em;
-        color: #999;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="container">
-      <div class="loading">Loading</div>
-    </div>
-    <script src="vendor.js"></script>
-  </body>
-</html>
diff --git a/js/src/index.js b/js/src/index.js
deleted file mode 100644
index 7e85dd51f4325934c2e79615f037d2a415c9872b..0000000000000000000000000000000000000000
--- a/js/src/index.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import 'whatwg-fetch';
-
-import es6Promise from 'es6-promise';
-es6Promise.polyfill();
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { AppContainer } from 'react-hot-loader';
-
-import injectTapEventPlugin from 'react-tap-event-plugin';
-import { hashHistory } from 'react-router';
-import qs from 'querystring';
-
-import SecureApi from './secureApi';
-import ContractInstances from '~/contracts';
-
-import { initStore } from './redux';
-import ContextProvider from '~/ui/ContextProvider';
-import muiTheme from '~/ui/Theme';
-import MainApplication from './main';
-
-import { loadSender, patchApi } from '~/util/tx';
-import { setApi } from '~/redux/providers/apiActions';
-
-import './environment';
-
-import '../assets/fonts/Roboto/font.css';
-import '../assets/fonts/RobotoMono/font.css';
-
-injectTapEventPlugin();
-
-if (process.env.NODE_ENV === 'development') {
-  // Expose the React Performance Tools on the`window` object
-  const Perf = require('react-addons-perf');
-
-  window.Perf = Perf;
-}
-
-const AUTH_HASH = '#/auth?';
-
-let token = null;
-
-if (window.location.hash && window.location.hash.indexOf(AUTH_HASH) === 0) {
-  token = qs.parse(window.location.hash.substr(AUTH_HASH.length)).token;
-}
-
-const uiUrl = window.location.host;
-const api = new SecureApi(uiUrl, token);
-
-patchApi(api);
-loadSender(api);
-ContractInstances.create(api);
-
-const store = initStore(api, hashHistory);
-
-store.dispatch({ type: 'initAll', api });
-store.dispatch(setApi(api));
-
-window.secureApi = api;
-
-ReactDOM.render(
-  <AppContainer>
-    <ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
-      <MainApplication
-        routerHistory={ hashHistory }
-      />
-    </ContextProvider>
-  </AppContainer>,
-  document.querySelector('#container')
-);
-
-if (module.hot) {
-  module.hot.accept('./main.js', () => {
-    require('./main.js');
-
-    ReactDOM.render(
-      <AppContainer>
-        <ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
-          <MainApplication
-            routerHistory={ hashHistory }
-          />
-        </ContextProvider>
-      </AppContainer>,
-      document.querySelector('#container')
-    );
-  });
-}
diff --git a/js/src/inject.js b/js/src/inject.js
deleted file mode 100644
index 295a604315739476f4a3a2705ab6e185611b4dfc..0000000000000000000000000000000000000000
--- a/js/src/inject.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import './parity';
-import './web3';
diff --git a/js/src/jsonrpc/.gitignore b/js/src/jsonrpc/.gitignore
deleted file mode 100644
index d8f8d46921aa81abc4c0d27703a8908333ae38c3..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-docs
diff --git a/js/src/jsonrpc/README.md b/js/src/jsonrpc/README.md
deleted file mode 100644
index 6a871c68cdffde6fca2c9a62af5fbc9a263bf3fb..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# jsonrpc
-
-JSON file of all ethereum's rpc methods supported by parity
-
-## interfaces
-
-[interfaces.md](release/interfaces.md) contains the auto-generated list of interfaces exposed, along with their relevant documentation
-
-## contributing
-
-0. Clone the repo
-0. Branch
-0. Add the missing interfaces only into `src/interfaces/*.js`
-0. Parameters (array) & Returns take objects of type
-    - `{ type: [Array|Boolean|Object|String|...], desc: 'some description', example: 100|'0xff'|{ ... } }`
-    - Types are built-in JS types or those defined in `src/types.js` (e.g. `BlockNumber`, `Quantity`, etc.)
-    - If a formatter is required, add it as `format: 'string-type'`
-0. Run the lint & tests, `npm run lint && npm run test`
-0. Generate via `npm run build` which outputs `index.js` & `index.json`.
-0. (optional) Generate docs via `npm run build:markdown` which outputs `md` files to `./docs`.
-0. Check-in and make a PR.
diff --git a/js/src/jsonrpc/helpers.js b/js/src/jsonrpc/helpers.js
deleted file mode 100644
index b462c8a08d90be8a2817b9e82a9efde99c2e9072..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/helpers.js
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-// A dummy placeholder object that will stringify literally to anything
-// in the example source.
-//
-//   {                                          {
-//     foo: new Dummy('{ ... }')   ------->       "foo": { ... }
-//   }                                          {
-//
-export class Dummy {
-  constructor (value) {
-    this.value = value;
-  }
-
-  toString () {
-    return this.value;
-  }
-
-  toJSON () {
-    return `##${this.value}##`;
-  }
-
-  static fixJSON (json) {
-    return json.replace(/"##([^#]+)##"/g, '$1');
-  }
-
-  static isDummy (obj) {
-    return obj instanceof Dummy;
-  }
-
-  static stringifyJSON (any) {
-    return Dummy.fixJSON(JSON.stringify(any));
-  }
-}
-
-// Enrich the API spec by additional markdown-formatted preamble
-export function withPreamble (preamble, spec) {
-  Object.defineProperty(spec, '_preamble', {
-    value: preamble.trim(),
-    enumerable: false
-  });
-
-  return spec;
-}
-
-// Enrich any example value with a comment to print in the docs
-export function withComment (example, comment) {
-  const constructor = example == null ? null : example.constructor;
-
-  if (constructor === Object || constructor === Array) {
-    Object.defineProperty(example, '_comment', {
-      value: comment,
-      enumerable: false
-    });
-
-    return example;
-  }
-
-  // Convert primitives
-  return new PrimitiveWithComment(example, comment);
-}
-
-// Turn a decimal number into a hexadecimal string with comment to it's original value
-export function fromDecimal (decimal) {
-  return withComment(`0x${decimal.toString(16)}`, decimal.toString());
-}
-
-// Internal helper
-class PrimitiveWithComment {
-  constructor (primitive, comment) {
-    this._value = primitive;
-    this._comment = comment;
-  }
-
-  toJSON () {
-    return this._value;
-  }
-}
diff --git a/js/src/jsonrpc/index.js b/js/src/jsonrpc/index.js
deleted file mode 100644
index ce7561788c1fdded6a283c9245d0172dcadc82f1..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import db from './interfaces/db';
-import eth from './interfaces/eth';
-import net from './interfaces/net';
-import parity from './interfaces/parity';
-import personal from './interfaces/personal';
-import shh from './interfaces/shh';
-import signer from './interfaces/signer';
-import trace from './interfaces/trace';
-import web3 from './interfaces/web3';
-
-export default {
-  db,
-  eth,
-  parity,
-  net,
-  personal,
-  shh,
-  signer,
-  trace,
-  web3
-};
diff --git a/js/src/jsonrpc/index.spec.js b/js/src/jsonrpc/index.spec.js
deleted file mode 100644
index af4afb9c96f9d90c9f79e2092d2f4eec5228b7f9..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/index.spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import interfaces from './';
-import * as customTypes from './types';
-
-const allowedTypes = [Array, Boolean, Object, String].concat(Object.values(customTypes));
-
-function verifyType (obj) {
-  if (typeof obj !== 'string') {
-    expect(obj).to.satisfy(() => allowedTypes.includes(obj.type));
-  }
-}
-
-describe('jsonrpc/interfaces', () => {
-  Object.keys(interfaces).forEach((group) => {
-    describe(group, () => {
-      Object.keys(interfaces[group]).forEach((name) => {
-        const method = interfaces[group][name];
-
-        describe(name, () => {
-          it('has the correct interface', () => {
-            expect(method.desc).to.be.a('string');
-            expect(method.params).to.be.an('array');
-            expect(method.returns).to.satisfy((returns) => {
-              return typeof returns === 'string' || typeof returns === 'object';
-            });
-
-            method.params.forEach(verifyType);
-            verifyType(method.returns);
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/jsonrpc/interfaces/db.js b/js/src/jsonrpc/interfaces/db.js
deleted file mode 100644
index f81746fad7fb54571e3257d0f1b4f67ced44bee3..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/interfaces/db.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Data } from '../types';
-
-export default {
-  getHex: {
-    nodoc: 'Not present in Rust code',
-    desc: 'Returns binary data from the local database.',
-    params: [
-      {
-        type: String,
-        desc: 'Database name'
-      },
-      {
-        type: String,
-        desc: 'Key name'
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: 'The previously stored data'
-    },
-    deprecated: true
-  },
-
-  getString: {
-    nodoc: 'Not present in Rust code',
-    desc: 'Returns string from the local database.',
-    params: [
-      {
-        type: String,
-        desc: 'Database name'
-      },
-      {
-        type: String,
-        desc: 'Key name'
-      }
-    ],
-    returns: {
-      type: String,
-      desc: 'The previously stored string'
-    },
-    deprecated: true
-  },
-
-  putHex: {
-    nodoc: 'Not present in Rust code',
-    desc: 'Stores binary data in the local database.',
-    params: [
-      {
-        type: String,
-        desc: 'Database name'
-      },
-      {
-        type: String,
-        desc: 'Key name'
-      },
-      {
-        type: Data,
-        desc: 'The data to store'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the value was stored, otherwise `false`'
-    },
-    deprecated: true
-  },
-
-  putString: {
-    nodoc: 'Not present in Rust code',
-    desc: 'Stores a string in the local database.',
-    params: [
-      {
-        type: String,
-        desc: 'Database name'
-      },
-      {
-        type: String,
-        desc: 'Key name'
-      },
-      {
-        type: String,
-        desc: 'The string to store'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the value was stored, otherwise `false`'
-    },
-    deprecated: true
-  }
-};
diff --git a/js/src/jsonrpc/interfaces/eth.js b/js/src/jsonrpc/interfaces/eth.js
deleted file mode 100644
index 30756e8c6e7abfc2437ae21c7f77252b73adc697..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/interfaces/eth.js
+++ /dev/null
@@ -1,1319 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Address, BlockNumber, Data, Hash, Quantity, CallRequest, TransactionRequest } from '../types';
-import { withPreamble, fromDecimal, withComment, Dummy } from '../helpers';
-
-const SUBDOC_PUBSUB = 'pubsub';
-
-export default withPreamble(`
-
-## The default block parameter
-
-The following methods have an optional extra \`defaultBlock\` parameter:
-
-- [eth_estimateGas](#eth_estimategas)
-- [eth_getBalance](#eth_getbalance)
-- [eth_getCode](#eth_getcode)
-- [eth_getTransactionCount](#eth_gettransactioncount)
-- [eth_getStorageAt](#eth_getstorageat)
-- [eth_call](#eth_call)
-
-When requests are made that act on the state of Ethereum, the last parameter determines the height of the block.
-
-The following options are possible for the \`defaultBlock\` parameter:
-
-- \`Quantity\`/\`Integer\` - an integer block number;
-- \`String "earliest"\` - for the earliest/genesis block;
-- \`String "latest"\` - for the latest mined block;
-- \`String "pending"\` - for the pending state/transactions.
-
-`, {
-  accounts: {
-    desc: 'Returns a list of addresses owned by client.',
-    params: [],
-    returns: {
-      type: Array,
-      desc: '20 Bytes - addresses owned by the client.',
-      example: ['0x407d73d8a49eeb85d32cf465507dd71d507100c1']
-    }
-  },
-
-  blockNumber: {
-    desc: 'Returns the number of most recent block.',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'integer of the current block number the client is on.',
-      example: fromDecimal(1207)
-    }
-  },
-
-  call: {
-    desc: 'Executes a new message call immediately without creating a transaction on the block chain.',
-    params: [
-      {
-        type: CallRequest,
-        desc: 'The transaction call object.',
-        format: 'inputCallFormatter',
-        example: {
-          from: '0x407d73d8a49eeb85d32cf465507dd71d507100c1',
-          to: '0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b',
-          value: fromDecimal(100000)
-        }
-      },
-      {
-        type: BlockNumber,
-        desc: 'Integer block number, or the string `\'latest\'`, `\'earliest\'` or `\'pending\'`, see the [default block parameter](#the-default-block-parameter).',
-        format: 'inputDefaultBlockNumberFormatter',
-        optional: true
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: 'the return value of executed contract.',
-      example: '0x'
-    }
-  },
-
-  coinbase: {
-    desc: 'Returns the client coinbase address.',
-    params: [],
-    returns: {
-      type: Address,
-      desc: 'The current coinbase address.',
-      example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-    }
-  },
-
-  estimateGas: {
-    desc: 'Makes a call or transaction, which won\'t be added to the blockchain and returns the used gas, which can be used for estimating the used gas.',
-    params: [
-      {
-        type: CallRequest,
-        desc: 'Same as [eth_call](#eth_call) parameters, except that all properties are optional.',
-        format: 'inputCallFormatter',
-        example: new Dummy('{ ... }')
-      },
-      {
-        type: BlockNumber,
-        desc: 'Integer block number, or the string `\'latest\'`, `\'earliest\'` or `\'pending\'`, see the [default block parameter](#the-default-block-parameter).',
-        format: 'inputDefaultBlockNumberFormatter',
-        optional: true
-      }
-    ],
-    returns: {
-      type: Quantity,
-      desc: 'The amount of gas used.',
-      format: 'utils.toDecimal',
-      example: fromDecimal(21000)
-    }
-  },
-
-  fetchQueuedTransactions: {
-    nodoc: 'Not present in Rust code',
-    desc: '?',
-    params: [
-      '?'
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful'
-    }
-  },
-
-  flush: {
-    nodoc: 'Not present in Rust code',
-    desc: '?',
-    params: [],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful'
-    }
-  },
-
-  gasPrice: {
-    desc: 'Returns the current price per gas in wei.',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'integer of the current gas price in wei.',
-      example: fromDecimal(10000000000000)
-    }
-  },
-
-  getBalance: {
-    desc: 'Returns the balance of the account of given address.',
-    params: [
-      {
-        type: Address,
-        desc: '20 Bytes - address to check for balance.',
-        format: 'inputAddressFormatter',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: BlockNumber,
-        desc: 'integer block number, or the string `\'latest\'`, `\'earliest\'` or `\'pending\'`, see the [default block parameter](#the-default-block-parameter).',
-        format: 'inputDefaultBlockNumberFormatter',
-        optional: true
-      }
-    ],
-    returns: {
-      type: Quantity,
-      desc: 'integer of the current balance in wei.',
-      format: 'outputBigNumberFormatter',
-      example: '0x0234c8a3397aab58'
-    }
-  },
-
-  getBlockByHash: {
-    desc: 'Returns information about a block by hash.',
-    params: [
-      {
-        type: Hash,
-        desc: 'Hash of a block.',
-        example: '0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331'
-      },
-      {
-        type: Boolean,
-        desc: 'If `true` it returns the full transaction objects, if `false` only the hashes of the transactions.',
-        example: true
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'A block object, or `null` when no block was found.',
-      details: {
-        number: {
-          type: Quantity,
-          desc: 'The block number. `null` when its pending block'
-        },
-        hash: {
-          type: Hash,
-          desc: '32 Bytes - hash of the block. `null` when its pending block'
-        },
-        parentHash: {
-          type: Hash,
-          desc: '32 Bytes - hash of the parent block'
-        },
-        nonce: {
-          type: Data,
-          desc: '8 Bytes - hash of the generated proof-of-work. `null` when its pending block'
-        },
-        sha3Uncles: {
-          type: Data,
-          desc: '32 Bytes - SHA3 of the uncles data in the block'
-        },
-        logsBloom: {
-          type: Data,
-          desc: '256 Bytes - the bloom filter for the logs of the block. `null` when its pending block'
-        },
-        transactionsRoot: {
-          type: Data,
-          desc: '32 Bytes - the root of the transaction trie of the block'
-        },
-        stateRoot: {
-          type: Data,
-          desc: '32 Bytes - the root of the final state trie of the block'
-        },
-        receiptsRoot: {
-          type: Data, desc: '32 Bytes - the root of the receipts trie of the block'
-        },
-        miner: {
-          type: Address,
-          desc: '20 Bytes - the address of the beneficiary to whom the mining rewards were given'
-        },
-        difficulty: {
-          type: Quantity,
-          desc: 'integer of the difficulty for this block'
-        },
-        totalDifficulty: {
-          type: Quantity,
-          desc: 'integer of the total difficulty of the chain until this block'
-        },
-        extraData: {
-          type: Data,
-          desc: 'the \'extra data\' field of this block'
-        },
-        size: {
-          type: Quantity,
-          desc: 'integer the size of this block in bytes'
-        },
-        gasLimit: {
-          type: Quantity,
-          desc: 'the maximum gas allowed in this block'
-        },
-        gasUsed: {
-          type: Quantity,
-          desc: 'the total used gas by all transactions in this block'
-        },
-        timestamp: {
-          type: Quantity,
-          desc: 'the unix timestamp for when the block was collated'
-        },
-        transactions: {
-          type: Array,
-          desc: 'Array of transaction objects, or 32 Bytes transaction hashes depending on the last given parameter'
-        },
-        uncles: {
-          type: Array,
-          desc: 'Array of uncle hashes'
-        }
-      },
-      example: {
-        number: fromDecimal(436),
-        hash: '0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331',
-        parentHash: '0x9646252be9520f6e71339a8df9c55e4d7619deeb018d2a3f2d21fc165dde5eb5',
-        sealFields: ['0xe04d296d2460cfb8472af2c5fd05b5a214109c25688d3704aed5484f9a7792f2', '0x0000000000000042'],
-        sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347',
-        logsBloom: '0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331',
-        transactionsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421',
-        stateRoot: '0xd5855eb08b3387c0af375e9cdb6acfc05eb8f519e419b874b6ff2ffda7ed1dff',
-        miner: '0x4e65fda2159562a496f9f3522f89122a3088497a',
-        difficulty: fromDecimal(163591),
-        totalDifficulty: fromDecimal(163591),
-        extraData: '0x0000000000000000000000000000000000000000000000000000000000000000',
-        size: fromDecimal(163591),
-        gasLimit: fromDecimal(653145),
-        minGasPrice: fromDecimal(653145),
-        gasUsed: fromDecimal(653145),
-        timestamp: fromDecimal(1424182926),
-        transactions: [new Dummy('{ ... }, { ... }, ...')],
-        uncles: ['0x1606e5...', '0xd5145a9...']
-      }
-    }
-  },
-
-  getBlockByNumber: {
-    desc: 'Returns information about a block by block number.',
-    params: [
-      {
-        type: BlockNumber,
-        desc: 'integer of a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`, as in the [default block parameter](#the-default-block-parameter).',
-        example: fromDecimal(436)
-      },
-      {
-        type: Boolean,
-        desc: 'If `true` it returns the full transaction objects, if `false` only the hashes of the transactions.',
-        example: true
-      }
-    ],
-    returns: 'See [eth_getBlockByHash](#eth_getblockbyhash)'
-  },
-
-  getBlockTransactionCountByHash: {
-    desc: 'Returns the number of transactions in a block from a block matching the given block hash.',
-    params: [
-      {
-        type: Hash,
-        desc: '32 Bytes - hash of a block.',
-        example: '0xb903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238'
-      }
-    ],
-    returns: {
-      type: Quantity,
-      desc: 'integer of the number of transactions in this block.',
-      example: fromDecimal(11)
-    }
-  },
-
-  getBlockTransactionCountByNumber: {
-    desc: 'Returns the number of transactions in a block from a block matching the given block number.',
-    params: [
-      {
-        type: BlockNumber,
-        desc: 'integer of a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`, as in the [default block parameter](#the-default-block-parameter).',
-        example: fromDecimal(232)
-      }
-    ],
-    returns: {
-      type: Quantity,
-      desc: 'integer of the number of transactions in this block.',
-      example: fromDecimal(10)
-    }
-  },
-
-  getCode: {
-    desc: 'Returns code at a given address.',
-    params: [
-      {
-        type: Address,
-        desc: '20 Bytes - address.',
-        format: 'inputAddressFormatter',
-        example: '0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'
-      },
-      {
-        type: BlockNumber,
-        desc: 'integer block number, or the string `\'latest\'`, `\'earliest\'` or `\'pending\'`, see the [default block parameter](#the-default-block-parameter).',
-        format: 'inputDefaultBlockNumberFormatter',
-        example: fromDecimal(2)
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: 'the code from the given address.',
-      example: '0x600160008035811a818181146012578301005b601b6001356025565b8060005260206000f25b600060078202905091905056'
-    }
-  },
-
-  getFilterChanges: {
-    desc: 'Polling method for a filter, which returns an array of logs which occurred since last poll.',
-    params: [
-      {
-        type: Quantity,
-        desc: 'The filter id.',
-        example: fromDecimal(22)
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'Array of log objects, or an empty array if nothing has changed since last poll.',
-      example: [
-        {
-          logIndex: fromDecimal(1),
-          blockNumber: fromDecimal(436),
-          blockHash: '0x8216c5785ac562ff41e2dcfdf5785ac562ff41e2dcfdf829c5a142f1fccd7d',
-          transactionHash: '0xdf829c5a142f1fccd7d8216c5785ac562ff41e2dcfdf5785ac562ff41e2dcf',
-          transactionIndex: fromDecimal(0),
-          address: '0x16c5785ac562ff41e2dcfdf829c5a142f1fccd7d',
-          data: '0x0000000000000000000000000000000000000000000000000000000000000000',
-          topics: ['0x59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a5']
-        },
-        new Dummy('...')
-      ]
-    }
-  },
-
-  getFilterChangesEx: {
-    nodoc: 'Not present in Rust code', // https://github.com/ethereum/wiki/wiki/Proposal:-Reversion-Notification
-    desc: '?',
-    params: [
-      '?'
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful'
-    }
-  },
-
-  getFilterLogs: {
-    desc: 'Returns an array of all logs matching filter with given id.',
-    params: [
-      {
-        type: Quantity,
-        desc: 'The filter id.',
-        example: fromDecimal(22)
-      }
-    ],
-    returns: 'See [eth_getFilterChanges](#eth_getfilterchanges)'
-  },
-
-  getFilterLogsEx: {
-    nodoc: 'Not present in Rust code', // https://github.com/ethereum/wiki/wiki/Proposal:-Reversion-Notification
-    desc: '?',
-    params: [
-      '?'
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful'
-    }
-  },
-
-  getLogs: {
-    desc: 'Returns an array of all logs matching a given filter object.',
-    params: [
-      {
-        type: Object,
-        desc: 'The filter object, see [eth_newFilter parameters](#eth_newfilter).',
-        example: {
-          topics: ['0x000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b']
-        }
-      }
-    ],
-    returns: 'See [eth_getFilterChanges](#eth_getfilterchanges)'
-  },
-
-  getLogsEx: {
-    nodoc: 'Not present in Rust code', // https://github.com/ethereum/wiki/wiki/Proposal:-Reversion-Notification
-    desc: '?',
-    params: [
-      '?'
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful'
-    }
-  },
-
-  getStorageAt: {
-    desc: 'Returns the value from a storage position at a given address.',
-    params: [
-      {
-        type: Address,
-        desc: '20 Bytes - address of the storage.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: Quantity,
-        desc: 'integer of the position in the storage.',
-        format: 'utils.toHex',
-        example: fromDecimal(0)
-      },
-      {
-        type: BlockNumber,
-        desc: 'integer block number, or the string `\'latest\'`, `\'earliest\'` or `\'pending\'`, see the [default block parameter](#the-default-block-parameter).',
-        format: 'inputDefaultBlockNumberFormatter',
-        example: fromDecimal(2),
-        optional: true
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: 'the value at this storage position.',
-      example: '0x0000000000000000000000000000000000000000000000000000000000000003'
-    }
-  },
-
-  getTransactionByHash: {
-    desc: 'Returns the information about a transaction requested by transaction hash.',
-    params: [
-      {
-        type: Hash,
-        desc: '32 Bytes - hash of a transaction.',
-        example: '0xb903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238'
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'A transaction object, or `null` when no transaction was found:',
-      format: 'outputTransactionFormatter',
-      details: {
-        hash: {
-          type: Hash,
-          desc: '32 Bytes - hash of the transaction.'
-        },
-        nonce: {
-          type: Quantity,
-          desc: 'the number of transactions made by the sender prior to this one.'
-        },
-        blockHash: {
-          type: Hash,
-          desc: '32 Bytes - hash of the block where this transaction was in. `null` when its pending.'
-        },
-        blockNumber: {
-          type: BlockNumber,
-          desc: 'block number where this transaction was in. `null` when its pending.'
-        },
-        transactionIndex: {
-          type: Quantity,
-          desc: 'integer of the transactions index position in the block. `null` when its pending.'
-        },
-        from: {
-          type: Address,
-          desc: '20 Bytes - address of the sender.'
-        },
-        to: {
-          type: Address,
-          desc: '20 Bytes - address of the receiver. `null` when its a contract creation transaction.'
-        },
-        value: {
-          type: Quantity,
-          desc: 'value transferred in Wei.'
-        },
-        gasPrice: {
-          type: Quantity,
-          desc: 'gas price provided by the sender in Wei.'
-        },
-        gas: {
-          type: Quantity,
-          desc: 'gas provided by the sender.'
-        },
-        input: {
-          type: Data,
-          desc: 'the data send along with the transaction.'
-        },
-        v: {
-          type: Quantity,
-          desc: 'the standardised V field of the signature.'
-        },
-        standard_v: {
-          type: Quantity,
-          desc: 'the standardised V field of the signature (0 or 1).'
-        },
-        r: {
-          type: Quantity,
-          desc: 'the R field of the signature.'
-        },
-        raw: {
-          type: Data,
-          desc: 'raw transaction data'
-        },
-        publicKey: {
-          type: Hash,
-          desc: 'public key of the signer.'
-        },
-        chainId: {
-          type: Quantity,
-          desc: 'the chain id of the transaction, if any.'
-        },
-        creates: {
-          type: Hash,
-          desc: 'creates contract hash'
-        },
-        condition: {
-          type: Object,
-          optional: true,
-          desc: 'conditional submission, Block number in `block` or timestamp in `time` or `null`. (parity-feature)'
-        }
-      },
-      example: {
-        hash: '0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b',
-        nonce: fromDecimal(0),
-        blockHash: '0xbeab0aa2411b7ab17f30a99d3cb9c6ef2fc5426d6ad6fd9e2a26a6aed1d1055b',
-        blockNumber: fromDecimal(5599),
-        transactionIndex: fromDecimal(1),
-        from: '0x407d73d8a49eeb85d32cf465507dd71d507100c1',
-        to: '0x853f43d8a49eeb85d32cf465507dd71d507100c1',
-        value: fromDecimal(520464),
-        gas: fromDecimal(520464),
-        gasPrice: '0x09184e72a000',
-        input: '0x603880600c6000396000f300603880600c6000396000f3603880600c6000396000f360'
-      }
-    }
-  },
-
-  getTransactionByBlockHashAndIndex: {
-    desc: 'Returns information about a transaction by block hash and transaction index position.',
-    params: [
-      {
-        type: Hash,
-        desc: 'hash of a block.',
-        example: '0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331'
-      },
-      {
-        type: Quantity,
-        desc: 'integer of the transaction index position.',
-        example: fromDecimal(0)
-      }
-    ],
-    returns: 'See [eth_getBlockByHash](#eth_gettransactionbyhash)'
-  },
-
-  getTransactionByBlockNumberAndIndex: {
-    desc: 'Returns information about a transaction by block number and transaction index position.',
-    params: [
-      {
-        type: BlockNumber,
-        desc: 'a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`, as in the [default block parameter](#the-default-block-parameter).',
-        example: fromDecimal(668)
-      },
-      {
-        type: Quantity,
-        desc: 'The transaction index position.',
-        example: fromDecimal(0)
-      }
-    ],
-    returns: 'See [eth_getBlockByHash](#eth_gettransactionbyhash)'
-  },
-
-  getTransactionCount: {
-    desc: 'Returns the number of transactions *sent* from an address.',
-    params: [
-      {
-        type: Address,
-        desc: '20 Bytes - address.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: BlockNumber,
-        desc: 'integer block number, or the string `\'latest\'`, `\'earliest\'` or `\'pending\'`, see the [default block parameter](#the-default-block-parameter).',
-        format: 'inputDefaultBlockNumberFormatter',
-        optional: true
-      }
-    ],
-    returns: {
-      type: Quantity,
-      desc: 'integer of the number of transactions send from this address.',
-      format: 'utils.toDecimal',
-      example: fromDecimal(1)
-    }
-  },
-
-  getTransactionReceipt: {
-    desc: 'Returns the receipt of a transaction by transaction hash.\n\n**Note** That the receipt is available even for pending transactions.',
-    params: [
-      {
-        type: Hash,
-        desc: 'hash of a transaction.',
-        example: '0xb903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238'
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'A transaction receipt object, or `null` when no receipt was found:',
-      format: 'outputTransactionReceiptFormatter',
-      details: {
-        transactionHash: {
-          type: Hash,
-          desc: '32 Bytes - hash of the transaction.'
-        },
-        transactionIndex: {
-          type: Quantity,
-          desc: 'integer of the transactions index position in the block.'
-        },
-        blockHash: {
-          type: Hash,
-          desc: '32 Bytes - hash of the block where this transaction was in.'
-        },
-        blockNumber: {
-          type: BlockNumber,
-          desc: 'block number where this transaction was in.'
-        },
-        cumulativeGasUsed: {
-          type: Quantity,
-          desc: 'The total amount of gas used when this transaction was executed in the block.'
-        },
-        gasUsed: {
-          type: Quantity,
-          desc: 'The amount of gas used by this specific transaction alone.'
-        },
-        contractAddress: {
-          type: Address,
-          desc: '20 Bytes - The contract address created, if the transaction was a contract creation, otherwise `null`.'
-        },
-        logs: {
-          type: Array,
-          desc: 'Array of log objects, which this transaction generated.'
-        }
-      },
-      example: {
-        transactionHash: '0xb903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238',
-        transactionIndex: fromDecimal(1),
-        blockNumber: fromDecimal(11),
-        blockHash: '0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b',
-        cumulativeGasUsed: fromDecimal(13244),
-        gasUsed: fromDecimal(1244),
-        contractAddress: withComment('0xb60e8dd61c5d32be8058bb8eb970870f07233155', 'or null, if none was created'),
-        logs: withComment([new Dummy('{ ... }, { ... }, ...]')], 'logs as returned by eth_getFilterLogs, etc.')
-      }
-    }
-  },
-
-  getUncleByBlockHashAndIndex: {
-    desc: 'Returns information about a uncle of a block by hash and uncle index position.\n\n**Note:** An uncle doesn\'t contain individual transactions.',
-    params: [
-      {
-        type: Hash,
-        desc: 'Hash of a block.',
-        example: '0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b'
-      },
-      {
-        type: Quantity,
-        desc: 'The uncle\'s index position.',
-        example: fromDecimal(0)
-      }
-    ],
-    returns: 'See [eth_getBlockByHash](#eth_getblockbyhash)'
-  },
-
-  getUncleByBlockNumberAndIndex: {
-    desc: 'Returns information about a uncle of a block by number and uncle index position.\n\n**Note:** An uncle doesn\'t contain individual transactions.',
-    params: [
-      {
-        type: BlockNumber,
-        desc: 'a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`, as in the [default block parameter](#the-default-block-parameter).',
-        example: fromDecimal(668)
-      },
-      {
-        type: Quantity,
-        desc: 'The uncle\'s index position.',
-        example: fromDecimal(0)
-      }
-    ],
-    returns: 'See [eth_getBlockByHash](#eth_getblockbyhash)'
-  },
-
-  getUncleCountByBlockHash: {
-    desc: 'Returns the number of uncles in a block from a block matching the given block hash.',
-    params: [
-      {
-        type: Hash,
-        desc: '32 Bytes - hash of a block.',
-        example: '0xb903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238'
-      }
-    ],
-    returns: {
-      type: Quantity,
-      desc: 'integer of the number of uncles in this block.',
-      example: fromDecimal(0)
-    }
-  },
-
-  getUncleCountByBlockNumber: {
-    desc: 'Returns the number of uncles in a block from a block matching the given block number.',
-    params: [
-      {
-        type: BlockNumber,
-        desc: 'integer of a block number, or the string \'latest\', \'earliest\' or \'pending\', see the [default block parameter](#the-default-block-parameter).',
-        example: fromDecimal(232)
-      }
-    ],
-    returns: {
-      type: Quantity,
-      desc: 'integer of the number of uncles in this block.',
-      example: fromDecimal(1)
-    }
-  },
-
-  getWork: {
-    desc: 'Returns the hash of the current block, the seedHash, and the boundary condition to be met ("target").',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'Array with the following properties:\n  - `Data`, 32 Bytes - current block header pow-hash.\n  - `Data`, 32 Bytes - the seed hash used for the DAG.\n  - `Data`, 32 Bytes - the boundary condition ("target"), 2^256 / difficulty.\n  - `Quantity`, the current block number.',
-      example: [
-        '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
-        '0x5EED00000000000000000000000000005EED0000000000000000000000000000',
-        '0xd1ff1c01710000000000000000000000d1ff1c01710000000000000000000000',
-        fromDecimal(1)
-      ]
-    }
-  },
-
-  hashrate: {
-    desc: 'Returns the number of hashes per second that the node is mining with.',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'number of hashes per second.',
-      example: fromDecimal(906)
-    }
-  },
-
-  inspectTransaction: {
-    nodoc: 'Not present in Rust code',
-    desc: '?',
-    params: [
-      '?'
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful'
-    }
-  },
-
-  mining: {
-    desc: 'Returns `true` if client is actively mining new blocks.',
-    params: [],
-    returns: {
-      type: Boolean,
-      desc: '`true` of the client is mining, otherwise `false`.',
-      example: true
-    }
-  },
-
-  newBlockFilter: {
-    desc: 'Creates a filter in the node, to notify when a new block arrives.\nTo check if the state has changed, call [eth_getFilterChanges](#eth_getfilterchanges).',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'A filter id.',
-      example: fromDecimal(1)
-    }
-  },
-
-  newFilter: {
-    desc: `Creates a filter object, based on filter options, to notify when the state changes (logs).
-           To check if the state has changed, call [eth_getFilterChanges](#eth_getfilterchanges).
-
-           ##### A note on specifying topic filters:
-           Topics are order-dependent. A transaction with a log with topics [A, B] will be matched by the following topic filters:
-           * \`[]\` "anything"
-           * \`[A]\` "A in first position (and anything after)"
-           * \`[null, B]\` "anything in first position AND B in second position (and anything after)"
-           * \`[A, B]\` "A in first position AND B in second position (and anything after)"
-           * \`[[A, B], [A, B]]\` "(A OR B) in first position AND (A OR B) in second position (and anything after)"`.replace(/^[^\S\n]+/gm, ''),
-    params: [{
-      type: Object,
-      desc: 'The filter options:',
-      details: {
-        fromBlock: {
-          type: BlockNumber,
-          desc: 'Integer block number, or `\'latest\'` for the last mined block or `\'pending\'`, `\'earliest\'` for not yet mined transactions.',
-          optional: true,
-          default: 'latest'
-        },
-        toBlock: {
-          type: BlockNumber,
-          desc: 'Integer block number, or `\'latest\'` for the last mined block or `\'pending\'`, `\'earliest\'` for not yet mined transactions.',
-          optional: true,
-          default: 'latest'
-        },
-        address: {
-          type: Address,
-          desc: '20 Bytes - Contract address or a list of addresses from which logs should originate.',
-          optional: true
-        },
-        topics: {
-          type: Array,
-          desc: 'Array of 32 Bytes `Data` topics. Topics are order-dependent. It\'s possible to pass in `null` to match any topic, or a subarray of multiple topics of which one should be matching.',
-          optional: true
-        },
-        limit: {
-          type: Quantity,
-          desc: 'The maximum number of entries to retrieve (latest first).',
-          optional: true
-        }
-      },
-      example: {
-        fromBlock: fromDecimal(1),
-        toBlock: fromDecimal(2),
-        address: '0x8888f1f195afa192cfee860698584c030f4c9db1',
-        topics: withComment([
-          withComment('0x000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b', 'This topic in first position'),
-          withComment(null, 'Any topic in second position'),
-          withComment(['0x000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b', '0x000000000000000000000000aff3454fce5edbc8cca8697c15331677e6ebccc'], 'Either topic of the two in third position')
-        ], '... and anything after')
-      }
-    }],
-    returns: {
-      type: Quantity,
-      desc: 'The filter id.',
-      example: fromDecimal(1)
-    }
-  },
-
-  newFilterEx: {
-    nodoc: 'Not present in Rust code', // https://github.com/ethereum/wiki/wiki/Proposal:-Reversion-Notification
-    desc: '?',
-    params: [
-      '?'
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful'
-    }
-  },
-
-  newPendingTransactionFilter: {
-    desc: 'Creates a filter in the node, to notify when new pending transactions arrive.\n\nTo check if the state has changed, call [eth_getFilterChanges](#eth_getfilterchanges).',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'A filter id.',
-      example: fromDecimal(1)
-    }
-  },
-
-  notePassword: {
-    nodoc: 'Not present in Rust code',
-    desc: '?',
-    params: [
-      '?'
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful'
-    }
-  },
-
-  pendingTransactions: {
-    nodoc: 'Not present in Rust code',
-    desc: '?',
-    params: [],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful'
-    }
-  },
-
-  protocolVersion: {
-    desc: 'Returns the current ethereum protocol version.',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'The current ethereum protocol version.',
-      example: fromDecimal(99)
-    }
-  },
-
-  register: {
-    nodoc: 'Not present in Rust code',
-    desc: '?',
-    params: [
-      '?'
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful'
-    }
-  },
-
-  sendRawTransaction: {
-    desc: 'Creates new message call transaction or a contract creation for signed transactions.\n\n**Note:** `eth_submitTransaction` is an alias of this method.',
-    params: [
-      {
-        type: Data,
-        desc: 'The signed transaction data.',
-        example: '0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675'
-      }
-    ],
-    returns: {
-      type: Hash,
-      desc: '32 Bytes - the transaction hash, or the zero hash if the transaction is not yet available\n\nUse [eth_getTransactionReceipt](#eth_gettransactionreceipt) to get the contract address, after the transaction was mined, when you created a contract.',
-      example: '0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331'
-    }
-  },
-
-  sendTransaction: {
-    desc: 'Creates new message call transaction or a contract creation, if the data field contains code.',
-    params: [
-      {
-        type: TransactionRequest,
-        desc: 'The transaction object.',
-        format: 'inputTransactionFormatter',
-        example: {
-          from: '0xb60e8dd61c5d32be8058bb8eb970870f07233155',
-          to: '0xd46e8dd67c5d32be8058bb8eb970870f07244567',
-          gas: fromDecimal(30400),
-          gasPrice: fromDecimal(10000000000000),
-          value: fromDecimal(2441406250),
-          data: '0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675'
-        }
-      }
-    ],
-    returns: {
-      type: Hash,
-      desc: '32 Bytes - the transaction hash, or the zero hash if the transaction is not yet available.\n\nUse [eth_getTransactionReceipt](#eth_gettransactionreceipt) to get the contract address, after the transaction was mined, when you created a contract.',
-      example: '0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331'
-    }
-  },
-
-  sign: {
-    desc: 'The sign method calculates an Ethereum specific signature with: `sign(keccak256("\x19Ethereum Signed Message:\n" + len(message) + message)))`.',
-    params: [
-      {
-        type: Address,
-        desc: '20 Bytes - address.',
-        format: 'inputAddressFormatter',
-        example: '0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826'
-      },
-      {
-        type: Data,
-        desc: 'Data which hash to sign.',
-        example: withComment('0x5363686f6f6c627573', 'Schoolbus')
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: 'Signed data.',
-      example: '0xb1092cb5b23c2aa55e5b5787729c6be812509376de99a52bea2b41e5a5f8601c5641e74d01e4493c17bf1ef8b179c49362b2c721222128d58422a539310c6ecd1b'
-    }
-  },
-
-  signTransaction: {
-    desc: 'Signs transactions without dispatching it to the network. It can be later submitted using [eth_sendRawTransaction](#eth_sendrawtransaction).',
-    params: [
-      {
-        type: TransactionRequest,
-        desc: 'Transaction object, see [eth_sendTransaction](#eth_sendTransaction).',
-        format: 'inputCallFormatter',
-        example: new Dummy('{ ... }')
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'Signed transaction and it\'s details:',
-      details: {
-        raw: {
-          type: Data,
-          desc: 'The signed, RLP encoded transaction.'
-        },
-        tx: {
-          type: Object,
-          desc: 'Transaction object:',
-          details: {
-            hash: {
-              type: Hash,
-              desc: '32 Bytes - hash of the transaction.'
-            },
-            nonce: {
-              type: Quantity,
-              desc: 'the number of transactions made by the sender prior to this one.'
-            },
-            blockHash: {
-              type: Hash,
-              desc: '32 Bytes - hash of the block where this transaction was in. `null` when its pending.'
-            },
-            blockNumber: {
-              type: BlockNumber,
-              desc: 'block number where this transaction was in. `null` when its pending.'
-            },
-            transactionIndex: {
-              type: Quantity,
-              desc: 'integer of the transactions index position in the block. `null` when its pending.'
-            },
-            from: {
-              type: Address,
-              desc: '20 Bytes - address of the sender.'
-            },
-            to: {
-              type: Address,
-              desc: '20 Bytes - address of the receiver. `null` when its a contract creation transaction.'
-            },
-            value: {
-              type: Quantity,
-              desc: 'value transferred in Wei.'
-            },
-            gasPrice: {
-              type: Quantity,
-              desc: 'gas price provided by the sender in Wei.'
-            },
-            gas: {
-              type: Quantity,
-              desc: 'gas provided by the sender.'
-            },
-            input: {
-              type: Data,
-              desc: 'the data send along with the transaction.'
-            },
-            v: {
-              type: Quantity,
-              desc: 'the standardised V field of the signature.'
-            },
-            standard_v: {
-              type: Quantity,
-              desc: 'the standardised V field of the signature (0 or 1).'
-            },
-            r: {
-              type: Quantity,
-              desc: 'the R field of the signature.'
-            },
-            raw: {
-              type: Data,
-              desc: 'raw transaction data'
-            },
-            publicKey: {
-              type: Hash,
-              desc: 'public key of the signer.'
-            },
-            chainId: {
-              type: Quantity,
-              desc: 'the chain id of the transaction, if any.'
-            },
-            creates: {
-              type: Hash,
-              desc: 'creates contract hash'
-            },
-            condition: {
-              type: Object,
-              optional: true,
-              desc: 'conditional submission, Block number in `block` or timestamp in `time` or `null`. (parity-feature)'
-            }
-          }
-        }
-      },
-      example: {
-        raw: '0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675',
-        tx: {
-          hash: '0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b',
-          nonce: fromDecimal(0),
-          blockHash: '0xbeab0aa2411b7ab17f30a99d3cb9c6ef2fc5426d6ad6fd9e2a26a6aed1d1055b',
-          blockNumber: fromDecimal(5599),
-          transactionIndex: fromDecimal(1),
-          from: '0x407d73d8a49eeb85d32cf465507dd71d507100c1',
-          to: '0x853f43d8a49eeb85d32cf465507dd71d507100c1',
-          value: fromDecimal(520464),
-          gas: fromDecimal(520464),
-          gasPrice: '0x09184e72a000',
-          input: '0x603880600c6000396000f300603880600c6000396000f3603880600c6000396000f360'
-        }
-      }
-    }
-  },
-
-  submitWork: {
-    desc: 'Used for submitting a proof-of-work solution.',
-    params: [
-      {
-        type: Data,
-        desc: '8 Bytes - The nonce found (64 bits).',
-        example: '0x0000000000000001'
-      },
-      {
-        type: Data,
-        desc: '32 Bytes - The header\'s pow-hash (256 bits)',
-        example: '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef'
-      },
-      {
-        type: Data,
-        desc: '32 Bytes - The mix digest (256 bits).',
-        example: '0xD1FE5700000000000000000000000000D1FE5700000000000000000000000000'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the provided solution is valid, otherwise `false`.',
-      example: true
-    }
-  },
-
-  submitHashrate: {
-    desc: 'Used for submitting mining hashrate.',
-    params: [
-      {
-        type: Data,
-        desc: 'a hexadecimal string representation (32 bytes) of the hash rate.',
-        example: '0x0000000000000000000000000000000000000000000000000000000000500000'
-      },
-      {
-        type: Data,
-        desc: 'A random hexadecimal(32 bytes) ID identifying the client.',
-        example: '0x59daa26581d0acd1fce254fb7e85952f4c09d0915afd33d3886cd914bc7d283c'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if submitting went through succesfully and `false` otherwise.',
-      example: true
-    }
-  },
-
-  syncing: {
-    desc: 'Returns an object with data about the sync status or `false`.',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'An object with sync status data or `FALSE`, when not syncing.',
-      format: 'outputSyncingFormatter',
-      details: {
-        startingBlock: {
-          type: Quantity,
-          desc: 'The block at which the import started (will only be reset, after the sync reached this head)'
-        },
-        currentBlock: {
-          type: Quantity,
-          desc: 'The current block, same as eth_blockNumber'
-        },
-        highestBlock: {
-          type: Quantity,
-          desc: 'The estimated highest block'
-        },
-        blockGap: {
-          type: Array,
-          desc: 'Array of "first", "last", such that [first, last) are all missing from the chain'
-        },
-        warpChunksAmount: {
-          type: Quantity,
-          desc: 'Total amount of snapshot chunks'
-        },
-        warpChunksProcessed: {
-          type: Quantity,
-          desc: 'Total amount of snapshot chunks processed'
-        }
-      },
-      example: withComment({
-        startingBlock: fromDecimal(900),
-        currentBlock: fromDecimal(902),
-        highestBlock: fromDecimal(1108)
-      }, 'Or `false` when not syncing')
-    }
-  },
-
-  uninstallFilter: {
-    desc: 'Uninstalls a filter with given id. Should always be called when watch is no longer needed.\nAdditonally Filters timeout when they aren\'t requested with [eth_getFilterChanges](#eth_getfilterchanges) for a period of time.',
-    params: [
-      {
-        type: Quantity,
-        desc: 'The filter id.',
-        example: fromDecimal(11)
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the filter was successfully uninstalled, otherwise `false`.',
-      example: true
-    }
-  },
-
-  unregister: {
-    nodoc: 'Not present in Rust code',
-    desc: '?',
-    params: [
-      '?'
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful'
-    }
-  },
-
-  // Pub-Sub
-  subscribe: {
-    subdoc: SUBDOC_PUBSUB,
-    desc: `
-Starts a subscription (on WebSockets / IPC / TCP transports) to a particular event. For every event that
-matches the subscription a JSON-RPC notification with event details and subscription ID will be sent to a client.
-
-An example notification received by subscribing to \`newHeads\` event:
-\`\`\`
-{"jsonrpc":"2.0","method":"eth_subscription","params":{"subscription":"0x416d77337e24399d","result":{"difficulty":"0xd9263f42a87",<...>,
-"uncles":[]}}}
-\`\`\`
-
-You can unsubscribe using \`eth_unsubscribe\` RPC method. Subscriptions are also tied to a transport
-connection, disconnecting causes all subscriptions to be canceled.
-    `,
-    params: [
-      {
-        type: String,
-        desc: 'Subscription type: one of `newHeads`, `logs`',
-        example: 'newHeads'
-      },
-      {
-        type: Object,
-        desc: `
-Subscription type-specific parameters. It must be left empty for
-\`newHeads\` and must contain filter object for \`logs\`.
-        `,
-        example: {
-          fromBlock: 'latest',
-          toBlock: 'latest'
-        }
-      }
-    ],
-    returns: {
-      type: String,
-      desc: 'Assigned subscription ID',
-      example: '0x416d77337e24399d'
-    }
-  },
-  unsubscribe: {
-    subdoc: SUBDOC_PUBSUB,
-    desc: 'Unsubscribes from a subscription.',
-    params: [{
-      type: String,
-      desc: 'Subscription ID',
-      example: '0x416d77337e24399d'
-    }],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful',
-      example: true
-    }
-  }
-});
diff --git a/js/src/jsonrpc/interfaces/net.js b/js/src/jsonrpc/interfaces/net.js
deleted file mode 100644
index b09b9b1513f8e9d11e0a064fa964c2a4b718039d..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/interfaces/net.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Quantity } from '../types';
-import { fromDecimal } from '../helpers';
-
-export default {
-  listening: {
-    desc: 'Returns `true` if client is actively listening for network connections.',
-    params: [],
-    returns: {
-      type: Boolean,
-      desc: '`true` when listening, otherwise `false`.',
-      example: true
-    }
-  },
-
-  peerCount: {
-    desc: 'Returns number of peers currenly connected to the client.',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'Integer of the number of connected peers',
-      format: 'utils.toDecimal',
-      example: fromDecimal(2)
-    }
-  },
-
-  version: {
-    desc: 'Returns the current network protocol version.',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'The current network protocol version',
-      example: '8995'
-    }
-  }
-};
diff --git a/js/src/jsonrpc/interfaces/parity.js b/js/src/jsonrpc/interfaces/parity.js
deleted file mode 100644
index a1e6246e47f8793bc4e3ae214464de5750faa9fe..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/interfaces/parity.js
+++ /dev/null
@@ -1,2070 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Address, Data, Hash, Quantity, BlockNumber, TransactionRequest, TransactionResponse } from '../types';
-import { fromDecimal, withComment, Dummy } from '../helpers';
-
-const SECTION_ACCOUNTS = 'Accounts (read-only) and Signatures';
-const SECTION_DEV = 'Development';
-const SECTION_MINING = 'Block Authoring (aka "mining")';
-const SECTION_NET = 'Network Information';
-const SECTION_NODE = 'Node Settings';
-const SECTION_VAULT = 'Account Vaults';
-
-const SUBDOC_SET = 'set';
-const SUBDOC_ACCOUNTS = 'accounts';
-const SUBDOC_PUBSUB = 'pubsub';
-
-export default {
-  accountsInfo: {
-    section: SECTION_ACCOUNTS,
-    desc: 'Provides metadata for accounts.',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'Maps account address to metadata.',
-      details: {
-        name: {
-          type: String,
-          desc: 'Account name'
-        }
-      },
-      example: {
-        '0x0024d0c7ab4c52f723f3aaf0872b9ea4406846a4': {
-          name: 'Foo'
-        },
-        '0x004385d8be6140e6f889833f68b51e17b6eacb29': {
-          name: 'Bar'
-        },
-        '0x009047ed78fa2be48b62aaf095b64094c934dab0': {
-          name: 'Baz'
-        }
-      }
-    }
-  },
-
-  chainStatus: {
-    section: SECTION_NET,
-    desc: 'Returns the information on warp sync blocks',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'The status object',
-      details: {
-        blockGap: {
-          type: Array,
-          desc: 'Describes the gap in the blockchain, if there is one: (first, last)',
-          optional: true
-        }
-      }
-    }
-  },
-
-  changeVault: {
-    section: SECTION_VAULT,
-    desc: 'Changes the current valut for the account',
-    params: [
-      {
-        type: Address,
-        desc: 'Account address',
-        example: '0x63Cf90D3f0410092FC0fca41846f596223979195'
-      },
-      {
-        type: String,
-        desc: 'Vault name',
-        example: 'StrongVault'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'True on success',
-      example: true
-    }
-  },
-
-  changeVaultPassword: {
-    section: SECTION_VAULT,
-    desc: 'Changes the password for any given vault',
-    params: [
-      {
-        type: String,
-        desc: 'Vault name',
-        example: 'StrongVault'
-      },
-      {
-        type: String,
-        desc: 'New Password',
-        example: 'p@55w0rd'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'True on success',
-      example: true
-    }
-  },
-
-  closeVault: {
-    section: SECTION_VAULT,
-    desc: 'Closes a vault with the given name',
-    params: [
-      {
-        type: String,
-        desc: 'Vault name',
-        example: 'StrongVault'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'True on success',
-      example: true
-    }
-  },
-
-  consensusCapability: {
-    desc: 'Returns information on current consensus capability.',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'or `String` - Either `"capable"`, `{"capableUntil":N}`, `{"incapableSince":N}` or `"unknown"` (`N` is a block number).',
-      example: 'capable'
-    }
-  },
-
-  dappsList: {
-    subdoc: SUBDOC_SET,
-    desc: 'Returns a list of available local dapps.',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'The list of dapps',
-      example: [
-        {
-          author: 'Parity Technologies Ltd',
-          description: 'A skeleton dapp',
-          iconUrl: 'title.png',
-          id: 'skeleton',
-          name: 'Skeleton',
-          version: '0.1'
-        }
-      ]
-    }
-  },
-
-  dappsRefresh: {
-    subdoc: SUBDOC_SET,
-    desc: 'Returns a boolean value upon success and error upon failure',
-    params: [],
-    returns: {
-      type: Boolean,
-      desc: 'True for success. error details for failure',
-      example: true
-    }
-  },
-
-  dappsUrl: {
-    section: SECTION_NODE,
-    desc: 'Returns the hostname and the port of dapps/rpc server, error if not enabled.',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'The hostname and port number',
-      example: 'localhost:8545'
-    }
-  },
-
-  defaultAccount: {
-    section: SECTION_ACCOUNTS,
-    desc: 'Returns the defaultAccount that is to be used with transactions',
-    params: [],
-    returns: {
-      type: Address,
-      desc: 'The account address',
-      example: '0x63Cf90D3f0410092FC0fca41846f596223979195'
-    }
-  },
-
-  defaultExtraData: {
-    section: SECTION_MINING,
-    desc: 'Returns the default extra data',
-    params: [],
-    returns: {
-      type: Data,
-      desc: 'Extra data',
-      example: '0xd5830106008650617269747986312e31342e30826c69'
-    }
-  },
-
-  devLogs: {
-    section: SECTION_DEV,
-    desc: 'Returns latest stdout logs of your node.',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'Development logs',
-      example: [
-        '2017-01-20 18:14:19  Updated conversion rate to Ξ1 = US$10.63 (11199212000 wei/gas)',
-        '2017-01-20 18:14:19  Configured for DevelopmentChain using InstantSeal engine',
-        '2017-01-20 18:14:19  Operating mode: active',
-        '2017-01-20 18:14:19  State DB configuration: fast',
-        '2017-01-20 18:14:19  Starting Parity/v1.7.0-unstable-2ae8b4c-20170120/x86_64-linux-gnu/rustc1.14.0'
-      ]
-    }
-  },
-
-  devLogsLevels: {
-    section: SECTION_DEV,
-    desc: 'Returns current logging level settings. Logging level can be set with `--logging` and be one of: `""` (default), `"info"`, `"debug"`, `"warn"`, `"error"`, `"trace"`.',
-    params: [],
-    returns: {
-      type: String,
-      decs: 'Current log level.',
-      example: 'debug'
-    }
-  },
-
-  enode: {
-    section: SECTION_NODE,
-    desc: 'Returns the node enode URI.',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'Enode URI',
-      example: 'enode://050929adcfe47dbe0b002cb7ef2bf91ca74f77c4e0f68730e39e717f1ce38908542369ae017148bee4e0d968340885e2ad5adea4acd19c95055080a4b625df6a@172.17.0.1:30303'
-    }
-  },
-
-  extraData: {
-    section: SECTION_MINING,
-    desc: 'Returns currently set extra data.',
-    params: [],
-    returns: {
-      type: Data,
-      desc: 'Extra data.',
-      example: '0xd5830106008650617269747986312e31342e30826c69'
-    }
-  },
-
-  gasFloorTarget: {
-    section: SECTION_MINING,
-    desc: 'Returns current target for gas floor.',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'Gas floor target.',
-      format: 'outputBigNumberFormatter',
-      example: fromDecimal(4700000)
-    }
-  },
-
-  gasCeilTarget: {
-    section: SECTION_MINING,
-    desc: 'Returns current target for gas ceiling.',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'Gas ceiling target.',
-      format: 'outputBigNumberFormatter',
-      example: fromDecimal(6283184)
-    }
-  },
-
-  gasPriceHistogram: {
-    section: SECTION_NET,
-    desc: 'Returns a snapshot of the historic gas prices.',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'Historic values',
-      details: {
-        bucketBounds: {
-          type: Array,
-          desc: 'Array of bound values.'
-        },
-        count: {
-          type: Array,
-          desc: 'Array of counts.'
-        }
-      },
-      example: {
-        bucketBounds: ['0x4a817c800', '0x525433d01', '0x5a26eb202', '0x61f9a2703', '0x69cc59c04', '0x719f11105', '0x7971c8606', '0x81447fb07', '0x891737008', '0x90e9ee509', '0x98bca5a0a'],
-        counts: [487, 9, 7, 1, 8, 0, 0, 0, 0, 14]
-      }
-    }
-  },
-
-  generateSecretPhrase: {
-    section: SECTION_ACCOUNTS,
-    desc: 'Creates a secret phrase that can be associated with an account.',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'The secret phrase.',
-      example: 'boasting breeches reshape reputably exit handrail stony jargon moneywise unhinge handed ruby'
-    }
-  },
-
-  getVaultMeta: {
-    section: SECTION_VAULT,
-    desc: 'Returns the metadata for a specific vault',
-    params: [
-      {
-        type: String,
-        desc: 'Vault name',
-        example: 'StrongVault'
-      }
-    ],
-    returns: {
-      type: String,
-      desc: 'The associated JSON metadata for this vault',
-      example: '{"passwordHint":"something"}'
-    }
-  },
-
-  hardwareAccountsInfo: {
-    section: SECTION_ACCOUNTS,
-    desc: 'Provides metadata for attached hardware wallets',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'Maps account address to metadata.',
-      details: {
-        manufacturer: {
-          type: String,
-          desc: 'Manufacturer'
-        },
-        name: {
-          type: String,
-          desc: 'Account name'
-        }
-      },
-      example: {
-        '0x0024d0c7ab4c52f723f3aaf0872b9ea4406846a4': {
-          manufacturer: 'Ledger',
-          name: 'Nano S'
-        }
-      }
-    }
-  },
-
-  listOpenedVaults: {
-    desc: 'Returns a list of all opened vaults',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'Names of all opened vaults',
-      example: "['Personal']"
-    }
-  },
-
-  listVaults: {
-    desc: 'Returns a list of all available vaults',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'Names of all available vaults',
-      example: "['Personal','Work']"
-    }
-  },
-
-  localTransactions: {
-    desc: 'Returns an object of current and past local transactions.',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'Mapping of transaction hashes to status objects status object.',
-      example: {
-        '0x09e64eb1ae32bb9ac415ce4ddb3dbad860af72d9377bb5f073c9628ab413c532': {
-          status: 'mined',
-          transaction: {
-            from: '0x00a329c0648769a73afac7f9381e08fb43dbea72',
-            to: '0x00a289b43e1e4825dbedf2a78ba60a640634dc40',
-            value: '0xfffff',
-            blockHash: null,
-            blockNumber: null,
-            creates: null,
-            gas: '0xe57e0',
-            gasPrice: '0x2d20cff33',
-            hash: '0x09e64eb1ae32bb9ac415ce4ddb3dbad860af72d9377bb5f073c9628ab413c532',
-            input: '0x',
-            condition: {
-              block: 1
-            },
-            chainId: null,
-            nonce: '0x0',
-            publicKey: '0x3fa8c08c65a83f6b4ea3e04e1cc70cbe3cd391499e3e05ab7dedf28aff9afc538200ff93e3f2b2cb5029f03c7ebee820d63a4c5a9541c83acebe293f54cacf0e',
-            raw: '0xf868808502d20cff33830e57e09400a289b43e1e4825dbedf2a78ba60a640634dc40830fffff801ca034c333b0b91cd832a3414d628e3fea29a00055cebf5ba59f7038c188404c0cf3a0524fd9b35be170439b5ffe89694ae0cfc553cb49d1d8b643239e353351531532',
-            standardV: '0x1',
-            v: '0x1c',
-            r: '0x34c333b0b91cd832a3414d628e3fea29a00055cebf5ba59f7038c188404c0cf3',
-            s: '0x524fd9b35be170439b5ffe89694ae0cfc553cb49d1d8b643239e353351531532',
-            transactionIndex: null
-          }
-        },
-        '0x...': new Dummy('{ ... }')
-      }
-    }
-  },
-
-  minGasPrice: {
-    section: SECTION_MINING,
-    desc: 'Returns currently set minimal gas price',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'Minimal Gas Price',
-      format: 'outputBigNumberFormatter',
-      example: fromDecimal(11262783488)
-    }
-  },
-
-  mode: {
-    section: SECTION_NODE,
-    desc: 'Get the mode. Results one of: `"active"`, `"passive"`, `"dark"`, `"offline"`.',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'The mode.',
-      example: 'active'
-    }
-  },
-
-  nodeKind: {
-    section: SECTION_NODE,
-    desc: 'Returns the node type availability and capability',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'Availability and Capability.',
-      details: {
-        availability: {
-          type: String,
-          desc: 'Availability, either `personal` or `public`.'
-        },
-        capability: {
-          type: String,
-          desc: 'Capability, either `full` or `light`.'
-        }
-      },
-      example: {
-        availability: 'personal',
-        capability: 'light'
-      }
-    }
-  },
-
-  netChain: {
-    section: SECTION_NET,
-    desc: 'Returns the name of the connected chain. DEPRECATED use `parity_chain` instead.',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'chain name.',
-      example: 'homestead'
-    }
-  },
-
-  chain: {
-    section: SECTION_NET,
-    desc: 'Returns the name of the connected chain. ',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'chain name, one of: "foundation", "kovan", &c. of a filename.',
-      example: 'homestead'
-    }
-  },
-
-  netPeers: {
-    section: SECTION_NET,
-    desc: 'Returns number of peers.',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'Number of peers',
-      details: {
-        active: {
-          type: Quantity,
-          desc: 'Number of active peers.'
-        },
-        connected: {
-          type: Quantity,
-          desc: 'Number of connected peers.'
-        },
-        max: {
-          type: Quantity,
-          desc: 'Maximum number of connected peers.'
-        },
-        peers: {
-          type: Array,
-          desc: 'List of all peers with details.'
-        }
-      },
-      example: {
-        active: 0,
-        connected: 25,
-        max: 25,
-        peers: [new Dummy('{ ... }, { ... }, { ... }, ...')]
-      }
-    }
-  },
-
-  netPort: {
-    section: SECTION_NET,
-    desc: 'Returns network port the node is listening on.',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'Port number',
-      example: 30303
-    }
-  },
-
-  newVault: {
-    section: SECTION_VAULT,
-    desc: 'Creates a new vault with the given name & password',
-    params: [
-      {
-        type: String,
-        desc: 'Vault name',
-        example: 'StrongVault'
-      },
-      {
-        type: String,
-        desc: 'Password',
-        example: 'p@55w0rd'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'True on success',
-      example: true
-    }
-  },
-
-  nextNonce: {
-    section: SECTION_NET,
-    desc: 'Returns next available nonce for transaction from given account. Includes pending block and transaction queue.',
-    params: [
-      {
-        type: Address,
-        desc: 'Account',
-        example: '0x00A289B43e1e4825DbEDF2a78ba60a640634DC40'
-      }
-    ],
-    returns: {
-      type: Quantity,
-      desc: 'Next valid nonce',
-      example: fromDecimal(12)
-    }
-  },
-
-  nodeName: {
-    section: SECTION_NODE,
-    desc: 'Returns node name, set when starting parity with `--identity NAME`.',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'Node name.',
-      example: 'Doge'
-    }
-  },
-
-  openVault: {
-    section: SECTION_VAULT,
-    desc: 'Opens a vault with the given name & password',
-    params: [
-      {
-        type: String,
-        desc: 'Vault name',
-        example: 'StrongVault'
-      },
-      {
-        type: String,
-        desc: 'Password',
-        example: 'p@55w0rd'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'True on success',
-      example: true
-    }
-  },
-
-  pendingTransactions: {
-    section: SECTION_NET,
-    desc: 'Returns a list of transactions currently in the queue.',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'Transactions ordered by priority',
-      details: TransactionResponse.details,
-      example: [
-        {
-          blockHash: null,
-          blockNumber: null,
-          creates: null,
-          from: '0xee3ea02840129123d5397f91be0391283a25bc7d',
-          gas: '0x23b58',
-          gasPrice: '0xba43b7400',
-          hash: '0x160b3c30ab1cf5871083f97ee1cee3901cfba3b0a2258eb337dd20a7e816b36e',
-          input: '0x095ea7b3000000000000000000000000bf4ed7b27f1d666546e30d74d50d173d20bca75400000000000000000000000000002643c948210b4bd99244ccd64d5555555555',
-          condition: {
-            block: 1
-          },
-          chainId: 1,
-          nonce: '0x5',
-          publicKey: '0x96157302dade55a1178581333e57d60ffe6fdf5a99607890456a578b4e6b60e335037d61ed58aa4180f9fd747dc50d44a7924aa026acbfb988b5062b629d6c36',
-          r: '0x92e8beb19af2bad0511d516a86e77fa73004c0811b2173657a55797bdf8558e1',
-          raw: '0xf8aa05850ba43b740083023b5894bb9bc244d798123fde783fcc1c72d3bb8c18941380b844095ea7b3000000000000000000000000bf4ed7b27f1d666546e30d74d50d173d20bca75400000000000000000000000000002643c948210b4bd99244ccd64d555555555526a092e8beb19af2bad0511d516a86e77fa73004c0811b2173657a55797bdf8558e1a062b4d4d125bbcb9c162453bc36ca156537543bb4414d59d1805d37fb63b351b8',
-          s: '0x62b4d4d125bbcb9c162453bc36ca156537543bb4414d59d1805d37fb63b351b8',
-          standardV: '0x1',
-          to: '0xbb9bc244d798123fde783fcc1c72d3bb8c189413',
-          transactionIndex: null,
-          v: '0x26',
-          value: '0x0'
-        },
-        new Dummy('{ ... }'),
-        new Dummy('{ ... }')
-      ]
-    }
-  },
-
-  pendingTransactionsStats: {
-    section: SECTION_NET,
-    desc: 'Returns propagation stats for transactions in the queue.',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'mapping of transaction hashes to stats.',
-      example: {
-        '0xdff37270050bcfba242116c745885ce2656094b2d3a0f855649b4a0ee9b5d15a': {
-          firstSeen: 3032066,
-          propagatedTo: {
-            '0x605e04a43b1156966b3a3b66b980c87b7f18522f7f712035f84576016be909a2798a438b2b17b1a8c58db314d88539a77419ca4be36148c086900fba487c9d39': 1,
-            '0xbab827781c852ecf52e7c8bf89b806756329f8cbf8d3d011e744a0bc5e3a0b0e1095257af854f3a8415ebe71af11b0c537f8ba797b25972f519e75339d6d1864': 1
-          }
-        }
-      }
-    }
-  },
-
-  removeTransaction: {
-    section: SECTION_NET,
-    desc: 'Removes transaction from local transaction pool. Scheduled transactions and not-propagated transactions are safe to remove, removal of other transactions may have no effect though.',
-    params: [{
-      type: Hash,
-      desc: 'Hash of transaction to remove.',
-      example: '0x2547ea3382099c7c76d33dd468063b32d41016aacb02cbd51ebc14ff5d2b6a43'
-    }],
-    returns: {
-      type: Object,
-      desc: 'Removed transaction or `null`.',
-      details: TransactionResponse.details,
-      example: [
-        {
-          blockHash: null,
-          blockNumber: null,
-          creates: null,
-          from: '0xee3ea02840129123d5397f91be0391283a25bc7d',
-          gas: '0x23b58',
-          gasPrice: '0xba43b7400',
-          hash: '0x160b3c30ab1cf5871083f97ee1cee3901cfba3b0a2258eb337dd20a7e816b36e',
-          input: '0x095ea7b3000000000000000000000000bf4ed7b27f1d666546e30d74d50d173d20bca75400000000000000000000000000002643c948210b4bd99244ccd64d5555555555',
-          condition: {
-            block: 1
-          },
-          chainId: 1,
-          nonce: '0x5',
-          publicKey: '0x96157302dade55a1178581333e57d60ffe6fdf5a99607890456a578b4e6b60e335037d61ed58aa4180f9fd747dc50d44a7924aa026acbfb988b5062b629d6c36',
-          r: '0x92e8beb19af2bad0511d516a86e77fa73004c0811b2173657a55797bdf8558e1',
-          raw: '0xf8aa05850ba43b740083023b5894bb9bc244d798123fde783fcc1c72d3bb8c18941380b844095ea7b3000000000000000000000000bf4ed7b27f1d666546e30d74d50d173d20bca75400000000000000000000000000002643c948210b4bd99244ccd64d555555555526a092e8beb19af2bad0511d516a86e77fa73004c0811b2173657a55797bdf8558e1a062b4d4d125bbcb9c162453bc36ca156537543bb4414d59d1805d37fb63b351b8',
-          s: '0x62b4d4d125bbcb9c162453bc36ca156537543bb4414d59d1805d37fb63b351b8',
-          standardV: '0x1',
-          to: '0xbb9bc244d798123fde783fcc1c72d3bb8c189413',
-          transactionIndex: null,
-          v: '0x26',
-          value: '0x0'
-        },
-        new Dummy('{ ... }'),
-        new Dummy('{ ... }')
-      ]
-    }
-  },
-
-  phraseToAddress: {
-    section: SECTION_ACCOUNTS,
-    desc: 'Converts a secret phrase into the corresponding address.',
-    params: [
-      {
-        type: String,
-        desc: 'The phrase',
-        example: 'stylus outing overhand dime radial seducing harmless uselessly evasive tastiness eradicate imperfect'
-      }
-    ],
-    returns: {
-      type: Address,
-      desc: 'Corresponding address',
-      example: '0x004385d8be6140e6f889833f68b51e17b6eacb29'
-    }
-  },
-
-  releasesInfo: {
-    desc: 'returns a ReleasesInfo object describing the current status of releases',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'Information on current releases, `null` if not available.',
-      details: {
-        fork: {
-          type: Quantity,
-          desc: 'Block number representing the last known fork for this chain, which may be in the future.'
-        },
-        minor: {
-          type: Object,
-          desc: 'Information about latest minor update to current version, `null` if this is the latest minor version.'
-        },
-        track: {
-          type: Object,
-          desc: 'Information about the latest release in this track.'
-        }
-      },
-      example: null
-    }
-  },
-
-  registryAddress: {
-    section: SECTION_NET,
-    desc: 'The address for the global registry.',
-    params: [],
-    returns: {
-      type: Address,
-      desc: 'The registry address.',
-      example: '0x3bb2bb5c6c9c9b7f4ef430b47dc7e026310042ea'
-    }
-  },
-
-  rpcSettings: {
-    section: SECTION_NET,
-    desc: 'Provides current JSON-RPC API settings.',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'JSON-RPC settings.',
-      details: {
-        enabled: {
-          type: Boolean,
-          desc: '`true` if JSON-RPC is enabled (default).'
-        },
-        interface: {
-          type: String,
-          desc: 'Interface on which JSON-RPC is running.'
-        },
-        port: {
-          type: Quantity,
-          desc: 'Port on which JSON-RPC is running.'
-        }
-      },
-      example: {
-        enabled: true,
-        interface: 'local',
-        port: 8545
-      }
-    }
-  },
-
-  setVaultMeta: {
-    section: SECTION_VAULT,
-    desc: 'Sets the metadata for a specific vault',
-    params: [
-      {
-        type: String,
-        desc: 'Vault name',
-        example: 'StrongVault'
-      },
-      {
-        type: String,
-        desc: 'The metadata as a JSON string',
-        example: '{"passwordHint":"something"}'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'The boolean call result, true on success',
-      example: true
-    }
-  },
-
-  transactionsLimit: {
-    section: SECTION_MINING,
-    desc: 'Changes limit for transactions in queue.',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'Current max number of transactions in queue.',
-      format: 'outputBigNumberFormatter',
-      example: 1024
-    }
-  },
-
-  unsignedTransactionsCount: {
-    section: SECTION_NET,
-    desc: 'Returns number of unsigned transactions when running with Trusted Signer. Error otherwise',
-    params: [],
-    returns: {
-      type: Quantity,
-      desc: 'Number of unsigned transactions',
-      example: 0
-    }
-  },
-
-  versionInfo: {
-    desc: 'Provides information about running version of Parity.',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'Information on current version.',
-      details: {
-        hash: {
-          type: Hash,
-          desc: '20 Byte hash of the current build.'
-        },
-        track: {
-          type: String,
-          desc: 'Track on which it was released, one of: `"stable"`, `"beta"`, `"nightly"`, `"testing"`, `"null"` (unknown or self-built).'
-        },
-        version: {
-          type: Object,
-          desc: 'Version number composed of `major`, `minor` and `patch` integers.'
-        }
-      },
-      example: {
-        hash: '0x2ae8b4ca278dd7b896090366615fef81cbbbc0e0',
-        track: 'null',
-        version: {
-          major: 1,
-          minor: 6,
-          patch: 0
-        }
-      }
-    }
-  },
-
-  listAccounts: {
-    desc: 'Returns all addresses if Fat DB is enabled (`--fat-db`), `null` otherwise.',
-    section: SECTION_ACCOUNTS,
-    params: [
-      {
-        type: Quantity,
-        desc: 'Integer number of addresses to display in a batch.',
-        example: 5
-      },
-      {
-        type: Address,
-        desc: '20 Bytes - Offset address from which the batch should start in order, or `null`.',
-        example: null
-      },
-      {
-        type: BlockNumber,
-        desc: 'integer block number, or the string `\'latest\'`, `\'earliest\'` or `\'pending\'`.',
-        format: 'inputDefaultBlockNumberFormatter',
-        optional: true
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'Requested number of `Address`es or `null` if Fat DB is not enabled.',
-      example: [
-        '0x7205b1bb42edce6e0ced37d1fd0a9d684f5a860f',
-        '0x98a2559a814c300b274325c92df1682ae0d344e3',
-        '0x2d7a7d0adf9c5f9073fefbdc18188bd23c68b633',
-        '0xd4bb3284201db8b03c06d8a3057dd32538e3dfda',
-        '0xa6396904b08aa31300ca54278b8e066ecc38e4a0'
-      ]
-    }
-  },
-
-  listStorageKeys: {
-    desc: 'Returns all storage keys of the given address (first parameter) if Fat DB is enabled (`--fat-db`), `null` otherwise.',
-    params: [
-      {
-        type: Address,
-        desc: '20 Bytes - Account for which to retrieve the storage keys.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: Quantity,
-        desc: 'Integer number of addresses to display in a batch.',
-        example: 5
-      },
-      {
-        type: Hash,
-        desc: '32 Bytes - Offset storage key from which the batch should start in order, or `null`.',
-        example: null
-      },
-      {
-        type: BlockNumber,
-        desc: 'integer block number, or the string `\'latest\'`, `\'earliest\'` or `\'pending\'`.',
-        format: 'inputDefaultBlockNumberFormatter',
-        optional: true
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'Requested number of 32 byte long storage keys for the given account or `null` if Fat DB is not enabled.',
-      example: [
-        '0xaab1a2940583e213f1d57a3ed358d5f5406177c8ff3c94516bfef3ea62d00c22',
-        '0xba8469eca5641b186e86cbc5343dfa5352df04feb4564cd3cf784f213aaa0319',
-        '0x769d107ba778d90205d7a159e820c41c20bf0783927b426c602561e74b7060e5',
-        '0x0289865bcaa58f7f5bf875495ac7af81e3630eb88a3a0358407c7051a850624a',
-        '0x32e0536502b9163b0a1ce6e3aabd95fa4a2bf602bbde1b9118015648a7a51178'
-      ]
-    }
-  },
-
-  encryptMessage: {
-    desc: 'Encrypt some data with a public key under ECIES.',
-    params: [
-      {
-        type: Hash,
-        desc: 'Public EC key generated with `secp256k1` curve, truncated to the last 64 bytes.',
-        example: '0xD219959D466D666060284733A80DDF025529FEAA8337169540B3267B8763652A13D878C40830DD0952639A65986DBEC611CF2171A03CFDC37F5A40537068AA4F'
-      },
-      {
-        type: Data,
-        desc: 'The message to encrypt.',
-        example: withComment('0x68656c6c6f20776f726c64', '"hello world"')
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: 'Encrypted message.',
-      example: '0x0491debeec5e874a453f84114c084c810708ebcb553b02f1b8c05511fa4d1a25fa38eb49a32c815e2b39b7bcd56d66648bf401067f15413dae683084ca7b01e21df89be9ec4bc6c762a657dbd3ba1540f557e366681b53629bb2c02e1443b5c0adc6b68f3442c879456d6a21ec9ed07847fa3c3ecb73ec7ee9f8e32d'
-    }
-  },
-
-  futureTransactions: {
-    desc: 'Returns all future transactions from transaction queue.',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'Transaction list.',
-      details: TransactionResponse.details,
-      example: [
-        {
-          hash: '0x80de421cd2e7e46824a91c343ca42b2ff339409eef09e2d9d73882462f8fce31',
-          nonce: '0x1',
-          blockHash: null,
-          blockNumber: null,
-          transactionIndex: null,
-          from: '0xe53e478c072265e2d9a99a4301346700c5fbb406',
-          to: '0xf5d405530dabfbd0c1cab7a5812f008aa5559adf',
-          value: '0x2efc004ac03a4996',
-          gasPrice: '0x4a817c800',
-          gas: '0x5208',
-          input: '0x',
-          creates: null,
-          raw: '0xf86c018504a817c80082520894f5d405530dabfbd0c1cab7a5812f008aa5559adf882efc004ac03a49968025a0b40c6967a7e8bbdfd99a25fd306b9ef23b80e719514aeb7ddd19e2303d6fc139a06bf770ab08119e67dc29817e1412a0e3086f43da308c314db1b3bca9fb6d32bd',
-          publicKey: '0xeba33fd74f06236e17475bc5b6d1bac718eac048350d77d3fc8fbcbd85782a57c821255623c4fd1ebc9d555d07df453b2579ee557b7203fc256ca3b3401e4027',
-          chainId: 1,
-          standardV: '0x0',
-          v: '0x25',
-          r: '0xb40c6967a7e8bbdfd99a25fd306b9ef23b80e719514aeb7ddd19e2303d6fc139',
-          s: '0x6bf770ab08119e67dc29817e1412a0e3086f43da308c314db1b3bca9fb6d32bd',
-          condition: {
-            block: 1
-          }
-        },
-        new Dummy('{ ... }, { ... }, ...')
-      ]
-    }
-  },
-
-  /*
-   * `parity_accounts` module methods
-   * ================================
-   */
-  allAccountsInfo: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'returns a map of accounts as an object.',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'Account metadata.',
-      details: {
-        name: {
-          type: String,
-          desc: 'Account name.'
-        },
-        meta: {
-          type: String,
-          desc: 'Encoded JSON string the defines additional account metadata.'
-        },
-        uuid: {
-          type: String,
-          desc: 'The account Uuid, or `null` if not available/unknown/not applicable.'
-        }
-      },
-      example: {
-        '0x00a289b43e1e4825dbedf2a78ba60a640634dc40': {
-          meta: '{}',
-          name: 'Foobar',
-          uuid: '0b9e70e6-235b-682d-a15c-2a98c71b3945'
-        }
-      }
-    }
-  },
-
-  newAccountFromPhrase: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Creates a new account from a recovery phrase.',
-    params: [
-      {
-        type: String,
-        desc: 'Recovery phrase.',
-        example: 'stylus outing overhand dime radial seducing harmless uselessly evasive tastiness eradicate imperfect'
-      },
-      {
-        type: String,
-        desc: 'Password.',
-        example: 'hunter2'
-      }
-    ],
-    returns: {
-      type: Address,
-      desc: 'The created address.',
-      example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-    }
-  },
-
-  newAccountFromSecret: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Creates a new account from a private ethstore secret key.',
-    params: [
-      {
-        type: Data,
-        desc: 'Secret, 32-byte hex',
-        example: '0x1db2c0cf57505d0f4a3d589414f0a0025ca97421d2cd596a9486bc7e2cd2bf8b'
-      },
-      {
-        type: String,
-        desc: 'Password',
-        example: 'hunter2'
-      }
-    ],
-    returns: {
-      type: Address,
-      desc: 'The created address.',
-      example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-    }
-  },
-
-  newAccountFromWallet: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Creates a new account from a JSON import',
-    params: [
-      {
-        type: String,
-        desc: 'Wallet JSON encoded to a string.',
-        example: '{"id": "9c62e86b-3cf9...", ...}'
-      },
-      {
-        type: String,
-        desc: 'Password.',
-        example: 'hunter2'
-      }
-    ],
-    returns: {
-      type: Address,
-      desc: 'The created address',
-      example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-    }
-  },
-
-  setAccountName: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Sets a name for the account',
-    params: [
-      {
-        type: Address,
-        desc: 'Address',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: String,
-        desc: 'Name',
-        example: 'Foobar'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful.',
-      example: true
-    }
-  },
-
-  setAccountMeta: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Sets metadata for the account',
-    params: [
-      {
-        type: Address,
-        desc: 'Address',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: String,
-        desc: 'Metadata (JSON encoded)',
-        example: '{"foo":"bar"}'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful.',
-      example: true
-    }
-  },
-
-  testPassword: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Checks if a given password can unlock a given account, without actually unlocking it.',
-    params: [
-      {
-        type: Address,
-        desc: 'Account to test.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: String,
-        desc: 'Password to test.',
-        example: 'hunter2'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the account and password are valid.',
-      example: true
-    }
-  },
-
-  changePassword: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Change the password for a given account.',
-    params: [
-      {
-        type: Address,
-        desc: 'Address of the account.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: String,
-        desc: 'Old password.',
-        example: 'hunter2'
-      },
-      {
-        type: String,
-        desc: 'New password.',
-        example: 'bazqux5'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful.',
-      example: true
-    }
-  },
-
-  killAccount: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Deletes an account.',
-    params: [
-      {
-        type: Address,
-        desc: 'The account to remove.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: String,
-        desc: 'Account password.',
-        example: 'hunter2'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful.',
-      example: true
-    }
-  },
-
-  removeAddress: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Removes an address from the addressbook.',
-    params: [
-      {
-        type: Address,
-        desc: 'The address to remove.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true`if the call was successful.',
-      example: true
-    }
-  },
-
-  setDappAddresses: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Sets the available addresses for a dapp. When provided with non-empty list changes the default account as well.',
-    params: [
-      {
-        type: String,
-        desc: 'Dapp Id.',
-        example: 'web'
-      },
-      {
-        type: Array,
-        desc: 'Array of available accounts available to the dapp or `null` for default list.',
-        example: ['0x407d73d8a49eeb85d32cf465507dd71d507100c1']
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful.',
-      example: true
-    }
-  },
-
-  getDappAddresses: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Returns the list of accounts available to a specific dapp.',
-    params: [
-      {
-        type: String,
-        desc: 'Dapp Id.',
-        example: 'web'
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'The list of available accounts.',
-      example: ['0x407d73d8a49eeb85d32cf465507dd71d507100c1']
-    }
-  },
-
-  setDappDefaultAddress: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Changes dapp default address. Does not affect other accounts exposed for this dapp, but default account will always be retured as the first one.',
-    params: [
-      {
-        type: String,
-        desc: 'Dapp Id.',
-        example: 'web'
-      },
-      {
-        type: Address,
-        desc: 'Default Address.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful',
-      example: true
-    }
-  },
-
-  getDappDefaultAddress: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Returns a default account available to a specific dapp.',
-    params: [
-      {
-        type: String,
-        desc: 'Dapp Id.',
-        example: 'web'
-      }
-    ],
-    returns: {
-      type: Address,
-      desc: 'Default Address',
-      example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-    }
-  },
-
-  setNewDappsAddresses: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Sets the list of accounts available to new dapps.',
-    params: [
-      {
-        type: Array,
-        desc: 'List of accounts available by default or `null` for all accounts.',
-        example: ['0x407d73d8a49eeb85d32cf465507dd71d507100c1']
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful',
-      example: true
-    }
-  },
-
-  getNewDappsAddresses: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Returns the list of accounts available to a new dapps.',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'The list of available accounts, can be `null`.',
-      example: ['0x407d73d8a49eeb85d32cf465507dd71d507100c1']
-    }
-  },
-
-  setNewDappsDefaultAddress: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Changes global default address. This setting may be overriden for a specific dapp.',
-    params: [
-      {
-        type: Address,
-        desc: 'Default Address.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful',
-      example: true
-    }
-  },
-
-  getNewDappsDefaultAddress: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Returns a default account available to dapps.',
-    params: [],
-    returns: {
-      type: Address,
-      desc: 'Default Address',
-      example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-    }
-  },
-
-  listRecentDapps: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Returns a list of the most recent active dapps.',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'Array of Dapp Ids.',
-      example: ['web']
-    }
-  },
-
-  importGethAccounts: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Imports a list of accounts from Geth.',
-    params: [
-      {
-        type: Array,
-        desc: 'List of the Geth addresses to import.',
-        example: ['0x407d73d8a49eeb85d32cf465507dd71d507100c1']
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'Array of the imported addresses.',
-      example: ['0x407d73d8a49eeb85d32cf465507dd71d507100c1']
-    }
-  },
-
-  listGethAccounts: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Returns a list of the accounts available from Geth.',
-    params: [],
-    returns: {
-      type: Array,
-      desc: '20 Bytes addresses owned by the client.',
-      example: ['0x407d73d8a49eeb85d32cf465507dd71d507100c1']
-    }
-  },
-
-  deriveAddressHash: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Derive new address from given account address using specific hash.',
-    params: [
-      {
-        type: Address,
-        desc: 'Account address to derive from.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: String,
-        desc: 'Password to the account.',
-        example: 'hunter2'
-      },
-      {
-        type: Object,
-        desc: 'Derivation hash and type (`soft` or `hard`). E.g. `{ hash: "0x123..123", type: "hard" }`.',
-        example: {
-          hash: '0x2547ea3382099c7c76d33dd468063b32d41016aacb02cbd51ebc14ff5d2b6a43',
-          type: 'hard'
-        }
-      },
-      {
-        type: Boolean,
-        desc: 'Flag indicating if the account should be saved.',
-        example: false
-      }
-    ],
-    returns: {
-      type: Address,
-      desc: '20 Bytes new derived address.',
-      example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-    }
-  },
-
-  deriveAddressIndex: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Derive new address from given account address using hierarchical derivation (sequence of 32-bit integer indices).',
-    params: [
-      {
-        type: Address,
-        desc: 'Account address to export.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: String,
-        desc: 'Password to the account.',
-        example: 'hunter2'
-      },
-      {
-        type: Array,
-        desc: 'Hierarchical derivation sequence of index and type (`soft` or `hard`). E.g. `[{index:1,type:"hard"},{index:2,type:"soft"}]`.',
-        example: [
-          { index: 1, type: 'hard' },
-          { index: 2, type: 'soft' }
-        ]
-      },
-      {
-        type: Boolean,
-        desc: 'Flag indicating if the account should be saved.',
-        example: false
-      }
-    ],
-    returns: {
-      type: Address,
-      desc: '20 Bytes new derived address.',
-      example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-    }
-  },
-
-  exportAccount: {
-    subdoc: SUBDOC_ACCOUNTS,
-    desc: 'Returns a standard wallet file for given account if password matches.',
-    params: [
-      {
-        type: Address,
-        desc: 'Account address to export.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: String,
-        desc: 'Password to the account.',
-        example: 'hunter2'
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'Standard wallet JSON.',
-      example: {
-        'address': '0042e5d2a662eeaca8a7e828c174f98f35d8925b',
-        'crypto': {
-          'cipher': 'aes-128-ctr',
-          'cipherparams': { 'iv': 'a1c6ff99070f8032ca1c4e8add006373' },
-          'ciphertext': 'df27e3db64aa18d984b6439443f73660643c2d119a6f0fa2fa9a6456fc802d75',
-          'kdf': 'pbkdf2',
-          'kdfparams': { 'c': 10240, 'dklen': 32, 'prf': 'hmac-sha256', 'salt': 'ddc325335cda5567a1719313e73b4842511f3e4a837c9658eeb78e51ebe8c815' },
-          'mac': '3dc888ae79cbb226ff9c455669f6cf2d79be72120f2298f6cb0d444fddc0aa3d'
-        },
-        'id': '6a186c80-7797-cff2-bc2e-7c1d6a6cc76e',
-        'meta': '{"passwordHint":"parity-export-test","timestamp":1490017814987}',
-        'name': 'parity-export-test',
-        'version': 3
-      }
-    }
-  },
-
-  /*
-   * `parity_set` module methods
-   * ===========================
-   */
-  setMinGasPrice: {
-    subdoc: SUBDOC_SET,
-    desc: 'Changes minimal gas price for transaction to be accepted to the queue.',
-    params: [
-      {
-        type: Quantity,
-        desc: 'Minimal gas price',
-        format: 'utils.toHex',
-        example: fromDecimal(1000)
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful',
-      example: true
-    }
-  },
-
-  setGasFloorTarget: {
-    subdoc: SUBDOC_SET,
-    desc: 'Sets a new gas floor target for mined blocks..',
-    params: [
-      {
-        type: Quantity,
-        desc: '(default: `0x0`) Gas floor target.',
-        format: 'utils.toHex',
-        example: fromDecimal(1000)
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful.',
-      example: true
-    }
-  },
-
-  setGasCeilTarget: {
-    subdoc: SUBDOC_SET,
-    desc: 'Sets new gas ceiling target for mined blocks.',
-    params: [
-      {
-        type: Quantity,
-        desc: '(default: `0x0`) Gas ceiling target.',
-        format: 'utils.toHex',
-        example: fromDecimal(10000000000)
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful.',
-      example: true
-    }
-  },
-
-  setExtraData: {
-    subdoc: SUBDOC_SET,
-    desc: 'Changes extra data for newly mined blocks',
-    params: [
-      {
-        type: Data,
-        desc: 'Extra Data',
-        format: 'utils.toHex',
-        example: '0x'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful',
-      example: true
-    }
-  },
-
-  setAuthor: {
-    subdoc: SUBDOC_SET,
-    desc: 'Changes author (coinbase) for mined blocks.',
-    params: [
-      {
-        type: Address,
-        desc: '20 Bytes - Address',
-        format: 'inputAddressFormatter',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful.',
-      example: true
-    }
-  },
-
-  setMaxTransactionGas: {
-    subdoc: SUBDOC_SET,
-    desc: 'Sets the maximum amount of gas a single transaction may consume.',
-    params: [
-      {
-        type: Quantity,
-        desc: 'Gas amount',
-        format: 'utils.toHex',
-        example: fromDecimal(100000)
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call was successful.',
-      example: true
-    }
-  },
-
-  setTransactionsLimit: {
-    subdoc: SUBDOC_SET,
-    desc: 'Changes limit for transactions in queue.',
-    params: [
-      {
-        type: Quantity,
-        desc: 'New Limit',
-        format: 'utils.toHex',
-        example: fromDecimal(1000)
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful',
-      example: true
-    }
-  },
-
-  addReservedPeer: {
-    subdoc: SUBDOC_SET,
-    desc: 'Add a reserved peer.',
-    params: [
-      {
-        type: String,
-        desc: 'Enode address',
-        example: 'enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if successful.',
-      example: true
-    }
-  },
-
-  removeReservedPeer: {
-    subdoc: SUBDOC_SET,
-    desc: 'Remove a reserved peer.',
-    params: [
-      {
-        type: String,
-        desc: 'Encode address',
-        example: 'enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if successful.',
-      example: true
-    }
-  },
-
-  dropNonReservedPeers: {
-    subdoc: SUBDOC_SET,
-    desc: 'Set Parity to drop all non-reserved peers. To restore default behavior call [parity_acceptNonReservedPeers](#parity_acceptnonreservedpeers).',
-    params: [],
-    returns: {
-      type: Boolean,
-      desc: '`true` if successful.',
-      example: true
-    }
-  },
-
-  acceptNonReservedPeers: {
-    subdoc: SUBDOC_SET,
-    desc: 'Set Parity to accept non-reserved peers (default behavior).',
-    params: [],
-    returns: {
-      type: Boolean,
-      desc: '`true` if successful.',
-      example: true
-    }
-  },
-
-  hashContent: {
-    subdoc: SUBDOC_SET,
-    desc: 'Creates a hash of a file at a given URL.',
-    params: [
-      {
-        type: String,
-        desc: 'The url of the content.',
-        example: 'https://raw.githubusercontent.com/paritytech/parity/master/README.md'
-      }
-    ],
-    returns: {
-      type: Hash,
-      desc: 'The SHA-3 hash of the content.',
-      example: '0x2547ea3382099c7c76d33dd468063b32d41016aacb02cbd51ebc14ff5d2b6a43'
-    }
-  },
-
-  setChain: {
-    subdoc: SUBDOC_SET,
-    desc: 'Sets the network spec file Parity is using.',
-    params: [
-      {
-        type: String,
-        desc: 'Chain spec name, one of: "foundation", "ropsten", "morden", "kovan", "olympic", "classic", "dev", "expanse" or a filename.',
-        example: 'foundation'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call succeeded.',
-      example: true
-    }
-  },
-
-  setMode: {
-    subdoc: SUBDOC_SET,
-    desc: 'Changes the operating mode of Parity.',
-    params: [
-      {
-        type: String,
-        desc: 'The mode to set, one of:\n  * `"active"` - Parity continuously syncs the chain.\n  * `"passive"` - Parity syncs initially, then sleeps and wakes regularly to resync.\n  * `"dark"` - Parity syncs only when the RPC is active.\n  * `"offline"` - Parity doesn\'t sync.\n',
-        example: 'passive'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the call succeeded.',
-      example: true
-    }
-  },
-
-  setEngineSigner: {
-    subdoc: SUBDOC_SET,
-    desc: 'Sets an authority account for signing consensus messages. For more information check the [[Proof of Authority Chains]] page.',
-    params: [
-      {
-        type: Address,
-        desc: 'Identifier of a valid authority account.',
-        example: '0x407d73d8a49eeb85d32cf465507dd71d507100c1'
-      },
-      {
-        type: String,
-        desc: 'Passphrase to unlock the account.',
-        example: 'hunter2'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'True if the call succeeded',
-      example: true
-    }
-  },
-
-  upgradeReady: {
-    subdoc: SUBDOC_SET,
-    desc: 'Returns a ReleaseInfo object describing the release which is available for upgrade or `null` if none is available.',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'Details or `null` if no new release is available.',
-      details: {
-        version: {
-          type: Object,
-          desc: 'Information on the version.'
-        },
-        is_critical: {
-          type: Boolean,
-          desc: 'Does this release contain critical security updates?'
-        },
-        fork: {
-          type: Quantity,
-          desc: 'The latest fork that this release can handle.'
-        },
-        binary: {
-          type: Data,
-          desc: 'Keccak-256 checksum of the release parity binary, if known.',
-          optional: true
-        }
-      },
-      example: null
-    }
-  },
-
-  executeUpgrade: {
-    subdoc: SUBDOC_SET,
-    desc: 'Attempts to upgrade Parity to the version specified in [parity_upgradeReady](#parity_upgradeready).',
-    params: [],
-    returns: {
-      type: Boolean,
-      desc: 'returns `true` if the upgrade to the new release was successfully executed, `false` if not.',
-      example: true
-    }
-  },
-
-  /*
-   * `parity_signing` trait methods (rolled into `parity` module)
-   * ============================================================
-   */
-  postSign: {
-    section: SECTION_ACCOUNTS,
-    desc: 'Request an arbitrary transaction to be signed by an account.',
-    params: [
-      {
-        type: Address,
-        desc: 'Account address.',
-        example: '0xb60e8dd61c5d32be8058bb8eb970870f07233155'
-      },
-      {
-        type: Hash,
-        desc: 'Transaction hash.',
-        example: '0x8cda01991ae267a539135736132f1f987e76868ce0269b7537d3aab37b7b185e'
-      }
-    ],
-    returns: {
-      type: Quantity,
-      desc: 'The id of the request to the signer. If the account was already unlocked, returns `Hash` of the transaction instead.',
-      example: '0x1'
-    }
-  },
-
-  postTransaction: {
-    section: SECTION_ACCOUNTS,
-    desc: 'Posts a transaction to the signer without waiting for the signer response.',
-    params: [
-      {
-        type: TransactionRequest,
-        desc: 'see [`eth_sendTransaction`](JSONRPC-eth-module#eth_sendtransaction).',
-        format: 'inputCallFormatter',
-        example: {
-          from: '0xb60e8dd61c5d32be8058bb8eb970870f07233155',
-          to: '0xd46e8dd67c5d32be8058bb8eb970870f07244567',
-          gas: fromDecimal(30400),
-          gasPrice: fromDecimal(10000000000000),
-          value: fromDecimal(2441406250),
-          data: '0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675',
-          condition: {
-            block: 354221,
-            time: new Date()
-          }
-        }
-      }
-    ],
-    returns: {
-      type: Quantity,
-      desc: 'The id of the request to the signer. If the account was already unlocked, returns `Hash` of the transaction instead.',
-      format: 'utils.toDecimal',
-      example: '0x1'
-    }
-  },
-
-  checkRequest: {
-    section: SECTION_ACCOUNTS,
-    desc: 'Get the the transaction hash of the request previously posted to [`parity_postTransaction`](#parity_posttransaction) or [`parity_postSign`](#parity_postsign). Will return a JSON-RPC error if the request was rejected.',
-    params: [
-      {
-        type: Quantity,
-        desc: 'The id of the request sent to the signer.',
-        example: '0x1'
-      }
-    ],
-    returns: {
-      type: Hash,
-      desc: '32 Bytes - the transaction hash or `null` if the request hasn\'t been signed yet.',
-      example: '0xde8dfd9642f7eeef12402f2a560dbf40921b4f0bda01fb84709b9d71f6c181be'
-    }
-  },
-
-  decryptMessage: {
-    desc: 'Decrypt a message encrypted with a ECIES public key.',
-    params: [
-      {
-        type: Address,
-        desc: 'Account which can decrypt the message.',
-        example: '0x00a329c0648769a73afac7f9381e08fb43dbea72'
-      },
-      {
-        type: Data,
-        desc: 'Encrypted message.',
-        example: '0x0405afee7fa2ab3e48c27b00d543389270cb7267fc191ca1311f297255a83cbe8d77a4ba135b51560700a582924fa86d2b19029fcb50d2b68d60a7df1ba81df317a19c8def117f2b9cf8c2618be0e3f146a5272fb9e5528719d2d7a1bd91fa620901cffa756305c79c093e7af30fa3c1587029421351c34a7c1e5a2b'
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: 'Decrypted message.',
-      example: withComment('0x68656c6c6f20776f726c64', 'hello world')
-    }
-  },
-
-  signMessage: {
-    desc: 'Sign the hashed message bytes with the given account.',
-    params: [
-      {
-        type: Address,
-        desc: 'Account which signs the message.',
-        example: '0xc171033d5cbff7175f29dfd3a63dda3d6f8f385e'
-      },
-      {
-        type: String,
-        desc: 'Passphrase to unlock the account.',
-        example: 'password1'
-      },
-      {
-        type: Data,
-        desc: 'Hashed message.',
-        example: '0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a'
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: 'Message signature.',
-      example: '0x1d9e33a8cf8bfc089a172bca01da462f9e359c6cb1b0f29398bc884e4d18df4f78588aee4fb5cc067ca62d2abab995e0bba29527be6ac98105b0320020a2efaf00'
-    }
-  },
-
-  wsUrl: {
-    section: SECTION_NODE,
-    desc: 'Returns the hostname and the port of WebSockets/Signer server, error if not enabled.',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'The hostname and port number',
-      example: 'localhost:8546'
-    }
-  },
-
-  composeTransaction: {
-    desc: 'Given partial transaction request produces transaction with all fields filled in. Such transaction can be then signed externally.',
-    params: [
-      {
-        type: TransactionRequest,
-        desc: 'see [`eth_sendTransaction`](JSONRPC-eth-module#eth_sendtransaction).',
-        format: 'inputCallFormatter',
-        example: {
-          from: '0xb60e8dd61c5d32be8058bb8eb970870f07233155',
-          to: '0xd46e8dd67c5d32be8058bb8eb970870f07244567',
-          value: fromDecimal(2441406250)
-        }
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'Transaction object (same as the parameter) with missing optional fields filled in by defaults.',
-      example: {
-        condition: null,
-        data: '0x',
-        from: '0xb60e8dd61c5d32be8058bb8eb970870f07233155',
-        gas: '0xe57e0',
-        gasPrice: '0x4a817c800',
-        nonce: '0x0',
-        to: '0xd46e8dd67c5d32be8058bb8eb970870f07244567',
-        value: '0x9184e72a'
-      }
-    }
-  },
-
-  getBlockHeaderByNumber: {
-    desc: 'Get block header. Same as [`eth_getBlockByNumber`](JSONRPC-eth-module#eth_getblockbynumber) but without uncles and transactions.',
-    params: [
-      {
-        type: BlockNumber,
-        desc: 'integer of a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`, as in the [default block parameter](#the-default-block-parameter).',
-        example: fromDecimal(436)
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'Block header',
-      example: {
-        author: '0xbb7b8287f3f0a933474a79eae42cbca977791171',
-        difficulty: '0x4ea3f27bc',
-        extraData: '0x476574682f4c5649562f76312e302e302f6c696e75782f676f312e342e32',
-        gasLimit: '0x1388',
-        gasUsed: '0x0',
-        hash: '0xdc0818cf78f21a8e70579cb46a43643f78291264dda342ae31049421c82d21ae',
-        logsBloom: '0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
-        miner: '0xbb7b8287f3f0a933474a79eae42cbca977791171',
-        mixHash: '0x4fffe9ae21f1c9e15207b1f472d5bbdd68c9595d461666602f2be20daf5e7843',
-        nonce: '0x689056015818adbe',
-        number: '0x1b4',
-        parentHash: '0xe99e022112df268087ea7eafaf4790497fd21dbeeb6bd7a1721df161a6657a54',
-        receiptsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421',
-        sealFields: ['0xa04fffe9ae21f1c9e15207b1f472d5bbdd68c9595d461666602f2be20daf5e7843', '0x88689056015818adbe'],
-        sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347',
-        size: '0x21b',
-        stateRoot: '0xddc8b0234c2e0cad087c8b389aa7ef01f7d79b2570bccb77ce48648aa61c904d',
-        timestamp: '0x55ba467c',
-        transactionsRoot: '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421'
-      }
-    }
-  },
-
-  cidV0: {
-    desc: 'Compute a v0 IPFS Content ID from protobuf encoded bytes.',
-    params: [
-      {
-        type: Data,
-        desc: 'to encode.',
-        example: '0x666f6f626172'
-      }
-    ],
-    returns: {
-      type: String,
-      desc: 'Base58 encoded CID',
-      example: 'QmSbFjqjd6nFwNHqsBCC7SK8GShGcayLUEtysJjNGhZAnC'
-    }
-  },
-
-  // Pub-Sub
-  subscribe: {
-    subdoc: SUBDOC_PUBSUB,
-    desc: `
-Starts a subscription (on WebSockets / IPC / TCP transports) to results of calling some other RPC method.
-For every change in returned value of that RPC call a JSON-RPC notification with result and subscription ID will be sent to a client.
-
-An example notification received by subscribing to \`eth_accounts\` RPC method:
-\`\`\`
-{"jsonrpc":"2.0","method":"parity_subscription","params":{"subscription":"0x416d77337e24399d","result":["0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826"]}}
-\`\`\`
-
-You can unsubscribe using \`parity_unsubscribe\` RPC method. Subscriptions are also tied to a transport
-connection, disconnecting causes all subscriptions to be canceled.
-    `,
-    params: [
-      {
-        type: String,
-        desc: 'RPC method name',
-        example: 'eth_getBalance'
-      },
-      {
-        type: Array,
-        desc: 'Parameters passed to RPC method. (Optional, defaults to no parameters)',
-        example: ['0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826', 'latest']
-      }
-    ],
-    returns: {
-      type: String,
-      desc: 'Assigned subscription ID',
-      example: '0x416d77337e24399d'
-    }
-  },
-  unsubscribe: {
-    subdoc: SUBDOC_PUBSUB,
-    desc: 'Unsubscribes from a subscription.',
-    params: [{
-      type: String,
-      desc: 'Subscription ID',
-      example: '0x416d77337e24399d'
-    }],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful',
-      example: true
-    }
-  }
-
-};
diff --git a/js/src/jsonrpc/interfaces/personal.js b/js/src/jsonrpc/interfaces/personal.js
deleted file mode 100644
index 6a885a3d0094654f5e9e33538f7ef2812f0a8755..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/interfaces/personal.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Address, Data, Quantity, TransactionRequest } from '../types';
-
-export default {
-  listAccounts: {
-    desc: 'Lists all stored accounts.',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'A list of 20 byte account identifiers.',
-      example: [
-        '0x7bf87721a96849d168de02fd6ea5986a3a147383',
-        '0xca807a90fd64deed760fb98bf0869b475c469348'
-      ]
-    }
-  },
-
-  newAccount: {
-    desc: 'Creates new account.\n\n**Note:** it becomes the new current unlocked account. There can only be one unlocked account at a time.',
-    params: [
-      {
-        type: String,
-        desc: 'Password for the new account.',
-        example: 'hunter2'
-      }
-    ],
-    returns: {
-      type: Address,
-      desc: '20 Bytes - The identifier of the new account.',
-      example: '0x8f0227d45853a50eefd48dd4fec25d5b3fd2295e'
-    }
-  },
-
-  sendTransaction: {
-    desc: 'Sends transaction and signs it in a single call. The account does not need to be unlocked to make this call, and will not be left unlocked after.',
-    params: [
-      {
-        type: TransactionRequest,
-        desc: 'The transaction object',
-        example: {
-          from: '0x407d73d8a49eeb85d32cf465507dd71d507100c1',
-          to: '0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b',
-          data: '0x41cd5add4fd13aedd64521e363ea279923575ff39718065d38bd46f0e6632e8e',
-          value: '0x186a0'
-        }
-      },
-      {
-        type: String,
-        desc: 'Passphrase to unlock the `from` account.',
-        example: 'hunter2'
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: '32 Bytes - the transaction hash, or the zero hash if the transaction is not yet available',
-      example: '0x62e05075829655752e146a129a044ad72e95ce33e48ff48118b697e15e7b41e4'
-    }
-  },
-
-  unlockAccount: {
-    desc: 'Unlocks specified account for use.\n\nIf permanent unlocking is disabled (the default) then the duration argument will be ignored, and the account will be unlocked for a single signing. With permanent locking enabled, the duration sets the number of seconds to hold the account open for. It will default to 300 seconds. Passing 0 unlocks the account indefinitely.\n\nThere can only be one unlocked account at a time.',
-    params: [
-      {
-        type: Address,
-        desc: '20 Bytes - The address of the account to unlock.',
-        example: '0x8f0227d45853a50eefd48dd4fec25d5b3fd2295e'
-      },
-      {
-        type: String,
-        desc: 'Passphrase to unlock the account.',
-        example: 'hunter2'
-      },
-      {
-        type: Quantity,
-        default: 300,
-        desc: 'Integer or `null` - Duration in seconds how long the account should remain unlocked for.',
-        example: null
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful',
-      example: true
-    }
-  }
-};
diff --git a/js/src/jsonrpc/interfaces/shh.js b/js/src/jsonrpc/interfaces/shh.js
deleted file mode 100644
index 7084aa3bf22008dbb1b8bc9ee48cfd404a1b7a0e..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/interfaces/shh.js
+++ /dev/null
@@ -1,291 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Data, Quantity, Float } from '../types';
-
-export default {
-  info: {
-    desc: 'Returns the current whisper protocol version.',
-    params: [],
-    returns: {
-      type: Object,
-      desc: 'The current whisper protocol version',
-      details: {
-        minPow: {
-          type: Float,
-          desc: 'required PoW threshold for a message to be accepted into the local pool, or null if there is empty space in the pool.'
-        },
-        messages: {
-          type: Quantity,
-          desc: 'Number of messages in the pool.'
-        },
-        memory: {
-          type: Quantity,
-          desc: 'Amount of memory used by messages in the pool.'
-        },
-        targetMemory: {
-          type: Quantity,
-          desc: 'Target amount of memory for the pool.'
-        }
-      }
-    }
-  },
-
-  post: {
-    desc: 'Sends a whisper message.',
-    params: [
-      {
-        type: Object, desc: 'The whisper post object:', format: 'inputPostFormatter',
-        details: {
-          from: {
-            type: Data, desc: '60 Bytes - The identity of the sender',
-            optional: true
-          },
-          to: {
-            type: Data, desc: '60 Bytes - The identity of the receiver. When present whisper will encrypt the message so that only the receiver can decrypt it',
-            optional: true
-          },
-          topics: {
-            type: Array, desc: 'Array of `Data` topics, for the receiver to identify messages'
-          },
-          payload: {
-            type: Data, desc: 'The payload of the message'
-          },
-          priority: {
-            type: Quantity, desc: 'The integer of the priority in a rang from ... (?)'
-          },
-          ttl: {
-            type: Quantity, desc: 'Integer of the time to live in seconds.'
-          }
-        }
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the message was send, otherwise `false`'
-    }
-  },
-
-  newKeyPair: {
-    desc: 'Generate a new key pair (identity) for asymmetric encryption.',
-    params: [],
-    returns: {
-      type: Data,
-      desc: '32 Bytes - the address of the new identiy'
-    }
-  },
-
-  addPrivateKey: {
-    desc: 'Import a private key to use for asymmetric decryption.',
-    params: [
-      {
-        type: Data,
-        desc: '32 Bytes - The private key to import'
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: '`32 Bytes`  A unique identity to refer to this keypair by.'
-    }
-  },
-
-  newSymKey: {
-    desc: 'Generate a key pair(identity) for symmetric encryption.',
-    params: [],
-    returns: {
-      type: Data,
-      desc: '32 Bytes - the address of the new identiy'
-    }
-  },
-
-  getPublicKey: {
-    desc: 'Get the public key associated with an asymmetric identity.',
-    params: [
-      {
-        type: Data,
-        desc: '32 Bytes - The identity to fetch the public key for.'
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: '`64 Bytes` - The public key of the asymmetric identity.'
-    }
-  },
-
-  getPrivateKey: {
-    desc: 'Get the private key associated with an asymmetric identity.',
-    params: [
-      {
-        type: Data,
-        desc: '32 Bytes - The identity to fetch the private key for.'
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: '`32 Bytes` - The private key of the asymmetric identity.'
-    }
-  },
-
-  getSymKey: {
-    desc: 'Get the key associated with a symmetric identity.',
-    params: [
-      {
-        type: Data,
-        desc: '`32 Bytes` - The identity to fetch the key for.'
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: '`64 Bytes` - The key of the asymmetric identity.'
-    }
-  },
-
-  deleteKey: {
-    desc: 'Delete the key or key pair denoted by the given identity.',
-    params: [
-      {
-        type: Data,
-        desc: '`32 Bytes` - The identity to remove.'
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: '`true` on successful removal, `false` on unkown identity'
-    }
-  },
-
-  newMessageFilter: {
-    desc: 'Create a new polled filter for messages.',
-    params: [
-      {
-        type: Object, desc: 'The filter options:',
-        details: {
-          decryptWith: {
-            type: Data,
-            desc: '`32 bytes` - Identity of key used for description. null if listening for broadcasts.'
-          },
-          from: {
-            type: Data, desc: '`32 Bytes` - if present, only accept messages signed by this key.',
-            optional: true
-          },
-          topics: {
-            type: Array,
-            desc: 'Array of `Data`. Only accept messages matching these topics. Should be non-empty.'
-          }
-        }
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: '`32 bytes` - Unique identity for this filter.'
-    }
-  },
-
-  getFilterMesssages: {
-    nodoc: 'Not present in Rust code',
-    desc: 'Uninstalls a filter with given id. Should always be called when watch is no longer needed.\nAdditonally Filters timeout when they aren\'t requested with [shh_getFilterChanges](#shh_getfilterchanges) for a period of time.',
-    params: [
-      {
-        type: Quantity,
-        desc: 'The filter id'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` if the filter was successfully uninstalled, otherwise `false`'
-    }
-  },
-
-  getFilterMessages: {
-    desc: 'Polling method for whisper filters. Returns new messages since the last call of this method.\n**Note** calling the [shh_getMessages](#shh_getmessages) method, will reset the buffer for this method, so that you won\'t receive duplicate messages.',
-    params: [
-      {
-        type: Data,
-        desc: '`32 bytes` - Unique identity to fetch changes for.'
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'Array of `messages` received since last poll',
-      details: {
-        from: {
-          type: Data,
-          desc: '`64 bytes` - Public key that signed this message or null'
-        },
-        recipient: {
-          type: Data,
-          desc: '`32 bytes` - local identity which decrypted this message, or null if broadcast.'
-        },
-        ttl: {
-          type: Quantity,
-          desc: 'time to live of the message in seconds.'
-        },
-        topics: {
-          type: Array,
-          desc: 'Array of `Data` - Topics which matched the filter'
-        },
-        timestamp: {
-          type: Quantity,
-          desc: 'Unix timestamp of the message'
-        },
-        payload: {
-          type: Data,
-          desc: 'The message body'
-        },
-        padding: {
-          type: Data,
-          desc: 'Optional padding which was decoded.'
-        }
-      }
-    }
-  },
-
-  deleteMessageFilter: {
-    desc: 'Delete a message filter by identifier',
-    params: [
-      {
-        type: Data,
-        desc: '`32 bytes` - The identity of the filter to delete.'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: '`true` on deletion, `false` on unrecognized ID.'
-    }
-  },
-  subscribe: {
-    desc: 'Open a subscription to a filter.',
-    params: [{
-      type: Data,
-      desc: 'See [shh_newMessageFilter](#shh_newmessagefilter)'
-    }],
-    returns: {
-      type: Quantity,
-      desc: 'Unique subscription identifier'
-    }
-  },
-  unsubscribe: {
-    desc: 'Close a subscribed filter',
-    params: [{
-      type: Quantity,
-      desc: 'Unique subscription identifier'
-    }],
-    returns: {
-      type: Boolean,
-      desc: '`true` on success, `false` on unkown subscription ID.'
-    }
-  }
-};
diff --git a/js/src/jsonrpc/interfaces/signer.js b/js/src/jsonrpc/interfaces/signer.js
deleted file mode 100644
index c3bd9bd04c4cd838a673421490d77d15967b4157..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/interfaces/signer.js
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Quantity, Data } from '../types';
-import { fromDecimal, Dummy } from '../helpers';
-
-export default {
-  generateAuthorizationToken: {
-    desc: 'Generates a new authorization token.',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'The new authorization token.',
-      example: 'bNGY-iIPB-j7zK-RSYZ'
-    }
-  },
-
-  generateWebProxyAccessToken: {
-    desc: 'Generates a new web proxy access token.',
-    params: [{
-      type: String,
-      desc: 'Domain for which the token is valid. Only requests to this domain will be allowed.',
-      example: 'https://parity.io'
-    }],
-    returns: {
-      type: String,
-      desc: 'The new web proxy access token.',
-      example: 'MOWm0tEJjwthDiTU'
-    }
-  },
-
-  requestsToConfirm: {
-    desc: 'Returns a list of the transactions awaiting authorization.',
-    params: [],
-    returns: {
-      // TODO: Types of the fields of transaction objects? Link to a transaction object in another page?
-      type: Array,
-      desc: 'A list of the outstanding transactions.',
-      example: new Dummy('[ ... ]')
-    }
-  },
-
-  confirmRequest: {
-    desc: 'Confirm a request in the signer queue',
-    params: [
-      {
-        type: Quantity,
-        desc: 'The request id.',
-        example: fromDecimal(1)
-      },
-      {
-        type: Object,
-        desc: 'Modify the transaction before confirmation.',
-        details: {
-          gasPrice: {
-            type: Quantity,
-            desc: 'Modify the gas price provided by the sender in Wei.',
-            optional: true
-          },
-          gas: {
-            type: Quantity,
-            desc: 'Gas provided by the sender in Wei.',
-            optional: true
-          },
-          condition: {
-            type: Object,
-            desc: 'Condition for scheduled transaction. Can be either an integer block number `{ block: 1 }` or UTC timestamp (in seconds) `{ timestamp: 1491290692 }`.',
-            optional: true
-          }
-        },
-        example: {}
-      },
-      {
-        type: String,
-        desc: 'The account password',
-        example: 'hunter2'
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'The status of the confirmation, depending on the request type.',
-      example: {}
-    }
-  },
-
-  confirmRequestRaw: {
-    desc: 'Confirm a request in the signer queue providing signed request.',
-    params: [
-      {
-        type: Quantity,
-        desc: 'Integer - The request id',
-        example: fromDecimal(1)
-      },
-      {
-        type: Data,
-        desc: 'Signed request (RLP encoded transaction)',
-        example: '0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675'
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'The status of the confirmation, depending on the request type.',
-      example: {}
-    }
-  },
-
-  confirmRequestWithToken: {
-    desc: 'Confirm specific request with rolling token.',
-    params: [
-      {
-        type: Quantity,
-        desc: 'The request id.',
-        example: fromDecimal(1)
-      },
-      {
-        type: Object,
-        desc: 'Modify the transaction before confirmation.',
-        details: {
-          gasPrice: {
-            type: Quantity,
-            desc: 'Modify the gas price provided by the sender in Wei.',
-            optional: true
-          },
-          gas: {
-            type: Quantity,
-            desc: 'Gas provided by the sender in Wei.',
-            optional: true
-          },
-          condition: {
-            type: Object,
-            desc: 'Conditional submission of the transaction. Can be either an integer block number `{ block: 1 }` or UTC timestamp (in seconds) `{ time: 1491290692 }` or `null`.',
-            optional: true
-          }
-        },
-        example: {}
-      },
-      {
-        type: String,
-        desc: 'Password (initially) or a token returned by the previous call.',
-        example: 'hunter2'
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'Status.',
-      details: {
-        result: {
-          type: Object,
-          desc: 'The status of the confirmation, depending on the request type.'
-        },
-        token: {
-          type: String,
-          desc: 'Token used to authenticate the next request.'
-        }
-      },
-      example: {
-        result: new Dummy('{ ... }'),
-        token: 'cAF2w5LE7XUZ3v3N'
-      }
-    }
-  },
-
-  rejectRequest: {
-    desc: 'Rejects a request in the signer queue',
-    params: [
-      {
-        type: Quantity,
-        desc: 'Integer - The request id',
-        example: fromDecimal(1)
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'The status of the rejection',
-      example: true
-    }
-  },
-
-  signerEnabled: {
-    nodoc: 'Not present in Rust code',
-    desc: 'Returns whether signer is enabled/disabled.',
-    params: [],
-    returns: {
-      type: Boolean,
-      desc: '`true` when enabled, `false` when disabled.',
-      example: true
-    }
-  },
-
-  // Pub-Sub
-  subscribePending: {
-    desc: `
-Starts a subscription for transactions in the confirmation queue.
-Each event contains all transactions currently in the queue.
-
-An example notification received by subscribing to this event:
-\`\`\`
-{"jsonrpc":"2.0","method":"signer_pending","params":{"subscription":"0x416d77337e24399d","result":[]}}
-\`\`\`
-
-You can unsubscribe using \`signer_unsubscribePending\` RPC method. Subscriptions are also tied to a transport
-connection, disconnecting causes all subscriptions to be canceled.
-    `,
-    params: [],
-    returns: {
-      type: String,
-      desc: 'Assigned subscription ID',
-      example: '0x416d77337e24399d'
-    }
-  },
-  unsubscribePending: {
-    desc: 'Unsubscribes from pending transactions subscription.',
-    params: [{
-      type: String,
-      desc: 'Subscription ID',
-      example: '0x416d77337e24399d'
-    }],
-    returns: {
-      type: Boolean,
-      desc: 'whether the call was successful',
-      example: true
-    }
-  }
-};
diff --git a/js/src/jsonrpc/interfaces/trace.js b/js/src/jsonrpc/interfaces/trace.js
deleted file mode 100644
index 9e35da629a314c22860daff7e0738ed384c04818..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/interfaces/trace.js
+++ /dev/null
@@ -1,376 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Address, BlockNumber, Data, Hash, CallRequest } from '../types';
-import { withPreamble, Dummy, fromDecimal } from '../helpers';
-
-const SECTION_FILTERING = 'Transaction-Trace Filtering';
-const SECTION_ADHOC = 'Ad-hoc Tracing';
-
-export default withPreamble(`
-
-The trace module is for getting a deeper insight into transaction processing.
-It includes two sets of calls; the transaction trace filtering API and the ad-hoc tracing API.
-
-**Note:** In order to use these API Parity must be fully synced with flags \`$ parity --tracing on\`.
-
-## The Ad-hoc Tracing API
-
-The ad-hoc tracing API allows you to perform a number of different diagnostics on calls or transactions,
-either historical ones from the chain or hypothetical ones not yet mined. The diagnostics include:
-
-- \`trace\` **Transaction trace**. An equivalent trace to that in the previous section.
-- \`vmTrace\` **Virtual Machine execution trace**. Provides a full trace of the VM's state throughout the execution of the transaction, including for any subcalls.
-- \`stateDiff\` **State difference**. Provides information detailing all altered portions of the Ethereum state made due to the execution of the transaction.
-
-There are three means of providing a transaction to execute; either providing the same information as when making
-a call using \`eth_call\` (see \`trace_call\`), through providing raw, signed, transaction data as when using
-\`eth_sendRawTransaction\` (see \`trace_rawTransaction\`) or simply a transaction hash for a previously mined
-transaction (see \`trace_replayTransaction\`). In the latter case, your node must be in archive mode or the
-transaction should be within the most recent 1000 blocks.
-
-## The Transaction-Trace Filtering API
-
-These APIs allow you to get a full *externality* trace on any transaction executed throughout the Parity chain.
-Unlike the log filtering API, you are able to search and filter based only upon address information.
-Information returned includes the execution of all \`CREATE\`s, \`SUICIDE\`s and all variants of \`CALL\` together
-with input data, output data, gas usage, amount transferred and the success status of each individual action.
-
-### \`traceAddress\` field
-
-The \`traceAddress\` field of all returned traces, gives the exact location in the call trace [index in root,
-index in first \`CALL\`, index in second \`CALL\`, ...].
-
-i.e. if the trace is:
-\`\`\`
-A
-  CALLs B
-    CALLs G
-  CALLs C
-    CALLs G
-\`\`\`
-then it should look something like:
-
-\`[ {A: []}, {B: [0]}, {G: [0, 0]}, {C: [1]}, {G: [1, 0]} ]\`
-
-`, {
-  block: {
-    section: SECTION_FILTERING,
-    desc: 'Returns traces created at given block.',
-    params: [
-      {
-        type: BlockNumber,
-        desc: 'Integer of a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`.',
-        example: fromDecimal(3068185)
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'Block traces.',
-      example: [
-        {
-          action: {
-            callType: 'call',
-            from: '0xaa7b131dc60b80d3cf5e59b5a21a666aa039c951',
-            gas: '0x0',
-            input: '0x',
-            to: '0xd40aba8166a212d6892125f079c33e6f5ca19814',
-            value: '0x4768d7effc3fbe'
-          },
-          blockHash: '0x7eb25504e4c202cf3d62fd585d3e238f592c780cca82dacb2ed3cb5b38883add',
-          blockNumber: 3068185,
-          result: {
-            gasUsed: '0x0',
-            output: '0x'
-          },
-          subtraces: 0,
-          traceAddress: [],
-          transactionHash: '0x07da28d752aba3b9dd7060005e554719c6205c8a3aea358599fc9b245c52f1f6',
-          transactionPosition: 0,
-          type: 'call'
-        },
-        new Dummy('...')
-      ]
-    }
-  },
-
-  filter: {
-    section: SECTION_FILTERING,
-    desc: 'Returns traces matching given filter',
-    params: [
-      {
-        type: Object,
-        desc: 'The filter object',
-        details: {
-          fromBlock: {
-            type: BlockNumber,
-            desc: 'From this block.',
-            optional: true
-          },
-          toBlock: {
-            type: BlockNumber,
-            desc: 'To this block.',
-            optional: true
-          },
-          fromAddress: {
-            type: Array,
-            desc: 'Sent from these addresses.',
-            optional: true
-          },
-          toAddress: {
-            type: Address,
-            desc: 'Sent to these addresses.',
-            optional: true
-          }
-        },
-        example: {
-          fromBlock: fromDecimal(3068100),
-          toBlock: fromDecimal(3068200),
-          toAddress: ['0x8bbB73BCB5d553B5A556358d27625323Fd781D37']
-        }
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'Traces matching given filter',
-      example: [
-        {
-          action: {
-            callType: 'call',
-            from: '0x32be343b94f860124dc4fee278fdcbd38c102d88',
-            gas: '0x4c40d',
-            input: '0x',
-            to: '0x8bbb73bcb5d553b5a556358d27625323fd781d37',
-            value: '0x3f0650ec47fd240000'
-          },
-          blockHash: '0x86df301bcdd8248d982dbf039f09faf792684e1aeee99d5b58b77d620008b80f',
-          blockNumber: 3068183,
-          result: {
-            gasUsed: '0x0',
-            output: '0x'
-          },
-          subtraces: 0,
-          traceAddress: [],
-          transactionHash: '0x3321a7708b1083130bd78da0d62ead9f6683033231617c9d268e2c7e3fa6c104',
-          transactionPosition: 3,
-          type: 'call'
-        },
-        new Dummy('...')
-      ]
-    }
-  },
-
-  get: {
-    section: SECTION_FILTERING,
-    desc: 'Returns trace at given position.',
-    params: [
-      {
-        type: Hash,
-        desc: 'Transaction hash.',
-        example: '0x17104ac9d3312d8c136b7f44d4b8b47852618065ebfa534bd2d3b5ef218ca1f3'
-      },
-      {
-        type: Array,
-        desc: 'Index positions of the traces.',
-        example: ['0x0']
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'Trace object',
-      example: {
-        action: {
-          callType: 'call',
-          from: '0x1c39ba39e4735cb65978d4db400ddd70a72dc750',
-          gas: '0x13e99',
-          input: '0x16c72721',
-          to: '0x2bd2326c993dfaef84f696526064ff22eba5b362',
-          value: '0x0'
-        },
-        blockHash: '0x7eb25504e4c202cf3d62fd585d3e238f592c780cca82dacb2ed3cb5b38883add',
-        blockNumber: 3068185,
-        result: {
-          gasUsed: '0x183',
-          output: '0x0000000000000000000000000000000000000000000000000000000000000001'
-        },
-        subtraces: 0,
-        traceAddress: [0],
-        transactionHash: '0x17104ac9d3312d8c136b7f44d4b8b47852618065ebfa534bd2d3b5ef218ca1f3',
-        transactionPosition: 2,
-        type: 'call'
-      }
-    }
-  },
-
-  transaction: {
-    section: SECTION_FILTERING,
-    desc: 'Returns all traces of given transaction',
-    params: [
-      {
-        type: Hash,
-        desc: 'Transaction hash',
-        example: '0x17104ac9d3312d8c136b7f44d4b8b47852618065ebfa534bd2d3b5ef218ca1f3'
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'Traces of given transaction',
-      example: [
-        {
-          action: {
-            callType: 'call',
-            from: '0x1c39ba39e4735cb65978d4db400ddd70a72dc750',
-            gas: '0x13e99',
-            input: '0x16c72721',
-            to: '0x2bd2326c993dfaef84f696526064ff22eba5b362',
-            value: '0x0'
-          },
-          blockHash: '0x7eb25504e4c202cf3d62fd585d3e238f592c780cca82dacb2ed3cb5b38883add',
-          blockNumber: 3068185,
-          result: {
-            gasUsed: '0x183',
-            output: '0x0000000000000000000000000000000000000000000000000000000000000001'
-          },
-          subtraces: 0,
-          traceAddress: [0],
-          transactionHash: '0x17104ac9d3312d8c136b7f44d4b8b47852618065ebfa534bd2d3b5ef218ca1f3',
-          transactionPosition: 2,
-          type: 'call'
-        },
-        new Dummy('...')
-      ]
-    }
-  },
-
-  call: {
-    section: SECTION_ADHOC,
-    desc: 'Executes the given call and returns a number of possible traces for it.',
-    params: [
-      {
-        type: CallRequest,
-        desc: 'Call options, same as `eth_call`.',
-        example: new Dummy('{ ... }')
-      },
-      {
-        type: Array,
-        desc: 'Type of trace, one or more of: `"vmTrace"`, `"trace"`, `"stateDiff"`.',
-        example: ['trace']
-      },
-      {
-        type: BlockNumber,
-        optional: true,
-        desc: 'Integer of a block number, or the string `\'earliest\'`, `\'latest\'` or `\'pending\'`.'
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'Block traces',
-      example: {
-        output: '0x',
-        stateDiff: null,
-        trace: [
-          {
-            action: new Dummy('{ ... }'),
-            result: {
-              gasUsed: '0x0',
-              output: '0x'
-            },
-            subtraces: 0,
-            traceAddress: [],
-            type: 'call'
-          }
-        ],
-        vmTrace: null
-      }
-    }
-  },
-
-  rawTransaction: {
-    section: SECTION_ADHOC,
-    desc: 'Traces a call to `eth_sendRawTransaction` without making the call, returning the traces',
-    params: [
-      {
-        type: Data,
-        desc: 'Raw transaction data.',
-        example: '0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675'
-      },
-      {
-        type: Array,
-        desc: 'Type of trace, one or more of: `"vmTrace"`, `"trace"`, `"stateDiff"`.',
-        example: ['trace']
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'Block traces.',
-      example: {
-        output: '0x',
-        stateDiff: null,
-        trace: [
-          {
-            action: new Dummy('{ ... }'),
-            result: {
-              gasUsed: '0x0',
-              output: '0x'
-            },
-            subtraces: 0,
-            traceAddress: [],
-            type: 'call'
-          }
-        ],
-        vmTrace: null
-      }
-    }
-  },
-
-  replayTransaction: {
-    section: SECTION_ADHOC,
-    desc: 'Replays a transaction, returning the traces.',
-    params: [
-      {
-        type: Hash,
-        desc: 'Transaction hash.',
-        example: '0x02d4a872e096445e80d05276ee756cefef7f3b376bcec14246469c0cd97dad8f'
-      },
-      {
-        type: Array,
-        desc: 'Type of trace, one or more of: `"vmTrace"`, `"trace"`, `"stateDiff"`.',
-        example: ['trace']
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'Block traces.',
-      example: {
-        output: '0x',
-        stateDiff: null,
-        trace: [
-          {
-            action: new Dummy('{ ... }'),
-            result: {
-              gasUsed: '0x0',
-              output: '0x'
-            },
-            subtraces: 0,
-            traceAddress: [],
-            type: 'call'
-          }
-        ],
-        vmTrace: null
-      }
-    }
-  }
-});
diff --git a/js/src/jsonrpc/interfaces/web3.js b/js/src/jsonrpc/interfaces/web3.js
deleted file mode 100644
index 2e3572650289448d19ae31068947e54a0b7fd7f6..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/interfaces/web3.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Data } from '../types';
-import { withComment } from '../helpers';
-
-export default {
-  clientVersion: {
-    desc: 'Returns the current client version.',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'The current client version',
-      example: 'Parity//v1.5.0-unstable-9db3f38-20170103/x86_64-linux-gnu/rustc1.14.0'
-    }
-  },
-
-  sha3: {
-    desc: 'Returns Keccak-256 (**not** the standardized SHA3-256) of the given data.',
-    params: [
-      {
-        type: String,
-        desc: 'The data to convert into a SHA3 hash.',
-        example: withComment('0x68656c6c6f20776f726c64', '"hello world"')
-      }
-    ],
-    returns: {
-      type: Data,
-      desc: 'The Keccak-256 hash of the given string.',
-      example: '0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad'
-    }
-  }
-};
diff --git a/js/src/jsonrpc/types.js b/js/src/jsonrpc/types.js
deleted file mode 100644
index bd69cc86302fdb81699b5f1ec8126c6a03ba8939..0000000000000000000000000000000000000000
--- a/js/src/jsonrpc/types.js
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export class Address {}
-
-export class Data {}
-
-export class Hash {}
-
-export class Integer {}
-
-export class Float {}
-
-export class Quantity {}
-
-export class BlockNumber {
-  static print = '`Quantity` | `Tag`';
-}
-
-export class CallRequest {
-  static print = '`Object`';
-
-  static details = {
-    from: {
-      type: Address,
-      desc: '20 Bytes - The address the transaction is send from.',
-      optional: true
-    },
-    to: {
-      type: Address,
-      desc: '(optional when creating new contract) 20 Bytes - The address the transaction is directed to.'
-    },
-    gas: {
-      type: Quantity,
-      desc: 'Integer of the gas provided for the transaction execution. eth_call consumes zero gas, but this parameter may be needed by some executions.',
-      optional: true
-    },
-    gasPrice: {
-      type: Quantity,
-      desc: 'Integer of the gas price used for each paid gas.',
-      optional: true
-    },
-    value: {
-      type: Quantity,
-      desc: 'Integer of the value sent with this transaction.',
-      optional: true
-    },
-    data: {
-      type: Data,
-      desc: '4 byte hash of the method signature followed by encoded parameters. For details see [Ethereum Contract ABI](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI).',
-      optional: true
-    }
-  }
-}
-
-export class TransactionRequest {
-  static print = '`Object`';
-
-  static details = {
-    from: {
-      type: Address,
-      desc: '20 Bytes - The address the transaction is send from.'
-    },
-    to: {
-      type: Address,
-      desc: '20 Bytes - The address the transaction is directed to.',
-      optional: true
-    },
-    gas: {
-      type: Quantity,
-      desc: 'Integer of the gas provided for the transaction execution. eth_call consumes zero gas, but this parameter may be needed by some executions.',
-      optional: true
-    },
-    gasPrice: {
-      type: Quantity,
-      desc: 'Integer of the gas price used for each paid gas.',
-      optional: true
-    },
-    value: {
-      type: Quantity,
-      desc: 'Integer of the value sent with this transaction.',
-      optional: true
-    },
-    data: {
-      type: Data,
-      desc: '4 byte hash of the method signature followed by encoded parameters. For details see [Ethereum Contract ABI](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI).',
-      optional: true
-    },
-    nonce: {
-      type: Quantity,
-      desc: 'Integer of a nonce. This allows to overwrite your own pending transactions that use the same nonce.',
-      optional: true
-    },
-    condition: {
-      type: Object,
-      desc: 'Conditional submission of the transaction. Can be either an integer block number `{ block: 1 }` or UTC timestamp (in seconds) `{ time: 1491290692 }` or `null`.',
-      optional: true
-    }
-  }
-}
-
-export class TransactionResponse {
-  static print = '`Object`';
-
-  static details = {
-    hash: {
-      type: Hash,
-      desc: '32 Bytes - hash of the transaction.'
-    },
-    nonce: {
-      type: Quantity,
-      desc: 'The number of transactions made by the sender prior to this one.'
-    },
-    blockHash: {
-      type: Hash,
-      desc: '32 Bytes - hash of the block where this transaction was in. `null` when its pending.'
-    },
-    blockNumber: {
-      type: BlockNumber,
-      desc: 'Block number where this transaction was in. `null` when its pending.'
-    },
-    transactionIndex: {
-      type: Quantity,
-      desc: 'Integer of the transactions index position in the block. `null` when its pending.'
-    },
-    from: {
-      type: Address,
-      desc: '20 Bytes - address of the sender.'
-    },
-    to: {
-      type: Address,
-      desc: '20 Bytes - address of the receiver. `null` when its a contract creation transaction.'
-    },
-    value: {
-      type: Quantity,
-      desc: 'Value transferred in Wei.'
-    },
-    gasPrice: {
-      type: Quantity,
-      desc: 'Gas price provided by the sender in Wei.'
-    },
-    gas: {
-      type: Quantity,
-      desc: 'Gas provided by the sender.'
-    },
-    input: {
-      type: Data,
-      desc: 'The data send along with the transaction.'
-    },
-    creates: {
-      type: Address,
-      optional: true,
-      desc: 'Address of a created contract or `null`.'
-    },
-    raw: {
-      type: Data,
-      desc: 'Raw transaction data.'
-    },
-    publicKey: {
-      type: Data,
-      desc: 'Public key of the signer.'
-    },
-    chainId: {
-      type: Quantity,
-      desc: 'The chain id of the transaction, if any.'
-    },
-    standardV: {
-      type: Quantity,
-      desc: 'The standardized V field of the signature (0 or 1).'
-    },
-    v: {
-      type: Quantity,
-      desc: 'The V field of the signature.'
-    },
-    r: {
-      type: Quantity,
-      desc: 'The R field of the signature.'
-    },
-    s: {
-      type: Quantity,
-      desc: 'The S field of the signature.'
-    },
-    condition: {
-      type: Object,
-      optional: true,
-      desc: 'Conditional submission, Block number in `block` or timestamp in `time` or `null`.'
-    }
-  }
-}
diff --git a/js/src/lib.rs b/js/src/lib.rs
deleted file mode 100644
index 04efa7cc51cb54e007dc245ca5aea4b09250ac5c..0000000000000000000000000000000000000000
--- a/js/src/lib.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#[cfg(feature = "with-syntex")]
-include!(concat!(env!("OUT_DIR"), "/lib.rs"));
-
-#[cfg(not(feature = "with-syntex"))]
-include!("lib.rs.in");
-
diff --git a/js/src/lib.rs.in b/js/src/lib.rs.in
deleted file mode 100644
index b811c10660186750bd70f58ce081f1477bff2192..0000000000000000000000000000000000000000
--- a/js/src/lib.rs.in
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate parity_dapps_glue;
-
-use std::collections::HashMap;
-use parity_dapps_glue::{WebApp, File, Info};
-
-#[derive(WebAppFiles)]
-#[webapp(path = "../build")]
-pub struct App {
-	pub files: HashMap<&'static str, File>,
-}
-
-impl Default for App {
-	fn default() -> App {
-		App {
-			files: Self::files(),
-		}
-	}
-}
-
-impl WebApp for App {
-	fn file(&self, path: &str) -> Option<&File> {
-		self.files.get(path)
-	}
-
-	fn info(&self) -> Info {
-		Info {
-			name: "Parity UI",
-			version: env!("CARGO_PKG_VERSION"),
-			author: "Parity <admin@parity.io>",
-			description: "New UI for Parity.",
-			icon_url: "icon.png",
-		}
-	}
-}
-
-#[test]
-fn test_js() {
-	parity_dapps_glue::js::build(env!("CARGO_MANIFEST_DIR"), "build");
-}
diff --git a/js/src/library.etherscan.js b/js/src/library.etherscan.js
deleted file mode 100644
index 1884822e650c19e2596b0a9baa1cc43161f47e63..0000000000000000000000000000000000000000
--- a/js/src/library.etherscan.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import es6Promise from 'es6-promise';
-es6Promise.polyfill();
-
-const isNode = typeof global !== 'undefined' && typeof global !== 'undefined';
-const isBrowser = typeof self !== 'undefined' && typeof self.window !== 'undefined';
-
-if (isBrowser) {
-  require('whatwg-fetch');
-}
-
-if (isNode) {
-  global.fetch = require('node-fetch');
-}
-
-import Etherscan from './3rdparty/etherscan';
-
-export default Etherscan;
diff --git a/js/src/library.jsonrpc.js b/js/src/library.jsonrpc.js
deleted file mode 100644
index a288e14beb6b4fc858d116c13621d02aff4268e3..0000000000000000000000000000000000000000
--- a/js/src/library.jsonrpc.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import JsonRpc from './jsonrpc';
-
-export default JsonRpc;
diff --git a/js/src/library.parity.js b/js/src/library.parity.js
deleted file mode 100644
index d7d697a8219df9ffb4e7f71929e4f6ecf8f71d8a..0000000000000000000000000000000000000000
--- a/js/src/library.parity.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import es6Promise from 'es6-promise';
-es6Promise.polyfill();
-
-const isNode = typeof global !== 'undefined' && typeof global !== 'undefined';
-const isBrowser = typeof self !== 'undefined' && typeof self.window !== 'undefined';
-
-if (isBrowser) {
-  require('whatwg-fetch');
-}
-
-if (isNode) {
-  global.fetch = require('node-fetch');
-}
-
-import Abi from './abi';
-import Api from './api';
-
-export { Api, Abi };
diff --git a/js/src/library.shapeshift.js b/js/src/library.shapeshift.js
deleted file mode 100644
index 6f6f4ccff95cedb42ba24f05c39fc8326e757f78..0000000000000000000000000000000000000000
--- a/js/src/library.shapeshift.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import es6Promise from 'es6-promise';
-es6Promise.polyfill();
-
-const isNode = typeof global !== 'undefined' && typeof global !== 'undefined';
-const isBrowser = typeof self !== 'undefined' && typeof self.window !== 'undefined';
-
-if (isBrowser) {
-  require('whatwg-fetch');
-}
-
-if (isNode) {
-  global.fetch = require('node-fetch');
-}
-
-import ShapeShift from './3rdparty/shapeshift';
-
-export default ShapeShift;
diff --git a/js/src/main.js b/js/src/main.js
deleted file mode 100644
index c28eddd020f83673ac1ee2e81befe0ad80b1ee40..0000000000000000000000000000000000000000
--- a/js/src/main.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { Router } from 'react-router';
-
-import routes from './routes';
-import styles from './reset.css';
-
-export default class MainApplication extends Component {
-  static propTypes = {
-    routerHistory: PropTypes.any.isRequired
-  };
-
-  render () {
-    const { routerHistory } = this.props;
-
-    return (
-      <Router className={ styles.reset } history={ routerHistory } routes={ routes } />
-    );
-  }
-}
diff --git a/js/src/mobx/hardwareStore.js b/js/src/mobx/hardwareStore.js
deleted file mode 100644
index 46bf3fa58102212826856ae1be4d685b6c5c1cea..0000000000000000000000000000000000000000
--- a/js/src/mobx/hardwareStore.js
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, observable, transaction } from 'mobx';
-
-import Ledger from '~/3rdparty/ledger';
-
-const HW_SCAN_INTERVAL = 5000;
-let instance = null;
-
-export default class HardwareStore {
-  @observable isScanning = false;
-  @observable wallets = {};
-
-  constructor (api) {
-    this._api = api;
-    this._ledger = Ledger.create(api);
-    this._pollId = null;
-
-    this._pollScan();
-  }
-
-  isConnected (address) {
-    return computed(() => !!this.wallets[address]).get();
-  }
-
-  @action setScanning = (isScanning) => {
-    this.isScanning = isScanning;
-  }
-
-  @action setWallets = (wallets) => {
-    this.wallets = wallets;
-  }
-
-  _pollScan = () => {
-    this._pollId = setTimeout(() => {
-      this.scan().then(this._pollScan);
-    }, HW_SCAN_INTERVAL);
-  }
-
-  scanLedger () {
-    if (!this._ledger.isSupported) {
-      return Promise.resolve({});
-    }
-
-    return this._ledger
-      .scan()
-      .then((wallets) => {
-        console.log('HardwareStore::scanLedger', wallets);
-
-        return wallets.reduce((hwInfo, wallet) => {
-          wallet.manufacturer = 'Ledger';
-          wallet.name = 'Nano S';
-          wallet.via = 'ledger';
-
-          hwInfo[wallet.address] = wallet;
-
-          return hwInfo;
-        }, {});
-      })
-      .catch((error) => {
-        console.warn('HardwareStore::scanLedger', error);
-
-        return {};
-      });
-  }
-
-  scanParity () {
-    return this._api.parity
-      .hardwareAccountsInfo()
-      .then((hwInfo) => {
-        Object
-          .keys(hwInfo)
-          .forEach((address) => {
-            const info = hwInfo[address];
-
-            info.address = address;
-            info.via = 'parity';
-          });
-
-        return hwInfo;
-      })
-      .catch((error) => {
-        console.warn('HardwareStore::scanParity', error);
-
-        return {};
-      });
-  }
-
-  scan () {
-    this.setScanning(true);
-
-    // NOTE: Depending on how the hardware is configured and how the local env setup
-    // is done, different results will be retrieved via Parity vs. the browser APIs
-    // (latter is Chrome-only, needs the browser app enabled on a Ledger, former is
-    // not intended as a network call, i.e. hw wallet is with the user)
-    return Promise
-      .all([
-        this.scanParity(),
-        this.scanLedger()
-      ])
-      .then(([hwAccounts, ledgerAccounts]) => {
-        transaction(() => {
-          this.setWallets(Object.assign({}, hwAccounts, ledgerAccounts));
-          this.setScanning(false);
-        });
-      });
-  }
-
-  createAccountInfo (entry, original = {}) {
-    const { address, manufacturer, name } = entry;
-
-    return Promise
-      .all([
-        original.name
-          ? Promise.resolve(true)
-          : this._api.parity.setAccountName(address, name),
-        this._api.parity.setAccountMeta(address, Object.assign({
-          description: `${manufacturer} ${name}`,
-          hardware: {
-            manufacturer
-          },
-          tags: ['hardware'],
-          timestamp: Date.now()
-        }, original.meta || {}))
-      ])
-      .catch((error) => {
-        console.warn('HardwareStore::createEntry', error);
-        throw error;
-      });
-  }
-
-  signLedger (transaction) {
-    return this._ledger.signTransaction(transaction);
-  }
-
-  static get (api) {
-    if (!instance) {
-      instance = new HardwareStore(api);
-    }
-
-    return instance;
-  }
-}
-
-export {
-  HW_SCAN_INTERVAL
-};
diff --git a/js/src/mobx/hardwareStore.spec.js b/js/src/mobx/hardwareStore.spec.js
deleted file mode 100644
index 784fc3f104736ae20a8cbba6e91c4e1008c07ede..0000000000000000000000000000000000000000
--- a/js/src/mobx/hardwareStore.spec.js
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import HardwareStore, { HW_SCAN_INTERVAL } from './hardwareStore';
-
-const ADDRESS = '0x1234567890123456789012345678901234567890';
-const WALLET = {
-  address: ADDRESS,
-  name: 'testing'
-};
-
-let api;
-let clock;
-let ledger;
-let store;
-
-function createApi () {
-  api = {
-    parity: {
-      hardwareAccountsInfo: sinon.stub().resolves({ ADDRESS: WALLET }),
-      setAccountMeta: sinon.stub().resolves(true),
-      setAccountName: sinon.stub().resolves(true)
-    }
-  };
-
-  return api;
-}
-
-function createLedger () {
-  ledger = {
-    isSupported: true,
-    getAppConfiguration: sinon.stub().resolves(),
-    scan: sinon.stub().resolves(WALLET),
-    signTransaction: sinon.stub().resolves()
-  };
-
-  return ledger;
-}
-
-function create () {
-  clock = sinon.useFakeTimers();
-  store = new HardwareStore(createApi());
-  store._ledger = createLedger();
-
-  return store;
-}
-
-function teardown () {
-  clock.restore();
-}
-
-describe('mobx/HardwareStore', () => {
-  beforeEach(() => {
-    create();
-  });
-
-  afterEach(() => {
-    teardown();
-  });
-
-  describe('@computed', () => {
-    describe('isConnected', () => {
-      beforeEach(() => {
-        store.setWallets({ [ADDRESS]: WALLET });
-      });
-
-      it('returns true for available', () => {
-        expect(store.isConnected(ADDRESS)).to.be.true;
-      });
-
-      it('returns false for non-available', () => {
-        expect(store.isConnected('nothing')).to.be.false;
-      });
-    });
-  });
-
-  describe('background polling', () => {
-    let pollId;
-
-    beforeEach(() => {
-      pollId = store._pollId;
-      sinon.spy(store, 'scan');
-    });
-
-    afterEach(() => {
-      store.scan.restore();
-    });
-
-    it('starts the polling at creation', () => {
-      expect(pollId).not.to.be.null;
-    });
-
-    it('scans when timer elapsed', () => {
-      expect(store.scan).not.to.have.been.called;
-      clock.tick(HW_SCAN_INTERVAL + 1);
-      expect(store.scan).to.have.been.called;
-    });
-  });
-
-  describe('@action', () => {
-    describe('setScanning', () => {
-      it('sets the flag', () => {
-        store.setScanning('testScanning');
-        expect(store.isScanning).to.equal('testScanning');
-      });
-    });
-
-    describe('setWallets', () => {
-      it('sets the wallets', () => {
-        store.setWallets('testWallet');
-        expect(store.wallets).to.equal('testWallet');
-      });
-    });
-  });
-
-  describe('operations', () => {
-    describe('createAccountInfo', () => {
-      describe('when not existing', () => {
-        beforeEach(() => {
-          return store.createAccountInfo({
-            address: 'testAddr',
-            manufacturer: 'testMfg',
-            name: 'testName'
-          });
-        });
-
-        it('calls into parity_setAccountName', () => {
-          expect(api.parity.setAccountName).to.have.been.calledWith('testAddr', 'testName');
-        });
-
-        it('calls into parity_setAccountMeta', () => {
-          expect(api.parity.setAccountMeta).to.have.been.calledWith('testAddr', sinon.match({
-            description: 'testMfg testName',
-            hardware: {
-              manufacturer: 'testMfg'
-            },
-            tags: ['hardware']
-          }));
-        });
-      });
-
-      describe('when already exists', () => {
-        beforeEach(() => {
-          return store.createAccountInfo({
-            address: 'testAddr',
-            manufacturer: 'testMfg',
-            name: 'testName'
-          }, {
-            name: 'originalName',
-            meta: {
-              description: 'originalDescription',
-              tags: ['tagA', 'tagB']
-            }
-          });
-        });
-
-        it('does not call into parity_setAccountName', () => {
-          expect(api.parity.setAccountName).not.to.have.been.called;
-        });
-
-        it('calls into parity_setAccountMeta', () => {
-          expect(api.parity.setAccountMeta).to.have.been.calledWith('testAddr', sinon.match({
-            description: 'originalDescription',
-            hardware: {
-              manufacturer: 'testMfg'
-            },
-            tags: ['tagA', 'tagB']
-          }));
-        });
-      });
-    });
-
-    describe('scanLedger', () => {
-      beforeEach(() => {
-        return store.scanLedger();
-      });
-
-      it('calls scan on the Ledger APIs', () => {
-        expect(ledger.scan).to.have.been.called;
-      });
-    });
-
-    describe('scanParity', () => {
-      beforeEach(() => {
-        return store.scanParity();
-      });
-
-      it('calls parity_hardwareAccountsInfo', () => {
-        expect(api.parity.hardwareAccountsInfo).to.have.been.called;
-      });
-    });
-
-    describe('scan', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setScanning');
-        sinon.spy(store, 'setWallets');
-        sinon.spy(store, 'scanLedger');
-        sinon.spy(store, 'scanParity');
-
-        return store.scan();
-      });
-
-      afterEach(() => {
-        store.setScanning.restore();
-        store.setWallets.restore();
-        store.scanLedger.restore();
-        store.scanParity.restore();
-      });
-
-      it('calls scanLedger', () => {
-        expect(store.scanLedger).to.have.been.called;
-      });
-
-      it('calls scanParity', () => {
-        expect(store.scanParity).to.have.been.called;
-      });
-
-      it('sets and resets the scanning state', () => {
-        expect(store.setScanning).to.have.been.calledWith(true);
-        expect(store.setScanning).to.have.been.calledWith(false);
-      });
-
-      it('sets the wallets', () => {
-        expect(store.setWallets).to.have.been.called;
-      });
-    });
-
-    describe('signLedger', () => {
-      beforeEach(() => {
-        return store.signLedger('testTx');
-      });
-
-      it('calls signTransaction on the ledger', () => {
-        expect(ledger.signTransaction).to.have.been.calledWith('testTx');
-      });
-    });
-  });
-});
diff --git a/js/src/mobx/historyStore.js b/js/src/mobx/historyStore.js
deleted file mode 100644
index fd18fd931ec211cdd14f552c1321085287101f98..0000000000000000000000000000000000000000
--- a/js/src/mobx/historyStore.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-import localStore from 'store';
-
-const LS_KEY = '_parity::history';
-const MAX_ENTRIES = 5;
-
-const instances = {};
-
-export default class Store {
-  @observable history = [];
-
-  constructor (type) {
-    this.historyKey = `${LS_KEY}::${type}`;
-    this.load();
-  }
-
-  @action add = (entry, type) => {
-    this.history = [{
-      entry,
-      timestamp: Date.now(),
-      type
-    }].concat(this.history.filter((h) => h.entry !== entry)).slice(0, MAX_ENTRIES);
-    this.save();
-  }
-
-  @action clear = () => {
-    this.history = [];
-    this.save();
-  }
-
-  @action load = () => {
-    this.history = localStore.get(this.historyKey) || [];
-  }
-
-  save = () => {
-    return localStore.set(this.historyKey, this.history);
-  }
-
-  static get (type) {
-    if (!instances[type]) {
-      instances[type] = new Store(type);
-    }
-
-    return instances[type];
-  }
-}
diff --git a/js/src/mobx/historyStore.spec.js b/js/src/mobx/historyStore.spec.js
deleted file mode 100644
index b791eb036d224dab4f9a02e29fc231782e521093..0000000000000000000000000000000000000000
--- a/js/src/mobx/historyStore.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Store from './historyStore';
-
-const TEST_ENTRY_1 = 'testing 1';
-const TEST_ENTRY_2 = 'testing 2';
-const TEST_ENTRY_3 = 'testing 3';
-
-let store;
-
-function create () {
-  store = Store.get('test');
-  store.clear();
-
-  return store;
-}
-
-describe('mobx/HistoryStore', () => {
-  beforeEach(() => {
-    create();
-  });
-
-  describe('@action', () => {
-    describe('add', () => {
-      it('adds the url to the list (front)', () => {
-        store.add(TEST_ENTRY_1);
-        expect(store.history[0].entry).to.equal(TEST_ENTRY_1);
-      });
-
-      it('adds multiples to the list', () => {
-        store.add(TEST_ENTRY_1);
-        store.add(TEST_ENTRY_2);
-
-        expect(store.history.length).to.equal(2);
-        expect(store.history[0].entry).to.equal(TEST_ENTRY_2);
-        expect(store.history[1].entry).to.equal(TEST_ENTRY_1);
-      });
-
-      it('does not add duplicates', () => {
-        store.add(TEST_ENTRY_2);
-        store.add(TEST_ENTRY_2);
-
-        expect(store.history.length).to.equal(1);
-        expect(store.history[0].entry).to.equal(TEST_ENTRY_2);
-      });
-    });
-
-    describe('clear', () => {
-      it('empties the list', () => {
-        store.add(TEST_ENTRY_3);
-        store.clear();
-
-        expect(store.history.length).to.equal(0);
-      });
-    });
-  });
-});
diff --git a/js/src/modals/AddAddress/addAddress.js b/js/src/modals/AddAddress/addAddress.js
deleted file mode 100644
index 26e315405d1ee53acbadd6ad87d6d3b5bf243812..0000000000000000000000000000000000000000
--- a/js/src/modals/AddAddress/addAddress.js
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Button, Form, Input, InputAddress, ModalBox, Portal } from '~/ui';
-import { AddIcon, AddressesIcon, CancelIcon } from '~/ui/Icons';
-
-import Store from './store';
-
-@observer
-export default class AddAddress extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    address: PropTypes.string,
-    contacts: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired
-  };
-
-  store = new Store(this.context.api, this.props.contacts);
-
-  componentWillMount () {
-    if (this.props.address) {
-      this.onEditAddress(null, this.props.address);
-    }
-  }
-
-  render () {
-    return (
-      <Portal
-        buttons={ this.renderDialogActions() }
-        onClose={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='addAddress.label'
-            defaultMessage='add saved address'
-          />
-        }
-        visible
-      >
-        { this.renderFields() }
-      </Portal>
-    );
-  }
-
-  renderDialogActions () {
-    const { hasError } = this.store;
-
-    return [
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='addAddress.button.close'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.onClose }
-      />,
-      <Button
-        disabled={ hasError }
-        icon={ <AddIcon /> }
-        key='save'
-        label={
-          <FormattedMessage
-            id='addAddress.button.add'
-            defaultMessage='Save Address'
-          />
-        }
-        onClick={ this.onAdd }
-      />
-    ];
-  }
-
-  renderFields () {
-    const { address, addressError, description, name, nameError } = this.store;
-
-    return (
-      <ModalBox
-        icon={ <AddressesIcon /> }
-        summary={
-          <FormattedMessage
-            id='addAddress.header'
-            defaultMessage='To add a new entry to your addressbook, you need the network address of the account and can supply an optional description. Once added it will reflect in your address book.'
-          />
-        }
-      >
-        <Form>
-          <InputAddress
-            allowCopy={ false }
-            autoFocus
-            disabled={ !!this.props.address }
-            error={ addressError }
-            hint={
-              <FormattedMessage
-                id='addAddress.input.address.hint'
-                defaultMessage='the network address for the entry'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='addAddress.input.address.label'
-                defaultMessage='network address'
-              />
-            }
-            onChange={ this.onEditAddress }
-            value={ address }
-          />
-          <Input
-            error={ nameError }
-            hint={
-              <FormattedMessage
-                id='addAddress.input.name.hint'
-                defaultMessage='a descriptive name for the entry'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='addAddress.input.name.label'
-                defaultMessage='address name'
-              />
-            }
-            onChange={ this.onEditName }
-            value={ name }
-          />
-          <Input
-            hint={
-              <FormattedMessage
-                id='addAddress.input.description.hint'
-                defaultMessage='an expanded description for the entry'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='addAddress.input.description.label'
-                defaultMessage='(optional) address description'
-              />
-            }
-            onChange={ this.onEditDescription }
-            value={ description }
-          />
-        </Form>
-      </ModalBox>
-    );
-  }
-
-  onEditAddress = (event, address) => {
-    this.store.setAddress(address);
-  }
-
-  onEditDescription = (event, description) => {
-    this.store.setDescription(description);
-  }
-
-  onEditName = (event, name) => {
-    this.store.setName(name);
-  }
-
-  onAdd = () => {
-    this.store.add();
-    this.onClose();
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-}
diff --git a/js/src/modals/AddAddress/addAddress.spec.js b/js/src/modals/AddAddress/addAddress.spec.js
deleted file mode 100644
index 1363776511d9effc54eeecb1b86542f6b07ca03b..0000000000000000000000000000000000000000
--- a/js/src/modals/AddAddress/addAddress.spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import AddAddress from './';
-
-describe('modals/AddAddress', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(
-        shallow(
-          <AddAddress />
-        )
-      ).to.be.ok;
-    });
-  });
-});
diff --git a/js/src/modals/AddAddress/index.js b/js/src/modals/AddAddress/index.js
deleted file mode 100644
index eb2fb90812e6b1c1498892985b8435c0a1346898..0000000000000000000000000000000000000000
--- a/js/src/modals/AddAddress/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './addAddress';
diff --git a/js/src/modals/AddAddress/store.js b/js/src/modals/AddAddress/store.js
deleted file mode 100644
index 3980e2f7f8579b157a2c03783641db372d1a5df4..0000000000000000000000000000000000000000
--- a/js/src/modals/AddAddress/store.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, transaction, observable } from 'mobx';
-
-import { ERRORS, validateAddress, validateName } from '~/util/validation';
-
-export default class Store {
-  @observable address = '';
-  @observable addressError = ERRORS.invalidAddress;
-  @observable createError = null;
-  @observable description = '';
-  @observable name = '';
-  @observable nameError = ERRORS.invalidName;
-
-  constructor (api, contacts) {
-    this._api = api;
-    this._contacts = contacts;
-  }
-
-  @computed get hasError () {
-    return !!(this.addressError || this.nameError);
-  }
-
-  @action setAddress = (_address) => {
-    let { address, addressError } = validateAddress(_address);
-
-    if (!addressError) {
-      const contact = this._contacts[address];
-
-      if (contact) {
-        addressError = ERRORS.duplicateAddress;
-      }
-    }
-
-    transaction(() => {
-      this.address = address;
-      this.addressError = addressError;
-    });
-  }
-
-  @action setCreateError = (error) => {
-    this.createError = error;
-  }
-
-  @action setDescription = (description) => {
-    this.description = description;
-  }
-
-  @action setName = (_name) => {
-    const { name, nameError } = validateName(_name);
-
-    transaction(() => {
-      this.name = name;
-      this.nameError = nameError;
-    });
-  }
-
-  add () {
-    return Promise
-      .all([
-        this._api.parity.setAccountName(this.address, this.name),
-        this._api.parity.setAccountMeta(this.address, {
-          description: this.description,
-          timestamp: Date.now(),
-          deleted: false
-        })
-      ])
-      .catch((error) => {
-        console.warn('Store:add', error);
-        this.setCreateError(error);
-      });
-  }
-}
diff --git a/js/src/modals/AddAddress/store.spec.js b/js/src/modals/AddAddress/store.spec.js
deleted file mode 100644
index 47cab0df8881aaf7786329d088a7dae56dfecdd4..0000000000000000000000000000000000000000
--- a/js/src/modals/AddAddress/store.spec.js
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Store from './store';
-
-import { TEST_ADDR_A, TEST_ADDR_B, TEST_CONTACTS } from './store.test.js';
-
-describe('modals/AddAddress/store', () => {
-  let store;
-
-  describe('@action', () => {
-    beforeEach(() => {
-      store = new Store(null, TEST_CONTACTS);
-    });
-
-    describe('setAddress', () => {
-      it('successfully sets non-existent addresses', () => {
-        store.setAddress(TEST_ADDR_B);
-
-        expect(store.addressError).to.be.null;
-        expect(store.address).to.equal(TEST_ADDR_B);
-      });
-
-      it('fails on invalid addresses', () => {
-        store.setAddress('0xinvalid');
-
-        expect(store.addressError).not.to.be.null;
-      });
-
-      it('fails when an address is already added', () => {
-        store.setAddress(TEST_ADDR_A);
-
-        expect(store.addressError).not.to.be.null;
-      });
-    });
-
-    describe('setName', () => {
-      it('sucessfully sets valid names', () => {
-        const name = 'Test Name';
-
-        store.setName(name);
-
-        expect(store.nameError).to.be.null;
-        expect(store.name).to.equal(name);
-      });
-
-      it('fails when name is invalid', () => {
-        store.setName(null);
-
-        expect(store.nameError).not.to.be.null;
-      });
-    });
-  });
-
-  describe('@computed', () => {
-    beforeEach(() => {
-      store = new Store(null, TEST_CONTACTS);
-    });
-
-    describe('hasError', () => {
-      beforeEach(() => {
-        store.setAddress(TEST_ADDR_B);
-        store.setName('Test Name');
-      });
-
-      it('returns false proper inputs', () => {
-        expect(store.hasError).to.be.false;
-      });
-
-      it('returns true with addressError', () => {
-        store.setAddress(TEST_ADDR_A);
-
-        expect(store.addressError).not.to.be.null;
-        expect(store.hasError).to.be.true;
-      });
-
-      it('returns true with nameError', () => {
-        store.setName(null);
-
-        expect(store.nameError).not.to.be.null;
-        expect(store.hasError).to.be.true;
-      });
-    });
-  });
-
-  describe('methods', () => {
-    let api;
-
-    beforeEach(() => {
-      api = {
-        parity: {
-          setAccountMeta: sinon.stub().resolves(true),
-          setAccountName: sinon.stub().resolves(true)
-        }
-      };
-      store = new Store(api, {});
-    });
-
-    describe('add', () => {
-      it('calls setAccountMeta', () => {
-        store.add();
-
-        expect(api.parity.setAccountMeta).to.have.been.called;
-      });
-
-      it('calls setAccountName', () => {
-        store.add();
-
-        expect(api.parity.setAccountName).to.have.been.called;
-      });
-    });
-  });
-});
diff --git a/js/src/modals/AddAddress/store.test.js b/js/src/modals/AddAddress/store.test.js
deleted file mode 100644
index b0f4c21d467952ab1de69a491c1f77d946d06f2d..0000000000000000000000000000000000000000
--- a/js/src/modals/AddAddress/store.test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const TEST_ADDR_A = '0x63Cf90D3f0410092FC0fca41846f596223979195';
-const TEST_ADDR_B = '0x00A40dEfa9933e82244bE542Fa7F8748eCCdd457';
-
-const TEST_CONTACTS = {
-  [TEST_ADDR_A]: { name: 'test', meta: {} }
-};
-
-export {
-  TEST_ADDR_A,
-  TEST_ADDR_B,
-  TEST_CONTACTS
-};
diff --git a/js/src/modals/AddContract/addContract.css b/js/src/modals/AddContract/addContract.css
deleted file mode 100644
index 5a55efaeffd70a6287b1038ee706026979a8b379..0000000000000000000000000000000000000000
--- a/js/src/modals/AddContract/addContract.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
diff --git a/js/src/modals/AddContract/addContract.js b/js/src/modals/AddContract/addContract.js
deleted file mode 100644
index f10515d1b43e00dc5c0b3694d39a657bb0d3e735..0000000000000000000000000000000000000000
--- a/js/src/modals/AddContract/addContract.js
+++ /dev/null
@@ -1,293 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { newError } from '~/redux/actions';
-import { Button, Form, Input, InputAddress, Portal, RadioButtons } from '~/ui';
-import { AddIcon, CancelIcon, NextIcon, PrevIcon } from '~/ui/Icons';
-
-import Store from './store';
-
-@observer
-class AddContract extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    contracts: PropTypes.object.isRequired,
-    newError: PropTypes.func.isRequired,
-    onClose: PropTypes.func
-  };
-
-  store = new Store(this.context.api, this.props.contracts);
-
-  render () {
-    const { step } = this.store;
-
-    return (
-      <Portal
-        activeStep={ step }
-        buttons={ this.renderDialogActions() }
-        onClose={ this.onClose }
-        open
-        steps={ [
-          <FormattedMessage
-            id='addContract.title.type'
-            defaultMessage='choose a contract type'
-            key='type'
-          />,
-          <FormattedMessage
-            id='addContract.title.details'
-            defaultMessage='enter contract details'
-            key='details'
-          />
-        ] }
-      >
-        { this.renderStep() }
-      </Portal>
-    );
-  }
-
-  renderStep () {
-    const { step } = this.store;
-
-    switch (step) {
-      case 0:
-        return this.renderContractTypeSelector();
-
-      default:
-        return this.renderFields();
-    }
-  }
-
-  renderContractTypeSelector () {
-    const { abiTypeIndex, abiTypes } = this.store;
-
-    return (
-      <RadioButtons
-        name='contractType'
-        value={ abiTypeIndex }
-        values={ abiTypes }
-        onChange={ this.onChangeABIType }
-      />
-    );
-  }
-
-  renderDialogActions () {
-    const { step } = this.store;
-
-    const cancelBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='addContract.button.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.onClose }
-      />
-    );
-
-    if (step === 0) {
-      return [
-        cancelBtn,
-        <Button
-          icon={ <NextIcon /> }
-          key='next'
-          label={
-            <FormattedMessage
-              id='addContract.button.next'
-              defaultMessage='Next'
-            />
-          }
-          onClick={ this.onNext }
-        />
-      ];
-    }
-
-    return [
-      cancelBtn,
-      <Button
-        icon={ <PrevIcon /> }
-        key='prev'
-        label={
-          <FormattedMessage
-            id='addContract.button.prev'
-            defaultMessage='Back'
-          />
-        }
-        onClick={ this.onPrev }
-      />,
-      <Button
-        icon={ <AddIcon /> }
-        key='add'
-        label={
-          <FormattedMessage
-            id='addContract.button.add'
-            defaultMessage='Add Contract'
-          />
-        }
-        disabled={ this.store.hasError }
-        onClick={ this.onAdd }
-      />
-    ];
-  }
-
-  renderFields () {
-    const { abi, abiError, abiType, address, addressError, description, name, nameError } = this.store;
-
-    return (
-      <Form>
-        <InputAddress
-          autoFocus
-          error={ addressError }
-          hint={
-            <FormattedMessage
-              id='addContract.address.hint'
-              defaultMessage='the network address for the contract'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='addContract.address.label'
-              defaultMessage='network address'
-            />
-          }
-          onChange={ this.onChangeAddress }
-          onSubmit={ this.onEditAddress }
-          value={ address }
-        />
-        <Input
-          error={ nameError }
-          hint={
-            <FormattedMessage
-              id='addContract.name.hint'
-              defaultMessage='a descriptive name for the contract'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='addContract.name.label'
-              defaultMessage='contract name'
-            />
-          }
-          onSubmit={ this.onEditName }
-          value={ name }
-        />
-        <Input
-          hint={
-            <FormattedMessage
-              id='addContract.description.hint'
-              defaultMessage='an expanded description for the entry'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='addContract.description.label'
-              defaultMessage='(optional) contract description'
-            />
-          }
-          onSubmit={ this.onEditDescription }
-          value={ description }
-        />
-        <Input
-          error={ abiError }
-          hint={
-            <FormattedMessage
-              id='addContract.abi.hint'
-              defaultMessage='the abi for the contract'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='addContract.abi.label'
-              defaultMessage='contract abi'
-            />
-          }
-          onSubmit={ this.onEditAbi }
-          readOnly={ abiType.readOnly }
-          value={ abi }
-        />
-      </Form>
-    );
-  }
-
-  onNext = () => {
-    this.store.nextStep();
-  }
-
-  onPrev = () => {
-    this.store.prevStep();
-  }
-
-  onChangeABIType = (value, index) => {
-    this.store.setAbiTypeIndex(index);
-  }
-
-  onEditAbi = (abi) => {
-    this.store.setAbi(abi);
-  }
-
-  onChangeAddress = (event, address) => {
-    this.onEditAddress(address);
-  }
-
-  onEditAddress = (address) => {
-    this.store.setAddress(address);
-  }
-
-  onEditDescription = (description) => {
-    this.store.setDescription(description);
-  }
-
-  onEditName = (name) => {
-    this.store.setName(name);
-  }
-
-  onAdd = () => {
-    return this.store
-      .addContract()
-      .then(() => {
-        this.onClose();
-      })
-      .catch((error) => {
-        this.props.newError(error);
-      });
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError
-  }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(AddContract);
diff --git a/js/src/modals/AddContract/addContract.spec.js b/js/src/modals/AddContract/addContract.spec.js
deleted file mode 100644
index df462bc4be76a80d2c02015aa6676f9b3d4e7366..0000000000000000000000000000000000000000
--- a/js/src/modals/AddContract/addContract.spec.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import AddContract from './';
-
-import { CONTRACTS, createApi, createRedux } from './addContract.test.js';
-
-let api;
-let component;
-let instance;
-let onClose;
-let reduxStore;
-
-function render (props = {}) {
-  api = createApi();
-  onClose = sinon.stub();
-  reduxStore = createRedux();
-
-  component = shallow(
-    <AddContract
-      { ...props }
-      contracts={ CONTRACTS }
-      onClose={ onClose }
-    />,
-    { context: { store: reduxStore } }
-  ).find('AddContract').shallow({ context: { api } });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/AddContract', () => {
-  describe('rendering', () => {
-    beforeEach(() => {
-      render();
-    });
-
-    it('renders the defauls', () => {
-      expect(component).to.be.ok;
-    });
-  });
-
-  describe('onAdd', () => {
-    it('calls store addContract', () => {
-      sinon.stub(instance.store, 'addContract').resolves(true);
-      return instance.onAdd().then(() => {
-        expect(instance.store.addContract).to.have.been.called;
-        instance.store.addContract.restore();
-      });
-    });
-
-    it('calls closes dialog on success', () => {
-      sinon.stub(instance.store, 'addContract').resolves(true);
-      return instance.onAdd().then(() => {
-        expect(onClose).to.have.been.called;
-        instance.store.addContract.restore();
-      });
-    });
-
-    it('adds newError on failure', () => {
-      sinon.stub(instance.store, 'addContract').rejects('test');
-      return instance.onAdd().then(() => {
-        expect(reduxStore.dispatch).to.have.been.calledWith({ error: new Error('test'), type: 'newError' });
-        instance.store.addContract.restore();
-      });
-    });
-  });
-});
diff --git a/js/src/modals/AddContract/addContract.test.js b/js/src/modals/AddContract/addContract.test.js
deleted file mode 100644
index e1f38b5cf626630a5d337cb6c1ca2f907f6033d1..0000000000000000000000000000000000000000
--- a/js/src/modals/AddContract/addContract.test.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-const ABI = '[{"constant":true,"inputs":[],"name":"totalDonated","outputs":[{"name":"","type":"uint256"}],"type":"function"}]';
-
-const CONTRACTS = {
-  '0x1234567890123456789012345678901234567890': {}
-};
-
-function createApi () {
-  return {
-    parity: {
-      setAccountMeta: sinon.stub().resolves(),
-      setAccountName: sinon.stub().resolves()
-    }
-  };
-}
-
-function createRedux () {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {};
-    }
-  };
-}
-
-export {
-  ABI,
-  CONTRACTS,
-  createApi,
-  createRedux
-};
diff --git a/js/src/modals/AddContract/index.js b/js/src/modals/AddContract/index.js
deleted file mode 100644
index 3a5985daab8a50d3093153a44177844a9066463b..0000000000000000000000000000000000000000
--- a/js/src/modals/AddContract/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './addContract';
diff --git a/js/src/modals/AddContract/store.js b/js/src/modals/AddContract/store.js
deleted file mode 100644
index 9d47e5f1ded62283db776969f820506ca84a8e81..0000000000000000000000000000000000000000
--- a/js/src/modals/AddContract/store.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, observable, transaction } from 'mobx';
-
-import { ERRORS, validateAbi, validateAddress, validateName } from '~/util/validation';
-
-import { ABI_TYPES } from './types';
-
-export default class Store {
-  @observable abi = '';
-  @observable abiError = ERRORS.invalidAbi;
-  @observable abiParsed = null;
-  @observable abiTypes = ABI_TYPES;
-  @observable abiTypeIndex = 0;
-  @observable address = '';
-  @observable addressError = ERRORS.invalidAddress;
-  @observable description = '';
-  @observable name = '';
-  @observable nameError = ERRORS.invalidName;
-  @observable step = 0;
-
-  constructor (api, contracts) {
-    this._api = api;
-    this._contracts = contracts;
-
-    this.setAbiTypeIndex(2);
-  }
-
-  @computed get abiType () {
-    return this.abiTypes[this.abiTypeIndex];
-  }
-
-  @computed get hasError () {
-    return !!(this.abiError || this.addressError || this.nameError);
-  }
-
-  @action nextStep = () => {
-    this.step++;
-  }
-
-  @action prevStep = () => {
-    this.step--;
-  }
-
-  @action setAbi = (_abi) => {
-    const { abi, abiError, abiParsed } = validateAbi(_abi);
-
-    transaction(() => {
-      this.abi = abi;
-      this.abiError = abiError;
-      this.abiParsed = abiParsed;
-    });
-  }
-
-  @action setAbiTypeIndex = (abiTypeIndex) => {
-    transaction(() => {
-      this.abiTypeIndex = abiTypeIndex;
-      this.setAbi(this.abiTypes[abiTypeIndex].value);
-    });
-  }
-
-  @action setAddress = (_address) => {
-    let { address, addressError } = validateAddress(_address);
-
-    if (!addressError) {
-      const contract = this._contracts[address];
-
-      if (contract) {
-        addressError = ERRORS.duplicateAddress;
-      }
-    }
-
-    transaction(() => {
-      this.address = address;
-      this.addressError = addressError;
-    });
-  }
-
-  @action setDescription = (description) => {
-    this.description = description;
-  }
-
-  @action setName = (_name) => {
-    const { name, nameError } = validateName(_name);
-
-    transaction(() => {
-      this.name = name;
-      this.nameError = nameError;
-    });
-  }
-
-  addContract () {
-    const meta = {
-      contract: true,
-      deleted: false,
-      timestamp: Date.now(),
-      abi: this.abiParsed,
-      type: this.abiType.type,
-      description: this.description
-    };
-
-    return Promise
-      .all([
-        this._api.parity.setAccountName(this.address, this.name),
-        this._api.parity.setAccountMeta(this.address, meta)
-      ])
-      .catch((error) => {
-        console.error('addContract', error);
-        throw error;
-      });
-  }
-}
diff --git a/js/src/modals/AddContract/store.spec.js b/js/src/modals/AddContract/store.spec.js
deleted file mode 100644
index 1305bd6e8aa8b98a696e8f1c650b3fa88bfdc65f..0000000000000000000000000000000000000000
--- a/js/src/modals/AddContract/store.spec.js
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Store from './store';
-
-import { ABI, CONTRACTS, createApi } from './addContract.test.js';
-
-const INVALID_ADDR = '0x123';
-const VALID_ADDR = '0x5A5eFF38DA95b0D58b6C616f2699168B480953C9';
-const DUPE_ADDR = Object.keys(CONTRACTS)[0];
-
-let api;
-let store;
-
-function createStore () {
-  api = createApi();
-  store = new Store(api, CONTRACTS);
-}
-
-describe('modals/AddContract/Store', () => {
-  beforeEach(() => {
-    createStore();
-  });
-
-  describe('constructor', () => {
-    it('creates an instance', () => {
-      expect(store).to.be.ok;
-    });
-
-    it('defaults to custom ABI', () => {
-      expect(store.abiType.type).to.equal('custom');
-    });
-  });
-
-  describe('@actions', () => {
-    describe('nextStep/prevStep', () => {
-      it('moves to the next/prev step', () => {
-        expect(store.step).to.equal(0);
-        store.nextStep();
-        expect(store.step).to.equal(1);
-        store.prevStep();
-        expect(store.step).to.equal(0);
-      });
-    });
-
-    describe('setAbiTypeIndex', () => {
-      beforeEach(() => {
-        store.setAbiTypeIndex(1);
-      });
-
-      it('changes the index', () => {
-        expect(store.abiTypeIndex).to.equal(1);
-      });
-
-      it('changes the abi', () => {
-        expect(store.abi).to.deep.equal(store.abiTypes[1].value);
-      });
-    });
-
-    describe('setAddress', () => {
-      it('sets a valid address', () => {
-        store.setAddress(VALID_ADDR);
-        expect(store.address).to.equal(VALID_ADDR);
-        expect(store.addressError).to.be.null;
-      });
-
-      it('sets the error on invalid address', () => {
-        store.setAddress(INVALID_ADDR);
-        expect(store.address).to.equal(INVALID_ADDR);
-        expect(store.addressError).not.to.be.null;
-      });
-
-      it('sets the error on suplicate address', () => {
-        store.setAddress(DUPE_ADDR);
-        expect(store.address).to.equal(DUPE_ADDR);
-        expect(store.addressError).not.to.be.null;
-      });
-    });
-
-    describe('setDescription', () => {
-      it('sets the description', () => {
-        store.setDescription('test description');
-        expect(store.description).to.equal('test description');
-      });
-    });
-
-    describe('setName', () => {
-      it('sets the name', () => {
-        store.setName('some name');
-        expect(store.name).to.equal('some name');
-        expect(store.nameError).to.be.null;
-      });
-
-      it('sets the error', () => {
-        store.setName('s');
-        expect(store.name).to.equal('s');
-        expect(store.nameError).not.to.be.null;
-      });
-    });
-  });
-
-  describe('@computed', () => {
-    describe('abiType', () => {
-      it('matches the index', () => {
-        expect(store.abiType).to.deep.equal(store.abiTypes[2]);
-      });
-    });
-
-    describe('hasError', () => {
-      beforeEach(() => {
-        store.setAddress(VALID_ADDR);
-        store.setName('valid name');
-        store.setAbi(ABI);
-      });
-
-      it('is false with no errors', () => {
-        expect(store.hasError).to.be.false;
-      });
-
-      it('is true with address error', () => {
-        store.setAddress(DUPE_ADDR);
-        expect(store.hasError).to.be.true;
-      });
-
-      it('is true with name error', () => {
-        store.setName('s');
-        expect(store.hasError).to.be.true;
-      });
-
-      it('is true with abi error', () => {
-        store.setAbi('');
-        expect(store.hasError).to.be.true;
-      });
-    });
-  });
-
-  describe('interactions', () => {
-    describe('addContract', () => {
-      beforeEach(() => {
-        store.setAddress(VALID_ADDR);
-        store.setName('valid name');
-        store.setAbi(ABI);
-      });
-
-      it('sets the account name', () => {
-        return store.addContract().then(() => {
-          expect(api.parity.setAccountName).to.have.been.calledWith(VALID_ADDR, 'valid name');
-        });
-      });
-
-      it('sets the account meta', () => {
-        return store.addContract().then(() => {
-          expect(api.parity.setAccountMeta).to.have.been.called;
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/modals/AddContract/types.js b/js/src/modals/AddContract/types.js
deleted file mode 100644
index dd1e20fbc6291f75cd64b7d7ec53627ac76c544f..0000000000000000000000000000000000000000
--- a/js/src/modals/AddContract/types.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { eip20, foundationWallet } from '~/contracts/abi';
-
-const ABI_TYPES = [
-  {
-    description: (
-      <FormattedMessage
-        id='addContract.abiType.token.description'
-        defaultMessage='A standard {erc20} token'
-        values={ {
-          erc20: (
-            <a href='https://github.com/ethereum/EIPs/issues/20' target='_blank'>
-              <FormattedMessage
-                id='addContract.abiType.token.erc20'
-                defaultMessage='ERC 20'
-              />
-            </a>
-          )
-        } }
-      />
-    ),
-    label: (
-      <FormattedMessage
-        id='addContract.abiType.token.label'
-        defaultMessage='Token'
-      />
-    ),
-    readOnly: true,
-    type: 'token',
-    value: JSON.stringify(eip20)
-  },
-  {
-    description: (
-      <FormattedMessage
-        id='addContract.abiType.multisigWallet.description'
-        defaultMessage='Ethereum Multisig contract {link}'
-        values={ {
-          link: (
-            <a href='https://github.com/ethereum/dapp-bin/blob/master/wallet/wallet.sol' target='_blank'>
-              <FormattedMessage
-                id='addContract.abiType.multisigWallet.link'
-                defaultMessage='see contract code'
-              />
-            </a>
-          )
-        } }
-      />
-    ),
-    label: (
-      <FormattedMessage
-        id='addContract.abiType.multisigWallet.label'
-        defaultMessage='Multisig Wallet'
-      />
-    ),
-    readOnly: true,
-    type: 'multisig',
-    value: JSON.stringify(foundationWallet)
-  },
-  {
-    description: (
-      <FormattedMessage
-        id='addContract.abiType.custom.description'
-        defaultMessage='Contract created from custom ABI'
-      />
-    ),
-    label: (
-      <FormattedMessage
-        id='addContract.abiType.custom.label'
-        defaultMessage='Custom Contract'
-      />
-    ),
-    type: 'custom',
-    value: ''
-  }
-];
-
-export {
-  ABI_TYPES
-};
diff --git a/js/src/modals/AddDapps/addDapps.css b/js/src/modals/AddDapps/addDapps.css
deleted file mode 100644
index 2c8779a8485dc35e07534b78140b13b53a04506f..0000000000000000000000000000000000000000
--- a/js/src/modals/AddDapps/addDapps.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.modal {
-  flex-direction: column;
-}
-
-.description {
-  margin-top: .5em !important;
-}
-
-.list {
-  margin-bottom: 1.5em;
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-
-  .background {
-    padding: 0.5em 0;
-  }
-
-  .header {
-    text-transform: uppercase;
-  }
-
-  .byline {
-    font-size: 0.75em;
-    padding-top: 0.5em;
-    line-height: 1.5em;
-    opacity: 0.75;
-  }
-}
diff --git a/js/src/modals/AddDapps/addDapps.js b/js/src/modals/AddDapps/addDapps.js
deleted file mode 100644
index 871b4f505eaa978072f4f6875e9e91189939213a..0000000000000000000000000000000000000000
--- a/js/src/modals/AddDapps/addDapps.js
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { DappCard, Portal, SelectionList } from '~/ui';
-
-import styles from './addDapps.css';
-
-@observer
-export default class AddDapps extends Component {
-  static propTypes = {
-    store: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { store } = this.props;
-
-    if (!store.modalOpen) {
-      return null;
-    }
-
-    return (
-      <Portal
-        className={ styles.modal }
-        onClose={ store.closeModal }
-        open
-        title={
-          <FormattedMessage
-            id='dapps.add.label'
-            defaultMessage='visible applications'
-          />
-        }
-      >
-        <div className={ styles.warning } />
-        {
-          this.renderList(store.sortedLocal, store.displayApps,
-            <FormattedMessage
-              id='dapps.add.local.label'
-              defaultMessage='Applications locally available'
-            />,
-            <FormattedMessage
-              id='dapps.add.local.desc'
-              defaultMessage='All applications installed locally on the machine by the user for access by the Parity client.'
-            />
-          )
-        }
-        {
-          this.renderList(store.sortedBuiltin, store.displayApps,
-            <FormattedMessage
-              id='dapps.add.builtin.label'
-              defaultMessage='Applications bundled with Parity'
-            />,
-            <FormattedMessage
-              id='dapps.add.builtin.desc'
-              defaultMessage='Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.'
-            />
-          )
-        }
-        {
-          this.renderList(store.sortedNetwork, store.displayApps,
-            <FormattedMessage
-              id='dapps.add.network.label'
-              defaultMessage='Applications on the global network'
-            />,
-            <FormattedMessage
-              id='dapps.add.network.desc'
-              defaultMessage='These applications are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each application before interacting.'
-            />
-          )
-        }
-      </Portal>
-    );
-  }
-
-  renderList (items, visibleItems, header, byline) {
-    if (!items || !items.length) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.list }>
-        <div className={ styles.background }>
-          <div className={ styles.header }>{ header }</div>
-          <div className={ styles.byline }>{ byline }</div>
-        </div>
-        <SelectionList
-          isChecked={ this.isVisible }
-          items={ items }
-          noStretch
-          onSelectClick={ this.onSelect }
-          renderItem={ this.renderApp }
-        />
-      </div>
-    );
-  }
-
-  renderApp = (app) => {
-    return (
-      <DappCard
-        app={ app }
-        key={ app.id }
-      />
-    );
-  }
-
-  isVisible = (app) => {
-    const { store } = this.props;
-
-    return store.displayApps[app.id].visible;
-  }
-
-  onSelect = (app) => {
-    const { store } = this.props;
-
-    if (this.isVisible(app)) {
-      store.hideApp(app.id);
-    } else {
-      store.showApp(app.id);
-    }
-  }
-}
diff --git a/js/src/modals/AddDapps/addDapps.spec.js b/js/src/modals/AddDapps/addDapps.spec.js
deleted file mode 100644
index e629a53757cd2bc78a1a99478d8e13f86d990a39..0000000000000000000000000000000000000000
--- a/js/src/modals/AddDapps/addDapps.spec.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import AddDapps from './';
-
-function renderShallow (store = {}) {
-  return shallow(
-    <AddDapps store={ store } />
-  );
-}
-
-describe('modals/AddDapps', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(renderShallow()).to.be.ok;
-    });
-
-    it('does not render the modal with modalOpen = false', () => {
-      expect(
-        renderShallow({ modalOpen: false }).find('Portal')
-      ).to.have.length(0);
-    });
-
-    it('does render the modal with modalOpen = true', () => {
-      expect(
-        renderShallow({ modalOpen: true }).find('Portal')
-      ).to.have.length(1);
-    });
-  });
-});
diff --git a/js/src/modals/AddDapps/index.js b/js/src/modals/AddDapps/index.js
deleted file mode 100644
index 126de130a7642f8086d50653c8ae7277d9ccce5a..0000000000000000000000000000000000000000
--- a/js/src/modals/AddDapps/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './addDapps';
diff --git a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js b/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
deleted file mode 100644
index 137d87d940e362b3e30a3f549dddca91490fe60e..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { IdentityIcon, Input, QrCode, Title } from '~/ui';
-
-import styles from '../createAccount.css';
-
-@observer
-export default class AccountDetails extends Component {
-  static propTypes = {
-    isConfirming: PropTypes.bool,
-    withRequiredBackup: PropTypes.bool,
-    createStore: PropTypes.object.isRequired
-  }
-
-  static defaultPropTypes = {
-    isConfirming: false,
-    withRequiredBackup: false
-  }
-
-  render () {
-    const { address, description, name } = this.props.createStore;
-
-    return (
-      <div className={ styles.details }>
-        <div className={ styles.info }>
-          <div className={ styles.account }>
-            <div className={ styles.name }>
-              <IdentityIcon
-                address={ address }
-                className={ styles.icon }
-                center
-              />
-              <Title
-                byline={ description }
-                className={ styles.title }
-                title={ name }
-              />
-            </div>
-            <div className={ styles.description }>
-              <Input
-                readOnly
-                hideUnderline
-                hint={
-                  <FormattedMessage
-                    id='createAccount.accountDetails.address.hint'
-                    defaultMessage='the network address for the account'
-                  />
-                }
-                label={
-                  <FormattedMessage
-                    id='createAccount.accountDetails.address.label'
-                    defaultMessage='address'
-                  />
-                }
-                value={ address }
-                allowCopy={ address }
-              />
-              { this.renderPhrase() }
-            </div>
-          </div>
-          <QrCode
-            className={ styles.qr }
-            value={ address }
-          />
-        </div>
-      </div>
-    );
-  }
-
-  renderRequiredBackup () {
-    const { phraseBackedUp, phraseBackedUpError } = this.props.createStore;
-
-    if (!this.props.withRequiredBackup) {
-      return null;
-    }
-
-    return (
-      <div>
-        <Input
-          error={ phraseBackedUpError }
-          hint={
-            <FormattedMessage
-              id='createAccount.accountDetails.phrase.hint'
-              defaultMessage='the account recovery phrase'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.accountDetails.phrase.backedUp'
-              defaultMessage='Type "I have written down the phrase" below to confirm it is backed up.'
-            />
-          }
-          onChange={ this.onEditPhraseBackedUp }
-          value={ phraseBackedUp }
-        />
-      </div>
-    );
-  }
-
-  renderPhrase () {
-    const { isConfirming } = this.props;
-    const { isTest, phrase, backupPhraseError } = this.props.createStore;
-
-    const hint = (
-      <FormattedMessage
-        id='createAccount.accountDetails.phrase.hint'
-        defaultMessage='the account recovery phrase'
-      />
-    );
-    const label = (
-      <FormattedMessage
-        id='createAccount.accountDetails.phrase.label'
-        defaultMessage='owner recovery phrase'
-      />
-    );
-
-    if (!isConfirming) {
-      if (!phrase) {
-        return null;
-      }
-
-      return (
-        <div>
-          <Input
-            allowCopy
-            hint={ hint }
-            label={ label }
-            readOnly
-            value={ phrase }
-          />
-          <div className={ styles.backupPhrase }>
-            <FormattedMessage
-              id='createAccount.accountDetails.phrase.backup'
-              defaultMessage='Please back up the recovery phrase now. Make sure to keep it private and secure, it allows full and unlimited access to the account.'
-            />
-          </div>
-          { this.renderRequiredBackup() }
-        </div>
-      );
-    }
-
-    return (
-      <div>
-        <Input
-          allowPaste={ isTest }
-          error={ backupPhraseError }
-          hint={ hint }
-          label={ label }
-          onChange={ this.onEditPhrase }
-          value={ phrase }
-        />
-        <div className={ styles.backupPhrase }>
-          <FormattedMessage
-            id='createAccount.accountDetails.phrase.backupConfirm'
-            defaultMessage='Type your recovery phrase now.'
-          />
-        </div>
-      </div>
-    );
-  }
-
-  onEditPhraseBackedUp = (ev) => {
-    this.props.createStore.setPhraseBackedUp(ev.target.value);
-  }
-
-  onEditPhrase = (ev) => {
-    this.props.createStore.setPhrase(ev.target.value);
-  }
-}
diff --git a/js/src/modals/CreateAccount/AccountDetails/accountDetails.spec.js b/js/src/modals/CreateAccount/AccountDetails/accountDetails.spec.js
deleted file mode 100644
index 99e1837cb424a8518eecbd33ce1faf0cb2686ed8..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/AccountDetails/accountDetails.spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { createStore } from '../createAccount.test.js';
-
-import AccountDetails from './';
-
-let component;
-let store;
-
-function render () {
-  store = createStore();
-  component = shallow(
-    <AccountDetails
-      createStore={ store }
-    />
-  );
-
-  return component;
-}
-
-describe('modals/CreateAccount/AccountDetails', () => {
-  it('renders with defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/CreateAccount/AccountDetails/index.js b/js/src/modals/CreateAccount/AccountDetails/index.js
deleted file mode 100644
index ab1b887737ba636bc3470057d7104e74a59728cd..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/AccountDetails/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './accountDetails';
diff --git a/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js b/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js
deleted file mode 100644
index 37a872e0e6f385cf5d4868aba8d9a5958193cb1f..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { SectionList } from '~/ui';
-import GethCard from '../GethCard';
-
-import styles from '../createAccount.css';
-
-@observer
-export default class AccountDetailsGeth extends Component {
-  static propTypes = {
-    createStore: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { gethAccountsAvailable, gethImported } = this.props.createStore;
-
-    const accounts = gethAccountsAvailable.filter((account) => gethImported.includes(account.address));
-
-    return (
-      <div>
-        <div className={ styles.summary }>
-          <FormattedMessage
-            id='createAccount.accountDetailsGeth.imported'
-            defaultMessage='You have completed the import of {number} addresses from the Geth keystore. These will now be available in your accounts list as a normal account, along with their associated balances on the network.'
-            values={ {
-              number: gethImported.length
-            } }
-          />
-        </div>
-        <SectionList
-          items={ accounts }
-          noStretch
-          renderItem={ this.renderAccount }
-        />
-      </div>
-    );
-  }
-
-  renderAccount = (account, index) => {
-    return (
-      <GethCard
-        address={ account.address }
-        balance={ account.balance }
-        name={ `Geth Import ${index + 1}` }
-      />
-    );
-  }
-}
diff --git a/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js b/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js
deleted file mode 100644
index 6099202cfb9f8b0e4dd308630e04eba0d0814f33..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { createStore } from '../createAccount.test.js';
-
-import AccountDetailsGeth from './';
-
-let component;
-let store;
-
-function render () {
-  store = createStore();
-  component = shallow(
-    <AccountDetailsGeth
-      createStore={ store }
-    />
-  );
-
-  return component;
-}
-
-describe('modals/CreateAccount/AccountDetailsGeth', () => {
-  it('renders with defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/CreateAccount/AccountDetailsGeth/index.js b/js/src/modals/CreateAccount/AccountDetailsGeth/index.js
deleted file mode 100644
index a5db55fc402264249a222ee285a3923b285b7e10..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/AccountDetailsGeth/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './accountDetailsGeth';
diff --git a/js/src/modals/CreateAccount/ChangeVault/changeVault.js b/js/src/modals/CreateAccount/ChangeVault/changeVault.js
deleted file mode 100644
index 510251cb2162baad583492002fd9c0a3dd94dd2c..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/ChangeVault/changeVault.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-
-import { VaultSelect } from '~/ui';
-
-@observer
-export default class ChangeVault extends Component {
-  static propTypes = {
-    createStore: PropTypes.object.isRequired,
-    vaultStore: PropTypes.object
-  }
-
-  render () {
-    const { createStore, vaultStore } = this.props;
-    const { vaultName } = createStore;
-
-    if (!vaultStore || vaultStore.vaultsOpened.length === 0) {
-      return null;
-    }
-
-    return (
-      <VaultSelect
-        onSelect={ this.onSelect }
-        value={ vaultName }
-        vaultStore={ vaultStore }
-      />
-    );
-  }
-
-  onSelect = (vaultName) => {
-    const { createStore } = this.props;
-
-    createStore.setVaultName(vaultName);
-  }
-}
diff --git a/js/src/modals/CreateAccount/ChangeVault/changeVault.spec.js b/js/src/modals/CreateAccount/ChangeVault/changeVault.spec.js
deleted file mode 100644
index 789facf8e49abfd7d8911f48a4672def71176aff..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/ChangeVault/changeVault.spec.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import ChangeVault from './';
-
-let component;
-let instance;
-let store;
-let vaultStore;
-
-function createStore () {
-  store = {
-    setVaultName: sinon.stub(),
-    vaultName: 'testing'
-  };
-
-  return store;
-}
-
-function createVaultStore () {
-  vaultStore = {
-    vaultsOpened: ['testing']
-  };
-
-  return vaultStore;
-}
-
-function render () {
-  component = shallow(
-    <ChangeVault
-      createStore={ createStore() }
-      vaultStore={ createVaultStore() }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/CreateAccount/ChangeVault', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('components', () => {
-    describe('VaultSelect', () => {
-      let select;
-
-      beforeEach(() => {
-        select = component.find('VaultSelect');
-      });
-
-      it('renders', () => {
-        expect(select.get(0)).to.be.ok;
-      });
-
-      it('passes onSelect as instance method', () => {
-        expect(select.props().onSelect).to.equal(instance.onSelect);
-      });
-
-      it('passes the value', () => {
-        expect(select.props().value).to.equal('testing');
-      });
-
-      it('passes the vaultStore', () => {
-        expect(select.props().vaultStore).to.equal(vaultStore);
-      });
-    });
-  });
-
-  describe('instance methods', () => {
-    describe('onSelect', () => {
-      it('calls into store setVaultName', () => {
-        instance.onSelect('newName');
-        expect(store.setVaultName).to.have.been.calledWith('newName');
-      });
-    });
-  });
-});
diff --git a/js/src/modals/CreateAccount/ChangeVault/index.js b/js/src/modals/CreateAccount/ChangeVault/index.js
deleted file mode 100644
index 5eac8b21d64837c03845e8ebf64d3ed68497fb4e..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/ChangeVault/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './changeVault';
diff --git a/js/src/modals/CreateAccount/CreationType/creationType.js b/js/src/modals/CreateAccount/CreationType/creationType.js
deleted file mode 100644
index 24e85bba1610584ad4bb82138f3b932284eed12a..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/CreationType/creationType.js
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Container, SelectionList, Title } from '~/ui';
-
-import TypeIcon from '../TypeIcon';
-import styles from '../createAccount.css';
-
-const TYPES = [
-  {
-    description: (
-      <FormattedMessage
-        id='createAccount.creationType.fromNew.description'
-        defaultMessage='Selecting your identity icon and specifying the password'
-      />
-    ),
-    label: (
-      <FormattedMessage
-        id='createAccount.creationType.fromNew.label'
-        defaultMessage='New Account'
-      />
-    ),
-    key: 'fromNew'
-  },
-  {
-    description: (
-      <FormattedMessage
-        id='createAccount.creationType.fromQr.description'
-        defaultMessage='Attach an externally managed account via QR code'
-      />
-    ),
-    label: (
-      <FormattedMessage
-        id='createAccount.creationType.fromQr.label'
-        defaultMessage='External Account'
-      />
-    ),
-    key: 'fromQr'
-  },
-  {
-    description: (
-      <FormattedMessage
-        id='createAccount.creationType.fromGeth.description'
-        defaultMessage='Import accounts from the Geth keystore with the original password'
-      />
-    ),
-    label: (
-      <FormattedMessage
-        id='createAccount.creationType.fromGeth.label'
-        defaultMessage='Geth keystore'
-      />
-    ),
-    key: 'fromGeth'
-  },
-  {
-    description: (
-      <FormattedMessage
-        id='createAccount.creationType.fromJSON.description'
-        defaultMessage='Import an industry-standard JSON keyfile with the original password'
-      />
-    ),
-    label: (
-      <FormattedMessage
-        id='createAccount.creationType.fromJSON.label'
-        defaultMessage='JSON file'
-      />
-    ),
-    key: 'fromJSON'
-  },
-  {
-    description: (
-      <FormattedMessage
-        id='createAccount.creationType.fromRaw.description'
-        defaultMessage='Enter a previously created raw private key with a new password'
-      />
-    ),
-    label: (
-      <FormattedMessage
-        id='createAccount.creationType.fromRaw.label'
-        defaultMessage='Private key'
-      />
-    ),
-    key: 'fromRaw'
-  },
-  {
-    description: (
-      <FormattedMessage
-        id='createAccount.creationType.fromPresale.description'
-        defaultMessage='Import an Ethereum presale wallet file with the original password'
-      />
-    ),
-    label: (
-      <FormattedMessage
-        id='createAccount.creationType.fromPresale.label'
-        defaultMessage='Presale wallet'
-      />
-    ),
-    key: 'fromPresale'
-  }
-];
-
-@observer
-export default class CreationType extends Component {
-  static propTypes = {
-    createStore: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { createType } = this.props.createStore;
-
-    return (
-      <div>
-        <div className={ styles.summary }>
-          <FormattedMessage
-            id='createAccount.creationType.info'
-            defaultMessage='Please select the type of account you want to create. Either create an account via name & password, or import it from a variety of existing sources. From here the wizard will guide you through the process of completing your account creation.'
-          />
-        </div>
-        { this.renderList(createType) }
-      </div>
-    );
-  }
-
-  renderList () {
-    return (
-      <SelectionList
-        isChecked={ this.isSelected }
-        items={ TYPES }
-        noStretch
-        onSelectClick={ this.onChange }
-        onSelectDoubleClick={ this.onSelect }
-        renderItem={ this.renderItem }
-      />
-    );
-  }
-
-  renderItem = (item) => {
-    return (
-      <Container>
-        <div className={ styles.selectItem }>
-          <TypeIcon
-            className={ styles.icon }
-            createStore={ this.props.createStore }
-            type={ item.key }
-          />
-          <Title
-            byline={ item.description }
-            className={ styles.info }
-            title={ item.label }
-          />
-        </div>
-      </Container>
-    );
-  }
-
-  isSelected = (item) => {
-    const { createType } = this.props.createStore;
-
-    return item.key === createType;
-  }
-
-  onChange = (item) => {
-    const { createStore } = this.props;
-
-    createStore.setCreateType(item.key);
-  }
-
-  onSelect = (item) => {
-    const { createStore } = this.props;
-
-    createStore.setCreateType(item.key);
-    createStore.nextStage();
-  }
-}
diff --git a/js/src/modals/CreateAccount/CreationType/creationType.spec.js b/js/src/modals/CreateAccount/CreationType/creationType.spec.js
deleted file mode 100644
index ddeaecae428e86b0bbd83835284dca7c697caa81..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/CreationType/creationType.spec.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { createStore } from '../createAccount.test.js';
-
-import CreationType from './';
-
-let component;
-let instance;
-let store;
-
-function render () {
-  store = createStore();
-  component = shallow(
-    <CreationType
-      createStore={ store }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/CreateAccount/CreationType', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders with defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('events', () => {
-    describe('onChange', () => {
-      beforeEach(() => {
-        instance.onChange({ key: 'testing' });
-      });
-
-      it('changes the store createType', () => {
-        expect(store.createType).to.equal('testing');
-      });
-    });
-  });
-});
diff --git a/js/src/modals/CreateAccount/CreationType/index.js b/js/src/modals/CreateAccount/CreationType/index.js
deleted file mode 100644
index 8e831564a9ce4ed5eacc3b8e6f5a644cbf5b250e..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/CreationType/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './creationType';
diff --git a/js/src/modals/CreateAccount/GethCard/gethCard.js b/js/src/modals/CreateAccount/GethCard/gethCard.js
deleted file mode 100644
index fb95b7515e75db301d699fc59fa4b943be3c2015..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/GethCard/gethCard.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { AccountCard } from '~/ui';
-import { ETH_TOKEN } from '~/util/tokens';
-
-export default class GethCard extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    balance: PropTypes.string.isRequired,
-    name: PropTypes.string.isRequired
-  }
-
-  render () {
-    const { address, balance, name } = this.props;
-
-    return (
-      <AccountCard
-        account={ {
-          address,
-          name
-        } }
-        balance={ {
-          [ETH_TOKEN.id]: balance
-        } }
-      />
-    );
-  }
-}
diff --git a/js/src/modals/CreateAccount/GethCard/index.js b/js/src/modals/CreateAccount/GethCard/index.js
deleted file mode 100644
index 8fdfca3c2c4bf4388ab7ad0e001518025a10a8e4..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/GethCard/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './gethCard';
diff --git a/js/src/modals/CreateAccount/NewAccount/index.js b/js/src/modals/CreateAccount/NewAccount/index.js
deleted file mode 100644
index 80734b486e201d09d5b0f12e71a2c9c40b232f3b..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewAccount/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './newAccount';
diff --git a/js/src/modals/CreateAccount/NewAccount/newAccount.js b/js/src/modals/CreateAccount/NewAccount/newAccount.js
deleted file mode 100644
index 9c6be9f6e136fdc4a2a4eeefa8ea1be89b124154..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewAccount/newAccount.js
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { IconButton } from 'material-ui';
-import { RadioButton, RadioButtonGroup } from 'material-ui/RadioButton';
-
-import { Form, Input, IdentityIcon } from '~/ui';
-import PasswordStrength from '~/ui/Form/PasswordStrength';
-import { RefreshIcon } from '~/ui/Icons';
-import Loading from '~/ui/Loading';
-
-import ChangeVault from '../ChangeVault';
-import styles from '../createAccount.css';
-
-@observer
-export default class CreateAccount extends Component {
-  static propTypes = {
-    newError: PropTypes.func.isRequired,
-    createStore: PropTypes.object.isRequired,
-    vaultStore: PropTypes.object
-  }
-
-  state = {
-    accounts: null,
-    selectedAddress: ''
-  }
-
-  componentWillMount () {
-    return this.createIdentities();
-  }
-
-  render () {
-    const { name, nameError, password, passwordRepeat, passwordRepeatError, passwordHint } = this.props.createStore;
-
-    return (
-      <Form>
-        <Input
-          autoFocus
-          error={ nameError }
-          hint={
-            <FormattedMessage
-              id='createAccount.newAccount.name.hint'
-              defaultMessage='a descriptive name for the account'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.newAccount.name.label'
-              defaultMessage='account name'
-            />
-          }
-          onChange={ this.onEditAccountName }
-          value={ name }
-        />
-        <Input
-          hint={
-            <FormattedMessage
-              id='createAccount.newAccount.hint.hint'
-              defaultMessage='(optional) a hint to help with remembering the password'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.newAccount.hint.label'
-              defaultMessage='password hint'
-            />
-          }
-          onChange={ this.onEditPasswordHint }
-          value={ passwordHint }
-        />
-        <div className={ styles.passwords }>
-          <div className={ styles.password }>
-            <Input
-              hint={
-                <FormattedMessage
-                  id='createAccount.newAccount.password.hint'
-                  defaultMessage='a strong, unique password'
-                />
-              }
-              label={
-                <FormattedMessage
-                  id='createAccount.newAccount.password.label'
-                  defaultMessage='password'
-                />
-              }
-              onChange={ this.onEditPassword }
-              type='password'
-              value={ password }
-            />
-          </div>
-          <div className={ styles.password }>
-            <Input
-              error={ passwordRepeatError }
-              hint={
-                <FormattedMessage
-                  id='createAccount.newAccount.password2.hint'
-                  defaultMessage='verify your password'
-                />
-              }
-              label={
-                <FormattedMessage
-                  id='createAccount.newAccount.password2.label'
-                  defaultMessage='password (repeat)'
-                />
-              }
-              onChange={ this.onEditPasswordRepeat }
-              type='password'
-              value={ passwordRepeat }
-            />
-          </div>
-        </div>
-        <PasswordStrength input={ password } />
-        <ChangeVault
-          createStore={ this.props.createStore }
-          vaultStore={ this.props.vaultStore }
-        />
-        { this.renderIdentitySelector() }
-        { this.renderIdentities() }
-      </Form>
-    );
-  }
-
-  renderIdentitySelector () {
-    const { accounts, selectedAddress } = this.state;
-
-    if (!accounts) {
-      return null;
-    }
-
-    const buttons = Object
-      .keys(accounts)
-      .map((address) => {
-        return (
-          <RadioButton
-            className={ styles.button }
-            key={ address }
-            value={ address }
-          />
-        );
-      });
-
-    return (
-      <RadioButtonGroup
-        className={ styles.selector }
-        name='identitySelector'
-        onChange={ this.onChangeIdentity }
-        valueSelected={ selectedAddress }
-      >
-        { buttons }
-      </RadioButtonGroup>
-    );
-  }
-
-  renderIdentities () {
-    const { accounts } = this.state;
-
-    if (!accounts) {
-      return (
-        <Loading className={ styles.selector } size={ 1 } />
-      );
-    }
-
-    const identities = Object
-      .keys(accounts)
-      .map((address) => {
-        return (
-          <div
-            className={ styles.identity }
-            key={ address }
-            onTouchTap={ this.onChangeIdentity }
-          >
-            <IdentityIcon
-              address={ address }
-              center
-            />
-          </div>
-        );
-      });
-
-    return (
-      <div className={ styles.identities }>
-        { identities }
-        <div className={ styles.refresh }>
-          <IconButton onTouchTap={ this.createIdentities }>
-            <RefreshIcon color='rgb(0, 151, 167)' />
-          </IconButton>
-        </div>
-      </div>
-    );
-  }
-
-  createIdentities = () => {
-    const { createStore } = this.props;
-
-    this.setState({
-      accounts: null,
-      selectedAddress: ''
-    });
-
-    createStore.setAddress('');
-    createStore.setPhrase('');
-
-    return createStore
-      .createIdentities()
-      .then((accounts) => {
-        const selectedAddress = Object.keys(accounts)[0];
-        const { phrase } = accounts[selectedAddress];
-
-        createStore.setAddress(selectedAddress);
-        createStore.setPhrase(phrase);
-
-        this.setState({
-          accounts,
-          selectedAddress
-        });
-      })
-      .catch((error) => {
-        this.props.newError(error);
-      });
-  }
-
-  onChangeIdentity = (event) => {
-    const { createStore } = this.props;
-    const selectedAddress = event.target.value || event.target.getAttribute('value');
-
-    if (!selectedAddress) {
-      return;
-    }
-
-    this.setState({ selectedAddress }, () => {
-      const { phrase } = this.state.accounts[selectedAddress];
-
-      createStore.setAddress(selectedAddress);
-      createStore.setPhrase(phrase);
-    });
-  }
-
-  onEditPasswordHint = (event, passwordHint) => {
-    const { createStore } = this.props;
-
-    createStore.setPasswordHint(passwordHint);
-  }
-
-  onEditAccountName = (event, name) => {
-    const { createStore } = this.props;
-
-    createStore.setName(name);
-  }
-
-  onEditPassword = (event, password) => {
-    const { createStore } = this.props;
-
-    createStore.setPassword(password);
-  }
-
-  onEditPasswordRepeat = (event, password) => {
-    const { createStore } = this.props;
-
-    createStore.setPasswordRepeat(password);
-  }
-}
diff --git a/js/src/modals/CreateAccount/NewAccount/newAccount.spec.js b/js/src/modals/CreateAccount/NewAccount/newAccount.spec.js
deleted file mode 100644
index 935fe5b80dd4ca0b12d16a25ba1c2181a6480ad1..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewAccount/newAccount.spec.js
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { createApi, createStore } from '../createAccount.test.js';
-
-import NewAccount from './';
-
-let api;
-let component;
-let instance;
-let store;
-
-function render () {
-  api = createApi();
-  store = createStore();
-  component = shallow(
-    <NewAccount
-      createStore={ store }
-    />,
-    {
-      context: { api }
-    }
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/CreateAccount/NewAccount', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders with defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('lifecycle', () => {
-    describe('componentWillMount', () => {
-      beforeEach(() => {
-        return instance.componentWillMount();
-      });
-
-      it('resets the accounts', () => {
-        expect(instance.state.accounts).to.be.null;
-      });
-
-      it('resets the initial selected value', () => {
-        expect(instance.state.selectedAddress).to.equal('');
-      });
-    });
-  });
-
-  describe('event handlers', () => {
-    describe('onChangeIdentity', () => {
-      let address;
-
-      beforeEach(() => {
-        address = Object.keys(instance.state.accounts)[3];
-
-        sinon.spy(store, 'setAddress');
-        sinon.spy(store, 'setPhrase');
-        instance.onChangeIdentity({ target: { value: address } });
-      });
-
-      afterEach(() => {
-        store.setAddress.restore();
-        store.setPhrase.restore();
-      });
-
-      it('sets the state with the new value', () => {
-        expect(instance.state.selectedAddress).to.equal(address);
-      });
-
-      it('sets the new address on the store', () => {
-        expect(store.setAddress).to.have.been.calledWith(address);
-      });
-
-      it('sets the new phrase on the store', () => {
-        expect(store.setPhrase).to.have.been.calledWith(instance.state.accounts[address].phrase);
-      });
-    });
-
-    describe('onEditPassword', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPassword');
-        instance.onEditPassword(null, 'test');
-      });
-
-      afterEach(() => {
-        store.setPassword.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPassword).to.have.been.calledWith('test');
-      });
-    });
-
-    describe('onEditPasswordRepeat', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPasswordRepeat');
-        instance.onEditPasswordRepeat(null, 'test');
-      });
-
-      afterEach(() => {
-        store.setPasswordRepeat.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPasswordRepeat).to.have.been.calledWith('test');
-      });
-    });
-
-    describe('onEditPasswordHint', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPasswordHint');
-        instance.onEditPasswordHint(null, 'test');
-      });
-
-      afterEach(() => {
-        store.setPasswordHint.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPasswordHint).to.have.been.calledWith('test');
-      });
-    });
-
-    describe('onEditAccountName', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setName');
-        instance.onEditAccountName(null, 'test');
-      });
-
-      afterEach(() => {
-        store.setName.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setName).to.have.been.calledWith('test');
-      });
-    });
-  });
-});
diff --git a/js/src/modals/CreateAccount/NewGeth/index.js b/js/src/modals/CreateAccount/NewGeth/index.js
deleted file mode 100644
index 5d5d6c0105be22ce56974bdb8e021242afccc7fc..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewGeth/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './newGeth';
diff --git a/js/src/modals/CreateAccount/NewGeth/newGeth.js b/js/src/modals/CreateAccount/NewGeth/newGeth.js
deleted file mode 100644
index 54c0acb505ae697fa6e00d235d9a89b7d7b9f464..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewGeth/newGeth.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { SelectionList } from '~/ui';
-
-import GethCard from '../GethCard';
-import styles from '../createAccount.css';
-
-@observer
-export default class NewGeth extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    createStore: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { gethAccountsAvailable, gethAddresses } = this.props.createStore;
-
-    return gethAccountsAvailable.length
-      ? (
-        <div>
-          <div className={ styles.summary }>
-            <FormattedMessage
-              id='createAccount.newGeth.available'
-              defaultMessage='There are currently {count} importable keys available from the Geth keystore which are not already available on your Parity instance. Select the accounts you wish to import and move to the next step to complete the import.'
-              values={ {
-                count: gethAccountsAvailable.length
-              } }
-            />
-          </div>
-          { this.renderList(gethAccountsAvailable, gethAddresses) }
-        </div>
-      )
-      : (
-        <div className={ styles.summary }>
-          <FormattedMessage
-            id='createAccount.newGeth.noKeys'
-            defaultMessage='There are currently no importable keys available from the Geth keystore, which are not already available on your Parity instance'
-          />
-        </div>
-      );
-  }
-
-  renderList (gethAccountsAvailable) {
-    return (
-      <SelectionList
-        isChecked={ this.isSelected }
-        items={ gethAccountsAvailable }
-        noStretch
-        onSelectClick={ this.onSelect }
-        renderItem={ this.renderAccount }
-      />
-    );
-  }
-
-  renderAccount = (account, index) => {
-    return (
-      <GethCard
-        address={ account.address }
-        balance={ account.balance }
-        name={ `Geth Account ${index + 1}` }
-      />
-    );
-  }
-
-  isSelected = (account) => {
-    const { gethAddresses } = this.props.createStore;
-
-    return gethAddresses.includes(account.address);
-  }
-
-  onSelect = (account) => {
-    const { createStore } = this.props;
-
-    createStore.selectGethAccount(account.address);
-  }
-}
diff --git a/js/src/modals/CreateAccount/NewGeth/newGeth.spec.js b/js/src/modals/CreateAccount/NewGeth/newGeth.spec.js
deleted file mode 100644
index b25eb7d012a1901841d2a39b732a985042bc238d..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewGeth/newGeth.spec.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { createStore } from '../createAccount.test.js';
-
-import NewGeth from './';
-
-let component;
-let instance;
-let store;
-
-function render () {
-  store = createStore();
-  component = shallow(
-    <NewGeth
-      createStore={ store }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/CreateAccount/NewGeth', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders with defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  describe('events', () => {
-    describe('onSelect', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'selectGethAccount');
-        instance.onSelect({ address: 'testAddress' });
-      });
-
-      afterEach(() => {
-        store.selectGethAccount.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.selectGethAccount).to.have.been.calledWith('testAddress');
-      });
-    });
-  });
-});
diff --git a/js/src/modals/CreateAccount/NewImport/index.js b/js/src/modals/CreateAccount/NewImport/index.js
deleted file mode 100644
index ecd5731a29301ccbeb31e06e57b3e92c410a62b1..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewImport/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './newImport';
diff --git a/js/src/modals/CreateAccount/NewImport/newImport.js b/js/src/modals/CreateAccount/NewImport/newImport.js
deleted file mode 100644
index f683e7c5d6a6721704f37139179809ca46b60607..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewImport/newImport.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Form, FileSelect, Input } from '~/ui';
-
-import ChangeVault from '../ChangeVault';
-import styles from '../createAccount.css';
-
-@observer
-export default class NewImport extends Component {
-  static propTypes = {
-    createStore: PropTypes.object.isRequired,
-    vaultStore: PropTypes.object
-
-  }
-
-  render () {
-    const { name, nameError, password, passwordHint } = this.props.createStore;
-
-    return (
-      <Form>
-        <Input
-          autoFocus
-          error={ nameError }
-          hint={
-            <FormattedMessage
-              id='createAccount.newImport.name.hint'
-              defaultMessage='a descriptive name for the account'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.newImport.name.label'
-              defaultMessage='account name'
-            />
-          }
-          onChange={ this.onEditName }
-          value={ name }
-        />
-        <Input
-          hint={
-            <FormattedMessage
-              id='createAccount.newImport.hint.hint'
-              defaultMessage='(optional) a hint to help with remembering the password'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.newImport.hint.label'
-              defaultMessage='password hint'
-            />
-          }
-          onChange={ this.onEditpasswordHint }
-          value={ passwordHint }
-        />
-        <div className={ styles.passwords }>
-          <div className={ styles.password }>
-            <Input
-              hint={
-                <FormattedMessage
-                  id='createAccount.newImport.password.hint'
-                  defaultMessage='the password to unlock the wallet'
-                />
-              }
-              label={
-                <FormattedMessage
-                  id='createAccount.newImport.password.label'
-                  defaultMessage='password'
-                />
-              }
-              type='password'
-              onChange={ this.onEditPassword }
-              value={ password }
-            />
-          </div>
-        </div>
-        <ChangeVault
-          createStore={ this.props.createStore }
-          vaultStore={ this.props.vaultStore }
-        />
-        { this.renderFileSelector() }
-      </Form>
-    );
-  }
-
-  renderFileSelector () {
-    const { walletFile, walletFileError } = this.props.createStore;
-
-    return walletFile
-      ? (
-        <Input
-          disabled
-          error={ walletFileError }
-          hint={
-            <FormattedMessage
-              id='createAccount.newImport.file.hint'
-              defaultMessage='the wallet file for import'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.newImport.file.label'
-              defaultMessage='wallet file'
-            />
-          }
-          value={ walletFile }
-        />
-      )
-      : (
-        <FileSelect
-          className={ styles.fileImport }
-          error={ walletFileError }
-          onSelect={ this.onFileSelect }
-        />
-      );
-  }
-
-  onFileSelect = (fileName, fileContent) => {
-    const { createStore } = this.props;
-
-    createStore.setWalletFile(fileName);
-    createStore.setWalletJson(fileContent);
-  }
-
-  onEditName = (event, name) => {
-    const { createStore } = this.props;
-
-    createStore.setName(name);
-  }
-
-  onEditPassword = (event, password) => {
-    const { createStore } = this.props;
-
-    createStore.setPassword(password);
-  }
-
-  onEditPasswordHint = (event, passwordHint) => {
-    const { createStore } = this.props;
-
-    createStore.setPasswordHint(passwordHint);
-  }
-}
diff --git a/js/src/modals/CreateAccount/NewImport/newImport.spec.js b/js/src/modals/CreateAccount/NewImport/newImport.spec.js
deleted file mode 100644
index ecd73e3b44ac78436db2752a9928adb2774e0a22..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewImport/newImport.spec.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { createStore } from '../createAccount.test.js';
-
-import NewImport from './';
-
-let component;
-let instance;
-let store;
-
-function render () {
-  store = createStore();
-  component = shallow(
-    <NewImport
-      createStore={ store }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/CreateAccount/NewImport', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders with defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  describe('events', () => {
-    describe('onEditName', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setName');
-        instance.onEditName(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setName.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setName).to.have.been.calledWith('testValue');
-      });
-    });
-
-    describe('onEditPassword', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPassword');
-        instance.onEditPassword(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setPassword.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPassword).to.have.been.calledWith('testValue');
-      });
-    });
-
-    describe('onEditPasswordHint', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPasswordHint');
-        instance.onEditPasswordHint(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setPasswordHint.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPasswordHint).to.have.been.calledWith('testValue');
-      });
-    });
-  });
-});
diff --git a/js/src/modals/CreateAccount/NewQr/index.js b/js/src/modals/CreateAccount/NewQr/index.js
deleted file mode 100644
index e9eeee1e43bdefc4eb6b3c512c5e14ab82a9691b..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewQr/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './newQr';
diff --git a/js/src/modals/CreateAccount/NewQr/newQr.js b/js/src/modals/CreateAccount/NewQr/newQr.js
deleted file mode 100644
index a1301ecd6571f3a329fcde006aa3f827eeafe1d4..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewQr/newQr.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Form, Input, InputAddress, QrScan } from '~/ui';
-
-import ChangeVault from '../ChangeVault';
-
-@observer
-export default class NewQr extends Component {
-  static propTypes = {
-    createStore: PropTypes.object.isRequired,
-    vaultStore: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { createStore } = this.props;
-
-    return createStore.qrAddressValid
-      ? this.renderInfo()
-      : this.renderScanner();
-  }
-
-  renderInfo () {
-    const { createStore, vaultStore } = this.props;
-    const { description, name, nameError, qrAddress } = createStore;
-
-    return (
-      <Form>
-        <InputAddress
-          allowCopy
-          readOnly
-          hint={
-            <FormattedMessage
-              id='createAccount.newQr.address.hint'
-              defaultMessage='the network address for the account'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.newQr.address.label'
-              defaultMessage='address'
-            />
-          }
-          value={ qrAddress }
-        />
-        <Input
-          autoFocus
-          error={ nameError }
-          hint={
-            <FormattedMessage
-              id='createAccount.newQr.name.hint'
-              defaultMessage='a descriptive name for the account'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.newQr.name.label'
-              defaultMessage='account name'
-            />
-          }
-          onChange={ this.onEditAccountName }
-          value={ name }
-        />
-        <Input
-          hint={
-            <FormattedMessage
-              id='createAccount.newQr.description.hint'
-              defaultMessage='a description for the account'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.newQr.description.label'
-              defaultMessage='account description'
-            />
-          }
-          onChange={ this.onEditAccountDescription }
-          value={ description }
-        />
-        <ChangeVault
-          createStore={ createStore }
-          vaultStore={ vaultStore }
-        />
-      </Form>
-    );
-  }
-
-  renderScanner () {
-    return (
-      <div>
-        <FormattedMessage
-          id='createAccount.newQr.summary'
-          defaultMessage='Use the built-in machine camera to scan to QR code of the account you wish to attach as an external account. External accounts are signed on the external device.'
-        />
-        <QrScan onScan={ this.onScan } />
-      </div>
-    );
-  }
-
-  onEditAccountDescription = (event, description) => {
-    const { createStore } = this.props;
-
-    createStore.setDescription(description);
-  }
-
-  onEditAccountName = (event, name) => {
-    const { createStore } = this.props;
-
-    createStore.setName(name);
-  }
-
-  onScan = (address) => {
-    const { createStore } = this.props;
-
-    console.log('QR scan', address);
-
-    createStore.setQrAddress(address);
-  }
-}
diff --git a/js/src/modals/CreateAccount/NewQr/newQr.spec.js b/js/src/modals/CreateAccount/NewQr/newQr.spec.js
deleted file mode 100644
index 6fb567ad7de720fe0bc2eedcea670559ccfd8021..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/NewQr/newQr.spec.js
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import NewQr from './';
-
-let component;
-let instance;
-let createStore;
-let vaultStore;
-
-function createStores () {
-  createStore = {
-    qrAddressValid: false,
-    setDescription: sinon.stub(),
-    setName: sinon.stub(),
-    setQrAddress: sinon.stub()
-  };
-
-  vaultStore = {};
-}
-
-function render (props = {}) {
-  createStores();
-
-  component = shallow(
-    <NewQr
-      createStore={ createStore }
-      vaultStore={ vaultStore }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/CreateAccount/NewQr', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('event methods', () => {
-    describe('onEditAccountDescription', () => {
-      beforeEach(() => {
-        instance.onEditAccountDescription(null, 'testing');
-      });
-
-      it('calls into createStore.setDescription', () => {
-        expect(createStore.setDescription).to.have.been.calledWith('testing');
-      });
-    });
-
-    describe('onEditAccountName', () => {
-      beforeEach(() => {
-        instance.onEditAccountName(null, 'testing');
-      });
-
-      it('calls into createStore.setName', () => {
-        expect(createStore.setName).to.have.been.calledWith('testing');
-      });
-    });
-
-    describe('onScan', () => {
-      beforeEach(() => {
-        instance.onScan('testing');
-      });
-
-      it('calls into createStore.setQrAddress', () => {
-        expect(createStore.setQrAddress).to.have.been.calledWith('testing');
-      });
-    });
-  });
-});
diff --git a/js/src/modals/CreateAccount/RawKey/index.js b/js/src/modals/CreateAccount/RawKey/index.js
deleted file mode 100644
index 3ec14db738ea1c1ada59e36d86fd160a9f3ad407..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/RawKey/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './rawKey';
diff --git a/js/src/modals/CreateAccount/RawKey/rawKey.js b/js/src/modals/CreateAccount/RawKey/rawKey.js
deleted file mode 100644
index a2121eb19a66b3a733f15385b1a445391ce6cde4..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/RawKey/rawKey.js
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Form, Input } from '~/ui';
-import PasswordStrength from '~/ui/Form/PasswordStrength';
-
-import ChangeVault from '../ChangeVault';
-import styles from '../createAccount.css';
-
-@observer
-export default class RawKey extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    createStore: PropTypes.object.isRequired,
-    vaultStore: PropTypes.object
-  }
-
-  render () {
-    const { name, nameError, password, passwordRepeat, passwordRepeatError, passwordHint, rawKey, rawKeyError } = this.props.createStore;
-
-    return (
-      <Form>
-        <Input
-          autoFocus
-          error={ rawKeyError }
-          hint={
-            <FormattedMessage
-              id='createAccount.rawKey.private.hint'
-              defaultMessage='the raw hex encoded private key'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.rawKey.private.label'
-              defaultMessage='private key'
-            />
-          }
-          onChange={ this.onEditKey }
-          value={ rawKey }
-        />
-        <Input
-          error={ nameError }
-          hint={
-            <FormattedMessage
-              id='createAccount.rawKey.name.hint'
-              defaultMessage='a descriptive name for the account'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.rawKey.name.label'
-              defaultMessage='account name'
-            />
-          }
-          onChange={ this.onEditName }
-          value={ name }
-        />
-        <Input
-          hint={
-            <FormattedMessage
-              id='createAccount.rawKey.hint.hint'
-              defaultMessage='(optional) a hint to help with remembering the password'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createAccount.rawKey.hint.label'
-              defaultMessage='password hint'
-            />
-          }
-          onChange={ this.onEditPasswordHint }
-          value={ passwordHint }
-        />
-        <div className={ styles.passwords }>
-          <div className={ styles.password }>
-            <Input
-              hint={
-                <FormattedMessage
-                  id='createAccount.rawKey.password.hint'
-                  defaultMessage='a strong, unique password'
-                />
-              }
-              label={
-                <FormattedMessage
-                  id='createAccount.rawKey.password.label'
-                  defaultMessage='password'
-                />
-              }
-              onChange={ this.onEditPassword }
-              type='password'
-              value={ password }
-            />
-          </div>
-          <div className={ styles.password }>
-            <Input
-              error={ passwordRepeatError }
-              hint={
-                <FormattedMessage
-                  id='createAccount.rawKey.password2.hint'
-                  defaultMessage='verify your password'
-                />
-              }
-              label={
-                <FormattedMessage
-                  id='createAccount.rawKey.password2.label'
-                  defaultMessage='password (repeat)'
-                />
-              }
-              onChange={ this.onEditPasswordRepeat }
-              type='password'
-              value={ passwordRepeat }
-            />
-          </div>
-        </div>
-        <PasswordStrength input={ password } />
-        <ChangeVault
-          createStore={ this.props.createStore }
-          vaultStore={ this.props.vaultStore }
-        />
-      </Form>
-    );
-  }
-
-  onEditName = (event, name) => {
-    const { createStore } = this.props;
-
-    createStore.setName(name);
-  }
-
-  onEditPasswordHint = (event, passwordHint) => {
-    const { createStore } = this.props;
-
-    createStore.setPasswordHint(passwordHint);
-  }
-
-  onEditPassword = (event, password) => {
-    const { createStore } = this.props;
-
-    createStore.setPassword(password);
-  }
-
-  onEditPasswordRepeat = (event, password) => {
-    const { createStore } = this.props;
-
-    createStore.setPasswordRepeat(password);
-  }
-
-  onEditKey = (event, rawKey) => {
-    const { createStore } = this.props;
-
-    createStore.setRawKey(rawKey);
-  }
-}
diff --git a/js/src/modals/CreateAccount/RawKey/rawKey.spec.js b/js/src/modals/CreateAccount/RawKey/rawKey.spec.js
deleted file mode 100644
index 121336d782939923df695cc7009c2b89beb7b556..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/RawKey/rawKey.spec.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { createStore } from '../createAccount.test.js';
-
-import RawKey from './';
-
-let component;
-let instance;
-let store;
-
-function render () {
-  store = createStore();
-  component = shallow(
-    <RawKey
-      createStore={ store }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/CreateAccount/RawKey', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders with defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('events', () => {
-    describe('onEditName', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setName');
-        instance.onEditName(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setName.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setName).to.have.been.calledWith('testValue');
-      });
-    });
-
-    describe('onEditKey', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setRawKey');
-        instance.onEditKey(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setRawKey.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setRawKey).to.have.been.calledWith('testValue');
-      });
-    });
-
-    describe('onEditPassword', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPassword');
-        instance.onEditPassword(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setPassword.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPassword).to.have.been.calledWith('testValue');
-      });
-    });
-
-    describe('onEditPasswordRepeat', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPasswordRepeat');
-        instance.onEditPasswordRepeat(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setPasswordRepeat.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPasswordRepeat).to.have.been.calledWith('testValue');
-      });
-    });
-
-    describe('onEditPasswordHint', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPasswordHint');
-        instance.onEditPasswordHint(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setPasswordHint.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPasswordHint).to.have.been.calledWith('testValue');
-      });
-    });
-  });
-});
diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/index.js b/js/src/modals/CreateAccount/RecoveryPhrase/index.js
deleted file mode 100644
index d32d11d6eae6d2b360236fd8ef227054735185f2..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/RecoveryPhrase/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './recoveryPhrase';
diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
deleted file mode 100644
index cd708396c74b6ab9875b2ef62b61c2ec74a29828..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { Checkbox } from 'material-ui';
-
-import { Form, Input, Warning } from '~/ui';
-import PasswordStrength from '~/ui/Form/PasswordStrength';
-
-import ChangeVault from '../ChangeVault';
-import styles from '../createAccount.css';
-
-@observer
-export default class RecoveryPhrase extends Component {
-  static propTypes = {
-    createStore: PropTypes.object.isRequired,
-    vaultStore: PropTypes.object
-  }
-
-  render () {
-    const { isWindowsPhrase, name, nameError, passPhraseError, password, passwordRepeat, passwordRepeatError, passwordHint, phrase } = this.props.createStore;
-
-    return (
-      <div className={ styles.details }>
-        { this.renderWarning() }
-        <Form>
-          <Input
-            autoFocus
-            error={
-              passPhraseError
-              ? (
-                <FormattedMessage
-                  id='createAccount.recoveryPhrase.passPhrase.error'
-                  defaultMessage='enter a recovery phrase'
-                />
-              )
-              : null
-            }
-            hint={
-              <FormattedMessage
-                id='createAccount.recoveryPhrase.phrase.hint'
-                defaultMessage='the account recovery phrase'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='createAccount.recoveryPhrase.phrase.label'
-                defaultMessage='account recovery phrase'
-              />
-            }
-            onChange={ this.onEditPhrase }
-            value={ phrase }
-          />
-          <Input
-            error={ nameError }
-            hint={
-              <FormattedMessage
-                id='createAccount.recoveryPhrase.name.hint'
-                defaultMessage='a descriptive name for the account'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='createAccount.recoveryPhrase.name.label'
-                defaultMessage='account name'
-              />
-            }
-            onChange={ this.onEditName }
-            value={ name }
-          />
-          <Input
-            hint={
-              <FormattedMessage
-                id='createAccount.recoveryPhrase.hint.hint'
-                defaultMessage='(optional) a hint to help with remembering the password'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='createAccount.recoveryPhrase.hint.label'
-                defaultMessage='password hint'
-              />
-            }
-            onChange={ this.onEditPasswordHint }
-            value={ passwordHint }
-          />
-          <div className={ styles.passwords }>
-            <div className={ styles.password }>
-              <Input
-                hint={
-                  <FormattedMessage
-                    id='createAccount.recoveryPhrase.password.hint'
-                    defaultMessage='a strong, unique password'
-                  />
-                }
-                label={
-                  <FormattedMessage
-                    id='createAccount.recoveryPhrase.password.label'
-                    defaultMessage='password'
-                  />
-                }
-                onChange={ this.onEditPassword }
-                type='password'
-                value={ password }
-              />
-            </div>
-            <div className={ styles.password }>
-              <Input
-                error={ passwordRepeatError }
-                hint={
-                  <FormattedMessage
-                    id='createAccount.recoveryPhrase.password2.hint'
-                    defaultMessage='verify your password'
-                  />
-                }
-                label={
-                  <FormattedMessage
-                    id='createAccount.recoveryPhrase.password2.label'
-                    defaultMessage='password (repeat)'
-                  />
-                }
-                onChange={ this.onEditPasswordRepeat }
-                type='password'
-                value={ passwordRepeat }
-              />
-            </div>
-          </div>
-          <PasswordStrength input={ password } />
-          <ChangeVault
-            createStore={ this.props.createStore }
-            vaultStore={ this.props.vaultStore }
-          />
-          <Checkbox
-            checked={ isWindowsPhrase }
-            className={ styles.checkbox }
-            label={
-              <FormattedMessage
-                id='createAccount.recoveryPhrase.windowsKey.label'
-                defaultMessage='Key was created with Parity <1.4.5 on Windows'
-              />
-            }
-            onCheck={ this.onToggleWindowsPhrase }
-          />
-        </Form>
-      </div>
-    );
-  }
-
-  renderWarning () {
-    const { isTest, phrase } = this.props.createStore;
-
-    if (!isTest && phrase.length === 0) {
-      return (
-        <Warning
-          warning={
-            <FormattedMessage
-              id='createAccount.recoveryPhrase.warning.emptyPhrase'
-              defaultMessage={ `The recovery phrase is empty.
-                This account can be recovered by anyone.
-              ` }
-            />
-          }
-        />
-      );
-    }
-
-    if (phrase.length === 0) {
-      return (
-        <Warning
-          warning={
-            <FormattedMessage
-              id='createAccount.recoveryPhrase.warning.testnetEmptyPhrase'
-              defaultMessage={ `The recovery phrase is empty.
-                This account can be recovered by anyone.
-                Proceed with caution.
-              ` }
-            />
-          }
-        />
-      );
-    }
-
-    const words = phrase.split(' ');
-
-    if (words.length < 11) {
-      return (
-        <Warning
-          warning={
-            <FormattedMessage
-              id='createAccount.recoveryPhrase.warning.shortPhrase'
-              defaultMessage={ `The recovery phrase is less than 11 words.
-                This account has not been generated by Parity and might be insecure.
-                Proceed with caution.
-              ` }
-            />
-          }
-        />
-      );
-    }
-
-    return null;
-  }
-
-  onToggleWindowsPhrase = (event) => {
-    const { createStore } = this.props;
-
-    createStore.setWindowsPhrase(!createStore.isWindowsPhrase);
-  }
-
-  onEditPhrase = (event, phrase) => {
-    const { createStore } = this.props;
-
-    createStore.setPhrase(phrase);
-  }
-
-  onEditName = (event, name) => {
-    const { createStore } = this.props;
-
-    createStore.setName(name);
-  }
-
-  onEditPassword = (event, password) => {
-    const { createStore } = this.props;
-
-    createStore.setPassword(password);
-  }
-
-  onEditPasswordRepeat = (event, password) => {
-    const { createStore } = this.props;
-
-    createStore.setPasswordRepeat(password);
-  }
-
-  onEditPasswordHint = (event, passwordHint) => {
-    const { createStore } = this.props;
-
-    createStore.setPasswordHint(passwordHint);
-  }
-}
diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js
deleted file mode 100644
index d6b5d3e70c7abc53a94d32298e1d546cda97942c..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { createStore } from '../createAccount.test.js';
-
-import RecoveryPhrase from './';
-
-let component;
-let instance;
-let store;
-
-function render () {
-  store = createStore();
-  component = shallow(
-    <RecoveryPhrase
-      createStore={ store }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/CreateAccount/RecoveryPhrase', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders with defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('event handlers', () => {
-    describe('onEditName', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setName');
-        instance.onEditName(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setName.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setName).to.have.been.calledWith('testValue');
-      });
-    });
-
-    describe('onEditPhrase', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPhrase');
-        instance.onEditPhrase(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setPhrase.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPhrase).to.have.been.calledWith('testValue');
-      });
-    });
-
-    describe('onEditPassword', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPassword');
-        instance.onEditPassword(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setPassword.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPassword).to.have.been.calledWith('testValue');
-      });
-    });
-
-    describe('onEditPasswordRepeat', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPasswordRepeat');
-        instance.onEditPasswordRepeat(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setPasswordRepeat.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPasswordRepeat).to.have.been.calledWith('testValue');
-      });
-    });
-
-    describe('onEditPasswordHint', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setPasswordHint');
-        instance.onEditPasswordHint(null, 'testValue');
-      });
-
-      afterEach(() => {
-        store.setPasswordHint.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setPasswordHint).to.have.been.calledWith('testValue');
-      });
-    });
-
-    describe('onToggleWindowsPhrase', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setWindowsPhrase');
-        instance.onToggleWindowsPhrase();
-      });
-
-      afterEach(() => {
-        store.setWindowsPhrase.restore();
-      });
-
-      it('calls into the store', () => {
-        expect(store.setWindowsPhrase).to.have.been.calledWith(true);
-      });
-    });
-  });
-});
diff --git a/js/src/modals/CreateAccount/TypeIcon/index.js b/js/src/modals/CreateAccount/TypeIcon/index.js
deleted file mode 100644
index 55bc79d6ba93d6e3f9c1b95b30e8869ca27f3b55..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/TypeIcon/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './typeIcon';
diff --git a/js/src/modals/CreateAccount/TypeIcon/typeIcon.js b/js/src/modals/CreateAccount/TypeIcon/typeIcon.js
deleted file mode 100644
index e63763df794e665aea625acc712175c395d230bd..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/TypeIcon/typeIcon.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { AccountsIcon, DoneIcon, FileIcon, FileUploadIcon, KeyboardIcon, KeyIcon, MembershipIcon, PhoneLock } from '~/ui/Icons';
-
-import { STAGE_INFO } from '../store';
-
-export default class TypeIcon extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    createStore: PropTypes.object.isRequired,
-    type: PropTypes.string
-  }
-
-  render () {
-    const { className, createStore, type } = this.props;
-    const { createType, stage } = createStore;
-
-    if (stage === STAGE_INFO) {
-      return <DoneIcon className={ className } />;
-    }
-
-    switch (type || createType) {
-      case 'fromGeth':
-        return <FileUploadIcon className={ className } />;
-
-      case 'fromJSON':
-        return <FileIcon className={ className } />;
-
-      case 'fromPhrase':
-        return <KeyboardIcon className={ className } />;
-
-      case 'fromPresale':
-        return <MembershipIcon className={ className } />;
-
-      case 'fromQr':
-        return <PhoneLock className={ className } />;
-
-      case 'fromRaw':
-        return <KeyIcon className={ className } />;
-
-      case 'fromNew':
-      default:
-        return <AccountsIcon className={ className } />;
-    }
-  }
-}
diff --git a/js/src/modals/CreateAccount/createAccount.css b/js/src/modals/CreateAccount/createAccount.css
deleted file mode 100644
index cbab4ee8d26a587cd9381129230a77a6b9c7a342..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/createAccount.css
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.details {
-  width: 100%;
-
-  .info {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-
-    .account {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-
-      .name {
-        display: flex;
-        flex-direction: row;
-        flex: 1;
-
-        .icon {
-          flex: 0 0 56px;
-          margin: 0 1em 0 0;
-        }
-
-        .title {
-          flex: 1;
-        }
-      }
-
-      .description {
-        flex: 1;
-      }
-    }
-
-    .qr {
-      flex: 0 0 136px;
-      margin: 1.5em 0 0 1.5em;
-    }
-  }
-}
-
-.spaced {
-  line-height: 1.618em;
-}
-
-/* TODO: 2 column layout can be made generic, now duplicated in Vaults */
-.passwords {
-  display: flex;
-  flex-wrap: wrap;
-
-  .password {
-    box-sizing: border-box;
-    flex: 0 1 50%;
-    width: 50%;
-
-    &:nth-child(odd) {
-      padding-right: 0.25rem;
-    }
-
-    &:nth-child(even) {
-      padding-left: 0.25rem;
-    }
-  }
-}
-
-.identities,
-.selector {
-  display: flex;
-}
-
-.selector {
-  margin-top: 1.5em;
-}
-
-.identities .identity,
-.selector .button {
-  flex: 0 1 12.5%;
-  width: 12.5% !important;
-  text-align: center;
-  cursor: pointer;
-}
-
-.refresh {
-  flex: 0 1 10%;
-  width: 10% !important;
-}
-
-.checkbox {
-  margin-top: 2em;
-}
-
-.selectItem {
-  display: flex;
-
-  .icon {
-    color: rgb(167, 151, 0) !important;
-    flex: 0 0 56px;
-    height: 56px !important;
-    margin-right: 0.75em;
-    width: 56px !important;
-  }
-
-  .info {
-    flex: 1 1;
-  }
-}
-
-.fileImport {
-  height: 9em;
-  margin-top: 1em;
-}
-
-.summary {
-  line-height: 1.618em;
-  padding: 0 4em 1.5em 4em;
-  text-align: center;
-}
-
-.backupPhrase {
-  line-height: 1.618em;
-  margin-top: 1.5em;
-}
diff --git a/js/src/modals/CreateAccount/createAccount.js b/js/src/modals/CreateAccount/createAccount.js
deleted file mode 100644
index ec8308615590ccff823696533cfc32bdbd8ea92b..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/createAccount.js
+++ /dev/null
@@ -1,438 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import ParityLogo from '~/../assets/images/parity-logo-black-no-text.svg';
-import { createIdentityImg } from '~/api/util/identity';
-import { newError } from '~/redux/actions';
-import { Button, ModalBox, Portal } from '~/ui';
-import { CancelIcon, CheckIcon, DoneIcon, NextIcon, PrevIcon, PrintIcon } from '~/ui/Icons';
-
-import VaultStore from '~/views/Vaults/store';
-
-import AccountDetails from './AccountDetails';
-import AccountDetailsGeth from './AccountDetailsGeth';
-import CreationType from './CreationType';
-import NewAccount from './NewAccount';
-import NewGeth from './NewGeth';
-import NewImport from './NewImport';
-import NewQr from './NewQr';
-import RawKey from './RawKey';
-import RecoveryPhrase from './RecoveryPhrase';
-import Store, { STAGE_CREATE, STAGE_INFO, STAGE_SELECT_TYPE, STAGE_CONFIRM_BACKUP } from './store';
-import TypeIcon from './TypeIcon';
-import print from './print';
-import recoveryPage from './recoveryPage.ejs';
-
-const TITLES = {
-  type: (
-    <FormattedMessage
-      id='createAccount.title.createType'
-      defaultMessage='creation type'
-    />
-  ),
-  create: (
-    <FormattedMessage
-      id='createAccount.title.createAccount'
-      defaultMessage='create account'
-    />
-  ),
-  info: (
-    <FormattedMessage
-      id='createAccount.title.accountInfo'
-      defaultMessage='account information'
-    />
-  ),
-  backup: (
-    <FormattedMessage
-      id='createAccount.title.backupPhrase'
-      defaultMessage='confirm recovery phrase'
-    />
-  ),
-  import: (
-    <FormattedMessage
-      id='createAccount.title.importAccount'
-      defaultMessage='import account'
-    />
-  ),
-  restore: (
-    <FormattedMessage
-      id='createAccount.title.restoreAccount'
-      defaultMessage='restore account'
-    />
-  ),
-  qr: (
-    <FormattedMessage
-      id='createAccount.title.qr'
-      defaultMessage='external account'
-    />
-  )
-};
-const STAGE_NAMES = [TITLES.type, TITLES.create, TITLES.info, TITLES.backup];
-const STAGE_IMPORT = [TITLES.type, TITLES.import, TITLES.info];
-const STAGE_RESTORE = [TITLES.restore, TITLES.info];
-const STAGE_QR = [TITLES.type, TITLES.qr, TITLES.info];
-
-@observer
-class CreateAccount extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    isTest: PropTypes.bool.isRequired,
-    newError: PropTypes.func.isRequired,
-    onClose: PropTypes.func,
-    onUpdate: PropTypes.func,
-    restore: PropTypes.bool
-  };
-
-  static defaultProps = {
-    restore: false
-  };
-
-  createStore = new Store(this.context.api, this.props.accounts, this.props.isTest);
-  vaultStore = VaultStore.get(this.context.api);
-
-  componentWillMount () {
-    if (this.props.restore) {
-      this.createStore.setCreateType('fromPhrase');
-      this.createStore.nextStage();
-    }
-
-    return this.vaultStore.loadVaults();
-  }
-
-  render () {
-    const { isBusy, createType, stage } = this.createStore;
-
-    let steps = STAGE_IMPORT;
-
-    if (createType === 'fromNew') {
-      steps = STAGE_NAMES;
-    } else if (createType === 'fromQr') {
-      steps = STAGE_QR;
-    } else if (createType === 'fromPhrase') {
-      steps = STAGE_RESTORE;
-    }
-
-    return (
-      <Portal
-        buttons={ this.renderDialogActions() }
-        busy={ isBusy }
-        activeStep={ stage }
-        onClose={ this.onClose }
-        open
-        steps={ steps }
-      >
-        <ModalBox icon={ <TypeIcon createStore={ this.createStore } /> }>
-          { this.renderPage() }
-        </ModalBox>
-      </Portal>
-    );
-  }
-
-  renderPage () {
-    const { createType, stage } = this.createStore;
-
-    switch (stage) {
-      case STAGE_SELECT_TYPE:
-        return (
-          <CreationType createStore={ this.createStore } />
-        );
-
-      case STAGE_CREATE:
-        if (createType === 'fromNew') {
-          return (
-            <NewAccount
-              newError={ this.props.newError }
-              createStore={ this.createStore }
-              vaultStore={ this.vaultStore }
-            />
-          );
-        }
-
-        if (createType === 'fromGeth') {
-          return (
-            <NewGeth createStore={ this.createStore } />
-          );
-        }
-
-        if (createType === 'fromPhrase') {
-          return (
-            <RecoveryPhrase
-              createStore={ this.createStore }
-              vaultStore={ this.vaultStore }
-            />
-          );
-        }
-
-        if (createType === 'fromQr') {
-          return (
-            <NewQr
-              createStore={ this.createStore }
-              vaultStore={ this.vaultStore }
-            />
-          );
-        }
-
-        if (createType === 'fromRaw') {
-          return (
-            <RawKey
-              createStore={ this.createStore }
-              vaultStore={ this.vaultStore }
-            />
-          );
-        }
-
-        return (
-          <NewImport
-            createStore={ this.createStore }
-            vaultStore={ this.vaultStore }
-          />
-        );
-
-      case STAGE_INFO:
-        if (createType === 'fromGeth') {
-          return (
-            <AccountDetailsGeth createStore={ this.createStore } />
-          );
-        }
-
-        return (
-          <AccountDetails
-            createStore={ this.createStore }
-            withRequiredBackup={ createType === 'fromNew' }
-          />
-        );
-
-      case STAGE_CONFIRM_BACKUP:
-        return (
-          <AccountDetails
-            createStore={ this.createStore }
-            isConfirming
-          />
-        );
-    }
-  }
-
-  renderDialogActions () {
-    const { restore } = this.props;
-    const { createType, canCreate, isBusy, stage, phraseBackedUpError } = this.createStore;
-
-    const cancelBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='createAccount.button.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.onClose }
-      />
-    );
-
-    const backBtn = restore
-      ? null
-      : (
-        <Button
-          icon={ <PrevIcon /> }
-          key='back'
-          label={
-            <FormattedMessage
-              id='createAccount.button.back'
-              defaultMessage='Back'
-            />
-          }
-          onClick={ this.createStore.prevStage }
-        />
-      );
-
-    switch (stage) {
-      case STAGE_SELECT_TYPE:
-        return [
-          cancelBtn,
-          <Button
-            icon={ <NextIcon /> }
-            key='next'
-            label={
-              <FormattedMessage
-                id='createAccount.button.next'
-                defaultMessage='Next'
-              />
-            }
-            onClick={ this.createStore.nextStage }
-          />
-        ];
-
-      case STAGE_CREATE:
-        return [
-          cancelBtn,
-          backBtn,
-          <Button
-            disabled={ !canCreate || isBusy }
-            icon={ <CheckIcon /> }
-            key='create'
-            label={
-              createType === 'fromNew'
-                ? (
-                  <FormattedMessage
-                    id='createAccount.button.next'
-                    defaultMessage='Next'
-                  />
-                )
-                : (
-                  <FormattedMessage
-                    id='createAccount.button.import'
-                    defaultMessage='Import'
-                  />
-                )
-            }
-            onClick={ createType === 'fromNew' ? this.createStore.nextStage : this.onCreate }
-          />
-        ];
-
-      case STAGE_INFO:
-        return [
-          ['fromNew', 'fromPhrase'].includes(createType)
-            ? (
-              <Button
-                icon={ <PrintIcon /> }
-                key='print'
-                label={
-                  <FormattedMessage
-                    id='createAccount.button.print'
-                    defaultMessage='Print Phrase'
-                  />
-                }
-                onClick={ this.printPhrase }
-              />
-            )
-            : null,
-          <Button
-            disabled={ createType === 'fromNew' && !!phraseBackedUpError }
-            icon={ <DoneIcon /> }
-            key='done'
-            label={
-              <FormattedMessage
-                id='createAccount.button.done'
-                defaultMessage='Done'
-              />
-            }
-            onClick={ createType === 'fromNew' ? this.onConfirmPhraseBackup : this.onClose }
-          />
-        ];
-
-      case STAGE_CONFIRM_BACKUP:
-        return [
-          <Button
-            icon={ <DoneIcon /> }
-            key='done'
-            label={
-              <FormattedMessage
-                id='createAccount.button.create'
-                defaultMessage='Create'
-              />
-            }
-            onClick={ this.onCreateNew }
-          />
-        ];
-    }
-  }
-
-  onConfirmPhraseBackup = () => {
-    this.createStore.clearPhrase();
-    this.createStore.nextStage();
-  }
-
-  onCreateNew = () => {
-    this.createStore.setBusy(true);
-    this.createStore.computeBackupPhraseAddress()
-      .then(err => {
-        if (err) {
-          this.createStore.setBusy(false);
-          return;
-        }
-
-        return this.createStore.createAccount(this.vaultStore)
-          .then(() => {
-            this.createStore.clearPhrase();
-            this.createStore.setBusy(false);
-            this.props.onUpdate && this.props.onUpdate();
-            this.onClose();
-          });
-      })
-      .catch((error) => {
-        this.createStore.setBusy(false);
-        this.props.newError(error);
-      });
-  }
-
-  onCreate = () => {
-    return this.createStore
-      .createAccount(this.vaultStore)
-      .then(() => {
-        this.createStore.nextStage();
-        this.props.onUpdate && this.props.onUpdate();
-      })
-      .catch((error) => {
-        this.props.newError(error);
-      });
-  }
-
-  onClose = () => {
-    this.createStore.clearPhrase();
-    this.props.onClose && this.props.onClose();
-  }
-
-  printPhrase = () => {
-    const { address, name, phrase } = this.createStore;
-    const identity = createIdentityImg(address);
-
-    print(recoveryPage({
-      address,
-      identity,
-      logo: ParityLogo,
-      name,
-      phrase
-    }));
-  }
-}
-
-function mapStateToProps (state) {
-  const { isTest } = state.nodeStatus;
-
-  return { isTest };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CreateAccount);
diff --git a/js/src/modals/CreateAccount/createAccount.spec.js b/js/src/modals/CreateAccount/createAccount.spec.js
deleted file mode 100644
index da7feb71d2aa76481f281154fdf4c1f5d7fbbe10..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/createAccount.spec.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { ACCOUNTS, createApi, createRedux } from './createAccount.test.js';
-
-import CreateAccount from './';
-
-let api;
-let component;
-
-function render () {
-  api = createApi();
-  component = shallow(
-    <CreateAccount
-      accounts={ ACCOUNTS }
-    />,
-    {
-      context: {
-        store: createRedux()
-      }
-    }
-  ).find('CreateAccount').shallow({
-    context: { api }
-  });
-
-  return component;
-}
-
-describe('modals/CreateAccount', () => {
-  describe('rendering', () => {
-    it('renders with defaults', () => {
-      expect(render()).to.be.ok;
-    });
-  });
-});
diff --git a/js/src/modals/CreateAccount/createAccount.test.js b/js/src/modals/CreateAccount/createAccount.test.js
deleted file mode 100644
index 31ddd56b061f276ca5854ba8aa2c22a97004a4f1..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/createAccount.test.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import sinon from 'sinon';
-
-import Api from '~/api';
-import Store from './store';
-
-const ADDRESS = '0x00000123456789abcdef123456789abcdef123456789abcdef';
-const ACCOUNTS = { [ADDRESS]: {} };
-const GETH_ADDRESSES = [
-  '0x123456789abcdef123456789abcdef123456789abcdef00000',
-  '0x00000123456789abcdef123456789abcdef123456789abcdef'
-];
-
-let counter = 1;
-
-function createApi () {
-  return {
-    eth: {
-      getBalance: sinon.stub().resolves(new BigNumber(1))
-    },
-    parity: {
-      generateSecretPhrase: sinon.stub().resolves('some account phrase'),
-      importGethAccounts: sinon.stub().resolves(GETH_ADDRESSES),
-      listGethAccounts: sinon.stub().resolves(GETH_ADDRESSES),
-      newAccountFromPhrase: sinon.stub().resolves(ADDRESS),
-      newAccountFromSecret: sinon.stub().resolves(ADDRESS),
-      newAccountFromWallet: sinon.stub().resolves(ADDRESS),
-      phraseToAddress: () => Promise.resolve(`${++counter}`),
-      setAccountMeta: sinon.stub().resolves(),
-      setAccountName: sinon.stub().resolves(),
-      listVaults: sinon.stub().resolves([]),
-      listOpenedVaults: sinon.stub().resolves([])
-    },
-    util: Api.util
-  };
-}
-
-function createRedux () {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        nodeStatus: {
-          isTest: true
-        }
-      };
-    }
-  };
-}
-
-function createStore () {
-  return new Store(createApi(), ACCOUNTS);
-}
-
-export {
-  ACCOUNTS,
-  ADDRESS,
-  GETH_ADDRESSES,
-  createApi,
-  createRedux,
-  createStore
-};
diff --git a/js/src/modals/CreateAccount/errors.js b/js/src/modals/CreateAccount/errors.js
deleted file mode 100644
index 3b9ed2669f15cf972715ab39e3a36d13dcee987a..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/errors.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-
-export default {
-  duplicateName: (
-    <FormattedMessage
-      id='errors.duplicateName'
-      defaultMessage='the name already exists'
-    />
-  ),
-
-  noFile: (
-    <FormattedMessage
-      id='errors.noFile'
-      defaultMessage='select a valid wallet file to import'
-    />
-  ),
-
-  noKey: (
-    <FormattedMessage
-      id='errors.noKey'
-      defaultMessage='you need to provide the raw private key'
-    />
-  ),
-
-  noMatchPassword: (
-    <FormattedMessage
-      id='errors.noMatchPassword'
-      defaultMessage='the supplied passwords does not match'
-    />
-  ),
-
-  noMatchBackupPhrase: (
-    <FormattedMessage
-      id='errors.noMatchBackupPhrase'
-      defaultMessage='the supplied recovery phrase does not match'
-    />
-  ),
-
-  noMatchPhraseBackedUp: (
-    <FormattedMessage
-      id='errors.noMatchPhraseBackedUp'
-      defaultMessage='type "I have written down the phrase"'
-    />
-  ),
-
-  noName: (
-    <FormattedMessage
-      id='errors.noName'
-      defaultMessage='you need to specify a valid name'
-    />
-  ),
-
-  invalidKey: (
-    <FormattedMessage
-      id='errors.invalidKey'
-      defaultMessage='the raw key needs to be hex, 64 characters in length and contain the prefix "0x"'
-    />
-  )
-
-};
diff --git a/js/src/modals/CreateAccount/index.js b/js/src/modals/CreateAccount/index.js
deleted file mode 100644
index 23dcf88806a9126d836a92bc49abaf7c6ce455ab..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import AccountDetails from './AccountDetails';
-import NewAccount from './NewAccount';
-
-export default from './createAccount';
-export { AccountDetails, NewAccount };
diff --git a/js/src/modals/CreateAccount/print.js b/js/src/modals/CreateAccount/print.js
deleted file mode 100644
index 634a410dcb9d09cf2501030bffa28d98fb2fcdb4..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/print.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export const onPrint = (window, cb) => {
-  let called = false;
-  let query;
-  let queryFn;
-
-  const onPrint = () => {
-    if (queryFn) {
-      query.removeListener(queryFn);
-    }
-
-    window.removeEventListener('afterprint', onPrint, false);
-
-    if (!called) {
-      called = true;
-      cb();
-    }
-  };
-
-  if (window.matchMedia) {
-    queryFn = (query) => {
-      if (!query.matches) {
-        onPrint();
-      }
-    };
-
-    query = window.matchMedia('print');
-    query.addListener(queryFn);
-  }
-
-  window.addEventListener('afterprint', onPrint, false);
-};
-
-export default (html) => {
-  const iframe = document.createElement('iframe');
-
-  iframe.setAttribute('sandbox', 'allow-modals allow-same-origin allow-scripts');
-  iframe.setAttribute('src', '/');
-  iframe.setAttribute('style', 'display: none');
-  document.body.appendChild(iframe);
-  const teardown = () => {
-    // Safari crashes without a timeout.
-    setTimeout(() => document.body.removeChild(iframe), 0);
-  };
-
-  setTimeout(() => {
-    iframe.contentDocument.write(html);
-
-    setTimeout(() => {
-      onPrint(iframe.contentWindow, teardown);
-      iframe.contentWindow.focus();
-      iframe.contentWindow.print();
-    }, 20);
-  }, 0);
-};
diff --git a/js/src/modals/CreateAccount/recoveryPage.ejs b/js/src/modals/CreateAccount/recoveryPage.ejs
deleted file mode 100644
index 460948d7be7a7a547e463adafa44c051c55f7c17..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/recoveryPage.ejs
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>Recovery phrase for <%= name %></title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <style>
-      body {
-        margin: 2em auto;
-        max-width: 30em;
-        padding: 1em;
-        text-align: center;
-        font-size: 110%;
-        font-family: sans-serif;
-        font-weight: 300;
-      }
-      #logo {
-        max-width: 4rem;
-        margin-bottom: 3rem;
-      }
-      p {
-        margin-bottom: 1rem;
-      }
-      figure {
-        margin-bottom: 1rem;
-      }
-      figure.address img {
-        border-radius: 100%;
-      }
-      pre code {
-        display: inline-block;
-        text-align: center;
-        white-space: normal;
-        line-height: 1.3;
-      }
-    </style>
-  </head>
-  <body>
-    <img id="logo" src="<%= logo %>" alt="Parity Logo" />
-    <p>This is your account <em><%= name %></em>:</p>
-    <figure class="address">
-      <img src="<%= identity %>" alt="symbol for the address of the account" />
-      <figcaption><code><%= address %></code></figcaption>
-    </figure>
-    <p>This is the recovery phrase:</p>
-    <pre><code><%= phrase %></code></pre>
-  </body>
-</html>
diff --git a/js/src/modals/CreateAccount/store.js b/js/src/modals/CreateAccount/store.js
deleted file mode 100644
index cc2160ab95cfc83a413dc18988fd7f234f24288f..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/store.js
+++ /dev/null
@@ -1,512 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, observable, transaction } from 'mobx';
-
-import apiutil from '~/api/util';
-
-import ERRORS from './errors';
-
-const FAKEPATH = 'C:\\fakepath\\';
-const STAGE_SELECT_TYPE = 0;
-const STAGE_CREATE = 1;
-const STAGE_INFO = 2;
-const STAGE_CONFIRM_BACKUP = 3;
-
-export default class Store {
-  @observable accounts = null;
-  @observable address = null;
-  @observable createType = 'fromNew';
-  @observable description = '';
-  @observable gethAccountsAvailable = [];
-  @observable gethAddresses = [];
-  @observable gethImported = [];
-  @observable isBusy = false;
-  @observable isWindowsPhrase = false;
-  @observable name = '';
-  @observable nameError = ERRORS.noName;
-  @observable password = '';
-  @observable passwordHint = '';
-  @observable passwordRepeat = '';
-  @observable phrase = '';
-  @observable backupPhraseAddress = null;
-  @observable phraseBackedUp = '';
-  @observable qrAddress = null;
-  @observable rawKey = '';
-  @observable rawKeyError = ERRORS.nokey;
-  @observable stage = STAGE_SELECT_TYPE;
-  @observable vaultName = '';
-  @observable walletFile = '';
-  @observable walletFileError = ERRORS.noFile;
-  @observable walletJson = '';
-
-  constructor (api, accounts, isTest, loadGeth = true) {
-    this._api = api;
-    this.accounts = Object.assign({}, accounts);
-    this.isTest = isTest;
-
-    if (loadGeth) {
-      this.loadAvailableGethAccounts();
-    }
-  }
-
-  @computed get canCreate () {
-    switch (this.createType) {
-      case 'fromGeth':
-        return this.gethAddresses.length !== 0;
-
-      case 'fromJSON':
-      case 'fromPresale':
-        return !(this.nameError || this.walletFileError);
-
-      case 'fromNew':
-        return !(this.nameError || this.passwordRepeatError) && this.hasAddress && this.hasPhrase;
-
-      case 'fromPhrase':
-        return !(this.nameError || this.passwordRepeatError || this.passPhraseError);
-
-      case 'fromQr':
-        return this.qrAddressValid && !this.nameError;
-
-      case 'fromRaw':
-        return !(this.nameError || this.passwordRepeatError || this.rawKeyError);
-
-      default:
-        return false;
-    }
-  }
-
-  @computed get passPhraseError () {
-    return !this.isTest && this.phrase.length === 0;
-  }
-
-  @computed get hasAddress () {
-    return !!(this.address);
-  }
-
-  @computed get hasPhrase () {
-    return this.phrase.length !== 0;
-  }
-
-  @computed get passwordRepeatError () {
-    return this.password === this.passwordRepeat
-      ? null
-      : ERRORS.noMatchPassword;
-  }
-
-  @computed get backupPhraseError () {
-    return !this.backupPhraseAddress || this.address === this.backupPhraseAddress
-      ? null
-      : ERRORS.noMatchBackupPhrase;
-  }
-
-  @computed get phraseBackedUpError () {
-    return this.phraseBackedUp === 'I have written down the phrase'
-      ? null
-      : ERRORS.noMatchPhraseBackedUp;
-  }
-
-  @computed get qrAddressValid () {
-    return this._api.util.isAddressValid(this.qrAddress);
-  }
-
-  @action clearPhrase = () => {
-    transaction(() => {
-      this.phrase = '';
-      this.phraseBackedUp = '';
-    });
-  }
-
-  @action clearErrors = () => {
-    transaction(() => {
-      this.address = '';
-      this.description = '';
-      this.password = '';
-      this.passwordRepeat = '';
-      this.phrase = '';
-      this.backupPhraseAddress = null;
-      this.phraseBackedUp = '';
-      this.name = '';
-      this.nameError = ERRORS.noName;
-      this.qrAddress = null;
-      this.rawKey = '';
-      this.rawKeyError = null;
-      this.vaultName = '';
-      this.walletFile = '';
-      this.walletFileError = null;
-      this.walletJson = '';
-    });
-  }
-
-  @action selectGethAccount = (address) => {
-    if (this.gethAddresses.includes(address)) {
-      this.gethAddresses = this.gethAddresses.filter((_address) => _address !== address);
-    } else {
-      this.gethAddresses = [address].concat(this.gethAddresses.peek());
-    }
-  }
-
-  @action setAddress = (address) => {
-    this.address = address;
-  }
-
-  @action setBusy = (isBusy) => {
-    this.isBusy = isBusy;
-  }
-
-  @action setCreateType = (createType) => {
-    this.clearErrors();
-    this.createType = createType;
-  }
-
-  @action setDescription = (description) => {
-    this.description = description;
-  }
-
-  @action setGethAccountsAvailable = (gethAccountsAvailable) => {
-    this.gethAccountsAvailable = [].concat(gethAccountsAvailable);
-  }
-
-  @action setGethImported = (gethImported) => {
-    this.gethImported = gethImported;
-  }
-
-  @action setQrAddress = (qrAddress) => {
-    if (qrAddress && qrAddress.substr(0, 2) !== '0x') {
-      qrAddress = `0x${qrAddress}`;
-    }
-
-    // FIXME: Current native signer encoding is not 100% for EIP-55, lowercase for now
-    this.qrAddress = qrAddress && this._api.util
-        ? this._api.util.toChecksumAddress(qrAddress.toLowerCase())
-        : qrAddress;
-  }
-
-  @action setVaultName = (vaultName) => {
-    this.vaultName = vaultName;
-  }
-
-  @action setWindowsPhrase = (isWindowsPhrase = false) => {
-    this.isWindowsPhrase = isWindowsPhrase;
-  }
-
-  @action setName = (name) => {
-    let nameError = null;
-
-    if (!name || !name.trim().length) {
-      nameError = ERRORS.noName;
-    }
-
-    transaction(() => {
-      this.name = name;
-      this.nameError = nameError;
-    });
-  }
-
-  @action setBackupPhraseAddress = (address) => {
-    this.backupPhraseAddress = address;
-  }
-
-  @action computeBackupPhraseAddress = () => {
-    return this._api.parity.phraseToAddress(this.phrase)
-      .then(address => {
-        this.setBackupPhraseAddress(address);
-        return address !== this.address;
-      })
-      .catch((error) => {
-        console.error('createAccount', error);
-        throw error;
-      });
-  }
-
-  @action setPhraseBackedUp = (backedUp) => {
-    this.phraseBackedUp = backedUp;
-  }
-
-  @action setPassword = (password) => {
-    this.password = password;
-  }
-
-  @action setPasswordHint = (passwordHint) => {
-    this.passwordHint = passwordHint;
-  }
-
-  @action setPasswordRepeat = (passwordRepeat) => {
-    this.passwordRepeat = passwordRepeat;
-  }
-
-  @action setPhrase = (phrase) => {
-    const recoveryPhrase = phrase
-      .toLowerCase() // wordlists are lowercase
-      .trim() // remove whitespace at both ends
-      .replace(/\s/g, ' ') // replace any whitespace with single space
-      .replace(/ +/g, ' '); // replace multiple spaces with a single space
-
-    const phraseParts = recoveryPhrase
-      .split(' ')
-      .map((part) => part.trim())
-      .filter((part) => part.length);
-
-    this.phrase = phraseParts.join(' ');
-    this.backupPhraseAddress = null;
-  }
-
-  @action setRawKey = (rawKey) => {
-    let rawKeyError = null;
-
-    if (!rawKey || !rawKey.trim().length) {
-      rawKeyError = ERRORS.noKey;
-    } else if (rawKey.substr(0, 2) !== '0x' || rawKey.substr(2).length !== 64 || !apiutil.isHex(rawKey)) {
-      rawKeyError = ERRORS.invalidKey;
-    }
-
-    transaction(() => {
-      this.rawKey = rawKey;
-      this.rawKeyError = rawKeyError;
-    });
-  }
-
-  @action setStage = (stage) => {
-    this.stage = stage;
-  }
-
-  @action setWalletFile = (walletFile) => {
-    transaction(() => {
-      this.walletFile = walletFile.replace(FAKEPATH, '');
-      this.walletFileError = ERRORS.noFile;
-      this.walletJson = null;
-    });
-  }
-
-  @action setWalletJson = (walletJson) => {
-    transaction(() => {
-      this.walletFileError = null;
-      this.walletJson = walletJson;
-    });
-  }
-
-  @action nextStage = () => {
-    if (this.stage === 0) {
-      this.clearErrors();
-    }
-
-    this.stage++;
-  }
-
-  @action prevStage = () => {
-    this.stage--;
-  }
-
-  createAccount = (vaultStore) => {
-    if (!this.canCreate) {
-      return false;
-    }
-
-    this.setBusy(true);
-
-    return this
-      ._createAccount()
-      .then(() => {
-        if (vaultStore && this.vaultName && this.vaultName.length) {
-          return vaultStore.moveAccount(this.vaultName, this.address);
-        }
-
-        return true;
-      })
-      .then(() => {
-        this.setBusy(false);
-      })
-      .catch((error) => {
-        this.setBusy(false);
-        throw error;
-      });
-  }
-
-  _createAccount = () => {
-    switch (this.createType) {
-      case 'fromGeth':
-        return this.createAccountFromGeth();
-
-      case 'fromJSON':
-      case 'fromPresale':
-        return this.createAccountFromWallet();
-
-      case 'fromNew':
-      case 'fromPhrase':
-        return this.createAccountFromPhrase();
-
-      case 'fromQr':
-        return this.createAccountFromQr();
-
-      case 'fromRaw':
-        return this.createAccountFromRaw();
-
-      default:
-        throw new Error(`Cannot create account for ${this.createType}`);
-    }
-  }
-
-  createAccountFromGeth = (timestamp = Date.now()) => {
-    return this._api.parity
-      .importGethAccounts(this.gethAddresses.peek())
-      .then((gethImported) => {
-        console.log('createAccountFromGeth', gethImported);
-
-        this.setName('Geth Import');
-        this.setDescription('Imported from Geth keystore');
-        this.setGethImported(gethImported);
-
-        return Promise.all(gethImported.map((address) => {
-          return this.setupMeta(address, timestamp);
-        }));
-      })
-      .catch((error) => {
-        console.error('createAccountFromGeth', error);
-        throw error;
-      });
-  }
-
-  createAccountFromPhrase = (timestamp = Date.now()) => {
-    let formattedPhrase = this.phrase;
-
-    if (this.isWindowsPhrase && this.createType === 'fromPhrase') {
-      formattedPhrase = this.phrase
-        .split(' ') // get the words
-        .map((word) => word === 'misjudged' ? word : `${word}\r`) // add \r after each (except last in dict)
-        .join(' '); // re-create string
-    }
-
-    return this._api.parity
-      .newAccountFromPhrase(formattedPhrase, this.password)
-      .then((address) => {
-        this.setAddress(address);
-
-        return this.setupMeta(address, timestamp);
-      })
-      .catch((error) => {
-        console.error('createAccount', error);
-        throw error;
-      });
-  }
-
-  createAccountFromQr = (timestamp = Date.now()) => {
-    this.setAddress(this.qrAddress);
-
-    return this.setupMeta(this.qrAddress, timestamp, { external: true });
-  }
-
-  createAccountFromRaw = (timestamp = Date.now()) => {
-    return this._api.parity
-      .newAccountFromSecret(this.rawKey, this.password)
-      .then((address) => {
-        this.setAddress(address);
-
-        return this.setupMeta(address, timestamp);
-      })
-      .catch((error) => {
-        console.error('createAccount', error);
-        throw error;
-      });
-  }
-
-  createAccountFromWallet = (timestamp = Date.now()) => {
-    return this._api.parity
-      .newAccountFromWallet(this.walletJson, this.password)
-      .then((address) => {
-        this.setAddress(address);
-
-        return this.setupMeta(address, timestamp);
-      })
-      .catch((error) => {
-        console.error('createAccount', error);
-        throw error;
-      });
-  }
-
-  setupMeta = (address, timestamp = Date.now(), extra = {}) => {
-    const meta = Object.assign({}, extra, {
-      description: this.description,
-      passwordHint: this.passwordHint,
-      timestamp
-    });
-
-    return this._api.parity
-      .setAccountName(address, this.name)
-      .then(() => this._api.parity.setAccountMeta(address, meta));
-  }
-
-  createIdentities = () => {
-    return Promise
-      .all([
-        this._api.parity.generateSecretPhrase(),
-        this._api.parity.generateSecretPhrase(),
-        this._api.parity.generateSecretPhrase(),
-        this._api.parity.generateSecretPhrase(),
-        this._api.parity.generateSecretPhrase(),
-        this._api.parity.generateSecretPhrase(),
-        this._api.parity.generateSecretPhrase()
-      ])
-      .then((phrases) => {
-        return Promise
-          .all(phrases.map((phrase) => this._api.parity.phraseToAddress(phrase)))
-          .then((addresses) => {
-            return phrases.reduce((accounts, phrase, index) => {
-              const address = addresses[index];
-
-              accounts[address] = {
-                address,
-                phrase
-              };
-
-              return accounts;
-            }, {});
-          });
-      })
-      .catch((error) => {
-        console.error('createIdentities', error);
-        throw error;
-      });
-  }
-
-  loadAvailableGethAccounts () {
-    return this._api.parity
-      .listGethAccounts()
-      .then((_addresses) => {
-        const addresses = (_addresses || []).filter((address) => !this.accounts[address]);
-
-        return Promise
-          .all(addresses.map((address) => this._api.eth.getBalance(address)))
-          .then((balances) => {
-            this.setGethAccountsAvailable(addresses.map((address, index) => {
-              return {
-                address,
-                balance: apiutil.fromWei(balances[index]).toFormat(5)
-              };
-            }));
-          });
-      })
-      .catch((error) => {
-        console.warn('loadAvailableGethAccounts', error);
-      });
-  }
-}
-
-export {
-  STAGE_INFO,
-  STAGE_CONFIRM_BACKUP,
-  STAGE_CREATE,
-  STAGE_SELECT_TYPE
-};
diff --git a/js/src/modals/CreateAccount/store.spec.js b/js/src/modals/CreateAccount/store.spec.js
deleted file mode 100644
index fbb88b0841850c6797175a5b11c16f3b2e6f648c..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateAccount/store.spec.js
+++ /dev/null
@@ -1,812 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Store from './store';
-
-import { ACCOUNTS, ADDRESS, GETH_ADDRESSES, createApi } from './createAccount.test.js';
-
-let api;
-let store;
-let vaultStore;
-
-function createVaultStore () {
-  vaultStore = {
-    moveAccount: sinon.stub().resolves(),
-    listVaults: sinon.stub().resolves()
-  };
-
-  return vaultStore;
-}
-
-function createStore (loadGeth) {
-  createVaultStore();
-
-  api = createApi();
-  store = new Store(api, ACCOUNTS, true, loadGeth);
-
-  return store;
-}
-
-describe('modals/CreateAccount/Store', () => {
-  beforeEach(() => {
-    createStore();
-  });
-
-  describe('constructor', () => {
-    it('captures the accounts passed', () => {
-      expect(store.accounts).to.deep.equal(ACCOUNTS);
-    });
-
-    it('starts as non-busy', () => {
-      expect(store.isBusy).to.be.false;
-    });
-
-    it('sets the initial createType to fromNew', () => {
-      expect(store.createType).to.equal('fromNew');
-    });
-
-    it('sets the initial stage to create', () => {
-      expect(store.stage).to.equal(0);
-    });
-
-    it('loads the geth accounts', () => {
-      expect(store.gethAccountsAvailable.map((account) => account.address)).to.deep.equal([GETH_ADDRESSES[0]]);
-    });
-
-    it('does not load geth accounts when loadGeth === false', () => {
-      createStore(false);
-      expect(store.gethAccountsAvailable.peek()).to.deep.equal([]);
-    });
-  });
-
-  describe('@action', () => {
-    describe('clearErrors', () => {
-      beforeEach(() => {
-        store.setName('testing');
-        store.setPassword('testing');
-        store.setQrAddress('testing');
-        store.setRawKey('test');
-        store.setVaultName('testing');
-        store.setWalletFile('test');
-        store.setWalletJson('test');
-      });
-
-      it('clears all errors', () => {
-        store.clearErrors();
-
-        expect(store.name).to.equal('');
-        expect(store.nameError).not.to.be.null;
-        expect(store.password).to.equal('');
-        expect(store.passwordRepeatError).to.be.null;
-        expect(store.qrAddress).to.be.null;
-        expect(store.rawKey).to.equal('');
-        expect(store.rawKeyError).to.be.null;
-        expect(store.vaultName).to.equal('');
-        expect(store.walletFile).to.equal('');
-        expect(store.walletFileError).to.be.null;
-        expect(store.walletJson).to.equal('');
-      });
-    });
-
-    describe('selectGethAccount', () => {
-      it('selects and deselects and address', () => {
-        expect(store.gethAddresses.peek()).to.deep.equal([]);
-        store.selectGethAccount(GETH_ADDRESSES[0]);
-        expect(store.gethAddresses.peek()).to.deep.equal([GETH_ADDRESSES[0]]);
-        store.selectGethAccount(GETH_ADDRESSES[0]);
-        expect(store.gethAddresses.peek()).to.deep.equal([]);
-      });
-    });
-
-    describe('setAddress', () => {
-      const ADDR = '0x1234567890123456789012345678901234567890';
-
-      it('sets the address', () => {
-        store.setAddress(ADDR);
-        expect(store.address).to.equal(ADDR);
-      });
-    });
-
-    describe('setBusy', () => {
-      it('sets the busy flag', () => {
-        store.setBusy(true);
-        expect(store.isBusy).to.be.true;
-      });
-    });
-
-    describe('setCreateType', () => {
-      it('allows changing the type', () => {
-        store.setCreateType('testing');
-        expect(store.createType).to.equal('testing');
-      });
-    });
-
-    describe('setDescription', () => {
-      it('allows setting the description', () => {
-        store.setDescription('testing');
-        expect(store.description).to.equal('testing');
-      });
-    });
-
-    describe('setName', () => {
-      it('allows setting the name', () => {
-        store.setName('testing');
-        expect(store.name).to.equal('testing');
-        expect(store.nameError).to.be.null;
-      });
-
-      it('sets errors on invalid names', () => {
-        store.setName('');
-        expect(store.nameError).not.to.be.null;
-      });
-    });
-
-    describe('setPassword', () => {
-      it('allows setting the password', () => {
-        store.setPassword('testing');
-        expect(store.password).to.equal('testing');
-      });
-    });
-
-    describe('setPasswordHint', () => {
-      it('allows setting the passwordHint', () => {
-        store.setPasswordHint('testing');
-        expect(store.passwordHint).to.equal('testing');
-      });
-    });
-
-    describe('setPasswordRepeat', () => {
-      it('allows setting the passwordRepeat', () => {
-        store.setPasswordRepeat('testing');
-        expect(store.passwordRepeat).to.equal('testing');
-      });
-    });
-
-    describe('setPhrase', () => {
-      it('allows setting the phrase', () => {
-        store.setPhrase('testing');
-        expect(store.phrase).to.equal('testing');
-      });
-    });
-
-    describe('setQrAddress', () => {
-      const ADDR = '0x1234567890123456789012345678901234567890';
-
-      it('sets the address', () => {
-        store.setQrAddress(ADDR);
-        expect(store.qrAddress).to.equal(ADDR);
-      });
-
-      it('adds leading 0x if not found', () => {
-        store.setQrAddress(ADDR.substr(2));
-        expect(store.qrAddress).to.equal(ADDR);
-      });
-    });
-
-    describe('setRawKey', () => {
-      it('sets error when empty key', () => {
-        store.setRawKey(null);
-        expect(store.rawKeyError).not.to.be.null;
-      });
-
-      it('sets error when non-hex value', () => {
-        store.setRawKey('0000000000000000000000000000000000000000000000000000000000000000');
-        expect(store.rawKeyError).not.to.be.null;
-      });
-
-      it('sets error when non-valid length value', () => {
-        store.setRawKey('0x0');
-        expect(store.rawKeyError).not.to.be.null;
-      });
-
-      it('sets the key when checks pass', () => {
-        const KEY = '0x1000000000000000000000000000000000000000000000000000000000000000';
-
-        store.setRawKey(KEY);
-        expect(store.rawKey).to.equal(KEY);
-        expect(store.rawKeyError).to.be.null;
-      });
-    });
-
-    describe('setStage', () => {
-      it('changes to the provided stage', () => {
-        store.setStage(2);
-        expect(store.stage).to.equal(2);
-      });
-    });
-
-    describe('setVaultName', () => {
-      it('sets the vault name', () => {
-        store.setVaultName('testVault');
-        expect(store.vaultName).to.equal('testVault');
-      });
-    });
-
-    describe('setWalletFile', () => {
-      it('sets the filepath', () => {
-        store.setWalletFile('testing');
-        expect(store.walletFile).to.equal('testing');
-      });
-
-      it('cleans up the fakepath', () => {
-        store.setWalletFile('C:\\fakepath\\testing');
-        expect(store.walletFile).to.equal('testing');
-      });
-
-      it('sets the error', () => {
-        store.setWalletFile('testing');
-        expect(store.walletFileError).not.to.be.null;
-      });
-    });
-
-    describe('setWalletJson', () => {
-      it('sets the json', () => {
-        store.setWalletJson('testing');
-        expect(store.walletJson).to.equal('testing');
-      });
-
-      it('clears previous file errors', () => {
-        store.setWalletFile('testing');
-        store.setWalletJson('testing');
-        expect(store.walletFileError).to.be.null;
-      });
-    });
-
-    describe('setWindowsPhrase', () => {
-      it('allows setting the windows toggle', () => {
-        store.setWindowsPhrase(true);
-        expect(store.isWindowsPhrase).to.be.true;
-      });
-    });
-
-    describe('nextStage/prevStage', () => {
-      it('changes to next/prev', () => {
-        expect(store.stage).to.equal(0);
-        store.nextStage();
-        expect(store.stage).to.equal(1);
-        store.prevStage();
-        expect(store.stage).to.equal(0);
-      });
-    });
-  });
-
-  describe('@computed', () => {
-    describe('canCreate', () => {
-      beforeEach(() => {
-        store.clearErrors();
-      });
-
-      describe('createType === fromGeth', () => {
-        beforeEach(() => {
-          store.setCreateType('fromGeth');
-        });
-
-        it('returns false on none selected', () => {
-          expect(store.canCreate).to.be.false;
-        });
-
-        it('returns true when selected', () => {
-          store.selectGethAccount(GETH_ADDRESSES[0]);
-          expect(store.canCreate).to.be.true;
-        });
-      });
-
-      describe('createType === fromJSON/fromPresale', () => {
-        beforeEach(() => {
-          store.setCreateType('fromJSON');
-          store.setName('blah');
-        });
-
-        it('returns true on no errors', () => {
-          expect(store.canCreate).to.be.true;
-        });
-
-        it('returns false on nameError', () => {
-          store.setName('');
-          expect(store.canCreate).to.be.false;
-        });
-
-        it('returns false on walletFileError', () => {
-          store.setWalletFile('testing');
-          expect(store.canCreate).to.be.false;
-        });
-      });
-
-      describe('createType === fromNew', () => {
-        beforeEach(() => {
-          store.setCreateType('fromNew');
-          store.setAddress('0x0000000000000000000000000000000000000000');
-          store.setName('blah');
-          store.setPhrase('testing');
-        });
-
-        it('returns true on no errors', () => {
-          expect(store.canCreate).to.be.true;
-        });
-
-        it('returns false on nameError', () => {
-          store.setName('');
-
-          expect(store.canCreate).to.be.false;
-        });
-
-        it('returns false on no phrase', () => {
-          store.setPhrase('');
-
-          expect(store.canCreate).to.be.false;
-        });
-
-        it('returns false on passwordRepeatError', () => {
-          store.setPassword('testing');
-
-          expect(store.canCreate).to.be.false;
-        });
-      });
-
-      describe('createType === fromPhrase', () => {
-        beforeEach(() => {
-          store.setCreateType('fromPhrase');
-          store.setName('name');
-        });
-
-        it('returns true on no errors', () => {
-          expect(store.canCreate).to.be.true;
-        });
-
-        it('returns false on nameError', () => {
-          store.setName('');
-          expect(store.canCreate).to.be.false;
-        });
-
-        it('returns false on passwordRepeatError', () => {
-          store.setPassword('testing');
-          expect(store.canCreate).to.be.false;
-        });
-      });
-
-      describe('createType === fromRaw', () => {
-        beforeEach(() => {
-          store.setCreateType('fromRaw');
-          store.setName('name');
-          store.setRawKey('0x1000000000000000000000000000000000000000000000000000000000000000');
-        });
-
-        it('returns true on no errors', () => {
-          expect(store.canCreate).to.be.true;
-        });
-
-        it('returns false on nameError', () => {
-          store.setName('');
-          expect(store.canCreate).to.be.false;
-        });
-
-        it('returns false on passwordRepeatError', () => {
-          store.setPassword('testing');
-          expect(store.canCreate).to.be.false;
-        });
-
-        it('returns false on rawKeyError', () => {
-          store.setRawKey('0x1');
-          expect(store.canCreate).to.be.false;
-        });
-      });
-
-      describe('createType === anythingElse', () => {
-        beforeEach(() => {
-          store.setCreateType('anythingElse');
-        });
-
-        it('always returns false', () => {
-          expect(store.canCreate).to.be.false;
-        });
-      });
-    });
-
-    describe('passwordRepeatError', () => {
-      it('is clear when passwords match', () => {
-        store.setPassword('testing');
-        store.setPasswordRepeat('testing');
-        expect(store.passwordRepeatError).to.be.null;
-      });
-
-      it('has error when passwords does not match', () => {
-        store.setPassword('testing');
-        store.setPasswordRepeat('testing2');
-        expect(store.passwordRepeatError).not.to.be.null;
-      });
-    });
-  });
-
-  describe('operations', () => {
-    describe('setupMeta', () => {
-      beforeEach(() => {
-        store.setDescription('test description');
-        store.setName('test name');
-        store.setPasswordHint('some hint');
-
-        return store.setupMeta('testaddr', 'timestamp', { something: 'else' });
-      });
-
-      it('sets the name for the acocunt', () => {
-        expect(api.parity.setAccountName).to.have.been.calledWith('testaddr', 'test name');
-      });
-
-      it('sets the meta for the account', () => {
-        expect(api.parity.setAccountMeta).to.have.been.calledWith('testaddr', {
-          description: 'test description',
-          passwordHint: 'some hint',
-          something: 'else',
-          timestamp: 'timestamp'
-        });
-      });
-    });
-
-    describe('createAccount', () => {
-      let createAccountFromGethSpy;
-      let createAccountFromWalletSpy;
-      let createAccountFromPhraseSpy;
-      let createAccountFromQrSpy;
-      let createAccountFromRawSpy;
-      let busySpy;
-
-      beforeEach(() => {
-        createAccountFromGethSpy = sinon.spy(store, 'createAccountFromGeth');
-        createAccountFromWalletSpy = sinon.spy(store, 'createAccountFromWallet');
-        createAccountFromPhraseSpy = sinon.spy(store, 'createAccountFromPhrase');
-        createAccountFromQrSpy = sinon.spy(store, 'createAccountFromQr');
-        createAccountFromRawSpy = sinon.spy(store, 'createAccountFromRaw');
-        busySpy = sinon.spy(store, 'setBusy');
-
-        store.setName('name');
-        store.setPhrase('testing');
-      });
-
-      afterEach(() => {
-        store.createAccountFromGeth.restore();
-        store.createAccountFromWallet.restore();
-        store.createAccountFromPhrase.restore();
-        store.createAccountFromRaw.restore();
-        store.createAccountFromQr.restore();
-        store.setBusy.restore();
-      });
-
-      it('throws error on invalid createType', () => {
-        store.setCreateType('testing');
-        expect(() => store.createAccount()).to.throw;
-      });
-
-      it('calls createAccountFromGeth on createType === fromGeth', () => {
-        store.setCreateType('fromGeth');
-        store.setGethAccountsAvailable(GETH_ADDRESSES);
-        store.selectGethAccount(GETH_ADDRESSES[0]);
-
-        return store.createAccount().then(() => {
-          expect(createAccountFromGethSpy).to.have.been.called;
-        });
-      });
-
-      it('calls createAccountFromWallet on createType === fromJSON', () => {
-        store.setCreateType('fromJSON');
-        store.setName('name');
-        store.setWalletJson('{}');
-
-        return store.createAccount().then(() => {
-          expect(createAccountFromWalletSpy).to.have.been.called;
-        });
-      });
-
-      it('calls createAccountFromPhrase on createType === fromNew', () => {
-        store.setCreateType('fromNew');
-        store.setName('name');
-        store.setPhrase('phrase');
-        store.setAddress('0x1234567890123456789012345678901234567890');
-
-        return store.createAccount().then(() => {
-          expect(createAccountFromPhraseSpy).to.have.been.called;
-        });
-      });
-
-      it('calls createAccountFromPhrase on createType === fromPhrase', () => {
-        store.setCreateType('fromPhrase');
-        store.setName('name');
-        store.setPhrase('phrase');
-        store.setAddress('0x1234567890123456789012345678901234567890');
-
-        return store.createAccount().then(() => {
-          expect(createAccountFromPhraseSpy).to.have.been.called;
-        });
-      });
-
-      it('calls createAccountFromWallet on createType === fromPresale', () => {
-        store.setCreateType('fromPresale');
-        store.setName('name');
-        store.setWalletJson('{}');
-
-        return store.createAccount().then(() => {
-          expect(createAccountFromWalletSpy).to.have.been.called;
-        });
-      });
-
-      it('calls createAccountFromQr on createType === fromQr', () => {
-        store.setCreateType('fromQr');
-        store.setQrAddress('0x1234567890123456789012345678901234567890');
-        store.setName('name');
-
-        return store.createAccount().then(() => {
-          expect(createAccountFromQrSpy).to.have.been.called;
-        });
-      });
-
-      it('calls createAccountFromRaw on createType === fromRaw', () => {
-        store.setCreateType('fromRaw');
-        store.setName('name');
-        store.setRawKey('0x1000000000000000000000000000000000000000000000000000000000000000');
-
-        return store.createAccount().then(() => {
-          expect(createAccountFromRawSpy).to.have.been.called;
-        });
-      });
-
-      it('moves account to vault when vaultName set', () => {
-        store.setCreateType('fromNew');
-        store.setVaultName('testing');
-        store.setName('name');
-        store.setAddress('0x1234567890123456789012345678901234567890');
-        store.setPhrase('phrase');
-
-        return store.createAccount(vaultStore).then(() => {
-          expect(vaultStore.moveAccount).to.have.been.calledWith('testing', ADDRESS);
-        });
-      });
-
-      it('sets and rests the busy flag', () => {
-        store.setCreateType('fromNew');
-        store.setName('name');
-        store.setAddress('0x1234567890123456789012345678901234567890');
-        store.setPhrase('phrase');
-
-        return store.createAccount().then(() => {
-          expect(busySpy).to.have.been.calledWith(true);
-          expect(busySpy).to.have.been.calledWith(false);
-        });
-      });
-
-      describe('createAccountFromGeth', () => {
-        beforeEach(() => {
-          store.selectGethAccount(GETH_ADDRESSES[0]);
-        });
-
-        it('calls parity.importGethAccounts', () => {
-          return store.createAccountFromGeth().then(() => {
-            expect(store._api.parity.importGethAccounts).to.have.been.calledWith([GETH_ADDRESSES[0]]);
-          });
-        });
-
-        it('sets the account name', () => {
-          return store.createAccountFromGeth().then(() => {
-            expect(store._api.parity.setAccountName).to.have.been.calledWith(GETH_ADDRESSES[0], 'Geth Import');
-          });
-        });
-
-        it('sets the account meta', () => {
-          return store.createAccountFromGeth(-1).then(() => {
-            expect(store._api.parity.setAccountMeta).to.have.been.calledWith(GETH_ADDRESSES[0], {
-              description: 'Imported from Geth keystore',
-              passwordHint: '',
-              timestamp: -1
-            });
-          });
-        });
-      });
-
-      describe('createAccountFromPhrase', () => {
-        beforeEach(() => {
-          store.setCreateType('fromPhrase');
-          store.setName('some name');
-          store.setPassword('P@55worD');
-          store.setPasswordHint('some hint');
-          store.setPhrase('some phrase');
-        });
-
-        it('calls parity.newAccountFromWallet', () => {
-          return store.createAccountFromPhrase().then(() => {
-            expect(store._api.parity.newAccountFromPhrase).to.have.been.calledWith('some phrase', 'P@55worD');
-          });
-        });
-
-        it('sets the address', () => {
-          return store.createAccountFromPhrase().then(() => {
-            expect(store.address).to.equal(ADDRESS);
-          });
-        });
-
-        it('sets the account name', () => {
-          return store.createAccountFromPhrase().then(() => {
-            expect(store._api.parity.setAccountName).to.have.been.calledWith(ADDRESS, 'some name');
-          });
-        });
-
-        it('sets the account meta', () => {
-          return store.createAccountFromPhrase(-1).then(() => {
-            expect(store._api.parity.setAccountMeta).to.have.been.calledWith(ADDRESS, {
-              description: '',
-              passwordHint: 'some hint',
-              timestamp: -1
-            });
-          });
-        });
-
-        it('adjusts phrases for Windows', () => {
-          store.setWindowsPhrase(true);
-          return store.createAccountFromPhrase().then(() => {
-            expect(store._api.parity.newAccountFromPhrase).to.have.been.calledWith('some\r phrase\r', 'P@55worD');
-          });
-        });
-
-        it('adjusts phrases for Windows (except last word)', () => {
-          store.setWindowsPhrase(true);
-          store.setPhrase('misjudged phrase');
-          return store.createAccountFromPhrase().then(() => {
-            expect(store._api.parity.newAccountFromPhrase).to.have.been.calledWith('misjudged phrase\r', 'P@55worD');
-          });
-        });
-      });
-
-      describe('createAccountFromQr', () => {
-        beforeEach(() => {
-          store.setName('some name');
-          store.setDescription('some desc');
-          store.setQrAddress('0x1234567890123456789012345678901234567890');
-          sinon.spy(store, 'setupMeta');
-
-          return store.createAccountFromQr(-1);
-        });
-
-        afterEach(() => {
-          store.setupMeta.restore();
-        });
-
-        it('sets the meta', () => {
-          expect(store.setupMeta).to.have.been.called;
-        });
-      });
-
-      describe('createAccountFromRaw', () => {
-        beforeEach(() => {
-          store.setName('some name');
-          store.setPassword('P@55worD');
-          store.setPasswordHint('some hint');
-          store.setRawKey('rawKey');
-        });
-
-        it('calls parity.newAccountFromSecret', () => {
-          return store.createAccountFromRaw().then(() => {
-            expect(store._api.parity.newAccountFromSecret).to.have.been.calledWith('rawKey', 'P@55worD');
-          });
-        });
-
-        it('sets the address', () => {
-          return store.createAccountFromRaw().then(() => {
-            expect(store.address).to.equal(ADDRESS);
-          });
-        });
-
-        it('sets the account name', () => {
-          return store.createAccountFromRaw().then(() => {
-            expect(store._api.parity.setAccountName).to.have.been.calledWith(ADDRESS, 'some name');
-          });
-        });
-
-        it('sets the account meta', () => {
-          return store.createAccountFromRaw(-1).then(() => {
-            expect(store._api.parity.setAccountMeta).to.have.been.calledWith(ADDRESS, {
-              description: '',
-              passwordHint: 'some hint',
-              timestamp: -1
-            });
-          });
-        });
-      });
-
-      describe('createAccountFromWallet', () => {
-        beforeEach(() => {
-          store.setName('some name');
-          store.setPassword('P@55worD');
-          store.setPasswordHint('some hint');
-          store.setWalletJson('json');
-        });
-
-        it('calls parity.newAccountFromWallet', () => {
-          return store.createAccountFromWallet().then(() => {
-            expect(store._api.parity.newAccountFromWallet).to.have.been.calledWith('json', 'P@55worD');
-          });
-        });
-
-        it('sets the address', () => {
-          return store.createAccountFromWallet().then(() => {
-            expect(store.address).to.equal(ADDRESS);
-          });
-        });
-
-        it('sets the account name', () => {
-          return store.createAccountFromWallet().then(() => {
-            expect(store._api.parity.setAccountName).to.have.been.calledWith(ADDRESS, 'some name');
-          });
-        });
-
-        it('sets the account meta', () => {
-          return store.createAccountFromWallet(-1).then(() => {
-            expect(store._api.parity.setAccountMeta).to.have.been.calledWith(ADDRESS, {
-              description: '',
-              passwordHint: 'some hint',
-              timestamp: -1
-            });
-          });
-        });
-      });
-    });
-
-    describe('createIdentities', () => {
-      it('creates calls parity.generateSecretPhrase', () => {
-        return store.createIdentities().then(() => {
-          expect(store._api.parity.generateSecretPhrase).to.have.been.called;
-        });
-      });
-
-      it('returns a map of 7 accounts', () => {
-        return store.createIdentities().then((accounts) => {
-          expect(Object.keys(accounts).length).to.equal(7);
-        });
-      });
-
-      it('creates accounts with an address & phrase', () => {
-        return store.createIdentities().then((accounts) => {
-          Object.keys(accounts).forEach((address) => {
-            const account = accounts[address];
-
-            expect(account.address).to.equal(address);
-            expect(account.phrase).to.be.ok;
-          });
-        });
-      });
-    });
-
-    describe('loadAvailableGethAccounts', () => {
-      it('retrieves the list from parity.listGethAccounts', () => {
-        return store.loadAvailableGethAccounts().then(() => {
-          expect(store._api.parity.listGethAccounts).to.have.been.called;
-        });
-      });
-
-      it('sets the available addresses with balances', () => {
-        return store.loadAvailableGethAccounts().then(() => {
-          expect(store.gethAccountsAvailable[0]).to.deep.equal({
-            address: GETH_ADDRESSES[0],
-            balance: '0.00000'
-          });
-        });
-      });
-
-      it('filters accounts already available', () => {
-        return store.loadAvailableGethAccounts().then(() => {
-          expect(store.gethAccountsAvailable.length).to.equal(1);
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/modals/CreateWallet/WalletDetails/index.js b/js/src/modals/CreateWallet/WalletDetails/index.js
deleted file mode 100644
index e572ba22bc5e135bd1a8cc0ef31a0287b4fdbc5b..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/WalletDetails/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './walletDetails';
diff --git a/js/src/modals/CreateWallet/WalletDetails/walletDetails.js b/js/src/modals/CreateWallet/WalletDetails/walletDetails.js
deleted file mode 100644
index d3776e2cb4b11a8a4cd4469802a97926b0600715..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/WalletDetails/walletDetails.js
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Form, TypedInput, Input, AddressSelect, InputAddress } from '~/ui';
-
-import styles from '../createWallet.css';
-
-export default class WalletDetails extends Component {
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    wallet: PropTypes.object.isRequired,
-    errors: PropTypes.object.isRequired,
-    onChange: PropTypes.func.isRequired,
-    walletType: PropTypes.string.isRequired
-  };
-
-  render () {
-    const { walletType } = this.props;
-
-    if (walletType === 'WATCH') {
-      return this.renderWatchDetails();
-    }
-
-    return this.renderMultisigDetails();
-  }
-
-  renderWatchDetails () {
-    const { wallet, errors } = this.props;
-
-    return (
-      <Form>
-        <InputAddress
-          autoFocus
-          hint={
-            <FormattedMessage
-              id='createWallet.details.address.hint'
-              defaultMessage='the wallet contract address'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createWallet.details.address.label'
-              defaultMessage='wallet address'
-            />
-          }
-          value={ wallet.address }
-          error={ errors.address }
-          onChange={ this.onAddressChange }
-        />
-
-        <Input
-          error={ errors.name }
-          hint={
-            <FormattedMessage
-              id='createWallet.details.name.hint'
-              defaultMessage='the local name for this wallet'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createWallet.details.name.label'
-              defaultMessage='wallet name'
-            />
-          }
-          value={ wallet.name }
-          onChange={ this.onNameChange }
-        />
-
-        <Input
-          hint={
-            <FormattedMessage
-              id='createWallet.details.description.hint'
-              defaultMessage='the local description for this wallet'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createWallet.details.description.label'
-              defaultMessage='wallet description (optional)'
-            />
-          }
-          value={ wallet.description }
-          onChange={ this.onDescriptionChange }
-        />
-      </Form>
-    );
-  }
-
-  renderMultisigDetails () {
-    const { accounts, wallet, errors } = this.props;
-
-    return (
-      <Form>
-        <Input
-          autoFocus
-          error={ errors.name }
-          hint={
-            <FormattedMessage
-              id='createWallet.details.nameMulti.hint'
-              defaultMessage='the local name for this wallet'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createWallet.details.nameMulti.label'
-              defaultMessage='wallet name'
-            />
-          }
-          value={ wallet.name }
-          onChange={ this.onNameChange }
-        />
-
-        <Input
-          hint={
-            <FormattedMessage
-              id='createWallet.details.descriptionMulti.hint'
-              defaultMessage='the local description for this wallet'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createWallet.details.descriptionMulti.label'
-              defaultMessage='wallet description (optional)'
-            />
-          }
-          value={ wallet.description }
-          onChange={ this.onDescriptionChange }
-        />
-
-        <AddressSelect
-          accounts={ accounts }
-          error={ errors.account }
-          hint={
-            <FormattedMessage
-              id='createWallet.details.ownerMulti.hint'
-              defaultMessage='the owner account for this contract'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='createWallet.details.ownerMulti.label'
-              defaultMessage='from account (contract owner)'
-            />
-          }
-          value={ wallet.account }
-          onChange={ this.onAccoutChange }
-        />
-
-        <TypedInput
-          accounts={ accounts }
-          label={
-            <FormattedMessage
-              id='createWallet.details.ownersMulti.label'
-              defaultMessage='other wallet owners'
-            />
-          }
-          onChange={ this.onOwnersChange }
-          param='address[]'
-          value={ wallet.owners.slice() }
-        />
-
-        <div className={ styles.splitInput }>
-          <TypedInput
-            error={ errors.required }
-            hint={
-              <FormattedMessage
-                id='createWallet.details.ownersMultiReq.hint'
-                defaultMessage='number of required owners to accept a transaction'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='createWallet.details.ownersMultiReq.label'
-                defaultMessage='required owners'
-              />
-            }
-            value={ wallet.required }
-            onChange={ this.onRequiredChange }
-            param='uint'
-            min={ 1 }
-            max={ wallet.owners.length + 1 }
-          />
-
-          <TypedInput
-            error={ errors.daylimit }
-            hint={
-              <FormattedMessage
-                id='createWallet.details.dayLimitMulti.hint'
-                defaultMessage='amount of ETH spendable without confirmations'
-              />
-            }
-            isEth
-            label={
-              <FormattedMessage
-                id='createWallet.details.dayLimitMulti.label'
-                defaultMessage='wallet day limit'
-              />
-            }
-            onChange={ this.onDaylimitChange }
-            param='uint'
-            value={ wallet.daylimit }
-          />
-        </div>
-      </Form>
-    );
-  }
-
-  onAddressChange = (_, address) => {
-    this.props.onChange({ address });
-  }
-
-  onAccoutChange = (_, account) => {
-    this.props.onChange({ account });
-  }
-
-  onNameChange = (_, name) => {
-    this.props.onChange({ name });
-  }
-
-  onDescriptionChange = (_, description) => {
-    this.props.onChange({ description });
-  }
-
-  onOwnersChange = (owners) => {
-    this.props.onChange({ owners });
-  }
-
-  onRequiredChange = (required) => {
-    this.props.onChange({ required });
-  }
-
-  onDaylimitChange = (daylimit) => {
-    this.props.onChange({ daylimit });
-  }
-}
diff --git a/js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js b/js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js
deleted file mode 100644
index 6518e689315aeb25b0e6b0fa2f6f6f886064f45a..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import WalletDetails from './';
-
-import { ACCOUNTS } from '../createWallet.test.js';
-
-let component;
-let onChange;
-
-function render (walletType = 'MULTISIG') {
-  onChange = sinon.stub();
-  component = shallow(
-    <WalletDetails
-      accounts={ ACCOUNTS }
-      errors={ {} }
-      onChange={ onChange }
-      wallet={ {
-        owners: []
-      } }
-      walletType={ walletType }
-    />
-  );
-
-  return component;
-}
-
-describe('WalletDetails', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/CreateWallet/WalletInfo/index.js b/js/src/modals/CreateWallet/WalletInfo/index.js
deleted file mode 100644
index 4817ad8dccd0723b70ea0178ffd2a106829d417e..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/WalletInfo/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './walletInfo';
diff --git a/js/src/modals/CreateWallet/WalletInfo/walletInfo.js b/js/src/modals/CreateWallet/WalletInfo/walletInfo.js
deleted file mode 100644
index bd65a247098613baefb49e11f044786ad9ce77c4..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/WalletInfo/walletInfo.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { fromWei } from '~/api/util/wei';
-import { CompletedStep, IdentityIcon, CopyToClipboard } from '~/ui';
-
-import styles from '../createWallet.css';
-
-export default class WalletInfo extends Component {
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    account: PropTypes.string.isRequired,
-    name: PropTypes.string.isRequired,
-    address: PropTypes.string.isRequired,
-    owners: PropTypes.array.isRequired,
-    required: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.object,
-      PropTypes.number
-    ]).isRequired,
-    daylimit: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.object,
-      PropTypes.number
-    ]).isRequired,
-
-    deployed: PropTypes.bool
-  };
-
-  render () {
-    const { address, required, daylimit, name, deployed } = this.props;
-
-    return (
-      <CompletedStep>
-        <div>
-          <span>
-            <FormattedMessage
-              id='createWallet.info.created'
-              defaultMessage='{name} has been {deployedOrAdded} at '
-              values={ {
-                name: <code>{ name }</code>,
-                deployedOrAdded: deployed
-                  ? (
-                    <FormattedMessage
-                      id='createWallet.info.deployed'
-                      defaultMessage='deployed'
-                    />
-                  )
-                  : (
-                    <FormattedMessage
-                      id='createWallet.info.added'
-                      defaultMessage='added'
-                    />
-                  )
-              } }
-            />
-          </span>
-        </div>
-        <div>
-          <CopyToClipboard
-            data={ address }
-            label={
-              <FormattedMessage
-                id='createWallet.info.copyAddress'
-                defaultMessage='copy address to clipboard'
-              />
-            }
-          />
-          <IdentityIcon
-            address={ address }
-            className={ styles.identityicon }
-            center
-            inline
-          />
-          <div className={ styles.address }>{ address }</div>
-        </div>
-        <div>
-          <FormattedMessage
-            id='createWallet.info.owners'
-            defaultMessage='The following are wallet owners'
-          />
-        </div>
-        <div>
-          { this.renderOwners() }
-        </div>
-        <p>
-          <FormattedMessage
-            id='createWallet.info.numOwners'
-            defaultMessage='{numOwners} owners are required to confirm a transaction.'
-            values={ {
-              numOwners: <code>{ required }</code>
-            } }
-          />
-        </p>
-        <p>
-          <FormattedMessage
-            id='createWallet.info.dayLimit'
-            defaultMessage='The daily limit is set to {dayLimit} ETH.'
-            values={ {
-              dayLimit: <code>{ fromWei(daylimit).toFormat() }</code>
-            } }
-          />
-        </p>
-      </CompletedStep>
-    );
-  }
-
-  renderOwners () {
-    const { account, owners, deployed } = this.props;
-
-    return []
-      .concat(deployed ? account : null, owners)
-      .filter((account) => account)
-      .map((address, id) => {
-        return (
-          <div
-            className={ styles.owner }
-            key={ id }
-          >
-            <IdentityIcon
-              address={ address }
-              className={ styles.identityicon }
-              center
-              inline
-            />
-            <div className={ styles.address }>
-              { this.addressToString(address) }
-            </div>
-          </div>
-        );
-      });
-  }
-
-  addressToString (address) {
-    const { accounts } = this.props;
-
-    if (accounts[address]) {
-      return accounts[address].name || address;
-    }
-
-    return address;
-  }
-}
diff --git a/js/src/modals/CreateWallet/WalletInfo/walletInfo.spec.js b/js/src/modals/CreateWallet/WalletInfo/walletInfo.spec.js
deleted file mode 100644
index 9237659b0bf969f306a4055e8fe562d4e49c3428..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/WalletInfo/walletInfo.spec.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import WalletInfo from './';
-
-import { ACCOUNTS } from '../createWallet.test.js';
-
-let component;
-
-function render () {
-  component = shallow(
-    <WalletInfo
-      accounts={ ACCOUNTS }
-      account='0x1234567890123456789012345678901234567890'
-      address='0x0987654321098765432109876543210987654321'
-      daylimit='5'
-      name='testWallet'
-      owners={ [] }
-      required='5'
-    />
-  );
-
-  return component;
-}
-
-describe('WalletInfo', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/CreateWallet/WalletType/index.js b/js/src/modals/CreateWallet/WalletType/index.js
deleted file mode 100644
index 5f3d8b1db704726d682950e25d64f0646e48d0c4..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/WalletType/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './walletType.js';
diff --git a/js/src/modals/CreateWallet/WalletType/walletType.js b/js/src/modals/CreateWallet/WalletType/walletType.js
deleted file mode 100644
index bbf55965bef7550d0eebc84bb76bfae7e7f54e6b..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/WalletType/walletType.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { walletSourceURL } from '~/contracts/code/wallet';
-import { RadioButtons } from '~/ui';
-
-const TYPES = [
-  {
-    label: (
-      <FormattedMessage
-        id='createWallet.type.multisig.label'
-        defaultMessage='Multi-Sig wallet'
-      />
-    ),
-    key: 'MULTISIG',
-    description: (
-      <FormattedMessage
-        id='createWallet.type.multisig.description'
-        defaultMessage='Create/Deploy a {link} Wallet'
-        values={ {
-          link: (
-            <a href={ walletSourceURL } target='_blank'>
-              <FormattedMessage
-                id='createWallet.type.multisig.link'
-                defaultMessage='standard multi-signature'
-              />
-            </a>
-          )
-        } }
-      />
-    )
-  },
-  {
-    label: (
-      <FormattedMessage
-        id='createWallet.type.watch.label'
-        defaultMessage='Watch a wallet'
-      />
-    ),
-    key: 'WATCH',
-    description: (
-      <FormattedMessage
-        id='createWallet.type.watch.description'
-        defaultMessage='Add an existing wallet to your accounts'
-      />
-    )
-  }
-];
-
-export default class WalletType extends Component {
-  static propTypes = {
-    onChange: PropTypes.func.isRequired,
-    type: PropTypes.string.isRequired
-  };
-
-  render () {
-    const { type } = this.props;
-
-    return (
-      <RadioButtons
-        name='contractType'
-        onChange={ this.onTypeChange }
-        value={ type }
-        values={ TYPES }
-      />
-    );
-  }
-
-  onTypeChange = (type) => {
-    this.props.onChange(type.key);
-  }
-}
diff --git a/js/src/modals/CreateWallet/WalletType/walletType.spec.js b/js/src/modals/CreateWallet/WalletType/walletType.spec.js
deleted file mode 100644
index 2c9d56220080107b8a720e91e1c866ce813a92df..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/WalletType/walletType.spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import WalletType from './';
-
-let component;
-let onChange;
-
-function render (walletType = 'MULTISIG') {
-  onChange = sinon.stub();
-  component = shallow(
-    <WalletType
-      onChange={ onChange }
-      type={ walletType }
-    />
-  );
-
-  return component;
-}
-
-describe('WalletType', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/CreateWallet/createWallet.css b/js/src/modals/CreateWallet/createWallet.css
deleted file mode 100644
index 1c0ac525b1e358ad53ca3c3d981aa4c679212e49..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/createWallet.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.address {
-  vertical-align: top;
-  display: inline-block;
-}
-
-.identityicon {
-  margin: -8px 0.5em;
-}
-
-.owner {
-  height: 40px;
-  color: lightgrey;
-
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  .identityicon {
-    width: 24px;
-    height: 24px;
-  }
-}
-
-.splitInput {
-  display: flex;
-  flex-direction: row;
-
-  > * {
-    flex: 1;
-
-    margin: 0 0.25em;
-
-    &:first-child {
-      margin-left: 0;
-    }
-
-    &:last-child {
-      margin-right: 0;
-    }
-  }
-}
diff --git a/js/src/modals/CreateWallet/createWallet.js b/js/src/modals/CreateWallet/createWallet.js
deleted file mode 100644
index 63be12d3431f3367498d70717690bed5cce64bf5..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/createWallet.js
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { Button, Portal } from '~/ui';
-import { CancelIcon, DoneIcon, NextIcon } from '~/ui/Icons';
-import { setRequest } from '~/redux/providers/requestsActions';
-
-import WalletType from './WalletType';
-import WalletDetails from './WalletDetails';
-import WalletInfo from './WalletInfo';
-import CreateWalletStore from './createWalletStore';
-
-@observer
-export class CreateWallet extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onSetRequest: PropTypes.func.isRequired
-  };
-
-  store = new CreateWalletStore(this.context.api, this.props);
-
-  render () {
-    const { stage, steps } = this.store;
-
-    return (
-      <Portal
-        activeStep={ stage }
-        buttons={ this.renderDialogActions() }
-        onClose={ this.onClose }
-        open
-        steps={ steps.map((step) => step.title) }
-      >
-        { this.renderPage() }
-      </Portal>
-    );
-  }
-
-  renderPage () {
-    const { step } = this.store;
-    const { accounts } = this.props;
-
-    switch (step) {
-      case 'INFO':
-        return (
-          <WalletInfo
-            accounts={ accounts }
-            account={ this.store.wallet.account }
-            address={ this.store.wallet.address }
-            daylimit={ this.store.wallet.daylimit }
-            deployed={ this.store.deployed }
-            name={ this.store.wallet.name }
-            owners={ this.store.wallet.owners.slice() }
-            required={ this.store.wallet.required }
-          />
-        );
-
-      case 'DETAILS':
-        return (
-          <WalletDetails
-            accounts={ accounts }
-            errors={ this.store.errors }
-            onChange={ this.store.onChange }
-            wallet={ this.store.wallet }
-            walletType={ this.store.walletType }
-          />
-        );
-
-      default:
-      case 'TYPE':
-        return (
-          <WalletType
-            onChange={ this.store.onTypeChange }
-            type={ this.store.walletType }
-          />
-        );
-    }
-  }
-
-  renderDialogActions () {
-    const { step, hasErrors, onCreate, onNext, onAdd } = this.store;
-
-    const cancelBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='createWallet.button.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.onClose }
-      />
-    );
-
-    const doneBtn = (
-      <Button
-        icon={ <DoneIcon /> }
-        key='done'
-        label={
-          <FormattedMessage
-            id='createWallet.button.done'
-            defaultMessage='Done'
-          />
-        }
-        onClick={ this.onClose }
-      />
-    );
-
-    const nextBtn = (
-      <Button
-        icon={ <NextIcon /> }
-        key='next'
-        label={
-          <FormattedMessage
-            id='createWallet.button.next'
-            defaultMessage='Next'
-          />
-        }
-        onClick={ onNext }
-      />
-    );
-
-    switch (step) {
-      case 'INFO':
-        return [ doneBtn ];
-
-      case 'DETAILS':
-        if (this.store.walletType === 'WATCH') {
-          return [ cancelBtn, (
-            <Button
-              disabled={ hasErrors }
-              icon={ <NextIcon /> }
-              key='add'
-              label={
-                <FormattedMessage
-                  id='createWallet.button.add'
-                  defaultMessage='Add'
-                />
-              }
-              onClick={ onAdd }
-            />
-          ) ];
-        }
-
-        return [ cancelBtn, (
-          <Button
-            disabled={ hasErrors }
-            icon={ <NextIcon /> }
-            key='create'
-            label={
-              <FormattedMessage
-                id='createWallet.button.create'
-                defaultMessage='Create'
-              />
-            }
-            onClick={ onCreate }
-          />
-        ) ];
-
-      default:
-      case 'TYPE':
-        return [ cancelBtn, nextBtn ];
-    }
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    onSetRequest: setRequest
-  }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(CreateWallet);
diff --git a/js/src/modals/CreateWallet/createWallet.spec.js b/js/src/modals/CreateWallet/createWallet.spec.js
deleted file mode 100644
index e38174b8166d58e1af8e48831a2762f3c6871664..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/createWallet.spec.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { CreateWallet } from './createWallet';
-
-import { ACCOUNTS } from './createWallet.test.js';
-
-let api;
-let component;
-let onClose;
-
-function createApi () {
-  api = {
-    parity: {
-      getNewDappsDefaultAddress: sinon.stub().resolves('')
-    }
-  };
-
-  return api;
-}
-
-function render () {
-  onClose = sinon.stub();
-  component = shallow(
-    <CreateWallet
-      accounts={ ACCOUNTS }
-      onClose={ onClose }
-    />,
-    {
-      context: { api: createApi() }
-    }
-  );
-
-  return component;
-}
-
-describe('modals/CreateWallet', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/CreateWallet/createWallet.test.js b/js/src/modals/CreateWallet/createWallet.test.js
deleted file mode 100644
index e034bd066f28963bbe4a5bd1fcede783575f3a04..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/createWallet.test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const ACCOUNTS = {
-  '0x1234567890123456789012345678901234567890': {
-    address: '0x1234567890123456789012345678901234567890'
-  }
-};
-
-export {
-  ACCOUNTS
-};
diff --git a/js/src/modals/CreateWallet/createWalletStore.js b/js/src/modals/CreateWallet/createWalletStore.js
deleted file mode 100644
index 26ed5816cf3763a478e91149238d7197ad6d0508..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/createWalletStore.js
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { noop } from 'lodash';
-import { observable, computed, action, transaction } from 'mobx';
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import Contract from '~/api/contract';
-import Contracts from '~/contracts';
-import { foundationWallet as walletAbi } from '~/contracts/abi';
-import { wallet as walletCode, walletLibrary as walletLibraryCode, walletLibraryRegKey, fullWalletCode } from '~/contracts/code/wallet';
-
-import { validateUint, validateAddress, validateName } from '~/util/validation';
-import { toWei } from '~/api/util/wei';
-import { deploy, getSender, loadSender, setSender } from '~/util/tx';
-import WalletsUtils from '~/util/wallets';
-
-const STEPS = {
-  TYPE: {
-    title: (
-      <FormattedMessage
-        id='createWallet.steps.type'
-        defaultMessage='wallet type'
-      />
-    )
-  },
-  DETAILS: {
-    title: (
-      <FormattedMessage
-        id='createWallet.steps.details'
-        defaultMessage='wallet details'
-      />
-    )
-  },
-  INFO: {
-    title: (
-      <FormattedMessage
-        id='createWallet.steps.info'
-        defaultMessage='wallet informaton'
-      />
-    )
-  }
-};
-
-export default class CreateWalletStore {
-  @observable step = null;
-  @observable txhash = null;
-  @observable walletType = 'MULTISIG';
-
-  @observable wallet = {
-    account: '',
-    address: '',
-    owners: [],
-    required: 1,
-    daylimit: toWei(1),
-
-    name: '',
-    description: ''
-  };
-
-  @observable errors = {
-    account: null,
-    address: null,
-    owners: null,
-    required: null,
-    daylimit: null,
-    name: null
-  };
-
-  onClose = noop;
-  onSetRequest = noop;
-
-  @computed get stage () {
-    return this.stepsKeys.findIndex((k) => k === this.step);
-  }
-
-  @computed get hasErrors () {
-    return !!Object.keys(this.errors)
-      .filter((errorKey) => {
-        if (this.walletType === 'WATCH') {
-          return ['address', 'name'].includes(errorKey);
-        }
-
-        return errorKey !== 'address';
-      })
-      .find((key) => !!this.errors[key]);
-  }
-
-  @computed get stepsKeys () {
-    return this.steps.map((s) => s.key);
-  }
-
-  @computed get steps () {
-    return Object
-      .keys(STEPS)
-      .map((key) => {
-        return {
-          ...STEPS[key],
-          key
-        };
-      })
-      .filter((step) => this.walletType === 'WATCH' || step.key !== 'INFO');
-  }
-
-  constructor (api, { accounts, onClose, onSetRequest }) {
-    this.api = api;
-
-    this.step = this.stepsKeys[0];
-    this.wallet.account = getSender() || Object.values(accounts)[0].address;
-    this.validateWallet(this.wallet);
-    this.onClose = onClose;
-    this.onSetRequest = onSetRequest;
-
-    loadSender(this.api)
-      .then((defaultAccount) => {
-        if (defaultAccount !== this.wallet.account) {
-          this.onChange({ account: defaultAccount });
-        }
-      });
-  }
-
-  @action onTypeChange = (type) => {
-    this.walletType = type;
-    this.validateWallet(this.wallet);
-  }
-
-  @action onNext = () => {
-    const stepIndex = this.stepsKeys.findIndex((k) => k === this.step) + 1;
-
-    this.step = this.stepsKeys[stepIndex];
-  }
-
-  @action onChange = (_wallet) => {
-    const newWallet = Object.assign({}, this.wallet, _wallet);
-
-    this.validateWallet(newWallet);
-  }
-
-  @action onAdd = () => {
-    if (this.hasErrors) {
-      return;
-    }
-
-    const walletContract = new Contract(this.api, walletAbi).at(this.wallet.address);
-
-    return Promise
-      .all([
-        WalletsUtils.fetchRequire(walletContract),
-        WalletsUtils.fetchOwners(walletContract),
-        WalletsUtils.fetchDailylimit(walletContract)
-      ])
-      .then(([ require, owners, daylimit ]) => {
-        transaction(() => {
-          this.wallet.owners = owners;
-          this.wallet.required = require.toNumber();
-          this.wallet.daylimit = daylimit.limit;
-
-          this.wallet = this.getWalletWithMeta(this.wallet);
-        });
-
-        return this.addWallet(this.wallet);
-      });
-  }
-
-  @action onCreate = () => {
-    if (this.hasErrors) {
-      return;
-    }
-
-    const { account, owners, required, daylimit } = this.wallet;
-
-    Contracts
-      .get()
-      .registry
-      .lookupAddress(walletLibraryRegKey)
-      .catch(() => {
-        return null; // exception when registry is not available
-      })
-      .then((address) => {
-        console.warn('WalletLibrary address in registry', address);
-
-        if (!address || /^(0x)?0*$/.test(address)) {
-          return null;
-        }
-
-        // Check that it's actually the expected code
-        return this.api.eth
-          .getCode(address)
-          .then((code) => {
-            const strippedCode = code.replace(/^0x/, '');
-
-            // The actual deployed code is included in the wallet
-            // library code (which might have some more data)
-            if (walletLibraryCode.indexOf(strippedCode) >= 0) {
-              return address;
-            }
-
-            return null;
-          });
-      })
-      .then((address) => {
-        let code = fullWalletCode;
-
-        if (address) {
-          const walletLibraryAddress = address.replace(/^0x/, '').toLowerCase();
-
-          code = walletCode.replace(/(_)+WalletLibrary(_)+/g, walletLibraryAddress);
-        } else {
-          console.warn('wallet library has not been found in the registry');
-        }
-
-        const options = {
-          data: code,
-          from: account
-        };
-
-        const contract = this.api.newContract(walletAbi);
-
-        setSender(account);
-        this.wallet = this.getWalletWithMeta(this.wallet);
-        this.onClose();
-        return deploy(contract, options, [ owners, required, daylimit ])
-          .then((requestId) => {
-            const metadata = { ...this.wallet.metadata, deployment: true };
-
-            this.onSetRequest(requestId, { metadata }, false);
-          });
-      });
-  }
-
-  @action addWallet = (wallet) => {
-    const { address, name, metadata } = wallet;
-
-    return Promise
-      .all([
-        this.api.parity.setAccountName(address, name),
-        this.api.parity.setAccountMeta(address, metadata)
-      ])
-      .then(() => {
-        this.step = 'INFO';
-      });
-  }
-
-  getWalletWithMeta = (wallet) => {
-    const { name, description } = wallet;
-
-    const metadata = {
-      abi: walletAbi,
-      wallet: true,
-      timestamp: Date.now(),
-      deleted: false,
-      tags: [ 'wallet' ],
-      description,
-      name
-    };
-
-    return {
-      ...wallet,
-      metadata
-    };
-  }
-
-  @action validateWallet = (_wallet) => {
-    const addressValidation = validateAddress(_wallet.address);
-    const accountValidation = validateAddress(_wallet.account);
-    const requiredValidation = validateUint(_wallet.required);
-    const daylimitValidation = validateUint(_wallet.daylimit);
-    const nameValidation = validateName(_wallet.name);
-
-    const errors = {
-      address: addressValidation.addressError,
-      account: accountValidation.addressError,
-      required: requiredValidation.valueError,
-      daylimit: daylimitValidation.valueError,
-      name: nameValidation.nameError
-    };
-
-    const wallet = {
-      ..._wallet,
-      address: addressValidation.address,
-      account: accountValidation.address,
-      required: requiredValidation.value,
-      daylimit: daylimitValidation.value,
-      name: nameValidation.name
-    };
-
-    transaction(() => {
-      this.wallet = wallet;
-      this.errors = errors;
-    });
-  }
-}
diff --git a/js/src/modals/CreateWallet/index.js b/js/src/modals/CreateWallet/index.js
deleted file mode 100644
index d38d27eb8ff218f59732314f67f53cd5d04633b5..0000000000000000000000000000000000000000
--- a/js/src/modals/CreateWallet/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './createWallet';
diff --git a/js/src/modals/DappPermissions/dappPermissions.js b/js/src/modals/DappPermissions/dappPermissions.js
deleted file mode 100644
index 81821cb8e9db1ae61834a3abd75223634288f7d7..0000000000000000000000000000000000000000
--- a/js/src/modals/DappPermissions/dappPermissions.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { AccountCard, Portal, SelectionList } from '~/ui';
-
-@observer
-export default class DappPermissions extends Component {
-  static propTypes = {
-    permissionStore: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { permissionStore } = this.props;
-
-    if (!permissionStore.modalOpen) {
-      return null;
-    }
-
-    return (
-      <Portal
-        onClose={ permissionStore.closeModal }
-        open
-        title={
-          <FormattedMessage
-            id='dapps.permissions.label'
-            defaultMessage='visible dapp accounts'
-          />
-        }
-      >
-        <SelectionList
-          items={ permissionStore.accounts }
-          noStretch
-          onDefaultClick={ this.onMakeDefault }
-          onSelectClick={ this.onSelect }
-          renderItem={ this.renderAccount }
-        />
-      </Portal>
-    );
-  }
-
-  onMakeDefault = (account) => {
-    this.props.permissionStore.setDefaultAccount(account.address);
-  }
-
-  onSelect = (account) => {
-    this.props.permissionStore.selectAccount(account.address);
-  }
-
-  renderAccount = (account) => {
-    return (
-      <AccountCard
-        account={ account }
-      />
-    );
-  }
-}
diff --git a/js/src/modals/DappPermissions/dappPermissions.spec.js b/js/src/modals/DappPermissions/dappPermissions.spec.js
deleted file mode 100644
index 81af509b7694538133426baea9c1182dc7f0efb5..0000000000000000000000000000000000000000
--- a/js/src/modals/DappPermissions/dappPermissions.spec.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import DappPermissions from './';
-
-let component;
-
-function renderShallow (permissionStore = {}) {
-  component = shallow(
-    <DappPermissions permissionStore={ permissionStore } />
-  );
-
-  return component;
-}
-
-describe('modals/DappPermissions', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(renderShallow()).to.be.ok;
-    });
-
-    it('does not render the modal with modalOpen = false', () => {
-      expect(
-        renderShallow({ modalOpen: false }).find('Portal')
-      ).to.have.length(0);
-    });
-
-    it('does render the modal with modalOpen = true', () => {
-      expect(
-        renderShallow({ modalOpen: true, accounts: [] }).find('Portal')
-      ).to.have.length(1);
-    });
-  });
-});
diff --git a/js/src/modals/DappPermissions/index.js b/js/src/modals/DappPermissions/index.js
deleted file mode 100644
index 96f3b0774bb1777aaf40ea808d4a22750ca70b42..0000000000000000000000000000000000000000
--- a/js/src/modals/DappPermissions/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dappPermissions';
diff --git a/js/src/modals/DappPermissions/store.js b/js/src/modals/DappPermissions/store.js
deleted file mode 100644
index 0476879a5287feec6c3e522f826702b6020cf375..0000000000000000000000000000000000000000
--- a/js/src/modals/DappPermissions/store.js
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable, transaction } from 'mobx';
-
-export default class Store {
-  @observable accounts = [];
-  @observable modalOpen = false;
-  @observable whitelist = [];
-  @observable whitelistDefault = null;
-
-  constructor (api) {
-    this._api = api;
-
-    this.loadWhitelist();
-  }
-
-  @action closeModal = () => {
-    transaction(() => {
-      const checkedAccounts = this.accounts.filter((account) => account.checked);
-      const defaultAddress = (this.accounts.find((account) => account.default) || {}).address;
-      const addresses = checkedAccounts.length === this.accounts.length
-        ? null
-        : checkedAccounts.map((account) => account.address);
-
-      this.modalOpen = false;
-      this.updateWhitelist(addresses, defaultAddress);
-    });
-  }
-
-  @action openModal = (accounts) => {
-    transaction(() => {
-      this.accounts = Object
-        .values(accounts)
-        .map((account, index) => {
-          return {
-            address: account.address,
-            checked: this.whitelist
-              ? this.whitelist.includes(account.address)
-              : true,
-            default: this.whitelistDefault
-              ? this.whitelistDefault === account.address
-              : index === 0,
-            description: account.meta.description,
-            name: account.name
-          };
-        });
-      this.modalOpen = true;
-    });
-  }
-
-  @action selectAccount = (address) => {
-    transaction(() => {
-      const isSingleAccount = this.accounts.filter((account) => account.checked).length === 1;
-
-      this.accounts = this.accounts.map((account) => {
-        if (account.address === address && (!isSingleAccount || !account.checked)) {
-          account.checked = !account.checked;
-          account.default = false;
-        }
-
-        return account;
-      });
-
-      this.setDefaultAccount((
-        this.accounts.find((account) => account.default) ||
-        this.accounts.find((account) => account.checked) ||
-        {}
-      ).address);
-    });
-  }
-
-  @action setDefaultAccount = (address) => {
-    this.accounts = this.accounts.map((account) => {
-      if (account.address === address) {
-        account.checked = true;
-        account.default = true;
-      } else if (account.default) {
-        account.default = false;
-      }
-
-      return account;
-    });
-  }
-
-  @action setWhitelist = (whitelist, whitelistDefault) => {
-    transaction(() => {
-      this.whitelist = whitelist;
-      this.whitelistDefault = whitelistDefault;
-    });
-  }
-
-  loadWhitelist () {
-    return Promise
-      .all([
-        this._api.parity.getNewDappsAddresses(),
-        this._api.parity.getNewDappsDefaultAddress()
-      ])
-      .then(([whitelist, whitelistDefault]) => {
-        this.setWhitelist(whitelist, whitelistDefault);
-      })
-      .catch((error) => {
-        console.warn('loadWhitelist', error);
-      });
-  }
-
-  updateWhitelist (whitelist, whitelistDefault = null) {
-    return Promise
-      .all([
-        this._api.parity.setNewDappsAddresses(whitelist),
-        this._api.parity.setNewDappsDefaultAddress(whitelistDefault)
-      ])
-      .then(() => {
-        this.setWhitelist(whitelist, whitelistDefault);
-      })
-      .catch((error) => {
-        console.warn('updateWhitelist', error);
-      });
-  }
-}
diff --git a/js/src/modals/DappPermissions/store.spec.js b/js/src/modals/DappPermissions/store.spec.js
deleted file mode 100644
index ed6d766b211da209402a48c9ca4fd26e8716f8e3..0000000000000000000000000000000000000000
--- a/js/src/modals/DappPermissions/store.spec.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Store from './store';
-
-const ACCOUNTS = {
-  '123': { address: '123', name: '123', meta: { description: '123' } },
-  '456': { address: '456', name: '456', meta: { description: '456' } },
-  '789': { address: '789', name: '789', meta: { description: '789' } }
-};
-const WHITELIST = ['456', '789'];
-
-let api;
-let store;
-
-function create () {
-  api = {
-    parity: {
-      getNewDappsAddresses: sinon.stub().resolves(WHITELIST),
-      getNewDappsDefaultAddress: sinon.stub().resolves(WHITELIST[0]),
-      setNewDappsAddresses: sinon.stub().resolves(true),
-      setNewDappsDefaultAddress: sinon.stub().resolves(true)
-    }
-  };
-
-  store = new Store(api);
-}
-
-describe('modals/DappPermissions/store', () => {
-  beforeEach(() => {
-    create();
-  });
-
-  describe('constructor', () => {
-    it('retrieves the whitelist via api', () => {
-      expect(api.parity.getNewDappsAddresses).to.be.calledOnce;
-    });
-
-    it('sets the retrieved whitelist', () => {
-      expect(store.whitelist.peek()).to.deep.equal(WHITELIST);
-    });
-  });
-
-  describe('@actions', () => {
-    beforeEach(() => {
-      store.openModal(ACCOUNTS);
-    });
-
-    describe('openModal', () => {
-      it('sets the modalOpen status', () => {
-        expect(store.modalOpen).to.be.true;
-      });
-
-      it('sets accounts with checked interfaces', () => {
-        expect(store.accounts.peek()).to.deep.equal([
-          { address: '123', name: '123', description: '123', default: false, checked: false },
-          { address: '456', name: '456', description: '456', default: true, checked: true },
-          { address: '789', name: '789', description: '789', default: false, checked: true }
-        ]);
-      });
-    });
-
-    describe('closeModal', () => {
-      beforeEach(() => {
-        store.setDefaultAccount('789');
-        store.closeModal();
-      });
-
-      it('calls setNewDappsAddresses', () => {
-        expect(api.parity.setNewDappsAddresses).to.have.been.calledWith(['456', '789']);
-      });
-
-      it('calls into setNewDappsDefaultAddress', () => {
-        expect(api.parity.setNewDappsDefaultAddress).to.have.been.calledWith('789');
-      });
-    });
-
-    describe('selectAccount', () => {
-      beforeEach(() => {
-        store.selectAccount('123');
-        store.selectAccount('789');
-      });
-
-      it('unselects previous selected accounts', () => {
-        expect(store.accounts.find((account) => account.address === '123').checked).to.be.true;
-      });
-
-      it('selects previous unselected accounts', () => {
-        expect(store.accounts.find((account) => account.address === '789').checked).to.be.false;
-      });
-
-      it('sets a new default when default was unselected', () => {
-        store.selectAccount('456');
-        expect(store.accounts.find((account) => account.address === '456').default).to.be.false;
-        expect(store.accounts.find((account) => account.address === '123').default).to.be.true;
-      });
-
-      it('does not deselect the last account', () => {
-        store.selectAccount('123');
-        store.selectAccount('456');
-        console.log(store.accounts.map((account) => ({ address: account.address, checked: account.checked })));
-        expect(store.accounts.find((account) => account.address === '456').default).to.be.true;
-        expect(store.accounts.find((account) => account.address === '456').checked).to.be.true;
-      });
-    });
-
-    describe('setDefaultAccount', () => {
-      beforeEach(() => {
-        store.setDefaultAccount('789');
-      });
-
-      it('unselects previous default', () => {
-        expect(store.accounts.find((account) => account.address === '456').default).to.be.false;
-      });
-
-      it('selects new default', () => {
-        expect(store.accounts.find((account) => account.address === '789').default).to.be.true;
-      });
-    });
-  });
-});
diff --git a/js/src/modals/DeleteAccount/deleteAccount.css b/js/src/modals/DeleteAccount/deleteAccount.css
deleted file mode 100644
index 5252e9454868f5eb294eccf1e14b90d970590b34..0000000000000000000000000000000000000000
--- a/js/src/modals/DeleteAccount/deleteAccount.css
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.body {
-  .hero {
-    padding-bottom: 1em;
-  }
-
-  .info {
-    display: inline-block;
-  }
-
-  .icon {
-    display: inline-block;
-  }
-
-  .nameinfo {
-    display: inline-block;
-    text-align: left;
-  }
-
-  .header {
-    text-transform: uppercase;
-    font-size: 1.25em;
-    padding-bottom: 0.25em;
-  }
-
-  .address {
-  }
-
-  .description {
-    padding-top: 1em;
-    font-size: 0.75em;
-    color: #aaa;
-  }
-
-  .password {
-    padding: 1em 5em;
-  }
-}
diff --git a/js/src/modals/DeleteAccount/deleteAccount.js b/js/src/modals/DeleteAccount/deleteAccount.js
deleted file mode 100644
index cd69d6bd9318c7f8d1664a7e5cb0dfbe23ecd89e..0000000000000000000000000000000000000000
--- a/js/src/modals/DeleteAccount/deleteAccount.js
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { ConfirmDialog, IdentityIcon, IdentityName, Input } from '~/ui';
-import { newError } from '~/redux/actions';
-
-import styles from './deleteAccount.css';
-
-class DeleteAccount extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired,
-    router: PropTypes.object
-  }
-
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    newError: PropTypes.func.isRequired
-  }
-
-  state = {
-    isBusy: false,
-    password: ''
-  }
-
-  render () {
-    const { account } = this.props;
-    const { isBusy, password } = this.state;
-
-    return (
-      <ConfirmDialog
-        busy={ isBusy }
-        className={ styles.body }
-        onConfirm={ this.onDeleteConfirmed }
-        onDeny={ this.closeDeleteDialog }
-        open
-        title={
-          <FormattedMessage
-            id='deleteAccount.title'
-            defaultMessage='confirm removal'
-          />
-        }
-      >
-        <div className={ styles.hero }>
-          <FormattedMessage
-            id='deleteAccount.question'
-            defaultMessage='Are you sure you want to permanently delete the following account?'
-          />
-        </div>
-        <div className={ styles.info }>
-          <IdentityIcon
-            address={ account.address }
-            className={ styles.icon }
-          />
-          <div className={ styles.nameinfo }>
-            <div className={ styles.header }>
-              <IdentityName
-                address={ account.address }
-                unknown
-              />
-            </div>
-            <div className={ styles.address }>
-              { account.address }
-            </div>
-          </div>
-        </div>
-        <div className={ styles.description }>
-          { account.meta.description }
-        </div>
-        <div className={ styles.password }>
-          <Input
-            autoFocus
-            hint={
-              <FormattedMessage
-                id='deleteAccount.password.hint'
-                defaultMessage='provide the account password to confirm the account deletion'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='deleteAccount.password.label'
-                defaultMessage='account password'
-              />
-            }
-            onChange={ this.onChangePassword }
-            onDefaultAction={ this.onDeleteConfirmed }
-            type='password'
-            value={ password }
-          />
-        </div>
-      </ConfirmDialog>
-    );
-  }
-
-  onChangePassword = (event, password) => {
-    this.setState({ password });
-  }
-
-  onDeleteConfirmed = () => {
-    const { api, router } = this.context;
-    const { account, newError } = this.props;
-    const { password } = this.state;
-
-    this.setState({ isBusy: true });
-
-    return api.parity
-      .killAccount(account.address, password)
-      .then((result) => {
-        this.setState({ isBusy: true });
-
-        if (result === true) {
-          router.push('/accounts');
-          this.closeDeleteDialog();
-        } else {
-          newError(new Error('Deletion failed.'));
-        }
-      })
-      .catch((error) => {
-        this.setState({ isBusy: false });
-        console.error('onDeleteConfirmed', error);
-        newError(new Error(`Deletion failed: ${error.message}`));
-      });
-  }
-
-  closeDeleteDialog = () => {
-    this.props.onClose();
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({ newError }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(DeleteAccount);
diff --git a/js/src/modals/DeleteAccount/deleteAccount.spec.js b/js/src/modals/DeleteAccount/deleteAccount.spec.js
deleted file mode 100644
index 871743453775fd46af9ff4ca00254df5f06cb16e..0000000000000000000000000000000000000000
--- a/js/src/modals/DeleteAccount/deleteAccount.spec.js
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import DeleteAccount from './';
-
-let api;
-let component;
-let instance;
-let onClose;
-let router;
-let store;
-
-const TEST_ADDRESS = '0x123456789012345678901234567890';
-const TEST_PASSWORD = 'testPassword';
-
-function createApi () {
-  api = {
-    parity: {
-      killAccount: sinon.stub().resolves(true)
-    }
-  };
-
-  return api;
-}
-
-function createRouter () {
-  router = {
-    push: sinon.stub()
-  };
-
-  return router;
-}
-
-function createStore () {
-  store = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {};
-    }
-  };
-
-  return store;
-}
-
-function render () {
-  onClose = sinon.stub();
-  component = shallow(
-    <DeleteAccount
-      account={ {
-        address: TEST_ADDRESS,
-        meta: {
-          description: 'testDescription'
-        }
-      } }
-      onClose={ onClose }
-    />,
-    {
-      context: {
-        store: createStore()
-      }
-    }
-  ).find('DeleteAccount').shallow({
-    context: {
-      api: createApi(),
-      router: createRouter()
-    }
-  });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/DeleteAccount', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('event handlers', () => {
-    describe('onChangePassword', () => {
-      it('sets the state with the new password', () => {
-        instance.onChangePassword(null, TEST_PASSWORD);
-        expect(instance.state.password).to.equal(TEST_PASSWORD);
-      });
-    });
-
-    describe('closeDeleteDialog', () => {
-      it('calls onClose', () => {
-        instance.closeDeleteDialog();
-        expect(onClose).to.have.been.called;
-      });
-    });
-
-    describe('onDeleteConfirmed', () => {
-      beforeEach(() => {
-        sinon.spy(instance, 'closeDeleteDialog');
-        instance.onChangePassword(null, TEST_PASSWORD);
-        return instance.onDeleteConfirmed();
-      });
-
-      afterEach(() => {
-        instance.closeDeleteDialog.restore();
-      });
-
-      it('calls parity_killAccount', () => {
-        expect(api.parity.killAccount).to.have.been.calledWith(TEST_ADDRESS, TEST_PASSWORD);
-      });
-
-      it('changes the route to /accounts', () => {
-        expect(router.push).to.have.been.calledWith('/accounts');
-      });
-
-      it('closes the dialog', () => {
-        expect(instance.closeDeleteDialog).to.have.been.called;
-      });
-    });
-  });
-});
diff --git a/js/src/modals/DeleteAccount/index.js b/js/src/modals/DeleteAccount/index.js
deleted file mode 100644
index a738460f04ab1cb94fb82a097bf8d137fc52a4ee..0000000000000000000000000000000000000000
--- a/js/src/modals/DeleteAccount/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './deleteAccount';
diff --git a/js/src/modals/DeployContract/DetailsStep/detailsStep.js b/js/src/modals/DeployContract/DetailsStep/detailsStep.js
deleted file mode 100644
index 7f5f9bdbc32441edd50dbaa58adc99ac09fedf6e..0000000000000000000000000000000000000000
--- a/js/src/modals/DeployContract/DetailsStep/detailsStep.js
+++ /dev/null
@@ -1,407 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { Checkbox, MenuItem } from 'material-ui';
-
-import { AddressSelect, Form, Input, Select } from '~/ui';
-import { validateAbi } from '~/util/validation';
-import { parseAbiType } from '~/util/abi';
-
-const CHECK_STYLE = {
-  marginTop: '1em'
-};
-
-export default class DetailsStep extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    onAbiChange: PropTypes.func.isRequired,
-    onAmountChange: PropTypes.func.isRequired,
-    onCodeChange: PropTypes.func.isRequired,
-    onDescriptionChange: PropTypes.func.isRequired,
-    onExtrasChange: PropTypes.func.isRequired,
-    onFromAddressChange: PropTypes.func.isRequired,
-    onInputsChange: PropTypes.func.isRequired,
-    onNameChange: PropTypes.func.isRequired,
-    onParamsChange: PropTypes.func.isRequired,
-
-    abi: PropTypes.string,
-    abiError: PropTypes.string,
-    amount: PropTypes.string,
-    amountError: PropTypes.string,
-    code: PropTypes.string,
-    codeError: PropTypes.string,
-    description: PropTypes.string,
-    descriptionError: PropTypes.string,
-    extras: PropTypes.bool,
-    fromAddress: PropTypes.string,
-    fromAddressError: PropTypes.string,
-    name: PropTypes.string,
-    nameError: PropTypes.string,
-    readOnly: PropTypes.bool
-  };
-
-  static defaultProps = {
-    extras: false,
-    readOnly: false
-  };
-
-  state = {
-    solcOutput: '',
-    contracts: {},
-    selectedContractIndex: 0
-  }
-
-  componentDidMount () {
-    const { abi, code } = this.props;
-
-    if (abi) {
-      this.onAbiChange(abi);
-      this.setState({ solcOutput: abi });
-    }
-
-    if (code) {
-      this.onCodeChange(code);
-    }
-  }
-
-  render () {
-    const {
-      accounts,
-      readOnly,
-
-      fromAddress, fromAddressError,
-      name, nameError,
-      description, descriptionError,
-      abiError, extras,
-      code, codeError
-    } = this.props;
-
-    const { solcOutput, contracts } = this.state;
-    const solc = contracts && Object.keys(contracts).length > 0;
-
-    return (
-      <Form>
-        <Input
-          autoFocus
-          error={ nameError }
-          hint={
-            <FormattedMessage
-              id='deployContract.details.name.hint'
-              defaultMessage='a name for the deployed contract'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='deployContract.details.name.label'
-              defaultMessage='contract name'
-            />
-          }
-          onChange={ this.onNameChange }
-          value={ name || '' }
-        />
-
-        <Input
-          error={ descriptionError }
-          hint={
-            <FormattedMessage
-              id='deployContract.details.description.hint'
-              defaultMessage='a description for the contract'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='deployContract.details.description.label'
-              defaultMessage='contract description (optional)'
-            />
-          }
-          onChange={ this.onDescriptionChange }
-          value={ description }
-        />
-
-        <AddressSelect
-          accounts={ accounts }
-          error={ fromAddressError }
-          hint={
-            <FormattedMessage
-              id='deployContract.details.address.hint'
-              defaultMessage='the owner account for this contract'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='deployContract.details.address.label'
-              defaultMessage='from account (contract owner)'
-            />
-          }
-          onChange={ this.onFromAddressChange }
-          value={ fromAddress }
-        />
-
-        { this.renderContractSelect() }
-
-        <Input
-          error={ abiError }
-          hint={
-            <FormattedMessage
-              id='deployContract.details.abi.hint'
-              defaultMessage='the abi of the contract to deploy or solc combined-output'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='deployContract.details.abi.label'
-              defaultMessage='abi / solc combined-output'
-            />
-          }
-          onChange={ this.onSolcChange }
-          onSubmit={ this.onSolcSubmit }
-          readOnly={ readOnly }
-          value={ solcOutput }
-        />
-        <Input
-          error={ codeError }
-          hint={
-            <FormattedMessage
-              id='deployContract.details.code.hint'
-              defaultMessage='the compiled code of the contract to deploy'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='deployContract.details.code.label'
-              defaultMessage='code'
-            />
-          }
-          onSubmit={ this.onCodeChange }
-          readOnly={ readOnly || solc }
-          value={ code }
-        />
-
-        { this.renderValueInput() }
-
-        <div>
-          <Checkbox
-            checked={ extras }
-            label={
-              <FormattedMessage
-                id='deployContract.details.advanced.label'
-                defaultMessage='advanced sending options'
-              />
-            }
-            onCheck={ this.onCheckExtras }
-            style={ CHECK_STYLE }
-          />
-        </div>
-
-      </Form>
-    );
-  }
-
-  renderValueInput () {
-    const { abi, amount, amountError } = this.props;
-
-    let payable = false;
-
-    try {
-      const parsedAbi = JSON.parse(abi);
-
-      payable = parsedAbi.find((method) => method.type === 'constructor' && method.payable);
-    } catch (error) {
-      return null;
-    }
-
-    if (!payable) {
-      return null;
-    }
-
-    return (
-      <Input
-        error={ amountError }
-        hint={
-          <FormattedMessage
-            id='deployContract.details.amount.hint'
-            defaultMessage='the amount to transfer to the contract'
-          />
-        }
-        label={
-          <FormattedMessage
-            id='deployContract.details.amount.label'
-            defaultMessage='amount to transfer (in {tag})'
-            values={ {
-              tag: 'ETH'
-            } }
-          />
-        }
-        min={ 0 }
-        step={ 0.1 }
-        type='number'
-        onChange={ this.onAmountChange }
-        value={ amount }
-      />
-    );
-  }
-
-  renderContractSelect () {
-    const { contracts } = this.state;
-
-    if (!contracts || Object.keys(contracts).length === 0) {
-      return null;
-    }
-
-    const { selectedContractIndex } = this.state;
-    const contractsItems = Object
-      .keys(contracts)
-      .map((name, index) => (
-        <MenuItem
-          key={ index }
-          label={ name }
-          value={ index }
-        >
-          { name }
-        </MenuItem>
-      ));
-
-    return (
-      <Select
-        label={
-          <FormattedMessage
-            id='deployContract.details.contract.label'
-            defaultMessage='select a contract'
-          />
-        }
-        onChange={ this.onContractChange }
-        value={ selectedContractIndex }
-      >
-        { contractsItems }
-      </Select>
-    );
-  }
-
-  onContractChange = (event, index) => {
-    const { contracts } = this.state;
-    const contractName = Object.keys(contracts)[index];
-    const contract = contracts[contractName];
-
-    if (!this.props.name || this.props.name.trim() === '') {
-      this.onNameChange(null, contractName);
-    }
-
-    const { abi, bin } = contract;
-    const code = /^0x/.test(bin)
-      ? bin
-      : `0x${bin}`;
-
-    this.setState({ selectedContractIndex: index }, () => {
-      this.onAbiChange(abi);
-      this.onCodeChange(code);
-    });
-  }
-
-  onSolcChange = (event, value) => {
-    // Change triggered only if valid
-    if (this.props.abiError) {
-      return null;
-    }
-
-    this.onSolcSubmit(value);
-  }
-
-  onSolcSubmit = (value) => {
-    try {
-      const solcParsed = JSON.parse(value);
-
-      if (!solcParsed || !solcParsed.contracts) {
-        throw new Error('Wrong solc output');
-      }
-
-      this.setState({ contracts: solcParsed.contracts }, () => {
-        this.onContractChange(null, 0);
-      });
-    } catch (e) {
-      this.setState({ contracts: null });
-      this.onAbiChange(value);
-    }
-
-    this.setState({ solcOutput: value });
-  }
-
-  onFromAddressChange = (event, fromAddress) => {
-    const { onFromAddressChange } = this.props;
-
-    onFromAddressChange(fromAddress);
-  }
-
-  onNameChange = (event, name) => {
-    const { onNameChange } = this.props;
-
-    onNameChange(name);
-  }
-
-  onDescriptionChange = (event, description) => {
-    const { onDescriptionChange } = this.props;
-
-    onDescriptionChange(description);
-  }
-
-  onAmountChange = (event, value) => {
-    const { onAmountChange } = this.props;
-
-    onAmountChange(value);
-  }
-
-  onCheckExtras = () => {
-    this.props.onExtrasChange(!this.props.extras);
-  }
-
-  onAbiChange = (abi) => {
-    const { api } = this.context;
-    const { onAbiChange, onParamsChange, onInputsChange } = this.props;
-    const { abiError, abiParsed } = validateAbi(abi, api);
-
-    if (!abiError) {
-      const { inputs } = abiParsed
-        .find((method) => method.type === 'constructor') || { inputs: [] };
-
-      const params = [];
-
-      inputs.forEach((input) => {
-        const param = parseAbiType(input.type);
-
-        params.push(param.default);
-      });
-
-      onParamsChange(params);
-      onInputsChange(inputs);
-    } else {
-      onParamsChange([]);
-      onInputsChange([]);
-    }
-
-    onAbiChange(abi);
-  }
-
-  onCodeChange = (code) => {
-    const { onCodeChange } = this.props;
-
-    onCodeChange(code);
-  }
-}
diff --git a/js/src/modals/DeployContract/DetailsStep/index.js b/js/src/modals/DeployContract/DetailsStep/index.js
deleted file mode 100644
index 4ad4b3ded849e299a348b22a6c093b8a5a365211..0000000000000000000000000000000000000000
--- a/js/src/modals/DeployContract/DetailsStep/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './detailsStep';
diff --git a/js/src/modals/DeployContract/ParametersStep/index.js b/js/src/modals/DeployContract/ParametersStep/index.js
deleted file mode 100644
index f8e76f0f5d87e3f4256804152afe1bd166f3dc1f..0000000000000000000000000000000000000000
--- a/js/src/modals/DeployContract/ParametersStep/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './parametersStep';
diff --git a/js/src/modals/DeployContract/ParametersStep/parametersStep.js b/js/src/modals/DeployContract/ParametersStep/parametersStep.js
deleted file mode 100644
index 0213bfa013856463dab0ca692f653dd35c8538fc..0000000000000000000000000000000000000000
--- a/js/src/modals/DeployContract/ParametersStep/parametersStep.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Form, TypedInput } from '~/ui';
-import { parseAbiType } from '~/util/abi';
-
-import styles from '../deployContract.css';
-
-export default class ParametersStep extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    onParamsChange: PropTypes.func.isRequired,
-
-    inputs: PropTypes.array,
-    params: PropTypes.array,
-    paramsError: PropTypes.array
-  };
-
-  render () {
-    return (
-      <Form>
-        { this.renderConstructorInputs() }
-      </Form>
-    );
-  }
-
-  renderConstructorInputs () {
-    const { accounts, params, paramsError } = this.props;
-    const { inputs } = this.props;
-
-    if (!inputs || !inputs.length) {
-      return null;
-    }
-
-    const inputsComponents = inputs.map((input, index) => {
-      const onChange = (value) => this.onParamChange(index, value);
-
-      const label = `${input.name ? `${input.name}: ` : ''}${input.type}`;
-      const value = params[index];
-      const error = paramsError[index];
-      const param = parseAbiType(input.type);
-
-      return (
-        <div key={ index } className={ styles.funcparams }>
-          <TypedInput
-            accounts={ accounts }
-            error={ error }
-            isEth={ false }
-            label={ label }
-            onChange={ onChange }
-            param={ param }
-            value={ value }
-          />
-        </div>
-      );
-    });
-
-    return (
-      <div className={ styles.parameters }>
-        <p>
-          <FormattedMessage
-            id='deployContract.parameters.choose'
-            defaultMessage='Choose the contract parameters'
-          />
-        </p>
-        { inputsComponents }
-      </div>
-    );
-  }
-
-  onParamChange = (index, value) => {
-    const { params, onParamsChange } = this.props;
-
-    params[index] = value;
-    onParamsChange(params);
-  }
-}
diff --git a/js/src/modals/DeployContract/deployContract.css b/js/src/modals/DeployContract/deployContract.css
deleted file mode 100644
index 801be27a87ca053d8ef1a922482d6d000bb844e7..0000000000000000000000000000000000000000
--- a/js/src/modals/DeployContract/deployContract.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.funcparams {
-  padding-left: 3em;
-}
-
-.parameters {
-  p {
-    color: rgba(255, 255, 255, 0.498039);
-  }
-}
diff --git a/js/src/modals/DeployContract/deployContract.js b/js/src/modals/DeployContract/deployContract.js
deleted file mode 100644
index a5d6c6b3426bc55c129fb5c0f4738b557a62eced..0000000000000000000000000000000000000000
--- a/js/src/modals/DeployContract/deployContract.js
+++ /dev/null
@@ -1,509 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { Button, GasPriceEditor, IdentityIcon, Portal, Warning } from '~/ui';
-import { CancelIcon } from '~/ui/Icons';
-import { ERRORS, validateAbi, validateCode, validateName, validatePositiveNumber } from '~/util/validation';
-import { deploy, deployEstimateGas, getSender, loadSender, setSender } from '~/util/tx';
-import { setRequest } from '~/redux/providers/requestsActions';
-
-import DetailsStep from './DetailsStep';
-import ParametersStep from './ParametersStep';
-import Extras from '../Transfer/Extras';
-
-const STEPS = {
-  CONTRACT_DETAILS: {
-    title: (
-      <FormattedMessage
-        id='deployContract.title.details'
-        defaultMessage='contract details'
-      />
-    )
-  },
-  CONTRACT_PARAMETERS: {
-    title: (
-      <FormattedMessage
-        id='deployContract.title.parameters'
-        defaultMessage='contract parameters'
-      />
-    )
-  },
-  EXTRAS: {
-    title: (
-      <FormattedMessage
-        id='deployContract.title.extras'
-        defaultMessage='extra information'
-      />
-    )
-  }
-};
-
-@observer
-class DeployContract extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired,
-    store: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    abi: PropTypes.string,
-    code: PropTypes.string,
-    gasLimit: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onSetRequest: PropTypes.func.isRequired,
-    readOnly: PropTypes.bool,
-    source: PropTypes.string
-  };
-
-  static defaultProps = {
-    readOnly: false,
-    source: ''
-  };
-
-  gasStore = new GasPriceEditor.Store(this.context.api, { gasLimit: this.props.gasLimit });
-
-  state = {
-    abi: '',
-    abiError: ERRORS.invalidAbi,
-    amount: '0',
-    amountValue: new BigNumber(0),
-    amountError: '',
-    code: '',
-    codeError: ERRORS.invalidCode,
-    description: '',
-    descriptionError: null,
-    extras: false,
-    fromAddress: getSender() || Object.keys(this.props.accounts)[0],
-    fromAddressError: null,
-    name: '',
-    nameError: ERRORS.invalidName,
-    params: [],
-    paramsError: [],
-    inputs: [],
-    step: 'CONTRACT_DETAILS'
-  };
-
-  componentWillMount () {
-    const { abi, code } = this.props;
-
-    if (abi && code) {
-      this.setState({ abi, code });
-    }
-
-    loadSender(this.context.api)
-      .then((defaultAccount) => {
-        if (defaultAccount !== this.state.fromAddress) {
-          this.setState({ fromAddress: defaultAccount });
-        }
-      });
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const { abi, code } = nextProps;
-    const newState = {};
-
-    if (abi !== this.props.abi) {
-      newState.abi = abi;
-    }
-
-    if (code !== this.props.code) {
-      newState.code = code;
-    }
-
-    if (Object.keys(newState).length) {
-      this.setState(newState);
-    }
-  }
-
-  render () {
-    const { step, inputs } = this.state;
-
-    const realStepKeys = Object.keys(STEPS)
-        .filter((k) => {
-          if (k === 'CONTRACT_PARAMETERS') {
-            return inputs.length > 0;
-          }
-
-          if (k === 'EXTRAS') {
-            return this.state.extras;
-          }
-
-          return true;
-        });
-
-    const realStep = realStepKeys.findIndex((k) => k === step);
-    const realSteps = realStepKeys.map((k) => STEPS[k]);
-
-    return (
-      <Portal
-        buttons={ this.renderDialogActions() }
-        activeStep={ realStep }
-        onClose={ this.onClose }
-        open
-        steps={ realSteps.map((s) => s.title) }
-      >
-        { this.renderExceptionWarning() }
-        { this.renderStep() }
-      </Portal>
-    );
-  }
-
-  renderExceptionWarning () {
-    const { step } = this.state;
-    const { errorEstimated } = this.gasStore;
-    const realStep = Object.keys(STEPS).findIndex((k) => k === step);
-
-    if (!errorEstimated || realStep >= 2) {
-      return null;
-    }
-
-    return (
-      <Warning warning={ errorEstimated } />
-    );
-  }
-
-  renderDialogActions () {
-    const { deployError, abiError, amountError, codeError, nameError, descriptionError, fromAddressError, fromAddress, step } = this.state;
-    const isValid = !nameError && !fromAddressError && !descriptionError && !abiError && !codeError && !amountError;
-
-    const cancelBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='deployContract.button.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.onClose }
-      />
-    );
-
-    const closeBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='close'
-        label={
-          <FormattedMessage
-            id='deployContract.button.close'
-            defaultMessage='Close'
-          />
-        }
-        onClick={ this.onClose }
-      />
-    );
-
-    if (deployError) {
-      return closeBtn;
-    }
-
-    const createButton = (
-      <Button
-        icon={
-          <IdentityIcon
-            address={ fromAddress }
-            button
-          />
-        }
-        key='create'
-        label={
-          <FormattedMessage
-            id='deployContract.button.create'
-            defaultMessage='Create'
-          />
-        }
-        onClick={ this.onDeployStart }
-      />
-    );
-
-    const nextButton = (
-      <Button
-        disabled={ !isValid }
-        key='next'
-        icon={
-          <IdentityIcon
-            address={ fromAddress }
-            button
-          />
-        }
-        label={
-          <FormattedMessage
-            id='deployContract.button.next'
-            defaultMessage='Next'
-          />
-        }
-        onClick={ this.onNextStep }
-      />
-    );
-
-    const hasParameters = this.state.inputs.length > 0;
-    const showExtras = this.state.extras;
-
-    switch (step) {
-      case 'CONTRACT_DETAILS':
-        return [
-          cancelBtn,
-          hasParameters || showExtras
-            ? nextButton
-            : createButton
-        ];
-
-      case 'CONTRACT_PARAMETERS':
-        return [
-          cancelBtn,
-          showExtras
-            ? nextButton
-            : createButton
-        ];
-
-      case 'EXTRAS':
-        return [
-          cancelBtn,
-          createButton
-        ];
-    }
-  }
-
-  renderStep () {
-    const { accounts, readOnly } = this.props;
-    const { step } = this.state;
-
-    switch (step) {
-      case 'CONTRACT_DETAILS':
-        return (
-          <DetailsStep
-            { ...this.state }
-            accounts={ accounts }
-            onAmountChange={ this.onAmountChange }
-            onExtrasChange={ this.onExtrasChange }
-            onFromAddressChange={ this.onFromAddressChange }
-            onDescriptionChange={ this.onDescriptionChange }
-            onNameChange={ this.onNameChange }
-            onAbiChange={ this.onAbiChange }
-            onCodeChange={ this.onCodeChange }
-            onParamsChange={ this.onParamsChange }
-            onInputsChange={ this.onInputsChange }
-            readOnly={ readOnly }
-          />
-        );
-
-      case 'CONTRACT_PARAMETERS':
-        return (
-          <ParametersStep
-            { ...this.state }
-            accounts={ accounts }
-            onParamsChange={ this.onParamsChange }
-            readOnly={ readOnly }
-          />
-        );
-
-      case 'EXTRAS':
-        return this.renderExtrasPage();
-    }
-  }
-
-  renderExtrasPage () {
-    if (!this.gasStore.histogram) {
-      return null;
-    }
-
-    return (
-      <Extras
-        gasStore={ this.gasStore }
-        hideData
-        isEth
-      />
-    );
-  }
-
-  estimateGas = () => {
-    const { api } = this.context;
-    const { abiError, abiParsed, amountValue, amountError, code, codeError, fromAddress, fromAddressError, params } = this.state;
-
-    if (abiError || codeError || fromAddressError || amountError) {
-      return;
-    }
-
-    const options = {
-      data: code,
-      from: fromAddress,
-      value: amountValue
-    };
-
-    const contract = api.newContract(abiParsed);
-
-    deployEstimateGas(contract, options, params)
-      .then(([gasEst, gas]) => {
-        this.gasStore.setEstimated(gasEst.toFixed(0));
-        this.gasStore.setGas(gas.toFixed(0));
-      })
-      .catch((error) => {
-        this.gasStore.setEstimatedError();
-        console.warn('estimateGas', error);
-      });
-  }
-
-  onNextStep = () => {
-    switch (this.state.step) {
-      case 'CONTRACT_DETAILS':
-        return this.onParametersStep();
-
-      case 'CONTRACT_PARAMETERS':
-        return this.onExtrasStep();
-
-      default:
-        console.warn('wrong call of "onNextStep" from', this.state.step);
-    }
-  }
-
-  onParametersStep = () => {
-    const { inputs } = this.state;
-
-    if (inputs.length) {
-      return this.setState({ step: 'CONTRACT_PARAMETERS' });
-    }
-
-    return this.onExtrasStep();
-  }
-
-  onExtrasStep = () => {
-    if (this.state.extras) {
-      return this.setState({ step: 'EXTRAS' });
-    }
-
-    return this.onDeployStart();
-  }
-
-  onDescriptionChange = (description) => {
-    this.setState({ description, descriptionError: null });
-  }
-
-  onFromAddressChange = (fromAddress) => {
-    const { api } = this.context;
-
-    const fromAddressError = api.util.isAddressValid(fromAddress)
-      ? null
-      : (
-        <FormattedMessage
-          id='deployContract.owner.noneSelected'
-          defaultMessage='a valid account as the contract owner needs to be selected'
-        />
-      );
-
-    this.setState({ fromAddress, fromAddressError }, this.estimateGas);
-  }
-
-  onNameChange = (name) => {
-    this.setState(validateName(name));
-  }
-
-  onParamsChange = (params) => {
-    this.setState({ params }, this.estimateGas);
-  }
-
-  onInputsChange = (inputs) => {
-    this.setState({ inputs }, this.estimateGas);
-  }
-
-  onAbiChange = (abi) => {
-    const { api } = this.context;
-
-    this.setState(validateAbi(abi, api), this.estimateGas);
-  }
-
-  onCodeChange = (code) => {
-    this.setState(validateCode(code), this.estimateGas);
-  }
-
-  onAmountChange = (amount) => {
-    const { numberError } = validatePositiveNumber(amount);
-    const nextAmountValue = numberError
-      ? new BigNumber(0)
-      : this.context.api.util.toWei(amount);
-
-    this.gasStore.setEthValue(nextAmountValue);
-    this.setState({ amount, amountValue: nextAmountValue, amountError: numberError }, this.estimateGas);
-  }
-
-  onExtrasChange = (extras) => {
-    this.setState({ extras });
-  }
-
-  onDeployStart = () => {
-    const { api } = this.context;
-    const { source } = this.props;
-    const { abiParsed, amountValue, code, description, name, params, fromAddress } = this.state;
-
-    const metadata = {
-      abi: abiParsed,
-      contract: true,
-      deleted: false,
-      timestamp: Date.now(),
-      name,
-      description,
-      source
-    };
-
-    const options = this.gasStore.overrideTransaction({
-      data: code,
-      from: fromAddress,
-      value: amountValue
-    });
-
-    const contract = api.newContract(abiParsed);
-
-    setSender(fromAddress);
-    this.onClose();
-    deploy(contract, options, params, true)
-      .then((requestId) => {
-        const requestMetadata = { ...metadata, deployment: true };
-
-        this.props.onSetRequest(requestId, { metadata: requestMetadata }, false);
-      });
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-}
-
-function mapStateToProps (state) {
-  const { gasLimit } = state.nodeStatus;
-
-  return {
-    gasLimit
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    onSetRequest: setRequest
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(DeployContract);
diff --git a/js/src/modals/DeployContract/deployContract.spec.js b/js/src/modals/DeployContract/deployContract.spec.js
deleted file mode 100644
index f0413df6aa087a0c0a589d9bb09cc7e43133463a..0000000000000000000000000000000000000000
--- a/js/src/modals/DeployContract/deployContract.spec.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import DeployContract from './';
-
-const STORE = {
-  dispatch: sinon.stub(),
-  subscribe: sinon.stub(),
-  getState: () => {
-    return {
-      balances: {
-        balances: {}
-      },
-      nodeStatus: {
-        gasLimit: new BigNumber(0x12345)
-      }
-    };
-  }
-};
-
-function renderShallow () {
-  return shallow(
-    <DeployContract
-      accounts={ {} }
-      store={ STORE }
-      onClose={ sinon.stub() }
-    />
-  );
-}
-
-describe('modals/DeployContract', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(renderShallow()).to.be.ok;
-    });
-  });
-});
diff --git a/js/src/modals/EditMeta/editMeta.js b/js/src/modals/EditMeta/editMeta.js
deleted file mode 100644
index 5d0c91dbe9a659647f4448c545c42089acf03f34..0000000000000000000000000000000000000000
--- a/js/src/modals/EditMeta/editMeta.js
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { newError } from '~/redux/actions';
-import { Button, Form, Input, InputChip, Portal, VaultSelect } from '~/ui';
-import { CancelIcon, SaveIcon } from '~/ui/Icons';
-import VaultStore from '~/views/Vaults/store';
-
-import Store from './store';
-
-@observer
-class EditMeta extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    newError: PropTypes.func.isRequired,
-    onClose: PropTypes.func.isRequired
-  }
-
-  store = new Store(this.context.api, this.props.account);
-  vaultStore = VaultStore.get(this.context.api);
-
-  componentWillMount () {
-    this.vaultStore.loadVaults();
-  }
-
-  render () {
-    const { description, isBusy, name, nameError, tags } = this.store;
-
-    return (
-      <Portal
-        buttons={ this.renderActions() }
-        busy={ isBusy }
-        onClose={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='editMeta.title'
-            defaultMessage='edit metadata'
-          />
-        }
-      >
-        <Form>
-          <Input
-            autoFocus
-            error={ nameError }
-            label={
-              <FormattedMessage
-                id='editMeta.name.label'
-                defaultMessage='name'
-              />
-            }
-            onSubmit={ this.store.setName }
-            value={ name }
-          />
-          <Input
-            hint={
-              <FormattedMessage
-                id='editMeta.description.hint'
-                defaultMessage='description for this address'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='editMeta.description.label'
-                defaultMessage='address description'
-              />
-            }
-            value={ description }
-            onSubmit={ this.store.setDescription }
-          />
-          { this.renderAccountFields() }
-          <InputChip
-            addOnBlur
-            hint={
-              <FormattedMessage
-                id='editMeta.tags.hint'
-                defaultMessage='press <Enter> to add a tag'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='editMeta.tags.label'
-                defaultMessage='(optional) tags'
-              />
-            }
-            onTokensChange={ this.store.setTags }
-            tokens={ tags.slice() }
-          />
-          { this.renderVaultSelector() }
-        </Form>
-      </Portal>
-    );
-  }
-
-  renderActions () {
-    const { hasError } = this.store;
-
-    return [
-      <Button
-        label='Cancel'
-        icon={ <CancelIcon /> }
-        key='cancel'
-        onClick={ this.onClose }
-      />,
-      <Button
-        disabled={ hasError }
-        label='Save'
-        icon={ <SaveIcon /> }
-        key='save'
-        onClick={ this.onSave }
-      />
-    ];
-  }
-
-  renderAccountFields () {
-    const { isAccount, passwordHint } = this.store;
-
-    if (!isAccount) {
-      return null;
-    }
-
-    return (
-      <Input
-        hint={
-          <FormattedMessage
-            id='editMeta.passwordHint.hint'
-            defaultMessage='a hint to allow password recovery'
-          />
-        }
-        label={
-          <FormattedMessage
-            id='editMeta.passwordHint.label'
-            defaultMessage='(optional) password hint'
-          />
-        }
-        value={ passwordHint }
-        onSubmit={ this.store.setPasswordHint }
-      />
-    );
-  }
-
-  renderVaultSelector () {
-    const { isAccount, vaultName } = this.store;
-
-    if (!isAccount) {
-      return null;
-    }
-
-    return (
-      <VaultSelect
-        onSelect={ this.setVaultName }
-        value={ vaultName }
-        vaultStore={ this.vaultStore }
-      />
-    );
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-
-  onSave = () => {
-    if (this.store.hasError) {
-      return;
-    }
-
-    return this.store
-      .save(this.vaultStore)
-      .then(this.onClose)
-      .catch((error) => {
-        this.props.newError(error);
-      });
-  }
-
-  setVaultName = (vaultName) => {
-    this.store.setVaultName(vaultName);
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError
-  }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(EditMeta);
diff --git a/js/src/modals/EditMeta/editMeta.spec.js b/js/src/modals/EditMeta/editMeta.spec.js
deleted file mode 100644
index 62b4d12545f2a5289a5e8f376ad9e3e97dcbea26..0000000000000000000000000000000000000000
--- a/js/src/modals/EditMeta/editMeta.spec.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import EditMeta from './';
-
-import { ACCOUNT, createApi, createRedux } from './editMeta.test.js';
-
-let api;
-let component;
-let instance;
-let onClose;
-let reduxStore;
-
-function render (props) {
-  api = createApi();
-  onClose = sinon.stub();
-  reduxStore = createRedux();
-
-  component = shallow(
-    <EditMeta
-      { ...props }
-      account={ ACCOUNT }
-      onClose={ onClose }
-    />,
-    { context: { store: reduxStore } }
-  ).find('EditMeta').shallow({ context: { api } });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/EditMeta', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(render()).to.be.ok;
-    });
-  });
-
-  describe('actions', () => {
-    beforeEach(() => {
-      render();
-    });
-
-    describe('onSave', () => {
-      it('calls store.save', () => {
-        sinon.spy(instance.store, 'save');
-
-        return instance.onSave().then(() => {
-          expect(instance.store.save).to.have.been.called;
-          instance.store.save.restore();
-        });
-      });
-
-      it('closes the dialog on success', () => {
-        return instance.onSave().then(() => {
-          expect(onClose).to.have.been.called;
-        });
-      });
-
-      it('adds newError on failure', () => {
-        sinon.stub(instance.store, 'save').rejects('test');
-
-        return instance.onSave().then(() => {
-          expect(reduxStore.dispatch).to.have.been.calledWith({ error: new Error('test'), type: 'newError' });
-          instance.store.save.restore();
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/modals/EditMeta/editMeta.test.js b/js/src/modals/EditMeta/editMeta.test.js
deleted file mode 100644
index c0cbf83a15b3c7738da4fc184be47d27da055521..0000000000000000000000000000000000000000
--- a/js/src/modals/EditMeta/editMeta.test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-const ACCOUNT = {
-  address: '0x123456789a123456789a123456789a123456789a',
-  meta: {
-    description: 'Call me bob',
-    passwordHint: 'some hint',
-    tags: ['testing']
-  },
-  name: 'Bobby',
-  uuid: '123-456'
-};
-
-const ADDRESS = {
-  address: '0x0123456789012345678901234567890123456789',
-  meta: {
-    description: 'Some address',
-    extraMeta: {
-      some: 'random',
-      extra: {
-        meta: 'data'
-      }
-    }
-  },
-  name: 'Random address'
-};
-
-function createApi () {
-  return {
-    parity: {
-      setAccountName: sinon.stub().resolves(),
-      setAccountMeta: sinon.stub().resolves(),
-      listVaults: sinon.stub().resolves([]),
-      listOpenedVaults: sinon.stub().resolves([])
-    }
-  };
-}
-
-function createRedux () {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {};
-    }
-  };
-}
-
-export {
-  ACCOUNT,
-  ADDRESS,
-  createApi,
-  createRedux
-};
diff --git a/js/src/modals/EditMeta/index.js b/js/src/modals/EditMeta/index.js
deleted file mode 100644
index 1b7fa4830290ff18903d30b2cd4f6c2480facde9..0000000000000000000000000000000000000000
--- a/js/src/modals/EditMeta/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './editMeta';
diff --git a/js/src/modals/EditMeta/store.js b/js/src/modals/EditMeta/store.js
deleted file mode 100644
index da3d88cd701dd5817d233e0fb6e9bd16620bdbed..0000000000000000000000000000000000000000
--- a/js/src/modals/EditMeta/store.js
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, observable, transaction } from 'mobx';
-
-import { validateName } from '~/util/validation';
-
-export default class Store {
-  @observable address = null;
-  @observable isAccount = false;
-  @observable isBusy = false;
-  @observable description = null;
-  @observable meta = null;
-  @observable name = null;
-  @observable nameError = null;
-  @observable passwordHint = null;
-  @observable tags = null;
-  @observable vaultName = null;
-
-  constructor (api, account) {
-    const { address, name, meta, uuid } = account;
-
-    this._api = api;
-
-    transaction(() => {
-      this.address = address;
-      this.meta = meta || {};
-      this.name = name || '';
-      this.isAccount = !!uuid;
-
-      this.description = this.meta.description || '';
-      this.passwordHint = this.meta.passwordHint || '';
-      this.tags = this.meta.tags && this.meta.tags.peek() || [];
-      this.vaultName = this.meta.vault;
-    });
-  }
-
-  @computed get hasError () {
-    return !!(this.nameError);
-  }
-
-  @action setDescription = (description) => {
-    this.description = description;
-  }
-
-  @action setName = (_name) => {
-    const { name, nameError } = validateName(_name);
-
-    transaction(() => {
-      this.name = name;
-      this.setNameError(nameError);
-    });
-  }
-
-  @action setNameError = (nameError) => {
-    this.nameError = nameError;
-  }
-
-  @action setPasswordHint = (passwordHint) => {
-    this.passwordHint = passwordHint;
-  }
-
-  @action setBusy = (isBusy) => {
-    this.isBusy = isBusy;
-  }
-
-  @action setTags = (tags) => {
-    this.tags = tags.slice();
-  }
-
-  @action setVaultName = (vaultName) => {
-    this.vaultName = vaultName;
-  }
-
-  save (vaultStore) {
-    this.setBusy(true);
-
-    const meta = {
-      description: this.description,
-      tags: this.tags.peek()
-    };
-
-    if (this.isAccount) {
-      meta.passwordHint = this.passwordHint;
-    }
-
-    return Promise
-      .all([
-        this._api.parity.setAccountName(this.address, this.name),
-        this._api.parity.setAccountMeta(this.address, Object.assign({}, this.meta, meta))
-      ])
-      .then(() => {
-        if (vaultStore && this.isAccount && (this.meta.vault !== this.vaultName)) {
-          return vaultStore.moveAccount(this.vaultName, this.address);
-        }
-
-        return true;
-      })
-      .then(() => {
-        this.setBusy(false);
-      })
-      .catch((error) => {
-        console.error('onSave', error);
-        this.setBusy(false);
-        throw error;
-      });
-  }
-}
diff --git a/js/src/modals/EditMeta/store.spec.js b/js/src/modals/EditMeta/store.spec.js
deleted file mode 100644
index a38da055f5b8e1e156f452f58aa2bc7e2486dc96..0000000000000000000000000000000000000000
--- a/js/src/modals/EditMeta/store.spec.js
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Store from './store';
-import { ACCOUNT, ADDRESS, createApi } from './editMeta.test.js';
-
-let api;
-let store;
-let vaultStore;
-
-function createVaultStore () {
-  return {
-    moveAccount: sinon.stub().resolves(true)
-  };
-}
-
-function createStore (account) {
-  api = createApi();
-  vaultStore = createVaultStore();
-
-  store = new Store(api, account);
-
-  return store;
-}
-
-describe('modals/EditMeta/Store', () => {
-  describe('constructor', () => {
-    describe('accounts', () => {
-      beforeEach(() => {
-        createStore(ACCOUNT);
-      });
-
-      it('flags it as an account', () => {
-        expect(store.isAccount).to.be.true;
-      });
-
-      it('extracts the address', () => {
-        expect(store.address).to.equal(ACCOUNT.address);
-      });
-
-      it('extracts the name', () => {
-        expect(store.name).to.equal(ACCOUNT.name);
-      });
-
-      it('extracts the tags', () => {
-        expect(store.tags).to.deep.equal(ACCOUNT.meta.tags);
-      });
-
-      describe('meta', () => {
-        it('extracts the full meta', () => {
-          expect(store.meta).to.deep.equal(ACCOUNT.meta);
-        });
-
-        it('extracts the description', () => {
-          expect(store.description).to.equal(ACCOUNT.meta.description);
-        });
-      });
-    });
-
-    describe('addresses', () => {
-      beforeEach(() => {
-        createStore(ADDRESS);
-      });
-
-      it('flags it as not an account', () => {
-        expect(store.isAccount).to.be.false;
-      });
-
-      it('extracts the address', () => {
-        expect(store.address).to.equal(ADDRESS.address);
-      });
-
-      it('extracts the name', () => {
-        expect(store.name).to.equal(ADDRESS.name);
-      });
-
-      it('extracts the tags (empty)', () => {
-        expect(store.tags.peek()).to.deep.equal([]);
-      });
-    });
-  });
-
-  describe('@computed', () => {
-    beforeEach(() => {
-      createStore(ADDRESS);
-    });
-
-    describe('hasError', () => {
-      it('is false when no nameError', () => {
-        store.setNameError(null);
-        expect(store.hasError).to.be.false;
-      });
-
-      it('is false with a nameError', () => {
-        store.setNameError('some error');
-        expect(store.hasError).to.be.true;
-      });
-    });
-  });
-
-  describe('@actions', () => {
-    beforeEach(() => {
-      createStore(ADDRESS);
-    });
-
-    describe('setBusy', () => {
-      it('sets the isBusy flag', () => {
-        store.setBusy('testing');
-        expect(store.isBusy).to.equal('testing');
-      });
-    });
-
-    describe('setDescription', () => {
-      it('sets the description', () => {
-        store.setDescription('description');
-        expect(store.description).to.equal('description');
-      });
-    });
-
-    describe('setName', () => {
-      it('sets the name', () => {
-        store.setName('valid name');
-        expect(store.name).to.equal('valid name');
-        expect(store.nameError).to.be.null;
-      });
-
-      it('sets name and error on invalid', () => {
-        store.setName('');
-        expect(store.name).to.equal('');
-        expect(store.nameError).not.to.be.null;
-      });
-    });
-
-    describe('setPasswordHint', () => {
-      it('sets the description', () => {
-        store.setPasswordHint('passwordHint');
-        expect(store.passwordHint).to.equal('passwordHint');
-      });
-    });
-
-    describe('setTags', () => {
-      it('sets the tags', () => {
-        store.setTags(['taga', 'tagb']);
-        expect(store.tags.peek()).to.deep.equal(['taga', 'tagb']);
-      });
-    });
-
-    describe('setVaultName', () => {
-      it('sets the name', () => {
-        store.setVaultName('testing');
-        expect(store.vaultName).to.equal('testing');
-      });
-    });
-  });
-
-  describe('operations', () => {
-    describe('save', () => {
-      beforeEach(() => {
-        createStore(ACCOUNT);
-        sinon.spy(store, 'setBusy');
-      });
-
-      afterEach(() => {
-        store.setBusy.restore();
-      });
-
-      it('sets the busy flag, clearing it when done', () => {
-        return store.save().then(() => {
-          expect(store.setBusy).to.have.been.calledWith(true);
-          expect(store.setBusy).to.have.been.calledWith(false);
-        });
-      });
-
-      it('calls parity.setAccountName with the set value', () => {
-        store.setName('test name');
-
-        return store.save().then(() => {
-          expect(api.parity.setAccountName).to.be.calledWith(ACCOUNT.address, 'test name');
-        });
-      });
-
-      it('calls parity.setAccountMeta with the adjusted values', () => {
-        store.setDescription('some new description');
-        store.setPasswordHint('some new passwordhint');
-        store.setTags(['taga']);
-
-        return store.save().then(() => {
-          expect(api.parity.setAccountMeta).to.have.been.calledWith(
-            ACCOUNT.address, Object.assign({}, ACCOUNT.meta, {
-              description: 'some new description',
-              passwordHint: 'some new passwordhint',
-              tags: ['taga']
-            })
-          );
-        });
-      });
-
-      it('moves vault account when applicable', () => {
-        store.setVaultName('testing');
-
-        return store.save(vaultStore).then(() => {
-          expect(vaultStore.moveAccount).to.have.been.calledWith('testing', ACCOUNT.address);
-        });
-      });
-
-      it('calls parity.setAccountMeta with the adjusted values', () => {
-        store.setDescription('some new description');
-        store.setPasswordHint('some new passwordhint');
-        store.setTags(['taga']);
-        store.save();
-
-        expect(api.parity.setAccountMeta).to.have.been.calledWith(ACCOUNT.address, Object.assign({}, ACCOUNT.meta, {
-          description: 'some new description',
-          passwordHint: 'some new passwordhint',
-          tags: ['taga']
-        }));
-      });
-    });
-  });
-});
diff --git a/js/src/modals/ExecuteContract/AdvancedStep/advancedStep.js b/js/src/modals/ExecuteContract/AdvancedStep/advancedStep.js
deleted file mode 100644
index 268ca1f70df9b8b72d01a66f9963d832ff0ab019..0000000000000000000000000000000000000000
--- a/js/src/modals/ExecuteContract/AdvancedStep/advancedStep.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { GasPriceEditor } from '~/ui';
-
-import styles from '../executeContract.css';
-
-export default class AdvancedStep extends Component {
-  static propTypes = {
-    gasStore: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { gasStore } = this.props;
-
-    return (
-      <div className={ styles.gaseditor }>
-        <GasPriceEditor store={ gasStore } />
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/ExecuteContract/AdvancedStep/index.js b/js/src/modals/ExecuteContract/AdvancedStep/index.js
deleted file mode 100644
index bd7a50eb407ba6ee7cdceefd46eb71f79285f08c..0000000000000000000000000000000000000000
--- a/js/src/modals/ExecuteContract/AdvancedStep/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './advancedStep';
diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
deleted file mode 100644
index 913def0eeffa017adaf2c4a92c735804dbc1b67a..0000000000000000000000000000000000000000
--- a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Checkbox, MenuItem } from 'material-ui';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { AddressSelect, Form, Input, Select, TypedInput } from '~/ui';
-
-import styles from '../executeContract.css';
-
-const CHECK_STYLE = {
-  position: 'absolute',
-  top: '38px',
-  left: '1em'
-};
-
-export default class DetailsStep extends Component {
-  static propTypes = {
-    advancedOptions: PropTypes.bool,
-    accounts: PropTypes.object.isRequired,
-    amount: PropTypes.string,
-    amountError: PropTypes.string,
-    contract: PropTypes.object.isRequired,
-    fromAddress: PropTypes.string,
-    fromAddressError: PropTypes.string,
-    func: PropTypes.object,
-    funcError: PropTypes.string,
-    onAdvancedClick: PropTypes.func,
-    onAmountChange: PropTypes.func.isRequired,
-    onFromAddressChange: PropTypes.func.isRequired,
-    onFuncChange: PropTypes.func,
-    onValueChange: PropTypes.func.isRequired,
-    values: PropTypes.array.isRequired,
-    valuesError: PropTypes.array.isRequired,
-    warning: PropTypes.string
-  }
-
-  render () {
-    const { accounts, advancedOptions, amount, amountError, fromAddress, fromAddressError, onAdvancedClick, onAmountChange, onFromAddressChange } = this.props;
-
-    return (
-      <Form>
-        <AddressSelect
-          accounts={ accounts }
-          error={ fromAddressError }
-          hint={
-            <FormattedMessage
-              id='executeContract.details.address.label'
-              defaultMessage='the account to transact with'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='executeContract.details.address.hint'
-              defaultMessage='from account'
-            />
-           }
-          onChange={ onFromAddressChange }
-          value={ fromAddress }
-        />
-        { this.renderFunctionSelect() }
-        { this.renderParameters() }
-        <div className={ styles.columns }>
-          <div>
-            <Input
-              error={ amountError }
-              hint={
-                <FormattedMessage
-                  id='executeContract.details.amount.hint'
-                  defaultMessage='the amount to send to with the transaction'
-                />
-              }
-              label={
-                <FormattedMessage
-                  id='executeContract.details.amount.label'
-                  defaultMessage='transaction value (in ETH)'
-                />
-              }
-              onSubmit={ onAmountChange }
-              value={ amount }
-            />
-          </div>
-          <div>
-            <Checkbox
-              checked={ advancedOptions }
-              label={
-                <FormattedMessage
-                  id='executeContract.details.advancedCheck.label'
-                  defaultMessage='advanced sending options'
-                />
-              }
-              onCheck={ onAdvancedClick }
-              style={ CHECK_STYLE }
-            />
-          </div>
-        </div>
-      </Form>
-    );
-  }
-
-  renderFunctionSelect () {
-    const { func, funcError, contract } = this.props;
-
-    if (!func) {
-      return null;
-    }
-
-    const functions = contract.functions
-      .filter((func) => !func.constant)
-      .sort((a, b) => (a.name || '').localeCompare(b.name || ''))
-      .map((func) => {
-        const params = (func.abi.inputs || [])
-          .map((input, index) => {
-            return (
-              <span key={ input.name }>
-                <span>{ index ? ', ' : '' }</span>
-                <span className={ styles.paramname }>{ input.name }: </span>
-                <span>{ input.type }</span>
-              </span>
-            );
-          });
-        const name = (
-          <div>
-            <span>{ func.name }</span>
-            <span className={ styles.paramname }>(</span>
-            { params }
-            <span className={ styles.paramname }>)</span>
-          </div>
-        );
-
-        return (
-          <MenuItem
-            key={ func.signature }
-            value={ func.signature }
-            label={ func.name || '()' }
-          >
-            { name }
-          </MenuItem>
-        );
-      });
-
-    return (
-      <Select
-        error={ funcError }
-        hint={
-          <FormattedMessage
-            id='executeContract.details.function.hint'
-            defaultMessage='the function to call on the contract'
-          />
-        }
-        label={
-          <FormattedMessage
-            id='executeContract.details.function.label'
-            defaultMessage='function to execute'
-          />
-        }
-        onChange={ this.onFuncChange }
-        value={ func.signature }
-      >
-        { functions }
-      </Select>
-    );
-  }
-
-  renderParameters () {
-    const { accounts, func, values, valuesError, onValueChange } = this.props;
-
-    if (!func) {
-      return null;
-    }
-
-    return (func.abi.inputs || []).map((input, index) => {
-      const onChange = (value) => onValueChange(null, index, value);
-      const label = `${input.name}: ${input.type}`;
-
-      return (
-        <div
-          key={ `${index}_${input.name || ''}` }
-          className={ styles.funcparams }
-        >
-          <TypedInput
-            label={ label }
-            value={ values[index] }
-            error={ valuesError[index] }
-            onChange={ onChange }
-            accounts={ accounts }
-            param={ input.type }
-            isEth={ false }
-          />
-        </div>
-      );
-    });
-  }
-
-  onFuncChange = (event, index, signature) => {
-    const { contract, onFuncChange } = this.props;
-
-    onFuncChange(event, contract.functions.find((fn) => fn.signature === signature));
-  }
-}
diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js
deleted file mode 100644
index 07399d872447f4b730e6dca24271ff99fc1f5f42..0000000000000000000000000000000000000000
--- a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import DetailsStep from './';
-
-import { CONTRACT } from '../executeContract.test.js';
-
-let component;
-let onAmountChange;
-let onClose;
-let onFromAddressChange;
-let onFuncChange;
-let onGasEditClick;
-let onValueChange;
-
-function render (props) {
-  onAmountChange = sinon.stub();
-  onClose = sinon.stub();
-  onFromAddressChange = sinon.stub();
-  onFuncChange = sinon.stub();
-  onGasEditClick = sinon.stub();
-  onValueChange = sinon.stub();
-
-  component = shallow(
-    <DetailsStep
-      { ...props }
-      contract={ CONTRACT }
-      onAmountChange={ onAmountChange }
-      onClose={ onClose }
-      onFromAddressChange={ onFromAddressChange }
-      onFuncChange={ onFuncChange }
-      onGasEditClick={ onGasEditClick }
-      onValueChange={ onValueChange }
-    />
-  );
-
-  return component;
-}
-
-describe('modals/ExecuteContract/DetailsStep', () => {
-  it('renders', () => {
-    expect(render({ accounts: {}, values: [ true ], valuesError: [ null ] })).to.be.ok;
-  });
-
-  describe('parameter values', () => {
-    beforeEach(() => {
-      render({
-        accounts: {},
-        func: CONTRACT.functions[0],
-        values: [ false ],
-        valuesError: [ null ]
-      });
-    });
-
-    describe('bool parameters', () => {
-      it('toggles from false to true', () => {
-        component.find('TypedInput').last().shallow().simulate('change', { target: { value: 'true' } });
-
-        expect(onValueChange).to.have.been.calledWith(null, 0, true);
-      });
-    });
-  });
-});
diff --git a/js/src/modals/ExecuteContract/DetailsStep/index.js b/js/src/modals/ExecuteContract/DetailsStep/index.js
deleted file mode 100644
index 4ad4b3ded849e299a348b22a6c093b8a5a365211..0000000000000000000000000000000000000000
--- a/js/src/modals/ExecuteContract/DetailsStep/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './detailsStep';
diff --git a/js/src/modals/ExecuteContract/executeContract.css b/js/src/modals/ExecuteContract/executeContract.css
deleted file mode 100644
index a8fb5f9e9c8e4c118e09ced4e3e09abf7c3002cb..0000000000000000000000000000000000000000
--- a/js/src/modals/ExecuteContract/executeContract.css
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.funcparams {
-  padding-left: 3em;
-}
-
-.gaseditor {
-  margin-top: 1em;
-}
-
-.paramname {
-  color: #aaa;
-}
-
-.modalbody,
-.modalcenter {
-}
-
-.modalcenter {
-  text-align: center;
-}
-
-.txhash {
-  word-break: break-all;
-}
-
-.warning {
-  border-radius: 0.5em;
-  background: #f80;
-  color: white;
-  font-size: 0.75em;
-  padding: 0.75em;
-  text-align: center;
-}
-
-.columns {
-  display: flex;
-  flex-wrap: wrap;
-  position: relative;
-
-  &>div {
-    flex: 0 1 50%;
-    width: 50%;
-    position: relative;
-  }
-}
diff --git a/js/src/modals/ExecuteContract/executeContract.js b/js/src/modals/ExecuteContract/executeContract.js
deleted file mode 100644
index 0f648dece5c96ad435a5cf73d34ec59cf21cd084..0000000000000000000000000000000000000000
--- a/js/src/modals/ExecuteContract/executeContract.js
+++ /dev/null
@@ -1,348 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import { toWei } from '~/api/util/wei';
-import { Button, GasPriceEditor, IdentityIcon, Portal, Warning } from '~/ui';
-import { CancelIcon, NextIcon, PrevIcon } from '~/ui/Icons';
-import { MAX_GAS_ESTIMATION } from '~/util/constants';
-import { validateAddress, validateUint } from '~/util/validation';
-import { parseAbiType } from '~/util/abi';
-import { setSender } from '~/util/tx';
-
-import AdvancedStep from './AdvancedStep';
-import DetailsStep from './DetailsStep';
-
-const STEP_DETAILS = 0;
-
-const TITLES = {
-  transfer: (
-    <FormattedMessage
-      id='executeContract.steps.transfer'
-      defaultMessage='function details'
-    />
-  ),
-  advanced: (
-    <FormattedMessage
-      id='executeContract.steps.advanced'
-      defaultMessage='advanced options'
-    />
-  )
-};
-const STAGES_BASIC = [TITLES.transfer];
-const STAGES_ADVANCED = [TITLES.transfer, TITLES.advanced];
-
-@observer
-class ExecuteContract extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired,
-    store: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object,
-    contract: PropTypes.object.isRequired,
-    fromAddress: PropTypes.string,
-    gasLimit: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onFromAddressChange: PropTypes.func.isRequired
-  };
-
-  gasStore = new GasPriceEditor.Store(this.context.api, { gasLimit: this.props.gasLimit });
-
-  state = {
-    advancedOptions: false,
-    amount: '0',
-    amountError: null,
-    fromAddressError: null,
-    func: null,
-    funcError: null,
-    step: STEP_DETAILS,
-    values: [],
-    valuesError: []
-  };
-
-  componentDidMount () {
-    const { contract } = this.props;
-    const functions = contract.functions
-      .filter((func) => !func.constant)
-      .sort((a, b) => (a.name || '').localeCompare(b.name || ''));
-
-    this.onFuncChange(null, functions[0]);
-  }
-
-  componentWillReceiveProps (newProps) {
-    if (newProps.fromAddress !== this.props.fromAddress) {
-      this.estimateGas(newProps.fromAddress);
-    }
-  }
-
-  render () {
-    const { advancedOptions, step } = this.state;
-    const steps = advancedOptions ? STAGES_ADVANCED : STAGES_BASIC;
-
-    return (
-      <Portal
-        activeStep={ step }
-        buttons={ this.renderDialogActions() }
-        onClose={ this.onClose }
-        open
-        steps={ steps }
-      >
-        { this.renderExceptionWarning() }
-        { this.renderStep() }
-      </Portal>
-    );
-  }
-
-  renderExceptionWarning () {
-    const { errorEstimated } = this.gasStore;
-
-    if (!errorEstimated) {
-      return null;
-    }
-
-    return (
-      <Warning warning={ errorEstimated } />
-    );
-  }
-
-  renderDialogActions () {
-    const { fromAddress } = this.props;
-    const { advancedOptions, step, fromAddressError, valuesError } = this.state;
-    const hasError = !!(fromAddressError || valuesError.find((error) => error));
-
-    const cancelBtn = (
-      <Button
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='executeContract.button.cancel'
-            defaultMessage='cancel'
-          />
-        }
-        icon={ <CancelIcon /> }
-        onClick={ this.onClose }
-      />
-    );
-    const postBtn = (
-      <Button
-        key='postTransaction'
-        label={
-          <FormattedMessage
-            id='executeContract.button.post'
-            defaultMessage='post transaction'
-          />
-        }
-        disabled={ hasError }
-        icon={ <IdentityIcon address={ fromAddress } button /> }
-        onClick={ this.postTransaction }
-      />
-    );
-    const nextBtn = (
-      <Button
-        key='nextStep'
-        label={
-          <FormattedMessage
-            id='executeContract.button.next'
-            defaultMessage='next'
-          />
-        }
-        icon={ <NextIcon /> }
-        onClick={ this.onNextClick }
-      />
-    );
-    const prevBtn = (
-      <Button
-        key='prevStep'
-        label={
-          <FormattedMessage
-            id='executeContract.button.prev'
-            defaultMessage='prev'
-          />
-        }
-        icon={ <PrevIcon /> }
-        onClick={ this.onPrevClick }
-      />
-    );
-
-    if (step === STEP_DETAILS) {
-      return [
-        cancelBtn,
-        advancedOptions ? nextBtn : postBtn
-      ];
-    }
-
-    return [
-      cancelBtn,
-      prevBtn,
-      postBtn
-    ];
-  }
-
-  renderStep () {
-    const { accounts, contract, fromAddress, onFromAddressChange } = this.props;
-    const { step } = this.state;
-
-    if (step === STEP_DETAILS) {
-      return (
-        <DetailsStep
-          { ...this.state }
-          accounts={ accounts }
-          contract={ contract }
-          fromAddress={ fromAddress }
-          onAmountChange={ this.onAmountChange }
-          onFromAddressChange={ onFromAddressChange }
-          onFuncChange={ this.onFuncChange }
-          onAdvancedClick={ this.onAdvancedClick }
-          onValueChange={ this.onValueChange }
-        />
-      );
-    }
-
-    return (
-      <AdvancedStep gasStore={ this.gasStore } />
-    );
-  }
-
-  onAmountChange = (amount) => {
-    this.gasStore.setEthValue(amount);
-    this.setState({ amount }, this.estimateGas);
-  }
-
-  onFuncChange = (event, func) => {
-    const values = (func.abi.inputs || []).map((input) => {
-      const parsedType = parseAbiType(input.type);
-
-      return parsedType.default;
-    });
-
-    this.setState({
-      func,
-      values
-    }, this.estimateGas);
-  }
-
-  onValueChange = (event, index, _value) => {
-    const { func, values, valuesError } = this.state;
-    const input = func.inputs.find((input, _index) => index === _index);
-    let value = _value;
-    let valueError = null;
-
-    switch (input.kind.type) {
-      case 'address':
-        valueError = validateAddress(_value).addressError;
-        break;
-
-      case 'uint':
-        valueError = validateUint(_value).valueError;
-        break;
-    }
-
-    values[index] = value;
-    valuesError[index] = valueError;
-
-    this.setState({
-      values: [].concat(values),
-      valuesError: [].concat(valuesError)
-    }, () => {
-      if (!valueError) {
-        this.estimateGas();
-      }
-    });
-  }
-
-  estimateGas = (_fromAddress) => {
-    const { fromAddress } = this.props;
-    const { amount, func, values } = this.state;
-    const options = {
-      gas: MAX_GAS_ESTIMATION,
-      from: _fromAddress || fromAddress,
-      value: toWei(amount || 0)
-    };
-
-    if (!func) {
-      return;
-    }
-
-    func
-      .estimateGas(options, values)
-      .then((gasEst) => {
-        const gas = gasEst.mul(1.2);
-
-        console.log(`estimateGas: received ${gasEst.toFormat(0)}, adjusted to ${gas.toFormat(0)}`);
-
-        this.gasStore.setEstimated(gasEst.toFixed(0));
-        this.gasStore.setGas(gas.toFixed(0));
-      })
-      .catch((error) => {
-        this.gasStore.setEstimatedError();
-        console.warn('estimateGas', error);
-      });
-  }
-
-  postTransaction = () => {
-    const { api } = this.context;
-    const { fromAddress } = this.props;
-    const { amount, func, values } = this.state;
-
-    const options = this.gasStore.overrideTransaction({
-      from: fromAddress,
-      value: api.util.toWei(amount || 0)
-    });
-
-    setSender(fromAddress);
-    func.postTransaction(options, values);
-    this.onClose();
-  }
-
-  onAdvancedClick = () => {
-    this.setState({
-      advancedOptions: !this.state.advancedOptions
-    });
-  }
-
-  onNextClick = () => {
-    this.setState({
-      step: this.state.step + 1
-    });
-  }
-
-  onPrevClick = () => {
-    this.setState({
-      step: this.state.step - 1
-    });
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-}
-
-function mapStateToProps (state) {
-  const { gasLimit } = state.nodeStatus;
-
-  return { gasLimit };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(ExecuteContract);
diff --git a/js/src/modals/ExecuteContract/executeContract.spec.js b/js/src/modals/ExecuteContract/executeContract.spec.js
deleted file mode 100644
index b093f78c707c8171ee5f9feeb07b0a7cde6f094e..0000000000000000000000000000000000000000
--- a/js/src/modals/ExecuteContract/executeContract.spec.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import ExecuteContract from './';
-
-import { createApi, CONTRACT, STORE } from './executeContract.test.js';
-
-let component;
-let onClose;
-let onFromAddressChange;
-
-function render (props) {
-  onClose = sinon.stub();
-  onFromAddressChange = sinon.stub();
-
-  component = shallow(
-    <ExecuteContract
-      { ...props }
-      contract={ CONTRACT }
-      onClose={ onClose }
-      onFromAddressChange={ onFromAddressChange }
-    />,
-      { context: { api: createApi(), store: STORE } }
-  ).find('ExecuteContract').shallow();
-
-  return component;
-}
-
-describe('modals/ExecuteContract', () => {
-  it('renders', () => {
-    expect(render({ accounts: {} })).to.be.ok;
-  });
-
-  describe('instance functions', () => {
-    beforeEach(() => {
-      render({
-        accounts: {}
-      });
-    });
-
-    describe('onValueChange', () => {
-      it('toggles boolean from false to true', () => {
-        component.setState({
-          func: CONTRACT.functions[0],
-          values: [false]
-        });
-        component.instance().onValueChange(null, 0, true);
-
-        expect(component.state().values).to.deep.equal([true]);
-      });
-    });
-  });
-});
diff --git a/js/src/modals/ExecuteContract/executeContract.test.js b/js/src/modals/ExecuteContract/executeContract.test.js
deleted file mode 100644
index 7b4fb9c3e0df2c32aa693c3d61f5a24f1612d5ee..0000000000000000000000000000000000000000
--- a/js/src/modals/ExecuteContract/executeContract.test.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import sinon from 'sinon';
-
-const CONTRACT = {
-  functions: [
-    {
-      name: 'test_a',
-      signature: 'test_a',
-      estimateGas: sinon.stub().resolves(new BigNumber(123)),
-      inputs: [
-        {
-          name: 'test_bool',
-          kind: {
-            type: 'bool'
-          }
-        }
-      ],
-      abi: {
-        inputs: [
-          {
-            name: 'test_bool',
-            type: 'bool'
-          }
-        ]
-      }
-    }
-  ]
-};
-
-const STORE = {
-  dispatch: sinon.stub(),
-  subscribe: sinon.stub(),
-  getState: () => {
-    return {
-      balances: {
-        balances: {}
-      },
-      nodeStatus: {
-        gasLimit: new BigNumber(123)
-      },
-      personal: {
-        accountsInfo: {}
-      },
-      settings: {
-        backgroundSeed: ''
-      },
-      registry: {
-        reverse: {}
-      }
-    };
-  }
-};
-
-function createApi (result = true) {
-  const sha3 = sinon.stub().resolves('0x0000000000000000000000000000000000000000');
-
-  sha3.text = sha3;
-  return {
-    parity: {
-      registryAddress: sinon.stub().resolves('0x0000000000000000000000000000000000000000')
-    },
-    util: { sha3 }
-  };
-}
-
-export {
-  createApi,
-  CONTRACT,
-  STORE
-};
diff --git a/js/src/modals/ExecuteContract/index.js b/js/src/modals/ExecuteContract/index.js
deleted file mode 100644
index f5fcd0e52bfd9f7eb557cc0bef02a201c20b6bb1..0000000000000000000000000000000000000000
--- a/js/src/modals/ExecuteContract/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './executeContract';
diff --git a/js/src/modals/ExportAccount/exportAccount.js b/js/src/modals/ExportAccount/exportAccount.js
deleted file mode 100644
index 48faaaec36e722788dd7a51ed914710cdc521d04..0000000000000000000000000000000000000000
--- a/js/src/modals/ExportAccount/exportAccount.js
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { newError } from '~/redux/actions';
-import { personalAccountsInfo } from '~/redux/providers/personalActions';
-import { AccountCard, Button, Portal, SelectionList } from '~/ui';
-import { CancelIcon, CheckIcon } from '~/ui/Icons';
-import ExportInput from './exportInput';
-import ExportStore from './exportStore';
-
-@observer
-class ExportAccount extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    balances: PropTypes.object.isRequired,
-    newError: PropTypes.func.isRequired,
-    personalAccountsInfo: PropTypes.func.isRequired,
-    onClose: PropTypes.func.isRequired
-  };
-
-  componentWillMount () {
-    const { accounts, newError } = this.props;
-
-    this.exportStore = new ExportStore(this.context.api, accounts, newError, null);
-  }
-
-  render () {
-    const { canExport } = this.exportStore;
-
-    return (
-      <Portal
-        buttons={ [
-          <Button
-            icon={ <CancelIcon /> }
-            key='cancel'
-            label={
-              <FormattedMessage
-                id='export.accounts.button.cancel'
-                defaultMessage='Cancel'
-              />
-            }
-            onClick={ this.onClose }
-          />,
-          <Button
-            disabled={ !canExport }
-            icon={ <CheckIcon /> }
-            key='execute'
-            label={
-              <FormattedMessage
-                id='export.accounts.button.export'
-                defaultMessage='Export'
-              />
-            }
-            onClick={ this.onExport }
-          />
-        ] }
-        onClose={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='export.accounts.title'
-            defaultMessage='Export an Account'
-          />
-        }
-      >
-        { this.renderList() }
-      </Portal>
-    );
-  }
-
-  renderList () {
-    const { accounts } = this.props;
-
-    const { selectedAccounts } = this.exportStore;
-
-    const accountList = Object.values(accounts)
-      .filter((account) => account.uuid)
-      .map((account) => {
-        account.checked = !!(selectedAccounts[account.address]);
-
-        return account;
-      });
-
-    return (
-      <SelectionList
-        items={ accountList }
-        noStretch
-        onSelectClick={ this.onSelect }
-        renderItem={ this.renderAccount }
-      />
-    );
-  }
-
-  renderAccount = (account) => {
-    const { balances } = this.props;
-    const balance = balances[account.address];
-    const { changePassword, getPassword } = this.exportStore;
-    const password = getPassword(account);
-
-    return (
-      <AccountCard
-        account={ account }
-        balance={ balance }
-      >
-        <div>
-          <ExportInput
-            account={ account }
-            value={ password }
-            onClick={ this.onClick }
-            onChange={ changePassword }
-          />
-        </div>
-      </AccountCard>
-    );
-  }
-
-  onSelect = (account) => {
-    this.exportStore.toggleSelectedAccount(account.address);
-  }
-
-  onClick = (address) => {
-    this.exportStore.onClick(address);
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-
-  onExport = () => {
-    this.exportStore.onExport();
-  }
-}
-
-function mapStateToProps (state) {
-  const { balances } = state;
-  const { accounts } = state.personal;
-
-  return {
-    accounts,
-    balances
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError,
-    personalAccountsInfo
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ExportAccount);
diff --git a/js/src/modals/ExportAccount/exportAccount.spec.js b/js/src/modals/ExportAccount/exportAccount.spec.js
deleted file mode 100644
index 7f185cc0715b10869f3c36445c755f7605a8a777..0000000000000000000000000000000000000000
--- a/js/src/modals/ExportAccount/exportAccount.spec.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import ExportAccount from './';
-
-const ADDRESS = '0x0123456789012345678901234567890123456789';
-
-let component;
-let NEWERROR;
-let PAI;
-let ONCLOSE;
-
-let reduxStore;
-
-function createReduxStore () {
-  reduxStore = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        balances: {
-          balances: {
-            [ADDRESS]: {}
-          }
-        },
-        personal: {
-          accounts: {
-            [ADDRESS]: {
-              address: ADDRESS
-            }
-          }
-        }
-      };
-    }
-  };
-
-  return reduxStore;
-}
-
-function render () {
-  component = shallow(
-    <ExportAccount
-      newError={ NEWERROR }
-      personalAccountsInfo={ PAI }
-      onClose={ ONCLOSE }
-    />,
-    {
-      context: { api: {}, store: createReduxStore() }
-    }
-  );
-
-  return component;
-}
-
-describe('CreateExportModal', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/ExportAccount/exportInput/exportInput.js b/js/src/modals/ExportAccount/exportInput/exportInput.js
deleted file mode 100644
index 07673b29b1c1562bba25e29393ab9465547202c9..0000000000000000000000000000000000000000
--- a/js/src/modals/ExportAccount/exportInput/exportInput.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { Input } from '~/ui/Form';
-
-export default class ExportInput extends Component {
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    onClick: PropTypes.func.isRequired,
-    onChange: PropTypes.func.isRequired,
-    value: PropTypes.string
-  };
-
-  render () {
-    const { value, onChange } = this.props;
-
-    return (
-      <Input
-        type='password'
-        label={
-          <FormattedMessage
-            id='export.setPassword.label'
-            defaultMessage='Password'
-          />
-        }
-        hint={
-          <FormattedMessage
-            id='export.setPassword.hint'
-            defaultMessage='Enter password Here'
-          />
-        }
-        value={ value }
-        onClick={ this.onClick }
-        onChange={ onChange }
-      />
-    );
-  }
-
-  onClick = (event) => {
-    const { account, onClick } = this.props;
-
-    event.stopPropagation();
-
-    onClick && onClick(account.address);
-  }
-}
diff --git a/js/src/modals/ExportAccount/exportInput/index.js b/js/src/modals/ExportAccount/exportInput/index.js
deleted file mode 100644
index fb685bf6b12d5635f69ab0c27e7b3ebfdd73c966..0000000000000000000000000000000000000000
--- a/js/src/modals/ExportAccount/exportInput/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './exportInput';
diff --git a/js/src/modals/ExportAccount/exportStore.js b/js/src/modals/ExportAccount/exportStore.js
deleted file mode 100644
index cba8d00a9564027c0fadf773964f6359efeb09d4..0000000000000000000000000000000000000000
--- a/js/src/modals/ExportAccount/exportStore.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-import FileSaver from 'file-saver';
-
-export default class ExportStore {
-  @observable canExport = false;
-  @observable selectedAccount = '';
-  @observable selectedAccounts = {};
-  @observable passwordInputs = {};
-
-  constructor (api, accounts, newError, address) {
-    this.accounts = accounts;
-    this._api = api;
-    this._newError = newError;
-    if (address) {
-      this.selectedAccounts[address] = true;
-      this.selectedAccount = address;
-    }
-  }
-
-  @action changePassword = (event, password) => {
-    this.passwordInputs[this.selectedAccount] = password;
-  }
-
-  @action getPassword = (address) => {
-    return this.passwordInputs[address];
-  }
-
-  @action onClick = (address) => {
-    this.selectedAccount = address;
-  }
-
-  @action resetAccountValue = () => {
-    this.passwordInputs[this.selectedAccount] = '';
-  }
-
-  @action setAccounts = (accounts) => {
-    this.accounts = accounts;
-  }
-
-  @action setSelectedAccount = (addr) => {
-    this.selectedAccounts[addr] = true;
-    this.canExport = true;
-  }
-
-  @action toggleSelectedAccount = (addr) => {
-    if (this.selectedAccounts[addr]) {
-      delete this.selectedAccounts[addr];
-    } else {
-      this.selectedAccounts[addr] = true;
-    }
-    this.canExport = false;
-    Object
-      .keys(this.selectedAccounts)
-      .forEach((address) => {
-        if (this.selectedAccounts[address]) {
-          this.canExport = true;
-        }
-      });
-  }
-
-  onExport = (event) => {
-    const { parity } = this._api;
-    const accounts = Object.keys(this.selectedAccounts);
-
-    accounts.forEach((address) => {
-      let password = this.passwordInputs[address];
-
-      parity
-        .exportAccount(address, password)
-        .then((content) => {
-          const text = JSON.stringify(content, null, 4);
-          const blob = new Blob([ text ], { type: 'application/json' });
-          const filename = this.accounts[address].uuid;
-
-          FileSaver.saveAs(blob, `${filename}.json`);
-
-          this.accountValue = '';
-          if (event) { event(); }
-        })
-        .catch((err) => {
-          const { name, meta } = this.accounts[address];
-          const { passwordHint } = meta;
-
-          this._newError({
-            message: `[${err.code}] Account "${name}" - Incorrect password. (Password Hint: ${passwordHint})`
-          });
-        });
-    });
-  }
-}
diff --git a/js/src/modals/ExportAccount/exportStore.spec.js b/js/src/modals/ExportAccount/exportStore.spec.js
deleted file mode 100644
index 08dcbddb85a2c01f0096a2a63e0a9628c6e1139f..0000000000000000000000000000000000000000
--- a/js/src/modals/ExportAccount/exportStore.spec.js
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import ExportStore from './exportStore';
-
-const ADDRESS = '0x00000123456789abcdef123456789abcdef123456789abcdef';
-const ADDRESS_2 = '0x123456789abcdef123456789abcdef123456789abcdef00000';
-const ACCOUNTS = { ADDRESS: {}, ADDRESS_2: {} };
-
-let api;
-let AccountStore;
-
-function createApi () {
-  return {
-    eth: {
-    },
-    parity: {
-      exportAccount: sinon.stub().resolves({})
-    }
-  };
-}
-
-function createMultiAccountStore (loadGeth) {
-  api = createApi();
-  AccountStore = new ExportStore(api, ACCOUNTS, null, null);
-
-  return AccountStore;
-}
-
-describe('modals/exportAccount/Store', () => {
-  beforeEach(() => {
-    createMultiAccountStore();
-  });
-
-  describe('constructor', () => {
-    it('insert api', () => {
-      expect(AccountStore._api).to.deep.equal(api);
-    });
-
-    it('insert accounts', () => {
-      expect(AccountStore.accounts).to.deep.equal(ACCOUNTS);
-    });
-
-    it('newError created', () => {
-      expect(AccountStore._newError).to.deep.equal(null);
-    });
-  });
-
-  describe('@action', () => {
-    describe('toggleSelectedAccount', () => {
-      it('Updates the selected accounts', () => {
-        // First set selectedAccounts
-        AccountStore.selectedAccounts = {
-          [ADDRESS]: true,
-          [ADDRESS_2]: false
-        };
-        // Toggle
-        AccountStore.toggleSelectedAccount(ADDRESS_2);
-        // Prep eqality
-        const eq = {
-          [ADDRESS]: true,
-          [ADDRESS_2]: true
-        };
-
-        // Check equality
-        expect(JSON.stringify(AccountStore.selectedAccounts)).to.deep.equal(JSON.stringify(eq));
-      });
-    });
-
-    describe('getPassword', () => {
-      it('Grab from the selected accounts input', () => {
-        // First set passwordInputs
-        AccountStore.passwordInputs = {
-          [ADDRESS]: 'abc'
-        };
-        // getPassword
-        const pass = AccountStore.getPassword(ADDRESS);
-
-        // Check equality
-        expect(AccountStore.passwordInputs[ADDRESS]).to.deep.equal(pass);
-      });
-    });
-
-    describe('setPassword & getPassword', () => {
-      it('First save the input of the selected account, than get the input.', () => {
-        // Set password
-        AccountStore.selectedAccount = ADDRESS;
-        // Set new pass
-        AccountStore.changePassword(null, 'abc');
-        // getPassword
-        const pass = AccountStore.getPassword(ADDRESS);
-
-        // Check equality
-        expect(AccountStore.passwordInputs[ADDRESS]).to.deep.equal(pass);
-      });
-    });
-
-    describe('changePassword', () => {
-      it('Change the stored value with the new input.', () => {
-        // First set selectedAccounts
-        AccountStore.selectedAccounts = {
-          [ADDRESS]: true,
-          [ADDRESS_2]: false
-        };
-        // First set passwordInputs
-        AccountStore.passwordInputs = {
-          [ADDRESS]: 'abc'
-        };
-        // 'Click' on the address:
-        AccountStore.onClick(ADDRESS);
-        // Change password
-        AccountStore.changePassword(null, '123');
-        // Check equality
-        expect(AccountStore.passwordInputs[ADDRESS]).to.deep.equal('123');
-      });
-    });
-  });
-});
diff --git a/js/src/modals/ExportAccount/index.js b/js/src/modals/ExportAccount/index.js
deleted file mode 100644
index eb61a884b8942124d860b2b23501163354a3610d..0000000000000000000000000000000000000000
--- a/js/src/modals/ExportAccount/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './exportAccount';
diff --git a/js/src/modals/Faucet/faucet.js b/js/src/modals/Faucet/faucet.js
deleted file mode 100644
index e4399e8ba57588c6ee945e9afe734d22a823dbd9..0000000000000000000000000000000000000000
--- a/js/src/modals/Faucet/faucet.js
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { txLink } from '~/3rdparty/etherscan/links';
-import { Button, ModalBox, Portal, ShortenedHash } from '~/ui';
-import { CloseIcon, DialIcon, DoneIcon, ErrorIcon, SendIcon } from '~/ui/Icons';
-
-import Store from './store';
-
-@observer
-export default class Faucet extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired
-  }
-
-  store = new Store(this.props.netVersion, this.props.address);
-
-  render () {
-    const { error, isBusy, isCompleted } = this.store;
-
-    let icon = <DialIcon />;
-
-    if (isCompleted) {
-      icon = error
-        ? <ErrorIcon />
-        : <DoneIcon />;
-    }
-
-    return (
-      <Portal
-        buttons={ this.renderActions() }
-        busy={ isBusy }
-        isSmallModal
-        onClose={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='faucet.title'
-            defaultMessage='Kovan ETH Faucet'
-          />
-        }
-      >
-        <ModalBox
-          icon={ icon }
-          summary={
-            isCompleted
-              ? this.renderSummaryDone()
-              : this.renderSummaryRequest()
-          }
-        />
-      </Portal>
-    );
-  }
-
-  renderActions = () => {
-    const { canTransact, isBusy, isCompleted } = this.store;
-
-    return isCompleted || isBusy
-      ? (
-        <Button
-          disabled={ isBusy }
-          icon={ <DoneIcon /> }
-          key='done'
-          label={
-            <FormattedMessage
-              id='faucet.buttons.done'
-              defaultMessage='close'
-            />
-          }
-          onClick={ this.onClose }
-        />
-      )
-      : [
-        <Button
-          icon={ <CloseIcon /> }
-          key='close'
-          label={
-            <FormattedMessage
-              id='faucet.buttons.close'
-              defaultMessage='close'
-            />
-          }
-          onClick={ this.onClose }
-        />,
-        <Button
-          disabled={ !canTransact }
-          icon={ <SendIcon /> }
-          key='request'
-          label={
-            <FormattedMessage
-              id='faucet.buttons.request'
-              defaultMessage='request'
-            />
-          }
-          onClick={ this.onExecute }
-        />
-      ];
-  }
-
-  renderSummaryDone () {
-    const { error, responseText, responseTxHash } = this.store;
-
-    return (
-      <div>
-        <FormattedMessage
-          id='faucet.summary.done'
-          defaultMessage='Your Kovan ETH has been requested from the faucet which responded with -'
-        />
-        {
-          error
-            ? (
-              <p>{ error }</p>
-            )
-            : (
-              <p>
-                <span>{ responseText }&nbsp;</span>
-                <a href={ txLink(responseTxHash, false, '42') } target='_blank'>
-                  <ShortenedHash data={ responseTxHash } />
-                </a>
-              </p>
-            )
-        }
-      </div>
-    );
-  }
-
-  renderSummaryRequest () {
-    return (
-      <FormattedMessage
-        id='faucet.summary.info'
-        defaultMessage='To request a deposit of Kovan ETH to this address, you need to ensure that the address is sms-verified on the mainnet. Once executed the faucet will deposit Kovan ETH into the current account.'
-      />
-    );
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-
-  onExecute = () => {
-    return this.store.makeItRain();
-  }
-}
diff --git a/js/src/modals/Faucet/index.js b/js/src/modals/Faucet/index.js
deleted file mode 100644
index 9aaa695dc862db5652e91c4bbe851122950ce3b6..0000000000000000000000000000000000000000
--- a/js/src/modals/Faucet/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './faucet';
diff --git a/js/src/modals/Faucet/store.js b/js/src/modals/Faucet/store.js
deleted file mode 100644
index 356a4c080c403be5e0460d85e1144c43cae10462..0000000000000000000000000000000000000000
--- a/js/src/modals/Faucet/store.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, observable, transaction } from 'mobx';
-import apiutil from '~/api/util';
-
-const ENDPOINT = 'http://faucet.kovan.network/api/';
-
-export default class Store {
-  @observable addressReceive = null;
-  @observable addressVerified = null;
-  @observable error = null;
-  @observable responseText = null;
-  @observable responseTxHash = null;
-  @observable isBusy = false;
-  @observable isCompleted = false;
-  @observable isDestination = false;
-  @observable isDone = false;
-
-  constructor (netVersion, address) {
-    transaction(() => {
-      this.setDestination(netVersion === '42');
-
-      this.setAddressReceive(address);
-      this.setAddressVerified(address);
-    });
-  }
-
-  @computed get canTransact () {
-    return !this.isBusy && this.addressReceiveValid && this.addressVerifiedValid;
-  }
-
-  @computed get addressReceiveValid () {
-    return apiutil.isAddressValid(this.addressReceive);
-  }
-
-  @computed get addressVerifiedValid () {
-    return apiutil.isAddressValid(this.addressVerified);
-  }
-
-  @action setAddressReceive = (address) => {
-    this.addressReceive = address;
-  }
-
-  @action setAddressVerified = (address) => {
-    this.addressVerified = address;
-  }
-
-  @action setBusy = (isBusy) => {
-    this.isBusy = isBusy;
-  }
-
-  @action setCompleted = (isCompleted) => {
-    transaction(() => {
-      this.setBusy(false);
-      this.isCompleted = isCompleted;
-    });
-  }
-
-  @action setDestination = (isDestination) => {
-    this.isDestination = isDestination;
-  }
-
-  @action setError = (error) => {
-    if (error.indexOf('not certified') !== -1) {
-      this.error = `${error}. Please ensure that this account is sms certified on the mainnet.`;
-    } else {
-      this.error = error;
-    }
-  }
-
-  @action setResponse = (response) => {
-    this.responseText = response.result;
-    this.responseTxHash = response.tx;
-  }
-
-  makeItRain = () => {
-    this.setBusy(true);
-
-    const options = {
-      method: 'GET',
-      mode: 'cors'
-    };
-    const url = `${ENDPOINT}${this.addressVerified}`;
-
-    return fetch(url, options)
-      .then((response) => {
-        if (!response.ok) {
-          return null;
-        }
-
-        return response.json();
-      })
-      .catch(() => {
-        return null;
-      })
-      .then((response) => {
-        transaction(() => {
-          if (!response || response.error) {
-            this.setError(
-              response
-                ? response.error
-                : 'Unable to complete request to the faucet, the server may be unavailable. Please try again later.'
-            );
-          } else {
-            this.setResponse(response);
-          }
-
-          this.setCompleted(true);
-        });
-      });
-  }
-}
diff --git a/js/src/modals/FirstRun/Completed/completed.js b/js/src/modals/FirstRun/Completed/completed.js
deleted file mode 100644
index 34c48a5cf21ab5ee0e1c3a03e8c3c057524fea2b..0000000000000000000000000000000000000000
--- a/js/src/modals/FirstRun/Completed/completed.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import styles from '../firstRun.css';
-
-export default class Completed extends Component {
-  render () {
-    return (
-      <div className={ styles.completed }>
-        <p>
-          <FormattedMessage
-            id='firstRun.completed.congrats'
-            defaultMessage='Congratulations! Your node setup has been completed successfully and you are ready to use the application.'
-          />
-        </p>
-        <p>
-          <FormattedMessage
-            id='firstRun.completed.next'
-            defaultMessage='Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.'
-          />
-        </p>
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/FirstRun/Completed/index.js b/js/src/modals/FirstRun/Completed/index.js
deleted file mode 100644
index 5df1b6d7f7a3dd16839e4bdfec6d409f857a2d9c..0000000000000000000000000000000000000000
--- a/js/src/modals/FirstRun/Completed/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './completed';
diff --git a/js/src/modals/FirstRun/TnC/index.js b/js/src/modals/FirstRun/TnC/index.js
deleted file mode 100644
index 65c46e47890de9dc4c309fdfb2fafede2d4b2a61..0000000000000000000000000000000000000000
--- a/js/src/modals/FirstRun/TnC/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './tnc';
diff --git a/js/src/modals/FirstRun/TnC/tnc.js b/js/src/modals/FirstRun/TnC/tnc.js
deleted file mode 100644
index 01651f0f451a37d12b6d7e831e573a717d6de6f2..0000000000000000000000000000000000000000
--- a/js/src/modals/FirstRun/TnC/tnc.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import ReactMarkdown from 'react-markdown';
-import { Checkbox } from 'material-ui';
-
-import styles from '../firstRun.css';
-
-let tnc = '';
-
-if (process.env.NODE_ENV !== 'test') {
-  tnc = require('./tnc.md');
-}
-
-export default class TnC extends Component {
-  static propTypes = {
-    hasAccepted: PropTypes.bool.isRequired,
-    onAccept: PropTypes.func.isRequired
-  }
-
-  render () {
-    const { hasAccepted, onAccept } = this.props;
-
-    return (
-      <div className={ styles.tnc }>
-        <ReactMarkdown
-          className={ styles.markdown }
-          source={ tnc }
-        />
-        <Checkbox
-          className={ styles.accept }
-          label={
-            <FormattedMessage
-              id='firstRun.tnc.accept'
-              defaultMessage='I accept these terms and conditions'
-            />
-          }
-          checked={ hasAccepted }
-          onCheck={ onAccept }
-        />
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/FirstRun/TnC/tnc.md b/js/src/modals/FirstRun/TnC/tnc.md
deleted file mode 100644
index 42ff3beef3b3982d02655d2056b7c1eaa41ae2ce..0000000000000000000000000000000000000000
--- a/js/src/modals/FirstRun/TnC/tnc.md
+++ /dev/null
@@ -1,215 +0,0 @@
-# LEGAL WARNING SHORT VERSION
-
-## Disclaimer of Liability and Warranties
-
-- The user expressly acknowledges and agrees that Parity Technologies Limited makes the Parity client available to the user at the user&#39;s sole risk.
-
-- The user represents that the user has an adequate understanding of the risks, usage and intricacies of cryptographic tokens and blockchain-based open source software, eth platform and eth.
-
-- The user acknowledges and agrees that, to the fullest extent permitted by any applicable law, the disclaimers of liability contained herein apply to any and all damages or injury whatsoever caused by or related to risks of, use of, or inability to use, the Parity client under any cause or action whatsoever of any kind in any jurisdiction, including, without limitation, actions for breach of warranty, breach of contract or tort (including negligence) and that Parity Technologies Limited shall not be liable for any indirect, incidental, special, exemplary or consequential damages, including for loss of profits, goodwill or data.
-
-- Some jurisdictions do not allow the exclusion of certain warranties or the limitation or exclusion of liability for certain types of damages. Therefore, some of the above limitations in this section may not apply to a user. In particular, nothing in these terms shall affect the statutory rights of any user or limit or exclude liability for death or physical injury arising from the negligence or wilful misconduct of Parity Technologies Limited or for fraud or fraudulent misrepresentation.
-
-- All rights reserved by Parity Technologies Limited. Licensed to the public under the GPL v3: [https://www.gnu.org/licenses/gpl-3.0.txt](http://www.gnu.org/licenses/gpl-3.0.txt)
-
-# LEGAL WARNING LONG VERSION
-
-The following Terms and Conditions (&quot;Terms&quot;) govern the use of Parity Technologies Limited&#39;s open source software product (&quot;Parity&quot;). Prior to any use of Parity or any of Parity Technologies Limited&#39;s products (&quot;Parity Technologies&#39; Products&quot;), you (&quot;User&quot; or &quot;you&quot;) confirm on your own behalf and on behalf of anyone who uses Parity on your behalf that you (and they) understand, expressly agree to and will comply with all of the Terms. All capitalized words and expressions in these Terms will have the effect and meaning given to them in the Terms. The group of developers and other personnel that is now, or will be, employed by, or contracted with, or affiliated with, Parity Technologies Limited (&quot;Parity Technologies&quot; or &quot;we&quot;) is termed the &quot;Parity Technologies Team&quot;.
-
-## Acknowledgement of Risks
-
-The User acknowledges the following serious risks to any use of Parity and expressly agrees not to hold liable Parity Technologies or the Parity Technologies Team should any of these risks occur:
-
-## Risk of Security Weaknesses in the Parity Core Infrastructure Software
-
-Parity uses open-source libraries and components developed by third parties. While Parity Technologies Limited generally aims to use only widely adopted open-source technology and develop it in line with industry standards, such open-source technology may contain bugs and errors and may not function correctly in all circumstances. As a result, there is a risk that Parity Technologies or the Parity Technologies Team may have introduced unintentional weaknesses or bugs into the core infrastructural elements of Parity causing the system to lose Ethereum tokens (&quot;ETH&quot;) stored in one or more User accounts or other accounts or lose sums of other valued tokens.
-
-## Risk of Weaknesses or Exploitable Breakthroughs in the Field of Cryptography
-
-Cryptography is an art, not a science, and the state of the art can advance over time. Advances in code cracking, or technical advances such as the development of quantum computers, could present risks to cryptocurrencies and Parity, which could result in the theft or loss of ETH. To the extent possible, Parity Technologies intends to update the protocol underlying Parity to account for any advances in cryptography and to incorporate additional security measures, but it cannot predict the future of cryptography or guarantee that any security updates will be made, timely or successful.
-
-## Risk of Ether Mining Attacks
-
-As with other cryptocurrencies, the blockchain accessed by Parity is susceptible to mining attacks, including but not limited to double-spend attacks, majority mining power attacks, &quot;selfish-mining&quot; attacks, and race condition attacks. Any successful attacks present a risk to the Ethereum ecosystem, expected proper execution and sequencing of ETH transactions, and expected proper execution and sequencing of contract computations. Despite the efforts of Parity Technologies and the Parity Technologies Team, known or novel mining attacks may be successful.
-
-## Risk of Rapid Adoption and Insufficiency of Computational Application Processing Power on the
-
-## Ethereum Network
-
-If Ethereum is rapidly adopted, the demand for transaction processing and distributed application computations could rise dramatically and at a pace that exceeds the rate with which ETH miners can bring online additional mining power. Under such a scenario, the entire Ethereum ecosystem could become destabilized, due to the increased cost of running distributed applications. In turn, this could dampen interest in the Ethereum ecosystem and ETH. Insufficiency of computational resources and an associated rise in the price of ETH could result in businesses being unable to acquire scarce computational resources to run their distributed applications. This would represent revenue losses to businesses or worst case, cause businesses to cease operations because such operations have become uneconomical due to distortions in the crypto-economy.
-
-## Risk of temporary network incoherence
-
-We recommend any groups handling large or important transactions to maintain a voluntary 24 hour waiting period on any ETH deposited. If we become aware that the integrity of the network is at risk due to issues with Parity, we will endeavour to publish patches in a timely fashion to address the issues. We will endeavour to provide solutions within the voluntary 24 hour waiting period.
-
-## Use of Parity by you
-
-You agree to use Parity only for purposes that are permitted by (a) these Terms (including the Software Licence Terms, as defined below) and (b) any applicable law or regulation in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United Kingdom or other relevant countries).
-
-You agree that you will not engage in any activity that: (1) interferes with or disrupts Parity&#39;s or Parity Technologies&#39; Products&#39; functioning (or the networks which are connected to Parity), or (2) is calculated or likely to do so.
-
-Unless you have been specifically permitted to do so in a separate agreement with Parity Technologies, you agree that you will not reproduce, duplicate, copy, sell, trade or resell Parity or Parity Technologies&#39; Products for any purpose unless than in accordance with the terms of the software licence terms available here: https [://www.gnu.org/licenses/gpl-3.0.txt](http://www.gnu.org/licenses/gpl-3.0.txt)(&quot;Software Licence Terms&quot;).
-
-You agree that you are solely responsible for (and that Parity Technologies has no responsibility to you or to any third party for) any breach of your obligations under these Terms and for the consequences (including any loss or damage which Parity Technologies may suffer) of any such breach.
-
-## Privacy and your personal information
-
-You agree to the use of your data (if any is gathered) in accordance with Parity Technologies&#39; privacy policies: [https://parity.io/legal.html](https://parity.io/legal.html). This policy explains how Parity Technologies treats your personal information (if any is gathered), and protects your privacy, when you use Parity Technologies&#39; Products.
-
-## Content in Parity
-
-You understand that all information and data (such as smart contracts, data files, written text, computer software, music, audio files or other sounds, photographs, videos or other images) which you may have access to as part of, or through your use of, Parity or Parity Technologies&#39; Products are the sole responsibility of the person from which such content originated. All such information is referred to below as &quot;Content&quot;.
-
-You should be aware that Content presented to you through Parity or Parity Technologies&#39; Products, including but not limited to any advertisements and any sponsored Content within Parity, may be protected by intellectual property rights which are owned by the possible sponsors or advertisers who may provide that Content to Parity Technologies (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this Content (either in whole or in part) unless you have been specifically told that you may do so by Parity Technologies or by the owners of that Content, in a separate agreement.
-
-Parity Technologies reserves the right (but shall have no obligation) to pre-screen, review, flag, filter, modify, refuse or remove any or all Content presented.
-
-You understand that by using Parity or Parity Technologies&#39; Products you may be exposed to Content that you may find offensive, indecent or objectionable and that, in this additional respect, you use Parity or Parity Technologies&#39; Products at your own risk.
-
-You agree that you are solely responsible for (and that Parity Technologies has no responsibility to you or to any third party for) any Content that you create, transmit or display while using Parity or Parity Technologies&#39; Products and for the consequences of your actions (including any loss or damage which Parity Technologies may suffer) by doing so.
-
-## Proprietary rights
-
-You acknowledge and agree that Parity Technologies owns all legal right, title and interest in and to Parity and Parity Technologies&#39; Products, including any intellectual property rights which subsist in Parity and Parity Technologies&#39; Products (whether those rights happen to be registered or not, and wherever in the world those rights may exist).
-
-Unless you have agreed otherwise in writing with Parity Technologies, nothing in the Terms gives you a right to use any of Parity Technologies&#39; trade names, trade marks, service marks, logos, domain names, and other distinctive brand features.
-
-If you have been given an explicit right to use any of these brand features in a separate written agreement with Parity Technologies, then you agree that your use of such features shall be in compliance with that agreement, any applicable provisions of these Terms, and Parity Technologies&#39; brand feature use guidelines as updated from time to time. These guidelines can be viewed online at https://parity.io/press.html.
-
-You retain copyright and any other rights you already hold in Content which you submit, post or display on or through, Parity. By posting Content, you grant to Parity Technologies a perpetual, royalty-free, non-exclusive, and irrevocable right and licence to use such Content in connection with its provision of Parity and Parity Technologies&#39; Products. Parity Technologies acknowledges and agrees that, except as expressly provided in these Terms or the Software Licence Terms, it obtains no right, title or interest from you (or your licensors) in or to any Content that you submit, post, transmit or display on, or through, Parity, including any intellectual property rights which subsist in that Content (whether those rights happen to be registered or not, and wherever in the world those rights may exist). Unless you have agreed otherwise in writing with Parity Technologies, you agree that you are responsible for protecting and enforcing those rights and that Parity Technologies has no obligation to do so on your behalf.
-
-You agree that you shall not remove, obscure, or alter any proprietary rights notices (including copyright and trade mark notices) which may be affixed to or contained within Parity or Parity Technologies&#39; Products.
-
-Unless you have been expressly authorized to do so in writing by Parity Technologies, you agree that in using Parity, you will not use any trade mark, service mark, trade name, logo of any company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
-
-## License Restrictions from Parity Technologies
-
-You may not (and you may not permit anyone else to) copy, modify, create a derivative work of, reverse engineer, decompile or otherwise attempt to extract the source code of Parity, Parity Technologies&#39; Products or any part thereof, unless this is expressly permitted by our Software Licence Terms or required by law, or unless you have been specifically told that you may do so by Parity Technologies, in writing.
-
-Unless Parity Technologies has given you specific written permission to do so, you may not assign (or grant a sub- licence of) your rights to use Parity Technologies&#39; Products, grant a security interest in or over your rights to use Parity Technologies&#39; Products, or otherwise transfer any part of your rights to use Parity Technologies&#39; Products.
-
-## Software updates
-
-Parity may automatically download and install updates from time to time from Parity Technologies. These updates are designed to improve, enhance and further develop Parity and may take the form of bug fixes, enhanced functions, new software modules and completely new versions. You agree to receive such updates (and permit Parity Technologies to deliver these to you) as part of your use of Parity and Parity Technologies&#39; Products.
-
-## Ending your relationship with Parity Technologies
-
-The Terms will continue to apply until terminated by either you or Parity Technologies as set out below. You may at any time, terminate your legal agreement with Parity Technologies. Parity Technologies may at any time, terminate its legal agreement with you if:
-
-(A) you have breached any provision of these Terms (or have acted in manner which indicates that you do not intend to, or are unable to comply with the provisions of these terms); or
-
-(B) Parity Technologies is required to do so by law (for example, where the provision of Parity or any of Parity Technologies&#39; Products to you is, or becomes, unlawful); or
-
-(C) any partner with whom Parity Technologies offered products or services to you has terminated its relationship with Parity Technologies or ceased to offer products or services to you; or
-
-(D) Parity Technologies is transitioning to no longer providing products or services to users in the country in which you are resident or from which you use the service; or
-
-(E) the provision of products or services to you by Parity Technologies is, in Parity Technologies&#39; opinion, no longer commercially viable.
-
-When these Terms come to an end for any reason:
-
-(A) you must immediately cease use of Parity and Parity Technologies&#39; Products;
-
-(B) you must delete or remove Parity or Parity Technologies&#39; Products from all computer equipment in your possession or under your control; and
-
-(C) all of the rights granted to you in these Terms shall cease.
-
-Except as set out above, termination of these Terms shall not affect any rights, remedies, obligations and liabilities that have accrued to you or Parity Technologies up to the date of termination, including the right to claim damages in respect of any breach of these Terms which existed at or before the date of termination, and the courts of England and Wales shall continue to have jurisdiction in respect of such rights, obligations and liabilities indefinitely.
-
-## Acknowledgement and acceptance of all risks, exclusion of warranties
-
-The User expressly acknowledges and agrees that the User is using Parity and Parity Technologies&#39; Products at the User&#39;s sole risk. The User represents that the User has an adequate understanding of the risks, usage and intricacies of cryptographic tokens and blockchain-based open source software.
-
-You expressly understand and agree that Parity and Parity Technologies&#39; Products are provided &quot;as is&quot; and &quot;as available.&quot;
-
-Parity Technologies, its subsidiaries and affiliates, and its licensors do not represent or warrant to you that:
-
-(a) your use of Parity or Parity Technologies&#39; Products will meet your requirements,
-
-(b) your use of Parity or Parity Technologies&#39; Products will be uninterrupted, timely, secure or free from error,
-
-(c) any information obtained by you as a result of your use of Parity or Parity Technologies&#39; Products will be accurate or reliable, or
-
-(d) defects in the operation or functionality of any software provided to you as part of Parity Technologies&#39; Products will be corrected.
-
-Any material downloaded or otherwise obtained through the use of Parity or Parity Technologies&#39; Products is done at your own discretion and risk and you will be solely responsible for any damage to your computer system or other device or loss of data or economic loss that results from the download of any such material.
-
-No advice or information, whether oral or written, obtained by you from Parity Technologies or through or from Parity Technologies&#39; Products shall create any warranty not expressly stated in the Terms.
-
-To the fullest extent permitted by applicable law, Parity Technologies expressly disclaims all implied warranties and conditions of any kind including, but not limited to, implied statutory warranties and conditions of merchantability, fitness for a particular purpose and non-infringement.
-
-## Exclusion and limitation of liability
-
-The User acknowledges and agrees that, to the fullest extent permitted by any applicable law, the disclaimers and exclusion of liability contained herein apply to any and all damages or injury whatsoever caused by or related to risks of, use of, or inability to use, Parity under any cause of action whatsoever of any kind in any jurisdiction, including, without limitation, actions for breach of warranty, breach of contract or tort (including negligence).
-
-Some jurisdictions do not allow the exclusion of certain warranties or the limitation or exclusion of liability for certain types of damages. Therefore, some of the above limitations in this section may not apply to you. In particular, nothing in these terms shall affect the statutory rights of any User or limit or exclude liability for death or physical injury arising from the negligence or wilful misconduct of Parity Technologies or for fraud or fraudulent misrepresentation.
-
-Subject to any liability which may not be excluded, you expressly understand and agree that Parity Technologies, its subsidiaries and affiliates, and its licensors shall not be liable to you for:
-
-(a) any direct, indirect, incidental, special consequential or exemplary damages which may be incurred by you, however caused and under any theory of liability. This shall include, but not be limited to, any loss of profit (whether incurred directly or indirectly), any loss of goodwill or business reputation, any loss of data suffered, cost of procurement of substitute goods or services, or other intangible loss; or
-
-(b) any loss or damage which may be incurred by you, including but not limited to loss or damage as a result of:
-
-(i) any reliance placed by you on the completeness, accuracy or existence of any advertising, or as a result of any relationship or transaction between you and any advertiser or sponsor whose advertising appears on Parity Technologies&#39; Products;
-
-(ii) any changes which Parity Technologies may make to Parity Technologies&#39; Products, or for any permanent or temporary cessation in the provision of Parity Technologies&#39; Products (or any features within Parity Technologies&#39; Products);
-
-(iii) the deletion of, corruption of, or failure to store, any content and other communications data maintained or transmitted by or through your use of Parity Technologies&#39; Products;
-
-(iv) your failure to provide Parity Technologies with accurate account information (if this is required); and
-
-(v) your failure to keep your password or account details secure and confidential.
-
-The limitations on Parity Technologies&#39; liability to you shall apply whether or not Parity Technologies has been advised of or should have been aware of the possibility of any such losses arising.
-
-## Copyright and trade mark policies
-
-It is Parity Technologies&#39; policy to respond to notices of alleged copyright infringement that comply with applicable international intellectual property law (including, in the United States, the Digital Millennium Copyright Act) where Parity Technologies is put on notice and it is under Parity Technologies&#39; control. In such cases Parity Technologies shall be entitled to terminate the accounts of repeat infringers.
-
-## Possible Advertisements
-
-Products or services provided may be supported by advertising revenue and may display advertisements and promotions. These advertisements may be targeted to the content of information stored on products or services, queries made through the products or services or other information.
-
-The manner, mode and extent of advertising by Parity Technologies on Parity Technologies&#39; Products are subject to change without specific notice to you.
-
-You agree that Parity Technologies may place such advertising on products and services accessed to you through Parity Technologies&#39; products.
-
-## Other content
-
-Parity Technologies&#39; services provided may include hyperlinks to other web sites, smart contracts or content or resources. Parity Technologies may have no control over any web sites or resources which are provided by companies or persons other than Parity Technologies.
-
-You acknowledge and agree that Parity Technologies is not responsible for the availability of any such external sites or resources, and does not endorse any advertising, products or other materials on or available from such web sites or resources.
-
-You acknowledge and agree that Parity Technologies is not liable for any loss or damage which may be incurred by you as a result of the availability of those external sites or resources, or as a result of any reliance placed by you on the completeness, accuracy or existence of any advertising, products or other materials on, or available from, such web sites or resources.
-
-## Changes to the Terms
-
-Parity Technologies may make changes to these Terms from time to time. When these changes are made, Parity Technologies will make a new copy of these Terms available at [https://parity.io/legal.html](https://parity.io/legal.html)and any new terms will be made available to you from within, or through, Parity or the affected Parity Technologies&#39; Product.
-
-You understand and agree that if you use Parity or Parity Technologies&#39; Products after the date on which the Terms have changed, Parity Technologies will treat your use as acceptance of the updated terms.
-
-## General legal terms
-
-Sometimes when you use Parity or Parity Technologies&#39; Products, you may (as a result of, or in connection with your use of these products) use a service or download a piece of software, or smart contract, or purchase goods, which are provided by another person or company. Your use of these other services, software, smart contract or goods may be subject to separate terms between you and the company or person concerned. If so, these Terms do not affect your legal relationship with these other companies or individuals.
-
-These Terms (including the Software Licence Terms) constitute the whole legal agreement between you and Parity Technologies and govern your use of Parity and Parity Technologies&#39; Products (but excluding any products or services which Parity Technologies may provide to you under a separate written agreement), and completely replace any prior agreements between you and Parity Technologies in relation to Parity and Parity Technologies&#39; Products.
-
-You agree that Parity Technologies may provide you with notices, including those regarding changes to the Terms, by postings on Parity or the affected Parity Technologies&#39; Product.
-
-You agree that if Parity Technologies does not exercise or enforce any legal right or remedy which is contained in these Terms (or which Parity Technologies has the benefit of under any applicable law), this will not be taken to be a formal waiver of Parity Technologies&#39; rights and that those rights or remedies will still be available to Parity Technologies.
-
-If any court of law, having the jurisdiction to decide on this matter, rules that any provision of these Terms is invalid, then that provision will be removed from the Terms without affecting the rest of the Terms. The remaining provisions of the Terms will continue to be valid and enforceable.
-
-You acknowledge and agree that each member of the group of companies of which Parity Technologies is the parent shall be third party beneficiaries to these Terms and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the Terms which confers a benefit on (or rights in favour of) them. Other than this, no other person or company shall be third party beneficiaries to these Terms.
-
-These Terms, and your relationship with Parity Technologies under these Terms, shall be governed by the laws of England and Wales, United Kingdom. You and Parity Technologies agree to submit to the exclusive jurisdiction of the courts located within England, United Kingdom to resolve any legal matter arising from these Terms (subject to the Dispute Resolution clause below). Notwithstanding this, you agree that Parity Technologies shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-## Dispute Resolution
-
-All disputes or claims arising out of, relating to, or in connection with the Terms, the breach thereof, or use of Parity shall be finally settled under the Rules of Arbitration of the International Chamber of Commerce by one or more arbitrators appointed in accordance with said Rules. All claims between the parties relating to these Terms that are capable of being resolved by arbitration, whether sounding in contract, tort, or otherwise, shall be submitted to ICC arbitration. Prior to commencing arbitration, the parties have a duty to negotiate in good faith and attempt to resolve their dispute in a manner other than by submission to ICC arbitration. The arbitration panel shall consist of one arbitrator only, unless the ICC Court of Arbitration determines that the dispute is such as to warrant three arbitrators. If the Court determines that one arbitrator is sufficient, then such arbitrator shall be a UK resident. If the Court determines that three arbitrators are necessary, then each party shall have 30 days to nominate an arbitrator of its choice - in the case of the Claimant, measured from receipt of notification of the ICC Court&#39;s decision to have three arbitrators; in the case of Respondent, measured from receipt of notification of Claimant&#39;s nomination. All nominations must be UK residents. If a party fails to nominate an arbitrator, the Court will do so. The Court shall also appoint the chairman. All arbitrators shall be and remain &quot;independent&quot; of the parties involved in the arbitration. The place of arbitration shall be England, United Kingdom. The language of the arbitration shall be English. In deciding the merits of the dispute, the tribunal shall apply the laws of England and Wales and any discovery shall be limited and shall not involve any depositions or any other examinations outside of a formal hearing. The tribunal shall not assume the powers of amiable compositeur or decide the case ex aequo et bono. In the final award, the tribunal shall fix the costs of the arbitration and decide which of the parties shall bear such costs in what proportion. Every award shall be binding on the parties. The parties undertake to carry out the award without delay and waive their right to any form of recourse against the award in so far as such waiver can validly be made. Notwithstanding the foregoing, either party shall be entitled at any time to apply to the courts of England, United Kingdom for injunctive relief, or where a claim is incapable of being resolved by arbitration.
-
-## Additional Terms for Enterprise Use
-
-If you are a business entity, then the individual accepting on behalf of the entity (for the avoidance of doubt, for business entities, in these Terms, &quot;you&quot; means the entity) represents and warrants that he or she has the authority to act on your behalf, that you represent that you are duly authorized to do business in the country or countries where you operate, and that your employees, officers, representatives, and other agents accessing Parity Technologies&#39; Products are duly authorized to access Parity and to legally bind you to these Terms.
-
-Subject to these Terms and subject to the Software Licence Terms, Parity Technologies grants you a non-exclusive, non-transferable licence to use Parity solely on machines intended for use by your employees, officers, representatives, and agents in connection with your business entity, and provided that their use of Parity Technologies will be subject to these Terms (including the Software Licence Terms).
diff --git a/js/src/modals/FirstRun/Welcome/index.js b/js/src/modals/FirstRun/Welcome/index.js
deleted file mode 100644
index 52dca2471eda87361963a1faeafc7f407257f326..0000000000000000000000000000000000000000
--- a/js/src/modals/FirstRun/Welcome/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './welcome';
diff --git a/js/src/modals/FirstRun/Welcome/welcome.js b/js/src/modals/FirstRun/Welcome/welcome.js
deleted file mode 100644
index 3ad4b84c1d61f8f70103acf1d17cd8a91ea66235..0000000000000000000000000000000000000000
--- a/js/src/modals/FirstRun/Welcome/welcome.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import imagesEthcore from '~/../assets/images/parity-logo-white.svg';
-
-import styles from '../firstRun.css';
-
-const LOGO_STYLE = {
-  float: 'right',
-  maxWidth: '10em',
-  height: 'auto',
-  margin: '0 1.5em'
-};
-
-export default class FirstRun extends Component {
-  render () {
-    return (
-      <div className={ styles.welcome }>
-        <img
-          src={ imagesEthcore }
-          alt='Parity Ltd.'
-          style={ LOGO_STYLE }
-        />
-        <p>
-          <FormattedMessage
-            id='firstRun.welcome.greeting'
-            defaultMessage='Welcome to Parity, the fastest and simplest way to run your node.'
-          />
-        </p>
-        <p>
-          <FormattedMessage
-            id='firstRun.welcome.description'
-            defaultMessage='As part of a new installation, the next few steps will guide you through the process of setting up your Parity instance and your associated accounts. Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us. Once completed you will have -'
-          />
-        </p>
-        <div>
-          <ul>
-            <li>
-              <FormattedMessage
-                id='firstRun.welcome.step.privacy'
-                defaultMessage='Understood our privacy policy & terms of operation'
-              />
-            </li>
-            <li>
-              <FormattedMessage
-                id='firstRun.welcome.step.account'
-                defaultMessage='Created your first Parity account'
-              />
-            </li>
-            <li>
-              <FormattedMessage
-                id='firstRun.welcome.step.recovery'
-                defaultMessage='Have the ability to recover your account'
-              />
-            </li>
-          </ul>
-        </div>
-        <p>
-          <FormattedMessage
-            id='firstRun.welcome.next'
-            defaultMessage='Click Next to continue your journey.'
-          />
-        </p>
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/FirstRun/firstRun.css b/js/src/modals/FirstRun/firstRun.css
deleted file mode 100644
index 8dd7ecfc249ec67854ed35b972803d3f80c15565..0000000000000000000000000000000000000000
--- a/js/src/modals/FirstRun/firstRun.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.completed,
-.welcome {
-  p {
-    line-height: 1.5em;
-  }
-
-  ul {
-    background: rgba(0, 0, 0, 0.1);
-    margin-right: 12em;
-    padding: 1em 3em;
-
-    li {
-      line-height: 2em;
-    }
-  }
-}
-
-.tnc {
-  overflow-y: auto;
-
-  p,
-  li {
-    opacity: 0.8;
-    line-height: 1.5em;
-  }
-
-  .accept {
-    margin: 1.5em 0;
-  }
-
-  .markdown {
-  }
-}
diff --git a/js/src/modals/FirstRun/firstRun.js b/js/src/modals/FirstRun/firstRun.js
deleted file mode 100644
index 2db94fdb9b6d4b224f0887eb5556969cdb1de699..0000000000000000000000000000000000000000
--- a/js/src/modals/FirstRun/firstRun.js
+++ /dev/null
@@ -1,366 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import ParityLogo from '~/../assets/images/parity-logo-black-no-text.svg';
-import { createIdentityImg } from '~/api/util/identity';
-import { newError } from '~/redux/actions';
-import { Button, Portal } from '~/ui';
-import { CheckIcon, DoneIcon, NextIcon, PrintIcon, ReplayIcon } from '~/ui/Icons';
-
-import { NewAccount, AccountDetails } from '../CreateAccount';
-import print from '../CreateAccount/print';
-import recoveryPage from '../CreateAccount/recoveryPage.ejs';
-import CreateStore from '../CreateAccount/store';
-
-import Completed from './Completed';
-import TnC from './TnC';
-import Welcome from './Welcome';
-
-const STAGE_NAMES = [
-  <FormattedMessage
-    id='firstRun.title.welcome'
-    defaultMessage='welcome'
-  />,
-  <FormattedMessage
-    id='firstRun.title.terms'
-    defaultMessage='terms'
-  />,
-  <FormattedMessage
-    id='firstRun.title.newAccount'
-    defaultMessage='new account'
-  />,
-  <FormattedMessage
-    id='firstRun.title.recovery'
-    defaultMessage='recovery'
-  />,
-  <FormattedMessage
-    id='firstRun.title.confirmation'
-    defaultMessage='confirmation'
-  />,
-  <FormattedMessage
-    id='firstRun.title.completed'
-    defaultMessage='completed'
-  />
-];
-const BUTTON_LABEL_NEXT = (
-  <FormattedMessage
-    id='firstRun.button.next'
-    defaultMessage='Next'
-  />
-);
-
-@observer
-class FirstRun extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    hasAccounts: PropTypes.bool.isRequired,
-    newError: PropTypes.func.isRequired,
-    onClose: PropTypes.func.isRequired,
-    visible: PropTypes.bool.isRequired
-  }
-
-  createStore = new CreateStore(this.context.api, {}, true, false);
-
-  state = {
-    stage: 0,
-    hasAcceptedTnc: false
-  }
-
-  render () {
-    const { visible } = this.props;
-    const { stage } = this.state;
-
-    if (!visible) {
-      return null;
-    }
-
-    return (
-      <Portal
-        buttons={ this.renderDialogActions() }
-        activeStep={ stage }
-        hideClose
-        steps={ STAGE_NAMES }
-        open
-      >
-        { this.renderStage() }
-      </Portal>
-    );
-  }
-
-  renderStage () {
-    const { stage, hasAcceptedTnc } = this.state;
-
-    switch (stage) {
-      case 0:
-        return (
-          <Welcome />
-        );
-      case 1:
-        return (
-          <TnC
-            hasAccepted={ hasAcceptedTnc }
-            onAccept={ this.onAcceptTnC }
-          />
-        );
-      case 2:
-        return (
-          <NewAccount
-            newError={ this.props.newError }
-            createStore={ this.createStore }
-          />
-        );
-      case 3:
-        return (
-          <AccountDetails
-            createStore={ this.createStore }
-            withRequiredBackup
-          />
-        );
-      case 4:
-        return (
-          <AccountDetails
-            createStore={ this.createStore }
-            isConfirming
-          />
-        );
-      case 5:
-        return (
-          <Completed />
-        );
-    }
-  }
-
-  renderDialogActions () {
-    const { hasAccounts } = this.props;
-    const { stage, hasAcceptedTnc } = this.state;
-    const { canCreate, phraseBackedUpError } = this.createStore;
-
-    switch (stage) {
-      case 0:
-        return (
-          <Button
-            icon={ <NextIcon /> }
-            key='next'
-            label={ BUTTON_LABEL_NEXT }
-            onClick={ this.onNext }
-          />
-        );
-
-      case 1:
-        return (
-          <Button
-            disabled={ !hasAcceptedTnc }
-            icon={ <NextIcon /> }
-            key='next'
-            label={ BUTTON_LABEL_NEXT }
-            onClick={ this.onNext }
-          />
-        );
-
-      case 2:
-        const buttons = [
-          <Button
-            disabled={ !canCreate }
-            icon={ <NextIcon /> }
-            key='next'
-            label={ BUTTON_LABEL_NEXT }
-            onClick={ this.onNext }
-          />
-        ];
-
-        if (hasAccounts) {
-          buttons.unshift(
-            <Button
-              icon={ <NextIcon /> }
-              key='skip'
-              label={
-                <FormattedMessage
-                  id='firstRun.button.skip'
-                  defaultMessage='Skip'
-                />
-              }
-              onClick={ this.skipAccountCreation }
-            />
-          );
-        }
-        return buttons;
-
-      case 3:
-        return [
-          <Button
-            icon={ <PrintIcon /> }
-            key='print'
-            label={
-              <FormattedMessage
-                id='firstRun.button.print'
-                defaultMessage='Print Phrase'
-              />
-            }
-            onClick={ this.printPhrase }
-          />,
-          <Button
-            disabled={ !!phraseBackedUpError }
-            icon={ <NextIcon /> }
-            key='next'
-            label={ BUTTON_LABEL_NEXT }
-            onClick={ this.onConfirmPhraseBackup }
-          />
-        ];
-
-      case 4:
-        return [
-          <Button
-            icon={ <ReplayIcon /> }
-            key='restart'
-            label={
-              <FormattedMessage
-                id='firstRun.button.restart'
-                defaultMessage='Start Over'
-              />
-            }
-            onClick={ this.onStartOver }
-          />,
-          <Button
-            icon={ <CheckIcon /> }
-            key='create'
-            label={
-              <FormattedMessage
-                id='firstRun.button.create'
-                defaultMessage='Create'
-              />
-            }
-            onClick={ this.onCreate }
-          />
-        ];
-
-      case 5:
-        return (
-          <Button
-            icon={ <DoneIcon /> }
-            key='close'
-            label={
-              <FormattedMessage
-                id='firstRun.button.close'
-                defaultMessage='Close'
-              />
-            }
-            onClick={ this.onClose }
-          />
-        );
-    }
-  }
-
-  onClose = () => {
-    const { onClose } = this.props;
-
-    this.setState({
-      stage: 0
-    }, onClose);
-  }
-
-  onConfirmPhraseBackup = () => {
-    this.createStore.clearPhrase();
-    this.onNext();
-  }
-
-  onNext = () => {
-    const { stage } = this.state;
-
-    this.setState({
-      stage: stage + 1
-    });
-  }
-
-  onStartOver = () => {
-    this.setState({
-      stage: 2
-    });
-  }
-
-  onAcceptTnC = () => {
-    this.setState({
-      hasAcceptedTnc: !this.state.hasAcceptedTnc
-    });
-  }
-
-  onCreate = () => {
-    this.createStore.setBusy(true);
-
-    this.createStore.computeBackupPhraseAddress()
-      .then(err => {
-        if (err) {
-          this.createStore.setBusy(false);
-          return;
-        }
-
-        return this.createStore.createAccount()
-          .then(() => {
-            this.createStore.clearPhrase();
-            this.createStore.setBusy(false);
-            this.onNext();
-          });
-      })
-      .catch((error) => {
-        this.createStore.setBusy(false);
-        this.props.newError(error);
-      });
-  }
-
-  skipAccountCreation = () => {
-    this.setState({ stage: this.state.stage + 3 });
-  }
-
-  printPhrase = () => {
-    const { address, phrase, name } = this.createStore;
-    const identity = createIdentityImg(address);
-
-    print(recoveryPage({
-      address,
-      identity,
-      logo: ParityLogo,
-      name,
-      phrase
-    }));
-  }
-}
-
-function mapStateToProps (state) {
-  const { hasAccounts } = state.personal;
-
-  return {
-    hasAccounts
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(FirstRun);
diff --git a/js/src/modals/FirstRun/firstRun.spec.js b/js/src/modals/FirstRun/firstRun.spec.js
deleted file mode 100644
index 14707dd5cafbe0e77fee8a70d37336a9acf88fe2..0000000000000000000000000000000000000000
--- a/js/src/modals/FirstRun/firstRun.spec.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import FirstRun from './';
-
-let component;
-let onClose;
-
-function createApi () {
-  return {};
-}
-
-function createRedux () {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        personal: {
-          hasAccounts: false
-        }
-      };
-    }
-  };
-}
-
-function render (props = { visible: true }) {
-  onClose = sinon.stub();
-  component = shallow(
-    <FirstRun
-      { ...props }
-      onClose={ onClose }
-    />,
-    {
-      context: {
-        store: createRedux()
-      }
-    }
-  ).find('FirstRun').shallow({
-    context: {
-      api: createApi()
-    }
-  });
-
-  return component;
-}
-
-describe('modals/FirstRun', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/FirstRun/index.js b/js/src/modals/FirstRun/index.js
deleted file mode 100644
index 928fa9c5abb35321635afbd86d66b705b5b02f1b..0000000000000000000000000000000000000000
--- a/js/src/modals/FirstRun/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './firstRun';
diff --git a/js/src/modals/LoadContract/index.js b/js/src/modals/LoadContract/index.js
deleted file mode 100644
index 2db3f02129a21ca16ca08b0e6dfc47b9db081bd0..0000000000000000000000000000000000000000
--- a/js/src/modals/LoadContract/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './loadContract';
diff --git a/js/src/modals/LoadContract/loadContract.css b/js/src/modals/LoadContract/loadContract.css
deleted file mode 100644
index ce9011c5dac27b319ae5fbfcdcd40efa78db5cdc..0000000000000000000000000000000000000000
--- a/js/src/modals/LoadContract/loadContract.css
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.loadContainer {
-  display: flex;
-  flex-direction: row;
-
-  > * {
-    flex: 50%;
-    width: 0;
-  }
-}
-
-.editor {
-  display: flex;
-  flex-direction: column;
-  padding-left: 1em;
-
-  p {
-    line-height: 48px;
-    height: 48px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-
-    margin: 0;
-    font-size: 1.2em;
-  }
-}
-
-.confirmRemoval {
-  text-align: center;
-
-  .editor {
-    text-align: left;
-    margin-top: 0.5em;
-  }
-}
diff --git a/js/src/modals/LoadContract/loadContract.js b/js/src/modals/LoadContract/loadContract.js
deleted file mode 100644
index 216723f7e53f9aec3b218062ecaaa549f0a2678b..0000000000000000000000000000000000000000
--- a/js/src/modals/LoadContract/loadContract.js
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Subheader, IconButton, Tabs, Tab } from 'material-ui';
-import { List, ListItem, makeSelectable } from 'material-ui/List';
-import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Button, Portal } from '~/ui';
-import Editor from '~/ui/Editor';
-import { CancelIcon, CheckIcon, DeleteIcon } from '~/ui/Icons';
-
-import styles from './loadContract.css';
-
-const SelectableList = makeSelectable(List);
-
-const REMOVAL_STYLE = {
-  backgroundColor: 'none',
-  cursor: 'default'
-};
-const SELECTED_STYLE = {
-  backgroundColor: 'rgba(255, 255, 255, 0.1)'
-};
-
-export default class LoadContract extends Component {
-  static propTypes = {
-    onClose: PropTypes.func.isRequired,
-    onLoad: PropTypes.func.isRequired,
-    onDelete: PropTypes.func.isRequired,
-    contracts: PropTypes.object.isRequired,
-    snippets: PropTypes.object.isRequired
-  };
-
-  state = {
-    selected: -1,
-    deleteRequest: false,
-    deleteId: -1
-  };
-
-  render () {
-    const { deleteRequest } = this.state;
-
-    return (
-      <Portal
-        buttons={ this.renderDialogActions() }
-        onClose={ this.onClose }
-        open
-        title={
-          deleteRequest
-            ? (
-              <FormattedMessage
-                id='loadContract.title.remove'
-                defaultMessage='confirm removal'
-              />
-            )
-            : (
-              <FormattedMessage
-                id='loadContract.title.view'
-                defaultMessage='view contracts'
-              />
-            )
-        }
-      >
-        { this.renderBody() }
-      </Portal>
-    );
-  }
-
-  renderBody () {
-    if (this.state.deleteRequest) {
-      return this.renderConfirmRemoval();
-    }
-
-    const { contracts, snippets } = this.props;
-    const contractsTab = Object.keys(contracts).length === 0
-      ? null
-      : (
-        <Tab
-          label={
-            <FormattedMessage
-              id='loadContract.tab.local'
-              defaultMessage='Local'
-            />
-          }
-        >
-          { this.renderEditor() }
-          <SelectableList onChange={ this.onClickContract }>
-            <Subheader>
-              <FormattedMessage
-                id='loadContract.header.saved'
-                defaultMessage='Saved Contracts'
-              />
-            </Subheader>
-            { this.renderContracts(contracts) }
-          </SelectableList>
-        </Tab>
-      );
-
-    return (
-      <div className={ styles.loadContainer }>
-        <Tabs onChange={ this.handleChangeTab }>
-          { contractsTab }
-          <Tab
-            label={
-              <FormattedMessage
-                id='loadContract.tab.snippets'
-                defaultMessage='Snippets'
-              />
-            }
-          >
-            { this.renderEditor() }
-            <SelectableList onChange={ this.onClickContract }>
-              <Subheader>
-                <FormattedMessage
-                  id='loadContract.header.snippets'
-                  defaultMessage='Contract Snippets'
-                />
-              </Subheader>
-              { this.renderContracts(snippets, false) }
-            </SelectableList>
-          </Tab>
-        </Tabs>
-      </div>
-    );
-  }
-
-  renderConfirmRemoval () {
-    const { deleteId } = this.state;
-    const { name, timestamp, sourcecode } = this.props.contracts[deleteId];
-
-    return (
-      <div className={ styles.confirmRemoval }>
-        <p>
-          <FormattedMessage
-            id='loadContract.removal.confirm'
-            defaultMessage='Are you sure you want to remove the following contract from your saved contracts?'
-          />
-        </p>
-        <ListItem
-          primaryText={ name }
-          secondaryText={
-            <FormattedMessage
-              id='loadContract.removal.savedAt'
-              defaultMessage='Saved {when}'
-              values={ {
-                when: moment(timestamp).fromNow()
-              } }
-            />
-          }
-          style={ REMOVAL_STYLE }
-        />
-
-        <div className={ styles.editor }>
-          <Editor
-            value={ sourcecode }
-            maxLines={ 20 }
-            readOnly
-          />
-        </div>
-      </div>
-    );
-  }
-
-  renderEditor () {
-    const { contracts, snippets } = this.props;
-    const { selected } = this.state;
-
-    const mergedContracts = Object.assign({}, contracts, snippets);
-
-    if (selected === -1 || !mergedContracts[selected]) {
-      return null;
-    }
-
-    const { sourcecode, name } = mergedContracts[selected];
-
-    return (
-      <div className={ styles.editor }>
-        <p>{ name }</p>
-        <Editor
-          readOnly
-          maxLines={ 20 }
-          value={ sourcecode }
-        />
-      </div>
-    );
-  }
-
-  renderContracts (contracts, removable = true) {
-    const { selected } = this.state;
-
-    return Object
-      .values(contracts)
-      .map((contract) => {
-        const { id, name, timestamp, description } = contract;
-        const onDelete = () => this.onDeleteRequest(id);
-
-        return (
-          <ListItem
-            key={ id }
-            primaryText={ name }
-            rightIconButton={
-              removable
-                ? (
-                  <IconButton onTouchTap={ onDelete }>
-                    <DeleteIcon />
-                  </IconButton>
-                )
-                : null
-            }
-            secondaryText={
-              description || (
-                <FormattedMessage
-                  id='loadContract.contract.savedAt'
-                  defaultMessage='Saved {when}'
-                  values={ {
-                    when: moment(timestamp).fromNow()
-                  } }
-                />
-              )
-            }
-            style={
-              selected === id
-                ? SELECTED_STYLE
-                : null
-            }
-            value={ id }
-          />
-        );
-      });
-  }
-
-  renderDialogActions () {
-    const { deleteRequest } = this.state;
-
-    if (deleteRequest) {
-      return [
-        <Button
-          icon={ <CancelIcon /> }
-          key='No'
-          label={
-            <FormattedMessage
-              id='loadContract.button.no'
-              defaultMessage='No'
-            />
-          }
-          onClick={ this.onRejectRemoval }
-        />,
-        <Button
-          icon={ <DeleteIcon /> }
-          key='Yes'
-          label={
-            <FormattedMessage
-              id='loadContract.button.yes'
-              defaultMessage='Yes'
-            />
-          }
-          onClick={ this.onConfirmRemoval }
-        />
-      ];
-    }
-
-    return [
-      <Button
-        icon={ <CancelIcon /> }
-        label={
-          <FormattedMessage
-            id='loadContract.button.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.onClose }
-      />,
-      <Button
-        disabled={ this.state.selected === -1 }
-        icon={ <CheckIcon /> }
-        label={
-          <FormattedMessage
-            id='loadContract.button.load'
-            defaultMessage='Load'
-          />
-        }
-        onClick={ this.onLoad }
-      />
-    ];
-  }
-
-  handleChangeTab = () => {
-    this.setState({ selected: -1 });
-  }
-
-  onClickContract = (event, selected) => {
-    this.setState({ selected });
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-
-  onLoad = () => {
-    const { contracts, snippets } = this.props;
-    const { selected } = this.state;
-
-    const mergedContracts = Object.assign({}, contracts, snippets);
-    const contract = mergedContracts[selected];
-
-    this.props.onLoad(contract);
-    this.props.onClose();
-  }
-
-  onDeleteRequest = (id) => {
-    this.setState({
-      deleteRequest: true,
-      deleteId: id
-    });
-  }
-
-  onConfirmRemoval = () => {
-    const { deleteId } = this.state;
-
-    this.props.onDelete(deleteId);
-
-    this.setState({
-      deleteRequest: false,
-      deleteId: -1,
-      selected: -1
-    });
-  }
-
-  onRejectRemoval = () => {
-    this.setState({
-      deleteRequest: false,
-      deleteId: -1
-    });
-  }
-}
diff --git a/js/src/modals/LoadContract/loadContract.spec.js b/js/src/modals/LoadContract/loadContract.spec.js
deleted file mode 100644
index b79a0875b54bd52f7d5d1226f20ada8ed94d2d5e..0000000000000000000000000000000000000000
--- a/js/src/modals/LoadContract/loadContract.spec.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import LoadContract from './';
-
-const CONTRACTS = {
-  345: { id: 345, name: 'test345' },
-  456: { id: 456, name: 'test456' },
-  987: { id: 987, name: 'test987' }
-};
-const SNIPPETS = {
-  123: { id: 123, name: 'test123' }
-};
-
-let component;
-let instance;
-let onClose;
-let onDelete;
-let onLoad;
-
-function render () {
-  onClose = sinon.stub();
-  onDelete = sinon.stub();
-  onLoad = sinon.stub();
-  component = shallow(
-    <LoadContract
-      contracts={ CONTRACTS }
-      onClose={ onClose }
-      onDelete={ onDelete }
-      onLoad={ onLoad }
-      snippets={ SNIPPETS }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/LoadContract', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('event methods', () => {
-    describe('handleChangeTab', () => {
-      beforeEach(() => {
-        instance.onClickContract(null, 345);
-        instance.handleChangeTab();
-      });
-
-      it('resets the selected value', () => {
-        expect(instance.state.selected).to.equal(-1);
-      });
-    });
-
-    describe('onClickContract', () => {
-      beforeEach(() => {
-        instance.onClickContract(null, 456);
-      });
-
-      it('sets the selected value', () => {
-        expect(instance.state.selected).to.equal(456);
-      });
-    });
-
-    describe('onClose', () => {
-      beforeEach(() => {
-        instance.onClose();
-      });
-
-      it('calls onClose', () => {
-        expect(onClose).to.have.been.called;
-      });
-    });
-
-    describe('onLoad', () => {
-      beforeEach(() => {
-        instance.onLoad();
-      });
-
-      it('calls onLoad', () => {
-        expect(onLoad).to.have.been.called;
-      });
-
-      it('calls onClose', () => {
-        expect(onClose).to.have.been.called;
-      });
-    });
-
-    describe('onDeleteRequest', () => {
-      beforeEach(() => {
-        instance.onDeleteRequest(987);
-      });
-
-      it('sets deleteRequest true', () => {
-        expect(instance.state.deleteRequest).to.be.true;
-      });
-
-      it('sets the deleteId', () => {
-        expect(instance.state.deleteId).to.equal(987);
-      });
-    });
-
-    describe('onConfirmRemoval', () => {
-      beforeEach(() => {
-        instance.onDeleteRequest(987);
-        instance.onConfirmRemoval();
-      });
-
-      it('calls onDelete', () => {
-        expect(onDelete).to.have.been.calledWith(987);
-      });
-
-      it('sets deleteRequest false', () => {
-        expect(instance.state.deleteRequest).to.be.false;
-      });
-
-      it('clears the deleteId', () => {
-        expect(instance.state.deleteId).to.equal(-1);
-      });
-    });
-
-    describe('onRejectRemoval', () => {
-      beforeEach(() => {
-        instance.onDeleteRequest(987);
-        instance.onRejectRemoval();
-      });
-
-      it('sets deleteRequest false', () => {
-        expect(instance.state.deleteRequest).to.be.false;
-      });
-
-      it('clears the deleteId', () => {
-        expect(instance.state.deleteId).to.equal(-1);
-      });
-    });
-  });
-});
diff --git a/js/src/modals/PasswordManager/index.js b/js/src/modals/PasswordManager/index.js
deleted file mode 100644
index 3ecddbc571dbd1a1246c4d2320aaf6adfdd112e4..0000000000000000000000000000000000000000
--- a/js/src/modals/PasswordManager/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './passwordManager.js';
diff --git a/js/src/modals/PasswordManager/passwordManager.css b/js/src/modals/PasswordManager/passwordManager.css
deleted file mode 100644
index f16f4f369ee4675f1d630bcc918dffbd05a13bff..0000000000000000000000000000000000000000
--- a/js/src/modals/PasswordManager/passwordManager.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.accountContainer {
-  display: flex;
-  flex-direction: row;
-  margin-bottom: 1.5rem;
-}
-
-.accountInfos {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-}
-
-.accountInfos > * {
-  margin: 0.25rem 0;
-}
-
-.hintLabel {
-  text-transform: uppercase;
-  font-size: 0.7rem;
-  margin-right: 0.5rem;
-}
-
-.accountAddress {
-  font-family: monospace;
-  font-size: 0.9rem;
-}
-
-.accountName {
-  font-size: 1.1rem;
-}
-
-.passwords {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.password {
-  flex: 0 1 50%;
-  width: 50%;
-}
-
-.passwordHint {
-  font-size: 0.9rem;
-  color: lightgrey;
-}
-
-.message {
-  margin-top: 1rem;
-  width: 100%;
-  height: 2.5rem;
-  text-align: center;
-  line-height: 2.5rem;
-  transition: height 350ms 0 !important;
-  overflow: hidden;
-}
-
-.hideMessage {
-  height: 0;
-  background-color: transparent !important;
-}
-
-.form {
-  box-sizing: border-box;
-  margin-top: 0;
-  padding: 0.75rem 1.5rem 1.5rem;
-  background-color: rgba(255, 255, 255, 0.05);
-}
diff --git a/js/src/modals/PasswordManager/passwordManager.js b/js/src/modals/PasswordManager/passwordManager.js
deleted file mode 100644
index d40ac7cde7ec1999e0354485043dd2c25f8026df..0000000000000000000000000000000000000000
--- a/js/src/modals/PasswordManager/passwordManager.js
+++ /dev/null
@@ -1,448 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Paper from 'material-ui/Paper';
-import { Tabs, Tab } from 'material-ui/Tabs';
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { newError, openSnackbar } from '~/redux/actions';
-import { Button, IdentityName, IdentityIcon, Portal } from '~/ui';
-import PasswordStrength from '~/ui/Form/PasswordStrength';
-import Form, { Input } from '~/ui/Form';
-import { CancelIcon, CheckIcon, SendIcon } from '~/ui/Icons';
-
-import Store, { CHANGE_ACTION, TEST_ACTION } from './store';
-import styles from './passwordManager.css';
-
-const MSG_SUCCESS_STYLE = {
-  backgroundColor: 'rgba(174, 213, 129, 0.75)'
-};
-const MSG_FAILURE_STYLE = {
-  backgroundColor: 'rgba(229, 115, 115, 0.75)'
-};
-const TABS_INKBAR_STYLE = {
-  backgroundColor: 'rgb(0, 151, 167)' // 'rgba(255, 255, 255, 0.55)'
-};
-const TABS_ITEM_STYLE = {
-  backgroundColor: 'rgba(255, 255, 255, 0.05)'
-};
-
-@observer
-class PasswordManager extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    openSnackbar: PropTypes.func.isRequired,
-    newError: PropTypes.func.isRequired,
-    onClose: PropTypes.func
-  }
-
-  store = new Store(this.context.api, this.props.account);
-
-  render () {
-    const { busy } = this.store;
-
-    return (
-      <Portal
-        busy={ busy }
-        buttons={ this.renderDialogActions() }
-        onClose={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='passwordChange.title'
-            defaultMessage='Password Manager'
-          />
-        }
-      >
-        { this.renderAccount() }
-        { this.renderPage() }
-        { this.renderMessage() }
-      </Portal>
-    );
-  }
-
-  renderMessage () {
-    const { infoMessage } = this.store;
-
-    if (!infoMessage) {
-      return null;
-    }
-
-    return (
-      <Paper
-        className={ `${styles.message}` }
-        style={
-          infoMessage.success
-            ? MSG_SUCCESS_STYLE
-            : MSG_FAILURE_STYLE
-        }
-        zDepth={ 1 }
-      >
-        { infoMessage.value }
-      </Paper>
-    );
-  }
-
-  renderAccount () {
-    const { address, passwordHint } = this.store;
-
-    return (
-      <div className={ styles.accountContainer }>
-        <IdentityIcon address={ address } />
-        <div className={ styles.accountInfos }>
-          <IdentityName
-            address={ address }
-            className={ styles.accountName }
-            unknown
-          />
-          <span className={ styles.accountAddress }>
-            { address }
-          </span>
-          <span className={ styles.passwordHint }>
-            <span className={ styles.hintLabel }>
-              <FormattedMessage
-                id='passwordChange.passwordHint.display'
-                defaultMessage='Hint {hint}'
-                values={ {
-                  hint: passwordHint || '-'
-                } }
-              />
-            </span>
-          </span>
-        </div>
-      </div>
-    );
-  }
-
-  renderPage () {
-    return (
-      <Tabs
-        inkBarStyle={ TABS_INKBAR_STYLE }
-        tabItemContainerStyle={ TABS_ITEM_STYLE }
-      >
-        <Tab
-          label={
-            <FormattedMessage
-              id='passwordChange.tabTest.label'
-              defaultMessage='Test Password'
-            />
-          }
-          onActive={ this.onActivateTestTab }
-        >
-          { this.renderTabTest() }
-        </Tab>
-        <Tab
-          label={
-            <FormattedMessage
-              id='passwordChange.tabChange.label'
-              defaultMessage='Change Password'
-            />
-          }
-          onActive={ this.onActivateChangeTab }
-        >
-          { this.renderTabChange() }
-        </Tab>
-      </Tabs>
-    );
-  }
-
-  renderTabTest () {
-    const { actionTab, busy } = this.store;
-
-    if (actionTab !== TEST_ACTION) {
-      return null;
-    }
-
-    return (
-      <Form className={ styles.form }>
-        <div>
-          <Input
-            autoFocus
-            disabled={ busy }
-            hint={
-              <FormattedMessage
-                id='passwordChange.testPassword.hint'
-                defaultMessage='your account password'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='passwordChange.testPassword.label'
-                defaultMessage='password'
-              />
-            }
-            onChange={ this.onEditTestPassword }
-            onSubmit={ this.testPassword }
-            submitOnBlur={ false }
-            type='password'
-          />
-        </div>
-      </Form>
-    );
-  }
-
-  renderTabChange () {
-    const { actionTab, busy, isRepeatValid, newPassword, passwordHint } = this.store;
-
-    if (actionTab !== CHANGE_ACTION) {
-      return null;
-    }
-
-    return (
-      <Form className={ styles.form }>
-        <div>
-          <Input
-            autoFocus
-            disabled={ busy }
-            hint={
-              <FormattedMessage
-                id='passwordChange.currentPassword.hint'
-                defaultMessage='your current password for this account'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='passwordChange.currentPassword.label'
-                defaultMessage='current password'
-              />
-            }
-            onChange={ this.onEditCurrentPassword }
-            type='password'
-          />
-          <Input
-            disabled={ busy }
-            hint={
-              <FormattedMessage
-                id='passwordChange.passwordHint.hint'
-                defaultMessage='hint for the new password'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='passwordChange.passwordHint.label'
-                defaultMessage='(optional) new password hint'
-              />
-            }
-            onChange={ this.onEditNewPasswordHint }
-            value={ passwordHint }
-          />
-          <div className={ styles.passwords }>
-            <div className={ styles.password }>
-              <Input
-                disabled={ busy }
-                hint={
-                  <FormattedMessage
-                    id='passwordChange.newPassword.hint'
-                    defaultMessage='the new password for this account'
-                  />
-                }
-                label={
-                  <FormattedMessage
-                    id='passwordChange.newPassword.label'
-                    defaultMessage='new password'
-                  />
-                }
-                onChange={ this.onEditNewPassword }
-                onSubmit={ this.changePassword }
-                submitOnBlur={ false }
-                type='password'
-              />
-            </div>
-            <div className={ styles.password }>
-              <Input
-                disabled={ busy }
-                error={
-                  isRepeatValid
-                    ? null
-                    : <FormattedMessage
-                      id='passwordChange.repeatPassword.error'
-                      defaultMessage='the supplied passwords do not match'
-                      />
-                }
-                hint={
-                  <FormattedMessage
-                    id='passwordChange.repeatPassword.hint'
-                    defaultMessage='repeat the new password for this account'
-                  />
-                }
-                label={
-                  <FormattedMessage
-                    id='passwordChange.repeatPassword.label'
-                    defaultMessage='repeat new password'
-                  />
-                }
-                onChange={ this.onEditNewPasswordRepeat }
-                onSubmit={ this.changePassword }
-                submitOnBlur={ false }
-                type='password'
-              />
-            </div>
-          </div>
-
-          <PasswordStrength input={ newPassword } />
-        </div>
-      </Form>
-    );
-  }
-
-  renderDialogActions () {
-    const { actionTab, busy, isRepeatValid } = this.store;
-
-    const cancelBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='passwordChange.button.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.onClose }
-      />
-    );
-
-    if (busy) {
-      return [
-        cancelBtn,
-        <Button
-          disabled
-          key='wait'
-          label={
-            <FormattedMessage
-              id='passwordChange.button.wait'
-              defaultMessage='Wait...'
-            />
-          }
-        />
-      ];
-    }
-
-    if (actionTab === TEST_ACTION) {
-      return [
-        cancelBtn,
-        <Button
-          icon={ <CheckIcon /> }
-          key='test'
-          label={
-            <FormattedMessage
-              id='passwordChange.button.test'
-              defaultMessage='Test'
-            />
-          }
-          onClick={ this.testPassword }
-        />
-      ];
-    }
-
-    return [
-      cancelBtn,
-      <Button
-        disabled={ !isRepeatValid }
-        icon={ <SendIcon /> }
-        key='change'
-        label={
-          <FormattedMessage
-            id='passwordChange.button.change'
-            defaultMessage='Change'
-          />
-        }
-        onClick={ this.changePassword }
-      />
-    ];
-  }
-
-  onActivateChangeTab = () => {
-    this.store.setActionTab(CHANGE_ACTION);
-  }
-
-  onActivateTestTab = () => {
-    this.store.setActionTab(TEST_ACTION);
-  }
-
-  onEditCurrentPassword = (event, password) => {
-    this.store.setPassword(password);
-  }
-
-  onEditNewPassword = (event, password) => {
-    this.store.setNewPassword(password);
-  }
-
-  onEditNewPasswordHint = (event, passwordHint) => {
-    this.store.setNewPasswordHint(passwordHint);
-  }
-
-  onEditNewPasswordRepeat = (event, password) => {
-    this.store.setNewPasswordRepeat(password);
-  }
-
-  onEditTestPassword = (event, password) => {
-    this.store.setValidatePassword(password);
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-
-  changePassword = () => {
-    return this.store
-      .changePassword()
-      .then((result) => {
-        if (result) {
-          this.props.openSnackbar(
-            <div>
-              <FormattedMessage
-                id='passwordChange.success'
-                defaultMessage='Your password has been successfully changed'
-              />
-            </div>
-          );
-          this.onClose();
-        }
-      })
-      .catch((error) => {
-        this.props.newError(error);
-      });
-  }
-
-  testPassword = () => {
-    return this.store
-      .testPassword()
-      .catch((error) => {
-        this.props.newError(error);
-      });
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    openSnackbar,
-    newError
-  }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(PasswordManager);
diff --git a/js/src/modals/PasswordManager/passwordManager.spec.js b/js/src/modals/PasswordManager/passwordManager.spec.js
deleted file mode 100644
index 6c1515c479a003a019c44ba4502ba2da75d21e72..0000000000000000000000000000000000000000
--- a/js/src/modals/PasswordManager/passwordManager.spec.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import PasswordManager from './';
-
-import { ACCOUNT, createApi, createRedux } from './passwordManager.test.js';
-
-let component;
-let instance;
-let onClose;
-let reduxStore;
-
-function render (props) {
-  onClose = sinon.stub();
-  reduxStore = createRedux();
-
-  component = shallow(
-    <PasswordManager
-      { ...props }
-      account={ ACCOUNT }
-      onClose={ onClose }
-    />,
-    { context: { store: reduxStore } }
-  ).find('PasswordManager').shallow({ context: { api: createApi() } });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/PasswordManager', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(render()).to.be.ok;
-    });
-  });
-
-  describe('actions', () => {
-    beforeEach(() => {
-      render();
-    });
-
-    describe('changePassword', () => {
-      it('calls store.changePassword', () => {
-        sinon.spy(instance.store, 'changePassword');
-
-        return instance.changePassword().then(() => {
-          expect(instance.store.changePassword).to.have.been.called;
-          instance.store.changePassword.restore();
-        });
-      });
-
-      it('closes the dialog on success', () => {
-        return instance.changePassword().then(() => {
-          expect(onClose).to.have.been.called;
-        });
-      });
-
-      it('shows snackbar on success', () => {
-        return instance.changePassword().then(() => {
-          expect(reduxStore.dispatch).to.have.been.calledWithMatch({ type: 'openSnackbar' });
-        });
-      });
-
-      it('adds newError on failure', () => {
-        sinon.stub(instance.store, 'changePassword').rejects('test');
-
-        return instance.changePassword().then(() => {
-          expect(reduxStore.dispatch).to.have.been.calledWith({ error: new Error('test'), type: 'newError' });
-          instance.store.changePassword.restore();
-        });
-      });
-    });
-
-    describe('testPassword', () => {
-      it('calls store.testPassword', () => {
-        sinon.spy(instance.store, 'testPassword');
-
-        return instance.testPassword().then(() => {
-          expect(instance.store.testPassword).to.have.been.called;
-          instance.store.testPassword.restore();
-        });
-      });
-
-      it('adds newError on failure', () => {
-        sinon.stub(instance.store, 'testPassword').rejects('test');
-
-        return instance.testPassword().then(() => {
-          expect(reduxStore.dispatch).to.have.been.calledWith({ error: new Error('test'), type: 'newError' });
-          instance.store.testPassword.restore();
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/modals/PasswordManager/passwordManager.test.js b/js/src/modals/PasswordManager/passwordManager.test.js
deleted file mode 100644
index a45a0b829e5d8c70a7caccd2af6ae441ca74507e..0000000000000000000000000000000000000000
--- a/js/src/modals/PasswordManager/passwordManager.test.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-const ACCOUNT = {
-  address: '0x123456789a123456789a123456789a123456789a',
-  meta: {
-    description: 'Call me bob',
-    passwordHint: 'some hint',
-    tags: ['testing']
-  },
-  name: 'Bobby',
-  uuid: '123-456'
-};
-
-function createApi (result = true) {
-  return {
-    parity: {
-      changePassword: sinon.stub().resolves(result),
-      setAccountMeta: sinon.stub().resolves(result),
-      testPassword: sinon.stub().resolves(result)
-    }
-  };
-}
-
-function createRedux () {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {};
-    }
-  };
-}
-
-export {
-  ACCOUNT,
-  createApi,
-  createRedux
-};
diff --git a/js/src/modals/PasswordManager/store.js b/js/src/modals/PasswordManager/store.js
deleted file mode 100644
index 3356b3fa2864c7064189e099da0fc76ceb5d24aa..0000000000000000000000000000000000000000
--- a/js/src/modals/PasswordManager/store.js
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, observable, transaction } from 'mobx';
-
-const CHANGE_ACTION = 'CHANGE_ACTION';
-const TEST_ACTION = 'TEST_ACTION';
-
-export default class Store {
-  @observable actionTab = TEST_ACTION;
-  @observable address = null;
-  @observable busy = false;
-  @observable infoMessage = null;
-  @observable meta = null;
-  @observable newPassword = '';
-  @observable newPasswordHint = '';
-  @observable newPasswordRepeat = '';
-  @observable password = '';
-  @observable passwordHint = '';
-  @observable validatePassword = '';
-
-  constructor (api, account) {
-    this._api = api;
-
-    this.address = account.address;
-    this.meta = account.meta || {};
-    this.passwordHint = this.meta.passwordHint || '';
-  }
-
-  @computed get isRepeatValid () {
-    return this.newPasswordRepeat === this.newPassword;
-  }
-
-  @action setActionTab = (actionTab) => {
-    transaction(() => {
-      this.actionTab = actionTab;
-      this.setInfoMessage();
-    });
-  }
-
-  @action setBusy = (busy, message) => {
-    transaction(() => {
-      this.busy = busy;
-      this.setInfoMessage(message);
-    });
-  }
-
-  @action setInfoMessage = (message = null) => {
-    this.infoMessage = message;
-  }
-
-  @action setPassword = (password) => {
-    transaction(() => {
-      this.password = password;
-      this.setInfoMessage();
-    });
-  }
-
-  @action setNewPassword = (password) => {
-    transaction(() => {
-      this.newPassword = password;
-      this.setInfoMessage();
-    });
-  }
-
-  @action setNewPasswordHint = (passwordHint) => {
-    transaction(() => {
-      this.newPasswordHint = passwordHint;
-      this.setInfoMessage();
-    });
-  }
-
-  @action setNewPasswordRepeat = (password) => {
-    transaction(() => {
-      this.newPasswordRepeat = password;
-      this.setInfoMessage();
-    });
-  }
-
-  @action setValidatePassword = (password) => {
-    transaction(() => {
-      this.validatePassword = password;
-      this.setInfoMessage();
-    });
-  }
-
-  changePassword = () => {
-    if (!this.isRepeatValid) {
-      return Promise.resolve(false);
-    }
-
-    this.setBusy(true);
-
-    return this
-      .testPassword(this.password)
-      .then((result) => {
-        if (!result) {
-          return false;
-        }
-
-        const meta = Object.assign({}, this.meta, {
-          passwordHint: this.newPasswordHint
-        });
-
-        return Promise
-          .all([
-            this._api.parity.setAccountMeta(this.address, meta),
-            this._api.parity.changePassword(this.address, this.password, this.newPassword)
-          ])
-          .then(() => {
-            this.setBusy(false);
-            return true;
-          });
-      })
-      .catch((error) => {
-        console.error('changePassword', error);
-        this.setBusy(false);
-        throw error;
-      });
-  }
-
-  testPassword = (password) => {
-    this.setBusy(true);
-
-    return this._api.parity
-      .testPassword(this.address, password || this.validatePassword)
-      .then((success) => {
-        this.setBusy(false, {
-          success,
-          value: success
-            ? 'This password is correct'
-            : 'This password is not correct'
-        });
-
-        return success;
-      })
-      .catch((error) => {
-        console.error('testPassword', error);
-        this.setBusy(false);
-        throw error;
-      });
-  }
-}
-
-export {
-  CHANGE_ACTION,
-  TEST_ACTION
-};
diff --git a/js/src/modals/PasswordManager/store.spec.js b/js/src/modals/PasswordManager/store.spec.js
deleted file mode 100644
index c1f46e08eff85bf4db5450ffb237d1f5bfa23908..0000000000000000000000000000000000000000
--- a/js/src/modals/PasswordManager/store.spec.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Store from './store';
-import { ACCOUNT, createApi } from './passwordManager.test.js';
-
-let api;
-let store;
-
-function createStore (account) {
-  api = createApi();
-  store = new Store(api, account);
-
-  return store;
-}
-
-describe('modals/PasswordManager/Store', () => {
-  beforeEach(() => {
-    createStore(ACCOUNT);
-  });
-
-  describe('constructor', () => {
-    it('extracts the address', () => {
-      expect(store.address).to.equal(ACCOUNT.address);
-    });
-
-    describe('meta', () => {
-      it('extracts the full meta', () => {
-        expect(store.meta).to.deep.equal(ACCOUNT.meta);
-      });
-
-      it('extracts the passwordHint', () => {
-        expect(store.passwordHint).to.equal(ACCOUNT.meta.passwordHint);
-      });
-    });
-  });
-
-  describe('operations', () => {
-    const CUR_PASSWORD = 'aPassW0rd';
-    const NEW_PASSWORD = 'br@ndNEW';
-    const NEW_HINT = 'something new to test';
-
-    describe('changePassword', () => {
-      beforeEach(() => {
-        store.setPassword(CUR_PASSWORD);
-        store.setNewPasswordHint(NEW_HINT);
-        store.setNewPassword(NEW_PASSWORD);
-        store.setNewPasswordRepeat(NEW_PASSWORD);
-      });
-
-      it('calls parity.testPassword with current password', () => {
-        return store.changePassword().then(() => {
-          expect(api.parity.testPassword).to.have.been.calledWith(ACCOUNT.address, CUR_PASSWORD);
-        });
-      });
-
-      it('calls parity.setAccountMeta with new hint', () => {
-        return store.changePassword().then(() => {
-          expect(api.parity.setAccountMeta).to.have.been.calledWith(ACCOUNT.address, Object.assign({}, ACCOUNT.meta, {
-            passwordHint: NEW_HINT
-          }));
-        });
-      });
-
-      it('calls parity.changePassword with the new password', () => {
-        return store.changePassword().then(() => {
-          expect(api.parity.changePassword).to.have.been.calledWith(ACCOUNT.address, CUR_PASSWORD, NEW_PASSWORD);
-        });
-      });
-    });
-
-    describe('testPassword', () => {
-      beforeEach(() => {
-        store.setValidatePassword(CUR_PASSWORD);
-      });
-
-      it('calls parity.testPassword', () => {
-        return store.testPassword().then(() => {
-          expect(api.parity.testPassword).to.have.been.calledWith(ACCOUNT.address, CUR_PASSWORD);
-        });
-      });
-
-      it('sets the infoMessage for success/failure', () => {
-        return store.testPassword().then(() => {
-          expect(store.infoMessage).not.to.be.null;
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/modals/SaveContract/index.js b/js/src/modals/SaveContract/index.js
deleted file mode 100644
index fce35db962a301e5697f9f517b4e5b4c6e793faf..0000000000000000000000000000000000000000
--- a/js/src/modals/SaveContract/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './saveContract';
diff --git a/js/src/modals/SaveContract/saveContract.css b/js/src/modals/SaveContract/saveContract.css
deleted file mode 100644
index 22ef7da2897acaaf52dc3d880ae286da1007d1af..0000000000000000000000000000000000000000
--- a/js/src/modals/SaveContract/saveContract.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.source {
-  margin-top: 2em;
-}
diff --git a/js/src/modals/SaveContract/saveContract.js b/js/src/modals/SaveContract/saveContract.js
deleted file mode 100644
index 7f45b6aa55afa9099159811c4a62efea3ff4815c..0000000000000000000000000000000000000000
--- a/js/src/modals/SaveContract/saveContract.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Button, Form, Input, Portal } from '~/ui';
-import Editor from '~/ui/Editor';
-import { CancelIcon, SaveIcon } from '~/ui/Icons';
-import { ERRORS, validateName } from '~/util/validation';
-
-import styles from './saveContract.css';
-
-export default class SaveContract extends Component {
-  static propTypes = {
-    sourcecode: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onSave: PropTypes.func.isRequired
-  };
-
-  state = {
-    name: '',
-    nameError: ERRORS.invalidName
-  };
-
-  render () {
-    const { sourcecode } = this.props;
-    const { name, nameError } = this.state;
-
-    return (
-      <Portal
-        buttons={ this.renderDialogActions() }
-        onClose={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='saveContract.title'
-            defaultMessage='save contract'
-          />
-        }
-      >
-        <div>
-          <Form>
-            <Input
-              label={
-                <FormattedMessage
-                  id='saveContract.name.label'
-                  defaultMessage='contract name'
-                />
-              }
-              hint={
-                <FormattedMessage
-                  id='saveContract.name.hint'
-                  defaultMessage='choose a name for this contract'
-                />
-              }
-              value={ name }
-              error={ nameError }
-              onChange={ this.onChangeName }
-            />
-          </Form>
-          <Editor
-            className={ styles.source }
-            value={ sourcecode }
-            maxLines={ 25 }
-            readOnly
-          />
-        </div>
-      </Portal>
-    );
-  }
-
-  renderDialogActions () {
-    const cancelBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='saveContract.buttons.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.onClose }
-      />
-    );
-
-    const confirmBtn = (
-      <Button
-        icon={ <SaveIcon /> }
-        key='save'
-        label={
-          <FormattedMessage
-            id='saveContract.buttons.save'
-            defaultMessage='Save'
-          />
-        }
-        disabled={ !!this.state.nameError }
-        onClick={ this.onSave }
-      />
-    );
-
-    return [ cancelBtn, confirmBtn ];
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-
-  onSave = () => {
-    const { name } = this.state;
-    const { sourcecode } = this.props;
-
-    this.props.onSave({ name, sourcecode });
-    this.onClose();
-  }
-
-  onChangeName = (event, value) => {
-    const { name, nameError } = validateName(value);
-
-    this.setState({ name, nameError });
-  }
-}
diff --git a/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js b/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js
deleted file mode 100644
index 043a1e3ad755c5af8a54467fe04b801fe9da556c..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { CopyToClipboard, QrCode } from '~/ui';
-
-import Value from '../Value';
-import styles from '../shapeshift.css';
-
-@observer
-export default class AwaitingDepositStep extends Component {
-  static propTypes = {
-    store: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { coinSymbol, depositAddress, price } = this.props.store;
-    const typeSymbol = (
-      <div className={ styles.symbol }>
-        { coinSymbol }
-      </div>
-    );
-
-    if (!depositAddress) {
-      return (
-        <div className={ styles.center }>
-          <div className={ styles.busy }>
-            <FormattedMessage
-              id='shapeshift.awaitingDepositStep.awaitingConfirmation'
-              defaultMessage='Awaiting confirmation of the deposit address for your {typeSymbol} funds exchange'
-              values={ { typeSymbol } }
-            />
-          </div>
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.center }>
-        <div className={ styles.info }>
-          <FormattedMessage
-            id='shapeshift.awaitingDepositStep.awaitingDeposit'
-            defaultMessage='{shapeshiftLink} is awaiting a {typeSymbol} deposit. Send the funds from your {typeSymbol} network client to -'
-            values={ {
-              shapeshiftLink: <a href='https://shapeshift.io' target='_blank'>ShapeShift.io</a>,
-              typeSymbol
-            } }
-          />
-        </div>
-        { this.renderAddress(depositAddress, coinSymbol) }
-        <div className={ styles.price }>
-          <div>
-            <FormattedMessage
-              id='shapeshift.awaitingDepositStep.minimumMaximum'
-              defaultMessage='{minimum} minimum, {maximum} maximum'
-              values={ {
-                maximum: <Value amount={ price.limit } symbol={ coinSymbol } />,
-                minimum: <Value amount={ price.minimum } symbol={ coinSymbol } />
-              } }
-            />
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderAddress (depositAddress, coinSymbol) {
-    const qrcode = (
-      <QrCode
-        className={ styles.qrcode }
-        value={ depositAddress }
-      />
-    );
-    let protocolLink = null;
-
-    // TODO: Expand for other coins where protocols are available
-    switch (coinSymbol) {
-      case 'BTC':
-        protocolLink = `bitcoin:${depositAddress}`;
-        break;
-    }
-
-    return (
-      <div className={ styles.addressInfo }>
-        {
-          protocolLink
-            ? (
-              <a
-                href={ protocolLink }
-                target='_blank'
-              >
-                { qrcode }
-              </a>
-            )
-            : qrcode
-        }
-        <div className={ styles.address }>
-          <CopyToClipboard data={ depositAddress } />
-          <span>{ depositAddress }</span>
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js b/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js
deleted file mode 100644
index 2e8cedf28cfd41db119f438356be8127107138b8..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import AwaitingDepositStep from './';
-
-const TEST_ADDRESS = '0x123456789123456789123456789123456789';
-
-let component;
-let instance;
-
-function render () {
-  component = shallow(
-    <AwaitingDepositStep
-      store={ {
-        coinSymbol: 'BTC',
-        price: { rate: 0.001, minimum: 0, limit: 1.999 }
-      } }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/Shapeshift/AwaitingDepositStep', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  it('displays waiting for address with empty depositAddress', () => {
-    render();
-    expect(component.find('FormattedMessage').props().id).to.match(/awaitingConfirmation/);
-  });
-
-  it('displays waiting for deposit with non-empty depositAddress', () => {
-    render({ depositAddress: 'xyz' });
-    expect(component.find('FormattedMessage').first().props().id).to.match(/awaitingDeposit/);
-  });
-
-  describe('instance methods', () => {
-    describe('renderAddress', () => {
-      let address;
-
-      beforeEach(() => {
-        address = shallow(instance.renderAddress(TEST_ADDRESS));
-      });
-
-      it('renders the address', () => {
-        expect(address.text()).to.contain(TEST_ADDRESS);
-      });
-
-      describe('CopyToClipboard', () => {
-        let copy;
-
-        beforeEach(() => {
-          copy = address.find('Connect(CopyToClipboard)');
-        });
-
-        it('renders the copy', () => {
-          expect(copy.length).to.equal(1);
-        });
-
-        it('passes the address', () => {
-          expect(copy.props().data).to.equal(TEST_ADDRESS);
-        });
-      });
-
-      describe('QrCode', () => {
-        let qr;
-
-        beforeEach(() => {
-          qr = address.find('QrCode');
-        });
-
-        it('renders the QrCode', () => {
-          expect(qr.length).to.equal(1);
-        });
-
-        it('passed the address', () => {
-          expect(qr.props().value).to.equal(TEST_ADDRESS);
-        });
-
-        describe('protocol link', () => {
-          it('does not render a protocol link (unlinked type)', () => {
-            expect(address.find('a')).to.have.length(0);
-          });
-
-          it('renders protocol link for BTC', () => {
-            address = shallow(instance.renderAddress(TEST_ADDRESS, 'BTC'));
-            expect(address.find('a').props().href).to.equal(`bitcoin:${TEST_ADDRESS}`);
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/modals/Shapeshift/AwaitingDepositStep/index.js b/js/src/modals/Shapeshift/AwaitingDepositStep/index.js
deleted file mode 100644
index a814af712e6418a6f9aca5a73e65f6ef6969e4e4..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/AwaitingDepositStep/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './awaitingDepositStep';
diff --git a/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js b/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js
deleted file mode 100644
index 14cb1e51f509a2beeb79541e3ff585793dfc1328..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { observer } from 'mobx-react';
-
-import Value from '../Value';
-import styles from '../shapeshift.css';
-
-@observer
-export default class AwaitingExchangeStep extends Component {
-  static propTypes = {
-    store: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { depositInfo } = this.props.store;
-    const { incomingCoin, incomingType } = depositInfo;
-
-    return (
-      <div className={ styles.center }>
-        <div className={ styles.info }>
-          <FormattedMessage
-            id='shapeshift.awaitingExchangeStep.receivedInfo'
-            defaultMessage='{shapeshiftLink} has received a deposit of -'
-            values={ {
-              shapeshiftLink: <a href='https://shapeshift.io' target='_blank'>ShapeShift.io</a>
-            } }
-          />
-        </div>
-        <div className={ styles.hero }>
-          <Value amount={ incomingCoin } symbol={ incomingType } />
-        </div>
-        <div className={ styles.info }>
-          <FormattedMessage
-            id='shapeshift.awaitingExchangeStep.awaitingCompletion'
-            defaultMessage='Awaiting the completion of the funds exchange and transfer of funds to your Parity account.'
-          />
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js b/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js
deleted file mode 100644
index 0433bfb564399bc017e36830f77c681351aaac90..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import AwaitingExchangeStep from './';
-
-let component;
-
-function render () {
-  component = shallow(
-    <AwaitingExchangeStep
-      store={ {
-        depositInfo: { incomingCoin: 0.01, incomingType: 'BTC' }
-      } }
-    />
-  );
-
-  return component;
-}
-
-describe('modals/Shapeshift/AwaitingExchangeStep', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/Shapeshift/AwaitingExchangeStep/index.js b/js/src/modals/Shapeshift/AwaitingExchangeStep/index.js
deleted file mode 100644
index d8d93b1749cfd467f15019eb82dcbca3b8b93ae9..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/AwaitingExchangeStep/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './awaitingExchangeStep';
diff --git a/js/src/modals/Shapeshift/CompletedStep/completedStep.js b/js/src/modals/Shapeshift/CompletedStep/completedStep.js
deleted file mode 100644
index 90f6b3eb66d2bad34d0e02439896fb2acd3d589a..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/CompletedStep/completedStep.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import Value from '../Value';
-import styles from '../shapeshift.css';
-
-@observer
-export default class CompletedStep extends Component {
-  static propTypes = {
-    store: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { depositInfo, exchangeInfo } = this.props.store;
-    const { incomingCoin, incomingType } = depositInfo;
-    const { outgoingCoin, outgoingType } = exchangeInfo;
-
-    return (
-      <div className={ styles.center }>
-        <div className={ styles.info }>
-          <FormattedMessage
-            id='shapeshift.completedStep.completed'
-            defaultMessage='{shapeshiftLink} has completed the funds exchange.'
-            values={ {
-              shapeshiftLink: <a href='https://shapeshift.io' target='_blank'>ShapeShift.io</a>
-            } }
-          />
-        </div>
-        <div className={ styles.hero }>
-          <Value amount={ incomingCoin } symbol={ incomingType } /> => <Value amount={ outgoingCoin } symbol={ outgoingType } />
-        </div>
-        <div className={ styles.info }>
-          <FormattedMessage
-            id='shapeshift.completedStep.parityFunds'
-            defaultMessage='The change in funds will be reflected in your Parity account shortly.'
-          />
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/Shapeshift/CompletedStep/completedStep.spec.js b/js/src/modals/Shapeshift/CompletedStep/completedStep.spec.js
deleted file mode 100644
index 4a51c756147b30c69c0a34e2591d10638d5ad0aa..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/CompletedStep/completedStep.spec.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import CompletedStep from './';
-
-let component;
-
-function render () {
-  component = shallow(
-    <CompletedStep
-      store={ {
-        depositInfo: { incomingCoin: 0.01, incomingType: 'BTC' },
-        exchangeInfo: { outgoingCoin: 0.1, outgoingType: 'ETH' }
-      } }
-    />
-  );
-
-  return component;
-}
-
-describe('modals/Shapeshift/CompletedStep', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/Shapeshift/CompletedStep/index.js b/js/src/modals/Shapeshift/CompletedStep/index.js
deleted file mode 100644
index 26668d8421b8c16017f890526ac4214435ee1afd..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/CompletedStep/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './completedStep';
diff --git a/js/src/modals/Shapeshift/ErrorStep/errorStep.js b/js/src/modals/Shapeshift/ErrorStep/errorStep.js
deleted file mode 100644
index c603a4b77611aa0df491440e8dde64d9c688e6ca..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/ErrorStep/errorStep.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import styles from '../shapeshift.css';
-
-@observer
-export default class ErrorStep extends Component {
-  static propTypes = {
-    store: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { error } = this.props.store;
-
-    return (
-      <div className={ styles.body }>
-        <div className={ styles.info }>
-          <FormattedMessage
-            id='shapeshift.errorStep.info'
-            defaultMessage='The funds shifting via {shapeshiftLink} failed with a fatal error on the exchange. The error message received from the exchange is as follow:'
-            values={ {
-              shapeshiftLink: <a href='https://shapeshift.io' target='_blank'>ShapeShift.io</a>
-            } }
-          />
-        </div>
-        <div className={ styles.error }>
-          { error.message }
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/Shapeshift/ErrorStep/errorStep.spec.js b/js/src/modals/Shapeshift/ErrorStep/errorStep.spec.js
deleted file mode 100644
index 92086a1eb6988df3e145734b8f3163d174548a2a..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/ErrorStep/errorStep.spec.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import ErrorStep from './';
-
-let component;
-
-function render () {
-  component = shallow(
-    <ErrorStep
-      store={ {
-        error: new Error('testing')
-      } }
-    />
-  );
-
-  return component;
-}
-
-describe('modals/Shapeshift/ErrorStep', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/Shapeshift/ErrorStep/index.js b/js/src/modals/Shapeshift/ErrorStep/index.js
deleted file mode 100644
index c7bff0fed0e4ba908aac259999ba4f8c4615c72b..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/ErrorStep/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './errorStep';
diff --git a/js/src/modals/Shapeshift/OptionsStep/index.js b/js/src/modals/Shapeshift/OptionsStep/index.js
deleted file mode 100644
index 57d752225c3b2b83118adac43122d8cdb7bae95d..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/OptionsStep/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './optionsStep';
diff --git a/js/src/modals/Shapeshift/OptionsStep/optionsStep.css b/js/src/modals/Shapeshift/OptionsStep/optionsStep.css
deleted file mode 100644
index 026615537edadc08e4eebaf4646eefbffde89456..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/OptionsStep/optionsStep.css
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.body {
-}
-
-.accept {
-  margin: 1.5em 0;
-}
-
-.coinselector {
-}
-
-.coinselector .coinselect {
-  margin-top: 11px;
-}
-
-.coinselect {
-  max-height: 36px;
-  padding: 4px 0 0 0;
-  line-height: 32px;
-}
-
-.coinimage {
-  display: inline-block;
-  width: 32px;
-  height: 32px;
-  margin-right: 0.5em;
-}
-
-.coindetails {
-  display: inline-block;
-  vertical-align: top;
-}
-
-.coinsymbol {
-  display: inline-block;
-  margin-right: 0.5em;
-  color: #aaa;
-}
-
-.coinname {
-  display: inline-block;
-}
-
-.empty {
-  color: #aaa;
-}
diff --git a/js/src/modals/Shapeshift/OptionsStep/optionsStep.js b/js/src/modals/Shapeshift/OptionsStep/optionsStep.js
deleted file mode 100644
index cd5eff926dadf22d85b76bd660a42a7b994fc2d0..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/OptionsStep/optionsStep.js
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Checkbox, MenuItem } from 'material-ui';
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Form, Input, Select, Warning } from '~/ui';
-
-import Price from '../Price';
-import { WARNING_NO_PRICE } from '../store';
-import styles from './optionsStep.css';
-
-const WARNING_LABELS = {
-  [WARNING_NO_PRICE]: (
-    <FormattedMessage
-      id='shapeshift.warning.noPrice'
-      defaultMessage='No price match was found for the selected type'
-    />
-  )
-};
-
-@observer
-export default class OptionsStep extends Component {
-  static propTypes = {
-    store: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { coinSymbol, coins, hasAcceptedTerms, price, refundAddress, warning } = this.props.store;
-
-    if (!coins.length) {
-      return (
-        <div className={ styles.empty }>
-          <FormattedMessage
-            id='shapeshift.optionsStep.noPairs'
-            defaultMessage='There are currently no exchange pairs/coins available to fund with.'
-          />
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.body }>
-        <Form>
-          <Select
-            className={ styles.coinselector }
-            hint={
-              <FormattedMessage
-                id='shapeshift.optionsStep.typeSelect.hint'
-                defaultMessage='the type of crypto conversion to do'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='shapeshift.optionsStep.typeSelect.label'
-                defaultMessage='fund account from'
-              />
-            }
-            onChange={ this.onSelectCoin }
-            value={ coinSymbol }
-          >
-            {
-              coins.map(this.renderCoinSelectItem)
-            }
-          </Select>
-          <Input
-            hint={
-              <FormattedMessage
-                id='shapeshift.optionsStep.returnAddr.hint'
-                defaultMessage='the return address for send failures'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='shapeshift.optionsStep.returnAddr.label'
-                defaultMessage='(optional) {coinSymbol} return address'
-                values={ { coinSymbol } }
-              />
-            }
-            onSubmit={ this.onChangeRefundAddress }
-            value={ refundAddress }
-          />
-          <Checkbox
-            checked={ hasAcceptedTerms }
-            className={ styles.accept }
-            label={
-              <FormattedMessage
-                id='shapeshift.optionsStep.terms.label'
-                defaultMessage='I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is completely out of the control of Parity'
-              />
-            }
-            onCheck={ this.onToggleAcceptTerms }
-          />
-        </Form>
-        <Warning warning={ WARNING_LABELS[warning] } />
-        <Price
-          coinSymbol={ coinSymbol }
-          price={ price }
-        />
-      </div>
-    );
-  }
-
-  renderCoinSelectItem = (coin) => {
-    const { image, name, symbol } = coin;
-
-    const item = (
-      <div className={ styles.coinselect }>
-        <img
-          className={ styles.coinimage }
-          src={ image }
-        />
-        <div className={ styles.coindetails }>
-          <div className={ styles.coinsymbol }>
-            { symbol }
-          </div>
-          <div className={ styles.coinname }>
-            { name }
-          </div>
-        </div>
-      </div>
-    );
-
-    return (
-      <MenuItem
-        key={ symbol }
-        value={ symbol }
-        label={ item }
-      >
-        { item }
-      </MenuItem>
-    );
-  }
-
-  onChangeRefundAddress = (event, refundAddress) => {
-    this.props.store.setRefundAddress(refundAddress);
-  }
-
-  onSelectCoin = (event, index, coinSymbol) => {
-    this.props.store.setCoinSymbol(coinSymbol);
-  }
-
-  onToggleAcceptTerms = () => {
-    this.props.store.toggleAcceptTerms();
-  }
-}
diff --git a/js/src/modals/Shapeshift/OptionsStep/optionsSteps.spec.js b/js/src/modals/Shapeshift/OptionsStep/optionsSteps.spec.js
deleted file mode 100644
index e0a71752e72b51665b2552f3ff13830bf2c1b7c5..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/OptionsStep/optionsSteps.spec.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import Store, { WARNING_NO_PRICE } from '../store';
-
-import OptionsStep from './';
-
-const ADDRESS = '0x1234567890123456789012345678901234567890';
-
-let component;
-let instance;
-let store;
-
-function render () {
-  store = new Store(ADDRESS);
-  component = shallow(
-    <OptionsStep store={ store } />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/Shapeshift/OptionsStep', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('renders no coins when none available', () => {
-    expect(component.find('FormattedMessage').props().id).to.equal('shapeshift.optionsStep.noPairs');
-  });
-
-  describe('components', () => {
-    beforeEach(() => {
-      store.setCoins([{ symbol: 'BTC', name: 'Bitcoin' }]);
-      store.toggleAcceptTerms();
-    });
-
-    describe('terms Checkbox', () => {
-      it('shows the state of store.hasAcceptedTerms', () => {
-        expect(component.find('Checkbox').props().checked).to.be.true;
-      });
-    });
-
-    describe('warning', () => {
-      let warning;
-
-      beforeEach(() => {
-        store.setWarning(WARNING_NO_PRICE);
-        warning = component.find('Warning');
-      });
-
-      it('shows a warning message when available', () => {
-        expect(warning.props().warning.props.id).to.equal('shapeshift.warning.noPrice');
-      });
-    });
-  });
-
-  describe('events', () => {
-    describe('onChangeRefundAddress', () => {
-      beforeEach(() => {
-        sinon.stub(store, 'setRefundAddress');
-      });
-
-      afterEach(() => {
-        store.setRefundAddress.restore();
-      });
-
-      it('sets the refundAddress on the store', () => {
-        instance.onChangeRefundAddress(null, 'refundAddress');
-        expect(store.setRefundAddress).to.have.been.calledWith('refundAddress');
-      });
-    });
-
-    describe('onSelectCoin', () => {
-      beforeEach(() => {
-        sinon.stub(store, 'setCoinSymbol');
-      });
-
-      afterEach(() => {
-        store.setCoinSymbol.restore();
-      });
-
-      it('sets the coinSymbol on the store', () => {
-        instance.onSelectCoin(null, 0, 'XMR');
-        expect(store.setCoinSymbol).to.have.been.calledWith('XMR');
-      });
-    });
-
-    describe('onToggleAcceptTerms', () => {
-      beforeEach(() => {
-        sinon.stub(store, 'toggleAcceptTerms');
-      });
-
-      afterEach(() => {
-        store.toggleAcceptTerms.restore();
-      });
-
-      it('toggles the terms on the store', () => {
-        instance.onToggleAcceptTerms();
-        expect(store.toggleAcceptTerms).to.have.been.called;
-      });
-    });
-  });
-});
diff --git a/js/src/modals/Shapeshift/Price/index.js b/js/src/modals/Shapeshift/Price/index.js
deleted file mode 100644
index 870689e034ee03bc65e7fbfccd0619c30ebec6a8..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/Price/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './price';
diff --git a/js/src/modals/Shapeshift/Price/price.js b/js/src/modals/Shapeshift/Price/price.js
deleted file mode 100644
index bd72a7498b466e86bff20d8ec29e29803af82255..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/Price/price.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import Value from '../Value';
-import styles from '../shapeshift.css';
-
-export default class Price extends Component {
-  static propTypes = {
-    coinSymbol: PropTypes.string.isRequired,
-    price: PropTypes.shape({
-      rate: PropTypes.number.isRequired,
-      minimum: PropTypes.number.isRequired,
-      limit: PropTypes.number.isRequired
-    })
-  }
-
-  render () {
-    const { coinSymbol, price } = this.props;
-
-    if (!price) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.price }>
-        <div>
-          <Value amount={ 1 } symbol={ coinSymbol } /> = <Value amount={ price.rate } />
-        </div>
-        <div>
-          <FormattedMessage
-            id='shapeshift.price.minMax'
-            defaultMessage='({minimum} minimum, {maximum} maximum)'
-            values={ {
-              maximum: <Value amount={ price.limit } symbol={ coinSymbol } />,
-              minimum: <Value amount={ price.minimum } symbol={ coinSymbol } />
-            } }
-          />
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/Shapeshift/Price/price.spec.js b/js/src/modals/Shapeshift/Price/price.spec.js
deleted file mode 100644
index 4c815b6528a421e7842b3b9828adcb1a40cbcec8..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/Price/price.spec.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import Price from './';
-
-let component;
-
-function render (props = {}) {
-  component = shallow(
-    <Price
-      coinSymbol='BTC'
-      price={ { rate: 0.1, minimum: 0.1, limit: 0.9 } }
-      error={ new Error('testing') }
-      { ...props }
-    />
-  );
-
-  return component;
-}
-
-describe('modals/Shapeshift/Price', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/Shapeshift/Value/index.js b/js/src/modals/Shapeshift/Value/index.js
deleted file mode 100644
index 9e981f7bf6827a7a2ff380627316e34779330b84..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/Value/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './value';
diff --git a/js/src/modals/Shapeshift/Value/value.css b/js/src/modals/Shapeshift/Value/value.css
deleted file mode 100644
index 267287c70670f7d2c89588e70cc27e2c0c4c9059..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/Value/value.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.body {
-  display: inline-block;
-  color: #aaa;
-}
-
-.amount {
-  display: inline-block;
-}
-
-.symbol {
-  font-variant: small-caps;
-  margin-left: 0.1rem;
-  font-size: 0.8em;
-}
diff --git a/js/src/modals/Shapeshift/Value/value.js b/js/src/modals/Shapeshift/Value/value.js
deleted file mode 100644
index 535d17ad7283b8bfbbb9f13db68af8605fdfb2a8..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/Value/value.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import React, { Component, PropTypes } from 'react';
-
-import styles from './value.css';
-
-export default class Value extends Component {
-  static propTypes = {
-    amount: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.string
-    ]),
-    symbol: PropTypes.string
-  }
-
-  render () {
-    const { amount, symbol } = this.props;
-
-    let value = '';
-
-    if (amount) {
-      value = new BigNumber(amount).toFormat(3);
-    }
-
-    return (
-      <div className={ styles.body }>
-        <span>{ value } </span>
-        <span className={ styles.symbol }>{ symbol || 'ETH' }</span>
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/Shapeshift/Value/value.spec.js b/js/src/modals/Shapeshift/Value/value.spec.js
deleted file mode 100644
index f4b1f646e0bc644946794956f47e58616aeab224..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/Value/value.spec.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import Value from './';
-
-let component;
-
-function render (props = {}) {
-  component = shallow(
-    <Value { ...props } />
-  );
-
-  return component;
-}
-
-describe('modals/Shapeshift/Value', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/modals/Shapeshift/index.js b/js/src/modals/Shapeshift/index.js
deleted file mode 100644
index 5bf7051ebc911890cdaadb9891561df581d1beba..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './shapeshift';
diff --git a/js/src/modals/Shapeshift/shapeshift.css b/js/src/modals/Shapeshift/shapeshift.css
deleted file mode 100644
index 1982011f995e655d699c99ad7bfb740db097659f..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/shapeshift.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.body {
-}
-
-.addressInfo {
-  text-align: center;
-
-  .address {
-    background: rgba(255, 255, 255, 0.1);
-    margin: 0.75em 0;
-    padding: 1em;
-
-    span {
-      margin-left: 0.75em;
-    }
-  }
-
-  .qrcode {
-    margin: 0.75em 0;
-  }
-}
-
-.shapeshift {
-  cursor: pointer;
-  left: 1.5em;
-  outline: none;
-  position: absolute;
-
-  img {
-    height: 28px;
-  }
-}
-
-.info, .busy {
-}
-
-.center {
-  div {
-    text-align: center;
-  }
-}
-
-.error {
-  padding-top: 1.5em;
-  color: #e44;
-}
-
-.hero {
-  padding-top: 0.75em;
-  text-align: center;
-  font-size: 1.75em;
-}
-
-.symbol {
-  display: inline-block;
-  color: #aaa;
-}
-
-.price {
-  div {
-    text-align: center;
-    font-size: small;
-  }
-}
-
-.empty {
-  color: #aaa;
-}
diff --git a/js/src/modals/Shapeshift/shapeshift.js b/js/src/modals/Shapeshift/shapeshift.js
deleted file mode 100644
index 497b84d289003d25692856aa3b26ba1c8bfc11d2..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/shapeshift.js
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import shapeshiftLogo from '~/../assets/images/shapeshift-logo.png';
-import { Button, IdentityIcon, Portal } from '~/ui';
-import { CancelIcon, DoneIcon } from '~/ui/Icons';
-
-import AwaitingDepositStep from './AwaitingDepositStep';
-import AwaitingExchangeStep from './AwaitingExchangeStep';
-import CompletedStep from './CompletedStep';
-import ErrorStep from './ErrorStep';
-import OptionsStep from './OptionsStep';
-import Store, { STAGE_COMPLETED, STAGE_OPTIONS, STAGE_WAIT_DEPOSIT, STAGE_WAIT_EXCHANGE } from './store';
-
-import styles from './shapeshift.css';
-
-const STAGE_TITLES = [
-  <FormattedMessage
-    id='shapeshift.title.details'
-    defaultMessage='details'
-  />,
-  <FormattedMessage
-    id='shapeshift.title.deposit'
-    defaultMessage='awaiting deposit'
-  />,
-  <FormattedMessage
-    id='shapeshift.title.exchange'
-    defaultMessage='awaiting exchange'
-  />,
-  <FormattedMessage
-    id='shapeshift.title.completed'
-    defaultMessage='completed'
-  />
-];
-const ERROR_TITLE = (
-  <FormattedMessage
-    id='shapeshift.title.error'
-    defaultMessage='exchange failed'
-  />
-);
-
-@observer
-export default class Shapeshift extends Component {
-  static contextTypes = {
-    store: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    onClose: PropTypes.func
-  }
-
-  store = new Store(this.props.address);
-
-  componentDidMount () {
-    this.store.retrieveCoins();
-  }
-
-  componentWillUnmount () {
-    this.store.unsubscribe();
-  }
-
-  render () {
-    const { error, stage } = this.store;
-
-    return (
-      <Portal
-        activeStep={ stage }
-        busySteps={ [
-          STAGE_WAIT_DEPOSIT,
-          STAGE_WAIT_EXCHANGE
-        ] }
-        buttons={ this.renderDialogActions() }
-        onClose={ this.onClose }
-        open
-        steps={
-          error
-            ? null
-            : STAGE_TITLES
-        }
-        title={
-          error
-            ? ERROR_TITLE
-            : null
-        }
-      >
-        { this.renderPage() }
-      </Portal>
-    );
-  }
-
-  renderDialogActions () {
-    const { address } = this.props;
-    const { coins, error, hasAcceptedTerms, stage } = this.store;
-
-    const logo = (
-      <a
-        className={ styles.shapeshift }
-        href='http://shapeshift.io'
-        key='logo'
-        target='_blank'
-      >
-        <img src={ shapeshiftLogo } />
-      </a>
-    );
-    const cancelBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='shapeshift.button.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.onClose }
-      />
-    );
-
-    if (error) {
-      return [
-        logo,
-        cancelBtn
-      ];
-    }
-
-    switch (stage) {
-      case STAGE_OPTIONS:
-        return [
-          logo,
-          cancelBtn,
-          <Button
-            disabled={ !coins.length || !hasAcceptedTerms }
-            icon={
-              <IdentityIcon
-                address={ address }
-                button
-              />
-            }
-            key='shift'
-            label={
-              <FormattedMessage
-                id='shapeshift.button.shift'
-                defaultMessage='Shift Funds'
-              />
-            }
-            onClick={ this.onShift }
-          />
-        ];
-
-      case STAGE_WAIT_DEPOSIT:
-      case STAGE_WAIT_EXCHANGE:
-        return [
-          logo,
-          cancelBtn
-        ];
-
-      case STAGE_COMPLETED:
-        return [
-          logo,
-          <Button
-            icon={ <DoneIcon /> }
-            key='done'
-            label={
-              <FormattedMessage
-                id='shapeshift.button.done'
-                defaultMessage='Close'
-              />
-            }
-            onClick={ this.onClose }
-          />
-        ];
-    }
-  }
-
-  renderPage () {
-    const { error, stage } = this.store;
-
-    if (error) {
-      return (
-        <ErrorStep store={ this.store } />
-      );
-    }
-
-    switch (stage) {
-      case STAGE_OPTIONS:
-        return (
-          <OptionsStep store={ this.store } />
-        );
-
-      case STAGE_WAIT_DEPOSIT:
-        return (
-          <AwaitingDepositStep store={ this.store } />
-        );
-
-      case STAGE_WAIT_EXCHANGE:
-        return (
-          <AwaitingExchangeStep store={ this.store } />
-        );
-
-      case STAGE_COMPLETED:
-        return (
-          <CompletedStep store={ this.store } />
-        );
-    }
-  }
-
-  onClose = () => {
-    this.store.setStage(STAGE_OPTIONS);
-    this.props.onClose && this.props.onClose();
-  }
-
-  onShift = () => {
-    return this.store.shift();
-  }
-}
diff --git a/js/src/modals/Shapeshift/shapeshift.spec.js b/js/src/modals/Shapeshift/shapeshift.spec.js
deleted file mode 100644
index b591de390ec9d5530d09864f5840973352a2276f..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/shapeshift.spec.js
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { STAGE_COMPLETED, STAGE_OPTIONS, STAGE_WAIT_DEPOSIT, STAGE_WAIT_EXCHANGE } from './store';
-import Shapeshift from './';
-
-const ADDRESS = '0x0123456789012345678901234567890123456789';
-
-let component;
-let instance;
-let onClose;
-
-function render (props = {}) {
-  onClose = sinon.stub();
-  component = shallow(
-    <Shapeshift
-      address={ ADDRESS }
-      onClose={ onClose }
-      { ...props }
-    />,
-    { context: { store: {} } }
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/Shapeshift', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  describe('componentDidMount', () => {
-    beforeEach(() => {
-      render();
-      sinon.stub(instance.store, 'retrieveCoins');
-      return instance.componentDidMount();
-    });
-
-    afterEach(() => {
-      instance.store.retrieveCoins.restore();
-    });
-
-    it('retrieves the list of coins when mounting', () => {
-      expect(instance.store.retrieveCoins).to.have.been.called;
-    });
-  });
-
-  describe('componentWillUnmount', () => {
-    beforeEach(() => {
-      render();
-      sinon.stub(instance.store, 'unsubscribe');
-      return instance.componentWillUnmount();
-    });
-
-    afterEach(() => {
-      instance.store.unsubscribe.restore();
-    });
-
-    it('removes any subscriptions when unmounting', () => {
-      expect(instance.store.unsubscribe).to.have.been.called;
-    });
-  });
-
-  describe('renderDialogActions', () => {
-    beforeEach(() => {
-      render();
-    });
-
-    describe('shift button', () => {
-      beforeEach(() => {
-        sinon.stub(instance.store, 'shift').resolves();
-
-        instance.store.setCoins(['BTC']);
-        instance.store.toggleAcceptTerms();
-      });
-
-      afterEach(() => {
-        instance.store.shift.restore();
-      });
-
-      it('disabled shift button when not accepted', () => {
-        instance.store.toggleAcceptTerms();
-        expect(shallow(instance.renderDialogActions()[2]).props().disabled).to.be.true;
-      });
-
-      it('shows shift button when accepted', () => {
-        expect(shallow(instance.renderDialogActions()[2]).props().disabled).to.be.false;
-      });
-
-      it('calls the shift on store when clicked', () => {
-        shallow(instance.renderDialogActions()[2]).simulate('touchTap');
-        expect(instance.store.shift).to.have.been.called;
-      });
-    });
-  });
-
-  describe('renderPage', () => {
-    beforeEach(() => {
-      render();
-    });
-
-    it('renders ErrorStep on error, passing the store', () => {
-      instance.store.setError('testError');
-      const page = instance.renderPage();
-
-      expect(page.type).to.match(/ErrorStep/);
-      expect(page.props.store).to.equal(instance.store);
-    });
-
-    it('renders OptionsStep with STAGE_OPTIONS, passing the store', () => {
-      instance.store.setStage(STAGE_OPTIONS);
-      const page = instance.renderPage();
-
-      expect(page.type).to.match(/OptionsStep/);
-      expect(page.props.store).to.equal(instance.store);
-    });
-
-    it('renders AwaitingDepositStep with STAGE_WAIT_DEPOSIT, passing the store', () => {
-      instance.store.setStage(STAGE_WAIT_DEPOSIT);
-      const page = instance.renderPage();
-
-      expect(page.type).to.match(/AwaitingDepositStep/);
-      expect(page.props.store).to.equal(instance.store);
-    });
-
-    it('renders AwaitingExchangeStep with STAGE_WAIT_EXCHANGE, passing the store', () => {
-      instance.store.setStage(STAGE_WAIT_EXCHANGE);
-      const page = instance.renderPage();
-
-      expect(page.type).to.match(/AwaitingExchangeStep/);
-      expect(page.props.store).to.equal(instance.store);
-    });
-
-    it('renders CompletedStep with STAGE_COMPLETED, passing the store', () => {
-      instance.store.setStage(STAGE_COMPLETED);
-      const page = instance.renderPage();
-
-      expect(page.type).to.match(/CompletedStep/);
-      expect(page.props.store).to.equal(instance.store);
-    });
-  });
-});
diff --git a/js/src/modals/Shapeshift/store.js b/js/src/modals/Shapeshift/store.js
deleted file mode 100644
index c82752c560f04d298e962700ff37ee67f00f0ed9..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/store.js
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable, transaction } from 'mobx';
-
-import initShapeshift from '~/3rdparty/shapeshift';
-
-const STAGE_OPTIONS = 0;
-const STAGE_WAIT_DEPOSIT = 1;
-const STAGE_WAIT_EXCHANGE = 2;
-const STAGE_COMPLETED = 3;
-
-const WARNING_NONE = 0;
-const WARNING_NO_PRICE = -1;
-
-export default class Store {
-  @observable address = null;
-  @observable coinPair = 'btc_eth';
-  @observable coinSymbol = 'BTC';
-  @observable coins = [];
-  @observable depositAddress = '';
-  @observable depositInfo = null;
-  @observable exchangeInfo = null;
-  @observable error = null;
-  @observable hasAcceptedTerms = false;
-  @observable price = null;
-  @observable refundAddress = '';
-  @observable stage = STAGE_OPTIONS;
-  @observable warning = 0;
-
-  constructor (address) {
-    this._shapeshiftApi = initShapeshift();
-    this.address = address;
-  }
-
-  @action setCoins = (coins) => {
-    this.coins = coins;
-  }
-
-  @action setCoinSymbol = (coinSymbol) => {
-    transaction(() => {
-      this.coinSymbol = coinSymbol;
-      this.coinPair = `${coinSymbol.toLowerCase()}_eth`;
-      this.price = null;
-    });
-
-    return this.getCoinPrice();
-  }
-
-  @action setDepositAddress = (depositAddress) => {
-    this.depositAddress = depositAddress;
-  }
-
-  @action setDepositInfo = (depositInfo) => {
-    transaction(() => {
-      this.depositInfo = depositInfo;
-      this.setStage(STAGE_WAIT_EXCHANGE);
-    });
-  }
-
-  @action setError = (error) => {
-    this.error = error;
-  }
-
-  @action setExchangeInfo = (exchangeInfo) => {
-    transaction(() => {
-      this.exchangeInfo = exchangeInfo;
-      this.setStage(STAGE_COMPLETED);
-    });
-  }
-
-  @action setPrice = (price) => {
-    transaction(() => {
-      this.price = price;
-      this.setWarning();
-    });
-  }
-
-  @action setRefundAddress = (refundAddress) => {
-    this.refundAddress = refundAddress;
-  }
-
-  @action setStage = (stage) => {
-    this.stage = stage;
-  }
-
-  @action setWarning = (warning = WARNING_NONE) => {
-    this.warning = warning;
-  }
-
-  @action toggleAcceptTerms = () => {
-    this.hasAcceptedTerms = !this.hasAcceptedTerms;
-  }
-
-  getCoinPrice () {
-    return this._shapeshiftApi
-      .getMarketInfo(this.coinPair)
-      .then((price) => {
-        this.setPrice(price);
-      })
-      .catch((error) => {
-        console.warn('getCoinPrice', error);
-
-        this.setWarning(WARNING_NO_PRICE);
-      });
-  }
-
-  retrieveCoins () {
-    return this._shapeshiftApi
-      .getCoins()
-      .then((coins) => {
-        this.setCoins(Object.values(coins).filter((coin) => coin.status === 'available'));
-
-        return this.getCoinPrice();
-      })
-      .catch((error) => {
-        console.error('retrieveCoins', error);
-        const message = `Failed to retrieve available coins from ShapeShift.io: ${error.message}`;
-
-        this.setError(message);
-      });
-  }
-
-  shift () {
-    this.setStage(STAGE_WAIT_DEPOSIT);
-
-    return this._shapeshiftApi
-      .shift(this.address, this.refundAddress, this.coinPair)
-      .then((result) => {
-        console.log('onShift', result);
-
-        this.setDepositAddress(result.deposit);
-        return this.subscribe();
-      })
-      .catch((error) => {
-        console.error('onShift', error);
-        const message = `Failed to start exchange: ${error.message}`;
-
-        this.setError(new Error(message));
-      });
-  }
-
-  onExchangeInfo = (error, result) => {
-    if (error) {
-      console.error('onExchangeInfo', error);
-
-      if (error.fatal) {
-        this.setError(error);
-      }
-      return;
-    }
-
-    console.log('onExchangeInfo', result.status, result);
-
-    switch (result.status) {
-      case 'received':
-        if (this.stage !== STAGE_WAIT_EXCHANGE) {
-          this.setDepositInfo(result);
-        }
-        return;
-
-      case 'complete':
-        if (this.stage !== STAGE_COMPLETED) {
-          this.setExchangeInfo(result);
-        }
-        return;
-    }
-  }
-
-  subscribe () {
-    return this._shapeshiftApi.subscribe(this.depositAddress, this.onExchangeInfo);
-  }
-
-  unsubscribe () {
-    return this._shapeshiftApi.unsubscribe(this.depositAddress);
-  }
-}
-
-export {
-  STAGE_COMPLETED,
-  STAGE_OPTIONS,
-  STAGE_WAIT_DEPOSIT,
-  STAGE_WAIT_EXCHANGE,
-  WARNING_NONE,
-  WARNING_NO_PRICE
-};
diff --git a/js/src/modals/Shapeshift/store.spec.js b/js/src/modals/Shapeshift/store.spec.js
deleted file mode 100644
index 099307fc6ab0778f6e53f6c6867ca9aa29c92239..0000000000000000000000000000000000000000
--- a/js/src/modals/Shapeshift/store.spec.js
+++ /dev/null
@@ -1,355 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Store, { STAGE_COMPLETED, STAGE_OPTIONS, STAGE_WAIT_DEPOSIT, STAGE_WAIT_EXCHANGE, WARNING_NONE, WARNING_NO_PRICE } from './store';
-
-const ADDRESS = '0xabcdeffdecbaabcdeffdecbaabcdeffdecbaabcdeffdecba';
-
-describe('modals/Shapeshift/Store', () => {
-  let store;
-
-  beforeEach(() => {
-    store = new Store(ADDRESS);
-  });
-
-  it('stores the ETH address', () => {
-    expect(store.address).to.equal(ADDRESS);
-  });
-
-  it('defaults to BTC-ETH pair', () => {
-    expect(store.coinSymbol).to.equal('BTC');
-    expect(store.coinPair).to.equal('btc_eth');
-  });
-
-  it('defaults to stage STAGE_OPTIONS', () => {
-    expect(store.stage).to.equal(STAGE_OPTIONS);
-  });
-
-  it('defaults to terms not accepted', () => {
-    expect(store.hasAcceptedTerms).to.be.false;
-  });
-
-  describe('@action', () => {
-    describe('setCoins', () => {
-      it('sets the available coins', () => {
-        const coins = ['BTC', 'ETC', 'XMR'];
-
-        store.setCoins(coins);
-        expect(store.coins.peek()).to.deep.equal(coins);
-      });
-    });
-
-    describe('setCoinSymbol', () => {
-      beforeEach(() => {
-        sinon.stub(store, 'getCoinPrice');
-        store.setCoinSymbol('XMR');
-      });
-
-      afterEach(() => {
-        store.getCoinPrice.restore();
-      });
-
-      it('sets the coinSymbol', () => {
-        expect(store.coinSymbol).to.equal('XMR');
-      });
-
-      it('sets the coinPair', () => {
-        expect(store.coinPair).to.equal('xmr_eth');
-      });
-
-      it('resets the price retrieved', () => {
-        expect(store.price).to.be.null;
-      });
-
-      it('retrieves the pair price', () => {
-        expect(store.getCoinPrice).to.have.been.called;
-      });
-    });
-
-    describe('setDepositAddress', () => {
-      it('sets the depositAddress', () => {
-        store.setDepositAddress('testing');
-        expect(store.depositAddress).to.equal('testing');
-      });
-    });
-
-    describe('setDepositInfo', () => {
-      beforeEach(() => {
-        store.setDepositInfo('testing');
-      });
-
-      it('sets the depositInfo', () => {
-        expect(store.depositInfo).to.equal('testing');
-      });
-
-      it('sets the stage to STAGE_WAIT_EXCHANGE', () => {
-        expect(store.stage).to.equal(STAGE_WAIT_EXCHANGE);
-      });
-    });
-
-    describe('setError', () => {
-      it('sets the error', () => {
-        store.setError(new Error('testing'));
-        expect(store.error).to.match(/testing/);
-      });
-    });
-
-    describe('setExchangeInfo', () => {
-      beforeEach(() => {
-        store.setExchangeInfo('testing');
-      });
-
-      it('sets the exchangeInfo', () => {
-        expect(store.exchangeInfo).to.equal('testing');
-      });
-
-      it('sets the stage to STAGE_COMPLETED', () => {
-        expect(store.stage).to.equal(STAGE_COMPLETED);
-      });
-    });
-
-    describe('setPrice', () => {
-      it('sets the price', () => {
-        store.setPrice('testing');
-        expect(store.price).to.equal('testing');
-      });
-
-      it('clears any warnings once set', () => {
-        store.setWarning(-999);
-        store.setPrice('testing');
-        expect(store.warning).to.equal(WARNING_NONE);
-      });
-    });
-
-    describe('setRefundAddress', () => {
-      it('sets the price', () => {
-        store.setRefundAddress('testing');
-        expect(store.refundAddress).to.equal('testing');
-      });
-    });
-
-    describe('setStage', () => {
-      it('sets the state', () => {
-        store.setStage('testing');
-        expect(store.stage).to.equal('testing');
-      });
-    });
-
-    describe('setWarning', () => {
-      it('sets the warning', () => {
-        store.setWarning(-999);
-
-        expect(store.warning).to.equal(-999);
-      });
-
-      it('clears the warning with no parameters', () => {
-        store.setWarning(-999);
-        store.setWarning();
-
-        expect(store.warning).to.equal(WARNING_NONE);
-      });
-    });
-
-    describe('toggleAcceptTerms', () => {
-      it('changes state on hasAcceptedTerms', () => {
-        store.toggleAcceptTerms();
-        expect(store.hasAcceptedTerms).to.be.true;
-      });
-    });
-  });
-
-  describe('operations', () => {
-    describe('getCoinPrice', () => {
-      beforeEach(() => {
-        sinon.stub(store._shapeshiftApi, 'getMarketInfo').resolves('testPrice');
-        return store.getCoinPrice();
-      });
-
-      afterEach(() => {
-        store._shapeshiftApi.getMarketInfo.restore();
-      });
-
-      it('retrieves the market info from ShapeShift', () => {
-        expect(store._shapeshiftApi.getMarketInfo).to.have.been.calledWith('btc_eth');
-      });
-
-      it('stores the price retrieved', () => {
-        expect(store.price).to.equal('testPrice');
-      });
-
-      it('sets a warning on failure', () => {
-        store._shapeshiftApi.getMarketInfo.restore();
-        sinon.stub(store._shapeshiftApi, 'getMarketInfo').rejects('someError');
-
-        return store.getCoinPrice().then(() => {
-          expect(store.warning).to.equal(WARNING_NO_PRICE);
-        });
-      });
-    });
-
-    describe('retrieveCoins', () => {
-      beforeEach(() => {
-        sinon.stub(store._shapeshiftApi, 'getCoins').resolves({
-          BTC: { symbol: 'BTC', status: 'available' },
-          ETC: { symbol: 'ETC' },
-          XMR: { symbol: 'XMR', status: 'available' }
-        });
-        sinon.stub(store, 'getCoinPrice');
-        return store.retrieveCoins();
-      });
-
-      afterEach(() => {
-        store._shapeshiftApi.getCoins.restore();
-        store.getCoinPrice.restore();
-      });
-
-      it('retrieves the coins from ShapeShift', () => {
-        expect(store._shapeshiftApi.getCoins).to.have.been.called;
-      });
-
-      it('sets the available coins', () => {
-        expect(store.coins.peek()).to.deep.equal([
-          { status: 'available', symbol: 'BTC' },
-          { status: 'available', symbol: 'XMR' }
-        ]);
-      });
-
-      it('retrieves the price once resolved', () => {
-        expect(store.getCoinPrice).to.have.been.called;
-      });
-    });
-
-    describe('shift', () => {
-      beforeEach(() => {
-        sinon.stub(store, 'subscribe').resolves();
-        sinon.stub(store._shapeshiftApi, 'shift').resolves({ deposit: 'depositAddress' });
-        store.setRefundAddress('refundAddress');
-
-        return store.shift();
-      });
-
-      afterEach(() => {
-        store.subscribe.restore();
-        store._shapeshiftApi.shift.restore();
-      });
-
-      it('moves to stage STAGE_WAIT_DEPOSIT', () => {
-        expect(store.stage).to.equal(STAGE_WAIT_DEPOSIT);
-      });
-
-      it('calls ShapeShift with the correct parameters', () => {
-        expect(store._shapeshiftApi.shift).to.have.been.calledWith(ADDRESS, 'refundAddress', store.coinPair);
-      });
-
-      it('sets the depositAddress', () => {
-        expect(store.depositAddress).to.equal('depositAddress');
-      });
-
-      it('subscribes to updates', () => {
-        expect(store.subscribe).to.have.been.called;
-      });
-
-      it('sets error when shift fails', () => {
-        store._shapeshiftApi.shift.restore();
-        sinon.stub(store._shapeshiftApi, 'shift').rejects({ message: 'testingError' });
-
-        return store.shift().then(() => {
-          expect(store.error).to.match(/testingError/);
-        });
-      });
-    });
-
-    describe('subscribe', () => {
-      beforeEach(() => {
-        sinon.stub(store._shapeshiftApi, 'subscribe');
-        store.setDepositAddress('depositAddress');
-        return store.subscribe();
-      });
-
-      afterEach(() => {
-        store._shapeshiftApi.subscribe.restore();
-      });
-
-      it('calls into the ShapeShift subscribe', () => {
-        expect(store._shapeshiftApi.subscribe).to.have.been.calledWith('depositAddress', store.onExchangeInfo);
-      });
-
-      describe('onExchangeInfo', () => {
-        it('sets the error when fatal error retrieved', () => {
-          store.onExchangeInfo({ fatal: true, message: 'testing' });
-          expect(store.error.message).to.equal('testing');
-        });
-
-        it('does not set the error when non-fatal error retrieved', () => {
-          store.onExchangeInfo({ message: 'testing' });
-          expect(store.error).to.be.null;
-        });
-
-        describe('status received', () => {
-          const INFO = { status: 'received' };
-
-          beforeEach(() => {
-            store.onExchangeInfo(null, INFO);
-          });
-
-          it('sets the depositInfo', () => {
-            expect(store.depositInfo).to.deep.equal(INFO);
-          });
-
-          it('only advanced depositInfo once', () => {
-            store.onExchangeInfo(null, Object.assign({}, INFO, { state: 'secondTime' }));
-            expect(store.depositInfo).to.deep.equal(INFO);
-          });
-        });
-
-        describe('status completed', () => {
-          const INFO = { status: 'complete' };
-
-          beforeEach(() => {
-            store.onExchangeInfo(null, INFO);
-          });
-
-          it('sets the depositInfo', () => {
-            expect(store.exchangeInfo).to.deep.equal(INFO);
-          });
-
-          it('only advanced depositInfo once', () => {
-            store.onExchangeInfo(null, Object.assign({}, INFO, { state: 'secondTime' }));
-            expect(store.exchangeInfo).to.deep.equal(INFO);
-          });
-        });
-      });
-    });
-
-    describe('unsubscribe', () => {
-      beforeEach(() => {
-        sinon.stub(store._shapeshiftApi, 'unsubscribe');
-        store.setDepositAddress('depositAddress');
-        return store.unsubscribe();
-      });
-
-      afterEach(() => {
-        store._shapeshiftApi.unsubscribe.restore();
-      });
-
-      it('calls into the ShapeShift unsubscribe', () => {
-        expect(store._shapeshiftApi.unsubscribe).to.have.been.calledWith('depositAddress');
-      });
-    });
-  });
-});
diff --git a/js/src/modals/Transfer/Details/details.js b/js/src/modals/Transfer/Details/details.js
deleted file mode 100644
index 9b5182cea3ba75ddd6730bd05f967ffb45582505..0000000000000000000000000000000000000000
--- a/js/src/modals/Transfer/Details/details.js
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Checkbox } from 'material-ui';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import Form, { Input, InputAddressSelect, AddressSelect } from '~/ui/Form';
-import { nullableProptype } from '~/util/proptypes';
-
-import TokenSelect from './tokenSelect';
-import styles from '../transfer.css';
-
-export const CHECK_STYLE = {
-  position: 'absolute',
-  top: '38px',
-  left: '1em'
-};
-
-export default class Details extends Component {
-  static propTypes = {
-    address: PropTypes.string,
-    balance: PropTypes.object,
-    all: PropTypes.bool,
-    extras: PropTypes.bool,
-    sender: PropTypes.string,
-    senderError: PropTypes.string,
-    recipient: PropTypes.string,
-    recipientError: PropTypes.string,
-    token: PropTypes.object,
-    total: PropTypes.string,
-    totalError: PropTypes.string,
-    value: PropTypes.string,
-    valueError: PropTypes.string,
-    onChange: PropTypes.func.isRequired,
-    wallet: PropTypes.object,
-    senders: nullableProptype(PropTypes.object)
-  };
-
-  static defaultProps = {
-    wallet: null,
-    senders: null
-  };
-
-  render () {
-    const { all, extras, token, total, totalError, value, valueError } = this.props;
-    const label = (
-      <FormattedMessage
-        id='transfer.details.amount.label'
-        defaultMessage='amount to transfer (in {tag})'
-        values={ {
-          tag: token.tag
-        } }
-      />
-    );
-
-    return (
-      <Form>
-        { this.renderTokenSelect() }
-        { this.renderFromAddress() }
-        { this.renderToAddress() }
-        <div className={ styles.columns }>
-          <div>
-            <Input
-              disabled={ all }
-              label={ label }
-              hint={
-                <FormattedMessage
-                  id='transfer.details.amount.hint'
-                  defaultMessage='the amount to transfer to the recipient'
-                />
-              }
-              value={ value }
-              error={ valueError }
-              onChange={ this.onEditValue }
-            />
-          </div>
-          <div>
-            <Checkbox
-              checked={ all }
-              label={
-                <FormattedMessage
-                  id='transfer.details.fullBalance.label'
-                  defaultMessage='full account balance'
-                />
-              }
-              onCheck={ this.onCheckAll }
-              style={ CHECK_STYLE }
-            />
-          </div>
-        </div>
-        <div className={ styles.columns }>
-          <div>
-            <Input
-              disabled
-              label={
-                <FormattedMessage
-                  id='transfer.details.total.label'
-                  defaultMessage='total transaction amount'
-                />
-              }
-              error={ totalError }
-            >
-              <div className={ styles.inputoverride }>
-                { total }<small> ETH</small>
-              </div>
-            </Input>
-          </div>
-
-          <div>
-            <Checkbox
-              checked={ extras }
-              label={
-                <FormattedMessage
-                  id='transfer.details.advanced.label'
-                  defaultMessage='advanced sending options'
-                />
-              }
-              onCheck={ this.onCheckExtras }
-              style={ CHECK_STYLE }
-            />
-          </div>
-        </div>
-      </Form>
-    );
-  }
-
-  renderFromAddress () {
-    const { sender, senderError, senders } = this.props;
-
-    if (!senders) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.address }>
-        <AddressSelect
-          accounts={ senders }
-          error={ senderError }
-          label={
-            <FormattedMessage
-              id='transfer.details.sender.label'
-              defaultMessage='sender address'
-            />
-          }
-          hint={
-            <FormattedMessage
-              id='transfer.details.sender.hint'
-              defaultMessage='the sender address'
-            />
-          }
-          value={ sender }
-          onChange={ this.onEditSender }
-        />
-      </div>
-    );
-  }
-
-  renderToAddress () {
-    const { recipient, recipientError } = this.props;
-
-    return (
-      <div className={ styles.address }>
-        <InputAddressSelect
-          label={
-            <FormattedMessage
-              id='transfer.details.recipient.label'
-              defaultMessage='recipient address'
-            />
-          }
-          hint={
-            <FormattedMessage
-              id='transfer.details.recipient.hint'
-              defaultMessage='the recipient address'
-            />
-          }
-          error={ recipientError }
-          value={ recipient }
-          onChange={ this.onEditRecipient }
-        />
-      </div>
-    );
-  }
-
-  renderTokenSelect () {
-    const { balance, token } = this.props;
-
-    return (
-      <TokenSelect
-        balance={ balance }
-        onChange={ this.onChangeToken }
-        value={ token.id }
-      />
-    );
-  }
-
-  onChangeToken = (event, index, tokenId) => {
-    this.props.onChange('token', tokenId);
-  }
-
-  onEditSender = (event, sender) => {
-    this.props.onChange('sender', sender);
-  }
-
-  onEditRecipient = (event, recipient) => {
-    this.props.onChange('recipient', recipient);
-  }
-
-  onEditValue = (event) => {
-    this.props.onChange('value', event.target.value);
-  }
-
-  onCheckAll = () => {
-    this.props.onChange('all', !this.props.all);
-  }
-
-  onCheckExtras = () => {
-    this.props.onChange('extras', !this.props.extras);
-  }
-
-  onContacts = () => {
-    this.setState({
-      showAddresses: true
-    });
-  }
-}
diff --git a/js/src/modals/Transfer/Details/index.js b/js/src/modals/Transfer/Details/index.js
deleted file mode 100644
index b5dd07dd531e60a0715948a39cfdf7efb2c2fa63..0000000000000000000000000000000000000000
--- a/js/src/modals/Transfer/Details/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './details';
diff --git a/js/src/modals/Transfer/Details/tokenSelect.js b/js/src/modals/Transfer/Details/tokenSelect.js
deleted file mode 100644
index 7f18e304bce5b37ca12bb700b68167f024a057a2..0000000000000000000000000000000000000000
--- a/js/src/modals/Transfer/Details/tokenSelect.js
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { MenuItem } from 'material-ui';
-import { isEqual } from 'lodash';
-
-import { Select } from '~/ui/Form';
-import TokenImage from '~/ui/TokenImage';
-
-import styles from '../transfer.css';
-
-class TokenSelect extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  };
-
-  static propTypes = {
-    onChange: PropTypes.func.isRequired,
-    balance: PropTypes.object.isRequired,
-    tokens: PropTypes.object.isRequired,
-    value: PropTypes.string.isRequired
-  };
-
-  componentWillMount () {
-    this.computeTokens();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const prevTokens = Object.keys(this.props.balance)
-      .map((tokenId) => `${tokenId}_${this.props.balance[tokenId].toNumber()}`);
-    const nextTokens = Object.keys(nextProps.balance)
-      .map((tokenId) => `${tokenId}_${nextProps.balance[tokenId].toNumber()}`);
-
-    if (!isEqual(prevTokens, nextTokens)) {
-      this.computeTokens(nextProps);
-    }
-  }
-
-  computeTokens (props = this.props) {
-    const { api } = this.context;
-    const { balance, tokens } = this.props;
-
-    const items = Object.keys(balance)
-      .map((tokenId) => {
-        const token = tokens[tokenId];
-        const tokenValue = balance[tokenId];
-        const isEth = token.native;
-
-        if (!isEth && tokenValue.eq(0)) {
-          return null;
-        }
-
-        let value = 0;
-
-        if (isEth) {
-          value = api.util.fromWei(tokenValue).toFormat(3);
-        } else {
-          const format = token.format || 1;
-          const decimals = format === 1 ? 0 : Math.min(3, Math.floor(format / 10));
-
-          value = new BigNumber(tokenValue).div(format).toFormat(decimals);
-        }
-
-        const label = (
-          <div className={ styles.token }>
-            <TokenImage token={ token } />
-            <div className={ styles.tokenname }>
-              { token.name }
-            </div>
-            <div className={ styles.tokenbalance }>
-              { value }<small> { token.tag }</small>
-            </div>
-          </div>
-        );
-
-        return (
-          <MenuItem
-            key={ tokenId }
-            value={ token.id }
-            label={ label }
-          >
-            { label }
-          </MenuItem>
-        );
-      })
-      .filter((node) => node);
-
-    this.setState({ items });
-  }
-
-  render () {
-    const { onChange, value } = this.props;
-    const { items } = this.state;
-
-    return (
-      <Select
-        className={ styles.tokenSelect }
-        label='type of token transfer'
-        hint='type of token to transfer'
-        value={ value }
-        onChange={ onChange }
-      >
-        { items }
-      </Select>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { tokens } = state;
-
-  return { tokens };
-}
-
-export default connect(mapStateToProps)(TokenSelect);
diff --git a/js/src/modals/Transfer/Extras/extras.js b/js/src/modals/Transfer/Extras/extras.js
deleted file mode 100644
index c3e2d1a8e6895360bd3e50305737205aa06e58b4..0000000000000000000000000000000000000000
--- a/js/src/modals/Transfer/Extras/extras.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { GasPriceEditor, Form, Input } from '~/ui';
-
-import styles from '../transfer.css';
-
-export default class Extras extends Component {
-  static propTypes = {
-    data: PropTypes.string,
-    dataError: PropTypes.string,
-    hideData: PropTypes.bool,
-    gasStore: PropTypes.object.isRequired,
-    isEth: PropTypes.bool,
-    onChange: PropTypes.func,
-    total: PropTypes.string,
-    totalError: PropTypes.string
-  };
-
-  static defaultProps = {
-    hideData: false
-  };
-
-  render () {
-    const { gasStore, onChange } = this.props;
-
-    return (
-      <Form>
-        { this.renderData() }
-        <div className={ styles.gaseditor }>
-          <GasPriceEditor
-            store={ gasStore }
-            onChange={ onChange }
-          />
-        </div>
-      </Form>
-    );
-  }
-
-  renderData () {
-    const { isEth, data, dataError, hideData } = this.props;
-
-    if (!isEth || hideData) {
-      return null;
-    }
-
-    return (
-      <Input
-        error={ dataError }
-        hint={
-          <FormattedMessage
-            id='transfer.advanced.data.hint'
-            defaultMessage='the data to pass through with the transaction'
-          />
-        }
-        label={
-          <FormattedMessage
-            id='transfer.advanced.data.label'
-            defaultMessage='transaction data'
-          />
-        }
-        onChange={ this.onEditData }
-        value={ data }
-      />
-    );
-  }
-
-  onEditData = (event) => {
-    this.props.onChange('data', event.target.value);
-  }
-}
diff --git a/js/src/modals/Transfer/Extras/index.js b/js/src/modals/Transfer/Extras/index.js
deleted file mode 100644
index 98909db40bac17413e02d083ff37ce8116bbf09a..0000000000000000000000000000000000000000
--- a/js/src/modals/Transfer/Extras/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './extras';
diff --git a/js/src/modals/Transfer/errors.js b/js/src/modals/Transfer/errors.js
deleted file mode 100644
index 2aac3ccda0368eab96405d4474c853578c536be6..0000000000000000000000000000000000000000
--- a/js/src/modals/Transfer/errors.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const ERRORS = {
-  requireSender: 'a valid sender is required for the transaction',
-  requireRecipient: 'a recipient network address is required for the transaction',
-  invalidAddress: 'the supplied address is an invalid network address',
-  invalidAmount: 'the supplied amount should be a valid positive number',
-  invalidDecimals: 'the supplied amount exceeds the allowed decimals',
-  largeAmount: 'the transaction total is higher than the available balance',
-  gasException: 'the transaction will throw an exception with the current values',
-  gasBlockLimit: 'the transaction execution will exceed the block gas limit'
-};
-
-export default ERRORS;
diff --git a/js/src/modals/Transfer/index.js b/js/src/modals/Transfer/index.js
deleted file mode 100644
index e366ead6d02bb22bff53dfe84447dc5d1ae485b6..0000000000000000000000000000000000000000
--- a/js/src/modals/Transfer/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './transfer';
diff --git a/js/src/modals/Transfer/store.js b/js/src/modals/Transfer/store.js
deleted file mode 100644
index eaccf4f40c9026e12daa24c4600917136588275d..0000000000000000000000000000000000000000
--- a/js/src/modals/Transfer/store.js
+++ /dev/null
@@ -1,516 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { noop } from 'lodash';
-import { observable, computed, action, transaction } from 'mobx';
-import BigNumber from 'bignumber.js';
-
-import { eip20 as tokenAbi } from '~/contracts/abi';
-import { fromWei } from '~/api/util/wei';
-import ERRORS from './errors';
-import { DEFAULT_GAS } from '~/util/constants';
-import { ETH_TOKEN } from '~/util/tokens';
-import { getTxOptions } from '~/util/tx';
-import GasPriceStore from '~/ui/GasPriceEditor/store';
-import { getLogger, LOG_KEYS } from '~/config';
-
-const log = getLogger(LOG_KEYS.TransferModalStore);
-
-const TITLES = {
-  transfer: 'transfer details',
-  extras: 'extra information'
-};
-const STAGES_BASIC = [TITLES.transfer];
-const STAGES_EXTRA = [TITLES.transfer, TITLES.extras];
-
-export const WALLET_WARNING_SPENT_TODAY_LIMIT = 'WALLET_WARNING_SPENT_TODAY_LIMIT';
-
-export default class TransferStore {
-  @observable stage = 0;
-  @observable extras = false;
-  @observable isEth = true;
-  @observable valueAll = false;
-  @observable sending = false;
-  @observable token = ETH_TOKEN;
-
-  @observable data = '';
-  @observable dataError = null;
-
-  @observable recipient = '';
-  @observable recipientError = ERRORS.requireRecipient;
-
-  @observable sender = '';
-  @observable senderError = null;
-  @observable sendersBalances = {};
-
-  @observable total = '0.0';
-  @observable totalError = null;
-
-  @observable value = '0.0';
-  @observable valueError = null;
-
-  @observable walletWarning = null;
-
-  account = null;
-  balance = null;
-
-  onClose = noop;
-  senders = null;
-  isWallet = false;
-  tokenContract = null;
-  tokens = {};
-  wallet = null;
-
-  gasStore = null;
-
-  constructor (api, props) {
-    this.api = api;
-
-    const { account, balance, gasLimit, onClose, senders, newError, sendersBalances, tokens } = props;
-
-    this.account = account;
-    this.balance = balance;
-    this.isWallet = account && account.wallet;
-    this.newError = newError;
-    this.tokens = tokens;
-
-    this.gasStore = new GasPriceStore(api, { gasLimit });
-    this.tokenContract = api.newContract(tokenAbi, '');
-
-    if (this.isWallet) {
-      this.wallet = props.wallet;
-    }
-
-    if (senders) {
-      this.senders = senders;
-      this.sendersBalances = sendersBalances;
-      this.senderError = ERRORS.requireSender;
-    }
-
-    if (onClose) {
-      this.onClose = onClose;
-    }
-  }
-
-  @computed get steps () {
-    const steps = [].concat(this.extras ? STAGES_EXTRA : STAGES_BASIC);
-
-    return steps;
-  }
-
-  @computed get isValid () {
-    const detailsValid = !this.recipientError && !this.valueError && !this.totalError && !this.senderError;
-    const extrasValid = !this.gasStore.errorGas && !this.gasStore.errorPrice && !this.gasStore.conditionBlockError && !this.totalError;
-
-    switch (this.stage) {
-      case 0:
-        return detailsValid;
-
-      case 1:
-        return extrasValid;
-    }
-  }
-
-  @action onNext = () => {
-    this.stage += 1;
-  }
-
-  @action onPrev = () => {
-    this.stage -= 1;
-  }
-
-  @action handleClose = () => {
-    this.stage = 0;
-    this.onClose();
-  }
-
-  @action onUpdateDetails = (type, value) => {
-    switch (type) {
-      case 'all':
-        return this._onUpdateAll(value);
-
-      case 'extras':
-        return this._onUpdateExtras(value);
-
-      case 'data':
-        return this._onUpdateData(value);
-
-      case 'gas':
-        return this._onUpdateGas(value);
-
-      case 'gasPrice':
-        return this._onUpdateGasPrice(value);
-
-      case 'recipient':
-        return this._onUpdateRecipient(value);
-
-      case 'sender':
-        return this._onUpdateSender(value);
-
-      case 'token':
-        return this._onUpdateToken(value);
-
-      case 'value':
-        return this._onUpdateValue(value);
-    }
-  }
-
-  @action onSend = () => {
-    this.onNext();
-    this.sending = true;
-
-    this
-      .send()
-      .catch((error) => {
-        this.newError(error);
-      })
-      .then(() => {
-        this.handleClose();
-      });
-  }
-
-  @action _onUpdateAll = (valueAll) => {
-    this.valueAll = valueAll;
-    this.recalculateGas();
-  }
-
-  @action _onUpdateExtras = (extras) => {
-    this.extras = extras;
-  }
-
-  @action _onUpdateData = (data) => {
-    this.data = data;
-    this.recalculateGas();
-  }
-
-  @action _onUpdateGas = (gas) => {
-    this.recalculate();
-  }
-
-  @action _onUpdateGasPrice = (gasPrice) => {
-    this.recalculate();
-  }
-
-  @action _onUpdateRecipient = (recipient) => {
-    let recipientError = null;
-
-    if (!recipient || !recipient.length) {
-      recipientError = ERRORS.requireRecipient;
-    } else if (!this.api.util.isAddressValid(recipient)) {
-      recipientError = ERRORS.invalidAddress;
-    }
-
-    transaction(() => {
-      this.recipient = recipient;
-      this.recipientError = recipientError;
-
-      this.recalculateGas();
-    });
-  }
-
-  @action _onUpdateSender = (sender) => {
-    let senderError = null;
-
-    if (!sender || !sender.length) {
-      senderError = ERRORS.requireSender;
-    } else if (!this.api.util.isAddressValid(sender)) {
-      senderError = ERRORS.invalidAddress;
-    }
-
-    transaction(() => {
-      this.sender = sender;
-      this.senderError = senderError;
-
-      this.recalculateGas();
-    });
-  }
-
-  @action _onUpdateToken = (tokenId) => {
-    transaction(() => {
-      this.token = { ...this.tokens[tokenId] };
-      this.isEth = this.token.native;
-
-      this.recalculateGas();
-    });
-  }
-
-  @action _onUpdateValue = (value) => {
-    let valueError = this._validatePositiveNumber(value);
-
-    if (!valueError) {
-      valueError = this._validateDecimals(value);
-    }
-
-    if (this.isWallet && !valueError) {
-      const { last, limit, spent } = this.wallet.dailylimit;
-
-      // Don't show a warning if the limit is 0
-      // (will always need confirmations)
-      if (limit.gt(0)) {
-        const remains = fromWei(limit.minus(spent));
-        const today = Math.round(Date.now() / (24 * 3600 * 1000));
-        const willResetLimit = last.lt(today);
-
-        if ((!willResetLimit && remains.lt(value)) || fromWei(limit).lt(value)) {
-          // already spent too much today
-          this.walletWarning = WALLET_WARNING_SPENT_TODAY_LIMIT;
-        } else if (this.walletWarning) {
-          // all ok
-          this.walletWarning = null;
-        }
-      }
-    }
-
-    transaction(() => {
-      this.value = value;
-      this.valueError = valueError;
-
-      this.recalculateGas();
-    });
-  }
-
-  @action recalculateGas = (redo = true) => {
-    if (!this.isValid) {
-      return this.recalculate(redo);
-    }
-
-    return this
-      .estimateGas()
-      .then((gasEst) => {
-        let gas = gasEst;
-
-        if (gas.gt(DEFAULT_GAS)) {
-          gas = gas.mul(1.2);
-        }
-
-        transaction(() => {
-          this.gasStore.setEstimated(gasEst.toFixed(0));
-          this.gasStore.setGas(gas.toFixed(0));
-
-          this.recalculate(redo);
-        });
-      })
-      .catch((error) => {
-        this.gasStore.setEstimatedError();
-        console.warn('etimateGas', error);
-        this.recalculate(redo);
-      });
-  }
-
-  /**
-   * Return the balance of the selected token
-   * (in WEI for ETH, without formating for other tokens)
-   */
-  getTokenBalance (token = this.token, address = this.account.address) {
-    const balance = address === this.account.address
-      ? this.balance
-      : this.sendersBalances[address];
-
-    return new BigNumber(balance[token.id] || 0);
-  }
-
-  getTokenValue (token = this.token, value = this.value, inverse = false) {
-    let _value;
-
-    try {
-      _value = new BigNumber(value || 0);
-    } catch (error) {
-      _value = new BigNumber(0);
-    }
-
-    if (inverse) {
-      return _value.div(token.format);
-    }
-
-    return _value.mul(token.format);
-  }
-
-  getValue () {
-    const { valueAll, isEth, isWallet } = this;
-
-    if (!valueAll) {
-      const value = this.getTokenValue();
-
-      return value;
-    }
-
-    const balance = this.getTokenBalance();
-
-    if (!isEth || isWallet) {
-      return balance;
-    }
-
-    // substract the gas estimate
-    const gasTotal = new BigNumber(this.gasStore.price || 0)
-      .mul(new BigNumber(this.gasStore.gas || 0));
-
-    const totalEthValue = balance.gt(gasTotal)
-      ? balance.minus(gasTotal)
-      : new BigNumber(0);
-
-    return totalEthValue;
-  }
-
-  getFormattedTokenValue (tokenValue) {
-    return this.getTokenValue(this.token, tokenValue, true);
-  }
-
-  @action recalculate = (redo = false) => {
-    const { account, balance } = this;
-
-    if (!account || !balance) {
-      return;
-    }
-
-    return this.getTransactionOptions()
-      .then((options) => {
-        const gasTotal = options.gas.mul(options.gasPrice);
-
-        const tokenValue = this.getValue();
-        const ethValue = options.value.add(gasTotal);
-
-        const tokenBalance = this.getTokenBalance();
-        const ethBalance = this.getTokenBalance(ETH_TOKEN, options.from);
-
-        let totalError = null;
-        let valueError = null;
-
-        if (tokenValue.gt(tokenBalance)) {
-          valueError = ERRORS.largeAmount;
-        }
-
-        if (ethValue.gt(ethBalance)) {
-          totalError = ERRORS.largeAmount;
-        }
-
-        log.debug('@recalculate', {
-          eth: ethValue.toFormat(),
-          token: tokenValue.toFormat(),
-          ethBalance: ethBalance.toFormat(),
-          tokenBalance: tokenBalance.toFormat(),
-          gasTotal: gasTotal.toFormat()
-        });
-
-        transaction(() => {
-          this.totalError = totalError;
-          this.valueError = valueError;
-          this.gasStore.setErrorTotal(totalError);
-          this.gasStore.setEthValue(options.value);
-
-          this.total = fromWei(ethValue).toFixed();
-
-          const nextValue = this.getFormattedTokenValue(tokenValue);
-          let prevValue;
-
-          try {
-            prevValue = new BigNumber(this.value || 0);
-          } catch (error) {
-            prevValue = new BigNumber(0);
-          }
-
-          // Change the input only if necessary
-          if (!nextValue.eq(prevValue)) {
-            this.value = nextValue.toString();
-          }
-
-          // Re Calculate gas once more to be sure
-          if (redo) {
-            return this.recalculateGas(false);
-          }
-        });
-      });
-  }
-
-  estimateGas () {
-    return this.getTransactionOptions()
-      .then((options) => {
-        return this.api.eth.estimateGas(options);
-      });
-  }
-
-  send () {
-    return this.getTransactionOptions()
-      .then((options) => {
-        log.debug('@send', 'transfer value', options.value && options.value.toFormat());
-
-        return this.api.parity.postTransaction(options);
-      });
-  }
-
-  getTransactionOptions () {
-    const [ func, options, values ] = this._getTransactionArgs();
-
-    return getTxOptions(this.api, func, options, values)
-      .then((_options) => {
-        delete _options.sender;
-        return _options;
-      });
-  }
-
-  _getTransactionArgs () {
-    const { isEth } = this;
-
-    const value = this.getValue();
-    const options = this.gasStore.overrideTransaction({
-      from: this.account.address,
-      sender: this.sender
-    });
-
-    // A simple ETH transfer
-    if (isEth) {
-      options.value = value;
-      options.data = this.data || '';
-      options.to = this.recipient;
-
-      return [ null, options ];
-    }
-
-    // A token transfer
-    const tokenContract = this.tokenContract.at(this.token.address);
-    const values = [
-      this.recipient,
-      value
-    ];
-
-    options.to = this.token.address;
-
-    return [ tokenContract.instance.transfer, options, values ];
-  }
-
-  _validatePositiveNumber (num) {
-    try {
-      const v = new BigNumber(num);
-
-      if (v.lt(0)) {
-        return ERRORS.invalidAmount;
-      }
-    } catch (e) {
-      return ERRORS.invalidAmount;
-    }
-
-    return null;
-  }
-
-  _validateDecimals (num) {
-    const s = new BigNumber(num).mul(this.token.format || 1).toFixed();
-
-    if (s.indexOf('.') !== -1) {
-      return ERRORS.invalidDecimals;
-    }
-
-    return null;
-  }
-}
diff --git a/js/src/modals/Transfer/transfer.css b/js/src/modals/Transfer/transfer.css
deleted file mode 100644
index 36f0d278f65d264d7485a79bf536c85521cd6ff2..0000000000000000000000000000000000000000
--- a/js/src/modals/Transfer/transfer.css
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.columns {
-  display: flex;
-  position: relative;
-  flex-wrap: wrap;
-
-  &>div {
-    flex: 0 1 50%;
-    position: relative;
-    width: 50%;
-  }
-}
-
-.gaseditor {
-  margin-top: 1em;
-}
-
-.info {
-  line-height: 1.618em;
-  width: 100%;
-}
-
-.row {
-  display: flex;
-  flex-direction: column;
-  flex-wrap: wrap;
-  position: relative;
-}
-
-.floatbutton {
-  float: right;
-  margin-left: -100%;
-  margin-top: 28px;
-  text-align: right;
-
-  &>div {
-    margin-right: 0.5em;
-  }
-}
-
-.token {
-  height: 32px;
-  padding: 4px 0;
-
-  img {
-    height: 32px;
-    width: 32px;
-    margin: 0 16px 0 0;
-    z-index: 10;
-  }
-
-  div {
-    height: 32px;
-    line-height: 32px;
-    display: inline-block;
-    vertical-align: top;
-  }
-}
-
-.tokenSelect {
-  .token {
-    margin-top: 10px;
-  }
-}
-
-.tokenbalance {
-  display: inline-block;
-  color: #aaa;
-  padding-left: 1em;
-}
-
-.tokenname {}
-
-.address {
-  position: relative;
-}
-
-.from {
-  padding: 25px 0 0 48px !important;
-  line-height: 32px;
-}
-
-.fromaddress {
-  text-transform: uppercase;
-  display: inline-block;
-}
-
-.frombalance {
-  display: inline-block;
-  color: #aaa;
-  padding-left: 1em;
-}
-
-.icon {
-  position: absolute;
-  top: 35px;
-}
-
-.grayscale {
-  -webkit-filter: grayscale(1);
-  filter: grayscale(1);
-  opacity: 0;
-}
-
-.hdraccount {
-  padding: 1em 0 0 0;
-}
-
-.hdrimage {
-  display: inline-block;
-}
-
-.hdrdetails {
-  display: inline-block;
-}
-
-.hdrname {
-  text-transform: uppercase;
-}
-
-.hdraddress {
-  color: #aaa;
-  font-size: 0.75em;
-}
-
-.inputoverride {
-  padding-top: 24px !important;
-}
-
-.contentTitle {
-  font-size: 1.2rem;
-}
-
-.warning {
-  border-radius: 0.5em;
-  background: #f80;
-  color: white;
-  font-size: 0.75em;
-  margin-bottom: 1em;
-  padding: 0.75em;
-  text-align: center;
-}
diff --git a/js/src/modals/Transfer/transfer.js b/js/src/modals/Transfer/transfer.js
deleted file mode 100644
index ab769ff02dab4628df48bebc17ebccfb2560fefa..0000000000000000000000000000000000000000
--- a/js/src/modals/Transfer/transfer.js
+++ /dev/null
@@ -1,313 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { observer } from 'mobx-react';
-import { pick } from 'lodash';
-
-import { Button, IdentityIcon, Portal, Warning } from '~/ui';
-import { newError } from '~/ui/Errors/actions';
-import { CancelIcon, NextIcon, PrevIcon } from '~/ui/Icons';
-import { nullableProptype } from '~/util/proptypes';
-
-import Details from './Details';
-import Extras from './Extras';
-
-import TransferStore, { WALLET_WARNING_SPENT_TODAY_LIMIT } from './store';
-import styles from './transfer.css';
-
-const STEP_DETAILS = 0;
-const STEP_EXTRA = 1;
-
-@observer
-class Transfer extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    newError: PropTypes.func.isRequired,
-    gasLimit: PropTypes.object.isRequired,
-
-    account: PropTypes.object,
-    balance: PropTypes.object,
-    onClose: PropTypes.func,
-    senders: nullableProptype(PropTypes.object),
-    sendersBalances: nullableProptype(PropTypes.object),
-    tokens: PropTypes.object,
-    wallet: PropTypes.object
-  }
-
-  store = new TransferStore(this.context.api, this.props);
-
-  render () {
-    const { stage, steps } = this.store;
-
-    return (
-      <Portal
-        activeStep={ stage }
-        buttons={ this.renderDialogActions() }
-        onClose={ this.handleClose }
-        open
-        steps={ steps }
-      >
-        { this.renderExceptionWarning() }
-        { this.renderWalletWarning() }
-        { this.renderPage() }
-      </Portal>
-    );
-  }
-
-  renderExceptionWarning () {
-    const { errorEstimated } = this.store.gasStore;
-
-    if (!errorEstimated) {
-      return null;
-    }
-
-    return (
-      <Warning warning={ errorEstimated } />
-    );
-  }
-
-  renderWalletWarning () {
-    const { walletWarning } = this.store;
-
-    if (!walletWarning) {
-      return null;
-    }
-
-    if (walletWarning === WALLET_WARNING_SPENT_TODAY_LIMIT) {
-      const warning = (
-        <FormattedMessage
-          id='transfer.warning.wallet_spent_limit'
-          defaultMessage='This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.'
-        />
-      );
-
-      return (
-        <Warning warning={ warning } />
-      );
-    }
-
-    return null;
-  }
-
-  renderAccount () {
-    const { account } = this.props;
-
-    return (
-      <div className={ styles.hdraccount }>
-        <div className={ styles.hdrimage }>
-          <IdentityIcon
-            address={ account.address }
-            center
-            inline
-          />
-        </div>
-        <div className={ styles.hdrdetails }>
-          <div className={ styles.hdrname }>
-            { account.name || 'Unnamed' }
-          </div>
-          <div className={ styles.hdraddress }>
-            { account.address }
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderPage () {
-    const { extras, stage } = this.store;
-
-    if (stage === STEP_DETAILS) {
-      return this.renderDetailsPage();
-    } else if (stage === STEP_EXTRA && extras) {
-      return this.renderExtrasPage();
-    }
-  }
-
-  renderDetailsPage () {
-    const { account, balance, senders } = this.props;
-    const { recipient, recipientError, sender, senderError } = this.store;
-    const { valueAll, extras, token, total, totalError, value, valueError } = this.store;
-
-    return (
-      <Details
-        address={ account.address }
-        all={ valueAll }
-        balance={ balance }
-        extras={ extras }
-        onChange={ this.store.onUpdateDetails }
-        recipient={ recipient }
-        recipientError={ recipientError }
-        sender={ sender }
-        senderError={ senderError }
-        senders={ senders }
-        token={ token }
-        total={ total }
-        totalError={ totalError }
-        value={ value }
-        valueError={ valueError }
-        wallet={ account.wallet && this.props.wallet }
-      />
-    );
-  }
-
-  renderExtrasPage () {
-    if (!this.store.gasStore.histogram) {
-      return null;
-    }
-
-    const { isEth, data, dataError, total, totalError } = this.store;
-
-    return (
-      <Extras
-        data={ data }
-        dataError={ dataError }
-        gasStore={ this.store.gasStore }
-        isEth={ isEth }
-        onChange={ this.store.onUpdateDetails }
-        total={ total }
-        totalError={ totalError }
-      />
-    );
-  }
-
-  renderDialogActions () {
-    const { account } = this.props;
-    const { extras, sending, stage } = this.store;
-
-    const cancelBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='transfer.buttons.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.handleClose }
-      />
-    );
-    const nextBtn = (
-      <Button
-        disabled={ !this.store.isValid }
-        icon={ <NextIcon /> }
-        key='next'
-        label={
-          <FormattedMessage
-            id='transfer.buttons.next'
-            defaultMessage='Next'
-          />
-        }
-        onClick={ this.store.onNext }
-      />
-    );
-    const prevBtn = (
-      <Button
-        icon={ <PrevIcon /> }
-        key='back'
-        label={
-          <FormattedMessage
-            id='transfer.buttons.back'
-            defaultMessage='Back'
-          />
-        }
-        onClick={ this.store.onPrev }
-      />
-    );
-    const sendBtn = (
-      <Button
-        disabled={ !this.store.isValid || sending }
-        icon={
-          <IdentityIcon
-            address={ account.address }
-            button
-          />
-        }
-        key='send'
-        label={
-          <FormattedMessage
-            id='transfer.buttons.send'
-            defaultMessage='Send'
-          />
-        }
-        onClick={ this.store.onSend }
-      />
-    );
-
-    switch (stage) {
-      case 0:
-        return extras
-          ? [cancelBtn, nextBtn]
-          : [cancelBtn, sendBtn];
-      case 1:
-        return [cancelBtn, prevBtn, sendBtn];
-      default:
-        return [cancelBtn];
-    }
-  }
-
-  handleClose = () => {
-    this.store.handleClose();
-  }
-}
-
-function mapStateToProps (initState, initProps) {
-  const { tokens } = initState;
-  const { address } = initProps.account;
-
-  const isWallet = initProps.account && initProps.account.wallet;
-  const wallet = isWallet
-    ? initState.wallet.wallets[address]
-    : null;
-
-  const senders = isWallet
-    ? Object
-      .values(initState.personal.accounts)
-      .filter((account) => wallet.owners.includes(account.address))
-      .reduce((accounts, account) => {
-        accounts[account.address] = account;
-        return accounts;
-      }, {})
-    : null;
-
-  return (state) => {
-    const { gasLimit } = state.nodeStatus;
-    const { balances } = state;
-
-    const balance = balances[address];
-    const sendersBalances = senders ? pick(balances, Object.keys(senders)) : null;
-
-    return { balance, gasLimit, senders, sendersBalances, tokens, wallet };
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Transfer);
diff --git a/js/src/modals/UpgradeParity/index.js b/js/src/modals/UpgradeParity/index.js
deleted file mode 100644
index 1f805677fc1ad510c94bb240a88a27747cce5eff..0000000000000000000000000000000000000000
--- a/js/src/modals/UpgradeParity/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './upgradeParity';
diff --git a/js/src/modals/UpgradeParity/store.js b/js/src/modals/UpgradeParity/store.js
deleted file mode 100644
index 6d97488df28f1b7ba96ef6a47d33937fdaef69f9..0000000000000000000000000000000000000000
--- a/js/src/modals/UpgradeParity/store.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, observable, transaction, toJS } from 'mobx';
-import store from 'store';
-
-const LS_UPDATE = '_parity::update';
-
-const A_MINUTE = 60 * 1000;
-const A_DAY = 24 * 60 * A_MINUTE;
-
-const STEP_INFO = 0;
-const STEP_UPDATING = 1;
-const STEP_COMPLETED = 2;
-const STEP_ERROR = 2;
-
-let instance = null;
-
-export default class Store {
-  @observable available = null;
-  @observable consensusCapability = null;
-  @observable closed = true;
-  @observable error = null;
-  @observable remindAt = 0;
-  @observable step = 0;
-  @observable upgrading = null;
-  @observable version = null;
-
-  constructor (api) {
-    this._api = api;
-
-    this.loadStorage();
-    this.checkUpgrade();
-  }
-
-  @computed get isVisible () {
-    return !this.closed && Date.now() >= this.remindAt;
-  }
-
-  @action closeModal = () => {
-    transaction(() => {
-      this.closed = true;
-      this.setStep(0, null);
-    });
-  }
-
-  @action loadStorage = () => {
-    const values = store.get(LS_UPDATE) || {};
-
-    this.remindAt = values.remindAt ? values.remindAt : 0;
-
-    return values;
-  }
-
-  @action openModal = () => {
-    this.closed = false;
-  }
-
-  @action setStep = (step, error = null) => {
-    transaction(() => {
-      this.error = error;
-      this.step = step;
-    });
-  }
-
-  @action setUpgrading () {
-    transaction(() => {
-      this.upgrading = this.available;
-      this.setStep(STEP_UPDATING, null);
-    });
-  }
-
-  @action setVersions (available, version, consensusCapability) {
-    transaction(() => {
-      this.available = available;
-      this.consensusCapability = consensusCapability;
-      this.version = version;
-    });
-  }
-
-  @action snoozeTillTomorrow = () => {
-    this.remindAt = Date.now() + A_DAY;
-    store.set(LS_UPDATE, Object.assign(this.loadStorage(), { remindAt: this.remindAt }));
-  }
-
-  @action upgradeNow = () => {
-    this.setUpgrading();
-
-    return this._api.parity
-      .executeUpgrade()
-      .then((result) => {
-        if (!result) {
-          throw new Error('Unable to complete update');
-        }
-
-        this.setStep(STEP_COMPLETED, null);
-      })
-      .catch((error) => {
-        console.error('upgradeNow', error);
-
-        this.setStep(STEP_ERROR, error);
-      });
-  }
-
-  checkUpgrade = () => {
-    if (!this._api) {
-      return Promise.resolve(false);
-    }
-
-    return Promise
-      .all([
-        this._api.parity.upgradeReady(),
-        this._api.parity.consensusCapability(),
-        this._api.parity.versionInfo()
-      ])
-      .then(([available, consensusCapability, version]) => {
-        if (!this.version || version.hash !== this.version.hash) {
-          console.log('[checkUpgrade]', 'available:', available, 'version:', toJS(version.version), 'consensusCapability:', consensusCapability);
-        }
-
-        this.setVersions(available, version, consensusCapability);
-
-        return true;
-      })
-      .catch((error) => {
-        console.warn('checkUpgrade', error);
-
-        return false;
-      });
-  }
-
-  static get (api) {
-    if (!instance) {
-      instance = new Store(api);
-    }
-
-    return instance;
-  }
-}
-
-export {
-  STEP_COMPLETED,
-  STEP_ERROR,
-  STEP_INFO,
-  STEP_UPDATING
-};
diff --git a/js/src/modals/UpgradeParity/store.spec.js b/js/src/modals/UpgradeParity/store.spec.js
deleted file mode 100644
index 894fb1cc841f4ab5e85d9bcebdf59e64ff1e800e..0000000000000000000000000000000000000000
--- a/js/src/modals/UpgradeParity/store.spec.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Store from './store';
-
-let store;
-
-describe('modals/UpgradeParity/store', () => {
-  describe('@actions', () => {
-    beforeEach(() => {
-      store = new Store();
-    });
-
-    describe('openModal & closeModal', () => {
-      it('toggles between the closed states', () => {
-        expect(store.closed).to.be.true;
-        store.openModal();
-        expect(store.closed).to.be.false;
-        store.closeModal();
-        expect(store.closed).to.be.true;
-      });
-
-      it('resets the step state upon closing', () => {
-        store.setStep(5, 'soem error');
-        store.closeModal();
-        expect(store.step).to.equal(0);
-        expect(store.error).to.be.null;
-      });
-    });
-
-    describe('setStep', () => {
-      it('sets the step as provided', () => {
-        expect(store.step).to.equal(0);
-        store.setStep(3);
-        expect(store.step).to.equal(3);
-      });
-
-      it('sets the error when provided', () => {
-        expect(store.error).to.be.null;
-        store.setStep(3, new Error('some error'));
-        expect(store.error).to.match(/some error/);
-      });
-    });
-  });
-});
diff --git a/js/src/modals/UpgradeParity/upgradeParity.css b/js/src/modals/UpgradeParity/upgradeParity.css
deleted file mode 100644
index 50bfe4c475554d792b2b16815e122687454e4364..0000000000000000000000000000000000000000
--- a/js/src/modals/UpgradeParity/upgradeParity.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.error {
-  padding-top: 1.25em;
-}
-
-.step {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-
-  .icon {
-    height: 10em !important;
-    opacity: 0.5;
-    width: 10em !important;
-  }
-
-  .text {
-    background: rgba(0, 0, 0, 0.25);
-    line-height: 1.5em;
-    margin-left: 3em;
-    padding: 2em;
-    width: 100%;
-  }
-}
-
-.version {
-  display: inline;
-  opacity: 0.5;
-  white-space: normal;
-}
diff --git a/js/src/modals/UpgradeParity/upgradeParity.js b/js/src/modals/UpgradeParity/upgradeParity.js
deleted file mode 100644
index 874f8325a98b7a660762e7d0cea0ea972177b759..0000000000000000000000000000000000000000
--- a/js/src/modals/UpgradeParity/upgradeParity.js
+++ /dev/null
@@ -1,337 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Button, Portal } from '~/ui';
-import { CancelIcon, DoneIcon, ErrorIcon, NextIcon, UpdateIcon, UpdateWaitIcon } from '~/ui/Icons';
-
-import { STEP_COMPLETED, STEP_ERROR, STEP_INFO, STEP_UPDATING } from './store';
-import styles from './upgradeParity.css';
-
-@observer
-export default class UpgradeParity extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    store: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { store } = this.props;
-
-    if (!store.isVisible) {
-      return null;
-    }
-
-    return (
-      <Portal
-        activeStep={ store.step }
-        busySteps={ [ 1 ] }
-        buttons={ this.renderActions() }
-        onClose={ this.onClose }
-        open
-        steps={ [
-          <FormattedMessage
-            id='upgradeParity.step.info'
-            key='info'
-            defaultMessage='upgrade available'
-          />,
-          <FormattedMessage
-            key='updating'
-            id='upgradeParity.step.updating'
-            defaultMessage='upgrading parity'
-          />,
-          store.error
-            ? <FormattedMessage
-              id='upgradeParity.step.error'
-              key='error'
-              defaultMessage='error'
-              />
-            : <FormattedMessage
-              id='upgradeParity.step.completed'
-              key='completed'
-              defaultMessage='upgrade completed'
-              />
-        ] }
-      >
-        { this.renderStep() }
-      </Portal>
-    );
-  }
-
-  renderActions () {
-    const { store } = this.props;
-
-    const closeButton =
-      <Button
-        icon={ <CancelIcon /> }
-        key='close'
-        label={
-          <FormattedMessage
-            id='upgradeParity.button.close'
-            defaultMessage='close'
-          />
-        }
-        onClick={ this.onClose }
-      />;
-    const doneButton =
-      <Button
-        icon={ <DoneIcon /> }
-        key='done'
-        label={
-          <FormattedMessage
-            id='upgradeParity.button.done'
-            defaultMessage='done'
-          />
-        }
-        onClick={ this.onDone }
-      />;
-
-    switch (store.step) {
-      case STEP_INFO:
-        return [
-          <Button
-            icon={ <NextIcon /> }
-            key='upgrade'
-            label={
-              <FormattedMessage
-                id='upgradeParity.button.upgrade'
-                defaultMessage='upgrade now'
-              />
-            }
-            onClick={ this.onUpgrade }
-          />,
-          closeButton
-        ];
-
-      case STEP_UPDATING:
-        return [
-          closeButton
-        ];
-
-      case STEP_COMPLETED:
-      case STEP_ERROR:
-        return [
-          doneButton
-        ];
-    }
-  }
-
-  renderStep () {
-    const { store } = this.props;
-    const currentversion = this.formatVersion(store);
-    const newversion = store.upgrading
-      ? this.formatVersion(store.upgrading)
-      : this.formatVersion(store.available);
-
-    switch (store.step) {
-      case STEP_INFO:
-        return this.renderStepInfo(newversion, currentversion);
-
-      case STEP_UPDATING:
-        return this.renderStepBusy(newversion);
-
-      case STEP_COMPLETED:
-      case STEP_ERROR:
-        return store.error
-          ? this.renderStepError(newversion)
-          : this.renderStepCompleted(newversion);
-    }
-  }
-
-  renderStepBusy (newversion) {
-    return (
-      <div className={ styles.step }>
-        <UpdateWaitIcon className={ styles.icon } />
-        <div className={ styles.text }>
-          <FormattedMessage
-            id='upgradeParity.busy'
-            defaultMessage='Your upgrade to Parity {newversion} is currently in progress. Please wait until the process completes.'
-            values={ {
-              newversion: <div className={ styles.version }>{ newversion }</div>
-            } }
-          />
-        </div>
-      </div>
-    );
-  }
-
-  renderStepCompleted (newversion) {
-    return (
-      <div className={ styles.step }>
-        <DoneIcon className={ styles.icon } />
-        <div className={ styles.text }>
-          <FormattedMessage
-            id='upgradeParity.completed'
-            defaultMessage='Your upgrade to Parity {newversion} has been successfully completed. Click "done" to automatically reload the application.'
-            values={ {
-              newversion: <div className={ styles.version }>{ newversion }</div>
-            } }
-          />
-        </div>
-      </div>
-    );
-  }
-
-  renderStepError (newversion) {
-    const { store } = this.props;
-
-    return (
-      <div className={ styles.step }>
-        <ErrorIcon className={ styles.icon } />
-        <div className={ styles.text }>
-          <FormattedMessage
-            id='upgradeParity.failed'
-            defaultMessage='Your upgrade to Parity {newversion} has failed with an error.'
-            values={ {
-              newversion: <div className={ styles.version }>{ newversion }</div>
-            } }
-          />
-          <div className={ styles.error }>
-            { store.error.message }
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderStepInfo (newversion, currentversion) {
-    return (
-      <div className={ styles.step }>
-        <UpdateIcon className={ styles.icon } />
-        <div className={ styles.text }>
-          <div>
-            <FormattedMessage
-              id='upgradeParity.info.welcome'
-              defaultMessage='Welcome to the Parity upgrade wizard, allowing you a completely seamless upgrade experience to the next version of Parity.'
-            />
-          </div>
-          <div>
-            <ul>
-              <li>
-                <FormattedMessage
-                  id='upgradeParity.info.currentVersion'
-                  defaultMessage='You are currently running {currentversion}'
-                  values={ {
-                    currentversion: <div className={ styles.version }>{ currentversion }</div>
-                  } }
-                />
-              </li>
-              <li>
-                <FormattedMessage
-                  id='upgradeParity.info.upgrade'
-                  defaultMessage='An upgrade to version {newversion} is available'
-                  values={ {
-                    currentversion: <div className={ styles.version }>{ currentversion }</div>,
-                    newversion: <div className={ styles.version }>{ newversion }</div>
-                  } }
-                />
-              </li>
-              <li>
-                { this.renderConsensusInfo() }
-              </li>
-            </ul>
-          </div>
-          <div>
-            <FormattedMessage
-              id='upgradeParity.info.next'
-              defaultMessage='Proceed with "upgrade now" to start your Parity upgrade.'
-            />
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderConsensusInfo () {
-    const { store } = this.props;
-    const { consensusCapability } = store;
-
-    if (consensusCapability) {
-      if (consensusCapability === 'capable') {
-        return (
-          <FormattedMessage
-            id='upgradeParity.consensus.capable'
-            defaultMessage='Your current Parity version is capable of handling the network requirements.'
-          />
-        );
-      } else if (consensusCapability.capableUntil) {
-        return (
-          <FormattedMessage
-            id='upgradeParity.consensus.capableUntil'
-            defaultMessage='Your current Parity version is capable of handling the network requirements until block {blockNumber}'
-            values={ {
-              blockNumber: consensusCapability.capableUntil
-            } }
-          />
-        );
-      } else if (consensusCapability.incapableSince) {
-        return (
-          <FormattedMessage
-            id='upgradeParity.consensus.incapableSince'
-            defaultMessage='Your current Parity version is incapable of handling the network requirements since block {blockNumber}'
-            values={ {
-              blockNumber: consensusCapability.incapableSince
-            } }
-          />
-        );
-      }
-    }
-
-    return (
-      <FormattedMessage
-        id='upgradeParity.consensus.unknown'
-        defaultMessage='Your current Parity version is capable of handling the network requirements.'
-      />
-    );
-  }
-
-  formatVersion (struct) {
-    if (!struct || !struct.version) {
-      return (
-        <FormattedMessage
-          id='upgradeParity.version.unknown'
-          defaultMessage='unknown'
-        />
-      );
-    }
-
-    const { track, version } = struct.version;
-
-    return `${version.major}.${version.minor}.${version.patch}-${track}`;
-  }
-
-  onClose = () => {
-    this.props.store.closeModal();
-  }
-
-  onDone = () => {
-    if (this.props.store.error) {
-      this.onClose();
-    } else {
-      window.location.reload();
-    }
-  }
-
-  onUpgrade = () => {
-    this.props.store.upgradeNow();
-  }
-}
diff --git a/js/src/modals/VaultAccounts/index.js b/js/src/modals/VaultAccounts/index.js
deleted file mode 100644
index 506a569f39bb00394d1253d1a5e2ffb698c3ad10..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultAccounts/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './vaultAccounts';
diff --git a/js/src/modals/VaultAccounts/vaultAccounts.js b/js/src/modals/VaultAccounts/vaultAccounts.js
deleted file mode 100644
index daf2d7c51bfa69c2dbedeebc05b9aea3ff6aa496..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultAccounts/vaultAccounts.js
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { newError } from '~/redux/actions';
-import { personalAccountsInfo } from '~/redux/providers/personalActions';
-import { AccountCard, Button, Portal, SelectionList } from '~/ui';
-import { CancelIcon, CheckIcon } from '~/ui/Icons';
-
-@observer
-class VaultAccounts extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    newError: PropTypes.func.isRequired,
-    personalAccountsInfo: PropTypes.func.isRequired,
-    vaultStore: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { accounts } = this.props;
-    const { isBusyAccounts, isModalAccountsOpen, selectedAccounts } = this.props.vaultStore;
-
-    if (!isModalAccountsOpen) {
-      return null;
-    }
-
-    const vaultAccounts = Object
-      .keys(accounts)
-      .filter((address) => accounts[address].uuid)
-      .map((address) => accounts[address]);
-
-    return (
-      <Portal
-        buttons={ [
-          <Button
-            disabled={ isBusyAccounts }
-            icon={ <CancelIcon /> }
-            key='cancel'
-            label={
-              <FormattedMessage
-                id='vaults.accounts.button.cancel'
-                defaultMessage='Cancel'
-              />
-            }
-            onClick={ this.onClose }
-          />,
-          <Button
-            disabled={ isBusyAccounts }
-            icon={ <CheckIcon /> }
-            key='execute'
-            label={
-              <FormattedMessage
-                id='vaults.accounts.button.execute'
-                defaultMessage='Set'
-              />
-            }
-            onClick={ this.onExecute }
-          />
-        ] }
-        busy={ isBusyAccounts }
-        onClose={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='vaults.accounts.title'
-            defaultMessage='Manage Vault Accounts'
-          />
-        }
-      >
-        { this.renderList(vaultAccounts, selectedAccounts) }
-      </Portal>
-    );
-  }
-
-  renderList (vaultAccounts) {
-    return (
-      <SelectionList
-        isChecked={ this.isSelected }
-        items={ vaultAccounts }
-        noStretch
-        onSelectClick={ this.onSelect }
-        renderItem={ this.renderAccount }
-      />
-    );
-  }
-
-  renderAccount = (account) => {
-    return (
-      <AccountCard
-        account={ account }
-      />
-    );
-  }
-
-  isSelected = (account) => {
-    const { vaultName, selectedAccounts } = this.props.vaultStore;
-
-    return account.meta.vault === vaultName
-      ? !selectedAccounts[account.address]
-      : selectedAccounts[account.address];
-  }
-
-  onSelect = (account) => {
-    this.props.vaultStore.toggleSelectedAccount(account.address);
-  }
-
-  onClose = () => {
-    this.props.vaultStore.closeAccountsModal();
-  }
-
-  onExecute = () => {
-    const { api } = this.context;
-    const { accounts, personalAccountsInfo, vaultStore } = this.props;
-    const { vaultName, selectedAccounts } = this.props.vaultStore;
-
-    const vaultAccounts = Object
-      .keys(accounts)
-      .filter((address) => accounts[address].uuid && selectedAccounts[address])
-      .map((address) => accounts[address]);
-
-    return vaultStore
-      .moveAccounts(
-        vaultName,
-        vaultAccounts
-          .filter((account) => account.meta.vault !== vaultName)
-          .map((account) => account.address),
-        vaultAccounts
-          .filter((account) => account.meta.vault === vaultName)
-          .map((account) => account.address)
-      )
-      .catch(this.props.newError)
-      .then(() => {
-        // TODO: We manually call parity_allAccountsInfo after all the promises
-        // have been resolved. If bulk moves do become available in the future,
-        // subscriptions can transparently take care of this instead of calling
-        // and manually dispatching an update. (Using subscriptions currently
-        // means allAccountsInfo is called after each and every move call)
-        return api.parity
-          .allAccountsInfo()
-          .then(personalAccountsInfo);
-      })
-      .then(this.onClose);
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts } = state.personal;
-
-  return {
-    accounts
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError,
-    personalAccountsInfo
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(VaultAccounts);
diff --git a/js/src/modals/VaultAccounts/vaultAccounts.spec.js b/js/src/modals/VaultAccounts/vaultAccounts.spec.js
deleted file mode 100644
index 6a0d43b6e88abcfe6cd3cf2428577356218f1694..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultAccounts/vaultAccounts.spec.js
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import VaultAccounts from './';
-
-const ACCOUNT_A = '0x1234567890123456789012345678901234567890';
-const ACCOUNT_B = '0x0123456789012345678901234567890123456789';
-const ACCOUNT_C = '0x9012345678901234567890123456789012345678';
-const ACCOUNT_D = '0x8901234567890123456789012345678901234567';
-const VAULTNAME = 'testVault';
-const ACCOUNTS = {
-  [ACCOUNT_A]: {
-    address: ACCOUNT_A,
-    uuid: null
-  },
-  [ACCOUNT_B]: {
-    address: ACCOUNT_B,
-    uuid: ACCOUNT_B,
-    meta: {
-      vault: 'somethingElse'
-    }
-  },
-  [ACCOUNT_C]: {
-    address: ACCOUNT_C,
-    uuid: ACCOUNT_C,
-    meta: {
-      vault: VAULTNAME
-    }
-  },
-  [ACCOUNT_D]: {
-    address: ACCOUNT_D,
-    uuid: ACCOUNT_D,
-    meta: {
-      vault: VAULTNAME
-    }
-  }
-};
-
-let api;
-let component;
-let instance;
-let reduxStore;
-let vaultStore;
-
-function createApi () {
-  api = {
-    parity: {
-      allAccountsInfo: sinon.stub().resolves({})
-    }
-  };
-
-  return api;
-}
-
-function createReduxStore () {
-  reduxStore = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        balances: {
-          balances: {}
-        },
-        personal: {
-          accounts: ACCOUNTS
-        }
-      };
-    }
-  };
-
-  return reduxStore;
-}
-
-function createVaultStore () {
-  vaultStore = {
-    isBusyAccounts: false,
-    isModalAccountsOpen: true,
-    selectedAccounts: { [ACCOUNT_B]: true, [ACCOUNT_C]: true },
-    vaultName: VAULTNAME,
-    closeAccountsModal: sinon.stub(),
-    moveAccounts: sinon.stub().resolves(true),
-    toggleSelectedAccount: sinon.stub()
-  };
-
-  return vaultStore;
-}
-
-function render () {
-  component = shallow(
-    <VaultAccounts vaultStore={ createVaultStore() } />,
-    {
-      context: {
-        store: createReduxStore()
-      }
-    }
-  ).find('VaultAccounts').shallow({
-    context: {
-      api: createApi()
-    }
-  });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/VaultAccounts', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('components', () => {
-    describe('SelectionList', () => {
-      let sectionList;
-
-      beforeEach(() => {
-        sectionList = component.find('SelectionList');
-      });
-
-      it('has the filtered accounts', () => {
-        expect(sectionList.props().items).to.deep.equal([
-          ACCOUNTS[ACCOUNT_B], ACCOUNTS[ACCOUNT_C], ACCOUNTS[ACCOUNT_D]
-        ]);
-      });
-
-      it('renders via renderAccount', () => {
-        expect(sectionList.props().renderItem).to.equal(instance.renderAccount);
-      });
-    });
-  });
-
-  describe('event handlers', () => {
-    describe('onClose', () => {
-      beforeEach(() => {
-        instance.onClose();
-      });
-
-      it('calls into closeAccountsModal', () => {
-        expect(vaultStore.closeAccountsModal).to.have.been.called;
-      });
-    });
-
-    describe('onExecute', () => {
-      beforeEach(() => {
-        sinon.spy(instance, 'onClose');
-        return instance.onExecute();
-      });
-
-      afterEach(() => {
-        instance.onClose.restore();
-      });
-
-      it('calls into moveAccounts', () => {
-        expect(vaultStore.moveAccounts).to.have.been.calledWith(VAULTNAME, [ACCOUNT_B], [ACCOUNT_C]);
-      });
-
-      it('closes modal', () => {
-        expect(instance.onClose).to.have.been.called;
-      });
-    });
-  });
-});
diff --git a/js/src/modals/VaultCreate/index.js b/js/src/modals/VaultCreate/index.js
deleted file mode 100644
index 24bf5bf06339e2f37f264190658106ff20a8f012..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultCreate/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './vaultCreate';
diff --git a/js/src/modals/VaultCreate/vaultCreate.css b/js/src/modals/VaultCreate/vaultCreate.css
deleted file mode 100644
index 125d262173ca9ebf3f480f900a7ca4afc2a1eaff..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultCreate/vaultCreate.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* TODO: These styles are shared with CreateAccount - DRY up */
-.passwords {
-  display: flex;
-  flex-wrap: wrap;
-
-  .password {
-    box-sizing: border-box;
-    flex: 0 1 50%;
-    width: 50%;
-
-    &:nth-child(odd) {
-      padding-right: 0.25rem;
-    }
-
-    &:nth-child(even) {
-      padding-left: 0.25rem;
-    }
-  }
-}
-
-.disabled {
-  opacity: 0.25;
-}
-
-.group+.group {
-  margin-top: 1em;
-}
diff --git a/js/src/modals/VaultCreate/vaultCreate.js b/js/src/modals/VaultCreate/vaultCreate.js
deleted file mode 100644
index c472b28d0fdfe56dcda63f5d5ff6ba6bba9d030f..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultCreate/vaultCreate.js
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { newError } from '~/redux/actions';
-import { Button, Input, Portal } from '~/ui';
-import PasswordStrength from '~/ui/Form/PasswordStrength';
-import { CheckIcon, CloseIcon } from '~/ui/Icons';
-
-import styles from './vaultCreate.css';
-
-@observer
-class VaultCreate extends Component {
-  static propTypes = {
-    newError: PropTypes.func.isRequired,
-    vaultStore: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { isBusyCreate, isModalCreateOpen, vaultDescription, vaultName, vaultNameError, vaultPassword, vaultPasswordHint, vaultPasswordRepeat, vaultPasswordRepeatError } = this.props.vaultStore;
-    const hasError = !!vaultNameError || !!vaultPasswordRepeatError;
-
-    if (!isModalCreateOpen) {
-      return null;
-    }
-
-    return (
-      <Portal
-        busy={ isBusyCreate }
-        buttons={ [
-          <Button
-            disabled={ isBusyCreate }
-            icon={ <CloseIcon /> }
-            key='close'
-            label={
-              <FormattedMessage
-                id='vaults.create.button.close'
-                defaultMessage='close'
-              />
-            }
-            onClick={ this.onClose }
-          />,
-          <Button
-            disabled={ hasError || isBusyCreate }
-            icon={ <CheckIcon /> }
-            key='vault'
-            label={
-              <FormattedMessage
-                id='vaults.create.button.vault'
-                defaultMessage='create vault'
-              />
-            }
-            onClick={ this.onCreate }
-          />
-        ] }
-        onClose={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='vaults.create.title'
-            defaultMessage='Create a new vault'
-          />
-        }
-      >
-        <div>
-          <Input
-            error={ vaultNameError }
-            hint={
-              <FormattedMessage
-                id='vaults.create.name.hint'
-                defaultMessage='a name for the vault'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='vaults.create.name.label'
-                defaultMessage='vault name'
-              />
-            }
-            onChange={ this.onEditName }
-            value={ vaultName }
-          />
-          <Input
-            hint={
-              <FormattedMessage
-                id='vaults.create.description.hint'
-                defaultMessage='an extended description for the vault'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='vaults.create.descriptions.label'
-                defaultMessage='(optional) description'
-              />
-            }
-            onChange={ this.onEditDescription }
-            value={ vaultDescription }
-          />
-          <Input
-            hint={
-              <FormattedMessage
-                id='vaults.create.hint.hint'
-                defaultMessage='(optional) a hint to help with remembering the password'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='vaults.create.hint.label'
-                defaultMessage='password hint'
-              />
-            }
-            onChange={ this.onEditPasswordHint }
-            value={ vaultPasswordHint }
-          />
-          <div className={ styles.passwords }>
-            <div className={ styles.password }>
-              <Input
-                hint={
-                  <FormattedMessage
-                    id='vaults.create.password.hint'
-                    defaultMessage='a strong, unique password'
-                  />
-                }
-                label={
-                  <FormattedMessage
-                    id='vaults.create.password.label'
-                    defaultMessage='password'
-                  />
-                }
-                onChange={ this.onEditPassword }
-                type='password'
-                value={ vaultPassword }
-              />
-            </div>
-            <div className={ styles.password }>
-              <Input
-                error={ vaultPasswordRepeatError }
-                hint={
-                  <FormattedMessage
-                    id='vaults.create.password2.hint'
-                    defaultMessage='verify your password'
-                  />
-                }
-                label={
-                  <FormattedMessage
-                    id='vaults.create.password2.label'
-                    defaultMessage='password (repeat)'
-                  />
-                }
-                onChange={ this.onEditPasswordRepeat }
-                type='password'
-                value={ vaultPasswordRepeat }
-              />
-            </div>
-          </div>
-          <PasswordStrength input={ vaultPassword } />
-        </div>
-      </Portal>
-    );
-  }
-
-  onEditDescription = (event, description) => {
-    this.props.vaultStore.setVaultDescription(description);
-  }
-
-  onEditName = (event, name) => {
-    this.props.vaultStore.setVaultName(name);
-  }
-
-  onEditPassword = (event, password) => {
-    this.props.vaultStore.setVaultPassword(password);
-  }
-
-  onEditPasswordHint = (event, hint) => {
-    this.props.vaultStore.setVaultPasswordHint(hint);
-  }
-
-  onEditPasswordRepeat = (event, password) => {
-    this.props.vaultStore.setVaultPasswordRepeat(password);
-  }
-
-  onCreate = () => {
-    const { vaultNameError, vaultPasswordRepeatError } = this.props.vaultStore;
-
-    if (vaultNameError || vaultPasswordRepeatError) {
-      return;
-    }
-
-    return this.props.vaultStore
-      .createVault()
-      .catch(this.props.newError)
-      .then(this.onClose);
-  }
-
-  onClose = () => {
-    this.props.vaultStore.closeCreateModal();
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError
-  }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(VaultCreate);
diff --git a/js/src/modals/VaultCreate/vaultCreate.spec.js b/js/src/modals/VaultCreate/vaultCreate.spec.js
deleted file mode 100644
index f807ac0b4bd3d3ef31c50c092e25ed0fbda52111..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultCreate/vaultCreate.spec.js
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import VaultCreate from './';
-
-let component;
-let instance;
-let reduxStore;
-let vaultStore;
-
-function vaultReduxStore () {
-  reduxStore = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: sinon.stub()
-  };
-
-  return reduxStore;
-}
-
-function vaultVaultStore () {
-  vaultStore = {
-    isBusyCreate: false,
-    isModalCreateOpen: true,
-    vaultDescription: 'initialDesc',
-    vaultName: 'initialName',
-    vaultPassword: 'initialPassword',
-    vaultPasswordRepeat: 'initialPassword',
-    vaultPasswordHint: 'initialHint',
-    closeCreateModal: sinon.stub(),
-    createVault: sinon.stub().resolves(true),
-    setVaultDescription: sinon.stub(),
-    setVaultName: sinon.stub(),
-    setVaultPassword: sinon.stub(),
-    setVaultPasswordHint: sinon.stub(),
-    setVaultPasswordRepeat: sinon.stub()
-  };
-
-  return vaultStore;
-}
-
-function render () {
-  component = shallow(
-    <VaultCreate vaultStore={ vaultVaultStore() } />,
-    {
-      context: {
-        store: vaultReduxStore()
-      }
-    }
-  ).find('VaultCreate').shallow();
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/VaultCreate', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('event handlers', () => {
-    describe('onClose', () => {
-      beforeEach(() => {
-        instance.onClose();
-      });
-
-      it('calls into closeCreateModal', () => {
-        expect(vaultStore.closeCreateModal).to.have.been.called;
-      });
-    });
-
-    describe('onCreate', () => {
-      beforeEach(() => {
-        sinon.spy(instance, 'onClose');
-        return instance.onCreate();
-      });
-
-      afterEach(() => {
-        instance.onClose.restore();
-      });
-
-      it('calls into createVault', () => {
-        expect(vaultStore.createVault).to.have.been.called;
-      });
-
-      it('closes modal', () => {
-        expect(instance.onClose).to.have.been.called;
-      });
-    });
-
-    describe('onEditDescription', () => {
-      beforeEach(() => {
-        instance.onEditDescription(null, 'testDescription');
-      });
-
-      it('calls setVaultDescription', () => {
-        expect(vaultStore.setVaultDescription).to.have.been.calledWith('testDescription');
-      });
-    });
-
-    describe('onEditName', () => {
-      beforeEach(() => {
-        instance.onEditName(null, 'testName');
-      });
-
-      it('calls setVaultName', () => {
-        expect(vaultStore.setVaultName).to.have.been.calledWith('testName');
-      });
-    });
-
-    describe('onEditPassword', () => {
-      beforeEach(() => {
-        instance.onEditPassword(null, 'testPassword');
-      });
-
-      it('calls setVaultPassword', () => {
-        expect(vaultStore.setVaultPassword).to.have.been.calledWith('testPassword');
-      });
-    });
-
-    describe('onEditPasswordHint', () => {
-      beforeEach(() => {
-        instance.onEditPasswordHint(null, 'testPasswordHint');
-      });
-
-      it('calls setVaultPasswordHint', () => {
-        expect(vaultStore.setVaultPasswordHint).to.have.been.calledWith('testPasswordHint');
-      });
-    });
-
-    describe('onEditPasswordRepeat', () => {
-      beforeEach(() => {
-        instance.onEditPasswordRepeat(null, 'testPassword');
-      });
-
-      it('calls setVaultPasswordRepeat', () => {
-        expect(vaultStore.setVaultPasswordRepeat).to.have.been.calledWith('testPassword');
-      });
-    });
-  });
-});
diff --git a/js/src/modals/VaultLock/index.js b/js/src/modals/VaultLock/index.js
deleted file mode 100644
index ffdab619100cc294ad995fe3261c6beb77ae90a6..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultLock/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './vaultLock';
diff --git a/js/src/modals/VaultLock/vaultLock.js b/js/src/modals/VaultLock/vaultLock.js
deleted file mode 100644
index 74135d5447c4e8cabdfbcfb71d7742a1d132993d..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultLock/vaultLock.js
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { newError } from '~/redux/actions';
-import { ConfirmDialog, VaultCard } from '~/ui';
-
-import styles from '../VaultUnlock/vaultUnlock.css';
-
-@observer
-class VaultLock extends Component {
-  static propTypes = {
-    newError: PropTypes.func.isRequired,
-    vaultStore: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { isBusyLock, isModalLockOpen, vault } = this.props.vaultStore;
-
-    if (!isModalLockOpen) {
-      return null;
-    }
-
-    return (
-      <ConfirmDialog
-        busy={ isBusyLock }
-        disabledConfirm={ isBusyLock }
-        disabledDeny={ isBusyLock }
-        onConfirm={ this.onExecute }
-        onDeny={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='vaults.confirmClose.title'
-            defaultMessage='Close Vault'
-          />
-        }
-      >
-        <div className={ styles.textbox }>
-          <FormattedMessage
-            id='vaults.confirmClose.info'
-            defaultMessage="You are about to close a vault. Any accounts associated with the vault won't be visible after this operation concludes. To view the associated accounts, open the vault again."
-          />
-        </div>
-        <VaultCard.Layout
-          withBorder
-          vault={ vault }
-        />
-      </ConfirmDialog>
-    );
-  }
-
-  onExecute = () => {
-    return this.props.vaultStore
-      .closeVault()
-      .catch(this.props.newError)
-      .then(this.onClose);
-  }
-
-  onClose = () => {
-    this.props.vaultStore.closeLockModal();
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError
-  }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(VaultLock);
diff --git a/js/src/modals/VaultLock/vaultLock.spec.js b/js/src/modals/VaultLock/vaultLock.spec.js
deleted file mode 100644
index 53f19241d1302779bf053209b9f7d374355c0da7..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultLock/vaultLock.spec.js
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import VaultLock from './';
-
-const VAULT = {
-  name: 'testVault'
-};
-
-let component;
-let instance;
-let reduxStore;
-let vaultStore;
-
-function createReduxStore () {
-  reduxStore = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {};
-    }
-  };
-
-  return reduxStore;
-}
-
-function createVaultStore () {
-  vaultStore = {
-    isBusyLock: false,
-    isModalLockOpen: true,
-    vault: VAULT,
-    vaultName: VAULT.name,
-    vaults: [VAULT],
-    closeLockModal: sinon.stub(),
-    closeVault: sinon.stub().resolves(true)
-  };
-
-  return vaultStore;
-}
-
-function render () {
-  component = shallow(
-    <VaultLock vaultStore={ createVaultStore() } />,
-    {
-      context: {
-        store: createReduxStore()
-      }
-    }
-  ).find('VaultLock').shallow();
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/VaultLock', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('ConfirmDialog', () => {
-    let dialog;
-
-    beforeEach(() => {
-      dialog = component.find('ConfirmDialog');
-    });
-
-    it('renders the dialog', () => {
-      expect(dialog.get(0)).to.be.ok;
-    });
-
-    it('passes onConfirm as onExecute', () => {
-      expect(dialog.props().onConfirm).to.equal(instance.onExecute);
-    });
-
-    it('passes onDeny as onClose', () => {
-      expect(dialog.props().onDeny).to.equal(instance.onClose);
-    });
-  });
-
-  describe('event methods', () => {
-    describe('onExecute', () => {
-      beforeEach(() => {
-        sinon.stub(instance, 'onClose');
-        return instance.onExecute();
-      });
-
-      afterEach(() => {
-        instance.onClose.restore();
-      });
-
-      it('closes the modal', () => {
-        expect(instance.onClose).to.have.been.called;
-      });
-
-      it('calls into vaultStore.closeVault', () => {
-        expect(vaultStore.closeVault).to.have.been.called;
-      });
-    });
-
-    describe('onClose', () => {
-      beforeEach(() => {
-        instance.onClose();
-      });
-
-      it('calls into closeLockModal', () => {
-        expect(vaultStore.closeLockModal).to.have.been.called;
-      });
-    });
-  });
-});
diff --git a/js/src/modals/VaultMeta/index.js b/js/src/modals/VaultMeta/index.js
deleted file mode 100644
index 685c54ef33dd4a4a86328189afb085d9657ae668..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultMeta/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './vaultMeta';
diff --git a/js/src/modals/VaultMeta/vaultMeta.js b/js/src/modals/VaultMeta/vaultMeta.js
deleted file mode 100644
index 5089af642f35447f8677fa85f9fcb4c027e393b3..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultMeta/vaultMeta.js
+++ /dev/null
@@ -1,298 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Checkbox } from 'material-ui';
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { newError } from '~/redux/actions';
-import { Button, Form, Input, Portal, VaultCard } from '~/ui';
-import PasswordStrength from '~/ui/Form/PasswordStrength';
-import { CheckIcon, CloseIcon } from '~/ui/Icons';
-
-import styles from '../VaultCreate/vaultCreate.css';
-
-@observer
-class VaultMeta extends Component {
-  static propTypes = {
-    newError: PropTypes.func.isRequired,
-    vaultStore: PropTypes.object.isRequired
-  };
-
-  state = {
-    passwordEdit: false
-  };
-
-  render () {
-    const { isBusyMeta, isModalMetaOpen, vault, vaultDescription, vaultPassword, vaultPasswordRepeat, vaultPasswordRepeatError, vaultPasswordOld, vaultPasswordHint } = this.props.vaultStore;
-    const { passwordEdit } = this.state;
-
-    if (!isModalMetaOpen) {
-      return null;
-    }
-
-    return (
-      <Portal
-        busy={ isBusyMeta }
-        buttons={ [
-          <Button
-            disabled={ isBusyMeta }
-            icon={ <CloseIcon /> }
-            key='close'
-            label={
-              <FormattedMessage
-                id='vaults.editMeta.button.close'
-                defaultMessage='close'
-              />
-            }
-            onClick={ this.onClose }
-          />,
-          <Button
-            disabled={ isBusyMeta || !!vaultPasswordRepeatError }
-            icon={ <CheckIcon /> }
-            key='vault'
-            label={
-              <FormattedMessage
-                id='vaults.editMeta.button.save'
-                defaultMessage='save'
-              />
-            }
-            onClick={ this.onExecute }
-          />
-        ] }
-        onClose={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='vaults.editMeta.title'
-            defaultMessage='Edit Vault Metadata'
-          />
-        }
-      >
-        <VaultCard.Layout vault={ vault }>
-          <Form>
-            <div className={ styles.group }>
-              <Input
-                autoFocus
-                hint={
-                  <FormattedMessage
-                    id='vaults.editMeta.description.hint'
-                    defaultMessage='the description for this vault'
-                  />
-                }
-                label={
-                  <FormattedMessage
-                    id='vaults.editMeta.description.label'
-                    defaultMessage='vault description'
-                  />
-                }
-                onChange={ this.onEditDescription }
-                value={ vaultDescription }
-              />
-              <Input
-                hint={
-                  <FormattedMessage
-                    id='vaults.editMeta.passwordHint.hint'
-                    defaultMessage='your password hint for this vault'
-                  />
-                }
-                label={
-                  <FormattedMessage
-                    id='vaults.editMeta.passwordHint.label'
-                    defaultMessage='password hint'
-                  />
-                }
-                onChange={ this.onEditPasswordHint }
-                value={ vaultPasswordHint }
-              />
-            </div>
-            <div className={ styles.group }>
-              <Checkbox
-                label={
-                  <FormattedMessage
-                    id='vaults.editMeta.allowPassword'
-                    defaultMessage='Change vault password'
-                  />
-                }
-                checked={ passwordEdit }
-                onCheck={ this.onTogglePassword }
-              />
-              <div className={ [styles.passwords, passwordEdit ? null : styles.disabled].join(' ') }>
-                <div className={ styles.password }>
-                  <Input
-                    disabled={ !passwordEdit }
-                    hint={
-                      <FormattedMessage
-                        id='vaults.editMeta.currentPassword.hint'
-                        defaultMessage='your current vault password'
-                      />
-                    }
-                    label={
-                      <FormattedMessage
-                        id='vaults.editMeta.currentPassword.label'
-                        defaultMessage='current password'
-                      />
-                    }
-                    onChange={ this.onEditPasswordCurrent }
-                    type='password'
-                    value={ vaultPasswordOld }
-                  />
-                </div>
-              </div>
-              <div className={ [styles.passwords, passwordEdit ? null : styles.disabled].join(' ') }>
-                <div className={ styles.password }>
-                  <Input
-                    disabled={ !passwordEdit }
-                    hint={
-                      <FormattedMessage
-                        id='vaults.editMeta.password.hint'
-                        defaultMessage='a strong, unique password'
-                      />
-                    }
-                    label={
-                      <FormattedMessage
-                        id='vaults.editMeta.password.label'
-                        defaultMessage='new password'
-                      />
-                    }
-                    onChange={ this.onEditPassword }
-                    type='password'
-                    value={ vaultPassword }
-                  />
-                </div>
-                <div className={ styles.password }>
-                  <Input
-                    disabled={ !passwordEdit }
-                    error={ vaultPasswordRepeatError }
-                    hint={
-                      <FormattedMessage
-                        id='vaults.editMeta.password2.hint'
-                        defaultMessage='verify your new password'
-                      />
-                    }
-                    label={
-                      <FormattedMessage
-                        id='vaults.editMeta.password2.label'
-                        defaultMessage='new password (repeat)'
-                      />
-                    }
-                    onChange={ this.onEditPasswordRepeat }
-                    type='password'
-                    value={ vaultPasswordRepeat }
-                  />
-                </div>
-              </div>
-              <div className={ passwordEdit ? null : styles.disabled }>
-                <PasswordStrength input={ vaultPassword } />
-              </div>
-            </div>
-          </Form>
-        </VaultCard.Layout>
-      </Portal>
-    );
-
-    // <InputChip
-    //   addOnBlur
-    //   hint={
-    //     <FormattedMessage
-    //       id='vaults.editMeta.tags.hint'
-    //       defaultMessage='press <Enter> to add a tag'
-    //     />
-    //   }
-    //   label={
-    //     <FormattedMessage
-    //       id='vaults.editMeta.tags.label'
-    //       defaultMessage='(optional) tags'
-    //     />
-    //   }
-    //   onTokensChange={ this.onEditTags }
-    //   tokens={ vaultTags.slice() }
-    // />
-  }
-
-  onEditDescription = (event, description) => {
-    this.props.vaultStore.setVaultDescription(description);
-  }
-
-  onEditPasswordCurrent = (event, password) => {
-    this.props.vaultStore.setVaultPasswordOld(password);
-  }
-
-  onEditPassword = (event, password) => {
-    this.props.vaultStore.setVaultPassword(password);
-  }
-
-  onEditPasswordHint = (event, hint) => {
-    this.props.vaultStore.setVaultPasswordHint(hint);
-  }
-
-  onEditPasswordRepeat = (event, password) => {
-    this.props.vaultStore.setVaultPasswordRepeat(password);
-  }
-
-  onEditTags = (tags) => {
-    this.props.vaultStore.setVaultTags(tags);
-  }
-
-  onTogglePassword = () => {
-    this.setState({
-      passwordEdit: !this.state.passwordEdit
-    });
-  }
-
-  onExecute = () => {
-    const { vaultPasswordRepeatError } = this.props.vaultStore;
-    const { passwordEdit } = this.state;
-
-    if (vaultPasswordRepeatError) {
-      return;
-    }
-
-    return Promise
-      .all([
-        passwordEdit
-          ? this.props.vaultStore.editVaultPassword()
-          : true
-      ])
-      .then(() => {
-        return this.props.vaultStore.editVaultMeta();
-      })
-      .catch(this.props.newError)
-      .then(this.onClose);
-  }
-
-  onClose = () => {
-    this.setState({
-      passwordEdit: false
-    });
-
-    this.props.vaultStore.closeMetaModal();
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError
-  }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(VaultMeta);
diff --git a/js/src/modals/VaultMeta/vaultMeta.spec.js b/js/src/modals/VaultMeta/vaultMeta.spec.js
deleted file mode 100644
index c616c8e6aa0a8d210fbff247d40bef0459a798ee..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultMeta/vaultMeta.spec.js
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import VaultMeta from './';
-
-const VAULT = {
-  name: 'testVault'
-};
-
-let component;
-let instance;
-let reduxStore;
-let vaultStore;
-
-function createReduxStore () {
-  reduxStore = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {};
-    }
-  };
-
-  return reduxStore;
-}
-
-function createVaultStore () {
-  vaultStore = {
-    isBusyMeta: false,
-    isModalMetaOpen: true,
-    vault: VAULT,
-    vaultDescription: '',
-    vaultTags: [],
-    vaultName: VAULT.name,
-    vaults: [VAULT],
-    closeMetaModal: sinon.stub(),
-    editVaultMeta: sinon.stub().resolves(true),
-    editVaultPassword: sinon.stub().resolves(true),
-    setVaultDescription: sinon.stub(),
-    setVaultPassword: sinon.stub(),
-    setVaultPasswordRepeat: sinon.stub(),
-    setVaultPasswordHint: sinon.stub(),
-    setVaultPasswordOld: sinon.stub(),
-    setVaultTags: sinon.stub()
-  };
-
-  return vaultStore;
-}
-
-function render (props = {}) {
-  component = shallow(
-    <VaultMeta vaultStore={ createVaultStore() } />,
-    {
-      context: {
-        store: createReduxStore()
-      }
-    }
-  ).find('VaultMeta').shallow();
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/VaultMeta', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('event methods', () => {
-    describe('onEditDescription', () => {
-      beforeEach(() => {
-        instance.onEditDescription(null, 'testing');
-      });
-
-      it('calls into setVaultDescription', () => {
-        expect(vaultStore.setVaultDescription).to.have.been.calledWith('testing');
-      });
-    });
-
-    describe('onEditPassword', () => {
-      beforeEach(() => {
-        instance.onEditPassword(null, 'testPassword');
-      });
-
-      it('calls setVaultPassword', () => {
-        expect(vaultStore.setVaultPassword).to.have.been.calledWith('testPassword');
-      });
-    });
-
-    describe('onEditPasswordHint', () => {
-      beforeEach(() => {
-        instance.onEditPasswordHint(null, 'testPasswordHint');
-      });
-
-      it('calls setVaultPasswordHint', () => {
-        expect(vaultStore.setVaultPasswordHint).to.have.been.calledWith('testPasswordHint');
-      });
-    });
-
-    describe('onEditPasswordCurrent', () => {
-      beforeEach(() => {
-        instance.onEditPasswordCurrent(null, 'testPasswordOld');
-      });
-
-      it('calls setVaultPasswordHint', () => {
-        expect(vaultStore.setVaultPasswordOld).to.have.been.calledWith('testPasswordOld');
-      });
-    });
-
-    describe('onEditPasswordRepeat', () => {
-      beforeEach(() => {
-        instance.onEditPasswordRepeat(null, 'testPassword');
-      });
-
-      it('calls setVaultPasswordRepeat', () => {
-        expect(vaultStore.setVaultPasswordRepeat).to.have.been.calledWith('testPassword');
-      });
-    });
-
-    describe('onEditTags', () => {
-      beforeEach(() => {
-        instance.onEditTags('testing');
-      });
-
-      it('calls into setVaultTags', () => {
-        expect(vaultStore.setVaultTags).to.have.been.calledWith('testing');
-      });
-    });
-
-    describe('onClose', () => {
-      beforeEach(() => {
-        instance.onClose();
-      });
-
-      it('calls into closeMetaModal', () => {
-        expect(vaultStore.closeMetaModal).to.have.been.called;
-      });
-    });
-
-    describe('onExecute', () => {
-      beforeEach(() => {
-        return instance.onExecute();
-      });
-
-      it('calls into editVaultMeta', () => {
-        expect(vaultStore.editVaultMeta).to.have.been.called;
-      });
-    });
-  });
-});
diff --git a/js/src/modals/VaultSelector/index.js b/js/src/modals/VaultSelector/index.js
deleted file mode 100644
index 95e5998a428de80148ce34e6587a4eda13df60db..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultSelector/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './vaultSelector';
diff --git a/js/src/modals/VaultSelector/vaultSelector.js b/js/src/modals/VaultSelector/vaultSelector.js
deleted file mode 100644
index 4fceb5cb075d27e0d0608075414a6f94a9bd5e80..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultSelector/vaultSelector.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import Portal from '~/ui/Portal';
-import SelectionList from '~/ui/SelectionList';
-import VaultCard from '~/ui/VaultCard';
-
-@observer
-export default class VaultSelector extends Component {
-  static propTypes = {
-    onClose: PropTypes.func.isRequired,
-    onSelect: PropTypes.func.isRequired,
-    selected: PropTypes.string,
-    vaultStore: PropTypes.object.isRequired
-  };
-
-  render () {
-    return (
-      <Portal
-        isChildModal
-        onClose={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='vaults.selector.title'
-            defaultMessage='Select Account Vault'
-          />
-        }
-      >
-        { this.renderList() }
-      </Portal>
-    );
-  }
-
-  renderList () {
-    const { vaultsOpened } = this.props.vaultStore;
-
-    if (vaultsOpened.length === 0) {
-      return (
-        <FormattedMessage
-          id='vaults.selector.noneAvailable'
-          defaultMessage='There are currently no vaults opened and available for selection. Create and open some first before attempting to select a vault for an account move.'
-        />
-      );
-    }
-
-    return (
-      <SelectionList
-        items={ vaultsOpened }
-        isChecked={ this.isSelected }
-        noStretch
-        onSelectClick={ this.onSelect }
-        renderItem={ this.renderVault }
-      />
-    );
-  }
-
-  renderVault = (vault) => {
-    return (
-      <VaultCard
-        hideAccounts
-        hideButtons
-        vault={ vault }
-      />
-    );
-  }
-
-  isSelected = (vault) => {
-    return this.props.selected === vault.name;
-  }
-
-  onSelect = (vault) => {
-    this.props.onSelect(
-      this.props.selected === vault.name
-        ? ''
-        : vault.name
-    );
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-}
diff --git a/js/src/modals/VaultSelector/vaultSelector.spec.js b/js/src/modals/VaultSelector/vaultSelector.spec.js
deleted file mode 100644
index 1996af3a7713f957b88325b25f6162dc6607445b..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultSelector/vaultSelector.spec.js
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import VaultSelector from './';
-
-const VAULTS_OPENED = [
-  { name: 'A', isOpen: true },
-  { name: 'B', isOpen: true }
-];
-const VAULTS_CLOSED = [
-  { name: 'C' },
-  { name: 'D' }
-];
-const VAULTS_ALL = VAULTS_OPENED.concat(VAULTS_CLOSED);
-
-let component;
-let instance;
-let onClose;
-let onSelect;
-let vaultStore;
-
-function createVaultStore () {
-  vaultStore = {
-    vaults: VAULTS_ALL,
-    vaultsOpened: VAULTS_OPENED
-  };
-
-  return vaultStore;
-}
-
-function render () {
-  onClose = sinon.stub();
-  onSelect = sinon.stub();
-
-  component = shallow(
-    <VaultSelector
-      onClose={ onClose }
-      onSelect={ onSelect }
-      selected='firstValue'
-      vaultStore={ createVaultStore() }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('ui/VaultSelector', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('components', () => {
-    describe('Portal', () => {
-      let portal;
-
-      beforeEach(() => {
-        portal = component.find('Portal');
-      });
-
-      it('renders', () => {
-        expect(portal.get(0)).to.be.ok;
-      });
-
-      it('opens as a child modal', () => {
-        expect(portal.props().isChildModal).to.be.true;
-      });
-
-      it('passes the instance onClose', () => {
-        expect(portal.props().onClose).to.equal(instance.onClose);
-      });
-    });
-
-    describe('SelectionList', () => {
-      let list;
-
-      beforeEach(() => {
-        list = component.find('SelectionList');
-      });
-
-      it('renders', () => {
-        expect(list.get(0)).to.be.ok;
-      });
-
-      it('passes the open vaults', () => {
-        expect(list.props().items).to.deep.equal(VAULTS_OPENED);
-      });
-
-      it('passes internal renderItem', () => {
-        expect(list.props().renderItem).to.equal(instance.renderVault);
-      });
-
-      it('passes internal isChecked', () => {
-        expect(list.props().isChecked).to.equal(instance.isSelected);
-      });
-
-      it('passes internal onSelectClick', () => {
-        expect(list.props().onSelectClick).to.equal(instance.onSelect);
-      });
-    });
-  });
-
-  describe('instance methods', () => {
-    describe('renderVault', () => {
-      let card;
-
-      beforeEach(() => {
-        card = instance.renderVault({ name: 'testVault' });
-      });
-
-      it('renders VaultCard', () => {
-        expect(card).to.be.ok;
-      });
-    });
-
-    describe('isSelected', () => {
-      it('returns true when vault name matches', () => {
-        expect(instance.isSelected({ name: 'firstValue' })).to.be.true;
-      });
-
-      it('returns false when vault name does not match', () => {
-        expect(instance.isSelected({ name: 'testValue' })).to.be.false;
-      });
-    });
-
-    describe('onSelect', () => {
-      it('calls into props onSelect', () => {
-        instance.onSelect({ name: 'testing' });
-        expect(onSelect).to.have.been.called;
-      });
-
-      it('passes name when new selection made', () => {
-        instance.onSelect({ name: 'newValue' });
-        expect(onSelect).to.have.been.calledWith('newValue');
-      });
-
-      it('passes empty name when current selection made', () => {
-        instance.onSelect({ name: 'firstValue' });
-        expect(onSelect).to.have.been.calledWith('');
-      });
-    });
-
-    describe('onClose', () => {
-      it('calls props onClose', () => {
-        instance.onClose();
-        expect(onClose).to.have.been.called;
-      });
-    });
-  });
-});
diff --git a/js/src/modals/VaultUnlock/index.js b/js/src/modals/VaultUnlock/index.js
deleted file mode 100644
index 71ef6c7e8ce6ebd11e1532e1ee8832dad96eb0a9..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultUnlock/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './vaultUnlock';
diff --git a/js/src/modals/VaultUnlock/vaultUnlock.css b/js/src/modals/VaultUnlock/vaultUnlock.css
deleted file mode 100644
index 6c16133127a036c33cb8481772cf79c34f0cb372..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultUnlock/vaultUnlock.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.form {
-  margin-top: 0;
-}
-
-.passwordHint {
-  color: rgba(255, 255, 255, 0.5);
-  font-size: 0.75em;
-  text-align: left;
-}
-
-.textbox {
-  line-height: 1.5em;
-  margin-bottom: 1.5em;
-}
diff --git a/js/src/modals/VaultUnlock/vaultUnlock.js b/js/src/modals/VaultUnlock/vaultUnlock.js
deleted file mode 100644
index 3c1eaddc094b4b422b6468adc5e299e227408bc5..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultUnlock/vaultUnlock.js
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { newError } from '~/redux/actions';
-import { ConfirmDialog, Form, Input, VaultCard } from '~/ui';
-
-import styles from './vaultUnlock.css';
-
-@observer
-class VaultUnlock extends Component {
-  static propTypes = {
-    newError: PropTypes.func.isRequired,
-    vaultStore: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { isBusyUnlock, isModalUnlockOpen, vault, vaultPassword } = this.props.vaultStore;
-
-    if (!isModalUnlockOpen) {
-      return null;
-    }
-
-    return (
-      <ConfirmDialog
-        busy={ isBusyUnlock }
-        disabledConfirm={ isBusyUnlock }
-        disabledDeny={ isBusyUnlock }
-        onConfirm={ this.onExecute }
-        onDeny={ this.onClose }
-        open
-        title={
-          <FormattedMessage
-            id='vaults.confirmOpen.title'
-            defaultMessage='Open Vault'
-          />
-        }
-      >
-        <div className={ styles.textbox }>
-          <FormattedMessage
-            id='vaults.confirmOpen.info'
-            defaultMessage='You are about to open a vault. After confirming your password, all accounts associated with this vault will be visible. Closing the vault will remove the accounts from view until the vault is opened again.'
-          />
-        </div>
-        <VaultCard.Layout
-          withBorder
-          vault={ vault }
-        />
-        <Form className={ styles.form }>
-          <Input
-            autoFocus
-            hint={
-              <FormattedMessage
-                id='vaults.confirmOpen.password.hint'
-                defaultMessage='the password specified when creating the vault'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='vaults.confirmOpen.password.label'
-                defaultMessage='vault password'
-              />
-            }
-            onChange={ this.onEditPassword }
-            onDefaultAction={ this.onExecute }
-            type='password'
-            value={ vaultPassword }
-          />
-          <div className={ styles.passwordHint }>
-            { vault.meta.passwordHint }
-          </div>
-          <br />
-        </Form>
-      </ConfirmDialog>
-    );
-  }
-
-  onEditPassword = (event, password) => {
-    this.props.vaultStore.setVaultPassword(password);
-  }
-
-  onClose = () => {
-    this.props.vaultStore.closeUnlockModal();
-  }
-
-  onExecute = () => {
-    return this.props.vaultStore
-      .openVault()
-      .catch(this.props.newError)
-      .then(this.onClose);
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError
-  }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(VaultUnlock);
diff --git a/js/src/modals/VaultUnlock/vaultUnlock.spec.js b/js/src/modals/VaultUnlock/vaultUnlock.spec.js
deleted file mode 100644
index b1696833d242a4d8c7222d3bded2a4ecd51db7c5..0000000000000000000000000000000000000000
--- a/js/src/modals/VaultUnlock/vaultUnlock.spec.js
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import VaultUnlock from './';
-
-const VAULT = {
-  name: 'testVault',
-  meta: {
-    passwordHint: 'some hint'
-  }
-};
-
-let component;
-let instance;
-let reduxStore;
-let vaultStore;
-
-function createReduxStore () {
-  reduxStore = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {};
-    }
-  };
-
-  return reduxStore;
-}
-
-function createVaultStore () {
-  vaultStore = {
-    isBusyUnlock: false,
-    isModalUnlockOpen: true,
-    vault: VAULT,
-    vaultName: VAULT.name,
-    vaultPassword: 'testPassword',
-    vaults: [VAULT],
-    closeUnlockModal: sinon.stub(),
-    openVault: sinon.stub().resolves(true),
-    setVaultPassword: sinon.stub()
-  };
-
-  return vaultStore;
-}
-
-function render () {
-  component = shallow(
-    <VaultUnlock vaultStore={ createVaultStore() } />,
-    {
-      context: {
-        store: createReduxStore()
-      }
-    }
-  ).find('VaultUnlock').shallow();
-  instance = component.instance();
-
-  return component;
-}
-
-describe('modals/VaultUnlock', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('ConfirmDialog', () => {
-    let dialog;
-
-    beforeEach(() => {
-      dialog = component.find('ConfirmDialog');
-    });
-
-    it('renders the dialog', () => {
-      expect(dialog.get(0)).to.be.ok;
-    });
-
-    it('passes onConfirm as onExecute', () => {
-      expect(dialog.props().onConfirm).to.equal(instance.onExecute);
-    });
-
-    it('passes onDeny as onClose', () => {
-      expect(dialog.props().onDeny).to.equal(instance.onClose);
-    });
-  });
-
-  describe('event methods', () => {
-    describe('onExecute', () => {
-      beforeEach(() => {
-        sinon.stub(instance, 'onClose');
-        return instance.onExecute();
-      });
-
-      afterEach(() => {
-        instance.onClose.restore();
-      });
-
-      it('closes the modal', () => {
-        expect(instance.onClose).to.have.been.called;
-      });
-
-      it('calls into vaultStore.openVault', () => {
-        expect(vaultStore.openVault).to.have.been.called;
-      });
-    });
-
-    describe('onClose', () => {
-      beforeEach(() => {
-        instance.onClose();
-      });
-
-      it('calls into closeUnlockModal', () => {
-        expect(vaultStore.closeUnlockModal).to.have.been.called;
-      });
-    });
-
-    describe('onEditPassword', () => {
-      beforeEach(() => {
-        instance.onEditPassword(null, 'someVaultPassword');
-      });
-
-      it('calls into vaultStore.setVaultPassword', () => {
-        expect(vaultStore.setVaultPassword).to.have.been.calledWith('someVaultPassword');
-      });
-    });
-  });
-});
diff --git a/js/src/modals/Verification/Done/done.css b/js/src/modals/Verification/Done/done.css
deleted file mode 100644
index 700a0549af4a8f17a0ed632695556bb83b0a3381..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/Done/done.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.spacing {
-  margin-top: 1.5em;
-}
-
-.container {
-  margin-top: .5em;
-  display: flex;
-  align-items: center;
-}
-
-.message {
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-left: .5em;
-}
diff --git a/js/src/modals/Verification/Done/done.js b/js/src/modals/Verification/Done/done.js
deleted file mode 100644
index 2c2e4874780be47e9360e94948f737c690116885..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/Done/done.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { DoneIcon } from '~/ui/Icons';
-
-import styles from './done.css';
-
-export default class Done extends Component {
-  render () {
-    return (
-      <div className={ styles.container }>
-        <DoneIcon />
-        <p className={ styles.message }>
-          <FormattedMessage
-            id='verification.done.message'
-            defaultMessage='Congratulations, your account is verified!'
-          />
-        </p>
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/Verification/Done/index.js b/js/src/modals/Verification/Done/index.js
deleted file mode 100644
index 547e2084f1ac7826c5d1667f609d9f084cb17106..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/Done/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './done';
diff --git a/js/src/modals/Verification/GatherData/gatherData.css b/js/src/modals/Verification/GatherData/gatherData.css
deleted file mode 100644
index 0f9ba36171c52542f4e368dcc1fbf553a76bc259..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/GatherData/gatherData.css
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.spacing {
-  margin-top: 1.5em;
-}
-
-.container {
-  margin-top: .5em;
-  display: flex;
-  align-items: center;
-}
-.message {
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-left: .5em;
-}
-
-.field {
-  margin-bottom: .5em;
-}
-
-.terms {
-  line-height: 1.3;
-  opacity: .7;
-
-  ul {
-    padding-left: 1.5em;
-  }
-
-  li {
-    margin-top: .2em;
-    margin-bottom: .2em;
-  }
-}
diff --git a/js/src/modals/Verification/GatherData/gatherData.js b/js/src/modals/Verification/GatherData/gatherData.js
deleted file mode 100644
index b5f7bf06b363b06613a2bbbb71a8bb8e157dd496..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/GatherData/gatherData.js
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import BigNumber from 'bignumber.js';
-import { Checkbox } from 'material-ui';
-
-import { fromWei } from '~/api/util/wei';
-import { Form, Input } from '~/ui';
-import { DoneIcon, ErrorIcon, InfoIcon } from '~/ui/Icons';
-import { nullableProptype } from '~/util/proptypes';
-
-import smsTermsOfService from '~/3rdparty/sms-verification/terms-of-service';
-import emailTermsOfService from '~/3rdparty/email-verification/terms-of-service';
-import { howSMSVerificationWorks, howEmailVerificationWorks } from '../how-it-works';
-import styles from './gatherData.css';
-
-const boolOfError = PropTypes.oneOfType([ PropTypes.bool, PropTypes.instanceOf(Error) ]);
-
-export default class GatherData extends Component {
-  static propTypes = {
-    fee: React.PropTypes.instanceOf(BigNumber),
-    fields: PropTypes.array.isRequired,
-    accountHasRequested: nullableProptype(PropTypes.bool.isRequired),
-    isServerRunning: nullableProptype(PropTypes.bool.isRequired),
-    isAbleToRequest: nullableProptype(boolOfError.isRequired),
-    accountIsVerified: nullableProptype(PropTypes.bool.isRequired),
-    method: PropTypes.string.isRequired,
-    setConsentGiven: PropTypes.func.isRequired
-  }
-
-  render () {
-    const { method, accountIsVerified } = this.props;
-    const termsOfService = method === 'email' ? emailTermsOfService : smsTermsOfService;
-    const howItWorks = method === 'email' ? howEmailVerificationWorks : howSMSVerificationWorks;
-
-    return (
-      <Form>
-        { howItWorks }
-        { this.renderServerRunning() }
-        { this.renderFee() }
-        { this.renderCertified() }
-        { this.renderRequested() }
-        { this.renderFields() }
-        { this.renderIfAbleToRequest() }
-        <Checkbox
-          className={ styles.spacing }
-          label={
-            <FormattedMessage
-              id='ui.verification.gatherData.termsOfService'
-              defaultMessage='I agree to the terms and conditions below.'
-            />
-          }
-          disabled={ accountIsVerified }
-          onCheck={ this.consentOnChange }
-        />
-        <div className={ styles.terms }>{ termsOfService }</div>
-      </Form>
-    );
-  }
-
-  renderServerRunning () {
-    const { isServerRunning } = this.props;
-
-    if (isServerRunning) {
-      return (
-        <div className={ styles.container }>
-          <DoneIcon />
-          <p className={ styles.message }>
-            <FormattedMessage
-              id='ui.verification.gatherData.isServerRunning.true'
-              defaultMessage='The verification server is running.'
-            />
-          </p>
-        </div>
-      );
-    } else if (isServerRunning === false) {
-      return (
-        <div className={ styles.container }>
-          <ErrorIcon />
-          <p className={ styles.message }>
-            <FormattedMessage
-              id='ui.verification.gatherData.isServerRunning.false'
-              defaultMessage='The verification server is not running.'
-            />
-          </p>
-        </div>
-      );
-    }
-    return (
-      <p className={ styles.message }>
-        <FormattedMessage
-          id='ui.verification.gatherData.isServerRunning.pending'
-          defaultMessage='Checking if the verification server is running…'
-        />
-      </p>
-    );
-  }
-
-  renderFee () {
-    const { fee } = this.props;
-
-    if (!fee) {
-      return (<p>Fetching the fee…</p>);
-    }
-    if (fee.eq(0)) {
-      return (
-        <div className={ styles.container }>
-          <InfoIcon />
-          <p className={ styles.message }>
-            <FormattedMessage
-              id='ui.verification.gatherData.nofee'
-              defaultMessage='There is no additional fee.'
-            />
-          </p>
-        </div>
-      );
-    }
-    return (
-      <div className={ styles.container }>
-        <InfoIcon />
-        <p className={ styles.message }>
-          <FormattedMessage
-            id='ui.verification.gatherData.fee'
-            defaultMessage='The additional fee is {amount} ETH.'
-            values={ {
-              amount: fromWei(fee).toFixed(3)
-            } }
-          />
-        </p>
-      </div>
-    );
-  }
-
-  renderCertified () {
-    const { accountIsVerified } = this.props;
-
-    if (accountIsVerified) {
-      return (
-        <div className={ styles.container }>
-          <ErrorIcon />
-          <p className={ styles.message }>
-            <FormattedMessage
-              id='ui.verification.gatherData.accountIsVerified.true'
-              defaultMessage='Your account is already verified.'
-            />
-          </p>
-        </div>
-      );
-    } else if (accountIsVerified === false) {
-      return (
-        <div className={ styles.container }>
-          <DoneIcon />
-          <p className={ styles.message }>
-            <FormattedMessage
-              id='ui.verification.gatherData.accountIsVerified.false'
-              defaultMessage='Your account is not verified yet.'
-            />
-          </p>
-        </div>
-      );
-    }
-    return (
-      <p className={ styles.message }>
-        <FormattedMessage
-          id='ui.verification.gatherData.accountIsVerified.pending'
-          defaultMessage='Checking if your account is verified…'
-        />
-      </p>
-    );
-  }
-
-  renderRequested () {
-    const { accountIsVerified, accountHasRequested } = this.props;
-
-    // If the account is verified, don't show that it has requested verification.
-    if (accountIsVerified) {
-      return null;
-    }
-
-    if (accountHasRequested) {
-      return (
-        <div className={ styles.container }>
-          <InfoIcon />
-          <p className={ styles.message }>
-            <FormattedMessage
-              id='ui.verification.gatherData.accountHasRequested.true'
-              defaultMessage='You already requested verification from this account.'
-            />
-          </p>
-        </div>
-      );
-    } else if (accountHasRequested === false) {
-      return (
-        <div className={ styles.container }>
-          <DoneIcon />
-          <p className={ styles.message }>
-            <FormattedMessage
-              id='ui.verification.gatherData.accountHasRequested.false'
-              defaultMessage='You did not request verification from this account yet.'
-            />
-          </p>
-        </div>
-      );
-    }
-    return (
-      <p className={ styles.message }>
-        <FormattedMessage
-          id='ui.verification.gatherData.accountHasRequested.pending'
-          defaultMessage='Checking if you requested verification…'
-        />
-      </p>
-    );
-  }
-
-  renderFields () {
-    const { accountIsVerified, fields } = this.props;
-
-    const rendered = fields.map((field, index) => {
-      const onChange = (_, v) => {
-        field.onChange(v);
-      };
-      const onSubmit = field.onChange;
-
-      return (
-        <Input
-          autoFocus={ index === 0 }
-          className={ styles.field }
-          key={ field.key }
-          label={ field.label }
-          hint={ field.hint }
-          error={ field.error }
-          disabled={ accountIsVerified }
-          onChange={ onChange }
-          onSubmit={ onSubmit }
-        />
-      );
-    });
-
-    return (<div>{rendered}</div>);
-  }
-
-  renderIfAbleToRequest () {
-    const { accountIsVerified, isAbleToRequest } = this.props;
-
-    // If the account is verified, don't show a warning.
-    // If the client is able to send the request, don't show a warning
-    if (accountIsVerified || isAbleToRequest === true) {
-      return null;
-    }
-
-    if (isAbleToRequest === null) {
-      return (
-        <p className={ styles.message }>
-          <FormattedMessage
-            id='ui.verification.gatherData.isAbleToRequest.pending'
-            defaultMessage='Validating your input…'
-          />
-        </p>
-      );
-    } else if (isAbleToRequest) {
-      return (
-        <div className={ styles.container }>
-          <ErrorIcon />
-          <p className={ styles.message }>
-            { isAbleToRequest.message }
-          </p>
-        </div>
-      );
-    }
-  }
-
-  consentOnChange = (_, consentGiven) => {
-    this.props.setConsentGiven(consentGiven);
-  }
-}
diff --git a/js/src/modals/Verification/GatherData/index.js b/js/src/modals/Verification/GatherData/index.js
deleted file mode 100644
index 4038860993898eb4e0a5a00da6ab4dea738645a8..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/GatherData/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './gatherData';
diff --git a/js/src/modals/Verification/QueryCode/index.js b/js/src/modals/Verification/QueryCode/index.js
deleted file mode 100644
index 77af76850146226abf60ff76b01b830e5f1a9830..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/QueryCode/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './queryCode';
diff --git a/js/src/modals/Verification/QueryCode/queryCode.js b/js/src/modals/Verification/QueryCode/queryCode.js
deleted file mode 100644
index 608e92f3fd0ce05cad56831ff2d0ac55a0e1d780..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/QueryCode/queryCode.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Form, Input } from '~/ui';
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-export default class QueryCode extends Component {
-  static propTypes = {
-    receiver: PropTypes.string.isRequired,
-    hint: nodeOrStringProptype(),
-    isCodeValid: PropTypes.bool.isRequired,
-    setCode: PropTypes.func.isRequired
-  }
-
-  static defaultProps = {
-    hint: (
-      <FormattedMessage
-        id='verification.code.hint'
-        defaultMessage='Enter the code you received.'
-      />
-    )
-  }
-
-  render () {
-    const { receiver, hint, isCodeValid } = this.props;
-
-    return (
-      <Form>
-        <p>
-          <FormattedMessage
-            id='verification.code.sent'
-            defaultMessage='The verification code has been sent to {receiver}.'
-            values={ {
-              receiver
-            } }
-          />
-        </p>
-        <Input
-          autoFocus
-          label={
-            <FormattedMessage
-              id='verification.code.label'
-              defaultMessage='verification code'
-            />
-          }
-          hint={ hint }
-          error={
-            isCodeValid
-              ? null
-              : (
-                <FormattedMessage
-                  id='verification.code.error'
-                  defaultMessage='invalid code'
-                />
-              )
-          }
-          onChange={ this.onChange }
-          onSubmit={ this.onSubmit }
-        />
-      </Form>
-    );
-  }
-
-  onChange = (_, code) => {
-    this.props.setCode(code.trim());
-  }
-
-  onSubmit = (code) => {
-    this.props.setCode(code.trim());
-  }
-}
diff --git a/js/src/modals/Verification/SendConfirmation/index.js b/js/src/modals/Verification/SendConfirmation/index.js
deleted file mode 100644
index a6277a4d4317affe7fb45fc42a0c9946c64fab9c..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/SendConfirmation/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './sendConfirmation';
diff --git a/js/src/modals/Verification/SendConfirmation/sendConfirmation.css b/js/src/modals/Verification/SendConfirmation/sendConfirmation.css
deleted file mode 100644
index 8b8a28bede4a855b6210c3649b4095bc7db579be..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/SendConfirmation/sendConfirmation.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.centered {
-  text-align: center;
-}
diff --git a/js/src/modals/Verification/SendConfirmation/sendConfirmation.js b/js/src/modals/Verification/SendConfirmation/sendConfirmation.js
deleted file mode 100644
index bcff625919eeaf03c61f37d0ad2b7e042234f839..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/SendConfirmation/sendConfirmation.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { nullableProptype } from '~/util/proptypes';
-import TxHash from '~/ui/TxHash';
-import {
-  POSTING_CONFIRMATION, POSTED_CONFIRMATION
-} from '../store';
-
-import styles from './sendConfirmation.css';
-
-export default class SendConfirmation extends Component {
-  static propTypes = {
-    step: PropTypes.any.isRequired,
-    tx: nullableProptype(PropTypes.any.isRequired)
-  }
-
-  render () {
-    const { step, tx } = this.props;
-
-    if (step === POSTING_CONFIRMATION) {
-      return (
-        <p>
-          <FormattedMessage
-            id='verification.confirmation.authorise'
-            defaultMessage='The verification code will be sent to the contract. Please authorize this using the Parity Signer.'
-          />
-        </p>);
-    }
-
-    if (step === POSTED_CONFIRMATION) {
-      return (
-        <div className={ styles.centered }>
-          <TxHash
-            hash={ tx }
-            maxConfirmations={ 2 }
-          />
-          <p>
-            <FormattedMessage
-              id='verification.confirmation.windowOpen'
-              defaultMessage='Please keep this window open.'
-            />
-          </p>
-        </div>
-      );
-    }
-
-    return null;
-  }
-}
diff --git a/js/src/modals/Verification/SendRequest/index.js b/js/src/modals/Verification/SendRequest/index.js
deleted file mode 100644
index 998cdd02c6d18cd54f3ba0f994aa107c956ad5d7..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/SendRequest/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './sendRequest';
diff --git a/js/src/modals/Verification/SendRequest/sendRequest.css b/js/src/modals/Verification/SendRequest/sendRequest.css
deleted file mode 100644
index 8b8a28bede4a855b6210c3649b4095bc7db579be..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/SendRequest/sendRequest.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.centered {
-  text-align: center;
-}
diff --git a/js/src/modals/Verification/SendRequest/sendRequest.js b/js/src/modals/Verification/SendRequest/sendRequest.js
deleted file mode 100644
index 7df4ef1e41a792b38f4e384a3792fca7fa677d73..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/SendRequest/sendRequest.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { nullableProptype } from '~/util/proptypes';
-import TxHash from '~/ui/TxHash';
-import {
-  POSTING_REQUEST, POSTED_REQUEST, REQUESTING_CODE
-} from '../store';
-
-import styles from './sendRequest.css';
-
-export default class SendRequest extends Component {
-  static propTypes = {
-    step: PropTypes.any.isRequired,
-    tx: nullableProptype(PropTypes.any.isRequired)
-  }
-
-  render () {
-    const { step, tx } = this.props;
-
-    switch (step) {
-      case POSTING_REQUEST:
-        return (
-          <p>
-            <FormattedMessage
-              id='verification.request.authorise'
-              defaultMessage='A verification request will be sent to the contract. Please authorize this using the Parity Signer.'
-            />
-          </p>
-        );
-
-      case POSTED_REQUEST:
-        return (
-          <div className={ styles.centered }>
-            <TxHash
-              hash={ tx }
-              maxConfirmations={ 1 }
-            />
-            <p>
-              <FormattedMessage
-                id='verification.request.windowOpen'
-                defaultMessage='Please keep this window open.'
-              />
-            </p>
-          </div>
-        );
-
-      case REQUESTING_CODE:
-        return (
-          <p>
-            <FormattedMessage
-              id='verification.request.requesting'
-              defaultMessage='Requesting a code from the Parity server and waiting for the puzzle to be put into the contract.'
-            />
-          </p>
-        );
-
-      default:
-        return null;
-    }
-  }
-}
diff --git a/js/src/modals/Verification/email-store.js b/js/src/modals/Verification/email-store.js
deleted file mode 100644
index d18d5fac9334f3d90e9f39fa21c165411c7b3011..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/email-store.js
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observable, computed, action } from 'mobx';
-import { sha3 } from '~/api/util/sha3';
-import { bytesToHex } from '~/api/util/format';
-
-import EmailVerificationABI from '~/contracts/abi/email-verification.json';
-import VerificationStore, {
-  LOADING, QUERY_DATA, QUERY_CODE, POSTED_CONFIRMATION, DONE
-} from './store';
-import { isServerRunning, hasReceivedCode, postToServer } from '~/3rdparty/email-verification';
-
-const ZERO20 = '0x0000000000000000000000000000000000000000';
-
-// name in the `BadgeReg.sol` contract
-const EMAIL_VERIFICATION = 'emailverification';
-
-export default class EmailVerificationStore extends VerificationStore {
-  @observable email = '';
-
-  @computed get isEmailValid () {
-    // See https://davidcel.is/posts/stop-validating-email-addresses-with-regex/
-    return this.email && this.email.indexOf('@') >= 0;
-  }
-
-  @computed get isStepValid () {
-    if (this.step === DONE) {
-      return true;
-    }
-    if (this.error) {
-      return false;
-    }
-
-    switch (this.step) {
-      case LOADING:
-        return this.contract && this.fee && this.accountIsVerified !== null && this.accountHasRequested !== null;
-      case QUERY_DATA:
-        return this.isEmailValid && this.consentGiven && this.isAbleToRequest === true;
-      case QUERY_CODE:
-        return this.requestTx && this.isCodeValid === true;
-      case POSTED_CONFIRMATION:
-        return !!this.confirmationTx;
-      default:
-        return false;
-    }
-  }
-
-  constructor (api, account, isTestnet) {
-    super(api, EmailVerificationABI, EMAIL_VERIFICATION, account, isTestnet);
-  }
-
-  isServerRunning = () => {
-    return isServerRunning(this.isTestnet);
-  }
-
-  checkIfReceivedCode = () => {
-    return hasReceivedCode(this.email, this.account, this.isTestnet);
-  }
-
-  // If the email has already been used for verification of another account,
-  // we prevent the user from wasting ETH to request another verification.
-  @action setIfAbleToRequest = () => {
-    const { isEmailValid } = this;
-
-    if (!isEmailValid) {
-      this.isAbleToRequest = true;
-      return;
-    }
-
-    const { contract, email } = this;
-    const emailHash = sha3.text(email);
-
-    this.isAbleToRequest = null;
-    contract
-      .instance.reverse
-      .call({}, [ emailHash ])
-      .then((address) => {
-        if (address === ZERO20) {
-          this.isAbleToRequest = true;
-        } else {
-          this.isAbleToRequest = new Error('Another account has been verified using this e-mail.');
-        }
-      })
-      .catch((err) => {
-        this.error = 'Failed to check if able to send request: ' + err.message;
-      });
-  }
-
-  // Determine the values relevant for checking if the last request contains
-  // the same data as the current one.
-  requestValues = () => [ sha3.text(this.email) ]
-
-  shallSkipRequest = (currentValues) => {
-    const { accountHasRequested } = this;
-    const lastRequest = this.lastRequestValues;
-
-    if (!accountHasRequested) {
-      return Promise.resolve(false);
-    }
-    // If the last email verification `request` for the selected address contains
-    // the same email as the current one, don't send another request to save ETH.
-    const skip = currentValues[0] === bytesToHex(lastRequest.emailHash.value);
-
-    return Promise.resolve(skip);
-  }
-
-  @action setEmail = (email) => {
-    this.email = email;
-  }
-
-  requestCode = () => {
-    const { email, account, isTestnet } = this;
-
-    return postToServer({ email, address: account }, isTestnet);
-  }
-}
diff --git a/js/src/modals/Verification/how-it-works.js b/js/src/modals/Verification/how-it-works.js
deleted file mode 100644
index aadbe48f1c77ee45add3f4adff9ec9bb3c2e12c7..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/how-it-works.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-
-import styles from './verification.css';
-
-export const howSMSVerificationWorks = (
-  <div>
-    <p>The following steps will let you prove that you control both an account and a phone number.</p>
-    <ol className={ styles.list }>
-      <li>You send a verification request to a specific contract.</li>
-      <li>Our server puts a puzzle into this contract.</li>
-      <li>The code you receive via SMS is the solution to this puzzle.</li>
-    </ol>
-  </div>
-);
-
-export const howEmailVerificationWorks = (
-  <div>
-    <p>The following steps will let you prove that you control both an account and an e-mail address.</p>
-    <ol className={ styles.list }>
-      <li>You send a verification request to a specific contract.</li>
-      <li>Our server puts a puzzle into this contract.</li>
-      <li>The code you receive via e-mail is the solution to this puzzle.</li>
-    </ol>
-  </div>
-);
diff --git a/js/src/modals/Verification/index.js b/js/src/modals/Verification/index.js
deleted file mode 100644
index 69231b853a7e9895506cff30d36099a9053776df..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './verification';
diff --git a/js/src/modals/Verification/sms-store.js b/js/src/modals/Verification/sms-store.js
deleted file mode 100644
index 25c07403cab785258f1a6c180fcbb8ac8d8339e0..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/sms-store.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observable, computed, action } from 'mobx';
-import phone from 'phoneformat.js';
-
-import SMSVerificationABI from '~/contracts/abi/sms-verification.json';
-import VerificationStore, {
-  LOADING, QUERY_DATA, QUERY_CODE, POSTED_CONFIRMATION, DONE
-} from './store';
-import { isServerRunning, hasReceivedCode, postToServer } from '~/3rdparty/sms-verification';
-
-// name in the `BadgeReg.sol` contract
-const SMS_VERIFICATION = 'smsverification';
-
-export default class SMSVerificationStore extends VerificationStore {
-  @observable number = '';
-
-  @computed get isNumberValid () {
-    return phone.isValidNumber(this.number);
-  }
-
-  @computed get isStepValid () {
-    if (this.step === DONE) {
-      return true;
-    }
-    if (this.error) {
-      return false;
-    }
-
-    switch (this.step) {
-      case LOADING:
-        return this.contract && this.fee && this.accountIsVerified !== null && this.accountHasRequested !== null;
-      case QUERY_DATA:
-        return this.isNumberValid && this.consentGiven;
-      case QUERY_CODE:
-        return this.requestTx && this.isCodeValid === true;
-      case POSTED_CONFIRMATION:
-        return !!this.confirmationTx;
-      default:
-        return false;
-    }
-  }
-
-  constructor (api, account, isTestnet) {
-    super(api, SMSVerificationABI, SMS_VERIFICATION, account, isTestnet);
-  }
-
-  isServerRunning = () => {
-    return isServerRunning(this.isTestnet);
-  }
-
-  checkIfReceivedCode = () => {
-    return hasReceivedCode(this.number, this.account, this.isTestnet);
-  }
-
-  // SMS verification events don't contain the phone number, so we will have to
-  // send a new request every single time. See below.
-  @action setIfAbleToRequest = () => {
-    this.isAbleToRequest = true;
-  }
-
-  // SMS verification `request` & `confirm` transactions and events don't contain the
-  // phone number, so we will have to send a new request every single time. This may
-  // cost the user more money, but given that it fails otherwise, it seems like a
-  // reasonable tradeoff.
-  shallSkipRequest = () => Promise.resolve(false)
-
-  @action setNumber = (number) => {
-    this.number = number;
-  }
-
-  requestCode = () => {
-    const { number, account, isTestnet } = this;
-
-    return postToServer({ number, address: account }, isTestnet);
-  }
-}
diff --git a/js/src/modals/Verification/store.js b/js/src/modals/Verification/store.js
deleted file mode 100644
index e7986f6ae85bc35f311b9d8bed5df2efc3707a99..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/store.js
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observable, autorun, action } from 'mobx';
-import { sha3 } from '~/api/util/sha3';
-import Contract from '~/api/contract';
-import Contracts from '~/contracts';
-
-import { checkIfVerified, findLastRequested, awaitPuzzle } from '~/contracts/verification';
-import { checkIfTxFailed, waitForConfirmations } from '~/util/tx';
-
-export const LOADING = 'fetching-contract';
-export const QUERY_DATA = 'query-data';
-export const POSTING_REQUEST = 'posting-request';
-export const POSTED_REQUEST = 'posted-request';
-export const REQUESTING_CODE = 'requesting-code';
-export const QUERY_CODE = 'query-code';
-export const POSTING_CONFIRMATION = 'posting-confirmation';
-export const POSTED_CONFIRMATION = 'posted-confirmation';
-export const DONE = 'done';
-
-export default class VerificationStore {
-  @observable step = null;
-  @observable error = null;
-
-  @observable contract = null;
-  @observable fee = null;
-  @observable accountIsVerified = null;
-  @observable accountHasRequested = null;
-  @observable isAbleToRequest = null;
-  @observable lastRequestValues = null;
-  @observable isServerRunning = null;
-  @observable consentGiven = false;
-  @observable requestTx = null;
-  @observable code = '';
-  @observable isCodeValid = false;
-  @observable confirmationTx = null;
-
-  constructor (api, abi, certifierName, account, isTestnet) {
-    this.api = api;
-    this.account = account;
-    this.isTestnet = isTestnet;
-
-    this.step = LOADING;
-    Contracts.get().badgeReg.fetchCertifierByName(certifierName)
-      .then(({ address }) => {
-        this.contract = new Contract(api, abi).at(address);
-        this.load();
-      })
-      .catch((err) => {
-        console.error('error', err);
-        this.error = 'Failed to fetch the contract: ' + err.message;
-      });
-
-    autorun(() => {
-      if (this.error) {
-        console.error('verification: ' + this.error);
-      }
-    });
-
-    autorun(() => {
-      if (this.step !== QUERY_DATA) {
-        return;
-      }
-
-      this.setIfAbleToRequest();
-    });
-  }
-
-  @action load = () => {
-    const { contract, account } = this;
-
-    this.step = LOADING;
-
-    const isServerRunning = this.isServerRunning()
-      .then((isRunning) => {
-        this.isServerRunning = isRunning;
-      })
-      .catch((err) => {
-        this.error = 'Failed to check if server is running: ' + err.message;
-      });
-
-    const fee = contract.instance.fee.call()
-      .then((fee) => {
-        this.fee = fee;
-      })
-      .catch((err) => {
-        this.error = 'Failed to fetch the fee: ' + err.message;
-      });
-
-    const accountIsVerified = checkIfVerified(contract, account)
-      .then((accountIsVerified) => {
-        this.accountIsVerified = accountIsVerified;
-      })
-      .catch((err) => {
-        this.error = 'Failed to check if verified: ' + err.message;
-      });
-
-    const accountHasRequested = findLastRequested(contract, account)
-      .then((log) => {
-        this.accountHasRequested = !!log;
-        if (log) {
-          this.lastRequestValues = log.params;
-          this.requestTx = log.transactionHash;
-        }
-      })
-      .catch((err) => {
-        this.error = 'Failed to check if requested: ' + err.message;
-      });
-
-    Promise
-      .all([ isServerRunning, fee, accountIsVerified, accountHasRequested ])
-      .then(() => {
-        this.step = QUERY_DATA;
-      });
-  }
-
-  @action setConsentGiven = (consentGiven) => {
-    this.consentGiven = consentGiven;
-  }
-
-  @action setCode = (code) => {
-    const { contract, account } = this;
-
-    if (!contract || !account || code.length === 0) {
-      return;
-    }
-
-    const confirm = contract.functions.find((fn) => fn.name === 'confirm');
-    const options = { from: account };
-    const values = [ sha3.text(code) ];
-
-    this.code = code;
-    this.isCodeValid = false;
-    confirm.estimateGas(options, values)
-      .then((gas) => {
-        options.gas = gas.mul(1.2).toFixed(0);
-        return confirm.call(options, values);
-      })
-      .then((result) => {
-        this.isCodeValid = result === true;
-      })
-      .catch((err) => {
-        this.error = 'Failed to check if the code is valid: ' + err.message;
-      });
-  }
-
-  requestValues = () => []
-
-  @action sendRequest = () => {
-    const { api, account, contract, fee } = this;
-
-    const request = contract.functions.find((fn) => fn.name === 'request');
-    const options = { from: account, value: fee.toString() };
-    const values = this.requestValues();
-
-    this.shallSkipRequest(values)
-      .then((skipRequest) => {
-        if (skipRequest) {
-          return;
-        }
-
-        this.step = POSTING_REQUEST;
-        return request.estimateGas(options, values)
-          .then((gas) => {
-            options.gas = gas.mul(1.2).toFixed(0);
-            return request.postTransaction(options, values);
-          })
-          .then((handle) => {
-            // The "request rejected" error doesn't have any property to distinguish
-            // it from other errors, so we can't give a meaningful error here.
-            return api.pollMethod('parity_checkRequest', handle);
-          })
-          .then((txHash) => {
-            this.requestTx = txHash;
-            return checkIfTxFailed(api, txHash, options.gas)
-              .then((hasFailed) => {
-                if (hasFailed) {
-                  throw new Error('Transaction failed, all gas used up.');
-                }
-                this.step = POSTED_REQUEST;
-                return waitForConfirmations(api, txHash, 1);
-              });
-          });
-      })
-      .then(() => this.checkIfReceivedCode())
-      .then((hasReceived) => {
-        if (hasReceived) {
-          return;
-        }
-
-        this.step = REQUESTING_CODE;
-        return this
-          .requestCode()
-          .then(() => awaitPuzzle(api, contract, account));
-      })
-      .then(() => {
-        this.step = QUERY_CODE;
-      })
-      .catch((err) => {
-        this.error = 'Failed to request a confirmation code: ' + err.message;
-      });
-  }
-
-  @action queryCode = () => {
-    this.step = QUERY_CODE;
-  }
-
-  @action sendConfirmation = () => {
-    const { api, account, contract, code } = this;
-    const token = sha3.text(code);
-
-    const confirm = contract.functions.find((fn) => fn.name === 'confirm');
-    const options = { from: account };
-    const values = [ token ];
-
-    this.step = POSTING_CONFIRMATION;
-    confirm.estimateGas(options, values)
-      .then((gas) => {
-        options.gas = gas.mul(1.2).toFixed(0);
-        return confirm.postTransaction(options, values);
-      })
-      .then((handle) => {
-        // TODO: The "request rejected" error doesn't have any property to
-        // distinguish it from other errors, so we can't give a meaningful error here.
-        return api.pollMethod('parity_checkRequest', handle);
-      })
-      .then((txHash) => {
-        this.confirmationTx = txHash;
-        return checkIfTxFailed(api, txHash, options.gas)
-          .then((hasFailed) => {
-            if (hasFailed) {
-              throw new Error('Transaction failed, all gas used up.');
-            }
-            this.step = POSTED_CONFIRMATION;
-            return waitForConfirmations(api, txHash, 1);
-          });
-      })
-      .then(() => {
-        this.step = DONE;
-      })
-      .catch((err) => {
-        this.error = 'Failed to send the verification code: ' + err.message;
-      });
-  }
-
-  @action done = () => {
-    this.step = DONE;
-  }
-}
diff --git a/js/src/modals/Verification/verification.css b/js/src/modals/Verification/verification.css
deleted file mode 100644
index 67b2a56c1838eea297d99b54e6d1fde63937f419..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/verification.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.noSpacing {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.list li {
-  padding: .1em 0;
-}
diff --git a/js/src/modals/Verification/verification.js b/js/src/modals/Verification/verification.js
deleted file mode 100644
index d94c4412244bb54a0c8ad240596918c75e3aac5a..0000000000000000000000000000000000000000
--- a/js/src/modals/Verification/verification.js
+++ /dev/null
@@ -1,451 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { observer } from 'mobx-react';
-import { observable } from 'mobx';
-
-import { Button, IdentityIcon, Portal } from '~/ui';
-import RadioButtons from '~/ui/Form/RadioButtons';
-import { CancelIcon, DoneIcon } from '~/ui/Icons';
-
-import SMSVerificationStore from './sms-store';
-import EmailVerificationStore from './email-store';
-
-import styles from './verification.css';
-
-const METHODS = {
-  sms: {
-    label: (
-      <FormattedMessage
-        id='verification.types.sms.label'
-        defaultMessage='SMS Verification'
-      />
-    ),
-    key: 0,
-    value: 'sms',
-    description: (
-      <p className={ styles.noSpacing }>
-        <FormattedMessage
-          id='verification.types.sms.description'
-          defaultMessage='It will be stored on the blockchain that you control a phone number (not <em>which</em>).'
-        />
-      </p>
-    )
-  },
-  email: {
-    label: (
-      <FormattedMessage
-        id='verification.types.email.label'
-        defaultMessage='E-mail Verification'
-      />
-    ),
-    key: 1,
-    value: 'email',
-    description: (
-      <p className={ styles.noSpacing }>
-        <FormattedMessage
-          id='verification.types.email.description'
-          defaultMessage='The hash of the e-mail address you prove control over will be stored on the blockchain.'
-        />
-      </p>
-    )
-  }
-};
-
-const STEPS = [
-  <FormattedMessage
-    id='verification.steps.method'
-    defaultMessage='Method'
-  />,
-  <FormattedMessage
-    id='verification.steps.data'
-    defaultMessage='Enter Data'
-  />,
-  <FormattedMessage
-    id='verification.steps.request'
-    defaultMessage='Request'
-  />,
-  <FormattedMessage
-    id='verification.steps.code'
-    defaultMessage='Enter Code'
-  />,
-  <FormattedMessage
-    id='verification.steps.confirm'
-    defaultMessage='Confirm'
-  />,
-  <FormattedMessage
-    id='verification.steps.completed'
-    defaultMessage='Completed'
-  />
-];
-
-import {
-  LOADING,
-  QUERY_DATA,
-  POSTING_REQUEST, POSTED_REQUEST,
-  REQUESTING_CODE, QUERY_CODE,
-  POSTING_CONFIRMATION, POSTED_CONFIRMATION,
-  DONE
-} from './store';
-
-import GatherData from './GatherData';
-import SendRequest from './SendRequest';
-import QueryCode from './QueryCode';
-import SendConfirmation from './SendConfirmation';
-import Done from './Done';
-
-@observer
-class Verification extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    account: PropTypes.string.isRequired,
-    isTest: PropTypes.bool.isRequired,
-    onClose: PropTypes.func.isRequired
-  }
-
-  static phases = { // mapping (store steps -> steps)
-    [LOADING]: 1, [QUERY_DATA]: 1,
-    [POSTING_REQUEST]: 2, [POSTED_REQUEST]: 2, [REQUESTING_CODE]: 2,
-    [QUERY_CODE]: 3,
-    [POSTING_CONFIRMATION]: 4, [POSTED_CONFIRMATION]: 4,
-    [DONE]: 5
-  }
-
-  state = {
-    method: 'sms'
-  };
-
-  @observable store = null;
-
-  render () {
-    const { onClose } = this.props;
-    const store = this.store;
-    let phase = 0;
-    let error = false;
-    let isStepValid = true;
-
-    if (store) {
-      phase = Verification.phases[store.step];
-      error = store.error;
-      isStepValid = store.isStepValid;
-    }
-
-    return (
-      <Portal
-        activeStep={ phase }
-        busySteps={
-          error
-            ? []
-            : [ 2, 4 ]
-        }
-        buttons={ this.renderDialogActions(phase, error, isStepValid) }
-        onClose={ onClose }
-        open
-        steps={ STEPS }
-        title={
-          <FormattedMessage
-            id='verification.title'
-            defaultMessage='verify your account'
-          />
-        }
-      >
-        { this.renderStep(phase, error) }
-      </Portal>
-    );
-  }
-
-  renderDialogActions (phase, error, isStepValid) {
-    const { account, onClose } = this.props;
-    const store = this.store;
-
-    const cancelButton = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='verification.button.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ onClose }
-      />
-    );
-
-    if (error) {
-      return cancelButton;
-    }
-
-    if (phase === 5) {
-      return [
-        cancelButton,
-        <Button
-          disabled={ !isStepValid }
-          icon={ <DoneIcon /> }
-          key='done'
-          label={
-            <FormattedMessage
-              id='verification.button.done'
-              defaultMessage='Done'
-            />
-          }
-          onClick={ onClose }
-        />
-      ];
-    }
-
-    let action = () => {};
-
-    switch (phase) {
-      case 0:
-        action = () => {
-          const { method } = this.state;
-
-          this.onSelectMethod(method);
-        };
-        break;
-      case 1:
-        action = store.sendRequest;
-        break;
-      case 2:
-        action = store.queryCode;
-        break;
-      case 3:
-        action = store.sendConfirmation;
-        break;
-      case 4:
-        action = store.done;
-        break;
-    }
-
-    return [
-      cancelButton,
-      <Button
-        disabled={ !isStepValid }
-        icon={
-          <IdentityIcon
-            address={ account }
-            button
-          />
-        }
-        key='next'
-        label={
-          <FormattedMessage
-            id='verification.button.next'
-            defaultMessage='Next'
-          />
-        }
-        onClick={ action }
-      />
-    ];
-  }
-
-  renderStep (phase, error) {
-    if (error) {
-      return (
-        <p>{ error }</p>
-      );
-    }
-
-    const { method } = this.state;
-
-    if (phase === 0) {
-      const values = Object.values(METHODS);
-      const value = values.findIndex((v) => v.value === method);
-
-      return (
-        <RadioButtons
-          onChange={ this.selectMethod }
-          value={ value < 0 ? 0 : value }
-          values={ values }
-        />
-      );
-    }
-
-    const {
-      step,
-      isServerRunning, isAbleToRequest, fee, accountIsVerified, accountHasRequested,
-      requestTx, isCodeValid, confirmationTx,
-      setCode
-    } = this.store;
-
-    switch (phase) {
-      case 1:
-        if (step === LOADING) {
-          return (
-            <p>
-              <FormattedMessage
-                id='verification.loading'
-                defaultMessage='Loading verification data.'
-              />
-            </p>
-          );
-        }
-
-        const { setConsentGiven } = this.store;
-        const fields = [];
-
-        if (method === 'sms') {
-          fields.push({
-            key: 'number',
-            label: (
-              <FormattedMessage
-                id='verification.gatherData.phoneNumber.label'
-                defaultMessage='phone number in international format'
-              />
-            ),
-            hint: (
-              <FormattedMessage
-                id='verification.gatherData.phoneNumber.hint'
-                defaultMessage='the SMS will be sent to this number'
-              />
-            ),
-            error: this.store.isNumberValid
-              ? null
-              : (
-                <FormattedMessage
-                  id='verification.gatherDate.phoneNumber.error'
-                  defaultMessage='invalid number'
-                />
-              ),
-            onChange: this.store.setNumber
-          });
-        } else if (method === 'email') {
-          fields.push({
-            key: 'email',
-            label: (
-              <FormattedMessage
-                id='verification.gatherData.email.label'
-                defaultMessage='e-mail address'
-              />
-            ),
-            hint: (
-              <FormattedMessage
-                id='verification.gatherData.email.hint'
-                defaultMessage='the code will be sent to this address'
-              />
-            ),
-            error: this.store.isEmailValid
-              ? null
-              : (
-                <FormattedMessage
-                  id='verification.gatherDate.email.error'
-                  defaultMessage='invalid e-mail'
-                />
-              ),
-            onChange: this.store.setEmail
-          });
-        }
-
-        return (
-          <GatherData
-            fee={ fee }
-            accountHasRequested={ accountHasRequested }
-            isServerRunning={ isServerRunning }
-            isAbleToRequest={ isAbleToRequest }
-            accountIsVerified={ accountIsVerified }
-            method={ method }
-            fields={ fields }
-            setConsentGiven={ setConsentGiven }
-          />
-        );
-
-      case 2:
-        return (
-          <SendRequest
-            step={ step }
-            tx={ requestTx }
-          />
-        );
-
-      case 3:
-        let receiver;
-        let hint;
-
-        if (method === 'sms') {
-          receiver = this.store.number;
-          hint = (
-            <FormattedMessage
-              id='verification.sms.enterCode'
-              defaultMessage='Enter the code you received via SMS.'
-            />
-          );
-        } else if (method === 'email') {
-          receiver = this.store.email;
-          hint = (
-            <FormattedMessage
-              id='verification.email.enterCode'
-              defaultMessage='Enter the code you received via e-mail.'
-            />
-          );
-        }
-        return (
-          <QueryCode
-            hint={ hint }
-            isCodeValid={ isCodeValid }
-            receiver={ receiver }
-            setCode={ setCode }
-          />
-        );
-
-      case 4:
-        return (
-          <SendConfirmation
-            step={ step }
-            tx={ confirmationTx }
-          />
-        );
-
-      case 5:
-        return (
-          <Done />
-        );
-
-      default:
-        return null;
-    }
-  }
-
-  onSelectMethod = (name) => {
-    const { api } = this.context;
-    const { account, isTest } = this.props;
-
-    if (name === 'sms') {
-      this.store = new SMSVerificationStore(api, account, isTest);
-    } else if (name === 'email') {
-      this.store = new EmailVerificationStore(api, account, isTest);
-    }
-  }
-
-  selectMethod = (choice, i) => {
-    this.setState({ method: choice.value });
-  }
-}
-
-const mapStateToProps = (state) => ({
-  isTest: state.nodeStatus.isTest
-});
-
-export default connect(
-  mapStateToProps,
-  null
-)(Verification);
diff --git a/js/src/modals/WalletSettings/index.js b/js/src/modals/WalletSettings/index.js
deleted file mode 100644
index bfedbb7af44b05f1ab96d28b831b5fdf3b533d63..0000000000000000000000000000000000000000
--- a/js/src/modals/WalletSettings/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './walletSettings';
diff --git a/js/src/modals/WalletSettings/walletSettings.css b/js/src/modals/WalletSettings/walletSettings.css
deleted file mode 100644
index 6b087083ea061867f1fda85b1313f27210633ede..0000000000000000000000000000000000000000
--- a/js/src/modals/WalletSettings/walletSettings.css
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.splitInput {
-  display: flex;
-  flex-direction: row;
-
-  > * {
-    flex: 1;
-
-    margin: 0 0.25em;
-
-    &:first-child {
-      margin-left: 0;
-    }
-
-    &:last-child {
-      margin-right: 0;
-    }
-  }
-}
-
-.change {
-  background-color: rgba(255, 255, 255, 0.1);
-  padding: 0.75em 1.75em;
-  margin-bottom: 1em;
-
-  &.add {
-    background-color: rgba(139, 195, 74, 0.5);
-  }
-
-  &.remove {
-    background-color: rgba(244, 67, 54, 0.5);
-  }
-
-  .label {
-    text-transform: uppercase;
-    margin-bottom: 0.5em;
-    margin-left: -1em;
-    font-size: 0.8em;
-  }
-}
-
-.eth:after {
-  content: 'ETH';
-  font-size: 0.75em;
-  margin-left: 0.125em;
-}
-
-.modifications {
-  color: white;
-  margin: 0;
-}
-
diff --git a/js/src/modals/WalletSettings/walletSettings.js b/js/src/modals/WalletSettings/walletSettings.js
deleted file mode 100644
index 1984e62134894788a90356bb22348bfc832047be..0000000000000000000000000000000000000000
--- a/js/src/modals/WalletSettings/walletSettings.js
+++ /dev/null
@@ -1,459 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { observer } from 'mobx-react';
-import { pick } from 'lodash';
-
-import { AddressSelect, Button, Form, TypedInput, Input, InputAddress, Portal } from '~/ui';
-import { CancelIcon, NextIcon } from '~/ui/Icons';
-import { fromWei } from '~/api/util/wei';
-
-import WalletSettingsStore from './walletSettingsStore.js';
-import styles from './walletSettings.css';
-
-@observer
-class WalletSettings extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accountsInfo: PropTypes.object.isRequired,
-    wallet: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    senders: PropTypes.object.isRequired
-  };
-
-  store = new WalletSettingsStore(this.context.api, this.props);
-
-  render () {
-    const { stage, steps } = this.store;
-
-    return (
-      <Portal
-        activeStep={ stage }
-        buttons={ this.renderDialogActions() }
-        onClose={ this.onClose }
-        open
-        steps={ steps.map((step) => step.title) }
-      >
-        { this.renderPage() }
-      </Portal>
-    );
-  }
-
-  renderPage () {
-    const { step } = this.store;
-
-    switch (step) {
-      case 'CONFIRMATION':
-        const { changes } = this.store;
-
-        return (
-          <div>
-            { this.renderChanges(changes) }
-          </div>
-        );
-
-      default:
-      case 'EDIT':
-        const { errors, fromString, wallet } = this.store;
-        const { accountsInfo, senders } = this.props;
-
-        return (
-          <Form>
-            <p>
-              <FormattedMessage
-                id='walletSettings.edit.message'
-                defaultMessage={
-                  `In order to edit this contract's settings, at
-                  least { owners, number } { owners, plural,
-                    one { owner }
-                    other { owners }
-                  } have to
-                  send the very same modifications. You can paste a stringified version
-                  of the modifications here.`
-                }
-                values={ {
-                  owners: this.store.initialWallet.require.toNumber()
-                } }
-              />
-            </p>
-
-            <Input
-              autoFocus
-              hint='[ ... ]'
-              label={
-                <FormattedMessage
-                  id='walletSettings.modifications.fromString.label'
-                  defaultMessage='modifications'
-                />
-              }
-              onChange={ this.store.onModificationsStringChange }
-            />
-
-            <AddressSelect
-              label={
-                <FormattedMessage
-                  id='walletSettings.modifications.sender.label'
-                  defaultMessage='from account (wallet owner)'
-                />
-              }
-              hint={
-                <FormattedMessage
-                  id='walletSettings.modifications.sender.hint'
-                  defaultMessage='send modifications as this owner'
-                />
-              }
-              value={ wallet.sender }
-              error={ errors.sender }
-              onChange={ this.store.onSenderChange }
-              accounts={ senders }
-            />
-
-            <br />
-
-            {
-              fromString
-                ? null
-                : (
-                  <div>
-                    <TypedInput
-                      label={
-                        <FormattedMessage
-                          id='walletSettings.modifications.owners.label'
-                          defaultMessage='other wallet owners'
-                        />
-                      }
-                      value={ wallet.owners.slice() }
-                      onChange={ this.store.onOwnersChange }
-                      accounts={ accountsInfo }
-                      param='address[]'
-                    />
-
-                    <div className={ styles.splitInput }>
-                      <TypedInput
-                        label={
-                          <FormattedMessage
-                            id='walletSettings.modifications.required.label'
-                            defaultMessage='required owners'
-                          />
-                        }
-                        hint={
-                          <FormattedMessage
-                            id='walletSettings.modifications.required.hint'
-                            defaultMessage='number of required owners to accept a transaction'
-                          />
-                        }
-                        error={ errors.require }
-                        min={ 1 }
-                        onChange={ this.store.onRequireChange }
-                        max={ wallet.owners.length }
-                        param='uint'
-                        value={ wallet.require }
-                      />
-
-                      <TypedInput
-                        label={
-                          <FormattedMessage
-                            id='walletSettings.modifications.daylimit.label'
-                            defaultMessage='wallet day limit'
-                          />
-                        }
-                        hint={
-                          <FormattedMessage
-                            id='walletSettings.modifications.daylimit.hint'
-                            defaultMessage='amount of ETH spendable without confirmations'
-                          />
-                        }
-                        value={ wallet.dailylimit }
-                        error={ errors.dailylimit }
-                        onChange={ this.store.onDailylimitChange }
-                        param='uint'
-                        isEth
-                      />
-                    </div>
-                  </div>
-                )
-            }
-          </Form>
-        );
-    }
-  }
-
-  renderChanges (changes) {
-    if (changes.length === 0) {
-      return (
-        <p>
-          <FormattedMessage
-            id='walletSettings.changes.none'
-            defaultMessage='No modifications have been made to the Wallet settings.'
-          />
-        </p>
-      );
-    }
-
-    const modifications = changes.map((change, index) => (
-      <div key={ `${change.type}_${index}` }>
-        { this.renderChange(change) }
-      </div>
-    ));
-
-    return (
-      <div>
-        <p className={ styles.modifications }>
-          <FormattedMessage
-            id='walletSettings.changes.modificationString'
-            defaultMessage={
-              `For your modifications to be taken into account,
-              other owners have to send the same modifications. They can paste
-              this string to make it easier:`
-            }
-          />
-        </p>
-        <Input
-          allowCopy
-          label='modifications'
-          readOnly
-          value={ this.store.changesToString() }
-        />
-
-        <p>
-          <FormattedMessage
-            id='walletSettings.changes.overview'
-            defaultMessage='You are about to make the following modifications'
-          />
-        </p>
-        { modifications }
-      </div>
-    );
-  }
-
-  renderChange (change) {
-    switch (change.type) {
-      case 'dailylimit':
-        return (
-          <div className={ styles.change }>
-            <div className={ styles.label }>Change Daily Limit</div>
-            <div>
-              <span> from </span>
-              <code> { fromWei(change.initial).toFormat() }</code>
-              <span className={ styles.eth } />
-              <span> to </span>
-              <code> { fromWei(change.value).toFormat() }</code>
-              <span className={ styles.eth } />
-            </div>
-          </div>
-        );
-
-      case 'require':
-        return (
-          <div className={ styles.change }>
-            <div className={ styles.label }>
-              <FormattedMessage
-                id='walletSettings.ownersChange.title'
-                defaultMessage='Change Required Owners'
-              />
-            </div>
-            <div>
-              <FormattedMessage
-                id='walletSettings.ownersChange.details'
-                defaultMessage=' from {from} to {to} '
-                values={ {
-                  from: <code>{ change.initial.toNumber() }</code>,
-                  to: <code>{ change.value.toNumber() }</code>
-                } }
-              />
-            </div>
-          </div>
-        );
-
-      case 'change_owner':
-        return (
-          <div className={ [ styles.change ].join(' ') }>
-            <div className={ styles.label }>
-              <FormattedMessage
-                id='walletSettings.changeOwner.title'
-                defaultMessage='Change Owner'
-              />
-            </div>
-            <div>
-              <InputAddress
-                disabled
-                label={
-                  <FormattedMessage
-                    id='walletSettings.changeOwner.labelFrom'
-                    defaultMessage='From'
-                  />
-                }
-                text
-                value={ change.value.from }
-              />
-              <InputAddress
-                disabled
-                label={
-                  <FormattedMessage
-                    id='walletSettings.changeOwner.labelTo'
-                    defaultMessage='To'
-                  />
-                }
-                text
-                value={ change.value.to }
-              />
-            </div>
-          </div>
-        );
-
-      case 'add_owner':
-        return (
-          <div className={ [ styles.change, styles.add ].join(' ') }>
-            <div className={ styles.label }>
-              <FormattedMessage
-                id='walletSettings.addOwner.title'
-                defaultMessage='Add Owner'
-              />
-            </div>
-            <div>
-              <InputAddress
-                disabled
-                text
-                value={ change.value }
-              />
-            </div>
-          </div>
-        );
-
-      case 'remove_owner':
-        return (
-          <div className={ [ styles.change, styles.remove ].join(' ') }>
-            <div className={ styles.label }>
-              <FormattedMessage
-                id='walletSettings.removeOwner.title'
-                defaultMessage='Remove Owner'
-              />
-            </div>
-            <div>
-              <InputAddress
-                disabled
-                text
-                value={ change.value }
-              />
-            </div>
-          </div>
-        );
-    }
-  }
-
-  renderDialogActions () {
-    const { step, hasErrors, onNext, send } = this.store;
-
-    const cancelBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancelBtn'
-        label={
-          <FormattedMessage
-            id='walletSettings.buttons.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.onClose }
-      />
-    );
-
-    const closeBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='closeBtn'
-        label={
-          <FormattedMessage
-            id='walletSettings.buttons.close'
-            defaultMessage='Close'
-          />
-        }
-        onClick={ this.onClose }
-      />
-    );
-
-    const nextBtn = (
-      <Button
-        icon={ <NextIcon /> }
-        key='nextBtn'
-        label={
-          <FormattedMessage
-            id='walletSettings.buttons.next'
-            defaultMessage='Next'
-          />
-        }
-        onClick={ onNext }
-        disabled={ hasErrors }
-      />
-    );
-
-    const sendBtn = (
-      <Button
-        icon={ <NextIcon /> }
-        key='sendBtn'
-        label={
-          <FormattedMessage
-            id='walletSettings.buttons.send'
-            defaultMessage='Send'
-          />
-        }
-        onClick={ send }
-        disabled={ hasErrors }
-      />
-    );
-
-    switch (step) {
-      case 'CONFIRMATION':
-        const { changes } = this.store;
-
-        if (changes.length === 0) {
-          return [ closeBtn ];
-        }
-
-        return [ cancelBtn, sendBtn ];
-
-      default:
-      case 'TYPE':
-        return [ cancelBtn, nextBtn ];
-    }
-  }
-
-  onClose = () => {
-    this.props.onClose();
-  }
-}
-
-function mapStateToProps (initState, initProps) {
-  const { accountsInfo, accounts } = initState.personal;
-  const { owners } = initProps.wallet;
-
-  const senders = pick(accounts, owners);
-
-  return () => {
-    return { accountsInfo, senders };
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(WalletSettings);
diff --git a/js/src/modals/WalletSettings/walletSettingsStore.js b/js/src/modals/WalletSettings/walletSettingsStore.js
deleted file mode 100644
index c3adb812e133cd17c2aa3da2861d036f4526861a..0000000000000000000000000000000000000000
--- a/js/src/modals/WalletSettings/walletSettingsStore.js
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { noop } from 'lodash';
-import { observable, computed, action, transaction } from 'mobx';
-import BigNumber from 'bignumber.js';
-
-import { validateUint, validateAddress } from '~/util/validation';
-import { DEFAULT_GAS, MAX_GAS_ESTIMATION } from '~/util/constants';
-import WalletsUtils from '~/util/wallets';
-
-const STEPS = {
-  EDIT: { title: 'wallet settings' },
-  CONFIRMATION: { title: 'confirmation' }
-};
-
-export default class WalletSettingsStore {
-  accounts = {};
-  onClose = noop;
-
-  @observable fromString = false;
-  @observable requests = [];
-  @observable step = null;
-
-  @observable wallet = {
-    owners: null,
-    require: null,
-    dailylimit: null,
-    sender: ''
-  };
-
-  @observable errors = {
-    owners: null,
-    require: null,
-    dailylimit: null,
-    sender: null
-  };
-
-  @computed get stage () {
-    return this.stepsKeys.findIndex((k) => k === this.step);
-  }
-
-  @computed get hasErrors () {
-    return !!Object.keys(this.errors).find((key) => !!this.errors[key]);
-  }
-
-  @computed get stepsKeys () {
-    return this.steps.map((s) => s.key);
-  }
-
-  @computed get steps () {
-    return Object
-      .keys(STEPS)
-      .map((key) => {
-        return {
-          ...STEPS[key],
-          key
-        };
-      });
-  }
-
-  @action
-  changesFromString (json) {
-    try {
-      const data = JSON.parse(json);
-      const changes = data.map((datum) => {
-        const [ type, valueStr ] = datum.split(';');
-
-        let value;
-
-        if (/^#BN#/.test(valueStr)) {
-          value = new BigNumber(valueStr.replace(/^#BN#/, ''), 16);
-        } else {
-          try {
-            value = JSON.parse(valueStr);
-          } catch (e) {
-            value = valueStr;
-          }
-        }
-
-        return { type, value };
-      });
-
-      this.changes = changes;
-    } catch (error) {
-      if (!(error instanceof SyntaxError)) {
-        console.error('changes from string', error);
-      }
-
-      this.changes = [];
-    }
-  }
-
-  changesToString () {
-    const changes = this.changes.map((change) => {
-      const { type, value } = change;
-
-      const valueStr = (value && typeof value.plus === 'function')
-        ? '#BN#' + value.toString(16)
-        : JSON.stringify(value);
-
-      return [
-        type,
-        valueStr
-      ].join(';');
-    });
-
-    return JSON.stringify(changes);
-  }
-
-  get changes () {
-    const changes = [];
-
-    const prevDailylimit = new BigNumber(this.initialWallet.dailylimit);
-    const nextDailylimit = new BigNumber(this.wallet.dailylimit);
-
-    const prevRequire = new BigNumber(this.initialWallet.require);
-    const nextRequire = new BigNumber(this.wallet.require);
-
-    if (!prevDailylimit.equals(nextDailylimit)) {
-      changes.push({
-        type: 'dailylimit',
-        initial: prevDailylimit,
-        value: nextDailylimit
-      });
-    }
-
-    if (!prevRequire.equals(nextRequire)) {
-      changes.push({
-        type: 'require',
-        initial: prevRequire,
-        value: nextRequire
-      });
-    }
-
-    const prevOwners = this.initialWallet.owners;
-    const nextOwners = this.wallet.owners;
-
-    const ownersToRemove = prevOwners.filter((owner) => !nextOwners.includes(owner));
-    const ownersToAdd = nextOwners.filter((owner) => !prevOwners.includes(owner));
-
-    const ownersChangeCount = Math.min(ownersToRemove.length, ownersToAdd.length);
-
-    for (let i = 0; i < ownersChangeCount; i++) {
-      changes.push({
-        type: 'change_owner',
-        value: {
-          from: ownersToRemove[i],
-          to: ownersToAdd[i]
-        }
-      });
-    }
-
-    ownersToRemove.slice(ownersChangeCount).forEach((owner) => {
-      changes.push({
-        type: 'remove_owner',
-        value: owner
-      });
-    });
-
-    ownersToAdd.slice(ownersChangeCount).forEach((owner) => {
-      changes.push({
-        type: 'add_owner',
-        value: owner
-      });
-    });
-
-    return changes;
-  }
-
-  set changes (changes) {
-    transaction(() => {
-      this.wallet.dailylimit = this.initialWallet.dailylimit;
-      this.wallet.require = this.initialWallet.require;
-      this.wallet.owners = this.initialWallet.owners.slice();
-
-      changes.forEach((change) => {
-        const { type, value } = change;
-
-        switch (type) {
-          case 'dailylimit':
-            this.wallet.dailylimit = value;
-            break;
-
-          case 'require':
-            this.wallet.require = value;
-            break;
-
-          case 'change_owner':
-            this.wallet.owners = this.wallet.owners
-              .filter((owner) => owner !== value.from)
-              .concat(value.to);
-            break;
-
-          case 'remove_owner':
-            this.wallet.owners = this.wallet.owners.filter((owner) => owner !== value);
-            break;
-
-          case 'add_owner':
-            this.wallet.owners.push(value);
-            break;
-        }
-      });
-    });
-  }
-
-  constructor (api, { onClose, wallet }) {
-    this.api = api;
-    this.step = this.stepsKeys[0];
-
-    this.initialWallet = {
-      address: wallet.address,
-      owners: wallet.owners,
-      require: wallet.require,
-      dailylimit: wallet.dailylimit.limit
-    };
-
-    transaction(() => {
-      this.wallet.owners = wallet.owners;
-      this.wallet.require = wallet.require;
-      this.wallet.dailylimit = wallet.dailylimit.limit;
-
-      this.validateWallet(this.wallet);
-    });
-
-    this.onClose = onClose;
-  }
-
-  @action onNext = () => {
-    const stepIndex = this.stepsKeys.findIndex((k) => k === this.step) + 1;
-
-    this.step = this.stepsKeys[stepIndex];
-  }
-
-  @action onChange = (_wallet) => {
-    const newWallet = Object.assign({}, this.wallet, _wallet);
-
-    this.validateWallet(newWallet);
-  }
-
-  @action onOwnersChange = (owners) => {
-    this.onChange({ owners });
-  }
-
-  @action onRequireChange = (require) => {
-    this.onChange({ require });
-  }
-
-  @action onSenderChange = (_, sender) => {
-    this.onChange({ sender });
-  }
-
-  @action onDailylimitChange = (dailylimit) => {
-    this.onChange({ dailylimit });
-  }
-
-  @action onModificationsStringChange = (event, value) => {
-    this.changesFromString(value);
-
-    if (this.changes && this.changes.length > 0) {
-      this.fromString = true;
-    } else {
-      this.fromString = false;
-    }
-  }
-
-  @action send = () => {
-    const changes = this.changes;
-
-    Promise.all(changes.map((change) => this.sendChange(change)));
-    this.onClose();
-  }
-
-  @action sendChange = (change) => {
-    const { api, initialWallet } = this;
-
-    WalletsUtils.getChangeMethod(api, initialWallet.address, change)
-      .then((changeMethod) => {
-        if (!changeMethod) {
-          return;
-        }
-
-        const { method, values } = changeMethod;
-
-        const options = {
-          from: this.wallet.sender,
-          to: initialWallet.address,
-          gas: MAX_GAS_ESTIMATION
-        };
-
-        return method
-          .estimateGas(options, values)
-          .then((gasEst) => {
-            let gas = gasEst;
-
-            if (gas.gt(DEFAULT_GAS)) {
-              gas = gas.mul(1.2);
-            }
-            options.gas = gas;
-
-            return method.postTransaction(options, values);
-          });
-      });
-  }
-
-  @action validateWallet = (_wallet) => {
-    const senderValidation = validateAddress(_wallet.sender);
-    const requireValidation = validateUint(_wallet.require);
-    const dailylimitValidation = validateUint(_wallet.dailylimit);
-
-    const errors = {
-      sender: senderValidation.addressError,
-      require: requireValidation.valueError,
-      dailylimit: dailylimitValidation.valueError
-    };
-
-    const wallet = {
-      ..._wallet,
-      sender: senderValidation.address,
-      require: requireValidation.value,
-      dailylimit: dailylimitValidation.value
-    };
-
-    transaction(() => {
-      this.wallet = wallet;
-      this.errors = errors;
-    });
-  }
-}
diff --git a/js/src/modals/index.js b/js/src/modals/index.js
deleted file mode 100644
index 7c313a2ef3b5c23c1c76fc5eb0b8b791f97ef4b6..0000000000000000000000000000000000000000
--- a/js/src/modals/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export AddAddress from './AddAddress';
-export AddContract from './AddContract';
-export CreateAccount from './CreateAccount';
-export CreateWallet from './CreateWallet';
-export DappPermissions from './DappPermissions';
-export DappsVisible from './AddDapps';
-export DeleteAccount from './DeleteAccount';
-export DeployContract from './DeployContract';
-export EditMeta from './EditMeta';
-export ExecuteContract from './ExecuteContract';
-export ExportAccount from './ExportAccount';
-export Faucet from './Faucet';
-export FirstRun from './FirstRun';
-export LoadContract from './LoadContract';
-export PasswordManager from './PasswordManager';
-export SaveContract from './SaveContract';
-export Shapeshift from './Shapeshift';
-export Transfer from './Transfer';
-export UpgradeParity from './UpgradeParity';
-export VaultAccounts from './VaultAccounts';
-export VaultCreate from './VaultCreate';
-export VaultLock from './VaultLock';
-export VaultMeta from './VaultMeta';
-export VaultSelector from './VaultSelector';
-export VaultUnlock from './VaultUnlock';
-export Verification from './Verification';
-export WalletSettings from './WalletSettings';
diff --git a/js/src/playground/index.js b/js/src/playground/index.js
deleted file mode 100644
index 04d43a76bc4695f8cf7ede38fc03589b0c989dc3..0000000000000000000000000000000000000000
--- a/js/src/playground/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './playground';
diff --git a/js/src/playground/playground.css b/js/src/playground/playground.css
deleted file mode 100644
index 92556ae94af51737c2cedc9f92efc75e037b65aa..0000000000000000000000000000000000000000
--- a/js/src/playground/playground.css
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$codeBackground: #002b36;
-$codeColor: #93a1a1;
-
-.container {
-  background-color: rgba(0, 0, 0, 0.5);
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  padding: 1em;
-  display: flex;
-  flex-direction: column;
-
-  .examples {
-    flex: 1;
-    overflow: auto;
-  }
-}
-
-.title {
-  font-size: 2.25em;
-  margin-bottom: 1em;
-
-  .select {
-    font-size: 0.85em;
-    font-family: monospace;
-    display: inline-block;
-    height: 1.5em;
-    border: 1px solid #aaa;
-    padding: 0 0.5em;
-    color: #555;
-    appearance: none;
-  }
-}
-
-.exampleContainer {
-  background-color: rgba(0, 0, 0, 0.5);
-  padding: 1em;
-  margin-bottom: 1em;
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-
-  p {
-    font-size: 1.25em;
-    margin-top: 0;
-  }
-}
-
-.example {
-  display: flex;
-  flex-direction: row;
-
-  .code {
-    flex: 1;
-    overflow: auto;
-    padding: 0.5em;
-    background-color: $codeBackground;
-    color: $codeColor;
-    font-size: 0.75em;
-
-    code {
-      white-space: pre;
-    }
-  }
-
-  .component {
-    flex: 3;
-    padding-left: 0.5em;
-    overflow: auto;
-  }
-}
diff --git a/js/src/playground/playground.js b/js/src/playground/playground.js
deleted file mode 100644
index 9aa32f5c05a84b51afe16a71d3eac8c433746277..0000000000000000000000000000000000000000
--- a/js/src/playground/playground.js
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-
-import AccountCard from '~/ui/AccountCard/accountCard.example';
-import CurrencySymbol from '~/ui/CurrencySymbol/currencySymbol.example';
-import QrCode from '~/ui/QrCode/qrCode.example';
-import SectionList from '~/ui/SectionList/sectionList.example';
-import Portal from '~/ui/Portal/portal.example';
-
-import PlaygroundStore from './store';
-import styles from './playground.css';
-
-PlaygroundStore.register(<AccountCard />);
-PlaygroundStore.register(<CurrencySymbol />);
-PlaygroundStore.register(<QrCode />);
-PlaygroundStore.register(<SectionList />);
-PlaygroundStore.register(<Portal />);
-
-@observer
-export default class Playground extends Component {
-  state = {
-    selectedIndex: 0
-  };
-
-  store = PlaygroundStore.get();
-
-  render () {
-    return (
-      <div className={ styles.container }>
-        <div className={ styles.title }>
-          <span>Playground > </span>
-          <select
-            className={ styles.select }
-            onChange={ this.handleChange }
-          >
-            { this.renderOptions() }
-          </select>
-        </div>
-
-        <div className={ styles.examples }>
-          { this.renderComponent() }
-        </div>
-      </div>
-    );
-  }
-
-  renderOptions () {
-    const { components } = this.store;
-
-    return components.map((element, index) => {
-      const name = element.type.displayName || element.type.name;
-
-      return (
-        <option
-          key={ `${name}_${index}` }
-          value={ index }
-        >
-          { name }
-        </option>
-      );
-    });
-  }
-
-  renderComponent () {
-    const { components } = this.store;
-    const { selectedIndex } = this.state;
-
-    return components[selectedIndex];
-  }
-
-  handleChange = (event) => {
-    const { value } = event.target;
-
-    this.setState({ selectedIndex: value });
-  }
-}
diff --git a/js/src/playground/playground.spec.js b/js/src/playground/playground.spec.js
deleted file mode 100644
index 6ea23af657716ee803e5d2e5d84a99382843c7b3..0000000000000000000000000000000000000000
--- a/js/src/playground/playground.spec.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import Playground from './playground';
-
-let component;
-let options;
-
-function render (props = {}) {
-  component = shallow(
-    <Playground />
-  );
-
-  options = component.find('option');
-
-  return component;
-}
-
-describe('playground', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('renders multiple options', () => {
-    expect(options.length).to.be.greaterThan(2);
-  });
-});
diff --git a/js/src/playground/playgroundExample.js b/js/src/playground/playgroundExample.js
deleted file mode 100644
index 9d16ef3ff2a5d9859d7daa0eb66f88d1125977c3..0000000000000000000000000000000000000000
--- a/js/src/playground/playgroundExample.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import reactElementToJSXString from 'react-element-to-jsx-string';
-
-import styles from './playground.css';
-
-export default class PlaygroundExample extends Component {
-  static propTypes = {
-    children: PropTypes.node,
-    name: PropTypes.string
-  };
-
-  render () {
-    const { children, name } = this.props;
-
-    return (
-      <div className={ styles.exampleContainer }>
-        { this.renderName(name) }
-        <div className={ styles.example }>
-          <div className={ styles.code }>
-            <code>{ reactElementToJSXString(children) }</code>
-          </div>
-          <div className={ styles.component }>
-            { children }
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderName (name) {
-    if (!name) {
-      return null;
-    }
-
-    return (
-      <p>{ name }</p>
-    );
-  }
-}
diff --git a/js/src/playground/store.js b/js/src/playground/store.js
deleted file mode 100644
index db0df38b4572443a6ee515c65d6b0d9877575601..0000000000000000000000000000000000000000
--- a/js/src/playground/store.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action } from 'mobx';
-
-let instance = null;
-
-export default class PlaygroundStore {
-  components = [];
-
-  static get () {
-    if (!instance) {
-      instance = new PlaygroundStore();
-    }
-
-    return instance;
-  }
-
-  static register (component) {
-    PlaygroundStore.get().add(component);
-  }
-
-  @action
-  add (component) {
-    this.components.push(component);
-  }
-}
diff --git a/js/src/playground/store.spec.js b/js/src/playground/store.spec.js
deleted file mode 100644
index 172d244fdad209727925e6d32ba9013ad5341fb6..0000000000000000000000000000000000000000
--- a/js/src/playground/store.spec.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-
-import QrCode from '~/ui/QrCode/qrCode.example';
-
-import PlaygroundStore from './store';
-
-describe('playground/store', () => {
-  let store = PlaygroundStore.get();
-
-  it('is available', () => {
-    expect(PlaygroundStore.get()).to.be.ok;
-  });
-
-  it('adds new Components', () => {
-    PlaygroundStore.register(<QrCode />);
-    expect(store.components.length).greaterThan(0);
-  });
-});
diff --git a/js/src/redux/actions.js b/js/src/redux/actions.js
deleted file mode 100644
index bf356535cb9de96792c02b62a82019141e6770fe..0000000000000000000000000000000000000000
--- a/js/src/redux/actions.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { newError } from '~/ui/Errors/actions';
-import { setAddressImage } from './providers/imagesActions';
-import { openSnackbar, showSnackbar } from './providers/snackbarActions';
-import { toggleStatusRefresh } from './providers/statusActions';
-import { toggleView } from '~/views/Settings/actions';
-
-export {
-  newError,
-  setAddressImage,
-  openSnackbar,
-  showSnackbar,
-  toggleStatusRefresh,
-  toggleView
-};
diff --git a/js/src/redux/index.js b/js/src/redux/index.js
deleted file mode 100644
index f0fbdff69101a9abd8bd23774f18e3044358ea93..0000000000000000000000000000000000000000
--- a/js/src/redux/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import * as actions from './actions';
-import initStore from './store';
-
-export {
-  actions,
-  initStore
-};
diff --git a/js/src/redux/middleware.js b/js/src/redux/middleware.js
deleted file mode 100644
index f83251f5162354dbdc5920e602a5fabd265320de..0000000000000000000000000000000000000000
--- a/js/src/redux/middleware.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-import thunk from 'redux-thunk';
-import { routerMiddleware } from 'react-router-redux';
-
-import ErrorsMiddleware from '~/ui/Errors/middleware';
-import SettingsMiddleware from '~/views/Settings/middleware';
-import SignerMiddleware from './providers/signerMiddleware';
-
-import CertificationsMiddleware from './providers/certifications/middleware';
-import ChainMiddleware from './providers/chainMiddleware';
-import RegistryMiddleware from './providers/registry/middleware';
-
-export default function (api, browserHistory, forEmbed = false) {
-  const errors = new ErrorsMiddleware();
-  const signer = new SignerMiddleware(api);
-  const settings = new SettingsMiddleware();
-  const chain = new ChainMiddleware();
-  const middleware = [
-    settings.toMiddleware(),
-    signer.toMiddleware(),
-    errors.toMiddleware(),
-    chain.toMiddleware()
-  ];
-
-  if (!forEmbed) {
-    const certifications = new CertificationsMiddleware().toMiddleware();
-    const registry = new RegistryMiddleware(api).toMiddleware();
-
-    middleware.push(certifications, registry);
-  }
-
-  const routeMiddleware = browserHistory ? routerMiddleware(browserHistory) : [];
-
-  return middleware.concat(routeMiddleware, thunk);
-}
diff --git a/js/src/redux/providers/apiActions.js b/js/src/redux/providers/apiActions.js
deleted file mode 100644
index 36563a2105dd443d560fee6536082a11ca0921d7..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/apiActions.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function setApi (api) {
-  return {
-    type: 'setApi',
-    api
-  };
-}
diff --git a/js/src/redux/providers/apiReducer.js b/js/src/redux/providers/apiReducer.js
deleted file mode 100644
index 853e909eee71329c79949732292343be63e7eff9..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/apiReducer.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-
-const initialState = {};
-
-export default handleActions({
-  setApi (state, action) {
-    const { api } = action;
-
-    return api;
-  }
-}, initialState);
diff --git a/js/src/redux/providers/balances.js b/js/src/redux/providers/balances.js
deleted file mode 100644
index a2f49cfa8c51e72dd557baf8ccdfc5677a178a7b..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/balances.js
+++ /dev/null
@@ -1,348 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { throttle } from 'lodash';
-
-import { fetchBalances, fetchTokensBalances, queryTokensFilter } from './balancesActions';
-import { loadTokens, fetchTokens } from './tokensActions';
-import { padRight } from '~/api/util/format';
-
-import Contracts from '~/contracts';
-
-let instance = null;
-
-export default class Balances {
-  constructor (store, api) {
-    this._api = api;
-    this._store = store;
-
-    this._tokenreg = null;
-    this._tokenregSID = null;
-    this._tokenMetaSID = null;
-
-    this._blockNumberSID = null;
-    this._accountsInfoSID = null;
-
-    // Throtthled load tokens (no more than once
-    // every minute)
-    this.loadTokens = throttle(
-      this._loadTokens,
-      60 * 1000,
-      { leading: true, trailing: true }
-    );
-
-    // Throttled `_fetchBalances` function
-    // that gets called max once every 40s
-    this.longThrottledFetch = throttle(
-      this._fetchBalances,
-      40 * 1000,
-      { leading: false, trailing: true }
-    );
-
-    this.shortThrottledFetch = throttle(
-      this._fetchBalances,
-      2 * 1000,
-      { leading: false, trailing: true }
-    );
-
-    // Fetch all tokens every 2 minutes
-    this.throttledTokensFetch = throttle(
-      this._fetchTokens,
-      2 * 60 * 1000,
-      { leading: false, trailing: true }
-    );
-
-    // Unsubscribe previous instance if it exists
-    if (instance) {
-      Balances.stop();
-    }
-  }
-
-  static get (store = {}) {
-    if (!instance && store) {
-      const { api } = store.getState();
-
-      return Balances.instantiate(store, api);
-    }
-
-    return instance;
-  }
-
-  static instantiate (store, api) {
-    if (!instance) {
-      instance = new Balances(store, api);
-    }
-
-    return instance;
-  }
-
-  static start () {
-    if (!instance) {
-      return Promise.reject('BalancesProvider has not been intiated yet');
-    }
-
-    const self = instance;
-
-    // Unsubscribe from previous subscriptions
-    return Balances
-      .stop()
-      .then(() => self.loadTokens())
-      .then(() => {
-        const promises = [
-          self.subscribeBlockNumber(),
-          self.subscribeAccountsInfo()
-        ];
-
-        return Promise.all(promises);
-      });
-  }
-
-  static stop () {
-    if (!instance) {
-      return Promise.resolve();
-    }
-
-    const self = instance;
-    const promises = [];
-
-    if (self._blockNumberSID) {
-      const p = self._api
-        .unsubscribe(self._blockNumberSID)
-        .then(() => {
-          self._blockNumberSID = null;
-        });
-
-      promises.push(p);
-    }
-
-    if (self._accountsInfoSID) {
-      const p = self._api
-        .unsubscribe(self._accountsInfoSID)
-        .then(() => {
-          self._accountsInfoSID = null;
-        });
-
-      promises.push(p);
-    }
-
-    // Unsubscribe without adding the promises
-    // to the result, since it would have to wait for a
-    // reconnection to resolve if the Node is disconnected
-    if (self._tokenreg) {
-      if (self._tokenregSID) {
-        const tokenregSID = self._tokenregSID;
-
-        self._tokenreg
-          .unsubscribe(tokenregSID)
-          .then(() => {
-            if (self._tokenregSID === tokenregSID) {
-              self._tokenregSID = null;
-            }
-          });
-      }
-
-      if (self._tokenMetaSID) {
-        const tokenMetaSID = self._tokenMetaSID;
-
-        self._tokenreg
-          .unsubscribe(tokenMetaSID)
-          .then(() => {
-            if (self._tokenMetaSID === tokenMetaSID) {
-              self._tokenMetaSID = null;
-            }
-          });
-      }
-    }
-
-    return Promise.all(promises);
-  }
-
-  subscribeAccountsInfo () {
-    return this._api
-      .subscribe('parity_allAccountsInfo', (error, accountsInfo) => {
-        if (error) {
-          return;
-        }
-
-        this.fetchAllBalances();
-      })
-      .then((accountsInfoSID) => {
-        this._accountsInfoSID = accountsInfoSID;
-      })
-      .catch((error) => {
-        console.warn('_subscribeAccountsInfo', error);
-      });
-  }
-
-  subscribeBlockNumber () {
-    return this._api
-      .subscribe('eth_blockNumber', (error) => {
-        if (error) {
-          return console.warn('_subscribeBlockNumber', error);
-        }
-
-        this._store.dispatch(queryTokensFilter());
-        return this.fetchAllBalances();
-      })
-      .then((blockNumberSID) => {
-        this._blockNumberSID = blockNumberSID;
-      })
-      .catch((error) => {
-        console.warn('_subscribeBlockNumber', error);
-      });
-  }
-
-  fetchAllBalances (options = {}) {
-    // If it's a network change, reload the tokens
-    // ( and then fetch the tokens balances ) and fetch
-    // the accounts balances
-    if (options.changedNetwork) {
-      this.loadTokens({ skipNotifications: true });
-      this.loadTokens.flush();
-
-      this.fetchBalances({
-        force: true,
-        skipNotifications: true
-      });
-
-      return;
-    }
-
-    this.fetchTokensBalances(options);
-    this.fetchBalances(options);
-  }
-
-  fetchTokensBalances (options) {
-    const { skipNotifications = false, force = false } = options;
-
-    this.throttledTokensFetch(skipNotifications);
-
-    if (force) {
-      this.throttledTokensFetch.flush();
-    }
-  }
-
-  fetchBalances (options) {
-    const { skipNotifications = false, force = false } = options;
-    const { syncing } = this._store.getState().nodeStatus;
-
-    // If syncing, only retrieve balances once every
-    // few seconds
-    if (syncing || syncing === null) {
-      this.shortThrottledFetch.cancel();
-      this.longThrottledFetch(skipNotifications);
-
-      if (force) {
-        this.longThrottledFetch.flush();
-      }
-
-      return;
-    }
-
-    this.longThrottledFetch.cancel();
-    this.shortThrottledFetch(skipNotifications);
-
-    if (force) {
-      this.shortThrottledFetch.flush();
-    }
-  }
-
-  _fetchBalances (skipNotifications = false) {
-    this._store.dispatch(fetchBalances(null, skipNotifications));
-  }
-
-  _fetchTokens (skipNotifications = false) {
-    this._store.dispatch(fetchTokensBalances(null, null, skipNotifications));
-  }
-
-  getTokenRegistry () {
-    return Contracts.get().tokenReg.getContract();
-  }
-
-  _loadTokens (options = {}) {
-    return this
-      .getTokenRegistry()
-      .then((tokenreg) => {
-        this._tokenreg = tokenreg;
-
-        this._store.dispatch(loadTokens(options));
-
-        return this.attachToTokens(tokenreg);
-      })
-      .catch((error) => {
-        console.warn('balances::loadTokens', error);
-      });
-  }
-
-  attachToTokens (tokenreg) {
-    return Promise
-      .all([
-        this.attachToTokenMetaChange(tokenreg),
-        this.attachToNewToken(tokenreg)
-      ]);
-  }
-
-  attachToNewToken (tokenreg) {
-    if (this._tokenregSID) {
-      return Promise.resolve();
-    }
-
-    return tokenreg.instance.Registered
-      .subscribe({
-        fromBlock: 0,
-        toBlock: 'latest',
-        skipInitFetch: true
-      }, (error, logs) => {
-        if (error) {
-          return console.error('balances::attachToNewToken', 'failed to attach to tokenreg Registered', error.toString(), error.stack);
-        }
-
-        this.handleTokensLogs(logs);
-      })
-      .then((tokenregSID) => {
-        this._tokenregSID = tokenregSID;
-      });
-  }
-
-  attachToTokenMetaChange (tokenreg) {
-    if (this._tokenMetaSID) {
-      return Promise.resolve();
-    }
-
-    return tokenreg.instance.MetaChanged
-      .subscribe({
-        fromBlock: 0,
-        toBlock: 'latest',
-        topics: [ null, padRight(this._api.util.asciiToHex('IMG'), 32) ],
-        skipInitFetch: true
-      }, (error, logs) => {
-        if (error) {
-          return console.error('balances::attachToTokenMetaChange', 'failed to attach to tokenreg MetaChanged', error.toString(), error.stack);
-        }
-
-        this.handleTokensLogs(logs);
-      })
-      .then((tokenMetaSID) => {
-        this._tokenMetaSID = tokenMetaSID;
-      });
-  }
-
-  handleTokensLogs (logs) {
-    const tokenIds = logs.map((log) => log.params.id.value.toNumber());
-
-    this._store.dispatch(fetchTokens(tokenIds));
-  }
-}
diff --git a/js/src/redux/providers/balancesActions.js b/js/src/redux/providers/balancesActions.js
deleted file mode 100644
index edfa7d2d308040326d6fba257ec262f9c1690a2b..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/balancesActions.js
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { uniq, isEqual } from 'lodash';
-import { push } from 'react-router-redux';
-
-import { notifyTransaction } from '~/util/notifications';
-import { ETH_TOKEN, fetchAccountsBalances } from '~/util/tokens';
-import { LOG_KEYS, getLogger } from '~/config';
-import { sha3 } from '~/api/util/sha3';
-
-const TRANSFER_SIGNATURE = sha3('Transfer(address,address,uint256)');
-
-const log = getLogger(LOG_KEYS.Balances);
-
-let tokensFilter = {};
-
-function _setBalances (balances) {
-  return {
-    type: 'setBalances',
-    balances
-  };
-}
-
-/**
- * @param {Object}  _balances         - In the shape:
- *   {
- *     [ who ]: { [ tokenId ]: BigNumber } // The balances of `who`
- *   }
- * @param {Boolean} skipNotifications [description]
- */
-function setBalances (updates, skipNotifications = false) {
-  return (dispatch, getState) => {
-    const { tokens, balances } = getState();
-
-    const prevBalances = balances;
-    const nextBalances = { ...prevBalances };
-
-    Object.keys(updates)
-      .forEach((who) => {
-        const accountUpdates = updates[who];
-
-        Object.keys(accountUpdates)
-          .forEach((tokenId) => {
-            const token = tokens[tokenId];
-            const prevTokenValue = (prevBalances[who] || {})[tokenId];
-            const nextTokenValue = accountUpdates[tokenId];
-
-            if (prevTokenValue && prevTokenValue.lt(nextTokenValue)) {
-              dispatch(notifyBalanceChange(who, prevTokenValue, nextTokenValue, token));
-            }
-
-            // Add the token if it's native ETH or if it has a value
-            if (token.native || nextTokenValue.gt(0)) {
-              nextBalances[who] = {
-                ...(nextBalances[who] || {}),
-                [tokenId]: nextTokenValue
-              };
-            }
-          });
-      });
-
-    return dispatch(_setBalances(nextBalances));
-  };
-}
-
-function notifyBalanceChange (who, fromValue, toValue, token) {
-  return (dispatch, getState) => {
-    const account = getState().personal.accounts[who];
-
-    if (account) {
-      const txValue = toValue.minus(fromValue);
-
-      const redirectToAccount = () => {
-        const basePath = account.wallet
-          ? 'wallet'
-          : 'accounts';
-
-        const route = `/${basePath}/${account.address}`;
-
-        dispatch(push(route));
-      };
-
-      notifyTransaction(account, token, txValue, redirectToAccount);
-    }
-  };
-}
-
-// TODO: fetch txCount when needed
-export function fetchBalances (_addresses, skipNotifications = false) {
-  return fetchTokensBalances(_addresses, [ ETH_TOKEN ], skipNotifications);
-}
-
-export function updateTokensFilter (_addresses, _tokens, options = {}) {
-  return (dispatch, getState) => {
-    const { api, personal, tokens } = getState();
-    const { visibleAccounts, accounts } = personal;
-
-    const addressesToFetch = uniq(visibleAccounts.concat(Object.keys(accounts)));
-    const addresses = uniq(_addresses || addressesToFetch || []).sort();
-
-    const tokensToUpdate = _tokens || Object.values(tokens);
-    const tokenAddresses = tokensToUpdate
-      .map((t) => t.address)
-      .filter((address) => address)
-      .sort();
-
-    if (tokensFilter.filterFromId || tokensFilter.filterToId) {
-      // Has the tokens addresses changed (eg. a network change)
-      const sameTokens = isEqual(tokenAddresses, tokensFilter.tokenAddresses);
-
-      // Addresses that are not in the current filter (omit those
-      // that the filter includes)
-      const newAddresses = addresses.filter((address) => !tokensFilter.addresses.includes(address));
-
-      // If no new addresses and the same tokens, don't change the filter
-      if (sameTokens && newAddresses.length === 0) {
-        log.debug('no need to update token filter', addresses, tokenAddresses, tokensFilter);
-        return queryTokensFilter(tokensFilter)(dispatch, getState);
-      }
-    }
-
-    log.debug('updating the token filter', addresses, tokenAddresses);
-    const promises = [];
-
-    if (tokensFilter.filterFromId) {
-      promises.push(api.eth.uninstallFilter(tokensFilter.filterFromId));
-    }
-
-    if (tokensFilter.filterToId) {
-      promises.push(api.eth.uninstallFilter(tokensFilter.filterToId));
-    }
-
-    Promise
-      .all([
-        api.eth.blockNumber()
-      ].concat(promises))
-      .then(([ block ]) => {
-        const topicsFrom = [ TRANSFER_SIGNATURE, addresses, null ];
-        const topicsTo = [ TRANSFER_SIGNATURE, null, addresses ];
-
-        const filterOptions = {
-          fromBlock: block,
-          toBlock: 'pending',
-          address: tokenAddresses
-        };
-
-        const optionsFrom = {
-          ...filterOptions,
-          topics: topicsFrom
-        };
-
-        const optionsTo = {
-          ...filterOptions,
-          topics: topicsTo
-        };
-
-        const newFilters = Promise.all([
-          api.eth.newFilter(optionsFrom),
-          api.eth.newFilter(optionsTo)
-        ]);
-
-        return newFilters;
-      })
-      .then(([ filterFromId, filterToId ]) => {
-        const nextTokensFilter = {
-          filterFromId, filterToId,
-          addresses, tokenAddresses
-        };
-
-        const { skipNotifications } = options;
-
-        tokensFilter = nextTokensFilter;
-        fetchTokensBalances(addresses, tokensToUpdate, skipNotifications)(dispatch, getState);
-      })
-      .catch((error) => {
-        console.warn('balances::updateTokensFilter', error);
-      });
-  };
-}
-
-export function queryTokensFilter () {
-  return (dispatch, getState) => {
-    const { api, personal, tokens } = getState();
-    const { visibleAccounts, accounts } = personal;
-
-    const allAddresses = visibleAccounts.concat(Object.keys(accounts));
-    const addressesToFetch = uniq(allAddresses);
-    const lcAddresses = addressesToFetch.map((a) => a.toLowerCase());
-
-    Promise
-      .all([
-        api.eth.getFilterChanges(tokensFilter.filterFromId),
-        api.eth.getFilterChanges(tokensFilter.filterToId)
-      ])
-      .then(([ logsFrom, logsTo ]) => {
-        const addresses = [];
-        const tokenAddresses = [];
-        const logs = logsFrom.concat(logsTo);
-
-        if (logs.length > 0) {
-          log.debug('got tokens filter logs', logs);
-        }
-
-        logs
-          .forEach((log) => {
-            const tokenAddress = log.address;
-
-            const fromAddress = '0x' + log.topics[1].slice(-40);
-            const toAddress = '0x' + log.topics[2].slice(-40);
-
-            const fromAddressIndex = lcAddresses.indexOf(fromAddress);
-            const toAddressIndex = lcAddresses.indexOf(toAddress);
-
-            if (fromAddressIndex > -1) {
-              addresses.push(addressesToFetch[fromAddressIndex]);
-            }
-
-            if (toAddressIndex > -1) {
-              addresses.push(addressesToFetch[toAddressIndex]);
-            }
-
-            tokenAddresses.push(tokenAddress);
-          });
-
-        if (addresses.length === 0) {
-          return;
-        }
-
-        const tokensToUpdate = Object.values(tokens)
-          .filter((t) => tokenAddresses.includes(t.address));
-
-        fetchTokensBalances(uniq(addresses), tokensToUpdate)(dispatch, getState);
-      });
-  };
-}
-
-export function fetchTokensBalances (_addresses = null, _tokens = null, skipNotifications = false) {
-  return (dispatch, getState) => {
-    const { api, personal, tokens } = getState();
-    const { visibleAccounts, accounts } = personal;
-    const allTokens = Object.values(tokens);
-
-    const addressesToFetch = uniq(visibleAccounts.concat(Object.keys(accounts)));
-    const addresses = _addresses || addressesToFetch;
-    const tokensToUpdate = _tokens || allTokens;
-
-    if (addresses.length === 0) {
-      return Promise.resolve();
-    }
-
-    const updates = addresses.reduce((updates, who) => {
-      updates[who] = tokensToUpdate.map((token) => token.id);
-      return updates;
-    }, {});
-
-    return fetchAccountsBalances(api, allTokens, updates)
-      .then((balances) => {
-        dispatch(setBalances(balances, skipNotifications));
-      })
-      .catch((error) => {
-        console.warn('balances::fetchTokensBalances', error);
-      });
-  };
-}
diff --git a/js/src/redux/providers/balancesReducer.js b/js/src/redux/providers/balancesReducer.js
deleted file mode 100644
index 1b6f3439152f8ceb0fec7f9fdeab3240dc50d7eb..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/balancesReducer.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-
-const initialState = {};
-
-export default handleActions({
-  setBalances (state, action) {
-    const { balances } = action;
-
-    return Object.assign({}, state, balances);
-  }
-}, initialState);
diff --git a/js/src/redux/providers/certifications/actions.js b/js/src/redux/providers/certifications/actions.js
deleted file mode 100644
index 8dede1c53c630948bfa6f98892519eff5b8ffddb..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/certifications/actions.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export const fetchCertifiers = () => ({
-  type: 'fetchCertifiers'
-});
-
-export const fetchCertifications = (address) => ({
-  type: 'fetchCertifications', address
-});
-
-export const addCertification = (address, id, name, title, icon) => ({
-  type: 'addCertification', address, id, name, title, icon
-});
-
-export const removeCertification = (address, id) => ({
-  type: 'removeCertification', address, id
-});
diff --git a/js/src/redux/providers/certifications/middleware.js b/js/src/redux/providers/certifications/middleware.js
deleted file mode 100644
index b70ff4909b676eb6cb62e50ca9e0f3854e555586..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/certifications/middleware.js
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { uniq, range, debounce } from 'lodash';
-
-import { addCertification, removeCertification } from './actions';
-
-import { getLogger, LOG_KEYS } from '~/config';
-import Contract from '~/api/contract';
-import Contracts from '~/contracts';
-import CertifierABI from '~/contracts/abi/certifier.json';
-
-const log = getLogger(LOG_KEYS.CertificationsMiddleware);
-
-// TODO: move this to a more general place
-const updatableFilter = (api, onFilter) => {
-  let filter = null;
-
-  const update = (address, topics) => {
-    if (filter) {
-      filter = filter.then((filterId) => {
-        api.eth.uninstallFilter(filterId);
-      });
-    }
-
-    filter = (filter || Promise.resolve())
-      .then(() => api.eth.newFilter({
-        fromBlock: 0,
-        toBlock: 'latest',
-        address,
-        topics
-      }))
-      .then((filterId) => {
-        onFilter(filterId);
-        return filterId;
-      })
-      .catch((err) => {
-        console.error('Failed to create certifications filter:', err);
-      });
-
-    return filter;
-  };
-
-  return update;
-};
-
-export default class CertificationsMiddleware {
-  toMiddleware () {
-    const api = Contracts.get()._api;
-    const badgeReg = Contracts.get().badgeReg;
-
-    const contract = new Contract(api, CertifierABI);
-    const Confirmed = contract.events.find((e) => e.name === 'Confirmed');
-    const Revoked = contract.events.find((e) => e.name === 'Revoked');
-
-    return (store) => {
-      let certifiers = [];
-      let addresses = [];
-      let filterChanged = false;
-      let filter = null;
-      let badgeRegFilter = null;
-      let fetchCertifiersPromise = null;
-
-      const updateFilter = updatableFilter(api, (filterId) => {
-        filterChanged = true;
-        filter = filterId;
-      });
-
-      const badgeRegUpdateFilter = updatableFilter(api, (filterId) => {
-        filterChanged = true;
-        badgeRegFilter = filterId;
-      });
-
-      badgeReg
-        .getContract()
-        .then((badgeRegContract) => {
-          return badgeRegUpdateFilter(badgeRegContract.address, [ [
-            badgeRegContract.instance.Registered.signature,
-            badgeRegContract.instance.Unregistered.signature,
-            badgeRegContract.instance.MetaChanged.signature,
-            badgeRegContract.instance.AddressChanged.signature
-          ] ]);
-        })
-        .then(() => {
-          shortFetchChanges();
-
-          api.subscribe('eth_blockNumber', (err) => {
-            if (err) {
-              return;
-            }
-
-            fetchChanges();
-          });
-        });
-
-      function onLogs (logs) {
-        logs = contract.parseEventLogs(logs);
-        logs.forEach((log) => {
-          const certifier = certifiers.find((c) => c.address === log.address);
-
-          if (!certifier) {
-            throw new Error(`Could not find certifier at ${log.address}.`);
-          }
-          const { id, name, title, icon } = certifier;
-
-          if (log.event === 'Revoked') {
-            store.dispatch(removeCertification(log.params.who.value, id));
-          } else {
-            store.dispatch(addCertification(log.params.who.value, id, name, title, icon));
-          }
-        });
-      }
-
-      function onBadgeRegLogs (logs) {
-        return badgeReg.getContract()
-          .then((badgeRegContract) => {
-            logs = badgeRegContract.parseEventLogs(logs);
-
-            const ids = logs.map((log) => log.params && log.params.id.value.toNumber());
-
-            return fetchCertifiers(uniq(ids));
-          });
-      }
-
-      function _fetchChanges () {
-        const method = filterChanged
-          ? 'getFilterLogs'
-          : 'getFilterChanges';
-
-        filterChanged = false;
-
-        api.eth[method](badgeRegFilter)
-          .then(onBadgeRegLogs)
-          .catch((err) => {
-            console.error('Failed to fetch badge reg events:', err);
-          })
-          .then(() => api.eth[method](filter))
-          .then(onLogs)
-          .catch((err) => {
-            console.error('Failed to fetch new certifier events:', err);
-          });
-      }
-
-      const shortFetchChanges = debounce(_fetchChanges, 0.5 * 1000, { leading: true });
-      const fetchChanges = debounce(shortFetchChanges, 10 * 1000, { leading: true });
-
-      function fetchConfirmedEvents () {
-        return updateFilter(certifiers.map((c) => c.address), [
-          [ Confirmed.signature, Revoked.signature ],
-          addresses
-        ]).then(() => shortFetchChanges());
-      }
-
-      function fetchCertifiers (ids = []) {
-        if (fetchCertifiersPromise) {
-          return fetchCertifiersPromise;
-        }
-
-        let fetchEvents = false;
-
-        const idsPromise = (certifiers.length === 0)
-          ? badgeReg.certifierCount().then((count) => {
-            return range(count);
-          })
-          : Promise.resolve(ids);
-
-        fetchCertifiersPromise = idsPromise
-          .then((ids) => {
-            const promises = ids.map((id) => {
-              return badgeReg.fetchCertifier(id)
-                .then((cert) => {
-                  if (!certifiers.some((c) => c.id === cert.id)) {
-                    certifiers = certifiers.concat(cert);
-                    fetchEvents = true;
-                  }
-                })
-                .catch((err) => {
-                  if (/does not exist/.test(err.toString())) {
-                    return log.info(err.toString());
-                  }
-
-                  log.warn(`Could not fetch certifier ${id}:`, err);
-                });
-            });
-
-            return Promise
-              .all(promises)
-              .then(() => {
-                fetchCertifiersPromise = null;
-
-                if (fetchEvents) {
-                  return fetchConfirmedEvents();
-                }
-              });
-          });
-
-        return fetchCertifiersPromise;
-      }
-
-      return (next) => (action) => {
-        switch (action.type) {
-          case 'fetchCertifiers':
-            fetchConfirmedEvents();
-
-            break;
-          case 'fetchCertifications':
-            const { address } = action;
-
-            if (!addresses.includes(address)) {
-              addresses = addresses.concat(address);
-              fetchConfirmedEvents();
-            }
-
-            break;
-          case 'setVisibleAccounts':
-            const _addresses = action.addresses || [];
-
-            addresses = uniq(addresses.concat(_addresses));
-            fetchConfirmedEvents();
-            next(action);
-
-            break;
-          default:
-            next(action);
-        }
-      };
-    };
-  }
-}
diff --git a/js/src/redux/providers/certifications/reducer.js b/js/src/redux/providers/certifications/reducer.js
deleted file mode 100644
index 0f94239c6b89a0abe738a6b00d6949d324a4e804..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/certifications/reducer.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const initialState = {};
-
-export default (state = initialState, action) => {
-  if (action.type === 'addCertification') {
-    const { address, id, name, icon, title } = action;
-    const certifications = state[address] || [];
-
-    if (certifications.some((c) => c.id === id)) {
-      return state;
-    }
-
-    const newCertifications = certifications.concat({
-      id, name, icon, title
-    });
-
-    return { ...state, [address]: newCertifications };
-  }
-
-  if (action.type === 'removeCertification') {
-    const { address, id } = action;
-    const certifications = state[address] || [];
-
-    const newCertifications = certifications.filter((c) => c.id !== id);
-
-    return { ...state, [address]: newCertifications };
-  }
-
-  return state;
-};
diff --git a/js/src/redux/providers/chainMiddleware.js b/js/src/redux/providers/chainMiddleware.js
deleted file mode 100644
index 398e604be6498f3478d2e0a3a40414655e100783..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/chainMiddleware.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { DEFAULT_NETCHAIN } from './statusReducer';
-
-export default class ChainMiddleware {
-  toMiddleware () {
-    return (store) => (next) => (action) => {
-      if (action.type === 'statusCollection') {
-        const { collection } = action;
-
-        if (collection) {
-          const { nodeStatus } = store.getState();
-          const { netChain, nodeKind } = nodeStatus;
-          const newChain = collection.netChain;
-          const newNodeKind = collection.nodeKind;
-          let reloadChain = false;
-          let reloadType = false;
-
-          // force reload when chain has changed and is not initial value
-          if (newChain) {
-            const hasChainChanged = newChain !== netChain;
-            const isInitialChain = netChain === DEFAULT_NETCHAIN;
-
-            reloadChain = !isInitialChain && hasChainChanged;
-          }
-
-          // force reload when nodeKind (availability or capability) has changed
-          if (newNodeKind && nodeKind) {
-            const hasAvailabilityChanged = nodeKind.availability !== newNodeKind.availability;
-            const hasCapabilityChanged = nodeKind.capability !== newNodeKind.capability;
-
-            reloadType = hasAvailabilityChanged || hasCapabilityChanged;
-          }
-
-          if (reloadChain || reloadType) {
-            setTimeout(() => {
-              window.location.reload();
-            }, 0);
-          }
-        }
-      }
-
-      next(action);
-    };
-  }
-}
diff --git a/js/src/redux/providers/chainMiddleware.spec.js b/js/src/redux/providers/chainMiddleware.spec.js
deleted file mode 100644
index 837031c29f9c4bf286c3354e688e5371aa85b382..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/chainMiddleware.spec.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Contracts from '~/contracts';
-import { initialState as defaultNodeStatusState } from './statusReducer';
-import ChainMiddleware from './chainMiddleware';
-import { createWsApi } from '~/../test/e2e/ethapi';
-
-let middleware;
-let next;
-let store;
-let clock;
-
-const api = createWsApi();
-
-Contracts.create(api);
-
-function stubGlobals () {
-  clock = sinon.useFakeTimers();
-  sinon.spy(window.location, 'reload');
-}
-
-function restoreGlobals () {
-  window.location.reload.restore();
-  clock.restore();
-}
-
-function createMiddleware (collection = {}) {
-  middleware = new ChainMiddleware().toMiddleware();
-  next = sinon.stub();
-  store = {
-    dispatch: sinon.stub(),
-    getState: () => {
-      return {
-        api: api,
-        nodeStatus: Object.assign({}, defaultNodeStatusState, collection)
-      };
-    }
-  };
-
-  return middleware;
-}
-
-function callMiddleware (action) {
-  const result = middleware(store)(next)(action);
-
-  clock.tick(100);
-
-  return result;
-}
-
-describe('reduxs/providers/ChainMiddleware', () => {
-  beforeEach(() => {
-    stubGlobals();
-  });
-
-  afterEach(() => {
-    restoreGlobals();
-  });
-
-  describe('next action', () => {
-    beforeEach(() => {
-      createMiddleware();
-    });
-
-    it('calls next with matching actiontypes', () => {
-      callMiddleware({ type: 'statusCollection' });
-
-      expect(next).to.have.been.calledWithMatch({ type: 'statusCollection' });
-    });
-
-    it('calls next with non-matching actiontypes', () => {
-      callMiddleware({ type: 'nonMatchingType' });
-
-      expect(next).to.have.been.calledWithMatch({ type: 'nonMatchingType' });
-    });
-  });
-
-  describe('chain switching', () => {
-    it('does not reload when moving from the initial/unknown chain', () => {
-      createMiddleware();
-      callMiddleware({ type: 'statusCollection', collection: { netChain: 'homestead' } });
-
-      expect(window.location.reload).not.to.have.been.called;
-    });
-
-    it('does not reload when moving to the same chain', () => {
-      createMiddleware({ netChain: 'homestead' });
-      callMiddleware({ type: 'statusCollection', collection: { netChain: 'homestead' } });
-
-      expect(window.location.reload).not.to.have.been.called;
-    });
-
-    it('does reload when moving between chains', () => {
-      createMiddleware({ netChain: 'homestead' });
-      callMiddleware({ type: 'statusCollection', collection: { netChain: 'ropsten' } });
-
-      expect(window.location.reload).to.have.been.called;
-    });
-  });
-});
diff --git a/js/src/redux/providers/imagesActions.js b/js/src/redux/providers/imagesActions.js
deleted file mode 100644
index a620a31badc59435d550f101155dba19e216d1d7..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/imagesActions.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function setAddressImage (address, hashArray, converted = false) {
-  return {
-    type: 'setAddressImage',
-    address,
-    hashArray,
-    converted
-  };
-}
diff --git a/js/src/redux/providers/imagesReducer.js b/js/src/redux/providers/imagesReducer.js
deleted file mode 100644
index a96600e700a2355e34ec9882c84133a336ce5bad..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/imagesReducer.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-import { bytesToHex } from '~/api/util/format';
-
-const ZERO = '0x0000000000000000000000000000000000000000000000000000000000000000';
-
-const initialState = {
-  images: {}
-};
-
-export function hashToImageUrl (hashArray) {
-  const hash = hashArray ? bytesToHex(hashArray) : ZERO;
-
-  return hash === ZERO ? null : `/api/content/${hash.substr(2)}`;
-}
-
-export default handleActions({
-  setAddressImage (state, action) {
-    const { address, hashArray, converted } = action;
-
-    const image = converted ? hashArray : hashToImageUrl(hashArray);
-
-    return Object.assign({}, state, {
-      [address]: image
-    });
-  }
-}, initialState);
diff --git a/js/src/redux/providers/index.js b/js/src/redux/providers/index.js
deleted file mode 100644
index 967820cc7acc13b1a668199b6af41461276d3c52..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/index.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export Balances from './balances';
-export Personal from './personal';
-export Signer from './signer';
-export Status from './status';
-
-export apiReducer from './apiReducer';
-export balancesReducer from './balancesReducer';
-export workerReducer from './workerReducer';
-export imagesReducer from './imagesReducer';
-export personalReducer from './personalReducer';
-export requestsReducer from './requestsReducer';
-export signerReducer from './signerReducer';
-export snackbarReducer from './snackbarReducer';
-export statusReducer from './statusReducer';
-export tokensReducer from './tokensReducer';
-export walletReducer from './walletReducer';
diff --git a/js/src/redux/providers/personal.js b/js/src/redux/providers/personal.js
deleted file mode 100644
index 4c9d3e23ad0459424ffbf75946385aaeafd1102a..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/personal.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { personalAccountsInfo } from './personalActions';
-
-export default class Personal {
-  constructor (store, api) {
-    this._api = api;
-    this._store = store;
-  }
-
-  start () {
-    this._removeDeleted();
-    this._subscribeAccountsInfo();
-  }
-
-  _subscribeAccountsInfo () {
-    this._api
-      .subscribe('parity_allAccountsInfo', (error, accountsInfo) => {
-        if (error) {
-          console.error('parity_allAccountsInfo', error);
-          return;
-        }
-
-        // Add the address to each accounts
-        Object.keys(accountsInfo)
-          .forEach((address) => {
-            accountsInfo[address].address = address;
-          });
-
-        this._store.dispatch(personalAccountsInfo(accountsInfo));
-      });
-  }
-
-  _removeDeleted () {
-    this._api.parity
-      .allAccountsInfo()
-      .then((accountsInfo) => {
-        return Promise.all(
-          Object
-            .keys(accountsInfo)
-            .filter((address) => {
-              const account = accountsInfo[address];
-
-              return !account.uuid && account.meta && account.meta.deleted;
-            })
-            .map((address) => this._api.parity.removeAddress(address))
-        );
-      })
-      .then((results) => {
-        if (results.length) {
-          console.log(`Removed ${results.length} previously marked addresses`);
-        }
-      })
-      .catch((error) => {
-        console.warn('removeDeleted', error);
-      });
-  }
-}
diff --git a/js/src/redux/providers/personalActions.js b/js/src/redux/providers/personalActions.js
deleted file mode 100644
index f747fa92e6ed1fcbf12cfb6adb54d019613c3b59..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/personalActions.js
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isEqual, intersection } from 'lodash';
-
-import BalancesProvider from './balances';
-import { updateTokensFilter } from './balancesActions';
-import { attachWallets } from './walletActions';
-
-import Contract from '~/api/contract';
-import MethodDecodingStore from '~/ui/MethodDecoding/methodDecodingStore';
-import WalletsUtils from '~/util/wallets';
-import { foundationWallet as WalletAbi } from '~/contracts/abi';
-
-export function personalAccountsInfo (accountsInfo) {
-  const accounts = {};
-  const contacts = {};
-  const contracts = {};
-  const hardware = {};
-  const wallets = {};
-
-  Object.keys(accountsInfo || {})
-    .map((address) => Object.assign({}, accountsInfo[address], { address }))
-    .filter((account) => account.meta && (account.uuid || !account.meta.deleted))
-    .forEach((account) => {
-      if (account.uuid) {
-        accounts[account.address] = account;
-      } else if (account.meta.wallet) {
-        account.wallet = true;
-        wallets[account.address] = account;
-      } else if (account.meta.contract) {
-        account.contract = true;
-        contracts[account.address] = account;
-      } else if (account.meta.hardware) {
-        account.hardware = true;
-        hardware[account.address] = account;
-        accounts[account.address] = account;
-      } else if (account.meta.external) {
-        account.external = true;
-        accounts[account.address] = account;
-      } else {
-        contacts[account.address] = account;
-      }
-    });
-
-  // Load user contracts for Method Decoding
-  MethodDecodingStore.loadContracts(contracts);
-
-  return (dispatch, getState) => {
-    const { api } = getState();
-
-    const _fetchOwners = Object
-      .values(wallets)
-      .map((wallet) => {
-        const walletContract = new Contract(api, WalletAbi);
-
-        return WalletsUtils.fetchOwners(walletContract.at(wallet.address));
-      });
-
-    Promise
-      .all(_fetchOwners)
-      .then((walletsOwners) => {
-        return Object
-          .values(wallets)
-          .map((wallet, index) => {
-            wallet.owners = walletsOwners[index].map((owner) => ({
-              address: owner,
-              name: accountsInfo[owner] && accountsInfo[owner].name || owner
-            }));
-
-            return wallet;
-          });
-      })
-      .catch(() => {
-        return [];
-      })
-      .then((_wallets) => {
-        // We want to separate owned wallets and other wallets
-        // However, wallets can be owned by wallets, that can
-        // be owned by an account...
-        let otherWallets = [].concat(_wallets);
-        let prevLength;
-        let nextLength;
-
-        // If no more other wallets, or if the size decreased, continue...
-        do {
-          prevLength = otherWallets.length;
-
-          otherWallets = otherWallets
-            .map((wallet) => {
-              const addresses = Object.keys(accounts);
-              const owners = wallet.owners.map((o) => o.address);
-
-              // Owners ∩ Addresses not null : Wallet is owned
-              // by one of the accounts
-              if (intersection(owners, addresses).length > 0) {
-                accounts[wallet.address] = wallet;
-                return false;
-              }
-
-              return wallet;
-            })
-            .filter((wallet) => wallet);
-
-          nextLength = otherWallets.length;
-        } while (nextLength < prevLength);
-
-        // And other wallets to contacts...
-        otherWallets.forEach((wallet) => {
-          contacts[wallet.address] = wallet;
-        });
-
-        // Cache the _real_ accounts for
-        // WalletsUtils (used for sending transactions)
-        WalletsUtils.cacheAccounts(accounts);
-
-        dispatch(_personalAccountsInfo({
-          accountsInfo,
-          accounts,
-          contacts,
-          contracts,
-          hardware
-        }));
-        dispatch(attachWallets(wallets));
-
-        BalancesProvider.get().fetchAllBalances({
-          force: true
-        });
-      })
-      .catch((error) => {
-        console.warn('personalAccountsInfo', error);
-        throw error;
-      });
-  };
-}
-
-function _personalAccountsInfo (data) {
-  return {
-    type: 'personalAccountsInfo',
-    ...data
-  };
-}
-
-export function _setVisibleAccounts (addresses) {
-  return {
-    type: 'setVisibleAccounts',
-    addresses
-  };
-}
-
-export function setVisibleAccounts (addresses) {
-  return (dispatch, getState) => {
-    const { visibleAccounts } = getState().personal;
-
-    if (isEqual(addresses.sort(), visibleAccounts.sort())) {
-      return;
-    }
-
-    dispatch(_setVisibleAccounts(addresses));
-
-    // Don't update the balances if no new addresses displayed
-    if (addresses.length === 0) {
-      return;
-    }
-
-    // Update the Tokens filter to take into account the new
-    // addresses
-    dispatch(updateTokensFilter());
-
-    BalancesProvider.get().fetchBalances({
-      force: true
-    });
-  };
-}
diff --git a/js/src/redux/providers/personalReducer.js b/js/src/redux/providers/personalReducer.js
deleted file mode 100644
index ba13ef0035bae2f3176a8750330a3c2c17687c3c..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/personalReducer.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isEqual } from 'lodash';
-import { handleActions } from 'redux-actions';
-
-const initialState = {
-  accountsInfo: {},
-  accounts: {},
-  contacts: {},
-  contracts: {},
-  hardware: {},
-  hasAccounts: false,
-  hasContacts: false,
-  hasContracts: false,
-  hasHardware: false,
-  visibleAccounts: []
-};
-
-export default handleActions({
-  personalAccountsInfo (state, action) {
-    const accountsInfo = action.accountsInfo || state.accountsInfo;
-    const { accounts, contacts, contracts, hardware } = action;
-
-    return Object.assign({}, state, {
-      accountsInfo,
-      accounts,
-      contacts,
-      contracts,
-      hasAccounts: Object.keys(accounts).length !== 0,
-      hasContacts: Object.keys(contacts).length !== 0,
-      hasContracts: Object.keys(contracts).length !== 0,
-      hasHardware: Object.keys(hardware).length !== 0
-    });
-  },
-
-  setVisibleAccounts (state, action) {
-    const addresses = (action.addresses || []).sort();
-
-    if (isEqual(addresses, state.visibleAccounts)) {
-      return state;
-    }
-
-    return Object.assign({}, state, {
-      visibleAccounts: addresses
-    });
-  }
-}, initialState);
diff --git a/js/src/redux/providers/registry/actions.js b/js/src/redux/providers/registry/actions.js
deleted file mode 100644
index 6461470b8957a5073965a26de3b307305cf4619b..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/registry/actions.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export const setReverse = (address, reverse) => ({
-  type: 'setReverse',
-  address, reverse
-});
-
-export const startCachingReverses = () => ({
-  type: 'startCachingReverses'
-});
-
-export const stopCachingReverses = () => ({
-  type: 'stopCachingReverses'
-});
diff --git a/js/src/redux/providers/registry/middleware.js b/js/src/redux/providers/registry/middleware.js
deleted file mode 100644
index eebbe9d143179ee9fd8edb992363b6a1ce0693b6..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/registry/middleware.js
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { debounce } from 'lodash';
-import lsstore from 'store';
-import Contracts from '~/contracts';
-import subscribeToEvents from '~/util/subscribe-to-events';
-
-import registryABI from '~/contracts/abi/registry.json';
-
-import { setReverse, startCachingReverses } from './actions';
-
-const STORE_KEY = '_parity::reverses';
-
-export default class RegistryMiddleware {
-  contract;
-  interval;
-  store;
-  subscription;
-  timeout;
-
-  addressesToCheck = {};
-
-  constructor (api) {
-    this._api = api;
-  }
-
-  toMiddleware () {
-    return (store) => {
-      this.store = store;
-
-      return (next) => (action) => {
-        switch (action.type) {
-          case 'initAll':
-            next(action);
-            store.dispatch(startCachingReverses());
-            break;
-
-          case 'startCachingReverses':
-            this.cacheReverses();
-            break;
-
-          case 'stopCachingReverses':
-            if (this.subscription) {
-              this.subscription.unsubscribe();
-            }
-            if (this.interval) {
-              clearInterval(this.interval);
-            }
-            if (this.timeout) {
-              clearTimeout(this.timeout);
-            }
-
-            this.write.flush();
-            break;
-
-          case 'setReverse':
-            this.write(
-              () => store.getState().nodeStatus.netChain,
-              () => store.getState().registry.reverse,
-              () => +store.getState().nodeStatus.blockNumber
-            );
-            next(action);
-            break;
-
-          default:
-            next(action);
-        }
-      };
-    };
-  }
-
-  cacheReverses () {
-    const { registry } = Contracts.get();
-    const cached = this.read(this.store.getState().nodeStatus.netChain);
-
-    if (cached) {
-      Object
-        .entries(cached.reverses)
-        .forEach(([ address, reverse ]) => this.store.dispatch(setReverse(address, reverse)));
-    }
-
-    registry.getInstance()
-      .then((instance) => this._api.newContract(registryABI, instance.address))
-      .then((_contract) => {
-        this.contract = _contract;
-
-        this.subscription = subscribeToEvents(this.contract, [
-          'ReverseConfirmed', 'ReverseRemoved'
-        ], {
-          from: cached ? cached.lastBlock : 0
-        });
-        this.subscription.on('log', this.onLog);
-
-        this.timeout = setTimeout(this.checkReverses, 10000);
-        this.interval = setInterval(this.checkReverses, 20000);
-      })
-      .catch((err) => {
-        console.error('Failed to start caching reverses:', err);
-        throw err;
-      });
-  }
-
-  checkReverses = () => {
-    Object
-      .keys(this.addressesToCheck)
-      .forEach((address) => {
-        this.contract
-          .instance
-          .reverse
-          .call({}, [ address ])
-          .then((reverse) => {
-            this.store.dispatch(setReverse(address, reverse));
-          });
-      });
-
-    this.addressesToCheck = {};
-  };
-
-  onLog = (log) => {
-    switch (log.event) {
-      case 'ReverseConfirmed':
-        this.addressesToCheck[log.params.reverse.value] = true;
-
-        break;
-      case 'ReverseRemoved':
-        delete this.addressesToCheck[log.params.reverse.value];
-
-        break;
-    }
-  };
-
-  read = (chain) => {
-    const reverses = lsstore.get(`${STORE_KEY}::${chain}::data`);
-    const lastBlock = lsstore.get(`${STORE_KEY}::${chain}::lastBlock`);
-
-    if (!reverses || !lastBlock) {
-      return null;
-    }
-    return { reverses, lastBlock };
-  };
-
-  write = debounce((getChain, getReverses, getLastBlock) => {
-    const chain = getChain();
-    const reverses = getReverses();
-    const lastBlock = getLastBlock();
-
-    lsstore.set(`${STORE_KEY}::${chain}::data`, reverses);
-    lsstore.set(`${STORE_KEY}::${chain}::lastBlock`, lastBlock);
-  }, 20000);
-}
diff --git a/js/src/redux/providers/registry/reducer.js b/js/src/redux/providers/registry/reducer.js
deleted file mode 100644
index e7f599b830ded2f7d0153a89eac8fb0c0c13b40d..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/registry/reducer.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const initialState = {
-  reverse: {} // cache for reverse lookup
-};
-
-export default (state = initialState, action) => {
-  if (action.type === 'setReverse') {
-    if (state.reverse[action.address] === action.reverse) {
-      return state;
-    }
-
-    return {
-      reverse: {
-        ...state.reverse, [ action.address ]: action.reverse
-      }
-    };
-  }
-
-  return state;
-};
diff --git a/js/src/redux/providers/requestsActions.js b/js/src/redux/providers/requestsActions.js
deleted file mode 100644
index 970bcba917ac1abf3af956ac2966109853095fff..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/requestsActions.js
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import { outTransaction } from '~/api/format/output';
-import { trackRequest as trackRequestUtil, parseTransactionReceipt } from '~/util/tx';
-import SavedRequests from '~/views/Application/Requests/savedRequests';
-
-const savedRequests = new SavedRequests();
-
-export const init = (api) => (dispatch) => {
-  api.subscribe('parity_postTransaction', (error, request) => {
-    if (error) {
-      return console.error(error);
-    }
-
-    dispatch(watchRequest(request));
-  });
-
-  api.once('connected', () => {
-    savedRequests.load(api).then((requests) => {
-      requests.forEach((request) => dispatch(watchRequest(request)));
-    });
-  });
-};
-
-export const watchRequest = (request) => (dispatch, getState) => {
-  const { requestId } = request;
-
-  // Convert value to BigNumber
-  request.transaction = outTransaction(request.transaction);
-  dispatch(setRequest(requestId, request));
-  dispatch(trackRequest(requestId, request));
-};
-
-export const trackRequest = (requestId, { transactionHash = null } = {}) => (dispatch, getState) => {
-  const { api } = getState();
-
-  trackRequestUtil(api, { requestId, transactionHash }, (error, _data = {}) => {
-    const data = { ..._data };
-
-    if (error) {
-      console.error(error);
-      return dispatch(setRequest(requestId, { error }));
-    }
-
-    // Hide the request after 6 mined blocks
-    if (data.transactionReceipt) {
-      const { transactionReceipt } = data;
-      const { requests } = getState();
-      const requestData = requests[requestId];
-      let blockSubscriptionId = -1;
-
-      // Set the block height to 0 at the beggining
-      data.blockHeight = new BigNumber(0);
-
-      // If the request was a contract deployment,
-      // then add the contract with the saved metadata to the account
-      if (requestData.metadata && requestData.metadata.deployment) {
-        const { metadata } = requestData;
-
-        const options = {
-          ...requestData.transaction,
-          metadata
-        };
-
-        parseTransactionReceipt(api, options, data.transactionReceipt)
-          .then((contractAddress) => {
-            // No contract address given, might need some confirmations
-            // from the wallet owners...
-            if (!contractAddress || /^(0x)?0*$/.test(contractAddress)) {
-              return false;
-            }
-
-            metadata.blockNumber = data.transactionReceipt
-              ? data.transactionReceipt.blockNumber.toNumber()
-              : null;
-
-            const prevRequest = getState().requests[requestId];
-            const nextTransaction = {
-              ...prevRequest.transaction,
-              creates: contractAddress
-            };
-
-            dispatch(setRequest(requestId, { transaction: nextTransaction }));
-            return Promise.all([
-              api.parity.setAccountName(contractAddress, metadata.name),
-              api.parity.setAccountMeta(contractAddress, metadata)
-            ]);
-          })
-          .catch((error) => {
-            console.error(error);
-          });
-      }
-
-      api
-        .subscribe('eth_blockNumber', (error, blockNumber) => {
-          if (error || !blockNumber) {
-            return;
-          }
-
-          // Transaction included in `blockHeight` blocks
-          const blockHeight = blockNumber.minus(transactionReceipt.blockNumber).plus(1);
-          const nextData = { blockHeight };
-
-          // Hide the transaction after 6 blocks
-          if (blockHeight.gt(6)) {
-            return dispatch(hideRequest(requestId));
-          }
-
-          return dispatch(setRequest(requestId, nextData, false));
-        })
-        .then((subId) => {
-          blockSubscriptionId = subId;
-          return dispatch(setRequest(requestId, { blockSubscriptionId }, false));
-        });
-    }
-
-    return dispatch(setRequest(requestId, data));
-  });
-};
-
-export const hideRequest = (requestId) => (dispatch, getState) => {
-  const { api, requests } = getState();
-  const request = requests[requestId];
-
-  dispatch(setRequest(requestId, { show: false }));
-
-  // Delete it if an error occured or if completed
-  if (request.error || request.transactionReceipt) {
-    // Wait for the animation to be done to delete the request
-    setTimeout(() => {
-      dispatch(deleteRequest(requestId));
-    }, 1000);
-  }
-
-  // Unsubscribe to eth-blockNumber if subscribed
-  if (request.blockSubscriptionId) {
-    api.unsubscribe(request.blockSubscriptionId);
-    dispatch(setRequest(requestId, { blockSubscriptionId: null }, false));
-  }
-};
-
-export const setRequest = (requestId, requestData, autoSetShow = true) => {
-  if (autoSetShow && requestData.show === undefined) {
-    requestData.show = true;
-  }
-
-  savedRequests.save(requestId, requestData);
-
-  return {
-    type: 'setRequest',
-    requestId, requestData
-  };
-};
-
-export const deleteRequest = (requestId) => {
-  savedRequests.remove(requestId);
-
-  return {
-    type: 'deleteRequest',
-    requestId
-  };
-};
diff --git a/js/src/redux/providers/requestsActions.spec.js b/js/src/redux/providers/requestsActions.spec.js
deleted file mode 100644
index 8f48b03d7564e0684387018180ac3d7b462a5b90..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/requestsActions.spec.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import { hideRequest, trackRequest, watchRequest } from './requestsActions';
-
-const TX_HASH = '0x123456';
-const BASE_REQUEST = {
-  requestId: '0x1',
-  transaction: {
-    from: '0x0',
-    to: '0x1'
-  }
-};
-
-let api;
-let store;
-let dispatcher;
-
-function createApi () {
-  return {
-    pollMethod: (method, data) => {
-      switch (method) {
-        case 'parity_checkRequest':
-          return Promise.resolve(TX_HASH);
-
-        default:
-          return Promise.resolve();
-      }
-    }
-  };
-}
-
-function createRedux (dispatcher) {
-  return {
-    dispatch: (arg) => {
-      if (typeof arg === 'function') {
-        return arg(store.dispatch, store.getState);
-      }
-
-      return dispatcher(arg);
-    },
-    getState: () => {
-      return {
-        api,
-        requests: {
-          [BASE_REQUEST.requestId]: BASE_REQUEST
-        }
-      };
-    }
-  };
-}
-
-describe('redux/requests', () => {
-  beforeEach(() => {
-    api = createApi();
-    dispatcher = sinon.spy();
-    store = createRedux(dispatcher);
-  });
-
-  it('watches new requests', () => {
-    store.dispatch(watchRequest(BASE_REQUEST));
-
-    expect(dispatcher).to.be.calledWith({
-      type: 'setRequest',
-      requestId: BASE_REQUEST.requestId,
-      requestData: BASE_REQUEST
-    });
-  });
-
-  it('tracks requests', (done) => {
-    store.dispatch(trackRequest(BASE_REQUEST.requestId));
-
-    setTimeout(() => {
-      expect(dispatcher).to.be.calledWith({
-        type: 'setRequest',
-        requestId: BASE_REQUEST.requestId,
-        requestData: {
-          transactionHash: TX_HASH,
-          show: true
-        }
-      });
-
-      done();
-    }, 50);
-  });
-
-  it('hides requests', () => {
-    store.dispatch(hideRequest(BASE_REQUEST.requestId));
-
-    expect(dispatcher).to.be.calledWith({
-      type: 'setRequest',
-      requestId: BASE_REQUEST.requestId,
-      requestData: { show: false }
-    });
-  });
-});
diff --git a/js/src/redux/providers/requestsReducer.js b/js/src/redux/providers/requestsReducer.js
deleted file mode 100644
index eebc6fe2dd719c5075b8503b72ca36c5a3eff7f2..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/requestsReducer.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-
-const initialState = {};
-
-export default handleActions({
-  setRequest (state, action) {
-    const { requestId, requestData } = action;
-
-    const nextState = {
-      ...state,
-      [requestId]: {
-        ...(state[requestId] || {}),
-        ...requestData
-      }
-    };
-
-    return nextState;
-  },
-
-  deleteRequest (state, action) {
-    const { requestId } = action;
-    const nextState = { ...state };
-
-    delete nextState[requestId];
-    return nextState;
-  }
-}, initialState);
diff --git a/js/src/redux/providers/signer.js b/js/src/redux/providers/signer.js
deleted file mode 100644
index 0e48d5c6e038c3baa8c65eac5fcc15959e473296..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/signer.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { signerRequestsToConfirm } from './signerActions';
-
-export default class Signer {
-  constructor (store, api) {
-    this._api = api;
-    this._store = store;
-  }
-
-  start () {
-    this._subscribeRequestsToConfirm();
-  }
-
-  _subscribeRequestsToConfirm () {
-    this._api
-      .subscribe('signer_requestsToConfirm', (error, pending) => {
-        if (error) {
-          return;
-        }
-
-        this._store.dispatch(signerRequestsToConfirm(pending || []));
-      });
-  }
-}
diff --git a/js/src/redux/providers/signerActions.js b/js/src/redux/providers/signerActions.js
deleted file mode 100644
index d09982edec843dff2d0e64b76b79de86b2aca859..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/signerActions.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createAction } from 'redux-actions';
-
-import { withError } from '../util';
-
-function identity (x) {
-  return x;
-}
-
-export function signerRequestsToConfirm (pending) {
-  return {
-    type: 'signerRequestsToConfirm',
-    pending
-  };
-}
-
-export const startConfirmRequest = createAction('signerStartConfirmRequest');
-export const successConfirmRequest = createAction('signerSuccessConfirmRequest');
-export const errorConfirmRequest = createAction('signerErrorConfirmRequest', identity,
-  withError((args) => args.err, 'error')
-);
-export const startRejectRequest = createAction('signerStartRejectRequest');
-export const successRejectRequest = createAction('signerSuccessRejectRequest');
-export const errorRejectRequest = createAction('signerErrorRejectRequest', identity,
-  withError((args) => args.err, 'error')
-);
diff --git a/js/src/redux/providers/signerMiddleware.js b/js/src/redux/providers/signerMiddleware.js
deleted file mode 100644
index 282e936012ee9868a507e7c07b7ee0f512507e37..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/signerMiddleware.js
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import * as actions from './signerActions';
-
-import { inHex } from '~/api/format/input';
-import HardwareStore from '~/mobx/hardwareStore';
-import { createSignedTx } from '~/util/qrscan';
-import { Signer } from '~/util/signer';
-
-export default class SignerMiddleware {
-  constructor (api) {
-    this._api = api;
-    this._hwstore = HardwareStore.get(api);
-  }
-
-  toMiddleware () {
-    return (store) => (next) => (action) => {
-      let delegate;
-
-      switch (action.type) {
-        case 'signerStartConfirmRequest':
-          delegate = this.onConfirmStart;
-          break;
-
-        case 'signerStartRejectRequest':
-          delegate = this.onRejectStart;
-          break;
-
-        default:
-          next(action);
-          return;
-      }
-
-      if (!delegate) {
-        return;
-      }
-
-      next(action);
-      delegate(store, action);
-    };
-  }
-
-  _createConfirmPromiseHandler (store, id) {
-    return (promise) => {
-      return promise
-        .then((txHash) => {
-          if (!txHash) {
-            store.dispatch(actions.errorConfirmRequest({ id, err: 'Unable to confirm.' }));
-            return;
-          }
-
-          store.dispatch(actions.successConfirmRequest({ id, txHash }));
-        })
-        .catch((error) => {
-          console.error('confirmRequest', id, error);
-          store.dispatch(actions.errorConfirmRequest({ id, err: error.message }));
-        });
-    };
-  }
-
-  createNoncePromise (transaction) {
-    return !transaction.nonce || transaction.nonce.isZero()
-      ? this._api.parity.nextNonce(transaction.from)
-      : Promise.resolve(transaction.nonce);
-  }
-
-  confirmLedgerTransaction (store, id, transaction) {
-    return this
-      .createNoncePromise(transaction)
-      .then((nonce) => {
-        transaction.nonce = nonce;
-
-        return this._hwstore.signLedger(transaction);
-      })
-      .then((rawTx) => {
-        return this.confirmRawRequest(store, id, rawTx);
-      });
-  }
-
-  confirmRawRequest (store, id, rawData) {
-    const handlePromise = this._createConfirmPromiseHandler(store, id);
-
-    return handlePromise(this._api.signer.confirmRequestRaw(id, rawData));
-  }
-
-  confirmSignedData (store, id, dataSigned) {
-    const { signature } = dataSigned;
-
-    return this.confirmRawRequest(store, id, signature);
-  }
-
-  confirmDecryptedMsg (store, id, decrypted) {
-    const { msg } = decrypted;
-
-    return this.confirmRawRequest(store, id, msg);
-  }
-
-  confirmSignedTransaction (store, id, txSigned) {
-    const { netVersion } = store.getState().nodeStatus;
-    const { signature, tx } = txSigned;
-    const { rlp } = createSignedTx(netVersion, signature, tx);
-
-    return this.confirmRawRequest(store, id, rlp);
-  }
-
-  confirmWalletTransaction (store, id, transaction, wallet, password) {
-    const { worker } = store.getState().worker;
-
-    const signerPromise = worker && worker._worker.state === 'activated'
-      ? worker
-        .postMessage({
-          action: 'getSignerSeed',
-          data: { wallet, password }
-        })
-        .then((result) => {
-          const seed = Buffer.from(result.data);
-
-          return new Signer(seed);
-        })
-      : Signer.fromJson(wallet, password);
-
-    // NOTE: Derving the key takes significant amount of time,
-    // make sure to display some kind of "in-progress" state.
-    return Promise
-      .all([ signerPromise, this.createNoncePromise(transaction) ])
-      .then(([ signer, nonce ]) => {
-        const txData = {
-          to: inHex(transaction.to),
-          nonce: inHex(transaction.nonce.isZero() ? nonce : transaction.nonce),
-          gasPrice: inHex(transaction.gasPrice),
-          gasLimit: inHex(transaction.gas),
-          value: inHex(transaction.value),
-          data: inHex(transaction.data)
-        };
-
-        return signer.signTransaction(txData);
-      })
-      .then((rawTx) => {
-        return this.confirmRawRequest(store, id, rawTx);
-      })
-      .catch((error) => {
-        console.error(error.message);
-        store.dispatch(actions.errorConfirmRequest({ id, err: error.message }));
-      });
-  }
-
-  onConfirmStart = (store, action) => {
-    const { condition, gas = 0, gasPrice = 0, id, password, payload, txSigned, dataSigned, decrypted, wallet } = action.payload;
-    const handlePromise = this._createConfirmPromiseHandler(store, id);
-    const transaction = payload.sendTransaction || payload.signTransaction;
-
-    if (transaction) {
-      const hardwareAccount = this._hwstore.wallets[transaction.from];
-
-      if (wallet) {
-        return this.confirmWalletTransaction(store, id, transaction, wallet, password);
-      } else if (txSigned) {
-        return this.confirmSignedTransaction(store, id, txSigned);
-      } else if (hardwareAccount) {
-        switch (hardwareAccount.via) {
-          case 'ledger':
-            return this.confirmLedgerTransaction(store, id, transaction);
-
-          case 'parity':
-          default:
-            break;
-        }
-      }
-    }
-
-    // TODO [ToDr] Support eth_sign for external wallet (wallet && dataSigned)
-    if (dataSigned) {
-      return this.confirmSignedData(store, id, dataSigned);
-    }
-    // TODO [ToDr] Support parity_decrypt for external wallet (wallet && decrypted)
-    if (decrypted) {
-      return this.confirmDecryptedMsg(store, id, decrypted);
-    }
-
-    return handlePromise(this._api.signer.confirmRequest(id, { gas, gasPrice, condition }, password));
-  }
-
-  onRejectStart = (store, action) => {
-    const id = action.payload;
-
-    return this._api.signer
-      .rejectRequest(id)
-      .then(() => {
-        store.dispatch(actions.successRejectRequest({ id }));
-      })
-      .catch((error) => {
-        console.error('rejectRequest', id, error);
-        store.dispatch(actions.errorRejectRequest({ id, err: error.message }));
-      });
-  }
-}
diff --git a/js/src/redux/providers/signerMiddleware.spec.js b/js/src/redux/providers/signerMiddleware.spec.js
deleted file mode 100644
index 1dcc19d7524fed38a37a7f072b0853519cad0d26..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/signerMiddleware.spec.js
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import sinon from 'sinon';
-
-import SignerMiddleware from './signerMiddleware';
-
-const ADDRESS = '0x3456789012345678901234567890123456789012';
-const RAW_SIGNED = 'testSignResponse';
-const NONCE = new BigNumber(0x123454321);
-const TRANSACTION = {
-  from: ADDRESS,
-  nonce: NONCE
-};
-const PAYLOAD = {
-  condition: 'testCondition',
-  gas: 'testGas',
-  gasPrice: 'testGasPrice',
-  id: 'testId',
-  password: 'testPassword',
-  payload: {
-    sendTransaction: TRANSACTION
-  }
-};
-const ACTION = {
-  payload: PAYLOAD
-};
-
-let api;
-let clock;
-let hwstore;
-let middleware;
-let store;
-
-function createApi () {
-  api = {
-    net: {
-      version: sinon.stub().resolves('2')
-    },
-    parity: {
-      nextNonce: sinon.stub().resolves(NONCE)
-    },
-    signer: {
-      confirmRequest: sinon.stub().resolves(true),
-      confirmRequestRaw: sinon.stub().resolves(true),
-      rejectRequest: sinon.stub().resolves(true)
-    }
-  };
-
-  return api;
-}
-
-function createHwStore () {
-  hwstore = {
-    signLedger: sinon.stub().resolves(RAW_SIGNED),
-    wallets: {
-      [ADDRESS]: {
-        address: ADDRESS,
-        via: 'ledger'
-      }
-    }
-  };
-
-  return hwstore;
-}
-
-function createRedux () {
-  return {
-    dispatch: sinon.stub(),
-    getState: () => {
-      return {
-        worker: {
-          worker: null
-        }
-      };
-    }
-  };
-}
-
-function create () {
-  clock = sinon.useFakeTimers();
-  store = createRedux();
-  middleware = new SignerMiddleware(createApi());
-
-  return middleware;
-}
-
-function teardown () {
-  clock.restore();
-}
-
-describe('redux/SignerMiddleware', () => {
-  beforeEach(() => {
-    create();
-  });
-
-  afterEach(() => {
-    teardown();
-  });
-
-  describe('createNoncePromise', () => {
-    it('resolves via transaction.nonce when available', () => {
-      const nonce = new BigNumber('0xabc');
-
-      return middleware.createNoncePromise({ nonce }).then((_nonce) => {
-        expect(_nonce).to.equal(nonce);
-      });
-    });
-
-    it('calls parity_nextNonce', () => {
-      return middleware.createNoncePromise({ from: 'testing' }).then((nonce) => {
-        expect(api.parity.nextNonce).to.have.been.calledWith('testing');
-        expect(nonce).to.equal(NONCE);
-      });
-    });
-  });
-
-  describe('confirmLedgerTransaction', () => {
-    beforeEach(() => {
-      sinon.spy(middleware, 'createNoncePromise');
-      middleware._hwstore = createHwStore();
-
-      return middleware.confirmLedgerTransaction(store, PAYLOAD.id, TRANSACTION);
-    });
-
-    afterEach(() => {
-      middleware.createNoncePromise.restore();
-    });
-
-    it('creates nonce via createNoncePromise', () => {
-      expect(middleware.createNoncePromise).to.have.been.calledWith(TRANSACTION);
-    });
-
-    it('calls into hardware signLedger', () => {
-      expect(hwstore.signLedger).to.have.been.calledWith(TRANSACTION);
-    });
-
-    it('confirms via signer_confirmRequestRaw', () => {
-      expect(api.signer.confirmRequestRaw).to.have.been.calledWith(PAYLOAD.id, RAW_SIGNED);
-    });
-  });
-
-  describe('onConfirmStart', () => {
-    describe('normal accounts', () => {
-      beforeEach(() => {
-        return middleware.onConfirmStart(store, ACTION);
-      });
-
-      it('calls into signer_confirmRequest', () => {
-        expect(api.signer.confirmRequest).to.have.been.calledWith(
-          PAYLOAD.id,
-          {
-            condition: PAYLOAD.condition,
-            gas: PAYLOAD.gas,
-            gasPrice: PAYLOAD.gasPrice
-          },
-          PAYLOAD.password
-        );
-      });
-    });
-
-    describe('hardware accounts', () => {
-      beforeEach(() => {
-        sinon.spy(middleware, 'confirmLedgerTransaction');
-        middleware._hwstore = createHwStore();
-
-        return middleware.onConfirmStart(store, ACTION);
-      });
-
-      afterEach(() => {
-        middleware.confirmLedgerTransaction.restore();
-      });
-
-      it('calls out to confirmLedgerTransaction', () => {
-        expect(middleware.confirmLedgerTransaction).to.have.been.called;
-      });
-    });
-
-    describe('json wallet accounts', () => {
-      beforeEach(() => {
-        sinon.spy(middleware, 'confirmWalletTransaction');
-
-        return middleware.onConfirmStart(store, {
-          payload: Object.assign({}, PAYLOAD, { wallet: 'testWallet' })
-        });
-      });
-
-      afterEach(() => {
-        middleware.confirmWalletTransaction.restore();
-      });
-
-      it('calls out to confirmWalletTransaction', () => {
-        expect(middleware.confirmWalletTransaction).to.have.been.called;
-      });
-    });
-  });
-
-  describe('onRejectStart', () => {
-    beforeEach(() => {
-      return middleware.onRejectStart(store, { payload: 'testId' });
-    });
-
-    it('calls into signer_rejectRequest', () => {
-      expect(api.signer.rejectRequest).to.have.been.calledWith('testId');
-    });
-  });
-});
diff --git a/js/src/redux/providers/signerReducer.js b/js/src/redux/providers/signerReducer.js
deleted file mode 100644
index 1575296595876b315b39e604e2566268b5f2d293..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/signerReducer.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-
-const initialState = {
-  finished: [],
-  pending: []
-};
-
-function removeWithId (pending, id) {
-  return pending.filter(tx => tx.id !== id).slice();
-}
-
-function setIsSending (pending, id, isSending) {
-  return pending.map(p => {
-    if (p.id === id) {
-      p.isSending = isSending;
-    }
-    return p;
-  }).slice();
-}
-
-export default handleActions({
-  signerRequestsToConfirm (state, action) {
-    const { pending } = action;
-
-    return Object.assign({}, state, {
-      pending: pending.map((request) => {
-        const { id } = request;
-        const oldRequest = state.pending.find((r) => r.id === id);
-
-        request.date = (oldRequest && oldRequest.date)
-          ? oldRequest.date
-          : new Date();
-
-        return request;
-      })
-    });
-  },
-
-  signerStartConfirmRequest (state, action) {
-    return {
-      ...state,
-      pending: setIsSending(state.pending, action.payload.id, true)
-    };
-  },
-
-  signerSuccessConfirmRequest (state, action) {
-    const { id, txHash } = action.payload;
-    const confirmed = Object.assign(
-      state.pending.find(p => p.id === id) || { id },
-      { result: txHash, status: 'confirmed' }
-    );
-
-    return {
-      ...state,
-      pending: removeWithId(state.pending, id),
-      finished: [confirmed].concat(state.finished)
-    };
-  },
-
-  signerErrorConfirmRequest (state, action) {
-    return {
-      ...state,
-      pending: setIsSending(state.pending, action.payload.id, false)
-    };
-  },
-
-  signerStartRejectRequest (state, action) {
-    return {
-      ...state,
-      pending: setIsSending(state.pending, action.payload.id, true)
-    };
-  },
-
-  signerSuccessRejectRequest (state, action) {
-    const { id } = action.payload;
-    const rejected = Object.assign(
-      state.pending.find(p => p.id === id) || { id },
-      { status: 'rejected' }
-    );
-
-    return {
-      ...state,
-      pending: removeWithId(state.pending, id),
-      finished: [rejected].concat(state.finished)
-    };
-  },
-
-  signerErrorRejectRequest (state, action) {
-    return {
-      ...state,
-      pending: setIsSending(state.pending, action.payload.id, false)
-    };
-  }
-
-}, initialState);
diff --git a/js/src/redux/providers/snackbarActions.js b/js/src/redux/providers/snackbarActions.js
deleted file mode 100644
index 61bed53f6c6e0e8f9ac87ad2cb9a40efeaca113a..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/snackbarActions.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function showSnackbar (message, cooldown) {
-  return (dispatch, getState) => {
-    dispatch(openSnackbar(message, cooldown));
-  };
-}
-
-export function openSnackbar (message, cooldown) {
-  return {
-    type: 'openSnackbar',
-    message, cooldown
-  };
-}
-
-export function closeSnackbar () {
-  return {
-    type: 'closeSnackbar'
-  };
-}
diff --git a/js/src/redux/providers/snackbarReducer.js b/js/src/redux/providers/snackbarReducer.js
deleted file mode 100644
index c572399a1ab9696a027c046ad4735a863846dec3..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/snackbarReducer.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-
-const initialState = {
-  open: false,
-  message: '',
-  cooldown: 1000
-};
-
-export default handleActions({
-  openSnackbar (state, action) {
-    const { message, cooldown } = action;
-
-    return {
-      ...state,
-      open: true,
-      cooldown: cooldown || state.cooldown,
-      message
-    };
-  },
-
-  closeSnackbar (state) {
-    return {
-      ...state,
-      open: false,
-      cooldown: initialState.cooldown
-    };
-  }
-}, initialState);
diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js
deleted file mode 100644
index 39ba74d010d60fb542b58ecd8462d19f865b3ef6..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/status.js
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isEqual } from 'lodash';
-
-import { LOG_KEYS, getLogger } from '~/config';
-import UpgradeStore from '~/modals/UpgradeParity/store';
-
-import BalancesProvider from './balances';
-import { statusBlockNumber, statusCollection } from './statusActions';
-
-const log = getLogger(LOG_KEYS.Signer);
-let instance = null;
-
-const STATUS_OK = 'ok';
-const STATUS_WARN = 'needsAttention';
-const STATUS_BAD = 'bad';
-
-export default class Status {
-  _apiStatus = {};
-  _status = {};
-  _longStatus = {};
-  _minerSettings = {};
-  _timeoutIds = {};
-  _blockNumberSubscriptionId = null;
-  _timestamp = Date.now();
-
-  constructor (store, api) {
-    this._api = api;
-    this._store = store;
-    this._upgradeStore = UpgradeStore.get(api);
-
-    // On connecting, stop all subscriptions
-    api.on('connecting', this.stop, this);
-
-    // On connected, start the subscriptions
-    api.on('connected', this.start, this);
-
-    // On disconnected, stop all subscriptions
-    api.on('disconnected', this.stop, this);
-
-    this.updateApiStatus();
-  }
-
-  static instantiate (store, api) {
-    if (!instance) {
-      instance = new Status(store, api);
-    }
-
-    return instance;
-  }
-
-  static get () {
-    if (!instance) {
-      throw new Error('The Status Provider has not been initialized yet');
-    }
-
-    return instance;
-  }
-
-  start () {
-    log.debug('status::start');
-
-    Promise
-      .all([
-        this._subscribeBlockNumber(),
-
-        this._pollLongStatus(),
-        this._pollStatus()
-      ])
-      .then(() => {
-        return BalancesProvider.start();
-      });
-  }
-
-  stop () {
-    log.debug('status::stop');
-
-    const promises = [];
-
-    if (this._blockNumberSubscriptionId) {
-      const promise = this._api
-        .unsubscribe(this._blockNumberSubscriptionId)
-        .then(() => {
-          this._blockNumberSubscriptionId = null;
-        });
-
-      promises.push(promise);
-    }
-
-    Object.values(this._timeoutIds).forEach((timeoutId) => {
-      clearTimeout(timeoutId);
-    });
-
-    const promise = BalancesProvider.stop();
-
-    promises.push(promise);
-
-    return Promise.all(promises)
-      .then(() => true)
-      .catch((error) => {
-        console.error('status::stop', error);
-        return true;
-      })
-      .then(() => this.updateApiStatus());
-  }
-
-  updateApiStatus () {
-    const apiStatus = this.getApiStatus();
-
-    log.debug('status::updateApiStatus', apiStatus);
-
-    if (!isEqual(apiStatus, this._apiStatus)) {
-      this._store.dispatch(statusCollection(apiStatus));
-      this._apiStatus = apiStatus;
-    }
-  }
-
-  _subscribeBlockNumber = () => {
-    return this._api
-      .subscribe('eth_blockNumber', (error, blockNumber) => {
-        if (error || !blockNumber) {
-          return;
-        }
-
-        this._store.dispatch(statusBlockNumber(blockNumber));
-
-        this._api.parity
-          .getBlockHeaderByNumber(blockNumber)
-          .then((block) => {
-            if (!block) {
-              return;
-            }
-
-            this._store.dispatch(statusCollection({
-              blockTimestamp: block.timestamp,
-              gasLimit: block.gasLimit
-            }));
-          })
-          .catch((error) => {
-            console.warn('status._subscribeBlockNumber', 'getBlockHeaderByNumber', error);
-          });
-      })
-      .then((blockNumberSubscriptionId) => {
-        this._blockNumberSubscriptionId = blockNumberSubscriptionId;
-      });
-  }
-
-  _pollTraceMode = () => {
-    return this._api.trace
-      .block()
-      .then(blockTraces => {
-        // Assumes not in Trace Mode if no transactions
-        // in latest block...
-        return blockTraces.length > 0;
-      })
-      .catch(() => false);
-  }
-
-  getApiStatus = () => {
-    const { isConnected, isConnecting, needsToken, secureToken } = this._api;
-
-    return {
-      isConnected,
-      isConnecting,
-      needsToken,
-      secureToken
-    };
-  }
-
-  _pollStatus = () => {
-    const nextTimeout = (timeout = 1000) => {
-      if (this._timeoutIds.status) {
-        clearTimeout(this._timeoutIds.status);
-      }
-
-      this._timeoutIds.status = setTimeout(() => this._pollStatus(), timeout);
-    };
-
-    this.updateApiStatus();
-
-    if (!this._api.isConnected) {
-      nextTimeout(250);
-      return Promise.resolve();
-    }
-
-    const statusPromises = [
-      this._api.eth.syncing(),
-      this._api.parity.netPeers(),
-      this._api.parity.nodeHealth()
-    ];
-
-    return Promise
-      .all(statusPromises)
-      .then(([ syncing, netPeers, health ]) => {
-        const status = { netPeers, syncing, health };
-
-        health.overall = this._overallStatus(health);
-        health.peers = health.peers || {};
-        health.sync = health.sync || {};
-        health.time = health.time || {};
-
-        if (!isEqual(status, this._status)) {
-          this._store.dispatch(statusCollection(status));
-          this._status = status;
-        }
-      })
-      .catch((error) => {
-        console.error('_pollStatus', error);
-      })
-      .then(() => {
-        nextTimeout();
-      });
-  }
-
-  _overallStatus = (health) => {
-    const allWithTime = [health.peers, health.sync, health.time].filter(x => x);
-    const all = [health.peers, health.sync].filter(x => x);
-    const statuses = all.map(x => x.status);
-    const bad = statuses.find(x => x === STATUS_BAD);
-    const needsAttention = statuses.find(x => x === STATUS_WARN);
-    const message = allWithTime.map(x => x.message).filter(x => x);
-
-    if (all.length) {
-      return {
-        status: bad || needsAttention || STATUS_OK,
-        message
-      };
-    }
-
-    return {
-      status: STATUS_BAD,
-      message: ['Unable to fetch node health.']
-    };
-  }
-
-  /**
-   * The data fetched here should not change
-   * unless Parity is restarted. They are thus
-   * fetched every 30s just in case, and whenever
-   * the client got reconnected.
-   */
-  _pollLongStatus = () => {
-    if (!this._api.isConnected) {
-      return Promise.resolve();
-    }
-
-    const { nodeKindFull } = this._store.getState().nodeStatus;
-    const defaultTimeout = (nodeKindFull === false ? 240 : 30) * 1000;
-
-    const nextTimeout = (timeout = defaultTimeout) => {
-      if (this._timeoutIds.longStatus) {
-        clearTimeout(this._timeoutIds.longStatus);
-      }
-
-      this._timeoutIds.longStatus = setTimeout(() => this._pollLongStatus(), timeout);
-    };
-
-    const statusPromises = [
-      this._api.parity.nodeKind(),
-      this._api.parity.netPeers(),
-      this._api.web3.clientVersion(),
-      this._api.net.version(),
-      this._api.parity.netChain()
-    ];
-
-    if (nodeKindFull) {
-      statusPromises.push(this._upgradeStore.checkUpgrade());
-    }
-
-    return Promise
-      .all(statusPromises)
-      .then(([nodeKind, netPeers, clientVersion, netVersion, netChain]) => {
-        const isTest = [
-          '2',  // morden
-          '3',  // ropsten,
-          '17', // devchain
-          '42'  // kovan
-        ].includes(netVersion);
-
-        const nodeKindFull = nodeKind &&
-          nodeKind.availability === 'personal' &&
-          nodeKind.capability === 'full';
-
-        const longStatus = {
-          nodeKind,
-          nodeKindFull,
-          netPeers,
-          clientVersion,
-          netChain,
-          netVersion,
-          isTest
-        };
-
-        if (!isEqual(longStatus, this._longStatus)) {
-          this._store.dispatch(statusCollection(longStatus));
-          this._longStatus = longStatus;
-        }
-      })
-      .catch((error) => {
-        console.error('_pollLongStatus', error);
-      })
-      .then(() => {
-        nextTimeout(60000);
-      });
-  }
-}
diff --git a/js/src/redux/providers/statusActions.js b/js/src/redux/providers/statusActions.js
deleted file mode 100644
index df18053e19ffaa8dae5fc3c40a6ff37519e3beb2..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/statusActions.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function statusBlockNumber (blockNumber) {
-  return {
-    type: 'statusBlockNumber',
-    blockNumber
-  };
-}
-
-export function statusCollection (collection) {
-  return {
-    type: 'statusCollection',
-    collection
-  };
-}
diff --git a/js/src/redux/providers/statusReducer.js b/js/src/redux/providers/statusReducer.js
deleted file mode 100644
index 23635cc8a3b7857f8cc462a18dd45f3aaa4cf1b7..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/statusReducer.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { handleActions } from 'redux-actions';
-
-const DEFAULT_NETCHAIN = '(unknown)';
-const DEFAULT_STATUS = 'needsAttention';
-const initialState = {
-  blockNumber: new BigNumber(0),
-  blockTimestamp: new Date(),
-  clientVersion: '',
-  gasLimit: new BigNumber(0),
-  health: {
-    peers: {
-      status: DEFAULT_STATUS
-    },
-    sync: {
-      status: DEFAULT_STATUS
-    },
-    time: {
-      status: DEFAULT_STATUS
-    },
-    overall: {
-      isNotReady: true,
-      status: DEFAULT_STATUS,
-      message: []
-    }
-  },
-  netChain: DEFAULT_NETCHAIN,
-  netPeers: {
-    active: new BigNumber(0),
-    connected: new BigNumber(0),
-    max: new BigNumber(0),
-    peers: []
-  },
-  netVersion: '0',
-  nodeKind: null,
-  nodeKindFull: null,
-  syncing: null,
-  isConnected: false,
-  isConnecting: false,
-  isTest: undefined,
-  traceMode: undefined
-};
-
-export default handleActions({
-  statusBlockNumber (state, action) {
-    const { blockNumber } = action;
-
-    return Object.assign({}, state, { blockNumber });
-  },
-
-  statusCollection (state, action) {
-    const { collection } = action;
-
-    return Object.assign({}, state, collection);
-  }
-}, initialState);
-
-export {
-  DEFAULT_NETCHAIN,
-  initialState
-};
diff --git a/js/src/redux/providers/tokensActions.js b/js/src/redux/providers/tokensActions.js
deleted file mode 100644
index 6f902882d5db9a588772987604d1f0642d8a7975..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/tokensActions.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { uniq } from 'lodash';
-
-import Contracts from '~/contracts';
-import { LOG_KEYS, getLogger } from '~/config';
-import { fetchTokenIds, fetchTokenInfo } from '~/util/tokens';
-
-import { updateTokensFilter } from './balancesActions';
-import { setAddressImage } from './imagesActions';
-
-const log = getLogger(LOG_KEYS.Balances);
-
-export function setTokens (tokens) {
-  return {
-    type: 'setTokens',
-    tokens
-  };
-}
-
-export function loadTokens (options = {}) {
-  log.debug('loading tokens', Object.keys(options).length ? options : '');
-
-  return (dispatch, getState) => {
-    const { tokenReg } = Contracts.get();
-
-    tokenReg.getInstance()
-      .then((tokenRegInstance) => {
-        return fetchTokenIds(tokenRegInstance);
-      })
-      .then((tokenIndexes) => dispatch(fetchTokens(tokenIndexes, options)))
-      .catch((error) => {
-        console.warn('tokens::loadTokens', error);
-      });
-  };
-}
-
-export function fetchTokens (_tokenIndexes, options = {}) {
-  const tokenIndexes = uniq(_tokenIndexes || []);
-
-  return (dispatch, getState) => {
-    const { api, images } = getState();
-    const { tokenReg } = Contracts.get();
-
-    return tokenReg.getInstance()
-      .then((tokenRegInstance) => {
-        const promises = tokenIndexes.map((id) => fetchTokenInfo(api, tokenRegInstance, id));
-
-        return Promise.all(promises);
-      })
-      .then((results) => {
-        const tokens = results
-          .reduce((tokens, token) => {
-            const { id, image, address } = token;
-
-            // dispatch only the changed images
-            if (images[address] !== image) {
-              dispatch(setAddressImage(address, image, true));
-            }
-
-            tokens[id] = token;
-            return tokens;
-          }, {});
-
-        log.debug('fetched token', tokens);
-
-        dispatch(setTokens(tokens));
-        dispatch(updateTokensFilter(null, null, options));
-      })
-      .catch((error) => {
-        console.warn('tokens::fetchTokens', error);
-      });
-  };
-}
diff --git a/js/src/redux/providers/tokensReducer.js b/js/src/redux/providers/tokensReducer.js
deleted file mode 100644
index e11fb41a30f10cb4cfaaf1fdfea929b850a8ff98..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/tokensReducer.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-
-import { ETH_TOKEN } from '~/util/tokens';
-
-const initialState = {
-  [ ETH_TOKEN.id ]: ETH_TOKEN
-};
-
-export default handleActions({
-  setTokens (state, action) {
-    const { tokens } = action;
-
-    return {
-      ...state,
-      ...tokens
-    };
-  }
-}, initialState);
diff --git a/js/src/redux/providers/walletActions.js b/js/src/redux/providers/walletActions.js
deleted file mode 100644
index 58a8faca6a680c617a8681507e9d27be2cff17f6..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/walletActions.js
+++ /dev/null
@@ -1,360 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isEqual, uniq } from 'lodash';
-
-import Contract from '~/api/contract';
-import { ERROR_CODES } from '~/api/transport/error';
-import { foundationWallet as WALLET_ABI } from '~/contracts/abi';
-import WalletsUtils from '~/util/wallets';
-import { newError } from '~/ui/Errors/actions';
-import {
-  UPDATE_OWNERS,
-  UPDATE_REQUIRE,
-  UPDATE_DAILYLIMIT,
-  UPDATE_TRANSACTIONS,
-  UPDATE_CONFIRMATIONS
-} from '~/util/wallets/updates';
-
-export function confirmOperation (address, owner, operation) {
-  return modifyOperation('confirm', address, owner, operation);
-}
-
-export function revokeOperation (address, owner, operation) {
-  return modifyOperation('revoke', address, owner, operation);
-}
-
-function modifyOperation (modification, address, owner, operation) {
-  return (dispatch, getState) => {
-    const { api } = getState();
-
-    dispatch(setOperationPendingState(address, operation, true));
-
-    WalletsUtils.postModifyOperation(api, address, modification, owner, operation)
-      .then((requestId) => {
-        return api.pollMethod('parity_checkRequest', requestId);
-      })
-      .catch((error) => {
-        if (error.code === ERROR_CODES.REQUEST_REJECTED) {
-          return;
-        }
-
-        dispatch(newError(error));
-      })
-      .then(() => {
-        dispatch(setOperationPendingState(address, operation, false));
-      });
-  };
-}
-
-export function attachWallets (_wallets) {
-  return (dispatch, getState) => {
-    const { wallet, api } = getState();
-
-    const prevAddresses = wallet.walletsAddresses;
-    const nextAddresses = Object.keys(_wallets).map((a) => a.toLowerCase()).sort();
-
-    if (isEqual(prevAddresses, nextAddresses)) {
-      return;
-    }
-
-    if (wallet.filterSubId) {
-      api.eth.uninstallFilter(wallet.filterSubId);
-    }
-
-    if (nextAddresses.length === 0) {
-      return dispatch(updateWallets({ wallets: {}, walletsAddresses: [], filterSubId: null }));
-    }
-
-    // Filter the logs from the current block
-    api.eth
-      .blockNumber()
-      .then((block) => {
-        const filterOptions = {
-          fromBlock: block,
-          toBlock: 'latest',
-          address: nextAddresses
-        };
-
-        return api.eth.newFilter(filterOptions);
-      })
-      .then((filterId) => {
-        dispatch(updateWallets({ wallets: _wallets, walletsAddresses: nextAddresses, filterSubId: filterId }));
-      })
-      .catch((error) => {
-        if (process.env.NODE_ENV === 'production') {
-          console.error('walletActions::attachWallets', error);
-        } else {
-          throw error;
-        }
-      });
-
-    fetchWalletsInfo(Object.keys(_wallets))(dispatch, getState);
-  };
-}
-
-export function load (api) {
-  return (dispatch, getState) => {
-    const contract = new Contract(api, WALLET_ABI);
-
-    dispatch(setWalletContract(contract));
-    api.subscribe('eth_blockNumber', (error) => {
-      if (error) {
-        if (process.env.NODE_ENV === 'production') {
-          return console.error('[eth_blockNumber] walletActions::load', error);
-        } else {
-          throw error;
-        }
-      }
-
-      const { filterSubId } = getState().wallet;
-
-      if (!filterSubId) {
-        return;
-      }
-
-      api.eth
-        .getFilterChanges(filterSubId)
-        .then((logs) => {
-          parseLogs(logs)(dispatch, getState);
-        })
-        .catch((error) => {
-          if (process.env.NODE_ENV === 'production') {
-            return console.error('[getFilterChanges] walletActions::load', error);
-          } else {
-            throw error;
-          }
-        });
-    });
-  };
-}
-
-function fetchWalletsInfo (updates) {
-  return (dispatch, getState) => {
-    if (Array.isArray(updates)) {
-      const _updates = updates.reduce((updates, address) => {
-        updates[address] = {
-          [ UPDATE_OWNERS ]: true,
-          [ UPDATE_REQUIRE ]: true,
-          [ UPDATE_DAILYLIMIT ]: true,
-          [ UPDATE_CONFIRMATIONS ]: true,
-          [ UPDATE_TRANSACTIONS ]: true,
-          address
-        };
-
-        return updates;
-      }, {});
-
-      return fetchWalletsInfo(_updates)(dispatch, getState);
-    }
-
-    const { api } = getState();
-    const _updates = Object.values(updates);
-
-    Promise
-      .all(_updates.map((update) => {
-        const contract = new Contract(api, WALLET_ABI).at(update.address);
-
-        return fetchWalletInfo(contract, update, getState);
-      }))
-      .then((updates) => {
-        dispatch(updateWalletsDetails(updates));
-      })
-      .catch((error) => {
-        if (process.env.NODE_ENV === 'production') {
-          return console.error('walletAction::fetchWalletsInfo', error);
-        } else {
-          throw error;
-        }
-      });
-  };
-}
-
-function fetchWalletInfo (contract, update, getState) {
-  const promises = [];
-
-  if (update[UPDATE_OWNERS]) {
-    promises.push(fetchWalletOwners(contract));
-  }
-
-  if (update[UPDATE_REQUIRE]) {
-    promises.push(fetchWalletRequire(contract));
-  }
-
-  if (update[UPDATE_DAILYLIMIT]) {
-    promises.push(fetchWalletDailylimit(contract));
-  }
-
-  if (update[UPDATE_TRANSACTIONS]) {
-    promises.push(fetchWalletTransactions(contract));
-  }
-
-  return Promise
-    .all(promises)
-    .then((updates) => {
-      if (update[UPDATE_CONFIRMATIONS]) {
-        const ownersUpdate = updates.find((u) => u.key === UPDATE_OWNERS);
-        const transactionsUpdate = updates.find((u) => u.key === UPDATE_TRANSACTIONS);
-
-        const owners = ownersUpdate && ownersUpdate.value || null;
-        const transactions = transactionsUpdate && transactionsUpdate.value || null;
-
-        return fetchWalletConfirmations(contract, update[UPDATE_CONFIRMATIONS], owners, transactions, getState)
-          .then((update) => {
-            updates.push(update);
-            return updates;
-          });
-      }
-
-      return updates;
-    })
-    .then((updates) => {
-      const wallet = { address: update.address };
-
-      updates.forEach((update) => {
-        wallet[update.key] = update.value;
-      });
-
-      return wallet;
-    });
-}
-
-function fetchWalletTransactions (contract) {
-  return WalletsUtils
-    .fetchTransactions(contract)
-    .then((transactions) => {
-      return {
-        key: UPDATE_TRANSACTIONS,
-        value: transactions
-      };
-    });
-}
-
-function fetchWalletOwners (contract) {
-  return WalletsUtils
-    .fetchOwners(contract)
-    .then((value) => {
-      return {
-        key: UPDATE_OWNERS,
-        value
-      };
-    });
-}
-
-function fetchWalletRequire (contract) {
-  return WalletsUtils
-    .fetchRequire(contract)
-    .then((value) => {
-      return {
-        key: UPDATE_REQUIRE,
-        value
-      };
-    });
-}
-
-function fetchWalletDailylimit (contract) {
-  return WalletsUtils
-    .fetchDailylimit(contract)
-    .then((value) => {
-      return {
-        key: UPDATE_DAILYLIMIT,
-        value
-      };
-    });
-}
-
-function fetchWalletConfirmations (contract, _operations, _owners = null, _transactions = null, getState) {
-  const wallet = getState().wallet.wallets[contract.address];
-
-  const owners = _owners || (wallet && wallet.owners) || null;
-  const transactions = _transactions || (wallet && wallet.transactions) || null;
-  const cache = { owners, transactions };
-
-  return WalletsUtils.fetchPendingTransactions(contract, cache)
-    .then((confirmations) => {
-      return {
-        key: UPDATE_CONFIRMATIONS,
-        value: confirmations
-      };
-    });
-}
-
-function parseLogs (logs) {
-  return (dispatch, getState) => {
-    if (!logs || logs.length === 0) {
-      return;
-    }
-
-    const { api } = getState();
-    const updates = {};
-
-    const promises = logs.map((log) => {
-      const { address } = log;
-
-      return WalletsUtils.logToUpdate(api, address, log)
-        .then((update) => {
-          const prev = updates[address] || {
-            [ UPDATE_DAILYLIMIT ]: true,
-            address
-          };
-
-          if (update[UPDATE_CONFIRMATIONS]) {
-            const operations = (prev[UPDATE_CONFIRMATIONS] || []).concat(update[UPDATE_CONFIRMATIONS]);
-
-            update[UPDATE_CONFIRMATIONS] = uniq(operations);
-          }
-
-          updates[address] = {
-            ...prev,
-            ...update
-          };
-        });
-    });
-
-    return Promise.all(promises)
-      .then(() => {
-        fetchWalletsInfo(updates)(dispatch, getState);
-      });
-  };
-}
-
-function setOperationPendingState (address, operation, isPending) {
-  return {
-    type: 'setOperationPendingState',
-    address, operation, isPending
-  };
-}
-
-function updateWalletsDetails (wallets) {
-  return {
-    type: 'updateWalletsDetails',
-    wallets
-  };
-}
-
-function setWalletContract (contract) {
-  return {
-    type: 'setWalletContract',
-    contract
-  };
-}
-
-function updateWallets (data) {
-  return {
-    type: 'updateWallets',
-    ...data
-  };
-}
diff --git a/js/src/redux/providers/walletReducer.js b/js/src/redux/providers/walletReducer.js
deleted file mode 100644
index eb8e43c376c0cac1b40764856e8f4aecd21b5163..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/walletReducer.js
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-
-const initialState = {
-  wallets: {},
-  walletsAddresses: [],
-  filterSubId: null,
-  contract: null
-};
-
-export default handleActions({
-  updateWallets: (state, action) => {
-    const { wallets, walletsAddresses, filterSubId } = action;
-
-    return {
-      ...state,
-      wallets, walletsAddresses, filterSubId
-    };
-  },
-
-  updateWalletsDetails: (state, action) => {
-    const { wallets } = action;
-    const prevWallets = state.wallets;
-
-    const nextWallets = { ...prevWallets };
-
-    Object.values(wallets).forEach((wallet) => {
-      const prevWallet = prevWallets[wallet.address] || {};
-
-      nextWallets[wallet.address] = {
-        instance: (state.contract && state.contract.instance) || null,
-        ...prevWallet,
-        ...wallet
-      };
-    });
-
-    return {
-      ...state,
-      wallets: nextWallets
-    };
-  },
-
-  setWalletContract: (state, action) => {
-    const { contract } = action;
-
-    return {
-      ...state,
-      contract
-    };
-  },
-
-  setOperationPendingState: (state, action) => {
-    const { address, operation, isPending } = action;
-    const { wallets } = state;
-
-    const wallet = { ...wallets[address] };
-
-    wallet.confirmations = wallet.confirmations.map((conf) => {
-      if (conf.operation === operation) {
-        conf.pending = isPending;
-      }
-
-      return conf;
-    });
-
-    return {
-      ...state,
-      wallets: {
-        ...wallets,
-        [ address ]: wallet
-      }
-    };
-  }
-}, initialState);
diff --git a/js/src/redux/providers/worker.js b/js/src/redux/providers/worker.js
deleted file mode 100644
index 3a7811241d3516e3dc84967279f901b29a8aa456..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/worker.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import PromiseWorker from 'promise-worker';
-import runtime from 'serviceworker-webpack-plugin/lib/runtime';
-import WebWorker from 'worker-loader!~/webWorker.js';
-
-import { setWorker } from './workerActions';
-
-// Setup the Service Worker
-setupServiceWorker()
-  .then(() => console.log('SW is setup'))
-  .catch((error) => console.error('SW error', error));
-
-function setupServiceWorker () {
-  if (!('serviceWorker' in navigator)) {
-    return Promise.reject('Service Worker is not available in your browser.');
-  }
-
-  const getServiceWorker = () => {
-    return navigator.serviceWorker.ready
-      .then((registration) => {
-        const worker = registration.active;
-
-        worker.controller = registration.active;
-
-        return new PromiseWorker(worker);
-      });
-  };
-
-  return new Promise((resolve, reject) => {
-    // Safe guard for registration bugs (happens in Chrome sometimes)
-    const timeoutId = window.setTimeout(() => {
-      console.warn('could not register SW after 2.5s');
-      getServiceWorker().then(resolve).catch(reject);
-    }, 2500);
-
-    // Setup the Service Worker
-    runtime
-      .register()
-      .then(() => {
-        window.clearTimeout(timeoutId);
-        return getServiceWorker();
-      })
-      .then(resolve).catch(reject);
-  });
-}
-
-function getWorker () {
-  try {
-    const worker = new PromiseWorker(new WebWorker());
-
-    return Promise.resolve(worker);
-  } catch (error) {
-    return Promise.reject(error);
-  }
-}
-
-export const setupWorker = (store) => {
-  const { dispatch, getState } = store;
-
-  const state = getState();
-  const stateWorker = state.worker.worker;
-
-  if (stateWorker !== undefined) {
-    return;
-  }
-
-  getWorker()
-    .then((worker) => {
-      dispatch(setWorker(worker));
-    })
-    .catch((error) => {
-      console.error('setupWorker', error);
-      dispatch(setWorker(null));
-    });
-};
diff --git a/js/src/redux/providers/workerActions.js b/js/src/redux/providers/workerActions.js
deleted file mode 100644
index 5598c154b442dfd4f5007516613c40337f6ce6d9..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/workerActions.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function setWorker (worker) {
-  return {
-    type: 'setWorker',
-    worker
-  };
-}
-
-export function setError (error) {
-  return {
-    type: 'setError',
-    error
-  };
-}
diff --git a/js/src/redux/providers/workerReducer.js b/js/src/redux/providers/workerReducer.js
deleted file mode 100644
index 566b25c75a941459e935ff5a9beeef4b4f276422..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/workerReducer.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-
-const initialState = {
-  worker: undefined,
-  error: null
-};
-
-export default handleActions({
-  setWorker (state, action) {
-    const { worker } = action;
-
-    return Object.assign({}, state, { worker: worker || null });
-  },
-
-  setError (state, action) {
-    const { error } = action;
-
-    return Object.assign({}, state, { error });
-  }
-}, initialState);
diff --git a/js/src/redux/providers/workerWrapper.js b/js/src/redux/providers/workerWrapper.js
deleted file mode 100644
index c6bb5dacab193b553757e3a80bbb203f9e2d5c90..0000000000000000000000000000000000000000
--- a/js/src/redux/providers/workerWrapper.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-if (!process.env.EMBED) {
-  const setupWorker = require('./worker').setupWorker;
-
-  module.exports = { setupWorker };
-} else {
-  module.exports = { setupWorker: () => {} };
-}
diff --git a/js/src/redux/reducers.js b/js/src/redux/reducers.js
deleted file mode 100644
index fb5384d6c894fc23cedd178cd9328f2129e79dd5..0000000000000000000000000000000000000000
--- a/js/src/redux/reducers.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { combineReducers } from 'redux';
-import { routerReducer } from 'react-router-redux';
-
-import {
-  apiReducer, balancesReducer,
-  workerReducer, imagesReducer, personalReducer, requestsReducer,
-  signerReducer, statusReducer as nodeStatusReducer,
-  snackbarReducer, tokensReducer, walletReducer
-} from './providers';
-import certificationsReducer from './providers/certifications/reducer';
-import registryReducer from './providers/registry/reducer';
-
-import errorReducer from '~/ui/Errors/reducers';
-import settingsReducer from '~/views/Settings/reducers';
-import tooltipReducer from '~/ui/Tooltips/reducers';
-
-export default function () {
-  return combineReducers({
-    api: apiReducer,
-    errors: errorReducer,
-    tooltip: tooltipReducer,
-    routing: routerReducer,
-    settings: settingsReducer,
-
-    balances: balancesReducer,
-    certifications: certificationsReducer,
-    images: imagesReducer,
-    nodeStatus: nodeStatusReducer,
-    personal: personalReducer,
-    registry: registryReducer,
-    requests: requestsReducer,
-    signer: signerReducer,
-    snackbar: snackbarReducer,
-    tokens: tokensReducer,
-    wallet: walletReducer,
-    worker: workerReducer
-  });
-}
diff --git a/js/src/redux/store.js b/js/src/redux/store.js
deleted file mode 100644
index 5740cb6188d17e7d8e9d3327a5a81b5e9765e5d3..0000000000000000000000000000000000000000
--- a/js/src/redux/store.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { applyMiddleware, createStore } from 'redux';
-
-import initMiddleware from './middleware';
-import initReducers from './reducers';
-
-import { load as loadWallet } from './providers/walletActions';
-import { init as initRequests } from './providers/requestsActions';
-import { setupWorker } from './providers/workerWrapper';
-
-import {
-  Balances as BalancesProvider,
-  Personal as PersonalProvider,
-  Signer as SignerProvider,
-  Status as StatusProvider
-} from './providers';
-
-const storeCreation = window.devToolsExtension
-  ? window.devToolsExtension()(createStore)
-  : createStore;
-
-export default function (api, browserHistory, forEmbed = false) {
-  const reducers = initReducers();
-  const middleware = initMiddleware(api, browserHistory, forEmbed);
-  const store = applyMiddleware(...middleware)(storeCreation)(reducers);
-
-  BalancesProvider.instantiate(store, api);
-  StatusProvider.instantiate(store, api);
-  new PersonalProvider(store, api).start();
-  new SignerProvider(store, api).start();
-
-  store.dispatch(loadWallet(api));
-  store.dispatch(initRequests(api));
-  setupWorker(store);
-
-  return store;
-}
diff --git a/js/src/redux/util.js b/js/src/redux/util.js
deleted file mode 100644
index 51dae9bc116268e6311fc938b4c72a7cd885c242..0000000000000000000000000000000000000000
--- a/js/src/redux/util.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { hashToImageUrl } from './providers/imagesReducer';
-import { withError } from '~/ui/Errors/middleware';
-
-export {
-  hashToImageUrl,
-  withError
-};
diff --git a/js/src/reset.css b/js/src/reset.css
deleted file mode 100644
index 6907ebdb201f9f7ac2ce20d0049ce91d63373ce8..0000000000000000000000000000000000000000
--- a/js/src/reset.css
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-:root,
-:root body {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-  color: rgba(255, 255, 255, 0.75);
-  font-size: 16px;
-  font-family: 'Roboto', sans-serif;
-  font-weight: 300 !important;
-}
-
-:root * {
-  font-weight: 300 !important;
-}
-
-:root a,
-:root a:visited {
-  text-decoration: none;
-  cursor: pointer;
-  color: rgb(0, 151, 167); /* #f80 */
-}
-
-:root a:hover {
-  color: rgb(0, 174, 193);
-}
-
-:root .reset { font-size: initial; width: 100%; height: 100%; }
-/* shame:on */
-/* Material-ui is changing input properties with inline styles. */
-/* because of that https://github.com/paritytech/eth-node-status-page is overriding all inputs with !important
-/* We want to keep it consistent and we use material ui, so we set the default color according to material ui */
-:root .reset input {
-  margin-top: 0;
-  color: rgba(0, 0, 0, 0.870588) !important;
-}
-:root .reset input[disabled] {
-  color: rgba(0, 0, 0, 0.298039) !important;
-}
-/* shame:off */
-
-// Prefixed version of
-/* http://meyerweb.com/eric/tools/css/reset/
-   v2.0 | 20110126
-   License: none (public domain)
-*/
-:root .reset div, :root .reset span, :root .reset applet, :root .reset object, :root .reset iframe,
-:root .reset h1, :root .reset h2, :root .reset h3, :root .reset h4, :root .reset h5, :root .reset h6, :root .reset p, :root .reset blockquote, :root .reset pre,
-:root .reset a, :root .reset abbr, :root .reset acronym, :root .reset address, :root .reset big, :root .reset cite, :root .reset code,
-:root .reset del, :root .reset dfn, :root .reset em, :root .reset img, :root .reset ins, :root .reset kbd, :root .reset q, :root .reset s, :root .reset samp,
-:root .reset small, :root .reset strike, :root .reset strong, :root .reset sub, :root .reset sup, :root .reset tt, :root .reset var,
-:root .reset b, :root .reset u, :root .reset i, :root .reset center,
-:root .reset dl, :root .reset dt, :root .reset dd, :root .reset ol, :root .reset ul, :root .reset li,
-:root .reset fieldset, :root .reset form, :root .reset label, :root .reset legend,
-:root .reset table, :root .reset caption, :root .reset tbody, :root .reset tfoot, :root .reset thead, :root .reset tr, :root .reset th, :root .reset td,
-:root .reset article, :root .reset aside, :root .reset canvas, :root .reset details, :root .reset embed,
-:root .reset figure, :root .reset figcaption, :root .reset footer, :root .reset header, :root .reset hgroup,
-:root .reset menu, :root .reset nav, :root .reset output, :root .reset ruby, :root .reset section, :root .reset summary,
-:root .reset time, :root .reset mark, :root .reset audio, :root .reset video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-:root .reset article, :root .reset aside, :root .reset details, :root .reset figcaption, :root .reset figure,
-:root .reset footer, :root .reset header, :root .reset hgroup, :root .reset menu, :root .reset nav, :root .reset section {
-  display: block;
-}
-:root .reset body {
-  line-height: 1;
-}
-:root .reset ol, :root .reset ul {
-  list-style: none;
-}
-:root .reset blockquote, :root .reset q {
-  quotes: none;
-}
-:root .reset blockquote:before, :root .reset blockquote:after,
-:root .reset q:before, :root .reset q:after {
-  content: '';
-  content: none;
-}
-:root .reset table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
diff --git a/js/src/routes.js b/js/src/routes.js
deleted file mode 100644
index 72097ae627df662ab56aacc11128f399b34d7f1e..0000000000000000000000000000000000000000
--- a/js/src/routes.js
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import HistoryStore from '~/mobx/historyStore';
-import {
-  Accounts, Account, Addresses, Address, Application,
-  Contract, Contracts, Dapp, Dapps, Home,
-  Settings, SettingsBackground, SettingsParity, SettingsProxy,
-  SettingsViews, Signer, Status,
-  Vaults, Wallet, Web, WriteContract
-} from '~/views';
-import builtinDapps from '~/views/Dapps/builtin.json';
-
-const accountsHistory = HistoryStore.get('accounts');
-const dappsHistory = HistoryStore.get('dapps');
-
-function handleDeprecatedRoute (nextState, replace) {
-  const { address } = nextState.params;
-  const redirectMap = {
-    account: 'accounts',
-    address: 'addresses',
-    contract: 'contracts'
-  };
-
-  const oldRoute = nextState.routes[0].path;
-  const newRoute = Object.keys(redirectMap).reduce((newRoute, key) => {
-    return newRoute.replace(new RegExp(`^/${key}`), '/' + redirectMap[key]);
-  }, oldRoute);
-
-  console.warn(`Route "${oldRoute}" is deprecated. Please use "${newRoute}"`);
-  replace(newRoute.replace(':address', address));
-}
-
-function redirectTo (path) {
-  return (nextState, replace) => {
-    replace(path);
-  };
-}
-
-const accountsRoutes = [
-  {
-    path: ':address',
-    component: Account,
-    onEnter: ({ params }) => {
-      accountsHistory.add(params.address, 'account');
-    }
-  },
-  { path: '/vaults', component: Vaults },
-  {
-    path: '/wallet/:address',
-    component: Wallet,
-    onEnter: ({ params }) => {
-      accountsHistory.add(params.address, 'wallet');
-    }
-  }
-];
-
-const addressesRoutes = [
-  { path: ':address', component: Address }
-];
-
-const contractsRoutes = [
-  { path: 'develop', component: WriteContract },
-  { path: ':address', component: Contract }
-];
-
-const settingsRoutes = [
-  { path: 'background', component: SettingsBackground },
-  { path: 'proxy', component: SettingsProxy },
-  { path: 'views', component: SettingsViews },
-  { path: 'parity', component: SettingsParity }
-];
-
-const statusRoutes = [
-  { path: ':subpage', component: Status }
-];
-
-const routes = [
-  // Backward Compatible routes
-  { path: '/account/:address', onEnter: handleDeprecatedRoute },
-  { path: '/address/:address', onEnter: handleDeprecatedRoute },
-  { path: '/contract/:address', onEnter: handleDeprecatedRoute },
-
-  { path: '/', onEnter: redirectTo('/home') },
-  { path: '/auth', onEnter: redirectTo('/home') },
-  { path: '/settings', onEnter: redirectTo('/settings/views') }
-];
-
-const childRoutes = [
-  {
-    path: 'accounts',
-    indexRoute: { component: Accounts },
-    childRoutes: accountsRoutes
-  },
-  {
-    path: 'addresses',
-    indexRoute: { component: Addresses },
-    childRoutes: addressesRoutes
-  },
-  {
-    path: 'contracts',
-    indexRoute: { component: Contracts },
-    childRoutes: contractsRoutes
-  },
-  {
-    path: 'status',
-    indexRoute: { component: Status },
-    childRoutes: statusRoutes
-  },
-  {
-    path: 'settings',
-    component: Settings,
-    childRoutes: settingsRoutes
-  },
-  {
-    path: 'app/:id',
-    component: Dapp,
-    onEnter: ({ params }) => {
-      if (!builtinDapps[params.id] || !builtinDapps[params.id].skipHistory) {
-        dappsHistory.add(params.id);
-      }
-    }
-  },
-  { path: 'apps', component: Dapps },
-  { path: 'home', component: Home },
-  { path: 'web', component: Web },
-  { path: 'web/:url', component: Web },
-  { path: 'signer', component: Signer }
-];
-
-// TODO : use ES6 imports when supported
-if (process.env.NODE_ENV !== 'production') {
-  const Playground = require('./playground').default;
-
-  childRoutes.push({
-    path: 'playground',
-    component: Playground
-  });
-}
-
-routes.push({
-  path: '/',
-  component: Application,
-  childRoutes
-});
-
-export default routes;
diff --git a/js/src/secureApi.js b/js/src/secureApi.js
deleted file mode 100644
index 76b7eadf81371dcbe61df1b30b843f1087bea8a7..0000000000000000000000000000000000000000
--- a/js/src/secureApi.js
+++ /dev/null
@@ -1,430 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { uniq } from 'lodash';
-import store from 'store';
-
-import Api from './api';
-import { LOG_KEYS, getLogger } from '~/config';
-
-const log = getLogger(LOG_KEYS.Signer);
-
-export default class SecureApi extends Api {
-  _isConnecting = false;
-  _needsToken = false;
-  _tokens = [];
-  _uiApi = null;
-
-  _dappsUrl = null;
-  _wsUrl = null;
-  _url = null;
-
-  static getTransport (url, sysuiToken, protocol) {
-    const transportUrl = SecureApi.transportUrl(url, protocol);
-
-    return new Api.Transport.Ws(transportUrl, sysuiToken, false);
-  }
-
-  static transportUrl (url, protocol) {
-    const proto = protocol() === 'https:' ? 'wss:' : 'ws:';
-
-    return `${proto}//${url}`;
-  }
-
-  // Returns a protocol with `:` at the end.
-  static protocol () {
-    return window.location.protocol;
-  }
-
-  constructor (uiUrl, nextToken, getTransport = SecureApi.getTransport, protocol = SecureApi.protocol) {
-    const sysuiToken = store.get('sysuiToken');
-    const transport = getTransport(uiUrl, sysuiToken, protocol);
-
-    super(transport);
-
-    this.protocol = protocol;
-    this._url = uiUrl;
-    this._uiApi = new Api(new Api.Transport.Http(`${this.protocol()}//${this._url}/rpc`, 0), false);
-    this._wsUrl = uiUrl;
-    // Try tokens from localStorage, from hash and 'initial'
-    this._tokens = uniq([sysuiToken, nextToken, 'initial'])
-      .filter((token) => token)
-      .map((token) => ({ value: token, tried: false }));
-
-    // When the transport is closed, try to reconnect
-    transport.on('close', this.connect, this);
-
-    this.connect();
-  }
-
-  get _dappsAddress () {
-    if (!this._dappsUrl) {
-      return {
-        host: null,
-        port: 8545
-      };
-    }
-
-    const [host, port] = this._dappsUrl.split(':');
-
-    return {
-      host,
-      port: parseInt(port, 10)
-    };
-  }
-
-  get dappsPort () {
-    return this._dappsAddress.port;
-  }
-
-  get dappsUrl () {
-    const { port } = this._dappsAddress;
-
-    return `${this.protocol()}//${this.hostname}:${port}`;
-  }
-
-  get hostname () {
-    if (window.location.hostname === 'home.parity') {
-      return 'dapps.parity';
-    }
-
-    return this._dappsAddress.host;
-  }
-
-  get isConnecting () {
-    return this._isConnecting;
-  }
-
-  get isConnected () {
-    return this._transport.isConnected;
-  }
-
-  get needsToken () {
-    return this._needsToken;
-  }
-
-  get secureToken () {
-    return this._transport.token;
-  }
-
-  connect () {
-    if (this._isConnecting) {
-      return;
-    }
-
-    log.debug('trying to connect...');
-
-    this._isConnecting = true;
-
-    this.emit('connecting');
-
-    // Reset the tested Tokens
-    this._resetTokens();
-
-    // Try to connect
-    return this._connect()
-      .then((connected) => {
-        this._isConnecting = false;
-
-        if (connected) {
-          const token = this.secureToken;
-
-          log.debug('got connected ; saving token', token);
-
-          // Save the sucessful token
-          this._saveToken(token);
-          this._needsToken = false;
-
-          // Emit the connected event
-          return this.emit('connected');
-        }
-
-        // If not connected, we need a new token
-        log.debug('needs a token');
-        this._needsToken = true;
-
-        return this.emit('disconnected');
-      })
-      .catch((error) => {
-        this._isConnecting = false;
-
-        log.debug('emitting "disconnected"');
-        this.emit('disconnected');
-        console.error('unhandled error in secureApi', error);
-      });
-  }
-
-  /**
-   * Resolves a wildcard address to `window.location.hostname`;
-   */
-  _resolveHost (url) {
-    const parts = url ? url.split(':') : [];
-    const port = parts[1];
-    let host = parts[0];
-
-    if (!host) {
-      return host;
-    }
-
-    if (host === '0.0.0.0') {
-      host = window.location.hostname;
-    }
-
-    return port ? `${host}:${port}` : host;
-  }
-
-  /**
-   * Returns a Promise that gets resolved with
-   * a boolean: `true` if the node is up, `false`
-   * otherwise (HEAD request to the Node)
-   */
-  isNodeUp () {
-    return fetch(`${this.protocol()}//${this._url}/api/ping`, { method: 'HEAD' })
-      .then(
-        (r) => r.status === 200,
-        () => false
-      )
-      .catch(() => false);
-  }
-
-  /**
-   * Update the given token, ie. add it to the token
-   * list, and then try to connect (if not already connecting)
-   */
-  updateToken (_token) {
-    const token = this._sanitiseToken(_token);
-
-    log.debug('updating token', token);
-
-    // Update the tokens list: put the new one on first position
-    this._tokens = [ { value: token, tried: false } ].concat(this._tokens);
-
-    // Try to connect with the new token added
-    return this.connect();
-  }
-
-  /**
-   * Try to connect to the Node with the next Token in
-   * the list
-   */
-  _connect () {
-    log.debug('trying next token');
-
-    // Get the first not-tried token
-    const nextToken = this._getNextToken();
-
-    // If no more tokens to try, user has to enter a new one
-    if (!nextToken) {
-      return Promise.resolve(false);
-    }
-
-    nextToken.tried = true;
-
-    return this._connectWithToken(nextToken.value)
-      .then((validToken) => {
-        // If not valid, try again with the next token in the list
-        if (!validToken) {
-          return this._connect();
-        }
-
-        // If correct and valid token, wait until the Node is ready
-        // and resolve as connected
-        return this._waitUntilNodeReady()
-          .then(() => true);
-      })
-      .catch((error) => {
-        log.error('unkown error in _connect', error);
-        return false;
-      });
-  }
-
-  /**
-   * Connect with the given token.
-   * It returns a Promise that gets resolved
-   * with `validToken` as argument, whether the given token
-   * is valid or not
-   */
-  _connectWithToken (_token) {
-    // Sanitize the token first
-    const token = this._sanitiseToken(_token);
-
-    const connectPromise = this._fetchSettings()
-      .then(() => {
-        // Update the URL and token in the transport layer
-        this.transport.url = SecureApi.transportUrl(this._wsUrl, this.protocol);
-        this.transport.updateToken(token, false);
-
-        log.debug('connecting with token', token);
-
-        return this.transport.connect();
-      })
-      .then(() => {
-        log.debug('connected with', token);
-
-        if (token === 'initial') {
-          return this._generateAuthorizationToken();
-        }
-
-        // The token is valid !
-        return true;
-      })
-      .catch((error) => {
-        // Log if it's not a close error (ie. wrong token)
-        if (error && error.type !== 'close') {
-          log.debug('did not connect ; error', error);
-        }
-
-        return false;
-      });
-
-    return Promise
-      .all([
-        connectPromise,
-        this.isNodeUp()
-      ])
-      .then(([ connected, isNodeUp ]) => {
-        if (connected) {
-          return true;
-        }
-
-        // If it's not up, try again in a few...
-        if (!isNodeUp) {
-          const timeout = this.transport.retryTimeout;
-
-          log.debug('node is not up ; will try again in', timeout, 'ms');
-
-          return new Promise((resolve, reject) => {
-            window.setTimeout(() => {
-              this._connectWithToken(token).then(resolve).catch(reject);
-            }, timeout);
-          });
-        }
-
-        // The token is invalid
-        log.debug('tried with a wrong token', token);
-        return false;
-      });
-  }
-
-  /**
-   * Retrieve the correct ports from the Node
-   */
-  _fetchSettings () {
-    return Promise
-      .all([
-        // ignore dapps disabled errors
-        this._uiApi.parity.dappsUrl().catch(() => null),
-        this._uiApi.parity.wsUrl()
-      ])
-      .then(([dappsUrl, wsUrl]) => {
-        this._dappsUrl = this._resolveHost(dappsUrl);
-        this._wsUrl = this._resolveHost(wsUrl);
-      });
-  }
-
-  /**
-   * Try to generate an Authorization Token.
-   * Then try to connect with the new token.
-   */
-  _generateAuthorizationToken () {
-    return this.signer
-      .generateAuthorizationToken()
-      .then((token) => this._connectWithToken(token));
-  }
-
-  /**
-   * Get the next token to try, if any left
-   */
-  _getNextToken () {
-    // Get the first not-tried token
-    const nextTokenIndex = this._tokens.findIndex((t) => !t.tried);
-
-    // If no more tokens to try, user has to enter a new one
-    if (nextTokenIndex < 0) {
-      return null;
-    }
-
-    const nextToken = this._tokens[nextTokenIndex];
-
-    return nextToken;
-  }
-
-  _resetTokens () {
-    this._tokens = this._tokens.map((token) => ({
-      ...token,
-      tried: false
-    }));
-  }
-
-  _sanitiseToken (token) {
-    return token.replace(/[^a-zA-Z0-9]/g, '');
-  }
-
-  _saveToken (token) {
-    store.set('sysuiToken', token);
-  }
-
-  /**
-   * Promise gets resolved when the node is up
-   * and running (it might take some time before
-   * the node is actually ready even when the client
-   * is connected).
-   *
-   * We check that the `parity_netChain` RPC calls
-   * returns successfully
-   */
-  _waitUntilNodeReady (_timeleft) {
-    // Default timeout to 30 seconds
-    const timeleft = Number.isFinite(_timeleft)
-      ? _timeleft
-      : 30 * 1000;
-
-    // After timeout, just resolve the promise...
-    if (timeleft <= 0) {
-      console.warn('node is still not ready after 30 seconds...');
-      return Promise.resolve(true);
-    }
-
-    const start = Date.now();
-
-    return this
-      .parity.netChain()
-      .then(() => true)
-      .catch((error) => {
-        if (!error) {
-          return true;
-        }
-
-        if (error.type !== 'NETWORK_DISABLED') {
-          throw error;
-        }
-
-        // Timeout between 250ms and 750ms
-        const timeout = Math.floor(250 + (500 * Math.random()));
-
-        log.debug('waiting until node is ready', 'retry in', timeout, 'ms');
-
-        // Retry in a few...
-        return new Promise((resolve, reject) => {
-          window.setTimeout(() => {
-            const duration = Date.now() - start;
-
-            this._waitUntilNodeReady(timeleft - duration).then(resolve).catch(reject);
-          }, timeout);
-        });
-      });
-  }
-}
diff --git a/js/src/serviceWorker.js b/js/src/serviceWorker.js
deleted file mode 100644
index cf53dcd465eec33df59853d93500c70c22835cdd..0000000000000000000000000000000000000000
--- a/js/src/serviceWorker.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import toolbox from 'sw-toolbox';
-
-/**
- * Cache the SOLC files : if not available, make a network request
- */
-toolbox.router.any(/rawgit.com\/ethereum\/solc-bin(.+)list\.json$/, toolbox.networkFirst);
-toolbox.router.any(/rawgit.com\/ethereum\/solc-bin(.+)soljson(.+)\.js$/, toolbox.cacheFirst);
-
-self.addEventListener('install', (event) => {
-  event.waitUntil(self.skipWaiting());
-});
-
-self.addEventListener('activate', (event) => {
-  event.waitUntil(self.clients.claim());
-});
diff --git a/js/src/ui/AccountCard/accountCard.css b/js/src/ui/AccountCard/accountCard.css
deleted file mode 100644
index e6cafe65692fa63f198c2bb37dd24d1b9e247c44..0000000000000000000000000000000000000000
--- a/js/src/ui/AccountCard/accountCard.css
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.account {
-  align-items: stretch;
-  background-color: rgba(0, 0, 0, 0.8);
-  display: flex;
-  flex-direction: row;
-  height: 100%;
-  overflow: hidden;
-  transition: transform ease-out 0.1s;
-  transform: scale(1);
-
-  &.copied {
-    animation-duration: 0.25s;
-    animation-name: copied;
-  }
-
-  &:focus {
-    transform: scale(0.99);
-    background-color: rgba(0, 0, 0, 0.6);
-  }
-
-  &:first-child {
-    margin-top: 0;
-  }
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-
-  &:hover {
-    cursor: pointer;
-    background-color: rgba(0, 0, 0, 0.4);
-  }
-}
-
-.mainContainer {
-  flex: 1 1 auto;
-  overflow: hidden;
-  padding: 1em;
-}
-
-.tagsContainer {
-  flex: 0 0 auto;
-  position: relative;
-  width: 3em;
-}
-
-.tags {
-  background-color: rgba(0, 0, 0, 0.4);
-  box-sizing: content-box;
-  height: calc(100% - 0.5em);
-  overflow-x: hidden;
-  overflow-y: scroll;
-  padding: 0.25em;
-  padding-right: 2em;
-  position: absolute;
-  right: -2.5em;
-  transition: background-color 0.2s ease-out;
-  width: calc(100% + 0.25em);
-
-  &:hover {
-    background-color: rgba(0, 0, 0, 0.8);
-    padding-left: 0.5em;
-    width: auto;
-  }
-}
-
-.infoContainer {
-  display: flex;
-  flex-direction: row;
-  margin-bottom: 0.5em;
-  width: 100%;
-}
-
-.description {
-  font-size: 0.75em;
-  color: rgba(255, 255, 255, 0.5);
-}
-
-.accountInfo {
-  flex: 1;
-
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  min-width: 0;
-
-  > * {
-    padding: 0.25em 0;
-  }
-
-  .addressContainer {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    font-size: 0.9em;
-  }
-
-  .accountName {
-    font-weight: 700 !important;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-
-.balance {
-  margin-top: 0;
-}
-
-@keyframes copied {
-  from {
-    transform: scale(0.99);
-  }
-
-  50% {
-    transform: scale(0.97);
-  }
-
-  to {
-    transform: scale(0.99);
-  }
-}
diff --git a/js/src/ui/AccountCard/accountCard.example.js b/js/src/ui/AccountCard/accountCard.example.js
deleted file mode 100644
index 8c4ea9a4b69e1959e68a31d8736eb738b494d55f..0000000000000000000000000000000000000000
--- a/js/src/ui/AccountCard/accountCard.example.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import PlaygroundExample from '~/playground/playgroundExample';
-
-import AccountCard from './accountCard';
-
-export default class AccountCardExample extends Component {
-  render () {
-    const account = {
-      address: '0x639ba260535db072a41115c472830846e4e9ad0f',
-      description: 'This is a description for the main account',
-      meta: {
-        tags: [ 'important', 'zargo' ]
-      },
-      name: 'Main Account'
-    };
-
-    const balance = {
-      tokens: [
-        {
-          value: 100000000000000000000,
-          token: {
-            tag: 'ETH'
-          }
-        }
-      ]
-    };
-
-    const accountManyTags = {
-      ...account,
-      meta: { tags: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map((n) => `tag #${n}`) }
-    };
-
-    const accountNoTags = {
-      ...account,
-      meta: { tags: [] }
-    };
-
-    return (
-      <div>
-        <PlaygroundExample name='Standard Account Card'>
-          <AccountCard
-            account={ account }
-            balance={ balance }
-          />
-        </PlaygroundExample>
-
-        <PlaygroundExample name='Small Account Card'>
-          <div style={ { width: 300 } }>
-            <AccountCard
-              account={ account }
-              balance={ balance }
-            />
-          </div>
-        </PlaygroundExample>
-
-        <PlaygroundExample name='Many Tags Account Card'>
-          <div style={ { width: 300 } }>
-            <AccountCard
-              account={ accountManyTags }
-              balance={ balance }
-            />
-          </div>
-        </PlaygroundExample>
-
-        <PlaygroundExample name='No Tags Account Card'>
-          <div style={ { width: 300 } }>
-            <AccountCard
-              account={ accountNoTags }
-              balance={ balance }
-            />
-          </div>
-        </PlaygroundExample>
-
-        <PlaygroundExample name='Two Account Card'>
-          <div style={ { display: 'flex' } }>
-            <div style={ { margin: '0 0.5em' } }>
-              <AccountCard
-                account={ account }
-                balance={ balance }
-              />
-            </div>
-            <div style={ { margin: '0 0.5em' } }>
-              <AccountCard
-                account={ account }
-                balance={ balance }
-              />
-            </div>
-          </div>
-        </PlaygroundExample>
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/AccountCard/accountCard.js b/js/src/ui/AccountCard/accountCard.js
deleted file mode 100644
index de7cc3d18019a75da770853be3ecb91c7a2c26c0..0000000000000000000000000000000000000000
--- a/js/src/ui/AccountCard/accountCard.js
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import ReactDOM from 'react-dom';
-import keycode from 'keycode';
-
-import Balance from '~/ui/Balance';
-import IdentityIcon from '~/ui/IdentityIcon';
-import IdentityName from '~/ui/IdentityName';
-import Tags from '~/ui/Tags';
-
-import styles from './accountCard.css';
-
-export default class AccountCard extends Component {
-  static propTypes = {
-    children: PropTypes.node,
-    account: PropTypes.object.isRequired,
-    balance: PropTypes.object,
-    className: PropTypes.string,
-    disableAddressClick: PropTypes.bool,
-    onClick: PropTypes.func,
-    onFocus: PropTypes.func
-  };
-
-  static defaultProps = {
-    disableAddressClick: false
-  };
-
-  state = {
-    copied: false
-  };
-
-  render () {
-    const { account, balance, className, onFocus, children } = this.props;
-    const { copied } = this.state;
-    const { address, description, meta = {}, name } = account;
-    const { tags = [] } = meta;
-    const classes = [ styles.account, className ];
-
-    if (copied) {
-      classes.push(styles.copied);
-    }
-
-    const props = onFocus
-      ? { tabIndex: 0 }
-      : {};
-
-    return (
-      <div
-        key={ address }
-        className={ classes.join(' ') }
-        onClick={ this.onClick }
-        onFocus={ this.onFocus }
-        onKeyDown={ this.handleKeyDown }
-        { ...props }
-      >
-        <div className={ styles.mainContainer }>
-          <div className={ styles.infoContainer }>
-            <IdentityIcon address={ address } />
-            <div className={ styles.accountInfo }>
-              <div className={ styles.accountName }>
-                <IdentityName
-                  address={ address }
-                  name={ name }
-                  unknown
-                />
-              </div>
-              { this.renderDescription(description) }
-              { this.renderAddress(address) }
-            </div>
-          </div>
-
-          <Balance
-            address={ address }
-            balance={ balance }
-            className={ styles.balance }
-            showOnlyEth
-          />
-          { children }
-        </div>
-
-        {
-          tags && tags.length > 0
-          ? (
-            <div className={ styles.tagsContainer }>
-              <div className={ styles.tags }>
-                <Tags
-                  floating={ false }
-                  horizontal
-                  tags={ tags }
-                />
-              </div>
-            </div>
-          ) : null
-        }
-
-      </div>
-    );
-  }
-
-  renderDescription (description) {
-    if (!description) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.description }>
-        <span>{ description }</span>
-      </div>
-    );
-  }
-
-  renderAddress (address) {
-    return (
-      <div className={ styles.addressContainer }>
-        <span
-          className={ styles.address }
-          onClick={ this.handleAddressClick }
-          ref={ `address` }
-          title={ address }
-        >
-          { address }
-        </span>
-      </div>
-    );
-  }
-
-  handleAddressClick = (event) => {
-    const { disableAddressClick } = this.props;
-
-    // Stop the event if address click is disallowed
-    if (disableAddressClick) {
-      return this.preventEvent(event);
-    }
-
-    return this.onClick(event);
-  }
-
-  handleKeyDown = (event) => {
-    const codeName = keycode(event);
-
-    if (event.ctrlKey) {
-      // Copy the selected address if nothing selected and there is
-      // a focused item
-      const isSelection = !window.getSelection || window.getSelection().type === 'Range';
-
-      if (codeName === 'c' && !isSelection) {
-        const element = ReactDOM.findDOMNode(this.refs.address);
-
-        // Copy the address from the right element
-        // @see https://developers.google.com/web/updates/2015/04/cut-and-copy-commands
-        try {
-          const range = document.createRange();
-
-          range.selectNode(element);
-          window.getSelection().addRange(range);
-          document.execCommand('copy');
-
-          try {
-            window.getSelection().removeRange(range);
-          } catch (e) {
-            window.getSelection().removeAllRanges();
-          }
-
-          this.setState({ copied: true }, () => {
-            window.setTimeout(() => {
-              this.setState({ copied: false });
-            }, 250);
-          });
-        } catch (e) {
-          console.warn('could not copy');
-        }
-      }
-
-      return event;
-    }
-  }
-
-  onClick = (event) => {
-    const { account, onClick } = this.props;
-
-    // Stop the default event if text is selected
-    if (window.getSelection && window.getSelection().type === 'Range') {
-      return this.preventEvent(event);
-    }
-
-    onClick && onClick(account.address);
-  }
-
-  onFocus = () => {
-    const { account, onFocus } = this.props;
-
-    onFocus && onFocus(account.index);
-  }
-
-  preventEvent = (event) => {
-    event.preventDefault();
-    event.stopPropagation();
-  }
-
-  setTagRef = (tagRef) => {
-    this.tagRefs.push(tagRef);
-  }
-}
diff --git a/js/src/ui/AccountCard/accountCard.spec.js b/js/src/ui/AccountCard/accountCard.spec.js
deleted file mode 100644
index 318434605c3b1f4d499ceec27e113155f03c79a4..0000000000000000000000000000000000000000
--- a/js/src/ui/AccountCard/accountCard.spec.js
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { ETH_TOKEN } from '~/util/tokens';
-
-import AccountCard from './';
-
-const TEST_ADDRESS = '0x1234567890123456789012345678901234567890';
-const TEST_NAME = 'Jimmy';
-
-let component;
-let onClick;
-let onFocus;
-
-function reduxStore () {
-  const getState = () => ({
-    balances: {},
-    tokens: {
-      [ETH_TOKEN.id]: ETH_TOKEN
-    }
-  });
-
-  return {
-    getState,
-    dispatch: () => null,
-    subscribe: () => null
-  };
-}
-
-function render (props = {}) {
-  if (!props.account) {
-    props.account = {
-      address: TEST_ADDRESS,
-      description: 'testDescription',
-      name: TEST_NAME,
-      meta: {
-        tags: [ 'tag 1', 'tag 2' ]
-      }
-    };
-  }
-
-  if (!props.balance) {
-    props.balance = {
-      [ETH_TOKEN.id]: new BigNumber(10)
-    };
-  }
-
-  onClick = sinon.stub();
-  onFocus = sinon.stub();
-
-  component = shallow(
-    <AccountCard
-      { ...props }
-      onClick={ onClick }
-      onFocus={ onFocus }
-    />
-  );
-
-  return component;
-}
-
-describe('ui/AccountCard', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('components', () => {
-    describe('Balance', () => {
-      let balance;
-
-      beforeEach(() => {
-        balance = component.find('Connect(Balance)').shallow({
-          context: { store: reduxStore() }
-        });
-      });
-
-      it('renders the balance', () => {
-        expect(balance.length).to.equal(1);
-      });
-
-      it('sets showOnlyEth', () => {
-        expect(balance.props().showOnlyEth).to.be.true;
-      });
-    });
-
-    describe('IdentityIcon', () => {
-      let icon;
-
-      beforeEach(() => {
-        icon = component.find('Connect(IdentityIcon)');
-      });
-
-      it('renders the icon', () => {
-        expect(icon.length).to.equal(1);
-      });
-
-      it('passes the address through', () => {
-        expect(icon.props().address).to.equal(TEST_ADDRESS);
-      });
-    });
-
-    describe('IdentityName', () => {
-      let name;
-
-      beforeEach(() => {
-        name = component.find('Connect(IdentityName)');
-      });
-
-      it('renders the name', () => {
-        expect(name.length).to.equal(1);
-      });
-
-      it('passes the address through', () => {
-        expect(name.props().address).to.equal(TEST_ADDRESS);
-      });
-
-      it('passes the name through', () => {
-        expect(name.props().name).to.equal(TEST_NAME);
-      });
-
-      it('renders unknown (no name)', () => {
-        expect(name.props().unknown).to.be.true;
-      });
-    });
-
-    describe('Tags', () => {
-      let tags;
-
-      beforeEach(() => {
-        tags = component.find('Tags');
-      });
-
-      it('renders the tags', () => {
-        expect(tags.length).to.equal(1);
-      });
-    });
-  });
-});
diff --git a/js/src/ui/AccountCard/index.js b/js/src/ui/AccountCard/index.js
deleted file mode 100644
index 8a741b5739f373051a64d9b5a24c0f98ae01995c..0000000000000000000000000000000000000000
--- a/js/src/ui/AccountCard/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './accountCard';
diff --git a/js/src/ui/Actionbar/Export/export.js b/js/src/ui/Actionbar/Export/export.js
deleted file mode 100644
index c5fd2f18a7254305fec6dda4c34d26382117f161..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Export/export.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import FileSaver from 'file-saver';
-
-import Button from '../../Button';
-import { FileDownloadIcon } from '../../Icons';
-
-class ActionbarExport extends Component {
-  static propTypes = {
-    content: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.object
-    ]).isRequired,
-    filename: PropTypes.string.isRequired,
-    className: PropTypes.string
-  }
-
-  render () {
-    const { className } = this.props;
-
-    return (
-      <Button
-        className={ className }
-        icon={ <FileDownloadIcon /> }
-        label={
-          <FormattedMessage
-            id='ui.actionbar.export.button.export'
-            defaultMessage='export'
-          />
-        }
-        onClick={ this.handleExport }
-      />
-    );
-  }
-
-  handleExport = () => {
-    const { filename, content } = this.props;
-    const text = JSON.stringify(content, null, 4);
-    const blob = new Blob([ text ], { type: 'application/json' });
-
-    FileSaver.saveAs(blob, `${filename}.json`);
-  }
-}
-
-export default ActionbarExport;
diff --git a/js/src/ui/Actionbar/Export/index.js b/js/src/ui/Actionbar/Export/index.js
deleted file mode 100644
index a949375cb2b625527b33dd3aa4cb56f22e58c10f..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Export/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './export';
diff --git a/js/src/ui/Actionbar/Import/import.css b/js/src/ui/Actionbar/Import/import.css
deleted file mode 100644
index 53a3e049acf40865df35a868aba27ae433c00bd3..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Import/import.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.desc {
-  margin-top: 0;
-  color: #ccc;
-}
diff --git a/js/src/ui/Actionbar/Import/import.js b/js/src/ui/Actionbar/Import/import.js
deleted file mode 100644
index a447be4cb1eac2a003009821ba56af38af8531a5..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Import/import.js
+++ /dev/null
@@ -1,250 +0,0 @@
-  // Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import Button from '../../Button';
-import FileSelect from '../../Form/FileSelect';
-import { CancelIcon, DoneIcon, FileUploadIcon } from '../../Icons';
-import Portal from '../../Portal';
-
-import styles from './import.css';
-
-const initialState = {
-  step: 0,
-  show: false,
-  validate: false,
-  validationBody: null,
-  error: false,
-  errorText: '',
-  content: ''
-};
-
-export default class ActionbarImport extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    onConfirm: PropTypes.func.isRequired,
-    renderValidation: PropTypes.func,
-    title: nodeOrStringProptype()
-  };
-
-  static defaultProps = {
-    title: (
-      <FormattedMessage
-        id='ui.actionbar.import.title'
-        defaultMessage='Import from a file'
-      />
-    )
-  };
-
-  state = Object.assign({}, initialState);
-
-  render () {
-    const { className } = this.props;
-
-    return (
-      <div>
-        <Button
-          className={ className }
-          icon={ <FileUploadIcon /> }
-          label={
-            <FormattedMessage
-              id='ui.actionbar.import.button.import'
-              defaultMessage='import'
-            />
-          }
-          onClick={ this.onOpenModal }
-        />
-        { this.renderModal() }
-      </div>
-    );
-  }
-
-  renderModal () {
-    const { title, renderValidation } = this.props;
-    const { show, step, error } = this.state;
-
-    if (!show) {
-      return null;
-    }
-
-    const steps = typeof renderValidation === 'function'
-      ? [
-        <FormattedMessage
-          id='ui.actionbar.import.step.select'
-          defaultMessage='select a file'
-        />,
-        error
-          ? (
-            <FormattedMessage
-              id='ui.actionbar.import.step.error'
-              defaultMessage='error'
-            />
-          )
-          : (
-            <FormattedMessage
-              id='ui.actionbar.import.step.validate'
-              defaultMessage='validate'
-            />)
-      ]
-      : null;
-
-    return (
-      <Portal
-        activeStep={ step }
-        buttons={ this.renderActions() }
-        onClose={ this.onCloseModal }
-        open
-        steps={ steps }
-        title={ title }
-      >
-        { this.renderBody() }
-      </Portal>
-    );
-  }
-
-  renderActions () {
-    const { validate, error } = this.state;
-
-    const cancelBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        key='cancel'
-        label={
-          <FormattedMessage
-            id='ui.actionbar.import.button.cancel'
-            defaultMessage='Cancel'
-          />
-        }
-        onClick={ this.onCloseModal }
-      />
-    );
-
-    if (error) {
-      return [ cancelBtn ];
-    }
-
-    if (validate) {
-      const confirmBtn = (
-        <Button
-          icon={ <DoneIcon /> }
-          key='confirm'
-          label={
-            <FormattedMessage
-              id='ui.actionbar.import.button.confirm'
-              defaultMessage='Confirm'
-            />
-          }
-          onClick={ this.onConfirm }
-        />
-      );
-
-      return [ cancelBtn, confirmBtn ];
-    }
-
-    return [ cancelBtn ];
-  }
-
-  renderBody () {
-    const { validate, errorText, error } = this.state;
-
-    if (error) {
-      return (
-        <div>
-          <p>
-            <FormattedMessage
-              id='ui.actionbar.import.error'
-              defaultMessage='An error occured: {errorText}'
-              values={ {
-                errorText
-              } }
-            />
-          </p>
-        </div>
-      );
-    }
-
-    if (validate) {
-      return this.renderValidation();
-    }
-
-    return (
-      <FileSelect onSelect={ this.onFileSelect } />
-    );
-  }
-
-  renderValidation () {
-    const { validationBody } = this.state;
-
-    return (
-      <div>
-        <p className={ styles.desc }>
-          <FormattedMessage
-            id='ui.actionbar.import.confirm'
-            defaultMessage='Confirm that this is what was intended to import.'
-          />
-        </p>
-        <div>
-          { validationBody }
-        </div>
-      </div>
-    );
-  }
-
-  onFileSelect = (file, content) => {
-    const { renderValidation } = this.props;
-
-    if (typeof renderValidation !== 'function') {
-      this.props.onConfirm(content);
-      return this.onCloseModal();
-    }
-
-    const validationBody = renderValidation(content);
-
-    if (validationBody && validationBody.error) {
-      return this.setState({
-        step: 1,
-        error: true,
-        errorText: validationBody.error
-      });
-    }
-
-    this.setState({
-      step: 1,
-      validate: true,
-      validationBody,
-      content
-    });
-  }
-
-  onConfirm = () => {
-    const { content } = this.state;
-
-    this.props.onConfirm(content);
-    return this.onCloseModal();
-  }
-
-  onOpenModal = () => {
-    this.setState({ show: true });
-  }
-
-  onCloseModal = () => {
-    this.setState(initialState);
-  }
-}
diff --git a/js/src/ui/Actionbar/Import/index.js b/js/src/ui/Actionbar/Import/index.js
deleted file mode 100644
index 52deb93f01d2e105698fe540373af99a5d57885d..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Import/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './import';
diff --git a/js/src/ui/Actionbar/Search/index.js b/js/src/ui/Actionbar/Search/index.js
deleted file mode 100644
index 2beda073a0323579109de629e7b2c6d111e0f80a..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Search/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './search';
diff --git a/js/src/ui/Actionbar/Search/search.css b/js/src/ui/Actionbar/Search/search.css
deleted file mode 100644
index 820dc23bf50f2545b39fca00018d60f5f80c743a..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Search/search.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.searchcontainer {
-  display: flex;
-  overflow: hidden;
-}
-
-.searchButton {
-  min-width: 50px !important;
-}
-
-.input {
-  width: 500px !important;
-}
-
-.inputContainer {
-  transition: width 450ms ease-in-out 0ms, height 0ms ease-in-out 0ms;
-  white-space: nowrap;
-  overflow: hidden;
-  width: 500px;
-  height: 100%;
-  position: relative;
-}
-
-.inputContainerShown {
-  transition: width 450ms ease-in-out 0ms, height 0ms ease-in-out 400ms;
-  width: 0;
-  height: 0;
-}
diff --git a/js/src/ui/Actionbar/Search/search.js b/js/src/ui/Actionbar/Search/search.js
deleted file mode 100644
index 9c0a4ca76f9f306e00a506e49aa4b756ce42efb5..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Search/search.js
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import Button from '../../Button';
-import InputChip from '../../Form/InputChip';
-import { SearchIcon } from '../../Icons';
-
-import styles from './search.css';
-
-export default class ActionbarSearch extends Component {
-  static propTypes = {
-    onChange: PropTypes.func.isRequired,
-    tokens: PropTypes.array
-  };
-
-  state = {
-    showSearch: false,
-    stateChanging: false,
-    inputValue: '',
-    timeoutIds: []
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const { tokens } = nextProps;
-
-    if (tokens.length > 0 && this.props.tokens.length === 0) {
-      this.handleOpenSearch(true, true);
-    }
-
-    if (tokens.length !== this.props.tokens.length) {
-      this.handleSearchChange(tokens);
-    }
-  }
-
-  componentWillUnmount () {
-    const { timeoutIds } = this.state;
-
-    if (timeoutIds.length > 0) {
-      timeoutIds.map(id => window.clearTimeout(id));
-    }
-  }
-
-  render () {
-    const { showSearch } = this.state;
-    const { tokens } = this.props;
-
-    const inputContainerClasses = [ styles.inputContainer ];
-
-    if (!showSearch) {
-      inputContainerClasses.push(styles.inputContainerShown);
-    }
-
-    return (
-      <div
-        className={ styles.searchcontainer }
-        key='searchAccount'
-      >
-        <div className={ inputContainerClasses.join(' ') }>
-          <InputChip
-            addOnBlur
-            className={ styles.input }
-            hint={
-              <FormattedMessage
-                id='ui.actionbar.search.hint'
-                defaultMessage='Enter search input...'
-              />
-            }
-            ref='inputChip'
-            tokens={ tokens }
-
-            onBlur={ this.handleSearchBlur }
-            onInputChange={ this.handleInputChange }
-            onTokensChange={ this.handleTokensChange }
-          />
-        </div>
-
-        <Button
-          className={ styles.searchButton }
-          icon={ <SearchIcon /> }
-          label=''
-          onClick={ this.handleSearchClick }
-        />
-      </div>
-    );
-  }
-
-  handleTokensChange = (tokens) => {
-    this.handleSearchChange(tokens);
-  }
-
-  handleInputChange = (inputValue) => {
-    this.setState({ inputValue }, () => {
-      this.handleSearchChange();
-    });
-  }
-
-  handleSearchChange = (searchTokens) => {
-    const { onChange, tokens } = this.props;
-    const { inputValue } = this.state;
-
-    const newSearchTokens = []
-      .concat(searchTokens || tokens);
-
-    const newSearchValues = []
-      .concat(searchTokens || tokens, inputValue);
-
-    onChange(newSearchTokens, newSearchValues);
-  }
-
-  handleSearchClick = () => {
-    const { showSearch } = this.state;
-
-    if (!showSearch) {
-      this.refs.inputChip.focus();
-    }
-
-    this.handleOpenSearch(!showSearch);
-  }
-
-  handleSearchBlur = () => {
-    const timeoutId = window.setTimeout(() => {
-      const { inputValue } = this.state;
-      const { tokens } = this.props;
-
-      if (tokens.length === 0 && inputValue.length === 0) {
-        this.handleOpenSearch(false);
-      }
-    }, 250);
-
-    this.setState({
-      timeoutIds: [].concat(this.state.timeoutIds, timeoutId)
-    });
-  }
-
-  handleOpenSearch = (showSearch, force) => {
-    if (this.state.stateChanging && !force) {
-      return false;
-    }
-
-    this.setState({
-      showSearch: showSearch,
-      stateChanging: true
-    });
-
-    const timeoutId = window.setTimeout(() => {
-      this.setState({ stateChanging: false });
-    }, 450);
-
-    this.setState({
-      timeoutIds: [].concat(this.state.timeoutIds, timeoutId)
-    });
-  }
-}
diff --git a/js/src/ui/Actionbar/Sort/index.js b/js/src/ui/Actionbar/Sort/index.js
deleted file mode 100644
index 7ccb2c7740e81791c68ac3dd128e6792b1da77bf..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Sort/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './sort';
diff --git a/js/src/ui/Actionbar/Sort/sort.css b/js/src/ui/Actionbar/Sort/sort.css
deleted file mode 100644
index c0046bc4e7cc5b400f6f7c38968761f87a7b3dff..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Sort/sort.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.sortButton {
-  min-width: 50px !important;
-}
diff --git a/js/src/ui/Actionbar/Sort/sort.js b/js/src/ui/Actionbar/Sort/sort.js
deleted file mode 100644
index 7fd775d122797008e009201b7537fde749ba4811..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Sort/sort.js
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { observer } from 'mobx-react';
-
-import IconMenu from 'material-ui/IconMenu';
-import MenuItem from 'material-ui/MenuItem';
-
-import SortIcon from 'material-ui/svg-icons/content/sort';
-
-import Button from '../../Button';
-
-import SortStore from './sortStore';
-import styles from './sort.css';
-
-@observer
-export default class ActionbarSort extends Component {
-  static propTypes = {
-    id: PropTypes.string.isRequired,
-    onChange: PropTypes.func.isRequired,
-
-    order: PropTypes.string,
-    showDefault: PropTypes.bool,
-    metas: PropTypes.array
-  };
-
-  static defaultProps = {
-    metas: [],
-    showDefault: true
-  }
-
-  store = new SortStore(this.props);
-
-  componentDidMount () {
-    this.store.restoreSavedOrder();
-  }
-
-  render () {
-    const { showDefault } = this.props;
-
-    return (
-      <IconMenu
-        iconButtonElement={
-          <Button
-            className={ styles.sortButton }
-            label=''
-            icon={ <SortIcon /> }
-            onClick={ this.store.handleMenuOpen }
-          />
-        }
-        open={ this.store.menuOpen }
-        onRequestChange={ this.store.handleMenuChange }
-        onItemTouchTap={ this.store.handleSortChange }
-        targetOrigin={ { horizontal: 'right', vertical: 'top' } }
-        anchorOrigin={ { horizontal: 'right', vertical: 'top' } }
-        touchTapCloseDelay={ 0 }
-      >
-        {
-          showDefault
-            ? this.renderMenuItem('', (
-              <FormattedMessage
-                id='ui.actionbar.sort.typeDefault'
-                defaultMessage='Default'
-              />
-            ))
-            : null
-        }
-        {
-          this.renderMenuItem('tags', (
-            <FormattedMessage
-              id='ui.actionbar.sort.typeTags'
-              defaultMessage='Sort by tags'
-            />
-          ))
-        }
-        {
-          this.renderMenuItem('name', (
-            <FormattedMessage
-              id='ui.actionbar.sort.typeName'
-              defaultMessage='Sort by name'
-            />
-          ))
-        }
-        {
-          this.renderMenuItem('eth', (
-            <FormattedMessage
-              id='ui.actionbar.sort.typeEth'
-              defaultMessage='Sort by ETH'
-            />
-          ))
-        }
-
-        { this.renderSortByMetas() }
-      </IconMenu>
-    );
-  }
-
-  renderSortByMetas () {
-    const { metas } = this.props;
-
-    return metas
-      .map((meta, index) => {
-        const label = (
-          <FormattedMessage
-            id='ui.actionbar.sort.sortBy'
-            defaultMessage='Sort by {label}'
-            values={ {
-              label: meta.label
-            } }
-          />
-        );
-
-        return this.renderMenuItem(meta.key, label, index);
-      });
-  }
-
-  renderMenuItem (value, label, key = null) {
-    const { order } = this.props;
-
-    const props = {};
-
-    if (key !== null) {
-      props.key = key;
-    }
-
-    const checked = order === value;
-
-    return (
-      <MenuItem
-        checked={ checked }
-        value={ value }
-        primaryText={ label }
-        innerDivStyle={ {
-          paddingLeft: checked ? 50 : 16
-        } }
-        { ...props }
-      />
-    );
-  }
-}
diff --git a/js/src/ui/Actionbar/Sort/sortStore.js b/js/src/ui/Actionbar/Sort/sortStore.js
deleted file mode 100644
index ae02a34cb2d22cebcb573e8ab4ab9e3cb7e5f516..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/Sort/sortStore.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-import store from 'store';
-
-const LS_STORE_KEY = '_parity::sortStore';
-
-export default class SortStore {
-  @observable menuOpen = false;
-
-  constructor (props) {
-    const { id, onChange } = props;
-
-    this.onChange = onChange;
-    this.id = id;
-  }
-
-  @action handleMenuOpen = () => {
-    this.menuOpen = true;
-  }
-
-  @action handleMenuChange = (open) => {
-    this.menuOpen = open;
-  }
-
-  @action handleSortChange = (event, child) => {
-    const order = child.props.value;
-
-    this.onChange(order);
-    this.saveOrder(order);
-  }
-
-  @action restoreSavedOrder = () => {
-    const order = this.getSavedOrder();
-
-    if (order) {
-      this.onChange(order);
-    }
-  }
-
-  getSavedOrder = () => {
-    return (this.getSavedOrders())[this.id];
-  }
-
-  getSavedOrders = () => {
-    return store.get(LS_STORE_KEY) || {};
-  }
-
-  setSavedOrders = (orders) => {
-    store.set(LS_STORE_KEY, orders);
-  }
-
-  saveOrder = (order) => {
-    const orders = {
-      ...this.getSavedOrders(),
-      [ this.id ]: order
-    };
-
-    this.setSavedOrders(orders);
-  }
-}
diff --git a/js/src/ui/Actionbar/actionbar.css b/js/src/ui/Actionbar/actionbar.css
deleted file mode 100644
index 0fcd4450fed82707ebab1b13cd46299f92809bc8..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/actionbar.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.actionbar {
-  padding: 0 24px !important;
-  margin-bottom: 0;
-  height: auto !important;
-  background: rgba(0, 0, 0, 0.25) !important;
-}
-
-.tooltitle {
-  text-transform: uppercase;
-  color: white;
-}
-
-.toolbuttons {
-  overflow: hidden;
-
-  button {
-    margin: 10px 0 10px 16px !important;
-
-    &:not([disabled]) {
-      color: white !important;
-
-      svg {
-        fill: white !important;
-      }
-    }
-  }
-}
diff --git a/js/src/ui/Actionbar/actionbar.js b/js/src/ui/Actionbar/actionbar.js
deleted file mode 100644
index 7e5c40fbbe7fbd301b9e634e03074d5bf126a5b4..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/actionbar.js
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isEqual } from 'lodash';
-import React, { Component, PropTypes } from 'react';
-import ReactDOM from 'react-dom';
-import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './actionbar.css';
-
-export default class Actionbar extends Component {
-  buttons = {};
-  buttonsTooltip = {};
-
-  static propTypes = {
-    title: nodeOrStringProptype(),
-    buttons: PropTypes.array,
-    children: PropTypes.node,
-    className: PropTypes.string,
-    health: PropTypes.node
-  };
-
-  static defaultProps = {
-    buttons: []
-  };
-
-  state = {
-    buttons: []
-  };
-
-  componentWillMount () {
-    this.setButtons(this.props);
-
-    window.addEventListener('resize', this.checkButtonsTooltip);
-  }
-
-  componentWillUnmount () {
-    window.removeEventListener('resize', this.checkButtonsTooltip);
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (!isEqual(this.props.buttons, nextProps.buttons)) {
-      this.setButtons(nextProps);
-    }
-  }
-
-  render () {
-    const { children, className } = this.props;
-    const classes = `${styles.actionbar} ${className}`;
-
-    return (
-      <Toolbar className={ classes }>
-        { this.renderTitle() }
-        { this.renderButtons() }
-        { children }
-      </Toolbar>
-    );
-  }
-
-  renderButtons () {
-    const { buttons } = this.state;
-
-    if (buttons.length === 0) {
-      return null;
-    }
-
-    return (
-      <ToolbarGroup className={ styles.toolbuttons }>
-        { buttons }
-      </ToolbarGroup>
-    );
-  }
-
-  renderTitle () {
-    const { title } = this.props;
-
-    return (
-      <h3 className={ styles.tooltitle }>
-        { title }
-      </h3>
-    );
-  }
-
-  checkButtonsTooltip = () => {
-    const buttonsTooltip = Object.keys(this.buttons)
-      .reduce((buttonsTooltip, index) => {
-        buttonsTooltip[index] = this.checkButtonTooltip(this.buttons[index]);
-        return buttonsTooltip;
-      }, {});
-
-    if (isEqual(buttonsTooltip, this.buttonsTooltip)) {
-      return;
-    }
-
-    this.buttonsTooltip = buttonsTooltip;
-    this.setButtons(this.props);
-  }
-
-  checkButtonTooltip = (button) => {
-    const { icon, text } = button;
-    const iconBoundings = icon.getBoundingClientRect();
-    const textBoundings = text.getBoundingClientRect();
-
-    // Visible if the bottom  of the text is above the bottom of the
-    // button (text is v-aligned on top)
-    const isTextVisible = textBoundings.top + textBoundings.height < iconBoundings.top + iconBoundings.height;
-
-    return !isTextVisible;
-  }
-
-  /**
-   * Return the icon and text nodes of a Button
-   * (and SVG/IMG for the icon next to a span node)
-   */
-  getIconAndTextNodes (element) {
-    if (!element || !element.children || element.children.length === 0) {
-      return null;
-    }
-
-    const children = Array.slice(element.children);
-    const text = children.find((child) => child.nodeName.toLowerCase() === 'span');
-    const icon = children.find((child) => {
-      const nodeName = child.nodeName.toLowerCase();
-
-      return nodeName === 'svg' || nodeName === 'img';
-    });
-
-    if (icon && text) {
-      return { icon, text };
-    }
-
-    const result = children
-      .map((child) => {
-        return this.getIconAndTextNodes(child);
-      })
-      .filter((result) => result);
-
-    return result.length > 0
-      ? result[0]
-      : null;
-  }
-
-  /**
-   * Add tooltip to all Buttons
-   */
-  patchButton (element, extraProps) {
-    if (element.type.displayName !== 'Button') {
-      if (!element.props.children) {
-        return element;
-      }
-
-      const children = this.patchButton(element.props.children);
-
-      return React.cloneElement(element, {}, children);
-    }
-
-    return React.cloneElement(element, extraProps);
-  }
-
-  setButtons (props) {
-    const buttons = props.buttons
-      .filter((button) => button)
-      .map((button, index) => {
-        const ref = this.setButtonRef.bind(this, index);
-        const showTooltip = this.buttonsTooltip[index];
-
-        return this.patchButton(button, { tooltip: showTooltip, ref });
-      });
-
-    this.setState({ buttons });
-  }
-
-  setButtonRef = (index, element) => {
-    const node = ReactDOM.findDOMNode(element);
-    const iconAndText = this.getIconAndTextNodes(node);
-
-    if (!iconAndText) {
-      return;
-    }
-
-    if (!this.buttons[index]) {
-      this.buttonsTooltip[index] = this.checkButtonTooltip(iconAndText);
-      this.setButtons(this.props);
-    }
-
-    this.buttons[index] = iconAndText;
-  };
-}
diff --git a/js/src/ui/Actionbar/actionbar.spec.js b/js/src/ui/Actionbar/actionbar.spec.js
deleted file mode 100644
index 1129f06a17f1ec10219956938351cc820349bc98..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/actionbar.spec.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import Actionbar from './actionbar';
-
-function renderShallow (props) {
-  return shallow(
-    <Actionbar { ...props } />
-  );
-}
-
-describe('ui/Actionbar', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(renderShallow()).to.be.ok;
-    });
-
-    it('renders with the specified className', () => {
-      expect(renderShallow({ className: 'testClass' })).to.have.className('testClass');
-    });
-  });
-});
diff --git a/js/src/ui/Actionbar/index.js b/js/src/ui/Actionbar/index.js
deleted file mode 100644
index a057ff73033d209c2897d4f340946f3d72fb2055..0000000000000000000000000000000000000000
--- a/js/src/ui/Actionbar/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export Export from './Export';
-export Import from './Import';
-export Search from './Search';
-export Sort from './Sort';
-
-export default from './actionbar';
diff --git a/js/src/ui/Badge/badge.css b/js/src/ui/Badge/badge.css
deleted file mode 100644
index ec9d30c47adb2ff1a608e51a5171cb4b2af98e28..0000000000000000000000000000000000000000
--- a/js/src/ui/Badge/badge.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.bubble {
-  border-radius: 50%;
-  padding: 3px 5px;
-  color: white;
-  font-size: 0.7em;
-  line-height: 1em;
-}
-
-.default {
-  background: #555;
-}
-
-.red {
-  background: red;
-}
-
-.green {
-  background: green;
-}
diff --git a/js/src/ui/Badge/badge.js b/js/src/ui/Badge/badge.js
deleted file mode 100644
index 69a309098b21f7dd280a2928b4560da10df1b96b..0000000000000000000000000000000000000000
--- a/js/src/ui/Badge/badge.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './badge.css';
-
-export default class Badge extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    color: PropTypes.string,
-    value: PropTypes.any
-  };
-
-  render () {
-    const { className, color, value } = this.props;
-    const classes = `${styles.bubble} ${styles[color || 'default']} ${className}`;
-
-    return (
-      <div className={ classes }>
-        { value }
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/Badge/badge.spec.js b/js/src/ui/Badge/badge.spec.js
deleted file mode 100644
index 82d47196e095776e5e34d4f1d88c570b7f1eee5f..0000000000000000000000000000000000000000
--- a/js/src/ui/Badge/badge.spec.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import Badge from './badge';
-
-function renderShallow (props) {
-  return shallow(
-    <Badge { ...props } />
-  );
-}
-
-describe('ui/Badge', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(renderShallow()).to.be.ok;
-    });
-
-    it('renders with the specified className', () => {
-      expect(renderShallow({ className: 'testClass' })).to.have.className('testClass');
-    });
-  });
-});
diff --git a/js/src/ui/Badge/index.js b/js/src/ui/Badge/index.js
deleted file mode 100644
index 749281ca82f981ab6c201f781990f3e922ae7bb9..0000000000000000000000000000000000000000
--- a/js/src/ui/Badge/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './badge';
diff --git a/js/src/ui/Balance/balance.css b/js/src/ui/Balance/balance.css
deleted file mode 100644
index 1176cafea6b884cf74cd82110cb38e5b3dfd7ba1..0000000000000000000000000000000000000000
--- a/js/src/ui/Balance/balance.css
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.balances {
-  display: flex;
-  flex-wrap: wrap;
-  margin: 0.75em 0 0 0;
-  vertical-align: top;
-
-  &:not(.full) {
-    height: 2.5em;
-    overflow: hidden;
-  }
-}
-
-.balance,
-.empty {
-  margin: 0.75em 0.5em 4px 0;
-}
-
-.empty {
-  min-height: 24px;
-  line-height: 24px;
-  opacity: 0.25;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.balance {
-  align-items: center;
-  border-radius: 16px;
-  display: flex;
-  max-height: 24px;
-  max-width: 100%;
-
-  &.full {
-    background: rgba(255, 255, 255, 0.07);
-
-    img {
-      margin-right: 1em;
-    }
-  }
-
-  img {
-    height: 32px;
-    margin-top: -4px;
-    width: 32px;
-  }
-
-  .tag {
-    padding-right: 0.75rem;
-    font-size: 0.85em;
-  }
-
-  .value {
-    margin: 0 0.5em 0 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
diff --git a/js/src/ui/Balance/balance.js b/js/src/ui/Balance/balance.js
deleted file mode 100644
index c6ed41f87aadce1ba66bad86e323040fd9f09357..0000000000000000000000000000000000000000
--- a/js/src/ui/Balance/balance.js
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import TokenImage from '~/ui/TokenImage';
-
-import styles from './balance.css';
-
-export class Balance extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  };
-
-  static propTypes = {
-    balance: PropTypes.object.isRequired,
-    tokens: PropTypes.object.isRequired,
-    address: PropTypes.string,
-    className: PropTypes.string,
-    showOnlyEth: PropTypes.bool,
-    showZeroValues: PropTypes.bool
-  };
-
-  static defaultProps = {
-    showOnlyEth: false,
-    showZeroValues: false
-  };
-
-  render () {
-    const { balance, className, showOnlyEth, tokens } = this.props;
-
-    if (Object.keys(balance).length === 0) {
-      return null;
-    }
-
-    let body = Object.keys(balance)
-      .map((tokenId) => {
-        const token = tokens[tokenId];
-        const balanceValue = balance[tokenId];
-
-        const isEthToken = token.native;
-        const isFullToken = !showOnlyEth || isEthToken;
-        const hasBalance = (balanceValue instanceof BigNumber) && balanceValue.gt(0);
-
-        if (!hasBalance && !isEthToken) {
-          return null;
-        }
-
-        const bnf = new BigNumber(token.format || 1);
-        let decimals = 0;
-
-        if (bnf.gte(1000)) {
-          decimals = 3;
-        } else if (bnf.gte(100)) {
-          decimals = 2;
-        } else if (bnf.gte(10)) {
-          decimals = 1;
-        }
-
-        const value = new BigNumber(balanceValue).div(bnf).toFormat(decimals);
-
-        const classNames = [styles.balance];
-        let details = null;
-
-        if (isFullToken) {
-          classNames.push(styles.full);
-          details = [
-            <div
-              className={ styles.value }
-              key='value'
-            >
-              <span title={ value }>
-                { value }
-              </span>
-            </div>,
-            <div
-              className={ styles.tag }
-              key='tag'
-            >
-              { token.tag }
-            </div>
-          ];
-        }
-
-        return (
-          <div
-            className={ classNames.join(' ') }
-            key={ tokenId }
-          >
-            <TokenImage token={ token } />
-            { details }
-          </div>
-        );
-      })
-      .filter((node) => node);
-
-    if (!body.length) {
-      body = (
-        <div className={ styles.empty }>
-          <FormattedMessage
-            id='ui.balance.none'
-            defaultMessage='No balances associated with this account'
-          />
-        </div>
-      );
-    }
-
-    return (
-      <div
-        className={
-          [
-            styles.balances,
-            showOnlyEth
-              ? ''
-              : styles.full,
-            className
-          ].join(' ')
-        }
-      >
-        { body }
-      </div>
-    );
-  }
-}
-
-function mapStateToProps (state, props) {
-  const { balances, tokens } = state;
-  const { address } = props;
-
-  return {
-    balance: balances[address] || props.balance || {},
-    tokens
-  };
-}
-
-export default connect(mapStateToProps)(Balance);
diff --git a/js/src/ui/Balance/balance.spec.js b/js/src/ui/Balance/balance.spec.js
deleted file mode 100644
index d5601a489fb269b15706ff55e4a73543dbfb9a58..0000000000000000000000000000000000000000
--- a/js/src/ui/Balance/balance.spec.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import apiutil from '~/api/util';
-
-import { Balance } from './balance';
-
-const TOKENS = {
-  'eth': { tag: 'ETH' },
-  'gav': { tag: 'GAV', format: 1 },
-  'tst': { tag: 'TST', format: 1 }
-};
-
-const BALANCE = {
-  'eth': new BigNumber(122),
-  'gav': new BigNumber(345),
-  'tst': new BigNumber(0)
-};
-
-let api;
-let component;
-
-function createApi () {
-  api = {
-    dappsUrl: 'http://testDapps:1234/',
-    util: apiutil
-  };
-
-  return api;
-}
-
-function render (props = {}) {
-  if (!props.balance) {
-    props.balance = BALANCE;
-  }
-
-  if (!props.tokens) {
-    props.tokens = TOKENS;
-  }
-
-  const api = createApi();
-
-  component = shallow(
-    <Balance
-      className='testClass'
-      { ...props }
-    />,
-    {
-      context: { api }
-    }
-  );
-
-  return component;
-}
-
-describe('ui/Balance', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('passes the specified className', () => {
-    expect(component.hasClass('testClass')).to.be.true;
-  });
-
-  it('renders all the non-zero balances', () => {
-    expect(component.find('Connect(TokenImage)')).to.have.length(2);
-  });
-
-  describe('render specifiers', () => {
-    it('renders all the tokens with showZeroValues', () => {
-      render({ showZeroValues: true });
-      expect(component.find('Connect(TokenImage)')).to.have.length(2);
-    });
-  });
-});
diff --git a/js/src/ui/Balance/index.js b/js/src/ui/Balance/index.js
deleted file mode 100644
index 3ec318556098b9610061502f02e39d180aa6d085..0000000000000000000000000000000000000000
--- a/js/src/ui/Balance/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './balance';
diff --git a/js/src/ui/BlockStatus/blockStatus.css b/js/src/ui/BlockStatus/blockStatus.css
deleted file mode 100644
index d5e8a655d0653011f14cd1d8170da6e31a903adf..0000000000000000000000000000000000000000
--- a/js/src/ui/BlockStatus/blockStatus.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.blockNumber {
-}
-
-.syncStatus {
-}
diff --git a/js/src/ui/BlockStatus/blockStatus.js b/js/src/ui/BlockStatus/blockStatus.js
deleted file mode 100644
index 0c11fec19e514ad9da00b30fd0da57810d1b12a5..0000000000000000000000000000000000000000
--- a/js/src/ui/BlockStatus/blockStatus.js
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import styles from './blockStatus.css';
-
-class BlockStatus extends Component {
-  static propTypes = {
-    blockNumber: PropTypes.object,
-    syncing: PropTypes.oneOfType([
-      PropTypes.bool,
-      PropTypes.object
-    ])
-  }
-
-  render () {
-    const { blockNumber, syncing } = this.props;
-
-    if (!blockNumber) {
-      return null;
-    }
-
-    if (!syncing) {
-      return (
-        <div className={ styles.blockNumber }>
-          <FormattedMessage
-            id='ui.blockStatus.bestBlock'
-            defaultMessage='{blockNumber} best block'
-            values={ {
-              blockNumber: blockNumber.toFormat()
-            } }
-          />
-        </div>
-      );
-    }
-
-    if (syncing.warpChunksAmount && syncing.warpChunksProcessed && !syncing.warpChunksAmount.eq(syncing.warpChunksProcessed)) {
-      return (
-        <div className={ styles.syncStatus }>
-          <FormattedMessage
-            id='ui.blockStatus.warpRestore'
-            defaultMessage='{percentage}% warp restore'
-            values={ {
-              percentage: syncing.warpChunksProcessed.mul(100).div(syncing.warpChunksAmount).toFormat(2)
-            } }
-          />
-        </div>
-      );
-    }
-
-    let syncStatus = null;
-    let warpStatus = null;
-
-    if (syncing.currentBlock && syncing.highestBlock) {
-      syncStatus = (
-        <span>
-          <FormattedMessage
-            id='ui.blockStatus.syncStatus'
-            defaultMessage='{currentBlock}/{highestBlock} syncing'
-            values={ {
-              currentBlock: syncing.currentBlock.toFormat(),
-              highestBlock: syncing.highestBlock.toFormat()
-            } }
-          />
-        </span>
-      );
-    }
-
-    if (syncing.blockGap) {
-      const [first, last] = syncing.blockGap;
-
-      warpStatus = (
-        <span>
-          <FormattedMessage
-            id='ui.blockStatus.warpStatus'
-            defaultMessage=', {percentage}% historic'
-            values={ {
-              percentage: first.mul(100).div(last).toFormat(2)
-            } }
-          />
-        </span>
-      );
-    }
-
-    return (
-      <div className={ styles.syncStatus }>
-        { syncStatus }
-        { warpStatus }
-      </div>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { blockNumber, syncing } = state.nodeStatus;
-
-  return {
-    blockNumber,
-    syncing
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(BlockStatus);
diff --git a/js/src/ui/BlockStatus/blockStatus.spec.js b/js/src/ui/BlockStatus/blockStatus.spec.js
deleted file mode 100644
index 277c286c59d4a8f3129fd2cadcb126fbb15e3783..0000000000000000000000000000000000000000
--- a/js/src/ui/BlockStatus/blockStatus.spec.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import BlockStatus from './';
-
-let component;
-
-function createRedux (syncing = false, blockNumber = new BigNumber(123)) {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        nodeStatus: {
-          blockNumber,
-          syncing
-        }
-      };
-    }
-  };
-}
-
-function render (reduxStore = createRedux(), props) {
-  component = shallow(
-    <BlockStatus { ...props } />,
-    { context: { store: reduxStore } }
-  ).find('BlockStatus').shallow();
-
-  return component;
-}
-
-describe('ui/BlockStatus', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  it('renders null with no blockNumber', () => {
-    expect(render(createRedux(false, null)).find('div')).to.have.length(0);
-  });
-
-  it('renders only the best block when syncing === false', () => {
-    const messages = render().find('FormattedMessage');
-
-    expect(messages).to.have.length(1);
-    expect(messages).to.have.id('ui.blockStatus.bestBlock');
-  });
-
-  it('renders only the warp restore status when restoring', () => {
-    const messages = render(createRedux({
-      warpChunksAmount: new BigNumber(100),
-      warpChunksProcessed: new BigNumber(5)
-    })).find('FormattedMessage');
-
-    expect(messages).to.have.length(1);
-    expect(messages).to.have.id('ui.blockStatus.warpRestore');
-  });
-
-  it('renders the current/highest when syncing', () => {
-    const messages = render(createRedux({
-      currentBlock: new BigNumber(123),
-      highestBlock: new BigNumber(456)
-    })).find('FormattedMessage');
-
-    expect(messages).to.have.length(1);
-    expect(messages).to.have.id('ui.blockStatus.syncStatus');
-  });
-
-  it('renders warp blockGap when catching up', () => {
-    const messages = render(createRedux({
-      blockGap: [new BigNumber(123), new BigNumber(456)]
-    })).find('FormattedMessage');
-
-    expect(messages).to.have.length(1);
-    expect(messages).to.have.id('ui.blockStatus.warpStatus');
-  });
-});
diff --git a/js/src/ui/BlockStatus/index.js b/js/src/ui/BlockStatus/index.js
deleted file mode 100644
index 904ad512de21b4df29ab0537fa50c674e73a3227..0000000000000000000000000000000000000000
--- a/js/src/ui/BlockStatus/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './blockStatus';
diff --git a/js/src/ui/Button/button.css b/js/src/ui/Button/button.css
deleted file mode 100644
index 45c235929ff1351451a3a66a9401e8926e8787a5..0000000000000000000000000000000000000000
--- a/js/src/ui/Button/button.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.tooltip {
-  text-transform: uppercase;
-}
diff --git a/js/src/ui/Button/button.js b/js/src/ui/Button/button.js
deleted file mode 100644
index fe4343df7dc1511a1278a327f99327122dcf35d2..0000000000000000000000000000000000000000
--- a/js/src/ui/Button/button.js
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import ReactTooltip from 'react-tooltip';
-import { FlatButton } from 'material-ui';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './button.css';
-
-let id = 0;
-
-export default class Button extends Component {
-  static propTypes = {
-    backgroundColor: PropTypes.string,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    icon: PropTypes.node,
-    label: nodeOrStringProptype(),
-    onClick: PropTypes.func,
-    primary: PropTypes.bool,
-    tooltip: PropTypes.bool
-  };
-
-  static defaultProps = {
-    primary: true,
-    tooltip: false
-  };
-
-  componentWillMount () {
-    this.id = id++;
-  }
-
-  render () {
-    const { className, backgroundColor, disabled, icon, label, primary, onClick, tooltip } = this.props;
-    const button = (
-      <FlatButton
-        backgroundColor={ backgroundColor }
-        className={ className }
-        disabled={ disabled }
-        icon={ icon }
-        label={ label }
-        onTouchTap={ onClick }
-        primary={ primary }
-      />
-    );
-
-    if (!tooltip) {
-      return button;
-    }
-
-    return (
-      <div>
-        <div
-          data-tip
-          data-for={ `button_${this.id}` }
-          data-effect='solid'
-          data-place='bottom'
-        >
-          { button }
-        </div>
-        <ReactTooltip id={ `button_${this.id}` }>
-          <div className={ styles.tooltip }>
-            { label }
-          </div>
-        </ReactTooltip>
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/Button/button.spec.js b/js/src/ui/Button/button.spec.js
deleted file mode 100644
index d7c854529ede23182b6af1512a8e923b039921b6..0000000000000000000000000000000000000000
--- a/js/src/ui/Button/button.spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import Button from './button';
-
-function render (props = {}) {
-  if (props && props.label === undefined) {
-    props.label = 'test';
-  }
-
-  return shallow(
-    <Button { ...props } />
-  );
-}
-
-describe('ui/Button', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(render()).to.be.ok;
-    });
-
-    it('renders with the specified className', () => {
-      expect(render({ className: 'testClass' })).to.have.className('testClass');
-    });
-  });
-});
diff --git a/js/src/ui/Button/index.js b/js/src/ui/Button/index.js
deleted file mode 100644
index 0c2be07ee37bab6a47298e29240a8ebdb094b646..0000000000000000000000000000000000000000
--- a/js/src/ui/Button/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './button';
diff --git a/js/src/ui/Certifications/certifications.css b/js/src/ui/Certifications/certifications.css
deleted file mode 100644
index 4d1944b2509ce61e9376353b860d39de2c69db2f..0000000000000000000000000000000000000000
--- a/js/src/ui/Certifications/certifications.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.certifications {
-  margin-top: 0.75em;
-}
-
-.certification,
-.certificationIcon {
-  border-radius: 1em;
-  display: inline-block;
-  line-height: 1em;
-  position: relative;
-
-  .icon {
-    width: 2em;
-    height: 2em;
-    margin: 0;
-    padding: 0;
-    border-radius: 1em;
-  }
-}
-
-.certificationIcon {
-  margin-left: 0.5em;
-}
-
-.certification {
-  background-color: rgba(255, 255, 255, 0.07);
-  margin-right: 0.5em;
-  margin-top: 1em;
-  padding: 0.3em 0.6em 0.2em 3em;
-  text-transform: uppercase;
-
-  &:last-child {
-    margin-right: 0;
-  }
-
-  .icon {
-    position: absolute;
-    top: -0.25em;
-    left: 0;
-  }
-}
diff --git a/js/src/ui/Certifications/certifications.js b/js/src/ui/Certifications/certifications.js
deleted file mode 100644
index 0693cf2d73195eab33525afe9db6c95c6c4ed822..0000000000000000000000000000000000000000
--- a/js/src/ui/Certifications/certifications.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import { hashToImageUrl } from '~/redux/providers/imagesReducer';
-
-import defaultIcon from '../../../assets/images/certifications/unknown.svg';
-
-import styles from './certifications.css';
-
-class Certifications extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    certifications: PropTypes.array.isRequired,
-    className: PropTypes.string,
-    dappsUrl: PropTypes.string.isRequired,
-    showOnlyIcon: PropTypes.bool
-  }
-
-  render () {
-    const { certifications, className } = this.props;
-
-    if (certifications.length === 0) {
-      return null;
-    }
-
-    return (
-      <div className={ [styles.certifications, className].join(' ') }>
-        { certifications.map(this.renderCertification) }
-      </div>
-    );
-  }
-
-  renderCertification = (certification) => {
-    const { name, icon } = certification;
-    const { dappsUrl, showOnlyIcon } = this.props;
-
-    const classNames = [
-      showOnlyIcon
-        ? styles.certificationIcon
-        : styles.certification,
-      !icon
-        ? styles.noIcon
-        : ''
-    ];
-
-    return (
-      <div
-        className={ classNames.join(' ') }
-        key={ name }
-      >
-        <img
-          className={ styles.icon }
-          src={
-            icon
-              ? `${dappsUrl}${hashToImageUrl(icon)}`
-              : defaultIcon
-          }
-        />
-        { this.renderCertificationName(certification) }
-      </div>
-    );
-  }
-
-  renderCertificationName = (certification) => {
-    const { showOnlyIcon } = this.props;
-    const { name, title } = certification;
-
-    if (showOnlyIcon) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.text }>
-        { title || name }
-      </div>
-    );
-  }
-}
-
-function mapStateToProps (_, initProps) {
-  const { address } = initProps;
-
-  return (state) => {
-    const certifications = state.certifications[address] || [];
-    const dappsUrl = state.api.dappsUrl;
-
-    return { certifications, dappsUrl };
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(Certifications);
diff --git a/js/src/ui/Certifications/index.js b/js/src/ui/Certifications/index.js
deleted file mode 100644
index d30dde2554ce23b2938ea30eacb1b33d57826879..0000000000000000000000000000000000000000
--- a/js/src/ui/Certifications/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './certifications';
diff --git a/js/src/ui/ConfirmDialog/confirmDialog.css b/js/src/ui/ConfirmDialog/confirmDialog.css
deleted file mode 100644
index 20e5f3cea2f618f896b04b195a76e588e78f57bc..0000000000000000000000000000000000000000
--- a/js/src/ui/ConfirmDialog/confirmDialog.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.body {
-  text-align: center;
-}
diff --git a/js/src/ui/ConfirmDialog/confirmDialog.js b/js/src/ui/ConfirmDialog/confirmDialog.js
deleted file mode 100644
index 86f668a28b0a34c873423348381ab59d62af1b0b..0000000000000000000000000000000000000000
--- a/js/src/ui/ConfirmDialog/confirmDialog.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import Button from '../Button';
-import Portal from '../Portal';
-import { CancelIcon, CheckIcon } from '../Icons';
-
-import styles from './confirmDialog.css';
-
-const DEFAULT_NO = (
-  <FormattedMessage
-    id='ui.confirmDialog.no'
-    defaultMessage='no'
-  />
-);
-const DEFAULT_YES = (
-  <FormattedMessage
-    id='ui.confirmDialog.yes'
-    defaultMessage='yes'
-  />
-);
-
-export default class ConfirmDialog extends Component {
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-    className: PropTypes.string,
-    disabledConfirm: PropTypes.bool,
-    disabledDeny: PropTypes.bool,
-    busy: PropTypes.bool,
-    iconConfirm: PropTypes.node,
-    iconDeny: PropTypes.node,
-    labelConfirm: PropTypes.string,
-    labelDeny: PropTypes.string,
-    onConfirm: PropTypes.func.isRequired,
-    onDeny: PropTypes.func.isRequired,
-    open: PropTypes.bool,
-    title: nodeOrStringProptype().isRequired,
-    visible: PropTypes.bool
-  }
-
-  render () {
-    const { busy, children, className, disabledConfirm, disabledDeny, iconConfirm, iconDeny, labelConfirm, labelDeny, onConfirm, onDeny, open, title, visible } = this.props;
-
-    // TODO: visible is for compatibility with existing, open aligns with Portal.
-    // (Cleanup once all uses of ConfirmDialog has been migrated)
-    if (!visible && !open) {
-      return null;
-    }
-
-    return (
-      <Portal
-        buttons={ [
-          <Button
-            disabled={ disabledDeny || busy }
-            icon={ iconDeny || <CancelIcon /> }
-            key='deny'
-            label={ labelDeny || DEFAULT_NO }
-            onClick={ onDeny }
-          />,
-          <Button
-            disabled={ disabledConfirm || busy }
-            icon={ iconConfirm || <CheckIcon /> }
-            key='confirm'
-            label={ labelConfirm || DEFAULT_YES }
-            onClick={ onConfirm }
-          />
-        ] }
-        busy={ busy }
-        className={ className }
-        isSmallModal
-        onClose={ onDeny }
-        title={ title }
-        open
-      >
-        <div className={ styles.body }>
-          { children }
-        </div>
-      </Portal>
-    );
-  }
-}
diff --git a/js/src/ui/ConfirmDialog/confirmDialog.spec.js b/js/src/ui/ConfirmDialog/confirmDialog.spec.js
deleted file mode 100644
index cdc1e8be8e3106c9f7130198e6faad167eb9f0e7..0000000000000000000000000000000000000000
--- a/js/src/ui/ConfirmDialog/confirmDialog.spec.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import ConfirmDialog from './';
-
-let component;
-let onConfirm;
-let onDeny;
-
-function render (props = {}) {
-  onConfirm = sinon.stub();
-  onDeny = sinon.stub();
-
-  if (props.open === undefined) {
-    props.open = true;
-  }
-
-  component = shallow(
-    <ConfirmDialog
-      { ...props }
-      title='test title'
-      onConfirm={ onConfirm }
-      onDeny={ onDeny }
-    >
-      <div id='testContent'>
-        some test content
-      </div>
-    </ConfirmDialog>
-  );
-
-  return component;
-}
-
-describe('ui/ConfirmDialog', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('renders the body as provided', () => {
-    expect(component.find('div[id="testContent"]').text()).to.equal('some test content');
-  });
-
-  describe('Portal properties', () => {
-    let props;
-
-    beforeEach(() => {
-      props = component.find('Portal').props();
-    });
-
-    it('passes title', () => {
-      expect(props.title).to.equal('test title');
-    });
-
-    it('passes open flag', () => {
-      expect(props.open).to.be.true;
-    });
-
-    it('passes the small flag', () => {
-      expect(props.isSmallModal).to.be.true;
-    });
-
-    it('maps onClose to onDeny', () => {
-      expect(props.onClose).to.equal(onDeny);
-    });
-
-    describe('buttons', () => {
-      let buttons;
-
-      beforeEach(() => {
-        buttons = component.props().buttons;
-      });
-
-      it('passes the buttons', () => {
-        expect(buttons.length).to.equal(2);
-      });
-
-      it('renders with supplied onConfim/onDeny callbacks', () => {
-        expect(buttons[0].props.onClick).to.deep.equal(onDeny);
-        expect(buttons[1].props.onClick).to.deep.equal(onConfirm);
-      });
-
-      it('renders default labels', () => {
-        expect(buttons[0].props.label.props.id).to.equal('ui.confirmDialog.no');
-        expect(buttons[1].props.label.props.id).to.equal('ui.confirmDialog.yes');
-      });
-
-      it('renders default icons', () => {
-        expect(buttons[0].props.icon.type.displayName).to.equal('ContentClear');
-        expect(buttons[1].props.icon.type.displayName).to.equal('NavigationCheck');
-      });
-
-      describe('overrides', () => {
-        beforeEach(() => {
-          render({
-            labelConfirm: 'labelConfirm',
-            labelDeny: 'labelDeny',
-            iconConfirm: 'iconConfirm',
-            iconDeny: 'iconDeny'
-          });
-          buttons = component.props().buttons;
-        });
-
-        it('renders supplied labels', () => {
-          expect(buttons[0].props.label).to.equal('labelDeny');
-          expect(buttons[1].props.label).to.equal('labelConfirm');
-        });
-
-        it('renders supplied icons', () => {
-          expect(buttons[0].props.icon).to.equal('iconDeny');
-          expect(buttons[1].props.icon).to.equal('iconConfirm');
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/ui/ConfirmDialog/index.js b/js/src/ui/ConfirmDialog/index.js
deleted file mode 100644
index c68d6033002066ad3eb5d5c9e44964e8a0ae6e87..0000000000000000000000000000000000000000
--- a/js/src/ui/ConfirmDialog/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './confirmDialog';
diff --git a/js/src/ui/Container/Title/index.js b/js/src/ui/Container/Title/index.js
deleted file mode 100644
index d39bfcc2fdf83d6243394d83a4a2f61c3e7e8280..0000000000000000000000000000000000000000
--- a/js/src/ui/Container/Title/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './title';
diff --git a/js/src/ui/Container/Title/title.css b/js/src/ui/Container/Title/title.css
deleted file mode 100644
index 1c0383bd2dcaa224cc4a8449f81e2198b081caa7..0000000000000000000000000000000000000000
--- a/js/src/ui/Container/Title/title.css
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$bylineColor: #aaa;
-$bylineLineHeight: 1.2rem;
-$bylineMaxHeight: 2.4rem;
-$titleLineHeight: 2rem;
-$smallFontSize: 0.75rem;
-
-.container {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-}
-
-.byline,
-.description {
-  color: $bylineColor;
-  display: -webkit-box;
-  line-height: $bylineLineHeight;
-  min-height: $bylineMaxHeight;
-  max-height: $bylineMaxHeight;
-  overflow: hidden;
-  position: relative;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-
-  * {
-    color: $bylineColor !important;
-  }
-}
-
-.description {
-  font-size: $smallFontSize;
-  margin: 0.5em 0 0;
-}
-
-.title {
-  line-height: $titleLineHeight;
-  margin: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  text-transform: uppercase;
-  white-space: nowrap;
-}
diff --git a/js/src/ui/Container/Title/title.js b/js/src/ui/Container/Title/title.js
deleted file mode 100644
index 50f6cc2e526fac8abac7605760b9cbf50f40c2bb..0000000000000000000000000000000000000000
--- a/js/src/ui/Container/Title/title.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './title.css';
-
-export default class Title extends Component {
-  static propTypes = {
-    actions: PropTypes.array,
-    byline: nodeOrStringProptype(),
-    className: PropTypes.string,
-    description: nodeOrStringProptype(),
-    title: nodeOrStringProptype()
-  };
-
-  static defaultProps = {
-    actions: []
-  };
-
-  render () {
-    const { className, title } = this.props;
-
-    return (
-      <div className={ [ className, styles.container ].join(' ') }>
-        <div>
-          <h3 className={ styles.title }>
-            { title }
-          </h3>
-          { this.renderByline() }
-          { this.renderDescription() }
-        </div>
-        { this.renderActions() }
-      </div>
-    );
-  }
-
-  renderActions () {
-    const { actions } = this.props;
-
-    if (actions.length === 0) {
-      return null;
-    }
-
-    return (
-      <div>
-        { actions }
-      </div>
-    );
-  }
-
-  renderByline () {
-    const { byline } = this.props;
-
-    if (!byline) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.byline }>
-        {
-          typeof byline === 'string'
-            ? (
-              <span title={ byline }>
-                { byline }
-              </span>
-            )
-            : byline
-        }
-      </div>
-    );
-  }
-
-  renderDescription () {
-    const { description } = this.props;
-
-    if (!description) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.description }>
-        {
-          typeof description === 'string'
-            ? (
-              <span title={ description }>
-                { description }
-              </span>
-            )
-            : description
-        }
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/Container/Title/title.spec.js b/js/src/ui/Container/Title/title.spec.js
deleted file mode 100644
index 45e91cbef129c99017dc8008ba6be748874a7f0b..0000000000000000000000000000000000000000
--- a/js/src/ui/Container/Title/title.spec.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import Title from './title';
-
-function render (props) {
-  return shallow(
-    <Title { ...props } />
-  );
-}
-
-describe('ui/Container/Title', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(render()).to.be.ok;
-    });
-
-    it('renders with the specified className', () => {
-      expect(render({ className: 'testClass' })).to.have.className('testClass');
-    });
-
-    it('renders the specified title', () => {
-      expect(render({ title: 'titleText' })).to.contain.text('titleText');
-    });
-
-    it('renders the specified byline', () => {
-      expect(render({ byline: 'bylineText' })).to.contain.text('bylineText');
-    });
-  });
-});
diff --git a/js/src/ui/Container/container.css b/js/src/ui/Container/container.css
deleted file mode 100644
index e01387406b18aa62d0788b7859f35be4866e6584..0000000000000000000000000000000000000000
--- a/js/src/ui/Container/container.css
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$background: rgba(18, 18, 18, 0.85);
-$backgroundHover: rgba(18, 18, 18, 1);
-$transitionAll: all 0.75s cubic-bezier(0.23, 1, 0.32, 1);
-
-.container {
-  background: $background;
-  flex: 1;
-  height: 100%;
-  padding: 0em;
-  max-width: 100%;
-  position: relative;
-  /*transform: translateZ(0);
-  transition: $transitionAll;*/
-  width: 100%;
-
-  .hoverOverlay {
-    background: $background;
-    display: none;
-    left: 0;
-    margin-top: -1.5em;
-    margin-bottom: 3em;
-    opacity: inherit;
-    padding: 0 1.5em 1.5em 1.5em;
-    position: absolute;
-    right: 0;
-    top: 100%;
-    /*transition: $transitionAll;*/
-    opacity: 0;
-    /*transform: scale(0.5, 0);
-    transform-origin: top center;*/
-    z-index: 100;
-  }
-
-  &:hover {
-    background: $backgroundHover;
-
-    .hoverOverlay {
-      background: $backgroundHover;
-      display: block;
-      /*transform: scale(1, 1);*/
-      opacity: 1;
-    }
-  }
-}
-
-.compact,
-.padded {
-  background-color: transparent !important;
-  border-radius: 0 !important;
-  height: 100%;
-  position: relative;
-  overflow: auto;
-}
-
-.compact {
-  padding: 0 1.5em;
-}
-
-.padded {
-  padding: 1.5em;
-}
-
-.light .compact,
-.light .padded {
-  background: rgba(0, 0, 0, 0.5) !important;
-}
-
-.link {
-  width: 100%;
-  height: 100%;
-}
diff --git a/js/src/ui/Container/container.js b/js/src/ui/Container/container.js
deleted file mode 100644
index 81e48f7f3ebfd8ba3fe254190ed08df995de9970..0000000000000000000000000000000000000000
--- a/js/src/ui/Container/container.js
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { Link } from 'react-router';
-import { Card } from 'material-ui/Card';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import Title from './Title';
-
-import styles from './container.css';
-
-export default class Container extends Component {
-  static propTypes = {
-    children: PropTypes.node,
-    className: PropTypes.string,
-    compact: PropTypes.bool,
-    hover: PropTypes.node,
-    light: PropTypes.bool,
-    link: PropTypes.string,
-    onClick: PropTypes.func,
-    style: PropTypes.object,
-    tabIndex: PropTypes.number,
-    title: nodeOrStringProptype()
-  }
-
-  render () {
-    const { children, className, compact, light, link, onClick, style, tabIndex } = this.props;
-    const props = {};
-
-    if (Number.isInteger(tabIndex)) {
-      props.tabIndex = tabIndex;
-    }
-
-    const card = (
-      <Card
-        className={
-          compact
-            ? styles.compact
-            : styles.padded
-        }
-        onClick={ onClick }
-      >
-        { this.renderTitle() }
-        { children }
-      </Card>
-    );
-
-    return (
-      <div
-        className={
-          [
-            styles.container,
-            light
-              ? styles.light
-              : '',
-            className
-          ].join(' ')
-        }
-        style={ style }
-        { ...props }
-      >
-        {
-          link
-            ? (
-              <Link
-                className={ styles.link }
-                to={ link }
-              >
-                { card }
-                { this.renderHover() }
-              </Link>
-            )
-            : (
-              <div>
-                { card }
-                { this.renderHover() }
-              </div>
-            )
-        }
-      </div>
-    );
-  }
-
-  renderHover () {
-    const { hover } = this.props;
-
-    if (!hover) {
-      return null;
-    }
-
-    return (
-      <Card className={ styles.hoverOverlay }>
-        { hover }
-      </Card>
-    );
-  }
-
-  renderTitle () {
-    const { title } = this.props;
-
-    if (!title) {
-      return null;
-    }
-
-    return (
-      <Title title={ title } />
-    );
-  }
-}
diff --git a/js/src/ui/Container/container.spec.js b/js/src/ui/Container/container.spec.js
deleted file mode 100644
index 78b625e397e6a2f4d452687715d5006df3ac60dc..0000000000000000000000000000000000000000
--- a/js/src/ui/Container/container.spec.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import Container from './container';
-
-function render (props) {
-  return shallow(
-    <Container { ...props } />
-  );
-}
-
-describe('ui/Container', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(render()).to.be.ok;
-    });
-
-    it('renders with the specified className', () => {
-      expect(render({ className: 'testClass' })).to.have.className('testClass');
-    });
-  });
-
-  describe('sections', () => {
-    it('renders the default Card', () => {
-      expect(render().find('Card')).to.have.length(1);
-    });
-
-    it('renders Hover Card when available', () => {
-      const cards = render({ hover: <div>testingHover</div> }).find('Card');
-
-      expect(cards).to.have.length(2);
-      expect(cards.get(1).props.children.props.children).to.equal('testingHover');
-    });
-
-    it('renders the Title', () => {
-      const title = render({ title: 'title' }).find('Title');
-
-      expect(title).to.have.length(1);
-      expect(title.props().title).to.equal('title');
-    });
-  });
-});
diff --git a/js/src/ui/Container/index.js b/js/src/ui/Container/index.js
deleted file mode 100644
index 3a3253f990d83d1cfa93e3e780aa9a8d8a67862e..0000000000000000000000000000000000000000
--- a/js/src/ui/Container/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Title from './Title';
-
-export default from './container.js';
-export { Title };
diff --git a/js/src/ui/ContextProvider/contextProvider.js b/js/src/ui/ContextProvider/contextProvider.js
deleted file mode 100644
index 9d8efea92975a645620dd1a659eb6be79201d286..0000000000000000000000000000000000000000
--- a/js/src/ui/ContextProvider/contextProvider.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { IntlProvider } from 'react-intl';
-import { observer } from 'mobx-react';
-
-import { LocaleStore } from '../../i18n';
-
-@observer
-export default class ContextProvider extends Component {
-  static propTypes = {
-    api: PropTypes.object.isRequired,
-    muiTheme: PropTypes.object.isRequired,
-    store: PropTypes.object.isRequired,
-    children: PropTypes.node.isRequired
-  }
-
-  static childContextTypes = {
-    api: PropTypes.object,
-    muiTheme: PropTypes.object,
-    store: PropTypes.object
-  }
-
-  localeStore = LocaleStore.get();
-
-  render () {
-    const { children } = this.props;
-    const { locale, messages } = this.localeStore;
-
-    return (
-      <IntlProvider locale={ locale } messages={ messages }>
-        { children }
-      </IntlProvider>
-    );
-  }
-
-  getChildContext () {
-    const { api, muiTheme, store } = this.props;
-
-    return {
-      api,
-      muiTheme,
-      store
-    };
-  }
-}
diff --git a/js/src/ui/ContextProvider/index.js b/js/src/ui/ContextProvider/index.js
deleted file mode 100644
index 6b6958db75c71dbf4beac04e1b8645c4dcb2950d..0000000000000000000000000000000000000000
--- a/js/src/ui/ContextProvider/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './contextProvider';
diff --git a/js/src/ui/CopyToClipboard/copyToClipboard.css b/js/src/ui/CopyToClipboard/copyToClipboard.css
deleted file mode 100644
index 4e2bb8cc4fc82192709abfbdf806ebaa35207587..0000000000000000000000000000000000000000
--- a/js/src/ui/CopyToClipboard/copyToClipboard.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.wrapper {
-  display: inline-block;
-}
-
-.data {
-  flex: 1;
-  font-family: monospace;
-  padding: 0 0.5em;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.container > * {
-  display: flex;
-}
diff --git a/js/src/ui/CopyToClipboard/copyToClipboard.js b/js/src/ui/CopyToClipboard/copyToClipboard.js
deleted file mode 100644
index 016730fce3319ea1976ab1d865740afab2b212a9..0000000000000000000000000000000000000000
--- a/js/src/ui/CopyToClipboard/copyToClipboard.js
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { IconButton } from 'material-ui';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import Clipboard from 'react-copy-to-clipboard';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { showSnackbar } from '~/redux/providers/snackbarActions';
-
-import { CopyIcon } from '../Icons';
-import Theme from '../Theme';
-
-import styles from './copyToClipboard.css';
-
-const { textColor, disabledTextColor } = Theme.flatButton;
-
-class CopyToClipboard extends Component {
-  static propTypes = {
-    showSnackbar: PropTypes.func.isRequired,
-    data: PropTypes.string.isRequired,
-
-    onCopy: PropTypes.func,
-    size: PropTypes.number, // in px
-    cooldown: PropTypes.number // in ms
-  };
-
-  static defaultProps = {
-    className: '',
-    onCopy: () => {},
-    size: 16,
-    cooldown: 1000
-  };
-
-  state = {
-    copied: false,
-    timeoutId: null
-  };
-
-  componentWillUnmount () {
-    const { timeoutId } = this.state;
-
-    if (timeoutId) {
-      window.clearTimeout(timeoutId);
-    }
-  }
-
-  render () {
-    const { data, size } = this.props;
-    const { copied } = this.state;
-
-    return (
-      <Clipboard
-        onCopy={ this.onCopy }
-        text={ data }
-      >
-        <div
-          className={ styles.wrapper }
-          onClick={ this.onClick }
-        >
-          <IconButton
-            disableTouchRipple
-            iconStyle={ {
-              height: size,
-              width: size
-            } }
-            style={ {
-              height: size,
-              padding: '0',
-              width: size
-            } }
-          >
-            <CopyIcon
-              color={
-                copied
-                  ? disabledTextColor
-                  : textColor
-              }
-            />
-          </IconButton>
-        </div>
-      </Clipboard>
-    );
-  }
-
-  onCopy = () => {
-    const { data, onCopy, cooldown, showSnackbar } = this.props;
-    const message = (
-      <div className={ styles.container }>
-        <FormattedMessage
-          id='ui.copyToClipboard.copied'
-          defaultMessage='copied {data} to clipboard'
-          values={ {
-            data: <code className={ styles.data }> { data } </code>
-          } }
-        />
-      </div>
-    );
-
-    this.setState({
-      copied: true,
-      timeoutId: setTimeout(() => {
-        this.setState({ copied: false, timeoutId: null });
-      }, cooldown)
-    });
-
-    showSnackbar(message, cooldown);
-    onCopy();
-  }
-
-  onClick = (event) => {
-    event.stopPropagation();
-    event.preventDefault();
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    showSnackbar
-  }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(CopyToClipboard);
diff --git a/js/src/ui/CopyToClipboard/index.js b/js/src/ui/CopyToClipboard/index.js
deleted file mode 100644
index 2452a049223790dd40b7f76f844874fb9e7add9b..0000000000000000000000000000000000000000
--- a/js/src/ui/CopyToClipboard/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './copyToClipboard';
diff --git a/js/src/ui/CurrencySymbol/currencySymbol.example.js b/js/src/ui/CurrencySymbol/currencySymbol.example.js
deleted file mode 100644
index c1b56ed5cfcb097d74c31471d9348216a0706145..0000000000000000000000000000000000000000
--- a/js/src/ui/CurrencySymbol/currencySymbol.example.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import PlaygroundExample from '~/playground/playgroundExample';
-
-import ConnectedCurrencySymbol, { CurrencySymbol } from './currencySymbol';
-
-export default class CurrencySymbolExample extends Component {
-  render () {
-    return (
-      <div>
-        <PlaygroundExample name='Connected Currency Symbol'>
-          <ConnectedCurrencySymbol />
-        </PlaygroundExample>
-
-        <PlaygroundExample name='Simple Currency Symbol'>
-          <CurrencySymbol
-            netChain='testnet'
-          />
-        </PlaygroundExample>
-
-        <PlaygroundExample name='ETC Currency Symbol'>
-          <CurrencySymbol
-            netChain='classic'
-          />
-        </PlaygroundExample>
-
-        <PlaygroundExample name='EXP Currency Symbol'>
-          <CurrencySymbol
-            netChain='expanse'
-          />
-        </PlaygroundExample>
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/CurrencySymbol/currencySymbol.js b/js/src/ui/CurrencySymbol/currencySymbol.js
deleted file mode 100644
index 3322b0301b7a881b4e69b2aa12c1fafc3d83f0a4..0000000000000000000000000000000000000000
--- a/js/src/ui/CurrencySymbol/currencySymbol.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-const SYMBOL_ETC = 'ETC';
-const SYMBOL_ETH = 'ETH';
-const SYMBOL_EXP = 'EXP';
-
-export class CurrencySymbol extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    netChain: PropTypes.string.isRequired
-  }
-
-  render () {
-    const { className } = this.props;
-
-    return (
-      <span className={ className }>{ this.renderSymbol() }</span>
-    );
-  }
-
-  renderSymbol () {
-    const { netChain } = this.props;
-
-    switch (netChain) {
-      case 'classic':
-        return SYMBOL_ETC;
-
-      case 'expanse':
-        return SYMBOL_EXP;
-
-      default:
-        return SYMBOL_ETH;
-    }
-  }
-}
-
-function mapStateToProps (state) {
-  const { netChain } = state.nodeStatus;
-
-  return {
-    netChain
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(CurrencySymbol);
diff --git a/js/src/ui/CurrencySymbol/currencySymbol.spec.js b/js/src/ui/CurrencySymbol/currencySymbol.spec.js
deleted file mode 100644
index e705b5edc21bc22dfff808040b62f855831734df..0000000000000000000000000000000000000000
--- a/js/src/ui/CurrencySymbol/currencySymbol.spec.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import CurrencySymbol from './';
-
-let component;
-let store;
-
-function createRedux (netChain = 'ropsten') {
-  store = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        nodeStatus: {
-          netChain
-        }
-      };
-    }
-  };
-
-  return store;
-}
-
-function render (netChain, props = {}) {
-  component = shallow(
-    <CurrencySymbol { ...props } />,
-    {
-      context: {
-        store: createRedux(netChain)
-      }
-    }
-  ).find('CurrencySymbol').shallow();
-
-  return component;
-}
-
-describe('ui/CurrencySymbol', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  it('passes the className as provided', () => {
-    expect(render('ropsten', { className: 'test' }).find('span').hasClass('test')).to.be.true;
-  });
-
-  describe('currencies', () => {
-    it('renders ETH as default', () => {
-      expect(render().text()).equal('ETH');
-    });
-
-    it('renders ETC for classic', () => {
-      expect(render('classic').text()).equal('ETC');
-    });
-
-    it('renders EXP for expanse', () => {
-      expect(render('expanse').text()).equal('EXP');
-    });
-
-    it('renders ETH as default', () => {
-      expect(render('somethingElse').text()).equal('ETH');
-    });
-  });
-
-  describe('renderSymbol', () => {
-    it('render defaults', () => {
-      expect(render().instance().renderSymbol()).to.be.ok;
-    });
-
-    it('render ETH as default', () => {
-      expect(render().instance().renderSymbol()).equal('ETH');
-    });
-
-    it('render ETC', () => {
-      expect(render('classic').instance().renderSymbol()).equal('ETC');
-    });
-
-    it('render EXP', () => {
-      expect(render('expanse').instance().renderSymbol()).equal('EXP');
-    });
-  });
-});
diff --git a/js/src/ui/CurrencySymbol/index.js b/js/src/ui/CurrencySymbol/index.js
deleted file mode 100644
index ce033d34b9c39dfd3efa9b5d432af5c367f3f43a..0000000000000000000000000000000000000000
--- a/js/src/ui/CurrencySymbol/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './currencySymbol';
diff --git a/js/src/ui/DappCard/dappCard.css b/js/src/ui/DappCard/dappCard.css
deleted file mode 100644
index 36292011bb4398842b198ad4a7c50292be3658d7..0000000000000000000000000000000000000000
--- a/js/src/ui/DappCard/dappCard.css
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  height: 100%;
-  position: relative;
-
-  &:not(:hover) {
-    .tags {
-      display: none;
-    }
-  }
-}
-
-.image {
-  left: 1.5em;
-  position: absolute;
-  top: 1.5em;
-}
-
-.author,
-.description {
-  margin-left: 72px;
-}
-
-.title {
-}
-
-.titleLink {
-  color: rgb(0, 151, 167);
-}
-
-.author {
-  font-size: 0.75em;
-  opacity: 0.5;
-  margin-top: 1em;
-}
diff --git a/js/src/ui/DappCard/dappCard.js b/js/src/ui/DappCard/dappCard.js
deleted file mode 100644
index cc0faf47d2cf07ed1eb756822c1cfa8444e7dcde..0000000000000000000000000000000000000000
--- a/js/src/ui/DappCard/dappCard.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import Container, { Title as ContainerTitle } from '~/ui/Container';
-import DappIcon from '~/ui/DappIcon';
-import Tags from '~/ui/Tags';
-
-import styles from './dappCard.css';
-
-export default class DappCard extends Component {
-  static propTypes = {
-    app: PropTypes.object.isRequired,
-    children: PropTypes.node,
-    className: PropTypes.string,
-    onClick: PropTypes.func,
-    showLink: PropTypes.bool,
-    showTags: PropTypes.bool
-  };
-
-  static defaultProps = {
-    showLink: false,
-    showTags: false
-  };
-
-  render () {
-    const { app, children, className, onClick, showLink, showTags } = this.props;
-
-    if (!app) {
-      return null;
-    }
-
-    return (
-      <Container
-        className={
-          [styles.container, className].join(' ')
-        }
-        hover={
-          <div className={ styles.author }>
-            { app.author }, v{ app.version }
-          </div>
-        }
-        link={ this.getLink(app) }
-        onClick={ onClick }
-      >
-        <DappIcon
-          app={ app }
-          className={ styles.image }
-        />
-        <Tags
-          className={ styles.tags }
-          tags={
-            showTags
-              ? [app.type]
-              : null
-          }
-        />
-        <div className={ styles.description }>
-          <ContainerTitle
-            className={
-              showLink
-                ? styles.titleLink
-                : styles.title
-            }
-            title={ app.name }
-            byline={ app.description }
-          />
-          { children }
-        </div>
-      </Container>
-    );
-  }
-
-  getLink (app) {
-    const { showLink } = this.props;
-
-    if (!showLink) {
-      return null;
-    }
-
-    return app.url === 'web'
-      ? '/web'
-      : `/app/${app.id}`;
-  }
-}
diff --git a/js/src/ui/DappCard/index.js b/js/src/ui/DappCard/index.js
deleted file mode 100644
index eed38ca781cf96b8c1473bb2a2dcf78a16b7bb32..0000000000000000000000000000000000000000
--- a/js/src/ui/DappCard/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dappCard';
diff --git a/js/src/ui/DappIcon/dappIcon.css b/js/src/ui/DappIcon/dappIcon.css
deleted file mode 100644
index 95ceed8648d4c4fe5853957b2c95f65a8b38462b..0000000000000000000000000000000000000000
--- a/js/src/ui/DappIcon/dappIcon.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.icon {
-  border-radius: 50%;
-  margin: 0 0.75em 0 0;
-}
-
-.normal {
-  height: 56px;
-  width: 56px;
-}
-
-.small {
-  height: 32px;
-  width: 32px;
-}
diff --git a/js/src/ui/DappIcon/dappIcon.js b/js/src/ui/DappIcon/dappIcon.js
deleted file mode 100644
index dac7031290aadd9bfa8bbb24ef4a30865a0ac24a..0000000000000000000000000000000000000000
--- a/js/src/ui/DappIcon/dappIcon.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './dappIcon.css';
-
-export default class DappIcon extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    app: PropTypes.object.isRequired,
-    className: PropTypes.string,
-    small: PropTypes.bool
-  };
-
-  render () {
-    const { dappsUrl } = this.context.api;
-    const { app, className, small } = this.props;
-
-    return (
-      <img
-        className={
-          [styles.icon, styles[small ? 'small' : 'normal'], className].join(' ')
-        }
-        src={
-          app.type === 'local'
-            ? `${dappsUrl}/${app.id}/${app.iconUrl}`
-            : `${app.image}`
-        }
-      />
-    );
-  }
-}
diff --git a/js/src/ui/DappIcon/dappIcon.spec.js b/js/src/ui/DappIcon/dappIcon.spec.js
deleted file mode 100644
index fce104685f75554f163be66885f3f6e096f34e51..0000000000000000000000000000000000000000
--- a/js/src/ui/DappIcon/dappIcon.spec.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import DappIcon from './';
-
-const DAPPS_URL = 'http://test';
-
-let api;
-let component;
-
-function createApi () {
-  api = {
-    dappsUrl: DAPPS_URL
-  };
-
-  return api;
-}
-
-function render (props = {}) {
-  if (!props.app) {
-    props.app = {};
-  }
-
-  component = shallow(
-    <DappIcon { ...props } />,
-    {
-      context: { api: createApi() }
-    }
-  );
-
-  return component;
-}
-
-describe('ui/DappIcon', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  it('adds specified className', () => {
-    expect(render({ className: 'testClass' }).hasClass('testClass')).to.be.true;
-  });
-
-  it('renders local apps with correct URL', () => {
-    expect(render({ app: { id: 'test', type: 'local', iconUrl: 'test.img' } }).props().src).to.equal(
-      `${DAPPS_URL}/test/test.img`
-    );
-  });
-
-  it('renders other apps with correct URL', () => {
-    expect(render({ app: { id: 'test', image: '/test.img' } }).props().src).to.equal(
-      `/test.img`
-    );
-  });
-});
diff --git a/js/src/ui/DappIcon/index.js b/js/src/ui/DappIcon/index.js
deleted file mode 100644
index c0b80956e4b3dff38897f26f28be2a056dcfb551..0000000000000000000000000000000000000000
--- a/js/src/ui/DappIcon/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dappIcon';
diff --git a/js/src/ui/Editor/editor.js b/js/src/ui/Editor/editor.js
deleted file mode 100644
index dd87aaa3d20a4202970c61d12911219da3de85b8..0000000000000000000000000000000000000000
--- a/js/src/ui/Editor/editor.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { PropTypes, Component } from 'react';
-
-import 'brace';
-import AceEditor from 'react-ace';
-import { noop } from 'lodash';
-
-import 'brace/theme/solarized_dark';
-import 'brace/mode/json';
-import './mode-solidity';
-
-export default class Editor extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    value: PropTypes.string,
-    mode: PropTypes.string,
-    maxLines: PropTypes.number,
-    annotations: PropTypes.array,
-    onExecute: PropTypes.func,
-    onChange: PropTypes.func,
-    readOnly: PropTypes.bool
-  };
-
-  static defaultProps = {
-    className: '',
-    value: '',
-    mode: 'javascript',
-    annotations: [],
-    onExecute: noop,
-    onChange: noop,
-    readOnly: false
-  };
-
-  componentWillMount () {
-    this.name = `PARITY_EDITOR_${Math.round(Math.random() * 99999)}`;
-  }
-
-  render () {
-    const { className, annotations, value, readOnly, mode, maxLines } = this.props;
-    const commands = [
-      {
-        name: 'execut',
-        bindKey: { win: 'Ctrl-Enter', mac: 'Command-Enter' },
-        exec: this.handleExecute
-      }
-    ];
-
-    const max = (maxLines !== undefined)
-      ? maxLines
-      : (readOnly ? value.split('\n').length + 1 : null);
-
-    return (
-      <AceEditor
-        mode={ mode }
-        theme='solarized_dark'
-        width='100%'
-        ref='brace'
-        style={ { flex: 1 } }
-        onChange={ this.handleOnChange }
-        name={ this.name }
-        editorProps={ { $blockScrolling: Infinity } }
-        setOptions={ {
-          useWorker: false,
-          fontFamily: 'monospace',
-          fontSize: '0.9em'
-        } }
-        maxLines={ max }
-        enableBasicAutocompletion={ !readOnly }
-        showPrintMargin={ false }
-        annotations={ annotations }
-        value={ value }
-        commands={ commands }
-        readOnly={ readOnly }
-        className={ className }
-      />
-    );
-  }
-
-  handleExecute = () => {
-    this.props.onExecute();
-  }
-
-  handleOnChange = (value) => {
-    this.props.onChange(value);
-  }
-}
diff --git a/js/src/ui/Editor/index.js b/js/src/ui/Editor/index.js
deleted file mode 100644
index 30960fa5d46c09373856bbdff518a09861d35631..0000000000000000000000000000000000000000
--- a/js/src/ui/Editor/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './editor';
diff --git a/js/src/ui/Editor/mode-solidity.js b/js/src/ui/Editor/mode-solidity.js
deleted file mode 100644
index e6845340fa5888295ced9c82640c909460043709..0000000000000000000000000000000000000000
--- a/js/src/ui/Editor/mode-solidity.js
+++ /dev/null
@@ -1,1000 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This file has been taken from `ethereum/browser-solidity`
- *
- * @see: https://raw.githubusercontent.com/ethereum/browser-solidity/master/src/mode-solidity.js
- */
-/* eslint-disable */
-var ace = window.ace;
-
-if (process.env.NODE_ENV === 'test') {
-  if (!ace.define) {
-    ace.define = () => {};
-  }
-}
-
-ace.define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(acequire, exports, module) {
-"use strict";
-
-var oop = acequire("../lib/oop");
-var TextHighlightRules = acequire("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        },
-        DocCommentHighlightRules.getTagRule(),
-        {
-            defaultToken : "comment.doc",
-            caseInsensitive: true
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-DocCommentHighlightRules.getTagRule = function(start) {
-    return {
-        token : "comment.doc.tag.storage.type",
-        regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
-    };
-};
-
-DocCommentHighlightRules.getStartRule = function(start) {
-    return {
-        token : "comment.doc", // doc comment
-        regex : "\\/\\*(?=\\*)",
-        next  : start
-    };
-};
-
-DocCommentHighlightRules.getEndRule = function (start) {
-    return {
-        token : "comment.doc", // closing comment
-        regex : "\\*\\/",
-        next  : start
-    };
-};
-
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-
-ace.define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"], function(acequire, exports, module) {
-"use strict";
-
-var oop = acequire("../lib/oop");
-var DocCommentHighlightRules = acequire("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = acequire("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function(options) {
-    var intTypes = 'bytes|int|uint';
-    for (var width = 8; width <= 256; width += 8)
-        intTypes += '|bytes' + (width / 8) + '|uint' + width + '|int' + width;
-    var keywordMapper = this.createKeywordMapper({
-        "variable.language":
-            "this|bool|string|byte|bytes|bytes0|address|" + intTypes,
-        "keyword":
-            "contract|library|constant|event|modifier|" +
-            "struct|mapping|enum|break|continue|delete|else|for|function|" +
-            "if|new|return|returns|var|while|using|" +
-            "private|public|external|internal|storage|memory",
-        "storage.type":
-            "constant|var|function",
-        "constant.language.boolean": "true|false"
-    }, "identifier");
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void";
-    var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    this.$rules = {
-        "no_regex" : [
-            {
-                token : "comment",
-                regex : "\\/\\/",
-                next : "line_comment"
-            },
-            DocCommentHighlightRules.getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'(?=.)",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"(?=.)',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, {
-                token : [
-                    "storage.type", "punctuation.operator", "support.function",
-                    "punctuation.operator", "entity.name.function", "text","keyword.operator"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)",
-                next: "function_arguments"
-            }, {
-                token : [
-                    "storage.type", "punctuation.operator", "entity.name.function", "text",
-                    "keyword.operator", "text", "storage.type", "text", "paren.lparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",
-                next: "function_arguments"
-            }, {
-                token : [
-                    "entity.name.function", "text", "keyword.operator", "text", "storage.type",
-                    "text", "paren.lparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",
-                next: "function_arguments"
-            }, {
-                token : [
-                    "storage.type", "punctuation.operator", "entity.name.function", "text",
-                    "keyword.operator", "text",
-                    "storage.type", "text", "entity.name.function", "text", "paren.lparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s+)(\\w+)(\\s*)(\\()",
-                next: "function_arguments"
-            }, {
-                token : [
-                    "storage.type", "text", "entity.name.function", "text", "paren.lparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()",
-                next: "function_arguments"
-            }, {
-                token : [
-                    "entity.name.function", "text", "punctuation.operator",
-                    "text", "storage.type", "text", "paren.lparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()",
-                next: "function_arguments"
-            }, {
-                token : [
-                    "text", "text", "storage.type", "text", "paren.lparen"
-                ],
-                regex : "(:)(\\s*)(function)(\\s*)(\\()",
-                next: "function_arguments"
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "start"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["support.constant"],
-                regex : /that\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|trace|timeEnd|assert)\b/
-            }, {
-                token : keywordMapper,
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /--|\*\*|\+\+|===|==|=|!=|!==|=>|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|[!$%&*+\-~\/^]=?/,
-                next  : "start"
-            }, {
-                token : "punctuation.operator",
-                regex : /[?:,;.]/,
-                next  : "start"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "start"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }
-        ],
-        "start": [
-            DocCommentHighlightRules.getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/",
-                next : "line_comment_regex_allowed"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex"
-            }, {
-                token : "text",
-                regex : "\\s+|^$",
-                next : "start"
-            }, {
-                token: "empty",
-                regex: "",
-                next: "no_regex"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
-            }, {
-                token: "string.regexp",
-                regex: "/[sxngimy]*",
-                next: "no_regex"
-            }, {
-                token : "invalid",
-                regex: /\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/
-            }, {
-                token : "constant.language.escape",
-                regex: /\(\?[:=!]|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/
-            }, {
-                token : "constant.language.delimiter",
-                regex: /\|/
-            }, {
-                token: "constant.language.escape",
-                regex: /\[\^?/,
-                next: "regex_character_class"
-            }, {
-                token: "empty",
-                regex: "$",
-                next: "no_regex"
-            }, {
-                defaultToken: "string.regexp"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.charclass.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
-            }, {
-                token: "constant.language.escape",
-                regex: "]",
-                next: "regex"
-            }, {
-                token: "constant.language.escape",
-                regex: "-"
-            }, {
-                token: "empty",
-                regex: "$",
-                next: "no_regex"
-            }, {
-                defaultToken: "string.regexp.charachterclass"
-            }
-        ],
-        "function_arguments": [
-            {
-                token: "variable.parameter",
-                regex: identifierRe
-            }, {
-                token: "punctuation.operator",
-                regex: "[, ]+"
-            }, {
-                token: "punctuation.operator",
-                regex: "$"
-            }, {
-                token: "empty",
-                regex: "",
-                next: "no_regex"
-            }
-        ],
-        "comment_regex_allowed" : [
-            DocCommentHighlightRules.getTagRule(),
-            {token : "comment", regex : "\\*\\/", next : "start"},
-            {defaultToken : "comment", caseInsensitive: true}
-        ],
-        "comment" : [
-            DocCommentHighlightRules.getTagRule(),
-            {token : "comment", regex : "\\*\\/", next : "no_regex"},
-            {defaultToken : "comment", caseInsensitive: true}
-        ],
-        "line_comment_regex_allowed" : [
-            DocCommentHighlightRules.getTagRule(),
-            {token : "comment", regex : "$|^", next : "start"},
-            {defaultToken : "comment", caseInsensitive: true}
-        ],
-        "line_comment" : [
-            DocCommentHighlightRules.getTagRule(),
-            {token : "comment", regex : "$|^", next : "no_regex"},
-            {defaultToken : "comment", caseInsensitive: true}
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "\\\\$",
-                next  : "qqstring"
-            }, {
-                token : "string",
-                regex : '"|$',
-                next  : "no_regex"
-            }, {
-                defaultToken: "string"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "\\\\$",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : "'|$",
-                next  : "no_regex"
-            }, {
-                defaultToken: "string"
-            }
-        ]
-    };
-
-
-    if (!options || !options.noES6) {
-        this.$rules.no_regex.unshift({
-            regex: "[{}]", onMatch: function(val, state, stack) {
-                this.next = val == "{" ? this.nextState : "";
-                if (val == "{" && stack.length) {
-                    stack.unshift("start", state);
-                    return "paren";
-                }
-                if (val == "}" && stack.length) {
-                    stack.shift();
-                    this.next = stack.shift();
-                    if (this.next.indexOf("string") != -1)
-                        return "paren.quasi.end";
-                }
-                return val == "{" ? "paren.lparen" : "paren.rparen";
-            },
-            nextState: "start"
-        }, {
-            token : "string.quasi.start",
-            regex : /`/,
-            push  : [{
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "paren.quasi.start",
-                regex : /\${/,
-                push  : "start"
-            }, {
-                token : "string.quasi.end",
-                regex : /`/,
-                next  : "pop"
-            }, {
-                defaultToken: "string.quasi"
-            }]
-        });
-    }
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ DocCommentHighlightRules.getEndRule("no_regex") ]);
-
-    this.normalizeRules();
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-
-ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"], function(acequire, exports, module) {
-"use strict";
-
-var Range = acequire("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        return line.match(/^\s*/)[0];
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-
-ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"], function(acequire, exports, module) {
-"use strict";
-
-var oop = acequire("../../lib/oop");
-var Behaviour = acequire("../behaviour").Behaviour;
-var TokenIterator = acequire("../../token_iterator").TokenIterator;
-var lang = acequire("../../lib/lang");
-
-var SAFE_INSERT_IN_TOKENS =
-    ["text", "paren.rparen", "punctuation.operator"];
-var SAFE_INSERT_BEFORE_TOKENS =
-    ["text", "paren.rparen", "punctuation.operator", "comment"];
-
-var context;
-var contextCache = {};
-var initContext = function(editor) {
-    var id = -1;
-    if (editor.multiSelect) {
-        id = editor.selection.index;
-        if (contextCache.rangeCount != editor.multiSelect.rangeCount)
-            contextCache = {rangeCount: editor.multiSelect.rangeCount};
-    }
-    if (contextCache[id])
-        return context = contextCache[id];
-    context = contextCache[id] = {
-        autoInsertedBrackets: 0,
-        autoInsertedRow: -1,
-        autoInsertedLineEnd: "",
-        maybeInsertedBrackets: 0,
-        maybeInsertedRow: -1,
-        maybeInsertedLineStart: "",
-        maybeInsertedLineEnd: ""
-    };
-};
-
-var CstyleBehaviour = function() {
-    this.add("braces", "insertion", function(state, action, editor, session, text) {
-        var cursor = editor.getCursorPosition();
-        var line = session.doc.getLine(cursor.row);
-        if (text == '{') {
-            initContext(editor);
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "" && selected !== "{" && editor.getWrapBehavioursEnabled()) {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else if (CstyleBehaviour.isSaneInsertion(editor, session)) {
-                if (/[\]\}\)]/.test(line[cursor.column]) || editor.inMultiSelectMode) {
-                    CstyleBehaviour.recordAutoInsert(editor, session, "}");
-                    return {
-                        text: '{}',
-                        selection: [1, 1]
-                    };
-                } else {
-                    CstyleBehaviour.recordMaybeInsert(editor, session, "{");
-                    return {
-                        text: '{',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == '}') {
-            initContext(editor);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null && CstyleBehaviour.isAutoInsertedClosing(cursor, line, text)) {
-                    CstyleBehaviour.popAutoInsertedClosing();
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n" || text == "\r\n") {
-            initContext(editor);
-            var closing = "";
-            if (CstyleBehaviour.isMaybeInsertedClosing(cursor, line)) {
-                closing = lang.stringRepeat("}", context.maybeInsertedBrackets);
-                CstyleBehaviour.clearMaybeInsertedClosing();
-            }
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar === '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column+1}, '}');
-                if (!openBracePos)
-                     return null;
-                var next_indent = this.$getIndent(session.getLine(openBracePos.row));
-            } else if (closing) {
-                var next_indent = this.$getIndent(line);
-            } else {
-                CstyleBehaviour.clearMaybeInsertedClosing();
-                return;
-            }
-            var indent = next_indent + session.getTabString();
-
-            return {
-                text: '\n' + indent + '\n' + next_indent + closing,
-                selection: [1, indent.length, 1, indent.length]
-            };
-        } else {
-            CstyleBehaviour.clearMaybeInsertedClosing();
-        }
-    });
-
-    this.add("braces", "deletion", function(state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            initContext(editor);
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            } else {
-                context.maybeInsertedBrackets--;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function(state, action, editor, session, text) {
-        if (text == '(') {
-            initContext(editor);
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "" && editor.getWrapBehavioursEnabled()) {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else if (CstyleBehaviour.isSaneInsertion(editor, session)) {
-                CstyleBehaviour.recordAutoInsert(editor, session, ")");
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            initContext(editor);
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null && CstyleBehaviour.isAutoInsertedClosing(cursor, line, text)) {
-                    CstyleBehaviour.popAutoInsertedClosing();
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function(state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            initContext(editor);
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("brackets", "insertion", function(state, action, editor, session, text) {
-        if (text == '[') {
-            initContext(editor);
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "" && editor.getWrapBehavioursEnabled()) {
-                return {
-                    text: '[' + selected + ']',
-                    selection: false
-                };
-            } else if (CstyleBehaviour.isSaneInsertion(editor, session)) {
-                CstyleBehaviour.recordAutoInsert(editor, session, "]");
-                return {
-                    text: '[]',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ']') {
-            initContext(editor);
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ']') {
-                var matching = session.$findOpeningBracket(']', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null && CstyleBehaviour.isAutoInsertedClosing(cursor, line, text)) {
-                    CstyleBehaviour.popAutoInsertedClosing();
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("brackets", "deletion", function(state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '[') {
-            initContext(editor);
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ']') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function(state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            initContext(editor);
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "" && selected !== "'" && selected != '"' && editor.getWrapBehavioursEnabled()) {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-                if (leftChar == '\\') {
-                    return null;
-                }
-                var tokens = session.getTokens(selection.start.row);
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    if (!CstyleBehaviour.isSaneInsertion(editor, session))
-                        return;
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function(state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            initContext(editor);
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == selected) {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-
-CstyleBehaviour.isSaneInsertion = function(editor, session) {
-    var cursor = editor.getCursorPosition();
-    var iterator = new TokenIterator(session, cursor.row, cursor.column);
-    if (!this.$matchTokenType(iterator.getCurrentToken() || "text", SAFE_INSERT_IN_TOKENS)) {
-        var iterator2 = new TokenIterator(session, cursor.row, cursor.column + 1);
-        if (!this.$matchTokenType(iterator2.getCurrentToken() || "text", SAFE_INSERT_IN_TOKENS))
-            return false;
-    }
-    iterator.stepForward();
-    return iterator.getCurrentTokenRow() !== cursor.row ||
-        this.$matchTokenType(iterator.getCurrentToken() || "text", SAFE_INSERT_BEFORE_TOKENS);
-};
-
-CstyleBehaviour.$matchTokenType = function(token, types) {
-    return types.indexOf(token.type || token) > -1;
-};
-
-CstyleBehaviour.recordAutoInsert = function(editor, session, bracket) {
-    var cursor = editor.getCursorPosition();
-    var line = session.doc.getLine(cursor.row);
-    if (!this.isAutoInsertedClosing(cursor, line, context.autoInsertedLineEnd[0]))
-        context.autoInsertedBrackets = 0;
-    context.autoInsertedRow = cursor.row;
-    context.autoInsertedLineEnd = bracket + line.substr(cursor.column);
-    context.autoInsertedBrackets++;
-};
-
-CstyleBehaviour.recordMaybeInsert = function(editor, session, bracket) {
-    var cursor = editor.getCursorPosition();
-    var line = session.doc.getLine(cursor.row);
-    if (!this.isMaybeInsertedClosing(cursor, line))
-        context.maybeInsertedBrackets = 0;
-    context.maybeInsertedRow = cursor.row;
-    context.maybeInsertedLineStart = line.substr(0, cursor.column) + bracket;
-    context.maybeInsertedLineEnd = line.substr(cursor.column);
-    context.maybeInsertedBrackets++;
-};
-
-CstyleBehaviour.isAutoInsertedClosing = function(cursor, line, bracket) {
-    return context.autoInsertedBrackets > 0 &&
-        cursor.row === context.autoInsertedRow &&
-        bracket === context.autoInsertedLineEnd[0] &&
-        line.substr(cursor.column) === context.autoInsertedLineEnd;
-};
-
-CstyleBehaviour.isMaybeInsertedClosing = function(cursor, line) {
-    return context.maybeInsertedBrackets > 0 &&
-        cursor.row === context.maybeInsertedRow &&
-        line.substr(cursor.column) === context.maybeInsertedLineEnd &&
-        line.substr(0, cursor.column) == context.maybeInsertedLineStart;
-};
-
-CstyleBehaviour.popAutoInsertedClosing = function() {
-    context.autoInsertedLineEnd = context.autoInsertedLineEnd.substr(1);
-    context.autoInsertedBrackets--;
-};
-
-CstyleBehaviour.clearMaybeInsertedClosing = function() {
-    if (context) {
-        context.maybeInsertedBrackets = 0;
-        context.maybeInsertedRow = -1;
-    }
-};
-
-
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});
-
-ace.define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(acequire, exports, module) {
-"use strict";
-
-var oop = acequire("../../lib/oop");
-var Range = acequire("../../range").Range;
-var BaseFoldMode = acequire("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(commentRegex) {
-    if (commentRegex) {
-        this.foldingStartMarker = new RegExp(
-            this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
-        );
-        this.foldingStopMarker = new RegExp(
-            this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
-        );
-    }
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-
-    this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length, 1);
-
-            if (range && !range.isMultiLine()) {
-                if (forceMultiline) {
-                    range = this.getSectionRange(session, row);
-                } else if (foldStyle != "all")
-                    range = null;
-            }
-
-            return range;
-        }
-
-        if (foldStyle === "markbegin")
-            return;
-
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[1])
-                return this.closingBracketBlock(session, match[1], row, i);
-
-            return session.getCommentFoldRange(row, i, -1);
-        }
-    };
-
-    this.getSectionRange = function(session, row) {
-        var line = session.getLine(row);
-        var startIndent = line.search(/\S/);
-        var startRow = row;
-        var startColumn = line.length;
-        row = row + 1;
-        var endRow = row;
-        var maxRow = session.getLength();
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var indent = line.search(/\S/);
-            if (indent === -1)
-                continue;
-            if  (startIndent > indent)
-                break;
-            var subRange = this.getFoldWidgetRange(session, "all", row);
-
-            if (subRange) {
-                if (subRange.start.row <= startRow) {
-                    break;
-                } else if (subRange.isMultiLine()) {
-                    row = subRange.end.row;
-                } else if (startIndent == indent) {
-                    break;
-                }
-            }
-            endRow = row;
-        }
-
-        return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-
-ace.define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"], function(acequire, exports, module) {
-"use strict";
-
-var oop = acequire("../lib/oop");
-var TextMode = acequire("./text").Mode;
-var JavaScriptHighlightRules = acequire("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = acequire("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = acequire("../range").Range;
-var WorkerClient = acequire("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = acequire("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = acequire("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.HighlightRules = JavaScriptHighlightRules;
-
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.lineCommentStart = "//";
-    this.blockComment = {start: "/*", end: "*/"};
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start" || state == "no_regex") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || endState == "no_regex") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-//    this.createWorker = function(session) {
-//        var worker = new WorkerClient(["ace"], "ace/mode/javascript_worker", "JavaScriptWorker");
-//        worker.attachToDocument(session.getDocument());
-//
-//        worker.on("jslint", function(results) {
-//            session.setAnnotations(results.data);
-//        });
-//
-//        worker.on("terminate", function() {
-//            session.clearAnnotations();
-//        });
-//
-//        return worker;
-//    };
-
-    this.$id = "ace/mode/javascript";
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
diff --git a/js/src/ui/Errors/actions.js b/js/src/ui/Errors/actions.js
deleted file mode 100644
index 676543f72bdca2b067ee9c9624b7f47a78b841de..0000000000000000000000000000000000000000
--- a/js/src/ui/Errors/actions.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function newError (error) {
-  return {
-    type: 'newError',
-    error
-  };
-}
-
-export function closeErrors () {
-  return {
-    type: 'closeErrors'
-  };
-}
diff --git a/js/src/ui/Errors/errors.css b/js/src/ui/Errors/errors.css
deleted file mode 100644
index 2f37d9bfac8233699365a2e7e2ea64dc1b155e22..0000000000000000000000000000000000000000
--- a/js/src/ui/Errors/errors.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  z-index: 10101 !important;
-
-  button {
-    color: white !important;
-    margin: 0 !important;
-    margin-right: -16px !important;
-  }
-}
diff --git a/js/src/ui/Errors/errors.js b/js/src/ui/Errors/errors.js
deleted file mode 100644
index 764b072f7213dd237b1106f6e5bc309c5d500716..0000000000000000000000000000000000000000
--- a/js/src/ui/Errors/errors.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { Snackbar } from 'material-ui';
-
-import { closeErrors } from './actions';
-
-import styles from './errors.css';
-
-const ERROR_REGEX = /-(\d+): (.+)$/;
-const DURATION_OPEN = 60000;
-const STYLE_BODY = {
-  height: 'auto',
-  whiteSpace: 'pre-line'
-};
-const STYLE_CONTENT = {
-  alignItems: 'center',
-  display: 'flex',
-  flexDirection: 'row',
-  justifyContent: 'space-between',
-  lineHeight: '1.5em',
-  padding: '0.75em 0'
-};
-
-class Errors extends Component {
-  static propTypes = {
-    message: PropTypes.string,
-    error: PropTypes.object,
-    visible: PropTypes.bool,
-    onCloseErrors: PropTypes.func
-  };
-
-  render () {
-    const { message, visible, onCloseErrors } = this.props;
-
-    if (!message || !visible) {
-      return null;
-    }
-
-    const text = this.getErrorMessage();
-
-    return (
-      <Snackbar
-        className={ styles.container }
-        open
-        action={
-          <FormattedMessage
-            id='ui.errors.close'
-            defaultMessage='close'
-          />
-        }
-        autoHideDuration={ DURATION_OPEN }
-        message={ text }
-        onActionTouchTap={ onCloseErrors }
-        onRequestClose={ this.onRequestClose }
-        bodyStyle={ STYLE_BODY }
-        contentStyle={ STYLE_CONTENT }
-      />
-    );
-  }
-
-  getErrorMessage = () => {
-    const { message, error } = this.props;
-
-    if (!error.text && !ERROR_REGEX.test(message)) {
-      return message;
-    }
-
-    const matches = ERROR_REGEX.exec(message);
-
-    const code = error.code || parseInt(matches[1]) * -1;
-    const text = error.text || matches[2];
-
-    return `[${code}] ${text}`;
-  }
-
-  onRequestClose = (reason) => {
-    if (reason === 'timeout') {
-      this.props.onCloseErrors();
-    }
-  }
-}
-
-function mapStateToProps (state) {
-  const { message, error, visible } = state.errors;
-
-  return {
-    message,
-    error,
-    visible
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    onCloseErrors: closeErrors
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Errors);
diff --git a/js/src/ui/Errors/index.js b/js/src/ui/Errors/index.js
deleted file mode 100644
index f596c42875bfc6df46c38e40a91c17aeeb4fb063..0000000000000000000000000000000000000000
--- a/js/src/ui/Errors/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import errorReducer from './reducers';
-import { newError } from './actions';
-
-export default from './errors';
-
-export {
-  errorReducer,
-  newError
-};
diff --git a/js/src/ui/Errors/middleware.js b/js/src/ui/Errors/middleware.js
deleted file mode 100644
index 7cdc1ecd5189075aa98dca941fdc29bd5710c4b3..0000000000000000000000000000000000000000
--- a/js/src/ui/Errors/middleware.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { newError } from './actions';
-
-function withError (formatter, type = 'default') {
-  return (message) => {
-    return {
-      error: {
-        message: formatter(message),
-        type
-      }
-    };
-  };
-}
-
-export default class ErrorsMiddleware {
-  toMiddleware () {
-    return (store) => (next) => (action) => {
-      const { meta } = action;
-
-      if (meta && meta.error) {
-        next(newError(meta.error));
-      }
-
-      next(action);
-    };
-  }
-}
-
-export {
-  withError
-};
diff --git a/js/src/ui/Errors/reducers.js b/js/src/ui/Errors/reducers.js
deleted file mode 100644
index 62f887bac4208b02bd69b002b435ebc18cac6735..0000000000000000000000000000000000000000
--- a/js/src/ui/Errors/reducers.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-function newError (state, action) {
-  const { error } = action;
-
-  return Object.assign({}, state, {
-    visible: true,
-    message: error.message,
-    error
-  });
-}
-
-function closeErrors (state, action) {
-  return Object.assign({}, state, {
-    visible: false,
-    message: null
-  });
-}
-
-export default function errorReducer (state = {}, action) {
-  switch (action.type) {
-    case 'newError':
-      return newError(state, action);
-
-    case 'closeErrors':
-      return closeErrors(state, action);
-
-    default:
-      return state;
-  }
-}
diff --git a/js/src/ui/Features/constants.js b/js/src/ui/Features/constants.js
deleted file mode 100644
index a416196e33c75c475ebe90f19205e98b05c59a83..0000000000000000000000000000000000000000
--- a/js/src/ui/Features/constants.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const LS_STORE_KEY = '_parity::features';
-
-export {
-  LS_STORE_KEY
-};
diff --git a/js/src/ui/Features/defaults.js b/js/src/ui/Features/defaults.js
deleted file mode 100644
index 1e85c398e26a9145e7febe4527a9fb1e5223a7ce..0000000000000000000000000000000000000000
--- a/js/src/ui/Features/defaults.js
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-
-const MODES = {
-  DEVELOPMENT: 1000, // only in dev mode, disabled by default, can be toggled
-  TESTING: 1011, // feature is available in dev mode
-  PRODUCTION: 1022 // feature is available
-};
-
-const FEATURES = {
-  LANGUAGE: 'LANGUAGE',
-  LOGLEVELS: 'LOGLEVELS'
-};
-
-const DEFAULTS = {
-  [FEATURES.LANGUAGE]: {
-    mode: MODES.TESTING,
-    name: (
-      <FormattedMessage
-        id='ui.features.defaults.i18n.name'
-        defaultMssage='Language Selection'
-      />
-    ),
-    description: (
-      <FormattedMessage
-        id='ui.features.defaults.i18n.desc'
-        defaultMssage='Allows changing the default interface language'
-      />
-    )
-  },
-  [FEATURES.LOGLEVELS]: {
-    mode: MODES.TESTING,
-    name: (
-      <FormattedMessage
-        id='ui.features.defaults.logging.name'
-        defaultMssage='Logging Level Selection'
-      />
-    ),
-    description: (
-      <FormattedMessage
-        id='ui.features.defaults.logging.desc'
-        defaultMssage='Allows changing of the log levels for various components'
-      />
-    )
-  }
-};
-
-if (process.env.NODE_ENV === 'test') {
-  Object
-    .keys(MODES)
-    .forEach((mode) => {
-      const key = `.${mode}`;
-
-      FEATURES[key] = key;
-      DEFAULTS[key] = {
-        mode: MODES[mode],
-        name: key,
-        description: key
-      };
-    });
-}
-
-export default DEFAULTS;
-
-export {
-  FEATURES,
-  MODES
-};
diff --git a/js/src/ui/Features/defaults.spec.js b/js/src/ui/Features/defaults.spec.js
deleted file mode 100644
index bde19f458f0395dd0226064468ac7b3364bdf892..0000000000000000000000000000000000000000
--- a/js/src/ui/Features/defaults.spec.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import defaults, { FEATURES, MODES } from './defaults';
-
-const features = Object.values(FEATURES);
-const modes = Object.values(MODES);
-
-describe('ui/Features/Defaults', () => {
-  describe('feature codes', () => {
-    Object.keys(FEATURES).forEach((key) => {
-      describe(key, () => {
-        let value;
-
-        beforeEach(() => {
-          value = FEATURES[key];
-        });
-
-        it('exists as an default', () => {
-          expect(defaults[value]).to.be.ok;
-        });
-
-        it('has a single unique code', () => {
-          expect(features.filter((code) => code === value).length).to.equal(1);
-        });
-      });
-    });
-  });
-
-  describe('defaults', () => {
-    Object.keys(defaults).forEach((key) => {
-      describe(key, () => {
-        let value;
-
-        beforeEach(() => {
-          value = defaults[key];
-        });
-
-        it('exists as an exposed feature', () => {
-          expect(features.includes(key)).to.be.ok;
-        });
-
-        it('has a valid mode', () => {
-          expect(modes.includes(value.mode)).to.be.true;
-        });
-
-        it('has a name and description', () => {
-          expect(value.description).to.be.ok;
-          expect(value.name).to.be.ok;
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/ui/Features/features.css b/js/src/ui/Features/features.css
deleted file mode 100644
index f064074d480a22735d08fd82daeb3f3168b0557f..0000000000000000000000000000000000000000
--- a/js/src/ui/Features/features.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.description {
-  opacity: 0.75;
-}
diff --git a/js/src/ui/Features/features.js b/js/src/ui/Features/features.js
deleted file mode 100644
index 041a6cbc100b9415010d40724ee9dfc553d31728..0000000000000000000000000000000000000000
--- a/js/src/ui/Features/features.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Checkbox } from 'material-ui';
-import { observer } from 'mobx-react';
-import { List, ListItem } from 'material-ui/List';
-import React, { Component } from 'react';
-
-import defaults, { MODES } from './defaults';
-import Store from './store';
-import styles from './features.css';
-
-@observer
-export default class Features extends Component {
-  store = Store.get();
-
-  render () {
-    if (process.env.NODE_ENV === 'production') {
-      return null;
-    }
-
-    return (
-      <List>
-        {
-          Object
-            .keys(defaults)
-            .filter((key) => defaults[key].mode !== MODES.PRODUCTION)
-            .map(this.renderItem)
-        }
-      </List>
-    );
-  }
-
-  renderItem = (key) => {
-    const feature = defaults[key];
-    const onCheck = () => this.store.toggleActive(key);
-
-    return (
-      <ListItem
-        key={ `feature_${key}` }
-        leftCheckbox={
-          <Checkbox
-            checked={ this.store.active[key] }
-            onCheck={ onCheck }
-          />
-        }
-        primaryText={ feature.name }
-        secondaryText={
-          <div className={ styles.description }>
-            { feature.description }
-          </div>
-        }
-      />
-    );
-  }
-}
diff --git a/js/src/ui/Features/features.spec.js b/js/src/ui/Features/features.spec.js
deleted file mode 100644
index de1cbdb0ae9ce7dec88e2b131d6643050306d37f..0000000000000000000000000000000000000000
--- a/js/src/ui/Features/features.spec.js
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import defaults, { MODES } from './defaults';
-
-import Features from './';
-
-let component;
-let instance;
-
-function render (props = { visible: true }) {
-  component = shallow(
-    <Features { ...props } />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Settings/Features', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('visibility', () => {
-    let oldEnv;
-
-    beforeEach(() => {
-      oldEnv = process.env.NODE_ENV;
-    });
-
-    afterEach(() => {
-      process.env.NODE_ENV = oldEnv;
-    });
-
-    it('renders null when NODE_ENV === production', () => {
-      process.env.NODE_ENV = 'production';
-      render();
-      expect(component.get(0)).to.be.null;
-    });
-
-    it('renders component when NODE_ENV !== production', () => {
-      process.env.NODE_ENV = 'development';
-      render();
-      expect(component.get(0)).not.to.be.null;
-    });
-  });
-
-  describe('instance methods', () => {
-    describe('renderItem', () => {
-      const keys = Object.keys(defaults).filter((key) => defaults[key].mode !== MODES.PRODUCTION);
-      const key = keys[0];
-
-      let item;
-
-      beforeEach(() => {
-        item = instance.renderItem(key);
-      });
-
-      it('renders an item', () => {
-        expect(item).not.to.be.null;
-      });
-
-      it('displays the correct name', () => {
-        expect(item.props.primaryText).to.equal(defaults[key].name);
-      });
-    });
-  });
-});
diff --git a/js/src/ui/Features/index.js b/js/src/ui/Features/index.js
deleted file mode 100644
index 3202afacad8f69d323e2242638729986673e59e7..0000000000000000000000000000000000000000
--- a/js/src/ui/Features/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { FEATURES } from './defaults';
-import FeaturesStore from './store';
-
-export default from './features';
-
-export {
-  FEATURES,
-  FeaturesStore
-};
diff --git a/js/src/ui/Features/store.js b/js/src/ui/Features/store.js
deleted file mode 100644
index 3dbcc6e34e0413c4eb5cdadb1ef6d8a9a886f0d2..0000000000000000000000000000000000000000
--- a/js/src/ui/Features/store.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-import store from 'store';
-
-import { LS_STORE_KEY } from './constants';
-import defaults, { FEATURES, MODES } from './defaults';
-
-const isProductionMode = process.env.NODE_ENV === 'production';
-
-let instance = null;
-
-export default class Store {
-  @observable active = {};
-
-  constructor () {
-    this.loadActiveFeatures();
-  }
-
-  @action setActiveFeatures = (features = {}, isProduction) => {
-    this.active = Object.assign({}, this.getDefaultActive(isProduction), features);
-  }
-
-  @action toggleActive = (featureKey) => {
-    this.active = Object.assign({}, this.active, { [featureKey]: !this.active[featureKey] });
-    this.saveActiveFeatures();
-  }
-
-  getDefaultActive (isProduction = isProductionMode) {
-    const modesTest = [MODES.PRODUCTION];
-
-    if (!isProduction) {
-      modesTest.push(MODES.TESTING);
-    }
-
-    return Object
-      .keys(FEATURES)
-      .reduce((visibility, feature) => {
-        visibility[feature] = modesTest.includes(defaults[feature].mode);
-        return visibility;
-      }, {});
-  }
-
-  loadActiveFeatures () {
-    this.setActiveFeatures(store.get(LS_STORE_KEY));
-  }
-
-  saveActiveFeatures () {
-    store.set(LS_STORE_KEY, this.active);
-  }
-
-  static get () {
-    if (!instance) {
-      instance = new Store();
-    }
-
-    return instance;
-  }
-}
diff --git a/js/src/ui/Features/store.spec.js b/js/src/ui/Features/store.spec.js
deleted file mode 100644
index 1ef6c84ea79c77b758d13f0c423cf5afb15be0d1..0000000000000000000000000000000000000000
--- a/js/src/ui/Features/store.spec.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import lstore from 'store';
-
-import { LS_STORE_KEY } from './constants';
-import defaults, { MODES } from './defaults';
-
-import Store from './store';
-
-let store;
-
-function createStore () {
-  store = new Store();
-
-  return store;
-}
-
-describe('ui/Features/Store', () => {
-  beforeEach(() => {
-    lstore.set(LS_STORE_KEY, { 'testingFromStorage': true });
-    createStore();
-  });
-
-  it('loads with values from localStorage', () => {
-    expect(store.active.testingFromStorage).to.be.true;
-  });
-
-  describe('@action', () => {
-    describe('setActiveFeatures', () => {
-      it('sets the active features', () => {
-        store.setActiveFeatures({ 'testing': true });
-        expect(store.active.testing).to.be.true;
-      });
-
-      it('overrides the defaults', () => {
-        store.setActiveFeatures({ '.PRODUCTION': false });
-        expect(store.active['.PRODUCTION']).to.be.false;
-      });
-    });
-
-    describe('toggleActive', () => {
-      it('changes the state of a feature', () => {
-        expect(store.active['.PRODUCTION']).to.be.true;
-        store.toggleActive('.PRODUCTION');
-        expect(store.active['.PRODUCTION']).to.be.false;
-      });
-
-      it('saves the updated state to localStorage', () => {
-        store.toggleActive('.PRODUCTION');
-        expect(lstore.get(LS_STORE_KEY)).to.deep.equal(store.active);
-      });
-    });
-  });
-
-  describe('operations', () => {
-    describe('getDefaultActive', () => {
-      it('returns features where mode === TESTING|PRODUCTION (non-production)', () => {
-        const visibility = store.getDefaultActive(false);
-
-        expect(
-          Object
-            .keys(visibility)
-            .filter((key) => visibility[key])
-            .filter((key) => ![MODES.TESTING, MODES.PRODUCTION].includes(defaults[key].mode))
-            .length
-        ).to.equal(0);
-      });
-
-      it('returns features where mode === PRODUCTION (production)', () => {
-        const visibility = store.getDefaultActive(true);
-
-        expect(
-          Object
-            .keys(visibility)
-            .filter((key) => visibility[key])
-            .filter((key) => ![MODES.PRODUCTION].includes(defaults[key].mode))
-            .length
-        ).to.equal(0);
-      });
-    });
-  });
-});
diff --git a/js/src/ui/Form/AddressSelect/addressSelect.css b/js/src/ui/Form/AddressSelect/addressSelect.css
deleted file mode 100644
index 5b7ced7481de886a24660ce984e7615ae370a208..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/AddressSelect/addressSelect.css
+++ /dev/null
@@ -1,164 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.outerInput {
-  display: flex;
-  flex-direction: row;
-  position: relative;
-
-  .input {
-    flex: 1;
-  }
-
-  .loader {
-    position: absolute;
-    bottom: 1rem;
-    right: 9rem;
-  }
-}
-
-.input {
-  box-sizing: border-box;
-  appearance: textfield;
-  width: 100%;
-  padding: 0;
-  border: none;
-  background: transparent;
-
-  transition-property: font-size, padding;
-  transition-duration: 0.5s;
-  transition-timing-function: cubic-bezier(0.7,0,0.3,1);
-
-  color: white;
-  font-family: inherit;
-  font-size: 2em;
-
-  &:focus {
-    outline: none;
-  }
-
-  &::placeholder {
-    color: #a2a2a2;
-  }
-}
-
-.copy {
-  margin-right: 0.5em;
-}
-
-.inputAddressContainer {
-  display: flex;
-  flex-direction: row;
-  align-items: baseline;
-  position: relative;
-}
-
-.inputAddress {
-  flex: 1;
-
-  &:focus {
-    outline: none;
-  }
-
-  > *:hover {
-    cursor: text !important;
-  }
-}
-
-.main {
-  position: relative;
-  left: 0;
-}
-
-.title {
-  display: flex;
-  flex-direction: column;
-  position: relative;
-}
-
-.label {
-  margin: 1rem 0.5rem 0.25em;
-  color: rgba(255, 255, 255, 0.498039);
-}
-
-.underline {
-  position: relative;
-  margin: 0 0.5rem 0 0.5rem;
-}
-
-.empty {
-  font-size: 1.5em;
-}
-
-.inputContainer {
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-
-  .input {
-    font-size: 1.5em;
-    padding: 0 9rem 0.5em 0.5rem;
-    display: block;
-
-    padding-right: 6rem;
-  }
-}
-
-.container {
-  margin-bottom: 1em;
-}
-
-.categories {
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  justify-content: flex-start;
-
-  > * {
-    flex: 1;
-  }
-}
-
-.category {
-  display: flex;
-  flex-direction: column;
-  margin: 0 0.5em;
-  max-width: 35em;
-
-  .title {
-    text-transform: uppercase;
-    font-color: white;
-
-    h3 {
-      margin: 0;
-    }
-  }
-
-  .cards {
-    flex: 1;
-    overflow: auto;
-
-    display: flex;
-    flex-direction: column;
-
-    margin: 1em 0;
-  }
-
-  .account {
-    margin: 0.5em 0;
-  }
-}
diff --git a/js/src/ui/Form/AddressSelect/addressSelect.js b/js/src/ui/Form/AddressSelect/addressSelect.js
deleted file mode 100644
index 8a2c6d577693fa26cbe7e40a808e5c6055a16d33..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/AddressSelect/addressSelect.js
+++ /dev/null
@@ -1,656 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import ReactDOM from 'react-dom';
-import { connect } from 'react-redux';
-import keycode, { codes } from 'keycode';
-import { FormattedMessage } from 'react-intl';
-import { observer } from 'mobx-react';
-
-import TextFieldUnderline from 'material-ui/TextField/TextFieldUnderline';
-
-import apiutil from '~/api/util';
-import AccountCard from '~/ui/AccountCard';
-import CopyToClipboard from '~/ui/CopyToClipboard';
-import InputAddress from '~/ui/Form/InputAddress';
-import Loading from '~/ui/Loading';
-import Portal from '~/ui/Portal';
-import { nodeOrStringProptype } from '~/util/proptypes';
-import { validateAddress } from '~/util/validation';
-import { toString } from '~/util/messages';
-
-import AddressSelectStore from './addressSelectStore';
-import styles from './addressSelect.css';
-
-const BOTTOM_BORDER_STYLE = { borderBottom: 'solid 3px' };
-
-// Current Form ID
-let currentId = 1;
-
-@observer
-class AddressSelect extends Component {
-  static contextTypes = {
-    intl: React.PropTypes.object.isRequired,
-    api: PropTypes.object.isRequired,
-    muiTheme: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    // Required props
-    onChange: PropTypes.func.isRequired,
-
-    // Redux props
-    accountsInfo: PropTypes.object,
-    accounts: PropTypes.object,
-    contacts: PropTypes.object,
-    contracts: PropTypes.object,
-    tokens: PropTypes.object,
-    reverse: PropTypes.object,
-
-    // Optional props
-    allowCopy: PropTypes.bool,
-    allowInput: PropTypes.bool,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    error: nodeOrStringProptype(),
-    hint: nodeOrStringProptype(),
-    label: nodeOrStringProptype(),
-    readOnly: PropTypes.bool,
-    value: nodeOrStringProptype()
-  };
-
-  static defaultProps = {
-    value: ''
-  };
-
-  store = new AddressSelectStore(this.context.api);
-
-  state = {
-    expanded: false,
-    focused: false,
-    focusedCat: null,
-    focusedItem: null,
-    inputFocused: false,
-    inputValue: ''
-  };
-
-  componentWillMount () {
-    this.setValues();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (this.store.values && this.store.values.length > 0) {
-      return;
-    }
-
-    this.setValues(nextProps);
-  }
-
-  setValues (props = this.props) {
-    this.store.setValues(props);
-  }
-
-  render () {
-    const input = this.renderInput();
-    const content = this.renderContent();
-
-    return (
-      <div className={ styles.main }>
-        { input }
-        { content }
-      </div>
-    );
-  }
-
-  renderInput () {
-    const { focused } = this.state;
-    const { accountsInfo, allowCopy, className, disabled, error, hint, label, readOnly, value } = this.props;
-
-    const input = (
-      <InputAddress
-        accountsInfo={ accountsInfo }
-        allowCopy={ (disabled || readOnly) && allowCopy ? allowCopy : false }
-        className={ className }
-        disabled={ disabled || readOnly }
-        error={ error }
-        hint={ hint }
-        focused={ focused }
-        label={ label }
-        readOnly
-        tabIndex={ -1 }
-        text
-        value={ value }
-      />
-    );
-
-    if (disabled || readOnly) {
-      return input;
-    }
-
-    return (
-      <div className={ styles.inputAddressContainer }>
-        { this.renderCopyButton() }
-        <div
-          className={ styles.inputAddress }
-          onBlur={ this.handleMainBlur }
-          onClick={ this.handleFocus }
-          onFocus={ this.handleMainFocus }
-          onKeyDown={ this.handleInputAddresKeydown }
-          ref='inputAddress'
-          tabIndex={ 0 }
-        >
-          { input }
-        </div>
-      </div>
-    );
-  }
-
-  renderCopyButton () {
-    const { allowCopy, value } = this.props;
-
-    if (!allowCopy) {
-      return null;
-    }
-
-    const text = typeof allowCopy === 'string'
-      ? allowCopy
-      : value.toString();
-
-    return (
-      <div className={ styles.copy }>
-        <CopyToClipboard data={ text } />
-      </div>
-    );
-  }
-
-  renderContent () {
-    const { muiTheme } = this.context;
-    const { hint, disabled, label, readOnly } = this.props;
-    const { expanded, inputFocused } = this.state;
-
-    if (disabled || readOnly) {
-      return null;
-    }
-
-    const id = `addressSelect_${++currentId}`;
-    const ilHint = toString(this.context, hint);
-
-    return (
-      <Portal
-        className={ styles.inputContainer }
-        isChildModal
-        onClick={ this.handleClose }
-        onClose={ this.handleClose }
-        onKeyDown={ this.handleKeyDown }
-        open={ expanded }
-        title={
-          <div className={ styles.title }>
-            <label className={ styles.label } htmlFor={ id }>
-              { label }
-            </label>
-            <div className={ styles.outerInput }>
-              <input
-                id={ id }
-                className={ styles.input }
-                placeholder={ ilHint }
-                onBlur={ this.handleInputBlur }
-                onClick={ this.stopEvent }
-                onFocus={ this.handleInputFocus }
-                onChange={ this.handleChange }
-                ref={ this.setInputRef }
-              />
-              { this.renderLoader() }
-            </div>
-
-            <div className={ styles.underline }>
-              <TextFieldUnderline
-                focus={ inputFocused }
-                focusStyle={ BOTTOM_BORDER_STYLE }
-                muiTheme={ muiTheme }
-                style={ BOTTOM_BORDER_STYLE }
-              />
-            </div>
-          </div>
-        }
-      >
-        { this.renderCurrentInput() }
-        { this.renderRegistryValues() }
-        { this.renderAccounts() }
-      </Portal>
-    );
-  }
-
-  renderLoader () {
-    if (!this.store.loading) {
-      return null;
-    }
-
-    return (
-      <Loading
-        className={ styles.loader }
-        size={ 0.5 }
-      />
-    );
-  }
-
-  renderCurrentInput () {
-    const { inputValue } = this.state;
-
-    if (!this.props.allowInput || !inputValue) {
-      return null;
-    }
-
-    const { address, addressError } = validateAddress(inputValue);
-    const { registryValues } = this.store;
-
-    if (addressError || registryValues.length > 0) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.container }>
-        { this.renderAccountCard({ address, index: 'currentInput_0' }) }
-      </div>
-    );
-  }
-
-  renderRegistryValues () {
-    const { registryValues } = this.store;
-
-    if (registryValues.length === 0) {
-      return null;
-    }
-
-    const accounts = registryValues
-      .map((registryValue, index) => {
-        const account = { ...registryValue, index: `${registryValue.address}_${index}` };
-
-        return this.renderAccountCard(account);
-      });
-
-    return (
-      <div className={ styles.container }>
-        { accounts }
-      </div>
-    );
-  }
-
-  renderAccounts () {
-    const { values } = this.store;
-
-    if (values.length === 0) {
-      return (
-        <div className={ styles.categories }>
-          <div className={ styles.empty }>
-            <FormattedMessage
-              id='addressSelect.noAccount'
-              defaultMessage='No account matches this query...'
-            />
-          </div>
-        </div>
-      );
-    }
-
-    const categories = values.map((category, index) => {
-      return this.renderCategory(category, index);
-    });
-
-    return (
-      <div className={ styles.categories }>
-        { categories }
-      </div>
-    );
-  }
-
-  renderCategory (category, index) {
-    const { label, key, values = [] } = category;
-    let content;
-
-    if (values.length === 0) {
-      content = (
-        <p>
-          <FormattedMessage
-            id='addressSelect.noAccount'
-            defaultMessage='No account matches this query...'
-          />
-        </p>
-      );
-    } else {
-      const cards = values
-        .map((account) => this.renderAccountCard(account));
-
-      content = (
-        <div className={ styles.cards }>
-          <div>{ cards }</div>
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.category } key={ `${key}_${index}` }>
-        <div className={ styles.title }>
-          <h3>{ label }</h3>
-        </div>
-        { content }
-      </div>
-    );
-  }
-
-  renderAccountCard (_account) {
-    const { accountsInfo } = this.props;
-    const { address, index = null } = _account;
-
-    const account = {
-      ...accountsInfo[address],
-      ..._account
-    };
-
-    return (
-      <AccountCard
-        account={ account }
-        className={ styles.account }
-        key={ `account_${index}` }
-        onClick={ this.handleClick }
-        onFocus={ this.focusItem }
-        ref={ `account_${index}` }
-      />
-    );
-  }
-
-  setInputRef = (refId) => {
-    this.inputRef = refId;
-  }
-
-  validateCustomInput = () => {
-    const { allowInput } = this.props;
-    const { inputValue } = this.state;
-    const { values } = this.store;
-
-    // If input is HEX and allowInput === true, send it
-    if (allowInput && inputValue && /^(0x)?([0-9a-f])+$/i.test(inputValue)) {
-      return this.handleClick(inputValue);
-    }
-
-    // If only one value, select it
-    if (values.reduce((cur, cat) => cur + cat.values.length, 0) === 1) {
-      const value = values.find((cat) => cat.values.length > 0).values[0];
-
-      return this.handleClick(value.address);
-    }
-  }
-
-  stopEvent = (event) => {
-    event.stopPropagation();
-  }
-
-  handleInputAddresKeydown = (event) => {
-    const code = keycode(event);
-
-    // Simulate click on input address if enter is pressed
-    if (code === 'enter') {
-      return this.handleDOMAction('inputAddress', 'click');
-    }
-  }
-
-  handleKeyDown = (event) => {
-    const codeName = keycode(event);
-
-    if (event.ctrlKey) {
-      return event;
-    }
-
-    switch (codeName) {
-      case 'enter':
-        const index = this.state.focusedItem;
-
-        if (!index) {
-          return this.validateCustomInput();
-        }
-
-        return this.handleDOMAction(`account_${index}`, 'click');
-
-      case 'left':
-      case 'right':
-      case 'up':
-      case 'down':
-        return this.handleNavigation(codeName, event);
-
-      default:
-        const code = codes[codeName];
-
-        // @see https://github.com/timoxley/keycode/blob/master/index.js
-        // lower case chars
-        if (code >= (97 - 32) && code <= (122 - 32)) {
-          return this.handleDOMAction(this.inputRef, 'focus');
-        }
-
-        // numbers
-        if (code >= 48 && code <= 57) {
-          return this.handleDOMAction(this.inputRef, 'focus');
-        }
-
-        return event;
-    }
-  }
-
-  handleDOMAction = (ref, method) => {
-    const refItem = typeof ref === 'string' ? this.refs[ref] : ref;
-    const element = ReactDOM.findDOMNode(refItem);
-
-    if (!element || typeof element[method] !== 'function') {
-      console.warn('could not find', ref, 'or method', method);
-      return;
-    }
-
-    return element[method]();
-  }
-
-  focusItem = (index) => {
-    this.setState({ focusedItem: index });
-    return this.handleDOMAction(`account_${index}`, 'focus');
-  }
-
-  handleNavigation = (direction, event) => {
-    const { focusedItem, focusedCat } = this.state;
-    const { values } = this.store;
-
-    // Don't do anything if no values
-    if (values.reduce((cur, cat) => cur + cat.values.length, 0) === 0) {
-      return event;
-    }
-
-    // Focus on the first element if none selected yet if going down
-    if (!focusedItem) {
-      if (direction !== 'down') {
-        return event;
-      }
-
-      event.preventDefault();
-
-      const firstCat = values.findIndex((cat) => cat.values.length > 0);
-      const nextCat = focusedCat && values[focusedCat].values.length > 0
-        ? focusedCat
-        : firstCat;
-
-      const nextValues = values[nextCat];
-      const nextFocus = nextValues ? nextValues.values[0] : null;
-
-      return this.focusItem(nextFocus && nextFocus.index || 1);
-    }
-
-    event.preventDefault();
-
-    // Find the previous focused category
-    const prevCategoryIndex = values.findIndex((category) => {
-      return category.values.find((value) => value.index === focusedItem);
-    });
-    const prevFocusIndex = values[prevCategoryIndex].values.findIndex((a) => a.index === focusedItem);
-
-    let nextCategory = prevCategoryIndex;
-    let nextFocusIndex;
-
-    // If down: increase index if possible
-    if (direction === 'down') {
-      const prevN = values[prevCategoryIndex].values.length;
-
-      nextFocusIndex = Math.min(prevFocusIndex + 1, prevN - 1);
-    }
-
-    // If up: decrease index if possible
-    if (direction === 'up') {
-      // Focus on search if at the top
-      if (prevFocusIndex === 0) {
-        return this.handleDOMAction(this.inputRef, 'focus');
-      }
-
-      nextFocusIndex = prevFocusIndex - 1;
-    }
-
-    // If right: next category
-    if (direction === 'right') {
-      const categoryShift = values
-        .slice(prevCategoryIndex + 1, values.length)
-        .findIndex((cat) => cat.values.length > 0) + 1;
-
-      nextCategory = Math.min(prevCategoryIndex + categoryShift, values.length - 1);
-    }
-
-    // If right: previous category
-    if (direction === 'left') {
-      const categoryShift = values
-        .slice(0, prevCategoryIndex)
-        .reverse()
-        .findIndex((cat) => cat.values.length > 0) + 1;
-
-      nextCategory = Math.max(prevCategoryIndex - categoryShift, 0);
-    }
-
-    // If left or right: try to keep the horizontal index
-    if (direction === 'left' || direction === 'right') {
-      this.setState({ focusedCat: nextCategory });
-      nextFocusIndex = Math.min(prevFocusIndex, values[nextCategory].values.length - 1);
-    }
-
-    const nextFocus = values[nextCategory].values[nextFocusIndex].index;
-
-    return this.focusItem(nextFocus);
-  }
-
-  handleClick = (address) => {
-    // Don't do anything if it's only text-selection
-    if (window.getSelection && window.getSelection().type === 'Range') {
-      return;
-    }
-
-    this.props.onChange(null, address);
-    this.handleClose();
-  }
-
-  handleMainBlur = () => {
-    if (this.props.readOnly) {
-      return;
-    }
-
-    if (window.document.hasFocus() && !this.state.expanded) {
-      this.closing = false;
-      this.setState({ focused: false });
-    }
-  }
-
-  handleMainFocus = () => {
-    if (this.state.focused || this.props.readOnly) {
-      return;
-    }
-
-    this.setState({ focused: true }, () => {
-      if (this.closing) {
-        this.closing = false;
-        return;
-      }
-
-      this.handleFocus();
-    });
-  }
-
-  handleFocus = () => {
-    const { disabled, readOnly } = this.props;
-
-    if (disabled || readOnly) {
-      return;
-    }
-
-    this.setState({ expanded: true, focusedItem: null, focusedCat: null }, () => {
-      window.setTimeout(() => {
-        this.handleDOMAction(this.inputRef, 'focus');
-      });
-    });
-  }
-
-  handleClose = () => {
-    this.closing = true;
-
-    if (this.refs.inputAddress) {
-      this.handleDOMAction('inputAddress', 'focus');
-    }
-
-    this.store.resetRegistryValues();
-    this.store.handleChange('');
-
-    this.setState({
-      expanded: false,
-      focusedItem: null,
-      inputValue: ''
-    });
-  }
-
-  handleInputBlur = () => {
-    this.setState({ inputFocused: false });
-  }
-
-  handleInputFocus = () => {
-    this.setState({ focusedItem: null, inputFocused: true });
-  }
-
-  handleChange = (event = { target: {} }) => {
-    const { value = '' } = event.target;
-
-    this.store.handleChange(value);
-
-    this.setState({
-      focusedItem: null,
-      inputValue: value
-    });
-
-    if (apiutil.isAddressValid(value)) {
-      this.handleClick(value);
-    }
-  }
-}
-
-function mapStateToProps (state) {
-  const { accountsInfo } = state.personal;
-  const { reverse } = state.registry;
-
-  return {
-    accountsInfo,
-    reverse
-  };
-}
-
-export default connect(
-  mapStateToProps
-)(AddressSelect);
diff --git a/js/src/ui/Form/AddressSelect/addressSelectStore.js b/js/src/ui/Form/AddressSelect/addressSelectStore.js
deleted file mode 100644
index 7fc1db4802c2ea0157db8e45b5f9679b97dd459c..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/AddressSelect/addressSelectStore.js
+++ /dev/null
@@ -1,314 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { observable, action, transaction } from 'mobx';
-import { flatMap, uniqBy } from 'lodash';
-import { FormattedMessage } from 'react-intl';
-
-import Contracts from '~/contracts';
-import { sha3 } from '~/api/util/sha3';
-
-const ZERO = /^(0x)?0*$/;
-
-export default class AddressSelectStore {
-  @observable loading = false;
-  @observable values = [];
-  @observable registryValues = [];
-
-  initValues = [];
-  regLookups = [
-    (query) => {
-      query = query.toLowerCase().trim();
-      if (query.length === 0 || query === '0x') {
-        return null;
-      }
-      const startsWithQuery = (s) => new RegExp('^' + query, 'i').test(s);
-
-      let address;
-      let name = this.reverse[query];
-
-      if (!name) {
-        const addr = Object
-          .keys(this.reverse)
-          .find((addr) => {
-            const name = this.reverse[addr];
-
-            return startsWithQuery(addr) || (name && startsWithQuery(name));
-          });
-
-        if (addr) {
-          address = addr;
-          name = this.reverse[addr];
-        } else {
-          return null;
-        }
-      }
-
-      return {
-        address,
-        name,
-        description: (
-          <FormattedMessage
-            id='addressSelect.fromRegistry'
-            defaultMessage='{name} (from registry)'
-            values={ {
-              name
-            } }
-          />
-        )
-      };
-    }
-  ];
-
-  constructor (api) {
-    this.api = api;
-
-    const { registry } = Contracts.create(api);
-
-    registry
-      .getContract('emailverification')
-      .then((emailVerification) => {
-        this.regLookups.push((email) => {
-          return emailVerification
-            .instance
-            .reverse
-            .call({}, [ sha3.text(email) ])
-            .then((address) => {
-              return {
-                address,
-                description: (
-                  <FormattedMessage
-                    id='addressSelect.fromEmail'
-                    defaultMessage='Verified using email {email}'
-                    values={ {
-                      email
-                    } }
-                  />
-                )
-              };
-            });
-        });
-      });
-
-    registry
-      .getInstance()
-      .then((registryInstance) => {
-        this.regLookups.push((name) => {
-          return registryInstance
-            .getAddress
-            .call({}, [ sha3.text(name), 'A' ])
-            .then((address) => {
-              return {
-                address,
-                name,
-                description: (
-                  <FormattedMessage
-                    id='addressSelect.fromRegistry'
-                    defaultMessage='{name} (from registry)'
-                    values={ {
-                      name
-                    } }
-                  />
-                )
-              };
-            });
-        });
-
-        this.regLookups.push((address) => {
-          return registryInstance
-            .reverse
-            .call({}, [ address ])
-            .then((name) => {
-              if (!name) {
-                return null;
-              }
-
-              return {
-                address,
-                name,
-                description: (
-                  <FormattedMessage
-                    id='addressSelect.fromRegistry'
-                    defaultMessage='{name} (from registry)'
-                    values={ {
-                      name
-                    } }
-                  />
-                )
-              };
-            });
-        });
-      });
-  }
-
-  @action setValues (props) {
-    const { accounts = {}, contracts = {}, contacts = {}, reverse = {} } = props;
-
-    this.reverse = reverse;
-
-    const accountsN = Object.keys(accounts).length;
-    const contractsN = Object.keys(contracts).length;
-    const contactsN = Object.keys(contacts).length;
-
-    if (accountsN + contractsN + contactsN === 0) {
-      return;
-    }
-
-    this.initValues = [
-      {
-        key: 'accounts',
-        label: (
-          <FormattedMessage
-            id='addressSelect.labels.accounts'
-            defaultMessage='accounts'
-          />
-        ),
-        values: Object.values(accounts)
-      },
-      {
-        key: 'contacts',
-        label: (
-          <FormattedMessage
-            id='addressSelect.labels.contacts'
-            defaultMessage='contacts'
-          />
-        ),
-        values: Object.values(contacts)
-      },
-      {
-        key: 'contracts',
-        label: (
-          <FormattedMessage
-            id='addressSelect.labels.contracts'
-            defaultMessage='contracts'
-          />
-        ),
-        values: Object.values(contracts)
-      }
-    ].filter((cat) => cat.values.length > 0);
-
-    this.handleChange();
-  }
-
-  @action resetRegistryValues = () => {
-    this.registryValues = [];
-  }
-
-  @action handleChange = (value = '') => {
-    let index = 0;
-
-    this.values = this.initValues
-      .map((category) => {
-        const filteredValues = this
-          .filterValues(category.values, value)
-          .map((value) => {
-            index++;
-
-            return {
-              index: parseInt(index),
-              ...value
-            };
-          });
-
-        return {
-          label: category.label,
-          values: filteredValues
-        };
-      });
-
-    // Clear the previous results after 50ms
-    // if still fetching
-    const timeoutId = setTimeout(() => {
-      transaction(() => {
-        this.registryValues = [];
-        this.loading = true;
-      });
-    }, 50);
-
-    const lookups = this.regLookups.map((regLookup) => regLookup(value));
-
-    // Registries Lookup
-    return Promise
-      .all(lookups)
-      .then((results) => {
-        return results
-          .filter((result) => result && !ZERO.test(result.address));
-      })
-      .then((results) => {
-        clearTimeout(timeoutId);
-
-        const registryValues = uniqBy(results, (result) => result.address)
-          .map((result) => {
-            const lowercaseAddress = result.address.toLowerCase();
-
-            const account = flatMap(this.initValues, (cat) => cat.values)
-              .find((account) => account.address.toLowerCase() === lowercaseAddress);
-
-            if (account && account.name) {
-              result.name = account.name;
-            } else if (!result.name) {
-              result.name = value;
-            }
-
-            return result;
-          });
-
-        transaction(() => {
-          this.loading = false;
-          this.registryValues = registryValues;
-        });
-      });
-  }
-
-  /**
-   * Filter the given values based on the given
-   * filter
-   */
-  filterValues = (values = [], _filter = '') => {
-    const filter = _filter.toLowerCase();
-
-    return values
-      // Remove empty accounts
-      .filter((a) => a)
-      .filter((account) => {
-        const address = account.address.toLowerCase();
-        const inAddress = address.includes(filter);
-
-        if (!account.name || inAddress) {
-          return inAddress;
-        }
-
-        const name = account.name.toLowerCase();
-        const inName = name.includes(filter);
-        const { meta = {} } = account;
-
-        if (!meta.tags || inName) {
-          return inName;
-        }
-
-        const tags = (meta.tags || []).join('');
-
-        return tags.includes(filter);
-      })
-      .sort((accA, accB) => {
-        const nameA = accA.name || accA.address;
-        const nameB = accB.name || accB.address;
-
-        return nameA.localeCompare(nameB);
-      });
-  }
-}
diff --git a/js/src/ui/Form/AddressSelect/index.js b/js/src/ui/Form/AddressSelect/index.js
deleted file mode 100644
index 9ae382b9331541c7f615ddbc716f65ef20cc0301..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/AddressSelect/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './addressSelect';
diff --git a/js/src/ui/Form/AutoComplete/autocomplete.css b/js/src/ui/Form/AutoComplete/autocomplete.css
deleted file mode 100644
index 56be9eb635ab484ec9b674aaa04a72700bd2aaf9..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/AutoComplete/autocomplete.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.item {
-  &:last-child {
-    &.divider {
-      display: none;
-    }
-  }
-}
diff --git a/js/src/ui/Form/AutoComplete/autocomplete.js b/js/src/ui/Form/AutoComplete/autocomplete.js
deleted file mode 100644
index 63b1e65fd687f42eeff078e65e5fcb4eec1411af..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/AutoComplete/autocomplete.js
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import keycode from 'keycode';
-import { isEqual } from 'lodash';
-import { MenuItem, AutoComplete as MUIAutoComplete, Divider as MUIDivider } from 'material-ui';
-import { PopoverAnimationVertical } from 'material-ui/Popover';
-import React, { Component, PropTypes } from 'react';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './autocomplete.css';
-
-// Hack to prevent "Unknown prop `disableFocusRipple` on <hr> tag" error
-class Divider extends Component {
-  static muiName = MUIDivider.muiName;
-
-  render () {
-    return (
-      <div
-        style={ { margin: '0.25em 0' } }
-        className={ [styles.item, styles.divider].join(' ') }
-      >
-        <MUIDivider style={ { height: 2 } } />
-      </div>
-    );
-  }
-}
-
-export default class AutoComplete extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    entry: PropTypes.object,
-    entries: PropTypes.oneOfType([
-      PropTypes.array,
-      PropTypes.object
-    ]),
-    error: nodeOrStringProptype(),
-    filter: PropTypes.func,
-    hint: nodeOrStringProptype(),
-    label: nodeOrStringProptype(),
-    onChange: PropTypes.func.isRequired,
-    onUpdateInput: PropTypes.func,
-    renderItem: PropTypes.func,
-    value: PropTypes.string
-  };
-
-  state = {
-    lastChangedValue: undefined,
-    entry: null,
-    open: false,
-    dataSource: [],
-    dividerBreaks: []
-  };
-
-  dividersVisibility = {};
-
-  componentWillMount () {
-    const dataSource = this.getDataSource();
-
-    this.setState({ dataSource });
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const prevEntries = Object.keys(this.props.entries || {}).sort();
-    const nextEntries = Object.keys(nextProps.entries || {}).sort();
-
-    if (!isEqual(prevEntries, nextEntries)) {
-      const dataSource = this.getDataSource(nextProps);
-
-      this.setState({ dataSource });
-    }
-  }
-
-  render () {
-    const { disabled, error, hint, label, value, className, onUpdateInput } = this.props;
-    const { open, dataSource } = this.state;
-
-    return (
-      <MUIAutoComplete
-        className={ className }
-        disabled={ disabled }
-        floatingLabelText={ label }
-        hintText={ hint }
-        errorText={ error }
-        onNewRequest={ this.onChange }
-        onUpdateInput={ onUpdateInput }
-        searchText={ value }
-        onFocus={ this.onFocus }
-        onClose={ this.onClose }
-        animation={ PopoverAnimationVertical }
-        filter={ this.handleFilter }
-        popoverProps={ { open } }
-        openOnFocus
-        menuCloseDelay={ 0 }
-        fullWidth
-        floatingLabelFixed
-        dataSource={ dataSource }
-        menuProps={ { maxHeight: 400 } }
-        ref='muiAutocomplete'
-        onKeyDown={ this.onKeyDown }
-      />
-    );
-  }
-
-  getDataSource (props = this.props) {
-    const { renderItem, entries } = props;
-    const entriesArray = (entries instanceof Array)
-      ? entries
-      : Object.values(entries);
-
-    let currentDivider = 0;
-    let firstSet = false;
-
-    const dataSource = entriesArray.map((entry, index) => {
-      // Render divider
-      if (typeof entry === 'string' && entry.toLowerCase() === 'divider') {
-        // Don't add divider if nothing before
-        if (!firstSet) {
-          return undefined;
-        }
-
-        const item = {
-          text: '',
-          divider: currentDivider,
-          isDivider: true,
-          value: (
-            <Divider />
-          )
-        };
-
-        currentDivider++;
-        return item;
-      }
-
-      let item;
-
-      if (renderItem && typeof renderItem === 'function') {
-        item = renderItem(entry);
-
-        // Add the item class to the entry
-        const classNames = [ styles.item ].concat(item.value.props.className);
-
-        item.value = React.cloneElement(item.value, { className: classNames.join(' ') });
-      } else {
-        item = {
-          text: entry,
-          value: (
-            <MenuItem
-              className={ styles.item }
-              primaryText={ entry }
-            />
-          )
-        };
-      }
-
-      if (!firstSet) {
-        item.first = true;
-        firstSet = true;
-      }
-
-      item.divider = currentDivider;
-      item.entry = entry;
-
-      return item;
-    }).filter((item) => item !== undefined);
-
-    return dataSource;
-  }
-
-  handleFilter = (searchText, name, item) => {
-    if (item.isDivider) {
-      return this.dividersVisibility[item.divider];
-    }
-
-    if (item.first) {
-      this.dividersVisibility = {};
-    }
-
-    const { filter } = this.props;
-    const show = filter(searchText, name, item);
-
-    // Show the related divider
-    if (show) {
-      this.dividersVisibility[item.divider] = true;
-    }
-
-    return show;
-  }
-
-  onKeyDown = (event) => {
-    const { muiAutocomplete } = this.refs;
-
-    switch (keycode(event)) {
-      case 'down':
-        const { menu } = muiAutocomplete.refs;
-
-        menu && menu.handleKeyDown(event);
-        break;
-
-      case 'enter':
-      case 'tab':
-        event.preventDefault();
-        event.stopPropagation();
-        event.which = 'useless';
-
-        const e = new CustomEvent('down');
-
-        e.which = 40;
-
-        muiAutocomplete && muiAutocomplete.handleKeyDown(e);
-        break;
-    }
-  }
-
-  onChange = (item, idx) => {
-    if (idx === -1) {
-      return;
-    }
-
-    const { dataSource } = this.state;
-    const { entry } = dataSource[idx];
-
-    this.handleOnChange(entry);
-    this.setState({ entry, open: false });
-  }
-
-  onClose = (event) => {
-    const { onUpdateInput } = this.props;
-
-    if (!onUpdateInput) {
-      const { entry } = this.state;
-
-      this.handleOnChange(entry);
-    }
-  }
-
-  onFocus = () => {
-    const { entry } = this.props;
-
-    this.setState({ entry, open: true }, () => {
-      this.handleOnChange(null, true);
-    });
-  }
-
-  handleOnChange = (value, empty) => {
-    const { lastChangedValue } = this.state;
-
-    if (value !== lastChangedValue) {
-      this.setState({ lastChangedValue: value });
-      this.props.onChange(value, empty);
-    }
-  }
-}
diff --git a/js/src/ui/Form/AutoComplete/index.js b/js/src/ui/Form/AutoComplete/index.js
deleted file mode 100644
index 5761be0e3ed50cb72fa427bf953c240a2de1bf80..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/AutoComplete/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './autocomplete';
diff --git a/js/src/ui/Form/DappUrlInput/dappUrlInput.js b/js/src/ui/Form/DappUrlInput/dappUrlInput.js
deleted file mode 100644
index a513059dfd06da9dda153855e1dc25f970513f63..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/DappUrlInput/dappUrlInput.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import keycode from 'keycode';
-import React, { Component, PropTypes } from 'react';
-
-export default class DappUrlInput extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    onChange: PropTypes.func.isRequired,
-    onGoto: PropTypes.func.isRequired,
-    onRestore: PropTypes.func.isRequired,
-    url: PropTypes.string.isRequired
-  }
-
-  render () {
-    const { className, url } = this.props;
-
-    return (
-      <input
-        className={ className }
-        onChange={ this.onChange }
-        onKeyDown={ this.onKeyDown }
-        type='text'
-        value={ url }
-      />
-    );
-  }
-
-  onChange = (event) => {
-    this.props.onChange(event.target.value);
-  };
-
-  onKeyDown = (event) => {
-    switch (keycode(event)) {
-      case 'esc':
-        this.props.onRestore();
-        break;
-
-      case 'enter':
-        this.props.onGoto();
-        break;
-
-      default:
-        break;
-    }
-  };
-}
diff --git a/js/src/ui/Form/DappUrlInput/dappUrlInput.spec.js b/js/src/ui/Form/DappUrlInput/dappUrlInput.spec.js
deleted file mode 100644
index 23a352ae63035f90c3d7e26f76fab0ef75d3e9a9..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/DappUrlInput/dappUrlInput.spec.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import DappUrlInput from './';
-
-let component;
-let onChange;
-let onGoto;
-let onRestore;
-
-function render (props = { url: 'http://some.url' }) {
-  onChange = sinon.stub();
-  onGoto = sinon.stub();
-  onRestore = sinon.stub();
-
-  component = shallow(
-    <DappUrlInput
-      onChange={ onChange }
-      onGoto={ onGoto }
-      onRestore={ onRestore }
-      { ...props }
-    />
-  );
-
-  return component;
-}
-
-describe('ui/Form/DappUrlInput', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  describe('events', () => {
-    describe('onChange', () => {
-      it('calls the onChange callback as provided', () => {
-        component.simulate('change', { target: { value: 'testing' } });
-        expect(onChange).to.have.been.calledWith('testing');
-      });
-    });
-
-    describe('onKeyDown', () => {
-      it('calls the onGoto callback on enter', () => {
-        component.simulate('keyDown', { keyCode: 13 });
-        expect(onGoto).to.have.been.called;
-      });
-
-      it('calls the onRestor callback on esc', () => {
-        component.simulate('keyDown', { keyCode: 27 });
-        expect(onRestore).to.have.been.called;
-      });
-    });
-  });
-});
diff --git a/js/src/ui/Form/DappUrlInput/index.js b/js/src/ui/Form/DappUrlInput/index.js
deleted file mode 100644
index a30c4dbe5918bee855f4679cbaca81dc061f6781..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/DappUrlInput/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dappUrlInput';
diff --git a/js/src/ui/Form/FileSelect/fileSelect.css b/js/src/ui/Form/FileSelect/fileSelect.css
deleted file mode 100644
index 1ac5981c4de80d528b6047af63a8d025857241dc..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/FileSelect/fileSelect.css
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$backgroundNormal: rgba(0, 0, 0, 0.2);
-$backgroundNormalHover: rgba(0, 0, 0, 0.5);
-$backgroundError: rgba(255, 0, 0, 0.1);
-$backgroundErrorHover: rgba(255, 0, 0, 0.2);
-
-.dropzone {
-  align-items: center;
-  background: $backgroundNormal;
-  border: 2px dashed #666;
-  border-radius: 0.5em;
-  display: flex;
-  justify-content: center;
-  font-size: 1.2em;
-  height: 12em;
-  transition: all 0.5s ease;
-  width: 100%;
-
-  &:hover {
-    background: $backgroundNormalHover;
-    border-radius: 0;
-    cursor: pointer;
-  }
-
-  &.error {
-    background: $backgroundError;
-
-    &:hover {
-      background: $backgroundErrorHover;
-    }
-  }
-
-  .label {
-    color: #aaa;
-  }
-}
diff --git a/js/src/ui/Form/FileSelect/fileSelect.js b/js/src/ui/Form/FileSelect/fileSelect.js
deleted file mode 100644
index 18b2c8d8e58e43ea5dd3f85b011af8ad1fb216f0..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/FileSelect/fileSelect.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import Dropzone from 'react-dropzone';
-import { FormattedMessage } from 'react-intl';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './fileSelect.css';
-
-export default class FileSelect extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    error: nodeOrStringProptype(),
-    label: nodeOrStringProptype(),
-    onSelect: PropTypes.func.isRequired
-  }
-
-  static defaultProps = {
-    label: (
-      <FormattedMessage
-        id='ui.fileSelect.defaultLabel'
-        defaultMessage='Drop a file here, or click to select a file to upload'
-      />
-    )
-  }
-
-  render () {
-    const { className, error, label } = this.props;
-
-    return (
-      <Dropzone
-        onDrop={ this.onDrop }
-        multiple={ false }
-        className={
-          [
-            styles.dropzone,
-            error
-              ? styles.error
-              : '',
-            className
-          ].join(' ') }
-      >
-        <div className={ styles.label }>
-          { error || label }
-        </div>
-      </Dropzone>
-    );
-  }
-
-  onDrop = (files) => {
-    const { onSelect } = this.props;
-    const reader = new FileReader();
-    const file = files[0];
-
-    reader.onload = (event) => {
-      onSelect(file.name, event.target.result);
-    };
-
-    reader.readAsText(file);
-  }
-}
diff --git a/js/src/ui/Form/FileSelect/fileSelect.spec.js b/js/src/ui/Form/FileSelect/fileSelect.spec.js
deleted file mode 100644
index f931fc6550f9a8fa11a8df536c348a83746c9437..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/FileSelect/fileSelect.spec.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import FileSelect from './';
-
-const FILE = {
-  content: 'some test content',
-  name: 'someName'
-};
-
-let component;
-let globalFileReader;
-let instance;
-let onSelect;
-let processedFile;
-
-function stubReader () {
-  globalFileReader = global.FileReader;
-
-  global.FileReader = class {
-    readAsText (file) {
-      processedFile = file;
-
-      this.onload({
-        target: {
-          result: file.content
-        }
-      });
-    }
-  };
-}
-
-function restoreReader () {
-  global.FileReader = globalFileReader;
-}
-
-function render (props = {}) {
-  onSelect = sinon.stub();
-  component = shallow(
-    <FileSelect
-      onSelect={ onSelect }
-      { ...props }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('ui/Form/FileSelect', () => {
-  beforeEach(() => {
-    stubReader();
-    render();
-  });
-
-  afterEach(() => {
-    restoreReader();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('DropZone', () => {
-    let label;
-    let zone;
-
-    beforeEach(() => {
-      label = component.find('FormattedMessage');
-      zone = component.find('Dropzone');
-    });
-
-    it('renders the label', () => {
-      expect(label.props().id).to.equal('ui.fileSelect.defaultLabel');
-    });
-
-    it('attaches the onDrop event', () => {
-      expect(zone.props().onDrop).to.equal(instance.onDrop);
-    });
-
-    it('does not allow multiples', () => {
-      expect(zone.props().multiple).to.be.false;
-    });
-  });
-
-  describe('event methods', () => {
-    describe('onDrop', () => {
-      beforeEach(() => {
-        instance.onDrop([ FILE ]);
-      });
-
-      it('reads the file as dropped', () => {
-        expect(processedFile).to.deep.equal(FILE);
-      });
-
-      it('calls prop onSelect with file & content', () => {
-        expect(onSelect).to.have.been.calledWith(FILE.name, FILE.content);
-      });
-    });
-  });
-});
diff --git a/js/src/ui/Form/FileSelect/index.js b/js/src/ui/Form/FileSelect/index.js
deleted file mode 100644
index ff9614ace1967971fd8f141d4dd625754cfd8cba..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/FileSelect/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './fileSelect';
diff --git a/js/src/ui/Form/FormWrap/formWrap.css b/js/src/ui/Form/FormWrap/formWrap.css
deleted file mode 100644
index aef7994ba4b598769251935c3df3b17d8a1a18bb..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/FormWrap/formWrap.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.stretch {
-  width: 75%;
-  clear: both;
-}
-
-.stretch input {
-  width: 100%;
-}
diff --git a/js/src/ui/Form/FormWrap/formWrap.js b/js/src/ui/Form/FormWrap/formWrap.js
deleted file mode 100644
index 3de4a9a463c822e0811b6d2514553e1864b2cdfc..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/FormWrap/formWrap.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './formWrap.css';
-
-export default class FormWrap extends Component {
-  static propTypes = {
-    children: PropTypes.node
-  }
-
-  render () {
-    return (
-      <div className={ styles.stretch }>
-        { this.props.children }
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/Form/FormWrap/index.js b/js/src/ui/Form/FormWrap/index.js
deleted file mode 100644
index 7483398c269ef771db3c56700818afd169cde987..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/FormWrap/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './formWrap';
diff --git a/js/src/ui/Form/Input/index.js b/js/src/ui/Form/Input/index.js
deleted file mode 100644
index 29e00f72b19f9481ced013481cbec51dc551898c..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/Input/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './input';
diff --git a/js/src/ui/Form/Input/input.css b/js/src/ui/Form/Input/input.css
deleted file mode 100644
index be8a6ec0a961fb04d646b975765e0862ffb6028f..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/Input/input.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  display: flex;
-  flex-direction: row;
-  align-items: baseline;
-  position: relative;
-}
-
-.copy {
-  margin-right: 0.5em;
-}
diff --git a/js/src/ui/Form/Input/input.js b/js/src/ui/Form/Input/input.js
deleted file mode 100644
index 6eb506dc12829c3ced71c47f86b59c6076e8a9e6..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/Input/input.js
+++ /dev/null
@@ -1,325 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { TextField } from 'material-ui';
-import { noop } from 'lodash';
-import keycode from 'keycode';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-import { toString } from '~/util/messages';
-
-import CopyToClipboard from '../../CopyToClipboard';
-
-import styles from './input.css';
-
-// TODO: duplicated in Select
-const UNDERLINE_DISABLED = {
-  borderBottom: 'dotted 2px',
-  borderColor: 'rgba(255, 255, 255, 0.125)' // 'transparent' // 'rgba(255, 255, 255, 0.298039)'
-};
-
-const UNDERLINE_READONLY = {
-  ...UNDERLINE_DISABLED,
-  cursor: 'text'
-};
-
-const UNDERLINE_NORMAL = {
-  borderBottom: 'solid 2px'
-};
-
-const UNDERLINE_FOCUSED = {
-  transform: 'scaleX(1.0)'
-};
-
-const NAME_ID = ' ';
-
-export default class Input extends Component {
-  static contextTypes = {
-    intl: React.PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    allowCopy: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.bool
-    ]),
-    allowPaste: PropTypes.bool,
-    autoFocus: PropTypes.bool,
-    children: PropTypes.node,
-    className: PropTypes.string,
-    defaultValue: PropTypes.string,
-    disabled: PropTypes.bool,
-    error: nodeOrStringProptype(),
-    escape: PropTypes.oneOf([
-      'default',
-      'initial'
-    ]),
-    focused: PropTypes.bool,
-    readOnly: PropTypes.bool,
-    hint: nodeOrStringProptype(),
-    hideUnderline: PropTypes.bool,
-    label: nodeOrStringProptype(),
-    max: PropTypes.any,
-    min: PropTypes.any,
-    multiLine: PropTypes.bool,
-    onBlur: PropTypes.func,
-    onChange: PropTypes.func,
-    onClick: PropTypes.func,
-    onDefaultAction: PropTypes.func,
-    onFocus: PropTypes.func,
-    onKeyDown: PropTypes.func,
-    onSubmit: PropTypes.func,
-    rows: PropTypes.number,
-    tabIndex: PropTypes.number,
-    type: PropTypes.string,
-    submitOnBlur: PropTypes.bool,
-    step: PropTypes.number,
-    style: PropTypes.object,
-    value: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.string,
-      PropTypes.node
-    ])
-  };
-
-  static defaultProps = {
-    allowCopy: false,
-    allowPaste: true,
-    escape: 'initial',
-    hideUnderline: false,
-    onBlur: noop,
-    onFocus: noop,
-    onChange: noop,
-    readOnly: false,
-    submitOnBlur: true,
-    style: {}
-  }
-
-  state = {
-    value: typeof this.props.value === 'undefined'
-      ? ''
-      : this.props.value
-  }
-
-  componentWillReceiveProps (newProps) {
-    if ((newProps.value !== this.props.value) && (newProps.value !== this.state.value)) {
-      this.setValue(newProps.value);
-    }
-
-    if (newProps.focused && !this.props.focused) {
-      this.refs.input.setState({ isFocused: true });
-    }
-
-    if (!newProps.focused && this.props.focused) {
-      this.refs.input.setState({ isFocused: false });
-    }
-  }
-
-  render () {
-    const { value } = this.state;
-    const { autoFocus, children, className, defaultValue, hideUnderline, disabled, error } = this.props;
-    const { focused, label, hint, onClick, multiLine, rows, type, min, max, step, style, tabIndex } = this.props;
-
-    const readOnly = this.props.readOnly || disabled;
-
-    const inputStyle = { overflow: 'hidden' };
-    const textFieldStyle = {};
-
-    if (readOnly) {
-      inputStyle.cursor = 'text';
-    }
-
-    if (hideUnderline && !hint) {
-      textFieldStyle.height = 'initial';
-    }
-
-    const underlineStyle = readOnly ? UNDERLINE_READONLY : UNDERLINE_NORMAL;
-    const underlineFocusStyle = focused
-      ? UNDERLINE_FOCUSED
-      : readOnly && typeof focused !== 'boolean' ? { display: 'none' } : null;
-
-    const textValue = toString(this.context, value);
-
-    return (
-      <div className={ styles.container } style={ style }>
-        { this.renderCopyButton() }
-        <TextField
-          autoComplete='off'
-          autoFocus={ autoFocus }
-          className={ className }
-          defaultValue={ defaultValue }
-          errorText={ error }
-          floatingLabelFixed
-          floatingLabelText={ label }
-          fullWidth
-          hintText={ hint }
-          id={ NAME_ID }
-          inputStyle={ inputStyle }
-          max={ max }
-          min={ min }
-          multiLine={ multiLine }
-          name={ NAME_ID }
-          onBlur={ this.onBlur }
-          onChange={ this.onChange }
-          onClick={ onClick }
-          onKeyDown={ this.onKeyDown }
-          onKeyUp={ this.onKeyUp }
-          onFocus={ this.onFocus }
-          onPaste={ this.onPaste }
-          readOnly={ readOnly }
-          ref='input'
-          rows={ rows }
-          step={ step }
-          style={ textFieldStyle }
-          tabIndex={ tabIndex }
-          type={ type || 'text' }
-          underlineDisabledStyle={ UNDERLINE_DISABLED }
-          underlineStyle={ underlineStyle }
-          underlineFocusStyle={ underlineFocusStyle }
-          underlineShow={ !hideUnderline }
-          value={ textValue }
-        >
-          { children }
-        </TextField>
-      </div>
-    );
-  }
-
-  renderCopyButton () {
-    const { allowCopy, hideUnderline } = this.props;
-    const { value } = this.state;
-
-    if (!allowCopy) {
-      return null;
-    }
-
-    const text = typeof allowCopy === 'string'
-      ? allowCopy
-      : value.toString();
-
-    const style = hideUnderline
-      ? {}
-      : { position: 'relative', top: '2px' };
-
-    return (
-      <div className={ styles.copy } style={ style }>
-        <CopyToClipboard data={ text } />
-      </div>
-    );
-  }
-
-  onChange = (event, value) => {
-    if (!this.props.allowPaste) {
-      if (value.length - this.state.value.length > 8) {
-        return;
-      }
-    }
-
-    event.persist();
-
-    this.setValue(value, () => {
-      this.props.onChange(event, value);
-
-      if (this.pasted) {
-        this.pasted = false;
-        return this.onSubmit(value);
-      }
-    });
-  }
-
-  onBlur = (event) => {
-    const { value } = event.target;
-    const { submitOnBlur } = this.props;
-
-    if (submitOnBlur) {
-      this.onSubmit(value);
-    }
-
-    this.props.onBlur(event);
-  }
-
-  onFocus = (event) => {
-    const { onFocus } = this.props;
-
-    this.intialValue = event.target.value;
-    return onFocus(event);
-  }
-
-  onPaste = (event) => {
-    this.pasted = true;
-  }
-
-  onKeyDown = (event) => {
-    const codeName = keycode(event);
-    const { value } = event.target;
-
-    if (codeName === 'enter') {
-      this.onSubmit(value, true);
-    }
-
-    this.props.onKeyDown && this.props.onKeyDown(event);
-  }
-
-  /**
-   * Revert to initial value if pressed ESC key
-   * once. Don't do anything (propagate the event) if
-   * ESC has been pressed twice in a row (eg. input in a Portal modal).
-   *
-   * NB: it has to be `onKeyUp` since the Portal is using
-   * the `onKeyUp` event to close the modal ; it mustn't be propagated
-   * if we only want to revert to initial value
-   */
-  onKeyUp = (event) => {
-    const { escape } = this.props;
-    const codeName = keycode(event);
-
-    if (codeName === 'esc' && !this.pressedEsc) {
-      event.stopPropagation();
-      event.preventDefault();
-
-      this.pressedEsc = true;
-
-      if (escape === 'initial' && this.intialValue !== undefined) {
-        return this.onChange(event, this.intialValue);
-      }
-
-      if (escape === 'default' && this.props.defaultValue !== undefined) {
-        return this.onSubmit(this.props.defaultValue);
-      }
-    } else if (this.pressedEsc) {
-      this.pressedEsc = false;
-    }
-  }
-
-  onSubmit = (value, performDefault) => {
-    const { onDefaultAction, onSubmit } = this.props;
-
-    this.setValue(value, () => {
-      if (onSubmit) {
-        onSubmit(value);
-      }
-
-      if (performDefault && onDefaultAction) {
-        onDefaultAction();
-      }
-    });
-  }
-
-  setValue (value, cb = noop) {
-    this.setState({ value }, cb);
-  }
-}
diff --git a/js/src/ui/Form/InputAddress/index.js b/js/src/ui/Form/InputAddress/index.js
deleted file mode 100644
index 33670020a49537bf28655e0c1c16c734855c5ea1..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputAddress/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './inputAddress';
diff --git a/js/src/ui/Form/InputAddress/inputAddress.css b/js/src/ui/Form/InputAddress/inputAddress.css
deleted file mode 100644
index ee154d070a4b9b2b96f7c85fdcd08f1456038ee8..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputAddress/inputAddress.css
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.container {
-  position: relative;
-}
-
-.input input {
-  padding-left: 48px !important;
-  box-sizing: border-box;
-
-  &.small {
-    padding-left: 40px !important;
-  }
-}
-
-.inputEmpty input {
-  padding-left: 0 !important;
-}
-
-.small {
-  .input input {
-    padding-left: 40px !important;
-  }
-
-  .icon,
-  .iconDisabled {
-    img {
-      height: 24px;
-      width: 24px;
-    }
-  }
-}
-
-.icon,
-.iconDisabled {
-  position: absolute;
-  top: 35px;
-
-  &.noLabel {
-    top: 10px;
-  }
-
-  &.noCopy {
-    left: 5px;
-  }
-
-  &.noUnderline {
-    top: 0;
-  }
-}
-
-.icon {
-  left: 0;
-}
-
-.iconDisabled {
-  left: 24px;
-}
diff --git a/js/src/ui/Form/InputAddress/inputAddress.js b/js/src/ui/Form/InputAddress/inputAddress.js
deleted file mode 100644
index f17d7b4cfe329c40ebaff51fe9074e162d385952..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputAddress/inputAddress.js
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import util from '~/api/util';
-import { nodeOrStringProptype } from '~/util/proptypes';
-import { isNullAddress } from '~/util/validation';
-
-import IdentityIcon from '../../IdentityIcon';
-import Input from '../Input';
-
-import styles from './inputAddress.css';
-
-class InputAddress extends Component {
-  static propTypes = {
-    account: PropTypes.object,
-    allowCopy: PropTypes.bool,
-    autoFocus: PropTypes.bool,
-    allowInvalid: PropTypes.bool,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    error: PropTypes.string,
-    focused: PropTypes.bool,
-    hideUnderline: PropTypes.bool,
-    hint: nodeOrStringProptype(),
-    label: nodeOrStringProptype(),
-    onChange: PropTypes.func,
-    onClick: PropTypes.func,
-    onFocus: PropTypes.func,
-    onSubmit: PropTypes.func,
-    readOnly: PropTypes.bool,
-    small: PropTypes.bool,
-    tabIndex: PropTypes.number,
-    text: PropTypes.bool,
-    value: PropTypes.string
-  };
-
-  static defaultProps = {
-    allowCopy: true,
-    hideUnderline: false,
-    small: false
-  };
-
-  render () {
-    const { account, allowCopy, autoFocus, className, disabled, error, focused, hint } = this.props;
-    const { hideUnderline, label, onClick, onFocus, readOnly, small } = this.props;
-    const { tabIndex, text, value } = this.props;
-    const icon = this.renderIcon();
-    const classes = [ className ];
-
-    classes.push(!icon ? styles.inputEmpty : styles.input);
-
-    const containerClasses = [ styles.container ];
-    const nullName = (disabled || readOnly) && isNullAddress(value) ? 'null' : null;
-
-    if (small) {
-      containerClasses.push(styles.small);
-    }
-
-    const props = {};
-
-    if (!disabled) {
-      props.focused = focused;
-    }
-
-    // FIXME: The is not advisable, fixes the display issue, however the name should come from
-    // a common component.
-    //    account.name || (value ? 'UNNAMED' : value)
-    return (
-      <div className={ containerClasses.join(' ') }>
-        <Input
-          allowCopy={ allowCopy && ((disabled || readOnly) ? value : false) }
-          autoFocus={ autoFocus }
-          className={ classes.join(' ') }
-          disabled={ disabled }
-          error={ error }
-          hideUnderline={ hideUnderline }
-          hint={ hint }
-          label={ label }
-          onChange={ this.onChange }
-          onClick={ onClick }
-          onFocus={ onFocus }
-          onSubmit={ this.onSubmit }
-          readOnly={ readOnly }
-          tabIndex={ tabIndex }
-          value={
-            text && account
-              ? (account.name || (value ? 'UNNAMED' : value))
-              : (nullName || value)
-          }
-          { ...props }
-        />
-        { icon }
-      </div>
-    );
-  }
-
-  renderIcon () {
-    const { allowInvalid, value, disabled, label, allowCopy, hideUnderline, readOnly } = this.props;
-
-    if (!value || !value.length || (!util.isAddressValid(value) && !allowInvalid)) {
-      return null;
-    }
-
-    const classes = [(disabled || readOnly) ? styles.iconDisabled : styles.icon];
-
-    if (!label) {
-      classes.push(styles.noLabel);
-    }
-
-    if (!allowCopy) {
-      classes.push(styles.noCopy);
-    }
-
-    if (hideUnderline) {
-      classes.push(styles.noUnderline);
-    }
-
-    return (
-      <div className={ classes.join(' ') }>
-        <IdentityIcon
-          address={ value }
-          center
-          inline
-        />
-      </div>
-    );
-  }
-
-  onChange = (event, _value) => {
-    let address = _value.trim();
-    const isEmpty = (address.length === 0);
-
-    this.setState({ isEmpty });
-
-    if (this.props.onChange) {
-      if (!/^0x/.test(address) && util.isAddressValid(`0x${address}`)) {
-        address = `0x${address}`;
-      }
-
-      this.props.onChange(event, address);
-    }
-  }
-
-  onSubmit = (_value) => {
-    const address = _value.trim();
-
-    if (this.props.onSubmit) {
-      this.props.onSubmit(address);
-    }
-  }
-}
-
-function mapStateToProps (state, props) {
-  const { text, value } = props;
-
-  if (!text || !value) {
-    return {};
-  }
-
-  const lcValue = value.toLowerCase();
-  const { accountsInfo } = state.personal;
-  const { tokens } = state;
-
-  const accountInfo = Object.values(accountsInfo).find((account) => account.address.toLowerCase() === lcValue);
-  const token = Object.values(tokens).find((token) => token.address.toLowerCase() === lcValue);
-
-  const account = accountInfo || token || null;
-
-  return {
-    account
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(InputAddress);
diff --git a/js/src/ui/Form/InputAddressSelect/index.js b/js/src/ui/Form/InputAddressSelect/index.js
deleted file mode 100644
index d1e231fb3e9b15630c79dfe9b70ccd927b030dd1..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputAddressSelect/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './inputAddressSelect';
diff --git a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js b/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
deleted file mode 100644
index 8199fece66012a873513d202778724fa9754a687..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import AddressSelect from '../AddressSelect';
-
-class InputAddressSelect extends Component {
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    contacts: PropTypes.object.isRequired,
-    contracts: PropTypes.object.isRequired,
-
-    allowCopy: PropTypes.bool,
-    className: PropTypes.string,
-    error: nodeOrStringProptype(),
-    hint: nodeOrStringProptype(),
-    label: nodeOrStringProptype(),
-    onChange: PropTypes.func,
-    readOnly: PropTypes.bool,
-    value: PropTypes.string
-  };
-
-  render () {
-    const { accounts, allowCopy, className, contacts, contracts, label, hint, error, value, onChange, readOnly } = this.props;
-
-    return (
-      <AddressSelect
-        allowCopy={ allowCopy }
-        allowInput
-        accounts={ accounts }
-        className={ className }
-        contacts={ contacts }
-        contracts={ contracts }
-        error={ error }
-        hint={ hint }
-        label={ label }
-        onChange={ onChange }
-        readOnly={ readOnly }
-        value={ value }
-      />
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts, contacts, contracts } = state.personal;
-
-  return {
-    accounts,
-    contacts,
-    contracts
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(InputAddressSelect);
diff --git a/js/src/ui/Form/InputChip/index.js b/js/src/ui/Form/InputChip/index.js
deleted file mode 100644
index a95ada1a626bdcc06820e47e1fbbb98f9b4abbd1..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputChip/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './inputChip';
diff --git a/js/src/ui/Form/InputChip/inputChip.css b/js/src/ui/Form/InputChip/inputChip.css
deleted file mode 100644
index 5992866983cca2a62c1cf8ea745b64ad58ae69e9..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputChip/inputChip.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.chip {
-  & > svg {
-    width: 1rem !important;
-    height: 1rem !important;
-    margin: initial !important;
-    margin-right: 4px !important;
-    padding: 2px 0 !important;
-  }
-}
diff --git a/js/src/ui/Form/InputChip/inputChip.js b/js/src/ui/Form/InputChip/inputChip.js
deleted file mode 100644
index 479f17da0c532549925d865a033296a075f4273f..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputChip/inputChip.js
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { Chip } from 'material-ui';
-import ChipInput from 'material-ui-chip-input';
-import { blue300 } from 'material-ui/styles/colors';
-import { uniq } from 'lodash';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './inputChip.css';
-
-export default class InputChip extends Component {
-  static propTypes = {
-    addOnBlur: PropTypes.bool,
-    clearOnBlur: PropTypes.bool,
-    className: PropTypes.string,
-    hint: nodeOrStringProptype(),
-    label: nodeOrStringProptype(),
-    onTokensChange: PropTypes.func,
-    onInputChange: PropTypes.func,
-    onBlur: PropTypes.func,
-    tokens: PropTypes.oneOfType([
-      PropTypes.array,
-      PropTypes.object
-    ]).isRequired
-  }
-
-  static defaultProps = {
-    clearOnBlur: false,
-    addOnBlur: false
-  }
-
-  state = {
-    focused: false
-  }
-
-  render () {
-    const { clearOnBlur, className, hint, label, tokens } = this.props;
-    const { focused } = this.state;
-
-    const classes = `${className}`;
-
-    const textFieldStyle = {
-      height: 55
-    };
-
-    if (!focused) {
-      textFieldStyle.width = 0;
-    }
-
-    return (
-      <ChipInput
-        className={ classes }
-        ref='chipInput'
-
-        value={ tokens }
-        clearOnBlur={ clearOnBlur }
-        floatingLabelText={ label }
-        hintText={ hint }
-
-        chipRenderer={ this.chipRenderer }
-
-        onFocus={ this.handleFocus }
-        onBlur={ this.handleBlur }
-        onRequestAdd={ this.handleTokenAdd }
-        onRequestDelete={ this.handleTokenDelete }
-        onUpdateInput={ this.handleInputChange }
-
-        floatingLabelFixed
-        fullWidth
-
-        hintStyle={ {
-          bottom: 13,
-          left: 0,
-          transition: 'none'
-        } }
-        inputStyle={ {
-          marginBottom: 18,
-          width: 'initial'
-        } }
-        textFieldStyle={ textFieldStyle }
-        underlineStyle={ {
-          borderWidth: 2
-        } }
-      />
-    );
-  }
-
-  chipRenderer = (state, key) => {
-    const { value, isFocused, isDisabled, handleClick, handleRequestDelete } = state;
-
-    return (
-      <Chip
-        key={ key }
-        className={ styles.chip }
-        style={ {
-          margin: '15px 8px 0 0',
-          float: 'left',
-          pointerEvents: isDisabled ? 'none' : undefined,
-          alignItems: 'center'
-        } }
-        labelStyle={ {
-          paddingRight: 6,
-          fontSize: '0.9rem',
-          lineHeight: 'initial'
-        } }
-        backgroundColor={ isFocused ? blue300 : 'rgba(50, 50, 50, 0.73)' }
-        onTouchTap={ handleClick }
-        onRequestDelete={ handleRequestDelete }
-      >
-        { value }
-      </Chip>
-    );
-  }
-
-  handleFocus = () => {
-    this.setState({ focused: true });
-  }
-
-  handleBlur = () => {
-    const { onBlur, addOnBlur } = this.props;
-
-    this.setState({ focused: false });
-
-    if (addOnBlur) {
-      const { inputValue } = this.refs.chipInput.state;
-
-      this.handleTokenAdd(inputValue);
-    }
-
-    if (typeof onBlur === 'function') {
-      onBlur();
-    }
-  }
-
-  handleTokenAdd = (value) => {
-    const { tokens, onInputChange } = this.props;
-
-    const newTokens = uniq([].concat(tokens, value));
-
-    this.handleTokensChange(newTokens);
-
-    if (value === this.refs.chipInput.state.inputValue) {
-      if (typeof onInputChange === 'function') {
-        onInputChange('');
-      }
-      this.refs.chipInput.setState({ inputValue: '' });
-    }
-  }
-
-  handleTokenDelete = (value) => {
-    const { tokens } = this.props;
-
-    const newTokens = uniq([]
-      .concat(tokens)
-      .filter(v => v !== value));
-
-    this.handleTokensChange(newTokens);
-    this.focus();
-  }
-
-  focus = () => {
-    this.refs.chipInput.focus();
-  }
-
-  handleInputChange = (value) => {
-    const { onInputChange } = this.props;
-
-    const splitTokens = value.split(/[\s,;]/);
-
-    const inputValue = (splitTokens.length <= 1)
-      ? value
-      : splitTokens.slice(-1)[0].trim();
-
-    this.refs.chipInput.setState({ inputValue });
-
-    if (splitTokens.length > 1) {
-      const tokensToAdd = splitTokens.slice(0, -1);
-
-      tokensToAdd.forEach(token => this.handleTokenAdd(token));
-    }
-
-    if (typeof onInputChange === 'function') {
-      onInputChange(inputValue);
-    }
-  }
-
-  handleTokensChange = (tokens) => {
-    const { onTokensChange } = this.props;
-
-    onTokensChange(tokens.filter(token => token && token.length > 0));
-  }
-}
diff --git a/js/src/ui/Form/InputDate/index.js b/js/src/ui/Form/InputDate/index.js
deleted file mode 100644
index decaab6716f1cc446bec8db90a182c4e614bbf7c..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputDate/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './inputDate';
diff --git a/js/src/ui/Form/InputDate/inputDate.css b/js/src/ui/Form/InputDate/inputDate.css
deleted file mode 100644
index 17ffa27b94a3efe03d9d494c30f0c739db6e5f2c..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputDate/inputDate.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  .input {
-    width: 100%;
-  }
-}
diff --git a/js/src/ui/Form/InputDate/inputDate.js b/js/src/ui/Form/InputDate/inputDate.js
deleted file mode 100644
index 86964837bc6efbf43635395c6f6496802509df2e..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputDate/inputDate.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { DatePicker } from 'material-ui';
-import React, { Component, PropTypes } from 'react';
-
-import Label from '../Label';
-
-import styles from './inputDate.css';
-
-// NOTE: Has to be larger than Signer overlay Z, aligns with ../InputTime
-const DIALOG_STYLE = { zIndex: 10010 };
-
-export default class InputDate extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    hint: PropTypes.node,
-    label: PropTypes.node,
-    onChange: PropTypes.func,
-    value: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { className, hint, label, onChange, value } = this.props;
-
-    return (
-      <div className={ [styles.container, className].join(' ') }>
-        <Label label={ label } />
-        <DatePicker
-          autoOk
-          className={ styles.input }
-          dialogContainerStyle={ DIALOG_STYLE }
-          hintText={ hint }
-          onChange={ onChange }
-          value={ value }
-        />
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/Form/InputInline/index.js b/js/src/ui/Form/InputInline/index.js
deleted file mode 100644
index 68e2dfd9f553a8823ef29c36a54be01dbd9559dd..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputInline/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './inputInline';
diff --git a/js/src/ui/Form/InputInline/inputInline.css b/js/src/ui/Form/InputInline/inputInline.css
deleted file mode 100644
index 5d53bf35b98c0b34914d303437544584a0f9e960..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputInline/inputInline.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.inlineedit {
-  cursor: pointer;
-}
diff --git a/js/src/ui/Form/InputInline/inputInline.js b/js/src/ui/Form/InputInline/inputInline.js
deleted file mode 100644
index 5736b7d39a13c56aa5f38e719aa13788fb6239f3..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputInline/inputInline.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import Input from '../Input';
-
-import styles from './inputInline.css';
-
-export default class InputInline extends Component {
-  static propTypes = {
-    error: PropTypes.string,
-    hint: PropTypes.string,
-    label: PropTypes.string,
-    onBlur: PropTypes.func,
-    onChange: PropTypes.func,
-    onSubmit: PropTypes.func,
-    onKeyDown: PropTypes.func,
-    type: PropTypes.string,
-    value: PropTypes.oneOfType([
-      PropTypes.number, PropTypes.string
-    ]),
-    static: nodeOrStringProptype()
-  }
-
-  state = {
-    editing: false
-  }
-
-  render () {
-    const { editing } = this.state;
-    const { error, label, hint, type, value } = this.props;
-
-    if (!editing) {
-      return (
-        <div
-          className={ styles.inlineedit }
-          onClick={ this.onToggle }
-        >
-          { this.props.static || value }
-        </div>
-      );
-    }
-
-    return (
-      <Input
-        error={ error }
-        label={ label }
-        hint={ hint }
-        type={ type }
-        value={ value }
-        onBlur={ this.onBlur }
-        onChange={ this.props.onChange }
-        onKeyDown={ this.onKeyDown }
-        onSubmit={ this.props.onSubmit }
-      />
-    );
-  }
-
-  onBlur = () => {
-    this.onToggle();
-
-    if (this.props.onBlur) {
-      this.props.onBlur();
-    }
-  }
-
-  onToggle = () => {
-    this.setState({
-      editing: !this.state.editing
-    });
-  }
-
-  onKeyDown = (event) => {
-    if (event.keyCode === 13) {
-      this.onToggle();
-    }
-
-    this.props.onKeyDown && this.props.onKeyDown(event);
-  }
-}
diff --git a/js/src/ui/Form/InputTime/index.js b/js/src/ui/Form/InputTime/index.js
deleted file mode 100644
index c6b393c349b8ad99d14ae5ae66cc121c607d859f..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputTime/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './inputTime';
diff --git a/js/src/ui/Form/InputTime/inputTime.css b/js/src/ui/Form/InputTime/inputTime.css
deleted file mode 100644
index 17ffa27b94a3efe03d9d494c30f0c739db6e5f2c..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputTime/inputTime.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  .input {
-    width: 100%;
-  }
-}
diff --git a/js/src/ui/Form/InputTime/inputTime.js b/js/src/ui/Form/InputTime/inputTime.js
deleted file mode 100644
index 2d54c8b127f10545e6593678cafaa7041f38c579..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/InputTime/inputTime.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { TimePicker } from 'material-ui';
-import React, { Component, PropTypes } from 'react';
-
-import Label from '../Label';
-
-import styles from './inputTime.css';
-
-// NOTE: Has to be larger than Signer overlay Z, aligns with ../InputDate
-const DIALOG_STYLE = { zIndex: 10010 };
-
-export default class InputTime extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    hint: PropTypes.node,
-    label: PropTypes.node,
-    onChange: PropTypes.func,
-    value: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { className, hint, label, onChange, value } = this.props;
-
-    return (
-      <div className={ [styles.container, className].join(' ') }>
-        <Label label={ label } />
-        <TimePicker
-          autoOk
-          className={ styles.input }
-          dialogStyle={ DIALOG_STYLE }
-          format='24hr'
-          hintText={ hint }
-          onChange={ onChange }
-          value={ value }
-        />
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/Form/Label/index.js b/js/src/ui/Form/Label/index.js
deleted file mode 100644
index d0394a361a8fcbd75d22bd705979831c0562909b..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/Label/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './label';
diff --git a/js/src/ui/Form/Label/label.css b/js/src/ui/Form/Label/label.css
deleted file mode 100644
index e774cb39fbf034ea93ce1617367506c37145b517..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/Label/label.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$labelColor: rgba(255, 255, 255, 0.5);
-$labelFontSize: 0.75rem;
-
-.label {
-  color: $labelColor;
-  font-size: $labelFontSize;
-}
diff --git a/js/src/ui/Form/Label/label.js b/js/src/ui/Form/Label/label.js
deleted file mode 100644
index 952a0e7a15f37e824fb771adc3642b23f0735dfb..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/Label/label.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './label.css';
-
-export default class Label extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    label: PropTypes.node
-  }
-
-  render () {
-    const { className, label } = this.props;
-
-    if (!label) {
-      return null;
-    }
-
-    return (
-      <label className={ [styles.label, className].join(' ') }>
-        { label }
-      </label>
-    );
-  }
-}
diff --git a/js/src/ui/Form/PasswordStrength/index.js b/js/src/ui/Form/PasswordStrength/index.js
deleted file mode 100644
index f2cec1a788a70b90554611c5dd80a45266124974..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/PasswordStrength/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './passwordStrength';
diff --git a/js/src/ui/Form/PasswordStrength/passwordStrength.css b/js/src/ui/Form/PasswordStrength/passwordStrength.css
deleted file mode 100644
index a3fad6d30ff4e42657c124646b1270d4ecdd1e0f..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/PasswordStrength/passwordStrength.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.strength {
-  margin-top: 1.25em;
-}
-
-.feedback {
-  font-size: 0.75em;
-}
-
-.label {
-  user-select: none;
-  line-height: 18px;
-  font-size: 12px;
-  color: rgba(255, 255, 255, 0.498039);
-}
diff --git a/js/src/ui/Form/PasswordStrength/passwordStrength.js b/js/src/ui/Form/PasswordStrength/passwordStrength.js
deleted file mode 100644
index 949d5308724809673b1d8b303c8b2e05c11044c9..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/PasswordStrength/passwordStrength.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { debounce } from 'lodash';
-import { LinearProgress } from 'material-ui';
-import { FormattedMessage } from 'react-intl';
-import zxcvbn from 'zxcvbn';
-
-import styles from './passwordStrength.css';
-
-const BAR_STYLE = {
-  borderRadius: 1,
-  height: 7,
-  marginTop: '0.5em'
-};
-
-export default class PasswordStrength extends Component {
-  static propTypes = {
-    input: PropTypes.string.isRequired
-  };
-
-  state = {
-    strength: null
-  };
-
-  constructor (props) {
-    super(props);
-
-    this.updateStrength = debounce(this._updateStrength, 50, { leading: true });
-  }
-
-  componentWillMount () {
-    this.updateStrength(this.props.input);
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (nextProps.input !== this.props.input) {
-      this.updateStrength(nextProps.input);
-    }
-  }
-
-  _updateStrength (input = '') {
-    const strength = zxcvbn(input);
-
-    this.setState({ strength });
-  }
-
-  render () {
-    const { strength } = this.state;
-
-    if (!strength) {
-      return null;
-    }
-
-    const { score, feedback } = strength;
-
-    // Score is between 0 and 4
-    const value = score * 100 / 5 + 20;
-    const color = this.getStrengthBarColor(score);
-
-    return (
-      <div className={ styles.strength }>
-        <label className={ styles.label }>
-          <FormattedMessage
-            id='ui.passwordStrength.label'
-            defaultMessage='password strength'
-          />
-        </label>
-        <LinearProgress
-          color={ color }
-          mode='determinate'
-          style={ BAR_STYLE }
-          value={ value }
-        />
-        <div className={ styles.feedback }>
-          { this.renderFeedback(feedback) }
-        </div>
-      </div>
-    );
-  }
-
-  // Note that the suggestions are in english, thus it wouldn't
-  // make sense to add translations to surrounding words
-  renderFeedback (feedback = {}) {
-    const { suggestions = [] } = feedback;
-
-    return (
-      <div>
-        <p>
-          { suggestions.join(' ') }
-        </p>
-      </div>
-    );
-  }
-
-  getStrengthBarColor (score) {
-    switch (score) {
-      case 4:
-      case 3:
-        return 'lightgreen';
-
-      case 2:
-        return 'yellow';
-
-      case 1:
-        return 'orange';
-
-      default:
-        return 'red';
-    }
-  }
-}
diff --git a/js/src/ui/Form/PasswordStrength/passwordStrength.spec.js b/js/src/ui/Form/PasswordStrength/passwordStrength.spec.js
deleted file mode 100644
index c777d1f29e42bc7fc243a81a32118b54274b01b6..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/PasswordStrength/passwordStrength.spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import PasswordStrength from './passwordStrength';
-
-const INPUT_A = 'l33t_test';
-const INPUT_B = 'Fu£dk;s$%kdlaOe9)_';
-const INPUT_NULL = '';
-
-function render (props) {
-  return shallow(
-    <PasswordStrength { ...props } />
-  ).shallow();
-}
-
-describe('ui/Form/PasswordStrength', () => {
-  describe('rendering', () => {
-    it('renders', () => {
-      expect(render({ input: INPUT_A })).to.be.ok;
-    });
-
-    it('renders a linear progress', () => {
-      expect(render({ input: INPUT_A }).find('LinearProgress')).to.be.ok;
-    });
-
-    describe('compute strength', () => {
-      it('has low score with empty input', () => {
-        expect(
-          render({ input: INPUT_NULL }).find('LinearProgress').props().value
-        ).to.equal(20);
-      });
-
-      it('has medium score', () => {
-        expect(
-          render({ input: INPUT_A }).find('LinearProgress').props().value
-        ).to.equal(60);
-      });
-
-      it('has high score', () => {
-        expect(
-          render({ input: INPUT_B }).find('LinearProgress').props().value
-        ).to.equal(100);
-      });
-    });
-  });
-});
diff --git a/js/src/ui/Form/RadioButtons/index.js b/js/src/ui/Form/RadioButtons/index.js
deleted file mode 100644
index d473f342db862eba4851ca61b8a9ec2666f77442..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/RadioButtons/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './radioButtons';
diff --git a/js/src/ui/Form/RadioButtons/radioButtons.css b/js/src/ui/Form/RadioButtons/radioButtons.css
deleted file mode 100644
index 12e10eeab0554141d0d748a1460a4b8d2c881b34..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/RadioButtons/radioButtons.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  .label {
-  }
-
-  .radioButton {
-    margin: 0.25em 0;
-  }
-
-  .radioLabel {
-    display: flex;
-    flex-direction: column;
-
-    .description {
-      font-size: 0.8em;
-      margin-bottom: 0.5em;
-      color: #ccc;
-      z-index: 2;
-    }
-  }
-}
diff --git a/js/src/ui/Form/RadioButtons/radioButtons.js b/js/src/ui/Form/RadioButtons/radioButtons.js
deleted file mode 100644
index bebe9c0f8589dd0219d55f47927f5c2d9a385397..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/RadioButtons/radioButtons.js
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { RadioButton, RadioButtonGroup } from 'material-ui/RadioButton';
-import React, { Component, PropTypes } from 'react';
-
-import { arrayOrObjectProptype } from '~/util/proptypes';
-
-import Label from '../Label';
-import styles from './radioButtons.css';
-
-export default class RadioButtons extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    label: PropTypes.node,
-    name: PropTypes.string,
-    onChange: PropTypes.func.isRequired,
-    value: PropTypes.any,
-    values: arrayOrObjectProptype().isRequired
-  };
-
-  static defaultProps = {
-    value: 0,
-    name: ''
-  };
-
-  render () {
-    const { className, label, value, values } = this.props;
-
-    const index = Number.isNaN(parseInt(value))
-      ? values.findIndex((_value) => _value.key === value)
-      : parseInt(value);
-    const selectedValue = typeof value !== 'object'
-      ? values[index]
-      : value;
-    const key = this.getKey(selectedValue, index);
-
-    return (
-      <div className={ [styles.container, className].join(' ') }>
-        <Label
-          className={ styles.label }
-          label={ label }
-        />
-        <RadioButtonGroup
-          name={ name }
-          onChange={ this.onChange }
-          valueSelected={ key }
-        >
-          { this.renderContent() }
-        </RadioButtonGroup>
-      </div>
-    );
-  }
-
-  renderContent () {
-    const { values } = this.props;
-
-    return values.map((value, index) => {
-      const label = typeof value === 'string'
-        ? value
-        : value.label || '';
-      const description = (typeof value !== 'string' && value.description) || null;
-      const key = this.getKey(value, index);
-
-      return (
-        <RadioButton
-          className={ styles.radioButton }
-          key={ index }
-          label={
-            <div className={ styles.radioLabel }>
-              <span>{ label }</span>
-              {
-                description
-                ? <span className={ styles.description }>{ description }</span>
-                : null
-              }
-            </div>
-          }
-          value={ key }
-        />
-      );
-    });
-  }
-
-  getKey (value, index) {
-    if (typeof value !== 'string') {
-      return typeof value.key === 'undefined'
-        ? index
-        : value.key;
-    }
-
-    return index;
-  }
-
-  onChange = (event, index) => {
-    const { onChange, values } = this.props;
-    const value = values[index] || values.find((value) => value.key === index);
-
-    onChange(value, index);
-  }
-}
diff --git a/js/src/ui/Form/Select/index.js b/js/src/ui/Form/Select/index.js
deleted file mode 100644
index 58cb5243b4469bf7c650138e739f000acb6598ff..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/Select/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './select';
diff --git a/js/src/ui/Form/Select/select.js b/js/src/ui/Form/Select/select.js
deleted file mode 100644
index cb6e864b72bf9869a779dbced1b160cca1882e83..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/Select/select.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { MenuItem, SelectField } from 'material-ui';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-// TODO: duplicated in Input
-const UNDERLINE_DISABLED = {
-  borderColor: 'rgba(255, 255, 255, 0.298039)' // 'transparent' // 'rgba(255, 255, 255, 0.298039)'
-};
-
-const UNDERLINE_NORMAL = {
-  borderBottom: 'solid 2px'
-};
-
-const NAME_ID = ' ';
-
-export default class Select extends Component {
-  static propTypes = {
-    children: PropTypes.node,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    error: nodeOrStringProptype(),
-    hint: nodeOrStringProptype(),
-    label: nodeOrStringProptype(),
-    onBlur: PropTypes.func,
-    onChange: PropTypes.func,
-    onKeyDown: PropTypes.func,
-    type: PropTypes.string,
-    value: PropTypes.any,
-    values: PropTypes.array
-  }
-
-  render () {
-    const { className, disabled, error, hint, label, onBlur, onChange, onKeyDown, value } = this.props;
-
-    return (
-      <SelectField
-        autoComplete='off'
-        className={ className }
-        disabled={ disabled }
-        errorText={ error }
-        floatingLabelFixed
-        floatingLabelText={ label }
-        fullWidth
-        hintText={ hint }
-        id={ NAME_ID }
-        name={ NAME_ID }
-        onBlur={ onBlur }
-        onChange={ onChange }
-        onKeyDown={ onKeyDown }
-        underlineDisabledStyle={ UNDERLINE_DISABLED }
-        underlineStyle={ UNDERLINE_NORMAL }
-        value={ value }
-      >
-        { this.renderChildren() }
-      </SelectField>
-    );
-  }
-
-  renderChildren () {
-    const { children, values } = this.props;
-
-    if (children) {
-      return children;
-    }
-
-    if (!values) {
-      return null;
-    }
-
-    return values.map((data, index) => {
-      const { name = index, value = index } = data;
-
-      return (
-        <MenuItem
-          key={ index }
-          label={ name }
-          value={ value }
-        >
-          { name }
-        </MenuItem>
-      );
-    });
-  }
-}
diff --git a/js/src/ui/Form/TypedInput/index.js b/js/src/ui/Form/TypedInput/index.js
deleted file mode 100644
index 8fbc515cf9b914675b04c3b61db8c76dc121d4ec..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/TypedInput/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './typedInput';
diff --git a/js/src/ui/Form/TypedInput/typedInput.css b/js/src/ui/Form/TypedInput/typedInput.css
deleted file mode 100644
index 1281c203cea2f1d787d1b6d7d6e6505bd8e047f7..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/TypedInput/typedInput.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.inputs {
-  padding-top: 2px;
-  overflow-x: hidden;
-
-  label {
-    line-height: 22px;
-    pointer-events: none;
-    color: rgba(255, 255, 255, 0.498039);
-    -webkit-user-select: none;
-    font-size: 12px;
-    position: relative;
-  }
-}
-
-.ethInput {
-  display: flex;
-  flex-direction: row;
-  align-items: flex-end;
-
-  .input {
-    flex: 1;
-    position: relative;
-
-    .label {
-      position: absolute;
-      right: 1.5em;
-      bottom: 1em;
-      font-size: 0.85em;
-      margin-left: 0.5em;
-    }
-  }
-
-  .toggle {
-    margin-bottom: 0.5em;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-  }
-}
-
diff --git a/js/src/ui/Form/TypedInput/typedInput.js b/js/src/ui/Form/TypedInput/typedInput.js
deleted file mode 100644
index e9f9c7eeefef250da5862b4646cc62da0f5a34bf..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/TypedInput/typedInput.js
+++ /dev/null
@@ -1,470 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { MenuItem, Toggle } from 'material-ui';
-import { range } from 'lodash';
-import BigNumber from 'bignumber.js';
-
-import IconButton from 'material-ui/IconButton';
-import AddIcon from 'material-ui/svg-icons/content/add';
-import RemoveIcon from 'material-ui/svg-icons/content/remove';
-
-import { fromWei, toWei } from '~/api/util/wei';
-import { bytesToHex } from '~/api/util/format';
-import Input from '~/ui/Form/Input';
-import InputAddressSelect from '~/ui/Form/InputAddressSelect';
-import Select from '~/ui/Form/Select';
-import { ABI_TYPES, parseAbiType } from '~/util/abi';
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './typedInput.css';
-
-export default class TypedInput extends Component {
-  static propTypes = {
-    param: PropTypes.oneOfType([
-      PropTypes.object,
-      PropTypes.string
-    ]).isRequired,
-
-    accounts: PropTypes.object,
-    allowCopy: PropTypes.bool,
-    className: PropTypes.string,
-    error: PropTypes.any,
-    hint: nodeOrStringProptype(),
-    isEth: PropTypes.bool,
-    label: nodeOrStringProptype(),
-    max: PropTypes.number,
-    min: PropTypes.number,
-    onChange: PropTypes.func,
-    readOnly: PropTypes.bool,
-    value: PropTypes.any
-  };
-
-  static defaultProps = {
-    allowCopy: false,
-    isEth: null,
-    min: null,
-    max: null,
-    onChange: () => {},
-    readOnly: false
-  };
-
-  state = {
-    isEth: false,
-    ethValue: 0
-  };
-
-  componentWillMount () {
-    const { isEth } = this.props;
-    const value = this.getValue();
-
-    if (typeof isEth === 'boolean' && value) {
-      // Remove formatting commas
-      const sanitizedValue = typeof value === 'string' ? value.replace(/,/g, '') : value;
-      const ethValue = isEth ? fromWei(sanitizedValue) : value;
-
-      this.setState({ isEth, ethValue });
-    }
-  }
-
-  render () {
-    const param = this.getParam();
-
-    if (param) {
-      return this.renderParam(param);
-    }
-
-    console.error('<TypedInput>', `unkown "${param}" param passed to props`);
-    return null;
-  }
-
-  renderParam (param) {
-    const { allowCopy, isEth, readOnly } = this.props;
-    const { type } = param;
-
-    if (type === ABI_TYPES.ARRAY) {
-      const { accounts, className, label } = this.props;
-      const { subtype, length } = param;
-      const value = this.getValue() || param.default;
-
-      const fixedLength = !!length;
-
-      const inputs = range(length || value.length).map((_, index) => {
-        const onChange = (inputValue) => {
-          const newValues = [].concat(value);
-
-          newValues[index] = inputValue;
-          this.props.onChange(newValues);
-        };
-
-        return (
-          <TypedInput
-            accounts={ accounts }
-            allowCopy={ allowCopy }
-            className={ className }
-            key={ `${subtype.type}_${index}` }
-            onChange={ onChange }
-            param={ subtype }
-            readOnly={ readOnly }
-            value={ value[index] }
-          />
-        );
-      });
-
-      return (
-        <div className={ styles.inputs }>
-          <label>{ label }</label>
-          { fixedLength || readOnly ? null : this.renderLength() }
-          { inputs }
-        </div>
-      );
-    }
-
-    if (isEth) {
-      return this.renderEth();
-    }
-
-    return this.renderType(type);
-  }
-
-  renderLength () {
-    const iconStyle = {
-      width: 16,
-      height: 16
-    };
-
-    const style = {
-      width: 24,
-      height: 24,
-      padding: 0
-    };
-
-    const plusStyle = {
-      ...style,
-      backgroundColor: 'rgba(255, 255, 255, 0.25)',
-      borderRadius: '50%'
-    };
-
-    return (
-      <div style={ { marginTop: '0.75em' } }>
-        <IconButton
-          iconStyle={ iconStyle }
-          style={ plusStyle }
-          onTouchTap={ this.onAddField }
-        >
-          <AddIcon />
-        </IconButton>
-
-        <IconButton
-          iconStyle={ iconStyle }
-          style={ style }
-          onTouchTap={ this.onRemoveField }
-        >
-          <RemoveIcon />
-        </IconButton>
-      </div>
-    );
-  }
-
-  renderType (type) {
-    if (type === ABI_TYPES.ADDRESS) {
-      return this.renderAddress();
-    }
-
-    if (type === ABI_TYPES.BOOL) {
-      return this.renderBoolean();
-    }
-
-    if (type === ABI_TYPES.STRING) {
-      return this.renderDefault();
-    }
-
-    if (type === ABI_TYPES.BYTES) {
-      let value = this.getValue();
-
-      // Convert to hex if it's an array
-      if (Array.isArray(value)) {
-        value = bytesToHex(value);
-      }
-
-      return this.renderDefault(value);
-    }
-
-    // If the `isEth` prop is present (true or false)
-    // then render the ETH toggle (usefull for contract execution)
-    // Don't by default
-    if (type === ABI_TYPES.INT) {
-      const { isEth } = this.props;
-
-      if (typeof isEth !== 'boolean') {
-        return this.renderInteger();
-      }
-
-      return this.renderEth();
-    }
-
-    if (type === ABI_TYPES.FIXED) {
-      return this.renderFloat();
-    }
-
-    return this.renderDefault();
-  }
-
-  renderEth () {
-    const { ethValue, isEth } = this.state;
-
-    const value = ethValue && typeof ethValue.toFixed === 'function'
-      ? ethValue.toFixed() // we need a string representation, could be >15 digits
-      : ethValue;
-
-    const input = isEth
-      ? this.renderFloat(value, this.onEthValueChange)
-      : this.renderInteger(value, this.onEthValueChange);
-
-    return (
-      <div className={ styles.ethInput }>
-        <div className={ styles.input }>
-          { input }
-          { isEth ? (<div className={ styles.label }>ETH</div>) : null }
-        </div>
-        <div className={ styles.toggle }>
-          <Toggle
-            toggled={ this.state.isEth }
-            onToggle={ this.onEthTypeChange }
-            style={ { width: 46 } }
-          />
-        </div>
-      </div>
-    );
-  }
-
-  getNumberValue (value, readOnly = this.props.readOnly) {
-    if (!value) {
-      return value;
-    }
-
-    const rawValue = typeof value === 'string'
-      ? value.replace(/,/g, '')
-      : value;
-
-    const bnValue = new BigNumber(rawValue);
-
-    return readOnly
-      ? bnValue.toFormat()
-      : bnValue.toFixed(); // we need a string representation, could be >15 digits
-  }
-
-  renderInteger (value = this.getValue(), onChange = this.onChange) {
-    const { allowCopy, className, label, error, hint, min, max, readOnly } = this.props;
-    const param = this.getParam();
-
-    const realValue = this.getNumberValue(value);
-
-    return (
-      <Input
-        allowCopy={ allowCopy ? this.getNumberValue(value, false) : undefined }
-        className={ className }
-        label={ label }
-        hint={ hint }
-        value={ realValue }
-        error={ error }
-        onChange={ onChange }
-        readOnly={ readOnly }
-        type={ readOnly ? 'text' : 'number' }
-        step={ 1 }
-        min={ min !== null ? min : (param.signed ? null : 0) }
-        max={ max !== null ? max : null }
-      />
-    );
-  }
-
-  /**
-   * Decimal numbers have to be input via text field
-   * because of some react issues with input number fields.
-   * Once the issue is fixed, this could be a number again.
-   *
-   * @see https://github.com/facebook/react/issues/1549
-   */
-  renderFloat (value = this.getValue(), onChange = this.onChange) {
-    const { allowCopy, className, label, error, hint, min, max, readOnly } = this.props;
-    const param = this.getParam();
-
-    const realValue = this.getNumberValue(value);
-
-    return (
-      <Input
-        allowCopy={ allowCopy ? this.getNumberValue(value, false) : undefined }
-        className={ className }
-        label={ label }
-        hint={ hint }
-        value={ realValue }
-        error={ error }
-        onChange={ onChange }
-        readOnly={ readOnly }
-        type='text'
-        min={ min !== null ? min : (param.signed ? null : 0) }
-        max={ max !== null ? max : null }
-      />
-    );
-  }
-
-  renderDefault (value = this.getValue()) {
-    const { allowCopy, className, label, error, hint, readOnly } = this.props;
-
-    return (
-      <Input
-        allowCopy={ allowCopy }
-        className={ className }
-        label={ label }
-        hint={ hint }
-        value={ value }
-        error={ error }
-        onSubmit={ this.onSubmit }
-        readOnly={ readOnly }
-      />
-    );
-  }
-
-  renderAddress () {
-    const { accounts, allowCopy, className, label, error, hint, readOnly } = this.props;
-    const value = this.getValue();
-
-    return (
-      <InputAddressSelect
-        allowCopy={ allowCopy }
-        accounts={ accounts }
-        className={ className }
-        error={ error }
-        hint={ hint }
-        label={ label }
-        onChange={ this.onChange }
-        readOnly={ readOnly }
-        value={ value }
-      />
-    );
-  }
-
-  renderBoolean () {
-    const { allowCopy, className, label, error, hint, readOnly } = this.props;
-    const value = this.getValue() ? 'true' : 'false';
-
-    if (readOnly) {
-      return this.renderDefault(value);
-    }
-
-    const boolitems = ['false', 'true'].map((bool) => {
-      return (
-        <MenuItem
-          key={ bool }
-          label={ bool }
-          value={ bool }
-        >
-          { bool }
-        </MenuItem>
-      );
-    });
-
-    return (
-      <Select
-        allowCopy={ allowCopy }
-        className={ className }
-        error={ error }
-        hint={ hint }
-        label={ label }
-        onChange={ this.onChangeBool }
-        value={ value }
-      >
-        { boolitems }
-      </Select>
-    );
-  }
-
-  onChangeBool = (event, _index, value) => {
-    // NOTE: event.target.value added for enzyme simulated event testing
-    this.props.onChange((value || event.target.value) === 'true');
-  }
-
-  onEthTypeChange = () => {
-    const { isEth, ethValue } = this.state;
-
-    if (ethValue === '' || ethValue === undefined) {
-      return this.setState({ isEth: !isEth });
-    }
-
-    // Remove formatting commas
-    const sanitizedValue = typeof ethValue === 'string' ? ethValue.replace(/,/g, '') : ethValue;
-    const value = isEth ? toWei(sanitizedValue) : fromWei(sanitizedValue);
-
-    this.setState({ isEth: !isEth, ethValue: value }, () => {
-      this.onEthValueChange(null, value);
-    });
-  }
-
-  onEthValueChange = (event, value) => {
-    const realValue = this.state.isEth && value !== '' && value !== undefined
-      ? toWei(value)
-      : value;
-
-    this.setState({ ethValue: value });
-    this.props.onChange(realValue);
-  }
-
-  onChange = (event, value) => {
-    this.props.onChange(value);
-  }
-
-  onSubmit = (value) => {
-    this.props.onChange(value);
-  }
-
-  onAddField = () => {
-    const { value, onChange } = this.props;
-    const param = this.getParam();
-
-    const newValues = [].concat(value, param.subtype.default);
-
-    onChange(newValues);
-  }
-
-  onRemoveField = () => {
-    const { value, onChange } = this.props;
-    const newValues = value.slice(0, -1);
-
-    onChange(newValues);
-  }
-
-  getParam () {
-    const { param } = this.props;
-
-    if (typeof param === 'string') {
-      return parseAbiType(param);
-    }
-
-    return param;
-  }
-
-  /**
-   * If the value comes from `decodeMethodInput`,
-   * it can be an object of the shape:
-   *   { value: Object, type: String }
-   */
-  getValue (value = this.props.value) {
-    return value && value.value !== undefined
-      ? value.value
-      : value;
-  }
-}
diff --git a/js/src/ui/Form/TypedInput/typedInput.spec.js b/js/src/ui/Form/TypedInput/typedInput.spec.js
deleted file mode 100644
index 56d81b6421ee2021bc586c7a2f50c9b256ac1a4a..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/TypedInput/typedInput.spec.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { ABI_TYPES } from '~/util/abi';
-
-import TypedInput from './';
-
-let component;
-let select;
-let onChange;
-
-function render (props) {
-  onChange = sinon.stub();
-  component = shallow(
-    <TypedInput
-      { ...props }
-      onChange={ onChange }
-    />
-  );
-  select = component.find('Select');
-
-  return component;
-}
-
-describe('ui/Form/TypedInput', () => {
-  describe('bool selection', () => {
-    beforeEach(() => {
-      render({ param: { type: ABI_TYPES.BOOL } });
-    });
-
-    it('renders', () => {
-      expect(component).to.be.ok;
-    });
-
-    it('calls onChange when value changes', () => {
-      select.shallow().simulate('change', { target: { value: 'true' } });
-
-      expect(onChange).to.have.been.called;
-    });
-
-    it("calls onChange(true) when value changes to 'true'", () => {
-      select.shallow().simulate('change', { target: { value: 'true' } });
-
-      expect(onChange).to.have.been.calledWith(true);
-    });
-
-    it("calls onChange(false) when value changes to 'false'", () => {
-      select.shallow().simulate('change', { target: { value: 'false' } });
-
-      expect(onChange).to.have.been.calledWith(false);
-    });
-  });
-});
diff --git a/js/src/ui/Form/VaultSelect/index.js b/js/src/ui/Form/VaultSelect/index.js
deleted file mode 100644
index b8741956e5812e4dca59bfcccc91b2c42136628e..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/VaultSelect/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './vaultSelect';
diff --git a/js/src/ui/Form/VaultSelect/vaultSelect.js b/js/src/ui/Form/VaultSelect/vaultSelect.js
deleted file mode 100644
index c93e530e1ea063de8fec49a9d42465c24f9b048c..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/VaultSelect/vaultSelect.js
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import VaultSelector from '~/modals/VaultSelector';
-import VaultStore from '~/views/Vaults/store';
-
-import InputAddress from '../InputAddress';
-
-export default class VaultSelect extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    onSelect: PropTypes.func.isRequired,
-    value: PropTypes.string,
-    vaultStore: PropTypes.object
-  };
-
-  state = {
-    isOpen: false
-  };
-
-  vaultStore = this.props.vaultStore || VaultStore.get(this.context.api);
-
-  componentWillMount () {
-    return this.vaultStore.loadVaults();
-  }
-
-  render () {
-    const { value } = this.props;
-
-    return (
-      <div>
-        { this.renderSelector() }
-        <InputAddress
-          allowCopy={ false }
-          allowInvalid
-          disabled
-          hint={
-            <FormattedMessage
-              id='ui.vaultSelect.hint'
-              defaultMessage='the vault this account is attached to'
-            />
-          }
-          label={
-            <FormattedMessage
-              id='ui.vaultSelect.label'
-              defaultMessage='associated vault'
-            />
-          }
-          onClick={ this.openSelector }
-          value={ (value || '').toUpperCase() }
-        />
-      </div>
-    );
-  }
-
-  renderSelector () {
-    const { value } = this.props;
-    const { isOpen } = this.state;
-
-    if (!isOpen) {
-      return null;
-    }
-
-    return (
-      <VaultSelector
-        onClose={ this.closeSelector }
-        onSelect={ this.onSelect }
-        selected={ value }
-        vaultStore={ this.vaultStore }
-      />
-    );
-  }
-
-  openSelector = () => {
-    this.setState({
-      isOpen: true
-    });
-  }
-
-  closeSelector = () => {
-    this.setState({
-      isOpen: false
-    });
-  }
-
-  onSelect = (vaultName) => {
-    this.props.onSelect(vaultName);
-    this.closeSelector();
-  }
-}
diff --git a/js/src/ui/Form/VaultSelect/vaultSelect.spec.js b/js/src/ui/Form/VaultSelect/vaultSelect.spec.js
deleted file mode 100644
index a0d5ed58338d090591394d2747717e02763e32fc..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/VaultSelect/vaultSelect.spec.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import VaultSelect from './';
-
-let component;
-let instance;
-let onSelect;
-let vaultStore;
-
-function createVaultStore () {
-  vaultStore = {
-    loadVaults: sinon.stub().resolves(true)
-  };
-
-  return vaultStore;
-}
-
-function render () {
-  onSelect = sinon.stub();
-
-  component = shallow(
-    <VaultSelect
-      onSelect={ onSelect }
-      value='initialValue'
-      vaultStore={ createVaultStore() }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('ui/Form/VaultSelect', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('components', () => {
-    describe('InputAddress', () => {
-      let input;
-
-      beforeEach(() => {
-        input = component.find('Connect(InputAddress)');
-      });
-
-      it('renders', () => {
-        expect(input.get(0)).to.be.ok;
-      });
-
-      it('passes value from props', () => {
-        expect(input.props().value).to.equal('INITIALVALUE');
-      });
-
-      it('passes instance openSelector to onClick', () => {
-        expect(input.props().onClick).to.equal(instance.openSelector);
-      });
-    });
-  });
-
-  describe('instance methods', () => {
-    describe('onSelect', () => {
-      it('calls into props', () => {
-        instance.onSelect('testing');
-        expect(onSelect).to.have.been.calledWith('testing');
-      });
-    });
-  });
-});
diff --git a/js/src/ui/Form/form.css b/js/src/ui/Form/form.css
deleted file mode 100644
index ff9ff9e840a177b098687160359bd7502ce5a416..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/form.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.form {
-  margin-top: -1em;
-  width: 100%;
-}
-
-.autofill {
-  height: 0;
-  width: 1px;
-  position: absolute;
-  left: 0;
-  top: 0;
-  opacity: 0;
-}
-
-:root .form input:-webkit-autofill {
-  display: none;
-  opacity: 0;
-}
diff --git a/js/src/ui/Form/form.js b/js/src/ui/Form/form.js
deleted file mode 100644
index ca6422007709577ae1c00ca1349c397fc7885799..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/form.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './form.css';
-
-export default class Form extends Component {
-  static propTypes = {
-    children: PropTypes.node,
-    className: PropTypes.string
-  }
-
-  render () {
-    const { className } = this.props;
-    const classes = [ styles.form ];
-
-    if (className) {
-      classes.push(className);
-    }
-
-    // HACK: hidden inputs to disable Chrome's autocomplete
-    return (
-      <form
-        autoComplete='new-password'
-        className={ classes.join(' ') }
-      >
-        <div className={ styles.autofill }>
-          <input type='text' name='fakeusernameremembered' />
-          <input type='password' name='fakepasswordremembered' />
-        </div>
-        { this.props.children }
-      </form>
-    );
-  }
-}
diff --git a/js/src/ui/Form/index.js b/js/src/ui/Form/index.js
deleted file mode 100644
index 8c8c7e1f2f89250f85970bc64fafcd8e1133e7d9..0000000000000000000000000000000000000000
--- a/js/src/ui/Form/index.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export AddressSelect from './AddressSelect';
-export DappUrlInput from './DappUrlInput';
-export FileSelect from './FileSelect';
-export FormWrap from './FormWrap';
-export Input from './Input';
-export InputAddress from './InputAddress';
-export InputAddressSelect from './InputAddressSelect';
-export InputChip from './InputChip';
-export InputDate from './InputDate';
-export InputInline from './InputInline';
-export InputTime from './InputTime';
-export Label from './Label';
-export RadioButtons from './RadioButtons';
-export Select from './Select';
-export TypedInput from './TypedInput';
-export VaultSelect from './VaultSelect';
-
-export default from './form';
diff --git a/js/src/ui/GasPriceEditor/gasPriceEditor.css b/js/src/ui/GasPriceEditor/gasPriceEditor.css
deleted file mode 100644
index abe9c03bf9bb76f01d86098273a4d33e750f2a6e..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceEditor/gasPriceEditor.css
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  display: flex;
-  flex-direction: column;
-}
-
-.conditionContainer {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  margin-bottom: 1.5em;
-
-  .input {
-    flex: 0 1 50%;
-  }
-}
-
-.conditionRadio {
-  display: flex;
-  flex-direction: column;
-  margin-bottom: 1em;
-
-  &>label {
-    margin-bottom: 0.5em;
-  }
-
-  &>div {
-    display: flex;
-    flex-direction: row;
-
-    &>div {
-      width: auto !important;
-
-      label {
-        padding-right: 1.5em;
-        white-space: nowrap;
-      }
-    }
-  }
-}
-
-.graphContainer {
-  display: flex;
-  flex-wrap: wrap;
-  position: relative;
-}
-
-.editColumn {
-  flex: 35;
-  padding-left: 1em;
-  justify-ontent: space-around;
-  padding-bottom: 12;
-  display: flex;
-  flex-wrap: wrap;
-  position: relative;
-  flex-direction: column;
-}
-
-.gasPriceDesc {
-  font-size: 0.75em;
-  opacity: 0.5;
-}
-
-.graphColumn {
-  flex: 65;
-}
-
-.row {
-  display: flex;
-  flex-wrap: wrap;
-  position: relative;
-  flex-direction: column;
-}
diff --git a/js/src/ui/GasPriceEditor/gasPriceEditor.js b/js/src/ui/GasPriceEditor/gasPriceEditor.js
deleted file mode 100644
index db9e02396e02a7eb5fb1cdd292dfc6e15d8cdacf..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceEditor/gasPriceEditor.js
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Input, InputDate, InputTime, RadioButtons } from '../Form';
-import GasPriceSelector from '../GasPriceSelector';
-
-import Store, { CONDITIONS } from './store';
-import styles from './gasPriceEditor.css';
-
-const CONDITION_VALUES = [
-  {
-    label: (
-      <FormattedMessage
-        id='txEditor.condition.none'
-        defaultMessage='No conditions'
-      />
-    ),
-    key: CONDITIONS.NONE
-  },
-  {
-    label: (
-      <FormattedMessage
-        id='txEditor.condition.blocknumber'
-        defaultMessage='Send after BlockNumber'
-      />
-    ),
-    key: CONDITIONS.BLOCK
-  },
-  {
-    label: (
-      <FormattedMessage
-        id='txEditor.condition.datetime'
-        defaultMessage='Send after Date & Time'
-      />
-    ),
-    key: CONDITIONS.TIME
-  }
-];
-
-@observer
-export default class GasPriceEditor extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    children: PropTypes.node,
-    onChange: PropTypes.func,
-    store: PropTypes.object.isRequired
-  }
-
-  static Store = Store;
-
-  render () {
-    const { api } = this.context;
-    const { children, store } = this.props;
-    const { conditionType, errorGas, errorPrice, errorTotal, estimated, gas, histogram, price, priceDefault, totalValue } = store;
-
-    const eth = api.util.fromWei(totalValue).toFormat();
-    const gasLabel = `gas (estimated: ${new BigNumber(estimated).toFormat()})`;
-    const priceLabel = `price (current: ${new BigNumber(priceDefault).toFormat()})`;
-
-    return (
-      <div className={ styles.container }>
-        <RadioButtons
-          className={ styles.conditionRadio }
-          label={
-            <FormattedMessage
-              id='txEditor.condition.label'
-              defaultMessage='Condition where transaction activates'
-            />
-          }
-          onChange={ this.onChangeConditionType }
-          value={ conditionType }
-          values={ CONDITION_VALUES }
-        />
-        { this.renderConditions() }
-
-        <div className={ styles.graphContainer }>
-          <div className={ styles.graphColumn }>
-            <GasPriceSelector
-              histogram={ histogram }
-              onChange={ this.onEditGasPrice }
-              price={ price }
-            />
-            <div className={ styles.gasPriceDesc }>
-              <FormattedMessage
-                id='txEditor.gas.info'
-                defaultMessage='You can choose the gas price based on the distribution of recent included transaction gas prices. The lower the gas price is, the cheaper the transaction will be. The higher the gas price is, the faster it should get mined by the network.'
-              />
-            </div>
-          </div>
-
-          <div className={ styles.editColumn }>
-            <div className={ styles.row }>
-              <Input
-                error={ errorGas }
-                hint='the amount of gas to use for the transaction'
-                label={ gasLabel }
-                min={ 1 }
-                onChange={ this.onEditGas }
-                type='number'
-                value={ gas }
-              />
-              <Input
-                error={ errorPrice }
-                hint='the price of gas to use for the transaction'
-                label={ priceLabel }
-                min={ 1 }
-                onChange={ this.onEditGasPrice }
-                type='number'
-                value={ price }
-              />
-            </div>
-            <div className={ styles.row }>
-              <Input
-                disabled
-                error={ errorTotal }
-                hint='the total amount of the transaction'
-                label='total transaction amount'
-                value={ `${eth} ETH` }
-              />
-            </div>
-            <div className={ styles.row }>
-              { children }
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderConditions () {
-    const { conditionType, condition, conditionBlockError } = this.props.store;
-
-    if (conditionType === CONDITIONS.NONE) {
-      return null;
-    }
-
-    if (conditionType === CONDITIONS.BLOCK) {
-      return (
-        <div className={ styles.conditionContainer }>
-          <div className={ styles.input }>
-            <Input
-              error={ conditionBlockError }
-              hint={
-                <FormattedMessage
-                  id='txEditor.condition.block.hint'
-                  defaultMessage='The minimum block to send from'
-                />
-              }
-              label={
-                <FormattedMessage
-                  id='txEditor.condition.block.label'
-                  defaultMessage='Transaction send block'
-                />
-              }
-              min={ 1 }
-              onChange={ this.onChangeConditionBlock }
-              type='number'
-              value={ condition.block }
-            />
-          </div>
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.conditionContainer }>
-        <div className={ styles.input }>
-          <InputDate
-            hint={
-              <FormattedMessage
-                id='txEditor.condition.date.hint'
-                defaultMessage='The minimum date to send from'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='txEditor.condition.date.label'
-                defaultMessage='Transaction send date'
-              />
-            }
-            onChange={ this.onChangeConditionDateTime }
-            value={ condition.time }
-          />
-        </div>
-        <div className={ styles.input }>
-          <InputTime
-            hint={
-              <FormattedMessage
-                id='txEditor.condition.time.hint'
-                defaultMessage='The minimum time to send from'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='txEditor.condition.time.label'
-                defaultMessage='Transaction send time'
-              />
-            }
-            onChange={ this.onChangeConditionDateTime }
-            value={ condition.time }
-          />
-        </div>
-      </div>
-    );
-  }
-
-  onEditGas = (event, gas) => {
-    const { store, onChange } = this.props;
-
-    store.setGas(gas);
-    onChange && onChange('gas', gas);
-  }
-
-  onEditGasPrice = (event, price) => {
-    const { store, onChange } = this.props;
-
-    store.setPrice(price);
-    onChange && onChange('gasPrice', price);
-  }
-
-  onChangeConditionType = (conditionType) => {
-    this.props.store.setConditionType(conditionType.key);
-  }
-
-  onChangeConditionBlock = (event, blockNumber) => {
-    this.props.store.setConditionBlockNumber(blockNumber);
-  }
-
-  onChangeConditionDateTime = (event, datetime) => {
-    this.props.store.setConditionDateTime(datetime);
-  }
-}
diff --git a/js/src/ui/GasPriceEditor/gasPriceEditor.spec.js b/js/src/ui/GasPriceEditor/gasPriceEditor.spec.js
deleted file mode 100644
index 94d3076faa994aed1800ae838d00b289d4926f50..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceEditor/gasPriceEditor.spec.js
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import GasPriceEditor from './';
-
-let api;
-let component;
-let store;
-
-function createApi () {
-  api = {
-    eth: {
-      blockNumber: sinon.stub().resolves(new BigNumber(3))
-    },
-    util: {
-      fromWei: (value) => new BigNumber(value)
-    }
-  };
-
-  return api;
-}
-
-function createStore () {
-  createApi();
-
-  store = {
-    _api: api,
-    conditionType: 'none',
-    estimated: '123',
-    histogram: {},
-    priceDefault: '456',
-    totalValue: '789',
-    setGas: sinon.stub(),
-    setPrice: sinon.stub()
-  };
-
-  return store;
-}
-
-function render (props = {}) {
-  createStore();
-
-  component = shallow(
-    <GasPriceEditor
-      store={ store }
-      { ...props }
-    />,
-    {
-      context: {
-        api
-      }
-    }
-  );
-
-  return component;
-}
-
-describe('ui/GasPriceEditor', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders', () => {
-    expect(component).to.be.ok;
-  });
-});
diff --git a/js/src/ui/GasPriceEditor/index.js b/js/src/ui/GasPriceEditor/index.js
deleted file mode 100644
index 6cc3ae1c1f3e8842df81cb3efd9da4fdbfa763e4..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceEditor/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './gasPriceEditor';
diff --git a/js/src/ui/GasPriceEditor/store.js b/js/src/ui/GasPriceEditor/store.js
deleted file mode 100644
index a7a3b914bdcfe0163b6aedf69b404d76a8fdebf1..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceEditor/store.js
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { action, computed, observable, transaction } from 'mobx';
-
-import { ERRORS, validatePositiveNumber } from '~/util/validation';
-import { DEFAULT_GAS, DEFAULT_GASPRICE, MAX_GAS_ESTIMATION } from '~/util/constants';
-
-const CONDITIONS = {
-  NONE: 'none',
-  BLOCK: 'blockNumber',
-  TIME: 'timestamp'
-};
-
-export default class GasPriceEditor {
-  @observable blockNumber = 0;
-  @observable condition = {};
-  @observable conditionBlockError = null;
-  @observable conditionType = CONDITIONS.NONE;
-  @observable errorEstimated = null;
-  @observable errorGas = null;
-  @observable errorPrice = null;
-  @observable errorTotal = null;
-  @observable estimated = DEFAULT_GAS;
-  @observable gas;
-  @observable gasLimit;
-  @observable histogram = null;
-  @observable isEditing = false;
-  @observable price;
-  @observable priceDefault;
-  @observable weiValue = '0';
-
-  constructor (api, { gas, gasLimit, gasPrice, condition = null }) {
-    this._api = api;
-
-    this.gas = gas;
-    this.gasLimit = gasLimit;
-    this.price = gasPrice;
-
-    if (condition) {
-      if (condition.block) {
-        this.condition = { block: condition.block.toFixed(0) };
-        this.conditionType = CONDITIONS.BLOCK;
-      } else if (condition.time) {
-        this.condition = { time: condition.time };
-        this.conditionType = CONDITIONS.TIME;
-      }
-    }
-
-    if (api) {
-      this.loadDefaults();
-    }
-  }
-
-  @computed get totalValue () {
-    try {
-      return new BigNumber(this.gas).mul(this.price).add(this.weiValue);
-    } catch (error) {
-      return new BigNumber(0);
-    }
-  }
-
-  @computed get conditionValue () {
-    switch (this.conditionType) {
-      case CONDITIONS.BLOCK:
-        return { block: new BigNumber(this.condition.block || 0) };
-
-      case CONDITIONS.TIME:
-        return { time: this.condition.time };
-    }
-
-    return;
-  }
-
-  @action setConditionType = (conditionType = CONDITIONS.NONE) => {
-    transaction(() => {
-      this.conditionBlockError = null;
-      this.conditionType = conditionType;
-
-      switch (conditionType) {
-        case CONDITIONS.BLOCK:
-          this.setConditionBlockNumber(this.blockNumber || 1);
-          break;
-
-        case CONDITIONS.TIME:
-          this.setConditionDateTime(new Date());
-          break;
-
-        case CONDITIONS.NONE:
-        default:
-          this.condition = {};
-          break;
-      }
-    });
-  }
-
-  @action setConditionBlockNumber = (block) => {
-    transaction(() => {
-      this.conditionBlockError = validatePositiveNumber(block).numberError;
-      this.condition = Object.assign({}, this.condition, { block });
-    });
-  }
-
-  @action setConditionDateTime = (_time) => {
-    const time = new Date(_time);
-
-    time.setMilliseconds(0); // ignored by/not passed to Parity
-    time.setSeconds(0); // current time selector doesn't allow seconds
-
-    this.condition = Object.assign({}, this.condition, { time });
-  }
-
-  @action setEditing = (isEditing) => {
-    this.isEditing = isEditing;
-  }
-
-  @action setErrorTotal = (errorTotal) => {
-    this.errorTotal = errorTotal;
-  }
-
-  @action setEstimatedError = (errorEstimated = ERRORS.gasException) => {
-    this.errorEstimated = errorEstimated;
-  }
-
-  @action setEstimated = (estimated) => {
-    transaction(() => {
-      const bn = new BigNumber(estimated);
-
-      this.estimated = estimated;
-
-      if (bn.gte(MAX_GAS_ESTIMATION)) {
-        this.setEstimatedError(ERRORS.gasException);
-      } else if (bn.gte(this.gasLimit)) {
-        this.setEstimatedError(ERRORS.gasBlockLimit);
-      } else {
-        this.setEstimatedError(null);
-      }
-    });
-  }
-
-  @action setEthValue = (weiValue) => {
-    this.weiValue = weiValue;
-  }
-
-  @action setGas = (gas) => {
-    transaction(() => {
-      const { numberError } = validatePositiveNumber(gas);
-
-      this.gas = gas;
-
-      if (numberError) {
-        this.errorGas = numberError;
-      } else {
-        const bn = new BigNumber(gas);
-
-        if (bn.gte(this.gasLimit)) {
-          this.errorGas = ERRORS.gasBlockLimit;
-        } else {
-          this.errorGas = null;
-        }
-      }
-    });
-  }
-
-  @action setGasLimit = (gasLimit) => {
-    this.gasLimit = gasLimit;
-  }
-
-  @action setHistogram = (gasHistogram) => {
-    this.histogram = gasHistogram;
-  }
-
-  @action setPrice = (price) => {
-    transaction(() => {
-      this.errorPrice = validatePositiveNumber(price).numberError;
-      this.price = price;
-    });
-  }
-
-  @action loadDefaults () {
-    Promise
-      .all([
-        // NOTE fetching histogram may fail if there is not enough data.
-        // We fallback to empty histogram.
-        this._api.parity.gasPriceHistogram().catch(() => ({
-          bucketBounds: [],
-          counts: []
-        })),
-        this._api.eth.gasPrice(),
-        this._api.eth.blockNumber()
-      ])
-      .then(([histogram, _price, blockNumber]) => {
-        transaction(() => {
-          const price = _price.toFixed(0);
-
-          if (!this.price) {
-            this.setPrice(price);
-          }
-          this.setHistogram(histogram);
-
-          this.priceDefault = price;
-          this.blockNumber = blockNumber.toNumber();
-        });
-      })
-      .catch((error) => {
-        console.warn('getDefaults', error);
-      });
-  }
-
-  overrideTransaction = (transaction) => {
-    if (this.errorGas || this.errorPrice || this.conditionBlockError) {
-      return transaction;
-    }
-
-    const override = {
-      condition: this.condition,
-      gas: new BigNumber(this.gas || DEFAULT_GAS),
-      gasPrice: new BigNumber(this.price || DEFAULT_GASPRICE)
-    };
-
-    const result = Object.assign({}, transaction, override);
-
-    switch (this.conditionType) {
-      case CONDITIONS.BLOCK:
-      case CONDITIONS.TIME:
-        result.condition = this.conditionValue;
-        break;
-
-      case CONDITIONS.NONE:
-      default:
-        delete result.condition;
-        break;
-    }
-
-    return result;
-  }
-}
-
-export {
-  CONDITIONS
-};
diff --git a/js/src/ui/GasPriceEditor/store.spec.js b/js/src/ui/GasPriceEditor/store.spec.js
deleted file mode 100644
index 4580748ea37e37506c33bd92e929d351b60ec701..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceEditor/store.spec.js
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import sinon from 'sinon';
-
-import { DEFAULT_GAS, DEFAULT_GASPRICE, MAX_GAS_ESTIMATION } from '~/util/constants';
-import { ERRORS } from '~/util/validation';
-
-import GasPriceEditor from './gasPriceEditor';
-import { CONDITIONS } from './store';
-
-const { Store } = GasPriceEditor;
-
-const GASPRICE = new BigNumber(123456);
-const GASLIMIT = 100000;
-const HISTOGRAM = {
-  bucketBounds: [1, 2],
-  counts: [3, 4]
-};
-
-let api;
-
-// TODO: share with gasPriceEditor.spec.js
-function createApi () {
-  api = {
-    eth: {
-      blockNumber: sinon.stub().resolves(new BigNumber(2)),
-      gasPrice: sinon.stub().resolves(GASPRICE)
-    },
-    parity: {
-      gasPriceHistogram: sinon.stub().resolves(HISTOGRAM)
-    }
-  };
-
-  return api;
-}
-
-describe('ui/GasPriceEditor/Store', () => {
-  let store = null;
-
-  beforeEach(() => {
-    createApi();
-  });
-
-  it('is available via GasPriceEditor.Store', () => {
-    expect(new Store(null, {})).to.be.ok;
-  });
-
-  describe('constructor (defaults)', () => {
-    beforeEach(() => {
-      store = new Store(api, { gasLimit: GASLIMIT });
-    });
-
-    it('retrieves the histogram and gasPrice', () => {
-      expect(api.eth.gasPrice).to.have.been.called;
-      expect(api.parity.gasPriceHistogram).to.have.been.called;
-    });
-
-    it('sets the gasLimit as passed', () => {
-      expect(store.gasLimit).to.equal(GASLIMIT);
-    });
-  });
-
-  describe('constructor (defaults) when histogram not available', () => {
-    const api = {
-      eth: {
-        blockNumber: sinon.stub().resolves(new BigNumber(2)),
-        gasPrice: sinon.stub().resolves(GASPRICE)
-      },
-      parity: {
-        gasPriceHistogram: sinon.stub().rejects('Data not available')
-      }
-    };
-
-    beforeEach(() => {
-      store = new Store(api, { gasLimit: GASLIMIT });
-    });
-
-    it('retrieves the histogram and gasPrice', done => {
-      expect(api.eth.gasPrice).to.have.been.called;
-      expect(api.parity.gasPriceHistogram).to.have.been.called;
-
-      setImmediate(() => {
-        expect(store.histogram).not.to.be.null;
-        expect(store.histogram.bucketBounds).not.to.be.null;
-        done();
-      });
-    });
-  });
-
-  describe('setters', () => {
-    beforeEach(() => {
-      store = new Store(null, { gasLimit: GASLIMIT });
-    });
-
-    describe('setConditionType', () => {
-      it('sets the actual type', () => {
-        store.setConditionType('testingType');
-        expect(store.conditionType).to.equal('testingType');
-      });
-
-      it('clears any block error on changing type', () => {
-        store.setConditionBlockNumber(-1);
-        expect(store.conditionBlockError).not.to.be.null;
-        store.setConditionType(CONDITIONS.BLOCK);
-        expect(store.conditionBlockError).to.be.null;
-      });
-
-      it('sets condition.block when type === CONDITIONS.BLOCK', () => {
-        store.setConditionType(CONDITIONS.BLOCK);
-        expect(store.condition.block).to.be.ok;
-      });
-
-      it('clears condition when type === CONDITIONS.NONE', () => {
-        store.setConditionType(CONDITIONS.BLOCK);
-        store.setConditionType(CONDITIONS.NONE);
-        expect(store.condition).to.deep.equal({});
-      });
-
-      it('sets condition.time when type === CONDITIONS.TIME', () => {
-        store.setConditionType(CONDITIONS.TIME);
-        expect(store.condition.time).to.be.ok;
-      });
-    });
-
-    describe('setConditionBlockNumber', () => {
-      beforeEach(() => {
-        store.setConditionBlockNumber('testingBlock');
-      });
-
-      it('sets the blockNumber', () => {
-        expect(store.condition.block).to.equal('testingBlock');
-      });
-
-      it('sets the error on invalid numbers', () => {
-        expect(store.conditionBlockError).not.to.be.null;
-      });
-
-      it('sets the error on negative numbers', () => {
-        store.setConditionBlockNumber(-1);
-        expect(store.conditionBlockError).not.to.be.null;
-      });
-
-      it('clears the error on positive numbers', () => {
-        store.setConditionBlockNumber(1000);
-        expect(store.conditionBlockError).to.be.null;
-      });
-    });
-
-    describe('setConditionDateTime', () => {
-      const BASEDATE = '1973-06-11 07:52';
-      const ZEROTIME = new Date(BASEDATE).getTime();
-
-      it('sets the datetime', () => {
-        store.setConditionDateTime(new Date(`${BASEDATE}:00.000`));
-        expect(store.condition.time.getTime()).to.equal(ZEROTIME);
-      });
-
-      it('zeros both seconds and miliseconds', () => {
-        store.setConditionDateTime(new Date(`${BASEDATE}:12.345`));
-        expect(store.condition.time.getTime()).to.equal(ZEROTIME);
-      });
-    });
-
-    describe('setEditing', () => {
-      it('sets the value', () => {
-        expect(store.isEditing).to.be.false;
-        store.setEditing(true);
-        expect(store.isEditing).to.be.true;
-      });
-    });
-
-    describe('setErrorTotal', () => {
-      it('sets the value', () => {
-        store.setErrorTotal('errorTotal');
-        expect(store.errorTotal).to.equal('errorTotal');
-      });
-    });
-
-    describe('setEstimatedError', () => {
-      it('sets the value as provided', () => {
-        store.setEstimatedError('errorTest');
-        expect(store.errorEstimated).to.equal('errorTest');
-      });
-
-      it('sets the null value as provided', () => {
-        store.setEstimatedError('errorTest');
-        store.setEstimatedError(null);
-        expect(store.errorEstimated).to.be.null;
-      });
-
-      it('sets a default error when none provided', () => {
-        store.setEstimatedError();
-        expect(store.errorEstimated).to.equal(ERRORS.gasException);
-      });
-    });
-
-    describe('setEstimated', () => {
-      it('sets the value', () => {
-        store.setEstimated('789');
-        expect(store.estimated).to.equal('789');
-      });
-
-      it('sets error when above exception max', () => {
-        store.setEstimated(MAX_GAS_ESTIMATION);
-        expect(store.errorEstimated).to.equal(ERRORS.gasException);
-      });
-
-      it('sets error when above gaslimit', () => {
-        store.setEstimated(GASLIMIT);
-        expect(store.errorEstimated).to.equal(ERRORS.gasBlockLimit);
-      });
-    });
-
-    describe('setEthValue', () => {
-      it('sets the value', () => {
-        store.setEthValue('123');
-        expect(store.weiValue).to.equal('123');
-      });
-    });
-
-    describe('setGas', () => {
-      it('sets the value', () => {
-        store.setGas('123');
-        expect(store.gas).to.equal('123');
-        expect(store.errorGas).to.be.null;
-      });
-
-      it('sets error on negative numbers', () => {
-        store.setGas(-123);
-        expect(store.errorGas).not.to.be.null;
-      });
-
-      it('sets error when above block limit', () => {
-        store.setGas(GASLIMIT);
-        expect(store.errorGas).to.equal(ERRORS.gasBlockLimit);
-      });
-    });
-
-    describe('setGasLimit', () => {
-      it('sets the value', () => {
-        store.setGasLimit('123');
-        expect(store.gasLimit).to.equal('123');
-      });
-    });
-
-    describe('setHistogram', () => {
-      it('sets the value', () => {
-        store.setHistogram(HISTOGRAM);
-        expect(store.histogram).to.deep.equal(HISTOGRAM);
-      });
-    });
-
-    describe('setPrice', () => {
-      it('sets the value', () => {
-        store.setPrice('123');
-        expect(store.price).to.equal('123');
-        expect(store.errorPrice).to.be.null;
-      });
-
-      it('sets error on negative numbers', () => {
-        store.setPrice(-123);
-        expect(store.errorPrice).not.to.be.null;
-      });
-    });
-  });
-
-  describe('computed', () => {
-    beforeEach(() => {
-      store = new Store(null, { gasLimit: GASLIMIT });
-    });
-
-    describe('totalValue', () => {
-      it('holds the total including eth, price & gas', () => {
-        store.setPrice('123');
-        store.setGas('123');
-        store.setEthValue('123');
-        expect(store.totalValue).to.deep.equal(new BigNumber(123 + 123 * 123));
-      });
-    });
-  });
-
-  describe('methods', () => {
-    beforeEach(() => {
-      store = new Store(null, { gasLimit: GASLIMIT });
-    });
-
-    describe('overrideTransaction', () => {
-      const TRANSACTION = { gas: '123', gasPrice: '456' };
-
-      it('overrides gas & gasPrice with values', () => {
-        store.setGas(DEFAULT_GAS);
-        const transaction = store.overrideTransaction(TRANSACTION);
-
-        expect(transaction.gas).to.deep.equal(new BigNumber(DEFAULT_GAS));
-        expect(transaction.gasPrice).to.deep.equal(new BigNumber(DEFAULT_GASPRICE));
-      });
-
-      it('does not override with invalid gas', () => {
-        store.setGas(-123);
-        expect(store.overrideTransaction(TRANSACTION)).to.deep.equal(TRANSACTION);
-      });
-
-      it('does not override with invalid price', () => {
-        store.setPrice(-123);
-        expect(store.overrideTransaction(TRANSACTION)).to.deep.equal(TRANSACTION);
-      });
-    });
-  });
-});
diff --git a/js/src/ui/GasPriceSelector/CustomBar/customBar.js b/js/src/ui/GasPriceSelector/CustomBar/customBar.js
deleted file mode 100644
index 069fa82cd5b22e52a6743ef21ab9b03491628dc4..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/CustomBar/customBar.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { Rectangle } from 'recharts';
-
-import { COLORS } from '../util';
-
-export default class CustomBar extends Component {
-  static propTypes = {
-    selected: PropTypes.number,
-    x: PropTypes.number,
-    y: PropTypes.number,
-    width: PropTypes.number,
-    height: PropTypes.number,
-    index: PropTypes.number,
-    onClick: PropTypes.func
-  }
-
-  render () {
-    const { x, y, selected, index, width, height, onClick } = this.props;
-
-    const fill = selected === index
-      ? COLORS.selected
-      : COLORS.default;
-
-    const borderWidth = 0.5;
-    const borderColor = 'rgba(255, 255, 255, 0.5)';
-
-    return (
-      <g>
-        <Rectangle
-          x={ x - borderWidth }
-          y={ y }
-          width={ borderWidth }
-          height={ height }
-          fill={ borderColor }
-        />
-        <Rectangle
-          x={ x + width }
-          y={ y }
-          width={ borderWidth }
-          height={ height }
-          fill={ borderColor }
-        />
-        <Rectangle
-          x={ x - borderWidth }
-          y={ y - borderWidth }
-          width={ width + borderWidth * 2 }
-          height={ borderWidth }
-          fill={ borderColor }
-        />
-        <Rectangle
-          x={ x }
-          y={ y }
-          width={ width }
-          height={ height }
-          fill={ fill }
-          onClick={ onClick }
-        />
-      </g>
-    );
-  }
-}
diff --git a/js/src/ui/GasPriceSelector/CustomBar/index.js b/js/src/ui/GasPriceSelector/CustomBar/index.js
deleted file mode 100644
index 04e9028b24984e18f96d196b457234c972d5aa7a..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/CustomBar/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './customBar';
diff --git a/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js b/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js
deleted file mode 100644
index 4b1e81d88ec1614e8023ea80f035f759e18fd621..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { Rectangle } from 'recharts';
-
-import { COLORS, countModifier } from '../util';
-
-export default class CustomCursor extends Component {
-  static propTypes = {
-    x: PropTypes.number,
-    y: PropTypes.number,
-    width: PropTypes.number,
-    height: PropTypes.number,
-    onClick: PropTypes.func,
-    getIndex: PropTypes.func,
-    counts: PropTypes.object,
-    yDomain: PropTypes.array
-  }
-
-  render () {
-    const { x, y, width, height, getIndex, counts, yDomain } = this.props;
-
-    const index = getIndex();
-
-    if (index === -1) {
-      return null;
-    }
-
-    const count = countModifier(counts[index]);
-    const barHeight = (count / yDomain[1]) * (y + height);
-
-    return (
-      <g>
-        <Rectangle
-          x={ x }
-          y={ 0 }
-          width={ width }
-          height={ height + y }
-          fill='transparent'
-          onClick={ this.onClick }
-        />
-        <Rectangle
-          x={ x }
-          y={ y + (height - barHeight) }
-          width={ width }
-          height={ barHeight }
-          fill={ COLORS.hover }
-          onClick={ this.onClick }
-        />
-      </g>
-    );
-  }
-
-  onClick = () => {
-    const { onClick, getIndex } = this.props;
-    const index = getIndex();
-
-    onClick({ index });
-  }
-}
diff --git a/js/src/ui/GasPriceSelector/CustomCursor/index.js b/js/src/ui/GasPriceSelector/CustomCursor/index.js
deleted file mode 100644
index 502f691de7b3298c46af976a0be4f3a21177c080..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/CustomCursor/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './customCursor';
diff --git a/js/src/ui/GasPriceSelector/CustomShape/customShape.js b/js/src/ui/GasPriceSelector/CustomShape/customShape.js
deleted file mode 100644
index e05e79fa5ee2efe4e5e12845dfaea15ead96d2e2..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/CustomShape/customShape.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { Dot } from 'recharts';
-
-export default class CustomShape extends Component {
-  static propTypes = {
-    showValue: PropTypes.number.isRequired,
-    cx: PropTypes.number,
-    cy: PropTypes.number,
-    payload: PropTypes.object
-  }
-
-  render () {
-    const { cx, cy, showValue, payload } = this.props;
-
-    if (showValue !== payload.y) {
-      return null;
-    }
-
-    return (
-      <g>
-        <Dot
-          style={ { fill: 'white' } }
-          cx={ cx }
-          cy={ cy }
-          r={ 5 }
-        />
-        <Dot
-          style={ { fill: 'rgb(255, 99, 132)' } }
-          cx={ cx }
-          cy={ cy }
-          r={ 3 }
-        />
-      </g>
-    );
-  }
-}
diff --git a/js/src/ui/GasPriceSelector/CustomShape/index.js b/js/src/ui/GasPriceSelector/CustomShape/index.js
deleted file mode 100644
index 87c67b018129fb84d9c7cd600d97ebd9fc6cb936..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/CustomShape/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './customShape';
diff --git a/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js b/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js
deleted file mode 100644
index ec7afda7e73707960afe84a6e6d0c316adf5d96f..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-export default class CustomTooltip extends Component {
-  static propTypes = {
-    histogram: PropTypes.object.isRequired,
-    intl: PropTypes.object.isRequired,
-    active: PropTypes.bool,
-    label: PropTypes.number,
-    payload: PropTypes.array,
-    type: PropTypes.string
-  };
-
-  static childContextTypes = {
-    intl: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { active, label, histogram } = this.props;
-
-    if (!active) {
-      return null;
-    }
-
-    const index = label;
-
-    const count = histogram.counts[index];
-    const minprice = histogram.bucketBounds[index];
-    const maxprice = histogram.bucketBounds[index + 1];
-
-    return (
-      <div>
-        <p className='label'>
-          <FormattedMessage
-            id='ui.gasPriceSelector.customTooltip.transactions'
-            defaultMessage='{number} {number, plural, one {transaction} other {transactions}} with gas price set from {minPrice} to {maxPrice}'
-            values={ {
-              number: count.toNumber(),
-              minPrice: <span>{ minprice.toFormat(0) }</span>,
-              maxPrice: <span>{ maxprice.toFormat(0) }</span>
-            } }
-          />
-        </p>
-      </div>
-    );
-  }
-
-  getChildContext () {
-    return { intl: this.props.intl };
-  }
-}
diff --git a/js/src/ui/GasPriceSelector/CustomTooltip/index.js b/js/src/ui/GasPriceSelector/CustomTooltip/index.js
deleted file mode 100644
index 7db6e3009efe4e2a25312a322cd94874dbe21063..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/CustomTooltip/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './customTooltip';
diff --git a/js/src/ui/GasPriceSelector/gasPriceSelector.css b/js/src/ui/GasPriceSelector/gasPriceSelector.css
deleted file mode 100644
index a313be90cc35d4bf5e38202bfc425603f2358517..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/gasPriceSelector.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.chart {
-  position: absolute;
-  width: 100%;
-}
-
-.chartRow, .sliderRow {
-  display: flex;
-  flex-wrap: wrap;
-  position: relative;
-}
-
-.chartRow {
-  margin-bottom: -24px;
-}
diff --git a/js/src/ui/GasPriceSelector/gasPriceSelector.js b/js/src/ui/GasPriceSelector/gasPriceSelector.js
deleted file mode 100644
index 588c4c7c2adbafb6730f466db8fbd22791f7131a..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/gasPriceSelector.js
+++ /dev/null
@@ -1,374 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { Slider } from 'material-ui';
-import React, { Component, PropTypes } from 'react';
-import { Bar, BarChart, ResponsiveContainer, Scatter, ScatterChart, Tooltip, XAxis, YAxis } from 'recharts';
-
-import CustomBar from './CustomBar';
-import CustomCursor from './CustomCursor';
-import CustomShape from './CustomShape';
-import CustomTooltip from './CustomTooltip';
-
-import { COLORS, countModifier } from './util';
-
-import styles from './gasPriceSelector.css';
-
-const TOOL_STYLE = {
-  color: 'rgba(255,255,255,0.5)',
-  backgroundColor: 'rgba(0, 0, 0, 0.75)',
-  padding: '0 0.5em',
-  fontSize: '0.75em'
-};
-
-export default class GasPriceSelector extends Component {
-  static contextTypes = {
-    intl: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    histogram: PropTypes.object.isRequired,
-    onChange: PropTypes.func.isRequired,
-    price: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.object
-    ])
-  }
-
-  state = {
-    price: null,
-    sliderValue: 0.5,
-    selectedIndex: 0,
-
-    chartData: {
-      values: [],
-      xDomain: [],
-      yDomain: [],
-      N: 0
-    }
-  }
-
-  componentWillMount () {
-    this.computeCharts();
-    this.setprice();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (nextProps.price !== this.props.price) {
-      this.setprice(nextProps);
-    }
-  }
-
-  componentWillUpdate (nextProps, nextState) {
-    if (Math.floor(nextState.sliderValue) !== Math.floor(this.state.sliderValue)) {
-      this.updateSelectedBarChart(nextState);
-    }
-  }
-
-  render () {
-    return (
-      <div>
-        { this.renderChart() }
-        { this.renderSlider() }
-      </div>
-    );
-  }
-
-  renderChart () {
-    const { histogram } = this.props;
-    const { chartData, sliderValue, selectedIndex } = this.state;
-
-    if (chartData.values.length === 0) {
-      return null;
-    }
-
-    const height = 196;
-    const countIndex = Math.max(0, Math.min(selectedIndex, histogram.counts.length - 1));
-    const selectedCount = countModifier(histogram.counts[countIndex]);
-
-    return (
-      <div className={ styles.chartRow }>
-        <div style={ { flex: 1, height } }>
-
-          <div className={ styles.chart }>
-            <ResponsiveContainer height={ height }>
-              <ScatterChart margin={ { top: 0, right: 0, left: 0, bottom: 0 } }>
-                <Scatter
-                  data={ [
-                    { x: sliderValue, y: 0 },
-                    { x: sliderValue, y: selectedCount },
-                    { x: sliderValue, y: chartData.yDomain[1] }
-                  ] }
-                  isAnimationActive={ false }
-                  line
-                  shape={
-                    <CustomShape showValue={ selectedCount } />
-                  }
-                />
-                <XAxis
-                  dataKey='x'
-                  domain={ [0, 1] }
-                  hide
-                  height={ 0 }
-                />
-                <YAxis
-                  dataKey='y'
-                  domain={ chartData.yDomain }
-                  hide
-                  width={ 0 }
-                />
-              </ScatterChart>
-            </ResponsiveContainer>
-          </div>
-
-          <div className={ styles.chart }>
-            <ResponsiveContainer height={ height }>
-              <BarChart
-                barCategoryGap={ 1 }
-                data={ chartData.values }
-                margin={ { top: 0, right: 0, left: 0, bottom: 0 } }
-                ref='barChart'
-              >
-                <Bar
-                  dataKey='value'
-                  onClick={ this.onClickprice }
-                  shape={ <CustomBar selected={ selectedIndex } onClick={ this.onClickprice } /> }stroke={ COLORS.line }
-                />
-                <Tooltip
-                  content={ this.tooltipContentRenderer }
-                  cursor={ this.renderCustomCursor() }
-                  wrapperStyle={ TOOL_STYLE }
-                />
-                <XAxis
-                  dataKey='index'
-                  domain={ chartData.xDomain }
-                  hide
-                  type='category'
-                />
-                <YAxis
-                  domain={ chartData.yDomain }
-                  hide
-                  type='number'
-                />
-              </BarChart>
-            </ResponsiveContainer>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  /**
-   * Passing the `intl` object as a prop
-   * so the CustomTooltip can add for child
-   * context (used by FormattedMessages)
-   */
-  tooltipContentRenderer = (props) => {
-    const { histogram } = this.props;
-
-    return (
-      <CustomTooltip
-        histogram={ histogram }
-        intl={ this.context.intl }
-        { ...props }
-      />
-    );
-  }
-
-  renderSlider () {
-    const { sliderValue } = this.state;
-
-    return (
-      <div className={ styles.sliderRow }>
-        <Slider
-          min={ 0 }
-          max={ 1 }
-          value={ sliderValue }
-          onChange={ this.onEditpriceSlider }
-          style={ {
-            flex: 1,
-            padding: '0 0.3em'
-          } }
-          sliderStyle={ {
-            marginBottom: 12
-          } }
-        />
-      </div>
-    );
-  }
-
-  renderCustomCursor = () => {
-    const { histogram } = this.props;
-    const { chartData } = this.state;
-
-    return (
-      <CustomCursor
-        counts={ histogram.counts }
-        getIndex={ this.getBarHoverIndex }
-        onClick={ this.onClickprice }
-        yDomain={ chartData.yDomain }
-      />
-    );
-  }
-
-  getBarHoverIndex = () => {
-    const { barChart } = this.refs;
-
-    if (!barChart || !barChart.state) {
-      return -1;
-    }
-
-    return barChart.state.activeTooltipIndex;
-  }
-
-  computeChartsData () {
-    const { priceChartData } = this.state;
-    const { histogram } = this.props;
-
-    const values = priceChartData
-      .map((value, index) => ({ value, index }));
-
-    const N = values.length - 1;
-    const maxGasCounts = countModifier(
-      histogram
-        .counts
-        .reduce((max, count) => count.greaterThan(max) ? count : max, 0)
-    );
-
-    const xDomain = [0, N];
-    const yDomain = [0, maxGasCounts * 1.1];
-
-    const chartData = {
-      values, N,
-      xDomain, yDomain
-    };
-
-    this.setState({ chartData }, () => {
-      this.updateSelectedBarChart();
-    });
-  }
-
-  computeCharts (props = this.props) {
-    const { histogram } = props;
-
-    const priceChartData = histogram
-      .counts
-      .map(count => countModifier(count));
-
-    this.setState(
-      { priceChartData },
-      () => this.computeChartsData()
-    );
-  }
-
-  updateSelectedBarChart (state = this.state) {
-  }
-
-  setprice (props = this.props) {
-    const { price, histogram } = props;
-
-    // If no gas price yet...
-    if (!price) {
-      return this.setSliderValue(0.5);
-    }
-
-    const bnprice = (typeof price === 'string')
-      ? new BigNumber(price)
-      : price;
-
-    // If gas price hasn't changed
-    if (this.state.price && bnprice.equals(this.state.price)) {
-      return;
-    }
-
-    const prices = histogram.bucketBounds;
-    const startIndex = prices
-      .findIndex(price => price.greaterThan(bnprice)) - 1;
-
-    // price Lower than the max in histogram
-    if (startIndex === -1) {
-      return this.setSliderValue(0, bnprice);
-    }
-
-    // price Greater than the max in histogram
-    if (startIndex === -2) {
-      return this.setSliderValue(1, bnprice);
-    }
-
-    const priceA = prices[startIndex];
-    const priceB = prices[startIndex + 1];
-
-    const sliderValueDec = bnprice
-      .minus(priceA)
-      .dividedBy(priceB.minus(priceA))
-      .toNumber();
-
-    const sliderValue = (startIndex + sliderValueDec) / (prices.length - 1);
-
-    this.setSliderValue(sliderValue, bnprice);
-  }
-
-  setSliderValue (value, price = this.state.price) {
-    const { histogram } = this.props;
-
-    const N = histogram.bucketBounds.length - 1;
-
-    const sliderValue = Math.max(0, Math.min(value, 1));
-    const selectedIndex = Math.floor(sliderValue * N);
-
-    this.setState({ sliderValue, price, selectedIndex });
-  }
-
-  onBarChartMouseUp = (event) => {
-    console.log(event);
-  }
-
-  onClickprice = (bar) => {
-    const { index } = bar;
-
-    const ratio = (index + 0.5) / (this.state.chartData.N + 1);
-
-    this.onEditpriceSlider(null, ratio);
-  }
-
-  onEditpriceSlider = (event, sliderValue) => {
-    const { histogram } = this.props;
-
-    const prices = histogram.bucketBounds;
-    const N = prices.length - 1;
-    const priceAIdx = Math.floor(sliderValue * N);
-    const priceBIdx = priceAIdx + 1;
-
-    if (priceBIdx === N + 1) {
-      const price = prices[priceAIdx].round();
-
-      this.props.onChange(event, price);
-      return;
-    }
-
-    const priceA = prices[priceAIdx];
-    const priceB = prices[priceBIdx];
-
-    const mult = Math.round((sliderValue % 1) * 100) / 100;
-    const price = priceA
-      .plus(priceB.minus(priceA).times(mult))
-      .round();
-
-    this.setSliderValue(sliderValue, price);
-    this.props.onChange(event, price.toFixed());
-  }
-}
diff --git a/js/src/ui/GasPriceSelector/index.js b/js/src/ui/GasPriceSelector/index.js
deleted file mode 100644
index 931d42575f103a4d24c09c365e51daca9314acc3..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './gasPriceSelector';
diff --git a/js/src/ui/GasPriceSelector/util.js b/js/src/ui/GasPriceSelector/util.js
deleted file mode 100644
index 0b5de2a2e7619553a7e55d37152cc0e36933acf1..0000000000000000000000000000000000000000
--- a/js/src/ui/GasPriceSelector/util.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const COLORS = {
-  default: 'rgba(255, 99, 132, 0.2)',
-  selected: 'rgba(255, 99, 132, 0.5)',
-  hover: 'rgba(255, 99, 132, 0.15)',
-  grid: 'rgba(255, 99, 132, 0.5)',
-  line: 'rgb(255, 99, 132)',
-  intersection: '#fff'
-};
-
-const countModifier = (count) => {
-  const val = count.toNumber ? count.toNumber() : count;
-
-  return Math.log10(val + 1) + 0.1;
-};
-
-export {
-  COLORS,
-  countModifier
-};
diff --git a/js/src/ui/Icons/index.js b/js/src/ui/Icons/index.js
deleted file mode 100644
index b62eeef11aee49817132f373034d4ddc81211d53..0000000000000000000000000000000000000000
--- a/js/src/ui/Icons/index.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export AccountsIcon from 'material-ui/svg-icons/action/account-balance-wallet';
-export AddressesIcon from 'material-ui/svg-icons/communication/contacts';
-export AddIcon from 'material-ui/svg-icons/content/add';
-export AppsIcon from 'material-ui/svg-icons/navigation/apps';
-export AttachFileIcon from 'material-ui/svg-icons/editor/attach-file';
-export CancelIcon from 'material-ui/svg-icons/content/clear';
-export CheckIcon from 'material-ui/svg-icons/navigation/check';
-export CloseIcon from 'material-ui/svg-icons/navigation/close';
-export CompareIcon from 'material-ui/svg-icons/action/compare-arrows';
-export ComputerIcon from 'material-ui/svg-icons/hardware/desktop-mac';
-export ContactsIcon from 'material-ui/svg-icons/image/grid-on';
-export ContractIcon from 'material-ui/svg-icons/action/code';
-export CopyIcon from 'material-ui/svg-icons/content/content-copy';
-export DashboardIcon from 'material-ui/svg-icons/action/dashboard';
-export DeleteIcon from 'material-ui/svg-icons/action/delete';
-export DevelopIcon from 'material-ui/svg-icons/action/description';
-export DoneIcon from 'material-ui/svg-icons/action/done-all';
-export DialIcon from 'material-ui/svg-icons/communication/dialpad';
-export EditIcon from 'material-ui/svg-icons/content/create';
-export ErrorIcon from 'material-ui/svg-icons/alert/error';
-export FileDownloadIcon from 'material-ui/svg-icons/file/file-download';
-export FileUploadIcon from 'material-ui/svg-icons/file/file-upload';
-export FileIcon from 'material-ui/svg-icons/editor/insert-drive-file';
-export FingerprintIcon from 'material-ui/svg-icons/action/fingerprint';
-export GasIcon from 'material-ui/svg-icons/maps/local-gas-station';
-export InfoIcon from 'material-ui/svg-icons/action/info-outline';
-export KeyIcon from 'material-ui/svg-icons/communication/vpn-key';
-export KeyboardIcon from 'material-ui/svg-icons/hardware/keyboard';
-export LinkIcon from 'material-ui/svg-icons/content/link';
-export ListIcon from 'material-ui/svg-icons/action/view-list';
-export LockedIcon from 'material-ui/svg-icons/action/lock';
-export MembershipIcon from 'material-ui/svg-icons/action/card-membership';
-export MoveIcon from 'material-ui/svg-icons/action/open-with';
-export NextIcon from 'material-ui/svg-icons/navigation/arrow-forward';
-export PauseIcon from 'material-ui/svg-icons/av/pause';
-export PhoneLock from 'material-ui/svg-icons/communication/phonelink-lock';
-export PlayIcon from 'material-ui/svg-icons/av/play-arrow';
-export PrevIcon from 'material-ui/svg-icons/navigation/arrow-back';
-export PrintIcon from 'material-ui/svg-icons/action/print';
-export RefreshIcon from 'material-ui/svg-icons/action/autorenew';
-export ReorderIcon from 'material-ui/svg-icons/action/reorder';
-export ReplayIcon from 'material-ui/svg-icons/av/replay';
-export RestoreIcon from 'material-ui/svg-icons/action/restore';
-export SaveIcon from 'material-ui/svg-icons/content/save';
-export SearchIcon from 'material-ui/svg-icons/action/search';
-export SendIcon from 'material-ui/svg-icons/content/send';
-export SettingsIcon from 'material-ui/svg-icons/action/settings';
-export SnoozeIcon from 'material-ui/svg-icons/av/snooze';
-export StarCircleIcon from 'material-ui/svg-icons/action/stars';
-export StarIcon from 'material-ui/svg-icons/toggle/star';
-export StarOutlineIcon from 'material-ui/svg-icons/toggle/star-border';
-export StatusIcon from 'material-ui/svg-icons/action/track-changes';
-export UnlockedIcon from 'material-ui/svg-icons/action/lock-open';
-export UpdateIcon from 'material-ui/svg-icons/action/system-update-alt';
-export UpdateWaitIcon from 'material-ui/svg-icons/action/update';
-export VerifyIcon from 'material-ui/svg-icons/action/verified-user';
-export VisibleIcon from 'material-ui/svg-icons/image/remove-red-eye';
-export VpnIcon from 'material-ui/svg-icons/notification/vpn-lock';
diff --git a/js/src/ui/Icons/index.spec.js b/js/src/ui/Icons/index.spec.js
deleted file mode 100644
index 88b2f4e6de5accde2612be3674a7e0158fb65956..0000000000000000000000000000000000000000
--- a/js/src/ui/Icons/index.spec.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import { createElement } from 'react';
-
-import * as Icons from './';
-
-describe('ui/Icons', () => {
-  Object.keys(Icons).forEach((icon) => {
-    it(`contains & renders ${icon}`, () => {
-      expect(shallow(createElement(Icons[icon]))).to.be.ok;
-    });
-  });
-});
diff --git a/js/src/ui/IdentityIcon/identityIcon.css b/js/src/ui/IdentityIcon/identityIcon.css
deleted file mode 100644
index b995b5aad14fa8052dc24dc517b1422154a28b33..0000000000000000000000000000000000000000
--- a/js/src/ui/IdentityIcon/identityIcon.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.icon {
-  border-radius: 50%;
-  margin: 0;
-
-  &.disabled {
-    filter: grayscale(100%);
-    opacity: 0.33;
-  }
-}
-
-.center {
-  text-align: center;
-}
-
-.left {
-  float: left;
-  text-align: left;
-  margin-right: 1em;
-}
-
-.right {
-  float: right;
-  text-align: right;
-}
-
-.padded {
-  margin: 1em 0 0 0;
-}
-
-.inline,
-.tiny {
-  display: inline-block;
-  margin-right: 0.75em;
-}
-
-.button {
-  display: inline;
-  width: 24px;
-  height: 24px;
-  margin: 6px 0.25em 0 12px;
-}
diff --git a/js/src/ui/IdentityIcon/identityIcon.js b/js/src/ui/IdentityIcon/identityIcon.js
deleted file mode 100644
index 3db1bc763102244a76931ceed2218f28f7cd6eec..0000000000000000000000000000000000000000
--- a/js/src/ui/IdentityIcon/identityIcon.js
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import { createIdentityImg } from '~/api/util/identity';
-import { isNullAddress } from '~/util/validation';
-import { CancelIcon, ContractIcon } from '../Icons';
-
-import styles from './identityIcon.css';
-
-class IdentityIcon extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    address: PropTypes.string,
-    button: PropTypes.bool,
-    center: PropTypes.bool,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    images: PropTypes.object.isRequired,
-    inline: PropTypes.bool,
-    padded: PropTypes.bool,
-    tiny: PropTypes.bool
-  }
-
-  state = {
-    iconsrc: ''
-  }
-
-  componentDidMount () {
-    this.updateIcon(this.props.address, this.props.images);
-  }
-
-  componentWillReceiveProps (newProps) {
-    const sameAddress = newProps.address === this.props.address;
-    const sameImages = Object.keys(newProps.images).length === Object.keys(this.props.images).length;
-
-    if (sameAddress && sameImages) {
-      return;
-    }
-
-    this.updateIcon(newProps.address, newProps.images);
-  }
-
-  updateIcon (_address, images) {
-    const { api } = this.context;
-    const { button, inline, tiny } = this.props;
-
-    if (images[_address]) {
-      this.setState({ iconsrc: `${api.dappsUrl}${images[_address]}` });
-      return;
-    }
-
-    let scale = 7;
-
-    if (tiny) {
-      scale = 2;
-    } else if (button) {
-      scale = 3;
-    } else if (inline) {
-      scale = 4;
-    }
-
-    this.setState({
-      iconsrc: createIdentityImg(_address, scale)
-    });
-  }
-
-  render () {
-    const { address, button, className, center, disabled, inline, padded, tiny } = this.props;
-    const { iconsrc } = this.state;
-    const classes = [
-      styles.icon,
-      disabled ? styles.disabled : '',
-      tiny ? styles.tiny : '',
-      button ? styles.button : '',
-      center ? styles.center : styles.left,
-      inline ? styles.inline : '',
-      padded ? styles.padded : '',
-      className
-    ].join(' ');
-
-    let size = '56px';
-
-    if (tiny) {
-      size = '16px';
-    } else if (button) {
-      size = '24px';
-    } else if (inline) {
-      size = '32px';
-    }
-
-    if (!address) {
-      return (
-        <ContractIcon
-          className={ classes }
-          data-address-img
-          style={ {
-            background: '#eee',
-            height: size,
-            width: size
-          } }
-        />
-      );
-    } else if (isNullAddress(address)) {
-      return (
-        <CancelIcon
-          className={ classes }
-          data-address-img
-          style={ {
-            background: '#333',
-            height: size,
-            width: size
-          } }
-        />
-      );
-    }
-
-    return (
-      <img
-        className={ classes }
-        data-address-img
-        height={ size }
-        width={ size }
-        src={ iconsrc }
-      />
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { images } = state;
-
-  return { images };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(IdentityIcon);
diff --git a/js/src/ui/IdentityIcon/identityIcon.spec.js b/js/src/ui/IdentityIcon/identityIcon.spec.js
deleted file mode 100644
index f6887d7d6df4bb56a6c46de4779c45da59d35883..0000000000000000000000000000000000000000
--- a/js/src/ui/IdentityIcon/identityIcon.spec.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import IdentityIcon from './';
-
-const ADDRESS0 = '0x0000000000000000000000000000000000000000';
-const ADDRESS1 = '0x0123456789012345678901234567890123456789';
-const ADDRESS2 = '0x9876543210987654321098765432109876543210';
-
-let component;
-let instance;
-
-function createApi () {
-  return {
-    dappsUrl: 'dappsUrl/'
-  };
-}
-
-function createRedux () {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        images: {
-          [ADDRESS2]: 'reduxImage'
-        }
-      };
-    }
-  };
-}
-
-function render (props = {}) {
-  if (props && props.address === undefined) {
-    props.address = ADDRESS1;
-  }
-
-  component = shallow(
-    <IdentityIcon { ...props } />,
-    { context: { store: createRedux() } }
-  ).find('IdentityIcon').shallow({ context: { api: createApi() } });
-
-  instance = component.instance();
-  instance.componentDidMount();
-
-  return component;
-}
-
-describe('ui/IdentityIcon', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  describe('images', () => {
-    it('renders an <img> with address specified', () => {
-      const img = render().find('img');
-
-      expect(img).to.have.length(1);
-      expect(img.props().src).to.equal('test-createIdentityImg');
-    });
-
-    it('renders an <img> with redux source when available', () => {
-      const img = render({ address: ADDRESS2 }).find('img');
-
-      expect(img).to.have.length(1);
-      expect(img.props().src).to.equal('dappsUrl/reduxImage');
-    });
-
-    it('renders an <ContractIcon> with no address specified', () => {
-      expect(render({ address: null }).find('ActionCode')).to.have.length(1);
-    });
-
-    it('renders an <CancelIcon> with 0x00..00 address specified', () => {
-      expect(render({ address: ADDRESS0 }).find('ContentClear')).to.have.length(1);
-    });
-  });
-
-  describe('sizes', () => {
-    it('renders 56px by default', () => {
-      expect(render().find('img').props().width).to.equal('56px');
-    });
-
-    it('renders 16px for tiny', () => {
-      expect(render({ tiny: true }).find('img').props().width).to.equal('16px');
-    });
-
-    it('renders 24px for button', () => {
-      expect(render({ button: true }).find('img').props().width).to.equal('24px');
-    });
-
-    it('renders 32px for inline', () => {
-      expect(render({ inline: true }).find('img').props().width).to.equal('32px');
-    });
-  });
-});
diff --git a/js/src/ui/IdentityIcon/index.js b/js/src/ui/IdentityIcon/index.js
deleted file mode 100644
index 09191356420c1b472cb6ed005a3e9af4a8adb151..0000000000000000000000000000000000000000
--- a/js/src/ui/IdentityIcon/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './identityIcon';
diff --git a/js/src/ui/IdentityName/identityName.js b/js/src/ui/IdentityName/identityName.js
deleted file mode 100644
index b9a0ba045f2694241440d1698664d86c75dde221..0000000000000000000000000000000000000000
--- a/js/src/ui/IdentityName/identityName.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import { isNullAddress } from '~/util/validation';
-import ShortenedHash from '../ShortenedHash';
-
-const defaultName = (
-  <FormattedMessage
-    id='ui.identityName.unnamed'
-    defaultMessage='UNNAMED'
-  />
-);
-const defaultNameNull = (
-  <FormattedMessage
-    id='ui.identityName.null'
-    defaultMessage='NULL'
-  />
-);
-
-export class IdentityName extends Component {
-  static propTypes = {
-    account: PropTypes.object,
-    address: PropTypes.string,
-    className: PropTypes.string,
-    empty: PropTypes.bool,
-    name: PropTypes.string,
-    shorten: PropTypes.bool,
-    unknown: PropTypes.bool
-  }
-
-  render () {
-    const { account, address, className, empty, name, shorten, unknown } = this.props;
-
-    if (!account && empty) {
-      return null;
-    }
-
-    const nullName = isNullAddress(address) ? defaultNameNull : null;
-    const addressFallback = nullName || (shorten ? (<ShortenedHash data={ address } />) : address);
-    const fallback = unknown ? defaultName : addressFallback;
-    const isUuid = account && account.name === account.uuid;
-    const displayName = (name && name.toUpperCase().trim()) ||
-      (account && !isUuid
-        ? account.name.toUpperCase().trim()
-        : fallback
-      );
-
-    return (
-      <span className={ className }>
-        {
-          displayName && displayName.length
-            ? displayName
-            : fallback
-        }
-      </span>
-    );
-  }
-}
-
-function mapStateToProps (state, props) {
-  const { address } = props;
-  const { personal, tokens } = state;
-
-  const account = personal.accountsInfo[address] || Object.values(tokens).find((token) => token.address === address);
-
-  return {
-    account
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(IdentityName);
diff --git a/js/src/ui/IdentityName/identityName.spec.js b/js/src/ui/IdentityName/identityName.spec.js
deleted file mode 100644
index cfabfbefd31060c2964db3e77e2a306b485965f7..0000000000000000000000000000000000000000
--- a/js/src/ui/IdentityName/identityName.spec.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { IdentityName } from './identityName';
-
-const ADDR_A = '0x123456789abcdef0123456789A';
-const ADDR_C = '0x123456789abcdef0123456789C';
-const ADDR_NULL = '0x0000000000000000000000000000000000000000';
-const NAME_JIMMY = 'Jimmy Test';
-
-function render (props) {
-  return shallow(
-    <IdentityName
-      { ...props }
-    />
-  );
-}
-
-describe('ui/IdentityName', () => {
-  it('renders defaults', () => {
-    expect(render({ address: ADDR_A })).to.be.ok;
-  });
-
-  describe('account not found', () => {
-    it('renders null with empty', () => {
-      expect(
-        render({ address: ADDR_C, empty: true }).html()
-      ).to.be.null;
-    });
-
-    it('renders address without empty', () => {
-      expect(
-        render({ address: ADDR_C }).text()
-      ).to.equal(ADDR_C);
-    });
-
-    it('renders short address with shorten', () => {
-      expect(
-        render({ address: ADDR_C, shorten: true }).find('ShortenedHash').props().data
-      ).to.equal(ADDR_C);
-    });
-
-    it('renders unknown with flag', () => {
-      expect(
-        render({ address: ADDR_C, unknown: true }).find('FormattedMessage').props().id
-      ).to.equal('ui.identityName.unnamed');
-    });
-
-    it('renders name when not found and passed', () => {
-      expect(
-        render({ address: ADDR_C, name: NAME_JIMMY }).text()
-      ).to.equal(NAME_JIMMY.toUpperCase());
-    });
-
-    it('renders name when not found, unknown and passed', () => {
-      expect(
-        render({ address: ADDR_C, name: NAME_JIMMY, unknown: true }).text()
-      ).to.equal(NAME_JIMMY.toUpperCase());
-    });
-
-    it('renders 0x000...000 as null', () => {
-      expect(
-        render({ address: ADDR_NULL }).find('FormattedMessage').props().id
-      ).to.equal('ui.identityName.null');
-    });
-  });
-});
diff --git a/js/src/ui/IdentityName/index.js b/js/src/ui/IdentityName/index.js
deleted file mode 100644
index 816b1db9b61f918b460eb4316e329e419ce75a6e..0000000000000000000000000000000000000000
--- a/js/src/ui/IdentityName/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './identityName';
diff --git a/js/src/ui/LanguageSelector/index.js b/js/src/ui/LanguageSelector/index.js
deleted file mode 100644
index 74472ff8e52f980edc079ba631be4f7e1a178236..0000000000000000000000000000000000000000
--- a/js/src/ui/LanguageSelector/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './languageSelector';
diff --git a/js/src/ui/LanguageSelector/languageSelector.js b/js/src/ui/LanguageSelector/languageSelector.js
deleted file mode 100644
index 369ca6f28baf933388c3b949ad70e9a87c74cbad..0000000000000000000000000000000000000000
--- a/js/src/ui/LanguageSelector/languageSelector.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { MenuItem } from 'material-ui';
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { LocaleStore } from '~/i18n';
-import { FeaturesStore, FEATURES } from '../Features';
-
-import Select from '../Form/Select';
-
-@observer
-export default class LanguageSelector extends Component {
-  features = FeaturesStore.get();
-  store = LocaleStore.get();
-
-  render () {
-    if (!this.features.active[FEATURES.LANGUAGE]) {
-      return null;
-    }
-
-    return (
-      <Select
-        hint={
-          <FormattedMessage
-            id='settings.parity.languages.hint'
-            defaultMessage='the language this interface is displayed with'
-          />
-        }
-        label={
-          <FormattedMessage
-            id='settings.parity.languages.label'
-            defaultMessage='UI language'
-          />
-        }
-        value={ this.store.locale }
-        onChange={ this.onChange }
-      >
-        { this.renderOptions() }
-      </Select>
-    );
-  }
-
-  renderOptions () {
-    return this.store.locales.map((locale) => {
-      const label = <FormattedMessage id={ `languages.${locale}` } />;
-
-      return (
-        <MenuItem
-          key={ locale }
-          value={ locale }
-          label={ label }
-        >
-          { label }
-        </MenuItem>
-      );
-    });
-  }
-
-  onChange = (event, index, locale) => {
-    this.store.setLocale(locale || event.target.value);
-  }
-}
diff --git a/js/src/ui/LanguageSelector/langugeSelector.spec.js b/js/src/ui/LanguageSelector/langugeSelector.spec.js
deleted file mode 100644
index 6c45413a919744a07888b9f3bc241c8f1c3802f6..0000000000000000000000000000000000000000
--- a/js/src/ui/LanguageSelector/langugeSelector.spec.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { LocaleStore } from '~/i18n';
-
-import LanguageSelector from './';
-
-let component;
-
-function render (props = {}) {
-  component = shallow(
-    <LanguageSelector { ...props } />
-  );
-
-  return component;
-}
-
-describe('LanguageSelector', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  describe('Select', () => {
-    let select;
-    let localeStore;
-
-    beforeEach(() => {
-      localeStore = LocaleStore.get();
-      sinon.stub(localeStore, 'setLocale');
-
-      render();
-      select = component.find('Select');
-    });
-
-    afterEach(() => {
-      localeStore.setLocale.restore();
-    });
-
-    it('renders the Select', () => {
-      expect(select).to.have.length(1);
-    });
-
-    it('has locale items', () => {
-      expect(select.find('MenuItem').length > 0).to.be.true;
-    });
-
-    it('calls localeStore.setLocale when changed', () => {
-      select.simulate('change', { target: { value: 'de' } });
-      expect(localeStore.setLocale).to.have.been.calledWith('de');
-    });
-  });
-});
diff --git a/js/src/ui/Loading/index.js b/js/src/ui/Loading/index.js
deleted file mode 100644
index 5eb10a7d4cd0c92498e3fdcdd87663a7209e1cf5..0000000000000000000000000000000000000000
--- a/js/src/ui/Loading/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './loading';
diff --git a/js/src/ui/Loading/loading.css b/js/src/ui/Loading/loading.css
deleted file mode 100644
index dd9e392e1a5fc380a815bb5ce2bdc3779d6e7a0a..0000000000000000000000000000000000000000
--- a/js/src/ui/Loading/loading.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.loading {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
diff --git a/js/src/ui/Loading/loading.js b/js/src/ui/Loading/loading.js
deleted file mode 100644
index 107d32dba6b7259d8ca5776aab1fd6147e5bc847..0000000000000000000000000000000000000000
--- a/js/src/ui/Loading/loading.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import CircularProgress from 'material-ui/CircularProgress';
-
-import styles from './loading.css';
-
-export default class Loading extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    size: PropTypes.number
-  };
-
-  static defaultProps = {
-    className: '',
-    size: 2
-  };
-
-  render () {
-    const { className, size } = this.props;
-    const computedSize = size * 60;
-
-    return (
-      <div className={ [ styles.loading, className ].join(' ') }>
-        <CircularProgress size={ computedSize } />
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/MethodDecoding/index.js b/js/src/ui/MethodDecoding/index.js
deleted file mode 100644
index 4a1f16092936575bc478a63a1904dfe86686398c..0000000000000000000000000000000000000000
--- a/js/src/ui/MethodDecoding/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './methodDecoding';
diff --git a/js/src/ui/MethodDecoding/methodDecoding.css b/js/src/ui/MethodDecoding/methodDecoding.css
deleted file mode 100644
index 870bf67dd4bef06060d3c6c3074eda478b743fd8..0000000000000000000000000000000000000000
--- a/js/src/ui/MethodDecoding/methodDecoding.css
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-}
-
-.clickable {
-  border: 1px dashed rgba(255, 255, 255, 0.4);
-  padding: 0.1em 0.3em;
-  margin: 0.1em 0.1em;
-
-  &:hover {
-    cursor: pointer;
-  }
-
-  &.noSelect {
-    user-select: none;
-  }
-}
-
-.loading {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.details {
-  line-height: 1.75em;
-}
-
-.details,
-.gasDetails {
-  color: #aaa;
-}
-
-.gasDetails {
-  padding-top: 0.75em;
-  font-size: 0.75em;
-  line-height: 1.5em;
-  opacity: 0.5;
-}
-
-.description {
-  line-height: 2em;
-  padding-bottom: 0.5em;
-}
-
-.name,
-.highlight {
-  color: white;
-  padding: 0.25em;
-}
-
-.name,
-.inputs,
-.highlight {
-}
-
-.inputs, .addressContainer {
-  padding-left: 2em;
-}
-
-.input {
-  margin-top: -16px;
-  font-family: inherit !important;
-}
-
-.inputs [data-address-img] {
-  position: absolute;
-  top: -16px;
-}
-
-.etherValue,
-.tokenValue {
-}
-
-.address {
-  display: inline-block;
-  position: relative;
-}
-
-.identityicon {
-  margin-bottom: -10px;
-  margin-right: 0.5em;
-}
-
-.inputData {
-  word-break: break-all;
-}
diff --git a/js/src/ui/MethodDecoding/methodDecoding.js b/js/src/ui/MethodDecoding/methodDecoding.js
deleted file mode 100644
index eb42a8bfff0303a9ae14fe31ef230d013971e693..0000000000000000000000000000000000000000
--- a/js/src/ui/MethodDecoding/methodDecoding.js
+++ /dev/null
@@ -1,676 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { CircularProgress } from 'material-ui';
-import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import { TypedInput, InputAddress } from '../Form';
-import MethodDecodingStore from './methodDecodingStore';
-
-import styles from './methodDecoding.css';
-
-const ASCII_INPUT = /^[a-z0-9\s,?;.:/!()-_@'"#]+$/i;
-const TOKEN_METHODS = {
-  '0xa9059cbb': 'transfer(to,value)'
-};
-
-class MethodDecoding extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    address: PropTypes.string,
-    compact: PropTypes.bool,
-    token: PropTypes.object,
-    transaction: PropTypes.object,
-    historic: PropTypes.bool
-  };
-
-  static defaultProps = {
-    address: '',
-    compact: false,
-    historic: false
-  };
-
-  state = {
-    contractAddress: null,
-    methodName: null,
-    methodInputs: null,
-    methodParams: null,
-    methodSignature: null,
-    isContract: false,
-    isDeploy: false,
-    isReceived: false,
-    isLoading: true,
-    expandInput: false,
-    inputType: 'auto'
-  };
-
-  methodDecodingStore = MethodDecodingStore.get(this.context.api);
-
-  componentWillMount () {
-    const { address, transaction } = this.props;
-
-    this
-      .methodDecodingStore
-      .lookup(address, transaction)
-      .then((lookup) => {
-        const newState = {
-          methodName: lookup.name,
-          methodInputs: lookup.inputs,
-          methodParams: lookup.params,
-          methodSignature: lookup.signature,
-
-          isContract: lookup.contract,
-          isDeploy: lookup.deploy,
-          isLoading: false,
-          isReceived: lookup.received
-        };
-
-        this.setState(newState);
-      });
-  }
-
-  render () {
-    const { transaction } = this.props;
-    const { isLoading } = this.state;
-
-    if (!transaction) {
-      return null;
-    }
-
-    if (isLoading) {
-      return (
-        <div className={ styles.loading }>
-          <CircularProgress size={ 60 } thickness={ 2 } />
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.container }>
-        { this.renderAction() }
-        { this.renderGas() }
-      </div>
-    );
-  }
-
-  renderGas () {
-    const { compact, historic, transaction } = this.props;
-    const { gas, gasPrice, value } = transaction;
-
-    if (!gas || !gasPrice || compact) {
-      return null;
-    }
-
-    const gasProvided = (
-      <span className={ styles.highlight }>
-        <FormattedMessage
-          id='ui.methodDecoding.gasValues'
-          defaultMessage='{gas} gas ({gasPrice}M/{tag})'
-          values={ {
-            gas: gas.toFormat(0),
-            gasPrice: gasPrice.div(1000000).toFormat(0),
-            tag: <small>ETH</small>
-          } }
-        />
-      </span>
-    );
-    const totalEthValue = (
-      <span className={ styles.highlight }>
-        { this.renderEtherValue(gas.mul(gasPrice).plus(value || 0)) }
-      </span>
-    );
-    const gasUsed = transaction.gasUsed
-      ? (
-        <span className={ styles.highlight }>
-          <FormattedMessage
-            id='ui.methodDecoding.gasUsed'
-            defaultMessage=' ({gas} gas used)'
-            values={ {
-              gas: transaction.gasUsed.toFormat(0)
-            } }
-          />
-        </span>
-      )
-      : '';
-
-    return (
-      <div className={ styles.gasDetails }>
-        <FormattedMessage
-          id='ui.methodDecoding.txValues'
-          defaultMessage='{historic, select, true {Provided} false {Provides}} {gasProvided}{gasUsed} for a total transaction value of {totalEthValue}'
-          values={ {
-            historic,
-            gasProvided,
-            gasUsed,
-            totalEthValue
-          } }
-        />
-        { this.renderMinBlock() }
-      </div>
-    );
-  }
-
-  renderMinBlock () {
-    const { historic, transaction } = this.props;
-    const { condition } = transaction;
-
-    if (!condition) {
-      return null;
-    }
-
-    const blockCondition = new BigNumber(condition.block || 0);
-
-    if (blockCondition.gt(0)) {
-      const blockNumber = (
-        <span className={ styles.highlight }>
-          #{ blockCondition.toFormat(0) }
-        </span>
-      );
-
-      return (
-        <div>
-          <FormattedMessage
-            id='ui.methodDecoding.condition.block'
-            defaultMessage='{historic, select, true {Will be submitted} false {To be submitted}} at block {blockNumber}'
-            values={ {
-              historic,
-              blockNumber
-            } }
-          />
-        </div>
-      );
-    }
-
-    if (condition.time) {
-      const timestamp = (
-        <span className={ styles.highlight }>
-          { moment(condition.time).format('LLLL') }
-        </span>
-      );
-
-      return (
-        <div>
-          <FormattedMessage
-            id='ui.methodDecoding.condition.time'
-            defaultMessage='{historic, select, true {Will be submitted} false {To be submitted}} {timestamp}'
-            values={ {
-              historic,
-              timestamp
-            } }
-          />
-        </div>
-      );
-    }
-
-    return null;
-  }
-
-  renderAction () {
-    const { token } = this.props;
-    const { methodName, methodInputs, methodSignature, isDeploy, isReceived, isContract } = this.state;
-
-    if (isDeploy) {
-      return this.renderDeploy();
-    }
-
-    if (isContract && methodSignature) {
-      if (token && TOKEN_METHODS[methodSignature] && methodInputs) {
-        return this.renderTokenAction();
-      }
-
-      if (methodName) {
-        return this.renderSignatureMethod();
-      }
-
-      return this.renderUnknownMethod();
-    }
-
-    return isReceived
-      ? this.renderValueReceipt()
-      : this.renderValueTransfer();
-  }
-
-  getAscii () {
-    const { api } = this.context;
-    const { transaction } = this.props;
-    const value = api.util.hexToAscii(transaction.input || transaction.data);
-
-    return {
-      value,
-      valid: ASCII_INPUT.test(value)
-    };
-  }
-
-  renderInputValue () {
-    const { compact, transaction } = this.props;
-
-    if (compact) {
-      return null;
-    }
-
-    const { expandInput, inputType } = this.state;
-    const input = transaction.input || transaction.data;
-
-    if (!/^(0x)?([0]*[1-9a-f]+[0]*)+$/.test(input)) {
-      return null;
-    }
-
-    const ascii = this.getAscii();
-    const type = inputType === 'auto'
-      ? (ascii.valid ? 'ascii' : 'raw')
-      : inputType;
-
-    const text = type === 'ascii'
-      ? ascii.value
-      : input;
-
-    const expandable = text.length > 50;
-    const textToShow = expandInput || !expandable
-      ? text
-      : text.slice(0, 50) + '...';
-
-    const inputDesc = (
-      <span
-        onClick={ this.toggleInputType }
-        className={ [ styles.clickable, styles.noSelect ].join(' ') }
-      >
-        {
-          type === 'ascii'
-            ? (
-              <FormattedMessage
-                id='ui.methodDecoding.input.input'
-                defaultMessage='input'
-              />
-            )
-            : (
-              <FormattedMessage
-                id='ui.methodDecoding.input.data'
-                defaultMessage='data'
-              />
-            )
-        }
-      </span>
-    );
-    const inputValue = (
-      <span
-        onClick={ this.toggleInputExpand }
-        className={ expandable ? styles.clickable : '' }
-      >
-        <code className={ styles.inputData }>
-          { textToShow }
-        </code>
-      </span>
-    );
-
-    return (
-      <div className={ styles.details }>
-        <FormattedMessage
-          id='ui.methodDecoding.input.withInput'
-          defaultMessage='with the {inputDesc} {inputValue}'
-          values={ {
-            inputDesc,
-            inputValue
-          } }
-        />
-      </div>
-    );
-  }
-
-  renderTokenAction () {
-    const { historic } = this.props;
-    const { methodSignature, methodInputs } = this.state;
-    const [to, value] = methodInputs;
-    const address = to.value;
-
-    switch (TOKEN_METHODS[methodSignature]) {
-      case 'transfer(to,value)':
-      default:
-        return (
-          <div className={ styles.details }>
-            <FormattedMessage
-              id='ui.methodDecoding.token.transfer'
-              defaultMessage='{historic, select, true {Transferred} false {Will transfer}} {value} to {address}'
-              values={ {
-                historic,
-                value: (
-                  <span className={ styles.highlight }>
-                    { this.renderTokenValue(value.value) }
-                  </span>
-                ),
-                address: this.renderAddressName(address)
-              } }
-            />
-          </div>
-        );
-    }
-  }
-
-  renderDeploy () {
-    const { compact, historic, transaction } = this.props;
-    const { methodInputs } = this.state;
-    const { value } = transaction;
-
-    if (!historic) {
-      return (
-        <div className={ styles.details }>
-          <FormattedMessage
-            id='ui.methodDecoding.deploy.willDeploy'
-            defaultMessage='Will deploy a contract'
-          />
-          {
-            value && value.gt(0)
-            ? (
-              <FormattedMessage
-                id='ui.methodDecoding.deploy.withValue'
-                defaultMessage=', sending {value}'
-                values={ {
-                  value: this.renderEtherValue(value)
-                } }
-              />
-            )
-            : null
-          }
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.details }>
-        <div>
-          <FormattedMessage
-            id='ui.methodDecoding.deploy.address'
-            defaultMessage='Deployed a contract at address '
-          />
-        </div>
-        { this.renderAddressName(transaction.creates, false) }
-        {
-          !compact && methodInputs && methodInputs.length
-          ? (
-            <div>
-              <FormattedMessage
-                id='ui.methodDecoding.deploy.params'
-                defaultMessage='with the following parameters:'
-              />
-              <div className={ styles.inputs }>
-                { this.renderInputs() }
-              </div>
-            </div>
-          )
-          : null
-        }
-      </div>
-    );
-  }
-
-  renderValueReceipt () {
-    const { historic, transaction } = this.props;
-    const { isContract } = this.state;
-
-    const valueEth = (
-      <span className={ styles.highlight }>
-        { this.renderEtherValue(transaction.value) }
-      </span>
-    );
-    const aContract = isContract
-      ? (
-        <FormattedMessage
-          id='ui.methodDecoding.receive.contract'
-          defaultMessage='the contract '
-        />
-      )
-      : '';
-
-    return (
-      <div className={ styles.details }>
-        <FormattedMessage
-          id='ui.methodDecoding.receive.info'
-          defaultMessage='{historic, select, true {Received} false {Will receive}} {valueEth} from {aContract}{address}'
-          values={ {
-            historic,
-            valueEth,
-            aContract,
-            address: this.renderAddressName(transaction.from)
-          } }
-        />
-        { this.renderInputValue() }
-      </div>
-    );
-  }
-
-  renderValueTransfer () {
-    const { historic, transaction } = this.props;
-    const { isContract } = this.state;
-
-    const valueEth = (
-      <span className={ styles.highlight }>
-        { this.renderEtherValue(transaction.value) }
-      </span>
-    );
-    const aContract = isContract
-      ? (
-        <FormattedMessage
-          id='ui.methodDecoding.transfer.contract'
-          defaultMessage='the contract '
-        />
-      )
-      : '';
-
-    return (
-      <div className={ styles.details }>
-        <FormattedMessage
-          id='ui.methodDecoding.transfer.info'
-          defaultMessage='{historic, select, true {Transferred} false {Will transfer}} {valueEth} to {aContract}{address}'
-          values={ {
-            historic,
-            valueEth,
-            aContract,
-            address: this.renderAddressName(transaction.to)
-          } }
-        />
-        { this.renderInputValue() }
-      </div>
-    );
-  }
-
-  renderSignatureMethod () {
-    const { compact, historic, transaction } = this.props;
-    const { methodName, methodInputs } = this.state;
-
-    const showInputs = !compact && methodInputs && methodInputs.length > 0;
-    const showEth = !!(transaction.value && transaction.value.gt(0));
-
-    const method = (
-      <span className={ styles.name }>
-        { methodName }
-      </span>
-    );
-    const ethValue = showEth && (
-      <span className={ styles.highlight }>
-        { this.renderEtherValue(transaction.value) }
-      </span>
-    );
-
-    return (
-      <div className={ styles.details }>
-        <div className={ styles.description }>
-          <FormattedMessage
-            id='ui.methodDecoding.signature.info'
-            defaultMessage='{historic, select, true {Executed} false {Will execute}} the {method} function on the contract {address} {showEth, select, true {transferring {ethValue}} false {}} {showInputs, select, false {} true {passing the following {inputLength, plural, one {parameter} other {parameters}}}}'
-            values={ {
-              historic,
-              method,
-              ethValue,
-              showEth,
-              showInputs,
-              address: this.renderAddressName(transaction.to),
-              inputLength: methodInputs.length
-            } }
-          />
-        </div>
-        {
-          showInputs
-          ? (
-            <div className={ styles.inputs }>
-              { this.renderInputs() }
-            </div>
-          )
-          : null
-        }
-      </div>
-    );
-  }
-
-  renderUnknownMethod () {
-    const { historic, transaction } = this.props;
-
-    const method = (
-      <span className={ styles.name }>
-        an unknown/unregistered
-      </span>
-    );
-    const ethValue = (
-      <span className={ styles.highlight }>
-        { this.renderEtherValue(transaction.value) }
-      </span>
-    );
-
-    return (
-      <div className={ styles.details }>
-        <FormattedMessage
-          id='ui.methodDecoding.unknown.info'
-          defaultMessage='{historic, select, true {Executed} false {Will execute}} the {method} on the contract {address} transferring {ethValue}.'
-          values={ {
-            historic,
-            method,
-            ethValue,
-            address: this.renderAddressName(transaction.to)
-          } }
-        />
-      </div>
-    );
-  }
-
-  renderInputs () {
-    const { methodInputs } = this.state;
-
-    if (!methodInputs || methodInputs.length === 0) {
-      return null;
-    }
-
-    const inputs = methodInputs.map((input, index) => {
-      const label = input.name
-        ? `${input.name}: ${input.type}`
-        : input.type;
-
-      return (
-        <TypedInput
-          allowCopy
-          className={ styles.input }
-          label={ label }
-          key={ index }
-          param={ input.type }
-          readOnly
-          value={ input.value }
-        />
-      );
-    });
-
-    return inputs;
-  }
-
-  renderTokenValue (value) {
-    const { token } = this.props;
-
-    return (
-      <span className={ styles.tokenValue }>
-        { value.div(token.format).toFormat(5) }<small> { token.tag }</small>
-      </span>
-    );
-  }
-
-  renderEtherValue (value) {
-    const { api } = this.context;
-    const ether = api.util.fromWei(value);
-
-    return (
-      <span className={ styles.etherValue }>
-        { ether.toFormat(5) }<small> ETH</small>
-      </span>
-    );
-  }
-
-  renderAddressName (address, withName = true) {
-    return (
-      <div className={ styles.addressContainer }>
-        <InputAddress
-          disabled
-          className={ styles.address }
-          value={ address }
-          text={ withName }
-        />
-      </div>
-    );
-  }
-
-  toggleInputExpand = () => {
-    if (window.getSelection && window.getSelection().type === 'Range') {
-      return;
-    }
-
-    this.setState({
-      expandInput: !this.state.expandInput
-    });
-  }
-
-  toggleInputType = () => {
-    const { inputType } = this.state;
-
-    if (inputType !== 'auto') {
-      return this.setState({
-        inputType: this.state.inputType === 'raw' ? 'ascii' : 'raw'
-      });
-    }
-
-    const ascii = this.getAscii();
-
-    return this.setState({
-      inputType: ascii.valid ? 'raw' : 'ascii'
-    });
-  }
-}
-
-function mapStateToProps (initState, initProps) {
-  const { tokens } = initState;
-  const { transaction } = initProps;
-
-  const token = Object.values(tokens).find((token) => token.address === transaction.to);
-
-  return () => {
-    return { token };
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(MethodDecoding);
diff --git a/js/src/ui/MethodDecoding/methodDecodingStore.js b/js/src/ui/MethodDecoding/methodDecodingStore.js
deleted file mode 100644
index 66f5b30c445fc9780f06a6dd6eaffd12611fed96..0000000000000000000000000000000000000000
--- a/js/src/ui/MethodDecoding/methodDecodingStore.js
+++ /dev/null
@@ -1,368 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Contracts from '~/contracts';
-import Abi from '~/abi';
-import * as abis from '~/contracts/abi';
-
-import { decodeMethodInput } from '~/api/util/decode';
-
-const CONTRACT_CREATE = '0x60606040';
-
-let instance = null;
-
-export default class MethodDecodingStore {
-  api = null;
-
-  _bytecodes = {};
-  _contractsAbi = {};
-  _isContract = {};
-  _methods = {};
-
-  constructor (api, contracts = {}) {
-    this.api = api;
-
-    // Load the signatures from the local ABIs
-    Object.keys(abis).forEach((abiKey) => {
-      this.loadFromAbi(abis[abiKey]);
-    });
-
-    this.addContracts(contracts);
-  }
-
-  addContracts (contracts = {}) {
-    // Load the User defined contracts
-    Object.values(contracts).forEach((contract) => {
-      if (!contract || !contract.meta || !contract.meta.abi) {
-        return;
-      }
-      this.loadFromAbi(contract.meta.abi, contract.address);
-    });
-  }
-
-  loadFromAbi (_abi, contractAddress) {
-    let abi;
-
-    try {
-      abi = new Abi(_abi);
-    } catch (error) {
-      console.warn('loadFromAbi', error, _abi);
-    }
-
-    if (!abi) {
-      return;
-    }
-
-    if (contractAddress) {
-      this._contractsAbi[contractAddress] = abi;
-    }
-
-    abi
-      .functions
-      .map((f) => ({ sign: f.signature, abi: f.abi }))
-      .forEach((mapping) => {
-        const sign = (/^0x/.test(mapping.sign) ? '' : '0x') + mapping.sign;
-
-        this._methods[sign] = mapping.abi;
-      });
-  }
-
-  static get (api, contracts = {}) {
-    if (!instance) {
-      instance = new MethodDecodingStore(api, contracts);
-    }
-
-    // Set API if not set yet
-    if (!instance.api) {
-      instance.api = api;
-    }
-
-    return instance;
-  }
-
-  static loadContracts (contracts = {}) {
-    if (!instance) {
-      // Just create the instance with null API
-      MethodDecodingStore.get(null, contracts);
-    } else {
-      instance.addContracts(contracts);
-    }
-  }
-
-  /**
-   * Looks up a transaction in the context of the given
-   * address
-   *
-   * @param  {String} address      The address contract
-   * @param  {Object} transaction  The transaction to lookup
-   * @return {Promise}             The result of the lookup. Resolves with:
-   *      {
-   *        contract: Boolean,
-   *        deploy: Boolean,
-   *        inputs: Array,
-   *        name: String,
-   *        params: Array,
-   *        received: Boolean,
-   *        signature: String
-   *      }
-   */
-  lookup (currentAddress, transaction) {
-    const result = {};
-
-    if (!transaction) {
-      return Promise.resolve(result);
-    }
-
-    const isReceived = transaction.to === currentAddress;
-    const contractAddress = isReceived ? transaction.from : transaction.to;
-    const input = transaction.input || transaction.data;
-
-    result.input = input;
-    result.received = isReceived;
-
-    // No input, should be a ETH transfer
-    if (!input || input === '0x') {
-      return Promise.resolve(result);
-    }
-
-    if (!transaction.to) {
-      return this.decodeContractCreation(result);
-    }
-
-    let signature;
-
-    try {
-      const decodeCallDataResult = this.api.util.decodeCallData(input);
-
-      signature = decodeCallDataResult.signature;
-    } catch (e) {}
-
-    // Contract deployment
-    if (!signature || signature === CONTRACT_CREATE || transaction.creates) {
-      const address = contractAddress || transaction.creates;
-
-      return this.isContractCreation(input, address)
-        .then((isContractCreation) => {
-          if (!isContractCreation) {
-            result.contract = false;
-            result.deploy = false;
-
-            return result;
-          }
-
-          return this.decodeContractCreation(result, address);
-        });
-    }
-
-    return this
-      .isContract(contractAddress)
-      .then((isContract) => {
-        result.contract = isContract;
-
-        if (!isContract) {
-          return result;
-        }
-
-        const { signature, paramdata } = this.api.util.decodeCallData(input);
-
-        result.signature = signature;
-        result.params = paramdata;
-
-        return this
-          .fetchMethodAbi(signature)
-          .then((abi) => {
-            let methodName = null;
-            let methodInputs = null;
-
-            if (abi) {
-              methodName = abi.name;
-              methodInputs = this.api.util
-                .decodeMethodInput(abi, paramdata)
-                .map((value, index) => {
-                  const { name, type } = abi.inputs[index];
-
-                  return { name, type, value };
-                });
-            }
-
-            return {
-              ...result,
-              name: methodName,
-              inputs: methodInputs
-            };
-          });
-      })
-      .catch((error) => {
-        console.warn('lookup', error);
-      });
-  }
-
-  decodeContractCreation (data, contractAddress = '') {
-    const result = {
-      ...data,
-      contract: true,
-      deploy: true
-    };
-
-    const { input } = data;
-    const abi = this._contractsAbi[contractAddress];
-
-    if (!abi || !abi.constructors || abi.constructors.length === 0) {
-      return Promise.resolve(result);
-    }
-
-    const constructorAbi = abi.constructors[0];
-
-    const rawInput = /^(?:0x)?(.*)$/.exec(input)[1];
-
-    return this
-      .getCode(contractAddress)
-      .then((code) => {
-        if (!code || /^(0x)0*?$/.test(code)) {
-          return result;
-        }
-
-        const rawCode = /^(?:0x)?(.*)$/.exec(code)[1];
-        const codeOffset = rawInput.indexOf(rawCode);
-
-        if (codeOffset === -1) {
-          return result;
-        }
-
-        // Params are the last bytes of the transaction Input
-        // (minus the bytecode). It seems that they are repeated
-        // twice
-        const params = rawInput.slice(codeOffset + rawCode.length);
-        const paramsBis = params.slice(params.length / 2);
-
-        let decodedInputs;
-
-        try {
-          decodedInputs = decodeMethodInput(constructorAbi, params);
-        } catch (e) {}
-
-        try {
-          if (!decodedInputs) {
-            decodedInputs = decodeMethodInput(constructorAbi, paramsBis);
-          }
-        } catch (e) {}
-
-        if (decodedInputs && decodedInputs.length > 0) {
-          result.inputs = decodedInputs
-            .map((value, index) => {
-              const type = constructorAbi.inputs[index].kind.type;
-
-              return { type, value };
-            });
-        }
-
-        return result;
-      });
-  }
-
-  fetchMethodAbi (signature) {
-    if (this._methods[signature] !== undefined) {
-      return Promise.resolve(this._methods[signature]);
-    }
-
-    this._methods[signature] = Contracts.get()
-      .signatureReg
-      .lookup(signature)
-      .then((method) => {
-        let abi = null;
-
-        if (method && method.length) {
-          abi = this.api.util.methodToAbi(method);
-        }
-
-        this._methods[signature] = abi;
-        return this._methods[signature];
-      });
-
-    return Promise.resolve(this._methods[signature]);
-  }
-
-  /**
-   * Checks (and caches) if the given address is a
-   * Contract or not, from its fetched bytecode
-   */
-  isContract (contractAddress) {
-    // If zero address, it isn't a contract
-    if (!contractAddress || /^(0x)?0*$/.test(contractAddress)) {
-      return Promise.resolve(false);
-    }
-
-    if (this._isContract[contractAddress]) {
-      return Promise.resolve(this._isContract[contractAddress]);
-    }
-
-    this._isContract[contractAddress] = this
-      .getCode(contractAddress)
-      .then((bytecode) => {
-        // Is a contract if the address contains *valid* bytecode
-        const _isContract = bytecode && /^(0x)?([0]*[1-9a-f]+[0]*)+$/.test(bytecode);
-
-        this._isContract[contractAddress] = _isContract;
-        return this._isContract[contractAddress];
-      });
-
-    return Promise.resolve(this._isContract[contractAddress]);
-  }
-
-  /**
-   * Check if the input resulted in a contract creation
-   * by checking that the contract address code contains
-   * a part of the input, or vice-versa
-   */
-  isContractCreation (input, contractAddress) {
-    return this.api.eth
-      .getCode(contractAddress)
-      .then((code) => {
-        if (/^(0x)?0*$/.test(code)) {
-          return false;
-        }
-
-        const strippedCode = code.replace(/^0x/, '');
-        const strippedInput = input.replace(/^0x/, '');
-
-        return strippedInput.indexOf(strippedInput) >= 0 || strippedCode.indexOf(strippedInput) >= 0;
-      })
-      .catch((error) => {
-        console.error(error);
-        return false;
-      });
-  }
-
-  getCode (contractAddress) {
-    // If zero address, resolve to '0x'
-    if (!contractAddress || /^(0x)?0*$/.test(contractAddress)) {
-      return Promise.resolve('0x');
-    }
-
-    if (this._bytecodes[contractAddress]) {
-      return Promise.resolve(this._bytecodes[contractAddress]);
-    }
-
-    this._bytecodes[contractAddress] = this.api.eth
-      .getCode(contractAddress)
-      .then((bytecode) => {
-        this._bytecodes[contractAddress] = bytecode;
-        return this._bytecodes[contractAddress];
-      });
-
-    return Promise.resolve(this._bytecodes[contractAddress]);
-  }
-}
diff --git a/js/src/ui/Modal/Busy/busy.css b/js/src/ui/Modal/Busy/busy.css
deleted file mode 100644
index c51d3c4ebf170b17afd389c989f00feb2534ce29..0000000000000000000000000000000000000000
--- a/js/src/ui/Modal/Busy/busy.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.center {
-  text-align: center;
-}
-
-.title {
-}
-
-.state {
-  margin-top: 1em;
-}
diff --git a/js/src/ui/Modal/Busy/busy.js b/js/src/ui/Modal/Busy/busy.js
deleted file mode 100644
index 7f881fc37ea254ce40fd1cb174e018fb56b3e950..0000000000000000000000000000000000000000
--- a/js/src/ui/Modal/Busy/busy.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './busy.css';
-
-export default class Busy extends Component {
-  static propTypes = {
-    children: PropTypes.node,
-    state: nodeOrStringProptype(),
-    title: nodeOrStringProptype()
-  }
-
-  render () {
-    const { children, state, title } = this.props;
-
-    return (
-      <div className={ styles.center }>
-        <div className={ styles.title }>{ title }</div>
-        <div className={ styles.state }>{ state }</div>
-        { children }
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/Modal/Busy/index.js b/js/src/ui/Modal/Busy/index.js
deleted file mode 100644
index 6053aeef9239c9d5f58a41efe71ef260a3f9f96c..0000000000000000000000000000000000000000
--- a/js/src/ui/Modal/Busy/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './busy';
diff --git a/js/src/ui/Modal/Completed/completed.css b/js/src/ui/Modal/Completed/completed.css
deleted file mode 100644
index c292a88e5a9944f7703e90c3bade13af166d67e6..0000000000000000000000000000000000000000
--- a/js/src/ui/Modal/Completed/completed.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.body {
-  text-align: center;
-}
-
-.body>div+div {
-  margin-top: 1em;
-}
diff --git a/js/src/ui/Modal/Completed/completed.js b/js/src/ui/Modal/Completed/completed.js
deleted file mode 100644
index 473c333185ce0dd5b88fa65081084b63bd377b68..0000000000000000000000000000000000000000
--- a/js/src/ui/Modal/Completed/completed.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './completed.css';
-
-export default class Completed extends Component {
-  static propTypes = {
-    children: PropTypes.node
-  }
-
-  render () {
-    const { children } = this.props;
-
-    return (
-      <div className={ styles.body }>
-        { children }
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/Modal/Completed/index.js b/js/src/ui/Modal/Completed/index.js
deleted file mode 100644
index 5df1b6d7f7a3dd16839e4bdfec6d409f857a2d9c..0000000000000000000000000000000000000000
--- a/js/src/ui/Modal/Completed/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './completed';
diff --git a/js/src/ui/Modal/index.js b/js/src/ui/Modal/index.js
deleted file mode 100644
index 661ace8a2a1ca287a83884d608c61c49f01d2f79..0000000000000000000000000000000000000000
--- a/js/src/ui/Modal/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Busy from './Busy';
-import Completed from './Completed';
-
-export {
-  Busy,
-  Completed
-};
diff --git a/js/src/ui/ModalBox/body.js b/js/src/ui/ModalBox/body.js
deleted file mode 100644
index 464270093b67db466bae9a880df66626c0f27b58..0000000000000000000000000000000000000000
--- a/js/src/ui/ModalBox/body.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { PropTypes } from 'react';
-
-import styles from './modalBox.css';
-
-export default function Body ({ children }) {
-  if (!children) {
-    return null;
-  }
-
-  return (
-    <div className={ styles.body }>
-      { children }
-    </div>
-  );
-}
-
-Body.propTypes = {
-  children: PropTypes.node
-};
diff --git a/js/src/ui/ModalBox/index.js b/js/src/ui/ModalBox/index.js
deleted file mode 100644
index 7f9d520411ba33b042644c09486daaa0861e8a9c..0000000000000000000000000000000000000000
--- a/js/src/ui/ModalBox/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './modalBox';
diff --git a/js/src/ui/ModalBox/modalBox.css b/js/src/ui/ModalBox/modalBox.css
deleted file mode 100644
index 12b4874e5f6a6d4b0a62d605aad0db4770019551..0000000000000000000000000000000000000000
--- a/js/src/ui/ModalBox/modalBox.css
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.body {
-  display: flex;
-  justify-content: flex-start;
-
-  .content {
-    flex: 1;
-
-    .body {
-      width: 100%;
-    }
-
-    .summary {
-      line-height: 1.618em;
-      padding: 0 4em 1.5em 4em;
-      text-align: center;
-    }
-  }
-
-  .icon {
-    align-items: center;
-    background: rgb(167, 151, 0);
-    border-radius: 50%;
-    display: flex;
-    flex: 0 0 5em;
-    flex-direction: column;
-    height: 5em;
-    justify-content: center;
-    margin-right: 1.5em;
-    padding: 0.75em;
-    width: 5em;
-
-    img {
-      margin: 0;
-      padding: 0;
-    }
-
-    svg {
-      fill: white !important;
-      font-size: 3.5em !important;
-      height: 3.5em !important;
-      margin: 0 !important;
-      width: 3.5em !important;
-    }
-  }
-}
diff --git a/js/src/ui/ModalBox/modalBox.js b/js/src/ui/ModalBox/modalBox.js
deleted file mode 100644
index bfcfbe88a848ce8b5b9fcdb368c5e55ead152a62..0000000000000000000000000000000000000000
--- a/js/src/ui/ModalBox/modalBox.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { PropTypes } from 'react';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import Body from './body';
-import Summary from './summary';
-import styles from './modalBox.css';
-
-export default function ModalBox ({ children, icon, summary }) {
-  return (
-    <div className={ styles.body }>
-      <div className={ styles.icon }>
-        { icon }
-      </div>
-      <div className={ styles.content }>
-        <Summary summary={ summary } />
-        <Body children={ children } />
-      </div>
-    </div>
-  );
-}
-
-ModalBox.propTypes = {
-  children: PropTypes.node,
-  icon: PropTypes.node.isRequired,
-  summary: nodeOrStringProptype()
-};
diff --git a/js/src/ui/ModalBox/modalBox.spec.js b/js/src/ui/ModalBox/modalBox.spec.js
deleted file mode 100644
index ad890be5f5d075377b6373fa3448dff69076ff72..0000000000000000000000000000000000000000
--- a/js/src/ui/ModalBox/modalBox.spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import ModalBox from './';
-
-let component;
-
-const CHILDREN = <div id='testChild'>testChild</div>;
-const ICON = <div id='testIcon'>testIcon</div>;
-const SUMMARY = <div id='testSummary'>testSummary</div>;
-
-function render () {
-  component = shallow(
-    <ModalBox
-      children={ CHILDREN }
-      icon={ ICON }
-      summary={ SUMMARY }
-    />
-  );
-
-  return component;
-}
-
-describe('ui/ModalBox', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('adds the icon as supplied', () => {
-    expect(component.find('#testIcon').text()).to.equal('testIcon');
-  });
-
-  describe('components', () => {
-    it('adds the Body as supplied', () => {
-      expect(component.find('Body').props().children).to.deep.equal(CHILDREN);
-    });
-
-    it('adds the Summary as supplied', () => {
-      expect(component.find('Summary').props().summary).to.deep.equal(SUMMARY);
-    });
-  });
-});
diff --git a/js/src/ui/ModalBox/summary.js b/js/src/ui/ModalBox/summary.js
deleted file mode 100644
index cb198c472968256441e3b572a6ef60b03926683e..0000000000000000000000000000000000000000
--- a/js/src/ui/ModalBox/summary.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './modalBox.css';
-
-export default function Summary ({ summary }) {
-  if (!summary) {
-    return null;
-  }
-
-  return (
-    <div className={ styles.summary }>
-      { summary }
-    </div>
-  );
-}
-
-Summary.propTypes = {
-  summary: nodeOrStringProptype()
-};
diff --git a/js/src/ui/Page/index.js b/js/src/ui/Page/index.js
deleted file mode 100644
index 76686424d7510cd12365099e91cc13e3757e0267..0000000000000000000000000000000000000000
--- a/js/src/ui/Page/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './page';
diff --git a/js/src/ui/Page/page.css b/js/src/ui/Page/page.css
deleted file mode 100644
index c13f49d6d98a944d1a687df4fdb97d9e1880746f..0000000000000000000000000000000000000000
--- a/js/src/ui/Page/page.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.layout,
-.layoutPadded {
-  &>div {
-    margin-bottom: 0.5em;
-  }
-}
-
-.layout {
-  padding: 0.25em 0.25em 3em 0.25em;
-}
-
-.layoutPadded {
-  padding: 0.5em 0.5em 3em 0.5em;
-}
diff --git a/js/src/ui/Page/page.js b/js/src/ui/Page/page.js
deleted file mode 100644
index c8e88ec1416f6877c9d0e5dc4c22bbd983911708..0000000000000000000000000000000000000000
--- a/js/src/ui/Page/page.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import Actionbar from '../Actionbar';
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './page.css';
-
-export default class Page extends Component {
-  static propTypes = {
-    buttons: PropTypes.array,
-    className: PropTypes.string,
-    children: PropTypes.node,
-    padded: PropTypes.bool,
-    title: nodeOrStringProptype()
-  };
-
-  render () {
-    const { buttons, className, children, padded, title } = this.props;
-
-    return (
-      <div>
-        {
-          title || buttons
-            ? (
-              <Actionbar
-                buttons={ buttons }
-                title={ title }
-              />
-            )
-            : null
-        }
-        <div
-          className={
-            [
-              padded
-                ? styles.layoutPadded
-                : styles.layout,
-              className
-            ].join(' ')
-          }
-        >
-          { children }
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/Page/page.spec.js b/js/src/ui/Page/page.spec.js
deleted file mode 100644
index 606ce276b4812c0ef5c769f830ed2424817c3384..0000000000000000000000000000000000000000
--- a/js/src/ui/Page/page.spec.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import Page from './';
-
-const BUTTONS = ['buttonA', 'buttonB'];
-const CLASSNAME = 'testClass';
-const TESTTEXT = 'testing children';
-const TITLE = 'test title';
-
-let component;
-
-function render () {
-  component = shallow(
-    <Page
-      buttons={ BUTTONS }
-      className={ CLASSNAME }
-      title={ TITLE }
-    >
-      <div id='testContent'>
-        { TESTTEXT }
-      </div>
-    </Page>
-  );
-
-  return component;
-}
-
-describe('ui/Page', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('renders the children', () => {
-    expect(component.find('div[id="testContent"]').text()).to.equal(TESTTEXT);
-  });
-
-  describe('components', () => {
-    describe('ActionBar', () => {
-      let actions;
-
-      beforeEach(() => {
-        actions = component.find('Actionbar');
-      });
-
-      it('renders the actionbar', () => {
-        expect(actions.get(0)).to.be.ok;
-      });
-
-      it('passes the provided title', () => {
-        expect(actions.props().title).to.equal(TITLE);
-      });
-
-      it('passed the provided buttons', () => {
-        expect(actions.props().buttons).to.equal(BUTTONS);
-      });
-    });
-  });
-});
diff --git a/js/src/ui/ParityBackground/index.js b/js/src/ui/ParityBackground/index.js
deleted file mode 100644
index c91aca28fe700945054ea6e0a08f2206b886fc92..0000000000000000000000000000000000000000
--- a/js/src/ui/ParityBackground/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './parityBackground';
diff --git a/js/src/ui/ParityBackground/parityBackground.js b/js/src/ui/ParityBackground/parityBackground.js
deleted file mode 100644
index 69fc773202904a79635d92852a97bf71f66578e6..0000000000000000000000000000000000000000
--- a/js/src/ui/ParityBackground/parityBackground.js
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-class ParityBackground extends Component {
-  static contextTypes = {
-    muiTheme: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    attachDocument: PropTypes.bool,
-    backgroundSeed: PropTypes.string,
-    children: PropTypes.node,
-    className: PropTypes.string,
-    onClick: PropTypes.func,
-    style: PropTypes.object
-  };
-
-  static defaultProps = {
-    style: {}
-  };
-
-  state = {
-    style: {}
-  };
-
-  _seed = null;
-
-  componentWillMount () {
-    this.setStyle();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    this.setStyle(nextProps);
-  }
-
-  shouldComponentUpdate (_, nextState) {
-    return nextState.style !== this.state.style;
-  }
-
-  setStyle (props = this.props) {
-    const { seed, gradient, backgroundSeed } = props;
-
-    const _seed = seed || backgroundSeed;
-
-    // Don't update if it's the same seed...
-    if (this._seed === _seed) {
-      return;
-    }
-
-    const { muiTheme } = this.context;
-
-    const style = muiTheme.parity.getBackgroundStyle(gradient, _seed);
-
-    this.setState({ style });
-  }
-
-  render () {
-    const { attachDocument, children, className, onClick } = this.props;
-
-    const style = {
-      ...this.state.style,
-      ...this.props.style
-    };
-
-    if (attachDocument) {
-      document.documentElement.style.backgroundImage = style.background;
-    }
-
-    return (
-      <div
-        className={ className }
-        style={
-          attachDocument
-            ? {}
-            : style
-        }
-        onTouchTap={ onClick }
-      >
-        { children }
-      </div>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { backgroundSeed } = state.settings;
-
-  return { backgroundSeed };
-}
-
-export default connect(
-  mapStateToProps
-)(ParityBackground);
diff --git a/js/src/ui/Portal/index.js b/js/src/ui/Portal/index.js
deleted file mode 100644
index 2c5524fee4e3b0ef7ff73e7435844e7c24100616..0000000000000000000000000000000000000000
--- a/js/src/ui/Portal/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './portal';
diff --git a/js/src/ui/Portal/portal.css b/js/src/ui/Portal/portal.css
deleted file mode 100644
index 85e8be4f171fbc4c7a928166c78d9686eb30fceb..0000000000000000000000000000000000000000
--- a/js/src/ui/Portal/portal.css
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$modalMargin: 1.5em;
-$modalPadding: 1.5em;
-$modalPaddingChild: 3em;
-$modalBackZ: 2500;
-
-/* This should be the default case, the Portal used as a stand-alone modal */
-$modalBottom: $modalMargin;
-$modalLeft: $modalMargin;
-$modalRight: $modalMargin;
-$modalTop: $modalMargin;
-$modalZ: 3500;
-
-/* This is the case where popped-up over another modal, Portal or otherwise */
-$popoverBottom: $modalMargin;
-$popoverLeft: $modalMargin;
-$popoverRight: $modalMargin;
-$popoverTop: 20vh;
-$popoverZ: 3600;
-
-.backOverlay {
-  background-color: rgba(255, 255, 255, 0.35);
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: $modalBackZ;
-}
-
-.parityBackground {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  opacity: 0.25;
-  z-index: -1;
-}
-
-.overlay {
-  background-color: rgba(0, 0, 0, 1);
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  padding: $modalPadding;
-  position: fixed;
-
-  * {
-    min-width: 0;
-  }
-
-  &.modal {
-    z-index: $modalZ;
-
-    &:not(.small) {
-      bottom: $modalBottom;
-      left: $modalLeft;
-      right: $modalRight;
-      top: $modalTop;
-    }
-
-    /* TODO: Small Portals don't adjust their overall height like we have with the
-    /* rest, so really tiny screens and large small Portals (it shouldn't be be done,
-    /* but may well be) will scretch to non-visible areas.
-    */
-    &.small {
-      margin: 1.5em auto;
-      max-width: 768px;
-      position: relative;
-      width: 75%;
-    }
-  }
-
-  &.popover {
-    left: $popoverLeft;
-    top: $popoverTop;
-    height: calc(100vh - $popoverTop - $popoverBottom);
-    width: calc(100vw - $popoverLeft - $popoverRight);
-    z-index: $popoverZ;
-  }
-
-  .buttonRow {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: flex-end;
-    padding: $modalPadding 0 0 0;
-
-    button:not([disabled]) {
-      color: white !important;
-
-      svg {
-        fill: white !important;
-      }
-    }
-  }
-
-  .childContainer {
-    flex: 1;
-    margin: 0 -$modalPadding;
-    overflow-x: hidden;
-    overflow-y: auto;
-    padding: 0 $modalPaddingChild;
-    z-index: 1;
-  }
-
-  .closeIcon {
-    font-size: 4em;
-    position: absolute;
-    right: 1rem;
-    top: 0.5rem;
-    z-index: 100;
-
-    &, * {
-      height: 48px !important;
-      width: 48px !important;
-    }
-
-    &:hover {
-      cursor: pointer;
-      opacity: 0.5;
-    }
-  }
-
-  .titleRow {
-    margin-bottom: $modalPadding;
-  }
-}
diff --git a/js/src/ui/Portal/portal.example.js b/js/src/ui/Portal/portal.example.js
deleted file mode 100644
index a1a32abb40263a22826cd853d504eb0ae9abe613..0000000000000000000000000000000000000000
--- a/js/src/ui/Portal/portal.example.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import { Button } from '~/ui';
-import PlaygroundExample from '~/playground/playgroundExample';
-
-import Portal from './portal';
-
-export default class PortalExample extends Component {
-  state = {
-    open: []
-  };
-
-  render () {
-    const { open } = this.state;
-
-    return (
-      <div>
-        <PlaygroundExample name='Standard Portal'>
-          <div>
-            <button onClick={ this.handleOpen(0) }>Open</button>
-            <Portal
-              open={ open[0] || false }
-              onClose={ this.handleClose }
-            >
-              <p>This is the first portal</p>
-            </Portal>
-          </div>
-        </PlaygroundExample>
-
-        <PlaygroundExample name='Popover Portal'>
-          <div>
-            <button onClick={ this.handleOpen(1) }>Open</button>
-            <Portal
-              isChildModal
-              open={ open[1] || false }
-              onClose={ this.handleClose }
-            >
-              <p>This is the second portal</p>
-            </Portal>
-          </div>
-        </PlaygroundExample>
-
-        <PlaygroundExample name='Portal in Modal'>
-          <div>
-            <button onClick={ this.handleOpen(2) }>Open</button>
-
-            <Portal
-              isChildModal
-              open={ open[3] || false }
-              onClose={ this.handleClose }
-            >
-              <p>This is the second portal</p>
-            </Portal>
-          </div>
-        </PlaygroundExample>
-
-        <PlaygroundExample name='Portal with Buttons'>
-          <div>
-            <button onClick={ this.handleOpen(4) }>Open</button>
-            <Portal
-              activeStep={ 0 }
-              buttons={ [
-                <Button
-                  key='close'
-                  label='close'
-                  onClick={ this.handleClose }
-                />
-              ] }
-              isChildModal
-              open={ open[4] || false }
-              onClose={ this.handleClose }
-              steps={ [ 'step 1', 'step 2' ] }
-              title='Portal with button'
-            >
-              <p>This is the fourth portal</p>
-            </Portal>
-          </div>
-        </PlaygroundExample>
-      </div>
-    );
-  }
-
-  handleOpen = (index) => {
-    return () => {
-      const { open } = this.state;
-      const nextOpen = open.slice();
-
-      nextOpen[index] = true;
-      this.setState({ open: nextOpen });
-    };
-  }
-
-  handleClose = () => {
-    this.setState({ open: [] });
-  }
-}
diff --git a/js/src/ui/Portal/portal.js b/js/src/ui/Portal/portal.js
deleted file mode 100644
index 6b2d7f8b2757e80d2ce98110681ce2458d1dd2d2..0000000000000000000000000000000000000000
--- a/js/src/ui/Portal/portal.js
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import ReactDOM from 'react-dom';
-import ReactPortal from 'react-portal';
-import keycode from 'keycode';
-import { noop } from 'lodash';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-import { CloseIcon } from '~/ui/Icons';
-import ParityBackground from '~/ui/ParityBackground';
-import StackEventListener from '~/ui/StackEventListener';
-import Title from '~/ui/Title';
-
-import styles from './portal.css';
-
-export default class Portal extends Component {
-  static propTypes = {
-    open: PropTypes.bool.isRequired,
-    activeStep: PropTypes.number,
-    busy: PropTypes.bool,
-    busySteps: PropTypes.array,
-    buttons: PropTypes.oneOfType([
-      PropTypes.array,
-      PropTypes.node,
-      PropTypes.object
-    ]),
-    children: PropTypes.node,
-    className: PropTypes.string,
-    hideClose: PropTypes.bool,
-    isChildModal: PropTypes.bool,
-    isSmallModal: PropTypes.bool,
-    onClick: PropTypes.func,
-    onClose: PropTypes.func,
-    onKeyDown: PropTypes.func,
-    steps: PropTypes.array,
-    title: nodeOrStringProptype()
-  };
-
-  static defaultProps = {
-    onClose: noop
-  };
-
-  componentDidMount () {
-    this.setBodyOverflow(this.props.open);
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (nextProps.open !== this.props.open) {
-      this.setBodyOverflow(nextProps.open);
-    }
-  }
-
-  componentWillUnmount () {
-    this.setBodyOverflow(false);
-  }
-
-  render () {
-    const { activeStep, busy, busySteps, children, className, isChildModal, isSmallModal, open, steps, title } = this.props;
-
-    if (!open) {
-      return null;
-    }
-
-    return (
-      <ReactPortal isOpened>
-        <div
-          className={ styles.backOverlay }
-          onClick={ this.handleClose }
-        >
-          <div
-            className={
-              [
-                styles.overlay,
-                isChildModal
-                  ? styles.popover
-                  : styles.modal,
-                isSmallModal
-                  ? styles.small
-                  : null,
-                className
-              ].join(' ')
-            }
-            onClick={ this.handleContainerClick }
-            onKeyDown={ this.handleKeyDown }
-          >
-            <StackEventListener onKeyUp={ this.handleKeyUp } />
-            <ParityBackground className={ styles.parityBackground } />
-            { this.renderClose() }
-            <Title
-              activeStep={ activeStep }
-              busy={ busy }
-              busySteps={ busySteps }
-              className={ styles.titleRow }
-              steps={ steps }
-              title={ title }
-            />
-            <div className={ styles.childContainer }>
-              { children }
-            </div>
-            { this.renderButtons() }
-          </div>
-        </div>
-      </ReactPortal>
-    );
-  }
-
-  renderButtons () {
-    const { buttons } = this.props;
-
-    if (!buttons) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.buttonRow }>
-        { buttons }
-      </div>
-    );
-  }
-
-  renderClose () {
-    const { hideClose } = this.props;
-
-    if (hideClose) {
-      return null;
-    }
-
-    return (
-      <CloseIcon
-        className={ styles.closeIcon }
-        onClick={ this.handleClose }
-      />
-    );
-  }
-
-  stopEvent = (event) => {
-    event.stopPropagation();
-  }
-
-  handleContainerClick = (event) => {
-    const { onClick } = this.props;
-
-    if (!onClick) {
-      return this.stopEvent(event);
-    }
-
-    return onClick(event);
-  }
-
-  handleClose = () => {
-    const { hideClose, onClose } = this.props;
-
-    if (!hideClose) {
-      onClose();
-    }
-
-    this.stopEvent(event);
-  }
-
-  handleKeyDown = (event) => {
-    const { onKeyDown } = this.props;
-
-    event.persist();
-
-    return onKeyDown
-      ? onKeyDown(event)
-      : false;
-  }
-
-  handleKeyUp = (event) => {
-    const codeName = keycode(event);
-
-    switch (codeName) {
-      case 'esc':
-        event.preventDefault();
-        return this.props.onClose();
-    }
-  }
-
-  handleDOMAction = (ref, method) => {
-    const element = ReactDOM.findDOMNode(
-      typeof ref === 'string'
-        ? this.refs[ref]
-        : ref
-    );
-
-    if (!element || typeof element[method] !== 'function') {
-      console.warn('could not find', ref, 'or method', method);
-      return;
-    }
-
-    return element[method]();
-  }
-
-  setBodyOverflow (open) {
-    if (!this.props.isChildModal) {
-      document.body.style.overflow = open
-        ? 'hidden'
-        : null;
-    }
-  }
-}
diff --git a/js/src/ui/Portal/portal.spec.js b/js/src/ui/Portal/portal.spec.js
deleted file mode 100644
index fdc1ab4a71ce20a07048ad91af720aa1634ef7b0..0000000000000000000000000000000000000000
--- a/js/src/ui/Portal/portal.spec.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import Portal from './';
-
-let component;
-let onClose;
-
-function render (props = {}) {
-  onClose = sinon.stub();
-  component = shallow(
-    <Portal
-      onClose={ onClose }
-      open
-      { ...props }
-    />
-  );
-
-  return component;
-}
-
-describe('ui/Portal', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('title rendering', () => {
-    const TITLE = 'some test title';
-    let title;
-
-    beforeEach(() => {
-      title = render({ title: TITLE }).find('Title');
-    });
-
-    it('renders the specified title', () => {
-      expect(title).to.have.length(1);
-    });
-
-    it('renders the passed title', () => {
-      expect(title.props().title).to.equal(TITLE);
-    });
-  });
-});
diff --git a/js/src/ui/QrCode/index.js b/js/src/ui/QrCode/index.js
deleted file mode 100644
index b88651bbf756009413a4a4e3b6ca879458e2ab15..0000000000000000000000000000000000000000
--- a/js/src/ui/QrCode/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './qrCode';
diff --git a/js/src/ui/QrCode/qrCode.css b/js/src/ui/QrCode/qrCode.css
deleted file mode 100644
index b6b524b44fd6ebd971fbded86a3c6a5d3f9eefd3..0000000000000000000000000000000000000000
--- a/js/src/ui/QrCode/qrCode.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.qr {
-  max-width: 15em;
-  max-height: 15em;
-
-  img {
-    height: auto !important;
-    max-height: 100%;
-    max-width: 100%;
-    width: auto !important;
-  }
-
-  svg {
-    background: white;
-  }
-}
diff --git a/js/src/ui/QrCode/qrCode.example.js b/js/src/ui/QrCode/qrCode.example.js
deleted file mode 100644
index 8f85f81478ec08309dfa02b3ee4cb8c5a92a0e56..0000000000000000000000000000000000000000
--- a/js/src/ui/QrCode/qrCode.example.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import PlaygroundExample from '~/playground/playgroundExample';
-
-import QrCode from './';
-
-export default class QrCodeExample extends Component {
-  render () {
-    return (
-      <div>
-        <PlaygroundExample name='Simple QRCode'>
-          <QrCode
-            value='this is a test'
-          />
-        </PlaygroundExample>
-
-        <PlaygroundExample name='Simple QRCode with margin'>
-          <QrCode
-            margin={ 10 }
-            value='this is a test'
-          />
-        </PlaygroundExample>
-
-        <PlaygroundExample name='Ethereum Address QRCode'>
-          <QrCode
-            margin={ 10 }
-            value='0x8c30393085C8C3fb4C1fB16165d9fBac5D86E1D9'
-          />
-        </PlaygroundExample>
-
-        <PlaygroundExample name='Bitcoin Address QRCode'>
-          <QrCode
-            margin={ 10 }
-            value='3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy'
-          />
-        </PlaygroundExample>
-
-        <PlaygroundExample name='Big QRCode'>
-          <QrCode
-            size={ 10 }
-            value='this is a test'
-          />
-        </PlaygroundExample>
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/QrCode/qrCode.js b/js/src/ui/QrCode/qrCode.js
deleted file mode 100644
index fddcf089ed59f01b673751473f1c87dc7cc8964c..0000000000000000000000000000000000000000
--- a/js/src/ui/QrCode/qrCode.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import qrcode from 'qrcode-generator/js/qrcode';
-import React, { Component, PropTypes } from 'react';
-
-import { calculateType } from './qrSize';
-
-import styles from './qrCode.css';
-
-const QROPTS = {
-  ERROR_LEVEL: 'M',
-  MAX_SIZE: 40,
-  MIN_SIZE: 5
-};
-
-export default class QrCode extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    margin: PropTypes.number,
-    size: PropTypes.number,
-    value: PropTypes.string.isRequired
-  };
-
-  static defaultProps = {
-    margin: 2,
-    size: 4
-  };
-
-  state = {
-    image: null
-  };
-
-  componentWillMount () {
-    this.generateCode(this.props);
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const hasChanged = nextProps.value !== this.props.value ||
-      nextProps.size !== this.props.size ||
-      nextProps.margin !== this.props.margin;
-
-    if (hasChanged) {
-      this.generateCode(nextProps);
-    }
-  }
-
-  render () {
-    const { className } = this.props;
-    const { image } = this.state;
-
-    return (
-      <div
-        className={ [styles.qr, className].join(' ') }
-        dangerouslySetInnerHTML={ {
-          __html: image
-        } }
-      />
-    );
-  }
-
-  generateCode (props) {
-    const { margin, size, value } = props;
-    const type = calculateType(value.length, QROPTS.ERROR_LEVEL);
-    const qr = qrcode(type, QROPTS.ERROR_LEVEL);
-
-    qr.addData(value, 'Byte');
-    qr.make();
-
-    this.setState({
-      image: qr.createImgTag(size, margin)
-    });
-  }
-}
diff --git a/js/src/ui/QrCode/qrCode.spec.js b/js/src/ui/QrCode/qrCode.spec.js
deleted file mode 100644
index ddde3be122d965878c53e13307d9ad6a15eefa96..0000000000000000000000000000000000000000
--- a/js/src/ui/QrCode/qrCode.spec.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import QrCode from './';
-
-const DEFAULT_PROPS = {
-  margin: 1,
-  size: 4,
-  value: 'someTestValue'
-};
-
-let component;
-let instance;
-
-function render (props = {}) {
-  component = shallow(
-    <QrCode
-      { ...DEFAULT_PROPS }
-      { ...props }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('ui/QrCode', () => {
-  beforeEach(() => {
-    render();
-    sinon.spy(instance, 'generateCode');
-  });
-
-  afterEach(() => {
-    instance.generateCode.restore();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('lifecycle', () => {
-    describe('componentWillMount', () => {
-      it('generates the image on mount', () => {
-        instance.componentWillMount();
-        expect(instance.generateCode).to.have.been.calledWith(DEFAULT_PROPS);
-      });
-    });
-
-    describe('componentWillReceiveProps', () => {
-      it('does not re-generate when no props changed', () => {
-        instance.componentWillReceiveProps(DEFAULT_PROPS);
-        expect(instance.generateCode).not.to.have.been.called;
-      });
-
-      it('does not re-generate when className changed', () => {
-        const nextProps = Object.assign({}, DEFAULT_PROPS, { className: 'test' });
-
-        instance.componentWillReceiveProps(nextProps);
-        expect(instance.generateCode).not.to.have.been.called;
-      });
-
-      it('does not re-generate when additional property changed', () => {
-        const nextProps = Object.assign({}, DEFAULT_PROPS, { something: 'test' });
-
-        instance.componentWillReceiveProps(nextProps);
-        expect(instance.generateCode).not.to.have.been.called;
-      });
-
-      it('does re-generate when value changed', () => {
-        const nextProps = Object.assign({}, DEFAULT_PROPS, { value: 'somethingElse' });
-
-        instance.componentWillReceiveProps(nextProps);
-        expect(instance.generateCode).to.have.been.calledWith(nextProps);
-      });
-
-      it('does re-generate when size changed', () => {
-        const nextProps = Object.assign({}, DEFAULT_PROPS, { size: 10 });
-
-        instance.componentWillReceiveProps(nextProps);
-        expect(instance.generateCode).to.have.been.calledWith(nextProps);
-      });
-
-      it('does re-generate when margin changed', () => {
-        const nextProps = Object.assign({}, DEFAULT_PROPS, { margin: 10 });
-
-        instance.componentWillReceiveProps(nextProps);
-        expect(instance.generateCode).to.have.been.calledWith(nextProps);
-      });
-    });
-  });
-});
diff --git a/js/src/ui/QrCode/qrSize.js b/js/src/ui/QrCode/qrSize.js
deleted file mode 100644
index 8440458acb1acacfe7c7d6bdef181065150344d9..0000000000000000000000000000000000000000
--- a/js/src/ui/QrCode/qrSize.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const _QR_SIZES = { 'L': [], 'M': [], 'H': [], 'Q': [] };
-const QR_LEVELS = Object.keys(_QR_SIZES);
-
-/* eslint-disable indent,no-multi-spaces */
-const QR_SIZES = [
-    19,   16,   13,    9,
-    34,   28,   22,   16,
-    55,   44,   34,   26,
-    80,   64,   48,   36,
-   108,   86,   62,   46,
-   136,  108,   76,   60,
-   156,  124,   88,   66,
-   194,  154,  110,   86,
-   232,  182,  132,  100,
-   274,  216,  154,  122,
-   324,  254,  180,  140,
-   370,  290,  206,  158,
-   428,  334,  244,  180,
-   461,  365,  261,  197,
-   523,  415,  295,  223,
-   589,  453,  325,  253,
-   647,  507,  367,  283,
-   721,  563,  397,  313,
-   795,  627,  445,  341,
-   861,  669,  485,  385,
-   932,  714,  512,  406,
-  1006,  782,  568,  442,
-  1094,  860,  614,  464,
-  1174,  914,  664,  514,
-  1276, 1000,  718,  538,
-  1370, 1062,  754,  596,
-  1468, 1128,  808,  628,
-  1531, 1193,  871,  661,
-  1631, 1267,  911,  701,
-  1735, 1373,  985,  745,
-  1843, 1455, 1033,  793,
-  1955, 1541, 1115,  845,
-  2071, 1631, 1171,  901,
-  2191, 1725, 1231,  961,
-  2306, 1812, 1286,  986,
-  2434, 1914, 1354, 1054,
-  2566, 1992, 1426, 1096,
-  2702, 2102, 1502, 1142,
-  2812, 2216, 1582, 1222,
-  2956, 2334, 1666, 1276
-].reduce((sizes, value, index) => {
-  sizes[QR_LEVELS[index % 4]].push(value);
-
-  return sizes;
-}, _QR_SIZES);
-/* eslint-enable indent,no-multi-spaces */
-
-export function calculateType (lengthBytes, errorLevel = 'M') {
-  let type = 5;
-
-  // subtract 3 from the capacities, since we need 2 bits for the mode and a
-  // bunch more for the length.
-  while (type < 40 && lengthBytes > QR_SIZES[errorLevel][type - 1] - 3) {
-    type++;
-  }
-
-  return type;
-}
diff --git a/js/src/ui/QrScan/index.js b/js/src/ui/QrScan/index.js
deleted file mode 100644
index 55c59d7c16617fb7f8aabb477f3e92857e0b7f25..0000000000000000000000000000000000000000
--- a/js/src/ui/QrScan/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './qrScan';
diff --git a/js/src/ui/QrScan/qrScan.css b/js/src/ui/QrScan/qrScan.css
deleted file mode 100644
index 67a7dee66648be6c6f664e131964a5dc8ce0ff3a..0000000000000000000000000000000000000000
--- a/js/src/ui/QrScan/qrScan.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.qr {
-  text-align: center;
-
-  video {
-    border: 2px solid rgb(200, 200, 200);
-    margin: 1.5em auto;
-  }
-}
diff --git a/js/src/ui/QrScan/qrScan.js b/js/src/ui/QrScan/qrScan.js
deleted file mode 100644
index d75e7d0e9eeb241f9ff9a8eee7b086b148576b20..0000000000000000000000000000000000000000
--- a/js/src/ui/QrScan/qrScan.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { PropTypes } from 'react';
-import Reader from 'react-qr-reader';
-
-import styles from './qrScan.css';
-
-const SCAN_DELAY = 100;
-const SCAN_STYLE = {
-  display: 'inline-block',
-  width: '30em'
-};
-
-export default function QrScan ({ onError, onScan }) {
-  return (
-    <div className={ styles.qr }>
-      <Reader
-        delay={ SCAN_DELAY }
-        onError={ onError }
-        onScan={ onScan }
-        style={ SCAN_STYLE }
-      />
-    </div>
-  );
-}
-
-QrScan.propTypes = {
-  onError: PropTypes.func,
-  onScan: PropTypes.func.isRequired
-};
-
-QrScan.defaultProps = {
-  onError: (error) => {
-    console.log('QrScan', error);
-  }
-};
diff --git a/js/src/ui/QrScan/qrScan.spec.js b/js/src/ui/QrScan/qrScan.spec.js
deleted file mode 100644
index 9e4c96f7482bac61ef60d93af861ade152993022..0000000000000000000000000000000000000000
--- a/js/src/ui/QrScan/qrScan.spec.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import QrScan from './';
-
-let component;
-let onError;
-let onScan;
-
-function render () {
-  onError = sinon.stub();
-  onScan = sinon.stub();
-
-  component = shallow(
-    <QrScan
-      onError={ onError }
-      onScan={ onScan }
-    />
-  );
-
-  return component;
-}
-
-describe('ui/QrScan', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('Reader', () => {
-    let reader;
-
-    beforeEach(() => {
-      reader = component.find('Reader');
-    });
-
-    it('renders component', () => {
-      expect(reader.get(0)).to.be.ok;
-    });
-
-    it('attaches onError', () => {
-      expect(reader.props().onError).to.equal(onError);
-    });
-
-    it('attaches onScan', () => {
-      expect(reader.props().onScan).to.equal(onScan);
-    });
-  });
-});
diff --git a/js/src/ui/ScrollableText/index.js b/js/src/ui/ScrollableText/index.js
deleted file mode 100644
index 959b338eb5cc31a68c431e5c07502dd6f6a3ce4c..0000000000000000000000000000000000000000
--- a/js/src/ui/ScrollableText/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './scrollableText';
diff --git a/js/src/ui/ScrollableText/scrollableText.css b/js/src/ui/ScrollableText/scrollableText.css
deleted file mode 100644
index 50a9ea892513a2cb65f5437904725d69d4c15b20..0000000000000000000000000000000000000000
--- a/js/src/ui/ScrollableText/scrollableText.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.input {
-  background-color: transparent;
-  border: none;
-  box-sizing: border-box;
-  color: inherit;
-  cursor: text;
-  display: inline-block;
-  font-family: inherit;
-  font-size: inherit;
-  margin-left: 0.25em;
-  padding: 0;
-  width: 100%;
-
-  &.small {
-    width: 10em;
-  }
-}
diff --git a/js/src/ui/ScrollableText/scrollableText.js b/js/src/ui/ScrollableText/scrollableText.js
deleted file mode 100644
index 53668ff776e57d747b4d72d532ba90454840d047..0000000000000000000000000000000000000000
--- a/js/src/ui/ScrollableText/scrollableText.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { PropTypes } from 'react';
-
-import styles from './scrollableText.css';
-
-export default function ScrollableText ({ small = false, text }) {
-  const classes = [ styles.input ];
-
-  if (small) {
-    classes.push(styles.small);
-  }
-
-  return (
-    <input
-      className={ classes.join(' ') }
-      readOnly
-      value={ text }
-    />
-  );
-}
-
-ScrollableText.propTypes = {
-  text: PropTypes.string.isRequired,
-  small: PropTypes.bool
-};
diff --git a/js/src/ui/SectionList/index.js b/js/src/ui/SectionList/index.js
deleted file mode 100644
index 463f336f16cb5b6f86d48fe7b483be6346f83f3e..0000000000000000000000000000000000000000
--- a/js/src/ui/SectionList/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './sectionList';
diff --git a/js/src/ui/SectionList/sectionList.css b/js/src/ui/SectionList/sectionList.css
deleted file mode 100644
index e81d8ce07f1f52b6ad547f8e8f01d024afdfe6d3..0000000000000000000000000000000000000000
--- a/js/src/ui/SectionList/sectionList.css
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$transition: all 0.25s;
-$widthNormal: 33.33%;
-$widthExpanded: 42%;
-$widthContracted: 29%;
-
-.section {
-  position: relative;
-  width: 100%;
-
-  .overlay {
-    background: rgba(0, 0, 0, 0.85);
-    bottom: 0;
-    left: 0;
-    padding: 1.5em;
-    position: absolute;
-    right: 0;
-    top: 0;
-    z-index: 199;
-  }
-
-  .row {
-    display: flex;
-    justify-content: center;
-
-    /* TODO: As per JS comments, the flex-base could be adjusted in the future to allow for
-    /* case where <> 3 columns are required should the need arrise from a UI pov. */
-    .item {
-      box-sizing: border-box;
-      display: flex;
-      flex: 0 1 $widthNormal;
-      max-width: $widthNormal;
-      min-width: $widthContracted;
-      opacity: 0.85;
-      padding: 0.25em;
-
-      /* https://www.binarymoon.co.uk/2014/02/fixing-css-transitions-in-google-chrome/ */
-      transform: translateZ(0);
-      transition: $transition;
-      width: 0;
-
-      &:hover {
-        opacity: 1;
-        z-index: 100;
-      }
-    }
-
-    .item.stretchOn:hover {
-      flex: 0 0 $widthExpanded;
-      max-width: $widthExpanded;
-    }
-  }
-}
-
-.section + .section {
-  margin-top: 1em;
-}
diff --git a/js/src/ui/SectionList/sectionList.example.js b/js/src/ui/SectionList/sectionList.example.js
deleted file mode 100644
index a0bd71b58c0a7901f6dbe6e0a657ae63250728da..0000000000000000000000000000000000000000
--- a/js/src/ui/SectionList/sectionList.example.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import PlaygroundExample from '~/playground/playgroundExample';
-import SectionList from './';
-
-const ITEM_STYLE = {
-  backgroundColor: 'rgba(0, 0, 0, 0.75)',
-  padding: '1em'
-};
-
-const items = [
-  { name: 'Jack', desc: 'Item number 1' },
-  { name: 'Paul', desc: 'Item number 2' },
-  { name: 'Matt', desc: 'Item number 3' },
-  { name: 'Titi', desc: 'Item number 4' }
-];
-
-export default class SectionListExample extends Component {
-  state = {
-    showOverlay: true
-  };
-
-  render () {
-    return (
-      <div>
-        <PlaygroundExample name='Simple Usage'>
-          { this.renderSimple() }
-        </PlaygroundExample>
-
-        <PlaygroundExample name='With Overlay'>
-          { this.renderWithOverlay() }
-        </PlaygroundExample>
-      </div>
-    );
-  }
-
-  renderSimple () {
-    return (
-      <SectionList
-        items={ items }
-        renderItem={ this.renderItem }
-      />
-    );
-  }
-
-  renderWithOverlay () {
-    const { showOverlay } = this.state;
-    const overlay = (
-      <div>
-        <p>Overlay</p>
-        <button onClick={ this.hideOverlay }>hide</button>
-      </div>
-    );
-
-    return (
-      <SectionList
-        items={ items }
-        overlay={ showOverlay ? overlay : null }
-        renderItem={ this.renderItem }
-      />
-    );
-  }
-
-  renderItem (item, index) {
-    const { desc, name } = item;
-
-    return (
-      <div style={ ITEM_STYLE }>
-        <h3>{ name }</h3>
-        <h3 data-hover='show'>{ desc }</h3>
-      </div>
-    );
-  }
-
-  hideOverlay = () => {
-    this.setState({ showOverlay: false });
-  }
-}
diff --git a/js/src/ui/SectionList/sectionList.js b/js/src/ui/SectionList/sectionList.js
deleted file mode 100644
index f499d8962e217900edb04bcb55e4086fe1a87d1a..0000000000000000000000000000000000000000
--- a/js/src/ui/SectionList/sectionList.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { chunkArray } from '~/util/array';
-import { arrayOrObjectProptype, nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './sectionList.css';
-
-// TODO: We probably want this to be passed via props - additional work required in that case to
-// support the styling for both the hover and no-hover CSS for the pre/post sizes. Future work only
-// if/when required.
-const ITEMS_PER_ROW = 3;
-
-export default class SectionList extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    items: arrayOrObjectProptype().isRequired,
-    renderItem: PropTypes.func.isRequired,
-    noStretch: PropTypes.bool,
-    overlay: nodeOrStringProptype()
-  };
-
-  static defaultProps = {
-    noStretch: false
-  };
-
-  render () {
-    const { className, items } = this.props;
-
-    if (!items || !items.length) {
-      return null;
-    }
-
-    const rendered = items
-      .map(this.renderItem)
-      .filter((item) => item);
-
-    if (!rendered.length) {
-      return null;
-    }
-
-    return (
-      <section className={ [styles.section, className].join(' ') }>
-        { this.renderOverlay() }
-        { chunkArray(rendered, ITEMS_PER_ROW).map(this.renderRow) }
-      </section>
-    );
-  }
-
-  renderOverlay () {
-    const { overlay } = this.props;
-
-    if (!overlay) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.overlay }>
-        { overlay }
-      </div>
-    );
-  }
-
-  renderRow = (row, index) => {
-    return (
-      <div
-        className={ styles.row }
-        key={ `row_${index}` }
-      >
-        { row }
-      </div>
-    );
-  }
-
-  renderItem = (item, index) => {
-    const { noStretch, renderItem } = this.props;
-    const itemRendered = renderItem(item, index);
-
-    if (!itemRendered) {
-      return null;
-    }
-
-    return (
-      <div
-        className={ [
-          styles.item,
-          noStretch
-            ? styles.stretchOff
-            : styles.stretchOn
-        ].join(' ') }
-        key={ `item_${index}` }
-      >
-        { itemRendered }
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/SectionList/sectionList.spec.js b/js/src/ui/SectionList/sectionList.spec.js
deleted file mode 100644
index 29c6d1d562c3c3bacf307059cf12d27ea021b645..0000000000000000000000000000000000000000
--- a/js/src/ui/SectionList/sectionList.spec.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import SectionList from './';
-
-const ITEMS = ['itemA', 'itemB', 'itemC', 'itemD', 'itemE'];
-
-let component;
-let instance;
-let renderItem;
-
-function render (props = {}) {
-  renderItem = sinon.stub().returns('someThing');
-  component = shallow(
-    <SectionList
-      className='testClass'
-      items={ ITEMS }
-      renderItem={ renderItem }
-      section='testSection'
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('SectionList', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('adds className as specified', () => {
-    expect(component.hasClass('testClass')).to.be.true;
-  });
-
-  describe('instance methods', () => {
-    describe('renderRow', () => {
-      let row;
-
-      beforeEach(() => {
-        sinon.stub(instance, 'renderItem');
-        row = instance.renderRow(['testA', 'testB']);
-      });
-
-      afterEach(() => {
-        instance.renderItem.restore();
-      });
-
-      it('renders a row', () => {
-        expect(row).to.be.ok;
-      });
-
-      it('adds a key for the row', () => {
-        expect(row.key).to.be.ok;
-      });
-    });
-
-    describe('renderItem', () => {
-      let item;
-
-      beforeEach(() => {
-        item = instance.renderItem('testItem', 50);
-      });
-
-      it('renders an item', () => {
-        expect(item).to.be.ok;
-      });
-
-      it('adds a key for the item', () => {
-        expect(item.key).to.be.ok;
-      });
-
-      it('calls the external renderer', () => {
-        expect(renderItem).to.have.been.calledWith('testItem', 50);
-      });
-    });
-  });
-});
diff --git a/js/src/ui/SelectionList/index.js b/js/src/ui/SelectionList/index.js
deleted file mode 100644
index bd762aef0327b29943cf989982d026247580bb74..0000000000000000000000000000000000000000
--- a/js/src/ui/SelectionList/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './selectionList';
diff --git a/js/src/ui/SelectionList/selectionList.css b/js/src/ui/SelectionList/selectionList.css
deleted file mode 100644
index b6e6b05f9fddc23a8d3102e2a6d2a8678d883172..0000000000000000000000000000000000000000
--- a/js/src/ui/SelectionList/selectionList.css
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.item {
-  cursor: pointer;
-  display: flex;
-  flex: 1;
-  height: 100%;
-  position: relative;
-  width: 100%;
-
-  &:hover {
-    filter: none;
-    opacity: 1;
-  }
-
-  .content {
-    height: 100%;
-    width: 100%;
-
-    &:hover {
-      background-color: rgba(255, 255, 255, 0.15);
-    }
-  }
-
-  .overlay {
-    position: absolute;
-    left: 0.75em;
-    top: 0.75em;
-    z-index: 1;
-
-    .icon,
-    .iconDisabled {
-      border-radius: 0.25em;
-      color: #333 !important;
-      cursor: pointer;
-      margin-right: 0.25em;
-    }
-
-    .icon {
-      background: white;
-    }
-
-    .iconDisabled {
-      background: #666;
-
-      &:hover {
-        background: white;
-      }
-    }
-  }
-}
-
-.selected {
-  filter: none;
-
-  &::after {
-    background: rgb(0, 151, 167);
-    content: '';
-    height: 4px;
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-  }
-
-  &.default::after {
-    background: rgb(167, 151, 0);
-  }
-}
-
-.unselected {
-  filter: grayscale(50%);
-  opacity: 0.75;
-}
diff --git a/js/src/ui/SelectionList/selectionList.js b/js/src/ui/SelectionList/selectionList.js
deleted file mode 100644
index 266dce8930e4d4b9ee5d4873f5f81877e77a0ccd..0000000000000000000000000000000000000000
--- a/js/src/ui/SelectionList/selectionList.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { noop } from 'lodash';
-import React, { Component, PropTypes } from 'react';
-
-import { StarIcon } from '~/ui/Icons';
-import SectionList from '~/ui/SectionList';
-import { arrayOrObjectProptype } from '~/util/proptypes';
-
-import styles from './selectionList.css';
-
-export default class SelectionList extends Component {
-  static propTypes = {
-    isChecked: PropTypes.func,
-    items: arrayOrObjectProptype().isRequired,
-    noStretch: PropTypes.bool,
-    onDefaultClick: PropTypes.func,
-    onSelectClick: PropTypes.func,
-    onSelectDoubleClick: PropTypes.func,
-    renderItem: PropTypes.func.isRequired
-  };
-
-  static defaultProps = {
-    onSelectDoubleClick: noop
-  };
-
-  render () {
-    const { items, noStretch } = this.props;
-
-    return (
-      <SectionList
-        items={ items }
-        noStretch={ noStretch }
-        renderItem={ this.renderItem }
-      />
-    );
-  }
-
-  renderItem = (item, index) => {
-    const { isChecked, onDefaultClick, onSelectClick, onSelectDoubleClick, renderItem } = this.props;
-    const isSelected = isChecked
-      ? isChecked(item)
-      : item.checked;
-
-    const handleClick = () => {
-      if (onSelectClick) {
-        onSelectClick(item);
-        return false;
-      }
-    };
-    const handleDoubleClick = () => {
-      onSelectDoubleClick(item);
-      return false;
-    };
-
-    let defaultIcon = null;
-
-    if (onDefaultClick) {
-      const makeDefault = () => {
-        onDefaultClick(item);
-        return false;
-      };
-
-      defaultIcon = (
-        <div className={ styles.overlay }>
-          {
-            isSelected && item.default
-              ? <StarIcon className={ styles.icon } />
-              : <StarIcon className={ styles.iconDisabled } onClick={ makeDefault } />
-          }
-        </div>
-      );
-    }
-
-    const classes = isSelected
-      ? [styles.item, styles.selected]
-      : [styles.item, styles.unselected];
-
-    if (item.default) {
-      classes.push(styles.default);
-    }
-
-    return (
-      <div className={ classes.join(' ') }>
-        <div
-          className={ styles.content }
-          onClick={ handleClick }
-          onDoubleClick={ handleDoubleClick }
-        >
-          { renderItem(item, index) }
-        </div>
-        { defaultIcon }
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/SelectionList/selectionList.spec.js b/js/src/ui/SelectionList/selectionList.spec.js
deleted file mode 100644
index 4dfaed3967fdcbed719a7a2b6fffb4858cbd0c67..0000000000000000000000000000000000000000
--- a/js/src/ui/SelectionList/selectionList.spec.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import SelectionList from './';
-
-const ITEMS = ['A', 'B', 'C'];
-
-let component;
-let instance;
-let renderItem;
-let onDefaultClick;
-let onSelectClick;
-
-function render (props = {}) {
-  renderItem = sinon.stub();
-  onDefaultClick = sinon.stub();
-  onSelectClick = sinon.stub();
-
-  component = shallow(
-    <SelectionList
-      items={ ITEMS }
-      noStretch='testNoStretch'
-      onDefaultClick={ onDefaultClick }
-      onSelectClick={ onSelectClick }
-      renderItem={ renderItem }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('ui/SelectionList', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('SectionList', () => {
-    let section;
-
-    beforeEach(() => {
-      section = component.find('SectionList');
-    });
-
-    it('renders the SectionList', () => {
-      expect(section.get(0)).to.be.ok;
-    });
-
-    it('passes the items through', () => {
-      expect(section.props().items).to.deep.equal(ITEMS);
-    });
-
-    it('passes internal render method', () => {
-      expect(section.props().renderItem).to.equal(instance.renderItem);
-    });
-
-    it('passes noStretch prop through', () => {
-      expect(section.props().noStretch).to.equal('testNoStretch');
-    });
-  });
-
-  describe('instance methods', () => {
-    describe('renderItem', () => {
-      let result;
-
-      beforeEach(() => {
-        result = instance.renderItem('testItem', 'testIndex');
-      });
-
-      it('renders', () => {
-        expect(result).to.be.ok;
-      });
-
-      it('calls into parent renderItem', () => {
-        expect(renderItem).to.have.been.calledWith('testItem', 'testIndex');
-      });
-    });
-  });
-});
diff --git a/js/src/ui/ShortenedHash/index.js b/js/src/ui/ShortenedHash/index.js
deleted file mode 100644
index 2a5a1a28cfd30e7fed2c26ce65b6d22f636f7be7..0000000000000000000000000000000000000000
--- a/js/src/ui/ShortenedHash/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './shortenedHash';
diff --git a/js/src/ui/ShortenedHash/shortenedHash.css b/js/src/ui/ShortenedHash/shortenedHash.css
deleted file mode 100644
index 18ca331628bb60fa034cb92497057dc29ceea05f..0000000000000000000000000000000000000000
--- a/js/src/ui/ShortenedHash/shortenedHash.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.hash {
-  display: inline-block;
-  word-break: break-all;
-}
diff --git a/js/src/ui/ShortenedHash/shortenedHash.js b/js/src/ui/ShortenedHash/shortenedHash.js
deleted file mode 100644
index 3ad265bee6dbb4c1fbc9af29aa3812d461cae47f..0000000000000000000000000000000000000000
--- a/js/src/ui/ShortenedHash/shortenedHash.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import styles from './shortenedHash.css';
-
-export default class ShortenedHash extends Component {
-  static propTypes = {
-    data: PropTypes.string.isRequired
-  }
-
-  render () {
-    const { data } = this.props;
-
-    let shortened = data.toLowerCase();
-
-    if (shortened.slice(0, 2) === '0x') {
-      shortened = shortened.slice(2);
-    }
-    if (shortened.length > (6 + 6)) {
-      shortened = shortened.slice(0, 6) + '…' + shortened.slice(-6);
-    }
-
-    return (
-      <abbr className={ styles.hash } title={ data }>{ shortened }</abbr>
-    );
-  }
-}
diff --git a/js/src/ui/SignerIcon/index.js b/js/src/ui/SignerIcon/index.js
deleted file mode 100644
index b312a2b291f21ccf1f84ce1b553da723d0d1231d..0000000000000000000000000000000000000000
--- a/js/src/ui/SignerIcon/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './signerIcon';
diff --git a/js/src/ui/SignerIcon/signerIcon.js b/js/src/ui/SignerIcon/signerIcon.js
deleted file mode 100644
index 911703a57cebd37731b41d0c1a3d130db6f40860..0000000000000000000000000000000000000000
--- a/js/src/ui/SignerIcon/signerIcon.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { keccak_256 } from 'js-sha3'; // eslint-disable-line camelcase
-import ActionFingerprint from 'material-ui/svg-icons/action/fingerprint';
-
-import IdentityIcon from '../IdentityIcon';
-
-class SignerIcon extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    secureToken: PropTypes.string
-  }
-
-  render () {
-    const { className, secureToken } = this.props;
-
-    if (!secureToken) {
-      return (
-        <ActionFingerprint />
-      );
-    }
-
-    const signerSha = keccak_256(secureToken);
-
-    return (
-      <IdentityIcon
-        address={ signerSha }
-        center
-        className={ className }
-      />
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { secureToken } = state.nodeStatus;
-
-  return { secureToken };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(SignerIcon);
diff --git a/js/src/ui/StackEventListener/index.js b/js/src/ui/StackEventListener/index.js
deleted file mode 100644
index e046c51d511861e97e0b386b4a19896ccc007396..0000000000000000000000000000000000000000
--- a/js/src/ui/StackEventListener/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './stackEventListener';
diff --git a/js/src/ui/StackEventListener/stackEventListener.js b/js/src/ui/StackEventListener/stackEventListener.js
deleted file mode 100644
index 586ddcad6371adc07e30e7c210ec05a36341390b..0000000000000000000000000000000000000000
--- a/js/src/ui/StackEventListener/stackEventListener.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import ReactEventListener from 'react-event-listener';
-import React, { Component, PropTypes } from 'react';
-
-let listenerId = 0;
-let listenerIds = [];
-
-export default class StackEventListener extends Component {
-  static propTypes = {
-    onKeyUp: PropTypes.func.isRequired
-  };
-
-  componentWillMount () {
-    // Add to the list of listeners on mount
-    this.id = ++listenerId;
-    listenerIds.push(this.id);
-  }
-
-  componentWillUnmount () {
-    // Remove from the listeners list on unmount
-    listenerIds = listenerIds.filter((id) => this.id !== id);
-  }
-
-  render () {
-    return (
-      <ReactEventListener
-        target='window'
-        onKeyUp={ this.handleKeyUp }
-      />
-    );
-  }
-
-  handleKeyUp = (event) => {
-    // Only handle event if last of the listeners list
-    if (this.id !== listenerIds.slice(-1)[0]) {
-      return event;
-    }
-
-    return this.props.onKeyUp(event);
-  }
-}
diff --git a/js/src/ui/StatusIndicator/index.js b/js/src/ui/StatusIndicator/index.js
deleted file mode 100644
index 7d2978dc415438dec397c6c7989d0ace0d72985b..0000000000000000000000000000000000000000
--- a/js/src/ui/StatusIndicator/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './statusIndicator';
diff --git a/js/src/ui/StatusIndicator/statusIndicator.css b/js/src/ui/StatusIndicator/statusIndicator.css
deleted file mode 100644
index fb2b6a8be9f2722c5da46a67d2185b2dc2cccdb2..0000000000000000000000000000000000000000
--- a/js/src/ui/StatusIndicator/statusIndicator.css
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.status {
-  display: inline-block;
-}
-
-.radial,.signal {
-  display: inline-block;
-  margin: .2em;
-  width: 1em;
-  height: 1em;
-  white-space: nowrap;
-}
-
-.radial {
-  border-radius: 100%;
-  border-top: 1px solid rgba(255, 255, 255, 0.5);
-  background-image: radial-gradient(ellipse at top, rgba(255, 255, 255, 0.38) 0%, rgba(255, 255, 255, 0) 100%);
-
-  &.ok {
-    background-color: #070;
-  }
-  &.bad {
-    background-color: #c00;
-  }
-  &.needsAttention {
-    background-color: #dc0;
-  }
-}
-
-.signal {
-  width: 2em;
-  width: calc(.9em + 5px);
-  text-transform: initial;
-  vertical-align: bottom;
-  margin-top: -1em;
-
-  > .bar {
-    display: inline-block;
-    border: 1px solid #444;
-    box-shadow: 0 0 1px rgba(0, 0, 0, 0.8);
-    width: .3em;
-    height: 1em;
-    opacity: 0.7;
-    background-color: rgba(0, 0, 0, 0.6);
-    vertical-align: bottom;
-
-    &.active {
-      opacity: 1.0;
-      background-image: linear-gradient(0, rgba(255, 255, 255, 0.38) 0%, rgba(255, 255, 255, 0) 100%);
-    }
-
-    &.bad {
-      height: .4em;
-      border-right: 0;
-    }
-    &.needsAttention {
-      height: .6em;
-      border-right: 0;
-    }
-    &.ok {
-      height: 1em;
-    }
-  }
-
-  &.bad > .bar.active {
-    background-color: #c00;
-  }
-  &.ok > .bar.active {
-    background-color: #080;
-  }
-  &.needsAttention > .bar.active {
-    background-color: #dc0;
-  }
-}
diff --git a/js/src/ui/StatusIndicator/statusIndicator.js b/js/src/ui/StatusIndicator/statusIndicator.js
deleted file mode 100644
index cacce2a3655694ad3de26e01c312a7d7adad6828..0000000000000000000000000000000000000000
--- a/js/src/ui/StatusIndicator/statusIndicator.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import ReactTooltip from 'react-tooltip';
-
-import styles from './statusIndicator.css';
-
-const statuses = ['bad', 'needsAttention', 'ok'];
-
-export default class StatusIndicator extends Component {
-  static propTypes = {
-    type: PropTypes.oneOf(['radial', 'signal']),
-    id: PropTypes.string.isRequired,
-    status: PropTypes.oneOf(statuses).isRequired,
-    title: PropTypes.arrayOf(PropTypes.node),
-    tooltipPlacement: PropTypes.oneOf(['left', 'top', 'bottom', 'right'])
-  };
-
-  static defaultProps = {
-    type: 'signal',
-    title: []
-  };
-
-  render () {
-    const { id, status, title, type, tooltipPlacement } = this.props;
-    const tooltip = title.find(x => !x.isEmpty) ? (
-      <ReactTooltip id={ `status-${id}` }>
-        { title.map(x => (<div key={ x }>{ x }</div>)) }
-      </ReactTooltip>
-    ) : null;
-
-    return (
-      <span className={ styles.status }>
-        <span className={ `${styles[type]} ${styles[status]}` }
-          data-tip={ title.length }
-          data-for={ `status-${id}` }
-          data-place={ tooltipPlacement }
-          data-effect='solid'
-        >
-          { type === 'signal' && statuses.map(this.renderBar) }
-        </span>
-        {tooltip}
-      </span>
-    );
-  }
-
-  renderBar = (signal) => {
-    const idx = statuses.indexOf(this.props.status);
-    const isActive = statuses.indexOf(signal) <= idx;
-    const activeClass = isActive ? styles.active : '';
-
-    return (
-      <span key={ signal } className={ `${styles.bar} ${styles[signal]} ${activeClass}` } />
-    );
-  }
-}
diff --git a/js/src/ui/Tags/index.js b/js/src/ui/Tags/index.js
deleted file mode 100644
index 4e91c96677126d48d797e89af488c10a4c603b15..0000000000000000000000000000000000000000
--- a/js/src/ui/Tags/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './tags';
diff --git a/js/src/ui/Tags/tags.css b/js/src/ui/Tags/tags.css
deleted file mode 100644
index 9fbbaaace0cd911539ce1ccd7efa19e95f7bb134..0000000000000000000000000000000000000000
--- a/js/src/ui/Tags/tags.css
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.tags {
-  display: flex;
-  flex-wrap: wrap;
-
-  &.floating {
-    position: absolute;
-    right: 0.25rem;
-    top: 0;
-  }
-
-  &.horizontal {
-    flex-direction: column;
-  }
-}
-
-.floating .tag {
-  margin-top: 0.75em;
-}
-
-.horizontal .tag {
-  margin: 0.25em 0;
-
-  .text {
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    width: 150%;
-  }
-}
-
-.tag {
-  font-size: 0.75rem;
-  background: rgba(255, 255, 255, 0.07);
-  border-radius: 16px;
-  margin: 0 0.5em;
-  padding: 0.25em 1em;
-  opacity: 1;
-  transition: opacity 0.2s ease-out;
-}
-
-.tagClickable:hover {
-  cursor: pointer;
-}
diff --git a/js/src/ui/Tags/tags.js b/js/src/ui/Tags/tags.js
deleted file mode 100644
index 503867dd633821c9282603b0a8cb3f20567ae5ab..0000000000000000000000000000000000000000
--- a/js/src/ui/Tags/tags.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { arrayOrObjectProptype } from '~/util/proptypes';
-
-import styles from './tags.css';
-
-export default class Tags extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    floating: PropTypes.bool,
-    horizontal: PropTypes.bool,
-    handleAddSearchToken: PropTypes.func,
-    setRefs: PropTypes.func,
-    tags: arrayOrObjectProptype()
-  };
-
-  static defaultProps = {
-    horizontal: false,
-    floating: true
-  };
-
-  render () {
-    const { className, floating, horizontal, tags } = this.props;
-
-    if (!tags || tags.length === 0) {
-      return null;
-    }
-
-    const classes = [ styles.tags ];
-
-    if (floating) {
-      classes.push(styles.floating);
-    }
-
-    if (horizontal) {
-      classes.push(styles.horizontal);
-    }
-
-    classes.push(className);
-
-    return (
-      <div className={ classes.join(' ') }>
-        { this.renderTags() }
-      </div>
-    );
-  }
-
-  renderTags () {
-    const { handleAddSearchToken, setRefs, tags } = this.props;
-
-    const tagClasses = handleAddSearchToken
-      ? [ styles.tag, styles.tagClickable ]
-      : [ styles.tag ];
-
-    const setRef = setRefs
-      ? (ref) => { setRefs(ref); }
-      : () => {};
-
-    return tags
-      .sort()
-      .map((tag, index) => {
-        const onClick = handleAddSearchToken
-          ? (event) => {
-            event.stopPropagation();
-            event.preventDefault();
-
-            handleAddSearchToken(tag);
-          }
-          : null;
-
-        return (
-          <div
-            key={ `tag_${index}` }
-            className={ tagClasses.join(' ') }
-            onClick={ onClick }
-            ref={ setRef }
-          >
-            <span className={ styles.text }>{ tag }</span>
-          </div>
-        );
-      });
-  }
-}
diff --git a/js/src/ui/Theme/index.js b/js/src/ui/Theme/index.js
deleted file mode 100644
index c1a5c3fa0ed403b67b0ac67e9577b9b8a97978f4..0000000000000000000000000000000000000000
--- a/js/src/ui/Theme/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './theme';
diff --git a/js/src/ui/Theme/theme.js b/js/src/ui/Theme/theme.js
deleted file mode 100644
index f64aa9a6f4a89d9e10c8da07ea4eb0881ad9fc1c..0000000000000000000000000000000000000000
--- a/js/src/ui/Theme/theme.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import GeoPattern from 'geopattern';
-import getMuiTheme from 'material-ui/styles/getMuiTheme';
-import darkBaseTheme from 'material-ui/styles/baseThemes/darkBaseTheme';
-import lightBaseTheme from 'material-ui/styles/baseThemes/lightBaseTheme';
-
-const lightTheme = getMuiTheme(lightBaseTheme);
-const muiTheme = getMuiTheme(darkBaseTheme);
-
-muiTheme.inkBar.backgroundColor = 'transparent';
-muiTheme.paper.backgroundColor = 'rgb(18, 18, 18)';
-muiTheme.raisedButton.primaryTextColor = 'white';
-muiTheme.snackbar.backgroundColor = 'rgba(255, 30, 30, 0.9)';
-muiTheme.snackbar.textColor = 'rgba(255, 255, 255, 0.75)';
-muiTheme.stepper.textColor = '#eee';
-muiTheme.stepper.disabledTextColor = '#777';
-muiTheme.tabs = lightTheme.tabs;
-muiTheme.tabs.backgroundColor = 'transparent';
-muiTheme.tabs.selectedTextColor = 'white';
-muiTheme.tabs.textColor = 'rgba(255, 255, 255, 0.5)';
-muiTheme.textField.floatingLabelColor = 'rgba(255, 255, 255, 0.5)';
-muiTheme.textField.hintColor = 'rgba(255, 255, 255, 0.5)';
-muiTheme.textField.disabledTextColor = muiTheme.textField.textColor;
-muiTheme.toolbar = lightTheme.toolbar;
-muiTheme.toolbar.backgroundColor = 'transparent';
-muiTheme.zIndex.layer = 4000;
-muiTheme.zIndex.popover = 4100;
-
-const imageCache = {};
-
-muiTheme.parity = {
-  backgroundSeed: '0x0',
-
-  setBackgroundSeed: (seed) => {
-    muiTheme.parity.backgroundSeed = seed;
-  },
-
-  getBackgroundStyle: (_gradient, _seed) => {
-    const gradient = _gradient || 'rgba(255, 255, 255, 0.25)';
-    const seed = _seed || muiTheme.parity.backgroundSeed;
-    let url;
-
-    if (_seed) {
-      url = GeoPattern.generate(_seed).toDataUrl();
-    } else if (imageCache[seed] && imageCache[seed][gradient]) {
-      url = imageCache[seed][gradient];
-    } else {
-      url = GeoPattern.generate(seed).toDataUrl();
-      imageCache[seed] = imageCache[seed] || {};
-      imageCache[seed][gradient] = url;
-    }
-
-    return {
-      background: `linear-gradient(${gradient}, ${gradient}), ${url}`
-    };
-  }
-};
-
-export default muiTheme;
diff --git a/js/src/ui/Theme/theme.spec.js b/js/src/ui/Theme/theme.spec.js
deleted file mode 100644
index 3347032e919619ba4cbc440acba87c44fa6835de..0000000000000000000000000000000000000000
--- a/js/src/ui/Theme/theme.spec.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import getMuiTheme from 'material-ui/styles/getMuiTheme';
-import lightBaseTheme from 'material-ui/styles/baseThemes/lightBaseTheme';
-
-const muiTheme = getMuiTheme(lightBaseTheme);
-
-import theme from './theme';
-
-describe('ui/Theme', () => {
-  it('is MUI-based', () => {
-    expect(Object.keys(theme)).to.deep.equal(Object.keys(muiTheme).concat('parity'));
-  });
-
-  it('allows setting of Parity backgrounds', () => {
-    expect(typeof theme.parity.setBackgroundSeed === 'function').to.be.true;
-    expect(typeof theme.parity.getBackgroundStyle === 'function').to.be.true;
-  });
-
-  describe('parity', () => {
-    describe('setBackgroundSeed', () => {
-      const SEED = 'testseed';
-
-      beforeEach(() => {
-        theme.parity.setBackgroundSeed(SEED);
-      });
-
-      it('sets the correct theme values', () => {
-        expect(theme.parity.backgroundSeed).to.equal(SEED);
-      });
-    });
-
-    describe('getBackgroundStyle', () => {
-      it('generates a style containing background', () => {
-        const style = theme.parity.getBackgroundStyle();
-
-        expect(style).to.have.property('background');
-      });
-    });
-  });
-});
diff --git a/js/src/ui/Title/index.js b/js/src/ui/Title/index.js
deleted file mode 100644
index d39bfcc2fdf83d6243394d83a4a2f61c3e7e8280..0000000000000000000000000000000000000000
--- a/js/src/ui/Title/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './title';
diff --git a/js/src/ui/Title/title.css b/js/src/ui/Title/title.css
deleted file mode 100644
index 5f7b196d7531fc8d568b6cf78a1f7c6c25b3e648..0000000000000000000000000000000000000000
--- a/js/src/ui/Title/title.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.title,
-.subtitle {
-  .steps {
-    margin: -0.5em 0 -1em 0;
-  }
-
-  .waiting {
-    margin: 1em -1.5em 0 -1.5em;
-  }
-}
-
-.subtitle {
-  opacity: 0.75;
-}
diff --git a/js/src/ui/Title/title.js b/js/src/ui/Title/title.js
deleted file mode 100644
index 82abdb3cf2f2bda4b1a9cb750ad7833b3bc1e12e..0000000000000000000000000000000000000000
--- a/js/src/ui/Title/title.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { LinearProgress } from 'material-ui';
-import { Step, Stepper, StepLabel } from 'material-ui/Stepper';
-import React, { Component, PropTypes } from 'react';
-
-// TODO: It would make sense (going forward) to replace all uses of
-// ContainerTitle with this component. In that case the styles for the
-// h3 (title) can be pulled from there. (As it stands the duplication
-// between the 2 has been removed, but as a short-term DRY only)
-import { Title as ContainerTitle } from '~/ui/Container';
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './title.css';
-
-export default class Title extends Component {
-  static propTypes = {
-    activeStep: PropTypes.number,
-    description: nodeOrStringProptype(),
-    busy: PropTypes.bool,
-    busySteps: PropTypes.array,
-    byline: nodeOrStringProptype(),
-    className: PropTypes.string,
-    isSubTitle: PropTypes.bool,
-    steps: PropTypes.array,
-    title: nodeOrStringProptype()
-  }
-
-  render () {
-    const { activeStep, byline, className, description, isSubTitle, steps, title } = this.props;
-
-    if (!title && !steps) {
-      return null;
-    }
-
-    return (
-      <div
-        className={
-          [
-            isSubTitle
-              ? styles.subtitle
-              : styles.title,
-            className
-          ].join(' ')
-        }
-      >
-        <ContainerTitle
-          byline={ byline }
-          description={ description }
-          title={
-            steps
-              ? steps[activeStep || 0]
-              : title
-          }
-        />
-        { this.renderSteps() }
-        { this.renderWaiting() }
-      </div>
-    );
-  }
-
-  renderSteps () {
-    const { activeStep, steps } = this.props;
-
-    if (!steps || steps.length < 2) {
-      return;
-    }
-
-    return (
-      <div className={ styles.steps }>
-        <Stepper activeStep={ activeStep }>
-          { this.renderTimeline() }
-        </Stepper>
-      </div>
-    );
-  }
-
-  renderTimeline () {
-    const { steps } = this.props;
-
-    return steps.map((label, index) => {
-      return (
-        <Step key={ label.key || index }>
-          <StepLabel>
-            { label }
-          </StepLabel>
-        </Step>
-      );
-    });
-  }
-
-  renderWaiting () {
-    const { activeStep, busy, busySteps } = this.props;
-    const isWaiting = busy || (busySteps || []).includes(activeStep);
-
-    if (!isWaiting) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.waiting }>
-        <LinearProgress />
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/Title/title.spec.js b/js/src/ui/Title/title.spec.js
deleted file mode 100644
index 38a23d4cb8b99d2d874d62de1fb6974a4f595e9a..0000000000000000000000000000000000000000
--- a/js/src/ui/Title/title.spec.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import Title from './';
-
-let component;
-let instance;
-
-function render (props = {}) {
-  component = shallow(
-    <Title
-      activeStep={ 0 }
-      byline='testByline'
-      className='testClass'
-      description='testDescription'
-      title='testTitle'
-      { ...props }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('ui/Title', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('instance methods', () => {
-    describe('renderSteps', () => {
-      let stepper;
-
-      beforeEach(() => {
-        render({ steps: ['stepA', 'stepB'] });
-        stepper = shallow(instance.renderSteps());
-      });
-
-      it('renders the Stepper', () => {
-        expect(stepper.find('Stepper').get(0)).to.be.ok;
-      });
-    });
-
-    describe('renderTimeline', () => {
-      let steps;
-
-      beforeEach(() => {
-        render({ steps: ['stepA', 'StepB'] });
-        steps = instance.renderTimeline();
-      });
-
-      it('renders the Step', () => {
-        expect(steps.length).to.equal(2);
-      });
-    });
-
-    describe('renderWaiting', () => {
-      let waiting;
-
-      beforeEach(() => {
-        render({ busy: true });
-        waiting = shallow(instance.renderWaiting());
-      });
-
-      it('renders the LinearProgress', () => {
-        expect(waiting.find('LinearProgress').get(0)).to.be.ok;
-      });
-    });
-  });
-});
diff --git a/js/src/ui/TokenImage/index.js b/js/src/ui/TokenImage/index.js
deleted file mode 100644
index f0b2f9d49652517d675d0391531ae1e5f4009bbe..0000000000000000000000000000000000000000
--- a/js/src/ui/TokenImage/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './tokenImage';
diff --git a/js/src/ui/TokenImage/tokenImage.js b/js/src/ui/TokenImage/tokenImage.js
deleted file mode 100644
index e0e66d22b718dfd538b58cc27fd47ee1e3dd018e..0000000000000000000000000000000000000000
--- a/js/src/ui/TokenImage/tokenImage.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import unknownImage from '~/../assets/images/contracts/unknown-64x64.png';
-
-class TokenImage extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  };
-
-  static propTypes = {
-    image: PropTypes.string,
-    token: PropTypes.shape({
-      image: PropTypes.string,
-      address: PropTypes.string
-    }).isRequired
-  };
-
-  render () {
-    const { api } = this.context;
-    const { image, token } = this.props;
-
-    const imageurl = token.image || image;
-    let imagesrc = unknownImage;
-
-    if (imageurl) {
-      const host = /^(\/)?api/.test(imageurl)
-        ? api.dappsUrl
-        : '';
-
-      imagesrc = `${host}${imageurl}`;
-    }
-
-    return (
-      <img
-        src={ imagesrc }
-        alt={ token.name }
-      />
-    );
-  }
-}
-
-function mapStateToProps (iniState) {
-  const { images } = iniState;
-
-  return (_, props) => {
-    const { token } = props;
-
-    return { image: images[token.address] };
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(TokenImage);
diff --git a/js/src/ui/Tooltips/Tooltip/index.js b/js/src/ui/Tooltips/Tooltip/index.js
deleted file mode 100644
index 7128fc336169b291f4faba8b2f11d9bd53d1d9c3..0000000000000000000000000000000000000000
--- a/js/src/ui/Tooltips/Tooltip/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './tooltip';
diff --git a/js/src/ui/Tooltips/Tooltip/tooltip.js b/js/src/ui/Tooltips/Tooltip/tooltip.js
deleted file mode 100644
index af3b5e0b338be5c21c401a12de3c9e518758c5ab..0000000000000000000000000000000000000000
--- a/js/src/ui/Tooltips/Tooltip/tooltip.js
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { FlatButton } from 'material-ui';
-
-import { CancelIcon, DoneIcon, NextIcon } from '~/ui/Icons';
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import { newTooltip, nextTooltip, closeTooltips } from '../actions';
-
-import styles from '../tooltips.css';
-
-let tooltipId = 0;
-
-class Tooltip extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    currentId: PropTypes.number,
-    maxId: PropTypes.number,
-    onNewTooltip: PropTypes.func,
-    onNextTooltip: PropTypes.func,
-    onCloseTooltips: PropTypes.func,
-    right: PropTypes.bool,
-    text: nodeOrStringProptype(),
-    title: nodeOrStringProptype()
-  }
-
-  state = {
-    id: tooltipId
-  }
-
-  componentWillMount () {
-    const { onNewTooltip } = this.props;
-
-    onNewTooltip(tooltipId);
-    tooltipId++;
-  }
-
-  render () {
-    const { id } = this.state;
-    const { className, currentId, maxId, right, onCloseTooltips, onNextTooltip, text, title } = this.props;
-
-    if (id !== currentId) {
-      return null;
-    }
-
-    const buttons = id !== maxId
-      ? [
-        <FlatButton
-          icon={ <CancelIcon /> }
-          key='skipButton'
-          label={
-            <FormattedMessage
-              id='ui.tooltips.button.skip'
-              defaultMessage='Skip'
-            />
-          }
-          onTouchTap={ onCloseTooltips }
-        />,
-        <FlatButton
-          icon={ <NextIcon /> }
-          key='nextButton'
-          label={
-            <FormattedMessage
-              id='ui.tooltips.button.next'
-              defaultMessage='Next'
-            />
-          }
-          onTouchTap={ onNextTooltip }
-        />
-      ] : (
-        <FlatButton
-          icon={ <DoneIcon /> }
-          label={
-            <FormattedMessage
-              id='ui.tooltips.button.done'
-              defaultMessage='Done'
-            />
-          }
-          onTouchTap={ onCloseTooltips }
-        />
-      );
-
-    return (
-      <div
-        className={
-          [
-            styles.box,
-            right
-              ? styles.arrowRight
-              : styles.arrowLeft,
-            className
-          ].join(' ')
-        }
-      >
-        <div className={ styles.title }>
-          { title }
-        </div>
-        <div className={ styles.text }>
-          { text }
-        </div>
-        <div className={ styles.buttons }>
-          { buttons }
-        </div>
-      </div>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { currentId, maxId } = state.tooltip;
-
-  return {
-    currentId,
-    maxId
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    onNewTooltip: newTooltip,
-    onNextTooltip: nextTooltip,
-    onCloseTooltips: closeTooltips
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Tooltip);
diff --git a/js/src/ui/Tooltips/Tooltip/tooltip.spec.js b/js/src/ui/Tooltips/Tooltip/tooltip.spec.js
deleted file mode 100644
index 57e820c967be92d65e50adc8ef224fc33de85544..0000000000000000000000000000000000000000
--- a/js/src/ui/Tooltips/Tooltip/tooltip.spec.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-import sinon from 'sinon';
-
-import Tooltip from './';
-
-let component;
-let store;
-
-function createRedux (currentId = 0) {
-  store = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        tooltip: {
-          currentId,
-          maxId: 2
-        }
-      };
-    }
-  };
-
-  return store;
-}
-
-function render () {
-  component = shallow(
-    <Tooltip />,
-    {
-      context: {
-        store: createRedux()
-      }
-    }
-  ).find('Tooltip').shallow();
-
-  return component;
-}
-
-describe('ui/Tooltips/Tooltip', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component.get(0)).to.be.ok;
-  });
-
-  it('renders null when id !== currentId', () => {
-    expect(render(1).get(0)).to.be.null;
-  });
-});
diff --git a/js/src/ui/Tooltips/actions.js b/js/src/ui/Tooltips/actions.js
deleted file mode 100644
index 13fa0172c26c0796bed5ae3258e89d79aa74514a..0000000000000000000000000000000000000000
--- a/js/src/ui/Tooltips/actions.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function newTooltip (newId) {
-  return {
-    type: 'newTooltip',
-    newId
-  };
-}
-
-export function nextTooltip () {
-  return {
-    type: 'nextTooltip'
-  };
-}
-
-export function closeTooltips () {
-  return {
-    type: 'closeTooltips'
-  };
-}
diff --git a/js/src/ui/Tooltips/index.js b/js/src/ui/Tooltips/index.js
deleted file mode 100644
index 8918ce14c061680dad14a0b5391f99039bd98aef..0000000000000000000000000000000000000000
--- a/js/src/ui/Tooltips/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './tooltips';
-
-export Tooltip from './Tooltip';
-export tooltipReducer from './reducers';
diff --git a/js/src/ui/Tooltips/reducers.js b/js/src/ui/Tooltips/reducers.js
deleted file mode 100644
index 4a294dc4fe8e545e5df1386a0702b9877c7dedd4..0000000000000000000000000000000000000000
--- a/js/src/ui/Tooltips/reducers.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import store from 'store';
-
-const LS_KEY = 'tooltips';
-
-let currentId = -1;
-let maxId = 0;
-
-function closeTooltips (state, action) {
-  store.set(LS_KEY, '{"state":"off"}');
-
-  currentId = -1;
-
-  return Object.assign({}, state, {
-    currentId
-  });
-}
-
-function newTooltip (state, action) {
-  const { newId } = action;
-
-  maxId = Math.max(newId, maxId);
-
-  return Object.assign({}, state, {
-    currentId,
-    maxId
-  });
-}
-
-function nextTooltip (state, action) {
-  const hideTips = store.get(LS_KEY);
-
-  currentId = hideTips
-    ? -1
-    : currentId + 1;
-
-  return Object.assign({}, state, {
-    currentId
-  });
-}
-
-export default function tooltipReducer (state = {}, action) {
-  switch (action.type) {
-    case 'newTooltip':
-      return newTooltip(state, action);
-
-    case 'nextTooltip':
-      return nextTooltip(state, action);
-
-    case 'closeTooltips':
-      return closeTooltips(state, action);
-
-    default:
-      return state;
-  }
-}
diff --git a/js/src/ui/Tooltips/tooltips.css b/js/src/ui/Tooltips/tooltips.css
deleted file mode 100644
index 940587da7e4256095be48ebab156ddff99572c32..0000000000000000000000000000000000000000
--- a/js/src/ui/Tooltips/tooltips.css
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.container {
-  height: 100%;
-  width: 100%;
-}
-
-.overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  background: rgba(0, 0, 0, 0.25);
-  z-index: 499;
-}
-
-.box {
-  position: absolute;
-  background: #663600; /* rgba(48, 48, 48, 0.95); #88b7d5; */
-  border: 4px solid #f80; /* #c2e1f5; */
-  max-width: 450px;
-  border-radius: 0.5em;
-  z-index: 500;
-  opacity: 1;
-  line-height: 1.618em;
-  white-space: normal;
-  opacity: 0.95;
-}
-
-.box:after, .box:before {
-  bottom: 100%;
-  border: solid transparent;
-  content: " ";
-  height: 0;
-  width: 0;
-  position: absolute;
-  pointer-events: none;
-}
-
-.box:after {
-  border-color: rgba(136, 183, 213, 0);
-  border-bottom-color: #663600; /* rgba(48, 48, 48, 0.95); #88b7d5; */
-  border-width: 20px;
-}
-
-.box:before {
-  border-color: rgba(194, 225, 245, 0);
-  border-bottom-color: #f80; /* #c2e1f5; */
-  border-width: 26px;
-}
-
-.arrowLeft:after, .arrowLeft:before {
-  left: 15%;
-}
-
-.arrowLeft:after {
-  margin-left: -20px;
-}
-
-.arrowLeft:before {
-  margin-left: -26px;
-}
-
-.arrowRight:after, .arrowRight:before {
-  right: 15%;
-}
-
-.arrowRight:after {
-  margin-right: -20px;
-}
-
-.arrowRight:before {
-  margin-right: -26px;
-}
-
-.title {
-  text-transform: uppercase;
-}
-
-.text {
-  padding: 1em;
-}
-
-.buttons {
-  margin: 0;
-  padding: 0 0.5em 0.5em 0;
-  text-align: right;
-}
diff --git a/js/src/ui/Tooltips/tooltips.js b/js/src/ui/Tooltips/tooltips.js
deleted file mode 100644
index 0647cae37b3eea4961a6409c87e47e5879972c93..0000000000000000000000000000000000000000
--- a/js/src/ui/Tooltips/tooltips.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { nextTooltip } from './actions';
-
-import styles from './tooltips.css';
-
-class Tooltips extends Component {
-  static contextTypes = {
-    router: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    currentId: PropTypes.number,
-    onNextTooltip: PropTypes.func
-  }
-
-  componentDidMount () {
-    const { onNextTooltip } = this.props;
-
-    onNextTooltip();
-    this.redirect();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (nextProps.currentId !== this.props.currentId) {
-      this.redirect(nextProps);
-    }
-  }
-
-  redirect (props = this.props) {
-    const { currentId } = props;
-
-    if (currentId !== undefined && currentId !== -1) {
-      const viewLink = '/accounts/';
-
-      this.context.router.push(viewLink);
-    }
-  }
-
-  render () {
-    const { currentId } = this.props;
-
-    if (currentId === -1) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.overlay } />
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { currentId } = state.tooltip;
-
-  return {
-    currentId
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    onNextTooltip: nextTooltip
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Tooltips);
diff --git a/js/src/ui/Tooltips/tooltips.spec.js b/js/src/ui/Tooltips/tooltips.spec.js
deleted file mode 100644
index b52153f8ee27ef76e8862bf121d9991a034f224c..0000000000000000000000000000000000000000
--- a/js/src/ui/Tooltips/tooltips.spec.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import Tooltips from './';
-
-let component;
-let router;
-let store;
-
-function createRedux () {
-  store = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        tooltip: {
-          currentId: 1
-        }
-      };
-    }
-  };
-
-  return store;
-}
-
-function createRouter () {
-  router = {
-    push: sinon.stub()
-  };
-
-  return router;
-}
-
-function render () {
-  component = shallow(
-    <Tooltips />,
-    {
-      context: {
-        store: createRedux()
-      }
-    }
-  ).find('Tooltips').shallow({
-    context: {
-      router: createRouter()
-    }
-  });
-
-  return component;
-}
-
-describe('ui/Tooltips', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component.get(0)).to.be.ok;
-  });
-});
diff --git a/js/src/ui/TxHash/index.js b/js/src/ui/TxHash/index.js
deleted file mode 100644
index e7402ed90883fead5901f74a1a0a5bd052b13abf..0000000000000000000000000000000000000000
--- a/js/src/ui/TxHash/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './txHash';
diff --git a/js/src/ui/TxHash/txHash.css b/js/src/ui/TxHash/txHash.css
deleted file mode 100644
index c753f6127cc459c3ef4cb2678cb431fe3ff43bb6..0000000000000000000000000000000000000000
--- a/js/src/ui/TxHash/txHash.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.hash {
-  padding-top: 1em;
-  word-break: break-all;
-}
-
-.confirm {
-  opacity: 0.5;
-}
-
-.progressbar {
-  margin: 0.5em 0 !important;
-  width: 30% !important;
-  min-width: 220px;
-  display: inline-block !important;
-  height: 0.75em !important;
-}
-
-.progressinfo {
-  text-align: center;
-}
diff --git a/js/src/ui/TxHash/txHash.js b/js/src/ui/TxHash/txHash.js
deleted file mode 100644
index c53ece870160d31eb5fcb8024d5b8db1ed38721e..0000000000000000000000000000000000000000
--- a/js/src/ui/TxHash/txHash.js
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { LinearProgress } from 'material-ui';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import { txLink } from '~/3rdparty/etherscan/links';
-import Warning from '~/ui/Warning';
-import { DEFAULT_GAS } from '~/util/constants';
-
-import ShortenedHash from '../ShortenedHash';
-import styles from './txHash.css';
-
-class TxHash extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    hash: PropTypes.string.isRequired,
-    maxConfirmations: PropTypes.number,
-    netVersion: PropTypes.string.isRequired,
-    summary: PropTypes.bool
-  }
-
-  static defaultProps = {
-    maxConfirmations: 10
-  };
-
-  state = {
-    blockNumber: new BigNumber(0),
-    isRecipientContract: false,
-    subscriptionId: null,
-    transaction: null,
-    transactionReceipt: null
-  }
-
-  componentWillMount () {
-    this.fetchTransaction();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const prevHash = this.props.hash;
-    const nextHash = nextProps.hash;
-
-    if (prevHash !== nextHash) {
-      this.fetchTransaction(nextProps);
-    }
-  }
-
-  /**
-   * Get the sent transaction data
-   */
-  fetchTransaction (props = this.props) {
-    const { hash } = props;
-
-    if (!hash) {
-      return;
-    }
-
-    this.context.api.eth
-      .getTransactionByHash(hash)
-      .then((transaction) => {
-        this.setState({ transaction });
-
-        return this.fetchRecipientCode(transaction);
-      });
-  }
-
-  fetchRecipientCode (transaction) {
-    if (!transaction || !transaction.to) {
-      return;
-    }
-
-    this.context.api.eth
-      .getCode(transaction.to)
-      .then((code) => {
-        const isRecipientContract = code && !/^(0x)?0*$/.test(code);
-
-        this.setState({ isRecipientContract });
-      })
-      .catch((error) => {
-        console.error('fetchRecipientCode', error);
-      });
-  }
-
-  componentDidMount () {
-    const { api } = this.context;
-
-    return api.subscribe('eth_blockNumber', this.onBlockNumber).then((subscriptionId) => {
-      this.setState({ subscriptionId });
-    });
-  }
-
-  componentWillUnmount () {
-    const { api } = this.context;
-    const { subscriptionId } = this.state;
-
-    return api.unsubscribe(subscriptionId);
-  }
-
-  render () {
-    const { hash, netVersion, summary } = this.props;
-
-    const hashLink = (
-      <a href={ txLink(hash, false, netVersion) } target='_blank'>
-        <ShortenedHash data={ hash } />
-      </a>
-    );
-
-    return (
-      <div>
-        { this.renderWarning() }
-        <p>{
-          summary
-            ? hashLink
-            : <FormattedMessage
-              id='ui.txHash.posted'
-              defaultMessage='The transaction has been posted to the network with a hash of {hashLink}'
-              values={ { hashLink } }
-              />
-        }</p>
-        { this.renderConfirmations() }
-      </div>
-    );
-  }
-
-  renderWarning () {
-    const { isRecipientContract, transaction, transactionReceipt } = this.state;
-
-    if (!(transactionReceipt && transactionReceipt.blockNumber && transactionReceipt.blockNumber.gt(0))) {
-      return null;
-    }
-
-    const { gas, input } = transaction;
-    const { gasUsed = new BigNumber(0) } = transactionReceipt;
-
-    const isOog = gasUsed.gte(gas);
-
-    // Skip OOG check if a simple transaction to a non-contract account
-    // @see: https://github.com/paritytech/parity/issues/4550
-    const skipOogCheck = gasUsed.eq(DEFAULT_GAS) && (!input || input === '0x') && !isRecipientContract;
-
-    if (!isOog || skipOogCheck) {
-      return null;
-    }
-
-    return (
-      <Warning
-        warning={
-          <FormattedMessage
-            id='ui.txHash.oog'
-            defaultMessage='The transaction might have gone out of gas. Try again with more gas.'
-          />
-        }
-      />
-    );
-  }
-
-  renderConfirmations () {
-    const { maxConfirmations } = this.props;
-    const { blockNumber, transactionReceipt } = this.state;
-
-    if (!(transactionReceipt && transactionReceipt.blockNumber && transactionReceipt.blockNumber.gt(0))) {
-      return (
-        <div className={ styles.confirm }>
-          <LinearProgress
-            className={ styles.progressbar }
-            color='white'
-            mode='indeterminate'
-          />
-          <div className={ styles.progressinfo }>
-            <FormattedMessage
-              id='ui.txHash.waiting'
-              defaultMessage='waiting for confirmations'
-            />
-          </div>
-        </div>
-      );
-    }
-
-    const confirmations = blockNumber.minus(transactionReceipt.blockNumber).plus(1);
-    const value = Math.min(confirmations.toNumber(), maxConfirmations);
-
-    let count = confirmations.toFormat(0);
-
-    if (confirmations.lte(maxConfirmations)) {
-      count = `${count}/${maxConfirmations}`;
-    }
-
-    return (
-      <div className={ styles.confirm }>
-        <LinearProgress
-          className={ styles.progressbar }
-          min={ 0 }
-          max={ maxConfirmations }
-          value={ value }
-          color='white'
-          mode='determinate'
-        />
-        <div className={ styles.progressinfo }>
-          <abbr title={ `block #${blockNumber.toFormat(0)}` }>
-            <FormattedMessage
-              id='ui.txHash.confirmations'
-              defaultMessage='{count} {value, plural, one {confirmation} other {confirmations}}'
-              values={ {
-                count,
-                value
-              } }
-            />
-          </abbr>
-        </div>
-      </div>
-    );
-  }
-
-  onBlockNumber = (error, blockNumber) => {
-    const { api } = this.context;
-    const { hash } = this.props;
-
-    const nextState = { blockNumber };
-
-    if (error || !hash || /^(0x)?0*$/.test(hash)) {
-      return this.setState(nextState);
-    }
-
-    return api.eth
-      .getTransactionReceipt(hash)
-      .then((transactionReceipt) => {
-        nextState.transactionReceipt = transactionReceipt;
-      })
-      .catch((error) => {
-        console.error('onBlockNumber', error);
-      })
-      .then(() => {
-        this.setState(nextState);
-      });
-  }
-}
-
-function mapStateToProps (state) {
-  const { netVersion } = state.nodeStatus;
-
-  return {
-    netVersion
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(TxHash);
diff --git a/js/src/ui/TxHash/txHash.spec.js b/js/src/ui/TxHash/txHash.spec.js
deleted file mode 100644
index 8e44c7e57806d611e93065241a996f8d7e9ee6d7..0000000000000000000000000000000000000000
--- a/js/src/ui/TxHash/txHash.spec.js
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import TxHash from './';
-
-const TXHASH = '0xabcdef123454321abcdef';
-
-let api;
-let blockNumber;
-let callback;
-let component;
-let instance;
-
-function createApi () {
-  blockNumber = new BigNumber(100);
-  api = {
-    eth: {
-      getTransactionByHash: (hash) => {
-        return Promise.resolve({
-          blockNumber: new BigNumber(100),
-          gas: new BigNumber(42000)
-        });
-      },
-      getTransactionReceipt: (hash) => {
-        return Promise.resolve({
-          blockNumber: new BigNumber(100),
-          transactionHash: hash,
-          gasUsed: new BigNumber(42000)
-        });
-      }
-    },
-    nextBlock: (increment = 1) => {
-      blockNumber = blockNumber.plus(increment);
-      return callback(null, blockNumber);
-    },
-    subscribe: (type, _callback) => {
-      callback = _callback;
-      return callback(null, blockNumber).then(() => {
-        return Promise.resolve(1);
-      });
-    },
-    unsubscribe: sinon.stub().resolves(true)
-  };
-
-  return api;
-}
-
-function createRedux () {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        nodeStatus: {
-          netVersion: '42'
-        }
-      };
-    }
-  };
-}
-
-function render (props) {
-  const baseComponent = shallow(
-    <TxHash
-      hash={ TXHASH }
-      { ...props }
-    />,
-    { context: { store: createRedux() } }
-  );
-
-  component = baseComponent.find('TxHash').shallow({ context: { api: createApi() } });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('ui/TxHash', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('renders the summary', () => {
-    expect(component.find('p').find('FormattedMessage').props().id).to.equal('ui.txHash.posted');
-  });
-
-  describe('renderConfirmations', () => {
-    describe('with no transaction retrieved', () => {
-      let child;
-
-      beforeEach(() => {
-        child = shallow(instance.renderConfirmations());
-      });
-
-      it('renders indeterminate progressbar', () => {
-        expect(child.find('LinearProgress[mode="indeterminate"]')).to.have.length(1);
-      });
-
-      it('renders waiting text', () => {
-        expect(child.find('FormattedMessage').props().id).to.equal('ui.txHash.waiting');
-      });
-    });
-
-    describe('with transaction retrieved', () => {
-      let child;
-
-      beforeEach(() => {
-        return instance.componentDidMount().then(() => {
-          child = shallow(instance.renderConfirmations());
-        });
-      });
-
-      it('renders determinate progressbar', () => {
-        expect(child.find('LinearProgress[mode="determinate"]')).to.have.length(1);
-      });
-
-      it('renders confirmation text', () => {
-        expect(child.find('FormattedMessage').props().id).to.equal('ui.txHash.confirmations');
-      });
-
-      it('renders with warnings', () => {
-        expect(component.find('Warning')).to.have.length.gte(1);
-      });
-
-      it('renders with oog warning', () => {
-        expect(component.find('Warning').shallow().find('FormattedMessage').prop('id')).to.match(/oog/);
-      });
-    });
-  });
-});
diff --git a/js/src/ui/TxList/TxRow/index.js b/js/src/ui/TxList/TxRow/index.js
deleted file mode 100644
index a1591a75f7f14ee70170c9883504602aa6f70d60..0000000000000000000000000000000000000000
--- a/js/src/ui/TxList/TxRow/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './txRow';
diff --git a/js/src/ui/TxList/TxRow/txRow.js b/js/src/ui/TxList/TxRow/txRow.js
deleted file mode 100644
index a28736ddbd7a04714bee5b77d5a8546cceb7a282..0000000000000000000000000000000000000000
--- a/js/src/ui/TxList/TxRow/txRow.js
+++ /dev/null
@@ -1,429 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import moment from 'moment';
-import dateDifference from 'date-difference';
-import { FormattedMessage } from 'react-intl';
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { Link } from 'react-router';
-
-import { txLink } from '~/3rdparty/etherscan/links';
-
-import IdentityIcon from '~/ui/IdentityIcon';
-import IdentityName from '~/ui/IdentityName';
-import MethodDecoding from '~/ui/MethodDecoding';
-import MethodDecodingStore from '~/ui/MethodDecoding/methodDecodingStore';
-
-import styles from '../txList.css';
-
-class TxRow extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accountAddresses: PropTypes.array.isRequired,
-    address: PropTypes.string.isRequired,
-    blockNumber: PropTypes.object,
-    contractAddresses: PropTypes.array.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    tx: PropTypes.object.isRequired,
-
-    block: PropTypes.object,
-    className: PropTypes.string,
-    cancelTransaction: PropTypes.func,
-    editTransaction: PropTypes.func,
-    historic: PropTypes.bool,
-    killTransaction: PropTypes.func
-  };
-
-  static defaultProps = {
-    historic: true
-  };
-
-  state = {
-    isCancelOpen: false,
-    isEditOpen: false,
-    canceled: false,
-    editing: false,
-    isContract: false,
-    isDeploy: false
-  };
-
-  methodDecodingStore = MethodDecodingStore.get(this.context.api);
-
-  componentWillMount () {
-    const { address, tx } = this.props;
-
-    this
-      .methodDecodingStore
-      .lookup(address, tx)
-      .then((lookup) => {
-        const newState = {
-          isContract: lookup.contract,
-          isDeploy: lookup.deploy
-        };
-
-        this.setState(newState);
-      });
-  }
-
-  render () {
-    const { address, className, historic, netVersion, tx } = this.props;
-
-    return (
-      <tr className={ className || '' }>
-        { this.renderBlockNumber(tx.blockNumber) }
-        { this.renderAddress(tx.from, false) }
-        <td className={ styles.transaction }>
-          { this.renderEtherValue(tx.value) }
-          <div>⇒</div>
-          <div>
-            <a
-              className={ styles.link }
-              href={ txLink(tx.hash, false, netVersion) }
-              target='_blank'
-            >
-              { `${tx.hash.substr(2, 6)}...${tx.hash.slice(-6)}` }
-            </a>
-          </div>
-        </td>
-        { this.renderAddress(tx.to || tx.creates, !!tx.creates) }
-        <td className={ styles.method }>
-          <MethodDecoding
-            historic={ historic }
-            address={ address }
-            transaction={ tx }
-          />
-        </td>
-      </tr>
-    );
-  }
-
-  renderAddress (address, isDeploy = false) {
-    const isKnownContract = this.getIsKnownContract(address);
-    let esLink = null;
-
-    if (address && (!isDeploy || isKnownContract)) {
-      esLink = (
-        <Link
-          activeClassName={ styles.currentLink }
-          className={ styles.link }
-          to={ this.addressLink(address) }
-        >
-          <IdentityName
-            address={ address }
-            shorten
-          />
-        </Link>
-      );
-    }
-
-    return (
-      <td className={ styles.address }>
-        <div className={ styles.center }>
-          <IdentityIcon
-            center
-            className={ styles.icon }
-            address={ (!isDeploy || isKnownContract) ? address : '' }
-          />
-        </div>
-        <div className={ styles.center }>
-          { esLink || 'DEPLOY' }
-        </div>
-      </td>
-    );
-  }
-
-  renderEtherValue (_value) {
-    const { api } = this.context;
-    const { isContract, isDeploy } = this.state;
-
-    // Always show the value if ETH transfer, ie. not
-    // a contract or a deployment
-    const fullValue = !(isContract || isDeploy);
-    const value = api.util.fromWei(_value);
-
-    if (value.eq(0) && !fullValue) {
-      return <div className={ styles.value }>{ ' ' }</div>;
-    }
-
-    return (
-      <div className={ styles.value }>
-        { value.toFormat(5) }<small>ETH</small>
-      </div>
-    );
-  }
-
-  renderBlockNumber (_blockNumber) {
-    const { block } = this.props;
-    const blockNumber = _blockNumber.toNumber();
-
-    return (
-      <td className={ styles.timestamp }>
-        <div>{ blockNumber && block ? moment(block.timestamp).fromNow() : null }</div>
-        <div>{ blockNumber ? _blockNumber.toFormat() : this.renderCancelToggle() }</div>
-      </td>
-    );
-  }
-
-  renderCancelToggle () {
-    const { canceled, editing, isCancelOpen, isEditOpen } = this.state;
-
-    if (canceled) {
-      return (
-        <div className={ styles.pending }>
-          <FormattedMessage
-            lassName={ styles.uppercase }
-            id='ui.txList.txRow.canceled'
-            defaultMessage='Canceled'
-          />
-        </div>
-      );
-    }
-
-    if (editing) {
-      return (
-        <div className={ styles.pending }>
-          <div className={ styles.uppercase }>
-            <FormattedMessage
-              id='ui.txList.txRow.editing'
-              defaultMessage='Editing'
-            />
-          </div>
-        </div>
-      );
-    }
-
-    if (!isCancelOpen && !isEditOpen) {
-      const pendingStatus = this.getCondition();
-      const isPending = pendingStatus === 'pending';
-
-      return (
-        <div className={ styles.pending }>
-          {
-            isPending
-            ? (
-              <div className={ styles.pending }>
-                <div />
-                <div className={ styles.uppercase }>
-                  <FormattedMessage
-                    id='ui.txList.txRow.submitting'
-                    defaultMessage='Pending'
-                  />
-                </div>
-              </div>
-            ) : (
-              <div>
-                <span>
-                  { pendingStatus }
-                </span>
-                <div className={ styles.uppercase }>
-                  <FormattedMessage
-                    id='ui.txList.txRow.scheduled'
-                    defaultMessage='Scheduled'
-                  />
-                </div>
-              </div>
-            )
-          }
-          <a onClick={ this.setEdit } className={ styles.uppercase }>
-            <FormattedMessage
-              id='ui.txList.txRow.edit'
-              defaultMessage='Edit'
-            />
-          </a>
-          <span>{' | '}</span>
-          <a onClick={ this.setCancel } className={ styles.uppercase }>
-            <FormattedMessage
-              id='ui.txList.txRow.cancel'
-              defaultMessage='Cancel'
-            />
-          </a>
-          { isPending
-            ? (
-              <div>
-                <FormattedMessage
-                  id='ui.txList.txRow.cancelWarning'
-                  defaultMessage='Warning: Editing or Canceling the transaction may not succeed!'
-                />
-              </div>
-            ) : null
-          }
-        </div>
-      );
-    }
-
-    let which;
-
-    if (isCancelOpen) {
-      which = (
-        <FormattedMessage
-          id='ui.txList.txRow.verify.cancelEditCancel'
-          defaultMessage='Cancel'
-        />
-      );
-    } else {
-      which = (
-        <FormattedMessage
-          id='ui.txList.txRow.verify.cancelEditEdit'
-          defaultMessage='Edit'
-        />
-      );
-    }
-
-    return (
-      <div className={ styles.pending }>
-        <div />
-        <div className={ styles.uppercase }>
-          <FormattedMessage
-            id='ui.txList.txRow.verify'
-            defaultMessage='Are you sure?'
-          />
-        </div>
-        <a onClick={ (isCancelOpen) ? this.cancelTx : this.editTx }>
-          { which }
-        </a>
-        <span>{' | '}</span>
-        <a onClick={ this.revertEditCancel }>
-          <FormattedMessage
-            id='ui.txList.txRow.verify.nevermind'
-            defaultMessage='Nevermind'
-          />
-        </a>
-      </div>
-    );
-  }
-
-  getIsKnownContract (address) {
-    const { contractAddresses } = this.props;
-
-    return contractAddresses
-      .map((a) => a.toLowerCase())
-      .includes(address.toLowerCase());
-  }
-
-  addressLink (address) {
-    const { accountAddresses } = this.props;
-    const isAccount = accountAddresses.includes(address);
-    const isContract = this.getIsKnownContract(address);
-
-    if (isContract) {
-      return `/contracts/${address}`;
-    }
-
-    if (isAccount) {
-      return `/accounts/${address}`;
-    }
-
-    return `/addresses/${address}`;
-  }
-
-  getCondition = () => {
-    const { blockNumber, tx } = this.props;
-    let { time, block = 0 } = tx.condition || {};
-
-    if (time) {
-      if ((time.getTime() - Date.now()) >= 0) {
-        return (
-          <FormattedMessage
-            id='ui.txList.txRow.pendingStatus.time'
-            defaultMessage='{time} left'
-            values={ {
-              time: dateDifference(new Date(), time, { compact: true })
-            } }
-          />
-        );
-      }
-    }
-
-    if (blockNumber) {
-      block = blockNumber.minus(block);
-      if (block.toNumber() < 0) {
-        return (
-          <FormattedMessage
-            id='ui.txList.txRow.pendingStatus.blocksLeft'
-            defaultMessage='{blockNumber} blocks left'
-            values={ {
-              blockNumber: block.abs().toFormat(0)
-            } }
-          />
-        );
-      }
-    }
-
-    return 'pending';
-  }
-
-  killTx = () => {
-    const { killTransaction, tx } = this.props;
-
-    killTransaction(this, tx);
-  }
-
-  cancelTx = () => {
-    const { cancelTransaction, tx } = this.props;
-    const pendingStatus = this.getCondition();
-    const isPending = pendingStatus === 'pending';
-
-    if (isPending) {
-      this.killTx();
-      return;
-    }
-
-    cancelTransaction(this, tx);
-  }
-
-  editTx = () => {
-    const { editTransaction, tx } = this.props;
-
-    editTransaction(this, tx);
-  }
-
-  setCancel = () => {
-    this.setState({ isCancelOpen: true });
-  }
-
-  setEdit = () => {
-    this.setState({ isEditOpen: true });
-  }
-
-  revertEditCancel = () => {
-    this.setState({ isCancelOpen: false, isEditOpen: false });
-  }
-}
-
-function mapStateToProps (initState) {
-  const { accounts, contracts } = initState.personal;
-  const accountAddresses = Object.keys(accounts);
-  const contractAddresses = Object.keys(contracts);
-
-  return (state) => {
-    const { netVersion } = state.nodeStatus;
-
-    return {
-      accountAddresses,
-      contractAddresses,
-      netVersion
-    };
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(TxRow);
diff --git a/js/src/ui/TxList/TxRow/txRow.spec.js b/js/src/ui/TxList/TxRow/txRow.spec.js
deleted file mode 100644
index 9ff5ffbe312d95aee88b273d6bdf8c81b230f54a..0000000000000000000000000000000000000000
--- a/js/src/ui/TxList/TxRow/txRow.spec.js
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import React from 'react';
-import { shallow } from 'enzyme';
-import sinon from 'sinon';
-
-import Api from '~/api';
-
-import TxRow from './txRow';
-
-const api = new Api({ execute: sinon.stub() });
-
-const STORE = {
-  dispatch: sinon.stub(),
-  subscribe: sinon.stub(),
-  getState: () => {
-    return {
-      nodeStatus: {
-        netVersion: '42'
-      },
-      personal: {
-        accounts: {
-          '0x123': {
-            address: '0x123'
-          }
-        },
-        contracts: {
-          '0x999': {
-            address: '0x999'
-          }
-        }
-      }
-    };
-  }
-};
-
-function render (props) {
-  return shallow(
-    <TxRow
-      store={ STORE }
-      { ...props }
-    />,
-    { context: { api } }
-  ).find('TxRow').shallow({ context: { api } });
-}
-
-describe('ui/TxList/TxRow', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      const block = {
-        timestamp: new Date()
-      };
-      const tx = {
-        blockNumber: new BigNumber(123),
-        from: '0x234',
-        hash: '0x123456789abcdef0123456789abcdef0123456789abcdef',
-        to: '0x123',
-        value: new BigNumber(1)
-      };
-
-      expect(render({ address: '0x123', block, netVersion: '42', tx })).to.be.ok;
-    });
-
-    it('renders account links', () => {
-      const block = {
-        timestamp: new Date()
-      };
-      const tx = {
-        blockNumber: new BigNumber(123),
-        from: '0x234',
-        hash: '0x123456789abcdef0123456789abcdef0123456789abcdef',
-        to: '0x123',
-        value: new BigNumber(1)
-      };
-
-      const element = render({ address: '0x123', block, netVersion: '42', tx });
-
-      expect(element.find('Link').get(1).props.to).to.equal('/accounts/0x123');
-    });
-
-    it('renders address links', () => {
-      const block = {
-        timestamp: new Date()
-      };
-      const tx = {
-        blockNumber: new BigNumber(123),
-        from: '0x234',
-        hash: '0x123456789abcdef0123456789abcdef0123456789abcdef',
-        to: '0x456',
-        value: new BigNumber(1)
-      };
-
-      const element = render({ address: '0x123', block, netVersion: '42', tx });
-
-      expect(element.find('Link').get(1).props.to).to.equal('/addresses/0x456');
-    });
-
-    it('renders contract links', () => {
-      const block = {
-        timestamp: new Date()
-      };
-      const tx = {
-        blockNumber: new BigNumber(123),
-        from: '0x234',
-        hash: '0x123456789abcdef0123456789abcdef0123456789abcdef',
-        to: '0x999',
-        value: new BigNumber(1)
-      };
-
-      const element = render({ address: '0x123', block, netVersion: '42', tx });
-
-      expect(element.find('Link').get(1).props.to).to.equal('/contracts/0x999');
-    });
-  });
-});
diff --git a/js/src/ui/TxList/index.js b/js/src/ui/TxList/index.js
deleted file mode 100644
index 58d2c2094e02d83f7261cac451ab950ee5133afb..0000000000000000000000000000000000000000
--- a/js/src/ui/TxList/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './txList';
diff --git a/js/src/ui/TxList/store.js b/js/src/ui/TxList/store.js
deleted file mode 100644
index 56f9541de05b322edbbb19ffc69d018237443ce6..0000000000000000000000000000000000000000
--- a/js/src/ui/TxList/store.js
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-import BigNumber from 'bignumber.js';
-
-export default class Store {
-  @observable blocks = {};
-  @observable sortedHashes = [];
-  @observable transactions = {};
-
-  constructor (api, onNewError, hashes) {
-    this._api = api;
-    this._onNewError = onNewError;
-    this.loadTransactions(hashes);
-  }
-
-  @action addHash = (hash) => {
-    if (!this.sortedHashes.includes(hash)) {
-      this.sortedHashes.push(hash);
-      this.sortHashes();
-    }
-  }
-
-  @action removeHash = (hash) => {
-    this.sortedHashes.remove(hash);
-    let tx = this.transactions[hash];
-
-    if (tx) {
-      delete this.transactions[hash];
-      delete this.blocks[tx.blockNumber];
-    }
-    this.sortHashes();
-  }
-
-  containsAll = (arr1, arr2) => {
-    return arr2.every((arr2Item) => arr1.includes(arr2Item));
-  }
-
-  sameHashList = (transactions) => {
-    return this.containsAll(transactions, this.sortedHashes) && this.containsAll(this.sortedHashes, transactions);
-  }
-
-  sortHashes = () => {
-    this.sortedHashes = this.sortedHashes.sort((hashA, hashB) => {
-      const bnA = this.transactions[hashA].blockNumber;
-      const bnB = this.transactions[hashB].blockNumber;
-
-      // 0 is a special case (has not been added to the blockchain yet)
-      if (bnB.eq(0)) {
-        return bnB.eq(bnA) ? 0 : 1;
-      } else if (bnA.eq(0)) {
-        return -1;
-      }
-
-      return bnB.comparedTo(bnA);
-    });
-  }
-
-  loadTransactions (_txhashes) {
-    // Ignore special cases and if the contents of _txhashes && this.sortedHashes are the same
-    if (Array.isArray(_txhashes) || this.sameHashList(_txhashes)) {
-      return;
-    }
-
-    // Remove any tx that are edited/cancelled
-    this.sortedHashes.forEach((hash) => {
-      if (!_txhashes.includes(hash)) {
-        this.removeHash(hash);
-      }
-    });
-
-    // Add any new tx
-    _txhashes.forEach((txhash) => {
-      if (this.sortedHashes.includes(txhash)) {
-        return;
-      }
-
-      this._api.eth
-        .getTransactionByHash(txhash)
-        .then((tx) => {
-          if (!tx) {
-            return;
-          }
-
-          this.transactions[txhash] = tx;
-
-          // If the tx has a blockHash, let's get the blockNumber, otherwise it's ready to be added
-          if (tx.blockHash) {
-            this._api.parity
-              .getBlockHeaderByNumber(tx.blockNumber)
-              .then((block) => {
-                this.blocks[tx.blockNumber] = block;
-                this.addHash(txhash);
-              });
-          } else {
-            this.addHash(txhash);
-          }
-        });
-    });
-  }
-
-  cancelTransaction = (txComponent, tx) => {
-    const { hash } = tx;
-
-    this._api.parity
-      .removeTransaction(hash)
-      .then(() => {
-        txComponent.setState({ canceled: true });
-      })
-      .catch((err) => {
-        this._onNewError({ message: err });
-      });
-  }
-
-  killTransaction = (txComponent, tx) => {
-    const { hash, gasPrice, from } = tx;
-
-    this._api.parity
-      .removeTransaction(hash)
-      .then(() => {
-        return this._api.parity.postTransaction({
-          from: from,
-          to: from,                    // set to owner
-          gas: new BigNumber(21000),   // set default gas
-          gasPrice: gasPrice.times(1.25),   // must be a minimum of 10% growth to be recognized as a replacement by miners (incentive)
-          value: new BigNumber(0),     // zero out the value
-          condition: null,             // ensure to post this instantly
-          data: '0x'
-        });
-      })
-      .then(() => {
-        tx.Component.setState({ canceled: true });
-      })
-      .catch((err) => {
-        this._onNewError({ message: err });
-      });
-  }
-
-  editTransaction = (txComponent, tx) => {
-    const { hash, gas, gasPrice, to, from, value, input, condition } = tx;
-
-    this._api.parity
-      .removeTransaction(hash)
-      .then(() => {
-        return this._api.parity.postTransaction({
-          from,
-          to,
-          gas,
-          gasPrice,
-          value,
-          condition,
-          data: input
-        });
-      })
-      .then(() => {
-        txComponent.setState({ editing: true });
-      })
-      .catch((err) => {
-        this._onNewError({ message: err });
-      });
-  }
-}
diff --git a/js/src/ui/TxList/store.spec.js b/js/src/ui/TxList/store.spec.js
deleted file mode 100644
index 501065b956f8c587353d7c45d9e508eb232645ec..0000000000000000000000000000000000000000
--- a/js/src/ui/TxList/store.spec.js
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import sinon from 'sinon';
-
-import Store from './store';
-
-const SUBID = 123;
-const BLOCKS = {
-  1: { blockhash: '0x1' },
-  2: { blockhash: '0x2' }
-};
-const TRANSACTIONS = {
-  '0x123': { blockNumber: new BigNumber(1) },
-  '0x234': { blockNumber: new BigNumber(0) },
-  '0x345': { blockNumber: new BigNumber(2) },
-  '0x456': { blockNumber: new BigNumber(0) }
-};
-
-describe('ui/TxList/store', () => {
-  let api;
-  let store;
-
-  beforeEach(() => {
-    api = {
-      subscribe: sinon.stub().resolves(SUBID),
-      eth: {
-        getBlockByNumber: (blockNumber) => {
-          return Promise.resolve(BLOCKS[blockNumber]);
-        }
-      }
-    };
-    store = new Store(api, null, []);
-  });
-
-  describe('create', () => {
-    it('has empty storage', () => {
-      expect(store.blocks).to.deep.equal({});
-      expect(store.sortedHashes.peek()).to.deep.equal([]);
-      expect(store.transactions).to.deep.equal({});
-    });
-  });
-
-  describe('addBlocks', () => {
-    beforeEach(() => {
-      Object.keys(BLOCKS)
-        .forEach((blockNumber) => {
-          store.blocks[blockNumber] = BLOCKS[blockNumber];
-        });
-    });
-
-    it('adds the blocks to the list', () => {
-      expect(store.blocks).to.deep.equal(BLOCKS);
-    });
-  });
-
-  describe('addTransactions', () => {
-    beforeEach(() => {
-      Object.keys(TRANSACTIONS)
-        .forEach((hash) => {
-          store.transactions[hash] = TRANSACTIONS[hash];
-          store.addHash(hash);
-        });
-      store.sortHashes();
-    });
-
-    it('adds all transactions to the list', () => {
-      expect(store.transactions).to.deep.equal(TRANSACTIONS);
-    });
-
-    it('sorts transactions based on blockNumber', () => {
-      expect(store.sortedHashes.peek()).to.deep.equal(['0x234', '0x456', '0x345', '0x123']);
-    });
-  });
-});
diff --git a/js/src/ui/TxList/txList.css b/js/src/ui/TxList/txList.css
deleted file mode 100644
index 0bfd898d27b08f637b10b71f16075a102360cd21..0000000000000000000000000000000000000000
--- a/js/src/ui/TxList/txList.css
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.transactions {
-  width: 100%;
-  border-collapse: collapse;
-
-  tr {
-    line-height: 32px;
-    vertical-align: top;
-
-    &:nth-child(even) {
-      background: rgba(255, 255, 255, 0.04);
-    }
-  }
-
-  th {
-    color: #aaa;
-    text-align: center;
-  }
-
-  td {
-    vertical-align: top;
-    padding: 0.75em 0.75em;
-
-    &.method {
-      width: 40%;
-    }
-
-    &.timestamp {
-      max-width: 5em;
-      padding-top: 0.75em;
-      text-align: center;
-      line-height: 1.5em;
-      color: grey;
-    }
-
-    &.transaction {
-      padding-top: 1.5em;
-      text-align: center;
-
-      & div {
-        line-height: 1.25em;
-        min-height: 1.25em;
-      }
-    }
-  }
-
-  .icon {
-    margin: 0;
-  }
-
-  .link {
-    vertical-align: top;
-
-    &.currentLink {
-      color: white;
-      cursor: text;
-    }
-  }
-
-  .right {
-    text-align: right;
-  }
-
-  .center {
-    text-align: center;
-  }
-
-  .left {
-    text-align: left;
-  }
-
-  .pending {
-    padding: 0em;
-  }
-
-  .pending div {
-    padding-bottom: 1.25em;
-  }
-
-  .uppercase {
-    text-transform: uppercase;
-  }
-}
diff --git a/js/src/ui/TxList/txList.js b/js/src/ui/TxList/txList.js
deleted file mode 100644
index eb75e28e3b61cee3c2a8f7628a4fc9729358358c..0000000000000000000000000000000000000000
--- a/js/src/ui/TxList/txList.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import Store from './store';
-import TxRow from './TxRow';
-
-import styles from './txList.css';
-
-@observer
-class TxList extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    hashes: PropTypes.oneOfType([
-      PropTypes.array,
-      PropTypes.object
-    ]).isRequired,
-    blockNumber: PropTypes.object,
-    netVersion: PropTypes.string.isRequired,
-    onNewError: PropTypes.func
-  };
-
-  componentWillMount () {
-    this.store = new Store(this.context.api, this.props.onNewError, this.props.hashes);
-  }
-
-  componentWillReceiveProps (newProps) {
-    this.store.loadTransactions(newProps.hashes);
-  }
-
-  render () {
-    return (
-      <table className={ styles.transactions }>
-        <tbody>
-          { this.renderRows() }
-        </tbody>
-      </table>
-    );
-  }
-
-  renderRows () {
-    const { address, netVersion, blockNumber } = this.props;
-    const { editTransaction, cancelTransaction, killTransaction } = this.store;
-
-    return this.store.sortedHashes.map((txhash) => {
-      const tx = this.store.transactions[txhash];
-      const txBlockNumber = tx.blockNumber.toNumber();
-      const block = this.store.blocks[txBlockNumber];
-
-      return (
-        <TxRow
-          key={ tx.hash }
-          tx={ tx }
-          block={ block }
-          blockNumber={ blockNumber }
-          address={ address }
-          netVersion={ netVersion }
-          editTransaction={ editTransaction }
-          cancelTransaction={ cancelTransaction }
-          killTransaction={ killTransaction }
-        />
-      );
-    });
-  }
-}
-
-function mapStateToProps (state) {
-  const { netVersion } = state.nodeStatus;
-
-  return {
-    netVersion
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(TxList);
diff --git a/js/src/ui/TxList/txList.spec.js b/js/src/ui/TxList/txList.spec.js
deleted file mode 100644
index 58a5237ac6a61bb8f4ea7af983953156af733abc..0000000000000000000000000000000000000000
--- a/js/src/ui/TxList/txList.spec.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-import sinon from 'sinon';
-
-import Api from '~/api';
-
-import TxList from './txList';
-
-const api = new Api({ execute: sinon.stub() });
-
-const STORE = {
-  dispatch: sinon.stub(),
-  subscribe: sinon.stub(),
-  getState: () => {
-    return {
-      nodeStatus: {
-        netVersion: '42'
-      }
-    };
-  }
-};
-
-function render (props) {
-  return shallow(
-    <TxList
-      store={ STORE }
-      { ...props }
-    />,
-    { context: { api } }
-  );
-}
-
-describe('ui/TxList', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(render({ address: '0x123', hashes: [] })).to.be.ok;
-    });
-  });
-});
diff --git a/js/src/ui/VaultCard/Layout/index.js b/js/src/ui/VaultCard/Layout/index.js
deleted file mode 100644
index 997ab2462085a9ed8dc5726e3979df6caa5a1f57..0000000000000000000000000000000000000000
--- a/js/src/ui/VaultCard/Layout/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './layout';
diff --git a/js/src/ui/VaultCard/Layout/layout.css b/js/src/ui/VaultCard/Layout/layout.css
deleted file mode 100644
index 4d593fbdd7446744969ba05f42c2a1244323be0b..0000000000000000000000000000000000000000
--- a/js/src/ui/VaultCard/Layout/layout.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$imageHeight: 56px;
-
-.layout {
-  display: flex;
-  min-height: $imageHeight;
-  overflow: hidden;
-  text-align: left;
-
-  &.border {
-    background: rgba(0, 0, 0, 0.25);
-    padding: 1.5em;
-  }
-
-  .identityIcon {
-    margin-right: 1em;
-    vertical-align: top;
-
-    &.locked {
-      filter: grayscale(100%);
-      opacity: 0.33;
-    }
-  }
-
-  .info {
-    flex: 1;
-    overflow: hidden;
-  }
-}
diff --git a/js/src/ui/VaultCard/Layout/layout.js b/js/src/ui/VaultCard/Layout/layout.js
deleted file mode 100644
index 8ef79579112421f8fb6d5a648b0e1c9ab5d0d5f3..0000000000000000000000000000000000000000
--- a/js/src/ui/VaultCard/Layout/layout.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import Title from '~/ui/Title';
-import IdentityIcon from '~/ui/IdentityIcon';
-
-import styles from './layout.css';
-
-export default class Layout extends Component {
-  static propTypes = {
-    children: PropTypes.node,
-    vault: PropTypes.object.isRequired,
-    withBorder: PropTypes.bool
-  };
-
-  render () {
-    const { children, vault, withBorder } = this.props;
-    const { isOpen, meta, name } = vault;
-
-    return (
-      <div
-        className={
-          [
-            styles.layout,
-            withBorder
-              ? styles.border
-              : null
-          ].join(' ')
-        }
-      >
-        <IdentityIcon
-          address={ name }
-          center
-          className={
-            [
-              styles.identityIcon,
-              isOpen || withBorder
-                ? styles.unlocked
-                : styles.locked
-            ].join(' ')
-          }
-        />
-        <div className={ styles.info }>
-          <Title
-            byline={ meta.description }
-            title={ name }
-          />
-          { children }
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/VaultCard/Layout/layout.spec.js b/js/src/ui/VaultCard/Layout/layout.spec.js
deleted file mode 100644
index f097f7a9bf8b6ea8a6093f9e39ec27e05084939f..0000000000000000000000000000000000000000
--- a/js/src/ui/VaultCard/Layout/layout.spec.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import Layout from './';
-
-const DESCRIPTION = 'some description';
-const NAME = 'testName';
-
-let component;
-
-function render () {
-  component = shallow(
-    <Layout
-      vault={ {
-        isOpen: true,
-        meta: {
-          description: DESCRIPTION,
-          passwordHint: 'some hint'
-        },
-        name: NAME
-      } }
-    />
-  );
-
-  return component;
-}
-
-describe('ui/VaultCard/Layout', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('components', () => {
-    describe('IdentityIcon', () => {
-      let icon;
-
-      beforeEach(() => {
-        icon = component.find('Connect(IdentityIcon)');
-      });
-
-      it('renders', () => {
-        expect(icon.get(0)).to.be.ok;
-      });
-
-      it('passes the name as address key', () => {
-        expect(icon.props().address).to.equal(NAME);
-      });
-    });
-
-    describe('Title', () => {
-      let title;
-
-      beforeEach(() => {
-        title = component.find('Title');
-      });
-
-      it('renders', () => {
-        expect(title.get(0)).to.be.ok;
-      });
-
-      it('passes the name as title', () => {
-        expect(title.props().title).to.equal(NAME);
-      });
-
-      it('passes the description as byline', () => {
-        expect(title.props().byline).to.equal(DESCRIPTION);
-      });
-    });
-  });
-});
diff --git a/js/src/ui/VaultCard/index.js b/js/src/ui/VaultCard/index.js
deleted file mode 100644
index 3cbb730d98e5d1363d26832f629c1b9e0d171f1a..0000000000000000000000000000000000000000
--- a/js/src/ui/VaultCard/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './vaultCard';
diff --git a/js/src/ui/VaultCard/vaultCard.css b/js/src/ui/VaultCard/vaultCard.css
deleted file mode 100644
index b85e962090b567b817ddd77e9438b22a92909503..0000000000000000000000000000000000000000
--- a/js/src/ui/VaultCard/vaultCard.css
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  text-align: left;
-
-  .accounts {
-    display: flex;
-    justify-content: center;
-    flex-wrap: wrap;
-    margin-top: 1.5em;
-
-    .account {
-      margin: 0.5em;
-    }
-  }
-
-  .empty {
-    margin-top: 1.5em;
-    opacity: 0.5;
-    text-align: center;
-  }
-
-  .buttons {
-    margin: -1em -1em 0.75em -1em;
-    text-align: right;
-
-    button.status {
-      min-width: 2em !important;
-    }
-
-    button:not(.status) {
-      display: none !important;
-    }
-  }
-
-  &:hover {
-    .buttons {
-      button.status {
-        display: none !important;
-      }
-
-      button:not(.status) {
-        display: inline-block !important;
-      }
-    }
-  }
-}
diff --git a/js/src/ui/VaultCard/vaultCard.js b/js/src/ui/VaultCard/vaultCard.js
deleted file mode 100644
index 62dae2049b535195babf8e374b39c5b4ed27f1b6..0000000000000000000000000000000000000000
--- a/js/src/ui/VaultCard/vaultCard.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { Link } from 'react-router';
-
-import Button from '~/ui/Button';
-import Container from '~/ui/Container';
-import IdentityIcon from '~/ui/IdentityIcon';
-import { LockedIcon, UnlockedIcon } from '~/ui/Icons';
-
-import Layout from './Layout';
-import styles from './vaultCard.css';
-
-export default class VaultCard extends Component {
-  static propTypes = {
-    accounts: PropTypes.array,
-    buttons: PropTypes.array,
-    children: PropTypes.node,
-    hideAccounts: PropTypes.bool,
-    hideButtons: PropTypes.bool,
-    vault: PropTypes.object.isRequired
-  };
-
-  static Layout = Layout;
-
-  render () {
-    const { children, vault } = this.props;
-    const { isOpen } = vault;
-
-    return (
-      <Container
-        className={ styles.container }
-        hover={
-          isOpen
-            ? this.renderAccounts()
-            : null
-        }
-      >
-        { this.renderButtons() }
-        <Layout vault={ vault }>
-          { children }
-        </Layout>
-      </Container>
-    );
-  }
-
-  renderAccounts () {
-    const { accounts, hideAccounts } = this.props;
-
-    if (hideAccounts) {
-      return null;
-    }
-
-    if (!accounts || !accounts.length) {
-      return (
-        <div className={ styles.empty }>
-          <FormattedMessage
-            id='vaults.accounts.empty'
-            defaultMessage='There are no accounts in this vault'
-          />
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.accounts }>
-        {
-          accounts.map((address) => {
-            return (
-              <Link
-                key={ address }
-                to={ `/accounts/${address}` }
-              >
-                <IdentityIcon
-                  address={ address }
-                  center
-                  className={ styles.account }
-                />
-              </Link>
-            );
-          })
-        }
-      </div>
-    );
-  }
-
-  renderButtons () {
-    const { buttons, hideButtons, vault } = this.props;
-    const { isOpen } = vault;
-
-    if (hideButtons) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.buttons }>
-        <Button
-          className={ styles.status }
-          disabled
-          icon={
-            isOpen
-              ? <UnlockedIcon />
-              : <LockedIcon />
-          }
-          key='status'
-        />
-        { buttons }
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/VaultCard/vaultCard.spec.js b/js/src/ui/VaultCard/vaultCard.spec.js
deleted file mode 100644
index 2052aa70771598cdcbb3523322b9b81c98140f01..0000000000000000000000000000000000000000
--- a/js/src/ui/VaultCard/vaultCard.spec.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import VaultCard from './';
-
-const VAULT = { name: 'testing', isOpen: true };
-
-let component;
-let instance;
-
-function render (props = {}) {
-  component = shallow(
-    <VaultCard
-      vault={ VAULT }
-      { ...props }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('ui/VaultCard', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('components', () => {
-    describe('Layout', () => {
-      let layout;
-
-      beforeEach(() => {
-        layout = component.find('Layout');
-      });
-
-      it('renders', () => {
-        expect(layout.get(0)).to.be.ok;
-      });
-
-      it('passes the vault', () => {
-        expect(layout.props().vault).to.deep.equal(VAULT);
-      });
-    });
-  });
-
-  describe('instance methods', () => {
-    describe('renderAccounts', () => {
-      it('renders empty when no accounts supplied', () => {
-        expect(
-          shallow(instance.renderAccounts()).find('FormattedMessage').props().id
-        ).to.equal('vaults.accounts.empty');
-      });
-
-      describe('with accounts', () => {
-        const ACCOUNTS = ['0x123', '0x456'];
-        let identities;
-
-        beforeEach(() => {
-          render({ accounts: ACCOUNTS });
-          identities = shallow(instance.renderAccounts()).find('Connect(IdentityIcon)');
-        });
-
-        it('renders the accounts when supplied', () => {
-          expect(identities).to.have.length(2);
-        });
-
-        it('renders accounts with correct address', () => {
-          console.log(identities.get(0));
-          expect(identities.get(0).props.address).to.equal(ACCOUNTS[0]);
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/ui/VaultTag/index.js b/js/src/ui/VaultTag/index.js
deleted file mode 100644
index af0419c99e6f703dccbb83a1e0997cd8b2741655..0000000000000000000000000000000000000000
--- a/js/src/ui/VaultTag/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './vaultTag';
diff --git a/js/src/ui/VaultTag/vaultTag.css b/js/src/ui/VaultTag/vaultTag.css
deleted file mode 100644
index acb139c6e3fadf1f1cb4df31e9e6240de508d3d3..0000000000000000000000000000000000000000
--- a/js/src/ui/VaultTag/vaultTag.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* TODO: These tag styles are shared with Balances & Certifications - should be made into
-/* a component that can take a list of tags and render them in the correct format
-*/
-.vault {
-  display: flex;
-  flex-wrap: wrap;
-  margin: 0.75em 0 0;
-  vertical-align: top;
-
-  .vaultBody {
-    margin: 0.75em 0.5em 0 0;
-    background: rgba(255, 255, 255, 0.07);
-    border-radius: 16px;
-    max-height: 24px;
-    max-width: 100%;
-    display: flex;
-    align-items: center;
-  }
-
-  img {
-    height: 32px !important;
-    margin: -4px 1em 0 0;
-    width: 32px !important;
-  }
-
-  .text {
-    margin: 0 0.5em 0 0;
-    text-transform: uppercase;
-    white-space: nowrap;
-  }
-}
diff --git a/js/src/ui/VaultTag/vaultTag.js b/js/src/ui/VaultTag/vaultTag.js
deleted file mode 100644
index 303aaca61e078167969c229e22d8e672c9565dcf..0000000000000000000000000000000000000000
--- a/js/src/ui/VaultTag/vaultTag.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import IdentityIcon from '~/ui/IdentityIcon';
-
-import styles from './vaultTag.css';
-
-export default class VaultTag extends Component {
-  static propTypes = {
-    vault: PropTypes.string.isRequired
-  };
-
-  render () {
-    const { vault } = this.props;
-
-    return (
-      <div className={ styles.vault }>
-        <div className={ styles.vaultBody }>
-          <IdentityIcon
-            address={ vault }
-            inline
-          />
-          <div className={ styles.text }>
-            { vault }
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/Warning/index.js b/js/src/ui/Warning/index.js
deleted file mode 100644
index b0096ae624396dcf711d0090ae7675edb602cd28..0000000000000000000000000000000000000000
--- a/js/src/ui/Warning/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './warning';
diff --git a/js/src/ui/Warning/warning.css b/js/src/ui/Warning/warning.css
deleted file mode 100644
index abddedbd7274489d23052ccfd742ec477b8f47ee..0000000000000000000000000000000000000000
--- a/js/src/ui/Warning/warning.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.warning {
-  background: #f80;
-  border-radius: 0.5em;
-  color: white;
-  font-size: 0.75em;
-  margin-bottom: 1em;
-  padding: 0.75em;
-  text-align: center;
-}
diff --git a/js/src/ui/Warning/warning.js b/js/src/ui/Warning/warning.js
deleted file mode 100644
index 1bde5a5d08e1fb09c117a62a3e8fefde4ccde00a..0000000000000000000000000000000000000000
--- a/js/src/ui/Warning/warning.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-
-import { nodeOrStringProptype } from '~/util/proptypes';
-
-import styles from './warning.css';
-
-export default class Warning extends Component {
-  static propTypes = {
-    warning: nodeOrStringProptype()
-  };
-
-  render () {
-    const { warning } = this.props;
-
-    if (!warning) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.warning }>
-        { warning }
-      </div>
-    );
-  }
-}
diff --git a/js/src/ui/index.js b/js/src/ui/index.js
deleted file mode 100644
index 7e07bad7b1d0b19e9d725b8535e2aa71a50fa0a3..0000000000000000000000000000000000000000
--- a/js/src/ui/index.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export AccountCard from './AccountCard';
-export Actionbar, { Export as ActionbarExport, Import as ActionbarImport, Search as ActionbarSearch, Sort as ActionbarSort } from './Actionbar';
-export Badge from './Badge';
-export Balance from './Balance';
-export BlockStatus from './BlockStatus';
-export Button from './Button';
-export Certifications from './Certifications';
-export ConfirmDialog from './ConfirmDialog';
-export Container, { Title as ContainerTitle } from './Container';
-export ContextProvider from './ContextProvider';
-export CopyToClipboard from './CopyToClipboard';
-export CurrencySymbol from './CurrencySymbol';
-export DappCard from './DappCard';
-export DappIcon from './DappIcon';
-export Errors from './Errors';
-export Features, { FEATURES, FeaturesStore } from './Features';
-export Form, { AddressSelect, DappUrlInput, FileSelect, FormWrap, Input, InputAddress, InputAddressSelect, InputChip, InputDate, InputInline, InputTime, Label, RadioButtons, Select, TypedInput, VaultSelect } from './Form';
-export GasPriceEditor from './GasPriceEditor';
-export GasPriceSelector from './GasPriceSelector';
-export Icons from './Icons';
-export IdentityIcon from './IdentityIcon';
-export IdentityName from './IdentityName';
-export LanguageSelector from './LanguageSelector';
-export Loading from './Loading';
-export MethodDecoding from './MethodDecoding';
-export { Busy as BusyStep, Completed as CompletedStep } from './Modal';
-export ModalBox from './ModalBox';
-export muiTheme from './Theme';
-export Page from './Page';
-export ParityBackground from './ParityBackground';
-export Portal from './Portal';
-export QrCode from './QrCode';
-export QrScan from './QrScan';
-export ScrollableText from './ScrollableText';
-export SectionList from './SectionList';
-export SelectionList from './SelectionList';
-export ShortenedHash from './ShortenedHash';
-export SignerIcon from './SignerIcon';
-export StatusIndicator from './StatusIndicator';
-export Tags from './Tags';
-export Title from './Title';
-export Tooltips, { Tooltip } from './Tooltips';
-export TxHash from './TxHash';
-export TxList from './TxList';
-export VaultCard from './VaultCard';
-export VaultTag from './VaultTag';
-export Warning from './Warning';
diff --git a/js/src/util/abi.js b/js/src/util/abi.js
deleted file mode 100644
index e2670f387addb52c0afddbb7a406389675adbd1f..0000000000000000000000000000000000000000
--- a/js/src/util/abi.js
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { range } from 'lodash';
-
-const ARRAY_TYPE = 'ARRAY_TYPE';
-const ADDRESS_TYPE = 'ADDRESS_TYPE';
-const STRING_TYPE = 'STRING_TYPE';
-const BOOL_TYPE = 'BOOL_TYPE';
-const BYTES_TYPE = 'BYTES_TYPE';
-const INT_TYPE = 'INT_TYPE';
-const FIXED_TYPE = 'FIXED_TYPE';
-
-export const ABI_TYPES = {
-  ARRAY: ARRAY_TYPE, ADDRESS: ADDRESS_TYPE,
-  STRING: STRING_TYPE, BOOL: BOOL_TYPE,
-  BYTES: BYTES_TYPE, INT: INT_TYPE,
-  FIXED: FIXED_TYPE
-};
-
-export function parseAbiType (type) {
-  const arrayRegex = /^(.+)\[(\d*)]$/;
-
-  if (arrayRegex.test(type)) {
-    const matches = arrayRegex.exec(type);
-
-    const subtype = parseAbiType(matches[1]);
-    const M = parseInt(matches[2]) || null;
-    const defaultValue = !M
-      ? []
-      : range(M).map(() => subtype.default);
-
-    return {
-      type: ARRAY_TYPE,
-      subtype: subtype,
-      length: M,
-      default: defaultValue
-    };
-  }
-
-  const lengthRegex = /^(u?int|bytes)(\d{1,3})$/;
-
-  if (lengthRegex.test(type)) {
-    const matches = lengthRegex.exec(type);
-
-    const subtype = parseAbiType(matches[1]);
-    const length = parseInt(matches[2]);
-
-    return {
-      ...subtype,
-      length
-    };
-  }
-
-  const fixedLengthRegex = /^(u?fixed)(\d{1,3})x(\d{1,3})$/;
-
-  if (fixedLengthRegex.test(type)) {
-    const matches = fixedLengthRegex.exec(type);
-
-    const subtype = parseAbiType(matches[1]);
-    const M = parseInt(matches[2]);
-    const N = parseInt(matches[3]);
-
-    return {
-      ...subtype,
-      M, N
-    };
-  }
-
-  if (type === 'string') {
-    return {
-      type: STRING_TYPE,
-      default: ''
-    };
-  }
-
-  if (type === 'bool') {
-    return {
-      type: BOOL_TYPE,
-      default: false
-    };
-  }
-
-  if (type === 'address') {
-    return {
-      type: ADDRESS_TYPE,
-      default: ''
-    };
-  }
-
-  if (type === 'bytes' || type === 'fixedBytes') {
-    return {
-      type: BYTES_TYPE,
-      default: '0x'
-    };
-  }
-
-  if (type === 'uint') {
-    return {
-      type: INT_TYPE,
-      default: 0,
-      length: 256,
-      signed: false
-    };
-  }
-
-  if (type === 'int') {
-    return {
-      type: INT_TYPE,
-      default: 0,
-      length: 256,
-      signed: true
-    };
-  }
-
-  if (type === 'ufixed') {
-    return {
-      type: FIXED_TYPE,
-      default: 0,
-      length: 256,
-      signed: false
-    };
-  }
-
-  if (type === 'fixed') {
-    return {
-      type: FIXED_TYPE,
-      default: 0,
-      length: 256,
-      signed: true
-    };
-  }
-
-  // If no matches, return null
-  return null;
-}
diff --git a/js/src/util/array.js b/js/src/util/array.js
deleted file mode 100644
index fd9e1ce86371fdf81b091ac2a42fc88ebfffcaa9..0000000000000000000000000000000000000000
--- a/js/src/util/array.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-// http://stackoverflow.com/questions/11318680/split-array-into-chunks-of-n-length
-export function chunkArray (array, size) {
-  return array
-    .map((item, index) => {
-      return index % size === 0
-        ? array.slice(index, index + size)
-        : null;
-    })
-    .filter((item) => item);
-}
diff --git a/js/src/util/array.spec.js b/js/src/util/array.spec.js
deleted file mode 100644
index 3af1d209d720a0ea4a679f6f90fb284b0f40675a..0000000000000000000000000000000000000000
--- a/js/src/util/array.spec.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { chunkArray } from './array';
-
-describe('util/array', () => {
-  describe('chunkArray', () => {
-    it('splits array into equal chunks', () => {
-      expect(chunkArray([1, 2, 3, 4], 2)).to.deep.equal([[1, 2], [3, 4]]);
-    });
-
-    it('splits array into equal chunks (non-divisible)', () => {
-      expect(chunkArray([1, 2, 3, 4], 3)).to.deep.equal([[1, 2, 3], [4]]);
-    });
-  });
-});
diff --git a/js/src/util/constants.js b/js/src/util/constants.js
deleted file mode 100644
index 4a5548de958a93e9a3b6f2dd194b5717cc85d4eb..0000000000000000000000000000000000000000
--- a/js/src/util/constants.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const DEFAULT_GAS = '21000';
-const DEFAULT_GASPRICE = '20000000000';
-
-const MAX_GAS_ESTIMATION = '50000000';
-
-const NULL_ADDRESS = '0000000000000000000000000000000000000000';
-
-const DOMAIN = '.web3.site';
-
-export {
-  DEFAULT_GAS,
-  DEFAULT_GASPRICE,
-  MAX_GAS_ESTIMATION,
-  NULL_ADDRESS,
-  DOMAIN
-};
diff --git a/js/src/util/dapplink.js b/js/src/util/dapplink.js
deleted file mode 100644
index e2b249b038088987da7fac12784da4654865c6db..0000000000000000000000000000000000000000
--- a/js/src/util/dapplink.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import base32 from 'base32.js';
-
-import { DOMAIN } from './constants';
-
-const BASE_URL = `.web${DOMAIN}`;
-const ENCODER_OPTS = { type: 'crockford' };
-
-export function encodePath (token, url) {
-  const encoder = new base32.Encoder(ENCODER_OPTS);
-  const chars = `${token}+${url}`
-    .split('')
-    .map((char) => char.charCodeAt(0));
-
-  return encoder
-    .write(chars) // add the characters to encode
-    .finalize(); // create the encoded string
-}
-
-export function encodeUrl (token, url) {
-  const encoded = encodePath(token, url)
-    .match(/.{1,63}/g) // split into 63-character chunks, max length is 64 for URLs parts
-    .join('.'); // add '.' between URL parts
-
-  return `${encoded}${BASE_URL}`;
-}
-
-// TODO: This export is really more a helper along the way of verifying the actual
-// encoding (being able to decode test values from the node layer), than meant to
-// be used as-is. Should the need arrise to decode URLs as well (instead of just
-// producing), it would make sense to further split the output into the token/URL
-export function decode (encoded) {
-  const decoder = new base32.Decoder(ENCODER_OPTS);
-  const sanitized = encoded
-    .replace(BASE_URL, '') // remove the BASE URL
-    .split('.') // split the string on the '.' (63-char boundaries)
-    .join(''); // combine without the '.'
-
-  return decoder
-    .write(sanitized) // add the string to decode
-    .finalize() // create the decoded buffer
-    .toString(); // create string from buffer
-}
-
-export {
-  BASE_URL
-};
diff --git a/js/src/util/dapplink.spec.js b/js/src/util/dapplink.spec.js
deleted file mode 100644
index 49a3aa19742b5d9a56102f7ebc524696af1b8453..0000000000000000000000000000000000000000
--- a/js/src/util/dapplink.spec.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { BASE_URL, decode, encodePath, encodeUrl } from './dapplink';
-
-const TEST_TOKEN = 'token';
-const TEST_URL = 'https://parity.io';
-const TEST_URL_LONG = 'http://some.very.very.very.long.long.long.domain.example.com';
-const TEST_PREFIX = 'EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY';
-const TEST_PREFIX_LONG = [
-  'EHQPPSBE5DM78X3G78QJYWVFDNJJWXK5E9WJWXK5E9WJWXK5E9WJWV3FDSKJWV3', 'FDSKJWV3FDSKJWS3FDNGPJVHECNW62VBGDHJJWRVFDM'
-].join('.');
-const TEST_RESULT = `${TEST_PREFIX}${BASE_URL}`;
-const TEST_ENCODED = `${TEST_TOKEN}+${TEST_URL}`;
-
-describe('util/ethlink', () => {
-  describe('decode', () => {
-    it('decodes into encoded url', () => {
-      expect(decode(TEST_PREFIX)).to.equal(TEST_ENCODED);
-    });
-
-    it('decodes full into encoded url', () => {
-      expect(decode(TEST_RESULT)).to.equal(TEST_ENCODED);
-    });
-  });
-
-  describe('encodePath', () => {
-    it('encodes a url/token combination', () => {
-      expect(encodePath(TEST_TOKEN, TEST_URL)).to.equal(TEST_PREFIX);
-    });
-
-    it('changes when token changes', () => {
-      expect(encodePath('test-token-2', TEST_URL)).not.to.equal(TEST_PREFIX);
-    });
-
-    it('changes when url changes', () => {
-      expect(encodePath(TEST_TOKEN, 'http://other.example.com')).not.to.equal(TEST_PREFIX);
-    });
-  });
-
-  describe('encodeUrl', () => {
-    it('encodes a url/token combination', () => {
-      expect(encodeUrl(TEST_TOKEN, TEST_URL)).to.equal(TEST_RESULT);
-    });
-
-    it('changes when token changes', () => {
-      expect(encodeUrl('test-token-2', TEST_URL)).not.to.equal(TEST_RESULT);
-    });
-
-    it('changes when url changes', () => {
-      expect(encodeUrl(TEST_TOKEN, 'http://other.example.com')).not.to.equal(TEST_RESULT);
-    });
-
-    describe('splitting', () => {
-      let encoded;
-
-      beforeEach(() => {
-        encoded = encodeUrl(TEST_TOKEN, TEST_URL_LONG);
-      });
-
-      it('splits long values into boundary parts', () => {
-        expect(encoded).to.equal(`${TEST_PREFIX_LONG}${BASE_URL}`);
-      });
-
-      it('first part 63 characters', () => {
-        expect(encoded.split('.')[0].length).to.equal(63);
-      });
-    });
-  });
-});
diff --git a/js/src/util/dapps.js b/js/src/util/dapps.js
deleted file mode 100644
index 58b33e49e7d4dc12318b42ce23ba36bbc8f5f4ed..0000000000000000000000000000000000000000
--- a/js/src/util/dapps.js
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { pick, range, uniq } from 'lodash';
-
-import Contracts from '~/contracts';
-import { hashToImageUrl } from '~/redux/util';
-import { bytesToHex } from '~/api/util/format';
-
-import builtinJson from '~/views/Dapps/builtin.json';
-
-const builtinApps = builtinJson.filter((app) => app.id);
-
-export function subscribeToChanges (api, dappReg, callback) {
-  return dappReg
-    .getContract()
-    .then((dappRegContract) => {
-      const dappRegInstance = dappRegContract.instance;
-
-      const signatures = ['MetaChanged', 'OwnerChanged', 'Registered']
-        .map((event) => dappRegInstance[event].signature);
-
-      return api.eth
-        .newFilter({
-          fromBlock: '0',
-          toBlock: 'latest',
-          address: dappRegInstance.address,
-          topics: [ signatures ]
-        })
-      .then((filterId) => {
-        return api
-          .subscribe('eth_blockNumber', () => {
-            if (filterId > -1) {
-              api.eth
-                .getFilterChanges(filterId)
-                .then((logs) => {
-                  return dappRegContract.parseEventLogs(logs);
-                })
-                .then((events) => {
-                  if (events.length === 0) {
-                    return [];
-                  }
-
-                  // Return uniq IDs which changed meta-data
-                  const ids = uniq(events.map((event) => bytesToHex(event.params.id.value)));
-
-                  callback(ids);
-                });
-            }
-          })
-          .then((blockSubId) => {
-            return {
-              block: blockSubId,
-              filter: filterId
-            };
-          });
-      });
-    });
-}
-
-export function fetchBuiltinApps () {
-  const { dappReg } = Contracts.get();
-
-  return Promise
-    .all(builtinApps.map((app) => dappReg.getImage(app.id)))
-    .then((imageIds) => {
-      return builtinApps.map((app, index) => {
-        app.type = 'builtin';
-        app.image = hashToImageUrl(imageIds[index]);
-        return app;
-      });
-    })
-    .catch((error) => {
-      console.warn('DappsStore:fetchBuiltinApps', error);
-    });
-}
-
-export function fetchLocalApps (api) {
-  return api.parity.dappsList()
-    .then((apps) => {
-      return apps
-        .map((app) => {
-          app.type = 'local';
-          app.visible = true;
-          return app;
-        })
-        .filter((app) => app.id && !['ui'].includes(app.id));
-    })
-    .catch((error) => {
-      console.warn('DappsStore:fetchLocal', error);
-    });
-}
-
-export function fetchRegistryAppIds () {
-  const { dappReg } = Contracts.get();
-
-  return dappReg
-    .count()
-    .then((count) => {
-      const promises = range(0, count.toNumber()).map((index) => dappReg.at(index));
-
-      return Promise.all(promises);
-    })
-    .then((appsInfo) => {
-      const appIds = appsInfo
-        .map(([appId, owner]) => bytesToHex(appId))
-        .filter((appId) => {
-          return (new BigNumber(appId)).gt(0) && !builtinApps.find((app) => app.id === appId);
-        });
-
-      return uniq(appIds);
-    })
-    .catch((error) => {
-      console.warn('DappsStore:fetchRegistryAppIds', error);
-    });
-}
-
-export function fetchRegistryApp (api, dappReg, appId) {
-  return Promise
-    .all([
-      dappReg.getImage(appId),
-      dappReg.getContent(appId),
-      dappReg.getManifest(appId)
-    ])
-    .then(([ imageId, contentId, manifestId ]) => {
-      const app = {
-        id: appId,
-        image: hashToImageUrl(imageId),
-        contentHash: bytesToHex(contentId).substr(2),
-        manifestHash: bytesToHex(manifestId).substr(2),
-        type: 'network',
-        visible: true
-      };
-
-      return fetchManifest(api, app.manifestHash)
-        .then((manifest) => {
-          if (manifest) {
-            app.manifestHash = null;
-
-            // Add usefull manifest fields to app
-            Object.assign(app, pick(manifest, ['author', 'description', 'name', 'version']));
-          }
-
-          return app;
-        });
-    })
-    .then((app) => {
-      // Keep dapps that has a Manifest File and an Id
-      const dapp = (app.manifestHash || !app.id) ? null : app;
-
-      return dapp;
-    })
-    .catch((error) => {
-      console.warn('DappsStore:fetchRegistryApp', error);
-    });
-}
-
-export function fetchManifest (api, manifestHash) {
-  if (/^(0x)?0+/.test(manifestHash)) {
-    return Promise.resolve(null);
-  }
-
-  return fetch(
-      `/api/content/${manifestHash}/`,
-      { redirect: 'follow', mode: 'cors' }
-    )
-    .then((response) => {
-      return response.ok
-        ? response.json()
-        : null;
-    })
-    .then((manifest) => {
-      return manifest;
-    })
-    .catch((error) => {
-      console.warn('DappsStore:fetchManifest', error);
-      return null;
-    });
-}
diff --git a/js/src/util/messages.js b/js/src/util/messages.js
deleted file mode 100644
index c34028f72f7ab8f1b8979d9e7fb5e1af6c3d5ea2..0000000000000000000000000000000000000000
--- a/js/src/util/messages.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Convert a String or a FormattedMessage
- * element into a string
- *
- * @param  {Object}        context - The React `context`
- * @param  {String|Object} value   - A String or a FormattedMessage
- *                                   element
- * @return {String}
- */
-export function toString (context, value) {
-  if (!context.intl) {
-    console.warn(`remember to add:
-        static contextTypes = {
-          intl: React.PropTypes.object.isRequired
-        };
-    to your component`);
-    return value;
-  }
-
-  const textValue = typeof value !== 'string' && (value && value.props)
-    ? context.intl.formatMessage(
-        value.props,
-        value.props.values || {}
-      )
-    : value || '';
-
-  return textValue;
-}
diff --git a/js/src/util/notifications.js b/js/src/util/notifications.js
deleted file mode 100644
index 74732cac25cf21dc6af73646438dfa6037b35471..0000000000000000000000000000000000000000
--- a/js/src/util/notifications.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Push from 'push.js';
-import BigNumber from 'bignumber.js';
-
-import unkownIcon from '~/../assets/images/contracts/unknown-64x64.png';
-
-export function notifyTransaction (account, token, _value, onClick) {
-  const name = account.name || account.address;
-  const value = _value.div(new BigNumber(token.format || 1));
-  const icon = token.image || unkownIcon;
-
-  let _notification = null;
-
-  Push
-    .create(`${name}`, {
-      body: `You just received ${value.toFormat(3)} ${token.tag.toUpperCase()}`,
-      icon: {
-        x16: icon,
-        x32: icon
-      },
-      timeout: 20000,
-      onClick: () => {
-        // Focus on the UI
-        try {
-          window.focus();
-        } catch (e) {}
-
-        if (onClick && typeof onClick === 'function') {
-          onClick();
-        }
-
-        // Close the notification
-        if (_notification) {
-          _notification.close();
-          _notification = null;
-        }
-      }
-    })
-    .then((notification) => {
-      _notification = notification;
-    });
-}
diff --git a/js/src/util/proptypes.js b/js/src/util/proptypes.js
deleted file mode 100644
index 30b6fafd94ced90ecba8b7889ecc7718e8f9bf3f..0000000000000000000000000000000000000000
--- a/js/src/util/proptypes.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { PropTypes } from 'react';
-
-export function arrayOrObjectProptype () {
-  return PropTypes.oneOfType([
-    PropTypes.array,
-    PropTypes.object
-  ]);
-}
-
-export function nullableProptype (type) {
-  return PropTypes.oneOfType([
-    PropTypes.oneOf([ null ]),
-    type
-  ]);
-}
-
-export function nodeOrStringProptype () {
-  return PropTypes.oneOfType([
-    PropTypes.node,
-    PropTypes.string
-  ]);
-}
diff --git a/js/src/util/qrscan.js b/js/src/util/qrscan.js
deleted file mode 100644
index 97fa70c847aa36efe9a00364a7b607f5048aadf2..0000000000000000000000000000000000000000
--- a/js/src/util/qrscan.js
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Transaction from 'ethereumjs-tx';
-
-import { inAddress, inHex, inNumber10 } from '~/api/format/input';
-import { sha3 } from '~/api/util/sha3';
-
-export function createUnsignedTx (api, netVersion, transaction) {
-  const { data, from, gas, gasPrice, to, value } = transaction;
-
-  return api.parity
-    .nextNonce(from)
-    .then((_nonce) => {
-      const chainId = parseInt(netVersion, 10);
-      const nonce = (!transaction.nonce || transaction.nonce.isZero())
-        ? _nonce
-        : transaction.nonce;
-
-      const tx = new Transaction({
-        chainId,
-        data: inHex(data),
-        gasPrice: inHex(gasPrice),
-        gasLimit: inHex(gas),
-        nonce: inHex(nonce),
-        to: to ? inHex(to) : undefined,
-        value: inHex(value),
-        r: 0,
-        s: 0,
-        v: chainId
-      });
-
-      const rlp = inHex(tx.serialize().toString('hex'));
-      const hash = sha3(rlp);
-
-      return {
-        chainId,
-        hash,
-        nonce,
-        rlp,
-        tx
-      };
-    });
-}
-
-export function createSignedTx (netVersion, signature, unsignedTx) {
-  const chainId = parseInt(netVersion, 10);
-  const { data, gasPrice, gasLimit, nonce, to, value } = unsignedTx;
-
-  const r = Buffer.from(signature.substr(2, 64), 'hex');
-  const s = Buffer.from(signature.substr(66, 64), 'hex');
-  const v = Buffer.from([parseInt(signature.substr(130, 2), 16) + (chainId * 2) + 35]);
-
-  const tx = new Transaction({
-    chainId,
-    data,
-    gasPrice,
-    gasLimit,
-    nonce,
-    to,
-    value,
-    r,
-    s,
-    v
-  });
-
-  return {
-    chainId,
-    rlp: inHex(tx.serialize().toString('hex')),
-    tx
-  };
-}
-
-export function generateQr (from, tx, hash, rlp) {
-  if (tx.data && tx.data.length > 64) {
-    return JSON.stringify({
-      action: 'signTransactionHash',
-      data: {
-        account: from.substr(2),
-        hash: hash.substr(2),
-        details: {
-          gasPrice: inNumber10(inHex(tx.gasPrice.toString('hex') || '0')),
-          gas: inNumber10(inHex(tx.gasLimit.toString('hex') || '0')),
-          nonce: inNumber10(inHex(tx.nonce.toString('hex') || '0')),
-          to: inAddress(tx.to.toString('hex')),
-          value: inHex(tx.value.toString('hex') || '0')
-        }
-      }
-    });
-  }
-
-  return JSON.stringify({
-    action: 'signTransaction',
-    data: {
-      account: from.substr(2),
-      rlp: rlp.substr(2)
-    }
-  });
-}
-
-export function generateDataQr (data) {
-  return Promise.resolve({
-    data,
-    value: JSON.stringify({
-      action: 'signData',
-      data
-    })
-  });
-}
-
-export function generateDecryptQr (data) {
-  return Promise.resolve({
-    decrypt: data,
-    value: JSON.stringify({
-      action: 'decrypt',
-      data
-    })
-  });
-}
-
-export function generateTxQr (api, netVersion, transaction) {
-  return createUnsignedTx(api, netVersion, transaction)
-    .then((qr) => {
-      qr.value = generateQr(transaction.from, qr.tx, qr.hash, qr.rlp);
-
-      return qr;
-    });
-}
diff --git a/js/src/util/signer.js b/js/src/util/signer.js
deleted file mode 100644
index 1194ff251491ee0b54fac19668d99d1a07335340..0000000000000000000000000000000000000000
--- a/js/src/util/signer.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import scrypt from 'scryptsy';
-import Transaction from 'ethereumjs-tx';
-import { pbkdf2Sync } from 'crypto';
-import { createDecipheriv } from 'browserify-aes';
-
-import { inHex } from '~/api/format/input';
-import { sha3 } from '~/api/util/sha3';
-
-// Adapted from https://github.com/kvhnuke/etherwallet/blob/mercury/app/scripts/myetherwallet.js
-
-export class Signer {
-  static fromJson (json, password) {
-    return Signer
-      .getSeed(json, password)
-      .then((seed) => {
-        return new Signer(seed);
-      });
-  }
-
-  static getSeed (json, password) {
-    try {
-      const seed = Signer.getSyncSeed(json, password);
-
-      return Promise.resolve(seed);
-    } catch (error) {
-      return Promise.reject(error);
-    }
-  }
-
-  static getSyncSeed (json, password) {
-    if (json.version !== 3) {
-      throw new Error('Only V3 wallets are supported');
-    }
-
-    const { kdf } = json.crypto;
-    const kdfparams = json.crypto.kdfparams || {};
-    const pwd = Buffer.from(password);
-    const salt = Buffer.from(kdfparams.salt, 'hex');
-    let derivedKey;
-
-    if (kdf === 'scrypt') {
-      derivedKey = scrypt(pwd, salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen);
-    } else if (kdf === 'pbkdf2') {
-      if (kdfparams.prf !== 'hmac-sha256') {
-        throw new Error('Unsupported parameters to PBKDF2');
-      }
-
-      derivedKey = pbkdf2Sync(pwd, salt, kdfparams.c, kdfparams.dklen, 'sha256');
-    } else {
-      throw new Error('Unsupported key derivation scheme');
-    }
-
-    const ciphertext = Buffer.from(json.crypto.ciphertext, 'hex');
-    const mac = sha3(Buffer.concat([derivedKey.slice(16, 32), ciphertext]));
-
-    if (mac !== inHex(json.crypto.mac)) {
-      throw new Error('Key derivation failed - possibly wrong password');
-    }
-
-    const decipher = createDecipheriv(
-      json.crypto.cipher,
-      derivedKey.slice(0, 16),
-      Buffer.from(json.crypto.cipherparams.iv, 'hex')
-    );
-
-    let seed = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
-
-    while (seed.length < 32) {
-      const nullBuff = Buffer.from([0x00]);
-
-      seed = Buffer.concat([nullBuff, seed]);
-    }
-
-    return seed;
-  }
-
-  constructor (seed) {
-    this.seed = seed;
-  }
-
-  signTransactionObject (tx) {
-    tx.sign(this.seed);
-
-    return tx;
-  }
-
-  signTransaction (transaction) {
-    const tx = new Transaction(transaction);
-
-    return inHex(this.signTransactionObject(tx).serialize().toString('hex'));
-  }
-}
diff --git a/js/src/util/solidity.js b/js/src/util/solidity.js
deleted file mode 100644
index 7309e8072e167447f907322d7e5785da92393c23..0000000000000000000000000000000000000000
--- a/js/src/util/solidity.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import solc from 'solc/browser-wrapper';
-
-export default class SolidityUtils {
-  static compile (data, compiler) {
-    const { sourcecode, build, optimize, files, name = '' } = data;
-
-    const start = Date.now();
-
-    console.log('[solidity] compiling...');
-
-    const input = {
-      [ name ]: sourcecode
-    };
-
-    const findFiles = (path) => {
-      const file = files.find((f) => f.name === path);
-
-      if (file) {
-        return { contents: file.sourcecode };
-      } else {
-        return { error: 'File not found' };
-      }
-    };
-
-    const compiled = compiler.compile({ sources: input }, optimize ? 1 : 0, findFiles);
-
-    const time = Math.round((Date.now() - start) / 100) / 10;
-
-    console.log(`[solidity] done compiling in ${time}s`);
-
-    compiled.version = build.longVersion;
-    compiled.sourcecode = sourcecode;
-
-    return compiled;
-  }
-
-  static getCompiler (build) {
-    const { longVersion, path } = build;
-    const URL = `https://cdn.rawgit.com/ethereum/solc-bin/gh-pages/bin/${path}`;
-    const isWorker = typeof window !== 'object';
-
-    return fetch(URL)
-      .then((r) => r.text())
-      .then((code) => {
-        // `window` for main thread, `self` for workers
-        const _self = isWorker ? self : window;
-
-        _self.Module = {};
-
-        const solcCode = code.replace('var Module;', `var Module=${isWorker ? 'self' : 'window'}.Module;`);
-
-        console.log(`[solidity] evaluating ${longVersion}`);
-
-        try {
-          // eslint-disable-next-line no-eval
-          eval(solcCode);
-        } catch (e) {
-          return Promise.reject(e);
-        }
-
-        console.log(`[solidity] done evaluating ${longVersion}`);
-
-        const compiler = solc(_self.Module);
-
-        delete _self.Module;
-
-        return compiler;
-      });
-  }
-}
diff --git a/js/src/util/subscribe-to-events.js b/js/src/util/subscribe-to-events.js
deleted file mode 100644
index 20c04260e6b357f86d6870821468dc2c101bd8a7..0000000000000000000000000000000000000000
--- a/js/src/util/subscribe-to-events.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import EventEmitter from 'eventemitter3';
-
-const defaults = {
-  from: 0,
-  to: 'latest',
-  interval: 5000,
-  filter: () => true
-};
-
-const subscribeToEvents = (contract, events, opt = {}) => {
-  const { api } = contract;
-
-  opt = Object.assign({}, defaults, opt);
-
-  let filter = null;
-  let interval = null;
-
-  const unsubscribe = () => {
-    if (filter) {
-      filter
-        .then((filterId) => {
-          return api.eth.uninstallFilter(filterId);
-        })
-        .catch((err) => {
-          emitter.emit('error', err);
-        });
-      filter = null;
-    }
-    if (interval) {
-      clearInterval(interval);
-      interval = null;
-    }
-  };
-
-  const emitter = new EventEmitter();
-
-  emitter.unsubscribe = unsubscribe;
-
-  const fetcher = (method, filterId) => () => {
-    api
-      .eth[method](filterId)
-      .then((logs) => {
-        logs = contract.parseEventLogs(logs);
-
-        for (let log of logs) {
-          if (opt.filter(log)) {
-            emitter.emit('log', log);
-            emitter.emit(log.event, log);
-          }
-        }
-      })
-      .catch((err) => {
-        emitter.emit('error', err);
-      });
-  };
-
-  const signatures = events
-    .filter((event) => contract.instance[event])
-    .map((event) => contract.instance[event].signature);
-
-  filter = api.eth
-    .newFilter({
-      fromBlock: opt.from,
-      toBlock: opt.to,
-      address: contract.address,
-      topics: [signatures]
-    })
-    .then((filterId) => {
-      fetcher('getFilterLogs', filterId)(); // fetch immediately
-
-      const fetchChanges = fetcher('getFilterChanges', filterId);
-
-      interval = setInterval(fetchChanges, opt.interval);
-
-      return filterId;
-    })
-    .catch((err) => {
-      emitter.emit('error', err);
-      throw err; // reject Promise
-    });
-
-  return emitter;
-};
-
-export default subscribeToEvents;
diff --git a/js/src/util/subscribe-to-events.spec.js b/js/src/util/subscribe-to-events.spec.js
deleted file mode 100644
index db0d40f075a3fa30287dd20a2787dbd3c4913518..0000000000000000000000000000000000000000
--- a/js/src/util/subscribe-to-events.spec.js
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { spy, stub, useFakeTimers } from 'sinon';
-
-import subscribeToEvents from './subscribe-to-events';
-import {
-  pastLogs, liveLogs, createApi, createContract
-} from './subscribe-to-events.test.js';
-
-// Note: We want to have a `setTimeout` that is independent from
-// `sinon.useFakeTimers`. Therefore we dereference `setTimeout` here.
-const _setTimeout = setTimeout;
-const delay = (t) => new Promise((resolve) => {
-  _setTimeout(resolve, t);
-});
-
-describe('util/subscribe-to-events', () => {
-  beforeEach(function () {
-    this.api = createApi();
-    this.contract = createContract(this.api);
-  });
-
-  it('installs a filter', async function () {
-    const { api, contract } = this;
-
-    subscribeToEvents(contract, [ 'Foo', 'Bar' ]);
-    await delay(0);
-
-    expect(api.eth.newFilter.calledOnce).to.equal(true);
-    expect(api.eth.newFilter.firstCall.args).to.eql([ {
-      fromBlock: 0, toBlock: 'latest',
-      address: contract.address,
-      topics: [ [
-        contract.instance.Foo.signature,
-        contract.instance.Bar.signature
-      ] ]
-    } ]);
-  });
-
-  it('queries & parses logs in the beginning', async function () {
-    const { api, contract } = this;
-
-    subscribeToEvents(contract, [ 'Foo', 'Bar' ]);
-
-    await delay(0);
-    expect(api.eth.getFilterLogs.callCount).to.equal(1);
-    expect(api.eth.getFilterLogs.firstCall.args).to.eql([ 123 ]);
-
-    await delay(0);
-    expect(contract.parseEventLogs.callCount).to.equal(1);
-  });
-
-  it('emits logs in the beginning', async function () {
-    const { contract } = this;
-
-    const onLog = spy();
-    const onFoo = spy();
-    const onBar = spy();
-
-    subscribeToEvents(contract, [ 'Foo', 'Bar' ])
-      .on('log', onLog)
-      .on('Foo', onFoo)
-      .on('Bar', onBar);
-
-    await delay(0);
-
-    expect(onLog.callCount).to.equal(2);
-    expect(onLog.firstCall.args).to.eql([ pastLogs[0] ]);
-    expect(onLog.secondCall.args).to.eql([ pastLogs[1] ]);
-    expect(onFoo.callCount).to.equal(1);
-    expect(onFoo.firstCall.args).to.eql([ pastLogs[0] ]);
-    expect(onBar.callCount).to.equal(1);
-    expect(onBar.firstCall.args).to.eql([ pastLogs[1] ]);
-  });
-
-  it('uninstalls the filter on sunsubscribe', async function () {
-    const { api, contract } = this;
-
-    const s = subscribeToEvents(contract, [ 'Foo', 'Bar' ]);
-
-    await delay(0);
-    s.unsubscribe();
-    await delay(0);
-
-    expect(api.eth.uninstallFilter.calledOnce).to.equal(true);
-    expect(api.eth.uninstallFilter.firstCall.args).to.eql([ 123 ]);
-  });
-
-  it('checks for new events regularly', async function () {
-    const clock = useFakeTimers();
-    const { api, contract } = this;
-
-    api.eth.getFilterLogs = stub().resolves([]);
-
-    const onLog = spy();
-    const onBar = spy();
-
-    subscribeToEvents(contract, [ 'Bar' ], { interval: 5 })
-      .on('log', onLog)
-      .on('Bar', onBar);
-    await delay(1); // let stubs resolve
-    clock.tick(5);
-    await delay(1); // let stubs resolve
-
-    expect(onLog.callCount).to.be.at.least(1);
-    expect(onLog.firstCall.args).to.eql([ liveLogs[0] ]);
-    expect(onBar.callCount).to.be.at.least(1);
-    expect(onBar.firstCall.args).to.eql([ liveLogs[0] ]);
-
-    clock.restore();
-  });
-
-  it('accepts a custom block range', async function () {
-    const { api, contract } = this;
-
-    subscribeToEvents(contract, [ 'Foo' ], { from: 123, to: 321 });
-
-    await delay(0);
-    expect(api.eth.newFilter.callCount).to.equal(1);
-    expect(api.eth.newFilter.firstCall.args[0].fromBlock).to.equal(123);
-    expect(api.eth.newFilter.firstCall.args[0].toBlock).to.equal(321);
-  });
-});
diff --git a/js/src/util/subscribe-to-events.test.js b/js/src/util/subscribe-to-events.test.js
deleted file mode 100644
index 306a98ecbd2ca356e24e345f7b28ea76ff17a0e7..0000000000000000000000000000000000000000
--- a/js/src/util/subscribe-to-events.test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { stub } from 'sinon';
-
-export const ADDRESS = '0x1111111111111111111111111111111111111111';
-
-export const pastLogs = [
-  { event: 'Foo', type: 'mined', address: ADDRESS, params: {} },
-  { event: 'Bar', type: 'mined', address: ADDRESS, params: {} }
-];
-
-export const liveLogs = [
-  { event: 'Bar', type: 'mined', address: ADDRESS, params: { foo: 'bar' } }
-];
-
-export const createApi = () => ({
-  eth: {
-    newFilter: stub().resolves(123),
-    uninstallFilter: stub()
-      .rejects(new Error('unknown filter id'))
-      .withArgs(123).resolves(null),
-    getFilterLogs: stub()
-      .rejects(new Error('unknown filter id'))
-      .withArgs(123).resolves(pastLogs),
-    getFilterChanges: stub()
-      .rejects(new Error('unknown filter id'))
-      .withArgs(123).resolves(liveLogs)
-  }
-});
-
-export const createContract = (api) => ({
-  api,
-  address: ADDRESS,
-  instance: {
-    Foo: { signature: 'Foo signature' },
-    Bar: { signature: 'Bar signature' }
-  },
-  parseEventLogs: stub().returnsArg(0)
-});
diff --git a/js/src/util/tokens.js b/js/src/util/tokens.js
deleted file mode 100644
index 63e6e9f02d6e4e84f1dc6193fe9fe947b3811419..0000000000000000000000000000000000000000
--- a/js/src/util/tokens.js
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { range } from 'lodash';
-import BigNumber from 'bignumber.js';
-
-import { hashToImageUrl } from '~/redux/util';
-import { sha3 } from '~/api/util/sha3';
-import imagesEthereum from '~/../assets/images/contracts/ethereum-black-64x64.png';
-
-const BALANCEOF_SIGNATURE = sha3('balanceOf(address)');
-const ADDRESS_PADDING = range(24).map(() => '0').join('');
-
-export const ETH_TOKEN = {
-  address: '',
-  format: new BigNumber(10).pow(18),
-  id: sha3('eth_native_token').slice(0, 10),
-  image: imagesEthereum,
-  name: 'Ethereum',
-  native: true,
-  tag: 'ETH'
-};
-
-export function fetchTokenIds (tokenregInstance) {
-  return tokenregInstance.tokenCount
-    .call()
-    .then((numTokens) => {
-      const tokenIndexes = range(numTokens.toNumber());
-
-      return tokenIndexes;
-    });
-}
-
-export function fetchTokenInfo (api, tokenregInstace, tokenIndex) {
-  return Promise
-    .all([
-      tokenregInstace.token.call({}, [tokenIndex]),
-      tokenregInstace.meta.call({}, [tokenIndex, 'IMG'])
-    ])
-    .then(([ tokenData, image ]) => {
-      const [ address, tag, format, name ] = tokenData;
-
-      const token = {
-        format: format.toString(),
-        index: tokenIndex,
-        image: hashToImageUrl(image),
-        id: sha3(address + tokenIndex).slice(0, 10),
-        address,
-        name,
-        tag
-      };
-
-      return token;
-    });
-}
-
-/**
- * `updates` should be in the shape:
- *   {
- *     [ who ]: [ tokenId ]  // Array of tokens to updates
- *   }
- *
- * Returns a Promise resolved witht the balances in the shape:
- *   {
- *     [ who ]: { [ tokenId ]: BigNumber } // The balances of `who`
- *   }
- */
-export function fetchAccountsBalances (api, tokens, updates) {
-  const addresses = Object.keys(updates);
-  const promises = addresses
-    .map((who) => {
-      const tokensIds = updates[who];
-      const tokensToUpdate = tokensIds.map((tokenId) => tokens.find((t) => t.id === tokenId));
-
-      return fetchAccountBalances(api, tokensToUpdate, who);
-    });
-
-  return Promise.all(promises)
-    .then((results) => {
-      return results.reduce((balances, accountBalances, index) => {
-        balances[addresses[index]] = accountBalances;
-        return balances;
-      }, {});
-    });
-}
-
-/**
- * Returns a Promise resolved with the balances in the shape:
- *   {
- *     [ tokenId ]: BigNumber  // Token balance value
- *   }
- */
-export function fetchAccountBalances (api, tokens, who) {
-  const calldata = '0x' + BALANCEOF_SIGNATURE.slice(2, 10) + ADDRESS_PADDING + who.slice(2);
-  const promises = tokens.map((token) => fetchTokenBalance(api, token, { who, calldata }));
-
-  return Promise.all(promises)
-    .then((results) => {
-      return results.reduce((balances, value, index) => {
-        const token = tokens[index];
-
-        balances[token.id] = value;
-        return balances;
-      }, {});
-    });
-}
-
-export function fetchTokenBalance (api, token, { who, calldata }) {
-  if (token.native) {
-    return api.eth.getBalance(who);
-  }
-
-  return api.eth
-    .call({ data: calldata, to: token.address })
-    .then((result) => {
-      const cleanResult = result.replace(/^0x/, '');
-
-      return new BigNumber(`0x${cleanResult || 0}`);
-    });
-}
diff --git a/js/src/util/tx.js b/js/src/util/tx.js
deleted file mode 100644
index e325e6024045f34e1a0ba43bc57ce59940278a14..0000000000000000000000000000000000000000
--- a/js/src/util/tx.js
+++ /dev/null
@@ -1,294 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import WalletsUtils from '~/util/wallets';
-
-/**
- * The sender is by default (when the UI loads) the
- * default dapp address. It can then be modified when
- * sending transactions....
- */
-let currentSender = '';
-let hasCurrentSenderChanged = false;
-
-export function getSender () {
-  currentSender;
-}
-
-export function loadSender (api) {
-  // If the current sender has been changed
-  // then don't bother checking changes of the
-  // default sender
-  if (hasCurrentSenderChanged) {
-    return Promise.resolve(currentSender);
-  }
-
-  return api.parity.getNewDappsDefaultAddress()
-    .then((defaultAccount) => {
-      currentSender = defaultAccount;
-      return defaultAccount;
-    });
-}
-
-export function setSender (sender) {
-  currentSender = sender;
-  hasCurrentSenderChanged = true;
-}
-
-export function trackRequest (api, options, statusCallback) {
-  const { requestId, transactionHash } = options;
-  const txHashPromise = transactionHash
-    ? Promise.resolve(transactionHash)
-    : api.pollMethod('parity_checkRequest', requestId);
-
-  return txHashPromise
-    .then((transactionHash) => {
-      statusCallback(null, { transactionHash });
-      return api.pollMethod('eth_getTransactionReceipt', transactionHash, isValidReceipt);
-    })
-    .then((transactionReceipt) => {
-      statusCallback(null, { transactionReceipt });
-    })
-    .catch((error) => {
-      statusCallback(error);
-    });
-}
-
-const isValidReceipt = (receipt) => {
-  return receipt && receipt.blockNumber && receipt.blockNumber.gt(0);
-};
-
-export function getTxOptions (api, func, _options, values = []) {
-  const options = { ..._options };
-  const address = options.from;
-
-  if (func && func.contract) {
-    options.to = options.to || func.contract.address;
-  }
-
-  if (!address) {
-    return Promise.resolve({ func, options, values });
-  }
-
-  return WalletsUtils
-    .isWallet(api, address)
-    .then((isWallet) => {
-      if (!isWallet) {
-        return { func, options, values };
-      }
-
-      if (func && func.contract) {
-        options.data = func.contract.getCallData(func, options, values);
-      }
-
-      if (!options.to) {
-        return { func, options, values };
-      }
-
-      return WalletsUtils
-        .getCallArgs(api, options, values)
-        .then((callArgs) => {
-          if (!callArgs) {
-            return { func, options, values };
-          }
-
-          return callArgs;
-        });
-    })
-    .then(({ func, options, values }) => {
-      if (func) {
-        options.data = func.contract.getCallData(func, options, values);
-      }
-
-      if (!options.value) {
-        options.value = new BigNumber(0);
-      }
-
-      return options;
-    });
-}
-
-export function estimateGas (_func, _options, _values = []) {
-  const { api } = _func.contract;
-
-  return getTxOptions(api, _func, _options, _values)
-    .then((options) => {
-      return api.eth.estimateGas(options);
-    });
-}
-
-export function postTransaction (_func, _options, _values = []) {
-  const { api } = _func.contract;
-
-  return getTxOptions(api, _func, _options, _values)
-    .then((options) => {
-      return api.parity.postTransaction(options);
-    });
-}
-
-export function deployEstimateGas (contract, _options, values) {
-  const options = { ..._options };
-  const { api } = contract;
-  const address = options.from;
-
-  return WalletsUtils
-    .isWallet(api, address)
-    .then((isWallet) => {
-      if (!isWallet) {
-        return contract.deployEstimateGas(options, values);
-      }
-
-      return WalletsUtils
-        .getDeployArgs(contract, options, values)
-        .then((callArgs) => {
-          const { func, options, values } = callArgs;
-
-          return func.estimateGas(options, values);
-        })
-        .then((gasEst) => {
-          return [gasEst, gasEst.mul(1.05)];
-        });
-    });
-}
-
-export function deploy (contract, options, values, skipGasEstimate = false) {
-  const { api } = contract;
-  const address = options.from;
-
-  const gasEstPromise = skipGasEstimate
-    ? Promise.resolve(null)
-    : deployEstimateGas(contract, options, values).then(([gasEst, gas]) => gas);
-
-  return gasEstPromise
-    .then((gas) => {
-      if (gas) {
-        options.gas = gas.toFixed(0);
-      }
-
-      return WalletsUtils.isWallet(api, address);
-    })
-    .then((isWallet) => {
-      if (!isWallet) {
-        const encodedOptions = contract._encodeOptions(contract.constructors[0], options, values);
-
-        return api.parity.postTransaction(encodedOptions);
-      }
-
-      return WalletsUtils.getDeployArgs(contract, options, values)
-        .then((callArgs) => {
-          const { func, options, values } = callArgs;
-
-          return func._postTransaction(options, values);
-        });
-    });
-}
-
-export function parseTransactionReceipt (api, options, receipt) {
-  if (receipt.gasUsed.eq(options.gas)) {
-    const error = new Error(`Contract not deployed, gasUsed == ${options.gas.toFixed(0)}`);
-
-    return Promise.reject(error);
-  }
-
-  // If regular contract creation, only validate the contract
-  if (receipt.contractAddress) {
-    return validateContract(api, receipt.contractAddress);
-  }
-
-  // Otherwise, needs to check for a contract deployment
-  // from a multisig wallet
-  const walletResult = WalletsUtils.parseTransactionLogs(api, options, receipt.logs || []);
-
-  if (!walletResult) {
-    const error = new Error('Something went wrong in the contract deployment...');
-
-    return Promise.reject(error);
-  }
-
-  if (walletResult.pending) {
-    return Promise.resolve(null);
-  }
-
-  return validateContract(api, walletResult.contractAddress);
-}
-
-function validateContract (api, contractAddress) {
-  return api.eth
-    .getCode(contractAddress)
-    .then((code) => {
-      if (code === '0x') {
-        throw new Error('Contract not deployed, getCode returned 0x');
-      }
-
-      return contractAddress;
-    });
-}
-
-export function patchApi (api) {
-  api.patch = {
-    ...api.patch,
-    contract: patchContract
-  };
-}
-
-export function patchContract (contract) {
-  contract._functions.forEach((func) => {
-    if (!func.constant) {
-      func._postTransaction = func.postTransaction;
-      func._estimateGas = func.estimateGas;
-
-      func.postTransaction = postTransaction.bind(contract, func);
-      func.estimateGas = estimateGas.bind(contract, func);
-    }
-  });
-}
-
-export function checkIfTxFailed (api, tx, gasSent) {
-  return api.pollMethod('eth_getTransactionReceipt', tx)
-  .then((receipt) => {
-    // TODO: Right now, there's no way to tell wether the EVM code crashed.
-    // Because you usually send a bit more gas than estimated (to make sure
-    // it gets mined quickly), we transaction probably failed if all the gas
-    // has been used up.
-    return receipt.gasUsed.eq(gasSent);
-  });
-}
-
-export function waitForConfirmations (api, tx, confirmations) {
-  return new Promise((resolve, reject) => {
-    api.pollMethod('eth_getTransactionReceipt', tx, isValidReceipt)
-    .then((receipt) => {
-      let subscription;
-
-      api.subscribe('eth_blockNumber', (err, block) => {
-        if (err) {
-          reject(err);
-        } else if (block.minus(confirmations - 1).gte(receipt.blockNumber)) {
-          if (subscription) {
-            api.unsubscribe(subscription);
-          }
-          resolve();
-        }
-      })
-      .then((_subscription) => {
-        subscription = _subscription;
-      })
-      .catch(reject);
-    });
-  });
-}
diff --git a/js/src/util/validation.js b/js/src/util/validation.js
deleted file mode 100644
index e0551a33904d3165b9bd9826287cdac794dfe42f..0000000000000000000000000000000000000000
--- a/js/src/util/validation.js
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import apiutil from '~/api/util';
-
-import { NULL_ADDRESS } from './constants';
-
-// TODO: Convert to FormattedMessages as soon as comfortable with the impact, i.e. errors
-// not being concatted into strings in components, all supporting a non-string format
-export const ERRORS = {
-  invalidAddress: 'address is an invalid network address',
-  invalidAmount: 'the supplied amount should be a valid positive number',
-  invalidAmountDecimals: 'the supplied amount exceeds the allowed decimals',
-  duplicateAddress: 'the address is already in your address book',
-  invalidChecksum: 'address has failed the checksum formatting',
-  invalidName: 'name should not be blank and longer than 2',
-  invalidAbi: 'abi should be a valid JSON array',
-  invalidCode: 'code should be the compiled hex string',
-  invalidNumber: 'invalid number format',
-  negativeNumber: 'input number should be positive',
-  decimalNumber: 'input number should not contain decimals',
-  gasException: 'the transaction will throw an exception with the current values',
-  gasBlockLimit: 'the transaction execution will exceed the block gas limit'
-};
-
-export function validateAbi (abi) {
-  let abiError = null;
-  let abiParsed = null;
-
-  try {
-    abiParsed = JSON.parse(abi);
-
-    if (!apiutil.isArray(abiParsed)) {
-      abiError = ERRORS.invalidAbi;
-
-      return {
-        error: abiError,
-        abi,
-        abiError,
-        abiParsed
-      };
-    }
-
-    // Validate each elements of the Array
-    const invalidIndex = abiParsed
-      .map((o) => isValidAbiEvent(o) || isValidAbiFunction(o) || isAbiFallback(o))
-      .findIndex((valid) => !valid);
-
-    if (invalidIndex !== -1) {
-      const invalid = abiParsed[invalidIndex];
-
-      // TODO: Needs seperate error when using FormattedMessage (no concats)
-      abiError = `${ERRORS.invalidAbi} (#${invalidIndex}: ${invalid.name || invalid.type})`;
-
-      return {
-        error: abiError,
-        abi,
-        abiError,
-        abiParsed
-      };
-    }
-
-    abi = JSON.stringify(abiParsed);
-  } catch (error) {
-    abiError = ERRORS.invalidAbi;
-  }
-
-  return {
-    error: abiError,
-    abi,
-    abiError,
-    abiParsed
-  };
-}
-
-function isValidAbiFunction (object) {
-  if (!object) {
-    return false;
-  }
-
-  return ((object.type === 'function' && object.name) || object.type === 'constructor') &&
-    (object.inputs && apiutil.isArray(object.inputs));
-}
-
-function isAbiFallback (object) {
-  if (!object) {
-    return false;
-  }
-
-  return object.type === 'fallback';
-}
-
-function isValidAbiEvent (object) {
-  if (!object) {
-    return false;
-  }
-
-  return (object.type === 'event') &&
-    (object.name) &&
-    (object.inputs && apiutil.isArray(object.inputs));
-}
-
-export function validateAddress (address) {
-  let addressError = null;
-
-  if (!address) {
-    addressError = ERRORS.invalidAddress;
-  } else if (!apiutil.isAddressValid(address)) {
-    addressError = ERRORS.invalidAddress;
-  } else {
-    address = apiutil.toChecksumAddress(address);
-  }
-
-  return {
-    error: addressError,
-    address,
-    addressError
-  };
-}
-
-export function validateCode (code) {
-  let codeError = null;
-
-  if (!code || !code.length) {
-    codeError = ERRORS.invalidCode;
-  } else if (!apiutil.isHex(code)) {
-    codeError = ERRORS.invalidCode;
-  }
-
-  return {
-    error: codeError,
-    code,
-    codeError
-  };
-}
-
-export function validateName (name) {
-  const nameError = !name || name.trim().length < 2
-    ? ERRORS.invalidName
-    : null;
-
-  return {
-    error: nameError,
-    name,
-    nameError
-  };
-}
-
-export function validatePositiveNumber (number) {
-  let numberError = null;
-
-  try {
-    const v = new BigNumber(number);
-
-    if (v.lt(0)) {
-      numberError = ERRORS.invalidAmount;
-    }
-  } catch (e) {
-    numberError = ERRORS.invalidAmount;
-  }
-
-  return {
-    error: numberError,
-    number,
-    numberError
-  };
-}
-
-export function validateDecimalsNumber (number, base = 1) {
-  let numberError = null;
-
-  try {
-    const s = new BigNumber(number).mul(base).toFixed();
-
-    if (s.indexOf('.') !== -1) {
-      numberError = ERRORS.invalidAmountDecimals;
-    }
-  } catch (e) {
-    numberError = ERRORS.invalidAmount;
-  }
-
-  return {
-    error: numberError,
-    number,
-    numberError
-  };
-}
-
-export function validateUint (value) {
-  let valueError = null;
-
-  try {
-    const bn = new BigNumber(value);
-
-    if (bn.lt(0)) {
-      valueError = ERRORS.negativeNumber;
-    } else if (!bn.isInteger()) {
-      valueError = ERRORS.decimalNumber;
-    }
-  } catch (e) {
-    valueError = ERRORS.invalidNumber;
-  }
-
-  return {
-    error: valueError,
-    value,
-    valueError
-  };
-}
-
-export function isNullAddress (address) {
-  if (address && address.substr(0, 2) === '0x') {
-    return isNullAddress(address.substr(2));
-  }
-
-  return address === NULL_ADDRESS;
-}
diff --git a/js/src/util/validation.spec.js b/js/src/util/validation.spec.js
deleted file mode 100644
index 3b9c00a72ff391ef810ab9229b33b7fef440e936..0000000000000000000000000000000000000000
--- a/js/src/util/validation.spec.js
+++ /dev/null
@@ -1,333 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import { NULL_ADDRESS } from './constants';
-import { ERRORS, isNullAddress, validateAbi, validateAddress, validateCode, validateName, validatePositiveNumber, validateUint } from './validation';
-
-describe('util/validation', () => {
-  describe('validateAbi', () => {
-    it('passes on valid ABI', () => {
-      const abi = '[{"type":"function","name":"test","inputs":[],"outputs":[]}]';
-
-      expect(validateAbi(abi)).to.deep.equal({
-        abi,
-        abiError: null,
-        abiParsed: [{
-          type: 'function',
-          name: 'test',
-          inputs: [],
-          outputs: []
-        }],
-        error: null
-      });
-    });
-
-    it('passes on valid ABI & trims ABI', () => {
-      const abi = '[ { "type" : "function" , "name" : "test" , "inputs" : [] , "outputs" : [] } ]';
-
-      expect(validateAbi(abi)).to.deep.equal({
-        abi: '[{"type":"function","name":"test","inputs":[],"outputs":[]}]',
-        abiError: null,
-        abiParsed: [{
-          type: 'function',
-          name: 'test',
-          inputs: [],
-          outputs: []
-        }],
-        error: null
-      });
-    });
-
-    it('sets error on invalid JSON', () => {
-      const abi = 'this is not json';
-
-      expect(validateAbi(abi)).to.deep.equal({
-        abi,
-        abiError: ERRORS.invalidAbi,
-        abiParsed: null,
-        error: ERRORS.invalidAbi
-      });
-    });
-
-    it('sets error on non-array JSON', () => {
-      const abi = '{}';
-
-      expect(validateAbi(abi)).to.deep.equal({
-        abi,
-        abiError: ERRORS.invalidAbi,
-        abiParsed: {},
-        error: ERRORS.invalidAbi
-      });
-    });
-
-    it('fails with invalid event', () => {
-      const abi = '[{ "type":"event" }]';
-
-      expect(validateAbi(abi)).to.deep.equal({
-        abi,
-        abiError: `${ERRORS.invalidAbi} (#0: event)`,
-        abiParsed: [{ type: 'event' }],
-        error: `${ERRORS.invalidAbi} (#0: event)`
-      });
-    });
-
-    it('fails with invalid function', () => {
-      const abi = '[{ "type":"function" }]';
-
-      expect(validateAbi(abi)).to.deep.equal({
-        abi,
-        abiError: `${ERRORS.invalidAbi} (#0: function)`,
-        abiParsed: [{ type: 'function' }],
-        error: `${ERRORS.invalidAbi} (#0: function)`
-      });
-    });
-
-    it('fails with unknown type', () => {
-      const abi = '[{ "type":"somethingElse" }]';
-
-      expect(validateAbi(abi)).to.deep.equal({
-        abi,
-        abiError: `${ERRORS.invalidAbi} (#0: somethingElse)`,
-        abiParsed: [{ type: 'somethingElse' }],
-        error: `${ERRORS.invalidAbi} (#0: somethingElse)`
-      });
-    });
-  });
-
-  describe('validateAddress', () => {
-    it('validates address', () => {
-      const address = '0x1234567890123456789012345678901234567890';
-
-      expect(validateAddress(address)).to.deep.equal({
-        address,
-        addressError: null,
-        error: null
-      });
-    });
-
-    it('validates address and converts to checksum', () => {
-      const address = '0x5A5eFF38DA95b0D58b6C616f2699168B480953C9';
-
-      expect(validateAddress(address.toLowerCase())).to.deep.equal({
-        address,
-        addressError: null,
-        error: null
-      });
-    });
-
-    it('sets error on null addresses', () => {
-      expect(validateAddress(null)).to.deep.equal({
-        address: null,
-        addressError: ERRORS.invalidAddress,
-        error: ERRORS.invalidAddress
-      });
-    });
-
-    it('sets error on invalid addresses', () => {
-      const address = '0x12344567';
-
-      expect(validateAddress(address)).to.deep.equal({
-        address,
-        addressError: ERRORS.invalidAddress,
-        error: ERRORS.invalidAddress
-      });
-    });
-  });
-
-  describe('validateCode', () => {
-    it('validates hex code', () => {
-      expect(validateCode('0x123abc')).to.deep.equal({
-        code: '0x123abc',
-        codeError: null,
-        error: null
-      });
-    });
-
-    it('validates hex code (non-prefix)', () => {
-      expect(validateCode('123abc')).to.deep.equal({
-        code: '123abc',
-        codeError: null,
-        error: null
-      });
-    });
-
-    it('sets error on invalid code', () => {
-      expect(validateCode(null)).to.deep.equal({
-        code: null,
-        codeError: ERRORS.invalidCode,
-        error: ERRORS.invalidCode
-      });
-    });
-
-    it('sets error on empty code', () => {
-      expect(validateCode('')).to.deep.equal({
-        code: '',
-        codeError: ERRORS.invalidCode,
-        error: ERRORS.invalidCode
-      });
-    });
-
-    it('sets error on non-hex code', () => {
-      expect(validateCode('123hfg')).to.deep.equal({
-        code: '123hfg',
-        codeError: ERRORS.invalidCode,
-        error: ERRORS.invalidCode
-      });
-    });
-  });
-
-  describe('validateName', () => {
-    it('validates names', () => {
-      expect(validateName('Joe Bloggs')).to.deep.equal({
-        name: 'Joe Bloggs',
-        nameError: null,
-        error: null
-      });
-    });
-
-    it('sets error on null names', () => {
-      expect(validateName(null)).to.deep.equal({
-        name: null,
-        nameError: ERRORS.invalidName,
-        error: ERRORS.invalidName
-      });
-    });
-
-    it('sets error on short names', () => {
-      expect(validateName('  1  ')).to.deep.equal({
-        name: '  1  ',
-        nameError: ERRORS.invalidName,
-        error: ERRORS.invalidName
-      });
-    });
-  });
-
-  describe('validatePositiveNumber', () => {
-    it('validates numbers', () => {
-      expect(validatePositiveNumber(123)).to.deep.equal({
-        number: 123,
-        numberError: null,
-        error: null
-      });
-    });
-
-    it('validates strings', () => {
-      expect(validatePositiveNumber('123')).to.deep.equal({
-        number: '123',
-        numberError: null,
-        error: null
-      });
-    });
-
-    it('validates bignumbers', () => {
-      expect(validatePositiveNumber(new BigNumber(123))).to.deep.equal({
-        number: new BigNumber(123),
-        numberError: null,
-        error: null
-      });
-    });
-
-    it('sets error on invalid numbers', () => {
-      expect(validatePositiveNumber(null)).to.deep.equal({
-        number: null,
-        numberError: ERRORS.invalidAmount,
-        error: ERRORS.invalidAmount
-      });
-    });
-
-    it('sets error on negative numbers', () => {
-      expect(validatePositiveNumber(-1)).to.deep.equal({
-        number: -1,
-        numberError: ERRORS.invalidAmount,
-        error: ERRORS.invalidAmount
-      });
-    });
-  });
-
-  describe('validateUint', () => {
-    it('validates numbers', () => {
-      expect(validateUint(123)).to.deep.equal({
-        value: 123,
-        valueError: null,
-        error: null
-      });
-    });
-
-    it('validates strings', () => {
-      expect(validateUint('123')).to.deep.equal({
-        value: '123',
-        valueError: null,
-        error: null
-      });
-    });
-
-    it('validates bignumbers', () => {
-      expect(validateUint(new BigNumber(123))).to.deep.equal({
-        value: new BigNumber(123),
-        valueError: null,
-        error: null
-      });
-    });
-
-    it('sets error on invalid numbers', () => {
-      expect(validateUint(null)).to.deep.equal({
-        value: null,
-        valueError: ERRORS.invalidNumber,
-        error: ERRORS.invalidNumber
-      });
-    });
-
-    it('sets error on negative numbers', () => {
-      expect(validateUint(-1)).to.deep.equal({
-        value: -1,
-        valueError: ERRORS.negativeNumber,
-        error: ERRORS.negativeNumber
-      });
-    });
-
-    it('sets error on decimal numbers', () => {
-      expect(validateUint(3.1415927)).to.deep.equal({
-        value: 3.1415927,
-        valueError: ERRORS.decimalNumber,
-        error: ERRORS.decimalNumber
-      });
-    });
-  });
-
-  describe('isNullAddress', () => {
-    it('verifies a prefixed null address', () => {
-      expect(isNullAddress(`0x${NULL_ADDRESS}`)).to.be.true;
-    });
-
-    it('verifies a non-prefixed null address', () => {
-      expect(isNullAddress(NULL_ADDRESS)).to.be.true;
-    });
-
-    it('sets false on a null value', () => {
-      expect(isNullAddress(null)).to.be.false;
-    });
-
-    it('sets false on a non-full length 00..00 value', () => {
-      expect(isNullAddress(NULL_ADDRESS.slice(2))).to.be.false;
-    });
-
-    it('sets false on a valid addess, non 00..00 value', () => {
-      expect(isNullAddress('0x1234567890123456789012345678901234567890')).to.be.false;
-    });
-  });
-});
diff --git a/js/src/util/wallets.js b/js/src/util/wallets.js
deleted file mode 100644
index 6b1c29d01c05aece9790cce376809f752a4fcdd1..0000000000000000000000000000000000000000
--- a/js/src/util/wallets.js
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { intersection } from 'lodash';
-
-import ConsensysWalletUtils from './wallets/consensys-wallet';
-import FoundationWalletUtils from './wallets/foundation-wallet';
-
-const CONSENSYS_WALLET = 'CONSENSYS_WALLET';
-const FOUNDATION_WALLET = 'FOUNDATION_WALLET';
-
-const _cachedWalletLookup = {};
-const _cachedWalletTypes = {};
-let _cachedAccounts = {};
-
-export default class WalletsUtils {
-  static cacheAccounts (accounts) {
-    _cachedAccounts = accounts;
-  }
-
-  static delegateCall (api, address, method, args = []) {
-    return WalletsUtils.getWalletType(api, address)
-      .then((walletType) => {
-        if (walletType === CONSENSYS_WALLET) {
-          return ConsensysWalletUtils[method].apply(null, args);
-        }
-
-        return FoundationWalletUtils[method].apply(null, args);
-      });
-  }
-
-  static fetchDailylimit (walletContract) {
-    const { api } = walletContract;
-
-    return WalletsUtils
-      .delegateCall(api, walletContract.address, 'fetchDailylimit', [ walletContract ]);
-  }
-
-  static fetchOwners (walletContract) {
-    const { api } = walletContract;
-
-    return WalletsUtils
-      .delegateCall(api, walletContract.address, 'fetchOwners', [ walletContract ]);
-  }
-
-  static fetchRequire (walletContract) {
-    const { api } = walletContract;
-
-    return WalletsUtils
-      .delegateCall(api, walletContract.address, 'fetchRequire', [ walletContract ]);
-  }
-
-  static fetchPendingTransactions (walletContract, cache) {
-    const { api } = walletContract;
-
-    return WalletsUtils
-      .delegateCall(api, walletContract.address, 'fetchPendingTransactions', [ walletContract, cache ]);
-  }
-
-  static fetchTransactions (walletContract) {
-    const { api } = walletContract;
-
-    return WalletsUtils
-      .delegateCall(api, walletContract.address, 'fetchTransactions', [ walletContract ])
-      .then((transactions) => {
-        return transactions.sort((txA, txB) => {
-          const comp = txB.blockNumber.comparedTo(txA.blockNumber);
-
-          if (comp !== 0) {
-            return comp;
-          }
-
-          return txB.transactionIndex.comparedTo(txA.transactionIndex);
-        });
-      });
-  }
-
-  static getCallArgs (api, options, values = []) {
-    const walletAddress = options.from;
-    let walletContract;
-    let submitMethod;
-
-    return Promise
-      .all([
-        WalletsUtils.getWalletContract(api, walletAddress),
-        WalletsUtils.delegateCall(api, walletAddress, 'getSubmitMethod')
-      ])
-      .then(([ _walletContract, _submitMethod ]) => {
-        walletContract = _walletContract;
-        submitMethod = _submitMethod;
-
-        return WalletsUtils.fetchOwners(walletContract);
-      })
-      .then((owners) => {
-        const addresses = Object.keys(_cachedAccounts);
-        const ownerAddress = intersection(addresses, owners).pop();
-
-        if (!ownerAddress) {
-          return false;
-        }
-
-        const account = _cachedAccounts[ownerAddress];
-        const _options = { ...options };
-        const { to, value = new BigNumber(0), data } = _options;
-
-        delete _options.data;
-
-        const nextValues = [ to, value, data ];
-        const nextOptions = {
-          ..._options,
-          from: options.sender || ownerAddress,
-          to: walletAddress,
-          value: new BigNumber(0)
-        };
-
-        const execFunc = walletContract.instance[submitMethod];
-        const callArgs = { func: execFunc, options: nextOptions, values: nextValues };
-
-        if (!account.wallet) {
-          return callArgs;
-        }
-
-        const nextData = walletContract.getCallData(execFunc, nextOptions, nextValues);
-
-        return WalletsUtils.getCallArgs(api, { ...nextOptions, data: nextData }, nextValues);
-      });
-  }
-
-  static getChangeMethod (api, address, change) {
-    return WalletsUtils
-      .delegateCall(api, address, 'getChangeMethod', [ api, address, change ]);
-  }
-
-  static getDeployArgs (contract, options, values) {
-    const { api } = contract;
-    const func = contract.constructors[0];
-
-    options.data = contract.getCallData(func, options, values);
-    options.to = '0x';
-
-    return WalletsUtils
-      .getCallArgs(api, options, values)
-      .then((callArgs) => {
-        if (!callArgs) {
-          console.error('no call args', callArgs);
-          throw new Error('you do not own this wallet');
-        }
-
-        return callArgs;
-      });
-  }
-
-  static getWalletContract (api, address) {
-    return WalletsUtils
-      .delegateCall(api, address, 'getWalletContract', [ api ])
-      .then((walletContract) => {
-        return walletContract.at(address);
-      });
-  }
-
-  static getWalletType (api, address) {
-    if (_cachedWalletTypes[address] === undefined) {
-      _cachedWalletTypes[address] = Promise.resolve(null)
-        .then((result) => {
-          if (result) {
-            return result;
-          }
-
-          return FoundationWalletUtils.isWallet(api, address)
-            .then((isWallet) => isWallet && FOUNDATION_WALLET);
-        })
-        .then((result) => {
-          if (result) {
-            return result;
-          }
-
-          return ConsensysWalletUtils.isWallet(api, address)
-            .then((isWallet) => isWallet && CONSENSYS_WALLET);
-        })
-        .then((result) => {
-          _cachedWalletTypes[address] = result || null;
-
-          return _cachedWalletTypes[address];
-        });
-    }
-
-    return Promise.resolve(_cachedWalletTypes[address]);
-  }
-
-  /**
-   * Check whether the given address could be
-   * a Wallet. The result is cached in order not
-   * to make unnecessary calls on non-wallet accounts
-   */
-  static isWallet (api, address) {
-    if (!address) {
-      return Promise.resolve(false);
-    }
-
-    if (!_cachedWalletLookup[address]) {
-      _cachedWalletLookup[address] = WalletsUtils.getWalletType(api, address)
-        .then((walletType) => walletType !== null)
-        .then((bool) => {
-          _cachedWalletLookup[address] = Promise.resolve(bool);
-          return bool;
-        });
-    }
-
-    return _cachedWalletLookup[address];
-  }
-
-  static logToUpdate (api, address, log) {
-    return WalletsUtils
-      .delegateCall(api, address, 'logToUpdate', [ log ]);
-  }
-
-  static parseTransactionLogs (api, options, rawLogs) {
-    return WalletsUtils
-      .delegateCall(api, options.from, 'parseTransactionLogs', [ api, options, rawLogs ]);
-  }
-
-  static postModifyOperation (api, walletAddress, modification, owner, operation) {
-    const options = { from: owner };
-    const values = [ operation ];
-
-    return Promise
-      .all([
-        WalletsUtils
-          .getWalletContract(api, walletAddress),
-        WalletsUtils
-          .delegateCall(api, walletAddress, 'getModifyOperationMethod', [ modification ])
-      ])
-      .then(([ wallet, method ]) => {
-        return wallet.instance[method]
-          .estimateGas(options, values)
-          .then((gas) => {
-            options.gas = gas.mul(1.5);
-            return wallet.instance[method].postTransaction(options, values);
-          });
-      });
-  }
-}
diff --git a/js/src/util/wallets/consensys-wallet.js b/js/src/util/wallets/consensys-wallet.js
deleted file mode 100644
index 9f9f9d5fa4e928aef79b384249024b5d1dd55d1f..0000000000000000000000000000000000000000
--- a/js/src/util/wallets/consensys-wallet.js
+++ /dev/null
@@ -1,354 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import Abi from '~/abi';
-import Contract from '~/api/contract';
-import { toHex } from '~/api/util/format';
-
-import WalletAbi from '~/contracts/abi/consensys-multisig-wallet.json';
-
-import {
-  UPDATE_OWNERS,
-  UPDATE_REQUIRE,
-  UPDATE_TRANSACTIONS,
-  UPDATE_CONFIRMATIONS
-} from './updates';
-
-const WALLET_CONTRACT = new Contract({}, WalletAbi);
-const WALLET_ABI = new Abi(WalletAbi);
-
-const walletEvents = WALLET_ABI.events.reduce((events, event) => {
-  events[event.name] = event;
-  return events;
-}, {});
-
-const WalletSignatures = {
-  Confirmation: toHex(walletEvents.Confirmation.signature),
-  Revocation: toHex(walletEvents.Revocation.signature),
-  Deposit: toHex(walletEvents.Deposit.signature),
-  Execution: toHex(walletEvents.Execution.signature),
-  OwnerAddition: toHex(walletEvents.OwnerAddition.signature),
-  OwnerRemoval: toHex(walletEvents.OwnerRemoval.signature),
-  RequirementChange: toHex(walletEvents.RequirementChange.signature),
-  Submission: toHex(walletEvents.Submission.signature)
-};
-
-export default class ConsensysWalletUtils {
-  static fetchOwners (inWallet) {
-    const wallet = new Contract(inWallet.api, WalletAbi).at(inWallet.address);
-
-    return wallet.instance.getOwners.call()
-      .then((owners) => {
-        return owners.map((token) => token.value);
-      });
-  }
-
-  static fetchPendingTransactions (inWallet) {
-    const wallet = new Contract(inWallet.api, WalletAbi).at(inWallet.address);
-
-    let transactions;
-    let txIds;
-
-    // Get pending and not exectued transactions
-    return wallet.instance.getTransactionCount
-      .call({}, [ true, false ])
-      .then((txCount) => {
-        // Get all the pending transactions
-        const fromId = 0;
-        const toId = txCount;
-
-        return wallet.instance.getTransactionIds
-          .call({}, [ fromId, toId, true, false ]);
-      })
-      .then((_txIds) => {
-        txIds = _txIds.map((token) => token.value);
-
-        const promises = txIds.map((txId) => {
-          return wallet.instance.transactions
-            .call({}, [ txId ]);
-        });
-
-        return Promise.all(promises);
-      })
-      .then((transactions) => {
-        return transactions.map((transaction, index) => {
-          const [ destination, value, data ] = transaction;
-          const id = toHex(txIds[index]);
-
-          return {
-            to: destination,
-            data,
-            value,
-            operation: id
-          };
-        });
-      })
-      .then((_transactions) => {
-        transactions = _transactions;
-
-        return wallet
-          .getAllLogs({
-            topics: [
-              WalletSignatures.Submission,
-              txIds.map((txId) => toHex(txId))
-            ]
-          });
-      })
-      .then((logs) => {
-        transactions.forEach((tx) => {
-          const log = logs
-            .find((log) => {
-              const id = toHex(log.params.transactionId.value);
-
-              return id === tx.operation;
-            });
-
-          if (!log) {
-            console.warn('could not find a Submission log for this operation', tx);
-            return;
-          }
-
-          tx.transactionIndex = log.transactionIndex;
-          tx.transactionHash = log.transactionHash;
-          tx.blockNumber = log.blockNumber;
-        });
-
-        const confirmationsPromises = transactions.map((tx) => {
-          return wallet.instance.getConfirmations
-            .call({}, [ tx.operation ])
-            .then((owners) => {
-              return owners.map((token) => token.value);
-            });
-        });
-
-        return Promise.all(confirmationsPromises);
-      })
-      .then((confirmations) => {
-        transactions.forEach((tx, index) => {
-          tx.confirmedBy = confirmations[index];
-        });
-
-        return transactions;
-      });
-  }
-
-  static fetchRequire (inWallet) {
-    const wallet = new Contract(inWallet.api, WalletAbi).at(inWallet.address);
-
-    return wallet.instance.required.call();
-  }
-
-  static fetchTransactions (inWallet) {
-    const wallet = new Contract(inWallet.api, WalletAbi).at(inWallet.address);
-
-    let transactions;
-    let txIds;
-
-    return wallet.instance.getTransactionCount
-      .call({}, [ false, true ])
-      .then((txCount) => {
-        // Get the 20 last transactions
-        const fromId = Math.max(0, txCount - 20);
-        const toId = txCount;
-
-        return wallet.instance.getTransactionIds
-          .call({}, [ fromId, toId, false, true ]);
-      })
-      .then((_txIds) => {
-        txIds = _txIds.map((token) => token.value);
-
-        const promises = txIds.map((txId) => {
-          return wallet.instance.transactions
-            .call({}, [ txId ]);
-        });
-
-        return Promise.all(promises);
-      })
-      .then((transactions) => {
-        return transactions.map((transaction, index) => {
-          const [ destination, value, data, executed ] = transaction;
-          const id = toHex(txIds[index]);
-
-          return {
-            destination, value, data, executed, id
-          };
-        });
-      })
-      .then((_transactions) => {
-        transactions = _transactions;
-
-        const depositLogs = wallet
-          .getAllLogs({
-            topics: [ WalletSignatures.Deposit ]
-          });
-
-        const executionLogs = wallet
-          .getAllLogs({
-            topics: [ WalletSignatures.Execution, txIds ]
-          });
-
-        return Promise.all([ depositLogs, executionLogs ]);
-      })
-      .then(([ depositLogs, executionLogs ]) => {
-        const logs = [].concat(depositLogs, executionLogs);
-
-        return logs.map((log) => {
-          const signature = toHex(log.topics[0]);
-
-          const transaction = {
-            transactionHash: log.transactionHash,
-            blockNumber: log.blockNumber
-          };
-
-          if (signature === WalletSignatures.Deposit) {
-            transaction.from = log.params.sender.value;
-            transaction.value = log.params.value.value;
-            transaction.to = wallet.address;
-          } else {
-            const txId = toHex(log.params.transactionId.value);
-            const tx = transactions.find((tx) => tx.id === txId);
-
-            transaction.from = wallet.address;
-            transaction.to = tx.destination;
-            transaction.value = tx.value;
-            transaction.data = tx.data;
-            transaction.operation = toHex(tx.id);
-          }
-
-          return transaction;
-        });
-      });
-  }
-
-  static getChangeMethod (api, address, change) {
-    const wallet = new Contract(api, WalletAbi).at(address);
-    const walletInstance = wallet.instance;
-
-    let data = '';
-
-    if (change.type === 'require') {
-      const func = walletInstance.changeRequirement;
-
-      data = wallet.getCallData(func, {}, [ change.value ]);
-    }
-
-    if (change.type === 'add_owner') {
-      const func = walletInstance.addOwner;
-
-      data = wallet.getCallData(func, {}, [ change.value ]);
-    }
-
-    if (change.type === 'change_owner') {
-      const func = walletInstance.replaceOwner;
-
-      data = wallet.getCallData(func, {}, [ change.value.from, change.value.to ]);
-    }
-
-    if (change.type === 'remove_owner') {
-      const func = walletInstance.removeOwner;
-
-      data = wallet.getCallData(func, {}, [ change.value ]);
-    }
-
-    const method = walletInstance.submitTransaction;
-    const values = [ address, 0, data ];
-
-    return { method, values };
-  }
-
-  static getModifyOperationMethod (modification) {
-    switch (modification) {
-      case 'confirm':
-        return 'confirmTransaction';
-
-      case 'revoke':
-        return 'revokeConfirmation';
-
-      default:
-        return '';
-    }
-  }
-
-  static getSubmitMethod () {
-    return 'submitTransaction';
-  }
-
-  static getWalletContract (api) {
-    return new Contract(api, WalletAbi);
-  }
-
-  static getWalletSignatures () {
-    return WalletSignatures;
-  }
-
-  static fetchDailylimit () {
-    return {
-      last: new BigNumber(0),
-      limit: new BigNumber(0),
-      spent: new BigNumber(0)
-    };
-  }
-
-  static isWallet (api, address) {
-    const wallet = new Contract(api, WalletAbi).at(address);
-
-    return ConsensysWalletUtils.fetchRequire(wallet)
-      .then((result) => {
-        if (!result || result.equals(0)) {
-          return false;
-        }
-
-        return true;
-      });
-  }
-
-  static logToUpdate (log) {
-    const eventSignature = toHex(log.topics[0]);
-
-    switch (eventSignature) {
-      case WalletSignatures.OwnerAddition:
-      case WalletSignatures.OwnerRemoval:
-        return { [ UPDATE_OWNERS ]: true };
-
-      case WalletSignatures.RequirementChange:
-        return { [ UPDATE_REQUIRE ]: true };
-
-      case WalletSignatures.Deposit:
-      case WalletSignatures.Execution:
-        return { [ UPDATE_TRANSACTIONS ]: true };
-
-      case WalletSignatures.Submission:
-      case WalletSignatures.Confirmation:
-      case WalletSignatures.Revocation:
-        const parsedLog = WALLET_CONTRACT.parseEventLogs([ log ])[0];
-        const operation = toHex(parsedLog.params.transactionId.value);
-
-        return { [ UPDATE_CONFIRMATIONS ]: operation };
-
-      default:
-        return {};
-    }
-  }
-
-  /**
-   * This type of wallet cannot create any contract...
-   */
-  static parseTransactionLogs (api, options, rawLogs) {
-    return null;
-  }
-}
diff --git a/js/src/util/wallets/foundation-wallet.js b/js/src/util/wallets/foundation-wallet.js
deleted file mode 100644
index 4fb1cfe220787503035ebed50b0bbf2438d6f431..0000000000000000000000000000000000000000
--- a/js/src/util/wallets/foundation-wallet.js
+++ /dev/null
@@ -1,500 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { range, uniq } from 'lodash';
-
-import Abi from '~/abi';
-import Contract from '~/api/contract';
-import { bytesToHex, toHex } from '~/api/util/format';
-import { validateAddress } from '~/util/validation';
-
-import WalletAbi from '~/contracts/abi/foundation-multisig-wallet.json';
-import OldWalletAbi from '~/contracts/abi/old-wallet.json';
-
-import PendingContracts from './pending-contracts';
-import {
-  UPDATE_OWNERS,
-  UPDATE_REQUIRE,
-  UPDATE_TRANSACTIONS,
-  UPDATE_CONFIRMATIONS
-} from './updates';
-
-const WALLET_CONTRACT = new Contract({}, WalletAbi);
-const WALLET_ABI = new Abi(WalletAbi);
-const OLD_WALLET_ABI = new Abi(OldWalletAbi);
-
-const walletEvents = WALLET_ABI.events.reduce((events, event) => {
-  events[event.name] = event;
-  return events;
-}, {});
-
-const oldWalletEvents = OLD_WALLET_ABI.events.reduce((events, event) => {
-  events[event.name] = event;
-  return events;
-}, {});
-
-const WalletSignatures = {
-  OwnerChanged: toHex(walletEvents.OwnerChanged.signature),
-  OwnerAdded: toHex(walletEvents.OwnerAdded.signature),
-  OwnerRemoved: toHex(walletEvents.OwnerRemoved.signature),
-  RequirementChanged: toHex(walletEvents.RequirementChanged.signature),
-  Confirmation: toHex(walletEvents.Confirmation.signature),
-  Revoke: toHex(walletEvents.Revoke.signature),
-  Deposit: toHex(walletEvents.Deposit.signature),
-  SingleTransact: toHex(walletEvents.SingleTransact.signature),
-  MultiTransact: toHex(walletEvents.MultiTransact.signature),
-  ConfirmationNeeded: toHex(walletEvents.ConfirmationNeeded.signature),
-
-  Old: {
-    SingleTransact: toHex(oldWalletEvents.SingleTransact.signature),
-    MultiTransact: toHex(oldWalletEvents.MultiTransact.signature)
-  }
-};
-
-export default class FoundationWalletUtils {
-  static fetchConfirmations (walletContract, operation, _owners = null) {
-    const ownersPromise = _owners
-      ? Promise.resolve(_owners)
-      : FoundationWalletUtils.fetchOwners(walletContract);
-
-    return ownersPromise
-      .then((owners) => {
-        const promises = owners.map((owner) => {
-          return walletContract.instance.hasConfirmed.call({}, [ operation, owner ]);
-        });
-
-        return Promise
-          .all(promises)
-          .then((data) => {
-            return owners.filter((_, index) => data[index]);
-          });
-      });
-  }
-
-  static fetchDailylimit (walletContract) {
-    const walletInstance = walletContract.instance;
-
-    return Promise
-      .all([
-        walletInstance.m_dailyLimit.call(),
-        walletInstance.m_spentToday.call(),
-        walletInstance.m_lastDay.call()
-      ])
-      .then(([ limit, spent, last ]) => ({
-        limit, spent, last
-      }));
-  }
-
-  static fetchOwners (walletContract) {
-    const walletInstance = walletContract.instance;
-
-    return walletInstance
-      .m_numOwners.call()
-      .then((mNumOwners) => {
-        const promises = range(mNumOwners.toNumber())
-          .map((idx) => walletInstance.getOwner.call({}, [ idx ]));
-
-        return Promise
-          .all(promises)
-          .then((_owners) => {
-            const owners = validateOwners(_owners);
-
-            // If all owners are the zero account : must be Mist wallet contract
-            if (!owners) {
-              return fetchMistOwners(walletContract, mNumOwners.toNumber());
-            }
-
-            return owners;
-          });
-      });
-  }
-
-  static fetchPendingTransactions (walletContract, cache = {}) {
-    const { owners, transactions } = cache;
-
-    return walletContract
-      .instance
-      .ConfirmationNeeded
-      .getAllLogs()
-      .then((logs) => {
-        return logs.map((log) => ({
-          initiator: log.params.initiator.value,
-          to: log.params.to.value,
-          data: log.params.data.value,
-          value: log.params.value.value,
-          operation: bytesToHex(log.params.operation.value),
-          transactionIndex: log.transactionIndex,
-          transactionHash: log.transactionHash,
-          blockNumber: log.blockNumber,
-          confirmedBy: []
-        }));
-      })
-      .then((logs) => {
-        return logs.sort((logA, logB) => {
-          const comp = logA.blockNumber.comparedTo(logB.blockNumber);
-
-          if (comp !== 0) {
-            return comp;
-          }
-
-          return logA.transactionIndex.comparedTo(logB.transactionIndex);
-        });
-      })
-      .then((pendingTxs) => {
-        if (pendingTxs.length === 0) {
-          return pendingTxs;
-        }
-
-        // Only fetch confirmations for operations not
-        // yet confirmed (ie. not yet a transaction)
-        if (transactions) {
-          const operations = transactions
-            .filter((t) => t.operation)
-            .map((t) => t.operation);
-
-          return pendingTxs.filter((pendingTx) => {
-            return !operations.includes(pendingTx.operation);
-          });
-        }
-
-        return pendingTxs;
-      })
-      .then((pendingTxs) => {
-        const promises = pendingTxs.map((tx) => {
-          return FoundationWalletUtils
-            .fetchConfirmations(walletContract, tx.operation, owners)
-            .then((confirmedBy) => {
-              tx.confirmedBy = confirmedBy;
-
-              return tx;
-            });
-        });
-
-        return Promise.all(promises);
-      });
-  }
-
-  static fetchRequire (wallet) {
-    return wallet.instance.m_required.call();
-  }
-
-  static fetchTransactions (walletContract) {
-    const { api } = walletContract;
-
-    return walletContract
-      .getAllLogs({
-        topics: [ [
-          WalletSignatures.SingleTransact,
-          WalletSignatures.MultiTransact,
-          WalletSignatures.Deposit,
-          WalletSignatures.Old.SingleTransact,
-          WalletSignatures.Old.MultiTransact
-        ] ]
-      })
-      .then((logs) => {
-        const transactions = logs.map((log) => {
-          const signature = toHex(log.topics[0]);
-
-          const value = log.params.value.value;
-          const from = signature === WalletSignatures.Deposit
-            ? log.params['_from'].value
-            : walletContract.address;
-
-          const to = signature === WalletSignatures.Deposit
-            ? walletContract.address
-            : log.params.to.value;
-
-          const transaction = {
-            transactionHash: log.transactionHash,
-            blockNumber: log.blockNumber,
-            from, to, value
-          };
-
-          if (log.params.created && log.params.created.value && !/^(0x)?0*$/.test(log.params.created.value)) {
-            transaction.creates = log.params.created.value;
-            delete transaction.to;
-          }
-
-          if (log.params.operation) {
-            transaction.operation = bytesToHex(log.params.operation.value);
-            checkPendingOperation(api, log, transaction.operation);
-          }
-
-          if (log.params.data) {
-            transaction.data = log.params.data.value;
-          }
-
-          return transaction;
-        });
-
-        return transactions;
-      });
-  }
-
-  static getChangeMethod (api, address, change) {
-    const wallet = new Contract(api, WalletAbi).at(address);
-    const walletInstance = wallet.instance;
-
-    if (change.type === 'require') {
-      return {
-        method: walletInstance.changeRequirement,
-        values: [ change.value ]
-      };
-    }
-
-    if (change.type === 'dailylimit') {
-      return {
-        method: walletInstance.setDailyLimit,
-        values: [ change.value ]
-      };
-    }
-
-    if (change.type === 'add_owner') {
-      return {
-        method: walletInstance.addOwner,
-        values: [ change.value ]
-      };
-    }
-
-    if (change.type === 'change_owner') {
-      return {
-        method: walletInstance.changeOwner,
-        values: [ change.value.from, change.value.to ]
-      };
-    }
-
-    if (change.type === 'remove_owner') {
-      return {
-        method: walletInstance.removeOwner,
-        values: [ change.value ]
-      };
-    }
-  }
-
-  static getModifyOperationMethod (modification) {
-    switch (modification) {
-      case 'confirm':
-        return 'confirm';
-
-      case 'revoke':
-        return 'revoke';
-
-      default:
-        return '';
-    }
-  }
-
-  static getSubmitMethod () {
-    return 'execute';
-  }
-
-  static getWalletContract (api) {
-    return new Contract(api, WalletAbi);
-  }
-
-  static getWalletSignatures () {
-    return WalletSignatures;
-  }
-
-  static isWallet (api, address) {
-    const walletContract = new Contract(api, WalletAbi);
-
-    return walletContract
-      .at(address)
-      .instance
-      .m_numOwners
-      .call()
-      .then((result) => {
-        if (!result || result.equals(0)) {
-          return false;
-        }
-
-        return true;
-      });
-  }
-
-  static logToUpdate (log) {
-    const eventSignature = toHex(log.topics[0]);
-
-    switch (eventSignature) {
-      case WalletSignatures.OwnerChanged:
-      case WalletSignatures.OwnerAdded:
-      case WalletSignatures.OwnerRemoved:
-        return { [ UPDATE_OWNERS ]: true };
-
-      case WalletSignatures.RequirementChanged:
-        return { [ UPDATE_REQUIRE ]: true };
-
-      case WalletSignatures.ConfirmationNeeded:
-      case WalletSignatures.Confirmation:
-      case WalletSignatures.Revoke:
-        const parsedLog = WALLET_CONTRACT.parseEventLogs([ log ])[0];
-        const operation = bytesToHex(parsedLog.params.operation.value);
-
-        return { [ UPDATE_CONFIRMATIONS ]: operation };
-
-      case WalletSignatures.Deposit:
-      case WalletSignatures.SingleTransact:
-      case WalletSignatures.MultiTransact:
-      case WalletSignatures.Old.SingleTransact:
-      case WalletSignatures.Old.MultiTransact:
-        return { [ UPDATE_TRANSACTIONS ]: true };
-
-      default:
-        return {};
-    }
-  }
-
-  static parseLogs (api, logs = []) {
-    const walletContract = new Contract(api, WalletAbi);
-
-    return walletContract.parseEventLogs(logs);
-  }
-
-  static parseTransactionLogs (api, options, rawLogs) {
-    const { metadata } = options;
-    const address = options.from;
-    const logs = FoundationWalletUtils.parseLogs(api, rawLogs);
-
-    const confirmationLog = logs.find((log) => log.event === 'ConfirmationNeeded');
-    const transactionLog = logs.find((log) => log.event === 'SingleTransact');
-
-    if (!confirmationLog && !transactionLog) {
-      return null;
-    }
-
-    // Confirmations are needed from the other owners
-    if (confirmationLog) {
-      const operationHash = bytesToHex(confirmationLog.params.operation.value);
-
-      // Add the contract to pending contracts
-      PendingContracts.addPendingContract(address, operationHash, metadata);
-
-      return { pending: true };
-    }
-
-    return { contractAddress: transactionLog.params.created.value };
-  }
-}
-
-function checkPendingOperation (api, log, operation) {
-  const pendingContracts = PendingContracts.getPendingContracts();
-
-  // Add the pending contract to the contracts
-  if (pendingContracts[operation]) {
-    const { metadata } = pendingContracts[operation];
-    const contractName = metadata.name;
-
-    metadata.blockNumber = log.blockNumber;
-
-    // The contract creation might not be in the same log,
-    // but must be in the same transaction (eg. Contract creation
-    // from Wallet within a Wallet)
-    api.eth
-      .getTransactionReceipt(log.transactionHash)
-      .then((transactionReceipt) => {
-        const transactionLogs = FoundationWalletUtils.parseLogs(api, transactionReceipt.logs);
-        const creationLog = transactionLogs.find((log) => {
-          return log.params.created && !/^(0x)?0*$/.test(log.params.created.value);
-        });
-
-        if (!creationLog) {
-          return false;
-        }
-
-        const contractAddress = creationLog.params.created.value;
-
-        return Promise
-          .all([
-            api.parity.setAccountName(contractAddress, contractName),
-            api.parity.setAccountMeta(contractAddress, metadata)
-          ])
-          .then(() => {
-            PendingContracts.removePendingContract(operation);
-          });
-      })
-      .catch((error) => {
-        console.error('adding wallet contract', error);
-      });
-  }
-}
-
-function fetchMistOwners (walletContract, mNumOwners) {
-  const walletAddress = walletContract.address;
-
-  return getMistOwnersOffset(walletContract)
-    .then((result) => {
-      if (!result || result.offset === -1) {
-        return [];
-      }
-
-      const owners = [ result.address ];
-
-      if (mNumOwners === 1) {
-        return owners;
-      }
-
-      const initOffset = result.offset + 1;
-      let promise = Promise.resolve();
-
-      range(initOffset, initOffset + mNumOwners - 1).forEach((offset) => {
-        promise = promise
-          .then(() => {
-            return walletContract.api.eth.getStorageAt(walletAddress, offset);
-          })
-          .then((result) => {
-            const resultAddress = '0x' + (result || '').slice(-40);
-            const { address } = validateAddress(resultAddress);
-
-            owners.push(address);
-          });
-      });
-
-      return promise.then(() => owners);
-    });
-}
-
-function getMistOwnersOffset (walletContract, offset = 3) {
-  return walletContract.api.eth
-    .getStorageAt(walletContract.address, offset)
-    .then((result) => {
-      if (result && !/^(0x)?0*$/.test(result)) {
-        const resultAddress = '0x' + result.slice(-40);
-        const { address, addressError } = validateAddress(resultAddress);
-
-        if (!addressError) {
-          return { offset, address };
-        }
-      }
-
-      if (offset >= 100) {
-        return { offset: -1 };
-      }
-
-      return getMistOwnersOffset(walletContract, offset + 1);
-    });
-}
-
-function validateOwners (owners) {
-  const uniqOwners = uniq(owners);
-
-  // If all owners are the zero account : must be Mist wallet contract
-  if (uniqOwners.length === 1 && /^(0x)?0*$/.test(owners[0])) {
-    return null;
-  }
-
-  return uniqOwners;
-}
diff --git a/js/src/util/wallets/pending-contracts.js b/js/src/util/wallets/pending-contracts.js
deleted file mode 100644
index 8eef273e23a15efadd8cf4bec7307823ced09dff..0000000000000000000000000000000000000000
--- a/js/src/util/wallets/pending-contracts.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import store from 'store';
-
-const LS_PENDING_CONTRACTS_KEY = '_parity::wallets::pendingContracts';
-
-export default class PendingContracts {
-  static getPendingContracts () {
-    return store.get(LS_PENDING_CONTRACTS_KEY) || {};
-  }
-
-  static setPendingContracts (contracts = {}) {
-    return store.set(LS_PENDING_CONTRACTS_KEY, contracts);
-  }
-
-  static removePendingContract (operationHash) {
-    const nextContracts = PendingContracts.getPendingContracts();
-
-    delete nextContracts[operationHash];
-    PendingContracts.setPendingContracts(nextContracts);
-  }
-
-  static addPendingContract (address, operationHash, metadata) {
-    const nextContracts = {
-      ...PendingContracts.getPendingContracts(),
-      [ operationHash ]: {
-        address,
-        metadata,
-        operationHash
-      }
-    };
-
-    PendingContracts.setPendingContracts(nextContracts);
-  }
-}
diff --git a/js/src/util/wallets/updates.js b/js/src/util/wallets/updates.js
deleted file mode 100644
index a739652fc3fa41b7885b54a7535f058668de8f01..0000000000000000000000000000000000000000
--- a/js/src/util/wallets/updates.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export const UPDATE_OWNERS = 'owners';
-export const UPDATE_REQUIRE = 'require';
-export const UPDATE_DAILYLIMIT = 'dailylimit';
-export const UPDATE_TRANSACTIONS = 'transactions';
-export const UPDATE_CONFIRMATIONS = 'confirmations';
diff --git a/js/src/util/web3.extensions.js b/js/src/util/web3.extensions.js
deleted file mode 100644
index fc9fe06b55c044fb19ebfd60baa3388ddce628e3..0000000000000000000000000000000000000000
--- a/js/src/util/web3.extensions.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import parity from '~/jsonrpc/interfaces/parity';
-import signer from '~/jsonrpc/interfaces/signer';
-import trace from '~/jsonrpc/interfaces/trace';
-
-export default function web3extensions (web3) {
-  const { Method } = web3._extend;
-
-  // TODO [ToDr] Consider output/input formatters.
-  const methods = (object, name) => {
-    return Object.keys(object).map(method => {
-      return new Method({
-        name: method,
-        call: `${name}_{method}`,
-        params: object[method].params.length
-      });
-    });
-  };
-
-  return [{
-    property: 'parity',
-    methods: methods(parity, 'parity'),
-    properties: []
-  }, {
-    property: 'signer',
-    methods: methods(signer, 'signer'),
-    properties: []
-  }, {
-    property: 'trace',
-    methods: methods(trace, 'trace'),
-    properties: []
-  }];
-}
diff --git a/js/src/views/Account/Header/header.css b/js/src/views/Account/Header/header.css
deleted file mode 100644
index 5ff69f774f7535fdd75388242942ecd74e02bfbd..0000000000000000000000000000000000000000
--- a/js/src/views/Account/Header/header.css
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.editicon {
-  margin-left: 0.5em;
-}
-
-.info {
-  margin: 0 156px 0 0;
-}
-
-.identityIcon {
-  float: left;
-  margin-right: -100%;
-}
-
-.qrcode {
-  float: right;
-  margin-top: 1.5em;
-}
-
-.addressline,
-.infoline,
-.uuidline,
-.vault,
-.title {
-  margin-left: 72px;
-}
-
-.addressline,
-.infoline,
-.uuidline {
-  line-height: 1.618em;
-
-  &.bigaddress {
-    font-size: 1.25em;
-  }
-}
-
-.infoline,
-.uuidline {
-  opacity: 0.5;
-}
-
-.uuidline {
-  display: inline-block;
-}
-
-.vault {
-  line-height: 32px;
-
-  .text {
-    display: inline-block;
-    opacity: 0.25;
-    text-transform: uppercase;
-  }
-}
-
-.addressline {
-  display: flex;
-}
-
-.address {
-  display: inline-block;
-  margin-left: 0.5em;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.tags {
-  clear: both;
-}
diff --git a/js/src/views/Account/Header/header.js b/js/src/views/Account/Header/header.js
deleted file mode 100644
index f02d5bd3a7a21323ead2c62b1aee95a650bcbfea..0000000000000000000000000000000000000000
--- a/js/src/views/Account/Header/header.js
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Balance, Certifications, Container, CopyToClipboard, ContainerTitle, IdentityIcon, IdentityName, QrCode, Tags, VaultTag } from '~/ui';
-
-import styles from './header.css';
-
-export default class Header extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    account: PropTypes.object,
-    children: PropTypes.node,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    hideName: PropTypes.bool,
-    isContract: PropTypes.bool
-  };
-
-  static defaultProps = {
-    children: null,
-    className: '',
-    hideName: false,
-    isContract: false
-  };
-
-  state = {
-    txCount: null
-  };
-
-  txCountSubId = null;
-
-  componentWillMount () {
-    if (this.props.account && !this.props.isContract) {
-      this.subscribeTxCount();
-    }
-  }
-
-  componentWillUnmount () {
-    this.unsubscribeTxCount();
-  }
-
-  subscribeTxCount () {
-    const { api } = this.context;
-
-    api
-      .subscribe('eth_blockNumber', (error) => {
-        if (error) {
-          return console.error(error);
-        }
-
-        api.eth.getTransactionCount(this.props.account.address)
-          .then((txCount) => this.setState({ txCount }));
-      })
-      .then((subscriptionId) => {
-        this.txCountSubId = subscriptionId;
-      });
-  }
-
-  unsubscribeTxCount () {
-    if (!this.txCountSubId) {
-      return;
-    }
-
-    this.context.api.unsubscribe(this.txCountSubId);
-  }
-
-  render () {
-    const { account, children, className, disabled, hideName } = this.props;
-
-    if (!account) {
-      return null;
-    }
-
-    const { address } = account;
-    const meta = account.meta || {};
-
-    return (
-      <div className={ className }>
-        <Container>
-          <QrCode
-            className={ styles.qrcode }
-            value={ address }
-          />
-          <IdentityIcon
-            address={ address }
-            className={ styles.identityIcon }
-            disabled={ disabled }
-          />
-          <div className={ styles.info }>
-            { this.renderName() }
-            <div className={ [ hideName ? styles.bigaddress : '', styles.addressline ].join(' ') }>
-              <CopyToClipboard data={ address } />
-              <div className={ styles.address }>
-                { address }
-              </div>
-            </div>
-            { this.renderUuid() }
-            <div className={ styles.infoline }>
-              { meta.description }
-            </div>
-            { this.renderTxCount() }
-            <div className={ styles.balances }>
-              <Balance
-                address={ address }
-              />
-              <Certifications address={ address } />
-              { this.renderVault() }
-            </div>
-          </div>
-          <div className={ styles.tags }>
-            <Tags tags={ meta.tags } />
-          </div>
-          { children }
-        </Container>
-      </div>
-    );
-  }
-
-  renderName () {
-    const { hideName } = this.props;
-
-    if (hideName) {
-      return null;
-    }
-
-    const { address } = this.props.account;
-
-    return (
-      <ContainerTitle
-        className={ styles.title }
-        title={
-          <IdentityName
-            address={ address }
-            unknown
-          />
-        }
-      />
-    );
-  }
-
-  renderTxCount () {
-    const { isContract } = this.props;
-    const { txCount } = this.state;
-
-    if (!txCount || isContract) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.infoline }>
-        <FormattedMessage
-          id='account.header.outgoingTransactions'
-          defaultMessage='{count} outgoing transactions'
-          values={ {
-            count: txCount.toFormat()
-          } }
-        />
-      </div>
-    );
-  }
-
-  renderUuid () {
-    const { uuid } = this.props.account;
-
-    if (!uuid) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.uuidline }>
-        <FormattedMessage
-          id='account.header.uuid'
-          defaultMessage='uuid: {uuid}'
-          values={ {
-            uuid
-          } }
-        />
-      </div>
-    );
-  }
-
-  renderVault () {
-    const { account } = this.props;
-    const { meta } = account;
-
-    if (!meta || !meta.vault) {
-      return null;
-    }
-
-    return (
-      <VaultTag vault={ meta.vault } />
-    );
-  }
-}
diff --git a/js/src/views/Account/Header/header.spec.js b/js/src/views/Account/Header/header.spec.js
deleted file mode 100644
index 48c0b1a998d7dfa4fe1524cdb1cac9aa91a47064..0000000000000000000000000000000000000000
--- a/js/src/views/Account/Header/header.spec.js
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { ETH_TOKEN } from '~/util/tokens';
-
-import Header from './';
-
-const ACCOUNT = {
-  address: '0x0123456789012345678901234567890123456789',
-  meta: {
-    description: 'the description',
-    tags: ['taga', 'tagb']
-  },
-  uuid: '0xabcdef'
-};
-const subscriptions = {};
-
-let component;
-let instance;
-
-const api = {
-  subscribe: (method, callback) => {
-    subscriptions[method] = (subscriptions[method] || []).concat(callback);
-    return Promise.resolve(0);
-  },
-  eth: {
-    getTransactionCount: () => Promise.resolve(new BigNumber(1))
-  }
-};
-
-function reduxStore () {
-  const getState = () => ({
-    balances: {},
-    tokens: {
-      [ETH_TOKEN.id]: ETH_TOKEN
-    }
-  });
-
-  return {
-    getState,
-    dispatch: () => null,
-    subscribe: () => null
-  };
-}
-
-function render (props = {}) {
-  if (props && !props.account) {
-    props.account = ACCOUNT;
-  }
-
-  component = shallow(
-    <Header { ...props } />,
-    { context: { api } }
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Account/Header', () => {
-  describe('rendering', () => {
-    it('renders defaults', () => {
-      expect(render()).to.be.ok;
-    });
-
-    it('renders null with no account', () => {
-      expect(render(null).find('div')).to.have.length(0);
-    });
-
-    it('renders when no account meta', () => {
-      expect(render({ account: { address: ACCOUNT.address } })).to.be.ok;
-    });
-
-    it('renders when no account description', () => {
-      expect(render({ account: { address: ACCOUNT.address, meta: { tags: [] } } })).to.be.ok;
-    });
-
-    it('renders when no account tags', () => {
-      expect(render({ account: { address: ACCOUNT.address, meta: { description: 'something' } } })).to.be.ok;
-    });
-
-    describe('sections', () => {
-      describe('Balance', () => {
-        let balance;
-
-        beforeEach(() => {
-          render();
-          balance = component.find('Connect(Balance)')
-            .shallow({ context: { store: reduxStore() } });
-        });
-
-        it('renders', () => {
-          expect(balance).to.have.length(1);
-        });
-
-        it('passes the account', () => {
-          expect(balance.props().address).to.deep.equal(ACCOUNT.address);
-        });
-      });
-
-      describe('Certifications', () => {
-        let certs;
-
-        beforeEach(() => {
-          render();
-          certs = component.find('Connect(Certifications)');
-        });
-
-        it('renders', () => {
-          expect(certs).to.have.length(1);
-        });
-
-        it('passes the address', () => {
-          expect(certs.props().address).to.deep.equal(ACCOUNT.address);
-        });
-      });
-
-      describe('IdentityIcon', () => {
-        let icon;
-
-        beforeEach(() => {
-          render();
-          icon = component.find('Connect(IdentityIcon)');
-        });
-
-        it('renders', () => {
-          expect(icon).to.have.length(1);
-        });
-
-        it('passes the address', () => {
-          expect(icon.props().address).to.deep.equal(ACCOUNT.address);
-        });
-      });
-
-      describe('QrCode', () => {
-        let qr;
-
-        beforeEach(() => {
-          render();
-          qr = component.find('QrCode');
-        });
-
-        it('renders', () => {
-          expect(qr).to.have.length(1);
-        });
-
-        it('passes the address', () => {
-          expect(qr.props().value).to.deep.equal(ACCOUNT.address);
-        });
-      });
-
-      describe('Tags', () => {
-        let tags;
-
-        beforeEach(() => {
-          render();
-          tags = component.find('Tags');
-        });
-
-        it('renders', () => {
-          expect(tags).to.have.length(1);
-        });
-
-        it('passes the tags', () => {
-          expect(tags.props().tags).to.deep.equal(ACCOUNT.meta.tags);
-        });
-      });
-    });
-  });
-
-  describe('renderName', () => {
-    it('renders null with hideName', () => {
-      render({ hideName: true });
-      expect(instance.renderName()).to.be.null;
-    });
-
-    it('renders the name', () => {
-      render();
-      expect(instance.renderName()).not.to.be.null;
-    });
-
-    it('renders when no address specified', () => {
-      render({ account: {} });
-      expect(instance.renderName()).to.be.ok;
-    });
-  });
-
-  describe('renderTxCount', () => {
-    it('renders null when txCount is null', () => {
-      render();
-      expect(instance.renderTxCount()).to.be.null;
-    });
-
-    it('renders null when contract', () => {
-      render({ isContract: true });
-
-      subscriptions['eth_blockNumber'].forEach((callback) => {
-        callback();
-
-        setTimeout(() => {
-          expect(instance.renderTxCount()).to.be.null;
-        });
-      });
-    });
-
-    it('renders the tx count', () => {
-      render();
-
-      subscriptions['eth_blockNumber'].forEach((callback) => {
-        callback();
-
-        setTimeout(() => {
-          expect(instance.renderTxCount()).not.to.be.null;
-        });
-      });
-    });
-  });
-
-  describe('renderUuid', () => {
-    it('renders null with no uuid', () => {
-      render({ account: Object.assign({}, ACCOUNT, { uuid: null }) });
-      expect(instance.renderUuid()).to.be.null;
-    });
-
-    it('renders the uuid', () => {
-      render();
-      expect(instance.renderUuid()).not.to.be.null;
-    });
-  });
-});
diff --git a/js/src/views/Account/Header/index.js b/js/src/views/Account/Header/index.js
deleted file mode 100644
index aef90266f940a3c7f8915c7ba910b62bec54317c..0000000000000000000000000000000000000000
--- a/js/src/views/Account/Header/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './header';
diff --git a/js/src/views/Account/Transactions/index.js b/js/src/views/Account/Transactions/index.js
deleted file mode 100644
index 0ba7422c9a6dd433a4c2874070e8ba0c0bcea52a..0000000000000000000000000000000000000000
--- a/js/src/views/Account/Transactions/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './transactions';
diff --git a/js/src/views/Account/Transactions/store.js b/js/src/views/Account/Transactions/store.js
deleted file mode 100644
index 10d5af025ecf5f4f8747cd83289c8b19321ecd7c..0000000000000000000000000000000000000000
--- a/js/src/views/Account/Transactions/store.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable, transaction } from 'mobx';
-
-import etherscan from '~/3rdparty/etherscan';
-
-export default class Store {
-  @observable address = null;
-  @observable isLoading = false;
-  @observable isTracing = false;
-  @observable netVersion = '0';
-  @observable txHashes = [];
-
-  constructor (api) {
-    this._api = api;
-  }
-
-  @action setHashes = (transactions) => {
-    transaction(() => {
-      this.setLoading(false);
-      this.txHashes = transactions.map((transaction) => transaction.hash);
-    });
-  }
-
-  @action setAddress = (address) => {
-    this.address = address;
-  }
-
-  @action setLoading = (isLoading) => {
-    this.isLoading = isLoading;
-  }
-
-  @action setNetVersion = (netVersion) => {
-    this.netVersion = netVersion;
-  }
-
-  @action setTracing = (isTracing) => {
-    this.isTracing = isTracing;
-  }
-
-  @action updateProps = (props) => {
-    transaction(() => {
-      this.setAddress(props.address);
-      this.setNetVersion(props.netVersion);
-
-      // TODO: When tracing is enabled again, adjust to actually set
-      this.setTracing(false && props.traceMode);
-    });
-
-    return this.getTransactions();
-  }
-
-  getTransactions () {
-    if (this.netVersion === '0') {
-      return Promise.resolve();
-    }
-
-    this.setLoading(true);
-
-    // TODO: When supporting other chains (eg. ETC). call to be made to other endpoints
-    return (
-      this.isTracing
-        ? this.fetchTraceTransactions()
-        : this.fetchEtherscanTransactions()
-      )
-      .then((transactions) => {
-        this.setHashes(transactions);
-      })
-      .catch((error) => {
-        console.warn('getTransactions', error);
-        this.setLoading(false);
-      });
-  }
-
-  fetchEtherscanTransactions () {
-    return etherscan.account.transactions(this.address, 0, false, this.netVersion);
-  }
-
-  fetchTraceTransactions () {
-    return Promise
-      .all([
-        this._api.trace.filter({
-          fromAddress: this.address,
-          fromBlock: 0
-        }),
-        this._api.trace.filter({
-          fromBlock: 0,
-          toAddress: this.address
-        })
-      ])
-      .then(([fromTransactions, toTransactions]) => {
-        return fromTransactions
-          .concat(toTransactions)
-          .map((transaction) => {
-            return {
-              blockNumber: transaction.blockNumber,
-              from: transaction.action.from,
-              hash: transaction.transactionHash,
-              to: transaction.action.to
-            };
-          });
-      });
-  }
-}
diff --git a/js/src/views/Account/Transactions/store.spec.js b/js/src/views/Account/Transactions/store.spec.js
deleted file mode 100644
index c99e91512a0a21fa5c0b2046d66c55b141c82b30..0000000000000000000000000000000000000000
--- a/js/src/views/Account/Transactions/store.spec.js
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import sinon from 'sinon';
-
-import { mockget as mockEtherscan } from '~/3rdparty/etherscan/helpers.spec.js';
-import { ADDRESS, createApi } from './transactions.test.js';
-
-import Store from './store';
-
-let api;
-let store;
-
-function createStore () {
-  api = createApi();
-  store = new Store(api);
-
-  return store;
-}
-
-function mockQuery () {
-  mockEtherscan([{
-    query: {
-      module: 'account',
-      action: 'txlist',
-      address: ADDRESS,
-      offset: 25,
-      page: 1,
-      sort: 'desc'
-    },
-    reply: [{ hash: '123' }]
-  }], false, '42');
-}
-
-describe('views/Account/Transactions/store', () => {
-  beforeEach(() => {
-    mockQuery();
-    createStore();
-  });
-
-  describe('constructor', () => {
-    it('sets the api', () => {
-      expect(store._api).to.deep.equals(api);
-    });
-
-    it('starts with isLoading === false', () => {
-      expect(store.isLoading).to.be.false;
-    });
-
-    it('starts with isTracing === false', () => {
-      expect(store.isTracing).to.be.false;
-    });
-  });
-
-  describe('@action', () => {
-    describe('setHashes', () => {
-      it('clears the loading state', () => {
-        store.setLoading(true);
-        store.setHashes([]);
-        expect(store.isLoading).to.be.false;
-      });
-
-      it('sets the hashes from the transactions', () => {
-        store.setHashes([{ hash: '123' }, { hash: '456' }]);
-        expect(store.txHashes.peek()).to.deep.equal(['123', '456']);
-      });
-    });
-
-    describe('setAddress', () => {
-      it('sets the address', () => {
-        store.setAddress(ADDRESS);
-        expect(store.address).to.equal(ADDRESS);
-      });
-    });
-
-    describe('setLoading', () => {
-      it('sets the isLoading flag', () => {
-        store.setLoading(true);
-        expect(store.isLoading).to.be.true;
-      });
-    });
-
-    describe('setNetVersion', () => {
-      it('sets the netVersion', () => {
-        store.setNetVersion('testing');
-        expect(store.netVersion).to.equal('testing');
-      });
-    });
-
-    describe('setTracing', () => {
-      it('sets the isTracing flag', () => {
-        store.setTracing(true);
-        expect(store.isTracing).to.be.true;
-      });
-    });
-
-    describe('updateProps', () => {
-      it('retrieves transactions once updated', () => {
-        sinon.spy(store, 'getTransactions');
-        store.updateProps({});
-
-        expect(store.getTransactions).to.have.been.called;
-        store.getTransactions.restore();
-      });
-    });
-  });
-
-  describe('operations', () => {
-    describe('getTransactions', () => {
-      it('retrieves the hashes via etherscan', () => {
-        sinon.spy(store, 'fetchEtherscanTransactions');
-        store.setAddress(ADDRESS);
-        store.setNetVersion('42');
-        store.setTracing(false);
-
-        return store.getTransactions().then(() => {
-          expect(store.fetchEtherscanTransactions).to.have.been.called;
-          expect(store.txHashes.peek()).to.deep.equal(['123']);
-          store.fetchEtherscanTransactions.restore();
-        });
-      });
-
-      it('retrieves the hashes via tracing', () => {
-        sinon.spy(store, 'fetchTraceTransactions');
-        store.setAddress(ADDRESS);
-        store.setNetVersion('42');
-        store.setTracing(true);
-
-        return store.getTransactions().then(() => {
-          expect(store.fetchTraceTransactions).to.have.been.called;
-          expect(store.txHashes.peek()).to.deep.equal(['123', '098']);
-          store.fetchTraceTransactions.restore();
-        });
-      });
-    });
-
-    describe('fetchEtherscanTransactions', () => {
-      it('retrieves the transactions', () => {
-        store.setAddress(ADDRESS);
-        store.setNetVersion('42');
-
-        return store.fetchEtherscanTransactions().then((transactions) => {
-          expect(transactions).to.deep.equal([{
-            blockNumber: new BigNumber(0),
-            from: '',
-            hash: '123',
-            timeStamp: undefined,
-            to: '',
-            value: undefined
-          }]);
-        });
-      });
-    });
-
-    describe('fetchTraceTransactions', () => {
-      it('retrieves the transactions', () => {
-        store.setAddress(ADDRESS);
-        store.setNetVersion('42');
-
-        return store.fetchTraceTransactions().then((transactions) => {
-          expect(transactions).to.deep.equal([
-            {
-              blockNumber: undefined,
-              from: undefined,
-              hash: '123',
-              to: undefined
-            },
-            {
-              blockNumber: undefined,
-              from: undefined,
-              hash: '098',
-              to: undefined
-            }
-          ]);
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/views/Account/Transactions/transactions.css b/js/src/views/Account/Transactions/transactions.css
deleted file mode 100644
index a09d0bddc3d1f3c3d2aa8ddfb5ec250be67d8204..0000000000000000000000000000000000000000
--- a/js/src/views/Account/Transactions/transactions.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.infonone {
-  opacity: 0.25;
-}
-
-.etherscan {
-  text-align: right;
-  padding-top: 1em;
-  font-size: 0.75em;
-  color: #aaa;
-}
diff --git a/js/src/views/Account/Transactions/transactions.js b/js/src/views/Account/Transactions/transactions.js
deleted file mode 100644
index f36529713e2bb3454073b12b265f537f9c65bf9a..0000000000000000000000000000000000000000
--- a/js/src/views/Account/Transactions/transactions.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import { Container, TxList, Loading } from '~/ui';
-
-import Store from './store';
-import styles from './transactions.css';
-
-@observer
-class Transactions extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    traceMode: PropTypes.bool
-  }
-
-  store = new Store(this.context.api);
-
-  componentWillMount () {
-    this.store.updateProps(this.props);
-  }
-
-  componentWillReceiveProps (newProps) {
-    if (this.props.traceMode === undefined && newProps.traceMode !== undefined) {
-      this.store.updateProps(newProps);
-      return;
-    }
-
-    const hasChanged = ['address', 'netVersion']
-      .map(key => newProps[key] !== this.props[key])
-      .reduce((truth, keyTruth) => truth || keyTruth, false);
-
-    if (hasChanged) {
-      this.store.updateProps(newProps);
-    }
-  }
-
-  render () {
-    return (
-      <Container
-        title={
-          <FormattedMessage
-            id='account.transactions.title'
-            defaultMessage='transactions'
-          />
-        }
-      >
-        { this.renderTransactionList() }
-        { this.renderEtherscanFooter() }
-      </Container>
-    );
-  }
-
-  renderTransactionList () {
-    const { address, isLoading, txHashes } = this.store;
-
-    if (isLoading) {
-      return (
-        <Loading />
-      );
-    }
-
-    return (
-      <TxList
-        address={ address }
-        hashes={ txHashes }
-      />
-    );
-  }
-
-  renderEtherscanFooter () {
-    const { isTracing } = this.store;
-
-    if (isTracing) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.etherscan }>
-        <FormattedMessage
-          id='account.transactions.poweredBy'
-          defaultMessage='Transaction list powered by {etherscan}'
-          values={ {
-            etherscan: <a href='https://etherscan.io/' target='_blank'>etherscan.io</a>
-          } }
-        />
-      </div>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { netVersion, traceMode } = state.nodeStatus;
-
-  return {
-    netVersion,
-    traceMode
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(Transactions);
diff --git a/js/src/views/Account/Transactions/transactions.spec.js b/js/src/views/Account/Transactions/transactions.spec.js
deleted file mode 100644
index 8b39206ebbeb56ae85ae52539e07a09990df8817..0000000000000000000000000000000000000000
--- a/js/src/views/Account/Transactions/transactions.spec.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { ADDRESS, createApi, createRedux } from './transactions.test.js';
-
-import Transactions from './';
-
-let component;
-let instance;
-
-function render (props) {
-  component = shallow(
-    <Transactions
-      address={ ADDRESS }
-      { ...props }
-    />,
-    { context: { store: createRedux() } }
-  ).find('Transactions').shallow({ context: { api: createApi() } });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Account/Transactions', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  describe('renderTransactionList', () => {
-    it('renders Loading when isLoading === true', () => {
-      instance.store.setLoading(true);
-      expect(instance.renderTransactionList().type).to.match(/Loading/);
-    });
-
-    it('renders TxList when isLoading === true', () => {
-      instance.store.setLoading(false);
-      expect(instance.renderTransactionList().type).to.match(/Connect/);
-    });
-  });
-});
diff --git a/js/src/views/Account/Transactions/transactions.test.js b/js/src/views/Account/Transactions/transactions.test.js
deleted file mode 100644
index abfc150acf50dfe875435adbc2b04257ec904a55..0000000000000000000000000000000000000000
--- a/js/src/views/Account/Transactions/transactions.test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { ADDRESS, createRedux } from '../account.test.js';
-
-function createApi () {
-  return {
-    trace: {
-      filter: (options) => Promise.resolve([{ transactionHash: options.fromAddress ? '123' : '098', action: {} }])
-    }
-  };
-}
-
-export {
-  ADDRESS,
-  createApi,
-  createRedux
-};
diff --git a/js/src/views/Account/account.css b/js/src/views/Account/account.css
deleted file mode 100644
index 88c5f2a85886a061d3319db5ed2bef27374e4d6f..0000000000000000000000000000000000000000
--- a/js/src/views/Account/account.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.btnicon {
-  width: 24px;
-  height: 24px;
-}
-
-.textbox {
-  line-height: 1.5em;
-  margin-bottom: 1.5em;
-}
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
deleted file mode 100644
index fdccac793bd233de618274d3ee92a32d6865cd93..0000000000000000000000000000000000000000
--- a/js/src/views/Account/account.js
+++ /dev/null
@@ -1,537 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { newError } from '~/redux/actions';
-import shapeshiftBtn from '~/../assets/images/shapeshift-btn.png';
-import HardwareStore from '~/mobx/hardwareStore';
-import ExportStore from '~/modals/ExportAccount/exportStore';
-import { DeleteAccount, EditMeta, Faucet, PasswordManager, Shapeshift, Transfer, Verification } from '~/modals';
-import { setVisibleAccounts } from '~/redux/providers/personalActions';
-import { fetchCertifiers, fetchCertifications } from '~/redux/providers/certifications/actions';
-import { Actionbar, Button, ConfirmDialog, Input, Page, Portal } from '~/ui';
-import { DeleteIcon, DialIcon, EditIcon, LockedIcon, SendIcon, VerifyIcon, FileDownloadIcon } from '~/ui/Icons';
-
-import DeleteAddress from '../Address/Delete';
-
-import Header from './Header';
-import Store from './store';
-import Transactions from './Transactions';
-import styles from './account.css';
-
-@observer
-class Account extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    fetchCertifiers: PropTypes.func.isRequired,
-    fetchCertifications: PropTypes.func.isRequired,
-    setVisibleAccounts: PropTypes.func.isRequired,
-
-    account: PropTypes.object,
-    certifications: PropTypes.object,
-    netVersion: PropTypes.string.isRequired,
-    newError: PropTypes.func,
-    params: PropTypes.object
-  }
-
-  store = new Store();
-  hwstore = HardwareStore.get(this.context.api);
-
-  componentWillMount () {
-    const { accounts, newError, params } = this.props;
-    const { address } = params;
-
-    this.exportStore = new ExportStore(this.context.api, accounts, newError, address);
-  }
-
-  componentDidMount () {
-    this.props.fetchCertifiers();
-    this.setVisibleAccounts();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const prevAddress = this.props.params.address;
-    const nextAddress = nextProps.params.address;
-    const { accounts } = nextProps;
-
-    if (prevAddress !== nextAddress) {
-      this.setVisibleAccounts(nextProps);
-    }
-
-    if (!Object.keys(this.exportStore.accounts).length) {
-      this.exportStore.setAccounts(accounts);
-    }
-  }
-
-  componentWillUnmount () {
-    this.props.setVisibleAccounts([]);
-  }
-
-  setVisibleAccounts (props = this.props) {
-    const { params, setVisibleAccounts, fetchCertifications } = props;
-    const addresses = [params.address];
-
-    setVisibleAccounts(addresses);
-    fetchCertifications(params.address);
-  }
-
-  render () {
-    const { account } = this.props;
-    const { address } = this.props.params;
-
-    if (!account) {
-      return null;
-    }
-
-    const isAvailable = !account.hardware || this.hwstore.isConnected(address);
-
-    return (
-      <div>
-        { this.renderDeleteDialog(account) }
-        { this.renderEditDialog(account) }
-        { this.renderExportDialog() }
-        { this.renderFaucetDialog() }
-        { this.renderFundDialog() }
-        { this.renderPasswordDialog(account) }
-        { this.renderTransferDialog(account) }
-        { this.renderVerificationDialog() }
-        { this.renderActionbar(account) }
-        <Page padded>
-          <Header
-            account={ account }
-            disabled={ !isAvailable }
-          />
-          <Transactions
-            address={ address }
-          />
-        </Page>
-      </div>
-    );
-  }
-
-  isKovan = (netVersion) => {
-    return netVersion === '42';
-  }
-
-  isMainnet = (netVersion) => {
-    return netVersion === '1';
-  }
-
-  isFaucettable = (netVersion, certifications, address) => {
-    return this.isKovan(netVersion) || (
-      this.isMainnet(netVersion) &&
-      this.isSmsCertified(certifications, address)
-    );
-  }
-
-  isSmsCertified = (_certifications, address) => {
-    const certifications = _certifications && _certifications[address]
-      ? _certifications[address].filter((cert) => cert.name.indexOf('smsverification') === 0)
-      : [];
-
-    return certifications.length !== 0;
-  }
-
-  renderActionbar (account) {
-    const { certifications, netVersion } = this.props;
-    const { address } = this.props.params;
-    const isVerifiable = this.isMainnet(netVersion);
-    const isFaucettable = this.isFaucettable(netVersion, certifications, address);
-
-    const buttons = [
-      <Button
-        icon={ <SendIcon /> }
-        key='transferFunds'
-        label={
-          <FormattedMessage
-            id='account.button.transfer'
-            defaultMessage='transfer'
-          />
-        }
-        onClick={ this.store.toggleTransferDialog }
-      />,
-      <Button
-        icon={
-          <img
-            className={ styles.btnicon }
-            src={ shapeshiftBtn }
-          />
-        }
-        key='shapeshift'
-        label={
-          <FormattedMessage
-            id='account.button.shapeshift'
-            defaultMessage='shapeshift'
-          />
-        }
-        onClick={ this.store.toggleFundDialog }
-      />,
-      isVerifiable
-        ? (
-          <Button
-            icon={ <VerifyIcon /> }
-            key='verification'
-            label={
-              <FormattedMessage
-                id='account.button.verify'
-                defaultMessage='verify'
-              />
-            }
-            onClick={ this.store.toggleVerificationDialog }
-          />
-        )
-        : null,
-      isFaucettable
-        ? (
-          <Button
-            icon={ <DialIcon /> }
-            key='faucet'
-            label={
-              <FormattedMessage
-                id='account.button.faucet'
-                defaultMessage='Kovan ETH'
-              />
-            }
-            onClick={ this.store.toggleFaucetDialog }
-          />
-        )
-        : null,
-      <Button
-        icon={ <EditIcon /> }
-        key='editmeta'
-        label={
-          <FormattedMessage
-            id='account.button.edit'
-            defaultMessage='edit'
-          />
-        }
-        onClick={ this.store.toggleEditDialog }
-      />,
-      <Button
-        icon={ <FileDownloadIcon /> }
-        key='exportmeta'
-        label={
-          <FormattedMessage
-            id='account.button.export'
-            defaultMessage='export'
-          />
-        }
-        onClick={ this.store.toggleExportDialog }
-      />,
-      !(account.external || account.hardware) && (
-        <Button
-          icon={ <LockedIcon /> }
-          key='passwordManager'
-          label={
-            <FormattedMessage
-              id='account.button.password'
-              defaultMessage='password'
-            />
-          }
-          onClick={ this.store.togglePasswordDialog }
-        />
-      ),
-      <Button
-        icon={ <DeleteIcon /> }
-        key='delete'
-        label={
-          account.external || account.hardware
-            ? (
-              <FormattedMessage
-                id='account.button.forget'
-                defaultMessage='forget'
-              />
-            )
-            : (
-              <FormattedMessage
-                id='account.button.delete'
-                defaultMessage='delete'
-              />
-            )
-        }
-        onClick={ this.store.toggleDeleteDialog }
-      />
-    ];
-
-    return (
-      <Actionbar
-        buttons={ buttons }
-        title={
-          <FormattedMessage
-            id='account.title'
-            defaultMessage='Account Management'
-          />
-        }
-      />
-    );
-  }
-
-  renderDeleteDialog (account) {
-    if (!this.store.isDeleteVisible) {
-      return null;
-    }
-
-    if (account.hardware) {
-      return (
-        <DeleteAddress
-          account={ account }
-          confirmMessage={
-            <FormattedMessage
-              id='account.hardware.confirmDelete'
-              defaultMessage='Are you sure you want to remove the following hardware address from your account list?'
-            />
-          }
-          visible
-          route='/accounts'
-          onClose={ this.store.toggleDeleteDialog }
-        />
-      );
-    }
-
-    if (account.external) {
-      return (
-        <DeleteAddress
-          account={ account }
-          confirmMessage={
-            <FormattedMessage
-              id='account.external.confirmDelete'
-              defaultMessage='Are you sure you want to remove the following external address from your account list?'
-            />
-          }
-          visible
-          route='/accounts'
-          onClose={ this.store.toggleDeleteDialog }
-        />
-      );
-    }
-
-    return (
-      <DeleteAccount
-        account={ account }
-        onClose={ this.store.toggleDeleteDialog }
-      />
-    );
-  }
-
-  renderEditDialog (account) {
-    if (!this.store.isEditVisible) {
-      return null;
-    }
-
-    return (
-      <EditMeta
-        account={ account }
-        onClose={ this.store.toggleEditDialog }
-      />
-    );
-  }
-
-  renderExportDialog () {
-    const { changePassword, accountValue } = this.exportStore;
-
-    if (!this.store.isExportVisible) {
-      return null;
-    }
-
-    return (
-      <Portal
-        open
-        isSmallModal
-        onClose={ this.exportClose }
-      >
-        <ConfirmDialog
-          open
-          disabledConfirm={ false }
-          labelConfirm='Export'
-          labelDeny='Cancel'
-          onConfirm={ this.onExport }
-          onDeny={ this.exportClose }
-          title={
-            <FormattedMessage
-              id='export.account.title'
-              defaultMessage='Export Account'
-            />
-          }
-        >
-          <div className={ styles.textbox }>
-            <FormattedMessage
-              id='export.account.info'
-              defaultMessage='Export your account as a JSON file. Please enter the password linked with this account.'
-            />
-          </div>
-          <Input
-            className={ styles.textbox }
-            onKeyDown={ this.onEnter }
-            autoFocus
-            type='password'
-            hint={
-              <FormattedMessage
-                id='export.account.password.hint'
-                defaultMessage='The password specified when creating this account'
-              />
-            }
-            label={
-              <FormattedMessage
-                id='export.account.password.label'
-                defaultMessage='Account password'
-              />
-            }
-            onChange={ changePassword }
-            value={ accountValue }
-          />
-        </ConfirmDialog>
-      </Portal>
-    );
-  }
-
-  renderFaucetDialog () {
-    const { netVersion } = this.props;
-
-    if (!this.store.isFaucetVisible) {
-      return null;
-    }
-
-    const { address } = this.props.params;
-
-    return (
-      <Faucet
-        address={ address }
-        netVersion={ netVersion }
-        onClose={ this.store.toggleFaucetDialog }
-      />
-    );
-  }
-
-  renderFundDialog () {
-    if (!this.store.isFundVisible) {
-      return null;
-    }
-
-    const { address } = this.props.params;
-
-    return (
-      <Shapeshift
-        address={ address }
-        onClose={ this.store.toggleFundDialog }
-      />
-    );
-  }
-
-  renderPasswordDialog (account) {
-    if (!this.store.isPasswordVisible) {
-      return null;
-    }
-
-    return (
-      <PasswordManager
-        account={ account }
-        onClose={ this.store.togglePasswordDialog }
-      />
-    );
-  }
-
-  renderTransferDialog (account) {
-    if (!this.store.isTransferVisible) {
-      return null;
-    }
-
-    return (
-      <Transfer
-        account={ account }
-        onClose={ this.store.toggleTransferDialog }
-      />
-    );
-  }
-
-  renderVerificationDialog () {
-    if (!this.store.isVerificationVisible) {
-      return null;
-    }
-
-    const { address } = this.props.params;
-
-    return (
-      <Verification
-        account={ address }
-        onClose={ this.store.toggleVerificationDialog }
-      />
-    );
-  }
-
-  onEnter = (event) => {
-    if (event.key === 'Enter') {
-      this.onExport();
-    }
-  }
-
-  exportClose = () => {
-    const { toggleExportDialog } = this.store;
-    const { resetAccountValue } = this.exportStore;
-
-    resetAccountValue();
-    toggleExportDialog();
-  }
-
-  onExport = () => {
-    const { onExport } = this.exportStore;
-
-    onExport(this.hideExport);
-  }
-
-  hideExport = () => {
-    this.store.toggleExportDialog();
-  }
-}
-
-function mapStateToProps (state, props) {
-  const { address } = props.params;
-
-  const { accounts } = state.personal;
-  const certifications = state.certifications;
-  const { netVersion } = state.nodeStatus;
-
-  const account = (accounts || {})[address];
-
-  return {
-    account,
-    accounts,
-    certifications,
-    netVersion
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    fetchCertifiers,
-    fetchCertifications,
-    newError,
-    setVisibleAccounts
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Account);
diff --git a/js/src/views/Account/account.spec.js b/js/src/views/Account/account.spec.js
deleted file mode 100644
index 6a96d63001d6c5d6509abc77dcd8daf35203573a..0000000000000000000000000000000000000000
--- a/js/src/views/Account/account.spec.js
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { ACCOUNTS, ADDRESS, createRedux } from './account.test.js';
-
-import Account from './';
-
-let component;
-let instance;
-let store;
-
-function render (props) {
-  component = shallow(
-    <Account
-      accounts={ ACCOUNTS }
-      params={ { address: ADDRESS } }
-      { ...props }
-    />,
-    {
-      context: {
-        store: createRedux()
-      }
-    }
-  ).find('Account').shallow();
-  instance = component.instance();
-  store = instance.store;
-
-  return component;
-}
-
-describe('views/Account', () => {
-  describe('rendering', () => {
-    beforeEach(() => {
-      render();
-    });
-
-    it('renders defaults', () => {
-      expect(component).to.be.ok;
-    });
-
-    describe('sections', () => {
-      it('renders the Actionbar', () => {
-        expect(component.find('Actionbar')).to.have.length(1);
-      });
-
-      it('renders the Page', () => {
-        expect(component.find('Page')).to.have.length(1);
-      });
-
-      it('renders the Header', () => {
-        expect(component.find('Header')).to.have.length(1);
-      });
-
-      it('renders the Transactions', () => {
-        expect(component.find('Connect(Transactions)')).to.have.length(1);
-      });
-
-      it('renders no other sections', () => {
-        expect(component.find('div').children()).to.have.length(2);
-      });
-    });
-  });
-
-  describe('sub-renderers', () => {
-    describe('renderActionBar', () => {
-      let bar;
-
-      beforeEach(() => {
-        render();
-
-        bar = instance.renderActionbar({ tokens: {} });
-      });
-
-      it('renders the bar', () => {
-        expect(bar.type).to.match(/Actionbar/);
-      });
-    });
-
-    describe('renderDeleteDialog', () => {
-      it('renders null when not visible', () => {
-        render();
-
-        expect(store.isDeleteVisible).to.be.false;
-        expect(instance.renderDeleteDialog(ACCOUNTS[ADDRESS])).to.be.null;
-      });
-
-      it('renders the modal when visible', () => {
-        render();
-
-        store.toggleDeleteDialog();
-        expect(instance.renderDeleteDialog(ACCOUNTS[ADDRESS]).type).to.match(/Connect/);
-      });
-    });
-
-    describe('renderEditDialog', () => {
-      it('renders null when not visible', () => {
-        render();
-
-        expect(store.isEditVisible).to.be.false;
-        expect(instance.renderEditDialog(ACCOUNTS[ADDRESS])).to.be.null;
-      });
-
-      it('renders the modal when visible', () => {
-        render();
-
-        store.toggleEditDialog();
-        expect(instance.renderEditDialog(ACCOUNTS[ADDRESS]).type).to.match(/Connect/);
-      });
-    });
-
-    describe('renderFundDialog', () => {
-      it('renders null when not visible', () => {
-        render();
-
-        expect(store.isFundVisible).to.be.false;
-        expect(instance.renderFundDialog()).to.be.null;
-      });
-
-      it('renders the modal when visible', () => {
-        render();
-
-        store.toggleFundDialog();
-        expect(instance.renderFundDialog().type).to.match(/Shapeshift/);
-      });
-    });
-
-    describe('renderPasswordDialog', () => {
-      it('renders null when not visible', () => {
-        render();
-
-        expect(store.isPasswordVisible).to.be.false;
-        expect(instance.renderPasswordDialog()).to.be.null;
-      });
-
-      it('renders the modal when visible', () => {
-        render();
-
-        store.togglePasswordDialog();
-        expect(instance.renderPasswordDialog({ address: ADDRESS }).type).to.match(/Connect/);
-      });
-    });
-
-    describe('renderTransferDialog', () => {
-      it('renders null when not visible', () => {
-        render();
-
-        expect(store.isTransferVisible).to.be.false;
-        expect(instance.renderTransferDialog()).to.be.null;
-      });
-
-      it('renders the modal when visible', () => {
-        render();
-
-        store.toggleTransferDialog();
-        expect(instance.renderTransferDialog().type).to.match(/Connect/);
-      });
-    });
-
-    describe('renderVerificationDialog', () => {
-      it('renders null when not visible', () => {
-        render();
-
-        expect(store.isVerificationVisible).to.be.false;
-        expect(instance.renderVerificationDialog()).to.be.null;
-      });
-
-      it('renders the modal when visible', () => {
-        render();
-
-        store.toggleVerificationDialog();
-        expect(instance.renderVerificationDialog().type).to.match(/Connect/);
-      });
-    });
-  });
-});
diff --git a/js/src/views/Account/account.test.js b/js/src/views/Account/account.test.js
deleted file mode 100644
index c88e0e156f8259cbda93218cff7a1a54f1ec1b8c..0000000000000000000000000000000000000000
--- a/js/src/views/Account/account.test.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-const ADDRESS = '0x0123456789012345678901234567890123456789';
-const ACCOUNTS = {
-  [ADDRESS]: {
-    address: ADDRESS
-  }
-};
-
-function createRedux () {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        balances: {
-          balances: {
-            [ADDRESS]: {}
-          }
-        },
-        images: {},
-        nodeStatus: {
-          netVersion: '1',
-          traceMode: false
-        },
-        personal: {
-          accounts: {
-            [ADDRESS]: {
-              address: ADDRESS
-            }
-          }
-        }
-      };
-    }
-  };
-}
-
-export {
-  ACCOUNTS,
-  ADDRESS,
-  createRedux
-};
diff --git a/js/src/views/Account/index.js b/js/src/views/Account/index.js
deleted file mode 100644
index 8023eb211aa6e9dfece99aacbbf636c0c4601224..0000000000000000000000000000000000000000
--- a/js/src/views/Account/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './account';
diff --git a/js/src/views/Account/store.js b/js/src/views/Account/store.js
deleted file mode 100644
index f9046ee7488381ec16dd10c9c62be33d82860702..0000000000000000000000000000000000000000
--- a/js/src/views/Account/store.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-
-export default class Store {
-  @observable isDeleteVisible = false;
-  @observable isEditVisible = false;
-  @observable isExportVisible = false;
-  @observable isFaucetVisible = false;
-  @observable isFundVisible = false;
-  @observable isPasswordVisible = false;
-  @observable isTransferVisible = false;
-  @observable isVerificationVisible = false;
-
-  @action toggleDeleteDialog = () => {
-    this.isDeleteVisible = !this.isDeleteVisible;
-  }
-
-  @action toggleEditDialog = () => {
-    this.isEditVisible = !this.isEditVisible;
-  }
-
-  @action toggleExportDialog = () => {
-    this.isExportVisible = !this.isExportVisible;
-  }
-
-  @action toggleFaucetDialog = () => {
-    this.isFaucetVisible = !this.isFaucetVisible;
-  }
-
-  @action toggleFundDialog = () => {
-    this.isFundVisible = !this.isFundVisible;
-  }
-
-  @action togglePasswordDialog = () => {
-    this.isPasswordVisible = !this.isPasswordVisible;
-  }
-
-  @action toggleTransferDialog = () => {
-    this.isTransferVisible = !this.isTransferVisible;
-  }
-
-  @action toggleVerificationDialog = () => {
-    this.isVerificationVisible = !this.isVerificationVisible;
-  }
-}
diff --git a/js/src/views/Account/store.spec.js b/js/src/views/Account/store.spec.js
deleted file mode 100644
index 9608b55a3e496900a32367608e72bcaaa34df243..0000000000000000000000000000000000000000
--- a/js/src/views/Account/store.spec.js
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Store from './store';
-
-let store;
-
-function createStore () {
-  store = new Store();
-}
-
-describe('views/Account/Store', () => {
-  beforeEach(() => {
-    createStore();
-  });
-
-  describe('constructor', () => {
-    it('sets all modal visibility to false', () => {
-      expect(store.isDeleteVisible).to.be.false;
-      expect(store.isEditVisible).to.be.false;
-      expect(store.isFaucetVisible).to.be.false;
-      expect(store.isFundVisible).to.be.false;
-      expect(store.isPasswordVisible).to.be.false;
-      expect(store.isTransferVisible).to.be.false;
-      expect(store.isVerificationVisible).to.be.false;
-    });
-  });
-
-  describe('@action', () => {
-    describe('toggleDeleteDialog', () => {
-      it('toggles the visibility', () => {
-        store.toggleDeleteDialog();
-        expect(store.isDeleteVisible).to.be.true;
-      });
-    });
-
-    describe('toggleEditDialog', () => {
-      it('toggles the visibility', () => {
-        store.toggleEditDialog();
-        expect(store.isEditVisible).to.be.true;
-      });
-    });
-
-    describe('toggleFaucetDialog', () => {
-      it('toggles the visibility', () => {
-        store.toggleFaucetDialog();
-        expect(store.isFaucetVisible).to.be.true;
-      });
-    });
-
-    describe('toggleFundDialog', () => {
-      it('toggles the visibility', () => {
-        store.toggleFundDialog();
-        expect(store.isFundVisible).to.be.true;
-      });
-    });
-
-    describe('togglePasswordDialog', () => {
-      it('toggles the visibility', () => {
-        store.togglePasswordDialog();
-        expect(store.isPasswordVisible).to.be.true;
-      });
-    });
-
-    describe('toggleTransferDialog', () => {
-      it('toggles the visibility', () => {
-        store.toggleTransferDialog();
-        expect(store.isTransferVisible).to.be.true;
-      });
-    });
-
-    describe('toggleVerificationDialog', () => {
-      it('toggles the visibility', () => {
-        store.toggleVerificationDialog();
-        expect(store.isVerificationVisible).to.be.true;
-      });
-    });
-  });
-});
diff --git a/js/src/views/Accounts/List/index.js b/js/src/views/Accounts/List/index.js
deleted file mode 100644
index e729c76a02da4292d5190e086e270a36953370b8..0000000000000000000000000000000000000000
--- a/js/src/views/Accounts/List/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './list';
diff --git a/js/src/views/Accounts/List/list.css b/js/src/views/Accounts/List/list.css
deleted file mode 100644
index 15d9cc59768639f23e996f0278403ee62798392c..0000000000000000000000000000000000000000
--- a/js/src/views/Accounts/List/list.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.list {
-  display: flex;
-  flex-wrap: wrap;
-
-  .item {
-    box-sizing: border-box;
-    flex: 0 1 50%;
-    padding-bottom: 0.25em;
-    position: relative;
-    width: 50%;
-
-    &:nth-child(odd) {
-      padding-right: 0.125em;
-    }
-
-    &:nth-child(even) {
-      padding-left: 0.125em;
-    }
-  }
-}
-
-.empty {
-  display: block;
-  width: 100%;
-
-  div {
-    color: #aaa;
-  }
-}
diff --git a/js/src/views/Accounts/List/list.js b/js/src/views/Accounts/List/list.js
deleted file mode 100644
index 2fa3be70b132d79f0171c1a400afe8b59a45b21f..0000000000000000000000000000000000000000
--- a/js/src/views/Accounts/List/list.js
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { pick } from 'lodash';
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { Container, SectionList } from '~/ui';
-import { fetchCertifiers, fetchCertifications } from '~/redux/providers/certifications/actions';
-import { ETH_TOKEN } from '~/util/tokens';
-
-import Summary from '../Summary';
-import styles from './list.css';
-
-class List extends Component {
-  static propTypes = {
-    balances: PropTypes.object.isRequired,
-    certifications: PropTypes.object.isRequired,
-    accounts: PropTypes.object,
-    disabled: PropTypes.object,
-    empty: PropTypes.bool,
-    link: PropTypes.string,
-    order: PropTypes.string,
-    orderFallback: PropTypes.string,
-    search: PropTypes.array,
-
-    fetchCertifiers: PropTypes.func.isRequired,
-    fetchCertifications: PropTypes.func.isRequired,
-    handleAddSearchToken: PropTypes.func
-  };
-
-  componentWillMount () {
-    const { accounts, fetchCertifiers, fetchCertifications } = this.props;
-
-    fetchCertifiers();
-    for (let address in accounts) {
-      fetchCertifications(address);
-    }
-  }
-
-  render () {
-    const { accounts, disabled, empty } = this.props;
-
-    if (empty) {
-      return (
-        <Container className={ styles.empty }>
-          <div>
-            There are currently no accounts or addresses to display.
-          </div>
-        </Container>
-      );
-    }
-
-    const addresses = this
-      .getAddresses()
-      .map((address) => {
-        const account = accounts[address] || {};
-        const isDisabled = disabled ? disabled[address] : false;
-        const owners = account.owners || null;
-
-        return {
-          account,
-          isDisabled,
-          owners
-        };
-      });
-
-    return (
-      <SectionList
-        items={ addresses }
-        renderItem={ this.renderSummary }
-      />
-    );
-  }
-
-  renderSummary = (item) => {
-    const { account, isDisabled, owners } = item;
-    const { handleAddSearchToken, link } = this.props;
-
-    return (
-      <Summary
-        account={ account }
-        disabled={ isDisabled }
-        handleAddSearchToken={ handleAddSearchToken }
-        link={ link }
-        owners={ owners }
-        showCertifications
-      />
-    );
-  }
-
-  getAddresses () {
-    const filteredAddresses = this.getFilteredAddresses();
-
-    return this.sortAddresses(filteredAddresses);
-  }
-
-  sortAddresses (addresses) {
-    const { order, orderFallback } = this.props;
-
-    if (!order) {
-      return addresses;
-    }
-
-    const { accounts } = this.props;
-
-    return addresses.sort((addressA, addressB) => {
-      const accountA = accounts[addressA];
-      const accountB = accounts[addressB];
-
-      const sort = this.compareAccounts(accountA, accountB, order);
-
-      if (sort === 0 && orderFallback) {
-        return this.compareAccounts(accountA, accountB, orderFallback);
-      }
-
-      return sort;
-    });
-  }
-
-  compareAccounts (accountA, accountB, key, _reverse = null) {
-    if (key && key.split(':')[1] === '-1') {
-      return this.compareAccounts(accountA, accountB, key.split(':')[0], true);
-    }
-
-    if (key === 'timestamp' && _reverse === null) {
-      return this.compareAccounts(accountA, accountB, key, true);
-    }
-
-    if (key === 'name') {
-      return accountA.name.localeCompare(accountB.name);
-    }
-
-    if (key === 'eth') {
-      const { balances } = this.props;
-
-      const balanceA = balances[accountA.address];
-      const balanceB = balances[accountB.address];
-
-      if (!balanceA && !balanceB) {
-        return 0;
-      } else if (balanceA && !balanceB) {
-        return -1;
-      } else if (!balanceA && balanceB) {
-        return 1;
-      }
-
-      const ethA = balanceA[ETH_TOKEN.id];
-      const ethB = balanceB[ETH_TOKEN.id];
-
-      if (!ethA && !ethB) {
-        return 0;
-      } else if (ethA && !ethB) {
-        return -1;
-      } else if (!ethA && ethB) {
-        return 1;
-      }
-
-      return -1 * ethA.comparedTo(ethB);
-    }
-
-    if (key === 'tags') {
-      const tagsA = [].concat(accountA.meta.tags)
-        .filter(t => t)
-        .sort()
-        .join('');
-
-      const tagsB = [].concat(accountB.meta.tags)
-        .filter(t => t)
-        .sort()
-        .join('');
-
-      if (!tagsA && !tagsB) {
-        return 0;
-      } else if (tagsA && !tagsB) {
-        return -1;
-      } else if (!tagsA && tagsB) {
-        return 1;
-      }
-
-      return tagsA.localeCompare(tagsB);
-    }
-
-    const reverse = _reverse
-      ? -1
-      : 1;
-
-    const metaA = accountA.meta[key];
-    const metaB = accountB.meta[key];
-
-    if (!metaA && !metaB) {
-      return 0;
-    }
-
-    if (metaA && !metaB) {
-      return -1;
-    }
-
-    if (metaA < metaB) {
-      return -1 * reverse;
-    }
-
-    if (!metaA && metaB) {
-      return 1;
-    }
-
-    if (metaA > metaB) {
-      return 1 * reverse;
-    }
-
-    return 0;
-  }
-
-  getFilteredAddresses () {
-    const { accounts, search } = this.props;
-    const searchValues = (search || []).map(v => v.toLowerCase());
-
-    if (searchValues.length === 0) {
-      return Object.keys(accounts);
-    }
-
-    return Object.keys(accounts)
-      .filter((address) => {
-        const account = accounts[address];
-
-        const tags = account.meta.tags || [];
-        const name = account.name || '';
-
-        const values = tags
-          .concat(name)
-          .map(v => v.toLowerCase());
-
-        return searchValues
-          .map(searchValue => {
-            return values
-              .some(value => value.indexOf(searchValue) >= 0);
-          })
-          // `current && truth, true` => use tokens as AND
-          // `current || truth, false` => use tokens as OR
-          .reduce((current, truth) => current && truth, true);
-      });
-  }
-}
-
-function mapStateToProps (state, props) {
-  const addresses = Object.keys(props.accounts);
-  const balances = pick(state.balances, addresses);
-  const { certifications } = state;
-
-  return { balances, certifications };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    fetchCertifiers,
-    fetchCertifications
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(List);
diff --git a/js/src/views/Accounts/Summary/index.js b/js/src/views/Accounts/Summary/index.js
deleted file mode 100644
index e36c506780cda1bcd841033d9185dc4120f395a2..0000000000000000000000000000000000000000
--- a/js/src/views/Accounts/Summary/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './summary';
diff --git a/js/src/views/Accounts/Summary/summary.js b/js/src/views/Accounts/Summary/summary.js
deleted file mode 100644
index ded53ab7ccc08aed6853703ef890cae7fb88e6a6..0000000000000000000000000000000000000000
--- a/js/src/views/Accounts/Summary/summary.js
+++ /dev/null
@@ -1,294 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { Link } from 'react-router';
-import { isEqual } from 'lodash';
-import ReactTooltip from 'react-tooltip';
-import { FormattedMessage } from 'react-intl';
-
-import { Balance, Container, ContainerTitle, CopyToClipboard, IdentityIcon, IdentityName, Tags, VaultTag } from '~/ui';
-import Certifications from '~/ui/Certifications';
-import { arrayOrObjectProptype, nullableProptype } from '~/util/proptypes';
-
-import styles from '../accounts.css';
-
-class Summary extends Component {
-  static contextTypes = {
-    api: React.PropTypes.object
-  };
-
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    accountsInfo: PropTypes.object.isRequired,
-    disabled: PropTypes.bool,
-    link: PropTypes.string,
-    name: PropTypes.string,
-    noLink: PropTypes.bool,
-    showCertifications: PropTypes.bool,
-    handleAddSearchToken: PropTypes.func,
-    owners: nullableProptype(arrayOrObjectProptype())
-  };
-
-  static defaultProps = {
-    noLink: false,
-    showCertifications: false
-  };
-
-  shouldComponentUpdate (nextProps) {
-    const prev = {
-      link: this.props.link,
-      disabled: this.props.disabled,
-      name: this.props.name,
-      noLink: this.props.noLink,
-      meta: this.props.account.meta,
-      address: this.props.account.address
-    };
-
-    const next = {
-      link: nextProps.link,
-      disabled: nextProps.disabled,
-      name: nextProps.name,
-      noLink: nextProps.noLink,
-      meta: nextProps.account.meta,
-      address: nextProps.account.address
-    };
-
-    if (!isEqual(next, prev)) {
-      return true;
-    }
-
-    const prevOwners = this.props.owners;
-    const nextOwners = nextProps.owners;
-
-    if (!isEqual(prevOwners, nextOwners)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  render () {
-    const { account, disabled, handleAddSearchToken, noLink } = this.props;
-    const { tags } = account.meta;
-
-    if (!account) {
-      return null;
-    }
-
-    const { address } = account;
-
-    return (
-      <Container
-        className={ styles.account }
-        hover={
-          <div className={ styles.overlay }>
-            { this.renderBalance(false) }
-            { this.renderDescription(account.meta) }
-            { this.renderOwners() }
-            { this.renderVault(account.meta) }
-          </div>
-        }
-        link={ this.getLink() }
-      >
-        <Tags
-          className={ styles.tags }
-          tags={ tags }
-          handleAddSearchToken={ handleAddSearchToken }
-        />
-        <div className={ styles.heading }>
-          <IdentityIcon
-            address={ address }
-            disabled={ disabled }
-          />
-          <ContainerTitle
-            byline={
-              <div className={ styles.addressline }>
-                <CopyToClipboard data={ address } />
-                <div className={ styles.address }>{ address }</div>
-              </div>
-            }
-            className={
-              noLink
-                ? styles.main
-                : styles.mainLink
-            }
-            title={
-              <IdentityName
-                address={ address }
-                name={ name }
-                unknown
-              />
-            }
-          />
-        </div>
-        <div className={ styles.summary }>
-          { this.renderBalance(true) }
-        </div>
-        { this.renderCertifications(true) }
-      </Container>
-    );
-  }
-
-  renderDescription (meta = {}) {
-    const { blockNumber } = meta;
-
-    if (!blockNumber) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.blockDescription }>
-        <FormattedMessage
-          id='accounts.summary.minedBlock'
-          defaultMessage='Mined at block #{blockNumber}'
-          values={ {
-            blockNumber: (new BigNumber(blockNumber)).toFormat()
-          } }
-        />
-      </div>
-    );
-  }
-
-  renderOwners () {
-    const { accountsInfo, owners } = this.props;
-    const ownersValid = (owners || []).filter((owner) => owner.address && new BigNumber(owner.address).gt(0));
-
-    if (!ownersValid || ownersValid.length === 0) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.owners }>
-        {
-          ownersValid.map((owner, index) => {
-            const account = accountsInfo[owner.address];
-            let ownerLinkType = 'addresses';
-
-            if (account) {
-              if (account.uuid || account.hardware) {
-                ownerLinkType = 'accounts';
-              } else if (account.wallet) {
-                ownerLinkType = 'wallet';
-              } else if (account.meta.contract) {
-                ownerLinkType = 'contract';
-              }
-            }
-
-            return (
-              <Link
-                className={ styles.owner }
-                key={ `${index}_${owner.address}` }
-                to={ `/${ownerLinkType}/${owner.address}` }
-              >
-                <div
-                  data-tip
-                  data-for={ `owner_${owner.address}` }
-                  data-effect='solid'
-                >
-                  <IdentityIcon
-                    address={ owner.address }
-                    center
-                  />
-                </div>
-                <ReactTooltip id={ `owner_${owner.address}` }>
-                  <FormattedMessage
-                    id='accounts.tooltips.owner'
-                    defaultMessage='{name} (owner)'
-                    values={ {
-                      name: owner.name
-                    } }
-                  />
-                </ReactTooltip>
-              </Link>
-            );
-          })
-        }
-      </div>
-    );
-  }
-
-  getLink () {
-    const { link, account } = this.props;
-    const { address } = account;
-    const baseLink = account.wallet
-      ? 'wallet'
-      : link || 'accounts';
-
-    return `/${baseLink}/${address}`;
-  }
-
-  renderBalance (onlyEth) {
-    const { account } = this.props;
-
-    return (
-      <Balance
-        address={ account.address }
-        className={
-          onlyEth
-            ? styles.ethBalances
-            : styles.allBalances
-        }
-        showOnlyEth={ onlyEth }
-      />
-    );
-  }
-
-  renderCertifications (onlyIcon) {
-    const { showCertifications, account } = this.props;
-
-    if (!showCertifications) {
-      return null;
-    }
-
-    return (
-      <Certifications
-        address={ account.address }
-        className={
-          onlyIcon
-            ? styles.iconCertifications
-            : styles.fullCertifications
-        }
-        showOnlyIcon={ onlyIcon }
-      />
-    );
-  }
-
-  renderVault (meta) {
-    if (!meta || !meta.vault) {
-      return null;
-    }
-
-    return (
-      <VaultTag vault={ meta.vault } />
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { accountsInfo } = state.personal;
-
-  return {
-    accountsInfo
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(Summary);
diff --git a/js/src/views/Accounts/accounts.css b/js/src/views/Accounts/accounts.css
deleted file mode 100644
index de7240cb9dffdf6e43be7e7d507d54b4cc8d7e9b..0000000000000000000000000000000000000000
--- a/js/src/views/Accounts/accounts.css
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.accountTooltip {
-  top: 13.3em;
-  left: 7em;
-}
-
-.account {
-  position: relative;
-
-  .addressline {
-    display: flex;
-    white-space: nowrap;
-
-    .address {
-      display: inline-block;
-      flex: 1;
-      margin-left: 0.5em;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
-
-  .blockDescription {
-    color: rgba(255, 255, 255, 0.25);
-    margin-top: 1.5em;
-  }
-
-  .iconCertifications {
-    top: 72px;
-    opacity: 1;
-    position: absolute;
-    left: 88px;
-
-    img {
-      height: 1em !important;
-      width: 1em !important;
-    }
-  }
-
-  .summary {
-    position: relative;
-
-    .ethBalances {
-      opacity: 1;
-    }
-  }
-
-  .overlay {
-    margin-top: -3.25em;
-  }
-
-  .owners {
-    display: flex;
-    justify-content: center;
-    flex-wrap: wrap;
-    margin-bottom: -0.5em;
-    margin-top: 1em;
-
-    .owner {
-      margin: 0.5em;
-    }
-  }
-
-  &:not(:hover) {
-    .tags {
-      display: none;
-    }
-  }
-
-  &:hover {
-    .ethBalances {
-      opacity: 0;
-    }
-  }
-}
-
-.toolbar {
-  position: relative;
-}
-
-.toolbarTooltip {
-  right: 1em;
-  top: 4em;
-}
-
-.loadings {
-  display: flex;
-  flex-wrap: wrap;
-
-  .loading {
-    flex: 0 1 50%;
-    width: 50%;
-    height: 150px;
-    display: flex;
-    padding: 0.25em;
-    box-sizing: border-box;
-
-    > div {
-      display: flex;
-      flex: 1;
-      align-items: center;
-      justify-content: center;
-      background-color: rgba(0, 0, 0, 0.8);
-    }
-  }
-}
-
-.heading {
-  display: flex;
-  flex-direction: row;
-  overflow: hidden;
-
-  .main,
-  .mainLink {
-    flex: 1;
-    overflow: hidden;
-  }
-
-  .mainLink h3 {
-    color: rgb(0, 151, 167);
-  }
-}
diff --git a/js/src/views/Accounts/accounts.js b/js/src/views/Accounts/accounts.js
deleted file mode 100644
index c8828cff604f34d49f6db37837c4fe2c4e33e21e..0000000000000000000000000000000000000000
--- a/js/src/views/Accounts/accounts.js
+++ /dev/null
@@ -1,516 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observe } from 'mobx';
-import { observer } from 'mobx-react';
-import { uniq, isEqual, pickBy } from 'lodash';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { Link } from 'react-router';
-import { bindActionCreators } from 'redux';
-
-import HardwareStore from '~/mobx/hardwareStore';
-import { CreateAccount, CreateWallet, ExportAccount } from '~/modals';
-import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '~/ui';
-import { AddIcon, KeyIcon, FileDownloadIcon } from '~/ui/Icons';
-import { setVisibleAccounts } from '~/redux/providers/personalActions';
-
-import List from './List';
-import styles from './accounts.css';
-
-@observer
-class Accounts extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  }
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    accountsInfo: PropTypes.object.isRequired,
-    availability: PropTypes.string.isRequired,
-    hasAccounts: PropTypes.bool.isRequired,
-    health: PropTypes.object.isRequired,
-    setVisibleAccounts: PropTypes.func.isRequired
-  }
-
-  hwstore = HardwareStore.get(this.context.api);
-
-  state = {
-    _observeCancel: null,
-    addressBook: false,
-    newDialog: false,
-    newWalletDialog: false,
-    newExportDialog: false,
-    restoreDialog: false,
-    sortOrder: '',
-    searchValues: [],
-    searchTokens: [],
-    show: false
-  }
-
-  componentWillMount () {
-    // FIXME: Messy, figure out what it fixes and do it elegantly
-    window.setTimeout(() => {
-      this.setState({ show: true });
-    }, 100);
-
-    this.setVisibleAccounts();
-
-    this.setState({
-      _observeCancel: observe(this.hwstore, 'wallets', this.onHardwareChange, true)
-    });
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const prevAddresses = Object.keys(this.props.accounts);
-    const nextAddresses = Object.keys(nextProps.accounts);
-
-    if (prevAddresses.length !== nextAddresses.length || !isEqual(prevAddresses.sort(), nextAddresses.sort())) {
-      this.setVisibleAccounts(nextProps);
-    }
-  }
-
-  componentWillUnmount () {
-    this.props.setVisibleAccounts([]);
-    this.state._observeCancel();
-  }
-
-  setVisibleAccounts (props = this.props) {
-    const { accounts, setVisibleAccounts } = props;
-
-    setVisibleAccounts(Object.keys(accounts));
-  }
-
-  render () {
-    return (
-      <div>
-        { this.renderNewDialog() }
-        { this.renderRestoreDialog() }
-        { this.renderNewWalletDialog() }
-        { this.renderNewExportDialog() }
-        { this.renderActionbar() }
-
-        <Page>
-          <Tooltip
-            className={ styles.accountTooltip }
-            text={
-              <FormattedMessage
-                id='accounts.tooltip.overview'
-                defaultMessage='your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account'
-              />
-            }
-          />
-
-          { this.renderExternalAccounts() }
-          { this.renderWallets() }
-          { this.renderAccounts() }
-        </Page>
-      </div>
-    );
-  }
-
-  renderLoading (object) {
-    const loadings = ((object && Object.keys(object)) || []).map((_, idx) => (
-      <div key={ idx } className={ styles.loading }>
-        <div />
-      </div>
-    ));
-
-    return (
-      <div className={ styles.loadings }>
-        { loadings }
-      </div>
-    );
-  }
-
-  renderAccounts () {
-    const { accounts } = this.props;
-    const _accounts = pickBy(accounts, (account) => account.uuid);
-    const _hasAccounts = Object.keys(_accounts).length > 0;
-
-    if (!this.state.show) {
-      return this.renderLoading(_accounts);
-    }
-
-    const { searchValues, sortOrder } = this.state;
-
-    return (
-      <List
-        search={ searchValues }
-        accounts={ _accounts }
-        empty={ !_hasAccounts }
-        order={ sortOrder }
-        handleAddSearchToken={ this.onAddSearchToken }
-      />
-    );
-  }
-
-  renderWallets () {
-    const { accounts } = this.props;
-    const wallets = pickBy(accounts, (account) => account.wallet);
-    const hasWallets = Object.keys(wallets).length > 0;
-
-    if (!hasWallets) {
-      return null;
-    }
-
-    if (!this.state.show) {
-      return this.renderLoading(wallets);
-    }
-
-    const { searchValues, sortOrder } = this.state;
-
-    return (
-      <List
-        link='wallet'
-        search={ searchValues }
-        accounts={ wallets }
-        order={ sortOrder }
-        handleAddSearchToken={ this.onAddSearchToken }
-      />
-    );
-  }
-
-  renderExternalAccounts () {
-    const { accounts } = this.props;
-    const { wallets } = this.hwstore;
-    const hardware = pickBy(accounts, (account) => account.hardware);
-    const external = pickBy(accounts, (account) => account.external);
-    const all = Object.assign({}, hardware, external);
-
-    if (Object.keys(all).length === 0) {
-      return null;
-    }
-
-    if (!this.state.show) {
-      return this.renderLoading(hardware);
-    }
-
-    const { searchValues, sortOrder } = this.state;
-    const disabled = Object
-      .keys(hardware)
-      .filter((address) => !wallets[address])
-      .reduce((result, address) => {
-        result[address] = true;
-        return result;
-      }, {});
-
-    return (
-      <List
-        search={ searchValues }
-        accounts={ all }
-        disabled={ disabled }
-        order={ sortOrder }
-        handleAddSearchToken={ this.onAddSearchToken }
-      />
-    );
-  }
-
-  renderSearchButton () {
-    const onChange = (searchTokens, searchValues) => {
-      this.setState({ searchTokens, searchValues });
-    };
-
-    return (
-      <ActionbarSearch
-        key='searchAccount'
-        tokens={ this.state.searchTokens }
-        onChange={ onChange }
-      />
-    );
-  }
-
-  renderSortButton () {
-    const onChange = (sortOrder) => {
-      this.setState({ sortOrder });
-    };
-
-    return (
-      <ActionbarSort
-        key='sortAccounts'
-        id='sortAccounts'
-        order={ this.state.sortOrder }
-        onChange={ onChange }
-      />
-    );
-  }
-
-  renderActionbar () {
-    const buttons = [
-      this.renderVaultsButton(),
-      <Button
-        key='newAccount'
-        icon={ <AddIcon /> }
-        label={
-          <FormattedMessage
-            id='accounts.button.newAccount'
-            defaultMessage='account'
-          />
-        }
-        onClick={ this.onNewAccountClick }
-      />,
-      this.renderNewWalletButton(),
-      <Button
-        key='restoreAccount'
-        icon={ <AddIcon /> }
-        label={
-          <FormattedMessage
-            id='accounts.button.restoreAccount'
-            defaultMessage='restore'
-          />
-        }
-        onClick={ this.onRestoreAccountClick }
-      />,
-      <Button
-        key='newExport'
-        icon={ <FileDownloadIcon /> }
-        label={
-          <FormattedMessage
-            id='accounts.button.export'
-            defaultMessage='export'
-          />
-        }
-        onClick={ this.onNewExportClick }
-      />,
-      this.renderSearchButton(),
-      this.renderSortButton()
-    ];
-
-    return (
-      <Actionbar
-        className={ styles.toolbar }
-        title={
-          <FormattedMessage
-            id='accounts.title'
-            defaultMessage='Accounts Overview'
-          />
-        }
-        buttons={ buttons }
-      >
-        <Tooltip
-          className={ styles.toolbarTooltip }
-          right
-          text={
-            <FormattedMessage
-              id='accounts.tooltip.actions'
-              defaultMessage='actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item'
-            />
-          }
-        />
-      </Actionbar>
-    );
-  }
-
-  renderNewDialog () {
-    const { accounts } = this.props;
-    const { newDialog } = this.state;
-
-    if (!newDialog) {
-      return null;
-    }
-
-    return (
-      <CreateAccount
-        accounts={ accounts }
-        onClose={ this.onNewAccountClose }
-      />
-    );
-  }
-
-  renderRestoreDialog () {
-    const { accounts } = this.props;
-    const { restoreDialog } = this.state;
-
-    if (!restoreDialog) {
-      return null;
-    }
-
-    return (
-      <CreateAccount
-        accounts={ accounts }
-        onClose={ this.onRestoreAccountClose }
-        restore
-      />
-    );
-  }
-
-  renderVaultsButton () {
-    if (this.props.availability !== 'personal') {
-      return null;
-    }
-
-    return (
-      <Link
-        to='/vaults'
-        key='vaults'
-      >
-        <Button
-          icon={ <KeyIcon /> }
-          label={
-            <FormattedMessage
-              id='accounts.button.vaults'
-              defaultMessage='vaults'
-            />
-          }
-          onClick={ this.onVaultsClick }
-        />
-      </Link>
-    );
-  }
-
-  renderNewWalletButton () {
-    return (
-      <Button
-        key='newWallet'
-        icon={ <AddIcon /> }
-        label={
-          <FormattedMessage
-            id='accounts.button.newWallet'
-            defaultMessage='wallet'
-          />
-        }
-        onClick={ this.onNewWalletClick }
-      />
-    );
-  }
-
-  renderNewWalletDialog () {
-    const { accounts } = this.props;
-    const { newWalletDialog } = this.state;
-
-    if (!newWalletDialog) {
-      return null;
-    }
-
-    return (
-      <CreateWallet
-        accounts={ accounts }
-        onClose={ this.onNewWalletClose }
-      />
-    );
-  }
-
-  renderNewExportDialog () {
-    const { newExportDialog } = this.state;
-
-    if (!newExportDialog) {
-      return null;
-    }
-
-    return (
-      <ExportAccount
-        onClose={ this.onNewExportClose }
-      />
-    );
-  }
-
-  onAddSearchToken = (token) => {
-    const { searchTokens } = this.state;
-    const newSearchTokens = uniq([].concat(searchTokens, token));
-
-    this.setState({ searchTokens: newSearchTokens });
-  }
-
-  onNewAccountClick = () => {
-    this.setState({
-      newDialog: true
-    });
-  }
-
-  onRestoreAccountClick = () => {
-    this.setState({
-      restoreDialog: true
-    });
-  }
-
-  onNewWalletClick = () => {
-    this.setState({
-      newWalletDialog: true
-    });
-  }
-
-  onNewExportClick = () => {
-    this.setState({
-      newExportDialog: true
-    });
-  }
-
-  onNewAccountClose = () => {
-    this.setState({
-      newDialog: false
-    });
-  }
-
-  onRestoreAccountClose = () => {
-    this.setState({
-      restoreDialog: false
-    });
-  }
-
-  onNewWalletClose = () => {
-    this.setState({
-      newWalletDialog: false
-    });
-  }
-
-  onNewExportClose = () => {
-    this.setState({
-      newExportDialog: false
-    });
-  }
-
-  onHardwareChange = () => {
-    const { accountsInfo } = this.props;
-    const { wallets } = this.hwstore;
-
-    Object
-      .keys(wallets)
-      .filter((address) => {
-        const account = accountsInfo[address];
-
-        return !account || !account.meta || !account.meta.hardware;
-      })
-      .forEach((address) => this.hwstore.createAccountInfo(wallets[address], accountsInfo[address]));
-
-    this.setVisibleAccounts();
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts, accountsInfo, hasAccounts } = state.personal;
-  const { availability = 'unknown' } = state.nodeStatus.nodeKind || {};
-  const { health } = state.nodeStatus;
-
-  return {
-    accounts,
-    accountsInfo,
-    availability,
-    hasAccounts,
-    health
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    setVisibleAccounts
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Accounts);
diff --git a/js/src/views/Accounts/accounts.spec.js b/js/src/views/Accounts/accounts.spec.js
deleted file mode 100644
index 3c6ab943954ebb907dd4fa0823221740f8b59905..0000000000000000000000000000000000000000
--- a/js/src/views/Accounts/accounts.spec.js
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import Accounts from './';
-
-let api;
-let component;
-let hwstore;
-let instance;
-let redux;
-
-function createApi () {
-  api = {};
-
-  return api;
-}
-
-function createHwStore (walletAddress = '0x456') {
-  hwstore = {
-    wallets: {
-      [walletAddress]: {
-        address: walletAddress
-      }
-    },
-    createAccountInfo: sinon.stub()
-  };
-
-  return hwstore;
-}
-
-function createRedux () {
-  redux = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        personal: {
-          accounts: {},
-          accountsInfo: {
-            '0x123': { meta: '1' },
-            '0x999': { meta: { hardware: {} } }
-          }
-        },
-        balances: {
-          balances: {}
-        },
-        nodeStatus: {
-          nodeKind: {
-            'availability': 'personal'
-          }
-        }
-      };
-    }
-  };
-
-  return redux;
-}
-
-function render (props = {}) {
-  component = shallow(
-    <Accounts { ...props } />,
-    {
-      context: {
-        store: createRedux()
-      }
-    }
-  ).find('Accounts').shallow({
-    context: {
-      api: createApi()
-    }
-  });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Accounts', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('instance event methods', () => {
-    describe('onHardwareChange', () => {
-      it('detects completely new entries', () => {
-        instance.hwstore = createHwStore();
-        instance.onHardwareChange();
-
-        expect(hwstore.createAccountInfo).to.have.been.calledWith({ address: '0x456' });
-      });
-
-      it('detects addressbook entries', () => {
-        instance.hwstore = createHwStore('0x123');
-        instance.onHardwareChange();
-
-        expect(hwstore.createAccountInfo).to.have.been.calledWith({ address: '0x123' }, { meta: '1' });
-      });
-
-      it('ignores existing hardware entries', () => {
-        instance.hwstore = createHwStore('0x999');
-        instance.onHardwareChange();
-
-        expect(hwstore.createAccountInfo).not.to.have.been.called;
-      });
-    });
-  });
-});
diff --git a/js/src/views/Accounts/index.js b/js/src/views/Accounts/index.js
deleted file mode 100644
index 027387e709e83bcecb50fa82770e5bb7950277ce..0000000000000000000000000000000000000000
--- a/js/src/views/Accounts/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './accounts';
diff --git a/js/src/views/Address/Delete/delete.js b/js/src/views/Address/Delete/delete.js
deleted file mode 100644
index 4ccf05a05770bc2f417fa4d80cd87c2f9629bd18..0000000000000000000000000000000000000000
--- a/js/src/views/Address/Delete/delete.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { ConfirmDialog, IdentityIcon, IdentityName } from '~/ui';
-import { newError } from '~/redux/actions';
-
-import styles from '../address.css';
-
-class Delete extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired,
-    router: PropTypes.object
-  };
-
-  static propTypes = {
-    route: PropTypes.string.isRequired,
-
-    address: PropTypes.string,
-    account: PropTypes.object,
-    confirmMessage: PropTypes.node,
-    visible: PropTypes.bool,
-    onClose: PropTypes.func,
-    newError: PropTypes.func
-  };
-
-  state = {
-    isBusy: false
-  };
-
-  render () {
-    const { account, confirmMessage, visible } = this.props;
-    const { isBusy } = this.state;
-
-    if (!visible) {
-      return null;
-    }
-
-    return (
-      <ConfirmDialog
-        busy={ isBusy }
-        className={ styles.delete }
-        title={
-          <FormattedMessage
-            id='address.delete.title'
-            defaultMessage='confirm removal'
-          />
-        }
-        visible
-        onDeny={ this.closeDeleteDialog }
-        onConfirm={ this.onDeleteConfirmed }
-      >
-        <div className={ styles.hero }>
-          {
-            confirmMessage || (
-              <FormattedMessage
-                id='address.delete.confirmInfo'
-                defaultMessage='Are you sure you want to remove the following address from your addressbook?'
-              />
-            )
-          }
-        </div>
-        <div className={ styles.info }>
-          <IdentityIcon
-            className={ styles.icon }
-            address={ account.address }
-          />
-          <div className={ styles.nameinfo }>
-            <div className={ styles.header }>
-              <IdentityName
-                address={ account.address }
-                unknown
-              />
-            </div>
-            <div className={ styles.address }>
-              { account.address }
-            </div>
-          </div>
-        </div>
-        <div className={ styles.description }>
-          { account.meta.description }
-        </div>
-      </ConfirmDialog>
-    );
-  }
-
-  onDeleteConfirmed = () => {
-    const { api, router } = this.context;
-    const { account, route, newError } = this.props;
-
-    this.setState({ isBusy: true });
-
-    api.parity
-      .removeAddress(account.address)
-      .then(() => {
-        router.push(route);
-        this.closeDeleteDialog();
-      })
-      .catch((error) => {
-        console.error('onDeleteConfirmed', error);
-        newError(new Error(`Deletion failed: ${error.message}`));
-        this.closeDeleteDialog();
-      });
-  }
-
-  closeDeleteDialog = () => {
-    this.props.onClose();
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({ newError }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(Delete);
diff --git a/js/src/views/Address/Delete/index.js b/js/src/views/Address/Delete/index.js
deleted file mode 100644
index 6a0b8d5eec98aa79035acaaaeb3715c3e848d1ac..0000000000000000000000000000000000000000
--- a/js/src/views/Address/Delete/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './delete';
diff --git a/js/src/views/Address/address.css b/js/src/views/Address/address.css
deleted file mode 100644
index 908c1822fbcfa4853f8521e12d0bcd71f9c0cfa3..0000000000000000000000000000000000000000
--- a/js/src/views/Address/address.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.delete {
-  .hero {
-    padding-bottom: 1em;
-  }
-
-  .info {
-    display: inline-block;
-  }
-
-  .icon {
-    display: inline-block;
-  }
-
-  .nameinfo {
-    display: inline-block;
-    text-align: left;
-  }
-
-  .header {
-    text-transform: uppercase;
-    font-size: 1.25em;
-    padding-bottom: 0.25em;
-  }
-
-  .address {
-  }
-
-  .description {
-    padding-top: 1em;
-    font-size: 0.75em;
-    color: #aaa;
-  }
-}
diff --git a/js/src/views/Address/address.js b/js/src/views/Address/address.js
deleted file mode 100644
index a8c1dc2d486b460a5afcdc978720fe88a12e7b9f..0000000000000000000000000000000000000000
--- a/js/src/views/Address/address.js
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { EditMeta, AddAddress } from '~/modals';
-import { Actionbar, Button, Page } from '~/ui';
-import { AddIcon, DeleteIcon, EditIcon } from '~/ui/Icons';
-
-import Header from '../Account/Header';
-import Transactions from '../Account/Transactions';
-import Delete from './Delete';
-import { setVisibleAccounts } from '~/redux/providers/personalActions';
-
-class Address extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired,
-    router: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    setVisibleAccounts: PropTypes.func.isRequired,
-
-    contacts: PropTypes.object,
-    params: PropTypes.object
-  };
-
-  state = {
-    showDeleteDialog: false,
-    showEditDialog: false,
-    showAdd: false
-  };
-
-  componentDidMount () {
-    this.setVisibleAccounts();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const prevAddress = this.props.params.address;
-    const nextAddress = nextProps.params.address;
-
-    if (prevAddress !== nextAddress) {
-      this.setVisibleAccounts(nextProps);
-    }
-  }
-
-  componentWillUnmount () {
-    this.props.setVisibleAccounts([]);
-  }
-
-  setVisibleAccounts (props = this.props) {
-    const { params, setVisibleAccounts } = props;
-    const addresses = [ params.address ];
-
-    setVisibleAccounts(addresses);
-  }
-
-  render () {
-    const { contacts } = this.props;
-    const { address } = this.props.params;
-
-    if (Object.keys(contacts).length === 0) {
-      return null;
-    }
-
-    const contact = (contacts || {})[address];
-
-    return (
-      <div>
-        { this.renderAddAddress(contact, address) }
-        { this.renderEditDialog(contact) }
-        { this.renderActionbar(contact) }
-        { this.renderDelete(contact) }
-        <Page padded>
-          <Header
-            account={ contact || { address, meta: {} } }
-            hideName={ !contact }
-          />
-          <Transactions
-            address={ address }
-          />
-        </Page>
-      </div>
-    );
-  }
-
-  renderAddAddress (contact, address) {
-    if (contact) {
-      return null;
-    }
-
-    const { contacts } = this.props;
-    const { showAdd } = this.state;
-
-    if (!showAdd) {
-      return null;
-    }
-
-    return (
-      <AddAddress
-        contacts={ contacts }
-        onClose={ this.onCloseAdd }
-        address={ address }
-      />
-    );
-  }
-
-  renderDelete (contact) {
-    if (!contact) {
-      return null;
-    }
-
-    const { showDeleteDialog } = this.state;
-
-    return (
-      <Delete
-        account={ contact }
-        visible={ showDeleteDialog }
-        route='/addresses'
-        onClose={ this.closeDeleteDialog }
-      />
-    );
-  }
-
-  renderActionbar (contact) {
-    const buttons = [
-      <Button
-        key='editmeta'
-        icon={ <EditIcon /> }
-        label={
-          <FormattedMessage
-            id='address.buttons.edit'
-            defaultMessage='edit'
-          />
-        }
-        onClick={ this.onEditClick }
-      />,
-      <Button
-        key='delete'
-        icon={ <DeleteIcon /> }
-        label={
-          <FormattedMessage
-            id='address.buttons.forget'
-            defaultMessage='forget'
-          />
-        }
-        onClick={ this.showDeleteDialog }
-      />
-    ];
-
-    const addToBook = (
-      <Button
-        key='newAddress'
-        icon={ <AddIcon /> }
-        label={
-          <FormattedMessage
-            id='address.buttons.save'
-            defaultMessage='save'
-          />
-        }
-        onClick={ this.onOpenAdd }
-      />
-    );
-
-    return (
-      <Actionbar
-        title={
-          <FormattedMessage
-            id='address.title'
-            defaultMessage='Address Information'
-          />
-        }
-        buttons={
-          !contact
-            ? [ addToBook ]
-            : buttons
-        }
-      />
-    );
-  }
-
-  renderEditDialog (contact) {
-    const { showEditDialog } = this.state;
-
-    if (!contact || !showEditDialog) {
-      return null;
-    }
-
-    return (
-      <EditMeta
-        account={ contact }
-        onClose={ this.onEditClick }
-      />
-    );
-  }
-
-  onEditClick = () => {
-    this.setState({
-      showEditDialog: !this.state.showEditDialog
-    });
-  }
-
-  closeDeleteDialog = () => {
-    this.setState({ showDeleteDialog: false });
-  }
-
-  showDeleteDialog = () => {
-    this.setState({ showDeleteDialog: true });
-  }
-
-  onOpenAdd = () => {
-    this.setState({
-      showAdd: true
-    });
-  }
-
-  onCloseAdd = () => {
-    this.setState({ showAdd: false });
-  }
-}
-
-function mapStateToProps (state) {
-  const { contacts } = state.personal;
-
-  return {
-    contacts
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    setVisibleAccounts
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Address);
diff --git a/js/src/views/Address/index.js b/js/src/views/Address/index.js
deleted file mode 100644
index 49bf1c2cd079d38f7a5afe8e77da6d510742800f..0000000000000000000000000000000000000000
--- a/js/src/views/Address/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './address';
diff --git a/js/src/views/Addresses/addresses.css b/js/src/views/Addresses/addresses.css
deleted file mode 100644
index e83342a1e9ed0b1a6c00de06c73f99b6ac926fc6..0000000000000000000000000000000000000000
--- a/js/src/views/Addresses/addresses.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.list {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.address {
-  flex: 0 1 50%;
-  width: 50%;
-  position: relative;
-
-  &:nth-child(odd)>div {
-    padding-right: 0.5em !important;
-  }
-
-  &:nth-child(even)>div {
-    padding-left: 0.5em !important;
-  }
-}
-
-.empty {
-  width: 100%;
-  display: block;
-
-  div {
-    color: #aaa;
-  }
-}
diff --git a/js/src/views/Addresses/addresses.js b/js/src/views/Addresses/addresses.js
deleted file mode 100644
index c02a760f19a70fb8df5fdb61610260602cd758b5..0000000000000000000000000000000000000000
--- a/js/src/views/Addresses/addresses.js
+++ /dev/null
@@ -1,294 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import ContentAdd from 'material-ui/svg-icons/content/add';
-import { uniq, isEqual } from 'lodash';
-
-import List from '../Accounts/List';
-import Summary from '../Accounts/Summary';
-import { AddAddress } from '~/modals';
-import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui';
-import { setVisibleAccounts } from '~/redux/providers/personalActions';
-
-import styles from './addresses.css';
-
-class Addresses extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  }
-
-  static propTypes = {
-    setVisibleAccounts: PropTypes.func.isRequired,
-
-    contacts: PropTypes.object,
-    hasContacts: PropTypes.bool
-  }
-
-  state = {
-    showAdd: false,
-    sortOrder: '',
-    searchValues: [],
-    searchTokens: []
-  }
-
-  componentWillMount () {
-    this.setVisibleAccounts();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const prevAddresses = Object.keys(this.props.contacts);
-    const nextAddresses = Object.keys(nextProps.contacts);
-
-    if (prevAddresses.length !== nextAddresses.length || !isEqual(prevAddresses.sort(), nextAddresses.sort())) {
-      this.setVisibleAccounts(nextProps);
-    }
-  }
-
-  componentWillUnmount () {
-    this.props.setVisibleAccounts([]);
-  }
-
-  setVisibleAccounts (props = this.props) {
-    const { contacts, setVisibleAccounts } = props;
-    const addresses = Object.keys(contacts);
-
-    setVisibleAccounts(addresses);
-  }
-
-  render () {
-    return (
-      <div>
-        { this.renderActionbar() }
-        { this.renderAddAddress() }
-        <Page>
-          { this.renderAccountsList() }
-        </Page>
-      </div>
-    );
-  }
-
-  renderAccountsList () {
-    const { contacts, hasContacts } = this.props;
-    const { searchValues, sortOrder } = this.state;
-
-    return (
-      <List
-        link='addresses'
-        search={ searchValues }
-        accounts={ contacts }
-        empty={ !hasContacts }
-        order={ sortOrder }
-        handleAddSearchToken={ this.onAddSearchToken }
-      />
-    );
-  }
-
-  renderSortButton () {
-    const onChange = (sortOrder) => {
-      this.setState({ sortOrder });
-    };
-
-    return (
-      <ActionbarSort
-        key='sortAccounts'
-        id='sortAddresses'
-        order={ this.state.sortOrder }
-        onChange={ onChange }
-      />
-    );
-  }
-
-  renderSearchButton () {
-    const onChange = (searchTokens, searchValues) => {
-      this.setState({ searchTokens, searchValues });
-    };
-
-    return (
-      <ActionbarSearch
-        key='searchAddress'
-        tokens={ this.state.searchTokens }
-        onChange={ onChange }
-      />
-    );
-  }
-
-  renderActionbar () {
-    const { contacts } = this.props;
-
-    const buttons = [
-      <Button
-        key='newAddress'
-        icon={ <ContentAdd /> }
-        label={
-          <FormattedMessage
-            id='addresses.buttons.add'
-            defaultMessage='address'
-          />
-        }
-        onClick={ this.onOpenAdd }
-      />,
-      <ActionbarExport
-        key='exportAddressbook'
-        content={ contacts }
-        filename='addressbook'
-      />,
-      <ActionbarImport
-        key='importAddressbook'
-        onConfirm={ this.onImport }
-        renderValidation={ this.renderValidation }
-      />,
-      this.renderSearchButton(),
-      this.renderSortButton()
-    ];
-
-    return (
-      <Actionbar
-        className={ styles.toolbar }
-        title={
-          <FormattedMessage
-            id='addresses.title'
-            defaultMessage='Saved Addresses'
-          />
-        }
-        buttons={ buttons }
-      />
-    );
-  }
-
-  renderAddAddress () {
-    const { contacts } = this.props;
-    const { showAdd } = this.state;
-
-    if (!showAdd) {
-      return null;
-    }
-
-    return (
-      <AddAddress
-        contacts={ contacts }
-        onClose={ this.onCloseAdd }
-      />
-    );
-  }
-
-  renderValidation = (content) => {
-    const error = {
-      error: (
-        <FormattedMessage
-          id='addresses.errors.invalidFile'
-          defaultMessage='The provided file is invalid...'
-        />
-      )
-    };
-
-    try {
-      const addresses = JSON.parse(content);
-
-      if (!addresses || Object.keys(addresses).length === 0) {
-        return error;
-      }
-
-      const body = Object
-        .values(addresses)
-        .filter((account) => account && account.address)
-        .map((account, index) => (
-          <Summary
-            key={ index }
-            account={ account }
-            name={ account.name }
-            noLink
-          />
-        ));
-
-      return (
-        <div>
-          { body }
-        </div>
-      );
-    } catch (e) {
-      return error;
-    }
-  }
-
-  onImport = (content) => {
-    try {
-      const addresses = JSON.parse(content);
-
-      Object.values(addresses).forEach((account) => {
-        this.onAddAccount(account);
-      });
-    } catch (e) {
-      console.error('onImport', content, e);
-    }
-  }
-
-  onAddAccount = (account) => {
-    const { api } = this.context;
-    const { address, name, meta } = account;
-
-    Promise.all([
-      api.parity.setAccountName(address, name),
-      api.parity.setAccountMeta(address, {
-        ...meta,
-        timestamp: Date.now(),
-        deleted: false
-      })
-    ]).catch((error) => {
-      console.error('onAddAccount', error);
-    });
-  }
-
-  onAddSearchToken = (token) => {
-    const { searchTokens } = this.state;
-    const newSearchTokens = uniq([].concat(searchTokens, token));
-
-    this.setState({ searchTokens: newSearchTokens });
-  }
-
-  onOpenAdd = () => {
-    this.setState({
-      showAdd: true
-    });
-  }
-
-  onCloseAdd = () => {
-    this.setState({ showAdd: false });
-  }
-}
-
-function mapStateToProps (state) {
-  const { contacts, hasContacts } = state.personal;
-
-  return {
-    contacts,
-    hasContacts
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    setVisibleAccounts
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Addresses);
diff --git a/js/src/views/Addresses/index.js b/js/src/views/Addresses/index.js
deleted file mode 100644
index c5fd947d1a66a43c67dc6b3b982beac3b3e398d1..0000000000000000000000000000000000000000
--- a/js/src/views/Addresses/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './addresses';
diff --git a/js/src/views/Application/Container/container.js b/js/src/views/Application/Container/container.js
deleted file mode 100644
index 5138450e20bff5127f5afcc7f8adbe5920f9dd7d..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Container/container.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { FirstRun, UpgradeParity } from '~/modals';
-import { Errors, ParityBackground, Tooltips } from '~/ui';
-
-import styles from '../application.css';
-
-export default class Container extends Component {
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-    onCloseFirstRun: PropTypes.func,
-    showFirstRun: PropTypes.bool,
-    upgradeStore: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { children, onCloseFirstRun, showFirstRun, upgradeStore } = this.props;
-
-    return (
-      <ParityBackground
-        attachDocument
-        className={ styles.container }
-      >
-        <FirstRun
-          onClose={ onCloseFirstRun }
-          visible={ showFirstRun }
-        />
-        <Tooltips />
-        <UpgradeParity store={ upgradeStore } />
-        <Errors />
-        { children }
-      </ParityBackground>
-    );
-  }
-}
diff --git a/js/src/views/Application/Container/index.js b/js/src/views/Application/Container/index.js
deleted file mode 100644
index 0deedaecc7762f78d94ef12f5d7fdeb29d22ac95..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Container/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './container';
diff --git a/js/src/views/Application/DappContainer/dappContainer.js b/js/src/views/Application/DappContainer/dappContainer.js
deleted file mode 100644
index 7851e98959c6f6cd9f10739703e20cd78c4236d3..0000000000000000000000000000000000000000
--- a/js/src/views/Application/DappContainer/dappContainer.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { Errors } from '~/ui';
-
-import styles from '../application.css';
-
-export default class DappContainer extends Component {
-  static propTypes = {
-    children: PropTypes.node.isRequired
-  };
-
-  render () {
-    const { children } = this.props;
-
-    return (
-      <div className={ styles.container }>
-        <Errors />
-        { children }
-      </div>
-    );
-  }
-}
diff --git a/js/src/views/Application/DappContainer/index.js b/js/src/views/Application/DappContainer/index.js
deleted file mode 100644
index 6fa199541f30c6796b6b330330ede54bbbb92489..0000000000000000000000000000000000000000
--- a/js/src/views/Application/DappContainer/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dappContainer';
diff --git a/js/src/views/Application/Extension/extension.css b/js/src/views/Application/Extension/extension.css
deleted file mode 100644
index 98d094a9faeab0b3fc66ecd63f31504559cda8b1..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Extension/extension.css
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.body {
-  background: #f80;
-  color: white;
-  opacity: 1;
-  max-width: 500px;
-  padding: 1em 4em 1em 2em;
-  position: fixed;
-  right: 1.5em;
-  top: 1.5em;
-  z-index: 1000;
-
-  .button {
-    background: rgba(0, 0, 0, 0.5);
-    color: white !important;
-
-    svg {
-      fill: white !important;
-    }
-  }
-
-  .buttonrow {
-    text-align: right;
-  }
-
-  p {
-    color: white;
-  }
-
-  .close {
-    cursor: pointer;
-    position: absolute;
-    right: 1em;
-    top: 1em;
-  }
-}
diff --git a/js/src/views/Application/Extension/extension.js b/js/src/views/Application/Extension/extension.js
deleted file mode 100644
index e7a0da7fbf9863993614252f4a061b3776c9f562..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Extension/extension.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Button } from '~/ui';
-import { CloseIcon, CheckIcon } from '~/ui/Icons';
-
-import Store from './store';
-import styles from './extension.css';
-
-@observer
-export default class Extension extends Component {
-  store = Store.get();
-
-  render () {
-    const { showWarning } = this.store;
-
-    if (!showWarning) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.body }>
-        <CloseIcon
-          className={ styles.close }
-          onClick={ this.onClose }
-        />
-        <p>
-          <FormattedMessage
-            id='extension.intro'
-            defaultMessage='Parity now has an extension available for Chrome that allows safe browsing of Ethereum-enabled decentralized applications. It is highly recommended that you install this extension to further enhance your Parity experience.'
-          />
-        </p>
-        <p className={ styles.buttonrow }>
-          <Button
-            className={ styles.button }
-            icon={ <CheckIcon /> }
-            label={
-              <FormattedMessage
-                id='extension.install'
-                defaultMessage='Install the extension now'
-              />
-            }
-            onClick={ this.onInstallClick }
-          />
-        </p>
-      </div>
-    );
-  }
-
-  onClose = () => {
-    this.store.snoozeWarning();
-  }
-
-  onInstallClick = () => {
-    this.store.installExtension();
-  }
-}
diff --git a/js/src/views/Application/Extension/index.js b/js/src/views/Application/Extension/index.js
deleted file mode 100644
index ac1cfa0155ff7095b19774e98ee75ff0c5ce8c29..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Extension/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './extension';
diff --git a/js/src/views/Application/Extension/store.js b/js/src/views/Application/Extension/store.js
deleted file mode 100644
index d1df2eb5b65d4b3afc305513c7a7d7501380a488..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Extension/store.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-/* global chrome */
-
-import { action, computed, observable } from 'mobx';
-
-import store from 'store';
-import browser from 'useragent.js/lib/browser';
-
-import { DOMAIN } from '~/util/constants';
-
-const A_DAY = 24 * 60 * 60 * 1000;
-const NEXT_DISPLAY = '_parity::extensionWarning::nextDisplay';
-
-// 'https://chrome.google.com/webstore/detail/parity-ethereum-integrati/himekenlppkgeaoeddcliojfddemadig';
-const EXTENSION_PAGE = 'https://chrome.google.com/webstore/detail/himekenlppkgeaoeddcliojfddemadig';
-
-let instance;
-
-export default class Store {
-  @observable hasExtension = false;
-  @observable isInstalling = false;
-  @observable nextDisplay = 0;
-  @observable shouldInstall = false;
-
-  constructor () {
-    this.nextDisplay = store.get(NEXT_DISPLAY) || 0;
-    this.testInstall();
-  }
-
-  @computed get showWarning () {
-    return !this.isInstalling && this.shouldInstall && (Date.now() > this.nextDisplay);
-  }
-
-  @action setExtensionActive = () => {
-    this.hasExtension = true;
-  }
-
-  @action setInstalling = (isInstalling) => {
-    this.isInstalling = isInstalling;
-  }
-
-  @action snoozeWarning = (sleep = A_DAY) => {
-    this.nextDisplay = Date.now() + sleep;
-    store.set(NEXT_DISPLAY, this.nextDisplay);
-  }
-
-  @action testInstall = () => {
-    this.shouldInstall = this.readStatus();
-  }
-
-  readStatus = () => {
-    const hasExtension = Symbol.for('parity.extension') in window;
-    const ua = browser.analyze(navigator.userAgent || '');
-
-    if (hasExtension) {
-      this.setExtensionActive();
-      return false;
-    }
-
-    return (ua || {}).name.toLowerCase() === 'chrome';
-  }
-
-  installExtension = () => {
-    this.setInstalling(true);
-
-    if (window.location.hostname.toString().endsWith(DOMAIN)) {
-      return this.inlineInstall()
-        .catch((error) => {
-          console.warn('Unable to perform direct install', error);
-          window.open(EXTENSION_PAGE, '_blank');
-        });
-    }
-
-    window.open(EXTENSION_PAGE, '_blank');
-    return Promise.resolve(true);
-  }
-
-  inlineInstall = () => {
-    return new Promise((resolve, reject) => {
-      const link = document.createElement('link');
-
-      link.setAttribute('rel', 'chrome-webstore-item');
-      link.setAttribute('href', EXTENSION_PAGE);
-      document.querySelector('head').appendChild(link);
-
-      if (chrome && chrome.webstore && chrome.webstore.install) {
-        chrome.webstore.install(EXTENSION_PAGE, resolve, reject);
-      } else {
-        reject(new Error('Direct installation failed.'));
-      }
-    });
-  }
-
-  static get () {
-    if (!instance) {
-      instance = new Store();
-    }
-
-    return instance;
-  }
-}
diff --git a/js/src/views/Application/FrameError/frameError.css b/js/src/views/Application/FrameError/frameError.css
deleted file mode 100644
index bf3d76f99a59a8c8851847acf680850e43b2241d..0000000000000000000000000000000000000000
--- a/js/src/views/Application/FrameError/frameError.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.error {
-  padding: 2em;
-  background: red;
-  color: white;
-}
diff --git a/js/src/views/Application/FrameError/frameError.js b/js/src/views/Application/FrameError/frameError.js
deleted file mode 100644
index 0cf1f4ef2173d7ba79aa8c9824093ea77d5a5158..0000000000000000000000000000000000000000
--- a/js/src/views/Application/FrameError/frameError.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import styles from './frameError.css';
-
-export default class FrameError extends Component {
-  render () {
-    return (
-      <div className={ styles.error }>
-        <FormattedMessage
-          id='application.frame.error'
-          defaultMessage='ERROR: This application cannot and should not be loaded in an embedded iFrame'
-        />
-      </div>
-    );
-  }
-}
diff --git a/js/src/views/Application/FrameError/index.js b/js/src/views/Application/FrameError/index.js
deleted file mode 100644
index 7b0ea95eafe5a3edfbc51135c299d90aff6ac908..0000000000000000000000000000000000000000
--- a/js/src/views/Application/FrameError/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './frameError';
diff --git a/js/src/views/Application/Requests/index.js b/js/src/views/Application/Requests/index.js
deleted file mode 100644
index 69692f6451c68d9391c5e7b94b2af47369915c39..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Requests/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './requests';
diff --git a/js/src/views/Application/Requests/requests.css b/js/src/views/Application/Requests/requests.css
deleted file mode 100644
index a5f33c07a053bd4f98e61df4bcd437ebfe51c709..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Requests/requests.css
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$baseColor: 18;
-$baseOpacity: 0.95;
-$borderColor: rgba($baseColor, $baseColor, $baseColor, 0.25);
-
-.requests {
-  align-items: flex-end;
-  bottom: 2em;
-  display: flex;
-  flex-direction: column;
-  position: fixed;
-  right: 0.175em;
-  width: 24em;
-  z-index: 750;
-
-  * {
-    font-size: 0.85rem !important;
-  }
-}
-
-.request {
-  animation-fill-mode: forwards;
-  animation-timing-function: cubic-bezier(0.7, 0, 0.3, 1);
-  background-color: rgba($baseColor, $baseColor, $baseColor, $baseOpacity);
-  border: 4px solid $borderColor;
-  cursor: pointer;
-  margin-top: 0.25em;
-  opacity: 1;
-  width: 100%;
-
-  &.hide {
-    animation-duration: 0.5s;
-    animation-name: fadeout;
-  }
-
-  .status {
-    padding: 0.5em;
-
-    &.error {
-      background-color: rgba(200, 40, 40, 0.95);
-      color: white;
-    }
-  }
-
-  .container {
-    display: flex;
-    flex-direction: row;
-    padding: 1em 1em 0.5em 1em;
-  }
-
-  &:hover .container {
-    background-color: rgba($baseColor, $baseColor, $baseColor, 1);
-  }
-
-  p {
-    margin: 0;
-  }
-}
-
-@keyframes fadeout {
-  from {
-    display: block;
-    height: inherit;
-    opacity: 1;
-  }
-
-  49% {
-    display: block;
-    height: inherit;
-    opacity: 0;
-  }
-
-  98% {
-    display: block;
-    height: 0;
-    opacity: 0;
-  }
-
-  to {
-    display: none;
-    height: 0;
-    opacity: 0;
-  }
-}
-
-.identity {
-  align-items: center;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  margin-right: 1em;
-
-  .icon {
-    margin-bottom: 0.5rem;
-  }
-}
-
-.inline {
-  align-items: center;
-  display: flex;
-  flex-direction: row;
-
-  .fill {
-    flex: 1 0 auto;
-  }
-}
-
-.hash {
-  margin-left: 0.25em;
-}
diff --git a/js/src/views/Application/Requests/requests.js b/js/src/views/Application/Requests/requests.js
deleted file mode 100644
index dfbb866b9061855535afc6b0608430444d576e55..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Requests/requests.js
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { LinearProgress } from 'material-ui';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import ReactDOM from 'react-dom';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { hideRequest } from '~/redux/providers/requestsActions';
-import { MethodDecoding, IdentityIcon, ScrollableText, ShortenedHash } from '~/ui';
-
-import styles from './requests.css';
-
-const ERROR_STATE = 'ERROR_STATE';
-const DONE_STATE = 'DONE_STATE';
-const WAITING_STATE = 'WAITING_STATE';
-
-class Requests extends Component {
-  static propTypes = {
-    requests: PropTypes.object.isRequired,
-    onHideRequest: PropTypes.func.isRequired
-  };
-
-  state = {
-    extras: {}
-  };
-
-  render () {
-    const { requests } = this.props;
-    const { extras } = this.state;
-
-    return (
-      <div className={ styles.requests }>
-        {
-          Object
-            .values(requests)
-            .map((request) => this.renderRequest(request, extras[request.requestId]))
-        }
-      </div>
-    );
-  }
-
-  renderRequest (request, extras = {}) {
-    const { show, transaction } = request;
-    const state = this.getTransactionState(request);
-    const displayedTransaction = { ...transaction };
-
-    // Don't show gas and gasPrice
-    delete displayedTransaction.gas;
-    delete displayedTransaction.gasPrice;
-
-    const requestClasses = [ styles.request ];
-    const statusClasses = [ styles.status ];
-    const requestStyle = {};
-
-    const handleHideRequest = () => {
-      this.handleHideRequest(request.requestId);
-    };
-
-    if (state.type === ERROR_STATE) {
-      statusClasses.push(styles.error);
-    }
-
-    if (!show) {
-      requestClasses.push(styles.hide);
-    }
-
-    // Set the Request height (for animation) if found
-    if (extras.height) {
-      requestStyle.height = extras.height;
-    }
-
-    return (
-      <div
-        className={ requestClasses.join(' ') }
-        key={ request.requestId }
-        ref={ `request_${request.requestId}` }
-        onClick={ handleHideRequest }
-        style={ requestStyle }
-      >
-        <div className={ statusClasses.join(' ') }>
-          { this.renderStatus(request) }
-        </div>
-        {
-          state.type === ERROR_STATE
-            ? null
-            : (
-              <LinearProgress
-                max={ 6 }
-                mode={ state.type === WAITING_STATE ? 'indeterminate' : 'determinate' }
-                value={ state.type === DONE_STATE ? +request.blockHeight : 6 }
-              />
-            )
-        }
-        <div className={ styles.container }>
-          <div
-            className={ styles.identity }
-            title={ transaction.from }
-          >
-            <IdentityIcon
-              address={ transaction.from }
-              inline
-              center
-              className={ styles.icon }
-            />
-          </div>
-          <MethodDecoding
-            address={ transaction.from }
-            compact
-            historic={ state.type === DONE_STATE }
-            transaction={ displayedTransaction }
-          />
-        </div>
-      </div>
-    );
-  }
-
-  renderStatus (request) {
-    const { error, transactionHash, transactionReceipt } = request;
-
-    if (error) {
-      return (
-        <div
-          className={ styles.inline }
-          title={ error.message }
-        >
-          <FormattedMessage
-            id='requests.status.error'
-            defaultMessage='An error occured:'
-          />
-          <div className={ styles.fill }>
-            <ScrollableText
-              text={ error.text || error.message || error.toString() }
-            />
-          </div>
-        </div>
-      );
-    }
-
-    if (transactionReceipt) {
-      return (
-        <FormattedMessage
-          id='requests.status.transactionMined'
-          defaultMessage='Transaction mined at block #{blockNumber} ({blockHeight} blocks ago)'
-          values={ {
-            blockHeight: +request.blockHeight,
-            blockNumber: +transactionReceipt.blockNumber
-          } }
-        />
-      );
-    }
-
-    if (transactionHash) {
-      return (
-        <div className={ styles.inline }>
-          <FormattedMessage
-            id='requests.status.transactionSent'
-            defaultMessage='Transaction sent to network with hash'
-          />
-          <div className={ [ styles.fill, styles.hash ].join(' ') }>
-            <ShortenedHash data={ transactionHash } />
-          </div>
-        </div>
-      );
-    }
-
-    return (
-      <FormattedMessage
-        id='requests.status.waitingForSigner'
-        defaultMessage='Waiting for authorization in the Parity Signer'
-      />
-    );
-  }
-
-  getTransactionState (request) {
-    const { error, transactionReceipt } = request;
-
-    if (error) {
-      return { type: ERROR_STATE };
-    }
-
-    if (transactionReceipt) {
-      return { type: DONE_STATE };
-    }
-
-    return { type: WAITING_STATE };
-  }
-
-  handleHideRequest = (requestId) => {
-    const requestElement = ReactDOM.findDOMNode(this.refs[`request_${requestId}`]);
-
-    // Try to get the request element height, to have a nice transition effect
-    if (requestElement) {
-      const { height } = requestElement.getBoundingClientRect();
-      const prevExtras = this.state.extras;
-      const nextExtras = {
-        ...prevExtras,
-        [ requestId ]: {
-          ...prevExtras[requestId],
-          height
-        }
-      };
-
-      return this.setState({ extras: nextExtras }, () => {
-        return this.props.onHideRequest(requestId);
-      });
-    }
-
-    return this.props.onHideRequest(requestId);
-  }
-}
-
-const mapStateToProps = (state) => {
-  const { requests } = state;
-
-  return { requests };
-};
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    onHideRequest: hideRequest
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Requests);
diff --git a/js/src/views/Application/Requests/savedRequests.js b/js/src/views/Application/Requests/savedRequests.js
deleted file mode 100644
index 546324a5677a10b46d99840eb4b23b6e18403a3b..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Requests/savedRequests.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import store from 'store';
-
-export const LS_REQUESTS_KEY = '_parity::requests';
-
-export default class SavedRequests {
-  load (api) {
-    return this.loadRequests(api)
-      .catch((error) => {
-        console.error(error);
-        return [];
-      });
-  }
-
-  /**
-   * Load the requests of the current network
-   */
-  loadRequests (api) {
-    const requests = this._get();
-
-    return api.parity.localTransactions()
-      .then((localTransactions) => {
-        const promises = Object.values(requests).map((request) => {
-          const { requestId, transactionHash } = request;
-
-          if (transactionHash) {
-            // The transaction might be from an other
-            // chain
-            if (!localTransactions[transactionHash]) {
-              this.remove(requestId);
-              return null;
-            }
-
-            return request;
-          }
-
-          // The request hasn't been signed yet
-          return this._requestExists(api, requestId)
-            .then((exists) => {
-              if (!exists) {
-                this.remove(requestId);
-                return null;
-              }
-
-              return request;
-            });
-        });
-
-        return Promise.all(promises);
-      })
-      .then((requests) => requests.filter((request) => request));
-  }
-
-  save (requestId, requestData) {
-    const requests = this._get();
-
-    requests[requestId] = {
-      ...(requests[requestId] || {}),
-      ...requestData
-    };
-
-    this._set(requests);
-  }
-
-  remove (requestId) {
-    const requests = this._get();
-
-    delete requests[requestId];
-    this._set(requests);
-  }
-
-  _get () {
-    return store.get(LS_REQUESTS_KEY) || {};
-  }
-
-  _set (requests = {}) {
-    if (Object.keys(requests).length > 0) {
-      return store.set(LS_REQUESTS_KEY, requests);
-    }
-
-    return store.remove(LS_REQUESTS_KEY);
-  }
-
-  _requestExists (api, requestId) {
-    return api.parity
-      .checkRequest(requestId)
-      .then(() => true)
-      .catch(() => {
-        return false;
-      });
-  }
-}
diff --git a/js/src/views/Application/Requests/savedRequests.spec.js b/js/src/views/Application/Requests/savedRequests.spec.js
deleted file mode 100644
index 8e8362f2001287ff39f5cd9ffc20ba2b6cf9cac5..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Requests/savedRequests.spec.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-import store from 'store';
-
-import SavedRequests, { LS_REQUESTS_KEY } from './savedRequests';
-
-const DEFAULT_REQUEST = {
-  requestId: '0x1',
-  transaction: {}
-};
-
-const SIGNED_REQUEST = {
-  requestId: '0x2',
-  transactionHash: '0xabcdef',
-  transaction: {}
-};
-
-const api = createApi();
-const savedRequests = new SavedRequests();
-
-function createApi () {
-  return {
-    parity: {
-      checkRequest: sinon.stub().resolves(),
-      localTransactions: sinon.stub().resolves([])
-    }
-  };
-}
-
-describe('views/Application/Requests/savedRequests', () => {
-  beforeEach((done) => {
-    store.set(LS_REQUESTS_KEY, {
-      [DEFAULT_REQUEST.requestId]: DEFAULT_REQUEST,
-      [SIGNED_REQUEST.requestId]: SIGNED_REQUEST
-    });
-
-    savedRequests.load(api)
-      .then(() => done());
-  });
-
-  afterEach(() => {
-    store.set(LS_REQUESTS_KEY, {});
-  });
-
-  it('gets requests from local storage', () => {
-    const requests = savedRequests._get();
-
-    expect(requests[DEFAULT_REQUEST.requestId]).to.deep.equal(DEFAULT_REQUEST);
-  });
-
-  it('sets requests to local storage', () => {
-    savedRequests._set({});
-
-    const requests = savedRequests._get();
-
-    expect(requests).to.deep.equal({});
-  });
-
-  it('removes requests', () => {
-    savedRequests.remove(DEFAULT_REQUEST.requestId);
-
-    const requests = savedRequests._get();
-
-    expect(requests[DEFAULT_REQUEST.requestId]).to.be.undefined;
-  });
-
-  it('saves new requests', () => {
-    savedRequests.save(DEFAULT_REQUEST.requestId, { extraData: true });
-
-    const requests = savedRequests._get();
-
-    expect(requests[DEFAULT_REQUEST.requestId]).to.deep.equal({
-      ...DEFAULT_REQUEST,
-      extraData: true
-    });
-  });
-
-  it('loads requests', () => {
-    return savedRequests.load(api)
-      .then((requests) => {
-        expect(requests).to.deep.equal([ DEFAULT_REQUEST ]);
-      });
-  });
-});
diff --git a/js/src/views/Application/Snackbar/index.js b/js/src/views/Application/Snackbar/index.js
deleted file mode 100644
index 2a7e79b5de95eaba5a36a738989888d75d075447..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Snackbar/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './snackbar';
diff --git a/js/src/views/Application/Snackbar/snackbar.js b/js/src/views/Application/Snackbar/snackbar.js
deleted file mode 100644
index a93161abc2c40474303a1807f6dda7b847fca271..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Snackbar/snackbar.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { Snackbar as SnackbarMUI } from 'material-ui';
-import { darkBlack, grey800 } from 'material-ui/styles/colors';
-
-import { closeSnackbar } from '~/redux/providers/snackbarActions';
-
-const bodyStyle = {
-  backgroundColor: darkBlack,
-  borderStyle: 'solid',
-  borderColor: grey800,
-  borderWidth: '1px 1px 0 1px',
-  minWidth: 0
-};
-
-class Snackbar extends Component {
-  static propTypes = {
-    closeSnackbar: PropTypes.func.isRequired,
-
-    open: PropTypes.bool,
-    cooldown: PropTypes.number,
-    message: PropTypes.any
-  };
-
-  render () {
-    const { open, message, cooldown } = this.props;
-
-    return (
-      <SnackbarMUI
-        open={ open }
-        message={ message }
-        autoHideDuration={ cooldown }
-        bodyStyle={ bodyStyle }
-        onRequestClose={ this.handleClose }
-      />
-    );
-  }
-
-  handleClose = () => {
-    this.props.closeSnackbar();
-  }
-}
-
-function mapStateToProps (state) {
-  const { open, message, cooldown } = state.snackbar;
-
-  return { open, message, cooldown };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    closeSnackbar
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Snackbar);
diff --git a/js/src/views/Application/Status/index.js b/js/src/views/Application/Status/index.js
deleted file mode 100644
index b41557c1ce4ca1d37324cd49b11916a9776f5566..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Status/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './status';
diff --git a/js/src/views/Application/Status/status.css b/js/src/views/Application/Status/status.css
deleted file mode 100644
index 50b1c73178b555e4d27af3b7ad096993c5b33629..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Status/status.css
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.status {
-  align-items: center;
-  background-color: rgba(0, 0, 0, 0.8);
-  bottom: 0;
-  color: #ccc;
-  display: flex;
-  font-size: 0.75em;
-  left: 0;
-  padding: .4em .5em;
-  position: fixed;
-  right: 0;
-  z-index: 1000;
-}
-
-.netinfo {
-  color: #ddd;
-  flex-grow: 1;
-  text-align: right;
-  vertical-align: middle;
-  text-align: right;
-
-  div {
-    display: inline-block;
-    margin-left: 1em;
-  }
-}
-
-.network {
-  border-radius: 0.4em;
-  line-height: 1.2;
-  padding: 0.25em 0.5em;
-  text-transform: uppercase;
-
-  &.live {
-    background: rgb(0, 136, 0);
-  }
-
-  &.test {
-    background: rgb(136, 0, 0);
-  }
-}
-
-.upgrade {
-  div {
-    display: inline-block;
-    margin-left: 1em;
-  }
-}
diff --git a/js/src/views/Application/Status/status.js b/js/src/views/Application/Status/status.js
deleted file mode 100644
index f44f48eb303f78a7ea0c86b04aefef3c6280e740..0000000000000000000000000000000000000000
--- a/js/src/views/Application/Status/status.js
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import { BlockStatus, StatusIndicator } from '~/ui';
-
-import styles from './status.css';
-
-class Status extends Component {
-  static propTypes = {
-    clientVersion: PropTypes.string,
-    isTest: PropTypes.bool,
-    netChain: PropTypes.string,
-    netPeers: PropTypes.object,
-    health: PropTypes.object,
-    upgradeStore: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { clientVersion, isTest, netChain, netPeers, health } = this.props;
-
-    return (
-      <div className={ styles.status }>
-        <div className={ styles.version }>
-          { clientVersion }
-        </div>
-        <div className={ styles.upgrade }>
-          { this.renderConsensus() }
-          { this.renderUpgradeButton() }
-        </div>
-        <div className={ styles.netinfo }>
-          <div>
-            <StatusIndicator
-              type='signal'
-              id='application.status.health'
-              status={ health.overall.status }
-              title={ health.overall.message }
-            />
-          </div>
-          <span title={ `${netPeers.connected.toFormat()}/${netPeers.max.toFormat()} peers` }>
-            <BlockStatus />
-          </span>
-          <div className={ `${styles.network} ${styles[isTest ? 'test' : 'live']}` }>
-            { netChain }
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderConsensus () {
-    const { upgradeStore } = this.props;
-
-    if (!upgradeStore || !upgradeStore.consensusCapability) {
-      return null;
-    }
-
-    if (upgradeStore.consensusCapability === 'capable') {
-      return (
-        <div>
-          <FormattedMessage
-            id='application.status.consensus.capable'
-            defaultMessage='Upgrade not required.'
-          />
-        </div>
-      );
-    }
-
-    if (upgradeStore.consensusCapability.capableUntil) {
-      return (
-        <div>
-          <FormattedMessage
-            id='application.status.consensus.capableUntil'
-            defaultMessage='Upgrade required before #{blockNumber}'
-            values={ {
-              blockNumber: upgradeStore.consensusCapability.capableUntil
-            } }
-          />
-        </div>
-      );
-    }
-
-    if (upgradeStore.consensusCapability.incapableSince) {
-      return (
-        <div>
-          <FormattedMessage
-            id='application.status.consensus.incapableSince'
-            defaultMessage='Upgrade required since #{blockNumber}'
-            values={ {
-              blockNumber: upgradeStore.consensusCapability.incapableSince
-            } }
-          />
-        </div>
-      );
-    }
-
-    return;
-  }
-
-  renderUpgradeButton () {
-    const { upgradeStore } = this.props;
-
-    if (!upgradeStore.available) {
-      return null;
-    }
-
-    return (
-      <div>
-        <a
-          href='javascript:void(0)'
-          onClick={ upgradeStore.openModal }
-        >
-          <FormattedMessage
-            id='application.status.upgrade'
-            defaultMessage='Upgrade'
-          />
-        </a>
-      </div>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { clientVersion, health, netPeers, netChain, isTest } = state.nodeStatus;
-
-  return {
-    clientVersion,
-    health,
-    netPeers,
-    netChain,
-    isTest
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(Status);
diff --git a/js/src/views/Application/TabBar/Tab/index.js b/js/src/views/Application/TabBar/Tab/index.js
deleted file mode 100644
index 5c539709fe3a97bab4adb9af1b459a713b760ef5..0000000000000000000000000000000000000000
--- a/js/src/views/Application/TabBar/Tab/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './tab';
diff --git a/js/src/views/Application/TabBar/Tab/tab.js b/js/src/views/Application/TabBar/Tab/tab.js
deleted file mode 100644
index 9496c73e4b0fc00c215003ec306f464966faa219..0000000000000000000000000000000000000000
--- a/js/src/views/Application/TabBar/Tab/tab.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Tab as MUITab } from 'material-ui/Tabs';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Badge } from '~/ui';
-
-import styles from '../tabBar.css';
-
-const SIGNER_ID = 'signer';
-
-export default class Tab extends Component {
-  static propTypes = {
-    pendings: PropTypes.number,
-    view: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { view } = this.props;
-
-    return (
-      <MUITab
-        icon={ view.icon }
-        label={
-          view.id === SIGNER_ID
-            ? this.renderSignerLabel()
-            : this.renderLabel(view.id)
-        }
-      />
-    );
-  }
-
-  renderLabel (id, bubble) {
-    return (
-      <div className={ styles.label }>
-        <FormattedMessage
-          id={ `settings.views.${id}.label` }
-        />
-        { bubble }
-      </div>
-    );
-  }
-
-  renderSignerLabel () {
-    const { pendings } = this.props;
-    let bubble;
-
-    if (pendings) {
-      bubble = (
-        <Badge
-          color='red'
-          className={ styles.labelBubble }
-          value={ pendings }
-        />
-      );
-    }
-
-    return this.renderLabel(SIGNER_ID, bubble);
-  }
-}
diff --git a/js/src/views/Application/TabBar/Tab/tabs.spec.js b/js/src/views/Application/TabBar/Tab/tabs.spec.js
deleted file mode 100644
index c1771412a2a2bf4c54e6877f36aa207e35ff33c9..0000000000000000000000000000000000000000
--- a/js/src/views/Application/TabBar/Tab/tabs.spec.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import Tab from './';
-
-let component;
-let instance;
-
-function render (id = 'signer') {
-  component = shallow(
-    <Tab
-      pending={ 5 }
-      view={ { id } }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Application/TabBar/Tab', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('instance methods', () => {
-    describe('renderLabel', () => {
-      it('renders the label with correct label', () => {
-        expect(
-          shallow(instance.renderLabel('test')).find('FormattedMessage').props().id
-        ).to.equal('settings.views.test.label');
-      });
-
-      it('renders the bubble when passed', () => {
-        expect(
-          shallow(instance.renderLabel('test', 'testBubble')).text()
-        ).to.equal('<FormattedMessage />testBubble');
-      });
-    });
-
-    describe('renderSignerLabel', () => {
-      beforeEach(() => {
-        sinon.stub(instance, 'renderLabel');
-      });
-
-      afterEach(() => {
-        instance.renderLabel.restore();
-      });
-
-      it('calls renderLabel with the details', () => {
-        instance.renderSignerLabel();
-        expect(instance.renderLabel).to.have.been.calledWith('signer');
-      });
-    });
-  });
-});
diff --git a/js/src/views/Application/TabBar/index.js b/js/src/views/Application/TabBar/index.js
deleted file mode 100644
index 89941f3fd27fbd5e49050c6dede62d5a144fb281..0000000000000000000000000000000000000000
--- a/js/src/views/Application/TabBar/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './tabBar';
diff --git a/js/src/views/Application/TabBar/tabBar.css b/js/src/views/Application/TabBar/tabBar.css
deleted file mode 100644
index fa8478f8b3b1620aaceb9e2718d62cfd2494e3bc..0000000000000000000000000000000000000000
--- a/js/src/views/Application/TabBar/tabBar.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.toolbar {
-  background: none !important;
-  height: 72px !important;
-  position: relative;
-}
-
-.tabs {
-  width: 100%;
-  position: relative;
-  display: flex;
-
-  & > * {
-    flex: 1;
-  }
-}
-
-.tabLink {
-  display: flex;
-
-  > * {
-    flex: 1;
-  }
-
-  &:hover {
-    background: rgba(0, 0, 0, 0.4) !important;
-  }
-
-  &.tabactive, &.tabactive:hover {
-    background: rgba(0, 0, 0, 0.25) !important;
-    border-radius: 4px 4px 0 0;
-
-    * {
-      color: white !important;
-    }
-  }
-}
-
-.tabLink,
-.settings,
-.first,
-.last {
-  background: rgba(0, 0, 0, 0.5) !important; /* rgba(0, 0, 0, 0.25) !important; */
-}
-
-.tabbarTooltip {
-  left: 3em;
-  top: 4em;
-}
-
-.label {
-  position: relative;
-}
-
-.labelBubble {
-  position: absolute;
-  top: -12px;
-  right: -12px;
-}
-
-.first,
-.last {
-  margin: 0;
-  padding: 36px 12px;
-  white-space: nowrap;
-}
-
-.indicatorTab {
-  font-size: 1.5rem;
-  flex: 0;
-}
-
-.indicator {
-  padding: 20px 12px 0;
-  opacity: 0.8;
-}
-
-.first {
-  margin-left: -24px;
-}
-
-.last {
-  margin-right: -24px;
-}
diff --git a/js/src/views/Application/TabBar/tabBar.js b/js/src/views/Application/TabBar/tabBar.js
deleted file mode 100644
index 7ac0d8eac57c26e9809485ec199808c1c5516883..0000000000000000000000000000000000000000
--- a/js/src/views/Application/TabBar/tabBar.js
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { Link } from 'react-router';
-import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';
-import { isEqual } from 'lodash';
-
-import { Tooltip, StatusIndicator } from '~/ui';
-
-import Tab from './Tab';
-import styles from './tabBar.css';
-
-class TabBar extends Component {
-  static contextTypes = {
-    router: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    pending: PropTypes.array,
-    health: PropTypes.object.isRequired,
-    views: PropTypes.array.isRequired
-  };
-
-  static defaultProps = {
-    pending: []
-  };
-
-  render () {
-    const { health } = this.props;
-
-    return (
-      <Toolbar className={ styles.toolbar }>
-        <ToolbarGroup className={ styles.first }>
-          <div />
-        </ToolbarGroup>
-        <div className={ styles.tabs }>
-          <Link
-            activeClassName={ styles.tabactive }
-            className={ `${styles.tabLink} ${styles.indicatorTab}` }
-            key='status'
-            to='/status'
-          >
-            <div className={ styles.indicator }>
-              <StatusIndicator
-                type='signal'
-                id='topbar.health'
-                status={ health.overall.status }
-                title={ health.overall.message }
-              />
-            </div>
-          </Link>
-          { this.renderTabItems() }
-          <Tooltip
-            className={ styles.tabbarTooltip }
-            text={
-              <FormattedMessage
-                id='tabBar.tooltip.overview'
-                defaultMessage='navigate between the different parts and views of the application, switching between an account view, token view and decentralized application view'
-              />
-            }
-          />
-        </div>
-        <ToolbarGroup className={ styles.last }>
-          <div />
-        </ToolbarGroup>
-      </Toolbar>
-    );
-  }
-
-  renderTabItems () {
-    const { views, pending } = this.props;
-
-    return views.map((view, index) => {
-      return (
-        <Link
-          activeClassName={ styles.tabactive }
-          className={ styles.tabLink }
-          key={ view.id }
-          to={ view.route }
-        >
-          <Tab
-            pendings={ pending.length }
-            view={ view }
-          />
-        </Link>
-      );
-    });
-  }
-}
-
-function mapStateToProps (initState) {
-  const { views } = initState.settings;
-
-  let filteredViewIds = Object
-    .keys(views)
-    .filter((id) => views[id].fixed || views[id].active);
-
-  let filteredViews = filteredViewIds.map((id) => ({
-    ...views[id],
-    id
-  }));
-
-  return (state) => {
-    const { availability = 'unknown' } = state.nodeStatus.nodeKind || {};
-    const { views } = state.settings;
-    const { health } = state.nodeStatus;
-
-    const viewIds = Object
-      .keys(views)
-      .filter((id) => {
-        const view = views[id];
-
-        const isEnabled = view.fixed || view.active;
-        const isAllowed = !view.onlyPersonal || availability === 'personal';
-
-        return isEnabled && isAllowed;
-      });
-
-    if (isEqual(viewIds, filteredViewIds)) {
-      return { views: filteredViews, health };
-    }
-
-    filteredViewIds = viewIds;
-    filteredViews = viewIds.map((id) => ({
-      ...views[id],
-      id
-    }));
-
-    return { views: filteredViews, health };
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(TabBar);
diff --git a/js/src/views/Application/TabBar/tabBar.spec.js b/js/src/views/Application/TabBar/tabBar.spec.js
deleted file mode 100644
index f629bca1fa830a29d98187308144307ad27c367c..0000000000000000000000000000000000000000
--- a/js/src/views/Application/TabBar/tabBar.spec.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import TabBar from './';
-
-let component;
-let store;
-
-function createStore () {
-  store = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        settings: {
-          views: {
-            settings: { fixed: true }
-          }
-        },
-        nodeStatus: {
-          nodeKind: {
-            'availability': 'personal'
-          },
-          health: {
-            overall: {
-              status: 'ok',
-              message: []
-            }
-          }
-        }
-      };
-    }
-  };
-
-  return store;
-}
-
-function render (props = {}) {
-  component = shallow(
-    <TabBar { ...props } />,
-    {
-      context: { store: createStore() }
-    }
-  ).find('TabBar').shallow();
-
-  return component;
-}
-
-describe('views/Application/TabBar', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-});
diff --git a/js/src/views/Application/application.css b/js/src/views/Application/application.css
deleted file mode 100644
index dc1754bd1c9ad8d8f18eeeaacb328a4ca2e0eeb7..0000000000000000000000000000000000000000
--- a/js/src/views/Application/application.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  display: flex;
-  flex-direction: column;
-  min-height: 100vh;
-}
-
-.content {
-  padding-bottom: 1.25em;
-}
diff --git a/js/src/views/Application/application.js b/js/src/views/Application/application.js
deleted file mode 100644
index 73f0cdda811e7aae53d8d89c7bb75885f5f3e6cd..0000000000000000000000000000000000000000
--- a/js/src/views/Application/application.js
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-
-import UpgradeStore from '~/modals/UpgradeParity/store';
-
-import Connection from '../Connection';
-import ParityBar from '../ParityBar';
-import SyncWarning, { showSyncWarning } from '../SyncWarning';
-
-import Snackbar from './Snackbar';
-import Container from './Container';
-import DappContainer from './DappContainer';
-import Extension from './Extension';
-import FrameError from './FrameError';
-import Status from './Status';
-import Store from './store';
-import TabBar from './TabBar';
-import Requests from './Requests';
-
-import styles from './application.css';
-
-const inFrame = window.parent !== window && window.parent.frames.length !== 0;
-const doShowSyncWarning = showSyncWarning();
-
-@observer
-class Application extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired,
-    background: PropTypes.string
-  }
-
-  static propTypes = {
-    blockNumber: PropTypes.object,
-    children: PropTypes.node,
-    pending: PropTypes.array
-  }
-
-  store = new Store(this.context.api);
-  upgradeStore = UpgradeStore.get(this.context.api);
-
-  render () {
-    const [root] = (window.location.hash || '').replace('#/', '').split('/');
-    const isMinimized = root === 'app' || root === 'web';
-
-    if (process.env.NODE_ENV !== 'production' && root === 'playground') {
-      return (
-        <div>
-          { this.props.children }
-        </div>
-      );
-    }
-
-    if (inFrame) {
-      return (
-        <FrameError />
-      );
-    }
-
-    return (
-      <div>
-        {
-          isMinimized
-            ? this.renderMinimized()
-            : this.renderApp()
-        }
-        {
-          doShowSyncWarning
-          ? (<SyncWarning />)
-          : null
-        }
-        <Connection />
-        <Requests />
-        <ParityBar dapp={ isMinimized } />
-      </div>
-    );
-  }
-
-  renderApp () {
-    const { blockNumber, children, pending } = this.props;
-
-    return (
-      <Container
-        upgradeStore={ this.upgradeStore }
-        onCloseFirstRun={ this.store.closeFirstrun }
-        showFirstRun={ this.store.firstrunVisible }
-      >
-        <TabBar pending={ pending } />
-        <div className={ styles.content }>
-          { children }
-        </div>
-        {
-          blockNumber
-            ? <Status upgradeStore={ this.upgradeStore } />
-            : null
-        }
-        <Extension />
-        <Snackbar />
-      </Container>
-    );
-  }
-
-  renderMinimized () {
-    const { children } = this.props;
-
-    return (
-      <DappContainer>
-        { children }
-      </DappContainer>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { blockNumber } = state.nodeStatus;
-  const { hasAccounts } = state.personal;
-  const { pending } = state.signer;
-
-  return {
-    blockNumber,
-    hasAccounts,
-    pending
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(Application);
diff --git a/js/src/views/Application/index.js b/js/src/views/Application/index.js
deleted file mode 100644
index 3d8d1ca3b851e5bfed73373e82eff06b5d9ea46c..0000000000000000000000000000000000000000
--- a/js/src/views/Application/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './application';
diff --git a/js/src/views/Application/store.js b/js/src/views/Application/store.js
deleted file mode 100644
index 9008997b8aa680b68c76938f4d06bb6910be5c78..0000000000000000000000000000000000000000
--- a/js/src/views/Application/store.js
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-import store from 'store';
-
-const OLD_LS_FIRST_RUN_KEY = 'showFirstRun';
-const LS_FIRST_RUN_KEY = '_parity::showFirstRun';
-
-export default class Store {
-  @observable firstrunVisible = false;
-
-  constructor (api) {
-    // Migrate the old key to the new one
-    this._migrateStore();
-
-    this._api = api;
-
-    // Show the first run the storage doesn't hold `false` value
-    const firstrunVisible = store.get(LS_FIRST_RUN_KEY) !== false;
-
-    // Only check accounts if we might show the first run
-    if (firstrunVisible) {
-      api.transport.once('open', () => {
-        this._checkAccounts();
-      });
-    } else {
-      this.firstrunVisible = false;
-    }
-  }
-
-  @action closeFirstrun = () => {
-    this.toggleFirstrun(false);
-  }
-
-  @action toggleFirstrun = (visible = false) => {
-    this.firstrunVisible = visible;
-
-    // There's no need to write to storage that the
-    // First Run should be visible
-    if (!visible) {
-      store.set(LS_FIRST_RUN_KEY, !!visible);
-    }
-  }
-
-  /**
-   * Migrate the old LocalStorage key format
-   * to the new one
-   */
-  _migrateStore () {
-    const oldValue = store.get(OLD_LS_FIRST_RUN_KEY);
-    const newValue = store.get(LS_FIRST_RUN_KEY);
-
-    if (newValue === undefined && oldValue !== undefined) {
-      store.set(LS_FIRST_RUN_KEY, oldValue);
-      store.remove(OLD_LS_FIRST_RUN_KEY);
-    }
-  }
-
-  _checkAccounts () {
-    return Promise
-      .all([
-        this._api.parity.listVaults(),
-        this._api.parity.allAccountsInfo()
-      ])
-      .then(([ vaults, info ]) => {
-        const accounts = Object.keys(info)
-          .filter((address) => info[address].uuid)
-          // In DEV mode, the empty phrase account is already added
-          .filter((address) => address.toLowerCase() !== '0x00a329c0648769a73afac7f9381e08fb43dbea72');
-
-        // Has accounts if any vaults or accounts
-        const hasAccounts = (accounts && accounts.length > 0) || (vaults && vaults.length > 0);
-
-        // Show First Run if no accounts and no vaults
-        this.toggleFirstrun(!hasAccounts);
-      })
-      .catch((error) => {
-        console.error('checkAccounts', error);
-      });
-  }
-}
diff --git a/js/src/views/Connection/connection.css b/js/src/views/Connection/connection.css
deleted file mode 100644
index 0603e6c1de75c8a10d482309f5225a99423b752f..0000000000000000000000000000000000000000
--- a/js/src/views/Connection/connection.css
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation; either version 3 of the License; or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful;
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not; see <http://www.gnu.org/licenses/>.
-*/
-
-.overlay {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background: rgba(255, 255, 255, 0.75);
-  z-index: 20000
-}
-
-.modal {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 20001
-}
-
-.body {
-  margin: 0 auto;
-  padding: 2em 4em;
-  text-align: center;
-  max-width: 40em;
-  background: rgba(25, 25, 25, 0.75);
-  color: rgb(208, 208, 208);
-  box-shadow: rgba(0, 0, 0, 0.25) 0px 14px 45px, rgba(0, 0, 0, 0.22) 0px 10px 18px
-}
-
-.header {
-  fontSize: 1.25em
-}
-
-.info {
-  margin-top: 1em;
-  line-height: 1.618em
-}
-
-.form {
-  margin-top: 0.75em;
-  padding: 0 4em;
-  text-align: left;
-}
-
-.timestamp {
-  background: rgba(255, 255, 255, 0.1);
-  border: 1px solid rgba(255, 255, 255, 0.2);
-  margin: 0.75em 0;
-  padding: 1em;
-}
-
-.btnrow {
-  text-align: right;
-  padding: 0 4em;
-}
-
-.icons {
-}
-
-.icon,
-.iconSmall {
-  display: inline-block;
-  padding: 1em;
-  vertical-align: middle;
-}
-
-.iconName {
-}
-
-.icon .svg {
-  width: 6em !important;
-  height: 6em !important;
-}
-
-.iconSmall .svg {
-  width: 3em !important;
-  height: 3em !important;
-}
-
-.console {
-  font-family: 'Roboto Mono', monospace;
-  background: rgba(0, 0, 0, 0.25);
-  font-size: 16px;
-  padding: 0 0.25em;
-}
-
-@keyframes pulse {
-  0% {
-    fill: rgb(0, 200, 0);
-  }
-  50% {
-    fill: rgb(150, 200, 150);
-  }
-  100% {
-    fill: rgb(0, 200, 0);
-  }
-}
-
-.pulse {
-  fill: red;
-  animation-name: pulse;
-  animation-duration: 1.5s;
-  animation-iteration-count: infinite;
-}
diff --git a/js/src/views/Connection/connection.js b/js/src/views/Connection/connection.js
deleted file mode 100644
index 58c6ebaacd94470497fe059b5ba62717d05ced7d..0000000000000000000000000000000000000000
--- a/js/src/views/Connection/connection.js
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import { Input } from '~/ui';
-import { CompareIcon, ComputerIcon, DashboardIcon, VpnIcon } from '~/ui/Icons';
-
-import styles from './connection.css';
-
-class Connection extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    isConnected: PropTypes.bool,
-    isConnecting: PropTypes.bool,
-    needsToken: PropTypes.bool
-  }
-
-  state = {
-    loading: false,
-    token: '',
-    validToken: false
-  }
-
-  render () {
-    const { isConnecting, isConnected, needsToken } = this.props;
-
-    if (!isConnecting && isConnected) {
-      return null;
-    }
-
-    return (
-      <div>
-        <div className={ styles.overlay } />
-        <div className={ styles.modal }>
-          <div className={ styles.body }>
-            <div className={ styles.icons }>
-              <div className={ styles.icon }>
-                <ComputerIcon className={ styles.svg } />
-              </div>
-              <div className={ styles.iconSmall }>
-                <CompareIcon className={ `${styles.svg} ${styles.pulse}` } />
-              </div>
-              <div className={ styles.icon }>
-                {
-                  needsToken
-                    ? <VpnIcon className={ styles.svg } />
-                    : <DashboardIcon className={ styles.svg } />
-                }
-              </div>
-            </div>
-            {
-              needsToken
-                ? this.renderSigner()
-                : this.renderPing()
-            }
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderSigner () {
-    const { loading, token, validToken } = this.state;
-    const { isConnecting, needsToken } = this.props;
-
-    if (needsToken && !isConnecting) {
-      return (
-        <div className={ styles.info }>
-          <div>
-            <FormattedMessage
-              id='connection.noConnection'
-              defaultMessage='Unable to make a connection to the Parity Secure API. To update your secure token or to generate a new one, run {newToken} and paste the generated token into the space below.'
-              values={ {
-                newToken: <span className={ styles.console }>parity signer new-token</span>
-              } }
-            />
-          </div>
-          <div className={ styles.timestamp }>
-            <FormattedMessage
-              id='connection.timestamp'
-              defaultMessage='Ensure that both the Parity node and this machine connecting have computer clocks in-sync with each other and with a timestamp server, ensuring both successful token validation and block operations.'
-            />
-          </div>
-          <div className={ styles.form }>
-            <Input
-              autoFocus
-              disabled={ loading }
-              error={
-                validToken || (!token || !token.length)
-                  ? null
-                  : (
-                    <FormattedMessage
-                      id='connection.invalidToken'
-                      defaultMessage='invalid signer token'
-                    />
-                  )
-              }
-              hint={
-                <FormattedMessage
-                  id='connection.token.hint'
-                  defaultMessage='a generated token from Parity'
-                />
-              }
-              label={
-                <FormattedMessage
-                  id='connection.token.label'
-                  defaultMessage='secure token'
-                />
-              }
-              onChange={ this.onChangeToken }
-              value={ token }
-            />
-          </div>
-        </div>
-      );
-    }
-
-    return (
-      <div className={ styles.info }>
-        <FormattedMessage
-          id='connection.connectingAPI'
-          defaultMessage='Connecting to the Parity Secure API.'
-        />
-      </div>
-    );
-  }
-
-  renderPing () {
-    return (
-      <div className={ styles.info }>
-        <FormattedMessage
-          id='connection.connectingNode'
-          defaultMessage='Connecting to the Parity Node. If this informational message persists, please ensure that your Parity node is running and reachable on the network.'
-        />
-      </div>
-    );
-  }
-
-  validateToken = (_token) => {
-    const token = _token.trim();
-    const validToken = /^[a-zA-Z0-9]{4}(-)?[a-zA-Z0-9]{4}(-)?[a-zA-Z0-9]{4}(-)?[a-zA-Z0-9]{4}$/.test(token);
-
-    return {
-      token,
-      validToken
-    };
-  }
-
-  onChangeToken = (event, _token) => {
-    const { token, validToken } = this.validateToken(_token || event.target.value);
-
-    this.setState({ token, validToken }, () => {
-      validToken && this.setToken();
-    });
-  }
-
-  setToken = () => {
-    const { api } = this.context;
-    const { token } = this.state;
-
-    this.setState({ loading: true });
-
-    return api
-      .updateToken(token, 0)
-      .then((isValid) => {
-        this.setState({
-          loading: isValid || false,
-          validToken: isValid
-        });
-      });
-  }
-}
-
-function mapStateToProps (state) {
-  const { isConnected, isConnecting, needsToken } = state.nodeStatus;
-
-  return {
-    isConnected,
-    isConnecting,
-    needsToken
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(Connection);
diff --git a/js/src/views/Connection/connection.spec.js b/js/src/views/Connection/connection.spec.js
deleted file mode 100644
index cdf8f2b8dfdc07e380e1386e942d1c35581fd6ba..0000000000000000000000000000000000000000
--- a/js/src/views/Connection/connection.spec.js
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import Connection from './';
-
-let api;
-let component;
-let instance;
-
-function createApi () {
-  return {
-    updateToken: sinon.stub().resolves()
-  };
-}
-
-function createRedux (isConnected = true, isConnecting = false, needsToken = false) {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        nodeStatus: {
-          isConnected,
-          isConnecting,
-          needsToken
-        }
-      };
-    }
-  };
-}
-
-function render (store) {
-  api = createApi();
-  component = shallow(
-    <Connection />,
-    { context: { store: store || createRedux() } }
-  ).find('Connection').shallow({ context: { api } });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Connection', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  it('does not render when connected', () => {
-    expect(render(createRedux(true)).find('div')).to.have.length(0);
-  });
-
-  describe('renderPing', () => {
-    it('renders the connecting to node message', () => {
-      render();
-      const ping = shallow(instance.renderPing());
-
-      expect(ping.find('FormattedMessage').props().id).to.equal('connection.connectingNode');
-    });
-  });
-
-  describe('renderSigner', () => {
-    it('renders the connecting to api message when isConnecting === true', () => {
-      render(createRedux(false, true));
-      const signer = shallow(instance.renderSigner());
-
-      expect(signer.find('FormattedMessage').props().id).to.equal('connection.connectingAPI');
-    });
-
-    it('renders token input when needsToken == true & isConnecting === false', () => {
-      render(createRedux(false, false, true));
-      const signer = shallow(instance.renderSigner());
-
-      expect(signer.find('FormattedMessage').first().props().id).to.equal('connection.noConnection');
-    });
-  });
-
-  describe('validateToken', () => {
-    beforeEach(() => {
-      render();
-    });
-
-    it('trims whitespace from passed tokens', () => {
-      expect(instance.validateToken(' \t test ing\t  ').token).to.equal('test ing');
-    });
-
-    it('validates 4-4-4-4 format', () => {
-      expect(instance.validateToken('1234-5678-90ab-cdef').validToken).to.be.true;
-    });
-
-    it('validates 4-4-4-4 format (with trimmable whitespace)', () => {
-      expect(instance.validateToken(' \t 1234-5678-90ab-cdef \t ').validToken).to.be.true;
-    });
-
-    it('validates 4444 format', () => {
-      expect(instance.validateToken('1234567890abcdef').validToken).to.be.true;
-    });
-
-    it('validates 4444 format (with trimmable whitespace)', () => {
-      expect(instance.validateToken(' \t 1234567890abcdef \t ').validToken).to.be.true;
-    });
-  });
-
-  describe('onChangeToken', () => {
-    beforeEach(() => {
-      render();
-      sinon.spy(instance, 'setToken');
-      sinon.spy(instance, 'validateToken');
-    });
-
-    afterEach(() => {
-      instance.setToken.restore();
-      instance.validateToken.restore();
-    });
-
-    it('validates tokens passed', () => {
-      instance.onChangeToken({ target: { value: 'testing' } });
-      expect(instance.validateToken).to.have.been.calledWith('testing');
-    });
-
-    it('sets the token on the api when valid', () => {
-      instance.onChangeToken({ target: { value: '1234-5678-90ab-cdef' } });
-      expect(instance.setToken).to.have.been.called;
-    });
-  });
-
-  describe('setToken', () => {
-    beforeEach(() => {
-      render();
-    });
-
-    it('calls the api.updateToken', () => {
-      component.setState({ token: 'testing' });
-
-      return instance.setToken().then(() => {
-        expect(api.updateToken).to.have.been.calledWith('testing');
-      });
-    });
-  });
-});
diff --git a/js/src/views/Connection/index.js b/js/src/views/Connection/index.js
deleted file mode 100644
index 7a75a0d8d4675e29c15a8f8ccf845c133e67009d..0000000000000000000000000000000000000000
--- a/js/src/views/Connection/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './connection';
diff --git a/js/src/views/Contract/Events/Event/event.js b/js/src/views/Contract/Events/Event/event.js
deleted file mode 100644
index fc2436f8ea36e0622be947d1289e3c0a3b8f2d50..0000000000000000000000000000000000000000
--- a/js/src/views/Contract/Events/Event/event.js
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { IdentityIcon, IdentityName, TypedInput } from '~/ui';
-import ShortenedHash from '~/ui/ShortenedHash';
-import { txLink } from '~/3rdparty/etherscan/links';
-
-import styles from '../../contract.css';
-
-export default class Event extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    event: PropTypes.object.isRequired,
-    netVersion: PropTypes.string.isRequired
-  }
-
-  state = {
-    transaction: {}
-  }
-
-  componentDidMount () {
-    this.retrieveTransaction();
-  }
-
-  render () {
-    const { event, netVersion } = this.props;
-    const { block, transaction } = this.state;
-
-    const classes = `${styles.event} ${styles[event.state]}`;
-    const url = txLink(event.transactionHash, false, netVersion);
-    const keys = Object.keys(event.params).join(', ');
-    const values = Object.keys(event.params).map((name, index) => {
-      const param = event.params[name];
-
-      return (
-        <div className={ styles.eventValue } key={ `${event.key}_val_${index}` }>
-          { this.renderParam(name, param) }
-        </div>
-      );
-    });
-
-    return (
-      <tr className={ classes }>
-        <td className={ styles.timestamp }>
-          <div>{
-            event.state === 'pending'
-              ? (
-                <FormattedMessage
-                  id='contract.events.eventPending'
-                  defaultMessage='pending'
-                />
-              )
-              : this.formatBlockTimestamp(block)
-          }</div>
-          <div>{ this.formatNumber(transaction.blockNumber) }</div>
-        </td>
-        <td className={ styles.txhash }>
-          { this.renderAddressName(transaction.from) }
-        </td>
-        <td className={ styles.txhash }>
-          <div className={ styles.eventType }>
-            { event.type }({ keys })
-          </div>
-          <a href={ url } target='_blank'><ShortenedHash data={ event.transactionHash } /></a>
-        </td>
-        <td className={ styles.eventDetails }>
-          <div className={ styles.eventParams }>
-            { values }
-          </div>
-        </td>
-      </tr>
-    );
-  }
-
-  renderAddressName (address, withName = true) {
-    return (
-      <span className={ styles.eventAddress }>
-        <IdentityIcon
-          address={ address }
-          className={ styles.eventIdentityicon }
-          center
-          inline
-        />
-        {
-          withName
-            ? <IdentityName address={ address } />
-            : address
-        }
-      </span>
-    );
-  }
-
-  renderParam (name, param) {
-    // Don't add a label id the name is an index key (ie. a Number)
-    const label = parseInt(name).toString() === name.toString()
-      ? undefined
-      : name;
-
-    return (
-      <TypedInput
-        allowCopy
-        className={ styles.input }
-        label={ label }
-        param={ param.type }
-        readOnly
-        value={ param.value }
-      />
-    );
-  }
-
-  formatBlockTimestamp (block) {
-    if (!block) {
-      return null;
-    }
-
-    return moment(block.timestamp).fromNow();
-  }
-
-  formatNumber (number) {
-    if (!number) {
-      return null;
-    }
-
-    return new BigNumber(number).toFormat();
-  }
-
-  retrieveTransaction () {
-    const { api } = this.context;
-    const { event } = this.props;
-
-    Promise
-      .all([
-        api.parity.getBlockHeaderByNumber(event.blockNumber),
-        api.eth.getTransactionByHash(event.transactionHash)
-      ])
-      .then(([block, transaction]) => {
-        this.setState({ block, transaction });
-      })
-      .catch((error) => {
-        console.warn('retrieveTransaction', error);
-      });
-  }
-}
diff --git a/js/src/views/Contract/Events/Event/index.js b/js/src/views/Contract/Events/Event/index.js
deleted file mode 100644
index 25441954b4837428bc895fc61c48f5f81cd24e58..0000000000000000000000000000000000000000
--- a/js/src/views/Contract/Events/Event/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './event';
diff --git a/js/src/views/Contract/Events/events.js b/js/src/views/Contract/Events/events.js
deleted file mode 100644
index a15565757b79a881ccb9ff4f6b67c938d59aada7..0000000000000000000000000000000000000000
--- a/js/src/views/Contract/Events/events.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { uniq } from 'lodash';
-
-import { Container, Loading } from '~/ui';
-
-import Event from './Event';
-import styles from '../contract.css';
-
-const TITLE = (
-  <FormattedMessage
-    id='contract.events.title'
-    defaultMessage='events'
-  />
-);
-
-export default class Events extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  };
-
-  static propTypes = {
-    isLoading: PropTypes.bool,
-    events: PropTypes.array,
-    netVersion: PropTypes.string.isRequired
-  };
-
-  static defaultProps = {
-    isLoading: false,
-    events: []
-  };
-
-  shouldComponentUpdate (nextProps) {
-    return (nextProps.events !== this.props.events) ||
-      (nextProps.netVersion !== this.props.netVersion) ||
-      (nextProps.isLoading !== this.props.isLoading);
-  }
-
-  render () {
-    const { events, isLoading, netVersion } = this.props;
-
-    if (isLoading) {
-      return (
-        <Container title={ TITLE }>
-          <div>
-            <Loading size={ 2 } />
-          </div>
-        </Container>
-      );
-    }
-
-    if (!events || !events.length) {
-      return (
-        <Container title={ TITLE }>
-          <p>
-            <FormattedMessage
-              id='contract.events.noEvents'
-              defaultMessage='No events has been sent from this contract.'
-            />
-          </p>
-        </Container>
-      );
-    }
-
-    const eventsKey = uniq(events.map((e) => e.key));
-    const list = eventsKey.map((eventKey) => {
-      const event = events.find((e) => e.key === eventKey);
-
-      return (
-        <Event
-          key={ event.key }
-          event={ event }
-          netVersion={ netVersion }
-        />
-      );
-    });
-
-    return (
-      <Container title={ TITLE }>
-        <table className={ styles.events }>
-          <thead>
-            <tr>
-              <th />
-              <th className={ styles.origin }>
-                origin
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            { list }
-          </tbody>
-        </table>
-      </Container>
-    );
-  }
-}
diff --git a/js/src/views/Contract/Events/index.js b/js/src/views/Contract/Events/index.js
deleted file mode 100644
index d2d0080b3542ce7eef9405c4c01348a1181898e7..0000000000000000000000000000000000000000
--- a/js/src/views/Contract/Events/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './events';
diff --git a/js/src/views/Contract/Queries/index.js b/js/src/views/Contract/Queries/index.js
deleted file mode 100644
index 3355a73361cfe075ffc4ef470a842e99bcf617c9..0000000000000000000000000000000000000000
--- a/js/src/views/Contract/Queries/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './queries';
diff --git a/js/src/views/Contract/Queries/inputQuery.js b/js/src/views/Contract/Queries/inputQuery.js
deleted file mode 100644
index 7a75727f6e54ffc92f25405314e0e6c647b8df43..0000000000000000000000000000000000000000
--- a/js/src/views/Contract/Queries/inputQuery.js
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isEqual } from 'lodash';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import LinearProgress from 'material-ui/LinearProgress';
-import { Card, CardActions, CardTitle, CardText } from 'material-ui/Card';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { newError } from '~/redux/actions';
-import { Button, TypedInput } from '~/ui';
-import { arrayOrObjectProptype } from '~/util/proptypes';
-import { parseAbiType } from '~/util/abi';
-
-import styles from './queries.css';
-
-class InputQuery extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  };
-
-  static propTypes = {
-    accountsInfo: PropTypes.object.isRequired,
-    contract: PropTypes.object.isRequired,
-    inputs: arrayOrObjectProptype().isRequired,
-    outputs: arrayOrObjectProptype().isRequired,
-    name: PropTypes.string.isRequired,
-    newError: PropTypes.func.isRequired,
-    signature: PropTypes.string.isRequired,
-    className: PropTypes.string
-  };
-
-  state = {
-    inputs: [],
-    isValid: true,
-    results: [],
-    values: {}
-  };
-
-  componentWillMount () {
-    this.parseInputs();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const prevInputTypes = this.props.inputs.map((input) => input.type);
-    const nextInputTypes = nextProps.inputs.map((input) => input.type);
-
-    if (!isEqual(prevInputTypes, nextInputTypes)) {
-      this.parseInputs(nextProps);
-    }
-  }
-
-  parseInputs (props = this.props) {
-    const inputs = props.inputs.map((input) => ({ ...input, parsed: parseAbiType(input.type) }));
-    const values = inputs.reduce((values, input, index) => {
-      values[index] = input.parsed.default;
-      return values;
-    }, {});
-
-    this.setState({ inputs, values });
-  }
-
-  render () {
-    const { name, className } = this.props;
-
-    return (
-      <Card className={ className }>
-        <CardTitle
-          className={ styles.methodTitle }
-          title={ name }
-        />
-        { this.renderContent() }
-      </Card>
-    );
-  }
-
-  renderContent () {
-    const { inputs } = this.state;
-
-    const { isValid } = this.state;
-    const inputsFields = inputs
-      .map((input, index) => this.renderInput(input, index));
-
-    return (
-      <div>
-        <CardText className={ styles.methodContent }>
-          <div className={ styles.methodResults }>
-            { this.renderResults() }
-          </div>
-          { inputsFields }
-        </CardText>
-        <CardActions>
-          <Button
-            label={
-              <FormattedMessage
-                id='contract.queries.buttons.query'
-                defaultMessage='Query'
-              />
-            }
-            disabled={ !isValid }
-            onClick={ this.onClick }
-          />
-        </CardActions>
-      </div>
-    );
-  }
-
-  renderResults () {
-    const { results, isLoading } = this.state;
-    const { accountsInfo, outputs } = this.props;
-
-    if (isLoading) {
-      return (
-        <LinearProgress mode='indeterminate' />
-      );
-    }
-
-    if (!results || results.length < 1) {
-      return null;
-    }
-
-    return outputs
-      .map((out, index) => ({
-        name: out.name,
-        type: out.type,
-        value: results[index]
-      }))
-      .map((out, index) => {
-        const input = (
-          <TypedInput
-            accounts={ accountsInfo }
-            allowCopy
-            isEth={ false }
-            param={ out.type }
-            readOnly
-            value={ out.value }
-          />
-        );
-
-        return (
-          <div key={ `${out.name}_${out.type}_${index}` }>
-            <div className={ styles.queryResultName }>
-              { out.name }
-            </div>
-            { input }
-          </div>
-        );
-      });
-  }
-
-  renderInput (input, index) {
-    const { values } = this.state;
-    const { name, type } = input;
-    const label = `${name ? `${name}: ` : ''}${type}`;
-
-    const onChange = (value) => {
-      const { values } = this.state;
-
-      this.setState({
-        values: {
-          ...values,
-          [ index ]: value
-        }
-      });
-    };
-
-    return (
-      <div key={ `${name}_${type}_${index}` }>
-        <TypedInput
-          hint={ type }
-          label={ label }
-          isEth={ false }
-          onChange={ onChange }
-          param={ type }
-          value={ values[index] }
-        />
-      </div>
-    );
-  }
-
-  onClick = () => {
-    const { inputs, values } = this.state;
-    const { contract, name, outputs, signature } = this.props;
-
-    this.setState({
-      isLoading: true,
-      results: []
-    });
-
-    const inputValues = inputs.map((input, index) => values[index]);
-
-    contract
-      .instance[signature]
-      .call({ rawTokens: true }, inputValues)
-      .then(results => {
-        if (outputs.length === 1) {
-          results = [ results ];
-        }
-
-        this.setState({
-          isLoading: false,
-          results
-        });
-      })
-      .catch((error) => {
-        console.error(`sending ${name} with params`, inputValues, error.message);
-
-        this.props.newError(error);
-        this.setState({
-          isLoading: false
-        });
-      });
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError
-  }, dispatch);
-}
-
-export default connect(
-  null,
-  mapDispatchToProps
-)(InputQuery);
diff --git a/js/src/views/Contract/Queries/queries.css b/js/src/views/Contract/Queries/queries.css
deleted file mode 100644
index 430b95601ee8e46fdb5763a3f4f8359589726c4b..0000000000000000000000000000000000000000
--- a/js/src/views/Contract/Queries/queries.css
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.vMethods, .hMethods, .methods {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.container {
-  align-items: flex-start;
-  display: border-box;
-}
-
-.container .method {
-  background-color: rgba(255, 255, 255, 0.05) !important;
-  margin: 0.5em;
-}
-
-.vMethods {
-  flex-direction: column;
-  width: 33.3333%;
-}
-
-.hMethods {
-  flex: 1;
-  flex-direction: row;
-  width: 66.6666%;
-}
-
-.hMethods .container {
-  width: 50%;
-}
-
-.methodTitle {
-  padding-bottom: 8px !important;
-  padding-top: 8px !important;
-}
-
-.methodContent {
-  padding-top: 0 !important;
-  padding-bottom: 8px !important;
-}
-
-.methodResults {
-}
-
-.methodResults > div {
-  padding: 0.25rem 0.5rem;
-  box-sizing: border-box;
-
-  & > div {
-    width: 100%;
-  }
-}
-
-.queryValue {
-  width: 100%;
-}
-
-.queryValue, .queryValue * {
-  white-space: normal !important;
-  overflow-wrap: break-word !important;
-  max-width: 100%;
-  box-sizing: border-box;
-}
diff --git a/js/src/views/Contract/Queries/queries.js b/js/src/views/Contract/Queries/queries.js
deleted file mode 100644
index eef428eed1510a428057e2fdba3cfd43b45985f0..0000000000000000000000000000000000000000
--- a/js/src/views/Contract/Queries/queries.js
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { Card, CardTitle, CardText } from 'material-ui/Card';
-
-import InputQuery from './inputQuery';
-import { Container, TypedInput } from '~/ui';
-
-import styles from './queries.css';
-
-export default class Queries extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  }
-
-  static propTypes = {
-    accountsInfo: PropTypes.object.isRequired,
-    contract: PropTypes.object,
-    values: PropTypes.object
-  }
-
-  render () {
-    const { contract } = this.props;
-
-    if (!contract) {
-      return null;
-    }
-    const queries = contract.functions
-      .filter((fn) => fn.constant)
-      .sort(this._sortEntries);
-
-    const noInputQueries = queries
-      .slice()
-      .filter((fn) => fn.inputs.length === 0)
-      .map((fn) => this.renderQuery(fn));
-
-    const withInputQueries = queries
-      .slice()
-      .filter((fn) => fn.inputs.length > 0)
-      .map((fn) => this.renderInputQuery(fn));
-
-    if (queries.length + noInputQueries.length + withInputQueries.length === 0) {
-      return null;
-    }
-
-    return (
-      <Container
-        title={
-          <FormattedMessage
-            id='contract.queries.title'
-            defaultMessage='queries'
-          />
-        }
-      >
-        <div className={ styles.methods }>
-          {
-            noInputQueries.length > 0
-            ? (
-              <div className={ styles.vMethods }>
-                { noInputQueries }
-              </div>
-            )
-            : null
-          }
-
-          {
-            withInputQueries.length > 0
-            ? (
-              <div className={ styles.hMethods }>
-                { withInputQueries }
-              </div>
-            )
-            : null
-          }
-        </div>
-      </Container>
-    );
-  }
-
-  renderInputQuery (fn) {
-    const { abi, name, signature } = fn;
-    const { accountsInfo, contract } = this.props;
-
-    return (
-      <div className={ styles.container } key={ fn.signature }>
-        <InputQuery
-          accountsInfo={ accountsInfo }
-          className={ styles.method }
-          inputs={ abi.inputs }
-          outputs={ abi.outputs }
-          name={ name }
-          signature={ signature }
-          contract={ contract }
-        />
-      </div>
-    );
-  }
-
-  renderQuery (fn) {
-    const { abi } = fn;
-    let values = this.props.values[fn.name] || [];
-
-    if (values && typeof values.slice === 'function') {
-      values = values.slice();
-    }
-
-    return (
-      <div className={ styles.container } key={ fn.signature }>
-        <Card className={ styles.method }>
-          <CardTitle
-            className={ styles.methodTitle }
-            title={ fn.name }
-          />
-          <CardText
-            className={ styles.methodContent }
-          >
-            {
-              abi.outputs
-                .map((output, index) => this.renderValue(values[index], output, index))
-            }
-          </CardText>
-        </Card>
-      </div>
-    );
-  }
-
-  renderValue (value, output, key) {
-    if (typeof value === 'undefined') {
-      return null;
-    }
-
-    const { accountsInfo } = this.props;
-    const { name, type } = output;
-    const label = `${name ? `${name}: ` : ''}${type}`;
-
-    return (
-      <TypedInput
-        accounts={ accountsInfo }
-        allowCopy
-        key={ key }
-        isEth={ false }
-        label={ label }
-        param={ output.type }
-        readOnly
-        value={ value }
-      />
-    );
-  }
-
-  _sortEntries (a, b) {
-    return a.name.localeCompare(b.name);
-  }
-}
diff --git a/js/src/views/Contract/contract.css b/js/src/views/Contract/contract.css
deleted file mode 100644
index 7cc706b8b2da118805ccf360e683a2f5d3072d10..0000000000000000000000000000000000000000
--- a/js/src/views/Contract/contract.css
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.events {
-  width: 100%;
-  border: none;
-  border-spacing: 0;
-
-  tr {
-    line-height: 32px;
-    vertical-align: top;
-  }
-}
-
-.event {
-  td {
-    vertical-align: top;
-    padding: 0 0.5em 1.5em;
-
-    div {
-      white-space: nowrap;
-    }
-
-    &.timestamp {
-      padding-right: 1.5em;
-      text-align: right;
-      line-height: 1.5em;
-      opacity: 0.5;
-      white-space: nowrap;
-    }
-  }
-}
-
-.blockNumber {
-  color: rgba(255, 255, 255, 0.25);
-  margin-top: 1.5em;
-}
-
-.origin {
-  text-align: left;
-  padding-left: 32px;
-  text-indent: 1em;
-  color: rgba(255, 255, 255, 0.5);
-  text-transform: uppercase;
-  font-size: 0.9em;
-}
-
-.txhash {
-  text-overflow: ellipsis;
-  width: 20%;
-}
-
-.key {
-  text-align: right;
-  color: #aaa;
-}
-
-.mined {
-}
-
-.pending {
-  opacity: 0.5;
-}
-
-.eventDetails {
-}
-
-.eventType {
-}
-
-.eventParams {
-  padding-left: 2em;
-}
-
-.eventValue {
-  margin-top: -16px;
-}
-
-.eventAddress {
-  display: inline-block;
-  position: relative;
-  white-space: nowrap;
-}
-
-.eventIdentityicon {
-  margin-bottom: -10px;
-  margin-right: 0.5em;
-}
-
-.details {
-  margin-top: -1.5em;
-
-  h4 {
-    text-transform: uppercase;
-    margin: 1.5em 0 1em;
-  }
-}
diff --git a/js/src/views/Contract/contract.js b/js/src/views/Contract/contract.js
deleted file mode 100644
index b362d0d0d1a19e2491c01e669aa495c28a8f86a8..0000000000000000000000000000000000000000
--- a/js/src/views/Contract/contract.js
+++ /dev/null
@@ -1,554 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import BigNumber from 'bignumber.js';
-
-import { EditMeta, ExecuteContract } from '~/modals';
-import { newError } from '~/redux/actions';
-import { setVisibleAccounts } from '~/redux/providers/personalActions';
-import { Actionbar, Button, Page, Portal } from '~/ui';
-import { CancelIcon, DeleteIcon, EditIcon, PlayIcon, VisibleIcon } from '~/ui/Icons';
-import Editor from '~/ui/Editor';
-import { getSender, loadSender } from '~/util/tx';
-
-import Header from '../Account/Header';
-import Delete from '../Address/Delete';
-
-import Events from './Events';
-import Queries from './Queries';
-
-import styles from './contract.css';
-
-class Contract extends Component {
-  static contextTypes = {
-    api: React.PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    setVisibleAccounts: PropTypes.func.isRequired,
-
-    accounts: PropTypes.object,
-    accountsInfo: PropTypes.object,
-    contracts: PropTypes.object,
-    netVersion: PropTypes.string.isRequired,
-    params: PropTypes.object
-  };
-
-  state = {
-    contract: null,
-    fromAddress: getSender(),
-    showDeleteDialog: false,
-    showEditDialog: false,
-    showExecuteDialog: false,
-    showDetailsDialog: false,
-    subscriptionId: -1,
-    blockSubscriptionId: -1,
-    allEvents: [],
-    minedEvents: [],
-    pendingEvents: [],
-    queryValues: {},
-    loadingEvents: true
-  };
-
-  componentDidMount () {
-    const { api } = this.context;
-
-    this.attachContract(this.props);
-    this.setBaseAccount(this.props);
-    this.setVisibleAccounts();
-
-    api
-      .subscribe('eth_blockNumber', this.queryContract)
-      .then(blockSubscriptionId => this.setState({ blockSubscriptionId }));
-
-    loadSender(api)
-      .then((defaultAccount) => {
-        if (defaultAccount !== this.state.fromAddress) {
-          this.onFromAddressChange(null, defaultAccount);
-        }
-      });
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const { accounts, contracts } = nextProps;
-
-    if (Object.keys(contracts).length !== Object.keys(this.props.contracts).length) {
-      this.attachContract(nextProps);
-    }
-
-    if (Object.keys(accounts).length !== Object.keys(this.props.accounts).length) {
-      this.setBaseAccount(nextProps);
-    }
-
-    const prevAddress = this.props.params.address;
-    const nextAddress = nextProps.params.address;
-
-    if (prevAddress !== nextAddress) {
-      this.setVisibleAccounts(nextProps);
-    }
-  }
-
-  componentWillUnmount () {
-    const { api } = this.context;
-    const { subscriptionId, blockSubscriptionId, contract } = this.state;
-
-    if (blockSubscriptionId >= 0) {
-      api.unsubscribe(blockSubscriptionId);
-    }
-
-    if (subscriptionId >= 0) {
-      contract.unsubscribe(subscriptionId);
-    }
-
-    this.props.setVisibleAccounts([]);
-  }
-
-  setVisibleAccounts (props = this.props) {
-    const { params, setVisibleAccounts } = props;
-    const addresses = [ params.address ];
-
-    setVisibleAccounts(addresses);
-  }
-
-  render () {
-    const { accountsInfo, contracts, netVersion, params } = this.props;
-    const { allEvents, contract, queryValues, loadingEvents } = this.state;
-    const account = contracts[params.address];
-
-    if (!account) {
-      return null;
-    }
-
-    return (
-      <div>
-        { this.renderActionbar(account) }
-        { this.renderDeleteDialog(account) }
-        { this.renderEditDialog(account) }
-        { this.renderExecuteDialog() }
-        <Page padded>
-          <Header
-            account={ account }
-            isContract
-          >
-            { this.renderBlockNumber(account.meta) }
-          </Header>
-          <Queries
-            accountsInfo={ accountsInfo }
-            contract={ contract }
-            values={ queryValues }
-          />
-          <Events
-            isLoading={ loadingEvents }
-            events={ allEvents }
-            netVersion={ netVersion }
-          />
-          { this.renderDetails(account) }
-        </Page>
-      </div>
-    );
-  }
-
-  renderBlockNumber (meta = {}) {
-    const { blockNumber } = meta;
-
-    if (!blockNumber) {
-      return null;
-    }
-
-    const formattedBlockNumber = (new BigNumber(blockNumber)).toFormat();
-
-    return (
-      <div className={ styles.blockNumber }>
-        <FormattedMessage
-          id='contract.minedBlock'
-          defaultMessage='Mined at block #{blockNumber}'
-          values={ {
-            blockNumber: formattedBlockNumber
-          } }
-        />
-      </div>
-    );
-  }
-
-  renderDetails (contract) {
-    const { showDetailsDialog } = this.state;
-
-    if (!showDetailsDialog) {
-      return null;
-    }
-
-    const cancelBtn = (
-      <Button
-        icon={ <CancelIcon /> }
-        label={
-          <FormattedMessage
-            id='contract.buttons.close'
-            defaultMessage='Close'
-          />
-        }
-        onClick={ this.closeDetailsDialog }
-      />
-    );
-
-    return (
-      <Portal
-        buttons={ [ cancelBtn ] }
-        onClose={ this.closeDetailsDialog }
-        open
-        title={
-          <FormattedMessage
-            id='contract.details.title'
-            defaultMessage='contract details'
-          />
-        }
-      >
-        <div className={ styles.details }>
-          { this.renderSource(contract) }
-
-          <div>
-            <h4>Contract ABI</h4>
-            <Editor
-              value={ JSON.stringify(contract.meta.abi, null, 2) }
-              mode='json'
-              maxLines={ 20 }
-              readOnly
-            />
-          </div>
-        </div>
-      </Portal>
-    );
-  }
-
-  renderSource (contract) {
-    const { source } = contract.meta;
-
-    if (!source) {
-      return null;
-    }
-
-    return (
-      <div>
-        <h4>Contract source code</h4>
-        <Editor
-          value={ source }
-          readOnly
-        />
-      </div>
-    );
-  }
-
-  renderActionbar (account) {
-    const buttons = [
-      <Button
-        key='execute'
-        icon={ <PlayIcon /> }
-        label={
-          <FormattedMessage
-            id='contract.buttons.execute'
-            defaultMessage='execute'
-          />
-        }
-        onClick={ this.showExecuteDialog }
-      />,
-      <Button
-        key='editmeta'
-        icon={ <EditIcon /> }
-        label={
-          <FormattedMessage
-            id='contract.buttons.edit'
-            defaultMessage='edit'
-          />
-        }
-        onClick={ this.showEditDialog }
-      />,
-      <Button
-        key='delete'
-        icon={ <DeleteIcon /> }
-        label={
-          <FormattedMessage
-            id='contract.buttons.forget'
-            defaultMessage='forget'
-          />
-        }
-        onClick={ this.showDeleteDialog }
-      />,
-      <Button
-        key='viewDetails'
-        icon={ <VisibleIcon /> }
-        label={
-          <FormattedMessage
-            id='contract.buttons.details'
-            defaultMessage='details'
-          />
-        }
-        onClick={ this.showDetailsDialog }
-      />
-    ];
-
-    return (
-      <Actionbar
-        title={
-          <FormattedMessage
-            id='contract.title'
-            defaultMessage='Contract Information'
-          />
-        }
-        buttons={ !account ? [] : buttons }
-      />
-    );
-  }
-
-  renderDeleteDialog (account) {
-    const { showDeleteDialog } = this.state;
-
-    return (
-      <Delete
-        account={ account }
-        visible={ showDeleteDialog }
-        route='/contracts'
-        onClose={ this.closeDeleteDialog }
-      />
-    );
-  }
-
-  renderEditDialog (account) {
-    const { showEditDialog } = this.state;
-
-    if (!showEditDialog) {
-      return null;
-    }
-
-    return (
-      <EditMeta
-        account={ account }
-        onClose={ this.closeEditDialog }
-      />
-    );
-  }
-
-  renderExecuteDialog () {
-    const { contract, fromAddress, showExecuteDialog } = this.state;
-    const { accounts } = this.props;
-
-    if (!showExecuteDialog) {
-      return null;
-    }
-
-    return (
-      <ExecuteContract
-        accounts={ accounts }
-        contract={ contract }
-        fromAddress={ fromAddress }
-        onClose={ this.closeExecuteDialog }
-        onFromAddressChange={ this.onFromAddressChange }
-      />
-    );
-  }
-
-  queryContract = () => {
-    const { contract } = this.state;
-
-    if (!contract) {
-      return;
-    }
-
-    const queries = contract.functions
-      .filter((fn) => fn.constant)
-      .filter((fn) => !fn.inputs.length);
-
-    Promise
-      .all(queries.map((query) => query.call({ rawTokens: true })))
-      .then(results => {
-        const values = queries.reduce((object, fn, idx) => {
-          const key = fn.name;
-
-          object[key] = fn.outputs.length === 1
-            ? [ results[idx] ]
-            : results[idx];
-
-          return object;
-        }, {});
-
-        this.setState({ queryValues: values });
-      })
-      .catch((error) => {
-        console.error('queryContract', error);
-      });
-  }
-
-  closeEditDialog = () => {
-    this.setState({ showEditDialog: false });
-  }
-
-  showEditDialog = () => {
-    this.setState({ showEditDialog: true });
-  }
-
-  closeDeleteDialog = () => {
-    this.setState({ showDeleteDialog: false });
-  }
-
-  showDeleteDialog = () => {
-    this.setState({ showDeleteDialog: true });
-  }
-
-  showDetailsDialog = () => {
-    this.setState({ showDetailsDialog: true });
-  }
-
-  closeDetailsDialog = () => {
-    this.setState({ showDetailsDialog: false });
-  }
-
-  closeExecuteDialog = () => {
-    this.setState({ showExecuteDialog: false });
-  }
-
-  showExecuteDialog = () => {
-    this.setState({ showExecuteDialog: true });
-  }
-
-  _sortEvents = (a, b) => {
-    return b.blockNumber.cmp(a.blockNumber) || b.logIndex.cmp(a.logIndex);
-  }
-
-  _logToEvent = (log) => {
-    const { api } = this.context;
-    const key = api.util.sha3(JSON.stringify(log));
-    const { address, blockNumber, logIndex, transactionHash, transactionIndex, params, type } = log;
-
-    return {
-      type: log.event,
-      state: type,
-      address,
-      blockNumber,
-      logIndex,
-      transactionHash,
-      transactionIndex,
-      params,
-      key
-    };
-  }
-
-  _receiveEvents = (error, logs) => {
-    if (this.state.loadingEvents) {
-      this.setState({ loadingEvents: false });
-    }
-
-    if (error) {
-      console.error('_receiveEvents', error);
-      return;
-    }
-
-    const events = logs.map(this._logToEvent);
-    const minedEvents = events
-      .filter((event) => event.state === 'mined')
-      .reverse()
-      .concat(this.state.minedEvents)
-      .sort(this._sortEvents);
-    const pendingEvents = events
-      .filter((event) => event.state === 'pending')
-      .reverse()
-      .concat(this.state.pendingEvents.filter((pending) => {
-        return !events.find((event) => {
-          const isMined = (event.state === 'mined') && (event.transactionHash === pending.transactionHash);
-          const isPending = (event.state === 'pending') && (event.key === pending.key);
-
-          return isMined || isPending;
-        });
-      }))
-      .sort(this._sortEvents);
-    const allEvents = pendingEvents.concat(minedEvents);
-
-    this.setState({
-      allEvents,
-      minedEvents,
-      pendingEvents
-    });
-  }
-
-  attachContract (props) {
-    if (!props) {
-      return;
-    }
-
-    const { api } = this.context;
-    const { contracts, params } = props;
-    const account = contracts[params.address];
-
-    if (!account) {
-      return;
-    }
-
-    const contract = api.newContract(account.meta.abi, params.address);
-
-    contract
-      .subscribe(null, { limit: 25, fromBlock: 0, toBlock: 'pending' }, this._receiveEvents)
-      .then((subscriptionId) => {
-        this.setState({ subscriptionId });
-      });
-
-    this.setState({ contract }, this.queryContract);
-  }
-
-  setBaseAccount (props) {
-    const { fromAccount } = this.state;
-
-    if (!props || fromAccount) {
-      return;
-    }
-
-    const { accounts } = props;
-
-    this.setState({
-      fromAddress: Object.keys(accounts)[0]
-    });
-  }
-
-  onFromAddressChange = (event, fromAddress) => {
-    this.setState({
-      fromAddress
-    });
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts, accountsInfo, contracts } = state.personal;
-  const { netVersion } = state.nodeStatus;
-
-  return {
-    accounts,
-    accountsInfo,
-    contracts,
-    netVersion
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError,
-    setVisibleAccounts
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Contract);
diff --git a/js/src/views/Contract/index.js b/js/src/views/Contract/index.js
deleted file mode 100644
index 74c58e942d4f23ba7637a544b403a1e1f88ffb37..0000000000000000000000000000000000000000
--- a/js/src/views/Contract/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './contract';
diff --git a/js/src/views/Contracts/contracts.js b/js/src/views/Contracts/contracts.js
deleted file mode 100644
index 52ed7cdae91aaeea7d538fc3973060fd41fd3ea0..0000000000000000000000000000000000000000
--- a/js/src/views/Contracts/contracts.js
+++ /dev/null
@@ -1,285 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { Link } from 'react-router';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { uniq, isEqual } from 'lodash';
-
-import { AddContract, DeployContract } from '~/modals';
-import { setVisibleAccounts } from '~/redux/providers/personalActions';
-import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui';
-import { AddIcon, DevelopIcon } from '~/ui/Icons';
-
-import List from '../Accounts/List';
-
-const META_SORT = [
-  {
-    key: 'timestamp',
-    label: (
-      <FormattedMessage
-        id='contracts.sortOrder.date'
-        defaultMessage='date'
-      />
-    )
-  },
-  {
-    key: 'blockNumber:-1',
-    label: (
-      <FormattedMessage
-        id='contracts.sortOrder.minedBlock'
-        defaultMessage='mined block'
-      />
-    )
-  }
-];
-
-class Contracts extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    setVisibleAccounts: PropTypes.func.isRequired,
-
-    accounts: PropTypes.object,
-    contracts: PropTypes.object,
-    hasContracts: PropTypes.bool
-  }
-
-  state = {
-    addContract: false,
-    deployContract: false,
-    sortOrder: 'blockNumber:-1',
-    searchValues: [],
-    searchTokens: []
-  }
-
-  componentWillMount () {
-    this.setVisibleAccounts();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const prevAddresses = Object.keys(this.props.contracts);
-    const nextAddresses = Object.keys(nextProps.contracts);
-
-    if (prevAddresses.length !== nextAddresses.length || !isEqual(prevAddresses.sort(), nextAddresses.sort())) {
-      this.setVisibleAccounts(nextProps);
-    }
-  }
-
-  componentWillUnmount () {
-    this.props.setVisibleAccounts([]);
-  }
-
-  setVisibleAccounts (props = this.props) {
-    const { contracts, setVisibleAccounts } = props;
-    const addresses = Object.keys(contracts);
-
-    setVisibleAccounts(addresses);
-  }
-
-  render () {
-    const { contracts, hasContracts } = this.props;
-    const { searchValues, sortOrder } = this.state;
-
-    return (
-      <div>
-        { this.renderActionbar() }
-        { this.renderAddContract() }
-        { this.renderDeployContract() }
-        <Page>
-          <List
-            link='contracts'
-            search={ searchValues }
-            accounts={ contracts }
-            empty={ !hasContracts }
-            order={ sortOrder }
-            orderFallback='name'
-            handleAddSearchToken={ this.onAddSearchToken }
-          />
-        </Page>
-      </div>
-    );
-  }
-
-  renderSortButton () {
-    const { sortOrder } = this.state;
-
-    return (
-      <ActionbarSort
-        key='sortAccounts'
-        id='sortContracts'
-        order={ sortOrder }
-        metas={ META_SORT }
-        showDefault={ false }
-        onChange={ this.handleSortChange }
-      />
-    );
-  }
-
-  renderSearchButton () {
-    const onChange = (searchTokens, searchValues) => {
-      this.setState({ searchTokens, searchValues });
-    };
-
-    return (
-      <ActionbarSearch
-        key='searchContract'
-        tokens={ this.state.searchTokens }
-        onChange={ onChange }
-      />
-    );
-  }
-
-  renderActionbar () {
-    const buttons = [
-      <Button
-        key='addContract'
-        icon={ <AddIcon /> }
-        label={
-          <FormattedMessage
-            id='contracts.buttons.watch'
-            defaultMessage='watch'
-          />
-        }
-        onClick={ this.onAddContract }
-      />,
-      <Button
-        key='deployContract'
-        icon={ <AddIcon /> }
-        label={
-          <FormattedMessage
-            id='contracts.buttons.deploy'
-            defaultMessage='deploy'
-          />
-        }
-        onClick={ this.onDeployContract }
-      />,
-      <Link
-        to='/contracts/develop'
-        key='writeContract'
-      >
-        <Button
-          icon={ <DevelopIcon /> }
-          label={
-            <FormattedMessage
-              id='contracts.buttons.develop'
-              defaultMessage='develop'
-            />
-          }
-        />
-      </Link>,
-
-      this.renderSearchButton(),
-      this.renderSortButton()
-    ];
-
-    return (
-      <Actionbar
-        title={
-          <FormattedMessage
-            id='contracts.title'
-            defaultMessage='Contracts'
-          />
-        }
-        buttons={ buttons }
-      />
-    );
-  }
-
-  renderAddContract () {
-    const { contracts } = this.props;
-    const { addContract } = this.state;
-
-    if (!addContract) {
-      return null;
-    }
-
-    return (
-      <AddContract
-        contracts={ contracts }
-        onClose={ this.onAddContractClose }
-      />
-    );
-  }
-
-  renderDeployContract () {
-    const { accounts } = this.props;
-    const { deployContract } = this.state;
-
-    if (!deployContract) {
-      return null;
-    }
-
-    return (
-      <DeployContract
-        accounts={ accounts }
-        onClose={ this.onDeployContractClose }
-      />
-    );
-  }
-
-  handleSortChange = (sortOrder) => {
-    this.setState({ sortOrder });
-  }
-
-  onAddSearchToken = (token) => {
-    const { searchTokens } = this.state;
-    const newSearchTokens = uniq([].concat(searchTokens, token));
-
-    this.setState({ searchTokens: newSearchTokens });
-  }
-
-  onDeployContractClose = () => {
-    this.setState({ deployContract: false });
-  }
-
-  onDeployContract = () => {
-    this.setState({ deployContract: true });
-  }
-
-  onAddContractClose = () => {
-    this.setState({ addContract: false });
-  }
-
-  onAddContract = () => {
-    this.setState({ addContract: true });
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts, contracts, hasContracts } = state.personal;
-
-  return {
-    accounts,
-    contracts,
-    hasContracts
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    setVisibleAccounts
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Contracts);
diff --git a/js/src/views/Contracts/index.js b/js/src/views/Contracts/index.js
deleted file mode 100644
index 8714ff544deb1aa555d2086247c09fc8d99532de..0000000000000000000000000000000000000000
--- a/js/src/views/Contracts/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './contracts';
diff --git a/js/src/views/Dapp/dapp.css b/js/src/views/Dapp/dapp.css
deleted file mode 100644
index 035a17a24cc4f1c4c4614d6985550a19ca8d2bdb..0000000000000000000000000000000000000000
--- a/js/src/views/Dapp/dapp.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.frame {
-  background: white;
-  border: 0;
-  position: absolute;
-  height: 100%;
-  width: 100%;
-}
-
-.full {
-  width: 100vw;
-  height: 100vh;
-  margin: 0;
-  padding: 0;
-  background: white;
-  font-family: 'Roboto', sans-serif;
-  font-size: 16px;
-  font-weight: 300;
-
-  .text {
-    text-align: center;
-    padding: 5em;
-    font-size: 2em;
-    color: #999;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-}
diff --git a/js/src/views/Dapp/dapp.js b/js/src/views/Dapp/dapp.js
deleted file mode 100644
index 815ae35dd51bf2bc9e29e4c96941622a971a38a9..0000000000000000000000000000000000000000
--- a/js/src/views/Dapp/dapp.js
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { observer } from 'mobx-react';
-import { FormattedMessage } from 'react-intl';
-
-import DappsStore from '../Dapps/dappsStore';
-
-import styles from './dapp.css';
-
-@observer
-export default class Dapp extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    params: PropTypes.object
-  };
-
-  state = {
-    app: null,
-    loading: true
-  };
-
-  store = DappsStore.get(this.context.api);
-
-  componentWillMount () {
-    const { id } = this.props.params;
-
-    this.loadApp(id);
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (nextProps.params.id !== this.props.params.id) {
-      this.loadApp(nextProps.params.id);
-    }
-  }
-
-  loadApp (id) {
-    this.setState({ loading: true });
-
-    this.store
-      .loadApp(id)
-      .then((app) => {
-        this.setState({ loading: false, app });
-      })
-      .catch(() => {
-        this.setState({ loading: false });
-      });
-  }
-
-  render () {
-    const { dappsUrl } = this.context.api;
-    const { app, loading } = this.state;
-
-    if (loading) {
-      return (
-        <div className={ styles.full }>
-          <div className={ styles.text }>
-            <FormattedMessage
-              id='dapp.loading'
-              defaultMessage='Loading'
-            />
-          </div>
-        </div>
-      );
-    }
-
-    if (!app) {
-      return (
-        <div className={ styles.full }>
-          <div className={ styles.text }>
-            <FormattedMessage
-              id='dapp.unavailable'
-              defaultMessage='The dapp cannot be reached'
-            />
-          </div>
-        </div>
-      );
-    }
-
-    let src = null;
-
-    switch (app.type) {
-      case 'local':
-        src = `${dappsUrl}/${app.id}/`;
-        break;
-      case 'network':
-        src = `${dappsUrl}/${app.contentHash}/`;
-        break;
-      default:
-        let dapphost = process.env.DAPPS_URL || (
-          process.env.NODE_ENV === 'production' && !app.secure
-            ? `${dappsUrl}/ui`
-            : ''
-        );
-
-        if (dapphost === '/') {
-          dapphost = '';
-        }
-
-        src = `${dapphost}/${app.url}.html`;
-        break;
-    }
-
-    return (
-      <iframe
-        className={ styles.frame }
-        frameBorder={ 0 }
-        name={ name }
-        sandbox='allow-forms allow-popups allow-same-origin allow-scripts'
-        scrolling='auto'
-        src={ src }
-      />
-    );
-  }
-}
diff --git a/js/src/views/Dapp/index.js b/js/src/views/Dapp/index.js
deleted file mode 100644
index 3d32813894b4befb9df2b554942ed8998f7bc49b..0000000000000000000000000000000000000000
--- a/js/src/views/Dapp/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dapp';
diff --git a/js/src/views/Dapps/builtin.json b/js/src/views/Dapps/builtin.json
deleted file mode 100644
index 09b60dccf6ef75293df66b529508dfc4dc2c2162..0000000000000000000000000000000000000000
--- a/js/src/views/Dapps/builtin.json
+++ /dev/null
@@ -1,101 +0,0 @@
-[
-  {
-    "url": "chaindeploy",
-    "name": "Chain Deployment",
-    "description": "Deploy all basic contracts, names & applications to the network",
-    "author": "Parity Team <admin@parity.io>",
-    "version": "1.0.0",
-    "visible": false
-  },
-  {
-    "id": "0xa635a9326814bded464190eddf0bdb90ce92d40ea2359cf553ea80e3c5a4076c",
-    "url": "console",
-    "name": "Parity/Web3 console",
-    "description": "A Javascript development console complete with web3 and parity objects",
-    "version": "0.3",
-    "author": "Gav Wood <gavin@parity.io>",
-    "position": "top-right",
-    "visible": true,
-    "secure": true
-  },
-  {
-    "id": "0xf9f2d620c2e08f83e45555247146c62185e4ab7cf82a4b9002a265a0d020348f",
-    "url": "tokendeploy",
-    "name": "Token Deployment",
-    "description": "Deploy new basic tokens that you are able to send around",
-    "author": "Parity Team <admin@parity.io>",
-    "version": "1.0.0",
-    "visible": true
-  },
-  {
-    "id": "0xd1adaede68d344519025e2ff574650cd99d3830fe6d274c7a7843cdc00e17938",
-    "url": "registry",
-    "name": "Registry",
-    "description": "A global registry of addresses on the network",
-    "author": "Parity Team <admin@parity.io>",
-    "version": "1.0.0",
-    "visible": true
-  },
-  {
-    "id": "0x0a8048117e51e964628d0f2d26342b3cd915248b59bcce2721e1d05f5cfa2208",
-    "url": "tokenreg",
-    "name": "Token Registry",
-    "description": "A registry of transactable tokens on the network",
-    "author": "Parity Team <admin@parity.io>",
-    "version": "1.0.0",
-    "visible": true,
-    "secure": true
-  },
-  {
-    "id": "0xf49089046f53f5d2e5f3513c1c32f5ff57d986e46309a42d2b249070e4e72c46",
-    "url": "signaturereg",
-    "name": "Method Registry",
-    "description": "A registry of method signatures for lookups on transactions",
-    "author": "Parity Team <admin@parity.io>",
-    "version": "1.0.0",
-    "visible": true
-  },
-  {
-    "id": "0x058740ee9a5a3fb9f1cfa10752baec87e09cc45cd7027fd54708271aca300c75",
-    "url": "githubhint",
-    "name": "GitHub Hint",
-    "description": "A mapping of GitHub URLs to hashes for use in contracts as references",
-    "author": "Parity Team <admin@parity.io>",
-    "version": "1.0.0",
-    "visible": false,
-    "secure": true,
-    "onlyPersonal": true
-  },
-  {
-    "id": "0xae74ad174b95cdbd01c88ac5b73a296d33e9088fc2a200e76bcedf3a94a7815d",
-    "url": "localtx",
-    "name": "TxQueue Viewer",
-    "description": "Have a peek at the internals of your node's transaction queue",
-    "author": "Parity Team <admin@parity.io>",
-    "version": "1.0.0",
-    "visible": true,
-    "secure": true
-  },
-  {
-    "id": "0x7bbc4f1a27628781b96213e781a1b8eec6982c1db8fac739af6e4c5a55862c03",
-    "url": "dappreg",
-    "name": "Dapp Registration",
-    "description": "Enables the registration and content management of dapps on the network",
-    "author": "Parity Team <admin@parity.io>",
-    "version": "1.0.0",
-    "visible": false,
-    "secure": true
-  },
-  {
-    "id": "0x9042323cd85c6576992d211de34b3ecc183f15e4f639aa87859882f839c374e5",
-    "url": "web",
-    "name": "Browser",
-    "description": "A Web 2.0 hosted pseudo-dapps browser",
-    "author": "Parity Team <admin@parity.io>",
-    "version": "1.0.0",
-    "visible": true,
-    "skipBuild": true,
-    "skipHistory": true,
-    "onlyPersonal": true
-  }
-]
diff --git a/js/src/views/Dapps/dappStore.spec.js b/js/src/views/Dapps/dappStore.spec.js
deleted file mode 100644
index 3b4fb0ded62ba4272717ebc01b0796597e0c2afc..0000000000000000000000000000000000000000
--- a/js/src/views/Dapps/dappStore.spec.js
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import sinon from 'sinon';
-import localStore from 'store';
-
-import Contracts from '~/contracts';
-
-import Store, { LS_KEY_DISPLAY } from './dappsStore';
-
-const APPID_DAPPREG = '0x7bbc4f1a27628781b96213e781a1b8eec6982c1db8fac739af6e4c5a55862c03';
-const APPID_GHH = '0x058740ee9a5a3fb9f1cfa10752baec87e09cc45cd7027fd54708271aca300c75';
-const APPID_LOCALTX = '0xae74ad174b95cdbd01c88ac5b73a296d33e9088fc2a200e76bcedf3a94a7815d';
-const APPID_TOKENDEPLOY = '0xf9f2d620c2e08f83e45555247146c62185e4ab7cf82a4b9002a265a0d020348f';
-
-let globalContractsGet;
-
-function stubGlobals () {
-  globalContractsGet = Contracts.get;
-
-  Contracts.get = () => {
-    return {
-      dappReg: {
-        at: sinon.stub().resolves([[0, 1, 2, 3], 'appOwner']),
-        count: sinon.stub().resolves(new BigNumber(1)),
-        getContract: sinon.stub().resolves({}),
-        getContent: sinon.stub().resolves([0, 1, 2, 3]),
-        getImage: sinon.stub().resolves([0, 1, 2, 3]),
-        getManifest: sinon.stub().resolves([0, 1, 2, 3])
-      }
-    };
-  };
-}
-
-function restoreGlobals () {
-  Contracts.get = globalContractsGet;
-}
-
-let api;
-let store;
-
-function create () {
-  api = {
-    parity: {
-      dappsList: () => Promise.resolve([])
-    }
-  };
-  store = new Store(api);
-
-  return store;
-}
-
-describe('views/Dapps/DappStore', () => {
-  beforeEach(() => {
-    stubGlobals();
-  });
-
-  afterEach(() => {
-    restoreGlobals();
-  });
-
-  describe('@action', () => {
-    const defaultViews = {
-      [APPID_TOKENDEPLOY]: { visible: false },
-      [APPID_DAPPREG]: { visible: true }
-    };
-
-    describe('setDisplayApps', () => {
-      beforeEach(() => {
-        create();
-        store.setDisplayApps(defaultViews);
-      });
-
-      it('sets from empty start', () => {
-        expect(store.displayApps).to.deep.equal(defaultViews);
-      });
-
-      it('overrides single keys, keeping existing', () => {
-        store.setDisplayApps({ [APPID_TOKENDEPLOY]: { visible: true } });
-
-        expect(store.displayApps).to.deep.equal(
-          Object.assign({}, defaultViews, { [APPID_TOKENDEPLOY]: { visible: true } })
-        );
-      });
-
-      it('extends with new keys, keeping existing', () => {
-        store.setDisplayApps({ 'test': { visible: true } });
-
-        expect(store.displayApps).to.deep.equal(
-          Object.assign({}, defaultViews, { 'test': { visible: true } })
-        );
-      });
-    });
-
-    describe('hideApp/showApp', () => {
-      beforeEach(() => {
-        localStore.set(LS_KEY_DISPLAY, defaultViews);
-
-        create().readDisplayApps();
-      });
-
-      afterEach(() => {
-        localStore.set(LS_KEY_DISPLAY, {});
-      });
-
-      it('disables visibility', () => {
-        store.hideApp(APPID_DAPPREG);
-
-        expect(store.displayApps[APPID_DAPPREG].visible).to.be.false;
-        expect(localStore.get(LS_KEY_DISPLAY)).to.deep.equal(
-          Object.assign({}, defaultViews, { [APPID_DAPPREG]: { visible: false } })
-        );
-      });
-
-      it('enables visibility', () => {
-        store.showApp(APPID_TOKENDEPLOY);
-
-        expect(store.displayApps[APPID_TOKENDEPLOY].visible).to.be.true;
-        expect(localStore.get(LS_KEY_DISPLAY)).to.deep.equal(
-          Object.assign({}, defaultViews, { [APPID_TOKENDEPLOY]: { visible: true } })
-        );
-      });
-
-      it('keeps visibility state', () => {
-        store.hideApp(APPID_TOKENDEPLOY);
-        store.showApp(APPID_DAPPREG);
-
-        expect(store.displayApps[APPID_TOKENDEPLOY].visible).to.be.false;
-        expect(store.displayApps[APPID_DAPPREG].visible).to.be.true;
-        expect(localStore.get(LS_KEY_DISPLAY)).to.deep.equal(defaultViews);
-      });
-    });
-
-    describe('readDisplayApps/writeDisplayApps', () => {
-      beforeEach(() => {
-        localStore.set(LS_KEY_DISPLAY, defaultViews);
-
-        create().readDisplayApps();
-      });
-
-      afterEach(() => {
-        localStore.set(LS_KEY_DISPLAY, {});
-      });
-
-      it('loads visibility from storage', () => {
-        expect(store.displayApps).to.deep.equal(defaultViews);
-      });
-
-      it('saves visibility to storage', () => {
-        store.setDisplayApps({ [APPID_TOKENDEPLOY]: { visible: true } });
-        store.writeDisplayApps();
-
-        expect(localStore.get(LS_KEY_DISPLAY)).to.deep.equal(
-          Object.assign({}, defaultViews, { [APPID_TOKENDEPLOY]: { visible: true } })
-        );
-      });
-    });
-  });
-
-  describe('saved views', () => {
-    beforeEach(() => {
-      localStore.set(LS_KEY_DISPLAY, {
-        [APPID_TOKENDEPLOY]: { visible: false },
-        [APPID_DAPPREG]: { visible: true }
-      });
-
-      return create().loadAllApps();
-    });
-
-    afterEach(() => {
-      localStore.set(LS_KEY_DISPLAY, {});
-    });
-
-    it('disables based on saved keys', () => {
-      expect(store.displayApps[APPID_TOKENDEPLOY].visible).to.be.false;
-    });
-
-    it('enables based on saved keys', () => {
-      expect(store.displayApps[APPID_DAPPREG].visible).to.be.true;
-    });
-
-    it('keeps non-sepcified disabled keys', () => {
-      expect(store.displayApps[APPID_GHH].visible).to.be.false;
-    });
-
-    it('keeps non-specified enabled keys', () => {
-      expect(store.displayApps[APPID_LOCALTX].visible).to.be.true;
-    });
-  });
-});
diff --git a/js/src/views/Dapps/dapps.css b/js/src/views/Dapps/dapps.css
deleted file mode 100644
index bc0965074cb602683186414a72849596354bbb30..0000000000000000000000000000000000000000
--- a/js/src/views/Dapps/dapps.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.overlay {
-  line-height: 1.5em;
-  margin: 0 auto;
-  text-align: left;
-  max-width: 980px;
-
-  &>div:first-child {
-    padding-bottom: 1em;
-  }
-}
diff --git a/js/src/views/Dapps/dapps.js b/js/src/views/Dapps/dapps.js
deleted file mode 100644
index 54706f3521c29dc63b0a5aa473657eed70885021..0000000000000000000000000000000000000000
--- a/js/src/views/Dapps/dapps.js
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { omitBy } from 'lodash';
-import { Checkbox } from 'material-ui';
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import { DappPermissions, DappsVisible } from '~/modals';
-import PermissionStore from '~/modals/DappPermissions/store';
-import { Actionbar, Button, DappCard, Page, SectionList } from '~/ui';
-import { LockedIcon, RefreshIcon, VisibleIcon } from '~/ui/Icons';
-
-import DappsStore from './dappsStore';
-
-import styles from './dapps.css';
-
-@observer
-class Dapps extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    availability: PropTypes.string.isRequired
-  };
-
-  store = DappsStore.get(this.context.api);
-  permissionStore = new PermissionStore(this.context.api);
-
-  componentWillMount () {
-    this.store.loadAllApps();
-  }
-
-  render () {
-    let externalOverlay = null;
-
-    if (this.store.externalOverlayVisible) {
-      externalOverlay = (
-        <div className={ styles.overlay }>
-          <div>
-            <FormattedMessage
-              id='dapps.external.warning'
-              defaultMessage='Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.'
-            />
-          </div>
-          <div>
-            <Checkbox
-              className={ styles.accept }
-              label={
-                <FormattedMessage
-                  id='dapps.external.accept'
-                  defaultMessage='I understand that these applications are not affiliated with Parity'
-                />
-              }
-              checked={ false }
-              onCheck={ this.onClickAcceptExternal }
-            />
-          </div>
-        </div>
-      );
-    }
-
-    return (
-      <div>
-        <DappPermissions permissionStore={ this.permissionStore } />
-        <DappsVisible store={ this.store } />
-        <Actionbar
-          className={ styles.toolbar }
-          title={
-            <FormattedMessage
-              id='dapps.label'
-              defaultMessage='Decentralized Applications'
-            />
-          }
-          buttons={ [
-            <Button
-              icon={ <RefreshIcon /> }
-              key='refresh'
-              label={
-                <FormattedMessage
-                  id='dapps.button.dapp.refresh'
-                  defaultMessage='refresh'
-                />
-              }
-              onClick={ this.store.refreshDapps }
-            />,
-            <Button
-              icon={ <VisibleIcon /> }
-              key='edit'
-              label={
-                <FormattedMessage
-                  id='dapps.button.edit'
-                  defaultMessage='edit'
-                />
-              }
-              onClick={ this.store.openModal }
-            />,
-            <Button
-              icon={ <LockedIcon /> }
-              key='permissions'
-              label={
-                <FormattedMessage
-                  id='dapps.button.permissions'
-                  defaultMessage='permissions'
-                />
-              }
-              onClick={ this.openPermissionsModal }
-            />
-          ] }
-        />
-        <Page>
-          <div>{ this.renderList(this.store.visibleLocal) }</div>
-          <div>{ this.renderList(this.store.visibleBuiltin) }</div>
-          <div>{ this.renderList(this.store.visibleNetwork, externalOverlay) }</div>
-        </Page>
-      </div>
-    );
-  }
-
-  renderList (items, overlay) {
-    return (
-      <SectionList
-        items={ items }
-        overlay={ overlay }
-        renderItem={ this.renderApp }
-      />
-    );
-  }
-
-  renderApp = (app) => {
-    if (app.onlyPersonal && this.props.availability !== 'personal') {
-      return null;
-    }
-
-    return (
-      <DappCard
-        app={ app }
-        key={ app.id }
-        showLink
-        showTags
-      />
-    );
-  }
-
-  onClickAcceptExternal = () => {
-    this.store.closeExternalOverlay();
-  }
-
-  openPermissionsModal = () => {
-    const { accounts } = this.props;
-
-    this.permissionStore.openModal(accounts);
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts } = state.personal;
-  const { availability = 'unknown' } = state.nodeStatus.nodeKind || {};
-
-  /**
-   * Do not show the Wallet Accounts in the Dapps
-   * Permissions Modal. This will come in v1.6, but
-   * for now it would break dApps using Web3...
-   */
-  const _accounts = omitBy(accounts, (account) => account.wallet);
-
-  return {
-    accounts: _accounts,
-    availability
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(Dapps);
diff --git a/js/src/views/Dapps/dappsStore.js b/js/src/views/Dapps/dappsStore.js
deleted file mode 100644
index 1a5e921ea749daec198b1c664fe3324fb8af3f69..0000000000000000000000000000000000000000
--- a/js/src/views/Dapps/dappsStore.js
+++ /dev/null
@@ -1,313 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import EventEmitter from 'eventemitter3';
-import { action, computed, observable, transaction } from 'mobx';
-import store from 'store';
-
-import Contracts from '~/contracts';
-import {
-  fetchBuiltinApps, fetchLocalApps,
-  fetchRegistryAppIds, fetchRegistryApp,
-  subscribeToChanges
-} from '~/util/dapps';
-
-const LS_KEY_DISPLAY = 'displayApps';
-const LS_KEY_EXTERNAL_ACCEPT = 'acceptExternal';
-const BUILTIN_APPS_KEY = 'BUILTIN_APPS_KEY';
-
-let instance = null;
-
-export default class DappsStore extends EventEmitter {
-  @observable apps = [];
-  @observable displayApps = {};
-  @observable modalOpen = false;
-  @observable externalOverlayVisible = true;
-
-  _api = null;
-  _subscriptions = {};
-  _cachedApps = {};
-  _manifests = {};
-  _registryAppsIds = null;
-
-  constructor (api) {
-    super();
-
-    this._api = api;
-
-    this.readDisplayApps();
-    this.loadExternalOverlay();
-    this.subscribeToChanges();
-  }
-
-  static get (api) {
-    if (!instance) {
-      instance = new DappsStore(api);
-    }
-
-    return instance;
-  }
-
-  /**
-   * Try to find the app from the local (local or builtin)
-   * apps, else fetch from the node
-   */
-  loadApp (id) {
-    const { dappReg } = Contracts.get();
-
-    return this
-      .loadLocalApps()
-      .then(() => {
-        const app = this.apps.find((app) => app.id === id);
-
-        if (app) {
-          return app;
-        }
-
-        return this.fetchRegistryApp(dappReg, id, true);
-      })
-      .then((app) => {
-        this.emit('loaded', app);
-        return app;
-      });
-  }
-
-  loadLocalApps () {
-    return Promise
-      .all([
-        this.fetchBuiltinApps().then((apps) => this.addApps(apps)),
-        this.fetchLocalApps().then((apps) => this.addApps(apps, true))
-      ]);
-  }
-
-  loadAllApps () {
-    const { dappReg } = Contracts.get();
-
-    return Promise
-      .all([
-        this.loadLocalApps(),
-        this.fetchRegistryApps(dappReg).then((apps) => this.addApps(apps))
-      ])
-      .then(this.writeDisplayApps);
-  }
-
-  subscribeToChanges () {
-    const { dappReg } = Contracts.get();
-
-    // Unsubscribe from previous subscriptions, if any
-    if (this._subscriptions.block) {
-      this._api.unsubscribe(this._subscriptions.block);
-    }
-
-    if (this._subscriptions.filter) {
-      this._api.eth.uninstallFilter(this._subscriptions.filter);
-    }
-
-    // Subscribe to dapps reg changes
-    subscribeToChanges(this._api, dappReg, (appIds) => {
-      const updates = appIds.map((appId) => {
-        return this.fetchRegistryApp(dappReg, appId, true);
-      });
-
-      Promise
-        .all(updates)
-        .then((apps) => {
-          this.addApps(apps);
-        });
-    }).then((subscriptions) => {
-      this._subscriptions = subscriptions;
-    });
-  }
-
-  fetchBuiltinApps (force = false) {
-    if (!force && this._cachedApps[BUILTIN_APPS_KEY] !== undefined) {
-      return Promise.resolve(this._cachedApps[BUILTIN_APPS_KEY]);
-    }
-
-    this._cachedApps[BUILTIN_APPS_KEY] = fetchBuiltinApps()
-      .then((apps) => {
-        this._cachedApps[BUILTIN_APPS_KEY] = apps;
-        return apps;
-      });
-
-    return Promise.resolve(this._cachedApps[BUILTIN_APPS_KEY]);
-  }
-
-  fetchLocalApps () {
-    return fetchLocalApps(this._api);
-  }
-
-  fetchRegistryAppIds (force = false) {
-    if (!force && this._registryAppsIds) {
-      return Promise.resolve(this._registryAppsIds);
-    }
-
-    this._registryAppsIds = fetchRegistryAppIds()
-      .then((appIds) => {
-        this._registryAppsIds = appIds;
-        return this._registryAppsIds;
-      });
-
-    return Promise.resolve(this._registryAppsIds);
-  }
-
-  fetchRegistryApp (dappReg, appId, force = false) {
-    if (!force && this._cachedApps[appId] !== undefined) {
-      return Promise.resolve(this._cachedApps[appId]);
-    }
-
-    this._cachedApps[appId] = fetchRegistryApp(this._api, dappReg, appId)
-      .then((dapp) => {
-        this._cachedApps[appId] = dapp;
-        return dapp;
-      });
-
-    return Promise.resolve(this._cachedApps[appId]);
-  }
-
-  fetchRegistryApps (dappReg) {
-    return this
-      .fetchRegistryAppIds()
-      .then((appIds) => {
-        const promises = appIds.map((appId) => {
-          // Fetch the Dapp and display it ASAP
-          return this
-            .fetchRegistryApp(dappReg, appId)
-            .then((app) => {
-              if (app) {
-                this.addApps([ app ]);
-              }
-
-              return app;
-            });
-        });
-
-        return Promise.all(promises);
-      });
-  }
-
-  @computed get sortedBuiltin () {
-    return this.apps.filter((app) => app.type === 'builtin');
-  }
-
-  @computed get sortedLocal () {
-    return this.apps.filter((app) => app.type === 'local');
-  }
-
-  @computed get sortedNetwork () {
-    return this.apps.filter((app) => app.type === 'network');
-  }
-
-  @computed get visibleApps () {
-    return this.apps.filter((app) => this.displayApps[app.id] && this.displayApps[app.id].visible);
-  }
-
-  @computed get visibleBuiltin () {
-    return this.visibleApps.filter((app) => app.type === 'builtin');
-  }
-
-  @computed get visibleLocal () {
-    return this.visibleApps.filter((app) => app.type === 'local');
-  }
-
-  @computed get visibleNetwork () {
-    return this.visibleApps.filter((app) => app.type === 'network');
-  }
-
-  @action refreshDapps = () => {
-    const self = this;
-
-    self._api.parity.dappsRefresh()
-      .then((res) => {
-        if (res === true) {
-          self.loadAllApps();
-        }
-      })
-      .catch((err) => {
-        console.log(err);
-      });
-  }
-
-  @action openModal = () => {
-    this.modalOpen = true;
-  }
-
-  @action closeModal = () => {
-    this.modalOpen = false;
-  }
-
-  @action closeExternalOverlay = () => {
-    this.externalOverlayVisible = false;
-    store.set(LS_KEY_EXTERNAL_ACCEPT, true);
-  }
-
-  @action loadExternalOverlay () {
-    this.externalOverlayVisible = !(store.get(LS_KEY_EXTERNAL_ACCEPT) || false);
-  }
-
-  @action hideApp = (id) => {
-    this.setDisplayApps({ [id]: { visible: false } });
-    this.writeDisplayApps();
-  }
-
-  @action showApp = (id) => {
-    this.setDisplayApps({ [id]: { visible: true } });
-    this.writeDisplayApps();
-  }
-
-  @action readDisplayApps = () => {
-    this.displayApps = store.get(LS_KEY_DISPLAY) || {};
-  }
-
-  @action writeDisplayApps = () => {
-    store.set(LS_KEY_DISPLAY, this.displayApps);
-  }
-
-  @action setDisplayApps = (displayApps) => {
-    this.displayApps = Object.assign({}, this.displayApps, displayApps);
-  };
-
-  @action addApps = (_apps = [], _local = false) => {
-    transaction(() => {
-      const apps = _apps.filter((app) => app);
-
-      // Get new apps IDs if available
-      const newAppsIds = apps
-        .map((app) => app.id)
-        .filter((id) => id);
-
-      this.apps = this.apps
-        .filter((app) => !app.id || !newAppsIds.includes(app.id))
-        .filter((app) => !(app.type === 'local' && _local && apps.indexOf(app) === -1))
-        .concat(apps || [])
-        .sort((a, b) => a.name.localeCompare(b.name));
-
-      const visibility = {};
-
-      apps.forEach((app) => {
-        if (!this.displayApps[app.id]) {
-          visibility[app.id] = { visible: app.visible };
-        }
-      });
-
-      this.setDisplayApps(visibility);
-    });
-  }
-}
-
-export {
-  LS_KEY_DISPLAY
-};
diff --git a/js/src/views/Dapps/index.js b/js/src/views/Dapps/index.js
deleted file mode 100644
index 9e6dddb632c8c6ec841221c3398d20e76b3e10c8..0000000000000000000000000000000000000000
--- a/js/src/views/Dapps/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dapps';
diff --git a/js/src/views/Home/Accounts/accounts.css b/js/src/views/Home/Accounts/accounts.css
deleted file mode 100644
index a6b08f344eea59eecf2d19e509f98c25dee96557..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Accounts/accounts.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.accounts {
-  margin-top: 1.5em;
-  text-align: center;
-
-  .account {
-    position: relative;
-    line-height: 2em;
-    vertical-align: middle;
-    white-space: nowrap;
-
-    .icon {
-      margin: 0;
-    }
-
-    .link, .name {
-      display: block;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    .name {
-      white-space: nowrap;
-    }
-
-    .timestamp {
-      color: #aaa;
-      font-size: 0.75em;
-      line-height: 1em;
-      padding-top: 0;
-      white-space: normal;
-    }
-  }
-}
diff --git a/js/src/views/Home/Accounts/accounts.js b/js/src/views/Home/Accounts/accounts.js
deleted file mode 100644
index f397994ff3fe672ca8b5b0595b0762c161bb718d..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Accounts/accounts.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { Link } from 'react-router';
-
-import { Container, ContainerTitle, IdentityName, IdentityIcon, SectionList } from '~/ui';
-import { arrayOrObjectProptype } from '~/util/proptypes';
-
-import styles from './accounts.css';
-
-class Accounts extends Component {
-  static propTypes = {
-    accountsInfo: PropTypes.object,
-    history: arrayOrObjectProptype().isRequired
-  };
-
-  render () {
-    return (
-      <div className={ styles.accounts }>
-        <ContainerTitle
-          title={
-            <FormattedMessage
-              id='home.accounts.title'
-              defaultMessage='Recent Accounts'
-            />
-          }
-        />
-        { this.renderHistory() }
-      </div>
-    );
-  }
-
-  renderHistory () {
-    const { accountsInfo, history } = this.props;
-
-    if (!accountsInfo || !Object.keys(accountsInfo).length) {
-      return null;
-    }
-
-    if (!history.length) {
-      return (
-        <div className={ styles.empty }>
-          <FormattedMessage
-            id='home.accounts.none'
-            defaultMessage='No recent accounts history available'
-          />
-        </div>
-      );
-    }
-
-    return (
-      <SectionList
-        items={ history }
-        renderItem={ this.renderHistoryItem }
-      />
-    );
-  }
-
-  renderHistoryItem = (history) => {
-    const { accountsInfo } = this.props;
-
-    if (!history || !history.entry) {
-      return null;
-    }
-
-    const account = accountsInfo[history.entry];
-
-    if (!account) {
-      return null;
-    }
-
-    let linkType = 'addresses';
-
-    if (account.uuid) {
-      linkType = 'accounts';
-    } else if (account.meta.wallet) {
-      linkType = 'wallet';
-    }
-
-    return (
-      <Container
-        className={ styles.account }
-        key={ history.timestamp }
-        hover={
-          <div className={ styles.timestamp }>
-            <FormattedMessage
-              id='home.account.visited'
-              defaultMessage='accessed {when}'
-              values={ {
-                when: moment(history.timestamp).fromNow()
-              } }
-            />
-          </div>
-        }
-      >
-        <Link
-          className={ styles.link }
-          to={ `/${linkType}/${history.entry}` }
-        >
-          <IdentityIcon
-            address={ history.entry }
-            className={ styles.icon }
-            center
-          />
-          <IdentityName
-            address={ history.entry }
-            className={ styles.name }
-            unknown
-          />
-        </Link>
-      </Container>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { accountsInfo } = state.personal;
-
-  return {
-    accountsInfo
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(Accounts);
diff --git a/js/src/views/Home/Accounts/accounts.spec.js b/js/src/views/Home/Accounts/accounts.spec.js
deleted file mode 100644
index 368ebcedba9acc370f79de60b69c34ac6ebc9048..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Accounts/accounts.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import Accounts from './';
-
-let component;
-let store;
-
-function createRedux () {
-  store = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        personal: {
-          accountsInfo: { '0x123': {} }
-        }
-      };
-    }
-  };
-
-  return store;
-}
-
-function render (history = []) {
-  component = shallow(
-    <Accounts
-      history={ history }
-    />,
-    {
-      context: {
-        store: createRedux()
-      }
-    }
-  ).find('Accounts').shallow();
-
-  return component;
-}
-
-describe('views/Home/Accounts', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  describe('no history', () => {
-    beforeEach(() => {
-      render();
-    });
-
-    it('renders empty message', () => {
-      expect(component.find('FormattedMessage').props().id).to.equal('home.accounts.none');
-    });
-  });
-});
diff --git a/js/src/views/Home/Accounts/index.js b/js/src/views/Home/Accounts/index.js
deleted file mode 100644
index 027387e709e83bcecb50fa82770e5bb7950277ce..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Accounts/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './accounts';
diff --git a/js/src/views/Home/Dapps/dapp.js b/js/src/views/Home/Dapps/dapp.js
deleted file mode 100644
index 51e5c21220b1be7f7c180288af885ab742ae3a48..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Dapps/dapp.js
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { Link } from 'react-router';
-
-import { Container, DappIcon } from '~/ui';
-
-import styles from './dapps.css';
-
-export default class Dapp extends Component {
-  static propTypes = {
-    id: PropTypes.string.isRequired,
-    store: PropTypes.object.isRequired,
-    timestamp: PropTypes.number.isRequired
-  }
-
-  state = {
-    dapp: null
-  }
-
-  componentWillMount () {
-    return this.loadApp();
-  }
-
-  render () {
-    const { id, timestamp } = this.props;
-    const { dapp } = this.state;
-
-    if (!dapp) {
-      return null;
-    }
-
-    return (
-      <Container
-        className={ styles.dapp }
-        hover={
-          <div className={ styles.timestamp }>
-            <FormattedMessage
-              id='home.dapp.visited'
-              defaultMessage='accessed {when}'
-              values={ {
-                when: moment(timestamp).fromNow()
-              } }
-            />
-          </div>
-        }
-      >
-        <Link
-          className={ styles.link }
-          to={ `/app/${id}` }
-        >
-          <DappIcon
-            app={ dapp }
-            className={ styles.icon }
-          />
-          <span className={ styles.name }>
-            { dapp.name }
-          </span>
-        </Link>
-      </Container>
-    );
-  }
-
-  loadApp = () => {
-    const { id, store } = this.props;
-
-    return store
-      .loadApp(id)
-      .then((dapp) => {
-        this.setState({ dapp });
-      });
-  }
-}
diff --git a/js/src/views/Home/Dapps/dapp.spec.js b/js/src/views/Home/Dapps/dapp.spec.js
deleted file mode 100644
index d7c5b09bdd43a2d9a16ff22c0ce99507c7cf1a20..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Dapps/dapp.spec.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import Dapp from './dapp';
-
-import { createStore } from './dapps.test.js';
-
-let component;
-let instance;
-let store;
-
-function render () {
-  store = createStore();
-  component = shallow(
-    <Dapp
-      id='testId'
-      store={ store }
-      timestamp={ Date.now() }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Home/Dapp', () => {
-  beforeEach(() => {
-    render();
-    return instance.componentWillMount();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('loads the dapp on mount', () => {
-    expect(store.loadApp).to.have.been.calledWith('testId');
-  });
-});
diff --git a/js/src/views/Home/Dapps/dapps.css b/js/src/views/Home/Dapps/dapps.css
deleted file mode 100644
index b8e9c01df95f5659f47e2b642eeace74493e41b8..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Dapps/dapps.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.dapps {
-  margin-top: 1.5em;
-  text-align: center;
-
-  .dapp {
-    position: relative;
-    line-height: 2em;
-    vertical-align: middle;
-
-    .icon {
-      margin: 0;
-    }
-
-    .link, .name {
-      display: block;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    .name {
-      white-space: nowrap;
-    }
-
-    .timestamp {
-      color: #aaa;
-      font-size: 0.75em;
-      line-height: 1em;
-      padding-top: 0;
-    }
-  }
-}
diff --git a/js/src/views/Home/Dapps/dapps.js b/js/src/views/Home/Dapps/dapps.js
deleted file mode 100644
index 608d4435b3e6779831cbcb6738355039d6347c35..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Dapps/dapps.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { ContainerTitle, SectionList } from '~/ui';
-import { arrayOrObjectProptype } from '~/util/proptypes';
-
-import Dapp from './dapp';
-import styles from './dapps.css';
-
-export default class Dapps extends Component {
-  static propTypes = {
-    history: arrayOrObjectProptype().isRequired,
-    store: PropTypes.object.isRequired
-  }
-
-  render () {
-    return (
-      <div className={ styles.dapps }>
-        <ContainerTitle
-          title={
-            <FormattedMessage
-              id='home.dapps.title'
-              defaultMessage='Recent Dapps'
-            />
-          }
-        />
-        { this.renderHistory() }
-      </div>
-    );
-  }
-
-  renderHistory () {
-    const { history } = this.props;
-
-    if (!history.length) {
-      return (
-        <div className={ styles.empty }>
-          <FormattedMessage
-            id='home.dapps.none'
-            defaultMessage='No recent Applications history available'
-          />
-        </div>
-      );
-    }
-
-    return (
-      <SectionList
-        items={ history }
-        renderItem={ this.renderHistoryItem }
-      />
-    );
-  }
-
-  renderHistoryItem = (history) => {
-    if (!history || !history.entry) {
-      return null;
-    }
-
-    const { store } = this.props;
-
-    return (
-      <Dapp
-        id={ history.entry }
-        key={ history.timestamp }
-        store={ store }
-        timestamp={ history.timestamp }
-      />
-    );
-  }
-}
diff --git a/js/src/views/Home/Dapps/dapps.spec.js b/js/src/views/Home/Dapps/dapps.spec.js
deleted file mode 100644
index 8dcb938f47cd4d8e4e2c9ac9777cbb6287d69c05..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Dapps/dapps.spec.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import Dapps from './';
-
-import { createStore } from './dapps.test.js';
-
-let component;
-let store;
-
-function render (history = []) {
-  store = createStore();
-  component = shallow(
-    <Dapps
-      history={ history }
-      store={ store }
-    />
-  );
-
-  return component;
-}
-
-describe('views/Home/Dapps', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  describe('no history', () => {
-    beforeEach(() => {
-      render();
-    });
-
-    it('renders empty message', () => {
-      expect(component.find('FormattedMessage').props().id).to.equal('home.dapps.none');
-    });
-  });
-
-  describe('with history', () => {
-    const HISTORY = [
-      { timestamp: 1, entry: 'testABC' },
-      { timestamp: 2, entry: 'testDEF' }
-    ];
-
-    beforeEach(() => {
-      render(HISTORY);
-    });
-
-    it('renders SectionList', () => {
-      expect(component.find('SectionList').length).to.equal(1);
-    });
-  });
-});
diff --git a/js/src/views/Home/Dapps/dapps.test.js b/js/src/views/Home/Dapps/dapps.test.js
deleted file mode 100644
index 3593d7f3e851a5f1d0cdf5e1e66d401a18db5276..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Dapps/dapps.test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-function createStore () {
-  return {
-    loadApp: sinon.stub().resolves({ name: 'testName' })
-  };
-}
-
-export {
-  createStore
-};
diff --git a/js/src/views/Home/Dapps/index.js b/js/src/views/Home/Dapps/index.js
deleted file mode 100644
index 9e6dddb632c8c6ec841221c3398d20e76b3e10c8..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Dapps/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './dapps';
diff --git a/js/src/views/Home/News/index.js b/js/src/views/Home/News/index.js
deleted file mode 100644
index 437e53a6e95bf2a18ce219d89116464a61e908c1..0000000000000000000000000000000000000000
--- a/js/src/views/Home/News/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './news';
diff --git a/js/src/views/Home/News/news.css b/js/src/views/Home/News/news.css
deleted file mode 100644
index f6a19affa2488c4e0b56ae20369913f645f73e84..0000000000000000000000000000000000000000
--- a/js/src/views/Home/News/news.css
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.news {
-}
-
-.markdown {
-  line-height: 1.2em;
-}
-
-.item {
-  height: 240px;
-  opacity: 0.85;
-  position: relative;
-  width: 100%;
-
-  .background {
-    background-repeat: no-repeat;
-    background-position: 50% 50%;
-    background-size: cover;
-    bottom: 0;
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    width: auto;
-  }
-
-  .overlay {
-    background: white;
-    color: #333;
-    display: none;
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: 100%;
-    padding: 0 1.5em 1em 1.5em;
-  }
-
-  .title {
-    background: rgba(255, 255, 255, 0.85);
-    bottom: 0;
-    color: #333;
-    font-size: 1.17em;
-    left: 0;
-    padding: 1rem 1.5rem;
-    position: absolute;
-    right: 0;
-    text-transform: uppercase;
-  }
-
-  &:hover {
-    opacity: 1;
-
-    .overlay {
-      display: block;
-    }
-  }
-}
diff --git a/js/src/views/Home/News/news.js b/js/src/views/Home/News/news.js
deleted file mode 100644
index 8af395a6b71ff75178159f4781e50eae73220594..0000000000000000000000000000000000000000
--- a/js/src/views/Home/News/news.js
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component } from 'react';
-import ReactMarkdown from 'react-markdown';
-
-import { SectionList } from '~/ui';
-
-import { createRenderers } from './renderers';
-import Store from './store';
-import styles from './news.css';
-
-const VERSION_ID = '1';
-
-@observer
-export default class News extends Component {
-  store = Store.get();
-
-  componentWillMount () {
-    return this.store.retrieveNews(VERSION_ID);
-  }
-
-  render () {
-    const { newsItems } = this.store;
-
-    if (!newsItems || !newsItems.length) {
-      return null;
-    }
-
-    return (
-      <SectionList
-        className={ styles.news }
-        items={ newsItems }
-        renderItem={ this.renderItem }
-      />
-    );
-  }
-
-  renderItem = (item) => {
-    if (!item) {
-      return null;
-    }
-
-    const inlineStyles = item.style || {};
-
-    return (
-      <div className={ styles.item }>
-        <div
-          className={ styles.background }
-          style={ {
-            backgroundImage: `url(${item.background})`
-          } }
-        />
-        <div
-          className={ styles.title }
-          style={ inlineStyles.head }
-        >
-          { item.title }
-        </div>
-        <div
-          className={ styles.overlay }
-          style={ inlineStyles.body }
-        >
-          <ReactMarkdown
-            className={ styles.markdown }
-            renderers={ createRenderers(inlineStyles.tags) }
-            source={ item.markdown }
-            softBreak='br'
-          />
-        </div>
-      </div>
-    );
-  }
-}
-
-export {
-  VERSION_ID
-};
diff --git a/js/src/views/Home/News/news.spec.js b/js/src/views/Home/News/news.spec.js
deleted file mode 100644
index 6da5c2919f5a87a7cb748e7b649ee4e4d469eb1e..0000000000000000000000000000000000000000
--- a/js/src/views/Home/News/news.spec.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import News from './news';
-import { restoreGlobals, stubGlobals } from './news.test.js';
-
-let component;
-let instance;
-
-function render () {
-  component = shallow(
-    <News />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Home/News', () => {
-  beforeEach(() => {
-    stubGlobals();
-    render();
-
-    return instance.componentWillMount();
-  });
-
-  afterEach(() => {
-    restoreGlobals();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('retrieves the content meta on mount', () => {
-    expect(instance.store.newsItems).to.equal('testContent');
-  });
-});
diff --git a/js/src/views/Home/News/news.test.js b/js/src/views/Home/News/news.test.js
deleted file mode 100644
index 4b45502a78b0f2741d3e7eee6a3116435be1b85b..0000000000000000000000000000000000000000
--- a/js/src/views/Home/News/news.test.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Contracts from '~/contracts';
-
-import { VERSION_ID } from './news';
-
-let contracts;
-let globalContractsGet;
-let globalFetch;
-
-export function stubGlobals () {
-  contracts = {
-    githubHint: {
-      getEntry: sinon.stub().resolves(['testUrl', 'testOwner', 'testCommit'])
-    },
-    registry: {
-      lookupMeta: sinon.stub().resolves('testMeta')
-    }
-  };
-
-  globalContractsGet = Contracts.get;
-  globalFetch = global.fetch;
-
-  sinon.stub(Contracts, 'get', () => contracts);
-  sinon.stub(global, 'fetch').resolves({
-    ok: true,
-    json: sinon.stub().resolves({
-      [VERSION_ID]: {
-        items: 'testContent'
-      }
-    })
-  });
-}
-
-export function restoreGlobals () {
-  Contracts.get = globalContractsGet;
-  global.fetch = globalFetch;
-}
diff --git a/js/src/views/Home/News/renderers.js b/js/src/views/Home/News/renderers.js
deleted file mode 100644
index fde4760296980f0597b3f7c1d396279b5352912b..0000000000000000000000000000000000000000
--- a/js/src/views/Home/News/renderers.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createElement } from 'react';
-
-export function createRenderers (tagStyles = {}) {
-  return Object
-    .keys(tagStyles)
-    .reduce((renderers, tag) => {
-      switch (tag) {
-        case 'a':
-        case 'link':
-          renderers['link'] = (mdProps) => {
-            const { children, href, title } = mdProps;
-            const style = tagStyles[tag];
-
-            return createElement('a', { href, title, style }, children);
-          };
-          break;
-      }
-
-      return renderers;
-    }, {});
-}
diff --git a/js/src/views/Home/News/store.js b/js/src/views/Home/News/store.js
deleted file mode 100644
index dd07d3b80b0be08e8a3ebe2d62ef7ab0303391db..0000000000000000000000000000000000000000
--- a/js/src/views/Home/News/store.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable } from 'mobx';
-import Contracts from '~/contracts';
-
-let instance = null;
-
-export default class Store {
-  @observable newsItems = null;
-
-  @action setNewsItems = (newsItems) => {
-    this.newsItems = newsItems;
-  }
-
-  retrieveNews (versionId) {
-    const contracts = Contracts.get();
-
-    return contracts.registry
-      .lookupMeta('paritynews', 'CONTENT')
-      .then((contentId) => {
-        return contracts.githubHint.getEntry(contentId);
-      })
-      .then(([url, owner, commit]) => {
-        if (!url) {
-          return null;
-        }
-
-        return fetch(url).then((response) => {
-          if (!response.ok) {
-            return null;
-          }
-
-          return response.json();
-        });
-      })
-      .then((news) => {
-        if (news && news[versionId]) {
-          this.setNewsItems(news[versionId].items);
-        }
-      })
-      .catch((error) => {
-        console.warn('retrieveNews', error);
-      });
-  }
-
-  static get () {
-    if (!instance) {
-      instance = new Store();
-    }
-
-    return instance;
-  }
-}
diff --git a/js/src/views/Home/News/store.spec.js b/js/src/views/Home/News/store.spec.js
deleted file mode 100644
index 6e77e0ee8800671405a8bdae9afcb18123c5a1b1..0000000000000000000000000000000000000000
--- a/js/src/views/Home/News/store.spec.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { VERSION_ID } from './news';
-import { restoreGlobals, stubGlobals } from './news.test.js';
-import Store from './store';
-
-let store;
-
-function create () {
-  store = new Store();
-
-  return store;
-}
-
-describe('views/Home/News/Store', () => {
-  beforeEach(() => {
-    stubGlobals();
-    create();
-  });
-
-  afterEach(() => {
-    restoreGlobals();
-  });
-
-  describe('@action', () => {
-    describe('setNewsItems', () => {
-      it('sets the items', () => {
-        store.setNewsItems('testing');
-        expect(store.newsItems).to.equal('testing');
-      });
-    });
-  });
-
-  describe('operations', () => {
-    describe('retrieveNews', () => {
-      it('retrieves the items', () => {
-        return store.retrieveNews(VERSION_ID).then(() => {
-          expect(store.newsItems).to.equal('testContent');
-        });
-      });
-    });
-  });
-});
diff --git a/js/src/views/Home/Urls/index.js b/js/src/views/Home/Urls/index.js
deleted file mode 100644
index d28700edbff13e2b28328b4fefc45097f6c7b62b..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Urls/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './urls';
diff --git a/js/src/views/Home/Urls/urls.css b/js/src/views/Home/Urls/urls.css
deleted file mode 100644
index 81d3e8dc259654b137ba87c05d71bf44f90cd65e..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Urls/urls.css
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.urls {
-  text-align: center;
-
-  .layout {
-    box-sizing: border-box;
-    margin: 1.5em auto;
-    padding: 0 1em;
-    width: 50%;
-
-    .empty {
-      margin-top: 0.5em;
-      opacity: 0.75;
-    }
-
-    .historyItem {
-      height: auto;
-      margin-top: 1em;
-      position: relative;
-      width: 100%;
-
-      .linkIcon {
-        opacity: 0;
-        position: absolute;
-        right: 0.5em;
-        top: 0.5em;
-      }
-
-      .url {
-        display: block;
-        color: rgb(0, 151, 167);
-        overflow: hidden;
-        text-overflow: ellipsis;
-        cursor: pointer;
-      }
-
-      .timestamp {
-        color: #aaa;
-        font-size: 0.75em;
-        line-height: 1em;
-        padding-top: 0.5rem;
-      }
-
-      &:hover {
-        opacity: 1;
-
-        .linkIcon {
-          opacity: 1;
-        }
-      }
-    }
-
-    .input {
-      background: rgba(255, 255, 255, 0.25);
-      border: 1px solid rgba(255, 255, 255, 0.5);
-      border-radius: 0.25em;
-      box-sizing: border-box;
-      color: white;
-      display: block;
-      font-size: 1.25em;
-      padding: 0.5em;
-      width: 100%;
-    }
-  }
-}
diff --git a/js/src/views/Home/Urls/urls.js b/js/src/views/Home/Urls/urls.js
deleted file mode 100644
index acf4ae36fa4f269e79a3205fdcaa7ebfc70ee38f..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Urls/urls.js
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Container, ContainerTitle, DappUrlInput, SectionList } from '~/ui';
-import { LinkIcon } from '~/ui/Icons';
-
-import styles from './urls.css';
-
-@observer
-export default class Urls extends Component {
-  static contextTypes = {
-    router: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    extensionStore: PropTypes.object.isRequired,
-    store: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { nextUrl } = this.props.store;
-
-    return (
-      <div className={ styles.urls }>
-        <div className={ styles.layout }>
-          <ContainerTitle
-            title={
-              <FormattedMessage
-                id='home.url.title'
-                defaultMessage='Web Applications'
-              />
-            }
-          />
-          <DappUrlInput
-            className={ styles.input }
-            onChange={ this.onChangeUrl }
-            onGoto={ this.onGotoUrl }
-            onRestore={ this.onRestoreUrl }
-            url={ nextUrl }
-          />
-          { this.renderHistory() }
-        </div>
-      </div>
-    );
-  }
-
-  renderHistory () {
-    const { history } = this.props.store;
-
-    if (!history.length) {
-      return (
-        <div className={ styles.empty }>
-          <FormattedMessage
-            id='home.url.none'
-            defaultMessage='No recent URL history available'
-          />
-        </div>
-      );
-    }
-
-    return (
-      <SectionList
-        items={ history }
-        renderItem={ this.renderHistoryItem }
-      />
-    );
-  }
-
-  renderHistoryItem = (history) => {
-    if (!history || !history.url) {
-      return null;
-    }
-
-    const onNavigate = () => this.onGotoUrl(history.url);
-
-    return (
-      <Container
-        className={ styles.historyItem }
-        hover={
-          <div className={ styles.timestamp }>
-            <FormattedMessage
-              id='home.url.visited'
-              defaultMessage='visited {when}'
-              values={ {
-                when: moment(history.timestamp).fromNow()
-              } }
-            />
-          </div>
-        }
-        key={ history.timestamp }
-        onClick={ onNavigate }
-      >
-        <LinkIcon className={ styles.linkIcon } />
-        <div className={ styles.url }>
-          { history.hostname }
-        </div>
-      </Container>
-    );
-  }
-
-  onChangeUrl = (url) => {
-    this.props.store.setNextUrl(url);
-  }
-
-  onGotoUrl = (url) => {
-    const { router } = this.context;
-    const { extensionStore } = this.props;
-
-    this.props.store.gotoUrl(url);
-
-    if (extensionStore.hasExtension) {
-      window.open(url, '_blank');
-    } else {
-      router.push('/web');
-    }
-  }
-
-  onRestoreUrl = () => {
-    this.props.store.restoreUrl();
-  }
-}
diff --git a/js/src/views/Home/Urls/urls.spec.js b/js/src/views/Home/Urls/urls.spec.js
deleted file mode 100644
index 6c1438fe0bba2b487e9f7f36fe215dcbd0e4b801..0000000000000000000000000000000000000000
--- a/js/src/views/Home/Urls/urls.spec.js
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import Urls from './';
-
-const NEXT_URL = 'http://somewhere.next';
-
-let component;
-let instance;
-let router;
-let store;
-
-function createRouter () {
-  router = {
-    push: sinon.stub()
-  };
-
-  return router;
-}
-
-function createStore () {
-  store = {
-    history: [],
-    gotoUrl: sinon.stub(),
-    restoreUrl: sinon.stub(),
-    setNextUrl: sinon.stub(),
-    nextUrl: NEXT_URL
-  };
-
-  return store;
-}
-
-function render () {
-  component = shallow(
-    <Urls
-      extensionStore={ { hasExtension: false } }
-      store={ createStore() }
-    />,
-    {
-      context: {
-        router: createRouter()
-      }
-    }
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Home/Urls', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('input', () => {
-    let input;
-
-    beforeEach(() => {
-      input = component.find('DappUrlInput');
-    });
-
-    it('renders the input cmponent', () => {
-      expect(input.length).to.equal(1);
-    });
-
-    it('passes nextUrl as url', () => {
-      expect(input.props().url).to.equal(NEXT_URL);
-    });
-  });
-
-  describe('events', () => {
-    describe('onChangeUrl', () => {
-      it('performs setNextUrl on store', () => {
-        instance.onChangeUrl('123');
-        expect(store.setNextUrl).to.have.been.calledWith('123');
-      });
-    });
-
-    describe('onGotoUrl', () => {
-      it('performs gotoUrl on store', () => {
-        instance.onGotoUrl();
-        expect(store.gotoUrl).to.have.been.called;
-      });
-
-      it('passed the URL when provided', () => {
-        instance.onGotoUrl('http://example.com');
-        expect(store.gotoUrl).to.have.been.calledWith('http://example.com');
-      });
-
-      it('does route navigation when executed', () => {
-        instance.onGotoUrl();
-        expect(router.push).to.have.been.calledWith('/web');
-      });
-    });
-
-    describe('onRestoreUrl', () => {
-      it('performs restoreUrl on store', () => {
-        instance.onRestoreUrl();
-        expect(store.restoreUrl).to.have.been.called;
-      });
-    });
-  });
-});
diff --git a/js/src/views/Home/home.css b/js/src/views/Home/home.css
deleted file mode 100644
index c607e4993be782389d17852af702d4d30ace2d70..0000000000000000000000000000000000000000
--- a/js/src/views/Home/home.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.accounts {
-  margin-top: 1.5em;
-}
-
-.body {
-  padding-bottom: 3em;
-}
-
-.empty {
-  margin-top: 1.5em;
-  opacity: 0.5;
-}
-
-.row {
-  display: flex;
-
-  .column {
-    box-sizing: border-box;
-    flex: 0 1 50%;
-    padding: 0 1.5em;
-    width: 50%;
-  }
-}
diff --git a/js/src/views/Home/home.js b/js/src/views/Home/home.js
deleted file mode 100644
index 964681aa64459ced923a4122826944c8fe947c15..0000000000000000000000000000000000000000
--- a/js/src/views/Home/home.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
-
-import HistoryStore from '~/mobx/historyStore';
-import { Page } from '~/ui';
-
-import DappsStore from '../Dapps/dappsStore';
-import ExtensionStore from '../Application/Extension/store';
-import WebStore from '../Web/store';
-
-import Accounts from './Accounts';
-import Dapps from './Dapps';
-import News from './News';
-import Urls from './Urls';
-import styles from './home.css';
-
-@observer
-class Home extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    availability: PropTypes.string.isRequired
-  };
-
-  dappsStore = DappsStore.get(this.context.api);
-  extensionStore = ExtensionStore.get();
-  webStore = WebStore.get(this.context.api);
-
-  accountsHistory = HistoryStore.get('accounts');
-  dappsHistory = HistoryStore.get('dapps');
-
-  componentWillMount () {
-    return this.webStore.loadHistory();
-  }
-
-  render () {
-    const urls = this.props.availability !== 'personal' ? null : (
-      <Urls
-        extensionStore={ this.extensionStore }
-        store={ this.webStore }
-      />
-    );
-
-    return (
-      <Page
-        className={ styles.body }
-        title={
-          <FormattedMessage
-            id='home.title'
-            defaultMessage='Parity Home'
-          />
-        }
-      >
-        <News />
-        { urls }
-        <div className={ styles.row }>
-          <div className={ styles.column }>
-            <Dapps
-              history={ this.dappsHistory.history }
-              store={ this.dappsStore }
-            />
-          </div>
-          <div className={ styles.column }>
-            <Accounts history={ this.accountsHistory.history } />
-          </div>
-        </div>
-      </Page>
-    );
-  }
-}
-
-function mapStateToProps (initState) {
-  return (state) => {
-    const { availability = 'unknown' } = state.nodeStatus.nodeKind || {};
-
-    return { availability };
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(Home);
diff --git a/js/src/views/Home/home.spec.js b/js/src/views/Home/home.spec.js
deleted file mode 100644
index 9d7b82ef5c6573ff425e9614a91e7319dd2ac83e..0000000000000000000000000000000000000000
--- a/js/src/views/Home/home.spec.js
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import Home from './';
-
-const TEST_APP_HISTORY = [];
-
-let api;
-let component;
-let instance;
-let store;
-
-function createStore () {
-  store = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        nodeStatus: {
-          nodeKind: {
-            'availability': 'personal'
-          }
-        }
-      };
-    }
-  };
-
-  return store;
-}
-
-function createApi () {
-  api = {
-    parity: {
-      listRecentDapps: sinon.stub().resolves(TEST_APP_HISTORY)
-    }
-  };
-
-  return api;
-}
-
-function render () {
-  component = shallow(
-    <Home />,
-    {
-      context: {
-        store: createStore()
-      }
-    }
-  ).find('Home').shallow({
-    context: {
-      api: createApi()
-    }
-  });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Home', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('lifecycle', () => {
-    describe('componentWillMount', () => {
-      beforeEach(() => {
-        sinon.stub(instance.webStore, 'loadHistory');
-        return instance.componentWillMount();
-      });
-
-      afterEach(() => {
-        instance.webStore.loadHistory.restore();
-      });
-
-      it('calls into webStore loadHistory', () => {
-        expect(instance.webStore.loadHistory).to.have.been.called;
-      });
-    });
-  });
-
-  describe('components', () => {
-    it('renders Accounts', () => {
-      expect(component.find('Connect(Accounts)').length).to.equal(1);
-    });
-
-    it('renders Dapps', () => {
-      expect(component.find('Dapps').length).to.equal(1);
-    });
-
-    it('renders News', () => {
-      expect(component.find('News').length).to.equal(1);
-    });
-
-    it('renders Urls', () => {
-      expect(component.find('Urls').length).to.equal(1);
-    });
-  });
-});
diff --git a/js/src/views/Home/index.js b/js/src/views/Home/index.js
deleted file mode 100644
index 12e31704a71ccc566a951a2b525222c843396816..0000000000000000000000000000000000000000
--- a/js/src/views/Home/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './home';
diff --git a/js/src/views/ParityBar/accountStore.js b/js/src/views/ParityBar/accountStore.js
deleted file mode 100644
index 3d4dbae9cf7868abee08d6a68674f40a23e6b50a..0000000000000000000000000000000000000000
--- a/js/src/views/ParityBar/accountStore.js
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable, transaction } from 'mobx';
-
-export default class AccountStore {
-  @observable accounts = [];
-  @observable defaultAccount = null;
-  @observable isLoading = false;
-
-  constructor (api) {
-    this._api = api;
-
-    this.loadDefaultAccount()
-      .then(() => this.loadAccounts());
-
-    this.subscribeDefaultAccount();
-  }
-
-  @action setAccounts = (accounts) => {
-    this.accounts = accounts;
-  }
-
-  @action setDefaultAccount = (defaultAccount) => {
-    transaction(() => {
-      this.accounts = this.accounts.map((account) => {
-        account.checked = account.address === defaultAccount;
-
-        return account;
-      });
-
-      this.defaultAccount = defaultAccount;
-    });
-  }
-
-  @action setLoading = (isLoading) => {
-    this.isLoading = isLoading;
-  }
-
-  makeDefaultAccount = (defaultAddress) => {
-    this.setDefaultAccount(defaultAddress);
-
-    return this._api.parity
-      .setNewDappsDefaultAddress(defaultAddress)
-      .catch((error) => {
-        console.warn('makeDefaultAccount', error);
-      });
-  }
-
-  loadDefaultAccount () {
-    return this._api.parity
-      .defaultAccount()
-      .then((address) => this.setDefaultAccount(address));
-  }
-
-  loadAccounts () {
-    this.setLoading(true);
-
-    return Promise
-      .all([
-        this._api.parity.getNewDappsAddresses(),
-        this._api.parity.allAccountsInfo()
-      ])
-      .then(([whitelist, allAccounts]) => {
-        transaction(() => {
-          const accounts = Object
-            .keys(allAccounts)
-            .filter((address) => {
-              const account = allAccounts[address];
-              const isAccount = account.uuid;
-              const isExternal = account.meta && (account.meta.external || account.meta.hardware);
-              const isWhitelisted = !whitelist || whitelist.includes(address);
-
-              return (isAccount || isExternal) && isWhitelisted;
-            })
-            .map((address) => {
-              return {
-                ...allAccounts[address],
-                checked: address === this.defaultAccount,
-                address
-              };
-            });
-
-          this.setLoading(false);
-          this.setAccounts(accounts);
-        });
-      })
-      .catch((error) => {
-        this.setLoading(false);
-        console.warn('loadAccounts', error);
-      });
-  }
-
-  subscribeDefaultAccount () {
-    const promiseDefaultAccount = this._api.subscribe('parity_defaultAccount', (error, defaultAccount) => {
-      if (!error) {
-        this.setDefaultAccount(defaultAccount);
-      }
-    });
-
-    const promiseEthAccounts = this._api.subscribe('eth_accounts', (error) => {
-      if (!error) {
-        this.loadAccounts();
-      }
-    });
-
-    const promiseAccountsInfo = this._api
-      .subscribe('parity_allAccountsInfo', (error, accountsInfo) => {
-        if (!error) {
-          this.loadAccounts();
-        }
-      });
-
-    return Promise.all([ promiseDefaultAccount, promiseEthAccounts, promiseAccountsInfo ]);
-  }
-}
diff --git a/js/src/views/ParityBar/accountStore.spec.js b/js/src/views/ParityBar/accountStore.spec.js
deleted file mode 100644
index 16cebf9e12bd6e73d5d2d2498c139229f5fe248d..0000000000000000000000000000000000000000
--- a/js/src/views/ParityBar/accountStore.spec.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import AccountStore from './accountStore';
-
-import { ACCOUNT_DEFAULT, ACCOUNT_NEW, createApi } from './parityBar.test.js';
-
-let api;
-let store;
-
-function create () {
-  api = createApi();
-  store = new AccountStore(api);
-
-  return store;
-}
-
-describe('views/ParityBar/AccountStore', () => {
-  beforeEach(() => {
-    create();
-  });
-
-  describe('constructor', () => {
-    it('subscribes to defaultAccount', () => {
-      expect(api.subscribe).to.have.been.calledWith('parity_defaultAccount');
-    });
-  });
-
-  describe('@action', () => {
-    describe('setAccounts', () => {
-      it('sets the accounts', () => {
-        store.setAccounts('testing');
-        expect(store.accounts).to.equal('testing');
-      });
-    });
-
-    describe('setDefaultAccount', () => {
-      it('sets the default account', () => {
-        store.setDefaultAccount('testing');
-        expect(store.defaultAccount).to.equal('testing');
-      });
-    });
-
-    describe('setLoading', () => {
-      it('sets the loading status', () => {
-        store.setLoading('testing');
-        expect(store.isLoading).to.equal('testing');
-      });
-    });
-  });
-
-  describe('operations', () => {
-    describe('loadAccounts', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setAccounts');
-
-        return store.loadAccounts();
-      });
-
-      afterEach(() => {
-        store.setAccounts.restore();
-      });
-
-      it('calls into parity_getNewDappsAddresses', () => {
-        expect(api.parity.getNewDappsAddresses).to.have.been.called;
-      });
-
-      it('calls into parity_allAccountsInfo', () => {
-        expect(api.parity.allAccountsInfo).to.have.been.called;
-      });
-
-      it('sets the accounts', () => {
-        expect(store.setAccounts).to.have.been.called;
-      });
-    });
-
-    describe('loadDefaultAccount', () => {
-      beforeEach(() => {
-        return store.loadDefaultAccount();
-      });
-
-      it('load and set the default account', () => {
-        expect(store.defaultAccount).to.equal(ACCOUNT_DEFAULT);
-      });
-    });
-
-    describe('makeDefaultAccount', () => {
-      beforeEach(() => {
-        return store.makeDefaultAccount(ACCOUNT_NEW);
-      });
-
-      it('calls into parity_setNewDappsDefaultAddress', () => {
-        expect(api.parity.setNewDappsDefaultAddress).to.have.been.calledWith(ACCOUNT_NEW);
-      });
-    });
-  });
-});
diff --git a/js/src/views/ParityBar/index.js b/js/src/views/ParityBar/index.js
deleted file mode 100644
index 64367ba6eebdadf2a32a56eff9ebe35fe3c105e7..0000000000000000000000000000000000000000
--- a/js/src/views/ParityBar/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './parityBar';
diff --git a/js/src/views/ParityBar/parityBar.css b/js/src/views/ParityBar/parityBar.css
deleted file mode 100644
index 11ebce07321c3f64c0c81dbc4366bc8abe116d5e..0000000000000000000000000000000000000000
--- a/js/src/views/ParityBar/parityBar.css
+++ /dev/null
@@ -1,267 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$overlayZ: 10000;
-$modalZ: 10001;
-
-.account {
-  width: 100%;
-
-  .selected,
-  .unselected {
-    margin: 0.125em 0;
-
-    &:focus {
-      outline: none;
-    }
-  }
-
-  .unselected {
-    background: rgba(0, 0, 0, 0.4) !important;
-  }
-
-  .selected {
-    background: rgba(255, 255, 255, 0.35) !important;
-  }
-}
-
-.container {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-}
-
-.overlay {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background: rgba(255, 255, 255, 0.5);
-  z-index: $overlayZ;
-  user-select: none;
-}
-
-.bar,
-.expanded {
-  position: fixed;
-  font-size: 16px;
-  font-family: 'Roboto', sans-serif;
-  z-index: $modalZ;
-  user-select: none;
-}
-
-.bar {
-  vertical-align: middle;
-  display: flex;
-  flex-wrap: wrap;
-  width: 100%;
-  top: 0;
-  left: 0;
-
-  &.moving {
-    bottom: 0;
-    right: 0;
-
-    &:hover {
-      cursor: move;
-    }
-  }
-}
-
-.parityBg {
-  position: fixed;
-  transition-property: left, top, right, bottom;
-  transition-duration: 0.25s;
-  transition-timing-function: ease;
-
-  &.moving {
-    transition-duration: 0.05s;
-    transition-timing-function: ease-in-out;
-  }
-}
-
-.accountsSection {
-  padding: 0 1em;
-  width: 920px;
-}
-
-.expanded {
-  border-radius: 4px 4px 0 0;
-  display: flex;
-  flex-direction: row;
-  min-height: 30vh;
-  max-height: 80vh;
-  max-width: calc(100vw - 2em);
-  width: 960px;
-
-  .content {
-    flex: 1;
-    overflow: auto;
-    display: flex;
-    background: rgba(0, 0, 0, 0.8);
-    max-width: calc(100vw - 2em);
-  }
-}
-
-.corner {
-  border-radius: 4px 4px 0 0;
-}
-
-.cornercolor {
-  background: rgba(0, 0, 0, 0.5);
-  padding: 0.5em 1em;
-  display: flex;
-  align-items: center;
-}
-
-.link {
-  white-space: nowrap;
-  border: none;
-  outline: none !important;
-  color: white !important;
-  display: inline-block;
-
-  img,
-  svg {
-    height: 24px !important;
-    width: 24px !important;
-    margin: 2px 0.5em 0 0;
-  }
-}
-
-.link+.link {
-  margin-left: 1em;
-}
-
-.button,
-.iconButton,
-.parityButton {
-  overflow: visible !important;
-}
-
-.parityButton img {
-  width: auto !important;
-  height: 24px;
-}
-
-.button svg {
-  fill: white !important;
-}
-
-.iconButton {
-  min-width: 2em !important;
-
-  img {
-    margin: 6px 0.5em 0;
-  }
-}
-
-.label {
-  position: relative;
-  display: inline-block;
-  vertical-align: top;
-}
-
-.labelText {
-  text-transform: uppercase;
-  vertical-align: top;
-}
-
-.labelBubble {
-  position: absolute;
-  top: 0;
-  right: -10px;
-}
-
-.header {
-  height: 2em;
-  padding: 0.5em 1em;
-  background: rgba(0, 0, 0, 0.25);
-  margin-bottom: 0;
-
-  &::after {
-    clear: both;
-  }
-}
-
-.header,
-.corner {
-  button {
-    color: white !important;
-  }
-
-  svg {
-    fill: white !important;
-  }
-}
-
-.body {
-  padding: 1em;
-}
-
-.title {
-  float: left;
-}
-
-.actions {
-  float: right;
-  margin-top: -2px;
-
-  div {
-    margin-left: 1em;
-    display: inline-block;
-    cursor: pointer;
-  }
-}
-
-.parityIcon,
-.signerIcon {
-  width: 24px;
-  height: 24px;
-  vertical-align: middle;
-  margin-left: 12px;
-}
-
-.moveIcon {
-  display: flex;
-  align-items: center;
-
-  &:hover {
-    cursor: move;
-  }
-}
-
-.dragButton {
-  width: 1em;
-  height: 1em;
-  margin-left: 0.5em;
-  background-color: white;
-  opacity: 0.25;
-  border-radius: 50%;
-  transition-property: opacity;
-  transition-duration: 0.1s;
-  transition-timing-function: ease-in-out;
-
-  &:hover {
-    opacity: 0.5;
-  }
-
-  &.moving {
-    opacity: 0.75;
-  }
-}
diff --git a/js/src/views/ParityBar/parityBar.js b/js/src/views/ParityBar/parityBar.js
deleted file mode 100644
index f6ae8d48e8f18bc9e12caf8efc3d2cc80fa9824d..0000000000000000000000000000000000000000
--- a/js/src/views/ParityBar/parityBar.js
+++ /dev/null
@@ -1,721 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { throttle } from 'lodash';
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import ReactDOM from 'react-dom';
-import { FormattedMessage } from 'react-intl';
-import { Link } from 'react-router';
-import { connect } from 'react-redux';
-import store from 'store';
-
-import imagesEthcoreBlock from '~/../assets/images/parity-logo-white-no-text.svg';
-import { AccountCard, Badge, Button, ContainerTitle, IdentityIcon, ParityBackground, SelectionList, StatusIndicator } from '~/ui';
-import { CancelIcon, FingerprintIcon } from '~/ui/Icons';
-import DappsStore from '~/views/Dapps/dappsStore';
-import { Embedded as Signer } from '~/views/Signer';
-
-import AccountStore from './accountStore';
-import styles from './parityBar.css';
-
-const LS_STORE_KEY = '_parity::parityBar';
-const DEFAULT_POSITION = { right: '1em', bottom: 0 };
-const DISPLAY_ACCOUNTS = 'accounts';
-const DISPLAY_SIGNER = 'signer';
-
-@observer
-class ParityBar extends Component {
-  app = null;
-  measures = null;
-  moving = false;
-
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    dapp: PropTypes.bool,
-    externalLink: PropTypes.string,
-    pending: PropTypes.array,
-    health: PropTypes.object
-  };
-
-  state = {
-    displayType: DISPLAY_SIGNER,
-    moving: false,
-    opened: false,
-    position: DEFAULT_POSITION
-  };
-
-  constructor (props) {
-    super(props);
-
-    this.debouncedMouseMove = throttle(
-      this._onMouseMove,
-      40,
-      { leading: true, trailing: true }
-    );
-  }
-
-  componentWillMount () {
-    const { api } = this.context;
-
-    this.accountStore = new AccountStore(api);
-
-    // Hook to the dapp loaded event to position the
-    // Parity Bar accordingly
-    const dappsStore = DappsStore.get(api);
-
-    dappsStore
-      .on('loaded', (app) => {
-        this.app = app;
-
-        if (this.props.dapp) {
-          this.loadPosition();
-        }
-      });
-
-    if (this.props.dapp) {
-      this.loadPosition();
-    }
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const count = this.props.pending.length;
-    const newCount = nextProps.pending.length;
-
-    // Replace to default position when leaving a dapp
-    if (this.props.dapp && !nextProps.dapp) {
-      this.loadPosition(true);
-    }
-
-    // Load position when dapp loads
-    if (!this.props.dapp && nextProps.dapp) {
-      this.loadPosition();
-    }
-
-    if (count === newCount) {
-      return;
-    }
-
-    if (count < newCount) {
-      this.setOpened(true, DISPLAY_SIGNER);
-    } else if (newCount === 0 && count === 1) {
-      this.setOpened(false);
-    }
-  }
-
-  setOpened (opened, displayType = DISPLAY_SIGNER) {
-    this.setState({ displayType, opened });
-    this.dispatchOpenEvent(opened);
-  }
-
-  dispatchOpenEvent (opened) {
-    if (!this.bar) {
-      return;
-    }
-
-    // Fire up custom even to support having parity bar iframed.
-    const event = new CustomEvent('parity.bar.visibility', {
-      bubbles: true,
-      detail: { opened }
-    });
-
-    this.bar.dispatchEvent(event);
-  }
-
-  onRef = (element) => {
-    this.bar = element;
-  }
-
-  render () {
-    const { moving, opened, position } = this.state;
-
-    const containerClassNames = opened
-      ? [ styles.overlay ]
-      : [ styles.bar ];
-
-    if (!opened && moving) {
-      containerClassNames.push(styles.moving);
-    }
-
-    const parityBgClassNames = [
-      opened
-        ? styles.expanded
-        : styles.corner,
-      styles.parityBg
-    ];
-
-    if (moving) {
-      parityBgClassNames.push(styles.moving);
-    }
-
-    const parityBgStyle = {
-      ...position
-    };
-
-    // Open the Signer at one of the four corners
-    // of the screen
-    if (opened) {
-      // Set at top or bottom of the screen
-      if (position.top !== undefined) {
-        parityBgStyle.top = 0;
-      } else {
-        parityBgStyle.bottom = 0;
-      }
-
-      // Set at left or right of the screen
-      if (position.left !== undefined) {
-        parityBgStyle.left = '1em';
-      } else {
-        parityBgStyle.right = '1em';
-      }
-    }
-
-    return (
-      <div
-        className={ containerClassNames.join(' ') }
-        onMouseEnter={ this.onMouseEnter }
-        onMouseLeave={ this.onMouseLeave }
-        onMouseMove={ this.onMouseMove }
-        onMouseUp={ this.onMouseUp }
-        ref={ this.onRef }
-      >
-        <ParityBackground
-          className={ parityBgClassNames.join(' ') }
-          ref='container'
-          style={ parityBgStyle }
-        >
-          {
-            opened
-              ? this.renderExpanded()
-              : this.renderBar()
-          }
-        </ParityBackground>
-      </div>
-    );
-  }
-
-  renderBar () {
-    const { dapp, health } = this.props;
-
-    if (!dapp) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.cornercolor }>
-        <StatusIndicator
-          type='signal'
-          id='paritybar.health'
-          status={ health.overall.status }
-          title={ health.overall.message }
-          tooltipPlacement='right'
-        />
-        <Button
-          className={ styles.iconButton }
-          icon={
-            <IdentityIcon
-              address={ this.accountStore.defaultAccount }
-              button
-              center
-              inline
-            />
-          }
-          onClick={ this.toggleAccountsDisplay }
-        />
-        {
-          this.renderLink(
-            <Button
-              className={ styles.parityButton }
-              icon={
-                <img
-                  className={ styles.parityIcon }
-                  src={ imagesEthcoreBlock }
-                />
-              }
-              label={
-                this.renderLabel(
-                  <FormattedMessage
-                    id='parityBar.label.parity'
-                    defaultMessage='Parity'
-                  />
-                )
-              }
-            />
-          )
-        }
-        <Button
-          className={ styles.button }
-          icon={ <FingerprintIcon /> }
-          label={ this.renderSignerLabel() }
-          onClick={ this.toggleSignerDisplay }
-        />
-        { this.renderDrag() }
-      </div>
-    );
-  }
-
-  renderDrag () {
-    const dragButtonClasses = [ styles.dragButton ];
-
-    if (this.state.moving) {
-      dragButtonClasses.push(styles.moving);
-    }
-
-    return (
-      <div
-        className={ styles.moveIcon }
-        onMouseDown={ this.onMouseDown }
-      >
-        <div
-          className={ dragButtonClasses.join(' ') }
-          ref='dragButton'
-        />
-      </div>
-    );
-  }
-
-  renderLink (button) {
-    const { externalLink } = this.props;
-
-    if (!externalLink) {
-      return (
-        <Link to='/apps'>
-          { button }
-        </Link>
-      );
-    }
-
-    return (
-      <a
-        href={ externalLink }
-        target='_parent'
-      >
-        { button }
-      </a>
-    );
-  }
-
-  renderExpanded () {
-    const { externalLink } = this.props;
-    const { displayType } = this.state;
-
-    return (
-      <div className={ styles.container }>
-        <div className={ styles.header }>
-          <div className={ styles.title }>
-            <ContainerTitle
-              title={
-                displayType === DISPLAY_ACCOUNTS
-                  ? (
-                    <FormattedMessage
-                      id='parityBar.title.accounts'
-                      defaultMessage='Default Account'
-                    />
-                  )
-                  : (
-                    <FormattedMessage
-                      id='parityBar.title.signer'
-                      defaultMessage='Parity Signer: Pending'
-                    />
-                  )
-              }
-            />
-          </div>
-          <div className={ styles.actions }>
-            <Button
-              icon={ <CancelIcon /> }
-              label={
-                <FormattedMessage
-                  id='parityBar.button.close'
-                  defaultMessage='Close'
-                />
-              }
-              onClick={ this.toggleSignerDisplay }
-            />
-          </div>
-        </div>
-        <div className={ styles.content }>
-          {
-            displayType === DISPLAY_ACCOUNTS
-              ? (
-                <SelectionList
-                  className={ styles.accountsSection }
-                  items={ this.accountStore.accounts }
-                  noStretch
-                  onSelectClick={ this.onMakeDefault }
-                  renderItem={ this.renderAccount }
-                />
-              )
-              : (
-                <Signer externalLink={ externalLink } />
-              )
-          }
-        </div>
-      </div>
-    );
-  }
-
-  onMakeDefault = (account) => {
-    this.toggleAccountsDisplay();
-
-    return this.accountStore
-      .makeDefaultAccount(account.address)
-      .then(() => this.accountStore.loadAccounts());
-  }
-
-  renderAccount = (account) => {
-    return (
-      <AccountCard
-        account={ account }
-      />
-    );
-  }
-
-  renderLabel (name, bubble) {
-    return (
-      <div className={ styles.label }>
-        <div className={ styles.labelText }>
-          { name }
-        </div>
-        { bubble }
-      </div>
-    );
-  }
-
-  renderSignerLabel () {
-    const { pending } = this.props;
-    let bubble = null;
-
-    if (pending && pending.length) {
-      bubble = (
-        <Badge
-          color='red'
-          className={ styles.labelBubble }
-          value={ pending.length }
-        />
-      );
-    }
-
-    return this.renderLabel(
-      <FormattedMessage
-        id='parityBar.label.signer'
-        defaultMessage='Signer'
-      />,
-      bubble
-    );
-  }
-
-  getHorizontal (x) {
-    const { page, button, container } = this.measures;
-
-    const left = x - button.offset.left;
-    const centerX = left + container.width / 2;
-
-    // left part of the screen
-    if (centerX < page.width / 2) {
-      return { left: Math.max(0, left) };
-    }
-
-    const right = page.width - x - button.offset.right;
-
-    return { right: Math.max(0, right) };
-  }
-
-  getVertical (y) {
-    const STICKY_SIZE = 75;
-    const { page, button, container } = this.measures;
-
-    const top = y - button.offset.top;
-    const centerY = top + container.height / 2;
-
-    // top part of the screen
-    if (centerY < page.height / 2) {
-      // Add Sticky edges
-      const stickyTop = top < STICKY_SIZE
-        ? 0
-        : top;
-
-      return { top: Math.max(0, stickyTop) };
-    }
-
-    const bottom = page.height - y - button.offset.bottom;
-    // Add Sticky edges
-    const stickyBottom = bottom < STICKY_SIZE
-      ? 0
-      : bottom;
-
-    return { bottom: Math.max(0, stickyBottom) };
-  }
-
-  getPosition (x, y) {
-    if (!this.moving || !this.measures) {
-      return {};
-    }
-
-    const horizontal = this.getHorizontal(x);
-    const vertical = this.getVertical(y);
-
-    const position = {
-      ...horizontal,
-      ...vertical
-    };
-
-    return position;
-  }
-
-  onMouseDown = () => {
-    // Dispatch an open event in case in an iframe (get full w and h)
-    this.dispatchOpenEvent(true);
-
-    window.setTimeout(() => {
-      const containerElt = ReactDOM.findDOMNode(this.refs.container);
-      const dragButtonElt = ReactDOM.findDOMNode(this.refs.dragButton);
-
-      if (!containerElt || !dragButtonElt) {
-        console.warn(containerElt ? 'drag button' : 'container', 'not found...');
-        return;
-      }
-
-      const bodyRect = document.body.getBoundingClientRect();
-      const containerRect = containerElt.getBoundingClientRect();
-      const buttonRect = dragButtonElt.getBoundingClientRect();
-
-      const buttonOffset = {
-        top: (buttonRect.top + buttonRect.height / 2) - containerRect.top,
-        left: (buttonRect.left + buttonRect.width / 2) - containerRect.left
-      };
-
-      buttonOffset.bottom = containerRect.height - buttonOffset.top;
-      buttonOffset.right = containerRect.width - buttonOffset.left;
-
-      const button = {
-        offset: buttonOffset,
-        height: buttonRect.height,
-        width: buttonRect.width
-      };
-
-      const container = {
-        height: containerRect.height,
-        width: containerRect.width
-      };
-
-      const page = {
-        height: bodyRect.height,
-        width: bodyRect.width
-      };
-
-      this.moving = true;
-      this.measures = {
-        button,
-        container,
-        page
-      };
-
-      this.setMovingState(true);
-    }, 50);
-  }
-
-  onMouseEnter = (event) => {
-    if (!this.moving) {
-      return;
-    }
-
-    const { buttons } = event;
-
-    // If no left-click, stop move
-    if (buttons !== 1) {
-      this.onMouseUp(event);
-    }
-  }
-
-  onMouseLeave = (event) => {
-    if (!this.moving) {
-      return;
-    }
-
-    event.stopPropagation();
-    event.preventDefault();
-  }
-
-  onMouseMove = (event) => {
-    const { pageX, pageY } = event;
-
-    // this._onMouseMove({ pageX, pageY });
-    this.debouncedMouseMove({ pageX, pageY });
-
-    event.stopPropagation();
-    event.preventDefault();
-  }
-
-  _onMouseMove = (event) => {
-    if (!this.moving) {
-      return;
-    }
-
-    const { pageX, pageY } = event;
-    const position = this.getPosition(pageX, pageY);
-
-    this.setState({ position });
-  }
-
-  onMouseUp = (event) => {
-    if (!this.moving) {
-      return;
-    }
-
-    const { pageX, pageY } = event;
-    const position = this.getPosition(pageX, pageY);
-
-    // Stick to bottom or top
-    if (position.top !== undefined) {
-      position.top = 0;
-    } else {
-      position.bottom = 0;
-    }
-
-    // Stick to bottom or top
-    if (position.left !== undefined) {
-      position.left = '1em';
-    } else {
-      position.right = '1em';
-    }
-
-    this.moving = false;
-    this.setMovingState(false, { position });
-    this.savePosition(position);
-  }
-
-  toggleAccountsDisplay = () => {
-    const { opened } = this.state;
-
-    this.setOpened(!opened, DISPLAY_ACCOUNTS);
-  }
-
-  toggleSignerDisplay = () => {
-    const { opened } = this.state;
-
-    this.setOpened(!opened, DISPLAY_SIGNER);
-  }
-
-  get config () {
-    const config = store.get(LS_STORE_KEY);
-
-    if (typeof config === 'string') {
-      try {
-        return JSON.parse(config);
-      } catch (e) {
-        return {};
-      }
-    }
-
-    return config || {};
-  }
-
-  /**
-   * Return the config key for the current view.
-   * If inside a dapp, should be the dapp id.
-   * Otherwise, try to get the current hostname.
-   */
-  getConfigKey () {
-    const { app } = this;
-
-    if (app && app.id) {
-      return app.id;
-    }
-
-    return window.location.hostname;
-  }
-
-  loadPosition (loadDefault = false) {
-    if (loadDefault) {
-      return this.setState({ position: DEFAULT_POSITION });
-    }
-
-    const { app, config } = this;
-    const configKey = this.getConfigKey();
-
-    if (config[configKey]) {
-      return this.setState({ position: config[configKey] });
-    }
-
-    if (app && app.position) {
-      const position = this.stringToPosition(app.position);
-
-      return this.setState({ position });
-    }
-
-    return this.setState({ position: DEFAULT_POSITION });
-  }
-
-  savePosition (position) {
-    const { config } = this;
-    const configKey = this.getConfigKey();
-
-    config[configKey] = position;
-    store.set(LS_STORE_KEY, config);
-  }
-
-  stringToPosition (value) {
-    switch (value) {
-      case 'top-left':
-        return {
-          left: '1em',
-          top: 0
-        };
-
-      case 'top-right':
-        return {
-          right: '1em',
-          top: 0
-        };
-
-      case 'bottom-left':
-        return {
-          bottom: 0,
-          left: '1em'
-        };
-
-      case 'bottom-right':
-      default:
-        return DEFAULT_POSITION;
-    }
-  }
-
-  setMovingState (moving, extras = {}) {
-    this.setState({ moving, ...extras });
-
-    // Trigger an open event if it's moving
-    this.dispatchOpenEvent(moving);
-  }
-}
-
-function mapStateToProps (state) {
-  const { pending } = state.signer;
-  const { health } = state.nodeStatus;
-
-  return {
-    pending,
-    health
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(ParityBar);
diff --git a/js/src/views/ParityBar/parityBar.spec.js b/js/src/views/ParityBar/parityBar.spec.js
deleted file mode 100644
index 4840b70bba0ac5232894c2dd528aed7b4c63d64f..0000000000000000000000000000000000000000
--- a/js/src/views/ParityBar/parityBar.spec.js
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import ParityBar from './';
-
-import { createApi } from './parityBar.test.js';
-
-let api;
-let component;
-let instance;
-let store;
-
-function createRedux (state = {}) {
-  store = {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => Object.assign({
-      balances: {
-        balances: {}
-      },
-      signer: {
-        pending: []
-      },
-      nodeStatus: {
-        health: {
-          overall: {
-            status: 'ok',
-            message: []
-          }
-        }
-      }
-    }, state)
-  };
-
-  return store;
-}
-
-function render (props = {}, state = {}) {
-  api = createApi();
-  component = shallow(
-    <ParityBar { ...props } />,
-    {
-      context: {
-        store: createRedux(state)
-      }
-    }
-  ).find('ParityBar').shallow({ context: { api } });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/ParityBar', () => {
-  beforeEach(() => {
-    render({ dapp: true });
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('includes the ParityBackground', () => {
-    expect(component.find('Connect(ParityBackground)')).to.have.length(1);
-  });
-
-  describe('renderBar', () => {
-    let bar;
-
-    beforeEach(() => {
-      bar = shallow(instance.renderBar());
-    });
-
-    it('renders nothing when not overlaying a dapp', () => {
-      render({ dapp: false });
-      expect(instance.renderBar()).to.be.null;
-    });
-
-    it('renders when overlaying a dapp', () => {
-      expect(bar.find('div')).not.to.have.length(0);
-    });
-
-    it('renders the Account selector button', () => {
-      const icon = bar.find('Button').first().props().icon;
-
-      expect(icon.type.displayName).to.equal('Connect(IdentityIcon)');
-    });
-
-    it('renders the Parity button', () => {
-      const label = shallow(bar.find('Button').at(1).props().label);
-
-      expect(label.find('FormattedMessage').props().id).to.equal('parityBar.label.parity');
-    });
-
-    it('renders the Signer button', () => {
-      const label = shallow(bar.find('Button').last().props().label);
-
-      expect(label.find('FormattedMessage').props().id).to.equal('parityBar.label.signer');
-    });
-  });
-
-  describe('renderExpanded', () => {
-    let expanded;
-
-    beforeEach(() => {
-      expanded = shallow(instance.renderExpanded());
-    });
-
-    it('includes the Signer', () => {
-      expect(expanded.find('Connect(Embedded)')).to.have.length(1);
-    });
-  });
-
-  describe('renderLabel', () => {
-    it('renders the label name', () => {
-      expect(shallow(instance.renderLabel('testing', null)).text()).to.equal('testing');
-    });
-
-    it('renders name and bubble', () => {
-      expect(shallow(instance.renderLabel('testing', '(bubble)')).text()).to.equal('testing(bubble)');
-    });
-  });
-
-  describe('renderSignerLabel', () => {
-    let label;
-
-    beforeEach(() => {
-      label = shallow(instance.renderSignerLabel());
-    });
-
-    it('renders the signer label', () => {
-      expect(label.find('FormattedMessage').props().id).to.equal('parityBar.label.signer');
-    });
-
-    it('does not render a badge when no pending requests', () => {
-      expect(label.find('Badge')).to.have.length(0);
-    });
-
-    it('renders a badge when pending requests', () => {
-      render({}, { signer: { pending: ['123', '456'] } });
-      expect(shallow(instance.renderSignerLabel()).find('Badge').props().value).to.equal(2);
-    });
-  });
-
-  describe('opened state', () => {
-    beforeEach(() => {
-      sinon.spy(instance, 'renderBar');
-      sinon.spy(instance, 'renderExpanded');
-    });
-
-    afterEach(() => {
-      instance.renderBar.restore();
-      instance.renderExpanded.restore();
-    });
-
-    it('renders the bar on with opened === false', () => {
-      expect(component.find('Link[to="/apps"]')).to.have.length(1);
-    });
-
-    it('renders expanded with opened === true', () => {
-      expect(instance.renderExpanded).not.to.have.been.called;
-      instance.setState({ opened: true });
-      expect(instance.renderExpanded).to.have.been.called;
-    });
-  });
-});
diff --git a/js/src/views/ParityBar/parityBar.test.js b/js/src/views/ParityBar/parityBar.test.js
deleted file mode 100644
index f390424e19542c4e561c207d2d5fd469e95e3695..0000000000000000000000000000000000000000
--- a/js/src/views/ParityBar/parityBar.test.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-const ACCOUNT_DEFAULT = '0x2345678901';
-const ACCOUNT_FIRST = '0x1234567890';
-const ACCOUNT_NEW = '0x0987654321';
-const ACCOUNTS = {
-  [ACCOUNT_FIRST]: { uuid: 123 },
-  [ACCOUNT_DEFAULT]: { uuid: 234 },
-  '0x3456789012': {},
-  [ACCOUNT_NEW]: { uuid: 456 }
-};
-
-function createApi () {
-  const api = {
-    subscribe: (params, callback) => {
-      callback(null, ACCOUNT_DEFAULT);
-
-      return Promise.resolve(1);
-    },
-    parity: {
-      defaultAccount: sinon.stub().resolves(ACCOUNT_DEFAULT),
-      allAccountsInfo: sinon.stub().resolves(ACCOUNTS),
-      getNewDappsAddresses: sinon.stub().resolves(null),
-      setNewDappsAddresses: sinon.stub().resolves(true),
-      setNewDappsDefaultAddress: sinon.stub().resolves(true)
-    }
-  };
-
-  sinon.spy(api, 'subscribe');
-
-  return api;
-}
-
-export {
-  ACCOUNT_DEFAULT,
-  ACCOUNT_FIRST,
-  ACCOUNT_NEW,
-  ACCOUNTS,
-  createApi
-};
diff --git a/js/src/views/RpcCalls/actions/localstorage.js b/js/src/views/RpcCalls/actions/localstorage.js
deleted file mode 100644
index 258159105582616a4b29a097943def355c30e8a5..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/actions/localstorage.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createAction } from 'redux-actions';
-
-export const syncRpcStateFromLocalStorage = createAction('sync rpcStateFromLocalStorage');
diff --git a/js/src/views/RpcCalls/actions/logger.js b/js/src/views/RpcCalls/actions/logger.js
deleted file mode 100644
index e8f8556e1a6888684d11484a32dfba7ec6d25987..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/actions/logger.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createAction } from 'redux-actions';
-
-import { identity } from '../util';
-import { withError } from '~/redux/util';
-
-export const updateLogging = createAction(
-  'update logging', identity, withError(flag => `logging updated to ${flag}`)
-);
diff --git a/js/src/views/RpcCalls/actions/rpc.js b/js/src/views/RpcCalls/actions/rpc.js
deleted file mode 100644
index 1c6f5a169ac73df97e1427e1d98d7c314c5f44b7..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/actions/rpc.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { createAction } from 'redux-actions';
-
-import { identity } from '../util';
-import { withError } from '~/redux/util';
-
-export const error = createAction('error rpc', identity,
-  withError(() => 'error processing rpc call. check console for details', 'error')
-);
-export const fireRpc = createAction('fire rpc');
-export const addRpcReponse = createAction('add rpcResponse');
-export const selectRpcMethod = createAction('select rpcMethod');
-export const resetRpcPrevCalls = createAction('reset rpcPrevCalls');
diff --git a/js/src/views/RpcCalls/components/AutoComplete/AutoComplete.js b/js/src/views/RpcCalls/components/AutoComplete/AutoComplete.js
deleted file mode 100644
index 6584f34a55341c304e0b6431caffc8996b354719..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/AutoComplete/AutoComplete.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import AutoComplete from 'material-ui/AutoComplete';
-
-export default class WrappedAutoComplete extends Component {
-  render () {
-    return (
-      <AutoComplete { ...this.props } />
-    );
-  }
-
-  static defaultProps = {
-    openOnFocus: true,
-    filter: (searchText, key) => searchText === '' || key.toLowerCase().indexOf(searchText.toLowerCase()) !== -1
-  }
-
-  static propTypes = {
-    dataSource: PropTypes.array.isRequired,
-    filter: PropTypes.func,
-    name: PropTypes.string.isRequired,
-    openOnFocus: PropTypes.bool
-  }
-
-  static contextTypes = {
-    muiTheme: PropTypes.object.isRequired
-  }
-}
diff --git a/js/src/views/RpcCalls/components/AutoComplete/AutoComplete.spec.js b/js/src/views/RpcCalls/components/AutoComplete/AutoComplete.spec.js
deleted file mode 100644
index 87bc9a1e82053ede5d3422a12080deb0a9f45b60..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/AutoComplete/AutoComplete.spec.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import getMuiTheme from 'material-ui/styles/getMuiTheme';
-
-import WrappedAutoComplete from './AutoComplete';
-
-describe('views/Status/components/AutoComplete', () => {
-  describe('rendering', () => {
-    let rendered;
-
-    beforeEach(() => {
-      const dataSource = ['abc', 'def', 'ghi'];
-      const component =
-        <WrappedAutoComplete
-          dataSource={ dataSource }
-          name='testComponent'
-        />;
-
-      rendered = shallow(component, { context: { muiTheme: getMuiTheme({}) } });
-    });
-
-    it('renders the material AutoComplete component', () => {
-      expect(rendered).to.be.ok;
-      expect(rendered).to.have.exactly(1).descendants('AutoComplete');
-    });
-  });
-});
diff --git a/js/src/views/RpcCalls/components/AutoComplete/index.js b/js/src/views/RpcCalls/components/AutoComplete/index.js
deleted file mode 100644
index d84245ff669fdb5b9baf363092642bf830f63497..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/AutoComplete/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './AutoComplete';
diff --git a/js/src/views/RpcCalls/components/Box/Box.js b/js/src/views/RpcCalls/components/Box/Box.js
deleted file mode 100644
index 1d6f525d2c7adc876a3a40e27be26efe8ed2f1d8..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Box/Box.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-export default class Box extends Component {
-  renderValue () {
-    if (!this.props.value) {
-      return;
-    }
-
-    return (
-      <h1>{ this.props.value }</h1>
-    );
-  }
-
-  render () {
-    return (
-      <div className='dapp-box'>
-        <h2>{ this.props.title }</h2>
-        { this.renderValue() }
-        { this.props.children }
-      </div>
-    );
-  }
-
-  static propTypes = {
-    title: PropTypes.string.isRequired,
-    value: PropTypes.string,
-    children: PropTypes.element
-  }
-}
diff --git a/js/src/views/RpcCalls/components/Box/Box.spec.js b/js/src/views/RpcCalls/components/Box/Box.spec.js
deleted file mode 100644
index 34154425c5da17f8b17087cfc85c3ae7b5d7e51e..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Box/Box.spec.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import Box from './Box';
-
-describe('views/Status/components/Box', () => {
-  describe('rendering', () => {
-    const title = 'test title';
-    let rendered;
-
-    beforeEach(() => {
-      rendered = shallow(<Box title={ title } />);
-    });
-
-    it('renders the component', () => {
-      expect(rendered).to.be.ok;
-      expect(rendered).to.have.className('dapp-box');
-    });
-
-    it('renders the title', () => {
-      expect(rendered.find('h2')).to.have.text(title);
-    });
-
-    it('renders no default value', () => {
-      expect(rendered).to.not.have.descendants('h1');
-    });
-  });
-
-  describe('contents', () => {
-    const value = 'test value';
-    const child = 'this is the child value';
-
-    let rendered;
-
-    beforeEach(() => {
-      rendered = shallow(
-        <Box
-          title='title'
-          value={ value }
-        >
-          <pre>{ child }</pre>
-        </Box>
-      );
-    });
-
-    it('renders the value', () => {
-      expect(rendered.find('h1')).to.have.text(value);
-    });
-
-    it('wraps the children', () => {
-      expect(rendered.find('pre')).to.have.text(child);
-    });
-  });
-});
diff --git a/js/src/views/RpcCalls/components/Box/index.js b/js/src/views/RpcCalls/components/Box/index.js
deleted file mode 100644
index 35e9da0cbbc21265611e190b1747b654e4c50f6b..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Box/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './Box';
diff --git a/js/src/views/RpcCalls/components/Call/Call.css b/js/src/views/RpcCalls/components/Call/Call.css
deleted file mode 100644
index 8dcf36e9e5c2fdd243d32565f3e9b89382fb8f50..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Call/Call.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.call {
-  position: relative;
-  border-bottom: 2px solid #CCC6C6;
-  margin-bottom: 18.4px;
-  background: #f5f4f2;
-}
-
-.call:first-child {
-  border-color: #6691C2;
-}
-
-.call pre {
-  margin: 0;
-}
-
-.call pre:nth-child(3) {
-  padding-top: 0;
-  color: #bbb;
-}
-
-.callNo {
-  float: right;
-  color: #ccc;
-}
diff --git a/js/src/views/RpcCalls/components/Call/Call.js b/js/src/views/RpcCalls/components/Call/Call.js
deleted file mode 100644
index 52a120fec292c562510160edd2904222e90951d0..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Call/Call.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import Response from '../Response';
-import styles from './Call.css';
-
-export default class Call extends Component {
-  render () {
-    let { callNo, name, params, response } = this.props.call;
-
-    params = this.formatParams(params);
-    return (
-      <div
-        onMouseEnter={ this.setActiveCall }
-        ref={ this.setElement }
-        className={ styles.call }
-        { ...this._test(`call-${callNo}`) }
-      >
-        <span className={ styles.callNo } { ...this._test('callNo') }>#{ callNo }</span>
-        <pre { ...this._test('name') }>{ name }({ params })</pre>
-        <Response response={ response } />
-      </div>
-    );
-  }
-
-  setElement = el => {
-    this.element = el;
-  }
-
-  setActiveCall = () => {
-    this.props.setActiveCall(this.props.call, this.element);
-  }
-
-  formatParams (params) {
-    return params.reduce((str, p) => {
-      if (str !== '') {
-        str += ', ';
-      }
-      if (p === undefined) {
-        return str;
-      }
-      if (typeof p === 'object' || typeof p === 'string') {
-        p = JSON.stringify(p);
-      }
-      return str + p;
-    }, '');
-  }
-
-  static propTypes = {
-    call: PropTypes.object.isRequired,
-    setActiveCall: PropTypes.func.isRequired
-  }
-}
diff --git a/js/src/views/RpcCalls/components/Call/Call.spec.js b/js/src/views/RpcCalls/components/Call/Call.spec.js
deleted file mode 100644
index af7e633e652b5ad635fc061811c8ddeb30fd0a71..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Call/Call.spec.js
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-import sinon from 'sinon';
-
-import '../../../../environment/tests';
-
-import Call from './Call';
-
-describe('views/Status/components/Call', () => {
-  const call = { callIdx: 123, callNo: 456, name: 'eth_call', params: [{ name: '123' }], response: '' };
-  const element = 'dummyElement';
-
-  let rendered;
-  let instance;
-  let setActiveCall = sinon.stub();
-
-  beforeEach(() => {
-    rendered = shallow(
-      <Call
-        call={ call }
-        setActiveCall={ setActiveCall }
-      />
-    );
-    instance = rendered.instance();
-  });
-
-  describe('rendering', () => {
-    it('renders the component', () => {
-      expect(rendered).to.be.ok;
-      expect(rendered).to.have.exactly(1).descendants(`div[data-test="Call-call-${call.callNo}"]`);
-    });
-
-    it('adds onMouseEnter to setActiveElement', () => {
-      expect(rendered.find('div').first()).to.have.prop('onMouseEnter', instance.setActiveCall);
-    });
-  });
-
-  describe('actions', () => {
-    it('sets the element via setElement', () => {
-      expect(instance.element).to.not.be.ok;
-      instance.setElement(element);
-      expect(instance.element).to.equal(element);
-    });
-
-    it('calls parent setActive call on setActiveCall', () => {
-      instance.setElement(element);
-      instance.setActiveCall();
-
-      expect(setActiveCall).to.be.calledWith(call, element);
-    });
-  });
-
-  describe('utility', () => {
-    describe('.formatParams', () => {
-      it('correctly returns a single parameter', () => {
-        expect(instance.formatParams([1])).to.equal('1');
-      });
-
-      it('correctly joins 2 parameters', () => {
-        expect(instance.formatParams([1, 2])).to.equal('1, 2');
-      });
-
-      it('stringifies a string object', () => {
-        expect(instance.formatParams(['1'])).to.equal('"1"');
-      });
-
-      it('stringifies an object object', () => {
-        expect(instance.formatParams([{ name: '1' }])).to.equal('{"name":"1"}');
-      });
-
-      it('skips an undefined value', () => {
-        expect(instance.formatParams(['1', undefined, 3])).to.equal('"1", , 3');
-      });
-    });
-  });
-});
diff --git a/js/src/views/RpcCalls/components/Call/index.js b/js/src/views/RpcCalls/components/Call/index.js
deleted file mode 100644
index 0620b46dedbad706d4aebac9ad34e12c03966e3b..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Call/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './Call';
diff --git a/js/src/views/RpcCalls/components/Calls/Calls.css b/js/src/views/RpcCalls/components/Calls/Calls.css
deleted file mode 100644
index 0266579ac84115a0eb2f35ca35c8a352221c0d6e..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Calls/Calls.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.historyInfo {
-  margin-top: 0;
-  text-transform: initial;
-}
-
-.header {
-  margin: 0;
-}
-
-.removeIcon {
-  float: right;
-  color: #bbb;
-  cursor: pointer;
-  transition: opacity ease-in-out 0.2s;
-  transition-delay: 0.2s;
-  opacity: 0;
-}
-
-div:hover > .removeIcon {
-  opacity: 1.0;
-}
-
-.history {
-  margin-top: calc(1em + 18.4px);
-  padding-top: 0;
-  overflow: auto;
-  max-height: 60vh;
-}
diff --git a/js/src/views/RpcCalls/components/Calls/Calls.js b/js/src/views/RpcCalls/components/Calls/Calls.js
deleted file mode 100644
index 3a1023bc6d77cf9efcb1f9453ab415273b5ed195..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Calls/Calls.js
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import Call from '../Call';
-import CallsToolbar from '../CallsToolbar';
-import styles from './Calls.css';
-
-export default class Calls extends Component {
-  state = {
-    activeCall: null,
-    activeChild: null
-  }
-
-  render () {
-    return (
-      <div
-        className='calls-container'
-        onMouseLeave={ this.clearActiveCall }
-        { ...this._test('container') }
-      >
-        { this.renderClear() }
-        <h2 className={ styles.header }>
-          <FormattedMessage
-            id='status.calls.title'
-            defaultMessage='History'
-          />
-        </h2>
-        <div className={ `${styles.history} row` } ref={ this.setCallsHistory }>
-          { this.renderNoCallsMsg() }
-          { this.renderCalls() }
-        </div>
-        <CallsToolbar
-          call={ this.state.activeCall }
-          callEl={ this.state.activeChild }
-          containerEl={ this._callsHistory }
-          actions={ this.props.actions }
-        />
-      </div>
-    );
-  }
-
-  renderClear () {
-    if (!this.props.calls.length) {
-      return;
-    }
-
-    return (
-      <a
-        { ...this._test('remove') }
-        title={
-          <FormattedMessage
-            id='status.calls.clearHistory'
-            defaultMessage='Clear RPC calls history'
-          />
-        }
-        onClick={ this.clearHistory }
-        className={ styles.removeIcon }
-      >
-        <i className='icon-trash' />
-      </a>
-    );
-  }
-
-  renderNoCallsMsg () {
-    if (this.props.calls.length) {
-      return;
-    }
-
-    return (
-      <div { ...this._test('empty-wrapper') }>
-        <h3 className={ styles.historyInfo } { ...this._test('empty') }>
-          <FormattedMessage
-            id='status.calls.rpcResults'
-            defaultMessage='Fire up some calls and the results will be here.'
-          />
-        </h3>
-      </div>
-    );
-  }
-
-  renderCalls () {
-    const { calls } = this.props;
-
-    if (!calls.length) {
-      return;
-    }
-
-    return calls.map((call, idx) => (
-      <Call
-        key={ calls.length - idx }
-        call={ call }
-        setActiveCall={ this.setActiveCall }
-      />
-    ));
-  }
-
-  clearActiveCall = () => {
-    this.setState({ activeCall: null, activeChild: null });
-  }
-
-  setActiveCall = (call, el) => {
-    this.setState({ activeCall: call, activeChild: el });
-  }
-
-  setCallsHistory = el => {
-    this._callsHistory = el;
-  }
-
-  clearHistory = () => {
-    this.props.reset();
-  }
-
-  static propTypes = {
-    calls: PropTypes.arrayOf(PropTypes.object).isRequired,
-    actions: PropTypes.shape({
-      fireRpc: PropTypes.func.isRequired,
-      copyToClipboard: PropTypes.func.isRequired,
-      selectRpcMethod: PropTypes.func.isRequired
-    }).isRequired,
-    reset: PropTypes.func
-  }
-}
diff --git a/js/src/views/RpcCalls/components/Calls/Calls.spec.js b/js/src/views/RpcCalls/components/Calls/Calls.spec.js
deleted file mode 100644
index 4127f65cbebd4e5af05331f3d308acd595992ae9..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Calls/Calls.spec.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import '../../../../environment/tests';
-
-import Calls from './Calls';
-
-describe('views/Status/components/Calls', () => {
-  describe('rendering (no calls)', () => {
-    let rendered;
-
-    before(() => {
-      const calls = [];
-
-      rendered = shallow(<Calls calls={ calls } />);
-    });
-
-    it('renders the component and container', () => {
-      expect(rendered).to.be.ok;
-      expect(rendered).to.have.className('calls-container');
-    });
-
-    it('renders no calls', () => {
-      expect(rendered.find('div[data-test="Calls-empty-wrapper"]')).to.have.exactly(1).descendants('h3');
-    });
-
-    it('renders no clear button', () => {
-      expect(rendered.find('a[data-test="Calls-remove"]')).to.not.exist;
-    });
-
-    it('renders an attached CallsToolbar', () => {
-      expect(rendered).to.have.exactly(1).descendants('CallsToolbar');
-    });
-  });
-
-  describe('rendering (calls supplied)', () => {
-    const calls = [
-      { callNo: 0, name: 'eth_call', params: '', response: '' },
-      { callNo: 1, name: 'eth_sendTransaction', params: '', response: '' }
-    ];
-    const actions = { action1: true, action2: true };
-
-    let rendered;
-    let instance;
-
-    before(() => {
-      rendered = shallow(<Calls calls={ calls } actions={ actions } />);
-      instance = rendered.instance();
-    });
-
-    it('renders the clear button', () => {
-      expect(rendered).to.have.exactly(1).descendants('a[data-test="Calls-remove"]');
-    });
-
-    it('renders calls', () => {
-      expect(rendered.find('div[data-test="Calls-empty-wrapper"]')).to.not.exist;
-      expect(rendered.find('div.row div')).to.have.exactly(2).descendants('Call');
-    });
-
-    it('passes the correct properties to Call', () => {
-      const call = rendered.find('Call').first();
-
-      expect(call).to.have.prop('setActiveCall', instance.setActiveCall);
-      expect(call).to.have.prop('call').deep.equal(calls[0]);
-    });
-
-    it('passes the correct properties to CallsToolbar', () => {
-      const child = { offsetTop: 0 };
-      const container = { scrollTop: 0 };
-
-      instance.setCallsHistory(container);
-      rendered.setState({ activeCall: 'dummyActiveCall', activeChild: child });
-
-      const toolbar = rendered.find('CallsToolbar').first();
-
-      expect(toolbar).to.have.prop('call', 'dummyActiveCall');
-      expect(toolbar).to.have.prop('actions').deep.equal(actions);
-      expect(toolbar).to.have.prop('callEl').deep.equal(child);
-      expect(toolbar).to.have.prop('containerEl').deep.equal(container);
-    });
-  });
-
-  describe('actions', () => {
-    let rendered;
-    let instance;
-
-    before(() => {
-      const calls = [
-        { callNo: 0, name: 'eth_call', params: '', response: '' },
-        { callNo: 1, name: 'eth_sendTransaction', params: '', response: '' }
-      ];
-
-      rendered = shallow(<Calls calls={ calls } />);
-      instance = rendered.instance();
-    });
-
-    it('sets the element via setCallsHistory', () => {
-      instance.setCallsHistory('dummyElement');
-
-      expect(instance._callsHistory).to.equal('dummyElement');
-    });
-
-    it('sets state via setActiveCall', () => {
-      instance.setActiveCall('dummyActiveCall', 'dummyActiveChild');
-
-      expect(rendered).to.have.state('activeCall', 'dummyActiveCall');
-      expect(rendered).to.have.state('activeChild', 'dummyActiveChild');
-    });
-
-    it('clears state via clearActiveCall', () => {
-      instance.setActiveCall('dummyActiveCall', 'dummyActiveChild');
-      expect(rendered).to.have.state('activeCall', 'dummyActiveCall');
-      instance.clearActiveCall();
-
-      expect(rendered).to.have.state('activeCall', null);
-      expect(rendered).to.have.state('activeChild', null);
-    });
-  });
-});
diff --git a/js/src/views/RpcCalls/components/Calls/index.js b/js/src/views/RpcCalls/components/Calls/index.js
deleted file mode 100644
index 4e625ded8fcf99c9cf252f6341d3f09a78f534f9..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Calls/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './Calls';
diff --git a/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.css b/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.css
deleted file mode 100644
index 8c34e1921d983bef0c55759db1b596afba827b94..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.css
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.callActionsWrap {
-  position: absolute;
-  animation: fadein .5s;
-  right: 0;
-  height: 28px;
-}
-
-.callActionsButton {
-  padding: 0 !important;
-  height: 24px !important;
-}
-
-.callActionsWrap:hover .callActionsButton {
-  display: none !important;
-}
-
-.callActions {
-  display: none;
-  height: 100%;
-  margin-top: 1px;
-  margin-right: 10px;
-}
-
-.callActionsWrap:hover .callActions {
-  display: block;
-}
-
-.callAction {
-  float: right;
-  transition: opacity ease-in-out .2s;
-  transition-delay: .2s;
-  opacity: 0;
-  padding: 3px !important;
-  height: 22px !important;
-  width: 22px !important;
-}
-
-.callActions:hover .callAction {
-  opacity: 1;
-}
-
-.callActionIcon {
-  height: 100% !important;
-  width: 100% !important;
-}
-
-@keyframes fadein {
-  from { opacity: 0; }
-  to { opacity: 1; }
-}
diff --git a/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.js b/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.js
deleted file mode 100644
index 618a5de266d647e125889d623e8f6dbc3bd04f2b..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.js
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import CopyToClipboard from 'react-copy-to-clipboard';
-import { FormattedMessage } from 'react-intl';
-import { sortBy, find, extend } from 'lodash';
-
-import IconButton from 'material-ui/IconButton';
-import MoreHorizIcon from 'material-ui/svg-icons/navigation/more-horiz';
-import CallIcon from 'material-ui/svg-icons/communication/call';
-import AssignmentIcon from 'material-ui/svg-icons/action/assignment';
-import InputIcon from 'material-ui/svg-icons/action/input';
-
-import { SCROLLBAR_WIDTH } from '../../constants';
-import styles from './CallsToolbar.css';
-import rpcData from '../../data/rpc.json';
-const rpcMethods = sortBy(rpcData.methods, 'name');
-
-export default class CallsToolbar extends Component {
-  render () {
-    const { call, callEl, containerEl } = this.props;
-
-    if (!call) {
-      return null;
-    }
-
-    const wrapStyle = { top: callEl.offsetTop - SCROLLBAR_WIDTH - containerEl.scrollTop };
-
-    if (this.hasScrollbar(containerEl)) {
-      wrapStyle.right = 13;
-    }
-
-    return (
-      <div
-        className={ styles.callActionsWrap }
-        style={ wrapStyle }
-      >
-        <IconButton
-          className={ styles.callActionsButton }
-          { ...this._test('button-more') }
-        >
-          <MoreHorizIcon />
-        </IconButton>
-        <div className={ styles.callActions } { ...this._test('button-container') }>
-          <IconButton
-            className={ styles.callAction }
-            onTouchTap={ this.setCall }
-            tooltip={
-              <FormattedMessage
-                id='status.callsToolbar.tooltip.set'
-                defaultMessage='Set'
-              />
-            }
-            tooltipPosition='top-left'
-            { ...this._test('button-setCall') }
-          >
-            <InputIcon className={ styles.callActionIcon } />
-          </IconButton>
-          <IconButton
-            className={ styles.callAction }
-            onTouchTap={ this.makeCall }
-            tooltip={
-              <FormattedMessage
-                id='status.callsToolbar.tooltip.fireAgain'
-                defaultMessage='Fire again'
-              />
-            }
-            tooltipPosition='top-left'
-            { ...this._test('button-makeCall') }
-          >
-            <CallIcon className={ styles.callActionIcon } />
-          </IconButton>
-          <CopyToClipboard
-            text={ JSON.stringify(call) }
-            onCopy={ this.copyToClipboard }
-          >
-            <IconButton
-              className={ styles.callAction }
-              tooltip={
-                <FormattedMessage
-                  id='status.callsToolbar.tooltip.copy'
-                  defaultMessage='Copy to clipboard'
-                />
-              }
-              tooltipPosition='top-left'
-              { ...this._test('copyCallToClipboard') }
-            >
-              <AssignmentIcon className={ styles.callActionIcon } />
-            </IconButton>
-          </CopyToClipboard>
-        </div>
-      </div>
-    );
-  }
-
-  setCall = () => {
-    const { call } = this.props;
-    let method = find(rpcMethods, { name: call.name });
-
-    this.props.actions.selectRpcMethod(extend({}, method, { paramsValues: call.params }));
-  }
-
-  makeCall = () => {
-    const { call } = this.props;
-    let method = find(rpcMethods, { name: call.name });
-
-    this.setCall();
-    this.props.actions.fireRpc({
-      method: method.name,
-      outputFormatter: method.outputFormatter,
-      inputFormatters: method.inputFormatters,
-      params: call.params
-    });
-  }
-
-  copyToClipboard = () => {
-    this.props.actions.copyToClipboard(
-      <FormattedMessage
-        id='status.callsToolbar.copied'
-        defaultMessage='method copied to clipboard'
-      />
-    );
-  }
-
-  hasScrollbar (el) {
-    return el.clientHeight < el.scrollHeight;
-  }
-}
-
-CallsToolbar.propTypes = {
-  call: PropTypes.object.isRequired,
-  callEl: PropTypes.node.isRequired,
-  containerEl: PropTypes.node.isRequired,
-  actions: PropTypes.shape({
-    fireRpc: PropTypes.func.isRequired,
-    copyToClipboard: PropTypes.func.isRequired,
-    selectRpcMethod: PropTypes.func.isRequired
-  }).isRequired
-};
diff --git a/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.spec.js b/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.spec.js
deleted file mode 100644
index e326f730efa12d1c6fcacf142b2bc7ffefad17b6..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.spec.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import sinon from 'sinon';
-import { shallow } from 'enzyme';
-
-import '../../../../environment/tests';
-
-import CallsToolbar from './CallsToolbar';
-
-describe('views/Status/components/CallsToolbar', () => {
-  const callEl = { offsetTop: 0 };
-  const containerEl = { scrollTop: 0, clientHeight: 0, scrollHeight: 999 };
-
-  describe('rendering (no call)', () => {
-    let rendered;
-
-    before(() => {
-      const call = null;
-
-      rendered = shallow(<CallsToolbar call={ call } callEl={ callEl } containerEl={ containerEl } />);
-    });
-
-    it('does not render the component', () => {
-      expect(rendered).to.not.have.descendants('[data-test="CallsToolbar-button-more"]');
-    });
-  });
-
-  describe('rendering', () => {
-    const call = { callNo: 456, name: 'eth_call', params: '', response: '' };
-    let rendered;
-    let btncontainer;
-
-    before(() => {
-      rendered = shallow(<CallsToolbar call={ call } callEl={ callEl } containerEl={ containerEl } />);
-      btncontainer = rendered.find('[data-test="CallsToolbar-button-container"]');
-    });
-
-    it('renders the More button', () => {
-      expect(rendered).to.have.descendants('[data-test="CallsToolbar-button-more"]');
-    });
-
-    it('renders the Set button', () => {
-      expect(btncontainer).to.have.descendants('[data-test="CallsToolbar-button-setCall"]');
-    });
-
-    it('renders the Fire button', () => {
-      expect(btncontainer).to.have.descendants('[data-test="CallsToolbar-button-makeCall"]');
-    });
-
-    it('renders the Copy button', () => {
-      expect(btncontainer).to.have.descendants('[data-test="CallsToolbar-copyCallToClipboard"]');
-    });
-  });
-
-  describe('actions', () => {
-    const call = { callNo: 456, name: 'eth_call', params: '', response: '' };
-    const actions = { fireRpc: sinon.stub(), copyToClipboard: sinon.stub(), selectRpcMethod: sinon.stub() };
-
-    let rendered;
-    let instance;
-
-    before(() => {
-      rendered = shallow(<CallsToolbar call={ call } callEl={ callEl } containerEl={ containerEl } actions={ actions } />);
-      instance = rendered.instance();
-    });
-
-    it('calls copyToClipboard with action copyToClipboard', () => {
-      instance.copyToClipboard();
-      expect(actions.copyToClipboard).to.be.calledOnce;
-    });
-
-    it('calls setCall with action selectRpcMethod', () => {
-      instance.setCall();
-      expect(actions.selectRpcMethod).to.be.calledOnce;
-    });
-
-    it('calls makeCall with action fireRpc', () => {
-      instance.makeCall();
-      expect(actions.fireRpc).to.be.calledOnce;
-    });
-  });
-
-  describe('utility', () => {
-    const call = { callNo: 456, name: 'eth_call', params: '', response: '' };
-    let rendered;
-    let instance;
-
-    before(() => {
-      rendered = shallow(<CallsToolbar call={ call } callEl={ callEl } containerEl={ containerEl } />);
-      instance = rendered.instance();
-    });
-
-    describe('.hasScrollbar', () => {
-      it('correctly returns true when scrollbar', () => {
-        expect(instance.hasScrollbar({ clientHeight: 123, scrollHeight: 456 })).to.be.true;
-      });
-
-      it('correctly returns false when no scrollbar', () => {
-        expect(instance.hasScrollbar({ clientHeight: 456, scrollHeight: 123 })).to.be.false;
-      });
-    });
-  });
-});
diff --git a/js/src/views/RpcCalls/components/CallsToolbar/index.js b/js/src/views/RpcCalls/components/CallsToolbar/index.js
deleted file mode 100644
index 1baac06366e92065a72e31537a87e877c7405dd3..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/CallsToolbar/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './CallsToolbar';
diff --git a/js/src/views/RpcCalls/components/EditableValue/EditableValue.css b/js/src/views/RpcCalls/components/EditableValue/EditableValue.css
deleted file mode 100644
index bfa3dc674e0a617484ac9455d7e6e975060e48c4..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/EditableValue/EditableValue.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.input {
-  margin-top: 0;
-  width: 100%;
-  padding-left: 10px;
-  padding-right: 50px;
-}
-
-.icon, .iconSuccess, .firstIcon {
-  display: block;
-  cursor: pointer;
-  flex: 1;
-  margin: 3px 3px;
-  color: #bbb;
-}
-
-.success, .iconSuccess {
-  color: #8bc34a;
-}
-
-.icon i, .iconSuccess i, .firstIcon i {
-  vertical-align: middle;
-}
-
-.icons, .iconsVisible, .firstIcon {
-  z-index: 10;
-  position: absolute;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  display: flex;
-  opacity: 0;
-  transition: opacity ease-in-out .2s;
-  transition-delay: 0.2s;
-}
-
-.iconsVisible {
-  opacity: 1.0;
-}
-
-.container:hover .icons, .container:hover .firstIcon {
-  opacity: 1.0;
-}
-
-.firstIcon {
-  position: absolute;
-  left: -10px;
-  right: auto;
-  top: 0;
-  bottom: 0;
-  margin: 3px 0;
-  display: block;
-}
-
-.autocomplete input {
-  margin-top: 0;
-  padding-left: 10px !important;
-  padding-right: 50px !important;
-}
diff --git a/js/src/views/RpcCalls/components/EditableValue/EditableValue.js b/js/src/views/RpcCalls/components/EditableValue/EditableValue.js
deleted file mode 100644
index 98ad223ca49be5fff346669c8bcffd096a87c0dc..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/EditableValue/EditableValue.js
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import AutoComplete from 'material-ui/AutoComplete';
-
-import styles from './EditableValue.css';
-import valueStyles from '../Value/Value.css';
-
-export default class EditableValue extends Component {
-  state = {
-    value: this.props.value,
-    inEditMode: false
-  }
-
-  componentWillReceiveProps (newProps) {
-    if (newProps.value === this.state.value || this.state.inEditMode) {
-      return;
-    }
-    this.setState({
-      value: newProps.value
-    });
-  }
-
-  onChange = value => {
-    this.setState({
-      value: value
-    });
-  }
-
-  onOpenEdit = evt => {
-    this.setState({
-      inEditMode: true
-    });
-
-    if (!this._input) {
-      return;
-    }
-    this._input.focus();
-  }
-
-  onCancel = evt => {
-    this.setState({
-      inEditMode: false,
-      value: this.props.value
-    });
-  }
-
-  onSubmit = () => {
-    this.setState({
-      inEditMode: false
-    });
-    this.props.onSubmit(this.state.value, false);
-  }
-
-  onResetToDefault = () => {
-    this.props.onSubmit(this.props.defaultValue, true);
-  }
-
-  render () {
-    return (
-      <form
-        className={ `${valueStyles.valueContainer} ${styles.container}` }
-        onSubmit={ this.onSubmit }
-        { ...this._testInherit() }
-      >
-        { this.renderResetButton() }
-        <div className={ this.state.inEditMode ? styles.iconsVisible : styles.icons }>
-          { this.props.children }
-          { this.renderButtons() }
-        </div>
-        { this.renderInput() }
-      </form>
-    );
-  }
-
-  renderInput () {
-    const { inEditMode, value } = this.state;
-
-    const setInput = el => { this._input = el; };
-    const onChange = evt => this.onChange(evt.target.value);
-
-    if (!inEditMode || !this.props.autocomplete) {
-      return (
-        <input
-          className={ inEditMode ? styles.input : valueStyles.value }
-          type='text'
-          value={ value }
-          onClick={ this.onOpenEdit }
-          ref={ setInput }
-          onChange={ onChange }
-          readOnly={ !inEditMode }
-        />
-      );
-    }
-
-    return (
-      <AutoComplete
-        name='EditableValueAutoComplete' // avoid Material Ui warning
-        className={ styles.autocomplete }
-        fullWidth
-        searchText={ value }
-        dataSource={ this.props.dataSource }
-        onUpdateInput={ this.onChange }
-        onNewRequest={ this.onChange }
-        openOnFocus
-        filter={ AutoComplete.noFilter }
-      />
-    );
-  }
-
-  renderResetButton () {
-    if (this.state.inEditMode) {
-      return;
-    }
-
-    if (!this.props.defaultValue || this.state.value === this.props.defaultValue) {
-      return;
-    }
-
-    return (
-      <a
-        key='reset'
-        className={ `${styles.icon} ${styles.firstIcon}` }
-        onClick={ this.onResetToDefault }
-        title={
-          <FormattedMessage
-            id='status.editableValue.reset'
-            defaultMessage='Reset to {defaultVaule}'
-            values={ {
-              defaultVaule: this.props.defaultValue
-            } }
-          />
-        }
-        { ...this._testInherit('reset') }
-      >
-        <i className='icon-anchor' />
-      </a>
-    );
-  }
-
-  renderButtons () {
-    if (this.state.inEditMode) {
-      return [
-        <a
-          key='submit'
-          className={ styles.iconSuccess }
-          onClick={ this.onSubmit }
-          { ...this._testInherit('submit') }
-        >
-          <i className='icon-check' />
-        </a>,
-        <a
-          key='cancel'
-          className={ styles.icon }
-          onClick={ this.onCancel }
-          { ...this._testInherit('cancel') }
-        >
-          <i className='icon-close' />
-        </a>
-      ];
-    }
-
-    return (
-      <a
-        key='edit'
-        className={ styles.icon }
-        onClick={ this.onOpenEdit }
-        title={
-          <FormattedMessage
-            id='status.editableValue.edit'
-            defaultMessage='Edit'
-          />
-        }
-        { ...this._testInherit('edit') }
-      >
-        <i className='icon-pencil' />
-      </a>
-    );
-  }
-
-  static propTypes = {
-    onSubmit: PropTypes.func.isRequired,
-    value: PropTypes.string,
-    defaultValue: PropTypes.string,
-    children: PropTypes.element,
-    autocomplete: PropTypes.bool,
-    dataSource: PropTypes.arrayOf(PropTypes.string)
-  }
-}
diff --git a/js/src/views/RpcCalls/components/EditableValue/index.js b/js/src/views/RpcCalls/components/EditableValue/index.js
deleted file mode 100644
index 480a8772b292af6266844789d1b056c48eac323f..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/EditableValue/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './EditableValue';
diff --git a/js/src/views/RpcCalls/components/JsonEditor/JsonEditor.css b/js/src/views/RpcCalls/components/JsonEditor/JsonEditor.css
deleted file mode 100644
index 87b7e10d9fd4c61cef21c7c0bb45314facf9c340..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/JsonEditor/JsonEditor.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.editor {
-  width: 100%;
-  height: 200px;
-}
-
-.error {
-  border: 1px solid red !important;
-}
-
-.errorMsg {
-  color: red;
-}
diff --git a/js/src/views/RpcCalls/components/JsonEditor/JsonEditor.js b/js/src/views/RpcCalls/components/JsonEditor/JsonEditor.js
deleted file mode 100644
index 75bc59e8715123f79afe8c60ed8726891aadd3a0..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/JsonEditor/JsonEditor.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { isEqual } from 'lodash';
-import formatJson from 'format-json';
-
-import styles from './JsonEditor.css';
-
-export default class JsonEditor extends Component {
-  constructor (...args) {
-    super(...args);
-    let { value } = this.props;
-
-    value = formatJson.plain(value);
-    this.state = { value };
-  }
-
-  componentDidMount () {
-    const mockedEvt = { target: { value: this.state.value } };
-
-    this.onChange(mockedEvt);
-  }
-
-  componentWillReceiveProps (nextProps) {
-    let { value } = nextProps;
-
-    if (!isEqual(value, this.props.value)) {
-      value = formatJson.plain(value);
-      this.setState({ value });
-    }
-  }
-
-  render () {
-    let errorClass = this.state.error ? styles.error : '';
-
-    return (
-      <div className='row'>
-        <textarea
-          onChange={ this.onChange }
-          className={ `${styles.editor} ${errorClass}` }
-          value={ this.state.value }
-        />
-        { this.renderError() }
-      </div>
-    );
-  }
-
-  renderError () {
-    const { error } = this.state;
-
-    if (!error) {
-      return;
-    }
-
-    return (
-      <div className={ styles.errorMsg }>{ error }</div>
-    );
-  }
-
-  onChange = evt => {
-    const { value } = evt.target;
-    let parsed;
-    let error;
-
-    try {
-      parsed = JSON.parse(value);
-      error = null;
-    } catch (err) {
-      parsed = null;
-      error = 'invalid json';
-    }
-
-    this.setState({
-      value,
-      error
-    });
-
-    this.props.onChange(parsed, error);
-  }
-
-  static propTypes = {
-    onChange: PropTypes.func.isRequired,
-    value: PropTypes.object
-  }
-}
diff --git a/js/src/views/RpcCalls/components/JsonEditor/index.js b/js/src/views/RpcCalls/components/JsonEditor/index.js
deleted file mode 100644
index c0c35731e35dab1b4cedbac1985c388ad3a0198d..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/JsonEditor/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './JsonEditor';
diff --git a/js/src/views/RpcCalls/components/Markdown/Markdown.css b/js/src/views/RpcCalls/components/Markdown/Markdown.css
deleted file mode 100644
index 72b1baee6696aee988df3c1cb868ad4752d848df..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Markdown/Markdown.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.container li {
-  display: list-item;
-  line-height: 1.6;
-}
diff --git a/js/src/views/RpcCalls/components/Markdown/Markdown.js b/js/src/views/RpcCalls/components/Markdown/Markdown.js
deleted file mode 100644
index 6d904187b38c5221c74a3f9cad474467badafdbe..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Markdown/Markdown.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import marked from 'marked';
-import React, { Component, PropTypes } from 'react';
-import styles from './Markdown.css';
-
-export default class Marked extends Component {
-  state = {}
-
-  render () {
-    let { parsed } = this.state;
-
-    if (!parsed) {
-      return null;
-    }
-    return <div className={ styles.container } style={ this.props.style } dangerouslySetInnerHTML={ { __html: parsed } } />;
-  }
-
-  componentWillMount () {
-    this.setState({ parsed: this.parse(this.props.val) });
-  }
-
-  componentWillReceiveProps (newProps) {
-    if (newProps.val === this.props.val) {
-      return;
-    }
-    this.setState({ parsed: this.parse(newProps.val) });
-  }
-
-  parse (val) {
-    try {
-      val = marked(val);
-    } catch (err) {
-      console.error(`Marked error when parsing ${val}: ${err}`);
-    }
-    return val;
-  }
-
-  static propTypes = {
-    val: PropTypes.any,
-    style: PropTypes.object
-  }
-}
diff --git a/js/src/views/RpcCalls/components/Markdown/index.js b/js/src/views/RpcCalls/components/Markdown/index.js
deleted file mode 100644
index db702025e00fc196b11b292bfa7c876b7ee16a39..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Markdown/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './Markdown';
diff --git a/js/src/views/RpcCalls/components/Response/Response.css b/js/src/views/RpcCalls/components/Response/Response.css
deleted file mode 100644
index 8aa5889662037d5bf756c13b1d75ecf8d27548b7..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Response/Response.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.response {
-  white-space: nowrap;
-  overflow-x: auto;
-}
diff --git a/js/src/views/RpcCalls/components/Response/Response.js b/js/src/views/RpcCalls/components/Response/Response.js
deleted file mode 100644
index f2cadcad6906933ebc1142b0dd00c31a2519aeff..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Response/Response.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { isArray, isPlainObject } from 'lodash';
-
-import styles from './Response.css';
-
-export default class Response extends Component {
-  render () {
-    let { response } = this.props;
-    let formatted;
-
-    if (isArray(response)) {
-      formatted = this.renderArray();
-    }
-    if (isPlainObject(response)) {
-      formatted = this.renderObject();
-    }
-
-    return <pre className={ styles.response }>{ formatted || response }</pre>;
-  }
-
-  renderArray () {
-    let { response } = this.props;
-
-    return response.map((r, idx) => (
-      <span key={ idx }>
-        { idx === 0 ? '[' : ',' }
-        { idx === 0 ? '' : <br /> }
-        { r }
-        { idx === response.length - 1 ? ']' : '' }
-      </span>
-    ));
-  }
-
-  renderObject () {
-    let { response } = this.props;
-    const arr = JSON.stringify(response, null, 1).split('\n');
-
-    return arr.map((any, idx) => (
-      <span key={ idx }>
-        { any }
-        { idx !== 0 && idx !== arr.length - 1 ? <br /> : '' }
-      </span>
-    ));
-  }
-
-  static propTypes = {
-    response: PropTypes.any.isRequired
-  }
-}
diff --git a/js/src/views/RpcCalls/components/Response/Response.spec.js b/js/src/views/RpcCalls/components/Response/Response.spec.js
deleted file mode 100644
index 467ef3edc8aa2e05aaf00520533c839058aa05f4..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Response/Response.spec.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { shallow } from 'enzyme';
-
-import '../../../../environment/tests';
-
-import Response from './Response';
-
-describe('views/Status/components/Response', () => {
-  describe('rendering', () => {
-    it('renders non-arrays/non-objects exactly as received', () => {
-      const TEST = '1234567890';
-      const rendered = shallow(<Response response={ TEST } />);
-
-      expect(rendered).to.have.html(`<pre>${TEST}</pre>`);
-    });
-
-    it('renders arrays properly with index and value', () => {
-      const TEST = ['123', '456'];
-      const rendered = shallow(<Response response={ TEST } />);
-
-      expect(rendered).to.have.html('<pre><span>[123</span><span>,<br/>456]</span></pre>');
-    });
-
-    it('renders objects properly with key and value', () => {
-      const TEST = { foo: '123', bar: '456' };
-      const rendered = shallow(<Response response={ TEST } />);
-
-      expect(rendered).to.have.html('<pre><span>{</span><span> &quot;foo&quot;: &quot;123&quot;,<br/></span><span> &quot;bar&quot;: &quot;456&quot;<br/></span><span>}</span></pre>');
-    });
-  });
-});
diff --git a/js/src/views/RpcCalls/components/Response/index.js b/js/src/views/RpcCalls/components/Response/index.js
deleted file mode 100644
index 6fb897955018978d6fed13bde3fb6833db769431..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/Response/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './Response';
diff --git a/js/src/views/RpcCalls/components/RpcCalls/RpcCalls.css b/js/src/views/RpcCalls/components/RpcCalls/RpcCalls.css
deleted file mode 100644
index 055ba53d88193ad5306a6fc21cee91524a9ac0c1..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/RpcCalls/RpcCalls.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.header {
-  margin: 0;
-}
-
-.input {
-  width: 100%;
-}
-
-h3 + label > input {
-  margin-top: 0;
-}
-
-.jsonToggle {
-  width: auto !important;
-  float: right;
-}
diff --git a/js/src/views/RpcCalls/components/RpcCalls/RpcCalls.js b/js/src/views/RpcCalls/components/RpcCalls/RpcCalls.js
deleted file mode 100644
index 022c2897514d138a431e123c76a7b7cedeffc85f..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/RpcCalls/RpcCalls.js
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import _ from 'lodash';
-
-import Toggle from 'material-ui/Toggle/Toggle';
-import TextField from 'material-ui/TextField';
-import { RpcAutoComplete } from 'dapps-react-components';
-import { formatRpcMd } from '../../util/rpc-md';
-import AnimateChildren from '../../components-compositors/Animated/children';
-import JsonEditor from '../JsonEditor';
-import Calls from '../Calls';
-import Markdown from '../Markdown';
-import styles from './RpcCalls.css';
-import rpcData from '../../data/rpc.json';
-import RpcNav from '../RpcNav';
-
-const rpcMethods = _.sortBy(rpcData.methods, 'name');
-
-export default class RpcCalls extends Component {
-  state = {};
-
-  componentWillReceiveProps (nextProps) {
-    const { paramsValues, params } = nextProps.rpc.selectedMethod;
-
-    if (paramsValues) {
-      params.map((p, index) => {
-        // todo [adgo] 01.05.2016 - make sure this works
-        // not sure idx is the same for paramsValues and params
-        this.setState({
-          [this.paramKey(p)]: paramsValues[index]
-        });
-      });
-
-      if (this.state.jsonMode) {
-        this.setJsonEditorValue();
-      }
-    }
-  }
-
-  render () {
-    return (
-      <div className='dapp-flex-content'>
-        <main className='dapp-content'>
-          <div className='dapp-container'>
-            <div className='row'>
-              <div className='col col-6'>
-                <h1>
-                  <FormattedMessage
-                    id='status.rpcCalls.requests'
-                    defaultMessage='RPC Requests'
-                  />
-                </h1>
-              </div>
-              <div className='col col-6'>
-                <RpcNav />
-              </div>
-            </div>
-          </div>
-          <div style={ { clear: 'both' } } />
-          <div className='dapp-container'>
-            <div className='row'>
-              <div className='col col-6 mobile-full'>
-                { this.renderForm() }
-              </div>
-              <div className='col col-6 mobile-full'>
-                <Calls
-                  calls={ this.props.rpc.prevCalls }
-                  reset={ this.props.actions.resetRpcPrevCalls }
-                  actions={ this.props.actions }
-                />
-              </div>
-            </div>
-          </div>
-        </main>
-      </div>
-    );
-  }
-
-  renderForm () {
-    return (
-      <div>
-        <Toggle
-          className={ styles.jsonToggle }
-          onToggle={ this.onJsonToggle }
-          label={
-            <FormattedMessage
-              id='status.rpcCalls.json'
-              defaultMessage='JSON'
-            />
-          }
-        />
-        <h2 className={ styles.header }>
-          <label htmlFor='selectedMethod'>
-            <FormattedMessage
-              id='status.rpcCalls.callMethod'
-              defaultMessage='Call Method'
-            />
-          </label>
-        </h2>
-        <AnimateChildren absolute>
-          { this.renderJsonForm() }
-          { this.renderInputForm() }
-        </AnimateChildren>
-      </div>
-    );
-  }
-
-  renderInputForm () {
-    if (this.state.jsonMode) {
-      return;
-    }
-
-    const { returns } = this.props.rpc.selectedMethod;
-
-    return (
-      <div className='row'>
-        { this.renderMethodList() }
-        <h3>
-          <FormattedMessage
-            id='status.rpcCalls.parameters'
-            defaultMessage='Parameters'
-          />
-        </h3>
-        { this.renderInputs() }
-        <h3>
-          <FormattedMessage
-            id='status.rpcCalls.returns'
-            defaultMessage='Returns'
-          />
-        </h3>
-        <Markdown val={ formatRpcMd(returns) } />
-        { this.renderFormButton() }
-      </div>
-    );
-  }
-
-  renderMethodList () {
-    const { desc } = this.props.rpc.selectedMethod;
-
-    return (
-      <div>
-        <RpcAutoComplete
-          style={ { marginTop: 0 } }
-          onNewRequest={ this.handleMethodChange }
-          { ...this._test('rpcAutoComplete') }
-        />
-        <div>
-          <Markdown val={ desc } />
-        </div>
-      </div>
-    );
-  }
-
-  handleMethodChange = name => {
-    const method = rpcMethods.find(m => m.name === name);
-
-    this.props.actions.selectRpcMethod(method);
-  }
-
-  onRpcFire = () => {
-    if (this.state.jsonMode) {
-      return this.onCustomRpcFire();
-    }
-
-    let { name, params, outputFormatter, inputFormatters } = this.props.rpc.selectedMethod;
-
-    params = params.map(this.jsonParamValue);
-
-    this.props.actions.fireRpc({
-      method: name,
-      outputFormatter,
-      inputFormatters,
-      params
-    });
-  }
-
-  onCustomRpcFire () {
-    const { method, params } = this.state.jsonEditorParsedValue;
-
-    this.props.actions.fireRpc({ method, params });
-  }
-
-  renderInputs () {
-    let { params, name } = this.props.rpc.selectedMethod;
-
-    if (!params || !params.length) {
-      return (
-        <FormattedMessage
-          id='status.rpcCalls.none'
-          defaultMessage='none'
-        />
-      );
-    }
-
-    return _.find(rpcMethods, { name })
-            .params.map(
-              p => {
-                const onChange = evt => this.setState({
-                  [this.paramKey(p)]: evt.target.value
-                });
-
-                if (_.isPlainObject(p)) {
-                  return this.renderObjInputs(p);
-                }
-
-                return (
-                  <TextField
-                    key={ p }
-                    inputStyle={ { marginTop: 0 } }
-                    fullWidth
-                    hintText={ p }
-                    title={ p }
-                    hintStyle={ { maxWidth: '100%', overflow: 'hidden', whiteSpace: 'nowrap' } }
-                    value={ this.paramValue(p) }
-                    onChange={ onChange }
-                    { ...this._test(this.paramKey(p)) }
-                  />
-                );
-              }
-            );
-  }
-
-  renderObjInputs (param) {
-    const { description, details } = param;
-
-    return (
-      <div>
-        <Markdown val={ description } />
-        <ul>
-          { Object.keys(details).map(k => {
-            const onChange = evt => this.setState({
-              [this.paramKey(`${description}.${k}`)]: evt.target.value
-            });
-
-            return (
-              <li key={ k }>
-                <TextField
-                  inputStyle={ { marginTop: 0 } }
-                  fullWidth
-                  title={ `${k}: ${details[k]}` }
-                  hintText={ `${k}: ${details[k]}` }
-                  hintStyle={ { maxWidth: '100%', overflow: 'hidden', whiteSpace: 'nowrap' } }
-                  value={ this.paramValue(`${description}.${k}`) }
-                  onChange={ onChange }
-                  { ...this._test(this.paramKey(k)) }
-                />
-              </li>
-            );
-          }) }
-        </ul>
-      </div>
-    );
-  }
-
-  setJsonEditorValue () {
-    const { name, params } = this.props.rpc.selectedMethod;
-    const json = {
-      method: name,
-      params: params.map(this.jsonParamValue)
-    };
-
-    this.setState({
-      jsonEditorValue: json
-    });
-  }
-
-  onJsonToggle = () => {
-    if (!this.state.jsonMode) {
-      this.setJsonEditorValue();
-    }
-    this.setState({ jsonMode: !this.state.jsonMode });
-  }
-
-  renderJsonForm () {
-    if (!this.state.jsonMode) {
-      return;
-    }
-
-    return (
-      <div>
-        <JsonEditor
-          onChange={ this.onJsonEditorChange }
-          value={ this.state.jsonEditorValue }
-        />
-        { this.renderFormButton() }
-      </div>
-    );
-  }
-
-  renderFormButton () {
-    return (
-      <button
-        { ...this._test('fireRpc') }
-        className={ 'dapp-block-button' }
-        disabled={ this.state.jsonEditorError }
-        onClick={ this.onRpcFire }
-      >
-        <FormattedMessage
-          id='status.rpcCalls.fireButton'
-          defaultMessage='Fire'
-        />
-      </button>
-    );
-  }
-
-  onJsonEditorChange = (jsonEditorParsedValue, jsonEditorError) => {
-    this.setState({
-      jsonEditorParsedValue,
-      jsonEditorError
-    });
-  }
-
-  jsonParamValue = p => {
-    if (_.isPlainObject(p)) {
-      const { description, details } = p;
-
-      return Object.keys(details).reduce((obj, key) => {
-        obj[key] = this.paramValue(`${description}.${key}`);
-        return obj;
-      }, {});
-    }
-
-    return this.paramValue(p);
-  }
-
-  paramValue (p) {
-    return this.state[this.paramKey(p)];
-  }
-
-  paramKey (p) {
-    return `params_${p}`;
-  }
-
-  selectedMethodChanged (nextProps) {
-    return nextProps.rpc.selectedMethod.name !== this.props.rpc.selectedMethod.name;
-  }
-
-  stateChanged (nextState) {
-    return !_.isEqual(nextState, this.state);
-  }
-
-  prevCallsChanged (nextProps) {
-    return nextProps.rpc.prevCalls.length !== this.props.rpc.prevCalls.length;
-  }
-
-  static propTypes = {
-    rpc: PropTypes.shape({
-      prevCalls: PropTypes.array.isRequired,
-      selectedMethod: PropTypes.object.isRequired
-    }).isRequired,
-    actions: PropTypes.shape({
-      fireRpc: PropTypes.func.isRequired,
-      selectRpcMethod: PropTypes.func.isRequired,
-      resetRpcPrevCalls: PropTypes.func.isRequired
-    }).isRequired
-  }
-}
diff --git a/js/src/views/RpcCalls/components/RpcCalls/index.js b/js/src/views/RpcCalls/components/RpcCalls/index.js
deleted file mode 100644
index ec656810324592e0d481c4c179d04bd66c8f1bb7..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/RpcCalls/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './RpcCalls';
diff --git a/js/src/views/RpcCalls/components/RpcDocs/RpcDocs.css b/js/src/views/RpcCalls/components/RpcDocs/RpcDocs.css
deleted file mode 100644
index 1a6a41b35fae15ecc28e866b87eabe237aa8ab42..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/RpcDocs/RpcDocs.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.autocomplete {
-  margin-top: 0 !important;
-}
-
-.headline {
-  text-transform: none;
-}
-
-.returnsTitle {
-  display: 'inline';
-}
-
-.returnsDesc {
-  display: inline-block;
-}
-
-hr {
-  margin-bottom: 0;
-}
diff --git a/js/src/views/RpcCalls/components/RpcDocs/RpcDocs.js b/js/src/views/RpcCalls/components/RpcDocs/RpcDocs.js
deleted file mode 100644
index 922346763bdbc5d3efc832c114b1ad105daed8d8..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/RpcDocs/RpcDocs.js
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import ReactDOM from 'react-dom';
-import { FormattedMessage } from 'react-intl';
-import { sortBy } from 'lodash';
-import List from 'material-ui/List/List';
-import ListItem from 'material-ui/List/ListItem';
-import AutoComplete from '../AutoComplete';
-
-import { formatRpcMd } from '../../util/rpc-md';
-import ScrollTopButton from '../ScrollTopButton';
-import styles from './RpcDocs.css';
-import Markdown from '../Markdown';
-import rpcData from '../../data/rpc.json';
-import RpcNav from '../RpcNav';
-
-const rpcMethods = sortBy(rpcData.methods, 'name');
-
-class RpcDocs extends Component {
-  render () {
-    return (
-      <div className='dapp-flex-content'>
-        <main className='dapp-content'>
-          <div className='dapp-container'>
-            <div className='row'>
-              <div className='col col-6'>
-                <h1>
-                  <FormattedMessage
-                    id='status.rpcDocs.title'
-                    defaultMessage='RPC Docs'
-                  />
-                </h1>
-              </div>
-              <div className='col col-6'>
-                <RpcNav />
-              </div>
-            </div>
-          </div>
-          <div style={ { clear: 'both' } } />
-          <div className='dapp-container'>
-            <div className='row'>
-              <div className='col col-12'>
-                <AutoComplete
-                  floatingLabelText={
-                    <FormattedMessage
-                      id='status.rpcDocs.methodName'
-                      defaultMessage='Method name'
-                    />
-                  }
-                  className={ styles.autocomplete }
-                  dataSource={ rpcMethods.map(m => m.name) }
-                  onNewRequest={ this.handleMethodChange }
-                  { ...this._test('autocomplete') }
-                />
-                { this.renderData() }
-              </div>
-            </div>
-          </div>
-          <ScrollTopButton />
-        </main>
-      </div>
-    );
-  }
-
-  renderData () {
-    const methods = rpcMethods.map((m, idx) => {
-      const setMethod = el => { this[`_method-${m.name}`] = el; };
-
-      return (
-        <ListItem
-          key={ m.name }
-          disabled
-          ref={ setMethod }
-        >
-          <h3 className={ styles.headline }>{ m.name }</h3>
-          <Markdown val={ m.desc } />
-          <p>
-            <FormattedMessage
-              id='status.rpcDocs.params'
-              defaultMessage='Params {params}'
-              vaules={ {
-                params: !m.params.length
-                  ? (
-                    <FormattedMessage
-                      id='status.rpcDocs.paramsNone'
-                      defaultMessage=' - none'
-                    />
-                  )
-                  : ''
-              } }
-            />
-          </p>
-          {
-            m.params.map((p, idx) => {
-              return (
-                <Markdown
-                  key={ `${m.name}-${idx}` }
-                  val={ formatRpcMd(p) }
-                />
-              );
-            })
-          }
-          <p className={ styles.returnsTitle }>
-            <FormattedMessage
-              id='status.rpcDocs.returns'
-              defaultMessage='Returns - '
-            />
-          </p>
-          <Markdown className={ styles.returnsDesc } val={ formatRpcMd(m.returns) } />
-          { idx !== rpcMethods.length - 1 ? <hr /> : '' }
-        </ListItem>
-      );
-    });
-
-    return (
-      <List>
-        { methods }
-      </List>
-    );
-  }
-
-  handleMethodChange = name => {
-    ReactDOM.findDOMNode(this[`_method-${name}`]).scrollIntoViewIfNeeded();
-  }
-}
-
-export default RpcDocs;
diff --git a/js/src/views/RpcCalls/components/RpcDocs/index.js b/js/src/views/RpcCalls/components/RpcDocs/index.js
deleted file mode 100644
index 4e89ebde40025fa771c58f1fe4b0ca22beff18fc..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/RpcDocs/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './RpcDocs';
diff --git a/js/src/views/RpcCalls/components/RpcNav/RpcNav.css b/js/src/views/RpcCalls/components/RpcNav/RpcNav.css
deleted file mode 100644
index 442a71f8b6d297fc44073aac370f15281ce15e1f..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/RpcNav/RpcNav.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.nav {
-  font-size: 20px;
-  float: right;
-}
-
-.activeNav {
-  color: #b7a6a6 !important;
-}
-
-.nav a:not(:first-child) {
-  margin-left: 30px;
-}
diff --git a/js/src/views/RpcCalls/components/RpcNav/RpcNav.js b/js/src/views/RpcCalls/components/RpcNav/RpcNav.js
deleted file mode 100644
index 41e8614b7ed32d8a4232e8f583ec4133defd1b61..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/RpcNav/RpcNav.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import { Link } from 'react-router';
-import styles from './RpcNav.css';
-
-export default class RpcNav extends Component {
-  render () {
-    return (
-      <div className={ styles.nav }>
-        <Link to={ '/rpc/calls' } activeClassName={ styles.activeNav } { ...this._test('rpc-calls-link') }>
-          <i className='icon-call-out' />
-        </Link>
-        <Link to={ '/rpc/docs' } activeClassName={ styles.activeNav } { ...this._test('rpc-docs-link') }>
-          <i className='icon-docs' />
-        </Link>
-      </div>
-    );
-  }
-}
diff --git a/js/src/views/RpcCalls/components/RpcNav/index.js b/js/src/views/RpcCalls/components/RpcNav/index.js
deleted file mode 100644
index d898e9f8f3aa8cae354d02cbe2dbb88ecdecb6b9..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/RpcNav/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './RpcNav';
diff --git a/js/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.css b/js/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.css
deleted file mode 100644
index e2c24f263a84b540d0a4a83f51c69e4d34e91113..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.scrollButton {
-  position: fixed !important;
-  bottom: 35px !important;
-  right: 0;
-  left: 0;
-  margin-right: auto;
-  margin-left: auto;
-  animation: fadein .5s;
-  background: #eee !important;
-  border-radius: 50%;
-  border: 1px solid #6691C2 !important;
-  z-index: 10;
-  padding: 5px !important;
-  width: 34px !important;
-  height: 34px !important;
-}
-
-@keyframes fadein {
-  from { opacity: 0; }
-  to { opacity: 1; }
-}
-
-.hidden {
-  display: none !important;
-}
diff --git a/js/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.js b/js/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.js
deleted file mode 100644
index 08bebecb76e9d9b6612c09c0f4a149b14b78d916..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import IconButton from 'material-ui/IconButton';
-import ArrowUpwardIcon from 'material-ui/svg-icons/navigation/arrow-upward';
-
-import { scrollTo } from './util';
-import styles from './ScrollTopButton.css';
-
-const scrollTopThreshold = 600;
-
-export default class ScrollTopButton extends Component {
-  state = {}
-
-  componentDidMount () {
-    window.addEventListener('scroll', this.handleScroll);
-  }
-
-  componentWillUnmount () {
-    window.removeEventListener('scroll', this.handleScroll);
-  }
-
-  _scrollToTop () {
-    scrollTo(document.body, 0, 500);
-  }
-
-  render () {
-    let hiddenClass = !this.state.showScrollButton ? styles.hidden : '';
-
-    return (
-      <IconButton
-        className={ `${styles.scrollButton} ${hiddenClass}` }
-        onTouchTap={ this._scrollToTop }
-      >
-        <ArrowUpwardIcon />
-      </IconButton>
-    );
-  }
-
-  handleScroll = event => {
-    let { scrollTop } = event.srcElement.body;
-    let { showScrollButton } = this.state;
-
-    if (!showScrollButton && scrollTop > scrollTopThreshold) {
-      this.setState({
-        showScrollButton: true
-      });
-    }
-
-    if (showScrollButton && scrollTop < scrollTopThreshold) {
-      this.setState({
-        showScrollButton: false
-      });
-    }
-  }
-}
diff --git a/js/src/views/RpcCalls/components/ScrollTopButton/index.js b/js/src/views/RpcCalls/components/ScrollTopButton/index.js
deleted file mode 100644
index e98d67db76bf75aad2202ac4030d73e3975caeda..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/ScrollTopButton/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './ScrollTopButton';
diff --git a/js/src/views/RpcCalls/components/ScrollTopButton/util.js b/js/src/views/RpcCalls/components/ScrollTopButton/util.js
deleted file mode 100644
index aac32a81bf17d5d043edf4bbd1bfcc2b26ab63a6..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/components/ScrollTopButton/util.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function scrollTo (element, to, duration) {
-  let start = element.scrollTop;
-  let change = to - start;
-  let increment = 50;
-
-  let animateScroll = elapsedTime => {
-    elapsedTime += increment;
-    let position = easeInOut(elapsedTime, start, change, duration);
-
-    element.scrollTop = position;
-    if (elapsedTime < duration) {
-      setTimeout(() => {
-        // stop if user scrolled
-        if (element.scrollTop !== parseInt(position, 10)) {
-          return;
-        }
-        animateScroll(elapsedTime);
-      }, increment);
-    }
-  };
-
-  animateScroll(0);
-}
-
-export function easeInOut (currentTime, start, change, duration) {
-  currentTime /= duration / 2;
-  if (currentTime < 1) {
-    return change / 2 * currentTime * currentTime + start;
-  }
-  currentTime -= 1;
-  return -change / 2 * (currentTime * (currentTime - 2) - 1) + start;
-}
diff --git a/js/src/views/RpcCalls/constants/index.js b/js/src/views/RpcCalls/constants/index.js
deleted file mode 100644
index 2262cb7b2de1be65c2df2d3175a16396d7d986c4..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/constants/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export const SCROLLBAR_WIDTH = 22;
diff --git a/js/src/views/RpcCalls/containers/RpcPage/RpcPage.js b/js/src/views/RpcCalls/containers/RpcPage/RpcPage.js
deleted file mode 100644
index 3a58820fec95f71a3ac730e9eb9b19c89017bbdc..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/containers/RpcPage/RpcPage.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-import { extend } from 'lodash';
-import * as RpcActions from '../../actions/rpc';
-import { updateLogging } from '../../actions/logger';
-import { copyToClipboard } from '../../actions/clipboard';
-
-class RpcPage extends Component {
-  static propTypes = {
-    children: PropTypes.object.isRequired,
-    rpc: PropTypes.object.isRequired,
-    actions: PropTypes.object.isRequired
-  }
-
-  render () {
-    return (
-      <div>
-        { this.props.children && React.cloneElement(this.props.children, {
-          ...this.props
-        }) }
-      </div>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  return state;
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    actions: bindActionCreators(extend({}, RpcActions, { copyToClipboard }, { updateLogging }), dispatch)
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(RpcPage);
diff --git a/js/src/views/RpcCalls/containers/RpcPage/index.js b/js/src/views/RpcCalls/containers/RpcPage/index.js
deleted file mode 100644
index fd014298cfda31f58a82cb4503cbf44b0d08c663..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/containers/RpcPage/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './RpcPage';
diff --git a/js/src/views/RpcCalls/data/rpc.json b/js/src/views/RpcCalls/data/rpc.json
deleted file mode 100644
index ec85b7c5bf2bb4083a02b1300914991310a39d0a..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/data/rpc.json
+++ /dev/null
@@ -1,1093 +0,0 @@
-{
-  "methods": [
-    {
-      "name": "web3_clientVersion",
-      "desc": "Returns the current client version.",
-      "params": [],
-      "returns": "`String` - The current client version",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "web3_sha3",
-      "desc": "Returns Keccak-256 (*not* the standardized SHA3-256) of the given data.",
-      "params": [
-        "`String` - the data to convert into a SHA3 hash"
-      ],
-      "returns": "`DATA` - The SHA3 result of the given string.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "net_version",
-      "desc": "Returns the current network protocol version.",
-      "params": [],
-      "returns": "`String` - The current network protocol version",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "net_listening",
-      "desc": "Returns `true` if client is actively listening for network connections.",
-      "params": [],
-      "returns": "`Boolean` - `true` when listening, otherwise `false`.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "net_peerCount",
-      "desc": "Returns number of peers currenly connected to the client.",
-      "params": [],
-      "returns": "`QUANTITY` - integer of the number of connected peers.",
-      "inputFormatters": [],
-      "outputFormatter": "utils.toDecimal"
-    },
-    {
-      "name": "eth_protocolVersion",
-      "desc": "Returns the current ethereum protocol version.",
-      "params": [],
-      "returns": "`String` - The current ethereum protocol version",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_syncing",
-      "desc": "Returns an object with data about the sync status or `false`.",
-      "params": [],
-      "returns": {
-        "description": "`Object|Boolean`, An object with sync status data or `FALSE`, when not syncing:",
-        "details": {
-          "startingBlock": "`QUANTITY` - The block at which the import started (will only be reset, after the sync reached his head)",
-          "currentBlock": "`QUANTITY` - The current block, same as eth_blockNumber",
-          "highestBlock": "`QUANTITY` - The estimated highest block"
-        }
-      },
-      "inputFormatters": [],
-      "outputFormatter": "outputSyncingFormatter"
-    },
-    {
-      "name": "eth_coinbase",
-      "desc": "Returns the client coinbase address.",
-      "params": [],
-      "returns": "`DATA`, 20 bytes - the current coinbase address.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_mining",
-      "desc": "Returns `true` if client is actively mining new blocks.",
-      "params": [],
-      "returns": "`Boolean` - returns `true` of the client is mining, otherwise `false`.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_hashrate",
-      "desc": "Returns the number of hashes per second that the node is mining with.",
-      "params": [],
-      "returns": "`QUANTITY` - number of hashes per second.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_gasPrice",
-      "desc": "Returns the current price per gas in wei.",
-      "params": [],
-      "returns": "`QUANTITY` - integer of the current gas price in wei.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_accounts",
-      "desc": "Returns a list of addresses owned by client.",
-      "params": [],
-      "returns": "`Array of DATA`, 20 Bytes - addresses owned by the client.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_blockNumber",
-      "desc": "Returns the number of most recent block.",
-      "params": [],
-      "returns": "`QUANTITY` - integer of the current block number the client is on.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getBalance",
-      "desc": "Returns the balance of the account of given address.",
-      "params": [
-        "`DATA`, 20 Bytes - address to check for balance.",
-        "`QUANTITY|TAG` - integer block number, or the string `\"latest\"`, `\"earliest\"` or `\"pending\"`, see the [default block parameter](#the-default-block-parameter)"
-      ],
-      "returns": "`QUANTITY` - integer of the current balance in wei.",
-      "inputFormatters": [
-        "inputAddressFormatter",
-        "inputDefaultBlockNumberFormatter"
-      ],
-      "outputFormatter": "outputBigNumberFormatter"
-    },
-    {
-      "name": "eth_getStorageAt",
-      "desc": "Returns the value from a storage position at a given address.",
-      "params": [
-        "`DATA`, 20 Bytes - address of the storage.",
-        "`QUANTITY` - integer of the position in the storage.",
-        "`QUANTITY|TAG` - integer block number, or the string `\"latest\"`, `\"earliest\"` or `\"pending\"`, see the [default block parameter](#the-default-block-parameter)"
-      ],
-      "returns": "`DATA` - the value at this storage position.",
-      "inputFormatters": [
-        null,
-        "utils.toHex",
-        "inputDefaultBlockNumberFormatter"
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getTransactionCount",
-      "desc": "Returns the number of transactions *sent* from an address.",
-      "params": [
-        "`DATA`, 20 Bytes - address.",
-        "`QUANTITY|TAG` - integer block number, or the string `\"latest\"`, `\"earliest\"` or `\"pending\"`, see the [default block parameter](#the-default-block-parameter)"
-      ],
-      "returns": "`QUANTITY` - integer of the number of transactions send from this address.",
-      "inputFormatters": [
-        null,
-        "inputDefaultBlockNumberFormatter"
-      ],
-      "outputFormatter": "utils.toDecimal"
-    },
-    {
-      "name": "eth_getBlockTransactionCountByHash",
-      "desc": "Returns the number of transactions in a block from a block matching the given block hash.",
-      "params": [
-        "`DATA`, 32 Bytes - hash of a block"
-      ],
-      "returns": "`QUANTITY` - integer of the number of transactions in this block.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getBlockTransactionCountByNumber",
-      "desc": "Returns the number of transactions in a block from a block matching the given block number.",
-      "params": [
-        "`QUANTITY|TAG` - integer of a block number, or the string `\"earliest\"`, `\"latest\"` or `\"pending\"`, as in the [default block parameter](#the-default-block-parameter)."
-      ],
-      "returns": "`QUANTITY` - integer of the number of transactions in this block.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getUncleCountByBlockHash",
-      "desc": "Returns the number of uncles in a block from a block matching the given block hash.",
-      "params": [
-        "`DATA`, 32 Bytes - hash of a block"
-      ],
-      "returns": "`QUANTITY` - integer of the number of uncles in this block.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getUncleCountByBlockNumber",
-      "desc": "Returns the number of uncles in a block from a block matching the given block number.",
-      "params": [
-        "`QUANTITY` - integer of a block number, or the string \"latest\", \"earliest\" or \"pending\", see the [default block parameter](#the-default-block-parameter)"
-      ],
-      "returns": "`QUANTITY` - integer of the number of uncles in this block.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getCode",
-      "desc": "Returns code at a given address.",
-      "params": [
-        "`DATA`, 20 Bytes - address",
-        "`QUANTITY|TAG` - integer block number, or the string `\"latest\"`, `\"earliest\"` or `\"pending\"`, see the [default block parameter](#the-default-block-parameter)"
-      ],
-      "returns": "`DATA` - the code from the given address.",
-      "inputFormatters": [
-        "inputAddressFormatter",
-        "inputDefaultBlockNumberFormatter"
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_sign",
-      "desc": "Signs data with a given address.\n**Note** the address to sign must be unlocked.",
-      "params": [
-        "`DATA`, 20 Bytes - address",
-        "`DATA`, Data to sign"
-      ],
-      "returns": "`DATA`: Signed data",
-      "inputFormatters": [
-        "inputAddressFormatter",
-        null
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_sendTransaction",
-      "desc": "Creates new message call transaction or a contract creation, if the data field contains code.",
-      "params": [
-        {
-          "description": "`Object` - The transaction object",
-          "details": {
-            "from": "`DATA`, 20 Bytes - The address the transaction is send from.",
-            "to": "`DATA`, 20 Bytes - (optional when creating new contract) The address the transaction is directed to.",
-            "gas": "`QUANTITY`  - (optional, default: 90000) Integer of the gas provided for the transaction execution. It will return unused gas.",
-            "gasPrice": "`QUANTITY`  - (optional, default: To-Be-Determined) Integer of the gasPrice used for each paid gas",
-            "value": "`QUANTITY`  - (optional) Integer of the value send with this transaction",
-            "data": "`DATA`  - The compiled code of a contract OR the hash of the invoked method signature and encoded parameters. For details see [Ethereum Contract ABI](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI)",
-            "nonce": "`QUANTITY`  - (optional) Integer of a nonce. This allows to overwrite your own pending transactions that use the same nonce."
-          }
-        }
-      ],
-      "returns": "`DATA`, 32 Bytes - the transaction hash, or the zero hash if the transaction is not yet available.",
-      "inputFormatters": [
-        "inputTransactionFormatter"
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_sendRawTransaction",
-      "desc": "Creates new message call transaction or a contract creation for signed transactions.",
-      "params": [
-        "`DATA`, The signed transaction data."
-      ],
-      "returns": "`DATA`, 32 Bytes - the transaction hash, or the zero hash if the transaction is not yet available.",
-      "inputFormatters": [
-        null
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_call",
-      "desc": "Executes a new message call immediately without creating a transaction on the block chain.",
-      "params": [
-        {
-          "description": "`Object` - The transaction call object",
-          "details": {
-            "from": "`DATA`, 20 Bytes - (optional) The address the transaction is send from.",
-            "to": "`DATA`, 20 Bytes  - The address the transaction is directed to.",
-            "gas": "`QUANTITY`  - (optional) Integer of the gas provided for the transaction execution. eth_call consumes zero gas, but this parameter may be needed by some executions.",
-            "gasPrice": "`QUANTITY`  - (optional) Integer of the gasPrice used for each paid gas",
-            "value": "`QUANTITY`  - (optional) Integer of the value send with this transaction",
-            "data": "`DATA`  - (optional) Hash of the method signature and encoded parameters. For details see [Ethereum Contract ABI](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI)"
-          }
-        },
-        "`QUANTITY|TAG` - integer block number, or the string `\"latest\"`, `\"earliest\"` or `\"pending\"`, see the [default block parameter](#the-default-block-parameter)"
-      ],
-      "returns": "`DATA` - the return value of executed contract.",
-      "inputFormatters": [
-        "inputCallFormatter",
-        "inputDefaultBlockNumberFormatter"
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_estimateGas",
-      "desc": "Makes a call or transaction, which won't be added to the blockchain and returns the used gas, which can be used for estimating the used gas.",
-      "params": [],
-      "returns": "`QUANTITY` - the amount of gas used.",
-      "inputFormatters": [
-        "inputCallFormatter"
-      ],
-      "outputFormatter": "utils.toDecimal"
-    },
-    {
-      "name": "eth_getBlockByHash",
-      "desc": "Returns information about a block by hash.",
-      "params": [
-        "`DATA`, 32 Bytes - Hash of a block.",
-        "`Boolean` - If `true` it returns the full transaction objects, if `false` only the hashes of the transactions."
-      ],
-      "returns": {
-        "description": "`Object` - A block object, or `null` when no block was found:",
-        "details": {
-          "number": "`QUANTITY` - the block number. `null` when its pending block.",
-          "hash": "`DATA`, 32 Bytes - hash of the block. `null` when its pending block.",
-          "parentHash": "`DATA`, 32 Bytes - hash of the parent block.",
-          "nonce": "`DATA`, 8 Bytes - hash of the generated proof-of-work. `null` when its pending block.",
-          "sha3Uncles": "`DATA`, 32 Bytes - SHA3 of the uncles data in the block.",
-          "logsBloom": "`DATA`, 256 Bytes - the bloom filter for the logs of the block. `null` when its pending block.",
-          "transactionsRoot": "`DATA`, 32 Bytes - the root of the transaction trie of the block.",
-          "stateRoot": "`DATA`, 32 Bytes - the root of the final state trie of the block.",
-          "receiptsRoot": "`DATA`, 32 Bytes - the root of the receipts trie of the block.",
-          "miner": "`DATA`, 20 Bytes - the address of the beneficiary to whom the mining rewards were given.",
-          "difficulty": "`QUANTITY` - integer of the difficulty for this block.",
-          "totalDifficulty": "`QUANTITY` - integer of the total difficulty of the chain until this block.",
-          "extraData": "`DATA` - the \"extra data\" field of this block.",
-          "size": "`QUANTITY` - integer the size of this block in bytes.",
-          "gasLimit": "`QUANTITY` - the maximum gas allowed in this block.",
-          "gasUsed": "`QUANTITY` - the total used gas by all transactions in this block.",
-          "timestamp": "`QUANTITY` - the unix timestamp for when the block was collated.",
-          "transactions": "`Array` - Array of transaction objects, or 32 Bytes transaction hashes depending on the last given parameter.",
-          "uncles": "`Array` - Array of uncle hashes."
-        }
-      },
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getBlockByNumber",
-      "desc": "Returns information about a block by block number.",
-      "params": [
-        "`QUANTITY|TAG` - integer of a block number, or the string `\"earliest\"`, `\"latest\"` or `\"pending\"`, as in the [default block parameter](#the-default-block-parameter).",
-        "`Boolean` - If `true` it returns the full transaction objects, if `false` only the hashes of the transactions."
-      ],
-      "returns": "See [eth_getBlockByHash](#eth_getblockbyhash)",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getTransactionByHash",
-      "desc": "Returns the information about a transaction requested by transaction hash.",
-      "params": [
-        "`DATA`, 32 Bytes - hash of a transaction"
-      ],
-      "returns": {
-        "description": "`Object` - A transaction object, or `null` when no transaction was found:",
-        "details": {
-          "hash": "`DATA`, 32 Bytes - hash of the transaction.",
-          "nonce": "`QUANTITY` - the number of transactions made by the sender prior to this one.",
-          "blockHash": "`DATA`, 32 Bytes - hash of the block where this transaction was in. `null` when its pending.",
-          "blockNumber": "`QUANTITY` - block number where this transaction was in. `null` when its pending.",
-          "transactionIndex": "`QUANTITY` - integer of the transactions index position in the block. `null` when its pending.",
-          "from": "`DATA`, 20 Bytes - address of the sender.",
-          "to": "`DATA`, 20 Bytes - address of the receiver. `null` when its a contract creation transaction.",
-          "value": "`QUANTITY` - value transferred in Wei.",
-          "gasPrice": "`QUANTITY` - gas price provided by the sender in Wei.",
-          "gas": "`QUANTITY` - gas provided by the sender.",
-          "input": "`DATA` - the data send along with the transaction."
-        }
-      },
-      "inputFormatters": [],
-      "outputFormatter": "outputTransactionFormatter"
-    },
-    {
-      "name": "eth_getTransactionByBlockHashAndIndex",
-      "desc": "Returns information about a transaction by block hash and transaction index position.",
-      "params": [
-        "`DATA`, 32 Bytes - hash of a block.",
-        "`QUANTITY` - integer of the transaction index position."
-      ],
-      "returns": "See [eth_getBlockByHash](#eth_gettransactionbyhash)",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getTransactionByBlockNumberAndIndex",
-      "desc": "Returns information about a transaction by block number and transaction index position.",
-      "params": [
-        "`QUANTITY|TAG` - a block number, or the string `\"earliest\"`, `\"latest\"` or `\"pending\"`, as in the [default block parameter](#the-default-block-parameter).",
-        "`QUANTITY` - the transaction index position."
-      ],
-      "returns": "See [eth_getBlockByHash](#eth_gettransactionbyhash)",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getTransactionReceipt",
-      "desc": "Returns the receipt of a transaction by transaction hash.\n**Note** That the receipt is not available for pending transactions.",
-      "params": [
-        "`DATA`, 32 Bytes - hash of a transaction"
-      ],
-      "returns": {
-        "description": "`Object` - A transaction receipt object, or `null` when no receipt was found:",
-        "details": {
-          "transactionHash ": "`DATA`, 32 Bytes - hash of the transaction.",
-          "transactionIndex": "`QUANTITY` - integer of the transactions index position in the block.",
-          "blockHash": "`DATA`, 32 Bytes - hash of the block where this transaction was in.",
-          "blockNumber": "`QUANTITY` - block number where this transaction was in.",
-          "cumulativeGasUsed ": "`QUANTITY ` - The total amount of gas used when this transaction was executed in the block.",
-          "gasUsed ": "`QUANTITY ` - The amount of gas used by this specific transaction alone.",
-          "contractAddress ": "`DATA`, 20 Bytes - The contract address created, if the transaction was a contract creation, otherwise `null`.",
-          "logs": "`Array` - Array of log objects, which this transaction generated."
-        }
-      },
-      "inputFormatters": [],
-      "outputFormatter": "outputTransactionReceiptFormatter"
-    },
-    {
-      "name": "eth_getUncleByBlockHashAndIndex",
-      "desc": "Returns information about a uncle of a block by hash and uncle index position.",
-      "params": [
-        "`DATA`, 32 Bytes - hash a block.",
-        "`QUANTITY` - the uncle's index position."
-      ],
-      "returns": "See [eth_getBlockByHash](#eth_getblockbyhash)",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getUncleByBlockNumberAndIndex",
-      "desc": "Returns information about a uncle of a block by number and uncle index position.",
-      "params": [
-        "`QUANTITY|TAG` - a block number, or the string `\"earliest\"`, `\"latest\"` or `\"pending\"`, as in the [default block parameter](#the-default-block-parameter).",
-        "`QUANTITY` - the uncle's index position."
-      ],
-      "returns": "See [eth_getBlockByHash](#eth_getblockbyhash)",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getCompilers",
-      "desc": "Returns a list of available compilers in the client.",
-      "params": [],
-      "returns": "`Array` - Array of available compilers.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_compileSolidity",
-      "desc": "Returns compiled solidity code.",
-      "params": [
-        "`String` - The source code."
-      ],
-      "returns": "`DATA` - The compiled source code.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_compileLLL",
-      "desc": "Returns compiled LLL code.",
-      "params": [
-        "`String` - The source code."
-      ],
-      "returns": "`DATA` - The compiled source code.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_compileSerpent",
-      "desc": "Returns compiled serpent code.",
-      "params": [
-        "`String` - The source code."
-      ],
-      "returns": "`DATA` - The compiled source code.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_newFilter",
-      "desc": "Creates a filter object, based on filter options, to notify when the state changes (logs).\nTo check if the state has changed, call [eth_getFilterChanges](#eth_getfilterchanges).",
-      "params": [],
-      "returns": {
-        "description": "1. `Object` - The filter options:",
-        "details": {
-          "fromBlock": "`QUANTITY|TAG` - (optional, default: `\"latest\"`) Integer block number, or `\"latest\"` for the last mined block or `\"pending\"`, `\"earliest\"` for not yet mined transactions.",
-          "toBlock": "`QUANTITY|TAG` - (optional, default: `\"latest\"`) Integer block number, or `\"latest\"` for the last mined block or `\"pending\"`, `\"earliest\"` for not yet mined transactions.",
-          "address": "`DATA|Array`, 20 Bytes - (optional) Contract address or a list of addresses from which logs should originate.",
-          "topics": "`Array of DATA`,  - (optional) Array of 32 Bytes `DATA` topics. Topics are order-dependent. Each topic can also be an array of DATA with \"or\" options."
-        }
-      },
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_newBlockFilter",
-      "desc": "Creates a filter in the node, to notify when a new block arrives.\nTo check if the state has changed, call [eth_getFilterChanges](#eth_getfilterchanges).",
-      "params": [],
-      "returns": "`QUANTITY` - A filter id.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_newPendingTransactionFilter",
-      "desc": "Creates a filter in the node, to notify when new pending transactions arrive.\nTo check if the state has changed, call [eth_getFilterChanges](#eth_getfilterchanges).",
-      "params": [],
-      "returns": "`QUANTITY` - A filter id.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_uninstallFilter",
-      "desc": "Uninstalls a filter with given id. Should always be called when watch is no longer needed.\nAdditonally Filters timeout when they aren't requested with [eth_getFilterChanges](#eth_getfilterchanges) for a period of time.",
-      "params": [
-        "`QUANTITY` - The filter id."
-      ],
-      "returns": "`Boolean` - `true` if the filter was successfully uninstalled, otherwise `false`.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getFilterChanges",
-      "desc": "Polling method for a filter, which returns an array of logs which occurred since last poll.",
-      "params": [
-        "`QUANTITY` - the filter id."
-      ],
-      "returns": "`Array` - Array of log objects, or an empty array if nothing has changed since last poll.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getFilterLogs",
-      "desc": "Returns an array of all logs matching filter with given id.",
-      "params": [
-        "`QUANTITY` - The filter id."
-      ],
-      "returns": "See [eth_getFilterChanges](#eth_getfilterchanges)",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getLogs",
-      "desc": "Returns an array of all logs matching a given filter object.",
-      "params": [
-        {
-          "description": "`Object` - the filter object, see [eth_newFilter parameters](#eth_newfilter).",
-          "details": {}
-        }
-      ],
-      "returns": "See [eth_getFilterChanges](#eth_getfilterchanges)",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getWork",
-      "desc": "Returns the hash of the current block, the seedHash, and the boundary condition to be met (\"target\").",
-      "params": [],
-      "returns": "`Array` - Array with the following properties:",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_submitWork",
-      "desc": "Used for submitting a proof-of-work solution.",
-      "params": [
-        "`DATA`, 8 Bytes - The nonce found (64 bits)",
-        "`DATA`, 32 Bytes - The header's pow-hash (256 bits)",
-        "`DATA`, 32 Bytes - The mix digest (256 bits)"
-      ],
-      "returns": "`Boolean` - returns `true` if the provided solution is valid, otherwise `false`.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_submitHashrate",
-      "desc": "Used for submitting mining hashrate.",
-      "params": [
-        "`Hashrate`, a hexadecimal string representation (32 bytes) of the hash rate ",
-        "`ID`, String - A random hexadecimal(32 bytes) ID identifying the client"
-      ],
-      "returns": "`Boolean` - returns `true` if submitting went through succesfully and `false` otherwise.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "db_putString",
-      "desc": "Stores a string in the local database.\n**Note** this function is deprecated and will be removed in the future.",
-      "params": [
-        "`String` - Database name.",
-        "`String` - Key name.",
-        "`String` - String to store."
-      ],
-      "returns": "`Boolean` - returns `true` if the value was stored, otherwise `false`.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "db_getString",
-      "desc": "Returns string from the local database.\n**Note** this function is deprecated and will be removed in the future.",
-      "params": [
-        "`String` - Database name.",
-        "`String` - Key name."
-      ],
-      "returns": "`String` - The previously stored string.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "db_putHex",
-      "desc": "Stores binary data in the local database.\n**Note** this function is deprecated and will be removed in the future.",
-      "params": [
-        "`String` - Database name.",
-        "`String` - Key name.",
-        "`DATA` - The data to store."
-      ],
-      "returns": "`Boolean` - returns `true` if the value was stored, otherwise `false`.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "db_getHex",
-      "desc": "Returns binary data from the local database.\n**Note** this function is deprecated and will be removed in the future.",
-      "params": [
-        "`String` - Database name.",
-        "`String` - Key name."
-      ],
-      "returns": "`DATA` - The previously stored data.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "shh_version",
-      "desc": "Returns the current whisper protocol version.",
-      "params": [],
-      "returns": "`String` - The current whisper protocol version",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "shh_post",
-      "desc": "Sends a whisper message.",
-      "params": [
-        {
-          "description": "`Object` - The whisper post object:",
-          "details": {
-            "from": "`DATA`, 60 Bytes - (optional) The identity of the sender.",
-            "to": "`DATA`, 60 Bytes - (optional) The identity of the receiver. When present whisper will encrypt the message so that only the receiver can decrypt it.",
-            "topics": "`Array of DATA` - Array of `DATA` topics, for the receiver to identify messages.",
-            "payload": "`DATA` - The payload of the message.",
-            "priority": "`QUANTITY` - The integer of the priority in a rang from ... (?).",
-            "ttl": "`QUANTITY` - integer of the time to live in seconds."
-          }
-        }
-      ],
-      "returns": "`Boolean` - returns `true` if the message was send, otherwise `false`.",
-      "inputFormatters": [
-        "inputPostFormatter"
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "shh_newIdentity",
-      "desc": "Creates new whisper identity in the client.",
-      "params": [],
-      "returns": "`DATA`, 60 Bytes - the address of the new identiy.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "shh_hasIdentity",
-      "desc": "Checks if the client hold the private keys for a given identity.",
-      "params": [
-        "`DATA`, 60 Bytes - The identity address to check."
-      ],
-      "returns": "`Boolean` - returns `true` if the client holds the privatekey for that identity, otherwise `false`.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "shh_newGroup",
-      "desc": "(?)",
-      "params": [],
-      "returns": "`DATA`, 60 Bytes - the address of the new group. (?)",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "shh_addToGroup",
-      "desc": "(?)",
-      "params": [
-        "`DATA`, 60 Bytes - The identity address to add to a group (?)."
-      ],
-      "returns": "`Boolean` - returns `true` if the identity was successfully added to the group, otherwise `false` (?).",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "shh_newFilter",
-      "desc": "Creates filter to notify, when client receives whisper message matching the filter options.",
-      "params": [
-        {
-          "description": "`Object` - The filter options:",
-          "details": {
-            "to": "`DATA`, 60 Bytes - (optional) Identity of the receiver. *When present it will try to decrypt any incoming message if the client holds the private key to this identity.*",
-            "topics": "`Array of DATA` - Array of `DATA` topics which the incoming message's topics should match.  You can use the following combinations:"
-          }
-        }
-      ],
-      "returns": "`QUANTITY` - The newly created filter.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "shh_uninstallFilter",
-      "desc": "Uninstalls a filter with given id. Should always be called when watch is no longer needed.\nAdditonally Filters timeout when they aren't requested with [shh_getFilterChanges](#shh_getfilterchanges) for a period of time.",
-      "params": [
-        "`QUANTITY` - The filter id."
-      ],
-      "returns": "`Boolean` - `true` if the filter was successfully uninstalled, otherwise `false`.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "shh_getFilterChanges",
-      "desc": "Polling method for whisper filters. Returns new messages since the last call of this method.\n**Note** calling the [shh_getMessages](#shh_getmessages) method, will reset the buffer for this method, so that you won't receive duplicate messages.",
-      "params": [
-        "`QUANTITY` - The filter id."
-      ],
-      "returns": "`Array` - Array of messages received since last poll:",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "shh_getMessages",
-      "desc": "Get all messages matching a filter. Unlike `shh_getFilterChanges` this returns all messages.",
-      "params": [
-        "`QUANTITY` - The filter id."
-      ],
-      "returns": "See [shh_getFilterChanges](#shh_getfilterchanges)",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_pendingTransactions",
-      "desc": "?",
-      "params": [],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_flush",
-      "desc": "?",
-      "params": [],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_newFilterEx",
-      "desc": "?",
-      "params": [
-        ""
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getFilterChangesEx",
-      "desc": "?",
-      "params": [
-        ""
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getFilterLogsEx",
-      "desc": "?",
-      "params": [
-        ""
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_getLogsEx",
-      "desc": "?",
-      "params": [
-        "?"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_register",
-      "desc": "?",
-      "params": [
-        "?"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_unregister",
-      "desc": "?",
-      "params": [
-        "?"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_fetchQueuedTransactions",
-      "desc": "?",
-      "params": [
-        "?"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_signTransaction",
-      "desc": "?",
-      "params": [
-        "?"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "personal_sendTransaction",
-      "desc": "Sends and signs a transaction given account passphrase. Does not require the account to be unlocked nor unlocks the account for future transactions. ",
-      "params": [
-        {
-          "description": "`Object` - The transaction object",
-          "details": {
-            "from": "`DATA`, 20 Bytes - The address the transaction is send from.",
-            "to": "`DATA`, 20 Bytes - (optional when creating new contract) The address the transaction is directed to.",
-            "gas": "`QUANTITY`  - (optional, default: 90000) Integer of the gas provided for the transaction execution. It will return unused gas.",
-            "gasPrice": "`QUANTITY`  - (optional, default: To-Be-Determined) Integer of the gasPrice used for each paid gas",
-            "value": "`QUANTITY`  - (optional) Integer of the value send with this transaction",
-            "data": "`DATA`  - The compiled code of a contract OR the hash of the invoked method signature and encoded parameters. For details see [Ethereum Contract ABI](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI)",
-            "nonce": "`QUANTITY`  - (optional) Integer of a nonce. This allows to overwrite your own pending transactions that use the same nonce."
-          }
-        },
-        "`PASS`, Passphrase to unlock `from` account."
-      ],
-      "returns": "`DATA`, 32 Bytes - the transaction hash, or the zero hash if the transaction is not yet available.",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_inspectTransaction",
-      "desc": "?",
-      "params": [
-        "?"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "eth_notePassword",
-      "desc": "?",
-      "params": [
-        "?"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "personal_newAccount",
-      "desc": "Creates new account",
-      "params": [
-        "`DATA` - Password"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [
-        null
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "personal_unlockAccount",
-      "desc": "?",
-      "params": [
-        "?",
-        "?",
-        "?"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [
-        null,
-        null,
-        null
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_minGasPrice",
-      "desc": "Returns currently set minimal gas price",
-      "params": [],
-      "returns": "`QUANTITY` - Minimal Gas Price",
-      "inputFormatters": [],
-      "outputFormatter": "outputBigNumberFormatter"
-    },
-    {
-      "name": "ethcore_extraData",
-      "desc": "Returns currently set extra data",
-      "params": [],
-      "returns": "`DATA` - Extra data",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_setExtraData",
-      "desc": "Changes extra data for newly mined blocks",
-      "params": [
-        "`DATA`- Extra Data"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [
-        "utils.toHex"
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_setMode",
-      "desc": "Changes current operating mode",
-      "params": [
-        "`DATA`- Mode name"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": null,
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_setMinGasPrice",
-      "desc": "Changes minimal gas price for transaction to be accepted to the queue.",
-      "params": [
-        "`QUANTITY` - Minimal gas price"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [
-        "utils.toHex"
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_gasFloorTarget",
-      "desc": "Returns current target for gas floor",
-      "params": [],
-      "returns": "`QUANTITY` - Gas Floor Target",
-      "inputFormatters": [],
-      "outputFormatter": "outputBigNumberFormatter"
-    },
-    {
-      "name": "ethcore_setGasFloorTarget",
-      "desc": "Changes current gas floor target.",
-      "params": [
-        "`QUANTITY` - Gas Floor Target"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [
-        "utils.toHex"
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_setAuthor",
-      "desc": "Changes author (coinbase) for mined blocks.",
-      "params": [
-        "`DATA`, 20 Bytes - Address"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [
-        "inputAddressFormatter"
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_setTransactionsLimit",
-      "desc": "Changes limit for transactions in queue.",
-      "params": [
-        "`QUANTITY` - New Limit"
-      ],
-      "returns": "`Boolean` - whether the call was successful",
-      "inputFormatters": [
-        "utils.toHex"
-      ],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_transactionsLimit",
-      "desc": "Changes limit for transactions in queue.",
-      "params": [],
-      "returns": "`QUANTITY` - Current max number of transactions in queue.",
-      "inputFormatters": [],
-      "outputFormatter": "outputBigNumberFormatter"
-    },
-    {
-      "name": "ethcore_netChain",
-      "desc": "Returns the name of the connected chain.",
-      "params": [],
-      "returns": "`DATA` - chain name",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_netPeers",
-      "desc": "Returns number of peers.",
-      "params": [],
-      "returns": "`OBJECT` - JSON object containing active, connected and max peers",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_netPort",
-      "desc": "Returns network port the node is listening on.",
-      "params": [],
-      "returns": "`QUANTITY` - Port Number",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_rpcSettings",
-      "desc": "Returns basic settings of rpc (enabled, port, interface).",
-      "params": [],
-      "returns": "`OBJECT` - JSON object containing rpc settings",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_nodeName",
-      "desc": "Returns node name (identity)",
-      "params": [],
-      "returns": "`DATA` - Node name",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "ethcore_mode",
-      "desc": "Returns current mode",
-      "params": [],
-      "returns": "`DATA` - Mode",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "trace_filter",
-      "desc": "Returns traces matching given filter",
-      "params": [
-        "`OBJECT` - The filter object"
-      ],
-      "returns": "`ARRAY` - Traces matching given filter",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "trace_get",
-      "desc": "Returns trace at given position.",
-      "params": [
-        "`HASH` - Transaction hash",
-        "`INTEGER` - Trace position witing transaction"
-      ],
-      "returns": "`Object` - Trace",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "trace_transaction",
-      "desc": "Returns all traces of given transaction",
-      "params": [
-        "`HASH` - Transaction hash"
-      ],
-      "returns": "`ARRAY` - Traces of given transaction",
-      "inputFormatters": [],
-      "outputFormatter": null
-    },
-    {
-      "name": "trace_block",
-      "desc": "Returns traces created at given block",
-      "params": [
-        "`BLOCKNUMBER` - Integer block number, or \"latest\" for the last mined block or \"pending\", \"earliest\" for not yet mined transactions"
-      ],
-      "returns": "`ARRAY` - Block traces",
-      "inputFormatters": [],
-      "outputFormatter": null
-    }
-  ]
-}
diff --git a/js/src/views/RpcCalls/middleware/index.js b/js/src/views/RpcCalls/middleware/index.js
deleted file mode 100644
index 9b7e91811761194214ce0573f6c3044580494bc0..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/middleware/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import LocalStorage from './localstorage';
-
-export default function () {
-  const localstorage = new LocalStorage();
-
-  return [
-    localstorage.toMiddleware()
-  ];
-}
diff --git a/js/src/views/RpcCalls/middleware/localstorage.js b/js/src/views/RpcCalls/middleware/localstorage.js
deleted file mode 100644
index 977c8cd887a4d5a6ceccf6e3f95f3c30fbc7c7e3..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/middleware/localstorage.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import localStore from 'store';
-import { syncRpcStateFromLocalStorage } from '../actions/localstorage';
-import rpcMetods from '../data/rpc.json';
-
-export default class localStorageMiddleware {
-  toMiddleware () {
-    return store => next => action => {
-      let delegate;
-
-      switch (action.type) {
-        case 'add rpcResponse': delegate = ::this.onAddRpcResponse; break;
-        case 'reset rpcPrevCalls': delegate = ::this.onResetRpcCalls; break;
-        case 'init app': delegate = ::this.onInitApp; break;
-        default:
-          next(action);
-          return;
-      }
-
-      if (!delegate) {
-        return;
-      }
-
-      delegate(store, next, action);
-    };
-  }
-
-  onInitApp (store, next, action) {
-    const prevCalls = localStore.get('rpcPrevCalls');
-
-    if (!(prevCalls && prevCalls.length)) {
-      return next(action);
-    }
-
-    store.dispatch(syncRpcStateFromLocalStorage({
-      prevCalls: prevCalls,
-      callNo: prevCalls.length ? prevCalls[0].callNo + 1 : 1,
-      selectedMethod: rpcMetods.methods.find(m => m.name === prevCalls[0].name)
-    }));
-    return next(action);
-  }
-
-  onAddRpcResponse (store, next, action) {
-    action.payload.callNo = store.getState().rpc.callNo;
-    this.unshift('rpcPrevCalls', action.payload);
-    return next(action);
-  }
-
-  onResetRpcCalls (store, next, action) {
-    localStore.set('rpcPrevCalls', []);
-    return next(action);
-  }
-
-  // TODO [adgo] 20.04.2016 remove if/when PR is accepted: https://github.com/marcuswestin/store.js/pull/153
-  unshift (key, value) {
-    const newArr = [value].concat(localStore.get(key) || []);
-
-    localStore.set(key, newArr);
-  }
-}
diff --git a/js/src/views/RpcCalls/middleware/localstorage.spec.js b/js/src/views/RpcCalls/middleware/localstorage.spec.js
deleted file mode 100644
index 81f23cfa5067de9a09964a4a34c64cfa22314afa..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/middleware/localstorage.spec.js
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-import localStore from 'store';
-
-import { syncRpcStateFromLocalStorage } from '../actions/localstorage';
-import rpcData from '../data/rpc.json';
-import LocalStorageMiddleware from './localstorage';
-
-describe('views/Status/middleware/localstorage', () => {
-  let cut;
-  let state;
-
-  beforeEach('mock cut', () => {
-    cut = new LocalStorageMiddleware();
-    sinon.spy(cut, 'onAddRpcResponse');
-    sinon.spy(cut, 'onResetRpcCalls');
-    sinon.spy(cut, 'onInitApp');
-    sinon.spy(cut, 'unshift');
-    state = {
-      rpc: {
-        callNo: 1
-      }
-    };
-  });
-
-  it('should call onAddRpcResponse when respected action is dispatched', () => {
-    // given
-    const store = { getState: () => state };
-    const next = sinon.spy();
-    const middleware = cut.toMiddleware()(store)(next);
-    const action = { type: 'add rpcResponse', payload: {} };
-
-    expect(middleware).to.be.a('function');
-    expect(action).to.be.an('object');
-
-    // when
-    middleware(action);
-
-    // then
-    expect(cut.onAddRpcResponse.calledWith(store, next, action)).to.be.true;
-  });
-
-  it('should call onResetRpcCalls when respected action is dispactched', () => {
-    // given
-    const store = {};
-    const next = sinon.spy();
-    const middleware = cut.toMiddleware()(store)(next);
-    const action = { type: 'reset rpcPrevCalls', payload: {} };
-
-    expect(middleware).to.be.a('function');
-    expect(action).to.be.an('object');
-
-    // when
-    middleware(action);
-
-    // then
-    expect(cut.onResetRpcCalls.calledWith(store, next, action)).to.be.true;
-  });
-
-  it('should call onInitApp when respected action is dispatched', () => {
-    // given
-    const store = { dispatch: sinon.spy() };
-    const next = sinon.spy();
-    const middleware = cut.toMiddleware()(store)(next);
-    const action = { type: 'init app' };
-
-    cut.onInitApp = sinon.spy();
-    expect(middleware).to.be.a('function');
-    expect(action).to.be.an('object');
-
-    // when
-    middleware(action);
-
-    // then
-    expect(cut.onInitApp.calledWith(store, next, action)).to.be.true;
-  });
-
-  it('should not call onAddRpcResponse or onInitApp when a non-respected action is dispatched', () => {
-    // given
-    const store = {};
-    const next = sinon.spy();
-    const middleware = cut.toMiddleware()(store)(next);
-    const action = { type: 'testAction' };
-
-    expect(middleware).to.be.a('function');
-    expect(action).to.be.an('object');
-
-    // when
-    middleware(action);
-
-    // then
-    expect(cut.onAddRpcResponse.called).to.be.false;
-    expect(cut.onInitApp.called).to.be.false;
-    expect(next.calledWith(action)).to.be.true;
-  });
-
-  describe('RPC', () => {
-    it('should dispatch syncRpcStateFromLocalStorage when there are rpc calls in localStorage', () => {
-      // given
-      const store = { dispatch: sinon.spy() };
-      const next = sinon.spy();
-      const action = {};
-      const key = 'rpcPrevCalls';
-      const prevCalls = [rpcData.methods[0]];
-
-      prevCalls[0].callNo = 1;
-      localStore.remove(key);
-      localStore.set(key, prevCalls);
-
-      // when
-      cut.onInitApp(store, next, action);
-
-      // then
-      expect(store.dispatch.calledWith(syncRpcStateFromLocalStorage({
-        prevCalls: prevCalls,
-        callNo: 2,
-        selectedMethod: prevCalls[0]
-      }))).to.be.true;
-      expect(next.calledWith(action)).to.be.true;
-    });
-
-    it('should not dispatch syncRpcStateFromLocalStorage when there are no rpc calls in localStorage', () => {
-      // given
-      const store = { dispatch: sinon.spy() };
-      const next = sinon.spy();
-      const action = {};
-
-      localStore.remove('rpcPrevCalls');
-
-      // when
-      cut.onInitApp(store, next, action);
-
-      // then
-      expect(store.dispatch.notCalled).to.be.true;
-      expect(next.calledWith(action)).to.be.true;
-    });
-  });
-
-  it('should call unshift and next', () => {
-    // given
-    const store = { getState: () => state };
-    const next = sinon.spy();
-    const action = { payload: {} };
-
-    // when
-    cut.onAddRpcResponse(store, next, action);
-
-    // then
-    expect(cut.unshift.calledWith('rpcPrevCalls', action.payload)).to.be.true;
-    expect(action.payload.callNo).to.equal(1);
-    expect(next.calledWith(action)).to.be.true;
-  });
-
-  describe('UNSHIFT', () => {
-    // TODO [adgo] 20.04.2016 remove if/when PR is accepted: https://github.com/marcuswestin/store.js/pull/153
-    it('should create array in local storage by key and unshift item to it', () => {
-      // given
-      const key = 'foo';
-      const val = 'bar';
-
-      localStore.remove(key);
-
-      // when
-      cut.unshift(key, val);
-
-      // then
-      expect(localStore.get(key)[0]).to.equal(val);
-      expect(localStore.get(key).length).to.equal(1);
-    });
-
-    // TODO [adgo] 20.04.2016 remove if/when PR is accepted: https://github.com/marcuswestin/store.js/pull/153
-    it('should unshift item to an existing array in local storage by key', () => {
-      // given
-      const key = 'foo';
-      const val = 'bar';
-      const newVal = 'bazz';
-
-      localStore.remove(key);
-      localStore.set(key, [val]);
-      expect(localStore.get(key)).to.be.defined;
-
-      // when
-      cut.unshift(key, newVal);
-
-      // then
-      expect(localStore.get(key)[0]).to.equal(newVal);
-      expect(localStore.get(key).length).to.equal(2);
-    });
-  });
-});
diff --git a/js/src/views/RpcCalls/reducers/index.js b/js/src/views/RpcCalls/reducers/index.js
deleted file mode 100644
index 4f57dd31182a6db77ac846062a4cbc6c19d8efb5..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/reducers/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import rpc from './rpc';
-import logger from './logger';
-
-export {
-  rpc,
-  logger
-};
diff --git a/js/src/views/RpcCalls/reducers/logger.js b/js/src/views/RpcCalls/reducers/logger.js
deleted file mode 100644
index 29fa6a05238d0c4a5c667ed1886bad740e41257b..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/reducers/logger.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-
-const isProd = process.env.NODE_ENV === 'production';
-
-const initialState = {
-  logging: false && !isProd
-};
-
-export default handleActions({
-  'update logging' (state, action) {
-    return {
-      logging: action.payload
-    };
-  }
-
-}, initialState);
diff --git a/js/src/views/RpcCalls/reducers/rpc.js b/js/src/views/RpcCalls/reducers/rpc.js
deleted file mode 100644
index 68c23b87534cdf4e14f4de6caa3b31afb0214ca3..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/reducers/rpc.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-import rpcMetods from '../data/rpc.json';
-
-const initialState = {
-  prevCalls: [],
-  callNo: 1,
-  selectedMethod: rpcMetods.methods[0]
-};
-
-export const actionHandlers = {
-
-  'add rpcResponse' (state, action) {
-    const calls = [action.payload].concat(state.prevCalls);
-    const maxCalls = 64;
-
-    return {
-      ...state,
-      callNo: state.callNo + 1,
-      prevCalls: calls.slice(0, maxCalls)
-    };
-  },
-
-  'sync rpcStateFromLocalStorage' (state, action) {
-    return {
-      ...state,
-      prevCalls: action.payload.prevCalls,
-      callNo: action.payload.callNo,
-      selectedMethod: action.payload.selectedMethod
-    };
-  },
-
-  'reset rpcPrevCalls' (state, action) {
-    return {
-      ...state,
-      callNo: 1,
-      prevCalls: []
-    };
-  },
-
-  'select rpcMethod' (state, action) {
-    return {
-      ...state,
-      selectedMethod: action.payload
-    };
-  }
-
-};
-
-export default handleActions(actionHandlers, initialState);
diff --git a/js/src/views/RpcCalls/util/error.js b/js/src/views/RpcCalls/util/error.js
deleted file mode 100644
index 2de8397607546eed00536e0fc5ede6e3c2337619..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/util/error.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function filterErrors (xs) {
-  return xs.filter(isError);
-}
-
-export function hasErrors (xs) {
-  if (!xs) {
-    return;
-  }
-  return !!xs.find(isError);
-}
-
-export function isError (x) {
-  return x instanceof Error;
-}
diff --git a/js/src/views/RpcCalls/util/error.spec.js b/js/src/views/RpcCalls/util/error.spec.js
deleted file mode 100644
index 2f4de7bac17a5a8c16aec9247453c49e594ab791..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/util/error.spec.js
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-import * as ErrorUtil from './error';
-
-describe('views/Status/util/error', () => {
-  beforeEach('spy on isError', () => {
-    sinon.spy(ErrorUtil, 'isError');
-  });
-
-  afterEach('spy on isError', () => {
-    ErrorUtil.isError.restore();
-  });
-
-  describe('filterErrors', () => {
-    const ERROR1 = new Error('abc');
-    const ERROR2 = new Error('def');
-    const INPUT = [ERROR1, 'ghi', ERROR2, 'jkl'];
-    const ERRORS = [ERROR1, ERROR2];
-
-    it('should return errors in the array', () => {
-      expect(ErrorUtil.filterErrors(INPUT)).to.deep.equal(ERRORS);
-    });
-  });
-
-  describe('hasErrors', () => {
-    it('should return undefined and not invoke isError when null is passed', () => {
-      // given
-      const xs = null;
-
-      // when
-      const res = ErrorUtil.hasErrors(xs);
-
-      // then
-      expect(ErrorUtil.isError.called).to.be.false;
-      expect(res).to.be.undefined;
-    });
-
-    it('should return true and invoke isError when at least one error object is passed', () => {
-      // given
-      const arg1 = 'test string';
-      const arg2 = new Error();
-      const xs = [arg1, arg2];
-
-      // when
-      const res = ErrorUtil.hasErrors(xs);
-
-      // then
-      // todo [adgo] - 30.04.2016 - fix and uncomment
-      // expect(ErrorUtil.isError.calledWith(arg1)).to.be.true;
-      // expect(ErrorUtil.isError.calledWith(arg2)).to.be.true;
-      expect(res).to.be.true;
-    });
-
-    it('should return false and invoke isError when non error objects are passed', () => {
-      // given
-      const arg1 = 'test string';
-      const arg2 = 123;
-      const xs = [arg1, arg2];
-
-      // when
-      const res = ErrorUtil.hasErrors(xs);
-
-      // then
-      // todo [adgo] - 30.04.2016 - fix and uncomment
-      // expect(ErrorUtil.isError.calledWith(arg1)).to.be.true;
-      // expect(ErrorUtil.isError.calledWith(arg2)).to.be.true;
-      expect(res).to.be.false;
-    });
-  });
-
-  describe('isError', () => {
-    it('should return false when non error object is passed', () => {
-      // given
-      const arg = '';
-
-      // when
-      const res = ErrorUtil.isError(arg);
-
-      // then
-      expect(res).to.be.false;
-    });
-
-    it('should return true when error object is passed', () => {
-      // given
-      const arg = new Error();
-
-      // when
-      const res = ErrorUtil.isError(arg);
-
-      // then
-      expect(res).to.be.true;
-    });
-  });
-});
diff --git a/js/src/views/RpcCalls/util/index.js b/js/src/views/RpcCalls/util/index.js
deleted file mode 100644
index 064952dbb46ccee19b9882d0f613b8f5de9f46a6..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/util/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function toPromise (fn) {
-  return new Promise((resolve, reject) => {
-    fn((err, res) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(res);
-      }
-    });
-  });
-}
-
-export function stringifyIfObject (any) {
-  if (typeof any === 'object') {
-    any = JSON.stringify(any);
-  }
-  return any;
-}
-
-export function identity (x) {
-  return x;
-}
diff --git a/js/src/views/RpcCalls/util/index.spec.js b/js/src/views/RpcCalls/util/index.spec.js
deleted file mode 100644
index 17f441a8e150b67ca05be2fc0c714fb773755e88..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/util/index.spec.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { toPromise, identity } from './';
-
-describe('views/Status/util', () => {
-  describe('toPromise', () => {
-    it('rejects on error result', () => {
-      const ERROR = new Error();
-      const FN = function (callback) {
-        callback(ERROR);
-      };
-
-      return toPromise(FN).catch(err => {
-        expect(err).to.equal(ERROR);
-      });
-    });
-
-    it('resolves on success result', () => {
-      const SUCCESS = 'ok, we are good';
-      const FN = function (callback) {
-        callback(null, SUCCESS);
-      };
-
-      return toPromise(FN).then(success => {
-        expect(success).to.equal(SUCCESS);
-      });
-    });
-  });
-
-  describe('identity', () => {
-    it('returns the value passed in', () => {
-      const TEST = { abc: 'def' };
-
-      expect(identity(TEST)).to.deep.equal(TEST);
-    });
-  });
-});
diff --git a/js/src/views/RpcCalls/util/react.js b/js/src/views/RpcCalls/util/react.js
deleted file mode 100644
index 4ae260db2e16cad01ab199b826bcb0c69831922e..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/util/react.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isValidElement } from 'react';
-
-export function isReactComponent (componentOrElem) {
-  return isValidElement(componentOrElem) && typeof componentOrElem.type === 'function';
-}
diff --git a/js/src/views/RpcCalls/util/rpc-md.js b/js/src/views/RpcCalls/util/rpc-md.js
deleted file mode 100644
index 99dbca695cac5d3a1b690fa480d91cef35ce0a19..0000000000000000000000000000000000000000
--- a/js/src/views/RpcCalls/util/rpc-md.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isPlainObject } from 'lodash';
-
-export function formatRpcMd (val) {
-  if (!isPlainObject(val)) {
-    return val;
-  }
-
-  return val.description + Object.keys(val.details)
-                            .map(key => `- \`${key}\`: ${val.details[key]}`)
-                            .join('\n');
-}
diff --git a/js/src/views/Settings/Background/background.css b/js/src/views/Settings/Background/background.css
deleted file mode 100644
index 09e96491c4d185d5c97c6adc2fb3c6088a847080..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Background/background.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.bgcontainer {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-}
-
-.bgflex {
-  flex-basis: 25%;
-  box-sizing: border-box;
-  display: inline-block;
-  padding: 0 0.5em 1em 0.5em;
-}
-
-.bgseed {
-  background: black;
-  border-radius: 4px;
-}
-
-.seed,
-.seedactive {
-  height: 10em;
-  border-radius: 4px;
-  cursor: pointer;
-  border: 2px solid rgba(255, 255, 255, 1);
-}
-
-.seed {
-  opacity: 0.5;
-}
diff --git a/js/src/views/Settings/Background/background.js b/js/src/views/Settings/Background/background.js
deleted file mode 100644
index 95116b24b37be8d1cccbe7a1ce242a04f077fe15..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Background/background.js
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import NavigationRefresh from 'material-ui/svg-icons/navigation/refresh';
-
-import { Button, Container, ParityBackground } from '~/ui';
-
-import { updateBackground } from '../actions';
-
-import layout from '../layout.css';
-import styles from './background.css';
-
-let counter = 0;
-
-class Background extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired,
-    muiTheme: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    settings: PropTypes.object.isRequired,
-    updateBackground: PropTypes.func.isRequired
-  }
-
-  state = {
-    seeds: []
-  }
-
-  componentDidMount () {
-    const { settings } = this.props;
-    const seeds = new Array(20).fill(null);
-
-    seeds[0] = settings.backgroundSeed;
-
-    this.setState({
-      seeds
-    }, () => this.generateSeeds());
-  }
-
-  render () {
-    return (
-      <Container
-        title={
-          <FormattedMessage id='settings.background.label' />
-        }
-      >
-        <div className={ layout.layout }>
-          <div className={ layout.overview }>
-            <div>
-              <FormattedMessage
-                id='settings.background.overview_0'
-                defaultMessage='The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new Signer token. This is so that decentralized applications cannot pretend to be trustworthy.'
-              />
-            </div>
-            <div>
-              <FormattedMessage
-                id='settings.background.overview_1'
-                defaultMessage='Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or use a new Signer token.'
-              />
-            </div>
-            <div>
-              <Button
-                icon={ <NavigationRefresh /> }
-                label={
-                  <FormattedMessage
-                    id='settings.background.button_more'
-                    defaultMessage='generate more'
-                  />
-                }
-                onClick={ this.generateSeeds }
-              />
-            </div>
-          </div>
-          <div className={ layout.details }>
-            <div className={ styles.bgcontainer }>
-              { this.renderBackgrounds() }
-            </div>
-          </div>
-        </div>
-      </Container>
-    );
-  }
-
-  renderBackgrounds () {
-    const { settings } = this.props;
-    const { seeds } = this.state;
-
-    return seeds.map((seed, index) => {
-      return (
-        <div className={ styles.bgflex } key={ index }>
-          <div className={ styles.bgseed }>
-            <ParityBackground
-              className={ settings.backgroundSeed === seed ? styles.seedactive : styles.seed }
-              seed={ seed }
-              onClick={ this.onSelect(seed) }
-            />
-          </div>
-        </div>
-      );
-    });
-  }
-
-  onSelect = (seed) => {
-    const { muiTheme } = this.context;
-    const { updateBackground } = this.props;
-
-    return (event) => {
-      muiTheme.parity.setBackgroundSeed(seed);
-      updateBackground(seed);
-    };
-  }
-
-  generateSeeds = () => {
-    const { seeds } = this.state;
-    const current = this.props.settings.backgroundSeed;
-
-    const newSeeds = seeds.map((seed) => {
-      if (seed === current) {
-        return seed;
-      }
-
-      return this.generateSeed();
-    });
-
-    this.setState({
-      seeds: newSeeds
-    });
-  }
-
-  generateSeed () {
-    const { api, muiTheme } = this.context;
-
-    return api.util.sha3.text(`${muiTheme.backgroundSeed}${Math.random()}${counter++}`);
-  }
-}
-
-function mapStateToProps (state) {
-  const { settings } = state;
-
-  return { settings };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({ updateBackground }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Background);
diff --git a/js/src/views/Settings/Background/index.js b/js/src/views/Settings/Background/index.js
deleted file mode 100644
index 43b1ceab0875d25718758ad5798c6b32ef5f7804..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Background/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './background';
diff --git a/js/src/views/Settings/Parity/index.js b/js/src/views/Settings/Parity/index.js
deleted file mode 100644
index 7fe520c606fa64436bb8b833267a26d839f943f4..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Parity/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './parity';
diff --git a/js/src/views/Settings/Parity/parity.js b/js/src/views/Settings/Parity/parity.js
deleted file mode 100644
index 7de9b8061e19f4da36464792db985791211b2c91..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Parity/parity.js
+++ /dev/null
@@ -1,283 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { MenuItem } from 'material-ui';
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Select, Container, LanguageSelector } from '~/ui';
-import Features, { FeaturesStore, FEATURES } from '~/ui/Features';
-
-import Store, { LOGLEVEL_OPTIONS } from './store';
-import layout from '../layout.css';
-
-@observer
-export default class Parity extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  store = new Store(this.context.api);
-  features = FeaturesStore.get();
-
-  componentWillMount () {
-    this.store.loadChain();
-    return this.store.loadMode();
-  }
-
-  render () {
-    return (
-      <Container
-        title={
-          <FormattedMessage id='settings.parity.label' />
-        }
-      >
-        <div className={ layout.layout }>
-          <div className={ layout.overview }>
-            <div>
-              <FormattedMessage
-                id='settings.parity.overview_0'
-                defaultMessage='Control the Parity node settings and nature of syncing via this interface.'
-              />
-            </div>
-          </div>
-          <div className={ layout.details }>
-            { this.renderChains() }
-            { this.renderModes() }
-            <Features />
-            <LanguageSelector />
-          </div>
-        </div>
-        { this.renderLogsConfig() }
-      </Container>
-    );
-  }
-
-  renderItem (name, label) {
-    return (
-      <MenuItem
-        key={ name }
-        label={ label }
-        value={ name }
-      >
-        { label }
-      </MenuItem>
-    );
-  }
-
-  renderLogsConfig () {
-    if (!this.features.active[FEATURES.LOGLEVELS]) {
-      return null;
-    }
-
-    return (
-      <div className={ layout.layout }>
-        <div className={ layout.overview }>
-          <div>
-            <FormattedMessage
-              id='settings.parity.loglevels'
-              defaultMessage='Choose the different logs level.'
-            />
-          </div>
-        </div>
-        <div className={ layout.details }>
-          { this.renderLogsLevels() }
-        </div>
-      </div>
-    );
-  }
-
-  renderLogsLevels () {
-    const { logLevels } = this.store;
-
-    return Object
-      .keys(logLevels)
-      .map((key) => {
-        const { level, log } = logLevels[key];
-        const { desc } = log;
-
-        const onChange = (_, index) => {
-          this.store.updateLoggerLevel(log.key, Object.values(LOGLEVEL_OPTIONS)[index].value);
-        };
-
-        return (
-          <div key={ key }>
-            <p>{ desc }</p>
-            <Select
-              onChange={ onChange }
-              value={ level }
-              values={ LOGLEVEL_OPTIONS }
-            />
-          </div>
-        );
-      });
-  }
-
-  renderModes () {
-    const { mode } = this.store;
-
-    return (
-      <Select
-        id='parityModeSelect'
-        hint={
-          <FormattedMessage
-            id='settings.parity.modes.hint'
-            defaultMessage='the syncing mode for the Parity node'
-          />
-        }
-        label={
-          <FormattedMessage
-            id='settings.parity.modes.label'
-            defaultMessage='mode of operation'
-          />
-        }
-        onChange={ this.onChangeMode }
-        value={ mode }
-      >
-        {
-          this.renderItem('active', (
-            <FormattedMessage
-              id='settings.parity.modes.mode_active'
-              defaultMessage='Parity continuously syncs the chain'
-            />
-          ))
-        }
-        {
-          this.renderItem('passive', (
-            <FormattedMessage
-              id='settings.parity.modes.mode_passive'
-              defaultMessage='Parity syncs initially, then sleeps and wakes regularly to resync'
-            />
-          ))
-        }
-        {
-          this.renderItem('dark', (
-            <FormattedMessage
-              id='settings.parity.modes.mode_dark'
-              defaultMessage='Parity syncs only when the RPC is active'
-            />
-          ))
-        }
-        {
-          this.renderItem('offline', (
-            <FormattedMessage
-              id='settings.parity.modes.mode_offline'
-              defaultMessage="Parity doesn't sync"
-            />
-          ))
-        }
-      </Select>
-    );
-  }
-
-  renderChains () {
-    const { chain } = this.store;
-
-    return (
-      <Select
-        id='parityChainSelect'
-        hint={
-          <FormattedMessage
-            id='settings.parity.chains.hint'
-            defaultMessage='the chain for the Parity node to sync to'
-          />
-        }
-        label={
-          <FormattedMessage
-            id='settings.parity.chains.label'
-            defaultMessage='chain/network to sync'
-          />
-        }
-        onChange={ this.onChangeChain }
-        value={ chain }
-      >
-        {
-          this.renderItem('foundation', (
-            <FormattedMessage
-              id='settings.parity.chains.chain_foundation'
-              defaultMessage='Parity syncs to the Ethereum network launched by the Ethereum Foundation'
-            />
-          ))
-        }
-        {
-          this.renderItem('kovan', (
-            <FormattedMessage
-              id='settings.parity.chains.chain_kovan'
-              defaultMessage='Parity syncs to the Kovan test network'
-            />
-          ))
-        }
-        {
-          this.renderItem('olympic', (
-            <FormattedMessage
-              id='settings.parity.chains.chain_olympic'
-              defaultMessage='Parity syncs to the Olympic test network'
-            />
-          ))
-        }
-        {
-          this.renderItem('morden', (
-            <FormattedMessage
-              id='settings.parity.chains.cmorden_kovan'
-              defaultMessage='Parity syncs to Morden (Classic) test network'
-            />
-          ))
-        }
-        {
-          this.renderItem('ropsten', (
-            <FormattedMessage
-              id='settings.parity.chains.chain_ropsten'
-              defaultMessage='Parity syncs to the Ropsten test network'
-            />
-          ))
-        }
-        {
-          this.renderItem('classic', (
-            <FormattedMessage
-              id='settings.parity.chains.chain_classic'
-              defaultMessage='Parity syncs to the Ethereum Classic network'
-            />
-          ))
-        }
-        {
-          this.renderItem('expanse', (
-            <FormattedMessage
-              id='settings.parity.chains.chain_expanse'
-              defaultMessage='Parity syncs to the Expanse network'
-            />
-          ))
-        }
-        {
-          this.renderItem('dev', (
-            <FormattedMessage
-              id='settings.parity.chains.chain_dev'
-              defaultMessage='Parity uses a local development chain'
-            />
-          ))
-        }
-      </Select>
-    );
-  }
-
-  onChangeMode = (event, index, mode) => {
-    this.store.changeMode(mode || event.target.value);
-  }
-
-  onChangeChain = (event, index, chain) => {
-    this.store.changeChain(chain || event.target.value);
-  }
-}
diff --git a/js/src/views/Settings/Parity/parity.spec.js b/js/src/views/Settings/Parity/parity.spec.js
deleted file mode 100644
index 8b5ff61eb7225bd7c6b467b8e5b31070654a0926..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Parity/parity.spec.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { createApi } from './parity.test.js';
-import Parity from './';
-
-let component;
-let instance;
-
-function render (props = {}) {
-  component = shallow(
-    <Parity { ...props } />,
-    { context: { api: createApi() } }
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Settings/Parity', () => {
-  beforeEach(() => {
-    render();
-    sinon.spy(instance.store, 'loadMode');
-    sinon.spy(instance.store, 'loadChain');
-  });
-
-  afterEach(() => {
-    instance.store.loadMode.restore();
-    instance.store.loadChain.restore();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('componentWillMount', () => {
-    beforeEach(() => {
-      return instance.componentWillMount();
-    });
-
-    it('loads the mode in the store', () => {
-      expect(instance.store.loadMode).to.have.been.called;
-    });
-
-    it('loads the chain in the store', () => {
-      expect(instance.store.loadChain).to.have.been.called;
-    });
-  });
-
-  describe('components', () => {
-    it('renders a Container component', () => {
-      expect(component.find('Container')).to.have.length(1);
-    });
-
-    it('renders a LanguageSelector component', () => {
-      expect(component.find('LanguageSelector')).to.have.length(1);
-    });
-
-    it('renders a Features component', () => {
-      expect(component.find('LanguageSelector')).to.have.length(1);
-    });
-  });
-
-  describe('Parity features', () => {
-    describe('mode selector', () => {
-      let select;
-
-      beforeEach(() => {
-        select = component.find('Select[id="parityModeSelect"]');
-        sinon.spy(instance.store, 'changeMode');
-      });
-
-      afterEach(() => {
-        instance.store.changeMode.restore();
-      });
-
-      it('renders a mode selector', () => {
-        expect(select).to.have.length(1);
-      });
-
-      it('changes the mode on the store when changed', () => {
-        select.simulate('change', { target: { value: 'dark' } });
-        expect(instance.store.changeMode).to.have.been.calledWith('dark');
-      });
-    });
-
-    describe('chain selector', () => {
-      let select;
-
-      beforeEach(() => {
-        select = component.find('Select[id="parityChainSelect"]');
-        sinon.spy(instance.store, 'changeChain');
-      });
-
-      afterEach(() => {
-        instance.store.changeChain.restore();
-      });
-
-      it('renders a chain selector', () => {
-        expect(select).to.have.length(1);
-      });
-
-      it('changes the chain on the store when changed', () => {
-        select.simulate('change', { target: { value: 'dark' } });
-        expect(instance.store.changeChain).to.have.been.calledWith('dark');
-      });
-    });
-  });
-});
diff --git a/js/src/views/Settings/Parity/parity.test.js b/js/src/views/Settings/Parity/parity.test.js
deleted file mode 100644
index 41b337075329a68c8052a06c025d1bce4a93500a..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Parity/parity.test.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-function createApi () {
-  return {
-    parity: {
-      mode: sinon.stub().resolves('passive'),
-      setMode: sinon.stub().resolves(true),
-      chain: sinon.stub().resolves('foundation'),
-      setChain: sinon.stub().resolves(true)
-    }
-  };
-}
-
-export {
-  createApi
-};
diff --git a/js/src/views/Settings/Parity/store.js b/js/src/views/Settings/Parity/store.js
deleted file mode 100644
index 6b9c477e8e7e3255453062e54f0af811a77c5c38..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Parity/store.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import LogLevel from 'loglevel';
-import { action, observable } from 'mobx';
-
-import { LOG_KEYS } from '~/config';
-
-const DEFAULT_MODE = 'active';
-const DEFAULT_CHAIN = 'foundation';
-const LOGLEVEL_OPTIONS = Object
-  .keys(LogLevel.levels)
-  .map((name) => {
-    return {
-      name,
-      value: LogLevel.levels[name]
-    };
-  });
-
-export default class Store {
-  @observable logLevels = {};
-  @observable mode = DEFAULT_MODE;
-  @observable chain = DEFAULT_CHAIN;
-
-  constructor (api) {
-    this._api = api;
-
-    this.loadLogLevels();
-  }
-
-  @action setLogLevels = (logLevels) => {
-    this.logLevels = { ...logLevels };
-  }
-
-  @action setLogLevelsSelect = (logLevelsSelect) => {
-    this.logLevelsSelect = logLevelsSelect;
-  }
-
-  @action setMode = (mode) => {
-    this.mode = mode;
-  }
-
-  @action setChain = (chain) => {
-    this.chain = chain;
-  }
-
-  changeMode (mode) {
-    return this._api.parity
-      .setMode(mode)
-      .then((result) => {
-        if (result) {
-          this.setMode(mode);
-        }
-      })
-      .catch((error) => {
-        console.warn('changeMode', error);
-      });
-  }
-
-  changeChain (chain) {
-    return this._api.parity
-      .setChain(chain)
-      .then((result) => {
-        if (result) {
-          this.setChain(chain);
-        }
-      })
-      .catch((error) => {
-        console.warn('changeChain', error);
-      });
-  }
-
-  loadLogLevels () {
-    this.setLogLevels(
-      Object
-        .keys(LOG_KEYS)
-        .reduce((state, logKey) => {
-          const log = LOG_KEYS[logKey];
-          const logger = LogLevel.getLogger(log.key);
-          const level = logger.getLevel();
-
-          state[logKey] = {
-            level,
-            log
-          };
-
-          return state;
-        }, this.logLevels)
-    );
-  }
-
-  updateLoggerLevel (key, level) {
-    LogLevel.getLogger(key).setLevel(level);
-    this.loadLogLevels();
-  }
-
-  loadMode () {
-    return this._api.parity
-      .mode()
-      .then((mode) => {
-        this.setMode(mode);
-      })
-      .catch((error) => {
-        console.warn('loadMode', error);
-      });
-  }
-
-  loadChain () {
-    return this._api.parity
-      .chain()
-      .then((chain) => {
-        this.setChain(chain);
-      })
-      .catch((error) => {
-        console.warn('loadChain', error);
-      });
-  }
-}
-
-export {
-  LOGLEVEL_OPTIONS
-};
diff --git a/js/src/views/Settings/Parity/store.spec.js b/js/src/views/Settings/Parity/store.spec.js
deleted file mode 100644
index f965b9c4454f49f093888089f18cdd10c03ca877..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Parity/store.spec.js
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import { createApi } from './parity.test.js';
-import Store from './store';
-
-let api;
-let store;
-
-function createStore () {
-  api = createApi();
-  store = new Store(api);
-
-  return store;
-}
-
-describe('views/Settings/Parity/Store', () => {
-  beforeEach(() => {
-    createStore();
-    sinon.spy(store, 'setMode');
-    sinon.spy(store, 'setChain');
-  });
-
-  afterEach(() => {
-    store.setMode.restore();
-    store.setChain.restore();
-  });
-
-  it('defaults to mode === active', () => {
-    expect(store.mode).to.equal('active');
-  });
-
-  it('defaults to chain === foundation', () => {
-    expect(store.chain).to.equal('foundation');
-  });
-
-  describe('@action', () => {
-    describe('setMode', () => {
-      it('sets the mode', () => {
-        store.setMode('offline');
-        expect(store.mode).to.equal('offline');
-      });
-    });
-
-    describe('setChain', () => {
-      it('sets the chain', () => {
-        store.setChain('dev');
-        expect(store.chain).to.equal('dev');
-      });
-    });
-  });
-
-  describe('operations', () => {
-    describe('changeMode', () => {
-      beforeEach(() => {
-        return store.changeMode('offline');
-      });
-
-      it('calls parity.setMode', () => {
-        expect(api.parity.setMode).to.have.been.calledWith('offline');
-      });
-
-      it('sets the mode as provided', () => {
-        expect(store.setMode).to.have.been.calledWith('offline');
-      });
-    });
-
-    describe('loadMode', () => {
-      beforeEach(() => {
-        return store.loadMode();
-      });
-
-      it('calls parity.mode', () => {
-        expect(api.parity.mode).to.have.been.called;
-      });
-
-      it('sets the mode as retrieved', () => {
-        expect(store.setMode).to.have.been.calledWith('passive');
-      });
-    });
-
-    describe('changeChain', () => {
-      beforeEach(() => {
-        return store.changeChain('dev');
-      });
-
-      it('calls parity.setChain', () => {
-        expect(api.parity.setChain).to.have.been.calledWith('dev');
-      });
-
-      it('sets the chain as provided', () => {
-        expect(store.setChain).to.have.been.calledWith('dev');
-      });
-    });
-
-    describe('loadChain', () => {
-      beforeEach(() => {
-        return store.loadChain();
-      });
-
-      it('calls parity.chain', () => {
-        expect(api.parity.chain).to.have.been.called;
-      });
-
-      it('sets the chain as retrieved', () => {
-        expect(store.setChain).to.have.been.calledWith('foundation');
-      });
-    });
-  });
-});
diff --git a/js/src/views/Settings/Proxy/index.js b/js/src/views/Settings/Proxy/index.js
deleted file mode 100644
index 59befe9d17a3a97655e419d17012c1924ae2d89f..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Proxy/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './proxy';
diff --git a/js/src/views/Settings/Proxy/proxy.css b/js/src/views/Settings/Proxy/proxy.css
deleted file mode 100644
index a1da079c29f3226e8b6ee085712c5d35197a94b3..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Proxy/proxy.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.details {
-  line-height: 1.5em;
-}
-
-.details div+div {
-  padding-top: 1.25em;
-}
diff --git a/js/src/views/Settings/Proxy/proxy.js b/js/src/views/Settings/Proxy/proxy.js
deleted file mode 100644
index 70a533d1d0d04faef0b4fc72ea78a42830134198..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Proxy/proxy.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Container } from '~/ui';
-
-import layout from '../layout.css';
-import styles from './proxy.css';
-
-export default class Proxy extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { dappsUrl } = this.context.api;
-    const proxyurl = `${dappsUrl}/proxy/proxy.pac`;
-
-    return (
-      <Container
-        title={
-          <FormattedMessage id='settings.proxy.label' />
-        }
-      >
-        <div className={ layout.layout }>
-          <div className={ layout.overview }>
-            <div>
-              <FormattedMessage
-                id='settings.proxy.overview_0'
-                defaultMessage='The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.'
-              />
-            </div>
-          </div>
-          <div className={ layout.details }>
-            <div className={ styles.details }>
-              <div>
-                <FormattedMessage
-                  id='settings.proxy.details_0'
-                  defaultMessage='Instead of accessing Parity via the IP address and port, you will be able to access it via the .web3.site subdomain, by visiting {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,'
-                  values={ {
-                    homeProxy: <span className={ layout.console }>http://parity.web3.site/</span>
-                  } }
-                />
-              </div>
-              <div className={ layout.center }>
-                <a href={ proxyurl } target='_blank'>{ proxyurl }</a>
-              </div>
-              <div>
-                <FormattedMessage
-                  id='settings.proxy.details_1'
-                  defaultMessage='To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}.'
-                  values={ {
-                    windowsLink: <a href='https://blogs.msdn.microsoft.com/ieinternals/2013/10/11/understanding-web-proxy-configuration/' target='_blank'><FormattedMessage id='settings.proxy.details_windows' defaultMessage='Windows' /></a>,
-                    macOSLink: <a href='https://support.apple.com/kb/PH18553?locale=en_US' target='_blank'><FormattedMessage id='settings.proxy.details_macos' defaultMessage='macOS' /></a>,
-                    ubuntuLink: <a href='http://xmodulo.com/how-to-set-up-proxy-auto-config-on-ubuntu-desktop.html' target='_blank'><FormattedMessage id='settings.proxy.details_ubuntu' defaultMessage='Ubuntu' /></a>
-                  } }
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-      </Container>
-    );
-  }
-}
diff --git a/js/src/views/Settings/Views/defaults.js b/js/src/views/Settings/Views/defaults.js
deleted file mode 100644
index 7f3842504eac555a2de491f87a4078a229945759..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Views/defaults.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-
-import imagesEthcoreBlock from '~/../assets/images/parity-logo-white-no-text.svg';
-import { AccountsIcon, AddressesIcon, AppsIcon, ContactsIcon, FingerprintIcon, SettingsIcon } from '~/ui/Icons';
-
-import styles from './views.css';
-
-const defaultViews = {
-  home: {
-    active: true,
-    fixed: true,
-    icon: (
-      <img
-        className={ styles.logoIcon }
-        src={ imagesEthcoreBlock }
-      />
-    ),
-    route: '/home',
-    value: 'home'
-  },
-
-  accounts: {
-    active: true,
-    fixed: true,
-    icon: <AccountsIcon />,
-    route: '/accounts',
-    value: 'account'
-  },
-
-  addresses: {
-    active: true,
-    icon: <AddressesIcon />,
-    route: '/addresses',
-    value: 'address'
-  },
-
-  apps: {
-    active: true,
-    icon: <AppsIcon />,
-    route: '/apps',
-    value: 'app'
-  },
-
-  contracts: {
-    active: false,
-    onlyPersonal: true,
-    icon: <ContactsIcon />,
-    route: '/contracts',
-    value: 'contract'
-  },
-
-  signer: {
-    active: true,
-    fixed: true,
-    icon: <FingerprintIcon />,
-    route: '/signer',
-    value: 'signer'
-  },
-
-  settings: {
-    active: true,
-    fixed: true,
-    icon: <SettingsIcon />,
-    route: '/settings',
-    value: 'settings'
-  }
-};
-
-export default defaultViews;
diff --git a/js/src/views/Settings/Views/index.js b/js/src/views/Settings/Views/index.js
deleted file mode 100644
index 004ada849f563ecee53a0f7b523d014685f7e2fc..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Views/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import defaultViews from './defaults';
-
-export default from './views';
-
-export {
-  defaultViews
-};
diff --git a/js/src/views/Settings/Views/views.css b/js/src/views/Settings/Views/views.css
deleted file mode 100644
index de4079608caf185398ca6f424ba68627c5bf0e9b..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Views/views.css
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.signerIcon {
-  width: 24px;
-  height: 24px;
-  margin-bottom: 5px;
-}
-
-.view {
-}
-
-.view+.view {
-  padding-top: 1.5em;
-}
-
-.header {
-}
-
-.labelicon {
-  display: inline-block;
-  margin-right: 0.75em;
-}
-
-.label {
-  display: inline-block;
-  vertical-align: top;
-  line-height: 24px;
-  color: white !important;
-}
-
-.logoIcon {
-  height: 24px;
-  margin-bottom: 5px;
-  opacity: 0.5;
-}
-
-.info {
-  color: #aaa;
-  padding-left: 4.75em;
-}
diff --git a/js/src/views/Settings/Views/views.js b/js/src/views/Settings/Views/views.js
deleted file mode 100644
index 3a5e58aaa61f3087634dd768a0d57f05c1ab4b62..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/Views/views.js
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { Checkbox } from 'material-ui';
-
-import { Container } from '~/ui';
-
-import { toggleView } from '../actions';
-
-import layout from '../layout.css';
-import styles from './views.css';
-
-class Views extends Component {
-  static propTypes = {
-    settings: PropTypes.object.isRequired,
-    toggleView: PropTypes.func.isRequired,
-    availability: PropTypes.string.isRequired
-  }
-
-  render () {
-    return (
-      <Container
-        title={
-          <FormattedMessage id='settings.views.label' />
-        }
-      >
-        <div className={ layout.layout }>
-          <div className={ layout.overview }>
-            <div>
-              <FormattedMessage
-                id='settings.views.overview_0'
-                defaultMessage='Manage the available application views using only the parts of the application applicable to you.'
-              />
-            </div>
-            <div>
-              <FormattedMessage
-                id='settings.views.overview_1'
-                defaultMessage='Are you an end-user? The defaults are setup for both beginner and advanced users alike.'
-              />
-            </div>
-            <div>
-              <FormattedMessage
-                id='settings.views.overview_2'
-                defaultMessage='Are you a developer? Add some features to manage contracts and interact with application deployments.'
-              />
-            </div>
-            <div>
-              <FormattedMessage
-                id='settings.views.overview_3'
-                defaultMessage='Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.'
-              />
-            </div>
-          </div>
-          <div className={ layout.details }>
-            {
-              this.renderView('accounts',
-                <FormattedMessage
-                  id='settings.views.accounts.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.accounts.description'
-                  defaultMessage='A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, manage your balances and fund your accounts.'
-                />
-              )
-            }
-            {
-              this.renderView('addresses',
-                <FormattedMessage
-                  id='settings.views.addresses.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.addresses.description'
-                  defaultMessage='A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available at the click of a button when transacting.'
-                />
-              )
-            }
-            {
-              this.renderView('apps',
-                <FormattedMessage
-                  id='settings.views.apps.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.apps.description'
-                  defaultMessage='Decentralized applications that interact with the underlying network. Add applications, manage you application portfolio and interact with application from around the network.'
-                />
-              )
-            }
-            {
-              this.renderView('contracts',
-                <FormattedMessage
-                  id='settings.views.contracts.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.contracts.description'
-                  defaultMessage='Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, specifically for advanced users that understand the inner working of certain contracts.'
-                />
-              )
-            }
-            {
-              this.renderView('signer',
-                <FormattedMessage
-                  id='settings.views.signer.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.signer.description'
-                  defaultMessage='The secure transaction management area of the application where you can approve any outgoing transactions made from the application as well as those placed into the queue by decentralized applications.'
-                />
-              )
-            }
-            {
-              this.renderView('settings',
-                <FormattedMessage
-                  id='settings.views.settings.label'
-                />,
-                <FormattedMessage
-                  id='settings.views.settings.description'
-                  defaultMessage='This view. Allows you to customize the application in term of options, operation and look and feel.'
-                />
-              )
-            }
-          </div>
-        </div>
-      </Container>
-    );
-  }
-
-  renderViews () {
-    const { settings } = this.props;
-
-    return Object.keys(settings.views).map((id) => {
-      const description = <FormattedMessage id={ `settings.views.${id}.description` } />;
-      const label = <FormattedMessage id={ `settings.views.${id}.label` } />;
-
-      this.renderView(id, label, description);
-    });
-  }
-
-  renderView = (id, label, description) => {
-    const { settings, toggleView } = this.props;
-
-    const toggle = () => toggleView(id);
-    const view = settings.views[id];
-
-    if (view.onlyPersonal && this.props.availability !== 'personal') {
-      return null;
-    }
-
-    return (
-      <div className={ styles.view } key={ id }>
-        <Checkbox
-          disabled={ view.fixed }
-          label={
-            <div className={ styles.header }>
-              <div className={ styles.labelicon }>
-                { view.icon }
-              </div>
-              <div className={ styles.label }>
-                { label }
-              </div>
-            </div>
-          }
-          onCheck={ toggle }
-          checked={ view.active }
-          value={ view.active }
-        />
-        <div className={ styles.info }>
-          { description }
-        </div>
-      </div>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { settings } = state;
-  const { availability = 'unknown' } = state.nodeStatus.nodeKind || {};
-
-  return { settings, availability };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({ toggleView }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Views);
diff --git a/js/src/views/Settings/actions.js b/js/src/views/Settings/actions.js
deleted file mode 100644
index eb86413ac96d230cf19051c4929188f8e3306309..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/actions.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function toggleView (viewId) {
-  return {
-    type: 'toggleView',
-    viewId
-  };
-}
-
-export function updateBackground (backgroundSeed) {
-  return {
-    type: 'updateBackground',
-    backgroundSeed
-  };
-}
diff --git a/js/src/views/Settings/index.js b/js/src/views/Settings/index.js
deleted file mode 100644
index c8003c00d8dfe396fe375220b114527baad667e3..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import settingsReducer from './reducers';
-import { toggleView, updateBackground } from './actions';
-import SettingsBackground from './Background';
-import SettingsParity from './Parity';
-import SettingsProxy from './Proxy';
-import SettingsViews, { defaultViews } from './Views';
-
-export default from './settings';
-
-export {
-  SettingsBackground,
-  SettingsParity,
-  SettingsProxy,
-  SettingsViews,
-  defaultViews,
-  settingsReducer,
-  toggleView,
-  updateBackground
-};
diff --git a/js/src/views/Settings/layout.css b/js/src/views/Settings/layout.css
deleted file mode 100644
index cca6b52086131232f7e6dbb8edd3f73c84826b21..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/layout.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.layout {
-  padding-top: 1.5em;
-}
-
-.layout::after {
-  display: table;
-  clear: both;
-  content: '';
-}
-
-.overview, .details {
-  float: left;
-  box-sizing: border-box;
-}
-
-.overview {
-  width: 33.33333%;
-  width: -webkit-calc(100% / 12 * 4);
-  width: -moz-calc(100% / 12 * 4);
-  width: calc(100% / 12 * 4);
-}
-
-.overview {
-  opacity: 0.5;
-}
-
-.overview div {
-  line-height: 1.5em;
-}
-
-.overview>div+div {
-  margin-top: 1.25em;
-}
-
-.details {
-  width: 66.66665%;
-  width: -webkit-calc(100% / 12 * 8);
-  width: -moz-calc(100% / 12 * 8);
-  width: calc(100% / 12 * 8);
-  padding-left: 3em;
-}
-
-.console {
-  font-family: 'Roboto Mono', monospace;
-  background: rgba(255, 255, 255, 0.1);
-  font-size: 16px;
-  padding: 0 0.25em;
-}
-
-.center {
-  text-align: center;
-}
diff --git a/js/src/views/Settings/middleware.js b/js/src/views/Settings/middleware.js
deleted file mode 100644
index 30931cea17857430a731c5108185df52d4f02e0c..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/middleware.js
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import store from 'store';
-
-import defaultViews from './Views/defaults';
-
-function initBackground (store, api) {
-  const backgroundSeed = loadBackground() || api.util.sha3(`${Date.now()}`);
-
-  store.dispatch({
-    type: 'updateBackground',
-    backgroundSeed
-  });
-}
-
-function loadBackground () {
-  // Check global object to support embedding
-  return store.get('backgroundSeed') || window.backgroundSeed;
-}
-
-function saveBackground (backgroundSeed) {
-  store.set('backgroundSeed', backgroundSeed);
-}
-
-function initViews (store) {
-  const { settings } = store.getState();
-  const data = loadViews();
-  const viewIds = Object.keys(data).filter((viewId) => {
-    return settings.views[viewId] && data[viewId].active !== settings.views[viewId].active;
-  });
-
-  if (viewIds.length) {
-    store.dispatch({ type: 'toggleViews', viewIds });
-  }
-}
-
-function getFixedViews () {
-  const views = {};
-
-  Object.keys(defaultViews).forEach((id) => {
-    if (defaultViews[id].fixed) {
-      views[id] = { active: true };
-    }
-  });
-
-  return views;
-}
-
-function getDefaultViews () {
-  const views = {};
-
-  Object.keys(defaultViews).forEach((id) => {
-    views[id] = {
-      active: defaultViews[id].active || false
-    };
-  });
-
-  return views;
-}
-
-function loadViews () {
-  const fixed = getFixedViews();
-  const defaults = getDefaultViews();
-  let data;
-
-  try {
-    const json = store.get('views') || {};
-
-    data = Object.assign(defaults, json, fixed);
-  } catch (e) {
-    data = defaults;
-  }
-
-  return data;
-}
-
-function saveViews () {
-  store.set('views', getDefaultViews());
-}
-
-function toggleViews (viewIds) {
-  viewIds.forEach((id) => {
-    defaultViews[id].active = !defaultViews[id].active;
-  });
-
-  saveViews();
-}
-
-export default class SettingsMiddleware {
-  toMiddleware () {
-    return (store) => (next) => (action) => {
-      switch (action.type) {
-        case 'initAll':
-          initBackground(store, action.api);
-          initViews(store);
-          break;
-
-        case 'toggleView':
-          toggleViews([action.viewId]);
-          break;
-
-        case 'toggleViews':
-          toggleViews(action.viewIds);
-          break;
-
-        case 'updateBackground':
-          saveBackground(action.backgroundSeed);
-          break;
-      }
-
-      next(action);
-    };
-  }
-}
diff --git a/js/src/views/Settings/reducers.js b/js/src/views/Settings/reducers.js
deleted file mode 100644
index 601f9b99101fbf03da221c2c14293bea416af818..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/reducers.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { handleActions } from 'redux-actions';
-
-import views from './Views/defaults';
-
-const initialState = {
-  views,
-  backgroundSeed: `${Date.now()}`
-};
-
-export default handleActions({
-  toggleView (state, action) {
-    return Object.assign({}, state, { views });
-  },
-
-  toggleViews (state, action) {
-    return Object.assign({}, state, { views });
-  },
-
-  updateBackground (state, action) {
-    const { backgroundSeed } = action;
-
-    return Object.assign({}, state, { backgroundSeed });
-  }
-}, initialState);
diff --git a/js/src/views/Settings/settings.css b/js/src/views/Settings/settings.css
deleted file mode 100644
index cea3444f7fae9b78cf788f5d413225f205d3f4d5..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/settings.css
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.menu {
-  display: inline-block;
-}
-
-.bar {
-  justify-content: flex-start !important;
-}
-
-.tabs {
-  margin-left: 3em;
-}
-
-.tab,
-.tabactive {
-  padding: 16px 2em !important;
-  line-height: 24px !important;
-  width: auto !important;
-
-  &>div {
-    height: 24px !important;
-
-    &>div {
-      display: inline-block !important;
-    }
-  }
-
-  svg {
-    margin-right: 0.5em;
-    margin-bottom: 0 !important;
-  }
-
-  .menu {
-    vertical-align: top;
-    display: inline-block;
-  }
-}
-
-.imageIcon {
-  height: 20px;
-  margin: 2px 0.5em 2px 0 !important;
-  opacity: 0.5;
-}
-
-.tabactive {
-  .imageIcon {
-    opacity: 1;
-  }
-}
diff --git a/js/src/views/Settings/settings.js b/js/src/views/Settings/settings.js
deleted file mode 100644
index b172cd1dc9d240a698c416be9756741673c4ed5b..0000000000000000000000000000000000000000
--- a/js/src/views/Settings/settings.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { Tab, Tabs } from 'material-ui';
-import ActionSettingsEthernet from 'material-ui/svg-icons/action/settings-ethernet';
-import ImageBlurOn from 'material-ui/svg-icons/image/blur-on';
-import ImageRemoveRedEye from 'material-ui/svg-icons/image/remove-red-eye';
-
-import { Actionbar, Page } from '~/ui';
-import imagesEthcoreBlock from '../../../assets/images/parity-logo-white-no-text.svg';
-
-import styles from './settings.css';
-
-export default class Settings extends Component {
-  static contextTypes = {
-    router: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    children: PropTypes.object.isRequired
-  }
-
-  render () {
-    const { children } = this.props;
-    const hash = (window.location.hash || '').split('?')[0].split('/')[2];
-    const isProxied = window.location.hostname.indexOf('.parity') !== -1;
-    let proxy = null;
-
-    if (!isProxied) {
-      proxy = this.renderTab(hash, 'proxy', <ActionSettingsEthernet />);
-    }
-
-    return (
-      <div>
-        <Actionbar
-          className={ styles.bar }
-          title={
-            <FormattedMessage id='settings.label' />
-          }
-        >
-          <Tabs className={ styles.tabs } value={ hash }>
-            { this.renderTab(hash, 'views', <ImageRemoveRedEye />) }
-            { this.renderTab(hash, 'background', <ImageBlurOn />) }
-            { proxy }
-            { this.renderTab(hash, 'parity', <img src={ imagesEthcoreBlock } className={ styles.imageIcon } />) }
-          </Tabs>
-        </Actionbar>
-        <Page>
-          { children }
-        </Page>
-      </div>
-    );
-  }
-
-  renderTab (hash, section, icon) {
-    return (
-      <Tab
-        className={
-          hash === section
-            ? styles.tabactive
-            : styles.tab
-        }
-        icon={ icon }
-        key={ section }
-        label={
-          <div className={ styles.menu }>
-            <FormattedMessage id={ `settings.${section}.label` } />
-          </div>
-        }
-        onActive={ this.onActivate(section) }
-        value={ section }
-      />
-    );
-  }
-
-  onActivate = (section) => {
-    const { router } = this.context;
-
-    return (event) => {
-      router.push(`/settings/${section}`);
-    };
-  }
-}
diff --git a/js/src/views/Signer/_layout.css b/js/src/views/Signer/_layout.css
deleted file mode 100644
index 86a0df76bed026091739d67e9f0a4cb18b2a5c4b..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/_layout.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-$pendingHeight: 190px;
-$finishedHeight: 120px;
-
-$embedWidth: 920px;
-$statusWidth: 270px;
-
-$accountPadding: 75px;
diff --git a/js/src/views/Signer/components/Account/AccountLink/accountLink.css b/js/src/views/Signer/components/Account/AccountLink/accountLink.css
deleted file mode 100644
index 5039a193144eda0b06dc064d42c18180dfe92517..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/Account/AccountLink/accountLink.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.container {
-  text-decoration: none;
-  color: inherit;
-}
diff --git a/js/src/views/Signer/components/Account/AccountLink/accountLink.js b/js/src/views/Signer/components/Account/AccountLink/accountLink.js
deleted file mode 100644
index afa8e98e5791e19ad48a5ad17566e732e1f89b62..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/Account/AccountLink/accountLink.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { Link } from 'react-router';
-
-import styles from './accountLink.css';
-
-class AccountLink extends Component {
-  static propTypes = {
-    accountAddresses: PropTypes.array.isRequired,
-    address: PropTypes.string.isRequired,
-    className: PropTypes.string,
-    children: PropTypes.node,
-    externalLink: PropTypes.string.isRequired
-  }
-
-  state = {
-    link: null
-  };
-
-  componentWillMount () {
-    const { address, externalLink } = this.props;
-
-    this.updateLink(address, externalLink);
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const { address, externalLink } = nextProps;
-
-    this.updateLink(address, externalLink);
-  }
-
-  render () {
-    const { children, address, className, externalLink } = this.props;
-
-    if (externalLink) {
-      return (
-        <a
-          href={ this.state.link }
-          target='_blank'
-          className={ `${styles.container} ${className}` }
-        >
-          { children || address }
-        </a>
-      );
-    }
-
-    return (
-      <Link
-        className={ `${styles.container} ${className}` }
-        to={ this.state.link }
-      >
-        { children || address }
-      </Link>
-    );
-  }
-
-  updateLink (address, externalLink) {
-    const { accountAddresses } = this.props;
-    const isAccount = accountAddresses.includes(address);
-
-    let link = isAccount
-      ? `/accounts/${address}`
-      : `/addresses/${address}`;
-
-    if (externalLink) {
-      const path = externalLink.replace(/\/+$/, '');
-
-      link = `${path}/#${link}`;
-    }
-
-    this.setState({
-      link
-    });
-  }
-}
-
-function mapStateToProps (initState) {
-  const { accounts } = initState.personal;
-  const accountAddresses = Object.keys(accounts);
-
-  return () => {
-    return { accountAddresses };
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(AccountLink);
diff --git a/js/src/views/Signer/components/Account/AccountLink/index.js b/js/src/views/Signer/components/Account/AccountLink/index.js
deleted file mode 100644
index 5366f3b5b3c8487610841783a86de56b1f846cae..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/Account/AccountLink/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './accountLink';
diff --git a/js/src/views/Signer/components/Account/account.css b/js/src/views/Signer/components/Account/account.css
deleted file mode 100644
index 42e13de4fa57c740b979e6397b7b6b4f47ea1e63..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/Account/account.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.acc {
-  text-align: center;
-  display: inline-block;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  width: 100%;
-}
-
-.acc > * {
-  display: block;
-}
-
-.address {
-  font-family: monospace;
-}
-
-.acc img {
-  width: 28px;
-  height: 28px;
-  vertical-align: middle;
-  margin-right: 3px;
-}
-
-.name {
-  white-space: nowrap;
-  display: block;
-  vertical-align: middle;
-  text-transform: uppercase;
-
-  span {
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
-}
diff --git a/js/src/views/Signer/components/Account/account.js b/js/src/views/Signer/components/Account/account.js
deleted file mode 100644
index 5a675abf70c952916172e1c1b24aa86d09688520..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/Account/account.js
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { IdentityIcon, IdentityName } from '~/ui';
-import AccountLink from './AccountLink';
-
-import styles from './account.css';
-
-export default class Account extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    externalLink: PropTypes.string.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    balance: PropTypes.object // eth BigNumber, not required since it mght take time to fetch
-  };
-
-  state = {
-    balanceDisplay: '?'
-  };
-
-  componentWillMount () {
-    this.updateBalanceDisplay(this.props.balance);
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (nextProps.balance === this.props.balance) {
-      return;
-    }
-    this.updateBalanceDisplay(nextProps.balance);
-  }
-
-  updateBalanceDisplay (balance) {
-    this.setState({
-      balanceDisplay: balance ? balance.div(1e18).toFormat(3) : '?'
-    });
-  }
-
-  render () {
-    const { address, className, disabled, externalLink, netVersion } = this.props;
-
-    return (
-      <div className={ `${styles.acc} ${className}` }>
-        <AccountLink
-          address={ address }
-          externalLink={ externalLink }
-          netVersion={ netVersion }
-        >
-          <IdentityIcon
-            center
-            disabled={ disabled }
-            address={ address }
-          />
-        </AccountLink>
-        { this.renderName() }
-        { this.renderBalance() }
-      </div>
-    );
-  }
-
-  renderBalance () {
-    const { balanceDisplay } = this.state;
-
-    return (
-      <span> <strong>{ balanceDisplay }</strong> <small>ETH</small></span>
-    );
-  }
-
-  renderName () {
-    const { address, externalLink, netVersion } = this.props;
-    const name = <IdentityName address={ address } empty />;
-
-    if (!name) {
-      return (
-        <AccountLink
-          address={ address }
-          externalLink={ externalLink }
-          netVersion={ netVersion }
-        >
-          [{ this.shortAddress(address) }]
-        </AccountLink>
-      );
-    }
-
-    return (
-      <AccountLink
-        address={ address }
-        externalLink={ externalLink }
-        netVersion={ netVersion }
-      >
-        <span>
-          <span className={ styles.name }>{ name }</span>
-          <span className={ styles.address }>[{ this.tinyAddress(address) }]</span>
-        </span>
-      </AccountLink>
-    );
-  }
-
-  tinyAddress () {
-    const { address } = this.props;
-    const len = address.length;
-
-    return address.slice(2, 4) + '..' + address.slice(len - 2);
-  }
-
-  shortAddress () {
-    const { address } = this.props;
-    const len = address.length;
-
-    return address.slice(2, 8) + '..' + address.slice(len - 7);
-  }
-}
diff --git a/js/src/views/Signer/components/Account/index.js b/js/src/views/Signer/components/Account/index.js
deleted file mode 100644
index 8023eb211aa6e9dfece99aacbbf636c0c4601224..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/Account/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './account';
diff --git a/js/src/views/Signer/components/DecryptRequest/decryptRequest.js b/js/src/views/Signer/components/DecryptRequest/decryptRequest.js
deleted file mode 100644
index 703582c9e68c19f95b8a3c624e5812bf5aab6aba..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/DecryptRequest/decryptRequest.js
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import Account from '../Account';
-import TransactionPendingForm from '../TransactionPendingForm';
-import RequestOrigin from '../RequestOrigin';
-
-import styles from '../SignRequest/signRequest.css';
-
-@observer
-class DecryptRequest extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    address: PropTypes.string.isRequired,
-    data: PropTypes.string.isRequired,
-    id: PropTypes.object.isRequired,
-    isFinished: PropTypes.bool.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    signerStore: PropTypes.object.isRequired,
-
-    className: PropTypes.string,
-    focus: PropTypes.bool,
-    isSending: PropTypes.bool,
-    onConfirm: PropTypes.func,
-    onReject: PropTypes.func,
-    origin: PropTypes.any,
-    status: PropTypes.string
-  };
-
-  static defaultProps = {
-    focus: false,
-    origin: {
-      type: 'unknown',
-      details: ''
-    }
-  };
-
-  componentWillMount () {
-    const { address, signerStore } = this.props;
-
-    signerStore.fetchBalance(address);
-  }
-
-  render () {
-    const { className } = this.props;
-
-    return (
-      <div className={ `${styles.container} ${className}` }>
-        { this.renderDetails() }
-        { this.renderActions() }
-      </div>
-    );
-  }
-
-  renderDetails () {
-    const { api } = this.context;
-    const { address, data, netVersion, origin, signerStore } = this.props;
-    const { balances, externalLink } = signerStore;
-
-    const balance = balances[address];
-
-    if (!balance) {
-      return <div />;
-    }
-
-    return (
-      <div className={ styles.signDetails }>
-        <div className={ styles.address }>
-          <Account
-            address={ address }
-            balance={ balance }
-            className={ styles.account }
-            externalLink={ externalLink }
-            netVersion={ netVersion }
-          />
-          <RequestOrigin origin={ origin } />
-        </div>
-        <div className={ styles.info } title={ api.util.sha3(data) }>
-          <p>
-            <FormattedMessage
-              id='signer.decryptRequest.request'
-              defaultMessage='A request to decrypt data using your account:'
-            />
-          </p>
-
-          <div className={ styles.signData }>
-            <p>{ data }</p>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  renderActions () {
-    const { accounts, address, focus, isFinished, status, data } = this.props;
-    const account = accounts[address];
-
-    if (isFinished) {
-      if (status === 'confirmed') {
-        return (
-          <div className={ styles.actions }>
-            <span className={ styles.isConfirmed }>
-              <FormattedMessage
-                id='signer.decryptRequest.state.confirmed'
-                defaultMessage='Confirmed'
-              />
-            </span>
-          </div>
-        );
-      }
-
-      return (
-        <div className={ styles.actions }>
-          <span className={ styles.isRejected }>
-            <FormattedMessage
-              id='signer.decryptRequest.state.rejected'
-              defaultMessage='Rejected'
-            />
-          </span>
-        </div>
-      );
-    }
-
-    return (
-      <TransactionPendingForm
-        account={ account }
-        address={ address }
-        focus={ focus }
-        isSending={ this.props.isSending }
-        netVersion={ this.props.netVersion }
-        onConfirm={ this.onConfirm }
-        onReject={ this.onReject }
-        className={ styles.actions }
-        dataToSign={ { decrypt: data } }
-      />
-    );
-  }
-
-  onConfirm = (data) => {
-    const { id } = this.props;
-    const { password, decrypted, wallet } = data;
-
-    this.props.onConfirm({ id, password, decrypted, wallet });
-  }
-
-  onReject = () => {
-    this.props.onReject(this.props.id);
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts } = state.personal;
-
-  return {
-    accounts
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(DecryptRequest);
diff --git a/js/src/views/Signer/components/DecryptRequest/index.js b/js/src/views/Signer/components/DecryptRequest/index.js
deleted file mode 100644
index c2bc5e1e98f3ea59ca93e6f3ed36d38a48a991b8..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/DecryptRequest/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './decryptRequest';
diff --git a/js/src/views/Signer/components/RequestOrigin/index.js b/js/src/views/Signer/components/RequestOrigin/index.js
deleted file mode 100644
index 2f703c924284445712dc3458af9e71ee58a80f0b..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/RequestOrigin/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './requestOrigin';
diff --git a/js/src/views/Signer/components/RequestOrigin/requestOrigin.css b/js/src/views/Signer/components/RequestOrigin/requestOrigin.css
deleted file mode 100644
index f5717e10cb9175ade1f25fd6096a54fdbf586d5e..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/RequestOrigin/requestOrigin.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  text-align: left;
-  margin: 3em .5em;
-  opacity: 0.6;
-  font-size: 0.8em;
-
-  .unknown {
-    color: #e44;
-  }
-
-  .url {
-    max-width: 100%;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-
-  .hash {
-    margin-left: .5em;
-  }
-
-  .hash, .url {
-    margin-bottom: -.2em;
-    display: inline-block;
-  }
-}
diff --git a/js/src/views/Signer/components/RequestOrigin/requestOrigin.js b/js/src/views/Signer/components/RequestOrigin/requestOrigin.js
deleted file mode 100644
index 0f5055a1f06d59400371d15cc1a1eeaf5c8fdaa1..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/RequestOrigin/requestOrigin.js
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import IdentityIcon from '~/ui/IdentityIcon';
-
-import styles from './requestOrigin.css';
-
-export default class RequestOrigin extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    origin: PropTypes.shape({
-      type: PropTypes.oneOf(['unknown', 'dapp', 'rpc', 'ipc', 'signer']),
-      details: PropTypes.oneOfType([
-        PropTypes.string,
-        PropTypes.shape({
-          session: PropTypes.string.isRequired
-        })
-      ]).isRequired
-    }).isRequired
-  };
-
-  render () {
-    const { origin } = this.props;
-
-    return (
-      <div className={ styles.container }>
-        Requested { this.renderOrigin(origin) }
-      </div>
-    );
-  }
-
-  renderOrigin (origin) {
-    if (origin.type === 'unknown') {
-      return (
-        <span className={ styles.unknown }>
-          <FormattedMessage
-            id='signer.requestOrigin.unknownInterface'
-            defaultMessage='via unknown interface'
-          />
-        </span>
-      );
-    }
-
-    if (origin.type === 'dapp') {
-      return (
-        <span>
-          <FormattedMessage
-            id='signer.requestOrigin.dapp'
-            defaultMessage='by a dapp at {url}'
-            values={ {
-              url: (
-                <span className={ styles.url }>
-                  {
-                    origin.details || (
-                      <FormattedMessage
-                        id='signer.requestOrigin.unknownUrl'
-                        defaultMessage='unknown URL'
-                      />
-                    )
-                  }
-                </span>
-              )
-            } }
-          />
-        </span>
-      );
-    }
-
-    if (origin.type === 'rpc') {
-      return (
-        <span>
-          <FormattedMessage
-            id='signer.requestOrigin.rpc'
-            defaultMessage='via RPC {url}'
-            values={ {
-              url: (
-                <span className={ styles.url }>
-                  ({
-                    origin.details || (
-                      <FormattedMessage
-                        id='signer.requestOrigin.unknownRpc'
-                        defaultMessage='unidentified'
-                      />
-                    )
-                  })
-                </span>
-              )
-            } }
-          />
-        </span>
-      );
-    }
-
-    if (origin.type === 'ipc') {
-      return (
-        <span>
-          <FormattedMessage
-            id='signer.requestOrigin.ipc'
-            defaultMessage='via IPC session'
-          />
-          <span
-            className={ styles.hash }
-            title={ origin.details }
-          >
-            <IdentityIcon
-              address={ origin.details }
-              tiny
-            />
-          </span>
-        </span>
-      );
-    }
-
-    if (origin.type === 'signer') {
-      const session = origin.details && origin.details.session || origin.details;
-
-      return this.renderSigner(session);
-    }
-  }
-
-  renderSigner (session) {
-    if (session.substr(2) === this.context.api.transport.sessionHash) {
-      return (
-        <span title={ session }>
-          <FormattedMessage
-            id='signer.requestOrigin.signerCurrent'
-            defaultMessage='via current tab'
-          />
-        </span>
-      );
-    }
-
-    return (
-      <span>
-        <FormattedMessage
-          id='signer.requestOrigin.signerUI'
-          defaultMessage='via UI session'
-        />
-        <span
-          className={ styles.hash }
-          title={ `UI Session id: ${session}` }
-        >
-          <IdentityIcon
-            address={ session }
-            tiny
-          />
-        </span>
-      </span>
-    );
-  }
-}
diff --git a/js/src/views/Signer/components/RequestOrigin/requestOrigin.spec.js b/js/src/views/Signer/components/RequestOrigin/requestOrigin.spec.js
deleted file mode 100644
index 0faac6bd39fdfab9349dc46d4f6f06ee3e1a6d63..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/RequestOrigin/requestOrigin.spec.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import RequestOrigin from './';
-
-const context = {
-  context: {
-    api: {
-      transport: {
-        sessionHash: '1234'
-      }
-    }
-  }
-};
-
-describe('views/Signer/components/RequestOrigin', () => {
-  it('renders unknown', () => {
-    expect(shallow(
-      <RequestOrigin origin={ { type: 'unknown', details: '' } } />,
-      context
-    ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.unknownInterface');
-  });
-
-  it('renders dapps', () => {
-    expect(shallow(
-      <RequestOrigin origin={ { type: 'dapp', details: 'http://parity.io' } } />,
-      context
-    ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.dapp');
-  });
-
-  it('renders rpc', () => {
-    expect(shallow(
-      <RequestOrigin origin={ { type: 'rpc', details: '' } } />,
-      context
-    ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.rpc');
-  });
-
-  it('renders ipc', () => {
-    expect(shallow(
-      <RequestOrigin origin={ { type: 'ipc', details: '0x1234' } } />,
-      context
-    ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.ipc');
-  });
-
-  it('renders signer', () => {
-    expect(shallow(
-      <RequestOrigin origin={ { type: 'signer', details: '0x12345' } } />,
-      context
-    ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.signerUI');
-
-    expect(shallow(
-      <RequestOrigin origin={ { type: 'signer', details: '0x1234' } } />,
-      context
-    ).find('FormattedMessage').props().id).to.equal('signer.requestOrigin.signerCurrent');
-  });
-});
diff --git a/js/src/views/Signer/components/RequestPending/index.js b/js/src/views/Signer/components/RequestPending/index.js
deleted file mode 100644
index 53511d537950a5a8cb0bfbc1583c15db19f52fcb..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/RequestPending/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './requestPending';
diff --git a/js/src/views/Signer/components/RequestPending/requestPending.js b/js/src/views/Signer/components/RequestPending/requestPending.js
deleted file mode 100644
index 7865a1d776223bee4c3b139aa4ee10785347fc17..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/RequestPending/requestPending.js
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import DecryptRequest from '../DecryptRequest';
-import SignRequest from '../SignRequest';
-import TransactionPending from '../TransactionPending';
-
-export default class RequestPending extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    date: PropTypes.instanceOf(Date).isRequired,
-    focus: PropTypes.bool,
-    gasLimit: PropTypes.object.isRequired,
-    id: PropTypes.object.isRequired,
-    isSending: PropTypes.bool.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    onReject: PropTypes.func.isRequired,
-    origin: PropTypes.object.isRequired,
-    payload: PropTypes.oneOfType([
-      PropTypes.shape({ decrypt: PropTypes.object.isRequired }),
-      PropTypes.shape({ sendTransaction: PropTypes.object.isRequired }),
-      PropTypes.shape({ sign: PropTypes.object.isRequired }),
-      PropTypes.shape({ signTransaction: PropTypes.object.isRequired })
-    ]).isRequired,
-    signerStore: PropTypes.object.isRequired
-  };
-
-  static defaultProps = {
-    focus: false,
-    isSending: false
-  };
-
-  render () {
-    const { className, date, focus, gasLimit, id, isSending, netVersion, onReject, payload, signerStore, origin } = this.props;
-
-    if (payload.sign) {
-      const { sign } = payload;
-
-      return (
-        <SignRequest
-          address={ sign.address }
-          className={ className }
-          focus={ focus }
-          data={ sign.data }
-          id={ id }
-          isFinished={ false }
-          isSending={ isSending }
-          netVersion={ netVersion }
-          onConfirm={ this.onConfirm }
-          onReject={ onReject }
-          origin={ origin }
-          signerStore={ signerStore }
-        />
-      );
-    }
-
-    if (payload.decrypt) {
-      const { decrypt } = payload;
-
-      return (
-        <DecryptRequest
-          address={ decrypt.address }
-          className={ className }
-          focus={ focus }
-          data={ decrypt.msg }
-          id={ id }
-          isFinished={ false }
-          isSending={ isSending }
-          netVersion={ netVersion }
-          onConfirm={ this.onConfirm }
-          onReject={ onReject }
-          origin={ origin }
-          signerStore={ signerStore }
-        />
-      );
-    }
-
-    const transaction = payload.sendTransaction || payload.signTransaction;
-
-    if (transaction) {
-      return (
-        <TransactionPending
-          className={ className }
-          date={ date }
-          focus={ focus }
-          gasLimit={ gasLimit }
-          id={ id }
-          isSending={ isSending }
-          netVersion={ netVersion }
-          onConfirm={ this.onConfirm }
-          onReject={ onReject }
-          origin={ origin }
-          signerStore={ signerStore }
-          transaction={ transaction }
-        />
-      );
-    }
-
-    console.error('RequestPending: Unknown payload', payload);
-    return null;
-  }
-
-  onConfirm = (data) => {
-    const { onConfirm, payload } = this.props;
-
-    data.payload = payload;
-    onConfirm(data);
-  };
-}
diff --git a/js/src/views/Signer/components/RequestPending/requestPending.spec.js b/js/src/views/Signer/components/RequestPending/requestPending.spec.js
deleted file mode 100644
index 3c2d29cf0ff4310c1c7ee86f8ceb42c9c0ce3581..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/RequestPending/requestPending.spec.js
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import RequestPending from './';
-
-const ADDRESS = '0x1234567890123456789012345678901234567890';
-const TRANSACTION = {
-  from: ADDRESS,
-  gas: new BigNumber(21000),
-  gasPrice: new BigNumber(20000000),
-  value: new BigNumber(1)
-};
-const PAYLOAD_SENDTX = {
-  sendTransaction: TRANSACTION
-};
-const PAYLOAD_SIGN = {
-  sign: {
-    address: ADDRESS,
-    data: 'testing'
-  }
-};
-const PAYLOAD_SIGNTX = {
-  signTransaction: TRANSACTION
-};
-const PAYLOAD_DECRYPT = {
-  decrypt: {
-    address: ADDRESS,
-    msg: 'testing'
-  }
-};
-
-let component;
-let onConfirm;
-let onReject;
-
-function render (payload) {
-  onConfirm = sinon.stub();
-  onReject = sinon.stub();
-
-  component = shallow(
-    <RequestPending
-      date={ new Date() }
-      gasLimit={ new BigNumber(100000) }
-      id={ new BigNumber(123) }
-      isSending={ false }
-      netVersion='42'
-      onConfirm={ onConfirm }
-      onReject={ onReject }
-      origin={ {} }
-      payload={ payload }
-      store={ {} }
-    />
-  );
-
-  return component;
-}
-
-describe('views/Signer/RequestPending', () => {
-  describe('sendTransaction', () => {
-    beforeEach(() => {
-      render(PAYLOAD_SENDTX);
-    });
-
-    it('renders defaults', () => {
-      expect(component).to.be.ok;
-    });
-
-    it('renders TransactionPending component', () => {
-      expect(component.find('Connect(TransactionPending)')).to.have.length(1);
-    });
-  });
-
-  describe('sign', () => {
-    beforeEach(() => {
-      render(PAYLOAD_SIGN);
-    });
-
-    it('renders defaults', () => {
-      expect(component).to.be.ok;
-    });
-
-    it('renders SignRequest component', () => {
-      expect(component.find('Connect(SignRequest)')).to.have.length(1);
-    });
-  });
-
-  describe('signTransaction', () => {
-    beforeEach(() => {
-      render(PAYLOAD_SIGNTX);
-    });
-
-    it('renders defaults', () => {
-      expect(component).to.be.ok;
-    });
-
-    it('renders TransactionPending component', () => {
-      expect(component.find('Connect(TransactionPending)')).to.have.length(1);
-    });
-  });
-
-  describe('decrypt', () => {
-    beforeEach(() => {
-      render(PAYLOAD_DECRYPT);
-    });
-
-    it('renders defaults', () => {
-      expect(component).to.be.ok;
-    });
-
-    it('renders DecryptRequest component', () => {
-      expect(component.find('Connect(DecryptRequest)')).to.have.length(1);
-    });
-  });
-});
diff --git a/js/src/views/Signer/components/SignRequest/index.js b/js/src/views/Signer/components/SignRequest/index.js
deleted file mode 100644
index 6a28008e44a364e98070b9ca1773aae9f65191dc..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/SignRequest/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './signRequest';
diff --git a/js/src/views/Signer/components/SignRequest/signRequest.css b/js/src/views/Signer/components/SignRequest/signRequest.css
deleted file mode 100644
index a8b3ddd6d1d0598c88656301ca616b1771904708..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/SignRequest/signRequest.css
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../../_layout.css';
-
-.container {
-  display: flex;
-  padding: 1.5em 1em 1.5em 0;
-}
-
-.actions, .signDetails {
-  vertical-align: middle;
-  min-height: $pendingHeight;
-}
-
-.signData {
-  border: 0.25em solid red;
-  margin-left: 2em;
-  padding: 0.5em;
-  overflow: auto;
-  max-height: 6em;
-  max-width: calc(100% - 2em);
-}
-
-.signData > p {
-  color: white;
-}
-
-.signDetails {
-  flex: 1;
-  overflow: auto;
-}
-
-.account img {
-  display: inline-block;
-  height: 50px;
-  margin: 5px;
-  width: 50px;
-}
-
-.address, .info {
-  box-sizing: border-box;
-  display: inline-block;
-  vertical-align: top;
-}
-
-.address {
-  width: 40%;
-}
-
-.info {
-  color: #E53935;
-  width: 60%;
-}
-
-.info p:first-child {
-  margin-top: 0;
-}
-
-/* TODO [todr] copy&paste from transactions */
-.isConfirmed {
-  color: green;
-}
-
-.isRejected {
-  opacity: 0.7;
-}
-
-.txHash {
-  display: block;
-  word-break: break-all;
-}
-
-.actions {
-  display: inline-block;
-  min-height: $finishedHeight;
-}
diff --git a/js/src/views/Signer/components/SignRequest/signRequest.js b/js/src/views/Signer/components/SignRequest/signRequest.js
deleted file mode 100644
index 2f97f140f5f0382245988f7152449de5bf74a643..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/SignRequest/signRequest.js
+++ /dev/null
@@ -1,279 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import ReactTooltip from 'react-tooltip';
-
-import HardwareStore from '~/mobx/hardwareStore';
-
-import Account from '../Account';
-import TransactionPendingForm from '../TransactionPendingForm';
-import RequestOrigin from '../RequestOrigin';
-
-import styles from './signRequest.css';
-
-function isAscii (data) {
-  for (var i = 2; i < data.length; i += 2) {
-    let n = parseInt(data.substr(i, 2), 16);
-
-    if (n < 32 || n >= 128) {
-      return false;
-    }
-  }
-  return true;
-}
-
-@observer
-class SignRequest extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    address: PropTypes.string.isRequired,
-    data: PropTypes.string.isRequired,
-    id: PropTypes.object.isRequired,
-    isFinished: PropTypes.bool.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    signerStore: PropTypes.object.isRequired,
-
-    className: PropTypes.string,
-    focus: PropTypes.bool,
-    isSending: PropTypes.bool,
-    onConfirm: PropTypes.func,
-    onReject: PropTypes.func,
-    origin: PropTypes.any,
-    status: PropTypes.string
-  };
-
-  static defaultProps = {
-    focus: false,
-    origin: {
-      type: 'unknown',
-      details: ''
-    }
-  };
-
-  state = {
-    hashToSign: null
-  };
-
-  hardwareStore = HardwareStore.get(this.context.api);
-
-  componentWillMount () {
-    const { address, signerStore } = this.props;
-
-    signerStore.fetchBalance(address);
-  }
-
-  componentDidMount () {
-    this.computeHashToSign(this.props.data);
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (this.props.data !== nextProps.data) {
-      this.computeHashToSign(nextProps.data);
-    }
-  }
-
-  computeHashToSign (data) {
-    const { sha3, hexToBytes, asciiToHex } = this.context.api.util;
-    const bytes = hexToBytes(data);
-    const message = hexToBytes(asciiToHex(`\x19Ethereum Signed Message:\n${bytes.length}`));
-    const hashToSign = sha3(message.concat(bytes));
-
-    this.setState({ hashToSign });
-  }
-
-  render () {
-    const { className } = this.props;
-
-    return (
-      <div className={ `${styles.container} ${className}` }>
-        { this.renderDetails() }
-        { this.renderActions() }
-      </div>
-    );
-  }
-
-  renderAsciiDetails (ascii) {
-    return (
-      <div className={ styles.signData }>
-        <p>{ascii}</p>
-      </div>
-    );
-  }
-
-  renderBinaryDetails (data) {
-    return (
-      <div className={ styles.signData }>
-        <p>
-          <FormattedMessage
-            id='signer.signRequest.unknownBinary'
-            defaultMessage='(Unknown binary data)'
-          />
-        </p>
-      </div>
-    );
-  }
-
-  renderDetails () {
-    const { api } = this.context;
-    const { address, data, netVersion, origin, signerStore } = this.props;
-    const { hashToSign } = this.state;
-    const { balances, externalLink } = signerStore;
-
-    const balance = balances[address];
-
-    if (!balance) {
-      return <div />;
-    }
-
-    const tooltip = [
-      <FormattedMessage
-        id='signer.signRequest.tooltip.hash'
-        defaultMessage='Hash to be signed: {hashToSign}'
-        values={ { hashToSign } }
-      />,
-      <br />,
-      <FormattedMessage
-        id='signer.signRequest.tooltip.data'
-        defaultMessage='Data: {data}'
-        values={ { data } }
-      />
-    ];
-
-    return (
-      <div className={ styles.signDetails }>
-        <div className={ styles.address }>
-          <Account
-            address={ address }
-            balance={ balance }
-            className={ styles.account }
-            externalLink={ externalLink }
-            netVersion={ netVersion }
-          />
-          <RequestOrigin origin={ origin } />
-        </div>
-        <ReactTooltip id={ `signRequest-${hashToSign}` }>
-          { tooltip }
-        </ReactTooltip>
-        <div
-          className={ styles.info }
-          data-effect='solid'
-          data-for={ `signRequest-${hashToSign}` }
-          data-place='top'
-          data-tip
-        >
-          <p>
-            <FormattedMessage
-              id='signer.signRequest.request'
-              defaultMessage='A request to sign data using your account:'
-            />
-          </p>
-          {
-            isAscii(data)
-              ? this.renderAsciiDetails(api.util.hexToAscii(data))
-              : this.renderBinaryDetails(data)
-          }
-          <p>
-            <strong>
-              <FormattedMessage
-                id='signer.signRequest.warning'
-                defaultMessage='WARNING: This consequences of doing this may be grave. Confirm the request only if you are sure.'
-              />
-            </strong>
-          </p>
-        </div>
-      </div>
-    );
-  }
-
-  renderActions () {
-    const { accounts, address, focus, isFinished, status, data } = this.props;
-    const account = accounts[address] || {};
-    const disabled = account.hardware && !this.hardwareStore.isConnected(address);
-
-    if (isFinished) {
-      if (status === 'confirmed') {
-        return (
-          <div className={ styles.actions }>
-            <span className={ styles.isConfirmed }>
-              <FormattedMessage
-                id='signer.signRequest.state.confirmed'
-                defaultMessage='Confirmed'
-              />
-            </span>
-          </div>
-        );
-      }
-
-      return (
-        <div className={ styles.actions }>
-          <span className={ styles.isRejected }>
-            <FormattedMessage
-              id='signer.signRequest.state.rejected'
-              defaultMessage='Rejected'
-            />
-          </span>
-        </div>
-      );
-    }
-
-    return (
-      <TransactionPendingForm
-        account={ account }
-        address={ address }
-        disabled={ disabled }
-        focus={ focus }
-        isSending={ this.props.isSending }
-        netVersion={ this.props.netVersion }
-        onConfirm={ this.onConfirm }
-        onReject={ this.onReject }
-        className={ styles.actions }
-        dataToSign={ { data } }
-      />
-    );
-  }
-
-  onConfirm = (data) => {
-    const { id } = this.props;
-    const { password, dataSigned, wallet } = data;
-
-    this.props.onConfirm({ id, password, dataSigned, wallet });
-  }
-
-  onReject = () => {
-    this.props.onReject(this.props.id);
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts } = state.personal;
-
-  return {
-    accounts
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(SignRequest);
diff --git a/js/src/views/Signer/components/SignRequest/signRequest.spec.js b/js/src/views/Signer/components/SignRequest/signRequest.spec.js
deleted file mode 100644
index 7cc61601b7875d2a2c9ba5e9795020ec73708dab..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/SignRequest/signRequest.spec.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import SignRequest from './';
-
-let component;
-let reduxStore;
-let signerStore;
-
-function createSignerStore () {
-  return {
-    balances: {},
-    fetchBalance: sinon.stub()
-  };
-}
-
-function createReduxStore () {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        personal: {
-          accounts: {}
-        }
-      };
-    }
-  };
-}
-
-function render () {
-  reduxStore = createReduxStore();
-  signerStore = createSignerStore();
-
-  component = shallow(
-    <SignRequest signerStore={ signerStore } />,
-    {
-      context: {
-        store: reduxStore,
-        api: {
-          util: {
-            sha3: (x) => x,
-            hexToBytes: (x) => x,
-            asciiToHex: (x) => x
-          }
-        }
-      }
-    }
-  ).find('SignRequest').shallow();
-
-  return component;
-}
-
-describe.only('views/Signer/components/SignRequest', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders', () => {
-    expect(component).to.be.ok;
-  });
-});
diff --git a/js/src/views/Signer/components/TransactionMainDetails/index.js b/js/src/views/Signer/components/TransactionMainDetails/index.js
deleted file mode 100644
index 1ad629866fec9bdbc1574bb800971a2a16a74fd3..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionMainDetails/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './transactionMainDetails';
diff --git a/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.css b/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.css
deleted file mode 100644
index 048a59c6753a8be7129d69734a2265ce928eba18..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.css
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../../_layout.css';
-
-.account {
-  text-align: center;
-}
-
-.contractIcon {
-  background: #eee;
-  width: 50px !important;
-  height: 50px !important;
-  box-sizing: border-box;
-  border-radius: 50%;
-  padding: 13px;
-}
-
-.editButtonRow {
-  text-align: right;
-}
-
-.from {
-  display: inline-block;
-  width: 40%;
-  vertical-align: top;
-
-  .account {
-    img {
-      display: inline-block;
-      width: 50px;
-      height: 50px;
-      margin: 5px;
-    }
-
-    span {
-      display: block;
-    }
-  }
-}
-
-.method {
-  display: inline-block;
-  width: 60%;
-  vertical-align: top;
-  line-height: 1em;
-}
-
-.tx {
-  position: relative;
-  text-align: center;
-  margin: 0 -75px;
-  width: 150px;
-  top: -20px;
-  white-space: nowrap;
-}
-
-.total {
-  font-size: 0.6em;
-  opacity: .5;
-}
-
-.transaction {
-  flex: 1;
-  overflow: auto;
-}
diff --git a/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js b/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js
deleted file mode 100644
index ebbddf895f2113d08e25c27153d1669d47591a94..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import ReactTooltip from 'react-tooltip';
-
-import { Button, MethodDecoding } from '~/ui';
-import { GasIcon } from '~/ui/Icons';
-
-import * as tUtil from '../util/transaction';
-import Account from '../Account';
-import RequestOrigin from '../RequestOrigin';
-
-import styles from './transactionMainDetails.css';
-
-export default class TransactionMainDetails extends Component {
-  static propTypes = {
-    children: PropTypes.node,
-    disabled: PropTypes.bool,
-    externalLink: PropTypes.string.isRequired,
-    from: PropTypes.string.isRequired,
-    fromBalance: PropTypes.object,
-    gasStore: PropTypes.object,
-    id: PropTypes.object.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    origin: PropTypes.any,
-    totalValue: PropTypes.object.isRequired,
-    transaction: PropTypes.object.isRequired,
-    value: PropTypes.object.isRequired
-  };
-
-  static defaultProps = {
-    origin: {
-      type: 'unknown',
-      details: ''
-    }
-  };
-
-  componentWillMount () {
-    const { totalValue, value } = this.props;
-
-    this.updateDisplayValues(value, totalValue);
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const { totalValue, value } = nextProps;
-
-    this.updateDisplayValues(value, totalValue);
-  }
-
-  render () {
-    const { children, disabled, externalLink, from, fromBalance, gasStore, netVersion, transaction, origin } = this.props;
-
-    return (
-      <div className={ styles.transaction }>
-        <div className={ styles.from }>
-          <div className={ styles.account }>
-            <Account
-              address={ from }
-              balance={ fromBalance }
-              disabled={ disabled }
-              externalLink={ externalLink }
-              netVersion={ netVersion }
-            />
-          </div>
-          <RequestOrigin origin={ origin } />
-        </div>
-        <div className={ styles.method }>
-          <MethodDecoding
-            address={ from }
-            historic={ false }
-            transaction={
-              gasStore
-                ? gasStore.overrideTransaction(transaction)
-                : transaction
-            }
-          />
-          { this.renderEditTx() }
-        </div>
-        { children }
-      </div>
-    );
-  }
-
-  renderEditTx () {
-    const { gasStore } = this.props;
-
-    if (!gasStore) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.editButtonRow }>
-        <Button
-          icon={ <GasIcon /> }
-          label={
-            <FormattedMessage
-              id='signer.mainDetails.editTx'
-              defaultMessage='Edit conditions/gas/gasPrice'
-            />
-          }
-          onClick={ this.toggleGasEditor }
-        />
-      </div>
-    );
-  }
-
-  renderTotalValue () {
-    const { id } = this.props;
-    const { feeEth, totalValueDisplay, totalValueDisplayWei } = this.state;
-    const labelId = `totalValue${id}`;
-
-    return (
-      <div>
-        <div
-          className={ styles.total }
-          data-effect='solid'
-          data-for={ labelId }
-          data-place='bottom'
-          data-tip
-        >
-          { totalValueDisplay } <small>ETH</small>
-        </div>
-        <ReactTooltip id={ labelId }>
-          <FormattedMessage
-            id='signer.mainDetails.tooltips.total1'
-            defaultMessage='The value of the transaction including the mining fee is {total} {type}.'
-            values={ {
-              total: <strong>{ totalValueDisplayWei }</strong>,
-              type: <small>WEI</small>
-            } }
-          />
-          <br />
-          <FormattedMessage
-            id='signer.mainDetails.tooltips.total2'
-            defaultMessage='(This includes a mining fee of {fee} {token})'
-            values={ {
-              fee: <strong>{ feeEth }</strong>,
-              token: <small>ETH</small>
-            } }
-          />
-        </ReactTooltip>
-      </div>
-    );
-  }
-
-  renderValue () {
-    const { id } = this.props;
-    const { valueDisplay, valueDisplayWei } = this.state;
-    const labelId = `value${id}`;
-
-    return (
-      <div>
-        <div
-          data-effect='solid'
-          data-for={ labelId }
-          data-tip
-        >
-          <strong>{ valueDisplay } </strong>
-          <small>ETH</small>
-        </div>
-        <ReactTooltip id={ labelId }>
-          <FormattedMessage
-            id='signer.mainDetails.tooltips.value1'
-            defaultMessage='The value of the transaction.'
-          />
-          <br />
-          <strong>{ valueDisplayWei }</strong> <small>WEI</small>
-        </ReactTooltip>
-      </div>
-    );
-  }
-
-  updateDisplayValues (value, totalValue) {
-    this.setState({
-      feeEth: tUtil.calcFeeInEth(totalValue, value),
-      totalValueDisplay: tUtil.getTotalValueDisplay(totalValue),
-      totalValueDisplayWei: tUtil.getTotalValueDisplayWei(totalValue),
-      valueDisplay: tUtil.getValueDisplay(value),
-      valueDisplayWei: tUtil.getValueDisplayWei(value)
-    });
-  }
-
-  toggleGasEditor = () => {
-    this.props.gasStore.setEditing(true);
-  }
-}
diff --git a/js/src/views/Signer/components/TransactionPending/index.js b/js/src/views/Signer/components/TransactionPending/index.js
deleted file mode 100644
index 1dfcfb3e4ae71f53d67566eed7f1a49c96703104..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPending/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './transactionPending';
diff --git a/js/src/views/Signer/components/TransactionPending/transactionPending.css b/js/src/views/Signer/components/TransactionPending/transactionPending.css
deleted file mode 100644
index 61229eefb0bfd5dc737e2819c988249801d7e286..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPending/transactionPending.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../../_layout.css';
-
-.container {
-  display: flex;
-  padding: 1.5em 1em 1.5em 0;
-
-  & > * {
-    vertical-align: middle;
-  }
-}
diff --git a/js/src/views/Signer/components/TransactionPending/transactionPending.js b/js/src/views/Signer/components/TransactionPending/transactionPending.js
deleted file mode 100644
index b9cc8f684ba627d4ea24dc9b722124c75ccd5824..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPending/transactionPending.js
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import HardwareStore from '~/mobx/hardwareStore';
-import { Button, GasPriceEditor } from '~/ui';
-
-import TransactionMainDetails from '../TransactionMainDetails';
-import TransactionPendingForm from '../TransactionPendingForm';
-
-import styles from './transactionPending.css';
-
-import * as tUtil from '../util/transaction';
-
-@observer
-class TransactionPending extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    className: PropTypes.string,
-    date: PropTypes.instanceOf(Date).isRequired,
-    focus: PropTypes.bool,
-    gasLimit: PropTypes.object,
-    id: PropTypes.object.isRequired,
-    isSending: PropTypes.bool.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    nonce: PropTypes.number,
-    onConfirm: PropTypes.func.isRequired,
-    onReject: PropTypes.func.isRequired,
-    origin: PropTypes.any,
-    signerStore: PropTypes.object.isRequired,
-    transaction: PropTypes.shape({
-      condition: PropTypes.object,
-      data: PropTypes.string,
-      from: PropTypes.string.isRequired,
-      gas: PropTypes.object.isRequired,
-      gasPrice: PropTypes.object.isRequired,
-      to: PropTypes.string,
-      value: PropTypes.object.isRequired
-    }).isRequired
-  };
-
-  static defaultProps = {
-    focus: false,
-    origin: {
-      type: 'unknown',
-      details: ''
-    }
-  };
-
-  gasStore = new GasPriceEditor.Store(this.context.api, {
-    condition: this.props.transaction.condition,
-    gas: this.props.transaction.gas.toFixed(),
-    gasLimit: this.props.gasLimit,
-    gasPrice: this.props.transaction.gasPrice.toFixed()
-  });
-
-  hardwareStore = HardwareStore.get(this.context.api);
-
-  componentWillMount () {
-    const { signerStore, transaction } = this.props;
-    const { from, gas, gasPrice, to, value } = transaction;
-
-    const fee = tUtil.getFee(gas, gasPrice); // BigNumber object
-    const gasPriceEthmDisplay = tUtil.getEthmFromWeiDisplay(gasPrice);
-    const gasToDisplay = tUtil.getGasDisplay(gas);
-    const totalValue = tUtil.getTotalValue(fee, value);
-
-    this.setState({ gasPriceEthmDisplay, totalValue, gasToDisplay });
-    this.gasStore.setEthValue(value);
-    signerStore.fetchBalances([from, to]);
-  }
-
-  render () {
-    return this.gasStore.isEditing
-      ? this.renderTxEditor()
-      : this.renderTransaction();
-  }
-
-  renderTransaction () {
-    const transaction = this.gasStore.overrideTransaction(this.props.transaction);
-
-    const { accounts, className, focus, id, isSending, netVersion, origin, signerStore } = this.props;
-    const { totalValue } = this.state;
-    const { balances, externalLink } = signerStore;
-    const { from, value } = transaction;
-    const fromBalance = balances[from];
-    const account = accounts[from] || {};
-    const disabled = account.hardware && !this.hardwareStore.isConnected(from);
-
-    return (
-      <div className={ `${styles.container} ${className}` }>
-        <TransactionMainDetails
-          className={ styles.transactionDetails }
-          disabled={ disabled }
-          externalLink={ externalLink }
-          from={ from }
-          fromBalance={ fromBalance }
-          gasStore={ this.gasStore }
-          id={ id }
-          netVersion={ netVersion }
-          origin={ origin }
-          totalValue={ totalValue }
-          transaction={ transaction }
-          value={ value }
-        />
-        <TransactionPendingForm
-          account={ account }
-          address={ from }
-          disabled={ disabled }
-          focus={ focus }
-          isSending={ isSending }
-          netVersion={ netVersion }
-          onConfirm={ this.onConfirm }
-          onReject={ this.onReject }
-          dataToSign={ { transaction } }
-        />
-      </div>
-    );
-  }
-
-  renderTxEditor () {
-    const { className } = this.props;
-
-    return (
-      <div className={ `${styles.container} ${className}` }>
-        <GasPriceEditor store={ this.gasStore }>
-          <Button
-            label={
-              <FormattedMessage
-                id='signer.txPending.buttons.viewToggle'
-                defaultMessage='view transaction'
-              />
-            }
-            onClick={ this.toggleGasEditor }
-          />
-        </GasPriceEditor>
-      </div>
-    );
-  }
-
-  onConfirm = (data) => {
-    const { id, transaction } = this.props;
-    const { password, txSigned, wallet } = data;
-    const { condition, gas, gasPrice } = this.gasStore.overrideTransaction(transaction);
-
-    const options = {
-      gas,
-      gasPrice,
-      id,
-      password,
-      txSigned,
-      wallet
-    };
-
-    if (condition && (condition.block || condition.time)) {
-      options.condition = condition;
-    }
-
-    this.props.onConfirm(options);
-  }
-
-  onReject = () => {
-    this.props.onReject(this.props.id);
-  }
-
-  toggleGasEditor = () => {
-    this.gasStore.setEditing(false);
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts } = state.personal;
-
-  return {
-    accounts
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(TransactionPending);
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/index.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/index.js
deleted file mode 100644
index 1cba761a52a4399dc75b5f2cd67673fef4273911..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './transactionPendingFormConfirm';
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.css b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.css
deleted file mode 100644
index f915d127480fab4907357ac4ce55dc03b6383e02..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.css
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.confirmForm {
-  margin-top: -2em;
-}
-
-.confirmButton {
-  display: block !important;
-  margin-bottom: 10px;
-  white-space: nowrap;
-}
-
-.signerIcon {
-  width: 24px;
-  height: 24px;
-  vertical-align: middle;
-  margin-left: 12px;
-}
-
-.passwordHint {
-  font-size: 0.75em;
-  color: rgba(255, 255, 255, 0.5);
-  margin-bottom: 0.75em;
-}
-
-.passwordHint span {
-  opacity: 0.85;
-}
-
-.fileInput input {
-  top: 22px;
-}
-
-.qr {
-  margin-bottom: 0.5em;
-  text-align: center;
-}
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
deleted file mode 100644
index e327a0322b3a423195788ac52fd35d69dc5b6a88..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
+++ /dev/null
@@ -1,588 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import keycode from 'keycode';
-import RaisedButton from 'material-ui/RaisedButton';
-import React, { Component, PropTypes } from 'react';
-import ReactDOM from 'react-dom';
-import { FormattedMessage } from 'react-intl';
-import ReactTooltip from 'react-tooltip';
-
-import { Form, Input, IdentityIcon, QrCode, QrScan } from '~/ui';
-import { generateTxQr, generateDataQr, generateDecryptQr } from '~/util/qrscan';
-
-import styles from './transactionPendingFormConfirm.css';
-
-const QR_VISIBLE = 1;
-const QR_SCAN = 2;
-const QR_COMPLETED = 3;
-
-export default class TransactionPendingFormConfirm extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    account: PropTypes.object,
-    address: PropTypes.string.isRequired,
-    disabled: PropTypes.bool,
-    focus: PropTypes.bool,
-    netVersion: PropTypes.string.isRequired,
-    isSending: PropTypes.bool.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    dataToSign: PropTypes.object.isRequired
-  };
-
-  static defaultProps = {
-    account: {},
-    focus: false
-  };
-
-  id = Math.random(); // for tooltip
-
-  state = {
-    password: '',
-    qrState: QR_VISIBLE,
-    qr: {},
-    wallet: null,
-    walletError: null
-  }
-
-  componentDidMount () {
-    this.focus();
-  }
-
-  componentWillMount () {
-    this.readNonce();
-    this.subscribeNonce();
-  }
-
-  componentWillUnmount () {
-    this.unsubscribeNonce();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (!this.props.focus && nextProps.focus) {
-      this.focus(nextProps);
-    }
-  }
-
-  /**
-   * Properly focus on the input element when needed.
-   * This might be fixed some day in MaterialUI with
-   * an autoFocus prop.
-   *
-   * @see https://github.com/callemall/material-ui/issues/5632
-   */
-  focus (props = this.props) {
-    if (props.focus) {
-      const textNode = ReactDOM.findDOMNode(this.refs.input);
-
-      if (!textNode) {
-        return;
-      }
-
-      const inputNode = textNode.querySelector('input');
-
-      inputNode && inputNode.focus();
-    }
-  }
-
-  getPasswordHint () {
-    const { account } = this.props;
-    const accountHint = account.meta && account.meta.passwordHint;
-
-    if (accountHint) {
-      return accountHint;
-    }
-
-    const { wallet } = this.state;
-    const walletHint = wallet && wallet.meta && wallet.meta.passwordHint;
-
-    return walletHint || null;
-  }
-
-  // TODO: Now that we have 3 types, it would make sense splitting each into their own
-  // sub-module and having the consistent bits combined (e.g. i18n, layouts)
-  render () {
-    const { account, address, disabled, isSending } = this.props;
-    const { wallet, walletError } = this.state;
-    const isAccount = account.external || account.hardware || account.uuid;
-    const isWalletOk = isAccount || (walletError === null && wallet !== null);
-    const confirmText = this.renderConfirmButton();
-    const confirmButton = confirmText
-      ? (
-        <div
-          data-effect='solid'
-          data-for={ `transactionConfirmForm${this.id}` }
-          data-place='bottom'
-          data-tip
-        >
-          <RaisedButton
-            className={ styles.confirmButton }
-            disabled={ disabled || isSending || !isWalletOk }
-            fullWidth
-            icon={
-              <IdentityIcon
-                address={ address }
-                button
-                className={ styles.signerIcon }
-              />
-            }
-            label={ confirmText }
-            onTouchTap={ this.onConfirm }
-            primary
-          />
-        </div>
-      )
-      : null;
-
-    return (
-      <div className={ styles.confirmForm }>
-        <Form>
-          { this.renderKeyInput() }
-          { this.renderQrCode() }
-          { this.renderQrScanner() }
-          { this.renderPassword() }
-          { this.renderHint() }
-          { confirmButton }
-          { this.renderTooltip() }
-        </Form>
-      </div>
-    );
-  }
-
-  renderConfirmButton () {
-    const { account, isSending } = this.props;
-    const { qrState } = this.state;
-
-    if (account.external) {
-      switch (qrState) {
-        case QR_VISIBLE:
-          return (
-            <FormattedMessage
-              id='signer.txPendingConfirm.buttons.scanSigned'
-              defaultMessage='Scan Signed QR'
-            />
-          );
-
-        case QR_SCAN:
-        case QR_COMPLETED:
-          return null;
-      }
-    }
-
-    return isSending
-      ? (
-        <FormattedMessage
-          id='signer.txPendingConfirm.buttons.confirmBusy'
-          defaultMessage='Confirming...'
-        />
-      )
-      : (
-        <FormattedMessage
-          id='signer.txPendingConfirm.buttons.confirmRequest'
-          defaultMessage='Confirm Request'
-        />
-      );
-  }
-
-  renderPassword () {
-    const { account } = this.props;
-    const { password } = this.state;
-
-    if (account.hardware || account.external) {
-      return null;
-    }
-
-    const isAccount = account.uuid;
-
-    return (
-      <Input
-        hint={
-          isAccount
-            ? (
-              <FormattedMessage
-                id='signer.txPendingConfirm.password.unlock.hint'
-                defaultMessage='unlock the account'
-              />
-            )
-            : (
-              <FormattedMessage
-                id='signer.txPendingConfirm.password.decrypt.hint'
-                defaultMessage='decrypt the key'
-              />
-            )
-        }
-        label={
-          isAccount
-            ? (
-              <FormattedMessage
-                id='signer.txPendingConfirm.password.unlock.label'
-                defaultMessage='Account Password'
-              />
-            )
-            : (
-              <FormattedMessage
-                id='signer.txPendingConfirm.password.decrypt.label'
-                defaultMessage='Key Password'
-              />
-            )
-        }
-        onChange={ this.onModifyPassword }
-        onKeyDown={ this.onKeyDown }
-        ref='input'
-        type='password'
-        value={ password }
-      />
-    );
-  }
-
-  renderHint () {
-    const { account, disabled, isSending } = this.props;
-    const { qrState } = this.state;
-
-    if (account.external) {
-      switch (qrState) {
-        case QR_VISIBLE:
-          return (
-            <div className={ styles.passwordHint }>
-              <FormattedMessage
-                id='signer.sending.external.scanTx'
-                defaultMessage='Please scan the transaction QR on your external device'
-              />
-            </div>
-          );
-
-        case QR_SCAN:
-          return (
-            <div className={ styles.passwordHint }>
-              <FormattedMessage
-                id='signer.sending.external.scanSigned'
-                defaultMessage='Scan the QR code of the signed transaction from your external device'
-              />
-            </div>
-          );
-
-        case QR_COMPLETED:
-          return null;
-      }
-    }
-
-    if (account.hardware) {
-      if (isSending) {
-        return (
-          <div className={ styles.passwordHint }>
-            <FormattedMessage
-              id='signer.sending.hardware.confirm'
-              defaultMessage='Please confirm the transaction on your attached hardware device'
-            />
-          </div>
-        );
-      } else if (disabled) {
-        return (
-          <div className={ styles.passwordHint }>
-            <FormattedMessage
-              id='signer.sending.hardware.connect'
-              defaultMessage='Please attach your hardware device before confirming the transaction'
-            />
-          </div>
-        );
-      }
-    }
-
-    const passwordHint = this.getPasswordHint();
-
-    if (!passwordHint) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.passwordHint }>
-        <FormattedMessage
-          id='signer.txPendingConfirm.passwordHint'
-          defaultMessage='(hint) {passwordHint}'
-          values={ {
-            passwordHint
-          } }
-        />
-      </div>
-    );
-  }
-
-  // TODO: Split into sub-scomponent
-  renderQrCode () {
-    const { account } = this.props;
-    const { qrState, qr } = this.state;
-
-    if (!account.external || qrState !== QR_VISIBLE || !qr.value) {
-      return null;
-    }
-
-    return (
-      <QrCode
-        className={ styles.qr }
-        value={ qr.value }
-      />
-    );
-  }
-
-  // TODO: Split into sub-scomponent
-  renderQrScanner () {
-    const { account } = this.props;
-    const { qrState } = this.state;
-
-    if (!account.external || qrState !== QR_SCAN) {
-      return null;
-    }
-
-    return (
-      <QrScan
-        className={ styles.camera }
-        onScan={ this.onScan }
-      />
-    );
-  }
-
-  renderKeyInput () {
-    const { account } = this.props;
-    const { walletError } = this.state;
-
-    if (account.uuid || account.wallet || account.hardware || account.external) {
-      return null;
-    }
-
-    return (
-      <Input
-        className={ styles.fileInput }
-        error={ walletError }
-        hint={
-          <FormattedMessage
-            id='signer.txPendingConfirm.selectKey.hint'
-            defaultMessage='The keyfile to use for this account'
-          />
-        }
-        label={
-          <FormattedMessage
-            id='signer.txPendingConfirm.selectKey.label'
-            defaultMessage='Select Local Key'
-          />
-        }
-        onChange={ this.onKeySelect }
-        type='file'
-      />
-    );
-  }
-
-  renderTooltip () {
-    const { account } = this.props;
-
-    if (this.state.password.length || account.hardware || account.external) {
-      return null;
-    }
-
-    return (
-      <ReactTooltip id={ `transactionConfirmForm${this.id}` }>
-        <FormattedMessage
-          id='signer.txPendingConfirm.tooltips.password'
-          defaultMessage='Please provide a password for this account'
-        />
-      </ReactTooltip>
-    );
-  }
-
-  onScan = (signature) => {
-    const { chainId, rlp, tx, data, decrypt } = this.state.qr;
-
-    if (!signature) {
-      return;
-    }
-
-    if (signature.substr(0, 2) !== '0x') {
-      signature = `0x${signature}`;
-    }
-
-    this.setState({ qrState: QR_COMPLETED });
-
-    if (tx) {
-      this.props.onConfirm({
-        txSigned: {
-          chainId,
-          rlp,
-          signature,
-          tx
-        }
-      });
-      return;
-    }
-
-    if (decrypt) {
-      this.props.onConfirm({
-        decrypted: {
-          decrypt,
-          msg: signature
-        }
-      });
-      return;
-    }
-
-    this.props.onConfirm({
-      dataSigned: {
-        data,
-        signature
-      }
-    });
-  }
-
-  onKeySelect = (event) => {
-    // Check that file have been selected
-    if (event.target.files.length === 0) {
-      return this.setState({
-        wallet: null,
-        walletError: null
-      });
-    }
-
-    const fileReader = new FileReader();
-
-    fileReader.onload = (e) => {
-      try {
-        const wallet = JSON.parse(e.target.result);
-
-        try {
-          if (wallet && typeof wallet.meta === 'string') {
-            wallet.meta = JSON.parse(wallet.meta);
-          }
-        } catch (e) {}
-
-        this.setState({
-          wallet,
-          walletError: null
-        });
-      } catch (error) {
-        this.setState({
-          wallet: null,
-          walletError: (
-            <FormattedMessage
-              id='signer.txPendingConfirm.errors.invalidWallet'
-              defaultMessage='Given wallet file is invalid.'
-            />
-          )
-        });
-      }
-    };
-
-    fileReader.readAsText(event.target.files[0]);
-  }
-
-  onModifyPassword = (event) => {
-    const password = event.target.value;
-
-    this.setState({
-      password
-    });
-  }
-
-  onConfirm = () => {
-    const { account } = this.props;
-    const { password, qrState, wallet } = this.state;
-
-    if (account.external && qrState === QR_VISIBLE) {
-      return this.setState({ qrState: QR_SCAN });
-    }
-
-    this.props.onConfirm({
-      password,
-      wallet
-    });
-  }
-
-  generateQr = () => {
-    const { api } = this.context;
-    const { netVersion, dataToSign } = this.props;
-    const { transaction, data, decrypt } = dataToSign;
-    const setState = qr => {
-      this.setState({ qr });
-    };
-
-    if (transaction) {
-      generateTxQr(api, netVersion, transaction).then(setState);
-      return;
-    }
-
-    if (decrypt) {
-      generateDecryptQr(decrypt).then(setState);
-      return;
-    }
-
-    generateDataQr(data).then(setState);
-  }
-
-  onKeyDown = (event) => {
-    const codeName = keycode(event);
-
-    if (codeName !== 'enter') {
-      return;
-    }
-
-    this.onConfirm();
-  }
-
-  // FIXME: Sadly the API subscription channels currently does not allow for specific values,
-  // rather it can only do general queries where parameters are not specified. Hence we are
-  // polling for the nonce here. Since we are moving to node-based subscriptions on the API layer,
-  // this can be optimised when the subscription mechanism is reworked to conform.
-  subscribeNonce () {
-    const nonceTimerId = setInterval(this.readNonce, 1000);
-
-    this.setState({ nonceTimerId });
-  }
-
-  unsubscribeNonce () {
-    const { nonceTimerId } = this.state;
-
-    if (!nonceTimerId) {
-      return;
-    }
-
-    clearInterval(nonceTimerId);
-  }
-
-  readNonce = () => {
-    const { api } = this.context;
-    const { account, dataToSign } = this.props;
-    const { qr } = this.state;
-
-    if ((dataToSign.data || dataToSign.decrypt) && qr && !qr.value) {
-      this.generateQr();
-      return;
-    }
-
-    if (!account || !account.external || !api.transport.isConnected || !dataToSign.transaction) {
-      return;
-    }
-
-    return api.parity
-      .nextNonce(account.address)
-      .then((newNonce) => {
-        const { nonce } = this.state.qr;
-
-        if (!nonce || !newNonce.eq(nonce)) {
-          this.generateQr();
-        }
-      });
-  }
-}
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.spec.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.spec.js
deleted file mode 100644
index 2e984400d4bbadd42fe9424944246fffe5aa5240..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.spec.js
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import TransactionPendingFormConfirm from './';
-
-const ADDR_NORMAL = '0x0123456789012345678901234567890123456789';
-const ADDR_WALLET = '0x1234567890123456789012345678901234567890';
-const ADDR_HARDWARE = '0x2345678901234567890123456789012345678901';
-const ADDR_SIGN = '0x3456789012345678901234567890123456789012';
-const ACCOUNTS = {
-  [ADDR_NORMAL]: {
-    address: ADDR_NORMAL,
-    uuid: ADDR_NORMAL
-  },
-  [ADDR_WALLET]: {
-    address: ADDR_WALLET,
-    wallet: true
-  },
-  [ADDR_HARDWARE]: {
-    address: ADDR_HARDWARE,
-    hardware: true
-  }
-};
-
-let component;
-let instance;
-let onConfirm;
-
-function render (address) {
-  onConfirm = sinon.stub();
-
-  component = shallow(
-    <TransactionPendingFormConfirm
-      account={ ACCOUNTS[address] }
-      address={ address }
-      onConfirm={ onConfirm }
-      isSending={ false }
-      dataToSign={ {} }
-    />
-  );
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Signer/TransactionPendingFormConfirm', () => {
-  describe('normal accounts', () => {
-    beforeEach(() => {
-      render(ADDR_NORMAL);
-    });
-
-    it('renders defaults', () => {
-      expect(component).to.be.ok;
-    });
-
-    it('does not render the key input', () => {
-      expect(instance.renderKeyInput()).to.be.null;
-    });
-
-    it('renders the password', () => {
-      expect(instance.renderPassword()).not.to.be.null;
-    });
-  });
-
-  describe('hardware accounts', () => {
-    beforeEach(() => {
-      render(ADDR_HARDWARE);
-    });
-
-    it('renders defaults', () => {
-      expect(component).to.be.ok;
-    });
-
-    it('does not render the key input', () => {
-      expect(instance.renderKeyInput()).to.be.null;
-    });
-
-    it('does not render the password', () => {
-      expect(instance.renderPassword()).to.be.null;
-    });
-  });
-
-  describe('wallet accounts', () => {
-    beforeEach(() => {
-      render(ADDR_WALLET);
-    });
-
-    it('renders defaults', () => {
-      expect(component).to.be.ok;
-    });
-
-    it('does not render the key input', () => {
-      expect(instance.renderKeyInput()).to.be.null;
-    });
-
-    it('renders the password', () => {
-      expect(instance.renderPassword()).not.to.be.null;
-    });
-  });
-
-  describe('signing accounts', () => {
-    beforeEach(() => {
-      render(ADDR_SIGN);
-    });
-
-    it('renders defaults', () => {
-      expect(component).to.be.ok;
-    });
-
-    it('renders the key input', () => {
-      expect(instance.renderKeyInput()).not.to.be.null;
-    });
-
-    it('renders the password', () => {
-      expect(instance.renderPassword()).not.to.be.null;
-    });
-
-    it('renders the hint', () => {
-      expect(instance.renderHint()).to.be.null;
-    });
-  });
-});
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/index.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/index.js
deleted file mode 100644
index 4149c432398095ba309531c3a07503327a39c6c0..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './transactionPendingFormReject';
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.css b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.css
deleted file mode 100644
index 1f0e1fd1ea94aac5f94662e9af8441fcbf79c235..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* the rejection button itself, once .reject has been pressed */
-.rejectButton {
-  display: block !important;
-  margin-bottom: 5px;
-}
-
-.rejectText {
-  margin-bottom: 10px;
-}
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js
deleted file mode 100644
index 3f5ba943f77dc4ee4f1a6176fd649afe1b59136e..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormReject/transactionPendingFormReject.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import RaisedButton from 'material-ui/RaisedButton';
-
-import styles from './transactionPendingFormReject.css';
-
-export default class TransactionPendingFormReject extends Component {
-  static propTypes = {
-    onReject: PropTypes.func.isRequired,
-    className: PropTypes.string
-  };
-
-  render () {
-    const { onReject } = this.props;
-
-    return (
-      <div>
-        <div className={ styles.rejectText }>
-          <FormattedMessage
-            id='signer.txPendingReject.info'
-            defaultMessage='Are you sure you want to reject request?'
-          />
-          <br />
-          <strong>
-            <FormattedMessage
-              id='signer.txPendingReject.undone'
-              defaultMessage='This cannot be undone'
-            />
-          </strong>
-        </div>
-        <RaisedButton
-          onTouchTap={ onReject }
-          className={ styles.rejectButton }
-          fullWidth
-          label={
-            <FormattedMessage
-              id='signer.txPendingReject.buttons.reject'
-              defaultMessage='Reject Request'
-            />
-          }
-        />
-      </div>
-    );
-  }
-}
diff --git a/js/src/views/Signer/components/TransactionPendingForm/index.js b/js/src/views/Signer/components/TransactionPendingForm/index.js
deleted file mode 100644
index b6a8befbad12377c31346a0d2c05b03845757c4d..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPendingForm/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './transactionPendingForm';
diff --git a/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.css b/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.css
deleted file mode 100644
index 9380a54df8857fa55b670bfdfd2e5773426e5043..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../../_layout.css';
-
-.container {
-  box-sizing: border-box;
-  padding: 1em 0 0 2em;
-  flex: 0 0 $statusWidth;
-}
-
-.rejectToggle {
-  display: block;
-  cursor: pointer;
-  color: #00e;
-  opacity: .7;
-  transition: opacity .5s;
-}
-
-.rejectToggle:hover {
-  opacity: 1;
-  text-decoration: underline;
-}
-
-.rejectToggle svg {
-  position: relative;
-  width: 18px !important;
-  height: 18px !important;
-  top: 3px;
-}
diff --git a/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js b/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
deleted file mode 100644
index e7248e1aba3b3bc5797ed6768320805a933edb24..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TransactionPendingForm/transactionPendingForm.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { PrevIcon } from '~/ui/Icons';
-
-import TransactionPendingFormConfirm from './TransactionPendingFormConfirm';
-import TransactionPendingFormReject from './TransactionPendingFormReject';
-import styles from './transactionPendingForm.css';
-
-export default class TransactionPendingForm extends Component {
-  static propTypes = {
-    account: PropTypes.object,
-    address: PropTypes.string.isRequired,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-    focus: PropTypes.bool,
-    netVersion: PropTypes.string.isRequired,
-    isSending: PropTypes.bool.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    onReject: PropTypes.func.isRequired,
-    dataToSign: PropTypes.oneOfType([
-      PropTypes.shape({
-        transaction: PropTypes.object.isRequired
-      }),
-      PropTypes.shape({
-        data: PropTypes.string.isRequired
-      }),
-      PropTypes.shape({
-        decrypt: PropTypes.string.isRequired
-      })
-    ]).isRequired
-  };
-
-  static defaultProps = {
-    account: {},
-    focus: false
-  };
-
-  state = {
-    isRejectOpen: false
-  };
-
-  render () {
-    const { className } = this.props;
-
-    return (
-      <div className={ `${styles.container} ${className}` }>
-        { this.renderForm() }
-        { this.renderRejectToggle() }
-      </div>
-    );
-  }
-
-  renderForm () {
-    const { account, address, disabled, focus, isSending, netVersion, onConfirm, onReject, dataToSign } = this.props;
-
-    if (this.state.isRejectOpen) {
-      return (
-        <TransactionPendingFormReject onReject={ onReject } />
-      );
-    }
-
-    return (
-      <TransactionPendingFormConfirm
-        address={ address }
-        account={ account }
-        disabled={ disabled }
-        focus={ focus }
-        netVersion={ netVersion }
-        isSending={ isSending }
-        onConfirm={ onConfirm }
-        dataToSign={ dataToSign }
-      />
-    );
-  }
-
-  renderRejectToggle () {
-    const { isRejectOpen } = this.state;
-    let html;
-
-    if (!isRejectOpen) {
-      html = (
-        <span>
-          <FormattedMessage
-            id='signer.txPendingForm.reject'
-            defaultMessage='reject request'
-          />
-        </span>
-      );
-    } else {
-      html = (
-        <span>
-          <PrevIcon />
-          <FormattedMessage
-            id='signer.txPendingForm.changedMind'
-            defaultMessage="I've changed my mind"
-          />
-        </span>
-      );
-    }
-
-    return (
-      <a
-        className={ styles.rejectToggle }
-        onClick={ this.onToggleReject }
-      >
-        { html }
-      </a>
-    );
-  }
-
-  onToggleReject = () => {
-    const { isRejectOpen } = this.state;
-
-    this.setState({
-      isRejectOpen: !isRejectOpen
-    });
-  }
-}
diff --git a/js/src/views/Signer/components/TxHashLink/index.js b/js/src/views/Signer/components/TxHashLink/index.js
deleted file mode 100644
index 534c6f2d6eb4fd92e31e7f7de8188e4c7b3f399b..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TxHashLink/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './txHashLink';
diff --git a/js/src/views/Signer/components/TxHashLink/txHashLink.js b/js/src/views/Signer/components/TxHashLink/txHashLink.js
deleted file mode 100644
index 42cc336e74934b1f95fac14a39c2520d996a4231..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/TxHashLink/txHashLink.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-
-import { txLink } from '~/3rdparty/etherscan/links';
-
-export default class TxHashLink extends Component {
-  static propTypes = {
-    children: PropTypes.node,
-    className: PropTypes.string,
-    netVersion: PropTypes.string.isRequired,
-    txHash: PropTypes.string.isRequired
-  }
-
-  render () {
-    const { children, className, netVersion, txHash } = this.props;
-
-    return (
-      <a
-        className={ className }
-        href={ txLink(txHash, false, netVersion) }
-        target='_blank'
-      >
-        { children || txHash }
-      </a>
-    );
-  }
-}
diff --git a/js/src/views/Signer/components/util/logger.js b/js/src/views/Signer/components/util/logger.js
deleted file mode 100644
index 14abcb2b6454e8b82c260296ce8433eb9f42ea41..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/util/logger.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const isLogging = process.env.LOGGING;
-
-export default logger();
-
-function logger () {
-  return isLogging ? devLogger() : prodLogger();
-}
-
-function prodLogger () {
-  return {
-    log: noop,
-    info: noop,
-    error: noop,
-    warn: noop
-  };
-}
-
-function devLogger () {
-  return console;
-}
-
-function noop () {}
diff --git a/js/src/views/Signer/components/util/react.js b/js/src/views/Signer/components/util/react.js
deleted file mode 100644
index 4ae260db2e16cad01ab199b826bcb0c69831922e..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/util/react.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isValidElement } from 'react';
-
-export function isReactComponent (componentOrElem) {
-  return isValidElement(componentOrElem) && typeof componentOrElem.type === 'function';
-}
diff --git a/js/src/views/Signer/components/util/transaction.js b/js/src/views/Signer/components/util/transaction.js
deleted file mode 100644
index 4efdba58e25d56516bf0418f742016f7e8162cb9..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/util/transaction.js
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-const WEI_TO_ETH_MULTIPLIER = 0.000000000000000001;
-const WEI_TO_SZABU_MULTIPLIER = 0.000000000001;
-
-export const getShortData = _getShortData;
-// calculations
-export const getFee = _getFee;
-export const calcFeeInEth = _calcFeeInEth;
-export const getTotalValue = _getTotalValue;
-// displays
-export const getSzaboFromWeiDisplay = _getSzaboFromWeiDisplay;
-export const getValueDisplay = _getValueDisplay;
-export const getValueDisplayWei = _getValueDisplayWei;
-export const getTotalValueDisplay = _getTotalValueDisplay;
-export const getTotalValueDisplayWei = _getTotalValueDisplayWei;
-export const getEthmFromWeiDisplay = _getEthmFromWeiDisplay;
-export const getGasDisplay = _getGasDisplay;
-
-function _getShortData (data) {
-  if (data.length <= 3) {
-    return data;
-  }
-  return data.substr(0, 3) + '...';
-}
-
-/*
- * @param {hex string} gas
- * @param {wei hex string} gasPrice
- * @return {BigNumber} fee in wei
- */
-function _getFee (gas, gasPrice) {
-  gas = new BigNumber(gas);
-  gasPrice = new BigNumber(gasPrice);
-  return gasPrice.times(gas);
-}
-
-function _calcFeeInEth (totalValue, value) {
-  let fee = new BigNumber(totalValue).sub(new BigNumber(value));
-
-  return fee.times(WEI_TO_ETH_MULTIPLIER).toFormat(7);
-}
-
-/*
- * @param {wei BigNumber} fee
- * @param {wei hex string} value
- * @return {BigNumber} total value in wei
- */
-function _getTotalValue (fee, value) {
-  value = new BigNumber(value);
-  return fee.plus(value);
-}
-
-/*
- * @param {wei hex string} gasPrice
- * @return {string} szabo gas price with unit [szabo] i.e. 21,423 [szabo]
- */
-function _getSzaboFromWeiDisplay (gasPrice) {
-  gasPrice = new BigNumber(gasPrice);
-  return gasPrice.times(WEI_TO_SZABU_MULTIPLIER).toPrecision(5);
-}
-
-/*
- * @param {wei hex string} value
- * @return {string} value in WEI nicely formatted
- */
-function _getValueDisplay (value) {
-  value = new BigNumber(value);
-  return value.times(WEI_TO_ETH_MULTIPLIER).toFormat(5);
-}
-
-function _getValueDisplayWei (value) {
-  value = new BigNumber(value);
-  return value.toFormat(0);
-}
-
-/*
- * @param {wei hex string} totalValue
- * @return {string} total value (including fee) with units i.e. 1.32 [eth]
- */
-function _getTotalValueDisplay (totalValue) {
-  totalValue = new BigNumber(totalValue);
-  return totalValue.times(WEI_TO_ETH_MULTIPLIER).toFormat(5);
-}
-
-function _getTotalValueDisplayWei (totalValue) {
-  totalValue = new BigNumber(totalValue);
-  return totalValue.toFormat(0);
-}
-
-function _getEthmFromWeiDisplay (weiHexString) {
-  const value = new BigNumber(weiHexString);
-
-  return value.times(WEI_TO_ETH_MULTIPLIER).times(1e7).toFixed(5);
-}
-
-function _getGasDisplay (gas) {
-  return new BigNumber(gas).times(1e-7).toFormat(4);
-}
diff --git a/js/src/views/Signer/components/util/transaction.spec.js b/js/src/views/Signer/components/util/transaction.spec.js
deleted file mode 100644
index 9fe4eb579abbae3d2f6a3a0489b820ef67919438..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/util/transaction.spec.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { getShortData, getFee, getTotalValue } from './transaction';
-
-describe('views/Signer/components/util/transaction', () => {
-  describe('getEstimatedMiningTime', () => {
-    it('should return estimated mining time', () => {
-    });
-  });
-
-  describe('getShortData', () => {
-    it('should return short data', () => {
-      // given
-      const data = '0xh87dY78';
-
-      // when
-      const res = getShortData(data);
-
-      // then
-      expect(res).to.equal('0xh...');
-    });
-
-    it('should return data as is', () => {
-      // given
-      const data = '0x0';
-
-      // when
-      const shortData = getShortData(data);
-
-      // then
-      expect(shortData).to.equal('0x0');
-    });
-  });
-
-  describe('getFee', () => {
-    it('should return wei BigNumber object equals to gas * gasPrice', () => {
-      // given
-      const gas = '0x76c0'; // 30400
-      const gasPrice = '0x9184e72a000'; // 10000000000000 wei
-
-      // when
-      const fee = getFee(gas, gasPrice);
-
-      // then
-      expect(fee).to.be.an.instanceOf(BigNumber);
-      expect(fee.toString()).to.be.equal('304000000000000000'); // converting to string due to https://github.com/MikeMcl/bignumber.js/issues/11
-    });
-  });
-
-  describe('getTotalValue', () => {
-    it('should return wei BigNumber totalValue equals to value + fee', () => {
-      // given
-      const fee = new BigNumber(304000000000000000); // wei
-      const value = '0x9184e72a'; // 2441406250 wei
-
-      // when
-      const totalValue = getTotalValue(fee, value);
-
-      // then
-      expect(totalValue).to.be.an.instanceOf(BigNumber);
-      expect(totalValue.toString()).to.be.equal('304000002441406250'); // converting to string due to https://github.com/MikeMcl/bignumber.js/issues/11
-    });
-  });
-});
diff --git a/js/src/views/Signer/components/util/util.js b/js/src/views/Signer/components/util/util.js
deleted file mode 100644
index 65551dbebf008ad398ff4ca80c36df09cd9b8c28..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/components/util/util.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function toPromise (fn) {
-  return new Promise((resolve, reject) => {
-    fn((err, res) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(res);
-      }
-    });
-  });
-}
-
-export function identity (x) {
-  return x;
-}
-
-export function capitalize (str) {
-  return str[0].toUpperCase() + str.slice(1).toLowerCase();
-}
diff --git a/js/src/views/Signer/containers/Embedded/embedded.css b/js/src/views/Signer/containers/Embedded/embedded.css
deleted file mode 100644
index df9fd7f9ed360b80bb3479e232640c5b70b9a544..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/containers/Embedded/embedded.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-@import '../../_layout.css';
-
-.info {
-  padding: 1em 0;
-}
-
-.none {
-  color: #aaa;
-}
-
-.request {
-  &:nth-child(even) {
-    background: rgba(255, 255, 255, 0.04);
-  }
-}
-
-.signer {
-  box-sizing: border-box;
-  padding: 0;
-  width: $embedWidth;
-}
diff --git a/js/src/views/Signer/containers/Embedded/embedded.js b/js/src/views/Signer/containers/Embedded/embedded.js
deleted file mode 100644
index 02005d668f136e99c819864bcd6226bbf9594c6d..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/containers/Embedded/embedded.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import Store from '../../store';
-import * as RequestsActions from '~/redux/providers/signerActions';
-import { Container } from '~/ui';
-
-import RequestPending from '../../components/RequestPending';
-
-import styles from './embedded.css';
-
-class Embedded extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    actions: PropTypes.shape({
-      startConfirmRequest: PropTypes.func.isRequired,
-      startRejectRequest: PropTypes.func.isRequired
-    }).isRequired,
-    externalLink: PropTypes.string,
-    gasLimit: PropTypes.object.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    signer: PropTypes.shape({
-      finished: PropTypes.array.isRequired,
-      pending: PropTypes.array.isRequired
-    }).isRequired
-  };
-
-  store = new Store(this.context.api, false, this.props.externalLink);
-
-  render () {
-    return (
-      <Container style={ { background: 'transparent' } }>
-        <div className={ styles.signer }>
-          { this.renderPendingRequests() }
-        </div>
-      </Container>
-    );
-  }
-
-  renderPendingRequests () {
-    const { signer } = this.props;
-    const { pending } = signer;
-
-    if (!pending.length) {
-      return (
-        <div className={ styles.none }>
-          <FormattedMessage
-            id='signer.embedded.noPending'
-            defaultMessage='There are currently no pending requests awaiting your confirmation'
-          />
-        </div>
-      );
-    }
-
-    const items = pending.sort(this._sortRequests).map(this.renderPending);
-
-    return (
-      <div>
-        { items }
-      </div>
-    );
-  }
-
-  renderPending = (data, index) => {
-    const { actions, gasLimit, netVersion } = this.props;
-    const { date, id, isSending, payload, origin } = data;
-
-    return (
-      <RequestPending
-        className={ styles.request }
-        date={ date }
-        focus={ index === 0 }
-        gasLimit={ gasLimit }
-        id={ id }
-        isSending={ isSending }
-        netVersion={ netVersion }
-        key={ id }
-        onConfirm={ actions.startConfirmRequest }
-        onReject={ actions.startRejectRequest }
-        origin={ origin }
-        payload={ payload }
-        signerStore={ this.store }
-      />
-    );
-  }
-
-  _sortRequests = (a, b) => {
-    return new BigNumber(a.id).cmp(b.id);
-  }
-}
-
-function mapStateToProps (state) {
-  const { gasLimit, netVersion } = state.nodeStatus;
-  const { actions, signer } = state;
-
-  return {
-    actions,
-    gasLimit,
-    netVersion,
-    signer
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    actions: bindActionCreators(RequestsActions, dispatch)
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Embedded);
diff --git a/js/src/views/Signer/containers/Embedded/index.js b/js/src/views/Signer/containers/Embedded/index.js
deleted file mode 100644
index 1bb184a2cb7f6e7acace1677df3853c4a14058e1..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/containers/Embedded/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './embedded';
diff --git a/js/src/views/Signer/containers/RequestsPage/index.js b/js/src/views/Signer/containers/RequestsPage/index.js
deleted file mode 100644
index 6bb7d69c5793a60b5d0aba2824023857b06d5b86..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/containers/RequestsPage/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './requestsPage';
diff --git a/js/src/views/Signer/containers/RequestsPage/requestsPage.css b/js/src/views/Signer/containers/RequestsPage/requestsPage.css
deleted file mode 100644
index 151c6a24cfe14ca7b38ae9a25e0396ec8e3d1e0f..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/containers/RequestsPage/requestsPage.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.noRequestsMsg {
-  color: #aaa;
-}
-
-.request {
-  &:nth-child(odd) {
-    background: rgba(255, 255, 255, 0.04);
-  }
-}
diff --git a/js/src/views/Signer/containers/RequestsPage/requestsPage.js b/js/src/views/Signer/containers/RequestsPage/requestsPage.js
deleted file mode 100644
index 8c2bf580f56fc9f125675a10d8f5c98a6e44ef2c..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/containers/RequestsPage/requestsPage.js
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import Store from '../../store';
-import { newError } from '~/redux/actions';
-import { startConfirmRequest, startRejectRequest } from '~/redux/providers/signerActions';
-import { Container, Page, TxList } from '~/ui';
-
-import RequestPending from '../../components/RequestPending';
-
-import styles from './requestsPage.css';
-
-@observer
-class RequestsPage extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    gasLimit: PropTypes.object.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    startConfirmRequest: PropTypes.func.isRequired,
-    startRejectRequest: PropTypes.func.isRequired,
-
-    blockNumber: PropTypes.object,
-    newError: PropTypes.func,
-    signer: PropTypes.shape({
-      pending: PropTypes.array.isRequired,
-      finished: PropTypes.array.isRequired
-    }).isRequired
-  };
-
-  store = new Store(this.context.api, true);
-
-  componentWillUnmount () {
-    this.store.unsubscribe();
-  }
-
-  render () {
-    return (
-      <Page>
-        <div>{ this.renderPendingRequests() }</div>
-        <div>{ this.renderLocalQueue() }</div>
-      </Page>
-    );
-  }
-
-  _sortRequests = (a, b) => {
-    return new BigNumber(a.id).cmp(b.id);
-  }
-
-  renderLocalQueue () {
-    const { localHashes } = this.store;
-    const { blockNumber, newError } = this.props;
-
-    if (!localHashes.length) {
-      return null;
-    }
-
-    return (
-      <Container
-        title={
-          <FormattedMessage
-            id='signer.requestsPage.queueTitle'
-            defaultMessage='Local Transactions'
-          />
-        }
-      >
-        <TxList
-          address=''
-          blockNumber={ blockNumber }
-          hashes={ localHashes }
-          onNewError={ newError }
-        />
-      </Container>
-    );
-  }
-
-  renderPendingRequests () {
-    const { pending } = this.props.signer;
-
-    if (!pending.length) {
-      return (
-        <Container>
-          <div className={ styles.noRequestsMsg }>
-            <FormattedMessage
-              id='signer.requestsPage.noPending'
-              defaultMessage='There are no requests requiring your confirmation.'
-            />
-          </div>
-        </Container>
-      );
-    }
-
-    const items = pending.sort(this._sortRequests).map(this.renderPending);
-
-    return (
-      <Container
-        title={
-          <FormattedMessage
-            id='signer.requestsPage.pendingTitle'
-            defaultMessage='Pending Signature Authorization'
-          />
-        }
-      >
-        { items }
-      </Container>
-    );
-  }
-
-  renderPending = (data, index) => {
-    const { startConfirmRequest, startRejectRequest, gasLimit, netVersion } = this.props;
-    const { date, id, isSending, payload, origin } = data;
-
-    return (
-      <RequestPending
-        className={ styles.request }
-        date={ date }
-        focus={ index === 0 }
-        gasLimit={ gasLimit }
-        id={ id }
-        isSending={ isSending }
-        netVersion={ netVersion }
-        key={ id }
-        onConfirm={ startConfirmRequest }
-        onReject={ startRejectRequest }
-        origin={ origin }
-        payload={ payload }
-        signerStore={ this.store }
-      />
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const { gasLimit, netVersion, blockNumber } = state.nodeStatus;
-  const { signer } = state;
-
-  return {
-    blockNumber,
-    gasLimit,
-    netVersion,
-    signer
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError,
-    startConfirmRequest,
-    startRejectRequest
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(RequestsPage);
diff --git a/js/src/views/Signer/index.js b/js/src/views/Signer/index.js
deleted file mode 100644
index b0274b28594a028e339758ce62df71563418b65b..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Embedded from './containers/Embedded';
-
-export default from './signer';
-
-export {
-  Embedded
-};
diff --git a/js/src/views/Signer/signer.js b/js/src/views/Signer/signer.js
deleted file mode 100644
index 093a980ed8ce96a3cf54b9755c061f4fcc079bf9..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/signer.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Actionbar } from '~/ui';
-import RequestsPage from './containers/RequestsPage';
-
-export default class Signer extends Component {
-  render () {
-    return (
-      <div>
-        <Actionbar
-          title={
-            <FormattedMessage
-              id='signer.title'
-              defaultMessage='Trusted Signer'
-            />
-          }
-        />
-        <RequestsPage />
-      </div>
-    );
-  }
-}
diff --git a/js/src/views/Signer/store.js b/js/src/views/Signer/store.js
deleted file mode 100644
index a18f4e209ffd3c532a2301fd8e1c22cc0fed2d3d..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/store.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { isEqual } from 'lodash';
-import { action, observable } from 'mobx';
-
-export default class SignerStore {
-  @observable balances = {};
-  @observable localHashes = [];
-
-  externalLink = '';
-
-  constructor (api, withLocalTransactions = false, externalLink = '') {
-    this._api = api;
-    this._timeoutId = 0;
-    this.externalLink = externalLink;
-
-    if (withLocalTransactions) {
-      this.fetchLocalTransactions();
-    }
-  }
-
-  @action setBalance = (address, balance) => {
-    this.setBalances({ [address]: balance });
-  }
-
-  @action setBalances = (balances) => {
-    this.balances = Object.assign({}, this.balances, balances);
-  }
-
-  @action setLocalHashes = (localHashes = []) => {
-    // Use slice to make sure they are both Arrays (MobX uses Objects for Observable Arrays)
-    if (!isEqual(localHashes.slice(), this.localHashes.slice())) {
-      this.localHashes = localHashes;
-    }
-  }
-
-  @action unsubscribe () {
-    if (this._timeoutId) {
-      clearTimeout(this._timeoutId);
-    }
-  }
-
-  fetchBalance (address) {
-    this._api.eth
-      .getBalance(address)
-      .then((balance) => {
-        this.setBalance(address, balance);
-      })
-      .catch((error) => {
-        console.warn('Store:fetchBalance', error);
-      });
-  }
-
-  fetchBalances (_addresses) {
-    const addresses = _addresses.filter((address) => address) || [];
-
-    if (!addresses.length) {
-      return;
-    }
-
-    Promise
-      .all(addresses.map((address) => this._api.eth.getBalance(address)))
-      .then((_balances) => {
-        this.setBalances(
-          addresses.reduce((balances, address, index) => {
-            balances[address] = _balances[index];
-            return balances;
-          }, {})
-        );
-      })
-      .catch((error) => {
-        console.warn('Store:fetchBalances', error);
-      });
-  }
-
-  fetchLocalTransactions = () => {
-    const nextTimeout = () => {
-      this._timeoutId = setTimeout(this.fetchLocalTransactions, 1500);
-    };
-
-    this._api.parity
-      .localTransactions()
-      .then((localTransactions) => {
-        const keys = Object
-          .keys(localTransactions)
-          .filter((key) => localTransactions[key].status !== 'canceled');
-
-        this.setLocalHashes(keys);
-      })
-      .then(() => nextTimeout())
-      .catch(() => nextTimeout());
-  }
-}
diff --git a/js/src/views/Signer/utils/extension.js b/js/src/views/Signer/utils/extension.js
deleted file mode 100644
index 786b52ec68d153619adfc7e6481fab9dafbf87b7..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/utils/extension.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export const isExtension = () => {
-  return window.location.protocol.indexOf('chrome-extension:') > -1;
-};
diff --git a/js/src/views/Signer/utils/utils.js b/js/src/views/Signer/utils/utils.js
deleted file mode 100644
index 76f7f09013298d2700defde1ca33e26cd7efaf60..0000000000000000000000000000000000000000
--- a/js/src/views/Signer/utils/utils.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function identity (x) {
-  return x;
-}
diff --git a/js/src/views/Status/Debug/debug.css b/js/src/views/Status/Debug/debug.css
deleted file mode 100644
index 70e929a59da6b59fdb481bbf92b2a0ca252ac47c..0000000000000000000000000000000000000000
--- a/js/src/views/Status/Debug/debug.css
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.subheader {
-  margin-top: 0;
-}
-
-.inputTrigger {
-  display: none;
-  left: 310px;
-  bottom: 4px;
-  position: absolute;
-  cursor: pointer;
-  animation: fadein .3s;
-}
-
-*:hover > .inputTrigger {
-  display: block;
-}
-
-@keyframes fadein {
-  0%   { opacity: 0; }
-  100% { opacity: 1; }
-}
-
-.logs {
-  margin: 0;
-  max-width: 100%;
-}
-
-.log {
-  font-family: monospace;
-  font-size: 0.9em;
-  white-space: pre-line;
-  word-wrap: break-word;
-  color: #aaa;
-  margin: 0.5em 0;
-  display: flex;
-  align-items: center;
-}
-
-.logDate {
-  color: green;
-  font-size: 0.85em;
-  margin-right: 0.5em;
-}
-
-.logText {
-  flex: 1;
-}
-
-.stopped {
-  color: #aaa;
-  padding: 1em 0;
-}
-
-.container {
-  width: 100%;
-}
-
-.actions {
-  float: right;
-}
-
-.actions a {
-  margin-left: 5px;
-  cursor: pointer;
-  color: #bbb;
-}
diff --git a/js/src/views/Status/Debug/debug.js b/js/src/views/Status/Debug/debug.js
deleted file mode 100644
index a0b91a3f29c63bd00699288df18dfeff2a9368d7..0000000000000000000000000000000000000000
--- a/js/src/views/Status/Debug/debug.js
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Container } from '~/ui';
-import { PauseIcon, PlayIcon, ReorderIcon, ReplayIcon } from '~/ui/Icons';
-
-import DebugStore from './store';
-import styles from './debug.css';
-
-@observer
-export default class Debug extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  debugStore = new DebugStore(this.context.api);
-
-  componentWillUnmount () {
-    this.debugStore.stopPolling();
-  }
-
-  render () {
-    const { logsLevels } = this.debugStore;
-
-    return (
-      <Container
-        title={
-          <FormattedMessage
-            id='status.debug.title'
-            defaultMessage='Node Logs'
-          />
-        }
-      >
-        { this.renderActions() }
-        <h2 className={ styles.subheader }>
-          { logsLevels || '-' }
-        </h2>
-        { this.renderToggle() }
-        { this.renderLogs() }
-      </Container>
-    );
-  }
-
-  renderToggle () {
-    const { logsEnabled } = this.debugStore;
-
-    if (logsEnabled) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.stopped }>
-        <FormattedMessage
-          id='status.debug.stopped'
-          defaultMessage='Refresh and display of logs from Parity is currently stopped via the UI, start it to see the latest updates.'
-        />
-      </div>
-    );
-  }
-
-  renderLogs () {
-    const { logs } = this.debugStore;
-
-    if (logs.length === 0) {
-      return null;
-    }
-
-    const text = logs
-      .map((log, index) => {
-        return (
-          <p key={ index } className={ styles.log }>
-            <span className={ styles.logDate }>[{ log.date.toLocaleString() }]</span>
-            <span className={ styles.logText }>{ log.log }</span>
-          </p>
-        );
-      });
-
-    return (
-      <div className={ styles.logs }>
-        { text }
-      </div>
-    );
-  }
-
-  renderActions () {
-    const { logsEnabled } = this.debugStore;
-    const toggleButton = logsEnabled
-      ? <PauseIcon />
-      : <PlayIcon />;
-
-    return (
-      <div className={ styles.actions }>
-        <a onClick={ this.toggle }>{ toggleButton }</a>
-        <a onClick={ this.clear }><ReplayIcon /></a>
-        <a
-          onClick={ this.reverse }
-          title={
-            <FormattedMessage
-              id='status.debug.reverse'
-              defaultMessage='Reverse Order'
-            />
-          }
-        >
-          <ReorderIcon />
-        </a>
-      </div>
-    );
-  }
-
-  clear = () => {
-    this.debugStore.clearLogs();
-  };
-
-  toggle = () => {
-    this.debugStore.toggle();
-  };
-
-  reverse = () => {
-    this.debugStore.reverse();
-  };
-}
diff --git a/js/src/views/Status/Debug/index.js b/js/src/views/Status/Debug/index.js
deleted file mode 100644
index 539b7e0fb01a5f71287c2d31ae145b550a61c9cb..0000000000000000000000000000000000000000
--- a/js/src/views/Status/Debug/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './debug';
diff --git a/js/src/views/Status/Debug/store.js b/js/src/views/Status/Debug/store.js
deleted file mode 100644
index 22466b7f9048d35324478b618e3f1e07e28eade9..0000000000000000000000000000000000000000
--- a/js/src/views/Status/Debug/store.js
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, observable, transaction } from 'mobx';
-
-const LOG_DATE_REGEX = /^(\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2})(.*)$/i;
-const MAX_LOGS = 25;
-
-export default class DebugStore {
-  @observable logs = [];
-  @observable logsLevels = null;
-  @observable logsEnabled = false;
-  @observable reversed = false;
-
-  api = null;
-  _lastLogAdded = null;
-  _timeoutId = null;
-
-  constructor (api) {
-    this.api = api;
-  }
-
-  @action clearLogs () {
-    this.logs = [];
-  }
-
-  @action setLogs (logs, logsLevels) {
-    let newLogs = [];
-
-    if (this._lastLogAdded) {
-      const sliceIndex = logs.findIndex((log) => log === this._lastLogAdded);
-
-      newLogs = logs.slice(0, sliceIndex);
-    } else {
-      newLogs = logs.slice();
-    }
-
-    this._lastLogAdded = logs[0];
-
-    const parsedLogs = newLogs
-      .map((log) => {
-        const logDate = LOG_DATE_REGEX.exec(log);
-
-        if (!logDate) {
-          return null;
-        }
-
-        return {
-          date: new Date(logDate[1]),
-          log: logDate[2]
-        };
-      })
-      .filter((log) => log);
-
-    transaction(() => {
-      if (!this.reversed) {
-        this.logs = [].concat(parsedLogs, this.logs.slice()).slice(0, MAX_LOGS);
-      } else {
-        parsedLogs.reverse();
-        this.logs = [].concat(this.logs.slice(), parsedLogs).slice(-1 * MAX_LOGS);
-      }
-
-      this.logsLevels = logsLevels;
-    });
-  }
-
-  @action toggle () {
-    this.logsEnabled = !this.logsEnabled;
-
-    if (this.logsEnabled) {
-      this.initPolling();
-    } else {
-      this.stopPolling();
-    }
-  }
-
-  @action reverse () {
-    transaction(() => {
-      this.reversed = !this.reversed;
-      this.logs = this.logs.reverse();
-    });
-  }
-
-  initPolling () {
-    this._pollLogs();
-  }
-
-  stopPolling () {
-    if (this._timeoutId) {
-      clearTimeout(this._timeoutId);
-    }
-  }
-
-  _pollLogs = () => {
-    const nextTimeout = (timeout = 1000) => {
-      this.stopPolling();
-      this._timeoutId = setTimeout(this._pollLogs, timeout);
-    };
-
-    return Promise
-      .all([
-        this.api.parity.devLogs(),
-        this.api.parity.devLogsLevels()
-      ])
-      .then(([ devLogs, devLogsLevels ]) => {
-        this.setLogs(devLogs, devLogsLevels);
-      })
-      .catch((error) => {
-        console.error('_pollLogs', error);
-      })
-      .then(() => {
-        return nextTimeout();
-      });
-  }
-}
diff --git a/js/src/views/Status/Health/health.js b/js/src/views/Status/Health/health.js
deleted file mode 100644
index d0c4136cad4dbcc3ab81a026dfb508e4a2642ed3..0000000000000000000000000000000000000000
--- a/js/src/views/Status/Health/health.js
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import { Container, ContainerTitle, StatusIndicator } from '~/ui';
-
-import grid from '../NodeStatus/nodeStatus.css';
-
-const HealthItem = (props) => {
-  const status = props.item.status || 'needsAttention';
-
-  return (
-    <div>
-      <h3>
-        <StatusIndicator
-          id={ props.id }
-          title={ [
-            (<div>{ props.item.message }</div>)
-          ] }
-          status={ status }
-        />
-        { props.title }
-        <small>&nbsp;({ props.details })</small>
-      </h3>
-      <p>
-        { status !== 'ok' ? props.item.message : '' }
-      </p>
-    </div>
-  );
-};
-
-HealthItem.propTypes = {
-  id: PropTypes.string.isRequired,
-  title: PropTypes.node.isRequired,
-  details: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.node
-  ]).isRequired,
-  item: PropTypes.object.isRequired
-};
-
-class Health extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    peers: PropTypes.object.isRequired,
-    sync: PropTypes.object.isRequired,
-    time: PropTypes.object.isRequired
-  };
-
-  state = {};
-
-  render () {
-    const { peers, sync, time } = this.props;
-    const [yes, no] = [(
-      <FormattedMessage
-        id='status.health.yes'
-        defaultMessage='yes'
-      />
-    ), (
-      <FormattedMessage
-        id='status.health.no'
-        defaultMessage='no'
-      />
-    )];
-
-    return (
-      <Container>
-        <ContainerTitle
-          title={
-            <div>
-              <FormattedMessage
-                id='status.health.title'
-                defaultMessage='Node Health'
-              />
-            </div>
-          }
-        />
-        <div className={ grid.container }>
-          <div className={ grid.row }>
-            <div className={ grid.col4 }>
-              <HealthItem
-                id='status.health.sync'
-                title={
-                  <FormattedMessage
-                    id='status.health.sync'
-                    defaultMessage='Chain Synchronized'
-                  />
-                }
-                details={ !sync.details ? yes : no }
-                item={ sync }
-              />
-            </div>
-            <div className={ grid.col4 }>
-              <HealthItem
-                id='status.health.peers'
-                title={
-                  <FormattedMessage
-                    id='status.health.peers'
-                    defaultMessage='Connected Peers'
-                  />
-                }
-                details={ (peers.details || []).join('/') }
-                item={ peers }
-              />
-            </div>
-            <div className={ grid.col4 }>
-              <HealthItem
-                id='status.health.time'
-                title={
-                  <FormattedMessage
-                    id='status.health.time'
-                    defaultMessage='Time Synchronized'
-                  />
-                }
-                details={ `${time.details || 0} ms` }
-                item={ time }
-              />
-            </div>
-          </div>
-        </div>
-      </Container>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  return state.nodeStatus.health;
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(Health);
diff --git a/js/src/views/Status/Health/index.js b/js/src/views/Status/Health/index.js
deleted file mode 100644
index 3fefcb039319db444e4df79198ef3e20dbcc46fc..0000000000000000000000000000000000000000
--- a/js/src/views/Status/Health/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './health';
diff --git a/js/src/views/Status/MiningSettings/decodeExtraData.js b/js/src/views/Status/MiningSettings/decodeExtraData.js
deleted file mode 100644
index 36cf1691db215c271592005b83127abd374dd697..0000000000000000000000000000000000000000
--- a/js/src/views/Status/MiningSettings/decodeExtraData.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import rlp from 'rlp';
-
-export function decodeExtraData (str) {
-  try {
-    // Try decoding as RLP
-    const decoded = rlp.decode(str);
-    const v = decoded[0];
-
-    decoded[0] = decoded[1];
-    decoded[1] = `${v[0]}.${v[1]}.${v[2]}`;
-    return decoded.join('/');
-  } catch (err) {
-    // hex -> str
-    return str.match(/.{1,2}/g).map(v => {
-      return String.fromCharCode(parseInt(v, 16));
-    }).join('');
-  }
-}
diff --git a/js/src/views/Status/MiningSettings/decodeExtraData.spec.js b/js/src/views/Status/MiningSettings/decodeExtraData.spec.js
deleted file mode 100644
index 093e409ba737516891b9945e993840f7ecc76da1..0000000000000000000000000000000000000000
--- a/js/src/views/Status/MiningSettings/decodeExtraData.spec.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { decodeExtraData } from './decodeExtraData';
-
-describe('views/Status/components/MiningSettings/decodeExtraData', () => {
-  describe('EXTRA DATA', () => {
-    const str = 'parity/1.0.0/1.0.0-beta2';
-    const encoded = '0xd783010000867061726974798b312e302e302d6265746132';
-
-    it('should decode encoded to str', () => {
-      expect(decodeExtraData(encoded)).to.equal(str);
-    });
-  });
-});
diff --git a/js/src/views/Status/MiningSettings/index.js b/js/src/views/Status/MiningSettings/index.js
deleted file mode 100644
index e443ce3e7149ea0938705c29dab583e1f642f54b..0000000000000000000000000000000000000000
--- a/js/src/views/Status/MiningSettings/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './miningSettings';
diff --git a/js/src/views/Status/MiningSettings/miningSettings.js b/js/src/views/Status/MiningSettings/miningSettings.js
deleted file mode 100644
index 32209cd24969ea0d95c274aad0247e98fff372c0..0000000000000000000000000000000000000000
--- a/js/src/views/Status/MiningSettings/miningSettings.js
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import formatNumber from 'format-number';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { ContainerTitle, Input, TypedInput } from '~/ui';
-
-import { numberFromString } from './numberFromString';
-import { decodeExtraData } from './decodeExtraData';
-
-const toNiceNumber = formatNumber();
-
-export default class MiningSettings extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  };
-
-  static propTypes = {
-    coinbase: PropTypes.string,
-    defaultExtraData: PropTypes.string,
-    extraData: PropTypes.string,
-    gasFloorTarget: PropTypes.object,
-    minGasPrice: PropTypes.object,
-    onUpdateSetting: PropTypes.func.isRequired
-  };
-
-  render () {
-    const { coinbase, defaultExtraData, extraData, gasFloorTarget, minGasPrice } = this.props;
-    const decodedExtraData = extraData
-      ? decodeExtraData(extraData)
-      : '';
-    const decodedDefaultExtraData = defaultExtraData
-      ? decodeExtraData(defaultExtraData)
-      : '';
-
-    return (
-      <div { ...this._testInherit() }>
-        <ContainerTitle
-          title={
-            <FormattedMessage
-              id='status.miningSettings.title'
-              defaultMessage='mining settings'
-            />
-          }
-        />
-        <TypedInput
-          label={
-            <FormattedMessage
-              id='status.miningSettings.input.author.label'
-              defaultMessage='author'
-            />
-          }
-          hint={
-            <FormattedMessage
-              id='status.miningSettings.input.author.hint'
-              defaultMessage='the mining author'
-            />
-          }
-          param='address'
-          value={ coinbase }
-          onChange={ this.onAuthorChange }
-          allowCopy
-        />
-
-        <Input
-          defaultValue={ decodedDefaultExtraData }
-          escape='default'
-          label={
-            <FormattedMessage
-              id='status.miningSettings.input.extradata.label'
-              defaultMessage='extradata'
-            />
-          }
-          hint={
-            <FormattedMessage
-              id='status.miningSettings.input.extradata.hint'
-              defaultMessage='extra data for mined blocks'
-            />
-          }
-          value={ decodedExtraData }
-          onSubmit={ this.onExtraDataChange }
-          allowCopy
-        />
-
-        <Input
-          label={
-            <FormattedMessage
-              id='status.miningSettings.input.gasPrice.label'
-              defaultMessage='minimal gas price'
-            />
-          }
-          hint={
-            <FormattedMessage
-              id='status.miningSettings.input.gasPrice.hint'
-              defaultMessage='the minimum gas price for mining'
-            />
-          }
-          value={ toNiceNumber(minGasPrice) }
-          onSubmit={ this.onMinGasPriceChange }
-          allowCopy={ minGasPrice.toString() }
-        />
-
-        <Input
-          label={
-            <FormattedMessage
-              id='status.miningSettings.input.gasFloor.label'
-              defaultMessage='gas floor target'
-            />
-          }
-          hint={
-            <FormattedMessage
-              id='status.miningSettings.input.gasFloor.hint'
-              defaultMessage='the gas floor target for mining'
-            />
-          }
-          value={ toNiceNumber(gasFloorTarget) }
-          onSubmit={ this.onGasFloorTargetChange }
-          allowCopy={ gasFloorTarget.toString() }
-        />
-      </div>
-    );
-  }
-
-  onMinGasPriceChange = (newVal) => {
-    const { api } = this.context;
-
-    api.parity
-      .setMinGasPrice(numberFromString(newVal))
-      .then(() => this.updateMiningSettings());
-  };
-
-  onExtraDataChange = (value) => {
-    const { api } = this.context;
-
-    api.parity
-      .setExtraData(value)
-      .then(() => this.updateMiningSettings());
-  };
-
-  onAuthorChange = (newVal) => {
-    const { api } = this.context;
-
-    api.parity
-      .setAuthor(newVal)
-      .then(() => this.updateMiningSettings());
-  };
-
-  onGasFloorTargetChange = (newVal) => {
-    const { api } = this.context;
-
-    api.parity
-      .setGasFloorTarget(numberFromString(newVal))
-      .then(() => this.updateMiningSettings());
-  };
-
-  updateMiningSettings () {
-    this.props.onUpdateSetting();
-  }
-}
diff --git a/js/src/views/Status/MiningSettings/numberFromString.js b/js/src/views/Status/MiningSettings/numberFromString.js
deleted file mode 100644
index d9f0b3da14b00bc01fea910d9f5a964e65d51964..0000000000000000000000000000000000000000
--- a/js/src/views/Status/MiningSettings/numberFromString.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export function numberFromString (val) {
-  return parseInt(
-    val
-      .replace(/m/ig, 'k')
-      .replace(/k/ig, '000')
-      .replace(/[^0-9]/g, '')
-    , 10
-  );
-}
diff --git a/js/src/views/Status/MiningSettings/numberFromString.spec.js b/js/src/views/Status/MiningSettings/numberFromString.spec.js
deleted file mode 100644
index 64c1ac24f911233c7b74976e3677d6fc38f967cc..0000000000000000000000000000000000000000
--- a/js/src/views/Status/MiningSettings/numberFromString.spec.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { numberFromString } from './numberFromString';
-
-describe('views/Status/components/MiningSettings/numberFromString', () => {
-  it('should convert string to number', () => {
-    expect(numberFromString('12345'), 12345);
-  });
-
-  it('should handle special characters "k" and "m"', () => {
-    expect(numberFromString('10kk'), 10000000);
-    expect(numberFromString('10K'), 1000);
-    expect(numberFromString('10Mmk'), 1000000000000000);
-  });
-
-  it('should ignore any non-numeric characters', () => {
-    expect(numberFromString('10.000.000'), 10000000);
-    expect(numberFromString('10_000_000'), 10000000);
-    expect(numberFromString('10_k_k'), 10000000);
-    expect(numberFromString('-5'), 5);
-  });
-});
diff --git a/js/src/views/Status/NodeStatus/index.js b/js/src/views/Status/NodeStatus/index.js
deleted file mode 100644
index 2fccb490354400beda8ce7a5b00f069d426bf388..0000000000000000000000000000000000000000
--- a/js/src/views/Status/NodeStatus/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './nodeStatus';
diff --git a/js/src/views/Status/NodeStatus/nodeStatus.css b/js/src/views/Status/NodeStatus/nodeStatus.css
deleted file mode 100644
index e96dad03d3829aa74204988dae3fba93880b5659..0000000000000000000000000000000000000000
--- a/js/src/views/Status/NodeStatus/nodeStatus.css
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.container {
-  padding-bottom: 1em;
-}
-
-.row {
-  margin: 0 -1em;
-
-  &::after {
-    display: table;
-    clear: both;
-    content: '';
-  }
-}
-
-.blockInfo {
-  color: #aaa;
-  font-size: 1.5em;
-  line-height: 1.5em;
-}
-
-.blockByline {
-  color: #aaa;
-  font-size: 0.75em;
-}
-
-.padBottom {
-  padding-bottom: 1.25em !important;
-}
-
-.col,
-.col3, .col4, .col4_5, .col6, .col12 {
-  float: left;
-  padding: 0 1em;
-  box-sizing: border-box;
-}
-
-.col3 {
-  width: 25%;
-  width: -webkit-calc(100% / 12 * 3);
-  width: -moz-calc(100% / 12 * 3);
-  width: calc(100% / 12 * 3);
-}
-
-.col4 {
-  width: 33.3%;
-  width: -webkit-calc(100% / 12 * 4);
-  width: -moz-calc(100% / 12 * 4);
-  width: calc(100% / 12 * 4);
-}
-
-.col4_5 {
-  width: 37.5%;
-  width: -webkit-calc(100% / 12 * 4.5);
-  width: -moz-calc(100% / 12 * 4.5);
-  width: calc(100% / 12 * 4.5);
-}
-
-.col6 {
-  width: 50%;
-  width: -webkit-calc(100% / 12 * 6);
-  width: -moz-calc(100% / 12 * 6);
-  width: calc(100% / 12 * 6);
-}
-
-.col12 {
-  width: 100%;
-}
diff --git a/js/src/views/Status/NodeStatus/nodeStatus.js b/js/src/views/Status/NodeStatus/nodeStatus.js
deleted file mode 100644
index 7e2e0679ea374f00d890a90b6aeb7d82c58d45d8..0000000000000000000000000000000000000000
--- a/js/src/views/Status/NodeStatus/nodeStatus.js
+++ /dev/null
@@ -1,301 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import bytes from 'bytes';
-import moment from 'moment';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import { Container, ContainerTitle, Input } from '~/ui';
-
-import MiningSettings from '../MiningSettings';
-import StatusStore from './store';
-
-import styles from './nodeStatus.css';
-
-class NodeStatus extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    blockNumber: PropTypes.object,
-    blockTimestamp: PropTypes.object,
-    netChain: PropTypes.string,
-    netPeers: PropTypes.object
-  };
-
-  statusStore = new StatusStore(this.context.api);
-
-  componentWillMount () {
-    this.statusStore.startPolling();
-  }
-
-  componentWillUnmount () {
-    this.statusStore.stopPolling();
-  }
-
-  render () {
-    const { blockNumber, blockTimestamp, netPeers } = this.props;
-    const { hashrate } = this.statusStore;
-
-    if (!netPeers || !blockNumber) {
-      return null;
-    }
-
-    const hashrateValue = bytes(hashrate.toNumber()) || 0;
-    const peers = `${netPeers.active}/${netPeers.connected}/${netPeers.max}`;
-
-    return (
-      <Container>
-        <div className={ styles.container }>
-          <div className={ styles.row }>
-            <div className={ styles.col3 }>
-              <div className={ `${styles.col12} ${styles.padBottom}` }>
-                <ContainerTitle
-                  title={
-                    <FormattedMessage
-                      id='status.status.title.bestBlock'
-                      defaultMessage='best block'
-                    />
-                  }
-                />
-                <div className={ styles.blockInfo }>
-                  #{ blockNumber.toFormat() }
-                </div>
-                <div className={ styles.blockByline }>
-                  { moment(blockTimestamp).calendar() }
-                </div>
-              </div>
-              <div className={ `${styles.col12} ${styles.padBottom}` }>
-                <ContainerTitle
-                  title={
-                    <FormattedMessage
-                      id='status.status.title.peers'
-                      defaultMessage='peers'
-                    />
-                  }
-                />
-                <div className={ styles.blockInfo }>
-                  { peers }
-                </div>
-              </div>
-              <div className={ `${styles.col12} ${styles.padBottom}` }>
-                <ContainerTitle
-                  title={
-                    <FormattedMessage
-                      id='status.status.title.hashRate'
-                      defaultMessage='hash rate'
-                    />
-                  }
-                />
-                <div className={ styles.blockInfo }>
-                  <FormattedMessage
-                    id='status.status.hashrate'
-                    defaultMessage='{hashrate} H/s'
-                    values={ {
-                      hashrate: hashrateValue
-                    } }
-                  />
-                </div>
-              </div>
-            </div>
-            <div className={ styles.col4_5 }>
-              { this.renderMiningSettings() }
-            </div>
-            <div className={ styles.col4_5 }>
-              { this.renderSettings() }
-            </div>
-          </div>
-        </div>
-      </Container>
-    );
-  }
-
-  renderMiningSettings () {
-    const { coinbase, defaultExtraData, extraData, gasFloorTarget, minGasPrice } = this.statusStore;
-
-    return (
-      <MiningSettings
-        coinbase={ coinbase }
-        defaultExtraData={ defaultExtraData }
-        extraData={ extraData }
-        gasFloorTarget={ gasFloorTarget }
-        minGasPrice={ minGasPrice }
-        onUpdateSetting={ this.statusStore.handleUpdateSetting }
-      />
-    );
-  }
-
-  renderNodeName () {
-    const { nodeName } = this.statusStore;
-
-    return (
-      <span>
-        { nodeName || (
-          <FormattedMessage
-            id='status.status.title.node'
-            defaultMessage='Node'
-          />)
-        }
-      </span>
-    );
-  }
-
-  renderSettings () {
-    const { netChain } = this.props;
-    const { enode, rpcSettings, netPort = '' } = this.statusStore;
-
-    if (!rpcSettings) {
-      return null;
-    }
-
-    const rpcPort = rpcSettings.port || '';
-
-    return (
-      <div>
-        <ContainerTitle
-          title={
-            <FormattedMessage
-              id='status.status.title.network'
-              defaultMessage='network settings'
-            />
-          }
-        />
-        <Input
-          allowCopy
-          readOnly
-          label={
-            <FormattedMessage
-              id='status.status.input.chain'
-              defaultMessage='chain'
-            />
-          }
-          value={ netChain }
-        />
-        <div className={ styles.row }>
-          <div className={ styles.col6 }>
-            <Input
-              allowCopy
-              readOnly
-              label={
-                <FormattedMessage
-                  id='status.status.input.rpcEnabled'
-                  defaultMessage='rpc enabled'
-                />
-              }
-              value={
-                rpcSettings.enabled
-                  ? (
-                    <FormattedMessage
-                      id='status.status.input.yes'
-                      defaultMessage='yes'
-                    />
-                  )
-                  : (
-                    <FormattedMessage
-                      id='status.status.input.no'
-                      defaultMessage='no'
-                    />
-                  )
-              }
-            />
-          </div>
-          <div className={ styles.col6 }>
-            <Input
-              allowCopy
-              readOnly
-              label={
-                <FormattedMessage
-                  id='status.status.input.port'
-                  defaultMessage='network port'
-                />
-              }
-              value={ netPort.toString() }
-            />
-          </div>
-        </div>
-
-        <div className={ styles.row }>
-          <div className={ styles.col6 }>
-            <Input
-              allowCopy
-              readOnly
-              label={
-                <FormattedMessage
-                  id='status.status.input.rpcInterface'
-                  defaultMessage='rpc interface'
-                />
-              }
-              value={ rpcSettings.interface }
-            />
-          </div>
-          <div className={ styles.col6 }>
-            <Input
-              allowCopy
-              readOnly
-              label={
-                <FormattedMessage
-                  id='status.status.input.rpcPort'
-                  defaultMessage='rpc port'
-                />
-              }
-              value={ rpcPort.toString() }
-            />
-          </div>
-        </div>
-
-        <div className={ styles.row }>
-          <div className={ styles.col12 }>
-            <Input
-              allowCopy
-              readOnly
-              label={
-                <FormattedMessage
-                  id='status.status.input.enode'
-                  defaultMessage='enode'
-                />
-              }
-              value={ enode }
-            />
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
-
-function mapStateToProps (state) {
-  const {
-    blockNumber,
-    blockTimestamp,
-    netChain,
-    netPeers
-  } = state.nodeStatus;
-
-  return {
-    blockNumber,
-    blockTimestamp,
-    netChain,
-    netPeers
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(NodeStatus);
diff --git a/js/src/views/Status/NodeStatus/store.js b/js/src/views/Status/NodeStatus/store.js
deleted file mode 100644
index 22fe2007009ea3c80c4003a1e9783616d4df7def..0000000000000000000000000000000000000000
--- a/js/src/views/Status/NodeStatus/store.js
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { action, observable, transaction } from 'mobx';
-
-export default class StatusStore {
-  @observable defaultExtraData = '';
-  @observable enode = '';
-  @observable hashrate = new BigNumber(0);
-  @observable netPort = new BigNumber(0);
-  @observable nodeName = '';
-  @observable rpcSettings = {};
-
-  @observable coinbase = '';
-  @observable extraData = '';
-  @observable gasFloorTarget = new BigNumber(0);
-  @observable minGasPrice = new BigNumber(0);
-
-  api = null;
-  _timeoutIds = {};
-
-  constructor (api) {
-    this.api = api;
-  }
-
-  @action setLongStatus ({ defaultExtraData, enode, netPort, rpcSettings }) {
-    transaction(() => {
-      this.defaultExtraData = defaultExtraData;
-      this.enode = enode;
-      this.netPort = netPort;
-      this.rpcSettings = rpcSettings;
-    });
-  }
-
-  @action setStatus ({ hashrate }) {
-    transaction(() => {
-      this.hashrate = hashrate;
-    });
-  }
-
-  @action setMinerSettings ({ coinbase, extraData, gasFloorTarget, minGasPrice }) {
-    transaction(() => {
-      this.coinbase = coinbase;
-      this.extraData = extraData;
-      this.gasFloorTarget = gasFloorTarget;
-      this.minGasPrice = minGasPrice;
-    });
-  }
-
-  startPolling () {
-    this._pollStatus();
-    this._pollLongStatus();
-  }
-
-  stopPolling () {
-    Object.keys(this._timeoutIds).forEach((key) => clearTimeout(this._timeoutIds[key]));
-  }
-
-  /**
-   * Miner settings should never changes unless
-   * Parity is restarted, or if the values are changed
-   * from the UI
-   */
-  _pollMinerSettings () {
-    return Promise
-      .all([
-        this.api.eth.coinbase(),
-        this.api.parity.extraData(),
-        this.api.parity.gasFloorTarget(),
-        this.api.parity.minGasPrice()
-      ])
-      .then(([
-        coinbase, extraData, gasFloorTarget, minGasPrice
-      ]) => {
-        const minerSettings = {
-          coinbase,
-          extraData,
-          gasFloorTarget,
-          minGasPrice
-        };
-
-        this.setMinerSettings(minerSettings);
-      })
-      .catch((error) => {
-        console.error('_pollMinerSettings', error);
-      });
-  }
-
-  _pollStatus () {
-    const nextTimeout = (timeout = 1000) => {
-      clearTimeout(this._timeoutIds.short);
-      this._timeoutIds.short = setTimeout(() => this._pollStatus(), timeout);
-    };
-
-    return Promise
-      .all([
-        this.api.eth.hashrate()
-      ])
-      .then(([
-        hashrate
-      ]) => {
-        this.setStatus({
-          hashrate
-        });
-      })
-      .catch((error) => {
-        console.error('_pollStatus', error);
-      })
-      .then(() => {
-        nextTimeout();
-      });
-  }
-
-  _pollLongStatus () {
-    const nextTimeout = (timeout = 30000) => {
-      clearTimeout(this._timeoutIds.long);
-      this._timeoutIds.long = setTimeout(() => this._pollLongStatus(), timeout);
-    };
-
-    this._pollMinerSettings();
-    return Promise
-      .all([
-        this.api.parity.defaultExtraData(),
-        this.api.parity.enode().then((enode) => enode).catch(() => '-'),
-        this.api.parity.netPort(),
-        this.api.parity.rpcSettings()
-      ])
-      .then(([
-        defaultExtraData, enode, netPort, rpcSettings
-      ]) => {
-        this.setLongStatus({
-          defaultExtraData, enode, netPort, rpcSettings
-        });
-      })
-      .catch((error) => {
-        console.error('_pollLongStatus', error);
-      })
-      .then(() => {
-        nextTimeout();
-      });
-  }
-
-  handleUpdateSetting = () => {
-    return this._pollMinerSettings();
-  };
-}
diff --git a/js/src/views/Status/Peers/index.js b/js/src/views/Status/Peers/index.js
deleted file mode 100644
index a223af63c6c92936f71f46605da557416ef366a0..0000000000000000000000000000000000000000
--- a/js/src/views/Status/Peers/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './peers';
diff --git a/js/src/views/Status/Peers/peers.css b/js/src/views/Status/Peers/peers.css
deleted file mode 100644
index a164aea81960cf1be982288ffd1f70250c16cb15..0000000000000000000000000000000000000000
--- a/js/src/views/Status/Peers/peers.css
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.peers {
-  margin-top: 0.5em;
-  overflow: auto;
-  width: 100%;
-
-  table {
-    border-collapse: collapse;
-    width: 100%;
-  }
-
-  th {
-    padding: 0.5em;
-    text-align: left;
-    white-space: nowrap;
-  }
-}
-
-.peer {
-  &:nth-child(odd) {
-    background-color: rgba(200, 200, 200, 0.1);
-  }
-
-  td {
-    border-top: 1px solid #333;
-    font-size: 0.9em;
-    overflow: hidden;
-    padding: 0.5em 0.25em;
-    white-space: nowrap;
-  }
-}
-
-.form {
-  align-items: center;
-  display: flex;
-  flex-direction: row;
-  float: right;
-  width: 40em;
-
-  .input {
-    flex: 1;
-    margin-right: 1em;
-  }
-}
diff --git a/js/src/views/Status/Peers/peers.js b/js/src/views/Status/Peers/peers.js
deleted file mode 100644
index 08bed0955f706c97a8ecdd5617ea899c4bcb9297..0000000000000000000000000000000000000000
--- a/js/src/views/Status/Peers/peers.js
+++ /dev/null
@@ -1,364 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-
-import { Button, Container, ContainerTitle, Input, ScrollableText, ShortenedHash } from '~/ui';
-import { showSnackbar } from '~/redux/providers/snackbarActions';
-import { newError } from '~/redux/actions';
-
-import styles from './peers.css';
-
-class Peers extends Component {
-  static contextTypes = {
-    api: PropTypes.object
-  };
-
-  static propTypes = {
-    peers: PropTypes.array.isRequired,
-    newError: PropTypes.func,
-    showSnackbar: PropTypes.func
-  };
-
-  state = {
-    action: '',
-    formInput: '',
-    showForm: false
-  };
-
-  getActions () {
-    return [
-      <Button
-        key='btn_acceptNonReserved'
-        label={
-          <FormattedMessage
-            id='peers.acceptNonReserved.label'
-            defaultMessage='Accept non-reserved'
-          />
-        }
-        onClick={ this.handleAcceptNonReserved }
-      />,
-      <Button
-        key='btn_dropNonReserved'
-        label={
-          <FormattedMessage
-            id='peers.dropNonReserved.label'
-            defaultMessage='Drop non-reserved'
-          />
-        }
-        onClick={ this.handleDropNonReserved }
-      />,
-      <Button
-        key='btn_addReserved'
-        label={
-          <FormattedMessage
-            id='peers.addReserved.label'
-            defaultMessage='Add reserved'
-          />
-        }
-        onClick={ this.handleAddReserved }
-      />,
-      <Button
-        key='btn_removeReserved'
-        label={
-          <FormattedMessage
-            id='peers.removeReserved.label'
-            defaultMessage='Remove reserved'
-          />
-        }
-        onClick={ this.handleRemoveReserved }
-      />
-    ];
-  }
-
-  render () {
-    const { peers } = this.props;
-
-    return (
-      <Container>
-        <ContainerTitle
-          actions={ this.getActions() }
-          title={
-            <FormattedMessage
-              id='status.peers.title'
-              defaultMessage='network peers'
-            />
-          }
-        />
-        { this.renderForm() }
-        <div className={ styles.peers }>
-          <table>
-            <thead>
-              <tr>
-                <th />
-                <th>
-                  <FormattedMessage
-                    id='status.peers.table.header.id'
-                    defaultMessage='ID'
-                  />
-                </th>
-                <th>
-                  <FormattedMessage
-                    id='status.peers.table.header.remoteAddress'
-                    defaultMessage='Remote Address'
-                  />
-                </th>
-                <th>
-                  <FormattedMessage
-                    id='status.peers.table.header.name'
-                    defaultMessage='Name'
-                  />
-                </th>
-                <th>
-                  <FormattedMessage
-                    id='status.peers.table.header.ethHeader'
-                    defaultMessage='Header (ETH)'
-                  />
-                </th>
-                <th>
-                  <FormattedMessage
-                    id='status.peers.table.header.ethDiff'
-                    defaultMessage='Difficulty (ETH)'
-                  />
-                </th>
-                <th>
-                  <FormattedMessage
-                    id='status.peers.table.header.caps'
-                    defaultMessage='Capabilities'
-                  />
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              { this.renderPeers(peers) }
-            </tbody>
-          </table>
-        </div>
-      </Container>
-    );
-  }
-
-  renderForm () {
-    const { action, showForm } = this.state;
-
-    if (!showForm) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.form }>
-        <div className={ styles.input }>
-          <Input
-            label={
-              <FormattedMessage
-                id='peers.form.label'
-                defaultMessage='Peer enode URL'
-              />
-            }
-            onChange={ this.handleInputChange }
-          />
-        </div>
-        <Button
-          label={
-            <FormattedMessage
-              id='peers.form.action.label'
-              defaultMessage='{add, select, true {Add} false {}}{remove, select, true {Remove} false {}}'
-              values={ {
-                add: action === 'add',
-                remove: action === 'remove'
-              } }
-            />
-          }
-          onClick={ this.handleConfirmForm }
-        />
-        <Button
-          label={
-            <FormattedMessage
-              id='peers.form.cancel.label'
-              defaultMessage='Cancel'
-            />
-          }
-          onClick={ this.handleCancelForm }
-        />
-      </div>
-    );
-  }
-
-  renderPeers (peers) {
-    return peers.map((peer, index) => this.renderPeer(peer, index));
-  }
-
-  renderPeer (peer, index) {
-    const { caps, id, name, network, protocols } = peer;
-
-    return (
-      <tr
-        className={ styles.peer }
-        key={ id }
-      >
-        <td>
-          { index + 1 }
-        </td>
-        <td>
-          <ScrollableText small text={ id } />
-        </td>
-        <td>
-          { network.remoteAddress }
-        </td>
-        <td>
-          { name }
-        </td>
-        <td>
-          {
-            protocols.eth
-            ? <ShortenedHash data={ protocols.eth.head } />
-            : null
-          }
-        </td>
-        <td>
-          {
-            protocols.eth && protocols.eth.difficulty.gt(0)
-            ? protocols.eth.difficulty.toExponential(16)
-            : null
-          }
-        </td>
-        <td>
-          {
-            caps && caps.length > 0
-            ? caps.join(' - ')
-            : null
-          }
-        </td>
-      </tr>
-    );
-  }
-
-  handleAcceptNonReserved = () => {
-    return this.context.api.parity.acceptNonReservedPeers()
-      .then(() => {
-        const message = (
-          <FormattedMessage
-            id='peers.acceptNonReservedPeers.success'
-            defaultMessage='Accepting non-reserved peers'
-          />
-        );
-
-        this.props.showSnackbar(message, 3000);
-      })
-      .catch((error) => {
-        this.props.newError(error);
-      });
-  };
-
-  handleDropNonReserved = () => {
-    return this.context.api.parity.dropNonReservedPeers()
-      .then(() => {
-        const message = (
-          <FormattedMessage
-            id='peers.dropNonReservedPeers.success'
-            defaultMessage='Dropping non-reserved peers'
-          />
-        );
-
-        this.props.showSnackbar(message, 3000);
-      })
-      .catch((error) => {
-        this.props.newError(error);
-      });
-  };
-
-  handleAddReserved = () => {
-    this.setState({ showForm: true, action: 'add' });
-  };
-
-  handleRemoveReserved = () => {
-    this.setState({ showForm: true, action: 'remove' });
-  };
-
-  handleInputChange = (event, value) => {
-    this.setState({ formInput: value });
-  };
-
-  handleCancelForm = () => {
-    this.setState({ showForm: false, action: '', formInput: '' });
-  };
-
-  handleConfirmForm = () => {
-    const { action, formInput } = this.state;
-    let method;
-
-    if (action === 'add') {
-      method = 'addReservedPeer';
-    } else if (action === 'remove') {
-      method = 'removeReservedPeer';
-    }
-
-    this.setState({ showForm: false, action: '', formInput: '' });
-
-    if (!method) {
-      return;
-    }
-
-    this.context.api.parity[method](formInput)
-      .then(() => {
-        const message = (
-          <FormattedMessage
-            id='peers.form.action.success'
-            defaultMessage='Successfully {add, select, true {added} false {}}{remove, select, true {removed} false {}} a reserved peer'
-            values={ {
-              add: action === 'add',
-              remove: action === 'remove'
-            } }
-          />
-        );
-
-        this.props.showSnackbar(message, 3000);
-      })
-      .catch((error) => {
-        this.props.newError(error);
-      });
-  };
-}
-
-function mapStateToProps (state) {
-  const handshakeRegex = /handshake/i;
-
-  const { netPeers } = state.nodeStatus;
-  const { peers = [] } = netPeers;
-  const realPeers = peers
-    .filter((peer) => peer.id)
-    .filter((peer) => !handshakeRegex.test(peer.network.remoteAddress))
-    .filter((peer) => peer.protocols.eth && peer.protocols.eth.head)
-    .sort((peerA, peerB) => {
-      const idComp = peerA.id.localeCompare(peerB.id);
-
-      return idComp;
-    });
-
-  return { peers: realPeers };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    newError,
-    showSnackbar
-  }, dispatch);
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Peers);
diff --git a/js/src/views/Status/index.js b/js/src/views/Status/index.js
deleted file mode 100644
index b41557c1ce4ca1d37324cd49b11916a9776f5566..0000000000000000000000000000000000000000
--- a/js/src/views/Status/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './status';
diff --git a/js/src/views/Status/status.css b/js/src/views/Status/status.css
deleted file mode 100644
index d6d5a07f56c472387baeb695465fa2816669cd8e..0000000000000000000000000000000000000000
--- a/js/src/views/Status/status.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.body {
-  &>div {
-    margin-bottom: 0.25em;
-  }
-}
diff --git a/js/src/views/Status/status.js b/js/src/views/Status/status.js
deleted file mode 100644
index bac520a464a402b0a2e90bc9bbbbadc152dd1349..0000000000000000000000000000000000000000
--- a/js/src/views/Status/status.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Page } from '~/ui';
-
-import Debug from './Debug';
-import Health from './Health';
-import Peers from './Peers';
-import NodeStatus from './NodeStatus';
-
-import styles from './status.css';
-
-export default () => (
-  <Page
-    title={
-      <FormattedMessage
-        id='status.title'
-        defaultMessage='Status'
-      />
-    }
-  >
-    <div className={ styles.body }>
-      <Health />
-      <NodeStatus />
-      <Peers />
-      <Debug />
-    </div>
-  </Page>
-);
diff --git a/js/src/views/SyncWarning/index.js b/js/src/views/SyncWarning/index.js
deleted file mode 100644
index 098605b2a0ca51a07362413de70001e162d9655f..0000000000000000000000000000000000000000
--- a/js/src/views/SyncWarning/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default, { showSyncWarning } from './syncWarning';
diff --git a/js/src/views/SyncWarning/syncWarning.css b/js/src/views/SyncWarning/syncWarning.css
deleted file mode 100644
index 324f7d3fa7960c20d541aeba3ae0b037d31d609c..0000000000000000000000000000000000000000
--- a/js/src/views/SyncWarning/syncWarning.css
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation; either version 3 of the License; or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful;
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not; see <http://www.gnu.org/licenses/>.
-*/
-
-.overlay {
-  background: rgba(255, 255, 255, 0.75);
-  bottom: 0;
-  left: 0;
-  position: fixed;
-  right: 0;
-  top: 0;
-  z-index: 10000;
-}
-
-.modal {
-  align-items: flex-start;
-  bottom: 0;
-  display: flex;
-  left: 0;
-  position: fixed;
-  right: 0;
-  top: 0;
-  z-index: 10001;
-}
-
-.body {
-  background: rgba(25, 25, 25, 0.75);
-  box-shadow: rgba(0, 0, 0, 0.25) 0 14px 45px, rgba(0, 0, 0, 0.22) 0 10px 18px;
-  color: rgb(208, 208, 208);
-  display: flex;
-  flex-direction: column;
-  margin: 0 auto;
-  max-width: 20em;
-  padding: 2em 4em;
-  text-align: center;
-}
-
-.button {
-  margin-top: 1em;
-}
-
-.body,
-.button {
-  > * {
-    margin: 0.5em 0;
-  }
-}
-
-.status {
-  font-size: 4rem;
-}
diff --git a/js/src/views/SyncWarning/syncWarning.js b/js/src/views/SyncWarning/syncWarning.js
deleted file mode 100644
index cc4dbed911c32c1898a6c130002c921e9d341cd1..0000000000000000000000000000000000000000
--- a/js/src/views/SyncWarning/syncWarning.js
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { Checkbox } from 'material-ui';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import store from 'store';
-
-import { Button, StatusIndicator } from '~/ui';
-
-import styles from './syncWarning.css';
-
-const LS_DONT_SHOW_AGAIN = '_parity::syncWarning::dontShowAgain';
-
-export const showSyncWarning = () => {
-  const dontShowAgain = store.get(LS_DONT_SHOW_AGAIN);
-
-  if (dontShowAgain === undefined || dontShowAgain === null) {
-    return true;
-  }
-
-  return !dontShowAgain;
-};
-
-class SyncWarning extends Component {
-  static propTypes = {
-    isOk: PropTypes.bool.isRequired,
-    health: PropTypes.object.isRequired
-  };
-
-  state = {
-    dontShowAgain: false,
-    show: true
-  };
-
-  render () {
-    const { isOk, health } = this.props;
-    const { dontShowAgain, show } = this.state;
-
-    if (isOk || !show) {
-      return null;
-    }
-
-    return (
-      <div>
-        <div className={ styles.overlay } />
-        <div className={ styles.modal }>
-          <div className={ styles.body }>
-            <div className={ styles.status }>
-              <StatusIndicator
-                type='signal'
-                id='healthWarning.indicator'
-                status={ health.overall.status }
-              />
-            </div>
-
-            {
-              health.overall.message.map(message => (
-                <p key={ message }>{ message }</p>
-              ))
-            }
-
-            <div className={ styles.button }>
-              <Checkbox
-                label={
-                  <FormattedMessage
-                    id='syncWarning.dontShowAgain.label'
-                    defaultMessage='Do not show this warning again'
-                  />
-                }
-                checked={ dontShowAgain }
-                onCheck={ this.handleCheck }
-              />
-              <Button
-                label={
-                  <FormattedMessage
-                    id='syncWarning.understandBtn.label'
-                    defaultMessage='I understand'
-                  />
-                }
-                onClick={ this.handleAgreeClick }
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  handleCheck = () => {
-    this.setState({ dontShowAgain: !this.state.dontShowAgain });
-  }
-
-  handleAgreeClick = () => {
-    if (this.state.dontShowAgain) {
-      store.set(LS_DONT_SHOW_AGAIN, true);
-    }
-
-    this.setState({ show: false });
-  }
-}
-
-function mapStateToProps (state) {
-  const { health } = state.nodeStatus;
-  const isNotAvailableYet = health.overall.isNotReady;
-  const isOk = isNotAvailableYet || health.overall.status === 'ok';
-
-  return {
-    isOk,
-    health
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(SyncWarning);
diff --git a/js/src/views/SyncWarning/syncWarning.spec.js b/js/src/views/SyncWarning/syncWarning.spec.js
deleted file mode 100644
index 01956b21556a7cb2f3c3f5cef22a6dc8f4205fcf..0000000000000000000000000000000000000000
--- a/js/src/views/SyncWarning/syncWarning.spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import SyncWarning from './';
-
-let component;
-
-function createRedux (syncing = null) {
-  return {
-    getState: () => {
-      return {
-        nodeStatus: {
-          health: {
-            overall: {
-              status: syncing ? 'needsAttention' : 'ok',
-              message: []
-            }
-          }
-        }
-      };
-    }
-  };
-}
-
-function render (store) {
-  component = shallow(
-    <SyncWarning />,
-    { context: { store: store || createRedux() } }
-  ).find('SyncWarning').shallow();
-
-  return component;
-}
-
-describe('views/SyncWarning', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-
-  it('does render when syncing', () => {
-    expect(render(createRedux({})).find('div')).to.have.length.gte(1);
-  });
-
-  it('does not render when not syncing', () => {
-    expect(render(createRedux(false)).find('div')).to.have.length(0);
-  });
-});
diff --git a/js/src/views/Vaults/index.js b/js/src/views/Vaults/index.js
deleted file mode 100644
index ba8d08445af94f192833e0e026f7f20e2e0f8e07..0000000000000000000000000000000000000000
--- a/js/src/views/Vaults/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './vaults';
diff --git a/js/src/views/Vaults/store.js b/js/src/views/Vaults/store.js
deleted file mode 100644
index 2d4f4c2df92ca864c27a8aaf8976202737322ba9..0000000000000000000000000000000000000000
--- a/js/src/views/Vaults/store.js
+++ /dev/null
@@ -1,431 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, observable, transaction } from 'mobx';
-
-// TODO: We need to move this to a generic location, it should most probably be
-// merged with the other valitation errors. Import here better than duplication.
-import ERRORS from '~/modals/CreateAccount/errors';
-
-let instance;
-
-export default class Store {
-  @observable isBusyAccounts = false;
-  @observable isBusyCreate = false;
-  @observable isBusyLoad = false;
-  @observable isBusyLock = false;
-  @observable isBusyMeta = false;
-  @observable isBusyUnlock = false;
-  @observable isModalAccountsOpen = false;
-  @observable isModalCreateOpen = false;
-  @observable isModalLockOpen = false;
-  @observable isModalMetaOpen = false;
-  @observable isModalUnlockOpen = false;
-  @observable selectedAccounts = {};
-  @observable vault = null;
-  @observable vaults = [];
-  @observable vaultsOpened = [];
-  @observable vaultNames = [];
-  @observable vaultName = '';
-  @observable vaultNameError = ERRORS.noName;
-  @observable vaultDescription = '';
-  @observable vaultPassword = '';
-  @observable vaultPasswordHint = '';
-  @observable vaultPasswordOld = '';
-  @observable vaultPasswordRepeat = '';
-  @observable vaultTags = [];
-
-  constructor (api) {
-    this._api = api;
-  }
-
-  @computed get vaultPasswordRepeatError () {
-    return this.vaultPassword === this.vaultPasswordRepeat
-      ? null
-      : ERRORS.noMatchPassword;
-  }
-
-  @action clearVaultFields = () => {
-    transaction(() => {
-      this.setVaultName('');
-      this.setVaultDescription('');
-      this.setVaultPassword('');
-      this.setVaultPasswordHint('');
-      this.setVaultPasswordOld('');
-      this.setVaultPasswordRepeat('');
-      this.setVaultTags([]);
-    });
-  }
-
-  @action setBusyAccounts = (isBusy) => {
-    this.isBusyAccounts = isBusy;
-  }
-
-  @action setBusyCreate = (isBusy) => {
-    this.isBusyCreate = isBusy;
-  }
-
-  @action setBusyLoad = (isBusy) => {
-    this.isBusyLoad = isBusy;
-  }
-
-  @action setBusyLock = (isBusy) => {
-    this.isBusyLock = isBusy;
-  }
-
-  @action setBusyMeta = (isBusy) => {
-    this.isBusyMeta = isBusy;
-  }
-
-  @action setBusyUnlock = (isBusy) => {
-    this.isBusyUnlock = isBusy;
-  }
-
-  @action setModalAccountsOpen = (isOpen) => {
-    transaction(() => {
-      this.setBusyAccounts(false);
-      this.isModalAccountsOpen = isOpen;
-    });
-  }
-
-  @action setModalCreateOpen = (isOpen) => {
-    transaction(() => {
-      this.setBusyCreate(false);
-      this.isModalCreateOpen = isOpen;
-    });
-  }
-
-  @action setModalLockOpen = (isOpen) => {
-    transaction(() => {
-      this.setBusyLock(false);
-      this.isModalLockOpen = isOpen;
-    });
-  }
-
-  @action setModalMetaOpen = (isOpen) => {
-    transaction(() => {
-      this.setBusyMeta(false);
-      this.isModalMetaOpen = isOpen;
-    });
-  }
-
-  @action setModalUnlockOpen = (isOpen) => {
-    transaction(() => {
-      this.setBusyUnlock(false);
-      this.setVaultPassword('');
-      this.isModalUnlockOpen = isOpen;
-    });
-  }
-
-  @action setSelectedAccounts = (selectedAccounts) => {
-    this.selectedAccounts = selectedAccounts;
-  }
-
-  @action setVaults = (allVaults, openedVaults, metaData) => {
-    transaction(() => {
-      this.vaultNames = allVaults.map((name) => name.toLowerCase());
-      this.vaults = allVaults.map((name, index) => {
-        return {
-          meta: metaData[index] || {},
-          name,
-          isOpen: openedVaults.includes(name)
-        };
-      });
-      this.vaultsOpened = this.vaults.filter((vault) => vault.isOpen);
-    });
-  }
-
-  @action setVaultDescription = (description) => {
-    this.vaultDescription = description;
-  }
-
-  @action setVaultName = (name) => {
-    let nameError = null;
-
-    if (!name || !name.trim().length) {
-      nameError = ERRORS.noName;
-    } else {
-      const lowerName = name.toLowerCase();
-
-      if (this.vaultNames.includes(lowerName)) {
-        nameError = ERRORS.duplicateName;
-      }
-    }
-
-    transaction(() => {
-      this.vault = this.vaults.find((vault) => vault.name === name);
-      this.vaultName = name;
-      this.vaultNameError = nameError;
-    });
-  }
-
-  @action setVaultPassword = (password) => {
-    this.vaultPassword = password;
-  }
-
-  @action setVaultPasswordHint = (hint) => {
-    this.vaultPasswordHint = hint;
-  }
-
-  @action setVaultPasswordOld = (password) => {
-    this.vaultPasswordOld = password;
-  }
-
-  @action setVaultPasswordRepeat = (password) => {
-    this.vaultPasswordRepeat = password;
-  }
-
-  @action setVaultTags = (tags) => {
-    this.vaultTags = tags;
-  }
-
-  @action toggleSelectedAccount = (address) => {
-    this.setSelectedAccounts(Object.assign({}, this.selectedAccounts, {
-      [address]: !this.selectedAccounts[address] })
-    );
-  }
-
-  closeAccountsModal () {
-    this.setModalAccountsOpen(false);
-  }
-
-  closeCreateModal () {
-    this.setModalCreateOpen(false);
-  }
-
-  closeLockModal () {
-    this.setModalLockOpen(false);
-  }
-
-  closeMetaModal () {
-    this.setModalMetaOpen(false);
-  }
-
-  closeUnlockModal () {
-    this.setModalUnlockOpen(false);
-  }
-
-  openAccountsModal (name) {
-    transaction(() => {
-      this.setVaultName(name);
-      this.setSelectedAccounts({});
-      this.setModalAccountsOpen(true);
-    });
-  }
-
-  openCreateModal () {
-    transaction(() => {
-      this.clearVaultFields();
-      this.setModalCreateOpen(true);
-    });
-  }
-
-  openLockModal (name) {
-    transaction(() => {
-      this.setVaultName(name);
-      this.setModalLockOpen(true);
-    });
-  }
-
-  openMetaModal (name) {
-    transaction(() => {
-      this.clearVaultFields();
-      this.setVaultName(name);
-
-      if (this.vault && this.vault.meta) {
-        this.setVaultDescription(this.vault.meta.description);
-        this.setVaultPasswordHint(this.vault.meta.passwordHint);
-      }
-
-      this.setModalMetaOpen(true);
-    });
-  }
-
-  openUnlockModal (name) {
-    transaction(() => {
-      this.setVaultName(name);
-      this.setModalUnlockOpen(true);
-    });
-  }
-
-  loadVaults = () => {
-    this.setBusyLoad(true);
-
-    return Promise
-      .all([
-        this._api.parity.listVaults(),
-        this._api.parity.listOpenedVaults()
-      ])
-      .then(([allVaults, openedVaults]) => {
-        return Promise
-          .all(allVaults.map((name) => this._api.parity.getVaultMeta(name)))
-          .then((metaData) => {
-            transaction(() => {
-              this.setBusyLoad(false);
-              this.setVaults(allVaults, openedVaults, metaData);
-            });
-          });
-      })
-      .catch((error) => {
-        console.warn('loadVaults', error);
-        this.setBusyLoad(false);
-      });
-  }
-
-  closeVault () {
-    this.setBusyLock(true);
-
-    return this._api.parity
-      .closeVault(this.vaultName)
-      .then(this.loadVaults)
-      .then(() => {
-        this.setBusyLock(false);
-      })
-      .catch((error) => {
-        console.error('closeVault', error);
-        this.setBusyLock(false);
-        throw error;
-      });
-  }
-
-  createVault () {
-    if (this.vaultNameError || this.vaultPasswordRepeatError) {
-      return Promise.reject();
-    }
-
-    this.setBusyCreate(true);
-
-    return this._api.parity
-      .newVault(this.vaultName, this.vaultPassword)
-      .then(() => {
-        return this._api.parity.setVaultMeta(this.vaultName, {
-          description: this.vaultDescription,
-          passwordHint: this.vaultPasswordHint,
-          tags: this.vaultTags
-        });
-      })
-      .then(this.loadVaults)
-      .then(() => {
-        this.setBusyCreate(false);
-      })
-      .catch((error) => {
-        console.error('createVault', error);
-        this.setBusyCreate(false);
-        throw error;
-      });
-  }
-
-  editVaultMeta () {
-    this.setBusyMeta(true);
-
-    return this._api.parity
-      .setVaultMeta(this.vaultName, {
-        description: this.vaultDescription,
-        passwordHint: this.vaultPasswordHint,
-        tags: this.vaultTags
-      })
-      .then(this.loadVaults)
-      .then(() => {
-        this.setBusyMeta(false);
-      })
-      .catch((error) => {
-        console.error('editVaultMeta', error);
-        this.setBusyMeta(false);
-        throw error;
-      });
-  }
-
-  editVaultPassword () {
-    this.setBusyMeta(true);
-
-    return this._api.parity
-      .closeVault(this.vaultName)
-      .then(() => {
-        return this._api.parity.openVault(this.vaultName, this.vaultPasswordOld);
-      })
-      .then(() => {
-        return this._api.parity.changeVaultPassword(this.vaultName, this.vaultPassword);
-      })
-      .then(() => {
-        this.setBusyMeta(false);
-      })
-      .catch((error) => {
-        console.error('editVaultPassword', error);
-        this.loadVaults();
-        this.setBusyMeta(false);
-        throw new Error('Unable to change the vault password');
-      });
-  }
-
-  openVault () {
-    this.setBusyUnlock(true);
-
-    return this._api.parity
-      .openVault(this.vaultName, this.vaultPassword)
-      .then(this.loadVaults)
-      .then(() => {
-        this.setBusyUnlock(false);
-      })
-      .catch((error) => {
-        console.error('openVault', error);
-        this.setBusyUnlock(false);
-        throw error;
-      });
-  }
-
-  moveAccounts (vaultName, inAccounts, outAccounts) {
-    this.setBusyAccounts(true);
-
-    return Promise
-      .all([
-        inAccounts.map((address) => this._api.parity.changeVault(address, vaultName)),
-        outAccounts.map((address) => this._api.parity.changeVault(address, ''))
-      ])
-      .then(this.loadVaults)
-      .then(() => {
-        this.setBusyAccounts(false);
-      })
-      .catch((error) => {
-        console.error('moveAccounts', error);
-        this.setBusyAccounts(false);
-        throw error;
-      });
-  }
-
-  moveAccount (vaultName, address) {
-    this.setBusyAccounts(true);
-
-    return this._api.parity
-      .changeVault(address, vaultName)
-      .then(this.loadVaults)
-      .then(() => {
-        this.setBusyAccounts(false);
-      })
-      .catch((error) => {
-        console.error('moveAccount', error);
-        this.setBusyAccounts(false);
-        throw error;
-      });
-  }
-
-  static get (api) {
-    if (!instance) {
-      instance = new Store(api);
-    }
-
-    return instance;
-  }
-}
diff --git a/js/src/views/Vaults/store.spec.js b/js/src/views/Vaults/store.spec.js
deleted file mode 100644
index 863b853da71cf17a14c6ce03bc7cacf4c19ce879..0000000000000000000000000000000000000000
--- a/js/src/views/Vaults/store.spec.js
+++ /dev/null
@@ -1,686 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Vaults from './';
-
-import ERRORS from '~/modals/CreateAccount/errors';
-import { createApi, TEST_VAULTS_ALL, TEST_VAULTS_META, TEST_VAULTS_OPEN } from './vaults.test.js';
-
-let api;
-let store;
-
-function create () {
-  api = createApi();
-  store = new Vaults.Store(api);
-
-  return store;
-}
-
-describe('modals/Vaults/Store', () => {
-  beforeEach(() => {
-    create();
-  });
-
-  describe('@action', () => {
-    describe('clearVaultFields', () => {
-      beforeEach(() => {
-        store.setVaultDescription('testing desc');
-        store.setVaultName('testing 123');
-        store.setVaultPassword('blah');
-        store.setVaultPasswordRepeat('bleh');
-        store.setVaultPasswordHint('hint');
-        store.setVaultPasswordOld('old');
-        store.setVaultTags('tags');
-
-        store.clearVaultFields();
-      });
-
-      it('resets create fields', () => {
-        expect(store.vaultDescription).to.equal('');
-        expect(store.vaultName).to.equal('');
-        expect(store.vaultNameError).not.to.be.null;
-        expect(store.vaultPassword).to.equal('');
-        expect(store.vaultPasswordRepeat).to.equal('');
-        expect(store.vaultPasswordHint).to.equal('');
-        expect(store.vaultPasswordOld).to.equal('');
-        expect(store.vaultTags.length).to.equal(0);
-      });
-    });
-
-    describe('setBusyAccounts', () => {
-      it('sets the flag', () => {
-        store.setBusyAccounts('busy');
-
-        expect(store.isBusyAccounts).to.equal('busy');
-      });
-    });
-
-    describe('setBusyCreate', () => {
-      it('sets the flag', () => {
-        store.setBusyCreate('busy');
-
-        expect(store.isBusyCreate).to.equal('busy');
-      });
-    });
-
-    describe('setBusyLoad', () => {
-      it('sets the flag', () => {
-        store.setBusyLoad('busy');
-
-        expect(store.isBusyLoad).to.equal('busy');
-      });
-    });
-
-    describe('setBusyLock', () => {
-      it('sets the flag', () => {
-        store.setBusyLock('busy');
-
-        expect(store.isBusyLock).to.equal('busy');
-      });
-    });
-
-    describe('setBusyMeta', () => {
-      it('sets the flag', () => {
-        store.setBusyMeta('busy');
-
-        expect(store.isBusyMeta).to.equal('busy');
-      });
-    });
-
-    describe('setBusyUnlock', () => {
-      it('sets the flag', () => {
-        store.setBusyUnlock('busy');
-
-        expect(store.isBusyUnlock).to.equal('busy');
-      });
-    });
-
-    describe('setModalAccountsOpen', () => {
-      it('sets the flag', () => {
-        store.setModalAccountsOpen('opened');
-
-        expect(store.isModalAccountsOpen).to.equal('opened');
-      });
-    });
-
-    describe('setModalCreateOpen', () => {
-      it('sets the flag', () => {
-        store.setModalCreateOpen('opened');
-
-        expect(store.isModalCreateOpen).to.equal('opened');
-      });
-    });
-
-    describe('setModalLockOpen', () => {
-      it('sets the flag', () => {
-        store.setModalLockOpen('opened');
-
-        expect(store.isModalLockOpen).to.equal('opened');
-      });
-    });
-
-    describe('setModalMetaOpen', () => {
-      it('sets the flag', () => {
-        store.setModalMetaOpen('opened');
-
-        expect(store.isModalMetaOpen).to.equal('opened');
-      });
-    });
-
-    describe('setModalUnlockOpen', () => {
-      beforeEach(() => {
-        store.setVaultPassword('testing');
-        store.setModalUnlockOpen('opened');
-      });
-
-      it('sets the flag', () => {
-        expect(store.isModalUnlockOpen).to.equal('opened');
-      });
-
-      it('rests the password to empty', () => {
-        expect(store.vaultPassword).to.equal('');
-      });
-    });
-
-    describe('setSelectedAccounts', () => {
-      it('sets the selected accounts', () => {
-        store.setSelectedAccounts('testing');
-
-        expect(store.selectedAccounts).to.equal('testing');
-      });
-    });
-
-    describe('setVaults', () => {
-      beforeEach(() => {
-        store.setVaults(['TEST', 'some'], ['TEST'], ['metaTest', 'metaSome']);
-      });
-
-      it('stores the available vault names (lookup)', () => {
-        expect(store.vaultNames.peek()).to.deep.equal(['test', 'some']);
-      });
-
-      it('sets all vaults with correct flags', () => {
-        expect(store.vaults.peek()).to.deep.equal([
-          { name: 'TEST', meta: 'metaTest', isOpen: true },
-          { name: 'some', meta: 'metaSome', isOpen: false }
-        ]);
-      });
-
-      it('sets the opened vaults', () => {
-        expect(store.vaultsOpened.peek()).to.deep.equal([
-          { name: 'TEST', meta: 'metaTest', isOpen: true }
-        ]);
-      });
-    });
-
-    describe('setVaultDescription', () => {
-      it('sets the description', () => {
-        store.setVaultDescription('test');
-
-        expect(store.vaultDescription).to.equal('test');
-      });
-    });
-
-    describe('setVaultName', () => {
-      it('sets the name as passed', () => {
-        store.setVaultName('testing');
-
-        expect(store.vaultName).to.equal('testing');
-      });
-
-      it('sets the vault when found', () => {
-        store.setVaults(['testing'], [], ['meta']);
-        store.setVaultName('testing');
-
-        expect(store.vault).to.deep.equal({
-          isOpen: false,
-          meta: 'meta',
-          name: 'testing'
-        });
-      });
-
-      it('clears the vault when not found', () => {
-        store.setVaults(['testing'], [], ['meta']);
-        store.setVaultName('testing2');
-
-        expect(store.vault).not.to.be.ok;
-      });
-
-      it('sets error noName error when empty', () => {
-        store.setVaultName(null);
-
-        expect(store.vaultNameError).to.equal(ERRORS.noName);
-      });
-
-      it('sets error duplicateName when duplicated', () => {
-        store.setVaults(['testDupe'], [], ['testing']);
-        store.setVaultName('testDUPE');
-
-        expect(store.vaultNameError).to.equal(ERRORS.duplicateName);
-      });
-    });
-
-    describe('setVaultPassword', () => {
-      it('sets the password', () => {
-        store.setVaultPassword('testPassword');
-
-        expect(store.vaultPassword).to.equal('testPassword');
-      });
-    });
-
-    describe('setVaultPasswordRepeat', () => {
-      it('sets the password', () => {
-        store.setVaultPasswordRepeat('testPassword');
-
-        expect(store.vaultPasswordRepeat).to.equal('testPassword');
-      });
-    });
-
-    describe('setVaultPasswordHint', () => {
-      it('sets the password hint', () => {
-        store.setVaultPasswordHint('test hint');
-
-        expect(store.vaultPasswordHint).to.equal('test hint');
-      });
-    });
-
-    describe('setVaultTags', () => {
-      it('sets the tags', () => {
-        store.setVaultTags('test');
-
-        expect(store.vaultTags).to.equal('test');
-      });
-    });
-
-    describe('toggleSelectedAccount', () => {
-      beforeEach(() => {
-        store.toggleSelectedAccount('123');
-      });
-
-      it('adds the selected account', () => {
-        expect(store.selectedAccounts['123']).to.be.true;
-      });
-
-      it('reverses when toggled again', () => {
-        store.toggleSelectedAccount('123');
-        expect(store.selectedAccounts['123']).to.be.false;
-      });
-    });
-  });
-
-  describe('@computed', () => {
-    describe('createPasswordRepeatError', () => {
-      beforeEach(() => {
-        store.setVaultPassword('blah');
-        store.setVaultPasswordRepeat('bleh');
-      });
-
-      it('has error when passwords do not match', () => {
-        expect(store.vaultPasswordRepeatError).not.to.be.null;
-      });
-
-      it('has no error when passwords match', () => {
-        store.setVaultPasswordRepeat('blah');
-        expect(store.vaultPasswordRepeatError).to.be.null;
-      });
-    });
-  });
-
-  describe('operations', () => {
-    describe('closeAccountsModal', () => {
-      beforeEach(() => {
-        store.setModalAccountsOpen(true);
-        store.closeAccountsModal();
-      });
-
-      it('sets the opened state to false', () => {
-        expect(store.isModalAccountsOpen).to.be.false;
-      });
-    });
-
-    describe('closeCreateModal', () => {
-      beforeEach(() => {
-        store.setModalCreateOpen(true);
-        store.closeCreateModal();
-      });
-
-      it('sets the opened state to false', () => {
-        expect(store.isModalCreateOpen).to.be.false;
-      });
-    });
-
-    describe('closeLockModal', () => {
-      beforeEach(() => {
-        store.setModalLockOpen(true);
-        store.closeLockModal();
-      });
-
-      it('sets the opened state to false', () => {
-        expect(store.isModalLockOpen).to.be.false;
-      });
-    });
-
-    describe('closeMetaModal', () => {
-      beforeEach(() => {
-        store.setModalMetaOpen(true);
-        store.closeMetaModal();
-      });
-
-      it('sets the opened state to false', () => {
-        expect(store.isModalMetaOpen).to.be.false;
-      });
-    });
-
-    describe('closeUnlockModal', () => {
-      beforeEach(() => {
-        store.setModalUnlockOpen(true);
-        store.closeUnlockModal();
-      });
-
-      it('sets the opened state to false', () => {
-        expect(store.isModalUnlockOpen).to.be.false;
-      });
-    });
-
-    describe('openAccountsModal', () => {
-      beforeEach(() => {
-        store.setSelectedAccounts({ '123': true, '456': false });
-        store.openAccountsModal('testing');
-      });
-
-      it('sets the opened state to true', () => {
-        expect(store.isModalAccountsOpen).to.be.true;
-      });
-
-      it('stores the name', () => {
-        expect(store.vaultName).to.equal('testing');
-      });
-
-      it('empties the selectedAccounts', () => {
-        expect(Object.keys(store.selectedAccounts).length).to.equal(0);
-      });
-    });
-
-    describe('openCreateModal', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'clearVaultFields');
-        store.openCreateModal();
-      });
-
-      afterEach(() => {
-        store.clearVaultFields.restore();
-      });
-
-      it('sets the opened state to true', () => {
-        expect(store.isModalCreateOpen).to.be.true;
-      });
-
-      it('clears the create fields', () => {
-        expect(store.clearVaultFields).to.have.been.called;
-      });
-    });
-
-    describe('openLockModal', () => {
-      beforeEach(() => {
-        store.openLockModal('testing');
-      });
-
-      it('sets the opened state to true', () => {
-        expect(store.isModalLockOpen).to.be.true;
-      });
-
-      it('stores the name', () => {
-        expect(store.vaultName).to.equal('testing');
-      });
-    });
-
-    describe('openMetaModal', () => {
-      beforeEach(() => {
-        store.openMetaModal('testing');
-      });
-
-      it('sets the opened state to true', () => {
-        expect(store.isModalMetaOpen).to.be.true;
-      });
-
-      it('stores the name', () => {
-        expect(store.vaultName).to.equal('testing');
-      });
-    });
-
-    describe('openUnlockModal', () => {
-      beforeEach(() => {
-        store.openUnlockModal('testing');
-      });
-
-      it('sets the opened state to true', () => {
-        expect(store.isModalUnlockOpen).to.be.true;
-      });
-
-      it('stores the name', () => {
-        expect(store.vaultName).to.equal('testing');
-      });
-    });
-
-    describe('loadVaults', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setBusyLoad');
-        sinon.spy(store, 'setVaults');
-
-        return store.loadVaults();
-      });
-
-      afterEach(() => {
-        store.setBusyLoad.restore();
-        store.setVaults.restore();
-      });
-
-      it('sets and resets the busy flag', () => {
-        expect(store.setBusyLoad).to.have.been.calledWith(true);
-        expect(store.isBusyLoad).to.be.false;
-      });
-
-      it('calls parity_listVaults', () => {
-        expect(api.parity.listVaults).to.have.been.called;
-      });
-
-      it('calls parity_listOpenedVaults', () => {
-        expect(api.parity.listOpenedVaults).to.have.been.called;
-      });
-
-      it('sets the vaults', () => {
-        expect(store.setVaults).to.have.been.calledWith(TEST_VAULTS_ALL, TEST_VAULTS_OPEN, [
-          TEST_VAULTS_META, TEST_VAULTS_META, TEST_VAULTS_META
-        ]);
-      });
-    });
-
-    describe('closeVault', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setBusyLock');
-
-        store.setVaultName('testVault');
-
-        return store.closeVault();
-      });
-
-      afterEach(() => {
-        store.setBusyLock.restore();
-      });
-
-      it('sets and resets the busy flag', () => {
-        expect(store.setBusyLock).to.have.been.calledWith(true);
-        expect(store.isBusyLock).to.be.false;
-      });
-
-      it('calls into parity_closeVault', () => {
-        expect(api.parity.closeVault).to.have.been.calledWith('testVault');
-      });
-    });
-
-    describe('createVault', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setBusyCreate');
-
-        store.setVaultDescription('testDescription');
-        store.setVaultName('testCreateName');
-        store.setVaultPassword('testCreatePassword');
-        store.setVaultPasswordRepeat('testCreatePassword');
-        store.setVaultPasswordHint('testCreateHint');
-        store.setVaultTags('testTags');
-
-        return store.createVault();
-      });
-
-      afterEach(() => {
-        store.setBusyCreate.restore();
-      });
-
-      it('sets and resets the busy flag', () => {
-        expect(store.setBusyCreate).to.have.been.calledWith(true);
-        expect(store.isBusyCreate).to.be.false;
-      });
-
-      it('calls into parity_newVault', () => {
-        expect(api.parity.newVault).to.have.been.calledWith('testCreateName', 'testCreatePassword');
-      });
-
-      it('calls into parity_setVaultMeta', () => {
-        expect(api.parity.setVaultMeta).to.have.been.calledWith('testCreateName', {
-          description: 'testDescription',
-          passwordHint: 'testCreateHint',
-          tags: 'testTags'
-        });
-      });
-    });
-
-    describe('editVaultMeta', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setBusyMeta');
-
-        store.setVaultDescription('testDescription');
-        store.setVaultName('testCreateName');
-        store.setVaultPasswordHint('testCreateHint');
-        store.setVaultTags('testTags');
-
-        return store.editVaultMeta();
-      });
-
-      afterEach(() => {
-        store.setBusyMeta.restore();
-      });
-
-      it('sets and resets the busy flag', () => {
-        expect(store.setBusyMeta).to.have.been.calledWith(true);
-        expect(store.isBusyMeta).to.be.false;
-      });
-
-      it('calls into parity_setVaultMeta', () => {
-        expect(api.parity.setVaultMeta).to.have.been.calledWith('testCreateName', {
-          description: 'testDescription',
-          passwordHint: 'testCreateHint',
-          tags: 'testTags'
-        });
-      });
-    });
-
-    describe('editVaultMeta', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setBusyMeta');
-
-        store.setVaultDescription('testDescription');
-        store.setVaultName('testCreateName');
-        store.setVaultPasswordHint('testCreateHint');
-        store.setVaultTags('testTags');
-
-        return store.editVaultMeta();
-      });
-
-      afterEach(() => {
-        store.setBusyMeta.restore();
-      });
-
-      it('sets and resets the busy flag', () => {
-        expect(store.setBusyMeta).to.have.been.calledWith(true);
-        expect(store.isBusyMeta).to.be.false;
-      });
-
-      it('calls into parity_setVaultMeta', () => {
-        expect(api.parity.setVaultMeta).to.have.been.calledWith('testCreateName', {
-          description: 'testDescription',
-          passwordHint: 'testCreateHint',
-          tags: 'testTags'
-        });
-      });
-    });
-
-    describe('editVaultPassword', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setBusyMeta');
-
-        store.setVaultName('testName');
-        store.setVaultPasswordOld('oldPassword');
-        store.setVaultPassword('newPassword');
-
-        return store.editVaultPassword();
-      });
-
-      afterEach(() => {
-        store.setBusyMeta.restore();
-      });
-
-      it('sets and resets the busy flag', () => {
-        expect(store.setBusyMeta).to.have.been.calledWith(true);
-        expect(store.isBusyMeta).to.be.false;
-      });
-
-      it('calls into parity_openVault', () => {
-        expect(api.parity.openVault).to.have.been.calledWith('testName', 'oldPassword');
-      });
-
-      it('calls into parity_changeVaultPassword', () => {
-        expect(api.parity.changeVaultPassword).to.have.been.calledWith('testName', 'newPassword');
-      });
-    });
-
-    describe('openVault', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setBusyUnlock');
-
-        store.setVaultName('testVault');
-
-        return store.openVault();
-      });
-
-      afterEach(() => {
-        store.setBusyUnlock.restore();
-      });
-
-      it('sets and resets the busy flag', () => {
-        expect(store.setBusyUnlock).to.have.been.calledWith(true);
-        expect(store.isBusyUnlock).to.be.false;
-      });
-
-      it('calls into parity_openVault', () => {
-        expect(api.parity.openVault).to.have.been.calledWith('testVault');
-      });
-    });
-
-    describe('moveAccounts', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setBusyAccounts');
-
-        return store.moveAccounts('testVault', ['A', 'B'], ['C']);
-      });
-
-      afterEach(() => {
-        store.setBusyAccounts.restore();
-      });
-
-      it('sets the busy flag', () => {
-        expect(store.setBusyAccounts).to.have.been.calledWith(true);
-      });
-
-      it('calls into parity_changeVault', () => {
-        expect(api.parity.changeVault).to.have.been.calledWith('A', 'testVault');
-        expect(api.parity.changeVault).to.have.been.calledWith('B', 'testVault');
-        expect(api.parity.changeVault).to.have.been.calledWith('C', '');
-      });
-    });
-
-    describe('moveAccount', () => {
-      beforeEach(() => {
-        sinon.spy(store, 'setBusyAccounts');
-
-        return store.moveAccount('testVault', 'A');
-      });
-
-      afterEach(() => {
-        store.setBusyAccounts.restore();
-      });
-
-      it('sets the busy flag', () => {
-        expect(store.setBusyAccounts).to.have.been.calledWith(true);
-      });
-
-      it('calls into parity_changeVault', () => {
-        expect(api.parity.changeVault).to.have.been.calledWith('A', 'testVault');
-      });
-    });
-  });
-});
diff --git a/js/src/views/Vaults/vaults.css b/js/src/views/Vaults/vaults.css
deleted file mode 100644
index d737367739796fb636c7ce6e9f076a399d36f2b3..0000000000000000000000000000000000000000
--- a/js/src/views/Vaults/vaults.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.empty {
-  width: 100%;
-  display: block;
-
-  span {
-    color: #aaa;
-  }
-}
diff --git a/js/src/views/Vaults/vaults.js b/js/src/views/Vaults/vaults.js
deleted file mode 100644
index 79870e56631196756ce9894bcf3efca7f6294083..0000000000000000000000000000000000000000
--- a/js/src/views/Vaults/vaults.js
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-
-import { VaultAccounts, VaultCreate, VaultLock, VaultMeta, VaultUnlock } from '~/modals';
-import { Button, Container, Page, SectionList, VaultCard } from '~/ui';
-import { AccountsIcon, AddIcon, EditIcon, LockedIcon, UnlockedIcon } from '~/ui/Icons';
-
-import Store from './store';
-import styles from './vaults.css';
-
-@observer
-class Vaults extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired
-  };
-
-  static Store = Store;
-
-  vaultStore = Store.get(this.context.api);
-
-  componentWillMount () {
-    return this.vaultStore.loadVaults();
-  }
-
-  render () {
-    return (
-      <Page
-        buttons={ [
-          <Button
-            icon={ <AddIcon /> }
-            key='create'
-            label={
-              <FormattedMessage
-                id='vaults.button.add'
-                defaultMessage='create vault'
-              />
-            }
-            onClick={ this.onOpenCreate }
-          />
-        ] }
-        title={
-          <FormattedMessage
-            id='vaults.title'
-            defaultMessage='Vault Management'
-          />
-        }
-      >
-        <VaultAccounts vaultStore={ this.vaultStore } />
-        <VaultCreate vaultStore={ this.vaultStore } />
-        <VaultLock vaultStore={ this.vaultStore } />
-        <VaultMeta vaultStore={ this.vaultStore } />
-        <VaultUnlock vaultStore={ this.vaultStore } />
-        { this.renderList() }
-      </Page>
-    );
-  }
-
-  renderList () {
-    const { vaults } = this.vaultStore;
-
-    if (!vaults || !vaults.length) {
-      return (
-        <Container className={ styles.empty }>
-          <FormattedMessage
-            id='vaults.empty'
-            defaultMessage='There are currently no vaults to display.'
-          />
-        </Container>
-      );
-    }
-
-    return (
-      <SectionList
-        items={ vaults }
-        renderItem={ this.renderVault }
-      />
-    );
-  }
-
-  renderVault = (vault) => {
-    const { accounts } = this.props;
-    const { isOpen, name } = vault;
-    const vaultAccounts = Object
-      .keys(accounts)
-      .filter((address) => accounts[address].uuid && accounts[address].meta.vault === vault.name);
-
-    const onClickAccounts = () => {
-      this.onOpenAccounts(name);
-      return false;
-    };
-    const onClickEdit = () => {
-      this.onOpenEdit(name);
-      return false;
-    };
-    const onClickOpen = () => {
-      isOpen
-        ? this.onOpenLockVault(name)
-        : this.onOpenUnlockVault(name);
-      return false;
-    };
-
-    return (
-      <VaultCard
-        accounts={ vaultAccounts }
-        buttons={
-          isOpen
-            ? [
-              <Button
-                icon={ <AccountsIcon /> }
-                key='accounts'
-                label={
-                  <FormattedMessage
-                    id='vaults.button.accounts'
-                    defaultMessage='accounts'
-                  />
-                }
-                onClick={ onClickAccounts }
-              />,
-              <Button
-                icon={ <EditIcon /> }
-                key='edit'
-                label={
-                  <FormattedMessage
-                    id='vaults.button.edit'
-                    defaultMessage='edit'
-                  />
-                }
-                onClick={ onClickEdit }
-              />,
-              <Button
-                icon={ <LockedIcon /> }
-                key='close'
-                label={
-                  <FormattedMessage
-                    id='vaults.button.close'
-                    defaultMessage='close'
-                  />
-                }
-                onClick={ onClickOpen }
-              />
-            ]
-            : [
-              <Button
-                icon={ <UnlockedIcon /> }
-                key='open'
-                label={
-                  <FormattedMessage
-                    id='vaults.button.open'
-                    defaultMessage='open'
-                  />
-                }
-                onClick={ onClickOpen }
-              />
-            ]
-        }
-        vault={ vault }
-      />
-    );
-  }
-
-  onOpenAccounts = (name) => {
-    this.vaultStore.openAccountsModal(name);
-  }
-
-  onOpenCreate = () => {
-    this.vaultStore.openCreateModal();
-  }
-
-  onOpenEdit = (name) => {
-    this.vaultStore.openMetaModal(name);
-  }
-
-  onOpenLockVault = (name) => {
-    this.vaultStore.openLockModal(name);
-  }
-
-  onOpenMeta = (name) => {
-    this.vaultStore.openMetaModal(name);
-  }
-
-  onOpenUnlockVault = (name) => {
-    this.vaultStore.openUnlockModal(name);
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts } = state.personal;
-
-  return { accounts };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(Vaults);
diff --git a/js/src/views/Vaults/vaults.spec.js b/js/src/views/Vaults/vaults.spec.js
deleted file mode 100644
index 1f1fd449ddea2a1155e06093fb02d236eb9cfe12..0000000000000000000000000000000000000000
--- a/js/src/views/Vaults/vaults.spec.js
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import sinon from 'sinon';
-
-import { createApi, createReduxStore } from './vaults.test.js';
-
-import Vaults from './';
-
-let api;
-let component;
-let instance;
-let store;
-
-function render (props = {}) {
-  api = createApi();
-  store = createReduxStore();
-
-  component = shallow(
-    <Vaults />,
-    {
-      context: { store }
-    }
-  ).find('Vaults').shallow({ context: { api } });
-  instance = component.instance();
-
-  return component;
-}
-
-describe('views/Vaults', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  describe('instance methods', () => {
-    describe('componentWillMount', () => {
-      beforeEach(() => {
-        sinon.spy(instance.vaultStore, 'loadVaults');
-
-        return instance.componentWillMount();
-      });
-
-      afterEach(() => {
-        instance.vaultStore.loadVaults.restore();
-      });
-
-      it('calls into vaultStore.loadVaults', () => {
-        expect(instance.vaultStore.loadVaults).to.have.been.called;
-      });
-    });
-
-    describe('renderList', () => {
-      it('renders empty when no vaults', () => {
-        instance.vaultStore.setVaults([], [], []);
-
-        expect(
-          shallow(instance.renderList()).find('FormattedMessage').props().id
-        ).to.equal('vaults.empty');
-      });
-
-      describe('SectionList', () => {
-        let list;
-
-        beforeEach(() => {
-          instance.vaultStore.setVaults(['testing'], [], ['meta']);
-          list = instance.renderList();
-        });
-
-        it('renders', () => {
-          expect(list).to.ok;
-        });
-
-        it('passes the vaults', () => {
-          expect(list.props.items.peek()).to.deep.equal(instance.vaultStore.vaults.peek());
-        });
-
-        it('renders via renderItem', () => {
-          expect(list.props.renderItem).to.deep.equal(instance.renderVault);
-        });
-      });
-    });
-
-    describe('renderVault', () => {
-      const VAULT = { name: 'testing', isOpen: true, meta: 'meta' };
-      let card;
-
-      beforeEach(() => {
-        card = instance.renderVault(VAULT);
-      });
-
-      it('renders', () => {
-        expect(card).to.be.ok;
-      });
-
-      it('passes the vault', () => {
-        expect(card.props.vault).to.deep.equal(VAULT);
-      });
-    });
-  });
-
-  describe('event methods', () => {
-    describe('onOpenAccounts', () => {
-      beforeEach(() => {
-        sinon.spy(instance.vaultStore, 'openAccountsModal');
-
-        instance.onOpenAccounts('testing');
-      });
-
-      afterEach(() => {
-        instance.vaultStore.openAccountsModal.restore();
-      });
-
-      it('calls into vaultStore.openAccountsModal', () => {
-        expect(instance.vaultStore.openAccountsModal).to.have.been.calledWith('testing');
-      });
-    });
-
-    describe('onOpenCreate', () => {
-      beforeEach(() => {
-        sinon.spy(instance.vaultStore, 'openCreateModal');
-
-        instance.onOpenCreate();
-      });
-
-      afterEach(() => {
-        instance.vaultStore.openCreateModal.restore();
-      });
-
-      it('calls into vaultStore.openCreateModal', () => {
-        expect(instance.vaultStore.openCreateModal).to.have.been.called;
-      });
-    });
-
-    describe('onOpenEdit', () => {
-      beforeEach(() => {
-        sinon.spy(instance.vaultStore, 'openMetaModal');
-
-        instance.onOpenEdit('testing');
-      });
-
-      afterEach(() => {
-        instance.vaultStore.openMetaModal.restore();
-      });
-
-      it('calls into vaultStore.openMetaModal', () => {
-        expect(instance.vaultStore.openMetaModal).to.have.been.calledWith('testing');
-      });
-    });
-
-    describe('onOpenLockVault', () => {
-      beforeEach(() => {
-        sinon.spy(instance.vaultStore, 'openLockModal');
-
-        instance.onOpenLockVault('testing');
-      });
-
-      afterEach(() => {
-        instance.vaultStore.openLockModal.restore();
-      });
-
-      it('calls into vaultStore.openLockModal', () => {
-        expect(instance.vaultStore.openLockModal).to.have.been.calledWith('testing');
-      });
-    });
-
-    describe('onOpenUnlockVault', () => {
-      beforeEach(() => {
-        sinon.spy(instance.vaultStore, 'openUnlockModal');
-
-        instance.onOpenUnlockVault('testing');
-      });
-
-      afterEach(() => {
-        instance.vaultStore.openUnlockModal.restore();
-      });
-
-      it('calls into vaultStore.openUnlockModal', () => {
-        expect(instance.vaultStore.openUnlockModal).to.have.been.calledWith('testing');
-      });
-    });
-  });
-});
diff --git a/js/src/views/Vaults/vaults.test.js b/js/src/views/Vaults/vaults.test.js
deleted file mode 100644
index 47cae8f844dd62b199026d3113d2c23311e8b756..0000000000000000000000000000000000000000
--- a/js/src/views/Vaults/vaults.test.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-const ACCOUNT_A = '0x1234567890123456789012345678901234567890';
-const ACCOUNT_B = '0x0123456789012345678901234567890123456789';
-const ACCOUNT_C = '0x9012345678901234567890123456789012345678';
-const ACCOUNT_D = '0x8901234567890123456789012345678901234567';
-
-const TEST_VAULTS_ALL = ['vault1', 'vault2', 'vault3'];
-const TEST_VAULTS_OPEN = ['vault2'];
-const TEST_VAULTS_META = { something: 'test' };
-
-const TEST_ACCOUNTS = {
-  [ACCOUNT_A]: {
-    address: ACCOUNT_A,
-    uuid: null
-  },
-  [ACCOUNT_B]: {
-    address: ACCOUNT_B,
-    uuid: ACCOUNT_B,
-    meta: {
-      vault: 'somethingElse'
-    }
-  },
-  [ACCOUNT_C]: {
-    address: ACCOUNT_C,
-    uuid: ACCOUNT_C,
-    meta: {
-      vault: 'test'
-    }
-  },
-  [ACCOUNT_D]: {
-    address: ACCOUNT_D,
-    uuid: ACCOUNT_D,
-    meta: {
-      vault: 'test'
-    }
-  }
-};
-
-export function createApi () {
-  return {
-    parity: {
-      listOpenedVaults: sinon.stub().resolves(TEST_VAULTS_OPEN),
-      listVaults: sinon.stub().resolves(TEST_VAULTS_ALL),
-      changeVault: sinon.stub().resolves(true),
-      closeVault: sinon.stub().resolves(true),
-      getVaultMeta: sinon.stub().resolves(TEST_VAULTS_META),
-      newVault: sinon.stub().resolves(true),
-      openVault: sinon.stub().resolves(true),
-      setVaultMeta: sinon.stub().resolves(true),
-      changeVaultPassword: sinon.stub().resolves(true)
-    }
-  };
-}
-
-export function createReduxStore () {
-  return {
-    dispatch: sinon.stub(),
-    subscribe: sinon.stub(),
-    getState: () => {
-      return {
-        personal: {
-          accounts: TEST_ACCOUNTS
-        }
-      };
-    }
-  };
-}
-
-export {
-  TEST_ACCOUNTS,
-  TEST_VAULTS_ALL,
-  TEST_VAULTS_META,
-  TEST_VAULTS_OPEN
-};
diff --git a/js/src/views/Wallet/Confirmations/confirmations.js b/js/src/views/Wallet/Confirmations/confirmations.js
deleted file mode 100644
index bea1ffd956a59fc622d0c0cbbd8ace40fe8c97bc..0000000000000000000000000000000000000000
--- a/js/src/views/Wallet/Confirmations/confirmations.js
+++ /dev/null
@@ -1,421 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { LinearProgress, MenuItem, IconMenu } from 'material-ui';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import ReactTooltip from 'react-tooltip';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { confirmOperation, revokeOperation } from '~/redux/providers/walletActions';
-import { bytesToHex } from '~/api/util/format';
-import { Container, InputAddress, Button, IdentityIcon } from '~/ui';
-import TxRow from '~/ui/TxList/TxRow';
-
-import styles from '../wallet.css';
-import txListStyles from '~/ui/TxList/txList.css';
-
-class WalletConfirmations extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    address: PropTypes.string.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    owners: PropTypes.array.isRequired,
-    require: PropTypes.object.isRequired,
-    confirmOperation: PropTypes.func.isRequired,
-    revokeOperation: PropTypes.func.isRequired,
-
-    confirmations: PropTypes.array
-  };
-
-  static defaultProps = {
-    confirmations: []
-  };
-
-  render () {
-    return (
-      <div>
-        <Container title='Pending Confirmations'>
-          { this.renderConfirmations() }
-        </Container>
-      </div>
-    );
-  }
-  renderConfirmations () {
-    const { confirmations, ...others } = this.props;
-    const realConfirmations = confirmations && confirmations
-      .filter((conf) => conf.confirmedBy.length > 0);
-
-    if (!realConfirmations) {
-      return null;
-    }
-
-    if (realConfirmations.length === 0) {
-      return (
-        <div>
-          <p>
-            <FormattedMessage
-              id='wallet.confirmations.none'
-              defaultMessage='No transactions needs confirmation right now.'
-            />
-          </p>
-        </div>
-      );
-    }
-
-    return realConfirmations
-      .map((confirmation) => (
-        <WalletConfirmation
-          key={ confirmation.operation }
-          confirmation={ confirmation }
-          { ...others }
-        />
-      ));
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts } = state.personal;
-
-  return { accounts };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    confirmOperation,
-    revokeOperation
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(WalletConfirmations);
-
-class WalletConfirmation extends Component {
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    confirmation: PropTypes.object.isRequired,
-    address: PropTypes.string.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    owners: PropTypes.array.isRequired,
-    require: PropTypes.object.isRequired,
-    confirmOperation: PropTypes.func.isRequired,
-    revokeOperation: PropTypes.func.isRequired
-  };
-
-  state = {
-    openConfirm: false,
-    openRevoke: false
-  };
-
-  render () {
-    const { confirmation } = this.props;
-    const confirmationsRows = [];
-
-    const className = styles.light;
-
-    const txRow = this.renderTransactionRow(confirmation, className);
-    const detailsRow = this.renderConfirmedBy(confirmation, className);
-    const progressRow = this.renderProgress(confirmation, className);
-    const actionsRow = this.renderActions(confirmation, className);
-
-    confirmationsRows.push(progressRow);
-    confirmationsRows.push(detailsRow);
-    confirmationsRows.push(txRow);
-    confirmationsRows.push(actionsRow);
-
-    return (
-      <div className={ styles.confirmationContainer }>
-        <table className={ [ txListStyles.transactions, styles.confirmations ].join(' ') }>
-          <tbody>
-            { confirmationsRows }
-          </tbody>
-        </table>
-        { this.renderPending() }
-      </div>
-    );
-  }
-
-  renderPending () {
-    const { pending } = this.props.confirmation;
-
-    if (!pending) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.pendingOverlay } />
-    );
-  }
-
-  handleOpenConfirm = () => {
-    this.setState({
-      openConfirm: true
-    });
-  }
-
-  handleCloseConfirm = () => {
-    this.setState({
-      openConfirm: false
-    });
-  }
-
-  handleOpenRevoke = () => {
-    this.setState({
-      openRevoke: true
-    });
-  }
-
-  handleCloseRevoke = () => {
-    this.setState({
-      openRevoke: false
-    });
-  }
-
-  handleConfirm = (e, item) => {
-    const { confirmOperation, confirmation, address } = this.props;
-    const owner = item.props.value;
-
-    confirmOperation(address, owner, confirmation.operation);
-  }
-
-  handleRevoke = (e, item) => {
-    const { revokeOperation, confirmation, address } = this.props;
-    const owner = item.props.value;
-
-    revokeOperation(address, owner, confirmation.operation);
-  }
-
-  renderActions (confirmation, className) {
-    const { owners, accounts } = this.props;
-    const { operation, confirmedBy, pending } = confirmation;
-    const { openConfirm, openRevoke } = this.state;
-
-    const addresses = Object.keys(accounts);
-
-    const possibleConfirm = owners
-      .filter((owner) => addresses.includes(owner))
-      .filter((owner) => !confirmedBy.includes(owner));
-
-    const possibleRevoke = owners
-      .filter((owner) => addresses.includes(owner))
-      .filter((owner) => confirmedBy.includes(owner));
-
-    const confirmButton = (
-      <Button
-        onClick={ this.handleOpenConfirm }
-        label={
-          <FormattedMessage
-            id='wallet.confirmations.buttons.confirmAs'
-            defaultMessage='Confirm As...'
-          />
-        }
-        disabled={ pending || possibleConfirm.length === 0 }
-      />
-    );
-
-    const revokeButton = (
-      <Button
-        onClick={ this.handleOpenRevoke }
-        label={
-          <FormattedMessage
-            id='wallet.confirmations.buttons.revokeAs'
-            defaultMessage='Revoke As...'
-          />
-        }
-        disabled={ pending || possibleRevoke.length === 0 }
-      />
-    );
-
-    return (
-      <tr
-        className={ className }
-        key={ `actions_${operation}` }
-      >
-        <td />
-        <td colSpan={ 3 }>
-          <div className={ styles.actions }>
-            <IconMenu
-              iconButtonElement={ confirmButton }
-              open={ openConfirm }
-              onRequestChange={ this.handleCloseConfirm }
-              onItemTouchTap={ this.handleConfirm }
-            >
-              { possibleConfirm.map((address) => this.renderAccountItem(address)) }
-            </IconMenu>
-
-            <IconMenu
-              iconButtonElement={ revokeButton }
-              open={ openRevoke }
-              onRequestChange={ this.handleCloseRevoke }
-              onItemTouchTap={ this.handleRevoke }
-            >
-              { possibleRevoke.map((address) => this.renderAccountItem(address)) }
-            </IconMenu>
-          </div>
-        </td>
-        <td />
-      </tr>
-    );
-  }
-
-  renderAccountItem (address) {
-    const account = this.props.accounts[address];
-
-    return (
-      <MenuItem
-        key={ address }
-        value={ address }
-      >
-        <div className={ styles.accountItem }>
-          <IdentityIcon
-            address={ address }
-            center
-            inline
-          />
-          <span>{ account.name.toUpperCase() || account.address }</span>
-        </div>
-      </MenuItem>
-    );
-  }
-
-  renderProgress (confirmation) {
-    const { require } = this.props;
-    const { operation, confirmedBy, pending } = confirmation;
-
-    const style = { borderRadius: 0 };
-
-    return (
-      <tr key={ `prog_${operation}` }>
-        <td
-          colSpan={ 5 }
-          style={ { padding: 0, paddingTop: '1em' } }
-        >
-          <div
-            data-tip
-            data-for={ `tooltip_${operation}` }
-            data-effect='solid'
-          >
-            {
-              pending
-              ? (
-                <LinearProgress
-                  key={ `pending_${operation}` }
-                  mode='indeterminate'
-                  style={ style }
-                />
-              )
-              : (
-                <LinearProgress
-                  key={ `unpending_${operation}` }
-                  mode='determinate'
-                  min={ 0 }
-                  max={ require.toNumber() }
-                  value={ confirmedBy.length }
-                  style={ style }
-                />
-              )
-            }
-          </div>
-
-          <ReactTooltip id={ `tooltip_${operation}` }>
-            <FormattedMessage
-              id='wallet.confirmations.tooltip.confirmed'
-              defaultMessage='Confirmed by {number}/{required} owners'
-              values={ {
-                required: require.toNumber(),
-                number: confirmedBy.length
-              } }
-            />
-          </ReactTooltip>
-        </td>
-      </tr>
-    );
-  }
-
-  renderTransactionRow (confirmation, className) {
-    const { address, netVersion } = this.props;
-    const { operation, transactionHash, blockNumber, value, to, data } = confirmation;
-
-    if (value && to && data) {
-      return (
-        <TxRow
-          address={ address }
-          className={ className }
-          historic={ false }
-          netVersion={ netVersion }
-          key={ operation }
-          tx={ {
-            hash: transactionHash,
-            blockNumber,
-            from: address,
-            to,
-            value,
-            input: bytesToHex(data)
-          } }
-        />
-      );
-    }
-
-    return (
-      <tr
-        className={ className }
-        key={ operation }
-      >
-        <td colSpan={ 5 }>
-          <code>{ operation }</code>
-        </td>
-      </tr>
-    );
-  }
-
-  renderConfirmedBy (confirmation, className) {
-    const { operation, confirmedBy } = confirmation;
-
-    const confirmed = confirmedBy.map((owner) => (
-      <InputAddress
-        key={ owner }
-        value={ owner }
-        allowCopy={ false }
-        hideUnderline
-        disabled
-        small
-        text
-      />
-    ));
-
-    return (
-      <tr key={ `details_${operation}` } className={ className }>
-        <td colSpan={ 5 } style={ { padding: 0 } }>
-          <div
-            data-tip
-            data-for={ `tooltip_${operation}` }
-            data-effect='solid'
-            className={ styles.confirmed }
-          >
-            { confirmed }
-          </div>
-        </td>
-      </tr>
-    );
-  }
-}
diff --git a/js/src/views/Wallet/Confirmations/index.js b/js/src/views/Wallet/Confirmations/index.js
deleted file mode 100644
index fc1c3be1a5b07c1f261a929ef87a34690c634ec9..0000000000000000000000000000000000000000
--- a/js/src/views/Wallet/Confirmations/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './confirmations';
diff --git a/js/src/views/Wallet/Details/details.js b/js/src/views/Wallet/Details/details.js
deleted file mode 100644
index 37e3e939529b4f8652c306f5ba96b0b40e49d35b..0000000000000000000000000000000000000000
--- a/js/src/views/Wallet/Details/details.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { Container, InputAddress } from '~/ui';
-
-import styles from '../wallet.css';
-
-export default class WalletDetails extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    owners: PropTypes.array,
-    require: PropTypes.object,
-    className: PropTypes.string
-  };
-
-  static defaultProps = {
-    className: ''
-  };
-
-  render () {
-    const { className } = this.props;
-
-    return (
-      <div className={ [ styles.details, className ].join(' ') }>
-        <Container
-          title={
-            <FormattedMessage
-              id='wallet.details.title'
-              defaultMessage='Details'
-            />
-          }
-        >
-          { this.renderDetails() }
-          { this.renderOwners() }
-        </Container>
-      </div>
-    );
-  }
-
-  renderOwners () {
-    const { owners } = this.props;
-
-    if (!owners) {
-      return null;
-    }
-
-    const ownersList = owners.map((owner, idx) => {
-      const address = typeof owner === 'object'
-        ? owner.address
-        : owner;
-
-      return (
-        <InputAddress
-          disabled
-          key={ `${idx}_${address}` }
-          text
-          value={ address }
-        />
-      );
-    });
-
-    return (
-      <div>
-        { ownersList }
-      </div>
-    );
-  }
-
-  renderDetails () {
-    const { require } = this.props;
-
-    if (!require) {
-      return null;
-    }
-
-    return (
-      <div>
-        <p>
-          <FormattedMessage
-            id='wallet.details.requiredOwners'
-            defaultMessage='This wallet requires at least {owners} to validate any action (transactions, modifications).'
-            values={ {
-              owners: (
-                <span className={ styles.detail }>
-                  <FormattedMessage
-                    id='wallet.details.requiredOwnersNumber'
-                    defaultMessage='{number} {numberValue, plural, one {owner} other {owners}}'
-                    values={ {
-                      number: require.toFormat(),
-                      numberValue: require.toNumber()
-                    } }
-                  />
-                </span>
-              )
-            } }
-          />
-        </p>
-      </div>
-    );
-  }
-}
diff --git a/js/src/views/Wallet/Details/index.js b/js/src/views/Wallet/Details/index.js
deleted file mode 100644
index b5dd07dd531e60a0715948a39cfdf7efb2c2fa63..0000000000000000000000000000000000000000
--- a/js/src/views/Wallet/Details/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './details';
diff --git a/js/src/views/Wallet/Transactions/index.js b/js/src/views/Wallet/Transactions/index.js
deleted file mode 100644
index 0ba7422c9a6dd433a4c2874070e8ba0c0bcea52a..0000000000000000000000000000000000000000
--- a/js/src/views/Wallet/Transactions/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './transactions';
diff --git a/js/src/views/Wallet/Transactions/transactions.js b/js/src/views/Wallet/Transactions/transactions.js
deleted file mode 100644
index aa1fae6727fbcca61937c941da6bc1005c14c095..0000000000000000000000000000000000000000
--- a/js/src/views/Wallet/Transactions/transactions.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import { bytesToHex } from '~/api/util/format';
-import { Container } from '~/ui';
-import TxRow from '~/ui/TxList/TxRow';
-
-import txListStyles from '~/ui/TxList/txList.css';
-
-export default class WalletTransactions extends Component {
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    transactions: PropTypes.array
-  };
-
-  static defaultProps = {
-    transactions: []
-  };
-
-  render () {
-    return (
-      <div>
-        <Container
-          title={
-            <FormattedMessage
-              id='wallet.transactions.title'
-              defaultMessage='Transactions'
-            />
-          }
-        >
-          { this.renderTransactions() }
-        </Container>
-      </div>
-    );
-  }
-  renderTransactions () {
-    const { address, netVersion, transactions } = this.props;
-
-    if (!transactions) {
-      return null;
-    }
-
-    if (transactions.length === 0) {
-      return (
-        <div>
-          <p>
-            <FormattedMessage
-              id='wallet.transactions.none'
-              defaultMessage='No transactions has been sent.'
-            />
-          </p>
-        </div>
-      );
-    }
-
-    const txRows = transactions.slice(0, 15).map((transaction, index) => {
-      const { transactionHash, data } = transaction;
-
-      return (
-        <TxRow
-          address={ address }
-          netVersion={ netVersion }
-          key={ `${transactionHash}_${index}` }
-          tx={ {
-            hash: transactionHash,
-            input: data && bytesToHex(data) || '',
-            ...transaction
-          } }
-        />
-      );
-    });
-
-    return (
-      <table className={ txListStyles.transactions }>
-        <tbody>
-          { txRows }
-        </tbody>
-      </table>
-    );
-  }
-}
diff --git a/js/src/views/Wallet/index.js b/js/src/views/Wallet/index.js
deleted file mode 100644
index 312536f5b12982b7655f16201889e93df565c807..0000000000000000000000000000000000000000
--- a/js/src/views/Wallet/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './wallet';
diff --git a/js/src/views/Wallet/wallet.css b/js/src/views/Wallet/wallet.css
deleted file mode 100644
index e54760d67764a63490f88800c898e97f0b241fb9..0000000000000000000000000000000000000000
--- a/js/src/views/Wallet/wallet.css
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.details {
-  margin: 0;
-
-  display: flex;
-  flex-direction: row;
-
-  > * {
-    flex: 1;
-    height: auto;
-
-    &:first-child {
-      margin-left: 0;
-    }
-
-    &:last-child {
-      margin-right: 0;
-    }
-  }
-}
-
-.owners {
-  margin-top: 0.75em;
-
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  padding: 1em 0.5em 0.5em;
-
-  > * {
-    margin-bottom: 0.5em;
-  }
-}
-
-.info {
-  display: flex;
-  flex-direction: row;
-
-  .header {
-    flex: 1;
-    margin-right: 0.25em;
-    overflow: hidden;
-  }
-
-  .details {
-    flex: 1;
-    margin-left: 0.25em;
-  }
-
-  > * {
-    height: auto;
-  }
-}
-
-.detail {
-  font-size: 1.125em;
-  color: white;
-  margin: 0 0.375em;
-  line-height: 1.5em;
-
-  &:first-child {
-    margin-left: 0;
-  }
-}
-
-.eth:after {
-  content: 'ETH';
-  font-size: 0.75em;
-  margin-left: 0.125em;
-}
-
-.progressText {
-  text-align: center;
-  margin: 0.75em 0 0.25em;
-}
-
-.confirmed {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  padding: 0.75em 0.5em 0;
-}
-
-.confirmations {
-  tr {
-    &:nth-child(even) {
-      background-color: initial;
-    }
-
-    &.light {
-      background-color: rgba(255, 255, 255, 0.04);
-    }
-
-    &.dark {
-      background-color: transparent;
-    }
-  }
-}
-
-.actions {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-}
-
-.accountItem {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.confirmationContainer {
-  position: relative;
-}
-
-.pendingOverlay {
-  position: absolute;
-  top: 1em;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background-color: rgba(255, 255, 255, 0.1);
-}
diff --git a/js/src/views/Wallet/wallet.js b/js/src/views/Wallet/wallet.js
deleted file mode 100644
index e996e5fdc1596ceb92bac5e9aeefcbcce3bb644d..0000000000000000000000000000000000000000
--- a/js/src/views/Wallet/wallet.js
+++ /dev/null
@@ -1,417 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import moment from 'moment';
-
-import { EditMeta, Transfer, WalletSettings } from '~/modals';
-import { Actionbar, Button, Page, Loading } from '~/ui';
-import { DeleteIcon, EditIcon, SendIcon, SettingsIcon } from '~/ui/Icons';
-import { nullableProptype } from '~/util/proptypes';
-
-import Delete from '../Address/Delete';
-import Header from '../Account/Header';
-import WalletDetails from './Details';
-import WalletConfirmations from './Confirmations';
-import WalletTransactions from './Transactions';
-
-import { setVisibleAccounts } from '~/redux/providers/personalActions';
-
-import styles from './wallet.css';
-
-class WalletContainer extends Component {
-  static propTypes = {
-    netVersion: PropTypes.string.isRequired
-  };
-
-  render () {
-    const { netVersion, ...others } = this.props;
-
-    if (netVersion === '0') {
-      return (
-        <Loading size={ 4 } />
-      );
-    }
-
-    return (
-      <Wallet
-        netVersion={ netVersion }
-        { ...others }
-      />
-    );
-  }
-}
-
-class Wallet extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  };
-
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-    netVersion: PropTypes.string.isRequired,
-    owned: PropTypes.bool.isRequired,
-    setVisibleAccounts: PropTypes.func.isRequired,
-    wallet: PropTypes.object.isRequired,
-    walletAccount: nullableProptype(PropTypes.object.isRequired)
-  };
-
-  state = {
-    showEditDialog: false,
-    showSettingsDialog: false,
-    showTransferDialog: false,
-    showDeleteDialog: false
-  };
-
-  componentDidMount () {
-    this.setVisibleAccounts();
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const prevAddress = this.props.address;
-    const nextAddress = nextProps.address;
-
-    if (prevAddress !== nextAddress) {
-      this.setVisibleAccounts(nextProps);
-    }
-  }
-
-  componentWillUnmount () {
-    this.props.setVisibleAccounts([]);
-  }
-
-  setVisibleAccounts (props = this.props) {
-    const { address, setVisibleAccounts } = props;
-    const addresses = [ address ];
-
-    setVisibleAccounts(addresses);
-  }
-
-  render () {
-    const { walletAccount, wallet } = this.props;
-
-    if (!walletAccount) {
-      return null;
-    }
-
-    const { owners, require, dailylimit } = wallet;
-
-    return (
-      <div className={ styles.wallet }>
-        { this.renderEditDialog(walletAccount) }
-        { this.renderSettingsDialog() }
-        { this.renderTransferDialog() }
-        { this.renderDeleteDialog(walletAccount) }
-        { this.renderActionbar() }
-        <Page padded>
-          <div className={ styles.info }>
-            <Header
-              className={ styles.header }
-              account={ walletAccount }
-              isContract
-            >
-              { this.renderInfos() }
-            </Header>
-
-            <WalletDetails
-              className={ styles.details }
-              owners={ owners }
-              require={ require }
-              dailylimit={ dailylimit }
-            />
-          </div>
-          { this.renderDetails() }
-        </Page>
-      </div>
-    );
-  }
-
-  renderInfos () {
-    const { dailylimit } = this.props.wallet;
-    const { api } = this.context;
-
-    if (!dailylimit || !dailylimit.limit) {
-      return null;
-    }
-
-    const _limit = api.util.fromWei(dailylimit.limit);
-
-    if (_limit.equals(0)) {
-      return null;
-    }
-
-    const limit = _limit.toFormat(3);
-    const spent = api.util.fromWei(dailylimit.spent).toFormat(3);
-    const date = moment(dailylimit.last.toNumber() * 24 * 3600 * 1000);
-
-    return (
-      <div>
-        <br />
-        <p>
-          <FormattedMessage
-            id='wallet.details.spent'
-            defaultMessage='{spent} has been spent today, out of {limit} set as the daily limit, which has been reset on {date}'
-            values={ {
-              date: <span className={ styles.detail }>{ date.format('LL') }</span>,
-              limit: <span className={ styles.detail }>{ limit }<span className={ styles.eth } /></span>,
-              spent: <span className={ styles.detail }>{ spent }<span className={ styles.eth } /></span>
-            } }
-          />
-        </p>
-      </div>
-    );
-  }
-
-  renderDetails () {
-    const { address, netVersion, wallet } = this.props;
-    const { owners, require, confirmations, transactions } = wallet;
-
-    if (!owners || !require) {
-      return (
-        <div style={ { marginTop: '4em' } }>
-          <Loading size={ 4 } />
-        </div>
-      );
-    }
-
-    return [
-      <WalletConfirmations
-        address={ address }
-        confirmations={ confirmations }
-        netVersion={ netVersion }
-        key='confirmations'
-        owners={ owners }
-        require={ require }
-      />,
-
-      <WalletTransactions
-        address={ address }
-        netVersion={ netVersion }
-        key='transactions'
-        transactions={ transactions }
-      />
-    ];
-  }
-
-  renderActionbar () {
-    const { owned } = this.props;
-
-    const buttons = [];
-
-    if (owned) {
-      buttons.push(
-        <Button
-          icon={ <SendIcon /> }
-          key='transferFunds'
-          label={
-            <FormattedMessage
-              id='wallet.buttons.transfer'
-              defaultMessage='transfer'
-            />
-          }
-          onClick={ this.onTransferClick }
-        />
-      );
-    }
-
-    buttons.push(
-      <Button
-        icon={ <DeleteIcon /> }
-        key='delete'
-        label={
-          <FormattedMessage
-            id='wallet.buttons.forget'
-            defaultMessage='forget'
-          />
-        }
-        onClick={ this.showDeleteDialog }
-      />
-    );
-
-    buttons.push(
-      <Button
-        icon={ <EditIcon /> }
-        key='editmeta'
-        label={
-          <FormattedMessage
-            id='wallet.buttons.edit'
-            defaultMessage='edit'
-          />
-        }
-        onClick={ this.onEditClick }
-      />
-    );
-
-    if (owned) {
-      buttons.push(
-        <Button
-          icon={ <SettingsIcon /> }
-          key='settings'
-          label={
-            <FormattedMessage
-              id='wallet.buttons.settings'
-              defaultMessage='settings'
-            />
-          }
-          onClick={ this.onSettingsClick }
-        />
-      );
-    }
-
-    return (
-      <Actionbar
-        buttons={ buttons }
-        title={
-          <FormattedMessage
-            id='wallet.title'
-            defaultMessage='Wallet Management'
-          />
-        }
-      />
-    );
-  }
-
-  renderDeleteDialog (account) {
-    const { showDeleteDialog } = this.state;
-
-    return (
-      <Delete
-        account={ account }
-        visible={ showDeleteDialog }
-        route='/accounts'
-        onClose={ this.closeDeleteDialog }
-      />
-    );
-  }
-
-  renderEditDialog (wallet) {
-    const { showEditDialog } = this.state;
-
-    if (!showEditDialog) {
-      return null;
-    }
-
-    return (
-      <EditMeta
-        account={ wallet }
-        keys={ ['description'] }
-        onClose={ this.onEditClick }
-      />
-    );
-  }
-
-  renderSettingsDialog () {
-    const { wallet } = this.props;
-    const { showSettingsDialog } = this.state;
-
-    if (!showSettingsDialog) {
-      return null;
-    }
-
-    return (
-      <WalletSettings
-        wallet={ wallet }
-        onClose={ this.onSettingsClick }
-      />
-    );
-  }
-
-  renderTransferDialog () {
-    const { showTransferDialog } = this.state;
-
-    if (!showTransferDialog) {
-      return null;
-    }
-
-    const { walletAccount } = this.props;
-
-    return (
-      <Transfer
-        account={ walletAccount }
-        onClose={ this.onTransferClose }
-      />
-    );
-  }
-
-  onEditClick = () => {
-    this.setState({
-      showEditDialog: !this.state.showEditDialog
-    });
-  }
-
-  onSettingsClick = () => {
-    this.setState({
-      showSettingsDialog: !this.state.showSettingsDialog
-    });
-  }
-
-  onTransferClick = () => {
-    this.setState({
-      showTransferDialog: !this.state.showTransferDialog
-    });
-  }
-
-  onTransferClose = () => {
-    this.onTransferClick();
-  }
-
-  closeDeleteDialog = () => {
-    this.setState({ showDeleteDialog: false });
-  }
-
-  showDeleteDialog = () => {
-    this.setState({ showDeleteDialog: true });
-  }
-}
-
-function mapStateToProps (_, initProps) {
-  const { address } = initProps.params;
-
-  return (state) => {
-    const { netVersion } = state.nodeStatus;
-    const { accountsInfo = {}, accounts = {} } = state.personal;
-    const walletAccount = accounts[address] || accountsInfo[address] || null;
-
-    if (walletAccount) {
-      walletAccount.address = address;
-    }
-
-    const wallet = state.wallet.wallets[address] || {};
-    const owned = !!accounts[address];
-
-    return {
-      address,
-      netVersion,
-      owned,
-      wallet,
-      walletAccount
-    };
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    setVisibleAccounts
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(WalletContainer);
diff --git a/js/src/views/Web/AddressBar/addressBar.js b/js/src/views/Web/AddressBar/addressBar.js
deleted file mode 100644
index af02f32729e8bb5b82385e6aaf6a44eb778abc4f..0000000000000000000000000000000000000000
--- a/js/src/views/Web/AddressBar/addressBar.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import Subdirectory from 'material-ui/svg-icons/navigation/subdirectory-arrow-left';
-
-import { Button, DappUrlInput } from '~/ui';
-import { CloseIcon, RefreshIcon } from '~/ui/Icons';
-
-@observer
-export default class AddressBar extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    store: PropTypes.object.isRequired
-  };
-
-  render () {
-    const { isLoading, isPristine, nextUrl } = this.props.store;
-
-    return (
-      <div className={ this.props.className }>
-        <Button
-          disabled={ isLoading }
-          onClick={ this.onRefreshUrl }
-          icon={
-            isLoading
-              ? <CloseIcon />
-              : <RefreshIcon />
-          }
-        />
-        <DappUrlInput
-          onChange={ this.onChangeUrl }
-          onGoto={ this.onGotoUrl }
-          onRestore={ this.onRestoreUrl }
-          url={ nextUrl }
-        />
-        <Button
-          disabled={ isPristine }
-          onClick={ this.onGotoUrl }
-          icon={ <Subdirectory /> }
-        />
-      </div>
-    );
-  }
-
-  onRefreshUrl = () => {
-    this.props.store.reload();
-  }
-
-  onChangeUrl = (url) => {
-    this.props.store.setNextUrl(url);
-  }
-
-  onGotoUrl = () => {
-    this.props.store.gotoUrl();
-  }
-
-  onRestoreUrl = () => {
-    this.props.store.restoreUrl();
-  }
-}
diff --git a/js/src/views/Web/AddressBar/addressBar.spec.js b/js/src/views/Web/AddressBar/addressBar.spec.js
deleted file mode 100644
index 7208d0f7b74da18c111737ace9535ba1110028ec..0000000000000000000000000000000000000000
--- a/js/src/views/Web/AddressBar/addressBar.spec.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import AddressBar from './';
-
-let component;
-let store;
-
-function createStore () {
-  store = {
-    nextUrl: 'https://parity.io'
-  };
-
-  return store;
-}
-
-function render (props = {}) {
-  component = shallow(
-    <AddressBar
-      className='testClass'
-      store={ createStore() }
-    />
-  );
-
-  return component;
-}
-
-describe('views/Web/AddressBar', () => {
-  it('renders defaults', () => {
-    expect(render()).to.be.ok;
-  });
-});
diff --git a/js/src/views/Web/AddressBar/index.js b/js/src/views/Web/AddressBar/index.js
deleted file mode 100644
index 9d0cce3a007d2c352cde4639b8276c54c417f2dc..0000000000000000000000000000000000000000
--- a/js/src/views/Web/AddressBar/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './addressBar';
diff --git a/js/src/views/Web/index.js b/js/src/views/Web/index.js
deleted file mode 100644
index c09be4ac1dc15cba8cb3a431a1cc3443c7f4435b..0000000000000000000000000000000000000000
--- a/js/src/views/Web/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './web';
diff --git a/js/src/views/Web/store.js b/js/src/views/Web/store.js
deleted file mode 100644
index 99b9b4b487a3496b52ee8a9e4e53cb24573e3c96..0000000000000000000000000000000000000000
--- a/js/src/views/Web/store.js
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { action, computed, observable, transaction } from 'mobx';
-import localStore from 'store';
-import { parse as parseUrl } from 'url';
-
-import { encodePath, encodeUrl } from '~/util/dapplink';
-
-const DEFAULT_URL = 'https://oasisdex.com';
-const LS_LAST_ADDRESS = '_parity::webLastAddress';
-
-const hasProtocol = /^https?:\/\//;
-
-let instance = null;
-
-export default class Store {
-  @observable counter = Date.now();
-  @observable currentUrl = null;
-  @observable history = [];
-  @observable isLoading = false;
-  @observable parsedUrl = null;
-  @observable nextUrl = null;
-  @observable token = null;
-
-  constructor (api) {
-    this._api = api;
-
-    this.nextUrl = this.currentUrl = this.loadLastUrl();
-  }
-
-  @computed get encodedPath () {
-    return `${this._api.dappsUrl}/web/${encodePath(this.token, this.currentUrl)}?t=${this.counter}`;
-  }
-
-  @computed get encodedUrl () {
-    return `http://${encodeUrl(this.token, this.currentUrl)}:${this._api.dappsPort}?t=${this.counter}`;
-  }
-
-  @computed get frameId () {
-    return `_web_iframe_${this.counter}`;
-  }
-
-  @computed get isPristine () {
-    return this.currentUrl === this.nextUrl;
-  }
-
-  @action gotoUrl = (_url) => {
-    let url = (_url || this.nextUrl).trim().replace(/\/+$/, '');
-
-    if (!hasProtocol.test(url)) {
-      url = `https://${url}`;
-    }
-    this.setNextUrl(url);
-    return this.generateToken(url).then(() => {
-      this.setCurrentUrl(this.nextUrl);
-    });
-  }
-
-  @action reload = () => {
-    transaction(() => {
-      this.setLoading(true);
-      this.counter = Date.now();
-    });
-  }
-
-  @action restoreUrl = () => {
-    this.setNextUrl(this.currentUrl);
-  }
-
-  @action setHistory = (urls) => {
-    this.history = Object
-      .keys(urls)
-      .filter((url) => url && !url.startsWith(this._api.dappsUrl) && url.indexOf('127.0.0.1') === -1)
-      .sort((urlA, urlB) => {
-        const timeA = urls[urlA].getTime();
-        const timeB = urls[urlB].getTime();
-
-        if (timeA > timeB) {
-          return -1;
-        } else if (timeA < timeB) {
-          return 1;
-        }
-
-        return 0;
-      })
-      .map((url) => {
-        const hostname = url.replace(/^http[s]?:\/\//, '').split('/')[0];
-
-        return {
-          hostname,
-          timestamp: urls[url],
-          url
-        };
-      });
-  }
-
-  @action setLoading = (isLoading) => {
-    this.isLoading = isLoading;
-  }
-
-  @action setToken = (token) => {
-    this.token = token;
-  }
-
-  @action setCurrentUrl = (_url) => {
-    const url = _url || this.currentUrl;
-
-    transaction(() => {
-      this.currentUrl = url;
-      this.parsedUrl = parseUrl(url);
-
-      this.saveLastUrl();
-
-      this.reload();
-    });
-  }
-
-  @action setNextUrl = (url) => {
-    this.nextUrl = url;
-  }
-
-  generateToken = (_url) => {
-    this.setToken(null);
-
-    return this._api.signer
-      .generateWebProxyAccessToken(_url)
-      .then((token) => {
-        this.setToken(token);
-      })
-      .catch((error) => {
-        console.warn('generateToken', error);
-      });
-  }
-
-  loadHistory = () => {
-    return this._api.parity
-      .listRecentDapps()
-      .then((apps) => {
-        this.setHistory(apps);
-      })
-      .catch((error) => {
-        console.warn('loadHistory', error);
-      });
-  }
-
-  loadLastUrl = () => {
-    return localStore.get(LS_LAST_ADDRESS) || DEFAULT_URL;
-  }
-
-  saveLastUrl = () => {
-    return localStore.set(LS_LAST_ADDRESS, this.currentUrl);
-  }
-
-  static get (api) {
-    if (!instance) {
-      instance = new Store(api);
-    }
-
-    return instance;
-  }
-}
-
-export {
-  DEFAULT_URL,
-  LS_LAST_ADDRESS
-};
diff --git a/js/src/views/Web/store.spec.js b/js/src/views/Web/store.spec.js
deleted file mode 100644
index 8e92cbd01679ea7587197d501f77eb8de97ad149..0000000000000000000000000000000000000000
--- a/js/src/views/Web/store.spec.js
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import sinon from 'sinon';
-
-import Store from './store';
-
-const TEST_HISTORY_URLA = 'http://testingA';
-const TEST_HISTORY_URLB = 'http://testingB';
-const TEST_HISTORY = {
-  '': new Date(678),
-  [TEST_HISTORY_URLA]: new Date(123),
-  [TEST_HISTORY_URLB]: new Date(456)
-};
-const TEST_TOKEN = 'testing-123';
-const TEST_URL1 = 'http://some.test.domain.com';
-const TEST_URL2 = 'http://something.different.com';
-
-let api;
-let store;
-
-function createApi () {
-  api = {
-    dappsPort: 8545,
-    dappsUrl: 'http://home.web3.site:8545',
-    parity: {
-      listRecentDapps: sinon.stub().resolves(TEST_HISTORY)
-    },
-    signer: {
-      generateWebProxyAccessToken: sinon.stub().resolves(TEST_TOKEN)
-    }
-  };
-
-  return api;
-}
-
-function create () {
-  store = new Store(createApi());
-
-  return store;
-}
-
-describe('views/Web/Store', () => {
-  beforeEach(() => {
-    create();
-  });
-
-  describe('@action', () => {
-    describe('gotoUrl', () => {
-      it('uses the nextUrl when none specified', () => {
-        store.setNextUrl('https://parity.io');
-
-        return store.gotoUrl().then(() => {
-          expect(store.currentUrl).to.equal('https://parity.io');
-        });
-      });
-
-      it('adds https when no protocol', () => {
-        return store.gotoUrl('google.com').then(() => {
-          expect(store.currentUrl).to.equal('https://google.com');
-        });
-      });
-    });
-
-    describe('restoreUrl', () => {
-      it('sets the nextUrl to the currentUrl', () => {
-        store.setCurrentUrl(TEST_URL1);
-        store.setNextUrl(TEST_URL2);
-        store.restoreUrl();
-
-        expect(store.nextUrl).to.equal(TEST_URL1);
-      });
-    });
-
-    describe('setCurrentUrl', () => {
-      beforeEach(() => {
-        store.setCurrentUrl(TEST_URL1);
-      });
-
-      it('sets the url', () => {
-        expect(store.currentUrl).to.equal(TEST_URL1);
-      });
-    });
-
-    describe('setHistory', () => {
-      let history;
-
-      beforeEach(() => {
-        store.setHistory(TEST_HISTORY);
-        history = store.history.peek();
-      });
-
-      it('sets the history', () => {
-        expect(history.length).to.equal(2);
-      });
-
-      it('adds hostname to entries', () => {
-        expect(history[1].hostname).to.be.ok;
-      });
-
-      it('removes hostname http prefixes', () => {
-        expect(history[1].hostname.indexOf('http')).to.equal(-1);
-      });
-
-      it('sorts the entries according to recently accessed', () => {
-        expect(history[0].url).to.equal(TEST_HISTORY_URLB);
-        expect(history[1].url).to.equal(TEST_HISTORY_URLA);
-      });
-    });
-
-    describe('setLoading', () => {
-      beforeEach(() => {
-        store.setLoading(true);
-      });
-
-      it('sets the loading state (true)', () => {
-        expect(store.isLoading).to.be.true;
-      });
-
-      it('sets the loading state (false)', () => {
-        store.setLoading(false);
-
-        expect(store.isLoading).to.be.false;
-      });
-    });
-
-    describe('setNextUrl', () => {
-      it('sets the url', () => {
-        store.setNextUrl(TEST_URL1);
-
-        expect(store.nextUrl).to.equal(TEST_URL1);
-      });
-    });
-
-    describe('setToken', () => {
-      it('sets the token', () => {
-        store.setToken(TEST_TOKEN);
-
-        expect(store.token).to.equal(TEST_TOKEN);
-      });
-    });
-  });
-
-  describe('@computed', () => {
-    describe('encodedUrl', () => {
-      describe('encodedPath', () => {
-        it('encodes current', () => {
-          store.setCurrentUrl(TEST_URL1);
-          expect(store.encodedPath).to.match(
-            /http:\/\/home\.web3\.site:8545\/web\/DSTPRV1BD1T78W1T5WQQ6VVDCMQ78SBKEGQ68VVDC5MPWBK3DXPG\?t=[0-9]*$/
-          );
-        });
-      });
-
-      it('encodes current', () => {
-        store.setCurrentUrl(TEST_URL1);
-        expect(store.encodedUrl).to.match(
-          /^http:\/\/DSTPRV1BD1T78W1T5WQQ6VVDCMQ78SBKEGQ68VVDC5MPWBK3DXPG\.web\.web3\.site:8545\?t=[0-9]*$/
-        );
-      });
-    });
-
-    describe('frameId', () => {
-      it('creates an id', () => {
-        expect(store.frameId).to.be.ok;
-      });
-    });
-
-    describe('isPristine', () => {
-      it('is true when current === next', () => {
-        store.setCurrentUrl(TEST_URL1);
-        store.setNextUrl(TEST_URL1);
-
-        expect(store.isPristine).to.be.true;
-      });
-
-      it('is false when current !== next', () => {
-        store.setCurrentUrl(TEST_URL1);
-        store.setNextUrl(TEST_URL2);
-
-        expect(store.isPristine).to.be.false;
-      });
-    });
-  });
-
-  describe('operations', () => {
-    describe('generateToken', () => {
-      beforeEach(() => {
-        return store.generateToken();
-      });
-
-      it('calls signer_generateWebProxyAccessToken', () => {
-        expect(api.signer.generateWebProxyAccessToken).to.have.been.calledOnce;
-      });
-
-      it('sets the token as retrieved', () => {
-        expect(store.token).to.equal(TEST_TOKEN);
-      });
-    });
-
-    describe('loadHistory', () => {
-      beforeEach(() => {
-        return store.loadHistory();
-      });
-
-      it('calls parity_listRecentDapps', () => {
-        expect(api.parity.listRecentDapps).to.have.been.calledOnce;
-      });
-
-      it('sets the history as retrieved', () => {
-        expect(store.history.peek().length).not.to.equal(0);
-      });
-    });
-  });
-});
diff --git a/js/src/views/Web/web.css b/js/src/views/Web/web.css
deleted file mode 100644
index 94e9d8e6f774cfb4ab74e49f9c29aad3def8751e..0000000000000000000000000000000000000000
--- a/js/src/views/Web/web.css
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.wrapper {
-  border: 0;
-  position: absolute;
-  height: 100%;
-  width: 100%;
-}
-
-:root .warningClose {
-  text-align: right;
-  a {
-    color: #fff;
-    text-decoration: underline;
-  }
-}
-
-.warning {
-  color: #fff;
-  background: #f80;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 50%;
-  padding: 1.5em;
-  z-index: 100;
-  animation: fadein 0.3s;
-}
-
-@keyframes fadein {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-
-.loading {
-  text-align: center;
-  margin-top: 5em;
-  color: #444;
-  font-size: 2em;
-}
-
-$addressbar: 36px;
-.url {
-  position: absolute;
-  top: 0;
-  width: 100%;
-  box-sizing: border-box;
-  height: $addressbar;
-  line-height: $addressbar;
-  display: flex;
-  background: rgba(0, 0, 0, 0.85);
-
-  > button {
-    min-width: 50px !important;
-  }
-
-  > input {
-    flex: 1;
-    font-size: 1.1em;
-    padding: 0.2em 0.5em;
-    border-radius: 0.25em;
-    border: none;
-    background: #666;
-    color: #eee;
-    outline: none;
-    box-shadow: 0 0 2px #111 inset;
-    margin: 2px 0;
-  }
-}
-
-.frame {
-  position: absolute;
-  width: 100%;
-  height: calc(100% - $addressbar);
-  top: $addressbar;
-  bottom: 0;
-  left: 0;
-  right: 0;
-}
diff --git a/js/src/views/Web/web.js b/js/src/views/Web/web.js
deleted file mode 100644
index 9e3dbca5483653c70eeff8ff0ac14f00a459f0a7..0000000000000000000000000000000000000000
--- a/js/src/views/Web/web.js
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { observer } from 'mobx-react';
-import React, { Component, PropTypes } from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import AddressBar from './AddressBar';
-import Store from './store';
-
-import styles from './web.css';
-
-@observer
-export default class Web extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    params: PropTypes.object.isRequired
-  }
-
-  store = Store.get(this.context.api);
-
-  state = {
-    isWarningDismissed: false
-  }
-
-  componentDidMount () {
-    this.store.gotoUrl(this.props.params.url);
-  }
-
-  componentWillReceiveProps (props) {
-    this.store.gotoUrl(props.params.url);
-  }
-
-  render () {
-    const { currentUrl, token } = this.store;
-
-    if (!token) {
-      return (
-        <div className={ styles.wrapper }>
-          <h1 className={ styles.loading }>
-            <FormattedMessage
-              id='web.requestToken'
-              defaultMessage='Requesting access token...'
-            />
-          </h1>
-        </div>
-      );
-    }
-
-    return currentUrl
-      ? this.renderFrame()
-      : null;
-  }
-
-  renderFrame () {
-    const { encodedPath, frameId } = this.store;
-
-    return (
-      <div className={ styles.wrapper }>
-        <AddressBar
-          className={ styles.url }
-          store={ this.store }
-        />
-        <iframe
-          className={ styles.frame }
-          frameBorder={ 0 }
-          id={ frameId }
-          name={ frameId }
-          onLoad={ this.iframeOnLoad }
-          sandbox='allow-forms allow-same-origin allow-scripts'
-          scrolling='auto'
-          src={ encodedPath }
-        />
-        { this.renderWarning() }
-      </div>
-    );
-  }
-
-  renderWarning () {
-    if (this.state.isWarningDismissed) {
-      return null;
-    }
-
-    return (
-      <div className={ styles.warning }>
-        <p>
-          WARNING: The web browser dapp is not safe as a general purpose browser.
-          Make sure to only visit web3-enabled sites that you trust.
-          Do not use it to browse web2.0 and never log in to any service - web3 dapps should not require that.
-        </p>
-        <div className={ styles.warningClose }>
-          <a onClick={ this.dismissWarning }>Okay!</a>
-        </div>
-      </div>
-    );
-  }
-
-  dismissWarning = () => {
-    this.setState({
-      isWarningDismissed: true
-    });
-  };
-
-  iframeOnLoad = () => {
-    this.store.setLoading(false);
-  };
-}
diff --git a/js/src/views/Web/web.spec.js b/js/src/views/Web/web.spec.js
deleted file mode 100644
index 950806d0b45d1d0301fc43232789ecb283cd6b0c..0000000000000000000000000000000000000000
--- a/js/src/views/Web/web.spec.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { DEFAULT_URL } from './store';
-import Web from './';
-
-let api;
-let component;
-
-function createApi () {
-  api = {};
-
-  return api;
-}
-
-function render (url = DEFAULT_URL) {
-  component = shallow(
-    <Web params={ { url } } />,
-    {
-      context: { api: createApi() }
-    }
-  );
-
-  return component;
-}
-
-describe('views/Web', () => {
-  beforeEach(() => {
-    render();
-  });
-
-  it('renders defaults', () => {
-    expect(component).to.be.ok;
-  });
-
-  it('renders loading with no token', () => {
-    expect(component.find('FormattedMessage').props().id).to.equal('web.requestToken');
-  });
-});
diff --git a/js/src/views/WriteContract/index.js b/js/src/views/WriteContract/index.js
deleted file mode 100644
index 34bd4faee32a30b2e095a215546d25ac75d0da27..0000000000000000000000000000000000000000
--- a/js/src/views/WriteContract/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './writeContract';
diff --git a/js/src/views/WriteContract/writeContract.css b/js/src/views/WriteContract/writeContract.css
deleted file mode 100644
index 01395e622676ebcb61f5b3de9f95458c4b4316bf..0000000000000000000000000000000000000000
--- a/js/src/views/WriteContract/writeContract.css
+++ /dev/null
@@ -1,198 +0,0 @@
-/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-.outer, .page, .editor {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-.timestamp {
-  font-size: 0.75em;
-  margin-left: 1em;
-  color: #ccc;
-}
-
-.toggles {
-  display: flex;
-  flex-direction: row;
-  margin: 1em 0 0;
-
-  > * {
-    flex: 1;
-  }
-}
-
-.container {
-  padding: 1em 0;
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-
-  // Fallback for browsers not supporting `calc`
-  min-height: 90vh;
-  min-height: calc(100vh - 8em);
-
-  > * {
-    margin: 0;
-
-    > h2 {
-      margin-top: 0;
-    }
-  }
-}
-
-.error {
-  background-color: rgba(200, 0, 0, 0.25);
-  padding: 1em 0.5em;
-  margin-top: -0.5em;
-  font-family: monospace;
-  font-size: 0.9em;
-}
-
-.mainEditor {
-  &:global(.ace-solarized-dark) {
-    background-color: rgba(0, 0, 0, 0.5);
-
-    :global(.ace_gutter) {
-      background-color: rgba(0, 0, 0, 0.7);
-    }
-
-    :global(.ace_content) {
-      background-color: transparent;
-    }
-  }
-}
-
-.big {
-  font-size: 1.2em;
-}
-
-.centeredMessage {
-  width: 100%;
-  height: 75%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.resizing * {
-  cursor: ew-resize !important;
-  user-select: none !important;
-}
-
-.editor {
-  width: 0;
-  margin-left: 0.5em;
-}
-
-.parameters {
-  width: 0;
-  display: flex;
-  flex-direction: column;
-  margin-right: 0.5em;
-  overflow: auto;
-
-  .panel {
-    background-color: rgba(0, 0, 0, 0.5);
-    padding: 1em;
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-  }
-
-  .compilation {
-    flex: 1 0 0;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .errors {
-    flex: 1 0 0;
-    overflow: auto;
-    margin-right: -0.5em;
-    margin-top: 0.5em;
-  }
-}
-
-.messageContainer {
-  padding: 0.5em 0;
-  margin-right: 0.5em;
-
-  &:first-child {
-    padding-top: 0;
-  }
-
-  &:last-child {
-    padding-bottom: 0;
-  }
-
-  .errorPosition {
-    background-color: rgba(0, 0, 0, 0.5);
-    padding: 0.25em 0.5em;
-    top: 0;
-    position: relative;
-    margin-bottom: 0.25em;
-    font-size: 0.75em;
-  }
-}
-
-.message {
-  font-family: monospace;
-  padding: 0.5em;
-  font-size: 0.9em;
-  white-space: pre;
-  overflow: auto;
-
-  &.error {
-    background-color: rgba(244, 67, 54, 0.5);
-  }
-
-  &.warning {
-    background-color: rgba(255, 235, 59, 0.5);
-  }
-
-  &.formal {
-    background-color: rgba(243, 156, 18, 0.5);
-  }
-}
-
-.messagesHeader {
-  margin-bottom: 0.25em;
-  text-transform: uppercase;
-  font-size: 0.9em;
-}
-
-.sliderContainer {
-  flex: 0 0 .8em;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  .slider {
-    width: 0.4em;
-    height: 3em;
-    border-radius: 0.75em;
-    background-color: rgba(0, 0, 0, 0.5);
-    content: ' ';
-
-    &:hover {
-      cursor: ew-resize;
-    }
-  }
-}
diff --git a/js/src/views/WriteContract/writeContract.js b/js/src/views/WriteContract/writeContract.js
deleted file mode 100644
index 634804c9c97679c94e57ad267a2b17b139a34261..0000000000000000000000000000000000000000
--- a/js/src/views/WriteContract/writeContract.js
+++ /dev/null
@@ -1,739 +0,0 @@
-  // Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { PropTypes, Component } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { observer } from 'mobx-react';
-import { MenuItem, Toggle } from 'material-ui';
-import { connect } from 'react-redux';
-import CircularProgress from 'material-ui/CircularProgress';
-import moment from 'moment';
-import { throttle } from 'lodash';
-
-import { Actionbar, ActionbarExport, ActionbarImport, Button, Page, Select, Input } from '~/ui';
-import { CancelIcon, ListIcon, SaveIcon, SendIcon, SettingsIcon } from '~/ui/Icons';
-import Editor from '~/ui/Editor';
-import { DeployContract, SaveContract, LoadContract } from '~/modals';
-
-import WriteContractStore from './writeContractStore';
-import styles from './writeContract.css';
-
-@observer
-class WriteContract extends Component {
-  static propTypes = {
-    accounts: PropTypes.object.isRequired,
-    worker: PropTypes.object,
-    workerError: PropTypes.any
-  };
-
-  store = WriteContractStore.get();
-
-  state = {
-    resizing: false,
-    size: 65
-  };
-
-  componentWillMount () {
-    const { worker } = this.props;
-
-    if (worker !== undefined) {
-      this.store.setWorker(worker);
-    }
-
-    this.throttledResize = throttle(this.applyResize, 100, { leading: true });
-  }
-
-  componentDidMount () {
-    this.store.setEditor(this.refs.editor);
-
-    if (this.props.workerError) {
-      this.store.setWorkerError(this.props.workerError);
-    }
-
-    // Wait for editor to be loaded
-    window.setTimeout(() => {
-      this.store.resizeEditor();
-    }, 2000);
-  }
-
-  // Set the worker if not set before (eg. first page loading)
-  componentWillReceiveProps (nextProps) {
-    if (this.props.worker === undefined && nextProps.worker !== undefined) {
-      this.store.setWorker(nextProps.worker);
-    }
-
-    if (this.props.workerError !== nextProps.workerError) {
-      this.store.setWorkerError(nextProps.workerError);
-    }
-  }
-
-  render () {
-    const { sourcecode } = this.store;
-    const { size, resizing } = this.state;
-
-    const annotations = this.store.annotations
-      .slice()
-      .filter((a) => a.contract === '');
-
-    return (
-      <div className={ styles.outer }>
-        { this.renderDeployModal() }
-        { this.renderSaveModal() }
-        { this.renderLoadModal() }
-        { this.renderActionBar() }
-        <Page className={ styles.page }>
-          <div
-            className={ `${styles.container} ${resizing ? styles.resizing : ''}` }
-            onMouseMove={ this.handleResize }
-            onMouseUp={ this.handleStopResize }
-            onMouseLeave={ this.handleStopResize }
-          >
-            <div
-              className={ styles.editor }
-              style={ { flex: `${size}%` } }
-            >
-              <h2>{ this.renderTitle() }</h2>
-
-              <Editor
-                ref='editor'
-                onChange={ this.store.handleEditSourcecode }
-                onExecute={ this.store.handleCompile }
-                annotations={ annotations }
-                value={ sourcecode }
-                className={ styles.mainEditor }
-              />
-            </div>
-
-            <div className={ styles.sliderContainer }>
-              <span
-                className={ styles.slider }
-                onMouseDown={ this.handleStartResize }
-              />
-            </div>
-
-            <div
-              className={ styles.parameters }
-              style={ { flex: `${100 - size}%` } }
-            >
-              <h2>
-                <FormattedMessage
-                  id='writeContract.title.parameters'
-                  defaultMessage='Parameters'
-                />
-              </h2>
-              { this.renderParameters() }
-            </div>
-          </div>
-        </Page>
-      </div>
-    );
-  }
-
-  renderTitle () {
-    const { selectedContract } = this.store;
-
-    if (!selectedContract || !selectedContract.name) {
-      return (
-        <FormattedMessage
-          id='writeContract.title.new'
-          defaultMessage='New Solidity Contract'
-        />
-      );
-    }
-
-    return (
-      <span>
-        { selectedContract.name }
-        <span
-          className={ styles.timestamp }
-          title={
-            <FormattedMessage
-              id='writeContract.title.saved'
-              defaultMessage='saved @ {timestamp}'
-              vaules={ {
-                timestamp: (new Date(selectedContract.timestamp)).toISOString()
-              } }
-            />
-          }
-        >
-          <FormattedMessage
-            id='writeContract.details.saved'
-            defaultMessage='(saved {timestamp})'
-            values={ {
-              timestamp: moment(selectedContract.timestamp).fromNow()
-            } }
-          />
-        </span>
-      </span>
-    );
-  }
-
-  renderActionBar () {
-    const { sourcecode, selectedContract } = this.store;
-
-    const filename = selectedContract && selectedContract.name
-      ? selectedContract.name
-        .replace(/[^a-z0-9]+/gi, '-')
-        .replace(/-$/, '')
-        .toLowerCase()
-      : 'contract.sol';
-
-    const extension = /\.sol$/.test(filename) ? '' : '.sol';
-
-    const buttons = [
-      <Button
-        icon={ <CancelIcon /> }
-        label={
-          <FormattedMessage
-            id='writeContract.buttons.new'
-            defaultMessage='New'
-          />
-        }
-        key='newContract'
-        onClick={ this.store.handleNewContract }
-      />,
-      <Button
-        icon={ <ListIcon /> }
-        label={
-          <FormattedMessage
-            id='writeContract.buttons.load'
-            defaultMessage='Load'
-          />
-        }
-        key='loadContract'
-        onClick={ this.store.handleOpenLoadModal }
-      />,
-      <Button
-        icon={ <SaveIcon /> }
-        label={
-          <FormattedMessage
-            id='writeContract.buttons.save'
-            defaultMessage='Save'
-          />
-        }
-        key='saveContract'
-        onClick={ this.store.handleSaveContract }
-      />,
-      <ActionbarExport
-        key='exportSourcecode'
-        content={ sourcecode }
-        filename={ `${filename}${extension}` }
-      />,
-      <ActionbarImport
-        key='importSourcecode'
-        title={
-          <FormattedMessage
-            id='writeContract.buttons.import'
-            defaultMessage='Import Solidity'
-          />
-        }
-        onConfirm={ this.store.handleImport }
-        renderValidation={ this.renderImportValidation }
-      />
-    ];
-
-    return (
-      <Actionbar
-        title={
-          <FormattedMessage
-            id='writeContract.title.main'
-            defaultMessage='Write a Contract'
-          />
-        }
-        buttons={ buttons }
-      />
-    );
-  }
-
-  renderImportValidation = (content) => {
-    return (
-      <Editor
-        readOnly
-        value={ content }
-        maxLines={ 20 }
-      />
-    );
-  }
-
-  renderParameters () {
-    const { compiling, contract, selectedBuild, loading, workerError } = this.store;
-
-    if (selectedBuild < 0) {
-      return (
-        <div className={ `${styles.panel} ${styles.centeredMessage}` }>
-          <CircularProgress
-            size={ 80 }
-            thickness={ 5 }
-          />
-          <p>
-            <FormattedMessage
-              id='writeContract.title.loading'
-              defaultMessage='Loading...'
-            />
-          </p>
-        </div>
-      );
-    }
-
-    let content;
-
-    if (workerError) {
-      content = (
-        <div className={ styles.panel }>
-          <div className={ styles.centeredMessage }>
-            <p>
-              <FormattedMessage
-                id='writeContract.error.params'
-                defaultMessage='An error occurred with the following description'
-              />
-            </p>
-            <div className={ styles.error }>
-              { workerError.toString() }
-            </div>
-          </div>
-        </div>
-      );
-    } else if (loading) {
-      const { longVersion } = this.store.builds[selectedBuild];
-
-      content = (
-        <div className={ styles.panel }>
-          <div className={ styles.centeredMessage }>
-            <CircularProgress
-              size={ 80 }
-              thickness={ 5 }
-            />
-            <p>
-              <FormattedMessage
-                id='writeContract.title.solidity'
-                defaultMessage='Loading Solidity {version}'
-                values={ {
-                  version: longVersion
-                } }
-              />
-            </p>
-          </div>
-        </div>
-      );
-    } else {
-      content = this.renderCompilation();
-    }
-
-    return (
-      <div className={ styles.panel }>
-        <div>
-          <Button
-            icon={ <SettingsIcon /> }
-            label={
-              <FormattedMessage
-                id='writeContract.buttons.compile'
-                defaultMessage='Compile'
-              />
-            }
-            onClick={ this.store.handleCompile }
-            primary={ false }
-            disabled={ compiling || this.store.isPristine }
-          />
-          {
-            contract
-              ? (
-                <Button
-                  disabled={ compiling || !this.store.isPristine }
-                  icon={ <SendIcon /> }
-                  label={
-                    <FormattedMessage
-                      id='writeContract.buttons.deploy'
-                      defaultMessage='Deploy'
-                    />
-                  }
-                  onClick={ this.store.handleOpenDeployModal }
-                  primary={ false }
-                />
-              )
-              : null
-          }
-        </div>
-        <div className={ styles.toggles }>
-          <div>
-            <Toggle
-              label={
-                <FormattedMessage
-                  id='writeContract.buttons.optimise'
-                  defaultMessage='Optimise'
-                />
-              }
-              labelPosition='right'
-              onToggle={ this.store.handleOptimizeToggle }
-              toggled={ this.store.optimize }
-            />
-          </div>
-          <div>
-            <Toggle
-              label={
-                <FormattedMessage
-                  id='writeContract.buttons.autoCompile'
-                  defaultMessage='Auto-Compile'
-                />
-              }
-              labelPosition='right'
-              onToggle={ this.store.handleAutocompileToggle }
-              toggled={ this.store.autocompile }
-            />
-          </div>
-        </div>
-        { this.renderSolidityVersions() }
-        { content }
-      </div>
-    );
-  }
-
-  renderSolidityVersions () {
-    const { builds, selectedBuild } = this.store;
-
-    const buildsList = builds.map((build, index) => (
-      <MenuItem
-        key={ index }
-        value={ index }
-        label={ build.release ? build.version : build.longVersion }
-      >
-        {
-          build.release
-            ? (
-              <span className={ styles.big }>
-                { build.version }
-              </span>
-            )
-            : build.longVersion
-        }
-      </MenuItem>
-    ));
-
-    return (
-      <div>
-        <Select
-          label={
-            <FormattedMessage
-              id='writeContract.title.selectSolidity'
-              defaultMessage='Select a Solidity version'
-            />
-          }
-          value={ selectedBuild }
-          onChange={ this.store.handleSelectBuild }
-        >
-          { buildsList }
-        </Select>
-      </div>
-    );
-  }
-
-  renderDeployModal () {
-    const { showDeployModal, contract, sourcecode } = this.store;
-
-    if (!showDeployModal) {
-      return null;
-    }
-
-    return (
-      <DeployContract
-        abi={ contract.interface }
-        accounts={ this.props.accounts }
-        code={ `0x${contract.bytecode}` }
-        source={ sourcecode }
-        onClose={ this.store.handleCloseDeployModal }
-        readOnly
-      />
-    );
-  }
-
-  renderLoadModal () {
-    const { showLoadModal } = this.store;
-
-    if (!showLoadModal) {
-      return null;
-    }
-
-    return (
-      <LoadContract
-        onLoad={ this.store.handleLoadContract }
-        onDelete={ this.store.handleDeleteContract }
-        onClose={ this.store.handleCloseLoadModal }
-        contracts={ this.store.savedContracts }
-        snippets={ this.store.snippets }
-      />
-    );
-  }
-
-  renderSaveModal () {
-    const { showSaveModal, sourcecode } = this.store;
-
-    if (!showSaveModal) {
-      return null;
-    }
-
-    return (
-      <SaveContract
-        sourcecode={ sourcecode }
-        onSave={ this.store.handleSaveNewContract }
-        onClose={ this.store.handleCloseSaveModal }
-      />
-    );
-  }
-
-  renderCompilation () {
-    const { compiled, contracts, compiling, contractIndex, contract } = this.store;
-
-    if (compiling) {
-      return (
-        <div className={ styles.centeredMessage }>
-          <CircularProgress
-            size={ 80 }
-            thickness={ 5 }
-          />
-          <p>
-            <FormattedMessage
-              id='writeContract.compiling.busy'
-              defaultMessage='Compiling...'
-            />
-          </p>
-        </div>
-      );
-    }
-
-    if (!compiled) {
-      return (
-        <div className={ styles.centeredMessage }>
-          <p>
-            <FormattedMessage
-              id='writeContract.compiling.action'
-              defaultMessage='Please compile the source code.'
-            />
-          </p>
-        </div>
-      );
-    }
-
-    if (!contracts) {
-      return this.renderErrors();
-    }
-
-    const contractKeys = Object.keys(contracts);
-
-    if (contractKeys.length === 0) {
-      return (
-        <div className={ styles.centeredMessage }>
-          <p>
-            <FormattedMessage
-              id='writeContract.error.noContract'
-              defaultMessage='No contract has been found.'
-            />
-          </p>
-        </div>
-      );
-    }
-
-    const contractsList = contractKeys.map((name, index) => (
-      <MenuItem
-        key={ index }
-        value={ index }
-        label={ name }
-      >
-        { name }
-      </MenuItem>
-    ));
-
-    return (
-      <div className={ styles.compilation }>
-        <Select
-          label={
-            <FormattedMessage
-              id='writeContract.title.contract'
-              defaultMessage='Select a contract'
-            />
-          }
-          value={ contractIndex }
-          onChange={ this.store.handleSelectContract }
-        >
-          { contractsList }
-        </Select>
-        { this.renderContract(contract) }
-        <h4 className={ styles.messagesHeader }>
-          <FormattedMessage
-            id='writeContract.title.messages'
-            defaultMessage='Compiler messages'
-          />
-        </h4>
-        { this.renderErrors() }
-      </div>
-    );
-  }
-
-  renderContract (contract) {
-    if (!contract) {
-      return null;
-    }
-
-    const { bytecode } = contract;
-    const abi = contract.interface;
-
-    const metadata = contract.metadata
-      ? (
-        <Input
-          allowCopy
-          label={
-            <FormattedMessage
-              id='writeContract.input.metadata'
-              defaultMessage='Metadata'
-            />
-          }
-          readOnly
-          value={ contract.metadata }
-        />
-      )
-      : null;
-
-    return (
-      <div>
-        <Input
-          allowCopy
-          label={
-            <FormattedMessage
-              id='writeContract.input.abi'
-              defaultMessage='ABI Definition'
-            />
-          }
-          readOnly
-          value={ abi }
-        />
-
-        <Input
-          allowCopy
-          label={
-            <FormattedMessage
-              id='writeContract.input.code'
-              defaultMessage='Bytecode'
-            />
-          }
-          readOnly
-          value={ `0x${bytecode}` }
-        />
-
-        { metadata }
-        { this.renderSwarmHash(contract) }
-      </div>
-    );
-  }
-
-  renderSwarmHash (contract) {
-    if (!contract || !contract.metadata) {
-      return null;
-    }
-
-    const { bytecode } = contract;
-
-    // @see https://solidity.readthedocs.io/en/develop/miscellaneous.html#encoding-of-the-metadata-hash-in-the-bytecode
-    const hashRegex = /a165627a7a72305820([a-f0-9]{64})0029$/;
-
-    if (!hashRegex.test(bytecode)) {
-      return null;
-    }
-
-    const hash = hashRegex.exec(bytecode)[1];
-
-    return (
-      <Input
-        allowCopy
-        label={
-          <FormattedMessage
-            id='writeContract.input.swarm'
-            defaultMessage='Swarm Metadata Hash'
-          />
-        }
-        readOnly
-        value={ `${hash}` }
-      />
-    );
-  }
-
-  renderErrors () {
-    const { annotations } = this.store;
-
-    const body = annotations.map((annotation, index) => {
-      const { text, row, column, contract, type, formal } = annotation;
-      const classType = formal ? 'formal' : type;
-      const classes = [ styles.message, styles[classType] ];
-
-      return (
-        <div key={ index } className={ styles.messageContainer }>
-          <div className={ classes.join(' ') }>{ text }</div>
-          <span className={ styles.errorPosition }>
-            { contract ? `[ ${contract} ]   ` : '' }
-            { row }: { column }
-          </span>
-        </div>
-      );
-    });
-
-    return (
-      <div className={ styles.errors }>
-        { body }
-      </div>
-    );
-  }
-
-  handleStartResize = () => {
-    this.setState({ resizing: true });
-  }
-
-  handleStopResize = () => {
-    this.setState({ resizing: false });
-  }
-
-  handleResize = (event) => {
-    if (!this.state.resizing) {
-      return;
-    }
-
-    const { pageX, currentTarget } = event;
-    const { width, left } = currentTarget.getBoundingClientRect();
-
-    const x = pageX - left;
-
-    this.size = 100 * x / width;
-    this.throttledResize();
-
-    event.stopPropagation();
-  }
-
-  applyResize = () => {
-    this.setState({ size: this.size });
-  }
-}
-
-function mapStateToProps (state) {
-  const { accounts } = state.personal;
-  const { worker, error } = state.worker;
-
-  return {
-    accounts,
-    worker,
-    workerError: error
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  null
-)(WriteContract);
diff --git a/js/src/views/WriteContract/writeContractStore.js b/js/src/views/WriteContract/writeContractStore.js
deleted file mode 100644
index 202296447dec2ee4826a5641c2a64c14023e177a..0000000000000000000000000000000000000000
--- a/js/src/views/WriteContract/writeContractStore.js
+++ /dev/null
@@ -1,572 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { debounce } from 'lodash';
-import { action, computed, observable, transaction } from 'mobx';
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-import store from 'store';
-
-import { sha3 } from '~/api/util/sha3';
-import SolidityUtils from '~/util/solidity';
-
-const SOLIDITY_LIST_URL = 'https://rawgit.com/ethereum/solc-bin/gh-pages/bin/list.json';
-const WRITE_CONTRACT_STORE_KEY = '_parity::writeContractStore';
-
-const SNIPPETS = {
-  snippet0: {
-    name: 'Token.sol',
-    description: (
-      <FormattedMessage
-        id='writeContract.type.standardErc20'
-        defaultMessage='Standard ERC20 Token Contract'
-      />
-    ),
-    id: 'snippet0',
-    sourcecode: require('raw-loader!../../contracts/snippets/token.sol')
-  },
-  snippet1: {
-    name: 'StandardToken.sol',
-    description: (
-      <FormattedMessage
-        id='writeContract.type.implementErc20'
-        defaultMessage='Implementation of ERC20 Token Contract'
-      />
-    ),
-    id: 'snippet1',
-    sourcecode: require('raw-loader!../../contracts/snippets/standard-token.sol')
-  },
-  snippet2: {
-    name: 'HumanStandardToken.sol',
-    description: (
-      <FormattedMessage
-        id='writeContract.type.humanErc20'
-        defaultMessage='Implementation of the Human Token Contract'
-      />
-    ),
-    id: 'snippet2',
-    sourcecode: require('raw-loader!../../contracts/snippets/human-standard-token.sol')
-  },
-  snippet3: {
-    name: 'Wallet.sol',
-    description: (
-      <FormattedMessage
-        id='writeContract.type.multisig'
-        defaultMessage='Implementation of a multisig Wallet'
-      />
-    ),
-    id: 'snippet3',
-    sourcecode: require('raw-loader!../../contracts/snippets/wallet.sol')
-  }
-};
-
-let instance = null;
-
-export default class WriteContractStore {
-  @observable sourcecode = '';
-
-  @observable compiled = false;
-  @observable compiling = false;
-  @observable loading = true;
-
-  @observable contractIndex = -1;
-  @observable contract = null;
-  @observable contracts = {};
-
-  @observable errors = [];
-  @observable annotations = [];
-
-  @observable builds = [];
-  @observable selectedBuild = -1;
-
-  @observable autocompile = false;
-  @observable optimize = false;
-
-  @observable showDeployModal = false;
-  @observable showSaveModal = false;
-  @observable showLoadModal = false;
-
-  @observable savedContracts = {};
-  @observable selectedContract = {};
-
-  @observable workerError = null;
-
-  loadingSolidity = false;
-  lastCompilation = {};
-  snippets = SNIPPETS;
-  worker = undefined;
-
-  useWorker = true;
-  solc = {};
-
-  constructor () {
-    this.debouncedCompile = debounce(this.handleCompile, 1000);
-  }
-
-  static get () {
-    if (!instance) {
-      instance = new WriteContractStore();
-    }
-
-    return instance;
-  }
-
-  @action setWorkerError (error) {
-    this.workerError = error;
-  }
-
-  @action setEditor (editor) {
-    this.editor = editor;
-  }
-
-  @action setWorker (worker) {
-    if (this.worker !== undefined) {
-      return;
-    }
-
-    this.worker = worker;
-
-    return Promise.all([
-      this.fetchSolidityVersions().then(() => this.handleCompile()),
-      this.reloadContracts(undefined, undefined, false)
-    ]);
-  }
-
-  fetchSolidityVersions () {
-    return fetch(SOLIDITY_LIST_URL)
-      .then((response) => response.json())
-      .then((data) => {
-        const { builds, releases, latestRelease } = data;
-        let latestIndex = -1;
-        let promise = Promise.resolve();
-
-        this.builds = builds.reverse().map((build, index) => {
-          if (releases[build.version] === build.path) {
-            build.release = true;
-
-            if (build.version === latestRelease) {
-              build.latest = true;
-              promise = promise.then(() => this.loadSolidityVersion(build));
-              latestIndex = index;
-            }
-          }
-
-          return build;
-        });
-
-        this.selectedBuild = latestIndex;
-        return promise;
-      })
-      .catch((error) => {
-        this.setWorkerError(error);
-      });
-  }
-
-  @action handleImport = (sourcecode) => {
-    this.reloadContracts(-1, sourcecode);
-  }
-
-  @action handleSelectBuild = (_, index, value) => {
-    this.selectedBuild = value;
-    return this
-      .loadSolidityVersion(this.builds[value])
-      .then(() => this.handleCompile());
-  }
-
-  getCompiler (build) {
-    const { longVersion } = build;
-
-    if (!this.solc[longVersion]) {
-      this.solc[longVersion] = SolidityUtils
-        .getCompiler(build)
-        .then((compiler) => {
-          this.solc[longVersion] = compiler;
-          return compiler;
-        })
-        .catch((error) => {
-          this.setWorkerError(error);
-          throw error;
-        });
-    }
-
-    return Promise.resolve(this.solc[longVersion]);
-  }
-
-  @action loadSolidityVersion = (build) => {
-    if (this.worker === undefined) {
-      return;
-    } else if (this.worker === null) {
-      this.useWorker = false;
-    }
-
-    if (this.loadingSolidity) {
-      return this.loadingSolidity;
-    }
-
-    this.loading = true;
-
-    if (this.useWorker) {
-      this.loadingSolidity = this.worker
-        .postMessage({
-          action: 'load',
-          data: build
-        })
-        .then((result) => {
-          if (result !== 'ok') {
-            throw new Error('error while loading solidity: ' + result);
-          }
-
-          this.loadingSolidity = false;
-          this.loading = false;
-        })
-        .catch((error) => {
-          console.warn('error while loading solidity', error);
-          this.useWorker = false;
-          this.loadingSolidity = null;
-
-          return this.loadSolidityVersion(build);
-        });
-    } else {
-      this.loadingSolidity = this
-        .getCompiler(build)
-        .then(() => {
-          this.loadingSolidity = false;
-          this.loading = false;
-
-          return 'ok';
-        })
-        .catch((error) => {
-          this.setWorkerError(error);
-          this.loadingSolidity = false;
-          this.loading = false;
-        });
-    }
-
-    return this.loadingSolidity;
-  }
-
-  @action handleOpenDeployModal = () => {
-    this.showDeployModal = true;
-  }
-
-  @action handleCloseDeployModal = () => {
-    this.showDeployModal = false;
-  }
-
-  @action handleOpenLoadModal = () => {
-    this.showLoadModal = true;
-  }
-
-  @action handleCloseLoadModal = () => {
-    this.showLoadModal = false;
-  }
-
-  @action handleOpenSaveModal = () => {
-    this.showSaveModal = true;
-  }
-
-  @action handleCloseSaveModal = () => {
-    this.showSaveModal = false;
-  }
-
-  @action handleSelectContract = (_, index, value) => {
-    this.contractIndex = value;
-    this.contract = this.contracts[Object.keys(this.contracts)[value]];
-  }
-
-  compile = (data) => {
-    const { name = '' } = this.selectedContract;
-
-    if (this.useWorker) {
-      return this.worker.postMessage({
-        action: 'compile',
-        data: {
-          ...data,
-          name
-        }
-      });
-    }
-
-    return new Promise((resolve, reject) => {
-      window.setTimeout(() => {
-        this
-          .getCompiler(data.build)
-          .then((compiler) => {
-            return SolidityUtils.compile({
-              ...data,
-              name
-            }, compiler);
-          })
-          .then(resolve)
-          .catch(reject);
-      }, 0);
-    });
-  }
-
-  @computed get isPristine () {
-    return this.getHash() === this.lastCompilation.hash;
-  }
-
-  getHash () {
-    const build = this.builds[this.selectedBuild];
-    const version = build.longVersion;
-    const sourcecode = this.sourcecode.replace(/\s+/g, ' ');
-
-    return sha3(JSON.stringify({ version, sourcecode, optimize: this.optimize }));
-  }
-
-  @action handleCompile = () => {
-    transaction(() => {
-      this.compiled = false;
-      this.compiling = true;
-      this.setWorkerError(null);
-    });
-
-    const build = this.builds[this.selectedBuild];
-    const hash = this.getHash();
-
-    let promise = Promise.resolve(null);
-
-    if (hash === this.lastCompilation.hash) {
-      promise = new Promise((resolve) => {
-        window.setTimeout(() => {
-          resolve(this.lastCompilation);
-        }, 500);
-      });
-    } else {
-      promise = this
-        .compile({
-          sourcecode: this.sourcecode,
-          build: build,
-          optimize: this.optimize,
-          files: this.files
-        })
-        .then((data) => {
-          const result = this.parseCompiled(data);
-
-          this.lastCompilation = {
-            result: result,
-            date: new Date(),
-            version: data.version,
-            hash
-          };
-
-          return this.lastCompilation;
-        })
-        .catch((error) => {
-          this.setWorkerError(error);
-        });
-    }
-
-    return promise.then((data = null) => {
-      if (data) {
-        const {
-          contract, contractIndex,
-          annotations, contracts, errors
-        } = data.result;
-
-        if (!contract && errors && errors.length > 0) {
-          this.setWorkerError(errors[0]);
-        } else {
-          this.contract = contract;
-          this.contractIndex = contractIndex;
-
-          this.annotations = annotations;
-          this.contracts = contracts;
-          this.errors = errors;
-        }
-      }
-
-      this.compiled = true;
-      this.compiling = false;
-    });
-  }
-
-  @action handleAutocompileToggle = () => {
-    this.autocompile = !this.autocompile;
-  }
-
-  @action handleOptimizeToggle = () => {
-    this.optimize = !this.optimize;
-  }
-
-  @action parseCompiled = (data) => {
-    const { contracts } = data;
-
-    const { errors = [] } = data;
-    const errorAnnotations = this.parseErrors(errors);
-    // const formalAnnotations = this.parseErrors(data.formal && data.formal.errors, true);
-
-    const annotations = [].concat(
-      errorAnnotations
-    );
-
-    const contractKeys = Object.keys(contracts || {});
-
-    const contract = contractKeys.length ? contracts[contractKeys[0]] : null;
-    const contractIndex = contractKeys.length ? 0 : -1;
-
-    return {
-      contract, contractIndex,
-      contracts, errors, annotations
-    };
-  }
-
-  parseErrors = (data, formal = false) => {
-    const regex = /^(.*):(\d+):(\d+):\s*([a-z]+):\s*((.|[\r\n])+)$/i;
-
-    return (data || [])
-      .filter((e) => regex.test(e))
-      .map((error, index) => {
-        const match = regex.exec(error);
-
-        const contract = match[1];
-        const row = parseInt(match[2]) - 1;
-        const column = parseInt(match[3]);
-
-        const type = formal ? 'warning' : match[4].toLowerCase();
-        const text = match[5];
-
-        return {
-          contract,
-          row, column,
-          type, text,
-          formal
-        };
-      });
-  }
-
-  @action handleEditSourcecode = (value, compile = false) => {
-    this.sourcecode = value;
-
-    const localStore = store.get(WRITE_CONTRACT_STORE_KEY) || {};
-
-    store.set(WRITE_CONTRACT_STORE_KEY, {
-      ...localStore,
-      current: value
-    });
-
-    if (compile) {
-      this.handleCompile();
-    } else if (this.autocompile) {
-      this.debouncedCompile();
-    }
-  }
-
-  @action handleSaveContract = () => {
-    if (this.selectedContract && this.selectedContract.id !== undefined) {
-      return this.handleSaveNewContract({
-        ...this.selectedContract,
-        sourcecode: this.sourcecode
-      });
-    }
-
-    return this.handleOpenSaveModal();
-  }
-
-  getId (contracts) {
-    return Object.values(contracts)
-      .map((c) => c.id)
-      .reduce((max, id) => Math.max(max, id), 0) + 1;
-  }
-
-  @action handleSaveNewContract = (data) => {
-    const { name, sourcecode, id } = data;
-
-    const localStore = store.get(WRITE_CONTRACT_STORE_KEY) || {};
-    const savedContracts = localStore.saved || {};
-    const cId = (id !== undefined)
-      ? id
-      : this.getId(savedContracts);
-
-    store.set(WRITE_CONTRACT_STORE_KEY, {
-      ...localStore,
-      saved: {
-        ...savedContracts,
-        [ cId ]: { sourcecode, id: cId, name, timestamp: Date.now() }
-      }
-    });
-
-    this.reloadContracts(cId);
-  }
-
-  @action reloadContracts = (id, sourcecode, recompile = true) => {
-    const localStore = store.get(WRITE_CONTRACT_STORE_KEY) || {};
-
-    this.savedContracts = localStore.saved || {};
-
-    const cId = id !== undefined ? id : localStore.currentId;
-
-    this.selectedContract = this.savedContracts[cId] || {};
-    this.sourcecode = sourcecode !== undefined
-      ? sourcecode
-      : this.selectedContract.sourcecode || localStore.current || '';
-
-    store.set(WRITE_CONTRACT_STORE_KEY, {
-      ...localStore,
-      currentId: this.selectedContract ? cId : null,
-      current: this.sourcecode
-    });
-
-    this.resizeEditor();
-
-    if (recompile) {
-      return this.handleCompile();
-    }
-  }
-
-  @action handleLoadContract = (contract) => {
-    const { sourcecode, id } = contract;
-
-    this.reloadContracts(id, sourcecode);
-  }
-
-  @action handleDeleteContract = (id) => {
-    const localStore = store.get(WRITE_CONTRACT_STORE_KEY) || {};
-
-    const savedContracts = Object.assign({}, localStore.saved || {});
-
-    if (savedContracts[id]) {
-      delete savedContracts[id];
-    }
-
-    store.set(WRITE_CONTRACT_STORE_KEY, {
-      ...localStore,
-      saved: savedContracts
-    });
-
-    this.reloadContracts();
-  }
-
-  @action handleNewContract = () => {
-    this.reloadContracts(-1, '');
-  }
-
-  @action resizeEditor = () => {
-    try {
-      this.editor.refs.brace.editor.resize();
-    } catch (e) {}
-  }
-
-  get files () {
-    const files = [].concat(
-      Object.values(this.snippets),
-      Object.values(this.savedContracts)
-    );
-
-    return files;
-  }
-}
diff --git a/js/src/views/index.js b/js/src/views/index.js
deleted file mode 100644
index 7460868ae25f5824ee1b3abd724d320c10105aca..0000000000000000000000000000000000000000
--- a/js/src/views/index.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export Account from './Account';
-export Accounts from './Accounts';
-export Address from './Address';
-export Addresses from './Addresses';
-export Application from './Application';
-export Contract from './Contract';
-export Contracts from './Contracts';
-export Dapp from './Dapp';
-export Dapps from './Dapps';
-export Home from './Home';
-export ParityBar from './ParityBar';
-export Settings, { SettingsBackground, SettingsParity, SettingsProxy, SettingsViews } from './Settings';
-export Signer from './Signer';
-export Status from './Status';
-export Vaults from './Vaults';
-export Wallet from './Wallet';
-export Web from './Web';
-export WriteContract from './WriteContract';
diff --git a/js/src/web3.js b/js/src/web3.js
deleted file mode 100644
index 89a411427e59c586fbb8320bc456cf862d84c6e9..0000000000000000000000000000000000000000
--- a/js/src/web3.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Web3 from 'web3';
-import web3extensions from './util/web3.extensions';
-
-import './dev.web3.html';
-
-const http = new Web3.providers.HttpProvider('/rpc/');
-const web3 = new Web3(http);
-
-// set default account
-web3.eth.getAccounts((err, accounts) => {
-  if (err || !accounts || !accounts[0]) {
-    return;
-  }
-
-  web3.eth.defaultAccount = accounts[0];
-});
-
-web3extensions(web3).map((extension) => web3._extend(extension));
-
-global.web3 = web3;
diff --git a/js/src/webWorker.js b/js/src/webWorker.js
deleted file mode 100644
index 115c61414ceb49eb0a56f34c8bde7d833bf8fe4a..0000000000000000000000000000000000000000
--- a/js/src/webWorker.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import registerPromiseWorker from 'promise-worker/register';
-import { Signer } from '~/util/signer';
-import SolidityUtils from '~/util/solidity';
-
-registerPromiseWorker((msg) => {
-  return handleMessage(msg);
-});
-
-self.compiler = {
-  version: null,
-  compiler: null
-};
-self.files = {};
-
-function handleMessage (message) {
-  switch (message.action) {
-    case 'compile':
-      return compile(message.data);
-
-    case 'load':
-      return getCompiler(message.data).then(() => 'ok');
-
-    case 'setFiles':
-      return setFiles(message.data);
-
-    case 'getSignerSeed':
-      return getSignerSeed(message.data);
-
-    default:
-      console.warn(`unknown action "${message.action}"`);
-      return null;
-  }
-}
-
-function getSignerSeed (data) {
-  console.log('deriving seed from service-worker');
-  const { wallet, password } = data;
-
-  return Signer.getSeed(wallet, password);
-}
-
-function compile (data) {
-  const { build } = data;
-
-  return getCompiler(build)
-    .then((compiler) => {
-      console.warn('compiling');
-      return SolidityUtils.compile(data, compiler);
-    })
-    .then((result) => {
-      console.warn('result in worker', result);
-      return result;
-    })
-    .catch((error) => {
-      console.error('error in worker', error);
-      throw error;
-    });
-}
-
-function setFiles (files) {
-  const prevFiles = self.files;
-  const nextFiles = files.reduce((obj, file) => {
-    obj[file.name] = file.sourcecode;
-    return obj;
-  }, {});
-
-  self.files = {
-    ...prevFiles,
-    ...nextFiles
-  };
-
-  return 'ok';
-}
-
-function getCompiler (build) {
-  const { longVersion } = build;
-
-  if (self.compiler.version !== longVersion) {
-    self.compiler.version = longVersion;
-    self.compiler.compiler = SolidityUtils
-      .getCompiler(build)
-      .then((compiler) => {
-        if (self.compiler.version === longVersion) {
-          self.compiler.compiler = compiler;
-        }
-
-        return compiler;
-      });
-  }
-
-  return Promise.resolve(self.compiler.compiler);
-}
diff --git a/js/test/babel.js b/js/test/babel.js
deleted file mode 100644
index c9c1d9daec3fcb8719fcd6427706384163e3fcfe..0000000000000000000000000000000000000000
--- a/js/test/babel.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-require('babel-register')();
diff --git a/js/test/e2e/ethapi.js b/js/test/e2e/ethapi.js
deleted file mode 100644
index 44e910722567b230e92f0709ada1163065708ec5..0000000000000000000000000000000000000000
--- a/js/test/e2e/ethapi.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import Api from '../../src/api';
-
-function createApi (transport) {
-  if (process.env.DEBUG) {
-    transport.setDebug(true);
-  }
-
-  return new Api(transport);
-}
-
-export function createHttpApi () {
-  return createApi(new Api.Transport.Http('http://localhost:8545'));
-}
-
-export function createWsApi () {
-  return createApi(new Api.Transport.Ws('ws://localhost:8546'));
-}
diff --git a/js/test/mocha.config.js b/js/test/mocha.config.js
deleted file mode 100644
index 771e14040672715ef4969c74a8674d974f57acc9..0000000000000000000000000000000000000000
--- a/js/test/mocha.config.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import 'isomorphic-fetch';
-import 'mock-local-storage';
-
-import es6Promise from 'es6-promise';
-es6Promise.polyfill();
-
-import injectTapEventPlugin from 'react-tap-event-plugin';
-injectTapEventPlugin();
-
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
-import chaiEnzyme from 'chai-enzyme';
-import 'sinon-as-promised';
-import sinonChai from 'sinon-chai';
-import { WebSocket } from 'mock-socket';
-import jsdom from 'jsdom';
-
-chai.use(chaiAsPromised);
-chai.use(chaiEnzyme());
-chai.use(sinonChai);
-
-// expose expect to global so we won't have to manually import & define it in every test
-global.expect = chai.expect;
-global.WebSocket = WebSocket;
-
-// setup jsdom
-global.document = jsdom.jsdom('<!doctype html><html><body></body></html>');
-global.window = document.defaultView;
-global.navigator = global.window.navigator;
-global.location = global.window.location;
-global.Blob = () => {};
-
-// attach mocked localStorage onto the window as exposed by jsdom
-global.window.localStorage = global.localStorage;
-
-module.exports = {};
diff --git a/js/test/mocha.opts b/js/test/mocha.opts
deleted file mode 100644
index 6a1e05869c4a0e1f45b95a0338041e730a431b85..0000000000000000000000000000000000000000
--- a/js/test/mocha.opts
+++ /dev/null
@@ -1,3 +0,0 @@
--r ./test/babel
--r ./test/mocha.config
--r ignore-styles
diff --git a/js/test/mockRpc.js b/js/test/mockRpc.js
deleted file mode 100644
index b3c6abc3e2ea70a0671f7b1a067ca2723056a6c2..0000000000000000000000000000000000000000
--- a/js/test/mockRpc.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import nock from 'nock';
-import { Server as MockWsServer } from 'mock-socket';
-
-import { isFunction } from '../src/api/util/types';
-
-export const TEST_HTTP_URL = 'http://localhost:6688';
-export const TEST_WS_URL = 'ws://localhost:8866';
-
-export function mockHttp (requests) {
-  nock.cleanAll();
-  let scope = nock(TEST_HTTP_URL);
-
-  requests.forEach((request, index) => {
-    scope = scope
-      .post('/')
-      .reply(request.code || 200, (uri, body) => {
-        if (body.method !== request.method) {
-          return {
-            error: `Invalid method ${body.method}, expected ${request.method}`
-          };
-        }
-
-        scope.body = scope.body || {};
-        scope.body[request.method] = body;
-
-        return request.reply;
-      });
-  });
-
-  return scope;
-}
-
-export function mockWs (requests) {
-  let mockServer = new MockWsServer(TEST_WS_URL);
-  const scope = { requests: 0, body: {}, server: mockServer };
-
-  scope.isDone = () => scope.requests === requests.length;
-  scope.stop = () => {
-    if (mockServer) {
-      mockServer.stop();
-      mockServer = null;
-    }
-  };
-
-  mockServer.on('message', (_body) => {
-    const body = JSON.parse(_body);
-    const request = requests[scope.requests];
-    const reply = request.reply;
-    const response = reply.error
-      ? { id: body.id, error: { code: reply.error.code, message: reply.error.message } }
-      : { id: body.id, result: reply };
-
-    scope.body[request.method] = body;
-    scope.requests++;
-
-    mockServer.send(JSON.stringify(response));
-
-    if (request.method.match('subscribe') && request.subscription) {
-      mockServer.send(JSON.stringify(request.subscription));
-    }
-  });
-
-  return scope;
-}
-
-export function endpointTest (instance, moduleId, name) {
-  describe(name, () => {
-    it(`has the ${moduleId}.${name} endpoint`, () => {
-      expect(isFunction(instance[moduleId][name])).to.be.ok;
-    });
-
-    it(`maps to ${moduleId}_${name} via RPC`, () => {
-      const scope = mockHttp([{ method: `${moduleId}_${name}`, reply: {} }]);
-
-      return instance[moduleId][name]()
-        .then(() => {
-          expect(scope.isDone()).to.be.true;
-        })
-        .catch(() => {
-          nock.cleanAll();
-        });
-    });
-  });
-}
diff --git a/js/test/npmJsonRpc.js b/js/test/npmJsonRpc.js
deleted file mode 100644
index db97d5d8d202409de1e7e3e5ba20ebd5e2bc93fd..0000000000000000000000000000000000000000
--- a/js/test/npmJsonRpc.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-try {
-  var JsonRpc = require('../.npmjs/jsonrpc/library.js').default;
-
-  if (typeof JsonRpc !== 'object') {
-    throw new Error('JsonRpc');
-  }
-
-  console.log(JsonRpc);
-  process.exit(0);
-} catch (e) {
-  console.error('An error occured:', e.toString().split('\n')[0]);
-  process.exit(1);
-}
diff --git a/js/test/npmParity.js b/js/test/npmParity.js
deleted file mode 100644
index 9ff3a74e29e6b9604e1cd72ab6fc9dae90941bba..0000000000000000000000000000000000000000
--- a/js/test/npmParity.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-try {
-  var Api = require('../.npmjs/parity/library.js').Api;
-  var Abi = require('../.npmjs/parity/library.js').Abi;
-
-  if (typeof Api !== 'function') {
-    throw new Error('No Api');
-  }
-
-  if (typeof Abi !== 'function') {
-    throw new Error('No Abi');
-  }
-
-  var transport = new Api.Transport.Http('http://localhost:8545');
-  var api = new Api(transport);
-
-  api.eth
-    .blockNumber()
-    .then((block) => {
-      console.log('library working fine', '(block #' + block.toFormat() + ')');
-      process.exit(0);
-    })
-    .catch(() => {
-      console.log('library working fine (disconnected)');
-      process.exit(0);
-    });
-} catch (e) {
-  console.error('An error occured:', e.toString().split('\n')[0]);
-  process.exit(1);
-}
diff --git a/js/test/types.js b/js/test/types.js
deleted file mode 100644
index ced405147fc518a61cbbe7e537ad83660ddbee36..0000000000000000000000000000000000000000
--- a/js/test/types.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-import { isInstanceOf } from '../src/api/util/types';
-
-export { isFunction, isInstanceOf } from '../src/api/util/types';
-export { isAddress } from '../src/abi/util/address';
-
-const ZEROS = '000000000000000000000000000000000000000000000000000000000000';
-
-export function isBigNumber (test) {
-  return isInstanceOf(test, BigNumber);
-}
-
-export function isBoolean (test) {
-  return Object.prototype.toString.call(test) === '[object Boolean]';
-}
-
-export function isHexNumber (_test) {
-  if (_test.substr(0, 2) !== '0x') {
-    return false;
-  }
-
-  const test = _test.substr(2);
-  const hex = `${ZEROS}${(new BigNumber(_test, 16)).toString(16)}`.slice(-1 * test.length);
-
-  return hex === test;
-}
diff --git a/js/wasm/README.md b/js/wasm/README.md
deleted file mode 100644
index fef60d86d8c2e147867e4418399000800c0f4ada..0000000000000000000000000000000000000000
--- a/js/wasm/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# WASM modules
-
-- `ethkey` -> `/js/src/api/local/ethkey/ethkey.wasm`
diff --git a/js/wasm/ethkey/Cargo.toml b/js/wasm/ethkey/Cargo.toml
deleted file mode 100644
index 8eb9159e9a0e4d9a56b6274ec00485986eecee0e..0000000000000000000000000000000000000000
--- a/js/wasm/ethkey/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-description = "Parity ethkey WASM module."
-name = "parity-ethkey-wasm"
-version = "1.8.0"
-license = "GPL-3.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[workspace]
-members = []
-
-[dependencies]
-tiny-keccak = "1.3"
-tiny-secp256k1 = "0.1"
-libc = { version = "0.2.14", default-features = false }
-
-[profile.release]
-panic = "abort"
diff --git a/js/wasm/ethkey/base64ify.js b/js/wasm/ethkey/base64ify.js
deleted file mode 100644
index 346fe91e5aad3ad3556a7754a0cab2c83fdfa53f..0000000000000000000000000000000000000000
--- a/js/wasm/ethkey/base64ify.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const fs = require('fs');
-
-const file = fs.readFileSync('./ethkey.opt.wasm', { encoding: 'base64' });
-
-fs.writeFileSync('../../src/api/local/ethkey/ethkey.wasm.js', `module.exports = new Buffer('${file}', 'base64');\n`);
diff --git a/js/wasm/ethkey/build.sh b/js/wasm/ethkey/build.sh
deleted file mode 100755
index c6a7a0909d8130a5e58bc0eb1bf21ba29c2dbbd2..0000000000000000000000000000000000000000
--- a/js/wasm/ethkey/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Remove previous build to avoid name conflicts
-rm -rf target/wasm32-unknown-emscripten/*
-
-# Build using nightly rustc + emscripten
-rustup run nightly cargo build --release --target=wasm32-unknown-emscripten
-
-# Copy final WASM file over
-cp ./target/wasm32-unknown-emscripten/release/deps/parity_ethkey_wasm-*.wasm ./ethkey.wasm
-
-# Create a Base64-encoded JS version of the wasm file for easy inclusion in Webpack
-node base64ify
-
-# Copy Base64-encoded JS version to src
-cp ./ethkey.wasm.js ../../src/api/local/ethkey/ethkey.wasm.js
-
-# rm -f ./ethkey.wasm ./ethkey.opt.wasm ./ethkey.wasm.js
diff --git a/js/wasm/ethkey/ethkey.opt.wasm b/js/wasm/ethkey/ethkey.opt.wasm
deleted file mode 100644
index 1cbbd4a65057007d6985a68c642482d766c96089..0000000000000000000000000000000000000000
Binary files a/js/wasm/ethkey/ethkey.opt.wasm and /dev/null differ
diff --git a/js/wasm/ethkey/ethkey.wasm b/js/wasm/ethkey/ethkey.wasm
deleted file mode 100644
index 80f8758d33ccb6e2a30d89a85e243b4922f623e1..0000000000000000000000000000000000000000
Binary files a/js/wasm/ethkey/ethkey.wasm and /dev/null differ
diff --git a/js/wasm/ethkey/src/main.rs b/js/wasm/ethkey/src/main.rs
deleted file mode 100644
index 01ecd0b401834ed171c69f84eff46f6180cfd0be..0000000000000000000000000000000000000000
--- a/js/wasm/ethkey/src/main.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![feature(lang_items, core_intrinsics)]
-#![feature(start)]
-#![feature(link_args)]
-#![no_std]
-use core::intrinsics;
-
-// Pull in the system libc library for what crt0.o likely requires.
-extern crate libc;
-extern crate tiny_keccak;
-extern crate tiny_secp256k1;
-
-use tiny_secp256k1::{is_valid_secret, create_public_key, ECPointG};
-
-// #[link_args = "-s EXPORTED_FUNCTIONS=['_input_ptr','_secret_ptr','_public_ptr','_address_ptr','_ecpointg','_verify_secret','_brain']"]
-// extern {}
-
-use tiny_keccak::Keccak;
-
-pub trait Keccak256<T: Sized> {
-    fn keccak256(&self) -> T;
-}
-
-impl Keccak256<[u8; 32]> for [u8] {
-    #[inline]
-    fn keccak256(&self) -> [u8; 32] {
-        let mut keccak = Keccak::new_keccak256();
-        let mut result = [0u8; 32];
-        keccak.update(self);
-        keccak.finalize(&mut result);
-        result
-    }
-}
-
-static mut INPUT: [u8; 1024] = [0; 1024];
-static mut SECRET: [u8; 32] = [0; 32];
-static mut PUBLIC: [u8; 64] = [0; 64];
-static mut ADDRESS: [u8; 20] = [0; 20];
-static mut G: Option<ECPointG> = None;
-
-#[no_mangle]
-pub extern "C" fn ecpointg() -> &'static ECPointG {
-    let g = unsafe { &G };
-
-    if let Some(ref g) = *g {
-        return g;
-    }
-
-    unsafe { G = Some(ECPointG::new()) };
-    g.as_ref().expect("value set above; qed")
-}
-
-#[no_mangle]
-pub extern "C" fn input_ptr() -> *const u8 {
-    unsafe { INPUT.as_ptr() }
-}
-
-#[no_mangle]
-pub extern "C" fn secret_ptr() -> *const u8 {
-    unsafe { SECRET.as_ptr() }
-}
-
-#[no_mangle]
-pub extern "C" fn public_ptr() -> *const u8 {
-    unsafe { PUBLIC.as_ptr() }
-}
-
-#[no_mangle]
-pub extern "C" fn address_ptr() -> *const u8 {
-    unsafe { ADDRESS.as_ptr() }
-}
-
-#[no_mangle]
-pub extern "C" fn verify_secret() -> bool {
-    is_valid_secret(unsafe { &SECRET })
-}
-
-#[no_mangle]
-pub extern "C" fn brain(input_len: usize) {
-    let data = unsafe { &INPUT[..input_len] };
-    let mut secret_out = unsafe { &mut SECRET };
-    let mut public_out = unsafe { &mut PUBLIC };
-    let mut address_out = unsafe { &mut ADDRESS };
-
-    let g = ecpointg();
-    let mut secret = data.keccak256();
-
-    let mut i = 0;
-    loop {
-        secret = secret.keccak256();
-
-        match i > 16384 {
-            false => i += 1,
-            true => {
-                if let Some(public) = create_public_key(g, &secret) {
-                    let public = &public[1..];
-                    let hash = public.keccak256();
-
-                    address_out.copy_from_slice(&hash[12..]);
-
-                    if address_out[0] == 0 {
-                        public_out.copy_from_slice(&public);
-                        secret_out.copy_from_slice(&secret);
-                        return;
-                    }
-                }
-            }
-        }
-    }
-}
-
-// Entry point for this program.
-#[start]
-fn start(_argc: isize, _argv: *const *const u8) -> isize {
-    0
-}
-
-// These functions are used by the compiler, but not
-// for a bare-bones hello world. These are normally
-// provided by libstd.
-#[lang = "eh_personality"]
-#[no_mangle]
-pub extern fn rust_eh_personality() {
-}
-
-// This function may be needed based on the compilation target.
-#[lang = "eh_unwind_resume"]
-#[no_mangle]
-pub extern fn rust_eh_unwind_resume() {
-}
-
-#[lang = "panic_fmt"]
-#[no_mangle]
-pub extern fn rust_begin_panic(_msg: core::fmt::Arguments,
-                               _file: &'static str,
-                               _line: u32) -> ! {
-    unsafe { intrinsics::abort() }
-}
diff --git a/js/webpack/app.js b/js/webpack/app.js
deleted file mode 100644
index b076e66e2502ba0636c5e65621f973ef0418dfb5..0000000000000000000000000000000000000000
--- a/js/webpack/app.js
+++ /dev/null
@@ -1,264 +0,0 @@
-
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const webpack = require('webpack');
-const path = require('path');
-const ReactIntlAggregatePlugin = require('react-intl-aggregate-webpack-plugin');
-const WebpackErrorNotificationPlugin = require('webpack-error-notification');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const ServiceWorkerWebpackPlugin = require('serviceworker-webpack-plugin');
-const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin');
-
-const Shared = require('./shared');
-const DAPPS = require('../src/views/Dapps/builtin.json');
-
-const FAVICON = path.resolve(__dirname, '../assets/images/parity-logo-black-no-text.png');
-
-const DEST = process.env.BUILD_DEST || '.build';
-const ENV = process.env.NODE_ENV || 'development';
-const EMBED = process.env.EMBED;
-
-const isProd = ENV === 'production';
-const isEmbed = EMBED === '1' || EMBED === 'true';
-const isAnalize = process.env.WPANALIZE === '1';
-
-const entry = isEmbed
-  ? {
-    embed: './embed.js'
-  }
-  : Object.assign({}, Shared.dappsEntry, {
-    index: './index.js'
-  });
-
-module.exports = {
-  cache: !isProd,
-  devtool: isProd ? '#hidden-source-map' : '#source-map',
-
-  context: path.join(__dirname, '../src'),
-  entry: entry,
-  output: {
-    // publicPath: '/',
-    path: path.join(__dirname, '../', DEST),
-    filename: '[name].[hash:10].js'
-  },
-
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        exclude: /(node_modules)/,
-        use: [ 'happypack/loader?id=babel-js' ]
-      },
-      {
-        test: /\.js$/,
-        include: /node_modules\/(material-chip-input|ethereumjs-tx|@parity\/wordlist)/,
-        use: 'babel-loader'
-      },
-      {
-        test: /\.json$/,
-        use: [ 'json-loader' ]
-      },
-      {
-        test: /\.ejs$/,
-        use: [ 'ejs-loader' ]
-      },
-      {
-        test: /\.html$/,
-        use: [
-          'file-loader?name=[name].[ext]!extract-loader',
-          {
-            loader: 'html-loader',
-            options: {
-              root: path.resolve(__dirname, '../assets/images'),
-              attrs: ['img:src', 'link:href']
-            }
-          }
-        ]
-      },
-      {
-        test: /\.md$/,
-        use: [
-          {
-            loader: 'html-loader',
-            options: {}
-          },
-          {
-            loader: 'markdown-loader',
-            options: {}
-          }
-        ]
-      },
-      {
-        test: /\.css$/,
-        include: [ /src/ ],
-        // exclude: [ /src\/dapps/ ],
-        loader: (isProd && !isEmbed)
-          ? ExtractTextPlugin.extract([
-            // 'style-loader',
-            'css-loader?modules&sourceMap&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]',
-            'postcss-loader'
-          ])
-          : undefined,
-        use: (isProd && !isEmbed)
-          ? undefined
-          : [ 'happypack/loader?id=css' ]
-      },
-
-      {
-        test: /\.css$/,
-        exclude: [ /src/ ],
-        use: [ 'style-loader', 'css-loader' ]
-      },
-      {
-        test: /\.(png|jpg)$/,
-        use: [ 'file-loader?&name=assets/[name].[hash:10].[ext]' ]
-      },
-      {
-        test: /\.(woff(2)|ttf|eot|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        use: [ 'file-loader?name=fonts/[name][hash:10].[ext]' ]
-      },
-      {
-        test: /parity-logo-white-no-text\.svg/,
-        use: [ 'url-loader' ]
-      },
-      {
-        test: /\.svg(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        exclude: [ /parity-logo-white-no-text\.svg/ ],
-        use: [ 'file-loader?name=assets/[name].[hash:10].[ext]' ]
-      }
-    ],
-    noParse: [
-      /node_modules\/sinon/
-    ]
-  },
-
-  resolve: {
-    alias: {
-      '~/api/local': path.resolve(__dirname, '../src/api/local/localAccountsMiddleware.js'),
-      '~': path.resolve(__dirname, '../src'),
-      'keythereum': path.resolve(__dirname, '../node_modules/keythereum/dist/keythereum')
-    },
-    modules: [
-      path.join(__dirname, '../node_modules')
-    ],
-    extensions: ['.json', '.js', '.jsx'],
-    unsafeCache: true
-  },
-
-  node: {
-    fs: 'empty'
-  },
-
-  plugins: (function () {
-    const DappsHTMLInjection = DAPPS.filter((dapp) => !dapp.skipBuild).map((dapp) => {
-      return new HtmlWebpackPlugin({
-        title: dapp.name,
-        filename: dapp.url + '.html',
-        template: './dapps/index.ejs',
-        favicon: FAVICON,
-        secure: dapp.secure,
-        chunks: [ isProd ? null : 'commons', dapp.url ]
-      });
-    });
-
-    let plugins = Shared.getPlugins().concat(
-      new WebpackErrorNotificationPlugin()
-    );
-
-    if (!isEmbed) {
-      plugins = [].concat(
-        plugins,
-
-        new HtmlWebpackPlugin({
-          title: 'Parity',
-          filename: 'index.html',
-          template: './index.ejs',
-          favicon: FAVICON,
-          chunks: [
-            isProd ? null : 'commons',
-            'index'
-          ]
-        }),
-
-        new ServiceWorkerWebpackPlugin({
-          entry: path.join(__dirname, '../src/serviceWorker.js')
-        }),
-
-        DappsHTMLInjection,
-
-        new webpack.DllReferencePlugin({
-          context: '.',
-          manifest: require(`../${DEST}/vendor-manifest.json`)
-        }),
-
-        new ScriptExtHtmlWebpackPlugin({
-          sync: [ 'commons', 'vendor.js' ],
-          defaultAttribute: 'defer'
-        }),
-
-        new CopyWebpackPlugin([
-          { from: './error_pages.css', to: 'styles.css' },
-          { from: 'dapps/static' }
-        ], {})
-      );
-    }
-
-    if (isEmbed) {
-      plugins.push(
-        new HtmlWebpackPlugin({
-          title: 'Parity Bar',
-          filename: 'embed.html',
-          template: './index.ejs',
-          favicon: FAVICON,
-          chunks: [
-            isProd ? null : 'commons',
-            'embed'
-          ]
-        })
-      );
-    }
-
-    if (!isAnalize && !isProd) {
-      const DEST_I18N = path.join(__dirname, '..', DEST, 'i18n');
-
-      plugins.push(
-        new ReactIntlAggregatePlugin({
-          messagesPattern: DEST_I18N + '/src/**/*.json',
-          aggregateOutputDir: DEST_I18N + '/i18n/',
-          aggregateFilename: 'en'
-        }),
-
-        new webpack.optimize.CommonsChunkPlugin({
-          filename: 'commons.[hash:10].js',
-          name: 'commons',
-          minChunks: 2
-        })
-      );
-    }
-
-    if (isProd) {
-      plugins.push(new ExtractTextPlugin({
-        filename: 'styles/[name].[hash:10].css',
-        allChunks: true
-      }));
-    }
-
-    return plugins;
-  }())
-};
diff --git a/js/webpack/build.server.js b/js/webpack/build.server.js
deleted file mode 100644
index 486209ccbd0620ccf72ab3867c8b6ed005323681..0000000000000000000000000000000000000000
--- a/js/webpack/build.server.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-// test only
-/**
- * Run `DAPPS_URL="/" PARITY_URL="127.0.0.1:8546" NODE_ENV="production" npm run build`
- * to build the project ; use this server to test that the minifed
- * version is working (this is a simple proxy server)
- */
-
-var express = require('express');
-
-var Shared = require('./shared');
-
-var app = express();
-
-Shared.addProxies(app);
-
-app.use(express.static('.build'));
-
-var server = app.listen(process.env.PORT || 3000, function () {
-  console.log('Listening on port', server.address().port);
-});
diff --git a/js/webpack/dev.server.js b/js/webpack/dev.server.js
deleted file mode 100644
index 038945014641a7133e9e7a84d233e53ee2a052cd..0000000000000000000000000000000000000000
--- a/js/webpack/dev.server.js
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const webpack = require('webpack');
-const WebpackStats = require('webpack/lib/Stats');
-const webpackDevMiddleware = require('webpack-dev-middleware');
-const webpackHotMiddleware = require('webpack-hot-middleware');
-
-const http = require('http');
-const express = require('express');
-const ProgressBar = require('progress');
-
-const webpackConfig = require('./app');
-const Shared = require('./shared');
-
-let progressBar = { update: () => {} };
-
-/**
- * Add webpack hot middleware to each entry in the config
- * and HMR to the plugins
- */
-(function updateWebpackConfig () {
-  webpackConfig.performance = { hints: false };
-
-  Object.keys(webpackConfig.entry).forEach((key) => {
-    const entry = webpackConfig.entry[key];
-
-    webpackConfig.entry[key] = [].concat(
-      'react-hot-loader/patch',
-      'webpack-hot-middleware/client?reload=true',
-      entry
-    );
-  });
-
-  webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
-  webpackConfig.plugins.push(new webpack.NamedModulesPlugin());
-  webpackConfig.plugins.push(new webpack.NoEmitOnErrorsPlugin());
-
-  webpackConfig.plugins.push(new webpack.ProgressPlugin(
-    (percentage) => progressBar.update(percentage)
-  ));
-})();
-
-const app = express();
-const compiler = webpack(webpackConfig);
-
-app.use(webpackHotMiddleware(compiler, {
-  log: console.log
-}));
-
-app.use(webpackDevMiddleware(compiler, {
-  noInfo: true,
-  quiet: false,
-  progress: true,
-  publicPath: webpackConfig.output.publicPath,
-  stats: {
-    colors: true
-  },
-  reporter: function (data) {
-    // @see https://github.com/webpack/webpack/blob/324d309107f00cfc38ec727521563d309339b2ec/lib/Stats.js#L790
-    // Accepted values: none, errors-only, minimal, normal, verbose
-    const options = WebpackStats.presetToOptions('minimal');
-    options.timings = true;
-
-    const output = data.stats.toString(options);
-
-    process.stdout.write('\n');
-    process.stdout.write(output);
-    process.stdout.write('\n\n');
-  }
-}));
-
-// Add the dev proxies in the express App
-Shared.addProxies(app);
-
-app.use(express.static(webpackConfig.output.path));
-
-const server = http.createServer(app);
-server.listen(process.env.PORT || 3000, function () {
-  console.log('Listening on port', server.address().port);
-  progressBar = new ProgressBar('[:bar] :percent :etas', { total: 50 });
-});
diff --git a/js/webpack/embed.js b/js/webpack/embed.js
deleted file mode 100644
index fd94a5b7c0d13086e02079bc1117cf2262810e16..0000000000000000000000000000000000000000
--- a/js/webpack/embed.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const webpack = require('webpack');
-const WebpackStats = require('webpack/lib/Stats');
-const path = require('path');
-const fs = require('fs');
-
-const WebpackConfig = require('./app');
-
-const compiler = webpack(WebpackConfig);
-
-compiler.run(function handler (err, stats) {
-  if (err) {
-    return console.error(err);
-  }
-
-  // @see https://github.com/webpack/webpack/blob/324d309107f00cfc38ec727521563d309339b2ec/lib/Stats.js#L790
-  // Accepted values: none, errors-only, minimal, normal, verbose
-  const options = WebpackStats.presetToOptions('normal');
-
-  options.timings = true;
-
-  const output = stats.toString(options);
-  const assets = Object.keys(stats.compilation.assets);
-
-  const embedPath = path.resolve(WebpackConfig.output.path, './embed.json');
-  const embedData = { assets: assets };
-
-  fs.writeFileSync(embedPath, JSON.stringify(embedData, null, 2));
-
-  process.stdout.write('\n');
-  process.stdout.write(output);
-  process.stdout.write('\n\n');
-});
-
diff --git a/js/webpack/libraries.js b/js/webpack/libraries.js
deleted file mode 100644
index 11623e9478f4791eed49d3c947c9ded074947d2f..0000000000000000000000000000000000000000
--- a/js/webpack/libraries.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-// Run with `webpack --config webpack.libraries.js`
-
-const path = require('path');
-
-const Shared = require('./shared');
-
-const DEST = process.env.BUILD_DEST || '.build';
-const ENV = process.env.NODE_ENV || 'development';
-const isProd = ENV === 'production';
-
-module.exports = {
-  context: path.join(__dirname, '../src'),
-  entry: {
-    // library
-    'inject': ['./inject.js'],
-    'web3': ['./web3.js'],
-    'parity': ['./parity.js']
-  },
-  output: {
-    path: path.join(__dirname, '../', DEST),
-    filename: '[name].js',
-    library: '[name].js',
-    libraryTarget: 'umd'
-  },
-
-  resolve: {
-    alias: {
-      '~': path.resolve(__dirname, '../src')
-    }
-  },
-
-  node: {
-    fs: 'empty'
-  },
-
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        exclude: /node_modules/,
-        // use: [ 'happypack/loader?id=js' ]
-        use: isProd ? ['babel-loader'] : [
-          // 'react-hot-loader',
-          'babel-loader?cacheDirectory=true'
-        ]
-      },
-      {
-        test: /\.js$/,
-        include: /node_modules\/(ethereumjs-tx|@parity\/wordlist)/,
-        use: 'babel-loader'
-      },
-      {
-        test: /\.json$/,
-        use: [ 'json-loader' ]
-      },
-      {
-        test: /\.html$/,
-        use: [ 'file-loader?name=[name].[ext]' ]
-      }
-    ]
-  },
-  plugins: Shared.getPlugins()
-};
diff --git a/js/webpack/npm.js b/js/webpack/npm.js
deleted file mode 100644
index 58e78e3ceddd02f3d5d8e78a1f952dc618473067..0000000000000000000000000000000000000000
--- a/js/webpack/npm.js
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const path = require('path');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-const packageJson = require('../package.json');
-
-const Shared = require('./shared');
-
-const ENV = process.env.NODE_ENV || 'development';
-const isProd = ENV === 'production';
-
-const LIBRARY = process.env.LIBRARY;
-
-if (!LIBRARY) {
-  process.exit(-1);
-}
-
-const SRC = LIBRARY.toLowerCase();
-const OUTPUT_PATH = path.join(__dirname, '../.npmjs', SRC);
-
-const TEST_CONTEXT = SRC === 'parity'
-  ? '../npm/parity/test/'
-  : `../src/3rdparty/${SRC}/`;
-
-console.log(`Building ${LIBRARY} from library.${SRC}.js to .npmjs/${SRC}`);
-
-module.exports = {
-  context: path.join(__dirname, '../src'),
-  target: 'node',
-  entry: `library.${SRC}.js`,
-  output: {
-    path: OUTPUT_PATH,
-    filename: 'library.js',
-    library: LIBRARY,
-    libraryTarget: 'umd',
-    umdNamedDefine: true
-  },
-  externals: {
-    'node-fetch': 'node-fetch'
-  },
-  module: {
-    rules: [
-      {
-        test: /(\.jsx|\.js)$/,
-        // use: [ 'happypack/loader?id=js' ],
-        use: isProd ? ['babel-loader'] : [
-          // 'react-hot-loader',
-          'babel-loader?cacheDirectory=true'
-        ],
-        exclude: /node_modules/
-      },
-      {
-        test: /\.js$/,
-        include: /node_modules\/(ethereumjs-tx|@parity\/wordlist)/,
-        use: 'babel-loader'
-      }
-    ]
-  },
-  node: {
-    fs: 'empty'
-  },
-  resolve: {
-    alias: {
-      '~': path.resolve(__dirname, '../src')
-    },
-    modules: [
-      path.resolve('./src'),
-      path.join(__dirname, '../node_modules')
-    ],
-    extensions: ['.json', '.js', '.jsx']
-  },
-
-  plugins: Shared.getPlugins().concat([
-    new CopyWebpackPlugin([
-      {
-        from: `../npm/${SRC}/package.json`,
-        to: 'package.json',
-        transform: function (content, path) {
-          const json = JSON.parse(content.toString());
-
-          json.devDependencies.chai = packageJson.devDependencies.chai;
-          json.devDependencies.mocha = packageJson.devDependencies.mocha;
-          json.devDependencies.nock = packageJson.devDependencies.nock;
-          json.scripts.test = 'mocha \'test/*.spec.js\'';
-          json.version = packageJson.version;
-
-          return new Buffer(JSON.stringify(json, null, '  '), 'utf-8');
-        }
-      },
-      {
-        from: '../LICENSE'
-      },
-
-      // Copy the base test config
-      {
-        from: '../npm/test',
-        to: 'test'
-      },
-
-      // Copy the actual tests
-      {
-        context: TEST_CONTEXT,
-        from: '**/*.spec.js',
-        to: 'test',
-        transform: function (content, path) {
-          let output = content.toString();
-
-          // Don't skip tests
-          output = output.replace(/describe\.skip/, 'describe');
-
-          // Require parent library
-          output = output.replace('require(\'./\')', 'require(\'../\')');
-
-          return new Buffer(output, 'utf-8');
-        }
-      },
-      {
-        from: `../npm/${SRC}/README.md`,
-        to: 'README.md'
-      }
-    ], { copyUnmodified: true })
-  ])
-};
diff --git a/js/webpack/shared.js b/js/webpack/shared.js
deleted file mode 100644
index ded064642e12f3b9e114cd1a842b7f41d337a243..0000000000000000000000000000000000000000
--- a/js/webpack/shared.js
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const webpack = require('webpack');
-const path = require('path');
-const fs = require('fs');
-const HappyPack = require('happypack');
-
-const postcssImport = require('postcss-import');
-const postcssNested = require('postcss-nested');
-const postcssVars = require('postcss-simple-vars');
-const rucksack = require('rucksack-css');
-const CircularDependencyPlugin = require('circular-dependency-plugin');
-const ProgressBarPlugin = require('progress-bar-webpack-plugin');
-
-const EMBED = process.env.EMBED;
-const ENV = process.env.NODE_ENV || 'development';
-const isProd = ENV === 'production';
-const isAnalize = process.env.WPANALIZE === '1';
-
-function getBabelrc () {
-  const babelrc = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../.babelrc')));
-
-  const es2015Index = babelrc.presets.findIndex((p) => p === 'es2015');
-
-  // [ "es2015", { "modules": false } ]
-  babelrc.presets[es2015Index] = [ 'es2015', { modules: false } ];
-  babelrc['babelrc'] = false;
-
-  const BABEL_PRESET_ENV = process.env.BABEL_PRESET_ENV;
-  const npmStart = process.env.npm_lifecycle_event === 'start';
-  const npmStartApp = process.env.npm_lifecycle_event === 'start:app';
-
-  if (BABEL_PRESET_ENV && (npmStart || npmStartApp)) {
-    console.log('using babel-preset-env');
-
-    babelrc.presets = [
-      // 'es2017',
-      'stage-0', 'react',
-      [
-        'env',
-        {
-          targets: { browsers: ['last 2 Chrome versions'] },
-          modules: false,
-          loose: true,
-          useBuiltIns: true
-        }
-      ]
-    ];
-  }
-
-  return babelrc;
-}
-
-function getPlugins (_isProd = isProd) {
-  const postcss = [
-    postcssImport({
-      addDependencyTo: webpack
-    }),
-    postcssNested({}),
-    postcssVars({
-      unknown: function (node, name, result) {
-        node.warn(result, `Unknown variable ${name}`);
-      }
-    }),
-    rucksack({
-      autoprefixer: true
-    })
-  ];
-
-  const plugins = (isAnalize
-    ? []
-    : [
-      new ProgressBarPlugin({
-        format: '[:msg] [:bar] ' + ':percent' + ' (:elapsed seconds)'
-      })
-    ]).concat([
-      new HappyPack({
-        id: 'css',
-        threads: 4,
-        loaders: [
-          'style-loader',
-          'css-loader?modules&sourceMap&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]',
-          'postcss-loader'
-        ],
-        verbose: !isAnalize
-      }),
-
-      new HappyPack({
-        id: 'babel-js',
-        threads: 4,
-        loaders: [ isProd ? 'babel-loader' : 'babel-loader?cacheDirectory=true' ],
-        verbose: !isAnalize
-      }),
-
-      new webpack.DefinePlugin({
-        'process.env': {
-          EMBED: JSON.stringify(EMBED),
-          NODE_ENV: JSON.stringify(ENV),
-          RPC_ADDRESS: JSON.stringify(process.env.RPC_ADDRESS),
-          PARITY_URL: JSON.stringify(process.env.PARITY_URL),
-          DAPPS_URL: JSON.stringify(process.env.DAPPS_URL),
-          LOGGING: JSON.stringify(!isProd)
-        }
-      }),
-
-      new webpack.LoaderOptionsPlugin({
-        minimize: isProd,
-        debug: !isProd,
-        options: {
-          context: path.join(__dirname, '../src'),
-          postcss: postcss,
-          babel: getBabelrc()
-        }
-      }),
-
-      new webpack.optimize.OccurrenceOrderPlugin(!_isProd),
-
-      new CircularDependencyPlugin({
-        exclude: /node_modules/,
-        failOnError: true
-      })
-    ]);
-
-  if (_isProd) {
-    plugins.push(new webpack.optimize.UglifyJsPlugin({
-      screwIe8: true,
-      compress: {
-        warnings: false
-      },
-      output: {
-        comments: false
-      }
-    }));
-  }
-
-  return plugins;
-}
-
-function getDappsEntry () {
-  const DAPPS = require('../src/views/Dapps/builtin.json');
-
-  return DAPPS.filter((dapp) => !dapp.skipBuild).reduce((_entry, dapp) => {
-    _entry[dapp.url] = './dapps/' + dapp.url + '.js';
-    return _entry;
-  }, {});
-}
-
-function addProxies (app) {
-  const proxy = require('http-proxy-middleware');
-
-  app.use('/api', proxy({
-    target: 'http://127.0.0.1:8180',
-    changeOrigin: true,
-    autoRewrite: true
-  }));
-
-  app.use('/app', proxy({
-    target: 'http://127.0.0.1:8545',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/app': ''
-    }
-  }));
-
-  app.use('/parity-utils', proxy({
-    target: 'http://127.0.0.1:3000',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/parity-utils': ''
-    }
-  }));
-
-  app.use('/rpc', proxy({
-    target: 'http://127.0.0.1:8545',
-    changeOrigin: true
-  }));
-}
-
-module.exports = {
-  getBabelrc: getBabelrc,
-  getPlugins: getPlugins,
-  dappsEntry: getDappsEntry(),
-  addProxies: addProxies
-};
diff --git a/js/webpack/test.js b/js/webpack/test.js
deleted file mode 100644
index 5041e8595e610c95e9ec3ca7e9fcde6cd54fd5c4..0000000000000000000000000000000000000000
--- a/js/webpack/test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const path = require('path');
-
-module.exports = {
-  context: path.join(__dirname, '../src'),
-  resolve: {
-    alias: {
-      '~': path.resolve(__dirname, '../src')
-    }
-  }
-};
diff --git a/js/webpack/vendor.js b/js/webpack/vendor.js
deleted file mode 100644
index 3270c319ceb41ac9d6dffee7d3e5ee72203233b6..0000000000000000000000000000000000000000
--- a/js/webpack/vendor.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const webpack = require('webpack');
-const path = require('path');
-
-const Shared = require('./shared');
-
-const ENV = process.env.NODE_ENV || 'development';
-const DEST = process.env.BUILD_DEST || '.build';
-
-let modules = [
-  'bignumber.js',
-  'blockies',
-  'brace',
-  'browserify-aes',
-  'ethereumjs-tx',
-  'lodash',
-  'material-ui',
-  'material-ui-chip-input',
-  'mobx',
-  'mobx-react',
-  'moment',
-  'phoneformat.js',
-  'react',
-  'react-dom',
-  'react-redux',
-  'react-router',
-  'react-router-redux',
-  'recharts',
-  'redux',
-  'redux-thunk',
-  'scryptsy',
-  'zxcvbn'
-];
-
-module.exports = {
-  entry: {
-    vendor: modules
-  },
-  module: {
-    rules: [
-      {
-        test: /\.json$/,
-        use: [ 'json-loader' ]
-      },
-      {
-        test: /\.js$/,
-        include: /(ethereumjs-tx)/,
-        use: [ 'babel-loader' ]
-      }
-    ]
-  },
-
-  resolve: {
-    alias: {
-      '~': path.resolve(__dirname, '../src')
-    }
-  },
-
-  output: {
-    filename: '[name].js',
-    path: path.resolve(__dirname, '../', `${DEST}/`),
-    library: '[name]_lib'
-  },
-  plugins: Shared.getPlugins().concat([
-    new webpack.DllPlugin({
-      name: '[name]_lib',
-      path: path.resolve(__dirname, '../', `${DEST}/[name]-manifest.json`)
-    }),
-
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: JSON.stringify(ENV)
-      }
-    })
-  ])
-};
diff --git a/js/yarn.lock b/js/yarn.lock
deleted file mode 100644
index 6a817fe5ebd57dbd6b330c890249f6ae445256d0..0000000000000000000000000000000000000000
--- a/js/yarn.lock
+++ /dev/null
@@ -1,8651 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@parity/wordlist@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@parity/wordlist/-/wordlist-1.0.1.tgz#c27e40e1ab3638a09ed53b4a2e81d531b5eb5a31"
-
-JSONStream@^0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd"
-  dependencies:
-    jsonparse "0.0.5"
-    through ">=2.2.7 <3"
-
-abab@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
-
-abbrev@1, abbrev@1.0.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
-
-accepts@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
-  dependencies:
-    mime-types "~2.1.11"
-    negotiator "0.6.1"
-
-acorn-dynamic-import@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
-  dependencies:
-    acorn "^4.0.3"
-
-acorn-globals@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
-  dependencies:
-    acorn "^4.0.4"
-
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
-  dependencies:
-    acorn "^3.0.4"
-
-acorn@^3.0.4:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-
-acorn@^4.0.3, acorn@^4.0.4:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
-
-acorn@^5.0.1:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
-
-ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
-
-ajv@^4.7.0, ajv@^4.9.1:
-  version "4.11.5"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
-align-text@^0.1.1, align-text@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
-  dependencies:
-    kind-of "^3.0.2"
-    longest "^1.0.1"
-    repeat-string "^1.5.2"
-
-alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-
-ansi-escapes@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-
-ansi-html@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-
-ansi@^0.3.0, ansi@~0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
-
-any-promise@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
-
-anymatch@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
-  dependencies:
-    arrify "^1.0.0"
-    micromatch "^2.1.5"
-
-append-transform@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
-  dependencies:
-    default-require-extensions "^1.0.0"
-
-aproba@^1.0.3:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
-
-archive-type@^3.0.0, archive-type@^3.0.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-3.2.0.tgz#9cd9c006957ebe95fadad5bd6098942a813737f6"
-  dependencies:
-    file-type "^3.1.0"
-
-are-we-there-yet@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz#80e470e95a084794fe1899262c5667c6e88de1b3"
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.0 || ^1.1.13"
-
-argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  dependencies:
-    sprintf-js "~1.0.2"
-
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  dependencies:
-    arr-flatten "^1.0.1"
-
-arr-flatten@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-
-array-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
-
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.0, array-uniq@^1.0.1, array-uniq@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-
-array.prototype.find@^2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-
-asap@~2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
-
-asn1.js@^4.0.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-
-assert@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  dependencies:
-    util "0.10.3"
-
-assertion-error@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
-
-ast-types@0.9.6:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
-
-async-each-series@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-1.1.0.tgz#f42fd8155d38f21a5b8ea07c28e063ed1700b138"
-
-async-each@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-
-async@1.5.0, async@1.x, async@^1.4.0, async@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.0.tgz#2796642723573859565633fc6274444bee2f8ce3"
-
-async@^2.1.2, async@^2.1.4:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
-  dependencies:
-    lodash "^4.14.0"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-
-attr-accept@^1.0.3:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-1.1.0.tgz#b5cd35227f163935a8f1de10ed3eba16941f6be6"
-
-autoprefixer@^6.0.0, autoprefixer@^6.3.1:
-  version "6.7.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
-  dependencies:
-    browserslist "^1.7.6"
-    caniuse-db "^1.0.30000634"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^5.2.16"
-    postcss-value-parser "^3.2.3"
-
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-
-aws4@^1.2.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
-babel-cli@6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.23.0.tgz#52ff946a2b0f64645c35e7bd5eea267aa0948c0f"
-  dependencies:
-    babel-core "^6.23.0"
-    babel-polyfill "^6.23.0"
-    babel-register "^6.23.0"
-    babel-runtime "^6.22.0"
-    commander "^2.8.1"
-    convert-source-map "^1.1.0"
-    fs-readdir-recursive "^1.0.0"
-    glob "^7.0.0"
-    lodash "^4.2.0"
-    output-file-sync "^1.1.0"
-    path-is-absolute "^1.0.0"
-    slash "^1.0.0"
-    source-map "^0.5.0"
-    v8flags "^2.0.10"
-  optionalDependencies:
-    chokidar "^1.6.1"
-
-babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
-  dependencies:
-    chalk "^1.1.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
-babel-core@6.23.1, babel-core@^6.23.0:
-  version "6.23.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-generator "^6.23.0"
-    babel-helpers "^6.23.0"
-    babel-messages "^6.23.0"
-    babel-register "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.1"
-    babel-types "^6.23.0"
-    babylon "^6.11.0"
-    convert-source-map "^1.1.0"
-    debug "^2.1.1"
-    json5 "^0.5.0"
-    lodash "^4.2.0"
-    minimatch "^3.0.2"
-    path-is-absolute "^1.0.0"
-    private "^0.1.6"
-    slash "^1.0.0"
-    source-map "^0.5.0"
-
-babel-eslint@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.1.1.tgz#8a6a884f085aa7060af69cfc77341c2f99370fb2"
-  dependencies:
-    babel-code-frame "^6.16.0"
-    babel-traverse "^6.15.0"
-    babel-types "^6.15.0"
-    babylon "^6.13.0"
-    lodash.pickby "^4.6.0"
-
-babel-generator@^6.18.0, babel-generator@^6.23.0:
-  version "6.24.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56"
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.23.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-babel-helper-bindify-decorators@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.22.0.tgz#d7f5bc261275941ac62acfc4e20dacfb8a3fe952"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-helper-builder-binary-assignment-operator-visitor@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.22.0.tgz#29df56be144d81bdeac08262bfa41d2c5e91cdcd"
-  dependencies:
-    babel-helper-explode-assignable-expression "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-helper-builder-react-jsx@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.23.0.tgz#d53fc8c996e0bc56d0de0fc4cc55a7138395ea4b"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.23.0"
-    esutils "^2.0.0"
-    lodash "^4.2.0"
-
-babel-helper-call-delegate@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.22.0.tgz#119921b56120f17e9dae3f74b4f5cc7bcc1b37ef"
-  dependencies:
-    babel-helper-hoist-variables "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-helper-define-map@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.23.0.tgz#1444f960c9691d69a2ced6a205315f8fd00804e7"
-  dependencies:
-    babel-helper-function-name "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.23.0"
-    lodash "^4.2.0"
-
-babel-helper-explode-assignable-expression@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.22.0.tgz#c97bf76eed3e0bae4048121f2b9dae1a4e7d0478"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-helper-explode-class@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.22.0.tgz#646304924aa6388a516843ba7f1855ef8dfeb69b"
-  dependencies:
-    babel-helper-bindify-decorators "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-helper-function-name@^6.22.0, babel-helper-function-name@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.23.0.tgz#25742d67175c8903dbe4b6cb9d9e1fcb8dcf23a6"
-  dependencies:
-    babel-helper-get-function-arity "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
-
-babel-helper-get-function-arity@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz#0beb464ad69dc7347410ac6ade9f03a50634f5ce"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-helper-hoist-variables@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.22.0.tgz#3eacbf731d80705845dd2e9718f600cfb9b4ba72"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-helper-optimise-call-expression@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.23.0.tgz#f3ee7eed355b4282138b33d02b78369e470622f5"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.23.0"
-
-babel-helper-regex@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.22.0.tgz#79f532be1647b1f0ee3474b5f5c3da58001d247d"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-    lodash "^4.2.0"
-
-babel-helper-remap-async-to-generator@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.22.0.tgz#2186ae73278ed03b8b15ced089609da981053383"
-  dependencies:
-    babel-helper-function-name "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-helper-replace-supers@^6.22.0, babel-helper-replace-supers@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.23.0.tgz#eeaf8ad9b58ec4337ca94223bacdca1f8d9b4bfd"
-  dependencies:
-    babel-helper-optimise-call-expression "^6.23.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
-
-babel-helpers@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-
-babel-loader@6.3.2:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.3.2.tgz#18de4566385578c1b4f8ffe6cbc668f5e2a5ef03"
-  dependencies:
-    find-cache-dir "^0.1.1"
-    loader-utils "^0.2.16"
-    mkdirp "^0.5.1"
-    object-assign "^4.0.1"
-
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-check-es2015-constants@^6.22.0, babel-plugin-check-es2015-constants@^6.3.13:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-lodash@3.2.11:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.2.11.tgz#21c8fdec9fe1835efaa737873e3902bdd66d5701"
-  dependencies:
-    glob "^7.1.1"
-    lodash "^4.17.2"
-
-babel-plugin-react-intl@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-2.3.1.tgz#3d43912e824da005e08e8e8239d5ba784374bb00"
-  dependencies:
-    babel-runtime "^6.2.0"
-    intl-messageformat-parser "^1.2.0"
-    mkdirp "^0.5.1"
-
-babel-plugin-recharts@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-recharts/-/babel-plugin-recharts-1.1.0.tgz#812cc84b13eb58dd405b2c63a28ea6f7b26ab4a7"
-  dependencies:
-    babel-traverse "^6.19.0"
-    babel-types "^6.19.0"
-    babylon "^6.14.1"
-
-babel-plugin-syntax-async-functions@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
-
-babel-plugin-syntax-async-generators@^6.5.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
-
-babel-plugin-syntax-class-constructor-call@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz#9cb9d39fe43c8600bec8146456ddcbd4e1a76416"
-
-babel-plugin-syntax-class-properties@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
-
-babel-plugin-syntax-decorators@^6.1.18, babel-plugin-syntax-decorators@^6.13.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
-
-babel-plugin-syntax-do-expressions@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz#5747756139aa26d390d09410b03744ba07e4796d"
-
-babel-plugin-syntax-dynamic-import@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
-
-babel-plugin-syntax-exponentiation-operator@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
-
-babel-plugin-syntax-export-extensions@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz#70a1484f0f9089a4e84ad44bac353c95b9b12721"
-
-babel-plugin-syntax-flow@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
-
-babel-plugin-syntax-function-bind@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz#48c495f177bdf31a981e732f55adc0bdd2601f46"
-
-babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
-
-babel-plugin-syntax-object-rest-spread@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
-
-babel-plugin-syntax-trailing-function-commas@^6.13.0, babel-plugin-syntax-trailing-function-commas@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
-
-babel-plugin-transform-async-generator-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.22.0.tgz#a720a98153a7596f204099cd5409f4b3c05bab46"
-  dependencies:
-    babel-helper-remap-async-to-generator "^6.22.0"
-    babel-plugin-syntax-async-generators "^6.5.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-to-generator@^6.8.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.22.0.tgz#194b6938ec195ad36efc4c33a971acf00d8cd35e"
-  dependencies:
-    babel-helper-remap-async-to-generator "^6.22.0"
-    babel-plugin-syntax-async-functions "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-class-constructor-call@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.22.0.tgz#11a4d2216abb5b0eef298b493748f4f2f4869120"
-  dependencies:
-    babel-plugin-syntax-class-constructor-call "^6.18.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-
-babel-plugin-transform-class-properties@6.23.0, babel-plugin-transform-class-properties@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.23.0.tgz#187b747ee404399013563c993db038f34754ac3b"
-  dependencies:
-    babel-helper-function-name "^6.23.0"
-    babel-plugin-syntax-class-properties "^6.8.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-
-babel-plugin-transform-decorators-legacy@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.4.tgz#741b58f6c5bce9e6027e0882d9c994f04f366925"
-  dependencies:
-    babel-plugin-syntax-decorators "^6.1.18"
-    babel-runtime "^6.2.0"
-    babel-template "^6.3.0"
-
-babel-plugin-transform-decorators@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.22.0.tgz#c03635b27a23b23b7224f49232c237a73988d27c"
-  dependencies:
-    babel-helper-explode-class "^6.22.0"
-    babel-plugin-syntax-decorators "^6.13.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-plugin-transform-do-expressions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz#28ccaf92812d949c2cd1281f690c8fdc468ae9bb"
-  dependencies:
-    babel-plugin-syntax-do-expressions "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-arrow-functions@^6.22.0, babel-plugin-transform-es2015-arrow-functions@^6.3.13:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoped-functions@^6.22.0, babel-plugin-transform-es2015-block-scoped-functions@^6.3.13:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoping@^6.22.0, babel-plugin-transform-es2015-block-scoping@^6.6.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.23.0.tgz#e48895cf0b375be148cd7c8879b422707a053b51"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
-    lodash "^4.2.0"
-
-babel-plugin-transform-es2015-classes@^6.22.0, babel-plugin-transform-es2015-classes@^6.6.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.23.0.tgz#49b53f326202a2fd1b3bbaa5e2edd8a4f78643c1"
-  dependencies:
-    babel-helper-define-map "^6.23.0"
-    babel-helper-function-name "^6.23.0"
-    babel-helper-optimise-call-expression "^6.23.0"
-    babel-helper-replace-supers "^6.23.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
-
-babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transform-es2015-computed-properties@^6.3.13:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.22.0.tgz#7c383e9629bba4820c11b0425bdd6290f7f057e7"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-
-babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.6.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-duplicate-keys@^6.22.0, babel-plugin-transform-es2015-duplicate-keys@^6.6.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.22.0.tgz#672397031c21610d72dd2bbb0ba9fb6277e1c36b"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-plugin-transform-es2015-for-of@^6.22.0, babel-plugin-transform-es2015-for-of@^6.6.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es2015-function-name@^6.3.13:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.22.0.tgz#f5fcc8b09093f9a23c76ac3d9e392c3ec4b77104"
-  dependencies:
-    babel-helper-function-name "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-plugin-transform-es2015-literals@^6.22.0, babel-plugin-transform-es2015-literals@^6.3.13:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.0, babel-plugin-transform-es2015-modules-amd@^6.8.0:
-  version "6.24.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.0.tgz#a1911fb9b7ec7e05a43a63c5995007557bcf6a2e"
-  dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-
-babel-plugin-transform-es2015-modules-commonjs@6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-modules-commonjs@^6.22.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.0, babel-plugin-transform-es2015-modules-commonjs@^6.6.0:
-  version "6.24.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.0.tgz#e921aefb72c2cc26cb03d107626156413222134f"
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-types "^6.23.0"
-
-babel-plugin-transform-es2015-modules-systemjs@^6.12.0, babel-plugin-transform-es2015-modules-systemjs@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.23.0.tgz#ae3469227ffac39b0310d90fec73bfdc4f6317b0"
-  dependencies:
-    babel-helper-hoist-variables "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-
-babel-plugin-transform-es2015-modules-umd@^6.12.0, babel-plugin-transform-es2015-modules-umd@^6.22.0:
-  version "6.24.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.0.tgz#fd5fa63521cae8d273927c3958afd7c067733450"
-  dependencies:
-    babel-plugin-transform-es2015-modules-amd "^6.24.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-
-babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es2015-object-super@^6.3.13:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.22.0.tgz#daa60e114a042ea769dd53fe528fc82311eb98fc"
-  dependencies:
-    babel-helper-replace-supers "^6.22.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-parameters@^6.22.0, babel-plugin-transform-es2015-parameters@^6.6.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.23.0.tgz#3a2aabb70c8af945d5ce386f1a4250625a83ae3b"
-  dependencies:
-    babel-helper-call-delegate "^6.22.0"
-    babel-helper-get-function-arity "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
-
-babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.3.13:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz#8ba776e0affaa60bff21e921403b8a652a2ff723"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-plugin-transform-es2015-spread@^6.22.0, babel-plugin-transform-es2015-spread@^6.3.13:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es2015-sticky-regex@^6.3.13:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.22.0.tgz#ab316829e866ee3f4b9eb96939757d19a5bc4593"
-  dependencies:
-    babel-helper-regex "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-plugin-transform-es2015-template-literals@^6.22.0, babel-plugin-transform-es2015-template-literals@^6.6.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-typeof-symbol@^6.22.0, babel-plugin-transform-es2015-typeof-symbol@^6.6.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-unicode-regex@^6.22.0, babel-plugin-transform-es2015-unicode-regex@^6.3.13:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.22.0.tgz#8d9cc27e7ee1decfe65454fb986452a04a613d20"
-  dependencies:
-    babel-helper-regex "^6.22.0"
-    babel-runtime "^6.22.0"
-    regexpu-core "^2.0.0"
-
-babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.8.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.22.0.tgz#d57c8335281918e54ef053118ce6eb108468084d"
-  dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor "^6.22.0"
-    babel-plugin-syntax-exponentiation-operator "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-export-extensions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz#53738b47e75e8218589eea946cbbd39109bbe653"
-  dependencies:
-    babel-plugin-syntax-export-extensions "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-flow-strip-types@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
-  dependencies:
-    babel-plugin-syntax-flow "^6.18.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-function-bind@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz#c6fb8e96ac296a310b8cf8ea401462407ddf6a97"
-  dependencies:
-    babel-plugin-syntax-function-bind "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-object-rest-spread@6.23.0, babel-plugin-transform-object-rest-spread@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
-  dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-display-name@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.23.0.tgz#4398910c358441dc4cef18787264d0412ed36b37"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx-self@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx-source@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.23.0.tgz#23e892f7f2e759678eb5e4446a8f8e94e81b3470"
-  dependencies:
-    babel-helper-builder-react-jsx "^6.23.0"
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-remove-prop-types@0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.3.2.tgz#6da8d834c6d7ad8ab02f956509790cfaa01ffe19"
-
-babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.6.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6"
-  dependencies:
-    regenerator-transform "0.9.8"
-
-babel-plugin-transform-runtime@6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-strict-mode@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz#e008df01340fdc87e959da65991b7e05970c8c7c"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-plugin-transform-strict-mode@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-webpack-alias@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-webpack-alias/-/babel-plugin-webpack-alias-2.1.2.tgz#05a1ba23c28595660fb6ea5736424fc596b4a247"
-  dependencies:
-    babel-types "^6.14.0"
-    find-up "^2.0.0"
-    lodash.some "^4.5.1"
-    lodash.template "^4.3.0"
-
-babel-polyfill@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
-  dependencies:
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
-babel-preset-env@1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.1.9.tgz#49443dcd6ef52b48b7191ea33869e24590a9eb4a"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.3.13"
-    babel-plugin-syntax-trailing-function-commas "^6.13.0"
-    babel-plugin-transform-async-to-generator "^6.8.0"
-    babel-plugin-transform-es2015-arrow-functions "^6.3.13"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.3.13"
-    babel-plugin-transform-es2015-block-scoping "^6.6.0"
-    babel-plugin-transform-es2015-classes "^6.6.0"
-    babel-plugin-transform-es2015-computed-properties "^6.3.13"
-    babel-plugin-transform-es2015-destructuring "^6.6.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.6.0"
-    babel-plugin-transform-es2015-for-of "^6.6.0"
-    babel-plugin-transform-es2015-function-name "^6.3.13"
-    babel-plugin-transform-es2015-literals "^6.3.13"
-    babel-plugin-transform-es2015-modules-amd "^6.8.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.6.0"
-    babel-plugin-transform-es2015-modules-systemjs "^6.12.0"
-    babel-plugin-transform-es2015-modules-umd "^6.12.0"
-    babel-plugin-transform-es2015-object-super "^6.3.13"
-    babel-plugin-transform-es2015-parameters "^6.6.0"
-    babel-plugin-transform-es2015-shorthand-properties "^6.3.13"
-    babel-plugin-transform-es2015-spread "^6.3.13"
-    babel-plugin-transform-es2015-sticky-regex "^6.3.13"
-    babel-plugin-transform-es2015-template-literals "^6.6.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.6.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.3.13"
-    babel-plugin-transform-exponentiation-operator "^6.8.0"
-    babel-plugin-transform-regenerator "^6.6.0"
-    browserslist "^1.4.0"
-    electron-to-chromium "^1.1.0"
-    invariant "^2.2.2"
-
-babel-preset-es2015@6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.22.0.tgz#af5a98ecb35eb8af764ad8a5a05eb36dc4386835"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.22.0"
-    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.22.0"
-    babel-plugin-transform-es2015-classes "^6.22.0"
-    babel-plugin-transform-es2015-computed-properties "^6.22.0"
-    babel-plugin-transform-es2015-destructuring "^6.22.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
-    babel-plugin-transform-es2015-for-of "^6.22.0"
-    babel-plugin-transform-es2015-function-name "^6.22.0"
-    babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.22.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.22.0"
-    babel-plugin-transform-es2015-modules-systemjs "^6.22.0"
-    babel-plugin-transform-es2015-modules-umd "^6.22.0"
-    babel-plugin-transform-es2015-object-super "^6.22.0"
-    babel-plugin-transform-es2015-parameters "^6.22.0"
-    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
-    babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
-    babel-plugin-transform-es2015-template-literals "^6.22.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
-    babel-plugin-transform-regenerator "^6.22.0"
-
-babel-preset-es2016@6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2016/-/babel-preset-es2016-6.22.0.tgz#b061aaa3983d40c9fbacfa3743b5df37f336156c"
-  dependencies:
-    babel-plugin-transform-exponentiation-operator "^6.22.0"
-
-babel-preset-es2017@6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2017/-/babel-preset-es2017-6.22.0.tgz#de2f9da5a30c50d293fb54a0ba15d6ddc573f0f2"
-  dependencies:
-    babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    babel-plugin-transform-async-to-generator "^6.22.0"
-
-babel-preset-flow@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
-  dependencies:
-    babel-plugin-transform-flow-strip-types "^6.22.0"
-
-babel-preset-react@6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.23.0.tgz#eb7cee4de98a3f94502c28565332da9819455195"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.3.13"
-    babel-plugin-transform-react-display-name "^6.23.0"
-    babel-plugin-transform-react-jsx "^6.23.0"
-    babel-plugin-transform-react-jsx-self "^6.22.0"
-    babel-plugin-transform-react-jsx-source "^6.22.0"
-    babel-preset-flow "^6.23.0"
-
-babel-preset-stage-0@6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-0/-/babel-preset-stage-0-6.22.0.tgz#707eeb5b415da769eff9c42f4547f644f9296ef9"
-  dependencies:
-    babel-plugin-transform-do-expressions "^6.22.0"
-    babel-plugin-transform-function-bind "^6.22.0"
-    babel-preset-stage-1 "^6.22.0"
-
-babel-preset-stage-1@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-1/-/babel-preset-stage-1-6.22.0.tgz#7da05bffea6ad5a10aef93e320cfc6dd465dbc1a"
-  dependencies:
-    babel-plugin-transform-class-constructor-call "^6.22.0"
-    babel-plugin-transform-export-extensions "^6.22.0"
-    babel-preset-stage-2 "^6.22.0"
-
-babel-preset-stage-2@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.22.0.tgz#ccd565f19c245cade394b21216df704a73b27c07"
-  dependencies:
-    babel-plugin-syntax-dynamic-import "^6.18.0"
-    babel-plugin-transform-class-properties "^6.22.0"
-    babel-plugin-transform-decorators "^6.22.0"
-    babel-preset-stage-3 "^6.22.0"
-
-babel-preset-stage-3@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.22.0.tgz#a4e92bbace7456fafdf651d7a7657ee0bbca9c2e"
-  dependencies:
-    babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    babel-plugin-transform-async-generator-functions "^6.22.0"
-    babel-plugin-transform-async-to-generator "^6.22.0"
-    babel-plugin-transform-exponentiation-operator "^6.22.0"
-    babel-plugin-transform-object-rest-spread "^6.22.0"
-
-babel-register@6.23.0, babel-register@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3"
-  dependencies:
-    babel-core "^6.23.0"
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.2.0"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.2"
-
-babel-runtime@6.23.0, babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0, babel-runtime@^6.9.2:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
-babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.23.0, babel-template@^6.3.0, babel-template@^6.7.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
-    babylon "^6.11.0"
-    lodash "^4.2.0"
-
-babel-template@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    babylon "^6.11.0"
-    lodash "^4.2.0"
-
-babel-traverse@^6.15.0, babel-traverse@^6.18.0, babel-traverse@^6.19.0, babel-traverse@^6.22.0, babel-traverse@^6.23.0, babel-traverse@^6.23.1:
-  version "6.23.1"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.23.0"
-    babylon "^6.15.0"
-    debug "^2.2.0"
-    globals "^9.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-babel-traverse@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-    babylon "^6.15.0"
-    debug "^2.2.0"
-    globals "^9.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-babel-types@^6.14.0, babel-types@^6.15.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
-  dependencies:
-    babel-runtime "^6.22.0"
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^1.0.1"
-
-babel-types@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
-  dependencies:
-    babel-runtime "^6.22.0"
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^1.0.1"
-
-babylon@^6.11.0, babylon@^6.13.0, babylon@^6.14.1, babylon@^6.15.0:
-  version "6.16.1"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
-
-balanced-match@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.2.1.tgz#7bc658b4bed61eee424ad74f75f5c3e2c4df3cc7"
-
-balanced-match@^0.4.0, balanced-match@^0.4.1, balanced-match@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-
-base32.js@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/base32.js/-/base32.js-0.1.0.tgz#b582dec693c2f11e893cf064ee6ac5b6131a2202"
-
-base64-js@^1.0.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
-
-batch-processor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  dependencies:
-    tweetnacl "^0.14.3"
-
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-
-big.js@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
-
-bignumber.js@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-3.0.1.tgz#807652d10e39de37e9e3497247edc798bb746f76"
-
-"bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2":
-  version "2.0.7"
-  resolved "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
-
-bin-build@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/bin-build/-/bin-build-2.2.0.tgz#11f8dd61f70ffcfa2bdcaa5b46f5e8fedd4221cc"
-  dependencies:
-    archive-type "^3.0.1"
-    decompress "^3.0.0"
-    download "^4.1.2"
-    exec-series "^1.0.0"
-    rimraf "^2.2.6"
-    tempfile "^1.0.0"
-    url-regex "^3.0.0"
-
-bin-check@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/bin-check/-/bin-check-2.0.0.tgz#86f8e6f4253893df60dc316957f5af02acb05930"
-  dependencies:
-    executable "^1.0.0"
-
-bin-version-check@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-2.1.0.tgz#e4e5df290b9069f7d111324031efc13fdd11a5b0"
-  dependencies:
-    bin-version "^1.0.0"
-    minimist "^1.1.0"
-    semver "^4.0.3"
-    semver-truncate "^1.0.0"
-
-bin-version@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/bin-version/-/bin-version-1.0.4.tgz#9eb498ee6fd76f7ab9a7c160436f89579435d78e"
-  dependencies:
-    find-versions "^1.0.0"
-
-bin-wrapper@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/bin-wrapper/-/bin-wrapper-3.0.2.tgz#67d3306262e4b1a5f2f88ee23464f6a655677aeb"
-  dependencies:
-    bin-check "^2.0.0"
-    bin-version-check "^2.1.0"
-    download "^4.0.0"
-    each-async "^1.1.1"
-    lazy-req "^1.0.0"
-    os-filter-obj "^1.0.0"
-
-binary-extensions@^1.0.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
-
-bindings@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
-
-bip66@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.4.tgz#8a59f8ae16eccb94681c3c2a7b224774605aadfb"
-
-bl@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.0.tgz#1397e7ec42c5f5dc387470c500e34a9f6be9ea98"
-  dependencies:
-    readable-stream "^2.0.5"
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  dependencies:
-    inherits "~2.0.0"
-
-blockies@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/blockies/-/blockies-0.0.2.tgz#22ad58da4f6b382bc79bf4386c5820c70047e4ed"
-
-bluebird@^2.10.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
-
-bluebird@^3.4.7:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.3, bn.js@^4.4.0, bn.js@^4.8.0:
-  version "4.11.6"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
-
-boolbase@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  dependencies:
-    hoek "2.x.x"
-
-bowser@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.6.0.tgz#37fc387b616cb6aef370dab4d6bd402b74c5c54d"
-
-brace-expansion@^1.0.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
-  dependencies:
-    balanced-match "^0.4.1"
-    concat-map "0.0.1"
-
-brace@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/brace/-/brace-0.9.0.tgz#ad034bae65220eb676d949cb280383fa8e12fa72"
-  dependencies:
-    w3c-blob "0.0.1"
-
-brace@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/brace/-/brace-0.8.0.tgz#e826c6d5054cae5f607ad7b1c81236dd2cf01978"
-  dependencies:
-    w3c-blob "0.0.1"
-
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-brorand@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-
-browser-stdout@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
-  dependencies:
-    buffer-xor "^1.0.2"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.0"
-    inherits "^2.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-
-browserify-rsa@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  dependencies:
-    bn.js "^4.1.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
-
-browserify-zlib@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
-  dependencies:
-    pako "~0.2.0"
-
-browserslist@^1.0.0, browserslist@^1.0.1, browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@^1.7.6:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
-  dependencies:
-    caniuse-db "^1.0.30000639"
-    electron-to-chromium "^1.2.7"
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-
-buffer-shims@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-
-buffer-to-vinyl@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz#00f15faee3ab7a1dda2cde6d9121bffdd07b2262"
-  dependencies:
-    file-type "^3.1.0"
-    readable-stream "^2.0.2"
-    uuid "^2.0.1"
-    vinyl "^1.0.0"
-
-buffer-xor@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-
-buffer@^4.3.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
-builtin-modules@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-
-bytes@2.4.0, bytes@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.4.0.tgz#7d97196f9d5baf7f6935e25985549edd2a6c2339"
-
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  dependencies:
-    callsites "^0.2.0"
-
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-
-camel-case@3.0.x:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
-  dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
-
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
-camelcase@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-
-caniuse-api@^1.5.2:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.5.3.tgz#5018e674b51c393e4d50614275dc017e27c4a2a2"
-  dependencies:
-    browserslist "^1.0.1"
-    caniuse-db "^1.0.30000346"
-    lodash.memoize "^4.1.0"
-    lodash.uniq "^4.3.0"
-
-caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000649"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000649.tgz#1ee1754a6df235450c8b7cd15e0ebf507221a86a"
-
-capture-stack-trace@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
-
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
-caw@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/caw/-/caw-1.2.0.tgz#ffb226fe7efc547288dc62ee3e97073c212d1034"
-  dependencies:
-    get-proxy "^1.0.1"
-    is-obj "^1.0.0"
-    object-assign "^3.0.0"
-    tunnel-agent "^0.4.0"
-
-center-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-  dependencies:
-    align-text "^0.1.3"
-    lazy-cache "^1.0.3"
-
-chai-as-promised@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-6.0.0.tgz#1a02a433a6f24dafac63b9c96fa1684db1aa8da6"
-  dependencies:
-    check-error "^1.0.2"
-
-chai-enzyme@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/chai-enzyme/-/chai-enzyme-0.6.1.tgz#585c963c6ea1331446efd12ee8391e807d758620"
-  dependencies:
-    html "^1.0.0"
-    react-element-to-jsx-string "^5.0.0"
-
-chai@3.5.0, "chai@>=1.9.2 <4.0.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
-  dependencies:
-    assertion-error "^1.0.1"
-    deep-eql "^0.1.3"
-    type-detect "^1.0.0"
-
-chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-change-emitter@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.3.tgz#731c9360913855f613dd256568d50f854a8806ac"
-
-check-error@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-
-cheerio@^0.22.0:
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
-  dependencies:
-    css-select "~1.2.0"
-    dom-serializer "~0.1.0"
-    entities "~1.1.1"
-    htmlparser2 "^3.9.1"
-    lodash.assignin "^4.0.9"
-    lodash.bind "^4.1.4"
-    lodash.defaults "^4.0.1"
-    lodash.filter "^4.4.0"
-    lodash.flatten "^4.2.0"
-    lodash.foreach "^4.3.0"
-    lodash.map "^4.4.0"
-    lodash.merge "^4.4.0"
-    lodash.pick "^4.2.1"
-    lodash.reduce "^4.4.0"
-    lodash.reject "^4.4.0"
-    lodash.some "^4.4.0"
-
-chokidar@^1.4.3, chokidar@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
-chownr@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-
-ci-info@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
-
-cipher-base@^1.0.0, cipher-base@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
-  dependencies:
-    inherits "^2.0.1"
-
-circular-dependency-plugin@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-2.0.0.tgz#c10796c83390488a9bcdd42f032d6e64e984f660"
-
-circular-json@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
-
-clap@^1.0.9:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
-  dependencies:
-    chalk "^1.1.3"
-
-classnames@2.2.5, classnames@^2.2.0, classnames@^2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
-
-clean-css@4.0.x:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.0.11.tgz#a6d88bffb399420b24298db49d99a1ed067534a8"
-  dependencies:
-    source-map "0.5.x"
-
-cli-cursor@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  dependencies:
-    restore-cursor "^2.0.0"
-
-cli-width@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
-
-cliui@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-  dependencies:
-    center-align "^0.1.1"
-    right-align "^0.1.1"
-    wordwrap "0.0.2"
-
-cliui@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
-
-clone-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.0.tgz#eae0a2413f55c0942f818c229fefce845d7f3b1c"
-  dependencies:
-    is-regexp "^1.0.0"
-    is-supported-regexp-flag "^1.0.0"
-
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-
-clone@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-
-clone@^1.0.0, clone@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
-
-cmd-shim@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
-  dependencies:
-    graceful-fs "^4.1.2"
-    mkdirp "~0.5.0"
-
-co@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz#4ea54ea5a08938153185e15210c68d9092bc1b78"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-
-coa@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.1.tgz#7f959346cfc8719e3f7233cd6852854a7c67d8a3"
-  dependencies:
-    q "^1.1.2"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-
-codemirror@^5.18.2:
-  version "5.25.2"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.25.2.tgz#8c77677ca9c9248d757d3a07ed1e89a8404850b7"
-
-collapse-white-space@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.2.tgz#9c463fb9c6d190d2dcae21a356a01bcae9eeef6d"
-
-color-convert@^1.3.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
-  dependencies:
-    color-name "^1.1.1"
-
-color-diff@^0.1.3:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/color-diff/-/color-diff-0.1.7.tgz#6db78cd9482a8e459d40821eaf4b503283dcb8e2"
-
-color-name@^1.0.0, color-name@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
-
-color-string@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
-  dependencies:
-    color-name "^1.0.0"
-
-color@^0.11.0:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
-  dependencies:
-    clone "^1.0.2"
-    color-convert "^1.3.0"
-    color-string "^0.3.0"
-
-colorguard@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/colorguard/-/colorguard-1.2.0.tgz#f3facaf5caaeba4ef54653d9fb25bb73177c0d84"
-  dependencies:
-    chalk "^1.1.1"
-    color-diff "^0.1.3"
-    log-symbols "^1.0.2"
-    object-assign "^4.0.1"
-    pipetteur "^2.0.0"
-    plur "^2.0.0"
-    postcss "^5.0.4"
-    postcss-reporter "^1.2.1"
-    text-table "^0.2.0"
-    yargs "^1.2.6"
-
-colormin@^1.0.5:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
-  dependencies:
-    color "^0.11.0"
-    css-color-names "0.0.4"
-    has "^1.0.1"
-
-colors@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2.9.0, commander@2.9.x, commander@^2.7.1, commander@^2.8.1, commander@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-commander@~2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-
-commonmark-react-renderer@^4.2.4:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/commonmark-react-renderer/-/commonmark-react-renderer-4.3.2.tgz#f30cdebd66141eef45ccd2d82fc00861e1e1f747"
-  dependencies:
-    in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.isplainobject "^4.0.6"
-    pascalcase "^0.1.1"
-    xss-filters "^1.2.6"
-
-commonmark@^0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/commonmark/-/commonmark-0.24.0.tgz#b80de0182c546355643aa15db12bfb282368278f"
-  dependencies:
-    entities "~ 1.1.1"
-    mdurl "~ 1.0.1"
-    string.prototype.repeat "^0.2.0"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-
-concat-stream@^1.4.6, concat-stream@^1.4.7:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  dependencies:
-    date-now "^0.1.4"
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-
-console-stream@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/console-stream/-/console-stream-0.1.1.tgz#a095fe07b20465955f2fafd28b5d72bccd949d44"
-
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-
-content-disposition@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
-
-content-type-parser@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
-
-content-type@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
-
-convert-source-map@^1.1.0, convert-source-map@^1.1.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
-
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-
-copy-to-clipboard@^3:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.5.tgz#4cd40e7c2ee159bc72d4f06b5bec8f9e0a1a3442"
-  dependencies:
-    toggle-selection "^1.0.3"
-
-copy-webpack-plugin@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz#9728e383b94316050d0c7463958f2b85c0aa8200"
-  dependencies:
-    bluebird "^2.10.2"
-    fs-extra "^0.26.4"
-    glob "^6.0.4"
-    is-glob "^3.1.0"
-    loader-utils "^0.2.15"
-    lodash "^4.3.0"
-    minimatch "^3.0.0"
-    node-dir "^0.1.10"
-
-core-js@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.0.tgz#df408ab46d01aff91c01c3e7971935d422c54f81"
-
-core-js@2.4.1, core-js@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
-
-core-js@^0.8.3:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-0.8.4.tgz#c22665f1e0d1b9c3c5e1b08dabd1f108695e4fcf"
-
-core-js@^1.0.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.1.1.tgz#817f2c2039347a1e9bf7d090c0923e53f749ca82"
-  dependencies:
-    js-yaml "^3.4.3"
-    minimist "^1.2.0"
-    object-assign "^4.1.0"
-    os-homedir "^1.0.1"
-    parse-json "^2.2.0"
-    require-from-string "^1.1.0"
-
-coveralls@2.11.16:
-  version "2.11.16"
-  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.11.16.tgz#da9061265142ddee954f68379122be97be8ab4b1"
-  dependencies:
-    js-yaml "3.6.1"
-    lcov-parse "0.0.10"
-    log-driver "1.2.5"
-    minimist "1.2.0"
-    request "2.79.0"
-
-create-ecdh@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.0.0"
-
-create-error-class@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-  dependencies:
-    capture-stack-trace "^1.0.0"
-
-create-hash@^1.1.0, create-hash@^1.1.1, create-hash@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.2.tgz#51210062d7bb7479f6c65bb41a92208b1d61abad"
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    ripemd160 "^1.0.0"
-    sha.js "^2.3.6"
-
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.4.tgz#d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170"
-  dependencies:
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-
-create-thenable@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/create-thenable/-/create-thenable-1.0.2.tgz#e2031720ccc9575d8cfa31f5c146e762a80c0534"
-  dependencies:
-    object.omit "~2.0.0"
-    unique-concat "~0.2.2"
-
-cross-spawn@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  dependencies:
-    boom "2.x.x"
-
-crypto-browserify@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-
-crypto-js@^3.1.4:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.8.tgz#715f070bf6014f2ae992a98b3929258b713f08d5"
-
-css-color-names@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.3.tgz#de0cef16f4d8aa8222a320d5b6d7e9bbada7b9f6"
-
-css-color-names@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
-
-css-loader@0.26.1:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.1.tgz#2ba7f20131b93597496b3e9bb500785a49cd29ea"
-  dependencies:
-    babel-code-frame "^6.11.0"
-    css-selector-tokenizer "^0.7.0"
-    cssnano ">=2.6.1 <4"
-    loader-utils "~0.2.2"
-    lodash.camelcase "^4.3.0"
-    object-assign "^4.0.1"
-    postcss "^5.0.6"
-    postcss-modules-extract-imports "^1.0.0"
-    postcss-modules-local-by-default "^1.0.1"
-    postcss-modules-scope "^1.0.0"
-    postcss-modules-values "^1.1.0"
-    source-list-map "^0.1.4"
-
-css-rule-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/css-rule-stream/-/css-rule-stream-1.1.0.tgz#3786e7198983d965a26e31957e09078cbb7705a2"
-  dependencies:
-    css-tokenize "^1.0.1"
-    duplexer2 "0.0.2"
-    ldjson-stream "^1.2.1"
-    through2 "^0.6.3"
-
-css-select@^1.1.0, css-select@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
-  dependencies:
-    boolbase "~1.0.0"
-    css-what "2.1"
-    domutils "1.5.1"
-    nth-check "~1.0.1"
-
-css-selector-tokenizer@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152"
-  dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
-
-css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
-  dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
-
-css-tokenize@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/css-tokenize/-/css-tokenize-1.0.1.tgz#4625cb1eda21c143858b7f81d6803c1d26fc14be"
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^1.0.33"
-
-css-what@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
-
-cssesc@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-
-"cssnano@>=2.6.1 <4":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
-  dependencies:
-    autoprefixer "^6.3.1"
-    decamelize "^1.1.2"
-    defined "^1.0.0"
-    has "^1.0.1"
-    object-assign "^4.0.1"
-    postcss "^5.0.14"
-    postcss-calc "^5.2.0"
-    postcss-colormin "^2.1.8"
-    postcss-convert-values "^2.3.4"
-    postcss-discard-comments "^2.0.4"
-    postcss-discard-duplicates "^2.0.1"
-    postcss-discard-empty "^2.0.1"
-    postcss-discard-overridden "^0.1.1"
-    postcss-discard-unused "^2.2.1"
-    postcss-filter-plugins "^2.0.0"
-    postcss-merge-idents "^2.1.5"
-    postcss-merge-longhand "^2.0.1"
-    postcss-merge-rules "^2.0.3"
-    postcss-minify-font-values "^1.0.2"
-    postcss-minify-gradients "^1.0.1"
-    postcss-minify-params "^1.0.4"
-    postcss-minify-selectors "^2.0.4"
-    postcss-normalize-charset "^1.1.0"
-    postcss-normalize-url "^3.0.7"
-    postcss-ordered-values "^2.1.0"
-    postcss-reduce-idents "^2.2.2"
-    postcss-reduce-initial "^1.0.0"
-    postcss-reduce-transforms "^1.0.3"
-    postcss-svgo "^2.1.1"
-    postcss-unique-selectors "^2.0.2"
-    postcss-value-parser "^3.2.3"
-    postcss-zindex "^2.0.1"
-
-csso@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
-  dependencies:
-    clap "^1.0.9"
-    source-map "^0.5.3"
-
-cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
-
-"cssstyle@>= 0.2.37 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
-  dependencies:
-    cssom "0.3.x"
-
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  dependencies:
-    array-find-index "^1.0.1"
-
-d3-array@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.1.1.tgz#a01abe63a25ffb91d3423c3c6d051b4d36bc8a09"
-
-d3-collection@1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.3.tgz#00bdea94fbc1628d435abbae2f4dc2164e37dd34"
-
-d3-color@1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.3.tgz#bc7643fca8e53a8347e2fbdaffa236796b58509b"
-
-d3-format@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.0.tgz#6b480baa886885d4651dc248a8f4ac9da16db07a"
-
-d3-interpolate@1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.4.tgz#a43ec5b3bee350d8516efdf819a4c08c053db302"
-  dependencies:
-    d3-color "1"
-
-d3-path@1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.5.tgz#241eb1849bd9e9e8021c0d0a799f8a0e8e441764"
-
-d3-scale@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.0.tgz#0b4175ca31cbe65e254427e4662dfaefc373462d"
-  dependencies:
-    d3-array "1"
-    d3-collection "1"
-    d3-color "1"
-    d3-format "1"
-    d3-interpolate "1"
-    d3-time "1"
-    d3-time-format "2"
-
-d3-shape@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.0.0.tgz#cca332487579e457354c8838a0a283be638459ba"
-  dependencies:
-    d3-path "1"
-
-d3-time-format@2:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.0.5.tgz#9d7780204f7c9119c9170b1a56db4de9a8af972e"
-  dependencies:
-    d3-time "1"
-
-d3-time@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.6.tgz#a55b13d7d15d3a160ae91708232e0835f1d5e945"
-
-d@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  dependencies:
-    es5-ext "^0.10.9"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  dependencies:
-    assert-plus "^1.0.0"
-
-date-difference@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/date-difference/-/date-difference-1.0.0.tgz#d3e6e883c0cad2dc9dbfcbf12e06297b97298974"
-  dependencies:
-    get-stdin "^3.0.2"
-    meow "^3.1.0"
-
-date-now@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-1.0.1.tgz#bb7d086438debe4182a485fb3df3fbfb99d6153c"
-
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-
-dateformat@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
-
-death@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/death/-/death-1.1.0.tgz#01aa9c401edd92750514470b8266390c66c67318"
-
-debounce@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.0.0.tgz#0948af513d2e4ce407916f8506a423d3f9cf72d8"
-  dependencies:
-    date-now "1.0.1"
-
-debug@2.2.0, debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
-debug@^2.1.1, debug@^2.2.0, debug@^2.3.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
-  dependencies:
-    ms "0.7.2"
-
-decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
-decompress-tar@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-3.1.0.tgz#217c789f9b94450efaadc5c5e537978fc333c466"
-  dependencies:
-    is-tar "^1.0.0"
-    object-assign "^2.0.0"
-    strip-dirs "^1.0.0"
-    tar-stream "^1.1.1"
-    through2 "^0.6.1"
-    vinyl "^0.4.3"
-
-decompress-tarbz2@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz#8b23935681355f9f189d87256a0f8bdd96d9666d"
-  dependencies:
-    is-bzip2 "^1.0.0"
-    object-assign "^2.0.0"
-    seek-bzip "^1.0.3"
-    strip-dirs "^1.0.0"
-    tar-stream "^1.1.1"
-    through2 "^0.6.1"
-    vinyl "^0.4.3"
-
-decompress-targz@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-3.1.0.tgz#b2c13df98166268991b715d6447f642e9696f5a0"
-  dependencies:
-    is-gzip "^1.0.0"
-    object-assign "^2.0.0"
-    strip-dirs "^1.0.0"
-    tar-stream "^1.1.1"
-    through2 "^0.6.1"
-    vinyl "^0.4.3"
-
-decompress-unzip@^3.0.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-3.4.0.tgz#61475b4152066bbe3fee12f9d629d15fe6478eeb"
-  dependencies:
-    is-zip "^1.0.0"
-    read-all-stream "^3.0.0"
-    stat-mode "^0.2.0"
-    strip-dirs "^1.0.0"
-    through2 "^2.0.0"
-    vinyl "^1.0.0"
-    yauzl "^2.2.1"
-
-decompress@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/decompress/-/decompress-3.0.0.tgz#af1dd50d06e3bfc432461d37de11b38c0d991bed"
-  dependencies:
-    buffer-to-vinyl "^1.0.0"
-    concat-stream "^1.4.6"
-    decompress-tar "^3.0.0"
-    decompress-tarbz2 "^3.0.0"
-    decompress-targz "^3.0.0"
-    decompress-unzip "^3.0.0"
-    stream-combiner2 "^1.1.1"
-    vinyl-assign "^1.0.1"
-    vinyl-fs "^2.2.0"
-
-deep-eql@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
-  dependencies:
-    type-detect "0.1.1"
-
-deep-equal@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-
-deep-extend@~0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.1.tgz#efe4113d08085f4e6f9687759810f807469e2253"
-
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-
-default-require-extensions@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
-  dependencies:
-    strip-bom "^2.0.0"
-
-defaults@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-  dependencies:
-    clone "^1.0.2"
-
-define-properties@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
-  dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
-
-defined@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-
-del@^2.0.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-
-depd@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
-
-des.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-
-detect-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  dependencies:
-    repeating "^2.0.0"
-
-detect-indent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
-
-diff@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
-
-diffie-hellman@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
-doctrine@^1.2.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
-
-doiuse@^2.4.1:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/doiuse/-/doiuse-2.6.0.tgz#1892d10b61a9a356addbf2b614933e81f8bb3834"
-  dependencies:
-    browserslist "^1.1.1"
-    caniuse-db "^1.0.30000187"
-    css-rule-stream "^1.1.0"
-    duplexer2 "0.0.2"
-    jsonfilter "^1.1.2"
-    ldjson-stream "^1.2.1"
-    lodash "^4.0.0"
-    multimatch "^2.0.0"
-    postcss "^5.0.8"
-    source-map "^0.4.2"
-    through2 "^0.6.3"
-    yargs "^3.5.4"
-
-dom-converter@~0.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
-  dependencies:
-    utila "~0.3"
-
-dom-serializer@0, dom-serializer@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
-  dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
-
-dom-walk@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
-
-domain-browser@^1.1.1:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
-
-domelementtype@1, domelementtype@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-
-domhandler@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
-  dependencies:
-    domelementtype "1"
-
-domhandler@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
-  dependencies:
-    domelementtype "1"
-
-domutils@1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
-  dependencies:
-    domelementtype "1"
-
-domutils@1.5.1, domutils@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
-download@^4.0.0, download@^4.1.2, download@^4.4.1:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/download/-/download-4.4.3.tgz#aa55fdad392d95d4b68e8c2be03e0c2aa21ba9ac"
-  dependencies:
-    caw "^1.0.1"
-    concat-stream "^1.4.7"
-    each-async "^1.0.0"
-    filenamify "^1.0.1"
-    got "^5.0.0"
-    gulp-decompress "^1.2.0"
-    gulp-rename "^1.2.0"
-    is-url "^1.2.0"
-    object-assign "^4.0.1"
-    read-all-stream "^3.0.0"
-    readable-stream "^2.0.2"
-    stream-combiner2 "^1.1.1"
-    vinyl "^1.0.0"
-    vinyl-fs "^2.2.0"
-    ware "^1.2.0"
-
-drbg.js@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b"
-  dependencies:
-    browserify-aes "^1.0.6"
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  dependencies:
-    readable-stream "~1.1.9"
-
-duplexer2@^0.1.4, duplexer2@~0.1.0:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  dependencies:
-    readable-stream "^2.0.2"
-
-duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-
-duplexify@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.0.tgz#1aa773002e1578457e9d9d4a50b0ccaaebcbd604"
-  dependencies:
-    end-of-stream "1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-each-async@^1.0.0, each-async@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/each-async/-/each-async-1.1.1.tgz#dee5229bdf0ab6ba2012a395e1b869abf8813473"
-  dependencies:
-    onetime "^1.0.0"
-    set-immediate-shim "^1.0.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  dependencies:
-    jsbn "~0.1.0"
-
-editions@^1.1.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.3.tgz#0907101bdda20fac3cbe334c27cbd0688dc99a5b"
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-
-ejs-loader@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ejs-loader/-/ejs-loader-0.3.0.tgz#68736fdc231a490edf919a6446ad9d9055a587be"
-  dependencies:
-    loader-utils "^0.2.7"
-    lodash "^3.6.0"
-
-ejs@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-1.0.0.tgz#c9c60a48a46ee452fb32a71c317b95e5aa1fcb3d"
-
-ejsify@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ejsify/-/ejsify-1.0.0.tgz#37194f5a85c12ae438429395799ec47b43bc453f"
-  dependencies:
-    ejs "~1.0.0"
-    through "~2.3.4"
-
-electron-to-chromium@^1.1.0, electron-to-chromium@^1.2.7:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.2.tgz#b8ce5c93b308db0e92f6d0435c46ddec8f6363ab"
-
-element-resize-detector@^1.1.0:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.1.11.tgz#34dc9aff624239e0ebdba6cdadeeae88a4cf0b1b"
-  dependencies:
-    batch-processor "^1.0.0"
-
-elliptic@6.4.0, elliptic@^6.0.0, elliptic@^6.2.3:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
-  dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-
-encodeurl@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
-
-encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  dependencies:
-    iconv-lite "~0.4.13"
-
-end-of-stream@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.0.0.tgz#d4596e702734a93e40e9af864319eabd99ff2f0e"
-  dependencies:
-    once "~1.3.0"
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
-  dependencies:
-    once "^1.4.0"
-
-enhanced-resolve@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    object-assign "^4.0.1"
-    tapable "^0.2.5"
-
-entities@^1.1.1, "entities@~ 1.1.1", entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
-
-enzyme@2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.7.1.tgz#76370e1d99e91f73091bb8c4314b7c128cc2d621"
-  dependencies:
-    cheerio "^0.22.0"
-    function.prototype.name "^1.0.0"
-    is-subset "^0.1.1"
-    lodash "^4.17.2"
-    object-is "^1.0.1"
-    object.assign "^4.0.4"
-    object.entries "^1.0.3"
-    object.values "^1.0.3"
-    uuid "^2.0.3"
-
-errno@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
-  dependencies:
-    prr "~0.0.0"
-
-error-ex@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
-  dependencies:
-    is-arrayish "^0.2.1"
-
-error-stack-parser@^1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-1.3.6.tgz#e0e73b93e417138d1cd7c0b746b1a4a14854c292"
-  dependencies:
-    stackframe "^0.3.1"
-
-es-abstract@^1.6.1, es-abstract@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.0"
-    is-callable "^1.1.3"
-    is-regex "^1.0.3"
-
-es-to-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
-  dependencies:
-    is-callable "^1.1.1"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
-
-es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.15"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6"
-  dependencies:
-    es6-iterator "2"
-    es6-symbol "~3.1"
-
-es6-error@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.0.tgz#f094c7041f662599bb12720da059d6b9c7ff0f40"
-
-es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.14"
-    es6-symbol "^3.1"
-
-es6-map@^0.1.3:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-    es6-iterator "~2.0.1"
-    es6-set "~0.1.5"
-    es6-symbol "~3.1.1"
-    event-emitter "~0.3.5"
-
-es6-promise@4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42"
-
-es6-set@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-    es6-iterator "~2.0.1"
-    es6-symbol "3.1.1"
-    event-emitter "~0.3.5"
-
-es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
-es6-templates@^0.2.2:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/es6-templates/-/es6-templates-0.2.3.tgz#5cb9ac9fb1ded6eb1239342b81d792bbb4078ee4"
-  dependencies:
-    recast "~0.11.12"
-    through "~2.3.6"
-
-es6-weak-map@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.14"
-    es6-iterator "^2.0.1"
-    es6-symbol "^3.1.1"
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-escodegen@^1.6.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
-  dependencies:
-    esprima "^2.7.1"
-    estraverse "^1.9.1"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.2.0"
-
-escope@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
-  dependencies:
-    es6-map "^0.1.3"
-    es6-weak-map "^2.0.1"
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-eslint-config-semistandard@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-semistandard/-/eslint-config-semistandard-7.0.0.tgz#f803493f56a5172f7f59c35ae648360b41f2ff71"
-
-eslint-config-standard-jsx@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-3.3.0.tgz#cab0801a15a360bf63facb97ab22fbdd88d8a5e0"
-
-eslint-config-standard-react@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard-react/-/eslint-config-standard-react-4.2.0.tgz#d15fd25e837e20aff0db32f64fb55d11880eb8d0"
-  dependencies:
-    eslint-config-standard-jsx "^3.0.0"
-
-eslint-config-standard@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-6.2.1.tgz#d3a68aafc7191639e7ee441e7348739026354292"
-
-eslint-plugin-promise@3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz#1be2793eafe2d18b5b123b8136c269f804fe7122"
-
-eslint-plugin-react@6.10.0:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.0.tgz#9c48b48d101554b5355413e7c64238abde6ef1ef"
-  dependencies:
-    array.prototype.find "^2.0.1"
-    doctrine "^1.2.2"
-    has "^1.0.1"
-    jsx-ast-utils "^1.3.4"
-    object.assign "^4.0.4"
-
-eslint-plugin-standard@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz#3589699ff9c917f2c25f76a916687f641c369ff3"
-
-eslint@3.16.1:
-  version "3.16.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.16.1.tgz#9bc31fc7341692cf772e80607508f67d711c5609"
-  dependencies:
-    babel-code-frame "^6.16.0"
-    chalk "^1.1.3"
-    concat-stream "^1.4.6"
-    debug "^2.1.1"
-    doctrine "^1.2.2"
-    escope "^3.6.0"
-    espree "^3.4.0"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    glob "^7.0.3"
-    globals "^9.14.0"
-    ignore "^3.2.0"
-    imurmurhash "^0.1.4"
-    inquirer "^0.12.0"
-    is-my-json-valid "^2.10.0"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.5.1"
-    json-stable-stringify "^1.0.0"
-    levn "^0.3.0"
-    lodash "^4.0.0"
-    mkdirp "^0.5.0"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.1"
-    pluralize "^1.2.1"
-    progress "^1.1.8"
-    require-uncached "^1.0.2"
-    shelljs "^0.7.5"
-    strip-bom "^3.0.0"
-    strip-json-comments "~2.0.1"
-    table "^3.7.8"
-    text-table "~0.2.0"
-    user-home "^2.0.0"
-
-espree@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"
-  dependencies:
-    acorn "^5.0.1"
-    acorn-jsx "^3.0.0"
-
-esprima@^2.6.0, esprima@^2.7.1:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-
-esprima@^3.1.1, esprima@~3.1.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
-esrecurse@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
-  dependencies:
-    estraverse "~4.1.0"
-    object-assign "^4.0.1"
-
-estraverse@^1.9.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
-
-estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-
-estraverse@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
-
-esutils@^2.0.0, esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-
-etag@~1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8"
-
-ethereum-common@^0.0.18:
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
-
-ethereumjs-tx@1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.2.5.tgz#ed36d7ffeb97bc889c61eef1ab76f47a613d8286"
-  dependencies:
-    ethereum-common "^0.0.18"
-    ethereumjs-util "^5.0.0"
-
-ethereumjs-util@5.1.1, ethereumjs-util@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.1.1.tgz#122fb38dea747dc62b3aebfc365d1bd48be4b73e"
-  dependencies:
-    bn.js "^4.8.0"
-    create-hash "^1.1.2"
-    ethjs-util "^0.1.3"
-    keccak "^1.0.2"
-    rlp "^2.0.0"
-    secp256k1 "^3.0.1"
-
-ethjs-util@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/ethjs-util/-/ethjs-util-0.1.4.tgz#1c8b6879257444ef4d3f3fbbac2ded12cd997d93"
-  dependencies:
-    is-hex-prefixed "1.0.0"
-    strip-hex-prefix "1.0.0"
-
-event-emitter@~0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
-eventemitter3@1.x.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
-
-eventemitter3@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.2.tgz#20ce4891909ce9f35b088c94fab40e2c96f473ac"
-
-events@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-
-evp_bytestokey@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
-  dependencies:
-    create-hash "^1.1.1"
-
-exec-buffer@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/exec-buffer/-/exec-buffer-3.1.0.tgz#851b46d062fca9bcbc6ff8781693e28e8da80402"
-  dependencies:
-    execa "^0.5.0"
-    p-finally "^1.0.0"
-    pify "^2.3.0"
-    rimraf "^2.5.4"
-    tempfile "^1.0.0"
-
-exec-series@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/exec-series/-/exec-series-1.0.3.tgz#6d257a9beac482a872c7783bc8615839fc77143a"
-  dependencies:
-    async-each-series "^1.1.0"
-    object-assign "^4.1.0"
-
-execa@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36"
-  dependencies:
-    cross-spawn "^4.0.0"
-    get-stream "^2.2.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execall@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73"
-  dependencies:
-    clone-regexp "^1.0.0"
-
-executable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/executable/-/executable-1.1.0.tgz#877980e9112f3391066da37265de7ad8434ab4d9"
-  dependencies:
-    meow "^3.1.0"
-
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  dependencies:
-    fill-range "^2.1.0"
-
-expand-template@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.0.3.tgz#6c303323177a62b1b22c070279f7861287b69b1a"
-
-express@4.14.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.14.1.tgz#646c237f766f148c2120aff073817b9e4d7e0d33"
-  dependencies:
-    accepts "~1.3.3"
-    array-flatten "1.1.1"
-    content-disposition "0.5.2"
-    content-type "~1.0.2"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "~2.2.0"
-    depd "~1.1.0"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    etag "~1.7.0"
-    finalhandler "0.5.1"
-    fresh "0.3.0"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.1"
-    path-to-regexp "0.1.7"
-    proxy-addr "~1.1.3"
-    qs "6.2.0"
-    range-parser "~1.2.0"
-    send "0.14.2"
-    serve-static "~1.11.2"
-    type-is "~1.6.14"
-    utils-merge "1.0.0"
-    vary "~1.1.0"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend@^3.0.0, extend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
-
-extend@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-1.2.1.tgz#a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"
-
-external-editor@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.1.tgz#4c597c6c88fa6410e41dbbaa7b1be2336aa31095"
-  dependencies:
-    tmp "^0.0.31"
-
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  dependencies:
-    is-extglob "^1.0.0"
-
-extract-loader@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/extract-loader/-/extract-loader-0.1.0.tgz#a1c146915241cc486d5292263c7555d5aa19766e"
-  dependencies:
-    loader-utils "^0.2.16"
-
-extract-text-webpack-plugin@2.0.0-beta.4:
-  version "2.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0-beta.4.tgz#d32393069e7d90c8318d48392302618b56bc1ba9"
-  dependencies:
-    async "^1.5.0"
-    loader-utils "^0.2.3"
-    webpack-sources "^0.1.0"
-
-extsprintf@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
-
-fancy-log@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
-  dependencies:
-    chalk "^1.1.1"
-    time-stamp "^1.0.0"
-
-fast-levenshtein@~2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-
-fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
-
-fbjs@^0.8.1, fbjs@^0.8.4, fbjs@^0.8.6:
-  version "0.8.12"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
-  dependencies:
-    core-js "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.9"
-
-fd-slicer@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
-  dependencies:
-    pend "~1.2.0"
-
-figures@^1.3.5:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
-
-file-loader@0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.0.tgz#bbe6db7474ac92c7f54fdc197cf547e98b6b8e12"
-  dependencies:
-    loader-utils "~0.2.5"
-
-file-loader@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.9.0.tgz#1d2daddd424ce6d1b07cfe3f79731bed3617ab42"
-  dependencies:
-    loader-utils "~0.2.5"
-
-file-saver@1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.3.tgz#cdd4c44d3aa264eac2f68ec165bc791c34af1232"
-
-file-type@^3.1.0, file-type@^3.8.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
-
-filename-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
-
-filename-reserved-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz#e61cf805f0de1c984567d0386dc5df50ee5af7e4"
-
-filenamify@^1.0.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-1.2.1.tgz#a9f2ffd11c503bed300015029272378f1f1365a5"
-  dependencies:
-    filename-reserved-regex "^1.0.0"
-    strip-outer "^1.0.0"
-    trim-repeated "^1.0.0"
-
-fileset@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  dependencies:
-    glob "^7.0.3"
-    minimatch "^3.0.3"
-
-filesize@^3.1.2:
-  version "3.5.6"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"
-
-fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^1.1.3"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
-finalhandler@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.1.tgz#2c400d8d4530935bc232549c5fa385ec07de6fcd"
-  dependencies:
-    debug "~2.2.0"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    statuses "~1.3.1"
-    unpipe "~1.0.0"
-
-find-cache-dir@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
-  dependencies:
-    commondir "^1.0.1"
-    mkdirp "^0.5.1"
-    pkg-dir "^1.0.0"
-
-find-parent-dir@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
-
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-find-up@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  dependencies:
-    locate-path "^2.0.0"
-
-find-versions@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-1.2.1.tgz#cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62"
-  dependencies:
-    array-uniq "^1.0.0"
-    get-stdin "^4.0.1"
-    meow "^3.5.0"
-    semver-regex "^1.0.0"
-
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-
-flat-cache@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
-  dependencies:
-    circular-json "^0.3.1"
-    del "^2.0.2"
-    graceful-fs "^4.1.2"
-    write "^0.2.1"
-
-flat@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-2.0.1.tgz#70e29188a74be0c3c89409eed1fa9577907ae32f"
-  dependencies:
-    is-buffer "~1.1.2"
-
-flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  dependencies:
-    for-in "^1.0.1"
-
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-form-data@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-format-json@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/format-json/-/format-json-1.0.3.tgz#268e3d3e169792ff49bb5b030f22c87ca1c2cd9f"
-
-format-number@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/format-number/-/format-number-2.0.1.tgz#e9231a8743ca64b47d09555dce40296343be66eb"
-
-formatio@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
-  dependencies:
-    samsam "~1.1"
-
-forwarded@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
-
-fresh@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f"
-
-fs-extra@^0.26.4:
-  version "0.26.7"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
-
-fs-readdir-recursive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-fsevents@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.29"
-
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
-function-bind@^1.0.2, function-bind@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
-
-function.prototype.name@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.0.0.tgz#5f523ca64e491a5f95aba80cc1e391080a14482e"
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.0"
-    is-callable "^1.1.2"
-
-gather-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b"
-
-gauge@~1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
-  dependencies:
-    ansi "^0.3.0"
-    has-unicode "^2.0.0"
-    lodash.pad "^4.1.0"
-    lodash.padend "^4.1.0"
-    lodash.padstart "^4.1.0"
-
-gauge@~2.7.1:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09"
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  dependencies:
-    is-property "^1.0.0"
-
-geopattern@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/geopattern/-/geopattern-1.2.3.tgz#de96602e46dba9095ca5774bfb3b36308f7e63fe"
-  dependencies:
-    extend "~1.2.1"
-
-get-caller-file@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
-
-get-own-enumerable-property-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-1.0.1.tgz#f1d4e3ad1402e039898e56d1e9b9aa924c26e484"
-
-get-proxy@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-1.1.0.tgz#894854491bc591b0f147d7ae570f5c678b7256eb"
-  dependencies:
-    rc "^1.1.2"
-
-get-stdin@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-3.0.2.tgz#c1ced24b9039b38ded85bdf161e57713b6dd4abe"
-
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-
-get-stdin@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
-
-get-stream@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
-  dependencies:
-    object-assign "^4.0.1"
-    pinkie-promise "^2.0.0"
-
-getpass@^0.1.1:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
-  dependencies:
-    assert-plus "^1.0.0"
-
-gifsicle@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/gifsicle/-/gifsicle-3.0.4.tgz#f45cb5ed10165b665dc929e0e9328b6c821dfa3b"
-  dependencies:
-    bin-build "^2.0.0"
-    bin-wrapper "^3.0.0"
-    logalot "^2.0.0"
-
-github-from-package@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  dependencies:
-    is-glob "^2.0.0"
-
-glob-parent@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-stream@^5.3.2:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22"
-  dependencies:
-    extend "^3.0.0"
-    glob "^5.0.3"
-    glob-parent "^3.0.0"
-    micromatch "^2.3.7"
-    ordered-read-streams "^0.3.0"
-    through2 "^0.6.0"
-    to-absolute-glob "^0.1.1"
-    unique-stream "^2.0.2"
-
-glob@7.0.5:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^5.0.3:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global@^4.3.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/global/-/global-4.3.1.tgz#5f757908c7cbabce54f386ae440e11e26b7916df"
-  dependencies:
-    min-document "^2.19.0"
-    process "~0.5.1"
-
-globals@^9.0.0, globals@^9.14.0:
-  version "9.17.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
-
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-globby@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-globjoin@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
-
-glogg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
-  dependencies:
-    sparkles "^1.0.0"
-
-got@^5.0.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-5.7.1.tgz#5f81635a61e4a6589f180569ea4e381680a51f35"
-  dependencies:
-    create-error-class "^3.0.1"
-    duplexer2 "^0.1.4"
-    is-redirect "^1.0.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
-    lowercase-keys "^1.0.0"
-    node-status-codes "^1.0.0"
-    object-assign "^4.0.1"
-    parse-json "^2.1.0"
-    pinkie-promise "^2.0.0"
-    read-all-stream "^3.0.0"
-    readable-stream "^2.0.5"
-    timed-out "^3.0.0"
-    unzip-response "^1.0.2"
-    url-parse-lax "^1.0.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-
-gulp-decompress@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/gulp-decompress/-/gulp-decompress-1.2.0.tgz#8eeb65a5e015f8ed8532cafe28454960626f0dc7"
-  dependencies:
-    archive-type "^3.0.0"
-    decompress "^3.0.0"
-    gulp-util "^3.0.1"
-    readable-stream "^2.0.2"
-
-gulp-rename@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817"
-
-gulp-sourcemaps@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
-  dependencies:
-    convert-source-map "^1.1.1"
-    graceful-fs "^4.1.2"
-    strip-bom "^2.0.0"
-    through2 "^2.0.0"
-    vinyl "^1.0.0"
-
-gulp-util@^3.0.1:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  dependencies:
-    glogg "^1.0.0"
-
-handlebars@^4.0.3:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.6.tgz#2ce4484850537f9c97a8026d5399b935c4ed4ed7"
-  dependencies:
-    async "^1.4.0"
-    optimist "^0.6.1"
-    source-map "^0.4.4"
-  optionalDependencies:
-    uglify-js "^2.6"
-
-happypack@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/happypack/-/happypack-3.0.3.tgz#22f78c87a325cdb798c958cf4ec383fcd4d6fdc7"
-  dependencies:
-    async "1.5.0"
-    json-stringify-safe "5.0.1"
-    loader-utils "0.2.16"
-    mkdirp "0.5.1"
-
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
-
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  dependencies:
-    sparkles "^1.0.0"
-
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-
-has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
-  dependencies:
-    function-bind "^1.0.2"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
-  dependencies:
-    inherits "^2.0.1"
-
-hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-he@1.1.x:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-
-history@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c"
-  dependencies:
-    invariant "^2.2.1"
-    loose-envify "^1.2.0"
-    query-string "^4.2.2"
-    warning "^3.0.0"
-
-hmac-drbg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.0.tgz#3db471f45aae4a994a0688322171f51b8b91bee5"
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-hoist-non-react-statics@^1.0.0, hoist-non-react-statics@^1.0.3, hoist-non-react-statics@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
-
-home-or-tmp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.1"
-
-hosted-git-info@^2.1.4:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.1.tgz#4b0445e41c004a8bd1337773a4ff790ca40318c8"
-
-html-comment-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
-
-html-encoding-sniffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
-  dependencies:
-    whatwg-encoding "^1.0.1"
-
-html-entities@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.0.tgz#41948caf85ce82fed36e4e6a0ed371a6664379e2"
-
-html-loader@0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-0.4.4.tgz#f2b5b9acd5e035ff3ab5fd369c13c97a7bb014da"
-  dependencies:
-    es6-templates "^0.2.2"
-    fastparse "^1.1.1"
-    html-minifier "^3.0.1"
-    loader-utils "^0.2.15"
-    object-assign "^4.1.0"
-
-html-minifier@^3.0.1, html-minifier@^3.2.3:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.4.2.tgz#31896baaf735c1d95f7a0b7291f9dc36c0720752"
-  dependencies:
-    camel-case "3.0.x"
-    clean-css "4.0.x"
-    commander "2.9.x"
-    he "1.1.x"
-    ncname "1.0.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "2.8.x"
-
-html-tags@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-1.1.1.tgz#869f43859f12d9bdc3892419e494a628aa1b204e"
-
-html-webpack-plugin@2.28.0:
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz#2e7863b57e5fd48fe263303e2ffc934c3064d009"
-  dependencies:
-    bluebird "^3.4.7"
-    html-minifier "^3.2.3"
-    loader-utils "^0.2.16"
-    lodash "^4.17.3"
-    pretty-error "^2.0.2"
-    toposort "^1.0.0"
-
-html@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz#a544fa9ea5492bfb3a2cca8210a10be7b5af1f61"
-  dependencies:
-    concat-stream "^1.4.7"
-
-htmlparser2@^3.9.1:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
-  dependencies:
-    domelementtype "^1.3.0"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^2.0.2"
-
-htmlparser2@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
-  dependencies:
-    domelementtype "1"
-    domhandler "2.1"
-    domutils "1.1"
-    readable-stream "1.0"
-
-http-errors@~1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750"
-  dependencies:
-    inherits "2.0.3"
-    setprototypeof "1.0.2"
-    statuses ">= 1.3.1 < 2"
-
-http-proxy-middleware@0.17.3:
-  version "0.17.3"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d"
-  dependencies:
-    http-proxy "^1.16.2"
-    is-glob "^3.1.0"
-    lodash "^4.17.2"
-    micromatch "^2.3.11"
-
-http-proxy@^1.16.2:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
-  dependencies:
-    eventemitter3 "1.x.x"
-    requires-port "1.x.x"
-
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-https-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
-
-humanize@0.0.9:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/humanize/-/humanize-0.0.9.tgz#1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"
-
-husky@0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-0.13.1.tgz#11efc6fc10e0ec4e789776f6582be37d71ba4ccf"
-  dependencies:
-    chalk "^1.1.3"
-    find-parent-dir "^0.3.0"
-    is-ci "^1.0.9"
-    normalize-path "^1.0.0"
-
-hyphenate-style-name@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
-
-iconv-lite@0.4.13, iconv-lite@~0.4.13:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
-
-icss-replace-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
-
-ieee754@^1.1.4:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-
-ignore-styles@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-styles/-/ignore-styles-5.0.1.tgz#b49ef2274bdafcd8a4880a966bfe38d1a0bf4671"
-
-ignore@^3.2.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"
-
-image-webpack-loader@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/image-webpack-loader/-/image-webpack-loader-3.2.0.tgz#f26306d6048d3a2f5a8d844ecaedd2b7148f0a4e"
-  dependencies:
-    file-loader "^0.9.0"
-    imagemin "^5.2.2"
-    imagemin-gifsicle "^5.1.0"
-    imagemin-mozjpeg "^6.0.0"
-    imagemin-optipng "^5.2.1"
-    imagemin-pngquant "^5.0.0"
-    imagemin-svgo "^5.2.0"
-    loader-utils "^0.2.16"
-
-imagemin-gifsicle@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/imagemin-gifsicle/-/imagemin-gifsicle-5.1.0.tgz#2e4ddcda2a109b221cabaec498e1e2dd28ca768f"
-  dependencies:
-    exec-buffer "^3.0.0"
-    gifsicle "^3.0.0"
-    is-gif "^1.0.0"
-
-imagemin-mozjpeg@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/imagemin-mozjpeg/-/imagemin-mozjpeg-6.0.0.tgz#71a32a457aa1b26117a68eeef2d9b190c2e5091e"
-  dependencies:
-    exec-buffer "^3.0.0"
-    is-jpg "^1.0.0"
-    mozjpeg "^4.0.0"
-
-imagemin-optipng@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-5.2.1.tgz#d22da412c09f5ff00a4339960b98a88b1dbe8695"
-  dependencies:
-    exec-buffer "^3.0.0"
-    is-png "^1.0.0"
-    optipng-bin "^3.0.0"
-
-imagemin-pngquant@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/imagemin-pngquant/-/imagemin-pngquant-5.0.0.tgz#7d72405778caba9c510eb3cb4590c8413383560e"
-  dependencies:
-    exec-buffer "^3.0.0"
-    is-png "^1.0.0"
-    pngquant-bin "^3.0.0"
-
-imagemin-svgo@^5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/imagemin-svgo/-/imagemin-svgo-5.2.1.tgz#74d593ce4cbe1b87efdb3d06a4a56078f71a8147"
-  dependencies:
-    is-svg "^2.0.0"
-    svgo "^0.7.0"
-
-imagemin@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-5.2.2.tgz#e14a0f357f8810266875eda38634eeb96f6fbd16"
-  dependencies:
-    file-type "^3.8.0"
-    globby "^5.0.0"
-    mkdirp "^0.5.1"
-    pify "^2.3.0"
-    promise.pipe "^3.0.0"
-    replace-ext "0.0.1"
-
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-
-in-publish@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
-
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  dependencies:
-    repeating "^2.0.0"
-
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-
-ini@^1.3.4, ini@~1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
-
-inline-style-prefixer@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz#c153c7e88fd84fef5c602e95a8168b2770671fe7"
-  dependencies:
-    bowser "^1.0.0"
-    hyphenate-style-name "^1.0.1"
-
-inquirer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^2.0.0"
-    figures "^1.3.5"
-    lodash "^4.3.0"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
-inquirer@^3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    chalk "^1.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.1"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx "^4.1.0"
-    string-width "^2.0.0"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
-interpret@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"
-
-intl-format-cache@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-2.0.5.tgz#b484cefcb9353f374f25de389a3ceea1af18d7c9"
-
-intl-messageformat-parser@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.2.0.tgz#5906b7f953ab7470e0dc8549097b648b991892ff"
-
-intl-messageformat-parser@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.3.0.tgz#c5d26ffb894c7d9c2b9fa444c67f417ab2594268"
-
-intl-messageformat@1.3.0, intl-messageformat@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-1.3.0.tgz#f7d926aded7a3ab19b2dc601efd54e99a4bd4eae"
-  dependencies:
-    intl-messageformat-parser "1.2.0"
-
-intl-relativeformat@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-1.3.0.tgz#893dc7076fccd380cf091a2300c380fa57ace45b"
-  dependencies:
-    intl-messageformat "1.3.0"
-
-invariant@^2.0.0, invariant@^2.1.1, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
-  dependencies:
-    loose-envify "^1.0.0"
-
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-
-ip-regex@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
-
-ipaddr.js@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
-
-irregular-plurals@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.2.0.tgz#38f299834ba8c00c30be9c554e137269752ff3ac"
-
-is-absolute-url@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
-
-is-absolute@^0.1.5:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.1.7.tgz#847491119fccb5fb436217cc737f7faad50f603f"
-  dependencies:
-    is-relative "^0.1.0"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-buffer@^1.0.2, is-buffer@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
-
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-bzip2@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-bzip2/-/is-bzip2-1.0.0.tgz#5ee58eaa5a2e9c80e21407bedf23ae5ac091b3fc"
-
-is-callable@^1.1.1, is-callable@^1.1.2, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
-
-is-ci@^1.0.10, is-ci@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
-  dependencies:
-    ci-info "^1.0.0"
-
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-
-is-dom@^1.0.5:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/is-dom/-/is-dom-1.0.9.tgz#483832d52972073de12b9fe3f60320870da8370d"
-
-is-dotfile@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-
-is-extglob@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-
-is-finite@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
-is-gif@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-gif/-/is-gif-1.0.0.tgz#a6d2ae98893007bffa97a1d8c01d63205832097e"
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-gzip@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-gzip/-/is-gzip-1.0.0.tgz#6ca8b07b99c77998025900e555ced8ed80879a83"
-
-is-hex-prefixed@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554"
-
-is-jpg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-jpg/-/is-jpg-1.0.0.tgz#2959c17e73430db38264da75b90dd54f2d86da1c"
-
-is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
-is-natural-number@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-2.1.1.tgz#7d4c5728377ef386c3e194a9911bf57c6dc335e7"
-
-is-number@^2.0.2, is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  dependencies:
-    kind-of "^3.0.2"
-
-is-obj@^1.0.0, is-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
-  dependencies:
-    path-is-inside "^1.0.1"
-
-is-plain-obj@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-
-is-plain-object@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.1.tgz#4d7ca539bc9db9b737b8acb612f2318ef92f294f"
-  dependencies:
-    isobject "^1.0.0"
-
-is-png@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-png/-/is-png-1.0.0.tgz#3d80373fe9b89d65fd341f659d3fc0a1135e718a"
-
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-
-is-promise@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-
-is-redirect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-
-is-regex@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  dependencies:
-    has "^1.0.1"
-
-is-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
-
-is-relative@^0.1.0:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.1.3.tgz#905fee8ae86f45b3ec614bc3c15c869df0876e82"
-
-is-resolvable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
-  dependencies:
-    tryit "^1.0.1"
-
-is-retry-allowed@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-
-is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-
-is-supported-regexp-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz#8b520c85fae7a253382d4b02652e045576e13bb8"
-
-is-svg@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
-  dependencies:
-    html-comment-regex "^1.1.0"
-
-is-symbol@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
-
-is-tar@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-tar/-/is-tar-1.0.0.tgz#2f6b2e1792c1f5bb36519acaa9d65c0d26fe853d"
-
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-
-is-url@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.2.tgz#498905a593bf47cc2d9e7f738372bbf7696c7f26"
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-
-is-valid-glob@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe"
-
-is-zip@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-zip/-/is-zip-1.0.0.tgz#47b0a8ff4d38a76431ccfd99a8e15a4c86ba2325"
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
-isobject@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-1.0.2.tgz#f0f9b8ce92dd540fa0740882e3835a2e022ec78a"
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  dependencies:
-    isarray "1.0.0"
-
-isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
-  dependencies:
-    node-fetch "^1.0.1"
-    whatwg-fetch ">=0.10.0"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-istanbul-api@^1.0.0-alpha:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.7.tgz#f6f37f09f8002b130f891c646b70ee4a8e7345ae"
-  dependencies:
-    async "^2.1.4"
-    fileset "^2.0.2"
-    istanbul-lib-coverage "^1.0.2"
-    istanbul-lib-hook "^1.0.5"
-    istanbul-lib-instrument "^1.7.0"
-    istanbul-lib-report "^1.0.0"
-    istanbul-lib-source-maps "^1.1.1"
-    istanbul-reports "^1.0.2"
-    js-yaml "^3.7.0"
-    mkdirp "^0.5.1"
-    once "^1.4.0"
-
-istanbul-lib-coverage@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1"
-
-istanbul-lib-hook@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.5.tgz#6ca3d16d60c5f4082da39f7c5cd38ea8a772b88e"
-  dependencies:
-    append-transform "^0.4.0"
-
-istanbul-lib-instrument@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659"
-  dependencies:
-    babel-generator "^6.18.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-    babylon "^6.13.0"
-    istanbul-lib-coverage "^1.0.2"
-    semver "^5.3.0"
-
-istanbul-lib-report@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0.tgz#d83dac7f26566b521585569367fe84ccfc7aaecb"
-  dependencies:
-    istanbul-lib-coverage "^1.0.2"
-    mkdirp "^0.5.1"
-    path-parse "^1.0.5"
-    supports-color "^3.1.2"
-
-istanbul-lib-source-maps@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.1.tgz#f8c8c2e8f2160d1d91526d97e5bd63b2079af71c"
-  dependencies:
-    istanbul-lib-coverage "^1.0.2"
-    mkdirp "^0.5.1"
-    rimraf "^2.4.4"
-    source-map "^0.5.3"
-
-istanbul-reports@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.2.tgz#4e8366abe6fa746cc1cd6633f108de12cc6ac6fa"
-  dependencies:
-    handlebars "^4.0.3"
-
-istanbul@1.0.0-alpha.2:
-  version "1.0.0-alpha.2"
-  resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-1.0.0-alpha.2.tgz#06096bc08e98baad744aae46962d8df9fac63d08"
-  dependencies:
-    abbrev "1.0.x"
-    async "1.x"
-    istanbul-api "^1.0.0-alpha"
-    js-yaml "3.x"
-    mkdirp "0.5.x"
-    nopt "3.x"
-    which "^1.1.1"
-    wordwrap "^1.0.0"
-
-jodid25519@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
-  dependencies:
-    jsbn "~0.1.0"
-
-js-base64@^2.1.9:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
-
-js-sha3@0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.5.tgz#baf0c0e8c54ad5903447df96ade7a4a1bca79a4a"
-
-js-tokens@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
-
-js-yaml@3.6.1, js-yaml@3.x, js-yaml@^3.5.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
-
-js-yaml@^3.4.3, js-yaml@^3.7.0:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^3.1.1"
-
-js-yaml@~3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
-jsdom@9.11.0:
-  version "9.11.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.11.0.tgz#a95b0304e521a2ca5a63c6ea47bf7708a7a84591"
-  dependencies:
-    abab "^1.0.3"
-    acorn "^4.0.4"
-    acorn-globals "^3.1.0"
-    array-equal "^1.0.0"
-    content-type-parser "^1.0.1"
-    cssom ">= 0.3.2 < 0.4.0"
-    cssstyle ">= 0.2.37 < 0.3.0"
-    escodegen "^1.6.1"
-    html-encoding-sniffer "^1.0.1"
-    nwmatcher ">= 1.3.9 < 2.0.0"
-    parse5 "^1.5.1"
-    request "^2.79.0"
-    sax "^1.2.1"
-    symbol-tree "^3.2.1"
-    tough-cookie "^2.3.2"
-    webidl-conversions "^4.0.0"
-    whatwg-encoding "^1.0.1"
-    whatwg-url "^4.3.0"
-    xml-name-validator "^2.0.1"
-
-jsesc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-
-json-loader@0.5.4, json-loader@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  dependencies:
-    jsonify "~0.0.0"
-
-json-stringify-safe@5.0.1, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonfilter@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/jsonfilter/-/jsonfilter-1.1.2.tgz#21ef7cedc75193813c75932e96a98be205ba5a11"
-  dependencies:
-    JSONStream "^0.8.4"
-    minimist "^1.1.0"
-    stream-combiner "^0.2.1"
-    through2 "^0.6.3"
-
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-
-jsonparse@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64"
-
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-
-jsprim@^1.2.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.0.2"
-    json-schema "0.2.3"
-    verror "1.3.6"
-
-jsqr@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/jsqr/-/jsqr-0.2.2.tgz#8c1f0279fb7c94542aaa9e8aeb7c722d523ea092"
-
-jsx-ast-utils@^1.3.4:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.0.tgz#5afe38868f56bc8cc7aeaef0100ba8c75bd12591"
-  dependencies:
-    object-assign "^4.1.0"
-
-keccak@^1.0.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/keccak/-/keccak-1.2.0.tgz#b53618fc7961b642f6e73f1546eec3329f7effe0"
-  dependencies:
-    bindings "^1.2.1"
-    inherits "^2.0.3"
-    nan "^2.2.1"
-    prebuild-install "^2.0.0"
-
-keycode@^2.1.1:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.8.tgz#94d2b7098215eff0e8f9a8931d5a59076c4532fb"
-
-keythereum@0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/keythereum/-/keythereum-0.4.6.tgz#0fdec7cf938ae39e5e3061b2f6e16677b766c5da"
-  dependencies:
-    elliptic "6.4.0"
-    ethereumjs-util "5.1.1"
-    sjcl "1.0.6"
-    uuid "3.0.0"
-    validator "4.0.2"
-
-kind-of@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
-  dependencies:
-    is-buffer "^1.0.2"
-
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  optionalDependencies:
-    graceful-fs "^4.1.9"
-
-known-css-properties@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.0.6.tgz#71a0b8fde1b6e3431c471efbc3d9733faebbcfbf"
-
-laggard@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/laggard/-/laggard-0.1.0.tgz#2efd645f7f2d8f3d27ac808039ca86a8ee341075"
-  dependencies:
-    minimist "^1.2.0"
-    pixrem "^3.0.0"
-    postcss "^5.0.0"
-    postcss-color-rgba-fallback "^2.0.0"
-    postcss-opacity "^3.0.0"
-    postcss-pseudoelements "^3.0.0"
-    postcss-reporter "^1.2.1"
-    postcss-vmin "^2.0.0"
-    postcss-will-change "^1.0.0"
-    read-file-stdin "^0.2.0"
-    write-file-stdout "0.0.2"
-
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-
-lazy-req@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-1.1.0.tgz#bdaebead30f8d824039ce0ce149d4daa07ba1fac"
-
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  dependencies:
-    readable-stream "^2.0.5"
-
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  dependencies:
-    invert-kv "^1.0.0"
-
-lcov-parse@0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
-
-ldjson-stream@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ldjson-stream/-/ldjson-stream-1.2.1.tgz#91beceda5ac4ed2b17e649fb777e7abfa0189c2b"
-  dependencies:
-    split2 "^0.2.1"
-    through2 "^0.6.1"
-
-leven@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
-
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-lie@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  dependencies:
-    immediate "~3.0.5"
-
-load-json-file@^1.0.0, load-json-file@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-loader-runner@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
-
-loader-utils@0.2.16:
-  version "0.2.16"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-loader-utils@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
-lodash-es@^4.2.1:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
-
-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-
-lodash._basecreate@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-
-lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-
-lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
-lodash.assignin@^4.0.9:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
-
-lodash.bind@^4.1.4:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
-
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-
-lodash.create@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
-  dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._basecreate "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-
-lodash.defaults@^4.0.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  dependencies:
-    lodash._root "^3.0.0"
-
-lodash.filter@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
-
-lodash.flatten@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
-
-lodash.foreach@^4.3.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-
-lodash.isequal@^4.0.0, lodash.isequal@^4.1.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash.map@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
-
-lodash.memoize@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-
-lodash.merge@^4.4.0, lodash.merge@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
-
-lodash.pad@^4.1.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70"
-
-lodash.padend@^4.1.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e"
-
-lodash.padstart@^4.1.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"
-
-lodash.pick@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
-
-lodash.pickby@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
-
-lodash.reduce@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
-
-lodash.reject@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
-
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-
-lodash.some@^4.4.0, lodash.some@^4.5.1:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
-
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.template@^4.3.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
-  dependencies:
-    lodash._reinterpolate "~3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
-lodash.templatesettings@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
-  dependencies:
-    lodash._reinterpolate "~3.0.0"
-
-lodash.throttle@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
-
-lodash.uniq@^4.3.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-
-lodash@4.13.1, lodash@~4.13.1:
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.13.1.tgz#83e4b10913f48496d4d16fec4a560af2ee744b68"
-
-lodash@4.17.2:
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
-
-lodash@^3.6.0:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-
-lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.2:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
-log-driver@1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
-
-log-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  dependencies:
-    chalk "^1.0.0"
-
-logalot@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552"
-  dependencies:
-    figures "^1.3.5"
-    squeak "^1.0.0"
-
-loglevel@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.4.1.tgz#95b383f91a3c2756fd4ab093667e4309161f2bcd"
-
-lolex@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
-
-longest@^1.0.0, longest@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-  dependencies:
-    js-tokens "^3.0.0"
-
-loud-rejection@^1.0.0, loud-rejection@^1.2.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-
-lowercase-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-
-lpad-align@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/lpad-align/-/lpad-align-1.1.0.tgz#27fa786bcb695fc434ea1500723eb8d0bdc82bf4"
-  dependencies:
-    get-stdin "^4.0.1"
-    longest "^1.0.0"
-    lpad "^2.0.1"
-    meow "^3.3.0"
-
-lpad@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/lpad/-/lpad-2.0.1.tgz#28316b4e7b2015f511f6591459afc0e5944008ad"
-
-lru-cache@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
-  dependencies:
-    pseudomap "^1.0.1"
-    yallist "^2.0.0"
-
-macaddress@^0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
-
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-
-marked@0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
-
-material-ui-chip-input@0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/material-ui-chip-input/-/material-ui-chip-input-0.11.1.tgz#e92b2cc5c9741cd75d6b1822f1c7771ad4ce6c10"
-
-material-ui@0.16.5:
-  version "0.16.5"
-  resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-0.16.5.tgz#bb8661aac7cac8cb223a3e76f4f57ee18a4aefc1"
-  dependencies:
-    babel-runtime "^6.11.6"
-    inline-style-prefixer "^2.0.1"
-    keycode "^2.1.1"
-    lodash.merge "^4.6.0"
-    lodash.throttle "^4.1.1"
-    react-addons-create-fragment "^15.0.0"
-    react-addons-transition-group "^15.0.0"
-    react-event-listener "^0.4.0"
-    recompose "^0.20.2"
-    simple-assign "^0.1.0"
-    warning "^3.0.0"
-
-math-expression-evaluator@^1.2.14:
-  version "1.2.16"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
-
-"mdurl@~ 1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-
-memory-fs@^0.4.0, memory-fs@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-memorystream@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-
-meow@^3.1.0, meow@^3.3.0, meow@^3.5.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-
-merge-stream@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  dependencies:
-    readable-stream "^2.0.1"
-
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-
-micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-miller-rabin@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
-mime-db@~1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
-
-mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
-  version "2.1.15"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
-  dependencies:
-    mime-db "~1.27.0"
-
-mime@1.2.x:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
-
-mime@1.3.4, mime@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
-
-mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
-
-min-document@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
-  dependencies:
-    dom-walk "^0.1.0"
-
-minimalistic-assert@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
-
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
-  dependencies:
-    brace-expansion "^1.0.0"
-
-minimist@0.0.8, minimist@~0.0.1:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.2, minimist@^1.1.3, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
-mobx-react-devtools@4.2.10:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/mobx-react-devtools/-/mobx-react-devtools-4.2.10.tgz#79274bd8d44ba04d950728738a144541fa2a6012"
-
-mobx-react@4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-4.0.3.tgz#40eb31d25e0b8d63048eda2376cc56bfabd14f75"
-  dependencies:
-    hoist-non-react-statics "^1.2.0"
-
-mobx@2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/mobx/-/mobx-2.6.4.tgz#e05a91a5b2c97dac3fdab34024e6b74a7f4311ab"
-
-mocha@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.2.0.tgz#7dc4f45e5088075171a68896814e6ae9eb7a85e3"
-  dependencies:
-    browser-stdout "1.3.0"
-    commander "2.9.0"
-    debug "2.2.0"
-    diff "1.4.0"
-    escape-string-regexp "1.0.5"
-    glob "7.0.5"
-    growl "1.9.2"
-    json3 "3.3.2"
-    lodash.create "3.1.1"
-    mkdirp "0.5.1"
-    supports-color "3.1.2"
-
-mock-local-storage@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/mock-local-storage/-/mock-local-storage-1.0.2.tgz#a65a65cddab4707433d52ba4e9f6b63084b8c298"
-  dependencies:
-    core-js "^0.8.3"
-
-mock-socket@6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/mock-socket/-/mock-socket-6.0.4.tgz#85f58a0aa83bc1db4ca7d14b42d8f9dd663e7569"
-
-moment@2.17.0:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.0.tgz#a4c292e02aac5ddefb29a6eed24f51938dd3b74f"
-
-mozjpeg@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/mozjpeg/-/mozjpeg-4.1.1.tgz#859030b24f689a53db9b40f0160d89195b88fd50"
-  dependencies:
-    bin-build "^2.0.0"
-    bin-wrapper "^3.0.0"
-    logalot "^2.0.0"
-
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-
-ms@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
-multimatch@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
-
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  dependencies:
-    duplexer2 "0.0.2"
-
-mute-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
-
-mute-stream@0.0.7, mute-stream@~0.0.4:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-
-nan@^2.2.1, nan@^2.3.0, nan@^2.3.3:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
-
-napa@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/napa/-/napa-2.3.0.tgz#4196546d1a0b6bb94f37042053cc5ddd79731e53"
-  dependencies:
-    download "^4.4.1"
-    extend "^3.0.0"
-    load-json-file "^1.1.0"
-    minimist "^1.2.0"
-    mkdirp "^0.5.0"
-    npm-cache-filename "^1.0.1"
-    npmlog "^2.0.2"
-    rimraf "^2.5.1"
-    tar-pack "^3.1.2"
-    write-json-file "^1.2.0"
-
-native-promise-only@~0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-
-ncname@1.0.x:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c"
-  dependencies:
-    xml-char-classes "^1.0.0"
-
-negotiator@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-
-no-case@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
-  dependencies:
-    lower-case "^1.1.1"
-
-nock@9.0.7:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/nock/-/nock-9.0.7.tgz#cc93481bb15f38bec2a39c4442be07825235b1a1"
-  dependencies:
-    chai ">=1.9.2 <4.0.0"
-    debug "^2.2.0"
-    deep-equal "^1.0.0"
-    json-stringify-safe "^5.0.1"
-    lodash "~4.17.2"
-    mkdirp "^0.5.0"
-    propagate "0.4.0"
-    qs "^6.0.2"
-
-node-abi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.0.0.tgz#443bfd151b599231028ae425e592e76cd31cb537"
-
-node-dir@^0.1.10:
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.16.tgz#d2ef583aa50b90d93db8cdd26fcea58353957fe4"
-  dependencies:
-    minimatch "^3.0.2"
-
-node-emoji@^1.0.4:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.5.1.tgz#fd918e412769bf8c448051238233840b2aff16a1"
-  dependencies:
-    string.prototype.codepointat "^0.2.0"
-
-node-fetch@^1.0.1:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
-  dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
-
-node-gyp@^3.2.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.0.tgz#7474f63a3a0501161dda0b6341f022f14c423fa6"
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "2"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
-
-node-libs-browser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.1.4"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^1.0.0"
-    https-browserify "0.0.1"
-    os-browserify "^0.2.0"
-    path-browserify "0.0.0"
-    process "^0.11.0"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.0.5"
-    stream-browserify "^2.0.1"
-    stream-http "^2.3.1"
-    string_decoder "^0.10.25"
-    timers-browserify "^2.0.2"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.10.3"
-    vm-browserify "0.0.4"
-
-node-pre-gyp@^0.6.29:
-  version "0.6.34"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7"
-  dependencies:
-    mkdirp "^0.5.1"
-    nopt "^4.0.1"
-    npmlog "^4.0.2"
-    rc "^1.1.7"
-    request "^2.81.0"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
-
-node-status-codes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"
-
-noop-logger@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
-
-"nopt@2 || 3", nopt@3.x:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  dependencies:
-    abbrev "1"
-
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
-
-normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-
-normalize-selector@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
-
-normalize-url@^1.4.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
-
-npm-cache-filename@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11"
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  dependencies:
-    path-key "^2.0.0"
-
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.1"
-    set-blocking "~2.0.0"
-
-npmlog@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692"
-  dependencies:
-    ansi "~0.3.1"
-    are-we-there-yet "~1.1.2"
-    gauge "~1.2.5"
-
-nth-check@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
-  dependencies:
-    boolbase "~1.0.0"
-
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-
-"nwmatcher@>= 1.3.9 < 2.0.0":
-  version "1.3.9"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.3.9.tgz#8bab486ff7fa3dfd086656bbe8b17116d3692d2a"
-
-oauth-sign@~0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
-object-assign@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
-
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-
-object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
-object-is@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
-
-object-keys@^1.0.10, object-keys@^1.0.8:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
-
-object-path@^0.11.2:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.4.tgz#370ae752fbf37de3ea70a861c23bba8915691949"
-
-object.assign@^4.0.1, object.assign@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.0"
-    object-keys "^1.0.10"
-
-object.entries@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.6.1"
-    function-bind "^1.1.0"
-    has "^1.0.1"
-
-object.omit@^2.0.0, object.omit@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-object.values@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.6.1"
-    function-bind "^1.1.0"
-    has "^1.0.1"
-
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  dependencies:
-    ee-first "1.1.1"
-
-once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-once@~1.3.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
-  dependencies:
-    wrappy "1"
-
-onecolor@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.4.tgz#75a46f80da6c7aaa5b4daae17a47198bd9652494"
-
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  dependencies:
-    mimic-fn "^1.0.0"
-
-optimist@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
-optionator@^0.8.1, optionator@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    wordwrap "~1.0.0"
-
-optipng-bin@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-3.1.2.tgz#18c5a3388ed5d6f1e6ef1998ab0a6bcc8bdd0ca0"
-  dependencies:
-    bin-build "^2.0.0"
-    bin-wrapper "^3.0.0"
-    logalot "^2.0.0"
-
-ordered-read-streams@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
-  dependencies:
-    is-stream "^1.0.1"
-    readable-stream "^2.0.1"
-
-os-browserify@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
-
-os-filter-obj@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/os-filter-obj/-/os-filter-obj-1.0.3.tgz#5915330d90eced557d2d938a31c6dd214d9c63ad"
-
-os-homedir@^1.0.0, os-homedir@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  dependencies:
-    lcid "^1.0.0"
-
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-
-osenv@0, osenv@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-output-file-sync@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
-  dependencies:
-    graceful-fs "^4.1.4"
-    mkdirp "^0.5.1"
-    object-assign "^4.1.0"
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-
-p-limit@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
-
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  dependencies:
-    p-limit "^1.1.0"
-
-pako@~0.2.0:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
-
-param-case@2.1.x:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
-  dependencies:
-    no-case "^2.2.0"
-
-parse-asn1@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
-  dependencies:
-    asn1.js "^4.0.0"
-    browserify-aes "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-parse-json@^2.1.0, parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  dependencies:
-    error-ex "^1.2.0"
-
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
-
-parseurl@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-
-path-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  dependencies:
-    pinkie-promise "^2.0.0"
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-
-path-key@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-
-path-to-regexp@^1.0.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
-  dependencies:
-    isarray "0.0.1"
-
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-pbkdf2@^3.0.3:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.9.tgz#f2c4b25a600058b3c3773c086c37dbbee1ffe693"
-  dependencies:
-    create-hmac "^1.1.2"
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-
-performance-now@^0.2.0, performance-now@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
-phoneformat.js@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/phoneformat.js/-/phoneformat.js-1.0.3.tgz#11be3474e76474540fe3734cc33f1a65841d5f87"
-
-pify@^2.0.0, pify@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-pipetteur@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pipetteur/-/pipetteur-2.0.3.tgz#1955760959e8d1a11cb2a50ec83eec470633e49f"
-  dependencies:
-    onecolor "^3.0.4"
-    synesthesia "^1.0.1"
-
-pixrem@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/pixrem/-/pixrem-3.0.2.tgz#30d1bafb4c3bdce8e9bb4bd56a13985619320c34"
-  dependencies:
-    browserslist "^1.0.0"
-    postcss "^5.0.0"
-    reduce-css-calc "^1.2.7"
-
-pkg-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
-  dependencies:
-    find-up "^1.0.0"
-
-plur@^2.0.0, plur@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
-  dependencies:
-    irregular-plurals "^1.0.0"
-
-pluralize@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
-
-pngquant-bin@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/pngquant-bin/-/pngquant-bin-3.1.1.tgz#d124d98a75a9487f40c1640b4dbfcbb2bd5a1fd1"
-  dependencies:
-    bin-build "^2.0.0"
-    bin-wrapper "^3.0.0"
-    logalot "^2.0.0"
-
-postcss-alias@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-alias/-/postcss-alias-1.0.0.tgz#070c61ee1197af6ee5eb75d26adf48899b9d2f7b"
-  dependencies:
-    postcss "^5.0.0"
-
-postcss-calc@^5.2.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
-  dependencies:
-    postcss "^5.0.2"
-    postcss-message-helpers "^2.0.0"
-    reduce-css-calc "^1.2.6"
-
-postcss-clearfix@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-clearfix/-/postcss-clearfix-1.0.0.tgz#afec6a0e01d25dac36a54adb89ffd4bfe1d219af"
-  dependencies:
-    postcss "^5.0"
-
-postcss-color-rgba-fallback@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-2.2.0.tgz#6d29491be5990a93173d47e7c76f5810b09402ba"
-  dependencies:
-    postcss "^5.0.0"
-    postcss-value-parser "^3.0.2"
-    rgb-hex "^1.0.0"
-
-postcss-colormin@^2.1.8:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
-  dependencies:
-    colormin "^1.0.5"
-    postcss "^5.0.13"
-    postcss-value-parser "^3.2.3"
-
-postcss-convert-values@^2.3.4:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
-  dependencies:
-    postcss "^5.0.11"
-    postcss-value-parser "^3.1.2"
-
-postcss-discard-comments@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
-  dependencies:
-    postcss "^5.0.14"
-
-postcss-discard-duplicates@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-discard-empty@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
-  dependencies:
-    postcss "^5.0.14"
-
-postcss-discard-overridden@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
-  dependencies:
-    postcss "^5.0.16"
-
-postcss-discard-unused@^2.2.1:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
-  dependencies:
-    postcss "^5.0.14"
-    uniqs "^2.0.0"
-
-postcss-easings@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-easings/-/postcss-easings-0.3.0.tgz#23dccbf97587e28d5da19c3bae4b50698c5aad5e"
-  dependencies:
-    postcss "^5.0.2"
-
-postcss-filter-plugins@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
-  dependencies:
-    postcss "^5.0.4"
-    uniqid "^4.0.0"
-
-postcss-fontpath@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-fontpath/-/postcss-fontpath-0.3.0.tgz#28142a79dd18f2c9f0bf5c87f7a3eb794c53929e"
-  dependencies:
-    object-assign "^4.0.1"
-    postcss "^5.0.0"
-
-postcss-hexrgba@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-hexrgba/-/postcss-hexrgba-0.2.1.tgz#5c61abba439c0a38e49e7fbc0b3cd936119ec225"
-  dependencies:
-    postcss "^5.0.0"
-
-postcss-import@9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-9.1.0.tgz#95fe9876a1e79af49fbdc3589f01fe5aa7cc1e80"
-  dependencies:
-    object-assign "^4.0.1"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-    promise-each "^2.2.0"
-    read-cache "^1.0.0"
-    resolve "^1.1.7"
-
-postcss-input-style@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-input-style/-/postcss-input-style-0.3.0.tgz#e3b4fdb0aa441bed1930cbb44d8ad5634cf38540"
-  dependencies:
-    postcss "^5.0.0"
-
-postcss-less@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-0.14.0.tgz#c631b089c6cce422b9a10f3a958d2bedd3819324"
-  dependencies:
-    postcss "^5.0.21"
-
-postcss-load-config@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
-  dependencies:
-    cosmiconfig "^2.1.0"
-    object-assign "^4.1.0"
-    postcss-load-options "^1.2.0"
-    postcss-load-plugins "^2.3.0"
-
-postcss-load-options@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
-  dependencies:
-    cosmiconfig "^2.1.0"
-    object-assign "^4.1.0"
-
-postcss-load-plugins@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
-  dependencies:
-    cosmiconfig "^2.1.1"
-    object-assign "^4.1.0"
-
-postcss-loader@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-1.3.2.tgz#c568b61c2e48e274e1c224a2587fb566f4ec26f5"
-  dependencies:
-    loader-utils "^1.0.2"
-    object-assign "^4.1.1"
-    postcss "^5.2.15"
-    postcss-load-config "^1.2.0"
-
-postcss-media-query-parser@^0.2.0:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
-
-postcss-merge-idents@^2.1.5:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.10"
-    postcss-value-parser "^3.1.1"
-
-postcss-merge-longhand@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-merge-rules@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
-  dependencies:
-    browserslist "^1.5.2"
-    caniuse-api "^1.5.2"
-    postcss "^5.0.4"
-    postcss-selector-parser "^2.2.2"
-    vendors "^1.0.0"
-
-postcss-message-helpers@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
-
-postcss-minify-font-values@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
-  dependencies:
-    object-assign "^4.0.1"
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
-
-postcss-minify-gradients@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
-  dependencies:
-    postcss "^5.0.12"
-    postcss-value-parser "^3.3.0"
-
-postcss-minify-params@^1.0.4:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
-  dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.2"
-    postcss-value-parser "^3.0.2"
-    uniqs "^2.0.0"
-
-postcss-minify-selectors@^2.0.4:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
-  dependencies:
-    alphanum-sort "^1.0.2"
-    has "^1.0.1"
-    postcss "^5.0.14"
-    postcss-selector-parser "^2.0.0"
-
-postcss-modules-extract-imports@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-modules-local-by-default@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce"
-  dependencies:
-    css-selector-tokenizer "^0.6.0"
-    postcss "^5.0.4"
-
-postcss-modules-scope@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29"
-  dependencies:
-    css-selector-tokenizer "^0.6.0"
-    postcss "^5.0.4"
-
-postcss-modules-values@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
-  dependencies:
-    icss-replace-symbols "^1.0.2"
-    postcss "^5.0.14"
-
-postcss-nested@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-1.0.0.tgz#d136bd4b576bd5632df142c12b2198a9ccf794df"
-  dependencies:
-    postcss "^5.0.2"
-
-postcss-normalize-charset@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
-  dependencies:
-    postcss "^5.0.5"
-
-postcss-normalize-url@^3.0.7:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
-  dependencies:
-    is-absolute-url "^2.0.0"
-    normalize-url "^1.4.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-
-postcss-opacity@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-opacity/-/postcss-opacity-3.0.0.tgz#7879bcc734405bf74aa6c81c391762052fc55b29"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-opacity@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-opacity/-/postcss-opacity-4.0.0.tgz#aa562043da3394c94a3acedcf43f0c323d0986a1"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-ordered-values@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
-  dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.1"
-
-postcss-position@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/postcss-position/-/postcss-position-0.5.0.tgz#8653d4f0b84ffb07e544fb7f7eae08c6551b73a0"
-  dependencies:
-    postcss "^5.0.0"
-
-postcss-pseudoelements@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-pseudoelements/-/postcss-pseudoelements-3.0.0.tgz#6c682177c7900ba053b6df17f8c590284c7b8bbc"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-quantity-queries@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/postcss-quantity-queries/-/postcss-quantity-queries-0.4.0.tgz#be1370a7be9312a173639c0869aa4210244f86ce"
-  dependencies:
-    balanced-match "^0.2.0"
-    postcss "^5.0.4"
-
-postcss-reduce-idents@^2.2.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
-  dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
-
-postcss-reduce-initial@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-reduce-transforms@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.8"
-    postcss-value-parser "^3.0.1"
-
-postcss-reporter@^1.2.1, postcss-reporter@^1.3.3:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-1.4.1.tgz#c136f0a5b161915f379dd3765c61075f7e7b9af2"
-  dependencies:
-    chalk "^1.0.0"
-    lodash "^4.1.0"
-    log-symbols "^1.0.2"
-    postcss "^5.0.0"
-
-postcss-reporter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-2.0.0.tgz#d25e74ba7fce911e2aa72ec1ae592fade6ec3671"
-  dependencies:
-    chalk "^1.0.0"
-    lodash "^4.1.0"
-    log-symbols "^1.0.2"
-    postcss "^5.0.0"
-
-postcss-reporter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-3.0.0.tgz#09ea0f37a444c5693878606e09b018ebeff7cf8f"
-  dependencies:
-    chalk "^1.0.0"
-    lodash "^4.1.0"
-    log-symbols "^1.0.2"
-    postcss "^5.0.0"
-
-postcss-resolve-nested-selector@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
-
-postcss-responsive-type@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/postcss-responsive-type/-/postcss-responsive-type-0.5.1.tgz#274133bc046359e542a58bbc621847d040fd10e6"
-  dependencies:
-    postcss "^5.0.0"
-
-postcss-scss@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-0.4.1.tgz#ad771b81f0f72f5f4845d08aa60f93557653d54c"
-  dependencies:
-    postcss "^5.2.13"
-
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1, postcss-selector-parser@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
-  dependencies:
-    flatten "^1.0.2"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss-simple-vars@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-3.0.0.tgz#1fa4ccb4b7151d9f0d52fb8ea19a15c1319599d6"
-  dependencies:
-    postcss "^5.0.21"
-
-postcss-svgo@^2.1.1:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
-  dependencies:
-    is-svg "^2.0.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-    svgo "^0.7.0"
-
-postcss-unique-selectors@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
-  dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.4"
-    uniqs "^2.0.0"
-
-postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-
-postcss-vmin@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-vmin/-/postcss-vmin-2.0.0.tgz#5327c21191371256868fd7a739917f1474d57fee"
-  dependencies:
-    postcss "^5.0.0"
-
-postcss-will-change@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-will-change/-/postcss-will-change-1.1.0.tgz#a651dd5a81e82c412d39a6cf90a92bb3269af18c"
-  dependencies:
-    postcss "^5.0.16"
-
-postcss-zindex@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.4"
-    uniqs "^2.0.0"
-
-postcss@^5.0, postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.18, postcss@^5.0.2, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.13, postcss@^5.2.15, postcss@^5.2.16, postcss@^5.2.4:
-  version "5.2.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.16.tgz#732b3100000f9ff8379a48a53839ed097376ad57"
-  dependencies:
-    chalk "^1.1.3"
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.2.3"
-
-prebuild-install@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.1.1.tgz#d0a77ea51b6a00f928cb71bc0ccea24f87ec171e"
-  dependencies:
-    expand-template "^1.0.2"
-    github-from-package "0.0.0"
-    minimist "^1.2.0"
-    node-abi "^2.0.0"
-    noop-logger "^0.1.1"
-    npmlog "^4.0.1"
-    os-homedir "^1.0.1"
-    pump "^1.0.1"
-    rc "^1.1.6"
-    simple-get "^1.4.2"
-    tar-fs "^1.13.0"
-    tunnel-agent "^0.4.3"
-    xtend "4.0.1"
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-
-prepend-http@^1.0.0, prepend-http@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-
-pretty-error@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.0.3.tgz#bed3d816a008e76da617cde8216f4b778849b5d9"
-  dependencies:
-    renderkid "^2.0.1"
-    utila "~0.4"
-
-private@^0.1.6, private@~0.1.5:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
-
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-process@^0.11.0:
-  version "0.11.9"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
-
-process@~0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
-
-progress-bar-webpack-plugin@1.9.3:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.9.3.tgz#81fb8bd8e38da6edaf9a20beed79bd978dd63c2a"
-  dependencies:
-    chalk "^1.1.1"
-    object.assign "^4.0.1"
-    progress "^1.1.8"
-
-progress@1.1.8, progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-
-promise-each@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/promise-each/-/promise-each-2.2.0.tgz#3353174eff2694481037e04e01f77aa0fb6d1b60"
-  dependencies:
-    any-promise "^0.1.0"
-
-promise-worker@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/promise-worker/-/promise-worker-1.1.1.tgz#c2b75d045d249625c02264e2dff9ad22e031c69b"
-  dependencies:
-    is-promise "^2.1.0"
-    lie "^3.0.2"
-
-promise.pipe@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/promise.pipe/-/promise.pipe-3.0.0.tgz#b8f729867f54353996e6d8e86f3bbd56882e32a6"
-
-promise@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.1.1.tgz#489654c692616b8aa55b0724fa809bb7db49c5bf"
-  dependencies:
-    asap "~2.0.3"
-
-propagate@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/propagate/-/propagate-0.4.0.tgz#f3fcca0a6fe06736a7ba572966069617c130b481"
-
-proper-lockfile@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-2.0.0.tgz#b21f5e79bcbb6b4e23eeeced15cfc7f63e8a2e55"
-  dependencies:
-    graceful-fs "^4.1.2"
-    retry "^0.10.0"
-
-proxy-addr@~1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3"
-  dependencies:
-    forwarded "~0.1.0"
-    ipaddr.js "1.3.0"
-
-prr@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
-
-pseudomap@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-
-public-encrypt@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-
-pump@^1.0.0, pump@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51"
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
-punycode@^1.2.4, punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-push.js@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/push.js/-/push.js-0.0.11.tgz#4fad3a9f90844212e2aa67d073a23d470e32a891"
-
-q@^1.1.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
-
-qs@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
-
-qs@6.3.0, qs@^6.0.2, qs@~6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
-
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
-query-string@^4.1.0, query-string@^4.2.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.2.tgz#ec0fd765f58a50031a3968c2431386f8947a5cdd"
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-
-querystring@0.2.0, querystring@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-
-raf@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.3.0.tgz#93845eeffc773f8129039f677f80a36044eee2c3"
-  dependencies:
-    performance-now "~0.2.0"
-
-randomatic@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
-  dependencies:
-    is-number "^2.0.2"
-    kind-of "^3.0.2"
-
-randombytes@^2.0.0, randombytes@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec"
-
-range-parser@^1.0.3, range-parser@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-
-raw-loader@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
-
-rc@^1.1.2, rc@^1.1.6, rc@^1.1.7:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
-  dependencies:
-    deep-extend "~0.4.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-react-ace@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-4.1.0.tgz#659faa010d173f60d6a8940f0b325c5e422cab54"
-  dependencies:
-    brace "^0.8.0"
-    lodash.isequal "^4.1.1"
-
-react-addons-create-fragment@^15.0.0:
-  version "15.5.1"
-  resolved "https://registry.yarnpkg.com/react-addons-create-fragment/-/react-addons-create-fragment-15.5.1.tgz#62c2427ee1e32fcd511f612cf3fe326ef9671b1c"
-  dependencies:
-    fbjs "^0.8.4"
-    object-assign "^4.1.0"
-
-react-addons-css-transition-group@15.4.2:
-  version "15.4.2"
-  resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.4.2.tgz#b7828834dfa14229fe07750e331e8a8cb6fb7745"
-  dependencies:
-    fbjs "^0.8.4"
-    object-assign "^4.1.0"
-
-react-addons-perf@15.4.2:
-  version "15.4.2"
-  resolved "https://registry.yarnpkg.com/react-addons-perf/-/react-addons-perf-15.4.2.tgz#110bdcf5c459c4f77cb85ed634bcd3397536383b"
-  dependencies:
-    fbjs "^0.8.4"
-    object-assign "^4.1.0"
-
-react-addons-shallow-compare@^15.4.2:
-  version "15.5.0"
-  resolved "https://registry.yarnpkg.com/react-addons-shallow-compare/-/react-addons-shallow-compare-15.5.0.tgz#4d95c68a5537ccb75f395169b64db1745617fab5"
-  dependencies:
-    fbjs "^0.8.4"
-    object-assign "^4.1.0"
-
-react-addons-test-utils@15.4.2:
-  version "15.4.2"
-  resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.4.2.tgz#93bcaa718fcae7360d42e8fb1c09756cc36302a2"
-  dependencies:
-    fbjs "^0.8.4"
-    object-assign "^4.1.0"
-
-"react-addons-transition-group@^0.14.0 || ^15.0.0", react-addons-transition-group@^15.0.0:
-  version "15.5.0"
-  resolved "https://registry.yarnpkg.com/react-addons-transition-group/-/react-addons-transition-group-15.5.0.tgz#4a7dd48d2061f49a8977396f9e7c3f40f1b07a40"
-  dependencies:
-    fbjs "^0.8.4"
-    object-assign "^4.1.0"
-
-react-codemirror@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/react-codemirror/-/react-codemirror-0.3.0.tgz#cd6bd6ef458ec1e035cfd8b3fe7b30c8c7883c6c"
-  dependencies:
-    classnames "^2.2.5"
-    codemirror "^5.18.2"
-    lodash.debounce "^4.0.8"
-
-react-container-dimensions@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/react-container-dimensions/-/react-container-dimensions-1.2.0.tgz#bfb5e70e10aa82d2ecba49147d14bb4c22cafdaa"
-  dependencies:
-    element-resize-detector "^1.1.0"
-    invariant "^2.2.1"
-
-react-copy-to-clipboard@4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-4.2.3.tgz#268c5a0fbde9a95d96145014e7f85110b0e7fb8e"
-  dependencies:
-    copy-to-clipboard "^3"
-
-react-deep-force-update@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz#4f7f6c12c3e7de42f345992a3c518236fa1ecad3"
-
-react-dom@15.4.2:
-  version "15.4.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f"
-  dependencies:
-    fbjs "^0.8.1"
-    loose-envify "^1.1.0"
-    object-assign "^4.1.0"
-
-react-dropzone@3.7.3:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-3.7.3.tgz#7852b6652a43afc7fa072021f3369123ea4a61e0"
-  dependencies:
-    attr-accept "^1.0.3"
-
-react-element-to-jsx-string@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-6.0.0.tgz#f2c151476ee8dd817891ed352be4ace9fb3631c2"
-  dependencies:
-    collapse-white-space "^1.0.0"
-    is-plain-object "^2.0.1"
-    lodash "^4.17.4"
-    sortobject "^1.0.0"
-    stringify-object "^3.1.0"
-    traverse "^0.6.6"
-
-react-element-to-jsx-string@^5.0.0:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-5.0.7.tgz#c663a4800a9c712115c0d8519cb0215a46a1f0f2"
-  dependencies:
-    collapse-white-space "^1.0.0"
-    is-plain-object "^2.0.1"
-    lodash "^4.17.4"
-    sortobject "^1.0.0"
-    stringify-object "2.4.0"
-    traverse "^0.6.6"
-
-react-event-listener@0.4.1, react-event-listener@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.4.1.tgz#86b53974c3df651857766b7b177682ed7c7c8318"
-  dependencies:
-    babel-runtime "^6.20.0"
-    react-addons-shallow-compare "^15.4.2"
-    warning "^3.0.0"
-
-react-hot-loader@3.0.0-beta.6:
-  version "3.0.0-beta.6"
-  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-3.0.0-beta.6.tgz#463fac0bfc8b63a8385258af20c91636abce75f4"
-  dependencies:
-    babel-template "^6.7.0"
-    global "^4.3.0"
-    react-deep-force-update "^2.0.1"
-    react-proxy "^3.0.0-alpha.0"
-    redbox-react "^1.2.5"
-    source-map "^0.4.4"
-
-react-inspector@paritytech/react-inspector:
-  version "1.1.2"
-  resolved "https://codeload.github.com/paritytech/react-inspector/tar.gz/73b5214261a5131821eb9088f58d7e5f31210c23"
-  dependencies:
-    babel-runtime "^6.9.2"
-    is-dom "^1.0.5"
-
-react-intl-aggregate-webpack-plugin@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/react-intl-aggregate-webpack-plugin/-/react-intl-aggregate-webpack-plugin-0.0.1.tgz#c29958860d7bcdfa6f460dec79f55ae0220488c6"
-  dependencies:
-    mkdirp "^0.5.1"
-
-react-intl@2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.1.5.tgz#f9795ea34b790dcb5d0d8ef7060dddbe85bf8763"
-  dependencies:
-    intl-format-cache "^2.0.5"
-    intl-messageformat "^1.3.0"
-    intl-relativeformat "^1.3.0"
-    invariant "^2.1.1"
-
-react-markdown@2.4.4:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-2.4.4.tgz#26d825438d292e7ca6e292fe76201e1dbf2cfeee"
-  dependencies:
-    commonmark "^0.24.0"
-    commonmark-react-renderer "^4.2.4"
-    in-publish "^2.0.0"
-
-react-portal@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-3.0.0.tgz#9304fce836e8a3216b22588f8dc91b447728f0ae"
-
-react-proxy@^3.0.0-alpha.0:
-  version "3.0.0-alpha.1"
-  resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz#4400426bcfa80caa6724c7755695315209fa4b07"
-  dependencies:
-    lodash "^4.6.1"
-
-react-qr-reader@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/react-qr-reader/-/react-qr-reader-1.0.3.tgz#9cd9e526cb2ae3ef2eabd7b3798172b8990d11ce"
-  dependencies:
-    jsqr "^0.2.1"
-    webrtc-adapter "^2.0.8"
-
-react-redux@4.4.6:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-4.4.6.tgz#4b9d32985307a11096a2dd61561980044fcc6209"
-  dependencies:
-    hoist-non-react-statics "^1.0.3"
-    invariant "^2.0.0"
-    lodash "^4.2.0"
-    loose-envify "^1.1.0"
-
-react-router-redux@4.0.7:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-4.0.7.tgz#9b1fde4e70106c50f47214e12bdd888cfb96e2a6"
-
-react-router@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.0.0.tgz#3f313e4dbaf57048c48dd0a8c3cac24d93667dff"
-  dependencies:
-    history "^3.0.0"
-    hoist-non-react-statics "^1.2.0"
-    invariant "^2.2.1"
-    loose-envify "^1.2.0"
-    warning "^3.0.0"
-
-react-smooth@0.1.11:
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/react-smooth/-/react-smooth-0.1.11.tgz#f389f8e58cbb546abb4921ca0cbe7b079bc51a0d"
-  dependencies:
-    lodash "~4.13.1"
-    raf "^3.2.0"
-    react-addons-transition-group "^0.14.0 || ^15.0.0"
-
-react-tap-event-plugin@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/react-tap-event-plugin/-/react-tap-event-plugin-2.0.1.tgz#316beb3bc6556e29ec869a7293e89c826a9074d2"
-  dependencies:
-    fbjs "^0.8.6"
-
-react-tooltip@3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-3.2.2.tgz#3a599c0eabbd9eb9597aa2d72b217fd7ba358767"
-  dependencies:
-    classnames "^2.2.0"
-
-react@15.4.2:
-  version "15.4.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef"
-  dependencies:
-    fbjs "^0.8.4"
-    loose-envify "^1.1.0"
-    object-assign "^4.1.0"
-
-read-all-stream@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"
-  dependencies:
-    pinkie-promise "^2.0.0"
-    readable-stream "^2.0.0"
-
-read-cache@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  dependencies:
-    pify "^2.3.0"
-
-read-file-stdin@^0.2.0, read-file-stdin@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/read-file-stdin/-/read-file-stdin-0.2.1.tgz#25eccff3a153b6809afacb23ee15387db9e0ee61"
-  dependencies:
-    gather-stream "^1.0.0"
-
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-read@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
-  dependencies:
-    mute-stream "~0.0.4"
-
-readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^1.0.33, readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816"
-  dependencies:
-    buffer-shims "^1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
-readdirp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
-  dependencies:
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    readable-stream "^2.0.2"
-    set-immediate-shim "^1.0.1"
-
-readline2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    mute-stream "0.0.5"
-
-recast@~0.11.12:
-  version "0.11.23"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
-  dependencies:
-    ast-types "0.9.6"
-    esprima "~3.1.0"
-    private "~0.1.5"
-    source-map "~0.5.0"
-
-recharts-scale@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/recharts-scale/-/recharts-scale-0.2.1.tgz#378f543ed17c3245e4d9afb10aaf6298240d2fcb"
-
-recharts@0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/recharts/-/recharts-0.15.2.tgz#636f21a341f00b31c925739ed4aef70adb55d80f"
-  dependencies:
-    classnames "2.2.5"
-    core-js "2.4.0"
-    d3-scale "1.0.0"
-    d3-shape "1.0.0"
-    lodash "4.13.1"
-    react-container-dimensions "1.2.0"
-    react-smooth "0.1.11"
-    recharts-scale "0.2.1"
-    reduce-css-calc "^1.3.0"
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  dependencies:
-    resolve "^1.1.6"
-
-recompose@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.20.2.tgz#113d6ac7e29ca664cfffec16b681ddddf15250bc"
-  dependencies:
-    change-emitter "^0.1.2"
-    fbjs "^0.8.1"
-    hoist-non-react-statics "^1.0.0"
-    symbol-observable "^0.2.4"
-
-redbox-react@^1.2.5:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/redbox-react/-/redbox-react-1.3.4.tgz#3d882bb62cc7c8f6256279d12f05c6a5a96d24c6"
-  dependencies:
-    error-stack-parser "^1.3.6"
-    object-assign "^4.0.1"
-
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
-reduce-css-calc@^1.2.6, reduce-css-calc@^1.2.7, reduce-css-calc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
-  dependencies:
-    balanced-match "^0.4.2"
-    math-expression-evaluator "^1.2.14"
-    reduce-function-call "^1.0.1"
-
-reduce-function-call@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
-  dependencies:
-    balanced-match "^0.4.2"
-
-reduce-reducers@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.1.2.tgz#fa1b4718bc5292a71ddd1e5d839c9bea9770f14b"
-
-redux-actions@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-1.1.0.tgz#df8ec791d9e267544e58a8ba2b72fc5c30afba3b"
-  dependencies:
-    invariant "^2.2.1"
-    lodash "^4.13.1"
-    reduce-reducers "^0.1.0"
-
-redux-thunk@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.1.0.tgz#c724bfee75dbe352da2e3ba9bc14302badd89a98"
-
-redux@3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-3.6.0.tgz#887c2b3d0b9bd86eca2be70571c27654c19e188d"
-  dependencies:
-    lodash "^4.2.1"
-    lodash-es "^4.2.1"
-    loose-envify "^1.1.0"
-    symbol-observable "^1.0.2"
-
-regenerate@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
-
-regenerator-runtime@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e"
-
-regenerator-transform@0.9.8:
-  version "0.9.8"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.8.tgz#0f88bb2bc03932ddb7b6b7312e68078f01026d6c"
-  dependencies:
-    babel-runtime "^6.18.0"
-    babel-types "^6.19.0"
-    private "^0.1.6"
-
-regex-cache@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
-  dependencies:
-    is-equal-shallow "^0.1.3"
-    is-primitive "^2.0.0"
-
-regexpu-core@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
-regexpu-core@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
-regjsgen@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-
-regjsparser@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-  dependencies:
-    jsesc "~0.5.0"
-
-relateurl@0.2.x:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-
-remove-trailing-separator@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
-
-renderkid@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
-  dependencies:
-    css-select "^1.1.0"
-    dom-converter "~0.1"
-    htmlparser2 "~3.3.0"
-    strip-ansi "^3.0.0"
-    utila "~0.3"
-
-repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  dependencies:
-    is-finite "^1.0.0"
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-
-request-capture-har@^1.1.4:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/request-capture-har/-/request-capture-har-1.2.2.tgz#cd692cfb2cc744fd84a3358aac6ee51528cf720d"
-
-request@2, request@^2.75.0, request@^2.79.0, request@^2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
-request@2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-
-require-from-string@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
-
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-
-require-uncached@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
-requires-port@1.x.x:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-
-resolve-from@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
-
-resolve@^1.1.6, resolve@^1.1.7:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
-  dependencies:
-    path-parse "^1.0.5"
-
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
-
-retry@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
-
-rgb-hex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rgb-hex/-/rgb-hex-1.0.0.tgz#bfaf8cd9cd9164b5a26d71eb4f15a0965324b3c1"
-
-right-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-  dependencies:
-    align-text "^0.1.1"
-
-rimraf@2, rimraf@^2.2.6, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.0, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
-  dependencies:
-    glob "^7.0.5"
-
-ripemd160@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"
-
-rlp@2.0.0, rlp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.0.0.tgz#9db384ff4b89a8f61563d92395d8625b18f3afb0"
-
-roadrunner@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/roadrunner/-/roadrunner-1.1.0.tgz#1180a30d64e1970d8f55dd8cb0da8ffccecad71e"
-
-rucksack-css@0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/rucksack-css/-/rucksack-css-0.9.1.tgz#da7eba4c67bd05b00cbf4c834305c5fe55375de1"
-  dependencies:
-    autoprefixer "^6.0.0"
-    laggard "^0.1.0"
-    minimist "^1.1.2"
-    postcss "^5.0.0"
-    postcss-alias "^1.0.0"
-    postcss-clearfix "^1.0.0"
-    postcss-color-rgba-fallback "^2.0.0"
-    postcss-easings "^0.3.0"
-    postcss-fontpath "^0.3.0"
-    postcss-hexrgba "^0.2.0"
-    postcss-input-style "^0.3.0"
-    postcss-opacity "^4.0.0"
-    postcss-position "^0.5.0"
-    postcss-pseudoelements "^3.0.0"
-    postcss-quantity-queries "^0.4.0"
-    postcss-reporter "^2.0.0"
-    postcss-responsive-type "^0.5.0"
-    postcss-vmin "^2.0.0"
-    read-file-stdin "^0.2.0"
-    write-file-stdout "^0.0.2"
-
-run-async@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
-  dependencies:
-    once "^1.3.0"
-
-run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  dependencies:
-    is-promise "^2.1.0"
-
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
-
-rx@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
-
-safe-buffer@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
-
-samsam@1.1.2, samsam@~1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
-
-sax@^1.2.1, sax@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
-
-script-ext-html-webpack-plugin@1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.7.1.tgz#ae9c0e26d7767d4aa793c76e3550344ec08b6d10"
-  dependencies:
-    debug "^2.3.3"
-
-scryptsy@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.0.0.tgz#262c36f0231cfa7654e2363fa394cd2dec66f378"
-
-sdp@^1.0.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/sdp/-/sdp-1.4.1.tgz#68e1a8d88e3a10ae098aaf32b147b70851b42165"
-
-secp256k1@3.2.5, secp256k1@^3.0.1:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.2.5.tgz#0dde5b27e5021665f6dffca7b2c3e010c6c13c93"
-  dependencies:
-    bindings "^1.2.1"
-    bip66 "^1.1.3"
-    bn.js "^4.11.3"
-    create-hash "^1.1.2"
-    drbg.js "^1.0.1"
-    elliptic "^6.2.3"
-    nan "^2.2.1"
-    prebuild-install "^2.0.0"
-
-seek-bzip@^1.0.3:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
-  dependencies:
-    commander "~2.8.1"
-
-semver-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
-
-semver-truncate@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-1.1.2.tgz#57f41de69707a62709a7e0104ba2117109ea47e8"
-  dependencies:
-    semver "^5.3.0"
-
-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
-semver@^4.0.3:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-
-send@0.14.2:
-  version "0.14.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.14.2.tgz#39b0438b3f510be5dc6f667a11f71689368cdeef"
-  dependencies:
-    debug "~2.2.0"
-    depd "~1.1.0"
-    destroy "~1.0.4"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    etag "~1.7.0"
-    fresh "0.3.0"
-    http-errors "~1.5.1"
-    mime "1.3.4"
-    ms "0.7.2"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.3.1"
-
-serve-static@~1.11.2:
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.11.2.tgz#2cf9889bd4435a320cc36895c9aa57bd662e6ac7"
-  dependencies:
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    parseurl "~1.3.1"
-    send "0.14.2"
-
-serviceworker-cache-polyfill@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz#de19ee73bef21ab3c0740a37b33db62464babdeb"
-
-serviceworker-webpack-plugin@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/serviceworker-webpack-plugin/-/serviceworker-webpack-plugin-0.2.0.tgz#6de9dec82ed144c754c6f15b343e7b8764ac5b28"
-  dependencies:
-    minimatch "^3.0.3"
-
-set-blocking@^2.0.0, set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-
-set-immediate-shim@^1.0.0, set-immediate-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-
-setimmediate@^1.0.4, setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
-setprototypeof@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08"
-
-sha.js@^2.3.6:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
-  dependencies:
-    inherits "^2.0.1"
-
-shelljs@^0.7.5:
-  version "0.7.7"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-
-simple-assign@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/simple-assign/-/simple-assign-0.1.0.tgz#17fd3066a5f3d7738f50321bb0f14ca281cc4baa"
-
-simple-get@^1.4.2:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-1.4.3.tgz#e9755eda407e96da40c5e5158c9ea37b33becbeb"
-  dependencies:
-    once "^1.3.1"
-    unzip-response "^1.0.0"
-    xtend "^4.0.0"
-
-sinon-as-promised@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/sinon-as-promised/-/sinon-as-promised-4.0.2.tgz#120e9ce033daa39648dc429062fe660be1b5b412"
-  dependencies:
-    create-thenable "~1.0.0"
-    native-promise-only "~0.8.1"
-
-sinon-chai@2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-2.8.0.tgz#432a9bbfd51a6fc00798f4d2526a829c060687ac"
-
-sinon@1.17.7:
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.7.tgz#4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"
-  dependencies:
-    formatio "1.1.1"
-    lolex "1.3.2"
-    samsam "1.1.2"
-    util ">=0.10.3 <1"
-
-sjcl@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/sjcl/-/sjcl-1.0.6.tgz#6415462a63cc0d4215c49baec9d3fa0c1b53520f"
-
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-
-slide@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  dependencies:
-    hoek "2.x.x"
-
-solc@ngotchac/solc-js:
-  version "0.4.4"
-  resolved "https://codeload.github.com/ngotchac/solc-js/tar.gz/04eb38cc3003fba8cb3656653a7941ed36408818"
-  dependencies:
-    memorystream "^0.3.1"
-    require-from-string "^1.1.0"
-    yargs "^4.7.1"
-
-sort-keys@^1.0.0, sort-keys@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  dependencies:
-    is-plain-obj "^1.0.0"
-
-sortobject@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/sortobject/-/sortobject-1.1.1.tgz#4f695d4d44ed0a4c06482c34c2582a2dcdc2ab34"
-  dependencies:
-    editions "^1.1.1"
-
-source-list-map@^0.1.4, source-list-map@~0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
-
-source-map-support@^0.4.2:
-  version "0.4.14"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef"
-  dependencies:
-    source-map "^0.5.6"
-
-source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
-source-map@^0.4.2, source-map@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
-  dependencies:
-    amdefine ">=0.0.4"
-
-sparkles@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
-
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
-  dependencies:
-    spdx-license-ids "^1.0.2"
-
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
-
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
-
-specificity@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.0.tgz#332472d4e5eb5af20821171933998a6bc3b1ce6f"
-
-split2@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-0.2.1.tgz#02ddac9adc03ec0bb78c1282ec079ca6e85ae900"
-  dependencies:
-    through2 "~0.6.1"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-
-squeak@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/squeak/-/squeak-1.3.0.tgz#33045037b64388b567674b84322a6521073916c3"
-  dependencies:
-    chalk "^1.0.0"
-    console-stream "^0.1.1"
-    lpad-align "^1.0.1"
-
-sshpk@^1.7.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jodid25519 "^1.0.0"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-stackframe@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-0.3.1.tgz#33aa84f1177a5548c8935533cbfeb3420975f5a4"
-
-stat-mode@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-
-"statuses@>= 1.3.1 < 2", statuses@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-
-store@1.3.20:
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/store/-/store-1.3.20.tgz#13ea7e3fb2d6c239868265d686b1d84e99c5be3e"
-
-stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
-stream-combiner2@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
-  dependencies:
-    duplexer2 "~0.1.0"
-    readable-stream "^2.0.2"
-
-stream-combiner@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
-  dependencies:
-    duplexer "~0.1.1"
-    through "~2.3.4"
-
-stream-http@^2.3.1:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.2.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-
-string-width@^1.0.1, string-width@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^3.0.0"
-
-string.prototype.codepointat@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz#6b26e9bd3afcaa7be3b4269b526de1b82000ac78"
-
-string.prototype.repeat@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"
-
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-stringify-object@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-2.4.0.tgz#c62d11023eb21fe2d9b087be039a26df3b22a09d"
-  dependencies:
-    is-plain-obj "^1.0.0"
-    is-regexp "^1.0.0"
-
-stringify-object@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.0.tgz#94370a135e41bc048358813bf99481f1315c6aa6"
-  dependencies:
-    get-own-enumerable-property-symbols "^1.0.1"
-    is-obj "^1.0.1"
-    is-regexp "^1.0.0"
-
-stringstream@~0.0.4:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-bom-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    strip-bom "^2.0.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  dependencies:
-    is-utf8 "^0.2.0"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-
-strip-dirs@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-1.1.1.tgz#960bbd1287844f3975a4558aa103a8255e2456a0"
-  dependencies:
-    chalk "^1.0.0"
-    get-stdin "^4.0.1"
-    is-absolute "^0.1.5"
-    is-natural-number "^2.0.0"
-    minimist "^1.1.0"
-    sum-up "^1.0.1"
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-
-strip-hex-prefix@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz#0c5f155fef1151373377de9dbb588da05500e36f"
-  dependencies:
-    is-hex-prefixed "1.0.0"
-
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  dependencies:
-    get-stdin "^4.0.1"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-
-strip-outer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.0.tgz#aac0ba60d2e90c5d4f275fd8869fd9a2d310ffb8"
-  dependencies:
-    escape-string-regexp "^1.0.2"
-
-style-loader@0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.1.tgz#468280efbc0473023cd3a6cd56e33b5a1d7fc3a9"
-  dependencies:
-    loader-utils "^0.2.7"
-
-style-search@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
-
-stylehacks@^2.3.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-2.3.2.tgz#64c83e0438a68c9edf449e8c552a7d9ab6009b0b"
-  dependencies:
-    browserslist "^1.1.3"
-    chalk "^1.1.1"
-    log-symbols "^1.0.2"
-    minimist "^1.2.0"
-    plur "^2.1.2"
-    postcss "^5.0.18"
-    postcss-reporter "^1.3.3"
-    postcss-selector-parser "^2.0.0"
-    read-file-stdin "^0.2.1"
-    text-table "^0.2.0"
-    write-file-stdout "0.0.2"
-
-stylelint-config-standard@16.0.0:
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-16.0.0.tgz#bb7387bff1d7dd7186a52b3ebf885b2405d691bf"
-
-stylelint@7.9.0:
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.9.0.tgz#b8d9ea20f887ab351075c6aded9528de24509327"
-  dependencies:
-    autoprefixer "^6.0.0"
-    balanced-match "^0.4.0"
-    chalk "^1.1.1"
-    colorguard "^1.2.0"
-    cosmiconfig "^2.1.1"
-    doiuse "^2.4.1"
-    execall "^1.0.0"
-    get-stdin "^5.0.0"
-    globby "^6.0.0"
-    globjoin "^0.1.4"
-    html-tags "^1.1.1"
-    ignore "^3.2.0"
-    known-css-properties "^0.0.6"
-    lodash "^4.17.4"
-    log-symbols "^1.0.2"
-    meow "^3.3.0"
-    micromatch "^2.3.11"
-    normalize-selector "^0.2.0"
-    postcss "^5.0.20"
-    postcss-less "^0.14.0"
-    postcss-media-query-parser "^0.2.0"
-    postcss-reporter "^3.0.0"
-    postcss-resolve-nested-selector "^0.1.1"
-    postcss-scss "^0.4.0"
-    postcss-selector-parser "^2.1.1"
-    postcss-value-parser "^3.1.1"
-    resolve-from "^2.0.0"
-    specificity "^0.3.0"
-    string-width "^2.0.0"
-    style-search "^0.1.0"
-    stylehacks "^2.3.0"
-    sugarss "^0.2.0"
-    svg-tags "^1.0.0"
-    table "^4.0.1"
-
-sugarss@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e"
-  dependencies:
-    postcss "^5.2.4"
-
-sum-up@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
-  dependencies:
-    chalk "^1.0.0"
-
-supports-color@3.1.2, supports-color@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-  dependencies:
-    has-flag "^1.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-supports-color@^3.1.2, supports-color@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  dependencies:
-    has-flag "^1.0.0"
-
-svg-tags@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
-
-svgo@^0.7.0:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
-  dependencies:
-    coa "~1.0.1"
-    colors "~1.1.2"
-    csso "~2.3.1"
-    js-yaml "~3.7.0"
-    mkdirp "~0.5.1"
-    sax "~1.2.1"
-    whet.extend "~0.9.9"
-
-sw-toolbox@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/sw-toolbox/-/sw-toolbox-3.6.0.tgz#26df1d1c70348658e4dea2884319149b7b3183b5"
-  dependencies:
-    path-to-regexp "^1.0.1"
-    serviceworker-cache-polyfill "^4.0.0"
-
-symbol-observable@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
-
-symbol-observable@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
-
-symbol-tree@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
-
-synesthesia@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/synesthesia/-/synesthesia-1.0.1.tgz#5ef95ea548c0d5c6e6f9bb4b0d0731dff864a777"
-  dependencies:
-    css-color-names "0.0.3"
-
-table@^3.7.8:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
-  dependencies:
-    ajv "^4.7.0"
-    ajv-keywords "^1.0.0"
-    chalk "^1.1.1"
-    lodash "^4.0.0"
-    slice-ansi "0.0.4"
-    string-width "^2.0.0"
-
-table@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"
-  dependencies:
-    ajv "^4.7.0"
-    ajv-keywords "^1.0.0"
-    chalk "^1.1.1"
-    lodash "^4.0.0"
-    slice-ansi "0.0.4"
-    string-width "^2.0.0"
-
-tapable@^0.2.5, tapable@~0.2.5:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
-
-tar-fs@^1.13.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.15.2.tgz#761f5b32932c7b39461a60d537faea0d8084830c"
-  dependencies:
-    chownr "^1.0.1"
-    mkdirp "^0.5.1"
-    pump "^1.0.0"
-    tar-stream "^1.1.2"
-
-tar-pack@^3.1.2, tar-pack@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
-  dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
-tar-stream@^1.1.1, tar-stream@^1.1.2, tar-stream@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.2.tgz#fbc6c6e83c1a19d4cb48c7d96171fc248effc7bf"
-  dependencies:
-    bl "^1.0.0"
-    end-of-stream "^1.0.0"
-    readable-stream "^2.0.0"
-    xtend "^4.0.0"
-
-tar@^2.0.0, tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-tempfile@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
-  dependencies:
-    os-tmpdir "^1.0.0"
-    uuid "^2.0.1"
-
-text-table@^0.2.0, text-table@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-
-through2-filter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@^0.6.0, through2@^0.6.1, through2@^0.6.3, through2@~0.6.1:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
-through2@^2.0.0, through2@~2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-"through@>=2.2.7 <3", through@^2.3.6, through@~2.3.4, through@~2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
-time-stamp@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
-
-timed-out@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217"
-
-timers-browserify@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
-  dependencies:
-    setimmediate "^1.0.4"
-
-tmp@^0.0.31:
-  version "0.0.31"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
-  dependencies:
-    os-tmpdir "~1.0.1"
-
-to-absolute-glob@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
-  dependencies:
-    extend-shallow "^2.0.1"
-
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-
-to-fast-properties@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
-
-to-source@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/to-source/-/to-source-2.0.3.tgz#5387f8259cf35762b3e3e9b5c2dcd8e3db9a2d15"
-
-toggle-selection@^1.0.3:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.5.tgz#726c703de607193a73c32c7df49cd24950fc574f"
-
-toposort@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
-
-tough-cookie@^2.3.2, tough-cookie@~2.3.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
-  dependencies:
-    punycode "^1.4.1"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-
-traverse@^0.6.6:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
-
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-
-trim-repeated@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
-  dependencies:
-    escape-string-regexp "^1.0.2"
-
-trim-right@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-
-tryit@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
-
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-
-tunnel-agent@^0.4.0, tunnel-agent@^0.4.3, tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  dependencies:
-    prelude-ls "~1.1.2"
-
-type-detect@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
-
-type-detect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
-
-type-is@~1.6.14:
-  version "1.6.15"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.15"
-
-typedarray-to-buffer@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.2.tgz#1017b32d984ff556eba100f501589aba1ace2e04"
-  dependencies:
-    is-typedarray "^1.0.0"
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-
-u2f-api-polyfill@0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/u2f-api-polyfill/-/u2f-api-polyfill-0.4.3.tgz#b7ad165a6f962558517a867c5c4bf9399fcf7e98"
-
-u2f-api@0.0.9:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/u2f-api/-/u2f-api-0.0.9.tgz#bded457ba5a9a9ee9b58b3de291f8c1f8feacb7a"
-
-ua-parser-js@^0.7.9:
-  version "0.7.12"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
-
-uglify-js@2.8.16, uglify-js@2.8.x, uglify-js@^2.6, uglify-js@^2.7.5:
-  version "2.8.16"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.16.tgz#d286190b6eefc6fd65eb0ecac6551e0b0e8839a4"
-  dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
-
-uglify-to-browserify@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-
-uid-number@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-
-uniqid@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
-  dependencies:
-    macaddress "^0.2.8"
-
-uniqs@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
-
-unique-concat@~0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/unique-concat/-/unique-concat-0.2.2.tgz#9210f9bdcaacc5e1e3929490d7c019df96f18712"
-
-unique-stream@^2.0.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
-  dependencies:
-    json-stable-stringify "^1.0.0"
-    through2-filter "^2.0.0"
-
-unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-
-unzip-response@^1.0.0, unzip-response@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
-
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
-
-url-loader@0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.7.tgz#67e8779759f8000da74994906680c943a9b0925d"
-  dependencies:
-    loader-utils "0.2.x"
-    mime "1.2.x"
-
-url-parse-lax@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  dependencies:
-    prepend-http "^1.0.1"
-
-url-regex@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz#dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"
-  dependencies:
-    ip-regex "^1.0.1"
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
-user-home@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
-
-user-home@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
-  dependencies:
-    os-homedir "^1.0.0"
-
-useragent.js@0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/useragent.js/-/useragent.js-0.5.6.tgz#a76aef101e2483702523ff6fb58a400af77e22a9"
-
-utf8@2.1.2, utf8@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-util@0.10.3, "util@>=0.10.3 <1", util@^0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  dependencies:
-    inherits "2.0.1"
-
-utila@~0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
-
-utila@~0.4:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
-
-utils-merge@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
-
-uuid@3.0.0, uuid@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.0.tgz#6728fc0459c450d796a99c31837569bdf672d728"
-
-uuid@^2.0.1, uuid@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
-
-v8flags@^2.0.10:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.0.12.tgz#73235d9f7176f8e8833fb286795445f7938d84e5"
-  dependencies:
-    user-home "^1.1.1"
-
-vali-date@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
-
-valid-url@1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200"
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
-  dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
-
-validator@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-4.0.2.tgz#70a1c2525ec4744e409971c1b298aa69a7534251"
-
-validator@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-6.2.0.tgz#b2cccdc49ff0f4b8ee4e61dba2ddd3dde13f23e7"
-
-vary@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
-
-vendors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
-
-verror@1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
-  dependencies:
-    extsprintf "1.0.2"
-
-vinyl-assign@^1.0.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl-assign/-/vinyl-assign-1.2.1.tgz#4d198891b5515911d771a8cd9c5480a46a074a45"
-  dependencies:
-    object-assign "^4.0.1"
-    readable-stream "^2.0.0"
-
-vinyl-fs@^2.2.0:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239"
-  dependencies:
-    duplexify "^3.2.0"
-    glob-stream "^5.3.2"
-    graceful-fs "^4.0.0"
-    gulp-sourcemaps "1.6.0"
-    is-valid-glob "^0.3.0"
-    lazystream "^1.0.0"
-    lodash.isequal "^4.0.0"
-    merge-stream "^1.0.0"
-    mkdirp "^0.5.0"
-    object-assign "^4.0.0"
-    readable-stream "^2.0.4"
-    strip-bom "^2.0.0"
-    strip-bom-stream "^1.0.0"
-    through2 "^2.0.0"
-    through2-filter "^2.0.0"
-    vali-date "^1.0.0"
-    vinyl "^1.0.0"
-
-vinyl@^0.4.3:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  dependencies:
-    clone "^0.2.0"
-    clone-stats "^0.0.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vm-browserify@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  dependencies:
-    indexof "0.0.1"
-
-w3c-blob@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/w3c-blob/-/w3c-blob-0.0.1.tgz#b0cd352a1a50f515563420ffd5861f950f1d85b8"
-
-ware@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ware/-/ware-1.3.0.tgz#d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"
-  dependencies:
-    wrap-fn "^0.1.0"
-
-warning@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
-  dependencies:
-    loose-envify "^1.0.0"
-
-watchpack@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
-  dependencies:
-    async "^2.1.2"
-    chokidar "^1.4.3"
-    graceful-fs "^4.1.2"
-
-web3@0.17.0-beta:
-  version "0.17.0-beta"
-  resolved "https://registry.yarnpkg.com/web3/-/web3-0.17.0-beta.tgz#57af38245bff7a32099f7ce5780fad5bbc00da5b"
-  dependencies:
-    bignumber.js "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
-    crypto-js "^3.1.4"
-    utf8 "^2.1.1"
-    xmlhttprequest "*"
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-
-webidl-conversions@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
-
-webpack-bundle-size-analyzer@2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-size-analyzer/-/webpack-bundle-size-analyzer-2.5.0.tgz#939ea465e4559353a9fce40af511820f216a9c80"
-  dependencies:
-    commander "^2.7.1"
-    filesize "^3.1.2"
-    humanize "0.0.9"
-
-webpack-dev-middleware@1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893"
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^1.3.4"
-    path-is-absolute "^1.0.0"
-    range-parser "^1.0.3"
-
-webpack-error-notification@0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/webpack-error-notification/-/webpack-error-notification-0.1.6.tgz#ebfcbd4ef46b83466b59c12fde8790168f47a257"
-
-webpack-hot-middleware@2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.17.1.tgz#0c8fbf6f93ff29c095d684b07ab6d6c0f2f951d7"
-  dependencies:
-    ansi-html "0.0.7"
-    html-entities "^1.2.0"
-    querystring "^0.2.0"
-    strip-ansi "^3.0.0"
-
-webpack-sources@^0.1.0, webpack-sources@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
-  dependencies:
-    source-list-map "~0.1.7"
-    source-map "~0.5.3"
-
-webpack@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.1.tgz#7bb1d72ae2087dd1a4af526afec15eed17dda475"
-  dependencies:
-    acorn "^4.0.4"
-    acorn-dynamic-import "^2.0.0"
-    ajv "^4.7.0"
-    ajv-keywords "^1.1.1"
-    async "^2.1.2"
-    enhanced-resolve "^3.0.0"
-    interpret "^1.0.0"
-    json-loader "^0.5.4"
-    loader-runner "^2.3.0"
-    loader-utils "^0.2.16"
-    memory-fs "~0.4.1"
-    mkdirp "~0.5.0"
-    node-libs-browser "^2.0.0"
-    source-map "^0.5.3"
-    supports-color "^3.1.0"
-    tapable "~0.2.5"
-    uglify-js "^2.7.5"
-    watchpack "^1.2.0"
-    webpack-sources "^0.1.4"
-    yargs "^6.0.0"
-
-webrtc-adapter@^2.0.8:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/webrtc-adapter/-/webrtc-adapter-2.1.0.tgz#612b5bc6ce8e73c9d0660038a21f9255a867bf3e"
-  dependencies:
-    sdp "^1.0.0"
-
-websocket@1.0.24:
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.24.tgz#74903e75f2545b6b2e1de1425bc1c905917a1890"
-  dependencies:
-    debug "^2.2.0"
-    nan "^2.3.3"
-    typedarray-to-buffer "^3.1.2"
-    yaeti "^0.0.6"
-
-whatwg-encoding@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
-  dependencies:
-    iconv-lite "0.4.13"
-
-whatwg-fetch@2.0.1, whatwg-fetch@>=0.10.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.1.tgz#078b9461bbe91cea73cbce8bb122a05f9e92b772"
-
-whatwg-url@^4.3.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.7.0.tgz#202035ac1955b087cdd20fa8b58ded3ab1cd2af5"
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-whet.extend@~0.9.9:
-  version "0.9.9"
-  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-
-which@1, which@^1.1.1, which@^1.2.9:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"
-  dependencies:
-    string-width "^1.0.1"
-
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
-window-size@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
-
-wordwrap@0.0.2, wordwrap@~0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
-wordwrap@^1.0.0, wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-
-worker-loader@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-0.8.0.tgz#13582960dcd7d700dc829d3fd252a7561696167e"
-  dependencies:
-    loader-utils "^1.0.2"
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
-wrap-fn@^0.1.0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/wrap-fn/-/wrap-fn-0.1.5.tgz#f21b6e41016ff4a7e31720dbc63a09016bdf9845"
-  dependencies:
-    co "3.1.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-write-file-atomic@^1.1.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.1.tgz#7d45ba32316328dd1ec7d90f60ebc0d845bb759a"
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    slide "^1.1.5"
-
-write-file-stdout@0.0.2, write-file-stdout@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1"
-
-write-json-file@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-1.2.0.tgz#2d5dfe96abc3c889057c93971aa4005efb548134"
-  dependencies:
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.1"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    sort-keys "^1.1.1"
-    write-file-atomic "^1.1.2"
-
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  dependencies:
-    mkdirp "^0.5.1"
-
-xml-char-classes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
-
-xml-name-validator@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
-
-xmlhttprequest@*:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
-
-xss-filters@^1.2.6:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/xss-filters/-/xss-filters-1.2.7.tgz#59fa1de201f36f2f3470dcac5f58ccc2830b0a9a"
-
-xtend@4.0.1, "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
-y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-
-yaeti@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577"
-
-yallist@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-
-yargs-parser@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"
-  dependencies:
-    camelcase "^3.0.0"
-    lodash.assign "^4.0.6"
-
-yargs-parser@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
-  dependencies:
-    camelcase "^3.0.0"
-
-yargs@6.6.0, yargs@^6.0.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^4.2.0"
-
-yargs@^1.2.6:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a"
-
-yargs@^3.5.4, yargs@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-  dependencies:
-    camelcase "^1.0.2"
-    cliui "^2.1.0"
-    decamelize "^1.0.0"
-    window-size "0.1.0"
-
-yargs@^4.7.1:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"
-  dependencies:
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    lodash.assign "^4.0.3"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.1"
-    which-module "^1.0.0"
-    window-size "^0.2.0"
-    y18n "^3.2.1"
-    yargs-parser "^2.4.1"
-
-yarn@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/yarn/-/yarn-0.21.3.tgz#8dda3a63c798b383cfa577452c2b3cb3e4aa87e0"
-  dependencies:
-    babel-runtime "^6.0.0"
-    bytes "^2.4.0"
-    camelcase "^3.0.0"
-    chalk "^1.1.1"
-    cmd-shim "^2.0.1"
-    commander "^2.9.0"
-    death "^1.0.0"
-    debug "^2.2.0"
-    defaults "^1.0.3"
-    detect-indent "^5.0.0"
-    ini "^1.3.4"
-    inquirer "^3.0.1"
-    invariant "^2.2.0"
-    is-builtin-module "^1.0.0"
-    is-ci "^1.0.10"
-    leven "^2.0.0"
-    loud-rejection "^1.2.0"
-    minimatch "^3.0.3"
-    mkdirp "^0.5.1"
-    node-emoji "^1.0.4"
-    node-gyp "^3.2.1"
-    object-path "^0.11.2"
-    proper-lockfile "^2.0.0"
-    read "^1.0.7"
-    request "^2.75.0"
-    request-capture-har "^1.1.4"
-    rimraf "^2.5.0"
-    roadrunner "^1.1.0"
-    semver "^5.1.0"
-    strip-bom "^3.0.0"
-    tar "^2.2.1"
-    tar-stream "^1.5.2"
-    validate-npm-package-license "^3.0.1"
-
-yauzl@^2.2.1:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.7.0.tgz#e21d847868b496fc29eaec23ee87fdd33e9b2bce"
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.0.1"
-
-zxcvbn@4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.1.tgz#2381aadd7f078a25a86b215327562647b80aa8ac"
diff --git a/json/Cargo.toml b/json/Cargo.toml
index dbc365a1dbd0338e4b4b34ee3f3831ca8ffe2b38..6e84e6da3ae247f71060659ce3fdfac54a856163 100644
--- a/json/Cargo.toml
+++ b/json/Cargo.toml
@@ -4,10 +4,9 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-ethcore-bigint = { path = "../util/bigint" }
+ethereum-types = "0.2"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
-clippy = { version = "0.0.103", optional = true}
 
diff --git a/json/src/blockchain/blockchain.rs b/json/src/blockchain/blockchain.rs
index 07014db0758953675ede1f6caad0e28f9505e994..9edd753130a1cb6dc4a34d13a888148adb3091b7 100644
--- a/json/src/blockchain/blockchain.rs
+++ b/json/src/blockchain/blockchain.rs
@@ -21,6 +21,7 @@ use hash::H256;
 use blockchain::state::State;
 use blockchain::header::Header;
 use blockchain::block::Block;
+use state::test::ForkSpec;
 use spec::{Genesis, Seal, Ethereum};
 
 /// Blockchain deserialization.
@@ -42,7 +43,9 @@ pub struct BlockChain {
 	pub pre_state: State,
 	/// Hash of best block.
 	#[serde(rename="lastblockhash")]
-	pub best_block: H256
+	pub best_block: H256,
+	/// Network.
+	pub network: ForkSpec,
 }
 
 impl BlockChain {
@@ -102,7 +105,7 @@ mod tests {
 				"rlp" : "0xf90285f90219a0f052d217bd5275a5177a3c3b7debdfe2670f1c8394b2965ccd5c1883cc1a524da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0bac6177a79e910c98d86ec31a09ae37ac2de15b754fd7bed1ba52362c49416bfa0498785da562aa0c5dd5937cf15f22139b0b1bcf3b4fc48986e1bb1dae9292796a0c7778a7376099ee2e5c455791c1885b5c361b95713fddcbe32d97fd01334d296b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000400000000000000000000000000000000000000000000000000000008302000001832fefba82560b8456850c2ca00102030405060708091011121314151617181920212223242526272829303132a05266ca43e81d25925a9ba573c3e4f9180bc076d316d90e63c6f8708b272f5ce28859ba4daed1898e21f866f864800a82c35094095e7baea6a6c7c4c2dfeb977efac326af552d8785012a05f200801ca0ee0b9ec878fbd4258a9473199d8ecc32996a20c323c004e79e0cda20e0418ce3a04e6bc63927d1510bab54f37e46fa036faf4b2c465d271920d9afea1fadf7bd21c0",
 				"transactions" : [
 					{
-						"data" : "0x",
+						"data" : "0x00",
 						"gasLimit" : "0xc350",
 						"gasPrice" : "0x0a",
 						"nonce" : "0x00",
@@ -116,6 +119,7 @@ mod tests {
 				"uncleHeaders" : [
 				]
 			}],
+			"network" : "Frontier",
 			"genesisBlockHeader" : {
 				"bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 				"coinbase" : "8888f1f195afa192cfee860698584c030f4c9db1",
diff --git a/json/src/hash.rs b/json/src/hash.rs
index 32c707d5b0c9c645d2c2f8b361ed4fff8981fd87..54aea04365e4400560dc3045c6ac93fe9feaef59 100644
--- a/json/src/hash.rs
+++ b/json/src/hash.rs
@@ -21,7 +21,7 @@ use std::fmt;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde::de::{Error, Visitor};
 use rustc_hex::ToHex;
-use bigint::hash::{H64 as Hash64, H160 as Hash160, H256 as Hash256, H520 as Hash520, H2048 as Hash2048};
+use ethereum_types::{H64 as Hash64, H160 as Hash160, H256 as Hash256, H520 as Hash520, Bloom as Hash2048};
 
 
 macro_rules! impl_hash {
@@ -99,7 +99,7 @@ impl_hash!(Bloom, Hash2048);
 mod test {
 	use std::str::FromStr;
 	use serde_json;
-	use bigint::hash;
+	use ethereum_types;
 	use hash::H256;
 
 	#[test]
@@ -107,13 +107,13 @@ mod test {
 		let s = r#"["", "5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae"]"#;
 		let deserialized: Vec<H256> = serde_json::from_str(s).unwrap();
 		assert_eq!(deserialized, vec![
-				   H256(hash::H256::from(0)),
-				   H256(hash::H256::from_str("5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae").unwrap())
+				   H256(ethereum_types::H256::from(0)),
+				   H256(ethereum_types::H256::from_str("5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae").unwrap())
 		]);
 	}
 
 	#[test]
 	fn hash_into() {
-		assert_eq!(hash::H256::from(0), H256(hash::H256::from(0)).into());
+		assert_eq!(ethereum_types::H256::from(0), H256(ethereum_types::H256::from(0)).into());
 	}
 }
diff --git a/json/src/lib.rs b/json/src/lib.rs
index 4af7384a0714293ccf01b62e641795b2c045d738..3cb1e49f57d596f5fdee2e076c566c3f8339e55f 100644
--- a/json/src/lib.rs
+++ b/json/src/lib.rs
@@ -17,7 +17,7 @@
 extern crate rustc_hex;
 extern crate serde;
 extern crate serde_json;
-extern crate ethcore_bigint as bigint;
+extern crate ethereum_types;
 #[macro_use] extern crate serde_derive;
 
 pub mod hash;
@@ -31,3 +31,4 @@ pub mod maybe;
 pub mod state;
 pub mod transaction;
 pub mod misc;
+pub mod test;
diff --git a/json/src/maybe.rs b/json/src/maybe.rs
index b799b7ef6a44d3c0a4eab88573cfd5877e919419..8b74b22c4830eddef46057663ceb1f127cbb6a52 100644
--- a/json/src/maybe.rs
+++ b/json/src/maybe.rs
@@ -68,7 +68,7 @@ impl<T> Into<Option<T>> for MaybeEmpty<T> {
 mod tests {
 	use std::str::FromStr;
 	use serde_json;
-	use bigint::hash;
+	use ethereum_types;
 	use hash::H256;
 	use maybe::MaybeEmpty;
 
@@ -78,7 +78,7 @@ mod tests {
 		let deserialized: Vec<MaybeEmpty<H256>> = serde_json::from_str(s).unwrap();
 		assert_eq!(deserialized, vec![
 				   MaybeEmpty::None,
-				   MaybeEmpty::Some(H256(hash::H256::from_str("5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae").unwrap()))
+				   MaybeEmpty::Some(H256(ethereum_types::H256::from_str("5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae").unwrap()))
 		]);
 	}
 
diff --git a/json/src/spec/account.rs b/json/src/spec/account.rs
index 32d5ec42d67d78d79ddd263f1ce24bc0ce2b231f..fb41137aa9c5c57f93341e1aff5ea0f1372de4c1 100644
--- a/json/src/spec/account.rs
+++ b/json/src/spec/account.rs
@@ -50,7 +50,7 @@ mod tests {
 	use std::collections::BTreeMap;
 	use serde_json;
 	use spec::account::Account;
-	use bigint::prelude::U256;
+	use ethereum_types::U256;
 	use uint::Uint;
 	use bytes::Bytes;
 
diff --git a/json/src/spec/authority_round.rs b/json/src/spec/authority_round.rs
index 2d7d640869344816871beb987936afb4d5a719ff..4dea4f09899c8d7531bec5b7b04bb27c5c44d2bb 100644
--- a/json/src/spec/authority_round.rs
+++ b/json/src/spec/authority_round.rs
@@ -22,7 +22,7 @@ use super::ValidatorSet;
 /// Authority params deserialization.
 #[derive(Debug, PartialEq, Deserialize)]
 pub struct AuthorityRoundParams {
-	/// Block duration.
+	/// Block duration, in seconds.
 	#[serde(rename="stepDuration")]
 	pub step_duration: Uint,
 	/// Valid authorities
@@ -40,6 +40,21 @@ pub struct AuthorityRoundParams {
 	/// Whether transitions should be immediate.
 	#[serde(rename="immediateTransitions")]
 	pub immediate_transitions: Option<bool>,
+	/// Reward per block in wei.
+	#[serde(rename="blockReward")]
+	pub block_reward: Option<Uint>,
+	/// Block at which maximum uncle count should be considered.
+	#[serde(rename="maximumUncleCountTransition")]
+	pub maximum_uncle_count_transition: Option<Uint>,
+	/// Maximum number of accepted uncles.
+	#[serde(rename="maximumUncleCount")]
+	pub maximum_uncle_count: Option<Uint>,
+	/// Block at which empty step messages should start.
+	#[serde(rename="emptyStepsTransition")]
+	pub empty_steps_transition: Option<Uint>,
+	/// Maximum number of accepted empty steps.
+	#[serde(rename="maximumEmptySteps")]
+	pub maximum_empty_steps: Option<Uint>,
 }
 
 /// Authority engine deserialization.
@@ -51,7 +66,7 @@ pub struct AuthorityRound {
 
 #[cfg(test)]
 mod tests {
-	use bigint::prelude::{U256, H160};
+	use ethereum_types::{U256, H160};
 	use uint::Uint;
 	use serde_json;
 	use hash::Address;
@@ -67,7 +82,10 @@ mod tests {
 					"list" : ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
 				},
 				"startStep" : 24,
-				"validateStepTransition": 150
+				"validateStepTransition": 150,
+				"blockReward": 5000000,
+				"maximumUncleCountTransition": 10000000,
+				"maximumUncleCount": 5
 			}
 		}"#;
 
@@ -76,5 +94,8 @@ mod tests {
 		assert_eq!(deserialized.params.validators, ValidatorSet::List(vec![Address(H160::from("0xc6d9d2cd449a754c494264e1809c50e34d64562b"))]));
 		assert_eq!(deserialized.params.start_step, Some(Uint(U256::from(24))));
 		assert_eq!(deserialized.params.immediate_transitions, None);
+		assert_eq!(deserialized.params.maximum_uncle_count_transition, Some(Uint(10_000_000.into())));
+		assert_eq!(deserialized.params.maximum_uncle_count, Some(Uint(5.into())));
+
 	}
 }
diff --git a/json/src/spec/basic_authority.rs b/json/src/spec/basic_authority.rs
index d8182a9906a855b00c9388ad5e5f332ab140c61d..0a257f134b12e9a81f78e0cdd526be6d66c83dc0 100644
--- a/json/src/spec/basic_authority.rs
+++ b/json/src/spec/basic_authority.rs
@@ -40,7 +40,7 @@ pub struct BasicAuthority {
 mod tests {
 	use serde_json;
 	use uint::Uint;
-	use bigint::prelude::{U256, H160};
+	use ethereum_types::{U256, H160};
 	use hash::Address;
 	use spec::basic_authority::BasicAuthority;
 	use spec::validator_set::ValidatorSet;
diff --git a/json/src/spec/builtin.rs b/json/src/spec/builtin.rs
index 892bf532eddd938f02ea0be4742e509f9ce4e3f7..34e9a2df1c18613cde6690cafa4d6e8b6f1a4a6e 100644
--- a/json/src/spec/builtin.rs
+++ b/json/src/spec/builtin.rs
@@ -34,6 +34,15 @@ pub struct Modexp {
 	pub divisor: usize,
 }
 
+/// Pricing for alt_bn128_pairing.
+#[derive(Debug, PartialEq, Deserialize, Clone)]
+pub struct AltBn128Pairing {
+	/// Base price.
+	pub base: usize,
+	/// Price per point pair.
+	pub pair: usize,
+}
+
 /// Pricing variants.
 #[derive(Debug, PartialEq, Deserialize, Clone)]
 pub enum Pricing {
@@ -43,6 +52,9 @@ pub enum Pricing {
 	/// Pricing for modular exponentiation.
 	#[serde(rename="modexp")]
 	Modexp(Modexp),
+	/// Pricing for alt_bn128_pairing exponentiation.
+	#[serde(rename="alt_bn128_pairing")]
+	AltBn128Pairing(AltBn128Pairing),
 }
 
 /// Spec builtin.
diff --git a/json/src/spec/engine.rs b/json/src/spec/engine.rs
index 8b487041e455ec955c36475e89c903fcf15d1c0a..e2545a5f90d6306ed39820bbce4f897a53786c24 100644
--- a/json/src/spec/engine.rs
+++ b/json/src/spec/engine.rs
@@ -16,14 +16,14 @@
 
 //! Engine deserialization.
 
-use super::{Ethash, BasicAuthority, AuthorityRound, Tendermint};
+use super::{Ethash, BasicAuthority, AuthorityRound, Tendermint, NullEngine};
 
 /// Engine deserialization.
 #[derive(Debug, PartialEq, Deserialize)]
 pub enum Engine {
 	/// Null engine.
 	#[serde(rename="null")]
-	Null,
+	Null(NullEngine),
 	/// Instantly sealing engine.
 	#[serde(rename="instantSeal")]
 	InstantSeal,
@@ -48,11 +48,18 @@ mod tests {
 	#[test]
 	fn engine_deserialization() {
 		let s = r#"{
-			"null": null
+			"null": {
+				"params": {
+					"blockReward": "0x0d"
+				}
+			}
 		}"#;
 
 		let deserialized: Engine = serde_json::from_str(s).unwrap();
-		assert_eq!(Engine::Null, deserialized);
+		match deserialized {
+			Engine::Null(_) => {}, // unit test in its own file.
+			_ => panic!(),
+		}
 
 		let s = r#"{
 			"instantSeal": null
@@ -61,7 +68,7 @@ mod tests {
 		let deserialized: Engine = serde_json::from_str(s).unwrap();
 		match deserialized {
 			Engine::InstantSeal => {},	// instant seal is unit tested in its own file.
-			_ => assert!(false),
+			_ => panic!(),
 		};
 
 		let s = r#"{
@@ -82,7 +89,7 @@ mod tests {
 		let deserialized: Engine = serde_json::from_str(s).unwrap();
 		match deserialized {
 			Engine::Ethash(_) => {},	// ethash is unit tested in its own file.
-			_ => assert!(false),
+			_ => panic!(),
 		};
 
 		let s = r#"{
@@ -98,7 +105,7 @@ mod tests {
 		let deserialized: Engine = serde_json::from_str(s).unwrap();
 		match deserialized {
 			Engine::BasicAuthority(_) => {}, // basicAuthority is unit tested in its own file.
-			_ => assert!(false),
+			_ => panic!(),
 		};
 
 		let s = r#"{
@@ -116,7 +123,7 @@ mod tests {
 		let deserialized: Engine = serde_json::from_str(s).unwrap();
 		match deserialized {
 			Engine::AuthorityRound(_) => {}, // AuthorityRound is unit tested in its own file.
-			_ => assert!(false),
+			_ => panic!(),
 		};
 
 		let s = r#"{
@@ -131,7 +138,7 @@ mod tests {
 		let deserialized: Engine = serde_json::from_str(s).unwrap();
 		match deserialized {
 			Engine::Tendermint(_) => {}, // Tendermint is unit tested in its own file.
-			_ => assert!(false),
+			_ => panic!(),
 		};
 	}
 }
diff --git a/json/src/spec/ethash.rs b/json/src/spec/ethash.rs
index 784a9d4778572662fb2a13e48e1bdbdeca78964c..afa8b596823841bf3eacaed6857ef31bf8f16f18 100644
--- a/json/src/spec/ethash.rs
+++ b/json/src/spec/ethash.rs
@@ -16,23 +16,26 @@
 
 //! Ethash params deserialization.
 
-use uint::Uint;
+use uint::{self, Uint};
 use hash::Address;
 
 /// Deserializable doppelganger of EthashParams.
-#[derive(Debug, PartialEq, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Deserialize)]
 pub struct EthashParams {
 	/// See main EthashParams docs.
 	#[serde(rename="minimumDifficulty")]
 	pub minimum_difficulty: Uint,
 	/// See main EthashParams docs.
 	#[serde(rename="difficultyBoundDivisor")]
+	#[serde(deserialize_with="uint::validate_non_zero")]
 	pub difficulty_bound_divisor: Uint,
 	/// See main EthashParams docs.
 	#[serde(rename="difficultyIncrementDivisor")]
+	#[serde(default, deserialize_with="uint::validate_optional_non_zero")]
 	pub difficulty_increment_divisor: Option<Uint>,
 	/// See main EthashParams docs.
 	#[serde(rename="metropolisDifficultyIncrementDivisor")]
+	#[serde(default, deserialize_with="uint::validate_optional_non_zero")]
 	pub metropolis_difficulty_increment_divisor: Option<Uint>,
 	/// See main EthashParams docs.
 	#[serde(rename="durationLimit")]
@@ -41,6 +44,9 @@ pub struct EthashParams {
 	/// See main EthashParams docs.
 	#[serde(rename="homesteadTransition")]
 	pub homestead_transition: Option<Uint>,
+	/// Reward per block in wei.
+	#[serde(rename="blockReward")]
+	pub block_reward: Option<Uint>,
 
 	/// See main EthashParams docs.
 	#[serde(rename="daoHardforkTransition")]
@@ -57,6 +63,7 @@ pub struct EthashParams {
 	pub difficulty_hardfork_transition: Option<Uint>,
 	/// See main EthashParams docs.
 	#[serde(rename="difficultyHardforkBoundDivisor")]
+	#[serde(default, deserialize_with="uint::validate_optional_non_zero")]
 	pub difficulty_hardfork_bound_divisor: Option<Uint>,
 	/// See main EthashParams docs.
 	#[serde(rename="bombDefuseTransition")]
@@ -93,24 +100,43 @@ pub struct EthashParams {
 	pub ecip1017_era_rounds: Option<Uint>,
 
 	/// See main EthashParams docs.
-	#[serde(rename="maxCodeSize")]
-	pub max_code_size: Option<Uint>,
-
+	#[serde(rename="mcip3Transition")]
+	pub mcip3_transition: Option<Uint>,
 	/// See main EthashParams docs.
-	#[serde(rename="maxGasLimitTransition")]
-	pub max_gas_limit_transition: Option<Uint>,
-
+	#[serde(rename="mcip3MinerReward")]
+	pub mcip3_miner_reward: Option<Uint>,
 	/// See main EthashParams docs.
-	#[serde(rename="maxGasLimit")]
-	pub max_gas_limit: Option<Uint>,
-
+	#[serde(rename="mcip3UbiReward")]
+	pub mcip3_ubi_reward: Option<Uint>,
 	/// See main EthashParams docs.
-	#[serde(rename="minGasPriceTransition")]
-	pub min_gas_price_transition: Option<Uint>,
-
+	#[serde(rename="mcip3UbiContract")]
+	pub mcip3_ubi_contract: Option<Address>,
 	/// See main EthashParams docs.
-	#[serde(rename="minGasPrice")]
-	pub min_gas_price: Option<Uint>,
+	#[serde(rename="mcip3DevReward")]
+	pub mcip3_dev_reward: Option<Uint>,
+	/// See main EthashParams docs.
+	#[serde(rename="mcip3DevContract")]
+	pub mcip3_dev_contract: Option<Address>,
+
+	/// EIP-649 transition block.
+	#[serde(rename="eip649Transition")]
+	pub eip649_transition: Option<Uint>,
+
+	/// EIP-649 bomb delay.
+	#[serde(rename="eip649Delay")]
+	pub eip649_delay: Option<Uint>,
+
+	/// EIP-649 base reward.
+	#[serde(rename="eip649Reward")]
+	pub eip649_reward: Option<Uint>,
+
+	/// EXPIP-2 block height
+	#[serde(rename="expip2Transition")]
+	pub expip2_transition: Option<Uint>,
+
+	/// EXPIP-2 duration limit
+	#[serde(rename="expip2DurationLimit")]
+	pub expip2_duration_limit: Option<Uint>,
 }
 
 /// Ethash engine deserialization.
@@ -124,7 +150,7 @@ pub struct Ethash {
 mod tests {
 	use serde_json;
 	use uint::Uint;
-	use bigint::prelude::{H160, U256};
+	use ethereum_types::{H160, U256};
 	use hash::Address;
 	use spec::ethash::{Ethash, EthashParams};
 
@@ -136,6 +162,7 @@ mod tests {
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
 				"homesteadTransition": "0x42",
+				"blockReward": "0x100",
 				"daoHardforkTransition": "0x08",
 				"daoHardforkBeneficiary": "0xabcabcabcabcabcabcabcabcabcabcabcabcabca",
 				"daoHardforkAccounts": [
@@ -181,6 +208,7 @@ mod tests {
 				metropolis_difficulty_increment_divisor: None,
 				duration_limit: Some(Uint(U256::from(0x0d))),
 				homestead_transition: Some(Uint(U256::from(0x42))),
+				block_reward: Some(Uint(U256::from(0x100))),
 				dao_hardfork_transition: Some(Uint(U256::from(0x08))),
 				dao_hardfork_beneficiary: Some(Address(H160::from("0xabcabcabcabcabcabcabcabcabcabcabcabcabca"))),
 				dao_hardfork_accounts: Some(vec![
@@ -216,11 +244,17 @@ mod tests {
 				ecip1010_pause_transition: None,
 				ecip1010_continue_transition: None,
 				ecip1017_era_rounds: None,
-				max_code_size: None,
-				max_gas_limit_transition: None,
-				max_gas_limit: None,
-				min_gas_price_transition: None,
-				min_gas_price: None,
+				mcip3_transition: None,
+				mcip3_miner_reward: None,
+				mcip3_ubi_reward: None,
+				mcip3_ubi_contract: None,
+				mcip3_dev_reward: None,
+				mcip3_dev_contract: None,
+				eip649_transition: None,
+				eip649_delay: None,
+				eip649_reward: None,
+				expip2_transition: None,
+				expip2_duration_limit: None,
 			}
 		});
 	}
@@ -243,6 +277,7 @@ mod tests {
 				metropolis_difficulty_increment_divisor: None,
 				duration_limit: None,
 				homestead_transition: None,
+				block_reward: None,
 				dao_hardfork_transition: None,
 				dao_hardfork_beneficiary: None,
 				dao_hardfork_accounts: None,
@@ -257,12 +292,31 @@ mod tests {
 				ecip1010_pause_transition: None,
 				ecip1010_continue_transition: None,
 				ecip1017_era_rounds: None,
-				max_code_size: None,
-				max_gas_limit_transition: None,
-				max_gas_limit: None,
-				min_gas_price_transition: None,
-				min_gas_price: None,
+				mcip3_transition: None,
+				mcip3_miner_reward: None,
+				mcip3_ubi_reward: None,
+				mcip3_ubi_contract: None,
+				mcip3_dev_reward: None,
+				mcip3_dev_contract: None,
+				eip649_transition: None,
+				eip649_delay: None,
+				eip649_reward: None,
+				expip2_transition: None,
+				expip2_duration_limit: None,
 			}
 		});
 	}
+
+	#[test]
+	#[should_panic(expected = "a non-zero value")]
+	fn test_zero_value_divisor() {
+		let s = r#"{
+			"params": {
+				"difficultyBoundDivisor": "0x0",
+				"minimumDifficulty": "0x020000"
+			}
+		}"#;
+
+		let _deserialized: Ethash = serde_json::from_str(s).unwrap();
+	}
 }
diff --git a/json/src/spec/genesis.rs b/json/src/spec/genesis.rs
index 98bc75c69d01e9df895c903dd6a4ad47b5badc2b..984053e77ae0dc7f0d1f5bc994d8cf67d069a418 100644
--- a/json/src/spec/genesis.rs
+++ b/json/src/spec/genesis.rs
@@ -60,7 +60,7 @@ mod tests {
 	use serde_json;
 	use bytes::Bytes;
 	use uint::Uint;
-	use bigint::prelude::{U256, H160, H64 as Eth64, H256 as Eth256};
+	use ethereum_types::{U256, H160, H64 as Eth64, H256 as Eth256};
 	use hash::{H64, H256, Address};
 	use spec::genesis::Genesis;
 	use spec::{Ethereum, Seal};
diff --git a/json/src/spec/hardcoded_sync.rs b/json/src/spec/hardcoded_sync.rs
new file mode 100644
index 0000000000000000000000000000000000000000..548fd66f0faabd724bbe2f14882aad22116ecc2c
--- /dev/null
+++ b/json/src/spec/hardcoded_sync.rs
@@ -0,0 +1,63 @@
+// Copyright 2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Spec hardcoded synchronization deserialization for the light client.
+
+use hash::H256;
+use uint::Uint;
+
+/// Spec hardcoded sync.
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct HardcodedSync {
+	/// Hexadecimal of the RLP encoding of the header of the block to start synchronization from.
+	pub header: String,
+	/// Total difficulty including the block of `header`.
+	#[serde(rename="totalDifficulty")]
+	pub total_difficulty: Uint,
+	/// Ordered trie roots of blocks before and including `header`.
+	#[serde(rename="CHTs")]
+	pub chts: Vec<H256>,
+}
+
+#[cfg(test)]
+mod tests {
+	use serde_json;
+	use uint::Uint;
+	use ethereum_types::{U256, H256 as Eth256};
+	use hash::H256;
+	use spec::hardcoded_sync::HardcodedSync;
+
+	#[test]
+	fn hardcoded_sync_deserialization() {
+		let s = r#"{
+			"header": "f901f9a0d405da4e66f1445d455195229624e133f5baafe72b5cf7b3c36c12c8146e98b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a05fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25a088d2ec6b9860aae1a2c3b299f72b6a5d70d7f7ba4722c78f2c49ba96273c2158a007c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302008003832fefba82524d84568e932a80a0a0349d8c3df71f1a48a9df7d03fd5f14aeee7d91332c009ecaff0a71ead405bd88ab4e252a7e8c2a23",
+			"totalDifficulty": "0x400000000",
+			"CHTs": [
+				"0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+				"0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
+			]
+		}"#;
+		let deserialized: HardcodedSync = serde_json::from_str(s).unwrap();
+		assert_eq!(deserialized, HardcodedSync {
+			header: String::from("f901f9a0d405da4e66f1445d455195229624e133f5baafe72b5cf7b3c36c12c8146e98b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a05fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25a088d2ec6b9860aae1a2c3b299f72b6a5d70d7f7ba4722c78f2c49ba96273c2158a007c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302008003832fefba82524d84568e932a80a0a0349d8c3df71f1a48a9df7d03fd5f14aeee7d91332c009ecaff0a71ead405bd88ab4e252a7e8c2a23"),
+			total_difficulty: Uint(U256::from(0x400000000u64)),
+			chts: vec![
+				H256(Eth256::from("0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa")),
+				H256(Eth256::from("0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544")),
+			]
+		});
+	}
+}
diff --git a/json/src/spec/mod.rs b/json/src/spec/mod.rs
index bc7e751aff1791f99353a4e683f447e9ac5431db..285596f14a72a25f8874474b865bd9647958cdd9 100644
--- a/json/src/spec/mod.rs
+++ b/json/src/spec/mod.rs
@@ -29,6 +29,8 @@ pub mod validator_set;
 pub mod basic_authority;
 pub mod authority_round;
 pub mod tendermint;
+pub mod null_engine;
+pub mod hardcoded_sync;
 
 pub use self::account::Account;
 pub use self::builtin::{Builtin, Pricing, Linear};
@@ -43,3 +45,5 @@ pub use self::validator_set::ValidatorSet;
 pub use self::basic_authority::{BasicAuthority, BasicAuthorityParams};
 pub use self::authority_round::{AuthorityRound, AuthorityRoundParams};
 pub use self::tendermint::{Tendermint, TendermintParams};
+pub use self::null_engine::{NullEngine, NullEngineParams};
+pub use self::hardcoded_sync::HardcodedSync;
diff --git a/json/src/spec/null_engine.rs b/json/src/spec/null_engine.rs
new file mode 100644
index 0000000000000000000000000000000000000000..cfd3d6ce6377eed4b057256597908b4c809198fc
--- /dev/null
+++ b/json/src/spec/null_engine.rs
@@ -0,0 +1,54 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Null engine params deserialization.
+
+use uint::Uint;
+
+/// Authority params deserialization.
+#[derive(Debug, PartialEq, Deserialize)]
+pub struct NullEngineParams {
+	/// Block reward.
+	#[serde(rename="blockReward")]
+	pub block_reward: Option<Uint>,
+}
+
+/// Null engine descriptor
+#[derive(Debug, PartialEq, Deserialize)]
+pub struct NullEngine {
+	/// Ethash params.
+	pub params: NullEngineParams,
+}
+
+#[cfg(test)]
+mod tests {
+	use serde_json;
+	use uint::Uint;
+	use ethereum_types::U256;
+	use super::*;
+
+	#[test]
+	fn null_engine_deserialization() {
+		let s = r#"{
+			"params": {
+				"blockReward": "0x0d"
+			}
+		}"#;
+
+		let deserialized: NullEngine = serde_json::from_str(s).unwrap();
+		assert_eq!(deserialized.params.block_reward, Some(Uint(U256::from(0x0d))));
+	}
+}
diff --git a/json/src/spec/params.rs b/json/src/spec/params.rs
index de33039c44f8adc6b14e6af860eab8a07523b627..4a1efe2a7f960e3aa1848ec43d896a5f1429e40f 100644
--- a/json/src/spec/params.rs
+++ b/json/src/spec/params.rs
@@ -16,7 +16,7 @@
 
 //! Spec params deserialization.
 
-use uint::Uint;
+use uint::{self, Uint};
 use hash::{H256, Address};
 use bytes::Bytes;
 
@@ -58,6 +58,9 @@ pub struct Params {
 	#[serde(rename="eip155Transition")]
 	pub eip155_transition: Option<Uint>,
 	/// See `CommonParams` docs.
+	#[serde(rename="validateChainIdTransition")]
+	pub validate_chain_id_transition: Option<Uint>,
+	/// See `CommonParams` docs.
 	#[serde(rename="validateReceiptsTransition")]
 	pub validate_receipts_transition: Option<Uint>,
 	/// See `CommonParams` docs.
@@ -85,6 +88,9 @@ pub struct Params {
 	#[serde(rename="eip214Transition")]
 	pub eip214_transition: Option<Uint>,
 	/// See `CommonParams` docs.
+	#[serde(rename="eip658Transition")]
+	pub eip658_transition: Option<Uint>,
+	/// See `CommonParams` docs.
 	#[serde(rename="dustProtectionTransition")]
 	pub dust_protection_transition: Option<Uint>,
 	/// See `CommonParams` docs.
@@ -92,26 +98,37 @@ pub struct Params {
 	pub nonce_cap_increment: Option<Uint>,
 	/// See `CommonParams` docs.
 	pub remove_dust_contracts : Option<bool>,
-	/// Wasm support flag
-	pub wasm: Option<bool>,
 	/// See `CommonParams` docs.
 	#[serde(rename="gasLimitBoundDivisor")]
+	#[serde(deserialize_with="uint::validate_non_zero")]
 	pub gas_limit_bound_divisor: Uint,
 	/// See `CommonParams` docs.
-	#[serde(rename="blockReward")]
-	pub block_reward: Option<Uint>,
-	/// See `CommonParams` docs.
 	pub registrar: Option<Address>,
+	/// Apply reward flag
+	#[serde(rename="applyReward")]
+	pub apply_reward: Option<bool>,
 	/// Node permission contract address.
 	#[serde(rename="nodePermissionContract")]
 	pub node_permission_contract: Option<Address>,
+	/// See main EthashParams docs.
+	#[serde(rename="maxCodeSize")]
+	pub max_code_size: Option<Uint>,
+	/// See main EthashParams docs.
+	#[serde(rename="maxCodeSizeTransition")]
+	pub max_code_size_transition: Option<Uint>,
+	/// Transaction permission contract address.
+	#[serde(rename="transactionPermissionContract")]
+	pub transaction_permission_contract: Option<Address>,
+	/// Wasm activation block height, if not activated from start
+	#[serde(rename="wasmActivationTransition")]
+	pub wasm_activation_transition: Option<Uint>,
 }
 
 #[cfg(test)]
 mod tests {
 	use serde_json;
 	use uint::Uint;
-	use bigint::prelude::U256;
+	use ethereum_types::U256;
 	use spec::params::Params;
 
 	#[test]
@@ -123,7 +140,9 @@ mod tests {
 			"subprotocolName" : "exp",
 			"minGasLimit": "0x1388",
 			"accountStartNonce": "0x01",
-			"gasLimitBoundDivisor": "0x20"
+			"gasLimitBoundDivisor": "0x20",
+			"maxCodeSize": "0x1000",
+			"wasmActivationTransition": "0x1010"
 		}"#;
 
 		let deserialized: Params = serde_json::from_str(s).unwrap();
@@ -134,5 +153,24 @@ mod tests {
 		assert_eq!(deserialized.min_gas_limit, Uint(U256::from(0x1388)));
 		assert_eq!(deserialized.account_start_nonce, Some(Uint(U256::from(0x01))));
 		assert_eq!(deserialized.gas_limit_bound_divisor, Uint(U256::from(0x20)));
+		assert_eq!(deserialized.max_code_size, Some(Uint(U256::from(0x1000))));
+		assert_eq!(deserialized.wasm_activation_transition, Some(Uint(U256::from(0x1010))));
+	}
+
+	#[test]
+	#[should_panic(expected = "a non-zero value")]
+	fn test_zero_value_divisor() {
+		let s = r#"{
+			"maximumExtraDataSize": "0x20",
+			"networkID" : "0x1",
+			"chainID" : "0x15",
+			"subprotocolName" : "exp",
+			"minGasLimit": "0x1388",
+			"accountStartNonce": "0x01",
+			"gasLimitBoundDivisor": "0x0",
+			"maxCodeSize": "0x1000"
+		}"#;
+
+		let _deserialized: Params = serde_json::from_str(s).unwrap();
 	}
 }
diff --git a/json/src/spec/seal.rs b/json/src/spec/seal.rs
index a428a09577e1d737d9136590a36b45065518a63c..6654a309a307773b6d933c3eed380b2bda03da20 100644
--- a/json/src/spec/seal.rs
+++ b/json/src/spec/seal.rs
@@ -73,7 +73,7 @@ mod tests {
 	use hash::*;
 	use bytes::Bytes;
 	use uint::Uint;
-	use bigint::prelude::{U256, H64 as Eth64, H256 as Eth256, H520 as Eth520};
+	use ethereum_types::{U256, H64 as Eth64, H256 as Eth256, H520 as Eth520};
 	use spec::{Ethereum, AuthorityRoundSeal, TendermintSeal, Seal};
 
 	#[test]
diff --git a/json/src/spec/spec.rs b/json/src/spec/spec.rs
index 6aa419b182581c6efac7259f0f96a39778366982..7003cb4cfc9e009525e1ed42bfc68684b0b8b54b 100644
--- a/json/src/spec/spec.rs
+++ b/json/src/spec/spec.rs
@@ -19,7 +19,7 @@
 use std::io::Read;
 use serde_json;
 use serde_json::Error;
-use spec::{Params, Genesis, Engine, State};
+use spec::{Params, Genesis, Engine, State, HardcodedSync};
 
 /// Spec deserialization.
 #[derive(Debug, PartialEq, Deserialize)]
@@ -39,6 +39,9 @@ pub struct Spec {
 	pub accounts: State,
 	/// Boot nodes.
 	pub nodes: Option<Vec<String>>,
+	/// Hardcoded synchronization for the light client.
+	#[serde(rename="hardcodedSync")]
+	pub hardcoded_sync: Option<HardcodedSync>,
 }
 
 impl Spec {
@@ -104,6 +107,14 @@ mod tests {
 		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
+	},
+	"hardcodedSync": {
+		"header": "f901f9a0d405da4e66f1445d455195229624e133f5baafe72b5cf7b3c36c12c8146e98b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a05fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25a088d2ec6b9860aae1a2c3b299f72b6a5d70d7f7ba4722c78f2c49ba96273c2158a007c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302008003832fefba82524d84568e932a80a0a0349d8c3df71f1a48a9df7d03fd5f14aeee7d91332c009ecaff0a71ead405bd88ab4e252a7e8c2a23",
+		"totalDifficulty": "0x400000000",
+		"CHTs": [
+			"0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+			"0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
+		]
 	}
 		}"#;
 		let _deserialized: Spec = serde_json::from_str(s).unwrap();
diff --git a/json/src/spec/tendermint.rs b/json/src/spec/tendermint.rs
index f9e35825d3d0d3d64bfd04bafa2d89ff56602b3c..8f3d4c224871119ae1d3459939b19fd15fdd9ea7 100644
--- a/json/src/spec/tendermint.rs
+++ b/json/src/spec/tendermint.rs
@@ -36,6 +36,9 @@ pub struct TendermintParams {
 	/// Commit step timeout in milliseconds.
 	#[serde(rename="timeoutCommit")]
 	pub timeout_commit: Option<Uint>,
+	/// Reward per block.
+	#[serde(rename="blockReward")]
+	pub block_reward: Option<Uint>,
 }
 
 /// Tendermint engine deserialization.
@@ -48,7 +51,7 @@ pub struct Tendermint {
 #[cfg(test)]
 mod tests {
 	use serde_json;
-	use bigint::prelude::H160;
+	use ethereum_types::H160;
 	use hash::Address;
 	use spec::tendermint::Tendermint;
 	use spec::validator_set::ValidatorSet;
diff --git a/json/src/spec/validator_set.rs b/json/src/spec/validator_set.rs
index 3526bed935db9e6a6d1827b6a2fae75f6d6bb837..9c6b4e79a1c4956662789135e932ece44ec9bb85 100644
--- a/json/src/spec/validator_set.rs
+++ b/json/src/spec/validator_set.rs
@@ -41,7 +41,7 @@ pub enum ValidatorSet {
 mod tests {
 	use serde_json;
 	use uint::Uint;
-	use bigint::prelude::{H160, U256};
+	use ethereum_types::{H160, U256};
 	use hash::Address;
 	use spec::validator_set::ValidatorSet;
 
diff --git a/json/src/state/test.rs b/json/src/state/test.rs
index a63b8ee8d78091542f072e917ac3be36492a821f..3a25c007df8a6d8d360df3844dec4c560ce3d303 100644
--- a/json/src/state/test.rs
+++ b/json/src/state/test.rs
@@ -104,10 +104,12 @@ pub enum ForkSpec {
 	EIP158,
 	Frontier,
 	Homestead,
-	// TODO [ToDr] Deprecated
-	Metropolis,
 	Byzantium,
 	Constantinople,
+	EIP158ToByzantiumAt5,
+	FrontierToHomesteadAt5,
+	HomesteadToDaoAt5,
+	HomesteadToEIP150At5,
 }
 
 /// State test indexes deserialization.
diff --git a/json/src/test/mod.rs b/json/src/test/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1a6e4db7daf7d5d73cf06dc1c498a235a9fd1996
--- /dev/null
+++ b/json/src/test/mod.rs
@@ -0,0 +1,67 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Additional test structures deserialization.
+
+use std::collections::BTreeMap;
+use std::io::Read;
+use serde_json;
+use serde_json::Error;
+use hash::H256;
+use uint::Uint;
+
+/// Blockchain test header deserializer.
+#[derive(Debug, PartialEq, Deserialize)]
+pub struct DifficultyTestCase {
+	/// Parent timestamp.
+	#[serde(rename="parentTimestamp")]
+	pub parent_timestamp: Uint,
+	/// Parent difficulty.
+	#[serde(rename="parentDifficulty")]
+	pub parent_difficulty: Uint,
+	/// Parent uncle hash.
+	#[serde(rename="parentUncles")]
+	pub parent_uncles: H256,
+	/// Current timestamp.
+	#[serde(rename="currentTimestamp")]
+	pub current_timestamp: Uint,
+	/// Current difficulty.
+	#[serde(rename="currentDifficulty")]
+	pub current_difficulty: Uint,
+	/// Current block number.
+	#[serde(rename="currentBlockNumber")]
+	pub current_block_number: Uint,
+}
+/// Blockchain test deserializer.
+#[derive(Debug, PartialEq, Deserialize)]
+pub struct DifficultyTest(BTreeMap<String, DifficultyTestCase>);
+
+impl IntoIterator for DifficultyTest {
+	type Item = <BTreeMap<String, DifficultyTestCase> as IntoIterator>::Item;
+	type IntoIter = <BTreeMap<String, DifficultyTestCase> as IntoIterator>::IntoIter;
+
+	fn into_iter(self) -> Self::IntoIter {
+		self.0.into_iter()
+	}
+}
+
+impl DifficultyTest {
+	/// Loads test from json.
+	pub fn load<R>(reader: R) -> Result<Self, Error> where R: Read {
+		serde_json::from_reader(reader)
+	}
+}
+
diff --git a/json/src/uint.rs b/json/src/uint.rs
index b6962c76288718173869c78ebf8d9fa36603a96e..70e0390a34cbbf74b258f29bcfe731b15394fc4c 100644
--- a/json/src/uint.rs
+++ b/json/src/uint.rs
@@ -18,9 +18,9 @@
 
 use std::fmt;
 use std::str::FromStr;
-use serde::{Deserialize, Deserializer};
-use serde::de::{Error, Visitor};
-use bigint::prelude::U256;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde::de::{Error, Visitor, Unexpected};
+use ethereum_types::U256;
 
 /// Lenient uint json deserialization for test json files.
 #[derive(Default, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
@@ -50,6 +50,13 @@ impl Into<u8> for Uint {
 	}
 }
 
+impl Serialize for Uint {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+		where S: Serializer {
+		self.0.to_string().serialize(serializer)
+	}
+}
+
 impl<'a> Deserialize<'a> for Uint {
 	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
 		where D: Deserializer<'a> {
@@ -90,10 +97,32 @@ impl<'a> Visitor<'a> for UintVisitor {
 	}
 }
 
+pub fn validate_non_zero<'de, D>(d: D) -> Result<Uint, D::Error> where D: Deserializer<'de> {
+	let value = Uint::deserialize(d)?;
+
+	if value == Uint(U256::from(0)) {
+		return Err(Error::invalid_value(Unexpected::Unsigned(value.into()), &"a non-zero value"))
+	}
+
+	Ok(value)
+}
+
+pub fn validate_optional_non_zero<'de, D>(d: D) -> Result<Option<Uint>, D::Error> where D: Deserializer<'de> {
+	let value: Option<Uint> = Option::deserialize(d)?;
+
+	if let Some(value) = value {
+		if value == Uint(U256::from(0)) {
+			return Err(Error::invalid_value(Unexpected::Unsigned(value.into()), &"a non-zero value"))
+		}
+	}
+
+	Ok(value)
+}
+
 #[cfg(test)]
 mod test {
 	use serde_json;
-	use bigint::prelude::U256;
+	use ethereum_types::U256;
 	use uint::Uint;
 
 	#[test]
diff --git a/json/src/vm/call.rs b/json/src/vm/call.rs
index 14e067f5f1dbb4d4b81cae0e5d6bb0529d080304..39d5a828eb9e36fea46dbe1a302d881d136d9274 100644
--- a/json/src/vm/call.rs
+++ b/json/src/vm/call.rs
@@ -39,7 +39,7 @@ pub struct Call {
 mod tests {
 	use serde_json;
 	use vm::Call;
-	use bigint::prelude::{U256, H160 as Hash160};
+	use ethereum_types::{U256, H160 as Hash160};
 	use uint::Uint;
 	use hash::Address;
 	use maybe::MaybeEmpty;
diff --git a/json/src/vm/log.rs b/json/src/vm/log.rs
deleted file mode 100644
index c406253bcecfbe51242966cd4efea8bf29650f5f..0000000000000000000000000000000000000000
--- a/json/src/vm/log.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Vm log deserialization.
-
-use hash::{Address, H256, Bloom};
-use bytes::Bytes;
-
-/// Vm log deserialization.
-#[derive(Debug, PartialEq, Deserialize)]
-pub struct Log {
-	/// Log address.
-	pub address: Address,
-	/// Log bloom.
-	pub bloom: Bloom,
-	/// Data.
-	pub data: Bytes,
-	/// Topics.
-	pub topics: Vec<H256>,
-}
-
-#[cfg(test)]
-mod tests {
-	use serde_json;
-	use vm::Log;
-
-	#[test]
-	fn log_deserialization() {
-		let s = r#"{
-			"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-			"bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000",
-			"data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
-			"topics" : [
-				"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-			]
-		}"#;
-		let _deserialized: Log = serde_json::from_str(s).unwrap();
-		// TODO: validate all fields
-	}
-}
-
diff --git a/json/src/vm/mod.rs b/json/src/vm/mod.rs
index 8917d89db5cb5f98a001f2e90ef089770506ae5d..a2588e37c79651130d3e524dab5f83d961db96c0 100644
--- a/json/src/vm/mod.rs
+++ b/json/src/vm/mod.rs
@@ -19,13 +19,11 @@
 pub mod env;
 pub mod transaction;
 pub mod vm;
-pub mod log;
 pub mod call;
 pub mod test;
 
 pub use self::env::Env;
 pub use self::transaction::Transaction;
 pub use self::vm::Vm;
-pub use self::log::Log;
 pub use self::call::Call;
 pub use self::test::Test;
diff --git a/json/src/vm/vm.rs b/json/src/vm/vm.rs
index 36a19cdade2a5aba6b9d532599bb3973f956bdd1..c7e33b609a7a4da604148e1512fabe0abea2f414 100644
--- a/json/src/vm/vm.rs
+++ b/json/src/vm/vm.rs
@@ -18,8 +18,9 @@
 
 use bytes::Bytes;
 use uint::Uint;
+use hash::H256;
 use blockchain::State;
-use vm::{Transaction, Log, Call, Env};
+use vm::{Transaction, Call, Env};
 
 /// Reporesents vm execution environment before and after exeuction of transaction.
 #[derive(Debug, PartialEq, Deserialize)]
@@ -35,8 +36,8 @@ pub struct Vm {
 	/// Gas left after transaction execution.
 	#[serde(rename="gas")]
 	pub gas_left: Option<Uint>,
-	/// Logs created during execution of transaction.
-	pub logs: Option<Vec<Log>>,
+	/// Hash of logs created during execution of transaction.
+	pub logs: Option<H256>,
 	/// Transaction output.
 	#[serde(rename="out")]
 	pub output: Option<Bytes>,
@@ -83,9 +84,9 @@ mod tests {
 				"value" : "0x0de0b6b3a7640000"
 			},
 			"gas" : "0x013874",
-			"logs" : [
-			],
+			"logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
 			"out" : "0x",
+			"network" : "Frontier",
 			"post" : {
 				"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
 					"balance" : "0x0de0b6b3a7640000",
diff --git a/local-store/Cargo.toml b/local-store/Cargo.toml
index d7b957fd718993425af2ced39a0fd7933eba045f..6d09eb76f69ade2ad53ce0da4cdaddbe76e75fdc 100644
--- a/local-store/Cargo.toml
+++ b/local-store/Cargo.toml
@@ -5,12 +5,16 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-ethcore-util = { path = "../util" }
-ethcore-io = { path = "../util/io" }
 ethcore = { path = "../ethcore" }
-rlp = {path = "../util/rlp" }
+ethcore-io = { path = "../util/io" }
+ethcore-transaction = { path = "../ethcore/transaction" }
+kvdb = { path = "../util/kvdb" }
+log = "0.3"
+rlp = { path = "../util/rlp" }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-log = "0.3"
+
+[dev-dependencies]
 ethkey = { path = "../ethkey" }
+kvdb-memorydb = { path = "../util/kvdb-memorydb" }
diff --git a/local-store/src/lib.rs b/local-store/src/lib.rs
index 5077fbe010d2fca636ba23880d802350486296a3..9120b8694a15932e7a1405978da20b241fc23745 100644
--- a/local-store/src/lib.rs
+++ b/local-store/src/lib.rs
@@ -19,21 +19,22 @@
 use std::sync::Arc;
 use std::fmt;
 
-use ethcore::transaction::{
+use transaction::{
 	SignedTransaction, PendingTransaction, UnverifiedTransaction,
 	Condition as TransactionCondition
 };
-use ethcore::service::ClientIoMessage;
+use ethcore::client::ClientIoMessage;
 use io::IoHandler;
 use rlp::UntrustedRlp;
-use util::kvdb::KeyValueDB;
+use kvdb::KeyValueDB;
 
 extern crate ethcore;
-extern crate ethcore_util as util;
+extern crate ethcore_transaction as transaction;
 extern crate ethcore_io as io;
 extern crate rlp;
 extern crate serde_json;
 extern crate serde;
+extern crate kvdb;
 
 #[macro_use]
 extern crate serde_derive;
@@ -43,6 +44,8 @@ extern crate log;
 
 #[cfg(test)]
 extern crate ethkey;
+#[cfg(test)]
+extern crate kvdb_memorydb;
 
 const LOCAL_TRANSACTIONS_KEY: &'static [u8] = &*b"LOCAL_TXS";
 
@@ -53,7 +56,7 @@ const UPDATE_TIMEOUT_MS: u64 = 15 * 60 * 1000; // once every 15 minutes.
 #[derive(Debug)]
 pub enum Error {
 	/// Database errors: these manifest as `String`s.
-	Database(String),
+	Database(kvdb::Error),
 	/// JSON errors.
 	Json(::serde_json::Error),
 }
@@ -229,7 +232,7 @@ mod tests {
 	use super::NodeInfo;
 
 	use std::sync::Arc;
-	use ethcore::transaction::{Transaction, Condition, PendingTransaction};
+	use transaction::{Transaction, Condition, PendingTransaction};
 	use ethkey::{Brain, Generator};
 
 	// we want to test: round-trip of good transactions.
@@ -242,7 +245,7 @@ mod tests {
 
 	#[test]
 	fn twice_empty() {
-		let db = Arc::new(::util::kvdb::in_memory(0));
+		let db = Arc::new(::kvdb_memorydb::create(0));
 
 		{
 			let store = super::create(db.clone(), None, Dummy(vec![]));
@@ -271,7 +274,7 @@ mod tests {
 			PendingTransaction::new(signed, condition)
 		}).collect();
 
-		let db = Arc::new(::util::kvdb::in_memory(0));
+		let db = Arc::new(::kvdb_memorydb::create(0));
 
 		{
 			// nothing written yet, will write pending.
@@ -310,7 +313,7 @@ mod tests {
 			PendingTransaction::new(signed, None)
 		});
 
-		let db = Arc::new(::util::kvdb::in_memory(0));
+		let db = Arc::new(::kvdb_memorydb::create(0));
 		{
 			// nothing written, will write bad.
 			let store = super::create(db.clone(), None, Dummy(transactions.clone()));
diff --git a/logger/Cargo.toml b/logger/Cargo.toml
index 8b9a8dea278f1278f84b54c3e1876ec7d831b8d9..0e1b03f9411e8a5e8f2b997e3e5dfdd8c2d084ed 100644
--- a/logger/Cargo.toml
+++ b/logger/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-description = "Ethcore client."
+description = "Log implementation for Parity"
 name = "ethcore-logger"
-version = "1.8.0"
+version = "1.11.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
@@ -9,9 +9,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
 log = "0.3"
 env_logger = "0.4"
 isatty = "0.1"
-lazy_static = "0.2"
+lazy_static = "1.0"
 regex = "0.2"
 time = "0.1"
-parking_lot = "0.4"
-arrayvec = "0.3"
-ansi_term = "0.9"
+parking_lot = "0.5"
+arrayvec = "0.4"
+ansi_term = "0.10"
diff --git a/logger/src/lib.rs b/logger/src/lib.rs
index 7b57f383f9bac2c830571475ede0b4962b9dad5b..a2cf6d2a02d00982b8d1334cf24f4113affbdf05 100644
--- a/logger/src/lib.rs
+++ b/logger/src/lib.rs
@@ -70,6 +70,7 @@ pub fn setup_log(config: &Config) -> Result<Arc<RotatingLogger>, String> {
 	// Disable info logging by default for some modules:
 	builder.filter(Some("ws"), LogLevelFilter::Warn);
 	builder.filter(Some("reqwest"), LogLevelFilter::Warn);
+	builder.filter(Some("hyper"), LogLevelFilter::Warn);
 	builder.filter(Some("rustls"), LogLevelFilter::Warn);
 	// Enable info for others.
 	builder.filter(None, LogLevelFilter::Info);
diff --git a/logger/src/rotating.rs b/logger/src/rotating.rs
index 2d98ebcd07fd982daacdb6acf028ce1d6a2f044b..e67bdfaad0adcd27e38fb4915c0e299cd3da39bf 100644
--- a/logger/src/rotating.rs
+++ b/logger/src/rotating.rs
@@ -32,8 +32,8 @@ lazy_static! {
 			builder.parse(&log);
 		}
 
-		if builder.init().is_ok() {
-			println!("logger initialized");
+		if !builder.init().is_ok() {
+			println!("logger initialization failed!");
 		}
 	};
 }
@@ -66,7 +66,11 @@ impl RotatingLogger {
 
 	/// Append new log entry
 	pub fn append(&self, log: String) {
-		self.logs.write().insert(0, log);
+		let mut logs = self.logs.write();
+		if logs.is_full() {
+			logs.pop();
+		}
+		logs.insert(0, log);
 	}
 
 	/// Return levels
diff --git a/mac/Parity Ethereum.xcodeproj/project.pbxproj b/mac/Parity Ethereum.xcodeproj/project.pbxproj
index 913feec70c26906b762dc6b69f345ce4f8d34d97..2e41be6377eff384240754d35897949d74be98ac 100644
--- a/mac/Parity Ethereum.xcodeproj/project.pbxproj	
+++ b/mac/Parity Ethereum.xcodeproj/project.pbxproj	
@@ -13,6 +13,8 @@
 		0ACF9AC71E30FAB600D5C935 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0ACF9AC51E30FAB600D5C935 /* MainMenu.xib */; };
 		0AE564F11E3CE42C00BD01F7 /* GetBSDProcessList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE564F01E3CE42C00BD01F7 /* GetBSDProcessList.swift */; };
 		0AED4DA01E3E22F800BF87C0 /* ethstore in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0AED4D9F1E3E22F800BF87C0 /* ethstore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		84CF92B3200E559900AD6E78 /* parity-evm in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84CF92B2200E559900AD6E78 /* parity-evm */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		84CF92B6200E56AE00AD6E78 /* ethkey in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84CF92B5200E56AE00AD6E78 /* ethkey */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -22,6 +24,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
+				84CF92B6200E56AE00AD6E78 /* ethkey in CopyFiles */,
+				84CF92B3200E559900AD6E78 /* parity-evm in CopyFiles */,
 				0AED4DA01E3E22F800BF87C0 /* ethstore in CopyFiles */,
 				0A7A475D1E3D2CDD0093D1AB /* parity in CopyFiles */,
 			);
@@ -38,6 +42,8 @@
 		0ACF9AC81E30FAB600D5C935 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		0AE564F01E3CE42C00BD01F7 /* GetBSDProcessList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GetBSDProcessList.swift; sourceTree = "<group>"; };
 		0AED4D9F1E3E22F800BF87C0 /* ethstore */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = ethstore; path = ../target/release/ethstore; sourceTree = "<group>"; };
+		84CF92B2200E559900AD6E78 /* parity-evm */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "parity-evm"; path = "../target/release/parity-evm"; sourceTree = "<group>"; };
+		84CF92B5200E56AE00AD6E78 /* ethkey */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = ethkey; path = ../target/release/ethkey; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -54,6 +60,8 @@
 		0ACF9AB51E30FAB600D5C935 = {
 			isa = PBXGroup;
 			children = (
+				84CF92B5200E56AE00AD6E78 /* ethkey */,
+				84CF92B2200E559900AD6E78 /* parity-evm */,
 				0AED4D9F1E3E22F800BF87C0 /* ethstore */,
 				0A7A475C1E3D2CDD0093D1AB /* parity */,
 				0ACF9AC01E30FAB600D5C935 /* Parity Ethereum */,
@@ -110,7 +118,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Parity Technologies";
 				TargetAttributes = {
 					0ACF9ABD1E30FAB600D5C935 = {
@@ -192,6 +200,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -241,6 +250,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/mac/Parity.pkgproj b/mac/Parity.pkgproj
index 1c87af629b66ca17b7355d495ed66d5884d1e3ba..e5229f927a36d3e5aca59924b89a0037fa6e0855 100755
--- a/mac/Parity.pkgproj
+++ b/mac/Parity.pkgproj
@@ -462,7 +462,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.8.0</string>
+				<string>1.11.0</string>
 			</dict>
 			<key>UUID</key>
 			<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>
diff --git a/mac/Parity/AppDelegate.swift b/mac/Parity/AppDelegate.swift
index c017e79bd34e219a6333615456ee20c8a6a20f46..d65c1d601fab4187cb6b4216b3c1ba0efe63f117 100644
--- a/mac/Parity/AppDelegate.swift
+++ b/mac/Parity/AppDelegate.swift
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -22,12 +22,12 @@ import Cocoa
 class AppDelegate: NSObject, NSApplicationDelegate {
 	@IBOutlet weak var statusMenu: NSMenu!
 	@IBOutlet weak var startAtLogonMenuItem: NSMenuItem!
-	
+
 	let statusItem = NSStatusBar.system().statusItem(withLength: NSVariableStatusItemLength)
 	var parityPid: Int32? = nil
 	var commandLine: [String] = []
 	let defaultDefaults = "{\"fat_db\":false,\"mode\":\"passive\",\"mode.alarm\":3600,\"mode.timeout\":300,\"pruning\":\"fast\",\"tracing\":false}"
-	
+
 	func menuAppPath() -> String {
 		return Bundle.main.executablePath!
 	}
@@ -40,20 +40,20 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 		return NSRunningApplication.runningApplications(withBundleIdentifier: Bundle.main.bundleIdentifier!).count > 1
 
 	}
-	
+
 	func isParityRunning() -> Bool {
 		if let pid = self.parityPid {
 			return kill(pid, 0) == 0
 		}
 		return false
 	}
-	
+
 	func killParity() {
 		if let pid = self.parityPid {
 			kill(pid, SIGKILL)
 		}
 	}
-	
+
 	func openUI() {
 		let parity = Process()
 		parity.launchPath = self.parityPath()
@@ -61,29 +61,29 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 		parity.arguments!.append("ui")
 		parity.launch()
 	}
-	
+
 	func writeConfigFiles() {
 		let basePath = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first?
 			.appendingPathComponent(Bundle.main.bundleIdentifier!, isDirectory: true)
-		
+
 		if FileManager.default.fileExists(atPath: basePath!.path) {
 			return
 		}
-		
+
 		do {
 			let defaultsFileDir = basePath?.appendingPathComponent("chains").appendingPathComponent("ethereum")
 			let defaultsFile = defaultsFileDir?.appendingPathComponent("user_defaults")
-			
+
 			try FileManager.default.createDirectory(atPath: (defaultsFileDir?.path)!, withIntermediateDirectories: true, attributes: nil)
 			if !FileManager.default.fileExists(atPath: defaultsFile!.path) {
 				try defaultDefaults.write(to: defaultsFile!, atomically: false, encoding: String.Encoding.utf8)
 			}
-		
+
 			let configFile = basePath?.appendingPathComponent("config.toml")
 		}
 		catch {}
 	}
-	
+
 	func autostartEnabled() -> Bool {
 		return itemReferencesInLoginItems().existingReference != nil
 	}
@@ -123,7 +123,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 		}
 		return (nil, nil)
 	}
-	
+
 	func toggleLaunchAtStartup() {
 		let itemReferences = itemReferencesInLoginItems()
 		let shouldBeToggled = (itemReferences.existingReference == nil)
@@ -155,7 +155,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
 	func launchParity() {
 		self.commandLine = CommandLine.arguments.dropFirst().filter({ $0 != "ui"})
-		
+
 		let processes = GetBSDProcessList()!
 		let parityProcess = processes.index(where: {
 			var name = $0.kp_proc.p_comm
@@ -166,7 +166,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 			}
 			return str == "parity"
 		})
-		
+
 		if parityProcess == nil {
 			let parity = Process()
 			let p = self.parityPath()
@@ -178,7 +178,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 			self.parityPid = processes[parityProcess!].kp_proc.p_pid
 		}
 	}
-	
+
 	func applicationDidFinishLaunching(_ aNotification: Notification) {
 		if self.isAlreadyRunning() {
 			openUI()
@@ -188,12 +188,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
 		self.writeConfigFiles()
 		self.launchParity()
-		Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true, block: {_ in 
+		Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true, block: {_ in
 			if !self.isParityRunning() {
 				NSApplication.shared().terminate(self)
 			}
 		})
-		
+
 		let icon = NSImage(named: "statusIcon")
 		icon?.isTemplate = true // best for dark mode
 		statusItem.image = icon
@@ -206,19 +206,18 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 		}
 		return true
 	}
-	
+
 	@IBAction func quitClicked(_ sender: NSMenuItem) {
 		self.killParity()
 		NSApplication.shared().terminate(self)
 	}
-	
+
 	@IBAction func openClicked(_ sender: NSMenuItem) {
 		self.openUI()
 	}
-	
+
 	@IBAction func startAtLogonClicked(_ sender: NSMenuItem) {
 		self.toggleLaunchAtStartup()
 	}
 
 }
-
diff --git a/mac/Parity/Assets.xcassets/AppIcon.appiconset/Parity.png b/mac/Parity/Assets.xcassets/AppIcon.appiconset/Parity.png
index d54082a9ede759b0423b08963562e994f5415e71..a7f085dab7a3db0028b50aa965f0ddb690affcff 100644
Binary files a/mac/Parity/Assets.xcassets/AppIcon.appiconset/Parity.png and b/mac/Parity/Assets.xcassets/AppIcon.appiconset/Parity.png differ
diff --git a/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-1.png b/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-1.png
index 040d444e2bfc2dc39b2715cf187226f0dd324249..75767ebd7d6fe6b52b9edc86cd76c7528a3b3ee8 100644
Binary files a/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-1.png and b/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-1.png differ
diff --git a/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-2.png b/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-2.png
index 3a4d72b2961cb6c63928deaee31df6bbe3c01433..6a1106f5f1a9e3d7c94c74cd194513ff1a5813d9 100644
Binary files a/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-2.png and b/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity-2.png differ
diff --git a/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity.png b/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity.png
index 19479998875e60919a20dcc7cf3972029cf47cdf..dfbda8ea3cf35f955d256a20fb65e5a80c9c89fb 100644
Binary files a/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity.png and b/mac/Parity/Assets.xcassets/statusIcon.imageset/Parity.png differ
diff --git a/mac/Parity/GetBSDProcessList.swift b/mac/Parity/GetBSDProcessList.swift
index 6ee1956e7858ed1ab68520fd5fc010f127d14038..6737787be8c37c22e3989e4773574f198b1bfe00 100644
--- a/mac/Parity/GetBSDProcessList.swift
+++ b/mac/Parity/GetBSDProcessList.swift
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -21,21 +21,21 @@ import Foundation
 import Darwin
 
 public func GetBSDProcessList() -> ([kinfo_proc]?)  {
-	
+
 	var done = false
 	var result: [kinfo_proc]?
 	var err: Int32
-	
+
 	repeat {
 		let name = [CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0];
 		let namePointer = name.withUnsafeBufferPointer { UnsafeMutablePointer<Int32>(mutating: $0.baseAddress) }
 		var length: Int = 0
-		
+
 		err = sysctl(namePointer, u_int(name.count), nil, &length, nil, 0)
 		if err == -1 {
 			err = errno
 		}
-		
+
 		if err == 0 {
 			let count = length / MemoryLayout<kinfo_proc>.stride
 			result = [kinfo_proc](repeating: kinfo_proc(), count: count)
@@ -54,6 +54,6 @@ public func GetBSDProcessList() -> ([kinfo_proc]?)  {
 			}
 		}
 	} while err == 0 && !done
-	
+
 	return result
 }
diff --git a/mac/Parity/Info.plist b/mac/Parity/Info.plist
index dba9517780e2fc2705178356067b1de7e2c9029a..2cc7e67b83e0b91ca65688de43f162e0cef3698b 100644
--- a/mac/Parity/Info.plist
+++ b/mac/Parity/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8</string>
+	<string>1.11</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSApplicationCategoryType</key>
diff --git a/mac/install-readme.txt b/mac/install-readme.txt
index a68d18ae9fee01387822f7eb73ce92f1523842ab..51f0330bbd65fbef3c9d8bb30e0a5fb4e0733fba 100644
--- a/mac/install-readme.txt
+++ b/mac/install-readme.txt
@@ -3,8 +3,6 @@ Parity Wallet
 
 Welcome to Parity Wallet, your all-in-one Ethereum node and wallet.
 
-WARNING: This installer is **EXPERIMENTAL**. Use it at your own risk.
-
-If you continue, Parity will be installed as a user service. You will be able to use the Parity Wallet through your browser by using the menu bar icon, following the shortcut in the Launchpad or navigating to http://localhost:8080/ in your browser.
+If you continue, Parity will be installed as a user service. You will be able to use the Parity Wallet through your browser by using the menu bar icon, following the shortcut in the Launchpad or navigating to http://localhost:8180/ in your browser.
 
 Parity is distributed under the terms of the GPL.
diff --git a/mac/uninstall-parity.sh b/mac/uninstall-parity.sh
index a1575308bf5006d0d9b3695ee4767bdee615e3e2..840dba1f6091e5d2b6fa3b7664c3636c11a92334 100755
--- a/mac/uninstall-parity.sh
+++ b/mac/uninstall-parity.sh
@@ -9,5 +9,4 @@ fi
 PLIST=~/Library/LaunchAgents/io.parity.ethereum.plist
 su $SUDO_USER -c "launchctl stop io.parity.ethereum"
 su $SUDO_USER -c "launchctl unload $PLIST"
-rm -f /usr/local/libexec/parity /usr/local/libexec/uninstall-parity.sh /usr/local/bin/ethstore $PLIST
-
+rm -f /usr/local/libexec/parity /usr/local/libexec/uninstall-parity.sh /usr/local/bin/ethstore /usr/local/bin/ethkey /usr/local/bin/parity-evm $PLIST
diff --git a/machine/Cargo.toml b/machine/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..037bc55bf806ecbd0356c4fc48964fe3a8d1792a
--- /dev/null
+++ b/machine/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "parity-machine"
+version = "0.1.0"
+description = "Generalization of a state machine for consensus engines"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+ethereum-types = "0.2"
diff --git a/machine/src/lib.rs b/machine/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3a45c38d2efb9244847447a42c6432aa84774884
--- /dev/null
+++ b/machine/src/lib.rs
@@ -0,0 +1,117 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Generalization of a state machine for a consensus engine.
+//! This will define traits for the header, block, and state of a blockchain.
+
+extern crate ethereum_types;
+
+use ethereum_types::{H256, U256, Address};
+
+/// A header. This contains important metadata about the block, as well as a
+/// "seal" that indicates validity to a consensus engine.
+pub trait Header {
+	/// Cryptographic hash of the header, excluding the seal.
+	fn bare_hash(&self) -> H256;
+
+	/// Cryptographic hash of the header, including the seal.
+	fn hash(&self) -> H256;
+
+	/// Get a reference to the seal fields.
+	fn seal(&self) -> &[Vec<u8>];
+
+	/// The author of the header.
+	fn author(&self) -> &Address;
+
+	/// The number of the header.
+	fn number(&self) -> u64;
+}
+
+/// a header with an associated score (difficulty in PoW terms)
+pub trait ScoredHeader: Header {
+	/// Get the score of this header.
+	fn score(&self) -> &U256;
+
+	/// Set the score of this header.
+	fn set_score(&mut self, score: U256);
+}
+
+/// A "live" block is one which is in the process of the transition.
+/// The state of this block can be mutated by arbitrary rules of the
+/// state transition function.
+pub trait LiveBlock: 'static {
+	/// The block header type;
+	type Header: Header;
+
+	/// Get a reference to the header.
+	fn header(&self) -> &Self::Header;
+
+	/// Get a reference to the uncle headers. If the block type doesn't
+	/// support uncles, return the empty slice.
+	fn uncles(&self) -> &[Self::Header];
+}
+
+/// Trait for blocks which have a transaction type.
+pub trait Transactions: LiveBlock {
+	/// The transaction type.
+	type Transaction;
+
+	/// Get a reference to the transactions in this block.
+	fn transactions(&self) -> &[Self::Transaction];
+}
+
+/// Generalization of types surrounding blockchain-suitable state machines.
+pub trait Machine: for<'a> LocalizedMachine<'a> {
+	/// The block header type.
+	type Header: Header;
+	/// The live block type.
+	type LiveBlock: LiveBlock<Header=Self::Header>;
+	/// A handle to a blockchain client for this machine.
+	type EngineClient: ?Sized;
+	/// A description of needed auxiliary data.
+	type AuxiliaryRequest;
+
+	/// Errors which can occur when querying or interacting with the machine.
+	type Error;
+}
+
+/// Machine-related types localized to a specific lifetime.
+// TODO: this is a workaround for a lack of associated type constructors in the language.
+pub trait LocalizedMachine<'a>: Sync + Send {
+	/// Definition of auxiliary data associated to a specific block.
+	type AuxiliaryData: 'a;
+	/// A context providing access to the state in a controlled capacity.
+	/// Generally also provides verifiable proofs.
+	type StateContext: ?Sized + 'a;
+}
+
+/// A state machine that uses balances.
+pub trait WithBalances: Machine {
+	/// Get the balance, in base units, associated with an account.
+	/// Extracts data from the live block.
+	fn balance(&self, live: &Self::LiveBlock, address: &Address) -> Result<U256, Self::Error>;
+
+	/// Increment the balance of an account in the state of the live block.
+	fn add_balance(&self, live: &mut Self::LiveBlock, address: &Address, amount: &U256) -> Result<(), Self::Error>;
+
+	/// Note block rewards. "direct" rewards are for authors, "indirect" are for e.g. uncles.
+	fn note_rewards(
+		&self,
+		_live: &mut Self::LiveBlock,
+		_direct: &[(Address, U256)],
+		_indirect: &[(Address, U256)],
+	) -> Result<(), Self::Error> { Ok(()) }
+}
diff --git a/miner/Cargo.toml b/miner/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..b9f44cd6e02c79bcf55cb553d478521e54af6dcb
--- /dev/null
+++ b/miner/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+description = "Parity Miner interface."
+name = "ethcore-miner"
+homepage = "http://parity.io"
+license = "GPL-3.0"
+version = "1.11.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+# TODO [ToDr] Rewrite using reqwest
+hyper = { git = "https://github.com/paritytech/hyper", default-features = false }
+
+common-types = { path = "../ethcore/types" }
+ethabi = "5.1"
+ethabi-contract = "5.0"
+ethabi-derive = "5.0"
+ethash = { path = "../ethash" }
+ethcore-transaction = { path = "../ethcore/transaction" }
+ethereum-types = "0.2"
+ethkey = { path = "../ethkey" }
+futures = "0.1"
+heapsize = "0.4"
+keccak-hash = { path = "../util/hash" }
+linked-hash-map = "0.5"
+log = "0.3"
+parking_lot = "0.5"
+rustc-hex = "1.0"
+table = { path = "../util/table" }
+transient-hashmap = "0.4"
diff --git a/ethcore/src/miner/banning_queue.rs b/miner/src/banning_queue.rs
similarity index 82%
rename from ethcore/src/miner/banning_queue.rs
rename to miner/src/banning_queue.rs
index 46d7e7cf8dba39958574c18ac1d84d8320ffd81d..388ae5e001543e24864b5c3f15490639bac30d65 100644
--- a/ethcore/src/miner/banning_queue.rs
+++ b/miner/src/banning_queue.rs
@@ -19,12 +19,12 @@
 
 use std::time::Duration;
 use std::ops::{Deref, DerefMut};
-use transaction::{SignedTransaction, Action};
+use ethereum_types::{H256, U256, Address};
+use hash::keccak;
+use transaction::{self, SignedTransaction, Action};
 use transient_hashmap::TransientHashMap;
-use miner::{TransactionQueue, TransactionQueueDetailsProvider, TransactionImportResult, TransactionOrigin};
-use miner::transaction_queue::QueuingInstant;
-use error::{Error, TransactionError};
-use util::{U256, H256, Address, Hashable};
+
+use transaction_queue::{TransactionQueue, TransactionDetailsProvider, TransactionOrigin, QueuingInstant};
 
 type Count = u16;
 
@@ -79,8 +79,8 @@ impl BanningTransactionQueue {
 		&mut self,
 		transaction: SignedTransaction,
 		time: QueuingInstant,
-		details_provider: &TransactionQueueDetailsProvider,
-	) -> Result<TransactionImportResult, Error> {
+		details_provider: &TransactionDetailsProvider,
+	) -> Result<transaction::ImportResult, transaction::Error> {
 		if let Threshold::BanAfter(threshold) = self.ban_threshold {
 			// NOTE In all checks use direct query to avoid increasing ban timeout.
 
@@ -89,7 +89,7 @@ impl BanningTransactionQueue {
 			let count = self.senders_bans.direct().get(&sender).cloned().unwrap_or(0);
 			if count > threshold {
 				debug!(target: "txqueue", "Ignoring transaction {:?} because sender is banned.", transaction.hash());
-				return Err(Error::Transaction(TransactionError::SenderBanned));
+				return Err(transaction::Error::SenderBanned);
 			}
 
 			// Check recipient
@@ -97,17 +97,17 @@ impl BanningTransactionQueue {
 				let count = self.recipients_bans.direct().get(&recipient).cloned().unwrap_or(0);
 				if count > threshold {
 					debug!(target: "txqueue", "Ignoring transaction {:?} because recipient is banned.", transaction.hash());
-					return Err(Error::Transaction(TransactionError::RecipientBanned));
+					return Err(transaction::Error::RecipientBanned);
 				}
 			}
 
 			// Check code
 			if let Action::Create = transaction.action {
-				let code_hash = transaction.data.sha3();
+				let code_hash = keccak(&transaction.data);
 				let count = self.codes_bans.direct().get(&code_hash).cloned().unwrap_or(0);
 				if count > threshold {
 					debug!(target: "txqueue", "Ignoring transaction {:?} because code is banned.", transaction.hash());
-					return Err(Error::Transaction(TransactionError::CodeBanned));
+					return Err(transaction::Error::CodeBanned);
 				}
 			}
 		}
@@ -131,7 +131,7 @@ impl BanningTransactionQueue {
 						self.ban_recipient(recipient)
 					},
 					Action::Create => {
-						self.ban_codehash(transaction.data.sha3())
+						self.ban_codehash(keccak(&transaction.data))
 					},
 				};
 				sender_banned || recipient_or_code_banned
@@ -146,7 +146,7 @@ impl BanningTransactionQueue {
 	/// queue.
 	fn ban_sender(&mut self, address: Address) -> bool {
 		let count = {
-			let mut count = self.senders_bans.entry(address).or_insert_with(|| 0);
+			let count = self.senders_bans.entry(address).or_insert_with(|| 0);
 			*count = count.saturating_add(1);
 			*count
 		};
@@ -166,7 +166,7 @@ impl BanningTransactionQueue {
 	/// Returns true if bans threshold has been reached.
 	fn ban_recipient(&mut self, address: Address) -> bool {
 		let count = {
-			let mut count = self.recipients_bans.entry(address).or_insert_with(|| 0);
+			let count = self.recipients_bans.entry(address).or_insert_with(|| 0);
 			*count = count.saturating_add(1);
 			*count
 		};
@@ -182,7 +182,7 @@ impl BanningTransactionQueue {
 	/// If bans threshold is reached all subsequent transactions to contracts with this codehash will be rejected.
 	/// Returns true if bans threshold has been reached.
 	fn ban_codehash(&mut self, code_hash: H256) -> bool {
-		let mut count = self.codes_bans.entry(code_hash).or_insert_with(|| 0);
+		let count = self.codes_bans.entry(code_hash).or_insert_with(|| 0);
 		*count = count.saturating_add(1);
 
 		match self.ban_threshold {
@@ -208,16 +208,11 @@ impl DerefMut for BanningTransactionQueue {
 
 #[cfg(test)]
 mod tests {
-	use std::time::Duration;
-	use rustc_hex::FromHex;
-	use super::{BanningTransactionQueue, Threshold};
+	use super::*;
 	use ethkey::{Random, Generator};
-	use transaction::{Transaction, SignedTransaction, Action};
-	use error::{Error, TransactionError};
-	use client::TransactionImportResult;
-	use miner::{TransactionQueue, TransactionOrigin};
-	use util::{U256, Address, Hashable};
-	use miner::transaction_queue::test::DummyTransactionDetailsProvider;
+	use rustc_hex::FromHex;
+	use transaction_queue::test::DummyTransactionDetailsProvider;
+	use ethereum_types::{U256, Address};
 
 	fn queue() -> BanningTransactionQueue {
 		BanningTransactionQueue::new(TransactionQueue::default(), Threshold::BanAfter(1), Duration::from_secs(180))
@@ -229,7 +224,7 @@ mod tests {
 
 	fn transaction(action: Action) -> SignedTransaction {
 		let keypair = Random.generate().unwrap();
-		Transaction {
+		transaction::Transaction {
 			action: action,
 			value: U256::from(100),
 			data: "3331600055".from_hex().unwrap(),
@@ -239,12 +234,8 @@ mod tests {
 		}.sign(keypair.secret(), None)
 	}
 
-	fn unwrap_err(res: Result<TransactionImportResult, Error>) -> TransactionError {
-		match res {
-			Err(Error::Transaction(e)) => e,
-			Ok(x) => panic!("Expected error, got: Ok({:?})", x),
-			Err(e) => panic!("Unexpected error type returned by queue: {:?}", e),
-		}
+	fn unwrap_err(res: Result<transaction::ImportResult, transaction::Error>) -> transaction::Error {
+		res.unwrap_err()
 	}
 
 	#[test]
@@ -271,7 +262,7 @@ mod tests {
 		assert!(!banlist1, "Threshold not reached yet.");
 		// Insert once
 		let import1 = txq.add_with_banlist(tx.clone(), 0, &default_tx_provider()).unwrap();
-		assert_eq!(import1, TransactionImportResult::Current);
+		assert_eq!(import1, transaction::ImportResult::Current);
 
 		// when
 		let banlist2 = txq.ban_sender(tx.sender());
@@ -279,7 +270,7 @@ mod tests {
 
 		// then
 		assert!(banlist2, "Threshold should be reached - banned.");
-		assert_eq!(unwrap_err(import2), TransactionError::SenderBanned);
+		assert_eq!(unwrap_err(import2), transaction::Error::SenderBanned);
 		// Should also remove transacion from the queue
 		assert_eq!(txq.find(&tx.hash()), None);
 	}
@@ -295,7 +286,7 @@ mod tests {
 		assert!(!banlist1, "Threshold not reached yet.");
 		// Insert once
 		let import1 = txq.add_with_banlist(tx.clone(), 0, &default_tx_provider()).unwrap();
-		assert_eq!(import1, TransactionImportResult::Current);
+		assert_eq!(import1, transaction::ImportResult::Current);
 
 		// when
 		let banlist2 = txq.ban_recipient(recipient);
@@ -303,21 +294,21 @@ mod tests {
 
 		// then
 		assert!(banlist2, "Threshold should be reached - banned.");
-		assert_eq!(unwrap_err(import2), TransactionError::RecipientBanned);
+		assert_eq!(unwrap_err(import2), transaction::Error::RecipientBanned);
 	}
 
 	#[test]
 	fn should_not_accept_transactions_with_banned_code() {
 		// given
 		let tx = transaction(Action::Create);
-		let codehash = tx.data.sha3();
+		let codehash = keccak(&tx.data);
 		let mut txq = queue();
 		// Banlist once (threshold not reached)
 		let banlist1 = txq.ban_codehash(codehash);
 		assert!(!banlist1, "Threshold not reached yet.");
 		// Insert once
 		let import1 = txq.add_with_banlist(tx.clone(), 0, &default_tx_provider()).unwrap();
-		assert_eq!(import1, TransactionImportResult::Current);
+		assert_eq!(import1, transaction::ImportResult::Current);
 
 		// when
 		let banlist2 = txq.ban_codehash(codehash);
@@ -325,6 +316,6 @@ mod tests {
 
 		// then
 		assert!(banlist2, "Threshold should be reached - banned.");
-		assert_eq!(unwrap_err(import2), TransactionError::CodeBanned);
+		assert_eq!(unwrap_err(import2), transaction::Error::CodeBanned);
 	}
 }
diff --git a/ethcore/src/miner/external.rs b/miner/src/external.rs
similarity index 95%
rename from ethcore/src/miner/external.rs
rename to miner/src/external.rs
index 65f8ee8cc6f358be6a8d501fd0e3addf4daedbdc..cbd830cd55f98131dead2ae657c7cd5f89b14287 100644
--- a/ethcore/src/miner/external.rs
+++ b/miner/src/external.rs
@@ -14,10 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+//! External Miner hashrate tracker.
+
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::{Instant, Duration};
-use util::{Mutex, U256, H256};
+use ethereum_types::{H256, U256};
+use parking_lot::Mutex;
 
 /// External miner interface.
 pub trait ExternalMinerService: Send + Sync {
@@ -70,7 +73,7 @@ mod tests {
 	use super::*;
 	use std::thread::sleep;
 	use std::time::Duration;
-	use util::{H256, U256};
+	use ethereum_types::{H256, U256};
 
 	fn miner() -> ExternalMiner {
 		ExternalMiner::default()
diff --git a/ethcore/src/blockchain/generator/transaction.rs b/miner/src/lib.rs
similarity index 53%
rename from ethcore/src/blockchain/generator/transaction.rs
rename to miner/src/lib.rs
index c2c89ace76847c1bc9d6ad939dee93b931a0c17a..e8a86bd02a4aa95b5a83c8771ab5c6270f588eac 100644
--- a/ethcore/src/blockchain/generator/transaction.rs
+++ b/miner/src/lib.rs
@@ -14,22 +14,32 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use transaction::SignedTransaction;
-
-pub trait WithTransaction {
-	fn with_transaction(self, transaction: SignedTransaction) -> Self where Self: Sized;
-}
-
-pub struct Transaction<'a, I> where I: 'a {
-	pub iter: &'a mut I,
-	pub transaction: SignedTransaction,
-}
-
-impl <'a, I> Iterator for Transaction<'a, I> where I: Iterator, <I as Iterator>::Item: WithTransaction {
-	type Item = <I as Iterator>::Item;
-
-	#[inline]
-	fn next(&mut self) -> Option<Self::Item> {
-		self.iter.next().map(|item| item.with_transaction(self.transaction.clone()))
-	}
-}
+#![warn(missing_docs)]
+
+//! Miner module
+//! Keeps track of transactions and mined block.
+
+extern crate common_types as types;
+extern crate ethabi;
+extern crate ethcore_transaction as transaction;
+extern crate ethereum_types;
+extern crate futures;
+extern crate heapsize;
+extern crate keccak_hash as hash;
+extern crate linked_hash_map;
+extern crate parking_lot;
+extern crate table;
+extern crate transient_hashmap;
+
+#[cfg(test)]
+extern crate ethkey;
+#[macro_use]
+extern crate log;
+#[cfg(test)]
+extern crate rustc_hex;
+
+pub mod banning_queue;
+pub mod external;
+pub mod local_transactions;
+pub mod transaction_queue;
+pub mod work_notify;
diff --git a/ethcore/src/miner/local_transactions.rs b/miner/src/local_transactions.rs
similarity index 86%
rename from ethcore/src/miner/local_transactions.rs
rename to miner/src/local_transactions.rs
index 59137c3f4aef996505da7c533585b34365b4db9f..e8d1988a4f670c928445ce39748f87482de3f552 100644
--- a/ethcore/src/miner/local_transactions.rs
+++ b/miner/src/local_transactions.rs
@@ -16,10 +16,9 @@
 
 //! Local Transactions List.
 
+use ethereum_types::{H256, U256};
 use linked_hash_map::LinkedHashMap;
-use transaction::{SignedTransaction, PendingTransaction};
-use error::TransactionError;
-use util::{U256, H256};
+use transaction::{self, SignedTransaction, PendingTransaction};
 
 /// Status of local transaction.
 /// Can indicate that the transaction is currently part of the queue (`Pending/Future`)
@@ -37,7 +36,7 @@ pub enum Status {
 	/// Replaced because of higher gas price of another transaction.
 	Replaced(SignedTransaction, U256, H256),
 	/// Transaction was never accepted to the queue.
-	Rejected(SignedTransaction, TransactionError),
+	Rejected(SignedTransaction, transaction::Error),
 	/// Transaction is invalid.
 	Invalid(SignedTransaction),
 	/// Transaction was canceled.
@@ -64,6 +63,7 @@ impl Default for LocalTransactionsList {
 }
 
 impl LocalTransactionsList {
+	/// Create a new list of local transactions.
 	pub fn new(max_old: usize) -> Self {
 		LocalTransactionsList {
 			max_old: max_old,
@@ -71,58 +71,68 @@ impl LocalTransactionsList {
 		}
 	}
 
+	/// Mark transaction with given hash as pending.
 	pub fn mark_pending(&mut self, hash: H256) {
 		debug!(target: "own_tx", "Imported to Current (hash {:?})", hash);
 		self.clear_old();
 		self.transactions.insert(hash, Status::Pending);
 	}
 
+	/// Mark transaction with given hash as future.
 	pub fn mark_future(&mut self, hash: H256) {
 		debug!(target: "own_tx", "Imported to Future (hash {:?})", hash);
 		self.transactions.insert(hash, Status::Future);
 		self.clear_old();
 	}
 
-	pub fn mark_rejected(&mut self, tx: SignedTransaction, err: TransactionError) {
+	/// Mark given transaction as rejected from the queue.
+	pub fn mark_rejected(&mut self, tx: SignedTransaction, err: transaction::Error) {
 		debug!(target: "own_tx", "Transaction rejected (hash {:?}): {:?}", tx.hash(), err);
 		self.transactions.insert(tx.hash(), Status::Rejected(tx, err));
 		self.clear_old();
 	}
 
+	/// Mark the transaction as replaced by transaction with given hash.
 	pub fn mark_replaced(&mut self, tx: SignedTransaction, gas_price: U256, hash: H256) {
 		debug!(target: "own_tx", "Transaction replaced (hash {:?}) by {:?} (new gas price: {:?})", tx.hash(), hash, gas_price);
 		self.transactions.insert(tx.hash(), Status::Replaced(tx, gas_price, hash));
 		self.clear_old();
 	}
 
+	/// Mark transaction as invalid.
 	pub fn mark_invalid(&mut self, tx: SignedTransaction) {
 		warn!(target: "own_tx", "Transaction marked invalid (hash {:?})", tx.hash());
 		self.transactions.insert(tx.hash(), Status::Invalid(tx));
 		self.clear_old();
 	}
 
+	/// Mark transaction as canceled.
 	pub fn mark_canceled(&mut self, tx: PendingTransaction) {
 		warn!(target: "own_tx", "Transaction canceled (hash {:?})", tx.hash());
 		self.transactions.insert(tx.hash(), Status::Canceled(tx));
 		self.clear_old();
 	}
 
+	/// Mark transaction as dropped because of limit.
 	pub fn mark_dropped(&mut self, tx: SignedTransaction) {
 		warn!(target: "own_tx", "Transaction dropped (hash {:?})", tx.hash());
 		self.transactions.insert(tx.hash(), Status::Dropped(tx));
 		self.clear_old();
 	}
 
+	/// Mark transaction as mined.
 	pub fn mark_mined(&mut self, tx: SignedTransaction) {
 		info!(target: "own_tx", "Transaction mined (hash {:?})", tx.hash());
 		self.transactions.insert(tx.hash(), Status::Mined(tx));
 		self.clear_old();
 	}
 
+	/// Returns true if the transaction is already in local transactions.
 	pub fn contains(&self, hash: &H256) -> bool {
 		self.transactions.contains_key(hash)
 	}
 
+	/// Return a map of all currently stored transactions.
 	pub fn all_transactions(&self) -> &LinkedHashMap<H256, Status> {
 		&self.transactions
 	}
@@ -152,10 +162,9 @@ impl LocalTransactionsList {
 
 #[cfg(test)]
 mod tests {
-	use util::U256;
+	use super::*;
+	use ethereum_types::U256;
 	use ethkey::{Random, Generator};
-	use transaction::{Action, Transaction, SignedTransaction};
-	use super::{LocalTransactionsList, Status};
 
 	#[test]
 	fn should_add_transaction_as_pending() {
@@ -199,8 +208,8 @@ mod tests {
 
 	fn new_tx(nonce: U256) -> SignedTransaction {
 		let keypair = Random.generate().unwrap();
-		Transaction {
-			action: Action::Create,
+		transaction::Transaction {
+			action: transaction::Action::Create,
 			value: U256::from(100),
 			data: Default::default(),
 			gas: U256::from(10),
diff --git a/ethcore/src/miner/transaction_queue.rs b/miner/src/transaction_queue.rs
similarity index 94%
rename from ethcore/src/miner/transaction_queue.rs
rename to miner/src/transaction_queue.rs
index 00029e70f22c917700a352705d6e0f1d651ede74..2be7fc8a3b8597cbd35b80bb641b1ae0db972159 100644
--- a/ethcore/src/miner/transaction_queue.rs
+++ b/miner/src/transaction_queue.rs
@@ -24,21 +24,22 @@
 //! # Usage Example
 //!
 //! ```rust
-//! extern crate ethcore_util as util;
-//! extern crate ethcore;
+//! extern crate ethereum_types;
+//! extern crate ethcore_miner as miner;
+//! extern crate ethcore_transaction as transaction;
 //! extern crate ethkey;
 //! extern crate rustc_hex;
 //!
-//! use util::{U256, Address};
+//! use ethereum_types::{U256, Address};
 //! use ethkey::{Random, Generator};
-//!	use ethcore::miner::{TransactionQueue, RemovalReason, TransactionQueueDetailsProvider, AccountDetails, TransactionOrigin};
-//!	use ethcore::transaction::*;
+//!	use miner::transaction_queue::{TransactionQueue, TransactionDetailsProvider, AccountDetails, TransactionOrigin, RemovalReason};
+//!	use transaction::*;
 //!	use rustc_hex::FromHex;
 //!
 //!	#[derive(Default)]
 //! struct DummyTransactionDetailsProvider;
 //!
-//!	impl TransactionQueueDetailsProvider for DummyTransactionDetailsProvider {
+//!	impl TransactionDetailsProvider for DummyTransactionDetailsProvider {
 //!		fn fetch_account(&self, _address: &Address) -> AccountDetails {
 //!			AccountDetails {
 //!				nonce: U256::from(10),
@@ -100,18 +101,19 @@
 //! 4. `remove_old` is used as convenient method to update the state nonce for all senders in the queue.
 //!		- Invokes `cull` with latest state nonce for all senders.
 
-use std::ops::Deref;
 use std::cmp::Ordering;
 use std::cmp;
 use std::collections::{HashSet, HashMap, BTreeSet, BTreeMap};
+use std::ops::Deref;
+
+use ethereum_types::{H256, U256, Address};
+use heapsize::HeapSizeOf;
 use linked_hash_map::LinkedHashMap;
-use util::{Address, H256, U256, HeapSizeOf};
+use local_transactions::{LocalTransactionsList, Status as LocalTransactionStatus};
 use table::Table;
-use transaction::*;
-use error::{Error, TransactionError};
-use client::TransactionImportResult;
-use header::BlockNumber;
-use miner::local_transactions::{LocalTransactionsList, Status as LocalTransactionStatus};
+use transaction::{self, SignedTransaction, PendingTransaction};
+
+type BlockNumber = u64;
 
 /// Transaction origin
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -131,7 +133,6 @@ impl PartialOrd for TransactionOrigin {
 }
 
 impl Ord for TransactionOrigin {
-	#[cfg_attr(feature="dev", allow(match_same_arms))]
 	fn cmp(&self, other: &TransactionOrigin) -> Ordering {
 		if *other == *self {
 			return Ordering::Equal;
@@ -281,7 +282,7 @@ struct VerifiedTransaction {
 	/// Transaction origin.
 	origin: TransactionOrigin,
 	/// Delay until specified condition is met.
-	condition: Option<Condition>,
+	condition: Option<transaction::Condition>,
 	/// Insertion time
 	insertion_time: QueuingInstant,
 	/// ID assigned upon insertion, should be unique.
@@ -292,7 +293,7 @@ impl VerifiedTransaction {
 	fn new(
 		transaction: SignedTransaction,
 		origin: TransactionOrigin,
-		condition: Option<Condition>,
+		condition: Option<transaction::Condition>,
 		insertion_time: QueuingInstant,
 		insertion_id: u64,
 	) -> Self {
@@ -336,7 +337,7 @@ impl GasPriceQueue {
 	/// Remove an item from a BTreeMap/HashSet "multimap".
 	/// Returns true if the item was removed successfully.
 	pub fn remove(&mut self, gas_price: &U256, hash: &H256) -> bool {
-		if let Some(mut hashes) = self.backing.get_mut(gas_price) {
+		if let Some(hashes) = self.backing.get_mut(gas_price) {
 			let only_one_left = hashes.len() == 1;
 			if !only_one_left {
 				// Operation may be ok: only if hash is in gas-price's Set.
@@ -510,12 +511,7 @@ pub struct AccountDetails {
 /// `new_gas_price > old_gas_price + old_gas_price >> SHIFT`
 const GAS_PRICE_BUMP_SHIFT: usize = 3; // 2 = 25%, 3 = 12.5%, 4 = 6.25%
 
-/// Future queue limits are lower from current queue limits:
-/// `future_limit = current_limit >> SHIFT`
-const FUTURE_QUEUE_LIMITS_SHIFT: usize = 3; // 2 = 25%, 3 = 12.5%, 4 = 6.25%
-
 /// Describes the strategy used to prioritize transactions in the queue.
-#[cfg_attr(feature="dev", allow(enum_variant_names))]
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum PrioritizationStrategy {
 	/// Use only gas price. Disregards the actual computation cost of the transaction.
@@ -544,6 +540,8 @@ pub enum RemovalReason {
 	Invalid,
 	/// Transaction was canceled
 	Canceled,
+	/// Transaction is not allowed,
+	NotAllowed,
 }
 
 /// Point in time when transaction was inserted.
@@ -621,9 +619,9 @@ impl TransactionQueue {
 			by_priority: BTreeSet::new(),
 			by_address: Table::new(),
 			by_gas_price: Default::default(),
-			total_gas_limit: total_gas_limit >> FUTURE_QUEUE_LIMITS_SHIFT,
-			limit: limit >> FUTURE_QUEUE_LIMITS_SHIFT,
-			memory_limit: memory_limit >> FUTURE_QUEUE_LIMITS_SHIFT,
+			total_gas_limit,
+			limit,
+			memory_limit,
 		};
 
 		TransactionQueue {
@@ -644,7 +642,7 @@ impl TransactionQueue {
 	/// Set the new limit for `current` and `future` queue.
 	pub fn set_limit(&mut self, limit: usize) {
 		self.current.set_limit(limit);
-		self.future.set_limit(limit >> FUTURE_QUEUE_LIMITS_SHIFT);
+		self.future.set_limit(limit);
 		// And ensure the limits
 		self.current.enforce_limit(&mut self.by_hash, &mut self.local_transactions);
 		self.future.enforce_limit(&mut self.by_hash, &mut self.local_transactions);
@@ -681,7 +679,7 @@ impl TransactionQueue {
 	/// Sets new total gas limit.
 	pub fn set_total_gas_limit(&mut self, total_gas_limit: U256) {
 		self.current.total_gas_limit = total_gas_limit;
-		self.future.total_gas_limit = total_gas_limit >> FUTURE_QUEUE_LIMITS_SHIFT;
+		self.future.total_gas_limit = total_gas_limit;
 		self.future.enforce_limit(&mut self.by_hash, &mut self.local_transactions);
 	}
 
@@ -708,31 +706,28 @@ impl TransactionQueue {
 		tx: SignedTransaction,
 		origin: TransactionOrigin,
 		time: QueuingInstant,
-		condition: Option<Condition>,
+		condition: Option<transaction::Condition>,
 		details_provider: &TransactionDetailsProvider,
-	) -> Result<TransactionImportResult, Error> {
+	) -> Result<transaction::ImportResult, transaction::Error> {
 		if origin == TransactionOrigin::Local {
 			let hash = tx.hash();
 			let cloned_tx = tx.clone();
 
 			let result = self.add_internal(tx, origin, time, condition, details_provider);
 			match result {
-				Ok(TransactionImportResult::Current) => {
+				Ok(transaction::ImportResult::Current) => {
 					self.local_transactions.mark_pending(hash);
 				},
-				Ok(TransactionImportResult::Future) => {
+				Ok(transaction::ImportResult::Future) => {
 					self.local_transactions.mark_future(hash);
 				},
-				Err(Error::Transaction(ref err)) => {
+				Err(ref err) => {
 					// Sometimes transactions are re-imported, so
 					// don't overwrite transactions if they are already on the list
 					if !self.local_transactions.contains(&hash) {
 						self.local_transactions.mark_rejected(cloned_tx, err.clone());
 					}
 				},
-				Err(_) => {
-					self.local_transactions.mark_invalid(cloned_tx);
-				},
 			}
 			result
 		} else {
@@ -746,9 +741,9 @@ impl TransactionQueue {
 		tx: SignedTransaction,
 		origin: TransactionOrigin,
 		time: QueuingInstant,
-		condition: Option<Condition>,
+		condition: Option<transaction::Condition>,
 		details_provider: &TransactionDetailsProvider,
-	) -> Result<TransactionImportResult, Error> {
+	) -> Result<transaction::ImportResult, transaction::Error> {
 		if origin != TransactionOrigin::Local && tx.gas_price < self.minimal_gas_price {
 			// if it is non-service-transaction => drop
 			let is_service_transaction = tx.gas_price.is_zero();
@@ -760,10 +755,10 @@ impl TransactionQueue {
 					self.minimal_gas_price
 				);
 
-				return Err(Error::Transaction(TransactionError::InsufficientGasPrice {
+				return Err(transaction::Error::InsufficientGasPrice {
 					minimal: self.minimal_gas_price,
 					got: tx.gas_price,
-				}));
+				});
 			}
 
 			let is_service_transaction_accepted = match details_provider.is_service_transaction_acceptable(&tx) {
@@ -789,10 +784,10 @@ impl TransactionQueue {
 			};
 
 			if !is_service_transaction_accepted {
-				return Err(Error::Transaction(TransactionError::InsufficientGasPrice {
-						minimal: self.minimal_gas_price,
-						got: tx.gas_price,
-					}));
+				return Err(transaction::Error::InsufficientGasPrice {
+					minimal: self.minimal_gas_price,
+					got: tx.gas_price,
+				});
 			}
 		}
 
@@ -805,10 +800,10 @@ impl TransactionQueue {
 				full_queues_lowest
 			);
 
-			return Err(Error::Transaction(TransactionError::InsufficientGasPrice {
+			return Err(transaction::Error::InsufficientGasPrice {
 				minimal: full_queues_lowest,
 				got: tx.gas_price,
-			}));
+			});
 		}
 
 		let gas_limit = cmp::min(self.tx_gas_limit, self.block_gas_limit);
@@ -820,10 +815,10 @@ impl TransactionQueue {
 				self.block_gas_limit,
 				self.tx_gas_limit
 			);
-			return Err(Error::Transaction(TransactionError::GasLimitExceeded {
+			return Err(transaction::Error::GasLimitExceeded {
 				limit: gas_limit,
 				got: tx.gas,
-			}));
+			});
 		}
 
 		let minimal_gas = details_provider.estimate_gas_required(&tx);
@@ -835,10 +830,10 @@ impl TransactionQueue {
 				minimal_gas,
 			);
 
-			return Err(Error::Transaction(TransactionError::InsufficientGas {
+			return Err(transaction::Error::InsufficientGas {
 				minimal: minimal_gas,
 				got: tx.gas,
-			}));
+			});
 		}
 
 		let client_account = details_provider.fetch_account(&tx.sender());
@@ -851,17 +846,17 @@ impl TransactionQueue {
 				cost
 			);
 
-			return Err(Error::Transaction(TransactionError::InsufficientBalance {
+			return Err(transaction::Error::InsufficientBalance {
 				cost: cost,
 				balance: client_account.balance
-			}));
+			});
 		}
 		tx.check_low_s()?;
 		// No invalid transactions beyond this point.
 		let id = self.next_transaction_id;
 		self.next_transaction_id += 1;
 		let vtx = VerifiedTransaction::new(tx, origin, condition, time, id);
-		let r = self.import_tx(vtx, client_account.nonce).map_err(Error::Transaction);
+		let r = self.import_tx(vtx, client_account.nonce);
 		assert_eq!(self.future.by_priority.len() + self.current.by_priority.len(), self.by_hash.len());
 		r
 	}
@@ -1013,6 +1008,9 @@ impl TransactionQueue {
 				RemovalReason::Invalid => self.local_transactions.mark_invalid(
 					transaction.transaction.into()
 				),
+				RemovalReason::NotAllowed => self.local_transactions.mark_invalid(
+					transaction.transaction.into()
+				),
 				RemovalReason::Canceled => self.local_transactions.mark_canceled(
 					PendingTransaction::new(transaction.transaction, transaction.condition)
 				),
@@ -1140,8 +1138,8 @@ impl TransactionQueue {
 				}
 			}
 			let delay = match tx.condition {
-				Some(Condition::Number(n)) => n > best_block,
-				Some(Condition::Timestamp(t)) => t > best_timestamp,
+				Some(transaction::Condition::Number(n)) => n > best_block,
+				Some(transaction::Condition::Timestamp(t)) => t > best_timestamp,
 				None => false,
 			};
 			if delay {
@@ -1220,7 +1218,7 @@ impl TransactionQueue {
 			if by_nonce.is_none() {
 				return;
 			}
-			let mut by_nonce = by_nonce.expect("None is tested in early-exit condition above; qed");
+			let by_nonce = by_nonce.expect("None is tested in early-exit condition above; qed");
 			while let Some(order) = by_nonce.remove(&current_nonce) {
 				// remove also from priority and gas_price
 				self.future.by_priority.remove(&order);
@@ -1254,12 +1252,13 @@ impl TransactionQueue {
 	/// iff `(address, nonce)` is the same but `gas_price` is higher.
 	///
 	/// Returns `true` when transaction was imported successfuly
-	fn import_tx(&mut self, tx: VerifiedTransaction, state_nonce: U256) -> Result<TransactionImportResult, TransactionError> {
+	fn import_tx(&mut self, tx: VerifiedTransaction, state_nonce: U256) -> Result<transaction::ImportResult,
+	transaction::Error> {
 
 		if self.by_hash.get(&tx.hash()).is_some() {
 			// Transaction is already imported.
 			trace!(target: "txqueue", "Dropping already imported transaction: {:?}", tx.hash());
-			return Err(TransactionError::AlreadyImported);
+			return Err(transaction::Error::AlreadyImported);
 		}
 
 		let min_gas_price = (self.minimal_gas_price, self.strategy);
@@ -1273,7 +1272,7 @@ impl TransactionQueue {
 		if nonce < state_nonce {
 			// Droping transaction
 			trace!(target: "txqueue", "Dropping old transaction: {:?} (nonce: {} < {})", tx.hash(), nonce, state_nonce);
-			return Err(TransactionError::Old);
+			return Err(transaction::Error::Old);
 		}
 
 		// Update nonces of transactions in future (remove old transactions)
@@ -1304,7 +1303,7 @@ impl TransactionQueue {
 
 			debug!(target: "txqueue", "Importing transaction to future: {:?}", hash);
 			debug!(target: "txqueue", "status: {:?}", self.status());
-			return Ok(TransactionImportResult::Future);
+			return Ok(transaction::ImportResult::Future);
 		}
 
 		// We might have filled a gap - move some more transactions from future
@@ -1328,7 +1327,7 @@ impl TransactionQueue {
 
 		debug!(target: "txqueue", "Imported transaction to current: {:?}", hash);
 		debug!(target: "txqueue", "status: {:?}", self.status());
-		Ok(TransactionImportResult::Current)
+		Ok(transaction::ImportResult::Current)
 	}
 
 	/// Updates
@@ -1415,19 +1414,20 @@ impl TransactionQueue {
 	}
 }
 
-fn check_too_cheap(is_in: bool) -> Result<(), TransactionError> {
+fn check_too_cheap(is_in: bool) -> Result<(), transaction::Error> {
 	if is_in {
 		Ok(())
 	} else {
-		Err(TransactionError::TooCheapToReplace)
+		Err(transaction::Error::TooCheapToReplace)
 	}
 }
 
-fn check_if_removed(sender: &Address, nonce: &U256, dropped: Option<HashMap<Address, U256>>) -> Result<(), TransactionError> {
+fn check_if_removed(sender: &Address, nonce: &U256, dropped: Option<HashMap<Address, U256>>) -> Result<(),
+   transaction::Error> {
 	match dropped {
 		Some(ref dropped) => match dropped.get(sender) {
 			Some(min) if nonce >= min => {
-				Err(TransactionError::LimitReached)
+				Err(transaction::Error::LimitReached)
 			},
 			_ => Ok(()),
 		},
@@ -1438,16 +1438,11 @@ fn check_if_removed(sender: &Address, nonce: &U256, dropped: Option<HashMap<Addr
 
 #[cfg(test)]
 pub mod test {
-	use rustc_hex::FromHex;
-	use table::Table;
-	use util::*;
-	use ethkey::{Random, Generator};
-	use error::{Error, TransactionError};
+	use ethereum_types::{U256, Address};
 	use super::*;
-	use super::{TransactionSet, TransactionOrder, VerifiedTransaction};
-	use miner::local_transactions::LocalTransactionsList;
-	use client::TransactionImportResult;
-	use transaction::{SignedTransaction, Transaction, Action, Condition};
+	use ethkey::{Random, Generator};
+	use rustc_hex::FromHex;
+	use transaction::Transaction;
 
 	pub struct DummyTransactionDetailsProvider {
 		account_details: AccountDetails,
@@ -1509,11 +1504,8 @@ pub mod test {
 		}
 	}
 
-	fn unwrap_tx_err(err: Result<TransactionImportResult, Error>) -> TransactionError {
-		match err.unwrap_err() {
-			Error::Transaction(e) => e,
-			_ => panic!("Expected transaction error!"),
-		}
+	fn unwrap_tx_err(err: Result<transaction::ImportResult, transaction::Error>) -> transaction::Error {
+		err.unwrap_err()
 	}
 
 	fn default_nonce() -> U256 { 123.into() }
@@ -1522,7 +1514,7 @@ pub mod test {
 
 	fn new_unsigned_tx(nonce: U256, gas: U256, gas_price: U256) -> Transaction {
 		Transaction {
-			action: Action::Create,
+			action: transaction::Action::Create,
 			value: U256::from(100),
 			data: "3331600055".from_hex().unwrap(),
 			gas: gas,
@@ -1632,11 +1624,11 @@ pub mod test {
 		// We may want to reconsider this in the near future so leaving this code in as a
 		// possible alternative.
 		/*
-		assert_eq!(res.unwrap(), TransactionImportResult::Current);
+		assert_eq!(res.unwrap(), transaction::ImportResult::Current);
 		assert_eq!(txq.status().pending, 2);
 		assert_eq!(txq.last_nonce(&sender), Some(nonce));
 		*/
-		assert_eq!(unwrap_tx_err(res), TransactionError::InsufficientGasPrice {
+		assert_eq!(unwrap_tx_err(res), transaction::Error::InsufficientGasPrice {
 			minimal: 2.into(),
 			got: 1.into(),
 		});
@@ -1785,14 +1777,14 @@ pub mod test {
 
 		// First insert one transaction to future
 		let res = txq.add(tx, TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(prev_nonce));
-		assert_eq!(res.unwrap(), TransactionImportResult::Future);
+		assert_eq!(res.unwrap(), transaction::ImportResult::Future);
 		assert_eq!(txq.status().future, 1);
 
 		// now import second transaction to current
 		let res = txq.add(tx2.clone(), TransactionOrigin::External, 0, None, &default_tx_provider());
 
 		// and then there should be only one transaction in current (the one with higher gas_price)
-		assert_eq!(res.unwrap(), TransactionImportResult::Current);
+		assert_eq!(res.unwrap(), transaction::ImportResult::Current);
 		assert_eq!(txq.status().pending, 1);
 		assert_eq!(txq.status().future, 0);
 		assert_eq!(txq.current.by_priority.len(), 1);
@@ -1810,14 +1802,14 @@ pub mod test {
 
 		// First insert one transaction to future
 		let res = txq.add(tx.clone(), TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(prev_nonce));
-		assert_eq!(res.unwrap(), TransactionImportResult::Future);
+		assert_eq!(res.unwrap(), transaction::ImportResult::Future);
 		assert_eq!(txq.status().future, 1);
 
 		// now import second transaction to current
 		let res = txq.add(tx2.clone(), TransactionOrigin::External, 0, None, &default_tx_provider());
 
 		// then
-		assert_eq!(res.unwrap(), TransactionImportResult::Current);
+		assert_eq!(res.unwrap(), transaction::ImportResult::Current);
 		assert_eq!(txq.status().pending, 2);
 		assert_eq!(txq.status().future, 0);
 		assert_eq!(txq.current.by_priority.len(), 2);
@@ -1837,7 +1829,7 @@ pub mod test {
 		let res = txq.add(tx, TransactionOrigin::External, 0, None, &default_tx_provider());
 
 		// then
-		assert_eq!(res.unwrap(), TransactionImportResult::Current);
+		assert_eq!(res.unwrap(), transaction::ImportResult::Current);
 		let stats = txq.status();
 		assert_eq!(stats.pending, 1);
 	}
@@ -1859,13 +1851,13 @@ pub mod test {
 		let res4 = txq.add(tx4, TransactionOrigin::External, 0, None, &default_tx_provider());
 
 		// then
-		assert_eq!(res1.unwrap(), TransactionImportResult::Current);
-		assert_eq!(res2.unwrap(), TransactionImportResult::Current);
-		assert_eq!(unwrap_tx_err(res3), TransactionError::InsufficientGasPrice {
+		assert_eq!(res1.unwrap(), transaction::ImportResult::Current);
+		assert_eq!(res2.unwrap(), transaction::ImportResult::Current);
+		assert_eq!(unwrap_tx_err(res3), transaction::Error::InsufficientGasPrice {
 			minimal: U256::from(15),
 			got: U256::from(10),
 		});
-		assert_eq!(res4.unwrap(), TransactionImportResult::Current);
+		assert_eq!(res4.unwrap(), transaction::ImportResult::Current);
 		let stats = txq.status();
 		assert_eq!(stats.pending, 3);
 		assert_eq!(txq.top_transactions()[0].gas, 40000.into());
@@ -1893,10 +1885,10 @@ pub mod test {
 		let res4 = txq.add(tx4, TransactionOrigin::External, 0, None, &default_tx_provider());
 
 		// then
-		assert_eq!(res1.unwrap(), TransactionImportResult::Current);
-		assert_eq!(res2.unwrap(), TransactionImportResult::Current);
-		assert_eq!(res3.unwrap(), TransactionImportResult::Current);
-		assert_eq!(res4.unwrap(), TransactionImportResult::Current);
+		assert_eq!(res1.unwrap(), transaction::ImportResult::Current);
+		assert_eq!(res2.unwrap(), transaction::ImportResult::Current);
+		assert_eq!(res3.unwrap(), transaction::ImportResult::Current);
+		assert_eq!(res4.unwrap(), transaction::ImportResult::Current);
 		let stats = txq.status();
 		assert_eq!(stats.pending, 4);
 		assert_eq!(txq.top_transactions()[0].gas, 30_000.into());
@@ -1936,7 +1928,7 @@ pub mod test {
 		let res = txq.add(tx, TransactionOrigin::External, 0, None, &default_tx_provider());
 
 		// then
-		assert_eq!(unwrap_tx_err(res), TransactionError::GasLimitExceeded {
+		assert_eq!(unwrap_tx_err(res), transaction::Error::GasLimitExceeded {
 			limit: U256::from(50_000),
 			got: gas,
 		});
@@ -1960,7 +1952,7 @@ pub mod test {
 		let res = txq.add(tx, TransactionOrigin::External, 0, None, &default_tx_provider().with_account(account));
 
 		// then
-		assert_eq!(unwrap_tx_err(res), TransactionError::InsufficientBalance {
+		assert_eq!(unwrap_tx_err(res), transaction::Error::InsufficientBalance {
 			balance: U256::from(1),
 			cost: U256::from(100_100),
 		});
@@ -1980,7 +1972,7 @@ pub mod test {
 		let res = txq.add(tx, TransactionOrigin::External, 0, None, &default_tx_provider());
 
 		// then
-		assert_eq!(unwrap_tx_err(res), TransactionError::InsufficientGasPrice {
+		assert_eq!(unwrap_tx_err(res), transaction::Error::InsufficientGasPrice {
 			minimal: U256::from(2),
 			got: U256::from(1),
 		});
@@ -2000,7 +1992,7 @@ pub mod test {
 		let res = txq.add(tx, TransactionOrigin::Local, 0, None, &default_tx_provider());
 
 		// then
-		assert_eq!(res.unwrap(), TransactionImportResult::Current);
+		assert_eq!(res.unwrap(), transaction::ImportResult::Current);
 		let stats = txq.status();
 		assert_eq!(stats.pending, 1);
 		assert_eq!(stats.future, 0);
@@ -2235,8 +2227,8 @@ pub mod test {
 		let res2 = txq.add(tx2.clone(), TransactionOrigin::External, 0, None, &default_tx_provider()).unwrap();
 
 		// then
-		assert_eq!(res1, TransactionImportResult::Current);
-		assert_eq!(res2, TransactionImportResult::Future);
+		assert_eq!(res1, transaction::ImportResult::Current);
+		assert_eq!(res2, transaction::ImportResult::Future);
 		let stats = txq.status();
 		assert_eq!(stats.pending, 1);
 		assert_eq!(stats.future, 1);
@@ -2253,12 +2245,12 @@ pub mod test {
 		let (tx, tx2) = new_tx_pair_default(1.into(), 0.into());
 
 		// when
-		let res1 = txq.add(tx.clone(), TransactionOrigin::External, 0, Some(Condition::Number(1)), &default_tx_provider()).unwrap();
+		let res1 = txq.add(tx.clone(), TransactionOrigin::External, 0, Some(transaction::Condition::Number(1)), &default_tx_provider()).unwrap();
 		let res2 = txq.add(tx2.clone(), TransactionOrigin::External, 0, None, &default_tx_provider()).unwrap();
 
 		// then
-		assert_eq!(res1, TransactionImportResult::Current);
-		assert_eq!(res2, TransactionImportResult::Current);
+		assert_eq!(res1, transaction::ImportResult::Current);
+		assert_eq!(res2, transaction::ImportResult::Current);
 		let top = txq.top_transactions_at(0, 0, None);
 		assert_eq!(top.len(), 0);
 		let top = txq.top_transactions_at(1, 0, None);
@@ -2396,7 +2388,7 @@ pub mod test {
 
 		// then
 		let t = txq.top_transactions();
-		assert_eq!(unwrap_tx_err(res), TransactionError::InsufficientGasPrice { minimal: 2.into(), got: 1.into() });
+		assert_eq!(unwrap_tx_err(res), transaction::Error::InsufficientGasPrice { minimal: 2.into(), got: 1.into() });
 		assert_eq!(txq.status().pending, 1);
 		assert_eq!(t.len(), 1);
 		assert_eq!(t[0], tx);
@@ -2407,7 +2399,7 @@ pub mod test {
 	fn should_limit_future_transactions() {
 		let mut txq = TransactionQueue::with_limits(
 			PrioritizationStrategy::GasPriceOnly,
-			1 << FUTURE_QUEUE_LIMITS_SHIFT,
+			1,
 			usize::max_value(),
 			!U256::zero(),
 			!U256::zero(),
@@ -2478,7 +2470,7 @@ pub mod test {
 		let res = txq.add(tx, TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(last_nonce));
 
 		// then
-		assert_eq!(unwrap_tx_err(res), TransactionError::Old);
+		assert_eq!(unwrap_tx_err(res), transaction::Error::Old);
 		let stats = txq.status();
 		assert_eq!(stats.pending, 0);
 		assert_eq!(stats.future, 0);
@@ -2498,7 +2490,7 @@ pub mod test {
 		let res = txq.add(tx2.clone(), TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(nonce));
 
 		// then
-		assert_eq!(unwrap_tx_err(res), TransactionError::AlreadyImported);
+		assert_eq!(unwrap_tx_err(res), transaction::Error::AlreadyImported);
 		let stats = txq.status();
 		assert_eq!(stats.future, 1);
 		assert_eq!(stats.pending, 0);
@@ -2548,8 +2540,6 @@ pub mod test {
 
 	#[test]
 	fn should_not_replace_same_transaction_if_the_fee_is_less_than_minimal_bump() {
-		use ethcore_logger::init_log;
-		init_log();
 		// given
 		let mut txq = TransactionQueue::default();
 		let keypair = Random.generate().unwrap();
@@ -2565,7 +2555,7 @@ pub mod test {
 		let res = txq.add(tx2, TransactionOrigin::External, 0, None, &default_tx_provider());
 
 		// then
-		assert_eq!(unwrap_tx_err(res), TransactionError::TooCheapToReplace);
+		assert_eq!(unwrap_tx_err(res), transaction::Error::TooCheapToReplace);
 		let stats = txq.status();
 		assert_eq!(stats.pending, 1);
 		assert_eq!(stats.future, 0);
@@ -2574,8 +2564,6 @@ pub mod test {
 
 	#[test]
 	fn should_replace_same_transaction_when_has_higher_fee() {
-		use ethcore_logger::init_log;
-		init_log();
 		// given
 		let mut txq = TransactionQueue::default();
 		let keypair = Random.generate().unwrap();
@@ -2697,9 +2685,9 @@ pub mod test {
 
 		// when
 		// Insert first transaction
-		assert_eq!(txq.add(tx1, TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(nonce1)).unwrap(), TransactionImportResult::Current);
+		assert_eq!(txq.add(tx1, TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(nonce1)).unwrap(), transaction::ImportResult::Current);
 		// Second should go to future
-		assert_eq!(txq.add(tx2, TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(nonce1)).unwrap(), TransactionImportResult::Future);
+		assert_eq!(txq.add(tx2, TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(nonce1)).unwrap(), transaction::ImportResult::Future);
 		// Now block is imported
 		txq.cull(sender, nonce2 - U256::from(1));
 		// tx2 should be not be promoted to current
@@ -2718,9 +2706,10 @@ pub mod test {
 		assert_eq!(txq.has_local_pending_transactions(), false);
 
 		// when
-		assert_eq!(txq.add(tx1, TransactionOrigin::External, 0, None, &default_tx_provider()).unwrap(), TransactionImportResult::Current);
+		assert_eq!(txq.add(tx1, TransactionOrigin::External, 0, None, &default_tx_provider()).unwrap(), transaction::ImportResult::Current);
 		assert_eq!(txq.has_local_pending_transactions(), false);
-		assert_eq!(txq.add(tx2, TransactionOrigin::Local, 0, None, &default_tx_provider()).unwrap(), TransactionImportResult::Current);
+		assert_eq!(txq.add(tx2, TransactionOrigin::Local, 0, None, &default_tx_provider()).unwrap(),
+		transaction::ImportResult::Current);
 
 		// then
 		assert_eq!(txq.has_local_pending_transactions(), true);
@@ -2731,7 +2720,7 @@ pub mod test {
 		// given
 		let mut txq = TransactionQueue::with_limits(
 			PrioritizationStrategy::GasPriceOnly,
-			1 << FUTURE_QUEUE_LIMITS_SHIFT,
+			1,
 			usize::max_value(),
 			!U256::zero(),
 			!U256::zero()
@@ -2740,8 +2729,8 @@ pub mod test {
 		let prev_nonce = default_account_details().nonce - U256::one();
 
 		// when
-		assert_eq!(txq.add(tx2, TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(prev_nonce)).unwrap(), TransactionImportResult::Future);
-		assert_eq!(txq.add(tx1.clone(), TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(prev_nonce)).unwrap(), TransactionImportResult::Future);
+		assert_eq!(txq.add(tx2, TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(prev_nonce)).unwrap(), transaction::ImportResult::Future);
+		assert_eq!(txq.add(tx1.clone(), TransactionOrigin::External, 0, None, &default_tx_provider().with_account_nonce(prev_nonce)).unwrap(), transaction::ImportResult::Future);
 
 		// then
 		assert_eq!(txq.future.by_priority.len(), 1);
@@ -2777,7 +2766,7 @@ pub mod test {
 
 		// then
 		assert_eq!(txq.last_nonce(&sender).unwrap(), 125.into());
-		assert_eq!(res.unwrap(), TransactionImportResult::Current);
+		assert_eq!(res.unwrap(), transaction::ImportResult::Current);
 		assert_eq!(txq.current.by_priority.len(), 3);
 	}
 
@@ -2793,8 +2782,8 @@ pub mod test {
 		let res2 = txq.add(tx2, TransactionOrigin::Local, 0, None, &default_tx_provider().with_tx_gas_required(high_gas));
 
 		// then
-		assert_eq!(res1.unwrap(), TransactionImportResult::Current);
-		assert_eq!(unwrap_tx_err(res2), TransactionError::InsufficientGas {
+		assert_eq!(res1.unwrap(), transaction::ImportResult::Current);
+		assert_eq!(unwrap_tx_err(res2), transaction::Error::InsufficientGas {
 			minimal: 100_001.into(),
 			got: 100_000.into(),
 		});
@@ -2872,12 +2861,12 @@ pub mod test {
 
 		// when
 		assert_eq!(unwrap_tx_err(txq.add(tx1, TransactionOrigin::External, 0, None, &default_tx_provider())),
-			TransactionError::InsufficientGasPrice {
+			transaction::Error::InsufficientGasPrice {
 				minimal: 100.into(),
 				got: 0.into(),
 			});
 		assert_eq!(unwrap_tx_err(txq.add(tx2, TransactionOrigin::RetractedBlock, 0, None, &default_tx_provider())),
-			TransactionError::InsufficientGasPrice {
+			transaction::Error::InsufficientGasPrice {
 				minimal: 100.into(),
 				got: 0.into(),
 			});
@@ -2896,7 +2885,7 @@ pub mod test {
 		// when
 		let details_provider = default_tx_provider().service_transaction_checker_returns_error("Contract error");
 		assert_eq!(unwrap_tx_err(txq.add(tx, TransactionOrigin::External, 0, None, &details_provider)),
-			TransactionError::InsufficientGasPrice {
+			transaction::Error::InsufficientGasPrice {
 				minimal: 100.into(),
 				got: 0.into(),
 			});
diff --git a/ethcore/src/miner/work_notify.rs b/miner/src/work_notify.rs
similarity index 76%
rename from ethcore/src/miner/work_notify.rs
rename to miner/src/work_notify.rs
index ff330d30ca3e055e0291a3eaf8d59a502b9f3bb1..8ab65ed83246cdb881911a7ee5fde23fa1e33137 100644
--- a/ethcore/src/miner/work_notify.rs
+++ b/miner/src/work_notify.rs
@@ -14,18 +14,22 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+//! Sends HTTP notifications to a list of URLs every time new work is available.
+
+extern crate ethash;
 extern crate hyper;
 
+use self::hyper::header::ContentType;
+use self::hyper::method::Method;
+use self::hyper::client::{Request, Response, Client};
+use self::hyper::{Next, Url};
+use self::hyper::net::HttpStream;
+
+use self::ethash::SeedHashCompute;
+
 use std::io::Write;
-use hyper::header::ContentType;
-use hyper::method::Method;
-use hyper::client::{Request, Response, Client};
-use hyper::{Next};
-use hyper::net::HttpStream;
-use ethash::SeedHashCompute;
-use hyper::Url;
-use util::*;
-use ethereum::ethash::Ethash;
+use ethereum_types::{H256, U256};
+use parking_lot::Mutex;
 
 /// Trait for notifying about new mining work
 pub trait NotifyWork : Send + Sync {
@@ -33,6 +37,7 @@ pub trait NotifyWork : Send + Sync {
 	fn notify(&self, pow_hash: H256, difficulty: U256, number: u64);
 }
 
+/// POSTs info about new work to given urls.
 pub struct WorkPoster {
 	urls: Vec<Url>,
 	client: Mutex<Client<PostHandler>>,
@@ -40,6 +45,7 @@ pub struct WorkPoster {
 }
 
 impl WorkPoster {
+	/// Create new `WorkPoster`.
 	pub fn new(urls: &[String]) -> Self {
 		let urls = urls.into_iter().filter_map(|u| {
 			match Url::parse(u) {
@@ -66,15 +72,24 @@ impl WorkPoster {
 	}
 }
 
+/// Convert an Ethash difficulty to the target boundary. Basically just `f(x) = 2^256 / x`.
+fn difficulty_to_boundary(difficulty: &U256) -> H256 {
+	if *difficulty <= U256::one() {
+		U256::max_value().into()
+	} else {
+		(((U256::one() << 255) / *difficulty) << 1).into()
+	}
+}
+
 impl NotifyWork for WorkPoster {
 	fn notify(&self, pow_hash: H256, difficulty: U256, number: u64) {
 		// TODO: move this to engine
-		let target = Ethash::difficulty_to_boundary(&difficulty);
-		let seed_hash = &self.seed_compute.lock().get_seedhash(number);
+		let target = difficulty_to_boundary(&difficulty);
+		let seed_hash = &self.seed_compute.lock().hash_block_number(number);
 		let seed_hash = H256::from_slice(&seed_hash[..]);
 		let body = format!(
-			r#"{{ "result": ["0x{}","0x{}","0x{}","0x{:x}"] }}"#,
-			pow_hash.hex(), seed_hash.hex(), target.hex(), number
+			r#"{{ "result": ["0x{:x}","0x{:x}","0x{:x}","0x{:x}"] }}"#,
+			pow_hash, seed_hash, target, number
 		);
 		let mut client = self.client.lock();
 		for u in &self.urls {
diff --git a/nsis/installer.nsi b/nsis/installer.nsi
index 5b7940302f23caab207229d775acb25ffca8b119..011557234014307e8fe0dc15ccb3fc788adc3e03 100644
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@@ -6,17 +6,17 @@
 !define SYNC_TERM 0x00100001
 
 !define APPNAME "Parity"
-!define COMPANYNAME "Parity"
+!define COMPANYNAME "Parity Technologies"
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
-!define VERSIONMINOR 8
+!define VERSIONMINOR 11
 !define VERSIONBUILD 0
-!define ARGS "--warp"
-!define FIRST_START_ARGS "ui --warp --mode=passive"
+!define ARGS ""
+!define FIRST_START_ARGS "--mode=passive ui"
 
 !addplugindir .\
 
-!define HELPURL "https://github.com/paritytech/parity/wiki" # "Support Information" link
+!define HELPURL "https://paritytech.github.io/wiki/" # "Support Information" link
 !define UPDATEURL "https://github.com/paritytech/parity/releases" # "Product Updates" link
 !define ABOUTURL "https://github.com/paritytech/parity" # "Publisher" link
 !define INSTALLSIZE 26120
@@ -88,14 +88,13 @@ section "install"
 	!insertmacro TerminateApp
 
 	# Files added here should be removed by the uninstaller (see section "uninstall")
-	file /oname=parity.exe ..\target\release\parity.exe
+	file /oname=parity.exe ..\target\x86_64-pc-windows-msvc\release\parity.exe
+  file /oname=parity-evm.exe ..\target\x86_64-pc-windows-msvc\release\parity-evm.exe
+  file /oname=ethstore.exe ..\target\x86_64-pc-windows-msvc\release\ethstore.exe
+  file /oname=ethkey.exe ..\target\x86_64-pc-windows-msvc\release\ethkey.exe
 	file /oname=ptray.exe ..\windows\ptray\x64\Release\ptray.exe
 
 	file "logo.ico"
-	file vc_redist.x64.exe
-
-	ExecWait '"$INSTDIR\vc_redist.x64.exe"  /passive /norestart'
-	delete $INSTDIR\vc_redist.x64.exe
 	# Add any other files for the install directory (license files, app data, etc) here
 
 	# Uninstaller - See function un.onInit and section "uninstall" for configuration
@@ -116,7 +115,6 @@ section "install"
 	# Firewall exception rules
 	SimpleFC::AdvAddRule "Parity incoming peers (TCP:30303)" ""  6 1 1 2147483647 1 "$INSTDIR\parity.exe" "" "" "Parity" 30303    "" "" ""
 	SimpleFC::AdvAddRule "Parity outgoing peers (TCP:30303)" ""  6 2 1 2147483647 1 "$INSTDIR\parity.exe" "" "" "Parity"    "" 30303 "" ""
-	SimpleFC::AdvAddRule       "Parity web queries (TCP:80)" ""  6 2 1 2147483647 1 "$INSTDIR\parity.exe" "" "" "Parity"    ""    80 "" ""
 	SimpleFC::AdvAddRule  "Parity UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\parity.exe" "" "" "Parity"    "" 30303 "" ""
 
 	# Registry information for add/remove programs
@@ -168,6 +166,9 @@ section "uninstall"
 
 	# Remove files
 	delete $INSTDIR\parity.exe
+  delete $INSTDIR\parity-evm.exe
+  delete $INSTDIR\ethstore.exe
+  delete $INSTDIR\ethkey.exe
 	delete $INSTDIR\ptray.exe
 	delete $INSTDIR\logo.ico
 
@@ -188,4 +189,3 @@ section "uninstall"
 	DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}"
 	DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}"
 sectionEnd
-
diff --git a/nsis/logo.ico b/nsis/logo.ico
index 61e68b90b86ccb69f7c13a0595bba8ffd1943c4c..cda99eef8b3668827befd6a13ff8268c096ceae4 100644
Binary files a/nsis/logo.ico and b/nsis/logo.ico differ
diff --git a/parity/account.rs b/parity/account.rs
index ed4f9b40ad9d574caa3c3cfab17d4654ad2dd901..3db1844a1b4d55dbca48c9f4246a7820fe430137 100644
--- a/parity/account.rs
+++ b/parity/account.rs
@@ -16,7 +16,7 @@
 
 use std::path::PathBuf;
 use ethcore::ethstore::{EthStore, SecretStore, import_account, import_accounts, read_geth_accounts};
-use ethcore::ethstore::dir::RootDiskDirectory;
+use ethcore::ethstore::accounts_dir::RootDiskDirectory;
 use ethcore::ethstore::SecretVaultRef;
 use ethcore::account_provider::{AccountProvider, AccountProviderSettings};
 use helpers::{password_prompt, password_from_file};
diff --git a/parity/blockchain.rs b/parity/blockchain.rs
index 426c8d447f7e9d34fce348ab8f4bcce1b8c2a9ef..9dab9069d78d89984a848ea8e8f74b1449e39fa0 100644
--- a/parity/blockchain.rs
+++ b/parity/blockchain.rs
@@ -21,15 +21,19 @@ use std::time::{Instant, Duration};
 use std::thread::sleep;
 use std::sync::Arc;
 use rustc_hex::FromHex;
-use util::{ToPretty, U256, H256, Address, Hashable};
+use hash::{keccak, KECCAK_NULL_RLP};
+use ethereum_types::{U256, H256, Address};
+use bytes::ToPretty;
 use rlp::PayloadInfo;
-use ethcore::service::ClientService;
-use ethcore::client::{Mode, DatabaseCompactionProfile, VMType, BlockImportError, BlockChainClient, BlockId};
+use ethcore::client::{Mode, DatabaseCompactionProfile, VMType, BlockImportError, Nonce, Balance, BlockChainClient, BlockId, BlockInfo, ImportBlock};
+use ethcore::db::NUM_COLUMNS;
 use ethcore::error::ImportError;
 use ethcore::miner::Miner;
 use ethcore::verification::queue::VerifierSettings;
+use ethcore_service::ClientService;
 use cache::CacheConfig;
 use informant::{Informant, FullNodeInformantData, MillisecondDuration};
+use kvdb_rocksdb::{Database, DatabaseConfig};
 use params::{SpecType, Pruning, Switch, tracing_switch_to_bool, fatdb_switch_to_bool};
 use helpers::{to_client_config, execute_upgrades};
 use dir::Directories;
@@ -154,6 +158,7 @@ pub fn execute(cmd: BlockchainCmd) -> Result<(), String> {
 fn execute_import_light(cmd: ImportBlockchain) -> Result<(), String> {
 	use light::client::{Service as LightClientService, Config as LightClientConfig};
 	use light::cache::Cache as LightDataCache;
+	use parking_lot::Mutex;
 
 	let timer = Instant::now();
 
@@ -187,24 +192,39 @@ fn execute_import_light(cmd: ImportBlockchain) -> Result<(), String> {
 	// create dirs used by parity
 	cmd.dirs.create_dirs(false, false, false)?;
 
-	let cache = Arc::new(::util::Mutex::new(
-		LightDataCache::new(Default::default(), ::time::Duration::seconds(0))
+	let cache = Arc::new(Mutex::new(
+		LightDataCache::new(Default::default(), Duration::new(0, 0))
 	));
 
 	let mut config = LightClientConfig {
 		queue: Default::default(),
 		chain_column: ::ethcore::db::COL_LIGHT_CHAIN,
-		db_cache_size: Some(cmd.cache_config.blockchain() as usize * 1024 * 1024),
-		db_compaction: compaction,
-		db_wal: cmd.wal,
 		verify_full: true,
 		check_seal: cmd.check_seal,
+		no_hardcoded_sync: true,
 	};
 
 	config.queue.max_mem_use = cmd.cache_config.queue() as usize * 1024 * 1024;
 	config.queue.verifier_settings = cmd.verifier_settings;
 
-	let service = LightClientService::start(config, &spec, &client_path, cache)
+	// initialize database.
+	let db = {
+		let db_config = DatabaseConfig {
+			memory_budget: Some(cmd.cache_config.blockchain() as usize * 1024 * 1024),
+			compaction: compaction,
+			wal: cmd.wal,
+			.. DatabaseConfig::with_columns(NUM_COLUMNS)
+		};
+
+		Arc::new(Database::open(
+			&db_config,
+			&client_path.to_str().expect("DB path could not be converted to string.")
+		).map_err(|e| format!("Failed to open database: {}", e))?)
+	};
+
+	// TODO: could epoch signals be avilable at the end of the file?
+	let fetch = ::light::client::fetch::unavailable();
+	let service = LightClientService::start(config, &spec, fetch, db, cache)
 		.map_err(|e| format!("Failed to start client: {}", e))?;
 
 	// free up the spec in memory.
@@ -584,8 +604,12 @@ fn execute_export(cmd: ExportBlockchain) -> Result<(), String> {
 		}
 		let b = client.block(BlockId::Number(i)).ok_or("Error exporting incomplete chain")?.into_inner();
 		match format {
-			DataFormat::Binary => { out.write(&b).expect("Couldn't write to stream."); }
-			DataFormat::Hex => { out.write_fmt(format_args!("{}", b.pretty())).expect("Couldn't write to stream."); }
+			DataFormat::Binary => {
+				out.write(&b).map_err(|e| format!("Couldn't write to stream. Cause: {}", e))?;
+			}
+			DataFormat::Hex => {
+				out.write_fmt(format_args!("{}", b.pretty())).map_err(|e| format!("Couldn't write to stream. Cause: {}", e))?;
+			}
 		}
 	}
 
@@ -627,7 +651,7 @@ fn execute_export_state(cmd: ExportState) -> Result<(), String> {
 		}
 
 		for account in accounts.into_iter() {
-			let balance = client.balance(&account, at).unwrap_or_else(U256::zero);
+			let balance = client.balance(&account, at.into()).unwrap_or_else(U256::zero);
 			if cmd.min_balance.map_or(false, |m| balance < m) || cmd.max_balance.map_or(false, |m| balance > m) {
 				last = Some(account);
 				continue; //filtered out
@@ -636,17 +660,17 @@ fn execute_export_state(cmd: ExportState) -> Result<(), String> {
 			if i != 0 {
 				out.write(b",").expect("Write error");
 			}
-			out.write_fmt(format_args!("\n\"0x{}\": {{\"balance\": \"{:x}\", \"nonce\": \"{:x}\"", account.hex(), balance, client.nonce(&account, at).unwrap_or_else(U256::zero))).expect("Write error");
-			let code = client.code(&account, at).unwrap_or(None).unwrap_or_else(Vec::new);
+			out.write_fmt(format_args!("\n\"0x{:x}\": {{\"balance\": \"{:x}\", \"nonce\": \"{:x}\"", account, balance, client.nonce(&account, at).unwrap_or_else(U256::zero))).expect("Write error");
+			let code = client.code(&account, at.into()).unwrap_or(None).unwrap_or_else(Vec::new);
 			if !code.is_empty() {
-				out.write_fmt(format_args!(", \"code_hash\": \"0x{}\"", code.sha3().hex())).expect("Write error");
+				out.write_fmt(format_args!(", \"code_hash\": \"0x{:x}\"", keccak(&code))).expect("Write error");
 				if cmd.code {
 					out.write_fmt(format_args!(", \"code\": \"{}\"", code.to_hex())).expect("Write error");
 				}
 			}
-			let storage_root = client.storage_root(&account, at).unwrap_or(::util::SHA3_NULL_RLP);
-			if storage_root != ::util::SHA3_NULL_RLP {
-				out.write_fmt(format_args!(", \"storage_root\": \"0x{}\"", storage_root.hex())).expect("Write error");
+			let storage_root = client.storage_root(&account, at).unwrap_or(KECCAK_NULL_RLP);
+			if storage_root != KECCAK_NULL_RLP {
+				out.write_fmt(format_args!(", \"storage_root\": \"0x{:x}\"", storage_root)).expect("Write error");
 				if cmd.storage {
 					out.write_fmt(format_args!(", \"storage\": {{")).expect("Write error");
 					let mut last_storage: Option<H256> = None;
@@ -660,7 +684,7 @@ fn execute_export_state(cmd: ExportState) -> Result<(), String> {
 							if last_storage.is_some() {
 								out.write(b",").expect("Write error");
 							}
-							out.write_fmt(format_args!("\n\t\"0x{}\": \"0x{}\"", key.hex(), client.storage_at(&account, &key, at).unwrap_or_else(Default::default).hex())).expect("Write error");
+							out.write_fmt(format_args!("\n\t\"0x{:x}\": \"0x{:x}\"", key, client.storage_at(&account, &key, at.into()).unwrap_or_else(Default::default))).expect("Write error");
 							last_storage = Some(key);
 						}
 					}
diff --git a/parity/boot.rs b/parity/boot.rs
deleted file mode 100644
index e2f5587c2e670d55b9bf18bcc35cd4d1cc9ff915..0000000000000000000000000000000000000000
--- a/parity/boot.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Parity micro-service helpers
-
-use nanoipc;
-use ipc;
-use std;
-use std::sync::Arc;
-use hypervisor::HypervisorServiceClient;
-use hypervisor::service::IpcModuleId;
-use ctrlc::CtrlC;
-use std::sync::atomic::{AtomicBool, Ordering};
-use nanoipc::{IpcInterface, GuardedSocket, NanoSocket};
-use ipc::WithSocket;
-use ethcore_logger::{Config as LogConfig, setup_log};
-use docopt::Docopt;
-
-#[derive(Debug)]
-pub enum BootError {
-	ReadArgs(std::io::Error),
-	DecodeArgs(ipc::binary::BinaryError),
-	DependencyConnect(nanoipc::SocketError),
-}
-
-pub fn host_service<T: ?Sized + Send + Sync + 'static>(addr: &str, stop_guard: Arc<AtomicBool>, service: Arc<T>) where T: IpcInterface {
-	let socket_url = addr.to_owned();
-	std::thread::spawn(move || {
-		let mut worker = nanoipc::Worker::<T>::new(&service);
-		worker.add_reqrep(&socket_url).unwrap();
-
-		while !stop_guard.load(Ordering::SeqCst) {
-			worker.poll();
-		}
-	});
-}
-
-pub fn payload<B: ipc::BinaryConvertable>() -> Result<B, BootError> {
-	use std::io;
-	use std::io::Read;
-
-	let mut buffer = Vec::new();
-	io::stdin().read_to_end(&mut buffer).map_err(BootError::ReadArgs)?;
-
-	ipc::binary::deserialize::<B>(&buffer).map_err(BootError::DecodeArgs)
-}
-
-pub fn register(hv_url: &str, control_url: &str, module_id: IpcModuleId) -> GuardedSocket<HypervisorServiceClient<NanoSocket>>{
-	let hypervisor_client = nanoipc::fast_client::<HypervisorServiceClient<_>>(hv_url).unwrap();
-	hypervisor_client.handshake().unwrap();
-	hypervisor_client.module_ready(module_id, control_url.to_owned());
-
-	hypervisor_client
-}
-
-pub fn dependency<C: WithSocket<NanoSocket>>(url: &str)
-	-> Result<GuardedSocket<C>, BootError>
-{
-	nanoipc::generic_client::<C>(url).map_err(BootError::DependencyConnect)
-}
-
-pub fn main_thread() -> Arc<AtomicBool> {
-	let stop = Arc::new(AtomicBool::new(false));
-	let ctrc_stop = stop.clone();
-	CtrlC::set_handler(move || {
-		ctrc_stop.store(true, Ordering::Relaxed);
-	});
-	stop
-}
-
-pub fn setup_cli_logger(svc_name: &str) {
-	let usage = format!("
-Ethcore {} service
-Usage:
-  parity {} [options]
-
- Options:
-  -l --logging LOGGING     Specify the logging level. Must conform to the same
-                           format as RUST_LOG.
-  --log-file FILENAME      Specify a filename into which logging should be
-                           directed.
-  --no-color               Don't use terminal color codes in output.
-", svc_name, svc_name);
-
-	#[derive(Debug, RustcDecodable)]
-	struct Args {
-		flag_logging: Option<String>,
-		flag_log_file: Option<String>,
-		flag_no_color: bool,
-	}
-
-	impl Args {
-		pub fn log_settings(&self) -> LogConfig {
-			LogConfig {
-				color: self.flag_no_color || cfg!(windows),
-				mode: self.flag_logging.clone(),
-				file: self.flag_log_file.clone(),
-			}
-		}
-	}
-
-	let args: Args = Docopt::new(usage)
-		.and_then(|d| d.decode())
-		.unwrap_or_else(|e| e.exit());
-	setup_log(&args.log_settings()).expect("Log initialization failure");
-}
diff --git a/parity/cache.rs b/parity/cache.rs
index 8784ffa3d370d7564f82ab46be3affc870bcbf3b..0bf0717a30c61dd3874a7e7f2147c56b5012ccde 100644
--- a/parity/cache.rs
+++ b/parity/cache.rs
@@ -17,8 +17,10 @@
 use std::cmp::max;
 
 const MIN_BC_CACHE_MB: u32 = 4;
-const MIN_DB_CACHE_MB: u32 = 2;
+const MIN_DB_CACHE_MB: u32 = 8;
 const MIN_BLOCK_QUEUE_SIZE_LIMIT_MB: u32 = 16;
+const DEFAULT_DB_CACHE_SIZE: u32 = 128;
+const DEFAULT_BC_CACHE_SIZE: u32 = 8;
 const DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB: u32 = 40;
 const DEFAULT_TRACE_CACHE_SIZE: u32 = 20;
 const DEFAULT_STATE_CACHE_SIZE: u32 = 25;
@@ -41,7 +43,11 @@ pub struct CacheConfig {
 
 impl Default for CacheConfig {
 	fn default() -> Self {
-		CacheConfig::new(32, 8, DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB, DEFAULT_STATE_CACHE_SIZE)
+		CacheConfig::new(
+			DEFAULT_DB_CACHE_SIZE,
+			DEFAULT_BC_CACHE_SIZE,
+			DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB,
+			DEFAULT_STATE_CACHE_SIZE)
 	}
 }
 
@@ -68,14 +74,9 @@ impl CacheConfig {
 		}
 	}
 
-	/// Size of db cache for blockchain.
-	pub fn db_blockchain_cache_size(&self) -> u32 {
-		max(MIN_DB_CACHE_MB, self.db / 4)
-	}
-
-	/// Size of db cache for state.
-	pub fn db_state_cache_size(&self) -> u32 {
-		max(MIN_DB_CACHE_MB, self.db * 3 / 4)
+	/// Size of db cache.
+	pub fn db_cache_size(&self) -> u32 {
+		max(MIN_DB_CACHE_MB, self.db)
 	}
 
 	/// Size of block queue size limit
@@ -122,13 +123,16 @@ mod tests {
 	fn test_cache_config_db_cache_sizes() {
 		let config = CacheConfig::new_with_total_cache_size(400);
 		assert_eq!(config.db, 280);
-		assert_eq!(config.db_blockchain_cache_size(), 70);
-		assert_eq!(config.db_state_cache_size(), 210);
+		assert_eq!(config.db_cache_size(), 280);
 	}
 
 	#[test]
 	fn test_cache_config_default() {
 		assert_eq!(CacheConfig::default(),
-			CacheConfig::new(32, 8, super::DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB, super::DEFAULT_STATE_CACHE_SIZE));
+				   CacheConfig::new(
+					   super::DEFAULT_DB_CACHE_SIZE,
+					   super::DEFAULT_BC_CACHE_SIZE,
+					   super::DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB,
+					   super::DEFAULT_STATE_CACHE_SIZE));
 	}
 }
diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
index b5b949cc7ec01d47803b37d60abca98526bc9e68..5ae6c8d3daf6daf3d07da911ebf974bd3cc07f8b 100644
--- a/parity/cli/mod.rs
+++ b/parity/cli/mod.rs
@@ -17,387 +17,961 @@
 #[macro_use]
 mod usage;
 mod presets;
-use dir;
 
 usage! {
 	{
-		// Commands
-		cmd_daemon: bool,
-		cmd_wallet: bool,
-		cmd_account: bool,
-		cmd_new: bool,
-		cmd_list: bool,
-		cmd_export: bool,
-		cmd_blocks: bool,
-		cmd_state: bool,
-		cmd_import: bool,
-		cmd_signer: bool,
-		cmd_new_token: bool,
-		cmd_sign: bool,
-		cmd_reject: bool,
-		cmd_snapshot: bool,
-		cmd_restore: bool,
-		cmd_ui: bool,
-		cmd_dapp: bool,
-		cmd_tools: bool,
-		cmd_hash: bool,
-		cmd_kill: bool,
-		cmd_db: bool,
-
-		// Arguments
-		arg_pid_file: String,
-		arg_file: Option<String>,
-		arg_path: Vec<String>,
-		arg_id: Option<usize>,
-
-		// Flags
-		// -- Legacy Options
-		flag_geth: bool,
-		flag_testnet: bool,
-		flag_import_geth_keys: bool,
-		flag_datadir: Option<String>,
-		flag_networkid: Option<u64>,
-		flag_peers: Option<u16>,
-		flag_nodekey: Option<String>,
-		flag_nodiscover: bool,
-		flag_jsonrpc: bool,
-		flag_jsonrpc_off: bool,
-		flag_webapp: bool,
-		flag_dapps_off: bool,
-		flag_rpc: bool,
-		flag_rpcaddr: Option<String>,
-		flag_rpcport: Option<u16>,
-		flag_rpcapi: Option<String>,
-		flag_rpccorsdomain: Option<String>,
-		flag_ipcdisable: bool,
-		flag_ipc_off: bool,
-		flag_ipcapi: Option<String>,
-		flag_ipcpath: Option<String>,
-		flag_gasprice: Option<String>,
-		flag_etherbase: Option<String>,
-		flag_extradata: Option<String>,
-		flag_cache: Option<u32>,
-
-		// -- Miscellaneous Options
-		flag_version: bool,
-		flag_no_config: bool,
-	}
-	{
-		// -- Operating Options
-		flag_mode: String = "last", or |c: &Config| otry!(c.parity).mode.clone(),
-		flag_mode_timeout: u64 = 300u64, or |c: &Config| otry!(c.parity).mode_timeout.clone(),
-		flag_mode_alarm: u64 = 3600u64, or |c: &Config| otry!(c.parity).mode_alarm.clone(),
-		flag_auto_update: String = "critical", or |c: &Config| otry!(c.parity).auto_update.clone(),
-		flag_release_track: String = "current", or |c: &Config| otry!(c.parity).release_track.clone(),
-		flag_public_node: bool = false, or |c: &Config| otry!(c.parity).public_node.clone(),
-		flag_no_download: bool = false, or |c: &Config| otry!(c.parity).no_download.clone(),
-		flag_no_consensus: bool = false, or |c: &Config| otry!(c.parity).no_consensus.clone(),
-		flag_chain: String = "foundation", or |c: &Config| otry!(c.parity).chain.clone(),
-		flag_keys_path: String = "$BASE/keys", or |c: &Config| otry!(c.parity).keys_path.clone(),
-		flag_identity: String = "", or |c: &Config| otry!(c.parity).identity.clone(),
-		flag_light: bool = false, or |c: &Config| otry!(c.parity).light,
-		flag_no_persistent_txqueue: bool = false,
-			or |c: &Config| otry!(c.parity).no_persistent_txqueue,
-
-		// -- Convenience Options
-		flag_config: String = "$BASE/config.toml", or |_| None,
-		flag_ports_shift: u16 = 0u16,
-			or |c: &Config| otry!(c.misc).ports_shift,
-		flag_unsafe_expose: bool = false,
-			or |c: &Config| otry!(c.misc).unsafe_expose,
-
-		// -- Account Options
-		flag_unlock: Option<String> = None,
-			or |c: &Config| otry!(c.account).unlock.as_ref().map(|vec| Some(vec.join(","))),
-		flag_password: Vec<String> = Vec::new(),
-			or |c: &Config| otry!(c.account).password.clone(),
-		flag_keys_iterations: u32 = 10240u32,
-			or |c: &Config| otry!(c.account).keys_iterations.clone(),
-		flag_no_hardware_wallets: bool = false,
-			or |c: &Config| otry!(c.account).disable_hardware.clone(),
-		flag_fast_unlock: bool = false,
-			or |c: &Config| otry!(c.account).fast_unlock.clone(),
-
-
-		flag_force_ui: bool = false,
-			or |c: &Config| otry!(c.ui).force.clone(),
-		flag_no_ui: bool = false,
-			or |c: &Config| otry!(c.ui).disable.clone(),
-		flag_ui_port: u16 = 8180u16,
-			or |c: &Config| otry!(c.ui).port.clone(),
-		flag_ui_interface: String = "local",
-			or |c: &Config| otry!(c.ui).interface.clone(),
-		flag_ui_hosts: String = "none",
-			or |c: &Config| otry!(c.ui).hosts.as_ref().map(|vec| vec.join(",")),
-		flag_ui_path: String = "$BASE/signer",
-			or |c: &Config| otry!(c.ui).path.clone(),
-		// NOTE [todr] For security reasons don't put this to config files
-		flag_ui_no_validation: bool = false, or |_| None,
-
-		// -- Networking Options
-		flag_no_warp: bool = false,
-			or |c: &Config| otry!(c.network).warp.clone().map(|w| !w),
-		flag_port: u16 = 30303u16,
-			or |c: &Config| otry!(c.network).port.clone(),
-		flag_min_peers: u16 = 25u16,
-			or |c: &Config| otry!(c.network).min_peers.clone(),
-		flag_max_peers: u16 = 50u16,
-			or |c: &Config| otry!(c.network).max_peers.clone(),
-		flag_max_pending_peers: u16 = 64u16,
-			or |c: &Config| otry!(c.network).max_pending_peers.clone(),
-		flag_snapshot_peers: u16 = 0u16,
-			or |c: &Config| otry!(c.network).snapshot_peers.clone(),
-		flag_nat: String = "any",
-			or |c: &Config| otry!(c.network).nat.clone(),
-		flag_allow_ips: String = "all",
-			or |c: &Config| otry!(c.network).allow_ips.clone(),
-		flag_network_id: Option<u64> = None,
-			or |c: &Config| otry!(c.network).id.clone().map(Some),
-		flag_bootnodes: Option<String> = None,
-			or |c: &Config| otry!(c.network).bootnodes.as_ref().map(|vec| Some(vec.join(","))),
-		flag_no_discovery: bool = false,
-			or |c: &Config| otry!(c.network).discovery.map(|d| !d).clone(),
-		flag_node_key: Option<String> = None,
-			or |c: &Config| otry!(c.network).node_key.clone().map(Some),
-		flag_reserved_peers: Option<String> = None,
-			or |c: &Config| otry!(c.network).reserved_peers.clone().map(Some),
-		flag_reserved_only: bool = false,
-			or |c: &Config| otry!(c.network).reserved_only.clone(),
-		flag_no_ancient_blocks: bool = false, or |_| None,
-		flag_no_serve_light: bool = false,
-			or |c: &Config| otry!(c.network).no_serve_light.clone(),
-
-		// -- API and Console Options
-		// RPC
-		flag_no_jsonrpc: bool = false,
-			or |c: &Config| otry!(c.rpc).disable.clone(),
-		flag_jsonrpc_port: u16 = 8545u16,
-			or |c: &Config| otry!(c.rpc).port.clone(),
-		flag_jsonrpc_interface: String  = "local",
-			or |c: &Config| otry!(c.rpc).interface.clone(),
-		flag_jsonrpc_cors: Option<String> = None,
-			or |c: &Config| otry!(c.rpc).cors.clone().map(Some),
-		flag_jsonrpc_apis: String = "web3,eth,pubsub,net,parity,parity_pubsub,traces,rpc,secretstore,shh,shh_pubsub",
-			or |c: &Config| otry!(c.rpc).apis.as_ref().map(|vec| vec.join(",")),
-		flag_jsonrpc_hosts: String = "none",
-			or |c: &Config| otry!(c.rpc).hosts.as_ref().map(|vec| vec.join(",")),
-		flag_jsonrpc_server_threads: Option<usize> = None,
-			or |c: &Config| otry!(c.rpc).server_threads.map(Some),
-		flag_jsonrpc_threads: usize = 0usize,
-			or |c: &Config| otry!(c.rpc).processing_threads,
-
-		// WS
-		flag_no_ws: bool = false,
-			or |c: &Config| otry!(c.websockets).disable.clone(),
-		flag_ws_port: u16 = 8546u16,
-			or |c: &Config| otry!(c.websockets).port.clone(),
-		flag_ws_interface: String  = "local",
-			or |c: &Config| otry!(c.websockets).interface.clone(),
-		flag_ws_apis: String = "web3,eth,pubsub,net,parity,parity_pubsub,traces,rpc,secretstore,shh,shh_pubsub",
-			or |c: &Config| otry!(c.websockets).apis.as_ref().map(|vec| vec.join(",")),
-		flag_ws_origins: String = "chrome-extension://*,moz-extension://*",
-			or |c: &Config| otry!(c.websockets).origins.as_ref().map(|vec| vec.join(",")),
-		flag_ws_hosts: String = "none",
-			or |c: &Config| otry!(c.websockets).hosts.as_ref().map(|vec| vec.join(",")),
-
-		// IPC
-		flag_no_ipc: bool = false,
-			or |c: &Config| otry!(c.ipc).disable.clone(),
-		flag_ipc_path: String = if cfg!(windows) { r"\\.\pipe\jsonrpc.ipc" } else { "$BASE/jsonrpc.ipc" },
-			or |c: &Config| otry!(c.ipc).path.clone(),
-		flag_ipc_apis: String = "web3,eth,pubsub,net,parity,parity_pubsub,parity_accounts,traces,rpc,secretstore,shh,shh_pubsub",
-			or |c: &Config| otry!(c.ipc).apis.as_ref().map(|vec| vec.join(",")),
-
-		// DAPPS
-		flag_no_dapps: bool = false,
-			or |c: &Config| otry!(c.dapps).disable.clone(),
-		flag_dapps_path: String = "$BASE/dapps",
-			or |c: &Config| otry!(c.dapps).path.clone(),
-
-		// Secret Store
-		flag_no_secretstore: bool = false,
-			or |c: &Config| otry!(c.secretstore).disable.clone(),
-		flag_no_secretstore_http: bool = false,
-			or |c: &Config| otry!(c.secretstore).disable_http.clone(),
-		flag_no_secretstore_acl_check: bool = false,
-			or |c: &Config| otry!(c.secretstore).disable_acl_check.clone(),
-		flag_secretstore_secret: Option<String> = None,
-			or |c: &Config| otry!(c.secretstore).self_secret.clone().map(Some),
-		flag_secretstore_nodes: String = "",
-			or |c: &Config| otry!(c.secretstore).nodes.as_ref().map(|vec| vec.join(",")),
-		flag_secretstore_interface: String = "local",
-			or |c: &Config| otry!(c.secretstore).interface.clone(),
-		flag_secretstore_port: u16 = 8083u16,
-			or |c: &Config| otry!(c.secretstore).port.clone(),
-		flag_secretstore_http_interface: String = "local",
-			or |c: &Config| otry!(c.secretstore).http_interface.clone(),
-		flag_secretstore_http_port: u16 = 8082u16,
-			or |c: &Config| otry!(c.secretstore).http_port.clone(),
-		flag_secretstore_path: String = "$BASE/secretstore",
-			or |c: &Config| otry!(c.secretstore).path.clone(),
-
-		// IPFS
-		flag_ipfs_api: bool = false,
-			or |c: &Config| otry!(c.ipfs).enable.clone(),
-		flag_ipfs_api_port: u16 = 5001u16,
-			or |c: &Config| otry!(c.ipfs).port.clone(),
-		flag_ipfs_api_interface: String = "local",
-			or |c: &Config| otry!(c.ipfs).interface.clone(),
-		flag_ipfs_api_cors: Option<String> = None,
-			or |c: &Config| otry!(c.ipfs).cors.clone().map(Some),
-		flag_ipfs_api_hosts: String = "none",
-			or |c: &Config| otry!(c.ipfs).hosts.as_ref().map(|vec| vec.join(",")),
-
-		// -- Sealing/Mining Options
-		flag_author: Option<String> = None,
-			or |c: &Config| otry!(c.mining).author.clone().map(Some),
-		flag_engine_signer: Option<String> = None,
-			or |c: &Config| otry!(c.mining).engine_signer.clone().map(Some),
-		flag_force_sealing: bool = false,
-			or |c: &Config| otry!(c.mining).force_sealing.clone(),
-		flag_reseal_on_txs: String = "own",
-			or |c: &Config| otry!(c.mining).reseal_on_txs.clone(),
-		flag_reseal_on_uncle: bool = false,
-			or |c: &Config| otry!(c.mining).reseal_on_uncle.clone(),
-		flag_reseal_min_period: u64 = 2000u64,
-			or |c: &Config| otry!(c.mining).reseal_min_period.clone(),
-		flag_reseal_max_period: u64 = 120000u64,
-			or |c: &Config| otry!(c.mining).reseal_max_period.clone(),
-		flag_work_queue_size: usize = 20usize,
-			or |c: &Config| otry!(c.mining).work_queue_size.clone(),
-		flag_tx_gas_limit: Option<String> = None,
-			or |c: &Config| otry!(c.mining).tx_gas_limit.clone().map(Some),
-		flag_tx_time_limit: Option<u64> = None,
-			or |c: &Config| otry!(c.mining).tx_time_limit.clone().map(Some),
-		flag_relay_set: String = "cheap",
-			or |c: &Config| otry!(c.mining).relay_set.clone(),
-		flag_min_gas_price: Option<u64> = None,
-			or |c: &Config| otry!(c.mining).min_gas_price.clone().map(Some),
-		flag_usd_per_tx: String = "0.0025",
-			or |c: &Config| otry!(c.mining).usd_per_tx.clone(),
-		flag_usd_per_eth: String = "auto",
-			or |c: &Config| otry!(c.mining).usd_per_eth.clone(),
-		flag_price_update_period: String = "hourly",
-			or |c: &Config| otry!(c.mining).price_update_period.clone(),
-		flag_gas_floor_target: String = "4700000",
-			or |c: &Config| otry!(c.mining).gas_floor_target.clone(),
-		flag_gas_cap: String = "6283184",
-			or |c: &Config| otry!(c.mining).gas_cap.clone(),
-		flag_extra_data: Option<String> = None,
-			or |c: &Config| otry!(c.mining).extra_data.clone().map(Some),
-		flag_tx_queue_size: usize = 8192usize,
-			or |c: &Config| otry!(c.mining).tx_queue_size.clone(),
-		flag_tx_queue_mem_limit: u32 = 2u32,
-			or |c: &Config| otry!(c.mining).tx_queue_mem_limit.clone(),
-		flag_tx_queue_gas: String = "off",
-			or |c: &Config| otry!(c.mining).tx_queue_gas.clone(),
-		flag_tx_queue_strategy: String = "gas_price",
-			or |c: &Config| otry!(c.mining).tx_queue_strategy.clone(),
-		flag_tx_queue_ban_count: u16 = 1u16,
-			or |c: &Config| otry!(c.mining).tx_queue_ban_count.clone(),
-		flag_tx_queue_ban_time: u16 = 180u16,
-			or |c: &Config| otry!(c.mining).tx_queue_ban_time.clone(),
-		flag_remove_solved: bool = false,
-			or |c: &Config| otry!(c.mining).remove_solved.clone(),
-		flag_notify_work: Option<String> = None,
-			or |c: &Config| otry!(c.mining).notify_work.as_ref().map(|vec| Some(vec.join(","))),
-		flag_refuse_service_transactions: bool = false,
-			or |c: &Config| otry!(c.mining).refuse_service_transactions.clone(),
-
-		flag_stratum: bool = false,
-			or |c: &Config| Some(c.stratum.is_some()),
-		flag_stratum_interface: String = "local",
-			or |c: &Config| otry!(c.stratum).interface.clone(),
-		flag_stratum_port: u16 = 8008u16,
-			or |c: &Config| otry!(c.stratum).port.clone(),
-		flag_stratum_secret: Option<String> = None,
-			or |c: &Config| otry!(c.stratum).secret.clone().map(Some),
-
-		// -- Footprint Options
-		flag_tracing: String = "auto",
-			or |c: &Config| otry!(c.footprint).tracing.clone(),
-		flag_pruning: String = "auto",
-			or |c: &Config| otry!(c.footprint).pruning.clone(),
-		flag_pruning_history: u64 = 64u64,
-			or |c: &Config| otry!(c.footprint).pruning_history.clone(),
-		flag_pruning_memory: usize = 32usize,
-			or |c: &Config| otry!(c.footprint).pruning_memory.clone(),
-		flag_cache_size_db: u32 = 32u32,
-			or |c: &Config| otry!(c.footprint).cache_size_db.clone(),
-		flag_cache_size_blocks: u32 = 8u32,
-			or |c: &Config| otry!(c.footprint).cache_size_blocks.clone(),
-		flag_cache_size_queue: u32 = 40u32,
-			or |c: &Config| otry!(c.footprint).cache_size_queue.clone(),
-		flag_cache_size_state: u32 = 25u32,
-			or |c: &Config| otry!(c.footprint).cache_size_state.clone(),
-		flag_cache_size: Option<u32> = None,
-			or |c: &Config| otry!(c.footprint).cache_size.clone().map(Some),
-		flag_fast_and_loose: bool = false,
-			or |c: &Config| otry!(c.footprint).fast_and_loose.clone(),
-		flag_db_compaction: String = "auto",
-			or |c: &Config| otry!(c.footprint).db_compaction.clone(),
-		flag_fat_db: String = "auto",
-			or |c: &Config| otry!(c.footprint).fat_db.clone(),
-		flag_scale_verifiers: bool = false,
-			or |c: &Config| otry!(c.footprint).scale_verifiers.clone(),
-		flag_num_verifiers: Option<usize> = None,
-			or |c: &Config| otry!(c.footprint).num_verifiers.clone().map(Some),
-
-		// -- Import/Export Options
-		flag_from: String = "1", or |_| None,
-		flag_to: String = "latest", or |_| None,
-		flag_format: Option<String> = None, or |_| None,
-		flag_no_seal_check: bool = false, or |_| None,
-		flag_no_storage: bool = false, or |_| None,
-		flag_no_code: bool = false, or |_| None,
-		flag_min_balance: Option<String> = None, or |_| None,
-		flag_max_balance: Option<String> = None, or |_| None,
-
-		// -- Snapshot Optons
-		flag_at: String = "latest", or |_| None,
-		flag_no_periodic_snapshot: bool = false,
-			or |c: &Config| otry!(c.snapshots).disable_periodic.clone(),
-
-		// -- Virtual Machine Options
-		flag_jitvm: bool = false,
-			or |c: &Config| otry!(c.vm).jit.clone(),
-
-		// -- Miscellaneous Options
-		flag_ntp_servers: String = "0.parity.pool.ntp.org:123,1.parity.pool.ntp.org:123,2.parity.pool.ntp.org:123,3.parity.pool.ntp.org:123",
-			or |c: &Config| otry!(c.misc).ntp_servers.clone().map(|vec| vec.join(",")),
-		flag_logging: Option<String> = None,
-			or |c: &Config| otry!(c.misc).logging.clone().map(Some),
-		flag_log_file: Option<String> = None,
-			or |c: &Config| otry!(c.misc).log_file.clone().map(Some),
-		flag_no_color: bool = false,
-			or |c: &Config| otry!(c.misc).color.map(|c| !c).clone(),
-
-		// -- Whisper options
-		flag_whisper: bool = false,
-			or |c: &Config| otry!(c.whisper).enabled,
-		flag_whisper_pool_size: usize = 10usize,
-			or |c: &Config| otry!(c.whisper).pool_size.clone(),
-
-		// -- Legacy Options supported in configs
-		flag_dapps_port: Option<u16> = None,
-			or |c: &Config| otry!(c.dapps).port.clone().map(Some),
-		flag_dapps_interface: Option<String> = None,
-			or |c: &Config| otry!(c.dapps).interface.clone().map(Some),
-		flag_dapps_hosts: Option<String> = None,
-			or |c: &Config| otry!(c.dapps).hosts.as_ref().map(|vec| Some(vec.join(","))),
-		flag_dapps_cors: Option<String> = None,
-			or |c: &Config| otry!(c.dapps).cors.clone().map(Some),
-		flag_dapps_user: Option<String> = None,
-			or |c: &Config| otry!(c.dapps).user.clone().map(Some),
-		flag_dapps_pass: Option<String> = None,
-			or |c: &Config| otry!(c.dapps).pass.clone().map(Some),
-		flag_dapps_apis_all: Option<bool> = None, or |_| None,
+		// CLI subcommands
+		// Subcommands must start with cmd_ and have '_' in place of '-'
+		// Sub-subcommands must start with the name of the subcommand
+		// Arguments must start with arg_
+		// Flags must start with flag_
+
+		CMD cmd_ui {
+			"Manage ui",
+		}
+
+		CMD cmd_dapp
+		{
+			"Manage dapps",
+
+			ARG arg_dapp_path: (Option<String>) = None,
+			"<PATH>",
+			"Path to the dapps",
+		}
+
+		CMD cmd_daemon
+		{
+			"Use Parity as a daemon",
+
+			ARG arg_daemon_pid_file: (Option<String>) = None,
+			"<PID-FILE>",
+			"Path to the pid file",
+		}
+
+		CMD cmd_account
+		{
+			"Manage accounts",
+
+			CMD cmd_account_new {
+				"Create a new acount",
+			}
+
+			CMD cmd_account_list {
+				"List existing accounts",
+			}
+
+			CMD cmd_account_import
+			{
+				"Import account",
+
+				ARG arg_account_import_path : (Option<Vec<String>>) = None,
+				"<PATH>...",
+				"Path to the accounts",
+			}
+		}
+
+		CMD cmd_wallet
+		{
+			"Manage wallet",
+
+			CMD cmd_wallet_import
+			{
+				"Import wallet",
+
+				ARG arg_wallet_import_path: (Option<String>) = None,
+				"<PATH>",
+				"Path to the wallet",
+			}
+		}
+
+		CMD cmd_import
+		{
+			"Import blockchain",
+
+			ARG arg_import_format: (Option<String>) = None,
+			"--format=[FORMAT]",
+			"Import in a given format. FORMAT must be either 'hex' or 'binary'. (default: auto)",
+
+			ARG arg_import_file: (Option<String>) = None,
+			"[FILE]",
+			"Path to the file to import from",
+		}
+
+		CMD cmd_export
+		{
+			"Export blockchain",
+
+			CMD cmd_export_blocks
+			{
+				"Export blocks",
+
+				ARG arg_export_blocks_format: (Option<String>) = None,
+				"--format=[FORMAT]",
+				"Export in a given format. FORMAT must be either 'hex' or 'binary'. (default: binary)",
+
+				ARG arg_export_blocks_from: (String) = "1",
+				"--from=[BLOCK]",
+				"Export from block BLOCK, which may be an index or hash.",
+
+				ARG arg_export_blocks_to: (String) = "latest",
+				"--to=[BLOCK]",
+				"Export to (including) block BLOCK, which may be an index, hash or latest.",
+
+				ARG arg_export_blocks_file: (Option<String>) = None,
+				"[FILE]",
+				"Path to the exported file",
+			}
+
+			CMD cmd_export_state
+			{
+				"Export state",
+
+				FLAG flag_export_state_no_storage: (bool) = false,
+				"--no-storage",
+				"Don't export account storage.",
+
+				FLAG flag_export_state_no_code: (bool) = false,
+				"--no-code",
+				"Don't export account code.",
+
+				ARG arg_export_state_min_balance: (Option<String>) = None,
+				"--min-balance=[WEI]",
+				"Don't export accounts with balance less than specified.",
+
+				ARG arg_export_state_max_balance: (Option<String>) = None,
+				"--max-balance=[WEI]",
+				"Don't export accounts with balance greater than specified.",
+
+				ARG arg_export_state_at: (String) = "latest",
+				"--at=[BLOCK]",
+				"Take a snapshot at the given block, which may be an index, hash, or latest. Note that taking snapshots at non-recent blocks will only work with --pruning archive",
+
+				ARG arg_export_state_format: (Option<String>) = None,
+				"--format=[FORMAT]",
+				"Export in a given format. FORMAT must be either 'hex' or 'binary'. (default: binary)",
+
+				ARG arg_export_state_file: (Option<String>) = None,
+				"[FILE]",
+				"Path to the exported file",
+			}
+		}
+
+		CMD cmd_signer
+		{
+			"Manage signer",
+
+			CMD cmd_signer_new_token {
+				"Generate new token",
+			}
+
+			CMD cmd_signer_list {
+				"List",
+			}
+
+			CMD cmd_signer_sign
+			{
+				"Sign",
+
+				ARG arg_signer_sign_id: (Option<usize>) = None,
+				"[ID]",
+				"ID",
+			}
+
+			CMD cmd_signer_reject
+			{
+				"Reject",
+
+				ARG arg_signer_reject_id: (Option<usize>) = None,
+				"<ID>",
+				"ID",
+			}
+		}
+
+		CMD cmd_snapshot
+		{
+			"Make a snapshot of the database",
+
+			ARG arg_snapshot_at: (String) = "latest",
+			"--at=[BLOCK]",
+			"Take a snapshot at the given block, which may be an index, hash, or latest. Note that taking snapshots at non-recent blocks will only work with --pruning archive",
+
+			ARG arg_snapshot_file: (Option<String>) = None,
+			"<FILE>",
+			"Path to the file to export to",
+		}
+
+		CMD cmd_restore
+		{
+			"Restore database from snapshot",
+
+			ARG arg_restore_file: (Option<String>) = None,
+			"[FILE]",
+			"Path to the file to restore from",
+		}
+
+		CMD cmd_tools
+		{
+			"Tools",
+
+			CMD cmd_tools_hash
+			{
+				"Hash a file",
+
+				ARG arg_tools_hash_file: (Option<String>) = None,
+				"<FILE>",
+				"File",
+			}
+		}
+
+		CMD cmd_db
+		{
+			"Manage the database representing the state of the blockchain on this system",
+
+			CMD cmd_db_kill {
+				"Clean the database",
+			}
+		}
+
+		CMD cmd_export_hardcoded_sync
+		{
+			"Export the hardcoded sync JSON file from the existing light client database",
+		}
 	}
 	{
-		// Values with optional default value.
-		flag_base_path: Option<String>, display dir::default_data_path(), or |c: &Config| otry!(c.parity).base_path.clone().map(Some),
-		flag_db_path: Option<String>, display dir::CHAINS_PATH, or |c: &Config| otry!(c.parity).db_path.clone().map(Some),
-		flag_warp: Option<bool>, display true, or |c: &Config| Some(otry!(c.network).warp.clone()),
+		// Global flags and arguments
+		["Operating Options"]
+			FLAG flag_public_node: (bool) = false, or |c: &Config| c.parity.as_ref()?.public_node.clone(),
+			"--public-node",
+			"Start Parity as a public web server. Account storage and transaction signing will be delegated to the UI.",
+
+			FLAG flag_no_download: (bool) = false, or |c: &Config| c.parity.as_ref()?.no_download.clone(),
+			"--no-download",
+			"Normally new releases will be downloaded ready for updating. This disables it. Not recommended.",
+
+			FLAG flag_no_consensus: (bool) = false, or |c: &Config| c.parity.as_ref()?.no_consensus.clone(),
+			"--no-consensus",
+			"Force the binary to run even if there are known issues regarding consensus. Not recommended.",
+
+			FLAG flag_light: (bool) = false, or |c: &Config| c.parity.as_ref()?.light,
+			"--light",
+			"Experimental: run in light client mode. Light clients synchronize a bare minimum of data and fetch necessary data on-demand from the network. Much lower in storage, potentially higher in bandwidth. Has no effect with subcommands.",
+
+			FLAG flag_no_hardcoded_sync: (bool) = false, or |c: &Config| c.parity.as_ref()?.no_hardcoded_sync,
+			"--no-hardcoded-sync",
+			"By default, if there is no existing database the light client will automatically jump to a block hardcoded in the chain's specifications. This disables this feature.",
+
+			FLAG flag_force_direct: (bool) = false, or |_| None,
+			"--force-direct",
+			"Run the originally installed version of Parity, ignoring any updates that have since been installed.",
+
+			ARG arg_mode: (String) = "last", or |c: &Config| c.parity.as_ref()?.mode.clone(),
+			"--mode=[MODE]",
+			"Set the operating mode. MODE can be one of: last - Uses the last-used mode, active if none; active - Parity continuously syncs the chain; passive - Parity syncs initially, then sleeps and wakes regularly to resync; dark - Parity syncs only when the RPC is active; offline - Parity doesn't sync.",
+
+			ARG arg_mode_timeout: (u64) = 300u64, or |c: &Config| c.parity.as_ref()?.mode_timeout.clone(),
+			"--mode-timeout=[SECS]",
+			"Specify the number of seconds before inactivity timeout occurs when mode is dark or passive",
+
+			ARG arg_mode_alarm: (u64) = 3600u64, or |c: &Config| c.parity.as_ref()?.mode_alarm.clone(),
+			"--mode-alarm=[SECS]",
+			"Specify the number of seconds before auto sleep reawake timeout occurs when mode is passive",
+
+			ARG arg_auto_update: (String) = "critical", or |c: &Config| c.parity.as_ref()?.auto_update.clone(),
+			"--auto-update=[SET]",
+			"Set a releases set to automatically update and install. SET can be one of: all - All updates in the our release track; critical - Only consensus/security updates; none - No updates will be auto-installed.",
+
+			ARG arg_release_track: (String) = "current", or |c: &Config| c.parity.as_ref()?.release_track.clone(),
+			"--release-track=[TRACK]",
+			"Set which release track we should use for updates. TRACK can be one of: stable - Stable releases; beta - Beta releases; nightly - Nightly releases (unstable); testing - Testing releases (do not use); current - Whatever track this executable was released on.",
+
+			ARG arg_chain: (String) = "foundation", or |c: &Config| c.parity.as_ref()?.chain.clone(),
+			"--chain=[CHAIN]",
+			"Specify the blockchain type. CHAIN may be either a JSON chain specification file or olympic, frontier, homestead, mainnet, morden, ropsten, classic, expanse, musicoin, ellaism, testnet, kovan or dev.",
+
+			ARG arg_keys_path: (String) = "$BASE/keys", or |c: &Config| c.parity.as_ref()?.keys_path.clone(),
+			"--keys-path=[PATH]",
+			"Specify the path for JSON key files to be found",
+
+			ARG arg_identity: (String) = "", or |c: &Config| c.parity.as_ref()?.identity.clone(),
+			"--identity=[NAME]",
+			"Specify your node's name.",
+
+			ARG arg_base_path: (Option<String>) = None, or |c: &Config| c.parity.as_ref()?.base_path.clone(),
+			"-d, --base-path=[PATH]",
+			"Specify the base data storage path.",
+
+			ARG arg_db_path: (Option<String>) = None, or |c: &Config| c.parity.as_ref()?.db_path.clone(),
+			"--db-path=[PATH]",
+			"Specify the database directory path",
+
+		["Convenience options"]
+			FLAG flag_unsafe_expose: (bool) = false, or |c: &Config| c.misc.as_ref()?.unsafe_expose,
+			"--unsafe-expose",
+			"All servers will listen on external interfaces and will be remotely accessible. It's equivalent with setting the following: --{{ws,jsonrpc,ui,ipfs,secret_store,stratum}}-interface=all --*-hosts=all    This option is UNSAFE and should be used with great care!",
+
+			ARG arg_config: (String) = "$BASE/config.toml", or |_| None,
+			"-c, --config=[CONFIG]",
+			"Specify a configuration. CONFIG may be either a configuration file or a preset: dev, insecure, dev-insecure, mining, or non-standard-ports.",
+
+			ARG arg_ports_shift: (u16) = 0u16, or |c: &Config| c.misc.as_ref()?.ports_shift,
+			"--ports-shift=[SHIFT]",
+			"Add SHIFT to all port numbers Parity is listening on. Includes network port and all servers (RPC, WebSockets, UI, IPFS, SecretStore).",
+
+		["Account options"]
+			FLAG flag_no_hardware_wallets: (bool) = false, or |c: &Config| c.account.as_ref()?.disable_hardware.clone(),
+			"--no-hardware-wallets",
+			"Disables hardware wallet support.",
+
+			FLAG flag_fast_unlock: (bool) = false, or |c: &Config| c.account.as_ref()?.fast_unlock.clone(),
+			"--fast-unlock",
+			"Use drasticly faster unlocking mode. This setting causes raw secrets to be stored unprotected in memory, so use with care.",
+
+			ARG arg_keys_iterations: (u32) = 10240u32, or |c: &Config| c.account.as_ref()?.keys_iterations.clone(),
+			"--keys-iterations=[NUM]",
+			"Specify the number of iterations to use when deriving key from the password (bigger is more secure)",
+
+			ARG arg_accounts_refresh: (u64) = 5u64, or |c: &Config| c.account.as_ref()?.refresh_time.clone(),
+			"--accounts-refresh=[TIME]",
+			"Specify the cache time of accounts read from disk. If you manage thousands of accounts set this to 0 to disable refresh.",
+
+			ARG arg_unlock: (Option<String>) = None, or |c: &Config| c.account.as_ref()?.unlock.as_ref().map(|vec| vec.join(",")),
+			"--unlock=[ACCOUNTS]",
+			"Unlock ACCOUNTS for the duration of the execution. ACCOUNTS is a comma-delimited list of addresses. Implies --no-ui.",
+
+			ARG arg_password: (Vec<String>) = Vec::new(), or |c: &Config| c.account.as_ref()?.password.clone(),
+			"--password=[FILE]...",
+			"Provide a file containing a password for unlocking an account. Leading and trailing whitespace is trimmed.",
+
+		["UI options"]
+			FLAG flag_force_ui: (bool) = false, or |c: &Config| c.ui.as_ref()?.force.clone(),
+			"--force-ui",
+			"Enable Trusted UI WebSocket endpoint, even when --unlock is in use.",
+
+			FLAG flag_no_ui: (bool) = false, or |c: &Config| c.ui.as_ref()?.disable.clone(),
+			"--no-ui",
+			"Disable Trusted UI WebSocket endpoint.",
+
+			// NOTE [todr] For security reasons don't put this to config files
+			FLAG flag_ui_no_validation: (bool) = false, or |_| None,
+			"--ui-no-validation",
+			"Disable Origin and Host headers validation for Trusted UI. WARNING: INSECURE. Used only for development.",
+
+			ARG arg_ui_interface: (String) = "local", or |c: &Config| c.ui.as_ref()?.interface.clone(),
+			"--ui-interface=[IP]",
+			"Specify the hostname portion of the Trusted UI server, IP should be an interface's IP address, or local.",
+
+			ARG arg_ui_hosts: (String) = "none", or |c: &Config| c.ui.as_ref()?.hosts.as_ref().map(|vec| vec.join(",")),
+			"--ui-hosts=[HOSTS]",
+			"List of allowed Host header values. This option will validate the Host header sent by the browser, it is additional security against some attack vectors. Special options: \"all\", \"none\",.",
+
+			ARG arg_ui_path: (String) = "$BASE/signer", or |c: &Config| c.ui.as_ref()?.path.clone(),
+			"--ui-path=[PATH]",
+			"Specify directory where Trusted UIs tokens should be stored.",
+
+			ARG arg_ui_port: (u16) = 8180u16, or |c: &Config| c.ui.as_ref()?.port.clone(),
+			"--ui-port=[PORT]",
+			"Specify the port of Trusted UI server.",
+
+		["Networking options"]
+			FLAG flag_no_warp: (bool) = false, or |c: &Config| c.network.as_ref()?.warp.clone().map(|w| !w),
+			"--no-warp",
+			"Disable syncing from the snapshot over the network.",
+
+			FLAG flag_no_discovery: (bool) = false, or |c: &Config| c.network.as_ref()?.discovery.map(|d| !d).clone(),
+			"--no-discovery",
+			"Disable new peer discovery.",
+
+			FLAG flag_reserved_only: (bool) = false, or |c: &Config| c.network.as_ref()?.reserved_only.clone(),
+			"--reserved-only",
+			"Connect only to reserved nodes.",
+
+			FLAG flag_no_ancient_blocks: (bool) = false, or |_| None,
+			"--no-ancient-blocks",
+			"Disable downloading old blocks after snapshot restoration or warp sync.",
+
+			FLAG flag_no_serve_light: (bool) = false, or |c: &Config| c.network.as_ref()?.no_serve_light.clone(),
+			"--no-serve-light",
+			"Disable serving of light peers.",
+
+			ARG arg_port: (u16) = 30303u16, or |c: &Config| c.network.as_ref()?.port.clone(),
+			"--port=[PORT]",
+			"Override the port on which the node should listen.",
+
+			ARG arg_min_peers: (u16) = 25u16, or |c: &Config| c.network.as_ref()?.min_peers.clone(),
+			"--min-peers=[NUM]",
+			"Try to maintain at least NUM peers.",
+
+			ARG arg_max_peers: (u16) = 50u16, or |c: &Config| c.network.as_ref()?.max_peers.clone(),
+			"--max-peers=[NUM]",
+			"Allow up to NUM peers.",
+
+			ARG arg_snapshot_peers: (u16) = 0u16, or |c: &Config| c.network.as_ref()?.snapshot_peers.clone(),
+			"--snapshot-peers=[NUM]",
+			"Allow additional NUM peers for a snapshot sync.",
+
+			ARG arg_nat: (String) = "any", or |c: &Config| c.network.as_ref()?.nat.clone(),
+			"--nat=[METHOD]",
+			"Specify method to use for determining public address. Must be one of: any, none, upnp, extip:<IP>.",
+
+			ARG arg_allow_ips: (String) = "all", or |c: &Config| c.network.as_ref()?.allow_ips.clone(),
+			"--allow-ips=[FILTER]",
+			"Filter outbound connections. Must be one of: private - connect to private network IP addresses only; public - connect to public network IP addresses only; all - connect to any IP address.",
+
+			ARG arg_max_pending_peers: (u16) = 64u16, or |c: &Config| c.network.as_ref()?.max_pending_peers.clone(),
+			"--max-pending-peers=[NUM]",
+			"Allow up to NUM pending connections.",
+
+			ARG arg_network_id: (Option<u64>) = None, or |c: &Config| c.network.as_ref()?.id.clone(),
+			"--network-id=[INDEX]",
+			"Override the network identifier from the chain we are on.",
+
+			ARG arg_bootnodes: (Option<String>) = None, or |c: &Config| c.network.as_ref()?.bootnodes.as_ref().map(|vec| vec.join(",")),
+			"--bootnodes=[NODES]",
+			"Override the bootnodes from our chain. NODES should be comma-delimited enodes.",
+
+			ARG arg_node_key: (Option<String>) = None, or |c: &Config| c.network.as_ref()?.node_key.clone(),
+			"--node-key=[KEY]",
+			"Specify node secret key, either as 64-character hex string or input to SHA3 operation.",
+
+			ARG arg_reserved_peers: (Option<String>) = None, or |c: &Config| c.network.as_ref()?.reserved_peers.clone(),
+			"--reserved-peers=[FILE]",
+			"Provide a file containing enodes, one per line. These nodes will always have a reserved slot on top of the normal maximum peers.",
+
+		["API and console options – RPC"]
+			FLAG flag_no_jsonrpc: (bool) = false, or |c: &Config| c.rpc.as_ref()?.disable.clone(),
+			"--no-jsonrpc",
+			"Disable the JSON-RPC API server.",
+
+			ARG arg_jsonrpc_port: (u16) = 8545u16, or |c: &Config| c.rpc.as_ref()?.port.clone(),
+			"--jsonrpc-port=[PORT]",
+			"Specify the port portion of the JSONRPC API server.",
+
+			ARG arg_jsonrpc_interface: (String)  = "local", or |c: &Config| c.rpc.as_ref()?.interface.clone(),
+			"--jsonrpc-interface=[IP]",
+			"Specify the hostname portion of the JSONRPC API server, IP should be an interface's IP address, or all (all interfaces) or local.",
+
+			ARG arg_jsonrpc_apis: (String) = "web3,eth,pubsub,net,parity,parity_pubsub,traces,rpc,shh,shh_pubsub", or |c: &Config| c.rpc.as_ref()?.apis.as_ref().map(|vec| vec.join(",")),
+			"--jsonrpc-apis=[APIS]",
+			"Specify the APIs available through the JSONRPC interface. APIS is a comma-delimited list of API name. Possible name are all, safe, web3, eth, net, personal, parity, parity_set, traces, rpc, parity_accounts, pubsub, parity_pubsub, shh, shh_pubsub, signer, secretstore. You can also disable a specific API by putting '-' in the front: all,-personal.",
+
+			ARG arg_jsonrpc_hosts: (String) = "none", or |c: &Config| c.rpc.as_ref()?.hosts.as_ref().map(|vec| vec.join(",")),
+			"--jsonrpc-hosts=[HOSTS]",
+			"List of allowed Host header values. This option will validate the Host header sent by the browser, it is additional security against some attack vectors. Special options: \"all\", \"none\",.",
+
+			ARG arg_jsonrpc_threads: (usize) = 4usize, or |c: &Config| c.rpc.as_ref()?.processing_threads,
+			"--jsonrpc-threads=[THREADS]",
+			"Turn on additional processing threads in all RPC servers. Setting this to non-zero value allows parallel cpu-heavy queries execution.",
+
+			ARG arg_jsonrpc_cors: (String) = "none", or |c: &Config| c.rpc.as_ref()?.cors.as_ref().map(|vec| vec.join(",")),
+			"--jsonrpc-cors=[URL]",
+			"Specify CORS header for JSON-RPC API responses. Special options: \"all\", \"none\".",
+
+			ARG arg_jsonrpc_server_threads: (Option<usize>) = None, or |c: &Config| c.rpc.as_ref()?.server_threads,
+			"--jsonrpc-server-threads=[NUM]",
+			"Enables multiple threads handling incoming connections for HTTP JSON-RPC server.",
+
+		["API and console options – WebSockets"]
+			FLAG flag_no_ws: (bool) = false, or |c: &Config| c.websockets.as_ref()?.disable.clone(),
+			"--no-ws",
+			"Disable the WebSockets server.",
+
+			ARG arg_ws_port: (u16) = 8546u16, or |c: &Config| c.websockets.as_ref()?.port.clone(),
+			"--ws-port=[PORT]",
+			"Specify the port portion of the WebSockets server.",
+
+			ARG arg_ws_interface: (String)  = "local", or |c: &Config| c.websockets.as_ref()?.interface.clone(),
+			"--ws-interface=[IP]",
+			"Specify the hostname portion of the WebSockets server, IP should be an interface's IP address, or all (all interfaces) or local.",
+
+			ARG arg_ws_apis: (String) = "web3,eth,pubsub,net,parity,parity_pubsub,traces,rpc,shh,shh_pubsub", or |c: &Config| c.websockets.as_ref()?.apis.as_ref().map(|vec| vec.join(",")),
+			"--ws-apis=[APIS]",
+			"Specify the APIs available through the WebSockets interface. APIS is a comma-delimited list of API name. Possible name are web3, eth, pubsub, net, personal, parity, parity_set, traces, rpc, parity_accounts, pubsub, parity_pubsub, shh, shh_pubsub, signer, secretstore.",
+
+			ARG arg_ws_origins: (String) = "parity://*,chrome-extension://*,moz-extension://*", or |c: &Config| c.websockets.as_ref()?.origins.as_ref().map(|vec| vec.join(",")),
+			"--ws-origins=[URL]",
+			"Specify Origin header values allowed to connect. Special options: \"all\", \"none\".",
+
+			ARG arg_ws_hosts: (String) = "none", or |c: &Config| c.websockets.as_ref()?.hosts.as_ref().map(|vec| vec.join(",")),
+			"--ws-hosts=[HOSTS]",
+			"List of allowed Host header values. This option will validate the Host header sent by the browser, it is additional security against some attack vectors. Special options: \"all\", \"none\".",
+
+		["API and console options – IPC"]
+			FLAG flag_no_ipc: (bool) = false, or |c: &Config| c.ipc.as_ref()?.disable.clone(),
+			"--no-ipc",
+			"Disable JSON-RPC over IPC service.",
+
+			ARG arg_ipc_path: (String) = if cfg!(windows) { r"\\.\pipe\jsonrpc.ipc" } else { "$BASE/jsonrpc.ipc" }, or |c: &Config| c.ipc.as_ref()?.path.clone(),
+			"--ipc-path=[PATH]",
+			"Specify custom path for JSON-RPC over IPC service.",
+
+			ARG arg_ipc_apis: (String) = "web3,eth,pubsub,net,parity,parity_pubsub,parity_accounts,traces,rpc,shh,shh_pubsub", or |c: &Config| c.ipc.as_ref()?.apis.as_ref().map(|vec| vec.join(",")),
+			"--ipc-apis=[APIS]",
+			"Specify custom API set available via JSON-RPC over IPC.",
+
+		["API and console options – Dapps"]
+			FLAG flag_no_dapps: (bool) = false, or |c: &Config| c.dapps.as_ref()?.disable.clone(),
+			"--no-dapps",
+			"Disable the Dapps server (e.g. status page).",
+
+			ARG arg_dapps_path: (String) = "$BASE/dapps", or |c: &Config| c.dapps.as_ref()?.path.clone(),
+			"--dapps-path=[PATH]",
+			"Specify directory where dapps should be installed.",
+
+		["API and console options – IPFS"]
+			FLAG flag_ipfs_api: (bool) = false, or |c: &Config| c.ipfs.as_ref()?.enable.clone(),
+			"--ipfs-api",
+			"Enable IPFS-compatible HTTP API.",
+
+			ARG arg_ipfs_api_port: (u16) = 5001u16, or |c: &Config| c.ipfs.as_ref()?.port.clone(),
+			"--ipfs-api-port=[PORT]",
+			"Configure on which port the IPFS HTTP API should listen.",
+
+			ARG arg_ipfs_api_interface: (String) = "local", or |c: &Config| c.ipfs.as_ref()?.interface.clone(),
+			"--ipfs-api-interface=[IP]",
+			"Specify the hostname portion of the IPFS API server, IP should be an interface's IP address or local.",
+
+			ARG arg_ipfs_api_hosts: (String) = "none", or |c: &Config| c.ipfs.as_ref()?.hosts.as_ref().map(|vec| vec.join(",")),
+			"--ipfs-api-hosts=[HOSTS]",
+			"List of allowed Host header values. This option will validate the Host header sent by the browser, it is additional security against some attack vectors. Special options: \"all\", \"none\".",
+
+			ARG arg_ipfs_api_cors: (String) = "none", or |c: &Config| c.ipfs.as_ref()?.cors.as_ref().map(|vec| vec.join(",")),
+			"--ipfs-api-cors=[URL]",
+			"Specify CORS header for IPFS API responses. Special options: \"all\", \"none\".",
+
+		["Secret store options"]
+			FLAG flag_no_secretstore: (bool) = false, or |c: &Config| c.secretstore.as_ref()?.disable.clone(),
+			"--no-secretstore",
+			"Disable Secret Store functionality.",
+
+			FLAG flag_no_secretstore_http: (bool) = false, or |c: &Config| c.secretstore.as_ref()?.disable_http.clone(),
+			"--no-secretstore-http",
+			"Disable Secret Store HTTP API.",
+
+ 			FLAG flag_no_secretstore_acl_check: (bool) = false, or |c: &Config| c.secretstore.as_ref()?.disable_acl_check.clone(),
+			"--no-acl-check",
+			"Disable ACL check (useful for test environments).",
+
+			FLAG flag_no_secretstore_auto_migrate: (bool) = false, or |c: &Config| c.secretstore.as_ref()?.disable_auto_migrate.clone(),
+			"--no-secretstore-auto-migrate",
+			"Do not run servers set change session automatically when servers set changes. This option has no effect when servers set is read from configuration file.",
+
+			ARG arg_secretstore_contract: (String) = "none", or |c: &Config| c.secretstore.as_ref()?.service_contract.clone(),
+			"--secretstore-contract=[SOURCE]",
+			"Secret Store Service contract address source: none, registry (contract address is read from registry) or address.",
+
+			ARG arg_secretstore_nodes: (String) = "", or |c: &Config| c.secretstore.as_ref()?.nodes.as_ref().map(|vec| vec.join(",")),
+			"--secretstore-nodes=[NODES]",
+			"Comma-separated list of other secret store cluster nodes in form NODE_PUBLIC_KEY_IN_HEX@NODE_IP_ADDR:NODE_PORT.",
+
+			ARG arg_secretstore_interface: (String) = "local", or |c: &Config| c.secretstore.as_ref()?.interface.clone(),
+			"--secretstore-interface=[IP]",
+			"Specify the hostname portion for listening to Secret Store Key Server internal requests, IP should be an interface's IP address, or local.",
+
+			ARG arg_secretstore_port: (u16) = 8083u16, or |c: &Config| c.secretstore.as_ref()?.port.clone(),
+			"--secretstore-port=[PORT]",
+			"Specify the port portion for listening to Secret Store Key Server internal requests.",
+
+			ARG arg_secretstore_http_interface: (String) = "local", or |c: &Config| c.secretstore.as_ref()?.http_interface.clone(),
+			"--secretstore-http-interface=[IP]",
+			"Specify the hostname portion for listening to Secret Store Key Server HTTP requests, IP should be an interface's IP address, or local.",
+
+			ARG arg_secretstore_http_port: (u16) = 8082u16, or |c: &Config| c.secretstore.as_ref()?.http_port.clone(),
+			"--secretstore-http-port=[PORT]",
+			"Specify the port portion for listening to Secret Store Key Server HTTP requests.",
+
+			ARG arg_secretstore_path: (String) = "$BASE/secretstore", or |c: &Config| c.secretstore.as_ref()?.path.clone(),
+			"--secretstore-path=[PATH]",
+			"Specify directory where Secret Store should save its data.",
+
+			ARG arg_secretstore_secret: (Option<String>) = None, or |c: &Config| c.secretstore.as_ref()?.self_secret.clone(),
+			"--secretstore-secret=[SECRET]",
+			"Hex-encoded secret key of this node.",
+
+			ARG arg_secretstore_admin_public: (Option<String>) = None, or |c: &Config| c.secretstore.as_ref()?.admin_public.clone(),
+			"--secretstore-admin=[PUBLIC]",
+			"Hex-encoded public key of secret store administrator.",
+
+		["Sealing/Mining options"]
+			FLAG flag_force_sealing: (bool) = false, or |c: &Config| c.mining.as_ref()?.force_sealing.clone(),
+			"--force-sealing",
+			"Force the node to author new blocks as if it were always sealing/mining.",
+
+			FLAG flag_reseal_on_uncle: (bool) = false, or |c: &Config| c.mining.as_ref()?.reseal_on_uncle.clone(),
+			"--reseal-on-uncle",
+			"Force the node to author new blocks when a new uncle block is imported.",
+
+			FLAG flag_remove_solved: (bool) = false, or |c: &Config| c.mining.as_ref()?.remove_solved.clone(),
+			"--remove-solved",
+			"Move solved blocks from the work package queue instead of cloning them. This gives a slightly faster import speed, but means that extra solutions submitted for the same work package will go unused.",
+
+			FLAG flag_refuse_service_transactions: (bool) = false, or |c: &Config| c.mining.as_ref()?.refuse_service_transactions.clone(),
+			"--refuse-service-transactions",
+			"Always refuse service transactions.",
+
+			FLAG flag_infinite_pending_block: (bool) = false, or |c: &Config| c.mining.as_ref()?.infinite_pending_block.clone(),
+			"--infinite-pending-block",
+			"Pending block will be created with maximal possible gas limit and will execute all transactions in the queue. Note that such block is invalid and should never be attempted to be mined.",
+
+			FLAG flag_no_persistent_txqueue: (bool) = false, or |c: &Config| c.parity.as_ref()?.no_persistent_txqueue,
+			"--no-persistent-txqueue",
+			"Don't save pending local transactions to disk to be restored whenever the node restarts.",
+
+			FLAG flag_stratum: (bool) = false, or |c: &Config| Some(c.stratum.is_some()),
+			"--stratum",
+			"Run Stratum server for miner push notification.",
+
+			ARG arg_reseal_on_txs: (String) = "own", or |c: &Config| c.mining.as_ref()?.reseal_on_txs.clone(),
+			"--reseal-on-txs=[SET]",
+			"Specify which transactions should force the node to reseal a block. SET is one of: none - never reseal on new transactions; own - reseal only on a new local transaction; ext - reseal only on a new external transaction; all - reseal on all new transactions.",
+
+			ARG arg_reseal_min_period: (u64) = 2000u64, or |c: &Config| c.mining.as_ref()?.reseal_min_period.clone(),
+			"--reseal-min-period=[MS]",
+			"Specify the minimum time between reseals from incoming transactions. MS is time measured in milliseconds.",
+
+			ARG arg_reseal_max_period: (u64) = 120000u64, or |c: &Config| c.mining.as_ref()?.reseal_max_period.clone(),
+			"--reseal-max-period=[MS]",
+			"Specify the maximum time since last block to enable force-sealing. MS is time measured in milliseconds.",
+
+			ARG arg_work_queue_size: (usize) = 20usize, or |c: &Config| c.mining.as_ref()?.work_queue_size.clone(),
+			"--work-queue-size=[ITEMS]",
+			"Specify the number of historical work packages which are kept cached lest a solution is found for them later. High values take more memory but result in fewer unusable solutions.",
+
+			ARG arg_relay_set: (String) = "cheap", or |c: &Config| c.mining.as_ref()?.relay_set.clone(),
+			"--relay-set=[SET]",
+			"Set of transactions to relay. SET may be: cheap - Relay any transaction in the queue (this may include invalid transactions); strict - Relay only executed transactions (this guarantees we don't relay invalid transactions, but means we relay nothing if not mining); lenient - Same as strict when mining, and cheap when not.",
+
+			ARG arg_usd_per_tx: (String) = "0.0001", or |c: &Config| c.mining.as_ref()?.usd_per_tx.clone(),
+			"--usd-per-tx=[USD]",
+			"Amount of USD to be paid for a basic transaction. The minimum gas price is set accordingly.",
+
+			ARG arg_usd_per_eth: (String) = "auto", or |c: &Config| c.mining.as_ref()?.usd_per_eth.clone(),
+			"--usd-per-eth=[SOURCE]",
+			"USD value of a single ETH. SOURCE may be either an amount in USD, a web service or 'auto' to use each web service in turn and fallback on the last known good value.",
+
+			ARG arg_price_update_period: (String) = "hourly", or |c: &Config| c.mining.as_ref()?.price_update_period.clone(),
+			"--price-update-period=[T]",
+			"T will be allowed to pass between each gas price update. T may be daily, hourly, a number of seconds, or a time string of the form \"2 days\", \"30 minutes\" etc..",
+
+			ARG arg_gas_floor_target: (String) = "4700000", or |c: &Config| c.mining.as_ref()?.gas_floor_target.clone(),
+			"--gas-floor-target=[GAS]",
+			"Amount of gas per block to target when sealing a new block.",
+
+			ARG arg_gas_cap: (String) = "6283184", or |c: &Config| c.mining.as_ref()?.gas_cap.clone(),
+			"--gas-cap=[GAS]",
+			"A cap on how large we will raise the gas limit per block due to transaction volume.",
+
+			ARG arg_tx_queue_mem_limit: (u32) = 2u32, or |c: &Config| c.mining.as_ref()?.tx_queue_mem_limit.clone(),
+			"--tx-queue-mem-limit=[MB]",
+			"Maximum amount of memory that can be used by the transaction queue. Setting this parameter to 0 disables limiting.",
+
+			ARG arg_tx_queue_size: (usize) = 8192usize, or |c: &Config| c.mining.as_ref()?.tx_queue_size.clone(),
+			"--tx-queue-size=[LIMIT]",
+			"Maximum amount of transactions in the queue (waiting to be included in next block).",
+
+			ARG arg_tx_queue_gas: (String) = "off", or |c: &Config| c.mining.as_ref()?.tx_queue_gas.clone(),
+			"--tx-queue-gas=[LIMIT]",
+			"Maximum amount of total gas for external transactions in the queue. LIMIT can be either an amount of gas or 'auto' or 'off'. 'auto' sets the limit to be 20x the current block gas limit.",
+
+			ARG arg_tx_queue_strategy: (String) = "gas_price", or |c: &Config| c.mining.as_ref()?.tx_queue_strategy.clone(),
+			"--tx-queue-strategy=[S]",
+			"Prioritization strategy used to order transactions in the queue. S may be: gas - Prioritize txs with low gas limit; gas_price - Prioritize txs with high gas price; gas_factor - Prioritize txs using gas price and gas limit ratio.",
+
+			ARG arg_tx_queue_ban_count: (u16) = 1u16, or |c: &Config| c.mining.as_ref()?.tx_queue_ban_count.clone(),
+			"--tx-queue-ban-count=[C]",
+			"Number of times maximal time for execution (--tx-time-limit) can be exceeded before banning sender/recipient/code.",
+
+			ARG arg_tx_queue_ban_time: (u16) = 180u16, or |c: &Config| c.mining.as_ref()?.tx_queue_ban_time.clone(),
+			"--tx-queue-ban-time=[SEC]",
+			"Banning time (in seconds) for offenders of specified execution time limit. Also number of offending actions have to reach the threshold within that time.",
+
+			ARG arg_stratum_interface: (String) = "local", or |c: &Config| c.stratum.as_ref()?.interface.clone(),
+			"--stratum-interface=[IP]",
+			"Interface address for Stratum server.",
+
+			ARG arg_stratum_port: (u16) = 8008u16, or |c: &Config| c.stratum.as_ref()?.port.clone(),
+			"--stratum-port=[PORT]",
+			"Port for Stratum server to listen on.",
+
+			ARG arg_min_gas_price: (Option<u64>) = None, or |c: &Config| c.mining.as_ref()?.min_gas_price.clone(),
+			"--min-gas-price=[STRING]",
+			"Minimum amount of Wei per GAS to be paid for a transaction to be accepted for mining. Overrides --usd-per-tx.",
+
+			ARG arg_gas_price_percentile: (usize) = 50usize, or |c: &Config| c.mining.as_ref()?.gas_price_percentile,
+			"--gas-price-percentile=[PCT]",
+			"Set PCT percentile gas price value from last 100 blocks as default gas price when sending transactions.",
+
+			ARG arg_author: (Option<String>) = None, or |c: &Config| c.mining.as_ref()?.author.clone(),
+			"--author=[ADDRESS]",
+			"Specify the block author (aka \"coinbase\") address for sending block rewards from sealed blocks. NOTE: MINING WILL NOT WORK WITHOUT THIS OPTION.", // Sealing/Mining Option
+
+			ARG arg_engine_signer: (Option<String>) = None, or |c: &Config| c.mining.as_ref()?.engine_signer.clone(),
+			"--engine-signer=[ADDRESS]",
+			"Specify the address which should be used to sign consensus messages and issue blocks. Relevant only to non-PoW chains.",
+
+			ARG arg_tx_gas_limit: (Option<String>) = None, or |c: &Config| c.mining.as_ref()?.tx_gas_limit.clone(),
+			"--tx-gas-limit=[GAS]",
+			"Apply a limit of GAS as the maximum amount of gas a single transaction may have for it to be mined.",
+
+			ARG arg_tx_time_limit: (Option<u64>) = None, or |c: &Config| c.mining.as_ref()?.tx_time_limit.clone(),
+			"--tx-time-limit=[MS]",
+			"Maximal time for processing single transaction. If enabled senders/recipients/code of transactions offending the limit will be banned from being included in transaction queue for 180 seconds.",
+
+			ARG arg_extra_data: (Option<String>) = None, or |c: &Config| c.mining.as_ref()?.extra_data.clone(),
+			"--extra-data=[STRING]",
+			"Specify a custom extra-data for authored blocks, no more than 32 characters.",
+
+			ARG arg_notify_work: (Option<String>) = None, or |c: &Config| c.mining.as_ref()?.notify_work.as_ref().map(|vec| vec.join(",")),
+			"--notify-work=[URLS]",
+			"URLs to which work package notifications are pushed. URLS should be a comma-delimited list of HTTP URLs.",
+
+			ARG arg_stratum_secret: (Option<String>) = None, or |c: &Config| c.stratum.as_ref()?.secret.clone(),
+			"--stratum-secret=[STRING]",
+			"Secret for authorizing Stratum server for peers.",
+
+		["Internal Options"]
+			FLAG flag_can_restart: (bool) = false, or |_| None,
+			"--can-restart",
+			"Executable will auto-restart if exiting with 69",
+
+		["Miscellaneous options"]
+			FLAG flag_no_color: (bool) = false, or |c: &Config| c.misc.as_ref()?.color.map(|c| !c).clone(),
+			"--no-color",
+			"Don't use terminal color codes in output.",
+
+			FLAG flag_version: (bool) = false, or |_| None,
+			"-v, --version",
+			"Show information about version.",
+
+			FLAG flag_no_config: (bool) = false, or |_| None,
+			"--no-config",
+			"Don't load a configuration file.",
+
+			ARG arg_ntp_servers: (String) = "0.parity.pool.ntp.org:123,1.parity.pool.ntp.org:123,2.parity.pool.ntp.org:123,3.parity.pool.ntp.org:123", or |c: &Config| c.misc.as_ref()?.ntp_servers.clone().map(|vec| vec.join(",")),
+			"--ntp-servers=[HOSTS]",
+			"Comma separated list of NTP servers to provide current time (host:port). Used to verify node health. Parity uses pool.ntp.org NTP servers; consider joining the pool: http://www.pool.ntp.org/join.html",
+
+			ARG arg_logging: (Option<String>) = None, or |c: &Config| c.misc.as_ref()?.logging.clone(),
+			"-l, --logging=[LOGGING]",
+			"Specify the logging level. Must conform to the same format as RUST_LOG.",
+
+			ARG arg_log_file: (Option<String>) = None, or |c: &Config| c.misc.as_ref()?.log_file.clone(),
+			"--log-file=[FILENAME]",
+			"Specify a filename into which logging should be appended.",
+
+		["Footprint options"]
+			FLAG flag_fast_and_loose: (bool) = false, or |c: &Config| c.footprint.as_ref()?.fast_and_loose.clone(),
+			"--fast-and-loose",
+			"Disables DB WAL, which gives a significant speed up but means an unclean exit is unrecoverable.",
+
+			FLAG flag_scale_verifiers: (bool) = false, or |c: &Config| c.footprint.as_ref()?.scale_verifiers.clone(),
+			"--scale-verifiers",
+			"Automatically scale amount of verifier threads based on workload. Not guaranteed to be faster.",
+
+			ARG arg_tracing: (String) = "auto", or |c: &Config| c.footprint.as_ref()?.tracing.clone(),
+			"--tracing=[BOOL]",
+			"Indicates if full transaction tracing should be enabled. Works only if client had been fully synced with tracing enabled. BOOL may be one of auto, on, off. auto uses last used value of this option (off if it does not exist).", // footprint option
+
+			ARG arg_pruning: (String) = "auto", or |c: &Config| c.footprint.as_ref()?.pruning.clone(),
+			"--pruning=[METHOD]",
+			"Configure pruning of the state/storage trie. METHOD may be one of auto, archive, fast: archive - keep all state trie data. No pruning. fast - maintain journal overlay. Fast but 50MB used. auto - use the method most recently synced or default to fast if none synced.",
+
+			ARG arg_pruning_history: (u64) = 64u64, or |c: &Config| c.footprint.as_ref()?.pruning_history.clone(),
+			"--pruning-history=[NUM]",
+			"Set a minimum number of recent states to keep in memory when pruning is active.",
+
+			ARG arg_pruning_memory: (usize) = 32usize, or |c: &Config| c.footprint.as_ref()?.pruning_memory.clone(),
+			"--pruning-memory=[MB]",
+			"The ideal amount of memory in megabytes to use to store recent states. As many states as possible will be kept within this limit, and at least --pruning-history states will always be kept.",
+
+			ARG arg_cache_size_db: (u32) = 128u32, or |c: &Config| c.footprint.as_ref()?.cache_size_db.clone(),
+			"--cache-size-db=[MB]",
+			"Override database cache size.",
+
+			ARG arg_cache_size_blocks: (u32) = 8u32, or |c: &Config| c.footprint.as_ref()?.cache_size_blocks.clone(),
+			"--cache-size-blocks=[MB]",
+			"Specify the prefered size of the blockchain cache in megabytes.",
+
+			ARG arg_cache_size_queue: (u32) = 40u32, or |c: &Config| c.footprint.as_ref()?.cache_size_queue.clone(),
+			"--cache-size-queue=[MB]",
+			"Specify the maximum size of memory to use for block queue.",
+
+			ARG arg_cache_size_state: (u32) = 25u32, or |c: &Config| c.footprint.as_ref()?.cache_size_state.clone(),
+			"--cache-size-state=[MB]",
+			"Specify the maximum size of memory to use for the state cache.",
+
+			ARG arg_db_compaction: (String) = "auto", or |c: &Config| c.footprint.as_ref()?.db_compaction.clone(),
+			"--db-compaction=[TYPE]",
+			"Database compaction type. TYPE may be one of: ssd - suitable for SSDs and fast HDDs; hdd - suitable for slow HDDs; auto - determine automatically.",
+
+			ARG arg_fat_db: (String) = "auto", or |c: &Config| c.footprint.as_ref()?.fat_db.clone(),
+			"--fat-db=[BOOL]",
+			"Build appropriate information to allow enumeration of all accounts and storage keys. Doubles the size of the state database. BOOL may be one of on, off or auto.",
+
+			ARG arg_cache_size: (Option<u32>) = None, or |c: &Config| c.footprint.as_ref()?.cache_size.clone(),
+			"--cache-size=[MB]",
+			"Set total amount of discretionary memory to use for the entire system, overrides other cache and queue options.",
+
+			ARG arg_num_verifiers: (Option<usize>) = None, or |c: &Config| c.footprint.as_ref()?.num_verifiers.clone(),
+			"--num-verifiers=[INT]",
+			"Amount of verifier threads to use or to begin with, if verifier auto-scaling is enabled.",
+
+		["Import/export options"]
+			FLAG flag_no_seal_check: (bool) = false, or |_| None,
+			"--no-seal-check",
+			"Skip block seal check.",
+
+		["Snapshot options"]
+			FLAG flag_no_periodic_snapshot: (bool) = false, or |c: &Config| c.snapshots.as_ref()?.disable_periodic.clone(),
+			"--no-periodic-snapshot",
+			"Disable automated snapshots which usually occur once every 10000 blocks.",
+
+		["Virtual Machine options"]
+			FLAG flag_jitvm: (bool) = false, or |c: &Config| c.vm.as_ref()?.jit.clone(),
+			"--jitvm",
+			"Enable the JIT VM.",
+
+		["Whisper options"]
+			FLAG flag_whisper: (bool) = false, or |c: &Config| c.whisper.as_ref()?.enabled,
+			"--whisper",
+			"Enable the Whisper network.",
+
+ 			ARG arg_whisper_pool_size: (usize) = 10usize, or |c: &Config| c.whisper.as_ref()?.pool_size.clone(),
+			"--whisper-pool-size=[MB]",
+			"Target size of the whisper message pool in megabytes.",
+
+		["Legacy options"]
+			FLAG flag_warp: (bool) = false, or |_| None,
+			"--warp",
+			"Does nothing; warp sync is enabled by default.",
+
+			FLAG flag_dapps_apis_all: (bool) = false, or |_| None,
+			"--dapps-apis-all",
+			"Dapps server is merged with RPC server. Use --jsonrpc-apis.",
+
+			FLAG flag_geth: (bool) = false, or |_| None,
+			"--geth",
+			"Run in Geth-compatibility mode. Sets the IPC path to be the same as Geth's. Overrides the --ipc-path and --ipcpath options. Alters RPCs to reflect Geth bugs. Includes the personal_ RPC by default.",
+
+			FLAG flag_testnet: (bool) = false, or |_| None,
+			"--testnet",
+			"Testnet mode. Equivalent to --chain testnet. Overrides the --keys-path option.",
+
+			FLAG flag_import_geth_keys: (bool) = false, or |_| None,
+			"--import-geth-keys",
+			"Attempt to import keys from Geth client.",
+
+			FLAG flag_ipcdisable: (bool) = false, or |_| None,
+			"--ipcdisable",
+			"Equivalent to --no-ipc.",
+
+			FLAG flag_ipc_off: (bool) = false, or |_| None,
+			"--ipc-off",
+			"Equivalent to --no-ipc.",
+
+			FLAG flag_nodiscover: (bool) = false, or |_| None,
+			"--nodiscover",
+			"Equivalent to --no-discovery.",
+
+			FLAG flag_jsonrpc: (bool) = false, or |_| None,
+			"-j, --jsonrpc",
+			"Does nothing; JSON-RPC is on by default now.",
+
+			FLAG flag_jsonrpc_off: (bool) = false, or |_| None,
+			"--jsonrpc-off",
+			"Equivalent to --no-jsonrpc.",
+
+			FLAG flag_webapp: (bool) = false, or |_| None,
+			"-w, --webapp",
+			"Does nothing; dapps server is on by default now.",
+
+			FLAG flag_dapps_off: (bool) = false, or |_| None,
+			"--dapps-off",
+			"Equivalent to --no-dapps.",
+
+			FLAG flag_rpc: (bool) = false, or |_| None,
+			"--rpc",
+			"Does nothing; JSON-RPC is on by default now.",
+
+			ARG arg_dapps_port: (Option<u16>) = None, or |c: &Config| c.dapps.as_ref()?.port.clone(),
+			"--dapps-port=[PORT]",
+			"Dapps server is merged with RPC server. Use --jsonrpc-port.",
+
+			ARG arg_dapps_interface: (Option<String>) = None, or |c: &Config| c.dapps.as_ref()?.interface.clone(),
+			"--dapps-interface=[IP]",
+			"Dapps server is merged with RPC server. Use --jsonrpc-interface.",
+
+			ARG arg_dapps_hosts: (Option<String>) = None, or |c: &Config| c.dapps.as_ref()?.hosts.as_ref().map(|vec| vec.join(",")),
+			"--dapps-hosts=[HOSTS]",
+			"Dapps server is merged with RPC server. Use --jsonrpc-hosts.",
+
+			ARG arg_dapps_cors: (Option<String>) = None, or |c: &Config| c.dapps.as_ref()?.cors.clone(),
+			"--dapps-cors=[URL]",
+			"Dapps server is merged with RPC server. Use --jsonrpc-cors.",
+
+			ARG arg_dapps_user: (Option<String>) = None, or |c: &Config| c.dapps.as_ref()?.user.clone(),
+			"--dapps-user=[USERNAME]",
+			"Dapps server authentication has been removed.",
+
+			ARG arg_dapps_pass: (Option<String>) = None, or |c: &Config| c.dapps.as_ref()?.pass.clone(),
+			"--dapps-pass=[PASSWORD]",
+			"Dapps server authentication has been removed.",
+
+			ARG arg_datadir: (Option<String>) = None, or |_| None,
+			"--datadir=[PATH]",
+			"Equivalent to --base-path PATH.",
+
+			ARG arg_networkid: (Option<u64>) = None, or |_| None,
+			"--networkid=[INDEX]",
+			"Equivalent to --network-id INDEX.",
+
+			ARG arg_peers: (Option<u16>) = None, or |_| None,
+			"--peers=[NUM]",
+			"Equivalent to --min-peers NUM.",
+
+			ARG arg_nodekey: (Option<String>) = None, or |_| None,
+			"--nodekey=[KEY]",
+			"Equivalent to --node-key KEY.",
+
+			ARG arg_rpcaddr: (Option<String>) = None, or |_| None,
+			"--rpcaddr=[IP]",
+			"Equivalent to --jsonrpc-interface IP.",
+
+			ARG arg_rpcport: (Option<u16>) = None, or |_| None,
+			"--rpcport=[PORT]",
+			"Equivalent to --jsonrpc-port PORT.",
+
+			ARG arg_rpcapi: (Option<String>) = None, or |_| None,
+			"--rpcapi=[APIS]",
+			"Equivalent to --jsonrpc-apis APIS.",
+
+			ARG arg_rpccorsdomain: (Option<String>) = None, or |_| None,
+			"--rpccorsdomain=[URL]",
+			"Equivalent to --jsonrpc-cors URL.",
+
+			ARG arg_ipcapi: (Option<String>) = None, or |_| None,
+			"--ipcapi=[APIS]",
+			"Equivalent to --ipc-apis APIS.",
+
+			ARG arg_ipcpath: (Option<String>) = None, or |_| None,
+			"--ipcpath=[PATH]",
+			"Equivalent to --ipc-path PATH.",
+
+			ARG arg_gasprice: (Option<String>) = None, or |_| None,
+			"--gasprice=[WEI]",
+			"Equivalent to --min-gas-price WEI.",
+
+			ARG arg_etherbase: (Option<String>) = None, or |_| None,
+			"--etherbase=[ADDRESS]",
+			"Equivalent to --author ADDRESS.",
+
+			ARG arg_extradata: (Option<String>) = None, or |_| None,
+			"--extradata=[STRING]",
+			"Equivalent to --extra-data STRING.",
+
+			ARG arg_cache: (Option<u32>) = None, or |_| None,
+			"--cache=[MB]",
+			"Equivalent to --cache-size MB.",
+
 	}
 }
 
@@ -424,6 +998,7 @@ struct Config {
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Operating {
 	mode: Option<String>,
 	mode_timeout: Option<u64>,
@@ -440,18 +1015,22 @@ struct Operating {
 	identity: Option<String>,
 	light: Option<bool>,
 	no_persistent_txqueue: Option<bool>,
+	no_hardcoded_sync: Option<bool>,
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Account {
 	unlock: Option<Vec<String>>,
 	password: Option<Vec<String>>,
 	keys_iterations: Option<u32>,
+	refresh_time: Option<u64>,
 	disable_hardware: Option<bool>,
 	fast_unlock: Option<bool>,
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Ui {
 	force: Option<bool>,
 	disable: Option<bool>,
@@ -462,6 +1041,7 @@ struct Ui {
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Network {
 	warp: Option<bool>,
 	port: Option<u16>,
@@ -481,11 +1061,12 @@ struct Network {
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Rpc {
 	disable: Option<bool>,
 	port: Option<u16>,
 	interface: Option<String>,
-	cors: Option<String>,
+	cors: Option<Vec<String>>,
 	apis: Option<Vec<String>>,
 	hosts: Option<Vec<String>>,
 	server_threads: Option<usize>,
@@ -493,6 +1074,7 @@ struct Rpc {
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Ws {
 	disable: Option<bool>,
 	port: Option<u16>,
@@ -503,6 +1085,7 @@ struct Ws {
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Ipc {
 	disable: Option<bool>,
 	path: Option<String>,
@@ -510,6 +1093,7 @@ struct Ipc {
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Dapps {
 	disable: Option<bool>,
 	port: Option<u16>,
@@ -522,11 +1106,15 @@ struct Dapps {
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct SecretStore {
 	disable: Option<bool>,
 	disable_http: Option<bool>,
 	disable_acl_check: Option<bool>,
+	disable_auto_migrate: Option<bool>,
+	service_contract: Option<String>,
 	self_secret: Option<String>,
+	admin_public: Option<String>,
 	nodes: Option<Vec<String>>,
 	interface: Option<String>,
 	port: Option<u16>,
@@ -536,15 +1124,17 @@ struct SecretStore {
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Ipfs {
 	enable: Option<bool>,
 	port: Option<u16>,
 	interface: Option<String>,
-	cors: Option<String>,
+	cors: Option<Vec<String>>,
 	hosts: Option<Vec<String>>,
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Mining {
 	author: Option<String>,
 	engine_signer: Option<String>,
@@ -558,6 +1148,7 @@ struct Mining {
 	tx_time_limit: Option<u64>,
 	relay_set: Option<String>,
 	min_gas_price: Option<u64>,
+	gas_price_percentile: Option<usize>,
 	usd_per_tx: Option<String>,
 	usd_per_eth: Option<String>,
 	price_update_period: Option<String>,
@@ -573,9 +1164,11 @@ struct Mining {
 	remove_solved: Option<bool>,
 	notify_work: Option<Vec<String>>,
 	refuse_service_transactions: Option<bool>,
+	infinite_pending_block: Option<bool>,
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Stratum {
 	interface: Option<String>,
 	port: Option<u16>,
@@ -583,6 +1176,7 @@ struct Stratum {
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Footprint {
 	tracing: Option<String>,
 	pruning: Option<String>,
@@ -601,16 +1195,19 @@ struct Footprint {
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Snapshots {
 	disable_periodic: Option<bool>,
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct VM {
 	jit: Option<bool>,
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Misc {
 	ntp_servers: Option<Vec<String>>,
 	logging: Option<String>,
@@ -621,6 +1218,7 @@ struct Misc {
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct Whisper {
 	enabled: Option<bool>,
 	pool_size: Option<usize>,
@@ -634,6 +1232,113 @@ mod tests {
 		Snapshots, VM, Misc, Whisper, SecretStore,
 	};
 	use toml;
+	use clap::{ErrorKind as ClapErrorKind};
+
+	#[test]
+	fn should_accept_any_argument_order() {
+		let args = Args::parse(&["parity", "--no-warp", "account", "list"]).unwrap();
+		assert_eq!(args.flag_no_warp, true);
+
+		let args = Args::parse(&["parity", "account", "list", "--no-warp"]).unwrap();
+		assert_eq!(args.flag_no_warp, true);
+
+		let args = Args::parse(&["parity", "--chain=dev", "account", "list"]).unwrap();
+		assert_eq!(args.arg_chain, "dev");
+
+		let args = Args::parse(&["parity", "account", "list", "--chain=dev"]).unwrap();
+		assert_eq!(args.arg_chain, "dev");
+	}
+
+	#[test]
+	fn should_not_crash_on_warp() {
+		let args = Args::parse(&["parity", "--warp"]);
+		assert!(args.is_ok());
+
+		let args = Args::parse(&["parity", "account", "list", "--warp"]);
+		assert!(args.is_ok());
+	}
+
+	#[test]
+	fn should_reject_invalid_values() {
+		let args = Args::parse(&["parity", "--cache=20"]);
+		assert!(args.is_ok());
+
+		let args = Args::parse(&["parity", "--cache=asd"]);
+		assert!(args.is_err());
+	}
+
+	#[test]
+	fn should_parse_args_and_flags() {
+		let args = Args::parse(&["parity", "--no-warp"]).unwrap();
+		assert_eq!(args.flag_no_warp, true);
+
+		let args = Args::parse(&["parity", "--pruning", "archive"]).unwrap();
+		assert_eq!(args.arg_pruning, "archive");
+
+		let args = Args::parse(&["parity", "export", "state", "--no-storage"]).unwrap();
+		assert_eq!(args.flag_export_state_no_storage, true);
+
+		let args = Args::parse(&["parity", "export", "state", "--min-balance","123"]).unwrap();
+		assert_eq!(args.arg_export_state_min_balance, Some("123".to_string()));
+	}
+
+	#[test]
+	fn should_exit_gracefully_on_unknown_argument() {
+		let result = Args::parse(&["parity", "--please-exit-gracefully"]);
+		assert!(
+			match result {
+				Err(ArgsError::Clap(ref clap_error)) if clap_error.kind == ClapErrorKind::UnknownArgument => true,
+				_ => false
+			}
+		);
+	}
+
+	#[test]
+	fn should_use_subcommand_arg_default() {
+		let args = Args::parse(&["parity", "export", "state", "--at", "123"]).unwrap();
+		assert_eq!(args.arg_export_state_at, "123");
+		assert_eq!(args.arg_snapshot_at, "latest");
+
+		let args = Args::parse(&["parity", "snapshot", "--at", "123", "file.dump"]).unwrap();
+		assert_eq!(args.arg_snapshot_at, "123");
+		assert_eq!(args.arg_export_state_at, "latest");
+
+		let args = Args::parse(&["parity", "export", "state"]).unwrap();
+		assert_eq!(args.arg_snapshot_at, "latest");
+		assert_eq!(args.arg_export_state_at, "latest");
+
+		let args = Args::parse(&["parity", "snapshot", "file.dump"]).unwrap();
+		assert_eq!(args.arg_snapshot_at, "latest");
+		assert_eq!(args.arg_export_state_at, "latest");
+	}
+
+	#[test]
+	fn should_parse_multiple_values() {
+		let args = Args::parse(&["parity", "account", "import", "~/1", "~/2"]).unwrap();
+		assert_eq!(args.arg_account_import_path, Some(vec!["~/1".to_owned(), "~/2".to_owned()]));
+
+		let args = Args::parse(&["parity", "account", "import", "~/1,ext"]).unwrap();
+		assert_eq!(args.arg_account_import_path, Some(vec!["~/1,ext".to_owned()]));
+
+		let args = Args::parse(&["parity", "--secretstore-nodes", "abc@127.0.0.1:3333,cde@10.10.10.10:4444"]).unwrap();
+		assert_eq!(args.arg_secretstore_nodes, "abc@127.0.0.1:3333,cde@10.10.10.10:4444");
+
+		let args = Args::parse(&["parity", "--password", "~/.safe/1", "--password", "~/.safe/2", "--ui-port", "8123", "ui"]).unwrap();
+		assert_eq!(args.arg_password, vec!["~/.safe/1".to_owned(), "~/.safe/2".to_owned()]);
+		assert_eq!(args.arg_ui_port, 8123);
+		assert_eq!(args.cmd_ui, true);
+
+		let args = Args::parse(&["parity", "--password", "~/.safe/1,~/.safe/2", "--ui-port", "8123", "ui"]).unwrap();
+		assert_eq!(args.arg_password, vec!["~/.safe/1".to_owned(), "~/.safe/2".to_owned()]);
+		assert_eq!(args.arg_ui_port, 8123);
+		assert_eq!(args.cmd_ui, true);
+	}
+
+	#[test]
+	fn should_parse_global_args_with_subcommand() {
+		let args = Args::parse(&["parity", "--chain", "dev", "account", "list"]).unwrap();
+		assert_eq!(args.arg_chain, "dev".to_owned());
+	}
 
 	#[test]
 	fn should_parse_args_and_include_config() {
@@ -647,7 +1352,7 @@ mod tests {
 		let args = Args::parse_with_config(&["parity"], config).unwrap();
 
 		// then
-		assert_eq!(args.flag_chain, "morden".to_owned());
+		assert_eq!(args.arg_chain, "morden".to_owned());
 	}
 
 	#[test]
@@ -662,7 +1367,7 @@ mod tests {
 		let args = Args::parse_with_config(&["parity", "--chain", "xyz"], config).unwrap();
 
 		// then
-		assert_eq!(args.flag_chain, "xyz".to_owned());
+		assert_eq!(args.arg_chain, "xyz".to_owned());
 	}
 
 	#[test]
@@ -676,13 +1381,13 @@ mod tests {
 		let args = Args::parse_with_config(&["parity"], config).unwrap();
 
 		// then
-		assert_eq!(args.flag_pruning_history, 128);
+		assert_eq!(args.arg_pruning_history, 128);
 	}
 
 	#[test]
 	fn should_parse_full_config() {
 		// given
-		let config = toml::from_str(include_str!("./config.full.toml")).unwrap();
+		let config = toml::from_str(include_str!("./tests/config.full.toml")).unwrap();
 
 		// when
 		let args = Args::parse_with_config(&["parity", "--chain", "xyz"], config).unwrap();
@@ -690,85 +1395,104 @@ mod tests {
 		// then
 		assert_eq!(args, Args {
 			// Commands
+			cmd_ui: false,
+			cmd_dapp: false,
 			cmd_daemon: false,
-			cmd_wallet: false,
 			cmd_account: false,
-			cmd_new: false,
-			cmd_list: false,
-			cmd_export: false,
-			cmd_state: false,
-			cmd_blocks: false,
+			cmd_account_new: false,
+			cmd_account_list: false,
+			cmd_account_import: false,
+			cmd_wallet: false,
+			cmd_wallet_import: false,
 			cmd_import: false,
+			cmd_export: false,
+			cmd_export_blocks: false,
+			cmd_export_state: false,
 			cmd_signer: false,
-			cmd_sign: false,
-			cmd_reject: false,
-			cmd_new_token: false,
+			cmd_signer_list: false,
+			cmd_signer_sign: false,
+			cmd_signer_reject: false,
+			cmd_signer_new_token: false,
 			cmd_snapshot: false,
 			cmd_restore: false,
-			cmd_ui: false,
-			cmd_dapp: false,
 			cmd_tools: false,
-			cmd_hash: false,
+			cmd_tools_hash: false,
 			cmd_db: false,
-			cmd_kill: false,
+			cmd_db_kill: false,
+			cmd_export_hardcoded_sync: false,
 
 			// Arguments
-			arg_pid_file: "".into(),
-			arg_file: None,
-			arg_id: None,
-			arg_path: vec![],
+			arg_daemon_pid_file: None,
+			arg_import_file: None,
+			arg_import_format: None,
+			arg_export_blocks_file: None,
+			arg_export_blocks_format: None,
+			arg_export_state_file: None,
+			arg_export_state_format: None,
+			arg_snapshot_file: None,
+			arg_restore_file: None,
+			arg_tools_hash_file: None,
+
+			arg_signer_sign_id: None,
+			arg_signer_reject_id: None,
+			arg_dapp_path: None,
+			arg_account_import_path: None,
+			arg_wallet_import_path: None,
 
 			// -- Operating Options
-			flag_mode: "last".into(),
-			flag_mode_timeout: 300u64,
-			flag_mode_alarm: 3600u64,
-			flag_auto_update: "none".into(),
-			flag_release_track: "current".into(),
+			arg_mode: "last".into(),
+			arg_mode_timeout: 300u64,
+			arg_mode_alarm: 3600u64,
+			arg_auto_update: "none".into(),
+			arg_release_track: "current".into(),
 			flag_public_node: false,
 			flag_no_download: false,
 			flag_no_consensus: false,
-			flag_chain: "xyz".into(),
-			flag_base_path: Some("$HOME/.parity".into()),
-			flag_db_path: Some("$HOME/.parity/chains".into()),
-			flag_keys_path: "$HOME/.parity/keys".into(),
-			flag_identity: "".into(),
+			arg_chain: "xyz".into(),
+			arg_base_path: Some("$HOME/.parity".into()),
+			arg_db_path: Some("$HOME/.parity/chains".into()),
+			arg_keys_path: "$HOME/.parity/keys".into(),
+			arg_identity: "".into(),
 			flag_light: false,
+			flag_no_hardcoded_sync: false,
 			flag_no_persistent_txqueue: false,
+			flag_force_direct: false,
 
 			// -- Convenience Options
-			flag_config: "$BASE/config.toml".into(),
-			flag_ports_shift: 0,
+			arg_config: "$BASE/config.toml".into(),
+			arg_ports_shift: 0,
 			flag_unsafe_expose: false,
 
 			// -- Account Options
-			flag_unlock: Some("0xdeadbeefcafe0000000000000000000000000000".into()),
-			flag_password: vec!["~/.safe/password.file".into()],
-			flag_keys_iterations: 10240u32,
+			arg_unlock: Some("0xdeadbeefcafe0000000000000000000000000000".into()),
+			arg_password: vec!["~/.safe/password.file".into()],
+			arg_keys_iterations: 10240u32,
+			arg_accounts_refresh: 5u64,
 			flag_no_hardware_wallets: false,
 			flag_fast_unlock: false,
 
 			flag_force_ui: false,
 			flag_no_ui: false,
-			flag_ui_port: 8180u16,
-			flag_ui_interface: "127.0.0.1".into(),
-			flag_ui_hosts: "none".into(),
-			flag_ui_path: "$HOME/.parity/signer".into(),
+			arg_ui_port: 8180u16,
+			arg_ui_interface: "127.0.0.1".into(),
+			arg_ui_hosts: "none".into(),
+			arg_ui_path: "$HOME/.parity/signer".into(),
 			flag_ui_no_validation: false,
 
 			// -- Networking Options
 			flag_no_warp: false,
-			flag_port: 30303u16,
-			flag_min_peers: 25u16,
-			flag_max_peers: 50u16,
-			flag_max_pending_peers: 64u16,
-			flag_snapshot_peers: 0u16,
-			flag_allow_ips: "all".into(),
-			flag_nat: "any".into(),
-			flag_network_id: Some(1),
-			flag_bootnodes: Some("".into()),
+			arg_port: 30303u16,
+			arg_min_peers: 25u16,
+			arg_max_peers: 50u16,
+			arg_max_pending_peers: 64u16,
+			arg_snapshot_peers: 0u16,
+			arg_allow_ips: "all".into(),
+			arg_nat: "any".into(),
+			arg_network_id: Some(1),
+			arg_bootnodes: Some("".into()),
 			flag_no_discovery: false,
-			flag_node_key: None,
-			flag_reserved_peers: Some("./path_to_file".into()),
+			arg_node_key: None,
+			arg_reserved_peers: Some("./path_to_file".into()),
 			flag_reserved_only: false,
 			flag_no_ancient_blocks: false,
 			flag_no_serve_light: false,
@@ -776,111 +1500,117 @@ mod tests {
 			// -- API and Console Options
 			// RPC
 			flag_no_jsonrpc: false,
-			flag_jsonrpc_port: 8545u16,
-			flag_jsonrpc_interface: "local".into(),
-			flag_jsonrpc_cors: Some("null".into()),
-			flag_jsonrpc_apis: "web3,eth,net,parity,traces,rpc,secretstore".into(),
-			flag_jsonrpc_hosts: "none".into(),
-			flag_jsonrpc_server_threads: None,
-			flag_jsonrpc_threads: 0,
+			arg_jsonrpc_port: 8545u16,
+			arg_jsonrpc_interface: "local".into(),
+			arg_jsonrpc_cors: "null".into(),
+			arg_jsonrpc_apis: "web3,eth,net,parity,traces,rpc,secretstore".into(),
+			arg_jsonrpc_hosts: "none".into(),
+			arg_jsonrpc_server_threads: None,
+			arg_jsonrpc_threads: 4,
 
 			// WS
 			flag_no_ws: false,
-			flag_ws_port: 8546u16,
-			flag_ws_interface: "local".into(),
-			flag_ws_apis: "web3,eth,net,parity,traces,rpc,secretstore".into(),
-			flag_ws_origins: "none".into(),
-			flag_ws_hosts: "none".into(),
+			arg_ws_port: 8546u16,
+			arg_ws_interface: "local".into(),
+			arg_ws_apis: "web3,eth,net,parity,traces,rpc,secretstore".into(),
+			arg_ws_origins: "none".into(),
+			arg_ws_hosts: "none".into(),
 
 			// IPC
 			flag_no_ipc: false,
-			flag_ipc_path: "$HOME/.parity/jsonrpc.ipc".into(),
-			flag_ipc_apis: "web3,eth,net,parity,parity_accounts,personal,traces,rpc,secretstore".into(),
+			arg_ipc_path: "$HOME/.parity/jsonrpc.ipc".into(),
+			arg_ipc_apis: "web3,eth,net,parity,parity_accounts,personal,traces,rpc,secretstore".into(),
 
 			// DAPPS
-			flag_dapps_path: "$HOME/.parity/dapps".into(),
+			arg_dapps_path: "$HOME/.parity/dapps".into(),
 			flag_no_dapps: false,
 
+			// SECRETSTORE
 			flag_no_secretstore: false,
 			flag_no_secretstore_http: false,
 			flag_no_secretstore_acl_check: false,
-			flag_secretstore_secret: None,
-			flag_secretstore_nodes: "".into(),
-			flag_secretstore_interface: "local".into(),
-			flag_secretstore_port: 8083u16,
-			flag_secretstore_http_interface: "local".into(),
-			flag_secretstore_http_port: 8082u16,
-			flag_secretstore_path: "$HOME/.parity/secretstore".into(),
+			flag_no_secretstore_auto_migrate: false,
+			arg_secretstore_contract: "none".into(),
+			arg_secretstore_secret: None,
+			arg_secretstore_admin_public: None,
+			arg_secretstore_nodes: "".into(),
+			arg_secretstore_interface: "local".into(),
+			arg_secretstore_port: 8083u16,
+			arg_secretstore_http_interface: "local".into(),
+			arg_secretstore_http_port: 8082u16,
+			arg_secretstore_path: "$HOME/.parity/secretstore".into(),
 
 			// IPFS
 			flag_ipfs_api: false,
-			flag_ipfs_api_port: 5001u16,
-			flag_ipfs_api_interface: "local".into(),
-			flag_ipfs_api_cors: Some("null".into()),
-			flag_ipfs_api_hosts: "none".into(),
+			arg_ipfs_api_port: 5001u16,
+			arg_ipfs_api_interface: "local".into(),
+			arg_ipfs_api_cors: "null".into(),
+			arg_ipfs_api_hosts: "none".into(),
 
 			// -- Sealing/Mining Options
-			flag_author: Some("0xdeadbeefcafe0000000000000000000000000001".into()),
-			flag_engine_signer: Some("0xdeadbeefcafe0000000000000000000000000001".into()),
+			arg_author: Some("0xdeadbeefcafe0000000000000000000000000001".into()),
+			arg_engine_signer: Some("0xdeadbeefcafe0000000000000000000000000001".into()),
 			flag_force_sealing: true,
-			flag_reseal_on_txs: "all".into(),
-			flag_reseal_min_period: 4000u64,
-			flag_reseal_max_period: 60000u64,
+			arg_reseal_on_txs: "all".into(),
+			arg_reseal_min_period: 4000u64,
+			arg_reseal_max_period: 60000u64,
 			flag_reseal_on_uncle: false,
-			flag_work_queue_size: 20usize,
-			flag_tx_gas_limit: Some("6283184".into()),
-			flag_tx_time_limit: Some(100u64),
-			flag_relay_set: "cheap".into(),
-			flag_min_gas_price: Some(0u64),
-			flag_usd_per_tx: "0.0025".into(),
-			flag_usd_per_eth: "auto".into(),
-			flag_price_update_period: "hourly".into(),
-			flag_gas_floor_target: "4700000".into(),
-			flag_gas_cap: "6283184".into(),
-			flag_extra_data: Some("Parity".into()),
-			flag_tx_queue_size: 8192usize,
-			flag_tx_queue_mem_limit: 2u32,
-			flag_tx_queue_gas: "off".into(),
-			flag_tx_queue_strategy: "gas_factor".into(),
-			flag_tx_queue_ban_count: 1u16,
-			flag_tx_queue_ban_time: 180u16,
+			arg_work_queue_size: 20usize,
+			arg_tx_gas_limit: Some("6283184".into()),
+			arg_tx_time_limit: Some(100u64),
+			arg_relay_set: "cheap".into(),
+			arg_min_gas_price: Some(0u64),
+			arg_usd_per_tx: "0.0001".into(),
+			arg_gas_price_percentile: 50usize,
+			arg_usd_per_eth: "auto".into(),
+			arg_price_update_period: "hourly".into(),
+			arg_gas_floor_target: "4700000".into(),
+			arg_gas_cap: "6283184".into(),
+			arg_extra_data: Some("Parity".into()),
+			arg_tx_queue_size: 8192usize,
+			arg_tx_queue_mem_limit: 2u32,
+			arg_tx_queue_gas: "off".into(),
+			arg_tx_queue_strategy: "gas_factor".into(),
+			arg_tx_queue_ban_count: 1u16,
+			arg_tx_queue_ban_time: 180u16,
 			flag_remove_solved: false,
-			flag_notify_work: Some("http://localhost:3001".into()),
+			arg_notify_work: Some("http://localhost:3001".into()),
 			flag_refuse_service_transactions: false,
+			flag_infinite_pending_block: false,
 
 			flag_stratum: false,
-			flag_stratum_interface: "local".to_owned(),
-			flag_stratum_port: 8008u16,
-			flag_stratum_secret: None,
+			arg_stratum_interface: "local".to_owned(),
+			arg_stratum_port: 8008u16,
+			arg_stratum_secret: None,
 
 			// -- Footprint Options
-			flag_tracing: "auto".into(),
-			flag_pruning: "auto".into(),
-			flag_pruning_history: 64u64,
-			flag_pruning_memory: 500usize,
-			flag_cache_size_db: 64u32,
-			flag_cache_size_blocks: 8u32,
-			flag_cache_size_queue: 50u32,
-			flag_cache_size_state: 25u32,
-			flag_cache_size: Some(128),
+			arg_tracing: "auto".into(),
+			arg_pruning: "auto".into(),
+			arg_pruning_history: 64u64,
+			arg_pruning_memory: 500usize,
+			arg_cache_size_db: 64u32,
+			arg_cache_size_blocks: 8u32,
+			arg_cache_size_queue: 50u32,
+			arg_cache_size_state: 25u32,
+			arg_cache_size: Some(128),
 			flag_fast_and_loose: false,
-			flag_db_compaction: "ssd".into(),
-			flag_fat_db: "auto".into(),
+			arg_db_compaction: "ssd".into(),
+			arg_fat_db: "auto".into(),
 			flag_scale_verifiers: true,
-			flag_num_verifiers: Some(6),
+			arg_num_verifiers: Some(6),
 
 			// -- Import/Export Options
-			flag_from: "1".into(),
-			flag_to: "latest".into(),
-			flag_format: None,
+			arg_export_blocks_from: "1".into(),
+			arg_export_blocks_to: "latest".into(),
 			flag_no_seal_check: false,
-			flag_no_code: false,
-			flag_no_storage: false,
-			flag_min_balance: None,
-			flag_max_balance: None,
+			flag_export_state_no_code: false,
+			flag_export_state_no_storage: false,
+			arg_export_state_min_balance: None,
+			arg_export_state_max_balance: None,
 
 			// -- Snapshot Optons
-			flag_at: "latest".into(),
+			arg_export_state_at: "latest".into(),
+			arg_snapshot_at: "latest".into(),
 			flag_no_periodic_snapshot: false,
 
 			// -- Virtual Machine Options
@@ -888,49 +1618,52 @@ mod tests {
 
 			// -- Whisper options.
 			flag_whisper: false,
-			flag_whisper_pool_size: 20,
+			arg_whisper_pool_size: 20,
 
 			// -- Legacy Options
+			flag_warp: false,
 			flag_geth: false,
 			flag_testnet: false,
 			flag_import_geth_keys: false,
-			flag_datadir: None,
-			flag_networkid: None,
-			flag_peers: None,
-			flag_nodekey: None,
+			arg_datadir: None,
+			arg_networkid: None,
+			arg_peers: None,
+			arg_nodekey: None,
 			flag_nodiscover: false,
 			flag_jsonrpc: false,
 			flag_jsonrpc_off: false,
 			flag_webapp: false,
 			flag_dapps_off: false,
 			flag_rpc: false,
-			flag_rpcaddr: None,
-			flag_rpcport: None,
-			flag_rpcapi: None,
-			flag_rpccorsdomain: None,
+			arg_rpcaddr: None,
+			arg_rpcport: None,
+			arg_rpcapi: None,
+			arg_rpccorsdomain: None,
 			flag_ipcdisable: false,
 			flag_ipc_off: false,
-			flag_ipcapi: None,
-			flag_ipcpath: None,
-			flag_gasprice: None,
-			flag_etherbase: None,
-			flag_extradata: None,
-			flag_cache: None,
-			flag_warp: Some(true),
+			arg_ipcapi: None,
+			arg_ipcpath: None,
+			arg_gasprice: None,
+			arg_etherbase: None,
+			arg_extradata: None,
+			arg_cache: None,
 			// Legacy-Dapps
-			flag_dapps_port: Some(8080),
-			flag_dapps_interface: Some("local".into()),
-			flag_dapps_hosts: Some("none".into()),
-			flag_dapps_cors: None,
-			flag_dapps_user: Some("test_user".into()),
-			flag_dapps_pass: Some("test_pass".into()),
-			flag_dapps_apis_all: None,
+			arg_dapps_port: Some(8080),
+			arg_dapps_interface: Some("local".into()),
+			arg_dapps_hosts: Some("none".into()),
+			arg_dapps_cors: None,
+			arg_dapps_user: Some("test_user".into()),
+			arg_dapps_pass: Some("test_pass".into()),
+			flag_dapps_apis_all: false,
+
+			// -- Internal Options
+			flag_can_restart: false,
 
 			// -- Miscellaneous Options
-			flag_ntp_servers: "0.parity.pool.ntp.org:123,1.parity.pool.ntp.org:123,2.parity.pool.ntp.org:123,3.parity.pool.ntp.org:123".into(),
+			arg_ntp_servers: "0.parity.pool.ntp.org:123,1.parity.pool.ntp.org:123,2.parity.pool.ntp.org:123,3.parity.pool.ntp.org:123".into(),
 			flag_version: false,
-			flag_logging: Some("own_tx=trace".into()),
-			flag_log_file: Some("/var/log/parity.log".into()),
+			arg_logging: Some("own_tx=trace".into()),
+			arg_log_file: Some("/var/log/parity.log".into()),
 			flag_no_color: false,
 			flag_no_config: false,
 		});
@@ -938,21 +1671,27 @@ mod tests {
 
 	#[test]
 	fn should_parse_config_and_return_errors() {
-		let config1 = Args::parse_config(include_str!("./config.invalid1.toml"));
-		let config2 = Args::parse_config(include_str!("./config.invalid2.toml"));
-		let config3 = Args::parse_config(include_str!("./config.invalid3.toml"));
-
-		match (config1, config2, config3) {
-			(Err(ArgsError::Decode(_)), Err(ArgsError::Decode(_)), Err(ArgsError::Decode(_))) => {},
-			(a, b, c) => {
-				assert!(false, "Got invalid error types: {:?}, {:?}, {:?}", a, b, c);
+		let config1 = Args::parse_config(include_str!("./tests/config.invalid1.toml"));
+		let config2 = Args::parse_config(include_str!("./tests/config.invalid2.toml"));
+		let config3 = Args::parse_config(include_str!("./tests/config.invalid3.toml"));
+		let config4 = Args::parse_config(include_str!("./tests/config.invalid4.toml"));
+
+		match (config1, config2, config3, config4) {
+			(
+				Err(ArgsError::Decode(_)),
+				Err(ArgsError::Decode(_)),
+				Err(ArgsError::Decode(_)),
+				Err(ArgsError::Decode(_)),
+			) => {},
+			(a, b, c, d) => {
+				assert!(false, "Got invalid error types: {:?}, {:?}, {:?}, {:?}", a, b, c, d);
 			}
 		}
 	}
 
 	#[test]
 	fn should_deserialize_toml_file() {
-		let config: Config = toml::from_str(include_str!("./config.toml")).unwrap();
+		let config: Config = toml::from_str(include_str!("./tests/config.toml")).unwrap();
 
 		assert_eq!(config, Config {
 			parity: Some(Operating {
@@ -970,12 +1709,14 @@ mod tests {
 				keys_path: None,
 				identity: None,
 				light: None,
+				no_hardcoded_sync: None,
 				no_persistent_txqueue: None,
 			}),
 			account: Some(Account {
 				unlock: Some(vec!["0x1".into(), "0x2".into(), "0x3".into()]),
 				password: Some(vec!["passwdfile path".into()]),
 				keys_iterations: None,
+				refresh_time: None,
 				disable_hardware: None,
 				fast_unlock: None,
 			}),
@@ -1041,7 +1782,10 @@ mod tests {
 				disable: None,
 				disable_http: None,
 				disable_acl_check: None,
+				disable_auto_migrate: None,
+				service_contract: None,
 				self_secret: None,
+				admin_public: None,
 				nodes: None,
 				interface: None,
 				port: Some(8083),
@@ -1067,6 +1811,7 @@ mod tests {
 				work_queue_size: None,
 				relay_set: None,
 				min_gas_price: None,
+				gas_price_percentile: None,
 				usd_per_tx: None,
 				usd_per_eth: None,
 				price_update_period: Some("hourly".into()),
@@ -1084,6 +1829,7 @@ mod tests {
 				remove_solved: None,
 				notify_work: None,
 				refuse_service_transactions: None,
+				infinite_pending_block: None,
 			}),
 			footprint: Some(Footprint {
 				tracing: Some("on".into()),
@@ -1092,7 +1838,7 @@ mod tests {
 				pruning_memory: None,
 				fast_and_loose: None,
 				cache_size: None,
-				cache_size_db: Some(128),
+				cache_size_db: Some(256),
 				cache_size_blocks: Some(16),
 				cache_size_queue: Some(100),
 				cache_size_state: Some(25),
diff --git a/parity/cli/presets/config.dev-insecure.toml b/parity/cli/presets/config.dev-insecure.toml
index 3a9956f8e3a43bd408ad714e1f7e0804c5b02068..e4c2c9f4769ef57ecb2d415ac10f609f0ea3a983 100644
--- a/parity/cli/presets/config.dev-insecure.toml
+++ b/parity/cli/presets/config.dev-insecure.toml
@@ -13,4 +13,4 @@ hosts = ["all"]
 
 [ipfs]
 enable = false # this is the default
-hosts = ["all"]
\ No newline at end of file
+hosts = ["all"]
diff --git a/parity/cli/presets/config.dev.toml b/parity/cli/presets/config.dev.toml
index f38e17348e6d669296cb3b3cb6a14b1c39960a3f..4fc0874c51c7c16feae931caaa3ccda5fced11c1 100644
--- a/parity/cli/presets/config.dev.toml
+++ b/parity/cli/presets/config.dev.toml
@@ -3,4 +3,4 @@ chain = "dev"
 
 [mining]
 reseal_min_period = 0
-min_gas_price = 0
\ No newline at end of file
+min_gas_price = 0
diff --git a/parity/cli/presets/config.insecure.toml b/parity/cli/presets/config.insecure.toml
index 6e67db3d738e77c98c1d72e99d4683e0f3012859..18859c9cc1fea66ce605af38730222350aae3caf 100644
--- a/parity/cli/presets/config.insecure.toml
+++ b/parity/cli/presets/config.insecure.toml
@@ -8,4 +8,4 @@ hosts = ["all"]
 
 [ipfs]
 enable = false # this is the default
-hosts = ["all"]
\ No newline at end of file
+hosts = ["all"]
diff --git a/parity/cli/presets/config.mining.toml b/parity/cli/presets/config.mining.toml
index 52e00494235ea658043efa2817d35e27b0ddd6e4..f6c39bdd6df6c6adaa7f0c4047eade50e695769c 100644
--- a/parity/cli/presets/config.mining.toml
+++ b/parity/cli/presets/config.mining.toml
@@ -28,4 +28,4 @@ cache_size = 256
 
 [misc]
 # Logging pattern (`<module>=<level>`, e.g. `own_tx=trace`).
-logging = "miner=trace,own_tx=trace"
\ No newline at end of file
+logging = "miner=trace,own_tx=trace"
diff --git a/parity/cli/presets/config.non-standard-ports.toml b/parity/cli/presets/config.non-standard-ports.toml
index e4013ff94ec84fadd1cb858a72f53172a9e944e9..5c522d8679523d20f7fbaa17c6f71a26a2575f8f 100644
--- a/parity/cli/presets/config.non-standard-ports.toml
+++ b/parity/cli/presets/config.non-standard-ports.toml
@@ -4,4 +4,4 @@ port = 30305
 
 [rpc]
 # JSON-RPC over HTTP will be accessible on port 8645.
-port = 8645
\ No newline at end of file
+port = 8645
diff --git a/parity/cli/config.full.toml b/parity/cli/tests/config.full.toml
similarity index 96%
rename from parity/cli/config.full.toml
rename to parity/cli/tests/config.full.toml
index a49717085b9f64d926ec3da3bad5386ebf248c76..88a91e263bcca6f4c643128d06b74a980405f2c2 100644
--- a/parity/cli/config.full.toml
+++ b/parity/cli/tests/config.full.toml
@@ -49,7 +49,7 @@ reserved_peers = "./path_to_file"
 disable = false
 port = 8545
 interface = "local"
-cors = "null"
+cors = ["null"]
 apis = ["web3", "eth", "net", "parity", "traces", "rpc", "secretstore"]
 hosts = ["none"]
 
@@ -76,10 +76,11 @@ path = "$HOME/.parity/dapps"
 user = "test_user"
 pass = "test_pass"
 
-[secretstore]	
+[secretstore]
 disable = false
 disable_http = false
 disable_acl_check = false
+service_contract = "none"
 nodes = []
 http_interface = "local"
 http_port = 8082
@@ -91,7 +92,7 @@ path = "$HOME/.parity/secretstore"
 enable = false
 port = 5001
 interface = "local"
-cors = "null"
+cors = ["null"]
 hosts = ["none"]
 
 [mining]
@@ -104,7 +105,7 @@ reseal_max_period = 60000
 work_queue_size = 20
 relay_set = "cheap"
 min_gas_price = 0
-usd_per_tx = "0.0025"
+usd_per_tx = "0.0001"
 usd_per_eth = "auto"
 price_update_period = "hourly"
 gas_floor_target = "4700000"
diff --git a/parity/cli/config.invalid1.toml b/parity/cli/tests/config.invalid1.toml
similarity index 100%
rename from parity/cli/config.invalid1.toml
rename to parity/cli/tests/config.invalid1.toml
diff --git a/parity/cli/config.invalid2.toml b/parity/cli/tests/config.invalid2.toml
similarity index 100%
rename from parity/cli/config.invalid2.toml
rename to parity/cli/tests/config.invalid2.toml
diff --git a/parity/cli/config.invalid3.toml b/parity/cli/tests/config.invalid3.toml
similarity index 100%
rename from parity/cli/config.invalid3.toml
rename to parity/cli/tests/config.invalid3.toml
diff --git a/parity/cli/tests/config.invalid4.toml b/parity/cli/tests/config.invalid4.toml
new file mode 100644
index 0000000000000000000000000000000000000000..a5429b2baa80239c93736eea9801ecd01bd3f81d
--- /dev/null
+++ b/parity/cli/tests/config.invalid4.toml
@@ -0,0 +1,2 @@
+[account]
+invalid = 5
diff --git a/parity/cli/config.toml b/parity/cli/tests/config.toml
similarity index 98%
rename from parity/cli/config.toml
rename to parity/cli/tests/config.toml
index 08da653de0d0f5b33ab4e614ebd8021bc0b7d10e..abdf3e0c799a511fc1f392566e6ce75c9a68f1b7 100644
--- a/parity/cli/config.toml
+++ b/parity/cli/tests/config.toml
@@ -63,7 +63,7 @@ tx_queue_gas = "off"
 tracing = "on"
 pruning = "fast"
 pruning_history = 64
-cache_size_db = 128
+cache_size_db = 256
 cache_size_blocks = 16
 cache_size_queue = 100
 cache_size_state = 25
diff --git a/parity/cli/usage.rs b/parity/cli/usage.rs
index 182efca921e5bb19d253f3e127493b14ce4c2d31..2dabc8378c10b3e8ae12601fe0461140f325a3f5 100644
--- a/parity/cli/usage.rs
+++ b/parity/cli/usage.rs
@@ -21,44 +21,144 @@ macro_rules! println_stderr(
     } }
 );
 
-macro_rules! otry {
-	($e: expr) => (
+macro_rules! return_if_parse_error {
+	($e:expr) => (
 		match $e {
-			Some(ref v) => v,
-			None => {
-				return None;
-			}
+			Err(clap_error @ ClapError { kind: ClapErrorKind::ValueValidation, .. }) => {
+				return Err(clap_error);
+			},
+
+			// Otherwise, if $e is ClapErrorKind::ArgumentNotFound or Ok(),
+			// then convert to Option
+			_ => $e.ok()
 		}
 	)
 }
+
+macro_rules! if_option {
+	(Option<$type:ty>, THEN {$($then:tt)*} ELSE {$($otherwise:tt)*}) => (
+		$($then)*
+	);
+	($type:ty, THEN {$($then:tt)*} ELSE {$($otherwise:tt)*}) => (
+		$($otherwise)*
+	);
+}
+
+macro_rules! if_vec {
+	(Vec<$type:ty>, THEN {$($then:tt)*} ELSE {$($otherwise:tt)*}) => (
+		$($then)*
+	);
+	($type:ty, THEN {$($then:tt)*} ELSE {$($otherwise:tt)*}) => (
+		$($otherwise)*
+	);
+}
+
+macro_rules! if_option_vec {
+	(Option<Vec<String>>, THEN {$then:expr} ELSE {$otherwise:expr}) => (
+		$then
+	);
+	(Option<$type:ty>, THEN {$then:expr} ELSE {$otherwise:expr}) => (
+		$otherwise
+	);
+}
+
+macro_rules! inner_option_type {
+	(Option<$type:ty>) => (
+		$type
+	)
+}
+
+macro_rules! inner_vec_type {
+	(Vec<$type:ty>) => (
+		$type
+	)
+}
+
+macro_rules! inner_option_vec_type {
+	(Option<Vec<String>>) => (
+		String
+	)
+}
+
+macro_rules! usage_with_ident {
+	($name:expr, $usage:expr, $help:expr) => (
+		if $usage.contains("<") {
+			format!("<{}> {} '{}'",$name, $usage, $help)
+		} else {
+			format!("[{}] {} '{}'",$name, $usage, $help)
+		}
+	);
+}
+
+macro_rules! underscore_to_hyphen {
+	($e:expr) => (
+		str::replace($e, "_", "-")
+	)
+}
+
 macro_rules! usage {
 	(
 		{
 			$(
-				$field_a:ident : $typ_a:ty,
-			)*
-		}
-		{
-			$(
-				$field:ident : $typ:ty = $default:expr, or $from_config:expr,
+				CMD $subc:ident
+				{
+					$subc_help:expr,
+
+					$(
+						CMD $subc_subc:ident
+						{
+							$subc_subc_help:expr,
+							$(
+								FLAG $subc_subc_flag:ident : (bool) = false, $subc_subc_flag_usage:expr, $subc_subc_flag_help:expr,
+							)*
+							$(
+								ARG $subc_subc_arg:ident : ($($subc_subc_arg_type_tt:tt)+) = $subc_subc_arg_default:expr, $subc_subc_arg_usage:expr, $subc_subc_arg_help:expr,
+							)*
+						}
+					)*
+
+					$(
+						FLAG $subc_flag:ident : (bool) = false, $subc_flag_usage:expr, $subc_flag_help:expr,
+					)*
+					$(
+						ARG $subc_arg:ident : ($($subc_arg_type_tt:tt)+) = $subc_arg_default:expr, $subc_arg_usage:expr, $subc_arg_help:expr,
+					)*
+				}
 			)*
 		}
 		{
 			$(
-				$field_s:ident : $typ_s:ty, display $default_s:expr, or $from_config_s:expr,
+			[$group_name:expr]
+				$(
+					FLAG $flag:ident : (bool) = false, or $flag_from_config:expr, $flag_usage:expr, $flag_help:expr,
+				)*
+				$(
+					ARG $arg:ident : ($($arg_type_tt:tt)+) = $arg_default:expr, or $arg_from_config:expr, $arg_usage:expr, $arg_help:expr,
+				)*
 			)*
 		}
 	) => {
 		use toml;
-		use std::{fs, io, process};
+		use std::{fs, io, process, cmp};
 		use std::io::{Read, Write};
-		use util::version;
-		use docopt::{Docopt, Error as DocoptError};
-		use helpers::replace_home;
+		use parity_version::version;
+		use clap::{Arg, App, SubCommand, AppSettings, ArgSettings, Error as ClapError, ErrorKind as ClapErrorKind};
+		use dir::helpers::replace_home;
+		use std::ffi::OsStr;
+		use std::collections::HashMap;
+
+		extern crate textwrap;
+		extern crate term_size;
+		use self::textwrap::{Wrapper};
+
+		const MAX_TERM_WIDTH: usize = 120;
+
+		#[cfg(test)]
+		use regex::Regex;
 
 		#[derive(Debug)]
 		pub enum ArgsError {
-			Docopt(DocoptError),
+			Clap(ClapError),
 			Decode(toml::de::Error),
 			Config(String, io::Error),
 		}
@@ -66,7 +166,7 @@ macro_rules! usage {
 		impl ArgsError {
 			pub fn exit(self) -> ! {
 				match self {
-					ArgsError::Docopt(e) => e.exit(),
+					ArgsError::Clap(e) => e.exit(),
 					ArgsError::Decode(e) => {
 						println_stderr!("You might have supplied invalid parameters in config file.");
 						println_stderr!("{}", e);
@@ -81,9 +181,9 @@ macro_rules! usage {
 			}
 		}
 
-		impl From<DocoptError> for ArgsError {
-			fn from(e: DocoptError) -> Self {
-				ArgsError::Docopt(e)
+		impl From<ClapError> for ArgsError {
+			fn from(e: ClapError) -> Self {
+				ArgsError::Clap(e)
 			}
 		}
 
@@ -96,15 +196,33 @@ macro_rules! usage {
 		#[derive(Debug, PartialEq)]
 		pub struct Args {
 			$(
-				pub $field_a: $typ_a,
-			)*
+				pub $subc: bool,
 
-			$(
-				pub $field: $typ,
+				$(
+					pub $subc_subc: bool,
+					$(
+						pub $subc_subc_flag: bool,
+					)*
+					$(
+						pub $subc_subc_arg: $($subc_subc_arg_type_tt)+,
+					)*
+				)*
+
+				$(
+					pub $subc_flag: bool,
+				)*
+				$(
+					pub $subc_arg: $($subc_arg_type_tt)+,
+				)*
 			)*
 
 			$(
-				pub $field_s: $typ_s,
+				$(
+					pub $flag: bool,
+				)*
+				$(
+					pub $arg: $($arg_type_tt)+,
+				)*
 			)*
 		}
 
@@ -112,15 +230,32 @@ macro_rules! usage {
 			fn default() -> Self {
 				Args {
 					$(
-						$field_a: Default::default(),
-					)*
+						$subc: Default::default(),
+						$(
+							$subc_subc: Default::default(),
+							$(
+								$subc_subc_flag: Default::default(),
+							)*
+							$(
+								$subc_subc_arg: Default::default(),
+							)*
+						)*
 
-					$(
-						$field: $default.into(),
+						$(
+							$subc_flag: Default::default(),
+						)*
+						$(
+							$subc_arg: Default::default(),
+						)*
 					)*
 
 					$(
-						$field_s: Default::default(),
+						$(
+							$flag: Default::default(),
+						)*
+						$(
+							$arg: Default::default(),
+						)*
 					)*
 				}
 			}
@@ -129,13 +264,46 @@ macro_rules! usage {
 		#[derive(Default, Debug, PartialEq, Clone, Deserialize)]
 		struct RawArgs {
 			$(
-				$field_a: $typ_a,
-			)*
-			$(
-				$field: Option<$typ>,
+				$subc: bool,
+
+				$(
+					$subc_subc: bool,
+					$(
+						$subc_subc_flag: bool,
+					)*
+					$(
+						$subc_subc_arg: if_option!(
+							$($subc_subc_arg_type_tt)+,
+							THEN { $($subc_subc_arg_type_tt)+ }
+							ELSE { Option<$($subc_subc_arg_type_tt)+> }
+						),
+					)*
+				)*
+
+				$(
+					$subc_flag: bool,
+				)*
+				$(
+					$subc_arg: if_option!(
+						$($subc_arg_type_tt)+,
+						THEN { $($subc_arg_type_tt)+ }
+						ELSE { Option<$($subc_arg_type_tt)+> }
+					),
+				)*
+
 			)*
 			$(
-				$field_s: Option<$typ_s>,
+				$(
+					$flag: bool,
+				)*
+
+				$(
+					$arg: if_option!(
+						$($arg_type_tt)+,
+						THEN { $($arg_type_tt)+ }
+						ELSE { Option<$($arg_type_tt)+> }
+					),
+				)*
 			)*
 		}
 
@@ -149,9 +317,9 @@ macro_rules! usage {
 					return Ok(raw_args.into_args(Config::default()));
 				}
 
-				let config_file = raw_args.flag_config.clone().unwrap_or_else(|| raw_args.clone().into_args(Config::default()).flag_config);
+				let config_file = raw_args.arg_config.clone().unwrap_or_else(|| raw_args.clone().into_args(Config::default()).arg_config);
 				let config_file = replace_home(&::dir::default_data_path(), &config_file);
-				match (fs::File::open(&config_file), raw_args.flag_config.clone()) {
+				match (fs::File::open(&config_file), raw_args.arg_config.clone()) {
 					// Load config file
 					(Ok(mut file), _) => {
 						println_stderr!("Loading config file from {}", &config_file);
@@ -178,7 +346,7 @@ macro_rules! usage {
 
 			#[cfg(test)]
 			fn parse_with_config<S: AsRef<str>>(command: &[S], config: Config) -> Result<Self, ArgsError> {
-				RawArgs::parse(command).map(|raw| raw.into_args(config)).map_err(ArgsError::Docopt)
+				RawArgs::parse(command).map(|raw| raw.into_args(config)).map_err(ArgsError::Clap)
 			}
 
 			fn parse_config(config: &str) -> Result<Config, ArgsError> {
@@ -188,41 +356,410 @@ macro_rules! usage {
 			pub fn print_version() -> String {
 				format!(include_str!("./version.txt"), version())
 			}
+
+			#[allow(unused_mut)] // subc_subc_exist may be assigned true by the macro
+			#[allow(unused_assignments)] // Rust issue #22630
+			pub fn print_help() -> String {
+
+				const TAB: &str = "    ";
+				const TAB_TAB: &str = "        ";
+
+				let term_width = match term_size::dimensions() {
+					None => MAX_TERM_WIDTH,
+					Some((w, _)) => {
+						cmp::min(w, MAX_TERM_WIDTH)
+					}
+				};
+
+				let mut help : String = include_str!("./usage_header.txt").to_owned();
+
+				help.push_str("\n");
+
+				// Subcommands
+				let mut subcommands_wrapper = Wrapper::new(term_width).subsequent_indent(TAB);
+				help.push_str("parity [options]\n");
+				$(
+					{
+						let mut subc_subc_exist = false;
+
+						$(
+							subc_subc_exist = true;
+							let subc_subc_usages : Vec<&str> = vec![
+								$(
+									concat!("[",$subc_subc_flag_usage,"]"),
+								)*
+								$(
+									$subc_subc_arg_usage,
+								)*
+							];
+
+							help.push_str(&subcommands_wrapper.fill(
+								format!(
+									"parity [options] {} {} {}\n",
+									underscore_to_hyphen!(&stringify!($subc)[4..]),
+									underscore_to_hyphen!(&stringify!($subc_subc)[stringify!($subc).len()+1..]),
+									subc_subc_usages.join(" ")
+								).as_ref())
+							);
+						)*
+
+						// Print the subcommand on its own only if it has no subsubcommands
+						if !subc_subc_exist {
+							let subc_usages : Vec<&str> = vec![
+								$(
+									concat!("[",$subc_flag_usage,"]"),
+								)*
+								$(
+									$subc_arg_usage,
+								)*
+							];
+
+							help.push_str(&subcommands_wrapper.fill(
+								format!(
+									"parity [options] {} {}\n",
+									underscore_to_hyphen!(&stringify!($subc)[4..]),
+									subc_usages.join(" ")
+								).as_ref())
+							);
+						}
+					}
+				)*
+
+				help.push_str("\n");
+
+				// Arguments and flags
+				let args_wrapper = Wrapper::new(term_width).initial_indent(TAB_TAB).subsequent_indent(TAB_TAB);
+				$(
+					help.push_str($group_name); help.push_str(":\n");
+
+					$(
+						help.push_str(&format!("{}{}\n{}\n",
+							TAB, $flag_usage,
+							args_wrapper.fill($flag_help)
+						));
+						help.push_str("\n");
+					)*
+
+					$(
+						if_option!(
+							$($arg_type_tt)+,
+							THEN {
+								if_option_vec!(
+									$($arg_type_tt)+,
+									THEN {
+										help.push_str(&format!("{}{}\n{}\n",
+											TAB, $arg_usage,
+											args_wrapper.fill(format!(
+												"{} (default: {:?})",
+												$arg_help,
+												{let x : inner_option_type!($($arg_type_tt)+)> = $arg_default; x}
+											).as_ref())
+										))
+									}
+									ELSE {
+										help.push_str(&format!("{}{}\n{}\n",
+											TAB, $arg_usage,
+											args_wrapper.fill(format!(
+												"{}{}",
+												$arg_help,
+												$arg_default.map(|x: inner_option_type!($($arg_type_tt)+)| format!(" (default: {})",x)).unwrap_or("".to_owned())
+											).as_ref())
+										))
+									}
+								)
+							}
+							ELSE {
+								if_vec!(
+									$($arg_type_tt)+,
+									THEN {
+										help.push_str(&format!("{}{}\n{}\n", TAB, $arg_usage,
+											args_wrapper.fill(format!(
+												"{} (default: {:?})",
+												$arg_help,
+												{let x : $($arg_type_tt)+ = $arg_default; x}
+											).as_ref())
+										))
+									}
+									ELSE {
+										help.push_str(&format!("{}{}\n{}\n", TAB, $arg_usage,
+											args_wrapper.fill(format!(
+												"{} (default: {})",
+												$arg_help,
+												$arg_default
+											).as_ref())
+										))
+									}
+								)
+							}
+						);
+						help.push_str("\n");
+					)*
+
+				)*
+
+				help
+			}
 		}
 
 		impl RawArgs {
 			fn into_args(self, config: Config) -> Args {
 				let mut args = Args::default();
 				$(
-					args.$field_a = self.$field_a;
-				)*
-				$(
-					args.$field = self.$field.or_else(|| $from_config(&config)).unwrap_or_else(|| $default.into());
+					args.$subc = self.$subc;
+
+					$(
+						args.$subc_subc = self.$subc_subc;
+						$(
+							args.$subc_subc_flag = self.$subc_subc_flag;
+						)*
+						$(
+							args.$subc_subc_arg = if_option!(
+								$($subc_subc_arg_type_tt)+,
+								THEN { self.$subc_subc_arg.or($subc_subc_arg_default) }
+								ELSE { self.$subc_subc_arg.unwrap_or($subc_subc_arg_default.into()) }
+							);
+						)*
+					)*
+
+					$(
+						args.$subc_flag = self.$subc_flag;
+					)*
+					$(
+						args.$subc_arg = if_option!(
+							$($subc_arg_type_tt)+,
+							THEN { self.$subc_arg.or($subc_arg_default) }
+							ELSE { self.$subc_arg.unwrap_or($subc_arg_default.into()) }
+						);
+					)*
 				)*
+
 				$(
-					args.$field_s = self.$field_s.or_else(|| $from_config_s(&config)).unwrap_or(None);
+					$(
+						args.$flag = self.$flag || $flag_from_config(&config).unwrap_or(false);
+					)*
+					$(
+						args.$arg = if_option!(
+							$($arg_type_tt)+,
+							THEN { self.$arg.or_else(|| $arg_from_config(&config)).or_else(|| $arg_default.into()) }
+							ELSE { self.$arg.or_else(|| $arg_from_config(&config)).unwrap_or_else(|| $arg_default.into()) }
+						);
+					)*
 				)*
 				args
 			}
 
-			pub fn parse<S: AsRef<str>>(command: &[S]) -> Result<Self, DocoptError> {
-				Docopt::new(Self::usage()).and_then(|d| d.argv(command).deserialize())
+			#[allow(unused_variables)] // the submatches of arg-less subcommands aren't used
+			pub fn parse<S: AsRef<str>>(command: &[S]) -> Result<Self, ClapError> {
+
+				let usages = vec![
+					$(
+						$(
+							usage_with_ident!(stringify!($arg), $arg_usage, $arg_help),
+						)*
+						$(
+							usage_with_ident!(stringify!($flag), $flag_usage, $flag_help),
+						)*
+					)*
+				];
+
+				// Hash of subc|subc_subc => Vec<String>
+				let mut subc_usages = HashMap::new();
+				$(
+					{
+						let this_subc_usages = vec![
+							$(
+								usage_with_ident!(stringify!($subc_flag), $subc_flag_usage, $subc_flag_help),
+							)*
+							$(
+								usage_with_ident!(stringify!($subc_arg), $subc_arg_usage, $subc_arg_help),
+							)*
+						];
+
+						subc_usages.insert(stringify!($subc),this_subc_usages);
+
+						$(
+							{
+								let this_subc_subc_usages = vec![
+									$(
+										usage_with_ident!(stringify!($subc_subc_flag), $subc_subc_flag_usage, $subc_subc_flag_help),
+									)*
+									$(
+										usage_with_ident!(stringify!($subc_subc_arg), $subc_subc_arg_usage, $subc_subc_arg_help),
+									)*
+								];
+
+								subc_usages.insert(stringify!($subc_subc), this_subc_subc_usages);
+							}
+						)*
+					}
+				)*
+
+				let matches = App::new("Parity")
+				    	.global_setting(AppSettings::VersionlessSubcommands)
+						.global_setting(AppSettings::DisableHelpSubcommand)
+						.max_term_width(MAX_TERM_WIDTH)
+						.help(Args::print_help().as_ref())
+						.args(&usages.iter().map(|u| {
+							let mut arg = Arg::from_usage(u)
+								.allow_hyphen_values(true) // Allow for example --allow-ips -10.0.0.0/8
+								.global(true) // Argument doesn't have to come before the first subcommand
+								.hidden(true); // Hide global arguments from the (subcommand) help messages generated by Clap
+
+							if arg.is_set(ArgSettings::Multiple) {
+								arg = arg.require_delimiter(true); // Multiple values can only be separated by commas, not spaces (#7428)
+							}
+
+							arg
+						}).collect::<Vec<Arg>>())
+						$(
+							.subcommand(
+								SubCommand::with_name(&underscore_to_hyphen!(&stringify!($subc)[4..]))
+								.about($subc_help)
+								.args(&subc_usages.get(stringify!($subc)).unwrap().iter().map(|u| Arg::from_usage(u).use_delimiter(false).allow_hyphen_values(true)).collect::<Vec<Arg>>())
+								$(
+									.setting(AppSettings::SubcommandRequired) // prevent from running `parity account`
+									.subcommand(
+										SubCommand::with_name(&underscore_to_hyphen!(&stringify!($subc_subc)[stringify!($subc).len()+1..]))
+										.about($subc_subc_help)
+										.args(&subc_usages.get(stringify!($subc_subc)).unwrap().iter().map(|u| Arg::from_usage(u).use_delimiter(false).allow_hyphen_values(true)).collect::<Vec<Arg>>())
+									)
+								)*
+							)
+						)*
+						.get_matches_from_safe(command.iter().map(|x| OsStr::new(x.as_ref())))?;
+
+				let mut raw_args : RawArgs = Default::default();
+
+				// Globals
+				$(
+					$(
+						raw_args.$flag = raw_args.$flag || matches.is_present(stringify!($flag));
+					)*
+					$(
+						if let some @ Some(_) = return_if_parse_error!(if_option!(
+							$($arg_type_tt)+,
+							THEN {
+								if_option_vec!(
+									$($arg_type_tt)+,
+									THEN { values_t!(matches, stringify!($arg), inner_option_vec_type!($($arg_type_tt)+)) }
+									ELSE { value_t!(matches, stringify!($arg), inner_option_type!($($arg_type_tt)+)) }
+								)
+							}
+							ELSE {
+								if_vec!(
+									$($arg_type_tt)+,
+									THEN { values_t!(matches, stringify!($arg), inner_vec_type!($($arg_type_tt)+)) }
+									ELSE { value_t!(matches, stringify!($arg), $($arg_type_tt)+) }
+								)
+							}
+						)) {
+							raw_args.$arg = some;
+						}
+					)*
+				)*
+
+				// Subcommands
+				$(
+					if let Some(submatches) = matches.subcommand_matches(&underscore_to_hyphen!(&stringify!($subc)[4..])) {
+						raw_args.$subc = true;
+
+						// Subcommand flags
+						$(
+							raw_args.$subc_flag = submatches.is_present(&stringify!($subc_flag));
+						)*
+						// Subcommand arguments
+						$(
+							raw_args.$subc_arg = return_if_parse_error!(if_option!(
+										$($subc_arg_type_tt)+,
+										THEN {
+											if_option_vec!(
+												$($subc_arg_type_tt)+,
+												THEN { values_t!(submatches, stringify!($subc_arg), inner_option_vec_type!($($subc_arg_type_tt)+)) }
+												ELSE { value_t!(submatches, stringify!($subc_arg), inner_option_type!($($subc_arg_type_tt)+)) }
+											)
+										}
+										ELSE {
+											if_vec!(
+												$($subc_arg_type_tt)+,
+												THEN { values_t!(submatches, stringify!($subc_arg), inner_vec_type!($($subc_arg_type_tt)+)) }
+												ELSE { value_t!(submatches, stringify!($subc_arg), $($subc_arg_type_tt)+) }
+											)
+										}
+							));
+						)*
+						// Sub-subcommands
+						$(
+							if let Some(subsubmatches) = submatches.subcommand_matches(&underscore_to_hyphen!(&stringify!($subc_subc)[stringify!($subc).len()+1..])) {
+								raw_args.$subc_subc = true;
+
+								// Sub-subcommand flags
+								$(
+									raw_args.$subc_subc_flag = subsubmatches.is_present(&stringify!($subc_subc_flag));
+								)*
+								// Sub-subcommand arguments
+								$(
+									raw_args.$subc_subc_arg = return_if_parse_error!(if_option!(
+										$($subc_subc_arg_type_tt)+,
+										THEN {
+											if_option_vec!(
+												$($subc_subc_arg_type_tt)+,
+												THEN { values_t!(subsubmatches, stringify!($subc_subc_arg), inner_option_vec_type!($($subc_subc_arg_type_tt)+)) }
+												ELSE { value_t!(subsubmatches, stringify!($subc_subc_arg), inner_option_type!($($subc_subc_arg_type_tt)+)) }
+											)
+										}
+										ELSE {
+											if_vec!(
+												$($subc_subc_arg_type_tt)+,
+												THEN { values_t!(subsubmatches, stringify!($subc_subc_arg), inner_vec_type!($($subc_subc_arg_type_tt)+)) }
+												ELSE { value_t!(subsubmatches, stringify!($subc_subc_arg), $($subc_subc_arg_type_tt)+) }
+											)
+										}
+									));
+								)*
+							}
+							else {
+								raw_args.$subc_subc = false;
+							}
+						)*
+					}
+					else {
+						raw_args.$subc = false;
+					}
+				)*
+
+				Ok(raw_args)
 			}
 
-			fn usage() -> String {
-				format!(
-					include_str!("./usage.txt"),
+		}
+
+		#[test]
+		fn usages_valid() {
+			let re = Regex::new(r"^(?:(-[a-zA-Z-]+, )?--[a-z-]+(=\[[a-zA-Z]+\](\.\.\.)?|=<[a-zA-Z]+>(\.\.\.)?)?)|(?:\[[a-zA-Z-]+\])(\.\.\.)?|(?:<[a-zA-Z-]+>)(\.\.\.)?$").unwrap();
+
+			let usages = vec![
+				$(
+					$(
+						$(
+							$subc_subc_arg_usage,
+						)*
+					)*
+					$(
+						$subc_arg_usage,
+					)*
+				)*
+				$(
 					$(
-						$field={ let v: $typ = $default.into(); v },
-						// Uncomment this to debug
-						// "named argument never used" error
-						// $field = $default,
+						$flag_usage,
 					)*
 					$(
-						$field_s = $default_s,
+						$arg_usage,
 					)*
-				)
+				)*
+			];
+
+			for usage in &usages {
+				assert!(re.is_match(usage));
 			}
 		}
-	};
+	}
 }
diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt
deleted file mode 100644
index dc1205ecf1e5a8e8149c9a4b669bca6b251a36b6..0000000000000000000000000000000000000000
--- a/parity/cli/usage.txt
+++ /dev/null
@@ -1,499 +0,0 @@
-Parity. Ethereum Client.
-  By Wood/Paronyan/Kotewicz/Drwięga/Volf et al.
-  Copyright 2015, 2016, 2017 Parity Technologies (UK) Ltd
-
-Usage:
-  parity [options]
-  parity ui [options]
-  parity dapp <path> [options]
-  parity daemon <pid-file> [options]
-  parity account (new | list ) [options]
-  parity account import <path>... [options]
-  parity wallet import <path> --password FILE [options]
-  parity import [ <file> ] [options]
-  parity export (blocks | state) [ <file> ] [options]
-  parity signer new-token [options]
-  parity signer list [options]
-  parity signer sign [ <id> ] [ --password FILE ] [options]
-  parity signer reject <id> [options]
-  parity snapshot <file> [options]
-  parity restore [ <file> ] [options]
-  parity tools hash <file>
-  parity db kill [options]
-
-Operating Options:
-  --mode MODE                      Set the operating mode. MODE can be one of:
-                                   last - Uses the last-used mode, active if none.
-                                   active - Parity continuously syncs the chain.
-                                   passive - Parity syncs initially, then sleeps and
-                                   wakes regularly to resync.
-                                   dark - Parity syncs only when the RPC is active.
-                                   offline - Parity doesn't sync. (default: {flag_mode}).
-  --mode-timeout SECS              Specify the number of seconds before inactivity
-                                   timeout occurs when mode is dark or passive
-                                   (default: {flag_mode_timeout}).
-  --mode-alarm SECS                Specify the number of seconds before auto sleep
-                                   reawake timeout occurs when mode is passive
-                                   (default: {flag_mode_alarm}).
-  --auto-update SET                Set a releases set to automatically update and
-                                   install.
-                                   all - All updates in the our release track.
-                                   critical - Only consensus/security updates.
-                                   none - No updates will be auto-installed.
-                                   (default: {flag_auto_update}).
-  --release-track TRACK            Set which release track we should use for updates.
-                                   stable - Stable releases.
-                                   beta - Beta releases.
-                                   nightly - Nightly releases (unstable).
-                                   testing - Testing releases (do not use).
-                                   current - Whatever track this executable was
-                                   released on (default: {flag_release_track}).
-  --public-node                    Start Parity as a public web server. Account storage
-                                   and transaction signing will be delegated to the UI.
-                                   (default: {flag_public_node}).
-  --no-download                    Normally new releases will be downloaded ready for
-                                   updating. This disables it. Not recommended.
-                                   (default: {flag_no_download}).
-  --no-consensus                   Force the binary to run even if there are known
-                                   issues regarding consensus. Not recommended.
-                                   (default: {flag_no_consensus}).
-  --force-direct                   Run the originally installed version of Parity,
-                                   ignoring any updates that have since been installed.
-  --chain CHAIN                    Specify the blockchain type. CHAIN may be either a
-                                   JSON chain specification file or olympic, frontier,
-                                   homestead, mainnet, morden, ropsten, classic, expanse,
-                                   testnet, kovan or dev (default: {flag_chain}).
-  -d --base-path PATH              Specify the base data storage path.
-                                   (default: {flag_base_path}).
-  --db-path PATH                   Specify the database directory path
-                                   (default: {flag_db_path}).
-  --keys-path PATH                 Specify the path for JSON key files to be found
-                                   (default: {flag_keys_path}).
-  --identity NAME                  Specify your node's name. (default: {flag_identity})
-  --light                          Experimental: run in light client mode. Light clients
-                                   synchronize a bare minimum of data and fetch necessary
-                                   data on-demand from the network. Much lower in storage,
-                                   potentially higher in bandwidth. Has no effect with
-                                   subcommands (default: {flag_light}).
-
-Convenience Options:
--c --config CONFIG                 Specify a configuration. CONFIG may be either a
-                                   configuration file or a preset: dev, insecure, dev-insecure,
-                                   mining, or non-standard-ports.
-                                   (default: {flag_config}).
-  --ports-shift SHIFT              Add SHIFT to all port numbers Parity is listening on.
-                                   Includes network port and all servers (RPC, WebSockets, UI, IPFS, SecretStore).
-                                   (default: {flag_ports_shift})
-  --unsafe-expose                  All servers will listen on external interfaces and will
-                                   be remotely accessible. It's equivalent with setting
-                                   the following: --{{ws,jsonrpc,ui,ipfs,secret_store,stratum}}-interface=all --*-hosts=all
-                                   This option is UNSAFE and should be used with great care!
-                                   (default: {flag_unsafe_expose})
-
-Account Options:
-  --unlock ACCOUNTS                Unlock ACCOUNTS for the duration of the execution.
-                                   ACCOUNTS is a comma-delimited list of addresses.
-                                   Implies --no-ui. (default: {flag_unlock:?})
-  --password FILE                  Provide a file containing a password for unlocking
-                                   an account. Leading and trailing whitespace is trimmed.
-                                   (default: {flag_password:?})
-  --keys-iterations NUM            Specify the number of iterations to use when
-                                   deriving key from the password (bigger is more
-                                   secure) (default: {flag_keys_iterations}).
-  --no-hardware-wallets            Disables hardware wallet support. (default: {flag_no_hardware_wallets})
-  --fast-unlock                    Use drasticly faster unlocking mode. This setting causes
-                                   raw secrets to be stored unprotected in memory,
-                                   so use with care. (default: {flag_fast_unlock})
-
-UI Options:
-  --force-ui                       Enable Trusted UI WebSocket endpoint,
-                                   even when --unlock is in use. (default: {flag_force_ui})
-  --no-ui                          Disable Trusted UI WebSocket endpoint.
-                                   (default: {flag_no_ui})
-  --ui-port PORT                   Specify the port of Trusted UI server
-                                   (default: {flag_ui_port}).
-  --ui-interface IP                Specify the hostname portion of the Trusted UI
-                                   server, IP should be an interface's IP address,
-                                   or local (default: {flag_ui_interface}).
-  --ui-hosts HOSTS                 List of allowed Host header values. This option will
-                                   validate the Host header sent by the browser, it
-                                   is additional security against some attack
-                                   vectors. Special options: "all", "none",
-                                   (default: {flag_ui_hosts}).
-  --ui-path PATH                   Specify directory where Trusted UIs tokens should
-                                   be stored. (default: {flag_ui_path})
-  --ui-no-validation               Disable Origin and Host headers validation for
-                                   Trusted UI. WARNING: INSECURE. Used only for
-                                   development. (default: {flag_ui_no_validation})
-
-Networking Options:
-  --no-warp                        Disable syncing from the snapshot over the network. (default: {flag_no_warp})
-  --port PORT                      Override the port on which the node should listen
-                                   (default: {flag_port}).
-  --min-peers NUM                  Try to maintain at least NUM peers (default: {flag_min_peers}).
-  --max-peers NUM                  Allow up to NUM peers (default: {flag_max_peers}).
-  --snapshot-peers NUM             Allow additional NUM peers for a snapshot sync
-                                   (default: {flag_snapshot_peers}).
-  --nat METHOD                     Specify method to use for determining public
-                                   address. Must be one of: any, none, upnp,
-                                   extip:<IP> (default: {flag_nat}).
-  --network-id INDEX               Override the network identifier from the chain we
-                                   are on. (default: {flag_network_id:?})
-  --bootnodes NODES                Override the bootnodes from our chain. NODES should
-                                   be comma-delimited enodes. (default: {flag_bootnodes:?})
-  --no-discovery                   Disable new peer discovery. (default: {flag_no_discovery})
-  --node-key KEY                   Specify node secret key, either as 64-character hex
-                                   string or input to SHA3 operation. (default: {flag_node_key:?})
-  --reserved-peers FILE            Provide a file containing enodes, one per line.
-                                   These nodes will always have a reserved slot on top
-                                   of the normal maximum peers. (default: {flag_reserved_peers:?})
-  --reserved-only                  Connect only to reserved nodes. (default: {flag_reserved_only})
-  --allow-ips FILTER               Filter outbound connections. FILTER can be one of:
-                                   private - connect to private network IP addresses only;
-                                   public - connect to public network IP addresses only;
-                                   all - connect to any IP address;
-                                   none - block all (for use with a custom filter as below);
-                                   a custom filter list in the format: "private ip_range1 -ip_range2 ...".
-                                   Where ip_range1 would be allowed and ip_range2 blocked;
-                                   Custom blocks ("-ip_range") override custom allows ("ip_range");
-                                   (default: {flag_allow_ips}).
-  --max-pending-peers NUM          Allow up to NUM pending connections. (default: {flag_max_pending_peers})
-  --no-ancient-blocks              Disable downloading old blocks after snapshot restoration
-                                   or warp sync. (default: {flag_no_ancient_blocks})
-  --no-serve-light                 Disable serving of light peers. (default: {flag_no_serve_light})
-
-API and Console Options:
-  --no-jsonrpc                     Disable the JSON-RPC API server. (default: {flag_no_jsonrpc})
-  --jsonrpc-port PORT              Specify the port portion of the JSONRPC API server
-                                   (default: {flag_jsonrpc_port}).
-  --jsonrpc-interface IP           Specify the hostname portion of the JSONRPC API
-                                   server, IP should be an interface's IP address, or
-                                   all (all interfaces) or local (default: {flag_jsonrpc_interface}).
-  --jsonrpc-cors URL               Specify CORS header for JSON-RPC API responses.
-                                   (default: {flag_jsonrpc_cors:?})
-  --jsonrpc-apis APIS              Specify the APIs available through the JSONRPC
-                                   interface. APIS is a comma-delimited list of API
-                                   name. Possible name are all, safe, web3, eth, net, personal,
-                                   parity, parity_set, traces, rpc, parity_accounts.
-                                   You can also disable a specific API by putting '-' in the front: all,-personal
-                                   (default: {flag_jsonrpc_apis}).
-  --jsonrpc-hosts HOSTS            List of allowed Host header values. This option will
-                                   validate the Host header sent by the browser, it
-                                   is additional security against some attack
-                                   vectors. Special options: "all", "none",
-                                   (default: {flag_jsonrpc_hosts}).
-  --jsonrpc-server-threads NUM     Enables experimental faster implementation of JSON-RPC server.
-                                   Requires Dapps server to be disabled
-                                   using --no-dapps. (default: {flag_jsonrpc_server_threads:?})
-  --jsonrpc-threads THREADS        Turn on additional processing threads in all RPC servers.
-                                   Setting this to non-zero value allows parallel cpu-heavy queries
-                                   execution. (default: {flag_jsonrpc_threads})
-
-  --no-ws                          Disable the WebSockets server. (default: {flag_no_ws})
-  --ws-port PORT                   Specify the port portion of the WebSockets server
-                                   (default: {flag_ws_port}).
-  --ws-interface IP                Specify the hostname portion of the WebSockets
-                                   server, IP should be an interface's IP address, or
-                                   all (all interfaces) or local (default: {flag_ws_interface}).
-  --ws-apis APIS                   Specify the APIs available through the WebSockets
-                                   interface. APIS is a comma-delimited list of API
-                                   name. Possible name are web3, eth, pubsub, net, personal,
-                                   parity, parity_set, traces, rpc, parity_accounts.
-                                   (default: {flag_ws_apis}).
-  --ws-origins URL                 Specify Origin header values allowed to connect.
-                                   Special options: "all", "none".
-                                   (default: {flag_ws_origins})
-  --ws-hosts HOSTS                 List of allowed Host header values. This option will
-                                   validate the Host header sent by the browser, it
-                                   is additional security against some attack
-                                   vectors. Special options: "all", "none",
-                                   (default: {flag_ws_hosts}).
-
-  --no-ipc                         Disable JSON-RPC over IPC service. (default: {flag_no_ipc})
-  --ipc-path PATH                  Specify custom path for JSON-RPC over IPC service
-                                   (default: {flag_ipc_path}).
-  --ipc-apis APIS                  Specify custom API set available via JSON-RPC over
-                                   IPC (default: {flag_ipc_apis}).
-
-  --no-dapps                       Disable the Dapps server (e.g. status page). (default: {flag_no_dapps})
-  --dapps-path PATH                Specify directory where dapps should be installed.
-                                   (default: {flag_dapps_path})
-  --ipfs-api                       Enable IPFS-compatible HTTP API. (default: {flag_ipfs_api})
-  --ipfs-api-port PORT             Configure on which port the IPFS HTTP API should listen.
-                                   (default: {flag_ipfs_api_port})
-  --ipfs-api-interface IP          Specify the hostname portion of the IPFS API server,
-                                   IP should be an interface's IP address or local.
-                                   (default: {flag_ipfs_api_interface})
-  --ipfs-api-cors URL              Specify CORS header for IPFS API responses.
-                                   (default: {flag_ipfs_api_cors:?})
-  --ipfs-api-hosts HOSTS           List of allowed Host header values. This option will
-                                   validate the Host header sent by the browser, it
-                                   is additional security against some attack
-                                   vectors. Special options: "all", "none"
-                                   (default: {flag_ipfs_api_hosts}).
-
-Secret Store Options:
-  --no-secretstore                 Disable Secret Store functionality. (default: {flag_no_secretstore})
-  --no-secretstore-http            Disable Secret Store HTTP API. (default: {flag_no_secretstore_http})
-  --no-acl-check                   Disable ACL check (useful for test environments). (default: {flag_no_secretstore_acl_check})
-  --secretstore-secret SECRET      Hex-encoded secret key of this node.
-                                   (required, default: {flag_secretstore_secret:?}).
-  --secretstore-nodes NODES        Comma-separated list of other secret store cluster nodes in form
-                                   NODE_PUBLIC_KEY_IN_HEX@NODE_IP_ADDR:NODE_PORT.
-                                   (required, default: {flag_secretstore_nodes}).
-  --secretstore-interface IP       Specify the hostname portion for listening to Secret Store Key Server
-                                   internal requests, IP should be an interface's IP address, or local
-                                   (default: {flag_secretstore_interface}).
-  --secretstore-port PORT          Specify the port portion for listening to Secret Store Key Server
-                                   internal requests (default: {flag_secretstore_port}).
-  --secretstore-http-interface IP  Specify the hostname portion for listening to Secret Store Key Server
-                                   HTTP requests, IP should be an interface's IP address, or local
-                                   (default: {flag_secretstore_http_interface}).
-  --secretstore-http-port PORT     Specify the port portion for listening to Secret Store Key Server
-                                   HTTP requests (default: {flag_secretstore_http_port}).
-  --secretstore-path PATH          Specify directory where Secret Store should save its data.
-                                   (default: {flag_secretstore_path}).
-
-Sealing/Mining Options:
-  --author ADDRESS                 Specify the block author (aka "coinbase") address
-                                   for sending block rewards from sealed blocks.
-                                   NOTE: MINING WILL NOT WORK WITHOUT THIS OPTION.
-                                   (default: {flag_author:?})
-  --engine-signer ADDRESS          Specify the address which should be used to
-                                   sign consensus messages and issue blocks.
-                                   Relevant only to non-PoW chains.
-                                   (default: {flag_engine_signer:?})
-  --force-sealing                  Force the node to author new blocks as if it were
-                                   always sealing/mining.
-                                   (default: {flag_force_sealing})
-  --reseal-on-txs SET              Specify which transactions should force the node
-                                   to reseal a block. SET is one of:
-                                   none - never reseal on new transactions;
-                                   own - reseal only on a new local transaction;
-                                   ext - reseal only on a new external transaction;
-                                   all - reseal on all new transactions
-                                   (default: {flag_reseal_on_txs}).
-  --reseal-on-uncle                Force the node to author new blocks when a new uncle
-                                   block is imported.
-                                   (default: {flag_reseal_on_uncle})
-  --reseal-min-period MS           Specify the minimum time between reseals from
-                                   incoming transactions. MS is time measured in
-                                   milliseconds (default: {flag_reseal_min_period}).
-  --reseal-max-period MS           Specify the maximum time since last block to enable
-                                   force-sealing. MS is time measured in
-                                   milliseconds (default: {flag_reseal_max_period}).
-  --work-queue-size ITEMS          Specify the number of historical work packages
-                                   which are kept cached lest a solution is found for
-                                   them later. High values take more memory but result
-                                   in fewer unusable solutions (default: {flag_work_queue_size}).
-  --tx-gas-limit GAS               Apply a limit of GAS as the maximum amount of gas
-                                   a single transaction may have for it to be mined.
-                                   (default: {flag_tx_gas_limit:?})
-  --tx-time-limit MS               Maximal time for processing single transaction.
-                                   If enabled senders/recipients/code of transactions
-                                   offending the limit will be banned from being included
-                                   in transaction queue for 180 seconds.
-                                   (default: {flag_tx_time_limit:?})
-  --relay-set SET                  Set of transactions to relay. SET may be:
-                                   cheap - Relay any transaction in the queue (this
-                                   may include invalid transactions);
-                                   strict - Relay only executed transactions (this
-                                   guarantees we don't relay invalid transactions, but
-                                   means we relay nothing if not mining);
-                                   lenient - Same as strict when mining, and cheap
-                                   when not (default: {flag_relay_set}).
-  --min-gas-price WEI              Minimum amount of Wei per GAS to be paid for a
-                                   transaction to be accepted for mining. Overrides
-                                   --basic-tx-usd.
-                                   (default: {flag_min_gas_price:?})
-  --usd-per-tx USD                 Amount of USD to be paid for a basic transaction
-                                   (default: {flag_usd_per_tx}). The minimum gas price is set
-                                   accordingly.
-  --usd-per-eth SOURCE             USD value of a single ETH. SOURCE may be either an
-                                   amount in USD, a web service or 'auto' to use each
-                                   web service in turn and fallback on the last known
-                                   good value (default: {flag_usd_per_eth}).
-  --price-update-period T          T will be allowed to pass between each gas price
-                                   update. T may be daily, hourly, a number of seconds,
-                                   or a time string of the form "2 days", "30 minutes"
-                                   etc. (default: {flag_price_update_period}).
-  --gas-floor-target GAS           Amount of gas per block to target when sealing a new
-                                   block (default: {flag_gas_floor_target}).
-  --gas-cap GAS                    A cap on how large we will raise the gas limit per
-                                   block due to transaction volume (default: {flag_gas_cap}).
-  --extra-data STRING              Specify a custom extra-data for authored blocks, no
-                                   more than 32 characters. (default: {flag_extra_data:?})
-  --tx-queue-mem-limit MB          Maximum amount of memory that can be used by the
-                                   transaction queue. Setting this parameter to 0
-                                   disables limiting (default: {flag_tx_queue_mem_limit}).
-  --tx-queue-size LIMIT            Maximum amount of transactions in the queue (waiting
-                                   to be included in next block) (default: {flag_tx_queue_size}).
-  --tx-queue-gas LIMIT             Maximum amount of total gas for external transactions in
-                                   the queue. LIMIT can be either an amount of gas or
-                                   'auto' or 'off'. 'auto' sets the limit to be 20x
-                                   the current block gas limit. (default: {flag_tx_queue_gas}).
-  --tx-queue-strategy S            Prioritization strategy used to order transactions
-                                   in the queue. S may be:
-                                   gas - Prioritize txs with low gas limit;
-                                   gas_price - Prioritize txs with high gas price;
-                                   gas_factor - Prioritize txs using gas price
-                                   and gas limit ratio (default: {flag_tx_queue_strategy}).
-  --tx-queue-ban-count C           Number of times maximal time for execution (--tx-time-limit)
-                                   can be exceeded before banning sender/recipient/code.
-                                   (default: {flag_tx_queue_ban_count})
-  --tx-queue-ban-time SEC          Banning time (in seconds) for offenders of specified
-                                   execution time limit. Also number of offending actions
-                                   have to reach the threshold within that time.
-                                   (default: {flag_tx_queue_ban_time} seconds)
-  --no-persistent-txqueue          Don't save pending local transactions to disk to be
-                                   restored whenever the node restarts.
-                                   (default: {flag_no_persistent_txqueue}).
-  --remove-solved                  Move solved blocks from the work package queue
-                                   instead of cloning them. This gives a slightly
-                                   faster import speed, but means that extra solutions
-                                   submitted for the same work package will go unused.
-                                   (default: {flag_remove_solved})
-  --notify-work URLS               URLs to which work package notifications are pushed.
-                                   URLS should be a comma-delimited list of HTTP URLs.
-                                   (default: {flag_notify_work:?})
-  --refuse-service-transactions    Always refuse service transactions.
-                                   (default: {flag_refuse_service_transactions}).
-  --stratum                        Run Stratum server for miner push notification. (default: {flag_stratum})
-  --stratum-interface IP           Interface address for Stratum server. (default: {flag_stratum_interface})
-  --stratum-port PORT              Port for Stratum server to listen on. (default: {flag_stratum_port})
-  --stratum-secret STRING          Secret for authorizing Stratum server for peers.
-                                   (default: {flag_stratum_secret:?})
-
-Footprint Options:
-  --tracing BOOL                   Indicates if full transaction tracing should be
-                                   enabled. Works only if client had been fully synced
-                                   with tracing enabled. BOOL may be one of auto, on,
-                                   off. auto uses last used value of this option (off
-                                   if it does not exist) (default: {flag_tracing}).
-  --pruning METHOD                 Configure pruning of the state/storage trie. METHOD
-                                   may be one of auto, archive, fast:
-                                   archive - keep all state trie data. No pruning.
-                                   fast - maintain journal overlay. Fast but 50MB used.
-                                   auto - use the method most recently synced or
-                                   default to fast if none synced (default: {flag_pruning}).
-  --pruning-history NUM            Set a minimum number of recent states to keep when pruning
-                                   is active. (default: {flag_pruning_history}).
-  --pruning-memory MB              The ideal amount of memory in megabytes to use to store
-                                   recent states. As many states as possible will be kept
-                                   within this limit, and at least --pruning-history states
-                                   will always be kept. (default: {flag_pruning_memory})
-  --cache-size-db MB               Override database cache size (default: {flag_cache_size_db}).
-  --cache-size-blocks MB           Specify the prefered size of the blockchain cache in
-                                   megabytes (default: {flag_cache_size_blocks}).
-  --cache-size-queue MB            Specify the maximum size of memory to use for block
-                                   queue (default: {flag_cache_size_queue}).
-  --cache-size-state MB            Specify the maximum size of memory to use for
-                                   the state cache (default: {flag_cache_size_state}).
-  --cache-size MB                  Set total amount of discretionary memory to use for
-                                   the entire system, overrides other cache and queue
-                                   options. (default: {flag_cache_size:?})
-  --fast-and-loose                 Disables DB WAL, which gives a significant speed up
-                                   but means an unclean exit is unrecoverable. (default: {flag_fast_and_loose})
-  --db-compaction TYPE             Database compaction type. TYPE may be one of:
-                                   ssd - suitable for SSDs and fast HDDs;
-                                   hdd - suitable for slow HDDs;
-                                   auto - determine automatically (default: {flag_db_compaction}).
-  --fat-db BOOL                    Build appropriate information to allow enumeration
-                                   of all accounts and storage keys. Doubles the size
-                                   of the state database. BOOL may be one of on, off
-                                   or auto. (default: {flag_fat_db})
-  --scale-verifiers                Automatically scale amount of verifier threads based on
-                                   workload. Not guaranteed to be faster.
-                                   (default: {flag_scale_verifiers})
-  --num-verifiers INT              Amount of verifier threads to use or to begin with, if verifier
-                                   auto-scaling is enabled. (default: {flag_num_verifiers:?})
-
-Import/Export Options:
-  --from BLOCK                     Export from block BLOCK, which may be an index or
-                                   hash (default: {flag_from}).
-  --to BLOCK                       Export to (including) block BLOCK, which may be an
-                                   index, hash or 'latest' (default: {flag_to}).
-  --format FORMAT                  For import/export in given format. FORMAT must be
-                                   one of 'hex' and 'binary'.
-                                   (default: {flag_format:?} = Import: auto, Export: binary)
-  --no-seal-check                  Skip block seal check. (default: {flag_no_seal_check})
-  --at BLOCK                       Export state at the given block, which may be an
-                                   index, hash, or 'latest'. (default: {flag_at})
-  --no-storage                     Don't export account storage. (default: {flag_no_storage})
-  --no-code                        Don't export account code. (default: {flag_no_code})
-  --min-balance WEI                Don't export accounts with balance less than specified.
-                                   (default: {flag_min_balance:?})
-  --max-balance WEI                Don't export accounts with balance greater than specified.
-                                   (default: {flag_max_balance:?})
-
-Snapshot Options:
-  --at BLOCK                       Take a snapshot at the given block, which may be an
-                                   index, hash, or 'latest'. Note that taking snapshots at
-                                   non-recent blocks will only work with --pruning archive
-                                   (default: {flag_at})
-  --no-periodic-snapshot           Disable automated snapshots which usually occur once
-                                   every 10000 blocks. (default: {flag_no_periodic_snapshot})
-
-Virtual Machine Options:
-  --jitvm                          Enable the JIT VM. (default: {flag_jitvm})
-
-Whisper Options:
-  --whisper                        Enable the Whisper network. (default: {flag_whisper})
-  --whisper-pool-size MB           Target size of the whisper message pool in megabytes.
-                                   (default: {flag_whisper_pool_size})
-
-Legacy Options:
-  --geth                           Run in Geth-compatibility mode. Sets the IPC path
-                                   to be the same as Geth's. Overrides the --ipc-path
-                                   and --ipcpath options. Alters RPCs to reflect Geth
-                                   bugs. Includes the personal_ RPC by default.
-  --testnet                        Testnet mode. Equivalent to --chain testnet.
-                                   Overrides the --keys-path option.
-  --import-geth-keys               Attempt to import keys from Geth client.
-  --datadir PATH                   Equivalent to --base-path PATH.
-  --networkid INDEX                Equivalent to --network-id INDEX.
-  --peers NUM                      Equivalent to --min-peers NUM.
-  --nodekey KEY                    Equivalent to --node-key KEY.
-  --nodiscover                     Equivalent to --no-discovery.
-  -j --jsonrpc                     Does nothing; JSON-RPC is on by default now.
-  --jsonrpc-off                    Equivalent to --no-jsonrpc.
-  -w --webapp                      Does nothing; dapps server is on by default now.
-  --dapps-off                      Equivalent to --no-dapps.
-  --dapps-user USERNAME            Dapps server authentication has been removed. (default: {flag_dapps_user:?})
-  --dapps-pass PASSWORD            Dapps server authentication has been removed. (default: {flag_dapps_pass:?})
-  --dapps-apis-all                 Dapps server is merged with RPC server. Use --jsonrpc-apis. (default: {flag_dapps_apis_all:?})
-  --dapps-cors URL                 Dapps server is merged with RPC server. Use --jsonrpc-cors. (default: {flag_dapps_cors:?})
-  --dapps-hosts HOSTS              Dapps server is merged with RPC server. Use --jsonrpc-hosts. (default: {flag_dapps_hosts:?})
-  --dapps-interface IP             Dapps server is merged with RPC server. Use --jsonrpc-interface. (default: {flag_dapps_interface:?})
-  --dapps-port PORT                Dapps server is merged with RPC server. Use --jsonrpc-port. (default: {flag_dapps_port:?})
-  --rpc                            Does nothing; JSON-RPC is on by default now.
-  --warp                           Does nothing; Warp sync is on by default. (default: {flag_warp})
-  --rpcaddr IP                     Equivalent to --jsonrpc-interface IP.
-  --rpcport PORT                   Equivalent to --jsonrpc-port PORT.
-  --rpcapi APIS                    Equivalent to --jsonrpc-apis APIS.
-  --rpccorsdomain URL              Equivalent to --jsonrpc-cors URL.
-  --ipcdisable                     Equivalent to --no-ipc.
-  --ipc-off                        Equivalent to --no-ipc.
-  --ipcapi APIS                    Equivalent to --ipc-apis APIS.
-  --ipcpath PATH                   Equivalent to --ipc-path PATH.
-  --gasprice WEI                   Equivalent to --min-gas-price WEI.
-  --etherbase ADDRESS              Equivalent to --author ADDRESS.
-  --extradata STRING               Equivalent to --extra-data STRING.
-  --cache MB                       Equivalent to --cache-size MB.
-
-Internal Options:
-  --can-restart                    Executable will auto-restart if exiting with 69.
-
-Miscellaneous Options:
-  --ntp-servers HOSTS              Comma separated list of NTP servers to provide current time (host:port).
-                                   Used to verify node health. Parity uses pool.ntp.org NTP servers,
-                                   consider joining the pool: http://www.pool.ntp.org/join.html
-                                   (default: {flag_ntp_servers})
-  -l --logging LOGGING             Specify the logging level. Must conform to the same
-                                   format as RUST_LOG. (default: {flag_logging:?})
-  --log-file FILENAME              Specify a filename into which logging should be
-                                   appended. (default: {flag_log_file:?})
-  --no-config                      Don't load a configuration file.
-  --no-color                       Don't use terminal color codes in output. (default: {flag_no_color})
-  -v --version                     Show information about version.
-  -h --help                        Show this screen.
diff --git a/parity/cli/usage_header.txt b/parity/cli/usage_header.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0bcd776c4e0537b1588ea927e61eaeeabf0c0c5c
--- /dev/null
+++ b/parity/cli/usage_header.txt
@@ -0,0 +1,3 @@
+Parity. Ethereum Client.
+	By Wood/Paronyan/Kotewicz/Drwięga/Volf et al.
+	Copyright 2015, 2016, 2017, 2018 Parity Technologies (UK) Ltd
diff --git a/parity/cli/version.txt b/parity/cli/version.txt
index a4febdcbd0937eee2151e49fd43ea20508945f39..ed0576e04d2464ab96e90ff572610c62bed50e50 100644
--- a/parity/cli/version.txt
+++ b/parity/cli/version.txt
@@ -1,10 +1,9 @@
 Parity
   version {}
-Copyright 2015, 2016, 2017 Parity Technologies (UK) Ltd
+Copyright 2015, 2016, 2017, 2018 Parity Technologies (UK) Ltd
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 
 By Wood/Paronyan/Kotewicz/Drwięga/Volf
    Habermeier/Czaban/Greeff/Gotchac/Redmann
-
diff --git a/parity/configuration.rs b/parity/configuration.rs
index 681804346f833abe13c9499c3039021c789259de..39c18f13891d8623da2211eacb44f89fa43461a3 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -15,17 +15,19 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::time::Duration;
-use std::io::{Read, Write, stderr};
+use std::io::Read;
 use std::net::SocketAddr;
 use std::path::{Path, PathBuf};
 use std::collections::BTreeMap;
 use std::cmp::max;
 use std::str::FromStr;
 use cli::{Args, ArgsError};
-use util::{Hashable, H256, U256, Bytes, version_data, Address};
-use util::journaldb::Algorithm;
-use util::Colour;
-use ethsync::{NetworkConfiguration, is_valid_node_url};
+use hash::keccak;
+use ethereum_types::{U256, H256, Address};
+use parity_version::{version_data, version};
+use bytes::Bytes;
+use ansi_term::Colour;
+use ethsync::{NetworkConfiguration, validate_node_url, self};
 use ethcore::ethstore::ethkey::{Secret, Public};
 use ethcore::client::{VMType};
 use ethcore::miner::{MinerOptions, Banning, StratumOptions};
@@ -35,17 +37,19 @@ use rpc::{IpcConfiguration, HttpConfiguration, WsConfiguration, UiConfiguration}
 use rpc_apis::ApiSet;
 use parity_rpc::NetworkSettings;
 use cache::CacheConfig;
-use helpers::{to_duration, to_mode, to_block_id, to_u256, to_pending_set, to_price, replace_home, replace_home_and_local,
-geth_ipc_path, parity_ipc_path, to_bootnodes, to_addresses, to_address, to_gas_limit, to_queue_strategy};
-use params::{ResealPolicy, AccountsConfig, GasPricerConfig, MinerExtras, Pruning, Switch};
+use helpers::{to_duration, to_mode, to_block_id, to_u256, to_pending_set, to_price, geth_ipc_path, parity_ipc_path,
+to_bootnodes, to_addresses, to_address, to_gas_limit, to_queue_strategy};
+use dir::helpers::{replace_home, replace_home_and_local};
+use params::{ResealPolicy, AccountsConfig, GasPricerConfig, MinerExtras, SpecType};
 use ethcore_logger::Config as LogConfig;
 use dir::{self, Directories, default_hypervisor_path, default_local_path, default_data_path};
 use dapps::Configuration as DappsConfiguration;
 use ipfs::Configuration as IpfsConfiguration;
-use secretstore::{Configuration as SecretStoreConfiguration, NodeSecretKey};
+use secretstore::{NodeSecretKey, Configuration as SecretStoreConfiguration, ContractAddress as SecretStoreContractAddress};
 use updater::{UpdatePolicy, UpdateFilter, ReleaseTrack};
 use run::RunCmd;
 use blockchain::{BlockchainCmd, ImportBlockchain, ExportBlockchain, KillBlockchain, ExportState, DataFormat};
+use export_hardcoded_sync::ExportHsyncCmd;
 use presale::ImportWallet;
 use account::{AccountCmd, NewAccount, ListAccounts, ImportAccounts, ImportFromGethAccounts};
 use snapshot::{self, SnapshotCommand};
@@ -76,6 +80,7 @@ pub enum Cmd {
 	},
 	Snapshot(SnapshotCommand),
 	Hash(Option<String>),
+	ExportHardcodedSync(ExportHsyncCmd),
 }
 
 pub struct Execute {
@@ -103,13 +108,13 @@ impl Configuration {
 
 	pub fn into_command(self) -> Result<Execute, String> {
 		let dirs = self.directories();
-		let pruning = self.args.flag_pruning.parse()?;
-		let pruning_history = self.args.flag_pruning_history;
+		let pruning = self.args.arg_pruning.parse()?;
+		let pruning_history = self.args.arg_pruning_history;
 		let vm_type = self.vm_type()?;
-		let spec = self.chain().parse()?;
-		let mode = match self.args.flag_mode.as_ref() {
+		let spec = self.chain()?;
+		let mode = match self.args.arg_mode.as_ref() {
 			"last" => None,
-			mode => Some(to_mode(&mode, self.args.flag_mode_timeout, self.args.flag_mode_alarm)?),
+			mode => Some(to_mode(&mode, self.args.arg_mode_timeout, self.args.arg_mode_alarm)?),
 		};
 		let update_policy = self.update_policy()?;
 		let logger_config = self.logger_config();
@@ -120,54 +125,42 @@ impl Configuration {
 		let ui_conf = self.ui_config();
 		let network_id = self.network_id();
 		let cache_config = self.cache_config();
-		let tracing = self.args.flag_tracing.parse()?;
-		let fat_db = self.args.flag_fat_db.parse()?;
-		let compaction = self.args.flag_db_compaction.parse()?;
+		let tracing = self.args.arg_tracing.parse()?;
+		let fat_db = self.args.arg_fat_db.parse()?;
+		let compaction = self.args.arg_db_compaction.parse()?;
 		let wal = !self.args.flag_fast_and_loose;
-		match self.args.flag_warp {
-			// Logging is not initialized yet, so we print directly to stderr
-			Some(true) if fat_db == Switch::On => writeln!(&mut stderr(), "Warning: Warp Sync is disabled because Fat DB is turned on").expect("Error writing to stderr"),
-			Some(true) if tracing == Switch::On => writeln!(&mut stderr(), "Warning: Warp Sync is disabled because tracing is turned on").expect("Error writing to stderr"),
-			Some(true) if pruning == Pruning::Specific(Algorithm::Archive) => writeln!(&mut stderr(), "Warning: Warp Sync is disabled because pruning mode is set to archive").expect("Error writing to stderr"),
-			_ => {},
-		};
 		let public_node = self.args.flag_public_node;
-		let warp_sync = !self.args.flag_no_warp && fat_db != Switch::On && tracing != Switch::On && pruning != Pruning::Specific(Algorithm::Archive);
+		let warp_sync = !self.args.flag_no_warp;
 		let geth_compatibility = self.args.flag_geth;
-		let mut dapps_conf = self.dapps_config();
+		let dapps_conf = self.dapps_config();
 		let ipfs_conf = self.ipfs_config();
 		let secretstore_conf = self.secretstore_config()?;
 		let format = self.format()?;
 
-		if self.args.flag_jsonrpc_server_threads.is_some() && dapps_conf.enabled {
-			dapps_conf.enabled = false;
-			writeln!(&mut stderr(), "Warning: Disabling Dapps server because fast RPC server was enabled.").expect("Error writing to stderr.")
-		}
-
 		let cmd = if self.args.flag_version {
 			Cmd::Version
 		} else if self.args.cmd_signer {
 			let authfile = ::signer::codes_path(&ws_conf.signer_path);
 
-			if self.args.cmd_new_token {
+			if self.args.cmd_signer_new_token {
 				Cmd::SignerToken(ws_conf, ui_conf, logger_config.clone())
-			} else if self.args.cmd_sign {
-				let pwfile = self.args.flag_password.get(0).map(|pwfile| {
+			} else if self.args.cmd_signer_sign {
+				let pwfile = self.args.arg_password.first().map(|pwfile| {
 					PathBuf::from(pwfile)
 				});
 				Cmd::SignerSign {
-					id: self.args.arg_id,
+					id: self.args.arg_signer_sign_id,
 					pwfile: pwfile,
 					port: ws_conf.port,
 					authfile: authfile,
 				}
-			} else if self.args.cmd_reject  {
+			} else if self.args.cmd_signer_reject  {
 				Cmd::SignerReject {
-					id: self.args.arg_id,
+					id: self.args.arg_signer_reject_id,
 					port: ws_conf.port,
 					authfile: authfile,
 				}
-			} else if self.args.cmd_list  {
+			} else if self.args.cmd_signer_list  {
 				Cmd::SignerList {
 					port: ws_conf.port,
 					authfile: authfile,
@@ -175,32 +168,32 @@ impl Configuration {
 			} else {
 				unreachable!();
 			}
-		} else if self.args.cmd_tools && self.args.cmd_hash {
-			Cmd::Hash(self.args.arg_file)
-		} else if self.args.cmd_db && self.args.cmd_kill {
+		} else if self.args.cmd_tools && self.args.cmd_tools_hash {
+			Cmd::Hash(self.args.arg_tools_hash_file)
+		} else if self.args.cmd_db && self.args.cmd_db_kill {
 			Cmd::Blockchain(BlockchainCmd::Kill(KillBlockchain {
 				spec: spec,
 				dirs: dirs,
 				pruning: pruning,
 			}))
 		} else if self.args.cmd_account {
-			let account_cmd = if self.args.cmd_new {
+			let account_cmd = if self.args.cmd_account_new {
 				let new_acc = NewAccount {
-					iterations: self.args.flag_keys_iterations,
+					iterations: self.args.arg_keys_iterations,
 					path: dirs.keys,
 					spec: spec,
-					password_file: self.args.flag_password.first().cloned(),
+					password_file: self.args.arg_password.first().map(|x| x.to_owned()),
 				};
 				AccountCmd::New(new_acc)
-			} else if self.args.cmd_list {
+			} else if self.args.cmd_account_list {
 				let list_acc = ListAccounts {
 					path: dirs.keys,
 					spec: spec,
 				};
 				AccountCmd::List(list_acc)
-			} else if self.args.cmd_import {
+			} else if self.args.cmd_account_import {
 				let import_acc = ImportAccounts {
-					from: self.args.arg_path.clone(),
+					from: self.args.arg_account_import_path.expect("CLI argument is required; qed").clone(),
 					to: dirs.keys,
 					spec: spec,
 				};
@@ -220,11 +213,11 @@ impl Configuration {
 			Cmd::Account(account_cmd)
 		} else if self.args.cmd_wallet {
 			let presale_cmd = ImportWallet {
-				iterations: self.args.flag_keys_iterations,
+				iterations: self.args.arg_keys_iterations,
 				path: dirs.keys,
 				spec: spec,
-				wallet_path: self.args.arg_path.first().unwrap().clone(),
-				password_file: self.args.flag_password.first().cloned(),
+				wallet_path: self.args.arg_wallet_import_path.unwrap().clone(),
+				password_file: self.args.arg_password.first().map(|x| x.to_owned()),
 			};
 			Cmd::ImportPresaleWallet(presale_cmd)
 		} else if self.args.cmd_import {
@@ -232,11 +225,11 @@ impl Configuration {
 				spec: spec,
 				cache_config: cache_config,
 				dirs: dirs,
-				file_path: self.args.arg_file.clone(),
+				file_path: self.args.arg_import_file.clone(),
 				format: format,
 				pruning: pruning,
 				pruning_history: pruning_history,
-				pruning_memory: self.args.flag_pruning_memory,
+				pruning_memory: self.args.arg_pruning_memory,
 				compaction: compaction,
 				wal: wal,
 				tracing: tracing,
@@ -249,44 +242,44 @@ impl Configuration {
 			};
 			Cmd::Blockchain(BlockchainCmd::Import(import_cmd))
 		} else if self.args.cmd_export {
-			if self.args.cmd_blocks {
+			if self.args.cmd_export_blocks {
 				let export_cmd = ExportBlockchain {
 					spec: spec,
 					cache_config: cache_config,
 					dirs: dirs,
-					file_path: self.args.arg_file.clone(),
+					file_path: self.args.arg_export_blocks_file.clone(),
 					format: format,
 					pruning: pruning,
 					pruning_history: pruning_history,
-					pruning_memory: self.args.flag_pruning_memory,
+					pruning_memory: self.args.arg_pruning_memory,
 					compaction: compaction,
 					wal: wal,
 					tracing: tracing,
 					fat_db: fat_db,
-					from_block: to_block_id(&self.args.flag_from)?,
-					to_block: to_block_id(&self.args.flag_to)?,
+					from_block: to_block_id(&self.args.arg_export_blocks_from)?,
+					to_block: to_block_id(&self.args.arg_export_blocks_to)?,
 					check_seal: !self.args.flag_no_seal_check,
 				};
 				Cmd::Blockchain(BlockchainCmd::Export(export_cmd))
-			} else if self.args.cmd_state {
+			} else if self.args.cmd_export_state {
 				let export_cmd = ExportState {
 					spec: spec,
 					cache_config: cache_config,
 					dirs: dirs,
-					file_path: self.args.arg_file.clone(),
+					file_path: self.args.arg_export_state_file.clone(),
 					format: format,
 					pruning: pruning,
 					pruning_history: pruning_history,
-					pruning_memory: self.args.flag_pruning_memory,
+					pruning_memory: self.args.arg_pruning_memory,
 					compaction: compaction,
 					wal: wal,
 					tracing: tracing,
 					fat_db: fat_db,
-					at: to_block_id(&self.args.flag_at)?,
-					storage: !self.args.flag_no_storage,
-					code: !self.args.flag_no_code,
-					min_balance: self.args.flag_min_balance.and_then(|s| to_u256(&s).ok()),
-					max_balance: self.args.flag_max_balance.and_then(|s| to_u256(&s).ok()),
+					at: to_block_id(&self.args.arg_export_state_at)?,
+					storage: !self.args.flag_export_state_no_storage,
+					code: !self.args.flag_export_state_no_code,
+					min_balance: self.args.arg_export_state_min_balance.and_then(|s| to_u256(&s).ok()),
+					max_balance: self.args.arg_export_state_max_balance.and_then(|s| to_u256(&s).ok()),
 				};
 				Cmd::Blockchain(BlockchainCmd::ExportState(export_cmd))
 			} else {
@@ -299,14 +292,14 @@ impl Configuration {
 				spec: spec,
 				pruning: pruning,
 				pruning_history: pruning_history,
-				pruning_memory: self.args.flag_pruning_memory,
+				pruning_memory: self.args.arg_pruning_memory,
 				tracing: tracing,
 				fat_db: fat_db,
 				compaction: compaction,
-				file_path: self.args.arg_file.clone(),
+				file_path: self.args.arg_snapshot_file.clone(),
 				wal: wal,
 				kind: snapshot::Kind::Take,
-				block_at: to_block_id(&self.args.flag_at)?,
+				block_at: to_block_id(&self.args.arg_snapshot_at)?,
 			};
 			Cmd::Snapshot(snapshot_cmd)
 		} else if self.args.cmd_restore {
@@ -316,19 +309,29 @@ impl Configuration {
 				spec: spec,
 				pruning: pruning,
 				pruning_history: pruning_history,
-				pruning_memory: self.args.flag_pruning_memory,
+				pruning_memory: self.args.arg_pruning_memory,
 				tracing: tracing,
 				fat_db: fat_db,
 				compaction: compaction,
-				file_path: self.args.arg_file.clone(),
+				file_path: self.args.arg_restore_file.clone(),
 				wal: wal,
 				kind: snapshot::Kind::Restore,
 				block_at: to_block_id("latest")?, // unimportant.
 			};
 			Cmd::Snapshot(restore_cmd)
+		} else if self.args.cmd_export_hardcoded_sync {
+			let export_hs_cmd = ExportHsyncCmd {
+				cache_config: cache_config,
+				dirs: dirs,
+				spec: spec,
+				pruning: pruning,
+				compaction: compaction,
+				wal: wal,
+			};
+			Cmd::ExportHardcodedSync(export_hs_cmd)
 		} else {
 			let daemon = if self.args.cmd_daemon {
-				Some(self.args.arg_pid_file.clone())
+				Some(self.args.arg_daemon_pid_file.clone().expect("CLI argument is required; qed"))
 			} else {
 				None
 			};
@@ -342,10 +345,11 @@ impl Configuration {
 				spec: spec,
 				pruning: pruning,
 				pruning_history: pruning_history,
-				pruning_memory: self.args.flag_pruning_memory,
+				pruning_memory: self.args.arg_pruning_memory,
 				daemon: daemon,
 				logger_config: logger_config.clone(),
-				miner_options: self.miner_options(self.args.flag_reseal_min_period)?,
+				miner_options: self.miner_options()?,
+				gas_price_percentile: self.args.arg_gas_price_percentile,
 				ntp_servers: self.ntp_servers(),
 				ws_conf: ws_conf,
 				http_conf: http_conf,
@@ -373,8 +377,8 @@ impl Configuration {
 				secretstore_conf: secretstore_conf,
 				dapp: self.dapp_to_open()?,
 				ui: self.args.cmd_ui,
-				name: self.args.flag_identity,
-				custom_bootnodes: self.args.flag_bootnodes.is_some(),
+				name: self.args.arg_identity,
+				custom_bootnodes: self.args.arg_bootnodes.is_some(),
 				no_periodic_snapshot: self.args.flag_no_periodic_snapshot,
 				check_seal: !self.args.flag_no_seal_check,
 				download_old_blocks: !self.args.flag_no_ancient_blocks,
@@ -383,6 +387,7 @@ impl Configuration {
 				light: self.args.flag_light,
 				no_persistent_txqueue: self.args.flag_no_persistent_txqueue,
 				whisper: whisper_config,
+				no_hardcoded_sync: self.args.flag_no_hardcoded_sync,
 			};
 			Cmd::Run(run_cmd)
 		};
@@ -405,8 +410,8 @@ impl Configuration {
 		let extras = MinerExtras {
 			author: self.author()?,
 			extra_data: self.extra_data()?,
-			gas_floor_target: to_u256(&self.args.flag_gas_floor_target)?,
-			gas_ceil_target: to_u256(&self.args.flag_gas_cap)?,
+			gas_floor_target: to_u256(&self.args.arg_gas_floor_target)?,
+			gas_ceil_target: to_u256(&self.args.arg_gas_cap)?,
 			engine_signer: self.engine_signer()?,
 		};
 
@@ -414,85 +419,89 @@ impl Configuration {
 	}
 
 	fn author(&self) -> Result<Address, String> {
-		to_address(self.args.flag_etherbase.clone().or(self.args.flag_author.clone()))
+		to_address(self.args.arg_etherbase.clone().or(self.args.arg_author.clone()))
 	}
 
 	fn engine_signer(&self) -> Result<Address, String> {
-		to_address(self.args.flag_engine_signer.clone())
+		to_address(self.args.arg_engine_signer.clone())
 	}
 
 	fn format(&self) -> Result<Option<DataFormat>, String> {
-		match self.args.flag_format {
+		match self.args.arg_import_format.clone()
+				.or(self.args.arg_export_blocks_format.clone())
+				.or(self.args.arg_export_state_format.clone()) {
 			Some(ref f) => Ok(Some(f.parse()?)),
 			None => Ok(None),
 		}
 	}
 
 	fn cache_config(&self) -> CacheConfig {
-		match self.args.flag_cache_size.or(self.args.flag_cache) {
+		match self.args.arg_cache_size.or(self.args.arg_cache) {
 			Some(size) => CacheConfig::new_with_total_cache_size(size),
 			None => CacheConfig::new(
-				self.args.flag_cache_size_db,
-				self.args.flag_cache_size_blocks,
-				self.args.flag_cache_size_queue,
-				self.args.flag_cache_size_state,
+				self.args.arg_cache_size_db,
+				self.args.arg_cache_size_blocks,
+				self.args.arg_cache_size_queue,
+				self.args.arg_cache_size_state,
 			),
 		}
 	}
 
 	fn logger_config(&self) -> LogConfig {
 		LogConfig {
-			mode: self.args.flag_logging.clone(),
+			mode: self.args.arg_logging.clone(),
 			color: !self.args.flag_no_color && !cfg!(windows),
-			file: self.args.flag_log_file.clone(),
+			file: self.args.arg_log_file.clone(),
 		}
 	}
 
-	fn chain(&self) -> String {
-		if let Some(ref s) = self.spec_name_override {
+	fn chain(&self) -> Result<SpecType, String> {
+		let name = if let Some(ref s) = self.spec_name_override {
 			s.clone()
-		}
-		else if self.args.flag_testnet {
+		} else if self.args.flag_testnet {
 			"testnet".to_owned()
 		} else {
-			self.args.flag_chain.clone()
-		}
+			self.args.arg_chain.clone()
+		};
+
+		Ok(name.parse()?)
 	}
 
 	fn max_peers(&self) -> u32 {
-		let peers = self.args.flag_max_peers as u32;
+		let peers = self.args.arg_max_peers as u32;
 		max(self.min_peers(), peers)
 	}
 
 	fn ip_filter(&self) -> Result<IpFilter, String> {
-		match IpFilter::parse(self.args.flag_allow_ips.as_str()) {
+		match IpFilter::parse(self.args.arg_allow_ips.as_str()) {
 			Ok(allow_ip) => Ok(allow_ip),
 			Err(_) => Err("Invalid IP filter value".to_owned()),
 		}
 	}
 
 	fn min_peers(&self) -> u32 {
-		self.args.flag_peers.unwrap_or(self.args.flag_min_peers) as u32
+		self.args.arg_peers.unwrap_or(self.args.arg_min_peers) as u32
 	}
 
 	fn max_pending_peers(&self) -> u32 {
-		self.args.flag_max_pending_peers as u32
+		self.args.arg_max_pending_peers as u32
 	}
 
 	fn snapshot_peers(&self) -> u32 {
-		self.args.flag_snapshot_peers as u32
+		self.args.arg_snapshot_peers as u32
 	}
 
 	fn work_notify(&self) -> Vec<String> {
-		self.args.flag_notify_work.as_ref().map_or_else(Vec::new, |s| s.split(',').map(|s| s.to_owned()).collect())
+		self.args.arg_notify_work.as_ref().map_or_else(Vec::new, |s| s.split(',').map(|s| s.to_owned()).collect())
 	}
 
 	fn accounts_config(&self) -> Result<AccountsConfig, String> {
 		let cfg = AccountsConfig {
-			iterations: self.args.flag_keys_iterations,
+			iterations: self.args.arg_keys_iterations,
+			refresh_time: self.args.arg_accounts_refresh,
 			testnet: self.args.flag_testnet,
-			password_files: self.args.flag_password.clone(),
-			unlocked_accounts: to_addresses(&self.args.flag_unlock)?,
+			password_files: self.args.arg_password.clone(),
+			unlocked_accounts: to_addresses(&self.args.arg_unlock)?,
 			enable_hardware_wallets: !self.args.flag_no_hardware_wallets,
 			enable_fast_unlock: self.args.flag_fast_unlock,
 		};
@@ -505,18 +514,19 @@ impl Configuration {
 			Ok(Some(StratumOptions {
 				io_path: self.directories().db,
 				listen_addr: self.stratum_interface(),
-				port: self.args.flag_ports_shift + self.args.flag_stratum_port,
-				secret: self.args.flag_stratum_secret.as_ref().map(|s| s.parse::<H256>().unwrap_or_else(|_| s.sha3())),
+				port: self.args.arg_ports_shift + self.args.arg_stratum_port,
+				secret: self.args.arg_stratum_secret.as_ref().map(|s| s.parse::<H256>().unwrap_or_else(|_| keccak(s))),
 			}))
 		} else { Ok(None) }
 	}
 
-	fn miner_options(&self, reseal_min_period: u64) -> Result<MinerOptions, String> {
-		if self.args.flag_force_sealing && reseal_min_period == 0 {
+	fn miner_options(&self) -> Result<MinerOptions, String> {
+		let is_dev_chain = self.chain()? == SpecType::Dev;
+		if is_dev_chain && self.args.flag_force_sealing && self.args.arg_reseal_min_period == 0 {
 			return Err("Force sealing can't be used with reseal_min_period = 0".into());
 		}
 
-		let reseal = self.args.flag_reseal_on_txs.parse::<ResealPolicy>()?;
+		let reseal = self.args.arg_reseal_on_txs.parse::<ResealPolicy>()?;
 
 		let options = MinerOptions {
 			new_work_notify: self.work_notify(),
@@ -524,41 +534,42 @@ impl Configuration {
 			reseal_on_external_tx: reseal.external,
 			reseal_on_own_tx: reseal.own,
 			reseal_on_uncle: self.args.flag_reseal_on_uncle,
-			tx_gas_limit: match self.args.flag_tx_gas_limit {
+			tx_gas_limit: match self.args.arg_tx_gas_limit {
 				Some(ref d) => to_u256(d)?,
 				None => U256::max_value(),
 			},
-			tx_queue_size: self.args.flag_tx_queue_size,
-			tx_queue_memory_limit: if self.args.flag_tx_queue_mem_limit > 0 {
-				Some(self.args.flag_tx_queue_mem_limit as usize * 1024 * 1024)
+			tx_queue_size: self.args.arg_tx_queue_size,
+			tx_queue_memory_limit: if self.args.arg_tx_queue_mem_limit > 0 {
+				Some(self.args.arg_tx_queue_mem_limit as usize * 1024 * 1024)
 			} else { None },
-			tx_queue_gas_limit: to_gas_limit(&self.args.flag_tx_queue_gas)?,
-			tx_queue_strategy: to_queue_strategy(&self.args.flag_tx_queue_strategy)?,
-			pending_set: to_pending_set(&self.args.flag_relay_set)?,
-			reseal_min_period: Duration::from_millis(reseal_min_period),
-			reseal_max_period: Duration::from_millis(self.args.flag_reseal_max_period),
-			work_queue_size: self.args.flag_work_queue_size,
+			tx_queue_gas_limit: to_gas_limit(&self.args.arg_tx_queue_gas)?,
+			tx_queue_strategy: to_queue_strategy(&self.args.arg_tx_queue_strategy)?,
+			pending_set: to_pending_set(&self.args.arg_relay_set)?,
+			reseal_min_period: Duration::from_millis(self.args.arg_reseal_min_period),
+			reseal_max_period: Duration::from_millis(self.args.arg_reseal_max_period),
+			work_queue_size: self.args.arg_work_queue_size,
 			enable_resubmission: !self.args.flag_remove_solved,
-			tx_queue_banning: match self.args.flag_tx_time_limit {
+			tx_queue_banning: match self.args.arg_tx_time_limit {
 				Some(limit) => Banning::Enabled {
-					min_offends: self.args.flag_tx_queue_ban_count,
+					min_offends: self.args.arg_tx_queue_ban_count,
 					offend_threshold: Duration::from_millis(limit),
-					ban_duration: Duration::from_secs(self.args.flag_tx_queue_ban_time as u64),
+					ban_duration: Duration::from_secs(self.args.arg_tx_queue_ban_time as u64),
 				},
 				None => Banning::Disabled,
 			},
 			refuse_service_transactions: self.args.flag_refuse_service_transactions,
+			infinite_pending_block: self.args.flag_infinite_pending_block,
 		};
 
 		Ok(options)
 	}
 
 	fn ui_port(&self) -> u16 {
-		self.args.flag_ports_shift + self.args.flag_ui_port
+		self.args.arg_ports_shift + self.args.arg_ui_port
 	}
 
 	fn ntp_servers(&self) -> Vec<String> {
-		self.args.flag_ntp_servers.split(",").map(str::to_owned).collect()
+		self.args.arg_ntp_servers.split(",").map(str::to_owned).collect()
 	}
 
 	fn ui_config(&self) -> UiConfiguration {
@@ -571,14 +582,14 @@ impl Configuration {
 	}
 
 	fn dapps_config(&self) -> DappsConfiguration {
-		let dev_ui = if self.args.flag_ui_no_validation { vec![("localhost".to_owned(), 3000)] } else { vec![] };
+		let dev_ui = if self.args.flag_ui_no_validation { vec![("127.0.0.1".to_owned(), 3000)] } else { vec![] };
 		let ui_port = self.ui_port();
 
 		DappsConfiguration {
 			enabled: self.dapps_enabled(),
 			dapps_path: PathBuf::from(self.directories().dapps),
 			extra_dapps: if self.args.cmd_dapp {
-				self.args.arg_path.iter().map(|path| PathBuf::from(path)).collect()
+				self.args.arg_dapp_path.iter().map(|path| PathBuf::from(path)).collect()
 			} else {
 				vec![]
 			},
@@ -586,7 +597,12 @@ impl Configuration {
 				let mut extra_embed = dev_ui.clone();
 				match self.ui_hosts() {
 					// In case host validation is disabled allow all frame ancestors
-					None => extra_embed.push(("*".to_owned(), ui_port)),
+					None => {
+						// NOTE Chrome does not seem to support "*:<port>"
+						// we use `http(s)://*:<port>` instead.
+						extra_embed.push(("http://*".to_owned(), ui_port));
+						extra_embed.push(("https://*".to_owned(), ui_port));
+					},
 					Some(hosts) => extra_embed.extend(hosts.into_iter().filter_map(|host| {
 						let mut it = host.split(":");
 						let host = it.next();
@@ -610,20 +626,23 @@ impl Configuration {
 			enabled: self.secretstore_enabled(),
 			http_enabled: self.secretstore_http_enabled(),
 			acl_check_enabled: self.secretstore_acl_check_enabled(),
+			auto_migrate_enabled: self.secretstore_auto_migrate_enabled(),
+			service_contract_address: self.secretstore_service_contract_address()?,
 			self_secret: self.secretstore_self_secret()?,
 			nodes: self.secretstore_nodes()?,
 			interface: self.secretstore_interface(),
-			port: self.args.flag_ports_shift + self.args.flag_secretstore_port,
+			port: self.args.arg_ports_shift + self.args.arg_secretstore_port,
 			http_interface: self.secretstore_http_interface(),
-			http_port: self.args.flag_ports_shift + self.args.flag_secretstore_http_port,
+			http_port: self.args.arg_ports_shift + self.args.arg_secretstore_http_port,
 			data_path: self.directories().secretstore,
+			admin_public: self.secretstore_admin_public()?,
 		})
 	}
 
 	fn ipfs_config(&self) -> IpfsConfiguration {
 		IpfsConfiguration {
 			enabled: self.args.flag_ipfs_api,
-			port: self.args.flag_ports_shift + self.args.flag_ipfs_api_port,
+			port: self.args.arg_ports_shift + self.args.arg_ipfs_api_port,
 			interface: self.ipfs_interface(),
 			cors: self.ipfs_cors(),
 			hosts: self.ipfs_hosts(),
@@ -634,7 +653,7 @@ impl Configuration {
 		if !self.args.cmd_dapp {
 			return Ok(None);
 		}
-		let path = self.args.arg_path.get(0).map(String::as_str).unwrap_or(".");
+		let path = self.args.arg_dapp_path.as_ref().map(String::as_str).unwrap_or(".");
 		let path = Path::new(path).canonicalize()
 			.map_err(|e| format!("Invalid path: {}. Error: {:?}", path, e))?;
 		let name = path.file_name()
@@ -651,14 +670,16 @@ impl Configuration {
 			U256::from_dec_str(&format!("{:.0}", wei_per_gas)).unwrap()
 		}
 
-		if let Some(dec) = self.args.flag_gasprice.as_ref() {
+		if let Some(dec) = self.args.arg_gasprice.as_ref() {
 			return Ok(GasPricerConfig::Fixed(to_u256(dec)?));
-		} else if let Some(dec) = self.args.flag_min_gas_price {
+		} else if let Some(dec) = self.args.arg_min_gas_price {
 			return Ok(GasPricerConfig::Fixed(U256::from(dec)));
+		} else if self.chain()? != SpecType::Foundation {
+			return Ok(GasPricerConfig::Fixed(U256::zero()));
 		}
 
-		let usd_per_tx = to_price(&self.args.flag_usd_per_tx)?;
-		if "auto" == self.args.flag_usd_per_eth.as_str() {
+		let usd_per_tx = to_price(&self.args.arg_usd_per_tx)?;
+		if "auto" == self.args.arg_usd_per_eth.as_str() {
 			// Just a very rough estimate to avoid accepting
 			// ZGP transactions before the price is fetched
 			// if user does not want it.
@@ -666,11 +687,11 @@ impl Configuration {
 			return Ok(GasPricerConfig::Calibrated {
 				initial_minimum: wei_per_gas(usd_per_tx, last_known_usd_per_eth),
 				usd_per_tx: usd_per_tx,
-				recalibration_period: to_duration(self.args.flag_price_update_period.as_str())?,
+				recalibration_period: to_duration(self.args.arg_price_update_period.as_str())?,
 			});
 		}
 
-		let usd_per_eth = to_price(&self.args.flag_usd_per_eth)?;
+		let usd_per_eth = to_price(&self.args.arg_usd_per_eth)?;
 		let wei_per_gas = wei_per_gas(usd_per_tx, usd_per_eth);
 
 		info!(
@@ -683,7 +704,7 @@ impl Configuration {
 	}
 
 	fn extra_data(&self) -> Result<Bytes, String> {
-		match self.args.flag_extradata.as_ref().or(self.args.flag_extra_data.as_ref()) {
+		match self.args.arg_extradata.as_ref().or(self.args.arg_extra_data.as_ref()) {
 			Some(x) if x.len() <= 32 => Ok(x.as_bytes().to_owned()),
 			None => Ok(version_data()),
 			Some(_) => Err("Extra data must be at most 32 characters".into()),
@@ -693,15 +714,21 @@ impl Configuration {
 	fn init_reserved_nodes(&self) -> Result<Vec<String>, String> {
 		use std::fs::File;
 
-		match self.args.flag_reserved_peers {
+		match self.args.arg_reserved_peers {
 			Some(ref path) => {
 				let mut buffer = String::new();
 				let mut node_file = File::open(path).map_err(|e| format!("Error opening reserved nodes file: {}", e))?;
 				node_file.read_to_string(&mut buffer).map_err(|_| "Error reading reserved node file")?;
 				let lines = buffer.lines().map(|s| s.trim().to_owned()).filter(|s| !s.is_empty() && !s.starts_with("#")).collect::<Vec<_>>();
-				if let Some(invalid) = lines.iter().find(|s| !is_valid_node_url(s)) {
-					return Err(format!("Invalid node address format given for a boot node: {}", invalid));
+
+				for line in &lines {
+					match validate_node_url(line).map(Into::into) {
+						None => continue,
+						Some(ethsync::ErrorKind::AddressResolve(_)) => return Err(format!("Failed to resolve hostname of a boot node: {}", line)),
+						Some(_) => return Err(format!("Invalid node address format given for a boot node: {}", line)),
+					}
 				}
+
 				Ok(lines)
 			},
 			None => Ok(Vec::new())
@@ -709,10 +736,10 @@ impl Configuration {
 	}
 
 	fn net_addresses(&self) -> Result<(SocketAddr, Option<SocketAddr>), String> {
-		let port = self.args.flag_ports_shift + self.args.flag_port;
+		let port = self.args.arg_ports_shift + self.args.arg_port;
 		let listen_address = SocketAddr::new("0.0.0.0".parse().unwrap(), port);
-		let public_address = if self.args.flag_nat.starts_with("extip:") {
-			let host = &self.args.flag_nat[6..];
+		let public_address = if self.args.arg_nat.starts_with("extip:") {
+			let host = &self.args.arg_nat[6..];
 			let host = host.parse().map_err(|_| format!("Invalid host given with `--nat extip:{}`", host))?;
 			Some(SocketAddr::new(host, port))
 		} else {
@@ -723,13 +750,13 @@ impl Configuration {
 
 	fn net_config(&self) -> Result<NetworkConfiguration, String> {
 		let mut ret = NetworkConfiguration::new();
-		ret.nat_enabled = self.args.flag_nat == "any" || self.args.flag_nat == "upnp";
-		ret.boot_nodes = to_bootnodes(&self.args.flag_bootnodes)?;
+		ret.nat_enabled = self.args.arg_nat == "any" || self.args.arg_nat == "upnp";
+		ret.boot_nodes = to_bootnodes(&self.args.arg_bootnodes)?;
 		let (listen, public) = self.net_addresses()?;
 		ret.listen_address = Some(format!("{}", listen));
 		ret.public_address = public.map(|p| format!("{}", p));
-		ret.use_secret = match self.args.flag_node_key.as_ref()
-			.map(|s| s.parse::<Secret>().or_else(|_| Secret::from_unsafe_slice(&s.sha3())).map_err(|e| format!("Invalid key: {:?}", e))
+		ret.use_secret = match self.args.arg_node_key.as_ref()
+			.map(|s| s.parse::<Secret>().or_else(|_| Secret::from_unsafe_slice(&keccak(s))).map_err(|e| format!("Invalid key: {:?}", e))
 			) {
 			None => None,
 			Some(Ok(key)) => Some(key),
@@ -746,17 +773,18 @@ impl Configuration {
 		ret.config_path = Some(net_path.to_str().unwrap().to_owned());
 		ret.reserved_nodes = self.init_reserved_nodes()?;
 		ret.allow_non_reserved = !self.args.flag_reserved_only;
+		ret.client_version = version();
 		Ok(ret)
 	}
 
 	fn network_id(&self) -> Option<u64> {
-		self.args.flag_network_id.or(self.args.flag_networkid)
+		self.args.arg_network_id.or(self.args.arg_networkid)
 	}
 
 	fn rpc_apis(&self) -> String {
-		let mut apis: Vec<&str> = self.args.flag_rpcapi
+		let mut apis: Vec<&str> = self.args.arg_rpcapi
 			.as_ref()
-			.unwrap_or(&self.args.flag_jsonrpc_apis)
+			.unwrap_or(&self.args.arg_jsonrpc_apis)
 			.split(",")
 			.collect();
 
@@ -767,17 +795,23 @@ impl Configuration {
 		apis.join(",")
 	}
 
-	fn cors(cors: Option<&String>) -> Option<Vec<String>> {
-		cors.map(|ref c| c.split(',').map(Into::into).collect())
+	fn cors(cors: &str) -> Option<Vec<String>> {
+		match cors {
+			"none" => return Some(Vec::new()),
+			"*" | "all" | "any" => return None,
+			_ => {},
+		}
+
+		Some(cors.split(',').map(Into::into).collect())
 	}
 
 	fn rpc_cors(&self) -> Option<Vec<String>> {
-		let cors = self.args.flag_jsonrpc_cors.as_ref().or(self.args.flag_rpccorsdomain.as_ref());
-		Self::cors(cors)
+		let cors = self.args.arg_rpccorsdomain.clone().unwrap_or_else(|| self.args.arg_jsonrpc_cors.to_owned());
+		Self::cors(&cors)
 	}
 
 	fn ipfs_cors(&self) -> Option<Vec<String>> {
-		Self::cors(self.args.flag_ipfs_api_cors.as_ref())
+		Self::cors(self.args.arg_ipfs_api_cors.as_ref())
 	}
 
 	fn hosts(&self, hosts: &str, interface: &str) -> Option<Vec<String>> {
@@ -803,15 +837,15 @@ impl Configuration {
 	}
 
 	fn ui_hosts(&self) -> Option<Vec<String>> {
-		self.hosts(&self.args.flag_ui_hosts, &self.ui_interface())
+		self.hosts(&self.args.arg_ui_hosts, &self.ui_interface())
 	}
 
 	fn rpc_hosts(&self) -> Option<Vec<String>> {
-		self.hosts(&self.args.flag_jsonrpc_hosts, &self.rpc_interface())
+		self.hosts(&self.args.arg_jsonrpc_hosts, &self.rpc_interface())
 	}
 
 	fn ws_hosts(&self) -> Option<Vec<String>> {
-		self.hosts(&self.args.flag_ws_hosts, &self.ws_interface())
+		self.hosts(&self.args.arg_ws_hosts, &self.ws_interface())
 	}
 
 	fn ws_origins(&self) -> Option<Vec<String>> {
@@ -819,11 +853,11 @@ impl Configuration {
 			return None;
 		}
 
-		Self::parse_hosts(&self.args.flag_ws_origins)
+		Self::parse_hosts(&self.args.arg_ws_origins)
 	}
 
 	fn ipfs_hosts(&self) -> Option<Vec<String>> {
-		self.hosts(&self.args.flag_ipfs_api_hosts, &self.ipfs_interface())
+		self.hosts(&self.args.arg_ipfs_api_hosts, &self.ipfs_interface())
 	}
 
 	fn ipc_config(&self) -> Result<IpcConfiguration, String> {
@@ -831,7 +865,7 @@ impl Configuration {
 			enabled: !(self.args.flag_ipcdisable || self.args.flag_ipc_off || self.args.flag_no_ipc),
 			socket_addr: self.ipc_path(),
 			apis: {
-				let mut apis = self.args.flag_ipcapi.clone().unwrap_or(self.args.flag_ipc_apis.clone());
+				let mut apis = self.args.arg_ipcapi.clone().unwrap_or(self.args.arg_ipc_apis.clone());
 				if self.args.flag_geth {
 					if !apis.is_empty() {
  						apis.push_str(",");
@@ -849,19 +883,18 @@ impl Configuration {
 		let conf = HttpConfiguration {
 			enabled: self.rpc_enabled(),
 			interface: self.rpc_interface(),
-			port: self.args.flag_ports_shift + self.args.flag_rpcport.unwrap_or(self.args.flag_jsonrpc_port),
+			port: self.args.arg_ports_shift + self.args.arg_rpcport.unwrap_or(self.args.arg_jsonrpc_port),
 			apis: match self.args.flag_public_node {
 				false => self.rpc_apis().parse()?,
 				true => self.rpc_apis().parse::<ApiSet>()?.retain(ApiSet::PublicContext),
 			},
 			hosts: self.rpc_hosts(),
 			cors: self.rpc_cors(),
-			server_threads: match self.args.flag_jsonrpc_server_threads {
-				Some(threads) if threads > 0 => Some(threads),
-				None => None,
-				_ => return Err("--jsonrpc-server-threads number needs to be positive.".into()),
+			server_threads: match self.args.arg_jsonrpc_server_threads {
+				Some(threads) if threads > 0 => threads,
+				_ => 1,
 			},
-			processing_threads: self.args.flag_jsonrpc_threads,
+			processing_threads: self.args.arg_jsonrpc_threads,
 		};
 
 		Ok(conf)
@@ -869,17 +902,25 @@ impl Configuration {
 
 	fn ws_config(&self) -> Result<WsConfiguration, String> {
 		let ui = self.ui_config();
+		let http = self.http_config()?;
+
+		let support_token_api =
+			// never enabled for public node
+			!self.args.flag_public_node
+			// enabled when not unlocking unless the ui is forced
+			&& (self.args.arg_unlock.is_none() || ui.enabled);
 
 		let conf = WsConfiguration {
 			enabled: self.ws_enabled(),
 			interface: self.ws_interface(),
-			port: self.args.flag_ports_shift + self.args.flag_ws_port,
-			apis: self.args.flag_ws_apis.parse()?,
+			port: self.args.arg_ports_shift + self.args.arg_ws_port,
+			apis: self.args.arg_ws_apis.parse()?,
 			hosts: self.ws_hosts(),
 			origins: self.ws_origins(),
 			signer_path: self.directories().signer.into(),
-			support_token_api: !self.args.flag_public_node,
+			support_token_api,
 			ui_address: ui.address(),
+			dapps_address: http.address(),
 		};
 
 		Ok(conf)
@@ -889,8 +930,8 @@ impl Configuration {
 		let http_conf = self.http_config()?;
 		let net_addresses = self.net_addresses()?;
 		Ok(NetworkSettings {
-			name: self.args.flag_identity.clone(),
-			chain: self.chain(),
+			name: self.args.arg_identity.clone(),
+			chain: format!("{}", self.chain()?),
 			network_port: net_addresses.0.port(),
 			rpc_enabled: http_conf.enabled,
 			rpc_interface: http_conf.interface,
@@ -902,13 +943,13 @@ impl Configuration {
 		Ok(UpdatePolicy {
 			enable_downloading: !self.args.flag_no_download,
 			require_consensus: !self.args.flag_no_consensus,
-			filter: match self.args.flag_auto_update.as_ref() {
+			filter: match self.args.arg_auto_update.as_ref() {
 				"none" => UpdateFilter::None,
 				"critical" => UpdateFilter::Critical,
 				"all" => UpdateFilter::All,
 				_ => return Err("Invalid value for `--auto-update`. See `--help` for more information.".into()),
 			},
-			track: match self.args.flag_release_track.as_ref() {
+			track: match self.args.arg_release_track.as_ref() {
 				"stable" => ReleaseTrack::Stable,
 				"beta" => ReleaseTrack::Beta,
 				"nightly" => ReleaseTrack::Nightly,
@@ -917,45 +958,29 @@ impl Configuration {
 				_ => return Err("Invalid value for `--releases-track`. See `--help` for more information.".into()),
 			},
 			path: default_hypervisor_path(),
+			max_size: 128 * 1024 * 1024,
 		})
 	}
 
 	fn directories(&self) -> Directories {
-		use path;
-
 		let local_path = default_local_path();
-		let base_path = self.args.flag_base_path.as_ref().or_else(|| self.args.flag_datadir.as_ref()).map_or_else(|| default_data_path(), |s| s.clone());
+		let base_path = self.args.arg_base_path.as_ref().or_else(|| self.args.arg_datadir.as_ref()).map_or_else(|| default_data_path(), |s| s.clone());
 		let data_path = replace_home("", &base_path);
-		let is_using_base_path = self.args.flag_base_path.is_some();
+		let is_using_base_path = self.args.arg_base_path.is_some();
 		// If base_path is set and db_path is not we default to base path subdir instead of LOCAL.
-		let base_db_path = if is_using_base_path && self.args.flag_db_path.is_none() {
+		let base_db_path = if is_using_base_path && self.args.arg_db_path.is_none() {
 			"$BASE/chains"
 		} else {
-			self.args.flag_db_path.as_ref().map_or(dir::CHAINS_PATH, |s| &s)
+			self.args.arg_db_path.as_ref().map_or(dir::CHAINS_PATH, |s| &s)
 		};
 		let cache_path = if is_using_base_path { "$BASE/cache" } else { dir::CACHE_PATH };
 
 		let db_path = replace_home_and_local(&data_path, &local_path, &base_db_path);
 		let cache_path = replace_home_and_local(&data_path, &local_path, cache_path);
-		let keys_path = replace_home(&data_path, &self.args.flag_keys_path);
-		let dapps_path = replace_home(&data_path, &self.args.flag_dapps_path);
-		let secretstore_path = replace_home(&data_path, &self.args.flag_secretstore_path);
-		let ui_path = replace_home(&data_path, &self.args.flag_ui_path);
-
-		if self.args.flag_geth && !cfg!(windows) {
-			let geth_root  = if self.chain() == "testnet".to_owned() { path::ethereum::test() } else {  path::ethereum::default() };
-			::std::fs::create_dir_all(geth_root.as_path()).unwrap_or_else(
-				|e| warn!("Failed to create '{}' for geth mode: {}", &geth_root.to_str().unwrap(), e));
-		}
-
-		if cfg!(feature = "ipc") && !cfg!(feature = "windows") {
-			let mut path_buf = PathBuf::from(data_path.clone());
-			path_buf.push("ipc");
-			let ipc_path = path_buf.to_str().unwrap();
-			::std::fs::create_dir_all(ipc_path).unwrap_or_else(
-				|e| warn!("Failed to directory '{}' for ipc sockets: {}", ipc_path, e)
-			);
-		}
+		let keys_path = replace_home(&data_path, &self.args.arg_keys_path);
+		let dapps_path = replace_home(&data_path, &self.args.arg_dapps_path);
+		let secretstore_path = replace_home(&data_path, &self.args.arg_secretstore_path);
+		let ui_path = replace_home(&data_path, &self.args.arg_ui_path);
 
 		Directories {
 			keys: keys_path,
@@ -974,8 +999,8 @@ impl Configuration {
 		} else {
 			parity_ipc_path(
 				&self.directories().base,
-				&self.args.flag_ipcpath.clone().unwrap_or(self.args.flag_ipc_path.clone()),
-				self.args.flag_ports_shift,
+				&self.args.arg_ipcpath.clone().unwrap_or(self.args.arg_ipc_path.clone()),
+				self.args.arg_ports_shift,
 			)
 		}
 	}
@@ -993,32 +1018,32 @@ impl Configuration {
 	}
 
 	fn ui_interface(&self) -> String {
-		self.interface(&self.args.flag_ui_interface)
+		self.interface(&self.args.arg_ui_interface)
 	}
 
 	fn rpc_interface(&self) -> String {
-		let rpc_interface = self.args.flag_rpcaddr.clone().unwrap_or(self.args.flag_jsonrpc_interface.clone());
+		let rpc_interface = self.args.arg_rpcaddr.clone().unwrap_or(self.args.arg_jsonrpc_interface.clone());
 		self.interface(&rpc_interface)
 	}
 
 	fn ws_interface(&self) -> String {
-		self.interface(&self.args.flag_ws_interface)
+		self.interface(&self.args.arg_ws_interface)
 	}
 
 	fn ipfs_interface(&self) -> String {
-		self.interface(&self.args.flag_ipfs_api_interface)
+		self.interface(&self.args.arg_ipfs_api_interface)
 	}
 
 	fn secretstore_interface(&self) -> String {
-		self.interface(&self.args.flag_secretstore_interface)
+		self.interface(&self.args.arg_secretstore_interface)
 	}
 
 	fn secretstore_http_interface(&self) -> String {
-		self.interface(&self.args.flag_secretstore_http_interface)
+		self.interface(&self.args.arg_secretstore_http_interface)
 	}
 
 	fn secretstore_self_secret(&self) -> Result<Option<NodeSecretKey>, String> {
-		match self.args.flag_secretstore_secret {
+		match self.args.arg_secretstore_secret {
 			Some(ref s) if s.len() == 64 => Ok(Some(NodeSecretKey::Plain(s.parse()
 				.map_err(|e| format!("Invalid secret store secret: {}. Error: {:?}", s, e))?))),
 			Some(ref s) if s.len() == 40 => Ok(Some(NodeSecretKey::KeyStore(s.parse()
@@ -1028,9 +1053,16 @@ impl Configuration {
 		}
 	}
 
+	fn secretstore_admin_public(&self) -> Result<Option<Public>, String> {
+		match self.args.arg_secretstore_admin_public.as_ref() {
+			Some(admin_public) => Ok(Some(admin_public.parse().map_err(|e| format!("Invalid secret store admin public: {}", e))?)),
+			None => Ok(None),
+		}
+	}
+
 	fn secretstore_nodes(&self) -> Result<BTreeMap<Public, (String, u16)>, String> {
 		let mut nodes = BTreeMap::new();
-		for node in self.args.flag_secretstore_nodes.split(',').filter(|n| n != &"") {
+		for node in self.args.arg_secretstore_nodes.split(',').filter(|n| n != &"") {
 			let public_and_addr: Vec<_> = node.split('@').collect();
 			if public_and_addr.len() != 2 {
 				return Err(format!("Invalid secret store node: {}", node));
@@ -1053,7 +1085,7 @@ impl Configuration {
 	}
 
 	fn stratum_interface(&self) -> String {
-		self.interface(&self.args.flag_stratum_interface)
+		self.interface(&self.args.arg_stratum_interface)
 	}
 
 	fn rpc_enabled(&self) -> bool {
@@ -1080,22 +1112,34 @@ impl Configuration {
 		!self.args.flag_no_secretstore_acl_check
 	}
 
+	fn secretstore_auto_migrate_enabled(&self) -> bool {
+		!self.args.flag_no_secretstore_auto_migrate
+	}
+
+	fn secretstore_service_contract_address(&self) -> Result<Option<SecretStoreContractAddress>, String> {
+		Ok(match self.args.arg_secretstore_contract.as_ref() {
+			"none" => None,
+			"registry" => Some(SecretStoreContractAddress::Registry),
+			a => Some(SecretStoreContractAddress::Address(a.parse().map_err(|e| format!("{}", e))?)),
+		})
+	}
+
 	fn ui_enabled(&self) -> bool {
 		if self.args.flag_force_ui {
 			return true;
 		}
 
-		let ui_disabled = self.args.flag_unlock.is_some() ||
+		let ui_disabled = self.args.arg_unlock.is_some() ||
 			self.args.flag_geth ||
 			self.args.flag_no_ui;
 
-		!ui_disabled && cfg!(feature = "ui-enabled")
+		self.args.cmd_ui && !ui_disabled && cfg!(feature = "ui-enabled")
 	}
 
 	fn verifier_settings(&self) -> VerifierSettings {
 		let mut settings = VerifierSettings::default();
 		settings.scale_verifiers = self.args.flag_scale_verifiers;
-		if let Some(num_verifiers) = self.args.flag_num_verifiers {
+		if let Some(num_verifiers) = self.args.arg_num_verifiers {
 			settings.num_verifiers = num_verifiers;
 		}
 
@@ -1105,7 +1149,7 @@ impl Configuration {
 	fn whisper_config(&self) -> ::whisper::Config {
 		::whisper::Config {
 			enabled: self.args.flag_whisper,
-			target_message_pool_size: self.args.flag_whisper_pool_size * 1024 * 1024,
+			target_message_pool_size: self.args.arg_whisper_pool_size * 1024 * 1024,
 		}
 	}
 }
@@ -1113,12 +1157,13 @@ impl Configuration {
 #[cfg(test)]
 mod tests {
 	use std::io::Write;
-	use std::fs::{File, create_dir};
+	use std::fs::File;
 	use std::str::FromStr;
 
-	use devtools::{RandomTempPath};
+	use tempdir::TempDir;
 	use ethcore::client::{VMType, BlockId};
-	use ethcore::miner::{MinerOptions, PrioritizationStrategy};
+	use ethcore::miner::MinerOptions;
+	use miner::transaction_queue::PrioritizationStrategy;
 	use parity_rpc::NetworkSettings;
 	use updater::{UpdatePolicy, UpdateFilter, ReleaseTrack};
 
@@ -1310,13 +1355,14 @@ mod tests {
 			interface: "127.0.0.1".into(),
 			port: 8546,
 			apis: ApiSet::UnsafeContext,
-			origins: Some(vec!["chrome-extension://*".into(), "moz-extension://*".into()]),
+			origins: Some(vec!["parity://*".into(),"chrome-extension://*".into(), "moz-extension://*".into()]),
 			hosts: Some(vec![]),
 			signer_path: expected.into(),
-			ui_address: Some(("127.0.0.1".to_owned(), 8180)),
+			ui_address: None,
+			dapps_address: Some("127.0.0.1:8545".into()),
 			support_token_api: true
 		}, UiConfiguration {
-			enabled: true,
+			enabled: false,
 			interface: "127.0.0.1".into(),
 			port: 8180,
 			hosts: Some(vec![]),
@@ -1341,6 +1387,7 @@ mod tests {
 			daemon: None,
 			logger_config: Default::default(),
 			miner_options: Default::default(),
+			gas_price_percentile: 50,
 			ntp_servers: vec![
 				"0.parity.pool.ntp.org:123".into(),
 				"1.parity.pool.ntp.org:123".into(),
@@ -1357,7 +1404,14 @@ mod tests {
 			acc_conf: Default::default(),
 			gas_pricer_conf: Default::default(),
 			miner_extras: Default::default(),
-			update_policy: UpdatePolicy { enable_downloading: true, require_consensus: true, filter: UpdateFilter::Critical, track: ReleaseTrack::Unknown, path: default_hypervisor_path() },
+			update_policy: UpdatePolicy {
+				enable_downloading: true,
+				require_consensus: true,
+				filter: UpdateFilter::Critical,
+				track: ReleaseTrack::Unknown,
+				path: default_hypervisor_path(),
+				max_size: 128 * 1024 * 1024,
+			},
 			mode: Default::default(),
 			tracing: Default::default(),
 			compaction: Default::default(),
@@ -1381,6 +1435,7 @@ mod tests {
 			verifier_settings: Default::default(),
 			serve_light: true,
 			light: false,
+			no_hardcoded_sync: false,
 			no_persistent_txqueue: false,
 			whisper: Default::default(),
 		};
@@ -1401,21 +1456,20 @@ mod tests {
 		let conf3 = parse(&["parity", "--tx-queue-strategy", "gas"]);
 
 		// then
-		let min_period = conf0.args.flag_reseal_min_period;
-		assert_eq!(conf0.miner_options(min_period).unwrap(), mining_options);
+		assert_eq!(conf0.miner_options().unwrap(), mining_options);
 		mining_options.tx_queue_strategy = PrioritizationStrategy::GasFactorAndGasPrice;
-		assert_eq!(conf1.miner_options(min_period).unwrap(), mining_options);
+		assert_eq!(conf1.miner_options().unwrap(), mining_options);
 		mining_options.tx_queue_strategy = PrioritizationStrategy::GasPriceOnly;
-		assert_eq!(conf2.miner_options(min_period).unwrap(), mining_options);
+		assert_eq!(conf2.miner_options().unwrap(), mining_options);
 		mining_options.tx_queue_strategy = PrioritizationStrategy::GasAndGasPrice;
-		assert_eq!(conf3.miner_options(min_period).unwrap(), mining_options);
+		assert_eq!(conf3.miner_options().unwrap(), mining_options);
 	}
 
 	#[test]
 	fn should_fail_on_force_reseal_and_reseal_min_period() {
-		let conf = parse(&["parity", "--chain", "dev", "--force-sealing"]);
+		let conf = parse(&["parity", "--chain", "dev", "--force-sealing", "--reseal-min-period", "0"]);
 
-		assert!(conf.miner_options(0).is_err());
+		assert!(conf.miner_options().is_err());
 	}
 
 	#[test]
@@ -1427,9 +1481,30 @@ mod tests {
 		let conf3 = parse(&["parity", "--auto-update=xxx"]);
 
 		// then
-		assert_eq!(conf0.update_policy().unwrap(), UpdatePolicy{enable_downloading: true, require_consensus: true, filter: UpdateFilter::Critical, track: ReleaseTrack::Testing, path: default_hypervisor_path()});
-		assert_eq!(conf1.update_policy().unwrap(), UpdatePolicy{enable_downloading: true, require_consensus: false, filter: UpdateFilter::All, track: ReleaseTrack::Unknown, path: default_hypervisor_path()});
-		assert_eq!(conf2.update_policy().unwrap(), UpdatePolicy{enable_downloading: false, require_consensus: true, filter: UpdateFilter::All, track: ReleaseTrack::Beta, path: default_hypervisor_path()});
+		assert_eq!(conf0.update_policy().unwrap(), UpdatePolicy {
+			enable_downloading: true,
+			require_consensus: true,
+			filter: UpdateFilter::Critical,
+			track: ReleaseTrack::Testing,
+			path: default_hypervisor_path(),
+			max_size: 128 * 1024 * 1024,
+		});
+		assert_eq!(conf1.update_policy().unwrap(), UpdatePolicy {
+			enable_downloading: true,
+			require_consensus: false,
+			filter: UpdateFilter::All,
+			track: ReleaseTrack::Unknown,
+			path: default_hypervisor_path(),
+			max_size: 128 * 1024 * 1024,
+		});
+		assert_eq!(conf2.update_policy().unwrap(), UpdatePolicy {
+			enable_downloading: false,
+			require_consensus: true,
+			filter: UpdateFilter::All,
+			track: ReleaseTrack::Beta,
+			path: default_hypervisor_path(),
+			max_size: 128 * 1024 * 1024,
+		});
 		assert!(conf3.update_policy().is_err());
 	}
 
@@ -1443,7 +1518,7 @@ mod tests {
 		// then
 		assert_eq!(conf.network_settings(), Ok(NetworkSettings {
 			name: "testname".to_owned(),
-			chain: "testnet".to_owned(),
+			chain: "kovan".to_owned(),
 			network_port: 30303,
 			rpc_enabled: true,
 			rpc_interface: "127.0.0.1".to_owned(),
@@ -1459,7 +1534,7 @@ mod tests {
 			assert_eq!(net.rpc_enabled, true);
 			assert_eq!(net.rpc_interface, "0.0.0.0".to_owned());
 			assert_eq!(net.rpc_port, 8000);
-			assert_eq!(conf.rpc_cors(), Some(vec!["*".to_owned()]));
+			assert_eq!(conf.rpc_cors(), None);
 			assert_eq!(conf.rpc_apis(), "web3,eth".to_owned());
 		}
 
@@ -1526,8 +1601,8 @@ mod tests {
 		let conf2 = parse(&["parity", "--ipfs-api-cors", "http://parity.io,http://something.io"]);
 
 		// then
-		assert_eq!(conf0.ipfs_cors(), None);
-		assert_eq!(conf1.ipfs_cors(), Some(vec!["*".into()]));
+		assert_eq!(conf0.ipfs_cors(), Some(vec![]));
+		assert_eq!(conf1.ipfs_cors(), None);
 		assert_eq!(conf2.ipfs_cors(), Some(vec!["http://parity.io".into(),"http://something.io".into()]));
 	}
 
@@ -1560,32 +1635,51 @@ mod tests {
 		// given
 
 		// when
-		let conf0 = parse(&["parity", "--ui-path", "signer"]);
-		let conf1 = parse(&["parity", "--ui-path", "signer", "--ui-no-validation"]);
-		let conf2 = parse(&["parity", "--ui-path", "signer", "--ui-port", "3123"]);
-		let conf3 = parse(&["parity", "--ui-path", "signer", "--ui-interface", "test"]);
+		let conf0 = parse(&["parity", "--ui-path=signer"]);
+		let conf1 = parse(&["parity", "--ui-path=signer", "--ui-no-validation"]);
+		let conf2 = parse(&["parity", "--ui-path=signer", "--ui-port", "3123"]);
+		let conf3 = parse(&["parity", "--ui-path=signer", "--ui-interface", "test"]);
+		let conf4 = parse(&["parity", "--ui-path=signer", "--force-ui"]);
+		let conf5 = parse(&["parity", "--ui-path=signer", "ui"]);
 
 		// then
 		assert_eq!(conf0.directories().signer, "signer".to_owned());
 		assert_eq!(conf0.ui_config(), UiConfiguration {
+			enabled: false,
+			interface: "127.0.0.1".into(),
+			port: 8180,
+			hosts: Some(vec![]),
+		});
+		assert!(conf4.ws_config().unwrap().hosts.is_some());
+		assert_eq!(conf4.directories().signer, "signer".to_owned());
+		assert_eq!(conf4.ui_config(), UiConfiguration {
+			enabled: true,
+			interface: "127.0.0.1".into(),
+			port: 8180,
+			hosts: Some(vec![]),
+		});
+		assert!(conf5.ws_config().unwrap().hosts.is_some());
+		assert!(conf5.ws_config().unwrap().hosts.is_some());
+		assert_eq!(conf5.directories().signer, "signer".to_owned());
+		assert_eq!(conf5.ui_config(), UiConfiguration {
 			enabled: true,
 			interface: "127.0.0.1".into(),
 			port: 8180,
 			hosts: Some(vec![]),
 		});
-		assert!(conf0.ws_config().unwrap().hosts.is_some());
+		assert!(conf5.ws_config().unwrap().hosts.is_some());
 		assert_eq!(conf1.directories().signer, "signer".to_owned());
 		assert_eq!(conf1.ui_config(), UiConfiguration {
-			enabled: true,
+			enabled: false,
 			interface: "127.0.0.1".into(),
 			port: 8180,
 			hosts: Some(vec![]),
 		});
-		assert_eq!(conf1.dapps_config().extra_embed_on, vec![("localhost".to_owned(), 3000)]);
+		assert_eq!(conf1.dapps_config().extra_embed_on, vec![("127.0.0.1".to_owned(), 3000)]);
 		assert_eq!(conf1.ws_config().unwrap().origins, None);
 		assert_eq!(conf2.directories().signer, "signer".to_owned());
 		assert_eq!(conf2.ui_config(), UiConfiguration {
-			enabled: true,
+			enabled: false,
 			interface: "127.0.0.1".into(),
 			port: 3123,
 			hosts: Some(vec![]),
@@ -1593,7 +1687,7 @@ mod tests {
 		assert!(conf2.ws_config().unwrap().hosts.is_some());
 		assert_eq!(conf3.directories().signer, "signer".to_owned());
 		assert_eq!(conf3.ui_config(), UiConfiguration {
-			enabled: true,
+			enabled: false,
 			interface: "test".into(),
 			port: 8180,
 			hosts: Some(vec![]),
@@ -1604,37 +1698,33 @@ mod tests {
 	#[test]
 	fn should_parse_dapp_opening() {
 		// given
-		let temp = RandomTempPath::new();
-		let name = temp.file_name().unwrap().to_str().unwrap();
-		create_dir(temp.as_str().to_owned()).unwrap();
+		let tempdir = TempDir::new("").unwrap();
 
 		// when
-		let conf0 = parse(&["parity", "dapp", temp.to_str().unwrap()]);
+		let conf0 = parse(&["parity", "dapp", tempdir.path().to_str().unwrap()]);
 
 		// then
-		assert_eq!(conf0.dapp_to_open(), Ok(Some(name.into())));
+		assert_eq!(conf0.dapp_to_open(), Ok(Some(tempdir.path().file_name().unwrap().to_str().unwrap().into())));
 		let extra_dapps = conf0.dapps_config().extra_dapps;
-		assert_eq!(extra_dapps, vec![temp.to_owned()]);
+		assert_eq!(extra_dapps, vec![tempdir.path().to_owned()]);
 	}
 
 	#[test]
 	fn should_not_bail_on_empty_line_in_reserved_peers() {
-		let temp = RandomTempPath::new();
-		create_dir(temp.as_str().to_owned()).unwrap();
-		let filename = temp.as_str().to_owned() + "/peers";
-		File::create(filename.clone()).unwrap().write_all(b"  \n\t\n").unwrap();
-		let args = vec!["parity", "--reserved-peers", &filename];
+		let tempdir = TempDir::new("").unwrap();
+		let filename = tempdir.path().join("peers");
+		File::create(&filename).unwrap().write_all(b"  \n\t\n").unwrap();
+		let args = vec!["parity", "--reserved-peers", filename.to_str().unwrap()];
 		let conf = Configuration::parse(&args, None).unwrap();
 		assert!(conf.init_reserved_nodes().is_ok());
 	}
 
 	#[test]
 	fn should_ignore_comments_in_reserved_peers() {
-		let temp = RandomTempPath::new();
-		create_dir(temp.as_str().to_owned()).unwrap();
-		let filename = temp.as_str().to_owned() + "/peers_comments";
-		File::create(filename.clone()).unwrap().write_all(b"# Sample comment\nenode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@172.0.0.1:30303\n").unwrap();
-		let args = vec!["parity", "--reserved-peers", &filename];
+		let tempdir = TempDir::new("").unwrap();
+		let filename = tempdir.path().join("peers_comments");
+		File::create(&filename).unwrap().write_all(b"# Sample comment\nenode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@172.0.0.1:30303\n").unwrap();
+		let args = vec!["parity", "--reserved-peers", filename.to_str().unwrap()];
 		let conf = Configuration::parse(&args, None).unwrap();
 		let reserved_nodes = conf.init_reserved_nodes();
 		assert!(reserved_nodes.is_ok());
@@ -1852,7 +1942,7 @@ mod tests {
 
 		let base_path = ::dir::default_data_path();
 		let local_path = ::dir::default_local_path();
-		assert_eq!(std.directories().cache, ::helpers::replace_home_and_local(&base_path, &local_path, ::dir::CACHE_PATH));
+		assert_eq!(std.directories().cache, dir::helpers::replace_home_and_local(&base_path, &local_path, ::dir::CACHE_PATH));
 		assert_eq!(base.directories().cache, "/test/cache");
 	}
 }
diff --git a/parity/dapps.rs b/parity/dapps.rs
index 4177644d3b458f563fe47b3db24d869567b41dc9..d93ae2db7cc79aefc4883071adee6c433397d0a0 100644
--- a/parity/dapps.rs
+++ b/parity/dapps.rs
@@ -17,21 +17,22 @@
 use std::path::PathBuf;
 use std::sync::Arc;
 
+use bytes::Bytes;
 use dir::default_data_path;
-use ethcore::client::{Client, BlockChainClient, BlockId};
-use ethcore::transaction::{Transaction, Action};
+use dir::helpers::replace_home;
+use ethcore::client::{Client, BlockChainClient, BlockId, CallContract};
 use ethsync::LightSync;
-use futures::{future, IntoFuture, Future, BoxFuture};
+use futures::{Future, future, IntoFuture};
+use futures_cpupool::CpuPool;
 use hash_fetch::fetch::Client as FetchClient;
-use hash_fetch::urlhint::ContractClient;
-use helpers::replace_home;
-use light::client::Client as LightClient;
+use registrar::{RegistrarClient, Asynchronous};
+use light::client::LightChainClient;
 use light::on_demand::{self, OnDemand};
 use node_health::{SyncStatus, NodeHealth};
 use rpc;
 use rpc_apis::SignerService;
-use parity_reactor;
-use util::{Bytes, Address};
+use transaction::{Transaction, Action};
+use ethereum_types::Address;
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct Configuration {
@@ -56,7 +57,7 @@ impl Default for Configuration {
 }
 
 impl Configuration {
-	pub fn address(&self, address: Option<(String, u16)>) -> Option<(String, u16)> {
+	pub fn address(&self, address: Option<::parity_rpc::Host>) -> Option<::parity_rpc::Host> {
 		match self.enabled {
 			true => address,
 			false => None,
@@ -70,34 +71,41 @@ pub struct FullRegistrar {
 	pub client: Arc<Client>,
 }
 
-impl ContractClient for FullRegistrar {
-	fn registrar(&self) -> Result<Address, String> {
-		self.client.additional_params().get("registrar")
+impl FullRegistrar {
+	pub fn new(client: Arc<Client>) -> Self {
+		FullRegistrar {
+			client,
+		}
+	}
+}
+
+impl RegistrarClient for FullRegistrar {
+	type Call = Asynchronous;
+
+	fn registrar_address(&self) -> Result<Address, String> {
+		self.client.registrar_address()
 			 .ok_or_else(|| "Registrar not defined.".into())
-			 .and_then(|registrar| {
-				 registrar.parse().map_err(|e| format!("Invalid registrar address: {:?}", e))
-			 })
 	}
 
-	fn call(&self, address: Address, data: Bytes) -> BoxFuture<Bytes, String> {
-		self.client.call_contract(BlockId::Latest, address, data)
-			.into_future()
-			.boxed()
+	fn call_contract(&self, address: Address, data: Bytes) -> Self::Call {
+		Box::new(self.client.call_contract(BlockId::Latest, address, data).into_future())
 	}
 }
 
 /// Registrar implementation for the light client.
-pub struct LightRegistrar {
+pub struct LightRegistrar<T> {
 	/// The light client.
-	pub client: Arc<LightClient>,
+	pub client: Arc<T>,
 	/// Handle to the on-demand service.
 	pub on_demand: Arc<OnDemand>,
 	/// Handle to the light network service.
 	pub sync: Arc<LightSync>,
 }
 
-impl ContractClient for LightRegistrar {
-	fn registrar(&self) -> Result<Address, String> {
+impl<T: LightChainClient + 'static> RegistrarClient for LightRegistrar<T> {
+	type Call = Box<Future<Item = Bytes, Error = String> + Send>;
+
+	fn registrar_address(&self) -> Result<Address, String> {
 		self.client.engine().additional_params().get("registrar")
 			 .ok_or_else(|| "Registrar not defined.".into())
 			 .and_then(|registrar| {
@@ -105,8 +113,15 @@ impl ContractClient for LightRegistrar {
 			 })
 	}
 
-	fn call(&self, address: Address, data: Bytes) -> BoxFuture<Bytes, String> {
-		let (header, env_info) = (self.client.best_block_header(), self.client.latest_env_info());
+	fn call_contract(&self, address: Address, data: Bytes) -> Self::Call {
+		let header = self.client.best_block_header();
+		let env_info = self.client.env_info(BlockId::Hash(header.hash()))
+			.ok_or_else(|| format!("Cannot fetch env info for header {}", header.hash()));
+
+		let env_info = match env_info {
+			Ok(e) => e,
+			Err(e) => return Box::new(future::err(e)),
+		};
 
 		let maybe_future = self.sync.with_context(move |ctx| {
 			self.on_demand
@@ -132,8 +147,8 @@ impl ContractClient for LightRegistrar {
 		});
 
 		match maybe_future {
-			Some(fut) => fut.boxed(),
-			None => future::err("cannot query registry: network disabled".into()).boxed(),
+			Some(fut) => Box::new(fut),
+			None => Box::new(future::err("cannot query registry: network disabled".into())),
 		}
 	}
 }
@@ -144,9 +159,9 @@ impl ContractClient for LightRegistrar {
 pub struct Dependencies {
 	pub node_health: NodeHealth,
 	pub sync_status: Arc<SyncStatus>,
-	pub contract_client: Arc<ContractClient>,
-	pub remote: parity_reactor::TokioRemote,
+	pub contract_client: Arc<RegistrarClient<Call=Asynchronous>>,
 	pub fetch: FetchClient,
+	pub pool: CpuPool,
 	pub signer: Arc<SignerService>,
 	pub ui_address: Option<(String, u16)>,
 }
@@ -189,9 +204,7 @@ mod server {
 
 	pub struct Middleware;
 	impl RequestMiddleware for Middleware {
-		fn on_request(
-			&self, _req: &hyper::server::Request<hyper::net::HttpStream>, _control: &hyper::Control
-		) -> RequestMiddlewareAction {
+		fn on_request(&self, _req: hyper::Request) -> RequestMiddlewareAction {
 			unreachable!()
 		}
 	}
@@ -227,7 +240,6 @@ mod server {
 	use rpc_apis;
 
 	use parity_dapps;
-	use parity_reactor;
 
 	pub use parity_dapps::Middleware;
 
@@ -240,12 +252,11 @@ mod server {
 		extra_script_src: Vec<(String, u16)>,
 	) -> Result<Middleware, String> {
 		let signer = deps.signer;
-		let parity_remote = parity_reactor::Remote::new(deps.remote.clone());
 		let web_proxy_tokens = Arc::new(move |token| signer.web_proxy_access_token_domain(&token));
 
 		Ok(parity_dapps::Middleware::dapps(
+			deps.pool,
 			deps.node_health,
-			parity_remote,
 			deps.ui_address,
 			extra_embed_on,
 			extra_script_src,
@@ -263,10 +274,9 @@ mod server {
 		deps: Dependencies,
 		dapps_domain: &str,
 	) -> Result<Middleware, String> {
-		let parity_remote = parity_reactor::Remote::new(deps.remote.clone());
 		Ok(parity_dapps::Middleware::ui(
+			deps.pool,
 			deps.node_health,
-			parity_remote,
 			dapps_domain,
 			deps.contract_client,
 			deps.sync_status,
@@ -289,12 +299,13 @@ mod server {
 			self.endpoints.list()
 				.into_iter()
 				.map(|app| rpc_apis::LocalDapp {
-					id: app.id,
+					id: app.id.unwrap_or_else(|| "unknown".into()),
 					name: app.name,
 					description: app.description,
 					version: app.version,
 					author: app.author,
 					icon_url: app.icon_url,
+					local_url: app.local_url,
 				})
 				.collect()
 		}
diff --git a/parity/deprecated.rs b/parity/deprecated.rs
index 820181efa6b589b23fba1e4a081e2a2f9ba69398..b41475d9dbdfe7dff35cdc0ed7bdf7ec025d4f18 100644
--- a/parity/deprecated.rs
+++ b/parity/deprecated.rs
@@ -37,6 +37,10 @@ impl fmt::Display for Deprecated {
 pub fn find_deprecated(args: &Args) -> Vec<Deprecated> {
 	let mut result = vec![];
 
+	if args.flag_warp {
+		result.push(Deprecated::DoesNothing("--warp"));
+	}
+
 	if args.flag_jsonrpc {
 		result.push(Deprecated::DoesNothing("--jsonrpc"));
 	}
@@ -65,40 +69,40 @@ pub fn find_deprecated(args: &Args) -> Vec<Deprecated> {
 		result.push(Deprecated::Replaced("--ipc-off", "--no-ipc"));
 	}
 
-	if args.flag_etherbase.is_some() {
+	if args.arg_etherbase.is_some() {
 		result.push(Deprecated::Replaced("--etherbase", "--author"));
 	}
 
-	if args.flag_extradata.is_some() {
+	if args.arg_extradata.is_some() {
 		result.push(Deprecated::Replaced("--extradata", "--extra-data"));
 	}
 
 	// Removed in 1.7
-	if args.flag_dapps_port.is_some() {
+	if args.arg_dapps_port.is_some() {
 		result.push(Deprecated::Replaced("--dapps-port", "--jsonrpc-port"));
 	}
 
-	if args.flag_dapps_interface.is_some() {
+	if args.arg_dapps_interface.is_some() {
 		result.push(Deprecated::Replaced("--dapps-interface", "--jsonrpc-interface"));
 	}
 
-	if args.flag_dapps_hosts.is_some() {
+	if args.arg_dapps_hosts.is_some() {
 		result.push(Deprecated::Replaced("--dapps-hosts", "--jsonrpc-hosts"));
 	}
 
-	if args.flag_dapps_cors.is_some() {
+	if args.arg_dapps_cors.is_some() {
 		result.push(Deprecated::Replaced("--dapps-cors", "--jsonrpc-cors"));
 	}
 
-	if args.flag_dapps_user.is_some() {
+	if args.arg_dapps_user.is_some() {
 		result.push(Deprecated::Removed("--dapps-user"));
 	}
 
-	if args.flag_dapps_pass.is_some() {
+	if args.arg_dapps_pass.is_some() {
 		result.push(Deprecated::Removed("--dapps-pass"));
 	}
 
-	if args.flag_dapps_apis_all.is_some() {
+	if args.flag_dapps_apis_all {
 		result.push(Deprecated::Replaced("--dapps-apis-all", "--jsonrpc-apis"));
 	}
 
@@ -117,6 +121,7 @@ mod tests {
 		assert_eq!(find_deprecated(&Args::default()), vec![]);
 		assert_eq!(find_deprecated(&{
 			let mut args = Args::default();
+			args.flag_warp = true;
 			args.flag_jsonrpc = true;
 			args.flag_rpc = true;
 			args.flag_jsonrpc_off = true;
@@ -124,17 +129,18 @@ mod tests {
 			args.flag_dapps_off = true;
 			args.flag_ipcdisable = true;
 			args.flag_ipc_off = true;
-			args.flag_etherbase = Some(Default::default());
-			args.flag_extradata = Some(Default::default());
-			args.flag_dapps_port = Some(Default::default());
-			args.flag_dapps_interface = Some(Default::default());
-			args.flag_dapps_hosts = Some(Default::default());
-			args.flag_dapps_cors = Some(Default::default());
-			args.flag_dapps_user = Some(Default::default());
-			args.flag_dapps_pass = Some(Default::default());
-			args.flag_dapps_apis_all = Some(Default::default());
+			args.arg_etherbase = Some(Default::default());
+			args.arg_extradata = Some(Default::default());
+			args.arg_dapps_port = Some(Default::default());
+			args.arg_dapps_interface = Some(Default::default());
+			args.arg_dapps_hosts = Some(Default::default());
+			args.arg_dapps_cors = Some(Default::default());
+			args.arg_dapps_user = Some(Default::default());
+			args.arg_dapps_pass = Some(Default::default());
+			args.flag_dapps_apis_all = true;
 			args
 		}), vec![
+			Deprecated::DoesNothing("--warp"),
 			Deprecated::DoesNothing("--jsonrpc"),
 			Deprecated::DoesNothing("--rpc"),
 			Deprecated::Replaced("--jsonrpc-off", "--no-jsonrpc"),
diff --git a/parity/export_hardcoded_sync.rs b/parity/export_hardcoded_sync.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7a48c0592e9f37ffbdd629b3ccc5dc5c297b56de
--- /dev/null
+++ b/parity/export_hardcoded_sync.rs
@@ -0,0 +1,117 @@
+// Copyright 2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+use std::time::Duration;
+
+use ethcore::client::DatabaseCompactionProfile;
+use ethcore::db::NUM_COLUMNS;
+use ethcore::spec::{SpecParams, OptimizeFor};
+use kvdb_rocksdb::{Database, DatabaseConfig};
+use light::client::fetch::Unavailable as UnavailableDataFetcher;
+use light::Cache as LightDataCache;
+
+use params::{SpecType, Pruning};
+use helpers::execute_upgrades;
+use dir::Directories;
+use cache::CacheConfig;
+use user_defaults::UserDefaults;
+
+// Number of minutes before a given gas price corpus should expire.
+// Light client only.
+const GAS_CORPUS_EXPIRATION_MINUTES: u64 = 60 * 6;
+
+#[derive(Debug, PartialEq)]
+pub struct ExportHsyncCmd {
+	pub cache_config: CacheConfig,
+	pub dirs: Directories,
+	pub spec: SpecType,
+	pub pruning: Pruning,
+	pub compaction: DatabaseCompactionProfile,
+	pub wal: bool,
+}
+
+pub fn execute(cmd: ExportHsyncCmd) -> Result<String, String> {
+	use light::client as light_client;
+	use parking_lot::Mutex;
+
+	// load spec
+	let spec = cmd.spec.spec(SpecParams::new(cmd.dirs.cache.as_ref(), OptimizeFor::Memory))?;
+
+	// load genesis hash
+	let genesis_hash = spec.genesis_header().hash();
+
+	// database paths
+	let db_dirs = cmd.dirs.database(genesis_hash, cmd.spec.legacy_fork_name(), spec.data_dir.clone());
+
+	// user defaults path
+	let user_defaults_path = db_dirs.user_defaults_path();
+
+	// load user defaults
+	let user_defaults = UserDefaults::load(&user_defaults_path)?;
+
+	// select pruning algorithm
+	let algorithm = cmd.pruning.to_algorithm(&user_defaults);
+
+	let compaction = cmd.compaction.compaction_profile(db_dirs.db_root_path().as_path());
+
+	// execute upgrades
+	execute_upgrades(&cmd.dirs.base, &db_dirs, algorithm, compaction.clone())?;
+
+	// create dirs used by parity
+	cmd.dirs.create_dirs(false, false, false)?;
+
+	// TODO: configurable cache size.
+	let cache = LightDataCache::new(Default::default(), Duration::from_secs(60 * GAS_CORPUS_EXPIRATION_MINUTES));
+	let cache = Arc::new(Mutex::new(cache));
+
+	// start client and create transaction queue.
+	let mut config = light_client::Config {
+		queue: Default::default(),
+		chain_column: ::ethcore::db::COL_LIGHT_CHAIN,
+		verify_full: true,
+		check_seal: true,
+		no_hardcoded_sync: true,
+	};
+
+	config.queue.max_mem_use = cmd.cache_config.queue() as usize * 1024 * 1024;
+
+	// initialize database.
+	let db = {
+		let db_config = DatabaseConfig {
+			memory_budget: Some(cmd.cache_config.blockchain() as usize * 1024 * 1024),
+			compaction: compaction,
+			wal: cmd.wal,
+			.. DatabaseConfig::with_columns(NUM_COLUMNS)
+		};
+
+		Arc::new(Database::open(
+			&db_config,
+			&db_dirs.client_path(algorithm).to_str().expect("DB path could not be converted to string.")
+		).map_err(|e| format!("Error opening database: {}", e))?)
+	};
+
+	let service = light_client::Service::start(config, &spec, UnavailableDataFetcher, db, cache)
+		.map_err(|e| format!("Error starting light client: {}", e))?;
+
+	let hs = service.client().read_hardcoded_sync()
+		.map_err(|e| format!("Error reading hardcoded sync: {}", e))?;
+	if let Some(hs) = hs {
+		Ok(::serde_json::to_string_pretty(&hs.to_json()).expect("generated JSON is always valid"))
+	} else {
+		Err("Error: cannot generate hardcoded sync because the database is empty.".into())
+	}
+}
diff --git a/parity/helpers.rs b/parity/helpers.rs
index 2a1b3156d9fe3bb2ddc91ea8c53fbd0d2cc2769e..959dddba92db266ccc62efc37881758e0647001d 100644
--- a/parity/helpers.rs
+++ b/parity/helpers.rs
@@ -14,19 +14,22 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{io, env};
+use std::io;
 use std::io::{Write, BufReader, BufRead};
 use std::time::Duration;
 use std::fs::File;
-use util::{clean_0x, U256, Address, CompactionProfile};
-use util::journaldb::Algorithm;
+use ethereum_types::{U256, clean_0x, Address};
+use kvdb_rocksdb::CompactionProfile;
+use journaldb::Algorithm;
 use ethcore::client::{Mode, BlockId, VMType, DatabaseCompactionProfile, ClientConfig, VerifierType};
-use ethcore::miner::{PendingSet, GasLimit, PrioritizationStrategy};
+use ethcore::miner::{PendingSet, GasLimit};
+use miner::transaction_queue::PrioritizationStrategy;
 use cache::CacheConfig;
 use dir::DatabaseDirectories;
+use dir::helpers::replace_home;
 use upgrade::{upgrade, upgrade_data_paths};
 use migration::migrate;
-use ethsync::is_valid_node_url;
+use ethsync::{validate_node_url, self};
 use path;
 
 pub fn to_duration(s: &str) -> Result<Duration, String> {
@@ -132,19 +135,6 @@ pub fn to_price(s: &str) -> Result<f32, String> {
 	s.parse::<f32>().map_err(|_| format!("Invalid transaciton price 's' given. Must be a decimal number."))
 }
 
-/// Replaces `$HOME` str with home directory path.
-pub fn replace_home(base: &str, arg: &str) -> String {
-	// the $HOME directory on mac os should be `~/Library` or `~/Library/Application Support`
-	let r = arg.replace("$HOME", env::home_dir().unwrap().to_str().unwrap());
-	let r = r.replace("$BASE", base);
-	r.replace("/", &::std::path::MAIN_SEPARATOR.to_string())
-}
-
-pub fn replace_home_and_local(base: &str, local: &str, arg: &str) -> String {
-	let r = replace_home(base, arg);
-	r.replace("$LOCAL", local)
-}
-
 /// Flush output buffer.
 pub fn flush_stdout() {
 	io::stdout().flush().expect("stdout is flushable; qed");
@@ -178,10 +168,10 @@ pub fn parity_ipc_path(base: &str, path: &str, shift: u16) -> String {
 pub fn to_bootnodes(bootnodes: &Option<String>) -> Result<Vec<String>, String> {
 	match *bootnodes {
 		Some(ref x) if !x.is_empty() => x.split(',').map(|s| {
-			if is_valid_node_url(s) {
-				Ok(s.to_owned())
-			} else {
-				Err(format!("Invalid node address format given for a boot node: {}", s))
+			match validate_node_url(s).map(Into::into) {
+				None => Ok(s.to_owned()),
+				Some(ethsync::ErrorKind::AddressResolve(_)) => Err(format!("Failed to resolve hostname of a boot node: {}", s)),
+				Some(_) => Err(format!("Invalid node address format given for a boot node: {}", s)),
 			}
 		}).collect(),
 		Some(_) => Ok(vec![]),
@@ -210,10 +200,10 @@ pub fn default_network_config() -> ::ethsync::NetworkConfiguration {
 		ip_filter: IpFilter::default(),
 		reserved_nodes: Vec::new(),
 		allow_non_reserved: true,
+		client_version: ::parity_version::version(),
 	}
 }
 
-#[cfg_attr(feature = "dev", allow(too_many_arguments))]
 pub fn to_client_config(
 		cache_config: &CacheConfig,
 		spec_name: String,
@@ -236,10 +226,8 @@ pub fn to_client_config(
 	client_config.blockchain.max_cache_size = cache_config.blockchain() as usize * mb;
 	// in bytes
 	client_config.blockchain.pref_cache_size = cache_config.blockchain() as usize * 3 / 4 * mb;
-	// db blockchain cache size, in megabytes
-	client_config.blockchain.db_cache_size = Some(cache_config.db_blockchain_cache_size() as usize);
-	// db state cache size, in megabytes
-	client_config.db_cache_size = Some(cache_config.db_state_cache_size() as usize);
+	// db cache size, in megabytes
+	client_config.db_cache_size = Some(cache_config.db_cache_size() as usize);
 	// db queue cache size, in bytes
 	client_config.queue.max_mem_use = cache_config.queue() as usize * mb;
 	// in bytes
@@ -287,7 +275,7 @@ pub fn execute_upgrades(
 	}
 
 	let client_path = dirs.db_path(pruning);
-	migrate(&client_path, pruning, compaction_profile).map_err(|e| format!("{}", e))
+	migrate(&client_path, compaction_profile).map_err(|e| format!("{}", e))
 }
 
 /// Prompts user asking for password.
@@ -340,8 +328,8 @@ mod tests {
 	use std::time::Duration;
 	use std::fs::File;
 	use std::io::Write;
-	use devtools::RandomTempPath;
-	use util::{U256};
+	use tempdir::TempDir;
+	use ethereum_types::U256;
 	use ethcore::client::{Mode, BlockId};
 	use ethcore::miner::PendingSet;
 	use super::{to_duration, to_mode, to_block_id, to_u256, to_pending_set, to_address, to_addresses, to_price, geth_ipc_path, to_bootnodes, password_from_file};
@@ -429,15 +417,17 @@ mod tests {
 
 	#[test]
 	fn test_password() {
-		let path = RandomTempPath::new();
-		let mut file = File::create(path.as_path()).unwrap();
+		let tempdir = TempDir::new("").unwrap();
+		let path = tempdir.path().join("file");
+		let mut file = File::create(&path).unwrap();
 		file.write_all(b"a bc ").unwrap();
-		assert_eq!(password_from_file(path.as_str().into()).unwrap().as_bytes(), b"a bc");
+		assert_eq!(password_from_file(path.to_str().unwrap().into()).unwrap().as_bytes(), b"a bc");
 	}
 
 	#[test]
 	fn test_password_multiline() {
-		let path = RandomTempPath::new();
+		let tempdir = TempDir::new("").unwrap();
+		let path = tempdir.path().join("file");
 		let mut file = File::create(path.as_path()).unwrap();
 		file.write_all(br#"    password with trailing whitespace
 those passwords should be
@@ -445,11 +435,10 @@ ignored
 but the first password is trimmed
 
 "#).unwrap();
-		assert_eq!(&password_from_file(path.as_str().into()).unwrap(), "password with trailing whitespace");
+		assert_eq!(&password_from_file(path.to_str().unwrap().into()).unwrap(), "password with trailing whitespace");
 	}
 
 	#[test]
-	#[cfg_attr(feature = "dev", allow(float_cmp))]
 	fn test_to_price() {
 		assert_eq!(to_price("1").unwrap(), 1.0);
 		assert_eq!(to_price("2.3").unwrap(), 2.3);
diff --git a/parity/informant.rs b/parity/informant.rs
index 1935ec9b6f8ad0edb07b9631df4342d8ae29d8e5..b834b018d6c79a2a0516df868ced7cceb307e003 100644
--- a/parity/informant.rs
+++ b/parity/informant.rs
@@ -16,15 +16,17 @@
 
 extern crate ansi_term;
 use self::ansi_term::Colour::{White, Yellow, Green, Cyan, Blue};
-use self::ansi_term::Style;
+use self::ansi_term::{Colour, Style};
 
 use std::sync::{Arc};
 use std::sync::atomic::{AtomicUsize, AtomicBool, Ordering as AtomicOrdering};
 use std::time::{Instant, Duration};
 
-use ethcore::client::*;
+use ethcore::client::{
+	BlockId, BlockChainClient, ChainInfo, BlockInfo, BlockChainInfo,
+	BlockQueueInfo, ChainNotify, ClientReport, Client, ClientIoMessage
+};
 use ethcore::header::BlockNumber;
-use ethcore::service::ClientIoMessage;
 use ethcore::snapshot::{RestorationStatus, SnapshotService as SS};
 use ethcore::snapshot::service::Service as SnapshotService;
 use ethsync::{LightSyncProvider, LightSync, SyncProvider, ManageNetwork};
@@ -35,7 +37,9 @@ use light::client::LightChainClient;
 use number_prefix::{binary_prefix, Standalone, Prefixed};
 use parity_rpc::{is_major_importing};
 use parity_rpc::informant::RpcStats;
-use util::{RwLock, Mutex, H256, Colour, Bytes};
+use ethereum_types::H256;
+use bytes::Bytes;
+use parking_lot::{RwLock, Mutex};
 
 /// Format byte counts to standard denominations.
 pub fn format_bytes(b: usize) -> String {
@@ -88,6 +92,7 @@ pub struct SyncInfo {
 	last_imported_old_block_number: Option<BlockNumber>,
 	num_peers: usize,
 	max_peers: u32,
+	snapshot_sync: bool,
 }
 
 pub struct Report {
@@ -150,6 +155,7 @@ impl InformantData for FullNodeInformantData {
 					last_imported_old_block_number: status.last_imported_old_block_number,
 					num_peers: status.num_peers,
 					max_peers: status.current_max_peers(net_config.min_peers, net_config.max_peers),
+					snapshot_sync: status.is_snapshot_syncing(),
 				}))
 			}
 			_ => (is_major_importing(self.sync.as_ref().map(|s| s.status().state), queue_info.clone()), None),
@@ -194,6 +200,7 @@ impl InformantData for LightNodeInformantData {
 			last_imported_old_block_number: None,
 			num_peers: peer_numbers.connected,
 			max_peers: peer_numbers.max as u32,
+			snapshot_sync: false,
 		});
 
 		Report {
@@ -247,7 +254,6 @@ impl<T: InformantData> Informant<T> {
 		self.in_shutdown.store(true, ::std::sync::atomic::Ordering::SeqCst);
 	}
 
-	#[cfg_attr(feature="dev", allow(match_bool))]
 	pub fn tick(&self) {
 		let elapsed = self.last_tick.read().elapsed();
 		if elapsed < Duration::from_secs(5) {
@@ -280,7 +286,7 @@ impl<T: InformantData> Informant<T> {
 				_ => (false, 0, 0),
 			}
 		);
-
+		let snapshot_sync = snapshot_sync && sync_info.as_ref().map_or(false, |s| s.snapshot_sync);
 		if !importing && !snapshot_sync && elapsed < Duration::from_secs(30) {
 			return;
 		}
diff --git a/parity/ipfs.rs b/parity/ipfs.rs
index 45c3f70626b03bbd8ceafb32d5cbe2c772e776d6..ac9a4662b214a51a99f168aa042d75b4162e6b19 100644
--- a/parity/ipfs.rs
+++ b/parity/ipfs.rs
@@ -34,8 +34,8 @@ impl Default for Configuration {
 			enabled: false,
 			port: 5001,
 			interface: "127.0.0.1".into(),
-			cors: None,
-			hosts: Some(Vec::new()),
+			cors: Some(vec![]),
+			hosts: Some(vec![]),
 		}
 	}
 }
diff --git a/parity/light_helpers/epoch_fetch.rs b/parity/light_helpers/epoch_fetch.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ff384c1310ec163b96cb83f179c6a20e3e615513
--- /dev/null
+++ b/parity/light_helpers/epoch_fetch.rs
@@ -0,0 +1,94 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::{Arc, Weak};
+
+use ethcore::encoded;
+use ethcore::engines::{EthEngine, StateDependentProof};
+use ethcore::header::Header;
+use ethcore::machine::EthereumMachine;
+use ethcore::receipt::Receipt;
+use ethsync::LightSync;
+
+use futures::{future, Future};
+use futures::future::Either;
+
+use light::client::fetch::ChainDataFetcher;
+use light::on_demand::{request, OnDemand};
+
+use parking_lot::RwLock;
+use ethereum_types::H256;
+
+const ALL_VALID_BACKREFS: &str = "no back-references, therefore all back-references valid; qed";
+
+type BoxFuture<T, E> = Box<Future<Item = T, Error = E>>;
+
+/// Allows on-demand fetch of data useful for the light client.
+pub struct EpochFetch {
+	/// A handle to the sync service.
+	pub sync: Arc<RwLock<Weak<LightSync>>>,
+	/// The on-demand request service.
+	pub on_demand: Arc<OnDemand>,
+}
+
+impl EpochFetch {
+	fn request<T>(&self, req: T) -> BoxFuture<T::Out, &'static str>
+		where T: Send + request::RequestAdapter + 'static, T::Out: Send + 'static
+	{
+		Box::new(match self.sync.read().upgrade() {
+			Some(sync) => {
+				let on_demand = &self.on_demand;
+				let maybe_future = sync.with_context(move |ctx| {
+					on_demand.request(ctx, req).expect(ALL_VALID_BACKREFS)
+				});
+
+				match maybe_future {
+					Some(x) => Either::A(x.map_err(|_| "Request canceled")),
+					None => Either::B(future::err("Unable to access network.")),
+				}
+			}
+			None => Either::B(future::err("Unable to access network")),
+		})
+	}
+}
+
+impl ChainDataFetcher for EpochFetch {
+	type Error = &'static str;
+
+	type Body = BoxFuture<encoded::Block, &'static str>;
+	type Receipts = BoxFuture<Vec<Receipt>, &'static str>;
+	type Transition = BoxFuture<Vec<u8>, &'static str>;
+
+	fn block_body(&self, header: &Header) -> Self::Body {
+		self.request(request::Body(header.encoded().into()))
+	}
+
+	/// Fetch block receipts.
+	fn block_receipts(&self, header: &Header) -> Self::Receipts {
+		self.request(request::BlockReceipts(header.encoded().into()))
+	}
+
+	/// Fetch epoch transition proof at given header.
+	fn epoch_transition(&self, hash: H256, engine: Arc<EthEngine>, checker: Arc<StateDependentProof<EthereumMachine>>)
+		-> Self::Transition
+	{
+		self.request(request::Signal {
+			hash: hash,
+			engine: engine,
+			proof_check: checker,
+		})
+	}
+}
diff --git a/parity/light_helpers/mod.rs b/parity/light_helpers/mod.rs
index 488f970c2c082a4eb50f2791f8df5d552870a592..5fc9c516b455fdd8d2c67a30767edc1245b5d058 100644
--- a/parity/light_helpers/mod.rs
+++ b/parity/light_helpers/mod.rs
@@ -16,6 +16,8 @@
 
 //! Utilities and helpers for the light client.
 
+mod epoch_fetch;
 mod queue_cull;
 
+pub use self::epoch_fetch::EpochFetch;
 pub use self::queue_cull::QueueCull;
diff --git a/parity/light_helpers/queue_cull.rs b/parity/light_helpers/queue_cull.rs
index 982e69e48bbeed600dfe3dced0206cd513ee9e23..091953ad5ef9dc9cb4c66140e4303e9d01efed2f 100644
--- a/parity/light_helpers/queue_cull.rs
+++ b/parity/light_helpers/queue_cull.rs
@@ -19,11 +19,11 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use ethcore::service::ClientIoMessage;
+use ethcore::client::ClientIoMessage;
 use ethsync::LightSync;
 use io::{IoContext, IoHandler, TimerToken};
 
-use light::client::Client;
+use light::client::LightChainClient;
 use light::on_demand::{request, OnDemand};
 use light::TransactionQueue;
 
@@ -31,7 +31,7 @@ use futures::{future, Future};
 
 use parity_reactor::Remote;
 
-use util::RwLock;
+use parking_lot::RwLock;
 
 // Attepmt to cull once every 10 minutes.
 const TOKEN: TimerToken = 1;
@@ -41,9 +41,9 @@ const TIMEOUT_MS: u64 = 1000 * 60 * 10;
 const PURGE_TIMEOUT_MS: u64 = 1000 * 60 * 9;
 
 /// Periodically culls the transaction queue of mined transactions.
-pub struct QueueCull {
+pub struct QueueCull<T> {
 	/// A handle to the client, for getting the latest block header.
-	pub client: Arc<Client>,
+	pub client: Arc<T>,
 	/// A handle to the sync service.
 	pub sync: Arc<LightSync>,
 	/// The on-demand request service.
@@ -54,7 +54,7 @@ pub struct QueueCull {
 	pub remote: Remote,
 }
 
-impl IoHandler<ClientIoMessage> for QueueCull {
+impl<T: LightChainClient + 'static> IoHandler<ClientIoMessage> for QueueCull<T> {
 	fn initialize(&self, io: &IoContext<ClientIoMessage>) {
 		io.register_timer(TOKEN, TIMEOUT_MS).expect("Error registering timer");
 	}
@@ -94,11 +94,11 @@ impl IoHandler<ClientIoMessage> for QueueCull {
 			});
 
 			match maybe_fetching {
-				Some(fut) => fut.boxed(),
+				Some(fut) => future::Either::A(fut),
 				None => {
 					debug!(target: "cull", "Unable to acquire network context; qed");
-					future::ok(()).boxed()
-				}
+					future::Either::B(future::ok(()))
+				},
 			}
 		}, Duration::from_millis(PURGE_TIMEOUT_MS), || {})
 	}
diff --git a/parity/main.rs b/parity/main.rs
index d79fb00649f9c37dcbf5bb5394af90ef19430395..30c3cf0e9863ebf0e9b239a2e77c8af849e63718 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -17,15 +17,14 @@
 //! Ethcore client application.
 
 #![warn(missing_docs)]
-#![cfg_attr(feature="dev", feature(plugin))]
-#![cfg_attr(feature="dev", plugin(clippy))]
-#![cfg_attr(feature="dev", allow(useless_format))]
-#![cfg_attr(feature="dev", allow(match_bool))]
 
 extern crate ansi_term;
 extern crate app_dirs;
 extern crate ctrlc;
 extern crate docopt;
+#[macro_use]
+extern crate clap;
+extern crate dir;
 extern crate env_logger;
 extern crate fdlimit;
 extern crate futures;
@@ -34,6 +33,7 @@ extern crate isatty;
 extern crate jsonrpc_core;
 extern crate num_cpus;
 extern crate number_prefix;
+extern crate parking_lot;
 extern crate regex;
 extern crate rlp;
 extern crate rpassword;
@@ -43,19 +43,22 @@ extern crate serde;
 extern crate serde_json;
 #[macro_use]
 extern crate serde_derive;
-extern crate time;
 extern crate toml;
 
 extern crate ethcore;
-extern crate ethcore_devtools as devtools;
+extern crate ethcore_bytes as bytes;
 extern crate ethcore_io as io;
-extern crate ethcore_ipc as ipc;
-extern crate ethcore_ipc_hypervisor as hypervisor;
-extern crate ethcore_ipc_nano as nanoipc;
 extern crate ethcore_light as light;
 extern crate ethcore_logger;
-extern crate ethcore_util as util;
+extern crate ethcore_migrations as migrations;
+extern crate ethcore_miner as miner;
 extern crate ethcore_network as network;
+extern crate ethcore_service;
+extern crate ethcore_transaction as transaction;
+extern crate ethereum_types;
+extern crate migration as migr;
+extern crate kvdb;
+extern crate kvdb_rocksdb;
 extern crate ethkey;
 extern crate ethsync;
 extern crate node_health;
@@ -66,10 +69,14 @@ extern crate parity_local_store as local_store;
 extern crate parity_reactor;
 extern crate parity_rpc;
 extern crate parity_updater as updater;
+extern crate parity_version;
 extern crate parity_whisper;
 extern crate path;
 extern crate rpc_cli;
 extern crate node_filter;
+extern crate keccak_hash as hash;
+extern crate journaldb;
+extern crate registrar;
 
 #[macro_use]
 extern crate log as rlog;
@@ -90,15 +97,18 @@ extern crate pretty_assertions;
 #[cfg(windows)] extern crate ws2_32;
 #[cfg(windows)] extern crate winapi;
 
+#[cfg(test)]
+extern crate tempdir;
+
 mod account;
 mod blockchain;
 mod cache;
 mod cli;
 mod configuration;
 mod dapps;
+mod export_hardcoded_sync;
 mod ipfs;
 mod deprecated;
-mod dir;
 mod helpers;
 mod informant;
 mod light_helpers;
@@ -117,11 +127,6 @@ mod url;
 mod user_defaults;
 mod whisper;
 
-#[cfg(feature="ipc")]
-mod boot;
-#[cfg(feature="ipc")]
-mod sync;
-
 #[cfg(feature="stratum")]
 mod stratum;
 
@@ -130,7 +135,7 @@ use std::collections::HashMap;
 use std::io::{self as stdio, BufReader, Read, Write};
 use std::fs::{remove_file, metadata, File, create_dir_all};
 use std::path::PathBuf;
-use util::sha3::sha3;
+use hash::keccak_buffer;
 use cli::Args;
 use configuration::{Cmd, Execute, Configuration};
 use deprecated::find_deprecated;
@@ -140,8 +145,8 @@ use dir::default_hypervisor_path;
 fn print_hash_of(maybe_file: Option<String>) -> Result<String, String> {
 	if let Some(file) = maybe_file {
 		let mut f = BufReader::new(File::open(&file).map_err(|_| "Unable to open file".to_owned())?);
-		let hash = sha3(&mut f).map_err(|_| "Unable to read from file".to_owned())?;
-		Ok(hash.hex())
+		let hash = keccak_buffer(&mut f).map_err(|_| "Unable to read from file".to_owned())?;
+		Ok(format!("{:x}", hash))
 	} else {
 		Err("Streaming from standard input not yet supported. Specify a file.".to_owned())
 	}
@@ -171,6 +176,7 @@ fn execute(command: Execute, can_restart: bool) -> Result<PostExecutionAction, S
 		Cmd::SignerList { port, authfile } => rpc_cli::signer_list(port, authfile).map(|s| PostExecutionAction::Print(s)),
 		Cmd::SignerReject { id, port, authfile } => rpc_cli::signer_reject(id, port, authfile).map(|s| PostExecutionAction::Print(s)),
 		Cmd::Snapshot(snapshot_cmd) => snapshot::execute(snapshot_cmd).map(|s| PostExecutionAction::Print(s)),
+		Cmd::ExportHardcodedSync(export_hs_cmd) => export_hardcoded_sync::execute(export_hs_cmd).map(|s| PostExecutionAction::Print(s)),
 	}
 }
 
@@ -195,14 +201,8 @@ fn stratum_main(alt_mains: &mut HashMap<String, fn()>) {
 	alt_mains.insert("stratum".to_owned(), stratum::main);
 }
 
-#[cfg(not(feature="ipc"))]
 fn sync_main(_: &mut HashMap<String, fn()>) {}
 
-#[cfg(feature="ipc")]
-fn sync_main(alt_mains: &mut HashMap<String, fn()>) {
-	alt_mains.insert("sync".to_owned(), sync::main);
-}
-
 fn updates_path(name: &str) -> PathBuf {
 	let mut dest = PathBuf::from(default_hypervisor_path());
 	dest.push(name);
diff --git a/parity/migration.rs b/parity/migration.rs
index c4e5f5ac67c8b9bc06dc797ba15634bab12fc5c8..bd659cba0156ac795e79100883d19a9a0698e9d2 100644
--- a/parity/migration.rs
+++ b/parity/migration.rs
@@ -15,17 +15,12 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::fs;
-use std::fs::File;
 use std::io::{Read, Write, Error as IoError, ErrorKind};
 use std::path::{Path, PathBuf};
 use std::fmt::{Display, Formatter, Error as FmtError};
-use std::sync::Arc;
-use util::journaldb::Algorithm;
-use util::migration::{Manager as MigrationManager, Config as MigrationConfig, Error as MigrationError, Migration};
-use util::kvdb::{CompactionProfile, Database, DatabaseConfig};
-use ethcore::migrations;
-use ethcore::db;
-use ethcore::migrations::Extract;
+use migr::{self, Manager as MigrationManager, Config as MigrationConfig};
+use kvdb_rocksdb::CompactionProfile;
+use migrations;
 
 /// Database is assumed to be at default version, when no version file is found.
 const DEFAULT_VERSION: u32 = 5;
@@ -43,16 +38,12 @@ const VERSION_FILE_NAME: &'static str = "db_version";
 pub enum Error {
 	/// Returned when current version cannot be read or guessed.
 	UnknownDatabaseVersion,
-	/// Migration does not support existing pruning algorithm.
-	UnsupportedPruningMethod,
 	/// Existing DB is newer than the known one.
 	FutureDBVersion,
 	/// Migration is not possible.
 	MigrationImpossible,
-	/// Migration unexpectadly failed.
-	MigrationFailed,
 	/// Internal migration error.
-	Internal(MigrationError),
+	Internal(migr::Error),
 	/// Migration was completed succesfully,
 	/// but there was a problem with io.
 	Io(IoError),
@@ -62,10 +53,8 @@ impl Display for Error {
 	fn fmt(&self, f: &mut Formatter) -> Result<(), FmtError> {
 		let out = match *self {
 			Error::UnknownDatabaseVersion => "Current database version cannot be read".into(),
-			Error::UnsupportedPruningMethod => "Unsupported pruning method for database migration. Delete DB and resync.".into(),
 			Error::FutureDBVersion => "Database was created with newer client version. Upgrade your client or delete DB and resync.".into(),
 			Error::MigrationImpossible => format!("Database migration to version {} is not possible.", CURRENT_VERSION),
-			Error::MigrationFailed => "Database migration unexpectedly failed".into(),
 			Error::Internal(ref err) => format!("{}", err),
 			Error::Io(ref err) => format!("Unexpected io error on DB migration: {}.", err),
 		};
@@ -80,11 +69,11 @@ impl From<IoError> for Error {
 	}
 }
 
-impl From<MigrationError> for Error {
-	fn from(err: MigrationError) -> Self {
-		match err {
-			MigrationError::Io(e) => Error::Io(e),
-			_ => Error::Internal(err),
+impl From<migr::Error> for Error {
+	fn from(err: migr::Error) -> Self {
+		match err.into() {
+			migr::ErrorKind::Io(e) => Error::Io(e),
+			err => Error::Internal(err.into()),
 		}
 	}
 }
@@ -99,7 +88,7 @@ fn version_file_path(path: &Path) -> PathBuf {
 /// Reads current database version from the file at given path.
 /// If the file does not exist returns `DEFAULT_VERSION`.
 fn current_version(path: &Path) -> Result<u32, Error> {
-	match File::open(version_file_path(path)) {
+	match fs::File::open(version_file_path(path)) {
 		Err(ref err) if err.kind() == ErrorKind::NotFound => Ok(DEFAULT_VERSION),
 		Err(_) => Err(Error::UnknownDatabaseVersion),
 		Ok(mut file) => {
@@ -114,7 +103,7 @@ fn current_version(path: &Path) -> Result<u32, Error> {
 /// Creates a new file if the version file does not exist yet.
 fn update_version(path: &Path) -> Result<(), Error> {
 	fs::create_dir_all(path)?;
-	let mut file = File::create(version_file_path(path))?;
+	let mut file = fs::File::create(version_file_path(path))?;
 	file.write_all(format!("{}", CURRENT_VERSION).as_bytes())?;
 	Ok(())
 }
@@ -145,49 +134,11 @@ pub fn default_migration_settings(compaction_profile: &CompactionProfile) -> Mig
 /// Migrations on the consolidated database.
 fn consolidated_database_migrations(compaction_profile: &CompactionProfile) -> Result<MigrationManager, Error> {
 	let mut manager = MigrationManager::new(default_migration_settings(compaction_profile));
-	manager.add_migration(migrations::ToV10::new()).map_err(|_| Error::MigrationImpossible)?;
 	manager.add_migration(migrations::TO_V11).map_err(|_| Error::MigrationImpossible)?;
 	manager.add_migration(migrations::TO_V12).map_err(|_| Error::MigrationImpossible)?;
 	Ok(manager)
 }
 
-/// Consolidates legacy databases into single one.
-fn consolidate_database(
-	old_db_path: PathBuf,
-	new_db_path: PathBuf,
-	column: Option<u32>,
-	extract: Extract,
-	compaction_profile: &CompactionProfile) -> Result<(), Error> {
-	fn db_error(e: String) -> Error {
-		warn!("Cannot open Database for consolidation: {:?}", e);
-		Error::MigrationFailed
-	}
-
-	let mut migration = migrations::ToV9::new(column, extract);
-	let config = default_migration_settings(compaction_profile);
-	let mut db_config = DatabaseConfig {
-		max_open_files: 64,
-		cache_sizes: Default::default(),
-		compaction: config.compaction_profile,
-		columns: None,
-		wal: true,
-	};
-
-	let old_path_str = old_db_path.to_str().ok_or(Error::MigrationImpossible)?;
-	let new_path_str = new_db_path.to_str().ok_or(Error::MigrationImpossible)?;
-
-	let cur_db = Arc::new(Database::open(&db_config, old_path_str).map_err(db_error)?);
-	// open new DB with proper number of columns
-	db_config.columns = migration.columns();
-	let mut new_db = Database::open(&db_config, new_path_str).map_err(db_error)?;
-
-	// Migrate to new database (default column only)
-	migration.migrate(cur_db, &config, &mut new_db, None)?;
-
-	Ok(())
-}
-
-
 /// Migrates database at given position with given migration rules.
 fn migrate_database(version: u32, db_path: PathBuf, mut migrations: MigrationManager) -> Result<(), Error> {
 	// check if migration is needed
@@ -225,7 +176,7 @@ fn exists(path: &Path) -> bool {
 }
 
 /// Migrates the database.
-pub fn migrate(path: &Path, pruning: Algorithm, compaction_profile: CompactionProfile) -> Result<(), Error> {
+pub fn migrate(path: &Path, compaction_profile: CompactionProfile) -> Result<(), Error> {
 	// read version file.
 	let version = current_version(path)?;
 
@@ -240,32 +191,6 @@ pub fn migrate(path: &Path, pruning: Algorithm, compaction_profile: CompactionPr
 		return Ok(())
 	}
 
-	// Perform pre-consolidation migrations
-	if version < CONSOLIDATION_VERSION && exists(&legacy::blocks_database_path(path)) {
-		println!("Migrating database from version {} to {}", version, CONSOLIDATION_VERSION);
-
-		migrate_database(version, legacy::extras_database_path(path), legacy::extras_database_migrations(&compaction_profile)?)?;
-		migrate_database(version, legacy::state_database_path(path), legacy::state_database_migrations(pruning, &compaction_profile)?)?;
-		migrate_database(version, legacy::blocks_database_path(path), legacy::blocks_database_migrations(&compaction_profile)?)?;
-
-		let db_path = consolidated_database_path(path);
-		// Remove the database dir (it shouldn't exist anyway, but it might when migration was interrupted)
-		let _ = fs::remove_dir_all(db_path.clone());
-		consolidate_database(legacy::blocks_database_path(path), db_path.clone(), db::COL_HEADERS, Extract::Header, &compaction_profile)?;
-		consolidate_database(legacy::blocks_database_path(path), db_path.clone(), db::COL_BODIES, Extract::Body, &compaction_profile)?;
-		consolidate_database(legacy::extras_database_path(path), db_path.clone(), db::COL_EXTRA, Extract::All, &compaction_profile)?;
-		consolidate_database(legacy::state_database_path(path), db_path.clone(), db::COL_STATE, Extract::All, &compaction_profile)?;
-		consolidate_database(legacy::trace_database_path(path), db_path.clone(), db::COL_TRACE, Extract::All, &compaction_profile)?;
-		let _ = fs::remove_dir_all(legacy::blocks_database_path(path));
-		let _ = fs::remove_dir_all(legacy::extras_database_path(path));
-		let _ = fs::remove_dir_all(legacy::state_database_path(path));
-		let _ = fs::remove_dir_all(legacy::trace_database_path(path));
-		println!("Migration finished");
-	}
-
-	// update version so we can apply post-consolidation migrations.
-	let version = ::std::cmp::max(CONSOLIDATION_VERSION, version);
-
 	// Further migrations
 	if version >= CONSOLIDATION_VERSION && version < CURRENT_VERSION && exists(&consolidated_database_path(path)) {
 		println!("Migrating database from version {} to {}", ::std::cmp::max(CONSOLIDATION_VERSION, version), CURRENT_VERSION);
@@ -276,68 +201,3 @@ pub fn migrate(path: &Path, pruning: Algorithm, compaction_profile: CompactionPr
 	// update version file.
 	update_version(path)
 }
-
-/// Old migrations utilities
-mod legacy {
-	use super::*;
-	use std::path::{Path, PathBuf};
-	use util::journaldb::Algorithm;
-	use util::migration::{Manager as MigrationManager};
-	use util::kvdb::CompactionProfile;
-	use ethcore::migrations;
-
-	/// Blocks database path.
-	pub fn blocks_database_path(path: &Path) -> PathBuf {
-		let mut blocks_path = path.to_owned();
-		blocks_path.push("blocks");
-		blocks_path
-	}
-
-	/// Extras database path.
-	pub fn extras_database_path(path: &Path) -> PathBuf {
-		let mut extras_path = path.to_owned();
-		extras_path.push("extras");
-		extras_path
-	}
-
-	/// State database path.
-	pub fn state_database_path(path: &Path) -> PathBuf {
-		let mut state_path = path.to_owned();
-		state_path.push("state");
-		state_path
-	}
-
-	/// Trace database path.
-	pub fn trace_database_path(path: &Path) -> PathBuf {
-		let mut blocks_path = path.to_owned();
-		blocks_path.push("tracedb");
-		blocks_path
-	}
-
-	/// Migrations on the blocks database.
-	pub fn blocks_database_migrations(compaction_profile: &CompactionProfile) -> Result<MigrationManager, Error> {
-		let mut manager = MigrationManager::new(default_migration_settings(compaction_profile));
-		manager.add_migration(migrations::blocks::V8::default()).map_err(|_| Error::MigrationImpossible)?;
-		Ok(manager)
-	}
-
-	/// Migrations on the extras database.
-	pub fn extras_database_migrations(compaction_profile: &CompactionProfile) -> Result<MigrationManager, Error> {
-		let mut manager = MigrationManager::new(default_migration_settings(compaction_profile));
-		manager.add_migration(migrations::extras::ToV6).map_err(|_| Error::MigrationImpossible)?;
-		Ok(manager)
-	}
-
-	/// Migrations on the state database.
-	pub fn state_database_migrations(pruning: Algorithm, compaction_profile: &CompactionProfile) -> Result<MigrationManager, Error> {
-		let mut manager = MigrationManager::new(default_migration_settings(compaction_profile));
-		let res = match pruning {
-			Algorithm::Archive => manager.add_migration(migrations::state::ArchiveV7::default()),
-			Algorithm::OverlayRecent => manager.add_migration(migrations::state::OverlayRecentV7::default()),
-			_ => return Err(Error::UnsupportedPruningMethod),
-		};
-
-		res.map_err(|_| Error::MigrationImpossible)?;
-		Ok(manager)
-	}
-}
diff --git a/parity/modules.rs b/parity/modules.rs
index 8613c5ae5ca58c14f4bcaacc0988e580e3b82517..36cffe2ec6be1fdbf44a4050c617ecee4c6d4d70 100644
--- a/parity/modules.rs
+++ b/parity/modules.rs
@@ -15,167 +15,19 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::Arc;
-use std::path::Path;
 
 use ethcore::client::BlockChainClient;
-use hypervisor::Hypervisor;
-use ethsync::{AttachedProtocol, SyncConfig, NetworkConfiguration, NetworkError, Params, ConnectionFilter};
+use ethsync::{self, AttachedProtocol, SyncConfig, NetworkConfiguration, Params, ConnectionFilter};
 use ethcore::snapshot::SnapshotService;
 use light::Provider;
 
-#[cfg(not(feature="ipc"))]
-use self::no_ipc_deps::*;
-
-#[cfg(not(feature="ipc"))]
+pub use ethsync::{EthSync, SyncProvider, ManageNetwork};
+pub use ethcore::client::ChainNotify;
 use ethcore_logger::Config as LogConfig;
 
-#[cfg(feature="ipc")]
-use self::ipc_deps::*;
-
-#[cfg(feature="ipc")]
-pub mod service_urls {
-	use std::path::PathBuf;
-
-	pub const CLIENT: &'static str = "parity-chain.ipc";
-	pub const SNAPSHOT: &'static str = "parity-snapshot.ipc";
-	pub const SYNC: &'static str = "parity-sync.ipc";
-	pub const SYNC_NOTIFY: &'static str = "parity-sync-notify.ipc";
-	pub const NETWORK_MANAGER: &'static str = "parity-manage-net.ipc";
-	pub const SYNC_CONTROL: &'static str = "parity-sync-control.ipc";
-	pub const LIGHT_PROVIDER: &'static str = "parity-light-provider.ipc";
-
-	#[cfg(feature="stratum")]
-	pub const STRATUM_CONTROL: &'static str = "parity-stratum-control.ipc";
-
-	pub fn with_base(data_dir: &str, service_path: &str) -> String {
-		let mut path = PathBuf::from(data_dir);
-		path.push(service_path);
-
-		format!("ipc://{}", path.to_str().unwrap())
-	}
-}
-
-#[cfg(not(feature="ipc"))]
-mod no_ipc_deps {
-	pub use ethsync::{EthSync, SyncProvider, ManageNetwork};
-	pub use ethcore::client::ChainNotify;
-}
-
-#[cfg(feature="ipc")]
-pub type SyncModules = (
-	GuardedSocket<SyncClient<NanoSocket>>,
-	GuardedSocket<NetworkManagerClient<NanoSocket>>,
-	GuardedSocket<ChainNotifyClient<NanoSocket>>
-);
-
-#[cfg(not(feature="ipc"))]
 pub type SyncModules = (Arc<SyncProvider>, Arc<ManageNetwork>, Arc<ChainNotify>);
 
-#[cfg(feature="ipc")]
-mod ipc_deps {
-	pub use ethsync::remote::{SyncClient, NetworkManagerClient};
-	pub use ethsync::ServiceConfiguration;
-	pub use ethcore::client::remote::ChainNotifyClient;
-	pub use hypervisor::{SYNC_MODULE_ID, BootArgs, HYPERVISOR_IPC_URL};
-	pub use nanoipc::{GuardedSocket, NanoSocket, generic_client, fast_client};
-	pub use ipc::IpcSocket;
-	pub use ipc::binary::serialize;
-	pub use light::remote::LightProviderClient;
-}
-
-#[cfg(feature="ipc")]
-pub fn hypervisor(base_path: &Path) -> Option<Hypervisor> {
-	Some(Hypervisor
-		::with_url(&service_urls::with_base(base_path.to_str().unwrap(), HYPERVISOR_IPC_URL))
-		.io_path(base_path.to_str().unwrap()))
-}
-
-#[cfg(not(feature="ipc"))]
-pub fn hypervisor(_: &Path) -> Option<Hypervisor> {
-	None
-}
-
-#[cfg(feature="ipc")]
-fn sync_arguments(io_path: &str, sync_cfg: SyncConfig, net_cfg: NetworkConfiguration, log_settings: &LogConfig) -> BootArgs {
-	let service_config = ServiceConfiguration {
-		sync: sync_cfg,
-		net: net_cfg,
-		io_path: io_path.to_owned(),
-	};
-
-	// initialisation payload is passed via stdin
-	let service_payload = serialize(&service_config).expect("Any binary-derived struct is serializable by definition");
-
-	// client service url and logging settings are passed in command line
-	let mut cli_args = Vec::new();
-	cli_args.push("sync".to_owned());
-	if !log_settings.color { cli_args.push("--no-color".to_owned()); }
-	if let Some(ref mode) = log_settings.mode {
-		cli_args.push("-l".to_owned());
-		cli_args.push(mode.to_owned());
-	}
-	if let Some(ref file) = log_settings.file {
-		cli_args.push("--log-file".to_owned());
-		cli_args.push(file.to_owned());
-	}
-
-	BootArgs::new().stdin(service_payload).cli(cli_args)
-}
-
-#[cfg(feature="ipc")]
-pub fn stratum(
-	hypervisor_ref: &mut Option<Hypervisor>,
-	config: &::ethcore::miner::StratumOptions
-) {
-	use ethcore_stratum;
-
-	let mut hypervisor = hypervisor_ref.take().expect("There should be hypervisor for ipc configuration");
-	let args = BootArgs::new().stdin(
-			serialize(&ethcore_stratum::ServiceConfiguration {
-				io_path: hypervisor.io_path.to_owned(),
-				port: config.port,
-				listen_addr: config.listen_addr.to_owned(),
-				secret: config.secret,
-			}).expect("Any binary-derived struct is serializable by definition")
-		).cli(vec!["stratum".to_owned()]);
-	hypervisor = hypervisor.module(super::stratum::MODULE_ID, args);
-	*hypervisor_ref = Some(hypervisor);
-}
-
-#[cfg(feature="ipc")]
-pub fn sync(
-	hypervisor_ref: &mut Option<Hypervisor>,
-	sync_cfg: SyncConfig,
-	net_cfg: NetworkConfiguration,
-	_client: Arc<BlockChainClient>,
-	_snapshot_service: Arc<SnapshotService>,
-	_provider: Arc<Provider>,
-	log_settings: &LogConfig,
-	_attached_protos: Vec<AttachedProtocol>,
-) -> Result<SyncModules, NetworkError> {
-	let mut hypervisor = hypervisor_ref.take().expect("There should be hypervisor for ipc configuration");
-	let args = sync_arguments(&hypervisor.io_path, sync_cfg, net_cfg, log_settings);
-	hypervisor = hypervisor.module(SYNC_MODULE_ID, args);
-
-	hypervisor.start();
-	hypervisor.wait_for_startup();
-
-	let sync_client = generic_client::<SyncClient<_>>(
-		&service_urls::with_base(&hypervisor.io_path, service_urls::SYNC)).unwrap();
-	let notify_client = generic_client::<ChainNotifyClient<_>>(
-		&service_urls::with_base(&hypervisor.io_path, service_urls::SYNC_NOTIFY)).unwrap();
-	let manage_client = generic_client::<NetworkManagerClient<_>>(
-		&service_urls::with_base(&hypervisor.io_path, service_urls::NETWORK_MANAGER)).unwrap();
-	let provider_client = generic_client::<LightProviderClient<_>>(
-		&service_urls::with_base(&hypervisor.io_path, service_urls::LIGHT_PROVIDER)).unwrap();
-
-	*hypervisor_ref = Some(hypervisor);
-	Ok((sync_client, manage_client, notify_client))
-}
-
-#[cfg(not(feature="ipc"))]
 pub fn sync(
-	_hypervisor: &mut Option<Hypervisor>,
 	sync_cfg: SyncConfig,
 	net_cfg: NetworkConfiguration,
 	client: Arc<BlockChainClient>,
@@ -184,7 +36,7 @@ pub fn sync(
 	_log_settings: &LogConfig,
 	attached_protos: Vec<AttachedProtocol>,
 	connection_filter: Option<Arc<ConnectionFilter>>,
-) -> Result<SyncModules, NetworkError> {
+) -> Result<SyncModules, ethsync::Error> {
 	let eth_sync = EthSync::new(Params {
 		config: sync_cfg,
 		chain: client,
diff --git a/parity/params.rs b/parity/params.rs
index 3054db48f20cbcf18b246ba6c5d3663d955abaae..4b5cd9409377c1785ae9eb6c67819f0dfcb3278c 100644
--- a/parity/params.rs
+++ b/parity/params.rs
@@ -14,11 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::{str, fs, fmt, path};
+use std::{str, fs, fmt};
 use std::time::Duration;
-use util::{Address, U256, version_data};
-use util::journaldb::Algorithm;
-use ethcore::spec::Spec;
+use ethereum_types::{U256, Address};
+use futures_cpupool::CpuPool;
+use parity_version::version_data;
+use journaldb::Algorithm;
+use ethcore::spec::{Spec, SpecParams};
 use ethcore::ethereum;
 use ethcore::client::Mode;
 use ethcore::miner::{GasPricer, GasPriceCalibratorOptions};
@@ -34,6 +36,8 @@ pub enum SpecType {
 	Olympic,
 	Classic,
 	Expanse,
+	Musicoin,
+	Ellaism,
 	Dev,
 	Custom(String),
 }
@@ -56,6 +60,8 @@ impl str::FromStr for SpecType {
 			"kovan" | "testnet" => SpecType::Kovan,
 			"olympic" => SpecType::Olympic,
 			"expanse" => SpecType::Expanse,
+			"musicoin" => SpecType::Musicoin,
+			"ellaism" => SpecType::Ellaism,
 			"dev" => SpecType::Dev,
 			other => SpecType::Custom(other.into()),
 		};
@@ -72,6 +78,8 @@ impl fmt::Display for SpecType {
 			SpecType::Olympic => "olympic",
 			SpecType::Classic => "classic",
 			SpecType::Expanse => "expanse",
+			SpecType::Musicoin => "musicoin",
+			SpecType::Ellaism => "ellaism",
 			SpecType::Kovan => "kovan",
 			SpecType::Dev => "dev",
 			SpecType::Custom(ref custom) => custom,
@@ -80,20 +88,22 @@ impl fmt::Display for SpecType {
 }
 
 impl SpecType {
-	pub fn spec<T: AsRef<path::Path>>(&self, cache_dir: T) -> Result<Spec, String> {
-		let cache_dir = cache_dir.as_ref();
+	pub fn spec<'a, T: Into<SpecParams<'a>>>(&self, params: T) -> Result<Spec, String> {
+		let params = params.into();
 		match *self {
-			SpecType::Foundation => Ok(ethereum::new_foundation(cache_dir)),
-			SpecType::Morden => Ok(ethereum::new_morden(cache_dir)),
-			SpecType::Ropsten => Ok(ethereum::new_ropsten(cache_dir)),
-			SpecType::Olympic => Ok(ethereum::new_olympic(cache_dir)),
-			SpecType::Classic => Ok(ethereum::new_classic(cache_dir)),
-			SpecType::Expanse => Ok(ethereum::new_expanse(cache_dir)),
-			SpecType::Kovan => Ok(ethereum::new_kovan(cache_dir)),
+			SpecType::Foundation => Ok(ethereum::new_foundation(params)),
+			SpecType::Morden => Ok(ethereum::new_morden(params)),
+			SpecType::Ropsten => Ok(ethereum::new_ropsten(params)),
+			SpecType::Olympic => Ok(ethereum::new_olympic(params)),
+			SpecType::Classic => Ok(ethereum::new_classic(params)),
+			SpecType::Expanse => Ok(ethereum::new_expanse(params)),
+			SpecType::Musicoin => Ok(ethereum::new_musicoin(params)),
+			SpecType::Ellaism => Ok(ethereum::new_ellaism(params)),
+			SpecType::Kovan => Ok(ethereum::new_kovan(params)),
 			SpecType::Dev => Ok(Spec::new_instant()),
 			SpecType::Custom(ref filename) => {
 				let file = fs::File::open(filename).map_err(|e| format!("Could not load specification file at {}: {}", filename, e))?;
-				Spec::load(cache_dir, file)
+				Spec::load(params, file)
 			}
 		}
 	}
@@ -102,6 +112,7 @@ impl SpecType {
 		match *self {
 			SpecType::Classic => Some("classic".to_owned()),
 			SpecType::Expanse => Some("expanse".to_owned()),
+			SpecType::Musicoin => Some("musicoin".to_owned()),
 			_ => None,
 		}
 	}
@@ -178,6 +189,7 @@ impl str::FromStr for ResealPolicy {
 #[derive(Debug, PartialEq)]
 pub struct AccountsConfig {
 	pub iterations: u32,
+	pub refresh_time: u64,
 	pub testnet: bool,
 	pub password_files: Vec<String>,
 	pub unlocked_accounts: Vec<Address>,
@@ -189,6 +201,7 @@ impl Default for AccountsConfig {
 	fn default() -> Self {
 		AccountsConfig {
 			iterations: 10240,
+			refresh_time: 5,
 			testnet: false,
 			password_files: Vec::new(),
 			unlocked_accounts: Vec::new(),
@@ -220,15 +233,15 @@ impl GasPricerConfig {
 impl Default for GasPricerConfig {
 	fn default() -> Self {
 		GasPricerConfig::Calibrated {
-			initial_minimum: 11904761856u64.into(),
-			usd_per_tx: 0.0025f32,
+			initial_minimum: 476190464u64.into(),
+			usd_per_tx: 0.0001f32,
 			recalibration_period: Duration::from_secs(3600),
 		}
 	}
 }
 
 impl GasPricerConfig {
-	pub fn to_gas_pricer(&self, fetch: FetchClient) -> GasPricer {
+	pub fn to_gas_pricer(&self, fetch: FetchClient, p: CpuPool) -> GasPricer {
 		match *self {
 			GasPricerConfig::Fixed(u) => GasPricer::Fixed(u),
 			GasPricerConfig::Calibrated { usd_per_tx, recalibration_period, .. } => {
@@ -237,7 +250,8 @@ impl GasPricerConfig {
 						usd_per_tx: usd_per_tx,
 						recalibration_period: recalibration_period,
 					},
-					fetch
+					fetch,
+					p,
 				)
 			}
 		}
@@ -320,7 +334,7 @@ pub fn mode_switch_to_bool(switch: Option<Mode>, user_defaults: &UserDefaults) -
 
 #[cfg(test)]
 mod tests {
-	use util::journaldb::Algorithm;
+	use journaldb::Algorithm;
 	use user_defaults::UserDefaults;
 	use super::{SpecType, Pruning, ResealPolicy, Switch, tracing_switch_to_bool};
 
@@ -352,6 +366,7 @@ mod tests {
 		assert_eq!(format!("{}", SpecType::Olympic), "olympic");
 		assert_eq!(format!("{}", SpecType::Classic), "classic");
 		assert_eq!(format!("{}", SpecType::Expanse), "expanse");
+		assert_eq!(format!("{}", SpecType::Musicoin), "musicoin");
 		assert_eq!(format!("{}", SpecType::Kovan), "kovan");
 		assert_eq!(format!("{}", SpecType::Dev), "dev");
 		assert_eq!(format!("{}", SpecType::Custom("foo/bar".into())), "foo/bar");
diff --git a/parity/presale.rs b/parity/presale.rs
index 5ac7d00fd2f7415968aef4a146f8794f81862eb1..216ff66a848b5b8185f9ba48853bfbe34ccb61dd 100644
--- a/parity/presale.rs
+++ b/parity/presale.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use ethcore::ethstore::{PresaleWallet, EthStore};
-use ethcore::ethstore::dir::RootDiskDirectory;
+use ethcore::ethstore::accounts_dir::RootDiskDirectory;
 use ethcore::account_provider::{AccountProvider, AccountProviderSettings};
 use helpers::{password_prompt, password_from_file};
 use params::SpecType;
diff --git a/parity/rpc.rs b/parity/rpc.rs
index f11d4c3ae1c0cccbd9d7aec8f953d684ded33c4d..41b10ba8725e835287c6133e50b7b4d1ad5f2cc3 100644
--- a/parity/rpc.rs
+++ b/parity/rpc.rs
@@ -21,7 +21,8 @@ use std::collections::HashSet;
 
 use dapps;
 use dir::default_data_path;
-use helpers::{parity_ipc_path, replace_home};
+use dir::helpers::replace_home;
+use helpers::parity_ipc_path;
 use jsonrpc_core::MetaIoHandler;
 use parity_reactor::TokioRemote;
 use parity_rpc::informant::{RpcStats, Middleware};
@@ -42,16 +43,13 @@ pub struct HttpConfiguration {
 	pub apis: ApiSet,
 	pub cors: Option<Vec<String>>,
 	pub hosts: Option<Vec<String>>,
-	pub server_threads: Option<usize>,
+	pub server_threads: usize,
 	pub processing_threads: usize,
 }
 
 impl HttpConfiguration {
-	pub fn address(&self) -> Option<(String, u16)> {
-		match self.enabled {
-			true => Some((self.interface.clone(), self.port)),
-			false => None,
-		}
+	pub fn address(&self) -> Option<rpc::Host> {
+		address(self.enabled, &self.interface, self.port, &self.hosts)
 	}
 }
 
@@ -62,10 +60,10 @@ impl Default for HttpConfiguration {
 			interface: "127.0.0.1".into(),
 			port: 8545,
 			apis: ApiSet::UnsafeContext,
-			cors: None,
-			hosts: Some(Vec::new()),
-			server_threads: None,
-			processing_threads: 0,
+			cors: Some(vec![]),
+			hosts: Some(vec![]),
+			server_threads: 1,
+			processing_threads: 4,
 		}
 	}
 }
@@ -79,11 +77,18 @@ pub struct UiConfiguration {
 }
 
 impl UiConfiguration {
-	pub fn address(&self) -> Option<(String, u16)> {
-		match self.enabled {
-			true => Some((self.interface.clone(), self.port)),
-			false => None,
-		}
+	pub fn address(&self) -> Option<rpc::Host> {
+		address(self.enabled, &self.interface, self.port, &self.hosts)
+	}
+
+	pub fn redirection_address(&self) -> Option<(String, u16)> {
+		self.address().map(|host| {
+			let mut it = host.split(':');
+			let hostname: Option<String> = it.next().map(|s| s.to_owned());
+			let port: Option<u16> = it.next().and_then(|s| s.parse().ok());
+
+			(hostname.unwrap_or_else(|| "localhost".into()), port.unwrap_or(8180))
+		})
 	}
 }
 
@@ -94,9 +99,9 @@ impl From<UiConfiguration> for HttpConfiguration {
 			interface: conf.interface,
 			port: conf.port,
 			apis: rpc_apis::ApiSet::UnsafeContext,
-			cors: None,
+			cors: Some(vec![]),
 			hosts: conf.hosts,
-			server_threads: None,
+			server_threads: 1,
 			processing_threads: 0,
 		}
 	}
@@ -105,7 +110,7 @@ impl From<UiConfiguration> for HttpConfiguration {
 impl Default for UiConfiguration {
 	fn default() -> Self {
 		UiConfiguration {
-			enabled: true && cfg!(feature = "ui-enabled"),
+			enabled: false,
 			port: 8180,
 			interface: "127.0.0.1".into(),
 			hosts: Some(vec![]),
@@ -145,7 +150,8 @@ pub struct WsConfiguration {
 	pub hosts: Option<Vec<String>>,
 	pub signer_path: PathBuf,
 	pub support_token_api: bool,
-	pub ui_address: Option<(String, u16)>,
+	pub ui_address: Option<rpc::Host>,
+	pub dapps_address: Option<rpc::Host>,
 }
 
 impl Default for WsConfiguration {
@@ -156,21 +162,30 @@ impl Default for WsConfiguration {
 			interface: "127.0.0.1".into(),
 			port: 8546,
 			apis: ApiSet::UnsafeContext,
-			origins: Some(vec!["chrome-extension://*".into(), "moz-extension://*".into()]),
+			origins: Some(vec!["parity://*".into(),"chrome-extension://*".into(), "moz-extension://*".into()]),
 			hosts: Some(Vec::new()),
 			signer_path: replace_home(&data_dir, "$BASE/signer").into(),
 			support_token_api: true,
-			ui_address: Some(("127.0.0.1".to_owned(), 8180)),
+			ui_address: None,
+			dapps_address: Some("127.0.0.1:8545".into()),
 		}
 	}
 }
 
 impl WsConfiguration {
-	pub fn address(&self) -> Option<(String, u16)> {
-		match self.enabled {
-			true => Some((self.interface.clone(), self.port)),
-			false => None,
-		}
+	pub fn address(&self) -> Option<rpc::Host> {
+		address(self.enabled, &self.interface, self.port, &self.hosts)
+	}
+}
+
+fn address(enabled: bool, bind_iface: &str, bind_port: u16, hosts: &Option<Vec<String>>) -> Option<rpc::Host> {
+	if !enabled {
+		return None;
+	}
+
+	match *hosts {
+		Some(ref hosts) if !hosts.is_empty() => Some(hosts[0].clone().into()),
+		_ => Some(format!("{}:{}", bind_iface, bind_port).into()),
 	}
 }
 
@@ -190,17 +205,15 @@ pub fn new_ws<D: rpc_apis::Dependencies>(
 	}
 
 	let domain = DAPPS_DOMAIN;
-	let ws_address = (conf.interface, conf.port);
-	let url = format!("{}:{}", ws_address.0, ws_address.1);
+	let url = format!("{}:{}", conf.interface, conf.port);
 	let addr = url.parse().map_err(|_| format!("Invalid WebSockets listen host/port given: {}", url))?;
 
 
-	let pool = deps.pool.clone();
-	let full_handler = setup_apis(rpc_apis::ApiSet::SafeContext, deps, pool.clone());
+	let full_handler = setup_apis(rpc_apis::ApiSet::SafeContext, deps);
 	let handler = {
 		let mut handler = MetaIoHandler::with_middleware((
 			rpc::WsDispatcher::new(full_handler),
-			Middleware::new(deps.stats.clone(), deps.apis.activity_notifier(), pool)
+			Middleware::new(deps.stats.clone(), deps.apis.activity_notifier(), deps.pool.clone())
 		));
 		let apis = conf.apis.list_apis();
 		deps.apis.extend_with_set(&mut handler, &apis);
@@ -210,11 +223,11 @@ pub fn new_ws<D: rpc_apis::Dependencies>(
 
 	let remote = deps.remote.clone();
 	let ui_address = conf.ui_address.clone();
-	let allowed_origins = into_domains(with_domain(conf.origins, domain, &[ui_address]));
-	let allowed_hosts = into_domains(with_domain(conf.hosts, domain, &[Some(ws_address)]));
+	let allowed_origins = into_domains(with_domain(conf.origins, domain, &ui_address, &conf.dapps_address));
+	let allowed_hosts = into_domains(with_domain(conf.hosts, domain, &Some(url.clone().into()), &None));
 
 	let signer_path;
-	let path = match conf.support_token_api && conf.ui_address.is_some() {
+	let path = match conf.support_token_api {
 		true => {
 			signer_path = ::signer::codes_path(&conf.signer_path);
 			Some(signer_path.as_path())
@@ -234,7 +247,7 @@ pub fn new_ws<D: rpc_apis::Dependencies>(
 
 	match start_result {
 		Ok(server) => Ok(Some(server)),
-		Err(rpc::ws::Error::Io(ref err)) if err.kind() == io::ErrorKind::AddrInUse => Err(
+		Err(rpc::ws::Error(rpc::ws::ErrorKind::Io(ref err), _)) if err.kind() == io::ErrorKind::AddrInUse => Err(
 			format!("WebSockets address {} is already in use, make sure that another instance of an Ethereum client is not running or change the address using the --ws-port and --ws-interface options.", url)
 		),
 		Err(e) => Err(format!("WebSockets error: {:?}", e)),
@@ -253,15 +266,13 @@ pub fn new_http<D: rpc_apis::Dependencies>(
 	}
 
 	let domain = DAPPS_DOMAIN;
-	let http_address = (conf.interface, conf.port);
-	let url = format!("{}:{}", http_address.0, http_address.1);
+	let url = format!("{}:{}", conf.interface, conf.port);
 	let addr = url.parse().map_err(|_| format!("Invalid {} listen host/port given: {}", id, url))?;
-	let pool = deps.pool.clone();
-	let handler = setup_apis(conf.apis, deps, pool);
+	let handler = setup_apis(conf.apis, deps);
 	let remote = deps.remote.clone();
 
 	let cors_domains = into_domains(conf.cors);
-	let allowed_hosts = into_domains(with_domain(conf.hosts, domain, &[Some(http_address)]));
+	let allowed_hosts = into_domains(with_domain(conf.hosts, domain, &Some(url.clone().into()), &None));
 
 	let start_result = rpc::start_http(
 		&addr,
@@ -270,18 +281,13 @@ pub fn new_http<D: rpc_apis::Dependencies>(
 		handler,
 		remote,
 		rpc::RpcExtractor,
-		match (conf.server_threads, middleware) {
-			(Some(threads), None) => rpc::HttpSettings::Threads(threads),
-			(None, middleware) => rpc::HttpSettings::Dapps(middleware),
-			(Some(_), Some(_)) => {
-				return Err("Dapps and fast multi-threaded RPC server cannot be enabled at the same time.".into())
-			},
-		}
+		middleware,
+		conf.server_threads,
 	);
 
 	match start_result {
 		Ok(server) => Ok(Some(server)),
-		Err(rpc::HttpServerError::Io(ref err)) if err.kind() == io::ErrorKind::AddrInUse => Err(
+		Err(ref err) if err.kind() == io::ErrorKind::AddrInUse => Err(
 			format!("{} address {} is already in use, make sure that another instance of an Ethereum client is not running or change the address using the --{}-port and --{}-interface options.", id, url, options, options)
 		),
 		Err(e) => Err(format!("{} error: {:?}", id, e)),
@@ -296,9 +302,18 @@ pub fn new_ipc<D: rpc_apis::Dependencies>(
 		return Ok(None);
 	}
 
-	let pool = dependencies.pool.clone();
-	let handler = setup_apis(conf.apis, dependencies, pool);
+	let handler = setup_apis(conf.apis, dependencies);
 	let remote = dependencies.remote.clone();
+	let path = PathBuf::from(&conf.socket_addr);
+	// Make sure socket file can be created on unix-like OS.
+	// Windows pipe paths are not on the FS.
+	if !cfg!(windows) {
+		if let Some(dir) = path.parent() {
+			::std::fs::create_dir_all(&dir)
+				.map_err(|err| format!("Unable to create IPC directory at {}: {}", dir.display(), err))?;
+		}
+	}
+
 	match rpc::start_ipc(&conf.socket_addr, handler, remote, rpc::RpcExtractor) {
 		Ok(server) => Ok(Some(server)),
 		Err(io_error) => Err(format!("IPC error: {}", io_error)),
@@ -309,29 +324,53 @@ fn into_domains<T: From<String>>(items: Option<Vec<String>>) -> DomainsValidatio
 	items.map(|vals| vals.into_iter().map(T::from).collect()).into()
 }
 
-fn with_domain(items: Option<Vec<String>>, domain: &str, addresses: &[Option<(String, u16)>]) -> Option<Vec<String>> {
+fn with_domain(items: Option<Vec<String>>, domain: &str, ui_address: &Option<rpc::Host>, dapps_address: &Option<rpc::Host>) -> Option<Vec<String>> {
+	fn extract_port(s: &str) -> Option<u16> {
+		s.split(':').nth(1).and_then(|s| s.parse().ok())
+	}
+
 	items.map(move |items| {
 		let mut items = items.into_iter().collect::<HashSet<_>>();
-		for address in addresses {
-			if let Some((host, port)) = address.clone() {
-				items.insert(format!("{}:{}", host, port));
-				items.insert(format!("{}:{}", host.replace("127.0.0.1", "localhost"), port));
-				items.insert(format!("http://*.{}:{}", domain, port));
-				items.insert(format!("http://*.{}", domain)); //proxypac
-			}
+		{
+			let mut add_hosts = |address: &Option<rpc::Host>| {
+				if let Some(host) = address.clone() {
+					items.insert(host.to_string());
+					items.insert(host.replace("127.0.0.1", "localhost"));
+					items.insert(format!("http://*.{}", domain)); //proxypac
+					if let Some(port) = extract_port(&*host) {
+						items.insert(format!("http://*.{}:{}", domain, port));
+					}
+				}
+			};
+
+			add_hosts(ui_address);
+			add_hosts(dapps_address);
 		}
 		items.into_iter().collect()
 	})
 }
 
-fn setup_apis<D>(apis: ApiSet, deps: &Dependencies<D>, pool: Option<CpuPool>) -> MetaIoHandler<Metadata, Middleware<D::Notifier>>
+fn setup_apis<D>(apis: ApiSet, deps: &Dependencies<D>) -> MetaIoHandler<Metadata, Middleware<D::Notifier>>
 	where D: rpc_apis::Dependencies
 {
 	let mut handler = MetaIoHandler::with_middleware(
-		Middleware::new(deps.stats.clone(), deps.apis.activity_notifier(), pool)
+		Middleware::new(deps.stats.clone(), deps.apis.activity_notifier(), deps.pool.clone())
 	);
 	let apis = apis.list_apis();
 	deps.apis.extend_with_set(&mut handler, &apis);
 
 	handler
 }
+
+#[cfg(test)]
+mod tests {
+	use super::address;
+
+	#[test]
+	fn should_return_proper_address() {
+		assert_eq!(address(false, "localhost", 8180, &None), None);
+		assert_eq!(address(true, "localhost", 8180, &None), Some("localhost:8180".into()));
+		assert_eq!(address(true, "localhost", 8180, &Some(vec!["host:443".into()])), Some("host:443".into()));
+		assert_eq!(address(true, "localhost", 8180, &Some(vec!["host".into()])), Some("host".into()));
+	}
+}
diff --git a/parity/rpc_apis.rs b/parity/rpc_apis.rs
index 7948d9b207aeeb4390244eca7936655fea980e91..5ba18dc09bf16b9d3c8b560661b7160ba3fd9336 100644
--- a/parity/rpc_apis.rs
+++ b/parity/rpc_apis.rs
@@ -15,8 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::cmp::PartialEq;
-use std::collections::BTreeMap;
-use std::collections::HashSet;
+use std::collections::{BTreeMap, HashSet};
 use std::str::FromStr;
 use std::sync::{Arc, Weak};
 
@@ -25,20 +24,23 @@ pub use parity_rpc::dapps::{DappsService, LocalDapp};
 
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::Client;
-use ethcore::miner::{Miner, ExternalMiner};
+use ethcore::miner::Miner;
 use ethcore::snapshot::SnapshotService;
 use ethcore_logger::RotatingLogger;
 use ethsync::{ManageNetwork, SyncProvider, LightSync};
+use futures_cpupool::CpuPool;
 use hash_fetch::fetch::Client as FetchClient;
 use jsonrpc_core::{self as core, MetaIoHandler};
+use light::client::LightChainClient;
 use light::{TransactionQueue as LightTransactionQueue, Cache as LightDataCache};
+use miner::external::ExternalMiner;
 use node_health::NodeHealth;
 use parity_reactor;
 use parity_rpc::dispatch::{FullDispatcher, LightDispatcher};
 use parity_rpc::informant::{ActivityNotifier, ClientNotifier};
-use parity_rpc::{Metadata, NetworkSettings};
+use parity_rpc::{Metadata, NetworkSettings, Host};
+use parking_lot::{Mutex, RwLock};
 use updater::Updater;
-use util::{Mutex, RwLock};
 
 #[derive(Debug, PartialEq, Clone, Eq, Hash)]
 pub enum Api {
@@ -66,7 +68,7 @@ pub enum Api {
 	Traces,
 	/// Rpc (Safe)
 	Rpc,
-	/// SecretStore (Safe)
+	/// SecretStore (UNSAFE: arbitrary hash signing)
 	SecretStore,
 	/// Whisper (Safe)
 	// TODO: _if_ someone guesses someone else's key or filter IDs they can remove
@@ -221,11 +223,13 @@ pub struct FullDependencies {
 	pub health: NodeHealth,
 	pub geth_compatibility: bool,
 	pub dapps_service: Option<Arc<DappsService>>,
-	pub dapps_address: Option<(String, u16)>,
-	pub ws_address: Option<(String, u16)>,
+	pub dapps_address: Option<Host>,
+	pub ws_address: Option<Host>,
 	pub fetch: FetchClient,
+	pub pool: CpuPool,
 	pub remote: parity_reactor::Remote,
 	pub whisper_rpc: Option<::whisper::RpcFactory>,
+	pub gas_price_percentile: usize,
 }
 
 impl FullDependencies {
@@ -238,12 +242,12 @@ impl FullDependencies {
 		use parity_rpc::v1::*;
 
 		macro_rules! add_signing_methods {
-			($namespace:ident, $handler:expr, $deps:expr) => {
+			($namespace:ident, $handler:expr, $deps:expr, $nonces:expr) => {
 				{
 					let deps = &$deps;
-					let dispatcher = FullDispatcher::new(deps.client.clone(), deps.miner.clone());
+					let dispatcher = FullDispatcher::new(deps.client.clone(), deps.miner.clone(), $nonces, deps.gas_price_percentile);
 					if deps.signer_service.is_enabled() {
-						$handler.extend_with($namespace::to_delegate(SigningQueueClient::new(&deps.signer_service, dispatcher, &deps.secret_store)))
+						$handler.extend_with($namespace::to_delegate(SigningQueueClient::new(&deps.signer_service, dispatcher, deps.remote.clone(), &deps.secret_store)))
 					} else {
 						$handler.extend_with($namespace::to_delegate(SigningUnsafeClient::new(&deps.secret_store, dispatcher)))
 					}
@@ -251,7 +255,13 @@ impl FullDependencies {
 			}
 		}
 
-		let dispatcher = FullDispatcher::new(self.client.clone(), self.miner.clone());
+		let nonces = Arc::new(Mutex::new(dispatch::Reservations::with_pool(self.pool.clone())));
+		let dispatcher = FullDispatcher::new(
+			self.client.clone(),
+			self.miner.clone(),
+			nonces.clone(),
+			self.gas_price_percentile,
+		);
 		for api in apis {
 			match *api {
 				Api::Web3 => {
@@ -272,6 +282,7 @@ impl FullDependencies {
 							pending_nonce_from_queue: self.geth_compatibility,
 							allow_pending_receipt_query: !self.geth_compatibility,
 							send_block_number_in_get_work: !self.geth_compatibility,
+							gas_price_percentile: self.gas_price_percentile,
 						}
 					);
 					handler.extend_with(client.to_delegate());
@@ -280,18 +291,25 @@ impl FullDependencies {
 						let filter_client = EthFilterClient::new(self.client.clone(), self.miner.clone());
 						handler.extend_with(filter_client.to_delegate());
 
-						add_signing_methods!(EthSigning, handler, self);
+						add_signing_methods!(EthSigning, handler, self, nonces.clone());
 					}
 				},
 				Api::EthPubSub => {
 					if !for_generic_pubsub {
 						let client = EthPubSubClient::new(self.client.clone(), self.remote.clone());
-						self.client.add_notify(client.handler());
+						let h = client.handler();
+						self.miner.add_transactions_listener(Box::new(move |hashes| if let Some(h) = h.upgrade() {
+							h.new_transactions(hashes);
+						}));
+
+						if let Some(h) = client.handler().upgrade() {
+							self.client.add_notify(h);
+						}
 						handler.extend_with(client.to_delegate());
 					}
 				},
 				Api::Personal => {
-					handler.extend_with(PersonalClient::new(&self.secret_store, dispatcher.clone(), self.geth_compatibility).to_delegate());
+					handler.extend_with(PersonalClient::new(self.secret_store.clone(), dispatcher.clone(), self.geth_compatibility).to_delegate());
 				},
 				Api::Signer => {
 					handler.extend_with(SignerClient::new(&self.secret_store, dispatcher.clone(), &self.signer_service, self.remote.clone()).to_delegate());
@@ -317,7 +335,7 @@ impl FullDependencies {
 					).to_delegate());
 
 					if !for_generic_pubsub {
-						add_signing_methods!(ParitySigning, handler, self);
+						add_signing_methods!(ParitySigning, handler, self, nonces.clone());
 					}
 				},
 				Api::ParityPubSub => {
@@ -339,10 +357,11 @@ impl FullDependencies {
 						&self.net_service,
 						self.dapps_service.clone(),
 						self.fetch.clone(),
+						self.pool.clone(),
 					).to_delegate())
 				},
 				Api::Traces => {
-					handler.extend_with(TracesClient::new(&self.client, &self.miner).to_delegate())
+					handler.extend_with(TracesClient::new(&self.client).to_delegate())
 				},
 				Api::Rpc => {
 					let modules = to_modules(&apis);
@@ -353,14 +372,14 @@ impl FullDependencies {
 				},
 				Api::Whisper => {
 					if let Some(ref whisper_rpc) = self.whisper_rpc {
-						let whisper = whisper_rpc.make_handler();
+						let whisper = whisper_rpc.make_handler(self.net.clone());
 						handler.extend_with(::parity_whisper::rpc::Whisper::to_delegate(whisper));
 					}
 				}
 				Api::WhisperPubSub => {
 					if !for_generic_pubsub {
 						if let Some(ref whisper_rpc) = self.whisper_rpc {
-							let whisper = whisper_rpc.make_handler();
+							let whisper = whisper_rpc.make_handler(self.net.clone());
 							handler.extend_with(
 								::parity_whisper::rpc::WhisperPubSub::to_delegate(whisper)
 							);
@@ -398,9 +417,9 @@ impl ActivityNotifier for LightClientNotifier {
 }
 
 /// RPC dependencies for a light client.
-pub struct LightDependencies {
+pub struct LightDependencies<T> {
 	pub signer_service: Arc<SignerService>,
-	pub client: Arc<::light::client::Client>,
+	pub client: Arc<T>,
 	pub sync: Arc<LightSync>,
 	pub net: Arc<ManageNetwork>,
 	pub secret_store: Arc<AccountProvider>,
@@ -411,15 +430,17 @@ pub struct LightDependencies {
 	pub cache: Arc<Mutex<LightDataCache>>,
 	pub transaction_queue: Arc<RwLock<LightTransactionQueue>>,
 	pub dapps_service: Option<Arc<DappsService>>,
-	pub dapps_address: Option<(String, u16)>,
-	pub ws_address: Option<(String, u16)>,
+	pub dapps_address: Option<Host>,
+	pub ws_address: Option<Host>,
 	pub fetch: FetchClient,
+	pub pool: CpuPool,
 	pub geth_compatibility: bool,
 	pub remote: parity_reactor::Remote,
 	pub whisper_rpc: Option<::whisper::RpcFactory>,
+	pub gas_price_percentile: usize,
 }
 
-impl LightDependencies {
+impl<C: LightChainClient + 'static> LightDependencies<C> {
 	fn extend_api<T: core::Middleware<Metadata>>(
 		&self,
 		handler: &mut MetaIoHandler<Metadata, T>,
@@ -434,6 +455,8 @@ impl LightDependencies {
 			self.on_demand.clone(),
 			self.cache.clone(),
 			self.transaction_queue.clone(),
+			Arc::new(Mutex::new(dispatch::Reservations::with_pool(self.pool.clone()))),
+			self.gas_price_percentile,
 		);
 
 		macro_rules! add_signing_methods {
@@ -444,7 +467,7 @@ impl LightDependencies {
 					let secret_store = Some(deps.secret_store.clone());
 					if deps.signer_service.is_enabled() {
 						$handler.extend_with($namespace::to_delegate(
-							SigningQueueClient::new(&deps.signer_service, dispatcher, &secret_store)
+							SigningQueueClient::new(&deps.signer_service, dispatcher, deps.remote.clone(), &secret_store)
 						))
 					} else {
 						$handler.extend_with(
@@ -471,6 +494,7 @@ impl LightDependencies {
 						self.transaction_queue.clone(),
 						self.secret_store.clone(),
 						self.cache.clone(),
+						self.gas_price_percentile,
 					);
 					handler.extend_with(Eth::to_delegate(client.clone()));
 
@@ -486,15 +510,20 @@ impl LightDependencies {
 						self.sync.clone(),
 						self.cache.clone(),
 						self.remote.clone(),
+						self.gas_price_percentile,
 					);
-					self.client.add_listener(
-						Arc::downgrade(&client.handler()) as Weak<::light::client::LightChainNotify>
-					);
+					self.client.add_listener(client.handler() as Weak<_>);
+					let h = client.handler();
+					self.transaction_queue.write().add_listener(Box::new(move |transactions| {
+						if let Some(h) = h.upgrade() {
+							h.new_transactions(transactions);
+						}
+					}));
 					handler.extend_with(EthPubSub::to_delegate(client));
 				},
 				Api::Personal => {
 					let secret_store = Some(self.secret_store.clone());
-					handler.extend_with(PersonalClient::new(&secret_store, dispatcher.clone(), self.geth_compatibility).to_delegate());
+					handler.extend_with(PersonalClient::new(secret_store, dispatcher.clone(), self.geth_compatibility).to_delegate());
 				},
 				Api::Signer => {
 					let secret_store = Some(self.secret_store.clone());
@@ -515,6 +544,7 @@ impl LightDependencies {
 						signer,
 						self.dapps_address.clone(),
 						self.ws_address.clone(),
+						self.gas_price_percentile,
 					).to_delegate());
 
 					if !for_generic_pubsub {
@@ -538,6 +568,7 @@ impl LightDependencies {
 						self.sync.clone(),
 						self.dapps_service.clone(),
 						self.fetch.clone(),
+						self.pool.clone(),
 					).to_delegate())
 				},
 				Api::Traces => {
@@ -553,13 +584,13 @@ impl LightDependencies {
 				},
 				Api::Whisper => {
 					if let Some(ref whisper_rpc) = self.whisper_rpc {
-						let whisper = whisper_rpc.make_handler();
+						let whisper = whisper_rpc.make_handler(self.net.clone());
 						handler.extend_with(::parity_whisper::rpc::Whisper::to_delegate(whisper));
 					}
 				}
 				Api::WhisperPubSub => {
 					if let Some(ref whisper_rpc) = self.whisper_rpc {
-						let whisper = whisper_rpc.make_handler();
+						let whisper = whisper_rpc.make_handler(self.net.clone());
 						handler.extend_with(::parity_whisper::rpc::WhisperPubSub::to_delegate(whisper));
 					}
 				}
@@ -568,7 +599,7 @@ impl LightDependencies {
 	}
 }
 
-impl Dependencies for LightDependencies {
+impl<T: LightChainClient + 'static> Dependencies for LightDependencies<T> {
 	type Notifier = LightClientNotifier;
 
 	fn activity_notifier(&self) -> Self::Notifier { LightClientNotifier }
@@ -596,7 +627,6 @@ impl ApiSet {
 			Api::EthPubSub,
 			Api::Parity,
 			Api::Rpc,
-			Api::SecretStore,
 			Api::Whisper,
 			Api::WhisperPubSub,
 		].into_iter().cloned().collect();
@@ -621,6 +651,7 @@ impl ApiSet {
 				public_list.insert(Api::ParityAccounts);
 				public_list.insert(Api::ParitySet);
 				public_list.insert(Api::Signer);
+				public_list.insert(Api::SecretStore);
 				public_list
 			},
 			ApiSet::All => {
@@ -630,6 +661,7 @@ impl ApiSet {
 				public_list.insert(Api::ParitySet);
 				public_list.insert(Api::Signer);
 				public_list.insert(Api::Personal);
+				public_list.insert(Api::SecretStore);
 				public_list
 			},
 			ApiSet::PubSub => [
@@ -680,7 +712,7 @@ mod test {
 	fn test_api_set_unsafe_context() {
 		let expected = vec![
 			// make sure this list contains only SAFE methods
-			Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::SecretStore, Api::Whisper, Api::WhisperPubSub,
+			Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::Whisper, Api::WhisperPubSub,
 		].into_iter().collect();
 		assert_eq!(ApiSet::UnsafeContext.list_apis(), expected);
 	}
@@ -689,7 +721,7 @@ mod test {
 	fn test_api_set_ipc_context() {
 		let expected = vec![
 			// safe
-			Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::SecretStore, Api::Whisper, Api::WhisperPubSub,
+			Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::Whisper, Api::WhisperPubSub,
 			// semi-safe
 			Api::ParityAccounts
 		].into_iter().collect();
@@ -731,7 +763,7 @@ mod test {
 	#[test]
 	fn test_safe_parsing() {
 		assert_eq!("safe".parse::<ApiSet>().unwrap(), ApiSet::List(vec![
-			Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::SecretStore, Api::Whisper, Api::WhisperPubSub,
+			Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::Whisper, Api::WhisperPubSub,
 		].into_iter().collect()));
 	}
 }
diff --git a/parity/run.rs b/parity/run.rs
index a81d61ba0f45453b250c8f8175f0e2f3af54c641..d485694b9cf1ed9252eaca3b26d25690616ddace 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -16,29 +16,39 @@
 
 use std::fmt;
 use std::sync::{Arc, Weak};
+use std::time::{Duration, Instant};
+use std::thread;
 use std::net::{TcpListener};
 
+use ansi_term::{Colour, Style};
 use ctrlc::CtrlC;
-use ethcore_logger::{Config as LogConfig, RotatingLogger};
 use ethcore::account_provider::{AccountProvider, AccountProviderSettings};
 use ethcore::client::{Client, Mode, DatabaseCompactionProfile, VMType, BlockChainClient};
+use ethcore::db::NUM_COLUMNS;
 use ethcore::ethstore::ethkey;
-use ethcore::miner::{Miner, MinerService, ExternalMiner, MinerOptions};
+use ethcore::miner::{Miner, MinerService, MinerOptions};
 use ethcore::miner::{StratumOptions, Stratum};
-use ethcore::service::ClientService;
 use ethcore::snapshot;
+use ethcore::spec::{SpecParams, OptimizeFor};
 use ethcore::verification::queue::VerifierSettings;
+use ethcore_logger::{Config as LogConfig, RotatingLogger};
+use ethcore_service::ClientService;
 use ethsync::{self, SyncConfig};
 use fdlimit::raise_fd_limit;
-use hash_fetch::fetch::{Fetch, Client as FetchClient};
+use futures_cpupool::CpuPool;
+use hash_fetch::{self, fetch};
 use informant::{Informant, LightNodeInformantData, FullNodeInformantData};
+use journaldb::Algorithm;
+use kvdb_rocksdb::{Database, DatabaseConfig};
 use light::Cache as LightDataCache;
+use miner::external::ExternalMiner;
+use node_filter::NodeFilter;
 use node_health;
 use parity_reactor::EventLoop;
 use parity_rpc::{NetworkSettings, informant, is_major_importing};
+use parking_lot::{Condvar, Mutex};
 use updater::{UpdatePolicy, Updater};
-use util::{Colour, version, Mutex, Condvar};
-use node_filter::NodeFilter;
+use parity_version::version;
 
 use params::{
 	SpecType, Pruning, AccountsConfig, GasPricerConfig, MinerExtras, Switch,
@@ -66,7 +76,7 @@ const SNAPSHOT_HISTORY: u64 = 100;
 
 // Number of minutes before a given gas price corpus should expire.
 // Light client only.
-const GAS_CORPUS_EXPIRATION_MINUTES: i64 = 60 * 6;
+const GAS_CORPUS_EXPIRATION_MINUTES: u64 = 60 * 6;
 
 // Pops along with error messages when a password is missing or invalid.
 const VERIFY_PASSWORD_HINT: &'static str = "Make sure valid password is present in files passed using `--password` or in the configuration file.";
@@ -83,6 +93,7 @@ pub struct RunCmd {
 	pub daemon: Option<String>,
 	pub logger_config: LogConfig,
 	pub miner_options: MinerOptions,
+	pub gas_price_percentile: usize,
 	pub ntp_servers: Vec<String>,
 	pub ws_conf: rpc::WsConfiguration,
 	pub http_conf: rpc::HttpConfiguration,
@@ -119,7 +130,8 @@ pub struct RunCmd {
 	pub serve_light: bool,
 	pub light: bool,
 	pub no_persistent_txqueue: bool,
-	pub whisper: ::whisper::Config
+	pub whisper: ::whisper::Config,
+	pub no_hardcoded_sync: bool,
 }
 
 pub fn open_ui(ws_conf: &rpc::WsConfiguration, ui_conf: &rpc::UiConfiguration, logger_config: &LogConfig) -> Result<(), String> {
@@ -151,7 +163,7 @@ struct FullNodeInfo {
 }
 
 impl ::local_store::NodeInfo for FullNodeInfo {
-	fn pending_transactions(&self) -> Vec<::ethcore::transaction::PendingTransaction> {
+	fn pending_transactions(&self) -> Vec<::transaction::PendingTransaction> {
 		let miner = match self.miner.as_ref() {
 			Some(m) => m,
 			None => return Vec::new(),
@@ -166,14 +178,16 @@ impl ::local_store::NodeInfo for FullNodeInfo {
 	}
 }
 
+type LightClient = ::light::client::Client<::light_helpers::EpochFetch>;
+
 // helper for light execution.
-fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> Result<(bool, Option<String>), String> {
+fn execute_light_impl(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> Result<((bool, Option<String>), Weak<LightClient>), String> {
 	use light::client as light_client;
 	use ethsync::{LightSyncParams, LightSync, ManageNetwork};
-	use util::RwLock;
+	use parking_lot::{Mutex, RwLock};
 
 	// load spec
-	let spec = cmd.spec.spec(&cmd.dirs.cache)?;
+	let spec = cmd.spec.spec(SpecParams::new(cmd.dirs.cache.as_ref(), OptimizeFor::Memory))?;
 
 	// load genesis hash
 	let genesis_hash = spec.genesis_header().hash();
@@ -204,27 +218,50 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 	info!("Running in experimental {} mode.", Colour::Blue.bold().paint("Light Client"));
 
 	// TODO: configurable cache size.
-	let cache = LightDataCache::new(Default::default(), ::time::Duration::minutes(GAS_CORPUS_EXPIRATION_MINUTES));
-	let cache = Arc::new(::util::Mutex::new(cache));
+	let cache = LightDataCache::new(Default::default(), Duration::from_secs(60 * GAS_CORPUS_EXPIRATION_MINUTES));
+	let cache = Arc::new(Mutex::new(cache));
 
 	// start client and create transaction queue.
 	let mut config = light_client::Config {
 		queue: Default::default(),
 		chain_column: ::ethcore::db::COL_LIGHT_CHAIN,
-		db_cache_size: Some(cmd.cache_config.blockchain() as usize * 1024 * 1024),
-		db_compaction: compaction,
-		db_wal: cmd.wal,
 		verify_full: true,
 		check_seal: cmd.check_seal,
+		no_hardcoded_sync: cmd.no_hardcoded_sync,
 	};
 
 	config.queue.max_mem_use = cmd.cache_config.queue() as usize * 1024 * 1024;
 	config.queue.verifier_settings = cmd.verifier_settings;
 
-	let service = light_client::Service::start(config, &spec, &db_dirs.client_path(algorithm), cache.clone())
+	// start on_demand service.
+	let on_demand = Arc::new(::light::on_demand::OnDemand::new(cache.clone()));
+
+	let sync_handle = Arc::new(RwLock::new(Weak::new()));
+	let fetch = ::light_helpers::EpochFetch {
+		on_demand: on_demand.clone(),
+		sync: sync_handle.clone(),
+	};
+
+	// initialize database.
+	let db = {
+		let db_config = DatabaseConfig {
+			memory_budget: Some(cmd.cache_config.blockchain() as usize * 1024 * 1024),
+			compaction: compaction,
+			wal: cmd.wal,
+			.. DatabaseConfig::with_columns(NUM_COLUMNS)
+		};
+
+		Arc::new(Database::open(
+			&db_config,
+			&db_dirs.client_path(algorithm).to_str().expect("DB path could not be converted to string.")
+		).map_err(|e| format!("Error opening database: {}", e))?)
+	};
+
+	let service = light_client::Service::start(config, &spec, fetch, db, cache.clone())
 		.map_err(|e| format!("Error starting light client: {}", e))?;
+	let client = service.client();
 	let txq = Arc::new(RwLock::new(::light::transaction_queue::TransactionQueue::default()));
-	let provider = ::light::provider::LightProvider::new(service.client().clone(), txq.clone());
+	let provider = ::light::provider::LightProvider::new(client.clone(), txq.clone());
 
 	// start network.
 	// set up bootnodes
@@ -233,15 +270,10 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 		net_conf.boot_nodes = spec.nodes.clone();
 	}
 
-	// start on_demand service.
-	let on_demand = Arc::new(::light::on_demand::OnDemand::new(cache.clone()));
-
 	let mut attached_protos = Vec::new();
 	let whisper_factory = if cmd.whisper.enabled {
-		let (whisper_net, whisper_factory) = ::whisper::setup(cmd.whisper.target_message_pool_size)
+		let whisper_factory = ::whisper::setup(cmd.whisper.target_message_pool_size, &mut attached_protos)
 			.map_err(|e| format!("Failed to initialize whisper: {}", e))?;
-
-		attached_protos.push(whisper_net);
 		whisper_factory
 	} else {
 		None
@@ -259,13 +291,14 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 	};
 	let light_sync = LightSync::new(sync_params).map_err(|e| format!("Error starting network: {}", e))?;
 	let light_sync = Arc::new(light_sync);
+	*sync_handle.write() = Arc::downgrade(&light_sync);
 
 	// spin up event loop
 	let event_loop = EventLoop::spawn();
 
 	// queue cull service.
 	let queue_cull = Arc::new(::light_helpers::QueueCull {
-		client: service.client().clone(),
+		client: client.clone(),
 		sync: light_sync.clone(),
 		on_demand: on_demand.clone(),
 		txq: txq.clone(),
@@ -277,8 +310,10 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 	// start the network.
 	light_sync.start_network();
 
+	let cpu_pool = CpuPool::new(4);
+
 	// fetch service
-	let fetch = FetchClient::new().map_err(|e| format!("Error starting fetch client: {:?}", e))?;
+	let fetch = fetch::Client::new().map_err(|e| format!("Error starting fetch client: {:?}", e))?;
 	let passwords = passwords_from_files(&cmd.acc_conf.password_files)?;
 
 	// prepare account provider
@@ -286,13 +321,13 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 	let rpc_stats = Arc::new(informant::RpcStats::default());
 
 	// the dapps server
-	let signer_service = Arc::new(signer::new_service(&cmd.ws_conf, &cmd.ui_conf, &cmd.logger_config));
+	let signer_service = Arc::new(signer::new_service(&cmd.ws_conf, &cmd.logger_config));
 	let (node_health, dapps_deps) = {
-		let contract_client = Arc::new(::dapps::LightRegistrar {
-			client: service.client().clone(),
+		let contract_client = ::dapps::LightRegistrar {
+			client: client.clone(),
 			sync: light_sync.clone(),
 			on_demand: on_demand.clone(),
-		});
+		};
 
 		struct LightSyncStatus(Arc<LightSync>);
 		impl fmt::Debug for LightSyncStatus {
@@ -311,18 +346,18 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 		let sync_status = Arc::new(LightSyncStatus(light_sync.clone()));
 		let node_health = node_health::NodeHealth::new(
 			sync_status.clone(),
-			node_health::TimeChecker::new(&cmd.ntp_servers, fetch.pool()),
+			node_health::TimeChecker::new(&cmd.ntp_servers, cpu_pool.clone()),
 			event_loop.remote(),
 		);
 
 		(node_health.clone(), dapps::Dependencies {
 			sync_status,
 			node_health,
-			contract_client: contract_client,
-			remote: event_loop.raw_remote(),
+			contract_client: Arc::new(contract_client),
 			fetch: fetch.clone(),
+			pool: cpu_pool.clone(),
 			signer: signer_service.clone(),
-			ui_address: cmd.ui_conf.address(),
+			ui_address: cmd.ui_conf.redirection_address(),
 		})
 	};
 
@@ -333,7 +368,7 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 	let dapps_service = dapps::service(&dapps_middleware);
 	let deps_for_rpc_apis = Arc::new(rpc_apis::LightDependencies {
 		signer_service: signer_service,
-		client: service.client().clone(),
+		client: client.clone(),
 		sync: light_sync.clone(),
 		net: light_sync.clone(),
 		health: node_health,
@@ -347,9 +382,11 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 		dapps_address: cmd.dapps_conf.address(cmd.http_conf.address()),
 		ws_address: cmd.ws_conf.address(),
 		fetch: fetch,
+		pool: cpu_pool.clone(),
 		geth_compatibility: cmd.geth_compatibility,
 		remote: event_loop.remote(),
 		whisper_rpc: whisper_factory,
+		gas_price_percentile: cmd.gas_price_percentile,
 	});
 
 	let dependencies = rpc::Dependencies {
@@ -372,7 +409,7 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 	// the informant
 	let informant = Arc::new(Informant::new(
 		LightNodeInformantData {
-			client: service.client().clone(),
+			client: client.clone(),
 			sync: light_sync.clone(),
 			cache: cache,
 		},
@@ -387,26 +424,13 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) ->
 	let res = wait_for_exit(None, None, can_restart);
 	informant.shutdown();
 
-	Ok(res)
-}
+	// Create a weak reference to the client so that we can wait on shutdown until it is dropped
+	let weak_client = Arc::downgrade(&client);
 
-pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> Result<(bool, Option<String>), String> {
-	if cmd.ui && cmd.dapps_conf.enabled {
-		// Check if Parity is already running
-		let addr = format!("{}:{}", cmd.ui_conf.interface, cmd.ui_conf.port);
-		if !TcpListener::bind(&addr as &str).is_ok() {
-			return open_ui(&cmd.ws_conf, &cmd.ui_conf, &cmd.logger_config).map(|_| (false, None));
-		}
-	}
-
-	// increase max number of open files
-	raise_fd_limit();
-
-	// run as light client.
-	if cmd.light {
-		return execute_light(cmd, can_restart, logger);
-	}
+	Ok((res, weak_client))
+}
 
+pub fn execute_impl(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> Result<((bool, Option<String>), Weak<Client>), String> {
 	// load spec
 	let spec = cmd.spec.spec(&cmd.dirs.cache)?;
 
@@ -489,7 +513,21 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 	}
 
 	sync_config.fork_block = spec.fork_block();
-	sync_config.warp_sync = spec.engine.supports_warp() && cmd.warp_sync;
+	let mut warp_sync = cmd.warp_sync;
+	if warp_sync {
+		// Logging is not initialized yet, so we print directly to stderr
+		if fat_db {
+			warn!("Warning: Warp Sync is disabled because Fat DB is turned on.");
+			warp_sync = false;
+		} else if tracing {
+			warn!("Warning: Warp Sync is disabled because tracing is turned on.");
+			warp_sync = false;
+		} else if algorithm != Algorithm::OverlayRecent {
+			warn!("Warning: Warp Sync is disabled because of non-default pruning mode.");
+			warp_sync = false;
+		}
+	}
+	sync_config.warp_sync = spec.engine.supports_warp() && warp_sync;
 	sync_config.download_old_blocks = cmd.download_old_blocks;
 	sync_config.serve_light = cmd.serve_light;
 
@@ -498,12 +536,14 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 	// prepare account provider
 	let account_provider = Arc::new(prepare_account_provider(&cmd.spec, &cmd.dirs, &spec.data_dir, cmd.acc_conf, &passwords)?);
 
+	let cpu_pool = CpuPool::new(4);
+
 	// fetch service
-	let fetch = FetchClient::new().map_err(|e| format!("Error starting fetch client: {:?}", e))?;
+	let fetch = fetch::Client::new().map_err(|e| format!("Error starting fetch client: {:?}", e))?;
 
 	// create miner
 	let initial_min_gas_price = cmd.gas_pricer_conf.initial_min();
-	let miner = Miner::new(cmd.miner_options, cmd.gas_pricer_conf.to_gas_pricer(fetch.clone()), &spec, Some(account_provider.clone()));
+	let miner = Miner::new(cmd.miner_options, cmd.gas_pricer_conf.to_gas_pricer(fetch.clone(), cpu_pool.clone()), &spec, Some(account_provider.clone()));
 	miner.set_author(cmd.miner_extras.author);
 	miner.set_gas_floor_target(cmd.miner_extras.gas_floor_target);
 	miner.set_gas_ceil_target(cmd.miner_extras.gas_ceil_target);
@@ -529,6 +569,11 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 		}
 	}
 
+	// display warning if using --no-hardcoded-sync
+	if !cmd.no_hardcoded_sync {
+		warn!("The --no-hardcoded-sync flag has no effect if you don't use --light");
+	}
+
 	// create client config
 	let mut client_config = to_client_config(
 		&cmd.cache_config,
@@ -557,9 +602,6 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 	// set network path.
 	net_conf.net_config_path = Some(db_dirs.network_path().to_string_lossy().into_owned());
 
-	// create supervisor
-	let mut hypervisor = modules::hypervisor(&cmd.dirs.ipc_path());
-
 	// create client service.
 	let service = ClientService::start(
 		client_config,
@@ -629,10 +671,9 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 	let mut attached_protos = Vec::new();
 
 	let whisper_factory = if cmd.whisper.enabled {
-		let (whisper_net, whisper_factory) = ::whisper::setup(cmd.whisper.target_message_pool_size)
+		let whisper_factory = ::whisper::setup(cmd.whisper.target_message_pool_size, &mut attached_protos)
 			.map_err(|e| format!("Failed to initialize whisper: {}", e))?;
 
-		attached_protos.push(whisper_net);
 		whisper_factory
 	} else {
 		None
@@ -640,7 +681,6 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 
 	// create sync object
 	let (sync_provider, manage_network, chain_notify) = modules::sync(
-		&mut hypervisor,
 		sync_config,
 		net_conf.clone().into(),
 		client.clone(),
@@ -664,13 +704,15 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 	// spin up event loop
 	let event_loop = EventLoop::spawn();
 
+	let contract_client = Arc::new(::dapps::FullRegistrar::new(client.clone()));
+
 	// the updater service
+	let updater_fetch = fetch.clone();
 	let updater = Updater::new(
 		Arc::downgrade(&(service.client() as Arc<BlockChainClient>)),
 		Arc::downgrade(&sync_provider),
 		update_policy,
-		fetch.clone(),
-		event_loop.remote(),
+		hash_fetch::Client::with_fetch(contract_client.clone(), cpu_pool.clone(), updater_fetch, event_loop.remote())
 	);
 	service.add_notify(updater.clone());
 
@@ -681,12 +723,11 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 		false => Some(account_provider.clone())
 	};
 
-	let signer_service = Arc::new(signer::new_service(&cmd.ws_conf, &cmd.ui_conf, &cmd.logger_config));
+	let signer_service = Arc::new(signer::new_service(&cmd.ws_conf, &cmd.logger_config));
 
 	// the dapps server
 	let (node_health, dapps_deps) = {
 		let (sync, client) = (sync_provider.clone(), client.clone());
-		let contract_client = Arc::new(::dapps::FullRegistrar { client: client.clone() });
 
 		struct SyncStatus(Arc<ethsync::SyncProvider>, Arc<Client>, ethsync::NetworkConfiguration);
 		impl fmt::Debug for SyncStatus {
@@ -707,17 +748,17 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 		let sync_status = Arc::new(SyncStatus(sync, client, net_conf));
 		let node_health = node_health::NodeHealth::new(
 			sync_status.clone(),
-			node_health::TimeChecker::new(&cmd.ntp_servers, fetch.pool()),
+			node_health::TimeChecker::new(&cmd.ntp_servers, cpu_pool.clone()),
 			event_loop.remote(),
 		);
 		(node_health.clone(), dapps::Dependencies {
 			sync_status,
 			node_health,
-			contract_client: contract_client,
-			remote: event_loop.raw_remote(),
+			contract_client,
 			fetch: fetch.clone(),
+			pool: cpu_pool.clone(),
 			signer: signer_service.clone(),
-			ui_address: cmd.ui_conf.address(),
+			ui_address: cmd.ui_conf.redirection_address(),
 		})
 	};
 	let dapps_middleware = dapps::new(cmd.dapps_conf.clone(), dapps_deps.clone())?;
@@ -743,8 +784,10 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 		dapps_address: cmd.dapps_conf.address(cmd.http_conf.address()),
 		ws_address: cmd.ws_conf.address(),
 		fetch: fetch.clone(),
+		pool: cpu_pool.clone(),
 		remote: event_loop.remote(),
 		whisper_rpc: whisper_factory,
+		gas_price_percentile: cmd.gas_price_percentile,
 	});
 
 	let dependencies = rpc::Dependencies {
@@ -769,6 +812,7 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 	// secret store key server
 	let secretstore_deps = secretstore::Dependencies {
 		client: client.clone(),
+		sync: sync_provider.clone(),
 		account_provider: account_provider,
 		accounts_passwords: &passwords,
 	};
@@ -835,6 +879,9 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 		open_dapp(&cmd.dapps_conf, &cmd.http_conf, &dapp)?;
 	}
 
+	// Create a weak reference to the client so that we can wait on shutdown until it is dropped
+	let weak_client = Arc::downgrade(&client);
+
 	// Handle exit
 	let restart = wait_for_exit(Some(updater), Some(client), can_restart);
 
@@ -848,11 +895,38 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> R
 	// just Arc is dropping here, to allow other reference release in its default time
 	drop(informant);
 
-	// hypervisor should be shutdown first while everything still works and can be
-	// terminated gracefully
-	drop(hypervisor);
+	Ok((restart, weak_client))
+}
+
+pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>) -> Result<(bool, Option<String>), String> {
+	if cmd.ui_conf.enabled {
+		warn!("{}", Style::new().bold().paint("Parity browser interface is deprecated. It's going to be removed in the next version, use standalone Parity UI instead."));
+		warn!("{}", Style::new().bold().paint("Standalone Parity UI: https://github.com/Parity-JS/shell/releases"));
+	}
+
+	if cmd.ui && cmd.dapps_conf.enabled {
+		// Check if Parity is already running
+		let addr = format!("{}:{}", cmd.ui_conf.interface, cmd.ui_conf.port);
+		if !TcpListener::bind(&addr as &str).is_ok() {
+			return open_ui(&cmd.ws_conf, &cmd.ui_conf, &cmd.logger_config).map(|_| (false, None));
+		}
+	}
+
+	// increase max number of open files
+	raise_fd_limit();
+
+	fn wait<T>(res: Result<((bool, Option<String>), Weak<T>), String>) -> Result<(bool, Option<String>), String> {
+		res.map(|(restart, weak_client)| {
+			wait_for_drop(weak_client);
+			restart
+		})
+	}
 
-	Ok(restart)
+	if cmd.light {
+		wait(execute_light_impl(cmd, can_restart, logger))
+	} else {
+		wait(execute_impl(cmd, can_restart, logger))
+	}
 }
 
 #[cfg(not(windows))]
@@ -881,7 +955,7 @@ fn print_running_environment(spec_name: &String, dirs: &Directories, db_dirs: &D
 
 fn prepare_account_provider(spec: &SpecType, dirs: &Directories, data_dir: &str, cfg: AccountsConfig, passwords: &[String]) -> Result<AccountProvider, String> {
 	use ethcore::ethstore::EthStore;
-	use ethcore::ethstore::dir::RootDiskDirectory;
+	use ethcore::ethstore::accounts_dir::RootDiskDirectory;
 
 	let path = dirs.keys_path(data_dir);
 	upgrade_key_location(&dirs.legacy_keys_path(cfg.testnet), &path);
@@ -897,9 +971,15 @@ fn prepare_account_provider(spec: &SpecType, dirs: &Directories, data_dir: &str,
 			],
 		},
 	};
+
+	let ethstore = EthStore::open_with_iterations(dir, cfg.iterations).map_err(|e| format!("Could not open keys directory: {}", e))?;
+	if cfg.refresh_time > 0 {
+		ethstore.set_refresh_time(::std::time::Duration::from_secs(cfg.refresh_time));
+	}
 	let account_provider = AccountProvider::new(
-		Box::new(EthStore::open_with_iterations(dir, cfg.iterations).map_err(|e| format!("Could not open keys directory: {}", e))?),
-		account_settings);
+		Box::new(ethstore),
+		account_settings,
+	);
 
 	for a in cfg.unlocked_accounts {
 		// Check if the account exists
@@ -934,7 +1014,7 @@ fn insert_dev_account(account_provider: &AccountProvider) {
 			Ok(address) => {
 				let _ = account_provider.set_account_name(address.clone(), "Development Account".into());
 				let _ = account_provider.set_account_meta(address, ::serde_json::to_string(&(vec![
-					("description", "Never use this account outside of develoopment chain!"),
+					("description", "Never use this account outside of development chain!"),
 					("passwordHint","Password is empty string"),
 				].into_iter().collect::<::std::collections::HashMap<_,_>>())).expect("Serialization of hashmap does not fail."));
 			},
@@ -979,3 +1059,27 @@ fn wait_for_exit(
 	let _ = exit.1.wait(&mut l);
 	l.clone()
 }
+
+fn wait_for_drop<T>(w: Weak<T>) {
+	let sleep_duration = Duration::from_secs(1);
+	let warn_timeout = Duration::from_secs(60);
+	let max_timeout = Duration::from_secs(300);
+
+	let instant = Instant::now();
+	let mut warned = false;
+
+	while instant.elapsed() < max_timeout {
+		if w.upgrade().is_none() {
+			return;
+		}
+
+		if !warned && instant.elapsed() > warn_timeout {
+			warned = true;
+			warn!("Shutdown is taking longer than expected.");
+		}
+
+		thread::sleep(sleep_duration);
+	}
+
+	warn!("Shutdown timeout reached, exiting uncleanly.");
+}
diff --git a/parity/secretstore.rs b/parity/secretstore.rs
index eb5922540205ec96d5591481ca4d33a22b997ea7..c71f2c14da669e99b7d6fbfa89c49f70489eb088 100644
--- a/parity/secretstore.rs
+++ b/parity/secretstore.rs
@@ -17,14 +17,15 @@
 use std::collections::BTreeMap;
 use std::sync::Arc;
 use dir::default_data_path;
+use dir::helpers::replace_home;
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::Client;
 use ethkey::{Secret, Public};
-use helpers::replace_home;
-use util::Address;
+use ethsync::SyncProvider;
+use ethereum_types::Address;
 
-#[derive(Debug, PartialEq, Clone)]
 /// This node secret key.
+#[derive(Debug, PartialEq, Clone)]
 pub enum NodeSecretKey {
 	/// Stored as plain text in configuration file.
 	Plain(Secret),
@@ -32,6 +33,15 @@ pub enum NodeSecretKey {
 	KeyStore(Address),
 }
 
+/// Secret store service contract address.
+#[derive(Debug, PartialEq, Clone)]
+pub enum ContractAddress {
+	/// Contract address is read from registry.
+	Registry,
+	/// Contract address is specified.
+	Address(Address),
+}
+
 #[derive(Debug, PartialEq, Clone)]
 /// Secret store configuration
 pub struct Configuration {
@@ -41,6 +51,10 @@ pub struct Configuration {
 	pub http_enabled: bool,
 	/// Is ACL check enabled.
 	pub acl_check_enabled: bool,
+	/// Is auto migrate enabled.
+	pub auto_migrate_enabled: bool,
+	/// Service contract address.
+	pub service_contract_address: Option<ContractAddress>,
 	/// This node secret.
 	pub self_secret: Option<NodeSecretKey>,
 	/// Other nodes IDs + addresses.
@@ -55,12 +69,16 @@ pub struct Configuration {
 	pub http_port: u16,
 	/// Data directory path for secret store
 	pub data_path: String,
+	/// Administrator public key.
+	pub admin_public: Option<Public>,
 }
 
 /// Secret store dependencies
 pub struct Dependencies<'a> {
 	/// Blockchain client.
 	pub client: Arc<Client>,
+	/// Sync provider.
+	pub sync: Arc<SyncProvider>,
 	/// Account provider.
 	pub account_provider: Arc<AccountProvider>,
 	/// Passed accounts passwords.
@@ -88,7 +106,7 @@ mod server {
 	use ethcore_secretstore;
 	use ethkey::KeyPair;
 	use ansi_term::Colour::Red;
-	use super::{Configuration, Dependencies, NodeSecretKey};
+	use super::{Configuration, Dependencies, NodeSecretKey, ContractAddress};
 
 	/// Key server
 	pub struct KeyServer {
@@ -119,7 +137,7 @@ mod server {
 					// Attempt to sign in the engine signer.
 					let password = deps.accounts_passwords.iter()
 						.find(|p| deps.account_provider.sign(account.clone(), Some((*p).clone()), Default::default()).is_ok())
-						.ok_or(format!("No valid password for the secret store node account {}", account))?;
+						.ok_or_else(|| format!("No valid password for the secret store node account {}", account))?;
 					Arc::new(ethcore_secretstore::KeyStoreNodeKeyPair::new(deps.account_provider, account, password.clone())
 						.map_err(|e| format!("{}", e))?)
 				},
@@ -132,6 +150,10 @@ mod server {
 					address: conf.http_interface.clone(),
 					port: conf.http_port,
 				}) } else { None },
+				service_contract_address: conf.service_contract_address.map(|c| match c {
+					ContractAddress::Registry => ethcore_secretstore::ContractAddress::Registry,
+					ContractAddress::Address(address) => ethcore_secretstore::ContractAddress::Address(address),
+				}),
 				data_path: conf.data_path.clone(),
 				acl_check_enabled: conf.acl_check_enabled,
 				cluster_config: ethcore_secretstore::ClusterConfiguration {
@@ -145,12 +167,14 @@ mod server {
 						port: port,
 					})).collect(),
 					allow_connecting_to_higher_nodes: true,
+					admin_public: conf.admin_public,
+					auto_migrate_enabled: conf.auto_migrate_enabled,
 				},
 			};
 
 			cconf.cluster_config.nodes.insert(self_secret.public().clone(), cconf.cluster_config.listener_address.clone());
 
-			let key_server = ethcore_secretstore::start(deps.client, self_secret, cconf)
+			let key_server = ethcore_secretstore::start(deps.client, deps.sync, self_secret, cconf)
 				.map_err(|e| format!("Error starting KeyServer {}: {}", key_server_name, e))?;
 
 			Ok(KeyServer {
@@ -169,7 +193,10 @@ impl Default for Configuration {
 			enabled: true,
 			http_enabled: true,
 			acl_check_enabled: true,
+			auto_migrate_enabled: true,
+			service_contract_address: None,
 			self_secret: None,
+			admin_public: None,
 			nodes: BTreeMap::new(),
 			interface: "127.0.0.1".to_owned(),
 			port: 8083,
diff --git a/parity/signer.rs b/parity/signer.rs
index 8bdf18bd06b55366e0447937d137f523f378cc75..ab476ef9d7e54324d0374db48c103c7ea2deb7e2 100644
--- a/parity/signer.rs
+++ b/parity/signer.rs
@@ -32,10 +32,10 @@ pub struct NewToken {
 	pub message: String,
 }
 
-pub fn new_service(ws_conf: &rpc::WsConfiguration, ui_conf: &rpc::UiConfiguration, logger_config: &LogConfig) -> rpc_apis::SignerService {
-	let signer_path = ws_conf.signer_path.clone();
+pub fn new_service(ws_conf: &rpc::WsConfiguration, logger_config: &LogConfig) -> rpc_apis::SignerService {
 	let logger_config_color = logger_config.color;
-	let signer_enabled = ui_conf.enabled;
+	let signer_path = ws_conf.signer_path.clone();
+	let signer_enabled = ws_conf.support_token_api;
 
 	rpc_apis::SignerService::new(move || {
 		generate_new_token(&signer_path, logger_config_color).map_err(|e| format!("{:?}", e))
@@ -56,6 +56,24 @@ pub fn execute(ws_conf: rpc::WsConfiguration, ui_conf: rpc::UiConfiguration, log
 pub fn generate_token_and_url(ws_conf: &rpc::WsConfiguration, ui_conf: &rpc::UiConfiguration, logger_config: &LogConfig) -> Result<NewToken, String> {
 	let code = generate_new_token(&ws_conf.signer_path, logger_config.color).map_err(|err| format!("Error generating token: {:?}", err))?;
 	let auth_url = format!("http://{}:{}/#/auth?token={}", ui_conf.interface, ui_conf.port, code);
+	let colored = |s: String| match logger_config.color {
+		true => format!("{}", White.bold().paint(s)),
+		false => s,
+	};
+
+	if !ui_conf.enabled {
+		return Ok(NewToken {
+			token: code.clone(),
+			url: auth_url.clone(),
+			message: format!(
+				r#"
+Generated token:
+{}
+"#,
+				colored(code)
+			),
+		})
+	}
 
 	// And print in to the console
 	Ok(NewToken {
@@ -67,10 +85,7 @@ Open: {}
 to authorize your browser.
 Or use the generated token:
 {}"#,
-			match logger_config.color {
-				true => format!("{}", White.bold().paint(auth_url)),
-				false => auth_url
-			},
+			colored(auth_url),
 			code
 		)
 	})
diff --git a/parity/snapshot.rs b/parity/snapshot.rs
index dc786a2ea2ebd6256525aae517e449185b83c7fe..bda5059f7e507111f2011012723d961b92d40fa1 100644
--- a/parity/snapshot.rs
+++ b/parity/snapshot.rs
@@ -20,13 +20,14 @@ use std::time::Duration;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
+use hash::keccak;
 use ethcore::snapshot::{Progress, RestorationStatus, SnapshotService as SS};
 use ethcore::snapshot::io::{SnapshotReader, PackedReader, PackedWriter};
 use ethcore::snapshot::service::Service as SnapshotService;
-use ethcore::service::ClientService;
 use ethcore::client::{Mode, DatabaseCompactionProfile, VMType};
 use ethcore::miner::Miner;
 use ethcore::ids::BlockId;
+use ethcore_service::ClientService;
 
 use cache::CacheConfig;
 use params::{SpecType, Pruning, Switch, tracing_switch_to_bool, fatdb_switch_to_bool};
@@ -65,8 +66,6 @@ pub struct SnapshotCommand {
 // helper for reading chunks from arbitrary reader and feeding them into the
 // service.
 fn restore_using<R: SnapshotReader>(snapshot: Arc<SnapshotService>, reader: &R, recover: bool) -> Result<(), String> {
-	use util::sha3::Hashable;
-
 	let manifest = reader.manifest();
 
 	info!("Restoring to block #{} (0x{:?})", manifest.block_number, manifest.block_hash);
@@ -95,7 +94,7 @@ fn restore_using<R: SnapshotReader>(snapshot: Arc<SnapshotService>, reader: &R,
  		let chunk = reader.chunk(state_hash)
 			.map_err(|e| format!("Encountered error while reading chunk {:?}: {}", state_hash, e))?;
 
-		let hash = chunk.sha3();
+		let hash = keccak(&chunk);
 		if hash != state_hash {
 			return Err(format!("Mismatched chunk hash. Expected {:?}, got {:?}", state_hash, hash));
 		}
@@ -112,7 +111,7 @@ fn restore_using<R: SnapshotReader>(snapshot: Arc<SnapshotService>, reader: &R,
  		let chunk = reader.chunk(block_hash)
 			.map_err(|e| format!("Encountered error while reading chunk {:?}: {}", block_hash, e))?;
 
-		let hash = chunk.sha3();
+		let hash = keccak(&chunk);
 		if hash != block_hash {
 			return Err(format!("Mismatched chunk hash. Expected {:?}, got {:?}", block_hash, hash));
 		}
diff --git a/parity/sync.rs b/parity/sync.rs
deleted file mode 100644
index 46bfdc72d2350c2f1e58d169b1c82b2d9351dc65..0000000000000000000000000000000000000000
--- a/parity/sync.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Parity sync service
-
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-use hypervisor::{SYNC_MODULE_ID, HYPERVISOR_IPC_URL, ControlService};
-use ethcore::client::ChainNotify;
-use ethcore::client::remote::RemoteClient;
-use ethcore::snapshot::remote::RemoteSnapshotService;
-use light::remote::LightProviderClient;
-use ethsync::{SyncProvider, EthSync, ManageNetwork, ServiceConfiguration};
-use modules::service_urls;
-use boot;
-use nanoipc;
-
-#[derive(Default)]
-struct SyncControlService {
-	pub stop: Arc<AtomicBool>,
-}
-
-impl ControlService for SyncControlService {
-	fn shutdown(&self) -> bool {
-		trace!(target: "hypervisor", "Received shutdown from control service");
-		self.stop.store(true, ::std::sync::atomic::Ordering::SeqCst);
-		true
-	}
-}
-
-pub fn main() {
-	boot::setup_cli_logger("sync");
-
-	let service_config: ServiceConfiguration = boot::payload()
-		.unwrap_or_else(|e| panic!("Fatal: error reading boot arguments ({:?})", e));
-
-	let remote_client = dependency!(RemoteClient, &service_urls::with_base(&service_config.io_path, service_urls::CLIENT));
-	let remote_snapshot = dependency!(RemoteSnapshotService, &service_urls::with_base(&service_config.io_path, service_urls::SNAPSHOT));
-	let remote_provider = dependency!(LightProviderClient, &service_urls::with_base(&service_config.io_path, service_urls::LIGHT_PROVIDER));
-
-	let sync = EthSync::new(Params {
-		config: service_config.sync,
-		chain: remote_client.service().clone(),
-		snapshot_service: remote_snapshot.service().clone(),
-		provider: remote_provider.service().clone(),
-		network_config: service_config.net
-		attached_protos: Vec::new(),
-	}).unwrap();
-
-	let _ = boot::main_thread();
-	let service_stop = Arc::new(AtomicBool::new(false));
-
-	let hypervisor = boot::register(
-		&service_urls::with_base(&service_config.io_path, HYPERVISOR_IPC_URL),
-		&service_urls::with_base(&service_config.io_path, service_urls::SYNC_CONTROL),
-		SYNC_MODULE_ID
-	);
-
-	boot::host_service(
-		&service_urls::with_base(&service_config.io_path, service_urls::SYNC),
-		service_stop.clone(),
-		sync.clone() as Arc<SyncProvider>
-	);
-	boot::host_service(
-		&service_urls::with_base(&service_config.io_path, service_urls::NETWORK_MANAGER),
-		service_stop.clone(),
-		sync.clone() as Arc<ManageNetwork>
-	);
-	boot::host_service(
-		&service_urls::with_base(&service_config.io_path, service_urls::SYNC_NOTIFY),
-		service_stop.clone(),
-		sync.clone() as Arc<ChainNotify>
-	);
-
-	let control_service = Arc::new(SyncControlService::default());
-	let as_control = control_service.clone() as Arc<ControlService>;
-	let mut worker = nanoipc::Worker::<ControlService>::new(&as_control);
-	let thread_stop = control_service.stop.clone();
-	worker.add_reqrep(
-		&service_urls::with_base(&service_config.io_path, service_urls::SYNC_CONTROL)
-	).unwrap();
-
-	while !thread_stop.load(::std::sync::atomic::Ordering::SeqCst) {
-		worker.poll();
-	}
-	service_stop.store(true, ::std::sync::atomic::Ordering::SeqCst);
-
-	hypervisor.module_shutdown(SYNC_MODULE_ID);
-	trace!(target: "hypervisor", "Sync process terminated gracefully");
-}
diff --git a/parity/upgrade.rs b/parity/upgrade.rs
index cef501b5093080dbe6797d329d981d994a1de406..fcea2560eca6161c57f929f8121d48bcaa9fa4ae 100644
--- a/parity/upgrade.rs
+++ b/parity/upgrade.rs
@@ -24,10 +24,9 @@ use std::io;
 use std::io::{Read, Write};
 use std::path::{PathBuf, Path};
 use dir::{DatabaseDirectories, default_data_path};
-use helpers::replace_home;
-use util::journaldb::Algorithm;
+use dir::helpers::replace_home;
+use journaldb::Algorithm;
 
-#[cfg_attr(feature="dev", allow(enum_variant_names))]
 #[derive(Debug)]
 pub enum Error {
 	CannotCreateConfigPath,
diff --git a/parity/user_defaults.rs b/parity/user_defaults.rs
index 703b3bf163a6db1f0fe675ff181e61bd3da32630..be91e302ebe4cace355950d131116bd0097044c3 100644
--- a/parity/user_defaults.rs
+++ b/parity/user_defaults.rs
@@ -26,7 +26,7 @@ use serde::de::value::MapAccessDeserializer;
 use serde_json::Value;
 use serde_json::de::from_reader;
 use serde_json::ser::to_string;
-use util::journaldb::Algorithm;
+use journaldb::Algorithm;
 use ethcore::client::Mode;
 
 pub struct UserDefaults {
diff --git a/parity/whisper.rs b/parity/whisper.rs
index cab117ae6d88e87eb3ac8f8ea9f84ba5314fa245..ed4812063d69cc28b0598ab8698f915412cbe2cf 100644
--- a/parity/whisper.rs
+++ b/parity/whisper.rs
@@ -17,10 +17,11 @@
 use std::sync::Arc;
 use std::io;
 
-use ethsync::AttachedProtocol;
+use ethsync::{AttachedProtocol, ManageNetwork};
 use parity_rpc::Metadata;
-use parity_whisper::net::{self as whisper_net, PoolHandle, Network as WhisperNetwork};
-use parity_whisper::rpc::{WhisperClient, FilterManager};
+use parity_whisper::message::Message;
+use parity_whisper::net::{self as whisper_net, Network as WhisperNetwork};
+use parity_whisper::rpc::{WhisperClient, PoolHandle, FilterManager};
 
 /// Whisper config.
 #[derive(Debug, PartialEq, Eq)]
@@ -38,6 +39,31 @@ impl Default for Config {
 	}
 }
 
+/// Standard pool handle.
+pub struct NetPoolHandle {
+	/// Pool handle.
+	handle: Arc<WhisperNetwork<Arc<FilterManager>>>,
+	/// Network manager.
+	net: Arc<ManageNetwork>,
+}
+
+impl PoolHandle for NetPoolHandle {
+	fn relay(&self, message: Message) -> bool {
+		let mut res = false;
+		let mut message = Some(message);
+		self.net.with_proto_context(whisper_net::PROTOCOL_ID, &mut |ctx| {
+			if let Some(message) = message.take() {
+				res = self.handle.post_message(message, ctx);
+			}
+		});
+		res
+	}
+
+	fn pool_status(&self) -> whisper_net::PoolStatus {
+		self.handle.pool_status()
+	}
+}
+
 /// Factory for standard whisper RPC.
 pub struct RpcFactory {
 	net: Arc<WhisperNetwork<Arc<FilterManager>>>,
@@ -45,8 +71,9 @@ pub struct RpcFactory {
 }
 
 impl RpcFactory {
-	pub fn make_handler(&self) -> WhisperClient<PoolHandle, Metadata> {
-		WhisperClient::new(self.net.handle(), self.manager.clone())
+	pub fn make_handler(&self, net: Arc<ManageNetwork>) -> WhisperClient<NetPoolHandle, Metadata> {
+		let handle = NetPoolHandle { handle: self.net.clone(), net: net };
+		WhisperClient::new(handle, self.manager.clone())
 	}
 }
 
@@ -54,24 +81,36 @@ impl RpcFactory {
 ///
 /// Will target the given pool size.
 #[cfg(not(feature = "ipc"))]
-pub fn setup(target_pool_size: usize) -> io::Result<(AttachedProtocol, Option<RpcFactory>)> {
+pub fn setup(target_pool_size: usize, protos: &mut Vec<AttachedProtocol>)
+	-> io::Result<Option<RpcFactory>>
+{
 	let manager = Arc::new(FilterManager::new()?);
 	let net = Arc::new(WhisperNetwork::new(target_pool_size, manager.clone()));
 
-	let proto = AttachedProtocol {
+	protos.push(AttachedProtocol {
 		handler: net.clone() as Arc<_>,
 		packet_count: whisper_net::PACKET_COUNT,
 		versions: whisper_net::SUPPORTED_VERSIONS,
-		protocol_id: *b"shh",
-	};
+		protocol_id: whisper_net::PROTOCOL_ID,
+	});
+
+	// parity-only extensions to whisper.
+	protos.push(AttachedProtocol {
+		handler: Arc::new(whisper_net::ParityExtensions),
+		packet_count: whisper_net::PACKET_COUNT,
+		versions: whisper_net::SUPPORTED_VERSIONS,
+		protocol_id: whisper_net::PARITY_PROTOCOL_ID,
+	});
 
 	let factory = RpcFactory { net: net, manager: manager };
 
-	Ok((proto, Some(factory)))
+	Ok(Some(factory))
 }
 
 // TODO: make it possible to attach generic protocols in IPC.
 #[cfg(feature = "ipc")]
-pub fn setup(_pool: usize) -> (AttachedProtocol, Option<RpcFactory>) {
-	Ok((AttachedProtocol, None))
+pub fn setup(_target_pool_size: usize, _protos: &mut Vec<AttachedProtocol>)
+	-> io::Result<Option<RpcFactory>>
+{
+	Ok(None)
 }
diff --git a/price-info/Cargo.toml b/price-info/Cargo.toml
index a6cc13eb715a45c174b7d59a94b80e6541b08784..5122ebb9dd7e9160a64206b8f896c26a70574394 100644
--- a/price-info/Cargo.toml
+++ b/price-info/Cargo.toml
@@ -3,14 +3,16 @@ description = "Fetch current ETH price"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "price-info"
-version = "1.7.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 fetch = { path = "../util/fetch" }
 futures = "0.1"
+futures-cpupool = "0.1"
 log = "0.3"
 serde_json = "1.0"
 
 [dev-dependencies]
-parking_lot = "0.4"
+hyper = "0.11"
+parking_lot = "0.5"
diff --git a/price-info/src/lib.rs b/price-info/src/lib.rs
index ba5719f40c5be7f39a939f9d2649239787ad3bde..e233062b4310dd0f0d3b08efcaf0cf7a0b2f9eca 100644
--- a/price-info/src/lib.rs
+++ b/price-info/src/lib.rs
@@ -19,6 +19,7 @@
 //! A simple client to get the current ETH price using an external API.
 
 extern crate futures;
+extern crate futures_cpupool;
 extern crate serde_json;
 
 #[macro_use]
@@ -29,10 +30,12 @@ pub extern crate fetch;
 use std::cmp;
 use std::fmt;
 use std::io;
-use std::io::Read;
+use std::str;
 
 use fetch::{Client as FetchClient, Fetch};
-use futures::Future;
+use futures::{Future, Stream};
+use futures::future::{self, Either};
+use futures_cpupool::CpuPool;
 use serde_json::Value;
 
 /// Current ETH price information.
@@ -48,7 +51,7 @@ pub enum Error {
 	/// The API returned an unexpected status code.
 	StatusCode(&'static str),
 	/// The API returned an unexpected status content.
-	UnexpectedResponse(String),
+	UnexpectedResponse(Option<String>),
 	/// There was an error when trying to reach the API.
 	Fetch(fetch::Error),
 	/// IO error when reading API response.
@@ -65,6 +68,7 @@ impl From<fetch::Error> for Error {
 
 /// A client to get the current ETH price using an external API.
 pub struct Client<F = FetchClient> {
+	pool: CpuPool,
 	api_endpoint: String,
 	fetch: F,
 }
@@ -85,23 +89,25 @@ impl<F> cmp::PartialEq for Client<F> {
 
 impl<F: Fetch> Client<F> {
 	/// Creates a new instance of the `Client` given a `fetch::Client`.
-	pub fn new(fetch: F) -> Client<F> {
-		let api_endpoint = "http://api.etherscan.io/api?module=stats&action=ethprice".to_owned();
-		Client { api_endpoint, fetch }
+	pub fn new(fetch: F, pool: CpuPool) -> Client<F> {
+		let api_endpoint = "https://api.etherscan.io/api?module=stats&action=ethprice".to_owned();
+		Client { pool, api_endpoint, fetch }
 	}
 
 	/// Gets the current ETH price and calls `set_price` with the result.
 	pub fn get<G: Fn(PriceInfo) + Sync + Send + 'static>(&self, set_price: G) {
-		self.fetch.forget(self.fetch.fetch(&self.api_endpoint)
-			.map_err(|err| Error::Fetch(err))
-			.and_then(move |mut response| {
+		let future = self.fetch.fetch(&self.api_endpoint, fetch::Abort::default())
+			.from_err()
+			.and_then(|response| {
 				if !response.is_success() {
-					return Err(Error::StatusCode(response.status().canonical_reason().unwrap_or("unknown")));
+					let s = Error::StatusCode(response.status().canonical_reason().unwrap_or("unknown"));
+					return Either::A(future::err(s));
 				}
-				let mut result = String::new();
-				response.read_to_string(&mut result)?;
-
-				let value: Option<Value> = serde_json::from_str(&result).ok();
+				Either::B(response.concat2().from_err())
+			})
+			.map(move |body| {
+				let body_str = str::from_utf8(&body).ok();
+				let value: Option<Value> = body_str.and_then(|s| serde_json::from_str(s).ok());
 
 				let ethusd = value
 					.as_ref()
@@ -114,62 +120,65 @@ impl<F: Fetch> Client<F> {
 						set_price(PriceInfo { ethusd });
 						Ok(())
 					},
-					None => Err(Error::UnexpectedResponse(result)),
+					None => Err(Error::UnexpectedResponse(body_str.map(From::from))),
 				}
 			})
 			.map_err(|err| {
 				warn!("Failed to auto-update latest ETH price: {:?}", err);
 				err
-			})
-		);
+			});
+		self.pool.spawn(future).forget()
 	}
 }
 
 #[cfg(test)]
 mod test {
+	extern crate hyper;
 	extern crate parking_lot;
 
 	use self::parking_lot::Mutex;
 	use std::sync::Arc;
 	use std::sync::atomic::{AtomicBool, Ordering};
 	use fetch;
-	use fetch::Fetch;
-	use futures;
-	use futures::future::{Future, FutureResult};
+	use fetch::{Fetch, Url};
+	use futures_cpupool::CpuPool;
+	use futures::future::{self, FutureResult};
 	use Client;
+	use self::hyper::StatusCode;
 
 	#[derive(Clone)]
 	struct FakeFetch(Option<String>, Arc<Mutex<u64>>);
+
+	impl FakeFetch {
+		fn new() -> Result<Self, fetch::Error> {
+			Ok(FakeFetch(None, Default::default()))
+		}
+	}
+
 	impl Fetch for FakeFetch {
 		type Result = FutureResult<fetch::Response, fetch::Error>;
-		fn new() -> Result<Self, fetch::Error> where Self: Sized { Ok(FakeFetch(None, Default::default())) }
-		fn fetch_with_abort(&self, url: &str, _abort: fetch::Abort) -> Self::Result {
-			assert_eq!(url, "http://api.etherscan.io/api?module=stats&action=ethprice");
+
+		fn fetch(&self, url: &str, abort: fetch::Abort) -> Self::Result {
+			assert_eq!(url, "https://api.etherscan.io/api?module=stats&action=ethprice");
+			let u = Url::parse(url).unwrap();
 			let mut val = self.1.lock();
 			*val = *val + 1;
 			if let Some(ref response) = self.0 {
-				let data = ::std::io::Cursor::new(response.clone());
-				futures::future::ok(fetch::Response::from_reader(data))
+				let r = hyper::Response::new().with_body(response.clone());
+				future::ok(fetch::client::Response::new(u, r, abort))
 			} else {
-				futures::future::ok(fetch::Response::not_found())
+				let r = hyper::Response::new().with_status(StatusCode::NotFound);
+				future::ok(fetch::client::Response::new(u, r, abort))
 			}
 		}
-
-		// this guarantees that the calls to price_info::Client::get will block for execution
-		fn forget<F, I, E>(&self, f: F) where
-			F: Future<Item=I, Error=E> + Send + 'static,
-			I: Send + 'static,
-			E: Send + 'static {
-			let _ = f.wait();
-		}
 	}
 
 	fn price_info_ok(response: &str) -> Client<FakeFetch> {
-		Client::new(FakeFetch(Some(response.to_owned()), Default::default()))
+		Client::new(FakeFetch(Some(response.to_owned()), Default::default()), CpuPool::new(1))
 	}
 
 	fn price_info_not_found() -> Client<FakeFetch> {
-		Client::new(FakeFetch::new().unwrap())
+		Client::new(FakeFetch::new().unwrap(), CpuPool::new(1))
 	}
 
 	#[test]
diff --git a/registrar/Cargo.toml b/registrar/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..3ba26e45607f5aac8156abfb2d9aba38080b1d24
--- /dev/null
+++ b/registrar/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+description = "Registar for Parity"
+name = "registrar"
+version = "0.0.1"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+futures = "0.1"
+ethabi = "5.1.0"
+ethabi-derive = "5.0.5"
+ethabi-contract = "5.0.3"
+keccak-hash = { path = "../util/hash" }
diff --git a/hash-fetch/res/registrar.json b/registrar/res/registrar.json
similarity index 100%
rename from hash-fetch/res/registrar.json
rename to registrar/res/registrar.json
diff --git a/ipc-common-types/src/lib.rs b/registrar/src/lib.rs
similarity index 74%
rename from ipc-common-types/src/lib.rs
rename to registrar/src/lib.rs
index 2038c91162f221d062edf3a476c4bda69e2e1345..961fbb17ee64adeee97ee37a7757966c5b8affc6 100644
--- a/ipc-common-types/src/lib.rs
+++ b/registrar/src/lib.rs
@@ -14,12 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Updater for Parity executables
+extern crate futures;
+extern crate ethabi;
+extern crate keccak_hash;
 
-extern crate semver;
-extern crate ethcore_util as util;
-extern crate ethcore_ipc as ipc;
+#[macro_use]
+extern crate ethabi_derive;
+#[macro_use]
+extern crate ethabi_contract;
 
-mod types;
-
-pub use types::*;
+mod registrar;
+pub use registrar::{Registrar, RegistrarClient, Synchronous, Asynchronous};
diff --git a/registrar/src/registrar.rs b/registrar/src/registrar.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c4128660d23bc78fa9a40c53974afbc21c49a6d1
--- /dev/null
+++ b/registrar/src/registrar.rs
@@ -0,0 +1,77 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use futures::{Future, future, IntoFuture};
+use ethabi::{Address, Bytes};
+use std::sync::Arc;
+use keccak_hash::keccak;
+
+use_contract!(registry, "Registry", "res/registrar.json");
+
+// Maps a domain name to an Ethereum address
+const DNS_A_RECORD: &'static str = "A";
+
+pub type Asynchronous = Box<Future<Item=Bytes, Error=String> + Send>;
+pub type Synchronous = Result<Bytes, String>;
+
+/// Registrar is dedicated interface to access the registrar contract
+/// which in turn generates an address when a client requests one
+pub struct Registrar {
+	registrar: registry::Registry,
+	client: Arc<RegistrarClient<Call=Asynchronous>>,
+}
+
+impl Registrar {
+	/// Registrar constructor
+	pub fn new(client: Arc<RegistrarClient<Call=Asynchronous>>) -> Self {
+		Self {
+			registrar: registry::Registry::default(),
+			client: client,
+		}
+	}
+
+	/// Generate an address for the given key
+	pub fn get_address<'a>(&self, key: &'a str) -> Box<Future<Item = Address, Error = String> + Send> {
+		// Address of the registrar itself
+		let registrar_address = match self.client.registrar_address() {
+			Ok(a) => a,
+			Err(e) => return Box::new(future::err(e)),
+		};
+
+		let address_fetcher = self.registrar.functions().get_address();
+		let id = address_fetcher.input(keccak(key), DNS_A_RECORD);
+
+		let future = self.client.call_contract(registrar_address, id).and_then(move |address| {
+			address_fetcher.output(&address)
+		}
+		.map_err(|e| e.to_string()));
+
+		Box::new(future)
+	}
+}
+
+/// Registrar contract interface
+/// Should execute transaction using current blockchain state.
+pub trait RegistrarClient: Send + Sync {
+	/// Specifies synchronous or asynchronous communication
+	type Call: IntoFuture<Item=Bytes, Error=String>;
+
+	/// Get registrar address
+	fn registrar_address(&self) -> Result<Address, String>;
+	/// Call Contract
+	fn call_contract(&self, address: Address, data: Bytes) -> Self::Call;
+}
+
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index a5a371cdf8928be9347dae3abbcf858372d44c26..bb23b2ec3d846bbc6e073dc21bbebd14d009b818 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -1,62 +1,71 @@
 [package]
 description = "Parity JSON-RPC servers."
 name = "parity-rpc"
-version = "1.8.0"
+version = "1.11.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [lib]
 
 [dependencies]
+ansi_term = "0.10"
 cid = "0.2"
-futures = "0.1"
+futures = "0.1.6"
 futures-cpupool = "0.1"
 log = "0.3"
-multihash ="0.6"
+multihash ="0.7"
 order-stat = "0.1"
-rand = "0.3"
+parking_lot = "0.5"
+rand = "0.4"
 rust-crypto = "0.2"
 rustc-hex = "1.0"
 semver = "0.6"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-time = "0.1"
+tempdir = "0.3"
+tiny-keccak = "1.3"
 tokio-timer = "0.1"
 transient-hashmap = "0.4"
 itertools = "0.5"
 
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-minihttp-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-ipc-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-ipc-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 
-ethcore-io = { path = "../util/io" }
-ethcore-ipc = { path = "../ipc/rpc" }
-ethcore-util = { path = "../util" }
+ethash = { path = "../ethash" }
 ethcore = { path = "../ethcore" }
+ethcore-bytes = { path = "../util/bytes" }
+ethcore-devtools = { path = "../devtools" }
+ethcore-io = { path = "../util/io" }
+ethcore-light = { path = "../ethcore/light" }
+ethcore-logger = { path = "../logger" }
+ethcore-miner = { path = "../miner" }
+ethcore-transaction = { path = "../ethcore/transaction" }
+ethereum-types = "0.2"
+
 ethcrypto = { path = "../ethcrypto" }
+ethjson = { path = "../json" }
 ethkey = { path = "../ethkey" }
 ethstore = { path = "../ethstore" }
-ethash = { path = "../ethash" }
 ethsync = { path = "../sync" }
-ethjson = { path = "../json" }
-ethcore-devtools = { path = "../devtools" }
-ethcore-light = { path = "../ethcore/light" }
-ethcore-logger = { path = "../logger" }
 fetch = { path = "../util/fetch" }
+hardware-wallet = { path = "../hw" }
+keccak-hash = { path = "../util/hash" }
 node-health = { path = "../dapps/node-health" }
 parity-reactor = { path = "../util/reactor" }
 parity-updater = { path = "../updater" }
+parity-version = { path = "../util/version" }
+patricia-trie = { path = "../util/patricia_trie" }
 rlp = { path = "../util/rlp" }
 stats = { path = "../util/stats" }
 vm = { path = "../ethcore/vm" }
 
-clippy = { version = "0.0.103", optional = true}
+[dev-dependencies]
 pretty_assertions = "0.1"
-
-[features]
-dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev"]
+macros = { path = "../util/macros" }
+ethcore-network = { path = "../util/network" }
+kvdb-memorydb = { path = "../util/kvdb-memorydb" }
diff --git a/rpc/src/authcodes.rs b/rpc/src/authcodes.rs
index 4427eda78981ef9bbdb6f19b619e78a081565c74..d18d0741fd69b80358e7d7fcab841b8f44e4106c 100644
--- a/rpc/src/authcodes.rs
+++ b/rpc/src/authcodes.rs
@@ -21,7 +21,8 @@ use std::{fs, time, mem};
 use itertools::Itertools;
 use rand::Rng;
 use rand::os::OsRng;
-use util::{H256, Hashable};
+use hash::keccak;
+use ethereum_types::H256;
 
 /// Providing current time in seconds
 pub trait TimeProvider {
@@ -82,7 +83,6 @@ pub struct AuthCodes<T: TimeProvider = DefaultTimeProvider> {
 impl AuthCodes<DefaultTimeProvider> {
 
 	/// Reads `AuthCodes` from file and creates new instance using `DefaultTimeProvider`.
-	#[cfg_attr(feature="dev", allow(single_char_pattern))]
 	pub fn from_file(file: &Path) -> io::Result<AuthCodes> {
 		let content = {
 			if let Ok(mut file) = fs::File::open(file) {
@@ -153,7 +153,6 @@ impl<T: TimeProvider> AuthCodes<T> {
 
 	/// Checks if given hash is correct authcode of `SignerUI`
 	/// Updates this hash last used field in case it's valid.
-	#[cfg_attr(feature="dev", allow(wrong_self_convention))]
 	pub fn is_valid(&mut self, hash: &H256, time: u64) -> bool {
 		let now = self.now.now();
 		// check time
@@ -162,7 +161,7 @@ impl<T: TimeProvider> AuthCodes<T> {
 			return false;
 		}
 
-		let as_token = |code| format!("{}:{}", code, time).sha3();
+		let as_token = |code| keccak(format!("{}:{}", code, time));
 
 		// Check if it's the initial token.
 		if self.is_empty() {
@@ -175,7 +174,7 @@ impl<T: TimeProvider> AuthCodes<T> {
 		}
 
 		// look for code
-		for mut code in &mut self.codes {
+		for code in &mut self.codes {
 			if &as_token(&code.code) == hash {
 				code.last_used_at = Some(time::Duration::from_secs(now));
 				return true;
@@ -226,17 +225,17 @@ impl<T: TimeProvider> AuthCodes<T> {
 
 #[cfg(test)]
 mod tests {
-
-	use devtools;
 	use std::io::{Read, Write};
 	use std::{time, fs};
 	use std::cell::Cell;
+	use tempdir::TempDir;
+	use hash::keccak;
 
-	use util::{H256, Hashable};
+	use ethereum_types::H256;
 	use super::*;
 
 	fn generate_hash(val: &str, time: u64) -> H256 {
-		format!("{}:{}", val, time).sha3()
+		keccak(format!("{}:{}", val, time))
 	}
 
 	#[test]
@@ -303,15 +302,16 @@ mod tests {
 	#[test]
 	fn should_read_old_format_from_file() {
 		// given
-		let path = devtools::RandomTempPath::new();
+		let tempdir = TempDir::new("").unwrap();
+		let file_path = tempdir.path().join("file");
 		let code = "23521352asdfasdfadf";
 		{
-			let mut file = fs::File::create(&path).unwrap();
+			let mut file = fs::File::create(&file_path).unwrap();
 			file.write_all(b"a\n23521352asdfasdfadf\nb\n").unwrap();
 		}
 
 		// when
-		let mut authcodes = AuthCodes::from_file(&path).unwrap();
+		let mut authcodes = AuthCodes::from_file(&file_path).unwrap();
 		let time = time::UNIX_EPOCH.elapsed().unwrap().as_secs();
 
 		// then
@@ -321,7 +321,8 @@ mod tests {
 	#[test]
 	fn should_remove_old_unused_tokens() {
 		// given
-		let path = devtools::RandomTempPath::new();
+		let tempdir = TempDir::new("").unwrap();
+		let file_path = tempdir.path().join("file");
 		let code1 = "11111111asdfasdf111";
 		let code2 = "22222222asdfasdf222";
 		let code3 = "33333333asdfasdf333";
@@ -338,11 +339,11 @@ mod tests {
 
 		let new_code = codes.generate_new().unwrap().replace('-', "");
 		codes.clear_garbage();
-		codes.to_file(&path).unwrap();
+		codes.to_file(&file_path).unwrap();
 
 		// then
 		let mut content = String::new();
-		let mut file = fs::File::open(&path).unwrap();
+		let mut file = fs::File::open(&file_path).unwrap();
 		file.read_to_string(&mut content).unwrap();
 
 		assert_eq!(content, format!("{};100;10000100\n{};100;100\n{};10000100", code1, code2, new_code));
diff --git a/rpc/src/http_common.rs b/rpc/src/http_common.rs
index edbb16140c1c03576767e72715cdb8763e2cbacd..72af6e469741ab5ecc9f62da99d1ae22e8b36e7c 100644
--- a/rpc/src/http_common.rs
+++ b/rpc/src/http_common.rs
@@ -19,7 +19,6 @@
 use jsonrpc_core;
 use http;
 use hyper;
-use minihttp;
 
 /// HTTP RPC server impl-independent metadata extractor
 pub trait HttpMetaExtractor: Send + Sync + 'static {
@@ -29,24 +28,22 @@ pub trait HttpMetaExtractor: Send + Sync + 'static {
 	fn read_metadata(&self, origin: Option<String>, user_agent: Option<String>, dapps_origin: Option<String>) -> Self::Metadata;
 }
 
-pub struct HyperMetaExtractor<T> {
+pub struct MetaExtractor<T> {
 	extractor: T,
 }
 
-impl<T> HyperMetaExtractor<T> {
+impl<T> MetaExtractor<T> {
 	pub fn new(extractor: T) -> Self {
-		HyperMetaExtractor {
-			extractor: extractor,
-		}
+		MetaExtractor { extractor }
 	}
 }
 
-impl<M, T> http::MetaExtractor<M> for HyperMetaExtractor<T> where
+impl<M, T> http::MetaExtractor<M> for MetaExtractor<T> where
 	T: HttpMetaExtractor<Metadata = M>,
 	M: jsonrpc_core::Metadata,
 {
-	fn read_metadata(&self, req: &hyper::server::Request<hyper::net::HttpStream>) -> M {
-		let as_string = |header: Option<&http::request_response::header::Raw>| header
+	fn read_metadata(&self, req: &hyper::server::Request) -> M {
+		let as_string = |header: Option<&hyper::header::Raw>| header
 			.and_then(|raw| raw.one())
 			.map(|raw| String::from_utf8_lossy(raw).into_owned());
 
@@ -56,28 +53,3 @@ impl<M, T> http::MetaExtractor<M> for HyperMetaExtractor<T> where
 		self.extractor.read_metadata(origin, user_agent, dapps_origin)
 	}
 }
-
-pub struct MiniMetaExtractor<T> {
-	extractor: T,
-}
-
-impl<T> MiniMetaExtractor<T> {
-	pub fn new(extractor: T) -> Self {
-		MiniMetaExtractor {
-			extractor: extractor,
-		}
-	}
-}
-
-impl<M, T> minihttp::MetaExtractor<M> for MiniMetaExtractor<T> where
-	T: HttpMetaExtractor<Metadata = M>,
-	M: jsonrpc_core::Metadata,
-{
-	fn read_metadata(&self, req: &minihttp::Req) -> M {
-		let origin = req.header("origin").map(|h| h.to_owned());
-		let user_agent = req.header("user-agent").map(|h| h.to_owned());
-		let dapps_origin = req.header("x-parity-origin").map(|h| h.to_owned());
-
-		self.extractor.read_metadata(origin, user_agent, dapps_origin)
-	}
-}
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index c429471f35b8e503bc7f0b43f8fb572892853100..95a0b424b9a5c89c4b6b9ba18a55b53c3a345cc8 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -17,38 +17,42 @@
 //! Parity RPC.
 
 #![warn(missing_docs)]
-#![cfg_attr(feature="dev", feature(plugin))]
-#![cfg_attr(feature="dev", plugin(clippy))]
 
+#[macro_use]
+extern crate futures;
+
+extern crate ansi_term;
 extern crate cid;
 extern crate crypto as rust_crypto;
-extern crate futures;
 extern crate futures_cpupool;
 extern crate itertools;
 extern crate multihash;
 extern crate order_stat;
+extern crate parking_lot;
 extern crate rand;
 extern crate rustc_hex;
 extern crate semver;
 extern crate serde;
 extern crate serde_json;
-extern crate time;
+extern crate tiny_keccak;
 extern crate tokio_timer;
 extern crate transient_hashmap;
 
 extern crate jsonrpc_core;
 extern crate jsonrpc_http_server as http;
 extern crate jsonrpc_ipc_server as ipc;
-extern crate jsonrpc_minihttp_server as minihttp;
 extern crate jsonrpc_pubsub;
 
 extern crate ethash;
 extern crate ethcore;
+extern crate ethcore_bytes as bytes;
 extern crate ethcore_devtools as devtools;
 extern crate ethcore_io as io;
-extern crate ethcore_ipc;
 extern crate ethcore_light as light;
+extern crate ethcore_miner as miner;
+extern crate ethcore_transaction as transaction;
 extern crate ethcrypto as crypto;
+extern crate ethereum_types;
 extern crate ethkey;
 extern crate ethstore;
 extern crate ethsync;
@@ -58,13 +62,15 @@ extern crate fetch;
 extern crate node_health;
 extern crate parity_reactor;
 extern crate parity_updater as updater;
+extern crate parity_version as version;
 extern crate rlp;
 extern crate stats;
+extern crate keccak_hash as hash;
+extern crate hardware_wallet;
+extern crate patricia_trie as trie;
 
 #[macro_use]
 extern crate log;
-#[cfg_attr(test, macro_use)]
-extern crate ethcore_util as util;
 #[macro_use]
 extern crate jsonrpc_macros;
 #[macro_use]
@@ -77,6 +83,15 @@ extern crate ethjson;
 #[macro_use]
 extern crate pretty_assertions;
 
+#[cfg(test)]
+#[macro_use]
+extern crate macros;
+
+#[cfg(test)]
+extern crate kvdb_memorydb;
+
+extern crate tempdir;
+
 pub extern crate jsonrpc_ws_server as ws;
 
 mod authcodes;
@@ -103,58 +118,7 @@ use std::net::SocketAddr;
 use http::tokio_core;
 
 /// RPC HTTP Server instance
-pub enum HttpServer {
-	/// Fast MiniHTTP variant
-	Mini(minihttp::Server),
-	/// Hyper variant
-	Hyper(http::Server),
-}
-
-impl HttpServer {
-	/// Returns current listening address.
-	pub fn address(&self) -> &SocketAddr {
-		match *self {
-			HttpServer::Mini(ref s) => s.address(),
-			HttpServer::Hyper(ref s) => &s.addrs()[0],
-		}
-	}
-}
-
-/// RPC HTTP Server error
-#[derive(Debug)]
-pub enum HttpServerError {
-	/// IO error
-	Io(::std::io::Error),
-	/// Other hyper error
-	Hyper(hyper::Error),
-}
-
-impl From<http::Error> for HttpServerError {
-	fn from(e: http::Error) -> Self {
-		use self::HttpServerError::*;
-		match e {
-			http::Error::Io(io) => Io(io),
-			http::Error::Other(hyper) => Hyper(hyper),
-		}
-	}
-}
-
-impl From<minihttp::Error> for HttpServerError {
-	fn from(e: minihttp::Error) -> Self {
-		use self::HttpServerError::*;
-		match e {
-			minihttp::Error::Io(io) => Io(io),
-		}
-	}
-}
-
-/// HTTP server implementation-specific settings.
-pub enum HttpSettings<R: RequestMiddleware> {
-	/// Enable fast minihttp server with given number of threads.
-	Threads(usize),
-	/// Enable standard server with optional dapps middleware.
-	Dapps(Option<R>),
-}
+pub type HttpServer = http::Server;
 
 /// Start http server asynchronously and returns result with `Server` handle on success or an error.
 pub fn start_http<M, S, H, T, R>(
@@ -164,38 +128,27 @@ pub fn start_http<M, S, H, T, R>(
 	handler: H,
 	remote: tokio_core::reactor::Remote,
 	extractor: T,
-	settings: HttpSettings<R>,
-) -> Result<HttpServer, HttpServerError> where
+	middleware: Option<R>,
+	threads: usize,
+) -> ::std::io::Result<HttpServer> where
 	M: jsonrpc_core::Metadata,
 	S: jsonrpc_core::Middleware<M>,
 	H: Into<jsonrpc_core::MetaIoHandler<M, S>>,
 	T: HttpMetaExtractor<Metadata=M>,
 	R: RequestMiddleware,
 {
-	Ok(match settings {
-		HttpSettings::Dapps(middleware) => {
-			let mut builder = http::ServerBuilder::new(handler)
-				.event_loop_remote(remote)
-				.meta_extractor(http_common::HyperMetaExtractor::new(extractor))
-				.cors(cors_domains.into())
-				.allowed_hosts(allowed_hosts.into());
-
-			if let Some(dapps) = middleware {
-				builder = builder.request_middleware(dapps)
-			}
-			builder.start_http(addr)
-				.map(HttpServer::Hyper)?
-		},
-		HttpSettings::Threads(threads) => {
-			minihttp::ServerBuilder::new(handler)
-				.threads(threads)
-				.meta_extractor(http_common::MiniMetaExtractor::new(extractor))
-				.cors(cors_domains.into())
-				.allowed_hosts(allowed_hosts.into())
-				.start_http(addr)
-				.map(HttpServer::Mini)?
-		},
-	})
+	let extractor = http_common::MetaExtractor::new(extractor);
+	let mut builder = http::ServerBuilder::with_meta_extractor(handler, extractor)
+		.threads(threads)
+		.event_loop_remote(remote)
+		.cors(cors_domains.into())
+		.allowed_hosts(allowed_hosts.into());
+
+	if let Some(dapps) = middleware {
+		builder = builder.request_middleware(dapps)
+	}
+
+	Ok(builder.start_http(addr)?)
 }
 
 /// Start ipc server asynchronously and returns result with `Server` handle on success or an error.
@@ -210,9 +163,8 @@ pub fn start_ipc<M, S, H, T>(
 	H: Into<jsonrpc_core::MetaIoHandler<M, S>>,
 	T: IpcMetaExtractor<M>,
 {
-	ipc::ServerBuilder::new(handler)
+	ipc::ServerBuilder::with_meta_extractor(handler, extractor)
 		.event_loop_remote(remote)
-		.session_metadata_extractor(extractor)
 		.start(addr)
 }
 
@@ -234,12 +186,11 @@ pub fn start_ws<M, S, H, T, U, V>(
 	U: ws::SessionStats,
 	V: ws::RequestMiddleware,
 {
-	ws::ServerBuilder::new(handler)
+	ws::ServerBuilder::with_meta_extractor(handler, extractor)
 		.event_loop_remote(remote)
 		.request_middleware(middleware)
 		.allowed_origins(allowed_origins)
 		.allowed_hosts(allowed_hosts)
-		.session_meta_extractor(extractor)
 		.session_stats(stats)
 		.start(addr)
 }
diff --git a/rpc/src/tests/helpers.rs b/rpc/src/tests/helpers.rs
index e7a1684c56e9911d0f2ba9b86f9f1b7af234f4e4..db61353d538eebacad0b23ef7976849d6ec76748 100644
--- a/rpc/src/tests/helpers.rs
+++ b/rpc/src/tests/helpers.rs
@@ -15,8 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::ops::{Deref, DerefMut};
+use std::path::PathBuf;
+use tempdir::TempDir;
 
-use devtools::RandomTempPath;
 use parity_reactor::{EventLoop, TokioRemote};
 
 use authcodes::AuthCodes;
@@ -54,18 +55,20 @@ impl<T> Deref for Server<T> {
 /// Struct representing authcodes
 pub struct GuardedAuthCodes {
 	authcodes: AuthCodes,
+	_tempdir: TempDir,
 	/// The path to the mock authcodes
-	pub path: RandomTempPath,
+	pub path: PathBuf,
 }
 
 impl GuardedAuthCodes {
 	pub fn new() -> Self {
-		let mut path = RandomTempPath::new();
-		path.panic_on_drop_failure = false;
+		let tempdir = TempDir::new("").unwrap();
+		let path = tempdir.path().join("file");
 
 		GuardedAuthCodes {
 			authcodes: AuthCodes::from_file(&path).unwrap(),
-			path: path,
+			_tempdir: tempdir,
+			path,
 		}
 	}
 }
diff --git a/rpc/src/tests/rpc.rs b/rpc/src/tests/rpc.rs
index 7bd156cf538032835eee26c6501977d634ce8fce..6e2900c8b7bb4ba0a0a31d06bd111a87fda94f46 100644
--- a/rpc/src/tests/rpc.rs
+++ b/rpc/src/tests/rpc.rs
@@ -18,7 +18,7 @@ use devtools::http_client;
 use jsonrpc_core::MetaIoHandler;
 use http::{self, hyper};
 
-use {HttpSettings, HttpServer};
+use {HttpServer};
 use tests::helpers::Server;
 use v1::{extractors, Metadata};
 
@@ -33,11 +33,13 @@ fn serve(handler: Option<MetaIoHandler<Metadata>>) -> Server<HttpServer> {
 		handler,
 		remote,
 		extractors::RpcExtractor,
-		HttpSettings::Dapps(Some(|_req: &hyper::server::Request<hyper::net::HttpStream>, _control: &hyper::Control| {
+		Some(|request: hyper::Request| {
 			http::RequestMiddlewareAction::Proceed {
-				should_continue_on_invalid_cors: false
+				should_continue_on_invalid_cors: false,
+				request,
 			}
-		})),
+		}),
+		1,
 	).unwrap())
 }
 
@@ -49,14 +51,13 @@ fn request(server: Server<HttpServer>, request: &str) -> http_client::Response {
 #[cfg(test)]
 mod testsing {
 	use jsonrpc_core::{MetaIoHandler, Value};
-	use jsonrpc_core::futures::{Future, future};
 	use v1::Metadata;
 	use super::{request, Server};
 
 	fn serve() -> (Server<::HttpServer>, ::std::net::SocketAddr) {
 		let mut io = MetaIoHandler::default();
 		io.add_method_with_meta("hello", |_, meta: Metadata| {
-			future::ok(Value::String(format!("{}", meta.origin))).boxed()
+			Ok(Value::String(format!("{}", meta.origin)))
 		});
 		let server = super::serve(Some(io));
 		let address = server.server.address().to_owned();
diff --git a/rpc/src/tests/ws.rs b/rpc/src/tests/ws.rs
index 77fb1ea2cf4143ecaf944f744839568313b21c6d..6d487484588be24350e9b71016ba856d301dcd35 100644
--- a/rpc/src/tests/ws.rs
+++ b/rpc/src/tests/ws.rs
@@ -56,7 +56,7 @@ pub fn request(server: Server<ws::Server>, request: &str) -> http_client::Respon
 #[cfg(test)]
 mod testing {
 	use std::time;
-	use util::Hashable;
+	use hash::keccak;
 	use devtools::http_client;
 	use super::{serve, request};
 
@@ -125,7 +125,7 @@ mod testing {
 				{{}}
 			",
 			port,
-			format!("{}:{}", code, timestamp).sha3(),
+			keccak(format!("{}:{}", code, timestamp)),
 			timestamp,
 			)
 		);
@@ -155,7 +155,7 @@ mod testing {
 				{{}}
 			",
 			port,
-			format!("{}:{}", code, timestamp).sha3(),
+			keccak(format!("{}:{}", code, timestamp)),
 			timestamp,
 			)
 		);
@@ -171,7 +171,7 @@ mod testing {
 				{{}}
 			",
 			port,
-			format!("{}:{}", code, timestamp).sha3(),
+			keccak(format!("{}:{}", code, timestamp)),
 			timestamp,
 			)
 		);
diff --git a/rpc/src/v1/extractors.rs b/rpc/src/v1/extractors.rs
index ab1fad4da3064c4bcddc009f258eb31a4b68ebec..071e57dae4345fb3f83efb349f8c4a98c860ab42 100644
--- a/rpc/src/v1/extractors.rs
+++ b/rpc/src/v1/extractors.rs
@@ -25,7 +25,7 @@ use ipc;
 use jsonrpc_core as core;
 use jsonrpc_pubsub::Session;
 use ws;
-use util::H256;
+use ethereum_types::H256;
 
 use v1::{Metadata, Origin};
 use v1::informant::RpcStats;
@@ -37,25 +37,24 @@ impl HttpMetaExtractor for RpcExtractor {
 	type Metadata = Metadata;
 
 	fn read_metadata(&self, origin: Option<String>, user_agent: Option<String>, dapps_origin: Option<String>) -> Metadata {
-		let mut metadata = Metadata::default();
-
-		metadata.origin = match (origin.as_ref().map(|s| s.as_str()), user_agent, dapps_origin) {
-			(Some("null"), _, Some(dapp)) => Origin::Dapps(dapp.into()),
-			(Some(dapp), _, _) => Origin::Dapps(dapp.to_owned().into()),
-			(None, Some(service), _) => Origin::Rpc(service.into()),
-			(None, _, _) => Origin::Rpc("unknown".into()),
-		};
-
-		metadata
+		Metadata {
+			origin: match (origin.as_ref().map(|s| s.as_str()), user_agent, dapps_origin) {
+				(Some("null"), _, Some(dapp)) => Origin::Dapps(dapp.into()),
+				(Some(dapp), _, _) => Origin::Dapps(dapp.to_owned().into()),
+				(None, Some(service), _) => Origin::Rpc(service.into()),
+				(None, _, _) => Origin::Rpc("unknown".into()),
+			},
+			session: None,
+		}
 	}
 }
 
 impl ipc::MetaExtractor<Metadata> for RpcExtractor {
 	fn extract(&self, req: &ipc::RequestContext) -> Metadata {
-		let mut metadata = Metadata::default();
-		metadata.origin = Origin::Ipc(req.session_id.into());
-		metadata.session = Some(Arc::new(Session::new(req.sender.clone())));
-		metadata
+		Metadata {
+			origin: Origin::Ipc(req.session_id.into()),
+			session: Some(Arc::new(Session::new(req.sender.clone()))),
+		}
 	}
 }
 
@@ -75,11 +74,10 @@ impl WsExtractor {
 
 impl ws::MetaExtractor<Metadata> for WsExtractor {
 	fn extract(&self, req: &ws::RequestContext) -> Metadata {
-		let mut metadata = Metadata::default();
 		let id = req.session_id as u64;
 
 		let dapp = req.origin.as_ref().map(|origin| (&**origin).into()).unwrap_or_default();
-		metadata.origin = match self.authcodes_path {
+		let origin = match self.authcodes_path {
 			Some(ref path) => {
 				let authorization = req.protocols.get(0).and_then(|p| auth_token_hash(&path, p, true));
 				match authorization {
@@ -89,8 +87,11 @@ impl ws::MetaExtractor<Metadata> for WsExtractor {
 			},
 			None => Origin::Ws { session: id.into(), dapp: dapp },
 		};
-		metadata.session = Some(Arc::new(Session::new(req.sender())));
-		metadata
+		let session = Some(Arc::new(Session::new(req.sender())));
+		Metadata {
+			origin,
+			session,
+		}
 	}
 }
 
@@ -136,7 +137,7 @@ impl ws::RequestMiddleware for WsExtractor {
 }
 
 fn add_security_headers(res: &mut ws::ws::Response) {
-	let mut headers = res.headers_mut();
+	let headers = res.headers_mut();
 	headers.push(("X-Frame-Options".into(), b"SAMEORIGIN".to_vec()));
 	headers.push(("X-XSS-Protection".into(), b"1; mode=block".to_vec()));
 	headers.push(("X-Content-Type-Options".into(), b"nosniff".to_vec()));
@@ -236,7 +237,7 @@ impl<M: core::Middleware<Metadata>> core::Middleware<Metadata> for WsDispatcher<
 		if use_full {
 			A(self.full_handler.handle_rpc_request(request, meta))
 		} else {
-			B(process(request, meta).boxed())
+			B(Box::new(process(request, meta)))
 		}
 	}
 }
diff --git a/rpc/src/v1/helpers/dispatch.rs b/rpc/src/v1/helpers/dispatch.rs
index ab8dd655a3c49314fa854b3a132830208d430fda..b082320d579a8450575a883bcfe34785c81eab9c 100644
--- a/rpc/src/v1/helpers/dispatch.rs
+++ b/rpc/src/v1/helpers/dispatch.rs
@@ -20,14 +20,15 @@ use std::fmt::Debug;
 use std::ops::Deref;
 use std::sync::Arc;
 
-use futures::{future, Future, BoxFuture};
 use light::cache::Cache as LightDataCache;
 use light::client::LightChainClient;
 use light::on_demand::{request, OnDemand};
 use light::TransactionQueue as LightTransactionQueue;
 use rlp;
-use util::{Address, H520, H256, U256, Bytes, Mutex, RwLock};
-use util::sha3::Hashable;
+use hash::keccak;
+use ethereum_types::{H256, H520, Address, U256};
+use bytes::Bytes;
+use parking_lot::{Mutex, RwLock};
 use stats::Corpus;
 
 use ethkey::Signature;
@@ -35,12 +36,14 @@ use ethsync::LightSync;
 use ethcore::ids::BlockId;
 use ethcore::miner::MinerService;
 use ethcore::client::MiningBlockChainClient;
-use ethcore::transaction::{Action, SignedTransaction, PendingTransaction, Transaction};
 use ethcore::account_provider::AccountProvider;
 use crypto::DEFAULT_MAC;
+use transaction::{Action, SignedTransaction, PendingTransaction, Transaction};
 
-use jsonrpc_core::Error;
-use v1::helpers::{errors, TransactionRequest, FilledTransactionRequest, ConfirmationPayload};
+use jsonrpc_core::{BoxFuture, Result, Error};
+use jsonrpc_core::futures::{future, Future, Poll, Async};
+use jsonrpc_core::futures::future::Either;
+use v1::helpers::{errors, nonce, TransactionRequest, FilledTransactionRequest, ConfirmationPayload};
 use v1::types::{
 	H256 as RpcH256, H520 as RpcH520, Bytes as RpcBytes,
 	RichRawTransaction as RpcRichRawTransaction,
@@ -50,6 +53,8 @@ use v1::types::{
 	DecryptRequest as RpcDecryptRequest,
 };
 
+pub use self::nonce::Reservations;
+
 /// Has the capability to dispatch, sign, and decrypt.
 ///
 /// Requires a clone implementation, with the implication that it be cheap;
@@ -60,14 +65,18 @@ pub trait Dispatcher: Send + Sync + Clone {
 
 	/// Fill optional fields of a transaction request, fetching gas price but not nonce.
 	fn fill_optional_fields(&self, request: TransactionRequest, default_sender: Address, force_nonce: bool)
-		-> BoxFuture<FilledTransactionRequest, Error>;
+		-> BoxFuture<FilledTransactionRequest>;
 
 	/// Sign the given transaction request without dispatching, fetching appropriate nonce.
 	fn sign(&self, accounts: Arc<AccountProvider>, filled: FilledTransactionRequest, password: SignWith)
-		-> BoxFuture<WithToken<SignedTransaction>, Error>;
+		-> BoxFuture<WithToken<SignedTransaction>>;
+
+	/// Converts a `SignedTransaction` into `RichRawTransaction`
+	fn enrich(&self, SignedTransaction) -> RpcRichRawTransaction;
 
 	/// "Dispatch" a local transaction.
-	fn dispatch_transaction(&self, signed_transaction: PendingTransaction) -> Result<H256, Error>;
+	fn dispatch_transaction(&self, signed_transaction: PendingTransaction)
+		-> Result<H256>;
 }
 
 /// A dispatcher which uses references to a client and miner in order to sign
@@ -76,14 +85,23 @@ pub trait Dispatcher: Send + Sync + Clone {
 pub struct FullDispatcher<C, M> {
 	client: Arc<C>,
 	miner: Arc<M>,
+	nonces: Arc<Mutex<nonce::Reservations>>,
+	gas_price_percentile: usize,
 }
 
 impl<C, M> FullDispatcher<C, M> {
 	/// Create a `FullDispatcher` from Arc references to a client and miner.
-	pub fn new(client: Arc<C>, miner: Arc<M>) -> Self {
+	pub fn new(
+		client: Arc<C>,
+		miner: Arc<M>,
+		nonces: Arc<Mutex<nonce::Reservations>>,
+		gas_price_percentile: usize,
+	) -> Self {
 		FullDispatcher {
 			client,
 			miner,
+			nonces,
+			gas_price_percentile,
 		}
 	}
 }
@@ -93,77 +111,77 @@ impl<C, M> Clone for FullDispatcher<C, M> {
 		FullDispatcher {
 			client: self.client.clone(),
 			miner: self.miner.clone(),
+			nonces: self.nonces.clone(),
+			gas_price_percentile: self.gas_price_percentile,
 		}
 	}
 }
 
 impl<C: MiningBlockChainClient, M: MinerService> FullDispatcher<C, M> {
-	fn fill_nonce(nonce: Option<U256>, from: &Address, miner: &M, client: &C) -> U256 {
-		nonce
-			.or_else(|| miner.last_nonce(from).map(|nonce| nonce + U256::one()))
-			.unwrap_or_else(|| client.latest_nonce(from))
+	fn state_nonce(&self, from: &Address) -> U256 {
+		self.miner.last_nonce(from).map(|nonce| nonce + U256::one())
+			.unwrap_or_else(|| self.client.latest_nonce(from))
+	}
+
+	/// Imports transaction to the miner's queue.
+	pub fn dispatch_transaction(client: &C, miner: &M, signed_transaction: PendingTransaction) -> Result<H256> {
+		let hash = signed_transaction.transaction.hash();
+
+		miner.import_own_transaction(client, signed_transaction)
+			.map_err(errors::transaction)
+			.map(|_| hash)
 	}
 }
 
 impl<C: MiningBlockChainClient, M: MinerService> Dispatcher for FullDispatcher<C, M> {
 	fn fill_optional_fields(&self, request: TransactionRequest, default_sender: Address, force_nonce: bool)
-		-> BoxFuture<FilledTransactionRequest, Error>
+		-> BoxFuture<FilledTransactionRequest>
 	{
-		let (client, miner) = (self.client.clone(), self.miner.clone());
 		let request = request;
 		let from = request.from.unwrap_or(default_sender);
-		let nonce = match force_nonce {
-			false => request.nonce,
-			true => Some(Self::fill_nonce(request.nonce, &from, &miner, &client)),
+		let nonce = if force_nonce {
+			request.nonce.or_else(|| Some(self.state_nonce(&from)))
+		} else {
+			request.nonce
 		};
-		future::ok(FilledTransactionRequest {
-			from: from,
+
+		Box::new(future::ok(FilledTransactionRequest {
+			from,
 			used_default_from: request.from.is_none(),
 			to: request.to,
-			nonce: nonce,
-			gas_price: request.gas_price.unwrap_or_else(|| default_gas_price(&*client, &*miner)),
-			gas: request.gas.unwrap_or_else(|| miner.sensible_gas_limit()),
+			nonce,
+			gas_price: request.gas_price.unwrap_or_else(|| {
+				default_gas_price(&*self.client, &*self.miner, self.gas_price_percentile)
+			}),
+			gas: request.gas.unwrap_or_else(|| self.miner.sensible_gas_limit()),
 			value: request.value.unwrap_or_else(|| 0.into()),
 			data: request.data.unwrap_or_else(Vec::new),
 			condition: request.condition,
-		}).boxed()
+		}))
 	}
 
 	fn sign(&self, accounts: Arc<AccountProvider>, filled: FilledTransactionRequest, password: SignWith)
-		-> BoxFuture<WithToken<SignedTransaction>, Error>
+		-> BoxFuture<WithToken<SignedTransaction>>
 	{
-		let (client, miner) = (self.client.clone(), self.miner.clone());
-		let chain_id = client.signing_chain_id();
-		let address = filled.from;
-		future::done({
-			let t = Transaction {
-				nonce: Self::fill_nonce(filled.nonce, &filled.from, &miner, &client),
-				action: filled.to.map_or(Action::Create, Action::Call),
-				gas: filled.gas,
-				gas_price: filled.gas_price,
-				value: filled.value,
-				data: filled.data,
-			};
-
-			if accounts.is_hardware_address(address) {
-				hardware_signature(&*accounts, address, t, chain_id).map(WithToken::No)
-			} else {
-				let hash = t.hash(chain_id);
-				let signature = try_bf!(signature(&*accounts, address, hash, password));
-				Ok(signature.map(|sig| {
-					SignedTransaction::new(t.with_signature(sig, chain_id))
-						.expect("Transaction was signed by AccountsProvider; it never produces invalid signatures; qed")
-				}))
-			}
-		}).boxed()
+		let chain_id = self.client.signing_chain_id();
+
+		if let Some(nonce) = filled.nonce {
+			return Box::new(future::done(sign_transaction(&*accounts, filled, chain_id, nonce, password)));
+		}
+
+		let state = self.state_nonce(&filled.from);
+		let reserved = self.nonces.lock().reserve(filled.from, state);
+
+		Box::new(ProspectiveSigner::new(accounts, filled, chain_id, reserved, password))
 	}
 
-	fn dispatch_transaction(&self, signed_transaction: PendingTransaction) -> Result<H256, Error> {
-		let hash = signed_transaction.transaction.hash();
+	fn enrich(&self, signed_transaction: SignedTransaction) -> RpcRichRawTransaction {
+		let block_number = self.client.best_block_header().number();
+		RpcRichRawTransaction::from_signed(signed_transaction, block_number, self.client.eip86_transition())
+	}
 
-		self.miner.import_own_transaction(&*self.client, signed_transaction)
-			.map_err(errors::transaction)
-			.map(|_| hash)
+	fn dispatch_transaction(&self, signed_transaction: PendingTransaction) -> Result<H256> {
+		Self::dispatch_transaction(&*self.client, &*self.miner, signed_transaction)
 	}
 }
 
@@ -174,11 +192,11 @@ pub fn fetch_gas_price_corpus(
 	client: Arc<LightChainClient>,
 	on_demand: Arc<OnDemand>,
 	cache: Arc<Mutex<LightDataCache>>,
-) -> BoxFuture<Corpus<U256>, Error> {
+) -> BoxFuture<Corpus<U256>> {
 	const GAS_PRICE_SAMPLE_SIZE: usize = 100;
 
 	if let Some(cached) = { cache.lock().gas_price_corpus() } {
-		return future::ok(cached).boxed()
+		return Box::new(future::ok(cached))
 	}
 
 	let cache = cache.clone();
@@ -204,8 +222,8 @@ pub fn fetch_gas_price_corpus(
 				})
 			})
 			.map(move |prices| {
-				// produce a corpus from the vector, cache it, and return
-				// the median as the intended gas price.
+				// produce a corpus from the vector and cache it.
+				// It's later used to get a percentile for default gas price.
 				let corpus: ::stats::Corpus<_> = prices.into();
 				cache.lock().set_gas_price_corpus(corpus.clone());
 				corpus
@@ -213,8 +231,8 @@ pub fn fetch_gas_price_corpus(
 	});
 
 	match eventual_corpus {
-		Some(corp) => corp.map_err(|_| errors::no_light_peers()).boxed(),
-		None => future::err(errors::network_disabled()).boxed(),
+		Some(corp) => Box::new(corp.map_err(|_| errors::no_light_peers())),
+		None => Box::new(future::err(errors::network_disabled())),
 	}
 }
 
@@ -226,7 +244,7 @@ pub fn eth_data_hash(mut data: Bytes) -> H256 {
 		format!("\x19Ethereum Signed Message:\n{}", data.len())
 		.into_bytes();
 	message_data.append(&mut data);
-	message_data.sha3()
+	keccak(message_data)
 }
 
 /// Dispatcher for light clients -- fetches default gas price, next nonce, etc. from network.
@@ -242,6 +260,10 @@ pub struct LightDispatcher {
 	pub cache: Arc<Mutex<LightDataCache>>,
 	/// Transaction queue.
 	pub transaction_queue: Arc<RwLock<LightTransactionQueue>>,
+	/// Nonce reservations
+	pub nonces: Arc<Mutex<nonce::Reservations>>,
+	/// Gas Price percentile value used as default gas price.
+	pub gas_price_percentile: usize,
 }
 
 impl LightDispatcher {
@@ -254,19 +276,23 @@ impl LightDispatcher {
 		on_demand: Arc<OnDemand>,
 		cache: Arc<Mutex<LightDataCache>>,
 		transaction_queue: Arc<RwLock<LightTransactionQueue>>,
+		nonces: Arc<Mutex<nonce::Reservations>>,
+		gas_price_percentile: usize,
 	) -> Self {
 		LightDispatcher {
-			sync: sync,
-			client: client,
-			on_demand: on_demand,
-			cache: cache,
-			transaction_queue: transaction_queue,
+			sync,
+			client,
+			on_demand,
+			cache,
+			transaction_queue,
+			nonces,
+			gas_price_percentile,
 		}
 	}
 
 	/// Get a recent gas price corpus.
 	// TODO: this could be `impl Trait`.
-	pub fn gas_price_corpus(&self) -> BoxFuture<Corpus<U256>, Error> {
+	pub fn gas_price_corpus(&self) -> BoxFuture<Corpus<U256>> {
 		fetch_gas_price_corpus(
 			self.sync.clone(),
 			self.client.clone(),
@@ -276,11 +302,11 @@ impl LightDispatcher {
 	}
 
 	/// Get an account's next nonce.
-	pub fn next_nonce(&self, addr: Address) -> BoxFuture<U256, Error> {
+	pub fn next_nonce(&self, addr: Address) -> BoxFuture<U256> {
 		// fast path where we don't go to network; nonce provided or can be gotten from queue.
 		let maybe_nonce = self.transaction_queue.read().next_nonce(&addr);
 		if let Some(nonce) = maybe_nonce {
-			return future::ok(nonce).boxed()
+			return Box::new(future::ok(nonce))
 		}
 
 		let best_header = self.client.best_block_header();
@@ -291,18 +317,18 @@ impl LightDispatcher {
 		}).expect("no back-references; therefore all back-references valid; qed"));
 
 		match nonce_future {
-			Some(x) =>
+			Some(x) => Box::new(
 				x.map(move |acc| acc.map_or(account_start_nonce, |acc| acc.nonce))
 					.map_err(|_| errors::no_light_peers())
-					.boxed(),
-			None =>  future::err(errors::network_disabled()).boxed()
+			),
+			None =>  Box::new(future::err(errors::network_disabled()))
 		}
 	}
 }
 
 impl Dispatcher for LightDispatcher {
 	fn fill_optional_fields(&self, request: TransactionRequest, default_sender: Address, force_nonce: bool)
-		-> BoxFuture<FilledTransactionRequest, Error>
+		-> BoxFuture<FilledTransactionRequest>
 	{
 		const DEFAULT_GAS_PRICE: U256 = U256([0, 0, 0, 21_000_000]);
 
@@ -327,84 +353,210 @@ impl Dispatcher for LightDispatcher {
 		};
 
 		// fast path for known gas price.
+		let gas_price_percentile = self.gas_price_percentile;
 		let gas_price = match request_gas_price {
-			Some(gas_price) => future::ok(with_gas_price(gas_price)).boxed(),
-			None => fetch_gas_price_corpus(
+			Some(gas_price) => Either::A(future::ok(with_gas_price(gas_price))),
+			None => Either::B(fetch_gas_price_corpus(
 				self.sync.clone(),
 				self.client.clone(),
 				self.on_demand.clone(),
 				self.cache.clone()
-			).and_then(|corp| match corp.median() {
-				Some(median) => future::ok(*median),
-				None => future::ok(DEFAULT_GAS_PRICE), // fall back to default on error.
-			}).map(with_gas_price).boxed()
+			).and_then(move |corp| match corp.percentile(gas_price_percentile) {
+				Some(percentile) => Ok(*percentile),
+				None => Ok(DEFAULT_GAS_PRICE), // fall back to default on error.
+			}).map(with_gas_price))
 		};
 
 		match (request_nonce, force_nonce) {
-			(_, false) | (Some(_), true) => gas_price,
+			(_, false) | (Some(_), true) => Box::new(gas_price),
 			(None, true) => {
 				let next_nonce = self.next_nonce(from);
-				gas_price.and_then(move |mut filled| next_nonce
+				Box::new(gas_price.and_then(move |mut filled| next_nonce
 					.map_err(|_| errors::no_light_peers())
 					.map(move |nonce| {
 						filled.nonce = Some(nonce);
 						filled
 					})
-				).boxed()
+				))
 			},
 		}
 	}
 
 	fn sign(&self, accounts: Arc<AccountProvider>, filled: FilledTransactionRequest, password: SignWith)
-		-> BoxFuture<WithToken<SignedTransaction>, Error>
+		-> BoxFuture<WithToken<SignedTransaction>>
 	{
 		let chain_id = self.client.signing_chain_id();
-		let address = filled.from;
-
-		let with_nonce = move |filled: FilledTransactionRequest, nonce| {
-			let t = Transaction {
-				nonce: nonce,
-				action: filled.to.map_or(Action::Create, Action::Call),
-				gas: filled.gas,
-				gas_price: filled.gas_price,
-				value: filled.value,
-				data: filled.data,
-			};
-
-			if accounts.is_hardware_address(address) {
-				return hardware_signature(&*accounts, address, t, chain_id).map(WithToken::No)
-			}
-
-			let hash = t.hash(chain_id);
-			let signature = signature(&*accounts, address, hash, password)?;
-
-			Ok(signature.map(|sig| {
-				SignedTransaction::new(t.with_signature(sig, chain_id))
-					.expect("Transaction was signed by AccountsProvider; it never produces invalid signatures; qed")
-			}))
-		};
 
 		// fast path for pre-filled nonce.
 		if let Some(nonce) = filled.nonce {
-			return future::done(with_nonce(filled, nonce)).boxed()
+			return Box::new(future::done(sign_transaction(&*accounts, filled, chain_id, nonce, password)))
 		}
 
-		self.next_nonce(address)
+		let nonces = self.nonces.clone();
+		Box::new(self.next_nonce(filled.from)
 			.map_err(|_| errors::no_light_peers())
-			.and_then(move |nonce| with_nonce(filled, nonce))
-			.boxed()
+			.and_then(move |nonce| {
+				let reserved = nonces.lock().reserve(filled.from, nonce);
+
+				ProspectiveSigner::new(accounts, filled, chain_id, reserved, password)
+			}))
+	}
+
+	fn enrich(&self, signed_transaction: SignedTransaction) -> RpcRichRawTransaction {
+		let block_number = self.client.best_block_header().number();
+		RpcRichRawTransaction::from_signed(signed_transaction, block_number, self.client.eip86_transition())
 	}
 
-	fn dispatch_transaction(&self, signed_transaction: PendingTransaction) -> Result<H256, Error> {
+	fn dispatch_transaction(&self, signed_transaction: PendingTransaction) -> Result<H256> {
 		let hash = signed_transaction.transaction.hash();
 
 		self.transaction_queue.write().import(signed_transaction)
-			.map_err(Into::into)
 			.map_err(errors::transaction)
 			.map(|_| hash)
 	}
 }
 
+fn sign_transaction(
+	accounts: &AccountProvider,
+	filled: FilledTransactionRequest,
+	chain_id: Option<u64>,
+	nonce: U256,
+	password: SignWith,
+) -> Result<WithToken<SignedTransaction>> {
+	let t = Transaction {
+		nonce: nonce,
+		action: filled.to.map_or(Action::Create, Action::Call),
+		gas: filled.gas,
+		gas_price: filled.gas_price,
+		value: filled.value,
+		data: filled.data,
+	};
+
+	if accounts.is_hardware_address(&filled.from) {
+		return hardware_signature(accounts, filled.from, t, chain_id).map(WithToken::No)
+	}
+
+	let hash = t.hash(chain_id);
+	let signature = signature(accounts, filled.from, hash, password)?;
+
+	Ok(signature.map(|sig| {
+		SignedTransaction::new(t.with_signature(sig, chain_id))
+			.expect("Transaction was signed by AccountsProvider; it never produces invalid signatures; qed")
+	}))
+}
+
+#[derive(Debug, Clone, Copy)]
+enum ProspectiveSignerState {
+	TryProspectiveSign,
+	WaitForNonce,
+	Finish,
+}
+
+struct ProspectiveSigner {
+	accounts: Arc<AccountProvider>,
+	filled: FilledTransactionRequest,
+	chain_id: Option<u64>,
+	reserved: nonce::Reserved,
+	password: SignWith,
+	state: ProspectiveSignerState,
+	prospective: Option<Result<WithToken<SignedTransaction>>>,
+	ready: Option<nonce::Ready>,
+}
+
+impl ProspectiveSigner {
+	pub fn new(
+		accounts: Arc<AccountProvider>,
+		filled: FilledTransactionRequest,
+		chain_id: Option<u64>,
+		reserved: nonce::Reserved,
+		password: SignWith,
+	) -> Self {
+		// If the account is permanently unlocked we can try to sign
+		// using prospective nonce. This should speed up sending
+		// multiple subsequent transactions in multi-threaded RPC environment.
+		let is_unlocked_permanently = accounts.is_unlocked_permanently(&filled.from);
+		let has_password = password.is_password();
+
+		ProspectiveSigner {
+			accounts,
+			filled,
+			chain_id,
+			reserved,
+			password,
+			state: if is_unlocked_permanently || has_password {
+				ProspectiveSignerState::TryProspectiveSign
+			} else {
+				ProspectiveSignerState::WaitForNonce
+			},
+			prospective: None,
+			ready: None,
+		}
+	}
+
+	fn sign(&self, nonce: &U256) -> Result<WithToken<SignedTransaction>> {
+		sign_transaction(
+			&*self.accounts,
+			self.filled.clone(),
+			self.chain_id,
+			*nonce,
+			self.password.clone()
+		)
+	}
+
+	fn poll_reserved(&mut self) -> Poll<nonce::Ready, Error> {
+		self.reserved.poll().map_err(|_| errors::internal("Nonce reservation failure", ""))
+	}
+}
+
+impl Future for ProspectiveSigner {
+	type Item = WithToken<SignedTransaction>;
+	type Error = Error;
+
+	fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
+		use self::ProspectiveSignerState::*;
+
+		loop {
+			match self.state {
+				TryProspectiveSign => {
+					// Try to poll reserved, it might be ready.
+					match self.poll_reserved()? {
+						Async::NotReady => {
+							self.state = WaitForNonce;
+							self.prospective = Some(self.sign(self.reserved.prospective_value()));
+						},
+						Async::Ready(nonce) => {
+							self.state = Finish;
+							self.prospective = Some(self.sign(nonce.value()));
+							self.ready = Some(nonce);
+						},
+					}
+				},
+				WaitForNonce => {
+					let nonce = try_ready!(self.poll_reserved());
+					let result = match (self.prospective.take(), nonce.matches_prospective()) {
+						(Some(prospective), true) => prospective,
+						_ => self.sign(nonce.value()),
+					};
+					self.state = Finish;
+					self.prospective = Some(result);
+					self.ready = Some(nonce);
+				},
+				Finish => {
+					if let (Some(result), Some(nonce)) = (self.prospective.take(), self.ready.take()) {
+						// Mark nonce as used on successful signing
+						return result.map(move |tx| {
+							nonce.mark_used();
+							Async::Ready(tx)
+						})
+					} else {
+						panic!("Poll after ready.");
+					}
+				}
+			}
+		}
+	}
+}
+
 /// Single-use account token.
 pub type AccountToken = String;
 
@@ -419,6 +571,16 @@ pub enum SignWith {
 	Token(AccountToken),
 }
 
+impl SignWith {
+	fn is_password(&self) -> bool {
+		if let SignWith::Password(_) = *self {
+			true
+		} else {
+			false
+		}
+	}
+}
+
 /// A value, potentially accompanied by a signing token.
 #[derive(Debug)]
 pub enum WithToken<T: Debug> {
@@ -489,11 +651,11 @@ pub fn execute<D: Dispatcher + 'static>(
 	accounts: Arc<AccountProvider>,
 	payload: ConfirmationPayload,
 	pass: SignWith
-) -> BoxFuture<WithToken<ConfirmationResponse>, Error> {
+) -> BoxFuture<WithToken<ConfirmationResponse>> {
 	match payload {
 		ConfirmationPayload::SendTransaction(request) => {
 			let condition = request.condition.clone().map(Into::into);
-			dispatcher.sign(accounts, request, pass)
+			Box::new(dispatcher.sign(accounts, request, pass)
 				.map(move |v| v.map(move |tx| PendingTransaction::new(tx, condition)))
 				.map(WithToken::into_tuple)
 				.map(|(tx, token)| (tx, token, dispatcher))
@@ -502,18 +664,18 @@ pub fn execute<D: Dispatcher + 'static>(
 						.map(RpcH256::from)
 						.map(ConfirmationResponse::SendTransaction)
 						.map(move |h| WithToken::from((h, tok)))
-				}).boxed()
+				}))
 		},
 		ConfirmationPayload::SignTransaction(request) => {
-			dispatcher.sign(accounts, request, pass)
-				.map(|result| result
-					.map(RpcRichRawTransaction::from)
+			Box::new(dispatcher.sign(accounts, request, pass)
+				.map(move |result| result
+					.map(move |tx| dispatcher.enrich(tx))
 					.map(ConfirmationResponse::SignTransaction)
-				).boxed()
+				))
 		},
 		ConfirmationPayload::EthSignMessage(address, data) => {
-			if accounts.is_hardware_address(address) {
-				return future::err(errors::unsupported("Signing via hardware wallets is not supported.", None)).boxed();
+			if accounts.is_hardware_address(&address) {
+				return Box::new(future::err(errors::unsupported("Signing via hardware wallets is not supported.", None)));
 			}
 
 			let hash = eth_data_hash(data);
@@ -523,11 +685,11 @@ pub fn execute<D: Dispatcher + 'static>(
 					.map(RpcH520::from)
 					.map(ConfirmationResponse::Signature)
 				);
-			future::done(res).boxed()
+			Box::new(future::done(res))
 		},
 		ConfirmationPayload::Decrypt(address, data) => {
-			if accounts.is_hardware_address(address) {
-				return future::err(errors::unsupported("Decrypting via hardware wallets is not supported.", None)).boxed();
+			if accounts.is_hardware_address(&address) {
+				return Box::new(future::err(errors::unsupported("Decrypting via hardware wallets is not supported.", None)));
 			}
 
 			let res = decrypt(&accounts, address, data, pass)
@@ -535,12 +697,12 @@ pub fn execute<D: Dispatcher + 'static>(
 					.map(RpcBytes)
 					.map(ConfirmationResponse::Decrypt)
 				);
-			future::done(res).boxed()
+			Box::new(future::done(res))
 		},
 	}
 }
 
-fn signature(accounts: &AccountProvider, address: Address, hash: H256, password: SignWith) -> Result<WithToken<Signature>, Error> {
+fn signature(accounts: &AccountProvider, address: Address, hash: H256, password: SignWith) -> Result<WithToken<Signature>> {
 	match password.clone() {
 		SignWith::Nothing => accounts.sign(address, None, hash).map(WithToken::No),
 		SignWith::Password(pass) => accounts.sign(address, Some(pass), hash).map(WithToken::No),
@@ -553,13 +715,13 @@ fn signature(accounts: &AccountProvider, address: Address, hash: H256, password:
 
 // obtain a hardware signature from the given account.
 fn hardware_signature(accounts: &AccountProvider, address: Address, t: Transaction, chain_id: Option<u64>)
-	-> Result<SignedTransaction, Error>
+	-> Result<SignedTransaction>
 {
-	debug_assert!(accounts.is_hardware_address(address));
+	debug_assert!(accounts.is_hardware_address(&address));
 
 	let mut stream = rlp::RlpStream::new();
 	t.rlp_append_unsigned_transaction(&mut stream, chain_id);
-	let signature = accounts.sign_with_hardware(address, &stream.as_raw())
+	let signature = accounts.sign_with_hardware(address, &t, chain_id, &stream.as_raw())
 		.map_err(|e| {
 			debug!(target: "miner", "Error signing transaction with hardware wallet: {}", e);
 			errors::account("Error signing transaction with hardware wallet", e)
@@ -572,7 +734,7 @@ fn hardware_signature(accounts: &AccountProvider, address: Address, t: Transacti
 		})
 }
 
-fn decrypt(accounts: &AccountProvider, address: Address, msg: Bytes, password: SignWith) -> Result<WithToken<Bytes>, Error> {
+fn decrypt(accounts: &AccountProvider, address: Address, msg: Bytes, password: SignWith) -> Result<WithToken<Bytes>> {
 	match password.clone() {
 		SignWith::Nothing => accounts.decrypt(address, None, &DEFAULT_MAC, &msg).map(WithToken::No),
 		SignWith::Password(pass) => accounts.decrypt(address, Some(pass), &DEFAULT_MAC, &msg).map(WithToken::No),
@@ -584,34 +746,32 @@ fn decrypt(accounts: &AccountProvider, address: Address, msg: Bytes, password: S
 }
 
 /// Extract the default gas price from a client and miner.
-pub fn default_gas_price<C, M>(client: &C, miner: &M) -> U256 where
+pub fn default_gas_price<C, M>(client: &C, miner: &M, percentile: usize) -> U256 where
 	C: MiningBlockChainClient,
 	M: MinerService,
 {
-	client.gas_price_corpus(100).median().cloned().unwrap_or_else(|| miner.sensible_gas_price())
+	client.gas_price_corpus(100).percentile(percentile).cloned().unwrap_or_else(|| miner.sensible_gas_price())
 }
 
 /// Convert RPC confirmation payload to signer confirmation payload.
 /// May need to resolve in the future to fetch things like gas price.
-pub fn from_rpc<D>(payload: RpcConfirmationPayload, default_account: Address, dispatcher: &D) -> BoxFuture<ConfirmationPayload, Error>
+pub fn from_rpc<D>(payload: RpcConfirmationPayload, default_account: Address, dispatcher: &D) -> BoxFuture<ConfirmationPayload>
 	where D: Dispatcher
 {
 	match payload {
 		RpcConfirmationPayload::SendTransaction(request) => {
-			dispatcher.fill_optional_fields(request.into(), default_account, false)
-				.map(ConfirmationPayload::SendTransaction)
-				.boxed()
+			Box::new(dispatcher.fill_optional_fields(request.into(), default_account, false)
+				.map(ConfirmationPayload::SendTransaction))
 		},
 		RpcConfirmationPayload::SignTransaction(request) => {
-			dispatcher.fill_optional_fields(request.into(), default_account, false)
-				.map(ConfirmationPayload::SignTransaction)
-				.boxed()
+			Box::new(dispatcher.fill_optional_fields(request.into(), default_account, false)
+				.map(ConfirmationPayload::SignTransaction))
 		},
 		RpcConfirmationPayload::Decrypt(RpcDecryptRequest { address, msg }) => {
-			future::ok(ConfirmationPayload::Decrypt(address.into(), msg.into())).boxed()
+			Box::new(future::ok(ConfirmationPayload::Decrypt(address.into(), msg.into())))
 		},
 		RpcConfirmationPayload::EthSignMessage(RpcSignRequest { address, data }) => {
-			future::ok(ConfirmationPayload::EthSignMessage(address.into(), data.into())).boxed()
+			Box::new(future::ok(ConfirmationPayload::EthSignMessage(address.into(), data.into())))
 		},
 	}
 }
diff --git a/rpc/src/v1/helpers/errors.rs b/rpc/src/v1/helpers/errors.rs
index 559f3a6b94859743a0afaf3decd95b2546c34399..9393fc53a01247ebd3fbbfd1655c8eb6913ad74d 100644
--- a/rpc/src/v1/helpers/errors.rs
+++ b/rpc/src/v1/helpers/errors.rs
@@ -17,10 +17,12 @@
 //! RPC Error codes and error objects
 
 use std::fmt;
-use rlp::DecoderError;
-use ethcore::error::{Error as EthcoreError, CallError, TransactionError};
+
 use ethcore::account_provider::{SignError as AccountError};
-use jsonrpc_core::{Error, ErrorCode, Value};
+use ethcore::error::{Error as EthcoreError, CallError};
+use jsonrpc_core::{futures, Error, ErrorCode, Value};
+use rlp::DecoderError;
+use transaction::Error as TransactionError;
 
 mod codes {
 	// NOTE [ToDr] Codes from [-32099, -32000]
@@ -287,7 +289,7 @@ pub fn password(error: AccountError) -> Error {
 }
 
 pub fn transaction_message(error: TransactionError) -> String {
-	use ethcore::error::TransactionError::*;
+	use self::TransactionError::*;
 
 	match error {
 		AlreadyImported => "Transaction with the same hash was already imported.".into(),
@@ -310,16 +312,18 @@ pub fn transaction_message(error: TransactionError) -> String {
 		GasLimitExceeded { limit, got } => {
 			format!("Transaction cost exceeds current gas limit. Limit: {}, got: {}. Try decreasing supplied gas.", limit, got)
 		},
+		InvalidSignature(sig) => format!("Invalid signature: {}", sig),
 		InvalidChainId => "Invalid chain id.".into(),
 		InvalidGasLimit(_) => "Supplied gas is beyond limit.".into(),
 		SenderBanned => "Sender is banned in local queue.".into(),
 		RecipientBanned => "Recipient is banned in local queue.".into(),
 		CodeBanned => "Code is banned in local queue.".into(),
+		NotAllowed => "Transaction is not permitted.".into(),
 	}
 }
 
-pub fn transaction(error: EthcoreError) -> Error {
-
+pub fn transaction<T: Into<EthcoreError>>(error: T) -> Error {
+	let error = error.into();
 	if let EthcoreError::Transaction(e) = error {
 		Error {
 			code: ErrorCode::ServerError(codes::TRANSACTION_ERROR),
@@ -378,6 +382,6 @@ pub fn deprecated<T: Into<Option<String>>>(message: T) -> Error {
 }
 
 // on-demand sender cancelled.
-pub fn on_demand_cancel(_cancel: ::futures::sync::oneshot::Canceled) -> Error {
+pub fn on_demand_cancel(_cancel: futures::sync::oneshot::Canceled) -> Error {
 	internal("on-demand sender cancelled", "")
 }
diff --git a/rpc/src/v1/helpers/fake_sign.rs b/rpc/src/v1/helpers/fake_sign.rs
index 2bbaef0eeb5b2ab81489b91d013d9aada93f7194..84a225d8141714c2e993681976a168f2e0daa3c7 100644
--- a/rpc/src/v1/helpers/fake_sign.rs
+++ b/rpc/src/v1/helpers/fake_sign.rs
@@ -14,22 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::sync::Arc;
-use ethcore::client::MiningBlockChainClient;
-use ethcore::miner::MinerService;
-use ethcore::transaction::{Transaction, SignedTransaction, Action};
-use util::U256;
+use transaction::{Transaction, SignedTransaction, Action};
+use ethereum_types::U256;
 
 use jsonrpc_core::Error;
 use v1::helpers::CallRequest;
-use v1::helpers::dispatch::default_gas_price;
 
-pub fn sign_call<C: MiningBlockChainClient, M: MinerService> (
-	client: &Arc<C>,
-	miner: &Arc<M>,
-	request: CallRequest,
-	gas_cap: bool,
-) -> Result<SignedTransaction, Error> {
+pub fn sign_call(request: CallRequest, gas_cap: bool) -> Result<SignedTransaction, Error> {
 	let max_gas = 50_000_000.into();
 	let gas = match request.gas {
 		Some(gas) if gas_cap && gas > max_gas => {
@@ -43,10 +34,10 @@ pub fn sign_call<C: MiningBlockChainClient, M: MinerService> (
 	let from = request.from.unwrap_or(0.into());
 
 	Ok(Transaction {
-		nonce: request.nonce.unwrap_or_else(|| client.latest_nonce(&from)),
+		nonce: request.nonce.unwrap_or_else(|| 0.into()),
 		action: request.to.map_or(Action::Create, Action::Call),
 		gas,
-		gas_price: request.gas_price.unwrap_or_else(|| default_gas_price(&**client, &**miner)),
+		gas_price: request.gas_price.unwrap_or_else(|| 0.into()),
 		value: request.value.unwrap_or(0.into()),
 		data: request.data.unwrap_or_default(),
 	}.fake_sign(from))
diff --git a/rpc/src/v1/helpers/light_fetch.rs b/rpc/src/v1/helpers/light_fetch.rs
index 972315272db94402e5bbd96548f0f6053af83fc1..f0c389d5778a8f9e4614191d288138a4fd6594f5 100644
--- a/rpc/src/v1/helpers/light_fetch.rs
+++ b/rpc/src/v1/helpers/light_fetch.rs
@@ -23,11 +23,11 @@ use ethcore::encoded;
 use ethcore::executed::{Executed, ExecutionError};
 use ethcore::ids::BlockId;
 use ethcore::filter::Filter as EthcoreFilter;
-use ethcore::transaction::{Action, Transaction as EthTransaction};
+use ethcore::receipt::Receipt;
 
-use futures::{future, Future, BoxFuture};
-use futures::future::Either;
-use jsonrpc_core::Error;
+use jsonrpc_core::{BoxFuture, Result};
+use jsonrpc_core::futures::{future, Future};
+use jsonrpc_core::futures::future::Either;
 use jsonrpc_macros::Trailing;
 
 use light::cache::Cache;
@@ -37,13 +37,19 @@ use light::on_demand::{request, OnDemand, HeaderRef, Request as OnDemandRequest,
 use light::request::Field;
 
 use ethsync::LightSync;
-use util::{Address, Mutex, U256};
+use ethereum_types::{U256, Address};
+use hash::H256;
+use parking_lot::Mutex;
+use transaction::{Action, Transaction as EthTransaction, SignedTransaction, LocalizedTransaction};
 
 use v1::helpers::{CallRequest as CallRequestHelper, errors, dispatch};
-use v1::types::{BlockNumber, CallRequest, Log};
+use v1::types::{BlockNumber, CallRequest, Log, Transaction};
+
+const NO_INVALID_BACK_REFS: &'static str = "Fails only on invalid back-references; back-references here known to be valid; qed";
 
 /// Helper for fetching blockchain data either from the light client or the network
 /// as necessary.
+#[derive(Clone)]
 pub struct LightFetch {
 	/// The light client.
 	pub client: Arc<LightChainClient>,
@@ -53,10 +59,36 @@ pub struct LightFetch {
 	pub sync: Arc<LightSync>,
 	/// The light data cache.
 	pub cache: Arc<Mutex<Cache>>,
+	/// Gas Price percentile
+	pub gas_price_percentile: usize,
+}
+
+/// Extract a transaction at given index.
+pub fn extract_transaction_at_index(block: encoded::Block, index: usize, eip86_transition: u64) -> Option<Transaction> {
+	block.transactions().into_iter().nth(index)
+		// Verify if transaction signature is correct.
+		.and_then(|tx| SignedTransaction::new(tx).ok())
+		.map(|signed_tx| {
+			let (signed, sender, _) = signed_tx.deconstruct();
+			let block_hash = block.hash();
+			let block_number = block.number();
+			let transaction_index = index;
+			let cached_sender = Some(sender);
+
+			LocalizedTransaction {
+				signed,
+				block_number,
+				block_hash,
+				transaction_index,
+				cached_sender,
+			}
+		})
+		.map(|tx| Transaction::from_localized(tx, eip86_transition))
 }
 
+
 /// Type alias for convenience.
-pub type ExecutionResult = Result<Executed, ExecutionError>;
+pub type ExecutionResult = ::std::result::Result<Executed, ExecutionError>;
 
 // extract the header indicated by the given `HeaderRef` from the given responses.
 // fails only if they do not correspond.
@@ -73,7 +105,7 @@ fn extract_header(res: &[OnDemandResponse], header: HeaderRef) -> Option<encoded
 impl LightFetch {
 	// push the necessary requests onto the request chain to get the header by the given ID.
 	// yield a header reference which other requests can use.
-	fn make_header_requests(&self, id: BlockId, reqs: &mut Vec<OnDemandRequest>) -> Result<HeaderRef, Error> {
+	fn make_header_requests(&self, id: BlockId, reqs: &mut Vec<OnDemandRequest>) -> Result<HeaderRef> {
 		if let Some(h) = self.client.block_header(id) {
 			return Ok(h.into());
 		}
@@ -107,66 +139,77 @@ impl LightFetch {
 	}
 
 	/// Get a block header from the on demand service or client, or error.
-	pub fn header(&self, id: BlockId) -> BoxFuture<encoded::Header, Error> {
+	pub fn header(&self, id: BlockId) -> BoxFuture<encoded::Header> {
 		let mut reqs = Vec::new();
 		let header_ref = match self.make_header_requests(id, &mut reqs) {
 			Ok(r) => r,
-			Err(e) => return future::err(e).boxed(),
+			Err(e) => return Box::new(future::err(e)),
 		};
 
-		let maybe_future = self.sync.with_context(move |ctx| {
-			self.on_demand.request_raw(ctx, reqs)
-				.expect("all back-references known to be valid; qed")
-				.map(|res| extract_header(&res, header_ref)
-					.expect("these responses correspond to requests that header_ref belongs to. \
-							 therefore it will not fail; qed"))
-				.map_err(errors::on_demand_cancel)
-				.boxed()
-		});
 
-		match maybe_future {
-			Some(recv) => recv,
-			None => future::err(errors::network_disabled()).boxed()
-		}
+		self.send_requests(reqs, |res|
+			extract_header(&res, header_ref)
+				.expect("these responses correspond to requests that header_ref belongs to \
+						therefore it will not fail; qed")
+		)
+	}
+
+	/// Helper for getting contract code at a given block.
+	pub fn code(&self, address: Address, id: BlockId) -> BoxFuture<Vec<u8>> {
+		let mut reqs = Vec::new();
+		let header_ref = match self.make_header_requests(id, &mut reqs) {
+			Ok(r) => r,
+			Err(e) => return Box::new(future::err(e)),
+		};
+
+		reqs.push(request::Account { header: header_ref.clone(), address: address }.into());
+		let account_idx = reqs.len() - 1;
+		reqs.push(request::Code { header: header_ref, code_hash: Field::back_ref(account_idx, 0) }.into());
+
+		self.send_requests(reqs, |mut res| match res.pop() {
+			Some(OnDemandResponse::Code(code)) => code,
+			_ => panic!("responses correspond directly with requests in amount and type; qed"),
+		})
 	}
 
-	/// helper for getting account info at a given block.
+	/// Helper for getting account info at a given block.
 	/// `None` indicates the account doesn't exist at the given block.
-	pub fn account(&self, address: Address, id: BlockId) -> BoxFuture<Option<BasicAccount>, Error> {
+	pub fn account(&self, address: Address, id: BlockId) -> BoxFuture<Option<BasicAccount>> {
 		let mut reqs = Vec::new();
 		let header_ref = match self.make_header_requests(id, &mut reqs) {
 			Ok(r) => r,
-			Err(e) => return future::err(e).boxed(),
+			Err(e) => return Box::new(future::err(e)),
 		};
 
 		reqs.push(request::Account { header: header_ref, address: address }.into());
 
-		let maybe_future = self.sync.with_context(move |ctx| {
-			self.on_demand.request_raw(ctx, reqs)
-				.expect("all back-references known to be valid; qed")
-				.map(|mut res| match res.pop() {
-					Some(OnDemandResponse::Account(acc)) => acc,
-					_ => panic!("responses correspond directly with requests in amount and type; qed"),
-				})
-				.map_err(errors::on_demand_cancel)
-				.boxed()
-		});
-
-		match maybe_future {
-			Some(recv) => recv,
-			None => future::err(errors::network_disabled()).boxed()
-		}
+		self.send_requests(reqs, |mut res|match res.pop() {
+			Some(OnDemandResponse::Account(acc)) => acc,
+			_ => panic!("responses correspond directly with requests in amount and type; qed"),
+		})
 	}
 
-	/// helper for getting proved execution.
-	pub fn proved_execution(&self, req: CallRequest, num: Trailing<BlockNumber>) -> BoxFuture<ExecutionResult, Error> {
+	/// Helper for getting proved execution.
+	pub fn proved_execution(&self, req: CallRequest, num: Trailing<BlockNumber>) -> BoxFuture<ExecutionResult> {
 		const DEFAULT_GAS_PRICE: u64 = 21_000;
 		// starting gas when gas not provided.
 		const START_GAS: u64 = 50_000;
 
 		let (sync, on_demand, client) = (self.sync.clone(), self.on_demand.clone(), self.client.clone());
 		let req: CallRequestHelper = req.into();
-		let id = num.unwrap_or_default().into();
+
+		// Note: Here we treat `Pending` as `Latest`.
+		//       Since light clients don't produce pending blocks
+		//       (they don't have state) we can safely fallback to `Latest`.
+		let id = match num.unwrap_or_default() {
+			BlockNumber::Num(n) => BlockId::Number(n),
+			BlockNumber::Earliest => BlockId::Earliest,
+			BlockNumber::Latest => BlockId::Latest,
+			BlockNumber::Pending => {
+				warn!("`Pending` is deprecated and may be removed in future versions. Falling back to `Latest`");
+				BlockId::Latest
+			}
+		};
 
 		let from = req.from.unwrap_or(Address::zero());
 		let nonce_fut = match req.nonce {
@@ -174,6 +217,7 @@ impl LightFetch {
 			None => Either::B(self.account(from, id).map(|acc| acc.map(|a| a.nonce))),
 		};
 
+		let gas_price_percentile = self.gas_price_percentile;
 		let gas_price_fut = match req.gas_price {
 			Some(price) => Either::A(future::ok(price)),
 			None => Either::B(dispatch::fetch_gas_price_corpus(
@@ -181,8 +225,8 @@ impl LightFetch {
 				self.client.clone(),
 				self.on_demand.clone(),
 				self.cache.clone(),
-			).map(|corp| match corp.median() {
-				Some(median) => *median,
+			).map(move |corp| match corp.percentile(gas_price_percentile) {
+				Some(percentile) => *percentile,
 				None => DEFAULT_GAS_PRICE.into(),
 			}))
 		};
@@ -191,7 +235,7 @@ impl LightFetch {
 		let header_fut = self.header(id);
 
 		// fetch missing transaction fields from the network.
-		nonce_fut.join(gas_price_fut).and_then(move |(nonce, gas_price)| {
+		Box::new(nonce_fut.join(gas_price_fut).and_then(move |(nonce, gas_price)| {
 			let action = req.to.map_or(Action::Create, Action::Call);
 			let value = req.value.unwrap_or_else(U256::zero);
 			let data = req.data.unwrap_or_default();
@@ -220,10 +264,10 @@ impl LightFetch {
 			// TODO: get last-hashes from network.
 			let env_info = match client.env_info(id) {
 				Some(env_info) => env_info,
-				_ => return future::err(errors::unknown_block()).boxed(),
+				_ => return Either::A(future::err(errors::unknown_block())),
 			};
 
-			execute_tx(gas_known, ExecuteParams {
+			Either::B(execute_tx(gas_known, ExecuteParams {
 				from: from,
 				tx: tx,
 				hdr: hdr,
@@ -231,58 +275,60 @@ impl LightFetch {
 				engine: client.engine().clone(),
 				on_demand: on_demand,
 				sync: sync,
-			})
-		}).boxed()
+			}))
+		}))
 	}
 
-	/// get a block itself. fails on unknown block ID.
-	pub fn block(&self, id: BlockId) -> BoxFuture<encoded::Block, Error> {
+	/// Get a block itself. Fails on unknown block ID.
+	pub fn block(&self, id: BlockId) -> BoxFuture<encoded::Block> {
 		let mut reqs = Vec::new();
 		let header_ref = match self.make_header_requests(id, &mut reqs) {
 			Ok(r) => r,
-			Err(e) => return future::err(e).boxed(),
+			Err(e) => return Box::new(future::err(e)),
 		};
 
 		reqs.push(request::Body(header_ref).into());
 
-		let maybe_future = self.sync.with_context(move |ctx| {
-			self.on_demand.request_raw(ctx, reqs)
-				.expect("all back-references known to be valid; qed")
-				.map(|mut res| match res.pop() {
-					Some(OnDemandResponse::Body(b)) => b,
-					_ => panic!("responses correspond directly with requests in amount and type; qed"),
-				})
-				.map_err(errors::on_demand_cancel)
-				.boxed()
-		});
-
-		match maybe_future {
-			Some(recv) => recv,
-			None => future::err(errors::network_disabled()).boxed()
-		}
+		self.send_requests(reqs, |mut res| match res.pop() {
+			Some(OnDemandResponse::Body(b)) => b,
+			_ => panic!("responses correspond directly with requests in amount and type; qed"),
+		})
 	}
 
-	/// get transaction logs
-	pub fn logs(&self, filter: EthcoreFilter) -> BoxFuture<Vec<Log>, Error> {
-		use std::collections::BTreeMap;
+	/// Get the block receipts. Fails on unknown block ID.
+	pub fn receipts(&self, id: BlockId) -> BoxFuture<Vec<Receipt>> {
+		let mut reqs = Vec::new();
+		let header_ref = match self.make_header_requests(id, &mut reqs) {
+			Ok(r) => r,
+			Err(e) => return Box::new(future::err(e)),
+		};
+
+		reqs.push(request::BlockReceipts(header_ref).into());
 
-		use futures::stream::{self, Stream};
+		self.send_requests(reqs, |mut res| match res.pop() {
+			Some(OnDemandResponse::Receipts(b)) => b,
+			_ => panic!("responses correspond directly with requests in amount and type; qed"),
+		})
+	}
 
-		const NO_INVALID_BACK_REFS: &'static str = "Fails only on invalid back-references; back-references here known to be valid; qed";
+	/// Get transaction logs
+	pub fn logs(&self, filter: EthcoreFilter) -> BoxFuture<Vec<Log>> {
+		use std::collections::BTreeMap;
+		use jsonrpc_core::futures::stream::{self, Stream};
 
 		// early exit for "to" block before "from" block.
 		let best_number = self.client.chain_info().best_block_number;
 		let block_number = |id| match id {
 			BlockId::Earliest => Some(0),
-			BlockId::Latest | BlockId::Pending => Some(best_number),
+			BlockId::Latest => Some(best_number),
 			BlockId::Hash(h) => self.client.block_header(BlockId::Hash(h)).map(|hdr| hdr.number()),
 			BlockId::Number(x) => Some(x),
 		};
 
 		match (block_number(filter.to_block), block_number(filter.from_block)) {
-			(Some(to), Some(from)) if to < from => return future::ok(Vec::new()).boxed(),
+			(Some(to), Some(from)) if to < from => return Box::new(future::ok(Vec::new())),
 			(Some(_), Some(_)) => {},
-			_ => return future::err(errors::unknown_block()).boxed(),
+			_ => return Box::new(future::err(errors::unknown_block())),
 		}
 
 		let maybe_future = self.sync.with_context(move |ctx| {
@@ -316,8 +362,84 @@ impl LightFetch {
 		});
 
 		match maybe_future {
-			Some(fut) => fut.boxed(),
-			None => future::err(errors::network_disabled()).boxed(),
+			Some(fut) => Box::new(fut),
+			None => Box::new(future::err(errors::network_disabled())),
+		}
+	}
+
+	// Get a transaction by hash. also returns the index in the block.
+	// Only returns transactions in the canonical chain.
+	pub fn transaction_by_hash(&self, tx_hash: H256, eip86_transition: u64)
+		-> BoxFuture<Option<(Transaction, usize)>>
+	{
+		let params = (self.sync.clone(), self.on_demand.clone());
+		let fetcher: Self = self.clone();
+
+		Box::new(future::loop_fn(params, move |(sync, on_demand)| {
+			let maybe_future = sync.with_context(|ctx| {
+				let req = request::TransactionIndex(tx_hash.clone().into());
+				on_demand.request(ctx, req)
+			});
+
+			let eventual_index = match maybe_future {
+				Some(e) => e.expect(NO_INVALID_BACK_REFS).map_err(errors::on_demand_cancel),
+				None => return Either::A(future::err(errors::network_disabled())),
+			};
+
+			let fetcher = fetcher.clone();
+			let extract_transaction = eventual_index.and_then(move |index| {
+				// check that the block is known by number.
+				// that ensures that it is within the chain that we are aware of.
+				fetcher.block(BlockId::Number(index.num)).then(move |blk| match blk {
+					Ok(blk) => {
+						// if the block is known by number, make sure the
+						// index from earlier isn't garbage.
+
+						if blk.hash() != index.hash {
+							// index is on a different chain from us.
+							return Ok(future::Loop::Continue((sync, on_demand)))
+						}
+
+						let index = index.index as usize;
+						let transaction = extract_transaction_at_index(blk, index, eip86_transition);
+
+						if transaction.as_ref().map_or(true, |tx| tx.hash != tx_hash.into()) {
+							// index is actively wrong: indicated block has
+							// fewer transactions than necessary or the transaction
+							// at that index had a different hash.
+							// TODO: punish peer/move into OnDemand somehow?
+							Ok(future::Loop::Continue((sync, on_demand)))
+						} else {
+							let transaction = transaction.map(move |tx| (tx, index));
+							Ok(future::Loop::Break(transaction))
+						}
+					}
+					Err(ref e) if e == &errors::unknown_block() => {
+						// block by number not in the canonical chain.
+						Ok(future::Loop::Break(None))
+					}
+					Err(e) => Err(e),
+				})
+			});
+
+			Either::B(extract_transaction)
+		}))
+	}
+
+	fn send_requests<T, F>(&self, reqs: Vec<OnDemandRequest>, parse_response: F) -> BoxFuture<T> where
+		F: FnOnce(Vec<OnDemandResponse>) -> T + Send + 'static,
+		T: Send + 'static,
+	{
+		let maybe_future = self.sync.with_context(move |ctx| {
+			Box::new(self.on_demand.request_raw(ctx, reqs)
+					 .expect(NO_INVALID_BACK_REFS)
+					 .map(parse_response)
+					 .map_err(errors::on_demand_cancel))
+		});
+
+		match maybe_future {
+			Some(recv) => recv,
+			None => Box::new(future::err(errors::network_disabled()))
 		}
 	}
 }
@@ -328,16 +450,16 @@ struct ExecuteParams {
 	tx: EthTransaction,
 	hdr: encoded::Header,
 	env_info: ::vm::EnvInfo,
-	engine: Arc<::ethcore::engines::Engine>,
+	engine: Arc<::ethcore::engines::EthEngine>,
 	on_demand: Arc<OnDemand>,
 	sync: Arc<LightSync>,
 }
 
 // has a peer execute the transaction with given params. If `gas_known` is false,
 // this will double the gas on each `OutOfGas` error.
-fn execute_tx(gas_known: bool, params: ExecuteParams) -> BoxFuture<ExecutionResult, Error> {
+fn execute_tx(gas_known: bool, params: ExecuteParams) -> BoxFuture<ExecutionResult> {
 	if !gas_known {
-		future::loop_fn(params, |mut params| {
+		Box::new(future::loop_fn(params, |mut params| {
 			execute_tx(true, params.clone()).and_then(move |res| {
 				match res {
 					Ok(executed) => {
@@ -345,7 +467,7 @@ fn execute_tx(gas_known: bool, params: ExecuteParams) -> BoxFuture<ExecutionResu
 						// exception?
 						if executed.exception.is_some() {
 							let old_gas = params.tx.gas;
-							params.tx.gas = params.tx.gas * 2.into();
+							params.tx.gas = params.tx.gas * 2u32;
 							if params.tx.gas > params.hdr.gas_limit() {
 								params.tx.gas = old_gas;
 							} else {
@@ -358,7 +480,7 @@ fn execute_tx(gas_known: bool, params: ExecuteParams) -> BoxFuture<ExecutionResu
 					failed => Ok(future::Loop::Break(failed)),
 				}
 			})
-		}).boxed()
+		}))
 	} else {
 		trace!(target: "light_fetch", "Placing execution request for {} gas in on_demand",
 			params.tx.gas);
@@ -379,8 +501,8 @@ fn execute_tx(gas_known: bool, params: ExecuteParams) -> BoxFuture<ExecutionResu
 		});
 
 		match proved_future {
-			Some(fut) => fut.boxed(),
-			None => future::err(errors::network_disabled()).boxed(),
+			Some(fut) => Box::new(fut),
+			None => Box::new(future::err(errors::network_disabled())),
 		}
 	}
 }
diff --git a/rpc/src/v1/helpers/mod.rs b/rpc/src/v1/helpers/mod.rs
index fcb452039e012fe60667511e86ff2fa6fdc4640b..7cd4e6f60a04f794fdfe2816858da08416be1782 100644
--- a/rpc/src/v1/helpers/mod.rs
+++ b/rpc/src/v1/helpers/mod.rs
@@ -22,14 +22,15 @@ pub mod block_import;
 pub mod dapps;
 pub mod dispatch;
 pub mod fake_sign;
+pub mod ipfs;
 pub mod light_fetch;
+pub mod nonce;
 pub mod oneshot;
-pub mod ipfs;
 pub mod secretstore;
 
 mod network_settings;
-mod poll_manager;
 mod poll_filter;
+mod poll_manager;
 mod requests;
 mod signer;
 mod signing_queue;
@@ -44,13 +45,14 @@ pub use self::requests::{
 	TransactionRequest, FilledTransactionRequest, ConfirmationRequest, ConfirmationPayload, CallRequest,
 };
 pub use self::signing_queue::{
-	ConfirmationsQueue, ConfirmationPromise, ConfirmationResult, SigningQueue, QueueEvent, DefaultAccount,
+	ConfirmationsQueue, ConfirmationReceiver, ConfirmationResult,
+	SigningQueue, QueueEvent, DefaultAccount,
 	QUEUE_LIMIT as SIGNING_QUEUE_LIMIT,
 };
 pub use self::signer::SignerService;
 pub use self::subscribers::Subscribers;
 pub use self::subscription_manager::GenericPollManager;
 
-pub fn to_url(address: &Option<(String, u16)>) -> Option<String> {
-	address.as_ref().map(|&(ref iface, ref port)| format!("{}:{}", iface, port))
+pub fn to_url(address: &Option<::Host>) -> Option<String> {
+	address.as_ref().map(|host| (**host).to_owned())
 }
diff --git a/rpc/src/v1/helpers/nonce.rs b/rpc/src/v1/helpers/nonce.rs
new file mode 100644
index 0000000000000000000000000000000000000000..06f38a85898dcb00e31795c7a0d29bf84ae18515
--- /dev/null
+++ b/rpc/src/v1/helpers/nonce.rs
@@ -0,0 +1,314 @@
+// Copyright 2015-2017 harity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::{cmp, mem};
+use std::collections::HashMap;
+use std::sync::{atomic, Arc};
+use std::sync::atomic::{AtomicBool, AtomicUsize};
+
+use ethereum_types::{U256, Address};
+use futures::{Future, future, Poll, Async};
+use futures::future::Either;
+use futures::sync::oneshot;
+use futures_cpupool::CpuPool;
+
+/// Manages currently reserved and prospective nonces
+/// for multiple senders.
+#[derive(Debug)]
+pub struct Reservations {
+	nonces: HashMap<Address, SenderReservations>,
+	pool: CpuPool,
+}
+impl Reservations {
+	/// A maximal number of reserved nonces in the hashmap
+	/// before we start clearing the unused ones.
+	const CLEAN_AT: usize = 512;
+
+	/// Create new nonces manager and spawn a single-threaded cpu pool
+	/// for progressing execution of dropped nonces.
+	pub fn new() -> Self {
+		Self::with_pool(CpuPool::new(1))
+	}
+
+	/// Create new nonces manager with given cpupool.
+	pub fn with_pool(pool: CpuPool) -> Self {
+		Reservations {
+			nonces: Default::default(),
+			pool,
+		}
+	}
+
+	/// Reserve a nonce for particular address.
+	///
+	/// The reserved nonce cannot be smaller than the minimal nonce.
+	pub fn reserve(&mut self, sender: Address, minimal: U256) -> Reserved {
+		if self.nonces.len() + 1 > Self::CLEAN_AT {
+			self.nonces.retain(|_, v| !v.is_empty());
+		}
+
+		let pool = &self.pool;
+		self.nonces.entry(sender)
+			.or_insert_with(move || SenderReservations::with_pool(pool.clone()))
+			.reserve_nonce(minimal)
+	}
+}
+
+/// Manages currently reserved and prospective nonces.
+#[derive(Debug)]
+pub struct SenderReservations {
+	previous: Option<oneshot::Receiver<U256>>,
+	previous_ready: Arc<AtomicBool>,
+	pool: CpuPool,
+	prospective_value: U256,
+	dropped: Arc<AtomicUsize>,
+}
+
+impl SenderReservations {
+	/// Create new nonces manager and spawn a single-threaded cpu pool
+	/// for progressing execution of dropped nonces.
+	#[cfg(test)]
+	pub fn new() -> Self {
+		Self::with_pool(CpuPool::new(1))
+	}
+
+	/// Create new nonces manager with given cpu pool.
+	pub fn with_pool(pool: CpuPool) -> Self {
+		SenderReservations {
+			previous: None,
+			previous_ready: Arc::new(AtomicBool::new(true)),
+			pool,
+			prospective_value: Default::default(),
+			dropped: Default::default(),
+		}
+	}
+
+	/// Reserves a prospective nonce.
+	/// The caller should provide a minimal nonce that needs to be reserved (taken from state/txqueue).
+	/// If there were any previous reserved nonces the returned future will be resolved when those are finished
+	/// (confirmed that the nonce were indeed used).
+	/// The caller can use `prospective_nonce` and perform some heavy computation anticipating
+	/// that the `prospective_nonce` will be equal to the one he will get.
+	pub fn reserve_nonce(&mut self, minimal: U256) -> Reserved {
+		// Update prospective value
+		let dropped = self.dropped.swap(0, atomic::Ordering::SeqCst);
+		let prospective_value = cmp::max(minimal, self.prospective_value - dropped.into());
+		self.prospective_value = prospective_value + 1.into();
+
+		let (next, rx) = oneshot::channel();
+		let next = Some(next);
+		let next_sent = Arc::new(AtomicBool::default());
+		let pool = self.pool.clone();
+		let dropped = self.dropped.clone();
+		self.previous_ready = next_sent.clone();
+		match mem::replace(&mut self.previous, Some(rx)) {
+			Some(previous) => Reserved {
+				previous: Either::A(previous),
+				next,
+				next_sent,
+				minimal,
+				prospective_value,
+				pool,
+				dropped,
+			},
+			None => Reserved {
+				previous: Either::B(future::ok(minimal)),
+				next,
+				next_sent,
+				minimal,
+				prospective_value,
+				pool,
+				dropped,
+			},
+		}
+	}
+
+	/// Returns true if there are no reserved nonces.
+	pub fn is_empty(&self) -> bool {
+		self.previous_ready.load(atomic::Ordering::SeqCst)
+	}
+}
+
+/// Represents a future nonce.
+#[derive(Debug)]
+pub struct Reserved {
+	previous: Either<
+		oneshot::Receiver<U256>,
+		future::FutureResult<U256, oneshot::Canceled>,
+	>,
+	next: Option<oneshot::Sender<U256>>,
+	next_sent: Arc<AtomicBool>,
+	minimal: U256,
+	prospective_value: U256,
+	pool: CpuPool,
+	dropped: Arc<AtomicUsize>,
+}
+
+impl Reserved {
+	/// Returns a prospective value of the nonce.
+	/// NOTE: This might be different than the one we resolve to.
+	/// Make sure to check if both nonces match or use the latter one.
+	pub fn prospective_value(&self) -> &U256 {
+		&self.prospective_value
+	}
+}
+
+impl Future for Reserved {
+    type Item = Ready;
+    type Error = ();
+
+    fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
+		let mut value = try_ready!(self.previous.poll().map_err(|e| {
+			warn!("Unexpected nonce cancellation: {}", e);
+		}));
+
+		if value < self.minimal {
+			value = self.minimal
+		}
+		let matches_prospective = value == self.prospective_value;
+
+		Ok(Async::Ready(Ready {
+			value,
+			matches_prospective,
+			next: self.next.take(),
+			next_sent: self.next_sent.clone(),
+			dropped: self.dropped.clone(),
+		}))
+	}
+}
+
+impl Drop for Reserved {
+	fn drop(&mut self) {
+		if let Some(next) = self.next.take() {
+			let next_sent = self.next_sent.clone();
+			self.dropped.fetch_add(1, atomic::Ordering::SeqCst);
+			// If Reserved is dropped just pipe previous and next together.
+			let previous = mem::replace(&mut self.previous, Either::B(future::ok(U256::default())));
+			self.pool.spawn(previous.map(move |nonce| {
+				next_sent.store(true, atomic::Ordering::SeqCst);
+				next.send(nonce).expect(Ready::RECV_PROOF)
+			})).forget()
+		}
+	}
+}
+
+/// Represents a valid reserved nonce.
+/// This can be used to dispatch the transaction.
+///
+/// After this nonce is used it should be marked as such
+/// using `mark_used` method.
+#[derive(Debug)]
+pub struct Ready {
+	value: U256,
+	matches_prospective: bool,
+	next: Option<oneshot::Sender<U256>>,
+	next_sent: Arc<AtomicBool>,
+	dropped: Arc<AtomicUsize>,
+}
+
+impl Ready {
+	const RECV_PROOF: &'static str = "Receiver never dropped.";
+
+	/// Returns a value of the nonce.
+	pub fn value(&self) -> &U256 {
+		&self.value
+	}
+
+	/// Returns true if current value matches the prospective nonce.
+	pub fn matches_prospective(&self) -> bool {
+		self.matches_prospective
+	}
+
+	/// Marks this nonce as used.
+	/// Make sure to call that method after this nonce has been consumed.
+	pub fn mark_used(mut self) {
+		let next = self.next.take().expect("Nonce can be marked as used only once; qed");
+		self.next_sent.store(true, atomic::Ordering::SeqCst);
+		next.send(self.value + 1.into()).expect(Self::RECV_PROOF);
+	}
+}
+
+impl Drop for Ready {
+	fn drop(&mut self) {
+		if let Some(next) = self.next.take() {
+			self.dropped.fetch_add(1, atomic::Ordering::SeqCst);
+			self.next_sent.store(true, atomic::Ordering::SeqCst);
+			next.send(self.value).expect(Self::RECV_PROOF);
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+	#[test]
+	fn should_reserve_a_set_of_nonces_and_resolve_them() {
+		let mut nonces = SenderReservations::new();
+
+		assert!(nonces.is_empty());
+		let n1 = nonces.reserve_nonce(5.into());
+		let n2 = nonces.reserve_nonce(5.into());
+		let n3 = nonces.reserve_nonce(5.into());
+		let n4 = nonces.reserve_nonce(5.into());
+		assert!(!nonces.is_empty());
+
+		// Check first nonce
+		let r = n1.wait().unwrap();
+		assert_eq!(r.value(), &U256::from(5));
+		assert!(r.matches_prospective());
+		r.mark_used();
+
+		// Drop second nonce
+		drop(n2);
+
+		// Drop third without marking as used
+		let r = n3.wait().unwrap();
+		drop(r);
+
+		// Last nonce should be resolved to 6
+		let r = n4.wait().unwrap();
+		assert_eq!(r.value(), &U256::from(6));
+		assert!(!r.matches_prospective());
+		r.mark_used();
+
+		// Next nonce should be immediately available.
+		let n5 = nonces.reserve_nonce(5.into());
+		let r = n5.wait().unwrap();
+		assert_eq!(r.value(), &U256::from(7));
+		assert!(r.matches_prospective());
+		r.mark_used();
+
+		// Should use start number if it's greater
+		let n6 = nonces.reserve_nonce(10.into());
+		let r = n6.wait().unwrap();
+		assert_eq!(r.value(), &U256::from(10));
+		assert!(r.matches_prospective());
+		r.mark_used();
+
+		assert!(nonces.is_empty());
+	}
+
+	#[test]
+	fn should_return_prospective_nonce() {
+		let mut nonces = SenderReservations::new();
+
+		let n1 = nonces.reserve_nonce(5.into());
+		let n2 = nonces.reserve_nonce(5.into());
+
+		assert_eq!(n1.prospective_value(), &U256::from(5));
+		assert_eq!(n2.prospective_value(), &U256::from(6));
+	}
+}
diff --git a/rpc/src/v1/helpers/oneshot.rs b/rpc/src/v1/helpers/oneshot.rs
index c128ccf551458525c128744b94c4df97cae20777..89e90dbd18d29e69634e9caa891c473d03fe84a9 100644
--- a/rpc/src/v1/helpers/oneshot.rs
+++ b/rpc/src/v1/helpers/oneshot.rs
@@ -15,8 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use jsonrpc_core::Error;
-use futures::{self, Future};
-use futures::sync::oneshot;
+use jsonrpc_core::futures::{self, Future};
+use jsonrpc_core::futures::sync::oneshot;
 use v1::helpers::errors;
 
 pub type Res<T> = Result<T, Error>;
diff --git a/rpc/src/v1/helpers/poll_filter.rs b/rpc/src/v1/helpers/poll_filter.rs
index faae75c98dc450b9ad02a07a207f4dc51f04708e..7ef8db0f15f0b6ec7fae4dabbd9f3bb88707ed13 100644
--- a/rpc/src/v1/helpers/poll_filter.rs
+++ b/rpc/src/v1/helpers/poll_filter.rs
@@ -1,7 +1,7 @@
 //! Helper type with all filter state data.
 
 use std::collections::HashSet;
-use util::hash::H256;
+use ethereum_types::H256;
 use v1::types::{Filter, Log};
 
 pub type BlockNumber = u64;
diff --git a/rpc/src/v1/helpers/requests.rs b/rpc/src/v1/helpers/requests.rs
index aa3a4c3d462a991606b4d37afc1b80cd50740949..13bfbb1b38641bd046dc6f0f3bc5471506e4b51f 100644
--- a/rpc/src/v1/helpers/requests.rs
+++ b/rpc/src/v1/helpers/requests.rs
@@ -14,7 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::{Address, U256, Bytes};
+use ethereum_types::{U256, Address};
+use bytes::Bytes;
+
 use v1::types::{Origin, TransactionCondition};
 
 /// Transaction request coming from RPC
diff --git a/rpc/src/v1/helpers/secretstore.rs b/rpc/src/v1/helpers/secretstore.rs
index 246d0fa3f11cc5f7386e9de07aa5e9dfb7fdb54b..fbcc167e23924f6206d699536aba108b804f3422 100644
--- a/rpc/src/v1/helpers/secretstore.rs
+++ b/rpc/src/v1/helpers/secretstore.rs
@@ -14,17 +14,38 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::iter::repeat;
+use std::collections::BTreeSet;
 use rand::{Rng, OsRng};
-use ethkey::{Public, Secret, math};
+use ethkey::{Public, Secret, Random, Generator, math};
 use crypto;
-use util::Bytes;
+use bytes::Bytes;
 use jsonrpc_core::Error;
 use v1::helpers::errors;
+use v1::types::{H256, H512, EncryptedDocumentKey};
+use tiny_keccak::Keccak;
 
 /// Initialization vector length.
 const INIT_VEC_LEN: usize = 16;
 
+/// Generate document key to store in secret store.
+pub fn generate_document_key(account_public: Public, server_key_public: Public) -> Result<EncryptedDocumentKey, Error> {
+	// generate random plain document key
+	let document_key = Random.generate().map_err(errors::encryption)?;
+
+	// encrypt document key using server key
+	let (common_point, encrypted_point) = encrypt_secret(document_key.public(), &server_key_public)?;
+
+	// ..and now encrypt document key with account public
+	let encrypted_key = crypto::ecies::encrypt(&account_public, &crypto::DEFAULT_MAC, document_key.public())
+		.map_err(errors::encryption)?;
+
+	Ok(EncryptedDocumentKey {
+		common_point: common_point.into(),
+		encrypted_point: encrypted_point.into(),
+		encrypted_key: encrypted_key.into(),
+	})
+}
+
 /// Encrypt document with distributely generated key.
 pub fn encrypt_document(key: Bytes, document: Bytes) -> Result<Bytes, Error> {
 	// make document key
@@ -32,10 +53,13 @@ pub fn encrypt_document(key: Bytes, document: Bytes) -> Result<Bytes, Error> {
 
 	// use symmetric encryption to encrypt document
 	let iv = initialization_vector();
-	let mut encrypted_document = Vec::with_capacity(document.len() + iv.len());
-	encrypted_document.extend(repeat(0).take(document.len()));
-	crypto::aes::encrypt(&key, &iv, &document, &mut encrypted_document);
-	encrypted_document.extend_from_slice(&iv);
+	let mut encrypted_document = vec![0; document.len() + iv.len()];
+	{
+		let (mut encryption_buffer, iv_buffer) = encrypted_document.split_at_mut(document.len());
+
+		crypto::aes::encrypt(&key, &iv, &document, &mut encryption_buffer);
+		iv_buffer.copy_from_slice(&iv);
+	}
 
 	Ok(encrypted_document)
 }
@@ -53,18 +77,31 @@ pub fn decrypt_document(key: Bytes, mut encrypted_document: Bytes) -> Result<Byt
 
 	// use symmetric decryption to decrypt document
 	let iv = encrypted_document.split_off(encrypted_document_len - INIT_VEC_LEN);
-	let mut document = Vec::with_capacity(encrypted_document_len - INIT_VEC_LEN);
-	document.extend(repeat(0).take(encrypted_document_len - INIT_VEC_LEN));
+	let mut document = vec![0; encrypted_document_len - INIT_VEC_LEN];
 	crypto::aes::decrypt(&key, &iv, &encrypted_document, &mut document);
 
 	Ok(document)
 }
 
+/// Decrypt document given secret shadow.
 pub fn decrypt_document_with_shadow(decrypted_secret: Public, common_point: Public, shadows: Vec<Secret>, encrypted_document: Bytes) -> Result<Bytes, Error> {
 	let key = decrypt_with_shadow_coefficients(decrypted_secret, common_point, shadows)?;
 	decrypt_document(key.to_vec(), encrypted_document)
 }
 
+/// Calculate Keccak(ordered servers set)
+pub fn ordered_servers_keccak(servers_set: BTreeSet<H512>) -> H256 {
+	let mut servers_set_keccak = Keccak::new_keccak256();
+	for server in servers_set {
+		servers_set_keccak.update(&server.0);
+	}
+
+	let mut servers_set_keccak_value = [0u8; 32];
+	servers_set_keccak.finalize(&mut servers_set_keccak_value);
+
+	servers_set_keccak_value.into()
+}
+
 fn into_document_key(key: Bytes) -> Result<Bytes, Error> {
 	// key is a previously distributely generated Public
 	if key.len() != 64 {
@@ -96,9 +133,31 @@ fn decrypt_with_shadow_coefficients(mut decrypted_shadow: Public, mut common_sha
 	Ok(decrypted_shadow)
 }
 
+fn encrypt_secret(secret: &Public, joint_public: &Public) -> Result<(Public, Public), Error> {
+	// TODO: it is copypaste of `encrypt_secret` from secret_store/src/key_server_cluster/math.rs
+	// use shared version from SS math library, when it'll be available
+
+	let key_pair = Random.generate()
+		.map_err(errors::encryption)?;
+
+	// k * T
+	let mut common_point = math::generation_point();
+	math::public_mul_secret(&mut common_point, key_pair.secret())
+		.map_err(errors::encryption)?;
+
+	// M + k * y
+	let mut encrypted_point = joint_public.clone();
+	math::public_mul_secret(&mut encrypted_point, key_pair.secret())
+		.map_err(errors::encryption)?;
+	math::public_add(&mut encrypted_point, secret)
+		.map_err(errors::encryption)?;
+
+	Ok((common_point, encrypted_point))
+}
+
 #[cfg(test)]
 mod tests {
-	use util::Bytes;
+	use bytes::Bytes;
 	use rustc_hex::FromHex;
 	use super::{encrypt_document, decrypt_document, decrypt_document_with_shadow};
 
diff --git a/rpc/src/v1/helpers/signer.rs b/rpc/src/v1/helpers/signer.rs
index 81d21eb82e4a1516cbaad52413b3133c77db2723..6d9606f87803048c1732b7ee01ffc52e20356ad5 100644
--- a/rpc/src/v1/helpers/signer.rs
+++ b/rpc/src/v1/helpers/signer.rs
@@ -17,7 +17,7 @@
 use std::sync::Arc;
 use std::ops::Deref;
 use http::Origin;
-use util::Mutex;
+use parking_lot::Mutex;
 use transient_hashmap::TransientHashMap;
 
 use ethstore::random_string;
diff --git a/rpc/src/v1/helpers/signing_queue.rs b/rpc/src/v1/helpers/signing_queue.rs
index e9e6313f4304ebced5ebb0e4015b2255287639e4..b73535ba4f9508c912b5fdf3817360d61d806b37 100644
--- a/rpc/src/v1/helpers/signing_queue.rs
+++ b/rpc/src/v1/helpers/signing_queue.rs
@@ -14,18 +14,17 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::mem;
-use std::cell::RefCell;
-use std::sync::Arc;
 use std::collections::BTreeMap;
-use jsonrpc_core;
-use util::{Mutex, RwLock, U256, Address};
+use ethereum_types::{U256, Address};
+use parking_lot::{Mutex, RwLock};
 use ethcore::account_provider::DappId;
-use v1::helpers::{ConfirmationRequest, ConfirmationPayload};
+use v1::helpers::{ConfirmationRequest, ConfirmationPayload, oneshot, errors};
 use v1::types::{ConfirmationResponse, H160 as RpcH160, Origin, DappId as RpcDappId};
 
+use jsonrpc_core::Error;
+
 /// Result that can be returned from JSON RPC.
-pub type RpcResult = Result<ConfirmationResponse, jsonrpc_core::Error>;
+pub type ConfirmationResult = Result<ConfirmationResponse, Error>;
 
 /// Type of default account
 pub enum DefaultAccount {
@@ -72,8 +71,9 @@ pub const QUEUE_LIMIT: usize = 50;
 /// A queue of transactions awaiting to be confirmed and signed.
 pub trait SigningQueue: Send + Sync {
 	/// Add new request to the queue.
-	/// Returns a `ConfirmationPromise` that can be used to await for resolution of given request.
-	fn add_request(&self, request: ConfirmationPayload, origin: Origin) -> Result<ConfirmationPromise, QueueAddError>;
+	/// Returns a `Result` wrapping  `ConfirmationReceiver` together with it's unique id in the queue.
+	/// `ConfirmationReceiver` is a `Future` awaiting for resolution of the given request.
+	fn add_request(&self, request: ConfirmationPayload, origin: Origin) -> Result<(U256, ConfirmationReceiver), QueueAddError>;
 
 	/// Removes a request from the queue.
 	/// Notifies possible token holders that request was rejected.
@@ -81,7 +81,7 @@ pub trait SigningQueue: Send + Sync {
 
 	/// Removes a request from the queue.
 	/// Notifies possible token holders that request was confirmed and given hash was assigned.
-	fn request_confirmed(&self, id: U256, result: RpcResult) -> Option<ConfirmationRequest>;
+	fn request_confirmed(&self, id: U256, result: ConfirmationResult) -> Option<ConfirmationRequest>;
 
 	/// Returns a request if it is contained in the queue.
 	fn peek(&self, id: &U256) -> Option<ConfirmationRequest>;
@@ -96,88 +96,20 @@ pub trait SigningQueue: Send + Sync {
 	fn is_empty(&self) -> bool;
 }
 
-#[derive(Debug, Clone, PartialEq)]
-/// Result of a pending confirmation request.
-pub enum ConfirmationResult {
-	/// The request has not yet been confirmed nor rejected.
-	Waiting,
-	/// The request has been rejected.
-	Rejected,
-	/// The request has been confirmed.
-	Confirmed(RpcResult),
-}
-
-type Listener = Box<FnMut(Option<RpcResult>) + Send>;
-
-/// A handle to submitted request.
-/// Allows to block and wait for a resolution of that request.
-pub struct ConfirmationToken {
-	result: Arc<Mutex<ConfirmationResult>>,
-	listeners: Arc<Mutex<Vec<Listener>>>,
+struct ConfirmationSender {
+	sender: oneshot::Sender<ConfirmationResult>,
 	request: ConfirmationRequest,
 }
 
-pub struct ConfirmationPromise {
-	id: U256,
-	result: Arc<Mutex<ConfirmationResult>>,
-	listeners: Arc<Mutex<Vec<Listener>>>,
-}
-
-impl ConfirmationToken {
-	/// Submit solution to all listeners
-	fn resolve(&self, result: Option<RpcResult>) {
-		let wrapped = result.clone().map_or(ConfirmationResult::Rejected, |h| ConfirmationResult::Confirmed(h));
-		{
-			let mut res = self.result.lock();
-			*res = wrapped.clone();
-		}
-		// Notify listener
-		let listeners = {
-			let mut listeners = self.listeners.lock();
-			mem::replace(&mut *listeners, Vec::new())
-		};
-		for mut listener in listeners {
-			listener(result.clone());
-		}
-	}
-
-	fn as_promise(&self) -> ConfirmationPromise {
-		ConfirmationPromise {
-			id: self.request.id,
-			result: self.result.clone(),
-			listeners: self.listeners.clone(),
-		}
-	}
-}
-
-impl ConfirmationPromise {
-	/// Get the ID for this request.
-	pub fn id(&self) -> U256 { self.id }
-
-	/// Just get the result, assuming it exists.
-	pub fn result(&self) -> ConfirmationResult {
-		self.result.lock().clone()
-	}
-
-	pub fn wait_for_result<F>(self, callback: F) where F: FnOnce(Option<RpcResult>) + Send + 'static {
-		trace!(target: "own_tx", "Signer: Awaiting confirmation... ({:?}).", self.id);
-		let _result = self.result.lock();
-		let mut listeners = self.listeners.lock();
-		// TODO [todr] Overcoming FnBox unstability
-		let callback = RefCell::new(Some(callback));
-		listeners.push(Box::new(move |result| {
-			let ref mut f = *callback.borrow_mut();
-			f.take().expect("Callbacks are called only once.")(result)
-		}));
-	}
-}
-
+/// Receiving end of the Confirmation channel; can be used as a `Future` to await for `ConfirmationRequest`
+/// being processed and turned into `ConfirmationOutcome`
+pub type ConfirmationReceiver =  oneshot::Receiver<ConfirmationResult>;
 
 /// Queue for all unconfirmed requests.
 #[derive(Default)]
 pub struct ConfirmationsQueue {
 	id: Mutex<U256>,
-	queue: RwLock<BTreeMap<U256, ConfirmationToken>>,
+	queue: RwLock<BTreeMap<U256, ConfirmationSender>>,
 	on_event: RwLock<Vec<Box<Fn(QueueEvent) -> () + Send + Sync>>>,
 }
 
@@ -201,23 +133,26 @@ impl ConfirmationsQueue {
 		}
 	}
 
-	/// Removes requests from this queue and notifies `ConfirmationPromise` holders about the result.
+	/// Removes requests from this queue and notifies `ConfirmationReceiver` holder about the result.
 	/// Notifies also a receiver about that event.
-	fn remove(&self, id: U256, result: Option<RpcResult>) -> Option<ConfirmationRequest> {
-		let token = self.queue.write().remove(&id);
+	fn remove(&self, id: U256, result: Option<ConfirmationResult>) -> Option<ConfirmationRequest> {
+		let sender = self.queue.write().remove(&id);
 
-		if let Some(token) = token {
+		if let Some(sender) = sender {
 			// notify receiver about the event
 			self.notify(result.clone().map_or_else(
 				|| QueueEvent::RequestRejected(id),
 				|_| QueueEvent::RequestConfirmed(id)
 			));
-			// notify token holders about resolution
-			token.resolve(result);
-			// return a result
-			return Some(token.request.clone());
+
+			// notify confirmation receiver about resolution
+			let result = result.ok_or(errors::request_rejected());
+			sender.sender.send(result);
+
+			Some(sender.request)
+		} else {
+			None
 		}
-		None
 	}
 }
 
@@ -228,7 +163,7 @@ impl Drop for ConfirmationsQueue {
 }
 
 impl SigningQueue for ConfirmationsQueue {
-	fn add_request(&self, request: ConfirmationPayload, origin: Origin) -> Result<ConfirmationPromise, QueueAddError> {
+	fn add_request(&self, request: ConfirmationPayload, origin: Origin) -> Result<(U256, ConfirmationReceiver), QueueAddError> {
 		if self.len() > QUEUE_LIMIT {
 			return Err(QueueAddError::LimitReached);
 		}
@@ -245,16 +180,17 @@ impl SigningQueue for ConfirmationsQueue {
 			trace!(target: "own_tx", "Signer: ({:?}) : {:?}", id, request);
 
 			let mut queue = self.queue.write();
-			queue.insert(id, ConfirmationToken {
-				result: Arc::new(Mutex::new(ConfirmationResult::Waiting)),
-				listeners: Default::default(),
+			let (sender, receiver) = oneshot::oneshot::<ConfirmationResult>();
+
+			queue.insert(id, ConfirmationSender {
+				sender,
 				request: ConfirmationRequest {
-					id: id,
+					id,
 					payload: request,
-					origin: origin,
+					origin,
 				},
 			});
-			queue.get(&id).map(|token| token.as_promise()).expect("Token was just inserted.")
+			(id, receiver)
 		};
 		// Notify listeners
 		self.notify(QueueEvent::NewRequest(id));
@@ -262,7 +198,7 @@ impl SigningQueue for ConfirmationsQueue {
 	}
 
 	fn peek(&self, id: &U256) -> Option<ConfirmationRequest> {
-		self.queue.read().get(id).map(|token| token.request.clone())
+		self.queue.read().get(id).map(|sender| sender.request.clone())
 	}
 
 	fn request_rejected(&self, id: U256) -> Option<ConfirmationRequest> {
@@ -270,14 +206,14 @@ impl SigningQueue for ConfirmationsQueue {
 		self.remove(id, None)
 	}
 
-	fn request_confirmed(&self, id: U256, result: RpcResult) -> Option<ConfirmationRequest> {
+	fn request_confirmed(&self, id: U256, result: ConfirmationResult) -> Option<ConfirmationRequest> {
 		debug!(target: "own_tx", "Signer: Transaction confirmed ({:?}).", id);
 		self.remove(id, Some(result))
 	}
 
 	fn requests(&self) -> Vec<ConfirmationRequest> {
 		let queue = self.queue.read();
-		queue.values().map(|token| token.request.clone()).collect()
+		queue.values().map(|sender| sender.request.clone()).collect()
 	}
 
 	fn len(&self) -> usize {
@@ -294,11 +230,13 @@ impl SigningQueue for ConfirmationsQueue {
 
 #[cfg(test)]
 mod test {
-	use std::time::Duration;
-	use std::thread;
-	use std::sync::{mpsc, Arc};
-	use util::{Address, U256, Mutex};
-	use v1::helpers::{SigningQueue, ConfirmationsQueue, QueueEvent, FilledTransactionRequest, ConfirmationPayload};
+	use std::sync::Arc;
+	use ethereum_types::{U256, Address};
+	use parking_lot::Mutex;
+	use jsonrpc_core::futures::Future;
+	use v1::helpers::{
+		SigningQueue, ConfirmationsQueue, QueueEvent, FilledTransactionRequest, ConfirmationPayload,
+	};
 	use v1::types::ConfirmationResponse;
 
 	fn request() -> ConfirmationPayload {
@@ -322,25 +260,12 @@ mod test {
 		let request = request();
 
 		// when
-		let q = queue.clone();
-		let handle = thread::spawn(move || {
-			let v = q.add_request(request, Default::default()).unwrap();
-			let (tx, rx) = mpsc::channel();
-			v.wait_for_result(move |res| {
-				tx.send(res).unwrap();
-			});
-			rx.recv().unwrap().expect("Should return hash")
-		});
-
-		let id = U256::from(1);
-		while queue.peek(&id).is_none() {
-			// Just wait for the other thread to start
-			thread::sleep(Duration::from_millis(100));
-		}
+		let (id, future) = queue.add_request(request, Default::default()).unwrap();
 		queue.request_confirmed(id, Ok(ConfirmationResponse::SendTransaction(1.into())));
 
 		// then
-		assert_eq!(handle.join().expect("Thread should finish nicely"), Ok(ConfirmationResponse::SendTransaction(1.into())));
+		let confirmation = future.wait().unwrap();
+		assert_eq!(confirmation, Ok(ConfirmationResponse::SendTransaction(1.into())));
 	}
 
 	#[test]
@@ -355,7 +280,7 @@ mod test {
 		queue.on_event(move |notification| {
 			r.lock().push(notification);
 		});
-		queue.add_request(request, Default::default()).unwrap();
+		let _future = queue.add_request(request, Default::default()).unwrap();
 		queue.finish();
 
 		// then
@@ -372,7 +297,7 @@ mod test {
 		let request = request();
 
 		// when
-		queue.add_request(request.clone(), Default::default()).unwrap();
+		let _future = queue.add_request(request.clone(), Default::default()).unwrap();
 		let all = queue.requests();
 
 		// then
diff --git a/rpc/src/v1/helpers/subscription_manager.rs b/rpc/src/v1/helpers/subscription_manager.rs
index c5e4216f4398bd69dbe734ff90516b256be91e3f..5988824b6a4e63f47e5a3533c01aa050978d7b01 100644
--- a/rpc/src/v1/helpers/subscription_manager.rs
+++ b/rpc/src/v1/helpers/subscription_manager.rs
@@ -18,11 +18,11 @@
 
 use std::sync::Arc;
 use std::sync::atomic::{self, AtomicBool};
-use util::Mutex;
+use parking_lot::Mutex;
 
 use jsonrpc_core::futures::future::{self, Either};
 use jsonrpc_core::futures::sync::mpsc;
-use jsonrpc_core::futures::{Sink, Future, BoxFuture};
+use jsonrpc_core::futures::{Sink, Future};
 use jsonrpc_core::{self as core, MetaIoHandler};
 use jsonrpc_pubsub::SubscriptionId;
 
@@ -87,7 +87,7 @@ impl<S: core::Middleware<Metadata>> GenericPollManager<S> {
 		}).is_some()
 	}
 
-	pub fn tick(&self) -> BoxFuture<(), ()> {
+	pub fn tick(&self) -> Box<Future<Item=(), Error=()> + Send> {
 		let mut futures = Vec::new();
 		// poll all subscriptions
 		for (id, subscription) in self.subscribers.iter() {
@@ -130,7 +130,7 @@ impl<S: core::Middleware<Metadata>> GenericPollManager<S> {
 		}
 
 		// return a future represeting all the polls
-		future::join_all(futures).map(|_| ()).boxed()
+		Box::new(future::join_all(futures).map(|_| ()))
 	}
 }
 
diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs
index 0cf70bf23cd76c792b2710bce6c7b78f188b4fb9..bd7e09ea73b33a0cc277208f4c8462365ce8d9cf 100644
--- a/rpc/src/v1/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -17,45 +17,45 @@
 //! Eth rpc implementation.
 
 use std::thread;
-use std::time::{Instant, Duration};
+use std::time::{Instant, Duration, SystemTime, UNIX_EPOCH};
 use std::sync::Arc;
 
-use futures::{self, future, BoxFuture, Future};
 use rlp::{self, UntrustedRlp};
-use time::get_time;
-use util::{H160, H256, Address, U256, H64};
-use util::sha3::Hashable;
-use util::Mutex;
+use ethereum_types::{U256, H64, H160, H256, Address};
+use parking_lot::Mutex;
 
 use ethash::SeedHashCompute;
 use ethcore::account_provider::{AccountProvider, DappId};
 use ethcore::block::IsBlock;
-use ethcore::client::{MiningBlockChainClient, BlockId, TransactionId, UncleId};
+use ethcore::client::{MiningBlockChainClient, BlockId, TransactionId, UncleId, StateOrBlock, StateClient, StateInfo, Call, EngineInfo};
 use ethcore::ethereum::Ethash;
 use ethcore::filter::Filter as EthcoreFilter;
-use ethcore::header::{Header as BlockHeader, BlockNumber as EthBlockNumber};
+use ethcore::header::{BlockNumber as EthBlockNumber, Seal};
 use ethcore::log_entry::LogEntry;
-use ethcore::miner::{MinerService, ExternalMinerService};
-use ethcore::transaction::SignedTransaction;
+use ethcore::miner::MinerService;
 use ethcore::snapshot::SnapshotService;
+use ethcore::encoded;
 use ethsync::{SyncProvider};
+use miner::external::ExternalMinerService;
+use transaction::{SignedTransaction, LocalizedTransaction};
 
-use jsonrpc_core::Error;
+use jsonrpc_core::{BoxFuture, Result};
+use jsonrpc_core::futures::future;
 use jsonrpc_macros::Trailing;
 
 use v1::helpers::{errors, limit_logs, fake_sign};
-use v1::helpers::dispatch::{Dispatcher, FullDispatcher, default_gas_price};
+use v1::helpers::dispatch::{FullDispatcher, default_gas_price};
 use v1::helpers::block_import::is_major_importing;
 use v1::helpers::accounts::unwrap_provider;
 use v1::traits::Eth;
 use v1::types::{
 	RichBlock, Block, BlockTransactions, BlockNumber, Bytes, SyncStatus, SyncInfo,
 	Transaction, CallRequest, Index, Filter, Log, Receipt, Work,
-	H64 as RpcH64, H256 as RpcH256, H160 as RpcH160, U256 as RpcU256,
+	H64 as RpcH64, H256 as RpcH256, H160 as RpcH160, U256 as RpcU256, block_number_to_id,
 };
 use v1::metadata::Metadata;
 
-const EXTRA_INFO_PROOF: &'static str = "Object exists in in blockchain (fetched earlier), extra_info is always available if object exists; qed";
+const EXTRA_INFO_PROOF: &'static str = "Object exists in blockchain (fetched earlier), extra_info is always available if object exists; qed";
 
 /// Eth RPC options
 pub struct EthClientOptions {
@@ -65,6 +65,8 @@ pub struct EthClientOptions {
 	pub allow_pending_receipt_query: bool,
 	/// Send additional block number when asking for work
 	pub send_block_number_in_get_work: bool,
+	/// Gas Price Percentile used as default gas price.
+	pub gas_price_percentile: usize,
 }
 
 impl EthClientOptions {
@@ -83,6 +85,7 @@ impl Default for EthClientOptions {
 			pending_nonce_from_queue: false,
 			allow_pending_receipt_query: true,
 			send_block_number_in_get_work: true,
+			gas_price_percentile: 50,
 		}
 	}
 }
@@ -106,11 +109,43 @@ pub struct EthClient<C, SN: ?Sized, S: ?Sized, M, EM> where
 	eip86_transition: u64,
 }
 
-impl<C, SN: ?Sized, S: ?Sized, M, EM> EthClient<C, SN, S, M, EM> where
-	C: MiningBlockChainClient,
+enum BlockNumberOrId {
+	Number(BlockNumber),
+	Id(BlockId),
+}
+
+impl From<BlockId> for BlockNumberOrId {
+	fn from(value: BlockId) -> BlockNumberOrId {
+		BlockNumberOrId::Id(value)
+	}
+}
+
+impl From<BlockNumber> for BlockNumberOrId {
+	fn from(value: BlockNumber) -> BlockNumberOrId {
+		BlockNumberOrId::Number(value)
+	}
+}
+
+enum PendingOrBlock {
+	Block(BlockId),
+	Pending,
+}
+
+struct PendingUncleId {
+	id: PendingOrBlock,
+	position: usize,
+}
+
+enum PendingTransactionId {
+	Hash(H256),
+	Location(PendingOrBlock, usize)
+}
+
+impl<C, SN: ?Sized, S: ?Sized, M, EM, T: StateInfo + 'static> EthClient<C, SN, S, M, EM> where
+	C: MiningBlockChainClient + StateClient<State=T> + Call<State=T> + EngineInfo,
 	SN: SnapshotService,
 	S: SyncProvider,
-	M: MinerService,
+	M: MinerService<State=T>,
 	EM: ExternalMinerService {
 
 	/// Creates new EthClient.
@@ -138,18 +173,55 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> EthClient<C, SN, S, M, EM> where
 
 	/// Attempt to get the `Arc<AccountProvider>`, errors if provider was not
 	/// set.
-	fn account_provider(&self) -> Result<Arc<AccountProvider>, Error> {
+	fn account_provider(&self) -> Result<Arc<AccountProvider>> {
 		unwrap_provider(&self.accounts)
 	}
 
-	fn block(&self, id: BlockId, include_txs: bool) -> Result<Option<RichBlock>, Error> {
+	fn rich_block(&self, id: BlockNumberOrId, include_txs: bool) -> Result<Option<RichBlock>> {
 		let client = &self.client;
-		match (client.block(id.clone()), client.block_total_difficulty(id)) {
+
+		let client_query = |id| (client.block(id), client.block_total_difficulty(id), client.block_extra_info(id));
+
+		let (block, difficulty, extra) = match id {
+			BlockNumberOrId::Number(BlockNumber::Pending) => {
+				let info = self.client.chain_info();
+				let pending_block = self.miner.pending_block(info.best_block_number);
+				let difficulty = {
+					let latest_difficulty = self.client.block_total_difficulty(BlockId::Latest).expect("blocks in chain have details; qed");
+					let pending_difficulty = self.miner.pending_block_header(info.best_block_number).map(|header| *header.difficulty());
+
+				 	if let Some(difficulty) = pending_difficulty {
+						difficulty + latest_difficulty
+					} else {
+						latest_difficulty
+					}
+				};
+
+				let extra = pending_block.as_ref().map(|b| self.client.engine().extra_info(&b.header));
+
+				(pending_block.map(|b| encoded::Block::new(b.rlp_bytes(Seal::Without))), Some(difficulty), extra)
+			},
+
+			BlockNumberOrId::Number(num) => {
+				let id = match num {
+					BlockNumber::Latest => BlockId::Latest,
+					BlockNumber::Earliest => BlockId::Earliest,
+					BlockNumber::Num(n) => BlockId::Number(n),
+					BlockNumber::Pending => unreachable!(), // Already covered
+				};
+
+				client_query(id)
+			},
+
+			BlockNumberOrId::Id(id) => client_query(id),
+		};
+
+		match (block, difficulty) {
 			(Some(block), Some(total_difficulty)) => {
 				let view = block.header_view();
 				Ok(Some(RichBlock {
 					inner: Block {
-						hash: Some(view.sha3().into()),
+						hash: Some(view.hash().into()),
 						size: Some(block.rlp().as_raw().len().into()),
 						parent_hash: view.parent_hash().into(),
 						uncles_hash: view.uncles_hash().into(),
@@ -173,29 +245,109 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> EthClient<C, SN, S, M, EM> where
 						},
 						extra_data: Bytes::new(view.extra_data()),
 					},
-					extra_info: client.block_extra_info(id.clone()).expect(EXTRA_INFO_PROOF),
+					extra_info: extra.expect(EXTRA_INFO_PROOF),
 				}))
 			},
 			_ => Ok(None)
 		}
 	}
 
-	fn transaction(&self, id: TransactionId) -> Result<Option<Transaction>, Error> {
-		match self.client.transaction(id) {
+	fn transaction(&self, id: PendingTransactionId) -> Result<Option<Transaction>> {
+		let client_transaction = |id| match self.client.transaction(id) {
 			Some(t) => Ok(Some(Transaction::from_localized(t, self.eip86_transition))),
 			None => Ok(None),
+		};
+
+		match id {
+			PendingTransactionId::Hash(hash) => client_transaction(TransactionId::Hash(hash)),
+
+			PendingTransactionId::Location(PendingOrBlock::Block(block), index) => {
+				client_transaction(TransactionId::Location(block, index))
+			},
+
+			PendingTransactionId::Location(PendingOrBlock::Pending, index) => {
+				let info = self.client.chain_info();
+				let pending_block = match self.miner.pending_block(info.best_block_number) {
+					Some(block) => block,
+					None => return Ok(None),
+				};
+
+				// Implementation stolen from `extract_transaction_at_index`
+				let transaction = pending_block.transactions.get(index)
+					// Verify if transaction signature is correct.
+					.and_then(|tx| SignedTransaction::new(tx.clone()).ok())
+					.map(|signed_tx| {
+						let (signed, sender, _) = signed_tx.deconstruct();
+						let block_hash = pending_block.header.hash();
+						let block_number = pending_block.header.number();
+						let transaction_index = index;
+						let cached_sender = Some(sender);
+
+						LocalizedTransaction {
+							signed,
+							block_number,
+							block_hash,
+							transaction_index,
+							cached_sender,
+						}
+					})
+					.map(|tx| Transaction::from_localized(tx, self.eip86_transition));
+
+				Ok(transaction)
+			}
 		}
 	}
 
-	fn uncle(&self, id: UncleId) -> Result<Option<RichBlock>, Error> {
+	fn uncle(&self, id: PendingUncleId) -> Result<Option<RichBlock>> {
 		let client = &self.client;
-		let uncle: BlockHeader = match client.uncle(id) {
-			Some(hdr) => hdr.decode(),
-			None => { return Ok(None); }
-		};
-		let parent_difficulty = match client.block_total_difficulty(BlockId::Hash(uncle.parent_hash().clone())) {
-			Some(difficulty) => difficulty,
-			None => { return Ok(None); }
+
+		let (uncle, parent_difficulty, extra) = match id {
+			PendingUncleId { id: PendingOrBlock::Pending, position } => {
+				let info = self.client.chain_info();
+
+				let pending_block = match self.miner.pending_block(info.best_block_number) {
+					Some(block) => block,
+					None => return Ok(None),
+				};
+
+				let uncle = match pending_block.uncles.get(position) {
+					Some(uncle) => uncle.clone(),
+					None => return Ok(None),
+				};
+
+				let difficulty = {
+					let latest_difficulty = self.client.block_total_difficulty(BlockId::Latest).expect("blocks in chain have details; qed");
+					let pending_difficulty = self.miner.pending_block_header(info.best_block_number).map(|header| *header.difficulty());
+
+					if let Some(difficulty) = pending_difficulty {
+						difficulty + latest_difficulty
+					} else {
+						latest_difficulty
+					}
+				};
+
+				let extra = self.client.engine().extra_info(&pending_block.header);
+
+				(uncle, difficulty, extra)
+			},
+
+			PendingUncleId { id: PendingOrBlock::Block(block_id), position } => {
+				let uncle_id = UncleId { block: block_id, position };
+
+				let uncle = match client.uncle(uncle_id) {
+					Some(hdr) => hdr.decode(),
+					None => { return Ok(None); }
+				};
+
+				let parent_difficulty = match client.block_total_difficulty(BlockId::Hash(uncle.parent_hash().clone())) {
+					Some(difficulty) => difficulty,
+					None => { return Ok(None); }
+				};
+
+				let extra = client.uncle_extra_info(uncle_id).expect(EXTRA_INFO_PROOF);
+
+				(uncle, parent_difficulty, extra)
+			}
 		};
 
 		let size = client.block(BlockId::Hash(uncle.hash()))
@@ -226,18 +378,36 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> EthClient<C, SN, S, M, EM> where
 				uncles: vec![],
 				transactions: BlockTransactions::Hashes(vec![]),
 			},
-			extra_info: client.uncle_extra_info(id).expect(EXTRA_INFO_PROOF),
+			extra_info: extra,
 		};
 		Ok(Some(block))
 	}
 
-	fn dapp_accounts(&self, dapp: DappId) -> Result<Vec<H160>, Error> {
+	fn dapp_accounts(&self, dapp: DappId) -> Result<Vec<H160>> {
 		let store = self.account_provider()?;
 		store
 			.note_dapp_used(dapp.clone())
 			.and_then(|_| store.dapp_addresses(dapp))
 			.map_err(|e| errors::account("Could not fetch accounts.", e))
 	}
+
+	fn get_state(&self, number: BlockNumber) -> StateOrBlock {
+		match number {
+			BlockNumber::Num(num) => BlockId::Number(num).into(),
+			BlockNumber::Earliest => BlockId::Earliest.into(),
+			BlockNumber::Latest => BlockId::Latest.into(),
+
+			BlockNumber::Pending => {
+				let info = self.client.chain_info();
+
+				self.miner
+					.pending_state(info.best_block_number)
+					.map(|s| Box::new(s) as Box<StateInfo>)
+					.unwrap_or(Box::new(self.client.latest_state()) as Box<StateInfo>)
+					.into()
+			}
+		}
+	}
 }
 
 pub fn pending_logs<M>(miner: &M, best_block: EthBlockNumber, filter: &EthcoreFilter) -> Vec<Log> where M: MinerService {
@@ -259,33 +429,40 @@ pub fn pending_logs<M>(miner: &M, best_block: EthBlockNumber, filter: &EthcoreFi
 	result
 }
 
-fn check_known<C>(client: &C, number: BlockNumber) -> Result<(), Error> where C: MiningBlockChainClient {
+fn check_known<C>(client: &C, number: BlockNumber) -> Result<()> where C: MiningBlockChainClient {
 	use ethcore::block_status::BlockStatus;
 
-	match client.block_status(number.into()) {
+	let id = match number {
+		BlockNumber::Pending => return Ok(()),
+
+		BlockNumber::Num(n) => BlockId::Number(n),
+		BlockNumber::Latest => BlockId::Latest,
+		BlockNumber::Earliest => BlockId::Earliest,
+	};
+
+	match client.block_status(id) {
 		BlockStatus::InChain => Ok(()),
-		BlockStatus::Pending => Ok(()),
 		_ => Err(errors::unknown_block()),
 	}
 }
 
 const MAX_QUEUE_SIZE_TO_MINE_ON: usize = 4;	// because uncles go back 6.
 
-impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
-	C: MiningBlockChainClient + 'static,
+impl<C, SN: ?Sized, S: ?Sized, M, EM, T: StateInfo + 'static> Eth for EthClient<C, SN, S, M, EM> where
+	C: MiningBlockChainClient + StateClient<State=T> + Call<State=T> + EngineInfo + 'static,
 	SN: SnapshotService + 'static,
 	S: SyncProvider + 'static,
-	M: MinerService + 'static,
+	M: MinerService<State=T> + 'static,
 	EM: ExternalMinerService + 'static,
 {
 	type Metadata = Metadata;
 
-	fn protocol_version(&self) -> Result<String, Error> {
+	fn protocol_version(&self) -> Result<String> {
 		let version = self.sync.status().protocol_version.to_owned();
 		Ok(format!("{}", version))
 	}
 
-	fn syncing(&self) -> Result<SyncStatus, Error> {
+	fn syncing(&self) -> Result<SyncStatus> {
 		use ethcore::snapshot::RestorationStatus;
 
 		let status = self.sync.status();
@@ -317,194 +494,229 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
 		}
 	}
 
-	fn author(&self, meta: Metadata) -> BoxFuture<RpcH160, Error> {
+	fn author(&self, meta: Metadata) -> Result<RpcH160> {
 		let dapp = meta.dapp_id();
 
-		let author = move || {
-			let mut miner = self.miner.author();
-			if miner == 0.into() {
-				miner = self.dapp_accounts(dapp.into())?.get(0).cloned().unwrap_or_default();
-			}
-
-			Ok(RpcH160::from(miner))
-		};
+		let mut miner = self.miner.author();
+		if miner == 0.into() {
+			miner = self.dapp_accounts(dapp.into())?.get(0).cloned().unwrap_or_default();
+		}
 
-		futures::done(author()).boxed()
+		Ok(RpcH160::from(miner))
 	}
 
-	fn is_mining(&self) -> Result<bool, Error> {
+	fn is_mining(&self) -> Result<bool> {
 		Ok(self.miner.is_currently_sealing())
 	}
 
-	fn hashrate(&self) -> Result<RpcU256, Error> {
+	fn hashrate(&self) -> Result<RpcU256> {
 		Ok(RpcU256::from(self.external_miner.hashrate()))
 	}
 
-	fn gas_price(&self) -> Result<RpcU256, Error> {
-		Ok(RpcU256::from(default_gas_price(&*self.client, &*self.miner)))
+	fn gas_price(&self) -> Result<RpcU256> {
+		Ok(RpcU256::from(default_gas_price(&*self.client, &*self.miner, self.options.gas_price_percentile)))
 	}
 
-	fn accounts(&self, meta: Metadata) -> BoxFuture<Vec<RpcH160>, Error> {
+	fn accounts(&self, meta: Metadata) -> Result<Vec<RpcH160>> {
 		let dapp = meta.dapp_id();
 
-		let accounts = move || {
-			let accounts = self.dapp_accounts(dapp.into())?;
-			Ok(accounts.into_iter().map(Into::into).collect())
-		};
-
-		futures::done(accounts()).boxed()
+		let accounts = self.dapp_accounts(dapp.into())?;
+		Ok(accounts.into_iter().map(Into::into).collect())
 	}
 
-	fn block_number(&self) -> Result<RpcU256, Error> {
+	fn block_number(&self) -> Result<RpcU256> {
 		Ok(RpcU256::from(self.client.chain_info().best_block_number))
 	}
 
-	fn balance(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256, Error> {
+	fn balance(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256> {
 		let address = address.into();
 
-		let id = num.unwrap_or_default();
+		let num = num.unwrap_or_default();
 
-		try_bf!(check_known(&*self.client, id.clone()));
-		let res = match self.client.balance(&address, id.into()) {
+		try_bf!(check_known(&*self.client, num.clone()));
+		let res = match self.client.balance(&address, self.get_state(num)) {
 			Some(balance) => Ok(balance.into()),
 			None => Err(errors::state_pruned()),
 		};
 
-		future::done(res).boxed()
+		Box::new(future::done(res))
 	}
 
-	fn storage_at(&self, address: RpcH160, pos: RpcU256, num: Trailing<BlockNumber>) -> BoxFuture<RpcH256, Error> {
+	fn storage_at(&self, address: RpcH160, pos: RpcU256, num: Trailing<BlockNumber>) -> BoxFuture<RpcH256> {
 		let address: Address = RpcH160::into(address);
 		let position: U256 = RpcU256::into(pos);
 
-		let id = num.unwrap_or_default();
+		let num = num.unwrap_or_default();
 
-		try_bf!(check_known(&*self.client, id.clone()));
-		let res = match self.client.storage_at(&address, &H256::from(position), id.into()) {
+		try_bf!(check_known(&*self.client, num.clone()));
+		let res = match self.client.storage_at(&address, &H256::from(position), self.get_state(num)) {
 			Some(s) => Ok(s.into()),
 			None => Err(errors::state_pruned()),
 		};
 
-		future::done(res).boxed()
+		Box::new(future::done(res))
 	}
 
-	fn transaction_count(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256, Error> {
+	fn transaction_count(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256> {
 		let address: Address = RpcH160::into(address);
 
 		let res = match num.unwrap_or_default() {
 			BlockNumber::Pending if self.options.pending_nonce_from_queue => {
 				let nonce = self.miner.last_nonce(&address)
 					.map(|n| n + 1.into())
-					.or_else(|| self.client.nonce(&address, BlockNumber::Pending.into()));
+					.or_else(|| self.client.nonce(&address, BlockId::Latest));
+
 				match nonce {
 					Some(nonce) => Ok(nonce.into()),
 					None => Err(errors::database("latest nonce missing"))
 				}
-			}
-			id => {
-				try_bf!(check_known(&*self.client, id.clone()));
-				match self.client.nonce(&address, id.into()) {
+			},
+
+			BlockNumber::Pending => {
+				let info = self.client.chain_info();
+				let nonce = self.miner
+					.pending_state(info.best_block_number)
+					.and_then(|s| s.nonce(&address).ok())
+					.or_else(|| {
+						warn!("Fallback to `BlockId::Latest`");
+						self.client.nonce(&address, BlockId::Latest)
+					});
+
+				match nonce {
+					Some(nonce) => Ok(nonce.into()),
+					None => Err(errors::database("latest nonce missing"))
+				}
+			},
+
+			number => {
+				try_bf!(check_known(&*self.client, number.clone()));
+				match self.client.nonce(&address, block_number_to_id(number)) {
 					Some(nonce) => Ok(nonce.into()),
 					None => Err(errors::state_pruned()),
 				}
 			}
 		};
 
-		future::done(res).boxed()
+		Box::new(future::done(res))
 	}
 
-	fn block_transaction_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>, Error> {
-		future::ok(self.client.block(BlockId::Hash(hash.into()))
-			.map(|block| block.transactions_count().into())).boxed()
+	fn block_transaction_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>> {
+		Box::new(future::ok(self.client.block(BlockId::Hash(hash.into()))
+			.map(|block| block.transactions_count().into())))
 	}
 
-	fn block_transaction_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>, Error> {
-		future::ok(match num {
+	fn block_transaction_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>> {
+		Box::new(future::ok(match num {
 			BlockNumber::Pending => Some(
 				self.miner.status().transactions_in_pending_block.into()
 			),
 			_ =>
-				self.client.block(num.into())
+				self.client.block(block_number_to_id(num))
 					.map(|block| block.transactions_count().into())
-		}).boxed()
+		}))
 	}
 
-	fn block_uncles_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>, Error> {
-			future::ok(self.client.block(BlockId::Hash(hash.into()))
-				.map(|block| block.uncles_count().into()))
-				.boxed()
+	fn block_uncles_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>> {
+		Box::new(future::ok(self.client.block(BlockId::Hash(hash.into()))
+			.map(|block| block.uncles_count().into())))
 	}
 
-	fn block_uncles_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>, Error> {
-		future::ok(match num {
+	fn block_uncles_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>> {
+		Box::new(future::ok(match num {
 			BlockNumber::Pending => Some(0.into()),
-			_ => self.client.block(num.into())
+			_ => self.client.block(block_number_to_id(num))
 					.map(|block| block.uncles_count().into()
 			),
-		}).boxed()
+		}))
 	}
 
-	fn code_at(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<Bytes, Error> {
+	fn code_at(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<Bytes> {
 		let address: Address = RpcH160::into(address);
 
-		let id = num.unwrap_or_default();
-		try_bf!(check_known(&*self.client, id.clone()));
+		let num = num.unwrap_or_default();
+		try_bf!(check_known(&*self.client, num.clone()));
 
-		let res = match self.client.code(&address, id.into()) {
+		let res = match self.client.code(&address, self.get_state(num)) {
 			Some(code) => Ok(code.map_or_else(Bytes::default, Bytes::new)),
 			None => Err(errors::state_pruned()),
 		};
 
-		future::done(res).boxed()
+		Box::new(future::done(res))
 	}
 
-	fn block_by_hash(&self, hash: RpcH256, include_txs: bool) -> BoxFuture<Option<RichBlock>, Error> {
-		future::done(self.block(BlockId::Hash(hash.into()), include_txs)).boxed()
+	fn block_by_hash(&self, hash: RpcH256, include_txs: bool) -> BoxFuture<Option<RichBlock>> {
+		Box::new(future::done(self.rich_block(BlockId::Hash(hash.into()).into(), include_txs)))
 	}
 
-	fn block_by_number(&self, num: BlockNumber, include_txs: bool) -> BoxFuture<Option<RichBlock>, Error> {
-		future::done(self.block(num.into(), include_txs)).boxed()
+	fn block_by_number(&self, num: BlockNumber, include_txs: bool) -> BoxFuture<Option<RichBlock>> {
+		Box::new(future::done(self.rich_block(num.into(), include_txs)))
 	}
 
-	fn transaction_by_hash(&self, hash: RpcH256) -> Result<Option<Transaction>, Error> {
+	fn transaction_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<Transaction>> {
 		let hash: H256 = hash.into();
 		let block_number = self.client.chain_info().best_block_number;
-		Ok(self.transaction(TransactionId::Hash(hash))?.or_else(|| self.miner.transaction(block_number, &hash).map(|t| Transaction::from_pending(t, block_number, self.eip86_transition))))
+		let tx = try_bf!(self.transaction(PendingTransactionId::Hash(hash))).or_else(|| {
+			self.miner.transaction(block_number, &hash)
+				.map(|t| Transaction::from_pending(t, block_number, self.eip86_transition))
+		});
+
+		Box::new(future::ok(tx))
 	}
 
-	fn transaction_by_block_hash_and_index(&self, hash: RpcH256, index: Index) -> Result<Option<Transaction>, Error> {
-		self.transaction(TransactionId::Location(BlockId::Hash(hash.into()), index.value()))
+	fn transaction_by_block_hash_and_index(&self, hash: RpcH256, index: Index) -> BoxFuture<Option<Transaction>> {
+		let id = PendingTransactionId::Location(PendingOrBlock::Block(BlockId::Hash(hash.into())), index.value());
+		Box::new(future::done(self.transaction(id)))
 	}
 
-	fn transaction_by_block_number_and_index(&self, num: BlockNumber, index: Index) -> Result<Option<Transaction>, Error> {
-		self.transaction(TransactionId::Location(num.into(), index.value()))
+	fn transaction_by_block_number_and_index(&self, num: BlockNumber, index: Index) -> BoxFuture<Option<Transaction>> {
+		let block_id = match num {
+			BlockNumber::Latest => PendingOrBlock::Block(BlockId::Latest),
+			BlockNumber::Earliest => PendingOrBlock::Block(BlockId::Earliest),
+			BlockNumber::Num(num) => PendingOrBlock::Block(BlockId::Number(num)),
+			BlockNumber::Pending => PendingOrBlock::Pending,
+		};
+
+		let transaction_id = PendingTransactionId::Location(block_id, index.value());
+		Box::new(future::done(self.transaction(transaction_id)))
 	}
 
-	fn transaction_receipt(&self, hash: RpcH256) -> Result<Option<Receipt>, Error> {
+	fn transaction_receipt(&self, hash: RpcH256) -> BoxFuture<Option<Receipt>> {
 		let best_block = self.client.chain_info().best_block_number;
 		let hash: H256 = hash.into();
+
 		match (self.miner.pending_receipt(best_block, &hash), self.options.allow_pending_receipt_query) {
-			(Some(receipt), true) => Ok(Some(receipt.into())),
+			(Some(receipt), true) => Box::new(future::ok(Some(receipt.into()))),
 			_ => {
 				let receipt = self.client.transaction_receipt(TransactionId::Hash(hash));
-				Ok(receipt.map(Into::into))
+				Box::new(future::ok(receipt.map(Into::into)))
 			}
 		}
 	}
 
-	fn uncle_by_block_hash_and_index(&self, hash: RpcH256, index: Index) -> Result<Option<RichBlock>, Error> {
-		self.uncle(UncleId { block: BlockId::Hash(hash.into()), position: index.value() })
+	fn uncle_by_block_hash_and_index(&self, hash: RpcH256, index: Index) -> BoxFuture<Option<RichBlock>> {
+		Box::new(future::done(self.uncle(PendingUncleId {
+			id: PendingOrBlock::Block(BlockId::Hash(hash.into())),
+			position: index.value()
+		})))
 	}
 
-	fn uncle_by_block_number_and_index(&self, num: BlockNumber, index: Index) -> Result<Option<RichBlock>, Error> {
-		self.uncle(UncleId { block: num.into(), position: index.value() })
+	fn uncle_by_block_number_and_index(&self, num: BlockNumber, index: Index) -> BoxFuture<Option<RichBlock>> {
+		let id = match num {
+			BlockNumber::Latest => PendingUncleId { id: PendingOrBlock::Block(BlockId::Latest), position: index.value() },
+			BlockNumber::Earliest => PendingUncleId { id: PendingOrBlock::Block(BlockId::Earliest), position: index.value() },
+			BlockNumber::Num(num) => PendingUncleId { id: PendingOrBlock::Block(BlockId::Number(num)), position: index.value() },
+
+			BlockNumber::Pending => PendingUncleId { id: PendingOrBlock::Pending, position: index.value() },
+		};
+
+		Box::new(future::done(self.uncle(id)))
 	}
 
-	fn compilers(&self) -> Result<Vec<String>, Error> {
+	fn compilers(&self) -> Result<Vec<String>> {
 		Err(errors::deprecated("Compilation functionality is deprecated.".to_string()))
 	}
 
-	fn logs(&self, filter: Filter) -> BoxFuture<Vec<Log>, Error> {
+	fn logs(&self, filter: Filter) -> BoxFuture<Vec<Log>> {
 		let include_pending = filter.to_block == Some(BlockNumber::Pending);
 		let filter: EthcoreFilter = filter.into();
 		let mut logs = self.client.logs(filter.clone())
@@ -520,10 +732,10 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
 
 		let logs = limit_logs(logs, filter.limit);
 
-		future::ok(logs).boxed()
+		Box::new(future::ok(logs))
 	}
 
-	fn work(&self, no_new_work_timeout: Trailing<u64>) -> Result<Work, Error> {
+	fn work(&self, no_new_work_timeout: Trailing<u64>) -> Result<Work> {
 		if !self.miner.can_produce_work_package() {
 			warn!(target: "miner", "Cannot give work package - engine seals internally.");
 			return Err(errors::no_work_required())
@@ -554,9 +766,10 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
 		self.miner.map_sealing_work(&*self.client, |b| {
 			let pow_hash = b.hash();
 			let target = Ethash::difficulty_to_boundary(b.block().header().difficulty());
-			let seed_hash = self.seed_compute.lock().get_seedhash(b.block().header().number());
+			let seed_hash = self.seed_compute.lock().hash_block_number(b.block().header().number());
 
-			if no_new_work_timeout > 0 && b.block().header().timestamp() + no_new_work_timeout < get_time().sec as u64 {
+			let now = SystemTime::now().duration_since(UNIX_EPOCH).unwrap_or_default().as_secs();
+			if no_new_work_timeout > 0 && b.block().header().timestamp() + no_new_work_timeout < now {
 				Err(errors::no_new_work())
 			} else if self.options.send_block_number_in_get_work {
 				let block_number = b.block().header().number();
@@ -577,7 +790,7 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
 		}).unwrap_or(Err(errors::internal("No work found.", "")))
 	}
 
-	fn submit_work(&self, nonce: RpcH64, pow_hash: RpcH256, mix_hash: RpcH256) -> Result<bool, Error> {
+	fn submit_work(&self, nonce: RpcH64, pow_hash: RpcH256, mix_hash: RpcH256) -> Result<bool> {
 		if !self.miner.can_produce_work_package() {
 			warn!(target: "miner", "Cannot submit work - engine seals internally.");
 			return Err(errors::no_work_required())
@@ -592,63 +805,103 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
 		Ok(self.miner.submit_seal(&*self.client, pow_hash, seal).is_ok())
 	}
 
-	fn submit_hashrate(&self, rate: RpcU256, id: RpcH256) -> Result<bool, Error> {
+	fn submit_hashrate(&self, rate: RpcU256, id: RpcH256) -> Result<bool> {
 		self.external_miner.submit_hashrate(rate.into(), id.into());
 		Ok(true)
 	}
 
-	fn send_raw_transaction(&self, raw: Bytes) -> Result<RpcH256, Error> {
+	fn send_raw_transaction(&self, raw: Bytes) -> Result<RpcH256> {
 		UntrustedRlp::new(&raw.into_vec()).as_val()
 			.map_err(errors::rlp)
 			.and_then(|tx| SignedTransaction::new(tx).map_err(errors::transaction))
 			.and_then(|signed_transaction| {
-				FullDispatcher::new(self.client.clone(), self.miner.clone())
-					.dispatch_transaction(signed_transaction.into())
+				FullDispatcher::dispatch_transaction(
+					&*self.client,
+					&*self.miner,
+					signed_transaction.into(),
+				)
 			})
 			.map(Into::into)
 	}
 
-	fn submit_transaction(&self, raw: Bytes) -> Result<RpcH256, Error> {
+	fn submit_transaction(&self, raw: Bytes) -> Result<RpcH256> {
 		self.send_raw_transaction(raw)
 	}
 
-	fn call(&self, meta: Self::Metadata, request: CallRequest, num: Trailing<BlockNumber>) -> BoxFuture<Bytes, Error> {
+	fn call(&self, meta: Self::Metadata, request: CallRequest, num: Trailing<BlockNumber>) -> BoxFuture<Bytes> {
 		let request = CallRequest::into(request);
-		let signed = match fake_sign::sign_call(&self.client, &self.miner, request, meta.is_dapp()) {
-			Ok(signed) => signed,
-			Err(e) => return future::err(e).boxed(),
-		};
+		let signed = try_bf!(fake_sign::sign_call(request, meta.is_dapp()));
 
 		let num = num.unwrap_or_default();
-		let result = self.client.call(&signed, Default::default(), num.into());
 
-		future::done(result
+		let (mut state, header) = if num == BlockNumber::Pending {
+			let info = self.client.chain_info();
+			let state = try_bf!(self.miner.pending_state(info.best_block_number).ok_or(errors::state_pruned()));
+			let header = try_bf!(self.miner.pending_block_header(info.best_block_number).ok_or(errors::state_pruned()));
+
+			(state, header)
+		} else {
+			let id = match num {
+				BlockNumber::Num(num) => BlockId::Number(num),
+				BlockNumber::Earliest => BlockId::Earliest,
+				BlockNumber::Latest => BlockId::Latest,
+				BlockNumber::Pending => unreachable!(), // Already covered
+			};
+
+			let state = try_bf!(self.client.state_at(id).ok_or(errors::state_pruned()));
+			let header = try_bf!(self.client.block_header(id).ok_or(errors::state_pruned()));
+
+			(state, header.decode())
+		};
+
+		let result = self.client.call(&signed, Default::default(), &mut state, &header);
+
+		Box::new(future::done(result
 			.map(|b| b.output.into())
 			.map_err(errors::call)
-		).boxed()
+		))
 	}
 
-	fn estimate_gas(&self, meta: Self::Metadata, request: CallRequest, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256, Error> {
+	fn estimate_gas(&self, meta: Self::Metadata, request: CallRequest, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256> {
 		let request = CallRequest::into(request);
-		let signed = match fake_sign::sign_call(&self.client, &self.miner, request, meta.is_dapp()) {
-			Ok(signed) => signed,
-			Err(e) => return future::err(e).boxed(),
+		let signed = try_bf!(fake_sign::sign_call(request, meta.is_dapp()));
+		let num = num.unwrap_or_default();
+
+		let (state, header) = if num == BlockNumber::Pending {
+			let info = self.client.chain_info();
+			let state = try_bf!(self.miner.pending_state(info.best_block_number).ok_or(errors::state_pruned()));
+			let header = try_bf!(self.miner.pending_block_header(info.best_block_number).ok_or(errors::state_pruned()));
+
+			(state, header)
+		} else {
+			let id = match num {
+				BlockNumber::Num(num) => BlockId::Number(num),
+				BlockNumber::Earliest => BlockId::Earliest,
+				BlockNumber::Latest => BlockId::Latest,
+				BlockNumber::Pending => unreachable!(), // Already covered
+			};
+
+			let state = try_bf!(self.client.state_at(id).ok_or(errors::state_pruned()));
+			let header = try_bf!(self.client.block_header(id).ok_or(errors::state_pruned()));
+
+			(state, header.decode())
 		};
-		future::done(self.client.estimate_gas(&signed, num.unwrap_or_default().into())
+
+		Box::new(future::done(self.client.estimate_gas(&signed, &state, &header)
 			.map(Into::into)
 			.map_err(errors::call)
-		).boxed()
+		))
 	}
 
-	fn compile_lll(&self, _: String) -> Result<Bytes, Error> {
+	fn compile_lll(&self, _: String) -> Result<Bytes> {
 		Err(errors::deprecated("Compilation of LLL via RPC is deprecated".to_string()))
 	}
 
-	fn compile_serpent(&self, _: String) -> Result<Bytes, Error> {
+	fn compile_serpent(&self, _: String) -> Result<Bytes> {
 		Err(errors::deprecated("Compilation of Serpent via RPC is deprecated".to_string()))
 	}
 
-	fn compile_solidity(&self, _: String) -> Result<Bytes, Error> {
+	fn compile_solidity(&self, _: String) -> Result<Bytes> {
 		Err(errors::deprecated("Compilation of Solidity via RPC is deprecated".to_string()))
 	}
 }
diff --git a/rpc/src/v1/impls/eth_filter.rs b/rpc/src/v1/impls/eth_filter.rs
index 8f448feb5f25d20cc0c7ced7234459e83274511c..0ff9f4c20f42a38c69b7adf32ab133f94d0d39a0 100644
--- a/rpc/src/v1/impls/eth_filter.rs
+++ b/rpc/src/v1/impls/eth_filter.rs
@@ -19,14 +19,15 @@
 use std::sync::Arc;
 use std::collections::HashSet;
 
-use jsonrpc_core::*;
 use ethcore::miner::MinerService;
 use ethcore::filter::Filter as EthcoreFilter;
 use ethcore::client::{BlockChainClient, BlockId};
-use util::{H256, Mutex};
-
-use futures::{future, Future, BoxFuture};
+use ethereum_types::H256;
+use parking_lot::Mutex;
 
+use jsonrpc_core::{BoxFuture, Result};
+use jsonrpc_core::futures::{future, Future};
+use jsonrpc_core::futures::future::Either;
 use v1::traits::EthFilter;
 use v1::types::{BlockNumber, Index, Filter, FilterChanges, Log, H256 as RpcH256, U256 as RpcU256};
 use v1::helpers::{PollFilter, PollManager, limit_logs};
@@ -44,7 +45,7 @@ pub trait Filterable {
 	fn pending_transactions_hashes(&self, block_number: u64) -> Vec<H256>;
 
 	/// Get logs that match the given filter.
-	fn logs(&self, filter: EthcoreFilter) -> BoxFuture<Vec<Log>, Error>;
+	fn logs(&self, filter: EthcoreFilter) -> BoxFuture<Vec<Log>>;
 
 	/// Get logs from the pending block.
 	fn pending_logs(&self, block_number: u64, filter: &EthcoreFilter) -> Vec<Log>;
@@ -87,8 +88,8 @@ impl<C, M> Filterable for EthFilterClient<C, M> where C: BlockChainClient, M: Mi
 		self.miner.pending_transactions_hashes(best)
 	}
 
-	fn logs(&self, filter: EthcoreFilter) -> BoxFuture<Vec<Log>, Error> {
-		future::ok(self.client.logs(filter).into_iter().map(Into::into).collect()).boxed()
+	fn logs(&self, filter: EthcoreFilter) -> BoxFuture<Vec<Log>> {
+		Box::new(future::ok(self.client.logs(filter).into_iter().map(Into::into).collect()))
 	}
 
 	fn pending_logs(&self, block_number: u64, filter: &EthcoreFilter) -> Vec<Log> {
@@ -101,20 +102,21 @@ impl<C, M> Filterable for EthFilterClient<C, M> where C: BlockChainClient, M: Mi
 
 
 impl<T: Filterable + Send + Sync + 'static> EthFilter for T {
-	fn new_filter(&self, filter: Filter) -> Result<RpcU256, Error> {
+	fn new_filter(&self, filter: Filter) -> Result<RpcU256> {
 		let mut polls = self.polls().lock();
 		let block_number = self.best_block_number();
 		let id = polls.create_poll(PollFilter::Logs(block_number, Default::default(), filter));
 		Ok(id.into())
 	}
 
-	fn new_block_filter(&self) -> Result<RpcU256, Error> {
+	fn new_block_filter(&self) -> Result<RpcU256> {
 		let mut polls = self.polls().lock();
-		let id = polls.create_poll(PollFilter::Block(self.best_block_number()));
+		// +1, since we don't want to include the current block
+		let id = polls.create_poll(PollFilter::Block(self.best_block_number() + 1));
 		Ok(id.into())
 	}
 
-	fn new_pending_transaction_filter(&self) -> Result<RpcU256, Error> {
+	fn new_pending_transaction_filter(&self) -> Result<RpcU256> {
 		let mut polls = self.polls().lock();
 		let best_block = self.best_block_number();
 		let pending_transactions = self.pending_transactions_hashes(best_block);
@@ -122,13 +124,13 @@ impl<T: Filterable + Send + Sync + 'static> EthFilter for T {
 		Ok(id.into())
 	}
 
-	fn filter_changes(&self, index: Index) -> BoxFuture<FilterChanges, Error> {
+	fn filter_changes(&self, index: Index) -> BoxFuture<FilterChanges> {
 		let mut polls = self.polls().lock();
-		match polls.poll_mut(&index.value()) {
-			None => future::ok(FilterChanges::Empty).boxed(),
+		Box::new(match polls.poll_mut(&index.value()) {
+			None => Either::A(future::ok(FilterChanges::Empty)),
 			Some(filter) => match *filter {
 				PollFilter::Block(ref mut block_number) => {
-					// + 1, cause we want to return hashes including current block hash.
+					// +1, cause we want to return hashes including current block hash.
 					let current_number = self.best_block_number() + 1;
 					let hashes = (*block_number..current_number).into_iter()
 						.map(BlockId::Number)
@@ -137,7 +139,7 @@ impl<T: Filterable + Send + Sync + 'static> EthFilter for T {
 
 					*block_number = current_number;
 
-					future::ok(FilterChanges::Hashes(hashes)).boxed()
+					Either::A(future::ok(FilterChanges::Hashes(hashes)))
 				},
 				PollFilter::PendingTransaction(ref mut previous_hashes) => {
 					// get hashes of pending transactions
@@ -161,7 +163,7 @@ impl<T: Filterable + Send + Sync + 'static> EthFilter for T {
 					*previous_hashes = current_hashes;
 
 					// return new hashes
-					future::ok(FilterChanges::Hashes(new_hashes)).boxed()
+					Either::A(future::ok(FilterChanges::Hashes(new_hashes)))
 				},
 				PollFilter::Logs(ref mut block_number, ref mut previous_logs, ref filter) => {
 					// retrive the current block number
@@ -199,44 +201,47 @@ impl<T: Filterable + Send + Sync + 'static> EthFilter for T {
 
 					// retrieve logs in range from_block..min(BlockId::Latest..to_block)
 					let limit = filter.limit;
-					self.logs(filter)
+					Either::B(self.logs(filter)
 						.map(move |mut logs| { logs.extend(pending); logs }) // append fetched pending logs
 						.map(move |logs| limit_logs(logs, limit)) // limit the logs
-						.map(FilterChanges::Logs)
-						.boxed()
+						.map(FilterChanges::Logs))
 				}
 			}
-		}
+		})
 	}
 
-	fn filter_logs(&self, index: Index) -> BoxFuture<Vec<Log>, Error> {
-		let mut polls = self.polls().lock();
-		match polls.poll(&index.value()) {
-			Some(&PollFilter::Logs(ref _block_number, ref _previous_log, ref filter)) => {
-				let include_pending = filter.to_block == Some(BlockNumber::Pending);
-				let filter: EthcoreFilter = filter.clone().into();
+	fn filter_logs(&self, index: Index) -> BoxFuture<Vec<Log>> {
+		let filter = {
+			let mut polls = self.polls().lock();
 
-				// fetch pending logs.
-				let pending = if include_pending {
-					let best_block = self.best_block_number();
-					self.pending_logs(best_block, &filter)
-				} else {
-					Vec::new()
-				};
-
-				// retrieve logs asynchronously, appending pending logs.
-				let limit = filter.limit;
-				self.logs(filter)
-					.map(move |mut logs| { logs.extend(pending); logs })
-					.map(move |logs| limit_logs(logs, limit))
-					.boxed()
-			},
-			// just empty array
-			_ => future::ok(Vec::new()).boxed()
-		}
+			match polls.poll(&index.value()) {
+				Some(&PollFilter::Logs(ref _block_number, ref _previous_log, ref filter)) => filter.clone(),
+				// just empty array
+				_ => return Box::new(future::ok(Vec::new())),
+			}
+		};
+
+		let include_pending = filter.to_block == Some(BlockNumber::Pending);
+		let filter: EthcoreFilter = filter.into();
+
+		// fetch pending logs.
+		let pending = if include_pending {
+			let best_block = self.best_block_number();
+			self.pending_logs(best_block, &filter)
+		} else {
+			Vec::new()
+		};
+
+		// retrieve logs asynchronously, appending pending logs.
+		let limit = filter.limit;
+		let logs = self.logs(filter);
+		Box::new(logs
+			.map(move |mut logs| { logs.extend(pending); logs })
+			.map(move |logs| limit_logs(logs, limit))
+		)
 	}
 
-	fn uninstall_filter(&self, index: Index) -> Result<bool, Error> {
+	fn uninstall_filter(&self, index: Index) -> Result<bool> {
 		self.polls().lock().remove_poll(&index.value());
 		Ok(true)
 	}
diff --git a/rpc/src/v1/impls/eth_pubsub.rs b/rpc/src/v1/impls/eth_pubsub.rs
index f918a44ea8e44759b55d18f82ce3a1128155f00c..315fc2f4f896da476e3f7c3e2a72734813a3fc22 100644
--- a/rpc/src/v1/impls/eth_pubsub.rs
+++ b/rpc/src/v1/impls/eth_pubsub.rs
@@ -16,11 +16,11 @@
 
 //! Eth PUB-SUB rpc implementation.
 
-use std::sync::Arc;
+use std::sync::{Arc, Weak};
 use std::collections::BTreeMap;
 
-use futures::{self, future, BoxFuture, Future};
-use jsonrpc_core::Error;
+use jsonrpc_core::{BoxFuture, Result, Error};
+use jsonrpc_core::futures::{self, Future, IntoFuture};
 use jsonrpc_macros::Trailing;
 use jsonrpc_macros::pubsub::{Sink, Subscriber};
 use jsonrpc_pubsub::SubscriptionId;
@@ -39,7 +39,9 @@ use light::cache::Cache;
 use light::on_demand::OnDemand;
 use light::client::{LightChainClient, LightChainNotify};
 use parity_reactor::Remote;
-use util::{RwLock, Mutex, H256, Bytes};
+use ethereum_types::H256;
+use bytes::Bytes;
+use parking_lot::{RwLock, Mutex};
 
 type Client = Sink<pubsub::Result>;
 
@@ -48,6 +50,7 @@ pub struct EthPubSubClient<C> {
 	handler: Arc<ChainNotificationHandler<C>>,
 	heads_subscribers: Arc<RwLock<Subscribers<Client>>>,
 	logs_subscribers: Arc<RwLock<Subscribers<(Client, EthFilter)>>>,
+	transactions_subscribers: Arc<RwLock<Subscribers<Client>>>,
 }
 
 impl<C> EthPubSubClient<C> {
@@ -55,15 +58,19 @@ impl<C> EthPubSubClient<C> {
 	pub fn new(client: Arc<C>, remote: Remote) -> Self {
 		let heads_subscribers = Arc::new(RwLock::new(Subscribers::default()));
 		let logs_subscribers = Arc::new(RwLock::new(Subscribers::default()));
+		let transactions_subscribers = Arc::new(RwLock::new(Subscribers::default()));
+
 		EthPubSubClient {
 			handler: Arc::new(ChainNotificationHandler {
 				client,
 				remote,
 				heads_subscribers: heads_subscribers.clone(),
 				logs_subscribers: logs_subscribers.clone(),
+				transactions_subscribers: transactions_subscribers.clone(),
 			}),
 			heads_subscribers,
 			logs_subscribers,
+			transactions_subscribers,
 		}
 	}
 
@@ -73,12 +80,13 @@ impl<C> EthPubSubClient<C> {
 		let client = Self::new(client, remote);
 		*client.heads_subscribers.write() = Subscribers::new_test();
 		*client.logs_subscribers.write() = Subscribers::new_test();
+		*client.transactions_subscribers.write() = Subscribers::new_test();
 		client
 	}
 
 	/// Returns a chain notification handler.
-	pub fn handler(&self) -> Arc<ChainNotificationHandler<C>> {
-		self.handler.clone()
+	pub fn handler(&self) -> Weak<ChainNotificationHandler<C>> {
+		Arc::downgrade(&self.handler)
 	}
 }
 
@@ -90,12 +98,14 @@ impl EthPubSubClient<LightFetch> {
 		sync: Arc<LightSync>,
 		cache: Arc<Mutex<Cache>>,
 		remote: Remote,
+		gas_price_percentile: usize,
 	) -> Self {
 		let fetch = LightFetch {
 			client,
 			on_demand,
 			sync,
-			cache
+			cache,
+			gas_price_percentile,
 		};
 		EthPubSubClient::new(Arc::new(fetch), remote)
 	}
@@ -107,6 +117,7 @@ pub struct ChainNotificationHandler<C> {
 	remote: Remote,
 	heads_subscribers: Arc<RwLock<Subscribers<Client>>>,
 	logs_subscribers: Arc<RwLock<Subscribers<(Client, EthFilter)>>>,
+	transactions_subscribers: Arc<RwLock<Subscribers<Client>>>,
 }
 
 impl<C> ChainNotificationHandler<C> {
@@ -129,8 +140,10 @@ impl<C> ChainNotificationHandler<C> {
 		}
 	}
 
-	fn notify_logs<F>(&self, enacted: &[H256], logs: F) where
-		F: Fn(EthFilter) -> BoxFuture<Vec<Log>, Error>,
+	fn notify_logs<F, T>(&self, enacted: &[H256], logs: F) where
+		F: Fn(EthFilter) -> T,
+		T: IntoFuture<Item = Vec<Log>, Error = Error>,
+		T::Future: Send + 'static,
 	{
 		for &(ref subscriber, ref filter) in self.logs_subscribers.read().values() {
 			let logs = futures::future::join_all(enacted
@@ -139,7 +152,7 @@ impl<C> ChainNotificationHandler<C> {
 					let mut filter = filter.clone();
 					filter.from_block = BlockId::Hash(*hash);
 					filter.to_block = filter.from_block.clone();
-					logs(filter)
+					logs(filter).into_future()
 				})
 				.collect::<Vec<_>>()
 			);
@@ -149,15 +162,24 @@ impl<C> ChainNotificationHandler<C> {
 			self.remote.spawn(logs
 				.map(move |logs| {
 					let logs = logs.into_iter().flat_map(|log| log).collect();
-					let logs = limit_logs(logs, limit);
-					if !logs.is_empty() {
-						Self::notify(&remote, &subscriber, pubsub::Result::Logs(logs));
+
+					for log in limit_logs(logs, limit) {
+						Self::notify(&remote, &subscriber, pubsub::Result::Log(log))
 					}
 				})
 				.map_err(|e| warn!("Unable to fetch latest logs: {:?}", e))
 			);
 		}
 	}
+
+	/// Notify all subscribers about new transaction hashes.
+	pub fn new_transactions(&self, hashes: &[H256]) {
+		for subscriber in self.transactions_subscribers.read().values() {
+			for hash in hashes {
+				Self::notify(&self.remote, subscriber, pubsub::Result::TransactionHash((*hash).into()));
+			}
+		}
+	}
 }
 
 /// A light client wrapper struct.
@@ -166,7 +188,7 @@ pub trait LightClient: Send + Sync {
 	fn block_header(&self, id: BlockId) -> Option<encoded::Header>;
 
 	/// Fetch logs.
-	fn logs(&self, filter: EthFilter) -> BoxFuture<Vec<Log>, Error>;
+	fn logs(&self, filter: EthFilter) -> BoxFuture<Vec<Log>>;
 }
 
 impl LightClient for LightFetch {
@@ -174,7 +196,7 @@ impl LightClient for LightFetch {
 		self.client.block_header(id)
 	}
 
-	fn logs(&self, filter: EthFilter) -> BoxFuture<Vec<Log>, Error> {
+	fn logs(&self, filter: EthFilter) -> BoxFuture<Vec<Log>> {
 		LightFetch::logs(self, filter)
 	}
 }
@@ -222,15 +244,15 @@ impl<C: BlockChainClient> ChainNotify for ChainNotificationHandler<C> {
 
 		// Enacted logs
 		self.notify_logs(&enacted, |filter| {
-			future::ok(self.client.logs(filter).into_iter().map(Into::into).collect()).boxed()
+			Ok(self.client.logs(filter).into_iter().map(Into::into).collect())
 		});
 
 		// Retracted logs
 		self.notify_logs(&retracted, |filter| {
-			future::ok(self.client.logs(filter).into_iter().map(Into::into).map(|mut log: Log| {
+			Ok(self.client.logs(filter).into_iter().map(Into::into).map(|mut log: Log| {
 				log.log_type = "removed".into();
 				log
-			}).collect()).boxed()
+			}).collect())
 		});
 	}
 }
@@ -250,16 +272,23 @@ impl<C: Send + Sync + 'static> EthPubSub for EthPubSubClient<C> {
 				self.heads_subscribers.write().push(subscriber);
 				return;
 			},
+			(pubsub::Kind::NewHeads, _) => {
+				errors::invalid_params("newHeads", "Expected no parameters.")
+			},
 			(pubsub::Kind::Logs, Some(pubsub::Params::Logs(filter))) => {
 				self.logs_subscribers.write().push(subscriber, filter.into());
 				return;
 			},
-			(pubsub::Kind::NewHeads, _) => {
-				errors::invalid_params("newHeads", "Expected no parameters.")
-			},
 			(pubsub::Kind::Logs, _) => {
 				errors::invalid_params("logs", "Expected a filter object.")
 			},
+			(pubsub::Kind::NewPendingTransactions, None) => {
+				self.transactions_subscribers.write().push(subscriber);
+				return;
+			},
+			(pubsub::Kind::NewPendingTransactions, _) => {
+				errors::invalid_params("newPendingTransactions", "Expected no parameters.")
+			},
 			_ => {
 				errors::unimplemented(None)
 			},
@@ -268,10 +297,11 @@ impl<C: Send + Sync + 'static> EthPubSub for EthPubSubClient<C> {
 		let _ = subscriber.reject(error);
 	}
 
-	fn unsubscribe(&self, id: SubscriptionId) -> BoxFuture<bool, Error> {
+	fn unsubscribe(&self, id: SubscriptionId) -> Result<bool> {
 		let res = self.heads_subscribers.write().remove(&id).is_some();
 		let res2 = self.logs_subscribers.write().remove(&id).is_some();
+		let res3 = self.transactions_subscribers.write().remove(&id).is_some();
 
-		future::ok(res || res2).boxed()
+		Ok(res || res2 || res3)
 	}
 }
diff --git a/rpc/src/v1/impls/light/eth.rs b/rpc/src/v1/impls/light/eth.rs
index d33b5a06f7c7220565a76016bff23b87dd41fade..e29f088c87d343c81de87689e47f41e48a5dde39 100644
--- a/rpc/src/v1/impls/light/eth.rs
+++ b/rpc/src/v1/impls/light/eth.rs
@@ -16,39 +16,33 @@
 
 //! Eth RPC interface for the light client.
 
-// TODO: remove when complete.
-#![allow(unused_imports, unused_variables)]
-
 use std::sync::Arc;
 
-use jsonrpc_core::Error;
+use jsonrpc_core::{Result, BoxFuture};
+use jsonrpc_core::futures::{future, Future};
+use jsonrpc_core::futures::future::Either;
 use jsonrpc_macros::Trailing;
 
 use light::cache::Cache as LightDataCache;
-use light::client::{Client as LightClient, LightChainClient};
+use light::client::LightChainClient;
 use light::{cht, TransactionQueue};
 use light::on_demand::{request, OnDemand};
 
 use ethcore::account_provider::{AccountProvider, DappId};
-use ethcore::basic_account::BasicAccount;
 use ethcore::encoded;
-use ethcore::executed::{Executed, ExecutionError};
-use ethcore::ids::BlockId;
 use ethcore::filter::Filter as EthcoreFilter;
-use ethcore::transaction::{Action, SignedTransaction, Transaction as EthTransaction};
+use ethcore::ids::BlockId;
 use ethsync::LightSync;
+use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP};
+use ethereum_types::U256;
+use parking_lot::{RwLock, Mutex};
 use rlp::UntrustedRlp;
-use util::sha3::{SHA3_NULL_RLP, SHA3_EMPTY_LIST_RLP};
-use util::{RwLock, Mutex, U256};
-
-use futures::{future, Future, BoxFuture, IntoFuture};
-use futures::sync::oneshot;
+use transaction::SignedTransaction;
 
 use v1::impls::eth_filter::Filterable;
-use v1::helpers::{CallRequest as CRequest, errors, limit_logs, dispatch};
+use v1::helpers::{errors, limit_logs};
 use v1::helpers::{PollFilter, PollManager};
-use v1::helpers::block_import::is_major_importing;
-use v1::helpers::light_fetch::LightFetch;
+use v1::helpers::light_fetch::{self, LightFetch};
 use v1::traits::Eth;
 use v1::types::{
 	RichBlock, Block, BlockTransactions, BlockNumber, Bytes, SyncStatus, SyncInfo,
@@ -57,22 +51,38 @@ use v1::types::{
 };
 use v1::metadata::Metadata;
 
-use util::Address;
-
 const NO_INVALID_BACK_REFS: &'static str = "Fails only on invalid back-references; back-references here known to be valid; qed";
 
 /// Light client `ETH` (and filter) RPC.
-pub struct EthClient {
+pub struct EthClient<T> {
 	sync: Arc<LightSync>,
-	client: Arc<LightClient>,
+	client: Arc<T>,
 	on_demand: Arc<OnDemand>,
 	transaction_queue: Arc<RwLock<TransactionQueue>>,
 	accounts: Arc<AccountProvider>,
 	cache: Arc<Mutex<LightDataCache>>,
 	polls: Mutex<PollManager<PollFilter>>,
+	gas_price_percentile: usize,
+}
+
+impl<T> EthClient<T> {
+	fn num_to_id(num: BlockNumber) -> BlockId {
+		// Note: Here we treat `Pending` as `Latest`.
+		//       Since light clients don't produce pending blocks
+		//       (they don't have state) we can safely fallback to `Latest`.
+		match num {
+			BlockNumber::Num(n) => BlockId::Number(n),
+			BlockNumber::Earliest => BlockId::Earliest,
+			BlockNumber::Latest => BlockId::Latest,
+			BlockNumber::Pending => {
+				warn!("`Pending` is deprecated and may be removed in future versions. Falling back to `Latest`");
+				BlockId::Latest
+			}
+		}
+	}
 }
 
-impl Clone for EthClient {
+impl<T> Clone for EthClient<T> {
 	fn clone(&self) -> Self {
 		// each instance should have its own poll manager.
 		EthClient {
@@ -83,30 +93,32 @@ impl Clone for EthClient {
 			accounts: self.accounts.clone(),
 			cache: self.cache.clone(),
 			polls: Mutex::new(PollManager::new()),
+			gas_price_percentile: self.gas_price_percentile,
 		}
 	}
 }
 
-
-impl EthClient {
+impl<T: LightChainClient + 'static> EthClient<T> {
 	/// Create a new `EthClient` with a handle to the light sync instance, client,
 	/// and on-demand request service, which is assumed to be attached as a handler.
 	pub fn new(
 		sync: Arc<LightSync>,
-		client: Arc<LightClient>,
+		client: Arc<T>,
 		on_demand: Arc<OnDemand>,
 		transaction_queue: Arc<RwLock<TransactionQueue>>,
 		accounts: Arc<AccountProvider>,
 		cache: Arc<Mutex<LightDataCache>>,
+		gas_price_percentile: usize,
 	) -> Self {
 		EthClient {
-			sync: sync,
-			client: client,
-			on_demand: on_demand,
-			transaction_queue: transaction_queue,
-			accounts: accounts,
-			cache: cache,
+			sync,
+			client,
+			on_demand,
+			transaction_queue,
+			accounts,
+			cache,
 			polls: Mutex::new(PollManager::new()),
+			gas_price_percentile,
 		}
 	}
 
@@ -117,11 +129,12 @@ impl EthClient {
 			on_demand: self.on_demand.clone(),
 			sync: self.sync.clone(),
 			cache: self.cache.clone(),
+			gas_price_percentile: self.gas_price_percentile,
 		}
 	}
 
 	// get a "rich" block structure. Fails on unknown block.
-	fn rich_block(&self, id: BlockId, include_txs: bool) -> BoxFuture<RichBlock, Error> {
+	fn rich_block(&self, id: BlockId, include_txs: bool) -> BoxFuture<RichBlock> {
 		let (on_demand, sync) = (self.on_demand.clone(), self.sync.clone());
 		let (client, engine) = (self.client.clone(), self.client.engine().clone());
 		let eip86_transition = self.client.eip86_transition();
@@ -161,10 +174,10 @@ impl EthClient {
 		};
 
 		// get the block itself.
-		self.fetcher().block(id).and_then(move |block| {
+		Box::new(self.fetcher().block(id).and_then(move |block| {
 			// then fetch the total difficulty (this is much easier after getting the block).
 			match client.score(id) {
-				Some(score) => future::ok(fill_rich(block, Some(score))).boxed(),
+				Some(score) => Either::A(future::ok(fill_rich(block, Some(score)))),
 				None => {
 					// make a CHT request to fetch the chain score.
 					let req = cht::block_to_cht_number(block.number())
@@ -180,7 +193,7 @@ impl EthClient {
 								.expect("genesis always stored; qed")
 								.difficulty();
 
-							return future::ok(fill_rich(block, Some(score))).boxed()
+							return Either::A(future::ok(fill_rich(block, Some(score))))
 						}
 					};
 
@@ -190,7 +203,7 @@ impl EthClient {
 					//   - we get a score, and our hash is canonical.
 					let maybe_fut = sync.with_context(move |ctx| on_demand.request(ctx, req).expect(NO_INVALID_BACK_REFS));
 					match maybe_fut {
-						Some(fut) => fut
+						Some(fut) => Either::B(fut
 							.map(move |(hash, score)| {
 								let score = if hash == block.hash() {
 									Some(score)
@@ -198,24 +211,24 @@ impl EthClient {
 									None
 								};
 
-							fill_rich(block, score)
-							}).map_err(errors::on_demand_cancel).boxed(),
-						None => return future::err(errors::network_disabled()).boxed(),
+								fill_rich(block, score)
+							}).map_err(errors::on_demand_cancel)),
+						None => Either::A(future::err(errors::network_disabled())),
 					}
 				}
 			}
-		}).boxed()
+		}))
 	}
 }
 
-impl Eth for EthClient {
+impl<T: LightChainClient + 'static> Eth for EthClient<T> {
 	type Metadata = Metadata;
 
-	fn protocol_version(&self) -> Result<String, Error> {
+	fn protocol_version(&self) -> Result<String> {
 		Ok(format!("{}", ::light::net::MAX_PROTOCOL_VERSION))
 	}
 
-	fn syncing(&self) -> Result<SyncStatus, Error> {
+	fn syncing(&self) -> Result<SyncStatus> {
 		if self.sync.is_major_importing() {
 			let chain_info = self.client.chain_info();
 			let current_block = U256::from(chain_info.best_block_number);
@@ -234,132 +247,130 @@ impl Eth for EthClient {
 		}
 	}
 
-	fn author(&self, _meta: Self::Metadata) -> BoxFuture<RpcH160, Error> {
-		future::ok(Default::default()).boxed()
+	fn author(&self, _meta: Self::Metadata) -> Result<RpcH160> {
+		Ok(Default::default())
 	}
 
-	fn is_mining(&self) -> Result<bool, Error> {
+	fn is_mining(&self) -> Result<bool> {
 		Ok(false)
 	}
 
-	fn hashrate(&self) -> Result<RpcU256, Error> {
+	fn hashrate(&self) -> Result<RpcU256> {
 		Ok(Default::default())
 	}
 
-	fn gas_price(&self) -> Result<RpcU256, Error> {
+	fn gas_price(&self) -> Result<RpcU256> {
 		Ok(self.cache.lock().gas_price_corpus()
-			.and_then(|c| c.median().cloned())
+			.and_then(|c| c.percentile(self.gas_price_percentile).cloned())
 			.map(RpcU256::from)
 			.unwrap_or_else(Default::default))
 	}
 
-	fn accounts(&self, meta: Metadata) -> BoxFuture<Vec<RpcH160>, Error> {
+	fn accounts(&self, meta: Metadata) -> Result<Vec<RpcH160>> {
 		let dapp: DappId = meta.dapp_id().into();
 
-		let accounts = self.accounts
+		self.accounts
 			.note_dapp_used(dapp.clone())
 			.and_then(|_| self.accounts.dapp_addresses(dapp))
 			.map_err(|e| errors::account("Could not fetch accounts.", e))
-			.map(|accs| accs.into_iter().map(Into::<RpcH160>::into).collect());
-
-		future::done(accounts).boxed()
+			.map(|accs| accs.into_iter().map(Into::<RpcH160>::into).collect())
 	}
 
-	fn block_number(&self) -> Result<RpcU256, Error> {
+	fn block_number(&self) -> Result<RpcU256> {
 		Ok(self.client.chain_info().best_block_number.into())
 	}
 
-	fn balance(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256, Error> {
-		self.fetcher().account(address.into(), num.unwrap_or_default().into())
-			.map(|acc| acc.map_or(0.into(), |a| a.balance).into()).boxed()
+	fn balance(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256> {
+		Box::new(self.fetcher().account(address.into(), Self::num_to_id(num.unwrap_or_default()))
+			.map(|acc| acc.map_or(0.into(), |a| a.balance).into()))
 	}
 
-	fn storage_at(&self, _address: RpcH160, _key: RpcU256, _num: Trailing<BlockNumber>) -> BoxFuture<RpcH256, Error> {
-		future::err(errors::unimplemented(None)).boxed()
+	fn storage_at(&self, _address: RpcH160, _key: RpcU256, _num: Trailing<BlockNumber>) -> BoxFuture<RpcH256> {
+		Box::new(future::err(errors::unimplemented(None)))
 	}
 
-	fn block_by_hash(&self, hash: RpcH256, include_txs: bool) -> BoxFuture<Option<RichBlock>, Error> {
-		self.rich_block(BlockId::Hash(hash.into()), include_txs).map(Some).boxed()
+	fn block_by_hash(&self, hash: RpcH256, include_txs: bool) -> BoxFuture<Option<RichBlock>> {
+		Box::new(self.rich_block(BlockId::Hash(hash.into()), include_txs).map(Some))
 	}
 
-	fn block_by_number(&self, num: BlockNumber, include_txs: bool) -> BoxFuture<Option<RichBlock>, Error> {
-		self.rich_block(num.into(), include_txs).map(Some).boxed()
+	fn block_by_number(&self, num: BlockNumber, include_txs: bool) -> BoxFuture<Option<RichBlock>> {
+		Box::new(self.rich_block(Self::num_to_id(num), include_txs).map(Some))
 	}
 
-	fn transaction_count(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256, Error> {
-		self.fetcher().account(address.into(), num.unwrap_or_default().into())
-			.map(|acc| acc.map_or(0.into(), |a| a.nonce).into()).boxed()
+	fn transaction_count(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256> {
+		Box::new(self.fetcher().account(address.into(), Self::num_to_id(num.unwrap_or_default()))
+			.map(|acc| acc.map_or(0.into(), |a| a.nonce).into()))
 	}
 
-	fn block_transaction_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>, Error> {
+	fn block_transaction_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>> {
 		let (sync, on_demand) = (self.sync.clone(), self.on_demand.clone());
 
-		self.fetcher().header(BlockId::Hash(hash.into())).and_then(move |hdr| {
-			if hdr.transactions_root() == SHA3_NULL_RLP {
-				future::ok(Some(U256::from(0).into())).boxed()
+		Box::new(self.fetcher().header(BlockId::Hash(hash.into())).and_then(move |hdr| {
+			if hdr.transactions_root() == KECCAK_NULL_RLP {
+				Either::A(future::ok(Some(U256::from(0).into())))
 			} else {
 				sync.with_context(|ctx| on_demand.request(ctx, request::Body(hdr.into())))
 					.map(|x| x.expect(NO_INVALID_BACK_REFS))
 					.map(|x| x.map(|b| Some(U256::from(b.transactions_count()).into())))
-					.map(|x| x.map_err(errors::on_demand_cancel).boxed())
-					.unwrap_or_else(|| future::err(errors::network_disabled()).boxed())
+					.map(|x| Either::B(x.map_err(errors::on_demand_cancel)))
+					.unwrap_or_else(|| Either::A(future::err(errors::network_disabled())))
 			}
-		}).boxed()
+		}))
 	}
 
-	fn block_transaction_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>, Error> {
+	fn block_transaction_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>> {
 		let (sync, on_demand) = (self.sync.clone(), self.on_demand.clone());
 
-		self.fetcher().header(num.into()).and_then(move |hdr| {
-			if hdr.transactions_root() == SHA3_NULL_RLP {
-				future::ok(Some(U256::from(0).into())).boxed()
+		Box::new(self.fetcher().header(Self::num_to_id(num)).and_then(move |hdr| {
+			if hdr.transactions_root() == KECCAK_NULL_RLP {
+				Either::A(future::ok(Some(U256::from(0).into())))
 			} else {
 				sync.with_context(|ctx| on_demand.request(ctx, request::Body(hdr.into())))
 					.map(|x| x.expect(NO_INVALID_BACK_REFS))
 					.map(|x| x.map(|b| Some(U256::from(b.transactions_count()).into())))
-					.map(|x| x.map_err(errors::on_demand_cancel).boxed())
-					.unwrap_or_else(|| future::err(errors::network_disabled()).boxed())
+					.map(|x| Either::B(x.map_err(errors::on_demand_cancel)))
+					.unwrap_or_else(|| Either::A(future::err(errors::network_disabled())))
 			}
-		}).boxed()
+		}))
 	}
 
-	fn block_uncles_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>, Error> {
+	fn block_uncles_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>> {
 		let (sync, on_demand) = (self.sync.clone(), self.on_demand.clone());
 
-		self.fetcher().header(BlockId::Hash(hash.into())).and_then(move |hdr| {
-			if hdr.uncles_hash() == SHA3_EMPTY_LIST_RLP {
-				future::ok(Some(U256::from(0).into())).boxed()
+		Box::new(self.fetcher().header(BlockId::Hash(hash.into())).and_then(move |hdr| {
+			if hdr.uncles_hash() == KECCAK_EMPTY_LIST_RLP {
+				Either::A(future::ok(Some(U256::from(0).into())))
 			} else {
 				sync.with_context(|ctx| on_demand.request(ctx, request::Body(hdr.into())))
 					.map(|x| x.expect(NO_INVALID_BACK_REFS))
 					.map(|x| x.map(|b| Some(U256::from(b.uncles_count()).into())))
-					.map(|x| x.map_err(errors::on_demand_cancel).boxed())
-					.unwrap_or_else(|| future::err(errors::network_disabled()).boxed())
+					.map(|x| Either::B(x.map_err(errors::on_demand_cancel)))
+					.unwrap_or_else(|| Either::A(future::err(errors::network_disabled())))
 			}
-		}).boxed()
+		}))
 	}
 
-	fn block_uncles_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>, Error> {
+	fn block_uncles_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>> {
 		let (sync, on_demand) = (self.sync.clone(), self.on_demand.clone());
 
-		self.fetcher().header(num.into()).and_then(move |hdr| {
-			if hdr.uncles_hash() == SHA3_EMPTY_LIST_RLP {
-				future::ok(Some(U256::from(0).into())).boxed()
+		Box::new(self.fetcher().header(Self::num_to_id(num)).and_then(move |hdr| {
+			if hdr.uncles_hash() == KECCAK_EMPTY_LIST_RLP {
+				Either::B(future::ok(Some(U256::from(0).into())))
 			} else {
 				sync.with_context(|ctx| on_demand.request(ctx, request::Body(hdr.into())))
 					.map(|x| x.expect(NO_INVALID_BACK_REFS))
 					.map(|x| x.map(|b| Some(U256::from(b.uncles_count()).into())))
-					.map(|x| x.map_err(errors::on_demand_cancel).boxed())
-					.unwrap_or_else(|| future::err(errors::network_disabled()).boxed())
+					.map(|x| Either::A(x.map_err(errors::on_demand_cancel)))
+					.unwrap_or_else(|| Either::B(future::err(errors::network_disabled())))
 			}
-		}).boxed()
+		}))
 	}
 
-	fn code_at(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<Bytes, Error> {
-		future::err(errors::unimplemented(None)).boxed()
+	fn code_at(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<Bytes> {
+		Box::new(self.fetcher().code(address.into(), Self::num_to_id(num.unwrap_or_default())).map(Into::into))
 	}
 
-	fn send_raw_transaction(&self, raw: Bytes) -> Result<RpcH256, Error> {
+	fn send_raw_transaction(&self, raw: Bytes) -> Result<RpcH256> {
 		let best_header = self.client.best_block_header().decode();
 
 		UntrustedRlp::new(&raw.into_vec()).as_val()
@@ -373,110 +384,160 @@ impl Eth for EthClient {
 
 				self.transaction_queue.write().import(signed.into())
 					.map(|_| hash)
-					.map_err(Into::into)
 					.map_err(errors::transaction)
 			})
 			.map(Into::into)
 	}
 
-	fn submit_transaction(&self, raw: Bytes) -> Result<RpcH256, Error> {
+	fn submit_transaction(&self, raw: Bytes) -> Result<RpcH256> {
 		self.send_raw_transaction(raw)
 	}
 
-	fn call(&self, _meta: Self::Metadata, req: CallRequest, num: Trailing<BlockNumber>) -> BoxFuture<Bytes, Error> {
-		self.fetcher().proved_execution(req, num).and_then(|res| {
+	fn call(&self, _meta: Self::Metadata, req: CallRequest, num: Trailing<BlockNumber>) -> BoxFuture<Bytes> {
+		Box::new(self.fetcher().proved_execution(req, num).and_then(|res| {
 			match res {
 				Ok(exec) => Ok(exec.output.into()),
 				Err(e) => Err(errors::execution(e)),
 			}
-		}).boxed()
+		}))
 	}
 
-	fn estimate_gas(&self, _meta: Self::Metadata, req: CallRequest, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256, Error> {
+	fn estimate_gas(&self, _meta: Self::Metadata, req: CallRequest, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256> {
 		// TODO: binary chop for more accurate estimates.
-		self.fetcher().proved_execution(req, num).and_then(|res| {
+		Box::new(self.fetcher().proved_execution(req, num).and_then(|res| {
 			match res {
 				Ok(exec) => Ok((exec.refunded + exec.gas_used).into()),
 				Err(e) => Err(errors::execution(e)),
 			}
-		}).boxed()
+		}))
 	}
 
-	fn transaction_by_hash(&self, hash: RpcH256) -> Result<Option<Transaction>, Error> {
-		Err(errors::unimplemented(None))
-	}
+	fn transaction_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<Transaction>> {
+		let hash = hash.into();
+		let eip86 = self.client.eip86_transition();
 
-	fn transaction_by_block_hash_and_index(&self, hash: RpcH256, idx: Index) -> Result<Option<Transaction>, Error> {
-		Err(errors::unimplemented(None))
-	}
-
-	fn transaction_by_block_number_and_index(&self, num: BlockNumber, idx: Index) -> Result<Option<Transaction>, Error> {
-		Err(errors::unimplemented(None))
-	}
+		{
+			let tx_queue = self.transaction_queue.read();
+			if let Some(tx) = tx_queue.get(&hash) {
+				return Box::new(future::ok(Some(Transaction::from_pending(
+					tx.clone(),
+					self.client.chain_info().best_block_number,
+					eip86,
+				))));
+			}
+		}
 
-	fn transaction_receipt(&self, hash: RpcH256) -> Result<Option<Receipt>, Error> {
-		Err(errors::unimplemented(None))
+		Box::new(self.fetcher().transaction_by_hash(hash, eip86).map(|x| x.map(|(tx, _)| tx)))
+	}
+
+	fn transaction_by_block_hash_and_index(&self, hash: RpcH256, idx: Index) -> BoxFuture<Option<Transaction>> {
+		let eip86 = self.client.eip86_transition();
+		Box::new(self.fetcher().block(BlockId::Hash(hash.into())).map(move |block| {
+			light_fetch::extract_transaction_at_index(block, idx.value(), eip86)
+		}))
+	}
+
+	fn transaction_by_block_number_and_index(&self, num: BlockNumber, idx: Index) -> BoxFuture<Option<Transaction>> {
+		let eip86 = self.client.eip86_transition();
+		Box::new(self.fetcher().block(Self::num_to_id(num)).map(move |block| {
+			light_fetch::extract_transaction_at_index(block, idx.value(), eip86)
+		}))
+	}
+
+	fn transaction_receipt(&self, hash: RpcH256) -> BoxFuture<Option<Receipt>> {
+		let eip86 = self.client.eip86_transition();
+		let fetcher = self.fetcher();
+		Box::new(fetcher.transaction_by_hash(hash.clone().into(), eip86).and_then(move |tx| {
+			// the block hash included in the transaction object here has
+			// already been checked for canonicality and whether it contains
+			// the transaction.
+			match tx {
+				Some((tx, index)) => match tx.block_hash.clone() {
+					Some(block_hash) => {
+						let extract_receipt = fetcher.receipts(BlockId::Hash(block_hash.clone().into()))
+							.and_then(move |mut receipts| future::ok(receipts.swap_remove(index)))
+							.map(Receipt::from)
+							.map(move |mut receipt| {
+								receipt.transaction_hash = Some(hash);
+								receipt.transaction_index = Some(index.into());
+								receipt.block_hash = Some(block_hash);
+								receipt.block_number = tx.block_number;
+								receipt
+							})
+							.map(Some);
+
+						Either::B(extract_receipt)
+					}
+					None => Either::A(future::err(errors::unknown_block())),
+				},
+				None => Either::A(future::ok(None)),
+			}
+		}))
 	}
 
-	fn uncle_by_block_hash_and_index(&self, hash: RpcH256, idx: Index) -> Result<Option<RichBlock>, Error> {
-		Err(errors::unimplemented(None))
+	fn uncle_by_block_hash_and_index(&self, hash: RpcH256, idx: Index) -> BoxFuture<Option<RichBlock>> {
+		let client = self.client.clone();
+		Box::new(self.fetcher().block(BlockId::Hash(hash.into())).map(move |block| {
+			extract_uncle_at_index(block, idx, client)
+		}))
 	}
 
-	fn uncle_by_block_number_and_index(&self, num: BlockNumber, idx: Index) -> Result<Option<RichBlock>, Error> {
-		Err(errors::unimplemented(None))
+	fn uncle_by_block_number_and_index(&self, num: BlockNumber, idx: Index) -> BoxFuture<Option<RichBlock>> {
+		let client = self.client.clone();
+		Box::new(self.fetcher().block(Self::num_to_id(num)).map(move |block| {
+			extract_uncle_at_index(block, idx, client)
+		}))
 	}
 
-	fn compilers(&self) -> Result<Vec<String>, Error> {
+	fn compilers(&self) -> Result<Vec<String>> {
 		Err(errors::deprecated("Compilation functionality is deprecated.".to_string()))
-
 	}
 
-	fn compile_lll(&self, _: String) -> Result<Bytes, Error> {
+	fn compile_lll(&self, _: String) -> Result<Bytes> {
 		Err(errors::deprecated("Compilation of LLL via RPC is deprecated".to_string()))
 	}
 
-	fn compile_serpent(&self, _: String) -> Result<Bytes, Error> {
+	fn compile_serpent(&self, _: String) -> Result<Bytes> {
 		Err(errors::deprecated("Compilation of Serpent via RPC is deprecated".to_string()))
 	}
 
-	fn compile_solidity(&self, _: String) -> Result<Bytes, Error> {
+	fn compile_solidity(&self, _: String) -> Result<Bytes> {
 		Err(errors::deprecated("Compilation of Solidity via RPC is deprecated".to_string()))
 	}
 
-	fn logs(&self, filter: Filter) -> BoxFuture<Vec<Log>, Error> {
+	fn logs(&self, filter: Filter) -> BoxFuture<Vec<Log>> {
 		let limit = filter.limit;
 
-		Filterable::logs(self, filter.into())
-			.map(move|logs| limit_logs(logs, limit))
-			.boxed()
+		Box::new(Filterable::logs(self, filter.into())
+			.map(move|logs| limit_logs(logs, limit)))
 	}
 
-	fn work(&self, _timeout: Trailing<u64>) -> Result<Work, Error> {
+	fn work(&self, _timeout: Trailing<u64>) -> Result<Work> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn submit_work(&self, _nonce: RpcH64, _pow_hash: RpcH256, _mix_hash: RpcH256) -> Result<bool, Error> {
+	fn submit_work(&self, _nonce: RpcH64, _pow_hash: RpcH256, _mix_hash: RpcH256) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn submit_hashrate(&self, _rate: RpcU256, _id: RpcH256) -> Result<bool, Error> {
+	fn submit_hashrate(&self, _rate: RpcU256, _id: RpcH256) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 }
 
 // This trait implementation triggers a blanked impl of `EthFilter`.
-impl Filterable for EthClient {
+impl<T: LightChainClient + 'static> Filterable for EthClient<T> {
 	fn best_block_number(&self) -> u64 { self.client.chain_info().best_block_number }
 
 	fn block_hash(&self, id: BlockId) -> Option<RpcH256> {
 		self.client.block_hash(id).map(Into::into)
 	}
 
-	fn pending_transactions_hashes(&self, _block_number: u64) -> Vec<::util::H256> {
+	fn pending_transactions_hashes(&self, _block_number: u64) -> Vec<::ethereum_types::H256> {
 		Vec::new()
 	}
 
-	fn logs(&self, filter: EthcoreFilter) -> BoxFuture<Vec<Log>, Error> {
+	fn logs(&self, filter: EthcoreFilter) -> BoxFuture<Vec<Log>> {
 		self.fetcher().logs(filter)
 	}
 
@@ -488,3 +549,37 @@ impl Filterable for EthClient {
 		&self.polls
 	}
 }
+
+fn extract_uncle_at_index<T: LightChainClient>(block: encoded::Block, index: Index, client: Arc<T>) -> Option<RichBlock> {
+		let uncle = match block.uncles().into_iter().nth(index.value()) {
+			Some(u) => u,
+			None => return None,
+		};
+
+		let extra_info = client.engine().extra_info(&uncle);
+		Some(RichBlock {
+			inner: Block {
+				hash: Some(uncle.hash().into()),
+				size: None,
+				parent_hash: uncle.parent_hash().clone().into(),
+				uncles_hash: uncle.uncles_hash().clone().into(),
+				author: uncle.author().clone().into(),
+				miner: uncle.author().clone().into(),
+				state_root: uncle.state_root().clone().into(),
+				transactions_root: uncle.transactions_root().clone().into(),
+				number: Some(uncle.number().into()),
+				gas_used: uncle.gas_used().clone().into(),
+				gas_limit: uncle.gas_limit().clone().into(),
+				logs_bloom: uncle.log_bloom().clone().into(),
+				timestamp: uncle.timestamp().into(),
+				difficulty: uncle.difficulty().clone().into(),
+				total_difficulty: None,
+				receipts_root: uncle.receipts_root().clone().into(),
+				extra_data: uncle.extra_data().clone().into(),
+				seal_fields: uncle.seal().into_iter().cloned().map(Into::into).collect(),
+				uncles: vec![],
+				transactions: BlockTransactions::Hashes(vec![]),
+			},
+			extra_info: extra_info,
+		})
+}
diff --git a/rpc/src/v1/impls/light/net.rs b/rpc/src/v1/impls/light/net.rs
index 4f0ede48f0d5a34a1ebb957ca371f2d3b7764161..3491b35ba77260edc7ff35dddccef124205bc794 100644
--- a/rpc/src/v1/impls/light/net.rs
+++ b/rpc/src/v1/impls/light/net.rs
@@ -16,7 +16,7 @@
 
 //! Net rpc implementation.
 use std::sync::Arc;
-use jsonrpc_core::Error;
+use jsonrpc_core::Result;
 use ethsync::LightSyncProvider;
 use v1::traits::Net;
 
@@ -35,15 +35,15 @@ impl<S: ?Sized> NetClient<S> where S: LightSyncProvider {
 }
 
 impl<S: ?Sized + Sync + Send + 'static> Net for NetClient<S> where S: LightSyncProvider {
-	fn version(&self) -> Result<String, Error> {
+	fn version(&self) -> Result<String> {
 		Ok(format!("{}", self.sync.network_id()).to_owned())
 	}
 
-	fn peer_count(&self) -> Result<String, Error> {
+	fn peer_count(&self) -> Result<String> {
 		Ok(format!("0x{:x}", self.sync.peer_numbers().connected as u64).to_owned())
 	}
 
-	fn is_listening(&self) -> Result<bool, Error> {
+	fn is_listening(&self) -> Result<bool> {
 		Ok(true)
 	}
 }
diff --git a/rpc/src/v1/impls/light/parity.rs b/rpc/src/v1/impls/light/parity.rs
index 7cd540937411ad1b00fb75ff86dc50a84e5e5161..3b2fab9a3cbf14b5f98e9c0cdf4f9806402bfc8e 100644
--- a/rpc/src/v1/impls/light/parity.rs
+++ b/rpc/src/v1/impls/light/parity.rs
@@ -17,9 +17,8 @@
 //! Parity-specific rpc implementation.
 use std::sync::Arc;
 use std::collections::{BTreeMap, HashSet};
-use futures::{future, Future, BoxFuture};
 
-use util::misc::version_data;
+use version::version_data;
 
 use crypto::{ecies, DEFAULT_MAC};
 use ethkey::{Brain, Generator};
@@ -28,10 +27,12 @@ use ethsync::LightSyncProvider;
 use ethcore::account_provider::AccountProvider;
 use ethcore_logger::RotatingLogger;
 use node_health::{NodeHealth, Health};
+use ethcore::ids::BlockId;
 
 use light::client::LightChainClient;
 
-use jsonrpc_core::Error;
+use jsonrpc_core::{Result, BoxFuture};
+use jsonrpc_core::futures::Future;
 use jsonrpc_macros::Trailing;
 use v1::helpers::{self, errors, ipfs, SigningQueue, SignerService, NetworkSettings};
 use v1::helpers::dispatch::LightDispatcher;
@@ -39,25 +40,28 @@ use v1::helpers::light_fetch::LightFetch;
 use v1::metadata::Metadata;
 use v1::traits::Parity;
 use v1::types::{
-	Bytes, U256, H160, H256, H512, CallRequest,
+	Bytes, U256, U64, H160, H256, H512, CallRequest,
 	Peers, Transaction, RpcSettings, Histogram,
 	TransactionStats, LocalTransactionStatus,
 	BlockNumber, ConsensusCapability, VersionInfo,
 	OperationsInfo, DappId, ChainStatus,
 	AccountInfo, HwAccountInfo, Header, RichHeader,
 };
+use Host;
 
 /// Parity implementation for light client.
 pub struct ParityClient {
+	client: Arc<LightChainClient>,
 	light_dispatch: Arc<LightDispatcher>,
 	accounts: Arc<AccountProvider>,
 	logger: Arc<RotatingLogger>,
 	settings: Arc<NetworkSettings>,
 	health: NodeHealth,
 	signer: Option<Arc<SignerService>>,
-	dapps_address: Option<(String, u16)>,
-	ws_address: Option<(String, u16)>,
+	dapps_address: Option<Host>,
+	ws_address: Option<Host>,
 	eip86_transition: u64,
+	gas_price_percentile: usize,
 }
 
 impl ParityClient {
@@ -70,8 +74,9 @@ impl ParityClient {
 		settings: Arc<NetworkSettings>,
 		health: NodeHealth,
 		signer: Option<Arc<SignerService>>,
-		dapps_address: Option<(String, u16)>,
-		ws_address: Option<(String, u16)>,
+		dapps_address: Option<Host>,
+		ws_address: Option<Host>,
+		gas_price_percentile: usize,
 	) -> Self {
 		ParityClient {
 			light_dispatch,
@@ -83,6 +88,8 @@ impl ParityClient {
 			dapps_address,
 			ws_address,
 			eip86_transition: client.eip86_transition(),
+			client,
+			gas_price_percentile,
 		}
 	}
 
@@ -93,6 +100,7 @@ impl ParityClient {
 			on_demand: self.light_dispatch.on_demand.clone(),
 			sync: self.light_dispatch.sync.clone(),
 			cache: self.light_dispatch.cache.clone(),
+			gas_price_percentile: self.gas_price_percentile,
 		}
 	}
 }
@@ -100,7 +108,7 @@ impl ParityClient {
 impl Parity for ParityClient {
 	type Metadata = Metadata;
 
-	fn accounts_info(&self, dapp: Trailing<DappId>) -> Result<BTreeMap<H160, AccountInfo>, Error> {
+	fn accounts_info(&self, dapp: Trailing<DappId>) -> Result<BTreeMap<H160, AccountInfo>> {
 		let dapp = dapp.unwrap_or_default();
 
 		let store = &self.accounts;
@@ -122,7 +130,7 @@ impl Parity for ParityClient {
 		)
 	}
 
-	fn hardware_accounts_info(&self) -> Result<BTreeMap<H160, HwAccountInfo>, Error> {
+	fn hardware_accounts_info(&self) -> Result<BTreeMap<H160, HwAccountInfo>> {
 		let store = &self.accounts;
 		let info = store.hardware_accounts_info().map_err(|e| errors::account("Could not fetch account info.", e))?;
 		Ok(info
@@ -132,51 +140,55 @@ impl Parity for ParityClient {
 		)
 	}
 
-	fn default_account(&self, meta: Self::Metadata) -> BoxFuture<H160, Error> {
+	fn locked_hardware_accounts_info(&self) -> Result<Vec<String>> {
+		let store = &self.accounts;
+		Ok(store.locked_hardware_accounts().map_err(|e| errors::account("Error communicating with hardware wallet.", e))?)
+	}
+
+	fn default_account(&self, meta: Self::Metadata) -> Result<H160> {
 		let dapp_id = meta.dapp_id();
-		future::ok(self.accounts
+		Ok(self.accounts
 			.dapp_addresses(dapp_id.into())
 			.ok()
 			.and_then(|accounts| accounts.get(0).cloned())
 			.map(|acc| acc.into())
-			.unwrap_or_default()
-		).boxed()
+			.unwrap_or_default())
 	}
 
-	fn transactions_limit(&self) -> Result<usize, Error> {
+	fn transactions_limit(&self) -> Result<usize> {
 		Ok(usize::max_value())
 	}
 
-	fn min_gas_price(&self) -> Result<U256, Error> {
+	fn min_gas_price(&self) -> Result<U256> {
 		Ok(U256::default())
 	}
 
-	fn extra_data(&self) -> Result<Bytes, Error> {
+	fn extra_data(&self) -> Result<Bytes> {
 		Ok(Bytes::default())
 	}
 
-	fn gas_floor_target(&self) -> Result<U256, Error> {
+	fn gas_floor_target(&self) -> Result<U256> {
 		Ok(U256::default())
 	}
 
-	fn gas_ceil_target(&self) -> Result<U256, Error> {
+	fn gas_ceil_target(&self) -> Result<U256> {
 		Ok(U256::default())
 	}
 
-	fn dev_logs(&self) -> Result<Vec<String>, Error> {
+	fn dev_logs(&self) -> Result<Vec<String>> {
 		let logs = self.logger.logs();
 		Ok(logs.as_slice().to_owned())
 	}
 
-	fn dev_logs_levels(&self) -> Result<String, Error> {
+	fn dev_logs_levels(&self) -> Result<String> {
 		Ok(self.logger.levels().to_owned())
 	}
 
-	fn net_chain(&self) -> Result<String, Error> {
+	fn net_chain(&self) -> Result<String> {
 		Ok(self.settings.chain.clone())
 	}
 
-	fn net_peers(&self) -> Result<Peers, Error> {
+	fn net_peers(&self) -> Result<Peers> {
 		let peers = self.light_dispatch.sync.peers().into_iter().map(Into::into).collect();
 		let peer_numbers = self.light_dispatch.sync.peer_numbers();
 
@@ -188,19 +200,24 @@ impl Parity for ParityClient {
 		})
 	}
 
-	fn net_port(&self) -> Result<u16, Error> {
+	fn net_port(&self) -> Result<u16> {
 		Ok(self.settings.network_port)
 	}
 
-	fn node_name(&self) -> Result<String, Error> {
+	fn node_name(&self) -> Result<String> {
 		Ok(self.settings.name.clone())
 	}
 
-	fn registry_address(&self) -> Result<Option<H160>, Error> {
-		Err(errors::light_unimplemented(None))
+	fn registry_address(&self) -> Result<Option<H160>> {
+		let reg = self.light_dispatch.client.engine().params().registrar;
+		if reg == Default::default() {
+			Ok(None)
+		} else {
+			Ok(Some(reg.into()))
+		}
 	}
 
-	fn rpc_settings(&self) -> Result<RpcSettings, Error> {
+	fn rpc_settings(&self) -> Result<RpcSettings> {
 		Ok(RpcSettings {
 			enabled: self.settings.rpc_enabled,
 			interface: self.settings.rpc_interface.clone(),
@@ -208,47 +225,46 @@ impl Parity for ParityClient {
 		})
 	}
 
-	fn default_extra_data(&self) -> Result<Bytes, Error> {
+	fn default_extra_data(&self) -> Result<Bytes> {
 		Ok(Bytes::new(version_data()))
 	}
 
-	fn gas_price_histogram(&self) -> BoxFuture<Histogram, Error> {
-		self.light_dispatch.gas_price_corpus()
+	fn gas_price_histogram(&self) -> BoxFuture<Histogram> {
+		Box::new(self.light_dispatch.gas_price_corpus()
 			.and_then(|corpus| corpus.histogram(10).ok_or_else(errors::not_enough_data))
-			.map(Into::into)
-			.boxed()
+			.map(Into::into))
 	}
 
-	fn unsigned_transactions_count(&self) -> Result<usize, Error> {
+	fn unsigned_transactions_count(&self) -> Result<usize> {
 		match self.signer {
 			None => Err(errors::signer_disabled()),
 			Some(ref signer) => Ok(signer.len()),
 		}
 	}
 
-	fn generate_secret_phrase(&self) -> Result<String, Error> {
+	fn generate_secret_phrase(&self) -> Result<String> {
 		Ok(random_phrase(12))
 	}
 
-	fn phrase_to_address(&self, phrase: String) -> Result<H160, Error> {
+	fn phrase_to_address(&self, phrase: String) -> Result<H160> {
 		Ok(Brain::new(phrase).generate().unwrap().address().into())
 	}
 
-	fn list_accounts(&self, _: u64, _: Option<H160>, _: Trailing<BlockNumber>) -> Result<Option<Vec<H160>>, Error> {
+	fn list_accounts(&self, _: u64, _: Option<H160>, _: Trailing<BlockNumber>) -> Result<Option<Vec<H160>>> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn list_storage_keys(&self, _: H160, _: u64, _: Option<H256>, _: Trailing<BlockNumber>) -> Result<Option<Vec<H256>>, Error> {
+	fn list_storage_keys(&self, _: H160, _: u64, _: Option<H256>, _: Trailing<BlockNumber>) -> Result<Option<Vec<H256>>> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn encrypt_message(&self, key: H512, phrase: Bytes) -> Result<Bytes, Error> {
+	fn encrypt_message(&self, key: H512, phrase: Bytes) -> Result<Bytes> {
 		ecies::encrypt(&key.into(), &DEFAULT_MAC, &phrase.0)
 			.map_err(errors::encryption)
 			.map(Into::into)
 	}
 
-	fn pending_transactions(&self) -> Result<Vec<Transaction>, Error> {
+	fn pending_transactions(&self) -> Result<Vec<Transaction>> {
 		let txq = self.light_dispatch.transaction_queue.read();
 		let chain_info = self.light_dispatch.client.chain_info();
 		Ok(
@@ -259,7 +275,7 @@ impl Parity for ParityClient {
 		)
 	}
 
-	fn future_transactions(&self) -> Result<Vec<Transaction>, Error> {
+	fn future_transactions(&self) -> Result<Vec<Transaction>> {
 		let txq = self.light_dispatch.transaction_queue.read();
 		let chain_info = self.light_dispatch.client.chain_info();
 		Ok(
@@ -270,7 +286,7 @@ impl Parity for ParityClient {
 		)
 	}
 
-	fn pending_transactions_stats(&self) -> Result<BTreeMap<H256, TransactionStats>, Error> {
+	fn pending_transactions_stats(&self) -> Result<BTreeMap<H256, TransactionStats>> {
 		let stats = self.light_dispatch.sync.transactions_stats();
 		Ok(stats.into_iter()
 		   .map(|(hash, stats)| (hash.into(), stats.into()))
@@ -278,7 +294,7 @@ impl Parity for ParityClient {
 		)
 	}
 
-	fn local_transactions(&self) -> Result<BTreeMap<H256, LocalTransactionStatus>, Error> {
+	fn local_transactions(&self) -> Result<BTreeMap<H256, LocalTransactionStatus>> {
 		let mut map = BTreeMap::new();
 		let chain_info = self.light_dispatch.client.chain_info();
 		let (best_num, best_tm) = (chain_info.best_block_number, chain_info.best_block_timestamp);
@@ -297,45 +313,49 @@ impl Parity for ParityClient {
 		Ok(map)
 	}
 
-	fn dapps_url(&self) -> Result<String, Error> {
+	fn dapps_url(&self) -> Result<String> {
 		helpers::to_url(&self.dapps_address)
 			.ok_or_else(|| errors::dapps_disabled())
 	}
 
-	fn ws_url(&self) -> Result<String, Error> {
+	fn ws_url(&self) -> Result<String> {
 		helpers::to_url(&self.ws_address)
 			.ok_or_else(|| errors::ws_disabled())
 	}
 
-	fn next_nonce(&self, address: H160) -> BoxFuture<U256, Error> {
-		self.light_dispatch.next_nonce(address.into()).map(Into::into).boxed()
+	fn next_nonce(&self, address: H160) -> BoxFuture<U256> {
+		Box::new(self.light_dispatch.next_nonce(address.into()).map(Into::into))
 	}
 
-	fn mode(&self) -> Result<String, Error> {
+	fn mode(&self) -> Result<String> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn chain(&self) -> Result<String, Error> {
+	fn chain_id(&self) -> Result<Option<U64>> {
+		Ok(self.client.signing_chain_id().map(U64::from))
+	}
+
+	fn chain(&self) -> Result<String> {
 		Ok(self.settings.chain.clone())
 	}
 
-	fn enode(&self) -> Result<String, Error> {
+	fn enode(&self) -> Result<String> {
 		self.light_dispatch.sync.enode().ok_or_else(errors::network_disabled)
 	}
 
-	fn consensus_capability(&self) -> Result<ConsensusCapability, Error> {
+	fn consensus_capability(&self) -> Result<ConsensusCapability> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn version_info(&self) -> Result<VersionInfo, Error> {
+	fn version_info(&self) -> Result<VersionInfo> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn releases_info(&self) -> Result<Option<OperationsInfo>, Error> {
+	fn releases_info(&self) -> Result<Option<OperationsInfo>> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn chain_status(&self) -> Result<ChainStatus, Error> {
+	fn chain_status(&self) -> Result<ChainStatus> {
 		let chain_info = self.light_dispatch.client.chain_info();
 
 		let gap = chain_info.ancient_block_number.map(|x| U256::from(x + 1))
@@ -346,7 +366,7 @@ impl Parity for ParityClient {
 		})
 	}
 
-	fn node_kind(&self) -> Result<::v1::types::NodeKind, Error> {
+	fn node_kind(&self) -> Result<::v1::types::NodeKind> {
 		use ::v1::types::{NodeKind, Availability, Capability};
 
 		Ok(NodeKind {
@@ -355,7 +375,7 @@ impl Parity for ParityClient {
 		})
 	}
 
-	fn block_header(&self, number: Trailing<BlockNumber>) -> BoxFuture<RichHeader, Error> {
+	fn block_header(&self, number: Trailing<BlockNumber>) -> BoxFuture<RichHeader> {
 		use ethcore::encoded;
 
 		let engine = self.light_dispatch.client.engine().clone();
@@ -386,20 +406,28 @@ impl Parity for ParityClient {
 			}
 		};
 
-		self.fetcher().header(number.unwrap_or_default().into()).map(from_encoded).boxed()
+		// Note: Here we treat `Pending` as `Latest`.
+		//       Since light clients don't produce pending blocks
+		//       (they don't have state) we can safely fallback to `Latest`.
+		let id = match number.unwrap_or_default() {
+			BlockNumber::Num(n) => BlockId::Number(n),
+			BlockNumber::Earliest => BlockId::Earliest,
+			BlockNumber::Latest | BlockNumber::Pending => BlockId::Latest,
+		};
+
+		Box::new(self.fetcher().header(id).map(from_encoded))
 	}
 
-	fn ipfs_cid(&self, content: Bytes) -> Result<String, Error> {
+	fn ipfs_cid(&self, content: Bytes) -> Result<String> {
 		ipfs::cid(content)
 	}
 
-	fn call(&self, _meta: Self::Metadata, _requests: Vec<CallRequest>, _block: Trailing<BlockNumber>) -> BoxFuture<Vec<Bytes>, Error> {
-		future::err(errors::light_unimplemented(None)).boxed()
+	fn call(&self, _meta: Self::Metadata, _requests: Vec<CallRequest>, _block: Trailing<BlockNumber>) -> Result<Vec<Bytes>> {
+		Err(errors::light_unimplemented(None))
 	}
 
-	fn node_health(&self) -> BoxFuture<Health, Error> {
-		self.health.health()
-			.map_err(|err| errors::internal("Health API failure.", err))
-			.boxed()
+	fn node_health(&self) -> BoxFuture<Health> {
+		Box::new(self.health.health()
+			.map_err(|err| errors::internal("Health API failure.", err)))
 	}
 }
diff --git a/rpc/src/v1/impls/light/parity_set.rs b/rpc/src/v1/impls/light/parity_set.rs
index b973271683f7ea9eb8d3aae13c662a0c23efbfa0..a1344fa69b95b08388aad7c341c9167d0c478121 100644
--- a/rpc/src/v1/impls/light/parity_set.rs
+++ b/rpc/src/v1/impls/light/parity_set.rs
@@ -21,11 +21,12 @@ use std::io;
 use std::sync::Arc;
 
 use ethsync::ManageNetwork;
-use fetch::Fetch;
-use futures::{BoxFuture, Future};
-use util::sha3;
+use fetch::{self, Fetch};
+use futures_cpupool::CpuPool;
+use hash::keccak_buffer;
 
-use jsonrpc_core::Error;
+use jsonrpc_core::{Result, BoxFuture};
+use jsonrpc_core::futures::Future;
 use v1::helpers::dapps::DappsService;
 use v1::helpers::errors;
 use v1::traits::ParitySet;
@@ -36,122 +37,126 @@ pub struct ParitySetClient<F> {
 	net: Arc<ManageNetwork>,
 	dapps: Option<Arc<DappsService>>,
 	fetch: F,
+	pool: CpuPool,
 }
 
 impl<F: Fetch> ParitySetClient<F> {
 	/// Creates new `ParitySetClient` with given `Fetch`.
-	pub fn new(net: Arc<ManageNetwork>, dapps: Option<Arc<DappsService>>, fetch: F) -> Self {
+	pub fn new(net: Arc<ManageNetwork>, dapps: Option<Arc<DappsService>>, fetch: F, p: CpuPool) -> Self {
 		ParitySetClient {
 			net: net,
 			dapps: dapps,
 			fetch: fetch,
+			pool: p,
 		}
 	}
 }
 
 impl<F: Fetch> ParitySet for ParitySetClient<F> {
-	fn set_min_gas_price(&self, _gas_price: U256) -> Result<bool, Error> {
+	fn set_min_gas_price(&self, _gas_price: U256) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn set_gas_floor_target(&self, _target: U256) -> Result<bool, Error> {
+	fn set_gas_floor_target(&self, _target: U256) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn set_gas_ceil_target(&self, _target: U256) -> Result<bool, Error> {
+	fn set_gas_ceil_target(&self, _target: U256) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn set_extra_data(&self, _extra_data: Bytes) -> Result<bool, Error> {
+	fn set_extra_data(&self, _extra_data: Bytes) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn set_author(&self, _author: H160) -> Result<bool, Error> {
+	fn set_author(&self, _author: H160) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn set_engine_signer(&self, _address: H160, _password: String) -> Result<bool, Error> {
+	fn set_engine_signer(&self, _address: H160, _password: String) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn set_transactions_limit(&self, _limit: usize) -> Result<bool, Error> {
+	fn set_transactions_limit(&self, _limit: usize) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn set_tx_gas_limit(&self, _limit: U256) -> Result<bool, Error> {
+	fn set_tx_gas_limit(&self, _limit: U256) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn add_reserved_peer(&self, peer: String) -> Result<bool, Error> {
+	fn add_reserved_peer(&self, peer: String) -> Result<bool> {
 		match self.net.add_reserved_peer(peer) {
 			Ok(()) => Ok(true),
 			Err(e) => Err(errors::invalid_params("Peer address", e)),
 		}
 	}
 
-	fn remove_reserved_peer(&self, peer: String) -> Result<bool, Error> {
+	fn remove_reserved_peer(&self, peer: String) -> Result<bool> {
 		match self.net.remove_reserved_peer(peer) {
 			Ok(()) => Ok(true),
 			Err(e) => Err(errors::invalid_params("Peer address", e)),
 		}
 	}
 
-	fn drop_non_reserved_peers(&self) -> Result<bool, Error> {
+	fn drop_non_reserved_peers(&self) -> Result<bool> {
 		self.net.deny_unreserved_peers();
 		Ok(true)
 	}
 
-	fn accept_non_reserved_peers(&self) -> Result<bool, Error> {
+	fn accept_non_reserved_peers(&self) -> Result<bool> {
 		self.net.accept_unreserved_peers();
 		Ok(true)
 	}
 
-	fn start_network(&self) -> Result<bool, Error> {
+	fn start_network(&self) -> Result<bool> {
 		self.net.start_network();
 		Ok(true)
 	}
 
-	fn stop_network(&self) -> Result<bool, Error> {
+	fn stop_network(&self) -> Result<bool> {
 		self.net.stop_network();
 		Ok(true)
 	}
 
-	fn set_mode(&self, _mode: String) -> Result<bool, Error> {
+	fn set_mode(&self, _mode: String) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn set_spec_name(&self, _spec_name: String) -> Result<bool, Error> {
+	fn set_spec_name(&self, _spec_name: String) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn hash_content(&self, url: String) -> BoxFuture<H256, Error> {
-		self.fetch.process(self.fetch.fetch(&url).then(move |result| {
+	fn hash_content(&self, url: String) -> BoxFuture<H256> {
+		let future = self.fetch.fetch(&url, Default::default()).then(move |result| {
 			result
 				.map_err(errors::fetch)
-				.and_then(|response| {
-					sha3(&mut io::BufReader::new(response)).map_err(errors::fetch)
+				.and_then(move |response| {
+					let mut reader = io::BufReader::new(fetch::BodyReader::new(response));
+					keccak_buffer(&mut reader).map_err(errors::fetch)
 				})
 				.map(Into::into)
-		}))
+		});
+		Box::new(self.pool.spawn(future))
 	}
 
-	fn dapps_refresh(&self) -> Result<bool, Error> {
+	fn dapps_refresh(&self) -> Result<bool> {
 		self.dapps.as_ref().map(|dapps| dapps.refresh_local_dapps()).ok_or_else(errors::dapps_disabled)
 	}
 
-	fn dapps_list(&self) -> Result<Vec<LocalDapp>, Error> {
+	fn dapps_list(&self) -> Result<Vec<LocalDapp>> {
 		self.dapps.as_ref().map(|dapps| dapps.list_dapps()).ok_or_else(errors::dapps_disabled)
 	}
 
-	fn upgrade_ready(&self) -> Result<Option<ReleaseInfo>, Error> {
+	fn upgrade_ready(&self) -> Result<Option<ReleaseInfo>> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn execute_upgrade(&self) -> Result<bool, Error> {
+	fn execute_upgrade(&self) -> Result<bool> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn remove_transaction(&self, _hash: H256) -> Result<Option<Transaction>, Error> {
+	fn remove_transaction(&self, _hash: H256) -> Result<Option<Transaction>> {
 		Err(errors::light_unimplemented(None))
 	}
 }
diff --git a/rpc/src/v1/impls/light/trace.rs b/rpc/src/v1/impls/light/trace.rs
index 22360183d0d3ea69ec885ddb8ee89547fe745aea..1d2c7fcaa0ade2609598e33d38ca6a79facdb3ca 100644
--- a/rpc/src/v1/impls/light/trace.rs
+++ b/rpc/src/v1/impls/light/trace.rs
@@ -16,8 +16,7 @@
 
 //! Traces api implementation.
 
-use jsonrpc_core::Error;
-use jsonrpc_core::futures::{future, Future, BoxFuture};
+use jsonrpc_core::Result;
 use jsonrpc_macros::Trailing;
 use v1::Metadata;
 use v1::traits::Traces;
@@ -31,35 +30,39 @@ pub struct TracesClient;
 impl Traces for TracesClient {
 	type Metadata = Metadata;
 
-	fn filter(&self, _filter: TraceFilter) -> Result<Option<Vec<LocalizedTrace>>, Error> {
+	fn filter(&self, _filter: TraceFilter) -> Result<Option<Vec<LocalizedTrace>>> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn block_traces(&self, _block_number: BlockNumber) -> Result<Option<Vec<LocalizedTrace>>, Error> {
+	fn block_traces(&self, _block_number: BlockNumber) -> Result<Option<Vec<LocalizedTrace>>> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn transaction_traces(&self, _transaction_hash: H256) -> Result<Option<Vec<LocalizedTrace>>, Error> {
+	fn transaction_traces(&self, _transaction_hash: H256) -> Result<Option<Vec<LocalizedTrace>>> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn trace(&self, _transaction_hash: H256, _address: Vec<Index>) -> Result<Option<LocalizedTrace>, Error> {
+	fn trace(&self, _transaction_hash: H256, _address: Vec<Index>) -> Result<Option<LocalizedTrace>> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn call(&self, _meta: Self::Metadata, _request: CallRequest, _flags: TraceOptions, _block: Trailing<BlockNumber>) -> BoxFuture<TraceResults, Error> {
-		future::err(errors::light_unimplemented(None)).boxed()
+	fn call(&self, _meta: Self::Metadata, _request: CallRequest, _flags: TraceOptions, _block: Trailing<BlockNumber>) -> Result<TraceResults> {
+		Err(errors::light_unimplemented(None))
 	}
 
-	fn call_many(&self, _meta: Self::Metadata, _request: Vec<(CallRequest, TraceOptions)>, _block: Trailing<BlockNumber>) -> BoxFuture<Vec<TraceResults>, Error> {
-		future::err(errors::light_unimplemented(None)).boxed()
+	fn call_many(&self, _meta: Self::Metadata, _request: Vec<(CallRequest, TraceOptions)>, _block: Trailing<BlockNumber>) -> Result<Vec<TraceResults>> {
+		Err(errors::light_unimplemented(None))
+	}
+
+	fn raw_transaction(&self, _raw_transaction: Bytes, _flags: TraceOptions, _block: Trailing<BlockNumber>) -> Result<TraceResults> {
+		Err(errors::light_unimplemented(None))
 	}
 
-	fn raw_transaction(&self, _raw_transaction: Bytes, _flags: TraceOptions, _block: Trailing<BlockNumber>) -> Result<TraceResults, Error> {
+	fn replay_transaction(&self, _transaction_hash: H256, _flags: TraceOptions) -> Result<TraceResults> {
 		Err(errors::light_unimplemented(None))
 	}
 
-	fn replay_transaction(&self, _transaction_hash: H256, _flags: TraceOptions) -> Result<TraceResults, Error> {
+	fn replay_block_transactions(&self,  _block_number: BlockNumber, _flags: TraceOptions) ->  Result<Vec<TraceResults>> {
 		Err(errors::light_unimplemented(None))
 	}
 }
diff --git a/rpc/src/v1/impls/net.rs b/rpc/src/v1/impls/net.rs
index 97f50b6334dc89030faa14a0e0e405da3fc2b610..50dbffdc79ed4f4d7b966e7eec89e04eea99620f 100644
--- a/rpc/src/v1/impls/net.rs
+++ b/rpc/src/v1/impls/net.rs
@@ -16,7 +16,7 @@
 
 //! Net rpc implementation.
 use std::sync::Arc;
-use jsonrpc_core::Error;
+use jsonrpc_core::Result;
 use ethsync::SyncProvider;
 use v1::traits::Net;
 
@@ -35,15 +35,15 @@ impl<S: ?Sized> NetClient<S> where S: SyncProvider {
 }
 
 impl<S: ?Sized> Net for NetClient<S> where S: SyncProvider + 'static {
-	fn version(&self) -> Result<String, Error> {
+	fn version(&self) -> Result<String> {
 		Ok(format!("{}", self.sync.status().network_id).to_owned())
 	}
 
-	fn peer_count(&self) -> Result<String, Error> {
+	fn peer_count(&self) -> Result<String> {
 		Ok(format!("0x{:x}", self.sync.status().num_peers as u64).to_owned())
 	}
 
-	fn is_listening(&self) -> Result<bool, Error> {
+	fn is_listening(&self) -> Result<bool> {
 		// right now (11 march 2016), we are always listening for incoming connections
 		//
 		// (this may not be true now -- 26 september 2016)
diff --git a/rpc/src/v1/impls/parity.rs b/rpc/src/v1/impls/parity.rs
index e66d3ac0562025c750865c4bd15b0577e8d6c4c1..95c810aa1a3eba8ff42a01b221170a7fe3c88233 100644
--- a/rpc/src/v1/impls/parity.rs
+++ b/rpc/src/v1/impls/parity.rs
@@ -18,39 +18,41 @@
 use std::sync::Arc;
 use std::str::FromStr;
 use std::collections::{BTreeMap, HashSet};
-use futures::{future, Future, BoxFuture};
 
-use util::Address;
-use util::misc::version_data;
+use ethereum_types::Address;
+use version::version_data;
 
 use crypto::{DEFAULT_MAC, ecies};
 use ethkey::{Brain, Generator};
 use ethstore::random_phrase;
 use ethsync::{SyncProvider, ManageNetwork};
 use ethcore::account_provider::AccountProvider;
-use ethcore::client::{MiningBlockChainClient};
+use ethcore::client::{MiningBlockChainClient, StateClient, Call};
 use ethcore::ids::BlockId;
 use ethcore::miner::MinerService;
 use ethcore::mode::Mode;
-use ethcore::transaction::SignedTransaction;
+use ethcore::state::StateInfo;
 use ethcore_logger::RotatingLogger;
 use node_health::{NodeHealth, Health};
 use updater::{Service as UpdateService};
 
-use jsonrpc_core::Error;
+use jsonrpc_core::{BoxFuture, Result};
+use jsonrpc_core::futures::{future, Future};
 use jsonrpc_macros::Trailing;
 use v1::helpers::{self, errors, fake_sign, ipfs, SigningQueue, SignerService, NetworkSettings};
 use v1::helpers::accounts::unwrap_provider;
 use v1::metadata::Metadata;
 use v1::traits::Parity;
 use v1::types::{
-	Bytes, U256, H160, H256, H512, CallRequest,
+	Bytes, U256, U64, H160, H256, H512, CallRequest,
 	Peers, Transaction, RpcSettings, Histogram,
 	TransactionStats, LocalTransactionStatus,
 	BlockNumber, ConsensusCapability, VersionInfo,
 	OperationsInfo, DappId, ChainStatus,
-	AccountInfo, HwAccountInfo, RichHeader
+	AccountInfo, HwAccountInfo, RichHeader,
+	block_number_to_id
 };
+use Host;
 
 /// Parity implementation.
 pub struct ParityClient<C, M, U>  {
@@ -64,8 +66,8 @@ pub struct ParityClient<C, M, U>  {
 	logger: Arc<RotatingLogger>,
 	settings: Arc<NetworkSettings>,
 	signer: Option<Arc<SignerService>>,
-	dapps_address: Option<(String, u16)>,
-	ws_address: Option<(String, u16)>,
+	dapps_address: Option<Host>,
+	ws_address: Option<Host>,
 	eip86_transition: u64,
 }
 
@@ -84,8 +86,8 @@ impl<C, M, U> ParityClient<C, M, U> where
 		logger: Arc<RotatingLogger>,
 		settings: Arc<NetworkSettings>,
 		signer: Option<Arc<SignerService>>,
-		dapps_address: Option<(String, u16)>,
-		ws_address: Option<(String, u16)>,
+		dapps_address: Option<Host>,
+		ws_address: Option<Host>,
 	) -> Self {
 		let eip86_transition = client.eip86_transition();
 		ParityClient {
@@ -107,19 +109,20 @@ impl<C, M, U> ParityClient<C, M, U> where
 
 	/// Attempt to get the `Arc<AccountProvider>`, errors if provider was not
 	/// set.
-	fn account_provider(&self) -> Result<Arc<AccountProvider>, Error> {
+	fn account_provider(&self) -> Result<Arc<AccountProvider>> {
 		unwrap_provider(&self.accounts)
 	}
 }
 
-impl<C, M, U> Parity for ParityClient<C, M, U> where
-	C: MiningBlockChainClient + 'static,
-	M: MinerService + 'static,
+impl<C, M, U, S> Parity for ParityClient<C, M, U> where
+	S: StateInfo + 'static,
+	C: MiningBlockChainClient + StateClient<State=S> + Call<State=S> + 'static,
+	M: MinerService<State=S> + 'static,
 	U: UpdateService + 'static,
 {
 	type Metadata = Metadata;
 
-	fn accounts_info(&self, dapp: Trailing<DappId>) -> Result<BTreeMap<H160, AccountInfo>, Error> {
+	fn accounts_info(&self, dapp: Trailing<DappId>) -> Result<BTreeMap<H160, AccountInfo>> {
 		let dapp = dapp.unwrap_or_default();
 
 		let store = self.account_provider()?;
@@ -141,7 +144,7 @@ impl<C, M, U> Parity for ParityClient<C, M, U> where
 		)
 	}
 
-	fn hardware_accounts_info(&self) -> Result<BTreeMap<H160, HwAccountInfo>, Error> {
+	fn hardware_accounts_info(&self) -> Result<BTreeMap<H160, HwAccountInfo>> {
 		let store = self.account_provider()?;
 		let info = store.hardware_accounts_info().map_err(|e| errors::account("Could not fetch account info.", e))?;
 		Ok(info
@@ -151,55 +154,63 @@ impl<C, M, U> Parity for ParityClient<C, M, U> where
 		)
 	}
 
-	fn default_account(&self, meta: Self::Metadata) -> BoxFuture<H160, Error> {
+	fn locked_hardware_accounts_info(&self) -> Result<Vec<String>> {
+		let store = self.account_provider()?;
+		Ok(store.locked_hardware_accounts().map_err(|e| errors::account("Error communicating with hardware wallet.", e))?)
+	}
+
+	fn default_account(&self, meta: Self::Metadata) -> Result<H160> {
 		let dapp_id = meta.dapp_id();
-		future::ok(
-			try_bf!(self.account_provider())
-				.dapp_default_address(dapp_id.into())
-				.map(Into::into)
-				.ok()
-				.unwrap_or_default()
-		).boxed()
+
+		Ok(self.account_provider()?
+			.dapp_default_address(dapp_id.into())
+			.map(Into::into)
+			.ok()
+			.unwrap_or_default())
 	}
 
-	fn transactions_limit(&self) -> Result<usize, Error> {
+	fn transactions_limit(&self) -> Result<usize> {
 		Ok(self.miner.transactions_limit())
 	}
 
-	fn min_gas_price(&self) -> Result<U256, Error> {
+	fn min_gas_price(&self) -> Result<U256> {
 		Ok(U256::from(self.miner.minimal_gas_price()))
 	}
 
-	fn extra_data(&self) -> Result<Bytes, Error> {
+	fn extra_data(&self) -> Result<Bytes> {
 		Ok(Bytes::new(self.miner.extra_data()))
 	}
 
-	fn gas_floor_target(&self) -> Result<U256, Error> {
+	fn gas_floor_target(&self) -> Result<U256> {
 		Ok(U256::from(self.miner.gas_floor_target()))
 	}
 
-	fn gas_ceil_target(&self) -> Result<U256, Error> {
+	fn gas_ceil_target(&self) -> Result<U256> {
 		Ok(U256::from(self.miner.gas_ceil_target()))
 	}
 
-	fn dev_logs(&self) -> Result<Vec<String>, Error> {
+	fn dev_logs(&self) -> Result<Vec<String>> {
 		let logs = self.logger.logs();
 		Ok(logs.as_slice().to_owned())
 	}
 
-	fn dev_logs_levels(&self) -> Result<String, Error> {
+	fn dev_logs_levels(&self) -> Result<String> {
 		Ok(self.logger.levels().to_owned())
 	}
 
-	fn net_chain(&self) -> Result<String, Error> {
+	fn net_chain(&self) -> Result<String> {
 		Ok(self.settings.chain.clone())
 	}
 
-	fn chain(&self) -> Result<String, Error> {
+	fn chain_id(&self) -> Result<Option<U64>> {
+		Ok(self.client.signing_chain_id().map(U64::from))
+	}
+
+	fn chain(&self) -> Result<String> {
 		Ok(self.client.spec_name())
 	}
 
-	fn net_peers(&self) -> Result<Peers, Error> {
+	fn net_peers(&self) -> Result<Peers> {
 		let sync_status = self.sync.status();
 		let net_config = self.net.network_config();
 		let peers = self.sync.peers().into_iter().map(Into::into).collect();
@@ -212,15 +223,15 @@ impl<C, M, U> Parity for ParityClient<C, M, U> where
 		})
 	}
 
-	fn net_port(&self) -> Result<u16, Error> {
+	fn net_port(&self) -> Result<u16> {
 		Ok(self.settings.network_port)
 	}
 
-	fn node_name(&self) -> Result<String, Error> {
+	fn node_name(&self) -> Result<String> {
 		Ok(self.settings.name.clone())
 	}
 
-	fn registry_address(&self) -> Result<Option<H160>, Error> {
+	fn registry_address(&self) -> Result<Option<H160>> {
 		Ok(
 			self.client
 				.additional_params()
@@ -230,7 +241,7 @@ impl<C, M, U> Parity for ParityClient<C, M, U> where
 		)
 	}
 
-	fn rpc_settings(&self) -> Result<RpcSettings, Error> {
+	fn rpc_settings(&self) -> Result<RpcSettings> {
 		Ok(RpcSettings {
 			enabled: self.settings.rpc_enabled,
 			interface: self.settings.rpc_interface.clone(),
@@ -238,63 +249,81 @@ impl<C, M, U> Parity for ParityClient<C, M, U> where
 		})
 	}
 
-	fn default_extra_data(&self) -> Result<Bytes, Error> {
+	fn default_extra_data(&self) -> Result<Bytes> {
 		Ok(Bytes::new(version_data()))
 	}
 
-	fn gas_price_histogram(&self) -> BoxFuture<Histogram, Error> {
-		future::done(self.client
+	fn gas_price_histogram(&self) -> BoxFuture<Histogram> {
+		Box::new(future::done(self.client
 			.gas_price_corpus(100)
 			.histogram(10)
 			.ok_or_else(errors::not_enough_data)
 			.map(Into::into)
-		).boxed()
+		))
 	}
 
-	fn unsigned_transactions_count(&self) -> Result<usize, Error> {
+	fn unsigned_transactions_count(&self) -> Result<usize> {
 		match self.signer {
 			None => Err(errors::signer_disabled()),
 			Some(ref signer) => Ok(signer.len()),
 		}
 	}
 
-	fn generate_secret_phrase(&self) -> Result<String, Error> {
+	fn generate_secret_phrase(&self) -> Result<String> {
 		Ok(random_phrase(12))
 	}
 
-	fn phrase_to_address(&self, phrase: String) -> Result<H160, Error> {
+	fn phrase_to_address(&self, phrase: String) -> Result<H160> {
 		Ok(Brain::new(phrase).generate().unwrap().address().into())
 	}
 
-	fn list_accounts(&self, count: u64, after: Option<H160>, block_number: Trailing<BlockNumber>) -> Result<Option<Vec<H160>>, Error> {
+	fn list_accounts(&self, count: u64, after: Option<H160>, block_number: Trailing<BlockNumber>) -> Result<Option<Vec<H160>>> {
+		let number = match block_number.unwrap_or_default() {
+			BlockNumber::Pending => {
+				warn!("BlockNumber::Pending is unsupported");
+				return Ok(None);
+			},
+
+			num => block_number_to_id(num)
+		};
+
 		Ok(self.client
-			.list_accounts(block_number.unwrap_or_default().into(), after.map(Into::into).as_ref(), count)
+			.list_accounts(number, after.map(Into::into).as_ref(), count)
 			.map(|a| a.into_iter().map(Into::into).collect()))
 	}
 
-	fn list_storage_keys(&self, address: H160, count: u64, after: Option<H256>, block_number: Trailing<BlockNumber>) -> Result<Option<Vec<H256>>, Error> {
+	fn list_storage_keys(&self, address: H160, count: u64, after: Option<H256>, block_number: Trailing<BlockNumber>) -> Result<Option<Vec<H256>>> {
+		let number = match block_number.unwrap_or_default() {
+			BlockNumber::Pending => {
+				warn!("BlockNumber::Pending is unsupported");
+				return Ok(None);
+			},
+
+			num => block_number_to_id(num)
+		};
+
 		Ok(self.client
-			.list_storage(block_number.unwrap_or_default().into(), &address.into(), after.map(Into::into).as_ref(), count)
+			.list_storage(number, &address.into(), after.map(Into::into).as_ref(), count)
 			.map(|a| a.into_iter().map(Into::into).collect()))
 	}
 
-	fn encrypt_message(&self, key: H512, phrase: Bytes) -> Result<Bytes, Error> {
+	fn encrypt_message(&self, key: H512, phrase: Bytes) -> Result<Bytes> {
 		ecies::encrypt(&key.into(), &DEFAULT_MAC, &phrase.0)
 			.map_err(errors::encryption)
 			.map(Into::into)
 	}
 
-	fn pending_transactions(&self) -> Result<Vec<Transaction>, Error> {
+	fn pending_transactions(&self) -> Result<Vec<Transaction>> {
 		let block_number = self.client.chain_info().best_block_number;
 		Ok(self.miner.pending_transactions().into_iter().map(|t| Transaction::from_pending(t, block_number, self.eip86_transition)).collect::<Vec<_>>())
 	}
 
-	fn future_transactions(&self) -> Result<Vec<Transaction>, Error> {
+	fn future_transactions(&self) -> Result<Vec<Transaction>> {
 		let block_number = self.client.chain_info().best_block_number;
 		Ok(self.miner.future_transactions().into_iter().map(|t| Transaction::from_pending(t, block_number, self.eip86_transition)).collect::<Vec<_>>())
 	}
 
-	fn pending_transactions_stats(&self) -> Result<BTreeMap<H256, TransactionStats>, Error> {
+	fn pending_transactions_stats(&self) -> Result<BTreeMap<H256, TransactionStats>> {
 		let stats = self.sync.transactions_stats();
 		Ok(stats.into_iter()
 		   .map(|(hash, stats)| (hash.into(), stats.into()))
@@ -302,7 +331,7 @@ impl<C, M, U> Parity for ParityClient<C, M, U> where
 		)
 	}
 
-	fn local_transactions(&self) -> Result<BTreeMap<H256, LocalTransactionStatus>, Error> {
+	fn local_transactions(&self) -> Result<BTreeMap<H256, LocalTransactionStatus>> {
 		// Return nothing if accounts are disabled (running as public node)
 		if self.accounts.is_none() {
 			return Ok(BTreeMap::new());
@@ -317,27 +346,27 @@ impl<C, M, U> Parity for ParityClient<C, M, U> where
 		)
 	}
 
-	fn dapps_url(&self) -> Result<String, Error> {
+	fn dapps_url(&self) -> Result<String> {
 		helpers::to_url(&self.dapps_address)
 			.ok_or_else(|| errors::dapps_disabled())
 	}
 
-	fn ws_url(&self) -> Result<String, Error> {
+	fn ws_url(&self) -> Result<String> {
 		helpers::to_url(&self.ws_address)
 			.ok_or_else(|| errors::ws_disabled())
 	}
 
-	fn next_nonce(&self, address: H160) -> BoxFuture<U256, Error> {
+	fn next_nonce(&self, address: H160) -> BoxFuture<U256> {
 		let address: Address = address.into();
 
-		future::ok(self.miner.last_nonce(&address)
+		Box::new(future::ok(self.miner.last_nonce(&address)
 			.map(|n| n + 1.into())
 			.unwrap_or_else(|| self.client.latest_nonce(&address))
 			.into()
-		).boxed()
+		))
 	}
 
-	fn mode(&self) -> Result<String, Error> {
+	fn mode(&self) -> Result<String> {
 		Ok(match self.client.mode() {
 			Mode::Off => "offline",
 			Mode::Dark(..) => "dark",
@@ -346,23 +375,23 @@ impl<C, M, U> Parity for ParityClient<C, M, U> where
 		}.into())
 	}
 
-	fn enode(&self) -> Result<String, Error> {
+	fn enode(&self) -> Result<String> {
 		self.sync.enode().ok_or_else(errors::network_disabled)
 	}
 
-	fn consensus_capability(&self) -> Result<ConsensusCapability, Error> {
+	fn consensus_capability(&self) -> Result<ConsensusCapability> {
 		Ok(self.updater.capability().into())
 	}
 
-	fn version_info(&self) -> Result<VersionInfo, Error> {
+	fn version_info(&self) -> Result<VersionInfo> {
 		Ok(self.updater.version_info().into())
 	}
 
-	fn releases_info(&self) -> Result<Option<OperationsInfo>, Error> {
+	fn releases_info(&self) -> Result<Option<OperationsInfo>> {
 		Ok(self.updater.info().map(Into::into))
 	}
 
-	fn chain_status(&self) -> Result<ChainStatus, Error> {
+	fn chain_status(&self) -> Result<ChainStatus> {
 		let chain_info = self.client.chain_info();
 
 		let gap = chain_info.ancient_block_number.map(|x| U256::from(x + 1))
@@ -373,7 +402,7 @@ impl<C, M, U> Parity for ParityClient<C, M, U> where
 		})
 	}
 
-	fn node_kind(&self) -> Result<::v1::types::NodeKind, Error> {
+	fn node_kind(&self) -> Result<::v1::types::NodeKind> {
 		use ::v1::types::{NodeKind, Availability, Capability};
 
 		let availability = match self.accounts {
@@ -387,47 +416,77 @@ impl<C, M, U> Parity for ParityClient<C, M, U> where
 		})
 	}
 
-	fn block_header(&self, number: Trailing<BlockNumber>) -> BoxFuture<RichHeader, Error> {
-		const EXTRA_INFO_PROOF: &'static str = "Object exists in in blockchain (fetched earlier), extra_info is always available if object exists; qed";
+	fn block_header(&self, number: Trailing<BlockNumber>) -> BoxFuture<RichHeader> {
+		const EXTRA_INFO_PROOF: &str = "Object exists in blockchain (fetched earlier), extra_info is always available if object exists; qed";
+		let number = number.unwrap_or_default();
+
+		let (header, extra) = if number == BlockNumber::Pending {
+			let info = self.client.chain_info();
+			let header = try_bf!(self.miner.pending_block_header(info.best_block_number).ok_or(errors::unknown_block()));
 
-		let id: BlockId = number.unwrap_or_default().into();
-		let encoded = match self.client.block_header(id.clone()) {
-			Some(encoded) => encoded,
-			None => return future::err(errors::unknown_block()).boxed(),
+			(header.encoded(), None)
+		} else {
+			let id = match number {
+				BlockNumber::Num(num) => BlockId::Number(num),
+				BlockNumber::Earliest => BlockId::Earliest,
+				BlockNumber::Latest => BlockId::Latest,
+				BlockNumber::Pending => unreachable!(), // Already covered
+			};
+
+			let header = try_bf!(self.client.block_header(id.clone()).ok_or(errors::unknown_block()));
+			let info = self.client.block_extra_info(id).expect(EXTRA_INFO_PROOF);
+
+			(header, Some(info))
 		};
 
-		future::ok(RichHeader {
-			inner: encoded.into(),
-			extra_info: self.client.block_extra_info(id).expect(EXTRA_INFO_PROOF),
-		}).boxed()
+		Box::new(future::ok(RichHeader {
+			inner: header.into(),
+			extra_info: extra.unwrap_or_default(),
+		}))
 	}
 
-	fn ipfs_cid(&self, content: Bytes) -> Result<String, Error> {
+	fn ipfs_cid(&self, content: Bytes) -> Result<String> {
 		ipfs::cid(content)
 	}
 
-	fn call(&self, meta: Self::Metadata, requests: Vec<CallRequest>, block: Trailing<BlockNumber>) -> BoxFuture<Vec<Bytes>, Error> {
-		let requests: Result<Vec<(SignedTransaction, _)>, Error> = requests
+	fn call(&self, meta: Self::Metadata, requests: Vec<CallRequest>, num: Trailing<BlockNumber>) -> Result<Vec<Bytes>> {
+		let requests = requests
 			.into_iter()
 			.map(|request| Ok((
-				fake_sign::sign_call(&self.client, &self.miner, request.into(), meta.is_dapp())?,
+				fake_sign::sign_call(request.into(), meta.is_dapp())?,
 				Default::default()
 			)))
-			.collect();
+			.collect::<Result<Vec<_>>>()?;
 
-		let block = block.unwrap_or_default();
-		let requests = try_bf!(requests);
+		let num = num.unwrap_or_default();
 
-		let result = self.client.call_many(&requests, block.into())
-				.map(|res| res.into_iter().map(|res| res.output.into()).collect())
-				.map_err(errors::call);
+		let (mut state, header) = if num == BlockNumber::Pending {
+			let info = self.client.chain_info();
+			let state = self.miner.pending_state(info.best_block_number).ok_or(errors::state_pruned())?;
+			let header = self.miner.pending_block_header(info.best_block_number).ok_or(errors::state_pruned())?;
 
-		future::done(result).boxed()
+			(state, header)
+		} else {
+			let id = match num {
+				BlockNumber::Num(num) => BlockId::Number(num),
+				BlockNumber::Earliest => BlockId::Earliest,
+				BlockNumber::Latest => BlockId::Latest,
+				BlockNumber::Pending => unreachable!(), // Already covered
+			};
+
+			let state = self.client.state_at(id).ok_or(errors::state_pruned())?;
+			let header = self.client.block_header(id).ok_or(errors::state_pruned())?;
+
+			(state, header.decode())
+		};
+
+		self.client.call_many(&requests, &mut state, &header)
+				.map(|res| res.into_iter().map(|res| res.output.into()).collect())
+				.map_err(errors::call)
 	}
 
-	fn node_health(&self) -> BoxFuture<Health, Error> {
-		self.health.health()
-			.map_err(|err| errors::internal("Health API failure.", err))
-			.boxed()
+	fn node_health(&self) -> BoxFuture<Health> {
+		Box::new(self.health.health()
+			.map_err(|err| errors::internal("Health API failure.", err)))
 	}
 }
diff --git a/rpc/src/v1/impls/parity_accounts.rs b/rpc/src/v1/impls/parity_accounts.rs
index 1a121699a00357273c91aafabce7622b3e6ac4de..8de8fea900f6a8aace81cdba0a15a403f72c070c 100644
--- a/rpc/src/v1/impls/parity_accounts.rs
+++ b/rpc/src/v1/impls/parity_accounts.rs
@@ -17,13 +17,13 @@
 //! Account management (personal) rpc implementation
 use std::sync::Arc;
 use std::collections::btree_map::{BTreeMap, Entry};
-use util::Address;
+use ethereum_types::Address;
 
 use ethkey::{Brain, Generator, Secret};
 use ethstore::KeyFile;
 use ethcore::account_provider::AccountProvider;
 
-use jsonrpc_core::Error;
+use jsonrpc_core::Result;
 use v1::helpers::errors;
 use v1::helpers::accounts::unwrap_provider;
 use v1::traits::ParityAccounts;
@@ -44,13 +44,13 @@ impl ParityAccountsClient {
 
 	/// Attempt to get the `Arc<AccountProvider>`, errors if provider was not
 	/// set.
-	fn account_provider(&self) -> Result<Arc<AccountProvider>, Error> {
+	fn account_provider(&self) -> Result<Arc<AccountProvider>> {
 		unwrap_provider(&self.accounts)
 	}
 }
 
 impl ParityAccounts for ParityAccountsClient {
-	fn all_accounts_info(&self) -> Result<BTreeMap<RpcH160, ExtAccountInfo>, Error> {
+	fn all_accounts_info(&self) -> Result<BTreeMap<RpcH160, ExtAccountInfo>> {
 		let store = self.account_provider()?;
 		let info = store.accounts_info().map_err(|e| errors::account("Could not fetch account info.", e))?;
 		let other = store.addresses_info();
@@ -68,7 +68,7 @@ impl ParityAccounts for ParityAccountsClient {
 
 		for (address, account) in account_iter {
 			match accounts.entry(address) {
-				/// Insert only if occupied entry isn't already an account with UUID
+				// Insert only if occupied entry isn't already an account with UUID
 				Entry::Occupied(ref mut occupied) if occupied.get().uuid.is_none() => {
 					occupied.insert(account);
 				},
@@ -82,7 +82,7 @@ impl ParityAccounts for ParityAccountsClient {
 		Ok(accounts)
 	}
 
-	fn new_account_from_phrase(&self, phrase: String, pass: String) -> Result<RpcH160, Error> {
+	fn new_account_from_phrase(&self, phrase: String, pass: String) -> Result<RpcH160> {
 		let store = self.account_provider()?;
 
 		let brain = Brain::new(phrase).generate().unwrap();
@@ -91,16 +91,16 @@ impl ParityAccounts for ParityAccountsClient {
 			.map_err(|e| errors::account("Could not create account.", e))
 	}
 
-	fn new_account_from_wallet(&self, json: String, pass: String) -> Result<RpcH160, Error> {
+	fn new_account_from_wallet(&self, json: String, pass: String) -> Result<RpcH160> {
 		let store = self.account_provider()?;
 
 		store.import_presale(json.as_bytes(), &pass)
-			.or_else(|_| store.import_wallet(json.as_bytes(), &pass))
+			.or_else(|_| store.import_wallet(json.as_bytes(), &pass, true))
 			.map(Into::into)
 			.map_err(|e| errors::account("Could not create account.", e))
 	}
 
-	fn new_account_from_secret(&self, secret: RpcH256, pass: String) -> Result<RpcH160, Error> {
+	fn new_account_from_secret(&self, secret: RpcH256, pass: String) -> Result<RpcH160> {
 		let store = self.account_provider()?;
 
 		let secret = Secret::from_unsafe_slice(&secret.0)
@@ -110,7 +110,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map_err(|e| errors::account("Could not create account.", e))
 	}
 
-	fn test_password(&self, account: RpcH160, password: String) -> Result<bool, Error> {
+	fn test_password(&self, account: RpcH160, password: String) -> Result<bool> {
 		let account: Address = account.into();
 
 		self.account_provider()?
@@ -118,7 +118,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map_err(|e| errors::account("Could not fetch account info.", e))
 	}
 
-	fn change_password(&self, account: RpcH160, password: String, new_password: String) -> Result<bool, Error> {
+	fn change_password(&self, account: RpcH160, password: String, new_password: String) -> Result<bool> {
 		let account: Address = account.into();
 		self.account_provider()?
 			.change_password(&account, password, new_password)
@@ -126,7 +126,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map_err(|e| errors::account("Could not fetch account info.", e))
 	}
 
-	fn kill_account(&self, account: RpcH160, password: String) -> Result<bool, Error> {
+	fn kill_account(&self, account: RpcH160, password: String) -> Result<bool> {
 		let account: Address = account.into();
 		self.account_provider()?
 			.kill_account(&account, &password)
@@ -134,7 +134,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map_err(|e| errors::account("Could not delete account.", e))
 	}
 
-	fn remove_address(&self, addr: RpcH160) -> Result<bool, Error> {
+	fn remove_address(&self, addr: RpcH160) -> Result<bool> {
 		let store = self.account_provider()?;
 		let addr: Address = addr.into();
 
@@ -142,7 +142,7 @@ impl ParityAccounts for ParityAccountsClient {
 		Ok(true)
 	}
 
-	fn set_account_name(&self, addr: RpcH160, name: String) -> Result<bool, Error> {
+	fn set_account_name(&self, addr: RpcH160, name: String) -> Result<bool> {
 		let store = self.account_provider()?;
 		let addr: Address = addr.into();
 
@@ -151,7 +151,7 @@ impl ParityAccounts for ParityAccountsClient {
 		Ok(true)
 	}
 
-	fn set_account_meta(&self, addr: RpcH160, meta: String) -> Result<bool, Error> {
+	fn set_account_meta(&self, addr: RpcH160, meta: String) -> Result<bool> {
 		let store = self.account_provider()?;
 		let addr: Address = addr.into();
 
@@ -160,7 +160,7 @@ impl ParityAccounts for ParityAccountsClient {
 		Ok(true)
 	}
 
-	fn set_dapp_addresses(&self, dapp: DappId, addresses: Option<Vec<RpcH160>>) -> Result<bool, Error> {
+	fn set_dapp_addresses(&self, dapp: DappId, addresses: Option<Vec<RpcH160>>) -> Result<bool> {
 		let store = self.account_provider()?;
 
 		store.set_dapp_addresses(dapp.into(), addresses.map(into_vec))
@@ -168,7 +168,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map(|_| true)
 	}
 
-	fn dapp_addresses(&self, dapp: DappId) -> Result<Vec<RpcH160>, Error> {
+	fn dapp_addresses(&self, dapp: DappId) -> Result<Vec<RpcH160>> {
 		let store = self.account_provider()?;
 
 		store.dapp_addresses(dapp.into())
@@ -176,7 +176,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map(into_vec)
 	}
 
-	fn set_dapp_default_address(&self, dapp: DappId, address: RpcH160) -> Result<bool, Error> {
+	fn set_dapp_default_address(&self, dapp: DappId, address: RpcH160) -> Result<bool> {
 		let store = self.account_provider()?;
 
 		store.set_dapp_default_address(dapp.into(), address.into())
@@ -184,7 +184,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map(|_| true)
 	}
 
-	fn dapp_default_address(&self, dapp: DappId) -> Result<RpcH160, Error> {
+	fn dapp_default_address(&self, dapp: DappId) -> Result<RpcH160> {
 		let store = self.account_provider()?;
 
 		store.dapp_default_address(dapp.into())
@@ -192,7 +192,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map(Into::into)
 	}
 
-	fn set_new_dapps_addresses(&self, addresses: Option<Vec<RpcH160>>) -> Result<bool, Error> {
+	fn set_new_dapps_addresses(&self, addresses: Option<Vec<RpcH160>>) -> Result<bool> {
 		let store = self.account_provider()?;
 
 		store
@@ -201,7 +201,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map(|_| true)
 	}
 
-	fn new_dapps_addresses(&self) -> Result<Option<Vec<RpcH160>>, Error> {
+	fn new_dapps_addresses(&self) -> Result<Option<Vec<RpcH160>>> {
 		let store = self.account_provider()?;
 
 		store.new_dapps_addresses()
@@ -209,7 +209,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map(|accounts| accounts.map(into_vec))
 	}
 
-	fn set_new_dapps_default_address(&self, address: RpcH160) -> Result<bool, Error> {
+	fn set_new_dapps_default_address(&self, address: RpcH160) -> Result<bool> {
 		let store = self.account_provider()?;
 
 		store.set_new_dapps_default_address(address.into())
@@ -217,7 +217,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map(|_| true)
 	}
 
-	fn new_dapps_default_address(&self) -> Result<RpcH160, Error> {
+	fn new_dapps_default_address(&self) -> Result<RpcH160> {
 		let store = self.account_provider()?;
 
 		store.new_dapps_default_address()
@@ -225,7 +225,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map(Into::into)
 	}
 
-	fn recent_dapps(&self) -> Result<BTreeMap<DappId, u64>, Error> {
+	fn recent_dapps(&self) -> Result<BTreeMap<DappId, u64>> {
 		let store = self.account_provider()?;
 
 		store.recent_dapps()
@@ -233,7 +233,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map(|map| map.into_iter().map(|(k, v)| (k.into(), v)).collect())
 	}
 
-	fn import_geth_accounts(&self, addresses: Vec<RpcH160>) -> Result<Vec<RpcH160>, Error> {
+	fn import_geth_accounts(&self, addresses: Vec<RpcH160>) -> Result<Vec<RpcH160>> {
 		let store = self.account_provider()?;
 
 		store
@@ -242,73 +242,73 @@ impl ParityAccounts for ParityAccountsClient {
 			.map_err(|e| errors::account("Couldn't import Geth accounts", e))
 	}
 
-	fn geth_accounts(&self) -> Result<Vec<RpcH160>, Error> {
+	fn geth_accounts(&self) -> Result<Vec<RpcH160>> {
 		let store = self.account_provider()?;
 
 		Ok(into_vec(store.list_geth_accounts(false)))
 	}
 
-	fn create_vault(&self, name: String, password: String) -> Result<bool, Error> {
+	fn create_vault(&self, name: String, password: String) -> Result<bool> {
 		self.account_provider()?
 			.create_vault(&name, &password)
 			.map_err(|e| errors::account("Could not create vault.", e))
 			.map(|_| true)
 	}
 
-	fn open_vault(&self, name: String, password: String) -> Result<bool, Error> {
+	fn open_vault(&self, name: String, password: String) -> Result<bool> {
 		self.account_provider()?
 			.open_vault(&name, &password)
 			.map_err(|e| errors::account("Could not open vault.", e))
 			.map(|_| true)
 	}
 
-	fn close_vault(&self, name: String) -> Result<bool, Error> {
+	fn close_vault(&self, name: String) -> Result<bool> {
 		self.account_provider()?
 			.close_vault(&name)
 			.map_err(|e| errors::account("Could not close vault.", e))
 			.map(|_| true)
 	}
 
-	fn list_vaults(&self) -> Result<Vec<String>, Error> {
+	fn list_vaults(&self) -> Result<Vec<String>> {
 		self.account_provider()?
 			.list_vaults()
 			.map_err(|e| errors::account("Could not list vaults.", e))
 	}
 
-	fn list_opened_vaults(&self) -> Result<Vec<String>, Error> {
+	fn list_opened_vaults(&self) -> Result<Vec<String>> {
 		self.account_provider()?
 			.list_opened_vaults()
 			.map_err(|e| errors::account("Could not list vaults.", e))
 	}
 
-	fn change_vault_password(&self, name: String, new_password: String) -> Result<bool, Error> {
+	fn change_vault_password(&self, name: String, new_password: String) -> Result<bool> {
 		self.account_provider()?
 			.change_vault_password(&name, &new_password)
 			.map_err(|e| errors::account("Could not change vault password.", e))
 			.map(|_| true)
 	}
 
-	fn change_vault(&self, address: RpcH160, new_vault: String) -> Result<bool, Error> {
+	fn change_vault(&self, address: RpcH160, new_vault: String) -> Result<bool> {
 		self.account_provider()?
 			.change_vault(address.into(), &new_vault)
 			.map_err(|e| errors::account("Could not change vault.", e))
 			.map(|_| true)
 	}
 
-	fn get_vault_meta(&self, name: String) -> Result<String, Error> {
+	fn get_vault_meta(&self, name: String) -> Result<String> {
 		self.account_provider()?
 			.get_vault_meta(&name)
 			.map_err(|e| errors::account("Could not get vault metadata.", e))
 	}
 
-	fn set_vault_meta(&self, name: String, meta: String) -> Result<bool, Error> {
+	fn set_vault_meta(&self, name: String, meta: String) -> Result<bool> {
 		self.account_provider()?
 			.set_vault_meta(&name, &meta)
 			.map_err(|e| errors::account("Could not update vault metadata.", e))
 			.map(|_| true)
 	}
 
-	fn derive_key_index(&self, addr: RpcH160, password: String, derivation: DeriveHierarchical, save_as_account: bool) -> Result<RpcH160, Error> {
+	fn derive_key_index(&self, addr: RpcH160, password: String, derivation: DeriveHierarchical, save_as_account: bool) -> Result<RpcH160> {
 		let addr: Address = addr.into();
 		self.account_provider()?
 			.derive_account(
@@ -321,7 +321,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map_err(|e| errors::account("Could not derive account.", e))
 	}
 
-	fn derive_key_hash(&self, addr: RpcH160, password: String, derivation: DeriveHash, save_as_account: bool) -> Result<RpcH160, Error> {
+	fn derive_key_hash(&self, addr: RpcH160, password: String, derivation: DeriveHash, save_as_account: bool) -> Result<RpcH160> {
 		let addr: Address = addr.into();
 		self.account_provider()?
 			.derive_account(
@@ -334,7 +334,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map_err(|e| errors::account("Could not derive account.", e))
 	}
 
-	fn export_account(&self, addr: RpcH160, password: String) -> Result<KeyFile, Error> {
+	fn export_account(&self, addr: RpcH160, password: String) -> Result<KeyFile> {
 		let addr = addr.into();
 		self.account_provider()?
 			.export_account(
@@ -345,7 +345,7 @@ impl ParityAccounts for ParityAccountsClient {
 			.map_err(|e| errors::account("Could not export account.", e))
 	}
 
-	fn sign_message(&self, addr: RpcH160, password: String, message: RpcH256) -> Result<RpcH520, Error> {
+	fn sign_message(&self, addr: RpcH160, password: String, message: RpcH256) -> Result<RpcH520> {
 		self.account_provider()?
 			.sign(
 				addr.into(),
@@ -355,6 +355,11 @@ impl ParityAccounts for ParityAccountsClient {
 			.map(Into::into)
 			.map_err(|e| errors::account("Could not sign message.", e))
 	}
+
+	fn hardware_pin_matrix_ack(&self, path: String, pin: String) -> Result<bool> {
+		let store = self.account_provider()?;
+		Ok(store.hardware_pin_matrix_ack(&path, &pin).map_err(|e| errors::account("Error communicating with hardware wallet.", e))?)
+	}
 }
 
 fn into_vec<A, B>(a: Vec<A>) -> Vec<B> where
diff --git a/rpc/src/v1/impls/parity_set.rs b/rpc/src/v1/impls/parity_set.rs
index 540964e637bd4d62770c511a5d9acf36f9947980..9d07118723005f56f4a1787d4614b5ed7f41b8bd 100644
--- a/rpc/src/v1/impls/parity_set.rs
+++ b/rpc/src/v1/impls/parity_set.rs
@@ -23,11 +23,12 @@ use ethcore::client::MiningBlockChainClient;
 use ethcore::mode::Mode;
 use ethsync::ManageNetwork;
 use fetch::{self, Fetch};
-use futures::{BoxFuture, Future};
-use util::sha3;
+use futures_cpupool::CpuPool;
+use hash::keccak_buffer;
 use updater::{Service as UpdateService};
 
-use jsonrpc_core::Error;
+use jsonrpc_core::{BoxFuture, Result};
+use jsonrpc_core::futures::Future;
 use v1::helpers::dapps::DappsService;
 use v1::helpers::errors;
 use v1::traits::ParitySet;
@@ -41,6 +42,7 @@ pub struct ParitySetClient<C, M, U, F = fetch::Client> {
 	net: Arc<ManageNetwork>,
 	dapps: Option<Arc<DappsService>>,
 	fetch: F,
+	pool: CpuPool,
 	eip86_transition: u64,
 }
 
@@ -55,6 +57,7 @@ impl<C, M, U, F> ParitySetClient<C, M, U, F>
 		net: &Arc<ManageNetwork>,
 		dapps: Option<Arc<DappsService>>,
 		fetch: F,
+		pool: CpuPool,
 	) -> Self {
 		ParitySetClient {
 			client: client.clone(),
@@ -63,6 +66,7 @@ impl<C, M, U, F> ParitySetClient<C, M, U, F>
 			net: net.clone(),
 			dapps: dapps,
 			fetch: fetch,
+			pool: pool,
 			eip86_transition: client.eip86_transition(),
 		}
 	}
@@ -75,81 +79,81 @@ impl<C, M, U, F> ParitySet for ParitySetClient<C, M, U, F> where
 	F: Fetch + 'static,
 {
 
-	fn set_min_gas_price(&self, gas_price: U256) -> Result<bool, Error> {
+	fn set_min_gas_price(&self, gas_price: U256) -> Result<bool> {
 		self.miner.set_minimal_gas_price(gas_price.into());
 		Ok(true)
 	}
 
-	fn set_gas_floor_target(&self, target: U256) -> Result<bool, Error> {
+	fn set_gas_floor_target(&self, target: U256) -> Result<bool> {
 		self.miner.set_gas_floor_target(target.into());
 		Ok(true)
 	}
 
-	fn set_gas_ceil_target(&self, target: U256) -> Result<bool, Error> {
+	fn set_gas_ceil_target(&self, target: U256) -> Result<bool> {
 		self.miner.set_gas_ceil_target(target.into());
 		Ok(true)
 	}
 
-	fn set_extra_data(&self, extra_data: Bytes) -> Result<bool, Error> {
+	fn set_extra_data(&self, extra_data: Bytes) -> Result<bool> {
 		self.miner.set_extra_data(extra_data.into_vec());
 		Ok(true)
 	}
 
-	fn set_author(&self, author: H160) -> Result<bool, Error> {
+	fn set_author(&self, author: H160) -> Result<bool> {
 		self.miner.set_author(author.into());
 		Ok(true)
 	}
 
-	fn set_engine_signer(&self, address: H160, password: String) -> Result<bool, Error> {
+	fn set_engine_signer(&self, address: H160, password: String) -> Result<bool> {
 		self.miner.set_engine_signer(address.into(), password).map_err(Into::into).map_err(errors::password)?;
 		Ok(true)
 	}
 
-	fn set_transactions_limit(&self, limit: usize) -> Result<bool, Error> {
+	fn set_transactions_limit(&self, limit: usize) -> Result<bool> {
 		self.miner.set_transactions_limit(limit);
 		Ok(true)
 	}
 
-	fn set_tx_gas_limit(&self, limit: U256) -> Result<bool, Error> {
+	fn set_tx_gas_limit(&self, limit: U256) -> Result<bool> {
 		self.miner.set_tx_gas_limit(limit.into());
 		Ok(true)
 	}
 
-	fn add_reserved_peer(&self, peer: String) -> Result<bool, Error> {
+	fn add_reserved_peer(&self, peer: String) -> Result<bool> {
 		match self.net.add_reserved_peer(peer) {
 			Ok(()) => Ok(true),
 			Err(e) => Err(errors::invalid_params("Peer address", e)),
 		}
 	}
 
-	fn remove_reserved_peer(&self, peer: String) -> Result<bool, Error> {
+	fn remove_reserved_peer(&self, peer: String) -> Result<bool> {
 		match self.net.remove_reserved_peer(peer) {
 			Ok(()) => Ok(true),
 			Err(e) => Err(errors::invalid_params("Peer address", e)),
 		}
 	}
 
-	fn drop_non_reserved_peers(&self) -> Result<bool, Error> {
+	fn drop_non_reserved_peers(&self) -> Result<bool> {
 		self.net.deny_unreserved_peers();
 		Ok(true)
 	}
 
-	fn accept_non_reserved_peers(&self) -> Result<bool, Error> {
+	fn accept_non_reserved_peers(&self) -> Result<bool> {
 		self.net.accept_unreserved_peers();
 		Ok(true)
 	}
 
-	fn start_network(&self) -> Result<bool, Error> {
+	fn start_network(&self) -> Result<bool> {
 		self.net.start_network();
 		Ok(true)
 	}
 
-	fn stop_network(&self) -> Result<bool, Error> {
+	fn stop_network(&self) -> Result<bool> {
 		self.net.stop_network();
 		Ok(true)
 	}
 
-	fn set_mode(&self, mode: String) -> Result<bool, Error> {
+	fn set_mode(&self, mode: String) -> Result<bool> {
 		self.client.set_mode(match mode.as_str() {
 			"offline" => Mode::Off,
 			"dark" => Mode::Dark(300),
@@ -160,39 +164,41 @@ impl<C, M, U, F> ParitySet for ParitySetClient<C, M, U, F> where
 		Ok(true)
 	}
 
-	fn set_spec_name(&self, spec_name: String) -> Result<bool, Error> {
+	fn set_spec_name(&self, spec_name: String) -> Result<bool> {
 		self.client.set_spec_name(spec_name);
 		Ok(true)
 	}
 
-	fn hash_content(&self, url: String) -> BoxFuture<H256, Error> {
-		self.fetch.process(self.fetch.fetch(&url).then(move |result| {
+	fn hash_content(&self, url: String) -> BoxFuture<H256> {
+		let future = self.fetch.fetch(&url, Default::default()).then(move |result| {
 			result
 				.map_err(errors::fetch)
-				.and_then(|response| {
-					sha3(&mut io::BufReader::new(response)).map_err(errors::fetch)
+				.and_then(move |response| {
+					let mut reader = io::BufReader::new(fetch::BodyReader::new(response));
+					keccak_buffer(&mut reader).map_err(errors::fetch)
 				})
 				.map(Into::into)
-		}))
+		});
+		Box::new(self.pool.spawn(future))
 	}
 
-	fn dapps_refresh(&self) -> Result<bool, Error> {
+	fn dapps_refresh(&self) -> Result<bool> {
 		self.dapps.as_ref().map(|dapps| dapps.refresh_local_dapps()).ok_or_else(errors::dapps_disabled)
 	}
 
-	fn dapps_list(&self) -> Result<Vec<LocalDapp>, Error> {
+	fn dapps_list(&self) -> Result<Vec<LocalDapp>> {
 		self.dapps.as_ref().map(|dapps| dapps.list_dapps()).ok_or_else(errors::dapps_disabled)
 	}
 
-	fn upgrade_ready(&self) -> Result<Option<ReleaseInfo>, Error> {
+	fn upgrade_ready(&self) -> Result<Option<ReleaseInfo>> {
 		Ok(self.updater.upgrade_ready().map(Into::into))
 	}
 
-	fn execute_upgrade(&self) -> Result<bool, Error> {
+	fn execute_upgrade(&self) -> Result<bool> {
 		Ok(self.updater.execute_upgrade())
 	}
 
-	fn remove_transaction(&self, hash: H256) -> Result<Option<Transaction>, Error> {
+	fn remove_transaction(&self, hash: H256) -> Result<Option<Transaction>> {
 		let block_number = self.client.chain_info().best_block_number;
 		let hash = hash.into();
 
diff --git a/rpc/src/v1/impls/personal.rs b/rpc/src/v1/impls/personal.rs
index 302190fd4551cb296778d97d54a1b308e3c22a70..c3560fe9df395d5873e0aa0c6674751cd0c3aac8 100644
--- a/rpc/src/v1/impls/personal.rs
+++ b/rpc/src/v1/impls/personal.rs
@@ -17,18 +17,26 @@
 //! Account management (personal) rpc implementation
 use std::sync::Arc;
 
+use bytes::{Bytes, ToPretty};
 use ethcore::account_provider::AccountProvider;
-use ethcore::transaction::PendingTransaction;
+use transaction::PendingTransaction;
+use ethereum_types::{H520, U128, Address};
+use ethkey::{public_to_address, recover, Signature};
 
-use util::{Address, U128, ToPretty};
-
-use futures::{future, Future, BoxFuture};
-use jsonrpc_core::Error;
+use jsonrpc_core::{BoxFuture, Result};
+use jsonrpc_core::futures::{future, Future};
 use v1::helpers::errors;
-use v1::helpers::dispatch::{Dispatcher, SignWith};
+use v1::helpers::dispatch::{self, eth_data_hash, Dispatcher, SignWith};
 use v1::helpers::accounts::unwrap_provider;
 use v1::traits::Personal;
-use v1::types::{H160 as RpcH160, H256 as RpcH256, U128 as RpcU128, TransactionRequest};
+use v1::types::{
+	H160 as RpcH160, H256 as RpcH256, H520 as RpcH520, U128 as RpcU128,
+	Bytes as RpcBytes,
+	ConfirmationPayload as RpcConfirmationPayload,
+	ConfirmationResponse as RpcConfirmationResponse,
+	TransactionRequest,
+	RichRawTransaction as RpcRichRawTransaction,
+};
 use v1::metadata::Metadata;
 
 /// Account management (personal) rpc implementation.
@@ -40,29 +48,58 @@ pub struct PersonalClient<D: Dispatcher> {
 
 impl<D: Dispatcher> PersonalClient<D> {
 	/// Creates new PersonalClient
-	pub fn new(store: &Option<Arc<AccountProvider>>, dispatcher: D, allow_perm_unlock: bool) -> Self {
+	pub fn new(accounts: Option<Arc<AccountProvider>>, dispatcher: D, allow_perm_unlock: bool) -> Self {
 		PersonalClient {
-			accounts: store.clone(),
-			dispatcher: dispatcher,
-			allow_perm_unlock: allow_perm_unlock,
+			accounts,
+			dispatcher,
+			allow_perm_unlock,
 		}
 	}
 
-	fn account_provider(&self) -> Result<Arc<AccountProvider>, Error> {
+	fn account_provider(&self) -> Result<Arc<AccountProvider>> {
 		unwrap_provider(&self.accounts)
 	}
 }
 
+impl<D: Dispatcher + 'static> PersonalClient<D> {
+	fn do_sign_transaction(&self, meta: Metadata, request: TransactionRequest, password: String) -> BoxFuture<(PendingTransaction, D)> {
+		let dispatcher = self.dispatcher.clone();
+		let accounts = try_bf!(self.account_provider());
+
+		let default = match request.from.as_ref() {
+			Some(account) => Ok(account.clone().into()),
+			None => accounts
+				.dapp_default_address(meta.dapp_id().into())
+				.map_err(|e| errors::account("Cannot find default account.", e)),
+		};
+
+		let default = match default {
+			Ok(default) => default,
+			Err(e) => return Box::new(future::err(e)),
+		};
+
+		Box::new(dispatcher.fill_optional_fields(request.into(), default, false)
+			.and_then(move |filled| {
+				let condition = filled.condition.clone().map(Into::into);
+				dispatcher.sign(accounts, filled, SignWith::Password(password))
+					.map(|tx| tx.into_value())
+					.map(move |tx| PendingTransaction::new(tx, condition))
+					.map(move |tx| (tx, dispatcher))
+			})
+		)
+	}
+}
+
 impl<D: Dispatcher + 'static> Personal for PersonalClient<D> {
 	type Metadata = Metadata;
 
-	fn accounts(&self) -> Result<Vec<RpcH160>, Error> {
+	fn accounts(&self) -> Result<Vec<RpcH160>> {
 		let store = self.account_provider()?;
 		let accounts = store.accounts().map_err(|e| errors::account("Could not fetch accounts.", e))?;
 		Ok(accounts.into_iter().map(Into::into).collect::<Vec<RpcH160>>())
 	}
 
-	fn new_account(&self, pass: String) -> Result<RpcH160, Error> {
+	fn new_account(&self, pass: String) -> Result<RpcH160> {
 		let store = self.account_provider()?;
 
 		store.new_account(&pass)
@@ -70,7 +107,7 @@ impl<D: Dispatcher + 'static> Personal for PersonalClient<D> {
 			.map_err(|e| errors::account("Could not create account.", e))
 	}
 
-	fn unlock_account(&self, account: RpcH160, account_pass: String, duration: Option<RpcU128>) -> Result<bool, Error> {
+	fn unlock_account(&self, account: RpcH160, account_pass: String, duration: Option<RpcU128>) -> Result<bool> {
 		let account: Address = account.into();
 		let store = self.account_provider()?;
 		let duration = match duration {
@@ -87,42 +124,61 @@ impl<D: Dispatcher + 'static> Personal for PersonalClient<D> {
 		};
 
 		let r = match (self.allow_perm_unlock, duration) {
-			(false, _) => store.unlock_account_temporarily(account, account_pass),
+			(false, None) => store.unlock_account_temporarily(account, account_pass),
+			(false, _) => return Err(errors::unsupported(
+				"Time-unlocking is only supported in --geth compatibility mode.",
+				Some("Restart your client with --geth flag or use personal_sendTransaction instead."),
+			)),
 			(true, Some(0)) => store.unlock_account_permanently(account, account_pass),
 			(true, Some(d)) => store.unlock_account_timed(account, account_pass, d * 1000),
 			(true, None) => store.unlock_account_timed(account, account_pass, 300_000),
 		};
 		match r {
 			Ok(_) => Ok(true),
-			// TODO [ToDr] Proper error here?
-			Err(_) => Ok(false),
+			Err(err) => Err(errors::account("Unable to unlock the account.", err)),
 		}
 	}
 
-	fn send_transaction(&self, meta: Metadata, request: TransactionRequest, password: String) -> BoxFuture<RpcH256, Error> {
+	fn sign(&self, data: RpcBytes, account: RpcH160, password: String) -> BoxFuture<RpcH520> {
 		let dispatcher = self.dispatcher.clone();
 		let accounts = try_bf!(self.account_provider());
 
-		let default = match request.from.as_ref() {
-			Some(account) => Ok(account.clone().into()),
-			None => accounts
-				.dapp_default_address(meta.dapp_id().into())
-				.map_err(|e| errors::account("Cannot find default account.", e)),
-		};
+		let payload = RpcConfirmationPayload::EthSignMessage((account.clone(), data).into());
+
+		Box::new(dispatch::from_rpc(payload, account.into(), &dispatcher)
+				 .and_then(|payload| {
+					 dispatch::execute(dispatcher, accounts, payload, dispatch::SignWith::Password(password))
+				 })
+				 .map(|v| v.into_value())
+				 .then(|res| match res {
+					 Ok(RpcConfirmationResponse::Signature(signature)) => Ok(signature),
+					 Err(e) => Err(e),
+					 e => Err(errors::internal("Unexpected result", e)),
+				 }))
+	}
 
-		let default = match default {
-			Ok(default) => default,
-			Err(e) => return future::err(e).boxed(),
-		};
+	fn ec_recover(&self, data: RpcBytes, signature: RpcH520) -> BoxFuture<RpcH160> {
+		let signature: H520 = signature.into();
+		let signature = Signature::from_electrum(&signature);
+		let data: Bytes = data.into();
 
-		dispatcher.fill_optional_fields(request.into(), default, false)
-			.and_then(move |filled| {
-				let condition = filled.condition.clone().map(Into::into);
-				dispatcher.sign(accounts, filled, SignWith::Password(password))
-					.map(|tx| tx.into_value())
-					.map(move |tx| PendingTransaction::new(tx, condition))
-					.map(move |tx| (tx, dispatcher))
-			})
+		let hash = eth_data_hash(data);
+		let account = recover(&signature.into(), &hash)
+			.map_err(errors::encryption)
+			.map(|public| {
+				public_to_address(&public).into()
+			});
+
+		Box::new(future::done(account))
+	}
+
+	fn sign_transaction(&self, meta: Metadata, request: TransactionRequest, password: String) -> BoxFuture<RpcRichRawTransaction> {
+		Box::new(self.do_sign_transaction(meta, request, password)
+			.map(|(pending_tx, dispatcher)| dispatcher.enrich(pending_tx.transaction)))
+	}
+
+	fn send_transaction(&self, meta: Metadata, request: TransactionRequest, password: String) -> BoxFuture<RpcH256> {
+		Box::new(self.do_sign_transaction(meta, request, password)
 			.and_then(|(pending_tx, dispatcher)| {
 				let chain_id = pending_tx.chain_id();
 				trace!(target: "miner", "send_transaction: dispatching tx: {} for chain ID {:?}",
@@ -130,10 +186,10 @@ impl<D: Dispatcher + 'static> Personal for PersonalClient<D> {
 
 				dispatcher.dispatch_transaction(pending_tx).map(Into::into)
 			})
-			.boxed()
+		)
 	}
 
-	fn sign_and_send_transaction(&self, meta: Metadata, request: TransactionRequest, password: String) -> BoxFuture<RpcH256, Error> {
+	fn sign_and_send_transaction(&self, meta: Metadata, request: TransactionRequest, password: String) -> BoxFuture<RpcH256> {
 		warn!("Using deprecated personal_signAndSendTransaction, use personal_sendTransaction instead.");
 		self.send_transaction(meta, request, password)
 	}
diff --git a/rpc/src/v1/impls/pubsub.rs b/rpc/src/v1/impls/pubsub.rs
index 616905f4ae558ccb0bd4c542e9b094f352b7f403..59eef19533fb005d8d10ce2c4f9d4db5456f3f80 100644
--- a/rpc/src/v1/impls/pubsub.rs
+++ b/rpc/src/v1/impls/pubsub.rs
@@ -18,10 +18,10 @@
 
 use std::sync::Arc;
 use std::time::Duration;
-use util::RwLock;
+use parking_lot::RwLock;
 
-use futures::{self, BoxFuture, Future, Stream, Sink};
-use jsonrpc_core::{self as core, Error, MetaIoHandler};
+use jsonrpc_core::{self as core, Result, MetaIoHandler};
+use jsonrpc_core::futures::{Future, Stream, Sink};
 use jsonrpc_macros::Trailing;
 use jsonrpc_macros::pubsub::Subscriber;
 use jsonrpc_pubsub::SubscriptionId;
@@ -94,8 +94,8 @@ impl<S: core::Middleware<Metadata>> PubSub for PubSubClient<S> {
 		}
 	}
 
-	fn parity_unsubscribe(&self, id: SubscriptionId) -> BoxFuture<bool, Error> {
+	fn parity_unsubscribe(&self, id: SubscriptionId) -> Result<bool> {
 		let res = self.poll_manager.write().unsubscribe(&id);
-		futures::future::ok(res).boxed()
+		Ok(res)
 	}
 }
diff --git a/rpc/src/v1/impls/rpc.rs b/rpc/src/v1/impls/rpc.rs
index d0b10cddbc46487ff6b1a6d66ecc7174801f2ac4..3c76a316464a42677abfdf9c5772a6957c3b321f 100644
--- a/rpc/src/v1/impls/rpc.rs
+++ b/rpc/src/v1/impls/rpc.rs
@@ -16,7 +16,7 @@
 
 //! RPC generic methods implementation.
 use std::collections::BTreeMap;
-use jsonrpc_core::Error;
+use jsonrpc_core::Result;
 use v1::traits::Rpc;
 
 /// RPC generic methods implementation.
@@ -39,7 +39,7 @@ impl RpcClient {
 }
 
 impl Rpc for RpcClient {
-	fn rpc_modules(&self) -> Result<BTreeMap<String, String>, Error> {
+	fn rpc_modules(&self) -> Result<BTreeMap<String, String>> {
 		let modules = self.modules.iter()
 			.fold(BTreeMap::new(), |mut map, (k, v)| {
 				map.insert(k.to_owned(), v.to_owned());
@@ -49,7 +49,7 @@ impl Rpc for RpcClient {
 		Ok(modules)
 	}
 
-	fn modules(&self) -> Result<BTreeMap<String, String>, Error> {
+	fn modules(&self) -> Result<BTreeMap<String, String>> {
 		let modules = self.modules.iter()
 			.filter(|&(k, _v)| {
 				self.valid_apis.contains(k)
diff --git a/rpc/src/v1/impls/secretstore.rs b/rpc/src/v1/impls/secretstore.rs
index 26a09705db612383d81f075755466449863ff03d..5a60192e8aff57aee1ffd021fe7f08d20fc94d7a 100644
--- a/rpc/src/v1/impls/secretstore.rs
+++ b/rpc/src/v1/impls/secretstore.rs
@@ -16,18 +16,20 @@
 
 //! SecretStore-specific rpc implementation.
 
+use std::collections::BTreeSet;
 use std::sync::Arc;
 
 use crypto::DEFAULT_MAC;
 use ethkey::Secret;
 use ethcore::account_provider::AccountProvider;
 
-use jsonrpc_core::Error;
+use jsonrpc_core::Result;
 use v1::helpers::errors;
 use v1::helpers::accounts::unwrap_provider;
-use v1::helpers::secretstore::{encrypt_document, decrypt_document, decrypt_document_with_shadow};
+use v1::helpers::secretstore::{generate_document_key, encrypt_document,
+	decrypt_document, decrypt_document_with_shadow, ordered_servers_keccak};
 use v1::traits::SecretStore;
-use v1::types::{H160, H512, Bytes};
+use v1::types::{H160, H256, H512, Bytes, EncryptedDocumentKey};
 
 /// Parity implementation.
 pub struct SecretStoreClient {
@@ -44,36 +46,43 @@ impl SecretStoreClient {
 
 	/// Attempt to get the `Arc<AccountProvider>`, errors if provider was not
 	/// set.
-	fn account_provider(&self) -> Result<Arc<AccountProvider>, Error> {
+	fn account_provider(&self) -> Result<Arc<AccountProvider>> {
 		unwrap_provider(&self.accounts)
 	}
 
 	/// Decrypt public key using account' private key
-	fn decrypt_key(&self, address: H160, password: String, key: Bytes) -> Result<Vec<u8>, Error> {
+	fn decrypt_key(&self, address: H160, password: String, key: Bytes) -> Result<Vec<u8>> {
 		let store = self.account_provider()?;
 		store.decrypt(address.into(), Some(password), &DEFAULT_MAC, &key.0)
 			.map_err(|e| errors::account("Could not decrypt key.", e))
 	}
 
 	/// Decrypt secret key using account' private key
-	fn decrypt_secret(&self, address: H160, password: String, key: Bytes) -> Result<Secret, Error> {
+	fn decrypt_secret(&self, address: H160, password: String, key: Bytes) -> Result<Secret> {
 		self.decrypt_key(address, password, key)
 			.and_then(|s| Secret::from_unsafe_slice(&s).map_err(|e| errors::account("invalid secret", e)))
 	}
 }
 
 impl SecretStore for SecretStoreClient {
-	fn encrypt(&self, address: H160, password: String, key: Bytes, data: Bytes) -> Result<Bytes, Error> {
+	fn generate_document_key(&self, address: H160, password: String, server_key_public: H512) -> Result<EncryptedDocumentKey> {
+		let store = self.account_provider()?;
+		let account_public = store.account_public(address.into(), &password)
+			.map_err(|e| errors::account("Could not read account public.", e))?;
+		generate_document_key(account_public, server_key_public.into())
+	}
+
+	fn encrypt(&self, address: H160, password: String, key: Bytes, data: Bytes) -> Result<Bytes> {
 		encrypt_document(self.decrypt_key(address, password, key)?, data.0)
 			.map(Into::into)
 	}
 
-	fn decrypt(&self, address: H160, password: String, key: Bytes, data: Bytes) -> Result<Bytes, Error> {
+	fn decrypt(&self, address: H160, password: String, key: Bytes, data: Bytes) -> Result<Bytes> {
 		decrypt_document(self.decrypt_key(address, password, key)?, data.0)
 			.map(Into::into)
 	}
 
-	fn shadow_decrypt(&self, address: H160, password: String, decrypted_secret: H512, common_point: H512, decrypt_shadows: Vec<Bytes>, data: Bytes) -> Result<Bytes, Error> {
+	fn shadow_decrypt(&self, address: H160, password: String, decrypted_secret: H512, common_point: H512, decrypt_shadows: Vec<Bytes>, data: Bytes) -> Result<Bytes> {
 		let mut shadows = Vec::with_capacity(decrypt_shadows.len());
 		for decrypt_shadow in decrypt_shadows {
 			shadows.push(self.decrypt_secret(address.clone(), password.clone(), decrypt_shadow)?);
@@ -82,4 +91,16 @@ impl SecretStore for SecretStoreClient {
 		decrypt_document_with_shadow(decrypted_secret.into(), common_point.into(), shadows, data.0)
 			.map(Into::into)
 	}
+
+	fn servers_set_hash(&self, servers_set: BTreeSet<H512>) -> Result<H256> {
+		Ok(ordered_servers_keccak(servers_set))
+	}
+
+	fn sign_raw_hash(&self, address: H160, password: String, raw_hash: H256) -> Result<Bytes> {
+		let store = self.account_provider()?;
+		store
+			.sign(address.into(), Some(password), raw_hash.into())
+			.map(|s| Bytes::new((*s).to_vec()))
+			.map_err(|e| errors::account("Could not sign raw hash.", e))
+	}
 }
diff --git a/rpc/src/v1/impls/signer.rs b/rpc/src/v1/impls/signer.rs
index 79f4f0e3814ccb7f477d1c87ce7c330e32bbb1df..ce3f13b976742bea163a34e23807349be1493135 100644
--- a/rpc/src/v1/impls/signer.rs
+++ b/rpc/src/v1/impls/signer.rs
@@ -19,14 +19,15 @@
 use std::sync::Arc;
 
 use ethcore::account_provider::AccountProvider;
-use ethcore::transaction::{SignedTransaction, PendingTransaction};
 use ethkey;
-use futures::{future, BoxFuture, Future, IntoFuture};
 use parity_reactor::Remote;
+use parking_lot::Mutex;
 use rlp::UntrustedRlp;
-use util::Mutex;
+use transaction::{SignedTransaction, PendingTransaction};
 
-use jsonrpc_core::{futures, Error};
+use jsonrpc_core::{Result, BoxFuture, Error};
+use jsonrpc_core::futures::{future, Future, IntoFuture};
+use jsonrpc_core::futures::future::Either;
 use jsonrpc_pubsub::SubscriptionId;
 use jsonrpc_macros::pubsub::{Sink, Subscriber};
 use v1::helpers::accounts::unwrap_provider;
@@ -72,33 +73,26 @@ impl<D: Dispatcher + 'static> SignerClient<D> {
 		SignerClient {
 			signer: signer.clone(),
 			accounts: store.clone(),
-			dispatcher: dispatcher,
-			subscribers: subscribers,
+			dispatcher,
+			subscribers,
 		}
 	}
 
-	fn account_provider(&self) -> Result<Arc<AccountProvider>, Error> {
+	fn account_provider(&self) -> Result<Arc<AccountProvider>> {
 		unwrap_provider(&self.accounts)
 	}
 
-	fn confirm_internal<F, T>(&self, id: U256, modification: TransactionModification, f: F) -> BoxFuture<WithToken<ConfirmationResponse>, Error> where
+	fn confirm_internal<F, T>(&self, id: U256, modification: TransactionModification, f: F) -> BoxFuture<WithToken<ConfirmationResponse>> where
 		F: FnOnce(D, Arc<AccountProvider>, ConfirmationPayload) -> T,
 		T: IntoFuture<Item=WithToken<ConfirmationResponse>, Error=Error>,
 		T::Future: Send + 'static
 	{
 		let id = id.into();
+		let accounts = try_bf!(self.account_provider());
 		let dispatcher = self.dispatcher.clone();
+		let signer = self.signer.clone();
 
-		let setup = || {
-			Ok((self.account_provider()?, self.signer.clone()))
-		};
-
-		let (accounts, signer) = match setup() {
-			Ok(x) => x,
-			Err(e) => return future::err(e).boxed(),
-		};
-
-		signer.peek(&id).map(|confirmation| {
+		Box::new(signer.peek(&id).map(|confirmation| {
 			let mut payload = confirmation.payload.clone();
 			// Modify payload
 			if let ConfirmationPayload::SendTransaction(ref mut request) = payload {
@@ -118,20 +112,20 @@ impl<D: Dispatcher + 'static> SignerClient<D> {
 				}
 			}
 			let fut = f(dispatcher, accounts, payload);
-			fut.into_future().then(move |result| {
+			Either::A(fut.into_future().then(move |result| {
 				// Execute
 				if let Ok(ref response) = result {
 					signer.request_confirmed(id, Ok((*response).clone()));
 				}
 
 				result
-			}).boxed()
+			}))
 		})
-		.unwrap_or_else(|| future::err(errors::invalid_params("Unknown RequestID", id)).boxed())
+		.unwrap_or_else(|| Either::B(future::err(errors::invalid_params("Unknown RequestID", id)))))
 	}
 
-	fn verify_transaction<F>(bytes: Bytes, request: FilledTransactionRequest, process: F) -> Result<ConfirmationResponse, Error> where
-		F: FnOnce(PendingTransaction) -> Result<ConfirmationResponse, Error>,
+	fn verify_transaction<F>(bytes: Bytes, request: FilledTransactionRequest, process: F) -> Result<ConfirmationResponse> where
+		F: FnOnce(PendingTransaction) -> Result<ConfirmationResponse>,
 	{
 		let signed_transaction = UntrustedRlp::new(&bytes.0).as_val().map_err(errors::rlp)?;
 		let signed_transaction = SignedTransaction::new(signed_transaction).map_err(|e| errors::invalid_params("Invalid signature.", e))?;
@@ -165,7 +159,7 @@ impl<D: Dispatcher + 'static> SignerClient<D> {
 impl<D: Dispatcher + 'static> Signer for SignerClient<D> {
 	type Metadata = Metadata;
 
-	fn requests_to_confirm(&self) -> Result<Vec<ConfirmationRequest>, Error> {
+	fn requests_to_confirm(&self) -> Result<Vec<ConfirmationRequest>> {
 		Ok(self.signer.requests()
 			.into_iter()
 			.map(Into::into)
@@ -176,17 +170,17 @@ impl<D: Dispatcher + 'static> Signer for SignerClient<D> {
 	// TODO [ToDr] TransactionModification is redundant for some calls
 	// might be better to replace it in future
 	fn confirm_request(&self, id: U256, modification: TransactionModification, pass: String)
-		-> BoxFuture<ConfirmationResponse, Error>
+		-> BoxFuture<ConfirmationResponse>
 	{
-		self.confirm_internal(id, modification, move |dis, accounts, payload| {
+		Box::new(self.confirm_internal(id, modification, move |dis, accounts, payload| {
 			dispatch::execute(dis, accounts, payload, dispatch::SignWith::Password(pass))
-		}).map(|v| v.into_value()).boxed()
+		}).map(|v| v.into_value()))
 	}
 
 	fn confirm_request_with_token(&self, id: U256, modification: TransactionModification, token: String)
-		-> BoxFuture<ConfirmationResponseWithToken, Error>
+		-> BoxFuture<ConfirmationResponseWithToken>
 	{
-		self.confirm_internal(id, modification, move |dis, accounts, payload| {
+		Box::new(self.confirm_internal(id, modification, move |dis, accounts, payload| {
 			dispatch::execute(dis, accounts, payload, dispatch::SignWith::Token(token))
 		}).and_then(|v| match v {
 			WithToken::No(_) => Err(errors::internal("Unexpected response without token.", "")),
@@ -194,10 +188,10 @@ impl<D: Dispatcher + 'static> Signer for SignerClient<D> {
 				result: response,
 				token: token,
 			}),
-		}).boxed()
+		}))
 	}
 
-	fn confirm_request_raw(&self, id: U256, bytes: Bytes) -> Result<ConfirmationResponse, Error> {
+	fn confirm_request_raw(&self, id: U256, bytes: Bytes) -> Result<ConfirmationResponse> {
 		let id = id.into();
 
 		self.signer.peek(&id).map(|confirmation| {
@@ -211,7 +205,8 @@ impl<D: Dispatcher + 'static> Signer for SignerClient<D> {
 				},
 				ConfirmationPayload::SignTransaction(request) => {
 					Self::verify_transaction(bytes, request, |pending_transaction| {
-						Ok(ConfirmationResponse::SignTransaction(pending_transaction.transaction.into()))
+						let rich = self.dispatcher.enrich(pending_transaction.transaction);
+						Ok(ConfirmationResponse::SignTransaction(rich))
 					})
 				},
 				ConfirmationPayload::EthSignMessage(address, data) => {
@@ -235,17 +230,17 @@ impl<D: Dispatcher + 'static> Signer for SignerClient<D> {
 		}).unwrap_or_else(|| Err(errors::invalid_params("Unknown RequestID", id)))
 	}
 
-	fn reject_request(&self, id: U256) -> Result<bool, Error> {
+	fn reject_request(&self, id: U256) -> Result<bool> {
 		let res = self.signer.request_rejected(id.into());
 		Ok(res.is_some())
 	}
 
-	fn generate_token(&self) -> Result<String, Error> {
+	fn generate_token(&self) -> Result<String> {
 		self.signer.generate_token()
 			.map_err(|e| errors::token(e))
 	}
 
-	fn generate_web_proxy_token(&self, domain: String) -> Result<String, Error> {
+	fn generate_web_proxy_token(&self, domain: String) -> Result<String> {
 		Ok(self.signer.generate_web_proxy_access_token(domain.into()))
 	}
 
@@ -253,8 +248,8 @@ impl<D: Dispatcher + 'static> Signer for SignerClient<D> {
 		self.subscribers.lock().push(sub)
 	}
 
-	fn unsubscribe_pending(&self, id: SubscriptionId) -> BoxFuture<bool, Error> {
+	fn unsubscribe_pending(&self, id: SubscriptionId) -> Result<bool> {
 		let res = self.subscribers.lock().remove(&id).is_some();
-		futures::future::ok(res).boxed()
+		Ok(res)
 	}
 }
diff --git a/rpc/src/v1/impls/signing.rs b/rpc/src/v1/impls/signing.rs
index 23ce3c78a9312baa94ce8c7c703d89b16dd8221b..d8a27e95265a7d67f2e55942ce71e8184c5a0e41 100644
--- a/rpc/src/v1/impls/signing.rs
+++ b/rpc/src/v1/impls/signing.rs
@@ -18,16 +18,18 @@
 
 use std::sync::Arc;
 use transient_hashmap::TransientHashMap;
-use util::{U256, Mutex};
+use ethereum_types::U256;
+use parking_lot::Mutex;
 
 use ethcore::account_provider::AccountProvider;
 
-use futures::{future, BoxFuture, Future};
-use jsonrpc_core::Error;
+use jsonrpc_core::{BoxFuture, Result, Error};
+use jsonrpc_core::futures::{future, Future, Poll, Async};
+use jsonrpc_core::futures::future::Either;
 use v1::helpers::{
-	errors, oneshot,
-	DefaultAccount,
-	SIGNING_QUEUE_LIMIT, SigningQueue, ConfirmationPromise, ConfirmationResult, SignerService,
+	errors, DefaultAccount, SignerService, SigningQueue,
+	ConfirmationReceiver as RpcConfirmationReceiver,
+	ConfirmationResult as RpcConfirmationResult,
 };
 use v1::helpers::dispatch::{self, Dispatcher};
 use v1::helpers::accounts::unwrap_provider;
@@ -43,69 +45,75 @@ use v1::types::{
 	Origin,
 };
 
+use parity_reactor::Remote;
+
 /// After 60s entries that are not queried with `check_request` will get garbage collected.
 const MAX_PENDING_DURATION_SEC: u32 = 60;
-/// Max number of total requests pending and completed, before we start garbage collecting them.
-const MAX_TOTAL_REQUESTS: usize = SIGNING_QUEUE_LIMIT;
 
+#[must_use = "futures do nothing unless polled"]
 enum DispatchResult {
-	Promise(ConfirmationPromise),
+	Future(U256, RpcConfirmationReceiver),
 	Value(RpcConfirmationResponse),
 }
 
-/// Implementation of functions that require signing when no trusted signer is used.
-pub struct SigningQueueClient<D> {
-	signer: Arc<SignerService>,
-	accounts: Option<Arc<AccountProvider>>,
-	dispatcher: D,
-	pending: Arc<Mutex<TransientHashMap<U256, ConfirmationPromise>>>,
-}
+impl Future for DispatchResult {
+	type Item = RpcConfirmationResponse;
+	type Error = Error;
 
-fn handle_dispatch<OnResponse>(res: Result<DispatchResult, Error>, on_response: OnResponse)
-	where OnResponse: FnOnce(Result<RpcConfirmationResponse, Error>) + Send + 'static
-{
-	match res {
-		Ok(DispatchResult::Value(result)) => on_response(Ok(result)),
-		Ok(DispatchResult::Promise(promise)) => {
-			promise.wait_for_result(move |result| {
-				on_response(result.unwrap_or_else(|| Err(errors::request_rejected())))
-			})
-		},
-		Err(e) => on_response(Err(e)),
+	fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
+		match *self {
+			DispatchResult::Value(ref response) => Ok(Async::Ready(response.clone())),
+			DispatchResult::Future(_uid, ref mut future) => try_ready!(future.poll()).map(Async::Ready),
+		}
 	}
 }
 
-fn collect_garbage(map: &mut TransientHashMap<U256, ConfirmationPromise>) {
-	map.prune();
-	if map.len() > MAX_TOTAL_REQUESTS {
-		// Remove all non-waiting entries.
-		let non_waiting: Vec<_> = map
-			.iter()
-			.filter(|&(_, val)| val.result() != ConfirmationResult::Waiting)
-			.map(|(key, _)| *key)
-			.collect();
-		for k in non_waiting {
-			map.remove(&k);
-		}
+fn schedule(remote: Remote,
+	confirmations: Arc<Mutex<TransientHashMap<U256, Option<RpcConfirmationResult>>>>,
+	id: U256,
+	future: RpcConfirmationReceiver) {
+	{
+		let mut confirmations = confirmations.lock();
+		confirmations.insert(id.clone(), None);
 	}
+
+	let future = future.then(move |result| {
+		let mut confirmations = confirmations.lock();
+		confirmations.prune();
+		let result = result.and_then(|response| response);
+		confirmations.insert(id, Some(result));
+		Ok(())
+	});
+	remote.spawn(future);
+}
+
+/// Implementation of functions that require signing when no trusted signer is used.
+pub struct SigningQueueClient<D> {
+	signer: Arc<SignerService>,
+	accounts: Option<Arc<AccountProvider>>,
+	dispatcher: D,
+	remote: Remote,
+	// None here means that the request hasn't yet been confirmed
+	confirmations: Arc<Mutex<TransientHashMap<U256, Option<RpcConfirmationResult>>>>,
 }
 
 impl<D: Dispatcher + 'static> SigningQueueClient<D> {
 	/// Creates a new signing queue client given shared signing queue.
-	pub fn new(signer: &Arc<SignerService>, dispatcher: D, accounts: &Option<Arc<AccountProvider>>) -> Self {
+	pub fn new(signer: &Arc<SignerService>, dispatcher: D, remote: Remote, accounts: &Option<Arc<AccountProvider>>) -> Self {
 		SigningQueueClient {
 			signer: signer.clone(),
 			accounts: accounts.clone(),
-			dispatcher: dispatcher,
-			pending: Arc::new(Mutex::new(TransientHashMap::new(MAX_PENDING_DURATION_SEC))),
+			dispatcher,
+			remote,
+			confirmations: Arc::new(Mutex::new(TransientHashMap::new(MAX_PENDING_DURATION_SEC))),
 		}
 	}
 
-	fn account_provider(&self) -> Result<Arc<AccountProvider>, Error> {
+	fn account_provider(&self) -> Result<Arc<AccountProvider>> {
 		unwrap_provider(&self.accounts)
 	}
 
-	fn dispatch(&self, payload: RpcConfirmationPayload, default_account: DefaultAccount, origin: Origin) -> BoxFuture<DispatchResult, Error> {
+	fn dispatch(&self, payload: RpcConfirmationPayload, default_account: DefaultAccount, origin: Origin) -> BoxFuture<DispatchResult> {
 		let accounts = try_bf!(self.account_provider());
 		let default_account = match default_account {
 			DefaultAccount::Provided(acc) => acc,
@@ -114,175 +122,135 @@ impl<D: Dispatcher + 'static> SigningQueueClient<D> {
 
 		let dispatcher = self.dispatcher.clone();
 		let signer = self.signer.clone();
-		dispatch::from_rpc(payload, default_account, &dispatcher)
+		Box::new(dispatch::from_rpc(payload, default_account, &dispatcher)
 			.and_then(move |payload| {
 				let sender = payload.sender();
-				if accounts.is_unlocked(sender) {
-					dispatch::execute(dispatcher, accounts, payload, dispatch::SignWith::Nothing)
+				if accounts.is_unlocked(&sender) {
+					Either::A(dispatch::execute(dispatcher, accounts, payload, dispatch::SignWith::Nothing)
 						.map(|v| v.into_value())
-						.map(DispatchResult::Value)
-						.boxed()
+						.map(DispatchResult::Value))
 				} else {
-					future::done(
+					Either::B(future::done(
 						signer.add_request(payload, origin)
-							.map(DispatchResult::Promise)
+							.map(|(id, future)| DispatchResult::Future(id, future))
 							.map_err(|_| errors::request_rejected_limit())
-					).boxed()
+					))
 				}
-			})
-			.boxed()
+			}))
 	}
 }
 
 impl<D: Dispatcher + 'static> ParitySigning for SigningQueueClient<D> {
 	type Metadata = Metadata;
 
-	fn compose_transaction(&self, meta: Metadata, transaction: RpcTransactionRequest) -> BoxFuture<RpcTransactionRequest, Error> {
+	fn compose_transaction(&self, meta: Metadata, transaction: RpcTransactionRequest) -> BoxFuture<RpcTransactionRequest> {
 		let accounts = try_bf!(self.account_provider());
 		let default_account = accounts.dapp_default_address(meta.dapp_id().into()).ok().unwrap_or_default();
-		self.dispatcher.fill_optional_fields(transaction.into(), default_account, true).map(Into::into).boxed()
+		Box::new(self.dispatcher.fill_optional_fields(transaction.into(), default_account, true).map(Into::into))
 	}
 
-	fn post_sign(&self, meta: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcEither<RpcU256, RpcConfirmationResponse>, Error> {
-		let pending = self.pending.clone();
-		self.dispatch(
+	fn post_sign(&self, meta: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcEither<RpcU256, RpcConfirmationResponse>> {
+		let remote = self.remote.clone();
+		let confirmations = self.confirmations.clone();
+
+		Box::new(self.dispatch(
 			RpcConfirmationPayload::EthSignMessage((address.clone(), data).into()),
 			DefaultAccount::Provided(address.into()),
 			meta.origin
 		).map(move |result| match result {
 			DispatchResult::Value(v) => RpcEither::Or(v),
-			DispatchResult::Promise(promise) => {
-				let id = promise.id();
-				let mut pending = pending.lock();
-				collect_garbage(&mut pending);
-				pending.insert(id, promise);
-
+			DispatchResult::Future(id, future) => {
+				schedule(remote, confirmations, id, future);
 				RpcEither::Either(id.into())
 			},
-		})
-		.boxed()
+		}))
 	}
 
-	fn post_transaction(&self, meta: Metadata, request: RpcTransactionRequest) -> BoxFuture<RpcEither<RpcU256, RpcConfirmationResponse>, Error> {
-		let pending = self.pending.clone();
-		self.dispatch(RpcConfirmationPayload::SendTransaction(request), meta.dapp_id().into(), meta.origin)
-			.map(move |result| match result {
-				DispatchResult::Value(v) => RpcEither::Or(v),
-				DispatchResult::Promise(promise) => {
-					let id = promise.id();
-					let mut pending = pending.lock();
-					collect_garbage(&mut pending);
-					pending.insert(id, promise);
+	fn post_transaction(&self, meta: Metadata, request: RpcTransactionRequest) -> BoxFuture<RpcEither<RpcU256, RpcConfirmationResponse>> {
+		let remote = self.remote.clone();
+		let confirmations = self.confirmations.clone();
 
+		Box::new(self.dispatch(RpcConfirmationPayload::SendTransaction(request), meta.dapp_id().into(), meta.origin)
+			.map(|result| match result {
+				DispatchResult::Value(v) => RpcEither::Or(v),
+				DispatchResult::Future(id, future) => {
+					schedule(remote, confirmations, id, future);
 					RpcEither::Either(id.into())
 				},
-			})
-			.boxed()
+			}))
 	}
 
-	fn check_request(&self, id: RpcU256) -> Result<Option<RpcConfirmationResponse>, Error> {
+	fn check_request(&self, id: RpcU256) -> Result<Option<RpcConfirmationResponse>> {
 		let id: U256 = id.into();
-		match self.pending.lock().get(&id) {
-			Some(ref promise) => match promise.result() {
-				ConfirmationResult::Waiting => Ok(None),
-				ConfirmationResult::Rejected => Err(errors::request_rejected()),
-				ConfirmationResult::Confirmed(rpc_response) => rpc_response.map(Some),
-			},
-			_ => Err(errors::request_not_found()),
+		match self.confirmations.lock().get(&id) {
+			None => Err(errors::request_not_found()), // Request info has been dropped, or even never been there
+			Some(&None) => Ok(None), // No confirmation yet, request is known, confirmation is pending
+			Some(&Some(ref confirmation)) => confirmation.clone().map(Some), // Confirmation is there
 		}
 	}
 
-	fn decrypt_message(&self, meta: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcBytes, Error> {
+	fn decrypt_message(&self, meta: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcBytes> {
 		let res = self.dispatch(
 			RpcConfirmationPayload::Decrypt((address.clone(), data).into()),
 			address.into(),
 			meta.origin,
 		);
 
-		let (ready, p) = oneshot::oneshot();
-
-		// when dispatch is complete
-		res.then(move |res| {
-			// register callback via the oneshot sender.
-			handle_dispatch(res, move |response| {
-				match response {
-					Ok(RpcConfirmationResponse::Decrypt(data)) => ready.send(Ok(data)),
-					Err(e) => ready.send(Err(e)),
-					e => ready.send(Err(errors::internal("Unexpected result.", e))),
-				}
-			});
-
-			p
-		}).boxed()
+		// when dispatch is complete - wait for result and then
+		Box::new(res.flatten().and_then(move |response| {
+			match response {
+				RpcConfirmationResponse::Decrypt(data) => Ok(data),
+				e => Err(errors::internal("Unexpected result.", e)),
+			}
+		}))
 	}
 }
 
 impl<D: Dispatcher + 'static> EthSigning for SigningQueueClient<D> {
 	type Metadata = Metadata;
 
-	fn sign(&self, meta: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcH520, Error> {
+	fn sign(&self, meta: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcH520> {
 		let res = self.dispatch(
 			RpcConfirmationPayload::EthSignMessage((address.clone(), data).into()),
 			address.into(),
 			meta.origin,
 		);
 
-		let (ready, p) = oneshot::oneshot();
-
-		res.then(move |res| {
-			handle_dispatch(res, move |response| {
-				match response {
-					Ok(RpcConfirmationResponse::Signature(sig)) => ready.send(Ok(sig)),
-					Err(e) => ready.send(Err(e)),
-					e => ready.send(Err(errors::internal("Unexpected result.", e))),
-				}
-			});
-
-			p
-		}).boxed()
+		Box::new(res.flatten().and_then(move |response| {
+			match response {
+				RpcConfirmationResponse::Signature(sig) => Ok(sig),
+				e => Err(errors::internal("Unexpected result.", e)),
+			}
+		}))
 	}
 
-	fn send_transaction(&self, meta: Metadata, request: RpcTransactionRequest) -> BoxFuture<RpcH256, Error> {
+	fn send_transaction(&self, meta: Metadata, request: RpcTransactionRequest) -> BoxFuture<RpcH256> {
 		let res = self.dispatch(
 			RpcConfirmationPayload::SendTransaction(request),
 			meta.dapp_id().into(),
 			meta.origin,
 		);
 
-		let (ready, p) = oneshot::oneshot();
-
-		res.then(move |res| {
-			handle_dispatch(res, move |response| {
-				match response {
-					Ok(RpcConfirmationResponse::SendTransaction(hash)) => ready.send(Ok(hash)),
-					Err(e) => ready.send(Err(e)),
-					e => ready.send(Err(errors::internal("Unexpected result.", e))),
-				}
-			});
-
-			p
-		}).boxed()
+		Box::new(res.flatten().and_then(move |response| {
+			match response {
+				RpcConfirmationResponse::SendTransaction(hash) => Ok(hash),
+				e => Err(errors::internal("Unexpected result.", e)),
+			}
+		}))
 	}
 
-	fn sign_transaction(&self, meta: Metadata, request: RpcTransactionRequest) -> BoxFuture<RpcRichRawTransaction, Error> {
+	fn sign_transaction(&self, meta: Metadata, request: RpcTransactionRequest) -> BoxFuture<RpcRichRawTransaction> {
 		let res = self.dispatch(
 			RpcConfirmationPayload::SignTransaction(request),
 			meta.dapp_id().into(),
 			meta.origin,
 		);
 
-		let (ready, p) = oneshot::oneshot();
-
-		res.then(move |res| {
-			handle_dispatch(res, move |response| {
-				match response {
-					Ok(RpcConfirmationResponse::SignTransaction(tx)) => ready.send(Ok(tx)),
-					Err(e) => ready.send(Err(e)),
-					e => ready.send(Err(errors::internal("Unexpected result.", e))),
-				}
-			});
-
-			p
-		}).boxed()
+		Box::new(res.flatten().and_then(move |response| {
+			match response {
+				RpcConfirmationResponse::SignTransaction(tx) => Ok(tx),
+				e => Err(errors::internal("Unexpected result.", e)),
+			}
+		}))
 	}
 }
diff --git a/rpc/src/v1/impls/signing_unsafe.rs b/rpc/src/v1/impls/signing_unsafe.rs
index cd027e960b484d25c8f8e5d7ea647471f7f957a3..ddac36a61e67208bce665699a53429987032e7bc 100644
--- a/rpc/src/v1/impls/signing_unsafe.rs
+++ b/rpc/src/v1/impls/signing_unsafe.rs
@@ -20,8 +20,8 @@ use std::sync::Arc;
 
 use ethcore::account_provider::AccountProvider;
 
-use futures::{future, BoxFuture, Future};
-use jsonrpc_core::Error;
+use jsonrpc_core::{BoxFuture, Result};
+use jsonrpc_core::futures::{future, Future};
 use v1::helpers::{errors, DefaultAccount};
 use v1::helpers::dispatch::{self, Dispatcher};
 use v1::helpers::accounts::unwrap_provider;
@@ -52,11 +52,11 @@ impl<D: Dispatcher + 'static> SigningUnsafeClient<D> {
 		}
 	}
 
-	fn account_provider(&self) -> Result<Arc<AccountProvider>, Error> {
+	fn account_provider(&self) -> Result<Arc<AccountProvider>> {
 		unwrap_provider(&self.accounts)
 	}
 
-	fn handle(&self, payload: RpcConfirmationPayload, account: DefaultAccount) -> BoxFuture<RpcConfirmationResponse, Error> {
+	fn handle(&self, payload: RpcConfirmationPayload, account: DefaultAccount) -> BoxFuture<RpcConfirmationResponse> {
 		let accounts = try_bf!(self.account_provider());
 		let default = match account {
 			DefaultAccount::Provided(acc) => acc,
@@ -64,12 +64,11 @@ impl<D: Dispatcher + 'static> SigningUnsafeClient<D> {
 		};
 
 		let dis = self.dispatcher.clone();
-		dispatch::from_rpc(payload, default, &dis)
+		Box::new(dispatch::from_rpc(payload, default, &dis)
 			.and_then(move |payload| {
 				dispatch::execute(dis, accounts, payload, dispatch::SignWith::Nothing)
 			})
-			.map(|v| v.into_value())
-			.boxed()
+			.map(|v| v.into_value()))
 	}
 }
 
@@ -77,67 +76,63 @@ impl<D: Dispatcher + 'static> EthSigning for SigningUnsafeClient<D>
 {
 	type Metadata = Metadata;
 
-	fn sign(&self, _: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcH520, Error> {
-		self.handle(RpcConfirmationPayload::EthSignMessage((address.clone(), data).into()), address.into())
+	fn sign(&self, _: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcH520> {
+		Box::new(self.handle(RpcConfirmationPayload::EthSignMessage((address.clone(), data).into()), address.into())
 			.then(|res| match res {
 				Ok(RpcConfirmationResponse::Signature(signature)) => Ok(signature),
 				Err(e) => Err(e),
 				e => Err(errors::internal("Unexpected result", e)),
-			})
-			.boxed()
+			}))
 	}
 
-	fn send_transaction(&self, meta: Metadata, request: RpcTransactionRequest) -> BoxFuture<RpcH256, Error> {
-		self.handle(RpcConfirmationPayload::SendTransaction(request), meta.dapp_id().into())
+	fn send_transaction(&self, meta: Metadata, request: RpcTransactionRequest) -> BoxFuture<RpcH256> {
+		Box::new(self.handle(RpcConfirmationPayload::SendTransaction(request), meta.dapp_id().into())
 			.then(|res| match res {
 				Ok(RpcConfirmationResponse::SendTransaction(hash)) => Ok(hash),
 				Err(e) => Err(e),
 				e => Err(errors::internal("Unexpected result", e)),
-			})
-			.boxed()
+			}))
 	}
 
-	fn sign_transaction(&self, meta: Metadata, request: RpcTransactionRequest) -> BoxFuture<RpcRichRawTransaction, Error> {
-		self.handle(RpcConfirmationPayload::SignTransaction(request), meta.dapp_id().into())
+	fn sign_transaction(&self, meta: Metadata, request: RpcTransactionRequest) -> BoxFuture<RpcRichRawTransaction> {
+		Box::new(self.handle(RpcConfirmationPayload::SignTransaction(request), meta.dapp_id().into())
 			.then(|res| match res {
 				Ok(RpcConfirmationResponse::SignTransaction(tx)) => Ok(tx),
 				Err(e) => Err(e),
 				e => Err(errors::internal("Unexpected result", e)),
-			})
-			.boxed()
+			}))
 	}
 }
 
 impl<D: Dispatcher + 'static> ParitySigning for SigningUnsafeClient<D> {
 	type Metadata = Metadata;
 
-	fn compose_transaction(&self, meta: Metadata, transaction: RpcTransactionRequest) -> BoxFuture<RpcTransactionRequest, Error> {
+	fn compose_transaction(&self, meta: Metadata, transaction: RpcTransactionRequest) -> BoxFuture<RpcTransactionRequest> {
 		let accounts = try_bf!(self.account_provider());
 		let default_account = accounts.dapp_default_address(meta.dapp_id().into()).ok().unwrap_or_default();
-		self.dispatcher.fill_optional_fields(transaction.into(), default_account, true).map(Into::into).boxed()
+		Box::new(self.dispatcher.fill_optional_fields(transaction.into(), default_account, true).map(Into::into))
 	}
 
-	fn decrypt_message(&self, _: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcBytes, Error> {
-		self.handle(RpcConfirmationPayload::Decrypt((address.clone(), data).into()), address.into())
+	fn decrypt_message(&self, _: Metadata, address: RpcH160, data: RpcBytes) -> BoxFuture<RpcBytes> {
+		Box::new(self.handle(RpcConfirmationPayload::Decrypt((address.clone(), data).into()), address.into())
 			.then(|res| match res {
 				Ok(RpcConfirmationResponse::Decrypt(data)) => Ok(data),
 				Err(e) => Err(e),
 				e => Err(errors::internal("Unexpected result", e)),
-			})
-			.boxed()
+			}))
 	}
 
-	fn post_sign(&self, _: Metadata,  _: RpcH160, _: RpcBytes) -> BoxFuture<RpcEither<RpcU256, RpcConfirmationResponse>, Error> {
+	fn post_sign(&self, _: Metadata,  _: RpcH160, _: RpcBytes) -> BoxFuture<RpcEither<RpcU256, RpcConfirmationResponse>> {
 		// We don't support this in non-signer mode.
-		future::err(errors::signer_disabled()).boxed()
+		Box::new(future::err(errors::signer_disabled()))
 	}
 
-	fn post_transaction(&self, _: Metadata, _: RpcTransactionRequest) -> BoxFuture<RpcEither<RpcU256, RpcConfirmationResponse>, Error> {
+	fn post_transaction(&self, _: Metadata, _: RpcTransactionRequest) -> BoxFuture<RpcEither<RpcU256, RpcConfirmationResponse>> {
 		// We don't support this in non-signer mode.
-		future::err((errors::signer_disabled())).boxed()
+		Box::new(future::err(errors::signer_disabled()))
 	}
 
-	fn check_request(&self, _: RpcU256) -> Result<Option<RpcConfirmationResponse>, Error> {
+	fn check_request(&self, _: RpcU256) -> Result<Option<RpcConfirmationResponse>> {
 		// We don't support this in non-signer mode.
 		Err(errors::signer_disabled())
 	}
diff --git a/rpc/src/v1/impls/traces.rs b/rpc/src/v1/impls/traces.rs
index 9ed2c39a4f2023ce5ebbdd1e9704d630bd423cb8..0ee1afd5fa7c5628b484bd434c53bb999cee4228 100644
--- a/rpc/src/v1/impls/traces.rs
+++ b/rpc/src/v1/impls/traces.rs
@@ -18,18 +18,16 @@
 
 use std::sync::Arc;
 
-use ethcore::client::{MiningBlockChainClient, CallAnalytics, TransactionId, TraceId};
-use ethcore::miner::MinerService;
-use ethcore::transaction::SignedTransaction;
+use ethcore::client::{MiningBlockChainClient, CallAnalytics, TransactionId, TraceId, StateClient, StateInfo, Call, BlockId};
 use rlp::UntrustedRlp;
+use transaction::SignedTransaction;
 
-use jsonrpc_core::Error;
-use jsonrpc_core::futures::{self, Future, BoxFuture};
+use jsonrpc_core::Result;
 use jsonrpc_macros::Trailing;
 use v1::Metadata;
 use v1::traits::Traces;
 use v1::helpers::{errors, fake_sign};
-use v1::types::{TraceFilter, LocalizedTrace, BlockNumber, Index, CallRequest, Bytes, TraceResults, TraceOptions, H256};
+use v1::types::{TraceFilter, LocalizedTrace, BlockNumber, Index, CallRequest, Bytes, TraceResults, TraceOptions, H256, block_number_to_id};
 
 fn to_call_analytics(flags: TraceOptions) -> CallAnalytics {
 	CallAnalytics {
@@ -40,40 +38,46 @@ fn to_call_analytics(flags: TraceOptions) -> CallAnalytics {
 }
 
 /// Traces api implementation.
-pub struct TracesClient<C, M> {
+pub struct TracesClient<C> {
 	client: Arc<C>,
-	miner: Arc<M>,
 }
 
-impl<C, M> TracesClient<C, M> {
+impl<C> TracesClient<C> {
 	/// Creates new Traces client.
-	pub fn new(client: &Arc<C>, miner: &Arc<M>) -> Self {
+	pub fn new(client: &Arc<C>) -> Self {
 		TracesClient {
 			client: client.clone(),
-			miner: miner.clone(),
 		}
 	}
 }
 
-impl<C, M> Traces for TracesClient<C, M> where C: MiningBlockChainClient + 'static, M: MinerService + 'static {
+impl<C, S> Traces for TracesClient<C> where
+	S: StateInfo + 'static,
+	C: MiningBlockChainClient + StateClient<State=S> + Call<State=S> + 'static
+{
 	type Metadata = Metadata;
 
-	fn filter(&self, filter: TraceFilter) -> Result<Option<Vec<LocalizedTrace>>, Error> {
+	fn filter(&self, filter: TraceFilter) -> Result<Option<Vec<LocalizedTrace>>> {
 		Ok(self.client.filter_traces(filter.into())
 			.map(|traces| traces.into_iter().map(LocalizedTrace::from).collect()))
 	}
 
-	fn block_traces(&self, block_number: BlockNumber) -> Result<Option<Vec<LocalizedTrace>>, Error> {
-		Ok(self.client.block_traces(block_number.into())
+	fn block_traces(&self, block_number: BlockNumber) -> Result<Option<Vec<LocalizedTrace>>> {
+		let id = match block_number {
+			BlockNumber::Pending => return Ok(None),
+			num => block_number_to_id(num)
+		};
+
+		Ok(self.client.block_traces(id)
 			.map(|traces| traces.into_iter().map(LocalizedTrace::from).collect()))
 	}
 
-	fn transaction_traces(&self, transaction_hash: H256) -> Result<Option<Vec<LocalizedTrace>>, Error> {
+	fn transaction_traces(&self, transaction_hash: H256) -> Result<Option<Vec<LocalizedTrace>>> {
 		Ok(self.client.transaction_traces(TransactionId::Hash(transaction_hash.into()))
 			.map(|traces| traces.into_iter().map(LocalizedTrace::from).collect()))
 	}
 
-	fn trace(&self, transaction_hash: H256, address: Vec<Index>) -> Result<Option<LocalizedTrace>, Error> {
+	fn trace(&self, transaction_hash: H256, address: Vec<Index>) -> Result<Option<LocalizedTrace>> {
 		let id = TraceId {
 			transaction: TransactionId::Hash(transaction_hash.into()),
 			address: address.into_iter().map(|i| i.value()).collect()
@@ -83,51 +87,94 @@ impl<C, M> Traces for TracesClient<C, M> where C: MiningBlockChainClient + 'stat
 			.map(LocalizedTrace::from))
 	}
 
-	fn call(&self, meta: Self::Metadata, request: CallRequest, flags: TraceOptions, block: Trailing<BlockNumber>) -> BoxFuture<TraceResults, Error> {
+	fn call(&self, meta: Self::Metadata, request: CallRequest, flags: TraceOptions, block: Trailing<BlockNumber>) -> Result<TraceResults> {
 		let block = block.unwrap_or_default();
 
 		let request = CallRequest::into(request);
-		let signed = try_bf!(fake_sign::sign_call(&self.client, &self.miner, request, meta.is_dapp()));
+		let signed = fake_sign::sign_call(request, meta.is_dapp())?;
 
-		let res = self.client.call(&signed, to_call_analytics(flags), block.into())
-			.map(TraceResults::from)
-			.map_err(errors::call);
+		let id = match block {
+			BlockNumber::Num(num) => BlockId::Number(num),
+			BlockNumber::Earliest => BlockId::Earliest,
+			BlockNumber::Latest => BlockId::Latest,
 
-		futures::done(res).boxed()
+			BlockNumber::Pending => return Err(errors::invalid_params("`BlockNumber::Pending` is not supported", ())),
+		};
+
+		let mut state = self.client.state_at(id).ok_or(errors::state_pruned())?;
+		let header = self.client.block_header(id).ok_or(errors::state_pruned())?;
+
+		self.client.call(&signed, to_call_analytics(flags), &mut state, &header.decode())
+			.map(TraceResults::from)
+			.map_err(errors::call)
 	}
 
-	fn call_many(&self, meta: Self::Metadata, requests: Vec<(CallRequest, TraceOptions)>, block: Trailing<BlockNumber>) -> BoxFuture<Vec<TraceResults>, Error> {
+	fn call_many(&self, meta: Self::Metadata, requests: Vec<(CallRequest, TraceOptions)>, block: Trailing<BlockNumber>) -> Result<Vec<TraceResults>> {
 		let block = block.unwrap_or_default();
 
-		let requests = try_bf!(requests.into_iter()
+		let requests = requests.into_iter()
 			.map(|(request, flags)| {
 				let request = CallRequest::into(request);
-				let signed = fake_sign::sign_call(&self.client, &self.miner, request, meta.is_dapp())?;
+				let signed = fake_sign::sign_call(request, meta.is_dapp())?;
 				Ok((signed, to_call_analytics(flags)))
 			})
-			.collect::<Result<Vec<_>, Error>>());
+			.collect::<Result<Vec<_>>>()?;
 
-		let res = self.client.call_many(&requests, block.into())
-			.map(|results| results.into_iter().map(TraceResults::from).collect())
-			.map_err(errors::call);
+		let id = match block {
+			BlockNumber::Num(num) => BlockId::Number(num),
+			BlockNumber::Earliest => BlockId::Earliest,
+			BlockNumber::Latest => BlockId::Latest,
+
+			BlockNumber::Pending => return Err(errors::invalid_params("`BlockNumber::Pending` is not supported", ())),
+		};
+
+		let mut state = self.client.state_at(id).ok_or(errors::state_pruned())?;
+		let header = self.client.block_header(id).ok_or(errors::state_pruned())?;
 
-		futures::done(res).boxed()
+		self.client.call_many(&requests, &mut state, &header.decode())
+			.map(|results| results.into_iter().map(TraceResults::from).collect())
+			.map_err(errors::call)
 	}
 
-	fn raw_transaction(&self, raw_transaction: Bytes, flags: TraceOptions, block: Trailing<BlockNumber>) -> Result<TraceResults, Error> {
+	fn raw_transaction(&self, raw_transaction: Bytes, flags: TraceOptions, block: Trailing<BlockNumber>) -> Result<TraceResults> {
 		let block = block.unwrap_or_default();
 
 		let tx = UntrustedRlp::new(&raw_transaction.into_vec()).as_val().map_err(|e| errors::invalid_params("Transaction is not valid RLP", e))?;
 		let signed = SignedTransaction::new(tx).map_err(errors::transaction)?;
 
-		self.client.call(&signed, to_call_analytics(flags), block.into())
+		let id = match block {
+			BlockNumber::Num(num) => BlockId::Number(num),
+			BlockNumber::Earliest => BlockId::Earliest,
+			BlockNumber::Latest => BlockId::Latest,
+
+			BlockNumber::Pending => return Err(errors::invalid_params("`BlockNumber::Pending` is not supported", ())),
+		};
+
+		let mut state = self.client.state_at(id).ok_or(errors::state_pruned())?;
+		let header = self.client.block_header(id).ok_or(errors::state_pruned())?;
+
+		self.client.call(&signed, to_call_analytics(flags), &mut state, &header.decode())
 			.map(TraceResults::from)
 			.map_err(errors::call)
 	}
 
-	fn replay_transaction(&self, transaction_hash: H256, flags: TraceOptions) -> Result<TraceResults, Error> {
+	fn replay_transaction(&self, transaction_hash: H256, flags: TraceOptions) -> Result<TraceResults> {
 		self.client.replay(TransactionId::Hash(transaction_hash.into()), to_call_analytics(flags))
 			.map(TraceResults::from)
 			.map_err(errors::call)
 	}
+
+	fn replay_block_transactions(&self, block_number: BlockNumber, flags: TraceOptions) -> Result<Vec<TraceResults>> {
+		let id = match block_number {
+			BlockNumber::Num(num) => BlockId::Number(num),
+			BlockNumber::Earliest => BlockId::Earliest,
+			BlockNumber::Latest => BlockId::Latest,
+
+			BlockNumber::Pending => return Err(errors::invalid_params("`BlockNumber::Pending` is not supported", ())),
+		};
+
+		self.client.replay_block_transactions(id, to_call_analytics(flags))
+			.map(|results| results.into_iter().map(TraceResults::from).collect())
+			.map_err(errors::call)
+	}
 }
diff --git a/rpc/src/v1/impls/web3.rs b/rpc/src/v1/impls/web3.rs
index 859c44567b517d33a21678249bfca2f2c7de62da..6915af1d1e0a4be7c4b5434e5b21bff19b50931f 100644
--- a/rpc/src/v1/impls/web3.rs
+++ b/rpc/src/v1/impls/web3.rs
@@ -15,11 +15,11 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Web3 rpc implementation.
-use jsonrpc_core::*;
-use util::version;
+use hash::keccak;
+use jsonrpc_core::Result;
+use version::version;
 use v1::traits::Web3;
 use v1::types::{H256, Bytes};
-use util::sha3::Hashable;
 
 /// Web3 rpc implementation.
 pub struct Web3Client;
@@ -30,11 +30,11 @@ impl Web3Client {
 }
 
 impl Web3 for Web3Client {
-	fn client_version(&self) -> Result<String, Error> {
+	fn client_version(&self) -> Result<String> {
 		Ok(version().to_owned().replace("Parity/", "Parity//"))
 	}
 
-	fn sha3(&self, data: Bytes) -> Result<H256, Error> {
-		Ok(data.0.sha3().into())
+	fn sha3(&self, data: Bytes) -> Result<H256> {
+		Ok(keccak(&data.0).into())
 	}
 }
diff --git a/rpc/src/v1/informant.rs b/rpc/src/v1/informant.rs
index 160f0ea9f80bc864a8d856d20c427d23553f1454..9a9cde3837cdd57f5c5f47ca42867fba61224557 100644
--- a/rpc/src/v1/informant.rs
+++ b/rpc/src/v1/informant.rs
@@ -20,11 +20,10 @@ use std::fmt;
 use std::sync::Arc;
 use std::sync::atomic::{self, AtomicUsize};
 use std::time;
-use futures::Future;
 use futures_cpupool as pool;
 use jsonrpc_core as rpc;
 use order_stat;
-use util::RwLock;
+use parking_lot::RwLock;
 
 pub use self::pool::CpuPool;
 
@@ -222,15 +221,23 @@ impl<M: rpc::Metadata, T: ActivityNotifier> rpc::Middleware<M> for Middleware<T>
 		self.notifier.active();
 		self.stats.count_request();
 
+		let id = match request {
+			rpc::Request::Single(rpc::Call::MethodCall(ref call)) => Some(call.id.clone()),
+			_ => None,
+		};
 		let stats = self.stats.clone();
 		let future = process(request, meta).map(move |res| {
-			stats.add_roundtrip(Self::as_micro(start.elapsed()));
+			let time = Self::as_micro(start.elapsed());
+			if time > 10_000 {
+				debug!(target: "rpc", "[{:?}] Took {}ms", id, time / 1_000);
+			}
+			stats.add_roundtrip(time);
 			res
 		});
 
 		match self.pool {
 			Some(ref pool) => A(pool.spawn(future)),
-			None => B(future.boxed()),
+			None => B(Box::new(future)),
 		}
 	}
 }
diff --git a/rpc/src/v1/mod.rs b/rpc/src/v1/mod.rs
index 8473d0f3835c97ed648ec1b18143db107e8f5ac4..b5e1cfa4dba46182e776aa9bd7be9d4733726bef 100644
--- a/rpc/src/v1/mod.rs
+++ b/rpc/src/v1/mod.rs
@@ -24,7 +24,7 @@ macro_rules! try_bf {
 	($res: expr) => {
 		match $res {
 			Ok(val) => val,
-			Err(e) => return ::futures::future::err(e.into()).boxed(),
+			Err(e) => return Box::new(::jsonrpc_core::futures::future::err(e.into())),
 		}
 	}
 }
diff --git a/rpc/src/v1/tests/eth.rs b/rpc/src/v1/tests/eth.rs
index cbbfa8dc0201fd332c0815ba9b74f51769d812e1..84dd64644d754856513b2f84d4d22158324281db 100644
--- a/rpc/src/v1/tests/eth.rs
+++ b/rpc/src/v1/tests/eth.rs
@@ -19,21 +19,27 @@ use std::env;
 use std::sync::Arc;
 use std::time::Duration;
 
-use ethcore::client::{BlockChainClient, Client, ClientConfig};
+use ethereum_types::{U256, H256, Address};
+use ethcore::account_provider::AccountProvider;
+use ethcore::block::Block;
+use ethcore::client::{BlockChainClient, Client, ClientConfig, ChainInfo, ImportBlock};
+use ethcore::ethereum;
 use ethcore::ids::BlockId;
+use ethcore::miner::{MinerOptions, Banning, GasPricer, Miner, PendingSet, GasLimit};
 use ethcore::spec::{Genesis, Spec};
-use ethcore::block::Block;
 use ethcore::views::BlockView;
-use ethcore::ethereum;
-use ethcore::miner::{MinerOptions, Banning, GasPricer, MinerService, ExternalMiner, Miner, PendingSet, PrioritizationStrategy, GasLimit};
-use ethcore::account_provider::AccountProvider;
 use ethjson::blockchain::BlockChain;
+use ethjson::state::test::ForkSpec;
 use io::IoChannel;
-use util::{U256, H256, Address, Hashable};
+use kvdb_memorydb;
+use miner::external::ExternalMiner;
+use miner::transaction_queue::PrioritizationStrategy;
+use parking_lot::Mutex;
 
 use jsonrpc_core::IoHandler;
-use v1::impls::{EthClient, SigningUnsafeClient};
 use v1::helpers::dispatch::FullDispatcher;
+use v1::helpers::nonce;
+use v1::impls::{EthClient, SigningUnsafeClient};
 use v1::metadata::Metadata;
 use v1::tests::helpers::{TestSnapshotService, TestSyncProvider, Config};
 use v1::traits::eth::Eth;
@@ -71,6 +77,7 @@ fn miner_service(spec: &Spec, accounts: Arc<AccountProvider>) -> Arc<Miner> {
 			work_queue_size: 50,
 			enable_resubmission: true,
 			refuse_service_transactions: false,
+			infinite_pending_block: false,
 		},
 		GasPricer::new_fixed(20_000_000_000u64.into()),
 		&spec,
@@ -94,7 +101,7 @@ fn make_spec(chain: &BlockChain) -> Spec {
 
 struct EthTester {
 	client: Arc<Client>,
-	_miner: Arc<MinerService>,
+	_miner: Arc<Miner>,
 	_snapshot: Arc<TestSnapshotService>,
 	accounts: Arc<AccountProvider>,
 	handler: IoHandler<Metadata>,
@@ -127,7 +134,7 @@ impl EthTester {
 		let client = Client::new(
 			ClientConfig::default(),
 			&spec,
-			Arc::new(::util::kvdb::in_memory(::ethcore::db::NUM_COLUMNS.unwrap_or(0))),
+			Arc::new(kvdb_memorydb::create(::ethcore::db::NUM_COLUMNS.unwrap_or(0))),
 			miner_service.clone(),
 			IoChannel::disconnected(),
 		).unwrap();
@@ -144,7 +151,9 @@ impl EthTester {
 			Default::default(),
 		);
 
-		let dispatcher = FullDispatcher::new(client.clone(), miner_service.clone());
+		let reservations = Arc::new(Mutex::new(nonce::Reservations::new()));
+
+		let dispatcher = FullDispatcher::new(client.clone(), miner_service.clone(), reservations, 50);
 		let eth_sign = SigningUnsafeClient::new(
 			&opt_account_provider,
 			dispatcher,
@@ -166,13 +175,13 @@ impl EthTester {
 
 #[test]
 fn harness_works() {
-	let chain: BlockChain = extract_chain!("BlockchainTests/bcUncleTest");
+	let chain: BlockChain = extract_chain!("BlockchainTests/bcWalletTest/wallet2outOf3txs");
 	let _ = EthTester::from_chain(&chain);
 }
 
 #[test]
 fn eth_get_balance() {
-	let chain = extract_chain!("BlockchainTests/bcWalletTest", "wallet2outOf3txs");
+	let chain = extract_chain!("BlockchainTests/bcWalletTest/wallet2outOf3txs");
 	let tester = EthTester::from_chain(&chain);
 	// final account state
 	let req_latest = r#"{
@@ -198,7 +207,7 @@ fn eth_get_balance() {
 
 #[test]
 fn eth_block_number() {
-	let chain = extract_chain!("BlockchainTests/bcRPC_API_Test");
+	let chain = extract_chain!("BlockchainTests/bcGasPricerTest/RPC_API_Test");
 	let tester = EthTester::from_chain(&chain);
 	let req_number = r#"{
 		"jsonrpc": "2.0",
@@ -213,11 +222,11 @@ fn eth_block_number() {
 
 #[test]
 fn eth_get_block() {
-	let chain = extract_chain!("BlockchainTests/bcRPC_API_Test");
+	let chain = extract_chain!("BlockchainTests/bcGasPricerTest/RPC_API_Test");
 	let tester = EthTester::from_chain(&chain);
 	let req_block = r#"{"method":"eth_getBlockByNumber","params":["0x0",false],"id":1,"jsonrpc":"2.0"}"#;
 
-	let res_block = r#"{"jsonrpc":"2.0","result":{"author":"0x8888f1f195afa192cfee860698584c030f4c9db1","difficulty":"0x20000","extraData":"0x42","gasLimit":"0x2fefd8","gasUsed":"0x0","hash":"0x5a39ed1020c04d4d84539975b893a4e7c53eab6c2965db8bc3468093a31bc5ae","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x8888f1f195afa192cfee860698584c030f4c9db1","mixHash":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","nonce":"0x0102030405060708","number":"0x0","parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000","receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","sealFields":["0xa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","0x880102030405060708"],"sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x1ff","stateRoot":"0x7dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1","timestamp":"0x54c98c81","totalDifficulty":"0x20000","transactions":[],"transactionsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","uncles":[]},"id":1}"#.to_owned();
+	let res_block = r#"{"jsonrpc":"2.0","result":{"author":"0x8888f1f195afa192cfee860698584c030f4c9db1","difficulty":"0x20000","extraData":"0x42","gasLimit":"0x1df5d44","gasUsed":"0x0","hash":"0xcded1bc807465a72e2d54697076ab858f28b15d4beaae8faa47339c8eee386a3","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x8888f1f195afa192cfee860698584c030f4c9db1","mixHash":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","nonce":"0x0102030405060708","number":"0x0","parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000","receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","sealFields":["0xa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","0x880102030405060708"],"sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","size":"0x200","stateRoot":"0x7dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1","timestamp":"0x54c98c81","totalDifficulty":"0x20000","transactions":[],"transactionsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","uncles":[]},"id":1}"#;
 	assert_eq!(tester.handler.handle_request_sync(req_block).unwrap(), res_block);
 }
 
@@ -431,7 +440,7 @@ fn verify_transaction_counts(name: String, chain: BlockChain) {
 	for b in chain.blocks_rlp().iter().filter(|b| Block::is_good(b)).map(|b| BlockView::new(b)) {
 		let count = b.transactions_count();
 
-		let hash = b.sha3();
+		let hash = b.hash();
 		let number = b.header_view().number();
 
 		let (req, res) = by_hash(hash, count, &mut id);
@@ -463,6 +472,6 @@ fn starting_nonce_test() {
 	assert_eq!(r#"{"jsonrpc":"2.0","result":"0x100","id":15}"#, &sample);
 }
 
-register_test!(eth_transaction_count_1, verify_transaction_counts, "BlockchainTests/bcWalletTest");
-register_test!(eth_transaction_count_2, verify_transaction_counts, "BlockchainTests/bcTotalDifficultyTest");
-register_test!(eth_transaction_count_3, verify_transaction_counts, "BlockchainTests/bcGasPricerTest");
+register_test!(eth_transaction_count_1, verify_transaction_counts, "BlockchainTests/bcWalletTest/wallet2outOf3txs");
+register_test!(eth_transaction_count_2, verify_transaction_counts, "BlockchainTests/bcTotalDifficultyTest/sideChainWithMoreTransactions");
+register_test!(eth_transaction_count_3, verify_transaction_counts, "BlockchainTests/bcGasPricerTest/RPC_API_Test");
diff --git a/rpc/src/v1/tests/helpers/dapps.rs b/rpc/src/v1/tests/helpers/dapps.rs
index 6a7182dd0ffee4a8d9b0607a98d9ae4a0ad7a320..10c54cf4c2476324e53b21b303c5f88a68d29e8b 100644
--- a/rpc/src/v1/tests/helpers/dapps.rs
+++ b/rpc/src/v1/tests/helpers/dapps.rs
@@ -32,6 +32,7 @@ impl DappsService for TestDappsService {
 			version: "0.1".into(),
 			author: "Parity Technologies Ltd".into(),
 			icon_url: "title.png".into(),
+			local_url: None,
 		}]
 	}
 
diff --git a/rpc/src/v1/tests/helpers/fetch.rs b/rpc/src/v1/tests/helpers/fetch.rs
index 236dae91b4577660c0c477f2387fc3267db042e2..316d0682554c5f3f2ca4d42eedabae68d2f90c50 100644
--- a/rpc/src/v1/tests/helpers/fetch.rs
+++ b/rpc/src/v1/tests/helpers/fetch.rs
@@ -16,28 +16,26 @@
 
 //! Test implementation of fetch client.
 
-use std::{io, thread};
-use futures::{self, Future};
-use fetch::{self, Fetch};
+use std::thread;
+use jsonrpc_core::futures::{self, Future};
+use fetch::{self, Fetch, Url};
+use hyper;
 
 /// Test implementation of fetcher. Will always return the same file.
 #[derive(Default, Clone)]
 pub struct TestFetch;
 
 impl Fetch for TestFetch {
-	type Result = futures::BoxFuture<fetch::Response, fetch::Error>;
+	type Result = Box<Future<Item = fetch::Response, Error = fetch::Error> + Send + 'static>;
 
-	fn new() -> Result<Self, fetch::Error> where Self: Sized {
-		Ok(TestFetch)
-	}
-
-	fn fetch_with_abort(&self, _url: &str, _abort: fetch::Abort) -> Self::Result {
+	fn fetch(&self, url: &str, abort: fetch::Abort) -> Self::Result {
+		let u = Url::parse(url).unwrap();
 		let (tx, rx) = futures::oneshot();
 		thread::spawn(move || {
-			let cursor = io::Cursor::new(b"Some content");
-			tx.send(fetch::Response::from_reader(cursor)).unwrap();
+			let r = hyper::Response::new().with_body(&b"Some content"[..]);
+			tx.send(fetch::Response::new(u, r, abort)).unwrap();
 		});
 
-		rx.map_err(|_| fetch::Error::Aborted).boxed()
+		Box::new(rx.map_err(|_| fetch::Error::Aborted))
 	}
 }
diff --git a/rpc/src/v1/tests/helpers/miner_service.rs b/rpc/src/v1/tests/helpers/miner_service.rs
index 7139d636bb7759b99d45d11ac2b0771747213d20..ca9993baea40140e5a92c52def9f11ae6cceaaab 100644
--- a/rpc/src/v1/tests/helpers/miner_service.rs
+++ b/rpc/src/v1/tests/helpers/miner_service.rs
@@ -18,15 +18,21 @@
 
 use std::collections::{BTreeMap, HashMap};
 use std::collections::hash_map::Entry;
-use util::{Address, H256, Bytes, U256, RwLock, Mutex};
+
+use bytes::Bytes;
+use ethcore::account_provider::SignError as AccountError;
+use ethcore::block::{Block, ClosedBlock};
+use ethcore::client::{Nonce, PrepareOpenBlock, StateClient, EngineInfo};
+use ethcore::engines::EthEngine;
 use ethcore::error::Error;
-use ethcore::client::MiningBlockChainClient;
-use ethcore::block::ClosedBlock;
-use ethcore::header::BlockNumber;
-use ethcore::transaction::{UnverifiedTransaction, SignedTransaction, PendingTransaction};
+use ethcore::header::{BlockNumber, Header};
+use ethcore::ids::BlockId;
+use ethcore::miner::{MinerService, MinerStatus};
 use ethcore::receipt::{Receipt, RichReceipt};
-use ethcore::miner::{MinerService, MinerStatus, TransactionImportResult, LocalTransactionStatus};
-use ethcore::account_provider::SignError as AccountError;
+use ethereum_types::{H256, U256, Address};
+use miner::local_transactions::Status as LocalTransactionStatus;
+use parking_lot::{RwLock, Mutex};
+use transaction::{UnverifiedTransaction, SignedTransaction, PendingTransaction, ImportResult as TransactionImportResult};
 
 /// Test miner service.
 pub struct TestMinerService {
@@ -89,7 +95,39 @@ impl TestMinerService {
 	}
 }
 
+impl StateClient for TestMinerService {
+	// State will not be used by test client anyway, since all methods that accept state are mocked
+	type State = ();
+
+	fn latest_state(&self) -> Self::State {
+		()
+	}
+
+	fn state_at(&self, _id: BlockId) -> Option<Self::State> {
+		Some(())
+	}
+}
+
+impl EngineInfo for TestMinerService {
+	fn engine(&self) -> &EthEngine {
+		unimplemented!()
+	}
+}
+
 impl MinerService for TestMinerService {
+	type State = ();
+
+	fn pending_state(&self, _latest_block_number: BlockNumber) -> Option<Self::State> {
+		None
+	}
+
+	fn pending_block_header(&self, _latest_block_number: BlockNumber) -> Option<Header> {
+		None
+	}
+
+	fn pending_block(&self, _latest_block_number: BlockNumber) -> Option<Block> {
+		None
+	}
 
 	/// Returns miner's status.
 	fn status(&self) -> MinerStatus {
@@ -161,7 +199,7 @@ impl MinerService for TestMinerService {
 	}
 
 	/// Imports transactions to transaction queue.
-	fn import_external_transactions(&self, _chain: &MiningBlockChainClient, transactions: Vec<UnverifiedTransaction>) ->
+	fn import_external_transactions<C>(&self, _chain: &C, transactions: Vec<UnverifiedTransaction>) ->
 		Vec<Result<TransactionImportResult, Error>> {
 		// lets assume that all txs are valid
 		let transactions: Vec<_> = transactions.into_iter().map(|tx| SignedTransaction::new(tx).unwrap()).collect();
@@ -178,7 +216,7 @@ impl MinerService for TestMinerService {
 	}
 
 	/// Imports transactions to transaction queue.
-	fn import_own_transaction(&self, chain: &MiningBlockChainClient, pending: PendingTransaction) ->
+	fn import_own_transaction<C: Nonce>(&self, chain: &C, pending: PendingTransaction) ->
 		Result<TransactionImportResult, Error> {
 
 		// keep the pending nonces up to date
@@ -198,12 +236,12 @@ impl MinerService for TestMinerService {
 	}
 
 	/// Removes all transactions from the queue and restart mining operation.
-	fn clear_and_reset(&self, _chain: &MiningBlockChainClient) {
+	fn clear_and_reset<C>(&self, _chain: &C) {
 		unimplemented!();
 	}
 
 	/// Called when blocks are imported to chain, updates transactions queue.
-	fn chain_new_blocks(&self, _chain: &MiningBlockChainClient, _imported: &[H256], _invalid: &[H256], _enacted: &[H256], _retracted: &[H256]) {
+	fn chain_new_blocks<C>(&self, _chain: &C, _imported: &[H256], _invalid: &[H256], _enacted: &[H256], _retracted: &[H256]) {
 		unimplemented!();
 	}
 
@@ -213,11 +251,11 @@ impl MinerService for TestMinerService {
 	}
 
 	/// New chain head event. Restart mining operation.
-	fn update_sealing(&self, _chain: &MiningBlockChainClient) {
+	fn update_sealing<C>(&self, _chain: &C) {
 		unimplemented!();
 	}
 
-	fn map_sealing_work<F, T>(&self, chain: &MiningBlockChainClient, f: F) -> Option<T> where F: FnOnce(&ClosedBlock) -> T {
+	fn map_sealing_work<C: PrepareOpenBlock, F, T>(&self, chain: &C, f: F) -> Option<T> where F: FnOnce(&ClosedBlock) -> T {
 		let open_block = chain.prepare_open_block(self.author(), *self.gas_range_target.write(), self.extra_data());
 		Some(f(&open_block.close()))
 	}
@@ -226,7 +264,7 @@ impl MinerService for TestMinerService {
 		self.pending_transactions.lock().get(hash).cloned().map(Into::into)
 	}
 
-	fn remove_pending_transaction(&self, _chain: &MiningBlockChainClient, hash: &H256) -> Option<PendingTransaction> {
+	fn remove_pending_transaction<C>(&self, _chain: &C, hash: &H256) -> Option<PendingTransaction> {
 		self.pending_transactions.lock().remove(hash).map(Into::into)
 	}
 
@@ -257,7 +295,7 @@ impl MinerService for TestMinerService {
 				contract_address: None,
 				logs: r.logs.clone(),
 				log_bloom: r.log_bloom,
-				state_root: r.state_root,
+				outcome: r.outcome.clone(),
 			}
 		)
 	}
@@ -276,7 +314,7 @@ impl MinerService for TestMinerService {
 
 	/// Submit `seal` as a valid solution for the header of `pow_hash`.
 	/// Will check the seal, but not actually insert the block into the chain.
-	fn submit_seal(&self, _chain: &MiningBlockChainClient, _pow_hash: H256, _seal: Vec<Bytes>) -> Result<(), Error> {
+	fn submit_seal<C>(&self, _chain: &C, _pow_hash: H256, _seal: Vec<Bytes>) -> Result<(), Error> {
 		unimplemented!();
 	}
 
diff --git a/rpc/src/v1/tests/helpers/snapshot_service.rs b/rpc/src/v1/tests/helpers/snapshot_service.rs
index cfb80619a30226a90afb7e850288d0f7a30e971c..25abab578e9df70fc468b70d864d1ae85db2e406 100644
--- a/rpc/src/v1/tests/helpers/snapshot_service.rs
+++ b/rpc/src/v1/tests/helpers/snapshot_service.rs
@@ -16,8 +16,9 @@
 
 use ethcore::snapshot::{ManifestData, RestorationStatus, SnapshotService};
 
-use util::{Bytes, Mutex};
-use util::hash::H256;
+use bytes::Bytes;
+use ethereum_types::H256;
+use parking_lot::Mutex;
 
 /// Mocked snapshot service (used for sync info extensions).
 pub struct TestSnapshotService {
diff --git a/rpc/src/v1/tests/helpers/sync_provider.rs b/rpc/src/v1/tests/helpers/sync_provider.rs
index 83c7db015ab854c88f0c85697439e516f9496738..cbe66542352e1773449e120527b06e268cf8697b 100644
--- a/rpc/src/v1/tests/helpers/sync_provider.rs
+++ b/rpc/src/v1/tests/helpers/sync_provider.rs
@@ -17,7 +17,8 @@
 //! Test implementation of SyncProvider.
 
 use std::collections::BTreeMap;
-use util::{H256, RwLock};
+use ethereum_types::H256;
+use parking_lot::RwLock;
 use ethsync::{SyncProvider, EthProtocolInfo, SyncStatus, SyncState, PeerInfo, TransactionStats};
 
 /// TestSyncProvider config.
@@ -74,9 +75,9 @@ impl SyncProvider for TestSyncProvider {
 		vec![
 			PeerInfo {
 				id: Some("node1".to_owned()),
-    			client_version: "Parity/1".to_owned(),
+				client_version: "Parity/1".to_owned(),
 				capabilities: vec!["eth/62".to_owned(), "eth/63".to_owned()],
-    			remote_address: "127.0.0.1:7777".to_owned(),
+				remote_address: "127.0.0.1:7777".to_owned(),
 				local_address: "127.0.0.1:8888".to_owned(),
 				eth_info: Some(EthProtocolInfo {
 					version: 62,
@@ -87,9 +88,9 @@ impl SyncProvider for TestSyncProvider {
 			},
 			PeerInfo {
 				id: None,
-    			client_version: "Parity/2".to_owned(),
+				client_version: "Parity/2".to_owned(),
 				capabilities: vec!["eth/63".to_owned(), "eth/64".to_owned()],
-    			remote_address: "Handshake".to_owned(),
+				remote_address: "Handshake".to_owned(),
 				local_address: "127.0.0.1:3333".to_owned(),
 				eth_info: Some(EthProtocolInfo {
 					version: 64,
diff --git a/rpc/src/v1/tests/mocked/eth.rs b/rpc/src/v1/tests/mocked/eth.rs
index d1835948f7feb150d50fd679a18dc44c793b783e..e901993bddda0e0e454ac3bf0e5afa7b2df41ab8 100644
--- a/rpc/src/v1/tests/mocked/eth.rs
+++ b/rpc/src/v1/tests/mocked/eth.rs
@@ -17,23 +17,25 @@
 use std::str::FromStr;
 use std::collections::HashMap;
 use std::sync::Arc;
-use std::time::{Instant, Duration};
-use rustc_hex::{FromHex, ToHex};
-use time::get_time;
-use rlp;
+use std::time::{Instant, Duration, SystemTime, UNIX_EPOCH};
 
-use util::{U256, Address, H256, Mutex};
-use ethkey::Secret;
+use ethereum_types::{H256, U256, Address};
+use parking_lot::Mutex;
 use ethcore::account_provider::AccountProvider;
-use ethcore::client::{TestBlockChainClient, EachBlockWith, Executed, TransactionId};
+use ethcore::client::{BlockChainClient, BlockId, EachBlockWith, Executed, TestBlockChainClient, TransactionId};
 use ethcore::log_entry::{LocalizedLogEntry, LogEntry};
-use ethcore::receipt::LocalizedReceipt;
-use ethcore::transaction::{Transaction, Action};
-use ethcore::miner::{ExternalMiner, MinerService};
+use ethcore::miner::MinerService;
+use ethcore::receipt::{LocalizedReceipt, TransactionOutcome};
+use ethkey::Secret;
 use ethsync::SyncState;
+use miner::external::ExternalMiner;
+use rlp;
+use rustc_hex::{FromHex, ToHex};
+use transaction::{Transaction, Action};
 
 use jsonrpc_core::IoHandler;
 use v1::{Eth, EthClient, EthClientOptions, EthFilter, EthFilterClient, EthSigning, SigningUnsafeClient};
+use v1::helpers::nonce;
 use v1::helpers::dispatch::FullDispatcher;
 use v1::tests::helpers::{TestSyncProvider, Config, TestMinerService, TestSnapshotService};
 use v1::metadata::Metadata;
@@ -89,10 +91,12 @@ impl EthTester {
 		let snapshot = snapshot_service();
 		let hashrates = Arc::new(Mutex::new(HashMap::new()));
 		let external_miner = Arc::new(ExternalMiner::new(hashrates.clone()));
+		let gas_price_percentile = options.gas_price_percentile;
 		let eth = EthClient::new(&client, &snapshot, &sync, &opt_ap, &miner, &external_miner, options).to_delegate();
 		let filter = EthFilterClient::new(client.clone(), miner.clone()).to_delegate();
+		let reservations = Arc::new(Mutex::new(nonce::Reservations::new()));
 
-		let dispatcher = FullDispatcher::new(client.clone(), miner.clone());
+		let dispatcher = FullDispatcher::new(client.clone(), miner.clone(), reservations, gas_price_percentile);
 		let sign = SigningUnsafeClient::new(&opt_ap, dispatcher).to_delegate();
 		let mut io: IoHandler<Metadata> = IoHandler::default();
 		io.extend_with(eth);
@@ -279,6 +283,29 @@ fn rpc_logs_filter() {
 	assert_eq!(tester.io.handle_request_sync(request_changes2), Some(response2.to_owned()));
 }
 
+#[test]
+fn rpc_blocks_filter() {
+	let tester = EthTester::default();
+	let request_filter = r#"{"jsonrpc": "2.0", "method": "eth_newBlockFilter", "id": 1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":"0x0","id":1}"#;
+
+	assert_eq!(tester.io.handle_request_sync(request_filter), Some(response.to_owned()));
+
+	let request_changes = r#"{"jsonrpc": "2.0", "method": "eth_getFilterChanges", "params": ["0x0"], "id": 1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":[],"id":1}"#;
+
+	assert_eq!(tester.io.handle_request_sync(request_changes), Some(response.to_owned()));
+
+	tester.client.add_blocks(2, EachBlockWith::Nothing);
+
+	let response = format!(
+		r#"{{"jsonrpc":"2.0","result":["0x{:x}","0x{:x}"],"id":1}}"#,
+		tester.client.block_hash(BlockId::Number(1)).unwrap(),
+		tester.client.block_hash(BlockId::Number(2)).unwrap());
+
+	assert_eq!(tester.io.handle_request_sync(request_changes), Some(response.to_owned()));
+}
+
 #[test]
 fn rpc_eth_submit_hashrate() {
 	let tester = EthTester::default();
@@ -468,7 +495,7 @@ fn rpc_eth_transaction_count() {
 
 #[test]
 fn rpc_eth_transaction_count_next_nonce() {
-	let tester = EthTester::new_with_options(EthClientOptions::with(|mut options| {
+	let tester = EthTester::new_with_options(EthClientOptions::with(|options| {
 		options.pending_nonce_from_queue = true;
 	}));
 	tester.miner.increment_last_nonce(1.into());
@@ -533,9 +560,9 @@ fn rpc_eth_transaction_count_by_number_pending() {
 
 #[test]
 fn rpc_eth_pending_transaction_by_hash() {
-	use util::H256;
+	use ethereum_types::H256;
 	use rlp;
-	use ethcore::transaction::SignedTransaction;
+	use transaction::SignedTransaction;
 
 	let tester = EthTester::default();
 	{
@@ -869,12 +896,12 @@ fn rpc_eth_sign_transaction() {
 		r#""input":"0x","# +
 		r#""nonce":"0x1","# +
 		&format!("\"publicKey\":\"0x{:?}\",", t.recover_public().unwrap()) +
-		&format!("\"r\":\"0x{}\",", U256::from(signature.r()).to_hex()) +
+		&format!("\"r\":\"0x{:x}\",", U256::from(signature.r())) +
 		&format!("\"raw\":\"0x{}\",", rlp.to_hex()) +
-		&format!("\"s\":\"0x{}\",", U256::from(signature.s()).to_hex()) +
-		&format!("\"standardV\":\"0x{}\",", U256::from(t.standard_v()).to_hex()) +
+		&format!("\"s\":\"0x{:x}\",", U256::from(signature.s())) +
+		&format!("\"standardV\":\"0x{:x}\",", U256::from(t.standard_v())) +
 		r#""to":"0xd46e8dd67c5d32be8058bb8eb970870f07244567","transactionIndex":null,"# +
-		&format!("\"v\":\"0x{}\",", U256::from(t.original_v()).to_hex()) +
+		&format!("\"v\":\"0x{:x}\",", U256::from(t.original_v())) +
 		r#""value":"0x9184e72a""# +
 		r#"}},"id":1}"#;
 
@@ -1004,7 +1031,7 @@ fn rpc_eth_transaction_receipt() {
 			log_index: 1,
 		}],
 		log_bloom: 0.into(),
-		state_root: Some(0.into()),
+		outcome: TransactionOutcome::StateRoot(0.into()),
 	};
 
 	let hash = H256::from_str("b903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238").unwrap();
@@ -1017,7 +1044,7 @@ fn rpc_eth_transaction_receipt() {
 		"params": ["0xb903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238"],
 		"id": 1
 	}"#;
-	let response = r#"{"jsonrpc":"2.0","result":{"blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","contractAddress":null,"cumulativeGasUsed":"0x20","gasUsed":"0x10","logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","data":"0x","logIndex":"0x1","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"mined"}],"logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","root":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0"},"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":{"blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","contractAddress":null,"cumulativeGasUsed":"0x20","gasUsed":"0x10","logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","data":"0x","logIndex":"0x1","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"mined"}],"logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","root":"0x0000000000000000000000000000000000000000000000000000000000000000","status":null,"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0"},"id":1}"#;
 
 	assert_eq!(tester.io.handle_request_sync(request), Some(response.to_owned()));
 }
@@ -1094,20 +1121,20 @@ fn rpc_get_work_returns_correct_work_package() {
 	eth_tester.miner.set_author(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap());
 
 	let request = r#"{"jsonrpc": "2.0", "method": "eth_getWork", "params": [], "id": 1}"#;
-	let response = r#"{"jsonrpc":"2.0","result":["0x3bbe93f74e7b97ae00784aeff8819c5cb600dd87e8b282a5d3446f3f871f0347","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000800000000000000000000000000000000000000000000000000000000000","0x1"],"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":["0x76c7bd86693aee93d1a80a408a09a0585b1a1292afcb56192f171d925ea18e2d","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000800000000000000000000000000000000000000000000000000000000000","0x1"],"id":1}"#;
 
 	assert_eq!(eth_tester.io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
 fn rpc_get_work_should_not_return_block_number() {
-	let eth_tester = EthTester::new_with_options(EthClientOptions::with(|mut options| {
+	let eth_tester = EthTester::new_with_options(EthClientOptions::with(|options| {
 		options.send_block_number_in_get_work = false;
 	}));
 	eth_tester.miner.set_author(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap());
 
 	let request = r#"{"jsonrpc": "2.0", "method": "eth_getWork", "params": [], "id": 1}"#;
-	let response = r#"{"jsonrpc":"2.0","result":["0x3bbe93f74e7b97ae00784aeff8819c5cb600dd87e8b282a5d3446f3f871f0347","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000800000000000000000000000000000000000000000000000000000000000"],"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":["0x76c7bd86693aee93d1a80a408a09a0585b1a1292afcb56192f171d925ea18e2d","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000800000000000000000000000000000000000000000000000000000000000"],"id":1}"#;
 
 	assert_eq!(eth_tester.io.handle_request_sync(request), Some(response.to_owned()));
 }
@@ -1116,7 +1143,8 @@ fn rpc_get_work_should_not_return_block_number() {
 fn rpc_get_work_should_timeout() {
 	let eth_tester = EthTester::default();
 	eth_tester.miner.set_author(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap());
-	eth_tester.client.set_latest_block_timestamp(get_time().sec as u64 - 1000);  // Set latest block to 1000 seconds ago
+	let timestamp = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs() - 1000;  // Set latest block to 1000 seconds ago
+	eth_tester.client.set_latest_block_timestamp(timestamp);
 	let hash = eth_tester.miner.map_sealing_work(&*eth_tester.client, |b| b.hash()).unwrap();
 
 	// Request without providing timeout. This should work since we're disabling timeout.
diff --git a/rpc/src/v1/tests/mocked/eth_pubsub.rs b/rpc/src/v1/tests/mocked/eth_pubsub.rs
index 1998300256ce32d3d0a4ad44af6fe738ae3b437a..1a0186c97e88404ee2e84bc9c4adb7a8be5b9f76 100644
--- a/rpc/src/v1/tests/mocked/eth_pubsub.rs
+++ b/rpc/src/v1/tests/mocked/eth_pubsub.rs
@@ -37,7 +37,7 @@ fn should_subscribe_to_new_heads() {
 	let h1 = client.block_hash_delta_minus(3);
 
 	let pubsub = EthPubSubClient::new_test(Arc::new(client), el.remote());
-	let handler = pubsub.handler();
+	let handler = pubsub.handler().upgrade().unwrap();
 	let pubsub = pubsub.to_delegate();
 
 	let mut io = MetaIoHandler::default();
@@ -82,7 +82,7 @@ fn should_subscribe_to_new_heads() {
 fn should_subscribe_to_logs() {
 	use ethcore::log_entry::{LocalizedLogEntry, LogEntry};
 	use ethcore::ids::BlockId;
-	use ethcore::client::BlockChainClient;
+	use ethcore::client::BlockInfo;
 
 	// given
 	let el = EventLoop::spawn();
@@ -109,7 +109,7 @@ fn should_subscribe_to_logs() {
 	]);
 
 	let pubsub = EthPubSubClient::new_test(Arc::new(client), el.remote());
-	let handler = pubsub.handler();
+	let handler = pubsub.handler().upgrade().unwrap();
 	let pubsub = pubsub.to_delegate();
 
 	let mut io = MetaIoHandler::default();
@@ -127,17 +127,17 @@ fn should_subscribe_to_logs() {
 	// Check notifications (enacted)
 	handler.new_blocks(vec![], vec![], vec![h1], vec![], vec![], vec![], 0);
 	let (res, receiver) = receiver.into_future().wait().unwrap();
-	let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":[{"address":"0x0000000000000000000000000000000000000005","blockHash":"0x3457d2fa2e3dd33c78ac681cf542e429becf718859053448748383af67e23218","blockNumber":"0x1","data":"0x","logIndex":"0x0","topics":["0x0000000000000000000000000000000000000000000000000000000000000001","0x0000000000000000000000000000000000000000000000000000000000000002","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"],"transactionHash":""#.to_owned()
+	let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":{"address":"0x0000000000000000000000000000000000000005","blockHash":"0x3457d2fa2e3dd33c78ac681cf542e429becf718859053448748383af67e23218","blockNumber":"0x1","data":"0x","logIndex":"0x0","topics":["0x0000000000000000000000000000000000000000000000000000000000000001","0x0000000000000000000000000000000000000000000000000000000000000002","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"],"transactionHash":""#.to_owned()
 		+ &format!("0x{:?}", tx_hash)
-		+ r#"","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"mined"}],"subscription":"0x416d77337e24399d"}}"#;
+		+ r#"","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"mined"},"subscription":"0x416d77337e24399d"}}"#;
 	assert_eq!(res, Some(response.into()));
 
 	// Check notifications (retracted)
 	handler.new_blocks(vec![], vec![], vec![], vec![h1], vec![], vec![], 0);
 	let (res, receiver) = receiver.into_future().wait().unwrap();
-	let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":[{"address":"0x0000000000000000000000000000000000000005","blockHash":"0x3457d2fa2e3dd33c78ac681cf542e429becf718859053448748383af67e23218","blockNumber":"0x1","data":"0x","logIndex":"0x0","topics":["0x0000000000000000000000000000000000000000000000000000000000000001","0x0000000000000000000000000000000000000000000000000000000000000002","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"],"transactionHash":""#.to_owned()
+	let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":{"address":"0x0000000000000000000000000000000000000005","blockHash":"0x3457d2fa2e3dd33c78ac681cf542e429becf718859053448748383af67e23218","blockNumber":"0x1","data":"0x","logIndex":"0x0","topics":["0x0000000000000000000000000000000000000000000000000000000000000001","0x0000000000000000000000000000000000000000000000000000000000000002","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"],"transactionHash":""#.to_owned()
 		+ &format!("0x{:?}", tx_hash)
-		+ r#"","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"removed"}],"subscription":"0x416d77337e24399d"}}"#;
+		+ r#"","transactionIndex":"0x0","transactionLogIndex":"0x0","type":"removed"},"subscription":"0x416d77337e24399d"}}"#;
 	assert_eq!(res, Some(response.into()));
 
 
@@ -150,6 +150,54 @@ fn should_subscribe_to_logs() {
 	assert_eq!(res, None);
 }
 
+
+#[test]
+fn should_subscribe_to_pending_transactions() {
+	// given
+	let el = EventLoop::spawn();
+	let client = TestBlockChainClient::new();
+
+	let pubsub = EthPubSubClient::new_test(Arc::new(client), el.remote());
+	let handler = pubsub.handler().upgrade().unwrap();
+	let pubsub = pubsub.to_delegate();
+
+	let mut io = MetaIoHandler::default();
+	io.extend_with(pubsub);
+
+	let mut metadata = Metadata::default();
+	let (sender, receiver) = futures::sync::mpsc::channel(8);
+	metadata.session = Some(Arc::new(Session::new(sender)));
+
+	// Fail if params are provided
+	let request = r#"{"jsonrpc": "2.0", "method": "eth_subscribe", "params": ["newPendingTransactions", {}], "id": 1}"#;
+	let response = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Couldn't parse parameters: newPendingTransactions","data":"\"Expected no parameters.\""},"id":1}"#;
+	assert_eq!(io.handle_request_sync(request, metadata.clone()), Some(response.to_owned()));
+
+	// Subscribe
+	let request = r#"{"jsonrpc": "2.0", "method": "eth_subscribe", "params": ["newPendingTransactions"], "id": 1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":"0x416d77337e24399d","id":1}"#;
+	assert_eq!(io.handle_request_sync(request, metadata.clone()), Some(response.to_owned()));
+
+	// Send new transactions
+	handler.new_transactions(&[5.into(), 7.into()]);
+
+	let (res, receiver) = receiver.into_future().wait().unwrap();
+	let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":"0x0000000000000000000000000000000000000000000000000000000000000005","subscription":"0x416d77337e24399d"}}"#;
+	assert_eq!(res, Some(response.into()));
+
+	let (res, receiver) = receiver.into_future().wait().unwrap();
+	let response = r#"{"jsonrpc":"2.0","method":"eth_subscription","params":{"result":"0x0000000000000000000000000000000000000000000000000000000000000007","subscription":"0x416d77337e24399d"}}"#;
+	assert_eq!(res, Some(response.into()));
+
+	// And unsubscribe
+	let request = r#"{"jsonrpc": "2.0", "method": "eth_unsubscribe", "params": ["0x416d77337e24399d"], "id": 1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
+	assert_eq!(io.handle_request_sync(request, metadata), Some(response.to_owned()));
+
+	let (res, _receiver) = receiver.into_future().wait().unwrap();
+	assert_eq!(res, None);
+}
+
 #[test]
 fn should_return_unimplemented() {
 	// given
@@ -167,8 +215,6 @@ fn should_return_unimplemented() {
 
 	// Subscribe
 	let response = r#"{"jsonrpc":"2.0","error":{"code":-32000,"message":"This request is not implemented yet. Please create an issue on Github repo."},"id":1}"#;
-	let request = r#"{"jsonrpc": "2.0", "method": "eth_subscribe", "params": ["newPendingTransactions"], "id": 1}"#;
-	assert_eq!(io.handle_request_sync(request, metadata.clone()), Some(response.to_owned()));
 	let request = r#"{"jsonrpc": "2.0", "method": "eth_subscribe", "params": ["syncing"], "id": 1}"#;
 	assert_eq!(io.handle_request_sync(request, metadata.clone()), Some(response.to_owned()));
 }
diff --git a/rpc/src/v1/tests/mocked/manage_network.rs b/rpc/src/v1/tests/mocked/manage_network.rs
index e5e3fd34050d01f18870f35a4485a8191932d588..9438429cdb625c89d855a407573e6219598f6931 100644
--- a/rpc/src/v1/tests/mocked/manage_network.rs
+++ b/rpc/src/v1/tests/mocked/manage_network.rs
@@ -15,6 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use ethsync::{ManageNetwork, NetworkConfiguration};
+use self::ethcore_network::{ProtocolId, NetworkContext};
+
+extern crate ethcore_network;
 
 pub struct TestManageNetwork;
 
@@ -27,4 +30,5 @@ impl ManageNetwork for TestManageNetwork {
 	fn start_network(&self) {}
 	fn stop_network(&self) {}
 	fn network_config(&self) -> NetworkConfiguration { NetworkConfiguration::new_local() }
+	fn with_proto_context(&self, _: ProtocolId, _: &mut FnMut(&NetworkContext)) { }
 }
diff --git a/rpc/src/v1/tests/mocked/parity.rs b/rpc/src/v1/tests/mocked/parity.rs
index 3c98ea8efff4f19db19c3953a6d241e080195ac0..4b75e07fedb00f2eec0e653599684737250a5bc4 100644
--- a/rpc/src/v1/tests/mocked/parity.rs
+++ b/rpc/src/v1/tests/mocked/parity.rs
@@ -23,7 +23,7 @@ use ethstore::ethkey::{Generator, Random};
 use ethsync::ManageNetwork;
 use node_health::{self, NodeHealth};
 use parity_reactor;
-use util::Address;
+use ethereum_types::{Address, U256, H256};
 
 use jsonrpc_core::IoHandler;
 use v1::{Parity, ParityClient};
@@ -31,6 +31,7 @@ use v1::metadata::Metadata;
 use v1::helpers::{SignerService, NetworkSettings};
 use v1::tests::helpers::{TestSyncProvider, Config, TestMinerService, TestUpdater};
 use super::manage_network::TestManageNetwork;
+use Host;
 
 pub type TestParityClient = ParityClient<TestBlockChainClient, TestMinerService, TestUpdater>;
 
@@ -44,8 +45,8 @@ pub struct Dependencies {
 	pub settings: Arc<NetworkSettings>,
 	pub network: Arc<ManageNetwork>,
 	pub accounts: Arc<AccountProvider>,
-	pub dapps_address: Option<(String, u16)>,
-	pub ws_address: Option<(String, u16)>,
+	pub dapps_address: Option<Host>,
+	pub ws_address: Option<Host>,
 }
 
 impl Dependencies {
@@ -74,8 +75,8 @@ impl Dependencies {
 			}),
 			network: Arc::new(TestManageNetwork),
 			accounts: Arc::new(AccountProvider::transient_provider()),
-			dapps_address: Some(("127.0.0.1".into(), 18080)),
-			ws_address: Some(("127.0.0.1".into(), 18546)),
+			dapps_address: Some("127.0.0.1:18080".into()),
+			ws_address: Some("127.0.0.1:18546".into()),
 		}
 	}
 
@@ -133,14 +134,14 @@ fn rpc_parity_accounts_info() {
 	deps.accounts.set_account_meta(address.clone(), "{foo: 69}".into()).unwrap();
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_accountsInfo", "params": [], "id": 1}"#;
-	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{}\":{{\"name\":\"Test\"}}}},\"id\":1}}", address.hex());
+	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{:x}\":{{\"name\":\"Test\"}}}},\"id\":1}}", address);
 	assert_eq!(io.handle_request_sync(request), Some(response));
 
 	// Change the whitelist
 	let address = Address::from(1);
 	deps.accounts.set_new_dapps_addresses(Some(vec![address.clone()])).unwrap();
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_accountsInfo", "params": [], "id": 1}"#;
-	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{}\":{{\"name\":\"XX\"}}}},\"id\":1}}", address.hex());
+	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{:x}\":{{\"name\":\"XX\"}}}},\"id\":1}}", address);
 	assert_eq!(io.handle_request_sync(request), Some(response));
 }
 
@@ -153,7 +154,7 @@ fn rpc_parity_default_account() {
 	// Check empty
 	let address = Address::default();
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_defaultAccount", "params": [], "id": 1}"#;
-	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":\"0x{}\",\"id\":1}}", address.hex());
+	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":\"0x{:x}\",\"id\":1}}", address);
 	assert_eq!(io.handle_request_sync(request), Some(response));
 
 	// With account
@@ -163,7 +164,7 @@ fn rpc_parity_default_account() {
 	let address = accounts[0];
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_defaultAccount", "params": [], "id": 1}"#;
-	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":\"0x{}\",\"id\":1}}", address.hex());
+	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":\"0x{:x}\",\"id\":1}}", address);
 	assert_eq!(io.handle_request_sync(request), Some(response));
 }
 
@@ -220,16 +221,27 @@ fn rpc_parity_extra_data() {
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
+#[test]
+fn rpc_parity_chain_id() {
+	let deps = Dependencies::new();
+	let io = deps.default_client();
+
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_chainId", "params": [], "id": 1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":null,"id":1}"#;
+
+	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
+}
+
 #[test]
 fn rpc_parity_default_extra_data() {
-	use util::misc;
-	use util::ToPretty;
+	use version::version_data;
+	use bytes::ToPretty;
 
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_defaultExtraData", "params": [], "id": 1}"#;
-	let response = format!(r#"{{"jsonrpc":"2.0","result":"0x{}","id":1}}"#, misc::version_data().to_hex());
+	let response = format!(r#"{{"jsonrpc":"2.0","result":"0x{}","id":1}}"#, version_data().to_hex());
 
 	assert_eq!(io.handle_request_sync(request), Some(response));
 }
@@ -485,8 +497,6 @@ fn rpc_parity_local_transactions() {
 
 #[test]
 fn rpc_parity_chain_status() {
-	use util::{H256, U256};
-
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
@@ -523,8 +533,6 @@ fn rpc_parity_cid() {
 
 #[test]
 fn rpc_parity_call() {
-	use util::U256;
-
 	let deps = Dependencies::new();
 	deps.client.set_execution_result(Ok(Executed {
 		exception: None,
diff --git a/rpc/src/v1/tests/mocked/parity_accounts.rs b/rpc/src/v1/tests/mocked/parity_accounts.rs
index b3ea644faf7f657f42d4bef5def4aaad7326ffec..258310b85a35ac2358f184f8b7a9298fe5e3431e 100644
--- a/rpc/src/v1/tests/mocked/parity_accounts.rs
+++ b/rpc/src/v1/tests/mocked/parity_accounts.rs
@@ -18,8 +18,8 @@ use std::sync::Arc;
 
 use ethcore::account_provider::{AccountProvider, AccountProviderSettings};
 use ethstore::EthStore;
-use ethstore::dir::RootDiskDirectory;
-use devtools::RandomTempPath;
+use ethstore::accounts_dir::RootDiskDirectory;
+use tempdir::TempDir;
 
 use jsonrpc_core::IoHandler;
 use v1::{ParityAccounts, ParityAccountsClient};
@@ -75,7 +75,7 @@ fn should_be_able_to_get_account_info() {
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_allAccountsInfo", "params": [], "id": 1}"#;
 	let res = tester.io.handle_request_sync(request);
-	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{}\":{{\"meta\":\"{{foo: 69}}\",\"name\":\"Test\",\"uuid\":\"{}\"}}}},\"id\":1}}", address.hex(), uuid);
+	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{:x}\":{{\"meta\":\"{{foo: 69}}\",\"name\":\"Test\",\"uuid\":\"{}\"}}}},\"id\":1}}", address, uuid);
 	assert_eq!(res, Some(response));
 }
 
@@ -87,7 +87,7 @@ fn should_be_able_to_set_name() {
 	assert_eq!(accounts.len(), 1);
 	let address = accounts[0];
 
-	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_setAccountName", "params": ["0x{}", "Test"], "id": 1}}"#, address.hex());
+	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_setAccountName", "params": ["0x{:x}", "Test"], "id": 1}}"#, address);
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
 	let res = tester.io.handle_request_sync(&request);
 	assert_eq!(res, Some(response.into()));
@@ -96,7 +96,7 @@ fn should_be_able_to_set_name() {
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_allAccountsInfo", "params": [], "id": 1}"#;
 	let res = tester.io.handle_request_sync(request);
-	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{}\":{{\"meta\":\"{{}}\",\"name\":\"Test\",\"uuid\":\"{}\"}}}},\"id\":1}}", address.hex(), uuid);
+	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{:x}\":{{\"meta\":\"{{}}\",\"name\":\"Test\",\"uuid\":\"{}\"}}}},\"id\":1}}", address, uuid);
 	assert_eq!(res, Some(response));
 }
 
@@ -108,7 +108,7 @@ fn should_be_able_to_set_meta() {
 	assert_eq!(accounts.len(), 1);
 	let address = accounts[0];
 
-	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_setAccountMeta", "params": ["0x{}", "{{foo: 69}}"], "id": 1}}"#, address.hex());
+	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_setAccountMeta", "params": ["0x{:x}", "{{foo: 69}}"], "id": 1}}"#, address);
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
 	let res = tester.io.handle_request_sync(&request);
 	assert_eq!(res, Some(response.into()));
@@ -117,7 +117,7 @@ fn should_be_able_to_set_meta() {
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_allAccountsInfo", "params": [], "id": 1}"#;
 	let res = tester.io.handle_request_sync(request);
-	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{}\":{{\"meta\":\"{{foo: 69}}\",\"name\":\"\",\"uuid\":\"{}\"}}}},\"id\":1}}", address.hex(), uuid);
+	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{:x}\":{{\"meta\":\"{{foo: 69}}\",\"name\":\"\",\"uuid\":\"{}\"}}}},\"id\":1}}", address, uuid);
 	assert_eq!(res, Some(response));
 }
 
@@ -235,7 +235,7 @@ fn should_be_able_to_kill_account() {
 	let res = tester.io.handle_request_sync(&request);
 	assert_eq!(res, Some(response.into()));
 
-	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_killAccount", "params": ["0x{}", "password"], "id": 1}}"#, address.hex());
+	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_killAccount", "params": ["0x{:x}", "password"], "id": 1}}"#, address);
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
 	let res = tester.io.handle_request_sync(&request);
 	assert_eq!(res, Some(response.into()));
@@ -275,8 +275,8 @@ fn should_be_able_to_remove_address() {
 
 #[test]
 fn rpc_parity_new_vault() {
-	let temp_path = RandomTempPath::new();
-	let tester = setup_with_vaults_support(temp_path.as_str());
+	let tempdir = TempDir::new("").unwrap();
+	let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_newVault", "params":["vault1", "password1"], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
@@ -288,8 +288,8 @@ fn rpc_parity_new_vault() {
 
 #[test]
 fn rpc_parity_open_vault() {
-	let temp_path = RandomTempPath::new();
-	let tester = setup_with_vaults_support(temp_path.as_str());
+	let tempdir = TempDir::new("").unwrap();
+	let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
 
 	assert!(tester.accounts.create_vault("vault1", "password1").is_ok());
 	assert!(tester.accounts.close_vault("vault1").is_ok());
@@ -302,8 +302,8 @@ fn rpc_parity_open_vault() {
 
 #[test]
 fn rpc_parity_close_vault() {
-	let temp_path = RandomTempPath::new();
-	let tester = setup_with_vaults_support(temp_path.as_str());
+	let tempdir = TempDir::new("").unwrap();
+	let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
 
 	assert!(tester.accounts.create_vault("vault1", "password1").is_ok());
 
@@ -315,8 +315,8 @@ fn rpc_parity_close_vault() {
 
 #[test]
 fn rpc_parity_change_vault_password() {
-	let temp_path = RandomTempPath::new();
-	let tester = setup_with_vaults_support(temp_path.as_str());
+	let tempdir = TempDir::new("").unwrap();
+	let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
 
 	assert!(tester.accounts.create_vault("vault1", "password1").is_ok());
 
@@ -328,13 +328,13 @@ fn rpc_parity_change_vault_password() {
 
 #[test]
 fn rpc_parity_change_vault() {
-	let temp_path = RandomTempPath::new();
-	let tester = setup_with_vaults_support(temp_path.as_str());
+	let tempdir = TempDir::new("").unwrap();
+	let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
 
 	let (address, _) = tester.accounts.new_account_and_public("root_password").unwrap();
 	assert!(tester.accounts.create_vault("vault1", "password1").is_ok());
 
-	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_changeVault", "params":["0x{}", "vault1"], "id": 1}}"#, address.hex());
+	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_changeVault", "params":["0x{:x}", "vault1"], "id": 1}}"#, address);
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
 
 	assert_eq!(tester.io.handle_request_sync(&request), Some(response.to_owned()));
@@ -342,8 +342,8 @@ fn rpc_parity_change_vault() {
 
 #[test]
 fn rpc_parity_vault_adds_vault_field_to_acount_meta() {
-	let temp_path = RandomTempPath::new();
-	let tester = setup_with_vaults_support(temp_path.as_str());
+	let tempdir = TempDir::new("").unwrap();
+	let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
 
 	let (address1, _) = tester.accounts.new_account_and_public("root_password1").unwrap();
 	let uuid1 = tester.accounts.account_meta(address1.clone()).unwrap().uuid.unwrap();
@@ -351,7 +351,7 @@ fn rpc_parity_vault_adds_vault_field_to_acount_meta() {
 	assert!(tester.accounts.change_vault(address1, "vault1").is_ok());
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_allAccountsInfo", "params":[], "id": 1}"#;
-	let response = format!(r#"{{"jsonrpc":"2.0","result":{{"0x{}":{{"meta":"{{\"vault\":\"vault1\"}}","name":"","uuid":"{}"}}}},"id":1}}"#, address1.hex(), uuid1);
+	let response = format!(r#"{{"jsonrpc":"2.0","result":{{"0x{:x}":{{"meta":"{{\"vault\":\"vault1\"}}","name":"","uuid":"{}"}}}},"id":1}}"#, address1, uuid1);
 
 	assert_eq!(tester.io.handle_request_sync(request), Some(response.to_owned()));
 
@@ -359,15 +359,15 @@ fn rpc_parity_vault_adds_vault_field_to_acount_meta() {
 	assert!(tester.accounts.change_vault(address1, "").is_ok());
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_allAccountsInfo", "params":[], "id": 1}"#;
-	let response = format!(r#"{{"jsonrpc":"2.0","result":{{"0x{}":{{"meta":"{{}}","name":"","uuid":"{}"}}}},"id":1}}"#, address1.hex(), uuid1);
+	let response = format!(r#"{{"jsonrpc":"2.0","result":{{"0x{:x}":{{"meta":"{{}}","name":"","uuid":"{}"}}}},"id":1}}"#, address1, uuid1);
 
 	assert_eq!(tester.io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
 fn rpc_parity_list_vaults() {
-	let temp_path = RandomTempPath::new();
-	let tester = setup_with_vaults_support(temp_path.as_str());
+	let tempdir = TempDir::new("").unwrap();
+	let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
 
 	assert!(tester.accounts.create_vault("vault1", "password1").is_ok());
 	assert!(tester.accounts.create_vault("vault2", "password2").is_ok());
@@ -383,8 +383,8 @@ fn rpc_parity_list_vaults() {
 
 #[test]
 fn rpc_parity_list_opened_vaults() {
-	let temp_path = RandomTempPath::new();
-	let tester = setup_with_vaults_support(temp_path.as_str());
+	let tempdir = TempDir::new("").unwrap();
+	let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
 
 	assert!(tester.accounts.create_vault("vault1", "password1").is_ok());
 	assert!(tester.accounts.create_vault("vault2", "password2").is_ok());
@@ -402,8 +402,8 @@ fn rpc_parity_list_opened_vaults() {
 
 #[test]
 fn rpc_parity_get_set_vault_meta() {
-	let temp_path = RandomTempPath::new();
-	let tester = setup_with_vaults_support(temp_path.as_str());
+	let tempdir = TempDir::new("").unwrap();
+	let tester = setup_with_vaults_support(tempdir.path().to_str().unwrap());
 
 	assert!(tester.accounts.create_vault("vault1", "password1").is_ok());
 
@@ -480,7 +480,7 @@ fn should_export_account() {
 	// given
 	let tester = setup();
 	let wallet = r#"{"id":"6a186c80-7797-cff2-bc2e-7c1d6a6cc76e","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"a1c6ff99070f8032ca1c4e8add006373"},"ciphertext":"df27e3db64aa18d984b6439443f73660643c2d119a6f0fa2fa9a6456fc802d75","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"ddc325335cda5567a1719313e73b4842511f3e4a837c9658eeb78e51ebe8c815"},"mac":"3dc888ae79cbb226ff9c455669f6cf2d79be72120f2298f6cb0d444fddc0aa3d"},"address":"0042e5d2a662eeaca8a7e828c174f98f35d8925b","name":"parity-export-test","meta":"{\"passwordHint\":\"parity-export-test\",\"timestamp\":1490017814987}"}"#;
-	tester.accounts.import_wallet(wallet.as_bytes(), "parity-export-test").unwrap();
+	tester.accounts.import_wallet(wallet.as_bytes(), "parity-export-test", false).unwrap();
 	let accounts = tester.accounts.accounts().unwrap();
 	assert_eq!(accounts.len(), 1);
 
@@ -501,6 +501,26 @@ fn should_export_account() {
 	assert_eq!(result, Some(response.into()));
 }
 
+#[test]
+fn should_import_wallet() {
+	let tester = setup();
+
+	let id = "6a186c80-7797-cff2-bc2e-7c1d6a6cc76e";
+	let request = r#"{"jsonrpc":"2.0","method":"parity_newAccountFromWallet","params":["{\"id\":\"<ID>\",\"version\":3,\"crypto\":{\"cipher\":\"aes-128-ctr\",\"cipherparams\":{\"iv\":\"478736fb55872c1baf01b27b1998c90b\"},\"ciphertext\":\"fe5a63cc0055d7b0b3b57886f930ad9b63f48950d1348145d95996c41e05f4e0\",\"kdf\":\"pbkdf2\",\"kdfparams\":{\"c\":10240,\"dklen\":32,\"prf\":\"hmac-sha256\",\"salt\":\"658436d6738a19731149a98744e5cf02c8d5aa1f8e80c1a43cc9351c70a984e4\"},\"mac\":\"c7384b26ecf25539d942030230062af9b69de5766cbcc4690bffce1536644631\"},\"address\":\"00bac56a8a27232baa044c03f43bf3648c961735\",\"name\":\"hello world\",\"meta\":\"{}\"}", "himom"],"id":1}"#;
+	let request = request.replace("<ID>", id);
+	let response = r#"{"jsonrpc":"2.0","result":"0x00bac56a8a27232baa044c03f43bf3648c961735","id":1}"#;
+
+	let res = tester.io.handle_request_sync(&request).unwrap();
+
+	assert_eq!(res, response);
+
+	let account_meta = tester.accounts.account_meta("0x00bac56a8a27232baa044c03f43bf3648c961735".into()).unwrap();
+	let account_uuid: String = account_meta.uuid.unwrap().into();
+
+	// the RPC should import the account with a new id
+	assert!(account_uuid != id);
+}
+
 #[test]
 fn should_sign_message() {
 	let tester = setup();
diff --git a/rpc/src/v1/tests/mocked/parity_set.rs b/rpc/src/v1/tests/mocked/parity_set.rs
index 22e0388e282071d8088a43a9b5f7ca91960e8909..f92841ee8b5f18307fb2bbf989ef9fca41d9c6d9 100644
--- a/rpc/src/v1/tests/mocked/parity_set.rs
+++ b/rpc/src/v1/tests/mocked/parity_set.rs
@@ -17,11 +17,12 @@
 use std::sync::Arc;
 use std::str::FromStr;
 use rustc_hex::FromHex;
-use util::{U256, Address};
+use ethereum_types::{U256, Address};
 
 use ethcore::miner::MinerService;
 use ethcore::client::TestBlockChainClient;
 use ethsync::ManageNetwork;
+use futures_cpupool::CpuPool;
 
 use jsonrpc_core::IoHandler;
 use v1::{ParitySet, ParitySetClient};
@@ -53,7 +54,8 @@ fn parity_set_client(
 	net: &Arc<TestManageNetwork>,
 ) -> TestParitySetClient {
 	let dapps_service = Arc::new(TestDappsService);
-	ParitySetClient::new(client, miner, updater, &(net.clone() as Arc<ManageNetwork>), Some(dapps_service), TestFetch::default())
+	let pool = CpuPool::new(1);
+	ParitySetClient::new(client, miner, updater, &(net.clone() as Arc<ManageNetwork>), Some(dapps_service), TestFetch::default(), pool)
 }
 
 #[test]
@@ -212,7 +214,7 @@ fn rpc_parity_set_hash_content() {
 
 #[test]
 fn rpc_parity_remove_transaction() {
-	use ethcore::transaction::{Transaction, Action};
+	use transaction::{Transaction, Action};
 
 	let miner = miner_service();
 	let client = client_service();
@@ -249,7 +251,7 @@ fn rpc_parity_set_dapps_list() {
 	io.extend_with(parity_set_client(&client, &miner, &updater, &network).to_delegate());
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_dappsList", "params":[], "id": 1}"#;
-	let response = r#"{"jsonrpc":"2.0","result":[{"author":"Parity Technologies Ltd","description":"A skeleton dapp","iconUrl":"title.png","id":"skeleton","name":"Skeleton","version":"0.1"}],"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":[{"author":"Parity Technologies Ltd","description":"A skeleton dapp","iconUrl":"title.png","id":"skeleton","localUrl":null,"name":"Skeleton","version":"0.1"}],"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
diff --git a/rpc/src/v1/tests/mocked/personal.rs b/rpc/src/v1/tests/mocked/personal.rs
index c7205d6ef7e1d200f8318b160381b8260d3d5992..6dd1da567fee080bdb15cd245500241ddd18c740 100644
--- a/rpc/src/v1/tests/mocked/personal.rs
+++ b/rpc/src/v1/tests/mocked/personal.rs
@@ -17,15 +17,19 @@
 use std::sync::Arc;
 use std::str::FromStr;
 
+use bytes::ToPretty;
+use ethereum_types::{U256, Address};
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::TestBlockChainClient;
-use ethcore::transaction::{Action, Transaction};
 use jsonrpc_core::IoHandler;
-use util::{U256, Address};
+use parking_lot::Mutex;
+use transaction::{Action, Transaction};
 
 use v1::{PersonalClient, Personal, Metadata};
-use v1::helpers::dispatch::FullDispatcher;
+use v1::helpers::nonce;
+use v1::helpers::dispatch::{eth_data_hash, FullDispatcher};
 use v1::tests::helpers::TestMinerService;
+use v1::types::H520;
 
 struct PersonalTester {
 	accounts: Arc<AccountProvider>,
@@ -51,9 +55,10 @@ fn setup() -> PersonalTester {
 	let opt_accounts = Some(accounts.clone());
 	let client = blockchain_client();
 	let miner = miner_service();
+	let reservations = Arc::new(Mutex::new(nonce::Reservations::new()));
 
-	let dispatcher = FullDispatcher::new(client, miner.clone());
-	let personal = PersonalClient::new(&opt_accounts, dispatcher, false);
+	let dispatcher = FullDispatcher::new(client, miner.clone(), reservations, 50);
+	let personal = PersonalClient::new(opt_accounts, dispatcher, false);
 
 	let mut io = IoHandler::default();
 	io.extend_with(personal.to_delegate());
@@ -92,15 +97,16 @@ fn new_account() {
 	assert_eq!(res, Some(response));
 }
 
-#[test]
-fn sign_and_send_transaction_with_invalid_password() {
+fn invalid_password_test(method: &str)
+{
 	let tester = setup();
 	let address = tester.accounts.new_account("password123").unwrap();
+
 	let request = r#"{
 		"jsonrpc": "2.0",
-		"method": "personal_sendTransaction",
+		"method": ""#.to_owned() + method + r#"",
 		"params": [{
-			"from": ""#.to_owned() + format!("0x{:?}", address).as_ref() + r#"",
+			"from": ""# + format!("0x{:?}", address).as_ref() + r#"",
 			"to": "0xd46e8dd67c5d32be8058bb8eb970870f07244567",
 			"gas": "0x76c0",
 			"gasPrice": "0x9184e72a000",
@@ -114,6 +120,63 @@ fn sign_and_send_transaction_with_invalid_password() {
 	assert_eq!(tester.io.handle_request_sync(request.as_ref()), Some(response.into()));
 }
 
+#[test]
+fn sign() {
+	let tester = setup();
+	let address = tester.accounts.new_account("password123").unwrap();
+	let data = vec![5u8];
+
+	let request = r#"{
+		"jsonrpc": "2.0",
+		"method": "personal_sign",
+		"params": [
+			""#.to_owned() + format!("0x{}", data.to_hex()).as_ref() + r#"",
+			""# + format!("0x{:?}", address).as_ref() + r#"",
+			"password123"
+		],
+		"id": 1
+	}"#;
+
+	let hash = eth_data_hash(data);
+	let signature = H520(tester.accounts.sign(address, Some("password123".into()), hash).unwrap().into_electrum());
+	let signature = format!("0x{:?}", signature);
+
+	let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + &signature + r#"","id":1}"#;
+
+	assert_eq!(tester.io.handle_request_sync(request.as_ref()), Some(response));
+}
+
+#[test]
+fn sign_with_invalid_password() {
+	let tester = setup();
+	let address = tester.accounts.new_account("password123").unwrap();
+
+	let request = r#"{
+		"jsonrpc": "2.0",
+		"method": "personal_sign",
+		"params": [
+			"0x0000000000000000000000000000000000000000000000000000000000000005",
+			""#.to_owned() + format!("0x{:?}", address).as_ref() + r#"",
+			""
+		],
+		"id": 1
+	}"#;
+
+	let response = r#"{"jsonrpc":"2.0","error":{"code":-32021,"message":"Account password is invalid or account does not exist.","data":"SStore(InvalidPassword)"},"id":1}"#;
+
+	assert_eq!(tester.io.handle_request_sync(request.as_ref()), Some(response.into()));
+}
+
+#[test]
+fn sign_transaction_with_invalid_password() {
+	invalid_password_test("personal_signTransaction");
+}
+
+#[test]
+fn sign_and_send_transaction_with_invalid_password() {
+	invalid_password_test("personal_sendTransaction");
+}
+
 #[test]
 fn send_transaction() {
 	sign_and_send_test("personal_sendTransaction");
@@ -177,7 +240,53 @@ fn sign_and_send_test(method: &str) {
 }
 
 #[test]
-fn should_unlock_account_temporarily() {
+fn ec_recover() {
+	let tester = setup();
+	let address = tester.accounts.new_account("password123").unwrap();
+	let data = vec![5u8];
+
+	let hash = eth_data_hash(data.clone());
+	let signature = H520(tester.accounts.sign(address, Some("password123".into()), hash).unwrap().into_electrum());
+	let signature = format!("0x{:?}", signature);
+
+	let request = r#"{
+		"jsonrpc": "2.0",
+		"method": "personal_ecRecover",
+		"params": [
+			""#.to_owned() + format!("0x{}", data.to_hex()).as_ref() + r#"",
+			""# + &signature + r#""
+		],
+		"id": 1
+	}"#;
+
+	let address = format!("0x{:?}", address);
+	let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + &address + r#"","id":1}"#;
+
+	assert_eq!(tester.io.handle_request_sync(request.as_ref()), Some(response.into()));
+}
+
+#[test]
+fn ec_recover_invalid_signature() {
+	let tester = setup();
+	let data = vec![5u8];
+
+	let request = r#"{
+		"jsonrpc": "2.0",
+		"method": "personal_ecRecover",
+		"params": [
+			""#.to_owned() + format!("0x{}", data.to_hex()).as_ref() + r#"",
+			"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+		],
+		"id": 1
+	}"#;
+
+	let response = r#"{"jsonrpc":"2.0","error":{"code":-32055,"message":"Encryption error.","data":"InvalidSignature"},"id":1}"#;
+
+	assert_eq!(tester.io.handle_request_sync(request.as_ref()), Some(response.into()));
+}
+
+#[test]
+fn should_unlock_not_account_temporarily_if_allow_perm_is_disabled() {
 	let tester = setup();
 	let address = tester.accounts.new_account("password123").unwrap();
 
@@ -191,10 +300,10 @@ fn should_unlock_account_temporarily() {
 		],
 		"id": 1
 	}"#;
-	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","error":{"code":-32000,"message":"Time-unlocking is only supported in --geth compatibility mode.","data":"Restart your client with --geth flag or use personal_sendTransaction instead."},"id":1}"#;
 	assert_eq!(tester.io.handle_request_sync(&request), Some(response.into()));
 
-	assert!(tester.accounts.sign(address, None, Default::default()).is_ok(), "Should unlock account.");
+	assert!(tester.accounts.sign(address, None, Default::default()).is_err(), "Should not unlock account.");
 }
 
 #[test]
diff --git a/rpc/src/v1/tests/mocked/secretstore.rs b/rpc/src/v1/tests/mocked/secretstore.rs
index ed278ced8a2a2ce5824ad721ca58361a3b984c34..d3ab781bcfdb26d77d9a39e8d526bd3504ed1aca 100644
--- a/rpc/src/v1/tests/mocked/secretstore.rs
+++ b/rpc/src/v1/tests/mocked/secretstore.rs
@@ -16,13 +16,17 @@
 
 use std::sync::Arc;
 
+use crypto::DEFAULT_MAC;
 use ethcore::account_provider::AccountProvider;
+use ethkey::{KeyPair, Signature, verify_public};
 
 use serde_json;
 use jsonrpc_core::{IoHandler, Success};
 use v1::metadata::Metadata;
 use v1::SecretStoreClient;
 use v1::traits::secretstore::SecretStore;
+use v1::helpers::secretstore::ordered_servers_keccak;
+use v1::types::{H256, EncryptedDocumentKey};
 
 struct Dependencies {
 	pub accounts: Arc<AccountProvider>,
@@ -51,7 +55,7 @@ fn rpc_secretstore_encrypt_and_decrypt() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	// insert new account && unlock it
+	// insert new account
 	let secret = "c1f1cfe279a5c350d13795bce162941967340c8a228e6ba175489afc564a5bef".parse().unwrap();
 	deps.accounts.insert_account(secret, "password").unwrap();
 
@@ -81,7 +85,7 @@ fn rpc_secretstore_shadow_decrypt() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	// insert new account && unlock it
+	// insert new account
 	let secret = "82758356bf46b42710d3946a8efa612b7bf5e125e4d49f28facf1139db4a46f4".parse().unwrap();
 	deps.accounts.insert_account(secret, "password").unwrap();
 
@@ -96,3 +100,76 @@ fn rpc_secretstore_shadow_decrypt() {
 	let decryption_response = io.handle_request_sync(&decryption_request).unwrap();
 	assert_eq!(decryption_response, r#"{"jsonrpc":"2.0","result":"0xdeadbeef","id":1}"#);
 }
+
+#[test]
+fn rpc_secretstore_servers_set_hash() {
+	let deps = Dependencies::new();
+	let io = deps.default_client();
+
+	// execute hashing request
+	let hashing_request = r#"{"jsonrpc": "2.0", "method": "secretstore_serversSetHash", "params":[
+		["0x843645726384530ffb0c52f175278143b5a93959af7864460f5a4fec9afd1450cfb8aef63dec90657f43f55b13e0a73c7524d4e9a13c051b4e5f1e53f39ecd91",
+		 "0x07230e34ebfe41337d3ed53b186b3861751f2401ee74b988bba55694e2a6f60c757677e194be2e53c3523cc8548694e636e6acb35c4e8fdc5e29d28679b9b2f3"]
+	], "id": 1}"#;
+	let hashing_response = io.handle_request_sync(&hashing_request).unwrap();
+	let hashing_response = hashing_response.replace(r#"{"jsonrpc":"2.0","result":"0x"#, "");
+	let hashing_response = hashing_response.replace(r#"","id":1}"#, "");
+	let hash: H256 = hashing_response.parse().unwrap();
+
+	let servers_set_keccak = ordered_servers_keccak(vec![
+		"843645726384530ffb0c52f175278143b5a93959af7864460f5a4fec9afd1450cfb8aef63dec90657f43f55b13e0a73c7524d4e9a13c051b4e5f1e53f39ecd91".parse().unwrap(),
+		"07230e34ebfe41337d3ed53b186b3861751f2401ee74b988bba55694e2a6f60c757677e194be2e53c3523cc8548694e636e6acb35c4e8fdc5e29d28679b9b2f3".parse().unwrap()
+	].into_iter().collect());
+	assert_eq!(hash, servers_set_keccak);
+}
+
+#[test]
+fn rpc_secretstore_sign_raw_hash() {
+	let deps = Dependencies::new();
+	let io = deps.default_client();
+
+	// insert new account
+	let secret = "82758356bf46b42710d3946a8efa612b7bf5e125e4d49f28facf1139db4a46f4".parse().unwrap();
+	let key_pair = KeyPair::from_secret(secret).unwrap();
+	deps.accounts.insert_account(key_pair.secret().clone(), "password").unwrap();
+
+	// execute signing request
+	let signing_request = r#"{"jsonrpc": "2.0", "method": "secretstore_signRawHash", "params":[
+		"0x00dfE63B22312ab4329aD0d28CaD8Af987A01932", "password", "0x0000000000000000000000000000000000000000000000000000000000000001"
+	], "id": 1}"#;
+	let signing_response = io.handle_request_sync(&signing_request).unwrap();
+	let signing_response = signing_response.replace(r#"{"jsonrpc":"2.0","result":"0x"#, "");
+	let signing_response = signing_response.replace(r#"","id":1}"#, "");
+	let signature: Signature = signing_response.parse().unwrap();
+
+	let hash = "0000000000000000000000000000000000000000000000000000000000000001".parse().unwrap();
+	assert!(verify_public(key_pair.public(), &signature, &hash).unwrap());
+}
+
+#[test]
+fn rpc_secretstore_generate_document_key() {
+	let deps = Dependencies::new();
+	let io = deps.default_client();
+
+	// insert new account
+	let secret = "82758356bf46b42710d3946a8efa612b7bf5e125e4d49f28facf1139db4a46f4".parse().unwrap();
+	let key_pair = KeyPair::from_secret(secret).unwrap();
+	deps.accounts.insert_account(key_pair.secret().clone(), "password").unwrap();
+
+	// execute generation request
+	let generation_request = r#"{"jsonrpc": "2.0", "method": "secretstore_generateDocumentKey", "params":[
+		"0x00dfE63B22312ab4329aD0d28CaD8Af987A01932", "password",
+		"0x843645726384530ffb0c52f175278143b5a93959af7864460f5a4fec9afd1450cfb8aef63dec90657f43f55b13e0a73c7524d4e9a13c051b4e5f1e53f39ecd91"
+	], "id": 1}"#;
+	let generation_response = io.handle_request_sync(&generation_request).unwrap();
+	let generation_response = generation_response.replace(r#"{"jsonrpc":"2.0","result":"#, "");
+	let generation_response = generation_response.replace(r#","id":1}"#, "");
+	let generation_response: EncryptedDocumentKey = serde_json::from_str(&generation_response).unwrap();
+
+	// the only thing we can check is that 'encrypted_key' can be decrypted by passed account
+	assert!(deps.accounts.decrypt(
+		"00dfE63B22312ab4329aD0d28CaD8Af987A01932".parse().unwrap(),
+		Some("password".into()),
+		&DEFAULT_MAC,
+		&generation_response.encrypted_key.0).is_ok());
+}
diff --git a/rpc/src/v1/tests/mocked/signer.rs b/rpc/src/v1/tests/mocked/signer.rs
index 6827334de5331ab25136888138e95ab6495bcd47..da531a00f153c74b286b518842c21706e4674046 100644
--- a/rpc/src/v1/tests/mocked/signer.rs
+++ b/rpc/src/v1/tests/mocked/signer.rs
@@ -16,13 +16,15 @@
 
 use std::sync::Arc;
 use std::str::FromStr;
-use util::{U256, Address, ToPretty};
+use ethereum_types::{U256, Address};
+use bytes::ToPretty;
 
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::TestBlockChainClient;
-use ethcore::transaction::{Transaction, Action, SignedTransaction};
 use parity_reactor::EventLoop;
+use parking_lot::Mutex;
 use rlp::encode;
+use transaction::{Transaction, Action, SignedTransaction};
 
 use serde_json;
 use jsonrpc_core::IoHandler;
@@ -30,7 +32,7 @@ use v1::{SignerClient, Signer, Origin};
 use v1::metadata::Metadata;
 use v1::tests::helpers::TestMinerService;
 use v1::types::{Bytes as RpcBytes, H520};
-use v1::helpers::{SigningQueue, SignerService, FilledTransactionRequest, ConfirmationPayload};
+use v1::helpers::{nonce, SigningQueue, SignerService, FilledTransactionRequest, ConfirmationPayload};
 use v1::helpers::dispatch::{FullDispatcher, eth_data_hash};
 
 struct SignerTester {
@@ -59,9 +61,10 @@ fn signer_tester() -> SignerTester {
 	let opt_accounts = Some(accounts.clone());
 	let client = blockchain_client();
 	let miner = miner_service();
+	let reservations = Arc::new(Mutex::new(nonce::Reservations::new()));
 	let event_loop = EventLoop::spawn();
 
-	let dispatcher = FullDispatcher::new(client, miner.clone());
+	let dispatcher = FullDispatcher::new(client, miner.clone(), reservations, 50);
 	let mut io = IoHandler::default();
 	io.extend_with(SignerClient::new(&opt_accounts, dispatcher, &signer, event_loop.remote()).to_delegate());
 
@@ -78,7 +81,7 @@ fn signer_tester() -> SignerTester {
 fn should_return_list_of_items_to_confirm() {
 	// given
 	let tester = signer_tester();
-	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
+	let _send_future = tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: Address::from(1),
 		used_default_from: false,
 		to: Some(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap()),
@@ -89,7 +92,7 @@ fn should_return_list_of_items_to_confirm() {
 		nonce: None,
 		condition: None,
 	}), Origin::Dapps("http://parity.io".into())).unwrap();
-	tester.signer.add_request(ConfirmationPayload::EthSignMessage(1.into(), vec![5].into()), Origin::Unknown).unwrap();
+	let _sign_future = tester.signer.add_request(ConfirmationPayload::EthSignMessage(1.into(), vec![5].into()), Origin::Unknown).unwrap();
 
 	// when
 	let request = r#"{"jsonrpc":"2.0","method":"signer_requestsToConfirm","params":[],"id":1}"#;
@@ -109,7 +112,7 @@ fn should_return_list_of_items_to_confirm() {
 fn should_reject_transaction_from_queue_without_dispatching() {
 	// given
 	let tester = signer_tester();
-	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
+	let _confirmation_future = tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: Address::from(1),
 		used_default_from: false,
 		to: Some(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap()),
@@ -136,7 +139,7 @@ fn should_reject_transaction_from_queue_without_dispatching() {
 fn should_not_remove_transaction_if_password_is_invalid() {
 	// given
 	let tester = signer_tester();
-	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
+	let _confirmation_future = tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: Address::from(1),
 		used_default_from: false,
 		to: Some(Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap()),
@@ -162,7 +165,7 @@ fn should_not_remove_transaction_if_password_is_invalid() {
 fn should_not_remove_sign_if_password_is_invalid() {
 	// given
 	let tester = signer_tester();
-	tester.signer.add_request(ConfirmationPayload::EthSignMessage(0.into(), vec![5].into()), Origin::Unknown).unwrap();
+	let _confirmation_future = tester.signer.add_request(ConfirmationPayload::EthSignMessage(0.into(), vec![5].into()), Origin::Unknown).unwrap();
 	assert_eq!(tester.signer.requests().len(), 1);
 
 	// when
@@ -180,7 +183,7 @@ fn should_confirm_transaction_and_dispatch() {
 	let tester = signer_tester();
 	let address = tester.accounts.new_account("test").unwrap();
 	let recipient = Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap();
-	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
+	let _confirmation_future = tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: address,
 		used_default_from: false,
 		to: Some(recipient),
@@ -226,7 +229,7 @@ fn should_alter_the_sender_and_nonce() {
 	//// given
 	let tester = signer_tester();
 	let recipient = Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap();
-	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
+	let _confirmation_future = tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: 0.into(),
 		used_default_from: false,
 		to: Some(recipient),
@@ -276,7 +279,7 @@ fn should_confirm_transaction_with_token() {
 	let tester = signer_tester();
 	let address = tester.accounts.new_account("test").unwrap();
 	let recipient = Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap();
-	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
+	let _confirmation_future = tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: address,
 		used_default_from: false,
 		to: Some(recipient),
@@ -325,7 +328,7 @@ fn should_confirm_transaction_with_rlp() {
 	let tester = signer_tester();
 	let address = tester.accounts.new_account("test").unwrap();
 	let recipient = Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap();
-	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
+	let _confirmation_future = tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: address,
 		used_default_from: false,
 		to: Some(recipient),
@@ -372,7 +375,7 @@ fn should_return_error_when_sender_does_not_match() {
 	let tester = signer_tester();
 	let address = tester.accounts.new_account("test").unwrap();
 	let recipient = Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap();
-	tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
+	let _confirmation_future = tester.signer.add_request(ConfirmationPayload::SendTransaction(FilledTransactionRequest {
 		from: Address::default(),
 		used_default_from: false,
 		to: Some(recipient),
@@ -419,7 +422,7 @@ fn should_confirm_sign_transaction_with_rlp() {
 	let tester = signer_tester();
 	let address = tester.accounts.new_account("test").unwrap();
 	let recipient = Address::from_str("d46e8dd67c5d32be8058bb8eb970870f07244567").unwrap();
-	tester.signer.add_request(ConfirmationPayload::SignTransaction(FilledTransactionRequest {
+	let _confirmation_future = tester.signer.add_request(ConfirmationPayload::SignTransaction(FilledTransactionRequest {
 		from: address,
 		used_default_from: false,
 		to: Some(recipient),
@@ -463,12 +466,12 @@ fn should_confirm_sign_transaction_with_rlp() {
 		r#""input":"0x","# +
 		r#""nonce":"0x0","# +
 		&format!("\"publicKey\":\"0x{:?}\",", t.public_key().unwrap()) +
-		&format!("\"r\":\"0x{}\",", U256::from(signature.r()).to_hex()) +
+		&format!("\"r\":\"0x{:x}\",", U256::from(signature.r())) +
 		&format!("\"raw\":\"0x{}\",", rlp.to_hex()) +
-		&format!("\"s\":\"0x{}\",", U256::from(signature.s()).to_hex()) +
-		&format!("\"standardV\":\"0x{}\",", U256::from(t.standard_v()).to_hex()) +
+		&format!("\"s\":\"0x{:x}\",", U256::from(signature.s())) +
+		&format!("\"standardV\":\"0x{:x}\",", U256::from(t.standard_v())) +
 		r#""to":"0xd46e8dd67c5d32be8058bb8eb970870f07244567","transactionIndex":null,"# +
-		&format!("\"v\":\"0x{}\",", U256::from(t.original_v()).to_hex()) +
+		&format!("\"v\":\"0x{:x}\",", U256::from(t.original_v())) +
 		r#""value":"0x1""# +
 		r#"}},"id":1}"#;
 
@@ -483,7 +486,7 @@ fn should_confirm_data_sign_with_signature() {
 	// given
 	let tester = signer_tester();
 	let address = tester.accounts.new_account("test").unwrap();
-	tester.signer.add_request(ConfirmationPayload::EthSignMessage(
+	let _confirmation_future = tester.signer.add_request(ConfirmationPayload::EthSignMessage(
 		address,
 		vec![1, 2, 3, 4].into(),
 	), Origin::Unknown).unwrap();
@@ -513,7 +516,7 @@ fn should_confirm_decrypt_with_phrase() {
 	// given
 	let tester = signer_tester();
 	let address = tester.accounts.new_account("test").unwrap();
-	tester.signer.add_request(ConfirmationPayload::Decrypt(
+	let _confirmation_future = tester.signer.add_request(ConfirmationPayload::Decrypt(
 		address,
 		vec![1, 2, 3, 4].into(),
 	), Origin::Unknown).unwrap();
diff --git a/rpc/src/v1/tests/mocked/signing.rs b/rpc/src/v1/tests/mocked/signing.rs
index 4c6951f1a6519db283b7d9a61bf7416416f81e89..5bf5119ec6008d6f869eb3901310d7a79996c813 100644
--- a/rpc/src/v1/tests/mocked/signing.rs
+++ b/rpc/src/v1/tests/mocked/signing.rs
@@ -14,28 +14,33 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::thread;
 use std::str::FromStr;
 use std::sync::Arc;
 use std::time::Duration;
 use rlp;
 
 use jsonrpc_core::{IoHandler, Success};
+use jsonrpc_core::futures::Future;
 use v1::impls::SigningQueueClient;
 use v1::metadata::Metadata;
 use v1::traits::{EthSigning, ParitySigning, Parity};
-use v1::helpers::{SignerService, SigningQueue, FullDispatcher};
-use v1::types::ConfirmationResponse;
+use v1::helpers::{nonce, SignerService, SigningQueue, FullDispatcher};
+use v1::types::{ConfirmationResponse, RichRawTransaction};
 use v1::tests::helpers::TestMinerService;
 use v1::tests::mocked::parity;
 
-use util::{Address, U256, ToPretty};
-use ethkey::Secret;
+use ethereum_types::{U256, Address};
+use bytes::ToPretty;
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::TestBlockChainClient;
-use ethcore::transaction::{Transaction, Action, SignedTransaction};
+use ethkey::Secret;
 use ethstore::ethkey::{Generator, Random};
-use futures::Future;
+use parking_lot::Mutex;
 use serde_json;
+use transaction::{Transaction, Action, SignedTransaction};
+
+use parity_reactor::Remote;
 
 struct SigningTester {
 	pub signer: Arc<SignerService>,
@@ -52,13 +57,16 @@ impl Default for SigningTester {
 		let miner = Arc::new(TestMinerService::default());
 		let accounts = Arc::new(AccountProvider::transient_provider());
 		let opt_accounts = Some(accounts.clone());
+		let reservations = Arc::new(Mutex::new(nonce::Reservations::new()));
 		let mut io = IoHandler::default();
 
-		let dispatcher = FullDispatcher::new(client.clone(), miner.clone());
+		let dispatcher = FullDispatcher::new(client.clone(), miner.clone(), reservations, 50);
 
-		let rpc = SigningQueueClient::new(&signer, dispatcher.clone(), &opt_accounts);
+		let remote = Remote::new_thread_per_future();
+
+		let rpc = SigningQueueClient::new(&signer, dispatcher.clone(), remote.clone(), &opt_accounts);
 		io.extend_with(EthSigning::to_delegate(rpc));
-		let rpc = SigningQueueClient::new(&signer, dispatcher, &opt_accounts);
+		let rpc = SigningQueueClient::new(&signer, dispatcher, remote, &opt_accounts);
 		io.extend_with(ParitySigning::to_delegate(rpc));
 
 		SigningTester {
@@ -182,6 +190,9 @@ fn should_check_status_of_request_when_its_resolved() {
 	tester.io.handle_request_sync(&request).expect("Sent");
 	tester.signer.request_confirmed(1.into(), Ok(ConfirmationResponse::Signature(1.into())));
 
+	// This is not ideal, but we need to give futures some time to be executed, and they need to run in a separate thread
+	thread::sleep(Duration::from_millis(20));
+
 	// when
 	let request = r#"{
 		"jsonrpc": "2.0",
@@ -306,12 +317,12 @@ fn should_add_sign_transaction_to_the_queue() {
 		r#""input":"0x","# +
 		r#""nonce":"0x1","# +
 		&format!("\"publicKey\":\"0x{:?}\",", t.public_key().unwrap()) +
-		&format!("\"r\":\"0x{}\",", U256::from(signature.r()).to_hex()) +
+		&format!("\"r\":\"0x{:x}\",", U256::from(signature.r())) +
 		&format!("\"raw\":\"0x{}\",", rlp.to_hex()) +
-		&format!("\"s\":\"0x{}\",", U256::from(signature.s()).to_hex()) +
-		&format!("\"standardV\":\"0x{}\",", U256::from(t.standard_v()).to_hex()) +
+		&format!("\"s\":\"0x{:x}\",", U256::from(signature.s())) +
+		&format!("\"standardV\":\"0x{:x}\",", U256::from(t.standard_v())) +
 		r#""to":"0xd46e8dd67c5d32be8058bb8eb970870f07244567","transactionIndex":null,"# +
-		&format!("\"v\":\"0x{}\",", U256::from(t.original_v()).to_hex()) +
+		&format!("\"v\":\"0x{:x}\",", U256::from(t.original_v())) +
 		r#""value":"0x9184e72a""# +
 		r#"}},"id":1}"#;
 
@@ -324,7 +335,9 @@ fn should_add_sign_transaction_to_the_queue() {
 	::std::thread::spawn(move || loop {
 		if signer.requests().len() == 1 {
 			// respond
-			signer.request_confirmed(1.into(), Ok(ConfirmationResponse::SignTransaction(t.into())));
+			signer.request_confirmed(1.into(), Ok(ConfirmationResponse::SignTransaction(
+				RichRawTransaction::from_signed(t.into(), 0x0, u64::max_value())
+			)));
 			break
 		}
 		::std::thread::sleep(Duration::from_millis(100))
diff --git a/rpc/src/v1/tests/mocked/traces.rs b/rpc/src/v1/tests/mocked/traces.rs
index cd3ae366655503d48fbd1856437ec497659c0a0d..0b2e7d5ccb84ead1dd078937b8658d0a8da1f7bb 100644
--- a/rpc/src/v1/tests/mocked/traces.rs
+++ b/rpc/src/v1/tests/mocked/traces.rs
@@ -47,8 +47,8 @@ fn io() -> Tester {
 		result: Res::None,
 		subtraces: 0,
 		trace_address: vec![0],
-		transaction_number: 0,
-		transaction_hash: 5.into(),
+		transaction_number: Some(0),
+		transaction_hash: Some(5.into()),
 		block_number: 10,
 		block_hash: 10.into(),
 	}]);
@@ -66,7 +66,7 @@ fn io() -> Tester {
 		state_diff: None,
 	}));
 	let miner = Arc::new(TestMinerService::default());
-	let traces = TracesClient::new(&client, &miner);
+	let traces = TracesClient::new(&client);
 	let mut io = IoHandler::default();
 	io.extend_with(traces.to_delegate());
 
@@ -232,3 +232,13 @@ fn rpc_trace_replay_transaction_state_pruned() {
 
 	assert_eq!(tester.io.handle_request_sync(request), Some(response.to_owned()));
 }
+
+#[test]
+fn rpc_trace_replay_block_transactions() {
+	let tester = io();
+
+	let request = r#"{"jsonrpc":"2.0","method":"trace_replayBlockTransactions","params":["0x10", ["trace", "stateDiff", "vmTrace"]],"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":[{"output":"0x010203","stateDiff":null,"trace":[],"vmTrace":null}],"id":1}"#;
+
+	assert_eq!(tester.io.handle_request_sync(request), Some(response.to_owned()));
+}
diff --git a/rpc/src/v1/tests/mocked/web3.rs b/rpc/src/v1/tests/mocked/web3.rs
index 46a83bb3db8f4549d794cf5df50463c240a97277..aceb36e5651a1ed264db86cd9b6ede846c257e48 100644
--- a/rpc/src/v1/tests/mocked/web3.rs
+++ b/rpc/src/v1/tests/mocked/web3.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use jsonrpc_core::IoHandler;
-use util::version;
+use version::version;
 use v1::{Web3, Web3Client};
 
 #[test]
diff --git a/rpc/src/v1/tests/mod.rs b/rpc/src/v1/tests/mod.rs
index a48727475596af0e301ebd092f5174314673e8b2..31ac1c5410cb6a1275165ac755c54dc8226abe4a 100644
--- a/rpc/src/v1/tests/mod.rs
+++ b/rpc/src/v1/tests/mod.rs
@@ -19,19 +19,8 @@ macro_rules! extract_chain {
 		::ethjson::blockchain::Test::load(RAW_DATA).unwrap().into_iter()
 	}};
 
-	($file:expr, $name:expr) => {{
-		let mut chain = None;
-		for (name, c) in extract_chain!(iter $file) {
-			if name == $name {
-				chain = Some(c);
-				break;
-			}
-		}
-		chain.unwrap()
-	}};
-
 	($file:expr) => {{
-		extract_chain!(iter $file).next().unwrap().1
+		extract_chain!(iter $file).filter(|&(_, ref t)| t.network == ForkSpec::Frontier).next().unwrap().1
 	}};
 }
 
@@ -39,27 +28,7 @@ macro_rules! register_test {
 	($name:ident, $cb:expr, $file:expr) => {
 		#[test]
 		fn $name() {
-			for (name, chain) in extract_chain!(iter $file) {
-				$cb(name, chain);
-			}
-		}
-	};
-
-	(heavy $name:ident, $cb:expr, $file:expr) => {
-		#[test]
-		#[cfg(feature = "test-heavy")]
-		fn $name() {
-			for (name, chain) in extract_chain!(iter $file) {
-				$cb(name, chain);
-			}
-		}
-	};
-
-	(ignore $name:ident, $cb:expr, $file:expr) => {
-		#[test]
-		#[ignore]
-		fn $name() {
-			for (name, chain) in extract_chain!(iter $file) {
+			for (name, chain) in extract_chain!(iter $file).filter(|&(_, ref t)| t.network == ForkSpec::Frontier) {
 				$cb(name, chain);
 			}
 		}
diff --git a/rpc/src/v1/traits/eth.rs b/rpc/src/v1/traits/eth.rs
index 9e7ed97155af9dee89618bb1bf1b9fad589c6b61..f4ea1e10d6dbe3708617ebd59fcd3fada561d54a 100644
--- a/rpc/src/v1/traits/eth.rs
+++ b/rpc/src/v1/traits/eth.rs
@@ -15,11 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Eth rpc interface.
-use jsonrpc_core::Error;
+use jsonrpc_core::{Result, BoxFuture};
 use jsonrpc_macros::Trailing;
 
-use futures::BoxFuture;
-
 use v1::types::{RichBlock, BlockNumber, Bytes, CallRequest, Filter, FilterChanges, Index};
 use v1::types::{Log, Receipt, SyncStatus, Transaction, Work};
 use v1::types::{H64, H160, H256, U256};
@@ -31,151 +29,151 @@ build_rpc_trait! {
 
 		/// Returns protocol version encoded as a string (quotes are necessary).
 		#[rpc(name = "eth_protocolVersion")]
-		fn protocol_version(&self) -> Result<String, Error>;
+		fn protocol_version(&self) -> Result<String>;
 
 		/// Returns an object with data about the sync status or false. (wtf?)
 		#[rpc(name = "eth_syncing")]
-		fn syncing(&self) -> Result<SyncStatus, Error>;
+		fn syncing(&self) -> Result<SyncStatus>;
 
 		/// Returns the number of hashes per second that the node is mining with.
 		#[rpc(name = "eth_hashrate")]
-		fn hashrate(&self) -> Result<U256, Error>;
+		fn hashrate(&self) -> Result<U256>;
 
 		/// Returns block author.
 		#[rpc(meta, name = "eth_coinbase")]
-		fn author(&self, Self::Metadata) -> BoxFuture<H160, Error>;
+		fn author(&self, Self::Metadata) -> Result<H160>;
 
 		/// Returns true if client is actively mining new blocks.
 		#[rpc(name = "eth_mining")]
-		fn is_mining(&self) -> Result<bool, Error>;
+		fn is_mining(&self) -> Result<bool>;
 
 		/// Returns current gas_price.
 		#[rpc(name = "eth_gasPrice")]
-		fn gas_price(&self) -> Result<U256, Error>;
+		fn gas_price(&self) -> Result<U256>;
 
 		/// Returns accounts list.
 		#[rpc(meta, name = "eth_accounts")]
-		fn accounts(&self, Self::Metadata) -> BoxFuture<Vec<H160>, Error>;
+		fn accounts(&self, Self::Metadata) -> Result<Vec<H160>>;
 
 		/// Returns highest block number.
 		#[rpc(name = "eth_blockNumber")]
-		fn block_number(&self) -> Result<U256, Error>;
+		fn block_number(&self) -> Result<U256>;
 
 		/// Returns balance of the given account.
-		#[rpc(async, name = "eth_getBalance")]
-		fn balance(&self, H160, Trailing<BlockNumber>) -> BoxFuture<U256, Error>;
+		#[rpc(name = "eth_getBalance")]
+		fn balance(&self, H160, Trailing<BlockNumber>) -> BoxFuture<U256>;
 
 		/// Returns content of the storage at given address.
-		#[rpc(async, name = "eth_getStorageAt")]
-		fn storage_at(&self, H160, U256, Trailing<BlockNumber>) -> BoxFuture<H256, Error>;
+		#[rpc(name = "eth_getStorageAt")]
+		fn storage_at(&self, H160, U256, Trailing<BlockNumber>) -> BoxFuture<H256>;
 
 		/// Returns block with given hash.
-		#[rpc(async, name = "eth_getBlockByHash")]
-		fn block_by_hash(&self, H256, bool) -> BoxFuture<Option<RichBlock>, Error>;
+		#[rpc(name = "eth_getBlockByHash")]
+		fn block_by_hash(&self, H256, bool) -> BoxFuture<Option<RichBlock>>;
 
 		/// Returns block with given number.
-		#[rpc(async, name = "eth_getBlockByNumber")]
-		fn block_by_number(&self, BlockNumber, bool) -> BoxFuture<Option<RichBlock>, Error>;
+		#[rpc(name = "eth_getBlockByNumber")]
+		fn block_by_number(&self, BlockNumber, bool) -> BoxFuture<Option<RichBlock>>;
 
 		/// Returns the number of transactions sent from given address at given time (block number).
-		#[rpc(async, name = "eth_getTransactionCount")]
-		fn transaction_count(&self, H160, Trailing<BlockNumber>) -> BoxFuture<U256, Error>;
+		#[rpc(name = "eth_getTransactionCount")]
+		fn transaction_count(&self, H160, Trailing<BlockNumber>) -> BoxFuture<U256>;
 
 		/// Returns the number of transactions in a block with given hash.
-		#[rpc(async, name = "eth_getBlockTransactionCountByHash")]
-		fn block_transaction_count_by_hash(&self, H256) -> BoxFuture<Option<U256>, Error>;
+		#[rpc(name = "eth_getBlockTransactionCountByHash")]
+		fn block_transaction_count_by_hash(&self, H256) -> BoxFuture<Option<U256>>;
 
 		/// Returns the number of transactions in a block with given block number.
-		#[rpc(async, name = "eth_getBlockTransactionCountByNumber")]
-		fn block_transaction_count_by_number(&self, BlockNumber) -> BoxFuture<Option<U256>, Error>;
+		#[rpc(name = "eth_getBlockTransactionCountByNumber")]
+		fn block_transaction_count_by_number(&self, BlockNumber) -> BoxFuture<Option<U256>>;
 
 		/// Returns the number of uncles in a block with given hash.
-		#[rpc(async, name = "eth_getUncleCountByBlockHash")]
-		fn block_uncles_count_by_hash(&self, H256) -> BoxFuture<Option<U256>, Error>;
+		#[rpc(name = "eth_getUncleCountByBlockHash")]
+		fn block_uncles_count_by_hash(&self, H256) -> BoxFuture<Option<U256>>;
 
 		/// Returns the number of uncles in a block with given block number.
-		#[rpc(async, name = "eth_getUncleCountByBlockNumber")]
-		fn block_uncles_count_by_number(&self, BlockNumber) -> BoxFuture<Option<U256>, Error>;
+		#[rpc(name = "eth_getUncleCountByBlockNumber")]
+		fn block_uncles_count_by_number(&self, BlockNumber) -> BoxFuture<Option<U256>>;
 
 		/// Returns the code at given address at given time (block number).
-		#[rpc(async, name = "eth_getCode")]
-		fn code_at(&self, H160, Trailing<BlockNumber>) -> BoxFuture<Bytes, Error>;
+		#[rpc(name = "eth_getCode")]
+		fn code_at(&self, H160, Trailing<BlockNumber>) -> BoxFuture<Bytes>;
 
 		/// Sends signed transaction, returning its hash.
 		#[rpc(name = "eth_sendRawTransaction")]
-		fn send_raw_transaction(&self, Bytes) -> Result<H256, Error>;
+		fn send_raw_transaction(&self, Bytes) -> Result<H256>;
 
 		/// @alias of `eth_sendRawTransaction`.
 		#[rpc(name = "eth_submitTransaction")]
-		fn submit_transaction(&self, Bytes) -> Result<H256, Error>;
+		fn submit_transaction(&self, Bytes) -> Result<H256>;
 
 		/// Call contract, returning the output data.
 		#[rpc(meta, name = "eth_call")]
-		fn call(&self, Self::Metadata, CallRequest, Trailing<BlockNumber>) -> BoxFuture<Bytes, Error>;
+		fn call(&self, Self::Metadata, CallRequest, Trailing<BlockNumber>) -> BoxFuture<Bytes>;
 
 		/// Estimate gas needed for execution of given contract.
 		#[rpc(meta, name = "eth_estimateGas")]
-		fn estimate_gas(&self, Self::Metadata, CallRequest, Trailing<BlockNumber>) -> BoxFuture<U256, Error>;
+		fn estimate_gas(&self, Self::Metadata, CallRequest, Trailing<BlockNumber>) -> BoxFuture<U256>;
 
 		/// Get transaction by its hash.
 		#[rpc(name = "eth_getTransactionByHash")]
-		fn transaction_by_hash(&self, H256) -> Result<Option<Transaction>, Error>;
+		fn transaction_by_hash(&self, H256) -> BoxFuture<Option<Transaction>>;
 
 		/// Returns transaction at given block hash and index.
 		#[rpc(name = "eth_getTransactionByBlockHashAndIndex")]
-		fn transaction_by_block_hash_and_index(&self, H256, Index) -> Result<Option<Transaction>, Error>;
+		fn transaction_by_block_hash_and_index(&self, H256, Index) -> BoxFuture<Option<Transaction>>;
 
 		/// Returns transaction by given block number and index.
 		#[rpc(name = "eth_getTransactionByBlockNumberAndIndex")]
-		fn transaction_by_block_number_and_index(&self, BlockNumber, Index) -> Result<Option<Transaction>, Error>;
+		fn transaction_by_block_number_and_index(&self, BlockNumber, Index) -> BoxFuture<Option<Transaction>>;
 
-		/// Returns transaction receipt.
+		/// Returns transaction receipt by transaction hash.
 		#[rpc(name = "eth_getTransactionReceipt")]
-		fn transaction_receipt(&self, H256) -> Result<Option<Receipt>, Error>;
+		fn transaction_receipt(&self, H256) -> BoxFuture<Option<Receipt>>;
 
 		/// Returns an uncles at given block and index.
 		#[rpc(name = "eth_getUncleByBlockHashAndIndex")]
-		fn uncle_by_block_hash_and_index(&self, H256, Index) -> Result<Option<RichBlock>, Error>;
+		fn uncle_by_block_hash_and_index(&self, H256, Index) -> BoxFuture<Option<RichBlock>>;
 
 		/// Returns an uncles at given block and index.
 		#[rpc(name = "eth_getUncleByBlockNumberAndIndex")]
-		fn uncle_by_block_number_and_index(&self, BlockNumber, Index) -> Result<Option<RichBlock>, Error>;
+		fn uncle_by_block_number_and_index(&self, BlockNumber, Index) -> BoxFuture<Option<RichBlock>>;
 
 		/// Returns available compilers.
 		/// @deprecated
 		#[rpc(name = "eth_getCompilers")]
-		fn compilers(&self) -> Result<Vec<String>, Error>;
+		fn compilers(&self) -> Result<Vec<String>>;
 
 		/// Compiles lll code.
 		/// @deprecated
 		#[rpc(name = "eth_compileLLL")]
-		fn compile_lll(&self, String) -> Result<Bytes, Error>;
+		fn compile_lll(&self, String) -> Result<Bytes>;
 
 		/// Compiles solidity.
 		/// @deprecated
 		#[rpc(name = "eth_compileSolidity")]
-		fn compile_solidity(&self, String) -> Result<Bytes, Error>;
+		fn compile_solidity(&self, String) -> Result<Bytes>;
 
 		/// Compiles serpent.
 		/// @deprecated
 		#[rpc(name = "eth_compileSerpent")]
-		fn compile_serpent(&self, String) -> Result<Bytes, Error>;
+		fn compile_serpent(&self, String) -> Result<Bytes>;
 
 		/// Returns logs matching given filter object.
-		#[rpc(async, name = "eth_getLogs")]
-		fn logs(&self, Filter) -> BoxFuture<Vec<Log>, Error>;
+		#[rpc(name = "eth_getLogs")]
+		fn logs(&self, Filter) -> BoxFuture<Vec<Log>>;
 
 		/// Returns the hash of the current block, the seedHash, and the boundary condition to be met.
 		#[rpc(name = "eth_getWork")]
-		fn work(&self, Trailing<u64>) -> Result<Work, Error>;
+		fn work(&self, Trailing<u64>) -> Result<Work>;
 
 		/// Used for submitting a proof-of-work solution.
 		#[rpc(name = "eth_submitWork")]
-		fn submit_work(&self, H64, H256, H256) -> Result<bool, Error>;
+		fn submit_work(&self, H64, H256, H256) -> Result<bool>;
 
 		/// Used for submitting mining hashrate.
 		#[rpc(name = "eth_submitHashrate")]
-		fn submit_hashrate(&self, U256, H256) -> Result<bool, Error>;
+		fn submit_hashrate(&self, U256, H256) -> Result<bool>;
 	}
 }
 
@@ -185,26 +183,26 @@ build_rpc_trait! {
 	pub trait EthFilter {
 		/// Returns id of new filter.
 		#[rpc(name = "eth_newFilter")]
-		fn new_filter(&self, Filter) -> Result<U256, Error>;
+		fn new_filter(&self, Filter) -> Result<U256>;
 
 		/// Returns id of new block filter.
 		#[rpc(name = "eth_newBlockFilter")]
-		fn new_block_filter(&self) -> Result<U256, Error>;
+		fn new_block_filter(&self) -> Result<U256>;
 
 		/// Returns id of new block filter.
 		#[rpc(name = "eth_newPendingTransactionFilter")]
-		fn new_pending_transaction_filter(&self) -> Result<U256, Error>;
+		fn new_pending_transaction_filter(&self) -> Result<U256>;
 
 		/// Returns filter changes since last poll.
-		#[rpc(async, name = "eth_getFilterChanges")]
-		fn filter_changes(&self, Index) -> BoxFuture<FilterChanges, Error>;
+		#[rpc(name = "eth_getFilterChanges")]
+		fn filter_changes(&self, Index) -> BoxFuture<FilterChanges>;
 
 		/// Returns all logs matching given filter (in a range 'from' - 'to').
-		#[rpc(async, name = "eth_getFilterLogs")]
-		fn filter_logs(&self, Index) -> BoxFuture<Vec<Log>, Error>;
+		#[rpc(name = "eth_getFilterLogs")]
+		fn filter_logs(&self, Index) -> BoxFuture<Vec<Log>>;
 
 		/// Uninstalls filter.
 		#[rpc(name = "eth_uninstallFilter")]
-		fn uninstall_filter(&self, Index) -> Result<bool, Error>;
+		fn uninstall_filter(&self, Index) -> Result<bool>;
 	}
 }
diff --git a/rpc/src/v1/traits/eth_pubsub.rs b/rpc/src/v1/traits/eth_pubsub.rs
index 794d12768136a0c837a1b1d48d9f57562feafd66..cfbe4c54bcb617006d99b532593b7347ce7bf053 100644
--- a/rpc/src/v1/traits/eth_pubsub.rs
+++ b/rpc/src/v1/traits/eth_pubsub.rs
@@ -16,11 +16,10 @@
 
 //! Eth PUB-SUB rpc interface.
 
-use jsonrpc_core::Error;
+use jsonrpc_core::Result;
 use jsonrpc_macros::Trailing;
 use jsonrpc_macros::pubsub::Subscriber;
 use jsonrpc_pubsub::SubscriptionId;
-use futures::BoxFuture;
 
 use v1::types::pubsub;
 
@@ -36,7 +35,7 @@ build_rpc_trait! {
 
 			/// Unsubscribe from existing Eth subscription.
 			#[rpc(name = "eth_unsubscribe")]
-			fn unsubscribe(&self, SubscriptionId) -> BoxFuture<bool, Error>;
+			fn unsubscribe(&self, SubscriptionId) -> Result<bool>;
 		}
 	}
 }
diff --git a/rpc/src/v1/traits/eth_signing.rs b/rpc/src/v1/traits/eth_signing.rs
index e3b9c9b20367df1d64f8c4625adc798e376448a8..9830ac54d8272c100867fc64e381adb56dbc9a41 100644
--- a/rpc/src/v1/traits/eth_signing.rs
+++ b/rpc/src/v1/traits/eth_signing.rs
@@ -16,8 +16,7 @@
 
 //! Eth rpc interface.
 
-use jsonrpc_core::Error;
-use futures::BoxFuture;
+use jsonrpc_core::BoxFuture;
 
 use v1::types::{Bytes, H160, H256, H520, TransactionRequest, RichRawTransaction};
 
@@ -28,18 +27,18 @@ build_rpc_trait! {
 
 		/// Signs the hash of data with given address signature.
 		#[rpc(meta, name = "eth_sign")]
-		fn sign(&self, Self::Metadata, H160, Bytes) -> BoxFuture<H520, Error>;
+		fn sign(&self, Self::Metadata, H160, Bytes) -> BoxFuture<H520>;
 
 		/// Sends transaction; will block waiting for signer to return the
 		/// transaction hash.
 		/// If Signer is disable it will require the account to be unlocked.
 		#[rpc(meta, name = "eth_sendTransaction")]
-		fn send_transaction(&self, Self::Metadata, TransactionRequest) -> BoxFuture<H256, Error>;
+		fn send_transaction(&self, Self::Metadata, TransactionRequest) -> BoxFuture<H256>;
 
 		/// Signs transactions without dispatching it to the network.
 		/// Returns signed transaction RLP representation and the transaction itself.
 		/// It can be later submitted using `eth_sendRawTransaction/eth_submitTransaction`.
 		#[rpc(meta, name = "eth_signTransaction")]
-		fn sign_transaction(&self, Self::Metadata, TransactionRequest) -> BoxFuture<RichRawTransaction, Error>;
+		fn sign_transaction(&self, Self::Metadata, TransactionRequest) -> BoxFuture<RichRawTransaction>;
 	}
 }
diff --git a/rpc/src/v1/traits/net.rs b/rpc/src/v1/traits/net.rs
index 109c10344a88cc0b3b126328c911b65f9389dd49..bc2068ff9ab7eaf5d6505a13702ce3db1e66fe91 100644
--- a/rpc/src/v1/traits/net.rs
+++ b/rpc/src/v1/traits/net.rs
@@ -15,22 +15,22 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Net rpc interface.
-use jsonrpc_core::Error;
+use jsonrpc_core::Result;
 
 build_rpc_trait! {
 	/// Net rpc interface.
 	pub trait Net {
 		/// Returns protocol version.
 		#[rpc(name = "net_version")]
-		fn version(&self) -> Result<String, Error>;
+		fn version(&self) -> Result<String>;
 
 		/// Returns number of peers connected to node.
 		#[rpc(name = "net_peerCount")]
-		fn peer_count(&self) -> Result<String, Error>;
+		fn peer_count(&self) -> Result<String>;
 
 		/// Returns true if client is actively listening for network connections.
 		/// Otherwise false.
 		#[rpc(name = "net_listening")]
-		fn is_listening(&self) -> Result<bool, Error>;
+		fn is_listening(&self) -> Result<bool>;
 	}
 }
diff --git a/rpc/src/v1/traits/parity.rs b/rpc/src/v1/traits/parity.rs
index f1512b8ce0ae69dfcfe0bea5b9f4de07a817c108..81c406fb3a3fcd7c99ef08388a7ecc512e492e99 100644
--- a/rpc/src/v1/traits/parity.rs
+++ b/rpc/src/v1/traits/parity.rs
@@ -18,13 +18,12 @@
 
 use std::collections::BTreeMap;
 
-use jsonrpc_core::Error;
+use jsonrpc_core::{BoxFuture, Result};
 use jsonrpc_macros::Trailing;
-use futures::BoxFuture;
 
 use node_health::Health;
 use v1::types::{
-	H160, H256, H512, U256, Bytes, CallRequest,
+	H160, H256, H512, U256, U64, Bytes, CallRequest,
 	Peers, Transaction, RpcSettings, Histogram,
 	TransactionStats, LocalTransactionStatus,
 	BlockNumber, ConsensusCapability, VersionInfo,
@@ -39,178 +38,188 @@ build_rpc_trait! {
 
 		/// Returns accounts information.
 		#[rpc(name = "parity_accountsInfo")]
-		fn accounts_info(&self, Trailing<DappId>) -> Result<BTreeMap<H160, AccountInfo>, Error>;
+		fn accounts_info(&self, Trailing<DappId>) -> Result<BTreeMap<H160, AccountInfo>>;
 
 		/// Returns hardware accounts information.
 		#[rpc(name = "parity_hardwareAccountsInfo")]
-		fn hardware_accounts_info(&self) -> Result<BTreeMap<H160, HwAccountInfo>, Error>;
+		fn hardware_accounts_info(&self) -> Result<BTreeMap<H160, HwAccountInfo>>;
+
+		/// Get a list of paths to locked hardware wallets
+		#[rpc(name = "parity_lockedHardwareAccountsInfo")]
+		fn locked_hardware_accounts_info(&self) -> Result<Vec<String>>;
 
 		/// Returns default account for dapp.
 		#[rpc(meta, name = "parity_defaultAccount")]
-		fn default_account(&self, Self::Metadata) -> BoxFuture<H160, Error>;
+		fn default_account(&self, Self::Metadata) -> Result<H160>;
 
 		/// Returns current transactions limit.
 		#[rpc(name = "parity_transactionsLimit")]
-		fn transactions_limit(&self) -> Result<usize, Error>;
+		fn transactions_limit(&self) -> Result<usize>;
 
 		/// Returns mining extra data.
 		#[rpc(name = "parity_extraData")]
-		fn extra_data(&self) -> Result<Bytes, Error>;
+		fn extra_data(&self) -> Result<Bytes>;
 
 		/// Returns mining gas floor target.
 		#[rpc(name = "parity_gasFloorTarget")]
-		fn gas_floor_target(&self) -> Result<U256, Error>;
+		fn gas_floor_target(&self) -> Result<U256>;
 
 		/// Returns mining gas floor cap.
 		#[rpc(name = "parity_gasCeilTarget")]
-		fn gas_ceil_target(&self) -> Result<U256, Error>;
+		fn gas_ceil_target(&self) -> Result<U256>;
 
 		/// Returns minimal gas price for transaction to be included in queue.
 		#[rpc(name = "parity_minGasPrice")]
-		fn min_gas_price(&self) -> Result<U256, Error>;
+		fn min_gas_price(&self) -> Result<U256>;
 
 		/// Returns latest logs
 		#[rpc(name = "parity_devLogs")]
-		fn dev_logs(&self) -> Result<Vec<String>, Error>;
+		fn dev_logs(&self) -> Result<Vec<String>>;
 
 		/// Returns logs levels
 		#[rpc(name = "parity_devLogsLevels")]
-		fn dev_logs_levels(&self) -> Result<String, Error>;
+		fn dev_logs_levels(&self) -> Result<String>;
 
 		/// Returns chain name - DEPRECATED. Use `parity_chainName` instead.
 		#[rpc(name = "parity_netChain")]
-		fn net_chain(&self) -> Result<String, Error>;
+		fn net_chain(&self) -> Result<String>;
 
 		/// Returns peers details
 		#[rpc(name = "parity_netPeers")]
-		fn net_peers(&self) -> Result<Peers, Error>;
+		fn net_peers(&self) -> Result<Peers>;
 
 		/// Returns network port
 		#[rpc(name = "parity_netPort")]
-		fn net_port(&self) -> Result<u16, Error>;
+		fn net_port(&self) -> Result<u16>;
 
 		/// Returns rpc settings
 		#[rpc(name = "parity_rpcSettings")]
-		fn rpc_settings(&self) -> Result<RpcSettings, Error>;
+		fn rpc_settings(&self) -> Result<RpcSettings>;
 
 		/// Returns node name
 		#[rpc(name = "parity_nodeName")]
-		fn node_name(&self) -> Result<String, Error>;
+		fn node_name(&self) -> Result<String>;
 
 		/// Returns default extra data
 		#[rpc(name = "parity_defaultExtraData")]
-		fn default_extra_data(&self) -> Result<Bytes, Error>;
+		fn default_extra_data(&self) -> Result<Bytes>;
 
 		/// Returns distribution of gas price in latest blocks.
-		#[rpc(async, name = "parity_gasPriceHistogram")]
-		fn gas_price_histogram(&self) -> BoxFuture<Histogram, Error>;
+		#[rpc(name = "parity_gasPriceHistogram")]
+		fn gas_price_histogram(&self) -> BoxFuture<Histogram>;
 
 		/// Returns number of unsigned transactions waiting in the signer queue (if signer enabled)
 		/// Returns error when signer is disabled
 		#[rpc(name = "parity_unsignedTransactionsCount")]
-		fn unsigned_transactions_count(&self) -> Result<usize, Error>;
+		fn unsigned_transactions_count(&self) -> Result<usize>;
 
 		/// Returns a cryptographically random phrase sufficient for securely seeding a secret key.
 		#[rpc(name = "parity_generateSecretPhrase")]
-		fn generate_secret_phrase(&self) -> Result<String, Error>;
+		fn generate_secret_phrase(&self) -> Result<String>;
 
 		/// Returns whatever address would be derived from the given phrase if it were to seed a brainwallet.
 		#[rpc(name = "parity_phraseToAddress")]
-		fn phrase_to_address(&self, String) -> Result<H160, Error>;
+		fn phrase_to_address(&self, String) -> Result<H160>;
 
 		/// Returns the value of the registrar for this network.
 		#[rpc(name = "parity_registryAddress")]
-		fn registry_address(&self) -> Result<Option<H160>, Error>;
+		fn registry_address(&self) -> Result<Option<H160>>;
 
 		/// Returns all addresses if Fat DB is enabled (`--fat-db`), or null if not.
 		#[rpc(name = "parity_listAccounts")]
-		fn list_accounts(&self, u64, Option<H160>, Trailing<BlockNumber>) -> Result<Option<Vec<H160>>, Error>;
+		fn list_accounts(&self, u64, Option<H160>, Trailing<BlockNumber>) -> Result<Option<Vec<H160>>>;
 
 		/// Returns all storage keys of the given address (first parameter) if Fat DB is enabled (`--fat-db`),
 		/// or null if not.
 		#[rpc(name = "parity_listStorageKeys")]
-		fn list_storage_keys(&self, H160, u64, Option<H256>, Trailing<BlockNumber>) -> Result<Option<Vec<H256>>, Error>;
+		fn list_storage_keys(&self, H160, u64, Option<H256>, Trailing<BlockNumber>) -> Result<Option<Vec<H256>>>;
 
 		/// Encrypt some data with a public key under ECIES.
 		/// First parameter is the 512-byte destination public key, second is the message.
 		#[rpc(name = "parity_encryptMessage")]
-		fn encrypt_message(&self, H512, Bytes) -> Result<Bytes, Error>;
+		fn encrypt_message(&self, H512, Bytes) -> Result<Bytes>;
 
 		/// Returns all pending transactions from transaction queue.
 		#[rpc(name = "parity_pendingTransactions")]
-		fn pending_transactions(&self) -> Result<Vec<Transaction>, Error>;
+		fn pending_transactions(&self) -> Result<Vec<Transaction>>;
 
 		/// Returns all future transactions from transaction queue.
 		#[rpc(name = "parity_futureTransactions")]
-		fn future_transactions(&self) -> Result<Vec<Transaction>, Error>;
+		fn future_transactions(&self) -> Result<Vec<Transaction>>;
 
 		/// Returns propagation statistics on transactions pending in the queue.
 		#[rpc(name = "parity_pendingTransactionsStats")]
-		fn pending_transactions_stats(&self) -> Result<BTreeMap<H256, TransactionStats>, Error>;
+		fn pending_transactions_stats(&self) -> Result<BTreeMap<H256, TransactionStats>>;
 
 		/// Returns a list of current and past local transactions with status details.
 		#[rpc(name = "parity_localTransactions")]
-		fn local_transactions(&self) -> Result<BTreeMap<H256, LocalTransactionStatus>, Error>;
+		fn local_transactions(&self) -> Result<BTreeMap<H256, LocalTransactionStatus>>;
 
 		/// Returns current Dapps Server interface and port or an error if dapps server is disabled.
 		#[rpc(name = "parity_dappsUrl")]
-		fn dapps_url(&self) -> Result<String, Error>;
+		fn dapps_url(&self) -> Result<String>;
 
 		/// Returns current WS Server interface and port or an error if ws server is disabled.
 		#[rpc(name = "parity_wsUrl")]
-		fn ws_url(&self) -> Result<String, Error>;
+		fn ws_url(&self) -> Result<String>;
 
 		/// Returns next nonce for particular sender. Should include all transactions in the queue.
-		#[rpc(async, name = "parity_nextNonce")]
-		fn next_nonce(&self, H160) -> BoxFuture<U256, Error>;
+		#[rpc(name = "parity_nextNonce")]
+		fn next_nonce(&self, H160) -> BoxFuture<U256>;
 
 		/// Get the mode. Returns one of: "active", "passive", "dark", "offline".
 		#[rpc(name = "parity_mode")]
-		fn mode(&self) -> Result<String, Error>;
+		fn mode(&self) -> Result<String>;
+
+		/// Returns the chain ID used for transaction signing at the
+		/// current best block. An empty string is returned if not
+		/// available.
+		#[rpc(name = "parity_chainId")]
+		fn chain_id(&self) -> Result<Option<U64>>;
 
 		/// Get the chain name. Returns one of: "foundation", "kovan", &c. of a filename.
 		#[rpc(name = "parity_chain")]
-		fn chain(&self) -> Result<String, Error>;
+		fn chain(&self) -> Result<String>;
 
 		/// Get the enode of this node.
 		#[rpc(name = "parity_enode")]
-		fn enode(&self) -> Result<String, Error>;
+		fn enode(&self) -> Result<String>;
 
 		/// Returns information on current consensus capability.
 		#[rpc(name = "parity_consensusCapability")]
-		fn consensus_capability(&self) -> Result<ConsensusCapability, Error>;
+		fn consensus_capability(&self) -> Result<ConsensusCapability>;
 
 		/// Get our version information in a nice object.
 		#[rpc(name = "parity_versionInfo")]
-		fn version_info(&self) -> Result<VersionInfo, Error>;
+		fn version_info(&self) -> Result<VersionInfo>;
 
 		/// Get information concerning the latest releases if available.
 		#[rpc(name = "parity_releasesInfo")]
-		fn releases_info(&self) -> Result<Option<OperationsInfo>, Error>;
+		fn releases_info(&self) -> Result<Option<OperationsInfo>>;
 
 		/// Get the current chain status.
 		#[rpc(name = "parity_chainStatus")]
-		fn chain_status(&self) -> Result<ChainStatus, Error>;
+		fn chain_status(&self) -> Result<ChainStatus>;
 
 		/// Get node kind info.
 		#[rpc(name = "parity_nodeKind")]
-		fn node_kind(&self) -> Result<::v1::types::NodeKind, Error>;
+		fn node_kind(&self) -> Result<::v1::types::NodeKind>;
 
 		/// Get block header.
 		/// Same as `eth_getBlockByNumber` but without uncles and transactions.
-		#[rpc(async, name = "parity_getBlockHeaderByNumber")]
-		fn block_header(&self, Trailing<BlockNumber>) -> BoxFuture<RichHeader, Error>;
+		#[rpc(name = "parity_getBlockHeaderByNumber")]
+		fn block_header(&self, Trailing<BlockNumber>) -> BoxFuture<RichHeader>;
 
 		/// Get IPFS CIDv0 given protobuf encoded bytes.
 		#[rpc(name = "parity_cidV0")]
-		fn ipfs_cid(&self, Bytes) -> Result<String, Error>;
+		fn ipfs_cid(&self, Bytes) -> Result<String>;
 
 		/// Call contract, returning the output data.
 		#[rpc(meta, name = "parity_call")]
-		fn call(&self, Self::Metadata, Vec<CallRequest>, Trailing<BlockNumber>) -> BoxFuture<Vec<Bytes>, Error>;
+		fn call(&self, Self::Metadata, Vec<CallRequest>, Trailing<BlockNumber>) -> Result<Vec<Bytes>>;
 
 		/// Returns node's health report.
-		#[rpc(async, name = "parity_nodeHealth")]
-		fn node_health(&self) -> BoxFuture<Health, Error>;
+		#[rpc(name = "parity_nodeHealth")]
+		fn node_health(&self) -> BoxFuture<Health>;
 	}
 }
diff --git a/rpc/src/v1/traits/parity_accounts.rs b/rpc/src/v1/traits/parity_accounts.rs
index 73c40ffd4ffab1df64a338fa53e480fb5ad39e26..494f1576cbd903b0902c5b0ae2ac076ec10bb79c 100644
--- a/rpc/src/v1/traits/parity_accounts.rs
+++ b/rpc/src/v1/traits/parity_accounts.rs
@@ -17,7 +17,7 @@
 //! Parity Accounts-related rpc interface.
 use std::collections::BTreeMap;
 
-use jsonrpc_core::Error;
+use jsonrpc_core::Result;
 use ethstore::KeyFile;
 use v1::types::{H160, H256, H520, DappId, DeriveHash, DeriveHierarchical, ExtAccountInfo};
 
@@ -26,163 +26,167 @@ build_rpc_trait! {
 	pub trait ParityAccounts {
 		/// Returns accounts information.
 		#[rpc(name = "parity_allAccountsInfo")]
-		fn all_accounts_info(&self) -> Result<BTreeMap<H160, ExtAccountInfo>, Error>;
+		fn all_accounts_info(&self) -> Result<BTreeMap<H160, ExtAccountInfo>>;
 
 		/// Creates new account from the given phrase using standard brainwallet mechanism.
 		/// Second parameter is password for the new account.
 		#[rpc(name = "parity_newAccountFromPhrase")]
-		fn new_account_from_phrase(&self, String, String) -> Result<H160, Error>;
+		fn new_account_from_phrase(&self, String, String) -> Result<H160>;
 
 		/// Creates new account from the given JSON wallet.
 		/// Second parameter is password for the wallet and the new account.
 		#[rpc(name = "parity_newAccountFromWallet")]
-		fn new_account_from_wallet(&self, String, String) -> Result<H160, Error>;
+		fn new_account_from_wallet(&self, String, String) -> Result<H160>;
 
 		/// Creates new account from the given raw secret.
 		/// Second parameter is password for the new account.
 		#[rpc(name = "parity_newAccountFromSecret")]
-		fn new_account_from_secret(&self, H256, String) -> Result<H160, Error>;
+		fn new_account_from_secret(&self, H256, String) -> Result<H160>;
 
 		/// Returns true if given `password` would unlock given `account`.
 		/// Arguments: `account`, `password`.
 		#[rpc(name = "parity_testPassword")]
-		fn test_password(&self, H160, String) -> Result<bool, Error>;
+		fn test_password(&self, H160, String) -> Result<bool>;
 
 		/// Changes an account's password.
 		/// Arguments: `account`, `password`, `new_password`.
 		#[rpc(name = "parity_changePassword")]
-		fn change_password(&self, H160, String, String) -> Result<bool, Error>;
+		fn change_password(&self, H160, String, String) -> Result<bool>;
 
 		/// Permanently deletes an account.
 		/// Arguments: `account`, `password`.
 		#[rpc(name = "parity_killAccount")]
-		fn kill_account(&self, H160, String) -> Result<bool, Error>;
+		fn kill_account(&self, H160, String) -> Result<bool>;
 
 		/// Permanently deletes an address from the addressbook
 		/// Arguments: `address`
 		#[rpc(name = "parity_removeAddress")]
-		fn remove_address(&self, H160) -> Result<bool, Error>;
+		fn remove_address(&self, H160) -> Result<bool>;
 
 		/// Set an account's name.
 		#[rpc(name = "parity_setAccountName")]
-		fn set_account_name(&self, H160, String) -> Result<bool, Error>;
+		fn set_account_name(&self, H160, String) -> Result<bool>;
 
 		/// Set an account's metadata string.
 		#[rpc(name = "parity_setAccountMeta")]
-		fn set_account_meta(&self, H160, String) -> Result<bool, Error>;
+		fn set_account_meta(&self, H160, String) -> Result<bool>;
 
 		/// Sets addresses exposed for particular dapp.
 		/// Setting a non-empty list will also override default account.
 		/// Setting `None` will resets visible account to what's visible for new dapps
 		/// (does not affect default account though)
 		#[rpc(name = "parity_setDappAddresses")]
-		fn set_dapp_addresses(&self, DappId, Option<Vec<H160>>) -> Result<bool, Error>;
+		fn set_dapp_addresses(&self, DappId, Option<Vec<H160>>) -> Result<bool>;
 
 		/// Gets accounts exposed for particular dapp.
 		#[rpc(name = "parity_getDappAddresses")]
-		fn dapp_addresses(&self, DappId) -> Result<Vec<H160>, Error>;
+		fn dapp_addresses(&self, DappId) -> Result<Vec<H160>>;
 
 		/// Changes dapp default address.
 		/// Does not affect other accounts exposed for this dapp, but
 		/// default account will always be retured as the first one.
 		#[rpc(name = "parity_setDappDefaultAddress")]
-		fn set_dapp_default_address(&self, DappId, H160) -> Result<bool, Error>;
+		fn set_dapp_default_address(&self, DappId, H160) -> Result<bool>;
 
 		/// Returns current dapp default address.
 		/// If not set explicite for the dapp will return global default.
 		#[rpc(name = "parity_getDappDefaultAddress")]
-		fn dapp_default_address(&self, DappId) -> Result<H160, Error>;
+		fn dapp_default_address(&self, DappId) -> Result<H160>;
 
 		/// Sets accounts exposed for new dapps.
 		/// Setting a non-empty list will also override default account.
 		/// Setting `None` exposes all internal-managed accounts.
 		/// (does not affect default account though)
 		#[rpc(name = "parity_setNewDappsAddresses")]
-		fn set_new_dapps_addresses(&self, Option<Vec<H160>>) -> Result<bool, Error>;
+		fn set_new_dapps_addresses(&self, Option<Vec<H160>>) -> Result<bool>;
 
 		/// Gets accounts exposed for new dapps.
 		/// `None` means that all accounts are exposes.
 		#[rpc(name = "parity_getNewDappsAddresses")]
-		fn new_dapps_addresses(&self) -> Result<Option<Vec<H160>>, Error>;
+		fn new_dapps_addresses(&self) -> Result<Option<Vec<H160>>>;
 
 		/// Changes default address for new dapps (global default address)
 		/// Does not affect other accounts exposed for new dapps, but
 		/// default account will always be retured as the first one.
 		#[rpc(name = "parity_setNewDappsDefaultAddress")]
-		fn set_new_dapps_default_address(&self, H160) -> Result<bool, Error>;
+		fn set_new_dapps_default_address(&self, H160) -> Result<bool>;
 
 		/// Returns current default address for new dapps (global default address)
 		/// In case it's not set explicite will return first available account.
 		/// If no accounts are available will return `0x0`
 		#[rpc(name = "parity_getNewDappsDefaultAddress")]
-		fn new_dapps_default_address(&self) -> Result<H160, Error>;
+		fn new_dapps_default_address(&self) -> Result<H160>;
 
 		/// Returns identified dapps that recently used RPC
 		/// Includes last usage timestamp.
 		#[rpc(name = "parity_listRecentDapps")]
-		fn recent_dapps(&self) -> Result<BTreeMap<DappId, u64>, Error>;
+		fn recent_dapps(&self) -> Result<BTreeMap<DappId, u64>>;
 
 		/// Imports a number of Geth accounts, with the list provided as the argument.
 		#[rpc(name = "parity_importGethAccounts")]
-		fn import_geth_accounts(&self, Vec<H160>) -> Result<Vec<H160>, Error>;
+		fn import_geth_accounts(&self, Vec<H160>) -> Result<Vec<H160>>;
 
 		/// Returns the accounts available for importing from Geth.
 		#[rpc(name = "parity_listGethAccounts")]
-		fn geth_accounts(&self) -> Result<Vec<H160>, Error>;
+		fn geth_accounts(&self) -> Result<Vec<H160>>;
 
 		/// Create new vault.
 		#[rpc(name = "parity_newVault")]
-		fn create_vault(&self, String, String) -> Result<bool, Error>;
+		fn create_vault(&self, String, String) -> Result<bool>;
 
 		/// Open existing vault.
 		#[rpc(name = "parity_openVault")]
-		fn open_vault(&self, String, String) -> Result<bool, Error>;
+		fn open_vault(&self, String, String) -> Result<bool>;
 
 		/// Close previously opened vault.
 		#[rpc(name = "parity_closeVault")]
-		fn close_vault(&self, String) -> Result<bool, Error>;
+		fn close_vault(&self, String) -> Result<bool>;
 
 		/// List all vaults.
 		#[rpc(name = "parity_listVaults")]
-		fn list_vaults(&self) -> Result<Vec<String>, Error>;
+		fn list_vaults(&self) -> Result<Vec<String>>;
 
 		/// List all currently opened vaults.
 		#[rpc(name = "parity_listOpenedVaults")]
-		fn list_opened_vaults(&self) -> Result<Vec<String>, Error>;
+		fn list_opened_vaults(&self) -> Result<Vec<String>>;
 
 		/// Change vault password.
 		#[rpc(name = "parity_changeVaultPassword")]
-		fn change_vault_password(&self, String, String) -> Result<bool, Error>;
+		fn change_vault_password(&self, String, String) -> Result<bool>;
 
 		/// Change vault of the given address.
 		#[rpc(name = "parity_changeVault")]
-		fn change_vault(&self, H160, String) -> Result<bool, Error>;
+		fn change_vault(&self, H160, String) -> Result<bool>;
 
 		/// Get vault metadata string.
 		#[rpc(name = "parity_getVaultMeta")]
-		fn get_vault_meta(&self, String) -> Result<String, Error>;
+		fn get_vault_meta(&self, String) -> Result<String>;
 
 		/// Set vault metadata string.
 		#[rpc(name = "parity_setVaultMeta")]
-		fn set_vault_meta(&self, String, String) -> Result<bool, Error>;
+		fn set_vault_meta(&self, String, String) -> Result<bool>;
 
 		/// Derive new address from given account address using specific hash.
 		/// Resulting address can be either saved as a new account (with the same password).
 		#[rpc(name = "parity_deriveAddressHash")]
-		fn derive_key_hash(&self, H160, String, DeriveHash, bool) -> Result<H160, Error>;
+		fn derive_key_hash(&self, H160, String, DeriveHash, bool) -> Result<H160>;
 
 		/// Derive new address from given account address using
 		/// hierarchical derivation (sequence of 32-bit integer indices).
 		/// Resulting address can be either saved as a new account (with the same password).
 		#[rpc(name = "parity_deriveAddressIndex")]
-		fn derive_key_index(&self, H160, String, DeriveHierarchical, bool) -> Result<H160, Error>;
+		fn derive_key_index(&self, H160, String, DeriveHierarchical, bool) -> Result<H160>;
 
 		/// Exports an account with given address if provided password matches.
 		#[rpc(name = "parity_exportAccount")]
-		fn export_account(&self, H160, String) -> Result<KeyFile, Error>;
+		fn export_account(&self, H160, String) -> Result<KeyFile>;
 
 		/// Sign raw hash with the key corresponding to address and password.
 		#[rpc(name = "parity_signMessage")]
-		fn sign_message(&self, H160, String, H256) -> Result<H520, Error>;
+		fn sign_message(&self, H160, String, H256) -> Result<H520>;
+
+		/// Send a PinMatrixAck to a hardware wallet, unlocking it
+		#[rpc(name = "parity_hardwarePinMatrixAck")]
+		fn hardware_pin_matrix_ack(&self, String, String) -> Result<bool>;
 	}
 }
diff --git a/rpc/src/v1/traits/parity_set.rs b/rpc/src/v1/traits/parity_set.rs
index 15f35b671483c7edd63f06cb2ee5b09192216eb2..40aad1a4bd909b16bbbc2d56a430be74026b4e6b 100644
--- a/rpc/src/v1/traits/parity_set.rs
+++ b/rpc/src/v1/traits/parity_set.rs
@@ -16,8 +16,7 @@
 
 //! Parity-specific rpc interface for operations altering the settings.
 
-use jsonrpc_core::Error;
-use futures::BoxFuture;
+use jsonrpc_core::{BoxFuture, Result};
 
 use v1::types::{Bytes, H160, H256, U256, ReleaseInfo, Transaction, LocalDapp};
 
@@ -26,91 +25,91 @@ build_rpc_trait! {
 	pub trait ParitySet {
 		/// Sets new minimal gas price for mined blocks.
 		#[rpc(name = "parity_setMinGasPrice")]
-		fn set_min_gas_price(&self, U256) -> Result<bool, Error>;
+		fn set_min_gas_price(&self, U256) -> Result<bool>;
 
 		/// Sets new gas floor target for mined blocks.
 		#[rpc(name = "parity_setGasFloorTarget")]
-		fn set_gas_floor_target(&self, U256) -> Result<bool, Error>;
+		fn set_gas_floor_target(&self, U256) -> Result<bool>;
 
 		/// Sets new gas ceiling target for mined blocks.
 		#[rpc(name = "parity_setGasCeilTarget")]
-		fn set_gas_ceil_target(&self, U256) -> Result<bool, Error>;
+		fn set_gas_ceil_target(&self, U256) -> Result<bool>;
 
 		/// Sets new extra data for mined blocks.
 		#[rpc(name = "parity_setExtraData")]
-		fn set_extra_data(&self, Bytes) -> Result<bool, Error>;
+		fn set_extra_data(&self, Bytes) -> Result<bool>;
 
 		/// Sets new author for mined block.
 		#[rpc(name = "parity_setAuthor")]
-		fn set_author(&self, H160) -> Result<bool, Error>;
+		fn set_author(&self, H160) -> Result<bool>;
 
 		/// Sets account for signing consensus messages.
 		#[rpc(name = "parity_setEngineSigner")]
-		fn set_engine_signer(&self, H160, String) -> Result<bool, Error>;
+		fn set_engine_signer(&self, H160, String) -> Result<bool>;
 
 		/// Sets the limits for transaction queue.
 		#[rpc(name = "parity_setTransactionsLimit")]
-		fn set_transactions_limit(&self, usize) -> Result<bool, Error>;
+		fn set_transactions_limit(&self, usize) -> Result<bool>;
 
 		/// Sets the maximum amount of gas a single transaction may consume.
 		#[rpc(name = "parity_setMaxTransactionGas")]
-		fn set_tx_gas_limit(&self, U256) -> Result<bool, Error>;
+		fn set_tx_gas_limit(&self, U256) -> Result<bool>;
 
 		/// Add a reserved peer.
 		#[rpc(name = "parity_addReservedPeer")]
-		fn add_reserved_peer(&self, String) -> Result<bool, Error>;
+		fn add_reserved_peer(&self, String) -> Result<bool>;
 
 		/// Remove a reserved peer.
 		#[rpc(name = "parity_removeReservedPeer")]
-		fn remove_reserved_peer(&self, String) -> Result<bool, Error>;
+		fn remove_reserved_peer(&self, String) -> Result<bool>;
 
 		/// Drop all non-reserved peers.
 		#[rpc(name = "parity_dropNonReservedPeers")]
-		fn drop_non_reserved_peers(&self) -> Result<bool, Error>;
+		fn drop_non_reserved_peers(&self) -> Result<bool>;
 
 		/// Accept non-reserved peers (default behavior)
 		#[rpc(name = "parity_acceptNonReservedPeers")]
-		fn accept_non_reserved_peers(&self) -> Result<bool, Error>;
+		fn accept_non_reserved_peers(&self) -> Result<bool>;
 
 		/// Start the network.
 		///
 		/// @deprecated - Use `set_mode("active")` instead.
 		#[rpc(name = "parity_startNetwork")]
-		fn start_network(&self) -> Result<bool, Error>;
+		fn start_network(&self) -> Result<bool>;
 
 		/// Stop the network.
 		///
 		/// @deprecated - Use `set_mode("offline")` instead.
 		#[rpc(name = "parity_stopNetwork")]
-		fn stop_network(&self) -> Result<bool, Error>;
+		fn stop_network(&self) -> Result<bool>;
 
 		/// Set the mode. Argument must be one of: "active", "passive", "dark", "offline".
 		#[rpc(name = "parity_setMode")]
-		fn set_mode(&self, String) -> Result<bool, Error>;
+		fn set_mode(&self, String) -> Result<bool>;
 
-		/// Set the network spec. Argument must be one of: "foundation", "ropsten", "morden", "kovan", "olympic", "classic", "dev", "expanse" or a filename.
+		/// Set the network spec. Argument must be one of: "foundation", "ropsten", "morden", "kovan", "olympic", "classic", "dev", "expanse", "musicoin" or a filename.
 		#[rpc(name = "parity_setChain")]
-		fn set_spec_name(&self, String) -> Result<bool, Error>;
+		fn set_spec_name(&self, String) -> Result<bool>;
 
 		/// Hash a file content under given URL.
-		#[rpc(async, name = "parity_hashContent")]
-		fn hash_content(&self, String) -> BoxFuture<H256, Error>;
+		#[rpc(name = "parity_hashContent")]
+		fn hash_content(&self, String) -> BoxFuture<H256>;
 
 		/// Returns true if refresh successful, error if unsuccessful or server is disabled.
 		#[rpc(name = "parity_dappsRefresh")]
-		fn dapps_refresh(&self) -> Result<bool, Error>;
+		fn dapps_refresh(&self) -> Result<bool>;
 
 		/// Returns a list of local dapps
 		#[rpc(name = "parity_dappsList")]
-		fn dapps_list(&self) -> Result<Vec<LocalDapp>, Error>;
+		fn dapps_list(&self) -> Result<Vec<LocalDapp>>;
 
 		/// Is there a release ready for install?
 		#[rpc(name = "parity_upgradeReady")]
-		fn upgrade_ready(&self) -> Result<Option<ReleaseInfo>, Error>;
+		fn upgrade_ready(&self) -> Result<Option<ReleaseInfo>>;
 
 		/// Execute a release which is ready according to upgrade_ready().
 		#[rpc(name = "parity_executeUpgrade")]
-		fn execute_upgrade(&self) -> Result<bool, Error>;
+		fn execute_upgrade(&self) -> Result<bool>;
 
 		/// Removes transaction from transaction queue.
 		/// Makes sense only for transactions that were not propagated to other peers yet
@@ -119,6 +118,6 @@ build_rpc_trait! {
 		/// or excessive gas limit that are not accepted by other peers whp.
 		/// Returns `true` when transaction was removed, `false` if it was not found.
 		#[rpc(name = "parity_removeTransaction")]
-		fn remove_transaction(&self, H256) -> Result<Option<Transaction>, Error>;
+		fn remove_transaction(&self, H256) -> Result<Option<Transaction>>;
 	}
 }
diff --git a/rpc/src/v1/traits/parity_signing.rs b/rpc/src/v1/traits/parity_signing.rs
index 344a477c4cc5fcaa96804fef7f911e584ede50b6..8015b04317bb755d6fb5933ee9a1e7951ace48bf 100644
--- a/rpc/src/v1/traits/parity_signing.rs
+++ b/rpc/src/v1/traits/parity_signing.rs
@@ -15,8 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! ParitySigning rpc interface.
-use jsonrpc_core::Error;
-use futures::BoxFuture;
+use jsonrpc_core::{BoxFuture, Result};
 
 use v1::types::{U256, H160, Bytes, ConfirmationResponse, TransactionRequest, Either};
 
@@ -28,26 +27,26 @@ build_rpc_trait! {
 		/// Given partial transaction request produces transaction with all fields filled in.
 		/// Such transaction can be then signed externally.
 		#[rpc(meta, name = "parity_composeTransaction")]
-		fn compose_transaction(&self, Self::Metadata, TransactionRequest) -> BoxFuture<TransactionRequest, Error>;
+		fn compose_transaction(&self, Self::Metadata, TransactionRequest) -> BoxFuture<TransactionRequest>;
 
 		/// Posts sign request asynchronously.
 		/// Will return a confirmation ID for later use with check_transaction.
 		#[rpc(meta, name = "parity_postSign")]
-		fn post_sign(&self, Self::Metadata, H160, Bytes) -> BoxFuture<Either<U256, ConfirmationResponse>, Error>;
+		fn post_sign(&self, Self::Metadata, H160, Bytes) -> BoxFuture<Either<U256, ConfirmationResponse>>;
 
 		/// Posts transaction asynchronously.
 		/// Will return a transaction ID for later use with check_transaction.
 		#[rpc(meta, name = "parity_postTransaction")]
-		fn post_transaction(&self, Self::Metadata, TransactionRequest) -> BoxFuture<Either<U256, ConfirmationResponse>, Error>;
+		fn post_transaction(&self, Self::Metadata, TransactionRequest) -> BoxFuture<Either<U256, ConfirmationResponse>>;
 
 		/// Checks the progress of a previously posted request (transaction/sign).
 		/// Should be given a valid send_transaction ID.
 		#[rpc(name = "parity_checkRequest")]
-		fn check_request(&self, U256) -> Result<Option<ConfirmationResponse>, Error>;
+		fn check_request(&self, U256) -> Result<Option<ConfirmationResponse>>;
 
 		/// Decrypt some ECIES-encrypted message.
 		/// First parameter is the address with which it is encrypted, second is the ciphertext.
 		#[rpc(meta, name = "parity_decryptMessage")]
-		fn decrypt_message(&self, Self::Metadata, H160, Bytes) -> BoxFuture<Bytes, Error>;
+		fn decrypt_message(&self, Self::Metadata, H160, Bytes) -> BoxFuture<Bytes>;
 	}
 }
diff --git a/rpc/src/v1/traits/personal.rs b/rpc/src/v1/traits/personal.rs
index f62f5ce7b70268709065d5700a25c29b31a831fc..7c187fcffe9bd22954a36f24fd5c443375a40a22 100644
--- a/rpc/src/v1/traits/personal.rs
+++ b/rpc/src/v1/traits/personal.rs
@@ -15,11 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Personal rpc interface.
-use jsonrpc_core::Error;
+use jsonrpc_core::{BoxFuture, Result};
 
-use futures::BoxFuture;
-
-use v1::types::{U128, H160, H256, TransactionRequest};
+use v1::types::{Bytes, U128, H160, H256, H520, TransactionRequest, RichRawTransaction as RpcRichRawTransaction};
 
 build_rpc_trait! {
 	/// Personal rpc interface. Safe (read-only) functions.
@@ -28,24 +26,38 @@ build_rpc_trait! {
 
 		/// Lists all stored accounts
 		#[rpc(name = "personal_listAccounts")]
-		fn accounts(&self) -> Result<Vec<H160>, Error>;
+		fn accounts(&self) -> Result<Vec<H160>>;
 
 		/// Creates new account (it becomes new current unlocked account)
 		/// Param is the password for the account.
 		#[rpc(name = "personal_newAccount")]
-		fn new_account(&self, String) -> Result<H160, Error>;
+		fn new_account(&self, String) -> Result<H160>;
 
 		/// Unlocks specified account for use (can only be one unlocked account at one moment)
 		#[rpc(name = "personal_unlockAccount")]
-		fn unlock_account(&self, H160, String, Option<U128>) -> Result<bool, Error>;
+		fn unlock_account(&self, H160, String, Option<U128>) -> Result<bool>;
+
+		/// Signs the hash of data with given account signature using the given password to unlock the account during
+		/// the request.
+		#[rpc(name = "personal_sign")]
+		fn sign(&self, Bytes, H160, String) -> BoxFuture<H520>;
+
+		/// Returns the account associated with the private key that was used to calculate the signature in
+		/// `personal_sign`.
+		#[rpc(name = "personal_ecRecover")]
+		fn ec_recover(&self, Bytes, H520) -> BoxFuture<H160>;
+
+		/// Signs transaction. The account is not unlocked in such case.
+		#[rpc(meta, name = "personal_signTransaction")]
+		fn sign_transaction(&self, Self::Metadata, TransactionRequest, String) -> BoxFuture<RpcRichRawTransaction>;
 
 		/// Sends transaction and signs it in single call. The account is not unlocked in such case.
 		#[rpc(meta, name = "personal_sendTransaction")]
-		fn send_transaction(&self, Self::Metadata, TransactionRequest, String) -> BoxFuture<H256, Error>;
+		fn send_transaction(&self, Self::Metadata, TransactionRequest, String) -> BoxFuture<H256>;
 
 		/// @deprecated alias for `personal_sendTransaction`.
 		#[rpc(meta, name = "personal_signAndSendTransaction")]
-		fn sign_and_send_transaction(&self, Self::Metadata, TransactionRequest, String) -> BoxFuture<H256, Error>;
+		fn sign_and_send_transaction(&self, Self::Metadata, TransactionRequest, String) -> BoxFuture<H256>;
 
 	}
 }
diff --git a/rpc/src/v1/traits/pubsub.rs b/rpc/src/v1/traits/pubsub.rs
index 7957a38755a2826fe0b3f678269b8649f6729bb4..0b77fc64d6e309ca178e8bf0f0ce25caad47ae80 100644
--- a/rpc/src/v1/traits/pubsub.rs
+++ b/rpc/src/v1/traits/pubsub.rs
@@ -16,11 +16,10 @@
 
 //! Parity-specific PUB-SUB rpc interface.
 
-use jsonrpc_core::{Error, Value, Params};
+use jsonrpc_core::{Result, Value, Params};
 use jsonrpc_pubsub::SubscriptionId;
 use jsonrpc_macros::Trailing;
 use jsonrpc_macros::pubsub::Subscriber;
-use futures::BoxFuture;
 
 build_rpc_trait! {
 	/// Parity-specific PUB-SUB rpc interface.
@@ -34,7 +33,7 @@ build_rpc_trait! {
 
 			/// Unsubscribe from existing Parity subscription.
 			#[rpc(name = "parity_unsubscribe")]
-			fn parity_unsubscribe(&self, SubscriptionId) -> BoxFuture<bool, Error>;
+			fn parity_unsubscribe(&self, SubscriptionId) -> Result<bool>;
 		}
 	}
 }
diff --git a/rpc/src/v1/traits/rpc.rs b/rpc/src/v1/traits/rpc.rs
index 96a3f48ac4fb84d7ddf8cd221cd1f854f68fae8c..a813aa94e67c4dcc6b41984a4e2d728676e00bf6 100644
--- a/rpc/src/v1/traits/rpc.rs
+++ b/rpc/src/v1/traits/rpc.rs
@@ -18,7 +18,7 @@
 
 use std::collections::BTreeMap;
 
-use jsonrpc_core::Error;
+use jsonrpc_core::Result;
 
 build_rpc_trait! {
 	/// RPC Interface.
@@ -26,11 +26,11 @@ build_rpc_trait! {
 		/// Returns supported modules for Geth 1.3.6
         /// @ignore
 		#[rpc(name = "modules")]
-		fn modules(&self) -> Result<BTreeMap<String, String>, Error>;
+		fn modules(&self) -> Result<BTreeMap<String, String>>;
 
 		/// Returns supported modules for Geth 1.4.0
         /// @ignore
 		#[rpc(name = "rpc_modules")]
-		fn rpc_modules(&self) -> Result<BTreeMap<String, String>, Error>;
+		fn rpc_modules(&self) -> Result<BTreeMap<String, String>>;
 	}
 }
diff --git a/rpc/src/v1/traits/secretstore.rs b/rpc/src/v1/traits/secretstore.rs
index c13367562b01a56c0d559bed3d957e2c88bd2c40..6d2e5669c007ac4f2f88ea3202608c1d5671a215 100644
--- a/rpc/src/v1/traits/secretstore.rs
+++ b/rpc/src/v1/traits/secretstore.rs
@@ -16,26 +16,44 @@
 
 //! SecretStore-specific rpc interface.
 
-use jsonrpc_core::Error;
+use std::collections::BTreeSet;
+use jsonrpc_core::Result;
 
-use v1::types::{H160, H512, Bytes};
+use v1::types::{H160, H256, H512, Bytes, EncryptedDocumentKey};
 
 build_rpc_trait! {
 	/// Parity-specific rpc interface.
 	pub trait SecretStore {
+		/// Generate document key to store in secret store.
+		/// Arguments: `account`, `password`, `server_key_public`.
+		#[rpc(name = "secretstore_generateDocumentKey")]
+		fn generate_document_key(&self, H160, String, H512) -> Result<EncryptedDocumentKey>;
+
 		/// Encrypt data with key, received from secret store.
 		/// Arguments: `account`, `password`, `key`, `data`.
 		#[rpc(name = "secretstore_encrypt")]
-		fn encrypt(&self, H160, String, Bytes, Bytes) -> Result<Bytes, Error>;
+		fn encrypt(&self, H160, String, Bytes, Bytes) -> Result<Bytes>;
 
 		/// Decrypt data with key, received from secret store.
 		/// Arguments: `account`, `password`, `key`, `data`.
 		#[rpc(name = "secretstore_decrypt")]
-		fn decrypt(&self, H160, String, Bytes, Bytes) -> Result<Bytes, Error>;
+		fn decrypt(&self, H160, String, Bytes, Bytes) -> Result<Bytes>;
 
 		/// Decrypt data with shadow key, received from secret store.
 		/// Arguments: `account`, `password`, `decrypted_secret`, `common_point`, `decrypt_shadows`, `data`.
 		#[rpc(name = "secretstore_shadowDecrypt")]
-		fn shadow_decrypt(&self, H160, String, H512, H512, Vec<Bytes>, Bytes) -> Result<Bytes, Error>;
+		fn shadow_decrypt(&self, H160, String, H512, H512, Vec<Bytes>, Bytes) -> Result<Bytes>;
+
+		/// Calculates the hash (keccak256) of servers set for using in ServersSetChange session.
+		/// Returned hash must be signed later by using `secretstore_signRawHash` method.
+		/// Arguments: `servers_set`.
+		#[rpc(name = "secretstore_serversSetHash")]
+		fn servers_set_hash(&self, BTreeSet<H512>) -> Result<H256>;
+
+		/// Generate recoverable ECDSA signature of raw hash.
+		/// Passed hash is treated as an input to the `sign` function (no prefixes added, no hash function is applied).
+		/// Arguments: `account`, `password`, `raw_hash`.
+		#[rpc(name = "secretstore_signRawHash")]
+		fn sign_raw_hash(&self, H160, String, H256) -> Result<Bytes>;
 	}
 }
diff --git a/rpc/src/v1/traits/signer.rs b/rpc/src/v1/traits/signer.rs
index f71b5f6042a2bfd3157c65528568a09f1f1b5ce8..b7f60619e805619220fcc083c552beb1368dd5df 100644
--- a/rpc/src/v1/traits/signer.rs
+++ b/rpc/src/v1/traits/signer.rs
@@ -15,10 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Parity Signer-related rpc interface.
-use jsonrpc_core::Error;
+use jsonrpc_core::{BoxFuture, Result};
 use jsonrpc_pubsub::SubscriptionId;
 use jsonrpc_macros::pubsub::Subscriber;
-use futures::BoxFuture;
 
 use v1::types::{U256, Bytes, TransactionModification, ConfirmationRequest, ConfirmationResponse, ConfirmationResponseWithToken};
 
@@ -29,31 +28,31 @@ build_rpc_trait! {
 
 		/// Returns a list of items to confirm.
 		#[rpc(name = "signer_requestsToConfirm")]
-		fn requests_to_confirm(&self) -> Result<Vec<ConfirmationRequest>, Error>;
+		fn requests_to_confirm(&self) -> Result<Vec<ConfirmationRequest>>;
 
 		/// Confirm specific request.
-		#[rpc(async, name = "signer_confirmRequest")]
-		fn confirm_request(&self, U256, TransactionModification, String) -> BoxFuture<ConfirmationResponse, Error>;
+		#[rpc(name = "signer_confirmRequest")]
+		fn confirm_request(&self, U256, TransactionModification, String) -> BoxFuture<ConfirmationResponse>;
 
 		/// Confirm specific request with token.
-		#[rpc(async, name = "signer_confirmRequestWithToken")]
-		fn confirm_request_with_token(&self, U256, TransactionModification, String) -> BoxFuture<ConfirmationResponseWithToken, Error>;
+		#[rpc(name = "signer_confirmRequestWithToken")]
+		fn confirm_request_with_token(&self, U256, TransactionModification, String) -> BoxFuture<ConfirmationResponseWithToken>;
 
 		/// Confirm specific request with already signed data.
 		#[rpc(name = "signer_confirmRequestRaw")]
-		fn confirm_request_raw(&self, U256, Bytes) -> Result<ConfirmationResponse, Error>;
+		fn confirm_request_raw(&self, U256, Bytes) -> Result<ConfirmationResponse>;
 
 		/// Reject the confirmation request.
 		#[rpc(name = "signer_rejectRequest")]
-		fn reject_request(&self, U256) -> Result<bool, Error>;
+		fn reject_request(&self, U256) -> Result<bool>;
 
 		/// Generates new authorization token.
 		#[rpc(name = "signer_generateAuthorizationToken")]
-		fn generate_token(&self) -> Result<String, Error>;
+		fn generate_token(&self) -> Result<String>;
 
 		/// Generates new web proxy access token for particular domain.
 		#[rpc(name = "signer_generateWebProxyAccessToken")]
-		fn generate_web_proxy_token(&self, String) -> Result<String, Error>;
+		fn generate_web_proxy_token(&self, String) -> Result<String>;
 
 		#[pubsub(name = "signer_pending")] {
 			/// Subscribe to new pending requests on signer interface.
@@ -62,7 +61,7 @@ build_rpc_trait! {
 
 			/// Unsubscribe from pending requests subscription.
 			#[rpc(name = "signer_unsubscribePending")]
-			fn unsubscribe_pending(&self, SubscriptionId) -> BoxFuture<bool, Error>;
+			fn unsubscribe_pending(&self, SubscriptionId) -> Result<bool>;
 		}
 	}
 }
diff --git a/rpc/src/v1/traits/traces.rs b/rpc/src/v1/traits/traces.rs
index 33bcb0afd4187ad87487a34fc5d7aff273bd9ec3..1fe01f47ef66869ea0ffc65ce1101304bffa8e95 100644
--- a/rpc/src/v1/traits/traces.rs
+++ b/rpc/src/v1/traits/traces.rs
@@ -16,8 +16,7 @@
 
 //! Traces specific rpc interface.
 
-use jsonrpc_core::Error;
-use jsonrpc_core::futures::BoxFuture;
+use jsonrpc_core::Result;
 use jsonrpc_macros::Trailing;
 use v1::types::{TraceFilter, LocalizedTrace, BlockNumber, Index, CallRequest, Bytes, TraceResults, H256, TraceOptions};
 
@@ -28,34 +27,38 @@ build_rpc_trait! {
 
 		/// Returns traces matching given filter.
 		#[rpc(name = "trace_filter")]
-		fn filter(&self, TraceFilter) -> Result<Option<Vec<LocalizedTrace>>, Error>;
+		fn filter(&self, TraceFilter) -> Result<Option<Vec<LocalizedTrace>>>;
 
 		/// Returns transaction trace at given index.
 		#[rpc(name = "trace_get")]
-		fn trace(&self, H256, Vec<Index>) -> Result<Option<LocalizedTrace>, Error>;
+		fn trace(&self, H256, Vec<Index>) -> Result<Option<LocalizedTrace>>;
 
 		/// Returns all traces of given transaction.
 		#[rpc(name = "trace_transaction")]
-		fn transaction_traces(&self, H256) -> Result<Option<Vec<LocalizedTrace>>, Error>;
+		fn transaction_traces(&self, H256) -> Result<Option<Vec<LocalizedTrace>>>;
 
 		/// Returns all traces produced at given block.
 		#[rpc(name = "trace_block")]
-		fn block_traces(&self, BlockNumber) -> Result<Option<Vec<LocalizedTrace>>, Error>;
+		fn block_traces(&self, BlockNumber) -> Result<Option<Vec<LocalizedTrace>>>;
 
 		/// Executes the given call and returns a number of possible traces for it.
 		#[rpc(meta, name = "trace_call")]
-		fn call(&self, Self::Metadata, CallRequest, TraceOptions, Trailing<BlockNumber>) -> BoxFuture<TraceResults, Error>;
+		fn call(&self, Self::Metadata, CallRequest, TraceOptions, Trailing<BlockNumber>) -> Result<TraceResults>;
 
 		/// Executes all given calls and returns a number of possible traces for each of it.
 		#[rpc(meta, name = "trace_callMany")]
-		fn call_many(&self, Self::Metadata, Vec<(CallRequest, TraceOptions)>, Trailing<BlockNumber>) -> BoxFuture<Vec<TraceResults>, Error>;
+		fn call_many(&self, Self::Metadata, Vec<(CallRequest, TraceOptions)>, Trailing<BlockNumber>) -> Result<Vec<TraceResults>>;
 
 		/// Executes the given raw transaction and returns a number of possible traces for it.
 		#[rpc(name = "trace_rawTransaction")]
-		fn raw_transaction(&self, Bytes, TraceOptions, Trailing<BlockNumber>) -> Result<TraceResults, Error>;
+		fn raw_transaction(&self, Bytes, TraceOptions, Trailing<BlockNumber>) -> Result<TraceResults>;
 
 		/// Executes the transaction with the given hash and returns a number of possible traces for it.
 		#[rpc(name = "trace_replayTransaction")]
-		fn replay_transaction(&self, H256, TraceOptions) -> Result<TraceResults, Error>;
+		fn replay_transaction(&self, H256, TraceOptions) -> Result<TraceResults>;
+
+		/// Executes all the transactions at the given block and returns a number of possible traces for each transaction.
+		#[rpc(name = "trace_replayBlockTransactions")]
+		fn replay_block_transactions(&self, BlockNumber, TraceOptions) ->  Result<Vec<TraceResults>>;
 	}
 }
diff --git a/rpc/src/v1/traits/web3.rs b/rpc/src/v1/traits/web3.rs
index b56f028d79b123b49a9f842e4e6a8c6f7986a673..e4fb8b0d1fbe6b0ce8c1312b2d87d8029a456929 100644
--- a/rpc/src/v1/traits/web3.rs
+++ b/rpc/src/v1/traits/web3.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Web3 rpc interface.
-use jsonrpc_core::Error;
+use jsonrpc_core::Result;
 
 use v1::types::{H256, Bytes};
 
@@ -24,10 +24,10 @@ build_rpc_trait! {
 	pub trait Web3 {
 		/// Returns current client version.
 		#[rpc(name = "web3_clientVersion")]
-		fn client_version(&self) -> Result<String, Error>;
+		fn client_version(&self) -> Result<String>;
 
 		/// Returns sha3 of the given data
 		#[rpc(name = "web3_sha3")]
-		fn sha3(&self, Bytes) -> Result<H256, Error>;
+		fn sha3(&self, Bytes) -> Result<H256>;
 	}
 }
diff --git a/rpc/src/v1/types/block.rs b/rpc/src/v1/types/block.rs
index 10f7a2476ffa9cfa69c0fc33daffd02db847d728..cd2d83e0e9f70a2af55e8cff1adb6c49ac9cede3 100644
--- a/rpc/src/v1/types/block.rs
+++ b/rpc/src/v1/types/block.rs
@@ -173,8 +173,10 @@ impl<'a> From<&'a EthHeader> for Header {
 			logs_bloom: h.log_bloom().into(),
 			timestamp: h.timestamp().into(),
 			difficulty: h.difficulty().into(),
-			seal_fields: h.seal().into_iter().map(Into::into).collect(),
 			extra_data: h.extra_data().into(),
+			seal_fields: h.view().decode_seal()
+				.expect("Client/Miner returns only valid headers. We only serialize headers from Client/Miner; qed")
+				.into_iter().map(Into::into).collect(),
 		}
 	}
 }
diff --git a/rpc/src/v1/types/block_number.rs b/rpc/src/v1/types/block_number.rs
index 334bf360d2d215fb6b6ac5a117c64858a7571d9c..b6c1860f5ba4202c4048f3d7163ee8f76eb791d6 100644
--- a/rpc/src/v1/types/block_number.rs
+++ b/rpc/src/v1/types/block_number.rs
@@ -82,9 +82,7 @@ impl<'a> Visitor<'a> for BlockNumberVisitor {
 			_ if value.starts_with("0x") => u64::from_str_radix(&value[2..], 16).map(BlockNumber::Num).map_err(|e| {
 				Error::custom(format!("Invalid block number: {}", e))
 			}),
-			_ => value.parse::<u64>().map(BlockNumber::Num).map_err(|e| {
-				Error::custom(format!("Invalid block number: {}", e))
-			}),
+			_ => Err(Error::custom(format!("Invalid block number: missing 0x prefix"))),
 		}
 	}
 
@@ -93,14 +91,14 @@ impl<'a> Visitor<'a> for BlockNumberVisitor {
 	}
 }
 
-impl Into<BlockId> for BlockNumber {
-	fn into(self) -> BlockId {
-		match self {
-			BlockNumber::Num(n) => BlockId::Number(n),
-			BlockNumber::Earliest => BlockId::Earliest,
-			BlockNumber::Latest => BlockId::Latest,
-			BlockNumber::Pending => BlockId::Pending,
-		}
+/// Converts `BlockNumber` to `BlockId`, panics on `BlockNumber::Pending`
+pub fn block_number_to_id(number: BlockNumber) -> BlockId {
+	match number {
+		BlockNumber::Num(num) => BlockId::Number(num),
+		BlockNumber::Earliest => BlockId::Earliest,
+		BlockNumber::Latest => BlockId::Latest,
+
+		BlockNumber::Pending => panic!("`BlockNumber::Pending` should be handled manually")
 	}
 }
 
@@ -112,17 +110,29 @@ mod tests {
 
 	#[test]
 	fn block_number_deserialization() {
-		let s = r#"["0xa", "10", "latest", "earliest", "pending"]"#;
+		let s = r#"["0xa", "latest", "earliest", "pending"]"#;
 		let deserialized: Vec<BlockNumber> = serde_json::from_str(s).unwrap();
-		assert_eq!(deserialized, vec![BlockNumber::Num(10), BlockNumber::Num(10), BlockNumber::Latest, BlockNumber::Earliest, BlockNumber::Pending])
+		assert_eq!(deserialized, vec![BlockNumber::Num(10), BlockNumber::Latest, BlockNumber::Earliest, BlockNumber::Pending])
+	}
+
+	#[test]
+	fn should_not_deserialize_decimal() {
+		let s = r#""10""#;
+		assert!(serde_json::from_str::<BlockNumber>(s).is_err());
+	}
+
+	#[test]
+	fn normal_block_number_to_id() {
+		assert_eq!(block_number_to_id(BlockNumber::Num(100)), BlockId::Number(100));
+		assert_eq!(block_number_to_id(BlockNumber::Earliest), BlockId::Earliest);
+		assert_eq!(block_number_to_id(BlockNumber::Latest), BlockId::Latest);
 	}
 
 	#[test]
-	fn block_number_into() {
-		assert_eq!(BlockId::Number(100), BlockNumber::Num(100).into());
-		assert_eq!(BlockId::Earliest, BlockNumber::Earliest.into());
-		assert_eq!(BlockId::Latest, BlockNumber::Latest.into());
-		assert_eq!(BlockId::Pending, BlockNumber::Pending.into());
+	#[should_panic]
+	fn pending_block_number_to_id() {
+		// Since this function is not allowed to be called in such way, panic should happen
+		block_number_to_id(BlockNumber::Pending);
 	}
 }
 
diff --git a/rpc/src/v1/types/bytes.rs b/rpc/src/v1/types/bytes.rs
index 4bd10af441684e7b84c54e27d30f879138dabfb3..fdbcb729bbf615b604560b1800cb92ce23a4feb8 100644
--- a/rpc/src/v1/types/bytes.rs
+++ b/rpc/src/v1/types/bytes.rs
@@ -74,13 +74,7 @@ impl<'a> Visitor<'a> for BytesVisitor {
 	}
 
 	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: Error {
-		if value.is_empty() {
-			warn!(
-				target: "deprecated",
-				"Deserializing empty string as empty bytes. This is a non-standard behaviour that will be removed in future versions. Please update your code to send `0x` instead!"
-			);
-			Ok(Bytes::new(Vec::new()))
-		} else if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
+		if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
 			Ok(Bytes::new(FromHex::from_hex(&value[2..]).map_err(|e| Error::custom(format!("Invalid hex: {}", e)))?))
 		} else {
 			Err(Error::custom("Invalid bytes format. Expected a 0x-prefixed hex string with even length"))
@@ -108,8 +102,7 @@ mod tests {
 
 	#[test]
 	fn test_bytes_deserialize() {
-		// TODO [ToDr] Uncomment when Mist starts sending correct data
-		// let bytes1: Result<Bytes, serde_json::Error> = serde_json::from_str(r#""""#);
+		let bytes1: Result<Bytes, serde_json::Error> = serde_json::from_str(r#""""#);
 		let bytes2: Result<Bytes, serde_json::Error> = serde_json::from_str(r#""0x123""#);
 		let bytes3: Result<Bytes, serde_json::Error> = serde_json::from_str(r#""0xgg""#);
 
@@ -117,19 +110,12 @@ mod tests {
 		let bytes5: Bytes = serde_json::from_str(r#""0x12""#).unwrap();
 		let bytes6: Bytes = serde_json::from_str(r#""0x0123""#).unwrap();
 
-		// assert!(bytes1.is_err());
+		assert!(bytes1.is_err());
 		assert!(bytes2.is_err());
 		assert!(bytes3.is_err());
 		assert_eq!(bytes4, Bytes(vec![]));
 		assert_eq!(bytes5, Bytes(vec![0x12]));
 		assert_eq!(bytes6, Bytes(vec![0x1, 0x23]));
 	}
-
-	// TODO [ToDr] Remove when Mist starts sending correct data
-	#[test]
-	fn test_bytes_lenient_against_the_spec_deserialize_for_empty_string_for_mist_compatibility() {
-		let deserialized: Bytes = serde_json::from_str(r#""""#).unwrap();
-		assert_eq!(deserialized, Bytes(Vec::new()));
-	}
 }
 
diff --git a/rpc/src/v1/types/confirmations.rs b/rpc/src/v1/types/confirmations.rs
index bbc8b350e04c2ffe211889b7e3ae9804531ab00d..5dcb11316c2c5d4bda9aa33b213c830596c4bfb8 100644
--- a/rpc/src/v1/types/confirmations.rs
+++ b/rpc/src/v1/types/confirmations.rs
@@ -18,8 +18,8 @@
 
 use std::fmt;
 use serde::{Serialize, Serializer};
-use util::Colour;
-use util::bytes::ToPretty;
+use ansi_term::Colour;
+use bytes::ToPretty;
 
 use v1::types::{U256, TransactionRequest, RichRawTransaction, H160, H256, H520, Bytes, TransactionCondition, Origin};
 use v1::helpers;
@@ -47,13 +47,13 @@ impl From<helpers::ConfirmationRequest> for ConfirmationRequest {
 }
 
 impl fmt::Display for ConfirmationRequest {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		write!(f, "#{}: {} coming from {}", self.id, self.payload, self.origin)
 	}
 }
 
 impl fmt::Display for ConfirmationPayload {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match *self {
 			ConfirmationPayload::SendTransaction(ref transaction) => write!(f, "{}", transaction),
 			ConfirmationPayload::SignTransaction(ref transaction) => write!(f, "(Sign only) {}", transaction),
@@ -83,7 +83,7 @@ impl From<(H160, Bytes)> for SignRequest {
 }
 
 impl fmt::Display for SignRequest {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		write!(
 			f,
 			"sign 0x{} with {}",
@@ -113,7 +113,7 @@ impl From<(H160, Bytes)> for DecryptRequest {
 }
 
 impl fmt::Display for DecryptRequest {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		write!(
 			f,
 			"decrypt data with {}",
diff --git a/rpc/src/v1/types/dapps.rs b/rpc/src/v1/types/dapps.rs
index fb4a868f088cca9b0ef4bf9cde722f9ee0ca2b14..418717fccfb9735b47d97aa7a6e3cfb72b3d0e9c 100644
--- a/rpc/src/v1/types/dapps.rs
+++ b/rpc/src/v1/types/dapps.rs
@@ -31,6 +31,9 @@ pub struct LocalDapp {
 	/// Dapp icon
 	#[serde(rename="iconUrl")]
 	pub icon_url: String,
+	/// Local development Url
+	#[serde(rename="localUrl")]
+	pub local_url: Option<String>,
 }
 
 #[cfg(test)]
@@ -40,7 +43,7 @@ mod tests {
 
 	#[test]
 	fn dapp_serialization() {
-		let s = r#"{"id":"skeleton","name":"Skeleton","description":"A skeleton dapp","version":"0.1","author":"Parity Technologies Ltd","iconUrl":"title.png"}"#;
+		let s = r#"{"id":"skeleton","name":"Skeleton","description":"A skeleton dapp","version":"0.1","author":"Parity Technologies Ltd","iconUrl":"title.png","localUrl":"http://localhost:5000"}"#;
 
 		let dapp = LocalDapp {
 			id: "skeleton".into(),
@@ -49,6 +52,7 @@ mod tests {
 			version: "0.1".into(),
 			author: "Parity Technologies Ltd".into(),
 			icon_url: "title.png".into(),
+			local_url: Some("http://localhost:5000".into()),
 		};
 
 		let serialized = serde_json::to_string(&dapp).unwrap();
diff --git a/rpc/src/v1/types/filter.rs b/rpc/src/v1/types/filter.rs
index 058d14d7e3439f7fe919f9dc068ef9dada92ca11..52217459c1f81ccdb6eff58b39177476fa41a5d7 100644
--- a/rpc/src/v1/types/filter.rs
+++ b/rpc/src/v1/types/filter.rs
@@ -72,9 +72,15 @@ pub struct Filter {
 
 impl Into<EthFilter> for Filter {
 	fn into(self) -> EthFilter {
+		let num_to_id = |num| match num {
+			BlockNumber::Num(n) => BlockId::Number(n),
+			BlockNumber::Earliest => BlockId::Earliest,
+			BlockNumber::Latest | BlockNumber::Pending => BlockId::Latest,
+		};
+
 		EthFilter {
-			from_block: self.from_block.map_or_else(|| BlockId::Latest, Into::into),
-			to_block: self.to_block.map_or_else(|| BlockId::Latest, Into::into),
+			from_block: self.from_block.map_or_else(|| BlockId::Latest, &num_to_id),
+			to_block: self.to_block.map_or_else(|| BlockId::Latest, &num_to_id),
 			address: self.address.and_then(|address| match address {
 				VariadicValue::Null => None,
 				VariadicValue::Single(a) => Some(vec![a.into()]),
@@ -124,7 +130,7 @@ impl Serialize for FilterChanges {
 mod tests {
 	use serde_json;
 	use std::str::FromStr;
-	use util::hash::H256;
+	use ethereum_types::H256;
 	use super::{VariadicValue, Topic, Filter};
 	use v1::types::BlockNumber;
 	use ethcore::filter::Filter as EthFilter;
diff --git a/rpc/src/v1/types/hash.rs b/rpc/src/v1/types/hash.rs
index 1816c96d5787e4429945353a62dfd886117aba01..e3cc73e2720dbd3a3d0f11772022434f953a6c42 100644
--- a/rpc/src/v1/types/hash.rs
+++ b/rpc/src/v1/types/hash.rs
@@ -20,7 +20,7 @@ use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};
 use serde;
 use rustc_hex::{ToHex, FromHex};
-use util::{H64 as Eth64, H160 as Eth160, H256 as Eth256, H520 as Eth520, H512 as Eth512, H2048 as Eth2048};
+use ethereum_types::{H64 as Eth64, H160 as Eth160, H256 as Eth256, H520 as Eth520, H512 as Eth512, Bloom as Eth2048};
 
 macro_rules! impl_hash {
 	($name: ident, $other: ident, $size: expr) => {
diff --git a/rpc/src/v1/types/histogram.rs b/rpc/src/v1/types/histogram.rs
index 55d8ae835c53ac8a8a601d4b414515d0cc7095e6..26bbc7d2de4272e8c15d75da3d7f079f302e2110 100644
--- a/rpc/src/v1/types/histogram.rs
+++ b/rpc/src/v1/types/histogram.rs
@@ -29,8 +29,8 @@ pub struct Histogram {
 	pub counts: Vec<usize>,
 }
 
-impl From<::stats::Histogram<::util::U256>> for Histogram {
-	fn from(h: ::stats::Histogram<::util::U256>) -> Self {
+impl From<::stats::Histogram<::ethereum_types::U256>> for Histogram {
+	fn from(h: ::stats::Histogram<::ethereum_types::U256>) -> Self {
 		Histogram {
 			bucket_bounds: h.bucket_bounds.into_iter().map(Into::into).collect(),
 			counts: h.counts
diff --git a/rpc/src/v1/types/mod.rs b/rpc/src/v1/types/mod.rs
index 1407ebcf24623e5fbc556599ec5119bb5a1f8ee0..7f1e51fad01342aec9b6bd5770af1e426c9c50d2 100644
--- a/rpc/src/v1/types/mod.rs
+++ b/rpc/src/v1/types/mod.rs
@@ -35,6 +35,7 @@ mod node_kind;
 mod provenance;
 mod receipt;
 mod rpc_settings;
+mod secretstore;
 mod sync;
 mod trace;
 mod trace_filter;
@@ -49,7 +50,7 @@ pub mod pubsub;
 pub use self::account_info::{AccountInfo, ExtAccountInfo, HwAccountInfo};
 pub use self::bytes::Bytes;
 pub use self::block::{RichBlock, Block, BlockTransactions, Header, RichHeader, Rich};
-pub use self::block_number::BlockNumber;
+pub use self::block_number::{BlockNumber, block_number_to_id};
 pub use self::call_request::CallRequest;
 pub use self::confirmations::{
 	ConfirmationPayload, ConfirmationRequest, ConfirmationResponse, ConfirmationResponseWithToken,
@@ -67,6 +68,7 @@ pub use self::node_kind::{NodeKind, Availability, Capability};
 pub use self::provenance::{Origin, DappId};
 pub use self::receipt::Receipt;
 pub use self::rpc_settings::RpcSettings;
+pub use self::secretstore::EncryptedDocumentKey;
 pub use self::sync::{
 	SyncStatus, SyncInfo, Peers, PeerInfo, PeerNetworkInfo, PeerProtocolsInfo,
 	TransactionStats, ChainStatus, EthProtocolInfo, PipProtocolInfo,
@@ -76,7 +78,7 @@ pub use self::trace_filter::TraceFilter;
 pub use self::transaction::{Transaction, RichRawTransaction, LocalTransactionStatus};
 pub use self::transaction_request::TransactionRequest;
 pub use self::transaction_condition::TransactionCondition;
-pub use self::uint::{U128, U256};
+pub use self::uint::{U128, U256, U64};
 pub use self::work::Work;
 
 // TODO [ToDr] Refactor to a proper type Vec of enums?
diff --git a/rpc/src/v1/types/pubsub.rs b/rpc/src/v1/types/pubsub.rs
index e7deeba4f6df1b13f5afaf0bf1eb209460dec61b..dfac5a0abb561a333a094bce7ea3b859a39af5ca 100644
--- a/rpc/src/v1/types/pubsub.rs
+++ b/rpc/src/v1/types/pubsub.rs
@@ -19,15 +19,17 @@
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde::de::Error;
 use serde_json::{Value, from_value};
-use v1::types::{RichHeader, Filter, Log};
+use v1::types::{RichHeader, Filter, Log, H256};
 
 /// Subscription result.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Result {
 	/// New block header.
 	Header(RichHeader),
-	/// Logs
-	Logs(Vec<Log>),
+	/// Log
+	Log(Log),
+	/// Transaction hash
+	TransactionHash(H256),
 }
 
 impl Serialize for Result {
@@ -36,7 +38,8 @@ impl Serialize for Result {
 	{
 		match *self {
 			Result::Header(ref header) => header.serialize(serializer),
-			Result::Logs(ref logs) => logs.serialize(serializer),
+			Result::Log(ref log) => log.serialize(serializer),
+			Result::TransactionHash(ref hash) => hash.serialize(serializer),
 		}
 	}
 }
diff --git a/rpc/src/v1/types/receipt.rs b/rpc/src/v1/types/receipt.rs
index 29e0f277cc459d1d35b5c12a0dda5381710ad729..e20856b8225993dd027a5a1ed80fa6c8d55503a3 100644
--- a/rpc/src/v1/types/receipt.rs
+++ b/rpc/src/v1/types/receipt.rs
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use v1::types::{Log, H160, H256, H2048, U256};
-use ethcore::receipt::{Receipt as EthReceipt, RichReceipt, LocalizedReceipt};
+use v1::types::{Log, H160, H256, H2048, U256, U64};
+use ethcore::receipt::{Receipt as EthReceipt, RichReceipt, LocalizedReceipt, TransactionOutcome};
 
 /// Receipt
 #[derive(Debug, Serialize)]
@@ -49,6 +49,25 @@ pub struct Receipt {
 	/// Logs bloom
 	#[serde(rename="logsBloom")]
 	pub logs_bloom: H2048,
+	/// Status code
+	#[serde(rename="status")]
+	pub status_code: Option<U64>,
+}
+
+impl Receipt {
+	fn outcome_to_state_root(outcome: TransactionOutcome) -> Option<H256> {
+		match outcome {
+			TransactionOutcome::Unknown | TransactionOutcome::StatusCode(_) => None,
+			TransactionOutcome::StateRoot(root) => Some(root.into()),
+		}
+	}
+
+	fn outcome_to_status_code(outcome: &TransactionOutcome) -> Option<U64> {
+		match *outcome {
+			TransactionOutcome::Unknown | TransactionOutcome::StateRoot(_) => None,
+			TransactionOutcome::StatusCode(ref code) => Some((*code as u64).into()),
+		}
+	}
 }
 
 impl From<LocalizedReceipt> for Receipt {
@@ -62,7 +81,8 @@ impl From<LocalizedReceipt> for Receipt {
 			gas_used: Some(r.gas_used.into()),
 			contract_address: r.contract_address.map(Into::into),
 			logs: r.logs.into_iter().map(Into::into).collect(),
-			state_root: r.state_root.map(Into::into),
+			status_code: Self::outcome_to_status_code(&r.outcome),
+			state_root: Self::outcome_to_state_root(r.outcome),
 			logs_bloom: r.log_bloom.into(),
 		}
 	}
@@ -79,7 +99,8 @@ impl From<RichReceipt> for Receipt {
 			gas_used: Some(r.gas_used.into()),
 			contract_address: r.contract_address.map(Into::into),
 			logs: r.logs.into_iter().map(Into::into).collect(),
-			state_root: r.state_root.map(Into::into),
+			status_code: Self::outcome_to_status_code(&r.outcome),
+			state_root: Self::outcome_to_state_root(r.outcome),
 			logs_bloom: r.log_bloom.into(),
 		}
 	}
@@ -96,7 +117,8 @@ impl From<EthReceipt> for Receipt {
 			gas_used: None,
 			contract_address: None,
 			logs: r.logs.into_iter().map(Into::into).collect(),
-			state_root: r.state_root.map(Into::into),
+			status_code: Self::outcome_to_status_code(&r.outcome),
+			state_root: Self::outcome_to_state_root(r.outcome),
 			logs_bloom: r.log_bloom.into(),
 		}
 	}
@@ -109,7 +131,7 @@ mod tests {
 
 	#[test]
 	fn receipt_serialization() {
-		let s = r#"{"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","cumulativeGasUsed":"0x20","gasUsed":"0x10","contractAddress":null,"logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"data":"0x","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","logIndex":"0x1","transactionLogIndex":null,"type":"mined"}],"root":"0x000000000000000000000000000000000000000000000000000000000000000a","logsBloom":"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f"}"#;
+		let s = r#"{"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","cumulativeGasUsed":"0x20","gasUsed":"0x10","contractAddress":null,"logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"data":"0x","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","logIndex":"0x1","transactionLogIndex":null,"type":"mined"}],"root":"0x000000000000000000000000000000000000000000000000000000000000000a","logsBloom":"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f","status":"0x1"}"#;
 
 		let receipt = Receipt {
 			transaction_hash: Some(0.into()),
@@ -136,6 +158,7 @@ mod tests {
 			}],
 			logs_bloom: 15.into(),
 			state_root: Some(10.into()),
+			status_code: Some(1u64.into()),
 		};
 
 		let serialized = serde_json::to_string(&receipt).unwrap();
diff --git a/rpc/src/v1/types/secretstore.rs b/rpc/src/v1/types/secretstore.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4388b308ba2053c95b4c62d92738ea54ad0a0fcc
--- /dev/null
+++ b/rpc/src/v1/types/secretstore.rs
@@ -0,0 +1,52 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use v1::types::{Bytes, H512};
+
+/// Encrypted document key.
+#[derive(Default, Debug, Serialize, PartialEq)]
+#[cfg_attr(test, derive(Deserialize))]
+pub struct EncryptedDocumentKey {
+	/// Common encryption point. Pass this to Secret Store 'Document key storing session'
+	pub common_point: H512,
+	/// Ecnrypted point. Pass this to Secret Store 'Document key storing session'.
+	pub encrypted_point: H512,
+	/// Document key itself, encrypted with passed account public. Pass this to 'secretstore_encrypt'.
+	pub encrypted_key: Bytes,
+}
+
+#[cfg(test)]
+mod tests {
+	use serde_json;
+	use super::EncryptedDocumentKey;
+
+	#[test]
+	fn test_serialize_encrypted_document_key() {
+		let initial = EncryptedDocumentKey {
+			common_point: 1.into(),
+			encrypted_point: 2.into(),
+			encrypted_key: vec![3].into(),
+		};
+
+		let serialized = serde_json::to_string(&initial).unwrap();
+		assert_eq!(serialized, r#"{"common_point":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001","encrypted_point":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002","encrypted_key":"0x03"}"#);
+
+		let deserialized: EncryptedDocumentKey = serde_json::from_str(&serialized).unwrap();
+		assert_eq!(deserialized.common_point, 1.into());
+		assert_eq!(deserialized.encrypted_point, 2.into());
+		assert_eq!(deserialized.encrypted_key, vec![3].into());
+	}
+}
diff --git a/rpc/src/v1/types/sync.rs b/rpc/src/v1/types/sync.rs
index 813fe8cb33f427ee33933b726a4d0c8807bee08a..ae421ed404749dc762a54771066f53e3f6dff14f 100644
--- a/rpc/src/v1/types/sync.rs
+++ b/rpc/src/v1/types/sync.rs
@@ -103,7 +103,7 @@ impl From<ethsync::EthProtocolInfo> for EthProtocolInfo {
 		EthProtocolInfo {
 			version: info.version,
 			difficulty: info.difficulty.map(Into::into),
-			head: info.head.hex(),
+			head: format!("{:x}", info.head),
 		}
 	}
 }
@@ -124,7 +124,7 @@ impl From<ethsync::PipProtocolInfo> for PipProtocolInfo {
 		PipProtocolInfo {
 			version: info.version,
 			difficulty: info.difficulty.into(),
-			head: info.head.hex(),
+			head: format!("{:x}", info.head),
 		}
 	}
 }
diff --git a/rpc/src/v1/types/trace.rs b/rpc/src/v1/types/trace.rs
index f9cf0bb403311a1b4a97b9f3977eb32994847333..a984c64ba80592e06cee307d24cafa2a7fe5146b 100644
--- a/rpc/src/v1/types/trace.rs
+++ b/rpc/src/v1/types/trace.rs
@@ -164,7 +164,7 @@ pub enum Diff<T> where T: Serialize {
 	Changed(ChangedType<T>),
 }
 
-impl<T, U> From<account_diff::Diff<T>> for Diff<U> where T: Eq + ::ethcore_ipc::BinaryConvertable, U: Serialize + From<T> {
+impl<T, U> From<account_diff::Diff<T>> for Diff<U> where T: Eq, U: Serialize + From<T> {
 	fn from(c: account_diff::Diff<T>) -> Self {
 		match c {
 			account_diff::Diff::Same => Diff::Same,
@@ -299,6 +299,49 @@ impl From<trace::Call> for Call {
 	}
 }
 
+/// Reward type.
+#[derive(Debug, Serialize)]
+pub enum RewardType {
+	/// Block
+	#[serde(rename="block")]
+	Block,
+	/// Uncle
+	#[serde(rename="uncle")]
+	Uncle,
+}
+
+impl From<trace::RewardType> for RewardType {
+	fn from(c: trace::RewardType) -> Self {
+		match c {
+			trace::RewardType::Block => RewardType::Block,
+			trace::RewardType::Uncle => RewardType::Uncle,
+		}
+	}
+}
+
+
+/// Reward action
+#[derive(Debug, Serialize)]
+pub struct Reward {
+	/// Author's address.
+	pub author: H160,
+	/// Reward amount.
+	pub value: U256,
+	/// Reward type.
+	#[serde(rename="rewardType")]
+	pub reward_type: RewardType,
+}
+
+impl From<trace::Reward> for Reward {
+	fn from(r: trace::Reward) -> Self {
+		Reward {
+			author: r.author.into(),
+			value: r.value.into(),
+			reward_type: r.reward_type.into(),
+		}
+	}
+}
+
 /// Suicide
 #[derive(Debug, Serialize)]
 pub struct Suicide {
@@ -330,6 +373,8 @@ pub enum Action {
 	Create(Create),
 	/// Suicide
 	Suicide(Suicide),
+	/// Reward
+	Reward(Reward),
 }
 
 impl From<trace::Action> for Action {
@@ -338,6 +383,7 @@ impl From<trace::Action> for Action {
 			trace::Action::Call(call) => Action::Call(call.into()),
 			trace::Action::Create(create) => Action::Create(create.into()),
 			trace::Action::Suicide(suicide) => Action::Suicide(suicide.into()),
+			trace::Action::Reward(reward) => Action::Reward(reward.into()),
 		}
 	}
 }
@@ -422,9 +468,9 @@ pub struct LocalizedTrace {
 	/// Subtraces
 	subtraces: usize,
 	/// Transaction position
-	transaction_position: usize,
+	transaction_position: Option<usize>,
 	/// Transaction hash
-	transaction_hash: H256,
+	transaction_hash: Option<H256>,
 	/// Block Number
 	block_number: u64,
 	/// Block Hash
@@ -449,6 +495,10 @@ impl Serialize for LocalizedTrace {
 				struc.serialize_field("type", "suicide")?;
 				struc.serialize_field("action", suicide)?;
 			},
+			Action::Reward(ref reward) => {
+				struc.serialize_field("type", "reward")?;
+				struc.serialize_field("action", reward)?;
+			},
 		}
 
 		match self.result {
@@ -477,8 +527,8 @@ impl From<EthLocalizedTrace> for LocalizedTrace {
 			result: t.result.into(),
 			trace_address: t.trace_address.into_iter().map(Into::into).collect(),
 			subtraces: t.subtraces.into(),
-			transaction_position: t.transaction_number.into(),
-			transaction_hash: t.transaction_hash.into(),
+			transaction_position: t.transaction_number.map(Into::into),
+			transaction_hash: t.transaction_hash.map(Into::into),
 			block_number: t.block_number.into(),
 			block_hash: t.block_hash.into(),
 		}
@@ -516,6 +566,10 @@ impl Serialize for Trace {
 				struc.serialize_field("type", "suicide")?;
 				struc.serialize_field("action", suicide)?;
 			},
+			Action::Reward(ref reward) => {
+				struc.serialize_field("type", "reward")?;
+				struc.serialize_field("action", reward)?;
+			},
 		}
 
 		match self.result {
@@ -607,8 +661,8 @@ mod tests {
 			}),
 			trace_address: vec![10],
 			subtraces: 1,
-			transaction_position: 11,
-			transaction_hash: 12.into(),
+			transaction_position: Some(11),
+			transaction_hash: Some(12.into()),
 			block_number: 13,
 			block_hash: 14.into(),
 		};
@@ -630,8 +684,8 @@ mod tests {
 			result: Res::FailedCall(TraceError::OutOfGas),
 			trace_address: vec![10],
 			subtraces: 1,
-			transaction_position: 11,
-			transaction_hash: 12.into(),
+			transaction_position: Some(11),
+			transaction_hash: Some(12.into()),
 			block_number: 13,
 			block_hash: 14.into(),
 		};
@@ -655,8 +709,8 @@ mod tests {
 			}),
 			trace_address: vec![10],
 			subtraces: 1,
-			transaction_position: 11,
-			transaction_hash: 12.into(),
+			transaction_position: Some(11),
+			transaction_hash: Some(12.into()),
 			block_number: 13,
 			block_hash: 14.into(),
 		};
@@ -676,8 +730,8 @@ mod tests {
 			result: Res::FailedCreate(TraceError::OutOfGas),
 			trace_address: vec![10],
 			subtraces: 1,
-			transaction_position: 11,
-			transaction_hash: 12.into(),
+			transaction_position: Some(11),
+			transaction_hash: Some(12.into()),
 			block_number: 13,
 			block_hash: 14.into(),
 		};
@@ -696,8 +750,8 @@ mod tests {
 			result: Res::None,
 			trace_address: vec![10],
 			subtraces: 1,
-			transaction_position: 11,
-			transaction_hash: 12.into(),
+			transaction_position: Some(11),
+			transaction_hash: Some(12.into()),
 			block_number: 13,
 			block_hash: 14.into(),
 		};
@@ -705,6 +759,26 @@ mod tests {
 		assert_eq!(serialized, r#"{"type":"suicide","action":{"address":"0x0000000000000000000000000000000000000004","refundAddress":"0x0000000000000000000000000000000000000006","balance":"0x7"},"result":null,"traceAddress":[10],"subtraces":1,"transactionPosition":11,"transactionHash":"0x000000000000000000000000000000000000000000000000000000000000000c","blockNumber":13,"blockHash":"0x000000000000000000000000000000000000000000000000000000000000000e"}"#);
 	}
 
+	#[test]
+	fn test_trace_reward_serialize() {
+		let t = LocalizedTrace {
+			action: Action::Reward(Reward {
+				author: 4.into(),
+				value: 6.into(),
+				reward_type: RewardType::Block,
+			}),
+			result: Res::None,
+			trace_address: vec![10],
+			subtraces: 1,
+			transaction_position: None,
+			transaction_hash: None,
+			block_number: 13,
+			block_hash: 14.into(),
+		};
+		let serialized = serde_json::to_string(&t).unwrap();
+		assert_eq!(serialized, r#"{"type":"reward","action":{"author":"0x0000000000000000000000000000000000000004","value":"0x6","rewardType":"block"},"result":null,"traceAddress":[10],"subtraces":1,"transactionPosition":null,"transactionHash":null,"blockNumber":13,"blockHash":"0x000000000000000000000000000000000000000000000000000000000000000e"}"#);
+	}
+
 	#[test]
 	fn test_vmtrace_serialize() {
 		let t = VMTrace {
diff --git a/rpc/src/v1/types/trace_filter.rs b/rpc/src/v1/types/trace_filter.rs
index 4390efa2af2852a4b0d33c92eb0e2d13a0538e9a..3a64f5248895361ad33944f43300e4dce659b14a 100644
--- a/rpc/src/v1/types/trace_filter.rs
+++ b/rpc/src/v1/types/trace_filter.rs
@@ -36,16 +36,31 @@ pub struct TraceFilter {
 	/// To address
 	#[serde(rename="toAddress")]
 	pub to_address: Option<Vec<H160>>,
+	/// Output offset
+	pub after: Option<usize>,
+	/// Output amount
+	pub count: Option<usize>,
 }
 
 impl Into<client::TraceFilter> for TraceFilter {
 	fn into(self) -> client::TraceFilter {
-		let start = self.from_block.map_or(BlockId::Latest, Into::into);
-		let end = self.to_block.map_or(BlockId::Latest, Into::into);
+		let num_to_id = |num| match num {
+			BlockNumber::Num(n) => BlockId::Number(n),
+			BlockNumber::Earliest => BlockId::Earliest,
+			BlockNumber::Latest => BlockId::Latest,
+			BlockNumber::Pending => {
+				warn!("Pending traces are not supported and might be removed in future versions. Falling back to Latest");
+				BlockId::Latest
+			}
+		};
+		let start = self.from_block.map_or(BlockId::Latest, &num_to_id);
+		let end = self.to_block.map_or(BlockId::Latest, &num_to_id);
 		client::TraceFilter {
 			range: start..end,
 			from_address: self.from_address.map_or_else(Vec::new, |x| x.into_iter().map(Into::into).collect()),
 			to_address: self.to_address.map_or_else(Vec::new, |x| x.into_iter().map(Into::into).collect()),
+			after: self.after,
+			count: self.count,
 		}
 	}
 }
@@ -53,7 +68,7 @@ impl Into<client::TraceFilter> for TraceFilter {
 #[cfg(test)]
 mod tests {
 	use serde_json;
-	use util::Address;
+	use ethereum_types::Address;
 	use v1::types::{BlockNumber, TraceFilter};
 
 	#[test]
@@ -64,7 +79,9 @@ mod tests {
 			from_block: None,
 			to_block: None,
 			from_address: None,
-			to_address: None
+			to_address: None,
+			after: None,
+			count: None,
 		});
 	}
 
@@ -74,7 +91,9 @@ mod tests {
 			"fromBlock": "latest",
 			"toBlock": "latest",
 			"fromAddress": ["0x0000000000000000000000000000000000000003"],
-			"toAddress": ["0x0000000000000000000000000000000000000005"]
+			"toAddress": ["0x0000000000000000000000000000000000000005"],
+			"after": 50,
+			"count": 100
 		}"#;
 		let deserialized: TraceFilter = serde_json::from_str(s).unwrap();
 		assert_eq!(deserialized, TraceFilter {
@@ -82,6 +101,8 @@ mod tests {
 			to_block: Some(BlockNumber::Latest),
 			from_address: Some(vec![Address::from(3).into()]),
 			to_address: Some(vec![Address::from(5).into()]),
+			after: 50.into(),
+			count: 100.into(),
 		});
 	}
 }
diff --git a/rpc/src/v1/types/transaction.rs b/rpc/src/v1/types/transaction.rs
index d5eb63b44a1e21b25ceb4f0d47c63d930ad7b954..c5dd63624f56f8772043244fd51be5ea429eecbe 100644
--- a/rpc/src/v1/types/transaction.rs
+++ b/rpc/src/v1/types/transaction.rs
@@ -18,9 +18,9 @@ use serde::{Serialize, Serializer};
 use serde::ser::SerializeStruct;
 use ethcore::miner;
 use ethcore::{contract_address, CreateContractAddress};
-use ethcore::transaction::{LocalizedTransaction, Action, PendingTransaction, SignedTransaction};
+use transaction::{LocalizedTransaction, Action, PendingTransaction, SignedTransaction};
 use v1::helpers::errors;
-use v1::types::{Bytes, H160, H256, U256, H512, TransactionCondition};
+use v1::types::{Bytes, H160, H256, U256, H512, U64, TransactionCondition};
 
 /// Transaction
 #[derive(Debug, Default, Clone, PartialEq, Serialize)]
@@ -60,7 +60,7 @@ pub struct Transaction {
 	pub public_key: Option<H512>,
 	/// The network id of the transaction, if any.
 	#[serde(rename="chainId")]
-	pub chain_id: Option<u64>,
+	pub chain_id: Option<U64>,
 	/// The standardised V field of the signature (0 or 1).
 	#[serde(rename="standardV")]
 	pub standard_v: U256,
@@ -158,11 +158,10 @@ pub struct RichRawTransaction {
 	pub transaction: Transaction
 }
 
-
-impl From<SignedTransaction> for RichRawTransaction {
-	fn from(t: SignedTransaction) -> Self {
-		// TODO: change transition to 0 when EIP-86 is commonly used.
-		let tx: Transaction = Transaction::from_signed(t, 0, u64::max_value());
+impl RichRawTransaction {
+	/// Creates new `RichRawTransaction` from `SignedTransaction`.
+	pub fn from_signed(tx: SignedTransaction, block_number: u64, eip86_transition: u64) -> Self {
+		let tx = Transaction::from_signed(tx, block_number, eip86_transition);
 		RichRawTransaction {
 			raw: tx.raw.clone(),
 			transaction: tx,
@@ -196,7 +195,7 @@ impl Transaction {
 			},
 			raw: ::rlp::encode(&t.signed).into_vec().into(),
 			public_key: t.recover_public().ok().map(Into::into),
-			chain_id: t.chain_id(),
+			chain_id: t.chain_id().map(U64::from),
 			standard_v: t.standard_v().into(),
 			v: t.original_v().into(),
 			r: signature.r().into(),
@@ -230,7 +229,7 @@ impl Transaction {
 			},
 			raw: ::rlp::encode(&t).into_vec().into(),
 			public_key: t.public_key().map(Into::into),
-			chain_id: t.chain_id(),
+			chain_id: t.chain_id().map(U64::from),
 			standard_v: t.standard_v().into(),
 			v: t.original_v().into(),
 			r: signature.r().into(),
diff --git a/rpc/src/v1/types/transaction_condition.rs b/rpc/src/v1/types/transaction_condition.rs
index 1682f2dd945ef0b7bbcc7016656f2ab09718d47a..541bd364a3696bf63c697f4008afdebec22919cd 100644
--- a/rpc/src/v1/types/transaction_condition.rs
+++ b/rpc/src/v1/types/transaction_condition.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use ethcore;
+use transaction;
 
 /// Represents condition on minimum block number or block timestamp.
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)]
@@ -28,27 +28,26 @@ pub enum TransactionCondition {
 	Timestamp(u64),
 }
 
-impl Into<ethcore::transaction::Condition> for TransactionCondition {
-	fn into(self) -> ethcore::transaction::Condition {
+impl Into<transaction::Condition> for TransactionCondition {
+	fn into(self) -> transaction::Condition {
 		match self {
-			TransactionCondition::Number(n) => ethcore::transaction::Condition::Number(n),
-			TransactionCondition::Timestamp(n) => ethcore::transaction::Condition::Timestamp(n),
+			TransactionCondition::Number(n) => transaction::Condition::Number(n),
+			TransactionCondition::Timestamp(n) => transaction::Condition::Timestamp(n),
 		}
 	}
 }
 
-impl From<ethcore::transaction::Condition> for TransactionCondition {
-	fn from(condition: ethcore::transaction::Condition) -> Self {
+impl From<transaction::Condition> for TransactionCondition {
+	fn from(condition: transaction::Condition) -> Self {
 		match condition {
-			ethcore::transaction::Condition::Number(n) => TransactionCondition::Number(n),
-			ethcore::transaction::Condition::Timestamp(n) => TransactionCondition::Timestamp(n),
+			transaction::Condition::Number(n) => TransactionCondition::Number(n),
+			transaction::Condition::Timestamp(n) => TransactionCondition::Timestamp(n),
 		}
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use ethcore;
 	use super::*;
 	use serde_json;
 
@@ -61,8 +60,8 @@ mod tests {
 
 	#[test]
 	fn condition_into() {
-		assert_eq!(ethcore::transaction::Condition::Number(100), TransactionCondition::Number(100).into());
-		assert_eq!(ethcore::transaction::Condition::Timestamp(100), TransactionCondition::Timestamp(100).into());
+		assert_eq!(transaction::Condition::Number(100), TransactionCondition::Number(100).into());
+		assert_eq!(transaction::Condition::Timestamp(100), TransactionCondition::Timestamp(100).into());
 	}
 }
 
diff --git a/rpc/src/v1/types/transaction_request.rs b/rpc/src/v1/types/transaction_request.rs
index cb74e071b5ce058553295c34ae8d3a1d58b34e03..2d4c86c7e7711e4e12ac73ec686560d9db6d2e5f 100644
--- a/rpc/src/v1/types/transaction_request.rs
+++ b/rpc/src/v1/types/transaction_request.rs
@@ -18,7 +18,7 @@
 
 use v1::types::{Bytes, H160, U256, TransactionCondition};
 use v1::helpers;
-use util::Colour;
+use ansi_term::Colour;
 
 use std::fmt;
 
@@ -62,7 +62,7 @@ pub fn format_ether(i: U256) -> String {
 }
 
 impl fmt::Display for TransactionRequest {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		let eth = self.value.unwrap_or(U256::from(0));
 		match self.to {
 			Some(ref to) => write!(
diff --git a/rpc/src/v1/types/uint.rs b/rpc/src/v1/types/uint.rs
index e783aac1fd3c5f801cf09003c681614ef0fa426a..e887322dbae1af60c5318f72b1f8596c215cb17f 100644
--- a/rpc/src/v1/types/uint.rs
+++ b/rpc/src/v1/types/uint.rs
@@ -17,7 +17,7 @@
 use std::str::FromStr;
 use std::fmt;
 use serde;
-use util::{U256 as EthU256, U128 as EthU128};
+use ethereum_types::{U256 as EthU256, U128 as EthU128};
 
 macro_rules! impl_uint {
 	($name: ident, $other: ident, $size: expr) => {
@@ -59,12 +59,6 @@ macro_rules! impl_uint {
 			}
 		}
 
-		impl serde::Serialize for $name {
-			fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: serde::Serializer {
-				serializer.serialize_str(&format!("0x{}", self.0.to_hex()))
-			}
-		}
-
 		impl<'a> serde::Deserialize<'a> for $name {
 			fn deserialize<D>(deserializer: D) -> Result<$name, D::Error>
 			where D: serde::Deserializer<'a> {
@@ -104,7 +98,25 @@ macro_rules! impl_uint {
 
 impl_uint!(U128, EthU128, 2);
 impl_uint!(U256, EthU256, 4);
+impl_uint!(U64, u64, 1);
+
+impl serde::Serialize for U128 {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: serde::Serializer {
+		serializer.serialize_str(&format!("0x{:x}", self.0))
+	}
+}
 
+impl serde::Serialize for U256 {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: serde::Serializer {
+		serializer.serialize_str(&format!("0x{:x}", self.0))
+	}
+}
+
+impl serde::Serialize for U64 {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: serde::Serializer {
+		serializer.serialize_str(&format!("0x{:x}", self.0))
+	}
+}
 
 #[cfg(test)]
 mod tests {
diff --git a/rpc_cli/Cargo.toml b/rpc_cli/Cargo.toml
index 5e407cb74aef64afe0c3508eb4b5d5a691712630..0bda94ab674b83bc1d365df9e87a76dbf1c56dac 100644
--- a/rpc_cli/Cargo.toml
+++ b/rpc_cli/Cargo.toml
@@ -8,8 +8,7 @@ version = "1.4.0"
 
 [dependencies]
 futures = "0.1"
-rpassword = "0.3.0"
+rpassword = "1.0"
 bigint = "4.0"
 parity-rpc = { path = "../rpc" }
 parity-rpc-client = { path = "../rpc_client" }
-ethcore-util = { path = "../util" }
diff --git a/rpc_cli/src/lib.rs b/rpc_cli/src/lib.rs
index 14bb5c7061c000c4124d996434f52aae7c0e8112..f322129d1c137eca1394e6f4fea41b2b4fa624a8 100644
--- a/rpc_cli/src/lib.rs
+++ b/rpc_cli/src/lib.rs
@@ -1,9 +1,6 @@
 extern crate futures;
 extern crate rpassword;
 
-extern crate ethcore_util as util;
-extern crate bigint;
-
 extern crate parity_rpc as rpc;
 extern crate parity_rpc_client as client;
 
diff --git a/rpc_client/Cargo.toml b/rpc_client/Cargo.toml
index 5cc688fb5b5541b8e949e6cd197776765d9fd5c0..81776b3e15df18618c1b871f930d220f4f43a071 100644
--- a/rpc_client/Cargo.toml
+++ b/rpc_client/Cargo.toml
@@ -9,13 +9,12 @@ version = "1.4.0"
 [dependencies]
 futures = "0.1"
 log = "0.3.6"
-rand = "0.3.14"
 serde = "1.0"
 serde_json = "1.0"
-tempdir = "0.3.5"
 url = "1.2.0"
 matches = "0.1"
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
+parking_lot = "0.5"
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 parity-rpc = { path = "../rpc" }
-ethcore-util = { path = "../util" }
+keccak-hash = { path = "../util/hash" }
diff --git a/rpc_client/src/client.rs b/rpc_client/src/client.rs
index 3f55fbe73cd18975cc1bb10149f8374d36cc0e56..8f330629b2cfa0e1860783670593f41993c7cfeb 100644
--- a/rpc_client/src/client.rs
+++ b/rpc_client/src/client.rs
@@ -1,5 +1,3 @@
-extern crate jsonrpc_core;
-
 use std::fmt::{Debug, Formatter, Error as FmtError};
 use std::io::{BufReader, BufRead};
 use std::sync::Arc;
@@ -9,7 +7,8 @@ use std::thread;
 use std::time;
 
 use std::path::PathBuf;
-use util::{Hashable, Mutex};
+use hash::keccak;
+use parking_lot::Mutex;
 use url::Url;
 use std::fs::File;
 
@@ -32,12 +31,14 @@ use serde_json::{
 	Error as JsonError,
 };
 
-use futures::{BoxFuture, Canceled, Complete, Future, oneshot, done};
+use futures::{Canceled, Complete, Future, oneshot, done};
 
 use jsonrpc_core::{Id, Version, Params, Error as JsonRpcError};
 use jsonrpc_core::request::MethodCall;
 use jsonrpc_core::response::{Output, Success, Failure};
 
+use BoxFuture;
+
 /// The actual websocket connection handler, passed into the
 /// event loop of ws-rs
 struct RpcHandler {
@@ -72,7 +73,7 @@ impl Handler for RpcHandler {
 					WsError::new(WsErrorKind::Internal, format!("{}", err))
 				})?;
 				let secs = timestamp.as_secs();
-				let hashed = format!("{}:{}", self.auth_code, secs).sha3();
+				let hashed = keccak(format!("{}:{}", self.auth_code, secs));
 				let proto = format!("{:?}_{}", hashed, secs);
 				r.add_protocol(&proto);
 				Ok(r)
@@ -211,7 +212,7 @@ impl Rpc {
 	) -> BoxFuture<Result<Self, RpcError>, Canceled> {
 		let (c, p) = oneshot::<Result<Self, RpcError>>();
 		match get_authcode(authpath) {
-			Err(e) => return done(Ok(Err(e))).boxed(),
+			Err(e) => return Box::new(done(Ok(Err(e)))),
 			Ok(code) => {
 				let url = String::from(url);
 				// The ws::connect takes a FnMut closure, which means c cannot
@@ -238,7 +239,7 @@ impl Rpc {
 						_ => ()
 					}
 				});
-				p.boxed()
+				Box::new(p)
 			}
 		}
 	}
@@ -265,7 +266,7 @@ impl Rpc {
 			.expect("request is serializable");
 		let _ = self.out.send(serialized);
 
-		p.map(|result| {
+		Box::new(p.map(|result| {
 			match result {
 				Ok(json) => {
 					let t: T = json::from_value(json)?;
@@ -273,7 +274,7 @@ impl Rpc {
 				},
 				Err(err) => Err(err)
 			}
-		}).boxed()
+		}))
 	}
 }
 
diff --git a/rpc_client/src/lib.rs b/rpc_client/src/lib.rs
index d1967ccbd589755df21330592d27de4ccde5c18c..49f537708ef7c11534ad2d5d416b5f88c292f2bb 100644
--- a/rpc_client/src/lib.rs
+++ b/rpc_client/src/lib.rs
@@ -1,16 +1,15 @@
 pub mod client;
 pub mod signer_client;
 
-extern crate ethcore_util as util;
 extern crate futures;
 extern crate jsonrpc_core;
 extern crate jsonrpc_ws_server as ws;
 extern crate parity_rpc as rpc;
-extern crate rand;
+extern crate parking_lot;
 extern crate serde;
 extern crate serde_json;
-extern crate tempdir;
 extern crate url;
+extern crate keccak_hash as hash;
 
 #[macro_use]
 extern crate log;
@@ -19,6 +18,8 @@ extern crate log;
 #[macro_use]
 extern crate matches;
 
+/// Boxed future response.
+pub type BoxFuture<T, E> = Box<futures::Future<Item=T, Error=E> + Send>;
 
 #[cfg(test)]
 mod tests {
@@ -36,7 +37,7 @@ mod tests {
 		authcodes.to_file(&authcodes.path).unwrap();
 
 		let connect = Rpc::connect(&format!("ws://127.0.0.1:{}", port - 1),
-								   authcodes.path.as_path());
+								   &authcodes.path);
 
 		let _ = connect.map(|conn| {
 			assert!(matches!(&conn, &Err(RpcError::WsError(_))));
@@ -63,7 +64,7 @@ mod tests {
 		authcodes.to_file(&authcodes.path).unwrap();
 
 		let connect = Rpc::connect(&format!("ws://127.0.0.1:{}", port),
-								   authcodes.path.as_path());
+								   &authcodes.path);
 
 		let _ = connect.map(|conn| {
 			assert!(conn.is_ok())
diff --git a/rpc_client/src/signer_client.rs b/rpc_client/src/signer_client.rs
index ae051efb61a7bdc3e57cb3ca793f6239e2c02076..cee063109bc26e8b683773360f5232f3e6f5a7a2 100644
--- a/rpc_client/src/signer_client.rs
+++ b/rpc_client/src/signer_client.rs
@@ -3,7 +3,8 @@ use rpc::signer::{ConfirmationRequest, TransactionModification, U256, Transactio
 use serde;
 use serde_json::{Value as JsonValue, to_value};
 use std::path::PathBuf;
-use futures::{BoxFuture, Canceled};
+use futures::{Canceled};
+use {BoxFuture};
 
 pub struct SignerRpc {
 	rpc: Rpc,
diff --git a/rustfmt.toml b/rustfmt.toml
index b1dd4575bdc207e1d112a5cac6d22be8051124af..16016b1b2aff844c80cf2ec5c805922e7c4d35ac 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,8 +1,8 @@
 verbose=false
-max_width=1000
-comment_width=1000
+max_width=100
+comment_width=100
 tab_spaces=4
-fn_call_width=1000
+fn_call_width=100
 struct_lit_width=32
 fn_call_style="Visual"
 single_line_if_else_max_width=100
@@ -13,3 +13,4 @@ reorder_imports=true
 format_strings=false
 hard_tabs=true
 wrap_match_arms=false
+error_on_line_overflow=false
\ No newline at end of file
diff --git a/scripts/aura-test.sh b/scripts/aura-test.sh
index bb152beba79e34dd59b2055ef02a191dd4fd3643..1cd6bf53687a3bc32873d249ba1b25a707127d06 100755
--- a/scripts/aura-test.sh
+++ b/scripts/aura-test.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
+set -e # fail on any error
+set -u # treat unset variables as error
+
 cargo build -j $(nproc) --release --features final $CARGOFLAGS
 git clone https://github.com/paritytech/parity-import-tests
 cp target/release/parity parity-import-tests/aura/parity
 cd parity-import-tests/aura
 echo "Start Aura test"
-parity import blocks.rlp --chain chain.json
-parity restore snap --chain chain.json
+./parity import blocks.rlp --chain chain.json
+./parity restore snap --chain chain.json
 echo "Aura test complete"
diff --git a/scripts/contractABI.js b/scripts/contractABI.js
deleted file mode 100644
index 4b9e489a9a06ba6f57d0bc5c0c5d3d02439aa884..0000000000000000000000000000000000000000
--- a/scripts/contractABI.js
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-// Rust/Parity ABI struct autogenerator.
-// By Gav Wood, 2016.
-
-var fs = require('fs');
-
-String.prototype.replaceAll = function(f, t) { return this.split(f).join(t); }
-String.prototype.toSnake = function(){
-	return this.replace(/([A-Z])/g, function($1){return "_"+$1.toLowerCase();});
-};
-
-function makeContractFile(name, json, prefs) {
-	return `// Autogenerated from JSON contract definition using Rust contract convertor.
-// Command line: ${process.argv.slice(2).join(' ')}
-#![allow(unused_imports)]
-use std::string::String;
-use std::result::Result;
-use std::fmt;
-use {util, ethabi};
-
-${convertContract(name, json, prefs)}
-`;
-}
-
-function convertContract(name, json, prefs) {
-	return `${prefs._pub ? "pub " : ""}struct ${name} {
-	contract: ethabi::Contract,
-	pub address: util::Address,
-	${prefs._explicit_do_call ? "" : `do_call: Box<Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send${prefs._sync ? " + Sync " : ""}+ 'static>,`}
-}
-impl ${name} {
-	pub fn new${prefs._explicit_do_call ? "" : "<F>"}(address: util::Address${prefs._explicit_do_call ? "" : `, do_call: F`}) -> Self
-		${prefs._explicit_do_call ? "" : `where F: Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send ${prefs._sync ? "+ Sync " : ""}+ 'static`} {
-		${name} {
-			contract: ethabi::Contract::new(ethabi::Interface::load(b"${JSON.stringify(json.filter(a => a.type == 'function')).replaceAll('"', '\\"')}").expect("JSON is autogenerated; qed")),
-			address: address,
-			${prefs._explicit_do_call ? "" : `do_call: Box::new(do_call),`}
-		}
-	}
-	fn as_string<T: fmt::Debug>(e: T) -> String { format!("{:?}", e) }
-	${json.filter(x => x.type == 'function').map(x => convertFunction(x, prefs)).join("\n")}
-}`;
-}
-
-function mapType(name, type, _prefs) {
-	let prefs = _prefs || {};
-	var m;
-	if ((m = type.match(/^bytes(\d+)$/)) != null && m[1] <= 32) {
-		if (prefs['string'])
-			return `&str`;
-		else
-			return `&util::H${m[1] * 8}`;
-	}
-	if ((m = type.match(/^(u?)int(\d+)$/)) != null) {
-		var n = [8, 16, 32, 64, 128, 160, 256].filter(i => m[2] <= i)[0];
-		if (n) {
-			if (n <= 64)
-				return `${m[1] == 'u' ? 'u' : 'i'}${n}`;
-			if (m[1] == 'u')
-				return `util::U${n}`;
-			// ERROR - unsupported integer (signed > 32 or unsigned > 256)
-		}
-	}
-	if (type == "address")
-		return "&util::Address";
-	if (type == "bool")
-		return "bool";
-	if (type == "string")
-		return "&str";
-	if (type == "bytes")
-		return "&[u8]";
-
-	console.log(`Unsupported argument type: ${type} (${name})`);
-}
-
-function mapReturnType(name, type, _prefs) {
-	let prefs = _prefs || {};
-	var m;
-	if ((m = type.match(/^bytes(\d+)$/)) != null && m[1] <= 32) {
-		if (prefs['string'])
-			return `String`;
-		else
-			return `util::H${m[1] * 8}`;
-	}
-	if ((m = type.match(/^(u?)int(\d+)$/)) != null) {
-		var n = [8, 16, 32, 64, 128, 160, 256].filter(i => m[2] <= i)[0];
-		if (n) {
-			if (n <= 64)
-				return `${m[1] == 'u' ? 'u' : 'i'}${n}`;
-			if (m[1] == 'u')
-				return `util::U${n}`;
-			// ERROR - unsupported integer (signed > 32 or unsigned > 256)
-		}
-	}
-	if (type == "address")
-		return "util::Address";
-	if (type == "bool")
-		return "bool";
-	if (type == "string")
-		return "String";
-	if (type == "bytes")
-		return "Vec<u8>";
-	if (type == "address[]")
-		return "Vec<util::Address>";
-
-	console.log(`Unsupported return type: ${type} (${name})`);
-}
-
-function convertToken(name, type, _prefs) {
-	let prefs = _prefs || {};
-	var m;
-	if ((m = type.match(/^bytes(\d+)$/)) != null && m[1] <= 32) {
-		if (prefs['string'])
-			return `ethabi::Token::FixedBytes(${name}.as_bytes().to_owned())`;
-		else
-			return `ethabi::Token::FixedBytes(${name}.as_ref().to_owned())`;
-	}
-	if ((m = type.match(/^(u?)int(\d+)$/)) != null) {
-		var n = [8, 16, 32, 64, 128, 160, 256].filter(i => m[2] <= i)[0];
-		if (n) {
-			if (m[1] == 'u')
-				return `ethabi::Token::Uint({ let mut r = [0u8; 32]; ${n <= 64 ? "util::U256::from(" + name + " as u64)" : name}.to_big_endian(&mut r); r })`;
-			else if (n <= 32)
-				return `ethabi::Token::Int(pad_i32(${name} as i32))`;
-			// ERROR - unsupported integer (signed > 32 or unsigned > 256)
-		}
-	}
-	if (type == "address")
-		return `ethabi::Token::Address(${name}.clone().0)`;
-	if (type == "bool")
-		return `ethabi::Token::Bool(${name})`;
-	if (type == "string")
-		return `ethabi::Token::String(${name}.to_owned())`;
-	if (type == "bytes")
-		return `ethabi::Token::Bytes(${name}.to_owned())`;
-
-	console.log(`Unsupported argument type: ${type} (${name})`);
-}
-
-function tokenType(name, type, _prefs) {
-	let prefs = _prefs || {};
-	var m;
-	if ((m = type.match(/^bytes(\d+)$/)) != null && m[1] <= 32)
-		return `${name}.to_fixed_bytes()`;
-	if ((m = type.match(/^(u?)int(\d+)$/)) != null) {
-		return `${name}.to_${m[1]}int()`;
-	}
-	if (type == "address")
-		return `${name}.to_address()`;
-	if (type == "bool")
-		return `${name}.to_bool()`;
-	if (type == "string")
-		return `${name}.to_string()`;
-	if (type == "bytes")
-		return `${name}.to_bytes()`;
-	if (type == "address[]")
-		return `${name}.to_array().and_then(|v| v.into_iter().map(|a| a.to_address()).collect::<Option<Vec<[u8; 20]>>>())`;
-
-	console.log(`Unsupported return type: ${type} (${name})`);
-}
-
-function tokenCoerce(name, type, _prefs) {
-	let prefs = _prefs || {};
-	var m;
-	if ((m = type.match(/^bytes(\d+)$/)) != null && m[1] <= 32) {
-		if (prefs['string'])
-			return `String::from_utf8(${name}).unwrap_or_else(String::new)`;
-		else
-			return `util::H${m[1] * 8}::from_slice(${name}.as_ref())`;
-	}
-	if ((m = type.match(/^(u?)int(\d+)$/)) != null) {
-		var n = [8, 16, 32, 64, 128, 160, 256].filter(i => m[2] <= i)[0];
-		if (n && m[1] == 'u')
-			return `util::U${n <= 64 ? 256 : n}::from(${name}.as_ref())` + (n <= 64 ? `.as_u64() as u${n}` : '');
-		// ERROR - unsupported integer (signed or unsigned > 256)
-	}
-	if (type == "address")
-		return `util::Address::from(${name})`;
-	if (type == "bool")
-		return `${name}`;
-	if (type == "string")
-		return `${name}`;
-	if (type == "bytes")
-		return `${name}`;
-	if (type == "address[]")
-		return `${name}.into_iter().map(|a| util::Address::from(a)).collect::<Vec<_>>()`;
-
-	console.log(`Unsupported return type: ${type} (${name})`);
-}
-
-function tokenExtract(expr, type, _prefs) {
-	return `{ let r = ${expr}; let r = ${tokenType('r', type, _prefs)}.ok_or("Invalid type returned")?; ${tokenCoerce('r', type, _prefs)} }`;
-}
-
-function convertFunction(json, _prefs) {
-	let cprefs = _prefs || {};
-	let prefs = (_prefs || {})[json.name] || (_prefs || {})['_'] || {};
-	let snakeName = json.name.toSnake();
-	let params = json.inputs.map((x, i) => (x.name ? x.name.toSnake() : ("_" + (i + 1))) + ": " + mapType(x.name, x.type, prefs[x.name]));
-	let returns = json.outputs.length != 1 ? "(" + json.outputs.map(x => mapReturnType(x.name, x.type, prefs[x.name])).join(", ") + ")" : mapReturnType(json.outputs[0].name, json.outputs[0].type, prefs[json.outputs[0].name]);
-	return `
-	/// Auto-generated from: \`${JSON.stringify(json)}\`
-	#[allow(dead_code)]
-	pub fn ${snakeName}${cprefs._explicit_do_call ? "<F>" : ""}(&self${cprefs._explicit_do_call ? `, do_call: &F` : ""}${params.length > 0 ? ', ' + params.join(", ") : ''}) -> Result<${returns}, String>
-		${cprefs._explicit_do_call ? `where F: Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send ${prefs._sync ? "+ Sync " : ""}` : ""} {
-		let call = self.contract.function("${json.name}".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![${json.inputs.map((x, i) => convertToken(x.name ? x.name.toSnake() : ("_" + (i + 1)), x.type, prefs[x.name])).join(', ')}]
-		).map_err(Self::as_string)?;
-		${json.outputs.length > 0 ? 'let output = ' : ''}call.decode_output((${cprefs._explicit_do_call ? "" : "self."}do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		${json.outputs.length > 0 ? 'let mut result = output.into_iter().rev().collect::<Vec<_>>();' : ''}
-		Ok((${json.outputs.map((o, i) => tokenExtract('result.pop().ok_or("Invalid return arity")?', o.type, prefs[o.name])).join(', ')}))
-	}`;
-}
-
-// default preferences:
-let prefs = {"_pub": true, "_": {"_client": {"string": true}, "_platform": {"string": true}}, "_sync": true};
-// default contract json ABI
-let jsonabi = [{"constant":true,"inputs":[],"name":"getValidators","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"}];
-// default name
-let name = 'Contract';
-
-// parse command line options
-for (let i = 1; i < process.argv.length; ++i) {
-	let arg = process.argv[i];
-	if (arg.indexOf("--jsonabi=") == 0) {
-		jsonabi = arg.slice(10);
-		if (fs.existsSync(jsonabi)) {
-			jsonabi = JSON.parse(fs.readFileSync(jsonabi).toString());
-		}
-	} else if (arg.indexOf("--explicit-do-call") == 0) {
-		prefs._explicit_do_call = true;
-	} else if (arg.indexOf("--name=") == 0) {
-		name = arg.slice(7);
-	}
-}
-
-let out = makeContractFile(name, jsonabi, prefs);
-console.log(`${out}`);
diff --git a/scripts/cov.sh b/scripts/cov.sh
index 9be89a3df33ae5d4d2f2c5b2a75350b68f09c0b7..80fe045ca1244759e2549883bf34213c9b186f2c 100755
--- a/scripts/cov.sh
+++ b/scripts/cov.sh
@@ -12,42 +12,21 @@
 ### Running coverage
 
 set -x
-
-KCOV=${1:-kcov}
-
-if ! type $KCOV > /dev/null; then
-   	echo "Install kcov first (details inside this file). Aborting."
-	exit 1
-fi
-
-RUSTFLAGS="-C link-dead-code" cargo test --all --exclude parity-ipfs-api --exclude evmjit --no-run || exit $?
-
-
+cargo test --all --exclude evmjit --no-run || exit $?
 KCOV_TARGET="target/cov"
 KCOV_FLAGS="--verify"
-EXCLUDE="/usr/lib,\
-/usr/include,\
-$HOME/.cargo,\
-$HOME/.multirust,\
-rocksdb,\
-secp256k1
-"
-
-rm -rf $KCOV_TARGET
+EXCLUDE="/usr/lib,/usr/include,$HOME/.cargo,$HOME/.multirust,rocksdb,secp256k1"
 mkdir -p $KCOV_TARGET
 echo "Cover RUST"
 for FILE in `find target/debug/deps ! -name "*.*"`
-do
-	$KCOV --exclude-pattern $EXCLUDE $KCOV_FLAGS $KCOV_TARGET $FILE
-done
-
-$KCOV --exclude-pattern $EXCLUDE $KCOV_FLAGS $KCOV_TARGET target/debug/parity-*
+  do
+   timeout --signal=SIGKILL 5m kcov --exclude-pattern $EXCLUDE $KCOV_FLAGS $KCOV_TARGET $FILE
+  done
+timeout --signal=SIGKILL 5m kcov --exclude-pattern $EXCLUDE $KCOV_FLAGS $KCOV_TARGET target/debug/parity-*
 echo "Cover JS"
 cd js
 npm install&&npm run test:coverage
 cd ..
-codecov
 bash <(curl -s https://codecov.io/bash)&&
 echo "Uploaded code coverage"
-
 exit 0
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
deleted file mode 100755
index 3fcd05f7f19672635facd671df54bc8ec32f1b24..0000000000000000000000000000000000000000
--- a/scripts/deploy.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-ll
-ls
-la
-echo "list of biniries"
-exit
diff --git a/scripts/fmt.sh b/scripts/fmt.sh
deleted file mode 100755
index 624b404ffcf8822c6278323933f9119e9470c7c5..0000000000000000000000000000000000000000
--- a/scripts/fmt.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-RUSTFMT="rustfmt --write-mode overwrite"
-
-$RUSTFMT ./ethash/src/lib.rs
-$RUSTFMT ./ethcore/src/lib.rs
-$RUSTFMT ./evmjit/src/lib.rs
-$RUSTFMT ./json/src/lib.rs
-$RUSTFMT ./miner/src/lib.rs
-$RUSTFMT ./parity/main.rs
-$RUSTFMT ./rpc/src/lib.rs
-$RUSTFMT ./signer/src/lib.rs
-$RUSTFMT ./dapps/src/lib.rs
-$RUSTFMT ./sync/src/lib.rs
-$RUSTFMT ./util/src/lib.rs
-
diff --git a/scripts/gitlab-build.sh b/scripts/gitlab-build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a2a084adc9b2effeed8b88c0c6a151bb3ddf5e8a
--- /dev/null
+++ b/scripts/gitlab-build.sh
@@ -0,0 +1,351 @@
+#!/bin/bash
+
+set -e # fail on any error
+set -u # treat unset variables as error
+#ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags 6. binary identifier
+BUILD_PLATFORM=$1
+PLATFORM=$2
+ARC=$3
+CC=$4
+CXX=$5
+IDENT=$6
+VER="$(grep -m 1 "version =" Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")"
+S3WIN=""
+echo "--------------------"
+echo "Build for platform: " $BUILD_PLATFORM
+echo "Build identifier:   " $IDENT
+echo "Cargo target:       " $PLATFORM
+echo "CC&CXX flags:       " $CC ", " $CXX
+echo "Architecture:       " $ARC
+echo "Libssl version:     " $LIBSSL
+echo "Parity version:     " $VER
+echo "Branch:             " $CI_BUILD_REF_NAME
+echo "--------------------"
+
+# NOTE for md5 and sha256 we want to display filename as well
+# hence we use --* instead of -p *
+MD5_BIN="rhash --md5"
+SHA256_BIN="rhash --sha256"
+
+set_env () {
+  echo "Set ENVIROMENT"
+  export HOST_CC=gcc
+  export HOST_CXX=g++
+  rm -rf .cargo
+  mkdir -p .cargo
+  echo "[target.$PLATFORM]" >> .cargo/config
+  echo "linker= \"$CC\"" >> .cargo/config
+  cat .cargo/config
+}
+set_env_win () {
+  set PLATFORM=x86_64-pc-windows-msvc
+  set INCLUDE="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt"
+  set LIB="C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64"
+  set RUST_BACKTRACE=1
+  #export RUSTFLAGS=$RUSTFLAGS
+  rustup default stable-x86_64-pc-windows-msvc
+  echo "MsBuild.exe windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release" > msbuild.cmd
+  echo "@ signtool sign /f "\%"1 /p "\%"2 /tr http://timestamp.comodoca.com /du https://parity.io "\%"3" > sign.cmd
+}
+build () {
+  if [[ "windows" = $IDENT ]]
+  then
+    # This is a nasty hack till we figure out the proper cargo caching strategy
+    echo "Remove index"
+    rm -rf cargo/registry/index/*.
+  fi
+  echo "Build parity:"
+  cargo build --target $PLATFORM --features final --release
+  echo "Build evmbin:"
+  cargo build --target $PLATFORM --release -p evmbin
+  echo "Build ethstore-cli:"
+  cargo build --target $PLATFORM --release -p ethstore-cli
+  echo "Build ethkey-cli:"
+  cargo build --target $PLATFORM --release -p ethkey-cli
+}
+strip_binaries () {
+  echo "Strip binaries:"
+  $STRIP_BIN -v target/$PLATFORM/release/parity
+  $STRIP_BIN -v target/$PLATFORM/release/parity-evm
+  $STRIP_BIN -v target/$PLATFORM/release/ethstore
+  $STRIP_BIN -v target/$PLATFORM/release/ethkey;
+}
+calculate_checksums () {
+  echo "Checksum calculation:"
+  rhash --version
+
+  rm -rf *.md5
+  rm -rf *.sha256
+
+  BIN="target/$PLATFORM/release/parity$S3WIN"
+  export SHA3="$($BIN tools hash $BIN)"
+
+  echo "Parity file SHA3: $SHA3"
+  $MD5_BIN target/$PLATFORM/release/parity$S3WIN > parity$S3WIN.md5
+  $SHA256_BIN target/$PLATFORM/release/parity$S3WIN > parity$S3WIN.sha256
+  $MD5_BIN target/$PLATFORM/release/parity-evm$S3WIN > parity-evm$S3WIN.md5
+  $SHA256_BIN target/$PLATFORM/release/parity-evm$S3WIN > parity-evm$S3WIN.sha256
+  $MD5_BIN target/$PLATFORM/release/ethstore$S3WIN > ethstore$S3WIN.md5
+  $SHA256_BIN target/$PLATFORM/release/ethstore$S3WIN > ethstore$S3WIN.sha256
+  $MD5_BIN target/$PLATFORM/release/ethkey$S3WIN > ethkey$S3WIN.md5
+  $SHA256_BIN target/$PLATFORM/release/ethkey$S3WIN > ethkey$S3WIN.sha256
+}
+make_deb () {
+  rm -rf deb
+  echo "create DEBIAN files"
+  mkdir -p deb/usr/bin/
+  mkdir -p deb/DEBIAN
+  echo "create copyright, docs, compat"
+  cp LICENSE deb/DEBIAN/copyright
+  echo "https://github.com/paritytech/parity/wiki" >> deb/DEBIAN/docs
+  echo "8" >> deb/DEBIAN/compat
+  echo "create control file"
+  control=deb/DEBIAN/control
+  echo "Package: parity" >> $control
+  echo "Version: $VER" >> $control
+  echo "Source: parity" >> $control
+  echo "Section: science" >> $control
+  echo "Priority: extra" >> $control
+  echo "Maintainer: Parity Technologies <devops@parity.io>" >> $control
+  echo "Build-Depends: debhelper (>=9)" >> $control
+  echo "Standards-Version: 3.9.5" >> $control
+  echo "Homepage: https://parity.io" >> $control
+  echo "Vcs-Git: git://github.com/paritytech/parity.git" >> $control
+  echo "Vcs-Browser: https://github.com/paritytech/parity" >> $control
+  echo "Architecture: $ARC" >> $control
+  echo "Depends: $LIBSSL" >> $control
+  echo "Description: Ethereum network client by Parity Technologies" >> $control
+  size=`du deb/|awk 'END {print $1}'`
+  echo "Installed-Size: $size" >> $control
+  echo "build .deb package"
+  cp target/$PLATFORM/release/parity deb/usr/bin/parity
+  cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
+  cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
+  cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
+  dpkg-deb -b deb "parity_"$VER"_"$IDENT"_"$ARC".deb"
+  $MD5_BIN "parity_"$VER"_"$IDENT"_"$ARC".deb" > "parity_"$VER"_"$IDENT"_"$ARC".deb.md5"
+  $SHA256_BIN "parity_"$VER"_"$IDENT"_"$ARC".deb" > "parity_"$VER"_"$IDENT"_"$ARC".deb.sha256"
+}
+make_rpm () {
+  rm -rf /install
+  mkdir -p /install/usr/bin
+  cp target/$PLATFORM/release/parity /install/usr/bin
+  cp target/$PLATFORM/release/parity-evm /install/usr/bin/parity-evm
+  cp target/$PLATFORM/release/ethstore /install/usr/bin/ethstore
+  cp target/$PLATFORM/release/ethkey /install/usr/bin/ethkey
+
+  rm -rf "parity-"$VER"-1."$ARC".rpm" || true
+  fpm -s dir -t rpm -n parity -v $VER --epoch 1 --license GPLv3 -d openssl --provides parity --url https://parity.io --vendor "Parity Technologies" -a x86_64 -m "<devops@parity.io>" --description "Ethereum network client by Parity Technologies" -C /install/
+  cp "parity-"$VER"-1."$ARC".rpm" "parity_"$VER"_"$IDENT"_"$ARC".rpm"
+  $MD5_BIN "parity_"$VER"_"$IDENT"_"$ARC".rpm" > "parity_"$VER"_"$IDENT"_"$ARC".rpm.md5"
+  $SHA256_BIN "parity_"$VER"_"$IDENT"_"$ARC".rpm" > "parity_"$VER"_"$IDENT"_"$ARC".rpm.sha256"
+}
+make_pkg () {
+  echo "make PKG"
+  cp target/$PLATFORM/release/parity target/release/parity
+  cp target/$PLATFORM/release/parity-evm target/release/parity-evm
+  cp target/$PLATFORM/release/ethstore target/release/ethstore
+  cp target/$PLATFORM/release/ethkey target/release/ethkey
+  cd mac
+  xcodebuild -configuration Release
+  cd ..
+  packagesbuild -v mac/Parity.pkgproj
+  productsign --sign 'Developer ID Installer: PARITY TECHNOLOGIES LIMITED (P2PX3JU8FT)' target/release/Parity\ Ethereum.pkg target/release/Parity\ Ethereum-signed.pkg
+  mv target/release/Parity\ Ethereum-signed.pkg "parity_"$VER"_"$IDENT"_"$ARC".pkg"
+  $MD5_BIN "parity_"$VER"_"$IDENT"_"$ARC"."$EXT >> "parity_"$VER"_"$IDENT"_"$ARC".pkg.md5"
+  $SHA256_BIN "parity_"$VER"_"$IDENT"_"$ARC"."$EXT >> "parity_"$VER"_"$IDENT"_"$ARC".pkg.sha256"
+}
+sign_exe () {
+  ./sign.cmd $keyfile $certpass "target/$PLATFORM/release/parity.exe"
+}
+make_exe () {
+  ./msbuild.cmd
+  ./sign.cmd $keyfile $certpass windows/ptray/x64/release/ptray.exe
+  cd nsis
+  curl -sL --url "https://github.com/paritytech/win-build/raw/master/vc_redist.x64.exe" -o vc_redist.x64.exe
+  echo "makensis.exe installer.nsi" > nsis.cmd
+  ./nsis.cmd
+  cd ..
+  cp nsis/installer.exe "parity_"$VER"_"$IDENT"_"$ARC"."$EXT
+  ./sign.cmd $keyfile $certpass "parity_"$VER"_"$IDENT"_"$ARC"."$EXT
+  $MD5_BIN "parity_"$VER"_"$IDENT"_"$ARC"."$EXT -p %h > "parity_"$VER"_"$IDENT"_"$ARC"."$EXT".md5"
+  $SHA256_BIN "parity_"$VER"_"$IDENT"_"$ARC"."$EXT -p %h > "parity_"$VER"_"$IDENT"_"$ARC"."$EXT".sha256"
+}
+push_binaries () {
+  echo "Push binaries to AWS S3"
+  aws configure set aws_access_key_id $s3_key
+  aws configure set aws_secret_access_key $s3_secret
+  if [[ "$CI_BUILD_REF_NAME" = "master" || "$CI_BUILD_REF_NAME" = "beta" || "$CI_BUILD_REF_NAME" = "stable" || "$CI_BUILD_REF_NAME" = "nightly" ]];
+  then
+    export S3_BUCKET=builds-parity-published;
+  else
+    export S3_BUCKET=builds-parity;
+  fi
+  aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$BUILD_PLATFORM
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity$S3WIN --body target/$PLATFORM/release/parity$S3WIN
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity$S3WIN.md5 --body parity$S3WIN.md5
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity$S3WIN.sha256 --body parity$S3WIN.sha256
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity-evm$S3WIN --body target/$PLATFORM/release/parity-evm$S3WIN
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity-evm$S3WIN.md5 --body parity-evm$S3WIN.md5
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/parity-evm$S3WIN.sha256 --body parity-evm$S3WIN.sha256
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethstore$S3WIN --body target/$PLATFORM/release/ethstore$S3WIN
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethstore$S3WIN.md5 --body ethstore$S3WIN.md5
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethstore$S3WIN.sha256 --body ethstore$S3WIN.sha256
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethkey$S3WIN --body target/$PLATFORM/release/ethkey$S3WIN
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethkey$S3WIN.md5 --body ethkey$S3WIN.md5
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/ethkey$S3WIN.sha256 --body ethkey$S3WIN.sha256
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/"parity_"$VER"_"$IDENT"_"$ARC"."$EXT --body "parity_"$VER"_"$IDENT"_"$ARC"."$EXT
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/"parity_"$VER"_"$IDENT"_"$ARC"."$EXT".md5" --body "parity_"$VER"_"$IDENT"_"$ARC"."$EXT".md5"
+  aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/"parity_"$VER"_"$IDENT"_"$ARC"."$EXT".sha256" --body "parity_"$VER"_"$IDENT"_"$ARC"."$EXT".sha256"
+}
+make_archive () {
+  echo "add artifacts to archive"
+  rm -rf parity.zip
+  zip -r parity.zip target/$PLATFORM/release/parity$S3WIN target/$PLATFORM/release/parity-evm$S3WIN target/$PLATFORM/release/ethstore$S3WIN target/$PLATFORM/release/ethkey$S3WIN parity$S3WIN.md5 parity-evm$S3WIN.md5 ethstore$S3WIN.md5 ethkey$S3WIN.md5 parity$S3WIN.sha256 parity-evm$S3WIN.sha256 ethstore$S3WIN.sha256 ethkey$S3WIN.sha256
+}
+
+updater_push_release () {
+  echo "push release"
+
+  DATA="commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity$S3WIN&secret=$RELEASES_SECRET"
+  # Mainnet
+  source scripts/safe_curl.sh $DATA "http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$BUILD_PLATFORM"
+  # Kovan
+  source scripts/safe_curl.sh $DATA "http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$BUILD_PLATFORM"
+}
+
+case $BUILD_PLATFORM in
+  x86_64-unknown-linux-gnu)
+    #set strip bin
+    STRIP_BIN="strip"
+    #package extention
+    EXT="deb"
+    build
+    strip_binaries
+    calculate_checksums
+    make_deb
+    make_archive
+    push_binaries
+    updater_push_release
+    ;;
+  x86_64-unknown-debian-gnu)
+    STRIP_BIN="strip"
+    EXT="deb"
+    LIBSSL="libssl1.1 (>=1.1.0)"
+    echo "Use libssl1.1 (>=1.1.0) for Debian builds"
+    build
+    strip_binaries
+    calculate_checksums
+    make_deb
+    make_archive
+    push_binaries
+    ;;
+  x86_64-unknown-centos-gnu)
+    STRIP_BIN="strip"
+    EXT="rpm"
+    build
+    strip_binaries
+    calculate_checksums
+    make_rpm
+    make_archive
+    push_binaries
+    ;;
+  i686-unknown-linux-gnu)
+    STRIP_BIN="strip"
+    EXT="deb"
+    set_env
+    build
+    strip_binaries
+    calculate_checksums
+    make_deb
+    make_archive
+    push_binaries
+    ;;
+  armv7-unknown-linux-gnueabihf)
+    STRIP_BIN="arm-linux-gnueabihf-strip"
+    EXT="deb"
+    set_env
+    build
+    strip_binaries
+    calculate_checksums
+    make_deb
+    make_archive
+    push_binaries
+    ;;
+  arm-unknown-linux-gnueabihf)
+    STRIP_BIN="arm-linux-gnueabihf-strip"
+    EXT="deb"
+    set_env
+    build
+    strip_binaries
+    calculate_checksums
+    make_deb
+    make_archive
+    push_binaries
+    ;;
+  aarch64-unknown-linux-gnu)
+    STRIP_BIN="aarch64-linux-gnu-strip"
+    EXT="deb"
+    set_env
+    build
+    strip_binaries
+    calculate_checksums
+    make_deb
+    make_archive
+    push_binaries
+    ;;
+  x86_64-apple-darwin)
+    STRIP_BIN="strip"
+    PLATFORM="x86_64-apple-darwin"
+    EXT="pkg"
+    build
+    strip_binaries
+    calculate_checksums
+    make_pkg
+    make_archive
+    push_binaries
+    updater_push_release
+    ;;
+  x86_64-unknown-snap-gnu)
+    ARC="amd64"
+    EXT="snap"
+    apt install -y expect zip rhash
+    snapcraft clean
+    echo "Prepare snapcraft.yaml for build on Gitlab CI in Docker image"
+    sed -i 's/git/'"$VER"'/g' snap/snapcraft.yaml
+    if [[ "$CI_BUILD_REF_NAME" = "beta" || "$VER" == *1.10* ]];
+      then
+        sed -i -e 's/grade: devel/grade: stable/' snap/snapcraft.yaml;
+    fi
+    mv -f snap/snapcraft.yaml snapcraft.yaml
+    snapcraft -d
+    snapcraft_login=$(expect -c "
+      spawn snapcraft login
+      expect \"Email:\"
+      send \"$SNAP_EMAIL\n\"
+      expect \"Password:\"
+      send \"$SNAP_PASS\n\"
+      expect \"\$\"
+      ")
+    echo "$snapcraft_login"
+    snapcraft push "parity_"$VER"_amd64.snap"
+    snapcraft status parity
+    snapcraft logout
+    $MD5_BIN "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5"
+    $SHA256_BIN "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.sha256"
+    echo "add artifacts to archive"
+    rm -rf parity.zip
+    zip -r parity.zip "parity_"$VER"_amd64.snap" "parity_"$VER"_amd64.snap.md5" "parity_"$VER"_amd64.snap.sha256"
+    ;;
+  x86_64-pc-windows-msvc)
+    set_env_win
+    EXT="exe"
+    S3WIN=".exe"
+    build
+    sign_exe
+    calculate_checksums
+    make_exe
+    make_archive
+    push_binaries
+    updater_push_release
+esac
diff --git a/scripts/gitlab-push-release.sh b/scripts/gitlab-push-release.sh
new file mode 100755
index 0000000000000000000000000000000000000000..275576b91ecd1c0a8eaeb253b34f412ca535a564
--- /dev/null
+++ b/scripts/gitlab-push-release.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e # fail on any error
+set -u # treat unset variables as error
+
+DATA="secret=$RELEASES_SECRET"
+
+echo "Pushing release to Mainnet"
+./scripts/safe_curl.sh $DATA "http://update.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF"
+
+echo "Pushing release to Kovan"
+./scripts/safe_curl.sh $DATA "http://update.parity.io:1338/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF"
diff --git a/scripts/gitlab-test.sh b/scripts/gitlab-test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..812317a2704fe29b1554277680e41d10006f98eb
--- /dev/null
+++ b/scripts/gitlab-test.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+#ARGUMENT test for RUST and COVERAGE
+set -e # fail on any error
+set -u # treat unset variables as error
+if [[ "$CI_COMMIT_REF_NAME" = "beta" || "$CI_COMMIT_REF_NAME" = "stable" ]]; then
+  export GIT_COMPARE=$CI_COMMIT_REF_NAME~;
+else
+  export GIT_COMPARE=master;
+fi
+export RUST_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep -v -e ^\\. -e ^LICENSE -e ^README.md -e ^test.sh -e ^windows/ -e ^scripts/ -e ^mac/ -e ^nsis/ | wc -l)"
+echo "RUST_FILES_MODIFIED: $RUST_FILES_MODIFIED"
+echo "RUST_FILES_MODIFIED: $RUST_FILES_MODIFIED"
+TEST_SWITCH=$1
+rust_test () {
+  git submodule update --init --recursive
+  rustup show
+  if [[ "${RUST_FILES_MODIFIED}" == "0" ]];
+    then echo "Skipping Rust tests since no Rust files modified.";
+    else ./test.sh || exit $?;
+  fi
+  # if [[ "$CI_COMMIT_REF_NAME" == "nightly" ]];
+  #   ### @TODO re-enable fail after https://github.com/paritytech/parity-import-tests/issues/3
+  #   then sh scripts/aura-test.sh; # || exit $?;
+  # fi
+}
+coverage_test () {
+  git submodule update --init --recursive
+  rm -rf target/*
+  scripts/cov.sh
+}
+case $TEST_SWITCH in
+  stable )
+    rustup default stable
+    rust_test
+    ;;
+  beta)
+    rustup default beta
+    rust_test
+    ;;
+  nightly)
+    rustup default nightly
+    rust_test
+    ;;
+  test-coverage)
+    coverage_test
+    ;;
+esac
diff --git a/scripts/parity.service b/scripts/parity.service
index 31d9011eabcb26bddf96839e2a86199936f68115..3d1f4a3da1e270f0399da7b52eb3fbb7437aff1c 100644
--- a/scripts/parity.service
+++ b/scripts/parity.service
@@ -3,8 +3,18 @@ Description=Parity Daemon
 After=network.target
 
 [Service]
-EnvironmentFile=-%h/.parity/parity.conf
-ExecStart=/usr/bin/parity $ARGS
+# run as root, set base_path in config.toml
+ExecStart=/usr/bin/parity --config /etc/parity/config.toml
+# To run as user, comment out above and uncomment below, fill in user and group
+# picks up users default config.toml in $HOME/.local/share/io.parity.ethereum/
+# User=username
+# Group=groupname
+# ExecStart=/usr/bin/parity
+Restart=on-failure
+
+# Specifies which signal to use when killing a service. Defaults to SIGTERM.
+# SIGHUP gives parity time to exit cleanly before SIGKILL (default 90s)
+KillSignal=SIGHUP
 
 [Install]
 WantedBy=default.target
diff --git a/scripts/safe_curl.sh b/scripts/safe_curl.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5990d1e24b358577b29908669b5d5b8aafe815be
--- /dev/null
+++ b/scripts/safe_curl.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -eu
+
+DATA=$1
+ADDRESS=$2
+
+CODE=$(curl -o out.txt -w '%{http_code}' --data $DATA $ADDRESS)
+cat out.txt && rm out.txt
+echo "\n"
+
+if [[ $CODE -eq 200 ]]; then
+	echo 'Pushed to updater service.';
+elif [[ $CODE -eq 202 ]]; then
+	echo 'Updater service ignored request.';
+else
+	echo 'Unable to push info to updater service.';
+	exit 2
+fi
+
diff --git a/scripts/snapcraft.yaml b/scripts/snapcraft.yaml
deleted file mode 100644
index bd71df3de693c6dbd434a8109c6bb744ccaf1637..0000000000000000000000000000000000000000
--- a/scripts/snapcraft.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: parity
-version: master
-summary: Fast, light, robust Ethereum implementation
-description: |
-  Parity's goal is to be the fastest, lightest, and most secure Ethereum
-  client. We are developing Parity using the sophisticated and cutting-edge
-  Rust programming language. Parity is licensed under the GPLv3, and can be
-  used for all your Ethereum needs.
-
-grade: devel
-confinement: strict
-
-apps:
-  parity:
-    command: parity
-    plugs: [network, network-bind]
-
-parts:
-  parity:
-    source: ..
-    plugin: rust
-    build-packages: [g++, libudev-dev, libssl-dev, make, pkg-config]
\ No newline at end of file
diff --git a/secret_store/Cargo.toml b/secret_store/Cargo.toml
index 19f342aa95f1e3adf02837e6c200011965846415..10b690b6d99b27667be4f45e9526f6da24e6c047 100644
--- a/secret_store/Cargo.toml
+++ b/secret_store/Cargo.toml
@@ -4,15 +4,11 @@ name = "ethcore-secretstore"
 version = "1.0.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[build-dependencies]
-ethcore-ipc-codegen = { path = "../ipc/codegen" }
 
 [dependencies]
 byteorder = "1.0"
 log = "0.3"
-parking_lot = "0.4"
+parking_lot = "0.5"
 hyper = { version = "0.10", default-features = false }
 serde = "1.0"
 serde_json = "1.0"
@@ -20,19 +16,26 @@ serde_derive = "1.0"
 futures = "0.1"
 futures-cpupool = "0.1"
 rustc-hex = "1.0"
+tiny-keccak = "1.3"
 tokio-core = "0.1.6"
 tokio-io = "0.1.0"
 tokio-service = "0.1"
 tokio-proto = "0.1"
 url = "1.0"
-ethabi = "2.0"
 ethcore = { path = "../ethcore" }
-ethcore-devtools = { path = "../devtools" }
-ethcore-util = { path = "../util" }
-ethcore-ipc = { path = "../ipc/rpc" }
-ethcore-ipc-nano = { path = "../ipc/nano" }
+ethcore-bytes = { path = "../util/bytes" }
+ethereum-types = "0.2"
+ethsync = { path = "../sync" }
+kvdb = { path = "../util/kvdb" }
+kvdb-rocksdb = { path = "../util/kvdb-rocksdb" }
+keccak-hash = { path = "../util/hash" }
 ethcore-logger = { path = "../logger" }
 ethcrypto = { path = "../ethcrypto" }
 ethkey = { path = "../ethkey" }
-native-contracts = { path = "../ethcore/native_contracts" }
-lazy_static = "0.2"
+lazy_static = "1.0"
+ethabi = "5.1"
+ethabi-derive = "5.0"
+ethabi-contract = "5.0"
+
+[dev-dependencies]
+tempdir = "0.3"
diff --git a/secret_store/build.rs b/secret_store/build.rs
deleted file mode 100644
index b2b27ea1ee60948127728b49d5152d04f622525d..0000000000000000000000000000000000000000
--- a/secret_store/build.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate ethcore_ipc_codegen;
-
-fn main() {
-	ethcore_ipc_codegen::derive_binary("src/types/mod.rs.in").unwrap();
-	ethcore_ipc_codegen::derive_ipc_cond("src/traits.rs", cfg!(feature="ipc")).unwrap();
-}
diff --git a/ethcore/native_contracts/res/secretstore_acl_storage.json b/secret_store/res/acl_storage.json
similarity index 100%
rename from ethcore/native_contracts/res/secretstore_acl_storage.json
rename to secret_store/res/acl_storage.json
diff --git a/secret_store/res/key_server_set.json b/secret_store/res/key_server_set.json
new file mode 100644
index 0000000000000000000000000000000000000000..0fb9502b1143d3d9a08081410e0f4fe5bf59a314
--- /dev/null
+++ b/secret_store/res/key_server_set.json
@@ -0,0 +1 @@
+[{"constant":true,"inputs":[],"name":"getMigrationMaster","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"keyServer","type":"address"}],"name":"getMigrationKeyServerPublic","outputs":[{"name":"","type":"bytes"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"id","type":"bytes32"}],"name":"startMigration","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"keyServer","type":"address"}],"name":"getMigrationKeyServerAddress","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getMigrationId","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getNewKeyServers","outputs":[{"name":"","type":"address[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"id","type":"bytes32"}],"name":"confirmMigration","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"getMigrationKeyServers","outputs":[{"name":"","type":"address[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"keyServer","type":"address"}],"name":"isMigrationConfirmed","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getCurrentKeyServers","outputs":[{"name":"","type":"address[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"keyServer","type":"address"}],"name":"getCurrentKeyServerPublic","outputs":[{"name":"","type":"bytes"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"keyServer","type":"address"}],"name":"getNewKeyServerAddress","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"keyServer","type":"address"}],"name":"getCurrentKeyServerAddress","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"keyServer","type":"address"}],"name":"getNewKeyServerPublic","outputs":[{"name":"","type":"bytes"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"keyServer","type":"address"}],"name":"KeyServerAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"keyServer","type":"address"}],"name":"KeyServerRemoved","type":"event"},{"anonymous":false,"inputs":[],"name":"MigrationStarted","type":"event"},{"anonymous":false,"inputs":[],"name":"MigrationCompleted","type":"event"}]
\ No newline at end of file
diff --git a/secret_store/res/service.json b/secret_store/res/service.json
new file mode 100644
index 0000000000000000000000000000000000000000..37d45350b2a34ee8f730a2a9762150bb9d629cdb
--- /dev/null
+++ b/secret_store/res/service.json
@@ -0,0 +1,8 @@
+[
+	{"constant":true,"inputs":[],"name":"serverKeyGenerationRequestsCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},
+	{"constant":true,"inputs":[{"name":"index","type":"uint256"}],"name":"getServerKeyId","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},
+	{"constant":false,"inputs":[{"name":"serverKeyId","type":"bytes32"},{"name":"serverKeyPublic","type":"bytes"},{"name":"v","type":"uint8"},{"name":"r","type":"bytes32"},{"name":"s","type":"bytes32"}],"name":"serverKeyGenerated","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},
+	{"constant":true,"inputs":[{"name":"serverKeyId","type":"bytes32"}],"name":"getServerKeyThreshold","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},
+	{"constant":true,"inputs":[{"name":"serverKeyId","type":"bytes32"},{"name":"authority","type":"address"}],"name":"getServerKeyConfirmationStatus","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},
+	{"anonymous":false,"inputs":[{"indexed":true,"name":"serverKeyId","type":"bytes32"},{"indexed":true,"name":"threshold","type":"uint256"}],"name":"ServerKeyRequested","type":"event"}
+]
\ No newline at end of file
diff --git a/secret_store/src/acl_storage.rs b/secret_store/src/acl_storage.rs
index 5b8284c6fffde6e9670ff7d82042efc668b5435c..f3d116145f842eedee2c3dca7d1c572b38949910 100644
--- a/secret_store/src/acl_storage.rs
+++ b/secret_store/src/acl_storage.rs
@@ -14,16 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::sync::{Arc, Weak};
+use std::sync::Arc;
 use std::collections::{HashMap, HashSet};
-use futures::{future, Future};
 use parking_lot::{Mutex, RwLock};
 use ethkey::public_to_address;
-use ethcore::client::{Client, BlockChainClient, BlockId, ChainNotify};
-use native_contracts::SecretStoreAclStorage;
-use util::{H256, Address, Bytes};
+use ethcore::client::{BlockId, ChainNotify, CallContract, RegistryInfo};
+use ethereum_types::{H256, Address};
+use bytes::Bytes;
+use trusted_client::TrustedClient;
 use types::all::{Error, ServerKeyId, Public};
 
+use_contract!(acl_storage, "AclStorage", "res/acl_storage.json");
+
 const ACL_CHECKER_CONTRACT_REGISTRY_NAME: &'static str = "secretstore_acl_checker";
 
 /// ACL storage of Secret Store
@@ -41,11 +43,11 @@ pub struct OnChainAclStorage {
 /// Cached on-chain ACL storage contract.
 struct CachedContract {
 	/// Blockchain client.
-	client: Weak<Client>,
+	client: TrustedClient,
 	/// Contract address.
 	contract_addr: Option<Address>,
 	/// Contract at given address.
-	contract: Option<SecretStoreAclStorage>,
+	contract: acl_storage::AclStorage,
 }
 
 /// Dummy ACL storage implementation (check always passed).
@@ -55,12 +57,15 @@ pub struct DummyAclStorage {
 }
 
 impl OnChainAclStorage {
-	pub fn new(client: &Arc<Client>) -> Arc<Self> {
+	pub fn new(trusted_client: TrustedClient) -> Result<Arc<Self>, Error> {
+		let client = trusted_client.get_untrusted();
 		let acl_storage = Arc::new(OnChainAclStorage {
-			contract: Mutex::new(CachedContract::new(client)),
+			contract: Mutex::new(CachedContract::new(trusted_client)),
 		});
-		client.add_notify(acl_storage.clone());
-		acl_storage
+		client
+			.ok_or(Error::Internal("Constructing OnChainAclStorage without active Client".into()))?
+			.add_notify(acl_storage.clone());
+		Ok(acl_storage)
 	}
 }
 
@@ -79,43 +84,42 @@ impl ChainNotify for OnChainAclStorage {
 }
 
 impl CachedContract {
-	pub fn new(client: &Arc<Client>) -> Self {
+	pub fn new(client: TrustedClient) -> Self {
 		CachedContract {
-			client: Arc::downgrade(client),
+			client,
 			contract_addr: None,
-			contract: None,
+			contract: acl_storage::AclStorage::default(),
 		}
 	}
 
 	pub fn update(&mut self) {
-		if let Some(client) = self.client.upgrade() {
-			let new_contract_addr = client.registry_address(ACL_CHECKER_CONTRACT_REGISTRY_NAME.to_owned());
-			if self.contract_addr.as_ref() != new_contract_addr.as_ref() {
-				self.contract = new_contract_addr.map(|contract_addr| {
-					trace!(target: "secretstore", "Configuring for ACL checker contract from {}", contract_addr);
-
-					SecretStoreAclStorage::new(contract_addr)
-				});
-
-				self.contract_addr = new_contract_addr;
+		if let Some(client) = self.client.get() {
+			match client.registry_address(ACL_CHECKER_CONTRACT_REGISTRY_NAME.to_owned(), BlockId::Latest) {
+				Some(new_contract_addr) if Some(new_contract_addr).as_ref() != self.contract_addr.as_ref() => {
+					trace!(target: "secretstore", "Configuring for ACL checker contract from {}", new_contract_addr);
+					self.contract_addr = Some(new_contract_addr);
+				},
+				Some(_) | None => ()
 			}
 		}
 	}
 
 	pub fn check(&mut self, public: &Public, document: &ServerKeyId) -> Result<bool, Error> {
-		match self.contract.as_ref() {
-			Some(contract) => {
-				let address = public_to_address(&public);
-				let do_call = |a, d| future::done(
-					self.client
-						.upgrade()
-						.ok_or("Calling contract without client".into())
-						.and_then(|c| c.call_contract(BlockId::Latest, a, d)));
-				contract.check_permissions(do_call, address, document.clone())
-					.map_err(|err| Error::Internal(err))
-					.wait()
-			},
-			None => Err(Error::Internal("ACL checker contract is not configured".to_owned())),
+		if let Some(client) = self.client.get() {
+			// call contract to check accesss
+			match self.contract_addr {
+				Some(contract_address) => {
+					let address = public_to_address(&public);
+					let do_call = |data| client.call_contract(BlockId::Latest, contract_address, data);
+					self.contract.functions()
+						.check_permissions()
+						.call(address, document.clone(), &do_call)
+						.map_err(|e| Error::Internal(e.to_string()))
+				},
+				None => Err(Error::Internal("ACL checker contract is not configured".to_owned())),
+			}
+		} else {
+			Err(Error::Internal("Calling ACL contract without trusted blockchain client".into()))
 		}
 	}
 }
diff --git a/secret_store/src/key_server.rs b/secret_store/src/key_server.rs
index f9fad19df7ecac5fa58b2435d837a24a4ff3971a..181df0caaf65cec360362218fdefdd9e7ac8c725 100644
--- a/secret_store/src/key_server.rs
+++ b/secret_store/src/key_server.rs
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::collections::BTreeSet;
 use std::thread;
 use std::sync::Arc;
 use std::sync::mpsc;
@@ -26,9 +27,9 @@ use super::acl_storage::AclStorage;
 use super::key_storage::KeyStorage;
 use super::key_server_set::KeyServerSet;
 use key_server_cluster::{math, ClusterCore};
-use traits::{ServerKeyGenerator, DocumentKeyServer, MessageSigner, KeyServer, NodeKeyPair};
+use traits::{AdminSessionsServer, ServerKeyGenerator, DocumentKeyServer, MessageSigner, KeyServer, NodeKeyPair};
 use types::all::{Error, Public, RequestSignature, ServerKeyId, EncryptedDocumentKey, EncryptedDocumentKeyShadow,
-	ClusterConfiguration, MessageHash, EncryptedMessageSignature};
+	ClusterConfiguration, MessageHash, EncryptedMessageSignature, NodeId};
 use key_server_cluster::{ClusterClient, ClusterConfiguration as NetClusterConfiguration};
 
 /// Secret store key server implementation
@@ -51,7 +52,6 @@ impl KeyServerImpl {
 		})
 	}
 
-	#[cfg(test)]
 	/// Get cluster client reference.
 	pub fn cluster(&self) -> Arc<ClusterClient> {
 		self.data.lock().cluster.clone()
@@ -60,6 +60,16 @@ impl KeyServerImpl {
 
 impl KeyServer for KeyServerImpl {}
 
+impl AdminSessionsServer for KeyServerImpl {
+	fn change_servers_set(&self, old_set_signature: RequestSignature, new_set_signature: RequestSignature, new_servers_set: BTreeSet<NodeId>) -> Result<(), Error> {
+		let servers_set_change_session = self.data.lock().cluster
+			.new_servers_set_change_session(None, None, new_servers_set, old_set_signature, new_set_signature)?;
+		servers_set_change_session.as_servers_set_change()
+			.expect("new_servers_set_change_session creates servers_set_change_session; qed")
+			.wait().map_err(Into::into)
+	}
+}
+
 impl ServerKeyGenerator for KeyServerImpl {
 	fn generate_key(&self, key_id: &ServerKeyId, signature: &RequestSignature, threshold: usize) -> Result<Public, Error> {
 		// recover requestor' public key from signature
@@ -75,7 +85,8 @@ impl ServerKeyGenerator for KeyServerImpl {
 impl DocumentKeyServer for KeyServerImpl {
 	fn store_document_key(&self, key_id: &ServerKeyId, signature: &RequestSignature, common_point: Public, encrypted_document_key: Public) -> Result<(), Error> {
 		// store encrypted key
-		let encryption_session = self.data.lock().cluster.new_encryption_session(key_id.clone(), signature.clone(), common_point, encrypted_document_key)?;
+		let encryption_session = self.data.lock().cluster.new_encryption_session(key_id.clone(),
+			signature.clone().into(), common_point, encrypted_document_key)?;
 		encryption_session.wait(None).map_err(Into::into)
 	}
 
@@ -106,7 +117,8 @@ impl DocumentKeyServer for KeyServerImpl {
 			.map_err(|_| Error::BadSignature)?;
 
 		// decrypt document key
-		let decryption_session = self.data.lock().cluster.new_decryption_session(key_id.clone(), signature.clone(), false)?;
+		let decryption_session = self.data.lock().cluster.new_decryption_session(key_id.clone(),
+			signature.clone().into(), None, false)?;
 		let document_key = decryption_session.wait()?.decrypted_secret;
 
 		// encrypt document key with requestor public key
@@ -116,19 +128,21 @@ impl DocumentKeyServer for KeyServerImpl {
 	}
 
 	fn restore_document_key_shadow(&self, key_id: &ServerKeyId, signature: &RequestSignature) -> Result<EncryptedDocumentKeyShadow, Error> {
-		let decryption_session = self.data.lock().cluster.new_decryption_session(key_id.clone(), signature.clone(), true)?;
+		let decryption_session = self.data.lock().cluster.new_decryption_session(key_id.clone(),
+			signature.clone().into(), None, true)?;
 		decryption_session.wait().map_err(Into::into)
 	}
 }
 
 impl MessageSigner for KeyServerImpl {
-	fn sign_message(&self, key_id: &ServerKeyId, signature: &RequestSignature, message: MessageHash) -> Result<EncryptedMessageSignature, Error> {
+	fn sign_message_schnorr(&self, key_id: &ServerKeyId, signature: &RequestSignature, message: MessageHash) -> Result<EncryptedMessageSignature, Error> {
 		// recover requestor' public key from signature
 		let public = ethkey::recover(signature, key_id)
 			.map_err(|_| Error::BadSignature)?;
 
 		// sign message
-		let signing_session = self.data.lock().cluster.new_signing_session(key_id.clone(), signature.clone(), message)?;
+		let signing_session = self.data.lock().cluster.new_schnorr_signing_session(key_id.clone(),
+			signature.clone().into(), None, message)?;
 		let message_signature = signing_session.wait()?;
 
 		// compose two message signature components into single one
@@ -141,6 +155,22 @@ impl MessageSigner for KeyServerImpl {
 			.map_err(|err| Error::Internal(format!("Error encrypting message signature: {}", err)))?;
 		Ok(message_signature)
 	}
+
+	fn sign_message_ecdsa(&self, key_id: &ServerKeyId, signature: &RequestSignature, message: MessageHash) -> Result<EncryptedMessageSignature, Error> {
+		// recover requestor' public key from signature
+		let public = ethkey::recover(signature, key_id)
+			.map_err(|_| Error::BadSignature)?;
+
+		// sign message
+		let signing_session = self.data.lock().cluster.new_ecdsa_signing_session(key_id.clone(),
+			signature.clone().into(), None, message)?;
+		let message_signature = signing_session.wait()?;
+
+		// encrypt combined signature with requestor public key
+		let message_signature = ethcrypto::ecies::encrypt(&public, &ethcrypto::DEFAULT_MAC, &*message_signature)
+			.map_err(|err| Error::Internal(format!("Error encrypting message signature: {}", err)))?;
+		Ok(message_signature)
+	}
 }
 
 impl KeyServerCore {
@@ -153,6 +183,8 @@ impl KeyServerCore {
 			allow_connecting_to_higher_nodes: config.allow_connecting_to_higher_nodes,
 			acl_storage: acl_storage,
 			key_storage: key_storage,
+			admin_public: config.admin_public.clone(),
+			auto_migrate_enabled: config.auto_migrate_enabled,
 		};
 
 		let (stop, stopped) = futures::oneshot();
@@ -190,54 +222,70 @@ impl Drop for KeyServerCore {
 
 #[cfg(test)]
 pub mod tests {
+	use std::collections::BTreeSet;
 	use std::time;
 	use std::sync::Arc;
+	use std::sync::atomic::{AtomicUsize, Ordering};
 	use std::net::SocketAddr;
 	use std::collections::BTreeMap;
 	use ethcrypto;
-	use ethkey::{self, Secret, Random, Generator};
+	use ethkey::{self, Secret, Random, Generator, verify_public};
 	use acl_storage::DummyAclStorage;
 	use key_storage::tests::DummyKeyStorage;
 	use node_key_pair::PlainNodeKeyPair;
 	use key_server_set::tests::MapKeyServerSet;
 	use key_server_cluster::math;
-	use util::H256;
+	use ethereum_types::{H256, H520};
 	use types::all::{Error, Public, ClusterConfiguration, NodeAddress, RequestSignature, ServerKeyId,
-		EncryptedDocumentKey, EncryptedDocumentKeyShadow, MessageHash, EncryptedMessageSignature};
-	use traits::{ServerKeyGenerator, DocumentKeyServer, MessageSigner, KeyServer};
+		EncryptedDocumentKey, EncryptedDocumentKeyShadow, MessageHash, EncryptedMessageSignature, NodeId};
+	use traits::{AdminSessionsServer, ServerKeyGenerator, DocumentKeyServer, MessageSigner, KeyServer};
 	use super::KeyServerImpl;
 
-	pub struct DummyKeyServer;
+	#[derive(Default)]
+	pub struct DummyKeyServer {
+		pub generation_requests_count: AtomicUsize,
+	}
 
 	impl KeyServer for DummyKeyServer {}
 
+	impl AdminSessionsServer for DummyKeyServer {
+		fn change_servers_set(&self, _old_set_signature: RequestSignature, _new_set_signature: RequestSignature, _new_servers_set: BTreeSet<NodeId>) -> Result<(), Error> {
+			unimplemented!("test-only")
+		}
+	}
+
 	impl ServerKeyGenerator for DummyKeyServer {
 		fn generate_key(&self, _key_id: &ServerKeyId, _signature: &RequestSignature, _threshold: usize) -> Result<Public, Error> {
-			unimplemented!()
+			self.generation_requests_count.fetch_add(1, Ordering::Relaxed);
+			Err(Error::Internal("test error".into()))
 		}
 	}
 
 	impl DocumentKeyServer for DummyKeyServer {
 		fn store_document_key(&self, _key_id: &ServerKeyId, _signature: &RequestSignature, _common_point: Public, _encrypted_document_key: Public) -> Result<(), Error> {
-			unimplemented!()
+			unimplemented!("test-only")
 		}
 
 		fn generate_document_key(&self, _key_id: &ServerKeyId, _signature: &RequestSignature, _threshold: usize) -> Result<EncryptedDocumentKey, Error> {
-			unimplemented!()
+			unimplemented!("test-only")
 		}
 
 		fn restore_document_key(&self, _key_id: &ServerKeyId, _signature: &RequestSignature) -> Result<EncryptedDocumentKey, Error> {
-			unimplemented!()
+			unimplemented!("test-only")
 		}
 
 		fn restore_document_key_shadow(&self, _key_id: &ServerKeyId, _signature: &RequestSignature) -> Result<EncryptedDocumentKeyShadow, Error> {
-			unimplemented!()
+			unimplemented!("test-only")
 		}
 	}
 
 	impl MessageSigner for DummyKeyServer {
-		fn sign_message(&self, _key_id: &ServerKeyId, _signature: &RequestSignature, _message: MessageHash) -> Result<EncryptedMessageSignature, Error> {
-			unimplemented!()
+		fn sign_message_schnorr(&self, _key_id: &ServerKeyId, _signature: &RequestSignature, _message: MessageHash) -> Result<EncryptedMessageSignature, Error> {
+			unimplemented!("test-only")
+		}
+
+		fn sign_message_ecdsa(&self, _key_id: &ServerKeyId, _signature: &RequestSignature, _message: MessageHash) -> Result<EncryptedMessageSignature, Error> {
+			unimplemented!("test-only")
 		}
 	}
 
@@ -255,6 +303,8 @@ pub mod tests {
 						port: start_port + (j as u16),
 					})).collect(),
 				allow_connecting_to_higher_nodes: false,
+				admin_public: None,
+				auto_migrate_enabled: false,
 			}).collect();
 		let key_servers_set: BTreeMap<Public, SocketAddr> = configs[0].nodes.iter()
 			.map(|(k, a)| (k.clone(), format!("{}:{}", a.address, a.port).parse().unwrap()))
@@ -385,13 +435,91 @@ pub mod tests {
 
 			// sign message
 			let message_hash = H256::from(42);
-			let combined_signature = key_servers[0].sign_message(&server_key_id, &signature, message_hash.clone()).unwrap();
+			let combined_signature = key_servers[0].sign_message_schnorr(&server_key_id, &signature, message_hash.clone()).unwrap();
 			let combined_signature = ethcrypto::ecies::decrypt(&requestor_secret, &ethcrypto::DEFAULT_MAC, &combined_signature).unwrap();
 			let signature_c = Secret::from_slice(&combined_signature[..32]);
 			let signature_s = Secret::from_slice(&combined_signature[32..]);
 
 			// check signature
-			assert_eq!(math::verify_signature(&server_public, &(signature_c, signature_s), &message_hash), Ok(true));
+			assert_eq!(math::verify_schnorr_signature(&server_public, &(signature_c, signature_s), &message_hash), Ok(true));
 		}
 	}
+
+	#[test]
+	fn decryption_session_is_delegated_when_node_does_not_have_key_share() {
+		//::logger::init_log();
+		let key_servers = make_key_servers(6110, 3);
+
+		// generate document key
+		let threshold = 0;
+		let document = Random.generate().unwrap().secret().clone();
+		let secret = Random.generate().unwrap().secret().clone();
+		let signature = ethkey::sign(&secret, &document).unwrap();
+		let generated_key = key_servers[0].generate_document_key(&document, &signature, threshold).unwrap();
+		let generated_key = ethcrypto::ecies::decrypt(&secret, &ethcrypto::DEFAULT_MAC, &generated_key).unwrap();
+
+		// remove key from node0
+		key_servers[0].cluster().key_storage().remove(&document).unwrap();
+
+		// now let's try to retrieve key back by requesting it from node0, so that session must be delegated
+		let retrieved_key = key_servers[0].restore_document_key(&document, &signature).unwrap();
+		let retrieved_key = ethcrypto::ecies::decrypt(&secret, &ethcrypto::DEFAULT_MAC, &retrieved_key).unwrap();
+		assert_eq!(retrieved_key, generated_key);
+	}
+
+	#[test]
+	fn schnorr_signing_session_is_delegated_when_node_does_not_have_key_share() {
+		//::logger::init_log();
+		let key_servers = make_key_servers(6114, 3);
+		let threshold = 1;
+
+		// generate server key
+		let server_key_id = Random.generate().unwrap().secret().clone();
+		let requestor_secret = Random.generate().unwrap().secret().clone();
+		let signature = ethkey::sign(&requestor_secret, &server_key_id).unwrap();
+		let server_public = key_servers[0].generate_key(&server_key_id, &signature, threshold).unwrap();
+
+		// remove key from node0
+		key_servers[0].cluster().key_storage().remove(&server_key_id).unwrap();
+
+		// sign message
+		let message_hash = H256::from(42);
+		let combined_signature = key_servers[0].sign_message_schnorr(&server_key_id, &signature, message_hash.clone()).unwrap();
+		let combined_signature = ethcrypto::ecies::decrypt(&requestor_secret, &ethcrypto::DEFAULT_MAC, &combined_signature).unwrap();
+		let signature_c = Secret::from_slice(&combined_signature[..32]);
+		let signature_s = Secret::from_slice(&combined_signature[32..]);
+
+		// check signature
+		assert_eq!(math::verify_schnorr_signature(&server_public, &(signature_c, signature_s), &message_hash), Ok(true));
+	}
+
+	#[test]
+	fn ecdsa_signing_session_is_delegated_when_node_does_not_have_key_share() {
+		//::logger::init_log();
+		let key_servers = make_key_servers(6117, 4);
+		let threshold = 1;
+
+		// generate server key
+		let server_key_id = Random.generate().unwrap().secret().clone();
+		let requestor_secret = Random.generate().unwrap().secret().clone();
+		let signature = ethkey::sign(&requestor_secret, &server_key_id).unwrap();
+		let server_public = key_servers[0].generate_key(&server_key_id, &signature, threshold).unwrap();
+
+		// remove key from node0
+		key_servers[0].cluster().key_storage().remove(&server_key_id).unwrap();
+
+		// sign message
+		let message_hash = H256::random();
+		let signature = key_servers[0].sign_message_ecdsa(&server_key_id, &signature, message_hash.clone()).unwrap();
+		let signature = ethcrypto::ecies::decrypt(&requestor_secret, &ethcrypto::DEFAULT_MAC, &signature).unwrap();
+		let signature: H520 = signature[0..65].into();
+
+		// check signature
+		assert!(verify_public(&server_public, &signature.into(), &message_hash).unwrap());
+	}
+
+	#[test]
+	fn servers_set_change_session_works_over_network() {
+		// TODO [Test]
+	}
 }
diff --git a/secret_store/src/key_server_cluster/admin_sessions/key_version_negotiation_session.rs b/secret_store/src/key_server_cluster/admin_sessions/key_version_negotiation_session.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b7291c25c8c0164292d414ee83ba57ee2d2700e1
--- /dev/null
+++ b/secret_store/src/key_server_cluster/admin_sessions/key_version_negotiation_session.rs
@@ -0,0 +1,734 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+use std::collections::{BTreeSet, BTreeMap};
+use ethereum_types::H256;
+use ethkey::Secret;
+use parking_lot::{Mutex, Condvar};
+use key_server_cluster::{Error, SessionId, NodeId, DocumentKeyShare};
+use key_server_cluster::cluster::Cluster;
+use key_server_cluster::cluster_sessions::{SessionIdWithSubSession, ClusterSession};
+use key_server_cluster::decryption_session::SessionImpl as DecryptionSession;
+use key_server_cluster::signing_session_ecdsa::SessionImpl as EcdsaSigningSession;
+use key_server_cluster::signing_session_schnorr::SessionImpl as SchnorrSigningSession;
+use key_server_cluster::message::{Message, KeyVersionNegotiationMessage, RequestKeyVersions, KeyVersions};
+use key_server_cluster::admin_sessions::ShareChangeSessionMeta;
+
+// TODO [Opt]: change sessions so that versions are sent by chunks.
+/// Number of versions sent in single message.
+const VERSIONS_PER_MESSAGE: usize = 32;
+
+/// Key version negotiation transport.
+pub trait SessionTransport {
+	/// Send message to given node.
+	fn send(&self, node: &NodeId, message: KeyVersionNegotiationMessage) -> Result<(), Error>;
+}
+
+/// Key version negotiation result computer.
+pub trait SessionResultComputer: Send + Sync {
+	/// Compute result of session, if possible.
+	fn compute_result(&self, threshold: Option<usize>, confirmations: &BTreeSet<NodeId>, versions: &BTreeMap<H256, BTreeSet<NodeId>>) -> Option<Result<(H256, NodeId), Error>>;
+}
+
+/// Key discovery session API.
+pub struct SessionImpl<T: SessionTransport> {
+	/// Session core.
+	core: SessionCore<T>,
+	/// Session data.
+	data: Mutex<SessionData>,
+}
+
+/// Action after key version is negotiated.
+#[derive(Clone)]
+pub enum ContinueAction {
+	/// Decryption session + is_shadow_decryption.
+	Decrypt(Arc<DecryptionSession>, bool),
+	/// Schnorr signing session + message hash.
+	SchnorrSign(Arc<SchnorrSigningSession>, H256),
+	/// ECDSA signing session + message hash.
+	EcdsaSign(Arc<EcdsaSigningSession>, H256),
+}
+
+/// Immutable session data.
+struct SessionCore<T: SessionTransport> {
+	/// Session meta.
+	pub meta: ShareChangeSessionMeta,
+	/// Sub-session id.
+	pub sub_session: Secret,
+	/// Key share.
+	pub key_share: Option<DocumentKeyShare>,
+	/// Session result computer.
+	pub result_computer: Arc<SessionResultComputer>,
+	/// Session transport.
+	pub transport: T,
+	/// Session nonce.
+	pub nonce: u64,
+	/// SessionImpl completion condvar.
+	pub completed: Condvar,
+}
+
+/// Mutable session data.
+struct SessionData {
+	/// Session state.
+	pub state: SessionState,
+	/// Initialization confirmations.
+	pub confirmations: Option<BTreeSet<NodeId>>,
+	/// Key threshold.
+	pub threshold: Option<usize>,
+	/// { Version => Nodes }
+	pub versions: Option<BTreeMap<H256, BTreeSet<NodeId>>>,
+	/// Session result.
+	pub result: Option<Result<(H256, NodeId), Error>>,
+	/// Continue action.
+	pub continue_with: Option<ContinueAction>,
+}
+
+/// SessionImpl creation parameters
+pub struct SessionParams<T: SessionTransport> {
+	/// Session meta.
+	pub meta: ShareChangeSessionMeta,
+	/// Sub-session id.
+	pub sub_session: Secret,
+	/// Key share.
+	pub key_share: Option<DocumentKeyShare>,
+	/// Session result computer.
+	pub result_computer: Arc<SessionResultComputer>,
+	/// Session transport to communicate to other cluster nodes.
+	pub transport: T,
+	/// Session nonce.
+	pub nonce: u64,
+}
+
+/// Signing session state.
+#[derive(Debug, PartialEq)]
+enum SessionState {
+	/// Waiting for initialization.
+	WaitingForInitialization,
+	/// Waiting for responses.
+	WaitingForResponses,
+	/// Session is completed.
+	Finished,
+}
+
+/// Isolated session transport.
+pub struct IsolatedSessionTransport {
+	/// Cluster.
+	pub cluster: Arc<Cluster>,
+	/// Key id.
+	pub key_id: SessionId,
+	/// Sub session id.
+	pub sub_session: Secret,
+	/// Session-level nonce.
+	pub nonce: u64,
+}
+
+/// Fastest session result computer. Computes first possible version that can be recovered on this node.
+/// If there's no such version, selects version with the most support.
+pub struct FastestResultComputer {
+	/// This node id.
+	self_node_id: NodeId,
+	/// Threshold (if known).
+	threshold: Option<usize>,
+}
+
+/// Selects version with most support, waiting for responses from all nodes.
+pub struct LargestSupportResultComputer;
+
+impl<T> SessionImpl<T> where T: SessionTransport {
+	/// Create new session.
+	pub fn new(params: SessionParams<T>) -> Self {
+		SessionImpl {
+			core: SessionCore {
+				meta: params.meta,
+				sub_session: params.sub_session,
+				key_share: params.key_share,
+				result_computer: params.result_computer,
+				transport: params.transport,
+				nonce: params.nonce,
+				completed: Condvar::new(),
+			},
+			data: Mutex::new(SessionData {
+				state: SessionState::WaitingForInitialization,
+				confirmations: None,
+				threshold: None,
+				versions: None,
+				result: None,
+				continue_with: None,
+			})
+		}
+	}
+
+	/// Return session meta.
+	pub fn meta(&self) -> &ShareChangeSessionMeta {
+		&self.core.meta
+	}
+
+	/// Return key threshold.
+	pub fn key_threshold(&self) -> Result<usize, Error> {
+		Ok(self.data.lock().threshold.clone().ok_or(Error::InvalidStateForRequest)?)
+	}
+
+	/// Return result computer reference.
+	pub fn version_holders(&self, version: &H256) -> Result<BTreeSet<NodeId>, Error> {
+		Ok(self.data.lock().versions.as_ref().ok_or(Error::InvalidStateForRequest)?
+			.get(version).ok_or(Error::KeyStorage("key version not found".into()))?
+			.clone())
+	}
+
+	/// Set continue action.
+	pub fn set_continue_action(&self, action: ContinueAction) {
+		self.data.lock().continue_with = Some(action);
+	}
+
+	/// Take continue action.
+	pub fn take_continue_action(&self) -> Option<ContinueAction> {
+		self.data.lock().continue_with.take()
+	}
+
+	/// Wait for session completion.
+	pub fn wait(&self) -> Result<(H256, NodeId), Error> {
+		Self::wait_session(&self.core.completed, &self.data, None, |data| data.result.clone())
+	}
+
+	/// Initialize session.
+	pub fn initialize(&self, connected_nodes: BTreeSet<NodeId>) -> Result<(), Error> {
+		// check state
+		let mut data = self.data.lock();
+		if data.state != SessionState::WaitingForInitialization {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// update state
+		let mut confirmations = connected_nodes;
+		let mut versions: BTreeMap<H256, BTreeSet<NodeId>> = BTreeMap::new();
+		let received_own_confirmation = confirmations.remove(&self.core.meta.self_node_id);
+		if received_own_confirmation {
+			if let Some(key_share) = self.core.key_share.as_ref() {
+				for version in &key_share.versions {
+					versions.entry(version.hash.clone())
+						.or_insert_with(Default::default)
+						.insert(self.core.meta.self_node_id.clone());
+				}
+			}
+		}
+
+		// update state
+		let no_confirmations_required = confirmations.is_empty();
+		data.state = SessionState::WaitingForResponses;
+		data.confirmations = Some(confirmations);
+		data.versions = Some(versions);
+
+		// try to complete session
+		Self::try_complete(&self.core, &mut *data);
+		if no_confirmations_required && data.state != SessionState::Finished {
+			return Err(Error::MissingKeyShare);
+		} else if data.state == SessionState::Finished {
+			return Ok(());
+		}
+
+		// send requests
+		let confirmations = data.confirmations.as_ref().expect("dilled couple of lines above; qed");
+		for connected_node in confirmations {
+			self.core.transport.send(connected_node, KeyVersionNegotiationMessage::RequestKeyVersions(RequestKeyVersions {
+				session: self.core.meta.id.clone().into(),
+				sub_session: self.core.sub_session.clone().into(),
+				session_nonce: self.core.nonce,
+			}))?;
+		}
+
+		Ok(())
+	}
+
+	/// Process single message.
+	pub fn process_message(&self, sender: &NodeId, message: &KeyVersionNegotiationMessage) -> Result<(), Error> {
+		if self.core.nonce != message.session_nonce() {
+			return Err(Error::ReplayProtection);
+		}
+
+		match message {
+			&KeyVersionNegotiationMessage::RequestKeyVersions(ref message) =>
+				self.on_key_versions_request(sender, message),
+			&KeyVersionNegotiationMessage::KeyVersions(ref message) =>
+				self.on_key_versions(sender, message),
+			&KeyVersionNegotiationMessage::KeyVersionsError(ref message) => {
+				self.on_session_error(sender, Error::Io(message.error.clone()));
+				Ok(())
+			},
+		}
+	}
+
+	/// Process key versions request.
+	pub fn on_key_versions_request(&self, sender: &NodeId, _message: &RequestKeyVersions) -> Result<(), Error> {
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		// check message
+		if *sender != self.core.meta.master_node_id {
+			return Err(Error::InvalidMessage);
+		}
+
+		// check state
+		let mut data = self.data.lock();
+		if data.state != SessionState::WaitingForInitialization {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// send response
+		self.core.transport.send(sender, KeyVersionNegotiationMessage::KeyVersions(KeyVersions {
+			session: self.core.meta.id.clone().into(),
+			sub_session: self.core.sub_session.clone().into(),
+			session_nonce: self.core.nonce,
+			threshold: self.core.key_share.as_ref().map(|key_share| key_share.threshold),
+			versions: self.core.key_share.as_ref().map(|key_share|
+				key_share.versions.iter().rev()
+					.filter(|v| v.id_numbers.contains_key(sender))
+					.chain(key_share.versions.iter().rev().filter(|v| !v.id_numbers.contains_key(sender)))
+					.map(|v| v.hash.clone().into())
+					.take(VERSIONS_PER_MESSAGE)
+					.collect())
+				.unwrap_or_else(|| Default::default())
+		}))?;
+
+		// update state
+		data.state = SessionState::Finished;
+
+		Ok(())
+	}
+
+	/// Process key versions response.
+	pub fn on_key_versions(&self, sender: &NodeId, message: &KeyVersions) -> Result<(), Error> {
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		// check state
+		let mut data = self.data.lock();
+		if data.state != SessionState::WaitingForResponses && data.state != SessionState::Finished {
+			return Err(Error::InvalidStateForRequest);
+		}
+		let reason = "this field is filled on master node when initializing; this is initialized master node; qed";
+		if !data.confirmations.as_mut().expect(reason).remove(sender) {
+			return Err(Error::InvalidMessage);
+		}
+
+		// remember versions that sender have
+		{
+			match message.threshold.clone() {
+				Some(threshold) if data.threshold.is_none() => {
+					data.threshold = Some(threshold);
+				},
+				Some(threshold) if data.threshold.as_ref() == Some(&threshold) => (),
+				Some(_) => return Err(Error::InvalidMessage),
+				None if message.versions.is_empty() => (),
+				None => return Err(Error::InvalidMessage),
+			}
+
+			let versions = data.versions.as_mut().expect(reason);
+			for version in &message.versions {
+				versions.entry(version.clone().into())
+					.or_insert_with(Default::default)
+					.insert(sender.clone());
+			}
+		}
+
+		// try to compute result
+		if data.state != SessionState::Finished {
+			Self::try_complete(&self.core, &mut *data);
+		}
+
+		Ok(())
+	}
+
+	/// Try to complete result && finish session.
+	fn try_complete(core: &SessionCore<T>, data: &mut SessionData) {
+		let reason = "this field is filled on master node when initializing; try_complete is only called on initialized master node; qed";
+		let confirmations = data.confirmations.as_ref().expect(reason);
+		let versions = data.versions.as_ref().expect(reason);
+		if let Some(result) = core.result_computer.compute_result(data.threshold.clone(), confirmations, versions) {
+			data.state = SessionState::Finished;
+			data.result = Some(result);
+			core.completed.notify_all();
+		}
+	}
+}
+
+impl<T> ClusterSession for SessionImpl<T> where T: SessionTransport {
+	type Id = SessionIdWithSubSession;
+
+	fn type_name() -> &'static str {
+		"version negotiation"
+	}
+
+	fn id(&self) -> SessionIdWithSubSession {
+		SessionIdWithSubSession::new(self.core.meta.id.clone(), self.core.sub_session.clone())
+	}
+
+	fn is_finished(&self) -> bool {
+		self.data.lock().state == SessionState::Finished
+	}
+
+	fn on_session_timeout(&self) {
+		let mut data = self.data.lock();
+
+		if data.confirmations.is_some() {
+			data.confirmations.as_mut().expect("checked a line above; qed").clear();
+			Self::try_complete(&self.core, &mut *data);
+			if data.state != SessionState::Finished {
+				warn!("{}: key version negotiation session failed with timeout", self.core.meta.self_node_id);
+
+				data.result = Some(Err(Error::ConsensusUnreachable));
+				self.core.completed.notify_all();
+			}
+		}
+	}
+
+	fn on_node_timeout(&self, node: &NodeId) {
+		self.on_session_error(node, Error::NodeDisconnected)
+	}
+
+	fn on_session_error(&self, node: &NodeId, error: Error) {
+		let mut data = self.data.lock();
+
+		if data.confirmations.is_some() {
+			let is_waiting_for_confirmation = data.confirmations.as_mut().expect("checked a line above; qed").remove(node);
+			if is_waiting_for_confirmation {
+				Self::try_complete(&self.core, &mut *data);
+				if data.state != SessionState::Finished {
+					warn!("{}: key version negotiation session failed because {} connection has timeouted", self.core.meta.self_node_id, node);
+
+					data.state = SessionState::Finished;
+					data.result = Some(Err(error));
+					self.core.completed.notify_all();
+				}
+			}
+		}
+	}
+
+	fn on_message(&self, sender: &NodeId, message: &Message) -> Result<(), Error> {
+		match *message {
+			Message::KeyVersionNegotiation(ref message) => self.process_message(sender, message),
+			_ => unreachable!("cluster checks message to be correct before passing; qed"),
+		}
+	}
+}
+
+impl SessionTransport for IsolatedSessionTransport {
+	fn send(&self, node: &NodeId, message: KeyVersionNegotiationMessage) -> Result<(), Error> {
+		self.cluster.send(node, Message::KeyVersionNegotiation(message))
+	}
+}
+
+impl FastestResultComputer {
+	pub fn new(self_node_id: NodeId, key_share: Option<&DocumentKeyShare>) -> Self {
+		let threshold = key_share.map(|ks| ks.threshold);
+		FastestResultComputer {
+			self_node_id: self_node_id,
+			threshold: threshold,
+		}
+	}}
+
+impl SessionResultComputer for FastestResultComputer {
+	fn compute_result(&self, threshold: Option<usize>, confirmations: &BTreeSet<NodeId>, versions: &BTreeMap<H256, BTreeSet<NodeId>>) -> Option<Result<(H256, NodeId), Error>> {
+		match self.threshold.or(threshold) {
+			// if there's no versions at all && we're not waiting for confirmations anymore
+			_ if confirmations.is_empty() && versions.is_empty() => Some(Err(Error::MissingKeyShare)),
+			// if we have key share on this node
+			Some(threshold) => {
+				// select version this node have, with enough participants
+				let has_key_share = self.threshold.is_some();
+				let version = versions.iter().find(|&(_, ref n)| !has_key_share || n.contains(&self.self_node_id) && n.len() >= threshold + 1);
+				// if there's no such version, wait for more confirmations
+				match version {
+					Some((version, nodes)) => Some(Ok((version.clone(), if has_key_share { self.self_node_id.clone() } else { nodes.iter().cloned().nth(0)
+						.expect("version is only inserted when there's at least one owner; qed") }))),
+					None if !confirmations.is_empty() => None,
+					// otherwise - try to find any version
+					None => Some(versions.iter()
+						.find(|&(_, ref n)| n.len() >= threshold + 1)
+						.map(|(version, nodes)| Ok((version.clone(), nodes.iter().cloned().nth(0)
+							.expect("version is only inserted when there's at least one owner; qed"))))
+						.unwrap_or(Err(Error::ConsensusUnreachable))),
+				}
+			},
+			// if we do not have share, then wait for all confirmations
+			None if !confirmations.is_empty() => None,
+			// ...and select version with largest support
+			None => Some(versions.iter()
+				.max_by_key(|&(_, ref n)| n.len())
+				.map(|(version, nodes)| Ok((version.clone(), nodes.iter().cloned().nth(0)
+					.expect("version is only inserted when there's at least one owner; qed"))))
+				.unwrap_or(Err(Error::ConsensusUnreachable))),
+		}
+	}
+}
+
+impl SessionResultComputer for LargestSupportResultComputer {
+	fn compute_result(&self, _threshold: Option<usize>, confirmations: &BTreeSet<NodeId>, versions: &BTreeMap<H256, BTreeSet<NodeId>>) -> Option<Result<(H256, NodeId), Error>> {
+		if !confirmations.is_empty() {
+			return None;
+		}
+		if versions.is_empty() {
+			return Some(Err(Error::MissingKeyShare));
+		}
+
+		versions.iter()
+			.max_by_key(|&(_, ref n)| n.len())
+			.map(|(version, nodes)| Ok((version.clone(), nodes.iter().cloned().nth(0)
+				.expect("version is only inserted when there's at least one owner; qed"))))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::sync::Arc;
+	use std::collections::{VecDeque, BTreeMap, BTreeSet};
+	use key_server_cluster::{NodeId, SessionId, Error, KeyStorage, DummyKeyStorage, DocumentKeyShare, DocumentKeyShareVersion};
+	use key_server_cluster::math;
+	use key_server_cluster::cluster::Cluster;
+	use key_server_cluster::cluster::tests::DummyCluster;
+	use key_server_cluster::admin_sessions::ShareChangeSessionMeta;
+	use key_server_cluster::message::{Message, KeyVersionNegotiationMessage, RequestKeyVersions, KeyVersions};
+	use super::{SessionImpl, SessionTransport, SessionParams, FastestResultComputer, LargestSupportResultComputer,
+		SessionResultComputer, SessionState};
+
+	struct DummyTransport {
+		cluster: Arc<DummyCluster>,
+	}
+
+	impl SessionTransport for DummyTransport {
+		fn send(&self, node: &NodeId, message: KeyVersionNegotiationMessage) -> Result<(), Error> {
+			self.cluster.send(node, Message::KeyVersionNegotiation(message))
+		}
+	}
+
+	struct Node {
+		pub cluster: Arc<DummyCluster>,
+		pub key_storage: Arc<DummyKeyStorage>,
+		pub session: SessionImpl<DummyTransport>,
+	}
+
+	struct MessageLoop {
+		pub session_id: SessionId,
+		pub nodes: BTreeMap<NodeId, Node>,
+		pub queue: VecDeque<(NodeId, NodeId, Message)>,
+	}
+
+	impl MessageLoop {
+		pub fn prepare_nodes(nodes_num: usize) -> BTreeMap<NodeId, Arc<DummyKeyStorage>> {
+			(0..nodes_num).map(|_| (math::generate_random_point().unwrap(),
+				Arc::new(DummyKeyStorage::default()))).collect()
+		}
+
+		pub fn empty(nodes_num: usize) -> Self {
+			Self::new(Self::prepare_nodes(nodes_num))
+		}
+
+		pub fn new(nodes: BTreeMap<NodeId, Arc<DummyKeyStorage>>) -> Self {
+			let master_node_id = nodes.keys().cloned().nth(0).unwrap();
+			let sub_sesion = math::generate_random_scalar().unwrap();
+			let all_nodes_ids: BTreeSet<_> = nodes.keys().cloned().collect();
+			MessageLoop {
+				session_id: Default::default(),
+				nodes: nodes.iter().map(|(node_id, key_storage)| {
+					let cluster = Arc::new(DummyCluster::new(node_id.clone()));
+					cluster.add_nodes(all_nodes_ids.iter().cloned());
+					(node_id.clone(), Node {
+						cluster: cluster.clone(),
+						key_storage: key_storage.clone(),
+						session: SessionImpl::new(SessionParams {
+							meta: ShareChangeSessionMeta {
+								id: Default::default(),
+								self_node_id: node_id.clone(),
+								master_node_id: master_node_id.clone(),
+							},
+							sub_session: sub_sesion.clone(),
+							key_share: key_storage.get(&Default::default()).unwrap(),
+							result_computer: Arc::new(FastestResultComputer::new(
+								node_id.clone(),
+								key_storage.get(&Default::default()).unwrap().as_ref(),
+							)),
+							transport: DummyTransport {
+								cluster: cluster,
+							},
+							nonce: 0,
+						}),
+					})
+				}).collect(),
+				queue: VecDeque::new(),
+			}
+		}
+
+		pub fn node_id(&self, idx: usize) -> &NodeId {
+			self.nodes.keys().nth(idx).unwrap()
+		}
+
+		pub fn session(&self, idx: usize) -> &SessionImpl<DummyTransport> {
+			&self.nodes.values().nth(idx).unwrap().session
+		}
+	}
+
+	#[test]
+	fn negotiation_fails_if_initialized_twice() {
+		let ml = MessageLoop::empty(1);
+		assert_eq!(ml.session(0).initialize(BTreeSet::new()), Ok(()));
+		assert_eq!(ml.session(0).initialize(BTreeSet::new()), Err(Error::InvalidStateForRequest));
+	}
+
+	#[test]
+	fn negotiation_fails_if_message_contains_wrong_nonce() {
+		let ml = MessageLoop::empty(2);
+		assert_eq!(ml.session(1).process_message(ml.node_id(0), &KeyVersionNegotiationMessage::RequestKeyVersions(RequestKeyVersions {
+			session: Default::default(),
+			sub_session: math::generate_random_scalar().unwrap().into(),
+			session_nonce: 100,
+		})), Err(Error::ReplayProtection));
+	}
+
+	#[test]
+	fn negotiation_fails_if_versions_request_received_from_non_master() {
+		let ml = MessageLoop::empty(3);
+		assert_eq!(ml.session(2).process_message(ml.node_id(1), &KeyVersionNegotiationMessage::RequestKeyVersions(RequestKeyVersions {
+			session: Default::default(),
+			sub_session: math::generate_random_scalar().unwrap().into(),
+			session_nonce: 0,
+		})), Err(Error::InvalidMessage));
+	}
+
+	#[test]
+	fn negotiation_fails_if_versions_request_received_twice() {
+		let ml = MessageLoop::empty(2);
+		assert_eq!(ml.session(1).process_message(ml.node_id(0), &KeyVersionNegotiationMessage::RequestKeyVersions(RequestKeyVersions {
+			session: Default::default(),
+			sub_session: math::generate_random_scalar().unwrap().into(),
+			session_nonce: 0,
+		})), Ok(()));
+		assert_eq!(ml.session(1).process_message(ml.node_id(0), &KeyVersionNegotiationMessage::RequestKeyVersions(RequestKeyVersions {
+			session: Default::default(),
+			sub_session: math::generate_random_scalar().unwrap().into(),
+			session_nonce: 0,
+		})), Err(Error::InvalidStateForRequest));
+	}
+
+	#[test]
+	fn negotiation_fails_if_versions_received_before_initialization() {
+		let ml = MessageLoop::empty(2);
+		assert_eq!(ml.session(1).process_message(ml.node_id(0), &KeyVersionNegotiationMessage::KeyVersions(KeyVersions {
+			session: Default::default(),
+			sub_session: math::generate_random_scalar().unwrap().into(),
+			session_nonce: 0,
+			threshold: Some(10),
+			versions: Vec::new(),
+		})), Err(Error::InvalidStateForRequest));
+	}
+
+	#[test]
+	fn negotiation_does_not_fails_if_versions_received_after_completion() {
+		let ml = MessageLoop::empty(3);
+		ml.session(0).initialize(ml.nodes.keys().cloned().collect()).unwrap();
+		assert_eq!(ml.session(0).data.lock().state, SessionState::WaitingForResponses);
+
+		let version_id = (*math::generate_random_scalar().unwrap()).clone();
+		assert_eq!(ml.session(0).process_message(ml.node_id(1), &KeyVersionNegotiationMessage::KeyVersions(KeyVersions {
+			session: Default::default(),
+			sub_session: math::generate_random_scalar().unwrap().into(),
+			session_nonce: 0,
+			threshold: Some(0),
+			versions: vec![version_id.clone().into()]
+		})), Ok(()));
+		assert_eq!(ml.session(0).data.lock().state, SessionState::Finished);
+
+		assert_eq!(ml.session(0).process_message(ml.node_id(2), &KeyVersionNegotiationMessage::KeyVersions(KeyVersions {
+			session: Default::default(),
+			sub_session: math::generate_random_scalar().unwrap().into(),
+			session_nonce: 0,
+			threshold: Some(0),
+			versions: vec![version_id.clone().into()]
+		})), Ok(()));
+		assert_eq!(ml.session(0).data.lock().state, SessionState::Finished);
+	}
+
+	#[test]
+	fn negotiation_fails_if_wrong_threshold_sent() {
+		let ml = MessageLoop::empty(3);
+		ml.session(0).initialize(ml.nodes.keys().cloned().collect()).unwrap();
+
+		let version_id = (*math::generate_random_scalar().unwrap()).clone();
+		assert_eq!(ml.session(0).process_message(ml.node_id(1), &KeyVersionNegotiationMessage::KeyVersions(KeyVersions {
+			session: Default::default(),
+			sub_session: math::generate_random_scalar().unwrap().into(),
+			session_nonce: 0,
+			threshold: Some(1),
+			versions: vec![version_id.clone().into()]
+		})), Ok(()));
+		assert_eq!(ml.session(0).process_message(ml.node_id(2), &KeyVersionNegotiationMessage::KeyVersions(KeyVersions {
+			session: Default::default(),
+			sub_session: math::generate_random_scalar().unwrap().into(),
+			session_nonce: 0,
+			threshold: Some(2),
+			versions: vec![version_id.clone().into()]
+		})), Err(Error::InvalidMessage));
+	}
+
+	#[test]
+	fn negotiation_fails_if_threshold_empty_when_versions_are_not_empty() {
+		let ml = MessageLoop::empty(2);
+		ml.session(0).initialize(ml.nodes.keys().cloned().collect()).unwrap();
+
+		let version_id = (*math::generate_random_scalar().unwrap()).clone();
+		assert_eq!(ml.session(0).process_message(ml.node_id(1), &KeyVersionNegotiationMessage::KeyVersions(KeyVersions {
+			session: Default::default(),
+			sub_session: math::generate_random_scalar().unwrap().into(),
+			session_nonce: 0,
+			threshold: None,
+			versions: vec![version_id.clone().into()]
+		})), Err(Error::InvalidMessage));
+	}
+
+	#[test]
+	fn fast_negotiation_does_not_completes_instantly_when_enough_share_owners_are_connected() {
+		let nodes = MessageLoop::prepare_nodes(2);
+		let version_id = (*math::generate_random_scalar().unwrap()).clone();
+		nodes.values().nth(0).unwrap().insert(Default::default(), DocumentKeyShare {
+			author: Default::default(),
+			threshold: 1,
+			public: Default::default(),
+			common_point: None,
+			encrypted_point: None,
+			versions: vec![DocumentKeyShareVersion {
+				hash: version_id,
+				id_numbers: vec![(nodes.keys().cloned().nth(0).unwrap(), math::generate_random_scalar().unwrap())].into_iter().collect(),
+				secret_share: math::generate_random_scalar().unwrap(),
+			}],
+		}).unwrap();
+		let ml = MessageLoop::new(nodes);
+		ml.session(0).initialize(ml.nodes.keys().cloned().collect()).unwrap();
+		// we can't be sure that node has given key version because previous ShareAdd session could fail
+		assert!(ml.session(0).data.lock().state != SessionState::Finished);
+	}
+
+	#[test]
+	fn fastest_computer_returns_missing_share_if_no_versions_returned() {
+		let computer = FastestResultComputer {
+			self_node_id: Default::default(),
+			threshold: None,
+		};
+		assert_eq!(computer.compute_result(Some(10), &Default::default(), &Default::default()), Some(Err(Error::MissingKeyShare)));
+	}
+
+	#[test]
+	fn largest_computer_returns_missing_share_if_no_versions_returned() {
+		let computer = LargestSupportResultComputer;
+		assert_eq!(computer.compute_result(Some(10), &Default::default(), &Default::default()), Some(Err(Error::MissingKeyShare)));
+	}
+}
diff --git a/secret_store/src/key_server_cluster/admin_sessions/mod.rs b/secret_store/src/key_server_cluster/admin_sessions/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..01655653a2c5e529e2db861472957410b2154b5a
--- /dev/null
+++ b/secret_store/src/key_server_cluster/admin_sessions/mod.rs
@@ -0,0 +1,47 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+pub mod key_version_negotiation_session;
+pub mod servers_set_change_session;
+pub mod share_add_session;
+pub mod share_change_session;
+
+mod sessions_queue;
+
+use key_server_cluster::{SessionId, NodeId, SessionMeta, Error};
+
+/// Share change session metadata.
+#[derive(Debug, Clone)]
+pub struct ShareChangeSessionMeta {
+	/// Key id.
+	pub id: SessionId,
+	/// Id of node, which has started this session.
+	pub master_node_id: NodeId,
+	/// Id of node, on which this session is running.
+	pub self_node_id: NodeId,
+}
+
+impl ShareChangeSessionMeta {
+	/// Convert to consensus session meta. `all_nodes_set` is the union of `old_nodes_set` && `new_nodes_set`.
+	pub fn into_consensus_meta(self, all_nodes_set_len: usize) -> Result<SessionMeta, Error> {
+		Ok(SessionMeta {
+			id: self.id,
+			master_node_id: self.master_node_id,
+			self_node_id: self.self_node_id,
+			threshold: all_nodes_set_len.checked_sub(1).ok_or(Error::ConsensusUnreachable)?,
+		})
+	}
+}
diff --git a/secret_store/src/key_server_cluster/admin_sessions/servers_set_change_session.rs b/secret_store/src/key_server_cluster/admin_sessions/servers_set_change_session.rs
new file mode 100644
index 0000000000000000000000000000000000000000..01f3392375b7c367857819a7dc8490acb5cfa98d
--- /dev/null
+++ b/secret_store/src/key_server_cluster/admin_sessions/servers_set_change_session.rs
@@ -0,0 +1,1293 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+use std::collections::{BTreeSet, BTreeMap};
+use std::collections::btree_map::Entry;
+use parking_lot::{Mutex, Condvar};
+use ethereum_types::H256;
+use ethkey::{Public, Signature};
+use key_server_cluster::{Error, NodeId, SessionId, KeyStorage};
+use key_server_cluster::math;
+use key_server_cluster::cluster::Cluster;
+use key_server_cluster::cluster_sessions::ClusterSession;
+use key_server_cluster::message::{Message, ServersSetChangeMessage,
+	ConsensusMessageWithServersSet, InitializeConsensusSessionWithServersSet,
+	ServersSetChangeConsensusMessage, ConfirmConsensusInitialization, UnknownSessionsRequest, UnknownSessions,
+	ServersSetChangeShareAddMessage, ServersSetChangeError, ServersSetChangeCompleted,
+	ServersSetChangeDelegate, ServersSetChangeDelegateResponse, InitializeShareChangeSession,
+	ConfirmShareChangeSessionInitialization, KeyVersionNegotiationMessage, ShareChangeKeyVersionNegotiation};
+use key_server_cluster::share_change_session::{ShareChangeSession, ShareChangeSessionParams, ShareChangeSessionPlan,
+	prepare_share_change_session_plan};
+use key_server_cluster::key_version_negotiation_session::{SessionImpl as KeyVersionNegotiationSessionImpl,
+	SessionParams as KeyVersionNegotiationSessionParams, LargestSupportResultComputer,
+	SessionTransport as KeyVersionNegotiationTransport};
+use key_server_cluster::jobs::job_session::JobTransport;
+use key_server_cluster::jobs::servers_set_change_access_job::{ServersSetChangeAccessJob, ServersSetChangeAccessRequest};
+use key_server_cluster::jobs::unknown_sessions_job::{UnknownSessionsJob};
+use key_server_cluster::jobs::consensus_session::{ConsensusSessionParams, ConsensusSessionState, ConsensusSession};
+use key_server_cluster::admin_sessions::sessions_queue::SessionsQueue;
+use key_server_cluster::admin_sessions::ShareChangeSessionMeta;
+
+/// Maximal number of active share change sessions.
+const MAX_ACTIVE_KEY_SESSIONS: usize = 64;
+
+/// Servers set change session.
+/// Brief overview:
+/// 1) consensus establishing
+/// 2) master node requests all other nodes for sessions he is not participating (aka unknown sessions)
+/// 3) every slave node responds with sessions id => we are able to collect Map<SessionId, Set> of unknown sessions on master
+/// 4) for every known session (i.e. session that master participates in):
+/// 4.1) share change plan is created = nodes to add shares for, nodes to move shares from/to, nodes to remove shares from
+/// 4.2) share change session is started. Share change session = sequential execution of ShareAdd, then ShareMove && then ShareRemove sessions (order matters here) for single key
+/// 5) for every unknown session:
+/// 5.1) sub_master is selected from sessions participants
+/// 5.2) share change session is delegated from master to this sub_master
+/// 5.3) share change session is executed by this sub_master
+/// 5.4) share change confirm is sent from sub_master to master
+/// 6) upon completing all known share change sessions && receiving confirmations for all unknown share change sessions, session completion signal is sent to all slave nodes && session is completed
+pub struct SessionImpl {
+	/// Session core.
+	core: SessionCore,
+	/// Session data.
+	data: Mutex<SessionData>,
+}
+
+/// Session state.
+#[derive(Debug, PartialEq)]
+enum SessionState {
+	/// Establishing consensus.
+	EstablishingConsensus,
+	/// Running share change sessions.
+	RunningShareChangeSessions,
+	/// Session is completed.
+	Finished,
+}
+
+/// Immutable session data.
+struct SessionCore {
+	/// Servers set change session meta (id is computed from new_nodes_set).
+	pub meta: ShareChangeSessionMeta,
+	/// Cluster which allows this node to send messages to other nodes in the cluster.
+	pub cluster: Arc<Cluster>,
+	/// Keys storage.
+	pub key_storage: Arc<KeyStorage>,
+	/// Session-level nonce.
+	pub nonce: u64,
+	/// All known nodes.
+	pub all_nodes_set: BTreeSet<NodeId>,
+	/// Administrator public key.
+	pub admin_public: Public,
+	/// Migration id (if this session is a part of auto-migration process).
+	pub migration_id: Option<H256>,
+	/// SessionImpl completion condvar.
+	pub completed: Condvar,
+}
+
+/// Servers set change consensus session type.
+type ServersSetChangeConsensusSession = ConsensusSession<ServersSetChangeAccessJob, ServersSetChangeConsensusTransport, UnknownSessionsJob, UnknownSessionsJobTransport>;
+
+/// Mutable session data.
+struct SessionData {
+	/// Session state.
+	pub state: SessionState,
+	/// Consensus-based servers set change session.
+	pub consensus_session: Option<ServersSetChangeConsensusSession>,
+	/// New nodes set.
+	pub new_nodes_set: Option<BTreeSet<NodeId>>,
+	/// Share change sessions queue (valid on master nodes only).
+	pub sessions_queue: Option<SessionsQueue>,
+	/// Share change sessions key version negotiation.
+	pub negotiation_sessions: BTreeMap<SessionId, KeyVersionNegotiationSessionImpl<ServersSetChangeKeyVersionNegotiationTransport>>,
+	/// Share change sessions initialization state (valid on master nodes only).
+	pub sessions_initialization_state: BTreeMap<SessionId, SessionInitializationData>,
+	/// Sessions delegated to other nodes (valid on master node only).
+	pub delegated_key_sessions: BTreeMap<SessionId, NodeId>,
+	/// Active share change sessions.
+	pub active_key_sessions: BTreeMap<SessionId, ShareChangeSession>,
+	/// Servers set change result.
+	pub result: Option<Result<(), Error>>,
+}
+
+/// Session initialization data.
+struct SessionInitializationData {
+	/// Master node id.
+	pub master: NodeId,
+	/// Nodes that have confirmed session initialization request.
+	pub confirmations: BTreeSet<NodeId>,
+}
+
+/// SessionImpl creation parameters
+pub struct SessionParams {
+	/// Session meta (artificial).
+	pub meta: ShareChangeSessionMeta,
+	/// Cluster.
+	pub cluster: Arc<Cluster>,
+	/// Keys storage.
+	pub key_storage: Arc<KeyStorage>,
+	/// Session nonce.
+	pub nonce: u64,
+	/// All known nodes.
+	pub all_nodes_set: BTreeSet<NodeId>,
+	/// Administrator public key.
+	pub admin_public: Public,
+	/// Migration id (if this session is a part of auto-migration process).
+	pub migration_id: Option<H256>,
+}
+
+/// Servers set change consensus transport.
+struct ServersSetChangeConsensusTransport {
+	/// Session id.
+	id: SessionId,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Migration id (if part of auto-migration process).
+	migration_id: Option<H256>,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+}
+
+/// Unknown sessions job transport.
+struct UnknownSessionsJobTransport {
+	/// Session id.
+	id: SessionId,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+}
+
+/// Key version negotiation transport.
+struct ServersSetChangeKeyVersionNegotiationTransport {
+	/// Session id.
+	id: SessionId,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+}
+
+impl SessionImpl {
+	/// Create new servers set change session.
+	pub fn new(params: SessionParams) -> Result<Self, Error> {
+		Ok(SessionImpl {
+			core: SessionCore {
+				meta: params.meta,
+				cluster: params.cluster,
+				key_storage: params.key_storage,
+				nonce: params.nonce,
+				all_nodes_set: params.all_nodes_set,
+				admin_public: params.admin_public,
+				migration_id: params.migration_id,
+				completed: Condvar::new(),
+			},
+			data: Mutex::new(SessionData {
+				state: SessionState::EstablishingConsensus,
+				consensus_session: None,
+				new_nodes_set: None,
+				sessions_queue: None,
+				negotiation_sessions: BTreeMap::new(),
+				sessions_initialization_state: BTreeMap::new(),
+				delegated_key_sessions: BTreeMap::new(),
+				active_key_sessions: BTreeMap::new(),
+				result: None,
+			}),
+		})
+	}
+
+	/// Get session id.
+	pub fn id(&self) -> &SessionId {
+		&self.core.meta.id
+	}
+
+	/// Get migration id.
+	pub fn migration_id(&self) -> Option<&H256> {
+		self.core.migration_id.as_ref()
+	}
+
+	/// Wait for session completion.
+	pub fn wait(&self) -> Result<(), Error> {
+		Self::wait_session(&self.core.completed, &self.data, None, |data| data.result.clone())
+	}
+
+	/// Initialize servers set change session on master node.
+	pub fn initialize(&self, new_nodes_set: BTreeSet<NodeId>, all_set_signature: Signature, new_set_signature: Signature) -> Result<(), Error> {
+		check_nodes_set(&self.core.all_nodes_set, &new_nodes_set)?;
+
+		let mut data = self.data.lock();
+		if data.state != SessionState::EstablishingConsensus || data.consensus_session.is_some() {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		let mut consensus_session = ConsensusSession::new(ConsensusSessionParams {
+			meta: self.core.meta.clone().into_consensus_meta(self.core.all_nodes_set.len())?,
+			consensus_executor: ServersSetChangeAccessJob::new_on_master(self.core.admin_public.clone(),
+				self.core.all_nodes_set.clone(),
+				new_nodes_set.clone(),
+				all_set_signature,
+				new_set_signature),
+			consensus_transport: ServersSetChangeConsensusTransport {
+				id: self.core.meta.id.clone(),
+				nonce: self.core.nonce,
+				migration_id: self.core.migration_id.clone(),
+				cluster: self.core.cluster.clone(),
+			},
+		})?;
+
+		consensus_session.initialize(self.core.all_nodes_set.clone())?;
+		debug_assert!(consensus_session.state() != ConsensusSessionState::ConsensusEstablished);
+		data.consensus_session = Some(consensus_session);
+		data.new_nodes_set = Some(new_nodes_set);
+
+		Ok(())
+	}
+
+	/// Process servers set change message.
+	pub fn process_message(&self, sender: &NodeId, message: &ServersSetChangeMessage) -> Result<(), Error> {
+		if self.core.nonce != message.session_nonce() {
+			return Err(Error::ReplayProtection);
+		}
+
+		match message {
+			&ServersSetChangeMessage::ServersSetChangeConsensusMessage(ref message) =>
+				self.on_consensus_message(sender, message),
+			&ServersSetChangeMessage::UnknownSessionsRequest(ref message) =>
+				self.on_unknown_sessions_requested(sender, message),
+			&ServersSetChangeMessage::UnknownSessions(ref message) =>
+				self.on_unknown_sessions(sender, message),
+			&ServersSetChangeMessage::ShareChangeKeyVersionNegotiation(ref message) =>
+				self.on_key_version_negotiation(sender, message),
+			&ServersSetChangeMessage::InitializeShareChangeSession(ref message) =>
+				self.on_initialize_share_change_session(sender, message),
+			&ServersSetChangeMessage::ConfirmShareChangeSessionInitialization(ref message) =>
+				self.on_share_change_session_confirmation(sender, message),
+			&ServersSetChangeMessage::ServersSetChangeDelegate(ref message) =>
+				self.on_sessions_delegation(sender, message),
+			&ServersSetChangeMessage::ServersSetChangeDelegateResponse(ref message) =>
+				self.on_delegated_session_completed(sender, message),
+			&ServersSetChangeMessage::ServersSetChangeShareAddMessage(ref message) =>
+				self.on_share_add_message(sender, message),
+			&ServersSetChangeMessage::ServersSetChangeError(ref message) => {
+				self.on_session_error(sender, Error::Io(message.error.clone()));
+				Ok(())
+			},
+			&ServersSetChangeMessage::ServersSetChangeCompleted(ref message) => 
+				self.on_session_completed(sender, message),
+		}
+	}
+
+	/// When consensus-related message is received.
+	pub fn on_consensus_message(&self, sender: &NodeId, message: &ServersSetChangeConsensusMessage) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+
+		// check state
+		let mut data = self.data.lock();
+		if data.state != SessionState::EstablishingConsensus {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// start slave consensus session if needed
+		if self.core.meta.self_node_id != self.core.meta.master_node_id {
+			if data.consensus_session.is_none() {
+				match &message.message {
+					&ConsensusMessageWithServersSet::InitializeConsensusSession(_) => {
+						data.consensus_session = Some(ConsensusSession::new(ConsensusSessionParams {
+							meta: self.core.meta.clone().into_consensus_meta(self.core.all_nodes_set.len())?,
+							consensus_executor: ServersSetChangeAccessJob::new_on_slave(self.core.admin_public.clone()),
+							consensus_transport: ServersSetChangeConsensusTransport {
+								id: self.core.meta.id.clone(),
+								nonce: self.core.nonce,
+								migration_id: self.core.migration_id.clone(),
+								cluster: self.core.cluster.clone(),
+							},
+						})?);
+					},
+					_ => return Err(Error::InvalidStateForRequest),
+				}
+			}
+		}
+
+		// process consensus message
+		let consensus_session = data.consensus_session.as_mut().ok_or(Error::InvalidMessage)?;
+		let is_establishing_consensus = consensus_session.state() == ConsensusSessionState::EstablishingConsensus;
+		match &message.message {
+			&ConsensusMessageWithServersSet::InitializeConsensusSession(ref message) =>
+				consensus_session.on_consensus_partial_request(sender, ServersSetChangeAccessRequest::from(message))?,
+			&ConsensusMessageWithServersSet::ConfirmConsensusInitialization(ref message) =>
+				consensus_session.on_consensus_partial_response(sender, message.is_confirmed)?,
+		}
+
+		// when consensus is established => request unknown sessions
+		let is_consensus_established = consensus_session.state() == ConsensusSessionState::ConsensusEstablished;
+		if self.core.meta.self_node_id != self.core.meta.master_node_id || !is_establishing_consensus || !is_consensus_established {
+			return Ok(());
+		}
+
+		let unknown_sessions_job = UnknownSessionsJob::new_on_master(self.core.key_storage.clone(), self.core.meta.self_node_id.clone());
+		consensus_session.disseminate_jobs(unknown_sessions_job, self.unknown_sessions_transport(), false)
+	}
+
+	/// When unknown sessions are requested.
+	pub fn on_unknown_sessions_requested(&self, sender: &NodeId, message: &UnknownSessionsRequest) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let mut data = self.data.lock();
+
+		let new_nodes_set = {
+			let consensus_session = data.consensus_session.as_mut().ok_or(Error::InvalidMessage)?;
+			let unknown_sessions_job = UnknownSessionsJob::new_on_slave(self.core.key_storage.clone());
+			let unknown_sessions_transport = self.unknown_sessions_transport();
+
+			// and respond with unknown sessions
+			consensus_session.on_job_request(&sender, sender.clone(), unknown_sessions_job, unknown_sessions_transport)?;
+
+			consensus_session.consensus_job().executor()
+				.new_servers_set()
+				.expect("consensus session is now completed; new_servers_set is intermediate result of consensus session; qed")
+				.clone()
+		};
+
+		// update state
+		data.state = SessionState::RunningShareChangeSessions;
+		data.new_nodes_set = Some(new_nodes_set);
+
+		Ok(())
+	}
+
+	/// When unknown sessions are received.
+	pub fn on_unknown_sessions(&self, sender: &NodeId, message: &UnknownSessions) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		// check state
+		let mut data = self.data.lock();
+		if data.state != SessionState::EstablishingConsensus {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// process message
+		let unknown_sessions = {
+			let consensus_session = data.consensus_session.as_mut().ok_or(Error::InvalidMessage)?;
+			consensus_session.on_job_response(sender, message.unknown_sessions.iter().cloned().map(Into::into).collect())?;
+			if consensus_session.state() != ConsensusSessionState::Finished {
+				return Ok(());
+			}
+
+			// all nodes have reported their unknown sessions
+			// => we are ready to start adding/moving/removing shares
+			consensus_session.result()?
+		};
+
+		// initialize sessions queue
+		data.state = SessionState::RunningShareChangeSessions;
+		data.sessions_queue = Some(SessionsQueue::new(&self.core.key_storage, unknown_sessions.keys().cloned().collect()));
+
+		// and disseminate session initialization requests
+		Self::disseminate_session_initialization_requests(&self.core, &mut *data)
+	}
+
+	/// When key version negotiation message is received.
+	pub fn on_key_version_negotiation(&self, sender: &NodeId, message: &ShareChangeKeyVersionNegotiation) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		// check state
+		let mut data = self.data.lock();
+		if data.state != SessionState::RunningShareChangeSessions {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// process message
+		match &message.message {
+			&KeyVersionNegotiationMessage::RequestKeyVersions(ref message) if sender == &self.core.meta.master_node_id => {
+				let key_id = message.session.clone().into();
+				let key_share = self.core.key_storage.get(&key_id).map_err(|e| Error::KeyStorage(e.into()))?;
+				let negotiation_session = KeyVersionNegotiationSessionImpl::new(KeyVersionNegotiationSessionParams {
+					meta: ShareChangeSessionMeta {
+						id: key_id.clone(),
+						self_node_id: self.core.meta.self_node_id.clone(),
+						master_node_id: sender.clone(),
+					},
+					sub_session: message.sub_session.clone().into(),
+					key_share: key_share,
+					result_computer: Arc::new(LargestSupportResultComputer {}),
+					transport: ServersSetChangeKeyVersionNegotiationTransport {
+						id: self.core.meta.id.clone(),
+						nonce: self.core.nonce,
+						cluster: self.core.cluster.clone(),
+					},
+					nonce: message.session_nonce,
+				});
+				negotiation_session.on_key_versions_request(sender, message)?;
+				debug_assert!(negotiation_session.is_finished());
+				Ok(())
+			},
+			&KeyVersionNegotiationMessage::KeyVersions(ref message) if self.core.meta.self_node_id == self.core.meta.master_node_id => {
+				let key_id = message.session.clone().into();
+				{
+					let negotiation_session = data.negotiation_sessions.get(&key_id).ok_or(Error::InvalidMessage)?;
+					negotiation_session.on_key_versions(sender, message)?;
+					if !negotiation_session.is_finished() {
+						return Ok(());
+					}
+				}
+
+				// else prepare plan && start share change session
+				if !Self::initialize_share_change_session(&self.core, &mut *data, key_id)? {
+					Self::disseminate_session_initialization_requests(&self.core, &mut *data)?;
+				}
+
+				Ok(())
+			},
+			_ => Err(Error::InvalidMessage),
+		}
+	}
+
+	/// When share change session initialization is requested.
+	pub fn on_initialize_share_change_session(&self, sender: &NodeId, message: &InitializeShareChangeSession) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		// we only accept delegation requests from master node
+		if sender != &self.core.meta.master_node_id {
+			return Err(Error::InvalidMessage);
+		}
+
+		// check state
+		let mut data = self.data.lock();
+		if data.state != SessionState::RunningShareChangeSessions {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// insert new session
+		let key_id = message.key_id.clone().into();
+		match data.active_key_sessions.contains_key(&key_id) {
+			true => return Err(Error::InvalidMessage),
+			false => {
+				let master_plan = ShareChangeSessionPlan {
+					key_version: message.version.clone().into(),
+					consensus_group: message.consensus_group.iter().cloned().map(Into::into).collect(),
+					new_nodes_map: message.new_nodes_map.iter().map(|(k, v)| (k.clone().into(), v.clone().map(Into::into))).collect(),
+				};
+
+				// if master plan is empty, it is cheating
+				if master_plan.is_empty() {
+					return Err(Error::InvalidMessage);
+				}
+
+				// on nodes, holding selected key share version, we could check if master node plan is correct
+				let master_node_id = message.master_node_id.clone().into();
+				if let Some(key_share) = self.core.key_storage.get(&key_id).map_err(|e| Error::KeyStorage(e.into()))? {
+					let version = message.version.clone().into();
+					if let Ok(key_version) = key_share.version(&version) {
+						let key_share_owners = key_version.id_numbers.keys().cloned().collect();
+						let new_nodes_set = data.new_nodes_set.as_ref()
+							.expect("new_nodes_set is filled during consensus establishing; change sessions are running after this; qed");
+						let local_plan = prepare_share_change_session_plan(
+							&self.core.all_nodes_set,
+							key_share.threshold,
+							version,
+							&master_node_id,
+							&key_share_owners,
+							new_nodes_set)?;
+
+						if local_plan.new_nodes_map.keys().collect::<BTreeSet<_>>() != master_plan.new_nodes_map.keys().collect::<BTreeSet<_>>() {
+							return Err(Error::InvalidMessage);
+						}
+					}
+				}
+
+				let session = Self::create_share_change_session(&self.core, key_id, master_node_id, master_plan)?;
+				if !session.is_finished() {
+					data.active_key_sessions.insert(key_id.clone(), session);
+				}
+			},
+		};
+
+		// send confirmation
+		self.core.cluster.send(sender, Message::ServersSetChange(ServersSetChangeMessage::ConfirmShareChangeSessionInitialization(ConfirmShareChangeSessionInitialization {
+			session: message.session.clone(),
+			session_nonce: message.session_nonce.clone(),
+			key_id: message.key_id.clone(),
+		})))
+	}
+
+	/// When share change session initialization is confirmed.
+	pub fn on_share_change_session_confirmation(&self, sender: &NodeId, message: &ConfirmShareChangeSessionInitialization) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		// we only accept delegation requests from master node
+		if self.core.meta.self_node_id != self.core.meta.master_node_id {
+			return Err(Error::InvalidMessage);
+		}
+
+		// check state
+		let mut data = self.data.lock();
+		if data.state != SessionState::RunningShareChangeSessions {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// add confirmation
+		let key_id = message.key_id.clone().into();
+		let session_master = {
+			let session_init_data = data.sessions_initialization_state.get_mut(&key_id).ok_or(Error::InvalidMessage)?;
+			if !session_init_data.confirmations.remove(sender) {
+				return Err(Error::InvalidMessage);
+			}
+
+			if !session_init_data.confirmations.is_empty() {
+				return Ok(());
+			}
+
+			session_init_data.master.clone()
+		};
+
+		// and start/delegate session if required
+		data.sessions_initialization_state.remove(&key_id);
+		if self.core.meta.self_node_id != session_master {
+			data.delegated_key_sessions.insert(key_id, session_master.clone());
+			return self.core.cluster.send(&session_master, Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeDelegate(ServersSetChangeDelegate {
+				session: self.core.meta.id.clone().into(),
+				session_nonce: self.core.nonce,
+				key_id: key_id.into(),
+			})));
+		}
+
+		// initialize share change session
+		{
+			let key_session = data.active_key_sessions.get_mut(&key_id).ok_or(Error::InvalidMessage)?;
+			key_session.initialize()?;
+			if !key_session.is_finished() {
+				return Ok(());
+			}
+		}
+
+		// complete key session
+		Self::complete_key_session(&self.core, &mut *data, true, key_id)
+	}
+
+	/// When sessions execution is delegated to this node.
+	pub fn on_sessions_delegation(&self, sender: &NodeId, message: &ServersSetChangeDelegate) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		// we only accept delegation requests from master node
+		if sender != &self.core.meta.master_node_id {
+			return Err(Error::InvalidMessage);
+		}
+
+		// check state
+		let mut data = self.data.lock();
+		if data.state != SessionState::RunningShareChangeSessions {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// start session
+		let key_session = data.active_key_sessions.get_mut(&message.key_id.clone().into()).ok_or(Error::InvalidMessage)?;
+		key_session.initialize()
+	}
+
+	/// When delegated session execution is completed.
+	pub fn on_delegated_session_completed(&self, sender: &NodeId, message: &ServersSetChangeDelegateResponse) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		// we only accept delegation requests on master node
+		if self.core.meta.self_node_id != self.core.meta.master_node_id {
+			return Err(Error::InvalidMessage);
+		}
+
+		// check state
+		let mut data = self.data.lock();
+		if data.state != SessionState::RunningShareChangeSessions {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// forget delegated session
+		let key_id = message.key_id.clone().into();
+		match data.delegated_key_sessions.entry(key_id) {
+			Entry::Occupied(entry) => if entry.get() == sender {
+				entry.remove()
+			} else {
+				return Err(Error::InvalidMessage);
+			},
+			_ => return Err(Error::InvalidMessage),
+		};
+
+		// check if we need to complete the whole change session
+		Self::disseminate_session_initialization_requests(&self.core, &mut *data)
+	}
+
+	/// When share add message is received.
+	pub fn on_share_add_message(&self, sender: &NodeId, message: &ServersSetChangeShareAddMessage) -> Result<(), Error> {
+		self.on_share_change_message(message.message.session_id().clone().into(), |session|
+			session.on_share_add_message(sender, &message.message))
+	}
+
+	/// When session completion message is received.
+	pub fn on_session_completed(&self, sender: &NodeId, message: &ServersSetChangeCompleted) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		if sender != &self.core.meta.master_node_id {
+			return Err(Error::InvalidMessage);
+		}
+
+		let mut data = self.data.lock();
+		data.result = Some(Ok(()));
+		if data.active_key_sessions.len() != 0 {
+			return Err(Error::TooEarlyForRequest);
+		}
+
+		// if we are on the set of nodes that are being removed from the cluster, let's clear database
+		if !data.new_nodes_set.as_ref()
+			.expect("new_nodes_set is filled during initialization; session is completed after initialization; qed")
+			.contains(&self.core.meta.self_node_id) {
+			self.core.key_storage.clear().map_err(|e| Error::KeyStorage(e.into()))?;
+		}
+
+		data.state = SessionState::Finished;
+		self.core.completed.notify_all();
+
+		Ok(())
+	}
+
+	/// Create unknown sessions transport.
+	fn unknown_sessions_transport(&self) -> UnknownSessionsJobTransport {
+		UnknownSessionsJobTransport {
+			id: self.core.meta.id.clone(),
+			nonce: self.core.nonce,
+			cluster: self.core.cluster.clone(),
+		}
+	}
+
+	/// When share change message is received.
+	fn on_share_change_message<F: Fn(&mut ShareChangeSession) -> Result<(), Error>>(&self, session_id: SessionId, message_processor: F) -> Result<(), Error> {
+		// check state
+		let mut data = self.data.lock();
+		if data.state != SessionState::RunningShareChangeSessions {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// process message
+		let (is_finished, is_master) = {
+			let key_session = data.active_key_sessions.get_mut(&session_id).ok_or(Error::InvalidMessage)?;
+			message_processor(key_session)?;
+			(key_session.is_finished(), key_session.is_master())
+		};
+
+		if is_finished {
+			Self::complete_key_session(&self.core, &mut *data, is_master, session_id)?;
+		}
+
+		Ok(())
+	}
+
+	/// Create share change session.
+	fn create_share_change_session(core: &SessionCore, key_id: SessionId, master_node_id: NodeId, session_plan: ShareChangeSessionPlan) -> Result<ShareChangeSession, Error> {
+		ShareChangeSession::new(ShareChangeSessionParams {
+			session_id: core.meta.id.clone(),
+			nonce: core.nonce,
+			meta: ShareChangeSessionMeta {
+				id: key_id,
+				self_node_id: core.meta.self_node_id.clone(),
+				master_node_id: master_node_id,
+			},
+			cluster: core.cluster.clone(),
+			key_storage: core.key_storage.clone(),
+			plan: session_plan,
+		})
+	}
+
+	/// Disseminate session initialization requests.
+	fn disseminate_session_initialization_requests(core: &SessionCore, data: &mut SessionData) -> Result<(), Error> {
+		debug_assert_eq!(core.meta.self_node_id, core.meta.master_node_id);
+		if data.sessions_queue.is_some() {
+			let number_of_sessions_active = data.active_key_sessions.len()
+				+ data.delegated_key_sessions.len()
+				+ data.negotiation_sessions.len();
+			let mut number_of_sessions_to_start = MAX_ACTIVE_KEY_SESSIONS.saturating_sub(number_of_sessions_active);
+			while number_of_sessions_to_start > 0 {
+				let key_id = match data.sessions_queue.as_mut().expect("checked before beginning of the loop; qed").next() {
+					None => break, // complete session
+					Some(Err(e)) => return Err(e),
+					Some(Ok(key_id)) => key_id,
+				};
+
+				let key_share = core.key_storage.get(&key_id).map_err(|e| Error::KeyStorage(e.into()))?;
+				let negotiation_session = KeyVersionNegotiationSessionImpl::new(KeyVersionNegotiationSessionParams {
+					meta: ShareChangeSessionMeta {
+						id: key_id,
+						self_node_id: core.meta.self_node_id.clone(),
+						master_node_id: core.meta.self_node_id.clone(),
+					},
+					sub_session: math::generate_random_scalar()?,
+					key_share: key_share,
+					result_computer: Arc::new(LargestSupportResultComputer {}), // TODO [Opt]: could use modified Fast version
+					transport: ServersSetChangeKeyVersionNegotiationTransport {
+						id: core.meta.id.clone(),
+						nonce: core.nonce,
+						cluster: core.cluster.clone(),
+					},
+					nonce: 0,
+				});
+				negotiation_session.initialize(core.cluster.nodes())?;
+				if !negotiation_session.is_finished() {
+					data.negotiation_sessions.insert(key_id, negotiation_session);
+					continue;
+				}
+
+				if !Self::initialize_share_change_session(core, data, key_id)? {
+					continue;
+				}
+
+				number_of_sessions_to_start = number_of_sessions_to_start - 1;
+			}
+
+			// if iteration is not yet finished => return
+			if number_of_sessions_to_start == 0 {
+				return Ok(());
+			}
+		}
+
+		// iteration is finished => complete session
+		if data.state != SessionState::Finished {
+			data.sessions_queue = None;
+			if data.active_key_sessions.len() == 0 &&
+				data.delegated_key_sessions.len() == 0 &&
+				data.negotiation_sessions.len() == 0 {
+				Self::complete_session(core, data)?;
+			}
+		}
+
+		Ok(())
+	}
+
+	/// Initialize share change session.
+	fn initialize_share_change_session(core: &SessionCore, data: &mut SessionData, key_id: SessionId) -> Result<bool, Error> {
+		// get selected version && old nodes set from key negotiation session
+		let negotiation_session = data.negotiation_sessions.remove(&key_id)
+			.expect("share change session is only initialized when negotiation is completed; qed");
+		let (selected_version, selected_master) = negotiation_session.wait()?;
+		let selected_version_holders = negotiation_session.version_holders(&selected_version)?;
+		let selected_version_threshold = negotiation_session.key_threshold()?;
+
+		// prepare session change plan && check if something needs to be changed
+		let old_nodes_set = selected_version_holders;
+		let new_nodes_set = data.new_nodes_set.as_ref()
+			.expect("this method is called after consensus estabished; new_nodes_set is a result of consensus session; qed");
+		let session_plan = prepare_share_change_session_plan(&core.all_nodes_set, selected_version_threshold, selected_version.clone(), &selected_master, &old_nodes_set, new_nodes_set)?;
+		if session_plan.is_empty() {
+			return Ok(false);
+		}
+
+		// send key session initialization requests
+		let mut confirmations: BTreeSet<_> = session_plan.new_nodes_map.keys().cloned().collect();
+		let need_create_session = confirmations.remove(&core.meta.self_node_id);
+		let initialization_message = Message::ServersSetChange(ServersSetChangeMessage::InitializeShareChangeSession(InitializeShareChangeSession {
+			session: core.meta.id.clone().into(),
+			session_nonce: core.nonce,
+			key_id: key_id.clone().into(),
+			version: selected_version.into(),
+			master_node_id: selected_master.clone().into(),
+			consensus_group: session_plan.consensus_group.iter().cloned().map(Into::into).collect(),
+			new_nodes_map: session_plan.new_nodes_map.iter()
+				.map(|(n, nid)| (n.clone().into(), nid.clone().map(Into::into)))
+				.collect(),
+		}));
+		for node in &confirmations {
+			core.cluster.send(&node, initialization_message.clone())?;
+		}
+
+		// create session on this node if required
+		if need_create_session {
+			data.active_key_sessions.insert(key_id.clone(), Self::create_share_change_session(core, key_id,
+				selected_master.clone(),
+				session_plan)?);
+		}
+
+		// initialize session if required
+		let wait_for_confirmations = !confirmations.is_empty();
+		if !wait_for_confirmations {
+			data.active_key_sessions.get_mut(&key_id)
+				.expect("!wait_for_confirmations is true only if this is the only session participant; if this is session participant, session is created above; qed")
+				.initialize()?;
+		} else {
+			data.sessions_initialization_state.insert(key_id, SessionInitializationData {
+				master: selected_master,
+				confirmations: confirmations,
+			});
+		}
+
+		Ok(true)
+	}
+
+	/// Return delegated session to master.
+	fn return_delegated_session(core: &SessionCore, key_id: &SessionId) -> Result<(), Error> {
+		assert!(core.meta.self_node_id != core.meta.master_node_id);
+		core.cluster.send(&core.meta.master_node_id, Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeDelegateResponse(ServersSetChangeDelegateResponse {
+			session: core.meta.id.clone().into(),
+			session_nonce: core.nonce,
+			key_id: key_id.clone().into(),
+		})))
+	}
+
+	/// Complete key session.
+	fn complete_key_session(core: &SessionCore, data: &mut SessionData, is_master: bool, session_id: SessionId) -> Result<(), Error> {
+		data.active_key_sessions.remove(&session_id);
+		let is_general_master = core.meta.self_node_id == core.meta.master_node_id;
+		if is_master && !is_general_master {
+			Self::return_delegated_session(core, &session_id)?;
+		}
+		if is_general_master {
+			Self::disseminate_session_initialization_requests(core, data)?;
+		}
+
+		if data.result.is_some() && data.active_key_sessions.len() == 0 {
+			data.state = SessionState::Finished;
+			core.completed.notify_all();
+		}
+
+		Ok(())
+	}
+
+	/// Complete servers set change session.
+	fn complete_session(core: &SessionCore, data: &mut SessionData) -> Result<(), Error> {
+		debug_assert_eq!(core.meta.self_node_id, core.meta.master_node_id);
+		
+		// send completion notification
+		core.cluster.broadcast(Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeCompleted(ServersSetChangeCompleted {
+			session: core.meta.id.clone().into(),
+			session_nonce: core.nonce,
+		})))?;
+
+		// if we are on the set of nodes that are being removed from the cluster, let's clear database
+		if !data.new_nodes_set.as_ref()
+			.expect("new_nodes_set is filled during initialization; session is completed after initialization; qed")
+			.contains(&core.meta.self_node_id) {
+			core.key_storage.clear().map_err(|e| Error::KeyStorage(e.into()))?;
+		}
+
+		data.state = SessionState::Finished;
+		data.result = Some(Ok(()));
+		core.completed.notify_all();
+
+		Ok(())
+	}
+}
+
+impl ClusterSession for SessionImpl {
+	type Id = SessionId;
+
+	fn type_name() -> &'static str {
+		"servers set change"
+	}
+
+	fn id(&self) -> SessionId {
+		self.core.meta.id.clone()
+	}
+
+	fn is_finished(&self) -> bool {
+		self.data.lock().state == SessionState::Finished
+	}
+
+	fn on_session_timeout(&self) {
+		self.on_session_error(&self.core.meta.self_node_id, Error::NodeDisconnected);
+	}
+
+	fn on_node_timeout(&self, node: &NodeId) {
+		self.on_session_error(node, Error::NodeDisconnected);
+	}
+
+	fn on_session_error(&self, node: &NodeId, error: Error) {
+		// error in generation session is considered fatal
+		// => broadcast error if error occured on this node
+		if *node == self.core.meta.self_node_id {
+			// do not bother processing send error, as we already processing error
+			let _ = self.core.cluster.broadcast(Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeError(ServersSetChangeError {
+				session: self.core.meta.id.clone().into(),
+				session_nonce: self.core.nonce,
+				error: error.clone().into(),
+			})));
+		}
+
+		let mut data = self.data.lock();
+
+		warn!("{}: servers set change session failed: {} on {}", self.core.meta.self_node_id, error, node);
+
+		data.state = SessionState::Finished;
+		data.result = Some(Err(error));
+		self.core.completed.notify_all();
+	}
+
+	fn on_message(&self, sender: &NodeId, message: &Message) -> Result<(), Error> {
+		match *message {
+			Message::ServersSetChange(ref message) => self.process_message(sender, message),
+			_ => unreachable!("cluster checks message to be correct before passing; qed"),
+		}
+	}
+}
+
+impl JobTransport for ServersSetChangeConsensusTransport {
+	type PartialJobRequest=ServersSetChangeAccessRequest;
+	type PartialJobResponse=bool;
+
+	fn send_partial_request(&self, node: &NodeId, request: ServersSetChangeAccessRequest) -> Result<(), Error> {
+		self.cluster.send(node, Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeConsensusMessage(ServersSetChangeConsensusMessage {
+			session: self.id.clone().into(),
+			session_nonce: self.nonce,
+			message: ConsensusMessageWithServersSet::InitializeConsensusSession(InitializeConsensusSessionWithServersSet {
+				migration_id: self.migration_id.clone().map(Into::into),
+				old_nodes_set: request.old_servers_set.into_iter().map(Into::into).collect(),
+				new_nodes_set: request.new_servers_set.into_iter().map(Into::into).collect(),
+				old_set_signature: request.old_set_signature.into(),
+				new_set_signature: request.new_set_signature.into(),
+			}),
+		})))
+	}
+
+	fn send_partial_response(&self, node: &NodeId, response: bool) -> Result<(), Error> {
+		self.cluster.send(node, Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeConsensusMessage(ServersSetChangeConsensusMessage {
+			session: self.id.clone().into(),
+			session_nonce: self.nonce,
+			message: ConsensusMessageWithServersSet::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
+				is_confirmed: response,
+			}),
+		})))
+	}
+}
+
+impl JobTransport for UnknownSessionsJobTransport {
+	type PartialJobRequest=NodeId;
+	type PartialJobResponse=BTreeSet<SessionId>;
+
+	fn send_partial_request(&self, node: &NodeId, _request: NodeId) -> Result<(), Error> {
+		self.cluster.send(node, Message::ServersSetChange(ServersSetChangeMessage::UnknownSessionsRequest(UnknownSessionsRequest {
+			session: self.id.clone().into(),
+			session_nonce: self.nonce,
+		})))
+	}
+
+	fn send_partial_response(&self, node: &NodeId, response: BTreeSet<SessionId>) -> Result<(), Error> {
+		self.cluster.send(node, Message::ServersSetChange(ServersSetChangeMessage::UnknownSessions(UnknownSessions {
+			session: self.id.clone().into(),
+			session_nonce: self.nonce,
+			unknown_sessions: response.into_iter().map(Into::into).collect(),
+		})))
+	}
+}
+
+impl KeyVersionNegotiationTransport for ServersSetChangeKeyVersionNegotiationTransport {
+	fn send(&self, node: &NodeId, message: KeyVersionNegotiationMessage) -> Result<(), Error> {
+		self.cluster.send(node, Message::ServersSetChange(ServersSetChangeMessage::ShareChangeKeyVersionNegotiation(ShareChangeKeyVersionNegotiation {
+			session: self.id.clone().into(),
+			session_nonce: self.nonce,
+			message: message,
+		})))
+	}
+}
+
+fn check_nodes_set(all_nodes_set: &BTreeSet<NodeId>, new_nodes_set: &BTreeSet<NodeId>) -> Result<(), Error> {
+	// all new nodes must be a part of all nodes set
+	match new_nodes_set.iter().any(|n| !all_nodes_set.contains(n)) {
+		true => Err(Error::InvalidNodesConfiguration),
+		false => Ok(())
+	}
+}
+
+#[cfg(test)]
+pub mod tests {
+	use std::sync::Arc;
+	use std::collections::{VecDeque, BTreeMap, BTreeSet};
+	use ethkey::{Random, Generator, Public, Signature, KeyPair, sign};
+	use key_server_cluster::{NodeId, SessionId, Error, KeyStorage, DummyKeyStorage};
+	use key_server_cluster::cluster::Cluster;
+	use key_server_cluster::cluster_sessions::ClusterSession;
+	use key_server_cluster::cluster::tests::DummyCluster;
+	use key_server_cluster::generation_session::tests::{MessageLoop as GenerationMessageLoop, Node as GenerationNode, generate_nodes_ids};
+	use key_server_cluster::message::Message;
+	use key_server_cluster::admin_sessions::ShareChangeSessionMeta;
+	use key_server_cluster::admin_sessions::share_add_session::tests::check_secret_is_preserved;
+	use key_server_cluster::jobs::servers_set_change_access_job::ordered_nodes_hash;
+	use super::{SessionImpl, SessionParams};
+
+	struct Node {
+		pub cluster: Arc<DummyCluster>,
+		pub key_storage: Arc<DummyKeyStorage>,
+		pub session: SessionImpl,
+	}
+
+	struct MessageLoop {
+		pub admin_key_pair: KeyPair,
+		pub original_key_pair: KeyPair,
+		pub all_nodes_set: BTreeSet<NodeId>,
+		pub new_nodes_set: BTreeSet<NodeId>,
+		pub all_set_signature: Signature,
+		pub new_set_signature: Signature,
+		pub nodes: BTreeMap<NodeId, Node>,
+		pub queue: VecDeque<(NodeId, NodeId, Message)>,
+	}
+
+	fn create_session(mut meta: ShareChangeSessionMeta, self_node_id: NodeId, admin_public: Public, all_nodes_set: BTreeSet<NodeId>, cluster: Arc<Cluster>, key_storage: Arc<KeyStorage>) -> SessionImpl {
+		meta.self_node_id = self_node_id;
+		SessionImpl::new(SessionParams {
+			meta: meta,
+			all_nodes_set: all_nodes_set,
+			cluster: cluster,
+			key_storage: key_storage,
+			nonce: 1,
+			admin_public: admin_public,
+			migration_id: None,
+		}).unwrap()
+	}
+
+	fn create_node(meta: ShareChangeSessionMeta, admin_public: Public, all_nodes_set: BTreeSet<NodeId>, node: GenerationNode) -> Node {
+		for n in &all_nodes_set {
+			node.cluster.add_node(n.clone());
+		}
+
+		Node {
+			cluster: node.cluster.clone(),
+			key_storage: node.key_storage.clone(),
+			session: create_session(meta, node.session.node().clone(), admin_public, all_nodes_set, node.cluster, node.key_storage),
+		}
+	}
+
+	impl MessageLoop {
+		pub fn new(gml: GenerationMessageLoop, master_node_id: NodeId, new_nodes_ids: BTreeSet<NodeId>, removed_nodes_ids: BTreeSet<NodeId>, isolated_nodes_ids: BTreeSet<NodeId>) -> Self {
+			// generate admin key pair
+			let admin_key_pair = Random.generate().unwrap();
+			let admin_public = admin_key_pair.public().clone();
+
+			// compute original secret key
+			let original_key_pair = gml.compute_key_pair(1);
+
+			// all active nodes set
+			let mut all_nodes_set: BTreeSet<_> = gml.nodes.keys()
+				.filter(|n| !isolated_nodes_ids.contains(n))
+				.cloned()
+				.collect();
+			// new nodes set includes all old nodes, except nodes being removed + all nodes being added
+			let new_nodes_set: BTreeSet<NodeId> = all_nodes_set.iter().cloned()
+				.chain(new_nodes_ids.iter().cloned())
+				.filter(|n| !removed_nodes_ids.contains(n))
+				.collect();
+			all_nodes_set.extend(new_nodes_ids.iter().cloned());
+			for isolated_node_id in &isolated_nodes_ids {
+				all_nodes_set.remove(isolated_node_id);
+			}
+
+			let meta = ShareChangeSessionMeta {
+				self_node_id: master_node_id.clone(),
+				master_node_id: master_node_id.clone(),
+				id: SessionId::default(),
+			};
+
+			let old_nodes = gml.nodes.into_iter().map(|n| create_node(meta.clone(), admin_public.clone(), all_nodes_set.clone(), n.1));
+			let new_nodes = new_nodes_ids.into_iter().map(|new_node_id| {
+				let new_node_cluster = Arc::new(DummyCluster::new(new_node_id.clone()));
+				for node in &all_nodes_set {
+					new_node_cluster.add_node(node.clone());
+				}
+
+				let new_node_key_storage = Arc::new(DummyKeyStorage::default());
+				let new_node_session = create_session(meta.clone(), new_node_id, admin_public.clone(), all_nodes_set.clone(), new_node_cluster.clone(), new_node_key_storage.clone());
+				Node {
+					cluster: new_node_cluster,
+					key_storage: new_node_key_storage,
+					session: new_node_session,
+				}
+			});
+			let nodes: BTreeMap<_, _> = old_nodes.chain(new_nodes).map(|n| (n.session.core.meta.self_node_id.clone(), n)).collect();
+
+			for node in nodes.values() {
+				for isolated_node_id in &isolated_nodes_ids {
+					node.cluster.remove_node(isolated_node_id);
+				}
+			}
+
+			let all_set_signature = sign(admin_key_pair.secret(), &ordered_nodes_hash(&all_nodes_set)).unwrap();
+			let new_set_signature = sign(admin_key_pair.secret(), &ordered_nodes_hash(&new_nodes_set)).unwrap();
+
+			MessageLoop {
+				admin_key_pair: admin_key_pair,
+				original_key_pair: original_key_pair,
+				all_nodes_set: all_nodes_set.clone(),
+				new_nodes_set: new_nodes_set,
+				all_set_signature: all_set_signature,
+				new_set_signature: new_set_signature,
+				nodes: nodes,
+				queue: Default::default(),
+			}
+		}
+
+		pub fn run(&mut self) {
+			while let Some((from, to, message)) = self.take_message() {
+				self.process_message((from, to, message)).unwrap();
+			}
+		}
+
+		pub fn take_message(&mut self) -> Option<(NodeId, NodeId, Message)> {
+			self.nodes.values()
+				.filter_map(|n| n.cluster.take_message().map(|m| (n.session.core.meta.self_node_id.clone(), m.0, m.1)))
+				.nth(0)
+				.or_else(|| self.queue.pop_front())
+		}
+
+		pub fn process_message(&mut self, msg: (NodeId, NodeId, Message)) -> Result<(), Error> {
+			match { match msg.2 {
+				Message::ServersSetChange(ref message) => self.nodes[&msg.1].session.process_message(&msg.0, message),
+				_ => unreachable!("only servers set change messages are expected"),
+			} } {
+				Ok(_) => Ok(()),
+				Err(Error::TooEarlyForRequest) => {
+					self.queue.push_back(msg);
+					Ok(())
+				},
+				Err(err) => Err(err),
+			}
+		}
+	}
+
+	pub fn generate_key(threshold: usize, nodes_ids: BTreeSet<NodeId>) -> GenerationMessageLoop {
+		let mut gml = GenerationMessageLoop::with_nodes_ids(nodes_ids);
+		gml.master().initialize(Default::default(), false, threshold, gml.nodes.keys().cloned().collect::<BTreeSet<_>>().into()).unwrap();
+		while let Some((from, to, message)) = gml.take_message() {
+			gml.process_message((from, to, message)).unwrap();
+		}
+		gml
+	}
+
+	#[test]
+	fn node_added_using_servers_set_change() {
+		// initial 2-of-3 session
+		let gml = generate_key(1, generate_nodes_ids(3));
+		let master_node_id = gml.nodes.keys().cloned().nth(0).unwrap();
+
+		// insert 1 node so that it becames 2-of-4 session
+		let nodes_to_add: BTreeSet<_> = (0..1).map(|_| Random.generate().unwrap().public().clone()).collect();
+		let mut ml = MessageLoop::new(gml, master_node_id, nodes_to_add, BTreeSet::new(), BTreeSet::new());
+		ml.nodes[&master_node_id].session.initialize(ml.nodes.keys().cloned().collect(), ml.all_set_signature.clone(), ml.new_set_signature.clone()).unwrap();
+		ml.run();
+
+		// try to recover secret for every possible combination of nodes && check that secret is the same
+		check_secret_is_preserved(ml.original_key_pair.clone(), ml.nodes.iter().map(|(k, v)| (k.clone(), v.key_storage.clone())).collect());
+
+		// check that all sessions have finished
+		assert!(ml.nodes.values().all(|n| n.session.is_finished()));
+	}
+
+	#[test]
+	fn node_added_using_server_set_change_from_this_node() {
+		// initial 2-of-3 session
+		let gml = generate_key(1, generate_nodes_ids(3));
+
+		// insert 1 node so that it becames 2-of-4 session
+		// master node is the node we are adding =>
+		// 1) add session is delegated to one of old nodes
+		// 2) key share is pushed to new node
+		// 3) delegated session is returned back to added node
+		let nodes_to_add: BTreeSet<_> = (0..1).map(|_| Random.generate().unwrap().public().clone()).collect();
+		let master_node_id = nodes_to_add.iter().cloned().nth(0).unwrap();
+		let mut ml = MessageLoop::new(gml, master_node_id, nodes_to_add, BTreeSet::new(), BTreeSet::new());
+		ml.nodes[&master_node_id].session.initialize(ml.nodes.keys().cloned().collect(), ml.all_set_signature.clone(), ml.new_set_signature.clone()).unwrap();
+		ml.run();
+
+		// check that all sessions have finished
+		assert!(ml.nodes.values().all(|n| n.session.is_finished()));
+	}
+
+	#[test]
+	fn node_moved_using_servers_set_change() {
+		// initial 2-of-3 session
+		let gml = generate_key(1, generate_nodes_ids(3));
+		let master_node_id = gml.nodes.keys().cloned().nth(0).unwrap();
+
+		// remove 1 node && insert 1 node so that one share is moved
+		let nodes_to_remove: BTreeSet<_> = gml.nodes.keys().cloned().skip(1).take(1).collect();
+		let nodes_to_add: BTreeSet<_> = (0..1).map(|_| Random.generate().unwrap().public().clone()).collect();
+		let mut ml = MessageLoop::new(gml, master_node_id, nodes_to_add.clone(), nodes_to_remove.clone(), BTreeSet::new());
+		let new_nodes_set = ml.nodes.keys().cloned().filter(|n| !nodes_to_remove.contains(n)).collect();
+		ml.nodes[&master_node_id].session.initialize(new_nodes_set, ml.all_set_signature.clone(), ml.new_set_signature.clone()).unwrap();
+		ml.run();
+
+		// check that secret is still the same as before moving the share
+		check_secret_is_preserved(ml.original_key_pair.clone(), ml.nodes.iter()
+			.filter(|&(k, _)| !nodes_to_remove.contains(k))
+			.map(|(k, v)| (k.clone(), v.key_storage.clone()))
+			.collect());
+
+		// check that all removed nodes do not own key share
+		assert!(ml.nodes.iter().filter(|&(k, _)| nodes_to_remove.contains(k)).all(|(_, v)| v.key_storage.get(&SessionId::default()).unwrap().is_none()));
+
+		// check that all sessions have finished
+		assert!(ml.nodes.values().all(|n| n.session.is_finished()));
+	}
+
+	#[test]
+	fn node_removed_using_servers_set_change() {
+		// initial 2-of-3 session
+		let gml = generate_key(1, generate_nodes_ids(3));
+		let master_node_id = gml.nodes.keys().cloned().nth(0).unwrap();
+
+		// remove 1 node so that session becames 2-of-2
+		let nodes_to_remove: BTreeSet<_> = gml.nodes.keys().cloned().skip(1).take(1).collect();
+		let new_nodes_set: BTreeSet<_> = gml.nodes.keys().cloned().filter(|n| !nodes_to_remove.contains(&n)).collect();
+		let mut ml = MessageLoop::new(gml, master_node_id, BTreeSet::new(), nodes_to_remove.clone(), BTreeSet::new());
+		ml.nodes[&master_node_id].session.initialize(new_nodes_set, ml.all_set_signature.clone(), ml.new_set_signature.clone()).unwrap();
+		ml.run();
+
+		// try to recover secret for every possible combination of nodes && check that secret is the same
+		check_secret_is_preserved(ml.original_key_pair.clone(), ml.nodes.iter()
+			.filter(|&(k, _)| !nodes_to_remove.contains(k))
+			.map(|(k, v)| (k.clone(), v.key_storage.clone()))
+			.collect());
+
+		// check that all removed nodes do not own key share
+		assert!(ml.nodes.iter().filter(|&(k, _)| nodes_to_remove.contains(k)).all(|(_, v)| v.key_storage.get(&SessionId::default()).unwrap().is_none()));
+
+		// check that all sessions have finished
+		assert!(ml.nodes.values().all(|n| n.session.is_finished()));
+	}
+
+	#[test]
+	fn isolated_node_removed_using_servers_set_change() {
+		// initial 2-of-3 session
+		let gml = generate_key(1, generate_nodes_ids(3));
+		let master_node_id = gml.nodes.keys().cloned().nth(0).unwrap();
+
+		// remove 1 node so that session becames 2-of-2
+		let nodes_to_isolate: BTreeSet<_> = gml.nodes.keys().cloned().skip(1).take(1).collect();
+		let new_nodes_set: BTreeSet<_> = gml.nodes.keys().cloned().filter(|n| !nodes_to_isolate.contains(&n)).collect();
+		let mut ml = MessageLoop::new(gml, master_node_id, BTreeSet::new(), BTreeSet::new(), nodes_to_isolate.clone());
+		ml.nodes[&master_node_id].session.initialize(new_nodes_set, ml.all_set_signature.clone(), ml.new_set_signature.clone()).unwrap();
+		ml.run();
+
+		// try to recover secret for every possible combination of nodes && check that secret is the same
+		check_secret_is_preserved(ml.original_key_pair.clone(), ml.nodes.iter()
+			.filter(|&(k, _)| !nodes_to_isolate.contains(k))
+			.map(|(k, v)| (k.clone(), v.key_storage.clone()))
+			.collect());
+
+		// check that all isolated nodes still OWN key share
+		assert!(ml.nodes.iter().filter(|&(k, _)| nodes_to_isolate.contains(k)).all(|(_, v)| v.key_storage.get(&SessionId::default()).unwrap().is_some()));
+
+		// check that all sessions have finished
+		assert!(ml.nodes.iter().filter(|&(k, _)| !nodes_to_isolate.contains(k)).all(|(_, v)| v.session.is_finished()));
+	}
+}
diff --git a/secret_store/src/key_server_cluster/admin_sessions/sessions_queue.rs b/secret_store/src/key_server_cluster/admin_sessions/sessions_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..35adaab68cdafb49e038810453262836fa2b8fce
--- /dev/null
+++ b/secret_store/src/key_server_cluster/admin_sessions/sessions_queue.rs
@@ -0,0 +1,56 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+use std::collections::{VecDeque, BTreeSet};
+use key_server_cluster::{Error, SessionId, KeyStorage};
+
+/// Queue of share change sessions.
+pub struct SessionsQueue {
+	/// Sessions, known on this node.
+	known_sessions: VecDeque<SessionId>,
+	/// Unknown sessions.
+	unknown_sessions: VecDeque<SessionId>,
+}
+
+impl SessionsQueue {
+	/// Create new sessions queue.
+	pub fn new(key_storage: &Arc<KeyStorage>, unknown_sessions: BTreeSet<SessionId>) -> Self {
+		// TODO [Opt]:
+		// 1) known sessions - change to iter
+		// 2) unknown sesions - request chunk-by-chunk
+		SessionsQueue {
+			known_sessions: key_storage.iter().map(|(k, _)| k).collect(),
+			unknown_sessions: unknown_sessions.into_iter().collect(),
+		}
+	}
+}
+
+impl Iterator for SessionsQueue {
+	type Item = Result<SessionId, Error>;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		if let Some(known_session) = self.known_sessions.pop_front() {
+			return Some(Ok(known_session));
+		}
+
+		if let Some(unknown_session) = self.unknown_sessions.pop_front() {
+			return Some(Ok(unknown_session));
+		}
+
+		None
+	}
+}
diff --git a/secret_store/src/key_server_cluster/admin_sessions/share_add_session.rs b/secret_store/src/key_server_cluster/admin_sessions/share_add_session.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7da73543bea0a323c1e5679e46cc6a330f21b037
--- /dev/null
+++ b/secret_store/src/key_server_cluster/admin_sessions/share_add_session.rs
@@ -0,0 +1,1292 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+use std::collections::{BTreeSet, BTreeMap};
+use ethereum_types::{H256, Address};
+use ethkey::{Public, Secret, Signature};
+use parking_lot::{Mutex, Condvar};
+use key_server_cluster::{Error, SessionId, NodeId, DocumentKeyShare, DocumentKeyShareVersion, KeyStorage};
+use key_server_cluster::cluster::Cluster;
+use key_server_cluster::cluster_sessions::ClusterSession;
+use key_server_cluster::math;
+use key_server_cluster::message::{Message, ShareAddMessage, ShareAddConsensusMessage, ConsensusMessageOfShareAdd,
+	InitializeConsensusSessionOfShareAdd, KeyShareCommon, NewKeysDissemination, ShareAddError,
+	ConfirmConsensusInitialization};
+use key_server_cluster::jobs::job_session::JobTransport;
+use key_server_cluster::jobs::dummy_job::{DummyJob, DummyJobTransport};
+use key_server_cluster::jobs::servers_set_change_access_job::{ServersSetChangeAccessJob, ServersSetChangeAccessRequest};
+use key_server_cluster::jobs::consensus_session::{ConsensusSessionParams, ConsensusSessionState, ConsensusSession};
+use key_server_cluster::admin_sessions::ShareChangeSessionMeta;
+
+/// Share addition session transport.
+pub trait SessionTransport: Clone + JobTransport<PartialJobRequest=ServersSetChangeAccessRequest, PartialJobResponse=bool> {
+	/// Get all connected nodes. Since ShareAdd session requires all cluster nodes to be connected, this set equals to all known cluster nodes set.
+	fn nodes(&self) -> BTreeSet<NodeId>;
+	/// Send message to given node.
+	fn send(&self, node: &NodeId, message: ShareAddMessage) -> Result<(), Error>;
+	/// Set data for master node (sent to slave nodes in consensus session initialization message).
+	fn set_master_data(&mut self, consensus_group: BTreeSet<NodeId>, id_numbers: BTreeMap<NodeId, Option<Secret>>);
+}
+
+/// Share addition session.
+/// Based on "Efficient Multi-Party Digital Signature using Adaptive Secret Sharing for Low-Power Devices in Wireless Networks" paper:
+/// http://www.wu.ece.ufl.edu/mypapers/msig.pdf
+/// Brief overview:
+/// 1) initialization: master node (which has received request for shares addition the message) asks all other nodes to support addition
+/// 2) key refreshing distribution (KRD): node generates new random polynom && sends required data to all other nodes
+/// 3) key refreshing verification (KRV): node verifies received data
+/// 4) node updates its own key share using generated (&& received) data
+pub struct SessionImpl<T: SessionTransport> {
+	/// Session core.
+	core: SessionCore<T>,
+	/// Session data.
+	data: Mutex<SessionData<T>>,
+}
+
+/// Immutable session data.
+struct SessionCore<T: SessionTransport> {
+	/// Session metadata.
+	pub meta: ShareChangeSessionMeta,
+	/// Session-level nonce.
+	pub nonce: u64,
+	/// Original key share (for old nodes only).
+	pub key_share: Option<DocumentKeyShare>,
+	/// Session transport to communicate to other cluster nodes.
+	pub transport: T,
+	/// Key storage.
+	pub key_storage: Arc<KeyStorage>,
+	/// Administrator public key.
+	pub admin_public: Option<Public>,
+	/// SessionImpl completion condvar.
+	pub completed: Condvar,
+}
+
+/// Share add consensus session type.
+type ShareAddChangeConsensusSession<T> = ConsensusSession<ServersSetChangeAccessJob, T, DummyJob, DummyJobTransport>;
+
+/// Mutable session data.
+struct SessionData<T: SessionTransport> {
+	/// Session state.
+	pub state: SessionState,
+	/// Key version to use for decryption.
+	pub version: Option<H256>,
+	/// Consensus session.
+	pub consensus_session: Option<ShareAddChangeConsensusSession<T>>,
+	/// NewKeyShare (for nodes being added).
+	pub new_key_share: Option<NewKeyShare>,
+	/// Nodes id numbers.
+	pub id_numbers: Option<BTreeMap<NodeId, Option<Secret>>>,
+	/// Secret subshares received from nodes.
+	pub secret_subshares: Option<BTreeMap<NodeId, Option<Secret>>>,
+	/// Share add change result.
+	pub result: Option<Result<(), Error>>,
+}
+
+/// New key share.
+struct NewKeyShare {
+	/// NewKeyShare: threshold.
+	pub threshold: usize,
+	/// NewKeyShare: author.
+	pub author: Address,
+	/// NewKeyShare: joint public.
+	pub joint_public: Public,
+	/// NewKeyShare: Common (shared) encryption point.
+	pub common_point: Option<Public>,
+	/// NewKeyShare: Encrypted point.
+	pub encrypted_point: Option<Public>,
+}
+
+/// Session state.
+#[derive(Debug, PartialEq)]
+enum SessionState {
+	/// State when consensus is establishing.
+	ConsensusEstablishing,
+	/// Waiting for keys dissemination.
+	WaitingForKeysDissemination,
+	/// Session is completed.
+	Finished,
+}
+
+/// SessionImpl creation parameters
+pub struct SessionParams<T: SessionTransport> {
+	/// Session metadata.
+	pub meta: ShareChangeSessionMeta,
+	/// Session transport.
+	pub transport: T,
+	/// Key storage.
+	pub key_storage: Arc<KeyStorage>,
+	/// Administrator public key.
+	pub admin_public: Option<Public>,
+	/// Session nonce.
+	pub nonce: u64,
+}
+
+/// Isolated ShareAdd session transport.
+#[derive(Clone)]
+pub struct IsolatedSessionTransport {
+	/// Key id.
+	session: SessionId,
+	/// Key version.
+	version: Option<H256>,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Consensus group.
+	consensus_group: Option<BTreeSet<NodeId>>,
+	/// Id numbers of all new nodes.
+	id_numbers: Option<BTreeMap<NodeId, Option<Secret>>>,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+}
+
+impl<T> SessionImpl<T> where T: SessionTransport {
+	/// Create new share addition session.
+	pub fn new(params: SessionParams<T>) -> Result<Self, Error> {
+		let key_share = params.key_storage
+			.get(&params.meta.id)
+			.map_err(|e| Error::KeyStorage(e.into()))?;
+
+		Ok(SessionImpl {
+			core: SessionCore {
+				meta: params.meta,
+				nonce: params.nonce,
+				key_share: key_share,
+				transport: params.transport,
+				key_storage: params.key_storage,
+				admin_public: params.admin_public,
+				completed: Condvar::new(),
+			},
+			data: Mutex::new(SessionData {
+				state: SessionState::ConsensusEstablishing,
+				version: None,
+				consensus_session: None,
+				new_key_share: None,
+				id_numbers: None,
+				secret_subshares: None,
+				result: None,
+			}),
+		})
+	}
+
+	/// Set pre-established consensus data.
+	pub fn set_consensus_output(&self, version: &H256, consensus_group: BTreeSet<NodeId>, mut new_nodes_map: BTreeMap<NodeId, Option<Secret>>) -> Result<(), Error> {
+		let mut data = self.data.lock();
+
+		// check state
+		if data.state != SessionState::ConsensusEstablishing || data.consensus_session.is_some() || data.id_numbers.is_some() || data.secret_subshares.is_some() {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// key share version is required on ShareAdd master node
+		if let Some(key_share) = self.core.key_share.as_ref() {
+			if let Ok(key_version) = key_share.version(version) {
+				for (node, id_number) in &key_version.id_numbers {
+					{
+						let external_id_number = new_nodes_map.get(node);
+						match external_id_number {
+							Some(&Some(ref external_id_number)) => {
+								if external_id_number == id_number {
+									continue;
+								}
+								return Err(Error::ConsensusUnreachable);
+							},
+							Some(&None) => (),
+							None => return Err(Error::ConsensusUnreachable),
+						}
+					}
+
+					new_nodes_map.insert(node.clone(), Some(id_number.clone()));
+				}
+
+				// check that all id_numbers are filled
+				if new_nodes_map.values().any(Option::is_none) {
+					return Err(Error::ConsensusUnreachable);
+				}
+			}
+		}
+
+		// check passed consensus data
+		Self::check_nodes_map(&self.core, version, &consensus_group, &new_nodes_map)?;
+
+		// update data
+		data.version = Some(version.clone());
+		data.id_numbers = Some(new_nodes_map);
+		data.secret_subshares = Some(consensus_group.into_iter()
+			.map(|n| (n, None))
+			.collect());
+
+		Ok(())
+	}
+
+	/// Initialize share add session on master node.
+	pub fn initialize(&self, version: Option<H256>, new_nodes_set: Option<BTreeSet<NodeId>>, old_set_signature: Option<Signature>, new_set_signature: Option<Signature>) -> Result<(), Error> {
+		debug_assert_eq!(self.core.meta.self_node_id, self.core.meta.master_node_id);
+
+		let mut data = self.data.lock();
+
+		// check state
+		if data.state != SessionState::ConsensusEstablishing || data.consensus_session.is_some() {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// if consensus is pre-established => start sending ShareAdd-specific messages
+		let is_consensus_pre_established = data.id_numbers.is_some();
+		if is_consensus_pre_established {
+			return Self::on_consensus_established(&self.core, &mut *data);
+		}
+
+		// else => prepare to start consensus session
+		// require all initialization params for consensus session
+		let version = version.ok_or(Error::InvalidMessage)?;
+		let old_set_signature = old_set_signature.ok_or(Error::InvalidMessage)?;
+		let new_set_signature = new_set_signature.ok_or(Error::InvalidMessage)?;
+		let new_nodes_set = new_nodes_set.ok_or(Error::InvalidMessage)?;
+		let admin_public = self.core.admin_public.as_ref().cloned().ok_or(Error::ConsensusUnreachable)?;
+
+		// key share version is required on ShareAdd master node
+		let key_share = self.core.key_share.as_ref().ok_or_else(|| Error::KeyStorage("key share is not found on master node".into()))?;
+		let key_version = key_share.version(&version).map_err(|e| Error::KeyStorage(e.into()))?;
+
+		// old nodes set is all non-isolated owners of version holders
+		let non_isolated_nodes = self.core.transport.nodes();
+		let old_nodes_set: BTreeSet<_> = key_version.id_numbers.keys()
+			.filter(|n| non_isolated_nodes.contains(n))
+			.cloned()
+			.collect();
+
+		// new nodes map contains previous id_numbers for old nodes && random number for new nodes
+		let mut new_nodes_map = BTreeMap::new();
+		for new_node in new_nodes_set.into_iter().filter(|n| non_isolated_nodes.contains(n)) {
+			new_nodes_map.insert(new_node, match key_version.id_numbers.get(&new_node) {
+				Some(old_id_number) => Some(old_id_number.clone()),
+				None => Some(math::generate_random_scalar()?),
+			});
+		}
+
+		// let's select consensus group
+		let consensus_group: BTreeSet<_> = ::std::iter::once(self.core.meta.self_node_id.clone())
+			.chain(old_nodes_set.iter()
+				.filter(|n| **n != self.core.meta.self_node_id && non_isolated_nodes.contains(*n))
+				.take(key_share.threshold)
+				.cloned())
+			.collect();
+
+		// now check nodes map
+		Self::check_nodes_map(&self.core, &version, &consensus_group, &new_nodes_map)?;
+
+		// prepare consensus session transport
+		let mut consensus_transport = self.core.transport.clone();
+		consensus_transport.set_master_data(consensus_group.clone(), new_nodes_map.clone());
+
+		// create && initialize consensus session
+		let mut consensus_session = ConsensusSession::new(ConsensusSessionParams {
+			meta: self.core.meta.clone().into_consensus_meta(new_nodes_map.len())?,
+			consensus_executor: ServersSetChangeAccessJob::new_on_master(admin_public,
+				old_nodes_set.clone(),
+				new_nodes_map.keys().cloned().collect(),
+				old_set_signature,
+				new_set_signature),
+			consensus_transport: consensus_transport,
+		})?;
+		consensus_session.initialize(new_nodes_map.keys().cloned().collect())?;
+
+		// update data
+		data.version = Some(version);
+		data.consensus_session = Some(consensus_session);
+		data.id_numbers = Some(new_nodes_map);
+		data.secret_subshares = Some(consensus_group.into_iter().map(|n| (n, None)).collect());
+
+		Ok(())
+	}
+
+	/// Process single message.
+	pub fn process_message(&self, sender: &NodeId, message: &ShareAddMessage) -> Result<(), Error> {
+		if self.core.nonce != message.session_nonce() {
+			return Err(Error::ReplayProtection);
+		}
+
+		match message {
+			&ShareAddMessage::ShareAddConsensusMessage(ref message) =>
+				self.on_consensus_message(sender, message),
+			&ShareAddMessage::KeyShareCommon(ref message) =>
+				self.on_common_key_share_data(sender, message),
+			&ShareAddMessage::NewKeysDissemination(ref message) =>
+				self.on_new_keys_dissemination(sender, message),
+			&ShareAddMessage::ShareAddError(ref message) => {
+				self.on_session_error(sender, Error::Io(message.error.clone().into()));
+				Ok(())
+			},
+		}
+	}
+
+	/// When consensus-related message is received.
+	pub fn on_consensus_message(&self, sender: &NodeId, message: &ShareAddConsensusMessage) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		// start slave consensus session if needed
+		let mut data = self.data.lock();
+		match &message.message {
+			&ConsensusMessageOfShareAdd::InitializeConsensusSession(ref message)
+				if data.consensus_session.is_none() && sender == &self.core.meta.master_node_id => {
+					let admin_public = self.core.admin_public.as_ref().cloned().ok_or(Error::ConsensusUnreachable)?;
+					data.consensus_session = Some(ConsensusSession::new(ConsensusSessionParams {
+						meta: self.core.meta.clone().into_consensus_meta(message.new_nodes_map.len())?,
+						consensus_executor: ServersSetChangeAccessJob::new_on_slave(admin_public),
+						consensus_transport: self.core.transport.clone(),
+					})?);
+				},
+			_ => (),
+		};
+
+		// process consensus message
+		let (is_establishing_consensus, is_consensus_established, version, new_nodes_map, consensus_group) = {
+			let consensus_session = data.consensus_session.as_mut().ok_or(Error::InvalidMessage)?;
+			let is_establishing_consensus = consensus_session.state() == ConsensusSessionState::EstablishingConsensus;
+
+			let (version, new_nodes_map, consensus_group) = match &message.message {
+				&ConsensusMessageOfShareAdd::InitializeConsensusSession(ref message) => {
+					consensus_session.on_consensus_partial_request(sender, ServersSetChangeAccessRequest::from(message))?;
+
+					let version = message.version.clone().into();
+					let consensus_group = message.consensus_group.iter().cloned().map(Into::into).collect();
+					let new_nodes_map: BTreeMap<_, _> = message.new_nodes_map.iter()
+						.map(|(n, nn)| (n.clone().into(), Some(nn.clone().into())))
+						.collect();
+
+					// check that all id_numbers are filled
+					if new_nodes_map.values().any(Option::is_none) {
+						return Err(Error::ConsensusUnreachable);
+					}
+
+					// check old set of nodes
+					Self::check_nodes_map(&self.core, &version, &consensus_group, &new_nodes_map)?;
+
+					(Some(version), Some(new_nodes_map), Some(consensus_group))
+				},
+				&ConsensusMessageOfShareAdd::ConfirmConsensusInitialization(ref message) => {
+					consensus_session.on_consensus_partial_response(sender, message.is_confirmed)?;
+					(None, None, None)
+				},
+			};
+
+			(
+				is_establishing_consensus,
+				consensus_session.state() == ConsensusSessionState::ConsensusEstablished,
+				version,
+				new_nodes_map,
+				consensus_group,
+			)
+		};
+
+		// update data
+		if let Some(version) = version {
+			data.version = Some(version);
+		}
+		if let Some(new_nodes_map) = new_nodes_map {
+			data.id_numbers = Some(new_nodes_map);
+		}
+		if let Some(consensus_group) = consensus_group {
+			data.secret_subshares = Some(consensus_group.into_iter().map(|n| (n, None)).collect());
+		}
+
+		// if consensus is stablished, proceed
+		if !is_establishing_consensus || !is_consensus_established || self.core.meta.self_node_id != self.core.meta.master_node_id {
+			return Ok(());
+		}
+
+		Self::on_consensus_established(&self.core, &mut *data)
+	}
+
+	/// When common key share data is received by new node.
+	pub fn on_common_key_share_data(&self, sender: &NodeId, message: &KeyShareCommon) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		// only master can send this message
+		if sender != &self.core.meta.master_node_id {
+			return Err(Error::InvalidMessage);
+		}
+
+		let mut data = self.data.lock();
+
+		// check state
+		if data.state != SessionState::ConsensusEstablishing || data.id_numbers.is_none() {
+			return Ok(());
+		}
+
+		// we only expect this message once
+		if data.new_key_share.is_some() {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// check if we actually waiting for this message
+		{
+			let version = data.version.as_ref().ok_or(Error::InvalidStateForRequest)?;
+			let key_version = self.core.key_share.as_ref().and_then(|ks| ks.version(version).ok());
+			if key_version.is_some() {
+				return Ok(());
+			}
+		}
+
+		// update data
+		data.state = SessionState::WaitingForKeysDissemination;
+		data.new_key_share = Some(NewKeyShare {
+			threshold: message.threshold,
+			author: message.author.clone().into(),
+			joint_public: message.joint_public.clone().into(),
+			common_point: message.common_point.clone().map(Into::into),
+			encrypted_point: message.encrypted_point.clone().map(Into::into),
+		});
+
+		let id_numbers = data.id_numbers.as_mut()
+			.expect("common key share data is expected after initialization; id_numers are filled during initialization; qed");
+		for (node, id_number) in &message.id_numbers {
+			let id_number: Secret = id_number.clone().into();
+			{
+				let local_id_number = id_numbers.get(&node.clone().into());
+				match local_id_number {
+					Some(&Some(ref local_id_number)) => {
+						if *local_id_number == id_number {
+							continue;
+						}
+
+						return Err(Error::ConsensusUnreachable);
+					},
+					Some(&None) => (),
+					None => continue, // can happen for isolated nodes
+				}
+			}
+
+			id_numbers.insert(node.clone().into(), Some(id_number));
+		}
+
+		Ok(())
+	}
+
+	/// When keys dissemination message is received.
+	pub fn on_new_keys_dissemination(&self, sender: &NodeId, message: &NewKeysDissemination) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let mut data = self.data.lock();
+
+		// check state
+		if data.state == SessionState::ConsensusEstablishing && data.secret_subshares.is_some() {
+			data.state = SessionState::WaitingForKeysDissemination;
+		} else if data.state != SessionState::WaitingForKeysDissemination {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		// update data
+		let explanation = "secret_subshares is filled during initialization; keys are disseminated after initialization; qed";
+		{
+			match data.secret_subshares.as_ref().expect(explanation).get(sender) {
+				None => return Err(Error::InvalidMessage),
+				Some(&Some(_)) => return Err(Error::InvalidMessage),
+				Some(&None) => (),
+			};
+
+			let secret_subshare = Self::compute_secret_subshare(&self.core, &mut *data, sender, &message.secret_subshare.clone().into())?;
+			*data.secret_subshares.as_mut().expect(explanation)
+				.get_mut(sender)
+				.expect("checked couple of lines above; qed") = Some(secret_subshare);
+		}
+
+		// if we have received subshare from master node, it means that we should start dissemination
+		if sender == &self.core.meta.master_node_id {
+			Self::on_consensus_established(&self.core, &mut *data)?;
+		}
+
+		// check if shares from all nodes are received
+		if data.secret_subshares.as_ref().expect(explanation).values().any(|v| v.is_none()) {
+			return Ok(())
+		}
+
+		// TODO [Trust]: find a way to verificate keys
+		Self::complete_session(&self.core, &mut *data)
+	}
+
+	/// Check nodes map.
+	fn check_nodes_map(core: &SessionCore<T>, version: &H256, consensus_group: &BTreeSet<NodeId>, new_nodes_map: &BTreeMap<NodeId, Option<Secret>>) -> Result<(), Error> {
+		// check if this node has given version
+		let has_this_version = match core.key_share.as_ref() {
+			Some(key_share) => key_share.version(version).is_ok(),
+			None => false,
+		};
+
+		// check && update passed data
+		match has_this_version {
+			true => {
+				// check if version exists
+				let explanation = "has_this_version is true; it is true if we have given version of the key; qed";
+				let key_share = core.key_share.as_ref().expect(explanation);
+				let key_version = key_share.version(version).expect(explanation);
+
+				// there must be exactly thresold + 1 nodes in consensus group
+				if consensus_group.len() != key_share.threshold + 1 {
+					return Err(Error::ConsensusUnreachable);
+				}
+
+				// every non-isolated node must be a part of new_nodes_set
+				let non_isolated_nodes = core.transport.nodes();
+				if key_version.id_numbers.keys().any(|n| non_isolated_nodes.contains(n) && !new_nodes_map.contains_key(n)) {
+					return Err(Error::ConsensusUnreachable);
+				}
+
+				// there must be at least one new node in new_nodes_map
+				if key_version.id_numbers.len() >= new_nodes_map.len() {
+					return Err(Error::ConsensusUnreachable);
+				}
+			},
+			false => {
+				// if we do not have a share, we should not be a part of consenus group
+				// but we must be on new nodes set, since this is a ShareAdd session
+				if consensus_group.contains(&core.meta.self_node_id) ||
+					!new_nodes_map.contains_key(&core.meta.self_node_id) {
+					return Err(Error::ConsensusUnreachable);
+				}
+			},
+		}
+
+		// master node must always be a part of consensus group
+		if !consensus_group.contains(&core.meta.master_node_id) {
+			return Err(Error::ConsensusUnreachable);
+		}
+
+		// master node must always be a part of new_nodes_map
+		if !new_nodes_map.contains_key(&core.meta.master_node_id) {
+			return Err(Error::ConsensusUnreachable);
+		}
+
+		Ok(())
+	}
+
+	/// Start sending ShareAdd-specific messages, when consensus is established.
+	fn on_consensus_established(core: &SessionCore<T>, data: &mut SessionData<T>) -> Result<(), Error> {
+		// update state
+		data.state = SessionState::WaitingForKeysDissemination;
+
+		// if we're not a part of consensus group, wait for secret subshares
+		let explanation = "secret_subshares is a result of consensus job; consensus is established; qed";
+		let is_consensus_group_node = data.secret_subshares.as_ref().expect(explanation).contains_key(&core.meta.self_node_id);
+		if !is_consensus_group_node {
+			return Ok(());
+		}
+
+		// else if master => send shared data to every new node
+		if core.meta.self_node_id == core.meta.master_node_id {
+			Self::disseminate_common_share_data(core, data)?;
+		}
+
+		// ...and then disseminate keys
+		Self::disseminate_keys(core, data)?;
+
+		// ..and check if session could be completed
+		if data.secret_subshares.as_ref().expect(explanation).values().any(|v| v.is_none()) {
+			return Ok(())
+		}
+
+		// TODO [Trust]: find a way to verificate keys
+		Self::complete_session(core, data)
+	}
+
+	/// Send common share data to evey new node.
+	fn disseminate_common_share_data(core: &SessionCore<T>, data: &SessionData<T>) -> Result<(), Error> {
+		let explanation = "disseminate_common_share_data is only called on master node; master node has specified version of the key; qed";
+		let old_key_share = core.key_share.as_ref().expect(explanation);
+		let old_key_version = old_key_share.version(data.version.as_ref().expect(explanation)).expect(explanation);
+		let consensus_group = data.secret_subshares.as_ref()
+			.expect("disseminate_common_share_data is only called on master node; consensus group is created during initialization on master node; qed");
+		let nodes = data.id_numbers.as_ref()
+			.expect("nodes are filled during consensus establishing; common share data sent after consensus is established; qed")
+			.keys()
+			.filter(|n| !consensus_group.contains_key(n));
+		for new_node in nodes {
+			core.transport.send(new_node, ShareAddMessage::KeyShareCommon(KeyShareCommon {
+				session: core.meta.id.clone().into(),
+				session_nonce: core.nonce,
+				threshold: old_key_share.threshold,
+				author: old_key_share.author.clone().into(),
+				joint_public: old_key_share.public.clone().into(),
+				common_point: old_key_share.common_point.clone().map(Into::into),
+				encrypted_point: old_key_share.encrypted_point.clone().map(Into::into),
+				id_numbers: old_key_version.id_numbers.iter().map(|(k, v)| (k.clone().into(), v.clone().into())).collect(),
+			}))?;
+		}
+
+		Ok(())
+	}
+
+	/// Disseminate key refreshing data.
+	fn disseminate_keys(core: &SessionCore<T>, data: &mut SessionData<T>) -> Result<(), Error> {
+		// generate random polynom with secret share as absolute term
+		let explanation = "disseminate_keys is only called on consensus group nodes; consensus group nodes have specified version of the key; qed";
+		let key_share = core.key_share.as_ref().expect(explanation);
+		let key_version = key_share.version(data.version.as_ref().expect(explanation)).expect(explanation);
+		let mut secret_share_polynom = math::generate_random_polynom(key_share.threshold)?;
+		secret_share_polynom[0] = key_version.secret_share.clone();
+
+		// calculate secret subshare for every new node (including this node)
+		let explanation = "disseminate_keys is called after initialization has completed; this field is filled during initialization; qed";
+		for (new_node, new_node_number) in data.id_numbers.as_ref().expect(explanation).iter() {
+			let new_node_number = new_node_number.as_ref().ok_or(Error::InvalidMessage)?;
+			let secret_subshare = math::compute_polynom(&secret_share_polynom, new_node_number)?;
+			if new_node != &core.meta.self_node_id {
+				core.transport.send(new_node, ShareAddMessage::NewKeysDissemination(NewKeysDissemination {
+					session: core.meta.id.clone().into(),
+					session_nonce: core.nonce,
+					secret_subshare: secret_subshare.into(),
+				}))?;
+			} else {
+				let secret_subshare = Self::compute_secret_subshare(core, data, new_node, &secret_subshare)?;
+				*data.secret_subshares.as_mut().expect(explanation)
+					.get_mut(&core.meta.self_node_id)
+					.expect("disseminate_keys is only calle on consensus group nodes; there's entry for every consensus node in secret_subshares; qed")
+						= Some(secret_subshare);
+			}
+		}
+
+		Ok(())
+	}
+
+	/// Compute secret subshare from passed secret value.
+	fn compute_secret_subshare(core: &SessionCore<T>, data: &SessionData<T>, sender: &NodeId, secret_value: &Secret) -> Result<Secret, Error> {
+		let explanation = "this field is a result of consensus job; compute_secret_subshare is called after consensus is established";
+		let id_numbers = data.id_numbers.as_ref().expect(explanation);
+		let secret_subshares = data.secret_subshares.as_ref().expect(explanation);
+		let threshold = core.key_share.as_ref().map(|ks| ks.threshold)
+			.unwrap_or_else(|| data.new_key_share.as_ref()
+				.expect("computation occurs after receiving key share threshold if not having one already; qed")
+				.threshold);
+
+		let explanation = "id_numbers are checked to have Some value for every consensus group node when consensus is establishe; qed";
+		let sender_id_number = id_numbers[sender].as_ref().expect(explanation);
+		let other_id_numbers = secret_subshares.keys().filter(|k| *k != sender).map(|n| id_numbers[n].as_ref().expect(explanation));
+		math::compute_secret_subshare(threshold, secret_value, sender_id_number, other_id_numbers)
+	}
+
+	/// Complete session.
+	fn complete_session(core: &SessionCore<T>, data: &mut SessionData<T>) -> Result<(), Error> {
+		// if already completed, do nothing
+		if data.state == SessionState::Finished {
+			return Ok(());
+		}
+
+		// compose updated key share
+		let explanation = "this field is a result of consensus job; complete_session is called after consensus is established";
+		let id_numbers = data.id_numbers.as_ref().expect(explanation);
+		let secret_subshares = data.secret_subshares.as_ref()
+			.expect("nodes are filled during consensus establishing; session is completed after consensus is established; qed");
+		let secret_share = math::compute_secret_share(secret_subshares.values().map(|ss| ss.as_ref()
+			.expect("complete_session is only called when subshares from all nodes are received; qed")))?;
+
+		let refreshed_key_version = DocumentKeyShareVersion::new(id_numbers.clone().into_iter().map(|(k, v)| (k.clone(),
+			v.expect("id_numbers are checked to have Some value for every consensus group node when consensus is establishe; qed"))).collect(),
+			secret_share);
+		let mut refreshed_key_share = core.key_share.as_ref().cloned().unwrap_or_else(|| {
+			let new_key_share = data.new_key_share.as_ref()
+				.expect("this is new node; on new nodes this field is filled before KRD; session is completed after KRD; qed");
+			DocumentKeyShare {
+				author: new_key_share.author.clone(),
+				threshold: new_key_share.threshold,
+				public: new_key_share.joint_public.clone(),
+				common_point: new_key_share.common_point.clone(),
+				encrypted_point: new_key_share.encrypted_point.clone(),
+				versions: Vec::new(),
+			}
+		});
+		refreshed_key_share.versions.push(refreshed_key_version);
+
+		// save encrypted data to the key storage
+		data.state = SessionState::Finished;
+		if core.key_share.is_some() {
+			core.key_storage.update(core.meta.id.clone(), refreshed_key_share.clone())
+		} else {
+			core.key_storage.insert(core.meta.id.clone(), refreshed_key_share.clone())
+		}.map_err(|e| Error::KeyStorage(e.into()))?;
+
+		// signal session completion
+		data.state = SessionState::Finished;
+		data.result = Some(Ok(()));
+		core.completed.notify_all();
+
+		Ok(())
+	}
+}
+
+impl<T> ClusterSession for SessionImpl<T> where T: SessionTransport {
+	type Id = SessionId;
+
+	fn type_name() -> &'static str {
+		"share add"
+	}
+
+	fn id(&self) -> SessionId {
+		self.core.meta.id.clone()
+	}
+
+	fn is_finished(&self) -> bool {
+		self.data.lock().state == SessionState::Finished
+	}
+
+	fn on_session_timeout(&self) {
+		self.on_session_error(&self.core.meta.self_node_id, Error::NodeDisconnected)
+	}
+
+	fn on_node_timeout(&self, node: &NodeId) {
+		self.on_session_error(node, Error::NodeDisconnected)
+	}
+
+	fn on_session_error(&self, node: &NodeId, error: Error) {
+		// error in generation session is considered fatal
+		// => broadcast error if error occured on this node
+		if *node == self.core.meta.self_node_id {
+			for node in self.core.transport.nodes() {
+				// do not bother processing send error, as we already processing error
+				let _ = self.core.transport.send(&node, ShareAddMessage::ShareAddError(ShareAddError {
+					session: self.core.meta.id.clone().into(),
+					session_nonce: self.core.nonce,
+					error: error.clone().into(),
+				}));
+			}
+		}
+
+		let mut data = self.data.lock();
+
+		warn!("{}: share add session failed: {} on {}", self.core.meta.self_node_id, error, node);
+
+		data.state = SessionState::Finished;
+		data.result = Some(Err(error));
+		self.core.completed.notify_all();
+	}
+
+	fn on_message(&self, sender: &NodeId, message: &Message) -> Result<(), Error> {
+		match *message {
+			Message::ShareAdd(ref message) => self.process_message(sender, message),
+			_ => unreachable!("cluster checks message to be correct before passing; qed"),
+		}
+	}
+}
+
+impl IsolatedSessionTransport {
+	pub fn new(session_id: SessionId, version: Option<H256>, nonce: u64, cluster: Arc<Cluster>) -> Self {
+		IsolatedSessionTransport {
+			session: session_id,
+			version: version,
+			nonce: nonce,
+			cluster: cluster,
+			id_numbers: None,
+			consensus_group: None,
+		}
+	}
+}
+
+impl JobTransport for IsolatedSessionTransport {
+	type PartialJobRequest = ServersSetChangeAccessRequest;
+	type PartialJobResponse = bool;
+
+	fn send_partial_request(&self, node: &NodeId, request: ServersSetChangeAccessRequest) -> Result<(), Error> {
+		let explanation = "partial requests are sent from master node only; on master node this field is filled during creation; qed";
+		let id_numbers = self.id_numbers.as_ref().expect(explanation);
+
+		self.cluster.send(node, Message::ShareAdd(ShareAddMessage::ShareAddConsensusMessage(ShareAddConsensusMessage {
+			session: self.session.clone().into(),
+			session_nonce: self.nonce,
+			message: ConsensusMessageOfShareAdd::InitializeConsensusSession(InitializeConsensusSessionOfShareAdd {
+				version: self.version.clone().expect(explanation).into(),
+				consensus_group: self.consensus_group.as_ref().expect(explanation).iter().cloned().map(Into::into).collect(),
+				old_nodes_set: request.old_servers_set.into_iter().map(Into::into).collect(),
+				new_nodes_map: request.new_servers_set.into_iter()
+					.filter_map(|n| id_numbers.get(&n)
+						.map(|id| (n.into(), id.clone()
+							.expect("partial requests are sent from master node only after consensus is established;
+								on master id_numbers are initialized with Some id_number for every consensus group node; qed").into())))
+					.collect(),
+				old_set_signature: request.old_set_signature.into(),
+				new_set_signature: request.new_set_signature.into(),
+			}),
+		})))
+	}
+
+	fn send_partial_response(&self, node: &NodeId, response: bool) -> Result<(), Error> {
+		self.cluster.send(node, Message::ShareAdd(ShareAddMessage::ShareAddConsensusMessage(ShareAddConsensusMessage {
+			session: self.session.clone().into(),
+			session_nonce: self.nonce,
+			message: ConsensusMessageOfShareAdd::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
+				is_confirmed: response,
+			}),
+		})))
+	}
+}
+
+impl SessionTransport for IsolatedSessionTransport {
+	fn nodes(&self) -> BTreeSet<NodeId> {
+		self.cluster.nodes()
+	}
+
+	fn set_master_data(&mut self, consensus_group: BTreeSet<NodeId>, id_numbers: BTreeMap<NodeId, Option<Secret>>) {
+		self.consensus_group = Some(consensus_group);
+		self.id_numbers = Some(id_numbers);
+	}
+
+	fn send(&self, node: &NodeId, message: ShareAddMessage) -> Result<(), Error> {
+		self.cluster.send(node, Message::ShareAdd(message))
+	}
+}
+
+#[cfg(test)]
+pub mod tests {
+	use std::sync::Arc;
+	use std::collections::{VecDeque, BTreeMap, BTreeSet};
+	use ethkey::{Random, Generator, Public, KeyPair, Signature, sign};
+	use ethereum_types::H256;
+	use key_server_cluster::{NodeId, SessionId, Error, KeyStorage, DummyKeyStorage};
+	use key_server_cluster::cluster::Cluster;
+	use key_server_cluster::cluster::tests::DummyCluster;
+	use key_server_cluster::cluster_sessions::ClusterSession;
+	use key_server_cluster::generation_session::tests::{Node as GenerationNode, generate_nodes_ids};
+	use key_server_cluster::math;
+	use key_server_cluster::message::Message;
+	use key_server_cluster::servers_set_change_session::tests::generate_key;
+	use key_server_cluster::jobs::servers_set_change_access_job::ordered_nodes_hash;
+	use key_server_cluster::admin_sessions::ShareChangeSessionMeta;
+	use super::{SessionImpl, SessionParams, IsolatedSessionTransport};
+
+	struct Node {
+		pub cluster: Arc<DummyCluster>,
+		pub key_storage: Arc<DummyKeyStorage>,
+		pub session: SessionImpl<IsolatedSessionTransport>,
+	}
+
+	struct MessageLoop {
+		pub admin_key_pair: KeyPair,
+		pub original_key_pair: KeyPair,
+		pub old_nodes_set: BTreeSet<NodeId>,
+		pub new_nodes_set: BTreeSet<NodeId>,
+		pub old_set_signature: Signature,
+		pub new_set_signature: Signature,
+		pub nodes: BTreeMap<NodeId, Node>,
+		pub queue: VecDeque<(NodeId, NodeId, Message)>,
+		pub version: H256,
+	}
+
+	fn create_session(mut meta: ShareChangeSessionMeta, admin_public: Public, self_node_id: NodeId, cluster: Arc<Cluster>, key_storage: Arc<KeyStorage>) -> SessionImpl<IsolatedSessionTransport> {
+		let session_id = meta.id.clone();
+		meta.self_node_id = self_node_id;
+		let key_version = key_storage.get(&session_id).unwrap().map(|ks| ks.versions.iter().last().unwrap().hash.clone());
+
+		SessionImpl::new(SessionParams {
+			meta: meta.clone(),
+			transport: IsolatedSessionTransport::new(session_id, key_version, 1, cluster),
+			key_storage: key_storage,
+			admin_public: Some(admin_public),
+			nonce: 1,
+		}).unwrap()
+	}
+
+	fn create_node(meta: ShareChangeSessionMeta, admin_public: Public, node: GenerationNode, added_nodes: &BTreeSet<NodeId>) -> Node {
+		node.cluster.add_nodes(added_nodes.iter().cloned());
+		Node {
+			cluster: node.cluster.clone(),
+			key_storage: node.key_storage.clone(),
+			session: create_session(meta, admin_public, node.session.node().clone(), node.cluster, node.key_storage),
+		}
+	}
+
+	/// This only works for schemes where threshold = 1
+	pub fn check_secret_is_preserved(joint_key_pair: KeyPair, nodes: BTreeMap<NodeId, Arc<DummyKeyStorage>>) {
+		let n = nodes.len();
+		let document_secret_plain = math::generate_random_point().unwrap();
+		for n1 in 0..n {
+			for n2 in n1+1..n {
+				let share1 = nodes.values().nth(n1).unwrap().get(&SessionId::default()).unwrap();
+				let share2 = nodes.values().nth(n2).unwrap().get(&SessionId::default()).unwrap();
+				let id_number1 = share1.as_ref().unwrap().last_version().unwrap().id_numbers[nodes.keys().nth(n1).unwrap()].clone();
+				let id_number2 = share1.as_ref().unwrap().last_version().unwrap().id_numbers[nodes.keys().nth(n2).unwrap()].clone();
+
+				// now encrypt and decrypt data
+				let (document_secret_decrypted, document_secret_decrypted_test) =
+					math::tests::do_encryption_and_decryption(1,
+						joint_key_pair.public(),
+						&[id_number1, id_number2],
+						&[share1.unwrap().last_version().unwrap().secret_share.clone(),
+							share2.unwrap().last_version().unwrap().secret_share.clone()],
+						Some(joint_key_pair.secret()),
+						document_secret_plain.clone());
+
+				assert_eq!(document_secret_plain, document_secret_decrypted_test);
+				assert_eq!(document_secret_plain, document_secret_decrypted);
+			}
+		}
+	}
+
+	impl MessageLoop {
+		pub fn new(t: usize, master_node_id: NodeId, old_nodes_set: BTreeSet<NodeId>, new_nodes_set: BTreeSet<NodeId>) -> Self {
+			// generate admin key pair
+			let admin_key_pair = Random.generate().unwrap();
+			let admin_public = admin_key_pair.public().clone();
+
+			// run initial generation session
+			let gml = generate_key(t, old_nodes_set.clone());
+
+			// compute original secret key
+			let version = gml.nodes.values().nth(0).unwrap().key_storage.get(&Default::default()).unwrap().unwrap().versions[0].hash.clone();
+			let original_key_pair = gml.compute_key_pair(t);
+
+			// prepare sessions on all nodes
+			let meta = ShareChangeSessionMeta {
+				id: SessionId::default(),
+				self_node_id: NodeId::default(),
+				master_node_id: master_node_id,
+			};
+			let new_nodes = new_nodes_set.iter()
+				.filter(|n| !old_nodes_set.contains(&n))
+				.map(|new_node_id| {
+					let new_node_cluster = Arc::new(DummyCluster::new(new_node_id.clone()));
+					let new_node_key_storage = Arc::new(DummyKeyStorage::default());
+					let new_node_session = create_session(meta.clone(), admin_public.clone(), new_node_id.clone(), new_node_cluster.clone(), new_node_key_storage.clone());
+					new_node_cluster.add_nodes(new_nodes_set.iter().cloned());
+					Node {
+						cluster: new_node_cluster,
+						key_storage: new_node_key_storage,
+						session: new_node_session,
+					}
+				});
+			let old_nodes = gml.nodes.into_iter().map(|gn| create_node(meta.clone(), admin_public.clone(), gn.1, &new_nodes_set));
+			let nodes = old_nodes.chain(new_nodes).map(|n| (n.session.core.meta.self_node_id.clone(), n)).collect();
+
+			let old_set_signature = sign(admin_key_pair.secret(), &ordered_nodes_hash(&old_nodes_set)).unwrap();
+			let new_set_signature = sign(admin_key_pair.secret(), &ordered_nodes_hash(&new_nodes_set)).unwrap();
+			MessageLoop {
+				admin_key_pair: admin_key_pair,
+				original_key_pair: original_key_pair,
+				version: version,
+				old_nodes_set: old_nodes_set.clone(),
+				new_nodes_set: new_nodes_set.clone(),
+				old_set_signature: old_set_signature,
+				new_set_signature: new_set_signature,
+				nodes: nodes,
+				queue: Default::default(),
+			}
+		}
+
+		pub fn new_additional(master_node_id: NodeId, ml: MessageLoop, new_nodes_set: BTreeSet<NodeId>) -> Self {
+			let version = ml.nodes.values().nth(0).unwrap().key_storage.get(&Default::default()).unwrap().unwrap().versions.last().unwrap().hash.clone();
+
+			// prepare sessions on all nodes
+			let meta = ShareChangeSessionMeta {
+				id: SessionId::default(),
+				self_node_id: NodeId::default(),
+				master_node_id: master_node_id,
+			};
+			let old_nodes_set = ml.nodes.keys().cloned().collect();
+			let nodes = ml.nodes.iter()
+				.map(|(n, nd)| {
+					let node_cluster = nd.cluster.clone();
+					let node_key_storage = nd.key_storage.clone();
+					let node_session = create_session(meta.clone(), ml.admin_key_pair.public().clone(), n.clone(), node_cluster.clone(), node_key_storage.clone());
+					node_cluster.add_nodes(new_nodes_set.iter().cloned());
+					(n.clone(), Node {
+						cluster: node_cluster,
+						key_storage: node_key_storage,
+						session: node_session,
+					})
+				}).chain(new_nodes_set.difference(&old_nodes_set).map(|n| {
+					let new_node_cluster = Arc::new(DummyCluster::new(n.clone()));
+					let new_node_key_storage = Arc::new(DummyKeyStorage::default());
+					let new_node_session = create_session(meta.clone(), ml.admin_key_pair.public().clone(), n.clone(), new_node_cluster.clone(), new_node_key_storage.clone());
+					new_node_cluster.add_nodes(new_nodes_set.iter().cloned());
+					(n.clone(), Node {
+						cluster: new_node_cluster,
+						key_storage: new_node_key_storage,
+						session: new_node_session,
+					})
+				})).collect();
+
+			let old_set_signature = sign(ml.admin_key_pair.secret(), &ordered_nodes_hash(&old_nodes_set)).unwrap();
+			let new_set_signature = sign(ml.admin_key_pair.secret(), &ordered_nodes_hash(&new_nodes_set)).unwrap();
+			MessageLoop {
+				admin_key_pair: ml.admin_key_pair,
+				original_key_pair: ml.original_key_pair,
+				version: version,
+				old_nodes_set: old_nodes_set.clone(),
+				new_nodes_set: new_nodes_set.clone(),
+				old_set_signature: old_set_signature,
+				new_set_signature: new_set_signature,
+				nodes: nodes,
+				queue: Default::default(),
+			}
+		}
+
+		pub fn update_signature(&mut self) {
+			self.old_set_signature = sign(self.admin_key_pair.secret(), &ordered_nodes_hash(&self.old_nodes_set)).unwrap();
+			self.new_set_signature = sign(self.admin_key_pair.secret(), &ordered_nodes_hash(&self.new_nodes_set)).unwrap();
+		}
+
+		pub fn run(&mut self) {
+			while let Some((from, to, message)) = self.take_message() {
+				self.process_message((from, to, message)).unwrap();
+			}
+		}
+
+		pub fn take_message(&mut self) -> Option<(NodeId, NodeId, Message)> {
+			self.nodes.values()
+				.filter_map(|n| n.cluster.take_message().map(|m| (n.session.core.meta.self_node_id.clone(), m.0, m.1)))
+				.nth(0)
+				.or_else(|| self.queue.pop_front())
+		}
+
+		pub fn process_message(&mut self, msg: (NodeId, NodeId, Message)) -> Result<(), Error> {
+			match { match msg.2 {
+				Message::ShareAdd(ref message) =>
+					self.nodes[&msg.1].session.process_message(&msg.0, message),
+				_ => unreachable!("only servers set change messages are expected"),
+			} } {
+				Ok(_) => Ok(()),
+				Err(Error::TooEarlyForRequest) => {
+					self.queue.push_back(msg);
+					Ok(())
+				},
+				Err(err) => Err(err),
+			}
+		}
+	}
+
+	#[test]
+	fn node_add_fails_if_nodes_removed() {
+		let old_nodes_set = generate_nodes_ids(3);
+		let master_node_id = old_nodes_set.iter().cloned().nth(0).unwrap();
+		let node_to_remove_id = old_nodes_set.iter().cloned().nth(1).unwrap();
+		let mut new_nodes_set: BTreeSet<_> = old_nodes_set.clone().into_iter().chain(generate_nodes_ids(1)).collect();
+		new_nodes_set.remove(&node_to_remove_id);
+		let ml = MessageLoop::new(1, master_node_id.clone(), old_nodes_set, new_nodes_set.clone());
+		assert_eq!(ml.nodes[&master_node_id].session.initialize(Some(ml.version), Some(new_nodes_set),
+			Some(ml.old_set_signature.clone()),
+			Some(ml.new_set_signature.clone())
+		).unwrap_err(), Error::ConsensusUnreachable);
+	}
+
+	#[test]
+	fn node_add_fails_if_no_nodes_added() {
+		let old_nodes_set = generate_nodes_ids(3);
+		let master_node_id = old_nodes_set.iter().cloned().nth(0).unwrap();
+		let new_nodes_set = old_nodes_set.clone();
+		let ml = MessageLoop::new(1, master_node_id.clone(), old_nodes_set, new_nodes_set.clone());
+		assert_eq!(ml.nodes[&master_node_id].session.initialize(Some(ml.version), Some(new_nodes_set),
+			Some(ml.old_set_signature.clone()),
+			Some(ml.new_set_signature.clone())
+		).unwrap_err(), Error::ConsensusUnreachable);
+	}
+
+	#[test]
+	fn node_add_fails_if_started_on_adding_node() {
+		let old_nodes_set = generate_nodes_ids(3);
+		let nodes_to_add_set = generate_nodes_ids(1);
+		let master_node_id = nodes_to_add_set.iter().cloned().nth(0).unwrap();
+		let new_nodes_set: BTreeSet<_> = old_nodes_set.clone().into_iter().chain(nodes_to_add_set.into_iter()).collect();
+		let ml = MessageLoop::new(1, master_node_id.clone(), old_nodes_set, new_nodes_set.clone());
+		assert_eq!(ml.nodes[&master_node_id].session.initialize(Some(ml.version), Some(new_nodes_set),
+			Some(ml.old_set_signature.clone()),
+			Some(ml.new_set_signature.clone())
+		).unwrap_err(), Error::KeyStorage("key share is not found on master node".into()));
+	}
+
+	#[test]
+	fn node_add_fails_if_initialized_twice() {
+		let old_nodes_set = generate_nodes_ids(3);
+		let master_node_id = old_nodes_set.iter().cloned().nth(0).unwrap();
+		let new_nodes_set: BTreeSet<_> = old_nodes_set.clone().into_iter().chain(generate_nodes_ids(1)).collect();
+		let ml = MessageLoop::new(1, master_node_id.clone(), old_nodes_set, new_nodes_set.clone());
+		assert_eq!(ml.nodes[&master_node_id].session.initialize(Some(ml.version), Some(new_nodes_set.clone()),
+			Some(ml.old_set_signature.clone()),
+			Some(ml.new_set_signature.clone())
+		), Ok(()));
+		assert_eq!(ml.nodes[&master_node_id].session.initialize(Some(ml.version), Some(new_nodes_set),
+			Some(ml.old_set_signature.clone()),
+			Some(ml.new_set_signature.clone())
+		), Err(Error::InvalidStateForRequest));
+	}
+
+	#[test]
+	fn node_add_fails_if_started_without_signatures() {
+		let old_nodes_set = generate_nodes_ids(3);
+		let master_node_id = old_nodes_set.iter().cloned().nth(0).unwrap();
+		let new_nodes_set: BTreeSet<_> = old_nodes_set.clone().into_iter().chain(generate_nodes_ids(1)).collect();
+		let ml = MessageLoop::new(1, master_node_id.clone(), old_nodes_set, new_nodes_set.clone());
+		assert_eq!(ml.nodes[&master_node_id].session.initialize(None, None, None, None), Err(Error::InvalidMessage));
+	}
+
+	#[test]
+	fn nodes_added_using_share_add() {
+		let test_cases = vec![(3, 1), (3, 3)];
+		for (n, nodes_to_add) in test_cases {
+			// generate key && prepare ShareAdd sessions
+			let old_nodes_set = generate_nodes_ids(n);
+			let new_nodes_set: BTreeSet<_> = old_nodes_set.clone().into_iter().chain(generate_nodes_ids(nodes_to_add)).collect();
+			let master_node_id = old_nodes_set.iter().cloned().nth(0).unwrap();
+			let mut ml = MessageLoop::new(1, master_node_id.clone(), old_nodes_set, new_nodes_set.clone());
+
+			// initialize session on master node && run to completion
+			ml.nodes[&master_node_id].session.initialize(Some(ml.version), Some(new_nodes_set),
+				Some(ml.old_set_signature.clone()),
+				Some(ml.new_set_signature.clone())).unwrap();
+			ml.run();
+
+			// check that session has completed on all nodes
+			assert!(ml.nodes.values().all(|n| n.session.is_finished()));
+
+			// check that secret is still the same as before adding the share
+			check_secret_is_preserved(ml.original_key_pair.clone(), ml.nodes.iter().map(|(k, v)| (k.clone(), v.key_storage.clone())).collect());
+		}
+	}
+
+	#[test]
+	fn nodes_added_using_share_add_with_isolated_nodes() {
+		let (n, nodes_to_add) = (3, 3);
+
+		// generate key && prepare ShareAdd sessions
+		let old_nodes_set = generate_nodes_ids(n);
+		let new_nodes_set: BTreeSet<_> = old_nodes_set.clone().into_iter().chain(generate_nodes_ids(nodes_to_add)).collect();
+		let master_node_id = old_nodes_set.iter().cloned().nth(0).unwrap();
+		let isolated_node_id = old_nodes_set.iter().cloned().nth(1).unwrap();
+		let mut ml = MessageLoop::new(1, master_node_id.clone(), old_nodes_set, new_nodes_set.clone());
+
+		// now let's isolate 1 of 3 nodes owning key share
+		ml.nodes.remove(&isolated_node_id);
+		ml.old_nodes_set.remove(&isolated_node_id);
+		ml.new_nodes_set.remove(&isolated_node_id);
+		for (_, node) in ml.nodes.iter_mut() {
+			node.cluster.remove_node(&isolated_node_id);
+		}
+		ml.update_signature();
+
+		// initialize session on master node && run to completion
+		ml.nodes[&master_node_id].session.initialize(Some(ml.version), Some(new_nodes_set),
+			Some(ml.old_set_signature.clone()),
+			Some(ml.new_set_signature.clone())).unwrap();
+		ml.run();
+
+		// check that session has completed on all nodes
+		assert!(ml.nodes.values().all(|n| n.session.is_finished()));
+
+		// check that secret is still the same as before adding the share
+		check_secret_is_preserved(ml.original_key_pair.clone(), ml.nodes
+			.iter()
+			.map(|(k, v)| (k.clone(), v.key_storage.clone()))
+			.collect());
+	}
+
+	#[test]
+	fn nodes_add_to_the_node_with_obsolete_version() {
+		let (n, nodes_to_add) = (3, 3);
+
+		// generate key (2-of-3) && prepare ShareAdd sessions
+		let old_nodes_set = generate_nodes_ids(n);
+		let newest_nodes_set = generate_nodes_ids(nodes_to_add);
+		let new_nodes_set: BTreeSet<_> = old_nodes_set.clone().into_iter().chain(newest_nodes_set.clone()).collect();
+		let master_node_id = old_nodes_set.iter().cloned().nth(0).unwrap();
+		let isolated_node_id = old_nodes_set.iter().cloned().nth(1).unwrap();
+		let oldest_nodes_set: BTreeSet<_> = old_nodes_set.iter().filter(|n| **n != isolated_node_id).cloned().collect();
+		let mut ml = MessageLoop::new(1, master_node_id.clone(), old_nodes_set.clone(), new_nodes_set.clone());
+		let isolated_key_storage = ml.nodes[&isolated_node_id].key_storage.clone();
+
+		// now let's isolate 1 of 3 nodes owning key share
+		ml.nodes.remove(&isolated_node_id);
+		ml.old_nodes_set.remove(&isolated_node_id);
+		ml.new_nodes_set.remove(&isolated_node_id);
+		for (_, node) in ml.nodes.iter_mut() {
+			node.cluster.remove_node(&isolated_node_id);
+		}
+		ml.update_signature();
+
+		// initialize session on master node && run to completion (2-of-5)
+		ml.nodes[&master_node_id].session.initialize(Some(ml.version), Some(new_nodes_set),
+			Some(ml.old_set_signature.clone()),
+			Some(ml.new_set_signature.clone())).unwrap();
+		ml.run();
+
+		// now let's add back old node so that key becames 2-of-6
+		let new_nodes_set: BTreeSet<_> = ml.nodes.keys().cloned().chain(::std::iter::once(isolated_node_id.clone())).collect();
+		let mut ml = MessageLoop::new_additional(master_node_id.clone(), ml, new_nodes_set.clone());
+		ml.nodes.get_mut(&isolated_node_id).unwrap().key_storage = isolated_key_storage.clone();
+		ml.nodes.get_mut(&isolated_node_id).unwrap().session.core.key_share = isolated_key_storage.get(&Default::default()).unwrap();
+		ml.nodes.get_mut(&isolated_node_id).unwrap().session.core.key_storage = isolated_key_storage;
+
+		// initialize session on master node && run to completion (2-of65)
+		ml.nodes[&master_node_id].session.initialize(Some(ml.version), Some(new_nodes_set),
+			Some(ml.old_set_signature.clone()),
+			Some(ml.new_set_signature.clone())).unwrap();
+		ml.run();
+
+		// check that session has completed on all nodes
+		assert!(ml.nodes.values().all(|n| n.session.is_finished()));
+
+		// check that secret is still the same as before adding the share
+		check_secret_is_preserved(ml.original_key_pair.clone(), ml.nodes
+			.iter()
+			.map(|(k, v)| (k.clone(), v.key_storage.clone()))
+			.collect());
+
+		// check that all oldest nodes have versions A, B, C
+		// isolated node has version A, C
+		// new nodes have versions B, C
+		let oldest_key_share = ml.nodes[oldest_nodes_set.iter().nth(0).unwrap()].key_storage.get(&Default::default()).unwrap().unwrap();
+		debug_assert_eq!(oldest_key_share.versions.len(), 3);
+		let version_a = oldest_key_share.versions[0].hash.clone();
+		let version_b = oldest_key_share.versions[1].hash.clone();
+		let version_c = oldest_key_share.versions[2].hash.clone();
+		debug_assert!(version_a != version_b && version_b != version_c);
+
+		debug_assert!(oldest_nodes_set.iter().all(|n| vec![version_a.clone(), version_b.clone(), version_c.clone()] ==
+			ml.nodes[n].key_storage.get(&Default::default()).unwrap().unwrap().versions.iter().map(|v| v.hash.clone()).collect::<Vec<_>>()));
+		debug_assert!(::std::iter::once(&isolated_node_id).all(|n| vec![version_a.clone(), version_c.clone()] ==
+			ml.nodes[n].key_storage.get(&Default::default()).unwrap().unwrap().versions.iter().map(|v| v.hash.clone()).collect::<Vec<_>>()));
+		debug_assert!(newest_nodes_set.iter().all(|n| vec![version_b.clone(), version_c.clone()] ==
+			ml.nodes[n].key_storage.get(&Default::default()).unwrap().unwrap().versions.iter().map(|v| v.hash.clone()).collect::<Vec<_>>()));
+	}
+
+	#[test]
+	fn nodes_add_fails_when_not_enough_share_owners_are_connected() {
+		let (n, nodes_to_add) = (3, 3);
+
+		// generate key (2-of-3) && prepare ShareAdd sessions
+		let old_nodes_set = generate_nodes_ids(n);
+		let new_nodes_set: BTreeSet<_> = old_nodes_set.clone().into_iter().chain(generate_nodes_ids(nodes_to_add)).collect();
+		let master_node_id = old_nodes_set.iter().cloned().nth(0).unwrap();
+		let isolated_node_id1 = old_nodes_set.iter().cloned().nth(1).unwrap();
+		let isolated_node_id2 = old_nodes_set.iter().cloned().nth(2).unwrap();
+		let mut ml = MessageLoop::new(1, master_node_id.clone(), old_nodes_set.clone(), new_nodes_set.clone());
+
+		// now let's isolate 2 of 3 nodes owning key share
+		ml.nodes.remove(&isolated_node_id1);
+		ml.nodes.remove(&isolated_node_id2);
+		ml.old_nodes_set.remove(&isolated_node_id1);
+		ml.new_nodes_set.remove(&isolated_node_id1);
+		ml.old_nodes_set.remove(&isolated_node_id2);
+		ml.new_nodes_set.remove(&isolated_node_id2);
+		for (_, node) in ml.nodes.iter_mut() {
+			node.cluster.remove_node(&isolated_node_id1);
+			node.cluster.remove_node(&isolated_node_id2);
+		}
+		ml.update_signature();
+
+		// initialize session on master node && run to completion (2-of-5)
+		assert_eq!(ml.nodes[&master_node_id].session.initialize(Some(ml.version), Some(new_nodes_set),
+			Some(ml.old_set_signature.clone()),
+			Some(ml.new_set_signature.clone())).map(|_| ()), Err(Error::ConsensusUnreachable));
+	}
+}
diff --git a/secret_store/src/key_server_cluster/admin_sessions/share_change_session.rs b/secret_store/src/key_server_cluster/admin_sessions/share_change_session.rs
new file mode 100644
index 0000000000000000000000000000000000000000..228d7ba987645ec7df4796bf8d7cdfdb64347419
--- /dev/null
+++ b/secret_store/src/key_server_cluster/admin_sessions/share_change_session.rs
@@ -0,0 +1,305 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+use std::collections::{BTreeSet, BTreeMap};
+use ethereum_types::H256;
+use ethkey::Secret;
+use key_server_cluster::{Error, NodeId, SessionId, KeyStorage};
+use key_server_cluster::cluster::Cluster;
+use key_server_cluster::cluster_sessions::ClusterSession;
+use key_server_cluster::math;
+use key_server_cluster::jobs::servers_set_change_access_job::ServersSetChangeAccessRequest;
+use key_server_cluster::jobs::job_session::JobTransport;
+use key_server_cluster::message::{Message, ServersSetChangeMessage, ServersSetChangeShareAddMessage};
+use key_server_cluster::share_add_session::{SessionTransport as ShareAddSessionTransport,
+	SessionImpl as ShareAddSessionImpl, SessionParams as ShareAddSessionParams};
+use key_server_cluster::message::ShareAddMessage;
+use key_server_cluster::admin_sessions::ShareChangeSessionMeta;
+
+/// Single session meta-change session. Brief overview:
+/// 1) nodes that have been already removed from cluster (isolated nodes) are removed from session
+/// 2) new shares are added to the session
+/// 3) shares are moved between nodes
+/// 4) shares are removed from nodes
+pub struct ShareChangeSession {
+	/// Servers set change session id.
+	session_id: SessionId,
+	/// Session nonce.
+	nonce: u64,
+	/// Share change session meta.
+	meta: ShareChangeSessionMeta,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+	/// Key storage.
+	key_storage: Arc<KeyStorage>,
+	/// Key version.
+	key_version: H256,
+	/// Consensus group to use in ShareAdd session.
+	consensus_group: Option<BTreeSet<NodeId>>,
+	/// Nodes to add shares for.
+	new_nodes_map: Option<BTreeMap<NodeId, Option<Secret>>>,
+	/// Share add session.
+	share_add_session: Option<ShareAddSessionImpl<ShareChangeTransport>>,
+	/// Is finished.
+	is_finished: bool,
+}
+
+/// Share change session plan.
+#[derive(Debug)]
+pub struct ShareChangeSessionPlan {
+	/// Key version that plan is valid for.
+	pub key_version: H256,
+	/// Consensus group to use in ShareAdd session.
+	pub consensus_group: BTreeSet<NodeId>,
+	/// Nodes to add shares for.
+	pub new_nodes_map: BTreeMap<NodeId, Option<Secret>>,
+}
+
+/// Session parameters.
+pub struct ShareChangeSessionParams {
+	/// Servers set change session id.
+	pub session_id: SessionId,
+	/// Session nonce.
+	pub nonce: u64,
+	/// Share change session meta.
+	pub meta: ShareChangeSessionMeta,
+	/// Cluster.
+	pub cluster: Arc<Cluster>,
+	/// Keys storage.
+	pub key_storage: Arc<KeyStorage>,
+	/// Session plan.
+	pub plan: ShareChangeSessionPlan,
+}
+
+/// Share add session transport.
+#[derive(Clone)]
+pub struct ShareChangeTransport {
+	/// Servers set change session id.
+	session_id: SessionId,
+	/// Session nonce.
+	nonce: u64,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+}
+
+impl ShareChangeSession {
+	/// Create new share change session.
+	pub fn new(params: ShareChangeSessionParams) -> Result<Self, Error> {
+		// we can't create sessions right now, because key share is read when session is created, but it can change in previous session
+		let key_version = params.plan.key_version;
+		let consensus_group = if !params.plan.consensus_group.is_empty() { Some(params.plan.consensus_group) } else { None };
+		let new_nodes_map = if !params.plan.new_nodes_map.is_empty() { Some(params.plan.new_nodes_map) } else { None };
+		debug_assert!(new_nodes_map.is_some());
+
+		let is_finished = new_nodes_map.is_none();
+		Ok(ShareChangeSession {
+			session_id: params.session_id,
+			nonce: params.nonce,
+			meta: params.meta,
+			cluster: params.cluster,
+			key_storage: params.key_storage,
+			key_version: key_version,
+			consensus_group: consensus_group,
+			new_nodes_map: new_nodes_map,
+			share_add_session: None,
+			is_finished: is_finished,
+		})
+	}
+
+	/// Is finished?.
+	pub fn is_finished(&self) -> bool {
+		self.is_finished
+	}
+
+	/// Is master node?.
+	pub fn is_master(&self) -> bool {
+		self.meta.self_node_id == self.meta.master_node_id
+	}
+
+	/// Initialize session (on master node).
+	pub fn initialize(&mut self) -> Result<(), Error> {
+		self.proceed_to_next_state()
+	}
+
+	/// When share-add message is received.
+	pub fn on_share_add_message(&mut self, sender: &NodeId, message: &ShareAddMessage) -> Result<(), Error> {
+		if self.share_add_session.is_none() {
+			self.create_share_add_session()?;
+		}
+
+		let change_state_needed = self.share_add_session.as_ref()
+			.map(|share_add_session| {
+				let was_finished = share_add_session.is_finished();
+				share_add_session.process_message(sender, message)
+					.map(|_| share_add_session.is_finished() && !was_finished)
+			})
+			.unwrap_or(Err(Error::InvalidMessage))?;
+		if change_state_needed {
+			self.proceed_to_next_state()?;
+		}
+
+		Ok(())
+	}
+
+	/// Create new share add session.
+	fn create_share_add_session(&mut self) -> Result<(), Error> {
+		let consensus_group = self.consensus_group.take().ok_or(Error::InvalidStateForRequest)?;
+		let new_nodes_map = self.new_nodes_map.take().ok_or(Error::InvalidStateForRequest)?;
+		let share_add_session = ShareAddSessionImpl::new(ShareAddSessionParams {
+			meta: self.meta.clone(),
+			nonce: self.nonce,
+			transport: ShareChangeTransport::new(self.session_id, self.nonce, self.cluster.clone()),
+			key_storage: self.key_storage.clone(),
+			admin_public: None,
+		})?;
+		share_add_session.set_consensus_output(&self.key_version, consensus_group, new_nodes_map)?;
+		self.share_add_session = Some(share_add_session);
+		Ok(())
+	}
+
+	/// Proceed to the next state.
+	fn proceed_to_next_state(&mut self) -> Result<(), Error> {
+		if self.meta.self_node_id != self.meta.master_node_id {
+			if self.new_nodes_map.is_none() {
+				self.is_finished = true;
+			}
+			return Ok(());
+		}
+
+		if self.new_nodes_map.is_some() {
+			self.create_share_add_session()?;
+			return self.share_add_session.as_ref()
+				.expect("either create_share_add_session fails, or session is created; qed")
+				.initialize(None, None, None, None);
+		}
+
+		self.is_finished = true;
+
+		Ok(())
+	}
+}
+
+impl ShareChangeTransport {
+	pub fn new(session_id: SessionId, nonce: u64, cluster: Arc<Cluster>) -> Self {
+		ShareChangeTransport {
+			session_id: session_id,
+			nonce: nonce,
+			cluster: cluster,
+		}
+	}
+}
+
+impl JobTransport for ShareChangeTransport {
+	type PartialJobRequest = ServersSetChangeAccessRequest;
+	type PartialJobResponse = bool;
+
+	fn send_partial_request(&self, _node: &NodeId, _request: ServersSetChangeAccessRequest) -> Result<(), Error> {
+		unreachable!("only called when establishing consensus; this transport is never used for establishing consensus; qed")
+	}
+
+	fn send_partial_response(&self, _node: &NodeId, _response: bool) -> Result<(), Error> {
+		unreachable!("only called when establishing consensus; this transport is never used for establishing consensus; qed")
+	}
+}
+
+impl ShareAddSessionTransport for ShareChangeTransport {
+	fn nodes(&self) -> BTreeSet<NodeId> {
+		self.cluster.nodes()
+	}
+
+	fn set_master_data(&mut self, _consensus_group: BTreeSet<NodeId>, _id_numbers: BTreeMap<NodeId, Option<Secret>>) {
+		unreachable!("only called when establishing consensus; this transport is never used for establishing consensus; qed")
+	}
+
+	fn send(&self, node: &NodeId, message: ShareAddMessage) -> Result<(), Error> {
+		self.cluster.send(node, Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeShareAddMessage(ServersSetChangeShareAddMessage {
+			session: self.session_id.clone().into(),
+			session_nonce: self.nonce,
+			message: message,
+		})))
+	}
+}
+
+/// Prepare share change plan for moving from old `old_key_version_owners` to `new_nodes_set`.
+pub fn prepare_share_change_session_plan(cluster_nodes: &BTreeSet<NodeId>, threshold: usize, key_version: H256, master: &NodeId, old_key_version_owners: &BTreeSet<NodeId>, new_nodes_set: &BTreeSet<NodeId>) -> Result<ShareChangeSessionPlan, Error> {
+	// make new nodes map, so that:
+	// all non-isolated old nodes will have their id number preserved
+	// all new nodes will have new id number
+	let mut new_nodes_map = new_nodes_set.difference(&old_key_version_owners)
+		.map(|n| math::generate_random_scalar().map(|id| (n.clone(), Some(id))))
+		.collect::<Result<BTreeMap<_, _>, _>>()?;
+	if !new_nodes_map.is_empty() {
+		for old_node in old_key_version_owners.iter().filter(|n| cluster_nodes.contains(n)) {
+			new_nodes_map.insert(old_node.clone(), None);
+		}
+	}
+
+	// select consensus group if there are some nodes to add
+	let consensus_group = if !new_nodes_map.is_empty() {
+			::std::iter::once(master.clone())
+				.chain(old_key_version_owners.iter()
+					.filter(|n| *n != master && cluster_nodes.contains(*n))
+					.take(threshold)
+					.cloned())
+				.collect()
+		} else {
+			BTreeSet::new()
+		};
+
+	Ok(ShareChangeSessionPlan {
+		key_version: key_version,
+		consensus_group: consensus_group,
+		new_nodes_map: new_nodes_map,
+	})
+}
+
+impl ShareChangeSessionPlan {
+	/// Is empty (nothing-to-do) plan?
+	pub fn is_empty(&self) -> bool {
+		self.new_nodes_map.is_empty()
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use key_server_cluster::math;
+	use super::prepare_share_change_session_plan;
+
+	#[test]
+	fn share_change_plan_creates_empty_plan() {
+		let cluster_nodes: Vec<_> = (0..3).map(|_| math::generate_random_point().unwrap()).collect();
+		let master = cluster_nodes[0].clone();
+		let old_key_version_owners = cluster_nodes.iter().cloned().collect();
+		let new_nodes_set = cluster_nodes.iter().cloned().collect();
+		let plan = prepare_share_change_session_plan(&cluster_nodes.iter().cloned().collect(), 1, Default::default(), &master, &old_key_version_owners, &new_nodes_set).unwrap();
+
+		assert!(plan.is_empty());
+	}
+
+	#[test]
+	fn share_change_plan_adds_new_nodes() {
+		let cluster_nodes: Vec<_> = (0..3).map(|_| math::generate_random_point().unwrap()).collect();
+		let master = cluster_nodes[0].clone();
+		let old_key_version_owners = cluster_nodes[0..2].iter().cloned().collect();
+		let new_nodes_set = cluster_nodes.iter().cloned().collect();
+		let plan = prepare_share_change_session_plan(&cluster_nodes.iter().cloned().collect(), 1, Default::default(), &master, &old_key_version_owners, &new_nodes_set).unwrap();
+
+		assert!(!plan.is_empty());
+		assert_eq!(old_key_version_owners, plan.consensus_group);
+		assert_eq!(new_nodes_set, plan.new_nodes_map.keys().cloned().collect());
+	}
+}
diff --git a/secret_store/src/key_server_cluster/decryption_session.rs b/secret_store/src/key_server_cluster/client_sessions/decryption_session.rs
similarity index 51%
rename from secret_store/src/key_server_cluster/decryption_session.rs
rename to secret_store/src/key_server_cluster/client_sessions/decryption_session.rs
index bc3c6aad0b4759dc5527dd37a975100c9271679f..c3946f74691f8cc0d31bc391b90d91509df028a3 100644
--- a/secret_store/src/key_server_cluster/decryption_session.rs
+++ b/secret_store/src/key_server_cluster/client_sessions/decryption_session.rs
@@ -14,26 +14,23 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::cmp::{Ord, PartialOrd, Ordering};
+use std::collections::BTreeSet;
 use std::sync::Arc;
 use parking_lot::{Mutex, Condvar};
-use ethkey::{Secret, Signature};
-use key_server_cluster::{Error, AclStorage, DocumentKeyShare, NodeId, SessionId, EncryptedDocumentKeyShadow, SessionMeta};
+use ethereum_types::H256;
+use ethkey::Secret;
+use key_server_cluster::{Error, AclStorage, DocumentKeyShare, NodeId, SessionId, Requester,
+	EncryptedDocumentKeyShadow, SessionMeta};
 use key_server_cluster::cluster::Cluster;
-use key_server_cluster::cluster_sessions::ClusterSession;
+use key_server_cluster::cluster_sessions::{SessionIdWithSubSession, ClusterSession};
 use key_server_cluster::message::{Message, DecryptionMessage, DecryptionConsensusMessage, RequestPartialDecryption,
 	PartialDecryption, DecryptionSessionError, DecryptionSessionCompleted, ConsensusMessage, InitializeConsensusSession,
-	ConfirmConsensusInitialization};
-use key_server_cluster::jobs::job_session::JobTransport;
+	ConfirmConsensusInitialization, DecryptionSessionDelegation, DecryptionSessionDelegationCompleted};
+use key_server_cluster::jobs::job_session::{JobSession, JobTransport};
+use key_server_cluster::jobs::key_access_job::KeyAccessJob;
 use key_server_cluster::jobs::decryption_job::{PartialDecryptionRequest, PartialDecryptionResponse, DecryptionJob};
 use key_server_cluster::jobs::consensus_session::{ConsensusSessionParams, ConsensusSessionState, ConsensusSession};
 
-/// Decryption session API.
-pub trait Session: Send + Sync + 'static {
-	/// Wait until session is completed. Returns distributely restored secret key.
-	fn wait(&self) -> Result<EncryptedDocumentKeyShadow, Error>;
-}
-
 /// Distributed decryption session.
 /// Based on "ECDKG: A Distributed Key Generation Protocol Based on Elliptic Curve Discrete Logarithm" paper:
 /// http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.124.4128&rep=rep1&type=pdf
@@ -56,35 +53,39 @@ struct SessionCore {
 	/// Decryption session access key.
 	pub access_key: Secret,
 	/// Key share.
-	pub key_share: DocumentKeyShare,
+	pub key_share: Option<DocumentKeyShare>,
 	/// Cluster which allows this node to send messages to other nodes in the cluster.
 	pub cluster: Arc<Cluster>,
+	/// Session-level nonce.
+	pub nonce: u64,
 	/// SessionImpl completion condvar.
 	pub completed: Condvar,
 }
 
 /// Decryption consensus session type.
-type DecryptionConsensusSession = ConsensusSession<DecryptionConsensusTransport, DecryptionJob, DecryptionJobTransport>;
+type DecryptionConsensusSession = ConsensusSession<KeyAccessJob, DecryptionConsensusTransport, DecryptionJob, DecryptionJobTransport>;
+/// Broadcast decryption job session type.
+type BroadcastDecryptionJobSession = JobSession<DecryptionJob, DecryptionJobTransport>;
 
 /// Mutable session data.
 struct SessionData {
+	/// Key version to use for decryption.
+	pub version: Option<H256>,
 	/// Consensus-based decryption session.
 	pub consensus_session: DecryptionConsensusSession,
+	/// Broadcast decryption job.
+	pub broadcast_job_session: Option<BroadcastDecryptionJobSession>,
 	/// Is shadow decryption requested?
 	pub is_shadow_decryption: Option<bool>,
+	/// Decryption result must be reconstructed on all participating nodes. This is useful
+	/// for service contract API so that all nodes from consensus group can confirm decryption.
+	pub is_broadcast_session: Option<bool>,
+	/// Delegation status.
+	pub delegation_status: Option<DelegationStatus>,
 	/// Decryption result.
 	pub result: Option<Result<EncryptedDocumentKeyShadow, Error>>,
 }
 
-/// Decryption session Id.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct DecryptionSessionId {
-	/// Encryption session id.
-	pub id: SessionId,
-	/// Decryption session access key.
-	pub access_key: Secret,
-}
-
 /// SessionImpl creation parameters
 pub struct SessionParams {
 	/// Session metadata.
@@ -92,11 +93,13 @@ pub struct SessionParams {
 	/// Session access key.
 	pub access_key: Secret,
 	/// Key share.
-	pub key_share: DocumentKeyShare,
+	pub key_share: Option<DocumentKeyShare>,
 	/// ACL storage.
 	pub acl_storage: Arc<AclStorage>,
-	/// Cluster
+	/// Cluster.
 	pub cluster: Arc<Cluster>,
+	/// Session nonce.
+	pub nonce: u64,
 }
 
 /// Decryption consensus transport.
@@ -105,6 +108,10 @@ struct DecryptionConsensusTransport {
 	id: SessionId,
 	/// Session access key.
 	access_key: Secret,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Selected key version (on master node).
+	version: Option<H256>,
 	/// Cluster.
 	cluster: Arc<Cluster>,
 }
@@ -115,97 +122,163 @@ struct DecryptionJobTransport {
 	id: SessionId,
 	//// Session access key.
 	access_key: Secret,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Is this a broadcast transport? If true, requests are not send and responses are sent only to non-master nodes.
+	is_broadcast_transport: bool,
+	/// Master node id.
+	master_node_id: NodeId,
 	/// Cluster.
 	cluster: Arc<Cluster>,
 }
 
+/// Session delegation status.
+enum DelegationStatus {
+	/// Delegated to other node.
+	DelegatedTo(NodeId),
+	/// Delegated from other node.
+	DelegatedFrom(NodeId, u64),
+}
+
 impl SessionImpl {
 	/// Create new decryption session.
-	pub fn new(params: SessionParams, requester_signature: Option<Signature>) -> Result<Self, Error> {
-		debug_assert_eq!(params.meta.threshold, params.key_share.threshold);
-		debug_assert_eq!(params.meta.self_node_id == params.meta.master_node_id, requester_signature.is_some());
-
-		use key_server_cluster::generation_session::{check_cluster_nodes, check_threshold};
+	pub fn new(params: SessionParams, requester: Option<Requester>) -> Result<Self, Error> {
+		debug_assert_eq!(params.meta.threshold, params.key_share.as_ref().map(|ks| ks.threshold).unwrap_or_default());
 
 		// check that common_point and encrypted_point are already set
-		if params.key_share.common_point.is_none() || params.key_share.encrypted_point.is_none() {
-			return Err(Error::NotStartedSessionId);
+		if let Some(key_share) = params.key_share.as_ref() {
+			// encrypted data must be set
+			if key_share.common_point.is_none() || key_share.encrypted_point.is_none() {
+				return Err(Error::NotStartedSessionId);
+			}
 		}
 
-		// check nodes and threshold
-		let nodes = params.key_share.id_numbers.keys().cloned().collect();
-		check_cluster_nodes(&params.meta.self_node_id, &nodes)?;
-		check_threshold(params.key_share.threshold, &nodes)?;
-
 		let consensus_transport = DecryptionConsensusTransport {
 			id: params.meta.id.clone(),
 			access_key: params.access_key.clone(),
+			nonce: params.nonce,
+			version: None,
 			cluster: params.cluster.clone(),
 		};
+		let consensus_session = ConsensusSession::new(ConsensusSessionParams {
+			meta: params.meta.clone(),
+			consensus_executor: match requester {
+				Some(requester) => KeyAccessJob::new_on_master(params.meta.id.clone(), params.acl_storage.clone(), requester),
+				None => KeyAccessJob::new_on_slave(params.meta.id.clone(), params.acl_storage.clone()),
+			},
+			consensus_transport: consensus_transport,
+		})?;
 
 		Ok(SessionImpl {
 			core: SessionCore {
-				meta: params.meta.clone(),
+				meta: params.meta,
 				access_key: params.access_key,
 				key_share: params.key_share,
 				cluster: params.cluster,
+				nonce: params.nonce,
 				completed: Condvar::new(),
 			},
 			data: Mutex::new(SessionData {
-				consensus_session: match requester_signature {
-					Some(requester_signature) => ConsensusSession::new_on_master(ConsensusSessionParams {
-						meta: params.meta,
-						acl_storage: params.acl_storage.clone(),
-						consensus_transport: consensus_transport,
-					}, requester_signature)?,
-					None => ConsensusSession::new_on_slave(ConsensusSessionParams {
-						meta: params.meta,
-						acl_storage: params.acl_storage.clone(),
-						consensus_transport: consensus_transport,
-					})?,
-				},
+				version: None,
+				consensus_session: consensus_session,
+				broadcast_job_session: None,
 				is_shadow_decryption: None,
+				is_broadcast_session: None,
+				delegation_status: None,
 				result: None,
 			}),
 		})
 	}
 
-	#[cfg(test)]
 	/// Get this node id.
+	#[cfg(test)]
 	pub fn node(&self) -> &NodeId {
 		&self.core.meta.self_node_id
 	}
 
-	#[cfg(test)]
 	/// Get this session access key.
+	#[cfg(test)]
 	pub fn access_key(&self) -> &Secret {
 		&self.core.access_key
 	}
 
-	#[cfg(test)]
 	/// Get session state.
+	#[cfg(test)]
 	pub fn state(&self) -> ConsensusSessionState {
 		self.data.lock().consensus_session.state()
 	}
 
-	#[cfg(test)]
 	/// Get decrypted secret
+	#[cfg(test)]
 	pub fn decrypted_secret(&self) -> Option<Result<EncryptedDocumentKeyShadow, Error>> {
 		self.data.lock().result.clone()
 	}
 
+	/// Wait for session completion.
+	pub fn wait(&self) -> Result<EncryptedDocumentKeyShadow, Error> {
+		Self::wait_session(&self.core.completed, &self.data, None, |data| data.result.clone())
+	}
+
+	/// Delegate session to other node.
+	pub fn delegate(&self, master: NodeId, version: H256, is_shadow_decryption: bool, is_broadcast_session: bool) -> Result<(), Error> {
+		if self.core.meta.master_node_id != self.core.meta.self_node_id {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		let mut data = self.data.lock();
+		if data.consensus_session.state() != ConsensusSessionState::WaitingForInitialization || data.delegation_status.is_some() {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		data.consensus_session.consensus_job_mut().executor_mut().set_has_key_share(false);
+		self.core.cluster.send(&master, Message::Decryption(DecryptionMessage::DecryptionSessionDelegation(DecryptionSessionDelegation {
+			session: self.core.meta.id.clone().into(),
+			sub_session: self.core.access_key.clone().into(),
+			session_nonce: self.core.nonce,
+			requester: data.consensus_session.consensus_job().executor().requester()
+				.expect("signature is passed to master node on creation; session can be delegated from master node only; qed")
+				.clone().into(),
+			version: version.into(),
+			is_shadow_decryption: is_shadow_decryption,
+			is_broadcast_session: is_broadcast_session,
+		})))?;
+		data.delegation_status = Some(DelegationStatus::DelegatedTo(master));
+		Ok(())
+	}
+
 	/// Initialize decryption session on master node.
-	pub fn initialize(&self, is_shadow_decryption: bool) -> Result<(), Error> {
+	pub fn initialize(&self, version: H256, is_shadow_decryption: bool, is_broadcast_session: bool) -> Result<(), Error> {
+		debug_assert_eq!(self.core.meta.self_node_id, self.core.meta.master_node_id);
+
+		// check if version exists
+		let key_version = match self.core.key_share.as_ref() {
+			None => return Err(Error::InvalidMessage),
+			Some(key_share) => key_share.version(&version).map_err(|e| Error::KeyStorage(e.into()))?,
+		};
+
 		let mut data = self.data.lock();
+		let non_isolated_nodes = self.core.cluster.nodes();
+		let mut consensus_nodes: BTreeSet<_> = key_version.id_numbers.keys()
+			.filter(|n| non_isolated_nodes.contains(*n))
+			.cloned()
+			.chain(::std::iter::once(self.core.meta.self_node_id.clone()))
+			.collect();
+		if let Some(&DelegationStatus::DelegatedFrom(delegation_master, _)) = data.delegation_status.as_ref() {
+			consensus_nodes.remove(&delegation_master);
+		}
+
+		data.consensus_session.consensus_job_mut().transport_mut().version = Some(version.clone());
+		data.version = Some(version.clone());
 		data.is_shadow_decryption = Some(is_shadow_decryption);
-		data.consensus_session.initialize(self.core.key_share.id_numbers.keys().cloned().collect())?;
+		data.is_broadcast_session = Some(is_broadcast_session);
+		data.consensus_session.initialize(consensus_nodes)?;
 
 		if data.consensus_session.state() == ConsensusSessionState::ConsensusEstablished {
-			self.core.disseminate_jobs(&mut data.consensus_session, is_shadow_decryption)?;
+			Self::disseminate_jobs(&self.core, &mut *data, &version, is_shadow_decryption, is_broadcast_session)?;
 
 			debug_assert!(data.consensus_session.state() == ConsensusSessionState::Finished);
-			data.result = Some(Ok(data.consensus_session.result()?));
-			self.core.completed.notify_all();
+			let result = data.consensus_session.result()?;
+			Self::set_decryption_result(&self.core, &mut *data, Ok(result));
 		}
 
 		Ok(())
@@ -213,6 +286,10 @@ impl SessionImpl {
 
 	/// Process decryption message.
 	pub fn process_message(&self, sender: &NodeId, message: &DecryptionMessage) -> Result<(), Error> {
+		if self.core.nonce != message.session_nonce() {
+			return Err(Error::ReplayProtection);
+		}
+
 		match message {
 			&DecryptionMessage::DecryptionConsensusMessage(ref message) =>
 				self.on_consensus_message(sender, message),
@@ -221,10 +298,56 @@ impl SessionImpl {
 			&DecryptionMessage::PartialDecryption(ref message) =>
 				self.on_partial_decryption(sender, message),
 			&DecryptionMessage::DecryptionSessionError(ref message) =>
-				self.on_session_error(sender, message),
+				self.process_node_error(Some(&sender), Error::Io(message.error.clone())),
 			&DecryptionMessage::DecryptionSessionCompleted(ref message) =>
 				self.on_session_completed(sender, message),
+			&DecryptionMessage::DecryptionSessionDelegation(ref message) =>
+				self.on_session_delegated(sender, message),
+			&DecryptionMessage::DecryptionSessionDelegationCompleted(ref message) =>
+				self.on_session_delegation_completed(sender, message),
+		}
+	}
+
+	/// When session is delegated to this node.
+	pub fn on_session_delegated(&self, sender: &NodeId, message: &DecryptionSessionDelegation) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+
+		{
+			let mut data = self.data.lock();
+			if data.consensus_session.state() != ConsensusSessionState::WaitingForInitialization || data.delegation_status.is_some() {
+				return Err(Error::InvalidStateForRequest);
+			}
+
+			data.consensus_session.consensus_job_mut().executor_mut().set_requester(message.requester.clone().into());
+			data.delegation_status = Some(DelegationStatus::DelegatedFrom(sender.clone(), message.session_nonce));
+		}
+
+		self.initialize(message.version.clone().into(), message.is_shadow_decryption, message.is_broadcast_session)
+	}
+
+	/// When delegated session is completed on other node.
+	pub fn on_session_delegation_completed(&self, sender: &NodeId, message: &DecryptionSessionDelegationCompleted) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+
+		if self.core.meta.master_node_id != self.core.meta.self_node_id {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		let mut data = self.data.lock();
+		match data.delegation_status.as_ref() {
+			Some(&DelegationStatus::DelegatedTo(ref node)) if node == sender => (),
+			_ => return Err(Error::InvalidMessage),
 		}
+
+		Self::set_decryption_result(&self.core, &mut *data, Ok(EncryptedDocumentKeyShadow {
+				decrypted_secret: message.decrypted_secret.clone().into(),
+				common_point: message.common_point.clone().map(Into::into),
+				decrypt_shadows: message.decrypt_shadows.clone().map(Into::into),
+			}));
+
+		Ok(())
 	}
 
 	/// When consensus-related message is received.
@@ -234,6 +357,14 @@ impl SessionImpl {
 
 		let mut data = self.data.lock();
 		let is_establishing_consensus = data.consensus_session.state() == ConsensusSessionState::EstablishingConsensus;
+		if let &ConsensusMessage::InitializeConsensusSession(ref msg) = &message.message {
+			let version = msg.version.clone().into();
+			let has_key_share = self.core.key_share.as_ref()
+				.map(|ks| ks.version(&version).is_ok())
+				.unwrap_or(false);
+			data.consensus_session.consensus_job_mut().executor_mut().set_has_key_share(has_key_share);
+			data.version = Some(version);
+		}
 		data.consensus_session.on_consensus_message(&sender, &message.message)?;
 
 		let is_consensus_established = data.consensus_session.state() == ConsensusSessionState::ConsensusEstablished;
@@ -241,9 +372,12 @@ impl SessionImpl {
 			return Ok(());
 		}
 
+		let version = data.version.as_ref().ok_or(Error::InvalidMessage)?.clone();
 		let is_shadow_decryption = data.is_shadow_decryption
 			.expect("we are on master node; on master node is_shadow_decryption is filled in initialize(); on_consensus_message follows initialize (state check in consensus_session); qed");
-		self.core.disseminate_jobs(&mut data.consensus_session, is_shadow_decryption)
+		let is_broadcast_session = data.is_broadcast_session
+			.expect("we are on master node; on master node is_broadcast_session is filled in initialize(); on_consensus_message follows initialize (state check in consensus_session); qed");
+		Self::disseminate_jobs(&self.core, &mut *data, &version, is_shadow_decryption, is_broadcast_session)
 	}
 
 	/// When partial decryption is requested.
@@ -252,16 +386,41 @@ impl SessionImpl {
 		debug_assert!(self.core.access_key == *message.sub_session);
 		debug_assert!(sender != &self.core.meta.self_node_id);
 
-		let mut data = self.data.lock();
-		let requester = data.consensus_session.requester()?.clone();
-		let decryption_job = DecryptionJob::new_on_slave(self.core.meta.self_node_id.clone(), self.core.access_key.clone(), requester, self.core.key_share.clone())?;
-		let decryption_transport = self.core.decryption_transport();
+		let key_share = match self.core.key_share.as_ref() {
+			None => return Err(Error::InvalidMessage),
+			Some(key_share) => key_share,
+		};
 
-		data.consensus_session.on_job_request(&sender, PartialDecryptionRequest {
+		let mut data = self.data.lock();
+		let key_version = key_share.version(data.version.as_ref().ok_or(Error::InvalidMessage)?)
+			.map_err(|e| Error::KeyStorage(e.into()))?.hash.clone();
+		let requester_public = data.consensus_session.consensus_job().executor().requester()
+			.ok_or(Error::InvalidStateForRequest)?
+			.public(&self.core.meta.id)
+			.ok_or(Error::InsufficientRequesterData)?;
+		let decryption_job = DecryptionJob::new_on_slave(self.core.meta.self_node_id.clone(), self.core.access_key.clone(),
+			requester_public.clone(), key_share.clone(), key_version)?;
+		let decryption_transport = self.core.decryption_transport(false);
+
+		// respond to request
+		data.consensus_session.on_job_request(sender, PartialDecryptionRequest {
 			id: message.request_id.clone().into(),
 			is_shadow_decryption: message.is_shadow_decryption,
+			is_broadcast_session: message.is_broadcast_session,
 			other_nodes_ids: message.nodes.iter().cloned().map(Into::into).collect(),
-		}, decryption_job, decryption_transport)
+		}, decryption_job, decryption_transport)?;
+
+		// ...and prepare decryption job session if we need to broadcast result
+		if message.is_broadcast_session {
+			let consensus_group: BTreeSet<_> = message.nodes.iter().cloned().map(Into::into).collect();
+			let broadcast_decryption_job = DecryptionJob::new_on_master(self.core.meta.self_node_id.clone(),
+				self.core.access_key.clone(), requester_public, key_share.clone(), key_version,
+				message.is_shadow_decryption, message.is_broadcast_session)?;
+			Self::create_broadcast_decryption_job(&self.core, &mut *data, consensus_group, broadcast_decryption_job,
+				message.request_id.clone().into())?;
+		}
+
+		Ok(())
 	}
 
 	/// When partial decryption is received.
@@ -271,23 +430,38 @@ impl SessionImpl {
 		debug_assert!(sender != &self.core.meta.self_node_id);
 
 		let mut data = self.data.lock();
-		data.consensus_session.on_job_response(sender, PartialDecryptionResponse {
-			request_id: message.request_id.clone().into(),
-			shadow_point: message.shadow_point.clone().into(),
-			decrypt_shadow: message.decrypt_shadow.clone(),
-		})?;
+		if self.core.meta.self_node_id == self.core.meta.master_node_id {
+			data.consensus_session.on_job_response(sender, PartialDecryptionResponse {
+				request_id: message.request_id.clone().into(),
+				shadow_point: message.shadow_point.clone().into(),
+				decrypt_shadow: message.decrypt_shadow.clone(),
+			})?;
+		} else {
+			match data.broadcast_job_session.as_mut() {
+				Some(broadcast_job_session) => broadcast_job_session.on_partial_response(sender, PartialDecryptionResponse {
+					request_id: message.request_id.clone().into(),
+					shadow_point: message.shadow_point.clone().into(),
+					decrypt_shadow: message.decrypt_shadow.clone(),
+				})?,
+				None => return Err(Error::TooEarlyForRequest),
+			}
+		}
 
 		if data.consensus_session.state() != ConsensusSessionState::Finished {
 			return Ok(());
 		}
 
-		self.core.cluster.broadcast(Message::Decryption(DecryptionMessage::DecryptionSessionCompleted(DecryptionSessionCompleted {
-			session: self.core.meta.id.clone().into(),
-			sub_session: self.core.access_key.clone().into(),
-		})))?;
+		// send compeltion signal to all nodes, except for rejected nodes
+		for node in data.consensus_session.consensus_non_rejected_nodes() {
+			self.core.cluster.send(&node, Message::Decryption(DecryptionMessage::DecryptionSessionCompleted(DecryptionSessionCompleted {
+				session: self.core.meta.id.clone().into(),
+				sub_session: self.core.access_key.clone().into(),
+				session_nonce: self.core.nonce,
+			})))?;
+		}
 
-		data.result = Some(Ok(data.consensus_session.result()?));
-		self.core.completed.notify_all();
+		let result = data.consensus_session.result()?;
+		Self::set_decryption_result(&self.core, &mut *data, Ok(result));
 
 		Ok(())
 	}
@@ -298,17 +472,36 @@ impl SessionImpl {
 		debug_assert!(self.core.access_key == *message.sub_session);
 		debug_assert!(sender != &self.core.meta.self_node_id);
 
-		self.data.lock().consensus_session.on_session_completed(sender)
-	}
+		let mut data = self.data.lock();
+
+		// if it is a broadcast session, wait for all answers before completing the session
+		let decryption_result = match data.broadcast_job_session.as_ref() {
+			Some(broadcast_job_session) => {
+				if !broadcast_job_session.is_result_ready() {
+					return Err(Error::TooEarlyForRequest);
+				}
+
+				Some(broadcast_job_session.result())
+			},
+			None => None,
+		};
+		if let Some(decryption_result) = decryption_result {
+			Self::set_decryption_result(&self.core, &mut *data, decryption_result);
+		}
 
-	/// When error has occured on another node.
-	pub fn on_session_error(&self, sender: &NodeId, message: &DecryptionSessionError) -> Result<(), Error> {
-		self.process_node_error(Some(&sender), &message.error)
+		data.consensus_session.on_session_completed(sender)
 	}
 
 	/// Process error from the other node.
-	fn process_node_error(&self, node: Option<&NodeId>, error: &String) -> Result<(), Error> {
+	fn process_node_error(&self, node: Option<&NodeId>, error: Error) -> Result<(), Error> {
 		let mut data = self.data.lock();
+		let is_self_node_error = node.map(|n| n == &self.core.meta.self_node_id).unwrap_or(false);
+		// error is always fatal if coming from this node
+		if is_self_node_error {
+			Self::set_decryption_result(&self.core, &mut *data, Err(error.clone()));
+			return Err(error);
+		}
+
 		match {
 			match node {
 				Some(node) => data.consensus_session.on_node_error(node),
@@ -317,15 +510,17 @@ impl SessionImpl {
 		} {
 			Ok(false) => Ok(()),
 			Ok(true) => {
-				let is_shadow_decryption = data.is_shadow_decryption.expect("on_node_error returned true; this means that jobs must be REsent; this means that jobs already have been sent; jobs are sent when is_shadow_decryption.is_some(); qed");
-				let disseminate_result = self.core.disseminate_jobs(&mut data.consensus_session, is_shadow_decryption);
+				let version = data.version.as_ref().ok_or(Error::InvalidMessage)?.clone();
+				let proof = "on_node_error returned true; this means that jobs must be REsent; this means that jobs already have been sent; jobs are sent when is_shadow_decryption.is_some(); qed";
+				let is_shadow_decryption = data.is_shadow_decryption.expect(proof);
+				let is_broadcast_session = data.is_broadcast_session.expect(proof);
+				let disseminate_result = Self::disseminate_jobs(&self.core, &mut *data, &version, is_shadow_decryption, is_broadcast_session);
 				match disseminate_result {
 					Ok(()) => Ok(()),
 					Err(err) => {
 						warn!("{}: decryption session failed with error: {:?} from {:?}", &self.core.meta.self_node_id, error, node);
 
-						data.result = Some(Err(err.clone()));
-						self.core.completed.notify_all();
+						Self::set_decryption_result(&self.core, &mut *data, Err(err.clone()));
 						Err(err)
 					}
 				}
@@ -333,71 +528,172 @@ impl SessionImpl {
 			Err(err) => {
 				warn!("{}: decryption session failed with error: {:?} from {:?}", &self.core.meta.self_node_id, error, node);
 
-				data.result = Some(Err(err.clone()));
-				self.core.completed.notify_all();
+				Self::set_decryption_result(&self.core, &mut *data, Err(err.clone()));
 				Err(err)
 			},
 		}
 	}
+
+	/// Disseminate jobs on session master.
+	fn disseminate_jobs(core: &SessionCore, data: &mut SessionData, version: &H256, is_shadow_decryption: bool, is_broadcast_session: bool) -> Result<(), Error> {
+		let key_share = match core.key_share.as_ref() {
+			None => return Err(Error::InvalidMessage),
+			Some(key_share) => key_share,
+		};
+
+		let key_version = key_share.version(version).map_err(|e| Error::KeyStorage(e.into()))?.hash.clone();
+		let requester = data.consensus_session.consensus_job().executor().requester().ok_or(Error::InvalidStateForRequest)?.clone();
+		let requester_public = requester.public(&core.meta.id).ok_or(Error::InsufficientRequesterData)?;
+		let consensus_group = data.consensus_session.select_consensus_group()?.clone();
+		let decryption_job = DecryptionJob::new_on_master(core.meta.self_node_id.clone(),
+			core.access_key.clone(), requester_public.clone(), key_share.clone(), key_version,
+			is_shadow_decryption, is_broadcast_session)?;
+		let decryption_request_id = decryption_job.request_id().clone().expect("TODO");
+		let decryption_transport = core.decryption_transport(false);
+		data.consensus_session.disseminate_jobs(decryption_job, decryption_transport, data.is_broadcast_session.expect("TODO"))?;
+
+		// ...and prepare decryption job session if we need to broadcast result
+		if data.is_broadcast_session.expect("TODO") {
+			let broadcast_decryption_job = DecryptionJob::new_on_master(core.meta.self_node_id.clone(),
+				core.access_key.clone(), requester_public, key_share.clone(), key_version, is_shadow_decryption, is_broadcast_session)?;
+			Self::create_broadcast_decryption_job(&core, data, consensus_group, broadcast_decryption_job,
+				decryption_request_id)?;
+		}
+
+		Ok(())
+	}
+
+	/// Create broadcast decryption job.
+	fn create_broadcast_decryption_job(core: &SessionCore, data: &mut SessionData, mut consensus_group: BTreeSet<NodeId>, mut job: DecryptionJob, request_id: Secret) -> Result<(), Error> {
+		consensus_group.insert(core.meta.self_node_id.clone());
+		job.set_request_id(request_id.clone().into());
+
+		let transport = core.decryption_transport(true);
+		let mut job_session = JobSession::new(SessionMeta {
+			id: core.meta.id.clone(),
+			master_node_id: core.meta.self_node_id.clone(),
+			self_node_id: core.meta.self_node_id.clone(),
+			threshold: core.meta.threshold,
+		}, job, transport);
+		job_session.initialize(consensus_group, core.meta.self_node_id != core.meta.master_node_id)?;
+		data.broadcast_job_session = Some(job_session);
+
+		Ok(())
+	}
+
+	/// Set decryption result.
+	fn set_decryption_result(core: &SessionCore, data: &mut SessionData, result: Result<EncryptedDocumentKeyShadow, Error>) {
+		if let Some(DelegationStatus::DelegatedFrom(master, nonce)) = data.delegation_status.take() {
+			// error means can't communicate => ignore it
+			let _ = match result.as_ref() {
+				Ok(document_key) => core.cluster.send(&master, Message::Decryption(DecryptionMessage::DecryptionSessionDelegationCompleted(DecryptionSessionDelegationCompleted {
+					session: core.meta.id.clone().into(),
+					sub_session: core.access_key.clone().into(),
+					session_nonce: nonce,
+					decrypted_secret: document_key.decrypted_secret.clone().into(),
+					common_point: document_key.common_point.clone().map(Into::into),
+					decrypt_shadows: document_key.decrypt_shadows.clone(),
+				}))),
+				Err(error) => core.cluster.send(&master, Message::Decryption(DecryptionMessage::DecryptionSessionError(DecryptionSessionError {
+					session: core.meta.id.clone().into(),
+					sub_session: core.access_key.clone().into(),
+					session_nonce: nonce,
+					error: error.clone().into(),
+				}))),
+			};
+		}
+
+		data.result = Some(result);
+		core.completed.notify_all();
+	}
 }
 
 impl ClusterSession for SessionImpl {
+	type Id = SessionIdWithSubSession;
+
+	fn type_name() -> &'static str {
+		"decryption"
+	}
+
+	fn id(&self) -> SessionIdWithSubSession {
+		SessionIdWithSubSession::new(self.core.meta.id.clone(), self.core.access_key.clone())
+	}
+
 	fn is_finished(&self) -> bool {
 		let data = self.data.lock();
 		data.consensus_session.state() == ConsensusSessionState::Failed
 			|| data.consensus_session.state() == ConsensusSessionState::Finished
+			|| data.result.is_some()
 	}
 
 	fn on_node_timeout(&self, node: &NodeId) {
 		// ignore error, only state matters
-		let _ = self.process_node_error(Some(node), &Error::NodeDisconnected.into());
+		let _ = self.process_node_error(Some(node), Error::NodeDisconnected);
 	}
 
 	fn on_session_timeout(&self) {
 		// ignore error, only state matters
-		let _ = self.process_node_error(None, &Error::NodeDisconnected.into());
+		let _ = self.process_node_error(None, Error::NodeDisconnected);
 	}
-}
 
-impl Session for SessionImpl {
-	fn wait(&self) -> Result<EncryptedDocumentKeyShadow, Error> {
-		let mut data = self.data.lock();
-		if !data.result.is_some() {
-			self.core.completed.wait(&mut data);
+	fn on_session_error(&self, node: &NodeId, error: Error) {
+		let is_fatal = self.process_node_error(Some(node), error.clone()).is_err();
+		let is_this_node_error = *node == self.core.meta.self_node_id;
+		if is_fatal || is_this_node_error {
+			// error in signing session is non-fatal, if occurs on slave node
+			// => either respond with error
+			// => or broadcast error
+			let message = Message::Decryption(DecryptionMessage::DecryptionSessionError(DecryptionSessionError {
+				session: self.core.meta.id.clone().into(),
+				sub_session: self.core.access_key.clone().into(),
+				session_nonce: self.core.nonce,
+				error: error.clone().into(),
+			}));
+
+			// do not bother processing send error, as we already processing error
+			let _ = if self.core.meta.master_node_id == self.core.meta.self_node_id {
+				self.core.cluster.broadcast(message)
+			} else {
+				self.core.cluster.send(&self.core.meta.master_node_id, message)
+			};
 		}
+	}
 
-		data.result.as_ref()
-			.expect("checked above or waited for completed; completed is only signaled when result.is_some(); qed")
-			.clone()
+	fn on_message(&self, sender: &NodeId, message: &Message) -> Result<(), Error> {
+		match *message {
+			Message::Decryption(ref message) => self.process_message(sender, message),
+			_ => unreachable!("cluster checks message to be correct before passing; qed"),
+		}
 	}
 }
 
 impl SessionCore {
-	pub fn decryption_transport(&self) -> DecryptionJobTransport {
+	pub fn decryption_transport(&self, is_broadcast_transport: bool) -> DecryptionJobTransport {
 		DecryptionJobTransport {
 			id: self.meta.id.clone(),
 			access_key: self.access_key.clone(),
-			cluster: self.cluster.clone()
+			nonce: self.nonce,
+			is_broadcast_transport: is_broadcast_transport,
+			master_node_id: self.meta.master_node_id.clone(),
+			cluster: self.cluster.clone(),
 		}
 	}
-
-	pub fn disseminate_jobs(&self, consensus_session: &mut DecryptionConsensusSession, is_shadow_decryption: bool) -> Result<(), Error> {
-		let requester = consensus_session.requester()?.clone();
-		let decryption_job = DecryptionJob::new_on_master(self.meta.self_node_id.clone(), self.access_key.clone(), requester, self.key_share.clone(), is_shadow_decryption)?;
-		consensus_session.disseminate_jobs(decryption_job, self.decryption_transport())
-	}
 }
 
 impl JobTransport for DecryptionConsensusTransport {
-	type PartialJobRequest=Signature;
+	type PartialJobRequest=Requester;
 	type PartialJobResponse=bool;
 
-	fn send_partial_request(&self, node: &NodeId, request: Signature) -> Result<(), Error> {
+	fn send_partial_request(&self, node: &NodeId, request: Requester) -> Result<(), Error> {
+		let version = self.version.as_ref()
+			.expect("send_partial_request is called on initialized master node only; version is filled in before initialization starts on master node; qed");
 		self.cluster.send(node, Message::Decryption(DecryptionMessage::DecryptionConsensusMessage(DecryptionConsensusMessage {
 			session: self.id.clone().into(),
 			sub_session: self.access_key.clone().into(),
+			session_nonce: self.nonce,
 			message: ConsensusMessage::InitializeConsensusSession(InitializeConsensusSession {
-				requestor_signature: request.into(),
+				requester: request.into(),
+				version: version.clone().into(),
 			})
 		})))
 	}
@@ -406,6 +702,7 @@ impl JobTransport for DecryptionConsensusTransport {
 		self.cluster.send(node, Message::Decryption(DecryptionMessage::DecryptionConsensusMessage(DecryptionConsensusMessage {
 			session: self.id.clone().into(),
 			sub_session: self.access_key.clone().into(),
+			session_nonce: self.nonce,
 			message: ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
 				is_confirmed: response,
 			})
@@ -418,58 +715,45 @@ impl JobTransport for DecryptionJobTransport {
 	type PartialJobResponse=PartialDecryptionResponse;
 
 	fn send_partial_request(&self, node: &NodeId, request: PartialDecryptionRequest) -> Result<(), Error> {
-		self.cluster.send(node, Message::Decryption(DecryptionMessage::RequestPartialDecryption(RequestPartialDecryption {
-			session: self.id.clone().into(),
-			sub_session: self.access_key.clone().into(),
-			request_id: request.id.into(),
-			is_shadow_decryption: request.is_shadow_decryption,
-			nodes: request.other_nodes_ids.into_iter().map(Into::into).collect(),
-		})))
-	}
-
-	fn send_partial_response(&self, node: &NodeId, response: PartialDecryptionResponse) -> Result<(), Error> {
-		self.cluster.send(node, Message::Decryption(DecryptionMessage::PartialDecryption(PartialDecryption {
-			session: self.id.clone().into(),
-			sub_session: self.access_key.clone().into(),
-			request_id: response.request_id.into(),
-			shadow_point: response.shadow_point.into(),
-			decrypt_shadow: response.decrypt_shadow,
-		})))
-	}
-}
-
-impl DecryptionSessionId {
-	/// Create new decryption session Id.
-	pub fn new(session_id: SessionId, sub_session_id: Secret) -> Self {
-		DecryptionSessionId {
-			id: session_id,
-			access_key: sub_session_id,
+		if !self.is_broadcast_transport {
+			self.cluster.send(node, Message::Decryption(DecryptionMessage::RequestPartialDecryption(RequestPartialDecryption {
+				session: self.id.clone().into(),
+				sub_session: self.access_key.clone().into(),
+				session_nonce: self.nonce,
+				request_id: request.id.into(),
+				is_shadow_decryption: request.is_shadow_decryption,
+				is_broadcast_session: request.is_broadcast_session,
+				nodes: request.other_nodes_ids.into_iter().map(Into::into).collect(),
+			})))?;
 		}
-	}
-}
 
-impl PartialOrd for DecryptionSessionId {
-	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-		Some(self.cmp(other))
+		Ok(())
 	}
-}
 
-impl Ord for DecryptionSessionId {
-	fn cmp(&self, other: &Self) -> Ordering {
-		match self.id.cmp(&other.id) {
-			Ordering::Equal => self.access_key.cmp(&other.access_key),
-			r @ _ => r,
+	fn send_partial_response(&self, node: &NodeId, response: PartialDecryptionResponse) -> Result<(), Error> {
+		if !self.is_broadcast_transport || *node != self.master_node_id {
+			self.cluster.send(node, Message::Decryption(DecryptionMessage::PartialDecryption(PartialDecryption {
+				session: self.id.clone().into(),
+				sub_session: self.access_key.clone().into(),
+				session_nonce: self.nonce,
+				request_id: response.request_id.into(),
+				shadow_point: response.shadow_point.into(),
+				decrypt_shadow: response.decrypt_shadow,
+			})))?;
 		}
+
+		Ok(())
 	}
 }
 
 #[cfg(test)]
 mod tests {
 	use std::sync::Arc;
-	use std::collections::BTreeMap;
+	use std::collections::{BTreeMap, VecDeque};
 	use acl_storage::DummyAclStorage;
 	use ethkey::{self, KeyPair, Random, Generator, Public, Secret};
-	use key_server_cluster::{NodeId, DocumentKeyShare, SessionId, Error, EncryptedDocumentKeyShadow, SessionMeta};
+	use key_server_cluster::{NodeId, DocumentKeyShare, DocumentKeyShareVersion, SessionId, Requester,
+		Error, EncryptedDocumentKeyShadow, SessionMeta};
 	use key_server_cluster::cluster::tests::DummyCluster;
 	use key_server_cluster::cluster_sessions::ClusterSession;
 	use key_server_cluster::decryption_session::{SessionImpl, SessionParams};
@@ -505,12 +789,16 @@ mod tests {
 		let common_point: Public = "6962be696e1bcbba8e64cc7fddf140f854835354b5804f3bb95ae5a2799130371b589a131bd39699ac7174ccb35fc4342dab05331202209582fc8f3a40916ab0".into();
 		let encrypted_point: Public = "b07031982bde9890e12eff154765f03c56c3ab646ad47431db5dd2d742a9297679c4c65b998557f8008469afd0c43d40b6c5f6c6a1c7354875da4115237ed87a".into();
 		let encrypted_datas: Vec<_> = (0..5).map(|i| DocumentKeyShare {
-			author: Public::default(),
+			author: Default::default(),
 			threshold: 3,
-			id_numbers: id_numbers.clone().into_iter().collect(),
-			secret_share: secret_shares[i].clone(),
+			public: Default::default(),
 			common_point: Some(common_point.clone()),
 			encrypted_point: Some(encrypted_point.clone()),
+			versions: vec![DocumentKeyShareVersion {
+				hash: Default::default(),
+				id_numbers: id_numbers.clone().into_iter().collect(),
+				secret_share: secret_shares[i].clone(),
+			}],
 		}).collect();
 		let acl_storages: Vec<_> = (0..5).map(|_| Arc::new(DummyAclStorage::default())).collect();
 		let clusters: Vec<_> = (0..5).map(|i| {
@@ -530,10 +818,11 @@ mod tests {
 				threshold: encrypted_datas[i].threshold,
 			},
 			access_key: access_key.clone(),
-			key_share: encrypted_datas[i].clone(),
+			key_share: Some(encrypted_datas[i].clone()),
 			acl_storage: acl_storages[i].clone(),
-			cluster: clusters[i].clone()
-		}, if i == 0 { signature.clone() } else { None }).unwrap()).collect();
+			cluster: clusters[i].clone(),
+			nonce: 0,
+		}, if i == 0 { signature.clone().map(Into::into) } else { None }).unwrap()).collect();
 
 		(requester, clusters, acl_storages, sessions)
 	}
@@ -543,15 +832,36 @@ mod tests {
 	}
 
 	fn do_messages_exchange_until<F>(clusters: &[Arc<DummyCluster>], sessions: &[SessionImpl], mut cond: F) -> Result<(), Error> where F: FnMut(&NodeId, &NodeId, &Message) -> bool {
-		while let Some((from, to, message)) = clusters.iter().filter_map(|c| c.take_message().map(|(to, msg)| (c.node(), to, msg))).next() {
-			let session = &sessions[sessions.iter().position(|s| s.node() == &to).unwrap()];
+		let mut queue: VecDeque<(NodeId, NodeId, Message)> = VecDeque::new();
+		while let Some((mut from, mut to, mut message)) = clusters.iter().filter_map(|c| c.take_message().map(|(to, msg)| (c.node(), to, msg))).next() {
 			if cond(&from, &to, &message) {
 				break;
 			}
 
-			match message {
-				Message::Decryption(message) => session.process_message(&from, &message)?,
-				_ => unreachable!(),
+			let mut is_queued_message = false;
+			loop {
+				let session = &sessions[sessions.iter().position(|s| s.node() == &to).unwrap()];
+				match session.on_message(&from, &message) {
+					Ok(_) => {
+						if let Some(qmessage) = queue.pop_front() {
+							from = qmessage.0;
+							to = qmessage.1;
+							message = qmessage.2;
+							is_queued_message = true;
+							continue;
+						}
+						break;
+					},
+					Err(Error::TooEarlyForRequest) => {
+						if is_queued_message {
+							queue.push_front((from, to, message));
+						} else {
+							queue.push_back((from, to, message));
+						}
+						break;
+					},
+					Err(err) => return Err(err),
+				}
 			}
 		}
 
@@ -571,29 +881,31 @@ mod tests {
 				threshold: 0,
 			},
 			access_key: Random.generate().unwrap().secret().clone(),
-			key_share: DocumentKeyShare {
-				author: Public::default(),
+			key_share: Some(DocumentKeyShare {
+				author: Default::default(),
 				threshold: 0,
-				id_numbers: nodes,
-				secret_share: Random.generate().unwrap().secret().clone(),
+				public: Default::default(),
 				common_point: Some(Random.generate().unwrap().public().clone()),
 				encrypted_point: Some(Random.generate().unwrap().public().clone()),
-			},
+				versions: vec![DocumentKeyShareVersion {
+					hash: Default::default(),
+					id_numbers: nodes,
+					secret_share: Random.generate().unwrap().secret().clone(),
+				}],
+			}),
 			acl_storage: Arc::new(DummyAclStorage::default()),
 			cluster: Arc::new(DummyCluster::new(self_node_id.clone())),
-		}, Some(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap())) {
+			nonce: 0,
+		}, Some(Requester::Signature(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap()))) {
 			Ok(_) => (),
 			_ => panic!("unexpected"),
 		}
 	}
 
 	#[test]
-	fn fails_to_construct_if_not_a_part_of_cluster() {
-		let mut nodes = BTreeMap::new();
+	fn fails_to_initialize_if_does_not_have_a_share() {
 		let self_node_id = Random.generate().unwrap().public().clone();
-		nodes.insert(Random.generate().unwrap().public().clone(), Random.generate().unwrap().secret().clone());
-		nodes.insert(Random.generate().unwrap().public().clone(), Random.generate().unwrap().secret().clone());
-		match SessionImpl::new(SessionParams {
+		let session = SessionImpl::new(SessionParams {
 			meta: SessionMeta {
 				id: SessionId::default(),
 				self_node_id: self_node_id.clone(),
@@ -601,29 +913,21 @@ mod tests {
 				threshold: 0,
 			},
 			access_key: Random.generate().unwrap().secret().clone(),
-			key_share: DocumentKeyShare {
-				author: Public::default(),
-				threshold: 0,
-				id_numbers: nodes,
-				secret_share: Random.generate().unwrap().secret().clone(),
-				common_point: Some(Random.generate().unwrap().public().clone()),
-				encrypted_point: Some(Random.generate().unwrap().public().clone()),
-			},
+			key_share: None,
 			acl_storage: Arc::new(DummyAclStorage::default()),
 			cluster: Arc::new(DummyCluster::new(self_node_id.clone())),
-		}, Some(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap())) {
-			Err(Error::InvalidNodesConfiguration) => (),
-			_ => panic!("unexpected"),
-		}
+			nonce: 0,
+		}, Some(Requester::Signature(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap()))).unwrap();
+		assert_eq!(session.initialize(Default::default(), false, false), Err(Error::InvalidMessage));
 	}
 
 	#[test]
-	fn fails_to_construct_if_threshold_is_wrong() {
+	fn fails_to_initialize_if_threshold_is_wrong() {
 		let mut nodes = BTreeMap::new();
 		let self_node_id = Random.generate().unwrap().public().clone();
 		nodes.insert(self_node_id.clone(), Random.generate().unwrap().secret().clone());
 		nodes.insert(Random.generate().unwrap().public().clone(), Random.generate().unwrap().secret().clone());
-		match SessionImpl::new(SessionParams {
+		let session = SessionImpl::new(SessionParams {
 			meta: SessionMeta {
 				id: SessionId::default(),
 				self_node_id: self_node_id.clone(),
@@ -631,38 +935,44 @@ mod tests {
 				threshold: 2,
 			},
 			access_key: Random.generate().unwrap().secret().clone(),
-			key_share: DocumentKeyShare {
-				author: Public::default(),
+			key_share: Some(DocumentKeyShare {
+				author: Default::default(),
 				threshold: 2,
-				id_numbers: nodes,
-				secret_share: Random.generate().unwrap().secret().clone(),
+				public: Default::default(),
 				common_point: Some(Random.generate().unwrap().public().clone()),
 				encrypted_point: Some(Random.generate().unwrap().public().clone()),
-			},
+				versions: vec![DocumentKeyShareVersion {
+					hash: Default::default(),
+					id_numbers: nodes,
+					secret_share: Random.generate().unwrap().secret().clone(),
+				}],
+			}),
 			acl_storage: Arc::new(DummyAclStorage::default()),
 			cluster: Arc::new(DummyCluster::new(self_node_id.clone())),
-		}, Some(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap())) {
-			Err(Error::InvalidThreshold) => (),
-			_ => panic!("unexpected"),
-		}
+			nonce: 0,
+		}, Some(Requester::Signature(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap()))).unwrap();
+		assert_eq!(session.initialize(Default::default(), false, false), Err(Error::ConsensusUnreachable));
 	}
 
 	#[test]
 	fn fails_to_initialize_when_already_initialized() {
 		let (_, _, _, sessions) = prepare_decryption_sessions();
-		assert_eq!(sessions[0].initialize(false).unwrap(), ());
-		assert_eq!(sessions[0].initialize(false).unwrap_err(), Error::InvalidStateForRequest);
+		assert_eq!(sessions[0].initialize(Default::default(), false, false).unwrap(), ());
+		assert_eq!(sessions[0].initialize(Default::default(), false, false).unwrap_err(), Error::InvalidStateForRequest);
 	}
 
 	#[test]
 	fn fails_to_accept_initialization_when_already_initialized() {
 		let (_, _, _, sessions) = prepare_decryption_sessions();
-		assert_eq!(sessions[0].initialize(false).unwrap(), ());
+		assert_eq!(sessions[0].initialize(Default::default(), false, false).unwrap(), ());
 		assert_eq!(sessions[0].on_consensus_message(sessions[1].node(), &message::DecryptionConsensusMessage {
 				session: SessionId::default().into(),
 				sub_session: sessions[0].access_key().clone().into(),
+				session_nonce: 0,
 				message: message::ConsensusMessage::InitializeConsensusSession(message::InitializeConsensusSession {
-					requestor_signature: ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap().into(),
+					requester: Requester::Signature(ethkey::sign(
+						Random.generate().unwrap().secret(), &SessionId::default()).unwrap()).into(),
+					version: Default::default(),
 				}),
 			}).unwrap_err(), Error::InvalidMessage);
 	}
@@ -673,15 +983,20 @@ mod tests {
 		assert_eq!(sessions[1].on_consensus_message(sessions[0].node(), &message::DecryptionConsensusMessage {
 				session: SessionId::default().into(),
 				sub_session: sessions[0].access_key().clone().into(),
+				session_nonce: 0,
 				message: message::ConsensusMessage::InitializeConsensusSession(message::InitializeConsensusSession {
-					requestor_signature: ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap().into(),
+					requester: Requester::Signature(ethkey::sign(Random.generate().unwrap().secret(),
+						&SessionId::default()).unwrap()).into(),
+					version: Default::default(),
 				}),
 		}).unwrap(), ());
 		assert_eq!(sessions[1].on_partial_decryption_requested(sessions[2].node(), &message::RequestPartialDecryption {
 			session: SessionId::default().into(),
 			sub_session: sessions[0].access_key().clone().into(),
+			session_nonce: 0,
 			request_id: Random.generate().unwrap().secret().clone().into(),
 			is_shadow_decryption: false,
+			is_broadcast_session: false,
 			nodes: sessions.iter().map(|s| s.node().clone().into()).take(4).collect(),
 		}).unwrap_err(), Error::InvalidMessage);
 	}
@@ -692,15 +1007,20 @@ mod tests {
 		assert_eq!(sessions[1].on_consensus_message(sessions[0].node(), &message::DecryptionConsensusMessage {
 				session: SessionId::default().into(),
 				sub_session: sessions[0].access_key().clone().into(),
+				session_nonce: 0,
 				message: message::ConsensusMessage::InitializeConsensusSession(message::InitializeConsensusSession {
-					requestor_signature: ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap().into(),
+					requester: Requester::Signature(ethkey::sign(Random.generate().unwrap().secret(),
+						&SessionId::default()).unwrap()).into(),
+					version: Default::default(),
 				}),
 		}).unwrap(), ());
 		assert_eq!(sessions[1].on_partial_decryption_requested(sessions[0].node(), &message::RequestPartialDecryption {
 			session: SessionId::default().into(),
 			sub_session: sessions[0].access_key().clone().into(),
+			session_nonce: 0,
 			request_id: Random.generate().unwrap().secret().clone().into(),
 			is_shadow_decryption: false,
+			is_broadcast_session: false,
 			nodes: sessions.iter().map(|s| s.node().clone().into()).take(2).collect(),
 		}).unwrap_err(), Error::InvalidMessage);
 	}
@@ -711,6 +1031,7 @@ mod tests {
 		assert_eq!(sessions[0].on_partial_decryption(sessions[1].node(), &message::PartialDecryption {
 			session: SessionId::default().into(),
 			sub_session: sessions[0].access_key().clone().into(),
+			session_nonce: 0,
 			request_id: Random.generate().unwrap().secret().clone().into(),
 			shadow_point: Random.generate().unwrap().public().clone().into(),
 			decrypt_shadow: None,
@@ -720,7 +1041,7 @@ mod tests {
 	#[test]
 	fn fails_to_accept_partial_decrypt_twice() {
 		let (_, clusters, _, sessions) = prepare_decryption_sessions();
-		sessions[0].initialize(false).unwrap();
+		sessions[0].initialize(Default::default(), false, false).unwrap();
 
 		let mut pd_from = None;
 		let mut pd_msg = None;
@@ -748,7 +1069,7 @@ mod tests {
 	#[test]
 	fn node_is_marked_rejected_when_timed_out_during_initialization_confirmation() {
 		let (_, _, _, sessions) = prepare_decryption_sessions();
-		sessions[0].initialize(false).unwrap();
+		sessions[0].initialize(Default::default(), false, false).unwrap();
 
 		// 1 node disconnects => we still can recover secret
 		sessions[0].on_node_timeout(sessions[1].node());
@@ -766,7 +1087,7 @@ mod tests {
 		let key_pair = Random.generate().unwrap();
 
 		acl_storages[1].prohibit(key_pair.public().clone(), SessionId::default());
-		sessions[0].initialize(false).unwrap();
+		sessions[0].initialize(Default::default(), false, false).unwrap();
 
 		do_messages_exchange_until(&clusters, &sessions, |_, _, _| sessions[0].state() == ConsensusSessionState::WaitingForPartialResults).unwrap();
 
@@ -778,7 +1099,7 @@ mod tests {
 	#[test]
 	fn session_does_not_fail_if_requested_node_disconnects() {
 		let (_, clusters, _, sessions) = prepare_decryption_sessions();
-		sessions[0].initialize(false).unwrap();
+		sessions[0].initialize(Default::default(), false, false).unwrap();
 
 		do_messages_exchange_until(&clusters, &sessions, |_, _, _| sessions[0].state() == ConsensusSessionState::WaitingForPartialResults).unwrap();
 
@@ -794,7 +1115,7 @@ mod tests {
 	#[test]
 	fn session_does_not_fail_if_node_with_shadow_point_disconnects() {
 		let (_, clusters, _, sessions) = prepare_decryption_sessions();
-		sessions[0].initialize(false).unwrap();
+		sessions[0].initialize(Default::default(), false, false).unwrap();
 
 		do_messages_exchange_until(&clusters, &sessions, |_, _, _| sessions[0].state() == ConsensusSessionState::WaitingForPartialResults
 			&& sessions[0].data.lock().consensus_session.computation_job().responses().len() == 2).unwrap();
@@ -811,7 +1132,7 @@ mod tests {
 	#[test]
 	fn session_restarts_if_confirmed_node_disconnects() {
 		let (_, clusters, _, sessions) = prepare_decryption_sessions();
-		sessions[0].initialize(false).unwrap();
+		sessions[0].initialize(Default::default(), false, false).unwrap();
 
 		do_messages_exchange_until(&clusters, &sessions, |_, _, _| sessions[0].state() == ConsensusSessionState::WaitingForPartialResults).unwrap();
 
@@ -826,7 +1147,7 @@ mod tests {
 	#[test]
 	fn session_does_not_fail_if_non_master_node_disconnects_from_non_master_node() {
 		let (_, clusters, _, sessions) = prepare_decryption_sessions();
-		sessions[0].initialize(false).unwrap();
+		sessions[0].initialize(Default::default(), false, false).unwrap();
 
 		do_messages_exchange_until(&clusters, &sessions, |_, _, _| sessions[0].state() == ConsensusSessionState::WaitingForPartialResults).unwrap();
 
@@ -841,7 +1162,7 @@ mod tests {
 		let (_, clusters, _, sessions) = prepare_decryption_sessions();
 
 		// now let's try to do a decryption
-		sessions[0].initialize(false).unwrap();
+		sessions[0].initialize(Default::default(), false, false).unwrap();
 
 		do_messages_exchange(&clusters, &sessions).unwrap();
 
@@ -863,7 +1184,7 @@ mod tests {
 		let (key_pair, clusters, _, sessions) = prepare_decryption_sessions();
 
 		// now let's try to do a decryption
-		sessions[0].initialize(true).unwrap();
+		sessions[0].initialize(Default::default(), true, false).unwrap();
 
 		do_messages_exchange(&clusters, &sessions).unwrap();
 
@@ -894,7 +1215,7 @@ mod tests {
 		let (key_pair, clusters, acl_storages, sessions) = prepare_decryption_sessions();
 
 		// now let's try to do a decryption
-		sessions[0].initialize(false).unwrap();
+		sessions[0].initialize(Default::default(), false, false).unwrap();
 
 		// we need 4 out of 5 nodes to agree to do a decryption
 		// let's say that 2 of these nodes are disagree
@@ -917,7 +1238,7 @@ mod tests {
 		acl_storages[0].prohibit(key_pair.public().clone(), SessionId::default());
 
 		// now let's try to do a decryption
-		sessions[0].initialize(false).unwrap();
+		sessions[0].initialize(Default::default(), false, false).unwrap();
 
 		do_messages_exchange(&clusters, &sessions).unwrap();
 
@@ -934,7 +1255,75 @@ mod tests {
 	}
 
 	#[test]
-	fn decryption_session_works_over_network() {
-		// TODO
+	fn decryption_message_fails_when_nonce_is_wrong() {
+		let (_, _, _, sessions) = prepare_decryption_sessions();
+		assert_eq!(sessions[1].process_message(sessions[0].node(), &message::DecryptionMessage::DecryptionSessionCompleted(
+			message::DecryptionSessionCompleted {
+				session: SessionId::default().into(),
+				sub_session: sessions[0].access_key().clone().into(),
+				session_nonce: 10,
+			}
+		)), Err(Error::ReplayProtection));
+	}
+
+	#[test]
+	fn decryption_works_when_delegated_to_other_node() {
+		let (_, clusters, _, mut sessions) = prepare_decryption_sessions();
+
+		// let's say node1 doesn't have a share && delegates decryption request to node0
+		// initially session is created on node1 => node1 is master for itself, but for other nodes node0 is still master
+		sessions[1].core.meta.master_node_id = sessions[1].core.meta.self_node_id.clone();
+		sessions[1].data.lock().consensus_session.consensus_job_mut().executor_mut().set_requester(
+			sessions[0].data.lock().consensus_session.consensus_job().executor().requester().unwrap().clone()
+		);
+
+		// now let's try to do a decryption
+		sessions[1].delegate(sessions[0].core.meta.self_node_id.clone(), Default::default(), false, false).unwrap();
+		do_messages_exchange(&clusters, &sessions).unwrap();
+
+		// now check that:
+		// 1) 4 of 5 sessions are in Finished state
+		assert_eq!(sessions.iter().filter(|s| s.state() == ConsensusSessionState::Finished).count(), 4);
+		// 2) 1 session has decrypted key value
+		assert_eq!(sessions[1].decrypted_secret().unwrap().unwrap(), EncryptedDocumentKeyShadow {
+			decrypted_secret: SECRET_PLAIN.into(),
+			common_point: None,
+			decrypt_shadows: None,
+		});
+	}
+
+	#[test]
+	fn decryption_works_when_share_owners_are_isolated() {
+		let (_, clusters, _, sessions) = prepare_decryption_sessions();
+
+		// we need 4 out of 5 nodes to agree to do a decryption
+		// let's say that 1 of these nodes (master) is isolated
+		let isolated_node_id = sessions[4].core.meta.self_node_id.clone();
+		for cluster in &clusters {
+			cluster.remove_node(&isolated_node_id);
+		}
+
+		// now let's try to do a decryption
+		sessions[0].initialize(Default::default(), false, false).unwrap();
+		do_messages_exchange(&clusters, &sessions).unwrap();
+
+		assert_eq!(sessions[0].decrypted_secret().unwrap().unwrap(), EncryptedDocumentKeyShadow {
+			decrypted_secret: SECRET_PLAIN.into(),
+			common_point: None,
+			decrypt_shadows: None,
+		});
+	}
+
+	#[test]
+	fn decryption_result_restored_on_all_nodes_if_broadcast_session_is_completed() {
+		let (_, clusters, _, sessions) = prepare_decryption_sessions();
+		sessions[0].initialize(Default::default(), false, true).unwrap();
+		do_messages_exchange(&clusters, &sessions).unwrap();
+
+		// decryption result must be the same and available on 4 nodes
+		let result = sessions[0].decrypted_secret();
+		assert!(result.clone().unwrap().is_ok());
+		assert_eq!(3, sessions.iter().skip(1).filter(|s| s.decrypted_secret() == result).count());
+		assert_eq!(1, sessions.iter().skip(1).filter(|s| s.decrypted_secret().is_none()).count());
 	}
 }
diff --git a/secret_store/src/key_server_cluster/encryption_session.rs b/secret_store/src/key_server_cluster/client_sessions/encryption_session.rs
similarity index 64%
rename from secret_store/src/key_server_cluster/encryption_session.rs
rename to secret_store/src/key_server_cluster/client_sessions/encryption_session.rs
index b61594925ff3b4ef4d125e0088b227624abe9e70..eafac6fd25693350ce921911bd941720bb3949ef 100644
--- a/secret_store/src/key_server_cluster/encryption_session.rs
+++ b/secret_store/src/key_server_cluster/client_sessions/encryption_session.rs
@@ -19,21 +19,13 @@ use std::fmt::{Debug, Formatter, Error as FmtError};
 use std::time;
 use std::sync::Arc;
 use parking_lot::{Condvar, Mutex};
-use ethkey::{self, Public, Signature};
-use key_server_cluster::{Error, NodeId, SessionId, KeyStorage, DocumentKeyShare};
+use ethkey::Public;
+use key_server_cluster::{Error, NodeId, SessionId, Requester, KeyStorage, DocumentKeyShare};
 use key_server_cluster::cluster::Cluster;
 use key_server_cluster::cluster_sessions::ClusterSession;
 use key_server_cluster::message::{Message, EncryptionMessage, InitializeEncryptionSession,
 	ConfirmEncryptionInitialization, EncryptionSessionError};
 
-/// Encryption session API.
-pub trait Session: Send + Sync + 'static {
-	/// Get encryption session state.
-	fn state(&self) -> SessionState;
-	/// Wait until session is completed. Returns distributely generated secret key.
-	fn wait(&self, timeout: Option<time::Duration>) -> Result<(), Error>;
-}
-
 /// Encryption (distributed key generation) session.
 /// Based on "ECDKG: A Distributed Key Generation Protocol Based on Elliptic Curve Discrete Logarithm" paper:
 /// http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.124.4128&rep=rep1&type=pdf
@@ -48,11 +40,13 @@ pub struct SessionImpl {
 	/// Public identifier of this node.
 	self_node_id: NodeId,
 	/// Encrypted data.
-	encrypted_data: DocumentKeyShare,
+	encrypted_data: Option<DocumentKeyShare>,
 	/// Key storage.
 	key_storage: Arc<KeyStorage>,
 	/// Cluster which allows this node to send messages to other nodes in the cluster.
 	cluster: Arc<Cluster>,
+	/// Session nonce.
+	nonce: u64,
 	/// SessionImpl completion condvar.
 	completed: Condvar,
 	/// Mutable session data.
@@ -66,15 +60,17 @@ pub struct SessionParams {
 	/// Id of node, on which this session is running.
 	pub self_node_id: Public,
 	/// Encrypted data (result of running generation_session::SessionImpl).
-	pub encrypted_data: DocumentKeyShare,
+	pub encrypted_data: Option<DocumentKeyShare>,
 	/// Key storage.
 	pub key_storage: Arc<KeyStorage>,
 	/// Cluster
 	pub cluster: Arc<Cluster>,
+	/// Session nonce.
+	pub nonce: u64,
 }
 
-#[derive(Debug)]
 /// Mutable data of encryption (distributed key generation) session.
+#[derive(Debug)]
 struct SessionData {
 	/// Current state of the session.
 	state: SessionState,
@@ -84,16 +80,16 @@ struct SessionData {
 	result: Option<Result<(), Error>>,
 }
 
-#[derive(Debug, Clone)]
 /// Mutable node-specific data.
+#[derive(Debug, Clone)]
 struct NodeData {
 	// === Values, filled during initialization phase ===
 	/// Flags marking that node has confirmed session initialization.
 	pub initialization_confirmed: bool,
 }
 
-#[derive(Debug, Clone, PartialEq)]
 /// Encryption (distributed key generation) session state.
+#[derive(Debug, Clone, PartialEq)]
 pub enum SessionState {
 	// === Initialization states ===
 	/// Every node starts in this state.
@@ -111,7 +107,7 @@ pub enum SessionState {
 impl SessionImpl {
 	/// Create new encryption session.
 	pub fn new(params: SessionParams) -> Result<Self, Error> {
-		check_encrypted_data(&params.self_node_id, &params.encrypted_data)?;
+		check_encrypted_data(&params.encrypted_data)?;
 
 		Ok(SessionImpl {
 			id: params.id,
@@ -119,6 +115,7 @@ impl SessionImpl {
 			encrypted_data: params.encrypted_data,
 			key_storage: params.key_storage,
 			cluster: params.cluster,
+			nonce: params.nonce,
 			completed: Condvar::new(),
 			data: Mutex::new(SessionData {
 				state: SessionState::WaitingForInitialization,
@@ -133,8 +130,14 @@ impl SessionImpl {
 		&self.self_node_id
 	}
 
+	/// Wait for session completion.
+	pub fn wait(&self, timeout: Option<time::Duration>) -> Result<(), Error> {
+		Self::wait_session(&self.completed, &self.data, timeout, |data| data.result.clone())
+	}
+
+
 	/// Start new session initialization. This must be called on master node.
-	pub fn initialize(&self, requestor_signature: Signature, common_point: Public, encrypted_point: Public) -> Result<(), Error> {
+	pub fn initialize(&self, requester: Requester, common_point: Public, encrypted_point: Public) -> Result<(), Error> {
 		let mut data = self.data.lock();
 
 		// check state
@@ -142,34 +145,35 @@ impl SessionImpl {
 			return Err(Error::InvalidStateForRequest);
 		}
 
-		// check that the requester is the author of the encrypted data
-		let requestor_public = ethkey::recover(&requestor_signature, &self.id)?;
-		if self.encrypted_data.author != requestor_public {
-			return Err(Error::AccessDenied);
-		}
-
 		// update state
 		data.state = SessionState::WaitingForInitializationConfirm;
-		for node_id in self.encrypted_data.id_numbers.keys() {
-			data.nodes.insert(node_id.clone(), NodeData {
-				initialization_confirmed: node_id == self.node(),
-			});
-		}
+		data.nodes.extend(self.cluster.nodes().into_iter().map(|n| (n, NodeData {
+			initialization_confirmed: &n == self.node(),
+		})));
 
-		// TODO: there could be situation when some nodes have failed to store encrypted data
-		// => potential problems during restore. some confirmation step is needed?
+		// TODO [Sec]: id signature is not enough here, as it was already used in key generation
+		// TODO [Reliability]: there could be situation when some nodes have failed to store encrypted data
+		// => potential problems during restore. some confirmation step is needed (2pc)?
 		// save encryption data
-		let mut encrypted_data = self.encrypted_data.clone();
-		encrypted_data.common_point = Some(common_point.clone());
-		encrypted_data.encrypted_point = Some(encrypted_point.clone());
-		self.key_storage.update(self.id.clone(), encrypted_data)
-			.map_err(|e| Error::KeyStorage(e.into()))?;
+		if let Some(mut encrypted_data) = self.encrypted_data.clone() {
+			// check that the requester is the author of the encrypted data
+			let requester_address = requester.address(&self.id).ok_or(Error::InsufficientRequesterData)?;
+			if encrypted_data.author != requester_address {
+				return Err(Error::AccessDenied);
+			}
+
+			encrypted_data.common_point = Some(common_point.clone());
+			encrypted_data.encrypted_point = Some(encrypted_point.clone());
+			self.key_storage.update(self.id.clone(), encrypted_data)
+				.map_err(|e| Error::KeyStorage(e.into()))?;
+		}
 
 		// start initialization
-		if self.encrypted_data.id_numbers.len() > 1 {
+		if data.nodes.len() > 1 {
 			self.cluster.broadcast(Message::Encryption(EncryptionMessage::InitializeEncryptionSession(InitializeEncryptionSession {
 				session: self.id.clone().into(),
-				requestor_signature: requestor_signature.into(),
+				session_nonce: self.nonce,
+				requester: requester.into(),
 				common_point: common_point.into(),
 				encrypted_point: encrypted_point.into(),
 			})))
@@ -195,17 +199,19 @@ impl SessionImpl {
 		}
 
 		// check that the requester is the author of the encrypted data
-		let requestor_public = ethkey::recover(&message.requestor_signature.clone().into(), &self.id)?;
-		if self.encrypted_data.author != requestor_public {
-			return Err(Error::AccessDenied);
-		}
+		if let Some(mut encrypted_data) = self.encrypted_data.clone() {
+			let requester: Requester = message.requester.clone().into();
+			let requestor_address = requester.address(&self.id).ok_or(Error::InsufficientRequesterData)?;
+			if encrypted_data.author != requestor_address {
+				return Err(Error::AccessDenied);
+			}
 
-		// save encryption data
-		let mut encrypted_data = self.encrypted_data.clone();
-		encrypted_data.common_point = Some(message.common_point.clone().into());
-		encrypted_data.encrypted_point = Some(message.encrypted_point.clone().into());
-		self.key_storage.update(self.id.clone(), encrypted_data)
-			.map_err(|e| Error::KeyStorage(e.into()))?;
+			// save encryption data
+			encrypted_data.common_point = Some(message.common_point.clone().into());
+			encrypted_data.encrypted_point = Some(message.encrypted_point.clone().into());
+			self.key_storage.update(self.id.clone(), encrypted_data)
+				.map_err(|e| Error::KeyStorage(e.into()))?;
+		}
 
 		// update state
 		data.state = SessionState::Finished;
@@ -213,6 +219,7 @@ impl SessionImpl {
 		// send confirmation back to master node
 		self.cluster.send(&sender, Message::Encryption(EncryptionMessage::ConfirmEncryptionInitialization(ConfirmEncryptionInitialization {
 			session: self.id.clone().into(),
+			session_nonce: self.nonce,
 		})))
 	}
 
@@ -239,22 +246,19 @@ impl SessionImpl {
 
 		Ok(())
 	}
+}
 
-	/// When error has occured on another node.
-	pub fn on_session_error(&self, sender: NodeId, message: &EncryptionSessionError) -> Result<(), Error> {
-		let mut data = self.data.lock();
-
-		warn!("{}: encryption session failed with error: {} from {}", self.node(), message.error, sender);
+impl ClusterSession for SessionImpl {
+	type Id = SessionId;
 
-		data.state = SessionState::Failed;
-		data.result = Some(Err(Error::Io(message.error.clone())));
-		self.completed.notify_all();
+	fn type_name() -> &'static str {
+		"encryption"
+	}
 
-		Ok(())
+	fn id(&self) -> SessionId {
+		self.id.clone()
 	}
-}
 
-impl ClusterSession for SessionImpl {
 	fn is_finished(&self) -> bool {
 		let data = self.data.lock();
 		data.state == SessionState::Failed
@@ -280,25 +284,46 @@ impl ClusterSession for SessionImpl {
 		data.result = Some(Err(Error::NodeDisconnected));
 		self.completed.notify_all();
 	}
-}
 
-impl Session for SessionImpl {
-	fn state(&self) -> SessionState {
-		self.data.lock().state.clone()
-	}
+	fn on_session_error(&self, node: &NodeId, error: Error) {
+		// error in encryption session is considered fatal
+		// => broadcast error if error occured on this node
+		if *node == self.self_node_id {
+			// do not bother processing send error, as we already processing error
+			let _ = self.cluster.broadcast(Message::Encryption(EncryptionMessage::EncryptionSessionError(EncryptionSessionError {
+				session: self.id.clone().into(),
+				session_nonce: self.nonce,
+				error: error.clone().into(),
+			})));
+		}
 
-	fn wait(&self, timeout: Option<time::Duration>) -> Result<(), Error> {
 		let mut data = self.data.lock();
-		if !data.result.is_some() {
-			match timeout {
-				None => self.completed.wait(&mut data),
-				Some(timeout) => { self.completed.wait_for(&mut data, timeout); },
-			}
+
+		warn!("{}: encryption session failed with error: {} from {}", self.node(), error, node);
+
+		data.state = SessionState::Failed;
+		data.result = Some(Err(error));
+		self.completed.notify_all();
+	}
+
+	fn on_message(&self, sender: &NodeId, message: &Message) -> Result<(), Error> {
+		if Some(self.nonce) != message.session_nonce() {
+			return Err(Error::ReplayProtection);
 		}
 
-		data.result.as_ref()
-			.expect("checked above or waited for completed; completed is only signaled when result.is_some(); qed")
-			.clone()
+		match message {
+			&Message::Encryption(ref message) => match message {
+				&EncryptionMessage::InitializeEncryptionSession(ref message) =>
+					self.on_initialize_session(sender.clone(), message),
+				&EncryptionMessage::ConfirmEncryptionInitialization(ref message) =>
+					self.on_confirm_initialization(sender.clone(), message),
+				&EncryptionMessage::EncryptionSessionError(ref message) => {
+					self.on_session_error(sender, Error::Io(message.error.clone().into()));
+					Ok(())
+				},
+			},
+			_ => unreachable!("cluster checks message to be correct before passing; qed"),
+		}
 	}
 }
 
@@ -308,15 +333,13 @@ impl Debug for SessionImpl {
 	}
 }
 
-fn check_encrypted_data(self_node_id: &Public, encrypted_data: &DocumentKeyShare) -> Result<(), Error> {
-	use key_server_cluster::generation_session::{check_cluster_nodes, check_threshold};
-
-	// check that common_point and encrypted_point are still not set yet
-	if encrypted_data.common_point.is_some() || encrypted_data.encrypted_point.is_some() {
-		return Err(Error::CompletedSessionId);
+fn check_encrypted_data(encrypted_data: &Option<DocumentKeyShare>) -> Result<(), Error> {
+	if let &Some(ref encrypted_data) = encrypted_data {
+		// check that common_point and encrypted_point are still not set yet
+		if encrypted_data.common_point.is_some() || encrypted_data.encrypted_point.is_some() {
+			return Err(Error::CompletedSessionId);
+		}
 	}
 
-	let nodes = encrypted_data.id_numbers.keys().cloned().collect();
-	check_cluster_nodes(self_node_id, &nodes)?;
-	check_threshold(encrypted_data.threshold, &nodes)
+	Ok(())
 }
diff --git a/secret_store/src/key_server_cluster/generation_session.rs b/secret_store/src/key_server_cluster/client_sessions/generation_session.rs
similarity index 79%
rename from secret_store/src/key_server_cluster/generation_session.rs
rename to secret_store/src/key_server_cluster/client_sessions/generation_session.rs
index ade78bc575479d603e4a02898e212d10f0ca8b88..1f1df70ce3b0b63ef9be3a9458cae60d686766aa 100644
--- a/secret_store/src/key_server_cluster/generation_session.rs
+++ b/secret_store/src/key_server_cluster/client_sessions/generation_session.rs
@@ -19,24 +19,15 @@ use std::fmt::{Debug, Formatter, Error as FmtError};
 use std::time;
 use std::sync::Arc;
 use parking_lot::{Condvar, Mutex};
+use ethereum_types::Address;
 use ethkey::{Public, Secret};
-use key_server_cluster::{Error, NodeId, SessionId, KeyStorage, DocumentKeyShare};
+use key_server_cluster::{Error, NodeId, SessionId, KeyStorage, DocumentKeyShare, DocumentKeyShareVersion};
 use key_server_cluster::math;
 use key_server_cluster::cluster::Cluster;
 use key_server_cluster::cluster_sessions::ClusterSession;
 use key_server_cluster::message::{Message, GenerationMessage, InitializeSession, ConfirmInitialization, CompleteInitialization,
 	KeysDissemination, PublicKeyShare, SessionError, SessionCompleted};
 
-/// Key generation session API.
-pub trait Session: Send + Sync + 'static {
-	/// Get generation session state.
-	fn state(&self) -> SessionState;
-	/// Wait until session is completed. Returns public portion of generated server key.
-	fn wait(&self, timeout: Option<time::Duration>) -> Result<Public, Error>;
-	/// Get joint public key (if it is known).
-	fn joint_public_and_secret(&self) -> Option<Result<(Public, Secret), Error>>;
-}
-
 /// Distributed key generation session.
 /// Based on "ECDKG: A Distributed Key Generation Protocol Based on Elliptic Curve Discrete Logarithm" paper:
 /// http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.124.4128&rep=rep1&type=pdf
@@ -54,6 +45,8 @@ pub struct SessionImpl {
 	key_storage: Option<Arc<KeyStorage>>,
 	/// Cluster which allows this node to send messages to other nodes in the cluster.
 	cluster: Arc<Cluster>,
+	/// Session-level nonce.
+	nonce: u64,
 	/// SessionImpl completion condvar.
 	completed: Condvar,
 	/// Mutable session data.
@@ -70,10 +63,12 @@ pub struct SessionParams {
 	pub key_storage: Option<Arc<KeyStorage>>,
 	/// Cluster
 	pub cluster: Arc<Cluster>,
+	/// Session nonce.
+	pub nonce: Option<u64>,
 }
 
-#[derive(Debug)]
 /// Mutable data of distributed key generation session.
+#[derive(Debug)]
 struct SessionData {
 	/// Current state of the session.
 	state: SessionState,
@@ -83,10 +78,12 @@ struct SessionData {
 	// === Values, filled when session initialization just starts ===
 	/// Reference to the node, which has started this session.
 	master: Option<NodeId>,
-	/// Public key of the creator of the session.
-	author: Option<Public>,
+	/// Address of the creator of the session.
+	author: Option<Address>,
 
 	// === Values, filled when session initialization is completed ===
+	/// Is zero secret generation session?
+	is_zero: Option<bool>,
 	/// Threshold value for this DKG. Only `threshold + 1` will be able to collectively recreate joint secret,
 	/// and thus - decrypt message, encrypted with joint public.
 	threshold: Option<usize>,
@@ -96,6 +93,8 @@ struct SessionData {
 	nodes: BTreeMap<NodeId, NodeData>,
 
 	// === Values, filled during KD phase ===
+	/// Polynom1.
+	polynom1: Option<Vec<Secret>>,
 	/// Value of polynom1[0], generated by this node.
 	secret_coeff: Option<Secret>,
 
@@ -107,20 +106,16 @@ struct SessionData {
 	/// Key share.
 	key_share: Option<Result<DocumentKeyShare, Error>>,
 	/// Jointly generated public key, which can be used to encrypt secret. Public.
-	joint_public_and_secret: Option<Result<(Public, Secret), Error>>,
+	joint_public_and_secret: Option<Result<(Public, Secret, Secret), Error>>,
 }
 
-#[derive(Debug, Clone)]
 /// Mutable node-specific data.
+#[derive(Debug, Clone)]
 struct NodeData {
 	/// Random unique scalar. Persistent.
 	pub id_number: Secret,
 
 	// === Values, filled during KD phase ===
-	/// Secret value1, which has been sent to this node.
-	pub secret1_sent: Option<Secret>,
-	/// Secret value2, which has been sent to this node.
-	pub secret2_sent: Option<Secret>,
 	/// Secret value1, which has been received from this node.
 	pub secret1: Option<Secret>,
 	/// Secret value2, which has been received from this node.
@@ -137,8 +132,8 @@ struct NodeData {
 	pub completion_confirmed: bool,
 }
 
-#[derive(Debug, Clone, PartialEq)]
 /// Schedule for visiting other nodes of cluster.
+#[derive(Debug, Clone, PartialEq)]
 pub struct EveryOtherNodeVisitor {
 	/// Already visited nodes.
 	visited: BTreeSet<NodeId>,
@@ -148,8 +143,8 @@ pub struct EveryOtherNodeVisitor {
 	in_progress: BTreeSet<NodeId>,
 }
 
-#[derive(Debug, Clone, PartialEq)]
 /// Distributed key generation session state.
+#[derive(Debug, Clone, PartialEq)]
 pub enum SessionState {
 	// === Initialization states ===
 	/// Every node starts in this state.
@@ -179,6 +174,32 @@ pub enum SessionState {
 	Failed,
 }
 
+pub enum InitializationNodes {
+	RandomNumbers(BTreeSet<NodeId>),
+	SpecificNumbers(BTreeMap<NodeId, Secret>)
+}
+
+impl InitializationNodes {
+	pub fn set(&self) -> BTreeSet<NodeId> {
+		match *self {
+			InitializationNodes::RandomNumbers(ref nodes) => nodes.clone(),
+			InitializationNodes::SpecificNumbers(ref nodes) => nodes.keys().cloned().collect(),
+		}
+	}
+}
+
+impl From<BTreeSet<NodeId>> for InitializationNodes {
+	fn from(nodes: BTreeSet<NodeId>) -> Self {
+		InitializationNodes::RandomNumbers(nodes)
+	}
+}
+
+impl From<BTreeMap<NodeId, Secret>> for InitializationNodes {
+	fn from(nodes: BTreeMap<NodeId, Secret>) -> Self {
+		InitializationNodes::SpecificNumbers(nodes)
+	}
+}
+
 impl SessionImpl {
 	/// Create new generation session.
 	pub fn new(params: SessionParams) -> Self {
@@ -187,15 +208,20 @@ impl SessionImpl {
 			self_node_id: params.self_node_id,
 			key_storage: params.key_storage,
 			cluster: params.cluster,
+			// when nonce.is_nonce(), generation session is wrapped
+			// => nonce is checked somewhere else && we can pass any value
+			nonce: params.nonce.unwrap_or_default(),
 			completed: Condvar::new(),
 			data: Mutex::new(SessionData {
 				state: SessionState::WaitingForInitialization,
 				simulate_faulty_behaviour: false,
 				master: None,
 				author: None,
+				is_zero: None,
 				threshold: None,
 				derived_point: None,
 				nodes: BTreeMap::new(),
+				polynom1: None,
 				secret_coeff: None,
 				secret_share: None,
 				key_share: None,
@@ -209,8 +235,8 @@ impl SessionImpl {
 		&self.self_node_id
 	}
 
-	#[cfg(test)]
 	/// Get derived point.
+	#[cfg(test)]
 	pub fn derived_point(&self) -> Option<Public> {
 		self.data.lock().derived_point.clone()
 	}
@@ -220,10 +246,26 @@ impl SessionImpl {
 		self.data.lock().simulate_faulty_behaviour = true;
 	}
 
+	/// Get session state.
+	pub fn state(&self) -> SessionState {
+		self.data.lock().state.clone()
+	}
+
+	/// Wait for session completion.
+	pub fn wait(&self, timeout: Option<time::Duration>) -> Result<Public, Error> {
+		Self::wait_session(&self.completed, &self.data, timeout, |data| data.joint_public_and_secret.clone()
+			.map(|r| r.map(|r| r.0.clone())))
+	}
+
+	/// Get generated public and secret (if any).
+	pub fn joint_public_and_secret(&self) -> Option<Result<(Public, Secret, Secret), Error>> {
+		self.data.lock().joint_public_and_secret.clone()
+	}
+
 	/// Start new session initialization. This must be called on master node.
-	pub fn initialize(&self, author: Public, threshold: usize, nodes: BTreeSet<NodeId>) -> Result<(), Error> {
-		check_cluster_nodes(self.node(), &nodes)?;
-		check_threshold(threshold, &nodes)?;
+	pub fn initialize(&self, author: Address, is_zero: bool, threshold: usize, nodes: InitializationNodes) -> Result<(), Error> {
+		check_cluster_nodes(self.node(), &nodes.set())?;
+		check_threshold(threshold, &nodes.set())?;
 
 		let mut data = self.data.lock();
 
@@ -235,11 +277,21 @@ impl SessionImpl {
 		// update state
 		data.master = Some(self.node().clone());
 		data.author = Some(author.clone());
+		data.is_zero = Some(is_zero);
 		data.threshold = Some(threshold);
-		for node_id in &nodes {
-			// generate node identification parameter
-			let node_id_number = math::generate_random_scalar()?;
-			data.nodes.insert(node_id.clone(), NodeData::with_id_number(node_id_number));
+		match nodes {
+			InitializationNodes::RandomNumbers(nodes) => {
+				for node_id in nodes {
+					// generate node identification parameter
+					let node_id_number = math::generate_random_scalar()?;
+					data.nodes.insert(node_id, NodeData::with_id_number(node_id_number));
+				}
+			},
+			InitializationNodes::SpecificNumbers(nodes) => {
+				for (node_id, node_id_number) in nodes {
+					data.nodes.insert(node_id, NodeData::with_id_number(node_id_number));
+				}
+			},
 		}
 
 		let mut visit_policy = EveryOtherNodeVisitor::new(self.node(), data.nodes.keys().cloned());
@@ -251,8 +303,10 @@ impl SessionImpl {
 				// start initialization
 				self.cluster.send(&next_node, Message::Generation(GenerationMessage::InitializeSession(InitializeSession {
 						session: self.id.clone().into(),
+						session_nonce: self.nonce,
 						author: author.into(),
 						nodes: data.nodes.iter().map(|(k, v)| (k.clone().into(), v.id_number.clone().into())).collect(),
+						is_zero: data.is_zero.expect("is_zero is filled in initialization phase; KD phase follows initialization phase; qed"),
 						threshold: data.threshold.expect("threshold is filled in initialization phase; KD phase follows initialization phase; qed"),
 						derived_point: derived_point.into(),
 					})))
@@ -269,6 +323,10 @@ impl SessionImpl {
 
 	/// Process single message.
 	pub fn process_message(&self, sender: &NodeId, message: &GenerationMessage) -> Result<(), Error> {
+		if self.nonce != message.session_nonce() {
+			return Err(Error::ReplayProtection);
+		}
+
 		match message {
 			&GenerationMessage::InitializeSession(ref message) =>
 				self.on_initialize_session(sender.clone(), message),
@@ -280,9 +338,11 @@ impl SessionImpl {
 				self.on_keys_dissemination(sender.clone(), message),
 			&GenerationMessage::PublicKeyShare(ref message) =>
 				self.on_public_key_share(sender.clone(), message),
-			&GenerationMessage::SessionError(ref message) =>
-				self.on_session_error(sender.clone(), message),
-			&GenerationMessage::SessionCompleted(ref message) => 
+			&GenerationMessage::SessionError(ref message) => {
+				self.on_session_error(sender, Error::Io(message.error.clone().into()));
+				Ok(())
+			},
+			&GenerationMessage::SessionCompleted(ref message) =>
 				self.on_session_completed(sender.clone(), message),
 		}
 	}
@@ -311,6 +371,7 @@ impl SessionImpl {
 		// send confirmation back to master node
 		self.cluster.send(&sender, Message::Generation(GenerationMessage::ConfirmInitialization(ConfirmInitialization {
 			session: self.id.clone().into(),
+			session_nonce: self.nonce,
 			derived_point: derived_point.into(),
 		})))?;
 
@@ -319,6 +380,7 @@ impl SessionImpl {
 		data.author = Some(message.author.clone().into());
 		data.state = SessionState::WaitingForInitializationComplete;
 		data.nodes = message.nodes.iter().map(|(id, number)| (id.clone().into(), NodeData::with_id_number(number.clone().into()))).collect();
+		data.is_zero = Some(message.is_zero);
 		data.threshold = Some(message.threshold);
 
 		Ok(())
@@ -348,8 +410,10 @@ impl SessionImpl {
 		if let Some(next_receiver) = next_receiver {
 			return self.cluster.send(&next_receiver, Message::Generation(GenerationMessage::InitializeSession(InitializeSession {
 					session: self.id.clone().into(),
+					session_nonce: self.nonce,
 					author: data.author.as_ref().expect("author is filled on initialization step; confrm initialization follows initialization; qed").clone().into(),
 					nodes: data.nodes.iter().map(|(k, v)| (k.clone().into(), v.id_number.clone().into())).collect(),
+					is_zero: data.is_zero.expect("is_zero is filled in initialization phase; KD phase follows initialization phase; qed"),
 					threshold: data.threshold.expect("threshold is filled in initialization phase; KD phase follows initialization phase; qed"),
 					derived_point: message.derived_point.clone().into(),
 				})));
@@ -406,8 +470,9 @@ impl SessionImpl {
 		debug_assert!(data.nodes.contains_key(&sender));
 
 		// check message
+		let is_zero = data.is_zero.expect("is_zero is filled in initialization phase; KD phase follows initialization phase; qed");
 		let threshold = data.threshold.expect("threshold is filled in initialization phase; KD phase follows initialization phase; qed");
-		if message.publics.len() != threshold + 1 {
+		if !is_zero && message.publics.len() != threshold + 1 {
 			return Err(Error::InvalidMessage);
 		}
 
@@ -448,7 +513,7 @@ impl SessionImpl {
 		// update node data with received public share
 		{
 			let node_data = &mut data.nodes.get_mut(&sender).ok_or(Error::InvalidMessage)?;
-				if node_data.public_share.is_some() {
+			if node_data.public_share.is_some() {
 				return Err(Error::InvalidMessage);
 			}
 
@@ -487,16 +552,28 @@ impl SessionImpl {
 				return Err(Error::InvalidMessage);
 			}
 
+			// calculate joint public key
+			let is_zero = data.is_zero.expect("is_zero is filled in initialization phase; KG phase follows initialization phase; qed");
+			let joint_public = if !is_zero {
+				let public_shares = data.nodes.values().map(|n| n.public_share.as_ref().expect("keys received on KD phase; KG phase follows KD phase; qed"));
+				math::compute_joint_public(public_shares)?
+			} else {
+				Default::default()
+			};
+
 			// save encrypted data to key storage
 			let encrypted_data = DocumentKeyShare {
 				author: data.author.as_ref().expect("author is filled in initialization phase; KG phase follows initialization phase; qed").clone(),
 				threshold: data.threshold.expect("threshold is filled in initialization phase; KG phase follows initialization phase; qed"),
-				id_numbers: data.nodes.iter().map(|(node_id, node_data)| (node_id.clone(), node_data.id_number.clone())).collect(),
-				secret_share: data.secret_share.as_ref().expect("secret_share is filled in KG phase; we are at the end of KG phase; qed").clone(),
+				public: joint_public,
 				common_point: None,
 				encrypted_point: None,
+				versions: vec![DocumentKeyShareVersion::new(
+					data.nodes.iter().map(|(node_id, node_data)| (node_id.clone(), node_data.id_number.clone())).collect(),
+					data.secret_share.as_ref().expect("secret_share is filled in KG phase; we are at the end of KG phase; qed").clone(),
+				)],
 			};
-			
+
 			if let Some(ref key_storage) = self.key_storage {
 				key_storage.insert(self.id.clone(), encrypted_data.clone())
 					.map_err(|e| Error::KeyStorage(e.into()))?;
@@ -506,6 +583,7 @@ impl SessionImpl {
 			data.state = SessionState::Finished;
 			return self.cluster.send(&sender, Message::Generation(GenerationMessage::SessionCompleted(SessionCompleted {
 				session: self.id.clone().into(),
+				session_nonce: self.nonce,
 			})));
 		}
 
@@ -531,20 +609,6 @@ impl SessionImpl {
 		Ok(())
 	}
 
-	/// When error has occured on another node.
-	pub fn on_session_error(&self, sender: NodeId, message: &SessionError) -> Result<(), Error> {
-		let mut data = self.data.lock();
-
-		warn!("{}: generation session failed with error: {} from {}", self.node(), message.error, sender);
-
-		data.state = SessionState::Failed;
-		data.key_share = Some(Err(Error::Io(message.error.clone())));
-		data.joint_public_and_secret = Some(Err(Error::Io(message.error.clone())));
-		self.completed.notify_all();
-
-		Ok(())
-	}
-
 	/// Complete initialization (when all other nodex has responded with confirmation)
 	fn complete_initialization(&self, mut derived_point: Public) -> Result<(), Error> {
 		// update point once again to make sure that derived point is not generated by last node
@@ -557,6 +621,7 @@ impl SessionImpl {
 		// broadcast derived point && other session paraeters to every other node
 		self.cluster.broadcast(Message::Generation(GenerationMessage::CompleteInitialization(CompleteInitialization {
 			session: self.id.clone().into(),
+			session_nonce: self.nonce,
 			derived_point: derived_point.into(),
 		})))
 	}
@@ -567,15 +632,23 @@ impl SessionImpl {
 
 		// pick 2t + 2 random numbers as polynomial coefficients for 2 polynoms
 		let threshold = data.threshold.expect("threshold is filled on initialization phase; KD phase follows initialization phase; qed");
-		let polynom1 = math::generate_random_polynom(threshold)?;
+		let is_zero = data.is_zero.expect("is_zero is filled on initialization phase; KD phase follows initialization phase; qed");
+		let mut polynom1 = math::generate_random_polynom(threshold)?;
+		if is_zero {
+			polynom1[0] = math::zero_scalar();
+		}
 		let polynom2 = math::generate_random_polynom(threshold)?;
+		data.polynom1 = Some(polynom1.clone());
 		data.secret_coeff = Some(polynom1[0].clone());
-		
+
 		// compute t+1 public values
-		let publics = math::public_values_generation(threshold,
-			data.derived_point.as_ref().expect("keys dissemination occurs after derived point is agreed; qed"),
-			&polynom1,
-			&polynom2)?;
+		let publics = match is_zero {
+			false => math::public_values_generation(threshold,
+				data.derived_point.as_ref().expect("keys dissemination occurs after derived point is agreed; qed"),
+				&polynom1,
+				&polynom2)?,
+			true => Default::default(),
+		};
 
 		// compute secret values for every other node
 		for (node, node_data) in data.nodes.iter_mut() {
@@ -584,11 +657,9 @@ impl SessionImpl {
 
 			// send a message containing secret1 && secret2 to other node
 			if node != self.node() {
-				node_data.secret1_sent = Some(secret1.clone());
-				node_data.secret2_sent = Some(secret2.clone());
-
 				self.cluster.send(&node, Message::Generation(GenerationMessage::KeysDissemination(KeysDissemination {
 					session: self.id.clone().into(),
+					session_nonce: self.nonce,
 					secret1: secret1.into(),
 					secret2: secret2.into(),
 					publics: publics.iter().cloned().map(Into::into).collect(),
@@ -609,28 +680,38 @@ impl SessionImpl {
 	/// Keys verification (KV) phase
 	fn verify_keys(&self) -> Result<(), Error> {
 		let mut data = self.data.lock();
-		
+
 		// key verification (KV) phase: check that other nodes have passed correct secrets
 		let threshold = data.threshold.expect("threshold is filled in initialization phase; KV phase follows initialization phase; qed");
-		let derived_point = data.derived_point.clone().expect("derived point generated on initialization phase; KV phase follows initialization phase; qed");
-		let number_id = data.nodes[self.node()].id_number.clone();
-		for (_	, node_data) in data.nodes.iter_mut().filter(|&(node_id, _)| node_id != self.node()) {
-			let secret1 = node_data.secret1.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
-			let secret2 = node_data.secret2.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
-			let publics = node_data.publics.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
-			let is_key_verification_ok = math::keys_verification(threshold, &derived_point, &number_id,
-				secret1, secret2, publics)?;
-
-			if !is_key_verification_ok {
-				// node has sent us incorrect values. In original ECDKG protocol we should have sent complaint here.
-				return Err(Error::InvalidMessage);
-			}
-		}
-
-		// calculate public share
+		let is_zero = data.is_zero.expect("is_zero is filled in initialization phase; KV phase follows initialization phase; qed");
 		let self_public_share = {
-			let self_secret_coeff = data.secret_coeff.as_ref().expect("secret_coeff is generated on KD phase; KG phase follows KD phase; qed");
-			math::compute_public_share(self_secret_coeff)?
+			if !is_zero { 
+				let derived_point = data.derived_point.clone().expect("derived point generated on initialization phase; KV phase follows initialization phase; qed");
+				let number_id = data.nodes[self.node()].id_number.clone();
+				for (_	, node_data) in data.nodes.iter_mut().filter(|&(node_id, _)| node_id != self.node()) {
+					let secret1 = node_data.secret1.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
+					let secret2 = node_data.secret2.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
+					let publics = node_data.publics.as_ref().expect("keys received on KD phase; KV phase follows KD phase; qed");
+					let is_key_verification_ok = math::keys_verification(threshold, &derived_point, &number_id,
+						secret1, secret2, publics)?;
+
+					if !is_key_verification_ok {
+						// node has sent us incorrect values. In original ECDKG protocol we should have sent complaint here.
+						return Err(Error::InvalidMessage);
+					}
+				}
+
+				// calculate public share
+				let self_public_share = {
+					let self_secret_coeff = data.secret_coeff.as_ref().expect("secret_coeff is generated on KD phase; KG phase follows KD phase; qed");
+					math::compute_public_share(self_secret_coeff)?
+				};
+
+				self_public_share
+			} else {
+				// TODO [Trust]: add verification when available
+				Default::default()
+			}
 		};
 
 		// calculate self secret + public shares
@@ -649,6 +730,7 @@ impl SessionImpl {
 		// broadcast self public key share
 		self.cluster.broadcast(Message::Generation(GenerationMessage::PublicKeyShare(PublicKeyShare {
 			session: self.id.clone().into(),
+			session_nonce: self.nonce,
 			public_share: self_public_share.into(),
 		})))
 	}
@@ -656,28 +738,35 @@ impl SessionImpl {
 	/// Complete generation
 	fn complete_generation(&self) -> Result<(), Error> {
 		let mut data = self.data.lock();
-		
-		// else - calculate joint public key
-		let joint_public = {
+
+		// calculate joint public key
+		let is_zero = data.is_zero.expect("is_zero is filled in initialization phase; KG phase follows initialization phase; qed");
+		let joint_public = if !is_zero {
 			let public_shares = data.nodes.values().map(|n| n.public_share.as_ref().expect("keys received on KD phase; KG phase follows KD phase; qed"));
 			math::compute_joint_public(public_shares)?
+		} else {
+			Default::default()
 		};
 
 		// prepare key data
+		let secret_share = data.secret_share.as_ref().expect("secret_share is filled in KG phase; we are at the end of KG phase; qed").clone();
 		let encrypted_data = DocumentKeyShare {
 			author: data.author.as_ref().expect("author is filled in initialization phase; KG phase follows initialization phase; qed").clone(),
 			threshold: data.threshold.expect("threshold is filled in initialization phase; KG phase follows initialization phase; qed"),
-			id_numbers: data.nodes.iter().map(|(node_id, node_data)| (node_id.clone(), node_data.id_number.clone())).collect(),
-			secret_share: data.secret_share.as_ref().expect("secret_share is filled in KG phase; we are at the end of KG phase; qed").clone(),
+			public: joint_public.clone(),
 			common_point: None,
 			encrypted_point: None,
+			versions: vec![DocumentKeyShareVersion::new(
+				data.nodes.iter().map(|(node_id, node_data)| (node_id.clone(), node_data.id_number.clone())).collect(),
+				secret_share.clone(),
+			)],
 		};
 
 		// if we are at the slave node - wait for session completion
 		let secret_coeff = data.secret_coeff.as_ref().expect("secret coeff is selected on initialization phase; current phase follows initialization; qed").clone();
 		if data.master.as_ref() != Some(self.node()) {
 			data.key_share = Some(Ok(encrypted_data));
-			data.joint_public_and_secret = Some(Ok((joint_public, secret_coeff)));
+			data.joint_public_and_secret = Some(Ok((joint_public, secret_coeff, secret_share)));
 			data.state = SessionState::WaitingForGenerationConfirmation;
 			return Ok(());
 		}
@@ -691,6 +780,7 @@ impl SessionImpl {
 		// then distribute encrypted data to every other node
 		self.cluster.broadcast(Message::Generation(GenerationMessage::SessionCompleted(SessionCompleted {
 			session: self.id.clone().into(),
+			session_nonce: self.nonce,
 		})))?;
 
 		// then wait for confirmation from all other nodes
@@ -699,7 +789,7 @@ impl SessionImpl {
 			self_node.completion_confirmed = true;
 		}
 		data.key_share = Some(Ok(encrypted_data));
-		data.joint_public_and_secret = Some(Ok((joint_public, secret_coeff)));
+		data.joint_public_and_secret = Some(Ok((joint_public, secret_coeff, secret_share)));
 		data.state = SessionState::WaitingForGenerationConfirmation;
 
 		Ok(())
@@ -707,6 +797,16 @@ impl SessionImpl {
 }
 
 impl ClusterSession for SessionImpl {
+	type Id = SessionId;
+
+	fn type_name() -> &'static str {
+		"generation"
+	}
+
+	fn id(&self) -> SessionId {
+		self.id.clone()
+	}
+
 	fn is_finished(&self) -> bool {
 		let data = self.data.lock();
 		data.state == SessionState::Failed
@@ -736,29 +836,31 @@ impl ClusterSession for SessionImpl {
 		data.joint_public_and_secret = Some(Err(Error::NodeDisconnected));
 		self.completed.notify_all();
 	}
-}
-
-impl Session for SessionImpl {
-	fn state(&self) -> SessionState {
-		self.data.lock().state.clone()
-	}
 
-	fn wait(&self, timeout: Option<time::Duration>) -> Result<Public, Error> {
-		let mut data = self.data.lock();
-		if !data.joint_public_and_secret.is_some() {
-			match timeout {
-				None => self.completed.wait(&mut data),
-				Some(timeout) => { self.completed.wait_for(&mut data, timeout); },
-			}
+	fn on_session_error(&self, node: &NodeId, error: Error) {
+		// error in generation session is considered fatal
+		// => broadcast error if error occured on this node
+		if *node == self.self_node_id {
+			// do not bother processing send error, as we already processing error
+			let _ = self.cluster.broadcast(Message::Generation(GenerationMessage::SessionError(SessionError {
+				session: self.id.clone().into(),
+				session_nonce: self.nonce,
+				error: error.clone().into(),
+			})));
 		}
 
-		data.joint_public_and_secret.clone()
-			.expect("checked above or waited for completed; completed is only signaled when joint_public.is_some(); qed")
-			.map(|p| p.0)
+		let mut data = self.data.lock();
+		data.state = SessionState::Failed;
+		data.key_share = Some(Err(error.clone()));
+		data.joint_public_and_secret = Some(Err(error));
+		self.completed.notify_all();
 	}
 
-	fn joint_public_and_secret(&self) -> Option<Result<(Public, Secret), Error>> {
-		self.data.lock().joint_public_and_secret.clone()
+	fn on_message(&self, sender: &NodeId, message: &Message) -> Result<(), Error> {
+		match *message {
+			Message::Generation(ref message) => self.process_message(sender, message),
+			_ => unreachable!("cluster checks message to be correct before passing; qed"),
+		}
 	}
 }
 
@@ -791,8 +893,6 @@ impl NodeData {
 	fn with_id_number(node_id_number: Secret) -> Self {
 		NodeData {
 			id_number: node_id_number,
-			secret1_sent: None,
-			secret2_sent: None,
 			secret1: None,
 			secret2: None,
 			publics: None,
@@ -836,12 +936,13 @@ pub mod tests {
 	use std::sync::Arc;
 	use std::collections::{BTreeSet, BTreeMap, VecDeque};
 	use tokio_core::reactor::Core;
-	use ethkey::{Random, Generator, Public};
-	use key_server_cluster::{NodeId, SessionId, Error, DummyKeyStorage};
+	use ethereum_types::Address;
+	use ethkey::{Random, Generator, Public, KeyPair};
+	use key_server_cluster::{NodeId, SessionId, Error, KeyStorage, DummyKeyStorage};
 	use key_server_cluster::message::{self, Message, GenerationMessage};
 	use key_server_cluster::cluster::tests::{DummyCluster, make_clusters, run_clusters, loop_until, all_connections_established};
 	use key_server_cluster::cluster_sessions::ClusterSession;
-	use key_server_cluster::generation_session::{Session, SessionImpl, SessionState, SessionParams};
+	use key_server_cluster::generation_session::{SessionImpl, SessionState, SessionParams};
 	use key_server_cluster::math;
 	use key_server_cluster::math::tests::do_encryption_and_decryption;
 
@@ -857,13 +958,19 @@ pub mod tests {
 		pub queue: VecDeque<(NodeId, NodeId, Message)>,
 	}
 
+	pub fn generate_nodes_ids(n: usize) -> BTreeSet<NodeId> {
+		(0..n).map(|_| math::generate_random_point().unwrap()).collect()
+	}
+
 	impl MessageLoop {
 		pub fn new(nodes_num: usize) -> Self {
+			Self::with_nodes_ids(generate_nodes_ids(nodes_num))
+		}
+
+		pub fn with_nodes_ids(nodes_ids: BTreeSet<NodeId>) -> Self {
 			let mut nodes = BTreeMap::new();
 			let session_id = SessionId::default();
-			for _ in 0..nodes_num {
-				let key_pair = Random.generate().unwrap();
-				let node_id = key_pair.public().clone();
+			for node_id in nodes_ids {
 				let cluster = Arc::new(DummyCluster::new(node_id.clone()));
 				let key_storage = Arc::new(DummyKeyStorage::default());
 				let session = SessionImpl::new(SessionParams {
@@ -871,6 +978,7 @@ pub mod tests {
 					self_node_id: node_id.clone(),
 					key_storage: Some(key_storage.clone()),
 					cluster: cluster.clone(),
+					nonce: Some(0),
 				});
 				nodes.insert(node_id, Node { cluster: cluster, key_storage: key_storage, session: session });
 			}
@@ -933,11 +1041,31 @@ pub mod tests {
 			let msg = self.take_message().unwrap();
 			self.process_message(msg)
 		}
+
+		pub fn compute_key_pair(&self, t: usize) -> KeyPair {
+			let secret_shares = self.nodes.values()
+				.map(|nd| nd.key_storage.get(&SessionId::default()).unwrap().unwrap().last_version().unwrap().secret_share.clone())
+				.take(t + 1)
+				.collect::<Vec<_>>();
+			let secret_shares = secret_shares.iter().collect::<Vec<_>>();
+			let id_numbers = self.nodes.iter()
+				.map(|(n, nd)| nd.key_storage.get(&SessionId::default()).unwrap().unwrap().last_version().unwrap().id_numbers[n].clone())
+				.take(t + 1)
+				.collect::<Vec<_>>();
+			let id_numbers = id_numbers.iter().collect::<Vec<_>>();
+			let joint_secret1 = math::compute_joint_secret_from_shares(t, &secret_shares, &id_numbers).unwrap();
+
+			let secret_values: Vec<_> = self.nodes.values().map(|s| s.session.joint_public_and_secret().unwrap().unwrap().1).collect();
+			let joint_secret2 = math::compute_joint_secret(secret_values.iter()).unwrap();
+			assert_eq!(joint_secret1, joint_secret2);
+
+			KeyPair::from_secret(joint_secret1).unwrap()
+		}
 	}
 
 	fn make_simple_cluster(threshold: usize, num_nodes: usize) -> Result<(SessionId, NodeId, NodeId, MessageLoop), Error> {
 		let l = MessageLoop::new(num_nodes);
-		l.master().initialize(Public::default(), threshold, l.nodes.keys().cloned().collect())?;
+		l.master().initialize(Default::default(), false, threshold, l.nodes.keys().cloned().collect::<BTreeSet<_>>().into())?;
 
 		let session_id = l.session_id.clone();
 		let master_id = l.master().node().clone();
@@ -948,7 +1076,7 @@ pub mod tests {
 	#[test]
 	fn initializes_in_cluster_of_single_node() {
 		let l = MessageLoop::new(1);
-		assert!(l.master().initialize(Public::default(), 0, l.nodes.keys().cloned().collect()).is_ok());
+		assert!(l.master().initialize(Default::default(), false, 0, l.nodes.keys().cloned().collect::<BTreeSet<_>>().into()).is_ok());
 	}
 
 	#[test]
@@ -960,9 +1088,10 @@ pub mod tests {
 			self_node_id: node_id.clone(),
 			key_storage: Some(Arc::new(DummyKeyStorage::default())),
 			cluster: cluster,
+			nonce: Some(0),
 		});
 		let cluster_nodes: BTreeSet<_> = (0..2).map(|_| math::generate_random_point().unwrap()).collect();
-		assert_eq!(session.initialize(Public::default(), 0, cluster_nodes).unwrap_err(), Error::InvalidNodesConfiguration);
+		assert_eq!(session.initialize(Default::default(), false, 0, cluster_nodes.into()).unwrap_err(), Error::InvalidNodesConfiguration);
 	}
 
 	#[test]
@@ -976,7 +1105,8 @@ pub mod tests {
 	#[test]
 	fn fails_to_initialize_when_already_initialized() {
 		let (_, _, _, l) = make_simple_cluster(0, 2).unwrap();
-		assert_eq!(l.master().initialize(Public::default(), 0, l.nodes.keys().cloned().collect()).unwrap_err(), Error::InvalidStateForRequest);
+		assert_eq!(l.master().initialize(Default::default(), false, 0, l.nodes.keys().cloned().collect::<BTreeSet<_>>().into()).unwrap_err(),
+			Error::InvalidStateForRequest);
 	}
 
 	#[test]
@@ -1013,6 +1143,7 @@ pub mod tests {
 		l.take_and_process_message().unwrap();
 		assert_eq!(l.master().on_confirm_initialization(s, &message::ConfirmInitialization {
 			session: sid.into(),
+			session_nonce: 0,
 			derived_point: math::generate_random_point().unwrap().into(),
 		}).unwrap_err(), Error::InvalidStateForRequest);
 	}
@@ -1024,6 +1155,7 @@ pub mod tests {
 		l.take_and_process_message().unwrap();
 		assert_eq!(l.master().on_confirm_initialization(s, &message::ConfirmInitialization {
 			session: sid.into(),
+			session_nonce: 0,
 			derived_point: math::generate_random_point().unwrap().into(),
 		}).unwrap_err(), Error::InvalidStateForRequest);
 	}
@@ -1052,8 +1184,10 @@ pub mod tests {
 		nodes.insert(math::generate_random_point().unwrap(), math::generate_random_scalar().unwrap());
 		assert_eq!(l.first_slave().on_initialize_session(m, &message::InitializeSession {
 			session: sid.into(),
-			author: Public::default().into(),
+			session_nonce: 0,
+			author: Address::default().into(),
 			nodes: nodes.into_iter().map(|(k, v)| (k.into(), v.into())).collect(),
+			is_zero: false,
 			threshold: 0,
 			derived_point: math::generate_random_point().unwrap().into(),
 		}).unwrap_err(), Error::InvalidNodesConfiguration);
@@ -1067,8 +1201,10 @@ pub mod tests {
 		nodes.insert(s, math::generate_random_scalar().unwrap());
 		assert_eq!(l.first_slave().on_initialize_session(m, &message::InitializeSession {
 			session: sid.into(),
-			author: Public::default().into(),
+			session_nonce: 0,
+			author: Address::default().into(),
 			nodes: nodes.into_iter().map(|(k, v)| (k.into(), v.into())).collect(),
+			is_zero: false,
 			threshold: 2,
 			derived_point: math::generate_random_point().unwrap().into(),
 		}).unwrap_err(), Error::InvalidThreshold);
@@ -1079,6 +1215,7 @@ pub mod tests {
 		let (sid, m, _, l) = make_simple_cluster(0, 2).unwrap();
 		assert_eq!(l.first_slave().on_complete_initialization(m, &message::CompleteInitialization {
 			session: sid.into(),
+			session_nonce: 0,
 			derived_point: math::generate_random_point().unwrap().into(),
 		}).unwrap_err(), Error::InvalidStateForRequest);
 	}
@@ -1092,6 +1229,7 @@ pub mod tests {
 		l.take_and_process_message().unwrap();
 		assert_eq!(l.first_slave().on_complete_initialization(l.second_slave().node().clone(), &message::CompleteInitialization {
 			session: sid.into(),
+			session_nonce: 0,
 			derived_point: math::generate_random_point().unwrap().into(),
 		}).unwrap_err(), Error::InvalidMessage);
 	}
@@ -1101,6 +1239,7 @@ pub mod tests {
 		let (sid, _, s, l) = make_simple_cluster(0, 2).unwrap();
 		assert_eq!(l.master().on_keys_dissemination(s, &message::KeysDissemination {
 			session: sid.into(),
+			session_nonce: 0,
 			secret1: math::generate_random_scalar().unwrap().into(),
 			secret2: math::generate_random_scalar().unwrap().into(),
 			publics: vec![math::generate_random_point().unwrap().into()],
@@ -1119,6 +1258,7 @@ pub mod tests {
 		l.take_and_process_message().unwrap(); // m -> s1: KeysDissemination
 		assert_eq!(l.first_slave().on_keys_dissemination(m, &message::KeysDissemination {
 			session: sid.into(),
+			session_nonce: 0,
 			secret1: math::generate_random_scalar().unwrap().into(),
 			secret2: math::generate_random_scalar().unwrap().into(),
 			publics: vec![math::generate_random_point().unwrap().into(), math::generate_random_point().unwrap().into()],
@@ -1137,6 +1277,7 @@ pub mod tests {
 		l.take_and_process_message().unwrap(); // m -> s1: KeysDissemination
 		assert_eq!(l.first_slave().on_keys_dissemination(m, &message::KeysDissemination {
 			session: sid.into(),
+			session_nonce: 0,
 			secret1: math::generate_random_scalar().unwrap().into(),
 			secret2: math::generate_random_scalar().unwrap().into(),
 			publics: vec![math::generate_random_point().unwrap().into()],
@@ -1148,6 +1289,7 @@ pub mod tests {
 		let (sid, _, s, l) = make_simple_cluster(1, 3).unwrap();
 		assert_eq!(l.master().on_public_key_share(s, &message::PublicKeyShare {
 			session: sid.into(),
+			session_nonce: 0,
 			public_share: math::generate_random_point().unwrap().into(),
 		}).unwrap_err(), Error::InvalidStateForRequest);
 	}
@@ -1176,6 +1318,7 @@ pub mod tests {
 		l.process_message((f, t, Message::Generation(GenerationMessage::PublicKeyShare(msg.clone())))).unwrap();
 		assert_eq!(l.second_slave().on_public_key_share(m, &message::PublicKeyShare {
 			session: sid.into(),
+			session_nonce: 0,
 			public_share: math::generate_random_point().unwrap().into(),
 		}).unwrap_err(), Error::InvalidMessage);
 	}
@@ -1202,7 +1345,7 @@ pub mod tests {
 		let test_cases = [(0, 5), (2, 5), (3, 5)];
 		for &(threshold, num_nodes) in &test_cases {
 			let mut l = MessageLoop::new(num_nodes);
-			l.master().initialize(Public::default(), threshold, l.nodes.keys().cloned().collect()).unwrap();
+			l.master().initialize(Default::default(), false, threshold, l.nodes.keys().cloned().collect::<BTreeSet<_>>().into()).unwrap();
 			assert_eq!(l.nodes.len(), num_nodes);
 
 			// let nodes do initialization + keys dissemination
@@ -1234,14 +1377,12 @@ pub mod tests {
 
 	#[test]
 	fn encryption_session_works_over_network() {
-		//::util::log::init_log();
-
 		let test_cases = [(1, 3)];
 		for &(threshold, num_nodes) in &test_cases {
 			let mut core = Core::new().unwrap();
 
 			// prepare cluster objects for each node
-			let clusters = make_clusters(&core, 6022, num_nodes);
+			let clusters = make_clusters(&core, 6031, num_nodes);
 			run_clusters(&clusters);
 
 			// establish connections
@@ -1253,4 +1394,16 @@ pub mod tests {
 			loop_until(&mut core, time::Duration::from_millis(1000), || session.joint_public_and_secret().is_some());
 		}
 	}
+
+	#[test]
+	fn generation_message_fails_when_nonce_is_wrong() {
+		let (sid, m, _, l) = make_simple_cluster(0, 2).unwrap();
+		assert_eq!(l.first_slave().process_message(&m, &message::GenerationMessage::KeysDissemination(message::KeysDissemination {
+			session: sid.into(),
+			session_nonce: 10,
+			secret1: math::generate_random_scalar().unwrap().into(),
+			secret2: math::generate_random_scalar().unwrap().into(),
+			publics: vec![math::generate_random_point().unwrap().into()],
+		})).unwrap_err(), Error::ReplayProtection);
+	}
 }
diff --git a/ethcore/src/migrations/blocks/mod.rs b/secret_store/src/key_server_cluster/client_sessions/mod.rs
similarity index 82%
rename from ethcore/src/migrations/blocks/mod.rs
rename to secret_store/src/key_server_cluster/client_sessions/mod.rs
index 1dba8c876dac813517d0a9207ffbf98a9eab8371..ba2fbd5350084773a6db13832805c4a3eda74d54 100644
--- a/ethcore/src/migrations/blocks/mod.rs
+++ b/secret_store/src/key_server_cluster/client_sessions/mod.rs
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Blocks database migrations.
-
-mod v8;
-
-pub use self::v8::V8;
+pub mod decryption_session;
+pub mod encryption_session;
+pub mod generation_session;
+pub mod signing_session_ecdsa;
+pub mod signing_session_schnorr;
diff --git a/secret_store/src/key_server_cluster/client_sessions/signing_session_ecdsa.rs b/secret_store/src/key_server_cluster/client_sessions/signing_session_ecdsa.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ddd4944129f81349a8baf9db574f9d603b5518b9
--- /dev/null
+++ b/secret_store/src/key_server_cluster/client_sessions/signing_session_ecdsa.rs
@@ -0,0 +1,1302 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::{BTreeSet, BTreeMap};
+use std::collections::btree_map::Entry;
+use std::sync::Arc;
+use parking_lot::{Mutex, Condvar};
+use ethkey::{Public, Secret, Signature, sign};
+use ethereum_types::H256;
+use key_server_cluster::{Error, NodeId, SessionId, SessionMeta, AclStorage, DocumentKeyShare, Requester};
+use key_server_cluster::cluster::{Cluster};
+use key_server_cluster::cluster_sessions::{SessionIdWithSubSession, ClusterSession};
+use key_server_cluster::generation_session::{SessionImpl as GenerationSession, SessionParams as GenerationSessionParams,
+	SessionState as GenerationSessionState};
+use key_server_cluster::math;
+use key_server_cluster::message::{Message, EcdsaSigningMessage, EcdsaSigningConsensusMessage, EcdsaSignatureNonceGenerationMessage,
+	EcdsaInversionNonceGenerationMessage, EcdsaInversionZeroGenerationMessage, EcdsaSigningInversedNonceCoeffShare,
+	EcdsaRequestPartialSignature, EcdsaPartialSignature, EcdsaSigningSessionCompleted, GenerationMessage,
+	ConsensusMessage, EcdsaSigningSessionError, InitializeConsensusSession, ConfirmConsensusInitialization,
+	EcdsaSigningSessionDelegation, EcdsaSigningSessionDelegationCompleted};
+use key_server_cluster::jobs::job_session::JobTransport;
+use key_server_cluster::jobs::key_access_job::KeyAccessJob;
+use key_server_cluster::jobs::signing_job_ecdsa::{EcdsaPartialSigningRequest, EcdsaPartialSigningResponse, EcdsaSigningJob};
+use key_server_cluster::jobs::consensus_session::{ConsensusSessionParams, ConsensusSessionState, ConsensusSession};
+
+/// Distributed ECDSA-signing session.
+/// Based on "A robust threshold elliptic curve digital signature providing a new verifiable secret sharing scheme" paper.
+/// WARNING: can only be used if 2*t < N is true for key generation scheme
+pub struct SessionImpl {
+	/// Session core.
+	core: SessionCore,
+	/// Session data.
+	data: Mutex<SessionData>,
+}
+
+/// Immutable session data.
+struct SessionCore {
+	/// Session metadata.
+	pub meta: SessionMeta,
+	/// Signing session access key.
+	pub access_key: Secret,
+	/// Key share.
+	pub key_share: Option<DocumentKeyShare>,
+	/// Cluster which allows this node to send messages to other nodes in the cluster.
+	pub cluster: Arc<Cluster>,
+	/// Session-level nonce.
+	pub nonce: u64,
+	/// SessionImpl completion condvar.
+	pub completed: Condvar,
+}
+
+/// Signing consensus session type.
+type SigningConsensusSession = ConsensusSession<KeyAccessJob, SigningConsensusTransport, EcdsaSigningJob, SigningJobTransport>;
+
+/// Mutable session data.
+struct SessionData {
+	/// Session state.
+	pub state: SessionState,
+	/// Message hash.
+	pub message_hash: Option<H256>,
+	/// Key version to use for decryption.
+	pub version: Option<H256>,
+	/// Consensus-based signing session.
+	pub consensus_session: SigningConsensusSession,
+	/// Signature nonce generation session.
+	pub sig_nonce_generation_session: Option<GenerationSession>,
+	/// Inversion nonce generation session.
+	pub inv_nonce_generation_session: Option<GenerationSession>,
+	/// Inversion zero generation session.
+	pub inv_zero_generation_session: Option<GenerationSession>,
+	/// Inversed nonce coefficient shares.
+	pub inversed_nonce_coeff_shares: Option<BTreeMap<NodeId, Secret>>,
+	/// Delegation status.
+	pub delegation_status: Option<DelegationStatus>,
+	/// Decryption result.
+	pub result: Option<Result<Signature, Error>>,
+}
+
+/// Signing session state.
+#[derive(Debug, PartialEq)]
+pub enum SessionState {
+	/// Consensus is establishing.
+	ConsensusEstablishing,
+	/// Nonces (signature, inversion && zero) are generating.
+	NoncesGenerating,
+	/// Waiting for inversed nonce shares.
+	WaitingForInversedNonceShares,
+	/// State when signature is computing.
+	SignatureComputing,
+}
+
+/// Session creation parameters
+pub struct SessionParams {
+	/// Session metadata.
+	pub meta: SessionMeta,
+	/// Session access key.
+	pub access_key: Secret,
+	/// Key share.
+	pub key_share: Option<DocumentKeyShare>,
+	/// ACL storage.
+	pub acl_storage: Arc<AclStorage>,
+	/// Cluster
+	pub cluster: Arc<Cluster>,
+	/// Session nonce.
+	pub nonce: u64,
+}
+
+/// Signing consensus transport.
+struct SigningConsensusTransport {
+	/// Session id.
+	id: SessionId,
+	/// Session access key.
+	access_key: Secret,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Selected key version (on master node).
+	version: Option<H256>,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+}
+
+/// Signing key generation transport.
+struct NonceGenerationTransport<F: Fn(SessionId, Secret, u64, GenerationMessage) -> EcdsaSigningMessage + Send + Sync> {
+	/// Session id.
+	id: SessionId,
+	/// Session access key.
+	access_key: Secret,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+	/// Other nodes ids.
+	other_nodes_ids: BTreeSet<NodeId>,
+	/// Message mapping function.
+	map: F,
+}
+
+/// Signing job transport
+struct SigningJobTransport {
+	/// Session id.
+	id: SessionId,
+	/// Session access key.
+	access_key: Secret,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+}
+
+/// Session delegation status.
+enum DelegationStatus {
+	/// Delegated to other node.
+	DelegatedTo(NodeId),
+	/// Delegated from other node.
+	DelegatedFrom(NodeId, u64),
+}
+
+impl SessionImpl {
+	/// Create new signing session.
+	pub fn new(params: SessionParams, requester: Option<Requester>) -> Result<Self, Error> {
+		debug_assert_eq!(params.meta.threshold, params.key_share.as_ref().map(|ks| ks.threshold).unwrap_or_default());
+
+		let consensus_transport = SigningConsensusTransport {
+			id: params.meta.id.clone(),
+			access_key: params.access_key.clone(),
+			nonce: params.nonce,
+			version: None,
+			cluster: params.cluster.clone(),
+		};
+		let consensus_session = ConsensusSession::new(ConsensusSessionParams {
+			// this session requires responses from 2 * t nodes
+			meta: SessionMeta {
+				id: params.meta.id,
+				master_node_id: params.meta.master_node_id,
+				self_node_id: params.meta.self_node_id,
+				threshold: params.meta.threshold * 2,
+			},
+			consensus_executor: match requester {
+				Some(requester) => KeyAccessJob::new_on_master(params.meta.id.clone(), params.acl_storage.clone(), requester),
+				None => KeyAccessJob::new_on_slave(params.meta.id.clone(), params.acl_storage.clone()),
+			},
+			consensus_transport: consensus_transport,
+		})?;
+
+		Ok(SessionImpl {
+			core: SessionCore {
+				meta: params.meta,
+				access_key: params.access_key,
+				key_share: params.key_share,
+				cluster: params.cluster,
+				nonce: params.nonce,
+				completed: Condvar::new(),
+			},
+			data: Mutex::new(SessionData {
+				state: SessionState::ConsensusEstablishing,
+				message_hash: None,
+				version: None,
+				consensus_session: consensus_session,
+				sig_nonce_generation_session: None,
+				inv_nonce_generation_session: None,
+				inv_zero_generation_session: None,
+				inversed_nonce_coeff_shares: None,
+				delegation_status: None,
+				result: None,
+			}),
+		})
+	}
+
+	/// Wait for session completion.
+	pub fn wait(&self) -> Result<Signature, Error> {
+		Self::wait_session(&self.core.completed, &self.data, None, |data| data.result.clone())
+	}
+
+	/// Delegate session to other node.
+	pub fn delegate(&self, master: NodeId, version: H256, message_hash: H256) -> Result<(), Error> {
+		if self.core.meta.master_node_id != self.core.meta.self_node_id {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		let mut data = self.data.lock();
+		if data.consensus_session.state() != ConsensusSessionState::WaitingForInitialization || data.delegation_status.is_some() {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		data.consensus_session.consensus_job_mut().executor_mut().set_has_key_share(false);
+		self.core.cluster.send(&master, Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionDelegation(EcdsaSigningSessionDelegation {
+			session: self.core.meta.id.clone().into(),
+			sub_session: self.core.access_key.clone().into(),
+			session_nonce: self.core.nonce,
+			requester: data.consensus_session.consensus_job().executor().requester()
+				.expect("requester is passed to master node on creation; session can be delegated from master node only; qed")
+				.clone().into(),
+			version: version.into(),
+			message_hash: message_hash.into(),
+		})))?;
+		data.delegation_status = Some(DelegationStatus::DelegatedTo(master));
+		Ok(())
+
+	}
+
+	/// Initialize signing session on master node.
+	pub fn initialize(&self, version: H256, message_hash: H256) -> Result<(), Error> {
+		debug_assert_eq!(self.core.meta.self_node_id, self.core.meta.master_node_id);
+
+		// check if version exists
+		let key_version = match self.core.key_share.as_ref() {
+			None => return Err(Error::InvalidMessage),
+			Some(key_share) => key_share.version(&version).map_err(|e| Error::KeyStorage(e.into()))?,
+		};
+
+		// select nodes to participate in consensus etablish session
+		let mut data = self.data.lock();
+		let non_isolated_nodes = self.core.cluster.nodes();
+		let mut consensus_nodes: BTreeSet<_> = key_version.id_numbers.keys()
+			.filter(|n| non_isolated_nodes.contains(*n))
+			.cloned()
+			.chain(::std::iter::once(self.core.meta.self_node_id.clone()))
+			.collect();
+		if let Some(&DelegationStatus::DelegatedFrom(delegation_master, _)) = data.delegation_status.as_ref() {
+			consensus_nodes.remove(&delegation_master);
+		}
+
+		// start consensus establish sesssion
+		data.consensus_session.consensus_job_mut().transport_mut().version = Some(version.clone());
+		data.version = Some(version.clone());
+		data.message_hash = Some(message_hash);
+		data.consensus_session.initialize(consensus_nodes)?;
+
+		// consensus established => threshold is 0 => we can generate signature on this node
+		if data.consensus_session.state() == ConsensusSessionState::ConsensusEstablished {
+			data.result = Some(sign(&key_version.secret_share, &message_hash).map_err(Into::into));
+			self.core.completed.notify_all();
+		}
+
+		Ok(())
+	}
+
+	/// Process signing message.
+	pub fn process_message(&self, sender: &NodeId, message: &EcdsaSigningMessage) -> Result<(), Error> {
+		if self.core.nonce != message.session_nonce() {
+			return Err(Error::ReplayProtection);
+		}
+
+		match message {
+			&EcdsaSigningMessage::EcdsaSigningConsensusMessage(ref message) =>
+				self.on_consensus_message(sender, message),
+			&EcdsaSigningMessage::EcdsaSignatureNonceGenerationMessage(ref message) =>
+				self.on_signature_nonce_generation_message(sender, message),
+			&EcdsaSigningMessage::EcdsaInversionNonceGenerationMessage(ref message) =>
+				self.on_inversion_nonce_generation_message(sender, message),
+			&EcdsaSigningMessage::EcdsaInversionZeroGenerationMessage(ref message) =>
+				self.on_inversion_zero_generation_message(sender, message),
+			&EcdsaSigningMessage::EcdsaSigningInversedNonceCoeffShare(ref message) =>
+				self.on_inversed_nonce_coeff_share(sender, message),
+			&EcdsaSigningMessage::EcdsaRequestPartialSignature(ref message) =>
+				self.on_partial_signature_requested(sender, message),
+			&EcdsaSigningMessage::EcdsaPartialSignature(ref message) =>
+				self.on_partial_signature(sender, message),
+			&EcdsaSigningMessage::EcdsaSigningSessionError(ref message) =>
+				self.process_node_error(Some(&sender), Error::Io(message.error.clone())),
+			&EcdsaSigningMessage::EcdsaSigningSessionCompleted(ref message) =>
+				self.on_session_completed(sender, message),
+			&EcdsaSigningMessage::EcdsaSigningSessionDelegation(ref message) =>
+				self.on_session_delegated(sender, message),
+			&EcdsaSigningMessage::EcdsaSigningSessionDelegationCompleted(ref message) =>
+				self.on_session_delegation_completed(sender, message),
+		}
+	}
+
+	/// When session is delegated to this node.
+	pub fn on_session_delegated(&self, sender: &NodeId, message: &EcdsaSigningSessionDelegation) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+
+		{
+			let mut data = self.data.lock();
+			if data.consensus_session.state() != ConsensusSessionState::WaitingForInitialization || data.delegation_status.is_some() {
+				return Err(Error::InvalidStateForRequest);
+			}
+
+			data.consensus_session.consensus_job_mut().executor_mut().set_requester(message.requester.clone().into());
+			data.delegation_status = Some(DelegationStatus::DelegatedFrom(sender.clone(), message.session_nonce));
+		}
+
+		self.initialize(message.version.clone().into(), message.message_hash.clone().into())
+	}
+
+	/// When delegated session is completed on other node.
+	pub fn on_session_delegation_completed(&self, sender: &NodeId, message: &EcdsaSigningSessionDelegationCompleted) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+
+		if self.core.meta.master_node_id != self.core.meta.self_node_id {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		let mut data = self.data.lock();
+		match data.delegation_status.as_ref() {
+			Some(&DelegationStatus::DelegatedTo(ref node)) if node == sender => (),
+			_ => return Err(Error::InvalidMessage),
+		}
+
+		Self::set_signing_result(&self.core, &mut *data, Ok(message.signature.clone().into()));
+
+		Ok(())
+	}
+
+	/// When consensus-related message is received.
+	pub fn on_consensus_message(&self, sender: &NodeId, message: &EcdsaSigningConsensusMessage) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let mut data = self.data.lock();
+		let is_establishing_consensus = data.consensus_session.state() == ConsensusSessionState::EstablishingConsensus;
+
+		if let &ConsensusMessage::InitializeConsensusSession(ref msg) = &message.message {
+			let version = msg.version.clone().into();
+			let has_key_share = self.core.key_share.as_ref()
+				.map(|ks| ks.version(&version).is_ok())
+				.unwrap_or(false);
+			data.consensus_session.consensus_job_mut().executor_mut().set_has_key_share(has_key_share);
+			data.version = Some(version);
+		}
+		data.consensus_session.on_consensus_message(&sender, &message.message)?;
+
+		let is_consensus_established = data.consensus_session.state() == ConsensusSessionState::ConsensusEstablished;
+		if self.core.meta.self_node_id != self.core.meta.master_node_id || !is_establishing_consensus || !is_consensus_established {
+			return Ok(());
+		}
+
+		let key_share = self.core.key_share.as_ref()
+			.expect("this is master node; master node is selected so that it has key version; qed");
+		let key_version = key_share.version(data.version.as_ref()
+			.expect("this is master node; master node is selected so that it has key version; qed")
+		).map_err(|e| Error::KeyStorage(e.into()))?;
+
+		let consensus_group = data.consensus_session.select_consensus_group()?.clone();
+		let mut other_consensus_group_nodes = consensus_group.clone();
+		other_consensus_group_nodes.remove(&self.core.meta.self_node_id);
+		let consensus_group_map: BTreeMap<_, _> = consensus_group.iter().map(|n| (n.clone(), key_version.id_numbers[n].clone())).collect();
+
+		// start generation of signature nonce
+		let sig_nonce_generation_session = Self::start_generation_session(&self.core, &other_consensus_group_nodes,
+			|s, k, n, m| EcdsaSigningMessage::EcdsaSignatureNonceGenerationMessage(
+				EcdsaSignatureNonceGenerationMessage {
+					session: s.into(),
+					sub_session: k.into(),
+					session_nonce: n,
+					message: m,
+				}));
+		sig_nonce_generation_session.initialize(Default::default(), false, key_share.threshold, consensus_group_map.clone().into())?;
+		data.sig_nonce_generation_session = Some(sig_nonce_generation_session);
+
+		// start generation of inversed nonce computation session
+		let inv_nonce_generation_session = Self::start_generation_session(&self.core, &other_consensus_group_nodes,
+			move |s, k, n, m| EcdsaSigningMessage::EcdsaInversionNonceGenerationMessage(
+				EcdsaInversionNonceGenerationMessage {
+					session: s.into(),
+					sub_session: k.into(),
+					session_nonce: n,
+					message: m,
+				}));
+		inv_nonce_generation_session.initialize(Default::default(), false, key_share.threshold, consensus_group_map.clone().into())?;
+		data.inv_nonce_generation_session = Some(inv_nonce_generation_session);
+
+		// start generation of zero-secret shares for inversed nonce computation session
+		let inv_zero_generation_session = Self::start_generation_session(&self.core, &other_consensus_group_nodes,
+			move |s, k, n, m| EcdsaSigningMessage::EcdsaInversionZeroGenerationMessage(
+				EcdsaInversionZeroGenerationMessage {
+					session: s.into(),
+					sub_session: k.into(),
+					session_nonce: n,
+					message: m,
+				}));
+		inv_zero_generation_session.initialize(Default::default(), true, key_share.threshold * 2, consensus_group_map.clone().into())?;
+		data.inv_zero_generation_session = Some(inv_zero_generation_session);
+
+		data.state = SessionState::NoncesGenerating;
+
+		Ok(())
+	}
+
+	/// When signature nonce generation message is received.
+	pub fn on_signature_nonce_generation_message(&self, sender: &NodeId, message: &EcdsaSignatureNonceGenerationMessage) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let mut data = self.data.lock();
+
+		if let &GenerationMessage::InitializeSession(ref message) = &message.message {
+			if &self.core.meta.master_node_id != sender {
+				match data.delegation_status.as_ref() {
+					Some(&DelegationStatus::DelegatedTo(s)) if s == *sender => (),
+					_ => return Err(Error::InvalidMessage),
+				}
+			}
+
+			let consensus_group: BTreeSet<NodeId> = message.nodes.keys().cloned().map(Into::into).collect();
+			let mut other_consensus_group_nodes = consensus_group.clone();
+			other_consensus_group_nodes.remove(&self.core.meta.self_node_id);
+
+			data.sig_nonce_generation_session = Some(Self::start_generation_session(&self.core, &other_consensus_group_nodes,
+				|s, k, n, m| EcdsaSigningMessage::EcdsaSignatureNonceGenerationMessage(
+					EcdsaSignatureNonceGenerationMessage {
+						session: s.into(),
+						sub_session: k.into(),
+						session_nonce: n,
+						message: m,
+					})));
+
+			data.state = SessionState::NoncesGenerating;
+		}
+
+		{
+			let generation_session = data.sig_nonce_generation_session.as_ref().ok_or(Error::InvalidStateForRequest)?;
+			let is_key_generating = generation_session.state() != GenerationSessionState::Finished;
+			generation_session.process_message(sender, &message.message)?;
+
+			let is_key_generated = generation_session.state() == GenerationSessionState::Finished;
+			if !is_key_generating || !is_key_generated {
+				return Ok(());
+			}
+		}
+
+		if !Self::check_nonces_generated(&*data) {
+			return Ok(());
+		}
+
+		Self::send_inversed_nonce_coeff_share(&self.core, &mut*data)?;
+		data.state = if self.core.meta.master_node_id != self.core.meta.self_node_id {
+			SessionState::SignatureComputing
+		} else {
+			SessionState::WaitingForInversedNonceShares
+		};
+
+		Ok(())
+	}
+
+	/// When inversion nonce generation message is received.
+	pub fn on_inversion_nonce_generation_message(&self, sender: &NodeId, message: &EcdsaInversionNonceGenerationMessage) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let mut data = self.data.lock();
+
+		if let &GenerationMessage::InitializeSession(ref message) = &message.message {
+			if &self.core.meta.master_node_id != sender {
+				match data.delegation_status.as_ref() {
+					Some(&DelegationStatus::DelegatedTo(s)) if s == *sender => (),
+					_ => return Err(Error::InvalidMessage),
+				}
+			}
+
+			let consensus_group: BTreeSet<NodeId> = message.nodes.keys().cloned().map(Into::into).collect();
+			let mut other_consensus_group_nodes = consensus_group.clone();
+			other_consensus_group_nodes.remove(&self.core.meta.self_node_id);
+
+			data.inv_nonce_generation_session = Some(Self::start_generation_session(&self.core, &other_consensus_group_nodes,
+				|s, k, n, m| EcdsaSigningMessage::EcdsaInversionNonceGenerationMessage(
+					EcdsaInversionNonceGenerationMessage {
+						session: s.into(),
+						sub_session: k.into(),
+						session_nonce: n,
+						message: m,
+					})));
+
+			data.state = SessionState::NoncesGenerating;
+		}
+
+		{
+			let generation_session = data.inv_nonce_generation_session.as_ref().ok_or(Error::InvalidStateForRequest)?;
+			let is_key_generating = generation_session.state() != GenerationSessionState::Finished;
+			generation_session.process_message(sender, &message.message)?;
+
+			let is_key_generated = generation_session.state() == GenerationSessionState::Finished;
+			if !is_key_generating || !is_key_generated {
+				return Ok(());
+			}
+		}
+
+		if !Self::check_nonces_generated(&*data) {
+			return Ok(());
+		}
+
+		Self::send_inversed_nonce_coeff_share(&self.core, &mut*data)?;
+		data.state = if self.core.meta.master_node_id != self.core.meta.self_node_id {
+			SessionState::SignatureComputing
+		} else {
+			SessionState::WaitingForInversedNonceShares
+		};
+
+		Ok(())
+	}
+
+	/// When inversion zero generation message is received.
+	pub fn on_inversion_zero_generation_message(&self, sender: &NodeId, message: &EcdsaInversionZeroGenerationMessage) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let mut data = self.data.lock();
+
+		if let &GenerationMessage::InitializeSession(ref message) = &message.message {
+			if &self.core.meta.master_node_id != sender {
+				match data.delegation_status.as_ref() {
+					Some(&DelegationStatus::DelegatedTo(s)) if s == *sender => (),
+					_ => return Err(Error::InvalidMessage),
+				}
+			}
+
+			let consensus_group: BTreeSet<NodeId> = message.nodes.keys().cloned().map(Into::into).collect();
+			let mut other_consensus_group_nodes = consensus_group.clone();
+			other_consensus_group_nodes.remove(&self.core.meta.self_node_id);
+
+			data.inv_zero_generation_session = Some(Self::start_generation_session(&self.core, &other_consensus_group_nodes,
+				|s, k, n, m| EcdsaSigningMessage::EcdsaInversionZeroGenerationMessage(
+					EcdsaInversionZeroGenerationMessage {
+						session: s.into(),
+						sub_session: k.into(),
+						session_nonce: n,
+						message: m,
+					})));
+
+			data.state = SessionState::NoncesGenerating;
+		}
+
+		{
+			let generation_session = data.inv_zero_generation_session.as_ref().ok_or(Error::InvalidStateForRequest)?;
+			let is_key_generating = generation_session.state() != GenerationSessionState::Finished;
+			generation_session.process_message(sender, &message.message)?;
+
+			let is_key_generated = generation_session.state() == GenerationSessionState::Finished;
+			if !is_key_generating || !is_key_generated {
+				return Ok(());
+			}
+		}
+
+		if !Self::check_nonces_generated(&*data) {
+			return Ok(());
+		}
+
+		Self::send_inversed_nonce_coeff_share(&self.core, &mut*data)?;
+		data.state = if self.core.meta.master_node_id != self.core.meta.self_node_id {
+			SessionState::SignatureComputing
+		} else {
+			SessionState::WaitingForInversedNonceShares
+		};
+
+		Ok(())
+	}
+
+	/// When inversed nonce share is received.
+	pub fn on_inversed_nonce_coeff_share(&self, sender: &NodeId, message: &EcdsaSigningInversedNonceCoeffShare) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let mut data = self.data.lock();
+
+		if self.core.meta.self_node_id != self.core.meta.master_node_id {
+			return Err(Error::InvalidMessage);
+		}
+		match data.state {
+			SessionState::WaitingForInversedNonceShares => (),
+			SessionState::NoncesGenerating => return Err(Error::TooEarlyForRequest),
+			_ => return Err(Error::InvalidStateForRequest),
+		}
+
+		let inversed_nonce_coeff = {
+			let consensus_group = data.consensus_session.select_consensus_group()?.clone();
+			{
+				let inversed_nonce_coeff_shares = data.inversed_nonce_coeff_shares.as_mut()
+					.expect("we are in WaitingForInversedNonceShares state; inversed_nonce_coeff_shares are filled before this state; qed");
+				match inversed_nonce_coeff_shares.entry(sender.clone()) {
+					Entry::Occupied(_) => return Err(Error::InvalidStateForRequest),
+					Entry::Vacant(entry) => {
+						entry.insert(message.inversed_nonce_coeff_share.clone().into());
+					},
+				}
+
+				if consensus_group.iter().any(|n| !inversed_nonce_coeff_shares.contains_key(n)) {
+					return Ok(());
+				}
+			}
+
+			Self::compute_inversed_nonce_coeff(&self.core, &*data)?
+		};
+
+
+		let version = data.version.as_ref().ok_or(Error::InvalidMessage)?.clone();
+		let message_hash = data.message_hash
+			.expect("we are on master node; on master node message_hash is filled in initialize(); on_generation_message follows initialize; qed");
+
+		let nonce_exists_proof = "nonce is generated before signature is computed; we are in SignatureComputing state; qed";
+		let sig_nonce_public = data.sig_nonce_generation_session.as_ref().expect(nonce_exists_proof).joint_public_and_secret().expect(nonce_exists_proof)?.0;
+		let inv_nonce_share = data.inv_nonce_generation_session.as_ref().expect(nonce_exists_proof).joint_public_and_secret().expect(nonce_exists_proof)?.2;
+
+		self.core.disseminate_jobs(&mut data.consensus_session, &version, sig_nonce_public, inv_nonce_share, inversed_nonce_coeff, message_hash)
+	}
+
+	/// When partial signature is requested.
+	pub fn on_partial_signature_requested(&self, sender: &NodeId, message: &EcdsaRequestPartialSignature) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let key_share = match self.core.key_share.as_ref() {
+			None => return Err(Error::InvalidMessage),
+			Some(key_share) => key_share,
+		};
+
+		let mut data = self.data.lock();
+
+		if sender != &self.core.meta.master_node_id {
+			return Err(Error::InvalidMessage);
+		}
+		if data.state != SessionState::SignatureComputing {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		let nonce_exists_proof = "nonce is generated before signature is computed; we are in SignatureComputing state; qed";
+		let sig_nonce_public = data.sig_nonce_generation_session.as_ref().expect(nonce_exists_proof).joint_public_and_secret().expect(nonce_exists_proof)?.0;
+		let inv_nonce_share = data.inv_nonce_generation_session.as_ref().expect(nonce_exists_proof).joint_public_and_secret().expect(nonce_exists_proof)?.2;
+
+		let version = data.version.as_ref().ok_or(Error::InvalidMessage)?.clone();
+		let key_version = key_share.version(&version).map_err(|e| Error::KeyStorage(e.into()))?.hash.clone();
+
+		let signing_job = EcdsaSigningJob::new_on_slave(key_share.clone(), key_version, sig_nonce_public, inv_nonce_share)?;
+		let signing_transport = self.core.signing_transport();
+
+		data.consensus_session.on_job_request(sender, EcdsaPartialSigningRequest {
+			id: message.request_id.clone().into(),
+			inversed_nonce_coeff: message.inversed_nonce_coeff.clone().into(),
+			message_hash: message.message_hash.clone().into(),
+		}, signing_job, signing_transport)
+	}
+
+	/// When partial signature is received.
+	pub fn on_partial_signature(&self, sender: &NodeId, message: &EcdsaPartialSignature) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let mut data = self.data.lock();
+		data.consensus_session.on_job_response(sender, EcdsaPartialSigningResponse {
+			request_id: message.request_id.clone().into(),
+			partial_signature_s: message.partial_signature_s.clone().into(),
+		})?;
+
+		if data.consensus_session.state() != ConsensusSessionState::Finished {
+			return Ok(());
+		}
+
+		// send compeltion signal to all nodes, except for rejected nodes
+		for node in data.consensus_session.consensus_non_rejected_nodes() {
+			self.core.cluster.send(&node, Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionCompleted(EcdsaSigningSessionCompleted {
+				session: self.core.meta.id.clone().into(),
+				sub_session: self.core.access_key.clone().into(),
+				session_nonce: self.core.nonce,
+			})))?;
+		}
+
+		let result = data.consensus_session.result()?;
+		Self::set_signing_result(&self.core, &mut *data, Ok(result));
+
+		Ok(())
+	}
+
+	/// When session is completed.
+	pub fn on_session_completed(&self, sender: &NodeId, message: &EcdsaSigningSessionCompleted) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		self.data.lock().consensus_session.on_session_completed(sender)
+	}
+
+	/// Process error from the other node.
+	fn process_node_error(&self, node: Option<&NodeId>, error: Error) -> Result<(), Error> {
+		let mut data = self.data.lock();
+		let is_self_node_error = node.map(|n| n == &self.core.meta.self_node_id).unwrap_or(false);
+		// error is always fatal if coming from this node
+		if is_self_node_error {
+			Self::set_signing_result(&self.core, &mut *data, Err(error.clone()));
+			return Err(error);
+		}
+
+		match {
+			match node {
+				Some(node) => data.consensus_session.on_node_error(node),
+				None => data.consensus_session.on_session_timeout(),
+			}
+		} {
+			Ok(false) => {
+				Ok(())
+			},
+			Ok(true) => {
+				let version = data.version.as_ref().ok_or(Error::InvalidMessage)?.clone();
+
+				let message_hash = data.message_hash.as_ref().cloned()
+					.expect("on_node_error returned true; this means that jobs must be REsent; this means that jobs already have been sent; jobs are sent when message_hash.is_some(); qed");
+
+				let nonce_exists_proof = "on_node_error returned true; this means that jobs must be REsent; this means that jobs already have been sent; jobs are sent when nonces generation has completed; qed";
+				let sig_nonce_public = data.sig_nonce_generation_session.as_ref().expect(nonce_exists_proof).joint_public_and_secret().expect(nonce_exists_proof)?.0;
+				let inv_nonce_share = data.inv_nonce_generation_session.as_ref().expect(nonce_exists_proof).joint_public_and_secret().expect(nonce_exists_proof)?.2;
+
+				let inversed_nonce_coeff = Self::compute_inversed_nonce_coeff(&self.core, &*data)?;
+
+				let disseminate_result = self.core.disseminate_jobs(&mut data.consensus_session, &version, sig_nonce_public, inv_nonce_share, inversed_nonce_coeff, message_hash);
+				match disseminate_result {
+					Ok(()) => Ok(()),
+					Err(err) => {
+						warn!("{}: ECDSA signing session failed with error: {:?} from {:?}", &self.core.meta.self_node_id, error, node);
+						Self::set_signing_result(&self.core, &mut *data, Err(err.clone()));
+						Err(err)
+					}
+				}
+			},
+			Err(err) => {
+				warn!("{}: ECDSA signing session failed with error: {:?} from {:?}", &self.core.meta.self_node_id, error, node);
+				Self::set_signing_result(&self.core, &mut *data, Err(err.clone()));
+				Err(err)
+			},
+		}
+	}
+
+	/// Start generation session.
+	fn start_generation_session<F>(core: &SessionCore, other_consensus_group_nodes: &BTreeSet<NodeId>, map_message: F) -> GenerationSession
+		where F: Fn(SessionId, Secret, u64, GenerationMessage) -> EcdsaSigningMessage + Send + Sync + 'static {
+		GenerationSession::new(GenerationSessionParams {
+			id: core.meta.id.clone(),
+			self_node_id: core.meta.self_node_id.clone(),
+			key_storage: None,
+			cluster: Arc::new(NonceGenerationTransport {
+				id: core.meta.id.clone(),
+				access_key: core.access_key.clone(),
+				nonce: core.nonce,
+				cluster: core.cluster.clone(),
+				other_nodes_ids: other_consensus_group_nodes.clone(),
+				map: map_message,
+			}),
+			nonce: None,
+		})
+	}
+
+	/// Set signing session result.
+	fn set_signing_result(core: &SessionCore, data: &mut SessionData, result: Result<Signature, Error>) {
+		if let Some(DelegationStatus::DelegatedFrom(master, nonce)) = data.delegation_status.take() {
+			// error means can't communicate => ignore it
+			let _ = match result.as_ref() {
+				Ok(signature) => core.cluster.send(&master, Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionDelegationCompleted(EcdsaSigningSessionDelegationCompleted {
+					session: core.meta.id.clone().into(),
+					sub_session: core.access_key.clone().into(),
+					session_nonce: nonce,
+					signature: signature.clone().into(),
+				}))),
+				Err(error) => core.cluster.send(&master, Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionError(EcdsaSigningSessionError {
+					session: core.meta.id.clone().into(),
+					sub_session: core.access_key.clone().into(),
+					session_nonce: nonce,
+					error: error.clone().into(),
+				}))),
+			};
+		}
+
+		data.result = Some(result);
+		core.completed.notify_all();
+	}
+
+	/// Check if all nonces are generated.
+	fn check_nonces_generated(data: &SessionData) -> bool {
+		let expect_proof = "check_nonces_generated is called when som nonce-gen session is completed;
+			all nonce-gen sessions are created at once; qed";
+		let sig_nonce_generation_session = data.sig_nonce_generation_session.as_ref().expect(expect_proof);
+		let inv_nonce_generation_session = data.inv_nonce_generation_session.as_ref().expect(expect_proof);
+		let inv_zero_generation_session = data.inv_zero_generation_session.as_ref().expect(expect_proof);
+
+		sig_nonce_generation_session.state() == GenerationSessionState::Finished
+			&& inv_nonce_generation_session.state() == GenerationSessionState::Finished
+			&& inv_zero_generation_session.state() == GenerationSessionState::Finished
+	}
+
+	/// Broadcast inversed nonce share.
+	fn send_inversed_nonce_coeff_share(core: &SessionCore, data: &mut SessionData) -> Result<(), Error> {
+		let proof = "inversed nonce coeff share is sent after nonces generation is completed; qed";
+
+		let sig_nonce_generation_session = data.sig_nonce_generation_session.as_ref().expect(proof);
+		let sig_nonce = sig_nonce_generation_session.joint_public_and_secret().expect(proof).expect(proof).2;
+
+		let inv_nonce_generation_session = data.inv_nonce_generation_session.as_ref().expect(proof);
+		let inv_nonce = inv_nonce_generation_session.joint_public_and_secret().expect(proof).expect(proof).2;
+
+		let inv_zero_generation_session = data.inv_zero_generation_session.as_ref().expect(proof);
+		let inv_zero = inv_zero_generation_session.joint_public_and_secret().expect(proof).expect(proof).2;
+
+		let inversed_nonce_coeff_share = math::compute_ecdsa_inversed_secret_coeff_share(&sig_nonce, &inv_nonce, &inv_zero)?;
+		if core.meta.self_node_id == core.meta.master_node_id {
+			let mut inversed_nonce_coeff_shares = BTreeMap::new();
+			inversed_nonce_coeff_shares.insert(core.meta.self_node_id.clone(), inversed_nonce_coeff_share);
+			data.inversed_nonce_coeff_shares = Some(inversed_nonce_coeff_shares);
+			Ok(())
+		} else {
+			core.cluster.send(&core.meta.master_node_id, Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningInversedNonceCoeffShare(EcdsaSigningInversedNonceCoeffShare {
+				session: core.meta.id.clone().into(),
+				sub_session: core.access_key.clone().into(),
+				session_nonce: core.nonce,
+				inversed_nonce_coeff_share: inversed_nonce_coeff_share.into(),
+			})))
+		}
+	}
+
+	/// Compute inversed nonce coefficient on master node.
+	fn compute_inversed_nonce_coeff(core: &SessionCore, data: &SessionData) -> Result<Secret, Error> {
+		let proof = "inversed nonce coeff is computed on master node; key version exists on master node";
+		let key_share = core.key_share.as_ref().expect(proof);
+		let key_version = key_share.version(data.version.as_ref().expect(proof)).expect(proof);
+
+		let proof = "inversed nonce coeff is computed after all shares are received; qed";
+		let inversed_nonce_coeff_shares = data.inversed_nonce_coeff_shares.as_ref().expect(proof);
+
+		math::compute_ecdsa_inversed_secret_coeff_from_shares(key_share.threshold,
+			&inversed_nonce_coeff_shares.keys().map(|n| key_version.id_numbers[n].clone()).collect::<Vec<_>>(),
+			&inversed_nonce_coeff_shares.values().cloned().collect::<Vec<_>>())
+	}
+}
+
+impl ClusterSession for SessionImpl {
+	type Id = SessionIdWithSubSession;
+
+	fn type_name() -> &'static str {
+		"ecdsa_signing"
+	}
+
+	fn id(&self) -> SessionIdWithSubSession {
+		SessionIdWithSubSession::new(self.core.meta.id.clone(), self.core.access_key.clone())
+	}
+
+	fn is_finished(&self) -> bool {
+		let data = self.data.lock();
+		data.consensus_session.state() == ConsensusSessionState::Failed
+			|| data.consensus_session.state() == ConsensusSessionState::Finished
+			|| data.result.is_some()
+	}
+
+	fn on_node_timeout(&self, node: &NodeId) {
+		// ignore error, only state matters
+		let _ = self.process_node_error(Some(node), Error::NodeDisconnected);
+	}
+
+	fn on_session_timeout(&self) {
+		// ignore error, only state matters
+		let _ = self.process_node_error(None, Error::NodeDisconnected);
+	}
+
+	fn on_session_error(&self, node: &NodeId, error: Error) {
+		let is_fatal = self.process_node_error(Some(node), error.clone()).is_err();
+		let is_this_node_error = *node == self.core.meta.self_node_id;
+		if is_fatal || is_this_node_error {
+			// error in signing session is non-fatal, if occurs on slave node
+			// => either respond with error
+			// => or broadcast error
+			let message = Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionError(EcdsaSigningSessionError {
+				session: self.core.meta.id.clone().into(),
+				sub_session: self.core.access_key.clone().into(),
+				session_nonce: self.core.nonce,
+				error: error.clone().into(),
+			}));
+
+			// do not bother processing send error, as we already processing error
+			let _ = if self.core.meta.master_node_id == self.core.meta.self_node_id {
+				self.core.cluster.broadcast(message)
+			} else {
+				self.core.cluster.send(&self.core.meta.master_node_id, message)
+			};
+		}
+	}
+
+	fn on_message(&self, sender: &NodeId, message: &Message) -> Result<(), Error> {
+		match *message {
+			Message::EcdsaSigning(ref message) => self.process_message(sender, message),
+			_ => unreachable!("cluster checks message to be correct before passing; qed"),
+		}
+	}
+}
+
+impl<F> NonceGenerationTransport<F> where F: Fn(SessionId, Secret, u64, GenerationMessage) -> EcdsaSigningMessage + Send + Sync {
+	fn map_message(&self, message: Message) -> Result<Message, Error> {
+		match message {
+			Message::Generation(message) => Ok(Message::EcdsaSigning((self.map)(self.id.clone(), self.access_key.clone(), self.nonce, message))),
+			_ => Err(Error::InvalidMessage),
+		}
+	}
+}
+
+impl<F> Cluster for NonceGenerationTransport<F> where F: Fn(SessionId, Secret, u64, GenerationMessage) -> EcdsaSigningMessage + Send + Sync {
+	fn broadcast(&self, message: Message) -> Result<(), Error> {
+		let message = self.map_message(message)?;
+		for to in &self.other_nodes_ids {
+			self.cluster.send(to, message.clone())?;
+		}
+		Ok(())
+	}
+
+	fn send(&self, to: &NodeId, message: Message) -> Result<(), Error> {
+		debug_assert!(self.other_nodes_ids.contains(to));
+		self.cluster.send(to, self.map_message(message)?)
+	}
+
+	fn is_connected(&self, node: &NodeId) -> bool {
+		self.cluster.is_connected(node)
+	}
+
+	fn nodes(&self) -> BTreeSet<NodeId> {
+		self.cluster.nodes()
+	}
+}
+
+impl SessionCore {
+	pub fn signing_transport(&self) -> SigningJobTransport {
+		SigningJobTransport {
+			id: self.meta.id.clone(),
+			access_key: self.access_key.clone(),
+			nonce: self.nonce,
+			cluster: self.cluster.clone()
+		}
+	}
+
+	pub fn disseminate_jobs(&self, consensus_session: &mut SigningConsensusSession, version: &H256, nonce_public: Public, inv_nonce_share: Secret, inversed_nonce_coeff: Secret, message_hash: H256) -> Result<(), Error> {
+		let key_share = match self.key_share.as_ref() {
+			None => return Err(Error::InvalidMessage),
+			Some(key_share) => key_share,
+		};
+
+		let key_version = key_share.version(version).map_err(|e| Error::KeyStorage(e.into()))?.hash.clone();
+		let signing_job = EcdsaSigningJob::new_on_master(key_share.clone(), key_version, nonce_public, inv_nonce_share, inversed_nonce_coeff, message_hash)?;
+		consensus_session.disseminate_jobs(signing_job, self.signing_transport(), false)
+	}
+}
+
+impl JobTransport for SigningConsensusTransport {
+	type PartialJobRequest=Requester;
+	type PartialJobResponse=bool;
+
+	fn send_partial_request(&self, node: &NodeId, request: Requester) -> Result<(), Error> {
+		let version = self.version.as_ref()
+			.expect("send_partial_request is called on initialized master node only; version is filled in before initialization starts on master node; qed");
+		self.cluster.send(node, Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningConsensusMessage(EcdsaSigningConsensusMessage {
+			session: self.id.clone().into(),
+			sub_session: self.access_key.clone().into(),
+			session_nonce: self.nonce,
+			message: ConsensusMessage::InitializeConsensusSession(InitializeConsensusSession {
+				requester: request.into(),
+				version: version.clone().into(),
+			})
+		})))
+	}
+
+	fn send_partial_response(&self, node: &NodeId, response: bool) -> Result<(), Error> {
+		self.cluster.send(node, Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningConsensusMessage(EcdsaSigningConsensusMessage {
+			session: self.id.clone().into(),
+			sub_session: self.access_key.clone().into(),
+			session_nonce: self.nonce,
+			message: ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
+				is_confirmed: response,
+			})
+		})))
+	}
+}
+
+impl JobTransport for SigningJobTransport {
+	type PartialJobRequest=EcdsaPartialSigningRequest;
+	type PartialJobResponse=EcdsaPartialSigningResponse;
+
+	fn send_partial_request(&self, node: &NodeId, request: EcdsaPartialSigningRequest) -> Result<(), Error> {
+		self.cluster.send(node, Message::EcdsaSigning(EcdsaSigningMessage::EcdsaRequestPartialSignature(EcdsaRequestPartialSignature {
+			session: self.id.clone().into(),
+			sub_session: self.access_key.clone().into(),
+			session_nonce: self.nonce,
+			request_id: request.id.into(),
+			inversed_nonce_coeff: request.inversed_nonce_coeff.into(),
+			message_hash: request.message_hash.into(),
+		})))
+	}
+
+	fn send_partial_response(&self, node: &NodeId, response: EcdsaPartialSigningResponse) -> Result<(), Error> {
+		self.cluster.send(node, Message::EcdsaSigning(EcdsaSigningMessage::EcdsaPartialSignature(EcdsaPartialSignature {
+			session: self.id.clone().into(),
+			sub_session: self.access_key.clone().into(),
+			session_nonce: self.nonce,
+			request_id: response.request_id.into(),
+			partial_signature_s: response.partial_signature_s.into(),
+		})))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::sync::Arc;
+	use std::collections::{BTreeSet, BTreeMap, VecDeque};
+	use ethereum_types::H256;
+	use ethkey::{self, Random, Generator, KeyPair, verify_public};
+	use acl_storage::DummyAclStorage;
+	use key_server_cluster::{NodeId, DummyKeyStorage, SessionId, SessionMeta, Error, KeyStorage};
+	use key_server_cluster::cluster_sessions::ClusterSession;
+	use key_server_cluster::cluster::tests::DummyCluster;
+	use key_server_cluster::generation_session::tests::MessageLoop as KeyGenerationMessageLoop;
+	use key_server_cluster::message::Message;
+	use key_server_cluster::signing_session_ecdsa::{SessionImpl, SessionParams};
+
+	struct Node {
+		pub node_id: NodeId,
+		pub cluster: Arc<DummyCluster>,
+		pub key_storage: Arc<DummyKeyStorage>,
+		pub session: SessionImpl,
+	}
+
+	struct MessageLoop {
+		pub session_id: SessionId,
+		pub requester: KeyPair,
+		pub nodes: BTreeMap<NodeId, Node>,
+		pub queue: VecDeque<(NodeId, NodeId, Message)>,
+		pub acl_storages: Vec<Arc<DummyAclStorage>>,
+		pub version: H256,
+	}
+
+	impl MessageLoop {
+		pub fn new(gl: &KeyGenerationMessageLoop) -> Self {
+			let version = gl.nodes.values().nth(0).unwrap().key_storage.get(&Default::default()).unwrap().unwrap().versions.iter().last().unwrap().hash;
+			let mut nodes = BTreeMap::new();
+			let session_id = gl.session_id.clone();
+			let requester = Random.generate().unwrap();
+			let signature = Some(ethkey::sign(requester.secret(), &SessionId::default()).unwrap());
+			let master_node_id = gl.nodes.keys().nth(0).unwrap().clone();
+			let mut acl_storages = Vec::new();
+			for (i, (gl_node_id, gl_node)) in gl.nodes.iter().enumerate() {
+				let acl_storage = Arc::new(DummyAclStorage::default());
+				acl_storages.push(acl_storage.clone());
+				let cluster = Arc::new(DummyCluster::new(gl_node_id.clone()));
+				let session = SessionImpl::new(SessionParams {
+					meta: SessionMeta {
+						id: session_id.clone(),
+						self_node_id: gl_node_id.clone(),
+						master_node_id: master_node_id.clone(),
+						threshold: gl_node.key_storage.get(&session_id).unwrap().unwrap().threshold,
+					},
+					access_key: "834cb736f02d9c968dfaf0c37658a1d86ff140554fc8b59c9fdad5a8cf810eec".parse().unwrap(),
+					key_share: Some(gl_node.key_storage.get(&session_id).unwrap().unwrap()),
+					acl_storage: acl_storage,
+					cluster: cluster.clone(),
+					nonce: 0,
+				}, if i == 0 { signature.clone().map(Into::into) } else { None }).unwrap();
+				nodes.insert(gl_node_id.clone(), Node { node_id: gl_node_id.clone(), cluster: cluster, key_storage: gl_node.key_storage.clone(), session: session });
+			}
+
+			let nodes_ids: Vec<_> = nodes.keys().cloned().collect();
+			for node in nodes.values() {
+				for node_id in &nodes_ids {
+					node.cluster.add_node(node_id.clone());
+				}
+			}
+
+			MessageLoop {
+				session_id: session_id,
+				requester: requester,
+				nodes: nodes,
+				queue: VecDeque::new(),
+				acl_storages: acl_storages,
+				version: version,
+			}
+		}
+
+		pub fn master(&self) -> &SessionImpl {
+			&self.nodes.values().nth(0).unwrap().session
+		}
+
+		pub fn take_message(&mut self) -> Option<(NodeId, NodeId, Message)> {
+			self.nodes.values()
+				.filter_map(|n| n.cluster.take_message().map(|m| (n.node_id.clone(), m.0, m.1)))
+				.nth(0)
+				.or_else(|| self.queue.pop_front())
+		}
+
+		pub fn process_message(&mut self, mut msg: (NodeId, NodeId, Message)) -> Result<(), Error> {
+			let mut is_queued_message = false;
+			loop {
+				match self.nodes[&msg.1].session.on_message(&msg.0, &msg.2) {
+					Ok(_) => {
+						if let Some(message) = self.queue.pop_front() {
+							msg = message;
+							is_queued_message = true;
+							continue;
+						}
+						return Ok(());
+					},
+					Err(Error::TooEarlyForRequest) => {
+						if is_queued_message {
+							self.queue.push_front(msg);
+						} else {
+							self.queue.push_back(msg);
+						}
+						return Ok(());
+					},
+					Err(err) => return Err(err),
+				}
+			}
+		}
+	}
+
+	fn prepare_signing_sessions(threshold: usize, num_nodes: usize) -> (KeyGenerationMessageLoop, MessageLoop) {
+		// run key generation sessions
+		let mut gl = KeyGenerationMessageLoop::new(num_nodes);
+		gl.master().initialize(Default::default(), false, threshold, gl.nodes.keys().cloned().collect::<BTreeSet<_>>().into()).unwrap();
+		while let Some((from, to, message)) = gl.take_message() {
+			gl.process_message((from, to, message)).unwrap();
+		}
+
+		// run signing session
+		let sl = MessageLoop::new(&gl);
+		(gl, sl)
+	}
+
+	#[test]
+	fn failed_gen_ecdsa_sign_session_when_threshold_is_too_low() {
+		let test_cases = [(1, 2), (2, 4), (3, 6), (4, 6)];
+		for &(threshold, num_nodes) in &test_cases {
+			let (_, sl) = prepare_signing_sessions(threshold, num_nodes);
+
+			// run signing session
+			let message_hash = H256::random();
+			assert_eq!(sl.master().initialize(sl.version.clone(), message_hash).unwrap_err(), Error::ConsensusUnreachable);
+		}
+	}
+
+	#[test]
+	fn complete_gen_ecdsa_sign_session() {
+		let test_cases = [(0, 1), (2, 5), (2, 6), (3, 11), (4, 11)];
+		for &(threshold, num_nodes) in &test_cases {
+			let (gl, mut sl) = prepare_signing_sessions(threshold, num_nodes);
+			let key_pair = gl.compute_key_pair(threshold);
+
+			// run signing session
+			let message_hash = H256::random();
+			sl.master().initialize(sl.version.clone(), message_hash).unwrap();
+			while let Some((from, to, message)) = sl.take_message() {
+				sl.process_message((from, to, message)).unwrap();
+			}
+
+			// verify signature
+			let signature = sl.master().wait().unwrap();
+			assert!(verify_public(key_pair.public(), &signature, &message_hash).unwrap());
+		}
+	}
+
+	#[test]
+	fn ecdsa_complete_signing_session_with_single_node_failing() {
+		let (_, mut sl) = prepare_signing_sessions(1, 4);
+		sl.master().initialize(sl.version.clone(), 777.into()).unwrap();
+
+		// we need at least 3-of-4 nodes to agree to reach consensus
+		// let's say 1 of 4 nodes disagee
+		sl.acl_storages[1].prohibit(sl.requester.public().clone(), SessionId::default());
+
+		// then consensus reachable, but single node will disagree
+		while let Some((from, to, message)) = sl.take_message() {
+			sl.process_message((from, to, message)).unwrap();
+		}
+
+		let data = sl.master().data.lock();
+		match data.result {
+			Some(Ok(_)) => (),
+			_ => unreachable!(),
+		}
+	}
+
+	#[test]
+	fn ecdsa_complete_signing_session_with_acl_check_failed_on_master() {
+		let (_, mut sl) = prepare_signing_sessions(1, 4);
+		sl.master().initialize(sl.version.clone(), 777.into()).unwrap();
+
+		// we need at least 3-of-4 nodes to agree to reach consensus
+		// let's say 1 of 4 nodes disagee
+		sl.acl_storages[0].prohibit(sl.requester.public().clone(), SessionId::default());
+
+		// then consensus reachable, but single node will disagree
+		while let Some((from, to, message)) = sl.take_message() {
+			sl.process_message((from, to, message)).unwrap();
+		}
+
+		let data = sl.master().data.lock();
+		match data.result {
+			Some(Ok(_)) => (),
+			_ => unreachable!(),
+		}
+	}
+
+	#[test]
+	fn ecdsa_signing_works_when_delegated_to_other_node() {
+		let (_, mut sl) = prepare_signing_sessions(1, 4);
+
+		// let's say node1 doesn't have a share && delegates decryption request to node0
+		// initially session is created on node1 => node1 is master for itself, but for other nodes node0 is still master
+		let actual_master = sl.nodes.keys().nth(0).cloned().unwrap();
+		let requested_node = sl.nodes.keys().skip(1).nth(0).cloned().unwrap();
+		let version = sl.nodes[&actual_master].key_storage.get(&Default::default()).unwrap().unwrap().last_version().unwrap().hash.clone();
+		sl.nodes[&requested_node].key_storage.remove(&Default::default()).unwrap();
+		sl.nodes.get_mut(&requested_node).unwrap().session.core.key_share = None;
+		sl.nodes.get_mut(&requested_node).unwrap().session.core.meta.master_node_id = sl.nodes[&requested_node].session.core.meta.self_node_id.clone();
+		sl.nodes[&requested_node].session.data.lock().consensus_session.consensus_job_mut().executor_mut().set_requester(
+			sl.nodes[&actual_master].session.data.lock().consensus_session.consensus_job().executor().requester().unwrap().clone()
+		);
+
+		// now let's try to do a decryption
+		sl.nodes[&requested_node].session.delegate(actual_master, version, H256::random()).unwrap();
+
+		// then consensus reachable, but single node will disagree
+		while let Some((from, to, message)) = sl.take_message() {
+			sl.process_message((from, to, message)).unwrap();
+		}
+	}
+
+	#[test]
+	fn ecdsa_signing_works_when_share_owners_are_isolated() {
+		let (_, mut sl) = prepare_signing_sessions(2, 6);
+
+		// we need 5 out of 6 nodes to agree to do a decryption
+		// let's say that 1 of these nodes (master) is isolated
+		let isolated_node_id = sl.nodes.keys().skip(2).nth(0).cloned().unwrap();
+		for node in sl.nodes.values() {
+			node.cluster.remove_node(&isolated_node_id);
+		}
+
+		// now let's try to do a signing
+		sl.master().initialize(sl.version.clone(), H256::random()).unwrap();
+
+		// then consensus reachable, but single node will disagree
+		while let Some((from, to, message)) = sl.take_message() {
+			sl.process_message((from, to, message)).unwrap();
+		}
+
+		let data = sl.master().data.lock();
+		match data.result {
+			Some(Ok(_)) => (),
+			_ => unreachable!(),
+		}
+	}
+}
diff --git a/secret_store/src/key_server_cluster/client_sessions/signing_session_schnorr.rs b/secret_store/src/key_server_cluster/client_sessions/signing_session_schnorr.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4eaf072373def4c6d407ccf2b32872160f105126
--- /dev/null
+++ b/secret_store/src/key_server_cluster/client_sessions/signing_session_schnorr.rs
@@ -0,0 +1,1274 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::BTreeSet;
+use std::sync::Arc;
+use parking_lot::{Mutex, Condvar};
+use ethkey::{Public, Secret};
+use ethereum_types::H256;
+use key_server_cluster::{Error, NodeId, SessionId, Requester, SessionMeta, AclStorage, DocumentKeyShare};
+use key_server_cluster::cluster::{Cluster};
+use key_server_cluster::cluster_sessions::{SessionIdWithSubSession, ClusterSession};
+use key_server_cluster::generation_session::{SessionImpl as GenerationSession, SessionParams as GenerationSessionParams,
+	SessionState as GenerationSessionState};
+use key_server_cluster::message::{Message, SchnorrSigningMessage, SchnorrSigningConsensusMessage, SchnorrSigningGenerationMessage,
+	SchnorrRequestPartialSignature, SchnorrPartialSignature, SchnorrSigningSessionCompleted, GenerationMessage,
+	ConsensusMessage, SchnorrSigningSessionError, InitializeConsensusSession, ConfirmConsensusInitialization,
+	SchnorrSigningSessionDelegation, SchnorrSigningSessionDelegationCompleted};
+use key_server_cluster::jobs::job_session::JobTransport;
+use key_server_cluster::jobs::key_access_job::KeyAccessJob;
+use key_server_cluster::jobs::signing_job_schnorr::{SchnorrPartialSigningRequest, SchnorrPartialSigningResponse, SchnorrSigningJob};
+use key_server_cluster::jobs::consensus_session::{ConsensusSessionParams, ConsensusSessionState, ConsensusSession};
+
+/// Distributed Schnorr-signing session.
+/// Based on "Efficient Multi-Party Digital Signature using Adaptive Secret Sharing for Low-Power Devices in Wireless Network" paper.
+/// Brief overview:
+/// 1) initialization: master node (which has received request for signing the message) requests all other nodes to sign the message
+/// 2) ACL check: all nodes which have received the request are querying ACL-contract to check if requestor has access to the private key
+/// 3) partial signing: every node which has succussfully checked access for the requestor do a partial signing
+/// 4) signing: master node receives all partial signatures of the secret and computes the signature
+pub struct SessionImpl {
+	/// Session core.
+	core: SessionCore,
+	/// Session data.
+	data: Mutex<SessionData>,
+}
+
+/// Immutable session data.
+struct SessionCore {
+	/// Session metadata.
+	pub meta: SessionMeta,
+	/// Signing session access key.
+	pub access_key: Secret,
+	/// Key share.
+	pub key_share: Option<DocumentKeyShare>,
+	/// Cluster which allows this node to send messages to other nodes in the cluster.
+	pub cluster: Arc<Cluster>,
+	/// Session-level nonce.
+	pub nonce: u64,
+	/// SessionImpl completion condvar.
+	pub completed: Condvar,
+}
+
+/// Signing consensus session type.
+type SigningConsensusSession = ConsensusSession<KeyAccessJob, SigningConsensusTransport, SchnorrSigningJob, SigningJobTransport>;
+
+/// Mutable session data.
+struct SessionData {
+	/// Session state.
+	pub state: SessionState,
+	/// Message hash.
+	pub message_hash: Option<H256>,
+	/// Key version to use for decryption.
+	pub version: Option<H256>,
+	/// Consensus-based signing session.
+	pub consensus_session: SigningConsensusSession,
+	/// Session key generation session.
+	pub generation_session: Option<GenerationSession>,
+	/// Delegation status.
+	pub delegation_status: Option<DelegationStatus>,
+	/// Decryption result.
+	pub result: Option<Result<(Secret, Secret), Error>>,
+}
+
+/// Signing session state.
+#[derive(Debug, PartialEq)]
+#[cfg_attr(test, derive(Clone, Copy))]
+pub enum SessionState {
+	/// State when consensus is establishing.
+	ConsensusEstablishing,
+	/// State when session key is generating.
+	SessionKeyGeneration,
+	/// State when signature is computing.
+	SignatureComputing,
+}
+
+/// Session creation parameters
+pub struct SessionParams {
+	/// Session metadata.
+	pub meta: SessionMeta,
+	/// Session access key.
+	pub access_key: Secret,
+	/// Key share.
+	pub key_share: Option<DocumentKeyShare>,
+	/// ACL storage.
+	pub acl_storage: Arc<AclStorage>,
+	/// Cluster
+	pub cluster: Arc<Cluster>,
+	/// Session nonce.
+	pub nonce: u64,
+}
+
+/// Signing consensus transport.
+struct SigningConsensusTransport {
+	/// Session id.
+	id: SessionId,
+	/// Session access key.
+	access_key: Secret,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Selected key version (on master node).
+	version: Option<H256>,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+}
+
+/// Signing key generation transport.
+struct SessionKeyGenerationTransport {
+	/// Session access key.
+	access_key: Secret,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Other nodes ids.
+	other_nodes_ids: BTreeSet<NodeId>,
+}
+
+/// Signing job transport
+struct SigningJobTransport {
+	/// Session id.
+	id: SessionId,
+	/// Session access key.
+	access_key: Secret,
+	/// Session-level nonce.
+	nonce: u64,
+	/// Cluster.
+	cluster: Arc<Cluster>,
+}
+
+/// Session delegation status.
+enum DelegationStatus {
+	/// Delegated to other node.
+	DelegatedTo(NodeId),
+	/// Delegated from other node.
+	DelegatedFrom(NodeId, u64),
+}
+
+impl SessionImpl {
+	/// Create new signing session.
+	pub fn new(params: SessionParams, requester: Option<Requester>) -> Result<Self, Error> {
+		debug_assert_eq!(params.meta.threshold, params.key_share.as_ref().map(|ks| ks.threshold).unwrap_or_default());
+
+		let consensus_transport = SigningConsensusTransport {
+			id: params.meta.id.clone(),
+			access_key: params.access_key.clone(),
+			nonce: params.nonce,
+			version: None,
+			cluster: params.cluster.clone(),
+		};
+		let consensus_session = ConsensusSession::new(ConsensusSessionParams {
+			meta: params.meta.clone(),
+			consensus_executor: match requester {
+				Some(requester) => KeyAccessJob::new_on_master(params.meta.id.clone(), params.acl_storage.clone(), requester),
+				None => KeyAccessJob::new_on_slave(params.meta.id.clone(), params.acl_storage.clone()),
+			},
+			consensus_transport: consensus_transport,
+		})?;
+
+		Ok(SessionImpl {
+			core: SessionCore {
+				meta: params.meta,
+				access_key: params.access_key,
+				key_share: params.key_share,
+				cluster: params.cluster,
+				nonce: params.nonce,
+				completed: Condvar::new(),
+			},
+			data: Mutex::new(SessionData {
+				state: SessionState::ConsensusEstablishing,
+				message_hash: None,
+				version: None,
+				consensus_session: consensus_session,
+				generation_session: None,
+				delegation_status: None,
+				result: None,
+			}),
+		})
+	}
+
+	/// Get session state.
+	#[cfg(test)]
+	pub fn state(&self) -> SessionState {
+		self.data.lock().state
+	}
+
+	/// Wait for session completion.
+	pub fn wait(&self) -> Result<(Secret, Secret), Error> {
+		Self::wait_session(&self.core.completed, &self.data, None, |data| data.result.clone())
+	}
+
+	/// Delegate session to other node.
+	pub fn delegate(&self, master: NodeId, version: H256, message_hash: H256) -> Result<(), Error> {
+		if self.core.meta.master_node_id != self.core.meta.self_node_id {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		let mut data = self.data.lock();
+		if data.consensus_session.state() != ConsensusSessionState::WaitingForInitialization || data.delegation_status.is_some() {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		data.consensus_session.consensus_job_mut().executor_mut().set_has_key_share(false);
+		self.core.cluster.send(&master, Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionDelegation(SchnorrSigningSessionDelegation {
+			session: self.core.meta.id.clone().into(),
+			sub_session: self.core.access_key.clone().into(),
+			session_nonce: self.core.nonce,
+			requester: data.consensus_session.consensus_job().executor().requester()
+				.expect("requester is passed to master node on creation; session can be delegated from master node only; qed")
+				.clone().into(),
+			version: version.into(),
+			message_hash: message_hash.into(),
+		})))?;
+		data.delegation_status = Some(DelegationStatus::DelegatedTo(master));
+		Ok(())
+
+	}
+
+	/// Initialize signing session on master node.
+	pub fn initialize(&self, version: H256, message_hash: H256) -> Result<(), Error> {
+		debug_assert_eq!(self.core.meta.self_node_id, self.core.meta.master_node_id);
+
+		// check if version exists
+		let key_version = match self.core.key_share.as_ref() {
+			None => return Err(Error::InvalidMessage),
+			Some(key_share) => key_share.version(&version).map_err(|e| Error::KeyStorage(e.into()))?,
+		};
+
+		let mut data = self.data.lock();
+		let non_isolated_nodes = self.core.cluster.nodes();
+		let mut consensus_nodes: BTreeSet<_> = key_version.id_numbers.keys()
+			.filter(|n| non_isolated_nodes.contains(*n))
+			.cloned()
+			.chain(::std::iter::once(self.core.meta.self_node_id.clone()))
+			.collect();
+		if let Some(&DelegationStatus::DelegatedFrom(delegation_master, _)) = data.delegation_status.as_ref() {
+			consensus_nodes.remove(&delegation_master);
+		}
+
+		data.consensus_session.consensus_job_mut().transport_mut().version = Some(version.clone());
+		data.version = Some(version.clone());
+		data.message_hash = Some(message_hash);
+		data.consensus_session.initialize(consensus_nodes)?;
+
+		if data.consensus_session.state() == ConsensusSessionState::ConsensusEstablished {
+			let generation_session = GenerationSession::new(GenerationSessionParams {
+				id: self.core.meta.id.clone(),
+				self_node_id: self.core.meta.self_node_id.clone(),
+				key_storage: None,
+				cluster: Arc::new(SessionKeyGenerationTransport {
+					access_key: self.core.access_key.clone(),
+					cluster: self.core.cluster.clone(),
+					nonce: self.core.nonce,
+					other_nodes_ids: BTreeSet::new()
+				}),
+				nonce: None,
+			});
+			generation_session.initialize(Default::default(), false, 0, vec![self.core.meta.self_node_id.clone()].into_iter().collect::<BTreeSet<_>>().into())?;
+
+			debug_assert_eq!(generation_session.state(), GenerationSessionState::WaitingForGenerationConfirmation);
+			let joint_public_and_secret = generation_session
+				.joint_public_and_secret()
+				.expect("session key is generated before signature is computed; we are in SignatureComputing state; qed")?;
+			data.generation_session = Some(generation_session);
+			data.state = SessionState::SignatureComputing;
+
+			self.core.disseminate_jobs(&mut data.consensus_session, &version, joint_public_and_secret.0, joint_public_and_secret.1, message_hash)?;
+
+			debug_assert!(data.consensus_session.state() == ConsensusSessionState::Finished);
+			let result = data.consensus_session.result()?;
+			Self::set_signing_result(&self.core, &mut *data, Ok(result));
+		}
+
+		Ok(())
+	}
+
+	/// Process signing message.
+	pub fn process_message(&self, sender: &NodeId, message: &SchnorrSigningMessage) -> Result<(), Error> {
+		if self.core.nonce != message.session_nonce() {
+			return Err(Error::ReplayProtection);
+		}
+
+		match message {
+			&SchnorrSigningMessage::SchnorrSigningConsensusMessage(ref message) =>
+				self.on_consensus_message(sender, message),
+			&SchnorrSigningMessage::SchnorrSigningGenerationMessage(ref message) =>
+				self.on_generation_message(sender, message),
+			&SchnorrSigningMessage::SchnorrRequestPartialSignature(ref message) =>
+				self.on_partial_signature_requested(sender, message),
+			&SchnorrSigningMessage::SchnorrPartialSignature(ref message) =>
+				self.on_partial_signature(sender, message),
+			&SchnorrSigningMessage::SchnorrSigningSessionError(ref message) =>
+				self.process_node_error(Some(&sender), Error::Io(message.error.clone())),
+			&SchnorrSigningMessage::SchnorrSigningSessionCompleted(ref message) =>
+				self.on_session_completed(sender, message),
+			&SchnorrSigningMessage::SchnorrSigningSessionDelegation(ref message) =>
+				self.on_session_delegated(sender, message),
+			&SchnorrSigningMessage::SchnorrSigningSessionDelegationCompleted(ref message) =>
+				self.on_session_delegation_completed(sender, message),
+		}
+	}
+
+	/// When session is delegated to this node.
+	pub fn on_session_delegated(&self, sender: &NodeId, message: &SchnorrSigningSessionDelegation) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+
+		{
+			let mut data = self.data.lock();
+			if data.consensus_session.state() != ConsensusSessionState::WaitingForInitialization || data.delegation_status.is_some() {
+				return Err(Error::InvalidStateForRequest);
+			}
+
+			data.consensus_session.consensus_job_mut().executor_mut().set_requester(message.requester.clone().into());
+			data.delegation_status = Some(DelegationStatus::DelegatedFrom(sender.clone(), message.session_nonce));
+		}
+
+		self.initialize(message.version.clone().into(), message.message_hash.clone().into())
+	}
+
+	/// When delegated session is completed on other node.
+	pub fn on_session_delegation_completed(&self, sender: &NodeId, message: &SchnorrSigningSessionDelegationCompleted) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+
+		if self.core.meta.master_node_id != self.core.meta.self_node_id {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		let mut data = self.data.lock();
+		match data.delegation_status.as_ref() {
+			Some(&DelegationStatus::DelegatedTo(ref node)) if node == sender => (),
+			_ => return Err(Error::InvalidMessage),
+		}
+
+		Self::set_signing_result(&self.core, &mut *data, Ok((message.signature_c.clone().into(), message.signature_s.clone().into())));
+
+		Ok(())
+	}
+
+	/// When consensus-related message is received.
+	pub fn on_consensus_message(&self, sender: &NodeId, message: &SchnorrSigningConsensusMessage) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let mut data = self.data.lock();
+		let is_establishing_consensus = data.consensus_session.state() == ConsensusSessionState::EstablishingConsensus;
+
+		if let &ConsensusMessage::InitializeConsensusSession(ref msg) = &message.message {
+			let version = msg.version.clone().into();
+			let has_key_share = self.core.key_share.as_ref()
+				.map(|ks| ks.version(&version).is_ok())
+				.unwrap_or(false);
+			data.consensus_session.consensus_job_mut().executor_mut().set_has_key_share(has_key_share);
+			data.version = Some(version);
+		}
+		data.consensus_session.on_consensus_message(&sender, &message.message)?;
+
+		let is_consensus_established = data.consensus_session.state() == ConsensusSessionState::ConsensusEstablished;
+		if self.core.meta.self_node_id != self.core.meta.master_node_id || !is_establishing_consensus || !is_consensus_established {
+			return Ok(());
+		}
+
+		let consensus_group = data.consensus_session.select_consensus_group()?.clone();
+		let mut other_consensus_group_nodes = consensus_group.clone();
+		other_consensus_group_nodes.remove(&self.core.meta.self_node_id);
+
+		let key_share = match self.core.key_share.as_ref() {
+			None => return Err(Error::InvalidMessage),
+			Some(key_share) => key_share,
+		};
+
+		let generation_session = GenerationSession::new(GenerationSessionParams {
+			id: self.core.meta.id.clone(),
+			self_node_id: self.core.meta.self_node_id.clone(),
+			key_storage: None,
+			cluster: Arc::new(SessionKeyGenerationTransport {
+				access_key: self.core.access_key.clone(),
+				cluster: self.core.cluster.clone(),
+				nonce: self.core.nonce,
+				other_nodes_ids: other_consensus_group_nodes,
+			}),
+			nonce: None,
+		});
+
+		generation_session.initialize(Default::default(), false, key_share.threshold, consensus_group.into())?;
+		data.generation_session = Some(generation_session);
+		data.state = SessionState::SessionKeyGeneration;
+
+		Ok(())
+	}
+
+	/// When session key related message is received.
+	pub fn on_generation_message(&self, sender: &NodeId, message: &SchnorrSigningGenerationMessage) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let mut data = self.data.lock();
+
+		if let &GenerationMessage::InitializeSession(ref message) = &message.message {
+			if &self.core.meta.master_node_id != sender {
+				match data.delegation_status.as_ref() {
+					Some(&DelegationStatus::DelegatedTo(s)) if s == *sender => (),
+					_ => return Err(Error::InvalidMessage),
+				}
+			}
+
+			let consensus_group: BTreeSet<NodeId> = message.nodes.keys().cloned().map(Into::into).collect();
+			let mut other_consensus_group_nodes = consensus_group.clone();
+			other_consensus_group_nodes.remove(&self.core.meta.self_node_id);
+
+			let generation_session = GenerationSession::new(GenerationSessionParams {
+				id: self.core.meta.id.clone(),
+				self_node_id: self.core.meta.self_node_id.clone(),
+				key_storage: None,
+				cluster: Arc::new(SessionKeyGenerationTransport {
+					access_key: self.core.access_key.clone(),
+					cluster: self.core.cluster.clone(),
+					nonce: self.core.nonce,
+					other_nodes_ids: other_consensus_group_nodes
+				}),
+				nonce: None,
+			});
+			data.generation_session = Some(generation_session);
+			data.state = SessionState::SessionKeyGeneration;
+		}
+
+		{
+			let generation_session = data.generation_session.as_ref().ok_or(Error::InvalidStateForRequest)?;
+			let is_key_generating = generation_session.state() != GenerationSessionState::Finished;
+			generation_session.process_message(sender, &message.message)?;
+
+			let is_key_generated = generation_session.state() == GenerationSessionState::Finished;
+			if !is_key_generating || !is_key_generated {
+				return Ok(());
+			}
+		}
+
+		data.state = SessionState::SignatureComputing;
+		if self.core.meta.master_node_id != self.core.meta.self_node_id {
+			return Ok(());
+		}
+
+		let version = data.version.as_ref().ok_or(Error::InvalidMessage)?.clone();
+		let message_hash = data.message_hash
+			.expect("we are on master node; on master node message_hash is filled in initialize(); on_generation_message follows initialize; qed");
+		let joint_public_and_secret = data.generation_session.as_ref()
+			.expect("session key is generated before signature is computed; we are in SignatureComputing state; qed")
+			.joint_public_and_secret()
+			.expect("session key is generated before signature is computed; we are in SignatureComputing state; qed")?;
+		self.core.disseminate_jobs(&mut data.consensus_session, &version, joint_public_and_secret.0, joint_public_and_secret.1, message_hash)
+	}
+
+	/// When partial signature is requested.
+	pub fn on_partial_signature_requested(&self, sender: &NodeId, message: &SchnorrRequestPartialSignature) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let key_share = match self.core.key_share.as_ref() {
+			None => return Err(Error::InvalidMessage),
+			Some(key_share) => key_share,
+		};
+
+		let mut data = self.data.lock();
+
+		if sender != &self.core.meta.master_node_id {
+			return Err(Error::InvalidMessage);
+		}
+		if data.state != SessionState::SignatureComputing {
+			return Err(Error::InvalidStateForRequest);
+		}
+
+		let joint_public_and_secret = data.generation_session.as_ref()
+			.expect("session key is generated before signature is computed; we are in SignatureComputing state; qed")
+			.joint_public_and_secret()
+			.expect("session key is generated before signature is computed; we are in SignatureComputing state; qed")?;
+		let key_version = key_share.version(data.version.as_ref().ok_or(Error::InvalidMessage)?)
+			.map_err(|e| Error::KeyStorage(e.into()))?.hash.clone();
+		let signing_job = SchnorrSigningJob::new_on_slave(self.core.meta.self_node_id.clone(), key_share.clone(), key_version, joint_public_and_secret.0, joint_public_and_secret.1)?;
+		let signing_transport = self.core.signing_transport();
+
+		data.consensus_session.on_job_request(sender, SchnorrPartialSigningRequest {
+			id: message.request_id.clone().into(),
+			message_hash: message.message_hash.clone().into(),
+			other_nodes_ids: message.nodes.iter().cloned().map(Into::into).collect(),
+		}, signing_job, signing_transport)
+	}
+
+	/// When partial signature is received.
+	pub fn on_partial_signature(&self, sender: &NodeId, message: &SchnorrPartialSignature) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		let mut data = self.data.lock();
+		data.consensus_session.on_job_response(sender, SchnorrPartialSigningResponse {
+			request_id: message.request_id.clone().into(),
+			partial_signature: message.partial_signature.clone().into(),
+		})?;
+
+		if data.consensus_session.state() != ConsensusSessionState::Finished {
+			return Ok(());
+		}
+
+		// send compeltion signal to all nodes, except for rejected nodes
+		for node in data.consensus_session.consensus_non_rejected_nodes() {
+			self.core.cluster.send(&node, Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionCompleted(SchnorrSigningSessionCompleted {
+				session: self.core.meta.id.clone().into(),
+				sub_session: self.core.access_key.clone().into(),
+				session_nonce: self.core.nonce,
+			})))?;
+		}
+
+		let result = data.consensus_session.result()?;
+		Self::set_signing_result(&self.core, &mut *data, Ok(result));
+
+		Ok(())
+	}
+
+	/// When session is completed.
+	pub fn on_session_completed(&self, sender: &NodeId, message: &SchnorrSigningSessionCompleted) -> Result<(), Error> {
+		debug_assert!(self.core.meta.id == *message.session);
+		debug_assert!(self.core.access_key == *message.sub_session);
+		debug_assert!(sender != &self.core.meta.self_node_id);
+
+		self.data.lock().consensus_session.on_session_completed(sender)
+	}
+
+	/// Process error from the other node.
+	fn process_node_error(&self, node: Option<&NodeId>, error: Error) -> Result<(), Error> {
+		let mut data = self.data.lock();
+		let is_self_node_error = node.map(|n| n == &self.core.meta.self_node_id).unwrap_or(false);
+		// error is always fatal if coming from this node
+		if is_self_node_error {
+			Self::set_signing_result(&self.core, &mut *data, Err(error.clone()));
+			return Err(error);
+		}
+
+		match {
+			match node {
+				Some(node) => data.consensus_session.on_node_error(node),
+				None => data.consensus_session.on_session_timeout(),
+			}
+		} {
+			Ok(false) => {
+				Ok(())
+			},
+			Ok(true) => {
+				let version = data.version.as_ref().ok_or(Error::InvalidMessage)?.clone();
+				let message_hash = data.message_hash.as_ref().cloned()
+					.expect("on_node_error returned true; this means that jobs must be REsent; this means that jobs already have been sent; jobs are sent when message_hash.is_some(); qed");
+				let joint_public_and_secret = data.generation_session.as_ref()
+					.expect("on_node_error returned true; this means that jobs must be REsent; this means that jobs already have been sent; jobs are sent when message_hash.is_some(); qed")
+					.joint_public_and_secret()
+					.expect("on_node_error returned true; this means that jobs must be REsent; this means that jobs already have been sent; jobs are sent when message_hash.is_some(); qed")?;
+				let disseminate_result = self.core.disseminate_jobs(&mut data.consensus_session, &version, joint_public_and_secret.0, joint_public_and_secret.1, message_hash);
+				match disseminate_result {
+					Ok(()) => Ok(()),
+					Err(err) => {
+						warn!("{}: signing session failed with error: {:?} from {:?}", &self.core.meta.self_node_id, error, node);
+						Self::set_signing_result(&self.core, &mut *data, Err(err.clone()));
+						Err(err)
+					}
+				}
+			},
+			Err(err) => {
+				warn!("{}: signing session failed with error: {:?} from {:?}", &self.core.meta.self_node_id, error, node);
+				Self::set_signing_result(&self.core, &mut *data, Err(err.clone()));
+				Err(err)
+			},
+		}
+	}
+
+	/// Set signing session result.
+	fn set_signing_result(core: &SessionCore, data: &mut SessionData, result: Result<(Secret, Secret), Error>) {
+		if let Some(DelegationStatus::DelegatedFrom(master, nonce)) = data.delegation_status.take() {
+			// error means can't communicate => ignore it
+			let _ = match result.as_ref() {
+				Ok(signature) => core.cluster.send(&master, Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionDelegationCompleted(SchnorrSigningSessionDelegationCompleted {
+					session: core.meta.id.clone().into(),
+					sub_session: core.access_key.clone().into(),
+					session_nonce: nonce,
+					signature_c: signature.0.clone().into(),
+					signature_s: signature.1.clone().into(),
+				}))),
+				Err(error) => core.cluster.send(&master, Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionError(SchnorrSigningSessionError {
+					session: core.meta.id.clone().into(),
+					sub_session: core.access_key.clone().into(),
+					session_nonce: nonce,
+					error: error.clone().into(),
+				}))),
+			};
+		}
+
+		data.result = Some(result);
+		core.completed.notify_all();
+	}
+}
+
+impl ClusterSession for SessionImpl {
+	type Id = SessionIdWithSubSession;
+
+	fn type_name() -> &'static str {
+		"signing"
+	}
+
+	fn id(&self) -> SessionIdWithSubSession {
+		SessionIdWithSubSession::new(self.core.meta.id.clone(), self.core.access_key.clone())
+	}
+
+	fn is_finished(&self) -> bool {
+		let data = self.data.lock();
+		data.consensus_session.state() == ConsensusSessionState::Failed
+			|| data.consensus_session.state() == ConsensusSessionState::Finished
+			|| data.result.is_some()
+	}
+
+	fn on_node_timeout(&self, node: &NodeId) {
+		// ignore error, only state matters
+		let _ = self.process_node_error(Some(node), Error::NodeDisconnected);
+	}
+
+	fn on_session_timeout(&self) {
+		// ignore error, only state matters
+		let _ = self.process_node_error(None, Error::NodeDisconnected);
+	}
+
+	fn on_session_error(&self, node: &NodeId, error: Error) {
+		let is_fatal = self.process_node_error(Some(node), error.clone()).is_err();
+		let is_this_node_error = *node == self.core.meta.self_node_id;
+		if is_fatal || is_this_node_error {
+			// error in signing session is non-fatal, if occurs on slave node
+			// => either respond with error
+			// => or broadcast error
+			let message = Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionError(SchnorrSigningSessionError {
+				session: self.core.meta.id.clone().into(),
+				sub_session: self.core.access_key.clone().into(),
+				session_nonce: self.core.nonce,
+				error: error.clone().into(),
+			}));
+
+			// do not bother processing send error, as we already processing error
+			let _ = if self.core.meta.master_node_id == self.core.meta.self_node_id {
+				self.core.cluster.broadcast(message)
+			} else {
+				self.core.cluster.send(&self.core.meta.master_node_id, message)
+			};
+		}
+	}
+
+	fn on_message(&self, sender: &NodeId, message: &Message) -> Result<(), Error> {
+		match *message {
+			Message::SchnorrSigning(ref message) => self.process_message(sender, message),
+			_ => unreachable!("cluster checks message to be correct before passing; qed"),
+		}
+	}
+}
+
+impl SessionKeyGenerationTransport {
+	fn map_message(&self, message: Message) -> Result<Message, Error> {
+		match message {
+			Message::Generation(message) => Ok(Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningGenerationMessage(SchnorrSigningGenerationMessage {
+				session: message.session_id().clone().into(),
+				sub_session: self.access_key.clone().into(),
+				session_nonce: self.nonce,
+				message: message,
+			}))),
+			_ => Err(Error::InvalidMessage),
+		}
+	}
+}
+
+impl Cluster for SessionKeyGenerationTransport {
+	fn broadcast(&self, message: Message) -> Result<(), Error> {
+		let message = self.map_message(message)?;
+		for to in &self.other_nodes_ids {
+			self.cluster.send(to, message.clone())?;
+		}
+		Ok(())
+	}
+
+	fn send(&self, to: &NodeId, message: Message) -> Result<(), Error> {
+		debug_assert!(self.other_nodes_ids.contains(to));
+		self.cluster.send(to, self.map_message(message)?)
+	}
+
+	fn is_connected(&self, node: &NodeId) -> bool {
+		self.cluster.is_connected(node)
+	}
+
+	fn nodes(&self) -> BTreeSet<NodeId> {
+		self.cluster.nodes()
+	}
+}
+
+impl SessionCore {
+	pub fn signing_transport(&self) -> SigningJobTransport {
+		SigningJobTransport {
+			id: self.meta.id.clone(),
+			access_key: self.access_key.clone(),
+			nonce: self.nonce,
+			cluster: self.cluster.clone()
+		}
+	}
+
+	pub fn disseminate_jobs(&self, consensus_session: &mut SigningConsensusSession, version: &H256, session_public: Public, session_secret_share: Secret, message_hash: H256) -> Result<(), Error> {
+		let key_share = match self.key_share.as_ref() {
+			None => return Err(Error::InvalidMessage),
+			Some(key_share) => key_share,
+		};
+
+		let key_version = key_share.version(version).map_err(|e| Error::KeyStorage(e.into()))?.hash.clone();
+		let signing_job = SchnorrSigningJob::new_on_master(self.meta.self_node_id.clone(), key_share.clone(), key_version, session_public, session_secret_share, message_hash)?;
+		consensus_session.disseminate_jobs(signing_job, self.signing_transport(), false)
+	}
+}
+
+impl JobTransport for SigningConsensusTransport {
+	type PartialJobRequest=Requester;
+	type PartialJobResponse=bool;
+
+	fn send_partial_request(&self, node: &NodeId, request: Requester) -> Result<(), Error> {
+		let version = self.version.as_ref()
+			.expect("send_partial_request is called on initialized master node only; version is filled in before initialization starts on master node; qed");
+		self.cluster.send(node, Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningConsensusMessage(SchnorrSigningConsensusMessage {
+			session: self.id.clone().into(),
+			sub_session: self.access_key.clone().into(),
+			session_nonce: self.nonce,
+			message: ConsensusMessage::InitializeConsensusSession(InitializeConsensusSession {
+				requester: request.into(),
+				version: version.clone().into(),
+			})
+		})))
+	}
+
+	fn send_partial_response(&self, node: &NodeId, response: bool) -> Result<(), Error> {
+		self.cluster.send(node, Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningConsensusMessage(SchnorrSigningConsensusMessage {
+			session: self.id.clone().into(),
+			sub_session: self.access_key.clone().into(),
+			session_nonce: self.nonce,
+			message: ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
+				is_confirmed: response,
+			})
+		})))
+	}
+}
+
+impl JobTransport for SigningJobTransport {
+	type PartialJobRequest=SchnorrPartialSigningRequest;
+	type PartialJobResponse=SchnorrPartialSigningResponse;
+
+	fn send_partial_request(&self, node: &NodeId, request: SchnorrPartialSigningRequest) -> Result<(), Error> {
+		self.cluster.send(node, Message::SchnorrSigning(SchnorrSigningMessage::SchnorrRequestPartialSignature(SchnorrRequestPartialSignature {
+			session: self.id.clone().into(),
+			sub_session: self.access_key.clone().into(),
+			session_nonce: self.nonce,
+			request_id: request.id.into(),
+			message_hash: request.message_hash.into(),
+			nodes: request.other_nodes_ids.into_iter().map(Into::into).collect(),
+		})))
+	}
+
+	fn send_partial_response(&self, node: &NodeId, response: SchnorrPartialSigningResponse) -> Result<(), Error> {
+		self.cluster.send(node, Message::SchnorrSigning(SchnorrSigningMessage::SchnorrPartialSignature(SchnorrPartialSignature {
+			session: self.id.clone().into(),
+			sub_session: self.access_key.clone().into(),
+			session_nonce: self.nonce,
+			request_id: response.request_id.into(),
+			partial_signature: response.partial_signature.into(),
+		})))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::sync::Arc;
+	use std::str::FromStr;
+	use std::collections::{BTreeSet, BTreeMap, VecDeque};
+	use ethereum_types::{Address, H256};
+	use ethkey::{self, Random, Generator, Public, Secret, KeyPair};
+	use acl_storage::DummyAclStorage;
+	use key_server_cluster::{NodeId, DummyKeyStorage, DocumentKeyShare, DocumentKeyShareVersion, SessionId,
+		Requester, SessionMeta, Error, KeyStorage};
+	use key_server_cluster::cluster_sessions::ClusterSession;
+	use key_server_cluster::cluster::tests::DummyCluster;
+	use key_server_cluster::generation_session::tests::MessageLoop as KeyGenerationMessageLoop;
+	use key_server_cluster::math;
+	use key_server_cluster::message::{Message, SchnorrSigningMessage, SchnorrSigningConsensusMessage, ConsensusMessage, ConfirmConsensusInitialization,
+		SchnorrSigningGenerationMessage, GenerationMessage, ConfirmInitialization, InitializeSession, SchnorrRequestPartialSignature};
+	use key_server_cluster::signing_session_schnorr::{SessionImpl, SessionState, SessionParams};
+
+	struct Node {
+		pub node_id: NodeId,
+		pub cluster: Arc<DummyCluster>,
+		pub key_storage: Arc<DummyKeyStorage>,
+		pub session: SessionImpl,
+	}
+
+	struct MessageLoop {
+		pub session_id: SessionId,
+		pub requester: KeyPair,
+		pub nodes: BTreeMap<NodeId, Node>,
+		pub queue: VecDeque<(NodeId, NodeId, Message)>,
+		pub acl_storages: Vec<Arc<DummyAclStorage>>,
+		pub version: H256,
+	}
+
+	impl MessageLoop {
+		pub fn new(gl: &KeyGenerationMessageLoop) -> Self {
+			let version = gl.nodes.values().nth(0).unwrap().key_storage.get(&Default::default()).unwrap().unwrap().versions.iter().last().unwrap().hash;
+			let mut nodes = BTreeMap::new();
+			let session_id = gl.session_id.clone();
+			let requester = Random.generate().unwrap();
+			let signature = Some(ethkey::sign(requester.secret(), &SessionId::default()).unwrap());
+			let master_node_id = gl.nodes.keys().nth(0).unwrap().clone();
+			let mut acl_storages = Vec::new();
+			for (i, (gl_node_id, gl_node)) in gl.nodes.iter().enumerate() {
+				let acl_storage = Arc::new(DummyAclStorage::default());
+				acl_storages.push(acl_storage.clone());
+				let cluster = Arc::new(DummyCluster::new(gl_node_id.clone()));
+				let session = SessionImpl::new(SessionParams {
+					meta: SessionMeta {
+						id: session_id.clone(),
+						self_node_id: gl_node_id.clone(),
+						master_node_id: master_node_id.clone(),
+						threshold: gl_node.key_storage.get(&session_id).unwrap().unwrap().threshold,
+					},
+					access_key: "834cb736f02d9c968dfaf0c37658a1d86ff140554fc8b59c9fdad5a8cf810eec".parse().unwrap(),
+					key_share: Some(gl_node.key_storage.get(&session_id).unwrap().unwrap()),
+					acl_storage: acl_storage,
+					cluster: cluster.clone(),
+					nonce: 0,
+				}, if i == 0 { signature.clone().map(Into::into) } else { None }).unwrap();
+				nodes.insert(gl_node_id.clone(), Node { node_id: gl_node_id.clone(), cluster: cluster, key_storage: gl_node.key_storage.clone(), session: session });
+			}
+
+			let nodes_ids: Vec<_> = nodes.keys().cloned().collect();
+			for node in nodes.values() {
+				for node_id in &nodes_ids {
+					node.cluster.add_node(node_id.clone());
+				}
+			}
+
+			MessageLoop {
+				session_id: session_id,
+				requester: requester,
+				nodes: nodes,
+				queue: VecDeque::new(),
+				acl_storages: acl_storages,
+				version: version,
+			}
+		}
+
+		pub fn master(&self) -> &SessionImpl {
+			&self.nodes.values().nth(0).unwrap().session
+		}
+
+		pub fn take_message(&mut self) -> Option<(NodeId, NodeId, Message)> {
+			self.nodes.values()
+				.filter_map(|n| n.cluster.take_message().map(|m| (n.node_id.clone(), m.0, m.1)))
+				.nth(0)
+				.or_else(|| self.queue.pop_front())
+		}
+
+		pub fn process_message(&mut self, mut msg: (NodeId, NodeId, Message)) -> Result<(), Error> {
+			let mut is_queued_message = false;
+			loop {
+				match self.nodes[&msg.1].session.on_message(&msg.0, &msg.2) {
+					Ok(_) => {
+						if let Some(message) = self.queue.pop_front() {
+							msg = message;
+							is_queued_message = true;
+							continue;
+						}
+						return Ok(());
+					},
+					Err(Error::TooEarlyForRequest) => {
+						if is_queued_message {
+							self.queue.push_front(msg);
+						} else {
+							self.queue.push_back(msg);
+						}
+						return Ok(());
+					},
+					Err(err) => return Err(err),
+				}
+			}
+		}
+
+		pub fn run_until<F: Fn(&MessageLoop) -> bool>(&mut self, predicate: F) -> Result<(), Error> {
+			while let Some((from, to, message)) = self.take_message() {
+				if predicate(self) {
+					return Ok(());
+				}
+
+				self.process_message((from, to, message))?;
+			}
+
+			unreachable!("either wrong predicate, or failing test")
+		}
+	}
+
+	fn prepare_signing_sessions(threshold: usize, num_nodes: usize) -> (KeyGenerationMessageLoop, MessageLoop) {
+		// run key generation sessions
+		let mut gl = KeyGenerationMessageLoop::new(num_nodes);
+		gl.master().initialize(Default::default(), false, threshold, gl.nodes.keys().cloned().collect::<BTreeSet<_>>().into()).unwrap();
+		while let Some((from, to, message)) = gl.take_message() {
+			gl.process_message((from, to, message)).unwrap();
+		}
+
+		// run signing session
+		let sl = MessageLoop::new(&gl);
+		(gl, sl)
+	}
+
+	#[test]
+	fn schnorr_complete_gen_sign_session() {
+		let test_cases = [(0, 1), (0, 5), (2, 5), (3, 5)];
+		for &(threshold, num_nodes) in &test_cases {
+			let (gl, mut sl) = prepare_signing_sessions(threshold, num_nodes);
+
+			// run signing session
+			let message_hash = H256::from(777);
+			sl.master().initialize(sl.version.clone(), message_hash).unwrap();
+			while let Some((from, to, message)) = sl.take_message() {
+				sl.process_message((from, to, message)).unwrap();
+			}
+
+			// verify signature
+			let public = gl.master().joint_public_and_secret().unwrap().unwrap().0;
+			let signature = sl.master().wait().unwrap();
+			assert!(math::verify_schnorr_signature(&public, &signature, &message_hash).unwrap());
+		}
+	}
+
+	#[test]
+	fn schnorr_constructs_in_cluster_of_single_node() {
+		let mut nodes = BTreeMap::new();
+		let self_node_id = Random.generate().unwrap().public().clone();
+		nodes.insert(self_node_id, Random.generate().unwrap().secret().clone());
+		match SessionImpl::new(SessionParams {
+			meta: SessionMeta {
+				id: SessionId::default(),
+				self_node_id: self_node_id.clone(),
+				master_node_id: self_node_id.clone(),
+				threshold: 0,
+			},
+			access_key: Random.generate().unwrap().secret().clone(),
+			key_share: Some(DocumentKeyShare {
+				author: Default::default(),
+				threshold: 0,
+				public: Default::default(),
+				common_point: Some(Random.generate().unwrap().public().clone()),
+				encrypted_point: Some(Random.generate().unwrap().public().clone()),
+				versions: vec![DocumentKeyShareVersion {
+					hash: Default::default(),
+					id_numbers: nodes,
+					secret_share: Random.generate().unwrap().secret().clone(),
+				}],
+			}),
+			acl_storage: Arc::new(DummyAclStorage::default()),
+			cluster: Arc::new(DummyCluster::new(self_node_id.clone())),
+			nonce: 0,
+		}, Some(Requester::Signature(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap()))) {
+			Ok(_) => (),
+			_ => panic!("unexpected"),
+		}
+	}
+
+	#[test]
+	fn schnorr_fails_to_initialize_if_does_not_have_a_share() {
+		let self_node_id = Random.generate().unwrap().public().clone();
+		let session = SessionImpl::new(SessionParams {
+			meta: SessionMeta {
+				id: SessionId::default(),
+				self_node_id: self_node_id.clone(),
+				master_node_id: self_node_id.clone(),
+				threshold: 0,
+			},
+			access_key: Random.generate().unwrap().secret().clone(),
+			key_share: None,
+			acl_storage: Arc::new(DummyAclStorage::default()),
+			cluster: Arc::new(DummyCluster::new(self_node_id.clone())),
+			nonce: 0,
+		}, Some(Requester::Signature(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap()))).unwrap();
+		assert_eq!(session.initialize(Default::default(), Default::default()), Err(Error::InvalidMessage));
+	}
+
+	#[test]
+	fn schnorr_fails_to_initialize_if_threshold_is_wrong() {
+		let mut nodes = BTreeMap::new();
+		let self_node_id = Random.generate().unwrap().public().clone();
+		nodes.insert(self_node_id.clone(), Random.generate().unwrap().secret().clone());
+		nodes.insert(Random.generate().unwrap().public().clone(), Random.generate().unwrap().secret().clone());
+		let session = SessionImpl::new(SessionParams {
+			meta: SessionMeta {
+				id: SessionId::default(),
+				self_node_id: self_node_id.clone(),
+				master_node_id: self_node_id.clone(),
+				threshold: 2,
+			},
+			access_key: Random.generate().unwrap().secret().clone(),
+			key_share: Some(DocumentKeyShare {
+				author: Default::default(),
+				threshold: 2,
+				public: Default::default(),
+				common_point: Some(Random.generate().unwrap().public().clone()),
+				encrypted_point: Some(Random.generate().unwrap().public().clone()),
+				versions: vec![DocumentKeyShareVersion {
+					hash: Default::default(),
+					id_numbers: nodes,
+					secret_share: Random.generate().unwrap().secret().clone(),
+				}],
+			}),
+			acl_storage: Arc::new(DummyAclStorage::default()),
+			cluster: Arc::new(DummyCluster::new(self_node_id.clone())),
+			nonce: 0,
+		}, Some(Requester::Signature(ethkey::sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap()))).unwrap();
+		assert_eq!(session.initialize(Default::default(), Default::default()), Err(Error::ConsensusUnreachable));
+	}
+
+	#[test]
+	fn schnorr_fails_to_initialize_when_already_initialized() {
+		let (_, sl) = prepare_signing_sessions(1, 3);
+		assert_eq!(sl.master().initialize(sl.version.clone(), 777.into()), Ok(()));
+		assert_eq!(sl.master().initialize(sl.version.clone(), 777.into()), Err(Error::InvalidStateForRequest));
+	}
+
+	#[test]
+	fn schnorr_does_not_fail_when_consensus_message_received_after_consensus_established() {
+		let (_, mut sl) = prepare_signing_sessions(1, 3);
+		sl.master().initialize(sl.version.clone(), 777.into()).unwrap();
+		// consensus is established
+		sl.run_until(|sl| sl.master().state() == SessionState::SessionKeyGeneration).unwrap();
+		// but 3rd node continues to send its messages
+		// this should not fail session
+		let consensus_group = sl.master().data.lock().consensus_session.select_consensus_group().unwrap().clone();
+		let mut had_3rd_message = false;
+		while let Some((from, to, message)) = sl.take_message() {
+			if !consensus_group.contains(&from) {
+				had_3rd_message = true;
+				sl.process_message((from, to, message)).unwrap();
+			}
+		}
+		assert!(had_3rd_message);
+	}
+
+	#[test]
+	fn schnorr_fails_when_consensus_message_is_received_when_not_initialized() {
+		let (_, sl) = prepare_signing_sessions(1, 3);
+		assert_eq!(sl.master().on_consensus_message(sl.nodes.keys().nth(1).unwrap(), &SchnorrSigningConsensusMessage {
+			session: SessionId::default().into(),
+			sub_session: sl.master().core.access_key.clone().into(),
+			session_nonce: 0,
+			message: ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
+				is_confirmed: true,
+			}),
+		}), Err(Error::InvalidStateForRequest));
+	}
+
+	#[test]
+	fn schnorr_fails_when_generation_message_is_received_when_not_initialized() {
+		let (_, sl) = prepare_signing_sessions(1, 3);
+		assert_eq!(sl.master().on_generation_message(sl.nodes.keys().nth(1).unwrap(), &SchnorrSigningGenerationMessage {
+			session: SessionId::default().into(),
+			sub_session: sl.master().core.access_key.clone().into(),
+			session_nonce: 0,
+			message: GenerationMessage::ConfirmInitialization(ConfirmInitialization {
+				session: SessionId::default().into(),
+				session_nonce: 0,
+				derived_point: Public::default().into(),
+			}),
+		}), Err(Error::InvalidStateForRequest));
+	}
+
+	#[test]
+	fn schnorr_fails_when_generation_sesson_is_initialized_by_slave_node() {
+		let (_, mut sl) = prepare_signing_sessions(1, 3);
+		sl.master().initialize(sl.version.clone(), 777.into()).unwrap();
+		sl.run_until(|sl| sl.master().state() == SessionState::SessionKeyGeneration).unwrap();
+
+		let slave2_id = sl.nodes.keys().nth(2).unwrap().clone();
+		let slave1 = &sl.nodes.values().nth(1).unwrap().session;
+
+		assert_eq!(slave1.on_generation_message(&slave2_id, &SchnorrSigningGenerationMessage {
+			session: SessionId::default().into(),
+			sub_session: sl.master().core.access_key.clone().into(),
+			session_nonce: 0,
+			message: GenerationMessage::InitializeSession(InitializeSession {
+				session: SessionId::default().into(),
+				session_nonce: 0,
+				author: Address::default().into(),
+				nodes: BTreeMap::new(),
+				is_zero: false,
+				threshold: 1,
+				derived_point: Public::default().into(),
+			})
+		}), Err(Error::InvalidMessage));
+	}
+
+	#[test]
+	fn schnorr_fails_when_signature_requested_when_not_initialized() {
+		let (_, sl) = prepare_signing_sessions(1, 3);
+		let slave1 = &sl.nodes.values().nth(1).unwrap().session;
+		assert_eq!(slave1.on_partial_signature_requested(sl.nodes.keys().nth(0).unwrap(), &SchnorrRequestPartialSignature {
+			session: SessionId::default().into(),
+			sub_session: sl.master().core.access_key.clone().into(),
+			session_nonce: 0,
+			request_id: Secret::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap().into(),
+			message_hash: H256::default().into(),
+			nodes: Default::default(),
+		}), Err(Error::InvalidStateForRequest));
+	}
+
+	#[test]
+	fn schnorr_fails_when_signature_requested_by_slave_node() {
+		let (_, sl) = prepare_signing_sessions(1, 3);
+		assert_eq!(sl.master().on_partial_signature_requested(sl.nodes.keys().nth(1).unwrap(), &SchnorrRequestPartialSignature {
+			session: SessionId::default().into(),
+			sub_session: sl.master().core.access_key.clone().into(),
+			session_nonce: 0,
+			request_id: Secret::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap().into(),
+			message_hash: H256::default().into(),
+			nodes: Default::default(),
+		}), Err(Error::InvalidMessage));
+	}
+
+	#[test]
+	fn schnorr_failed_signing_session() {
+		let (_, mut sl) = prepare_signing_sessions(1, 3);
+		sl.master().initialize(sl.version.clone(), 777.into()).unwrap();
+
+		// we need at least 2-of-3 nodes to agree to reach consensus
+		// let's say 2 of 3 nodes disagee
+		sl.acl_storages[1].prohibit(sl.requester.public().clone(), SessionId::default());
+		sl.acl_storages[2].prohibit(sl.requester.public().clone(), SessionId::default());
+
+		// then consensus is unreachable
+		assert_eq!(sl.run_until(|_| false), Err(Error::ConsensusUnreachable));
+	}
+
+	#[test]
+	fn schnorr_complete_signing_session_with_single_node_failing() {
+		let (_, mut sl) = prepare_signing_sessions(1, 3);
+		sl.master().initialize(sl.version.clone(), 777.into()).unwrap();
+
+		// we need at least 2-of-3 nodes to agree to reach consensus
+		// let's say 1 of 3 nodes disagee
+		sl.acl_storages[1].prohibit(sl.requester.public().clone(), SessionId::default());
+
+		// then consensus reachable, but single node will disagree
+		while let Some((from, to, message)) = sl.take_message() {
+			sl.process_message((from, to, message)).unwrap();
+		}
+
+		let data = sl.master().data.lock();
+		match data.result {
+			Some(Ok(_)) => (),
+			_ => unreachable!(),
+		}
+	}
+
+	#[test]
+	fn schnorr_complete_signing_session_with_acl_check_failed_on_master() {
+		let (_, mut sl) = prepare_signing_sessions(1, 3);
+		sl.master().initialize(sl.version.clone(), 777.into()).unwrap();
+
+		// we need at least 2-of-3 nodes to agree to reach consensus
+		// let's say 1 of 3 nodes disagee
+		sl.acl_storages[0].prohibit(sl.requester.public().clone(), SessionId::default());
+
+		// then consensus reachable, but single node will disagree
+		while let Some((from, to, message)) = sl.take_message() {
+			sl.process_message((from, to, message)).unwrap();
+		}
+
+		let data = sl.master().data.lock();
+		match data.result {
+			Some(Ok(_)) => (),
+			_ => unreachable!(),
+		}
+	}
+
+	#[test]
+	fn schnorr_signing_message_fails_when_nonce_is_wrong() {
+		let (_, sl) = prepare_signing_sessions(1, 3);
+		assert_eq!(sl.master().process_message(sl.nodes.keys().nth(1).unwrap(), &SchnorrSigningMessage::SchnorrSigningGenerationMessage(SchnorrSigningGenerationMessage {
+			session: SessionId::default().into(),
+			sub_session: sl.master().core.access_key.clone().into(),
+			session_nonce: 10,
+			message: GenerationMessage::ConfirmInitialization(ConfirmInitialization {
+				session: SessionId::default().into(),
+				session_nonce: 0,
+				derived_point: Public::default().into(),
+			}),
+		})), Err(Error::ReplayProtection));
+	}
+
+	#[test]
+	fn schnorr_signing_works_when_delegated_to_other_node() {
+		let (_, mut sl) = prepare_signing_sessions(1, 3);
+
+		// let's say node1 doesn't have a share && delegates decryption request to node0
+		// initially session is created on node1 => node1 is master for itself, but for other nodes node0 is still master
+		let actual_master = sl.nodes.keys().nth(0).cloned().unwrap();
+		let requested_node = sl.nodes.keys().skip(1).nth(0).cloned().unwrap();
+		let version = sl.nodes[&actual_master].key_storage.get(&Default::default()).unwrap().unwrap().last_version().unwrap().hash.clone();
+		sl.nodes[&requested_node].key_storage.remove(&Default::default()).unwrap();
+		sl.nodes.get_mut(&requested_node).unwrap().session.core.key_share = None;
+		sl.nodes.get_mut(&requested_node).unwrap().session.core.meta.master_node_id = sl.nodes[&requested_node].session.core.meta.self_node_id.clone();
+		sl.nodes[&requested_node].session.data.lock().consensus_session.consensus_job_mut().executor_mut().set_requester(
+			sl.nodes[&actual_master].session.data.lock().consensus_session.consensus_job().executor().requester().unwrap().clone()
+		);
+
+		// now let's try to do a decryption
+		sl.nodes[&requested_node].session.delegate(actual_master, version, Default::default()).unwrap();
+
+		// then consensus reachable, but single node will disagree
+		while let Some((from, to, message)) = sl.take_message() {
+			sl.process_message((from, to, message)).unwrap();
+		}
+	}
+
+	#[test]
+	fn schnorr_signing_works_when_share_owners_are_isolated() {
+		let (_, mut sl) = prepare_signing_sessions(1, 3);
+
+		// we need 2 out of 3 nodes to agree to do a decryption
+		// let's say that 1 of these nodes (master) is isolated
+		let isolated_node_id = sl.nodes.keys().skip(2).nth(0).cloned().unwrap();
+		for node in sl.nodes.values() {
+			node.cluster.remove_node(&isolated_node_id);
+		}
+
+		// now let's try to do a signing
+		sl.master().initialize(sl.version.clone(), 777.into()).unwrap();
+
+		// then consensus reachable, but single node will disagree
+		while let Some((from, to, message)) = sl.take_message() {
+			sl.process_message((from, to, message)).unwrap();
+		}
+
+		let data = sl.master().data.lock();
+		match data.result {
+			Some(Ok(_)) => (),
+			_ => unreachable!(),
+		}
+	}
+}
\ No newline at end of file
diff --git a/secret_store/src/key_server_cluster/cluster.rs b/secret_store/src/key_server_cluster/cluster.rs
index c267d1259939c74c89dc7eb9ea994e38f25ab478..2dcefea25ad3c14f7cd6d305cefd963b3728a494 100644
--- a/secret_store/src/key_server_cluster/cluster.rs
+++ b/secret_store/src/key_server_cluster/cluster.rs
@@ -20,27 +20,30 @@ use std::sync::Arc;
 use std::collections::{BTreeMap, BTreeSet};
 use std::collections::btree_map::Entry;
 use std::net::{SocketAddr, IpAddr};
-use futures::{finished, failed, Future, Stream, BoxFuture};
+use futures::{finished, failed, Future, Stream};
 use futures_cpupool::CpuPool;
 use parking_lot::{RwLock, Mutex};
 use tokio_io::IoFuture;
 use tokio_core::reactor::{Handle, Remote, Interval};
 use tokio_core::net::{TcpListener, TcpStream};
-use ethkey::{Public, KeyPair, Signature, Random, Generator};
-use util::H256;
-use key_server_cluster::{Error, NodeId, SessionId, AclStorage, KeyStorage, KeyServerSet, NodeKeyPair};
-use key_server_cluster::cluster_sessions::{ClusterSession, ClusterSessions, GenerationSessionWrapper, EncryptionSessionWrapper,
-	DecryptionSessionWrapper, SigningSessionWrapper};
-use key_server_cluster::message::{self, Message, ClusterMessage, GenerationMessage, EncryptionMessage, DecryptionMessage,
-	SigningMessage, ConsensusMessage};
-use key_server_cluster::generation_session::{Session as GenerationSession, SessionState as GenerationSessionState};
-#[cfg(test)]
-use key_server_cluster::generation_session::SessionImpl as GenerationSessionImpl;
-use key_server_cluster::decryption_session::{Session as DecryptionSession, DecryptionSessionId};
-use key_server_cluster::encryption_session::{Session as EncryptionSession, SessionState as EncryptionSessionState};
-use key_server_cluster::signing_session::{Session as SigningSession, SigningSessionId};
+use ethkey::{Public, KeyPair, Signature, Random, Generator, public_to_address};
+use ethereum_types::H256;
+use key_server_cluster::{Error, NodeId, SessionId, Requester, AclStorage, KeyStorage, KeyServerSet, NodeKeyPair};
+use key_server_cluster::cluster_sessions::{ClusterSession, AdminSession, ClusterSessions, SessionIdWithSubSession,
+	ClusterSessionsContainer, SERVERS_SET_CHANGE_SESSION_ID, create_cluster_view, AdminSessionCreationData, ClusterSessionsListener};
+use key_server_cluster::cluster_sessions_creator::{ClusterSessionCreator, IntoSessionId};
+use key_server_cluster::message::{self, Message, ClusterMessage};
+use key_server_cluster::generation_session::{SessionImpl as GenerationSession};
+use key_server_cluster::decryption_session::{SessionImpl as DecryptionSession};
+use key_server_cluster::encryption_session::{SessionImpl as EncryptionSession};
+use key_server_cluster::signing_session_ecdsa::{SessionImpl as EcdsaSigningSession};
+use key_server_cluster::signing_session_schnorr::{SessionImpl as SchnorrSigningSession};
+use key_server_cluster::key_version_negotiation_session::{SessionImpl as KeyVersionNegotiationSession,
+	IsolatedSessionTransport as KeyVersionNegotiationSessionTransport, ContinueAction};
 use key_server_cluster::io::{DeadlineStatus, ReadMessage, SharedTcpStream, read_encrypted_message, WriteMessage, write_encrypted_message};
 use key_server_cluster::net::{accept_connection as net_accept_connection, connect as net_connect, Connection as NetConnection};
+use key_server_cluster::connection_trigger::{Maintain, ConnectionTrigger, SimpleConnectionTrigger, ServersSetChangeSessionCreatorConnector};
+use key_server_cluster::connection_trigger_with_migration::ConnectionTriggerWithMigration;
 
 /// Maintain interval (seconds). Every MAINTAIN_INTERVAL seconds node:
 /// 1) checks if connected nodes are responding to KeepAlive messages
@@ -55,9 +58,8 @@ const KEEP_ALIVE_SEND_INTERVAL: u64 = 30;
 /// we must treat this node as non-responding && disconnect from it.
 const KEEP_ALIVE_DISCONNECT_INTERVAL: u64 = 60;
 
-/// Encryption sesion timeout interval. It works
 /// Empty future.
-type BoxedEmptyFuture = BoxFuture<(), ()>;
+pub type BoxedEmptyFuture = Box<Future<Item = (), Error = ()> + Send>;
 
 /// Cluster interface for external clients.
 pub trait ClusterClient: Send + Sync {
@@ -66,33 +68,49 @@ pub trait ClusterClient: Send + Sync {
 	/// Start new generation session.
 	fn new_generation_session(&self, session_id: SessionId, author: Public, threshold: usize) -> Result<Arc<GenerationSession>, Error>;
 	/// Start new encryption session.
-	fn new_encryption_session(&self, session_id: SessionId, requestor_signature: Signature, common_point: Public, encrypted_point: Public) -> Result<Arc<EncryptionSession>, Error>;
+	fn new_encryption_session(&self, session_id: SessionId, requester: Requester, common_point: Public, encrypted_point: Public) -> Result<Arc<EncryptionSession>, Error>;
 	/// Start new decryption session.
-	fn new_decryption_session(&self, session_id: SessionId, requestor_signature: Signature, is_shadow_decryption: bool) -> Result<Arc<DecryptionSession>, Error>;
-	/// Start new signing session.
-	fn new_signing_session(&self, session_id: SessionId, requestor_signature: Signature, message_hash: H256) -> Result<Arc<SigningSession>, Error>;
+	fn new_decryption_session(&self, session_id: SessionId, requester: Requester, version: Option<H256>, is_shadow_decryption: bool) -> Result<Arc<DecryptionSession>, Error>;
+	/// Start new Schnorr signing session.
+	fn new_schnorr_signing_session(&self, session_id: SessionId, requester: Requester, version: Option<H256>, message_hash: H256) -> Result<Arc<SchnorrSigningSession>, Error>;
+	/// Start new ECDSA session.
+	fn new_ecdsa_signing_session(&self, session_id: SessionId, requester: Requester, version: Option<H256>, message_hash: H256) -> Result<Arc<EcdsaSigningSession>, Error>;
+	/// Start new key version negotiation session.
+	fn new_key_version_negotiation_session(&self, session_id: SessionId) -> Result<Arc<KeyVersionNegotiationSession<KeyVersionNegotiationSessionTransport>>, Error>;
+	/// Start new servers set change session.
+	fn new_servers_set_change_session(&self, session_id: Option<SessionId>, migration_id: Option<H256>, new_nodes_set: BTreeSet<NodeId>, old_set_signature: Signature, new_set_signature: Signature) -> Result<Arc<AdminSession>, Error>;
+
+	/// Listen for new generation sessions.
+	fn add_generation_listener(&self, listener: Arc<ClusterSessionsListener<GenerationSession>>);
 
-	#[cfg(test)]
 	/// Ask node to make 'faulty' generation sessions.
-	fn make_faulty_generation_sessions(&self);
 	#[cfg(test)]
+	fn make_faulty_generation_sessions(&self);
 	/// Get active generation session with given id.
-	fn generation_session(&self, session_id: &SessionId) -> Option<Arc<GenerationSessionImpl>>;
 	#[cfg(test)]
+	fn generation_session(&self, session_id: &SessionId) -> Option<Arc<GenerationSession>>;
 	/// Try connect to disconnected nodes.
+	#[cfg(test)]
 	fn connect(&self);
+	/// Get key storage.
+	#[cfg(test)]
+	fn key_storage(&self) -> Arc<KeyStorage>;
 }
 
-/// Cluster access for single encryption/decryption/signing participant.
+/// Cluster access for single session participant.
 pub trait Cluster: Send + Sync {
 	/// Broadcast message to all other nodes.
 	fn broadcast(&self, message: Message) -> Result<(), Error>;
 	/// Send message to given node.
 	fn send(&self, to: &NodeId, message: Message) -> Result<(), Error>;
+	/// Is connected to given node?
+	fn is_connected(&self, node: &NodeId) -> bool;
+	/// Get a set of connected nodes.
+	fn nodes(&self) -> BTreeSet<NodeId>;
 }
 
-#[derive(Clone)]
 /// Cluster initialization parameters.
+#[derive(Clone)]
 pub struct ClusterConfiguration {
 	/// Number of threads reserved by cluster.
 	pub threads: usize,
@@ -108,6 +126,11 @@ pub struct ClusterConfiguration {
 	pub key_storage: Arc<KeyStorage>,
 	/// Reference to ACL storage
 	pub acl_storage: Arc<AclStorage>,
+	/// Administrator public key.
+	pub admin_public: Option<Public>,
+	/// Should key servers set change session should be started when servers set changes.
+	/// This will only work when servers set is configured using KeyServerSet contract.
+	pub auto_migrate_enabled: bool,
 }
 
 /// Cluster state.
@@ -140,29 +163,34 @@ pub struct ClusterView {
 /// Cross-thread shareable cluster data.
 pub struct ClusterData {
 	/// Cluster configuration.
-	config: ClusterConfiguration,
+	pub config: ClusterConfiguration,
 	/// Handle to the event loop.
-	handle: Remote,
+	pub handle: Remote,
 	/// Handle to the cpu thread pool.
-	pool: CpuPool,
+	pub pool: CpuPool,
 	/// KeyPair this node holds.
-	self_key_pair: Arc<NodeKeyPair>,
+	pub self_key_pair: Arc<NodeKeyPair>,
 	/// Connections data.
-	connections: ClusterConnections,
+	pub connections: ClusterConnections,
 	/// Active sessions data.
-	sessions: ClusterSessions,
+	pub sessions: ClusterSessions,
 }
 
-/// Connections that are forming the cluster.
+/// Connections that are forming the cluster. Lock order: trigger.lock() -> data.lock().
 pub struct ClusterConnections {
 	/// Self node id.
 	pub self_node_id: NodeId,
 	/// All known other key servers.
 	pub key_server_set: Arc<KeyServerSet>,
+	/// Connections trigger.
+	pub trigger: Mutex<Box<ConnectionTrigger>>,
+	/// Servers set change session creator connector.
+	pub connector: Arc<ServersSetChangeSessionCreatorConnector>,
 	/// Connections data.
 	pub data: RwLock<ClusterConnectionsData>,
 }
 
+#[derive(Default)]
 /// Cluster connections data.
 pub struct ClusterConnectionsData {
 	/// Active key servers set.
@@ -199,7 +227,8 @@ impl ClusterCore {
 	pub fn new(handle: Handle, config: ClusterConfiguration) -> Result<Arc<Self>, Error> {
 		let listen_address = make_socket_address(&config.listen_address.0, config.listen_address.1)?;
 		let connections = ClusterConnections::new(&config)?;
-		let sessions = ClusterSessions::new(&config);
+		let servers_set_change_creator_connector = connections.connector.clone();
+		let sessions = ClusterSessions::new(&config, servers_set_change_creator_connector);
 		let data = ClusterData::new(&handle, config, connections, sessions);
 
 		Ok(Arc::new(ClusterCore {
@@ -214,14 +243,14 @@ impl ClusterCore {
 		Arc::new(ClusterClientImpl::new(self.data.clone()))
 	}
 
-	#[cfg(test)]
 	/// Get cluster configuration.
+	#[cfg(test)]
 	pub fn config(&self) -> &ClusterConfiguration {
 		&self.data.config
 	}
 
-	#[cfg(test)]
 	/// Get connection to given node.
+	#[cfg(test)]
 	pub fn connection(&self, node: &NodeId) -> Option<Arc<Connection>> {
 		self.data.connection(node)
 	}
@@ -261,23 +290,21 @@ impl ClusterCore {
 	/// Connect to socket using given context and handle.
 	fn connect_future(handle: &Handle, data: Arc<ClusterData>, node_address: SocketAddr) -> BoxedEmptyFuture {
 		let disconnected_nodes = data.connections.disconnected_nodes().keys().cloned().collect();
-		net_connect(&node_address, handle, data.self_key_pair.clone(), disconnected_nodes)
+		Box::new(net_connect(&node_address, handle, data.self_key_pair.clone(), disconnected_nodes)
 			.then(move |result| ClusterCore::process_connection_result(data, Some(node_address), result))
-			.then(|_| finished(()))
-			.boxed()
+			.then(|_| finished(())))
 	}
 
 	/// Start listening for incoming connections.
 	fn listen(handle: &Handle, data: Arc<ClusterData>, listen_address: SocketAddr) -> Result<BoxedEmptyFuture, Error> {
-		Ok(TcpListener::bind(&listen_address, &handle)?
+		Ok(Box::new(TcpListener::bind(&listen_address, &handle)?
 			.incoming()
 			.and_then(move |(stream, node_address)| {
 				ClusterCore::accept_connection(data.clone(), stream, node_address);
 				Ok(())
 			})
 			.for_each(|_| Ok(()))
-			.then(|_| finished(()))
-			.boxed())
+			.then(|_| finished(()))))
 	}
 
 	/// Accept connection.
@@ -289,21 +316,19 @@ impl ClusterCore {
 
 	/// Accept connection future.
 	fn accept_connection_future(handle: &Handle, data: Arc<ClusterData>, stream: TcpStream, node_address: SocketAddr) -> BoxedEmptyFuture {
-		net_accept_connection(node_address, stream, handle, data.self_key_pair.clone())
+		Box::new(net_accept_connection(node_address, stream, handle, data.self_key_pair.clone())
 			.then(move |result| ClusterCore::process_connection_result(data, None, result))
-			.then(|_| finished(()))
-			.boxed()
+			.then(|_| finished(())))
 	}
 
 	/// Schedule mainatain procedures.
 	fn schedule_maintain(handle: &Handle, data: Arc<ClusterData>) {
 		let d = data.clone();
-		let interval: BoxedEmptyFuture = Interval::new(time::Duration::new(MAINTAIN_INTERVAL, 0), handle)
+		let interval: BoxedEmptyFuture = Box::new(Interval::new(time::Duration::new(MAINTAIN_INTERVAL, 0), handle)
 			.expect("failed to create interval")
 			.and_then(move |_| Ok(ClusterCore::maintain(data.clone())))
 			.for_each(|_| Ok(()))
-			.then(|_| finished(()))
-			.boxed();
+			.then(|_| finished(())));
 
 		d.spawn(interval);
 	}
@@ -319,7 +344,7 @@ impl ClusterCore {
 
 	/// Called for every incomming mesage.
 	fn process_connection_messages(data: Arc<ClusterData>, connection: Arc<Connection>) -> IoFuture<Result<(), Error>> {
-		connection
+		Box::new(connection
 			.read_message()
 			.then(move |result|
 				match result {
@@ -327,30 +352,31 @@ impl ClusterCore {
 						ClusterCore::process_connection_message(data.clone(), connection.clone(), message);
 						// continue serving connection
 						data.spawn(ClusterCore::process_connection_messages(data.clone(), connection));
-						finished(Ok(())).boxed()
+						Box::new(finished(Ok(())))
 					},
 					Ok((_, Err(err))) => {
-						warn!(target: "secretstore_net", "{}: protocol error {} when reading message from node {}", data.self_key_pair.public(), err, connection.node_id());
+						warn!(target: "secretstore_net", "{}: protocol error '{}' when reading message from node {}", data.self_key_pair.public(), err, connection.node_id());
 						// continue serving connection
 						data.spawn(ClusterCore::process_connection_messages(data.clone(), connection));
-						finished(Err(err)).boxed()
+						Box::new(finished(Err(err)))
 					},
 					Err(err) => {
-						warn!(target: "secretstore_net", "{}: network error {} when reading message from node {}", data.self_key_pair.public(), err, connection.node_id());
+						warn!(target: "secretstore_net", "{}: network error '{}' when reading message from node {}", data.self_key_pair.public(), err, connection.node_id());
 						// close connection
-						data.connections.remove(connection.node_id(), connection.is_inbound());
-						failed(err).boxed()
+						data.connections.remove(data.clone(), connection.node_id(), connection.is_inbound());
+						Box::new(failed(err))
 					},
 				}
-			).boxed()
+			))
 	}
 
 	/// Send keepalive messages to every othe node.
 	fn keep_alive(data: Arc<ClusterData>) {
+		data.sessions.sessions_keep_alive();
 		for connection in data.connections.active_connections() {
 			let last_message_diff = time::Instant::now() - connection.last_message_time();
 			if last_message_diff > time::Duration::from_secs(KEEP_ALIVE_DISCONNECT_INTERVAL) {
-				data.connections.remove(connection.node_id(), connection.is_inbound());
+				data.connections.remove(data.clone(), connection.node_id(), connection.is_inbound());
 				data.sessions.on_connection_timeout(connection.node_id());
 			}
 			else if last_message_diff > time::Duration::from_secs(KEEP_ALIVE_SEND_INTERVAL) {
@@ -361,7 +387,12 @@ impl ClusterCore {
 
 	/// Try to connect to every disconnected node.
 	fn connect_disconnected_nodes(data: Arc<ClusterData>) {
-		data.connections.update_nodes_set();
+		let r = data.connections.update_nodes_set(data.clone());
+		if let Some(r) = r {
+			data.spawn(r);
+		}
+
+		// connect to disconnected nodes
 		for (node_id, node_address) in data.connections.disconnected_nodes() {
 			if data.config.allow_connecting_to_higher_nodes || data.self_key_pair.public() < &node_id {
 				ClusterCore::connect(data.clone(), node_address);
@@ -374,29 +405,29 @@ impl ClusterCore {
 		match result {
 			Ok(DeadlineStatus::Meet(Ok(connection))) => {
 				let connection = Connection::new(outbound_addr.is_none(), connection);
-				if data.connections.insert(connection.clone()) {
+				if data.connections.insert(data.clone(), connection.clone()) {
 					ClusterCore::process_connection_messages(data.clone(), connection)
 				} else {
-					finished(Ok(())).boxed()
+					Box::new(finished(Ok(())))
 				}
 			},
 			Ok(DeadlineStatus::Meet(Err(err))) => {
-				warn!(target: "secretstore_net", "{}: protocol error {} when establishing {} connection{}",
+				warn!(target: "secretstore_net", "{}: protocol error '{}' when establishing {} connection{}",
 					data.self_key_pair.public(), err, if outbound_addr.is_some() { "outbound" } else { "inbound" },
 					outbound_addr.map(|a| format!(" with {}", a)).unwrap_or_default());
-				finished(Ok(())).boxed()
+				Box::new(finished(Ok(())))
 			},
 			Ok(DeadlineStatus::Timeout) => {
 				warn!(target: "secretstore_net", "{}: timeout when establishing {} connection{}",
 					data.self_key_pair.public(), if outbound_addr.is_some() { "outbound" } else { "inbound" },
 					outbound_addr.map(|a| format!(" with {}", a)).unwrap_or_default());
-				finished(Ok(())).boxed()
+				Box::new(finished(Ok(())))
 			},
 			Err(err) => {
-				warn!(target: "secretstore_net", "{}: network error {} when establishing {} connection{}",
+				warn!(target: "secretstore_net", "{}: network error '{}' when establishing {} connection{}",
 					data.self_key_pair.public(), err, if outbound_addr.is_some() { "outbound" } else { "inbound" },
 					outbound_addr.map(|a| format!(" with {}", a)).unwrap_or_default());
-				finished(Ok(())).boxed()
+				Box::new(finished(Ok(())))
 			},
 		}
 	}
@@ -405,265 +436,193 @@ impl ClusterCore {
 	fn process_connection_message(data: Arc<ClusterData>, connection: Arc<Connection>, message: Message) {
 		connection.set_last_message_time(time::Instant::now());
 		trace!(target: "secretstore_net", "{}: received message {} from {}", data.self_key_pair.public(), message, connection.node_id());
+		// error is ignored as we only process errors on session level
 		match message {
-			Message::Generation(message) => ClusterCore::process_generation_message(data, connection, message),
-			Message::Encryption(message) => ClusterCore::process_encryption_message(data, connection, message),
-			Message::Decryption(message) => ClusterCore::process_decryption_message(data, connection, message),
-			Message::Signing(message) => ClusterCore::process_signing_message(data, connection, message),
-			Message::Cluster(message) => ClusterCore::process_cluster_message(data, connection, message),
-		}
-	}
-
-	/// Process single generation message from the connection.
-	fn process_generation_message(data: Arc<ClusterData>, connection: Arc<Connection>, mut message: GenerationMessage) {
-		let session_id = message.session_id().clone();
-		let mut sender = connection.node_id().clone();
-		let session = match message {
-			GenerationMessage::InitializeSession(_) => {
-				let mut connected_nodes = data.connections.connected_nodes();
-				connected_nodes.insert(data.self_key_pair.public().clone());
-
-				let cluster = Arc::new(ClusterView::new(data.clone(), connected_nodes));
-				data.sessions.new_generation_session(sender.clone(), session_id.clone(), cluster)
-			},
-			_ => {
-				data.sessions.generation_sessions.get(&session_id)
-					.ok_or(Error::InvalidSessionId)
-			},
-		};
-
-		let mut is_queued_message = false;
-		loop {
-			match session.clone().and_then(|session| session.process_message(&sender, &message)) {
-				Ok(_) => {
-					// if session is completed => stop
-					let session = session.clone().expect("session.method() call finished with success; session exists; qed");
-					let session_state = session.state();
-					if session_state == GenerationSessionState::Finished {
-						info!(target: "secretstore_net", "{}: generation session completed", data.self_key_pair.public());
+			Message::Generation(message) => Self::process_message(&data, &data.sessions.generation_sessions, connection, Message::Generation(message))
+				.map(|_| ()).unwrap_or_default(),
+			Message::Encryption(message) => Self::process_message(&data, &data.sessions.encryption_sessions, connection, Message::Encryption(message))
+				.map(|_| ()).unwrap_or_default(),
+			Message::Decryption(message) => Self::process_message(&data, &data.sessions.decryption_sessions, connection, Message::Decryption(message))
+				.map(|_| ()).unwrap_or_default(),
+			Message::SchnorrSigning(message) => Self::process_message(&data, &data.sessions.schnorr_signing_sessions, connection, Message::SchnorrSigning(message))
+				.map(|_| ()).unwrap_or_default(),
+			Message::EcdsaSigning(message) => Self::process_message(&data, &data.sessions.ecdsa_signing_sessions, connection, Message::EcdsaSigning(message))
+				.map(|_| ()).unwrap_or_default(),
+			Message::ServersSetChange(message) => {
+				let message = Message::ServersSetChange(message);
+				let is_initialization_message = message.is_initialization_message();
+				let session = Self::process_message(&data, &data.sessions.admin_sessions, connection, message);
+				if is_initialization_message {
+					if let Some(session) = session {
+						data.connections.servers_set_change_creator_connector().set_key_servers_set_change_session(session.clone());
 					}
-					if session_state == GenerationSessionState::Finished || session_state == GenerationSessionState::Failed {
-						data.sessions.generation_sessions.remove(&session_id);
-						break;
-					}
-
-					// try to dequeue message
-					match data.sessions.generation_sessions.dequeue_message(&session_id) {
-						Some((msg_sender, msg)) => {
-							is_queued_message = true;
-							sender = msg_sender;
-							message = msg;
-						},
-						None => break,
-					}
-				},
-				Err(Error::TooEarlyForRequest) => {
-					data.sessions.generation_sessions.enqueue_message(&session_id, sender, message, is_queued_message);
-					break;
-				},
-				Err(err) => {
-					warn!(target: "secretstore_net", "{}: generation session error {} when processing message {} from node {}", data.self_key_pair.public(), err, message, sender);
-					data.sessions.respond_with_generation_error(&session_id, message::SessionError {
-						session: session_id.clone().into(),
-						error: format!("{:?}", err),
-					});
-					if err != Error::InvalidSessionId {
-						data.sessions.generation_sessions.remove(&session_id);
-					}
-					break;
-				},
+				}
 			}
+			Message::KeyVersionNegotiation(message) => {
+				let session = Self::process_message(&data, &data.sessions.negotiation_sessions, connection, Message::KeyVersionNegotiation(message));
+				Self::try_continue_session(&data, session);
+			},
+			Message::ShareAdd(message) => Self::process_message(&data, &data.sessions.admin_sessions, connection, Message::ShareAdd(message))
+				.map(|_| ()).unwrap_or_default(),
+			Message::Cluster(message) => ClusterCore::process_cluster_message(data, connection, message),
 		}
 	}
 
-	/// Process single encryption message from the connection.
-	fn process_encryption_message(data: Arc<ClusterData>, connection: Arc<Connection>, mut message: EncryptionMessage) {
-		let session_id = message.session_id().clone();
-		let mut sender = connection.node_id().clone();
-		let session = match message {
-			EncryptionMessage::InitializeEncryptionSession(_) => {
-				let mut connected_nodes = data.connections.connected_nodes();
-				connected_nodes.insert(data.self_key_pair.public().clone());
-
-				let cluster = Arc::new(ClusterView::new(data.clone(), connected_nodes));
-				data.sessions.new_encryption_session(sender.clone(), session_id.clone(), cluster)
-			},
-			_ => {
-				data.sessions.encryption_sessions.get(&session_id)
-					.ok_or(Error::InvalidSessionId)
-			},
-		};
-
-		let mut is_queued_message = false;
-		loop {
-			match session.clone().and_then(|session| match message {
-				EncryptionMessage::InitializeEncryptionSession(ref message) =>
-					session.on_initialize_session(sender.clone(), message),
-				EncryptionMessage::ConfirmEncryptionInitialization(ref message) =>
-					session.on_confirm_initialization(sender.clone(), message),
-				EncryptionMessage::EncryptionSessionError(ref message) =>
-					session.on_session_error(sender.clone(), message),
-			}) {
-				Ok(_) => {
-					// if session is completed => stop
-					let session = session.clone().expect("session.method() call finished with success; session exists; qed");
-					let session_state = session.state();
-					if session_state == EncryptionSessionState::Finished {
-						info!(target: "secretstore_net", "{}: encryption session completed", data.self_key_pair.public());
-					}
-					if session_state == EncryptionSessionState::Finished || session_state == EncryptionSessionState::Failed {
-						data.sessions.encryption_sessions.remove(&session_id);
-						break;
-					}
-
-					// try to dequeue message
-					match data.sessions.encryption_sessions.dequeue_message(&session_id) {
-						Some((msg_sender, msg)) => {
-							is_queued_message = true;
-							sender = msg_sender;
-							message = msg;
+	/// Try to contnue session.
+	fn try_continue_session(data: &Arc<ClusterData>, session: Option<Arc<KeyVersionNegotiationSession<KeyVersionNegotiationSessionTransport>>>) {
+		if let Some(session) = session {
+			let meta = session.meta();
+			let is_master_node = meta.self_node_id == meta.master_node_id;
+			if is_master_node && session.is_finished() {
+				data.sessions.negotiation_sessions.remove(&session.id());
+				match session.wait() {
+					Ok((version, master)) => match session.take_continue_action() {
+						Some(ContinueAction::Decrypt(session, is_shadow_decryption)) => {
+							let initialization_error = if data.self_key_pair.public() == &master {
+								session.initialize(version, is_shadow_decryption, false)
+							} else {
+								session.delegate(master, version, is_shadow_decryption, false)
+							};
+
+							if let Err(error) = initialization_error {
+								session.on_session_error(&meta.self_node_id, error);
+								data.sessions.decryption_sessions.remove(&session.id());
+							}
 						},
-						None => break,
-					}
-				},
-				Err(Error::TooEarlyForRequest) => {
-					data.sessions.encryption_sessions.enqueue_message(&session_id, sender, message, is_queued_message);
-					break;
-				},
-				Err(err) => {
-					warn!(target: "secretstore_net", "{}: encryption session error {} when processing message {} from node {}", data.self_key_pair.public(), err, message, sender);
-					data.sessions.respond_with_encryption_error(&session_id, message::EncryptionSessionError {
-						session: session_id.clone().into(),
-						error: format!("{:?}", err),
-					});
-					if err != Error::InvalidSessionId {
-						data.sessions.encryption_sessions.remove(&session_id);
-					}
-					break;
-				},
+						Some(ContinueAction::SchnorrSign(session, message_hash)) => {
+							let initialization_error = if data.self_key_pair.public() == &master {
+								session.initialize(version, message_hash)
+							} else {
+								session.delegate(master, version, message_hash)
+							};
+
+							if let Err(error) = initialization_error {
+								session.on_session_error(&meta.self_node_id, error);
+								data.sessions.schnorr_signing_sessions.remove(&session.id());
+							}
+						},
+						Some(ContinueAction::EcdsaSign(session, message_hash)) => {
+							let initialization_error = if data.self_key_pair.public() == &master {
+								session.initialize(version, message_hash)
+							} else {
+								session.delegate(master, version, message_hash)
+							};
+
+							if let Err(error) = initialization_error {
+								session.on_session_error(&meta.self_node_id, error);
+								data.sessions.ecdsa_signing_sessions.remove(&session.id());
+							}
+						},
+						None => (),
+					},
+					Err(error) => match session.take_continue_action() {
+						Some(ContinueAction::Decrypt(session, _)) => {
+							data.sessions.decryption_sessions.remove(&session.id());
+							session.on_session_error(&meta.self_node_id, error);
+						},
+						Some(ContinueAction::SchnorrSign(session, _)) => {
+							data.sessions.schnorr_signing_sessions.remove(&session.id());
+							session.on_session_error(&meta.self_node_id, error);
+						},
+						Some(ContinueAction::EcdsaSign(session, _)) => {
+							data.sessions.ecdsa_signing_sessions.remove(&session.id());
+							session.on_session_error(&meta.self_node_id, error);
+						},
+						None => (),
+					},
+				}
 			}
 		}
 	}
 
-	/// Process single decryption message from the connection.
-	fn process_decryption_message(data: Arc<ClusterData>, connection: Arc<Connection>, mut message: DecryptionMessage) {
-		let session_id = message.session_id().clone();
-		let sub_session_id = message.sub_session_id().clone();
-		let decryption_session_id = DecryptionSessionId::new(session_id.clone(), sub_session_id.clone());
-		let mut sender = connection.node_id().clone();
-		let session = match message {
-			DecryptionMessage::DecryptionConsensusMessage(ref message) if match message.message {
-				ConsensusMessage::InitializeConsensusSession(_) => true,
+	/// Get or insert new session.
+	fn prepare_session<S: ClusterSession, SC: ClusterSessionCreator<S, D>, D>(data: &Arc<ClusterData>, sessions: &ClusterSessionsContainer<S, SC, D>, sender: &NodeId, message: &Message) -> Result<Arc<S>, Error>
+		where Message: IntoSessionId<S::Id> {
+		fn requires_all_connections(message: &Message) -> bool {
+			match *message {
+				Message::Generation(_) => true,
+				Message::ShareAdd(_) => true,
+				Message::ServersSetChange(_) => true,
 				_ => false,
-			} => {
-				let mut connected_nodes = data.connections.connected_nodes();
-				connected_nodes.insert(data.self_key_pair.public().clone());
+			}
+		}
 
-				let cluster = Arc::new(ClusterView::new(data.clone(), connected_nodes));
-				data.sessions.new_decryption_session(sender.clone(), session_id.clone(), sub_session_id.clone(), cluster, None)
-			},
-			_ => {
-				data.sessions.decryption_sessions.get(&decryption_session_id)
-					.ok_or(Error::InvalidSessionId)
+		// get or create new session, if required
+		let session_id = message.into_session_id().expect("into_session_id fails for cluster messages only; only session messages are passed to prepare_session; qed");
+		let is_initialization_message = message.is_initialization_message();
+		let is_delegation_message = message.is_delegation_message();
+		match is_initialization_message || is_delegation_message {
+			false => sessions.get(&session_id, true).ok_or(Error::InvalidSessionId),
+			true => {
+				let creation_data = SC::creation_data_from_message(&message)?;
+				let master = if is_initialization_message { sender.clone() } else { data.self_key_pair.public().clone() };
+				let cluster = create_cluster_view(data, requires_all_connections(&message))?;
+
+				sessions.insert(cluster, master, session_id, Some(message.session_nonce().ok_or(Error::InvalidMessage)?), message.is_exclusive_session_message(), creation_data)
 			},
-		};
-
-		loop {
-			match session.clone().and_then(|session| session.process_message(&sender, &message)) {
-				Ok(_) => {
-					// if session is completed => stop
-					let session = session.clone().expect("session.method() call finished with success; session exists; qed");
-					if session.is_finished() {
-						info!(target: "secretstore_net", "{}: decryption session completed", data.self_key_pair.public());
-						data.sessions.decryption_sessions.remove(&decryption_session_id);
-						break;
-					}
-
-					// try to dequeue message
-					match data.sessions.decryption_sessions.dequeue_message(&decryption_session_id) {
-						Some((msg_sender, msg)) => {
-							sender = msg_sender;
-							message = msg;
-						},
-						None => break,
-					}
-				},
-				Err(err) => {
-					warn!(target: "secretstore_net", "{}: decryption session error {} when processing message {} from node {}", data.self_key_pair.public(), err, message, sender);
-					data.sessions.respond_with_decryption_error(&session_id, &sub_session_id, &sender, message::DecryptionSessionError {
-						session: session_id.clone().into(),
-						sub_session: sub_session_id.clone().into(),
-						error: format!("{:?}", err),
-					});
-					if err != Error::InvalidSessionId {
-						data.sessions.decryption_sessions.remove(&decryption_session_id);
-					}
-					break;
-				},
-			}
 		}
 	}
 
-	/// Process singlesigning message from the connection.
-	fn process_signing_message(data: Arc<ClusterData>, connection: Arc<Connection>, mut message: SigningMessage) {
-		let session_id = message.session_id().clone();
-		let sub_session_id = message.sub_session_id().clone();
-		let signing_session_id = SigningSessionId::new(session_id.clone(), sub_session_id.clone());
-		let mut sender = connection.node_id().clone();
-		let session = match message {
-			SigningMessage::SigningConsensusMessage(ref message) if match message.message {
-				ConsensusMessage::InitializeConsensusSession(_) => true,
-				_ => false,
-			} => {
-				let mut connected_nodes = data.connections.connected_nodes();
-				connected_nodes.insert(data.self_key_pair.public().clone());
+	/// Process single session message from connection.
+	fn process_message<S: ClusterSession, SC: ClusterSessionCreator<S, D>, D>(data: &Arc<ClusterData>, sessions: &ClusterSessionsContainer<S, SC, D>, connection: Arc<Connection>, mut message: Message) -> Option<Arc<S>>
+		where Message: IntoSessionId<S::Id> {
 
-				let cluster = Arc::new(ClusterView::new(data.clone(), connected_nodes));
-				data.sessions.new_signing_session(sender.clone(), session_id.clone(), sub_session_id.clone(), cluster, None)
-			},
-			_ => {
-				data.sessions.signing_sessions.get(&signing_session_id)
-					.ok_or(Error::InvalidSessionId)
+		// get or create new session, if required
+		let mut sender = connection.node_id().clone();
+		let session = Self::prepare_session(data, sessions, &sender, &message);
+		// send error if session is not found, or failed to create
+		let session = match session {
+			Ok(session) => session,
+			Err(error) => {
+				// this is new session => it is not yet in container
+				warn!(target: "secretstore_net", "{}: {} session read error '{}' when requested for session from node {}",
+					data.self_key_pair.public(), S::type_name(), error, sender);
+				if !message.is_error_message() {
+					let session_id = message.into_session_id().expect("session_id only fails for cluster messages; only session messages are passed to process_message; qed");
+					let session_nonce = message.session_nonce().expect("session_nonce only fails for cluster messages; only session messages are passed to process_message; qed");
+					data.spawn(connection.send_message(SC::make_error_message(session_id, session_nonce, error)));
+				}
+				return None;
 			},
 		};
 
+		let session_id = session.id();
 		let mut is_queued_message = false;
 		loop {
-			match session.clone().and_then(|session| session.process_message(&sender, &message)) {
+			let message_result = session.on_message(&sender, &message);
+			match message_result {
 				Ok(_) => {
 					// if session is completed => stop
-					let session = session.clone().expect("session.method() call finished with success; session exists; qed");
 					if session.is_finished() {
-						info!(target: "secretstore_net", "{}: signing session completed", data.self_key_pair.public());
-						data.sessions.signing_sessions.remove(&signing_session_id);
-						break;
+						info!(target: "secretstore_net", "{}: {} session completed", data.self_key_pair.public(), S::type_name());
+						sessions.remove(&session_id);
+						return Some(session);
 					}
 
 					// try to dequeue message
-					match data.sessions.signing_sessions.dequeue_message(&signing_session_id) {
+					match sessions.dequeue_message(&session_id) {
 						Some((msg_sender, msg)) => {
 							is_queued_message = true;
 							sender = msg_sender;
 							message = msg;
 						},
-						None => break,
+						None => return Some(session),
 					}
 				},
 				Err(Error::TooEarlyForRequest) => {
-					data.sessions.signing_sessions.enqueue_message(&signing_session_id, sender, message, is_queued_message);
-					break;
+					sessions.enqueue_message(&session_id, sender, message, is_queued_message);
+					return Some(session);
 				},
 				Err(err) => {
-					warn!(target: "secretstore_net", "{}: signing session error {} when processing message {} from node {}", data.self_key_pair.public(), err, message, sender);
-					data.sessions.respond_with_signing_error(&session_id, &sub_session_id, &sender, message::SigningSessionError {
-						session: session_id.clone().into(),
-						sub_session: sub_session_id.clone().into(),
-						error: format!("{:?}", err),
-					});
-					if err != Error::InvalidSessionId {
-						data.sessions.signing_sessions.remove(&signing_session_id);
-					}
-					break;
+					warn!(target: "secretstore_net", "{}: {} session error '{}' when processing message {} from node {}",
+						data.self_key_pair.public(),
+						S::type_name(),
+						err,
+						message,
+						sender);
+					session.on_session_error(data.self_key_pair.public(), err);
+					sessions.remove(&session_id);
+					return Some(session);
 				},
 			}
 		}
@@ -672,8 +631,12 @@ impl ClusterCore {
 	/// Process single cluster message from the connection.
 	fn process_cluster_message(data: Arc<ClusterData>, connection: Arc<Connection>, message: ClusterMessage) {
 		match message {
-			ClusterMessage::KeepAlive(_) => data.spawn(connection.send_message(Message::Cluster(ClusterMessage::KeepAliveResponse(message::KeepAliveResponse {})))),
-			ClusterMessage::KeepAliveResponse(_) => (),
+			ClusterMessage::KeepAlive(_) => data.spawn(connection.send_message(Message::Cluster(ClusterMessage::KeepAliveResponse(message::KeepAliveResponse {
+				session_id: None,
+			})))),
+			ClusterMessage::KeepAliveResponse(msg) => if let Some(session_id) = msg.session_id {
+				data.sessions.on_session_keep_alive(connection.node_id(), session_id.into());
+			},
 			_ => warn!(target: "secretstore_net", "{}: received unexpected message {} from node {} at {}", data.self_key_pair.public(), message, connection.node_id(), connection.node_address()),
 		}
 	}
@@ -681,12 +644,21 @@ impl ClusterCore {
 
 impl ClusterConnections {
 	pub fn new(config: &ClusterConfiguration) -> Result<Self, Error> {
-		let mut nodes = config.key_server_set.get();
+		let mut nodes = config.key_server_set.snapshot().current_set;
 		nodes.remove(config.self_key_pair.public());
 
+		let trigger: Box<ConnectionTrigger> = match config.auto_migrate_enabled {
+			false => Box::new(SimpleConnectionTrigger::new(config.key_server_set.clone(), config.self_key_pair.clone(), config.admin_public.clone())),
+			true if config.admin_public.is_none() => Box::new(ConnectionTriggerWithMigration::new(config.key_server_set.clone(), config.self_key_pair.clone())),
+			true => return Err(Error::Io("secret store admininstrator public key is specified with auto-migration enabled".into())), // TODO [Refac]: Io -> Internal
+		};
+		let connector = trigger.servers_set_change_creator_connector();
+
 		Ok(ClusterConnections {
 			self_node_id: config.self_key_pair.public().clone(),
 			key_server_set: config.key_server_set.clone(),
+			trigger: Mutex::new(trigger),
+			connector: connector,
 			data: RwLock::new(ClusterConnectionsData {
 				nodes: nodes,
 				connections: BTreeMap::new(),
@@ -704,39 +676,54 @@ impl ClusterConnections {
 		self.data.read().connections.get(node).cloned()
 	}
 
-	pub fn insert(&self, connection: Arc<Connection>) -> bool {
-		let mut data = self.data.write();
-		if !data.nodes.contains_key(connection.node_id()) {
-			// incoming connections are checked here
-			trace!(target: "secretstore_net", "{}: ignoring unknown connection from {} at {}", self.self_node_id, connection.node_id(), connection.node_address());
-			debug_assert!(connection.is_inbound());
-			return false;
-		}
-		if data.connections.contains_key(connection.node_id()) {
-			// we have already connected to the same node
-			// the agreement is that node with lower id must establish connection to node with higher id
-			if (&self.self_node_id < connection.node_id() && connection.is_inbound())
-				|| (&self.self_node_id > connection.node_id() && !connection.is_inbound()) {
+	pub fn insert(&self, data: Arc<ClusterData>, connection: Arc<Connection>) -> bool {
+		{
+			let mut data = self.data.write();
+			if !data.nodes.contains_key(connection.node_id()) {
+				// incoming connections are checked here
+				trace!(target: "secretstore_net", "{}: ignoring unknown connection from {} at {}", self.self_node_id, connection.node_id(), connection.node_address());
+				debug_assert!(connection.is_inbound());
 				return false;
 			}
+
+			if data.connections.contains_key(connection.node_id()) {
+				// we have already connected to the same node
+				// the agreement is that node with lower id must establish connection to node with higher id
+				if (&self.self_node_id < connection.node_id() && connection.is_inbound())
+					|| (&self.self_node_id > connection.node_id() && !connection.is_inbound()) {
+					return false;
+				}
+			}
+
+			let node = connection.node_id().clone();
+			trace!(target: "secretstore_net", "{}: inserting connection to {} at {}. Connected to {} of {} nodes",
+				self.self_node_id, node, connection.node_address(), data.connections.len() + 1, data.nodes.len());
+			data.connections.insert(node.clone(), connection.clone());
 		}
 
-		trace!(target: "secretstore_net", "{}: inserting connection to {} at {}. Connected to {} of {} nodes",
-			self.self_node_id, connection.node_id(), connection.node_address(), data.connections.len() + 1, data.nodes.len());
-		data.connections.insert(connection.node_id().clone(), connection);
+		let maintain_action = self.trigger.lock().on_connection_established(connection.node_id());
+		self.maintain_connection_trigger(maintain_action, data);
+
 		true
 	}
 
-	pub fn remove(&self, node: &NodeId, is_inbound: bool) {
-		let mut data = self.data.write();
-		if let Entry::Occupied(entry) = data.connections.entry(node.clone()) {
-			if entry.get().is_inbound() != is_inbound {
+	pub fn remove(&self, data: Arc<ClusterData>, node: &NodeId, is_inbound: bool) {
+		{
+			let mut data = self.data.write();
+			if let Entry::Occupied(entry) = data.connections.entry(node.clone()) {
+				if entry.get().is_inbound() != is_inbound {
+					return;
+				}
+
+				trace!(target: "secretstore_net", "{}: removing connection to {} at {}", self.self_node_id, entry.get().node_id(), entry.get().node_address());
+				entry.remove_entry();
+			} else {
 				return;
 			}
-
-			trace!(target: "secretstore_net", "{}: removing connection to {} at {}", self.self_node_id, entry.get().node_id(), entry.get().node_address());
-			entry.remove_entry();
 		}
+
+		let maintain_action = self.trigger.lock().on_connection_closed(node);
+		self.maintain_connection_trigger(maintain_action, data);
 	}
 
 	pub fn connected_nodes(&self) -> BTreeSet<NodeId> {
@@ -755,47 +742,25 @@ impl ClusterConnections {
 			.collect()
 	}
 
-	pub fn update_nodes_set(&self) {
-		let mut data = self.data.write();
-		let mut new_nodes = self.key_server_set.get();
-		// we do not need to connect to self
-		// + we do not need to try to connect to any other node if we are not the part of a cluster
-		if new_nodes.remove(&self.self_node_id).is_none() {
-			new_nodes.clear();
-		}
-
-		let mut num_added_nodes = 0;
-		let mut num_removed_nodes = 0;
-		let mut num_changed_nodes = 0;
-
-		for obsolete_node in data.nodes.keys().cloned().collect::<Vec<_>>() {
-			if !new_nodes.contains_key(&obsolete_node) {
-				if let Entry::Occupied(entry) = data.connections.entry(obsolete_node) {
-					trace!(target: "secretstore_net", "{}: removing connection to {} at {}", self.self_node_id, entry.get().node_id(), entry.get().node_address());
-					entry.remove();
-				}
+	pub fn servers_set_change_creator_connector(&self) -> Arc<ServersSetChangeSessionCreatorConnector> {
+		self.connector.clone()
+	}
 
-				data.nodes.remove(&obsolete_node);
-				num_removed_nodes += 1;
-			}
-		}
+	pub fn update_nodes_set(&self, data: Arc<ClusterData>) -> Option<BoxedEmptyFuture> {
+		let maintain_action = self.trigger.lock().on_maintain();
+		self.maintain_connection_trigger(maintain_action, data);
+		None
+	}
 
-		for (new_node_public, new_node_addr) in new_nodes {
-			match data.nodes.insert(new_node_public, new_node_addr) {
-				None => num_added_nodes += 1,
-				Some(old_node_addr) => if new_node_addr != old_node_addr {
-					if let Entry::Occupied(entry) = data.connections.entry(new_node_public) {
-						trace!(target: "secretstore_net", "{}: removing connection to {} at {}", self.self_node_id, entry.get().node_id(), entry.get().node_address());
-						entry.remove();
-					}
-					num_changed_nodes += 1;
-				},
-			}
+	fn maintain_connection_trigger(&self, maintain_action: Option<Maintain>, data: Arc<ClusterData>) {
+		if maintain_action == Some(Maintain::SessionAndConnections) || maintain_action == Some(Maintain::Session) {
+			let client = ClusterClientImpl::new(data);
+			self.trigger.lock().maintain_session(&client);
 		}
-
-		if num_added_nodes != 0 || num_removed_nodes != 0 || num_changed_nodes != 0 {
-			trace!(target: "secretstore_net", "{}: updated nodes set: removed {}, added {}, changed {}. Connected to {} of {} nodes",
-				self.self_node_id, num_removed_nodes, num_added_nodes, num_changed_nodes, data.connections.len(), data.nodes.len());
+		if maintain_action == Some(Maintain::SessionAndConnections) || maintain_action == Some(Maintain::Connections) {
+			let mut trigger = self.trigger.lock();
+			let mut data = self.data.write();
+			trigger.maintain_connections(&mut *data);
 		}
 	}
 }
@@ -817,11 +782,6 @@ impl ClusterData {
 		self.connections.get(node)
 	}
 
-	/// Get sessions reference.
-	pub fn sessions(&self) -> &ClusterSessions {
-		&self.sessions
-	}
-
 	/// Spawns a future using thread pool and schedules execution of it with event loop handle.
 	pub fn spawn<F>(&self, f: F) where F: Future + Send + 'static, F::Item: Send + 'static, F::Error: Send + 'static {
 		let pool_work = self.pool.spawn(f);
@@ -881,14 +841,6 @@ impl ClusterView {
 			})),
 		}
 	}
-
-	pub fn is_connected(&self, node: &NodeId) -> bool {
-		self.core.lock().nodes.contains(node)
-	}
-
-	pub fn nodes(&self) -> BTreeSet<NodeId> {
-		self.core.lock().nodes.clone()
-	}
 }
 
 impl Cluster for ClusterView {
@@ -909,6 +861,14 @@ impl Cluster for ClusterView {
 		core.cluster.spawn(connection.send_message(message));
 		Ok(())
 	}
+
+	fn is_connected(&self, node: &NodeId) -> bool {
+		self.core.lock().nodes.contains(node)
+	}
+
+	fn nodes(&self) -> BTreeSet<NodeId> {
+		self.core.lock().nodes.clone()
+	}
 }
 
 impl ClusterClientImpl {
@@ -917,6 +877,23 @@ impl ClusterClientImpl {
 			data: data,
 		}
 	}
+
+	fn create_key_version_negotiation_session(&self, session_id: SessionId) -> Result<Arc<KeyVersionNegotiationSession<KeyVersionNegotiationSessionTransport>>, Error> {
+		let mut connected_nodes = self.data.connections.connected_nodes();
+		connected_nodes.insert(self.data.self_key_pair.public().clone());
+
+		let access_key = Random.generate()?.secret().clone();
+		let session_id = SessionIdWithSubSession::new(session_id, access_key);
+		let cluster = create_cluster_view(&self.data, false)?;
+		let session = self.data.sessions.negotiation_sessions.insert(cluster, self.data.self_key_pair.public().clone(), session_id.clone(), None, false, None)?;
+		match session.initialize(connected_nodes) {
+			Ok(()) => Ok(session),
+			Err(error) => {
+				self.data.sessions.negotiation_sessions.remove(&session.id());
+				Err(error)
+			}
+		}
+	}
 }
 
 impl ClusterClient for ClusterClientImpl {
@@ -928,42 +905,155 @@ impl ClusterClient for ClusterClientImpl {
 		let mut connected_nodes = self.data.connections.connected_nodes();
 		connected_nodes.insert(self.data.self_key_pair.public().clone());
 
-		let cluster = Arc::new(ClusterView::new(self.data.clone(), connected_nodes.clone()));
-		let session = self.data.sessions.new_generation_session(self.data.self_key_pair.public().clone(), session_id, cluster)?;
-		session.initialize(author, threshold, connected_nodes)?;
-		Ok(GenerationSessionWrapper::new(Arc::downgrade(&self.data), session_id, session))
+		let cluster = create_cluster_view(&self.data, true)?;
+		let session = self.data.sessions.generation_sessions.insert(cluster, self.data.self_key_pair.public().clone(), session_id, None, false, None)?;
+		match session.initialize(public_to_address(&author), false, threshold, connected_nodes.into()) {
+			Ok(()) => Ok(session),
+			Err(error) => {
+				self.data.sessions.generation_sessions.remove(&session.id());
+				Err(error)
+			},
+		}
 	}
 
-	fn new_encryption_session(&self, session_id: SessionId, requestor_signature: Signature, common_point: Public, encrypted_point: Public) -> Result<Arc<EncryptionSession>, Error> {
+	fn new_encryption_session(&self, session_id: SessionId, requester: Requester, common_point: Public, encrypted_point: Public) -> Result<Arc<EncryptionSession>, Error> {
 		let mut connected_nodes = self.data.connections.connected_nodes();
 		connected_nodes.insert(self.data.self_key_pair.public().clone());
 
-		let cluster = Arc::new(ClusterView::new(self.data.clone(), connected_nodes.clone()));
-		let session = self.data.sessions.new_encryption_session(self.data.self_key_pair.public().clone(), session_id, cluster)?;
-		session.initialize(requestor_signature, common_point, encrypted_point)?;
-		Ok(EncryptionSessionWrapper::new(Arc::downgrade(&self.data), session_id, session))
+		let cluster = create_cluster_view(&self.data, true)?;
+		let session = self.data.sessions.encryption_sessions.insert(cluster, self.data.self_key_pair.public().clone(), session_id, None, false, None)?;
+		match session.initialize(requester, common_point, encrypted_point) {
+			Ok(()) => Ok(session),
+			Err(error) => {
+				self.data.sessions.encryption_sessions.remove(&session.id());
+				Err(error)
+			},
+		}
+	}
+
+	fn new_decryption_session(&self, session_id: SessionId, requester: Requester, version: Option<H256>, is_shadow_decryption: bool) -> Result<Arc<DecryptionSession>, Error> {
+		let mut connected_nodes = self.data.connections.connected_nodes();
+		connected_nodes.insert(self.data.self_key_pair.public().clone());
+
+		let access_key = Random.generate()?.secret().clone();
+		let session_id = SessionIdWithSubSession::new(session_id, access_key);
+		let cluster = create_cluster_view(&self.data, false)?;
+		let session = self.data.sessions.decryption_sessions.insert(cluster, self.data.self_key_pair.public().clone(),
+			session_id.clone(), None, false, Some(requester))?;
+
+		let initialization_result = match version {
+			Some(version) => session.initialize(version, is_shadow_decryption, false),
+			None => {
+				self.create_key_version_negotiation_session(session_id.id.clone())
+					.map(|version_session| {
+						version_session.set_continue_action(ContinueAction::Decrypt(session.clone(), is_shadow_decryption));
+						ClusterCore::try_continue_session(&self.data, Some(version_session));
+					})
+			},
+		};
+
+		match initialization_result {
+			Ok(()) => Ok(session),
+			Err(error) => {
+				self.data.sessions.decryption_sessions.remove(&session.id());
+				Err(error)
+			},
+		}
 	}
 
-	fn new_decryption_session(&self, session_id: SessionId, requestor_signature: Signature, is_shadow_decryption: bool) -> Result<Arc<DecryptionSession>, Error> {
+	fn new_schnorr_signing_session(&self, session_id: SessionId, requester: Requester, version: Option<H256>, message_hash: H256) -> Result<Arc<SchnorrSigningSession>, Error> {
 		let mut connected_nodes = self.data.connections.connected_nodes();
 		connected_nodes.insert(self.data.self_key_pair.public().clone());
 
 		let access_key = Random.generate()?.secret().clone();
-		let cluster = Arc::new(ClusterView::new(self.data.clone(), connected_nodes.clone()));
-		let session = self.data.sessions.new_decryption_session(self.data.self_key_pair.public().clone(), session_id, access_key.clone(), cluster, Some(requestor_signature))?;
-		session.initialize(is_shadow_decryption)?;
-		Ok(DecryptionSessionWrapper::new(Arc::downgrade(&self.data), DecryptionSessionId::new(session_id, access_key), session))
+		let session_id = SessionIdWithSubSession::new(session_id, access_key);
+		let cluster = create_cluster_view(&self.data, false)?;
+		let session = self.data.sessions.schnorr_signing_sessions.insert(cluster, self.data.self_key_pair.public().clone(), session_id.clone(), None, false, Some(requester))?;
+
+		let initialization_result = match version {
+			Some(version) => session.initialize(version, message_hash),
+			None => {
+				self.create_key_version_negotiation_session(session_id.id.clone())
+					.map(|version_session| {
+						version_session.set_continue_action(ContinueAction::SchnorrSign(session.clone(), message_hash));
+						ClusterCore::try_continue_session(&self.data, Some(version_session));
+					})
+			},
+		};
+
+		match initialization_result {
+			Ok(()) => Ok(session),
+			Err(error) => {
+				self.data.sessions.schnorr_signing_sessions.remove(&session.id());
+				Err(error)
+			},
+		}
 	}
 
-	fn new_signing_session(&self, session_id: SessionId, requestor_signature: Signature, message_hash: H256) -> Result<Arc<SigningSession>, Error> {
+	fn new_ecdsa_signing_session(&self, session_id: SessionId, requester: Requester, version: Option<H256>, message_hash: H256) -> Result<Arc<EcdsaSigningSession>, Error> {
 		let mut connected_nodes = self.data.connections.connected_nodes();
 		connected_nodes.insert(self.data.self_key_pair.public().clone());
 
 		let access_key = Random.generate()?.secret().clone();
-		let cluster = Arc::new(ClusterView::new(self.data.clone(), connected_nodes.clone()));
-		let session = self.data.sessions.new_signing_session(self.data.self_key_pair.public().clone(), session_id, access_key.clone(), cluster, Some(requestor_signature))?;
-		session.initialize(message_hash)?;
-		Ok(SigningSessionWrapper::new(Arc::downgrade(&self.data), SigningSessionId::new(session_id, access_key), session))
+		let session_id = SessionIdWithSubSession::new(session_id, access_key);
+		let cluster = create_cluster_view(&self.data, false)?;
+		let session = self.data.sessions.ecdsa_signing_sessions.insert(cluster, self.data.self_key_pair.public().clone(), session_id.clone(), None, false, Some(requester))?;
+
+		let initialization_result = match version {
+			Some(version) => session.initialize(version, message_hash),
+			None => {
+				self.create_key_version_negotiation_session(session_id.id.clone())
+					.map(|version_session| {
+						version_session.set_continue_action(ContinueAction::EcdsaSign(session.clone(), message_hash));
+						ClusterCore::try_continue_session(&self.data, Some(version_session));
+					})
+			},
+		};
+
+		match initialization_result {
+			Ok(()) => Ok(session),
+			Err(error) => {
+				self.data.sessions.ecdsa_signing_sessions.remove(&session.id());
+				Err(error)
+			},
+		}
+	}
+
+	fn new_key_version_negotiation_session(&self, session_id: SessionId) -> Result<Arc<KeyVersionNegotiationSession<KeyVersionNegotiationSessionTransport>>, Error> {
+		let session = self.create_key_version_negotiation_session(session_id)?;
+		Ok(session)
+	}
+
+	fn new_servers_set_change_session(&self, session_id: Option<SessionId>, migration_id: Option<H256>, new_nodes_set: BTreeSet<NodeId>, old_set_signature: Signature, new_set_signature: Signature) -> Result<Arc<AdminSession>, Error> {
+		let mut connected_nodes = self.data.connections.connected_nodes();
+		connected_nodes.insert(self.data.self_key_pair.public().clone());
+
+		let session_id = match session_id {
+			Some(session_id) if session_id == *SERVERS_SET_CHANGE_SESSION_ID => session_id,
+			Some(_) => return Err(Error::InvalidMessage),
+			None => *SERVERS_SET_CHANGE_SESSION_ID,
+		};
+
+		let cluster = create_cluster_view(&self.data, true)?;
+		let creation_data = Some(AdminSessionCreationData::ServersSetChange(migration_id, new_nodes_set.clone()));
+		let session = self.data.sessions.admin_sessions.insert(cluster, self.data.self_key_pair.public().clone(), session_id, None, true, creation_data)?;
+		let initialization_result = session.as_servers_set_change().expect("servers set change session is created; qed")
+			.initialize(new_nodes_set, old_set_signature, new_set_signature);
+
+		match initialization_result {
+			Ok(()) => {
+				self.data.connections.servers_set_change_creator_connector().set_key_servers_set_change_session(session.clone());
+				Ok(session)
+			},
+			Err(error) => {
+				self.data.sessions.admin_sessions.remove(&session.id());
+				Err(error)
+			},
+		}
+	}
+
+	fn add_generation_listener(&self, listener: Arc<ClusterSessionsListener<GenerationSession>>) {
+		self.data.sessions.generation_sessions.add_listener(listener);
 	}
 
 	#[cfg(test)]
@@ -977,8 +1067,13 @@ impl ClusterClient for ClusterClientImpl {
 	}
 
 	#[cfg(test)]
-	fn generation_session(&self, session_id: &SessionId) -> Option<Arc<GenerationSessionImpl>> {
-		self.data.sessions.generation_sessions.get(session_id)
+	fn generation_session(&self, session_id: &SessionId) -> Option<Arc<GenerationSession>> {
+		self.data.sessions.generation_sessions.get(session_id, false)
+	}
+
+	#[cfg(test)]
+	fn key_storage(&self) -> Arc<KeyStorage> {
+		self.data.config.key_storage.clone()
 	}
 }
 
@@ -991,14 +1086,26 @@ fn make_socket_address(address: &str, port: u16) -> Result<SocketAddr, Error> {
 pub mod tests {
 	use std::sync::Arc;
 	use std::time;
-	use std::collections::VecDeque;
+	use std::collections::{BTreeSet, VecDeque};
 	use parking_lot::Mutex;
 	use tokio_core::reactor::Core;
-	use ethkey::{Random, Generator, Public};
-	use key_server_cluster::{NodeId, SessionId, Error, DummyAclStorage, DummyKeyStorage, MapKeyServerSet, PlainNodeKeyPair};
+	use ethereum_types::H256;
+	use ethkey::{Random, Generator, Public, Signature, sign};
+	use key_server_cluster::{NodeId, SessionId, Requester, Error, DummyAclStorage, DummyKeyStorage,
+		MapKeyServerSet, PlainNodeKeyPair, KeyStorage};
 	use key_server_cluster::message::Message;
-	use key_server_cluster::cluster::{Cluster, ClusterCore, ClusterConfiguration};
-	use key_server_cluster::generation_session::{Session as GenerationSession, SessionState as GenerationSessionState};
+	use key_server_cluster::cluster::{Cluster, ClusterCore, ClusterConfiguration, ClusterClient, ClusterState};
+	use key_server_cluster::cluster_sessions::{ClusterSession, AdminSession, ClusterSessionsListener};
+	use key_server_cluster::generation_session::{SessionImpl as GenerationSession, SessionState as GenerationSessionState};
+	use key_server_cluster::decryption_session::{SessionImpl as DecryptionSession};
+	use key_server_cluster::encryption_session::{SessionImpl as EncryptionSession};
+	use key_server_cluster::signing_session_ecdsa::{SessionImpl as EcdsaSigningSession};
+	use key_server_cluster::signing_session_schnorr::{SessionImpl as SchnorrSigningSession};
+	use key_server_cluster::key_version_negotiation_session::{SessionImpl as KeyVersionNegotiationSession,
+		IsolatedSessionTransport as KeyVersionNegotiationSessionTransport};
+
+	#[derive(Default)]
+	pub struct DummyClusterClient;
 
 	#[derive(Debug)]
 	pub struct DummyCluster {
@@ -1008,10 +1115,28 @@ pub mod tests {
 
 	#[derive(Debug, Default)]
 	struct DummyClusterData {
-		nodes: Vec<NodeId>,
+		nodes: BTreeSet<NodeId>,
 		messages: VecDeque<(NodeId, Message)>,
 	}
 
+	impl ClusterClient for DummyClusterClient {
+		fn cluster_state(&self) -> ClusterState { unimplemented!("test-only") }
+		fn new_generation_session(&self, _session_id: SessionId, _author: Public, _threshold: usize) -> Result<Arc<GenerationSession>, Error> { unimplemented!("test-only") }
+		fn new_encryption_session(&self, _session_id: SessionId, _requester: Requester, _common_point: Public, _encrypted_point: Public) -> Result<Arc<EncryptionSession>, Error> { unimplemented!("test-only") }
+		fn new_decryption_session(&self, _session_id: SessionId, _requester: Requester, _version: Option<H256>, _is_shadow_decryption: bool) -> Result<Arc<DecryptionSession>, Error> { unimplemented!("test-only") }
+		fn new_schnorr_signing_session(&self, _session_id: SessionId, _requester: Requester, _version: Option<H256>, _message_hash: H256) -> Result<Arc<SchnorrSigningSession>, Error> { unimplemented!("test-only") }
+		fn new_ecdsa_signing_session(&self, _session_id: SessionId, _requester: Requester, _version: Option<H256>, _message_hash: H256) -> Result<Arc<EcdsaSigningSession>, Error> { unimplemented!("test-only") }
+		fn new_key_version_negotiation_session(&self, _session_id: SessionId) -> Result<Arc<KeyVersionNegotiationSession<KeyVersionNegotiationSessionTransport>>, Error> { unimplemented!("test-only") }
+		fn new_servers_set_change_session(&self, _session_id: Option<SessionId>, _migration_id: Option<H256>, _new_nodes_set: BTreeSet<NodeId>, _old_set_signature: Signature, _new_set_signature: Signature) -> Result<Arc<AdminSession>, Error> { unimplemented!("test-only") }
+
+		fn add_generation_listener(&self, _listener: Arc<ClusterSessionsListener<GenerationSession>>) {}
+
+		fn make_faulty_generation_sessions(&self) { unimplemented!("test-only") }
+		fn generation_session(&self, _session_id: &SessionId) -> Option<Arc<GenerationSession>> { unimplemented!("test-only") }
+		fn connect(&self) { unimplemented!("test-only") }
+		fn key_storage(&self) -> Arc<KeyStorage> { unimplemented!("test-only") }
+	}
+
 	impl DummyCluster {
 		pub fn new(id: NodeId) -> Self {
 			DummyCluster {
@@ -1025,7 +1150,15 @@ pub mod tests {
 		}
 
 		pub fn add_node(&self, node: NodeId) {
-			self.data.lock().nodes.push(node);
+			self.data.lock().nodes.insert(node);
+		}
+
+		pub fn add_nodes<I: Iterator<Item=NodeId>>(&self, nodes: I) {
+			self.data.lock().nodes.extend(nodes)
+		}
+
+		pub fn remove_node(&self, node: &NodeId) {
+			self.data.lock().nodes.remove(node);
 		}
 
 		pub fn take_message(&self) -> Option<(NodeId, Message)> {
@@ -1048,6 +1181,15 @@ pub mod tests {
 			self.data.lock().messages.push_back((to.clone(), message));
 			Ok(())
 		}
+
+		fn is_connected(&self, node: &NodeId) -> bool {
+			let data = self.data.lock();
+			&self.id == node || data.nodes.contains(node)
+		}
+
+		fn nodes(&self) -> BTreeSet<NodeId> {
+			self.data.lock().nodes.iter().cloned().collect()
+		}
 	}
 
 	pub fn loop_until<F>(core: &mut Core, timeout: time::Duration, predicate: F) where F: Fn() -> bool {
@@ -1065,7 +1207,7 @@ pub mod tests {
 	}
 
 	pub fn all_connections_established(cluster: &Arc<ClusterCore>) -> bool {
-		cluster.config().key_server_set.get().keys()
+		cluster.config().key_server_set.snapshot().new_set.keys()
 			.filter(|p| *p != cluster.config().self_key_pair.public())
 			.all(|p| cluster.connection(p).is_some())
 	}
@@ -1082,6 +1224,8 @@ pub mod tests {
 			allow_connecting_to_higher_nodes: false,
 			key_storage: Arc::new(DummyKeyStorage::default()),
 			acl_storage: Arc::new(DummyAclStorage::default()),
+			admin_public: None,
+			auto_migrate_enabled: false,
 		}).collect();
 		let clusters: Vec<_> = cluster_params.into_iter().enumerate()
 			.map(|(_, params)| ClusterCore::new(core.handle(), params).unwrap())
@@ -1121,6 +1265,7 @@ pub mod tests {
 
 	#[test]
 	fn error_in_generation_session_broadcasted_to_all_other_nodes() {
+		//::logger::init_log();
 		let mut core = Core::new().unwrap();
 		let clusters = make_clusters(&core, 6016, 3);
 		run_clusters(&clusters);
@@ -1131,22 +1276,54 @@ pub mod tests {
 
 		// start && wait for generation session to fail
 		let session = clusters[0].client().new_generation_session(SessionId::default(), Public::default(), 1).unwrap();
-		loop_until(&mut core, time::Duration::from_millis(300), || session.joint_public_and_secret().is_some());
+		loop_until(&mut core, time::Duration::from_millis(300), || session.joint_public_and_secret().is_some()
+			&& clusters[0].client().generation_session(&SessionId::default()).is_none());
+		assert!(session.joint_public_and_secret().unwrap().is_err());
+
+		// check that faulty session is either removed from all nodes, or nonexistent (already removed)
+		for i in 1..3 {
+			if let Some(session) = clusters[i].client().generation_session(&SessionId::default()) {
+				// wait for both session completion && session removal (session completion event is fired
+				// before session is removed from its own container by cluster)
+				loop_until(&mut core, time::Duration::from_millis(300), || session.joint_public_and_secret().is_some()
+					&& clusters[i].client().generation_session(&SessionId::default()).is_none());
+				assert!(session.joint_public_and_secret().unwrap().is_err());
+			}
+		}
+	}
+
+	#[test]
+	fn generation_session_completion_signalled_if_failed_on_master() {
+		//::logger::init_log();
+		let mut core = Core::new().unwrap();
+		let clusters = make_clusters(&core, 6025, 3);
+		run_clusters(&clusters);
+		loop_until(&mut core, time::Duration::from_millis(300), || clusters.iter().all(all_connections_established));
+
+		// ask one of nodes to produce faulty generation sessions
+		clusters[0].client().make_faulty_generation_sessions();
+
+		// start && wait for generation session to fail
+		let session = clusters[0].client().new_generation_session(SessionId::default(), Public::default(), 1).unwrap();
+		loop_until(&mut core, time::Duration::from_millis(300), || session.joint_public_and_secret().is_some()
+			&& clusters[0].client().generation_session(&SessionId::default()).is_none());
 		assert!(session.joint_public_and_secret().unwrap().is_err());
 
 		// check that faulty session is either removed from all nodes, or nonexistent (already removed)
-		assert!(clusters[0].client().generation_session(&SessionId::default()).is_none());
 		for i in 1..3 {
 			if let Some(session) = clusters[i].client().generation_session(&SessionId::default()) {
-				loop_until(&mut core, time::Duration::from_millis(300), || session.joint_public_and_secret().is_some());
+				// wait for both session completion && session removal (session completion event is fired
+				// before session is removed from its own container by cluster)
+				loop_until(&mut core, time::Duration::from_millis(300), || session.joint_public_and_secret().is_some()
+					&& clusters[i].client().generation_session(&SessionId::default()).is_none());
 				assert!(session.joint_public_and_secret().unwrap().is_err());
-				assert!(clusters[i].client().generation_session(&SessionId::default()).is_none());
 			}
 		}
 	}
 
 	#[test]
 	fn generation_session_is_removed_when_succeeded() {
+		//::logger::init_log();
 		let mut core = Core::new().unwrap();
 		let clusters = make_clusters(&core, 6019, 3);
 		run_clusters(&clusters);
@@ -1154,17 +1331,150 @@ pub mod tests {
 
 		// start && wait for generation session to complete
 		let session = clusters[0].client().new_generation_session(SessionId::default(), Public::default(), 1).unwrap();
-		loop_until(&mut core, time::Duration::from_millis(300), || session.state() == GenerationSessionState::Finished);
+		loop_until(&mut core, time::Duration::from_millis(300), || (session.state() == GenerationSessionState::Finished
+			|| session.state() == GenerationSessionState::Failed)
+			&& clusters[0].client().generation_session(&SessionId::default()).is_none());
 		assert!(session.joint_public_and_secret().unwrap().is_ok());
 
 		// check that session is either removed from all nodes, or nonexistent (already removed)
-		assert!(clusters[0].client().generation_session(&SessionId::default()).is_none());
 		for i in 1..3 {
 			if let Some(session) = clusters[i].client().generation_session(&SessionId::default()) {
-				loop_until(&mut core, time::Duration::from_millis(300), || session.state() == GenerationSessionState::Finished);
+				loop_until(&mut core, time::Duration::from_millis(300), || (session.state() == GenerationSessionState::Finished
+					|| session.state() == GenerationSessionState::Failed)
+					&& clusters[i].client().generation_session(&SessionId::default()).is_none());
 				assert!(session.joint_public_and_secret().unwrap().is_err());
-				assert!(clusters[i].client().generation_session(&SessionId::default()).is_none());
 			}
 		}
 	}
+
+	#[test]
+	fn sessions_are_removed_when_initialization_fails() {
+		let mut core = Core::new().unwrap();
+		let clusters = make_clusters(&core, 6022, 3);
+		run_clusters(&clusters);
+		loop_until(&mut core, time::Duration::from_millis(300), || clusters.iter().all(all_connections_established));
+
+		// generation session
+		{
+			// try to start generation session => fail in initialization
+			assert_eq!(clusters[0].client().new_generation_session(SessionId::default(), Public::default(), 100).map(|_| ()),
+				Err(Error::InvalidThreshold));
+
+			// try to start generation session => fails in initialization
+			assert_eq!(clusters[0].client().new_generation_session(SessionId::default(), Public::default(), 100).map(|_| ()),
+				Err(Error::InvalidThreshold));
+
+			assert!(clusters[0].data.sessions.generation_sessions.is_empty());
+		}
+
+		// decryption session
+		{
+			// try to start decryption session => fails in initialization
+			assert_eq!(clusters[0].client().new_decryption_session(Default::default(), Default::default(), Some(Default::default()), false).map(|_| ()),
+				Err(Error::InvalidMessage));
+
+			// try to start generation session => fails in initialization
+			assert_eq!(clusters[0].client().new_decryption_session(Default::default(), Default::default(), Some(Default::default()), false).map(|_| ()),
+				Err(Error::InvalidMessage));
+
+			assert!(clusters[0].data.sessions.decryption_sessions.is_empty());
+			assert!(clusters[0].data.sessions.negotiation_sessions.is_empty());
+		}
+	}
+
+	#[test]
+	fn schnorr_signing_session_completes_if_node_does_not_have_a_share() {
+		//::logger::init_log();
+		let mut core = Core::new().unwrap();
+		let clusters = make_clusters(&core, 6028, 3);
+		run_clusters(&clusters);
+		loop_until(&mut core, time::Duration::from_millis(300), || clusters.iter().all(all_connections_established));
+
+		// start && wait for generation session to complete
+		let session = clusters[0].client().new_generation_session(SessionId::default(), Public::default(), 1).unwrap();
+		loop_until(&mut core, time::Duration::from_millis(300), || (session.state() == GenerationSessionState::Finished
+			|| session.state() == GenerationSessionState::Failed)
+			&& clusters[0].client().generation_session(&SessionId::default()).is_none());
+		assert!(session.joint_public_and_secret().unwrap().is_ok());
+
+		// now remove share from node2
+		assert!((0..3).all(|i| clusters[i].data.sessions.generation_sessions.is_empty()));
+		clusters[2].data.config.key_storage.remove(&Default::default()).unwrap();
+
+		// and try to sign message with generated key
+		let signature = sign(Random.generate().unwrap().secret(), &Default::default()).unwrap();
+		let session0 = clusters[0].client().new_schnorr_signing_session(Default::default(), signature.into(), None, Default::default()).unwrap();
+		let session = clusters[0].data.sessions.schnorr_signing_sessions.first().unwrap();
+
+		loop_until(&mut core, time::Duration::from_millis(300), || session.is_finished() && (0..3).all(|i|
+			clusters[i].data.sessions.schnorr_signing_sessions.is_empty()));
+		session0.wait().unwrap();
+
+		// and try to sign message with generated key using node that has no key share
+		let signature = sign(Random.generate().unwrap().secret(), &Default::default()).unwrap();
+		let session2 = clusters[2].client().new_schnorr_signing_session(Default::default(), signature.into(), None, Default::default()).unwrap();
+		let session = clusters[2].data.sessions.schnorr_signing_sessions.first().unwrap();
+
+		loop_until(&mut core, time::Duration::from_millis(300), || session.is_finished()  && (0..3).all(|i|
+			clusters[i].data.sessions.schnorr_signing_sessions.is_empty()));
+		session2.wait().unwrap();
+
+		// now remove share from node1
+		clusters[1].data.config.key_storage.remove(&Default::default()).unwrap();
+
+		// and try to sign message with generated key
+		let signature = sign(Random.generate().unwrap().secret(), &Default::default()).unwrap();
+		let session1 = clusters[0].client().new_schnorr_signing_session(Default::default(), signature.into(), None, Default::default()).unwrap();
+		let session = clusters[0].data.sessions.schnorr_signing_sessions.first().unwrap();
+
+		loop_until(&mut core, time::Duration::from_millis(300), || session.is_finished());
+		session1.wait().unwrap_err();
+	}
+
+	#[test]
+	fn ecdsa_signing_session_completes_if_node_does_not_have_a_share() {
+		//::logger::init_log();
+		let mut core = Core::new().unwrap();
+		let clusters = make_clusters(&core, 6041, 4);
+		run_clusters(&clusters);
+		loop_until(&mut core, time::Duration::from_millis(300), || clusters.iter().all(all_connections_established));
+
+		// start && wait for generation session to complete
+		let session = clusters[0].client().new_generation_session(SessionId::default(), Public::default(), 1).unwrap();
+		loop_until(&mut core, time::Duration::from_millis(300), || (session.state() == GenerationSessionState::Finished
+			|| session.state() == GenerationSessionState::Failed)
+			&& clusters[0].client().generation_session(&SessionId::default()).is_none());
+		assert!(session.joint_public_and_secret().unwrap().is_ok());
+
+		// now remove share from node2
+		assert!((0..3).all(|i| clusters[i].data.sessions.generation_sessions.is_empty()));
+		clusters[2].data.config.key_storage.remove(&Default::default()).unwrap();
+
+		// and try to sign message with generated key
+		let signature = sign(Random.generate().unwrap().secret(), &Default::default()).unwrap();
+		let session0 = clusters[0].client().new_ecdsa_signing_session(Default::default(), signature.into(), None, H256::random()).unwrap();
+		let session = clusters[0].data.sessions.ecdsa_signing_sessions.first().unwrap();
+
+		loop_until(&mut core, time::Duration::from_millis(1000), || session.is_finished() && (0..3).all(|i|
+			clusters[i].data.sessions.ecdsa_signing_sessions.is_empty()));
+		session0.wait().unwrap();
+
+		// and try to sign message with generated key using node that has no key share
+		let signature = sign(Random.generate().unwrap().secret(), &Default::default()).unwrap();
+		let session2 = clusters[2].client().new_ecdsa_signing_session(Default::default(), signature.into(), None, H256::random()).unwrap();
+		let session = clusters[2].data.sessions.ecdsa_signing_sessions.first().unwrap();
+		loop_until(&mut core, time::Duration::from_millis(1000), || session.is_finished()  && (0..3).all(|i|
+			clusters[i].data.sessions.ecdsa_signing_sessions.is_empty()));
+		session2.wait().unwrap();
+
+		// now remove share from node1
+		clusters[1].data.config.key_storage.remove(&Default::default()).unwrap();
+
+		// and try to sign message with generated key
+		let signature = sign(Random.generate().unwrap().secret(), &Default::default()).unwrap();
+		let session1 = clusters[0].client().new_ecdsa_signing_session(Default::default(), signature.into(), None, H256::random()).unwrap();
+		let session = clusters[0].data.sessions.ecdsa_signing_sessions.first().unwrap();
+		loop_until(&mut core, time::Duration::from_millis(1000), || session.is_finished());
+		session1.wait().unwrap_err();
+	}
 }
diff --git a/secret_store/src/key_server_cluster/cluster_sessions.rs b/secret_store/src/key_server_cluster/cluster_sessions.rs
index f8e4974b106a2c1c030fbf0eae35b06284b80dcc..86e38a879a8f4c32f340455a8fb55e79d3ac55f0 100644
--- a/secret_store/src/key_server_cluster/cluster_sessions.rs
+++ b/secret_store/src/key_server_cluster/cluster_sessions.rs
@@ -16,277 +16,230 @@
 
 use std::time;
 use std::sync::{Arc, Weak};
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::collections::{VecDeque, BTreeSet, BTreeMap};
-use parking_lot::RwLock;
-use ethkey::{Public, Secret, Signature};
-use key_server_cluster::{Error, NodeId, SessionId, AclStorage, KeyStorage, DocumentKeyShare, EncryptedDocumentKeyShadow, SessionMeta};
-use key_server_cluster::cluster::{Cluster, ClusterData, ClusterView, ClusterConfiguration};
-use key_server_cluster::message::{self, Message, GenerationMessage, EncryptionMessage, DecryptionMessage, SigningMessage};
-use key_server_cluster::generation_session::{Session as GenerationSession, SessionImpl as GenerationSessionImpl,
-	SessionParams as GenerationSessionParams, SessionState as GenerationSessionState};
-use key_server_cluster::decryption_session::{Session as DecryptionSession, SessionImpl as DecryptionSessionImpl,
-	DecryptionSessionId, SessionParams as DecryptionSessionParams};
-use key_server_cluster::encryption_session::{Session as EncryptionSession, SessionImpl as EncryptionSessionImpl,
-	SessionParams as EncryptionSessionParams, SessionState as EncryptionSessionState};
-use key_server_cluster::signing_session::{Session as SigningSession, SessionImpl as SigningSessionImpl,
-	SigningSessionId, SessionParams as SigningSessionParams};
+use std::sync::atomic::AtomicBool;
+use std::collections::{VecDeque, BTreeMap, BTreeSet};
+use parking_lot::{Mutex, RwLock, Condvar};
+use ethereum_types::H256;
+use ethkey::Secret;
+use key_server_cluster::{Error, NodeId, SessionId, Requester};
+use key_server_cluster::cluster::{Cluster, ClusterData, ClusterConfiguration, ClusterView};
+use key_server_cluster::connection_trigger::ServersSetChangeSessionCreatorConnector;
+use key_server_cluster::message::{self, Message};
+use key_server_cluster::generation_session::{SessionImpl as GenerationSessionImpl};
+use key_server_cluster::decryption_session::{SessionImpl as DecryptionSessionImpl};
+use key_server_cluster::encryption_session::{SessionImpl as EncryptionSessionImpl};
+use key_server_cluster::signing_session_ecdsa::{SessionImpl as EcdsaSigningSessionImpl};
+use key_server_cluster::signing_session_schnorr::{SessionImpl as SchnorrSigningSessionImpl};
+use key_server_cluster::share_add_session::{SessionImpl as ShareAddSessionImpl, IsolatedSessionTransport as ShareAddTransport};
+use key_server_cluster::servers_set_change_session::{SessionImpl as ServersSetChangeSessionImpl};
+use key_server_cluster::key_version_negotiation_session::{SessionImpl as KeyVersionNegotiationSessionImpl,
+	IsolatedSessionTransport as VersionNegotiationTransport};
+
+use key_server_cluster::cluster_sessions_creator::{GenerationSessionCreator, EncryptionSessionCreator, DecryptionSessionCreator,
+	SchnorrSigningSessionCreator, KeyVersionNegotiationSessionCreator, AdminSessionCreator, SessionCreatorCore,
+	EcdsaSigningSessionCreator, ClusterSessionCreator};
 
 /// When there are no session-related messages for SESSION_TIMEOUT_INTERVAL seconds,
 /// we must treat this session as stalled && finish it with an error.
 /// This timeout is for cases when node is responding to KeepAlive messages, but intentionally ignores
 /// session messages.
 const SESSION_TIMEOUT_INTERVAL: u64 = 60;
+/// Interval to send session-level KeepAlive-messages.
+const SESSION_KEEP_ALIVE_INTERVAL: u64 = 30;
+
+lazy_static! {
+	/// Servers set change session id (there could be at most 1 session => hardcoded id).
+	pub static ref SERVERS_SET_CHANGE_SESSION_ID: SessionId = "10b7af423bb551d5dc8645db754163a2145d37d78d468fa7330435ed77064c1c"
+		.parse()
+		.expect("hardcoded id should parse without errors; qed");
+}
+
+/// Session id with sub session.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct SessionIdWithSubSession {
+	/// Key id.
+	pub id: SessionId,
+	/// Sub session id.
+	pub access_key: Secret,
+}
 
 /// Generic cluster session.
 pub trait ClusterSession {
+	/// Session identifier type.
+	type Id: ::std::fmt::Debug + Ord + Clone;
+
+	/// Session type name.
+	fn type_name() -> &'static str;
+	/// Get session id.
+	fn id(&self) -> Self::Id;
 	/// If session is finished (either with succcess or not).
 	fn is_finished(&self) -> bool;
 	/// When it takes too much time to complete session.
 	fn on_session_timeout(&self);
 	/// When it takes too much time to receive response from the node.
 	fn on_node_timeout(&self, node_id: &NodeId);
+	/// Process error that has occured during session + propagate this error to required nodes.
+	fn on_session_error(&self, sender: &NodeId, error: Error);
+	/// Process session message.
+	fn on_message(&self, sender: &NodeId, message: &Message) -> Result<(), Error>;
+
+	/// 'Wait for session completion' helper.
+	fn wait_session<T, U, F: Fn(&U) -> Option<Result<T, Error>>>(completion_event: &Condvar, session_data: &Mutex<U>, timeout: Option<time::Duration>, result_reader: F) -> Result<T, Error> {
+		let mut locked_data = session_data.lock();
+		match result_reader(&locked_data) {
+			Some(result) => result,
+			None => {
+				match timeout {
+					None => completion_event.wait(&mut locked_data),
+					Some(timeout) => {
+						completion_event.wait_for(&mut locked_data, timeout);
+					},
+				}
+
+				result_reader(&locked_data)
+					.expect("waited for completion; completion is only signaled when result.is_some(); qed")
+			},
+		}
+	}
+}
+
+/// Administrative session.
+pub enum AdminSession {
+	/// Share add session.
+	ShareAdd(ShareAddSessionImpl<ShareAddTransport>),
+	/// Servers set change session.
+	ServersSetChange(ServersSetChangeSessionImpl),
+}
+
+/// Administrative session creation data.
+pub enum AdminSessionCreationData {
+	/// Share add session (key id).
+	ShareAdd(H256),
+	/// Servers set change session (block id, new_server_set).
+	ServersSetChange(Option<H256>, BTreeSet<NodeId>),
 }
 
 /// Active sessions on this cluster.
 pub struct ClusterSessions {
 	/// Key generation sessions.
-	pub generation_sessions: ClusterSessionsContainer<SessionId, GenerationSessionImpl, GenerationMessage>,
+	pub generation_sessions: ClusterSessionsContainer<GenerationSessionImpl, GenerationSessionCreator, ()>,
 	/// Encryption sessions.
-	pub encryption_sessions: ClusterSessionsContainer<SessionId, EncryptionSessionImpl, EncryptionMessage>,
+	pub encryption_sessions: ClusterSessionsContainer<EncryptionSessionImpl, EncryptionSessionCreator, ()>,
 	/// Decryption sessions.
-	pub decryption_sessions: ClusterSessionsContainer<DecryptionSessionId, DecryptionSessionImpl, DecryptionMessage>,
-	/// Signing sessions.
-	pub signing_sessions: ClusterSessionsContainer<SigningSessionId, SigningSessionImpl, SigningMessage>,
+	pub decryption_sessions: ClusterSessionsContainer<DecryptionSessionImpl, DecryptionSessionCreator, Requester>,
+	/// Schnorr signing sessions.
+	pub schnorr_signing_sessions: ClusterSessionsContainer<SchnorrSigningSessionImpl, SchnorrSigningSessionCreator, Requester>,
+	/// ECDSA signing sessions.
+	pub ecdsa_signing_sessions: ClusterSessionsContainer<EcdsaSigningSessionImpl, EcdsaSigningSessionCreator, Requester>,
+	/// Key version negotiation sessions.
+	pub negotiation_sessions: ClusterSessionsContainer<KeyVersionNegotiationSessionImpl<VersionNegotiationTransport>, KeyVersionNegotiationSessionCreator, ()>,
+	/// Administrative sessions.
+	pub admin_sessions: ClusterSessionsContainer<AdminSession, AdminSessionCreator, AdminSessionCreationData>,
 	/// Self node id.
 	self_node_id: NodeId,
-	/// All nodes ids.
-	nodes: BTreeSet<NodeId>,
-	/// Reference to key storage
-	key_storage: Arc<KeyStorage>,
-	/// Reference to ACL storage
-	acl_storage: Arc<AclStorage>,
-	/// Make faulty generation sessions.
-	make_faulty_generation_sessions: AtomicBool,
+	/// Creator core.
+	creator_core: Arc<SessionCreatorCore>,
+}
+
+/// Active sessions container listener.
+pub trait ClusterSessionsListener<S: ClusterSession>: Send + Sync {
+	/// When new session is inserted to the container.
+	fn on_session_inserted(&self, _session: Arc<S>) {}
+	/// When session is removed from the container.
+	fn on_session_removed(&self, _session: Arc<S>) {}
 }
 
 /// Active sessions container.
-pub struct ClusterSessionsContainer<K, V, M> {
+pub struct ClusterSessionsContainer<S: ClusterSession, SC: ClusterSessionCreator<S, D>, D> {
+	/// Sessions creator.
+	pub creator: SC,
 	/// Active sessions.
-	pub sessions: RwLock<BTreeMap<K, QueuedSession<V, M>>>,
+	sessions: RwLock<BTreeMap<S::Id, QueuedSession<S>>>,
+	/// Listeners. Lock order: sessions -> listeners.
+	listeners: Mutex<Vec<Weak<ClusterSessionsListener<S>>>>,
+	/// Sessions container state.
+	container_state: Arc<Mutex<ClusterSessionsContainerState>>,
+	/// Phantom data.
+	_pd: ::std::marker::PhantomData<D>,
 }
 
 /// Session and its message queue.
-pub struct QueuedSession<V, M> {
+pub struct QueuedSession<S> {
 	/// Session master.
 	pub master: NodeId,
 	/// Cluster view.
-	pub cluster_view: Arc<ClusterView>,
+	pub cluster_view: Arc<Cluster>,
+	/// Last keep alive time.
+	pub last_keep_alive_time: time::Instant,
 	/// Last received message time.
 	pub last_message_time: time::Instant,
 	/// Generation session.
-	pub session: Arc<V>,
+	pub session: Arc<S>,
 	/// Messages queue.
-	pub queue: VecDeque<(NodeId, M)>,
+	pub queue: VecDeque<(NodeId, Message)>,
 }
 
-/// Generation session implementation, which removes session from cluster on drop.
-pub struct GenerationSessionWrapper {
-	/// Wrapped session.
-	session: Arc<GenerationSession>,
-	/// Session Id.
-	session_id: SessionId,
-	/// Cluster data reference.
-	cluster: Weak<ClusterData>,
-}
-
-/// Encryption session implementation, which removes session from cluster on drop.
-pub struct EncryptionSessionWrapper {
-	/// Wrapped session.
-	session: Arc<EncryptionSession>,
-	/// Session Id.
-	session_id: SessionId,
-	/// Cluster data reference.
-	cluster: Weak<ClusterData>,
-}
-
-/// Decryption session implementation, which removes session from cluster on drop.
-pub struct DecryptionSessionWrapper {
-	/// Wrapped session.
-	session: Arc<DecryptionSession>,
-	/// Session Id.
-	session_id: DecryptionSessionId,
-	/// Cluster data reference.
-	cluster: Weak<ClusterData>,
-}
-
-/// Signing session implementation, which removes session from cluster on drop.
-pub struct SigningSessionWrapper {
-	/// Wrapped session.
-	session: Arc<SigningSession>,
-	/// Session Id.
-	session_id: SigningSessionId,
-	/// Cluster data reference.
-	cluster: Weak<ClusterData>,
+/// Cluster sessions container state.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum ClusterSessionsContainerState {
+	/// There's no active sessions => any session can be started.
+	Idle,
+	/// There are active sessions => exclusive session can't be started right now.
+	Active(usize),
+	/// Exclusive session is active => can't start any other sessions.
+	Exclusive,
 }
 
 impl ClusterSessions {
 	/// Create new cluster sessions container.
-	pub fn new(config: &ClusterConfiguration) -> Self {
+	pub fn new(config: &ClusterConfiguration, servers_set_change_session_creator_connector: Arc<ServersSetChangeSessionCreatorConnector>) -> Self {
+		let container_state = Arc::new(Mutex::new(ClusterSessionsContainerState::Idle));
+		let creator_core = Arc::new(SessionCreatorCore::new(config));
 		ClusterSessions {
 			self_node_id: config.self_key_pair.public().clone(),
-			nodes: config.key_server_set.get().keys().cloned().collect(),
-			acl_storage: config.acl_storage.clone(),
-			key_storage: config.key_storage.clone(),
-			generation_sessions: ClusterSessionsContainer::new(),
-			encryption_sessions: ClusterSessionsContainer::new(),
-			decryption_sessions: ClusterSessionsContainer::new(),
-			signing_sessions: ClusterSessionsContainer::new(),
-			make_faulty_generation_sessions: AtomicBool::new(false),
+			generation_sessions: ClusterSessionsContainer::new(GenerationSessionCreator {
+				core: creator_core.clone(),
+				make_faulty_generation_sessions: AtomicBool::new(false),
+			}, container_state.clone()),
+			encryption_sessions: ClusterSessionsContainer::new(EncryptionSessionCreator {
+				core: creator_core.clone(),
+			}, container_state.clone()),
+			decryption_sessions: ClusterSessionsContainer::new(DecryptionSessionCreator {
+				core: creator_core.clone(),
+			}, container_state.clone()),
+			schnorr_signing_sessions: ClusterSessionsContainer::new(SchnorrSigningSessionCreator {
+				core: creator_core.clone(),
+			}, container_state.clone()),
+			ecdsa_signing_sessions: ClusterSessionsContainer::new(EcdsaSigningSessionCreator {
+				core: creator_core.clone(),
+			}, container_state.clone()),
+			negotiation_sessions: ClusterSessionsContainer::new(KeyVersionNegotiationSessionCreator {
+				core: creator_core.clone(),
+			}, container_state.clone()),
+			admin_sessions: ClusterSessionsContainer::new(AdminSessionCreator {
+				core: creator_core.clone(),
+				servers_set_change_session_creator_connector: servers_set_change_session_creator_connector,
+				admin_public: config.admin_public.clone(),
+			}, container_state),
+			creator_core: creator_core,
 		}
 	}
 
 	#[cfg(test)]
 	pub fn make_faulty_generation_sessions(&self) {
-		self.make_faulty_generation_sessions.store(true, Ordering::Relaxed);
+		self.generation_sessions.creator.make_faulty_generation_sessions();
 	}
 
-	/// Create new generation session.
-	pub fn new_generation_session(&self, master: NodeId, session_id: SessionId, cluster: Arc<ClusterView>) -> Result<Arc<GenerationSessionImpl>, Error> {
-		// check that there's no finished encryption session with the same id
-		if self.key_storage.contains(&session_id) {
-			return Err(Error::DuplicateSessionId);
-		}
-		// communicating to all other nodes is crucial for encryption session
-		// => check that we have connections to all cluster nodes
-		if self.nodes.iter().any(|n| !cluster.is_connected(n)) {
-			return Err(Error::NodeDisconnected);
-		}
-
-		// check that there's no active encryption session with the same id
-		self.generation_sessions.insert(master, session_id, cluster.clone(), move ||
-			Ok(GenerationSessionImpl::new(GenerationSessionParams {
-				id: session_id.clone(),
-				self_node_id: self.self_node_id.clone(),
-				key_storage: Some(self.key_storage.clone()),
-				cluster: cluster,
-			})))
-			.map(|session| {
-				if self.make_faulty_generation_sessions.load(Ordering::Relaxed) {
-					session.simulate_faulty_behaviour();
-				}
-				session
-			})
+	/// Send session-level keep-alive messages.
+	pub fn sessions_keep_alive(&self) {
+		self.admin_sessions.send_keep_alive(&*SERVERS_SET_CHANGE_SESSION_ID, &self.self_node_id);
 	}
 
-	/// Send generation session error.
-	pub fn respond_with_generation_error(&self, session_id: &SessionId, error: message::SessionError) {
-		self.generation_sessions.sessions.read().get(session_id)
-			.map(|s| {
-				// error in generation session is considered fatal
-				// => broadcast error
-
-				// do not bother processing send error, as we already processing error
-				let _ = s.cluster_view.broadcast(Message::Generation(GenerationMessage::SessionError(error)));
-			});
-	}
-
-	/// Create new encryption session.
-	pub fn new_encryption_session(&self, master: NodeId, session_id: SessionId, cluster: Arc<ClusterView>) -> Result<Arc<EncryptionSessionImpl>, Error> {
-		let encrypted_data = self.read_key_share(&session_id, &cluster)?;
-		self.encryption_sessions.insert(master, session_id, cluster.clone(), move || EncryptionSessionImpl::new(EncryptionSessionParams {
-			id: session_id.clone(),
-			self_node_id: self.self_node_id.clone(),
-			encrypted_data: encrypted_data,
-			key_storage: self.key_storage.clone(),
-			cluster: cluster,
-		}))
-	}
-
-	/// Send encryption session error.
-	pub fn respond_with_encryption_error(&self, session_id: &SessionId, error: message::EncryptionSessionError) {
-		self.encryption_sessions.sessions.read().get(session_id)
-			.map(|s| {
-				// error in encryption session is considered fatal
-				// => broadcast error
-
-				// do not bother processing send error, as we already processing error
-				let _ = s.cluster_view.broadcast(Message::Encryption(EncryptionMessage::EncryptionSessionError(error)));
-			});
-	}
-
-	/// Create new decryption session.
-	pub fn new_decryption_session(&self, master: NodeId, session_id: SessionId, sub_session_id: Secret, cluster: Arc<ClusterView>, requester_signature: Option<Signature>) -> Result<Arc<DecryptionSessionImpl>, Error> {
-		let session_id = DecryptionSessionId::new(session_id, sub_session_id);
-		let encrypted_data = self.read_key_share(&session_id.id, &cluster)?;
-
-		self.decryption_sessions.insert(master, session_id.clone(), cluster.clone(), move || DecryptionSessionImpl::new(DecryptionSessionParams {
-			meta: SessionMeta {
-				id: session_id.id,
-				self_node_id: self.self_node_id.clone(),
-				master_node_id: master,
-				threshold: encrypted_data.threshold,
-			},
-			access_key: session_id.access_key,
-			key_share: encrypted_data,
-			acl_storage: self.acl_storage.clone(),
-			cluster: cluster,
-		}, requester_signature))
-	}
-
-	/// Send decryption session error.
-	pub fn respond_with_decryption_error(&self, session_id: &SessionId, sub_session_id: &Secret, to: &NodeId, error: message::DecryptionSessionError) {
-		let session_id = DecryptionSessionId::new(session_id.clone(), sub_session_id.clone());
-		self.decryption_sessions.sessions.read().get(&session_id)
-			.map(|s| {
-				// error in decryption session is non-fatal, if occurs on slave node
-				// => either respond with error
-				// => or broadcast error
-
-				// do not bother processing send error, as we already processing error
-				if s.master == self.self_node_id {
-					let _ = s.cluster_view.broadcast(Message::Decryption(DecryptionMessage::DecryptionSessionError(error)));
-				} else {
-					let _ = s.cluster_view.send(to, Message::Decryption(DecryptionMessage::DecryptionSessionError(error)));
-				}
-			});
-	}
-
-	/// Create new signing session.
-	pub fn new_signing_session(&self, master: NodeId, session_id: SessionId, sub_session_id: Secret, cluster: Arc<ClusterView>, requester_signature: Option<Signature>) -> Result<Arc<SigningSessionImpl>, Error> {
-		let session_id = SigningSessionId::new(session_id, sub_session_id);
-		let encrypted_data = self.read_key_share(&session_id.id, &cluster)?;
-
-		self.signing_sessions.insert(master, session_id.clone(), cluster.clone(), move || SigningSessionImpl::new(SigningSessionParams {
-			meta: SessionMeta {
-				id: session_id.id,
-				self_node_id: self.self_node_id.clone(),
-				master_node_id: master,
-				threshold: encrypted_data.threshold,
-			},
-			access_key: session_id.access_key,
-			key_share: encrypted_data,
-			acl_storage: self.acl_storage.clone(),
-			cluster: cluster,
-		}, requester_signature))
-	}
-
-	/// Send signing session error.
-	pub fn respond_with_signing_error(&self, session_id: &SessionId, sub_session_id: &Secret, to: &NodeId, error: message::SigningSessionError) {
-		let session_id = SigningSessionId::new(session_id.clone(), sub_session_id.clone());
-		self.signing_sessions.sessions.read().get(&session_id)
-			.map(|s| {
-				// error in signing session is non-fatal, if occurs on slave node
-				// => either respond with error
-				// => or broadcast error
-
-				// do not bother processing send error, as we already processing error
-				if s.master == self.self_node_id {
-					let _ = s.cluster_view.broadcast(Message::Signing(SigningMessage::SigningSessionError(error)));
-				} else {
-					let _ = s.cluster_view.send(to, Message::Signing(SigningMessage::SigningSessionError(error)));
-				}
-			});
+	/// When session-level keep-alive response is received.
+	pub fn on_session_keep_alive(&self, sender: &NodeId, session_id: SessionId) {
+		if session_id == *SERVERS_SET_CHANGE_SESSION_ID {
+			self.admin_sessions.on_keep_alive(&session_id, sender);
+		}
 	}
 
 	/// Stop sessions that are stalling.
@@ -294,7 +247,10 @@ impl ClusterSessions {
 		self.generation_sessions.stop_stalled_sessions();
 		self.encryption_sessions.stop_stalled_sessions();
 		self.decryption_sessions.stop_stalled_sessions();
-		self.signing_sessions.stop_stalled_sessions();
+		self.schnorr_signing_sessions.stop_stalled_sessions();
+		self.ecdsa_signing_sessions.stop_stalled_sessions();
+		self.negotiation_sessions.stop_stalled_sessions();
+		self.admin_sessions.stop_stalled_sessions();
 	}
 
 	/// When connection to node is lost.
@@ -302,63 +258,92 @@ impl ClusterSessions {
 		self.generation_sessions.on_connection_timeout(node_id);
 		self.encryption_sessions.on_connection_timeout(node_id);
 		self.decryption_sessions.on_connection_timeout(node_id);
-		self.signing_sessions.on_connection_timeout(node_id);
-	}
-
-	/// Read key share && remove disconnected nodes.
-	fn read_key_share(&self, key_id: &SessionId, cluster: &Arc<ClusterView>) -> Result<DocumentKeyShare, Error> {
-		let mut encrypted_data = self.key_storage.get(key_id).map_err(|e| Error::KeyStorage(e.into()))?;
-
-		// some of nodes, which were encrypting secret may be down
-		// => do not use these in session
-		let disconnected_nodes: BTreeSet<_> = encrypted_data.id_numbers.keys().cloned().collect();
-		for disconnected_node in disconnected_nodes.difference(&cluster.nodes()) {
-			encrypted_data.id_numbers.remove(&disconnected_node);
-		}
-		Ok(encrypted_data)
+		self.schnorr_signing_sessions.on_connection_timeout(node_id);
+		self.ecdsa_signing_sessions.on_connection_timeout(node_id);
+		self.negotiation_sessions.on_connection_timeout(node_id);
+		self.admin_sessions.on_connection_timeout(node_id);
+		self.creator_core.on_connection_timeout(node_id);
 	}
 }
 
-impl<K, V, M> ClusterSessionsContainer<K, V, M> where K: Clone + Ord, V: ClusterSession {
-	pub fn new() -> Self {
+impl<S, SC, D> ClusterSessionsContainer<S, SC, D> where S: ClusterSession, SC: ClusterSessionCreator<S, D> {
+	pub fn new(creator: SC, container_state: Arc<Mutex<ClusterSessionsContainerState>>) -> Self {
 		ClusterSessionsContainer {
+			creator: creator,
 			sessions: RwLock::new(BTreeMap::new()),
+			listeners: Mutex::new(Vec::new()),
+			container_state: container_state,
+			_pd: Default::default(),
 		}
 	}
 
-	pub fn get(&self, session_id: &K) -> Option<Arc<V>> {
-		self.sessions.read().get(session_id).map(|s| s.session.clone())
+	pub fn add_listener(&self, listener: Arc<ClusterSessionsListener<S>>) {
+		self.listeners.lock().push(Arc::downgrade(&listener));
 	}
 
-	pub fn insert<F: FnOnce() -> Result<V, Error>>(&self, master: NodeId, session_id: K, cluster: Arc<ClusterView>, session: F) -> Result<Arc<V>, Error> {
+	#[cfg(test)]
+	pub fn is_empty(&self) -> bool {
+		self.sessions.read().is_empty()
+	}
+
+	pub fn get(&self, session_id: &S::Id, update_last_message_time: bool) -> Option<Arc<S>> {
+		let mut sessions = self.sessions.write();
+		sessions.get_mut(session_id)
+			.map(|s| {
+				if update_last_message_time {
+					s.last_message_time = time::Instant::now();
+				}
+				s.session.clone()
+			})
+	}
+
+	#[cfg(test)]
+	pub fn first(&self) -> Option<Arc<S>> {
+		self.sessions.read().values().nth(0).map(|s| s.session.clone())
+	}
+
+	pub fn insert(&self, cluster: Arc<Cluster>, master: NodeId, session_id: S::Id, session_nonce: Option<u64>, is_exclusive_session: bool, creation_data: Option<D>) -> Result<Arc<S>, Error> {
 		let mut sessions = self.sessions.write();
 		if sessions.contains_key(&session_id) {
 			return Err(Error::DuplicateSessionId);
 		}
 
-		let session = Arc::new(session()?);
+		// create cluster
+		// let cluster = create_cluster_view(data, requires_all_connections)?;
+		// create session
+		let session = self.creator.create(cluster.clone(), master.clone(), session_nonce, session_id.clone(), creation_data)?;
+		// check if session can be started
+		self.container_state.lock().on_session_starting(is_exclusive_session)?;
+
+		// insert session
 		let queued_session = QueuedSession {
 			master: master,
 			cluster_view: cluster,
+			last_keep_alive_time: time::Instant::now(),
 			last_message_time: time::Instant::now(),
 			session: session.clone(),
 			queue: VecDeque::new(),
 		};
 		sessions.insert(session_id, queued_session);
+		self.notify_listeners(|l| l.on_session_inserted(session.clone()));
+
 		Ok(session)
 	}
 
-	pub fn remove(&self, session_id: &K) {
-		self.sessions.write().remove(session_id);
+	pub fn remove(&self, session_id: &S::Id) {
+		if let Some(session) = self.sessions.write().remove(session_id) {
+			self.container_state.lock().on_session_completed();
+			self.notify_listeners(|l| l.on_session_removed(session.session.clone()));
+		}
 	}
 
-	pub fn enqueue_message(&self, session_id: &K, sender: NodeId, message: M, is_queued_message: bool) {
+	pub fn enqueue_message(&self, session_id: &S::Id, sender: NodeId, message: Message, is_queued_message: bool) {
 		self.sessions.write().get_mut(session_id)
 			.map(|session| if is_queued_message { session.queue.push_front((sender, message)) }
 				else { session.queue.push_back((sender, message)) });
 	}
 
-	pub fn dequeue_message(&self, session_id: &K) -> Option<(NodeId, M)> {
+	pub fn dequeue_message(&self, session_id: &S::Id) -> Option<(NodeId, Message)> {
 		self.sessions.write().get_mut(session_id)
 			.and_then(|session| session.queue.pop_front())
 	}
@@ -395,112 +380,234 @@ impl<K, V, M> ClusterSessionsContainer<K, V, M> where K: Clone + Ord, V: Cluster
 			}
 		}
 	}
-}
 
-impl GenerationSessionWrapper {
-	pub fn new(cluster: Weak<ClusterData>, session_id: SessionId, session: Arc<GenerationSession>) -> Arc<Self> {
-		Arc::new(GenerationSessionWrapper {
-			session: session,
-			session_id: session_id,
-			cluster: cluster,
-		})
+	fn notify_listeners<F: Fn(&ClusterSessionsListener<S>) -> ()>(&self, callback: F) {
+		let mut listeners = self.listeners.lock();
+		let mut listener_index = 0;
+		while listener_index < listeners.len() {
+			match listeners[listener_index].upgrade() {
+				Some(listener) => {
+					callback(&*listener);
+					listener_index += 1;
+				},
+				None => {
+					listeners.swap_remove(listener_index);
+				},
+			}
+		}
 	}
 }
 
-impl GenerationSession for GenerationSessionWrapper {
-	fn state(&self) -> GenerationSessionState {
-		self.session.state()
+impl<S, SC, D> ClusterSessionsContainer<S, SC, D> where S: ClusterSession, SC: ClusterSessionCreator<S, D>, SessionId: From<S::Id> {
+	pub fn send_keep_alive(&self, session_id: &S::Id, self_node_id: &NodeId) {
+		if let Some(session) = self.sessions.write().get_mut(session_id) {
+			let now = time::Instant::now();
+			if self_node_id == &session.master && now - session.last_keep_alive_time > time::Duration::from_secs(SESSION_KEEP_ALIVE_INTERVAL) {
+				session.last_keep_alive_time = now;
+				// since we send KeepAlive message to prevent nodes from disconnecting
+				// && worst thing that can happen if node is disconnected is that session is failed
+				// => ignore error here, because probably this node is not need for the rest of the session at all
+				let _ = session.cluster_view.broadcast(Message::Cluster(message::ClusterMessage::KeepAliveResponse(message::KeepAliveResponse {
+					session_id: Some(session_id.clone().into()),
+				})));
+			}
+		}
 	}
 
-	fn wait(&self, timeout: Option<time::Duration>) -> Result<Public, Error> {
-		self.session.wait(timeout)
+	pub fn on_keep_alive(&self, session_id: &S::Id, sender: &NodeId) {
+		if let Some(session) = self.sessions.write().get_mut(session_id) {
+			let now = time::Instant::now();
+			// we only accept keep alive from master node of ServersSetChange session
+			if sender == &session.master {
+				session.last_keep_alive_time = now;
+			}
+		}
 	}
+}
 
-	fn joint_public_and_secret(&self) -> Option<Result<(Public, Secret), Error>> {
-		self.session.joint_public_and_secret()
+impl ClusterSessionsContainerState {
+	/// When session is starting.
+	pub fn on_session_starting(&mut self, is_exclusive_session: bool) -> Result<(), Error> {
+		match *self {
+			ClusterSessionsContainerState::Idle if is_exclusive_session => {
+				::std::mem::replace(self, ClusterSessionsContainerState::Exclusive);
+			},
+			ClusterSessionsContainerState::Idle => {
+				::std::mem::replace(self, ClusterSessionsContainerState::Active(1));
+			},
+			ClusterSessionsContainerState::Active(_) if is_exclusive_session =>
+				return Err(Error::HasActiveSessions),
+			ClusterSessionsContainerState::Active(sessions_count) => {
+				::std::mem::replace(self, ClusterSessionsContainerState::Active(sessions_count + 1));
+			},
+			ClusterSessionsContainerState::Exclusive =>
+				return Err(Error::ExclusiveSessionActive),
+		}
+		Ok(())
 	}
-}
 
-impl Drop for GenerationSessionWrapper {
-	fn drop(&mut self) {
-		if let Some(cluster) = self.cluster.upgrade() {
-			cluster.sessions().generation_sessions.remove(&self.session_id);
+	/// When session is completed.
+	pub fn on_session_completed(&mut self) {
+		match *self {
+			ClusterSessionsContainerState::Idle =>
+				unreachable!("idle means that there are no active sessions; on_session_completed is only called once after active session is completed; qed"),
+			ClusterSessionsContainerState::Active(sessions_count) if sessions_count == 1 => {
+				::std::mem::replace(self, ClusterSessionsContainerState::Idle);
+			},
+			ClusterSessionsContainerState::Active(sessions_count) => {
+				::std::mem::replace(self, ClusterSessionsContainerState::Active(sessions_count - 1));
+			}
+			ClusterSessionsContainerState::Exclusive => {
+				::std::mem::replace(self, ClusterSessionsContainerState::Idle);
+			},
 		}
 	}
 }
 
-impl EncryptionSessionWrapper {
-	pub fn new(cluster: Weak<ClusterData>, session_id: SessionId, session: Arc<EncryptionSession>) -> Arc<Self> {
-		Arc::new(EncryptionSessionWrapper {
-			session: session,
-			session_id: session_id,
-			cluster: cluster,
-		})
+impl SessionIdWithSubSession {
+	/// Create new decryption session Id.
+	pub fn new(session_id: SessionId, sub_session_id: Secret) -> Self {
+		SessionIdWithSubSession {
+			id: session_id,
+			access_key: sub_session_id,
+		}
 	}
 }
 
-impl EncryptionSession for EncryptionSessionWrapper {
-	fn state(&self) -> EncryptionSessionState {
-		self.session.state()
+impl PartialOrd for SessionIdWithSubSession {
+	fn partial_cmp(&self, other: &Self) -> Option<::std::cmp::Ordering> {
+		Some(self.cmp(other))
 	}
+}
 
-	fn wait(&self, timeout: Option<time::Duration>) -> Result<(), Error> {
-		self.session.wait(timeout)
+impl Ord for SessionIdWithSubSession {
+	fn cmp(&self, other: &Self) -> ::std::cmp::Ordering {
+		match self.id.cmp(&other.id) {
+			::std::cmp::Ordering::Equal => self.access_key.cmp(&other.access_key),
+			r @ _ => r,
+		}
 	}
 }
 
-impl Drop for EncryptionSessionWrapper {
-	fn drop(&mut self) {
-		if let Some(cluster) = self.cluster.upgrade() {
-			cluster.sessions().encryption_sessions.remove(&self.session_id);
+impl AdminSession {
+	pub fn as_servers_set_change(&self) -> Option<&ServersSetChangeSessionImpl> {
+		match *self {
+			AdminSession::ServersSetChange(ref session) => Some(session),
+			_ => None
 		}
 	}
 }
 
-impl DecryptionSessionWrapper {
-	pub fn new(cluster: Weak<ClusterData>, session_id: DecryptionSessionId, session: Arc<DecryptionSession>) -> Arc<Self> {
-		Arc::new(DecryptionSessionWrapper {
-			session: session,
-			session_id: session_id,
-			cluster: cluster,
-		})
+impl ClusterSession for AdminSession {
+	type Id = SessionId;
+
+	fn type_name() -> &'static str {
+		"admin"
 	}
-}
 
-impl DecryptionSession for DecryptionSessionWrapper {
-	fn wait(&self) -> Result<EncryptedDocumentKeyShadow, Error> {
-		self.session.wait()
+	fn id(&self) -> SessionId {
+		match *self {
+			AdminSession::ShareAdd(ref session) => session.id().clone(),
+			AdminSession::ServersSetChange(ref session) => session.id().clone(),
+		}
 	}
-}
 
-impl Drop for DecryptionSessionWrapper {
-	fn drop(&mut self) {
-		if let Some(cluster) = self.cluster.upgrade() {
-			cluster.sessions().decryption_sessions.remove(&self.session_id);
+	fn is_finished(&self) -> bool {
+		match *self {
+			AdminSession::ShareAdd(ref session) => session.is_finished(),
+			AdminSession::ServersSetChange(ref session) => session.is_finished(),
 		}
 	}
-}
 
-impl SigningSessionWrapper {
-	pub fn new(cluster: Weak<ClusterData>, session_id: SigningSessionId, session: Arc<SigningSession>) -> Arc<Self> {
-		Arc::new(SigningSessionWrapper {
-			session: session,
-			session_id: session_id,
-			cluster: cluster,
-		})
+	fn on_session_timeout(&self) {
+		match *self {
+			AdminSession::ShareAdd(ref session) => session.on_session_timeout(),
+			AdminSession::ServersSetChange(ref session) => session.on_session_timeout(),
+		}
+	}
+
+	fn on_node_timeout(&self, node_id: &NodeId) {
+		match *self {
+			AdminSession::ShareAdd(ref session) => session.on_node_timeout(node_id),
+			AdminSession::ServersSetChange(ref session) => session.on_node_timeout(node_id),
+		}
+	}
+
+	fn on_session_error(&self, node: &NodeId, error: Error) {
+		match *self {
+			AdminSession::ShareAdd(ref session) => session.on_session_error(node, error),
+			AdminSession::ServersSetChange(ref session) => session.on_session_error(node, error),
+		}
 	}
-}
 
-impl SigningSession for SigningSessionWrapper {
-	fn wait(&self) -> Result<(Secret, Secret), Error> {
-		self.session.wait()
+	fn on_message(&self, sender: &NodeId, message: &Message) -> Result<(), Error> {
+		match *self {
+			AdminSession::ShareAdd(ref session) => session.on_message(sender, message),
+			AdminSession::ServersSetChange(ref session) => session.on_message(sender, message),
+		}
+	}
+}
+pub fn create_cluster_view(data: &Arc<ClusterData>, requires_all_connections: bool) -> Result<Arc<Cluster>, Error> {
+	if requires_all_connections {
+		if !data.connections.disconnected_nodes().is_empty() {
+			return Err(Error::NodeDisconnected);
+		}
 	}
+
+	let mut connected_nodes = data.connections.connected_nodes();
+	connected_nodes.insert(data.self_key_pair.public().clone());
+
+	Ok(Arc::new(ClusterView::new(data.clone(), connected_nodes)))
 }
 
-impl Drop for SigningSessionWrapper {
-	fn drop(&mut self) {
-		if let Some(cluster) = self.cluster.upgrade() {
-			cluster.sessions().signing_sessions.remove(&self.session_id);
+#[cfg(test)]
+mod tests {
+	use std::sync::Arc;
+	use ethkey::{Random, Generator};
+	use key_server_cluster::{Error, DummyAclStorage, DummyKeyStorage, MapKeyServerSet, PlainNodeKeyPair};
+	use key_server_cluster::cluster::ClusterConfiguration;
+	use key_server_cluster::connection_trigger::SimpleServersSetChangeSessionCreatorConnector;
+	use key_server_cluster::cluster::tests::DummyCluster;
+	use super::{ClusterSessions, AdminSessionCreationData};
+
+	pub fn make_cluster_sessions() -> ClusterSessions {
+		let key_pair = Random.generate().unwrap();
+		let config = ClusterConfiguration {
+			threads: 1,
+			self_key_pair: Arc::new(PlainNodeKeyPair::new(key_pair.clone())),
+			listen_address: ("127.0.0.1".to_owned(), 100_u16),
+			key_server_set: Arc::new(MapKeyServerSet::new(vec![(key_pair.public().clone(), format!("127.0.0.1:{}", 100).parse().unwrap())].into_iter().collect())),
+			allow_connecting_to_higher_nodes: false,
+			key_storage: Arc::new(DummyKeyStorage::default()),
+			acl_storage: Arc::new(DummyAclStorage::default()),
+			admin_public: Some(Random.generate().unwrap().public().clone()),
+			auto_migrate_enabled: false,
+		};
+		ClusterSessions::new(&config, Arc::new(SimpleServersSetChangeSessionCreatorConnector {
+			admin_public: Some(Random.generate().unwrap().public().clone()),
+		}))
+	}
+
+	#[test]
+	fn cluster_session_cannot_be_started_if_exclusive_session_is_active() {
+		let sessions = make_cluster_sessions();
+		sessions.generation_sessions.insert(Arc::new(DummyCluster::new(Default::default())), Default::default(), Default::default(), None, false, None).unwrap();
+		match sessions.admin_sessions.insert(Arc::new(DummyCluster::new(Default::default())), Default::default(), Default::default(), None, true, Some(AdminSessionCreationData::ShareAdd(Default::default()))) {
+			Err(Error::HasActiveSessions) => (),
+			Err(e) => unreachable!(format!("{}", e)),
+			Ok(_) => unreachable!("OK"),
+		}
+	}
+
+	#[test]
+	fn exclusive_session_cannot_be_started_if_other_session_is_active() {
+		let sessions = make_cluster_sessions();
+
+		sessions.admin_sessions.insert(Arc::new(DummyCluster::new(Default::default())), Default::default(), Default::default(), None, true, Some(AdminSessionCreationData::ShareAdd(Default::default()))).unwrap();
+		match sessions.generation_sessions.insert(Arc::new(DummyCluster::new(Default::default())), Default::default(), Default::default(), None, false, None) {
+			Err(Error::ExclusiveSessionActive) => (),
+			Err(e) => unreachable!(format!("{}", e)),
+			Ok(_) => unreachable!("OK"),
 		}
 	}
 }
diff --git a/secret_store/src/key_server_cluster/cluster_sessions_creator.rs b/secret_store/src/key_server_cluster/cluster_sessions_creator.rs
new file mode 100644
index 0000000000000000000000000000000000000000..86e40853e2203cb80c2a1814f9563bfce857d47b
--- /dev/null
+++ b/secret_store/src/key_server_cluster/cluster_sessions_creator.rs
@@ -0,0 +1,482 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::collections::BTreeMap;
+use parking_lot::RwLock;
+use ethkey::Public;
+use key_server_cluster::{Error, NodeId, SessionId, Requester, AclStorage, KeyStorage, DocumentKeyShare, SessionMeta};
+use key_server_cluster::cluster::{Cluster, ClusterConfiguration};
+use key_server_cluster::connection_trigger::ServersSetChangeSessionCreatorConnector;
+use key_server_cluster::cluster_sessions::{ClusterSession, SessionIdWithSubSession, AdminSession, AdminSessionCreationData};
+use key_server_cluster::message::{self, Message, DecryptionMessage, SchnorrSigningMessage, ConsensusMessageOfShareAdd,
+	ShareAddMessage, ServersSetChangeMessage, ConsensusMessage, ConsensusMessageWithServersSet, EcdsaSigningMessage};
+use key_server_cluster::generation_session::{SessionImpl as GenerationSessionImpl, SessionParams as GenerationSessionParams};
+use key_server_cluster::decryption_session::{SessionImpl as DecryptionSessionImpl,
+	SessionParams as DecryptionSessionParams};
+use key_server_cluster::encryption_session::{SessionImpl as EncryptionSessionImpl, SessionParams as EncryptionSessionParams};
+use key_server_cluster::signing_session_ecdsa::{SessionImpl as EcdsaSigningSessionImpl,
+	SessionParams as EcdsaSigningSessionParams};
+use key_server_cluster::signing_session_schnorr::{SessionImpl as SchnorrSigningSessionImpl,
+	SessionParams as SchnorrSigningSessionParams};
+use key_server_cluster::share_add_session::{SessionImpl as ShareAddSessionImpl,
+	SessionParams as ShareAddSessionParams, IsolatedSessionTransport as ShareAddTransport};
+use key_server_cluster::servers_set_change_session::{SessionImpl as ServersSetChangeSessionImpl,
+	SessionParams as ServersSetChangeSessionParams};
+use key_server_cluster::key_version_negotiation_session::{SessionImpl as KeyVersionNegotiationSessionImpl,
+	SessionParams as KeyVersionNegotiationSessionParams, IsolatedSessionTransport as VersionNegotiationTransport,
+	FastestResultComputer as FastestResultKeyVersionsResultComputer};
+use key_server_cluster::admin_sessions::ShareChangeSessionMeta;
+
+/// Generic cluster session creator.
+pub trait ClusterSessionCreator<S: ClusterSession, D> {
+	/// Get creation data from message.
+	fn creation_data_from_message(_message: &Message) -> Result<Option<D>, Error> {
+		Ok(None)
+	}
+
+	/// Prepare error message.
+	fn make_error_message(sid: S::Id, nonce: u64, err: Error) -> Message;
+
+	/// Create cluster session.
+	fn create(&self, cluster: Arc<Cluster>, master: NodeId, nonce: Option<u64>, id: S::Id, creation_data: Option<D>) -> Result<Arc<S>, Error>;
+}
+
+/// Message with session id.
+pub trait IntoSessionId<K> {
+	/// Get session id.
+	fn into_session_id(&self) -> Result<K, Error>;
+}
+
+pub struct SessionCreatorCore {
+	/// Self node id.
+	self_node_id: NodeId,
+	/// Reference to key storage
+	key_storage: Arc<KeyStorage>,
+	/// Reference to ACL storage
+	acl_storage: Arc<AclStorage>,
+	/// Always-increasing sessions counter. Is used as session nonce to prevent replay attacks:
+	/// 1) during handshake, KeyServers generate new random key to encrypt messages
+	/// => there's no way to use messages from previous connections for replay attacks
+	/// 2) when session (of any type) is started, master node increases its own session counter and broadcasts it
+	/// 3) when slave KeyServer receives session initialization message, it checks that new nonce is larger than previous (from the same master)
+	/// => there's no way to use messages from previous sessions for replay attacks
+	/// 4) KeyServer checks that each session message contains the same nonce that initialization message
+	/// Given that: (A) handshake is secure and (B) session itself is initially replay-protected
+	/// => this guarantees that sessions are replay-protected.
+	session_counter: AtomicUsize,
+	/// Maximal session nonce, received from given connection.
+	max_nonce: RwLock<BTreeMap<NodeId, u64>>,
+}
+
+impl SessionCreatorCore {
+	/// Create new session creator core.
+	pub fn new(config: &ClusterConfiguration) -> Self {
+		SessionCreatorCore {
+			self_node_id: config.self_key_pair.public().clone(),
+			acl_storage: config.acl_storage.clone(),
+			key_storage: config.key_storage.clone(),
+			session_counter: AtomicUsize::new(0),
+			max_nonce: RwLock::new(BTreeMap::new()),
+		}
+	}
+
+	/// When node has teimtouted.
+	pub fn on_connection_timeout(&self, node_id: &NodeId) {
+		self.max_nonce.write().remove(node_id);
+	}
+
+	/// Check or generate new session nonce.
+	fn check_session_nonce(&self, master: &NodeId, nonce: Option<u64>) -> Result<u64, Error> {
+		// if we're master node of the session, then nonce should be generated
+		// if we're slave node of the session, then nonce should be passed from outside
+		match nonce {
+			Some(nonce) => match nonce > *self.max_nonce.write().entry(master.clone()).or_insert(0) {
+				true => Ok(nonce),
+				false => Err(Error::ReplayProtection),
+			},
+			None => Ok(self.session_counter.fetch_add(1, Ordering::Relaxed) as u64 + 1),
+		}
+	}
+
+	/// Read key share && remove disconnected nodes.
+	fn read_key_share(&self, key_id: &SessionId) -> Result<Option<DocumentKeyShare>, Error> {
+		self.key_storage.get(key_id).map_err(|e| Error::KeyStorage(e.into()))
+	}
+}
+
+/// Generation session creator.
+pub struct GenerationSessionCreator {
+	/// True if generation sessions must fail.
+	pub make_faulty_generation_sessions: AtomicBool,
+	/// Creator core.
+	pub core: Arc<SessionCreatorCore>,
+}
+
+impl GenerationSessionCreator {
+	#[cfg(test)]
+	pub fn make_faulty_generation_sessions(&self) {
+		self.make_faulty_generation_sessions.store(true, Ordering::Relaxed);
+	}
+}
+
+impl ClusterSessionCreator<GenerationSessionImpl, ()> for GenerationSessionCreator {
+	fn make_error_message(sid: SessionId, nonce: u64, err: Error) -> Message {
+		message::Message::Generation(message::GenerationMessage::SessionError(message::SessionError {
+			session: sid.into(),
+			session_nonce: nonce,
+			error: err.into(),
+		}))
+	}
+
+	fn create(&self, cluster: Arc<Cluster>, master: NodeId, nonce: Option<u64>, id: SessionId, _creation_data: Option<()>) -> Result<Arc<GenerationSessionImpl>, Error> {
+		// check that there's no finished encryption session with the same id
+		if self.core.key_storage.contains(&id) {
+			return Err(Error::DuplicateSessionId);
+		}
+
+		let nonce = self.core.check_session_nonce(&master, nonce)?;
+		Ok(GenerationSessionImpl::new(GenerationSessionParams {
+			id: id.clone(),
+			self_node_id: self.core.self_node_id.clone(),
+			key_storage: Some(self.core.key_storage.clone()),
+			cluster: cluster,
+			nonce: Some(nonce),
+		}))
+		.map(|session| {
+			if self.make_faulty_generation_sessions.load(Ordering::Relaxed) {
+				session.simulate_faulty_behaviour();
+			}
+			session
+		})
+		.map(Arc::new)
+	}
+}
+
+/// Encryption session creator.
+pub struct EncryptionSessionCreator {
+	/// Creator core.
+	pub core: Arc<SessionCreatorCore>,
+}
+
+impl ClusterSessionCreator<EncryptionSessionImpl, ()> for EncryptionSessionCreator {
+	fn make_error_message(sid: SessionId, nonce: u64, err: Error) -> Message {
+		message::Message::Encryption(message::EncryptionMessage::EncryptionSessionError(message::EncryptionSessionError {
+			session: sid.into(),
+			session_nonce: nonce,
+			error: err.into(),
+		}))
+	}
+
+	fn create(&self, cluster: Arc<Cluster>, master: NodeId, nonce: Option<u64>, id: SessionId, _creation_data: Option<()>) -> Result<Arc<EncryptionSessionImpl>, Error> {
+		let encrypted_data = self.core.read_key_share(&id)?;
+		let nonce = self.core.check_session_nonce(&master, nonce)?;
+		Ok(Arc::new(EncryptionSessionImpl::new(EncryptionSessionParams {
+			id: id,
+			self_node_id: self.core.self_node_id.clone(),
+			encrypted_data: encrypted_data,
+			key_storage: self.core.key_storage.clone(),
+			cluster: cluster,
+			nonce: nonce,
+		})?))
+	}
+}
+
+/// Decryption session creator.
+pub struct DecryptionSessionCreator {
+	/// Creator core.
+	pub core: Arc<SessionCreatorCore>,
+}
+
+impl ClusterSessionCreator<DecryptionSessionImpl, Requester> for DecryptionSessionCreator {
+	fn creation_data_from_message(message: &Message) -> Result<Option<Requester>, Error> {
+		match *message {
+			Message::Decryption(DecryptionMessage::DecryptionConsensusMessage(ref message)) => match &message.message {
+				&ConsensusMessage::InitializeConsensusSession(ref message) => Ok(Some(message.requester.clone().into())),
+				_ => Err(Error::InvalidMessage),
+			},
+			Message::Decryption(DecryptionMessage::DecryptionSessionDelegation(ref message)) => Ok(Some(message.requester.clone().into())),
+			_ => Err(Error::InvalidMessage),
+		}
+	}
+
+	fn make_error_message(sid: SessionIdWithSubSession, nonce: u64, err: Error) -> Message {
+		message::Message::Decryption(message::DecryptionMessage::DecryptionSessionError(message::DecryptionSessionError {
+			session: sid.id.into(),
+			sub_session: sid.access_key.into(),
+			session_nonce: nonce,
+			error: err.into(),
+		}))
+	}
+
+	fn create(&self, cluster: Arc<Cluster>, master: NodeId, nonce: Option<u64>, id: SessionIdWithSubSession, requester: Option<Requester>) -> Result<Arc<DecryptionSessionImpl>, Error> {
+		let encrypted_data = self.core.read_key_share(&id.id)?;
+		let nonce = self.core.check_session_nonce(&master, nonce)?;
+		Ok(Arc::new(DecryptionSessionImpl::new(DecryptionSessionParams {
+			meta: SessionMeta {
+				id: id.id,
+				self_node_id: self.core.self_node_id.clone(),
+				master_node_id: master,
+				threshold: encrypted_data.as_ref().map(|ks| ks.threshold).unwrap_or_default(),
+			},
+			access_key: id.access_key,
+			key_share: encrypted_data,
+			acl_storage: self.core.acl_storage.clone(),
+			cluster: cluster,
+			nonce: nonce,
+		}, requester)?))
+	}
+}
+
+/// Schnorr signing session creator.
+pub struct SchnorrSigningSessionCreator {
+	/// Creator core.
+	pub core: Arc<SessionCreatorCore>,
+}
+
+impl ClusterSessionCreator<SchnorrSigningSessionImpl, Requester> for SchnorrSigningSessionCreator {
+	fn creation_data_from_message(message: &Message) -> Result<Option<Requester>, Error> {
+		match *message {
+			Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningConsensusMessage(ref message)) => match &message.message {
+				&ConsensusMessage::InitializeConsensusSession(ref message) => Ok(Some(message.requester.clone().into())),
+				_ => Err(Error::InvalidMessage),
+			},
+			Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionDelegation(ref message)) => Ok(Some(message.requester.clone().into())),
+			_ => Err(Error::InvalidMessage),
+		}
+	}
+
+	fn make_error_message(sid: SessionIdWithSubSession, nonce: u64, err: Error) -> Message {
+		message::Message::SchnorrSigning(message::SchnorrSigningMessage::SchnorrSigningSessionError(message::SchnorrSigningSessionError {
+			session: sid.id.into(),
+			sub_session: sid.access_key.into(),
+			session_nonce: nonce,
+			error: err.into(),
+		}))
+	}
+
+	fn create(&self, cluster: Arc<Cluster>, master: NodeId, nonce: Option<u64>, id: SessionIdWithSubSession, requester: Option<Requester>) -> Result<Arc<SchnorrSigningSessionImpl>, Error> {
+		let encrypted_data = self.core.read_key_share(&id.id)?;
+		let nonce = self.core.check_session_nonce(&master, nonce)?;
+		Ok(Arc::new(SchnorrSigningSessionImpl::new(SchnorrSigningSessionParams {
+			meta: SessionMeta {
+				id: id.id,
+				self_node_id: self.core.self_node_id.clone(),
+				master_node_id: master,
+				threshold: encrypted_data.as_ref().map(|ks| ks.threshold).unwrap_or_default(),
+			},
+			access_key: id.access_key,
+			key_share: encrypted_data,
+			acl_storage: self.core.acl_storage.clone(),
+			cluster: cluster,
+			nonce: nonce,
+		}, requester)?))
+	}
+}
+
+/// ECDSA signing session creator.
+pub struct EcdsaSigningSessionCreator {
+	/// Creator core.
+	pub core: Arc<SessionCreatorCore>,
+}
+
+impl ClusterSessionCreator<EcdsaSigningSessionImpl, Requester> for EcdsaSigningSessionCreator {
+	fn creation_data_from_message(message: &Message) -> Result<Option<Requester>, Error> {
+		match *message {
+			Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningConsensusMessage(ref message)) => match &message.message {
+				&ConsensusMessage::InitializeConsensusSession(ref message) => Ok(Some(message.requester.clone().into())),
+				_ => Err(Error::InvalidMessage),
+			},
+			Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionDelegation(ref message)) => Ok(Some(message.requester.clone().into())),
+			_ => Err(Error::InvalidMessage),
+		}
+	}
+
+	fn make_error_message(sid: SessionIdWithSubSession, nonce: u64, err: Error) -> Message {
+		message::Message::EcdsaSigning(message::EcdsaSigningMessage::EcdsaSigningSessionError(message::EcdsaSigningSessionError {
+			session: sid.id.into(),
+			sub_session: sid.access_key.into(),
+			session_nonce: nonce,
+			error: err.into(),
+		}))
+	}
+
+	fn create(&self, cluster: Arc<Cluster>, master: NodeId, nonce: Option<u64>, id: SessionIdWithSubSession, requester: Option<Requester>) -> Result<Arc<EcdsaSigningSessionImpl>, Error> {
+		let encrypted_data = self.core.read_key_share(&id.id)?;
+		let nonce = self.core.check_session_nonce(&master, nonce)?;
+		Ok(Arc::new(EcdsaSigningSessionImpl::new(EcdsaSigningSessionParams {
+			meta: SessionMeta {
+				id: id.id,
+				self_node_id: self.core.self_node_id.clone(),
+				master_node_id: master,
+				threshold: encrypted_data.as_ref().map(|ks| ks.threshold).unwrap_or_default(),
+			},
+			access_key: id.access_key,
+			key_share: encrypted_data,
+			acl_storage: self.core.acl_storage.clone(),
+			cluster: cluster,
+			nonce: nonce,
+		}, requester)?))
+	}
+}
+
+/// Key version negotiation session creator.
+pub struct KeyVersionNegotiationSessionCreator {
+	/// Creator core.
+	pub core: Arc<SessionCreatorCore>,
+}
+
+impl ClusterSessionCreator<KeyVersionNegotiationSessionImpl<VersionNegotiationTransport>, ()> for KeyVersionNegotiationSessionCreator {
+	fn make_error_message(sid: SessionIdWithSubSession, nonce: u64, err: Error) -> Message {
+		message::Message::KeyVersionNegotiation(message::KeyVersionNegotiationMessage::KeyVersionsError(message::KeyVersionsError {
+			session: sid.id.into(),
+			sub_session: sid.access_key.into(),
+			session_nonce: nonce,
+			error: err.into(),
+		}))
+	}
+
+	fn create(&self, cluster: Arc<Cluster>, master: NodeId, nonce: Option<u64>, id: SessionIdWithSubSession, _creation_data: Option<()>) -> Result<Arc<KeyVersionNegotiationSessionImpl<VersionNegotiationTransport>>, Error> {
+		let encrypted_data = self.core.read_key_share(&id.id)?;
+		let nonce = self.core.check_session_nonce(&master, nonce)?;
+		let computer = Arc::new(FastestResultKeyVersionsResultComputer::new(self.core.self_node_id.clone(), encrypted_data.as_ref()));
+		Ok(Arc::new(KeyVersionNegotiationSessionImpl::new(KeyVersionNegotiationSessionParams {
+			meta: ShareChangeSessionMeta {
+				id: id.id.clone(),
+				self_node_id: self.core.self_node_id.clone(),
+				master_node_id: master,
+			},
+			sub_session: id.access_key.clone(),
+			key_share: encrypted_data,
+			result_computer: computer,
+			transport: VersionNegotiationTransport {
+				cluster: cluster,
+				key_id: id.id,
+				sub_session: id.access_key.clone(),
+				nonce: nonce,
+			},
+			nonce: nonce,
+		})))
+	}
+}
+
+/// Administrative session creator.
+pub struct AdminSessionCreator {
+	/// Creator core.
+	pub core: Arc<SessionCreatorCore>,
+	/// Administrator public.
+	pub admin_public: Option<Public>,
+	/// Servers set change sessions creator connector.
+	pub servers_set_change_session_creator_connector: Arc<ServersSetChangeSessionCreatorConnector>,
+}
+
+impl ClusterSessionCreator<AdminSession, AdminSessionCreationData> for AdminSessionCreator {
+	fn creation_data_from_message(message: &Message) -> Result<Option<AdminSessionCreationData>, Error> {
+		match *message {
+			Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeConsensusMessage(ref message)) => match &message.message {
+				&ConsensusMessageWithServersSet::InitializeConsensusSession(ref message) => Ok(Some(AdminSessionCreationData::ServersSetChange(
+					message.migration_id.clone().map(Into::into),
+					message.new_nodes_set.clone().into_iter().map(Into::into).collect()
+				))),
+				_ => Err(Error::InvalidMessage),
+			},
+			Message::ShareAdd(ShareAddMessage::ShareAddConsensusMessage(ref message)) => match &message.message {
+				&ConsensusMessageOfShareAdd::InitializeConsensusSession(ref message) => Ok(Some(AdminSessionCreationData::ShareAdd(message.version.clone().into()))),
+				_ => Err(Error::InvalidMessage),
+			},
+			_ => Err(Error::InvalidMessage),
+		}
+	}
+
+	fn make_error_message(sid: SessionId, nonce: u64, err: Error) -> Message {
+		message::Message::ServersSetChange(message::ServersSetChangeMessage::ServersSetChangeError(message::ServersSetChangeError {
+			session: sid.into(),
+			session_nonce: nonce,
+			error: err.into(),
+		}))
+	}
+
+	fn create(&self, cluster: Arc<Cluster>, master: NodeId, nonce: Option<u64>, id: SessionId, creation_data: Option<AdminSessionCreationData>) -> Result<Arc<AdminSession>, Error> {
+		let nonce = self.core.check_session_nonce(&master, nonce)?;
+		Ok(Arc::new(match creation_data {
+			Some(AdminSessionCreationData::ShareAdd(version)) => {
+				AdminSession::ShareAdd(ShareAddSessionImpl::new(ShareAddSessionParams {
+					meta: ShareChangeSessionMeta {
+						id: id.clone(),
+						self_node_id: self.core.self_node_id.clone(),
+						master_node_id: master,
+					},
+					transport: ShareAddTransport::new(id.clone(), Some(version), nonce, cluster),
+					key_storage: self.core.key_storage.clone(),
+					nonce: nonce,
+					admin_public: Some(self.admin_public.clone().ok_or(Error::AccessDenied)?),
+				})?)
+			},
+			Some(AdminSessionCreationData::ServersSetChange(migration_id, new_nodes_set)) => {
+				let admin_public = self.servers_set_change_session_creator_connector.admin_public(migration_id.as_ref(), new_nodes_set)
+					.map_err(|_| Error::AccessDenied)?;
+
+				AdminSession::ServersSetChange(ServersSetChangeSessionImpl::new(ServersSetChangeSessionParams {
+					meta: ShareChangeSessionMeta {
+						id: id.clone(),
+						self_node_id: self.core.self_node_id.clone(),
+						master_node_id: master,
+					},
+					cluster: cluster.clone(),
+					key_storage: self.core.key_storage.clone(),
+					nonce: nonce,
+					all_nodes_set: cluster.nodes(),
+					admin_public: admin_public,
+					migration_id: migration_id,
+				})?)
+			},
+			None => unreachable!("expected to call with non-empty creation data; qed"),
+		}))
+	}
+}
+
+impl IntoSessionId<SessionId> for Message {
+	fn into_session_id(&self) -> Result<SessionId, Error> {
+		match *self {
+			Message::Generation(ref message) => Ok(message.session_id().clone()),
+			Message::Encryption(ref message) => Ok(message.session_id().clone()),
+			Message::Decryption(_) => Err(Error::InvalidMessage),
+			Message::SchnorrSigning(_) => Err(Error::InvalidMessage),
+			Message::EcdsaSigning(_) => Err(Error::InvalidMessage),
+			Message::ServersSetChange(ref message) => Ok(message.session_id().clone()),
+			Message::ShareAdd(ref message) => Ok(message.session_id().clone()),
+			Message::KeyVersionNegotiation(_) => Err(Error::InvalidMessage),
+			Message::Cluster(_) => Err(Error::InvalidMessage),
+		}
+	}
+}
+
+impl IntoSessionId<SessionIdWithSubSession> for Message {
+	fn into_session_id(&self) -> Result<SessionIdWithSubSession, Error> {
+		match *self {
+			Message::Generation(_) => Err(Error::InvalidMessage),
+			Message::Encryption(_) => Err(Error::InvalidMessage),
+			Message::Decryption(ref message) => Ok(SessionIdWithSubSession::new(message.session_id().clone(), message.sub_session_id().clone())),
+			Message::SchnorrSigning(ref message) => Ok(SessionIdWithSubSession::new(message.session_id().clone(), message.sub_session_id().clone())),
+			Message::EcdsaSigning(ref message) => Ok(SessionIdWithSubSession::new(message.session_id().clone(), message.sub_session_id().clone())),
+			Message::ServersSetChange(_) => Err(Error::InvalidMessage),
+			Message::ShareAdd(_) => Err(Error::InvalidMessage),
+			Message::KeyVersionNegotiation(ref message) => Ok(SessionIdWithSubSession::new(message.session_id().clone(), message.sub_session_id().clone())),
+			Message::Cluster(_) => Err(Error::InvalidMessage),
+		}
+	}
+}
diff --git a/secret_store/src/key_server_cluster/connection_trigger.rs b/secret_store/src/key_server_cluster/connection_trigger.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e0172b89aca1c86df012896238fb02b5625dff41
--- /dev/null
+++ b/secret_store/src/key_server_cluster/connection_trigger.rs
@@ -0,0 +1,362 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::{BTreeSet, BTreeMap};
+use std::collections::btree_map::Entry;
+use std::net::SocketAddr;
+use std::sync::Arc;
+use ethereum_types::H256;
+use ethkey::Public;
+use key_server_cluster::{KeyServerSet, KeyServerSetSnapshot};
+use key_server_cluster::cluster::{ClusterClient, ClusterConnectionsData};
+use key_server_cluster::cluster_sessions::AdminSession;
+use types::all::{Error, NodeId};
+use {NodeKeyPair};
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+/// Describes which maintain() call is required.
+pub enum Maintain {
+	/// We need to maintain() both connections && session.
+	SessionAndConnections,
+	/// Only call maintain_session.
+	Session,
+	/// Only call maintain_connections.
+	Connections,
+}
+
+/// Connection trigger, which executes necessary actions when set of key servers changes.
+pub trait ConnectionTrigger: Send + Sync {
+	/// On maintain interval.
+	fn on_maintain(&mut self) -> Option<Maintain>;
+	/// When connection is established.
+	fn on_connection_established(&mut self, node: &NodeId) -> Option<Maintain>;
+	/// When connection is closed.
+	fn on_connection_closed(&mut self, node: &NodeId) -> Option<Maintain>;
+	/// Maintain active sessions.
+	fn maintain_session(&mut self, sessions: &ClusterClient);
+	/// Maintain active connections.
+	fn maintain_connections(&mut self, connections: &mut ClusterConnectionsData);
+	/// Return connector for the servers set change session creator.
+	fn servers_set_change_creator_connector(&self) -> Arc<ServersSetChangeSessionCreatorConnector>;
+}
+
+/// Servers set change session creator connector.
+pub trait ServersSetChangeSessionCreatorConnector: Send + Sync {
+	/// Get actual administrator public key. For manual-migration configuration it is the pre-configured
+	/// administrator key. For auto-migration configurations it is the key of actual MigrationSession master node.
+	fn admin_public(&self, migration_id: Option<&H256>, new_server_set: BTreeSet<NodeId>) -> Result<Public, Error>;
+	/// Set active servers set change session.
+	fn set_key_servers_set_change_session(&self, session: Arc<AdminSession>);
+}
+
+/// Simple connection trigger, which only keeps connections to current_set.
+pub struct SimpleConnectionTrigger {
+	/// Key server set cluster.
+	key_server_set: Arc<KeyServerSet>,
+	/// Trigger connections.
+	connections: TriggerConnections,
+	/// Servers set change session creator connector.
+	connector: Arc<ServersSetChangeSessionCreatorConnector>,
+}
+
+/// Simple Servers set change session creator connector, which will just return
+/// pre-configured administartor public when asked.
+pub struct SimpleServersSetChangeSessionCreatorConnector {
+	/// Secret store administrator public key.
+	pub admin_public: Option<Public>,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+/// Action with trigger connections.
+pub enum ConnectionsAction {
+	/// Connect to nodes from old set only.
+	ConnectToCurrentSet,
+	/// Connect to nodes from migration set.
+	ConnectToMigrationSet,
+}
+
+/// Trigger connections.
+pub struct TriggerConnections {
+	/// This node key pair.
+	pub self_key_pair: Arc<NodeKeyPair>,
+}
+
+impl SimpleConnectionTrigger {
+	/// Create new simple connection trigger.
+	pub fn new(key_server_set: Arc<KeyServerSet>, self_key_pair: Arc<NodeKeyPair>, admin_public: Option<Public>) -> Self {
+		SimpleConnectionTrigger {
+			key_server_set: key_server_set,
+			connections: TriggerConnections {
+				self_key_pair: self_key_pair,
+			},
+			connector: Arc::new(SimpleServersSetChangeSessionCreatorConnector {
+				admin_public: admin_public,
+			}),
+		}
+	}
+}
+
+impl ConnectionTrigger for SimpleConnectionTrigger {
+	fn on_maintain(&mut self) -> Option<Maintain> {
+		Some(Maintain::Connections)
+	}
+
+	fn on_connection_established(&mut self, _node: &NodeId) -> Option<Maintain> {
+		None
+	}
+
+	fn on_connection_closed(&mut self, _node: &NodeId) -> Option<Maintain> {
+		// we do not want to reconnect after every connection close
+		// because it could be a part of something bigger
+		None
+	}
+
+	fn maintain_session(&mut self, _sessions: &ClusterClient) {
+	}
+
+	fn maintain_connections(&mut self, connections: &mut ClusterConnectionsData) {
+		self.connections.maintain(ConnectionsAction::ConnectToCurrentSet, connections, &self.key_server_set.snapshot())
+	}
+
+	fn servers_set_change_creator_connector(&self) -> Arc<ServersSetChangeSessionCreatorConnector> {
+		self.connector.clone()
+	}
+}
+
+impl ServersSetChangeSessionCreatorConnector for SimpleServersSetChangeSessionCreatorConnector {
+	fn admin_public(&self, _migration_id: Option<&H256>, _new_server_set: BTreeSet<NodeId>) -> Result<Public, Error> {
+		self.admin_public.clone().ok_or(Error::AccessDenied)
+	}
+
+	fn set_key_servers_set_change_session(&self, _session: Arc<AdminSession>) {
+	}
+}
+
+impl TriggerConnections {
+	pub fn maintain(&self, action: ConnectionsAction, data: &mut ClusterConnectionsData, server_set: &KeyServerSetSnapshot) {
+		match action {
+			ConnectionsAction::ConnectToCurrentSet => {
+				adjust_connections(self.self_key_pair.public(), data, &server_set.current_set);
+			},
+			ConnectionsAction::ConnectToMigrationSet => {
+				let migration_set = server_set.migration.as_ref().map(|s| s.set.clone()).unwrap_or_default();
+				adjust_connections(self.self_key_pair.public(), data, &migration_set);
+			},
+		}
+	}
+}
+
+fn adjust_connections(self_node_id: &NodeId, data: &mut ClusterConnectionsData, required_set: &BTreeMap<NodeId, SocketAddr>) {
+	if !required_set.contains_key(self_node_id) {
+		trace!(target: "secretstore_net", "{}: isolated from cluser", self_node_id);
+		data.connections.clear();
+		data.nodes.clear();
+		return;
+	}
+
+	for node_to_disconnect in select_nodes_to_disconnect(&data.nodes, required_set) {
+		if let Entry::Occupied(entry) = data.connections.entry(node_to_disconnect.clone()) {
+			trace!(target: "secretstore_net", "{}: removing connection to {} at {}",
+				self_node_id, entry.get().node_id(), entry.get().node_address());
+			entry.remove();
+		}
+
+		data.nodes.remove(&node_to_disconnect);
+	}
+
+	for (node_to_connect, node_addr) in required_set {
+		if node_to_connect != self_node_id {
+			data.nodes.insert(node_to_connect.clone(), node_addr.clone());
+		}
+	}
+}
+
+fn select_nodes_to_disconnect(current_set: &BTreeMap<NodeId, SocketAddr>, new_set: &BTreeMap<NodeId, SocketAddr>) -> Vec<NodeId> {
+	current_set.iter()
+		.filter(|&(node_id, node_addr)| match new_set.get(node_id) {
+			Some(new_node_addr) => node_addr != new_node_addr,
+			None => true,
+		})
+		.map(|(node_id, _)| node_id.clone())
+		.collect()
+}
+
+#[cfg(test)]
+mod tests {
+	use std::collections::BTreeSet;
+	use std::sync::Arc;
+	use ethkey::{Random, Generator};
+	use key_server_cluster::cluster::ClusterConnectionsData;
+	use key_server_cluster::{MapKeyServerSet, PlainNodeKeyPair, KeyServerSetSnapshot, KeyServerSetMigration};
+	use super::{Maintain, TriggerConnections, ConnectionsAction, ConnectionTrigger, SimpleConnectionTrigger,
+		select_nodes_to_disconnect, adjust_connections};
+
+	fn create_connections() -> TriggerConnections {
+		TriggerConnections {
+			self_key_pair: Arc::new(PlainNodeKeyPair::new(Random.generate().unwrap())),
+		}
+	}
+
+	#[test]
+	fn do_not_disconnect_if_set_is_not_changed() {
+		let node_id = Random.generate().unwrap().public().clone();
+		assert_eq!(select_nodes_to_disconnect(
+			&vec![(node_id, "127.0.0.1:8081".parse().unwrap())].into_iter().collect(),
+			&vec![(node_id, "127.0.0.1:8081".parse().unwrap())].into_iter().collect()),
+			vec![]);
+	}
+
+	#[test]
+	fn disconnect_if_address_has_changed() {
+		let node_id = Random.generate().unwrap().public().clone();
+		assert_eq!(select_nodes_to_disconnect(
+			&vec![(node_id.clone(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect(),
+			&vec![(node_id.clone(), "127.0.0.1:8082".parse().unwrap())].into_iter().collect()),
+			vec![node_id.clone()]);
+	}
+
+	#[test]
+	fn disconnect_if_node_has_removed() {
+		let node_id = Random.generate().unwrap().public().clone();
+		assert_eq!(select_nodes_to_disconnect(
+			&vec![(node_id.clone(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect(),
+			&vec![].into_iter().collect()),
+			vec![node_id.clone()]);
+	}
+
+	#[test]
+	fn does_not_disconnect_if_node_has_added() {
+		let node_id = Random.generate().unwrap().public().clone();
+		assert_eq!(select_nodes_to_disconnect(
+			&vec![(node_id.clone(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect(),
+			&vec![(node_id.clone(), "127.0.0.1:8081".parse().unwrap()),
+				(Random.generate().unwrap().public().clone(), "127.0.0.1:8082".parse().unwrap())]
+				.into_iter().collect()),
+			vec![]);
+	}
+
+	#[test]
+	fn adjust_connections_disconnects_from_all_nodes_if_not_a_part_of_key_server() {
+		let self_node_id = Random.generate().unwrap().public().clone();
+		let other_node_id = Random.generate().unwrap().public().clone();
+		let mut connection_data: ClusterConnectionsData = Default::default();
+		connection_data.nodes.insert(other_node_id.clone(), "127.0.0.1:8081".parse().unwrap());
+
+		let required_set = connection_data.nodes.clone();
+		adjust_connections(&self_node_id, &mut connection_data, &required_set);
+		assert!(connection_data.nodes.is_empty());
+	}
+
+	#[test]
+	fn adjust_connections_connects_to_new_nodes() {
+		let self_node_id = Random.generate().unwrap().public().clone();
+		let other_node_id = Random.generate().unwrap().public().clone();
+		let mut connection_data: ClusterConnectionsData = Default::default();
+
+		let required_set = vec![(self_node_id.clone(), "127.0.0.1:8081".parse().unwrap()),
+			(other_node_id.clone(), "127.0.0.1:8082".parse().unwrap())].into_iter().collect();
+		adjust_connections(&self_node_id, &mut connection_data, &required_set);
+		assert!(connection_data.nodes.contains_key(&other_node_id));
+	}
+
+	#[test]
+	fn adjust_connections_reconnects_from_changed_nodes() {
+		let self_node_id = Random.generate().unwrap().public().clone();
+		let other_node_id = Random.generate().unwrap().public().clone();
+		let mut connection_data: ClusterConnectionsData = Default::default();
+		connection_data.nodes.insert(other_node_id.clone(), "127.0.0.1:8082".parse().unwrap());
+
+		let required_set = vec![(self_node_id.clone(), "127.0.0.1:8081".parse().unwrap()),
+			(other_node_id.clone(), "127.0.0.1:8083".parse().unwrap())].into_iter().collect();
+		adjust_connections(&self_node_id, &mut connection_data, &required_set);
+		assert_eq!(connection_data.nodes.get(&other_node_id), Some(&"127.0.0.1:8083".parse().unwrap()));
+	}
+
+	#[test]
+	fn adjust_connections_disconnects_from_removed_nodes() {
+		let self_node_id = Random.generate().unwrap().public().clone();
+		let other_node_id = Random.generate().unwrap().public().clone();
+		let mut connection_data: ClusterConnectionsData = Default::default();
+		connection_data.nodes.insert(other_node_id.clone(), "127.0.0.1:8082".parse().unwrap());
+
+		let required_set = vec![(self_node_id.clone(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect();
+		adjust_connections(&self_node_id, &mut connection_data, &required_set);
+		assert!(connection_data.nodes.is_empty());
+	}
+
+	#[test]
+	fn adjust_connections_does_not_connects_to_self() {
+		let self_node_id = Random.generate().unwrap().public().clone();
+		let mut connection_data: ClusterConnectionsData = Default::default();
+
+		let required_set = vec![(self_node_id.clone(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect();
+		adjust_connections(&self_node_id, &mut connection_data, &required_set);
+		assert!(connection_data.nodes.is_empty());
+	}
+
+	#[test]
+	fn maintain_connects_to_current_set_works() {
+		let connections = create_connections();
+		let self_node_id = connections.self_key_pair.public().clone();
+		let current_node_id = Random.generate().unwrap().public().clone();
+		let migration_node_id = Random.generate().unwrap().public().clone();
+		let new_node_id = Random.generate().unwrap().public().clone();
+
+		let mut connections_data: ClusterConnectionsData = Default::default();
+		connections.maintain(ConnectionsAction::ConnectToCurrentSet, &mut connections_data, &KeyServerSetSnapshot {
+			current_set: vec![(self_node_id.clone(), "127.0.0.1:8081".parse().unwrap()),
+				(current_node_id.clone(), "127.0.0.1:8082".parse().unwrap())].into_iter().collect(),
+			new_set: vec![(new_node_id.clone(), "127.0.0.1:8083".parse().unwrap())].into_iter().collect(),
+			migration: Some(KeyServerSetMigration {
+				set: vec![(migration_node_id.clone(), "127.0.0.1:8084".parse().unwrap())].into_iter().collect(),
+				..Default::default()
+			}),
+		});
+
+		assert_eq!(vec![current_node_id], connections_data.nodes.keys().cloned().collect::<Vec<_>>());
+	}
+
+	#[test]
+	fn maintain_connects_to_migration_set_works() {
+		let connections = create_connections();
+		let self_node_id = connections.self_key_pair.public().clone();
+		let current_node_id = Random.generate().unwrap().public().clone();
+		let migration_node_id = Random.generate().unwrap().public().clone();
+		let new_node_id = Random.generate().unwrap().public().clone();
+
+		let mut connections_data: ClusterConnectionsData = Default::default();
+		connections.maintain(ConnectionsAction::ConnectToMigrationSet, &mut connections_data, &KeyServerSetSnapshot {
+			current_set: vec![(current_node_id.clone(), "127.0.0.1:8082".parse().unwrap())].into_iter().collect(),
+			new_set: vec![(new_node_id.clone(), "127.0.0.1:8083".parse().unwrap())].into_iter().collect(),
+			migration: Some(KeyServerSetMigration {
+				set: vec![(self_node_id.clone(), "127.0.0.1:8081".parse().unwrap()),
+					(migration_node_id.clone(), "127.0.0.1:8084".parse().unwrap())].into_iter().collect(),
+				..Default::default()
+			}),
+		});
+
+		assert_eq!(vec![migration_node_id].into_iter().collect::<BTreeSet<_>>(),
+			connections_data.nodes.keys().cloned().collect::<BTreeSet<_>>());
+	}
+
+	#[test]
+	fn simple_connections_trigger_only_maintains_connections() {
+		let key_server_set = Arc::new(MapKeyServerSet::new(Default::default()));
+		let self_key_pair = Arc::new(PlainNodeKeyPair::new(Random.generate().unwrap()));
+		let mut trigger = SimpleConnectionTrigger::new(key_server_set, self_key_pair, None);
+		assert_eq!(trigger.on_maintain(), Some(Maintain::Connections));
+	}
+}
diff --git a/secret_store/src/key_server_cluster/connection_trigger_with_migration.rs b/secret_store/src/key_server_cluster/connection_trigger_with_migration.rs
new file mode 100644
index 0000000000000000000000000000000000000000..91679928fb632345c9273e42baf500edf134f08a
--- /dev/null
+++ b/secret_store/src/key_server_cluster/connection_trigger_with_migration.rs
@@ -0,0 +1,741 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::{BTreeSet, BTreeMap};
+use std::net::SocketAddr;
+use std::sync::Arc;
+use ethereum_types::H256;
+use ethkey::Public;
+use parking_lot::Mutex;
+use key_server_cluster::{KeyServerSet, KeyServerSetSnapshot, KeyServerSetMigration, is_migration_required};
+use key_server_cluster::cluster::{ClusterClient, ClusterConnectionsData};
+use key_server_cluster::cluster_sessions::{AdminSession, ClusterSession};
+use key_server_cluster::jobs::servers_set_change_access_job::ordered_nodes_hash;
+use key_server_cluster::connection_trigger::{Maintain, ConnectionsAction, ConnectionTrigger,
+	ServersSetChangeSessionCreatorConnector, TriggerConnections};
+use types::all::{Error, NodeId};
+use {NodeKeyPair};
+
+/// Key servers set change trigger with automated migration procedure.
+pub struct ConnectionTriggerWithMigration {
+	/// This node key pair.
+	self_key_pair: Arc<NodeKeyPair>,
+	/// Key server set.
+	key_server_set: Arc<KeyServerSet>,
+	/// Last server set state.
+	snapshot: KeyServerSetSnapshot,
+	/// Required connections action.
+	connections_action: Option<ConnectionsAction>,
+	/// Required session action.
+	session_action: Option<SessionAction>,
+	/// Currenty connected nodes.
+	connected: BTreeSet<NodeId>,
+	/// Trigger migration connections.
+	connections: TriggerConnections,
+	/// Trigger migration session.
+	session: TriggerSession,
+}
+
+#[derive(Default)]
+/// Key servers set change session creator connector with migration support.
+pub struct ServersSetChangeSessionCreatorConnectorWithMigration {
+	/// This node id.
+	self_node_id: NodeId,
+	/// Active migration state to check when servers set change session is started.
+	migration: Mutex<Option<KeyServerSetMigration>>,
+	/// Active servers set change session.
+	session: Mutex<Option<Arc<AdminSession>>>,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+/// Migration session action.
+enum SessionAction {
+	/// Start migration (confirm migration transaction).
+	StartMigration(H256),
+	/// Start migration session.
+	Start,
+	/// Confirm migration and forget migration session.
+	ConfirmAndDrop(H256),
+	/// Forget migration session.
+	Drop,
+	/// Forget migration session and retry.
+	DropAndRetry,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+/// Migration session state.
+enum SessionState {
+	/// No active session.
+	Idle,
+	/// Session is running with given migration id.
+	Active(Option<H256>),
+	/// Session is completed successfully.
+	Finished(Option<H256>),
+	/// Session is completed with an error.
+	Failed(Option<H256>),
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+/// Migration state.
+pub enum MigrationState {
+	/// No migration required.
+	Idle,
+	/// Migration is required.
+	Required,
+	/// Migration has started.
+	Started,
+}
+
+/// Migration session.
+struct TriggerSession {
+	/// Servers set change session creator connector.
+	connector: Arc<ServersSetChangeSessionCreatorConnectorWithMigration>,
+	/// This node key pair.
+	self_key_pair: Arc<NodeKeyPair>,
+	/// Key server set.
+	key_server_set: Arc<KeyServerSet>,
+}
+
+impl ConnectionTriggerWithMigration {
+	/// Create new trigge with migration.
+	pub fn new(key_server_set: Arc<KeyServerSet>, self_key_pair: Arc<NodeKeyPair>) -> Self {
+		let snapshot = key_server_set.snapshot();
+		let migration = snapshot.migration.clone();
+
+		ConnectionTriggerWithMigration {
+			self_key_pair: self_key_pair.clone(),
+			key_server_set: key_server_set.clone(),
+			snapshot: snapshot,
+			connected: BTreeSet::new(),
+			connections: TriggerConnections {
+				self_key_pair: self_key_pair.clone(),
+			},
+			session: TriggerSession {
+				connector: Arc::new(ServersSetChangeSessionCreatorConnectorWithMigration {
+					self_node_id: self_key_pair.public().clone(),
+					migration: Mutex::new(migration),
+					session: Mutex::new(None),
+				}),
+				self_key_pair: self_key_pair,
+				key_server_set: key_server_set,
+			},
+			connections_action: None,
+			session_action: None,
+		}
+	}
+	
+	/// Actually do mainteinance.
+	fn do_maintain(&mut self) -> Option<Maintain> {
+		loop {
+			let session_state = session_state(self.session.connector.session.lock().clone());
+			let migration_state = migration_state(self.self_key_pair.public(), &self.snapshot);
+
+			let session_action = maintain_session(self.self_key_pair.public(), &self.connected, &self.snapshot, migration_state, session_state);
+			let session_maintain_required = session_action.map(|session_action|
+				self.session.process(session_action)).unwrap_or_default();
+			self.session_action = session_action;
+
+			let connections_action = maintain_connections(migration_state, session_state);
+			let connections_maintain_required = connections_action.map(|_| true).unwrap_or_default();
+			self.connections_action = connections_action;
+
+			if session_state != SessionState::Idle || migration_state != MigrationState::Idle {
+				trace!(target: "secretstore_net", "{}: non-idle auto-migration state: {:?} -> {:?}",
+					self.self_key_pair.public(), (migration_state, session_state), (self.connections_action, self.session_action));
+			}
+
+			if session_action != Some(SessionAction::DropAndRetry) {
+				return match (session_maintain_required, connections_maintain_required) {
+					(true, true) => Some(Maintain::SessionAndConnections),
+					(true, false) => Some(Maintain::Session),
+					(false, true) => Some(Maintain::Connections),
+					(false, false) => None,
+				};
+			}
+		}
+	}
+}
+
+impl ConnectionTrigger for ConnectionTriggerWithMigration {
+	fn on_maintain(&mut self) -> Option<Maintain> {
+		self.snapshot = self.key_server_set.snapshot();
+		*self.session.connector.migration.lock() = self.snapshot.migration.clone();
+
+		self.do_maintain()
+	}
+
+	fn on_connection_established(&mut self, node: &NodeId) -> Option<Maintain> {
+		self.connected.insert(node.clone());
+		self.do_maintain()
+	}
+
+	fn on_connection_closed(&mut self, node: &NodeId) -> Option<Maintain> {
+		self.connected.remove(node);
+		self.do_maintain()
+	}
+
+	fn maintain_session(&mut self, sessions: &ClusterClient) {
+		if let Some(action) = self.session_action {
+			self.session.maintain(action, sessions, &self.snapshot);
+		}
+	}
+
+	fn maintain_connections(&mut self, connections: &mut ClusterConnectionsData) {
+		if let Some(action) = self.connections_action {
+			self.connections.maintain(action, connections, &self.snapshot);
+		}
+	}
+
+	fn servers_set_change_creator_connector(&self) -> Arc<ServersSetChangeSessionCreatorConnector> {
+		self.session.connector.clone()
+	}
+}
+
+impl ServersSetChangeSessionCreatorConnector for ServersSetChangeSessionCreatorConnectorWithMigration {
+	fn admin_public(&self, migration_id: Option<&H256>, new_server_set: BTreeSet<NodeId>) -> Result<Public, Error> {
+		// the idea is that all nodes are agreed upon a block number and a new set of nodes in this block
+		// then master node is selected of all nodes set && this master signs the old set && new set
+		// (signatures are inputs to ServerSetChangeSession)
+		self.migration.lock().as_ref()
+			.map(|migration| {
+				let is_migration_id_same = migration_id.map(|mid| mid == &migration.id).unwrap_or_default();
+				let is_migration_set_same = new_server_set == migration.set.keys().cloned().collect();
+				if is_migration_id_same && is_migration_set_same {
+					Ok(migration.master.clone())
+				} else {
+					warn!(target: "secretstore_net", "{}: failed to accept auto-migration session: same_migration_id={}, same_migration_set={}",
+						self.self_node_id, is_migration_id_same, is_migration_set_same);
+
+					Err(Error::AccessDenied)
+				}
+			})
+			.unwrap_or_else(|| {
+				warn!(target: "secretstore_net", "{}: failed to accept non-scheduled auto-migration session", self.self_node_id);
+				Err(Error::AccessDenied)
+			})
+	}
+
+	fn set_key_servers_set_change_session(&self, session: Arc<AdminSession>) {
+		*self.session.lock() = Some(session);
+	}
+}
+
+impl TriggerSession {
+	/// Process session action.
+	pub fn process(&mut self, action: SessionAction) -> bool {
+		match action {
+			SessionAction::ConfirmAndDrop(migration_id) => {
+				*self.connector.session.lock() = None;
+				self.key_server_set.confirm_migration(migration_id);
+				false
+			},
+			SessionAction::Drop | SessionAction::DropAndRetry => {
+				*self.connector.session.lock() = None;
+				false
+			},
+			SessionAction::StartMigration(migration_id) => {
+				self.key_server_set.start_migration(migration_id);
+				false
+			},
+			SessionAction::Start => true,
+		}
+	}
+
+	/// Maintain session.
+	pub fn maintain(&mut self, action: SessionAction, sessions: &ClusterClient, server_set: &KeyServerSetSnapshot) {
+		if action == SessionAction::Start { // all other actions are processed in maintain
+			let migration = server_set.migration.as_ref()
+				.expect("action is Start only when migration is started (see maintain_session); qed");
+
+			// we assume that authorities that are removed from the servers set are either offline, or malicious
+			// => they're not involved in ServersSetChangeSession
+			// => both sets are the same
+			let old_set: BTreeSet<_> = migration.set.keys().cloned().collect();
+			let new_set = old_set.clone();
+
+			let signatures = self.self_key_pair.sign(&ordered_nodes_hash(&old_set))
+				.and_then(|old_set_signature| self.self_key_pair.sign(&ordered_nodes_hash(&new_set))
+					.map(|new_set_signature| (old_set_signature, new_set_signature)))
+				.map_err(Into::into);
+			let session = signatures.and_then(|(old_set_signature, new_set_signature)|
+				sessions.new_servers_set_change_session(None, Some(migration.id.clone()), new_set, old_set_signature, new_set_signature));
+
+			match session {
+				Ok(_) => trace!(target: "secretstore_net", "{}: started auto-migrate session",
+					self.self_key_pair.public()),
+				Err(err) => trace!(target: "secretstore_net", "{}: failed to start auto-migrate session with: {}",
+					self.self_key_pair.public(), err),
+			}
+		}
+	}
+}
+
+fn migration_state(self_node_id: &NodeId, snapshot: &KeyServerSetSnapshot) -> MigrationState {
+	// if this node is not on current && old set => we do not participate in migration
+	if !snapshot.current_set.contains_key(self_node_id) &&
+		!snapshot.migration.as_ref().map(|s| s.set.contains_key(self_node_id)).unwrap_or_default() {
+		return MigrationState::Idle;
+	}
+
+	// if migration has already started no other states possible
+	if snapshot.migration.is_some() {
+		return MigrationState::Started;
+	}
+
+	// we only require migration if set actually changes
+	// when only address changes, we could simply adjust connections
+	if !is_migration_required(&snapshot.current_set, &snapshot.new_set) {
+		return MigrationState::Idle;
+	}
+
+	return MigrationState::Required;
+}
+
+fn session_state(session: Option<Arc<AdminSession>>) -> SessionState {
+	session
+		.and_then(|s| match s.as_servers_set_change() {
+			Some(s) if !s.is_finished() => Some(SessionState::Active(s.migration_id().cloned())),
+			Some(s) => match s.wait() {
+				Ok(_) => Some(SessionState::Finished(s.migration_id().cloned())),
+				Err(_) => Some(SessionState::Failed(s.migration_id().cloned())),
+			},
+			None => None,
+		})
+		.unwrap_or(SessionState::Idle)
+}
+
+fn maintain_session(self_node_id: &NodeId, connected: &BTreeSet<NodeId>, snapshot: &KeyServerSetSnapshot, migration_state: MigrationState, session_state: SessionState) -> Option<SessionAction> {
+	let migration_data_proof = "migration_state is Started; migration data available when started; qed";
+
+	match (migration_state, session_state) {
+		// === NORMAL combinations ===
+
+		// having no session when it is not required => ok
+		(MigrationState::Idle, SessionState::Idle) => None,
+		// migration is required && no active session => start migration
+		(MigrationState::Required, SessionState::Idle) => {
+			match select_master_node(snapshot) == self_node_id {
+				true => Some(SessionAction::StartMigration(H256::random())),
+				// we are not on master node
+				false => None,
+			}
+		},
+		// migration is active && there's no active session => start it
+		(MigrationState::Started, SessionState::Idle) => {
+			match is_connected_to_all_nodes(self_node_id, &snapshot.migration.as_ref().expect(migration_data_proof).set, connected) &&
+				select_master_node(snapshot) == self_node_id {
+				true => Some(SessionAction::Start),
+				// we are not connected to all required nodes yet or we are not on master node => wait for it
+				false => None,
+			}
+		},
+		// migration is active && session is not yet started/finished => ok
+		(MigrationState::Started, SessionState::Active(ref session_migration_id))
+			if snapshot.migration.as_ref().expect(migration_data_proof).id == session_migration_id.unwrap_or_default() =>
+				None,
+		// migration has finished => confirm migration
+		(MigrationState::Started, SessionState::Finished(ref session_migration_id))
+			if snapshot.migration.as_ref().expect(migration_data_proof).id == session_migration_id.unwrap_or_default() =>
+				match snapshot.migration.as_ref().expect(migration_data_proof).set.contains_key(self_node_id) {
+					true => Some(SessionAction::ConfirmAndDrop(
+						snapshot.migration.as_ref().expect(migration_data_proof).id.clone()
+					)),
+					// we are not on migration set => we do not need to confirm
+					false => Some(SessionAction::Drop),
+				},
+		// migration has failed => it should be dropped && restarted later
+		(MigrationState::Started, SessionState::Failed(ref session_migration_id))
+			if snapshot.migration.as_ref().expect(migration_data_proof).id == session_migration_id.unwrap_or_default() =>
+				Some(SessionAction::Drop),
+
+		// ABNORMAL combinations, which are still possible when contract misbehaves ===
+
+		// having active session when it is not required => drop it && wait for other tasks
+		(MigrationState::Idle, SessionState::Active(_)) |
+		// no migration required && there's finished session => drop it && wait for other tasks
+		(MigrationState::Idle, SessionState::Finished(_)) |
+		// no migration required && there's failed session => drop it && wait for other tasks
+		(MigrationState::Idle, SessionState::Failed(_)) |
+		// migration is required && session is active => drop it && wait for other tasks
+		(MigrationState::Required, SessionState::Active(_)) |
+		// migration is required && session has failed => we need to forget this obsolete session and retry
+		(MigrationState::Required, SessionState::Finished(_)) |
+		// session for other migration is active => we need to forget this obsolete session and retry
+		// (the case for same id is checked above)
+		(MigrationState::Started, SessionState::Active(_)) |
+		// session for other migration has finished => we need to forget this obsolete session and retry
+		// (the case for same id is checked above)
+		(MigrationState::Started, SessionState::Finished(_)) |
+		// session for other migration has failed => we need to forget this obsolete session and retry
+		// (the case for same id is checked above)
+		(MigrationState::Started, SessionState::Failed(_)) |
+		// migration is required && session has failed => we need to forget this obsolete session and retry
+		(MigrationState::Required, SessionState::Failed(_)) => {
+			// some of the cases above could happen because of lags (could actually be a non-abnormal behavior)
+			// => we ony trace here
+			trace!(target: "secretstore_net", "{}: suspicious auto-migration state: {:?}",
+				self_node_id, (migration_state, session_state));
+			Some(SessionAction::DropAndRetry)
+		},
+	}
+}
+
+fn maintain_connections(migration_state: MigrationState, session_state: SessionState) -> Option<ConnectionsAction> {
+	match (migration_state, session_state) {
+		// session is active => we do not alter connections when session is active
+		(_, SessionState::Active(_)) => None,
+		// when no migration required => we just keep us connected to old nodes set
+		(MigrationState::Idle, _) => Some(ConnectionsAction::ConnectToCurrentSet),
+		// when migration is either scheduled, or in progress => connect to both old and migration set.
+		// this could lead to situation when node is not 'officially' a part of KeyServer (i.e. it is not in current_set)
+		// but it participates in new key generation session
+		// it is ok, since 'officialy' here means that this node is a owner of all old shares
+		(MigrationState::Required, _) |
+		(MigrationState::Started, _) => Some(ConnectionsAction::ConnectToMigrationSet),
+	}
+}
+
+fn is_connected_to_all_nodes(self_node_id: &NodeId, nodes: &BTreeMap<NodeId, SocketAddr>, connected: &BTreeSet<NodeId>) -> bool {
+	nodes.keys()
+		.filter(|n| *n != self_node_id)
+		.all(|n| connected.contains(n))
+}
+
+fn select_master_node(snapshot: &KeyServerSetSnapshot) -> &NodeId {
+	// we want to minimize a number of UnknownSession messages =>
+	// try to select a node which was in SS && will be in SS
+	match snapshot.migration.as_ref() {
+		Some(migration) => &migration.master,
+		None => snapshot.current_set.keys()
+			.filter(|n| snapshot.new_set.contains_key(n))
+			.nth(0)
+			.or_else(|| snapshot.new_set.keys().nth(0))
+			.unwrap_or_else(|| snapshot.current_set.keys().nth(0)
+				.expect("select_master_node is only called when migration is Required or Started;\
+					when Started: migration.is_some() && we return migration.master; qed;\
+					when Required: current_set != new_set; this means that at least one set is non-empty; we try to take node from each set; qed"))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use key_server_cluster::{KeyServerSetSnapshot, KeyServerSetMigration};
+	use key_server_cluster::connection_trigger::ConnectionsAction;
+	use super::{MigrationState, SessionState, SessionAction, migration_state, maintain_session,
+		maintain_connections, select_master_node};
+
+	#[test]
+	fn migration_state_is_idle_when_required_but_this_node_is_not_on_the_list() {
+		assert_eq!(migration_state(&1.into(), &KeyServerSetSnapshot {
+			current_set: vec![(2.into(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect(),
+			new_set: vec![(3.into(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect(),
+			migration: None,
+		}), MigrationState::Idle);
+	}
+
+	#[test]
+	fn migration_state_is_idle_when_sets_are_equal() {
+		assert_eq!(migration_state(&1.into(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect(),
+			new_set: vec![(1.into(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect(),
+			migration: None,
+		}), MigrationState::Idle);
+	}
+
+	#[test]
+	fn migration_state_is_idle_when_only_address_changes() {
+		assert_eq!(migration_state(&1.into(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8080".parse().unwrap())].into_iter().collect(),
+			new_set: vec![(1.into(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect(),
+			migration: None,
+		}), MigrationState::Idle);
+	}
+
+	#[test]
+	fn migration_state_is_required_when_node_is_added() {
+		assert_eq!(migration_state(&1.into(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8080".parse().unwrap())].into_iter().collect(),
+			new_set: vec![(1.into(), "127.0.0.1:8080".parse().unwrap()),
+				(2.into(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect(),
+			migration: None,
+		}), MigrationState::Required);
+	}
+
+	#[test]
+	fn migration_state_is_required_when_node_is_removed() {
+		assert_eq!(migration_state(&1.into(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8080".parse().unwrap()),
+				(2.into(), "127.0.0.1:8081".parse().unwrap())].into_iter().collect(),
+			new_set: vec![(1.into(), "127.0.0.1:8080".parse().unwrap())].into_iter().collect(),
+			migration: None,
+		}), MigrationState::Required);
+	}
+
+	#[test]
+	fn migration_state_is_started_when_migration_is_some() {
+		assert_eq!(migration_state(&1.into(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8080".parse().unwrap())].into_iter().collect(),
+			new_set: Default::default(),
+			migration: Some(KeyServerSetMigration {
+				id: Default::default(),
+				set: Default::default(),
+				master: Default::default(),
+				is_confirmed: Default::default(),
+			}),
+		}), MigrationState::Started);
+	}
+
+	#[test]
+	fn existing_master_is_selected_when_migration_has_started() {
+		assert_eq!(select_master_node(&KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8180".parse().unwrap())].into_iter().collect(),
+			new_set: vec![(2.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			migration: Some(KeyServerSetMigration {
+				master: 3.into(),
+				..Default::default()
+			}),
+		}), &3.into());
+	}
+
+	#[test]
+	fn persistent_master_is_selected_when_migration_has_not_started_yet() {
+		assert_eq!(select_master_node(&KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8180".parse().unwrap()),
+				(2.into(), "127.0.0.1:8180".parse().unwrap())].into_iter().collect(),
+			new_set: vec![(2.into(), "127.0.0.1:8181".parse().unwrap()),
+				(4.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			migration: None,
+		}), &2.into());
+	}
+
+	#[test]
+	fn new_master_is_selected_in_worst_case() {
+		assert_eq!(select_master_node(&KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8180".parse().unwrap()),
+				(2.into(), "127.0.0.1:8180".parse().unwrap())].into_iter().collect(),
+			new_set: vec![(3.into(), "127.0.0.1:8181".parse().unwrap()),
+				(4.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			migration: None,
+		}), &3.into());
+	}
+
+	#[test]
+	fn maintain_connections_returns_none_when_session_is_active() {
+		assert_eq!(maintain_connections(MigrationState::Required,
+			SessionState::Active(Default::default())), None);
+	}
+
+	#[test]
+	fn maintain_connections_connects_to_current_set_when_no_migration() {
+		assert_eq!(maintain_connections(MigrationState::Idle,
+			SessionState::Idle), Some(ConnectionsAction::ConnectToCurrentSet));
+	}
+
+	#[test]
+	fn maintain_connections_connects_to_current_and_old_set_when_migration_is_required() {
+		assert_eq!(maintain_connections(MigrationState::Required,
+			SessionState::Idle), Some(ConnectionsAction::ConnectToMigrationSet));
+	}
+
+	#[test]
+	fn maintain_connections_connects_to_current_and_old_set_when_migration_is_started() {
+		assert_eq!(maintain_connections(MigrationState::Started,
+			SessionState::Idle), Some(ConnectionsAction::ConnectToMigrationSet));
+	}
+
+	#[test]
+	fn maintain_sessions_does_nothing_if_no_session_and_no_migration() {
+		assert_eq!(maintain_session(&1.into(), &Default::default(), &Default::default(),
+			MigrationState::Idle, SessionState::Idle), None);
+	}
+
+	#[test]
+	fn maintain_session_does_nothing_when_migration_required_on_slave_node_and_no_session() {
+		assert_eq!(maintain_session(&2.into(), &vec![2.into()].into_iter().collect(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			new_set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap()),
+				(2.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			migration: None,
+		}, MigrationState::Required, SessionState::Idle), None);
+	}
+
+	#[test]
+	fn maintain_session_does_nothing_when_migration_started_on_slave_node_and_no_session() {
+		assert_eq!(maintain_session(&2.into(), &vec![2.into()].into_iter().collect(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			new_set: Default::default(),
+			migration: Some(KeyServerSetMigration {
+				master: 1.into(),
+				set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap()),
+					(2.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+				..Default::default()
+			}),
+		}, MigrationState::Started, SessionState::Idle), None);
+	}
+
+	#[test]
+	fn maintain_session_does_nothing_when_migration_started_on_master_node_and_no_session_and_not_connected_to_migration_nodes() {
+		assert_eq!(maintain_session(&1.into(), &Default::default(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			new_set: Default::default(),
+			migration: Some(KeyServerSetMigration {
+				master: 1.into(),
+				set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap()),
+					(2.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+				..Default::default()
+			}),
+		}, MigrationState::Started, SessionState::Idle), None);
+	}
+
+	#[test]
+	fn maintain_session_starts_session_when_migration_started_on_master_node_and_no_session() {
+		assert_eq!(maintain_session(&1.into(), &vec![2.into()].into_iter().collect(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			new_set: Default::default(),
+			migration: Some(KeyServerSetMigration {
+				master: 1.into(),
+				set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap()),
+					(2.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+				..Default::default()
+			}),
+		}, MigrationState::Started, SessionState::Idle), Some(SessionAction::Start));
+	}
+
+	#[test]
+	fn maintain_session_does_nothing_when_both_migration_and_session_are_started() {
+		assert_eq!(maintain_session(&1.into(), &vec![2.into()].into_iter().collect(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			new_set: Default::default(),
+			migration: Some(KeyServerSetMigration {
+				master: 1.into(),
+				set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap()),
+					(2.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+				..Default::default()
+			}),
+		}, MigrationState::Started, SessionState::Active(Default::default())), None);
+	}
+
+	#[test]
+	fn maintain_session_confirms_migration_when_active_and_session_has_finished_on_new_node() {
+		assert_eq!(maintain_session(&1.into(), &vec![2.into()].into_iter().collect(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			new_set: Default::default(),
+			migration: Some(KeyServerSetMigration {
+				master: 1.into(),
+				set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap()),
+					(2.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+				..Default::default()
+			}),
+		}, MigrationState::Started, SessionState::Finished(Default::default())), Some(SessionAction::ConfirmAndDrop(Default::default())));
+	}
+
+	#[test]
+	fn maintain_session_drops_session_when_active_and_session_has_finished_on_removed_node() {
+		assert_eq!(maintain_session(&1.into(), &vec![2.into()].into_iter().collect(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap()),
+				(2.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			new_set: Default::default(),
+			migration: Some(KeyServerSetMigration {
+				master: 2.into(),
+				set: vec![(2.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+				..Default::default()
+			}),
+		}, MigrationState::Started, SessionState::Finished(Default::default())), Some(SessionAction::Drop));
+	}
+
+	#[test]
+	fn maintain_session_drops_session_when_active_and_session_has_failed() {
+		assert_eq!(maintain_session(&1.into(), &vec![2.into()].into_iter().collect(), &KeyServerSetSnapshot {
+			current_set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+			new_set: Default::default(),
+			migration: Some(KeyServerSetMigration {
+				master: 1.into(),
+				set: vec![(1.into(), "127.0.0.1:8181".parse().unwrap()),
+					(2.into(), "127.0.0.1:8181".parse().unwrap())].into_iter().collect(),
+				..Default::default()
+			}),
+		}, MigrationState::Started, SessionState::Failed(Default::default())), Some(SessionAction::Drop));
+	}
+
+	#[test]
+	fn maintain_session_detects_abnormal_when_no_migration_and_active_session() {
+		assert_eq!(maintain_session(&Default::default(), &Default::default(), &Default::default(),
+			MigrationState::Idle, SessionState::Active(Default::default())), Some(SessionAction::DropAndRetry));
+	}
+
+	#[test]
+	fn maintain_session_detects_abnormal_when_no_migration_and_finished_session() {
+		assert_eq!(maintain_session(&Default::default(), &Default::default(), &Default::default(),
+			MigrationState::Idle, SessionState::Finished(Default::default())), Some(SessionAction::DropAndRetry));
+	}
+
+	#[test]
+	fn maintain_session_detects_abnormal_when_no_migration_and_failed_session() {
+		assert_eq!(maintain_session(&Default::default(), &Default::default(), &Default::default(),
+			MigrationState::Idle, SessionState::Failed(Default::default())), Some(SessionAction::DropAndRetry));
+	}
+
+	#[test]
+	fn maintain_session_detects_abnormal_when_required_migration_and_active_session() {
+		assert_eq!(maintain_session(&Default::default(), &Default::default(), &Default::default(),
+			MigrationState::Required, SessionState::Active(Default::default())), Some(SessionAction::DropAndRetry));
+	}
+
+	#[test]
+	fn maintain_session_detects_abnormal_when_required_migration_and_finished_session() {
+		assert_eq!(maintain_session(&Default::default(), &Default::default(), &Default::default(),
+			MigrationState::Required, SessionState::Finished(Default::default())), Some(SessionAction::DropAndRetry));
+	}
+
+	#[test]
+	fn maintain_session_detects_abnormal_when_required_migration_and_failed_session() {
+		assert_eq!(maintain_session(&Default::default(), &Default::default(), &Default::default(),
+			MigrationState::Required, SessionState::Failed(Default::default())), Some(SessionAction::DropAndRetry));
+	}
+
+	#[test]
+	fn maintain_session_detects_abnormal_when_active_migration_and_active_session_with_different_id() {
+		assert_eq!(maintain_session(&Default::default(), &Default::default(), &KeyServerSetSnapshot {
+			migration: Some(KeyServerSetMigration {
+				id: 0.into(),
+				..Default::default()
+			}),
+			..Default::default()
+		}, MigrationState::Started, SessionState::Active(Some(1.into()))), Some(SessionAction::DropAndRetry));
+	}
+
+	#[test]
+	fn maintain_session_detects_abnormal_when_active_migration_and_finished_session_with_different_id() {
+		assert_eq!(maintain_session(&Default::default(), &Default::default(), &KeyServerSetSnapshot {
+			migration: Some(KeyServerSetMigration {
+				id: 0.into(),
+				..Default::default()
+			}),
+			..Default::default()
+		}, MigrationState::Started, SessionState::Finished(Some(1.into()))), Some(SessionAction::DropAndRetry));
+	}
+
+	#[test]
+	fn maintain_session_detects_abnormal_when_active_migration_and_failed_session_with_different_id() {
+		assert_eq!(maintain_session(&Default::default(), &Default::default(), &KeyServerSetSnapshot {
+			migration: Some(KeyServerSetMigration {
+				id: 0.into(),
+				..Default::default()
+			}),
+			..Default::default()
+		}, MigrationState::Started, SessionState::Failed(Some(1.into()))), Some(SessionAction::DropAndRetry));
+	}
+}
diff --git a/secret_store/src/key_server_cluster/io/deadline.rs b/secret_store/src/key_server_cluster/io/deadline.rs
index aea339ca95d1c088c19d4515c8fad832cfcce2b9..1088f4f33722004ce774e6b649a9509e7046dbc9 100644
--- a/secret_store/src/key_server_cluster/io/deadline.rs
+++ b/secret_store/src/key_server_cluster/io/deadline.rs
@@ -16,24 +16,24 @@
 
 use std::io;
 use std::time::Duration;
-use futures::{Future, Select, BoxFuture, Poll, Async};
+use futures::{Future, Select, Poll, Async};
 use tokio_core::reactor::{Handle, Timeout};
 
-type DeadlineBox<F> = BoxFuture<DeadlineStatus<<F as Future>::Item>, <F as Future>::Error>;
+type DeadlineBox<F> = Box<Future<Item = DeadlineStatus<<F as Future>::Item>, Error = <F as Future>::Error> + Send>;
 
 /// Complete a passed future or fail if it is not completed within timeout.
 pub fn deadline<F, T>(duration: Duration, handle: &Handle, future: F) -> Result<Deadline<F>, io::Error>
 	where F: Future<Item = T, Error = io::Error> + Send + 'static, T: 'static {
-	let timeout = Timeout::new(duration, handle)?.map(|_| DeadlineStatus::Timeout).boxed();
-	let future = future.map(DeadlineStatus::Meet).boxed();
+	let timeout: DeadlineBox<F> = Box::new(Timeout::new(duration, handle)?.map(|_| DeadlineStatus::Timeout));
+	let future: DeadlineBox<F> = Box::new(future.map(DeadlineStatus::Meet));
 	let deadline = Deadline {
 		future: timeout.select(future),
 	};
 	Ok(deadline)
 }
 
-#[derive(Debug, PartialEq)]
 /// Deadline future completion status.
+#[derive(Debug, PartialEq)]
 pub enum DeadlineStatus<T> {
 	/// Completed a future.
 	Meet(T),
@@ -61,20 +61,11 @@ impl<F, T> Future for Deadline<F> where F: Future<Item = T, Error = io::Error> {
 
 #[cfg(test)]
 mod tests {
-	use std::io;
 	use std::time::Duration;
-	use futures::{Future, empty, done};
+	use futures::{Future, done};
 	use tokio_core::reactor::Core;
 	use super::{deadline, DeadlineStatus};
 
-	//#[test] TODO: not working
-	fn _deadline_timeout_works() {
-		let mut core = Core::new().unwrap();
-		let deadline = deadline(Duration::from_millis(1), &core.handle(), empty::<(), io::Error>()).unwrap();
-		core.turn(Some(Duration::from_millis(3)));
-		assert_eq!(deadline.wait().unwrap(), DeadlineStatus::Timeout);
-	}
-
 	#[test]
 	fn deadline_result_works() {
 		let mut core = Core::new().unwrap();
diff --git a/secret_store/src/key_server_cluster/io/handshake.rs b/secret_store/src/key_server_cluster/io/handshake.rs
index bf52ab798e6b87bb755901253c36c6ae45380b7a..c48ed27daedd5b99891f75ba80f69a958c529fbf 100644
--- a/secret_store/src/key_server_cluster/io/handshake.rs
+++ b/secret_store/src/key_server_cluster/io/handshake.rs
@@ -14,13 +14,32 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+///! Given: two nodes each holding its own `self_key_pair`.
+///!
+///! Handshake process:
+///! 1) both nodes are generating random `KeyPair` (`session_key_pair`), which will be used for channel encryption
+///! 2) both nodes are generating random H256 (`confirmation_plain`)
+///! 3) both nodes are signing `confirmation_plain` using `session_key_pair` to receive `confirmation_signed_session`
+///! 4) nodes exchange with `NodePublicKey` messages, containing: `self_key_pair.public`, `confirmation_plain`, `confirmation_signed_session`
+///! 5) both nodes are checking that they're configured to communicate to server with received `message.self_key_pair.public`. Connection is closed otherwise
+///! 6) both nodes are recovering peer' `session_key_pair.public` from `message.confirmation_plain` and `message.confirmation_signed_session`
+///! 7) both nodes are computing shared session key pair using self' `session_key_pair.secret` && peer' `session_key_pair.public`. All following messages are encrypted using this key_pair.
+///! 8) both nodes are signing `message.confirmation_plain` with their own `self_key_pair.private` to receive `confirmation_signed`
+///! 9) nodes exchange with `NodePrivateKeySignature` messages, containing `confirmation_signed`
+///! 10) both nodes are checking that `confirmation_signed` is actually signed with the owner of peer' `self_key_pair.secret`
+///!
+///! Result of handshake is:
+///! 1) belief, that we are connected to the KS from our KS-set
+///! 2) session key pair, which is used to enrypt all connection messages
+
 use std::io;
 use std::sync::Arc;
 use std::collections::BTreeSet;
 use futures::{Future, Poll, Async};
 use tokio_io::{AsyncRead, AsyncWrite};
-use ethkey::{Random, Generator, KeyPair, verify_public};
-use util::H256;
+use ethcrypto::ecdh::agree;
+use ethkey::{Random, Generator, KeyPair, Public, Signature, verify_public, sign, recover};
+use ethereum_types::H256;
 use key_server_cluster::{NodeId, Error, NodeKeyPair};
 use key_server_cluster::message::{Message, ClusterMessage, NodePublicKey, NodePrivateKeySignature};
 use key_server_cluster::io::{write_message, write_encrypted_message, WriteMessage, ReadMessage,
@@ -28,16 +47,20 @@ use key_server_cluster::io::{write_message, write_encrypted_message, WriteMessag
 
 /// Start handshake procedure with another node from the cluster.
 pub fn handshake<A>(a: A, self_key_pair: Arc<NodeKeyPair>, trusted_nodes: BTreeSet<NodeId>) -> Handshake<A> where A: AsyncWrite + AsyncRead {
-	let self_confirmation_plain = Random.generate().map(|kp| *kp.secret().clone()).map_err(Into::into);
-	handshake_with_plain_confirmation(a, self_confirmation_plain, self_key_pair, trusted_nodes)
+	let init_data = Random.generate().map(|kp| *kp.secret().clone()).map_err(Into::into)
+		.and_then(|cp| Random.generate().map(|kp| (cp, kp)).map_err(Into::into));
+	handshake_with_init_data(a, init_data, self_key_pair, trusted_nodes)
 }
 
-/// Start handshake procedure with another node from the cluster and given plain confirmation.
-pub fn handshake_with_plain_confirmation<A>(a: A, self_confirmation_plain: Result<H256, Error>, self_key_pair: Arc<NodeKeyPair>, trusted_nodes: BTreeSet<NodeId>) -> Handshake<A> where A: AsyncWrite + AsyncRead {
-	let (error, state) = match self_confirmation_plain.clone()
-		.and_then(|c| Handshake::<A>::make_public_key_message(self_key_pair.public().clone(), c)) {
-		Ok(message) => (None, HandshakeState::SendPublicKey(write_message(a, message))),
-		Err(err) => (Some((a, Err(err))), HandshakeState::Finished),
+/// Start handshake procedure with another node from the cluster and given plain confirmation + session key pair.
+pub fn handshake_with_init_data<A>(a: A, init_data: Result<(H256, KeyPair), Error>, self_key_pair: Arc<NodeKeyPair>, trusted_nodes: BTreeSet<NodeId>) -> Handshake<A> where A: AsyncWrite + AsyncRead {
+	let handshake_input_data = init_data
+		.and_then(|(cp, kp)| sign(kp.secret(), &cp).map(|sp| (cp, kp, sp)).map_err(Into::into))
+		.and_then(|(cp, kp, sp)| Handshake::<A>::make_public_key_message(self_key_pair.public().clone(), cp.clone(), sp).map(|msg| (cp, kp, msg)));
+
+	let (error, cp, kp, state) = match handshake_input_data {
+		Ok((cp, kp, msg)) => (None, cp, Some(kp), HandshakeState::SendPublicKey(write_message(a, msg))),
+		Err(err) => (Some((a, Err(err))), Default::default(), None, HandshakeState::Finished),
 	};
 
 	Handshake {
@@ -45,10 +68,12 @@ pub fn handshake_with_plain_confirmation<A>(a: A, self_confirmation_plain: Resul
 		error: error,
 		state: state,
 		self_key_pair: self_key_pair,
-		self_confirmation_plain: self_confirmation_plain.unwrap_or(Default::default()),
+		self_session_key_pair: kp,
+		self_confirmation_plain: cp,
 		trusted_nodes: Some(trusted_nodes),
-		other_node_id: None,
-		other_confirmation_plain: None,
+		peer_node_id: None,
+		peer_session_public: None,
+		peer_confirmation_plain: None,
 		shared_key: None,
 	}
 }
@@ -56,9 +81,12 @@ pub fn handshake_with_plain_confirmation<A>(a: A, self_confirmation_plain: Resul
 /// Wait for handshake procedure to be started by another node from the cluster.
 pub fn accept_handshake<A>(a: A, self_key_pair: Arc<NodeKeyPair>) -> Handshake<A> where A: AsyncWrite + AsyncRead {
 	let self_confirmation_plain = Random.generate().map(|kp| *kp.secret().clone()).map_err(Into::into);
-	let (error, state) = match self_confirmation_plain.clone() {
-		Ok(_) => (None, HandshakeState::ReceivePublicKey(read_message(a))),
-		Err(err) => (Some((a, Err(err))), HandshakeState::Finished),
+	let handshake_input_data = self_confirmation_plain
+		.and_then(|cp| Random.generate().map(|kp| (cp, kp)).map_err(Into::into));
+
+	let (error, cp, kp, state) = match handshake_input_data {
+		Ok((cp, kp)) => (None, cp, Some(kp), HandshakeState::ReceivePublicKey(read_message(a))),
+		Err(err) => (Some((a, Err(err))), Default::default(), None, HandshakeState::Finished),
 	};
 
 	Handshake {
@@ -66,16 +94,18 @@ pub fn accept_handshake<A>(a: A, self_key_pair: Arc<NodeKeyPair>) -> Handshake<A
 		error: error,
 		state: state,
 		self_key_pair: self_key_pair,
-		self_confirmation_plain: self_confirmation_plain.unwrap_or(Default::default()),
+		self_session_key_pair: kp,
+		self_confirmation_plain: cp,
 		trusted_nodes: None,
-		other_node_id: None,
-		other_confirmation_plain: None,
+		peer_node_id: None,
+		peer_session_public: None,
+		peer_confirmation_plain: None,
 		shared_key: None,
 	}
 }
 
-#[derive(Debug, PartialEq)]
 /// Result of handshake procedure.
+#[derive(Debug, PartialEq)]
 pub struct HandshakeResult {
 	/// Node id.
 	pub node_id: NodeId,
@@ -89,10 +119,12 @@ pub struct Handshake<A> {
 	error: Option<(A, Result<HandshakeResult, Error>)>,
 	state: HandshakeState<A>,
 	self_key_pair: Arc<NodeKeyPair>,
+	self_session_key_pair: Option<KeyPair>,
 	self_confirmation_plain: H256,
 	trusted_nodes: Option<BTreeSet<NodeId>>,
-	other_node_id: Option<NodeId>,
-	other_confirmation_plain: Option<H256>,
+	peer_node_id: Option<NodeId>,
+	peer_session_public: Option<Public>,
+	peer_confirmation_plain: Option<H256>,
 	shared_key: Option<KeyPair>,
 }
 
@@ -111,10 +143,16 @@ impl<A> Handshake<A> where A: AsyncRead + AsyncWrite {
 		self.self_confirmation_plain = self_confirmation_plain;
 	}
 
-	pub fn make_public_key_message(self_node_id: NodeId, confirmation_plain: H256) -> Result<Message, Error> {
+	#[cfg(test)]
+	pub fn set_self_session_key_pair(&mut self, self_session_key_pair: KeyPair) {
+		self.self_session_key_pair = Some(self_session_key_pair);
+	}
+
+	pub fn make_public_key_message(self_node_id: NodeId, confirmation_plain: H256, confirmation_signed_session: Signature) -> Result<Message, Error> {
 		Ok(Message::Cluster(ClusterMessage::NodePublicKey(NodePublicKey {
 			node_id: self_node_id.into(),
 			confirmation_plain: confirmation_plain.into(),
+			confirmation_signed_session: confirmation_signed_session.into(),
 		})))
 	}
 
@@ -123,6 +161,12 @@ impl<A> Handshake<A> where A: AsyncRead + AsyncWrite {
 			confirmation_signed: self_key_pair.sign(confirmation_plain)?.into(),
 		})))
 	}
+
+	fn compute_shared_key(self_session_key_pair: &KeyPair, peer_session_public: &Public) -> Result<KeyPair, Error> {
+		agree(self_session_key_pair.secret(), peer_session_public)
+			.map_err(Into::into)
+			.and_then(|s| fix_shared_key(&s))
+	}
 }
 
 impl<A> Future for Handshake<A> where A: AsyncRead + AsyncWrite {
@@ -143,20 +187,25 @@ impl<A> Future for Handshake<A> where A: AsyncRead + AsyncWrite {
 						read_message(stream)
 					), Async::NotReady)
 				} else {
-					self.shared_key = match self.self_key_pair.compute_shared_key(
-						self.other_node_id.as_ref().expect("we are in passive mode; in passive mode SendPublicKey follows ReceivePublicKey; other_node_id is filled in ReceivePublicKey; qed")
-					).map_err(Into::into).and_then(|sk| fix_shared_key(sk.secret())) {
+					let shared_key = Self::compute_shared_key(
+						self.self_session_key_pair.as_ref().expect(
+							"self_session_key_pair is not filled only when initialization has failed; if initialization has failed, self.error.is_some(); qed"),
+						self.peer_session_public.as_ref().expect(
+							"we are in passive mode; in passive mode SendPublicKey follows ReceivePublicKey; peer_session_public is filled in ReceivePublicKey; qed"),
+					);
+
+					self.shared_key = match shared_key {
 						Ok(shared_key) => Some(shared_key),
-						Err(err) => return Ok((stream, Err(err.into())).into()),
+						Err(err) => return Ok((stream, Err(err)).into()),
 					};
 
-					let message = match Handshake::<A>::make_private_key_signature_message(
-						&*self.self_key_pair,
-						self.other_confirmation_plain.as_ref().expect("we are in passive mode; in passive mode SendPublicKey follows ReceivePublicKey; other_confirmation_plain is filled in ReceivePublicKey; qed")
-					) {
+					let peer_confirmation_plain = self.peer_confirmation_plain.as_ref()
+						.expect("we are in passive mode; in passive mode SendPublicKey follows ReceivePublicKey; peer_confirmation_plain is filled in ReceivePublicKey; qed");
+					let message = match Handshake::<A>::make_private_key_signature_message(&*self.self_key_pair, peer_confirmation_plain) {
 						Ok(message) => message,
 						Err(err) => return Ok((stream, Err(err)).into()),
 					};
+
 					(HandshakeState::SendPrivateKeySignature(write_encrypted_message(stream,
 						self.shared_key.as_ref().expect("filled couple of lines above; qed"),
 					message)), Async::NotReady)
@@ -177,28 +226,44 @@ impl<A> Future for Handshake<A> where A: AsyncRead + AsyncWrite {
 					return Ok((stream, Err(Error::InvalidNodeId)).into());
 				}
 
-				self.other_node_id = Some(message.node_id.into());
-				self.other_confirmation_plain = Some(message.confirmation_plain.into());
+				self.peer_node_id = Some(message.node_id.into());
+				self.peer_session_public = Some(match recover(&message.confirmation_signed_session, &message.confirmation_plain) {
+					Ok(peer_session_public) => peer_session_public,
+					Err(err) => return Ok((stream, Err(err.into())).into()),
+				});
+				self.peer_confirmation_plain = Some(message.confirmation_plain.into());
 				if self.is_active {
-					self.shared_key = match self.self_key_pair.compute_shared_key(
-						self.other_node_id.as_ref().expect("filled couple of lines above; qed")
-					).map_err(Into::into).and_then(|sk| fix_shared_key(sk.secret())) {
+					let shared_key = Self::compute_shared_key(
+						self.self_session_key_pair.as_ref().expect(
+							"self_session_key_pair is not filled only when initialization has failed; if initialization has failed, self.error.is_some(); qed"),
+						self.peer_session_public.as_ref().expect(
+							"we are in passive mode; in passive mode SendPublicKey follows ReceivePublicKey; peer_session_public is filled in ReceivePublicKey; qed"),
+					);
+
+					self.shared_key = match shared_key {
 						Ok(shared_key) => Some(shared_key),
-						Err(err) => return Ok((stream, Err(err.into())).into()),
+						Err(err) => return Ok((stream, Err(err)).into()),
 					};
 
-					let message = match Handshake::<A>::make_private_key_signature_message(
-						&*self.self_key_pair,
-						self.other_confirmation_plain.as_ref().expect("filled couple of lines above; qed")
-					) {
+					let peer_confirmation_plain = self.peer_confirmation_plain.as_ref()
+						.expect("filled couple of lines above; qed");
+					let message = match Handshake::<A>::make_private_key_signature_message(&*self.self_key_pair, peer_confirmation_plain) {
 						Ok(message) => message,
 						Err(err) => return Ok((stream, Err(err)).into()),
 					};
+
 					(HandshakeState::SendPrivateKeySignature(write_encrypted_message(stream,
 						self.shared_key.as_ref().expect("filled couple of lines above; qed"),
 					message)), Async::NotReady)
 				} else {
-					let message = match Handshake::<A>::make_public_key_message(self.self_key_pair.public().clone(), self.self_confirmation_plain.clone()) {
+					let self_session_key_pair = self.self_session_key_pair.as_ref()
+						.expect("self_session_key_pair is not filled only when initialization has failed; if initialization has failed, self.error.is_some(); qed");
+					let confirmation_signed_session = match sign(self_session_key_pair.secret(), &self.self_confirmation_plain).map_err(Into::into) {
+						Ok(confirmation_signed_session) => confirmation_signed_session,
+						Err(err) => return Ok((stream, Err(err)).into()),
+					};
+
+					let message = match Handshake::<A>::make_public_key_message(self.self_key_pair.public().clone(), self.self_confirmation_plain.clone(), confirmation_signed_session) {
 						Ok(message) => message,
 						Err(err) => return Ok((stream, Err(err)).into()),
 					};
@@ -225,13 +290,13 @@ impl<A> Future for Handshake<A> where A: AsyncRead + AsyncWrite {
 					Err(err) => return Ok((stream, Err(err.into())).into()),
 				};
 
-				let other_node_public = self.other_node_id.as_ref().expect("other_node_id is filled in ReceivePublicKey; ReceivePrivateKeySignature follows ReceivePublicKey; qed");
-				if !verify_public(other_node_public, &*message.confirmation_signed, &self.self_confirmation_plain).unwrap_or(false) {
+				let peer_public = self.peer_node_id.as_ref().expect("peer_node_id is filled in ReceivePublicKey; ReceivePrivateKeySignature follows ReceivePublicKey; qed");
+				if !verify_public(peer_public, &*message.confirmation_signed, &self.self_confirmation_plain).unwrap_or(false) {
 					return Ok((stream, Err(Error::InvalidMessage)).into());
 				}
 
 				(HandshakeState::Finished, Async::Ready((stream, Ok(HandshakeResult {
-					node_id: self.other_node_id.expect("other_node_id is filled in ReceivePublicKey; ReceivePrivateKeySignature follows ReceivePublicKey; qed"),
+					node_id: self.peer_node_id.expect("peer_node_id is filled in ReceivePublicKey; ReceivePrivateKeySignature follows ReceivePublicKey; qed"),
 					shared_key: self.shared_key.clone().expect("shared_key is filled in Send/ReceivePublicKey; ReceivePrivateKeySignature follows Send/ReceivePublicKey; qed"),
 				}))))
 			},
@@ -253,27 +318,26 @@ mod tests {
 	use std::collections::BTreeSet;
 	use futures::Future;
 	use ethkey::{Random, Generator, sign};
-	use ethcrypto::ecdh::agree;
-	use util::H256;
+	use ethereum_types::H256;
 	use key_server_cluster::PlainNodeKeyPair;
-	use key_server_cluster::io::message::fix_shared_key;
 	use key_server_cluster::io::message::tests::TestIo;
 	use key_server_cluster::message::{Message, ClusterMessage, NodePublicKey, NodePrivateKeySignature};
-	use super::{handshake_with_plain_confirmation, accept_handshake, HandshakeResult};
+	use super::{handshake_with_init_data, accept_handshake, HandshakeResult};
 
 	fn prepare_test_io() -> (H256, TestIo) {
-		let self_key_pair = Random.generate().unwrap();
-		let peer_key_pair = Random.generate().unwrap();
-		let mut io = TestIo::new(self_key_pair.clone(), peer_key_pair.public().clone());
+		let mut io = TestIo::new();
 
 		let self_confirmation_plain = *Random.generate().unwrap().secret().clone();
 		let peer_confirmation_plain = *Random.generate().unwrap().secret().clone();
 
-		let self_confirmation_signed = sign(peer_key_pair.secret(), &self_confirmation_plain).unwrap();
+		let self_confirmation_signed = sign(io.peer_key_pair().secret(), &self_confirmation_plain).unwrap();
+		let peer_confirmation_signed = sign(io.peer_session_key_pair().secret(), &peer_confirmation_plain).unwrap();
 
+		let peer_public = io.peer_key_pair().public().clone();
 		io.add_input_message(Message::Cluster(ClusterMessage::NodePublicKey(NodePublicKey {
-			node_id: peer_key_pair.public().clone().into(),
+			node_id: peer_public.into(),
 			confirmation_plain: peer_confirmation_plain.into(),
+			confirmation_signed_session: peer_confirmation_signed.into(),
 		})));
 		io.add_encrypted_input_message(Message::Cluster(ClusterMessage::NodePrivateKeySignature(NodePrivateKeySignature {
 			confirmation_signed: self_confirmation_signed.into(),
@@ -285,14 +349,15 @@ mod tests {
 	#[test]
 	fn active_handshake_works() {
 		let (self_confirmation_plain, io) = prepare_test_io();
-		let self_key_pair = io.self_key_pair().clone();
-		let trusted_nodes: BTreeSet<_> = vec![io.peer_public().clone()].into_iter().collect();
-		let shared_key = fix_shared_key(&agree(self_key_pair.secret(), trusted_nodes.iter().nth(0).unwrap()).unwrap()).unwrap();
+		let trusted_nodes: BTreeSet<_> = vec![io.peer_key_pair().public().clone()].into_iter().collect();
+		let self_session_key_pair = io.self_session_key_pair().clone();
+		let self_key_pair = Arc::new(PlainNodeKeyPair::new(io.self_key_pair().clone()));
+		let shared_key = io.shared_key_pair().clone();
 
-		let handshake = handshake_with_plain_confirmation(io, Ok(self_confirmation_plain), Arc::new(PlainNodeKeyPair::new(self_key_pair)), trusted_nodes);
+		let handshake = handshake_with_init_data(io, Ok((self_confirmation_plain, self_session_key_pair)), self_key_pair, trusted_nodes);
 		let handshake_result = handshake.wait().unwrap();
 		assert_eq!(handshake_result.1, Ok(HandshakeResult {
-			node_id: handshake_result.0.peer_public().clone(),
+			node_id: handshake_result.0.peer_key_pair().public().clone(),
 			shared_key: shared_key,
 		}));
 	}
@@ -300,16 +365,17 @@ mod tests {
 	#[test]
 	fn passive_handshake_works() {
 		let (self_confirmation_plain, io) = prepare_test_io();
-		let self_key_pair = io.self_key_pair().clone();
-		let trusted_nodes: BTreeSet<_> = vec![io.peer_public().clone()].into_iter().collect();
-		let shared_key = fix_shared_key(&agree(self_key_pair.secret(), trusted_nodes.iter().nth(0).unwrap()).unwrap()).unwrap();
+		let self_key_pair = Arc::new(PlainNodeKeyPair::new(io.self_key_pair().clone()));
+		let self_session_key_pair = io.self_session_key_pair().clone();
+		let shared_key = io.shared_key_pair().clone();
 
-		let mut handshake = accept_handshake(io, Arc::new(PlainNodeKeyPair::new(self_key_pair)));
+		let mut handshake = accept_handshake(io, self_key_pair);
 		handshake.set_self_confirmation_plain(self_confirmation_plain);
+		handshake.set_self_session_key_pair(self_session_key_pair);
 
 		let handshake_result = handshake.wait().unwrap();
 		assert_eq!(handshake_result.1, Ok(HandshakeResult {
-			node_id: handshake_result.0.peer_public().clone(),
+			node_id: handshake_result.0.peer_key_pair().public().clone(),
 			shared_key: shared_key,
 		}));
 	}
diff --git a/secret_store/src/key_server_cluster/io/message.rs b/secret_store/src/key_server_cluster/io/message.rs
index 5a6b50a3ee8fb6e0ae6e4ca7f2b305288ba2ffee..94030ef416df252009df1f1ada64b79917075e39 100644
--- a/secret_store/src/key_server_cluster/io/message.rs
+++ b/secret_store/src/key_server_cluster/io/message.rs
@@ -19,30 +19,32 @@ use std::u16;
 use std::ops::Deref;
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use serde_json;
-use ethcrypto::ecies::{encrypt_single_message, decrypt_single_message};
+use ethcrypto::ecies;
 use ethkey::{Secret, KeyPair};
 use ethkey::math::curve_order;
-use util::{H256, U256};
+use ethereum_types::{H256, U256};
 use key_server_cluster::Error;
-use key_server_cluster::message::{Message, ClusterMessage, GenerationMessage, EncryptionMessage,
-	DecryptionMessage, SigningMessage};
+use key_server_cluster::message::{Message, ClusterMessage, GenerationMessage, EncryptionMessage, DecryptionMessage,
+	SchnorrSigningMessage, EcdsaSigningMessage, ServersSetChangeMessage, ShareAddMessage, KeyVersionNegotiationMessage};
 
 /// Size of serialized header.
-pub const MESSAGE_HEADER_SIZE: usize = 4;
+pub const MESSAGE_HEADER_SIZE: usize = 18;
+/// Current header version.
+pub const CURRENT_HEADER_VERSION: u64 = 1;
 
-#[derive(Debug, PartialEq)]
 /// Message header.
+#[derive(Debug, PartialEq)]
 pub struct MessageHeader {
 	/// Message/Header version.
-	pub version: u8,
+	pub version: u64,
 	/// Message kind.
-	pub kind: u8,
+	pub kind: u64,
 	/// Message payload size (without header).
 	pub size: u16,
 }
 
-#[derive(Debug, Clone, PartialEq)]
 /// Serialized message.
+#[derive(Debug, Clone, PartialEq)]
 pub struct SerializedMessage(Vec<u8>);
 
 impl Deref for SerializedMessage {
@@ -84,19 +86,79 @@ pub fn serialize_message(message: Message) -> Result<SerializedMessage, Error> {
 		Message::Decryption(DecryptionMessage::PartialDecryption(payload))					=> (152, serde_json::to_vec(&payload)),
 		Message::Decryption(DecryptionMessage::DecryptionSessionError(payload))				=> (153, serde_json::to_vec(&payload)),
 		Message::Decryption(DecryptionMessage::DecryptionSessionCompleted(payload))			=> (154, serde_json::to_vec(&payload)),
-
-		Message::Signing(SigningMessage::SigningConsensusMessage(payload))					=> (200, serde_json::to_vec(&payload)),
-		Message::Signing(SigningMessage::SigningGenerationMessage(payload))					=> (201, serde_json::to_vec(&payload)),
-		Message::Signing(SigningMessage::RequestPartialSignature(payload))					=> (202, serde_json::to_vec(&payload)),
-		Message::Signing(SigningMessage::PartialSignature(payload))							=> (203, serde_json::to_vec(&payload)),
-		Message::Signing(SigningMessage::SigningSessionError(payload))						=> (204, serde_json::to_vec(&payload)),
-		Message::Signing(SigningMessage::SigningSessionCompleted(payload))					=> (205, serde_json::to_vec(&payload)),
+		Message::Decryption(DecryptionMessage::DecryptionSessionDelegation(payload))		=> (155, serde_json::to_vec(&payload)),
+		Message::Decryption(DecryptionMessage::DecryptionSessionDelegationCompleted(payload))
+																							=> (156, serde_json::to_vec(&payload)),
+
+		Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningConsensusMessage(payload))
+																							=> (200, serde_json::to_vec(&payload)),
+		Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningGenerationMessage(payload))
+																							=> (201, serde_json::to_vec(&payload)),
+		Message::SchnorrSigning(SchnorrSigningMessage::SchnorrRequestPartialSignature(payload))
+																							=> (202, serde_json::to_vec(&payload)),
+		Message::SchnorrSigning(SchnorrSigningMessage::SchnorrPartialSignature(payload))	=> (203, serde_json::to_vec(&payload)),
+		Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionError(payload))	=> (204, serde_json::to_vec(&payload)),
+		Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionCompleted(payload))
+																							=> (205, serde_json::to_vec(&payload)),
+		Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionDelegation(payload))
+																							=> (206, serde_json::to_vec(&payload)),
+		Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionDelegationCompleted(payload))
+																							=> (207, serde_json::to_vec(&payload)),
+
+		Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeConsensusMessage(payload))
+																							=> (250, serde_json::to_vec(&payload)),
+		Message::ServersSetChange(ServersSetChangeMessage::UnknownSessionsRequest(payload)) => (251, serde_json::to_vec(&payload)),
+		Message::ServersSetChange(ServersSetChangeMessage::UnknownSessions(payload))		=> (252, serde_json::to_vec(&payload)),
+		Message::ServersSetChange(ServersSetChangeMessage::ShareChangeKeyVersionNegotiation(payload))
+																							=> (253, serde_json::to_vec(&payload)),
+		Message::ServersSetChange(ServersSetChangeMessage::InitializeShareChangeSession(payload))
+																							=> (254, serde_json::to_vec(&payload)),
+		Message::ServersSetChange(ServersSetChangeMessage::ConfirmShareChangeSessionInitialization(payload))
+																							=> (255, serde_json::to_vec(&payload)),
+		Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeDelegate(payload))
+																							=> (256, serde_json::to_vec(&payload)),
+		Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeDelegateResponse(payload))
+																							=> (257, serde_json::to_vec(&payload)),
+		Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeShareAddMessage(payload))
+																							=> (258, serde_json::to_vec(&payload)),
+		Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeError(payload))	=> (261, serde_json::to_vec(&payload)),
+		Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeCompleted(payload))
+																							=> (262, serde_json::to_vec(&payload)),
+
+		Message::ShareAdd(ShareAddMessage::ShareAddConsensusMessage(payload))				=> (300, serde_json::to_vec(&payload)),
+		Message::ShareAdd(ShareAddMessage::KeyShareCommon(payload))							=> (301, serde_json::to_vec(&payload)),
+		Message::ShareAdd(ShareAddMessage::NewKeysDissemination(payload))					=> (302, serde_json::to_vec(&payload)),
+		Message::ShareAdd(ShareAddMessage::ShareAddError(payload))							=> (303, serde_json::to_vec(&payload)),
+
+		Message::KeyVersionNegotiation(KeyVersionNegotiationMessage::RequestKeyVersions(payload))
+																							=> (450, serde_json::to_vec(&payload)),
+		Message::KeyVersionNegotiation(KeyVersionNegotiationMessage::KeyVersions(payload))
+																							=> (451, serde_json::to_vec(&payload)),
+		Message::KeyVersionNegotiation(KeyVersionNegotiationMessage::KeyVersionsError(payload))
+																							=> (452, serde_json::to_vec(&payload)),
+
+		Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningConsensusMessage(payload))	=> (500, serde_json::to_vec(&payload)),
+		Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSignatureNonceGenerationMessage(payload))
+																							=> (501, serde_json::to_vec(&payload)),
+		Message::EcdsaSigning(EcdsaSigningMessage::EcdsaInversionNonceGenerationMessage(payload))
+																							=> (502, serde_json::to_vec(&payload)),
+		Message::EcdsaSigning(EcdsaSigningMessage::EcdsaInversionZeroGenerationMessage(payload))
+																							=> (503, serde_json::to_vec(&payload)),
+		Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningInversedNonceCoeffShare(payload))
+																							=> (504, serde_json::to_vec(&payload)),
+		Message::EcdsaSigning(EcdsaSigningMessage::EcdsaRequestPartialSignature(payload))	=> (505, serde_json::to_vec(&payload)),
+		Message::EcdsaSigning(EcdsaSigningMessage::EcdsaPartialSignature(payload))			=> (506, serde_json::to_vec(&payload)),
+		Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionError(payload))		=> (507, serde_json::to_vec(&payload)),
+		Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionCompleted(payload))	=> (508, serde_json::to_vec(&payload)),
+		Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionDelegation(payload))	=> (509, serde_json::to_vec(&payload)),
+		Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionDelegationCompleted(payload))
+																							=> (510, serde_json::to_vec(&payload)),
 	};
 
 	let payload = payload.map_err(|err| Error::Serde(err.to_string()))?;
 	build_serialized_message(MessageHeader {
 		kind: message_kind,
-		version: 1,
+		version: CURRENT_HEADER_VERSION,
 		size: 0,
 	}, payload)
 }
@@ -126,13 +188,50 @@ pub fn deserialize_message(header: &MessageHeader, payload: Vec<u8>) -> Result<M
 		152	=> Message::Decryption(DecryptionMessage::PartialDecryption(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
 		153	=> Message::Decryption(DecryptionMessage::DecryptionSessionError(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
 		154	=> Message::Decryption(DecryptionMessage::DecryptionSessionCompleted(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
-
-		200	=> Message::Signing(SigningMessage::SigningConsensusMessage(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
-		201	=> Message::Signing(SigningMessage::SigningGenerationMessage(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
-		202	=> Message::Signing(SigningMessage::RequestPartialSignature(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
-		203	=> Message::Signing(SigningMessage::PartialSignature(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
-		204	=> Message::Signing(SigningMessage::SigningSessionError(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
-		205	=> Message::Signing(SigningMessage::SigningSessionCompleted(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		155	=> Message::Decryption(DecryptionMessage::DecryptionSessionDelegation(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		156	=> Message::Decryption(DecryptionMessage::DecryptionSessionDelegationCompleted(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+
+		200	=> Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningConsensusMessage(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		201	=> Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningGenerationMessage(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		202	=> Message::SchnorrSigning(SchnorrSigningMessage::SchnorrRequestPartialSignature(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		203	=> Message::SchnorrSigning(SchnorrSigningMessage::SchnorrPartialSignature(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		204	=> Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionError(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		205	=> Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionCompleted(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		206	=> Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionDelegation(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		207	=> Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionDelegationCompleted(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+
+		250	=> Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeConsensusMessage(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		251	=> Message::ServersSetChange(ServersSetChangeMessage::UnknownSessionsRequest(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		252	=> Message::ServersSetChange(ServersSetChangeMessage::UnknownSessions(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		253 => Message::ServersSetChange(ServersSetChangeMessage::ShareChangeKeyVersionNegotiation(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		254 => Message::ServersSetChange(ServersSetChangeMessage::InitializeShareChangeSession(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		255 => Message::ServersSetChange(ServersSetChangeMessage::ConfirmShareChangeSessionInitialization(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		256	=> Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeDelegate(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		257	=> Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeDelegateResponse(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		258	=> Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeShareAddMessage(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		261	=> Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeError(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		262	=> Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeCompleted(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+
+		300 => Message::ShareAdd(ShareAddMessage::ShareAddConsensusMessage(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		301 => Message::ShareAdd(ShareAddMessage::KeyShareCommon(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		302 => Message::ShareAdd(ShareAddMessage::NewKeysDissemination(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		303 => Message::ShareAdd(ShareAddMessage::ShareAddError(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+
+		450 => Message::KeyVersionNegotiation(KeyVersionNegotiationMessage::RequestKeyVersions(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		451 => Message::KeyVersionNegotiation(KeyVersionNegotiationMessage::KeyVersions(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		452 => Message::KeyVersionNegotiation(KeyVersionNegotiationMessage::KeyVersionsError(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+
+		500	=> Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningConsensusMessage(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		501	=> Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSignatureNonceGenerationMessage(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		502	=> Message::EcdsaSigning(EcdsaSigningMessage::EcdsaInversionNonceGenerationMessage(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		503	=> Message::EcdsaSigning(EcdsaSigningMessage::EcdsaInversionZeroGenerationMessage(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		504	=> Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningInversedNonceCoeffShare(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		505	=> Message::EcdsaSigning(EcdsaSigningMessage::EcdsaRequestPartialSignature(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		506	=> Message::EcdsaSigning(EcdsaSigningMessage::EcdsaPartialSignature(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		507	=> Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionError(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		508	=> Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionCompleted(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		509	=> Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionDelegation(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
+		510	=> Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionDelegationCompleted(serde_json::from_slice(&payload).map_err(|err| Error::Serde(err.to_string()))?)),
 
 		_ => return Err(Error::Serde(format!("unknown message type {}", header.kind))),
 	})
@@ -142,7 +241,7 @@ pub fn deserialize_message(header: &MessageHeader, payload: Vec<u8>) -> Result<M
 pub fn encrypt_message(key: &KeyPair, message: SerializedMessage) -> Result<SerializedMessage, Error> {
 	let mut header: Vec<_> = message.into();
 	let payload = header.split_off(MESSAGE_HEADER_SIZE);
-	let encrypted_payload = encrypt_single_message(key.public(), &payload)?;
+	let encrypted_payload = ecies::encrypt(key.public(), &[], &payload)?;
 
 	let header = deserialize_header(&header)?;
 	build_serialized_message(header, encrypted_payload)
@@ -150,7 +249,7 @@ pub fn encrypt_message(key: &KeyPair, message: SerializedMessage) -> Result<Seri
 
 /// Decrypt serialized message.
 pub fn decrypt_message(key: &KeyPair, payload: Vec<u8>) -> Result<Vec<u8>, Error> {
-	Ok(decrypt_single_message(key.secret(), &payload)?)
+	Ok(ecies::decrypt(key.secret(), &[], &payload)?)
 }
 
 /// Fix shared encryption key.
@@ -167,8 +266,8 @@ pub fn fix_shared_key(shared_secret: &Secret) -> Result<KeyPair, Error> {
 /// Serialize message header.
 fn serialize_header(header: &MessageHeader) -> Result<Vec<u8>, Error> {
 	let mut buffer = Vec::with_capacity(MESSAGE_HEADER_SIZE);
-	buffer.write_u8(header.version)?;
-	buffer.write_u8(header.kind)?;
+	buffer.write_u64::<LittleEndian>(header.version)?;
+	buffer.write_u64::<LittleEndian>(header.kind)?;
 	buffer.write_u16::<LittleEndian>(header.size)?;
 	Ok(buffer)
 }
@@ -176,9 +275,14 @@ fn serialize_header(header: &MessageHeader) -> Result<Vec<u8>, Error> {
 /// Deserialize message header.
 pub fn deserialize_header(data: &[u8]) -> Result<MessageHeader, Error> {
 	let mut reader = Cursor::new(data);
+	let version = reader.read_u64::<LittleEndian>()?;
+	if version != CURRENT_HEADER_VERSION {
+		return Err(Error::InvalidMessageVersion);
+	}
+
 	Ok(MessageHeader {
-		version: reader.read_u8()?,
-		kind: reader.read_u8()?,
+		version: version,
+		kind: reader.read_u64::<LittleEndian>()?,
 		size: reader.read_u16::<LittleEndian>()?,
 	})
 }
@@ -201,25 +305,34 @@ pub mod tests {
 	use std::io;
 	use futures::Poll;
 	use tokio_io::{AsyncRead, AsyncWrite};
-	use ethkey::{KeyPair, Public};
+	use ethkey::{Random, Generator, KeyPair};
 	use ethcrypto::ecdh::agree;
+	use key_server_cluster::Error;
 	use key_server_cluster::message::Message;
-	use super::{MESSAGE_HEADER_SIZE, MessageHeader, fix_shared_key, encrypt_message, serialize_message,
-		serialize_header, deserialize_header};
+	use super::{MESSAGE_HEADER_SIZE, CURRENT_HEADER_VERSION, MessageHeader, fix_shared_key, encrypt_message,
+		serialize_message, serialize_header, deserialize_header};
 
 	pub struct TestIo {
 		self_key_pair: KeyPair,
-		peer_public: Public,
+		self_session_key_pair: KeyPair,
+		peer_key_pair: KeyPair,
+		peer_session_key_pair: KeyPair,
 		shared_key_pair: KeyPair,
 		input_buffer: io::Cursor<Vec<u8>>,
 	}
 
 	impl TestIo {
-		pub fn new(self_key_pair: KeyPair, peer_public: Public) -> Self {
-			let shared_key_pair = fix_shared_key(&agree(self_key_pair.secret(), &peer_public).unwrap()).unwrap();
+		pub fn new() -> Self {
+			let self_session_key_pair = Random.generate().unwrap();
+			let peer_session_key_pair = Random.generate().unwrap();
+			let self_key_pair = Random.generate().unwrap();
+			let peer_key_pair = Random.generate().unwrap();
+			let shared_key_pair = fix_shared_key(&agree(self_session_key_pair.secret(), peer_session_key_pair.public()).unwrap()).unwrap();
 			TestIo {
 				self_key_pair: self_key_pair,
-				peer_public: peer_public,
+				self_session_key_pair: self_session_key_pair,
+				peer_key_pair: peer_key_pair,
+				peer_session_key_pair: peer_session_key_pair,
 				shared_key_pair: shared_key_pair,
 				input_buffer: io::Cursor::new(Vec::new()),
 			}
@@ -229,8 +342,20 @@ pub mod tests {
 			&self.self_key_pair
 		}
 
-		pub fn peer_public(&self) -> &Public {
-			&self.peer_public
+		pub fn self_session_key_pair(&self) -> &KeyPair {
+			&self.self_session_key_pair
+		}
+
+		pub fn peer_key_pair(&self) -> &KeyPair {
+			&self.peer_key_pair
+		}
+
+		pub fn peer_session_key_pair(&self) -> &KeyPair {
+			&self.peer_session_key_pair
+		}
+
+		pub fn shared_key_pair(&self) -> &KeyPair {
+			&self.shared_key_pair
 		}
 
 		pub fn add_input_message(&mut self, message: Message) {
@@ -280,7 +405,7 @@ pub mod tests {
 	fn header_serialization_works() {
 		let header = MessageHeader {
 			kind: 1,
-			version: 2,
+			version: CURRENT_HEADER_VERSION,
 			size: 3,
 		};
 
@@ -290,4 +415,15 @@ pub mod tests {
 		let deserialized_header = deserialize_header(&serialized_header).unwrap();
 		assert_eq!(deserialized_header, header);
 	}
+
+	#[test]
+	fn deserializing_header_of_wrong_version_fails() {
+		let header = MessageHeader {
+			kind: 1,
+			version: CURRENT_HEADER_VERSION + 1,
+			size: 3,
+		};
+
+		assert_eq!(deserialize_header(&serialize_header(&header).unwrap()).unwrap_err(), Error::InvalidMessageVersion);
+	}
 }
diff --git a/secret_store/src/key_server_cluster/io/write_message.rs b/secret_store/src/key_server_cluster/io/write_message.rs
index 5988634cc3b63c78a49ee8440db9b9f9850f2f79..8a89cf4552a4e2fa547cc3164e6fca894bff3530 100644
--- a/secret_store/src/key_server_cluster/io/write_message.rs
+++ b/secret_store/src/key_server_cluster/io/write_message.rs
@@ -44,7 +44,6 @@ pub fn write_encrypted_message<A>(a: A, key: &KeyPair, message: Message) -> Writ
 		Err(error) => (Some(error), write_all(a, Vec::new())),
 	};
 
-
 	WriteMessage {
 		error: error,
 		future: future,
diff --git a/secret_store/src/key_server_cluster/jobs/consensus_session.rs b/secret_store/src/key_server_cluster/jobs/consensus_session.rs
index 27542bc446aa7638b7ed8d351c5c6f45f56bf051..42de71b544d4379c3a3e1e4d57299a32bf810faf 100644
--- a/secret_store/src/key_server_cluster/jobs/consensus_session.rs
+++ b/secret_store/src/key_server_cluster/jobs/consensus_session.rs
@@ -15,12 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::collections::BTreeSet;
-use std::sync::Arc;
-use ethkey::{Public, Signature, recover};
-use key_server_cluster::{Error, NodeId, SessionMeta, AclStorage};
+use key_server_cluster::{Error, NodeId, SessionMeta, Requester};
 use key_server_cluster::message::ConsensusMessage;
 use key_server_cluster::jobs::job_session::{JobSession, JobSessionState, JobTransport, JobExecutor};
-use key_server_cluster::jobs::key_access_job::KeyAccessJob;
 
 /// Consensus session state.
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -47,15 +44,17 @@ pub enum ConsensusSessionState {
 /// 2) master node sends partial job requests to every member of consensus group
 /// 3) slave nodes are computing partial responses
 /// 4) master node computes result from partial responses
-pub struct ConsensusSession<ConsensusTransport: JobTransport<PartialJobRequest=Signature, PartialJobResponse=bool>, ComputationExecutor: JobExecutor, ComputationTransport: JobTransport<PartialJobRequest=ComputationExecutor::PartialJobRequest, PartialJobResponse=ComputationExecutor::PartialJobResponse>> {
+pub struct ConsensusSession<ConsensusExecutor: JobExecutor<PartialJobResponse=bool>,
+	ConsensusTransport: JobTransport<PartialJobRequest=ConsensusExecutor::PartialJobRequest, PartialJobResponse=ConsensusExecutor::PartialJobResponse>,
+	ComputationExecutor: JobExecutor,
+	ComputationTransport: JobTransport<PartialJobRequest=ComputationExecutor::PartialJobRequest, PartialJobResponse=ComputationExecutor::PartialJobResponse>
+> {
 	/// Current session state.
 	state: ConsensusSessionState,
 	/// Session metadata.
 	meta: SessionMeta,
-	/// Requester, for which consensus group has allowed access.
-	requester: Option<Public>,
 	/// Consensus establish job.
-	consensus_job: JobSession<KeyAccessJob, ConsensusTransport>,
+	consensus_job: JobSession<ConsensusExecutor, ConsensusTransport>,
 	/// Consensus group.
 	consensus_group: BTreeSet<NodeId>,
 	/// Computation job.
@@ -63,38 +62,30 @@ pub struct ConsensusSession<ConsensusTransport: JobTransport<PartialJobRequest=S
 }
 
 /// Consensus session creation parameters.
-pub struct ConsensusSessionParams<ConsensusTransport: JobTransport<PartialJobRequest=Signature, PartialJobResponse=bool>> {
+pub struct ConsensusSessionParams<ConsensusExecutor: JobExecutor<PartialJobResponse=bool>,
+	ConsensusTransport: JobTransport<PartialJobRequest=ConsensusExecutor::PartialJobRequest, PartialJobResponse=ConsensusExecutor::PartialJobResponse>
+> {
 	/// Session metadata.
 	pub meta: SessionMeta,
 	/// ACL storage for access check.
-	pub acl_storage: Arc<AclStorage>,
+	pub consensus_executor: ConsensusExecutor,
 	/// Transport for consensus establish job.
 	pub consensus_transport: ConsensusTransport,
 }
 
-impl<ConsensusTransport, ComputationExecutor, ComputationTransport> ConsensusSession<ConsensusTransport, ComputationExecutor, ComputationTransport> where ConsensusTransport: JobTransport<PartialJobRequest=Signature, PartialJobResponse=bool>, ComputationExecutor: JobExecutor, ComputationTransport: JobTransport<PartialJobRequest=ComputationExecutor::PartialJobRequest, PartialJobResponse=ComputationExecutor::PartialJobResponse> {
-	/// Create new consensus session on slave node.
-	pub fn new_on_slave(params: ConsensusSessionParams<ConsensusTransport>) -> Result<Self, Error> {
-		debug_assert!(params.meta.self_node_id != params.meta.master_node_id);
-		Self::new(None, KeyAccessJob::new_on_slave(params.meta.id.clone(), params.acl_storage.clone()), params)
-	}
-
-	/// Create new consensus session on master node.
-	pub fn new_on_master(params: ConsensusSessionParams<ConsensusTransport>, signature: Signature) -> Result<Self, Error> {
-		debug_assert!(params.meta.self_node_id == params.meta.master_node_id);
-		Self::new(Some(recover(&signature, &params.meta.id)?),
-			KeyAccessJob::new_on_master(params.meta.id.clone(), params.acl_storage.clone(), signature), params)
-	}
-
+impl<ConsensusExecutor, ConsensusTransport, ComputationExecutor, ComputationTransport> ConsensusSession<ConsensusExecutor, ConsensusTransport, ComputationExecutor, ComputationTransport>
+	where ConsensusExecutor: JobExecutor<PartialJobResponse=bool, JobResponse=BTreeSet<NodeId>>,
+		ConsensusTransport: JobTransport<PartialJobRequest=ConsensusExecutor::PartialJobRequest, PartialJobResponse=ConsensusExecutor::PartialJobResponse>,
+		ComputationExecutor: JobExecutor,
+		ComputationTransport: JobTransport<PartialJobRequest=ComputationExecutor::PartialJobRequest, PartialJobResponse=ComputationExecutor::PartialJobResponse> {
 	/// Create new consensus session.
-	fn new(requester: Option<Public>, consensus_job_executor: KeyAccessJob, params: ConsensusSessionParams<ConsensusTransport>) -> Result<Self, Error> {
-		let consensus_job = JobSession::new(params.meta.clone(), consensus_job_executor, params.consensus_transport);
+	pub fn new(params: ConsensusSessionParams<ConsensusExecutor, ConsensusTransport>) -> Result<Self, Error> {
+		let consensus_job = JobSession::new(params.meta.clone(), params.consensus_executor, params.consensus_transport);
 		debug_assert!(consensus_job.state() == JobSessionState::Inactive);
 
 		Ok(ConsensusSession {
 			state: ConsensusSessionState::WaitingForInitialization,
 			meta: params.meta,
-			requester: requester,
 			consensus_job: consensus_job,
 			consensus_group: BTreeSet::new(),
 			computation_job: None,
@@ -102,11 +93,26 @@ impl<ConsensusTransport, ComputationExecutor, ComputationTransport> ConsensusSes
 	}
 
 	/// Get consensus job reference.
-	#[cfg(test)]
-	pub fn consensus_job(&self) -> &JobSession<KeyAccessJob, ConsensusTransport> {
+	pub fn consensus_job(&self) -> &JobSession<ConsensusExecutor, ConsensusTransport> {
 		&self.consensus_job
 	}
 
+	/// Get mutable consensus job reference.
+	pub fn consensus_job_mut(&mut self) -> &mut JobSession<ConsensusExecutor, ConsensusTransport> {
+		&mut self.consensus_job
+	}
+
+	/// Get all nodes, which has not rejected consensus request.
+	pub fn consensus_non_rejected_nodes(&self) -> BTreeSet<NodeId> {
+		self.consensus_job.responses().iter()
+			.filter(|r| *r.1)
+			.map(|r| r.0)
+			.chain(self.consensus_job.requests())
+			.filter(|n| **n != self.meta.self_node_id)
+			.cloned()
+			.collect()
+	}
+
 	/// Get computation job reference.
 	#[cfg(test)]
 	pub fn computation_job(&self) -> &JobSession<ComputationExecutor, ComputationTransport> {
@@ -119,11 +125,6 @@ impl<ConsensusTransport, ComputationExecutor, ComputationTransport> ConsensusSes
 		self.state
 	}
 
-	/// Get requester, for which consensus has been reached.
-	pub fn requester(&self) -> Result<&Public, Error> {
-		self.requester.as_ref().ok_or(Error::InvalidStateForRequest)
-	}
-
 	/// Get computation result.
 	pub fn result(&self) -> Result<ComputationExecutor::JobResponse, Error> {
 		debug_assert!(self.meta.self_node_id == self.meta.master_node_id);
@@ -139,22 +140,20 @@ impl<ConsensusTransport, ComputationExecutor, ComputationTransport> ConsensusSes
 	/// Initialize session on master node.
 	pub fn initialize(&mut self, nodes: BTreeSet<NodeId>) -> Result<(), Error> {
 		debug_assert!(self.meta.self_node_id == self.meta.master_node_id);
-		let initialization_result = self.consensus_job.initialize(nodes);
+		let initialization_result = self.consensus_job.initialize(nodes, false);
 		self.state = ConsensusSessionState::EstablishingConsensus;
 		self.process_result(initialization_result)
 	}
 
-	/// Process consensus message.
-	pub fn on_consensus_message(&mut self, sender: &NodeId, message: &ConsensusMessage) -> Result<(), Error> {
-		let consensus_result = match message {
-			&ConsensusMessage::InitializeConsensusSession(ref message) => {
-				let signature = message.requestor_signature.clone().into();
-				self.requester = Some(recover(&signature, &self.meta.id)?);
-				self.consensus_job.on_partial_request(sender, signature)
-			},
-			&ConsensusMessage::ConfirmConsensusInitialization(ref message) =>
-				self.consensus_job.on_partial_response(sender, message.is_confirmed),
-		};
+	/// Process consensus request message.
+	pub fn on_consensus_partial_request(&mut self, sender: &NodeId, request: ConsensusExecutor::PartialJobRequest) -> Result<(), Error> {
+		let consensus_result = self.consensus_job.on_partial_request(sender, request);
+		self.process_result(consensus_result)
+	}
+
+	/// Process consensus message response.
+	pub fn on_consensus_partial_response(&mut self, sender: &NodeId, response: bool) -> Result<(), Error> {
+		let consensus_result = self.consensus_job.on_partial_response(sender, response);
 		self.process_result(consensus_result)
 	}
 
@@ -180,12 +179,12 @@ impl<ConsensusTransport, ComputationExecutor, ComputationTransport> ConsensusSes
 	}
 
 	/// Disseminate jobs from master node.
-	pub fn disseminate_jobs(&mut self, executor: ComputationExecutor, transport: ComputationTransport) -> Result<(), Error> {
+	pub fn disseminate_jobs(&mut self, executor: ComputationExecutor, transport: ComputationTransport, broadcast_self_response: bool) -> Result<(), Error> {
 		let consensus_group = self.select_consensus_group()?.clone();
 		self.consensus_group.clear();
 
 		let mut computation_job = JobSession::new(self.meta.clone(), executor, transport);
-		let computation_result = computation_job.initialize(consensus_group);
+		let computation_result = computation_job.initialize(consensus_group, broadcast_self_response);
 		self.computation_job = Some(computation_job);
 		self.state = ConsensusSessionState::WaitingForPartialResults;
 		self.process_result(computation_result)
@@ -212,6 +211,7 @@ impl<ConsensusTransport, ComputationExecutor, ComputationTransport> ConsensusSes
 		let computation_result = self.computation_job.as_mut()
 			.expect("WaitingForPartialResults is only set when computation_job is created; qed")
 			.on_partial_response(node, response);
+
 		self.process_result(computation_result)
 	}
 
@@ -236,8 +236,9 @@ impl<ConsensusTransport, ComputationExecutor, ComputationTransport> ConsensusSes
 		let (is_restart_needed, timeout_result) = match self.state {
 			ConsensusSessionState::WaitingForInitialization if is_self_master => {
 				// it is strange to receive error before session is initialized && slave doesn't know access_key
-				// => ignore this error for now
-				(false, Ok(()))
+				// => fatal error
+				self.state = ConsensusSessionState::Failed;
+				(false, Err(Error::ConsensusUnreachable))
 			}
 			ConsensusSessionState::WaitingForInitialization if is_node_master => {
 				// can not establish consensus
@@ -339,30 +340,50 @@ impl<ConsensusTransport, ComputationExecutor, ComputationTransport> ConsensusSes
 	}
 }
 
+impl<ConsensusExecutor, ConsensusTransport, ComputationExecutor, ComputationTransport> ConsensusSession<ConsensusExecutor, ConsensusTransport, ComputationExecutor, ComputationTransport>
+	where ConsensusExecutor: JobExecutor<PartialJobRequest=Requester, PartialJobResponse=bool, JobResponse=BTreeSet<NodeId>>,
+		ConsensusTransport: JobTransport<PartialJobRequest=ConsensusExecutor::PartialJobRequest, PartialJobResponse=ConsensusExecutor::PartialJobResponse>,
+		ComputationExecutor: JobExecutor,
+		ComputationTransport: JobTransport<PartialJobRequest=ComputationExecutor::PartialJobRequest, PartialJobResponse=ComputationExecutor::PartialJobResponse> {
+	/// Process basic consensus message.
+	pub fn on_consensus_message(&mut self, sender: &NodeId, message: &ConsensusMessage) -> Result<(), Error> {
+		let consensus_result = match message {
+			
+			&ConsensusMessage::InitializeConsensusSession(ref message) =>
+				self.consensus_job.on_partial_request(sender, message.requester.clone().into()),
+			&ConsensusMessage::ConfirmConsensusInitialization(ref message) =>
+				self.consensus_job.on_partial_response(sender, message.is_confirmed),
+		};
+		self.process_result(consensus_result)
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use std::sync::Arc;
-	use ethkey::{Signature, KeyPair, Random, Generator, sign};
-	use key_server_cluster::{Error, NodeId, SessionId, DummyAclStorage};
+	use ethkey::{KeyPair, Random, Generator, sign};
+	use key_server_cluster::{Error, NodeId, SessionId, Requester, DummyAclStorage};
 	use key_server_cluster::message::{ConsensusMessage, InitializeConsensusSession, ConfirmConsensusInitialization};
 	use key_server_cluster::jobs::job_session::tests::{make_master_session_meta, make_slave_session_meta, SquaredSumJobExecutor, DummyJobTransport};
+	use key_server_cluster::jobs::key_access_job::KeyAccessJob;
 	use super::{ConsensusSession, ConsensusSessionParams, ConsensusSessionState};
 
-	type SquaredSumConsensusSession = ConsensusSession<DummyJobTransport<Signature, bool>, SquaredSumJobExecutor, DummyJobTransport<u32, u32>>;
+	type SquaredSumConsensusSession = ConsensusSession<KeyAccessJob, DummyJobTransport<Requester, bool>, SquaredSumJobExecutor, DummyJobTransport<u32, u32>>;
 
 	fn make_master_consensus_session(threshold: usize, requester: Option<KeyPair>, acl_storage: Option<DummyAclStorage>) -> SquaredSumConsensusSession {
 		let secret = requester.map(|kp| kp.secret().clone()).unwrap_or(Random.generate().unwrap().secret().clone());
-		SquaredSumConsensusSession::new_on_master(ConsensusSessionParams {
+		SquaredSumConsensusSession::new(ConsensusSessionParams {
 			meta: make_master_session_meta(threshold),
-			acl_storage: Arc::new(acl_storage.unwrap_or(DummyAclStorage::default())),
+			consensus_executor: KeyAccessJob::new_on_master(SessionId::default(), Arc::new(acl_storage.unwrap_or(DummyAclStorage::default())),
+				sign(&secret, &SessionId::default()).unwrap().into()),
 			consensus_transport: DummyJobTransport::default(),
-		}, sign(&secret, &SessionId::default()).unwrap()).unwrap()
+		}).unwrap()
 	}
 
 	fn make_slave_consensus_session(threshold: usize, acl_storage: Option<DummyAclStorage>) -> SquaredSumConsensusSession {
-		SquaredSumConsensusSession::new_on_slave(ConsensusSessionParams {
+		SquaredSumConsensusSession::new(ConsensusSessionParams {
 			meta: make_slave_session_meta(threshold),
-			acl_storage: Arc::new(acl_storage.unwrap_or(DummyAclStorage::default())),
+			consensus_executor: KeyAccessJob::new_on_slave(SessionId::default(), Arc::new(acl_storage.unwrap_or(DummyAclStorage::default()))),
 			consensus_transport: DummyJobTransport::default(),
 		}).unwrap()
 	}
@@ -429,7 +450,7 @@ mod tests {
 	#[test]
 	fn consensus_session_job_dissemination_fails_if_consensus_is_not_reached() {
 		let mut session = make_master_consensus_session(1, None, None);
-		assert_eq!(session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap_err(), Error::InvalidStateForRequest);
+		assert_eq!(session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap_err(), Error::InvalidStateForRequest);
 	}
 
 	#[test]
@@ -441,7 +462,7 @@ mod tests {
 			is_confirmed: true,
 		})).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::ConsensusEstablished);
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::Finished);
 		assert!(session.computation_job().responses().contains_key(&NodeId::from(1)));
 	}
@@ -459,7 +480,7 @@ mod tests {
 			is_confirmed: true,
 		})).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::ConsensusEstablished);
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForPartialResults);
 		assert!(!session.computation_job().responses().contains_key(&NodeId::from(1)));
 	}
@@ -481,7 +502,8 @@ mod tests {
 		let mut session = make_slave_consensus_session(0, None);
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForInitialization);
 		session.on_consensus_message(&NodeId::from(1), &ConsensusMessage::InitializeConsensusSession(InitializeConsensusSession {
-			requestor_signature: sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap().into(),
+			requester: Requester::Signature(sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap()).into(),
+			version: Default::default(),
 		})).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::ConsensusEstablished);
 		assert_eq!(session.on_job_request(&NodeId::from(1), 20, SquaredSumJobExecutor, DummyJobTransport::default()).unwrap_err(), Error::InvalidMessage);
@@ -493,7 +515,8 @@ mod tests {
 		let mut session = make_slave_consensus_session(0, None);
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForInitialization);
 		session.on_consensus_message(&NodeId::from(1), &ConsensusMessage::InitializeConsensusSession(InitializeConsensusSession {
-			requestor_signature: sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap().into(),
+			requester: Requester::Signature(sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap()).into(),
+			version: Default::default(),
 		})).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::ConsensusEstablished);
 		session.on_job_request(&NodeId::from(1), 2, SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
@@ -522,16 +545,18 @@ mod tests {
 	fn consessus_session_completion_is_accepted() {
 		let mut session = make_slave_consensus_session(0, None);
 		session.on_consensus_message(&NodeId::from(1), &ConsensusMessage::InitializeConsensusSession(InitializeConsensusSession {
-			requestor_signature: sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap().into(),
+			requester: Requester::Signature(sign(Random.generate().unwrap().secret(), &SessionId::default()).unwrap()).into(),
+			version: Default::default(),
 		})).unwrap();
 		session.on_session_completed(&NodeId::from(1)).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::Finished);
 	}
 
 	#[test]
-	fn consensus_session_continues_if_node_error_received_by_uninitialized_master() {
+	fn consensus_session_fails_if_node_error_received_by_uninitialized_master() {
 		let mut session = make_master_consensus_session(0, None, None);
-		assert_eq!(session.on_node_error(&NodeId::from(2)), Ok(false));
+		assert_eq!(session.on_node_error(&NodeId::from(2)), Err(Error::ConsensusUnreachable));
+		assert_eq!(session.state(), ConsensusSessionState::Failed);
 	}
 
 	#[test]
@@ -599,7 +624,7 @@ mod tests {
 		session.on_consensus_message(&NodeId::from(3), &ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
 			is_confirmed: true,
 		})).unwrap();
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.on_node_error(&NodeId::from(3)), Ok(false));
 		assert_eq!(session.on_node_error(&NodeId::from(4)), Ok(false));
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForPartialResults);
@@ -612,7 +637,7 @@ mod tests {
 		session.on_consensus_message(&NodeId::from(2), &ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
 			is_confirmed: true,
 		})).unwrap();
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForPartialResults);
 
 		session.on_consensus_message(&NodeId::from(3), &ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
@@ -620,7 +645,7 @@ mod tests {
 		})).unwrap();
 		assert_eq!(session.on_node_error(&NodeId::from(2)), Ok(true));
 		assert_eq!(session.state(), ConsensusSessionState::ConsensusEstablished);
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForPartialResults);
 
 		assert_eq!(session.on_node_error(&NodeId::from(3)), Ok(false));
@@ -634,7 +659,7 @@ mod tests {
 		session.on_consensus_message(&NodeId::from(2), &ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
 			is_confirmed: true,
 		})).unwrap();
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.on_node_error(&NodeId::from(2)), Err(Error::ConsensusUnreachable));
 		assert_eq!(session.state(), ConsensusSessionState::Failed);
 	}
@@ -653,7 +678,7 @@ mod tests {
 			is_confirmed: true,
 		})).unwrap();
 
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForPartialResults);
 
 		session.on_consensus_message(&NodeId::from(3), &ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
@@ -662,7 +687,7 @@ mod tests {
 		assert_eq!(session.on_session_timeout(), Ok(true));
 		assert_eq!(session.state(), ConsensusSessionState::ConsensusEstablished);
 
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForPartialResults);
 
 		assert_eq!(session.on_session_timeout(), Ok(false));
@@ -676,7 +701,7 @@ mod tests {
 		session.on_consensus_message(&NodeId::from(2), &ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
 			is_confirmed: true,
 		})).unwrap();
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForPartialResults);
 
 		assert_eq!(session.on_session_timeout(), Err(Error::ConsensusUnreachable));
@@ -708,7 +733,7 @@ mod tests {
 			is_confirmed: true,
 		})).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::ConsensusEstablished);
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForPartialResults);
 		session.on_job_response(&NodeId::from(2), 16).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::Finished);
@@ -725,7 +750,7 @@ mod tests {
 		})).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::ConsensusEstablished);
 
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForPartialResults);
 
 		session.on_consensus_message(&NodeId::from(3), &ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
@@ -735,7 +760,7 @@ mod tests {
 		assert_eq!(session.on_node_error(&NodeId::from(2)).unwrap(), true);
 		assert_eq!(session.state(), ConsensusSessionState::ConsensusEstablished);
 
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForPartialResults);
 
 		assert_eq!(session.on_node_error(&NodeId::from(3)).unwrap(), false);
@@ -746,7 +771,7 @@ mod tests {
 		})).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::ConsensusEstablished);
 
-		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default()).unwrap();
+		session.disseminate_jobs(SquaredSumJobExecutor, DummyJobTransport::default(), false).unwrap();
 		assert_eq!(session.state(), ConsensusSessionState::WaitingForPartialResults);
 
 		session.on_job_response(&NodeId::from(4), 16).unwrap();
diff --git a/secret_store/src/key_server_cluster/jobs/decryption_job.rs b/secret_store/src/key_server_cluster/jobs/decryption_job.rs
index 54594c8272fbf3571e051cac9449bc53e5dc820d..ebd9c18596b7f536912caad2523d733eb1d9d69b 100644
--- a/secret_store/src/key_server_cluster/jobs/decryption_job.rs
+++ b/secret_store/src/key_server_cluster/jobs/decryption_job.rs
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::collections::{BTreeSet, BTreeMap};
+use ethereum_types::H256;
 use ethkey::{Public, Secret};
 use ethcrypto::ecies::encrypt;
 use ethcrypto::DEFAULT_MAC;
@@ -32,10 +33,14 @@ pub struct DecryptionJob {
 	requester: Public,
 	/// Key share.
 	key_share: DocumentKeyShare,
+	/// Key version.
+	key_version: H256,
 	/// Request id.
 	request_id: Option<Secret>,
 	/// Is shadow decryption requested.
 	is_shadow_decryption: Option<bool>,
+	/// Is broadcast decryption requested.
+	is_broadcast_session: Option<bool>,
 }
 
 /// Decryption job partial request.
@@ -44,11 +49,14 @@ pub struct PartialDecryptionRequest {
 	pub id: Secret,
 	/// Is shadow decryption requested.
 	pub is_shadow_decryption: bool,
+	/// Is broadcast decryption requested.
+	pub is_broadcast_session: bool,
 	/// Id of other nodes, participating in decryption.
 	pub other_nodes_ids: BTreeSet<NodeId>,
 }
 
 /// Decryption job partial response.
+#[derive(Clone)]
 pub struct PartialDecryptionResponse {
 	/// Request id.
 	pub request_id: Secret,
@@ -59,29 +67,41 @@ pub struct PartialDecryptionResponse {
 }
 
 impl DecryptionJob {
-	pub fn new_on_slave(self_node_id: NodeId, access_key: Secret, requester: Public, key_share: DocumentKeyShare) -> Result<Self, Error> {
+	pub fn new_on_slave(self_node_id: NodeId, access_key: Secret, requester: Public, key_share: DocumentKeyShare, key_version: H256) -> Result<Self, Error> {
 		debug_assert!(key_share.common_point.is_some() && key_share.encrypted_point.is_some());
 		Ok(DecryptionJob {
 			self_node_id: self_node_id,
 			access_key: access_key,
 			requester: requester,
 			key_share: key_share,
+			key_version: key_version,
 			request_id: None,
 			is_shadow_decryption: None,
+			is_broadcast_session: None,
 		})
 	}
 
-	pub fn new_on_master(self_node_id: NodeId, access_key: Secret, requester: Public, key_share: DocumentKeyShare, is_shadow_decryption: bool) -> Result<Self, Error> {
+	pub fn new_on_master(self_node_id: NodeId, access_key: Secret, requester: Public, key_share: DocumentKeyShare, key_version: H256, is_shadow_decryption: bool, is_broadcast_session: bool) -> Result<Self, Error> {
 		debug_assert!(key_share.common_point.is_some() && key_share.encrypted_point.is_some());
 		Ok(DecryptionJob {
 			self_node_id: self_node_id,
 			access_key: access_key,
 			requester: requester,
 			key_share: key_share,
+			key_version: key_version,
 			request_id: Some(math::generate_random_scalar()?),
 			is_shadow_decryption: Some(is_shadow_decryption),
+			is_broadcast_session: Some(is_broadcast_session),
 		})
 	}
+
+	pub fn request_id(&self) -> &Option<Secret> {
+		&self.request_id
+	}
+
+	pub fn set_request_id(&mut self, request_id: Secret) {
+		self.request_id = Some(request_id);
+	}
 }
 
 impl JobExecutor for DecryptionJob {
@@ -96,26 +116,30 @@ impl JobExecutor for DecryptionJob {
 			.expect("prepare_partial_request is only called on master nodes; request_id is filed in constructor on master nodes; qed");
 		let is_shadow_decryption = self.is_shadow_decryption
 			.expect("prepare_partial_request is only called on master nodes; is_shadow_decryption is filed in constructor on master nodes; qed");
+		let is_broadcast_session = self.is_broadcast_session
+			.expect("prepare_partial_request is only called on master nodes; is_broadcast_session is filed in constructor on master nodes; qed");
 		let mut other_nodes_ids = nodes.clone();
 		other_nodes_ids.remove(node);
 
 		Ok(PartialDecryptionRequest {
 			id: request_id.clone(),
 			is_shadow_decryption: is_shadow_decryption,
+			is_broadcast_session: is_broadcast_session,
 			other_nodes_ids: other_nodes_ids,
 		})
 	}
 
-	fn process_partial_request(&self, partial_request: PartialDecryptionRequest) -> Result<JobPartialRequestAction<PartialDecryptionResponse>, Error> {
+	fn process_partial_request(&mut self, partial_request: PartialDecryptionRequest) -> Result<JobPartialRequestAction<PartialDecryptionResponse>, Error> {
+		let key_version = self.key_share.version(&self.key_version).map_err(|e| Error::KeyStorage(e.into()))?;
 		if partial_request.other_nodes_ids.len() != self.key_share.threshold
 			|| partial_request.other_nodes_ids.contains(&self.self_node_id)
-			|| partial_request.other_nodes_ids.iter().any(|n| !self.key_share.id_numbers.contains_key(n)) {
+			|| partial_request.other_nodes_ids.iter().any(|n| !key_version.id_numbers.contains_key(n)) {
 			return Err(Error::InvalidMessage);
 		}
 
-		let self_id_number = &self.key_share.id_numbers[&self.self_node_id];
-		let other_id_numbers = partial_request.other_nodes_ids.iter().map(|n| &self.key_share.id_numbers[n]);
-		let node_shadow = math::compute_node_shadow(&self.key_share.secret_share, &self_id_number, other_id_numbers)?;
+		let self_id_number = &key_version.id_numbers[&self.self_node_id];
+		let other_id_numbers = partial_request.other_nodes_ids.iter().map(|n| &key_version.id_numbers[n]);
+		let node_shadow = math::compute_node_shadow(&key_version.secret_share, &self_id_number, other_id_numbers)?;
 		let decrypt_shadow = if partial_request.is_shadow_decryption { Some(math::generate_random_scalar()?) } else { None };
 		let common_point = self.key_share.common_point.as_ref().expect("DecryptionJob is only created when common_point is known; qed");
 		let (shadow_point, decrypt_shadow) = math::compute_node_shadow_point(&self.access_key, &common_point, &node_shadow, decrypt_shadow)?;
@@ -129,7 +153,7 @@ impl JobExecutor for DecryptionJob {
 		}))
 	}
 
-	fn check_partial_response(&self, partial_response: &PartialDecryptionResponse) -> Result<JobPartialResponseAction, Error> {
+	fn check_partial_response(&mut self, _sender: &NodeId, partial_response: &PartialDecryptionResponse) -> Result<JobPartialResponseAction, Error> {
 		if Some(&partial_response.request_id) != self.request_id.as_ref() {
 			return Ok(JobPartialResponseAction::Ignore);
 		}
diff --git a/secret_store/src/key_server_cluster/jobs/dummy_job.rs b/secret_store/src/key_server_cluster/jobs/dummy_job.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3e84c0d49d2f9f3bb5464a8188a4f6d09f74ae48
--- /dev/null
+++ b/secret_store/src/key_server_cluster/jobs/dummy_job.rs
@@ -0,0 +1,60 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::{BTreeMap, BTreeSet};
+use key_server_cluster::{Error, NodeId};
+use key_server_cluster::jobs::job_session::{JobExecutor, JobTransport, JobPartialRequestAction, JobPartialResponseAction};
+
+/// No-work job to use in generics (TODO [Refac]: create separate ShareChangeConsensusSession && remove this)
+pub struct DummyJob;
+
+impl JobExecutor for DummyJob {
+	type PartialJobRequest = ();
+	type PartialJobResponse = ();
+	type JobResponse = ();
+
+	fn prepare_partial_request(&self, _n: &NodeId, _nodes: &BTreeSet<NodeId>) -> Result<(), Error> {
+		unreachable!("dummy job methods are never called")
+	}
+
+	fn process_partial_request(&mut self, _r: ()) -> Result<JobPartialRequestAction<()>, Error> {
+		unreachable!("dummy job methods are never called")
+	}
+
+	fn check_partial_response(&mut self, _s: &NodeId, _r: &()) -> Result<JobPartialResponseAction, Error> {
+		unreachable!("dummy job methods are never called")
+	}
+
+	fn compute_response(&self, _r: &BTreeMap<NodeId, ()>) -> Result<(), Error> {
+		unreachable!("dummy job methods are never called")
+	}
+}
+
+/// No-work job transport to use in generics (TODO [Refac]: create separate ShareChangeConsensusSession && remove this)
+pub struct DummyJobTransport;
+
+impl JobTransport for DummyJobTransport {
+	type PartialJobRequest = ();
+	type PartialJobResponse = ();
+
+	fn send_partial_request(&self, _node: &NodeId, _request: ()) -> Result<(), Error> {
+		unreachable!("dummy transport methods are never called")
+	}
+
+	fn send_partial_response(&self, _node: &NodeId, _response: ()) -> Result<(), Error> {
+		unreachable!("dummy transport methods are never called")
+	}
+}
diff --git a/secret_store/src/key_server_cluster/jobs/job_session.rs b/secret_store/src/key_server_cluster/jobs/job_session.rs
index 6608397ddfc94f847d897df2d8572ed7a1cde450..0299fdb141d6bb554584233de4dd3e2f4a211101 100644
--- a/secret_store/src/key_server_cluster/jobs/job_session.rs
+++ b/secret_store/src/key_server_cluster/jobs/job_session.rs
@@ -17,8 +17,8 @@
 use std::collections::{BTreeSet, BTreeMap};
 use key_server_cluster::{Error, NodeId, SessionMeta};
 
-#[derive(Debug, Clone, Copy, PartialEq)]
 /// Partial response action.
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum JobPartialResponseAction {
 	/// Ignore this response.
 	Ignore,
@@ -28,10 +28,10 @@ pub enum JobPartialResponseAction {
 	Accept,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
 /// Partial request action.
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum JobPartialRequestAction<PartialJobResponse> {
-	/// Repond with reject.
+	/// Respond with reject.
 	Reject(PartialJobResponse),
 	/// Respond with this response.
 	Respond(PartialJobResponse),
@@ -40,15 +40,15 @@ pub enum JobPartialRequestAction<PartialJobResponse> {
 /// Job executor.
 pub trait JobExecutor {
 	type PartialJobRequest;
-	type PartialJobResponse;
+	type PartialJobResponse: Clone;
 	type JobResponse;
 
 	/// Prepare job request for given node.
 	fn prepare_partial_request(&self, node: &NodeId, nodes: &BTreeSet<NodeId>) -> Result<Self::PartialJobRequest, Error>;
 	/// Process partial request.
-	fn process_partial_request(&self, partial_request: Self::PartialJobRequest) -> Result<JobPartialRequestAction<Self::PartialJobResponse>, Error>;
+	fn process_partial_request(&mut self, partial_request: Self::PartialJobRequest) -> Result<JobPartialRequestAction<Self::PartialJobResponse>, Error>;
 	/// Check partial response of given node.
-	fn check_partial_response(&self, partial_response: &Self::PartialJobResponse) -> Result<JobPartialResponseAction, Error>;
+	fn check_partial_response(&mut self, sender: &NodeId, partial_response: &Self::PartialJobResponse) -> Result<JobPartialResponseAction, Error>;
 	/// Compute final job response.
 	fn compute_response(&self, partial_responses: &BTreeMap<NodeId, Self::PartialJobResponse>) -> Result<Self::JobResponse, Error>;
 }
@@ -64,8 +64,8 @@ pub trait JobTransport {
 	fn send_partial_response(&self, node: &NodeId, response: Self::PartialJobResponse) -> Result<(), Error>;
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
 /// Current state of job session.
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum JobSessionState {
 	/// Session is inactive.
 	Inactive,
@@ -87,8 +87,6 @@ pub struct JobSession<Executor: JobExecutor, Transport> where Transport: JobTran
 	transport: Transport,
 	/// Session data.
 	data: JobSessionData<Executor::PartialJobResponse>,
-	//// PartialJobRequest dummy.
-	// dummy: PhantomData<PartialJobRequest>,
 }
 
 /// Data of job session.
@@ -123,19 +121,34 @@ impl<Executor, Transport> JobSession<Executor, Transport> where Executor: JobExe
 		}
 	}
 
-	#[cfg(test)]
 	/// Get transport reference.
+	#[cfg(test)]
 	pub fn transport(&self) -> &Transport {
 		&self.transport
 	}
 
+	/// Get mutable transport reference.
+	pub fn transport_mut(&mut self) -> &mut Transport {
+		&mut self.transport
+	}
+
+	/// Get executor reference.
+	pub fn executor(&self) -> &Executor {
+		&self.executor
+	}
+
+	/// Get mutable executor reference.
+	pub fn executor_mut(&mut self) -> &mut Executor {
+		&mut self.executor
+	}
+
 	/// Get job state.
 	pub fn state(&self) -> JobSessionState {
 		self.data.state
 	}
 
-	#[cfg(test)]
 	/// Get rejects.
+	#[cfg(test)]
 	pub fn rejects(&self) -> &BTreeSet<NodeId> {
 		debug_assert!(self.meta.self_node_id == self.meta.master_node_id);
 
@@ -153,7 +166,6 @@ impl<Executor, Transport> JobSession<Executor, Transport> where Executor: JobExe
 			.requests
 	}
 
-	#[cfg(test)]
 	/// Get responses.
 	pub fn responses(&self) -> &BTreeMap<NodeId, Executor::PartialJobResponse> {
 		debug_assert!(self.meta.self_node_id == self.meta.master_node_id);
@@ -163,6 +175,14 @@ impl<Executor, Transport> JobSession<Executor, Transport> where Executor: JobExe
 			.responses
 	}
 
+	/// Returns true if enough responses are ready to compute result.
+	pub fn is_result_ready(&self) -> bool {
+		debug_assert!(self.meta.self_node_id == self.meta.master_node_id);
+		self.data.active_data.as_ref()
+			.expect("is_result_ready is only called on master nodes after initialization; on master nodes active_data is filled during initialization; qed")
+			.responses.len() >= self.meta.threshold + 1
+	}
+
 	/// Get job result.
 	pub fn result(&self) -> Result<Executor::JobResponse, Error> {
 		debug_assert!(self.meta.self_node_id == self.meta.master_node_id);
@@ -177,47 +197,55 @@ impl<Executor, Transport> JobSession<Executor, Transport> where Executor: JobExe
 	}
 
 	/// Initialize.
-	pub fn initialize(&mut self, nodes: BTreeSet<NodeId>) -> Result<(), Error> {		
+	pub fn initialize(&mut self, nodes: BTreeSet<NodeId>, broadcast_self_response: bool) -> Result<(), Error> {		
 		debug_assert!(self.meta.self_node_id == self.meta.master_node_id);
-		debug_assert!(nodes.len() >= self.meta.threshold + 1);
+
+		if nodes.len() < self.meta.threshold + 1 {
+			return Err(Error::ConsensusUnreachable);
+		}
 
 		if self.data.state != JobSessionState::Inactive {
 			return Err(Error::InvalidStateForRequest);
 		}
 
-		// send requests to slave nodes
-		let mut waits_for_self = false;
+		// result from self
 		let active_data = ActiveJobSessionData {
-			requests: nodes,
+			requests: nodes.clone(),
 			rejects: BTreeSet::new(),
 			responses: BTreeMap::new(),
 		};
-		for node in &active_data.requests {
-			if node != &self.meta.self_node_id {
-				self.transport.send_partial_request(&node, self.executor.prepare_partial_request(node, &active_data.requests)?)?;
-			} else {
-				waits_for_self = true;
-			}
-		}
-
-		// result from self
+		let waits_for_self = active_data.requests.contains(&self.meta.self_node_id);
 		let self_response = if waits_for_self {
 			let partial_request = self.executor.prepare_partial_request(&self.meta.self_node_id, &active_data.requests)?;
 			Some(self.executor.process_partial_request(partial_request)?)
 		} else {
 			None
 		};
+		let self_response = match self_response {
+			Some(JobPartialRequestAction::Respond(self_response)) => Some(self_response),
+			Some(JobPartialRequestAction::Reject(self_response)) => Some(self_response),
+			None => None,
+		};
 
 		// update state
 		self.data.active_data = Some(active_data);
 		self.data.state = JobSessionState::Active;
 
 		// if we are waiting for response from self => do it
-		if let Some(self_response) = self_response {
+		if let Some(self_response) = self_response.clone() {
 			let self_node_id = self.meta.self_node_id.clone();
-			match self_response {
-				JobPartialRequestAction::Respond(self_response) => self.on_partial_response(&self_node_id, self_response)?,
-				JobPartialRequestAction::Reject(self_response) => self.on_partial_response(&self_node_id, self_response)?,
+			self.on_partial_response(&self_node_id, self_response)?;
+		}
+
+		// send requests to save nodes. we only send requests if session is still active.
+		for node in nodes.iter().filter(|n| **n != self.meta.self_node_id) {
+			if self.data.state == JobSessionState::Active {
+				self.transport.send_partial_request(node, self.executor.prepare_partial_request(node, &nodes)?)?;
+			}
+			if broadcast_self_response {
+				if let Some(self_response) = self_response.clone() {
+					self.transport.send_partial_response(node, self_response)?;
+				}
 			}
 		}
 
@@ -264,7 +292,7 @@ impl<Executor, Transport> JobSession<Executor, Transport> where Executor: JobExe
 			return Err(Error::InvalidNodeForRequest);
 		}
 		
-		match self.executor.check_partial_response(&response)? {
+		match self.executor.check_partial_response(node, &response)? {
 			JobPartialResponseAction::Ignore => Ok(()),
 			JobPartialResponseAction::Reject => {
 				active_data.rejects.insert(node.clone());
@@ -277,7 +305,6 @@ impl<Executor, Transport> JobSession<Executor, Transport> where Executor: JobExe
 			},
 			JobPartialResponseAction::Accept => {
 				active_data.responses.insert(node.clone(), response);
-
 				if active_data.responses.len() < self.meta.threshold + 1 {
 					return Ok(());
 				}
@@ -348,8 +375,8 @@ pub mod tests {
 		type JobResponse = u32;
 
 		fn prepare_partial_request(&self, _n: &NodeId, _nodes: &BTreeSet<NodeId>) -> Result<u32, Error> { Ok(2) }
-		fn process_partial_request(&self, r: u32) -> Result<JobPartialRequestAction<u32>, Error> { if r <= 10 { Ok(JobPartialRequestAction::Respond(r * r)) } else { Err(Error::InvalidMessage) } }
-		fn check_partial_response(&self, r: &u32) -> Result<JobPartialResponseAction, Error> { if r % 2 == 0 { Ok(JobPartialResponseAction::Accept) } else { Ok(JobPartialResponseAction::Reject) } }
+		fn process_partial_request(&mut self, r: u32) -> Result<JobPartialRequestAction<u32>, Error> { if r <= 10 { Ok(JobPartialRequestAction::Respond(r * r)) } else { Err(Error::InvalidMessage) } }
+		fn check_partial_response(&mut self, _s: &NodeId, r: &u32) -> Result<JobPartialResponseAction, Error> { if r % 2 == 0 { Ok(JobPartialResponseAction::Accept) } else { Ok(JobPartialResponseAction::Reject) } }
 		fn compute_response(&self, r: &BTreeMap<NodeId, u32>) -> Result<u32, Error> { Ok(r.values().fold(0, |v1, v2| v1 + v2)) }
 	}
 
@@ -360,6 +387,10 @@ pub mod tests {
 	}
 
 	impl<T, U> DummyJobTransport<T, U> {
+		pub fn is_empty_response(&self) -> bool {
+			self.responses.lock().is_empty()
+		}
+
 		pub fn response(&self) -> (NodeId, U) {
 			self.responses.lock().pop_front().unwrap()
 		}
@@ -384,22 +415,23 @@ pub mod tests {
 	#[test]
 	fn job_initialize_fails_if_not_inactive() {
 		let mut job = JobSession::new(make_master_session_meta(0), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(1)].into_iter().collect()).unwrap();
-		assert_eq!(job.initialize(vec![Public::from(1)].into_iter().collect()).unwrap_err(), Error::InvalidStateForRequest);
+		job.initialize(vec![Public::from(1)].into_iter().collect(), false).unwrap();
+		assert_eq!(job.initialize(vec![Public::from(1)].into_iter().collect(), false).unwrap_err(), Error::InvalidStateForRequest);
 	}
 
 	#[test]
 	fn job_initialization_leads_to_finish_if_single_node_is_required() {
 		let mut job = JobSession::new(make_master_session_meta(0), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(1)].into_iter().collect()).unwrap();
+		job.initialize(vec![Public::from(1)].into_iter().collect(), false).unwrap();
 		assert_eq!(job.state(), JobSessionState::Finished);
+		assert!(job.is_result_ready());
 		assert_eq!(job.result(), Ok(4));
 	}
 
 	#[test]
 	fn job_initialization_does_not_leads_to_finish_if_single_other_node_is_required() {
 		let mut job = JobSession::new(make_master_session_meta(0), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(2)].into_iter().collect()).unwrap();
+		job.initialize(vec![Public::from(2)].into_iter().collect(), false).unwrap();
 		assert_eq!(job.state(), JobSessionState::Active);
 	}
 
@@ -442,7 +474,7 @@ pub mod tests {
 	#[test]
 	fn job_response_fails_if_comes_to_failed_state() {
 		let mut job = JobSession::new(make_master_session_meta(0), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(2)].into_iter().collect()).unwrap();
+		job.initialize(vec![Public::from(2)].into_iter().collect(), false).unwrap();
 		job.on_session_timeout().unwrap_err();
 		assert_eq!(job.on_partial_response(&NodeId::from(2), 2).unwrap_err(), Error::InvalidStateForRequest);
 	}
@@ -450,14 +482,14 @@ pub mod tests {
 	#[test]
 	fn job_response_fails_if_comes_from_unknown_node() {
 		let mut job = JobSession::new(make_master_session_meta(0), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(2)].into_iter().collect()).unwrap();
+		job.initialize(vec![Public::from(2)].into_iter().collect(), false).unwrap();
 		assert_eq!(job.on_partial_response(&NodeId::from(3), 2).unwrap_err(), Error::InvalidNodeForRequest);
 	}
 
 	#[test]
 	fn job_response_leads_to_failure_if_too_few_nodes_left() {
 		let mut job = JobSession::new(make_master_session_meta(1), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(1), Public::from(2)].into_iter().collect()).unwrap();
+		job.initialize(vec![Public::from(1), Public::from(2)].into_iter().collect(), false).unwrap();
 		assert_eq!(job.state(), JobSessionState::Active);
 		assert_eq!(job.on_partial_response(&NodeId::from(2), 3).unwrap_err(), Error::ConsensusUnreachable);
 		assert_eq!(job.state(), JobSessionState::Failed);
@@ -466,16 +498,18 @@ pub mod tests {
 	#[test]
 	fn job_response_succeeds() {
 		let mut job = JobSession::new(make_master_session_meta(2), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(1), Public::from(2), Public::from(3)].into_iter().collect()).unwrap();
+		job.initialize(vec![Public::from(1), Public::from(2), Public::from(3)].into_iter().collect(), false).unwrap();
 		assert_eq!(job.state(), JobSessionState::Active);
+		assert!(!job.is_result_ready());
 		job.on_partial_response(&NodeId::from(2), 2).unwrap();
 		assert_eq!(job.state(), JobSessionState::Active);
+		assert!(!job.is_result_ready());
 	}
 
 	#[test]
 	fn job_response_leads_to_finish() {
 		let mut job = JobSession::new(make_master_session_meta(1), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(1), Public::from(2)].into_iter().collect()).unwrap();
+		job.initialize(vec![Public::from(1), Public::from(2)].into_iter().collect(), false).unwrap();
 		assert_eq!(job.state(), JobSessionState::Active);
 		job.on_partial_response(&NodeId::from(2), 2).unwrap();
 		assert_eq!(job.state(), JobSessionState::Finished);
@@ -500,7 +534,7 @@ pub mod tests {
 	#[test]
 	fn job_node_error_ignored_when_disconnects_from_rejected() {
 		let mut job = JobSession::new(make_master_session_meta(1), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(1), Public::from(2), Public::from(3)].into_iter().collect()).unwrap();
+		job.initialize(vec![Public::from(1), Public::from(2), Public::from(3)].into_iter().collect(), false).unwrap();
 		assert_eq!(job.state(), JobSessionState::Active);
 		job.on_partial_response(&NodeId::from(2), 3).unwrap();
 		job.on_node_error(&NodeId::from(2)).unwrap();
@@ -510,7 +544,7 @@ pub mod tests {
 	#[test]
 	fn job_node_error_ignored_when_disconnects_from_unknown() {
 		let mut job = JobSession::new(make_master_session_meta(1), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(1), Public::from(2)].into_iter().collect()).unwrap();
+		job.initialize(vec![Public::from(1), Public::from(2)].into_iter().collect(), false).unwrap();
 		assert_eq!(job.state(), JobSessionState::Active);
 		job.on_node_error(&NodeId::from(3)).unwrap();
 		assert_eq!(job.state(), JobSessionState::Active);
@@ -519,7 +553,7 @@ pub mod tests {
 	#[test]
 	fn job_node_error_ignored_when_disconnects_from_requested_and_enough_nodes_left() {
 		let mut job = JobSession::new(make_master_session_meta(1), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(1), Public::from(2), Public::from(3)].into_iter().collect()).unwrap();
+		job.initialize(vec![Public::from(1), Public::from(2), Public::from(3)].into_iter().collect(), false).unwrap();
 		assert_eq!(job.state(), JobSessionState::Active);
 		job.on_node_error(&NodeId::from(3)).unwrap();
 		assert_eq!(job.state(), JobSessionState::Active);
@@ -528,9 +562,25 @@ pub mod tests {
 	#[test]
 	fn job_node_error_leads_to_fail_when_disconnects_from_requested_and_not_enough_nodes_left() {
 		let mut job = JobSession::new(make_master_session_meta(1), SquaredSumJobExecutor, DummyJobTransport::default());
-		job.initialize(vec![Public::from(1), Public::from(2)].into_iter().collect()).unwrap();
+		job.initialize(vec![Public::from(1), Public::from(2)].into_iter().collect(), false).unwrap();
 		assert_eq!(job.state(), JobSessionState::Active);
 		assert_eq!(job.on_node_error(&NodeId::from(2)).unwrap_err(), Error::ConsensusUnreachable);
 		assert_eq!(job.state(), JobSessionState::Failed);
 	}
+
+	#[test]
+	fn job_broadcasts_self_response() {
+		let mut job = JobSession::new(make_master_session_meta(1), SquaredSumJobExecutor, DummyJobTransport::default());
+		job.initialize(vec![Public::from(1), Public::from(2)].into_iter().collect(), true).unwrap();
+		assert_eq!(job.state(), JobSessionState::Active);
+		assert_eq!(job.transport().response(), (NodeId::from(2), 4));
+	}
+
+	#[test]
+	fn job_does_not_broadcasts_self_response() {
+		let mut job = JobSession::new(make_master_session_meta(1), SquaredSumJobExecutor, DummyJobTransport::default());
+		job.initialize(vec![Public::from(1), Public::from(2)].into_iter().collect(), false).unwrap();
+		assert_eq!(job.state(), JobSessionState::Active);
+		assert!(job.transport().is_empty_response());
+	}
 }
diff --git a/secret_store/src/key_server_cluster/jobs/key_access_job.rs b/secret_store/src/key_server_cluster/jobs/key_access_job.rs
index 0bbb8bf042ab68dec94e251415120cfec669391b..2cb686e6c2104fa603411b3579a81cce3cb09456 100644
--- a/secret_store/src/key_server_cluster/jobs/key_access_job.rs
+++ b/secret_store/src/key_server_cluster/jobs/key_access_job.rs
@@ -16,54 +16,74 @@
 
 use std::sync::Arc;
 use std::collections::{BTreeSet, BTreeMap};
-use ethkey::{Signature, recover};
-use key_server_cluster::{Error, NodeId, SessionId, AclStorage};
+use key_server_cluster::{Error, NodeId, SessionId, Requester, AclStorage};
 use key_server_cluster::jobs::job_session::{JobPartialResponseAction, JobPartialRequestAction, JobExecutor};
 
 /// Purpose of this job is to construct set of nodes, which have agreed to provide access to the given key for the given requestor.
 pub struct KeyAccessJob {
 	/// Key id.
 	id: SessionId,
+	/// Has key share?
+	has_key_share: bool,
 	/// ACL storage.
 	acl_storage: Arc<AclStorage>,
-	/// Requester signature.
-	signature: Option<Signature>,
+	/// Requester data.
+	requester: Option<Requester>,
 }
 
 impl KeyAccessJob {
 	pub fn new_on_slave(id: SessionId, acl_storage: Arc<AclStorage>) -> Self {
 		KeyAccessJob {
 			id: id,
+			has_key_share: true,
 			acl_storage: acl_storage,
-			signature: None,
+			requester: None,
 		}
 	}
 
-	pub fn new_on_master(id: SessionId, acl_storage: Arc<AclStorage>, signature: Signature) -> Self {
+	pub fn new_on_master(id: SessionId, acl_storage: Arc<AclStorage>, requester: Requester) -> Self {
 		KeyAccessJob {
 			id: id,
+			has_key_share: true,
 			acl_storage: acl_storage,
-			signature: Some(signature),
+			requester: Some(requester),
 		}
 	}
+
+	pub fn set_has_key_share(&mut self, has_key_share: bool) {
+		self.has_key_share = has_key_share;
+	}
+
+	pub fn set_requester(&mut self, requester: Requester) {
+		self.requester = Some(requester);
+	}
+
+	pub fn requester(&self) -> Option<&Requester> {
+		self.requester.as_ref()
+	}
 }
 
 impl JobExecutor for KeyAccessJob {
-	type PartialJobRequest = Signature;
+	type PartialJobRequest = Requester;
 	type PartialJobResponse = bool;
 	type JobResponse = BTreeSet<NodeId>;
 
-	fn prepare_partial_request(&self, _node: &NodeId, _nodes: &BTreeSet<NodeId>) -> Result<Signature, Error> {
-		Ok(self.signature.as_ref().expect("prepare_partial_request is only called on master nodes; new_on_master fills the signature; qed").clone())
+	fn prepare_partial_request(&self, _node: &NodeId, _nodes: &BTreeSet<NodeId>) -> Result<Requester, Error> {
+		Ok(self.requester.as_ref().expect("prepare_partial_request is only called on master nodes; new_on_master fills the signature; qed").clone())
 	}
 
-	fn process_partial_request(&self, partial_request: Signature) -> Result<JobPartialRequestAction<bool>, Error> {
-		self.acl_storage.check(&recover(&partial_request, &self.id)?, &self.id)
+	fn process_partial_request(&mut self, partial_request: Requester) -> Result<JobPartialRequestAction<bool>, Error> {
+		if !self.has_key_share {
+			return Ok(JobPartialRequestAction::Reject(false));
+		}
+		
+		self.requester = Some(partial_request.clone());
+		self.acl_storage.check(&partial_request.public(&self.id).ok_or(Error::InsufficientRequesterData)?, &self.id)
 			.map_err(|_| Error::AccessDenied)
 			.map(|is_confirmed| if is_confirmed { JobPartialRequestAction::Respond(true) } else { JobPartialRequestAction::Reject(false) })
 	}
 
-	fn check_partial_response(&self, partial_response: &bool) -> Result<JobPartialResponseAction, Error> {
+	fn check_partial_response(&mut self, _sender: &NodeId, partial_response: &bool) -> Result<JobPartialResponseAction, Error> {
 		Ok(if *partial_response { JobPartialResponseAction::Accept } else { JobPartialResponseAction::Reject })
 	}
 
diff --git a/secret_store/src/key_server_cluster/jobs/mod.rs b/secret_store/src/key_server_cluster/jobs/mod.rs
index d9a358abab6441bf0b9650cc13c286e06305c89f..817f09b71dde2bd413d79f3cc8a768ecd04e6fd0 100644
--- a/secret_store/src/key_server_cluster/jobs/mod.rs
+++ b/secret_store/src/key_server_cluster/jobs/mod.rs
@@ -16,6 +16,10 @@
 
 pub mod consensus_session;
 pub mod decryption_job;
+pub mod dummy_job;
 pub mod job_session;
 pub mod key_access_job;
-pub mod signing_job;
+pub mod servers_set_change_access_job;
+pub mod signing_job_ecdsa;
+pub mod signing_job_schnorr;
+pub mod unknown_sessions_job;
diff --git a/secret_store/src/key_server_cluster/jobs/servers_set_change_access_job.rs b/secret_store/src/key_server_cluster/jobs/servers_set_change_access_job.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1d1628692695130fa63567c2096645e5b8065669
--- /dev/null
+++ b/secret_store/src/key_server_cluster/jobs/servers_set_change_access_job.rs
@@ -0,0 +1,149 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::{BTreeSet, BTreeMap};
+use ethkey::{Public, Signature, recover};
+use tiny_keccak::Keccak;
+use key_server_cluster::{Error, NodeId, SessionId};
+use key_server_cluster::message::{InitializeConsensusSessionWithServersSet, InitializeConsensusSessionOfShareAdd};
+use key_server_cluster::jobs::job_session::{JobPartialResponseAction, JobPartialRequestAction, JobExecutor};
+
+/// Purpose of this job is to check if requestor is administrator of SecretStore (i.e. it have access to change key servers set).
+pub struct ServersSetChangeAccessJob {
+	/// Servers set administrator public key (this could be changed to ACL-based check later).
+	administrator: Public,
+	/// Old servers set.
+	old_servers_set: Option<BTreeSet<NodeId>>,
+	/// New servers set.
+	new_servers_set: Option<BTreeSet<NodeId>>,
+	/// Old servers set, signed by requester.
+	old_set_signature: Option<Signature>,
+	/// New servers set, signed by requester.
+	new_set_signature: Option<Signature>,
+}
+
+/// Servers set change job partial request.
+pub struct ServersSetChangeAccessRequest {
+	/// Old servers set.
+	pub old_servers_set: BTreeSet<NodeId>,
+	/// New servers set.
+	pub new_servers_set: BTreeSet<NodeId>,
+	/// Hash(old_servers_set), signed by requester.
+	pub old_set_signature: Signature,
+	/// Hash(new_servers_set), signed by requester.
+	pub new_set_signature: Signature,
+}
+
+impl<'a> From<&'a InitializeConsensusSessionWithServersSet> for ServersSetChangeAccessRequest {
+	fn from(message: &InitializeConsensusSessionWithServersSet) -> Self {
+		ServersSetChangeAccessRequest {
+			old_servers_set: message.old_nodes_set.iter().cloned().map(Into::into).collect(),
+			new_servers_set: message.new_nodes_set.iter().cloned().map(Into::into).collect(),
+			old_set_signature: message.old_set_signature.clone().into(),
+			new_set_signature: message.new_set_signature.clone().into(),
+		}
+	}
+}
+
+impl<'a> From<&'a InitializeConsensusSessionOfShareAdd> for ServersSetChangeAccessRequest {
+	fn from(message: &InitializeConsensusSessionOfShareAdd) -> Self {
+		ServersSetChangeAccessRequest {
+			old_servers_set: message.old_nodes_set.iter().cloned().map(Into::into).collect(),
+			new_servers_set: message.new_nodes_map.keys().cloned().map(Into::into).collect(),
+			old_set_signature: message.old_set_signature.clone().into(),
+			new_set_signature: message.new_set_signature.clone().into(),
+		}
+	}
+}
+
+impl ServersSetChangeAccessJob {
+	pub fn new_on_slave(administrator: Public) -> Self {
+		ServersSetChangeAccessJob {
+			administrator: administrator,
+			old_servers_set: None,
+			new_servers_set: None,
+			old_set_signature: None,
+			new_set_signature: None,
+		}
+	}
+
+	pub fn new_on_master(administrator: Public, old_servers_set: BTreeSet<NodeId>, new_servers_set: BTreeSet<NodeId>, old_set_signature: Signature, new_set_signature: Signature) -> Self {
+		ServersSetChangeAccessJob {
+			administrator: administrator,
+			old_servers_set: Some(old_servers_set),
+			new_servers_set: Some(new_servers_set),
+			old_set_signature: Some(old_set_signature),
+			new_set_signature: Some(new_set_signature),
+		}
+	}
+
+	pub fn new_servers_set(&self) -> Option<&BTreeSet<NodeId>> {
+		self.new_servers_set.as_ref()
+	}
+}
+
+impl JobExecutor for ServersSetChangeAccessJob {
+	type PartialJobRequest = ServersSetChangeAccessRequest;
+	type PartialJobResponse = bool;
+	type JobResponse = BTreeSet<NodeId>;
+
+	fn prepare_partial_request(&self, _node: &NodeId, _nodes: &BTreeSet<NodeId>) -> Result<ServersSetChangeAccessRequest, Error> {
+		let explanation = "prepare_partial_request is only called on master nodes; this field is filled on master nodes in constructor; qed";
+		Ok(ServersSetChangeAccessRequest {
+			old_servers_set: self.old_servers_set.clone().expect(explanation),
+			new_servers_set: self.new_servers_set.clone().expect(explanation),
+			old_set_signature: self.old_set_signature.clone().expect(explanation),
+			new_set_signature: self.new_set_signature.clone().expect(explanation),
+		})
+	}
+
+	fn process_partial_request(&mut self, partial_request: ServersSetChangeAccessRequest) -> Result<JobPartialRequestAction<bool>, Error> {
+		let ServersSetChangeAccessRequest {
+			old_servers_set,
+			new_servers_set,
+			old_set_signature,
+			new_set_signature,
+		} = partial_request;
+
+		// check old servers set signature
+		let old_actual_public = recover(&old_set_signature, &ordered_nodes_hash(&old_servers_set).into())?;
+		let new_actual_public = recover(&new_set_signature, &ordered_nodes_hash(&new_servers_set).into())?;
+		let is_administrator = old_actual_public == self.administrator && new_actual_public == self.administrator;
+		self.new_servers_set = Some(new_servers_set);
+
+		Ok(if is_administrator { JobPartialRequestAction::Respond(true) } else { JobPartialRequestAction::Reject(false) })
+	}
+
+	fn check_partial_response(&mut self, _sender: &NodeId, partial_response: &bool) -> Result<JobPartialResponseAction, Error> {
+		Ok(if *partial_response { JobPartialResponseAction::Accept } else { JobPartialResponseAction::Reject })
+	}
+
+	fn compute_response(&self, partial_responses: &BTreeMap<NodeId, bool>) -> Result<BTreeSet<NodeId>, Error> {
+		Ok(partial_responses.keys().cloned().collect())
+	}
+}
+
+pub fn ordered_nodes_hash(nodes: &BTreeSet<NodeId>) -> SessionId {
+	let mut nodes_keccak = Keccak::new_keccak256();
+	for node in nodes {
+		nodes_keccak.update(&*node);
+	}
+
+	let mut nodes_keccak_value = [0u8; 32];
+	nodes_keccak.finalize(&mut nodes_keccak_value);
+
+	nodes_keccak_value.into()
+}
diff --git a/secret_store/src/key_server_cluster/jobs/signing_job_ecdsa.rs b/secret_store/src/key_server_cluster/jobs/signing_job_ecdsa.rs
new file mode 100644
index 0000000000000000000000000000000000000000..561a8e0f87ca5dce8183e5a7634876b2cfa0b7af
--- /dev/null
+++ b/secret_store/src/key_server_cluster/jobs/signing_job_ecdsa.rs
@@ -0,0 +1,151 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::{BTreeSet, BTreeMap};
+use ethkey::{Public, Secret, Signature};
+use ethereum_types::H256;
+use key_server_cluster::{Error, NodeId, DocumentKeyShare};
+use key_server_cluster::math;
+use key_server_cluster::jobs::job_session::{JobPartialRequestAction, JobPartialResponseAction, JobExecutor};
+
+/// Signing job.
+pub struct EcdsaSigningJob {
+	/// Key share.
+	key_share: DocumentKeyShare,
+	/// Key version.
+	key_version: H256,
+	/// Share of inv(nonce).
+	inv_nonce_share: Secret,
+	/// Nonce public.
+	nonce_public: Public,
+	/// Request id.
+	request_id: Option<Secret>,
+	/// 
+	inversed_nonce_coeff: Option<Secret>,
+	/// Message hash.
+	message_hash: Option<H256>,
+}
+
+/// Signing job partial request.
+pub struct EcdsaPartialSigningRequest {
+	/// Request id.
+	pub id: Secret,
+	/// 
+	pub inversed_nonce_coeff: Secret,
+	/// Message hash to sign.
+	pub message_hash: H256,
+}
+
+/// Signing job partial response.
+#[derive(Clone)]
+pub struct EcdsaPartialSigningResponse {
+	/// Request id.
+	pub request_id: Secret,
+	/// Partial signature' s share.
+	pub partial_signature_s: Secret,
+}
+
+impl EcdsaSigningJob {
+	pub fn new_on_slave(key_share: DocumentKeyShare, key_version: H256, nonce_public: Public, inv_nonce_share: Secret) -> Result<Self, Error> {
+		Ok(EcdsaSigningJob {
+			key_share: key_share,
+			key_version: key_version,
+			nonce_public: nonce_public,
+			inv_nonce_share: inv_nonce_share,
+			request_id: None,
+			inversed_nonce_coeff: None,
+			message_hash: None,
+		})
+	}
+
+	pub fn new_on_master(key_share: DocumentKeyShare, key_version: H256, nonce_public: Public, inv_nonce_share: Secret, inversed_nonce_coeff: Secret, message_hash: H256) -> Result<Self, Error> {
+		Ok(EcdsaSigningJob {
+			key_share: key_share,
+			key_version: key_version,
+			nonce_public: nonce_public,
+			inv_nonce_share: inv_nonce_share,
+			request_id: Some(math::generate_random_scalar()?),
+			inversed_nonce_coeff: Some(inversed_nonce_coeff),
+			message_hash: Some(message_hash),
+		})
+	}
+}
+
+impl JobExecutor for EcdsaSigningJob {
+	type PartialJobRequest = EcdsaPartialSigningRequest;
+	type PartialJobResponse = EcdsaPartialSigningResponse;
+	type JobResponse = Signature;
+
+	fn prepare_partial_request(&self, _node: &NodeId, nodes: &BTreeSet<NodeId>) -> Result<EcdsaPartialSigningRequest, Error> {
+		debug_assert!(nodes.len() == self.key_share.threshold * 2 + 1);
+
+		let request_id = self.request_id.as_ref()
+			.expect("prepare_partial_request is only called on master nodes; request_id is filed in constructor on master nodes; qed");
+		let inversed_nonce_coeff = self.inversed_nonce_coeff.as_ref()
+			.expect("prepare_partial_request is only called on master nodes; inversed_nonce_coeff is filed in constructor on master nodes; qed");
+		let message_hash = self.message_hash.as_ref()
+			.expect("compute_response is only called on master nodes; message_hash is filed in constructor on master nodes; qed");
+
+		Ok(EcdsaPartialSigningRequest {
+			id: request_id.clone(),
+			inversed_nonce_coeff: inversed_nonce_coeff.clone(),
+			message_hash: message_hash.clone(),
+		})
+	}
+
+	fn process_partial_request(&mut self, partial_request: EcdsaPartialSigningRequest) -> Result<JobPartialRequestAction<EcdsaPartialSigningResponse>, Error> {
+		let inversed_nonce_coeff_mul_nonce = math::compute_secret_mul(&partial_request.inversed_nonce_coeff, &self.inv_nonce_share)?;
+		let key_version = self.key_share.version(&self.key_version).map_err(|e| Error::KeyStorage(e.into()))?;
+		let signature_r = math::compute_ecdsa_r(&self.nonce_public)?;
+		let inv_nonce_mul_secret = math::compute_secret_mul(&inversed_nonce_coeff_mul_nonce, &key_version.secret_share)?;
+		let partial_signature_s = math::compute_ecdsa_s_share(
+			&inversed_nonce_coeff_mul_nonce,
+			&inv_nonce_mul_secret,
+			&signature_r,
+			&math::to_scalar(partial_request.message_hash)?,
+		)?;
+
+		Ok(JobPartialRequestAction::Respond(EcdsaPartialSigningResponse {
+			request_id: partial_request.id,
+			partial_signature_s: partial_signature_s,
+		}))
+	}
+
+	fn check_partial_response(&mut self, _sender: &NodeId, partial_response: &EcdsaPartialSigningResponse) -> Result<JobPartialResponseAction, Error> {
+		if Some(&partial_response.request_id) != self.request_id.as_ref() {
+			return Ok(JobPartialResponseAction::Ignore);
+		}
+		// TODO [Trust]: check_ecdsa_signature_share()
+
+		Ok(JobPartialResponseAction::Accept)
+	}
+
+	fn compute_response(&self, partial_responses: &BTreeMap<NodeId, EcdsaPartialSigningResponse>) -> Result<Signature, Error> {
+		let key_version = self.key_share.version(&self.key_version).map_err(|e| Error::KeyStorage(e.into()))?;
+		if partial_responses.keys().any(|n| !key_version.id_numbers.contains_key(n)) {
+			return Err(Error::InvalidMessage);
+		}
+
+		let id_numbers: Vec<_> = partial_responses.keys().map(|n| key_version.id_numbers[n].clone()).collect();
+		let signature_s_shares: Vec<_> = partial_responses.values().map(|r| r.partial_signature_s.clone()).collect();
+		let signature_s = math::compute_ecdsa_s(self.key_share.threshold, &signature_s_shares, &id_numbers)?;
+		let signature_r = math::compute_ecdsa_r(&self.nonce_public)?;
+
+		let signature = math::serialize_ecdsa_signature(&self.nonce_public, signature_r, signature_s);
+
+		Ok(signature)
+	}
+}
diff --git a/secret_store/src/key_server_cluster/jobs/signing_job.rs b/secret_store/src/key_server_cluster/jobs/signing_job_schnorr.rs
similarity index 68%
rename from secret_store/src/key_server_cluster/jobs/signing_job.rs
rename to secret_store/src/key_server_cluster/jobs/signing_job_schnorr.rs
index 28ac31a1e57542ea220cc04e4f0580ca21f8ecd0..6246a728de96805b86bc0131b3f61d75071499c4 100644
--- a/secret_store/src/key_server_cluster/jobs/signing_job.rs
+++ b/secret_store/src/key_server_cluster/jobs/signing_job_schnorr.rs
@@ -16,17 +16,19 @@
 
 use std::collections::{BTreeSet, BTreeMap};
 use ethkey::{Public, Secret};
-use util::H256;
+use ethereum_types::H256;
 use key_server_cluster::{Error, NodeId, DocumentKeyShare};
 use key_server_cluster::math;
 use key_server_cluster::jobs::job_session::{JobPartialRequestAction, JobPartialResponseAction, JobExecutor};
 
 /// Signing job.
-pub struct SigningJob {
+pub struct SchnorrSigningJob {
 	/// This node id.
 	self_node_id: NodeId,
 	/// Key share.
 	key_share: DocumentKeyShare,
+	/// Key version.
+	key_version: H256,
 	/// Session public key.
 	session_public: Public,
 	/// Session secret coefficient.
@@ -38,7 +40,7 @@ pub struct SigningJob {
 }
 
 /// Signing job partial request.
-pub struct PartialSigningRequest {
+pub struct SchnorrPartialSigningRequest {
 	/// Request id.
 	pub id: Secret,
 	/// Message hash.
@@ -48,18 +50,20 @@ pub struct PartialSigningRequest {
 }
 
 /// Signing job partial response.
-pub struct PartialSigningResponse {
+#[derive(Clone)]
+pub struct SchnorrPartialSigningResponse {
 	/// Request id.
 	pub request_id: Secret,
 	/// Partial signature.
 	pub partial_signature: Secret,
 }
 
-impl SigningJob {
-	pub fn new_on_slave(self_node_id: NodeId, key_share: DocumentKeyShare, session_public: Public, session_secret_coeff: Secret) -> Result<Self, Error> {
-		Ok(SigningJob {
+impl SchnorrSigningJob {
+	pub fn new_on_slave(self_node_id: NodeId, key_share: DocumentKeyShare, key_version: H256, session_public: Public, session_secret_coeff: Secret) -> Result<Self, Error> {
+		Ok(SchnorrSigningJob {
 			self_node_id: self_node_id,
 			key_share: key_share,
+			key_version: key_version,
 			session_public: session_public,
 			session_secret_coeff: session_secret_coeff,
 			request_id: None,
@@ -67,10 +71,11 @@ impl SigningJob {
 		})
 	}
 
-	pub fn new_on_master(self_node_id: NodeId, key_share: DocumentKeyShare, session_public: Public, session_secret_coeff: Secret, message_hash: H256) -> Result<Self, Error> {
-		Ok(SigningJob {
+	pub fn new_on_master(self_node_id: NodeId, key_share: DocumentKeyShare, key_version: H256, session_public: Public, session_secret_coeff: Secret, message_hash: H256) -> Result<Self, Error> {
+		Ok(SchnorrSigningJob {
 			self_node_id: self_node_id,
 			key_share: key_share,
+			key_version: key_version,
 			session_public: session_public,
 			session_secret_coeff: session_secret_coeff,
 			request_id: Some(math::generate_random_scalar()?),
@@ -79,12 +84,12 @@ impl SigningJob {
 	}
 }
 
-impl JobExecutor for SigningJob {
-	type PartialJobRequest = PartialSigningRequest;
-	type PartialJobResponse = PartialSigningResponse;
+impl JobExecutor for SchnorrSigningJob {
+	type PartialJobRequest = SchnorrPartialSigningRequest;
+	type PartialJobResponse = SchnorrPartialSigningResponse;
 	type JobResponse = (Secret, Secret);
 
-	fn prepare_partial_request(&self, node: &NodeId, nodes: &BTreeSet<NodeId>) -> Result<PartialSigningRequest, Error> {
+	fn prepare_partial_request(&self, node: &NodeId, nodes: &BTreeSet<NodeId>) -> Result<SchnorrPartialSigningRequest, Error> {
 		debug_assert!(nodes.len() == self.key_share.threshold + 1);
 
 		let request_id = self.request_id.as_ref()
@@ -94,52 +99,53 @@ impl JobExecutor for SigningJob {
 		let mut other_nodes_ids = nodes.clone();
 		other_nodes_ids.remove(node);
 
-		Ok(PartialSigningRequest {
+		Ok(SchnorrPartialSigningRequest {
 			id: request_id.clone(),
 			message_hash: message_hash.clone(),
 			other_nodes_ids: other_nodes_ids,
 		})
 	}
 
-	fn process_partial_request(&self, partial_request: PartialSigningRequest) -> Result<JobPartialRequestAction<PartialSigningResponse>, Error> {
+	fn process_partial_request(&mut self, partial_request: SchnorrPartialSigningRequest) -> Result<JobPartialRequestAction<SchnorrPartialSigningResponse>, Error> {
+		let key_version = self.key_share.version(&self.key_version).map_err(|e| Error::KeyStorage(e.into()))?;
 		if partial_request.other_nodes_ids.len() != self.key_share.threshold
 			|| partial_request.other_nodes_ids.contains(&self.self_node_id)
-			|| partial_request.other_nodes_ids.iter().any(|n| !self.key_share.id_numbers.contains_key(n)) {
+			|| partial_request.other_nodes_ids.iter().any(|n| !key_version.id_numbers.contains_key(n)) {
 			return Err(Error::InvalidMessage);
 		}
 
-		let self_id_number = &self.key_share.id_numbers[&self.self_node_id];
-		let other_id_numbers = partial_request.other_nodes_ids.iter().map(|n| &self.key_share.id_numbers[n]);
+		let self_id_number = &key_version.id_numbers[&self.self_node_id];
+		let other_id_numbers = partial_request.other_nodes_ids.iter().map(|n| &key_version.id_numbers[n]);
 		let combined_hash = math::combine_message_hash_with_public(&partial_request.message_hash, &self.session_public)?;
-		Ok(JobPartialRequestAction::Respond(PartialSigningResponse {
+		Ok(JobPartialRequestAction::Respond(SchnorrPartialSigningResponse {
 			request_id: partial_request.id,
-			partial_signature: math::compute_signature_share(
+			partial_signature: math::compute_schnorr_signature_share(
 				self.key_share.threshold,
 				&combined_hash,
 				&self.session_secret_coeff,
-				&self.key_share.secret_share,
+				&key_version.secret_share,
 				self_id_number,
 				other_id_numbers
 			)?,
 		}))
 	}
 
-	fn check_partial_response(&self, partial_response: &PartialSigningResponse) -> Result<JobPartialResponseAction, Error> {
+	fn check_partial_response(&mut self, _sender: &NodeId, partial_response: &SchnorrPartialSigningResponse) -> Result<JobPartialResponseAction, Error> {
 		if Some(&partial_response.request_id) != self.request_id.as_ref() {
 			return Ok(JobPartialResponseAction::Ignore);
 		}
-		// TODO: check_signature_share()
+		// TODO [Trust]: check_schnorr_signature_share()
 
 		Ok(JobPartialResponseAction::Accept)
 	}
 
-	fn compute_response(&self, partial_responses: &BTreeMap<NodeId, PartialSigningResponse>) -> Result<(Secret, Secret), Error> {
+	fn compute_response(&self, partial_responses: &BTreeMap<NodeId, SchnorrPartialSigningResponse>) -> Result<(Secret, Secret), Error> {
 		let message_hash = self.message_hash.as_ref()
 			.expect("compute_response is only called on master nodes; message_hash is filed in constructor on master nodes; qed");
 
 		let signature_c = math::combine_message_hash_with_public(message_hash, &self.session_public)?;
-		let signature_s = math::compute_signature(partial_responses.values().map(|r| &r.partial_signature))?;
-	
+		let signature_s = math::compute_schnorr_signature(partial_responses.values().map(|r| &r.partial_signature))?;
+
 		Ok((signature_c, signature_s))
 	}
-}
+}
\ No newline at end of file
diff --git a/secret_store/src/key_server_cluster/jobs/unknown_sessions_job.rs b/secret_store/src/key_server_cluster/jobs/unknown_sessions_job.rs
new file mode 100644
index 0000000000000000000000000000000000000000..13f2f8b8bb46ee2ae698154a984a28e6f40d77ce
--- /dev/null
+++ b/secret_store/src/key_server_cluster/jobs/unknown_sessions_job.rs
@@ -0,0 +1,80 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+use std::collections::{BTreeSet, BTreeMap};
+use key_server_cluster::{Error, NodeId, SessionId, KeyStorage};
+use key_server_cluster::jobs::job_session::{JobPartialRequestAction, JobPartialResponseAction, JobExecutor};
+
+/// Unknown sessions report job.
+pub struct UnknownSessionsJob {
+	/// Target node id.
+	target_node_id: Option<NodeId>,
+	/// Keys storage.
+	key_storage: Arc<KeyStorage>,
+}
+
+impl UnknownSessionsJob {
+	pub fn new_on_slave(key_storage: Arc<KeyStorage>) -> Self {
+		UnknownSessionsJob {
+			target_node_id: None,
+			key_storage: key_storage,
+		}
+	}
+
+	pub fn new_on_master(key_storage: Arc<KeyStorage>, self_node_id: NodeId) -> Self {
+		UnknownSessionsJob {
+			target_node_id: Some(self_node_id),
+			key_storage: key_storage,
+		}
+	}
+}
+
+impl JobExecutor for UnknownSessionsJob {
+	type PartialJobRequest = NodeId;
+	type PartialJobResponse = BTreeSet<SessionId>;
+	type JobResponse = BTreeMap<SessionId, BTreeSet<NodeId>>;
+
+	fn prepare_partial_request(&self, _node: &NodeId, _nodes: &BTreeSet<NodeId>) -> Result<NodeId, Error> {
+		Ok(self.target_node_id.clone().expect("prepare_partial_request is only called on master nodes; this field is filled on master nodes in constructor; qed"))
+	}
+
+	fn process_partial_request(&mut self, partial_request: NodeId) -> Result<JobPartialRequestAction<BTreeSet<SessionId>>, Error> {
+		Ok(JobPartialRequestAction::Respond(self.key_storage.iter()
+			.filter(|&(_, ref key_share)| !key_share.versions.last().map(|v| v.id_numbers.contains_key(&partial_request)).unwrap_or(true))
+			.map(|(id, _)| id.clone())
+			.collect()))
+	}
+
+	fn check_partial_response(&mut self, _sender: &NodeId, _partial_response: &BTreeSet<SessionId>) -> Result<JobPartialResponseAction, Error> {
+		Ok(JobPartialResponseAction::Accept)
+	}
+
+	// TODO [Opt]:
+	// currently ALL unknown sessions are sent at once - it is better to limit messages by size/len => add partial-partial responses
+	fn compute_response(&self, partial_responses: &BTreeMap<NodeId, BTreeSet<SessionId>>) -> Result<BTreeMap<SessionId, BTreeSet<NodeId>>, Error> {
+		let mut result: BTreeMap<SessionId, BTreeSet<NodeId>> = BTreeMap::new();
+		for (node_id, node_sessions) in partial_responses {
+			for node_session in node_sessions {
+				result.entry(node_session.clone())
+					.or_insert_with(Default::default)
+					.insert(node_id.clone());
+			}
+		}
+
+		Ok(result)
+	}
+}
diff --git a/secret_store/src/key_server_cluster/math.rs b/secret_store/src/key_server_cluster/math.rs
index 047a4556c4fadc184fb786ed550affa391c30a11..78c444822beefb44e0d22e85853392a3b8e01e4d 100644
--- a/secret_store/src/key_server_cluster/math.rs
+++ b/secret_store/src/key_server_cluster/math.rs
@@ -14,12 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use ethkey::{Public, Secret, Random, Generator, math};
-use util::{U256, H256, Hashable};
+use ethkey::{Public, Secret, Signature, Random, Generator, math};
+use ethereum_types::{H256, U256};
+use hash::keccak;
 use key_server_cluster::Error;
 
-#[derive(Debug)]
 /// Encryption result.
+#[derive(Debug)]
 pub struct EncryptedSecret {
 	/// Common encryption point.
 	pub common_point: Public,
@@ -27,16 +28,40 @@ pub struct EncryptedSecret {
 	pub encrypted_point: Public,
 }
 
-/// Generate random scalar
+/// Create zero scalar.
+pub fn zero_scalar() -> Secret {
+	Secret::zero()
+}
+
+/// Convert hash to EC scalar (modulo curve order).
+pub fn to_scalar(hash: H256) -> Result<Secret, Error> {
+	let scalar: U256 = hash.into();
+	let scalar: H256 = (scalar % math::curve_order()).into();
+	let scalar = Secret::from_slice(&*scalar);
+	scalar.check_validity()?;
+	Ok(scalar)
+}
+
+/// Generate random scalar.
 pub fn generate_random_scalar() -> Result<Secret, Error> {
 	Ok(Random.generate()?.secret().clone())
 }
 
-/// Generate random point
+/// Generate random point.
 pub fn generate_random_point() -> Result<Public, Error> {
 	Ok(Random.generate()?.public().clone())
 }
 
+/// Get X coordinate of point.
+fn public_x(public: &Public) -> H256 {
+	public[0..32].into()
+}
+
+/// Get Y coordinate of point.
+fn public_y(public: &Public) -> H256 {
+	public[32..64].into()
+}
+
 /// Compute publics sum.
 pub fn compute_public_sum<'a, I>(mut publics: I) -> Result<Public, Error> where I: Iterator<Item=&'a Public> {
 	let mut sum = publics.next().expect("compute_public_sum is called when there's at least one public; qed").clone();
@@ -55,6 +80,13 @@ pub fn compute_secret_sum<'a, I>(mut secrets: I) -> Result<Secret, Error> where
 	Ok(sum)
 }
 
+/// Compute secrets multiplication.
+pub fn compute_secret_mul(secret1: &Secret, secret2: &Secret) -> Result<Secret, Error> {
+	let mut secret_mul = secret1.clone();
+	secret_mul.mul(secret2)?;
+	Ok(secret_mul)
+}
+
 /// Compute secrets 'shadow' multiplication: coeff * multiplication(s[j] / (s[i] - s[j])) for every i != j
 pub fn compute_shadow_mul<'a, I>(coeff: &Secret, self_secret: &Secret, mut other_secrets: I) -> Result<Secret, Error> where I: Iterator<Item=&'a Secret> {
 	// when there are no other secrets, only coeff is left
@@ -164,6 +196,16 @@ pub fn keys_verification(threshold: usize, derived_point: &Public, number_id: &S
 	Ok(left == right)
 }
 
+/// Compute secret subshare from passed secret value.
+pub fn compute_secret_subshare<'a, I>(threshold: usize, secret_value: &Secret, sender_id_number: &Secret, other_id_numbers: I) -> Result<Secret, Error> where I: Iterator<Item=&'a Secret> {
+	let mut subshare = compute_shadow_mul(secret_value, sender_id_number, other_id_numbers)?;
+	if threshold % 2 != 0 {
+		subshare.neg()?;
+	}
+
+	Ok(subshare)
+}
+
 /// Compute secret share.
 pub fn compute_secret_share<'a, I>(secret_values: I) -> Result<Secret, Error> where I: Iterator<Item=&'a Secret> {
 	compute_secret_sum(secret_values)
@@ -181,12 +223,33 @@ pub fn compute_joint_public<'a, I>(public_shares: I) -> Result<Public, Error> wh
 	compute_public_sum(public_shares)
 }
 
+/// Compute joint secret key from N secret coefficients.
 #[cfg(test)]
-/// Compute joint secret key.
 pub fn compute_joint_secret<'a, I>(secret_coeffs: I) -> Result<Secret, Error> where I: Iterator<Item=&'a Secret> {
 	compute_secret_sum(secret_coeffs)
 }
 
+/// Compute joint secret key from t+1 secret shares.
+pub fn compute_joint_secret_from_shares<'a>(t: usize, secret_shares: &[&'a Secret], id_numbers: &[&'a Secret]) -> Result<Secret, Error> {
+	let secret_share_0 = secret_shares[0];
+	let id_number_0 = id_numbers[0];
+	let other_nodes_numbers = id_numbers.iter().skip(1).cloned();
+	let mut result = compute_node_shadow(secret_share_0, id_number_0, other_nodes_numbers)?;
+	for i in 1..secret_shares.len() {
+		let secret_share_i = secret_shares[i];
+		let id_number_i = id_numbers[i];
+		let other_nodes_numbers = id_numbers.iter().enumerate().filter(|&(j, _)| j != i).map(|(_, n)| n).cloned();
+		let addendum = compute_node_shadow(secret_share_i, id_number_i, other_nodes_numbers)?;
+		result.add(&addendum)?;
+	}
+
+	if t % 2 != 0 {
+		result.neg()?;
+	}
+
+	Ok(result)
+}
+
 /// Encrypt secret with joint public key.
 pub fn encrypt_secret(secret: &Public, joint_public: &Public) -> Result<EncryptedSecret, Error> {
 	// this is performed by KS-cluster client (or KS master)
@@ -238,8 +301,8 @@ pub fn compute_joint_shadow_point<'a, I>(nodes_shadow_points: I) -> Result<Publi
 	compute_public_sum(nodes_shadow_points)
 }
 
-#[cfg(test)]
 /// Compute joint shadow point (version for tests).
+#[cfg(test)]
 pub fn compute_joint_shadow_point_test<'a, I>(access_key: &Secret, common_point: &Public, nodes_shadows: I) -> Result<Public, Error> where I: Iterator<Item=&'a Secret> {
 	let mut joint_shadow = compute_secret_sum(nodes_shadows)?;
 	joint_shadow.mul(access_key)?;
@@ -277,8 +340,8 @@ pub fn make_common_shadow_point(threshold: usize, mut common_point: Public) -> R
 	}
 }
 
-#[cfg(test)]
 /// Decrypt shadow-encrypted secret.
+#[cfg(test)]
 pub fn decrypt_with_shadow_coefficients(mut decrypted_shadow: Public, mut common_shadow_point: Public, shadow_coefficients: Vec<Secret>) -> Result<Public, Error> {
 	let shadow_coefficients_sum = compute_secret_sum(shadow_coefficients.iter())?;
 	math::public_mul_secret(&mut common_shadow_point, &shadow_coefficients_sum)?;
@@ -286,8 +349,8 @@ pub fn decrypt_with_shadow_coefficients(mut decrypted_shadow: Public, mut common
 	Ok(decrypted_shadow)
 }
 
-#[cfg(test)]
 /// Decrypt data using joint secret (version for tests).
+#[cfg(test)]
 pub fn decrypt_with_joint_secret(encrypted_point: &Public, common_point: &Public, joint_secret: &Secret) -> Result<Public, Error> {
 	let mut common_point_mul = common_point.clone();
 	math::public_mul_secret(&mut common_point_mul, joint_secret)?;
@@ -306,19 +369,14 @@ pub fn combine_message_hash_with_public(message_hash: &H256, public: &Public) ->
 	buffer[32..64].copy_from_slice(&public[0..32]);
 
 	// calculate hash of buffer
-	let hash = (&buffer[..]).sha3();
+	let hash = keccak(&buffer[..]);
 
 	// map hash to EC finite field value
-	let hash: U256 = hash.into();
-	let hash: H256 = (hash % math::curve_order()).into();
-	let hash = Secret::from_slice(&*hash);
-	hash.check_validity()?;
-
-	Ok(hash)
+	to_scalar(hash)
 }
 
-/// Compute signature share.
-pub fn compute_signature_share<'a, I>(threshold: usize, combined_hash: &Secret, one_time_secret_coeff: &Secret, node_secret_share: &Secret, node_number: &Secret, other_nodes_numbers: I)
+/// Compute Schnorr signature share.
+pub fn compute_schnorr_signature_share<'a, I>(threshold: usize, combined_hash: &Secret, one_time_secret_coeff: &Secret, node_secret_share: &Secret, node_number: &Secret, other_nodes_numbers: I)
 	-> Result<Secret, Error> where I: Iterator<Item=&'a Secret> {
 	let mut sum = one_time_secret_coeff.clone();
 	let mut subtrahend = compute_shadow_mul(combined_hash, node_number, other_nodes_numbers)?;
@@ -331,10 +389,10 @@ pub fn compute_signature_share<'a, I>(threshold: usize, combined_hash: &Secret,
 	Ok(sum)
 }
 
-/// Check signature share.
-pub fn _check_signature_share<'a, I>(_combined_hash: &Secret, _signature_share: &Secret, _public_share: &Public, _one_time_public_share: &Public, _node_numbers: I)
+/// Check Schnorr signature share.
+pub fn _check_schnorr_signature_share<'a, I>(_combined_hash: &Secret, _signature_share: &Secret, _public_share: &Public, _one_time_public_share: &Public, _node_numbers: I)
 	-> Result<bool, Error> where I: Iterator<Item=&'a Secret> {
-	// TODO: in paper partial signature is checked using comparison:
+	// TODO [Trust]: in paper partial signature is checked using comparison:
 	//    sig[i] * T                                  = r[i] - c * lagrange_coeff(i) * y[i]
 	// => (k[i] - c * lagrange_coeff(i) * s[i]) * T   = r[i] - c * lagrange_coeff(i) * y[i]
 	// => k[i] * T - c * lagrange_coeff(i) * s[i] * T = k[i] * T - c * lagrange_coeff(i) * y[i]
@@ -351,14 +409,14 @@ pub fn _check_signature_share<'a, I>(_combined_hash: &Secret, _signature_share:
 	Ok(true)
 }
 
-/// Compute signature.
-pub fn compute_signature<'a, I>(signature_shares: I) -> Result<Secret, Error> where I: Iterator<Item=&'a Secret> {
+/// Compute Schnorr signature.
+pub fn compute_schnorr_signature<'a, I>(signature_shares: I) -> Result<Secret, Error> where I: Iterator<Item=&'a Secret> {
 	compute_secret_sum(signature_shares)
 }
 
-#[cfg(test)]
 /// Locally compute Schnorr signature as described in https://en.wikipedia.org/wiki/Schnorr_signature#Signing.
-pub fn local_compute_signature(nonce: &Secret, secret: &Secret, message_hash: &Secret) -> Result<(Secret, Secret), Error> {
+#[cfg(test)]
+pub fn local_compute_schnorr_signature(nonce: &Secret, secret: &Secret, message_hash: &Secret) -> Result<(Secret, Secret), Error> {
 	let mut nonce_public = math::generation_point();
 	math::public_mul_secret(&mut nonce_public, &nonce).unwrap();
 
@@ -372,9 +430,9 @@ pub fn local_compute_signature(nonce: &Secret, secret: &Secret, message_hash: &S
 	Ok((combined_hash, sig))
 }
 
+/// Verify Schnorr signature as described in https://en.wikipedia.org/wiki/Schnorr_signature#Verifying.
 #[cfg(test)]
-/// Verify signature as described in https://en.wikipedia.org/wiki/Schnorr_signature#Verifying.
-pub fn verify_signature(public: &Public, signature: &(Secret, Secret), message_hash: &H256) -> Result<bool, Error> {
+pub fn verify_schnorr_signature(public: &Public, signature: &(Secret, Secret), message_hash: &H256) -> Result<bool, Error> {
 	let mut addendum = math::generation_point();
 	math::public_mul_secret(&mut addendum, &signature.1)?;
 	let mut nonce_public = public.clone();
@@ -385,10 +443,98 @@ pub fn verify_signature(public: &Public, signature: &(Secret, Secret), message_h
 	Ok(combined_hash == signature.0)
 }
 
+/// Compute R part of ECDSA signature.
+pub fn compute_ecdsa_r(nonce_public: &Public) -> Result<Secret, Error> {
+	to_scalar(public_x(nonce_public))
+}
+
+/// Compute share of S part of ECDSA signature.
+pub fn compute_ecdsa_s_share(inv_nonce_share: &Secret, inv_nonce_mul_secret: &Secret, signature_r: &Secret, message_hash: &Secret) -> Result<Secret, Error> {
+	let mut nonce_inv_share_mul_message_hash = inv_nonce_share.clone();
+	nonce_inv_share_mul_message_hash.mul(&message_hash.clone().into())?;
+
+	let mut nonce_inv_share_mul_secret_share_mul_r = inv_nonce_mul_secret.clone();
+	nonce_inv_share_mul_secret_share_mul_r.mul(signature_r)?;
+
+	let mut signature_s_share = nonce_inv_share_mul_message_hash;
+	signature_s_share.add(&nonce_inv_share_mul_secret_share_mul_r)?;
+
+	Ok(signature_s_share)
+}
+
+/// Compute S part of ECDSA signature from shares.
+pub fn compute_ecdsa_s(t: usize, signature_s_shares: &[Secret], id_numbers: &[Secret]) -> Result<Secret, Error> {
+	let double_t = t * 2;
+	debug_assert!(id_numbers.len() >= double_t + 1);
+	debug_assert_eq!(signature_s_shares.len(), id_numbers.len());
+
+	compute_joint_secret_from_shares(double_t,
+		&signature_s_shares.iter().take(double_t + 1).collect::<Vec<_>>(),
+		&id_numbers.iter().take(double_t + 1).collect::<Vec<_>>())
+}
+
+/// Serialize ECDSA signature to [r][s]v form.
+pub fn serialize_ecdsa_signature(nonce_public: &Public, signature_r: Secret, mut signature_s: Secret) -> Signature {
+	// compute recovery param
+	let mut signature_v = {
+		let nonce_public_x = public_x(nonce_public);
+		let nonce_public_y: U256 = public_y(nonce_public).into();
+		let nonce_public_y_is_odd = !(nonce_public_y % 2.into()).is_zero();
+		let bit0 = if nonce_public_y_is_odd { 1u8 } else { 0u8 };
+		let bit1 = if nonce_public_x != *signature_r { 2u8 } else { 0u8 };
+		bit0 | bit1
+	};
+
+	// fix high S
+	let curve_order = math::curve_order();
+	let curve_order_half = curve_order / 2.into();
+	let s_numeric: U256 = (*signature_s).into();
+	if s_numeric > curve_order_half {
+		let signature_s_hash: H256 = (curve_order - s_numeric).into();
+		signature_s = signature_s_hash.into();
+		signature_v ^= 1;
+	}
+
+	// serialize as [r][s]v
+	let mut signature = [0u8; 65];
+	signature[..32].copy_from_slice(&**signature_r);
+	signature[32..64].copy_from_slice(&**signature_s);
+	signature[64] = signature_v;
+
+	signature.into()
+}
+
+/// Compute share of ECDSA reversed-nonce coefficient. Result of this_coeff * secret_share gives us a share of inv(nonce).
+pub fn compute_ecdsa_inversed_secret_coeff_share(secret_share: &Secret, nonce_share: &Secret, zero_share: &Secret) -> Result<Secret, Error> {
+	let mut coeff = secret_share.clone();
+	coeff.mul(nonce_share).unwrap();
+	coeff.add(zero_share).unwrap();
+	Ok(coeff)
+}
+
+/// Compute ECDSA reversed-nonce coefficient from its shares. Result of this_coeff * secret_share gives us a share of inv(nonce).
+pub fn compute_ecdsa_inversed_secret_coeff_from_shares(t: usize, id_numbers: &[Secret], shares: &[Secret]) -> Result<Secret, Error> {
+	debug_assert_eq!(shares.len(), 2 * t + 1);
+	debug_assert_eq!(shares.len(), id_numbers.len());
+
+	let u_shares = (0..2*t+1).map(|i| compute_shadow_mul(&shares[i], &id_numbers[i], id_numbers.iter().enumerate()
+		.filter(|&(j, _)| i != j)
+		.map(|(_, id)| id)
+		.take(2 * t))).collect::<Result<Vec<_>, _>>()?;
+
+	// compute u
+	let u = compute_secret_sum(u_shares.iter())?;
+
+	// compute inv(u)
+	let mut u_inv = u;
+	u_inv.inv()?;
+	Ok(u_inv)
+}
+
 #[cfg(test)]
 pub mod tests {
 	use std::iter::once;
-	use ethkey::KeyPair;
+	use ethkey::{KeyPair, recover, verify_public};
 	use super::*;
 
 	#[derive(Clone)]
@@ -401,19 +547,50 @@ pub mod tests {
 		joint_public: Public,
 	}
 
-	fn run_key_generation(t: usize, n: usize, id_numbers: Option<Vec<Secret>>) -> KeyGenerationArtifacts {
+	struct ZeroGenerationArtifacts {
+		polynoms1: Vec<Vec<Secret>>,
+		secret_shares: Vec<Secret>,
+	}
+
+	fn prepare_polynoms1(t: usize, n: usize, secret_required: Option<Secret>) -> Vec<Vec<Secret>> {
+		let mut polynoms1: Vec<_> = (0..n).map(|_| generate_random_polynom(t).unwrap()).collect();
+		// if we need specific secret to be shared, update polynoms so that sum of their free terms = required secret
+		if let Some(mut secret_required) = secret_required {
+			for polynom1 in polynoms1.iter_mut().take(n - 1) {
+				let secret_coeff1 = generate_random_scalar().unwrap();
+				secret_required.sub(&secret_coeff1).unwrap();
+				polynom1[0] = secret_coeff1;
+			}
+
+			polynoms1[n - 1][0] = secret_required;
+		}
+		polynoms1
+	}
+
+	fn run_key_generation(t: usize, n: usize, id_numbers: Option<Vec<Secret>>, secret_required: Option<Secret>) -> KeyGenerationArtifacts {
 		// === PART1: DKG ===
 
 		// data, gathered during initialization
+		let derived_point = Random.generate().unwrap().public().clone();
 		let id_numbers: Vec<_> = match id_numbers {
 			Some(id_numbers) => id_numbers,
 			None => (0..n).map(|_| generate_random_scalar().unwrap()).collect(),
 		};
 
 		// data, generated during keys dissemination
-		let polynoms1: Vec<_> = (0..n).map(|_| generate_random_polynom(t).unwrap()).collect();
+		let polynoms1 = prepare_polynoms1(t, n, secret_required);
 		let secrets1: Vec<_> = (0..n).map(|i| (0..n).map(|j| compute_polynom(&polynoms1[i], &id_numbers[j]).unwrap()).collect::<Vec<_>>()).collect();
 
+		// following data is used only on verification step
+		let polynoms2: Vec<_> = (0..n).map(|_| generate_random_polynom(t).unwrap()).collect();
+		let secrets2: Vec<_> = (0..n).map(|i| (0..n).map(|j| compute_polynom(&polynoms2[i], &id_numbers[j]).unwrap()).collect::<Vec<_>>()).collect();
+		let publics: Vec<_> = (0..n).map(|i| public_values_generation(t, &derived_point, &polynoms1[i], &polynoms2[i]).unwrap()).collect();
+
+		// keys verification
+		(0..n).map(|i| (0..n).map(|j| if i != j {
+			assert!(keys_verification(t, &derived_point, &id_numbers[i], &secrets1[j][i], &secrets2[j][i], &publics[j]).unwrap());
+		}).collect::<Vec<_>>()).collect::<Vec<_>>();
+
 		// data, generated during keys generation
 		let public_shares: Vec<_> = (0..n).map(|i| compute_public_share(&polynoms1[i][0]).unwrap()).collect();
 		let secret_shares: Vec<_> = (0..n).map(|i| compute_secret_share(secrets1.iter().map(|s| &s[i])).unwrap()).collect();
@@ -431,6 +608,124 @@ pub mod tests {
 		}
 	}
 
+	fn run_zero_key_generation(t: usize, n: usize, id_numbers: &[Secret]) -> ZeroGenerationArtifacts {
+		// data, generated during keys dissemination
+		let polynoms1 = prepare_polynoms1(t, n, Some(zero_scalar()));
+		let secrets1: Vec<_> = (0..n).map(|i| (0..n).map(|j| compute_polynom(&polynoms1[i], &id_numbers[j]).unwrap()).collect::<Vec<_>>()).collect();
+
+		// data, generated during keys generation
+		let secret_shares: Vec<_> = (0..n).map(|i| compute_secret_share(secrets1.iter().map(|s| &s[i])).unwrap()).collect();
+
+		ZeroGenerationArtifacts {
+			polynoms1: polynoms1,
+			secret_shares: secret_shares,
+		}
+	}
+
+	fn run_key_share_refreshing(old_t: usize, new_t: usize, new_n: usize, old_artifacts: &KeyGenerationArtifacts) -> KeyGenerationArtifacts {
+		// === share refreshing protocol from
+		// === based on "Verifiable Secret Redistribution for Threshold Sharing Schemes"
+		// === http://www.cs.cmu.edu/~wing/publications/CMU-CS-02-114.pdf
+
+		// generate new id_numbers for new nodes
+		let new_nodes = new_n.saturating_sub(old_artifacts.id_numbers.len());
+		let id_numbers: Vec<_> = old_artifacts.id_numbers.iter().take(new_n).cloned()
+			.chain((0..new_nodes).map(|_| generate_random_scalar().unwrap()))
+			.collect();
+
+		// on every authorized node: generate random polynomial ai(j) = si + ... + ai[new_t - 1] * j^(new_t - 1)
+		let mut subshare_polynoms = Vec::new();
+		for i in 0..old_t+1 {
+			let mut subshare_polynom = generate_random_polynom(new_t).unwrap();
+			subshare_polynom[0] = old_artifacts.secret_shares[i].clone();
+			subshare_polynoms.push(subshare_polynom);
+		}
+
+		// on every authorized node: calculate subshare for every new node
+		let mut subshares = Vec::new();
+		for j in 0..new_n {
+			let mut subshares_to_j = Vec::new();
+			for i in 0..old_t+1 {
+				let subshare_from_i_to_j = compute_polynom(&subshare_polynoms[i], &id_numbers[j]).unwrap();
+				subshares_to_j.push(subshare_from_i_to_j);
+			}
+			subshares.push(subshares_to_j);
+		}
+
+		// on every new node: generate new share using Lagrange interpolation
+		// on every node: generate new share using Lagrange interpolation
+		let mut new_secret_shares = Vec::new();
+		for j in 0..new_n {
+			let mut subshares_to_j = Vec::new();
+			for i in 0..old_t+1 {
+				let subshare_from_i = &subshares[j][i];
+				let id_number_i = &id_numbers[i];
+				let other_id_numbers = (0usize..old_t+1).filter(|j| *j != i).map(|j| &id_numbers[j]);
+				let mut subshare_from_i = compute_shadow_mul(subshare_from_i, id_number_i, other_id_numbers).unwrap();
+				if old_t % 2 != 0 {
+					subshare_from_i.neg().unwrap();
+				}
+				subshares_to_j.push(subshare_from_i);
+			}
+			new_secret_shares.push(compute_secret_sum(subshares_to_j.iter()).unwrap());
+		}
+
+		let mut result = old_artifacts.clone();
+		result.id_numbers = id_numbers;
+		result.secret_shares = new_secret_shares;
+		result
+	}
+
+	fn run_multiplication_protocol(t: usize, secret_shares1: &[Secret], secret_shares2: &[Secret]) -> Vec<Secret> {
+		let n = secret_shares1.len();
+		assert!(t * 2 + 1 <= n);
+
+		// shares of secrets multiplication = multiplication of secrets shares
+		let mul_shares: Vec<_> = (0..n).map(|i| {
+			let share1 = secret_shares1[i].clone();
+			let share2 = secret_shares2[i].clone();
+			let mut mul_share = share1;
+			mul_share.mul(&share2).unwrap();
+			mul_share
+		}).collect();
+
+		mul_shares
+	}
+
+	fn run_reciprocal_protocol(t: usize, artifacts: &KeyGenerationArtifacts) -> Vec<Secret> {
+		// === Given a secret x mod r which is shared among n players, it is
+		// === required to generate shares of inv(x) mod r with out revealing
+		// === any information about x or inv(x).
+		// === https://www.researchgate.net/publication/280531698_Robust_Threshold_Elliptic_Curve_Digital_Signature
+	
+		// generate shared random secret e for given t
+		let n = artifacts.id_numbers.len();
+		assert!(t * 2 + 1 <= n);
+		let e_artifacts = run_key_generation(t, n, Some(artifacts.id_numbers.clone()), None);
+
+		// generate shares of zero for 2 * t threshold
+		let z_artifacts = run_zero_key_generation(2 * t, n, &artifacts.id_numbers);
+
+		// each player computes && broadcast u[i] = x[i] * e[i] + z[i]
+		let ui: Vec<_> = (0..n).map(|i| compute_ecdsa_inversed_secret_coeff_share(&artifacts.secret_shares[i],
+			&e_artifacts.secret_shares[i],
+			&z_artifacts.secret_shares[i]).unwrap()).collect();
+
+		// players can interpolate the polynomial of degree 2t and compute u && inv(u):
+		let u_inv = compute_ecdsa_inversed_secret_coeff_from_shares(t,
+			&artifacts.id_numbers.iter().take(2*t + 1).cloned().collect::<Vec<_>>(),
+			&ui.iter().take(2*t + 1).cloned().collect::<Vec<_>>()).unwrap();
+
+		// each player Pi computes his share of inv(x) as e[i] * inv(u)
+		let x_inv_shares: Vec<_> = (0..n).map(|i| {
+			let mut x_inv_share = e_artifacts.secret_shares[i].clone();
+			x_inv_share.mul(&u_inv).unwrap();
+			x_inv_share
+		}).collect();
+
+		x_inv_shares
+	}
+
 	pub fn do_encryption_and_decryption(t: usize, joint_public: &Public, id_numbers: &[Secret], secret_shares: &[Secret], joint_secret: Option<&Secret>, document_secret_plain: Public) -> (Public, Public) {
 		// === PART2: encryption using joint public key ===
 
@@ -449,10 +744,12 @@ pub mod tests {
 				.filter(|&(j, _)| j != i)
 				.take(t)
 				.map(|(_, id_number)| id_number)).unwrap()).collect();
+
 		let nodes_shadow_points: Vec<_> = nodes_shadows.iter()
 			.map(|s| compute_node_shadow_point(&access_key, &encrypted_secret.common_point, s, None).unwrap())
 			.map(|sp| sp.0)
 			.collect();
+
 		assert_eq!(nodes_shadows.len(), t + 1);
 		assert_eq!(nodes_shadow_points.len(), t + 1);
 
@@ -477,7 +774,7 @@ pub mod tests {
 		let test_cases = [(0, 2), (1, 2), (1, 3), (2, 3), (1, 4), (2, 4), (3, 4), (1, 5), (2, 5), (3, 5), (4, 5),
 			(1, 10), (2, 10), (3, 10), (4, 10), (5, 10), (6, 10), (7, 10), (8, 10), (9, 10)];
 		for &(t, n) in &test_cases {
-			let artifacts = run_key_generation(t, n, None);
+			let artifacts = run_key_generation(t, n, None, None);
 
 			// compute joint private key [just for test]
 			let joint_secret = compute_joint_secret(artifacts.polynoms1.iter().map(|p| &p[0])).unwrap();
@@ -504,12 +801,12 @@ pub mod tests {
 		let key_pair = Random.generate().unwrap();
 		let message_hash = "0000000000000000000000000000000000000000000000000000000000000042".parse().unwrap();
 		let nonce = generate_random_scalar().unwrap();
-		let signature = local_compute_signature(&nonce, key_pair.secret(), &message_hash).unwrap();
-		assert_eq!(verify_signature(key_pair.public(), &signature, &message_hash), Ok(true));
+		let signature = local_compute_schnorr_signature(&nonce, key_pair.secret(), &message_hash).unwrap();
+		assert_eq!(verify_schnorr_signature(key_pair.public(), &signature, &message_hash), Ok(true));
 	}
 
 	#[test]
-	fn full_signature_math_session() {
+	fn full_schnorr_signature_math_session() {
 		let test_cases = [(0, 1), (0, 2), (1, 2), (1, 3), (2, 3), (1, 4), (2, 4), (3, 4), (1, 5), (2, 5), (3, 5), (4, 5),
 			(1, 10), (2, 10), (3, 10), (4, 10), (5, 10), (6, 10), (7, 10), (8, 10), (9, 10)];
 		for &(t, n) in &test_cases {
@@ -518,7 +815,7 @@ pub mod tests {
 
 			// === MiDS-S algorithm ===
 			// setup: all nodes share master secret key && every node knows master public key
-			let artifacts = run_key_generation(t, n, None);
+			let artifacts = run_key_generation(t, n, None, None);
 
 			// in this gap (not related to math):
 			// master node should ask every other node if it is able to do a signing
@@ -529,14 +826,14 @@ pub mod tests {
 
 			// step 1: run DKG to generate one-time secret key (nonce)
 			let id_numbers = artifacts.id_numbers.iter().cloned().take(n).collect();
-			let one_time_artifacts = run_key_generation(t, n, Some(id_numbers));
+			let one_time_artifacts = run_key_generation(t, n, Some(id_numbers), None);
 
 			// step 2: message hash && x coordinate of one-time public value are combined
 			let combined_hash = combine_message_hash_with_public(&message_hash, &one_time_artifacts.joint_public).unwrap();
 
 			// step 3: compute signature shares
 			let partial_signatures: Vec<_> = (0..n)
-				.map(|i| compute_signature_share(
+				.map(|i| compute_schnorr_signature_share(
 					t,
 					&combined_hash,
 					&one_time_artifacts.polynoms1[i][0],
@@ -556,7 +853,7 @@ pub mod tests {
 					.filter(|j| i != *j)
 					.map(|j| {
 						let signature_share = partial_signatures[j].clone();
-						assert!(_check_signature_share(&combined_hash,
+						assert!(_check_schnorr_signature_share(&combined_hash,
 							&signature_share,
 							&artifacts.public_shares[j],
 							&one_time_artifacts.public_shares[j],
@@ -568,17 +865,215 @@ pub mod tests {
 
 			// step 5: compute signature
 			let signatures: Vec<_> = (0..n)
-				.map(|i| (combined_hash.clone(), compute_signature(received_signatures[i].iter().chain(once(&partial_signatures[i]))).unwrap()))
+				.map(|i| (combined_hash.clone(), compute_schnorr_signature(received_signatures[i].iter().chain(once(&partial_signatures[i]))).unwrap()))
 				.collect();
 
 			// === verify signature ===
 			let master_secret = compute_joint_secret(artifacts.polynoms1.iter().map(|p| &p[0])).unwrap();
 			let nonce = compute_joint_secret(one_time_artifacts.polynoms1.iter().map(|p| &p[0])).unwrap();
-			let local_signature = local_compute_signature(&nonce, &master_secret, &message_hash).unwrap();
+			let local_signature = local_compute_schnorr_signature(&nonce, &master_secret, &message_hash).unwrap();
 			for signature in &signatures {
 				assert_eq!(signature, &local_signature);
-				assert_eq!(verify_signature(&artifacts.joint_public, signature, &message_hash), Ok(true));
+				assert_eq!(verify_schnorr_signature(&artifacts.joint_public, signature, &message_hash), Ok(true));
 			}
 		}
 	}
+
+	#[test]
+	fn full_ecdsa_signature_math_session() {
+		let test_cases = [(2, 5), (2, 6), (3, 11), (4, 11)];
+		for &(t, n) in &test_cases {
+			// values that can be hardcoded
+			let joint_secret: Secret = Random.generate().unwrap().secret().clone();
+			let joint_nonce: Secret = Random.generate().unwrap().secret().clone();
+			let message_hash: H256 = H256::random();
+
+			// convert message hash to EC scalar
+			let message_hash_scalar = to_scalar(message_hash.clone()).unwrap();
+
+			// generate secret key shares
+			let artifacts = run_key_generation(t, n, None, Some(joint_secret));
+
+			// generate nonce shares
+			let nonce_artifacts = run_key_generation(t, n, Some(artifacts.id_numbers.clone()), Some(joint_nonce));
+
+			// compute nonce public
+			// x coordinate (mapped to EC field) of this public is the r-portion of signature
+			let nonce_public_shares: Vec<_> = (0..n).map(|i| compute_public_share(&nonce_artifacts.polynoms1[i][0]).unwrap()).collect();
+			let nonce_public = compute_joint_public(nonce_public_shares.iter()).unwrap();
+			let signature_r = compute_ecdsa_r(&nonce_public).unwrap();
+
+			// compute shares of inv(nonce) so that both nonce && inv(nonce) are still unknown to all nodes
+			let nonce_inv_shares = run_reciprocal_protocol(t, &nonce_artifacts);
+
+			// compute multiplication of secret-shares * inv-nonce-shares
+			let mul_shares = run_multiplication_protocol(t, &artifacts.secret_shares, &nonce_inv_shares);
+
+			// compute shares for s portion of signature: nonce_inv * (message_hash + secret * signature_r)
+			// every node broadcasts this share
+			let double_t = 2 * t;
+			let signature_s_shares: Vec<_> = (0..double_t+1).map(|i| compute_ecdsa_s_share(
+				&nonce_inv_shares[i],
+				&mul_shares[i],
+				&signature_r,
+				&message_hash_scalar
+			).unwrap()).collect();
+
+			// compute signature_s from received shares
+			let signature_s = compute_ecdsa_s(t,
+				&signature_s_shares,
+				&artifacts.id_numbers.iter().take(double_t + 1).cloned().collect::<Vec<_>>()
+			).unwrap();
+
+			// check signature
+			let signature_actual = serialize_ecdsa_signature(&nonce_public, signature_r, signature_s);
+			let joint_secret = compute_joint_secret(artifacts.polynoms1.iter().map(|p| &p[0])).unwrap();
+			let joint_secret_pair = KeyPair::from_secret(joint_secret).unwrap();
+			assert_eq!(recover(&signature_actual, &message_hash).unwrap(), *joint_secret_pair.public());
+			assert!(verify_public(joint_secret_pair.public(), &signature_actual, &message_hash).unwrap());
+		}
+	}
+
+	#[test]
+	fn full_generation_math_session_with_refreshing_shares() {
+		let test_cases = vec![(1, 4), (6, 10)];
+		for (t, n) in test_cases {
+			// generate key using t-of-n session
+			let artifacts1 = run_key_generation(t, n, None, None);
+			let joint_secret1 = compute_joint_secret(artifacts1.polynoms1.iter().map(|p1| &p1[0])).unwrap();
+
+			// let's say we want to refresh existing secret shares
+			// by doing this every T seconds, and assuming that in each T-second period adversary KS is not able to collect t+1 secret shares
+			// we can be sure that the scheme is secure
+			let artifacts2 = run_key_share_refreshing(t, t, n, &artifacts1);
+			let joint_secret2 = compute_joint_secret_from_shares(t, &artifacts2.secret_shares.iter().take(t + 1).collect::<Vec<_>>(),
+				&artifacts2.id_numbers.iter().take(t + 1).collect::<Vec<_>>()).unwrap();
+			assert_eq!(joint_secret1, joint_secret2);
+
+			// refresh again
+			let artifacts3 = run_key_share_refreshing(t, t, n, &artifacts2);
+			let joint_secret3 = compute_joint_secret_from_shares(t, &artifacts3.secret_shares.iter().take(t + 1).collect::<Vec<_>>(),
+				&artifacts3.id_numbers.iter().take(t + 1).collect::<Vec<_>>()).unwrap();
+			assert_eq!(joint_secret1, joint_secret3);
+		}
+	}
+
+	#[test]
+	fn full_generation_math_session_with_adding_new_nodes() {
+		let test_cases = vec![(1, 3), (1, 4), (6, 10)];
+		for (t, n) in test_cases {
+			// generate key using t-of-n session
+			let artifacts1 = run_key_generation(t, n, None, None);
+			let joint_secret1 = compute_joint_secret(artifacts1.polynoms1.iter().map(|p1| &p1[0])).unwrap();
+
+			// let's say we want to include additional couple of servers to the set
+			// so that scheme becames t-of-n+2
+			let artifacts2 = run_key_share_refreshing(t, t, n + 2, &artifacts1);
+			let joint_secret2 = compute_joint_secret_from_shares(t, &artifacts2.secret_shares.iter().take(t + 1).collect::<Vec<_>>(),
+				&artifacts2.id_numbers.iter().take(t + 1).collect::<Vec<_>>()).unwrap();
+			assert_eq!(joint_secret1, joint_secret2);
+
+			// include another server (t-of-n+3)
+			let artifacts3 = run_key_share_refreshing(t, t, n + 3, &artifacts2);
+			let joint_secret3 = compute_joint_secret_from_shares(t, &artifacts3.secret_shares.iter().take(t + 1).collect::<Vec<_>>(),
+				&artifacts3.id_numbers.iter().take(t + 1).collect::<Vec<_>>()).unwrap();
+			assert_eq!(joint_secret1, joint_secret3);
+		}
+	}
+
+	#[test]
+	fn full_generation_math_session_with_decreasing_threshold() {
+		let (t, n) = (3, 5);
+
+		// generate key using t-of-n session
+		let artifacts1 = run_key_generation(t, n, None, None);
+
+		let joint_secret1 = compute_joint_secret(artifacts1.polynoms1.iter().map(|p1| &p1[0])).unwrap();
+
+		// let's say we want to decrease threshold so that it becames (t-1)-of-n
+		let new_t = t - 1;
+		let artifacts2 = run_key_share_refreshing(t, new_t, n, &artifacts1);
+		let joint_secret2 = compute_joint_secret_from_shares(new_t, &artifacts2.secret_shares.iter().take(new_t + 1).collect::<Vec<_>>(),
+			&artifacts2.id_numbers.iter().take(new_t + 1).collect::<Vec<_>>()).unwrap();
+		assert_eq!(joint_secret1, joint_secret2);
+
+		// let's say we want to decrease threshold once again so that it becames (t-2)-of-n
+		let t = t - 1;
+		let new_t = t - 2;
+		let artifacts3 = run_key_share_refreshing(t, new_t, n, &artifacts2);
+		let joint_secret3 = compute_joint_secret_from_shares(new_t, &artifacts3.secret_shares.iter().take(new_t + 1).collect::<Vec<_>>(),
+			&artifacts3.id_numbers.iter().take(new_t + 1).collect::<Vec<_>>()).unwrap();
+		assert_eq!(joint_secret1, joint_secret3);
+	}
+
+	#[test]
+	fn full_zero_secret_generation_math_session() {
+		let test_cases = vec![(1, 4), (2, 4)];
+		for (t, n) in test_cases {
+			// run joint zero generation session
+			let id_numbers: Vec<_> = (0..n).map(|_| generate_random_scalar().unwrap()).collect();
+			let artifacts = run_zero_key_generation(t, n, &id_numbers);
+
+			// check that zero secret is generated
+			// we can't compute secrets sum here, because result will be zero (invalid secret, unsupported by SECP256k1)
+			// so just use complement trick: x + (-x) = 0
+			// TODO [Refac]: switch to SECP256K1-free scalar EC arithmetic
+			let partial_joint_secret = compute_secret_sum(artifacts.polynoms1.iter().take(n - 1).map(|p| &p[0])).unwrap();
+			let mut partial_joint_secret_complement = artifacts.polynoms1[n - 1][0].clone();
+			partial_joint_secret_complement.neg().unwrap();
+			assert_eq!(partial_joint_secret, partial_joint_secret_complement);
+		}
+	}
+
+	#[test]
+	fn full_generation_with_multiplication() {
+		let test_cases = vec![(1, 3), (2, 5), (2, 7), (3, 8)];
+		for (t, n) in test_cases {
+			// generate two shared secrets
+			let artifacts1 = run_key_generation(t, n, None, None);
+			let artifacts2 = run_key_generation(t, n, Some(artifacts1.id_numbers.clone()), None);
+
+			// multiplicate original secrets
+			let joint_secret1 = compute_joint_secret(artifacts1.polynoms1.iter().map(|p| &p[0])).unwrap();
+			let joint_secret2 = compute_joint_secret(artifacts2.polynoms1.iter().map(|p| &p[0])).unwrap();
+			let mut expected_joint_secret_mul = joint_secret1;
+			expected_joint_secret_mul.mul(&joint_secret2).unwrap();
+
+			// run multiplication protocol
+			let joint_secret_mul_shares = run_multiplication_protocol(t, &artifacts1.secret_shares, &artifacts2.secret_shares);
+
+			// calculate actual secrets multiplication
+			let double_t = t * 2;
+			let actual_joint_secret_mul = compute_joint_secret_from_shares(double_t,
+				&joint_secret_mul_shares.iter().take(double_t + 1).collect::<Vec<_>>(),
+				&artifacts1.id_numbers.iter().take(double_t + 1).collect::<Vec<_>>()).unwrap();
+
+			assert_eq!(actual_joint_secret_mul, expected_joint_secret_mul);
+		}
+	}
+
+	#[test]
+	fn full_generation_with_reciprocal() {
+		let test_cases = vec![(1, 3), (2, 5), (2, 7), (2, 7), (3, 8)];
+		for (t, n) in test_cases {
+			// generate shared secret
+			let artifacts = run_key_generation(t, n, None, None);
+
+			// calculate inversion of original shared secret
+			let joint_secret = compute_joint_secret(artifacts.polynoms1.iter().map(|p| &p[0])).unwrap();
+			let mut expected_joint_secret_inv = joint_secret.clone();
+			expected_joint_secret_inv.inv().unwrap();
+
+			// run inversion protocol
+			let reciprocal_shares = run_reciprocal_protocol(t, &artifacts);
+
+			// calculate actual secret inversion
+			let double_t = t * 2;
+			let actual_joint_secret_inv = compute_joint_secret_from_shares(double_t,
+				&reciprocal_shares.iter().take(double_t + 1).collect::<Vec<_>>(),
+				&artifacts.id_numbers.iter().take(double_t + 1).collect::<Vec<_>>()).unwrap();
+
+			assert_eq!(actual_joint_secret_inv, expected_joint_secret_inv);
+		}
+	}
 }
diff --git a/secret_store/src/key_server_cluster/message.rs b/secret_store/src/key_server_cluster/message.rs
index b18cf512feda97eb10ed341b84a83b1687f6bc6a..9a93efb03a3909783c318ae7d9a1431bb16a926b 100644
--- a/secret_store/src/key_server_cluster/message.rs
+++ b/secret_store/src/key_server_cluster/message.rs
@@ -18,13 +18,14 @@ use std::fmt;
 use std::collections::{BTreeSet, BTreeMap};
 use ethkey::Secret;
 use key_server_cluster::SessionId;
-use super::{SerializableH256, SerializablePublic, SerializableSecret, SerializableSignature, SerializableMessageHash};
+use super::{SerializableH256, SerializablePublic, SerializableSecret, SerializableSignature,
+	SerializableMessageHash, SerializableRequester, SerializableAddress};
 
 pub type MessageSessionId = SerializableH256;
 pub type MessageNodeId = SerializablePublic;
 
-#[derive(Clone, Debug)]
 /// All possible messages that can be sent during encryption/decryption sessions.
+#[derive(Clone, Debug)]
 pub enum Message {
 	/// Cluster message.
 	Cluster(ClusterMessage),
@@ -34,12 +35,20 @@ pub enum Message {
 	Encryption(EncryptionMessage),
 	/// Decryption message.
 	Decryption(DecryptionMessage),
-	/// Signing message.
-	Signing(SigningMessage),
+	/// Schnorr signing message.
+	SchnorrSigning(SchnorrSigningMessage),
+	/// ECDSA signing message.
+	EcdsaSigning(EcdsaSigningMessage),
+	/// Key version negotiation message.
+	KeyVersionNegotiation(KeyVersionNegotiationMessage),
+	/// Share add message.
+	ShareAdd(ShareAddMessage),
+	/// Servers set change message.
+	ServersSetChange(ServersSetChangeMessage),
 }
 
-#[derive(Clone, Debug)]
 /// All possible cluster-level messages.
+#[derive(Clone, Debug)]
 pub enum ClusterMessage {
 	/// Introduce node public key.
 	NodePublicKey(NodePublicKey),
@@ -51,8 +60,8 @@ pub enum ClusterMessage {
 	KeepAliveResponse(KeepAliveResponse),
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// All possible messages that can be sent during key generation session.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum GenerationMessage {
 	/// Initialize new DKG session.
 	InitializeSession(InitializeSession),
@@ -70,8 +79,8 @@ pub enum GenerationMessage {
 	SessionCompleted(SessionCompleted),
 }
 
-#[derive(Clone, Debug)]
 /// All possible messages that can be sent during encryption session.
+#[derive(Clone, Debug)]
 pub enum EncryptionMessage {
 	/// Initialize encryption session.
 	InitializeEncryptionSession(InitializeEncryptionSession),
@@ -81,8 +90,8 @@ pub enum EncryptionMessage {
 	EncryptionSessionError(EncryptionSessionError),
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// All possible messages that can be sent during consensus establishing.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum ConsensusMessage {
 	/// Initialize consensus session.
 	InitializeConsensusSession(InitializeConsensusSession),
@@ -90,8 +99,26 @@ pub enum ConsensusMessage {
 	ConfirmConsensusInitialization(ConfirmConsensusInitialization),
 }
 
-#[derive(Clone, Debug)]
+/// All possible messages that can be sent during servers-set consensus establishing.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum ConsensusMessageWithServersSet {
+	/// Initialize consensus session.
+	InitializeConsensusSession(InitializeConsensusSessionWithServersSet),
+	/// Confirm/reject consensus session initialization.
+	ConfirmConsensusInitialization(ConfirmConsensusInitialization),
+}
+
+/// All possible messages that can be sent during share add consensus establishing.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum ConsensusMessageOfShareAdd {
+	/// Initialize consensus session.
+	InitializeConsensusSession(InitializeConsensusSessionOfShareAdd),
+	/// Confirm/reject consensus session initialization.
+	ConfirmConsensusInitialization(ConfirmConsensusInitialization),
+}
+
 /// All possible messages that can be sent during decryption session.
+#[derive(Clone, Debug)]
 pub enum DecryptionMessage {
 	/// Consensus establishing message.
 	DecryptionConsensusMessage(DecryptionConsensusMessage),
@@ -103,61 +130,154 @@ pub enum DecryptionMessage {
 	DecryptionSessionError(DecryptionSessionError),
 	/// When decryption session is completed.
 	DecryptionSessionCompleted(DecryptionSessionCompleted),
+	/// When decryption session is delegated to another node.
+	DecryptionSessionDelegation(DecryptionSessionDelegation),
+	/// When delegated decryption session is completed.
+	DecryptionSessionDelegationCompleted(DecryptionSessionDelegationCompleted),
 }
 
+/// All possible messages that can be sent during Schnorr signing session.
 #[derive(Clone, Debug)]
-/// All possible messages that can be sent during signing session.
-pub enum SigningMessage {
+pub enum SchnorrSigningMessage {
 	/// Consensus establishing message.
-	SigningConsensusMessage(SigningConsensusMessage),
+	SchnorrSigningConsensusMessage(SchnorrSigningConsensusMessage),
 	/// Session key generation message.
-	SigningGenerationMessage(SigningGenerationMessage),
+	SchnorrSigningGenerationMessage(SchnorrSigningGenerationMessage),
 	/// Request partial signature from node.
-	RequestPartialSignature(RequestPartialSignature),
+	SchnorrRequestPartialSignature(SchnorrRequestPartialSignature),
 	/// Partial signature is generated.
-	PartialSignature(PartialSignature),
+	SchnorrPartialSignature(SchnorrPartialSignature),
 	/// Signing error occured.
-	SigningSessionError(SigningSessionError),
+	SchnorrSigningSessionError(SchnorrSigningSessionError),
 	/// Signing session completed.
-	SigningSessionCompleted(SigningSessionCompleted),
+	SchnorrSigningSessionCompleted(SchnorrSigningSessionCompleted),
+	/// When signing session is delegated to another node.
+	SchnorrSigningSessionDelegation(SchnorrSigningSessionDelegation),
+	/// When delegated signing session is completed.
+	SchnorrSigningSessionDelegationCompleted(SchnorrSigningSessionDelegationCompleted),
 }
 
+/// All possible messages that can be sent during ECDSA signing session.
+#[derive(Clone, Debug)]
+pub enum EcdsaSigningMessage {
+	/// Consensus establishing message.
+	EcdsaSigningConsensusMessage(EcdsaSigningConsensusMessage),
+	/// Signature nonce generation message.
+	EcdsaSignatureNonceGenerationMessage(EcdsaSignatureNonceGenerationMessage),
+	/// Inversion nonce generation message.
+	EcdsaInversionNonceGenerationMessage(EcdsaInversionNonceGenerationMessage),
+	/// Inversion zero generation message.
+	EcdsaInversionZeroGenerationMessage(EcdsaInversionZeroGenerationMessage),
+	/// Inversed nonce coefficient share.
+	EcdsaSigningInversedNonceCoeffShare(EcdsaSigningInversedNonceCoeffShare),
+	/// Request partial signature from node.
+	EcdsaRequestPartialSignature(EcdsaRequestPartialSignature),
+	/// Partial signature is generated.
+	EcdsaPartialSignature(EcdsaPartialSignature),
+	/// Signing error occured.
+	EcdsaSigningSessionError(EcdsaSigningSessionError),
+	/// Signing session completed.
+	EcdsaSigningSessionCompleted(EcdsaSigningSessionCompleted),
+	/// When signing session is delegated to another node.
+	EcdsaSigningSessionDelegation(EcdsaSigningSessionDelegation),
+	/// When delegated signing session is completed.
+	EcdsaSigningSessionDelegationCompleted(EcdsaSigningSessionDelegationCompleted),
+}
+
+/// All possible messages that can be sent during servers set change session.
+#[derive(Clone, Debug)]
+pub enum ServersSetChangeMessage {
+	/// Consensus establishing message.
+	ServersSetChangeConsensusMessage(ServersSetChangeConsensusMessage),
+	/// Unknown sessions ids request.
+	UnknownSessionsRequest(UnknownSessionsRequest),
+	/// Unknown sessions ids.
+	UnknownSessions(UnknownSessions),
+	/// Negotiating key version to use as a base for ShareAdd session.
+	ShareChangeKeyVersionNegotiation(ShareChangeKeyVersionNegotiation),
+	/// Initialize share change session(s).
+	InitializeShareChangeSession(InitializeShareChangeSession),
+	/// Confirm share change session(s) initialization.
+	ConfirmShareChangeSessionInitialization(ConfirmShareChangeSessionInitialization),
+	/// Share change session delegation.
+	ServersSetChangeDelegate(ServersSetChangeDelegate),
+	/// Share change session delegation response.
+	ServersSetChangeDelegateResponse(ServersSetChangeDelegateResponse),
+	/// Share add message.
+	ServersSetChangeShareAddMessage(ServersSetChangeShareAddMessage),
+	/// Servers set change session completed.
+	ServersSetChangeError(ServersSetChangeError),
+	/// Servers set change session completed.
+	ServersSetChangeCompleted(ServersSetChangeCompleted),
+}
+
+/// All possible messages that can be sent during share add session.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum ShareAddMessage {
+	/// Consensus establishing message.
+	ShareAddConsensusMessage(ShareAddConsensusMessage),
+	/// Common key share data is sent to new node.
+	KeyShareCommon(KeyShareCommon),
+	/// Generated keys are sent to every node.
+	NewKeysDissemination(NewKeysDissemination),
+	/// When session error has occured.
+	ShareAddError(ShareAddError),
+}
+
+/// All possible messages that can be sent during key version negotiation message.
 #[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum KeyVersionNegotiationMessage {
+	/// Request key versions.
+	RequestKeyVersions(RequestKeyVersions),
+	/// Key versions.
+	KeyVersions(KeyVersions),
+	/// When session error has occured.
+	KeyVersionsError(KeyVersionsError),
+}
+
 /// Introduce node public key.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct NodePublicKey {
 	/// Node identifier (aka node public key).
 	pub node_id: MessageNodeId,
-	/// Data, which must be signed by peer to prove that he owns the corresponding private key. 
+	/// Random data, which must be signed by peer to prove that he owns the corresponding private key. 
 	pub confirmation_plain: SerializableH256,
+	/// The same random `confirmation_plain`, signed with one-time session key.
+	pub confirmation_signed_session: SerializableSignature,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Confirm that node owns the private key of previously passed public key (aka node id).
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct NodePrivateKeySignature {
 	/// Previously passed `confirmation_plain`, signed with node private key.
 	pub confirmation_signed: SerializableSignature,
 }
 
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Ask if the node is still alive.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct KeepAlive {
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Confirm that the node is still alive.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct KeepAliveResponse {
+	/// Session id, if used for session-level keep alive.
+	pub session_id: Option<MessageSessionId>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Initialize new DKG session.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct InitializeSession {
 	/// Session Id.
 	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Session author.
-	pub author: SerializablePublic,
+	pub author: SerializableAddress,
 	/// All session participants along with their identification numbers.
 	pub nodes: BTreeMap<MessageNodeId, SerializableSecret>,
+	/// Is zero secret generation session?
+	pub is_zero: bool,
 	/// Decryption threshold. During decryption threshold-of-route.len() nodes must came to
 	/// consensus to successfully decrypt message.
 	pub threshold: usize,
@@ -168,29 +288,35 @@ pub struct InitializeSession {
 	pub derived_point: SerializablePublic,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Confirm DKG session initialization.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ConfirmInitialization {
 	/// Session Id.
 	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Derived generation point.
 	pub derived_point: SerializablePublic,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Broadcast generated point to every other node.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct CompleteInitialization {
 	/// Session Id.
 	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Derived generation point.
 	pub derived_point: SerializablePublic,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Generated keys are sent to every node.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct KeysDissemination {
 	/// Session Id.
 	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Secret 1.
 	pub secret1: SerializableSecret,
 	/// Secret 2.
@@ -199,103 +325,155 @@ pub struct KeysDissemination {
 	pub publics: Vec<SerializablePublic>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Node is sharing its public key share.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct PublicKeyShare {
 	/// Session Id.
 	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Public key share.
 	pub public_share: SerializablePublic,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// When session error has occured.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct SessionError {
 	/// Session Id.
 	pub session: MessageSessionId,
-	/// Public key share.
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Error message.
 	pub error: String,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// When session is completed.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct SessionCompleted {
 	/// Session Id.
 	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Node is requested to prepare for saving encrypted data.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct InitializeEncryptionSession {
 	/// Encryption session Id.
 	pub session: MessageSessionId,
-	/// Requestor signature.
-	pub requestor_signature: SerializableSignature,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Requester.
+	pub requester: SerializableRequester,
 	/// Common point.
 	pub common_point: SerializablePublic,
 	/// Encrypted data.
 	pub encrypted_point: SerializablePublic,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Node is responding to encryption initialization request.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ConfirmEncryptionInitialization {
 	/// Encryption session Id.
 	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// When encryption session error has occured.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct EncryptionSessionError {
 	/// Encryption session Id.
 	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Error message.
 	pub error: String,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Node is asked to be part of consensus group.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct InitializeConsensusSession {
-	/// Requestor signature.
-	pub requestor_signature: SerializableSignature,
+	/// Requester.
+	pub requester: SerializableRequester,
+	/// Key version.
+	pub version: SerializableH256,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Node is responding to consensus initialization request.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ConfirmConsensusInitialization {
 	/// Is node confirmed consensus participation.
 	pub is_confirmed: bool,
 }
 
+/// Node is asked to be part of servers-set consensus group.
 #[derive(Clone, Debug, Serialize, Deserialize)]
-/// Consensus-related signing message.
-pub struct SigningConsensusMessage {
+pub struct InitializeConsensusSessionWithServersSet {
+	/// Migration id (if any).
+	pub migration_id: Option<SerializableH256>,
+	/// Old nodes set.
+	pub old_nodes_set: BTreeSet<MessageNodeId>,
+	/// New nodes set.
+	pub new_nodes_set: BTreeSet<MessageNodeId>,
+	/// Old server set, signed by requester.
+	pub old_set_signature: SerializableSignature,
+	/// New server set, signed by requester.
+	pub new_set_signature: SerializableSignature,
+}
+
+/// Node is asked to be part of servers-set consensus group.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct InitializeConsensusSessionOfShareAdd {
+	/// Key version.
+	pub version: SerializableH256,
+	/// threshold+1 nodes from old_nodes_set selected for shares redistribution.
+	pub consensus_group: BTreeSet<MessageNodeId>,
+	/// Old nodes set: all non-isolated owners of selected key share version.
+	pub old_nodes_set: BTreeSet<MessageNodeId>,
+	/// New nodes map: node id => node id number.
+	pub new_nodes_map: BTreeMap<MessageNodeId, SerializableSecret>,
+	/// Old server set, signed by requester.
+	pub old_set_signature: SerializableSignature,
+	/// New server set, signed by requester.
+	pub new_set_signature: SerializableSignature,
+}
+
+/// Consensus-related Schnorr signing message.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SchnorrSigningConsensusMessage {
 	/// Generation session Id.
 	pub session: MessageSessionId,
 	/// Signing session Id.
 	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Consensus message.
 	pub message: ConsensusMessage,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Session key generation message.
-pub struct SigningGenerationMessage {
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SchnorrSigningGenerationMessage {
 	/// Generation session Id.
 	pub session: MessageSessionId,
 	/// Signing session Id.
 	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Generation message.
 	pub message: GenerationMessage,
 }
 
+/// Request partial Schnorr signature.
 #[derive(Clone, Debug, Serialize, Deserialize)]
-/// Request partial signature.
-pub struct RequestPartialSignature {
+pub struct SchnorrRequestPartialSignature {
 	/// Generation session Id.
 	pub session: MessageSessionId,
 	/// Signing session Id.
 	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Request id.
 	pub request_id: SerializableSecret,
 	/// Message hash.
@@ -304,73 +482,271 @@ pub struct RequestPartialSignature {
 	pub nodes: BTreeSet<MessageNodeId>,
 }
 
+/// Partial Schnorr signature.
 #[derive(Clone, Debug, Serialize, Deserialize)]
-/// Partial signature.
-pub struct PartialSignature {
+pub struct SchnorrPartialSignature {
 	/// Generation session Id.
 	pub session: MessageSessionId,
 	/// Signing session Id.
 	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Request id.
 	pub request_id: SerializableSecret,
 	/// S part of signature.
 	pub partial_signature: SerializableSecret,
 }
 
+/// When Schnorr signing session error has occured.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SchnorrSigningSessionError {
+	/// Encryption session Id.
+	pub session: MessageSessionId,
+	/// Signing session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Error message.
+	pub error: String,
+}
+
+/// Schnorr signing session completed.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SchnorrSigningSessionCompleted {
+	/// Generation session Id.
+	pub session: MessageSessionId,
+	/// Signing session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+}
+
+/// When Schnorr signing session is delegated to another node.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SchnorrSigningSessionDelegation {
+	/// Encryption session Id.
+	pub session: MessageSessionId,
+	/// Decryption session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Requester.
+	pub requester: SerializableRequester,
+	/// Key version.
+	pub version: SerializableH256,
+	/// Message hash.
+	pub message_hash: SerializableH256,
+}
+
+/// When delegated Schnorr signing session is completed.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SchnorrSigningSessionDelegationCompleted {
+	/// Encryption session Id.
+	pub session: MessageSessionId,
+	/// Decryption session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// S-portion of signature.
+	pub signature_s: SerializableSecret,
+	/// C-portion of signature.
+	pub signature_c: SerializableSecret,
+}
+
+/// Consensus-related ECDSA signing message.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct EcdsaSigningConsensusMessage {
+	/// Generation session Id.
+	pub session: MessageSessionId,
+	/// Signing session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Consensus message.
+	pub message: ConsensusMessage,
+}
+
+/// ECDSA signature nonce generation message.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct EcdsaSignatureNonceGenerationMessage {
+	/// Generation session Id.
+	pub session: MessageSessionId,
+	/// Signing session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Generation message.
+	pub message: GenerationMessage,
+}
+
+/// ECDSA inversion nonce generation message.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct EcdsaInversionNonceGenerationMessage {
+	/// Generation session Id.
+	pub session: MessageSessionId,
+	/// Signing session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Generation message.
+	pub message: GenerationMessage,
+}
+
+/// ECDSA inversed nonce share message.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct EcdsaSigningInversedNonceCoeffShare {
+	/// Generation session Id.
+	pub session: MessageSessionId,
+	/// Signing session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Inversed nonce coefficient share.
+	pub inversed_nonce_coeff_share: SerializableSecret,
+}
+
+/// ECDSA inversion zero generation message.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct EcdsaInversionZeroGenerationMessage {
+	/// Generation session Id.
+	pub session: MessageSessionId,
+	/// Signing session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Generation message.
+	pub message: GenerationMessage,
+}
+
+/// Request partial ECDSA signature.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct EcdsaRequestPartialSignature {
+	/// Generation session Id.
+	pub session: MessageSessionId,
+	/// Signing session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Request id.
+	pub request_id: SerializableSecret,
+	///
+	pub inversed_nonce_coeff: SerializableSecret,
+	/// Message hash.
+	pub message_hash: SerializableMessageHash,
+}
+
+/// Partial ECDSA signature.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct EcdsaPartialSignature {
+	/// Generation session Id.
+	pub session: MessageSessionId,
+	/// Signing session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Request id.
+	pub request_id: SerializableSecret,
+	/// Partial S part of signature.
+	pub partial_signature_s: SerializableSecret,
+}
+
+/// When ECDSA signing session error has occured.
 #[derive(Clone, Debug, Serialize, Deserialize)]
-/// When signing session error has occured.
-pub struct SigningSessionError {
+pub struct EcdsaSigningSessionError {
 	/// Encryption session Id.
 	pub session: MessageSessionId,
 	/// Signing session Id.
 	pub sub_session: SerializableSecret,
-	/// Error description.
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Error message.
 	pub error: String,
 }
 
+/// ECDSA signing session completed.
 #[derive(Clone, Debug, Serialize, Deserialize)]
-/// Signing session completed.
-pub struct SigningSessionCompleted {
+pub struct EcdsaSigningSessionCompleted {
 	/// Generation session Id.
 	pub session: MessageSessionId,
 	/// Signing session Id.
 	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+}
+
+/// When ECDSA signing session is delegated to another node.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct EcdsaSigningSessionDelegation {
+	/// Encryption session Id.
+	pub session: MessageSessionId,
+	/// Decryption session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Requestor signature.
+	pub requester: SerializableRequester,
+	/// Key version.
+	pub version: SerializableH256,
+	/// Message hash.
+	pub message_hash: SerializableH256,
 }
 
+/// When delegated ECDSA signing session is completed.
 #[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct EcdsaSigningSessionDelegationCompleted {
+	/// Encryption session Id.
+	pub session: MessageSessionId,
+	/// Decryption session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Signature.
+	pub signature: SerializableSignature,
+}
+
 /// Consensus-related decryption message.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct DecryptionConsensusMessage {
 	/// Generation session Id.
 	pub session: MessageSessionId,
 	/// Signing session Id.
 	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Consensus message.
 	pub message: ConsensusMessage,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Node is requested to do a partial decryption.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct RequestPartialDecryption {
 	/// Encryption session Id.
 	pub session: MessageSessionId,
 	/// Decryption session Id.
 	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Request id.
 	pub request_id: SerializableSecret,
 	/// Is shadow decryption requested? When true, decryption result
 	/// will be visible to the owner of requestor public key only.
 	pub is_shadow_decryption: bool,
+	/// Decryption result must be reconstructed on all participating nodes. This is useful
+	/// for service contract API so that all nodes from consensus group can confirm decryption.
+	pub is_broadcast_session: bool,
 	/// Nodes that are agreed to do a decryption.
 	pub nodes: BTreeSet<MessageNodeId>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// Node has partially decrypted the secret.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct PartialDecryption {
 	/// Encryption session Id.
 	pub session: MessageSessionId,
 	/// Decryption session Id.
 	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
 	/// Request id.
 	pub request_id: SerializableSecret,
 	/// Partially decrypted secret.
@@ -379,24 +755,359 @@ pub struct PartialDecryption {
 	pub decrypt_shadow: Option<Vec<u8>>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// When decryption session error has occured.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct DecryptionSessionError {
 	/// Encryption session Id.
 	pub session: MessageSessionId,
 	/// Decryption session Id.
 	pub sub_session: SerializableSecret,
-	/// Public key share.
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Error message.
 	pub error: String,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
 /// When decryption session is completed.
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct DecryptionSessionCompleted {
 	/// Encryption session Id.
 	pub session: MessageSessionId,
 	/// Decryption session Id.
 	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+}
+
+/// When decryption session is delegated to another node.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct DecryptionSessionDelegation {
+	/// Encryption session Id.
+	pub session: MessageSessionId,
+	/// Decryption session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Requester.
+	pub requester: SerializableRequester,
+	/// Key version.
+	pub version: SerializableH256,
+	/// Is shadow decryption requested? When true, decryption result
+	/// will be visible to the owner of requestor public key only.
+	pub is_shadow_decryption: bool,
+	/// Decryption result must be reconstructed on all participating nodes. This is useful
+	/// for service contract API so that all nodes from consensus group can confirm decryption.
+	pub is_broadcast_session: bool,
+}
+
+/// When delegated decryption session is completed.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct DecryptionSessionDelegationCompleted {
+	/// Encryption session Id.
+	pub session: MessageSessionId,
+	/// Decryption session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Decrypted secret point. It is partially decrypted if shadow decrpytion was requested.
+	pub decrypted_secret: SerializablePublic,
+	/// Shared common point.
+	pub common_point: Option<SerializablePublic>,
+	/// If shadow decryption was requested: shadow decryption coefficients, encrypted with requestor public.
+	pub decrypt_shadows: Option<Vec<Vec<u8>>>,
+}
+
+/// Consensus-related servers set change message.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ServersSetChangeConsensusMessage {
+	/// Servers set change session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Consensus message.
+	pub message: ConsensusMessageWithServersSet,
+}
+
+/// Unknown sessions ids request.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct UnknownSessionsRequest {
+	/// Servers set change session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+}
+
+/// Unknown session ids.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct UnknownSessions {
+	/// Servers set change session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Unknown session id.
+	pub unknown_sessions: BTreeSet<MessageSessionId>,
+}
+
+/// Key version negotiation message.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ShareChangeKeyVersionNegotiation {
+	/// Servers set change session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Key version negotiation message.
+	pub message: KeyVersionNegotiationMessage,
+}
+
+/// Master node opens share initialize session on other nodes.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct InitializeShareChangeSession {
+	/// Servers set change session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Key id.
+	pub key_id: MessageSessionId,
+	/// Key vesion to use in ShareAdd session.
+	pub version: SerializableH256,
+	/// Master node.
+	pub master_node_id: MessageNodeId,
+	/// Consensus group to use in ShareAdd session.
+	pub consensus_group: BTreeSet<MessageNodeId>,
+	/// Shares to add. Values are filled for new nodes only.
+	pub new_nodes_map: BTreeMap<MessageNodeId, Option<SerializableSecret>>,
+}
+
+/// Slave node confirms session initialization.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ConfirmShareChangeSessionInitialization {
+	/// Servers set change session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Sessions that are confirmed.
+	pub key_id: MessageSessionId,
+}
+
+/// Share change is requested.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ServersSetChangeDelegate {
+	/// Servers set change session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Key id.
+	pub key_id: MessageSessionId,
+}
+
+/// Share change is completed.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ServersSetChangeDelegateResponse {
+	/// Servers set change session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Key id.
+	pub key_id: MessageSessionId,
+}
+
+/// Servers set change share add message.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ServersSetChangeShareAddMessage {
+	/// Servers set change session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Unknown session id.
+	pub message: ShareAddMessage,
+}
+
+/// When servers set change session error has occured.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ServersSetChangeError {
+	/// Servers set change session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Error message.
+	pub error: String,
+}
+
+/// When servers set change session is completed.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ServersSetChangeCompleted {
+	/// Servers set change session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+}
+
+/// Consensus-related share add session message.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ShareAddConsensusMessage {
+	/// Share add session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Consensus message.
+	pub message: ConsensusMessageOfShareAdd,
+}
+
+/// Key share common data is passed to new node.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct KeyShareCommon {
+	/// Generation session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Key threshold.
+	pub threshold: usize,
+	/// Author of key share entry.
+	pub author: SerializableAddress,
+	/// Joint public.
+	pub joint_public: SerializablePublic,
+	/// Common (shared) encryption point.
+	pub common_point: Option<SerializablePublic>,
+	/// Encrypted point.
+	pub encrypted_point: Option<SerializablePublic>,
+	/// Selected version id numbers.
+	pub id_numbers: BTreeMap<MessageNodeId, SerializableSecret>,
+}
+
+/// Generated keys are sent to every node.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct NewKeysDissemination {
+	/// Generation session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Sub share of rcevier' secret share.
+	pub secret_subshare: SerializableSecret,
+}
+
+/// When share add session error has occured.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ShareAddError {
+	/// Generation session Id.
+	pub session: MessageSessionId,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Error message.
+	pub error: String,
+}
+
+/// Key versions are requested.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct RequestKeyVersions {
+	/// Generation session id.
+	pub session: MessageSessionId,
+	/// Version negotiation session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+}
+
+/// Key versions are sent.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct KeyVersions {
+	/// Generation session id.
+	pub session: MessageSessionId,
+	/// Version negotiation session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Key threshold.
+	pub threshold: Option<usize>,
+	/// Key versions.
+	pub versions: Vec<SerializableH256>,
+}
+
+/// When key versions error has occured.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct KeyVersionsError {
+	/// Generation session id.
+	pub session: MessageSessionId,
+	/// Version negotiation session Id.
+	pub sub_session: SerializableSecret,
+	/// Session-level nonce.
+	pub session_nonce: u64,
+	/// Error message.
+	pub error: String,
+}
+
+impl Message {
+	pub fn is_initialization_message(&self) -> bool {
+		match *self {
+			Message::Generation(GenerationMessage::InitializeSession(_)) => true,
+			Message::Encryption(EncryptionMessage::InitializeEncryptionSession(_)) => true,
+			Message::Decryption(DecryptionMessage::DecryptionConsensusMessage(ref msg)) => match msg.message {
+				ConsensusMessage::InitializeConsensusSession(_) => true,
+				_ => false
+			},
+			Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningConsensusMessage(ref msg)) => match msg.message {
+				ConsensusMessage::InitializeConsensusSession(_) => true,
+				_ => false
+			},
+			Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningConsensusMessage(ref msg)) => match msg.message {
+				ConsensusMessage::InitializeConsensusSession(_) => true,
+				_ => false
+			},
+			Message::KeyVersionNegotiation(KeyVersionNegotiationMessage::RequestKeyVersions(_)) => true,
+			Message::ShareAdd(ShareAddMessage::ShareAddConsensusMessage(ref msg)) => match msg.message {
+				ConsensusMessageOfShareAdd::InitializeConsensusSession(_) => true,
+				_ => false
+			},
+			Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeConsensusMessage(ref msg)) => match msg.message {
+				ConsensusMessageWithServersSet::InitializeConsensusSession(_) => true,
+				_ => false
+			},
+			_ => false,
+		}
+	}
+
+	pub fn is_delegation_message(&self) -> bool {
+		match *self {
+			Message::Decryption(DecryptionMessage::DecryptionSessionDelegation(_)) => true,
+			Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionDelegation(_)) => true,
+			Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionDelegation(_)) => true,
+			_ => false,
+		}
+	}
+
+	pub fn is_error_message(&self) -> bool {
+		match *self {
+			Message::Generation(GenerationMessage::SessionError(_)) => true,
+			Message::Encryption(EncryptionMessage::EncryptionSessionError(_)) => true,
+			Message::Decryption(DecryptionMessage::DecryptionSessionError(_)) => true,
+			Message::SchnorrSigning(SchnorrSigningMessage::SchnorrSigningSessionError(_)) => true,
+			Message::EcdsaSigning(EcdsaSigningMessage::EcdsaSigningSessionError(_)) => true,
+			Message::KeyVersionNegotiation(KeyVersionNegotiationMessage::KeyVersionsError(_)) => true,
+			Message::ShareAdd(ShareAddMessage::ShareAddError(_)) => true,
+			Message::ServersSetChange(ServersSetChangeMessage::ServersSetChangeError(_)) => true,
+			_ => false,
+		}
+	}
+
+	pub fn is_exclusive_session_message(&self) -> bool {
+		match *self {
+			Message::ServersSetChange(_) => true,
+			_ => false,
+		}
+	}
+
+	pub fn session_nonce(&self) -> Option<u64> {
+		match *self {
+			Message::Cluster(_) => None,
+			Message::Generation(ref message) => Some(message.session_nonce()),
+			Message::Encryption(ref message) => Some(message.session_nonce()),
+			Message::Decryption(ref message) => Some(message.session_nonce()),
+			Message::SchnorrSigning(ref message) => Some(message.session_nonce()),
+			Message::EcdsaSigning(ref message) => Some(message.session_nonce()),
+			Message::ShareAdd(ref message) => Some(message.session_nonce()),
+			Message::ServersSetChange(ref message) => Some(message.session_nonce()),
+			Message::KeyVersionNegotiation(ref message) => Some(message.session_nonce()),
+		}
+	}
 }
 
 impl GenerationMessage {
@@ -411,6 +1122,18 @@ impl GenerationMessage {
 			GenerationMessage::SessionCompleted(ref msg) => &msg.session,
 		}
 	}
+
+	pub fn session_nonce(&self) -> u64 {
+		match *self {
+			GenerationMessage::InitializeSession(ref msg) => msg.session_nonce,
+			GenerationMessage::ConfirmInitialization(ref msg) => msg.session_nonce,
+			GenerationMessage::CompleteInitialization(ref msg) => msg.session_nonce,
+			GenerationMessage::KeysDissemination(ref msg) => msg.session_nonce,
+			GenerationMessage::PublicKeyShare(ref msg) => msg.session_nonce,
+			GenerationMessage::SessionError(ref msg) => msg.session_nonce,
+			GenerationMessage::SessionCompleted(ref msg) => msg.session_nonce,
+		}
+	}
 }
 
 impl EncryptionMessage {
@@ -421,6 +1144,14 @@ impl EncryptionMessage {
 			EncryptionMessage::EncryptionSessionError(ref msg) => &msg.session,
 		}
 	}
+
+	pub fn session_nonce(&self) -> u64 {
+		match *self {
+			EncryptionMessage::InitializeEncryptionSession(ref msg) => msg.session_nonce,
+			EncryptionMessage::ConfirmEncryptionInitialization(ref msg) => msg.session_nonce,
+			EncryptionMessage::EncryptionSessionError(ref msg) => msg.session_nonce,
+		}
+	}
 }
 
 impl DecryptionMessage {
@@ -431,6 +1162,8 @@ impl DecryptionMessage {
 			DecryptionMessage::PartialDecryption(ref msg) => &msg.session,
 			DecryptionMessage::DecryptionSessionError(ref msg) => &msg.session,
 			DecryptionMessage::DecryptionSessionCompleted(ref msg) => &msg.session,
+			DecryptionMessage::DecryptionSessionDelegation(ref msg) => &msg.session,
+			DecryptionMessage::DecryptionSessionDelegationCompleted(ref msg) => &msg.session,
 		}
 	}
 
@@ -441,30 +1174,191 @@ impl DecryptionMessage {
 			DecryptionMessage::PartialDecryption(ref msg) => &msg.sub_session,
 			DecryptionMessage::DecryptionSessionError(ref msg) => &msg.sub_session,
 			DecryptionMessage::DecryptionSessionCompleted(ref msg) => &msg.sub_session,
+			DecryptionMessage::DecryptionSessionDelegation(ref msg) => &msg.sub_session,
+			DecryptionMessage::DecryptionSessionDelegationCompleted(ref msg) => &msg.sub_session,
+		}
+	}
+
+	pub fn session_nonce(&self) -> u64 {
+		match *self {
+			DecryptionMessage::DecryptionConsensusMessage(ref msg) => msg.session_nonce,
+			DecryptionMessage::RequestPartialDecryption(ref msg) => msg.session_nonce,
+			DecryptionMessage::PartialDecryption(ref msg) => msg.session_nonce,
+			DecryptionMessage::DecryptionSessionError(ref msg) => msg.session_nonce,
+			DecryptionMessage::DecryptionSessionCompleted(ref msg) => msg.session_nonce,
+			DecryptionMessage::DecryptionSessionDelegation(ref msg) => msg.session_nonce,
+			DecryptionMessage::DecryptionSessionDelegationCompleted(ref msg) => msg.session_nonce,
 		}
 	}
 }
 
-impl SigningMessage {
+impl SchnorrSigningMessage {
 	pub fn session_id(&self) -> &SessionId {
 		match *self {
-			SigningMessage::SigningConsensusMessage(ref msg) => &msg.session,
-			SigningMessage::SigningGenerationMessage(ref msg) => &msg.session,
-			SigningMessage::RequestPartialSignature(ref msg) => &msg.session,
-			SigningMessage::PartialSignature(ref msg) => &msg.session,
-			SigningMessage::SigningSessionError(ref msg) => &msg.session,
-			SigningMessage::SigningSessionCompleted(ref msg) => &msg.session,
+			SchnorrSigningMessage::SchnorrSigningConsensusMessage(ref msg) => &msg.session,
+			SchnorrSigningMessage::SchnorrSigningGenerationMessage(ref msg) => &msg.session,
+			SchnorrSigningMessage::SchnorrRequestPartialSignature(ref msg) => &msg.session,
+			SchnorrSigningMessage::SchnorrPartialSignature(ref msg) => &msg.session,
+			SchnorrSigningMessage::SchnorrSigningSessionError(ref msg) => &msg.session,
+			SchnorrSigningMessage::SchnorrSigningSessionCompleted(ref msg) => &msg.session,
+			SchnorrSigningMessage::SchnorrSigningSessionDelegation(ref msg) => &msg.session,
+			SchnorrSigningMessage::SchnorrSigningSessionDelegationCompleted(ref msg) => &msg.session,
 		}
 	}
 
 	pub fn sub_session_id(&self) -> &Secret {
 		match *self {
-			SigningMessage::SigningConsensusMessage(ref msg) => &msg.sub_session,
-			SigningMessage::SigningGenerationMessage(ref msg) => &msg.sub_session,
-			SigningMessage::RequestPartialSignature(ref msg) => &msg.sub_session,
-			SigningMessage::PartialSignature(ref msg) => &msg.sub_session,
-			SigningMessage::SigningSessionError(ref msg) => &msg.sub_session,
-			SigningMessage::SigningSessionCompleted(ref msg) => &msg.sub_session,
+			SchnorrSigningMessage::SchnorrSigningConsensusMessage(ref msg) => &msg.sub_session,
+			SchnorrSigningMessage::SchnorrSigningGenerationMessage(ref msg) => &msg.sub_session,
+			SchnorrSigningMessage::SchnorrRequestPartialSignature(ref msg) => &msg.sub_session,
+			SchnorrSigningMessage::SchnorrPartialSignature(ref msg) => &msg.sub_session,
+			SchnorrSigningMessage::SchnorrSigningSessionError(ref msg) => &msg.sub_session,
+			SchnorrSigningMessage::SchnorrSigningSessionCompleted(ref msg) => &msg.sub_session,
+			SchnorrSigningMessage::SchnorrSigningSessionDelegation(ref msg) => &msg.sub_session,
+			SchnorrSigningMessage::SchnorrSigningSessionDelegationCompleted(ref msg) => &msg.sub_session,
+		}
+	}
+
+	pub fn session_nonce(&self) -> u64 {
+		match *self {
+			SchnorrSigningMessage::SchnorrSigningConsensusMessage(ref msg) => msg.session_nonce,
+			SchnorrSigningMessage::SchnorrSigningGenerationMessage(ref msg) => msg.session_nonce,
+			SchnorrSigningMessage::SchnorrRequestPartialSignature(ref msg) => msg.session_nonce,
+			SchnorrSigningMessage::SchnorrPartialSignature(ref msg) => msg.session_nonce,
+			SchnorrSigningMessage::SchnorrSigningSessionError(ref msg) => msg.session_nonce,
+			SchnorrSigningMessage::SchnorrSigningSessionCompleted(ref msg) => msg.session_nonce,
+			SchnorrSigningMessage::SchnorrSigningSessionDelegation(ref msg) => msg.session_nonce,
+			SchnorrSigningMessage::SchnorrSigningSessionDelegationCompleted(ref msg) => msg.session_nonce,
+		}
+	}
+}
+
+impl EcdsaSigningMessage {
+	pub fn session_id(&self) -> &SessionId {
+		match *self {
+			EcdsaSigningMessage::EcdsaSigningConsensusMessage(ref msg) => &msg.session,
+			EcdsaSigningMessage::EcdsaSignatureNonceGenerationMessage(ref msg) => &msg.session,
+			EcdsaSigningMessage::EcdsaInversionNonceGenerationMessage(ref msg) => &msg.session,
+			EcdsaSigningMessage::EcdsaInversionZeroGenerationMessage(ref msg) => &msg.session,
+			EcdsaSigningMessage::EcdsaSigningInversedNonceCoeffShare(ref msg) => &msg.session,
+			EcdsaSigningMessage::EcdsaRequestPartialSignature(ref msg) => &msg.session,
+			EcdsaSigningMessage::EcdsaPartialSignature(ref msg) => &msg.session,
+			EcdsaSigningMessage::EcdsaSigningSessionError(ref msg) => &msg.session,
+			EcdsaSigningMessage::EcdsaSigningSessionCompleted(ref msg) => &msg.session,
+			EcdsaSigningMessage::EcdsaSigningSessionDelegation(ref msg) => &msg.session,
+			EcdsaSigningMessage::EcdsaSigningSessionDelegationCompleted(ref msg) => &msg.session,
+		}
+	}
+
+	pub fn sub_session_id(&self) -> &Secret {
+		match *self {
+			EcdsaSigningMessage::EcdsaSigningConsensusMessage(ref msg) => &msg.sub_session,
+			EcdsaSigningMessage::EcdsaSignatureNonceGenerationMessage(ref msg) => &msg.sub_session,
+			EcdsaSigningMessage::EcdsaInversionNonceGenerationMessage(ref msg) => &msg.sub_session,
+			EcdsaSigningMessage::EcdsaInversionZeroGenerationMessage(ref msg) => &msg.sub_session,
+			EcdsaSigningMessage::EcdsaSigningInversedNonceCoeffShare(ref msg) => &msg.sub_session,
+			EcdsaSigningMessage::EcdsaRequestPartialSignature(ref msg) => &msg.sub_session,
+			EcdsaSigningMessage::EcdsaPartialSignature(ref msg) => &msg.sub_session,
+			EcdsaSigningMessage::EcdsaSigningSessionError(ref msg) => &msg.sub_session,
+			EcdsaSigningMessage::EcdsaSigningSessionCompleted(ref msg) => &msg.sub_session,
+			EcdsaSigningMessage::EcdsaSigningSessionDelegation(ref msg) => &msg.sub_session,
+			EcdsaSigningMessage::EcdsaSigningSessionDelegationCompleted(ref msg) => &msg.sub_session,
+		}
+	}
+
+	pub fn session_nonce(&self) -> u64 {
+		match *self {
+			EcdsaSigningMessage::EcdsaSigningConsensusMessage(ref msg) => msg.session_nonce,
+			EcdsaSigningMessage::EcdsaSignatureNonceGenerationMessage(ref msg) => msg.session_nonce,
+			EcdsaSigningMessage::EcdsaInversionNonceGenerationMessage(ref msg) => msg.session_nonce,
+			EcdsaSigningMessage::EcdsaInversionZeroGenerationMessage(ref msg) => msg.session_nonce,
+			EcdsaSigningMessage::EcdsaSigningInversedNonceCoeffShare(ref msg) => msg.session_nonce,
+			EcdsaSigningMessage::EcdsaRequestPartialSignature(ref msg) => msg.session_nonce,
+			EcdsaSigningMessage::EcdsaPartialSignature(ref msg) => msg.session_nonce,
+			EcdsaSigningMessage::EcdsaSigningSessionError(ref msg) => msg.session_nonce,
+			EcdsaSigningMessage::EcdsaSigningSessionCompleted(ref msg) => msg.session_nonce,
+			EcdsaSigningMessage::EcdsaSigningSessionDelegation(ref msg) => msg.session_nonce,
+			EcdsaSigningMessage::EcdsaSigningSessionDelegationCompleted(ref msg) => msg.session_nonce,
+		}
+	}
+}
+
+impl ServersSetChangeMessage {
+	pub fn session_id(&self) -> &SessionId {
+		match *self {
+			ServersSetChangeMessage::ServersSetChangeConsensusMessage(ref msg) => &msg.session,
+			ServersSetChangeMessage::UnknownSessionsRequest(ref msg) => &msg.session,
+			ServersSetChangeMessage::UnknownSessions(ref msg) => &msg.session,
+			ServersSetChangeMessage::ShareChangeKeyVersionNegotiation(ref msg) => &msg.session,
+			ServersSetChangeMessage::InitializeShareChangeSession(ref msg) => &msg.session,
+			ServersSetChangeMessage::ConfirmShareChangeSessionInitialization(ref msg) => &msg.session,
+			ServersSetChangeMessage::ServersSetChangeDelegate(ref msg) => &msg.session,
+			ServersSetChangeMessage::ServersSetChangeDelegateResponse(ref msg) => &msg.session,
+			ServersSetChangeMessage::ServersSetChangeShareAddMessage(ref msg) => &msg.session,
+			ServersSetChangeMessage::ServersSetChangeError(ref msg) => &msg.session,
+			ServersSetChangeMessage::ServersSetChangeCompleted(ref msg) => &msg.session,
+		}
+	}
+
+	pub fn session_nonce(&self) -> u64 {
+		match *self {
+			ServersSetChangeMessage::ServersSetChangeConsensusMessage(ref msg) => msg.session_nonce,
+			ServersSetChangeMessage::UnknownSessionsRequest(ref msg) => msg.session_nonce,
+			ServersSetChangeMessage::UnknownSessions(ref msg) => msg.session_nonce,
+			ServersSetChangeMessage::ShareChangeKeyVersionNegotiation(ref msg) => msg.session_nonce,
+			ServersSetChangeMessage::InitializeShareChangeSession(ref msg) => msg.session_nonce,
+			ServersSetChangeMessage::ConfirmShareChangeSessionInitialization(ref msg) => msg.session_nonce,
+			ServersSetChangeMessage::ServersSetChangeDelegate(ref msg) => msg.session_nonce,
+			ServersSetChangeMessage::ServersSetChangeDelegateResponse(ref msg) => msg.session_nonce,
+			ServersSetChangeMessage::ServersSetChangeShareAddMessage(ref msg) => msg.session_nonce,
+			ServersSetChangeMessage::ServersSetChangeError(ref msg) => msg.session_nonce,
+			ServersSetChangeMessage::ServersSetChangeCompleted(ref msg) => msg.session_nonce,
+		}
+	}
+}
+
+impl ShareAddMessage {
+	pub fn session_id(&self) -> &SessionId {
+		match *self {
+			ShareAddMessage::ShareAddConsensusMessage(ref msg) => &msg.session,
+			ShareAddMessage::KeyShareCommon(ref msg) => &msg.session,
+			ShareAddMessage::NewKeysDissemination(ref msg) => &msg.session,
+			ShareAddMessage::ShareAddError(ref msg) => &msg.session,
+		}
+	}
+
+	pub fn session_nonce(&self) -> u64 {
+		match *self {
+			ShareAddMessage::ShareAddConsensusMessage(ref msg) => msg.session_nonce,
+			ShareAddMessage::KeyShareCommon(ref msg) => msg.session_nonce,
+			ShareAddMessage::NewKeysDissemination(ref msg) => msg.session_nonce,
+			ShareAddMessage::ShareAddError(ref msg) => msg.session_nonce,
+		}
+	}
+}
+
+impl KeyVersionNegotiationMessage {
+	pub fn session_id(&self) -> &SessionId {
+		match *self {
+			KeyVersionNegotiationMessage::RequestKeyVersions(ref msg) => &msg.session,
+			KeyVersionNegotiationMessage::KeyVersions(ref msg) => &msg.session,
+			KeyVersionNegotiationMessage::KeyVersionsError(ref msg) => &msg.session,
+		}
+	}
+
+	pub fn sub_session_id(&self) -> &Secret {
+		match *self {
+			KeyVersionNegotiationMessage::RequestKeyVersions(ref msg) => &msg.sub_session,
+			KeyVersionNegotiationMessage::KeyVersions(ref msg) => &msg.sub_session,
+			KeyVersionNegotiationMessage::KeyVersionsError(ref msg) => &msg.sub_session,
+		}
+	}
+
+	pub fn session_nonce(&self) -> u64 {
+		match *self {
+			KeyVersionNegotiationMessage::RequestKeyVersions(ref msg) => msg.session_nonce,
+			KeyVersionNegotiationMessage::KeyVersions(ref msg) => msg.session_nonce,
+			KeyVersionNegotiationMessage::KeyVersionsError(ref msg) => msg.session_nonce,
 		}
 	}
 }
@@ -476,7 +1370,11 @@ impl fmt::Display for Message {
 			Message::Generation(ref message) => write!(f, "Generation.{}", message),
 			Message::Encryption(ref message) => write!(f, "Encryption.{}", message),
 			Message::Decryption(ref message) => write!(f, "Decryption.{}", message),
-			Message::Signing(ref message) => write!(f, "Signing.{}", message),
+			Message::SchnorrSigning(ref message) => write!(f, "SchnorrSigning.{}", message),
+			Message::EcdsaSigning(ref message) => write!(f, "EcdsaSigning.{}", message),
+			Message::ServersSetChange(ref message) => write!(f, "ServersSetChange.{}", message),
+			Message::ShareAdd(ref message) => write!(f, "ShareAdd.{}", message),
+			Message::KeyVersionNegotiation(ref message) => write!(f, "KeyVersionNegotiation.{}", message),
 		}
 	}
 }
@@ -520,7 +1418,25 @@ impl fmt::Display for ConsensusMessage {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match *self {
 			ConsensusMessage::InitializeConsensusSession(_) => write!(f, "InitializeConsensusSession"),
-			ConsensusMessage::ConfirmConsensusInitialization(_) => write!(f, "ConfirmConsensusInitialization"),
+			ConsensusMessage::ConfirmConsensusInitialization(ref msg) => write!(f, "ConfirmConsensusInitialization({})", msg.is_confirmed),
+		}
+	}
+}
+
+impl fmt::Display for ConsensusMessageWithServersSet {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match *self {
+			ConsensusMessageWithServersSet::InitializeConsensusSession(_) => write!(f, "InitializeConsensusSession"),
+			ConsensusMessageWithServersSet::ConfirmConsensusInitialization(ref msg) => write!(f, "ConfirmConsensusInitialization({})", msg.is_confirmed),
+		}
+	}
+}
+
+impl fmt::Display for ConsensusMessageOfShareAdd {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match *self {
+			ConsensusMessageOfShareAdd::InitializeConsensusSession(_) => write!(f, "InitializeConsensusSession"),
+			ConsensusMessageOfShareAdd::ConfirmConsensusInitialization(ref msg) => write!(f, "ConfirmConsensusInitialization({})", msg.is_confirmed),
 		}
 	}
 }
@@ -533,19 +1449,81 @@ impl fmt::Display for DecryptionMessage {
 			DecryptionMessage::PartialDecryption(_) => write!(f, "PartialDecryption"),
 			DecryptionMessage::DecryptionSessionError(_) => write!(f, "DecryptionSessionError"),
 			DecryptionMessage::DecryptionSessionCompleted(_) => write!(f, "DecryptionSessionCompleted"),
+			DecryptionMessage::DecryptionSessionDelegation(_) => write!(f, "DecryptionSessionDelegation"),
+			DecryptionMessage::DecryptionSessionDelegationCompleted(_) => write!(f, "DecryptionSessionDelegationCompleted"),
+		}
+	}
+}
+
+impl fmt::Display for SchnorrSigningMessage {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match *self {
+			SchnorrSigningMessage::SchnorrSigningConsensusMessage(ref m) => write!(f, "SchnorrSigningConsensusMessage.{}", m.message),
+			SchnorrSigningMessage::SchnorrSigningGenerationMessage(ref m) => write!(f, "SchnorrSigningGenerationMessage.{}", m.message),
+			SchnorrSigningMessage::SchnorrRequestPartialSignature(_) => write!(f, "SchnorrRequestPartialSignature"),
+			SchnorrSigningMessage::SchnorrPartialSignature(_) => write!(f, "SchnorrPartialSignature"),
+			SchnorrSigningMessage::SchnorrSigningSessionError(_) => write!(f, "SchnorrSigningSessionError"),
+			SchnorrSigningMessage::SchnorrSigningSessionCompleted(_) => write!(f, "SchnorrSigningSessionCompleted"),
+			SchnorrSigningMessage::SchnorrSigningSessionDelegation(_) => write!(f, "SchnorrSigningSessionDelegation"),
+			SchnorrSigningMessage::SchnorrSigningSessionDelegationCompleted(_) => write!(f, "SchnorrSigningSessionDelegationCompleted"),
+		}
+	}
+}
+
+impl fmt::Display for EcdsaSigningMessage {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match *self {
+			EcdsaSigningMessage::EcdsaSigningConsensusMessage(ref m) => write!(f, "EcdsaSigningConsensusMessage.{}", m.message),
+			EcdsaSigningMessage::EcdsaSignatureNonceGenerationMessage(ref m) => write!(f, "EcdsaSignatureNonceGenerationMessage.{}", m.message),
+			EcdsaSigningMessage::EcdsaInversionNonceGenerationMessage(ref m) => write!(f, "EcdsaInversionNonceGenerationMessage.{}", m.message),
+			EcdsaSigningMessage::EcdsaInversionZeroGenerationMessage(ref m) => write!(f, "EcdsaInversionZeroGenerationMessage.{}", m.message),
+			EcdsaSigningMessage::EcdsaSigningInversedNonceCoeffShare(_) => write!(f, "EcdsaSigningInversedNonceCoeffShare"),
+			EcdsaSigningMessage::EcdsaRequestPartialSignature(_) => write!(f, "EcdsaRequestPartialSignature"),
+			EcdsaSigningMessage::EcdsaPartialSignature(_) => write!(f, "EcdsaPartialSignature"),
+			EcdsaSigningMessage::EcdsaSigningSessionError(_) => write!(f, "EcdsaSigningSessionError"),
+			EcdsaSigningMessage::EcdsaSigningSessionCompleted(_) => write!(f, "EcdsaSigningSessionCompleted"),
+			EcdsaSigningMessage::EcdsaSigningSessionDelegation(_) => write!(f, "EcdsaSigningSessionDelegation"),
+			EcdsaSigningMessage::EcdsaSigningSessionDelegationCompleted(_) => write!(f, "EcdsaSigningSessionDelegationCompleted"),
+		}
+	}
+}
+
+impl fmt::Display for ServersSetChangeMessage {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match *self {
+			ServersSetChangeMessage::ServersSetChangeConsensusMessage(ref m) => write!(f, "ServersSetChangeConsensusMessage.{}", m.message),
+			ServersSetChangeMessage::UnknownSessionsRequest(_) => write!(f, "UnknownSessionsRequest"),
+			ServersSetChangeMessage::UnknownSessions(_) => write!(f, "UnknownSessions"),
+			ServersSetChangeMessage::ShareChangeKeyVersionNegotiation(ref m) => write!(f, "ShareChangeKeyVersionNegotiation.{}", m.message),
+			ServersSetChangeMessage::InitializeShareChangeSession(_) => write!(f, "InitializeShareChangeSession"),
+			ServersSetChangeMessage::ConfirmShareChangeSessionInitialization(_) => write!(f, "ConfirmShareChangeSessionInitialization"),
+			ServersSetChangeMessage::ServersSetChangeDelegate(_) => write!(f, "ServersSetChangeDelegate"),
+			ServersSetChangeMessage::ServersSetChangeDelegateResponse(_) => write!(f, "ServersSetChangeDelegateResponse"),
+			ServersSetChangeMessage::ServersSetChangeShareAddMessage(ref m) => write!(f, "ServersSetChangeShareAddMessage.{}", m.message),
+			ServersSetChangeMessage::ServersSetChangeError(_) => write!(f, "ServersSetChangeError"),
+			ServersSetChangeMessage::ServersSetChangeCompleted(_) => write!(f, "ServersSetChangeCompleted"),
+		}
+	}
+}
+
+impl fmt::Display for ShareAddMessage {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match *self {
+			ShareAddMessage::ShareAddConsensusMessage(ref m) => write!(f, "ShareAddConsensusMessage.{}", m.message),
+			ShareAddMessage::KeyShareCommon(_) => write!(f, "KeyShareCommon"),
+			ShareAddMessage::NewKeysDissemination(_) => write!(f, "NewKeysDissemination"),
+			ShareAddMessage::ShareAddError(_) => write!(f, "ShareAddError"),
+
 		}
 	}
 }
 
-impl fmt::Display for SigningMessage {
+impl fmt::Display for KeyVersionNegotiationMessage {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match *self {
-			SigningMessage::SigningConsensusMessage(ref m) => write!(f, "SigningConsensusMessage.{}", m.message),
-			SigningMessage::SigningGenerationMessage(ref m) => write!(f, "SigningGenerationMessage.{}", m.message),
-			SigningMessage::RequestPartialSignature(_) => write!(f, "RequestPartialSignature"),
-			SigningMessage::PartialSignature(_) => write!(f, "PartialSignature"),
-			SigningMessage::SigningSessionError(_) => write!(f, "SigningSessionError"),
-			SigningMessage::SigningSessionCompleted(_) => write!(f, "SigningSessionCompleted"),
+			KeyVersionNegotiationMessage::RequestKeyVersions(_) => write!(f, "RequestKeyVersions"),
+			KeyVersionNegotiationMessage::KeyVersions(_) => write!(f, "KeyVersions"),
+			KeyVersionNegotiationMessage::KeyVersionsError(_) => write!(f, "KeyVersionsError"),
 		}
 	}
 }
diff --git a/secret_store/src/key_server_cluster/mod.rs b/secret_store/src/key_server_cluster/mod.rs
index 4fcda153922562362c5973cd2430683be8b75fac..17334e838ae73db987160c89f3df969e6a408ae7 100644
--- a/secret_store/src/key_server_cluster/mod.rs
+++ b/secret_store/src/key_server_cluster/mod.rs
@@ -21,29 +21,29 @@ use ethcrypto;
 use super::types::all::ServerKeyId;
 
 pub use super::traits::NodeKeyPair;
-pub use super::types::all::{NodeId, EncryptedDocumentKeyShadow};
+pub use super::types::all::{NodeId, Requester, EncryptedDocumentKeyShadow};
 pub use super::acl_storage::AclStorage;
-pub use super::key_storage::{KeyStorage, DocumentKeyShare};
-pub use super::key_server_set::KeyServerSet;
-pub use super::serialization::{SerializableSignature, SerializableH256, SerializableSecret, SerializablePublic, SerializableMessageHash};
+pub use super::key_storage::{KeyStorage, DocumentKeyShare, DocumentKeyShareVersion};
+pub use super::key_server_set::{is_migration_required, KeyServerSet, KeyServerSetSnapshot, KeyServerSetMigration};
+pub use super::serialization::{SerializableSignature, SerializableH256, SerializableSecret, SerializablePublic,
+	SerializableRequester, SerializableMessageHash, SerializableAddress};
 pub use self::cluster::{ClusterCore, ClusterConfiguration, ClusterClient};
-pub use self::generation_session::Session as GenerationSession;
-pub use self::encryption_session::Session as EncryptionSession;
-pub use self::decryption_session::Session as DecryptionSession;
+pub use self::cluster_sessions::{ClusterSession, ClusterSessionsListener};
+#[cfg(test)]
+pub use self::cluster::tests::DummyClusterClient;
 
 #[cfg(test)]
 pub use super::node_key_pair::PlainNodeKeyPair;
 #[cfg(test)]
 pub use super::key_storage::tests::DummyKeyStorage;
-#[cfg(test)]
 pub use super::acl_storage::DummyAclStorage;
 #[cfg(test)]
 pub use super::key_server_set::tests::MapKeyServerSet;
 
 pub type SessionId = ServerKeyId;
 
-#[derive(Debug, Clone)]
 /// Session metadata.
+#[derive(Debug, Clone)]
 pub struct SessionMeta {
 	/// Key id.
 	pub id: SessionId,
@@ -55,8 +55,8 @@ pub struct SessionMeta {
 	pub threshold: usize,
 }
 
-#[derive(Clone, Debug, PartialEq)]
 /// Errors which can occur during encryption/decryption session
+#[derive(Clone, Debug, PartialEq)]
 pub enum Error {
 	/// Invalid node address has been passed.
 	InvalidNodeAddress,
@@ -90,8 +90,14 @@ pub enum Error {
 	/// Message or some data in the message was recognized as invalid.
 	/// This means that node is misbehaving/cheating.
 	InvalidMessage,
+	/// Message version is not supported.
+	InvalidMessageVersion,
+	/// Message is invalid because of replay-attack protection.
+	ReplayProtection,
 	/// Connection to node, required for this session is not established.
 	NodeDisconnected,
+	/// Node is missing requested key share.
+	MissingKeyShare,
 	/// Cryptographic error.
 	EthKey(String),
 	/// I/O error has occured.
@@ -104,6 +110,12 @@ pub enum Error {
 	ConsensusUnreachable,
 	/// Acl storage error.
 	AccessDenied,
+	/// Can't start session, because exclusive session is active.
+	ExclusiveSessionActive,
+	/// Can't start exclusive session, because there are other active sessions.
+	HasActiveSessions,
+	/// Insufficient requester data.
+	InsufficientRequesterData,
 }
 
 impl From<ethkey::Error> for Error {
@@ -140,13 +152,19 @@ impl fmt::Display for Error {
 			Error::InvalidStateForRequest => write!(f, "session is in invalid state for processing this request"),
 			Error::InvalidNodeForRequest => write!(f, "invalid node for this request"),
 			Error::InvalidMessage => write!(f, "invalid message is received"),
+			Error::InvalidMessageVersion => write!(f, "unsupported message is received"),
+			Error::ReplayProtection => write!(f, "replay message is received"),
 			Error::NodeDisconnected => write!(f, "node required for this operation is currently disconnected"),
+			Error::MissingKeyShare => write!(f, "requested key share version is not found"),
 			Error::EthKey(ref e) => write!(f, "cryptographic error {}", e),
 			Error::Io(ref e) => write!(f, "i/o error {}", e),
 			Error::Serde(ref e) => write!(f, "serde error {}", e),
 			Error::KeyStorage(ref e) => write!(f, "key storage error {}", e),
 			Error::ConsensusUnreachable => write!(f, "Consensus unreachable"),
 			Error::AccessDenied => write!(f, "Access denied"),
+			Error::ExclusiveSessionActive => write!(f, "Exclusive session active"),
+			Error::HasActiveSessions => write!(f, "Unable to start exclusive session"),
+			Error::InsufficientRequesterData => write!(f, "Insufficient requester data"),
 		}
 	}
 }
@@ -157,14 +175,27 @@ impl Into<String> for Error {
 	}
 }
 
+mod admin_sessions;
+mod client_sessions;
+
+pub use self::admin_sessions::key_version_negotiation_session;
+pub use self::admin_sessions::servers_set_change_session;
+pub use self::admin_sessions::share_add_session;
+pub use self::admin_sessions::share_change_session;
+
+pub use self::client_sessions::decryption_session;
+pub use self::client_sessions::encryption_session;
+pub use self::client_sessions::generation_session;
+pub use self::client_sessions::signing_session_ecdsa;
+pub use self::client_sessions::signing_session_schnorr;
+
 mod cluster;
 mod cluster_sessions;
-mod decryption_session;
-mod encryption_session;
-mod generation_session;
+mod cluster_sessions_creator;
+mod connection_trigger;
+mod connection_trigger_with_migration;
 mod io;
 mod jobs;
 pub mod math;
 mod message;
-mod signing_session;
 mod net;
diff --git a/secret_store/src/key_server_cluster/signing_session.rs b/secret_store/src/key_server_cluster/signing_session.rs
deleted file mode 100644
index e56306142a76ea497a1b6d77c2e034ad3d90b967..0000000000000000000000000000000000000000
--- a/secret_store/src/key_server_cluster/signing_session.rs
+++ /dev/null
@@ -1,706 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::collections::BTreeSet;
-use std::sync::Arc;
-use parking_lot::{Mutex, Condvar};
-use ethkey::{Public, Secret, Signature};
-use util::H256;
-use key_server_cluster::{Error, NodeId, SessionId, SessionMeta, AclStorage, DocumentKeyShare};
-use key_server_cluster::cluster::{Cluster};
-use key_server_cluster::cluster_sessions::ClusterSession;
-use key_server_cluster::generation_session::{SessionImpl as GenerationSession, SessionParams as GenerationSessionParams,
-	Session as GenerationSessionApi, SessionState as GenerationSessionState};
-use key_server_cluster::message::{Message, SigningMessage, SigningConsensusMessage, SigningGenerationMessage,
-	RequestPartialSignature, PartialSignature, SigningSessionCompleted, GenerationMessage, ConsensusMessage, SigningSessionError,
-	InitializeConsensusSession, ConfirmConsensusInitialization};
-use key_server_cluster::jobs::job_session::JobTransport;
-use key_server_cluster::jobs::signing_job::{PartialSigningRequest, PartialSigningResponse, SigningJob};
-use key_server_cluster::jobs::consensus_session::{ConsensusSessionParams, ConsensusSessionState, ConsensusSession};
-
-pub use key_server_cluster::decryption_session::DecryptionSessionId as SigningSessionId;
-
-/// Signing session API.
-pub trait Session: Send + Sync + 'static {
-	/// Wait until session is completed. Returns signed message.
-	fn wait(&self) -> Result<(Secret, Secret), Error>;
-}
-
-/// Distributed signing session.
-/// Based on "Efficient Multi-Party Digital Signature using Adaptive Secret Sharing for Low-Power Devices in Wireless Network" paper.
-/// Brief overview:
-/// 1) initialization: master node (which has received request for signing the message) requests all other nodes to sign the message
-/// 2) ACL check: all nodes which have received the request are querying ACL-contract to check if requestor has access to the private key
-/// 3) partial signing: every node which has succussfully checked access for the requestor do a partial signing
-/// 4) signing: master node receives all partial signatures of the secret and computes the signature
-pub struct SessionImpl {
-	/// Session core.
-	core: SessionCore,
-	/// Session data.
-	data: Mutex<SessionData>,
-}
-
-/// Immutable session data.
-struct SessionCore {
-	/// Session metadata.
-	pub meta: SessionMeta,
-	/// Signing session access key.
-	pub access_key: Secret,
-	/// Key share.
-	pub key_share: DocumentKeyShare,
-	/// Cluster which allows this node to send messages to other nodes in the cluster.
-	pub cluster: Arc<Cluster>,
-	/// SessionImpl completion condvar.
-	pub completed: Condvar,
-}
-
-/// Signing consensus session type.
-type SigningConsensusSession = ConsensusSession<SigningConsensusTransport, SigningJob, SigningJobTransport>;
-
-/// Mutable session data.
-struct SessionData {
-	/// Session state.
-	pub state: SessionState,
-	/// Message hash.
-	pub message_hash: Option<H256>,
-	/// Consensus-based signing session.
-	pub consensus_session: SigningConsensusSession,
-	/// Session key generation session.
-	pub generation_session: Option<GenerationSession>,
-	/// Decryption result.
-	pub result: Option<Result<(Secret, Secret), Error>>,
-}
-
-/// Signing session state.
-#[derive(Debug, PartialEq)]
-pub enum SessionState {
-	/// State when consensus is establishing.
-	ConsensusEstablishing,
-	/// State when session key is generating.
-	SessionKeyGeneration,
-	/// State when signature is computing.
-	SignatureComputing,
-}
-
-/// Session creation parameters
-pub struct SessionParams {
-	/// Session metadata.
-	pub meta: SessionMeta,
-	/// Session access key.
-	pub access_key: Secret,
-	/// Key share.
-	pub key_share: DocumentKeyShare,
-	/// ACL storage.
-	pub acl_storage: Arc<AclStorage>,
-	/// Cluster
-	pub cluster: Arc<Cluster>,
-}
-
-/// Signing consensus transport.
-struct SigningConsensusTransport {
-	/// Session id.
-	id: SessionId,
-	/// Session access key.
-	access_key: Secret,
-	/// Cluster.
-	cluster: Arc<Cluster>,
-}
-
-/// Signing key generation transport.
-struct SessionKeyGenerationTransport {
-	/// Session access key.
-	access_key: Secret,
-	/// Cluster.
-	cluster: Arc<Cluster>,
-	/// Other nodes ids.
-	other_nodes_ids: BTreeSet<NodeId>,
-}
-
-/// Signing job transport
-struct SigningJobTransport {
-	/// Session id.
-	id: SessionId,
-	//// Session access key.
-	access_key: Secret,
-	/// Cluster.
-	cluster: Arc<Cluster>,
-}
-
-impl SessionImpl {
-	/// Create new signing session.
-	pub fn new(params: SessionParams, requester_signature: Option<Signature>) -> Result<Self, Error> {
-		debug_assert_eq!(params.meta.threshold, params.key_share.threshold);
-		debug_assert_eq!(params.meta.self_node_id == params.meta.master_node_id, requester_signature.is_some());
-
-		use key_server_cluster::generation_session::{check_cluster_nodes, check_threshold};
-
-		// check nodes and threshold
-		let nodes = params.key_share.id_numbers.keys().cloned().collect();
-		check_cluster_nodes(&params.meta.self_node_id, &nodes)?;
-		check_threshold(params.key_share.threshold, &nodes)?;
-
-		let consensus_transport = SigningConsensusTransport {
-			id: params.meta.id.clone(),
-			access_key: params.access_key.clone(),
-			cluster: params.cluster.clone(),
-		};
-
-		Ok(SessionImpl {
-			core: SessionCore {
-				meta: params.meta.clone(),
-				access_key: params.access_key,
-				key_share: params.key_share,
-				cluster: params.cluster,
-				completed: Condvar::new(),
-			},
-			data: Mutex::new(SessionData {
-				state: SessionState::ConsensusEstablishing,
-				message_hash: None,
-				consensus_session: match requester_signature {
-					Some(requester_signature) => ConsensusSession::new_on_master(ConsensusSessionParams {
-						meta: params.meta,
-						acl_storage: params.acl_storage.clone(),
-						consensus_transport: consensus_transport,
-					}, requester_signature)?,
-					None => ConsensusSession::new_on_slave(ConsensusSessionParams {
-						meta: params.meta,
-						acl_storage: params.acl_storage.clone(),
-						consensus_transport: consensus_transport,
-					})?,
-				},
-				generation_session: None,
-				result: None,
-			}),
-		})
-	}
-
-	/// Initialize signing session on master node.
-	pub fn initialize(&self, message_hash: H256) -> Result<(), Error> {
-		let mut data = self.data.lock();
-		data.message_hash = Some(message_hash);
-		data.consensus_session.initialize(self.core.key_share.id_numbers.keys().cloned().collect())?;
-
-		if data.consensus_session.state() == ConsensusSessionState::ConsensusEstablished {
-			let generation_session = GenerationSession::new(GenerationSessionParams {
-				id: self.core.meta.id.clone(),
-				self_node_id: self.core.meta.self_node_id.clone(),
-				key_storage: None,
-				cluster: Arc::new(SessionKeyGenerationTransport {
-					access_key: self.core.access_key.clone(),
-					cluster: self.core.cluster.clone(),
-					other_nodes_ids: BTreeSet::new()
-				}),
-			});
-			generation_session.initialize(Public::default(), 0, vec![self.core.meta.self_node_id.clone()].into_iter().collect())?;
-
-			debug_assert_eq!(generation_session.state(), GenerationSessionState::WaitingForGenerationConfirmation);
-			let joint_public_and_secret = generation_session
-				.joint_public_and_secret()
-				.expect("session key is generated before signature is computed; we are in SignatureComputing state; qed")?;
-			data.generation_session = Some(generation_session);
-			data.state = SessionState::SignatureComputing;
-
-			self.core.disseminate_jobs(&mut data.consensus_session, joint_public_and_secret.0, joint_public_and_secret.1, message_hash)?;
-
-			debug_assert!(data.consensus_session.state() == ConsensusSessionState::Finished);
-			data.result = Some(Ok(data.consensus_session.result()?));
-			self.core.completed.notify_all();
-		}
-
-		Ok(())
-	}
-
-	/// Process signing message.
-	pub fn process_message(&self, sender: &NodeId, message: &SigningMessage) -> Result<(), Error> {
-		match message {
-			&SigningMessage::SigningConsensusMessage(ref message) =>
-				self.on_consensus_message(sender, message),
-			&SigningMessage::SigningGenerationMessage(ref message) =>
-				self.on_generation_message(sender, message),
-			&SigningMessage::RequestPartialSignature(ref message) => 
-				self.on_partial_signature_requested(sender, message),
-			&SigningMessage::PartialSignature(ref message) => 
-				self.on_partial_signature(sender, message),
-			&SigningMessage::SigningSessionError(ref message) => 
-				self.on_session_error(sender, message),
-			&SigningMessage::SigningSessionCompleted(ref message) => 
-				self.on_session_completed(sender, message),
-		}
-	}
-
-	/// When consensus-related message is received.
-	pub fn on_consensus_message(&self, sender: &NodeId, message: &SigningConsensusMessage) -> Result<(), Error> {
-		debug_assert!(self.core.meta.id == *message.session);
-		debug_assert!(self.core.access_key == *message.sub_session);
-		debug_assert!(sender != &self.core.meta.self_node_id);
-
-		let mut data = self.data.lock();
-		let is_establishing_consensus = data.consensus_session.state() == ConsensusSessionState::EstablishingConsensus;
-		data.consensus_session.on_consensus_message(&sender, &message.message)?;
-
-		let is_consensus_established = data.consensus_session.state() == ConsensusSessionState::ConsensusEstablished;
-		if self.core.meta.self_node_id != self.core.meta.master_node_id || !is_establishing_consensus || !is_consensus_established {
-			return Ok(());
-		}
-
-		let consensus_group = data.consensus_session.select_consensus_group()?.clone();
-		let mut other_consensus_group_nodes = consensus_group.clone();
-		other_consensus_group_nodes.remove(&self.core.meta.self_node_id);
-
-		let generation_session = GenerationSession::new(GenerationSessionParams {
-			id: self.core.meta.id.clone(),
-			self_node_id: self.core.meta.self_node_id.clone(),
-			key_storage: None,
-			cluster: Arc::new(SessionKeyGenerationTransport {
-				access_key: self.core.access_key.clone(),
-				cluster: self.core.cluster.clone(),
-				other_nodes_ids: other_consensus_group_nodes,
-			}),
-		});
-		generation_session.initialize(Public::default(), self.core.key_share.threshold, consensus_group)?;
-		data.generation_session = Some(generation_session);
-		data.state = SessionState::SessionKeyGeneration;
-
-		Ok(())
-	}
-
-	/// When session key related message is received.
-	pub fn on_generation_message(&self, sender: &NodeId, message: &SigningGenerationMessage) -> Result<(), Error> {
-		debug_assert!(self.core.meta.id == *message.session);
-		debug_assert!(self.core.access_key == *message.sub_session);
-		debug_assert!(sender != &self.core.meta.self_node_id);
-
-		let mut data = self.data.lock();
-
-		if let &GenerationMessage::InitializeSession(ref message) = &message.message {
-			if &self.core.meta.master_node_id != sender {
-				return Err(Error::InvalidMessage);
-			}
-
-			let consensus_group: BTreeSet<NodeId> = message.nodes.keys().cloned().map(Into::into).collect();
-			let mut other_consensus_group_nodes = consensus_group.clone();
-			other_consensus_group_nodes.remove(&self.core.meta.self_node_id);
-
-			let generation_session = GenerationSession::new(GenerationSessionParams {
-				id: self.core.meta.id.clone(),
-				self_node_id: self.core.meta.self_node_id.clone(),
-				key_storage: None,
-				cluster: Arc::new(SessionKeyGenerationTransport {
-					access_key: self.core.access_key.clone(),
-					cluster: self.core.cluster.clone(),
-					other_nodes_ids: other_consensus_group_nodes
-				}),
-			});
-			data.generation_session = Some(generation_session);
-			data.state = SessionState::SessionKeyGeneration;
-		}
-
-		{
-			let generation_session = data.generation_session.as_ref().ok_or(Error::InvalidStateForRequest)?;
-			let is_key_generating = generation_session.state() != GenerationSessionState::Finished;
-			generation_session.process_message(sender, &message.message)?;
-
-			let is_key_generated = generation_session.state() == GenerationSessionState::Finished;
-			if !is_key_generating || !is_key_generated {
-				return Ok(());
-			}
-		}
-
-		data.state = SessionState::SignatureComputing;
-		if self.core.meta.master_node_id != self.core.meta.self_node_id {
-			return Ok(());
-		}
-
-		let message_hash = data.message_hash
-			.expect("we are on master node; on master node message_hash is filled in initialize(); on_generation_message follows initialize; qed");
-		let joint_public_and_secret = data.generation_session.as_ref()
-			.expect("session key is generated before signature is computed; we are in SignatureComputing state; qed")
-			.joint_public_and_secret()
-			.expect("session key is generated before signature is computed; we are in SignatureComputing state; qed")?;
-		self.core.disseminate_jobs(&mut data.consensus_session, joint_public_and_secret.0, joint_public_and_secret.1, message_hash)
-	}
-
-	/// When partial signature is requested.
-	pub fn on_partial_signature_requested(&self, sender: &NodeId, message: &RequestPartialSignature) -> Result<(), Error> {
-		debug_assert!(self.core.meta.id == *message.session);
-		debug_assert!(self.core.access_key == *message.sub_session);
-		debug_assert!(sender != &self.core.meta.self_node_id);
-
-		let mut data = self.data.lock();
-
-		if sender != &self.core.meta.master_node_id {
-			return Err(Error::InvalidMessage);
-		}
-		if data.state != SessionState::SignatureComputing {
-			return Err(Error::InvalidStateForRequest);
-		}
-
-		let joint_public_and_secret = data.generation_session.as_ref()
-			.expect("session key is generated before signature is computed; we are in SignatureComputing state; qed")
-			.joint_public_and_secret()
-			.expect("session key is generated before signature is computed; we are in SignatureComputing state; qed")?;
-		let signing_job = SigningJob::new_on_slave(self.core.meta.self_node_id.clone(), self.core.key_share.clone(), joint_public_and_secret.0, joint_public_and_secret.1)?;
-		let signing_transport = self.core.signing_transport();
-
-		data.consensus_session.on_job_request(sender, PartialSigningRequest {
-			id: message.request_id.clone().into(),
-			message_hash: message.message_hash.clone().into(),
-			other_nodes_ids: message.nodes.iter().cloned().map(Into::into).collect(),
-		}, signing_job, signing_transport)
-	}
-
-	/// When partial signature is received.
-	pub fn on_partial_signature(&self, sender: &NodeId, message: &PartialSignature) -> Result<(), Error> {
-		debug_assert!(self.core.meta.id == *message.session);
-		debug_assert!(self.core.access_key == *message.sub_session);
-		debug_assert!(sender != &self.core.meta.self_node_id);
-
-		let mut data = self.data.lock();
-		data.consensus_session.on_job_response(sender, PartialSigningResponse {
-			request_id: message.request_id.clone().into(),
-			partial_signature: message.partial_signature.clone().into(),
-		})?;
-
-		if data.consensus_session.state() != ConsensusSessionState::Finished {
-			return Ok(());
-		}
-
-		self.core.cluster.broadcast(Message::Signing(SigningMessage::SigningSessionCompleted(SigningSessionCompleted {
-			session: self.core.meta.id.clone().into(),
-			sub_session: self.core.access_key.clone().into(),
-		})))?;
-
-		data.result = Some(Ok(data.consensus_session.result()?));
-		self.core.completed.notify_all();
-
-		Ok(())
-	}
-
-	/// When session is completed.
-	pub fn on_session_completed(&self, sender: &NodeId, message: &SigningSessionCompleted) -> Result<(), Error> {
-		debug_assert!(self.core.meta.id == *message.session);
-		debug_assert!(self.core.access_key == *message.sub_session);
-		debug_assert!(sender != &self.core.meta.self_node_id);
-
-		self.data.lock().consensus_session.on_session_completed(sender)
-	}
-
-	/// When error has occured on another node.
-	pub fn on_session_error(&self, sender: &NodeId, message: &SigningSessionError) -> Result<(), Error> {
-		self.process_node_error(Some(&sender), &message.error)
-	}
-
-	/// Process error from the other node.
-	fn process_node_error(&self, node: Option<&NodeId>, error: &String) -> Result<(), Error> {
-		let mut data = self.data.lock();
-		match {
-			match node {
-				Some(node) => data.consensus_session.on_node_error(node),
-				None => data.consensus_session.on_session_timeout(),
-			}
-		} {
-			Ok(false) => Ok(()),
-			Ok(true) => {
-				let message_hash = data.message_hash.as_ref().cloned()
-					.expect("on_node_error returned true; this means that jobs must be REsent; this means that jobs already have been sent; jobs are sent when message_hash.is_some(); qed");
-				let joint_public_and_secret = data.generation_session.as_ref()
-					.expect("on_node_error returned true; this means that jobs must be REsent; this means that jobs already have been sent; jobs are sent when message_hash.is_some(); qed")
-					.joint_public_and_secret()
-					.expect("on_node_error returned true; this means that jobs must be REsent; this means that jobs already have been sent; jobs are sent when message_hash.is_some(); qed")?;
-				let disseminate_result = self.core.disseminate_jobs(&mut data.consensus_session, joint_public_and_secret.0, joint_public_and_secret.1, message_hash);
-				match disseminate_result {
-					Ok(()) => Ok(()),
-					Err(err) => {
-						warn!("{}: signing session failed with error: {:?} from {:?}", &self.core.meta.self_node_id, error, node);
-
-						data.result = Some(Err(err.clone()));
-						self.core.completed.notify_all();
-						Err(err)
-					}
-				}
-			},
-			Err(err) => {
-				warn!("{}: signing session failed with error: {:?} from {:?}", &self.core.meta.self_node_id, error, node);
-
-				data.result = Some(Err(err.clone()));
-				self.core.completed.notify_all();
-				Err(err)
-			},
-		}
-	}
-}
-
-impl ClusterSession for SessionImpl {
-	fn is_finished(&self) -> bool {
-		let data = self.data.lock();
-		data.consensus_session.state() == ConsensusSessionState::Failed
-			|| data.consensus_session.state() == ConsensusSessionState::Finished
-	}
-
-	fn on_node_timeout(&self, node: &NodeId) {
-		// ignore error, only state matters
-		let _ = self.process_node_error(Some(node), &Error::NodeDisconnected.into());
-	}
-
-	fn on_session_timeout(&self) {
-		// ignore error, only state matters
-		let _ = self.process_node_error(None, &Error::NodeDisconnected.into());
-	}
-}
-
-impl Session for SessionImpl {
-	fn wait(&self) -> Result<(Secret, Secret), Error> {
-		let mut data = self.data.lock();
-		if !data.result.is_some() {
-			self.core.completed.wait(&mut data);
-		}
-
-		data.result.as_ref()
-			.expect("checked above or waited for completed; completed is only signaled when result.is_some(); qed")
-			.clone()
-	}
-}
-
-impl SessionKeyGenerationTransport {
-	fn map_message(&self, message: Message) -> Result<Message, Error> {
-		match message {
-			Message::Generation(message) => Ok(Message::Signing(SigningMessage::SigningGenerationMessage(SigningGenerationMessage {
-				session: message.session_id().clone().into(),
-				sub_session: self.access_key.clone().into(),
-				message: message,
-			}))),
-			_ => Err(Error::InvalidMessage),
-		}
-	}
-}
-
-impl Cluster for SessionKeyGenerationTransport {
-	fn broadcast(&self, message: Message) -> Result<(), Error> {
-		let message = self.map_message(message)?;
-		for to in &self.other_nodes_ids {
-			self.cluster.send(to, message.clone())?;
-		}
-		Ok(())
-	}
-
-	fn send(&self, to: &NodeId, message: Message) -> Result<(), Error> {
-		debug_assert!(self.other_nodes_ids.contains(to));
-		self.cluster.send(to, self.map_message(message)?)
-	}
-}
-
-impl SessionCore {
-	pub fn signing_transport(&self) -> SigningJobTransport {
-		SigningJobTransport {
-			id: self.meta.id.clone(),
-			access_key: self.access_key.clone(),
-			cluster: self.cluster.clone()
-		}
-	}
-
-	pub fn disseminate_jobs(&self, consensus_session: &mut SigningConsensusSession, session_public: Public, session_secret_share: Secret, message_hash: H256) -> Result<(), Error> {
-		let signing_job = SigningJob::new_on_master(self.meta.self_node_id.clone(), self.key_share.clone(), session_public, session_secret_share, message_hash)?;
-		consensus_session.disseminate_jobs(signing_job, self.signing_transport())
-	}
-}
-
-impl JobTransport for SigningConsensusTransport {
-	type PartialJobRequest=Signature;
-	type PartialJobResponse=bool;
-
-	fn send_partial_request(&self, node: &NodeId, request: Signature) -> Result<(), Error> {
-		self.cluster.send(node, Message::Signing(SigningMessage::SigningConsensusMessage(SigningConsensusMessage {
-			session: self.id.clone().into(),
-			sub_session: self.access_key.clone().into(),
-			message: ConsensusMessage::InitializeConsensusSession(InitializeConsensusSession {
-				requestor_signature: request.into(),
-			})
-		})))
-	}
-
-	fn send_partial_response(&self, node: &NodeId, response: bool) -> Result<(), Error> {
-		self.cluster.send(node, Message::Signing(SigningMessage::SigningConsensusMessage(SigningConsensusMessage {
-			session: self.id.clone().into(),
-			sub_session: self.access_key.clone().into(),
-			message: ConsensusMessage::ConfirmConsensusInitialization(ConfirmConsensusInitialization {
-				is_confirmed: response,
-			})
-		})))
-	}
-}
-
-impl JobTransport for SigningJobTransport {
-	type PartialJobRequest=PartialSigningRequest;
-	type PartialJobResponse=PartialSigningResponse;
-
-	fn send_partial_request(&self, node: &NodeId, request: PartialSigningRequest) -> Result<(), Error> {
-		self.cluster.send(node, Message::Signing(SigningMessage::RequestPartialSignature(RequestPartialSignature {
-			session: self.id.clone().into(),
-			sub_session: self.access_key.clone().into(),
-			request_id: request.id.into(),
-			message_hash: request.message_hash.into(),
-			nodes: request.other_nodes_ids.into_iter().map(Into::into).collect(),
-		})))
-	}
-
-	fn send_partial_response(&self, node: &NodeId, response: PartialSigningResponse) -> Result<(), Error> {
-		self.cluster.send(node, Message::Signing(SigningMessage::PartialSignature(PartialSignature {
-			session: self.id.clone().into(),
-			sub_session: self.access_key.clone().into(),
-			request_id: response.request_id.into(),
-			partial_signature: response.partial_signature.into(),
-		})))
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::sync::Arc;
-	use std::collections::{BTreeMap, VecDeque};
-	use ethkey::{self, Random, Generator, Public};
-	use util::H256;
-	use acl_storage::DummyAclStorage;
-	use key_server_cluster::{NodeId, SessionId, SessionMeta, Error, KeyStorage};
-	use key_server_cluster::cluster::tests::DummyCluster;
-	use key_server_cluster::generation_session::{Session as GenerationSession};
-	use key_server_cluster::generation_session::tests::MessageLoop as KeyGenerationMessageLoop;
-	use key_server_cluster::math;
-	use key_server_cluster::message::{Message, SigningMessage};
-	use key_server_cluster::signing_session::{Session, SessionImpl, SessionParams};
-
-	struct Node {
-		pub node_id: NodeId,
-		pub cluster: Arc<DummyCluster>,
-		pub session: SessionImpl,
-	}
-
-	struct MessageLoop {
-		pub session_id: SessionId,
-		pub nodes: BTreeMap<NodeId, Node>,
-		pub queue: VecDeque<(NodeId, NodeId, Message)>,
-	}
-
-	impl MessageLoop {
-		pub fn new(gl: &KeyGenerationMessageLoop) -> Self {
-			let mut nodes = BTreeMap::new();
-			let session_id = gl.session_id.clone();
-			let requester = Random.generate().unwrap();
-			let signature = Some(ethkey::sign(requester.secret(), &SessionId::default()).unwrap());
-			let master_node_id = gl.nodes.keys().nth(0).unwrap().clone();
-			for (i, (gl_node_id, gl_node)) in gl.nodes.iter().enumerate() {
-				let acl_storage = Arc::new(DummyAclStorage::default());
-				let cluster = Arc::new(DummyCluster::new(gl_node_id.clone()));
-				let session = SessionImpl::new(SessionParams {
-					meta: SessionMeta {
-						id: session_id.clone(),
-						self_node_id: gl_node_id.clone(),
-						master_node_id: master_node_id.clone(),
-						threshold: gl_node.key_storage.get(&session_id).unwrap().threshold,
-					},
-					access_key: "834cb736f02d9c968dfaf0c37658a1d86ff140554fc8b59c9fdad5a8cf810eec".parse().unwrap(),
-					key_share: gl_node.key_storage.get(&session_id).unwrap(),
-					acl_storage: acl_storage,
-					cluster: cluster.clone(),
-				}, if i == 0 { signature.clone() } else { None }).unwrap();
-				nodes.insert(gl_node_id.clone(), Node { node_id: gl_node_id.clone(), cluster: cluster, session: session });
-			}
-
-			let nodes_ids: Vec<_> = nodes.keys().cloned().collect();
-			for node in nodes.values() {
-				for node_id in &nodes_ids {
-					node.cluster.add_node(node_id.clone());
-				}
-			}
-
-			MessageLoop {
-				session_id: session_id,
-				nodes: nodes,
-				queue: VecDeque::new(),
-			}
-		}
-
-		pub fn master(&self) -> &SessionImpl {
-			&self.nodes.values().nth(0).unwrap().session
-		}
-
-		pub fn take_message(&mut self) -> Option<(NodeId, NodeId, Message)> {
-			self.nodes.values()
-				.filter_map(|n| n.cluster.take_message().map(|m| (n.node_id.clone(), m.0, m.1)))
-				.nth(0)
-				.or_else(|| self.queue.pop_front())
-		}
-
-		pub fn process_message(&mut self, mut msg: (NodeId, NodeId, Message)) -> Result<(), Error> {
-			let mut is_queued_message = false;
-			loop {
-				match {
-					match msg.2 {
-						Message::Signing(SigningMessage::SigningConsensusMessage(ref message)) => self.nodes[&msg.1].session.on_consensus_message(&msg.0, &message),
-						Message::Signing(SigningMessage::SigningGenerationMessage(ref message)) => self.nodes[&msg.1].session.on_generation_message(&msg.0, &message),
-						Message::Signing(SigningMessage::RequestPartialSignature(ref message)) => self.nodes[&msg.1].session.on_partial_signature_requested(&msg.0, &message),
-						Message::Signing(SigningMessage::PartialSignature(ref message)) => self.nodes[&msg.1].session.on_partial_signature(&msg.0, &message),
-						Message::Signing(SigningMessage::SigningSessionCompleted(ref message)) => self.nodes[&msg.1].session.on_session_completed(&msg.0, &message),
-						_ => panic!("unexpected"),
-					}
-				} {
-					Ok(_) => {
-						if let Some(message) = self.queue.pop_front() {
-							msg = message;
-							is_queued_message = true;
-							continue;
-						}
-						return Ok(());
-					},
-					Err(Error::TooEarlyForRequest) => {
-						if is_queued_message {
-							self.queue.push_front(msg);
-						} else {
-							self.queue.push_back(msg);
-						}
-						return Ok(());
-					},
-					Err(err) => return Err(err),
-				}
-			}
-		}
-	}
-
-	#[test]
-	fn complete_gen_sign_session() {
-		let test_cases = [(0, 1), (0, 5), (2, 5), (3, 5)];
-		for &(threshold, num_nodes) in &test_cases {
-			// run key generation sessions
-			let mut gl = KeyGenerationMessageLoop::new(num_nodes);
-			gl.master().initialize(Public::default(), threshold, gl.nodes.keys().cloned().collect()).unwrap();
-			while let Some((from, to, message)) = gl.take_message() {
-				gl.process_message((from, to, message)).unwrap();
-			}
-
-			// run signing session
-			let message_hash = H256::from(777);
-			let mut sl = MessageLoop::new(&gl);
-			sl.master().initialize(message_hash).unwrap();
-			while let Some((from, to, message)) = sl.take_message() {
-				sl.process_message((from, to, message)).unwrap();
-			}
-
-			// verify signature
-			let public = gl.master().joint_public_and_secret().unwrap().unwrap().0;
-			let signature = sl.master().wait().unwrap();
-			assert!(math::verify_signature(&public, &signature, &message_hash).unwrap());
-		}
-	}
-}
diff --git a/secret_store/src/key_server_set.rs b/secret_store/src/key_server_set.rs
index e17dceed50ed8390f9217e512f3fa3e950578d9d..f069368b044d237c9cfa342572aed384773395c5 100644
--- a/secret_store/src/key_server_set.rs
+++ b/secret_store/src/key_server_set.rs
@@ -14,33 +14,77 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::sync::{Arc, Weak};
+use std::sync::Arc;
 use std::net::SocketAddr;
-use std::collections::BTreeMap;
-use futures::{future, Future};
+use std::collections::{BTreeMap, HashSet};
 use parking_lot::Mutex;
+use ethcore::client::{Client, BlockChainClient, BlockId, ChainNotify, CallContract, RegistryInfo};
 use ethcore::filter::Filter;
-use ethcore::client::{Client, BlockChainClient, BlockId, ChainNotify};
-use native_contracts::KeyServerSet as KeyServerSetContract;
-use util::{H256, Address, Bytes, Hashable};
-use types::all::{Error, Public, NodeAddress};
+use ethkey::public_to_address;
+use hash::keccak;
+use ethereum_types::{H256, Address};
+use bytes::Bytes;
+use types::all::{Error, Public, NodeAddress, NodeId};
+use trusted_client::TrustedClient;
+use {NodeKeyPair};
 
+use_contract!(key_server, "KeyServerSet", "res/key_server_set.json");
+
+/// Name of KeyServerSet contract in registry.
 const KEY_SERVER_SET_CONTRACT_REGISTRY_NAME: &'static str = "secretstore_server_set";
+/// Number of blocks (since latest new_set change) required before actually starting migration.
+const MIGRATION_CONFIRMATIONS_REQUIRED: u64 = 5;
+/// Number of blocks before the same-migration transaction (be it start or confirmation) will be retried.
+const TRANSACTION_RETRY_INTERVAL_BLOCKS: u64 = 30;
 
 /// Key server has been added to the set.
 const ADDED_EVENT_NAME: &'static [u8] = &*b"KeyServerAdded(address)";
 /// Key server has been removed from the set.
 const REMOVED_EVENT_NAME: &'static [u8] = &*b"KeyServerRemoved(address)";
+/// Migration has started.
+const MIGRATION_STARTED_EVENT_NAME: &'static [u8] = &*b"MigrationStarted()";
+/// Migration has completed.
+const MIGRATION_COMPLETED_EVENT_NAME: &'static [u8] = &*b"MigrationCompleted()";
 
 lazy_static! {
-	static ref ADDED_EVENT_NAME_HASH: H256 = ADDED_EVENT_NAME.sha3();
-	static ref REMOVED_EVENT_NAME_HASH: H256 = REMOVED_EVENT_NAME.sha3();
+	static ref ADDED_EVENT_NAME_HASH: H256 = keccak(ADDED_EVENT_NAME);
+	static ref REMOVED_EVENT_NAME_HASH: H256 = keccak(REMOVED_EVENT_NAME);
+	static ref MIGRATION_STARTED_EVENT_NAME_HASH: H256 = keccak(MIGRATION_STARTED_EVENT_NAME);
+	static ref MIGRATION_COMPLETED_EVENT_NAME_HASH: H256 = keccak(MIGRATION_COMPLETED_EVENT_NAME);
+}
+
+#[derive(Default, Debug, Clone, PartialEq)]
+/// Key Server Set state.
+pub struct KeyServerSetSnapshot {
+	/// Current set of key servers.
+	pub current_set: BTreeMap<NodeId, SocketAddr>,
+	/// New set of key servers.
+	pub new_set: BTreeMap<NodeId, SocketAddr>,
+	/// Current migration data.
+	pub migration: Option<KeyServerSetMigration>,
+}
+
+#[derive(Default, Debug, Clone, PartialEq)]
+/// Key server set migration.
+pub struct KeyServerSetMigration {
+	/// Migration id.
+	pub id: H256,
+	/// Migration set of key servers. It is the new_set at the moment of migration start.
+	pub set: BTreeMap<NodeId, SocketAddr>,
+	/// Master node of the migration process.
+	pub master: NodeId,
+	/// Is migration confirmed by this node?
+	pub is_confirmed: bool,
 }
 
-/// Key Server set
+/// Key Server Set
 pub trait KeyServerSet: Send + Sync {
-	/// Get set of configured key servers
-	fn get(&self) -> BTreeMap<Public, SocketAddr>;
+	/// Get server set state.
+	fn snapshot(&self) -> KeyServerSetSnapshot;
+	/// Start migration.
+	fn start_migration(&self, migration_id: H256);
+	/// Confirm migration.
+	fn confirm_migration(&self, migration_id: H256);
 }
 
 /// On-chain Key Server set implementation.
@@ -49,37 +93,70 @@ pub struct OnChainKeyServerSet {
 	contract: Mutex<CachedContract>,
 }
 
+#[derive(Default, Debug, Clone, PartialEq)]
+/// Non-finalized new_set.
+struct FutureNewSet {
+	/// New servers set.
+	pub new_set: BTreeMap<NodeId, SocketAddr>,
+	/// Hash of block, when this set has appeared for first time.
+	pub block: H256,
+}
+
+#[derive(Default, Debug, Clone, PartialEq)]
+/// Migration-related transaction information.
+struct PreviousMigrationTransaction {
+	/// Migration id.
+	pub migration_id: H256,
+	/// Latest actual block number at the time this transaction has been sent.
+	pub block: u64,
+}
+
 /// Cached on-chain Key Server set contract.
 struct CachedContract {
 	/// Blockchain client.
-	client: Weak<Client>,
+	client: TrustedClient,
 	/// Contract address.
-	contract_addr: Option<Address>,
-	/// Active set of key servers.
-	key_servers: BTreeMap<Public, SocketAddr>,
+	contract_address: Option<Address>,
+	/// Contract interface.
+	contract: key_server::KeyServerSet,
+	/// Is auto-migrate enabled?
+	auto_migrate_enabled: bool,
+	/// Current contract state.
+	snapshot: KeyServerSetSnapshot,
+	/// Scheduled contract state (if any).
+	future_new_set: Option<FutureNewSet>,
+	/// Previous start migration transaction.
+	start_migration_tx: Option<PreviousMigrationTransaction>,
+	/// Previous confirm migration transaction.
+	confirm_migration_tx: Option<PreviousMigrationTransaction>,
+	/// This node key pair.
+	self_key_pair: Arc<NodeKeyPair>,
 }
 
 impl OnChainKeyServerSet {
-	pub fn new(client: &Arc<Client>, key_servers: BTreeMap<Public, NodeAddress>) -> Result<Arc<Self>, Error> {
-		let mut cached_contract = CachedContract::new(client, key_servers)?;
-		let key_server_contract_address = client.registry_address(KEY_SERVER_SET_CONTRACT_REGISTRY_NAME.to_owned());
-		// only initialize from contract if it is installed. otherwise - use default nodes
-		// once the contract is installed, all default nodes are lost (if not in the contract' set)
-		if key_server_contract_address.is_some() {
-			cached_contract.read_from_registry(&*client, key_server_contract_address);
-		}
-
+	pub fn new(trusted_client: TrustedClient, self_key_pair: Arc<NodeKeyPair>, auto_migrate_enabled: bool, key_servers: BTreeMap<Public, NodeAddress>) -> Result<Arc<Self>, Error> {
+		let client = trusted_client.get_untrusted();
 		let key_server_set = Arc::new(OnChainKeyServerSet {
-			contract: Mutex::new(cached_contract),
+			contract: Mutex::new(CachedContract::new(trusted_client, self_key_pair, auto_migrate_enabled, key_servers)?),
 		});
-		client.add_notify(key_server_set.clone());
+		client
+			.ok_or(Error::Internal("Constructing OnChainKeyServerSet without active Client".into()))?
+			.add_notify(key_server_set.clone());
 		Ok(key_server_set)
 	}
 }
 
 impl KeyServerSet for OnChainKeyServerSet {
-	fn get(&self) -> BTreeMap<Public, SocketAddr> {
-		self.contract.lock().get()
+	fn snapshot(&self) -> KeyServerSetSnapshot {
+		self.contract.lock().snapshot()
+	}
+
+	fn start_migration(&self, migration_id: H256) {
+		self.contract.lock().start_migration(migration_id)
+	}
+
+	fn confirm_migration(&self, migration_id: H256) {
+		self.contract.lock().confirm_migration(migration_id);
 	}
 }
 
@@ -91,97 +168,435 @@ impl ChainNotify for OnChainKeyServerSet {
 	}
 }
 
+trait KeyServerSubset<F: Fn(Vec<u8>) -> Result<Vec<u8>, String>> {
+	fn read_list(&self, f: &F) -> Result<Vec<Address>, String>;
+
+	fn read_public(&self, address: Address, f: &F) -> Result<Bytes, String>;
+
+	fn read_address(&self, address: Address, f: &F) -> Result<String, String>;
+}
+
+#[derive(Default)]
+struct CurrentKeyServerSubset {
+	read_list: key_server::functions::GetCurrentKeyServers,
+	read_public: key_server::functions::GetCurrentKeyServerPublic,
+	read_address: key_server::functions::GetCurrentKeyServerAddress,
+}
+
+impl <F: Fn(Vec<u8>) -> Result<Vec<u8>, String>> KeyServerSubset<F> for CurrentKeyServerSubset {
+	fn read_list(&self, f: &F) -> Result<Vec<Address>, String> {
+		self.read_list.call(f).map_err(|e| e.to_string())
+	}
+
+	fn read_public(&self, address: Address, f: &F) -> Result<Bytes, String> {
+		self.read_public.call(address, f).map_err(|e| e.to_string())
+	}
+
+	fn read_address(&self, address: Address, f: &F) -> Result<String, String> {
+		self.read_address.call(address, f).map_err(|e| e.to_string())
+	}
+}
+
+#[derive(Default)]
+struct MigrationKeyServerSubset {
+	read_list: key_server::functions::GetMigrationKeyServers,
+	read_public: key_server::functions::GetMigrationKeyServerPublic,
+	read_address: key_server::functions::GetMigrationKeyServerAddress,
+}
+
+impl <F: Fn(Vec<u8>) -> Result<Vec<u8>, String>> KeyServerSubset<F> for MigrationKeyServerSubset {
+	fn read_list(&self, f: &F) -> Result<Vec<Address>, String> {
+		self.read_list.call(f).map_err(|e| e.to_string())
+	}
+
+	fn read_public(&self, address: Address, f: &F) -> Result<Bytes, String> {
+		self.read_public.call(address, f).map_err(|e| e.to_string())
+	}
+
+	fn read_address(&self, address: Address, f: &F) -> Result<String, String> {
+		self.read_address.call(address, f).map_err(|e| e.to_string())
+	}
+}
+
+#[derive(Default)]
+struct NewKeyServerSubset {
+	read_list: key_server::functions::GetNewKeyServers,
+	read_public: key_server::functions::GetNewKeyServerPublic,
+	read_address: key_server::functions::GetNewKeyServerAddress,
+}
+
+impl <F: Fn(Vec<u8>) -> Result<Vec<u8>, String>> KeyServerSubset<F> for NewKeyServerSubset {
+	fn read_list(&self, f: &F) -> Result<Vec<Address>, String> {
+		self.read_list.call(f).map_err(|e| e.to_string())
+	}
+
+	fn read_public(&self, address: Address, f: &F) -> Result<Bytes, String> {
+		self.read_public.call(address, f).map_err(|e| e.to_string())
+	}
+
+	fn read_address(&self, address: Address, f: &F) -> Result<String, String> {
+		self.read_address.call(address, f).map_err(|e| e.to_string())
+	}
+}
+
 impl CachedContract {
-	pub fn new(client: &Arc<Client>, key_servers: BTreeMap<Public, NodeAddress>) -> Result<Self, Error> {
+	pub fn new(client: TrustedClient, self_key_pair: Arc<NodeKeyPair>, auto_migrate_enabled: bool, key_servers: BTreeMap<Public, NodeAddress>) -> Result<Self, Error> {
+		let server_set = key_servers.into_iter()
+			.map(|(p, addr)| {
+				let addr = format!("{}:{}", addr.address, addr.port).parse()
+					.map_err(|err| Error::Internal(format!("error parsing node address: {}", err)))?;
+				Ok((p, addr))
+			})
+			.collect::<Result<BTreeMap<_, _>, Error>>()?;
 		Ok(CachedContract {
-			client: Arc::downgrade(client),
-			contract_addr: None,
-			key_servers: key_servers.into_iter()
-				.map(|(p, addr)| {
-					let addr = format!("{}:{}", addr.address, addr.port).parse()
-						.map_err(|err| Error::Internal(format!("error parsing node address: {}", err)))?;
-					Ok((p, addr))
-				})
-				.collect::<Result<BTreeMap<_, _>, Error>>()?,
+			client: client,
+			contract_address: None,
+			contract: key_server::KeyServerSet::default(),
+			auto_migrate_enabled: auto_migrate_enabled,
+			future_new_set: None,
+			confirm_migration_tx: None,
+			start_migration_tx: None,
+			snapshot: KeyServerSetSnapshot {
+				current_set: server_set.clone(),
+				new_set: server_set,
+				..Default::default()
+			},
+			self_key_pair: self_key_pair,
 		})
 	}
 
 	pub fn update(&mut self, enacted: Vec<H256>, retracted: Vec<H256>) {
-		if let Some(client) = self.client.upgrade() {
-			let new_contract_addr = client.registry_address(KEY_SERVER_SET_CONTRACT_REGISTRY_NAME.to_owned());
+		if let Some(client) = self.client.get() {
+			// read new snapshot from reqistry (if something has chnaged)
+			self.read_from_registry_if_required(&*client, enacted, retracted);
+
+			// update number of confirmations (if there's future new set)
+			self.update_number_of_confirmations_if_required(&*client);
+		}
+	}
+
+	fn snapshot(&self) -> KeyServerSetSnapshot {
+		self.snapshot.clone()
+	}
+
+	fn start_migration(&mut self, migration_id: H256) {
+		// trust is not needed here, because it is the reaction to the read of the trusted client
+		if let (Some(client), Some(contract_address)) = (self.client.get_untrusted(), self.contract_address.as_ref()) {
+			// check if we need to send start migration transaction
+			if !update_last_transaction_block(&*client, &migration_id, &mut self.start_migration_tx) {
+				return;
+			}
+
+			// prepare transaction data
+			let transaction_data = self.contract.functions().start_migration().input(migration_id);
 
-			// new contract installed => read nodes set from the contract
-			if self.contract_addr.as_ref() != new_contract_addr.as_ref() {
-				self.read_from_registry(&*client, new_contract_addr);
+			// send transaction
+			if let Err(error) = client.transact_contract(*contract_address, transaction_data) {
+				warn!(target: "secretstore_net", "{}: failed to submit auto-migration start transaction: {}",
+					self.self_key_pair.public(), error);
+			} else {
+				trace!(target: "secretstore_net", "{}: sent auto-migration start transaction",
+					self.self_key_pair.public());
+			}
+		}
+	}
+
+	fn confirm_migration(&mut self, migration_id: H256) {
+		// trust is not needed here, because we have already completed the action
+		if let (Some(client), Some(contract_address)) = (self.client.get(), self.contract_address) {
+			// check if we need to send start migration transaction
+			if !update_last_transaction_block(&*client, &migration_id, &mut self.confirm_migration_tx) {
 				return;
 			}
 
-			// check for contract events
-			let is_set_changed = self.contract_addr.is_some() && enacted.iter()
-				.chain(retracted.iter())
-				.any(|block_hash| !client.logs(Filter {
-					from_block: BlockId::Hash(block_hash.clone()),
-					to_block: BlockId::Hash(block_hash.clone()),
-					address: self.contract_addr.clone().map(|a| vec![a]),
-					topics: vec![
-						Some(vec![*ADDED_EVENT_NAME_HASH, *REMOVED_EVENT_NAME_HASH]),
-						None,
-						None,
-						None,
-					],
-					limit: Some(1),
-				}).is_empty());
-			// to simplify processing - just re-read the whole nodes set from the contract
-			if is_set_changed {
-				self.read_from_registry(&*client, new_contract_addr);
+			// prepare transaction data
+			let transaction_data = self.contract.functions().confirm_migration().input(migration_id);
+
+			// send transaction
+			if let Err(error) = client.transact_contract(contract_address, transaction_data) {
+				warn!(target: "secretstore_net", "{}: failed to submit auto-migration confirmation transaction: {}",
+					self.self_key_pair.public(), error);
+			} else {
+				trace!(target: "secretstore_net", "{}: sent auto-migration confirm transaction",
+					self.self_key_pair.public());
 			}
 		}
 	}
 
-	pub fn get(&self) -> BTreeMap<Public, SocketAddr> {
-		self.key_servers.clone()
+	fn read_from_registry_if_required(&mut self, client: &Client, enacted: Vec<H256>, retracted: Vec<H256>) {
+		// read new contract from registry
+		let new_contract_addr = client.registry_address(KEY_SERVER_SET_CONTRACT_REGISTRY_NAME.to_owned(), BlockId::Latest);
+
+		// new contract installed => read nodes set from the contract
+		if self.contract_address.as_ref() != new_contract_addr.as_ref() {
+			self.read_from_registry(&*client, new_contract_addr);
+			return;
+		}
+
+		// check for contract events
+		let is_set_changed = self.contract_address.is_some() && enacted.iter()
+			.chain(retracted.iter())
+			.any(|block_hash| !client.logs(Filter {
+				from_block: BlockId::Hash(block_hash.clone()),
+				to_block: BlockId::Hash(block_hash.clone()),
+				address: self.contract_address.map(|address| vec![address]),
+				topics: vec![
+					Some(vec![*ADDED_EVENT_NAME_HASH, *REMOVED_EVENT_NAME_HASH,
+						*MIGRATION_STARTED_EVENT_NAME_HASH, *MIGRATION_COMPLETED_EVENT_NAME_HASH]),
+					None,
+					None,
+					None,
+				],
+				limit: Some(1),
+			}).is_empty());
+
+		// to simplify processing - just re-read the whole nodes set from the contract
+		if is_set_changed {
+			self.read_from_registry(&*client, new_contract_addr);
+		}
 	}
 
 	fn read_from_registry(&mut self, client: &Client, new_contract_address: Option<Address>) {
-		self.key_servers = new_contract_address.map(|contract_addr| {
+		if let Some(ref contract_addr) = new_contract_address {
 			trace!(target: "secretstore", "Configuring for key server set contract from {}", contract_addr);
+		}
+		self.contract_address = new_contract_address;
 
-			KeyServerSetContract::new(contract_addr)
-		})
-		.map(|contract| {
-			let mut key_servers = BTreeMap::new();
-			let do_call = |a, d| future::done(client.call_contract(BlockId::Latest, a, d));
-			let key_servers_list = contract.get_key_servers(do_call).wait()
-				.map_err(|err| { trace!(target: "secretstore", "Error {} reading list of key servers from contract", err); err })
-				.unwrap_or_default();
-			for key_server in key_servers_list {
-				let key_server_public = contract.get_key_server_public(
-					|a, d| future::done(client.call_contract(BlockId::Latest, a, d)), key_server).wait()
-					.and_then(|p| if p.len() == 64 { Ok(Public::from_slice(&p)) } else { Err(format!("Invalid public length {}", p.len())) });
-				let key_server_ip = contract.get_key_server_address(
-					|a, d| future::done(client.call_contract(BlockId::Latest, a, d)), key_server).wait()
-					.and_then(|a| a.parse().map_err(|e| format!("Invalid ip address: {}", e)));
-
-				// only add successfully parsed nodes
-				match (key_server_public, key_server_ip) {
-					(Ok(key_server_public), Ok(key_server_ip)) => { key_servers.insert(key_server_public, key_server_ip); },
-					(Err(public_err), _) => warn!(target: "secretstore_net", "received invalid public from key server set contract: {}", public_err),
-					(_, Err(ip_err)) => warn!(target: "secretstore_net", "received invalid IP from key server set contract: {}", ip_err),
-				}
+		let contract_address = match self.contract_address {
+			Some(contract_address) => contract_address,
+			None => {
+				// no contract installed => empty snapshot
+				// WARNING: after restart current_set will be reset to the set from configuration file
+				// even though we have reset to empty set here. We are not considerning this as an issue
+				// because it is actually the issue of administrator.
+				self.snapshot = Default::default();
+				self.future_new_set = None;
+				return;
+			},
+		};
+
+		let do_call = |data| client.call_contract(BlockId::Latest, contract_address, data);
+
+		let current_set = Self::read_key_server_set(CurrentKeyServerSubset::default(), &do_call);
+
+		// read migration-related data if auto migration is enabled
+		let (new_set, migration) = match self.auto_migrate_enabled {
+			true => {
+				let new_set = Self::read_key_server_set(NewKeyServerSubset::default(), &do_call);
+				let migration_set = Self::read_key_server_set(MigrationKeyServerSubset::default(), &do_call);
+
+				let migration_id = match migration_set.is_empty() {
+					false => self.contract.functions().get_migration_id().call(&do_call)
+						.map_err(|err| { trace!(target: "secretstore", "Error {} reading migration id from contract", err); err })
+						.ok(),
+					true => None,
+				};
+
+				let migration_master = match migration_set.is_empty() {
+					false => self.contract.functions().get_migration_master().call(&do_call)
+						.map_err(|err| { trace!(target: "secretstore", "Error {} reading migration master from contract", err); err })
+						.ok()
+						.and_then(|address| current_set.keys().chain(migration_set.keys())
+							.find(|public| public_to_address(public) == address)
+							.cloned()),
+					true => None,
+				};
+
+				let is_migration_confirmed = match migration_set.is_empty() {
+					false if current_set.contains_key(self.self_key_pair.public()) || migration_set.contains_key(self.self_key_pair.public()) =>
+						self.contract.functions().is_migration_confirmed().call(self.self_key_pair.address(), &do_call)
+							.map_err(|err| { trace!(target: "secretstore", "Error {} reading migration confirmation from contract", err); err })
+							.ok(),
+					_ => None,
+				};
+
+				let migration = match (migration_set.is_empty(), migration_id, migration_master, is_migration_confirmed) {
+					(false, Some(migration_id), Some(migration_master), Some(is_migration_confirmed)) =>
+						Some(KeyServerSetMigration {
+							id: migration_id,
+							master: migration_master,
+							set: migration_set,
+							is_confirmed: is_migration_confirmed,
+						}),
+					_ => None,
+				};
+
+				(new_set, migration)
 			}
-			key_servers
-		})
-		.unwrap_or_default();
-		self.contract_addr = new_contract_address;
+			false => (current_set.clone(), None),
+		};
+
+		let mut new_snapshot = KeyServerSetSnapshot {
+			current_set: current_set,
+			new_set: new_set,
+			migration: migration,
+		};
+
+		// we might want to adjust new_set if auto migration is enabled
+		if self.auto_migrate_enabled {
+			let block = client.block_hash(BlockId::Latest).unwrap_or_default();
+			update_future_set(&mut self.future_new_set, &mut new_snapshot, block);
+		}
+
+		self.snapshot = new_snapshot;
+	}
+
+	fn read_key_server_set<T, F>(subset: T, do_call: F) -> BTreeMap<Public, SocketAddr>
+		where
+			T: KeyServerSubset<F>,
+			F: Fn(Vec<u8>) -> Result<Vec<u8>, String> {
+		let mut key_servers = BTreeMap::new();
+		let mut key_servers_addresses = HashSet::new();
+		let key_servers_list = subset.read_list(&do_call)
+			.map_err(|err| { warn!(target: "secretstore_net", "error {} reading list of key servers from contract", err); err })
+			.unwrap_or_default();
+		for key_server in key_servers_list {
+			let key_server_public = subset.read_public(key_server, &do_call)
+				.and_then(|p| if p.len() == 64 { Ok(Public::from_slice(&p)) } else { Err(format!("Invalid public length {}", p.len())) });
+			let key_server_address: Result<SocketAddr, _> = subset.read_address(key_server, &do_call)
+				.and_then(|a| a.parse().map_err(|e| format!("Invalid ip address: {}", e)));
+
+			// only add successfully parsed nodes
+			match (key_server_public, key_server_address) {
+				(Ok(key_server_public), Ok(key_server_address)) => {
+					if !key_servers_addresses.insert(key_server_address.clone()) {
+						warn!(target: "secretstore_net", "the same address ({}) specified twice in list of contracts. Ignoring server {}",
+							key_server_address, key_server_public);
+						continue;
+					}
+
+					key_servers.insert(key_server_public, key_server_address);
+				},
+				(Err(public_err), _) => warn!(target: "secretstore_net", "received invalid public from key server set contract: {}", public_err),
+				(_, Err(ip_err)) => warn!(target: "secretstore_net", "received invalid IP from key server set contract: {}", ip_err),
+			}
+		}
+		key_servers
+	}
+
+	fn update_number_of_confirmations_if_required(&mut self, client: &BlockChainClient) {
+		if !self.auto_migrate_enabled {
+			return;
+		}
+
+		update_number_of_confirmations(
+			&|| latest_block_hash(&*client),
+			&|block| block_confirmations(&*client, block),
+			&mut self.future_new_set, &mut self.snapshot);
+	}
+}
+
+/// Check if two sets are equal (in terms of migration requirements). We do not need migration if only
+/// addresses are changed - simply adjusting connections is enough in this case.
+pub fn is_migration_required(current_set: &BTreeMap<NodeId, SocketAddr>, new_set: &BTreeMap<NodeId, SocketAddr>) -> bool {
+	let no_nodes_removed = current_set.keys().all(|n| new_set.contains_key(n));
+	let no_nodes_added = new_set.keys().all(|n| current_set.contains_key(n));
+	!no_nodes_removed || !no_nodes_added
+}
+
+fn update_future_set(future_new_set: &mut Option<FutureNewSet>, new_snapshot: &mut KeyServerSetSnapshot, block: H256) {
+	// migration has already started => no need to delay visibility
+	if new_snapshot.migration.is_some() {
+		*future_new_set = None;
+		return;
+	}
+
+	// new no migration is required => no need to delay visibility
+	if !is_migration_required(&new_snapshot.current_set, &new_snapshot.new_set) {
+		*future_new_set = None;
+		return;
+	}
+
+	// when auto-migrate is enabled, we do not want to start migration right after new_set is changed, because of:
+	// 1) there could be a fork && we could start migration to forked version (and potentially lose secrets)
+	// 2) there must be some period for new_set changes finalization (i.e. adding/removing more servers)
+	let mut new_set = new_snapshot.current_set.clone();
+	::std::mem::swap(&mut new_set, &mut new_snapshot.new_set);
+
+	// if nothing has changed in future_new_set, then we want to preserve previous block hash
+	let block = match Some(&new_set) == future_new_set.as_ref().map(|f| &f.new_set) {
+		true => future_new_set.as_ref().map(|f| &f.block).cloned().unwrap_or_else(|| block),
+		false => block,
+	};
+
+	*future_new_set = Some(FutureNewSet {
+		new_set: new_set,
+		block: block,
+	});
+}
+
+fn update_number_of_confirmations<F1: Fn() -> H256, F2: Fn(H256) -> Option<u64>>(latest_block: &F1, confirmations: &F2, future_new_set: &mut Option<FutureNewSet>, snapshot: &mut KeyServerSetSnapshot) {
+	match future_new_set.as_mut() {
+		// no future new set is scheduled => do nothing,
+		None => return,
+		// else we should calculate number of confirmations for future new set
+		Some(future_new_set) => match confirmations(future_new_set.block.clone()) {
+			// we have enough confirmations => should move new_set from future to snapshot
+			Some(confirmations) if confirmations >= MIGRATION_CONFIRMATIONS_REQUIRED => (),
+			// not enough confirmations => do nothing
+			Some(_) => return,
+			// if number of confirmations is None, then reorg has happened && we need to reset block
+			// (some more intelligent startegy is possible, but let's stick to simplest one)
+			None => {
+				future_new_set.block = latest_block();
+				return;
+			}
+		}
+	}
+
+	let future_new_set = future_new_set.take()
+		.expect("we only pass through match above when future_new_set is some; qed");
+	snapshot.new_set = future_new_set.new_set;
+}
+
+fn update_last_transaction_block(client: &Client, migration_id: &H256, previous_transaction: &mut Option<PreviousMigrationTransaction>) -> bool {
+	// TODO [Reliability]: add the same mechanism to the contract listener, if accepted
+	let last_block = client.block_number(BlockId::Latest).unwrap_or_default();
+	match previous_transaction.as_ref() {
+		// no previous transaction => send immideately
+		None => (),
+		// previous transaction has been sent for other migration process => send immideately
+		Some(tx) if tx.migration_id != *migration_id => (),
+		// if we have sent the same type of transaction recently => do nothing (hope it will be mined eventually)
+		// if we have sent the same transaction some time ago =>
+		//   assume that our tx queue was full
+		//   or we didn't have enough eth fot this tx
+		//   or the transaction has been removed from the queue (and never reached any miner node)
+		// if we have restarted after sending tx => assume we have never sent it
+		Some(tx) => {
+			let last_block = client.block_number(BlockId::Latest).unwrap_or_default();
+			if tx.block > last_block || last_block - tx.block < TRANSACTION_RETRY_INTERVAL_BLOCKS {
+				return false;
+			}
+		},
 	}
+
+	*previous_transaction = Some(PreviousMigrationTransaction {
+		migration_id: migration_id.clone(),
+		block: last_block,
+	});
+
+	true
+}
+
+fn latest_block_hash(client: &BlockChainClient) -> H256 {
+	client.block_hash(BlockId::Latest).unwrap_or_default()
+}
+
+fn block_confirmations(client: &BlockChainClient, block: H256) -> Option<u64> {
+	client.block_number(BlockId::Hash(block))
+		.and_then(|block| client.block_number(BlockId::Latest).map(|last_block| (block, last_block)))
+		.map(|(block, last_block)| last_block - block)
 }
 
 #[cfg(test)]
 pub mod tests {
 	use std::collections::BTreeMap;
 	use std::net::SocketAddr;
+	use ethereum_types::H256;
 	use ethkey::Public;
-	use super::KeyServerSet;
+	use super::{update_future_set, update_number_of_confirmations, FutureNewSet,
+		KeyServerSet, KeyServerSetSnapshot, MIGRATION_CONFIRMATIONS_REQUIRED};
 
 	#[derive(Default)]
 	pub struct MapKeyServerSet {
@@ -197,8 +612,228 @@ pub mod tests {
 	}
 
 	impl KeyServerSet for MapKeyServerSet {
-		fn get(&self) -> BTreeMap<Public, SocketAddr> {
-			self.nodes.clone()
+		fn snapshot(&self) -> KeyServerSetSnapshot {
+			KeyServerSetSnapshot {
+				current_set: self.nodes.clone(),
+				new_set: self.nodes.clone(),
+				..Default::default()
+			}
 		}
+
+		fn start_migration(&self, _migration_id: H256) {
+			unimplemented!("test-only")
+		}
+
+		fn confirm_migration(&self, _migration_id: H256) {
+			unimplemented!("test-only")
+		}
+	}
+
+	#[test]
+	fn future_set_is_updated_to_none_when_migration_has_already_started() {
+		let mut future_new_set = Some(Default::default());
+		let mut new_snapshot = KeyServerSetSnapshot {
+			migration: Some(Default::default()),
+			..Default::default()
+		};
+		let new_snapshot_copy = new_snapshot.clone();
+		update_future_set(&mut future_new_set, &mut new_snapshot, Default::default());
+		assert_eq!(future_new_set, None);
+		assert_eq!(new_snapshot, new_snapshot_copy);
+	}
+
+	#[test]
+	fn future_set_is_updated_to_none_when_no_migration_is_required() {
+		let node_id = Default::default();
+		let address1 = "127.0.0.1:12000".parse().unwrap();
+		let address2 = "127.0.0.1:12001".parse().unwrap();
+
+		// addresses are different, but node set is the same => no migration is required
+		let mut future_new_set = Some(Default::default());
+		let mut new_snapshot = KeyServerSetSnapshot {
+			current_set: vec![(node_id, address1)].into_iter().collect(),
+			new_set: vec![(node_id, address2)].into_iter().collect(),
+			..Default::default()
+		};
+		let new_snapshot_copy = new_snapshot.clone();
+		update_future_set(&mut future_new_set, &mut new_snapshot, Default::default());
+		assert_eq!(future_new_set, None);
+		assert_eq!(new_snapshot, new_snapshot_copy);
+
+		// everything is the same => no migration is required
+		let mut future_new_set = Some(Default::default());
+		let mut new_snapshot = KeyServerSetSnapshot {
+			current_set: vec![(node_id, address1)].into_iter().collect(),
+			new_set: vec![(node_id, address1)].into_iter().collect(),
+			..Default::default()
+		};
+		let new_snapshot_copy = new_snapshot.clone();
+		update_future_set(&mut future_new_set, &mut new_snapshot, Default::default());
+		assert_eq!(future_new_set, None);
+		assert_eq!(new_snapshot, new_snapshot_copy);
+	}
+
+	#[test]
+	fn future_set_is_initialized() {
+		let address = "127.0.0.1:12000".parse().unwrap();
+
+		let mut future_new_set = None;
+		let mut new_snapshot = KeyServerSetSnapshot {
+			current_set: vec![(1.into(), address)].into_iter().collect(),
+			new_set: vec![(2.into(), address)].into_iter().collect(),
+			..Default::default()
+		};
+		update_future_set(&mut future_new_set, &mut new_snapshot, Default::default());
+		assert_eq!(future_new_set, Some(FutureNewSet {
+			new_set: vec![(2.into(), address)].into_iter().collect(),
+			block: Default::default(),
+		}));
+		assert_eq!(new_snapshot, KeyServerSetSnapshot {
+			current_set: vec![(1.into(), address)].into_iter().collect(),
+			new_set: vec![(1.into(), address)].into_iter().collect(),
+			..Default::default()
+		});
+	}
+
+	#[test]
+	fn future_set_is_updated_when_set_differs() {
+		let address = "127.0.0.1:12000".parse().unwrap();
+
+		let mut future_new_set = Some(FutureNewSet {
+			new_set: vec![(2.into(), address)].into_iter().collect(),
+			block: Default::default(),
+		});
+		let mut new_snapshot = KeyServerSetSnapshot {
+			current_set: vec![(1.into(), address)].into_iter().collect(),
+			new_set: vec![(3.into(), address)].into_iter().collect(),
+			..Default::default()
+		};
+		update_future_set(&mut future_new_set, &mut new_snapshot, 1.into());
+		assert_eq!(future_new_set, Some(FutureNewSet {
+			new_set: vec![(3.into(), address)].into_iter().collect(),
+			block: 1.into(),
+		}));
+		assert_eq!(new_snapshot, KeyServerSetSnapshot {
+			current_set: vec![(1.into(), address)].into_iter().collect(),
+			new_set: vec![(1.into(), address)].into_iter().collect(),
+			..Default::default()
+		});
+	}
+
+	#[test]
+	fn future_set_is_not_updated_when_set_is_the_same() {
+		let address = "127.0.0.1:12000".parse().unwrap();
+
+		let mut future_new_set = Some(FutureNewSet {
+			new_set: vec![(2.into(), address)].into_iter().collect(),
+			block: Default::default(),
+		});
+		let mut new_snapshot = KeyServerSetSnapshot {
+			current_set: vec![(1.into(), address)].into_iter().collect(),
+			new_set: vec![(2.into(), address)].into_iter().collect(),
+			..Default::default()
+		};
+		update_future_set(&mut future_new_set, &mut new_snapshot, 1.into());
+		assert_eq!(future_new_set, Some(FutureNewSet {
+			new_set: vec![(2.into(), address)].into_iter().collect(),
+			block: Default::default(),
+		}));
+		assert_eq!(new_snapshot, KeyServerSetSnapshot {
+			current_set: vec![(1.into(), address)].into_iter().collect(),
+			new_set: vec![(1.into(), address)].into_iter().collect(),
+			..Default::default()
+		});
+	}
+
+	#[test]
+	fn when_updating_confirmations_nothing_is_changed_if_no_future_set() {
+		let address = "127.0.0.1:12000".parse().unwrap();
+
+		let mut future_new_set = None;
+		let mut snapshot = KeyServerSetSnapshot {
+			current_set: vec![(1.into(), address)].into_iter().collect(),
+			new_set: vec![(1.into(), address)].into_iter().collect(),
+			..Default::default()
+		};
+		let snapshot_copy = snapshot.clone();
+		update_number_of_confirmations(
+			&|| 1.into(),
+			&|_| Some(MIGRATION_CONFIRMATIONS_REQUIRED),
+			&mut future_new_set, &mut snapshot);
+		assert_eq!(future_new_set, None);
+		assert_eq!(snapshot, snapshot_copy);
+	}
+
+	#[test]
+	fn when_updating_confirmations_migration_is_scheduled() {
+		let address = "127.0.0.1:12000".parse().unwrap();
+
+		let mut future_new_set = Some(FutureNewSet {
+			new_set: vec![(2.into(), address)].into_iter().collect(),
+			block: Default::default(),
+		});
+		let mut snapshot = KeyServerSetSnapshot {
+			current_set: vec![(1.into(), address)].into_iter().collect(),
+			new_set: vec![(1.into(), address)].into_iter().collect(),
+			..Default::default()
+		};
+		update_number_of_confirmations(
+			&|| 1.into(),
+			&|_| Some(MIGRATION_CONFIRMATIONS_REQUIRED),
+			&mut future_new_set, &mut snapshot);
+		assert_eq!(future_new_set, None);
+		assert_eq!(snapshot, KeyServerSetSnapshot {
+			current_set: vec![(1.into(), address)].into_iter().collect(),
+			new_set: vec![(2.into(), address)].into_iter().collect(),
+			..Default::default()
+		});
+	}
+
+	#[test]
+	fn when_updating_confirmations_migration_is_not_scheduled_when_not_enough_confirmations() {
+		let address = "127.0.0.1:12000".parse().unwrap();
+
+		let mut future_new_set = Some(FutureNewSet {
+			new_set: vec![(2.into(), address)].into_iter().collect(),
+			block: Default::default(),
+		});
+		let mut snapshot = KeyServerSetSnapshot {
+			current_set: vec![(1.into(), address)].into_iter().collect(),
+			new_set: vec![(1.into(), address)].into_iter().collect(),
+			..Default::default()
+		};
+		let future_new_set_copy = future_new_set.clone();
+		let snapshot_copy = snapshot.clone();
+		update_number_of_confirmations(
+			&|| 1.into(),
+			&|_| Some(MIGRATION_CONFIRMATIONS_REQUIRED - 1),
+			&mut future_new_set, &mut snapshot);
+		assert_eq!(future_new_set, future_new_set_copy);
+		assert_eq!(snapshot, snapshot_copy);
+	}
+
+	#[test]
+	fn when_updating_confirmations_migration_is_reset_when_reorganized() {
+		let address = "127.0.0.1:12000".parse().unwrap();
+
+		let mut future_new_set = Some(FutureNewSet {
+			new_set: vec![(2.into(), address)].into_iter().collect(),
+			block: 1.into(),
+		});
+		let mut snapshot = KeyServerSetSnapshot {
+			current_set: vec![(1.into(), address)].into_iter().collect(),
+			new_set: vec![(1.into(), address)].into_iter().collect(),
+			..Default::default()
+		};
+		let snapshot_copy = snapshot.clone();
+		update_number_of_confirmations(
+			&|| 2.into(),
+			&|_| None,
+			&mut future_new_set, &mut snapshot);
+		assert_eq!(future_new_set, Some(FutureNewSet {
+			new_set: vec![(2.into(), address)].into_iter().collect(),
+			block: 2.into(),
+		}));
+		assert_eq!(snapshot, snapshot_copy);
 	}
 }
diff --git a/secret_store/src/key_storage.rs b/secret_store/src/key_storage.rs
index fdbb5fa406824bd80137c45948c53332fb0e0530..4429500db13d9a3b7a6c0200b69b41a77dd4122c 100644
--- a/secret_store/src/key_storage.rs
+++ b/secret_store/src/key_storage.rs
@@ -17,29 +17,49 @@
 use std::path::PathBuf;
 use std::collections::BTreeMap;
 use serde_json;
-use ethkey::{Secret, Public};
-use util::Database;
+use tiny_keccak::Keccak;
+use ethereum_types::{H256, Address};
+use ethkey::{Secret, Public, public_to_address};
+use kvdb_rocksdb::{Database, DatabaseIterator};
 use types::all::{Error, ServiceConfiguration, ServerKeyId, NodeId};
-use serialization::{SerializablePublic, SerializableSecret};
+use serialization::{SerializablePublic, SerializableSecret, SerializableH256, SerializableAddress};
 
 /// Key of version value.
 const DB_META_KEY_VERSION: &'static [u8; 7] = b"version";
+/// Current db version.
+const CURRENT_VERSION: u8 = 3;
+/// Current type of serialized key shares.
+type CurrentSerializableDocumentKeyShare = SerializableDocumentKeyShareV3;
+/// Current type of serialized key shares versions.
+type CurrentSerializableDocumentKeyVersion = SerializableDocumentKeyShareVersionV3;
 
-#[derive(Debug, Clone, PartialEq)]
 /// Encrypted key share, stored by key storage on the single key server.
+#[derive(Debug, Clone, PartialEq)]
+#[cfg_attr(test, derive(Default))]
 pub struct DocumentKeyShare {
 	/// Author of the entry.
-	pub author: Public,
+	pub author: Address,
 	/// Decryption threshold (at least threshold + 1 nodes are required to decrypt data).
 	pub threshold: usize,
-	/// Nodes ids numbers.
-	pub id_numbers: BTreeMap<NodeId, Secret>,
-	/// Node secret share.
-	pub secret_share: Secret,
+	/// Server public key.
+	pub public: Public,
 	/// Common (shared) encryption point.
 	pub common_point: Option<Public>,
 	/// Encrypted point.
 	pub encrypted_point: Option<Public>,
+	/// Key share versions.
+	pub versions: Vec<DocumentKeyShareVersion>,
+}
+
+/// Versioned portion of document key share.
+#[derive(Debug, Clone, PartialEq)]
+pub struct DocumentKeyShareVersion {
+	/// Version hash (Keccak(time + id_numbers)).
+	pub hash: H256,
+	/// Nodes ids numbers.
+	pub id_numbers: BTreeMap<NodeId, Secret>,
+	/// Node secret share.
+	pub secret_share: Secret,
 }
 
 /// Document encryption keys storage
@@ -49,9 +69,15 @@ pub trait KeyStorage: Send + Sync {
 	/// Update document encryption key
 	fn update(&self, document: ServerKeyId, key: DocumentKeyShare) -> Result<(), Error>;
 	/// Get document encryption key
-	fn get(&self, document: &ServerKeyId) -> Result<DocumentKeyShare, Error>;
+	fn get(&self, document: &ServerKeyId) -> Result<Option<DocumentKeyShare>, Error>;
+	/// Remove document encryption key
+	fn remove(&self, document: &ServerKeyId) -> Result<(), Error>;
+	/// Clears the database
+	fn clear(&self) -> Result<(), Error>;
 	/// Check if storage contains document encryption key
 	fn contains(&self, document: &ServerKeyId) -> bool;
+	/// Iterate through storage
+	fn iter<'a>(&'a self) -> Box<Iterator<Item=(ServerKeyId, DocumentKeyShare)> + 'a>;
 }
 
 /// Persistent document encryption keys storage
@@ -59,8 +85,13 @@ pub struct PersistentKeyStorage {
 	db: Database,
 }
 
-#[derive(Serialize, Deserialize)]
+/// Persistent document encryption keys storage iterator
+pub struct PersistentKeyStorageIterator<'a> {
+	iter: Option<DatabaseIterator<'a>>,
+}
+
 /// V0 of encrypted key share, as it is stored by key storage on the single key server.
+#[derive(Serialize, Deserialize)]
 struct SerializableDocumentKeyShareV0 {
 	/// Decryption threshold (at least threshold + 1 nodes are required to decrypt data).
 	pub threshold: usize,
@@ -74,8 +105,8 @@ struct SerializableDocumentKeyShareV0 {
 	pub encrypted_point: SerializablePublic,
 }
 
-#[derive(Serialize, Deserialize)]
 /// V1 of encrypted key share, as it is stored by key storage on the single key server.
+#[derive(Serialize, Deserialize)]
 struct SerializableDocumentKeyShareV1 {
 	/// Authore of the entry.
 	pub author: SerializablePublic,
@@ -91,14 +122,62 @@ struct SerializableDocumentKeyShareV1 {
 	pub encrypted_point: Option<SerializablePublic>,
 }
 
+/// V2 of encrypted key share, as it is stored by key storage on the single key server.
+#[derive(Serialize, Deserialize)]
+struct SerializableDocumentKeyShareV2 {
+	/// Author of the entry.
+	pub author: SerializablePublic,
+	/// Decryption threshold (at least threshold + 1 nodes are required to decrypt data).
+	pub threshold: usize,
+	/// Server public.
+	pub public: SerializablePublic,
+	/// Common (shared) encryption point.
+	pub common_point: Option<SerializablePublic>,
+	/// Encrypted point.
+	pub encrypted_point: Option<SerializablePublic>,
+	/// Versions.
+	pub versions: Vec<SerializableDocumentKeyShareVersionV2>
+}
+
+/// V2 of encrypted key share version, as it is stored by key storage on the single key server.
+#[derive(Serialize, Deserialize)]
+struct SerializableDocumentKeyShareVersionV2 {
+	/// Version hash.
+	pub hash: SerializableH256,
+	/// Nodes ids numbers.
+	pub id_numbers: BTreeMap<SerializablePublic, SerializableSecret>,
+	/// Node secret share.
+	pub secret_share: SerializableSecret,
+}
+
+/// V3 of encrypted key share, as it is stored by key storage on the single key server.
+#[derive(Serialize, Deserialize)]
+struct SerializableDocumentKeyShareV3 {
+	/// Author of the entry.
+	pub author: SerializableAddress,
+	/// Decryption threshold (at least threshold + 1 nodes are required to decrypt data).
+	pub threshold: usize,
+	/// Server public.
+	pub public: SerializablePublic,
+	/// Common (shared) encryption point.
+	pub common_point: Option<SerializablePublic>,
+	/// Encrypted point.
+	pub encrypted_point: Option<SerializablePublic>,
+	/// Versions.
+	pub versions: Vec<SerializableDocumentKeyShareVersionV3>
+}
+
+/// V3 of encrypted key share version, as it is stored by key storage on the single key server.
+type SerializableDocumentKeyShareVersionV3 = SerializableDocumentKeyShareVersionV2;
+
 impl PersistentKeyStorage {
 	/// Create new persistent document encryption keys storage
 	pub fn new(config: &ServiceConfiguration) -> Result<Self, Error> {
 		let mut db_path = PathBuf::from(&config.data_path);
 		db_path.push("db");
-		let db_path = db_path.to_str().ok_or(Error::Database("Invalid secretstore path".to_owned()))?;
+		let db_path = db_path.to_str().ok_or_else(|| Error::Database("Invalid secretstore path".to_owned()))?;
 
-		let db = Database::open_default(&db_path).map_err(Error::Database)?;
+		let db = Database::open_default(&db_path)?;
 		let db = upgrade_db(db)?;
 
 		Ok(PersistentKeyStorage {
@@ -108,55 +187,119 @@ impl PersistentKeyStorage {
 }
 
 fn upgrade_db(db: Database) -> Result<Database, Error> {
-	let version = db.get(None, DB_META_KEY_VERSION).map_err(Error::Database)?;
+	let version = db.get(None, DB_META_KEY_VERSION)?;
 	let version = version.and_then(|v| v.get(0).cloned()).unwrap_or(0);
 	match version {
 		0 => {
 			let mut batch = db.transaction();
-			batch.put(None, DB_META_KEY_VERSION, &[1]);
-			for (db_key, db_value) in db.iter(None).into_iter().flat_map(|inner| inner) {
+			batch.put(None, DB_META_KEY_VERSION, &[CURRENT_VERSION]);
+			for (db_key, db_value) in db.iter(None).into_iter().flat_map(|inner| inner).filter(|&(ref k, _)| **k != *DB_META_KEY_VERSION) {
 				let v0_key = serde_json::from_slice::<SerializableDocumentKeyShareV0>(&db_value).map_err(|e| Error::Database(e.to_string()))?;
-				let v1_key = SerializableDocumentKeyShareV1 {
+				let current_key = CurrentSerializableDocumentKeyShare {
 					// author is used in separate generation + encrypt sessions.
 					// in v0 there have been only simultaneous GenEnc sessions.
-					author: Public::default().into(), 
+					author: Address::default().into(), // added in v1
 					threshold: v0_key.threshold,
-					id_numbers: v0_key.id_numbers,
-					secret_share: v0_key.secret_share,
+					public: Public::default().into(), // addded in v2
 					common_point: Some(v0_key.common_point),
 					encrypted_point: Some(v0_key.encrypted_point),
+					versions: vec![CurrentSerializableDocumentKeyVersion {
+						hash: DocumentKeyShareVersion::data_hash(v0_key.id_numbers.iter().map(|(k, v)| (&***k, &****v))).into(),
+						id_numbers: v0_key.id_numbers,
+						secret_share: v0_key.secret_share,
+					}],
+				};
+				let db_value = serde_json::to_vec(&current_key).map_err(|e| Error::Database(e.to_string()))?;
+				batch.put(None, &*db_key, &*db_value);
+			}
+			db.write(batch)?;
+			Ok(db)
+		},
+		1 => {
+			let mut batch = db.transaction();
+			batch.put(None, DB_META_KEY_VERSION, &[CURRENT_VERSION]);
+			for (db_key, db_value) in db.iter(None).into_iter().flat_map(|inner| inner).filter(|&(ref k, _)| **k != *DB_META_KEY_VERSION) {
+				let v1_key = serde_json::from_slice::<SerializableDocumentKeyShareV1>(&db_value).map_err(|e| Error::Database(e.to_string()))?;
+				let current_key = CurrentSerializableDocumentKeyShare {
+					author: public_to_address(&v1_key.author).into(), // added in v1 + changed in v3
+					threshold: v1_key.threshold,
+					public: Public::default().into(), // addded in v2
+					common_point: v1_key.common_point,
+					encrypted_point: v1_key.encrypted_point,
+					versions: vec![CurrentSerializableDocumentKeyVersion {
+						hash: DocumentKeyShareVersion::data_hash(v1_key.id_numbers.iter().map(|(k, v)| (&***k, &****v))).into(),
+						id_numbers: v1_key.id_numbers,
+						secret_share: v1_key.secret_share,
+					}],
+				};
+				let db_value = serde_json::to_vec(&current_key).map_err(|e| Error::Database(e.to_string()))?;
+				batch.put(None, &*db_key, &*db_value);
+			}
+			db.write(batch)?;
+			Ok(db)
+		}
+		2 => {
+			let mut batch = db.transaction();
+			batch.put(None, DB_META_KEY_VERSION, &[CURRENT_VERSION]);
+			for (db_key, db_value) in db.iter(None).into_iter().flat_map(|inner| inner).filter(|&(ref k, _)| **k != *DB_META_KEY_VERSION) {
+				let v2_key = serde_json::from_slice::<SerializableDocumentKeyShareV2>(&db_value).map_err(|e| Error::Database(e.to_string()))?;
+				let current_key = CurrentSerializableDocumentKeyShare {
+					author: public_to_address(&v2_key.author).into(), // changed in v3
+					threshold: v2_key.threshold,
+					public: v2_key.public,
+					common_point: v2_key.common_point,
+					encrypted_point: v2_key.encrypted_point,
+					versions: v2_key.versions,
 				};
-				let db_value = serde_json::to_vec(&v1_key).map_err(|e| Error::Database(e.to_string()))?;
+				let db_value = serde_json::to_vec(&current_key).map_err(|e| Error::Database(e.to_string()))?;
 				batch.put(None, &*db_key, &*db_value);
 			}
-			db.write(batch).map_err(Error::Database)?;
+			db.write(batch)?;
 			Ok(db)
 		},
-		1 => Ok(db),
-		_ => Err(Error::Database(format!("unsupported SecretStore database version:? {}", version))),
+		3 => Ok(db),
+		_ => Err(Error::Database(format!("unsupported SecretStore database version: {}", version))),
 	}
 }
 
 impl KeyStorage for PersistentKeyStorage {
 	fn insert(&self, document: ServerKeyId, key: DocumentKeyShare) -> Result<(), Error> {
-		let key: SerializableDocumentKeyShareV1 = key.into();
+		let key: CurrentSerializableDocumentKeyShare = key.into();
 		let key = serde_json::to_vec(&key).map_err(|e| Error::Database(e.to_string()))?;
 		let mut batch = self.db.transaction();
 		batch.put(None, &document, &key);
-		self.db.write(batch).map_err(Error::Database)
+		self.db.write(batch).map_err(Into::into)
 	}
 
 	fn update(&self, document: ServerKeyId, key: DocumentKeyShare) -> Result<(), Error> {
 		self.insert(document, key)
 	}
 
-	fn get(&self, document: &ServerKeyId) -> Result<DocumentKeyShare, Error> {
+	fn get(&self, document: &ServerKeyId) -> Result<Option<DocumentKeyShare>, Error> {
 		self.db.get(None, document)
-			.map_err(Error::Database)?
-			.ok_or(Error::DocumentNotFound)
-			.map(|key| key.into_vec())
-			.and_then(|key| serde_json::from_slice::<SerializableDocumentKeyShareV1>(&key).map_err(|e| Error::Database(e.to_string())))
-			.map(Into::into)
+			.map_err(|e| Error::Database(e.to_string()))
+			.and_then(|key| match key {
+				None => Ok(None),
+				Some(key) => serde_json::from_slice::<CurrentSerializableDocumentKeyShare>(&key)
+					.map_err(|e| Error::Database(e.to_string()))
+					.map(Into::into)
+					.map(Some),
+			})
+	}
+
+	fn remove(&self, document: &ServerKeyId) -> Result<(), Error> {
+		let mut batch = self.db.transaction();
+		batch.delete(None, &document);
+		self.db.write(batch).map_err(Into::into)
+	}
+
+	fn clear(&self) -> Result<(), Error> {
+		let mut batch = self.db.transaction();
+		for (key, _) in self.iter() {
+			batch.delete(None, &key);
+		}
+		self.db.write(batch)
+			.map_err(|e| Error::Database(e.to_string()))
 	}
 
 	fn contains(&self, document: &ServerKeyId) -> bool {
@@ -164,48 +307,130 @@ impl KeyStorage for PersistentKeyStorage {
 			.map(|k| k.is_some())
 			.unwrap_or(false)
 	}
+
+	fn iter<'a>(&'a self) -> Box<Iterator<Item=(ServerKeyId, DocumentKeyShare)> + 'a> {
+		Box::new(PersistentKeyStorageIterator {
+			iter: self.db.iter(None),
+		})
+	}
+}
+
+impl<'a> Iterator for PersistentKeyStorageIterator<'a> {
+	type Item = (ServerKeyId, DocumentKeyShare);
+
+	fn next(&mut self) -> Option<(ServerKeyId, DocumentKeyShare)> {
+		self.iter.as_mut()
+			.and_then(|iter| iter.next()
+				.and_then(|(db_key, db_val)| serde_json::from_slice::<CurrentSerializableDocumentKeyShare>(&db_val)
+					.ok()
+					.map(|key| ((*db_key).into(), key.into()))))
+	}
+}
+
+impl DocumentKeyShare {
+	/// Get last version reference.
+	#[cfg(test)]
+	pub fn last_version(&self) -> Result<&DocumentKeyShareVersion, Error> {
+		self.versions.iter().rev()
+			.nth(0)
+			.ok_or_else(|| Error::Database("key version is not found".into()))
+	}
+
+	/// Get given version reference.
+	pub fn version(&self, version: &H256) -> Result<&DocumentKeyShareVersion, Error> {
+		self.versions.iter().rev()
+			.find(|v| &v.hash == version)
+			.ok_or_else(|| Error::Database("key version is not found".into()))
+	}
+}
+
+impl DocumentKeyShareVersion {
+	/// Create new version
+	pub fn new(id_numbers: BTreeMap<NodeId, Secret>, secret_share: Secret) -> Self {
+		DocumentKeyShareVersion {
+			hash: Self::data_hash(id_numbers.iter().map(|(k, v)| (&**k, &***v))),
+			id_numbers: id_numbers,
+			secret_share: secret_share,
+		}
+	}
+
+
+	/// Calculate hash of given version data.
+	pub fn data_hash<'a, I>(id_numbers: I) -> H256 where I: Iterator<Item=(&'a [u8], &'a [u8])> {
+		let mut nodes_keccak = Keccak::new_keccak256();
+
+		for (node, node_number) in id_numbers {
+			nodes_keccak.update(node);
+			nodes_keccak.update(node_number);
+		}
+
+		let mut nodes_keccak_value = [0u8; 32];
+		nodes_keccak.finalize(&mut nodes_keccak_value);
+
+		nodes_keccak_value.into()
+	}
 }
 
-impl From<DocumentKeyShare> for SerializableDocumentKeyShareV1 {
+impl From<DocumentKeyShare> for SerializableDocumentKeyShareV3 {
 	fn from(key: DocumentKeyShare) -> Self {
-		SerializableDocumentKeyShareV1 {
+		SerializableDocumentKeyShareV3 {
 			author: key.author.into(),
 			threshold: key.threshold,
-			id_numbers: key.id_numbers.into_iter().map(|(k, v)| (k.into(), v.into())).collect(),
-			secret_share: key.secret_share.into(),
+			public: key.public.into(),
 			common_point: key.common_point.map(Into::into),
 			encrypted_point: key.encrypted_point.map(Into::into),
+			versions: key.versions.into_iter().map(Into::into).collect(),
 		}
 	}
 }
 
-impl From<SerializableDocumentKeyShareV1> for DocumentKeyShare {
-	fn from(key: SerializableDocumentKeyShareV1) -> Self {
+impl From<DocumentKeyShareVersion> for SerializableDocumentKeyShareVersionV3 {
+	fn from(version: DocumentKeyShareVersion) -> Self {
+		SerializableDocumentKeyShareVersionV3 {
+			hash: version.hash.into(),
+			id_numbers: version.id_numbers.into_iter().map(|(k, v)| (k.into(), v.into())).collect(),
+			secret_share: version.secret_share.into(),
+		}
+	}
+}
+
+impl From<SerializableDocumentKeyShareV3> for DocumentKeyShare {
+	fn from(key: SerializableDocumentKeyShareV3) -> Self {
 		DocumentKeyShare {
 			author: key.author.into(),
 			threshold: key.threshold,
-			id_numbers: key.id_numbers.into_iter().map(|(k, v)| (k.into(), v.into())).collect(),
-			secret_share: key.secret_share.into(),
+			public: key.public.into(),
 			common_point: key.common_point.map(Into::into),
 			encrypted_point: key.encrypted_point.map(Into::into),
+			versions: key.versions.into_iter()
+				.map(|v| DocumentKeyShareVersion {
+					hash: v.hash.into(),
+					id_numbers: v.id_numbers.into_iter().map(|(k, v)| (k.into(), v.into())).collect(),
+					secret_share: v.secret_share.into(),
+				})
+				.collect(),
 		}
 	}
 }
 
 #[cfg(test)]
 pub mod tests {
+	extern crate tempdir;
+
 	use std::collections::{BTreeMap, HashMap};
 	use parking_lot::RwLock;
 	use serde_json;
-	use devtools::RandomTempPath;
-	use ethkey::{Random, Generator, Public, Secret};
-	use util::Database;
+	use self::tempdir::TempDir;
+	use ethereum_types::{Address, H256};
+	use ethkey::{Random, Generator, Public, Secret, public_to_address};
+	use kvdb_rocksdb::Database;
 	use types::all::{Error, NodeAddress, ServiceConfiguration, ClusterConfiguration, ServerKeyId};
-	use super::{DB_META_KEY_VERSION, KeyStorage, PersistentKeyStorage, DocumentKeyShare,
-		SerializableDocumentKeyShareV0, SerializableDocumentKeyShareV1, upgrade_db};
+	use super::{DB_META_KEY_VERSION, CURRENT_VERSION, KeyStorage, PersistentKeyStorage, DocumentKeyShare,
+		DocumentKeyShareVersion, CurrentSerializableDocumentKeyShare, upgrade_db, SerializableDocumentKeyShareV0,
+		SerializableDocumentKeyShareV1, SerializableDocumentKeyShareV2, SerializableDocumentKeyShareVersionV2};
 
-	#[derive(Default)]
 	/// In-memory document encryption keys storage
+	#[derive(Default)]
 	pub struct DummyKeyStorage {
 		keys: RwLock<HashMap<ServerKeyId, DocumentKeyShare>>,
 	}
@@ -221,22 +446,37 @@ pub mod tests {
 			Ok(())
 		}
 
-		fn get(&self, document: &ServerKeyId) -> Result<DocumentKeyShare, Error> {
-			self.keys.read().get(document).cloned().ok_or(Error::DocumentNotFound)
+		fn get(&self, document: &ServerKeyId) -> Result<Option<DocumentKeyShare>, Error> {
+			Ok(self.keys.read().get(document).cloned())
+		}
+
+		fn remove(&self, document: &ServerKeyId) -> Result<(), Error> {
+			self.keys.write().remove(document);
+			Ok(())
+		}
+
+		fn clear(&self) -> Result<(), Error> {
+			self.keys.write().clear();
+			Ok(())
 		}
 
 		fn contains(&self, document: &ServerKeyId) -> bool {
 			self.keys.read().contains_key(document)
 		}
+
+		fn iter<'a>(&'a self) -> Box<Iterator<Item=(ServerKeyId, DocumentKeyShare)> + 'a> {
+			Box::new(self.keys.read().clone().into_iter())
+		}
 	}
 
 	#[test]
 	fn persistent_key_storage() {
-		let path = RandomTempPath::create_dir();
+		let tempdir = TempDir::new("").unwrap();
 		let config = ServiceConfiguration {
 			listener_address: None,
+			service_contract_address: None,
 			acl_check_enabled: true,
-			data_path: path.as_str().to_owned(),
+			data_path: tempdir.path().display().to_string(),
 			cluster_config: ClusterConfiguration {
 				threads: 1,
 				listener_address: NodeAddress {
@@ -245,51 +485,61 @@ pub mod tests {
 				},
 				nodes: BTreeMap::new(),
 				allow_connecting_to_higher_nodes: false,
+				admin_public: None,
+				auto_migrate_enabled: false,
 			},
 		};
-		
+
 		let key1 = ServerKeyId::from(1);
 		let value1 = DocumentKeyShare {
-			author: Public::default(),
+			author: Default::default(),
 			threshold: 100,
-			id_numbers: vec![
-				(Random.generate().unwrap().public().clone(), Random.generate().unwrap().secret().clone())
-			].into_iter().collect(),
-			secret_share: Random.generate().unwrap().secret().clone(),
+			public: Public::default(),
 			common_point: Some(Random.generate().unwrap().public().clone()),
 			encrypted_point: Some(Random.generate().unwrap().public().clone()),
+			versions: vec![DocumentKeyShareVersion {
+				hash: Default::default(),
+				id_numbers: vec![
+					(Random.generate().unwrap().public().clone(), Random.generate().unwrap().secret().clone())
+				].into_iter().collect(),
+				secret_share: Random.generate().unwrap().secret().clone(),
+			}],
 		};
 		let key2 = ServerKeyId::from(2);
 		let value2 = DocumentKeyShare {
-			author: Public::default(),
+			author: Default::default(),
 			threshold: 200,
-			id_numbers: vec![
-				(Random.generate().unwrap().public().clone(), Random.generate().unwrap().secret().clone())
-			].into_iter().collect(),
-			secret_share: Random.generate().unwrap().secret().clone(),
+			public: Public::default(),
 			common_point: Some(Random.generate().unwrap().public().clone()),
 			encrypted_point: Some(Random.generate().unwrap().public().clone()),
+			versions: vec![DocumentKeyShareVersion {
+				hash: Default::default(),
+				id_numbers: vec![
+					(Random.generate().unwrap().public().clone(), Random.generate().unwrap().secret().clone())
+				].into_iter().collect(),
+				secret_share: Random.generate().unwrap().secret().clone(),
+			}],
 		};
 		let key3 = ServerKeyId::from(3);
 
 		let key_storage = PersistentKeyStorage::new(&config).unwrap();
 		key_storage.insert(key1.clone(), value1.clone()).unwrap();
 		key_storage.insert(key2.clone(), value2.clone()).unwrap();
-		assert_eq!(key_storage.get(&key1), Ok(value1.clone()));
-		assert_eq!(key_storage.get(&key2), Ok(value2.clone()));
-		assert_eq!(key_storage.get(&key3), Err(Error::DocumentNotFound));
+		assert_eq!(key_storage.get(&key1), Ok(Some(value1.clone())));
+		assert_eq!(key_storage.get(&key2), Ok(Some(value2.clone())));
+		assert_eq!(key_storage.get(&key3), Ok(None));
 		drop(key_storage);
 
 		let key_storage = PersistentKeyStorage::new(&config).unwrap();
-		assert_eq!(key_storage.get(&key1), Ok(value1));
-		assert_eq!(key_storage.get(&key2), Ok(value2));
-		assert_eq!(key_storage.get(&key3), Err(Error::DocumentNotFound));
+		assert_eq!(key_storage.get(&key1), Ok(Some(value1)));
+		assert_eq!(key_storage.get(&key2), Ok(Some(value2)));
+		assert_eq!(key_storage.get(&key3), Ok(None));
 	}
 
 	#[test]
-	fn upgrade_db_0_to_1() {
-		let db_path = RandomTempPath::create_dir();
-		let db = Database::open_default(db_path.as_str()).unwrap();
+	fn upgrade_db_from_0() {
+		let tempdir = TempDir::new("").unwrap();
+		let db = Database::open_default(&tempdir.path().display().to_string()).unwrap();
 
 		// prepare v0 database
 		{
@@ -312,16 +562,110 @@ pub mod tests {
 		let db = upgrade_db(db).unwrap();
 
 		// check upgrade
-		assert_eq!(db.get(None, DB_META_KEY_VERSION).unwrap().unwrap()[0], 1);
-		let key = serde_json::from_slice::<SerializableDocumentKeyShareV1>(&db.get(None, &[7]).unwrap().map(|key| key.to_vec()).unwrap()).unwrap();
-		assert_eq!(Public::default(), key.author.clone().into());
+		assert_eq!(db.get(None, DB_META_KEY_VERSION).unwrap().unwrap()[0], CURRENT_VERSION);
+		let key = serde_json::from_slice::<CurrentSerializableDocumentKeyShare>(&db.get(None, &[7]).unwrap().map(|key| key.to_vec()).unwrap()).unwrap();
+		assert_eq!(Address::default(), key.author.clone().into());
 		assert_eq!(777, key.threshold);
+		assert_eq!(Some("99e82b163b062d55a64085bacfd407bb55f194ba5fb7a1af9c34b84435455520f1372e0e650a4f91aed0058cb823f62146ccb5599c8d13372c300dea866b69fc".parse::<Public>().unwrap()), key.common_point.clone().map(Into::into));
+		assert_eq!(Some("7e05df9dd077ec21ed4bc45c9fe9e0a43d65fa4be540630de615ced5e95cf5c3003035eb713317237d7667feeeb64335525158f5f7411f67aca9645169ea554c".parse::<Public>().unwrap()), key.encrypted_point.clone().map(Into::into));
+
+		assert_eq!(key.versions.len(), 1);
 		assert_eq!(vec![(
 			"b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8".parse::<Public>().unwrap(),
 			"281b6bf43cb86d0dc7b98e1b7def4a80f3ce16d28d2308f934f116767306f06c".parse::<Secret>().unwrap(),
-		)], key.id_numbers.clone().into_iter().map(|(k, v)| (k.into(), v.into())).collect::<Vec<(Public, Secret)>>());
-		assert_eq!("00125d85a05e5e63e214cb60fe63f132eec8a103aa29266b7e6e6c5b7597230b".parse::<Secret>().unwrap(), key.secret_share.into());
+		)], key.versions[0].id_numbers.clone().into_iter().map(|(k, v)| (k.into(), v.into())).collect::<Vec<(Public, Secret)>>());
+		assert_eq!("00125d85a05e5e63e214cb60fe63f132eec8a103aa29266b7e6e6c5b7597230b".parse::<Secret>().unwrap(), key.versions[0].secret_share.clone().into());
+	}
+
+	#[test]
+	fn upgrade_db_from_1() {
+		let tempdir = TempDir::new("").unwrap();
+		let db = Database::open_default(&tempdir.path().display().to_string()).unwrap();
+
+		// prepare v1 database
+		{
+			let key = serde_json::to_vec(&SerializableDocumentKeyShareV1 {
+				author: "b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8".into(),
+				threshold: 777,
+				id_numbers: vec![(
+					"b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8".into(),
+					"281b6bf43cb86d0dc7b98e1b7def4a80f3ce16d28d2308f934f116767306f06c".parse::<Secret>().unwrap().into(),
+				)].into_iter().collect(),
+				secret_share: "00125d85a05e5e63e214cb60fe63f132eec8a103aa29266b7e6e6c5b7597230b".parse::<Secret>().unwrap().into(),
+				common_point: Some("99e82b163b062d55a64085bacfd407bb55f194ba5fb7a1af9c34b84435455520f1372e0e650a4f91aed0058cb823f62146ccb5599c8d13372c300dea866b69fc".into()),
+				encrypted_point: Some("7e05df9dd077ec21ed4bc45c9fe9e0a43d65fa4be540630de615ced5e95cf5c3003035eb713317237d7667feeeb64335525158f5f7411f67aca9645169ea554c".into()),
+			}).unwrap();
+			let mut batch = db.transaction();
+			batch.put(None, DB_META_KEY_VERSION, &[1]);
+			batch.put(None, &[7], &key);
+			db.write(batch).unwrap();
+		}
+
+		// upgrade database
+		let db = upgrade_db(db).unwrap();
+
+		// check upgrade
+		assert_eq!(db.get(None, DB_META_KEY_VERSION).unwrap().unwrap()[0], CURRENT_VERSION);
+		let key = serde_json::from_slice::<CurrentSerializableDocumentKeyShare>(&db.get(None, &[7]).unwrap().map(|key| key.to_vec()).unwrap()).unwrap();
+		assert_eq!(777, key.threshold);
+		assert_eq!(Some("99e82b163b062d55a64085bacfd407bb55f194ba5fb7a1af9c34b84435455520f1372e0e650a4f91aed0058cb823f62146ccb5599c8d13372c300dea866b69fc".parse::<Public>().unwrap()), key.common_point.clone().map(Into::into));
+		assert_eq!(Some("7e05df9dd077ec21ed4bc45c9fe9e0a43d65fa4be540630de615ced5e95cf5c3003035eb713317237d7667feeeb64335525158f5f7411f67aca9645169ea554c".parse::<Public>().unwrap()), key.encrypted_point.clone().map(Into::into));
+		assert_eq!(key.author.0, public_to_address(&"b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8".into()));
+
+		assert_eq!(key.versions.len(), 1);
+		assert_eq!(vec![(
+			"b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8".parse::<Public>().unwrap(),
+			"281b6bf43cb86d0dc7b98e1b7def4a80f3ce16d28d2308f934f116767306f06c".parse::<Secret>().unwrap(),
+		)], key.versions[0].id_numbers.clone().into_iter().map(|(k, v)| (k.into(), v.into())).collect::<Vec<(Public, Secret)>>());
+
+		assert_eq!("00125d85a05e5e63e214cb60fe63f132eec8a103aa29266b7e6e6c5b7597230b".parse::<Secret>().unwrap(), key.versions[0].secret_share.clone().into());
+	}
+
+	#[test]
+	fn upgrade_db_from_2() {
+		let tempdir = TempDir::new("").unwrap();
+		let db = Database::open_default(&tempdir.path().display().to_string()).unwrap();
+
+		// prepare v2 database
+		{
+			let key = serde_json::to_vec(&SerializableDocumentKeyShareV2 {
+				author: "b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8".into(),
+				threshold: 777,
+				common_point: Some("99e82b163b062d55a64085bacfd407bb55f194ba5fb7a1af9c34b84435455520f1372e0e650a4f91aed0058cb823f62146ccb5599c8d13372c300dea866b69fc".into()),
+				encrypted_point: Some("7e05df9dd077ec21ed4bc45c9fe9e0a43d65fa4be540630de615ced5e95cf5c3003035eb713317237d7667feeeb64335525158f5f7411f67aca9645169ea554c".into()),
+				public: "b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8".into(),
+				versions: vec![SerializableDocumentKeyShareVersionV2 {
+					hash: "281b6bf43cb86d0dc7b98e1b7def4a80f3ce16d28d2308f934f116767306f06c".parse::<H256>().unwrap().into(),
+					id_numbers: vec![(
+						"b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8".into(),
+						"281b6bf43cb86d0dc7b98e1b7def4a80f3ce16d28d2308f934f116767306f06c".parse::<Secret>().unwrap().into(),
+					)].into_iter().collect(),
+					secret_share: "00125d85a05e5e63e214cb60fe63f132eec8a103aa29266b7e6e6c5b7597230b".parse::<Secret>().unwrap().into(),
+				}],
+			}).unwrap();
+			let mut batch = db.transaction();
+			batch.put(None, DB_META_KEY_VERSION, &[2]);
+			batch.put(None, &[7], &key);
+			db.write(batch).unwrap();
+		}
+
+		// upgrade database
+		let db = upgrade_db(db).unwrap();
+
+		// check upgrade
+		assert_eq!(db.get(None, DB_META_KEY_VERSION).unwrap().unwrap()[0], CURRENT_VERSION);
+		let key = serde_json::from_slice::<CurrentSerializableDocumentKeyShare>(&db.get(None, &[7]).unwrap().map(|key| key.to_vec()).unwrap()).unwrap();
+		assert_eq!(777, key.threshold);
 		assert_eq!(Some("99e82b163b062d55a64085bacfd407bb55f194ba5fb7a1af9c34b84435455520f1372e0e650a4f91aed0058cb823f62146ccb5599c8d13372c300dea866b69fc".parse::<Public>().unwrap()), key.common_point.clone().map(Into::into));
 		assert_eq!(Some("7e05df9dd077ec21ed4bc45c9fe9e0a43d65fa4be540630de615ced5e95cf5c3003035eb713317237d7667feeeb64335525158f5f7411f67aca9645169ea554c".parse::<Public>().unwrap()), key.encrypted_point.clone().map(Into::into));
+		assert_eq!(key.author.0, public_to_address(&"b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8".parse().unwrap()));
+
+		assert_eq!(key.versions.len(), 1);
+		assert_eq!(vec![(
+			"b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8".parse::<Public>().unwrap(),
+			"281b6bf43cb86d0dc7b98e1b7def4a80f3ce16d28d2308f934f116767306f06c".parse::<Secret>().unwrap(),
+		)], key.versions[0].id_numbers.clone().into_iter().map(|(k, v)| (k.into(), v.into())).collect::<Vec<(Public, Secret)>>());
+
+		assert_eq!("00125d85a05e5e63e214cb60fe63f132eec8a103aa29266b7e6e6c5b7597230b".parse::<Secret>().unwrap(), key.versions[0].secret_share.clone().into());
 	}
 }
diff --git a/secret_store/src/lib.rs b/secret_store/src/lib.rs
index d7f35a55acfa409dfb81bb75433ddec9c2ddc64f..9d89ba0c633282ddfc100bb8fc63d686bee88137 100644
--- a/secret_store/src/lib.rs
+++ b/secret_store/src/lib.rs
@@ -15,72 +15,97 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 extern crate byteorder;
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate futures;
+extern crate ethabi;
+extern crate ethcore;
+extern crate ethcore_bytes as bytes;
+extern crate ethcore_logger as logger;
+extern crate ethcrypto;
+extern crate ethereum_types;
+extern crate ethkey;
+extern crate ethsync;
 extern crate futures_cpupool;
 extern crate hyper;
-#[macro_use]
-extern crate lazy_static;
+extern crate keccak_hash as hash;
+extern crate kvdb;
+extern crate kvdb_rocksdb;
 extern crate parking_lot;
 extern crate rustc_hex;
 extern crate serde;
 extern crate serde_json;
-#[macro_use]
-extern crate serde_derive;
-extern crate tokio_io;
+extern crate tiny_keccak;
 extern crate tokio_core;
-extern crate tokio_service;
+extern crate tokio_io;
 extern crate tokio_proto;
+extern crate tokio_service;
 extern crate url;
 
-extern crate ethabi;
-extern crate ethcore;
-extern crate ethcore_devtools as devtools;
-extern crate ethcore_util as util;
-extern crate ethcore_ipc as ipc;
-extern crate ethcore_logger as logger;
-extern crate ethcrypto;
-extern crate ethkey;
-extern crate native_contracts;
+#[macro_use]
+extern crate ethabi_derive;
+#[macro_use]
+extern crate ethabi_contract;
+#[macro_use]
+extern crate futures;
+#[macro_use]
+extern crate serde_derive;
+#[macro_use]
+extern crate lazy_static;
+#[macro_use]
+extern crate log;
 
 mod key_server_cluster;
 mod types;
 
-mod traits {
-	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
-	include!(concat!(env!("OUT_DIR"), "/traits.rs"));
-}
-
+mod traits;
 mod acl_storage;
-mod http_listener;
 mod key_server;
 mod key_storage;
 mod serialization;
 mod key_server_set;
 mod node_key_pair;
+mod listener;
+mod trusted_client;
 
 use std::sync::Arc;
 use ethcore::client::Client;
+use ethsync::SyncProvider;
 
 pub use types::all::{ServerKeyId, EncryptedDocumentKey, RequestSignature, Public,
-	Error, NodeAddress, ServiceConfiguration, ClusterConfiguration};
+	Error, NodeAddress, ContractAddress, ServiceConfiguration, ClusterConfiguration};
 pub use traits::{NodeKeyPair, KeyServer};
 pub use self::node_key_pair::{PlainNodeKeyPair, KeyStoreNodeKeyPair};
 
 /// Start new key server instance
-pub fn start(client: Arc<Client>, self_key_pair: Arc<NodeKeyPair>, config: ServiceConfiguration) -> Result<Box<KeyServer>, Error> {
-	use std::sync::Arc;
-
+pub fn start(client: Arc<Client>, sync: Arc<SyncProvider>, self_key_pair: Arc<NodeKeyPair>, config: ServiceConfiguration) -> Result<Box<KeyServer>, Error> {
+	let trusted_client = trusted_client::TrustedClient::new(client.clone(), sync);
 	let acl_storage: Arc<acl_storage::AclStorage> = if config.acl_check_enabled {
-			acl_storage::OnChainAclStorage::new(&client)
+			acl_storage::OnChainAclStorage::new(trusted_client.clone())?
 		} else {
 			Arc::new(acl_storage::DummyAclStorage::default())
 		};
-	let key_server_set = key_server_set::OnChainKeyServerSet::new(&client, config.cluster_config.nodes.clone())?;
+
+	let key_server_set = key_server_set::OnChainKeyServerSet::new(trusted_client.clone(), self_key_pair.clone(),
+		config.cluster_config.auto_migrate_enabled, config.cluster_config.nodes.clone())?;
 	let key_storage = Arc::new(key_storage::PersistentKeyStorage::new(&config)?);
-	let key_server = key_server::KeyServerImpl::new(&config.cluster_config, key_server_set, self_key_pair, acl_storage, key_storage)?;
-	let listener = http_listener::KeyServerHttpListener::start(config.listener_address, key_server)?;
-	Ok(Box::new(listener))
+	let key_server = Arc::new(key_server::KeyServerImpl::new(&config.cluster_config, key_server_set.clone(), self_key_pair.clone(), acl_storage, key_storage.clone())?);
+	let cluster = key_server.cluster();
+
+	// prepare listeners
+	let http_listener = match config.listener_address {
+		Some(listener_address) => Some(listener::http_listener::KeyServerHttpListener::start(listener_address, key_server.clone())?),
+		None => None,
+	};
+	let contract_listener = config.service_contract_address.map(|service_contract_address| {
+		let service_contract = Arc::new(listener::service_contract::OnChainServiceContract::new(trusted_client, service_contract_address, self_key_pair.clone()));
+		let contract_listener = listener::service_contract_listener::ServiceContractListener::new(listener::service_contract_listener::ServiceContractListenerParams {
+			contract: service_contract,
+			key_server: key_server.clone(),
+			self_key_pair: self_key_pair,
+			key_server_set: key_server_set,
+			cluster: cluster,
+			key_storage: key_storage,
+		});
+		client.add_notify(contract_listener.clone());
+		contract_listener
+	});
+	Ok(Box::new(listener::Listener::new(key_server, http_listener, contract_listener)))
 }
diff --git a/secret_store/src/http_listener.rs b/secret_store/src/listener/http_listener.rs
similarity index 56%
rename from secret_store/src/http_listener.rs
rename to secret_store/src/listener/http_listener.rs
index 8833893652042b4b4475963934c8ec3836f33154..4d34f984bfc6eaa6724ebca372617933431907aa 100644
--- a/secret_store/src/http_listener.rs
+++ b/secret_store/src/listener/http_listener.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::collections::BTreeSet;
+use std::io::Read;
 use std::sync::Arc;
 use hyper::header;
 use hyper::uri::RequestUri;
@@ -25,10 +27,10 @@ use serde::Serialize;
 use serde_json;
 use url::percent_encoding::percent_decode;
 
-use traits::{ServerKeyGenerator, DocumentKeyServer, MessageSigner, KeyServer};
+use traits::KeyServer;
 use serialization::{SerializableEncryptedDocumentKeyShadow, SerializableBytes, SerializablePublic};
-use types::all::{Error, Public, MessageHash, EncryptedMessageSignature, NodeAddress, RequestSignature, ServerKeyId,
-	EncryptedDocumentKey, EncryptedDocumentKeyShadow};
+use types::all::{Error, Public, MessageHash, NodeAddress, RequestSignature, ServerKeyId,
+	EncryptedDocumentKey, EncryptedDocumentKeyShadow, NodeId};
 
 /// Key server http-requests listener. Available requests:
 /// To generate server key:							POST		/shadow/{server_key_id}/{signature}/{threshold}
@@ -36,11 +38,13 @@ use types::all::{Error, Public, MessageHash, EncryptedMessageSignature, NodeAddr
 /// To generate server && document key:				POST		/{server_key_id}/{signature}/{threshold} 
 /// To get document key:							GET			/{server_key_id}/{signature}
 /// To get document key shadow:						GET			/shadow/{server_key_id}/{signature} 
-/// To sign message with server key:				GET			/{server_key_id}/{signature}/{message_hash}
+/// To generate Schnorr signature with server key:	GET			/schnorr/{server_key_id}/{signature}/{message_hash}
+/// To generate ECDSA signature with server key:	GET			/ecdsa/{server_key_id}/{signature}/{message_hash}
+/// To change servers set:							POST		/admin/servers_set_change/{old_signature}/{new_signature} + BODY: json array of hex-encoded nodes ids
 
-pub struct KeyServerHttpListener<T: KeyServer + 'static> {
-	http_server: Option<HttpListening>,
-	handler: Arc<KeyServerSharedHttpHandler<T>>,
+pub struct KeyServerHttpListener {
+	http_server: HttpListening,
+	_handler: Arc<KeyServerSharedHttpHandler>,
 }
 
 /// Parsed http request
@@ -58,93 +62,71 @@ enum Request {
 	GetDocumentKey(ServerKeyId, RequestSignature),
 	/// Request shadow of encryption key of given document for given requestor.
 	GetDocumentKeyShadow(ServerKeyId, RequestSignature),
-	/// Sign message.
-	SignMessage(ServerKeyId, RequestSignature, MessageHash),
+	/// Generate Schnorr signature for the message.
+	SchnorrSignMessage(ServerKeyId, RequestSignature, MessageHash),
+	/// Generate ECDSA signature for the message.
+	EcdsaSignMessage(ServerKeyId, RequestSignature, MessageHash),
+	/// Change servers set.
+	ChangeServersSet(RequestSignature, RequestSignature, BTreeSet<NodeId>),
 }
 
 /// Cloneable http handler
-struct KeyServerHttpHandler<T: KeyServer + 'static> {
-	handler: Arc<KeyServerSharedHttpHandler<T>>,
+struct KeyServerHttpHandler {
+	handler: Arc<KeyServerSharedHttpHandler>,
 }
 
 /// Shared http handler
-struct KeyServerSharedHttpHandler<T: KeyServer + 'static> {
-	key_server: T,
+struct KeyServerSharedHttpHandler {
+	key_server: Arc<KeyServer>,
 }
 
-impl<T> KeyServerHttpListener<T> where T: KeyServer + 'static {
+impl KeyServerHttpListener {
 	/// Start KeyServer http listener
-	pub fn start(listener_address: Option<NodeAddress>, key_server: T) -> Result<Self, Error> {
+	pub fn start(listener_address: NodeAddress, key_server: Arc<KeyServer>) -> Result<Self, Error> {
 		let shared_handler = Arc::new(KeyServerSharedHttpHandler {
 			key_server: key_server,
 		});
 
-		let http_server = listener_address
-			.map(|listener_address| format!("{}:{}", listener_address.address, listener_address.port))
-			.map(|listener_address| HttpServer::http(&listener_address).expect("cannot start HttpServer"))
-			.map(|http_server| http_server.handle(KeyServerHttpHandler {
+		let listener_address = format!("{}:{}", listener_address.address, listener_address.port);
+		let http_server = HttpServer::http(&listener_address)
+			.and_then(|http_server| http_server.handle(KeyServerHttpHandler {
 				handler: shared_handler.clone(),
-			}).expect("cannot start HttpServer"));
+			})).map_err(|err| Error::Hyper(format!("{}", err)))?;
 
 		let listener = KeyServerHttpListener {
 			http_server: http_server,
-			handler: shared_handler,
+			_handler: shared_handler,
 		};
 		Ok(listener)
 	}
 }
 
-impl<T> KeyServer for KeyServerHttpListener<T> where T: KeyServer + 'static {}
-
-impl<T> ServerKeyGenerator for KeyServerHttpListener<T> where T: KeyServer + 'static {
-	fn generate_key(&self, key_id: &ServerKeyId, signature: &RequestSignature, threshold: usize) -> Result<Public, Error> {
-		self.handler.key_server.generate_key(key_id, signature, threshold)
-	}
-}
-
-impl<T> DocumentKeyServer for KeyServerHttpListener<T> where T: KeyServer + 'static {
-	fn store_document_key(&self, key_id: &ServerKeyId, signature: &RequestSignature, common_point: Public, encrypted_document_key: Public) -> Result<(), Error> {
-		self.handler.key_server.store_document_key(key_id, signature, common_point, encrypted_document_key)
-	}
-
-	fn generate_document_key(&self, key_id: &ServerKeyId, signature: &RequestSignature, threshold: usize) -> Result<EncryptedDocumentKey, Error> {
-		self.handler.key_server.generate_document_key(key_id, signature, threshold)
-	}
-
-	fn restore_document_key(&self, key_id: &ServerKeyId, signature: &RequestSignature) -> Result<EncryptedDocumentKey, Error> {
-		self.handler.key_server.restore_document_key(key_id, signature)
-	}
-
-	fn restore_document_key_shadow(&self, key_id: &ServerKeyId, signature: &RequestSignature) -> Result<EncryptedDocumentKeyShadow, Error> {
-		self.handler.key_server.restore_document_key_shadow(key_id, signature)
-	}
-}
-
-impl <T> MessageSigner for KeyServerHttpListener<T> where T: KeyServer + 'static {
-	fn sign_message(&self, key_id: &ServerKeyId, signature: &RequestSignature, message: MessageHash) -> Result<EncryptedMessageSignature, Error> {
-		self.handler.key_server.sign_message(key_id, signature, message)
-	}
-}
-
-impl<T> Drop for KeyServerHttpListener<T> where T: KeyServer + 'static {
+impl Drop for KeyServerHttpListener {
 	fn drop(&mut self) {
 		// ignore error as we are dropping anyway
-		self.http_server.take().map(|mut s| { let _ = s.close(); });
+		let _ = self.http_server.close();
 	}
 }
 
-impl<T> HttpHandler for KeyServerHttpHandler<T> where T: KeyServer + 'static {
-	fn handle(&self, req: HttpRequest, mut res: HttpResponse) {
+impl HttpHandler for KeyServerHttpHandler {
+	fn handle(&self, mut req: HttpRequest, mut res: HttpResponse) {
 		if req.headers.has::<header::Origin>() {
 			warn!(target: "secretstore", "Ignoring {}-request {} with Origin header", req.method, req.uri);
 			*res.status_mut() = HttpStatusCode::NotFound;
 			return;
 		}
 
+		let mut req_body = Default::default();
+		if let Err(error) = req.read_to_string(&mut req_body) {
+			warn!(target: "secretstore", "Error {} reading body of {}-request {}", error, req.method, req.uri);
+			*res.status_mut() = HttpStatusCode::BadRequest;
+			return;
+		}
+
 		let req_method = req.method.clone();
 		let req_uri = req.uri.clone();
 		match &req_uri {
-			&RequestUri::AbsolutePath(ref path) => match parse_request(&req_method, &path) {
+			&RequestUri::AbsolutePath(ref path) => match parse_request(&req_method, &path, &req_body) {
 				Request::GenerateServerKey(document, signature, threshold) => {
 					return_server_public_key(req, res, self.handler.key_server.generate_key(&document, &signature, threshold)
 						.map_err(|err| {
@@ -180,10 +162,24 @@ impl<T> HttpHandler for KeyServerHttpHandler<T> where T: KeyServer + 'static {
 							err
 						}));
 				},
-				Request::SignMessage(document, signature, message_hash) => {
-					return_message_signature(req, res, self.handler.key_server.sign_message(&document, &signature, message_hash)
+				Request::SchnorrSignMessage(document, signature, message_hash) => {
+					return_message_signature(req, res, self.handler.key_server.sign_message_schnorr(&document, &signature, message_hash)
 						.map_err(|err| {
-							warn!(target: "secretstore", "SignMessage request {} has failed with: {}", req_uri, err);
+							warn!(target: "secretstore", "SchnorrSignMessage request {} has failed with: {}", req_uri, err);
+							err
+						}));
+				},
+				Request::EcdsaSignMessage(document, signature, message_hash) => {
+					return_message_signature(req, res, self.handler.key_server.sign_message_ecdsa(&document, &signature, message_hash)
+						.map_err(|err| {
+							warn!(target: "secretstore", "EcdsaSignMessage request {} has failed with: {}", req_uri, err);
+							err
+						}));
+				},
+				Request::ChangeServersSet(old_set_signature, new_set_signature, new_servers_set) => {
+					return_empty(req, res, self.handler.key_server.change_servers_set(old_set_signature, new_set_signature, new_servers_set)
+						.map_err(|err| {
+							warn!(target: "secretstore", "ChangeServersSet request {} has failed with: {}", req_uri, err);
 							err
 						}));
 				},
@@ -248,6 +244,7 @@ fn return_error(mut res: HttpResponse, err: Error) {
 		Error::BadSignature => *res.status_mut() = HttpStatusCode::BadRequest,
 		Error::AccessDenied => *res.status_mut() = HttpStatusCode::Forbidden,
 		Error::DocumentNotFound => *res.status_mut() = HttpStatusCode::NotFound,
+		Error::Hyper(_) => *res.status_mut() = HttpStatusCode::BadRequest,
 		Error::Serde(_) => *res.status_mut() = HttpStatusCode::BadRequest,
 		Error::Database(_) => *res.status_mut() = HttpStatusCode::InternalServerError,
 		Error::Internal(_) => *res.status_mut() = HttpStatusCode::InternalServerError,
@@ -261,7 +258,7 @@ fn return_error(mut res: HttpResponse, err: Error) {
 	}
 }
 
-fn parse_request(method: &HttpMethod, uri_path: &str) -> Request {
+fn parse_request(method: &HttpMethod, uri_path: &str, body: &str) -> Request {
 	let uri_path = match percent_decode(uri_path.as_bytes()).decode_utf8() {
 		Ok(path) => path,
 		Err(_) => return Request::Invalid,
@@ -272,7 +269,12 @@ fn parse_request(method: &HttpMethod, uri_path: &str) -> Request {
 		return Request::Invalid;
 	}
 
-	let (is_shadow_request, args_offset) = if &path[0] == "shadow" { (true, 1) } else { (false, 0) };
+	if path[0] == "admin" {
+		return parse_admin_request(method, path, body);
+	}
+
+	let (prefix, args_offset) = if &path[0] == "shadow" || &path[0] == "schnorr" || &path[0] == "ecdsa"
+		{ (&*path[0], 1) } else { ("", 0) };
 	let args_count = path.len() - args_offset;
 	if args_count < 2 || path[args_offset].is_empty() || path[args_offset + 1].is_empty() {
 		return Request::Invalid;
@@ -291,83 +293,136 @@ fn parse_request(method: &HttpMethod, uri_path: &str) -> Request {
 	let message_hash = path.get(args_offset + 2).map(|v| v.parse());
 	let common_point = path.get(args_offset + 2).map(|v| v.parse());
 	let encrypted_key = path.get(args_offset + 3).map(|v| v.parse());
-	match (is_shadow_request, args_count, method, threshold, message_hash, common_point, encrypted_key) {
-		(true, 3, &HttpMethod::Post, Some(Ok(threshold)), _, _, _) =>
+	match (prefix, args_count, method, threshold, message_hash, common_point, encrypted_key) {
+		("shadow", 3, &HttpMethod::Post, Some(Ok(threshold)), _, _, _) =>
 			Request::GenerateServerKey(document, signature, threshold),
-		(true, 4, &HttpMethod::Post, _, _, Some(Ok(common_point)), Some(Ok(encrypted_key))) =>
+		("shadow", 4, &HttpMethod::Post, _, _, Some(Ok(common_point)), Some(Ok(encrypted_key))) =>
 			Request::StoreDocumentKey(document, signature, common_point, encrypted_key),
-		(false, 3, &HttpMethod::Post, Some(Ok(threshold)), _, _, _) =>
+		("", 3, &HttpMethod::Post, Some(Ok(threshold)), _, _, _) =>
 			Request::GenerateDocumentKey(document, signature, threshold),
-		(false, 2, &HttpMethod::Get, _, _, _, _) =>
+		("", 2, &HttpMethod::Get, _, _, _, _) =>
 			Request::GetDocumentKey(document, signature),
-		(true, 2, &HttpMethod::Get, _, _, _, _) =>
+		("shadow", 2, &HttpMethod::Get, _, _, _, _) =>
 			Request::GetDocumentKeyShadow(document, signature),
-		(false, 3, &HttpMethod::Get, _, Some(Ok(message_hash)), _, _) =>
-			Request::SignMessage(document, signature, message_hash),
+		("schnorr", 3, &HttpMethod::Get, _, Some(Ok(message_hash)), _, _) =>
+			Request::SchnorrSignMessage(document, signature, message_hash),
+		("ecdsa", 3, &HttpMethod::Get, _, Some(Ok(message_hash)), _, _) =>
+			Request::EcdsaSignMessage(document, signature, message_hash),
 		_ => Request::Invalid,
 	}
 }
 
+fn parse_admin_request(method: &HttpMethod, path: Vec<String>, body: &str) -> Request {
+	let args_count = path.len();
+	if *method != HttpMethod::Post || args_count != 4 || path[1] != "servers_set_change" {
+		return Request::Invalid;
+	}
+
+	let old_set_signature = match path[2].parse() {
+		Ok(signature) => signature,
+		_ => return Request::Invalid,
+	};
+
+	let new_set_signature = match path[3].parse() {
+		Ok(signature) => signature,
+		_ => return Request::Invalid,
+	};
+
+	let new_servers_set: BTreeSet<SerializablePublic> = match serde_json::from_str(body) {
+		Ok(new_servers_set) => new_servers_set,
+		_ => return Request::Invalid,
+	};
+
+	Request::ChangeServersSet(old_set_signature, new_set_signature,
+		new_servers_set.into_iter().map(Into::into).collect())
+}
+
 #[cfg(test)]
 mod tests {
+	use std::sync::Arc;
 	use hyper::method::Method as HttpMethod;
+	use ethkey::Public;
 	use key_server::tests::DummyKeyServer;
 	use types::all::NodeAddress;
 	use super::{parse_request, Request, KeyServerHttpListener};
 
 	#[test]
 	fn http_listener_successfully_drops() {
-		let key_server = DummyKeyServer;
+		let key_server = Arc::new(DummyKeyServer::default());
 		let address = NodeAddress { address: "127.0.0.1".into(), port: 9000 };
-		let listener = KeyServerHttpListener::start(Some(address), key_server).unwrap();
+		let listener = KeyServerHttpListener::start(address, key_server).unwrap();
 		drop(listener);
 	}
-
+ 
 	#[test]
 	fn parse_request_successful() {
 		// POST		/shadow/{server_key_id}/{signature}/{threshold}						=> generate server key
-		assert_eq!(parse_request(&HttpMethod::Post, "/shadow/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/2"),
+		assert_eq!(parse_request(&HttpMethod::Post, "/shadow/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/2", Default::default()),
 			Request::GenerateServerKey("0000000000000000000000000000000000000000000000000000000000000001".into(),
 				"a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01".parse().unwrap(),
 				2));
 		// POST		/shadow/{server_key_id}/{signature}/{common_point}/{encrypted_key}	=> store encrypted document key
-		assert_eq!(parse_request(&HttpMethod::Post, "/shadow/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8/1395568277679f7f583ab7c0992da35f26cde57149ee70e524e49bdae62db3e18eb96122501e7cbb798b784395d7bb5a499edead0706638ad056d886e56cf8fb"),
+		assert_eq!(parse_request(&HttpMethod::Post, "/shadow/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8/1395568277679f7f583ab7c0992da35f26cde57149ee70e524e49bdae62db3e18eb96122501e7cbb798b784395d7bb5a499edead0706638ad056d886e56cf8fb", Default::default()),
 			Request::StoreDocumentKey("0000000000000000000000000000000000000000000000000000000000000001".into(),
 				"a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01".parse().unwrap(),
 				"b486d3840218837b035c66196ecb15e6b067ca20101e11bd5e626288ab6806ecc70b8307012626bd512bad1559112d11d21025cef48cc7a1d2f3976da08f36c8".parse().unwrap(),
 				"1395568277679f7f583ab7c0992da35f26cde57149ee70e524e49bdae62db3e18eb96122501e7cbb798b784395d7bb5a499edead0706638ad056d886e56cf8fb".parse().unwrap()));
 		// POST		/{server_key_id}/{signature}/{threshold}							=> generate server && document key
-		assert_eq!(parse_request(&HttpMethod::Post, "/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/2"),
+		assert_eq!(parse_request(&HttpMethod::Post, "/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/2", Default::default()),
 			Request::GenerateDocumentKey("0000000000000000000000000000000000000000000000000000000000000001".into(),
 				"a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01".parse().unwrap(),
 				2));
 		// GET		/{server_key_id}/{signature}										=> get document key
-		assert_eq!(parse_request(&HttpMethod::Get, "/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01"),
+		assert_eq!(parse_request(&HttpMethod::Get, "/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01", Default::default()),
 			Request::GetDocumentKey("0000000000000000000000000000000000000000000000000000000000000001".into(),
 				"a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01".parse().unwrap()));
-		assert_eq!(parse_request(&HttpMethod::Get, "/%30000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01"),
+		assert_eq!(parse_request(&HttpMethod::Get, "/%30000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01", Default::default()),
 			Request::GetDocumentKey("0000000000000000000000000000000000000000000000000000000000000001".into(),
 				"a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01".parse().unwrap()));
 		// GET		/shadow/{server_key_id}/{signature}									=> get document key shadow
-		assert_eq!(parse_request(&HttpMethod::Get, "/shadow/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01"),
+		assert_eq!(parse_request(&HttpMethod::Get, "/shadow/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01", Default::default()),
 			Request::GetDocumentKeyShadow("0000000000000000000000000000000000000000000000000000000000000001".into(),
 				"a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01".parse().unwrap()));
-		// GET		/{server_key_id}/{signature}/{message_hash}							=> sign message with server key
-		assert_eq!(parse_request(&HttpMethod::Get, "/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/281b6bf43cb86d0dc7b98e1b7def4a80f3ce16d28d2308f934f116767306f06c"),
-			Request::SignMessage("0000000000000000000000000000000000000000000000000000000000000001".into(),
+		// GET		/schnorr/{server_key_id}/{signature}/{message_hash}					=> schnorr-sign message with server key
+		assert_eq!(parse_request(&HttpMethod::Get, "/schnorr/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/281b6bf43cb86d0dc7b98e1b7def4a80f3ce16d28d2308f934f116767306f06c", Default::default()),
+			Request::SchnorrSignMessage("0000000000000000000000000000000000000000000000000000000000000001".into(),
 				"a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01".parse().unwrap(),
 				"281b6bf43cb86d0dc7b98e1b7def4a80f3ce16d28d2308f934f116767306f06c".parse().unwrap()));
+		// GET		/ecdsa/{server_key_id}/{signature}/{message_hash}					=> ecdsa-sign message with server key
+		assert_eq!(parse_request(&HttpMethod::Get, "/ecdsa/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/281b6bf43cb86d0dc7b98e1b7def4a80f3ce16d28d2308f934f116767306f06c", Default::default()),
+			Request::EcdsaSignMessage("0000000000000000000000000000000000000000000000000000000000000001".into(),
+				"a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01".parse().unwrap(),
+				"281b6bf43cb86d0dc7b98e1b7def4a80f3ce16d28d2308f934f116767306f06c".parse().unwrap()));
+		// POST		/admin/servers_set_change/{old_set_signature}/{new_set_signature} + body
+		let node1: Public = "843645726384530ffb0c52f175278143b5a93959af7864460f5a4fec9afd1450cfb8aef63dec90657f43f55b13e0a73c7524d4e9a13c051b4e5f1e53f39ecd91".parse().unwrap();
+		let node2: Public = "07230e34ebfe41337d3ed53b186b3861751f2401ee74b988bba55694e2a6f60c757677e194be2e53c3523cc8548694e636e6acb35c4e8fdc5e29d28679b9b2f3".parse().unwrap();
+		let nodes = vec![node1, node2].into_iter().collect();
+		assert_eq!(parse_request(&HttpMethod::Post, "/admin/servers_set_change/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/b199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01",
+			&r#"["0x843645726384530ffb0c52f175278143b5a93959af7864460f5a4fec9afd1450cfb8aef63dec90657f43f55b13e0a73c7524d4e9a13c051b4e5f1e53f39ecd91",
+				"0x07230e34ebfe41337d3ed53b186b3861751f2401ee74b988bba55694e2a6f60c757677e194be2e53c3523cc8548694e636e6acb35c4e8fdc5e29d28679b9b2f3"]"#),
+			Request::ChangeServersSet(
+				"a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01".parse().unwrap(),
+				"b199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01".parse().unwrap(),
+				nodes,
+			));
 	}
 
 	#[test]
 	fn parse_request_failed() {
-		assert_eq!(parse_request(&HttpMethod::Get, ""), Request::Invalid);
-		assert_eq!(parse_request(&HttpMethod::Get, "/shadow"), Request::Invalid);
-		assert_eq!(parse_request(&HttpMethod::Get, "///2"), Request::Invalid);
-		assert_eq!(parse_request(&HttpMethod::Get, "/shadow///2"), Request::Invalid);
-		assert_eq!(parse_request(&HttpMethod::Get, "/0000000000000000000000000000000000000000000000000000000000000001"), Request::Invalid);
-		assert_eq!(parse_request(&HttpMethod::Get, "/0000000000000000000000000000000000000000000000000000000000000001/"), Request::Invalid);
-		assert_eq!(parse_request(&HttpMethod::Get, "/a/b"), Request::Invalid);
-		assert_eq!(parse_request(&HttpMethod::Get, "/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/0000000000000000000000000000000000000000000000000000000000000002/0000000000000000000000000000000000000000000000000000000000000002"), Request::Invalid);
+		assert_eq!(parse_request(&HttpMethod::Get, "", Default::default()), Request::Invalid);
+		assert_eq!(parse_request(&HttpMethod::Get, "/shadow", Default::default()), Request::Invalid);
+		assert_eq!(parse_request(&HttpMethod::Get, "///2", Default::default()), Request::Invalid);
+		assert_eq!(parse_request(&HttpMethod::Get, "/shadow///2", Default::default()), Request::Invalid);
+		assert_eq!(parse_request(&HttpMethod::Get, "/0000000000000000000000000000000000000000000000000000000000000001", Default::default()), Request::Invalid);
+		assert_eq!(parse_request(&HttpMethod::Get, "/0000000000000000000000000000000000000000000000000000000000000001/", Default::default()), Request::Invalid);
+		assert_eq!(parse_request(&HttpMethod::Get, "/a/b", Default::default()), Request::Invalid);
+		assert_eq!(parse_request(&HttpMethod::Get, "/schnorr/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/0000000000000000000000000000000000000000000000000000000000000002/0000000000000000000000000000000000000000000000000000000000000002", Default::default()), Request::Invalid);
+		assert_eq!(parse_request(&HttpMethod::Get, "/ecdsa/0000000000000000000000000000000000000000000000000000000000000001/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/0000000000000000000000000000000000000000000000000000000000000002/0000000000000000000000000000000000000000000000000000000000000002", Default::default()), Request::Invalid);
+		assert_eq!(parse_request(&HttpMethod::Post, "/admin/servers_set_change/xxx/yyy",
+			&r#"["0x843645726384530ffb0c52f175278143b5a93959af7864460f5a4fec9afd1450cfb8aef63dec90657f43f55b13e0a73c7524d4e9a13c051b4e5f1e53f39ecd91",
+				"0x07230e34ebfe41337d3ed53b186b3861751f2401ee74b988bba55694e2a6f60c757677e194be2e53c3523cc8548694e636e6acb35c4e8fdc5e29d28679b9b2f3"]"#),
+			Request::Invalid);
+		assert_eq!(parse_request(&HttpMethod::Post, "/admin/servers_set_change/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01/a199fb39e11eefb61c78a4074a53c0d4424600a3e74aad4fb9d93a26c30d067e1d4d29936de0c73f19827394a1dd049480a0d581aee7ae7546968da7d3d1c2fd01", ""),
+			Request::Invalid);
 	}
 }
diff --git a/secret_store/src/listener/mod.rs b/secret_store/src/listener/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..df96c583d44a979df338fe191c2e3aad2e253131
--- /dev/null
+++ b/secret_store/src/listener/mod.rs
@@ -0,0 +1,84 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+pub mod http_listener;
+pub mod service_contract;
+pub mod service_contract_listener;
+mod tasks_queue;
+
+use std::collections::BTreeSet;
+use std::sync::Arc;
+use traits::{ServerKeyGenerator, DocumentKeyServer, MessageSigner, AdminSessionsServer, KeyServer};
+use types::all::{Error, Public, MessageHash, EncryptedMessageSignature, RequestSignature, ServerKeyId,
+	EncryptedDocumentKey, EncryptedDocumentKeyShadow, NodeId};
+
+pub struct Listener {
+	key_server: Arc<KeyServer>,
+	_http: Option<http_listener::KeyServerHttpListener>,
+	_contract: Option<Arc<service_contract_listener::ServiceContractListener>>,
+}
+
+impl Listener {
+	pub fn new(key_server: Arc<KeyServer>, http: Option<http_listener::KeyServerHttpListener>, contract: Option<Arc<service_contract_listener::ServiceContractListener>>) -> Self {
+		Self {
+			key_server: key_server,
+			_http: http,
+			_contract: contract,
+		}
+	}
+}
+
+impl KeyServer for Listener {}
+
+impl ServerKeyGenerator for Listener {
+	fn generate_key(&self, key_id: &ServerKeyId, signature: &RequestSignature, threshold: usize) -> Result<Public, Error> {
+		self.key_server.generate_key(key_id, signature, threshold)
+	}
+}
+
+impl DocumentKeyServer for Listener {
+	fn store_document_key(&self, key_id: &ServerKeyId, signature: &RequestSignature, common_point: Public, encrypted_document_key: Public) -> Result<(), Error> {
+		self.key_server.store_document_key(key_id, signature, common_point, encrypted_document_key)
+	}
+
+	fn generate_document_key(&self, key_id: &ServerKeyId, signature: &RequestSignature, threshold: usize) -> Result<EncryptedDocumentKey, Error> {
+		self.key_server.generate_document_key(key_id, signature, threshold)
+	}
+
+	fn restore_document_key(&self, key_id: &ServerKeyId, signature: &RequestSignature) -> Result<EncryptedDocumentKey, Error> {
+		self.key_server.restore_document_key(key_id, signature)
+	}
+
+	fn restore_document_key_shadow(&self, key_id: &ServerKeyId, signature: &RequestSignature) -> Result<EncryptedDocumentKeyShadow, Error> {
+		self.key_server.restore_document_key_shadow(key_id, signature)
+	}
+}
+
+impl MessageSigner for Listener {
+	fn sign_message_schnorr(&self, key_id: &ServerKeyId, signature: &RequestSignature, message: MessageHash) -> Result<EncryptedMessageSignature, Error> {
+		self.key_server.sign_message_schnorr(key_id, signature, message)
+	}
+
+	fn sign_message_ecdsa(&self, key_id: &ServerKeyId, signature: &RequestSignature, message: MessageHash) -> Result<EncryptedMessageSignature, Error> {
+		self.key_server.sign_message_ecdsa(key_id, signature, message)
+	}
+}
+
+impl AdminSessionsServer for Listener {
+	fn change_servers_set(&self, old_set_signature: RequestSignature, new_set_signature: RequestSignature, new_servers_set: BTreeSet<NodeId>) -> Result<(), Error> {
+		self.key_server.change_servers_set(old_set_signature, new_set_signature, new_servers_set)
+	}
+}
\ No newline at end of file
diff --git a/secret_store/src/listener/service_contract.rs b/secret_store/src/listener/service_contract.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f2d13f192f75ddfcb17e6a46484083c87af72580
--- /dev/null
+++ b/secret_store/src/listener/service_contract.rs
@@ -0,0 +1,356 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+use parking_lot::RwLock;
+use ethcore::filter::Filter;
+use ethcore::client::{Client, BlockChainClient, BlockId, RegistryInfo, CallContract};
+use ethkey::{Public, Signature, public_to_address};
+use hash::keccak;
+use ethereum_types::{H256, U256, Address};
+use listener::service_contract_listener::ServiceTask;
+use trusted_client::TrustedClient;
+use {ServerKeyId, NodeKeyPair, ContractAddress};
+
+use_contract!(service, "Service", "res/service.json");
+
+/// Name of the SecretStore contract in the registry.
+const SERVICE_CONTRACT_REGISTRY_NAME: &'static str = "secretstore_service";
+
+/// Key server has been added to the set.
+const SERVER_KEY_REQUESTED_EVENT_NAME: &'static [u8] = &*b"ServerKeyRequested(bytes32,uint256)";
+
+/// Number of confirmations required before request can be processed.
+const REQUEST_CONFIRMATIONS_REQUIRED: u64 = 3;
+
+lazy_static! {
+	static ref SERVER_KEY_REQUESTED_EVENT_NAME_HASH: H256 = keccak(SERVER_KEY_REQUESTED_EVENT_NAME);
+}
+
+/// Service contract trait.
+pub trait ServiceContract: Send + Sync {
+	/// Update contract when new blocks are enacted. Returns true if contract is installed && up-to-date (i.e. chain is synced).
+	fn update(&self) -> bool;
+	/// Read recent contract logs. Returns topics of every entry.
+	fn read_logs(&self) -> Box<Iterator<Item=Vec<H256>>>;
+	/// Publish generated key.
+	fn read_pending_requests(&self) -> Box<Iterator<Item=(bool, ServiceTask)>>;
+	/// Publish server key.
+	fn publish_server_key(&self, server_key_id: &ServerKeyId, server_key: &Public) -> Result<(), String>;
+}
+
+/// On-chain service contract.
+pub struct OnChainServiceContract {
+	/// Blockchain client.
+	client: TrustedClient,
+	/// This node key pair.
+	self_key_pair: Arc<NodeKeyPair>,
+	/// Contract addresss.
+	address: ContractAddress,
+	/// Contract.
+	data: RwLock<ServiceData>,
+}
+
+/// On-chain service contract data.
+struct ServiceData {
+	/// Contract.
+	pub contract: service::Service,
+	/// Contract address.
+	pub contract_address: Address,
+	/// Last block we have read logs from.
+	pub last_log_block: Option<H256>,
+}
+
+/// Pending requests iterator.
+struct PendingRequestsIterator {
+	/// Blockchain client.
+	client: Arc<Client>,
+	/// Contract.
+	contract: service::Service,
+	/// Contract address.
+	contract_address: Address,
+	/// This node key pair.
+	self_key_pair: Arc<NodeKeyPair>,
+	/// Block, this iterator is created for.
+	block: H256,
+	/// Current request index.
+	index: U256,
+	/// Requests length.
+	length: U256,
+}
+
+impl OnChainServiceContract {
+	/// Create new on-chain service contract.
+	pub fn new(client: TrustedClient, address: ContractAddress, self_key_pair: Arc<NodeKeyPair>) -> Self {
+		let contract_addr = match address {
+			ContractAddress::Registry => client.get().and_then(|c| c.registry_address(SERVICE_CONTRACT_REGISTRY_NAME.to_owned(), BlockId::Latest)
+				.map(|address| {
+					trace!(target: "secretstore", "{}: installing service contract from address {}",
+						self_key_pair.public(), address);
+					address
+				}))
+				.unwrap_or_default(),
+			ContractAddress::Address(ref address) => {
+				trace!(target: "secretstore", "{}: installing service contract from address {}",
+					self_key_pair.public(), address);
+				address.clone()
+			},
+		};
+
+		OnChainServiceContract {
+			client: client,
+			self_key_pair: self_key_pair,
+			address: address,
+			data: RwLock::new(ServiceData {
+				contract: service::Service::default(),
+				contract_address: contract_addr,
+				last_log_block: None,
+			}),
+		}
+	}
+}
+
+impl ServiceContract for OnChainServiceContract {
+	fn update(&self) -> bool {
+		// TODO [Sec]: registry_address currently reads from BlockId::Latest, instead of
+		// from block with REQUEST_CONFIRMATIONS_REQUIRED confirmations
+		if let &ContractAddress::Registry = &self.address {
+			if let Some(client) = self.client.get() {
+				// update contract address from registry
+				let service_contract_addr = client.registry_address(SERVICE_CONTRACT_REGISTRY_NAME.to_owned(), BlockId::Latest).unwrap_or_default();
+				if self.data.read().contract_address != service_contract_addr {
+					trace!(target: "secretstore", "{}: installing service contract from address {}",
+						self.self_key_pair.public(), service_contract_addr);
+					self.data.write().contract_address = service_contract_addr;
+				}
+			}
+		}
+
+		self.data.read().contract_address != Default::default()
+			&& self.client.get().is_some()
+	}
+
+	fn read_logs(&self) -> Box<Iterator<Item=Vec<H256>>> {
+		let client = match self.client.get() {
+			Some(client) => client,
+			None => {
+				warn!(target: "secretstore", "{}: client is offline during read_logs call",
+					self.self_key_pair.public());
+				return Box::new(::std::iter::empty());
+			},
+		};
+
+		// prepare range of blocks to read logs from
+		let (address, first_block, last_block) = {
+			let mut data = self.data.write();
+			let address = data.contract_address;
+			let confirmed_block = match get_confirmed_block_hash(&*client, REQUEST_CONFIRMATIONS_REQUIRED) {
+				Some(confirmed_block) => confirmed_block,
+				None => return Box::new(::std::iter::empty()), // no block with enough confirmations
+			};
+			let first_block = match data.last_log_block.take().and_then(|b| client.tree_route(&b, &confirmed_block)) {
+				// if we have a route from last_log_block to confirmed_block => search for logs on this route
+				//
+				// potentially this could lead us to reading same logs twice when reorganizing to the fork, which
+				// already has been canonical previosuly
+				// the worst thing that can happen in this case is spending some time reading unneeded data from SS db
+				Some(ref route) if route.index < route.blocks.len() => route.blocks[route.index],
+				// else we care only about confirmed block
+				_ => confirmed_block.clone(),
+			};
+
+			data.last_log_block = Some(confirmed_block.clone());
+			(address, first_block, confirmed_block)
+		};
+
+		// read server key generation requests
+		let request_logs = client.logs(Filter {
+			from_block: BlockId::Hash(first_block),
+			to_block: BlockId::Hash(last_block),
+			address: Some(vec![address]),
+			topics: vec![
+				Some(vec![*SERVER_KEY_REQUESTED_EVENT_NAME_HASH]),
+				None,
+				None,
+				None,
+			],
+			limit: None,
+		});
+
+		Box::new(request_logs.into_iter().map(|log| log.entry.topics))
+	}
+
+	fn read_pending_requests(&self) -> Box<Iterator<Item=(bool, ServiceTask)>> {
+		let client = match self.client.get() {
+			Some(client) => client,
+			None => return Box::new(::std::iter::empty()),
+		};
+
+		// we only need requests that are here for more than REQUEST_CONFIRMATIONS_REQUIRED blocks
+		// => we're reading from Latest - (REQUEST_CONFIRMATIONS_REQUIRED + 1) block
+		let data = self.data.read();
+		match data.contract_address == Default::default() {
+			true => Box::new(::std::iter::empty()),
+			false => get_confirmed_block_hash(&*client, REQUEST_CONFIRMATIONS_REQUIRED + 1)
+				.and_then(|b| {
+					let contract_address = data.contract_address;
+					let do_call = |data| client.call_contract(BlockId::Hash(b), contract_address, data);
+					data.contract.functions().server_key_generation_requests_count().call(&do_call)
+						.map_err(|error| {
+							warn!(target: "secretstore", "{}: call to server_key_generation_requests_count failed: {}",
+								self.self_key_pair.public(), error);
+							error
+						})
+						.map(|l| (b, l))
+						.ok()
+				})
+				.map(|(b, l)| Box::new(PendingRequestsIterator {
+					client: client,
+					contract: service::Service::default(),
+					contract_address: data.contract_address,
+					self_key_pair: self.self_key_pair.clone(),
+					block: b,
+					index: 0.into(),
+					length: l,
+				}) as Box<Iterator<Item=(bool, ServiceTask)>>)
+				.unwrap_or_else(|| Box::new(::std::iter::empty()))
+		}
+	}
+
+	fn publish_server_key(&self, server_key_id: &ServerKeyId, server_key: &Public) -> Result<(), String> {
+		// only publish if contract address is set && client is online
+		let data = self.data.read();
+		if data.contract_address == Default::default() {
+			// it is not an error, because key could be generated even without contract
+			return Ok(());
+		}
+
+		let client = match self.client.get() {
+			Some(client) => client,
+			None => return Err("trusted client is required to publish key".into()),
+		};
+
+		// only publish key if contract waits for publication
+		// failing is ok here - it could be that enough confirmations have been recevied
+		// or key has been requested using HTTP API
+		let contract_address = data.contract_address;
+		let do_call = |data| client.call_contract(BlockId::Latest, contract_address, data);
+		let self_address = public_to_address(self.self_key_pair.public());
+		if data.contract.functions()
+			.get_server_key_confirmation_status()
+			.call(*server_key_id, self_address, &do_call)
+			.unwrap_or(false) {
+			return Ok(());
+		}
+
+		// prepare transaction data
+		let server_key_hash = keccak(server_key);
+		let signed_server_key = self.self_key_pair.sign(&server_key_hash).map_err(|e| format!("{}", e))?;
+		let signed_server_key: Signature = signed_server_key.into_electrum().into();
+		let transaction_data = data.contract.functions()
+			.server_key_generated()
+			.input(*server_key_id,
+				server_key.to_vec(),
+				signed_server_key.v(),
+				signed_server_key.r(),
+				signed_server_key.s(),
+			);
+
+		// send transaction
+		client.transact_contract(
+			data.contract_address,
+			transaction_data
+		).map_err(|e| format!("{}", e))?;
+
+		Ok(())
+	}
+}
+
+impl Iterator for PendingRequestsIterator {
+	type Item = (bool, ServiceTask);
+
+	fn next(&mut self) -> Option<(bool, ServiceTask)> {
+		if self.index >= self.length {
+			return None;
+		}
+
+		let index = self.index.clone();
+		self.index = self.index + 1.into();
+
+		let self_address = public_to_address(self.self_key_pair.public());
+		let contract_address = self.contract_address;
+		let do_call = |data| self.client.call_contract(BlockId::Hash(self.block.clone()), contract_address, data);
+		self.contract.functions().get_server_key_id().call(index, &do_call)
+			.and_then(|server_key_id|
+				self.contract.functions().get_server_key_threshold().call(server_key_id, &do_call)
+					.map(|threshold| (server_key_id, threshold)))
+			.and_then(|(server_key_id, threshold)|
+				self.contract.functions().get_server_key_confirmation_status().call(server_key_id, self_address, &do_call)
+					.map(|is_confirmed| (server_key_id, threshold, is_confirmed)))
+			.map(|(server_key_id, threshold, is_confirmed)|
+				Some((is_confirmed, ServiceTask::GenerateServerKey(server_key_id, threshold.into()))))
+			.map_err(|error| {
+				warn!(target: "secretstore", "{}: reading service contract request failed: {}",
+					self.self_key_pair.public(), error);
+				()
+			})
+			.unwrap_or(None)
+	}
+}
+
+/// Get hash of the last block with at least n confirmations.
+fn get_confirmed_block_hash(client: &Client, confirmations: u64) -> Option<H256> {
+	client.block_number(BlockId::Latest)
+		.map(|b| b.saturating_sub(confirmations))
+		.and_then(|b| client.block_hash(BlockId::Number(b)))
+}
+
+#[cfg(test)]
+pub mod tests {
+	use parking_lot::Mutex;
+	use ethkey::Public;
+	use ethereum_types::H256;
+	use listener::service_contract_listener::ServiceTask;
+	use ServerKeyId;
+	use super::ServiceContract;
+
+	#[derive(Default)]
+	pub struct DummyServiceContract {
+		pub is_actual: bool,
+		pub logs: Vec<Vec<H256>>,
+		pub pending_requests: Vec<(bool, ServiceTask)>,
+		pub published_keys: Mutex<Vec<(ServerKeyId, Public)>>,
+	}
+
+	impl ServiceContract for DummyServiceContract {
+		fn update(&self) -> bool {
+			true
+		}
+
+		fn read_logs(&self) -> Box<Iterator<Item=Vec<H256>>> {
+			Box::new(self.logs.clone().into_iter())
+		}
+
+		fn read_pending_requests(&self) -> Box<Iterator<Item=(bool, ServiceTask)>> {
+			Box::new(self.pending_requests.clone().into_iter())
+		}
+
+		fn publish_server_key(&self, server_key_id: &ServerKeyId, server_key: &Public) -> Result<(), String> {
+			self.published_keys.lock().push((server_key_id.clone(), server_key.clone()));
+			Ok(())
+		}
+	}
+}
diff --git a/secret_store/src/listener/service_contract_listener.rs b/secret_store/src/listener/service_contract_listener.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0d04a7daed98a63746448d8b5255258ad26402e1
--- /dev/null
+++ b/secret_store/src/listener/service_contract_listener.rs
@@ -0,0 +1,659 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::HashSet;
+use std::sync::Arc;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::thread;
+use parking_lot::Mutex;
+use ethcore::client::ChainNotify;
+use ethkey::{Random, Generator, Public, sign};
+use bytes::Bytes;
+use ethereum_types::{H256, U256};
+use key_server_set::KeyServerSet;
+use key_server_cluster::{ClusterClient, ClusterSessionsListener, ClusterSession};
+use key_server_cluster::generation_session::SessionImpl as GenerationSession;
+use key_storage::KeyStorage;
+use listener::service_contract::ServiceContract;
+use listener::tasks_queue::TasksQueue;
+use {ServerKeyId, NodeKeyPair, KeyServer};
+
+/// Retry interval (in blocks). Every RETRY_INTERVAL_BLOCKS blocks each KeyServer reads pending requests from
+/// service contract && tries to re-execute. The reason to have this mechanism is primarily because keys
+/// servers set change takes a lot of time + there could be some races, when blocks are coming to different
+/// KS at different times. This isn't intended to fix && respond to general session errors!
+const RETRY_INTERVAL_BLOCKS: usize = 30;
+
+/// Max failed retry requests (in single retry interval). The reason behind this constant is that if several
+/// pending requests have failed, then most probably other will fail too.
+const MAX_FAILED_RETRY_REQUESTS: usize = 1;
+
+/// SecretStore <-> Authority connector responsible for:
+/// 1. listening for new requests on SecretStore contract
+/// 2. redirecting requests to key server
+/// 3. publishing response on SecretStore contract
+pub struct ServiceContractListener {
+	/// Service contract listener data.
+	data: Arc<ServiceContractListenerData>,
+	/// Service thread handle.
+	service_handle: Option<thread::JoinHandle<()>>,
+}
+
+/// Service contract listener parameters.
+pub struct ServiceContractListenerParams {
+	/// Service contract.
+	pub contract: Arc<ServiceContract>,
+	/// Key server reference.
+	pub key_server: Arc<KeyServer>,
+	/// This node key pair.
+	pub self_key_pair: Arc<NodeKeyPair>,
+	/// Key servers set.
+	pub key_server_set: Arc<KeyServerSet>,
+	/// Cluster reference.
+	pub cluster: Arc<ClusterClient>,
+	/// Key storage reference.
+	pub key_storage: Arc<KeyStorage>,
+}
+
+/// Service contract listener data.
+struct ServiceContractListenerData {
+	/// Blocks since last retry.
+	pub last_retry: AtomicUsize,
+	/// Retry-related data.
+	pub retry_data: Mutex<ServiceContractRetryData>,
+	/// Service tasks queue.
+	pub tasks_queue: Arc<TasksQueue<ServiceTask>>,
+	/// Service contract.
+	pub contract: Arc<ServiceContract>,
+	/// Key server reference.
+	pub key_server: Arc<KeyServer>,
+	/// This node key pair.
+	pub self_key_pair: Arc<NodeKeyPair>,
+	/// Key servers set.
+	pub key_server_set: Arc<KeyServerSet>,
+	/// Key storage reference.
+	pub key_storage: Arc<KeyStorage>,
+
+}
+
+/// Retry-related data.
+#[derive(Default)]
+struct ServiceContractRetryData {
+	/// Server keys, which we have generated (or tried to generate) since last retry moment.
+	pub generated_keys: HashSet<ServerKeyId>,
+}
+
+/// Service task.
+#[derive(Debug, Clone, PartialEq)]
+pub enum ServiceTask {
+	/// Retry all 'stalled' tasks.
+	Retry,
+	/// Generate server key (server_key_id, threshold).
+	GenerateServerKey(H256, H256),
+	/// Confirm server key (server_key_id).
+	RestoreServerKey(H256),
+	/// Shutdown listener.
+	Shutdown,
+}
+
+impl ServiceContractListener {
+	/// Create new service contract listener.
+	pub fn new(params: ServiceContractListenerParams) -> Arc<ServiceContractListener> {
+		let data = Arc::new(ServiceContractListenerData {
+			last_retry: AtomicUsize::new(0),
+			retry_data: Default::default(),
+			tasks_queue: Arc::new(TasksQueue::new()),
+			contract: params.contract,
+			key_server: params.key_server,
+			self_key_pair: params.self_key_pair,
+			key_server_set: params.key_server_set,
+			key_storage: params.key_storage,
+		});
+		data.tasks_queue.push(ServiceTask::Retry);
+
+		// we are not starting thread when in test mode
+		let service_handle = if cfg!(test) {
+			None
+		} else {
+			let service_thread_data = data.clone();
+			Some(thread::spawn(move || Self::run_service_thread(service_thread_data)))
+		};
+		let contract = Arc::new(ServiceContractListener {
+			data: data,
+			service_handle: service_handle,
+		});
+		params.cluster.add_generation_listener(contract.clone());
+		contract
+	}
+
+	/// Process incoming events of service contract.
+	fn process_service_contract_events(&self) {
+		self.data.tasks_queue.push_many(self.data.contract.read_logs()
+			.filter_map(|topics| match topics.len() {
+				// when key is already generated && we have this key
+				3 if self.data.key_storage.get(&topics[1]).map(|k| k.is_some()).unwrap_or_default() => {
+					Some(ServiceTask::RestoreServerKey(
+						topics[1],
+					))
+				}
+				// when key is not yet generated && this node should be master of this key generation session
+				3 if is_processed_by_this_key_server(&*self.data.key_server_set, &*self.data.self_key_pair, &topics[1]) => {
+					Some(ServiceTask::GenerateServerKey(
+						topics[1],
+						topics[2],
+					))
+				},
+				3 => None,
+				l @ _ => {
+					warn!(target: "secretstore", "Ignoring ServerKeyRequested event with wrong number of params {}", l);
+					None
+				},
+			}));
+	}
+
+	/// Service thread procedure.
+	fn run_service_thread(data: Arc<ServiceContractListenerData>) {
+		loop {
+			let task = data.tasks_queue.wait();
+			trace!(target: "secretstore", "{}: processing {:?} task", data.self_key_pair.public(), task);
+
+			match task {
+				ServiceTask::Shutdown => break,
+				task @ _ => {
+					// the only possible reaction to an error is a trace && it is already happened
+					let _ = Self::process_service_task(&data, task);
+				},
+			};
+		}
+	}
+
+	/// Process single service task.
+	fn process_service_task(data: &Arc<ServiceContractListenerData>, task: ServiceTask) -> Result<(), String> {
+		match task {
+			ServiceTask::Retry =>
+				Self::retry_pending_requests(&data)
+					.map(|processed_requests| {
+						if processed_requests != 0 {
+							trace!(target: "secretstore", "{}: successfully retried {} pending requests",
+								data.self_key_pair.public(), processed_requests);
+						}
+						()
+					})
+					.map_err(|error| {
+						warn!(target: "secretstore", "{}: retrying pending requests has failed with: {}",
+							data.self_key_pair.public(), error);
+						error
+					}),
+			ServiceTask::RestoreServerKey(server_key_id) => {
+				data.retry_data.lock().generated_keys.insert(server_key_id.clone());
+				Self::restore_server_key(&data, &server_key_id)
+					.and_then(|server_key| Self::publish_server_key(&data, &server_key_id, &server_key))
+					.map(|_| {
+						trace!(target: "secretstore", "{}: processed RestoreServerKey({}) request",
+							data.self_key_pair.public(), server_key_id);
+						()
+					})
+					.map_err(|error| {
+						warn!(target: "secretstore", "{}: failed to process RestoreServerKey({}) request with: {}",
+							data.self_key_pair.public(), server_key_id, error);
+						error
+					})
+			},
+			ServiceTask::GenerateServerKey(server_key_id, threshold) => {
+				data.retry_data.lock().generated_keys.insert(server_key_id.clone());
+				Self::generate_server_key(&data, &server_key_id, &threshold)
+					.and_then(|server_key| Self::publish_server_key(&data, &server_key_id, &server_key))
+					.map(|_| {
+						trace!(target: "secretstore", "{}: processed GenerateServerKey({}, {}) request",
+							data.self_key_pair.public(), server_key_id, threshold);
+						()
+					})
+					.map_err(|error| {
+						warn!(target: "secretstore", "{}: failed to process GenerateServerKey({}, {}) request with: {}",
+							data.self_key_pair.public(), server_key_id, threshold, error);
+						error
+					})
+			},
+			ServiceTask::Shutdown => unreachable!("it must be checked outside"),
+		}
+	}
+
+	/// Retry processing pending requests.
+	fn retry_pending_requests(data: &Arc<ServiceContractListenerData>) -> Result<usize, String> {
+		let mut failed_requests = 0;
+		let mut processed_requests = 0;
+		let retry_data = ::std::mem::replace(&mut *data.retry_data.lock(), Default::default());
+		for (is_confirmed, task) in data.contract.read_pending_requests() {
+			// only process requests, which we haven't confirmed yet
+			if is_confirmed {
+				continue;
+			}
+
+			let request_result = match task {
+				ServiceTask::GenerateServerKey(server_key_id, threshold) => {
+					// only process request, which haven't been processed recently
+					// there could be a lag when we've just generated server key && retrying on the same block
+					// (or before our tx is mined) - state is not updated yet
+					if retry_data.generated_keys.contains(&server_key_id) {
+						continue;
+					}
+
+					// process request
+					let is_own_request = is_processed_by_this_key_server(&*data.key_server_set, &*data.self_key_pair, &server_key_id);
+					Self::process_service_task(data, match is_own_request {
+						true => ServiceTask::GenerateServerKey(server_key_id, threshold.into()),
+						false => ServiceTask::RestoreServerKey(server_key_id),
+					})
+				},
+				_ => Err("not supported".into()),
+			};
+
+			// process request result
+			match request_result {
+				Ok(_) => processed_requests += 1,
+				Err(_) => {
+					failed_requests += 1;
+					if failed_requests > MAX_FAILED_RETRY_REQUESTS {
+						return Err("too many failed requests".into());
+					}
+				},
+			}
+		}
+
+		Ok(processed_requests)
+	}
+
+	/// Generate server key.
+	fn generate_server_key(data: &Arc<ServiceContractListenerData>, server_key_id: &ServerKeyId, threshold: &H256) -> Result<Public, String> {
+		let threshold_num = threshold.low_u64();
+		if threshold != &threshold_num.into() || threshold_num >= ::std::usize::MAX as u64 {
+			return Err(format!("invalid threshold {:?}", threshold));
+		}
+
+		// key server expects signed server_key_id in server_key_generation procedure
+		// only signer could store document key for this server key later
+		// => this API (server key generation) is not suitable for usage in encryption via contract endpoint
+		let author_key = Random.generate().map_err(|e| format!("{}", e))?;
+		let server_key_id_signature = sign(author_key.secret(), server_key_id).map_err(|e| format!("{}", e))?;
+		data.key_server.generate_key(server_key_id, &server_key_id_signature, threshold_num as usize)
+			.map_err(Into::into)
+	}
+
+	/// Restore server key.
+	fn restore_server_key(data: &Arc<ServiceContractListenerData>, server_key_id: &ServerKeyId) -> Result<Public, String> {
+		data.key_storage.get(server_key_id)
+			.map_err(|e| format!("{}", e))
+			.and_then(|ks| ks.ok_or("missing key".to_owned()))
+			.map(|ks| ks.public)
+	}
+
+	/// Publish server key.
+	fn publish_server_key(data: &Arc<ServiceContractListenerData>, server_key_id: &ServerKeyId, server_key: &Public) -> Result<(), String> {
+		data.contract.publish_server_key(server_key_id, server_key)
+	}
+}
+
+impl Drop for ServiceContractListener {
+	fn drop(&mut self) {
+		if let Some(service_handle) = self.service_handle.take() {
+			self.data.tasks_queue.push_front(ServiceTask::Shutdown);
+			// ignore error as we are already closing
+			let _ = service_handle.join();
+		}
+	}
+}
+
+impl ChainNotify for ServiceContractListener {
+	fn new_blocks(&self, _imported: Vec<H256>, _invalid: Vec<H256>, enacted: Vec<H256>, _retracted: Vec<H256>, _sealed: Vec<H256>, _proposed: Vec<Bytes>, _duration: u64) {
+		let enacted_len = enacted.len();
+		if enacted_len == 0 {
+			return;
+		}
+
+		if !self.data.contract.update() {
+			return;
+		}
+
+		self.process_service_contract_events();
+
+		// schedule retry if received enough blocks since last retry
+		// it maybe inaccurate when switching syncing/synced states, but that's ok
+		if self.data.last_retry.fetch_add(enacted_len, Ordering::Relaxed) >= RETRY_INTERVAL_BLOCKS {
+			self.data.tasks_queue.push(ServiceTask::Retry);
+			self.data.last_retry.store(0, Ordering::Relaxed);
+		}
+	}
+}
+
+impl ClusterSessionsListener<GenerationSession> for ServiceContractListener {
+	fn on_session_removed(&self, session: Arc<GenerationSession>) {
+		// only publish when the session is started by another node
+		// when it is started by this node, it is published from process_service_task
+		if !is_processed_by_this_key_server(&*self.data.key_server_set, &*self.data.self_key_pair, &session.id()) {
+			// by this time sesion must already be completed - either successfully, or not
+			assert!(session.is_finished());
+
+			// ignore result - the only thing that we can do is to log the error
+			match session.wait(Some(Default::default()))
+				.map_err(|e| format!("{}", e))
+				.and_then(|server_key| Self::publish_server_key(&self.data, &session.id(), &server_key)) {
+				Ok(_) => trace!(target: "secretstore", "{}: completed foreign GenerateServerKey({}) request",
+					self.data.self_key_pair.public(), session.id()),
+				Err(error) => warn!(target: "secretstore", "{}: failed to process GenerateServerKey({}) request with: {}",
+					self.data.self_key_pair.public(), session.id(), error),
+			}
+		}
+	}
+}
+
+/// Returns true when session, related to `server_key_id` must be started on this KeyServer.
+fn is_processed_by_this_key_server(key_server_set: &KeyServerSet, self_key_pair: &NodeKeyPair, server_key_id: &H256) -> bool {
+	let servers = key_server_set.snapshot().current_set;
+	let total_servers_count = servers.len();
+	match total_servers_count {
+		0 => return false,
+		1 => return true,
+		_ => (),
+	}
+
+	let this_server_index = match servers.keys().enumerate().find(|&(_, s)| s == self_key_pair.public()) {
+		Some((index, _)) => index,
+		None => return false,
+	};
+
+	let server_key_id_value: U256 = server_key_id.into();
+	let range_interval = U256::max_value() / total_servers_count.into();
+	let range_begin = (range_interval + 1.into()) * this_server_index as u32;
+	let range_end = range_begin.saturating_add(range_interval);
+
+	server_key_id_value >= range_begin && server_key_id_value <= range_end
+}
+
+#[cfg(test)]
+mod tests {
+	use std::sync::Arc;
+	use std::sync::atomic::Ordering;
+	use ethkey::{Random, Generator, KeyPair};
+	use listener::service_contract::ServiceContract;
+	use listener::service_contract::tests::DummyServiceContract;
+	use key_server_cluster::DummyClusterClient;
+	use key_server::tests::DummyKeyServer;
+	use key_storage::{KeyStorage, DocumentKeyShare};
+	use key_storage::tests::DummyKeyStorage;
+	use key_server_set::tests::MapKeyServerSet;
+	use PlainNodeKeyPair;
+	use super::{ServiceTask, ServiceContractListener, ServiceContractListenerParams, is_processed_by_this_key_server};
+
+	fn make_service_contract_listener(contract: Option<Arc<ServiceContract>>, key_server: Option<Arc<DummyKeyServer>>, key_storage: Option<Arc<KeyStorage>>) -> Arc<ServiceContractListener> {
+		let contract = contract.unwrap_or_else(|| Arc::new(DummyServiceContract::default()));
+		let key_server = key_server.unwrap_or_else(|| Arc::new(DummyKeyServer::default()));
+		let key_storage = key_storage.unwrap_or_else(|| Arc::new(DummyKeyStorage::default()));
+		let servers_set = Arc::new(MapKeyServerSet::new(vec![
+			("79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8".parse().unwrap(),
+				"127.0.0.1:8080".parse().unwrap()),
+			("c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee51ae168fea63dc339a3c58419466ceaeef7f632653266d0e1236431a950cfe52a".parse().unwrap(),
+				"127.0.0.1:8080".parse().unwrap()),
+			("f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9388f7b0f632de8140fe337e62a37f3566500a99934c2231b6cb9fd7584b8e672".parse().unwrap(),
+				"127.0.0.1:8080".parse().unwrap()),
+		].into_iter().collect()));
+		let self_key_pair = Arc::new(PlainNodeKeyPair::new(KeyPair::from_secret("0000000000000000000000000000000000000000000000000000000000000001".parse().unwrap()).unwrap()));
+		ServiceContractListener::new(ServiceContractListenerParams {
+			contract: contract,
+			key_server: key_server,
+			self_key_pair: self_key_pair,
+			key_server_set: servers_set,
+			cluster: Arc::new(DummyClusterClient::default()),
+			key_storage: key_storage,
+		})
+	}
+
+	#[test]
+	fn is_not_processed_by_this_key_server_with_zero_servers() {
+		assert_eq!(is_processed_by_this_key_server(
+			&MapKeyServerSet::default(),
+			&PlainNodeKeyPair::new(Random.generate().unwrap()),
+			&Default::default()), false);
+	}
+
+	#[test]
+	fn is_processed_by_this_key_server_with_single_server() {
+		let self_key_pair = Random.generate().unwrap();
+		assert_eq!(is_processed_by_this_key_server(
+			&MapKeyServerSet::new(vec![
+				(self_key_pair.public().clone(), "127.0.0.1:8080".parse().unwrap())
+			].into_iter().collect()),
+			&PlainNodeKeyPair::new(self_key_pair),
+			&Default::default()), true);
+	}
+
+	#[test]
+	fn is_not_processed_by_this_key_server_when_not_a_part_of_servers_set() {
+		assert!(is_processed_by_this_key_server(
+			&MapKeyServerSet::new(vec![
+				(Random.generate().unwrap().public().clone(), "127.0.0.1:8080".parse().unwrap())
+			].into_iter().collect()),
+			&PlainNodeKeyPair::new(Random.generate().unwrap()),
+			&Default::default()));
+	}
+
+	#[test]
+	fn is_processed_by_this_key_server_in_set_of_3() {
+		// servers set is ordered && server range depends on index of this server
+		let servers_set = MapKeyServerSet::new(vec![
+			// secret: 0000000000000000000000000000000000000000000000000000000000000001
+			("79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8".parse().unwrap(),
+				"127.0.0.1:8080".parse().unwrap()),
+			// secret: 0000000000000000000000000000000000000000000000000000000000000002
+			("c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee51ae168fea63dc339a3c58419466ceaeef7f632653266d0e1236431a950cfe52a".parse().unwrap(),
+				"127.0.0.1:8080".parse().unwrap()),
+			// secret: 0000000000000000000000000000000000000000000000000000000000000003
+			("f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9388f7b0f632de8140fe337e62a37f3566500a99934c2231b6cb9fd7584b8e672".parse().unwrap(),
+				"127.0.0.1:8080".parse().unwrap()),
+		].into_iter().collect());
+
+		// 1st server: process hashes [0x0; 0x555...555]
+		let key_pair = PlainNodeKeyPair::new(KeyPair::from_secret(
+			"0000000000000000000000000000000000000000000000000000000000000001".parse().unwrap()).unwrap());
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"0000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"3000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"5555555555555555555555555555555555555555555555555555555555555555".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"5555555555555555555555555555555555555555555555555555555555555556".parse().unwrap()), false);
+
+		// 2nd server: process hashes from 0x555...556 to 0xaaa...aab
+		let key_pair = PlainNodeKeyPair::new(KeyPair::from_secret(
+			"0000000000000000000000000000000000000000000000000000000000000002".parse().unwrap()).unwrap());
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"5555555555555555555555555555555555555555555555555555555555555555".parse().unwrap()), false);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"5555555555555555555555555555555555555555555555555555555555555556".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"7555555555555555555555555555555555555555555555555555555555555555".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaac".parse().unwrap()), false);
+
+		// 3rd server: process hashes from 0x800...000 to 0xbff...ff
+		let key_pair = PlainNodeKeyPair::new(KeyPair::from_secret(
+			"0000000000000000000000000000000000000000000000000000000000000003".parse().unwrap()).unwrap());
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab".parse().unwrap()), false);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaac".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaac".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".parse().unwrap()), true);
+	}
+
+	#[test]
+	fn is_processed_by_this_key_server_in_set_of_4() {
+		// servers set is ordered && server range depends on index of this server
+		let servers_set = MapKeyServerSet::new(vec![
+			// secret: 0000000000000000000000000000000000000000000000000000000000000001
+			("79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8".parse().unwrap(),
+				"127.0.0.1:8080".parse().unwrap()),
+			// secret: 0000000000000000000000000000000000000000000000000000000000000002
+			("c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee51ae168fea63dc339a3c58419466ceaeef7f632653266d0e1236431a950cfe52a".parse().unwrap(),
+				"127.0.0.1:8080".parse().unwrap()),
+			// secret: 0000000000000000000000000000000000000000000000000000000000000004
+			("e493dbf1c10d80f3581e4904930b1404cc6c13900ee0758474fa94abe8c4cd1351ed993ea0d455b75642e2098ea51448d967ae33bfbdfe40cfe97bdc47739922".parse().unwrap(),
+				"127.0.0.1:8080".parse().unwrap()),
+			// secret: 0000000000000000000000000000000000000000000000000000000000000003
+			("f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9388f7b0f632de8140fe337e62a37f3566500a99934c2231b6cb9fd7584b8e672".parse().unwrap(),
+				"127.0.0.1:8080".parse().unwrap()),
+		].into_iter().collect());
+
+		// 1st server: process hashes [0x0; 0x3ff...ff]
+		let key_pair = PlainNodeKeyPair::new(KeyPair::from_secret(
+			"0000000000000000000000000000000000000000000000000000000000000001".parse().unwrap()).unwrap());
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"0000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"2000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"3fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"4000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), false);
+
+		// 2nd server: process hashes from 0x400...000 to 0x7ff...ff
+		let key_pair = PlainNodeKeyPair::new(KeyPair::from_secret(
+			"0000000000000000000000000000000000000000000000000000000000000002".parse().unwrap()).unwrap());
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"3fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".parse().unwrap()), false);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"4000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"6000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"8000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), false);
+
+		// 3rd server: process hashes from 0x800...000 to 0xbff...ff
+		let key_pair = PlainNodeKeyPair::new(KeyPair::from_secret(
+			"0000000000000000000000000000000000000000000000000000000000000004".parse().unwrap()).unwrap());
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".parse().unwrap()), false);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"8000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"a000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"bfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"c000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), false);
+
+		// 4th server: process hashes from 0xc00...000 to 0xfff...ff
+		let key_pair = PlainNodeKeyPair::new(KeyPair::from_secret(
+			"0000000000000000000000000000000000000000000000000000000000000003".parse().unwrap()).unwrap());
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"bfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".parse().unwrap()), false);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"c000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"e000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()), true);
+		assert_eq!(is_processed_by_this_key_server(&servers_set, &key_pair,
+			&"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".parse().unwrap()), true);
+	}
+
+	#[test]
+	fn no_tasks_scheduled_when_no_contract_events() {
+		let listener = make_service_contract_listener(None, None, None);
+		assert_eq!(listener.data.tasks_queue.snapshot().len(), 1);
+		listener.process_service_contract_events();
+		assert_eq!(listener.data.tasks_queue.snapshot().len(), 1);
+	}
+
+	#[test]
+	fn server_key_generation_is_scheduled_when_requested_key_is_unknown() {
+		let mut contract = DummyServiceContract::default();
+		contract.logs.push(vec![Default::default(), Default::default(), Default::default()]);
+		let listener = make_service_contract_listener(Some(Arc::new(contract)), None, None);
+		assert_eq!(listener.data.tasks_queue.snapshot().len(), 1);
+		listener.process_service_contract_events();
+		assert_eq!(listener.data.tasks_queue.snapshot().len(), 2);
+		assert_eq!(listener.data.tasks_queue.snapshot().pop_back(), Some(ServiceTask::GenerateServerKey(Default::default(), Default::default())));
+	}
+
+	#[test]
+	fn no_new_tasks_scheduled_when_requested_key_is_unknown_and_request_belongs_to_other_key_server() {
+		let server_key_id = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".parse().unwrap();
+		let mut contract = DummyServiceContract::default();
+		contract.logs.push(vec![Default::default(), server_key_id, Default::default()]);
+		let listener = make_service_contract_listener(Some(Arc::new(contract)), None, None);
+		assert_eq!(listener.data.tasks_queue.snapshot().len(), 1);
+		listener.process_service_contract_events();
+		assert_eq!(listener.data.tasks_queue.snapshot().len(), 1);
+	}
+
+	#[test]
+	fn server_key_restore_is_scheduled_when_requested_key_is_known() {
+		let mut contract = DummyServiceContract::default();
+		contract.logs.push(vec![Default::default(), Default::default(), Default::default()]);
+		let listener = make_service_contract_listener(Some(Arc::new(contract)), None, None);
+		listener.data.key_storage.insert(Default::default(), Default::default()).unwrap();
+		assert_eq!(listener.data.tasks_queue.snapshot().len(), 1);
+		listener.process_service_contract_events();
+		assert_eq!(listener.data.tasks_queue.snapshot().len(), 2);
+		assert_eq!(listener.data.tasks_queue.snapshot().pop_back(), Some(ServiceTask::RestoreServerKey(Default::default())));
+	}
+
+	#[test]
+	fn no_new_tasks_scheduled_when_wrong_number_of_topics_in_log() {
+		let mut contract = DummyServiceContract::default();
+		contract.logs.push(vec![Default::default(), Default::default()]);
+		let listener = make_service_contract_listener(Some(Arc::new(contract)), None, None);
+		assert_eq!(listener.data.tasks_queue.snapshot().len(), 1);
+		listener.process_service_contract_events();
+		assert_eq!(listener.data.tasks_queue.snapshot().len(), 1);
+	}
+
+	#[test]
+	fn generation_session_is_created_when_processing_generate_server_key_task() {
+		let key_server = Arc::new(DummyKeyServer::default());
+		let listener = make_service_contract_listener(None, Some(key_server.clone()), None);
+		ServiceContractListener::process_service_task(&listener.data, ServiceTask::GenerateServerKey(Default::default(), Default::default())).unwrap_err();
+		assert_eq!(key_server.generation_requests_count.load(Ordering::Relaxed), 1);
+	}
+
+	#[test]
+	fn key_is_read_and_published_when_processing_restore_server_key_task() {
+		let contract = Arc::new(DummyServiceContract::default());
+		let key_storage = Arc::new(DummyKeyStorage::default());
+		let mut key_share = DocumentKeyShare::default();
+		key_share.public = KeyPair::from_secret("0000000000000000000000000000000000000000000000000000000000000001".parse().unwrap()).unwrap().public().clone();
+		key_storage.insert(Default::default(), key_share.clone()).unwrap();
+		let listener = make_service_contract_listener(Some(contract.clone()), None, Some(key_storage));
+		ServiceContractListener::process_service_task(&listener.data, ServiceTask::RestoreServerKey(Default::default())).unwrap();
+		assert_eq!(*contract.published_keys.lock(), vec![(Default::default(), key_share.public)]);
+	}
+
+	#[test]
+	fn generation_is_not_retried_if_tried_in_the_same_cycle() {
+		let mut contract = DummyServiceContract::default();
+		contract.pending_requests.push((false, ServiceTask::GenerateServerKey(Default::default(), Default::default())));
+		let key_server = Arc::new(DummyKeyServer::default());
+		let listener = make_service_contract_listener(Some(Arc::new(contract)), Some(key_server.clone()), None);
+		listener.data.retry_data.lock().generated_keys.insert(Default::default());
+		ServiceContractListener::retry_pending_requests(&listener.data).unwrap();
+		assert_eq!(key_server.generation_requests_count.load(Ordering::Relaxed), 0);
+	}
+}
diff --git a/secret_store/src/listener/tasks_queue.rs b/secret_store/src/listener/tasks_queue.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e228d12cef81141d289fa7794aeb85ae545e81d8
--- /dev/null
+++ b/secret_store/src/listener/tasks_queue.rs
@@ -0,0 +1,78 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::VecDeque;
+use parking_lot::{Mutex, Condvar};
+
+#[derive(Default)]
+/// General deque-based tasks queue.
+pub struct TasksQueue<Task: Clone> {
+	/// Service event.
+	service_event: Condvar,
+	/// Service tasks queue.
+	service_tasks: Mutex<VecDeque<Task>>,
+}
+
+impl<Task> TasksQueue<Task> where Task: Clone {
+	/// Create new tasks queue.
+	pub fn new() -> Self {
+		TasksQueue {
+			service_event: Condvar::new(),
+			service_tasks: Mutex::new(VecDeque::new()),
+		}
+	}
+
+	#[cfg(test)]
+	/// Get current tasks snapshot.
+	pub fn snapshot(&self) -> VecDeque<Task> {
+		self.service_tasks.lock().clone()
+	}
+
+	/// Push task to the front of queue.
+	pub fn push_front(&self, task: Task) {
+		let mut service_tasks = self.service_tasks.lock();
+		service_tasks.push_front(task);
+		self.service_event.notify_all();
+	}
+
+	/// Push task to the back of queue.
+	pub fn push(&self, task: Task) {
+		let mut service_tasks = self.service_tasks.lock();
+		service_tasks.push_back(task);
+		self.service_event.notify_all();
+	}
+
+	/// Push task to the back of queue.
+	pub fn push_many<I: Iterator<Item=Task>>(&self, tasks: I) {
+		let mut service_tasks = self.service_tasks.lock();
+		let previous_len = service_tasks.len();
+		service_tasks.extend(tasks);
+		if service_tasks.len() != previous_len {
+			self.service_event.notify_all();
+		}
+	}
+
+	/// Wait for new task (task is removed from the front of queue).
+	pub fn wait(&self) -> Task {
+		let mut service_tasks = self.service_tasks.lock();
+		if service_tasks.is_empty() {
+			self.service_event.wait(&mut service_tasks);
+		}
+
+		service_tasks.pop_front()
+			.expect("service_event is only fired when there are new tasks; qed")
+	}
+}
diff --git a/secret_store/src/node_key_pair.rs b/secret_store/src/node_key_pair.rs
index ce6c88a07b7f8a3614690d664c80a9d3f680894e..75c840185684e7be8c245b4fb20f04fe0b4eaa1f 100644
--- a/secret_store/src/node_key_pair.rs
+++ b/secret_store/src/node_key_pair.rs
@@ -16,9 +16,9 @@
 
 use std::sync::Arc;
 use ethcrypto::ecdh::agree;
-use ethkey::{KeyPair, Public, Signature, Error as EthKeyError, sign};
+use ethkey::{KeyPair, Public, Signature, Error as EthKeyError, sign, public_to_address};
 use ethcore::account_provider::AccountProvider;
-use util::{Address, H256};
+use ethereum_types::{H256, Address};
 use traits::NodeKeyPair;
 
 pub struct PlainNodeKeyPair {
@@ -45,6 +45,10 @@ impl NodeKeyPair for PlainNodeKeyPair {
 		self.key_pair.public()
 	}
 
+	fn address(&self) -> Address {
+		public_to_address(self.key_pair.public())
+	}
+
 	fn sign(&self, data: &H256) -> Result<Signature, EthKeyError> {
 		sign(self.key_pair.secret(), data)
 	}
@@ -72,6 +76,10 @@ impl NodeKeyPair for KeyStoreNodeKeyPair {
 		&self.public
 	}
 
+	fn address(&self) -> Address {
+		public_to_address(&self.public)
+	}
+
 	fn sign(&self, data: &H256) -> Result<Signature, EthKeyError> {
 		self.account_provider.sign(self.address.clone(), Some(self.password.clone()), data.clone())
 			.map_err(|e| EthKeyError::Custom(format!("{}", e)))
diff --git a/secret_store/src/serialization.rs b/secret_store/src/serialization.rs
index ad26bf7d4b50e204cfa9fa071c29c48211793cf7..95f67909677c4ee0cc7d7dd0c51acd65c8af4e31 100644
--- a/secret_store/src/serialization.rs
+++ b/secret_store/src/serialization.rs
@@ -15,331 +15,144 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::fmt;
-use std::cmp::{Ord, PartialOrd, Ordering};
 use std::ops::Deref;
 use rustc_hex::{ToHex, FromHex};
 use serde::{Serialize, Deserialize, Serializer, Deserializer};
 use serde::de::{Visitor, Error as SerdeError};
 use ethkey::{Public, Secret, Signature};
-use util::{H256, Bytes};
+use ethereum_types::{H160, H256};
+use bytes::Bytes;
+use types::all::Requester;
 
-/// Serializable message hash.
-pub type SerializableMessageHash = SerializableH256;
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-/// Serializable shadow decryption result.
-pub struct SerializableEncryptedDocumentKeyShadow {
-	/// Decrypted secret point. It is partially decrypted if shadow decrpytion was requested.
-	pub decrypted_secret: SerializablePublic,
-	/// Shared common point.
-	pub common_point: SerializablePublic,
-	/// If shadow decryption was requested: shadow decryption coefficients, encrypted with requestor public.
-	pub decrypt_shadows: Vec<SerializableBytes>,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-/// Serializable Bytes.
-pub struct SerializableBytes(pub Bytes);
-
-impl<T> From<T> for SerializableBytes where Bytes: From<T> {
-	fn from(s: T) -> SerializableBytes {
-		SerializableBytes(s.into())
-	}
-}
-
-impl Into<Bytes> for SerializableBytes {
-	fn into(self) -> Bytes {
-		self.0
-	}
-}
-
-impl Deref for SerializableBytes {
-	type Target = Bytes;
-
-	fn deref(&self) -> &Bytes {
-		&self.0
-	}
-}
-
-impl Serialize for SerializableBytes {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
-		let mut serialized = "0x".to_owned();
-		serialized.push_str(self.0.to_hex().as_ref());
-		serializer.serialize_str(serialized.as_ref())
+macro_rules! impl_bytes_deserialize {
+	($name: ident, $value: expr, true) => {
+		$value[2..].from_hex().map($name).map_err(SerdeError::custom)
+	};
+	($name: ident, $value: expr, false) => {
+		$value[2..].parse().map($name).map_err(SerdeError::custom)
 	}
 }
 
-impl<'a> Deserialize<'a> for SerializableBytes {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-		where D: Deserializer<'a>
-	{
-		let s = String::deserialize(deserializer)?;
-		if s.len() >= 2 && &s[0..2] == "0x" && s.len() & 1 == 0 {
-			let data = s[2..].from_hex().map_err(SerdeError::custom)?;
-			Ok(SerializableBytes(data))
-		} else {
-			Err(SerdeError::custom("invalid format"))
-		}
-	}
-}
-
-#[derive(Clone, Debug)]
-/// Serializable Signature.
-pub struct SerializableSignature(pub Signature);
-
-impl<T> From<T> for SerializableSignature where Signature: From<T> {
-	fn from(s: T) -> SerializableSignature {
-		SerializableSignature(s.into())
-	}
-}
+macro_rules! impl_bytes {
+	($name: ident, $other: ident, $from_hex: ident, ($($trait: ident),*)) => {
+		#[derive(Clone, Debug, PartialEq, Eq, $($trait,)*)]
+		pub struct $name(pub $other);
 
-impl Into<Signature> for SerializableSignature {
-	fn into(self) -> Signature {
-		self.0
-	}
-}
-
-impl Deref for SerializableSignature {
-	type Target = Signature;
-
-	fn deref(&self) -> &Signature {
-		&self.0
-	}
-}
-
-impl Serialize for SerializableSignature {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
-		let mut serialized = "0x".to_owned();
-		serialized.push_str(self.0.to_hex().as_ref());
-		serializer.serialize_str(serialized.as_ref())
-	}
-}
-
-impl<'a> Deserialize<'a> for SerializableSignature {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'a> {
-		struct HashVisitor;
-
-		impl<'b> Visitor<'b> for HashVisitor {
-			type Value = SerializableSignature;
-
-			fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-				write!(formatter, "a hex-encoded Signature")
-			}
-
-			fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-				if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
-					value[2..].parse().map(|s| SerializableSignature(s)).map_err(SerdeError::custom)
-				} else {
-					Err(SerdeError::custom("invalid format"))
-				}
+		impl<T> From<T> for $name where $other: From<T> {
+			fn from(s: T) -> $name {
+				$name(s.into())
 			}
+		}
 
-			fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-				self.visit_str(value.as_ref())
+		impl Into<$other> for $name {
+			fn into(self) -> $other {
+				self.0
 			}
 		}
 
-		deserializer.deserialize_any(HashVisitor)
-	}
-}
-
-#[derive(Clone, Debug)]
-/// Serializable H256.
-pub struct SerializableH256(pub H256);
-
-impl<T> From<T> for SerializableH256 where H256: From<T> {
-	fn from(s: T) -> SerializableH256 {
-		SerializableH256(s.into())
-	}
-}
-
-impl Into<H256> for SerializableH256 {
-	fn into(self) -> H256 {
-		self.0
-	}
-}
-
-impl Deref for SerializableH256 {
-	type Target = H256;
-
-	fn deref(&self) -> &H256 {
-		&self.0
-	}
-}
-
-impl Serialize for SerializableH256 {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
-		let mut serialized = "0x".to_owned();
-		serialized.push_str(self.0.to_hex().as_ref());
-		serializer.serialize_str(serialized.as_ref())
-	}
-}
-
-impl<'a> Deserialize<'a> for SerializableH256 {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'a> {
-		struct HashVisitor;
-
-		impl<'b> Visitor<'b> for HashVisitor {
-			type Value = SerializableH256;
+		impl Deref for $name {
+			type Target = $other;
 
-			fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-				write!(formatter, "a hex-encoded H256")
-			}
-
-			fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-				if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
-					value[2..].parse().map(|s| SerializableH256(s)).map_err(SerdeError::custom)
-				} else {
-					Err(SerdeError::custom("invalid format"))
-				}
+			fn deref(&self) -> &$other {
+				&self.0
 			}
+		}
 
-			fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-				self.visit_str(value.as_ref())
+		impl Serialize for $name {
+			fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
+				let mut serialized = "0x".to_owned();
+				serialized.push_str(self.0.to_hex().as_ref());
+				serializer.serialize_str(serialized.as_ref())
 			}
 		}
 
-		deserializer.deserialize_any(HashVisitor)
-	}
-}
-
-#[derive(Clone, Debug)]
-/// Serializable EC scalar/secret key.
-pub struct SerializableSecret(pub Secret);
-
-impl<T> From<T> for SerializableSecret where Secret: From<T> {
-	fn from(s: T) -> SerializableSecret {
-		SerializableSecret(s.into())
-	}
-}
-
-impl Into<Secret> for SerializableSecret {
-	fn into(self) -> Secret {
-		self.0
-	}
-}
-
-impl Deref for SerializableSecret {
-	type Target = Secret;
-
-	fn deref(&self) -> &Secret {
-		&self.0
-	}
-}
+		impl<'a> Deserialize<'a> for $name {
+			fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'a> {
+				struct HexBytesVisitor;
 
-impl Serialize for SerializableSecret {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
-		let mut serialized = "0x".to_owned();
-		serialized.push_str(self.0.to_hex().as_ref());
-		serializer.serialize_str(serialized.as_ref())
-	}
-}
+				impl<'b> Visitor<'b> for HexBytesVisitor {
+					type Value = $name;
 
-impl<'a> Deserialize<'a> for SerializableSecret {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'a> {
-		struct HashVisitor;
+					fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+						write!(formatter, "a hex-encoded bytes string")
+					}
 
-		impl<'b> Visitor<'b> for HashVisitor {
-			type Value = SerializableSecret;
+					fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
+						if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
+							impl_bytes_deserialize!($name, value, $from_hex)
+						} else {
+							Err(SerdeError::custom("invalid format"))
+						}
+					}
 
-			fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-				write!(formatter, "a hex-encoded EC scalar")
-			}
-
-			fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-				if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
-					value[2..].parse().map(|s| SerializableSecret(s)).map_err(SerdeError::custom)
-				} else {
-					Err(SerdeError::custom("invalid format"))
+					fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
+						self.visit_str(value.as_ref())
+					}
 				}
-			}
 
-			fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-				self.visit_str(value.as_ref())
+				deserializer.deserialize_any(HexBytesVisitor)
 			}
 		}
-
-		deserializer.deserialize_any(HashVisitor)
 	}
 }
 
-#[derive(Clone, Debug)]
-/// Serializable EC point/public key.
-pub struct SerializablePublic(pub Public);
-
-impl<T> From<T> for SerializablePublic where Public: From<T> {
-	fn from(p: T) -> SerializablePublic {
-		SerializablePublic(p.into())
-	}
-}
-
-impl Into<Public> for SerializablePublic {
-	fn into(self) -> Public {
-		self.0
-	}
-}
-
-impl Deref for SerializablePublic {
-	type Target = Public;
-
-	fn deref(&self) -> &Public {
-		&self.0
-	}
-}
-
-impl Eq for SerializablePublic { }
-
-impl PartialEq for SerializablePublic {
-	fn eq(&self, other: &SerializablePublic) -> bool {
-		self.0.eq(&other.0)
-	}
-}
+/// Serializable message hash.
+pub type SerializableMessageHash = SerializableH256;
+/// Serializable address;
+pub type SerializableAddress = SerializableH160;
 
-impl Ord for SerializablePublic {
-	fn cmp(&self, other: &SerializablePublic) -> Ordering {
-		self.0.cmp(&other.0)
-	}
-}
+/// Serializable Bytes.
+impl_bytes!(SerializableBytes, Bytes, true, (Default));
+/// Serializable H256.
+impl_bytes!(SerializableH256, H256, false, (Default, PartialOrd, Ord));
+/// Serializable H160.
+impl_bytes!(SerializableH160, H160, false, (Default));
+/// Serializable H512 (aka Public).
+impl_bytes!(SerializablePublic, Public, false, (Default, PartialOrd, Ord));
+/// Serializable Secret.
+impl_bytes!(SerializableSecret, Secret, false, ());
+/// Serializable Signature.
+impl_bytes!(SerializableSignature, Signature, false, ());
 
-impl PartialOrd for SerializablePublic {
-	fn partial_cmp(&self, other: &SerializablePublic) -> Option<Ordering> {
-		self.0.partial_cmp(&other.0)
-	}
+/// Serializable shadow decryption result.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SerializableEncryptedDocumentKeyShadow {
+	/// Decrypted secret point. It is partially decrypted if shadow decrpytion was requested.
+	pub decrypted_secret: SerializablePublic,
+	/// Shared common point.
+	pub common_point: SerializablePublic,
+	/// If shadow decryption was requested: shadow decryption coefficients, encrypted with requestor public.
+	pub decrypt_shadows: Vec<SerializableBytes>,
 }
 
-impl Serialize for SerializablePublic {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
-		let mut serialized = "0x".to_owned();
-		serialized.push_str(self.0.to_hex().as_ref());
-		serializer.serialize_str(serialized.as_ref())
+/// Serializable requester identification data.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum SerializableRequester {
+	/// Requested with server key id signature.
+	Signature(SerializableSignature),
+	/// Requested with public key.
+	Public(SerializablePublic),
+	/// Requested with verified address.
+	Address(SerializableAddress),
+}
+
+impl From<SerializableRequester> for Requester {
+	fn from(requester: SerializableRequester) -> Requester {
+		match requester {
+			SerializableRequester::Signature(signature) => Requester::Signature(signature.into()),
+			SerializableRequester::Public(public) => Requester::Public(public.into()),
+			SerializableRequester::Address(address) => Requester::Address(address.into()),
+		}
 	}
 }
 
-impl<'a> Deserialize<'a> for SerializablePublic {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'a> {
-		struct HashVisitor;
-
-		impl<'b> Visitor<'b> for HashVisitor {
-			type Value = SerializablePublic;
-
-			fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-				write!(formatter, "a hex-encoded EC point")
-			}
-
-			fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-				if value.len() >= 2 && &value[0..2] == "0x" && value.len() & 1 == 0 {
-					value[2..].parse().map(|s| SerializablePublic(s)).map_err(SerdeError::custom)
-				} else {
-					Err(SerdeError::custom("invalid format"))
-				}
-			}
-
-			fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-				self.visit_str(value.as_ref())
-			}
+impl From<Requester> for SerializableRequester {
+	fn from(requester: Requester) -> SerializableRequester {
+		match requester {
+			Requester::Signature(signature) => SerializableRequester::Signature(signature.into()),
+			Requester::Public(public) => SerializableRequester::Public(public.into()),
+			Requester::Address(address) => SerializableRequester::Address(address.into()),
 		}
-
-		deserializer.deserialize_any(HashVisitor)
 	}
 }
 
diff --git a/secret_store/src/traits.rs b/secret_store/src/traits.rs
index 31da748e010689565517ca876bcac4553117d99c..d486cfb10e10f204ec7da553b432475730353745 100644
--- a/secret_store/src/traits.rs
+++ b/secret_store/src/traits.rs
@@ -14,15 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::collections::BTreeSet;
 use ethkey::{KeyPair, Signature, Error as EthKeyError};
-use util::H256;
+use ethereum_types::{H256, Address};
 use types::all::{Error, Public, ServerKeyId, MessageHash, EncryptedMessageSignature, RequestSignature, EncryptedDocumentKey,
-	EncryptedDocumentKeyShadow};
+	EncryptedDocumentKeyShadow, NodeId};
 
 /// Node key pair.
 pub trait NodeKeyPair: Send + Sync {
 	/// Public portion of key.
 	fn public(&self) -> &Public;
+	/// Address of key owner.
+	fn address(&self) -> Address;
 	/// Sign data with node key.
 	fn sign(&self, data: &H256) -> Result<Signature, EthKeyError>;
 	/// Compute shared key to encrypt channel between two nodes.
@@ -73,16 +76,30 @@ pub trait DocumentKeyServer: ServerKeyGenerator {
 
 /// Message signer.
 pub trait MessageSigner: ServerKeyGenerator {
-	/// Sign message with previously generated SK.
+	/// Generate Schnorr signature for message with previously generated SK.
 	/// `key_id` is the caller-provided identifier of generated SK.
 	/// `signature` is `key_id`, signed with caller public key.
 	/// `message` is the message to be signed.
 	/// Result is a signed message, encrypted with caller public key.
-	fn sign_message(&self, key_id: &ServerKeyId, signature: &RequestSignature, message: MessageHash) -> Result<EncryptedMessageSignature, Error>;
+	fn sign_message_schnorr(&self, key_id: &ServerKeyId, signature: &RequestSignature, message: MessageHash) -> Result<EncryptedMessageSignature, Error>;
+	/// Generate ECDSA signature for message with previously generated SK.
+	/// WARNING: only possible when SK was generated using t <= 2 * N.
+	/// `key_id` is the caller-provided identifier of generated SK.
+	/// `signature` is `key_id`, signed with caller public key.
+	/// `message` is the message to be signed.
+	/// Result is a signed message, encrypted with caller public key.
+	fn sign_message_ecdsa(&self, key_id: &ServerKeyId, signature: &RequestSignature, message: MessageHash) -> Result<EncryptedMessageSignature, Error>;
 }
 
+/// Administrative sessions server.
+pub trait AdminSessionsServer {
+	/// Change servers set so that nodes in new_servers_set became owners of shares for all keys.
+	/// And old nodes (i.e. cluste nodes except new_servers_set) have clear databases.
+	/// WARNING: newly generated keys will be distributed among all cluster nodes. So this session
+	/// must be followed with cluster nodes change (either via contract, or config files).
+	fn change_servers_set(&self, old_set_signature: RequestSignature, new_set_signature: RequestSignature, new_servers_set: BTreeSet<NodeId>) -> Result<(), Error>;
+}
 
-#[ipc(client_ident="RemoteKeyServer")]
 /// Key server.
-pub trait KeyServer: DocumentKeyServer + MessageSigner + Send + Sync {
+pub trait KeyServer: AdminSessionsServer + DocumentKeyServer + MessageSigner + Send + Sync {
 }
diff --git a/secret_store/src/trusted_client.rs b/secret_store/src/trusted_client.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8a0f83d44f32d00b34c8e70323789473b3d1328f
--- /dev/null
+++ b/secret_store/src/trusted_client.rs
@@ -0,0 +1,57 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::{Arc, Weak};
+use ethcore::client::{Client, BlockChainClient, ChainInfo};
+use ethsync::SyncProvider;
+
+#[derive(Clone)]
+/// 'Trusted' client weak reference.
+pub struct TrustedClient {
+	/// Blockchain client.
+	client: Weak<Client>,
+	/// Sync provider.
+	sync: Weak<SyncProvider>,
+}
+
+impl TrustedClient {
+	/// Create new trusted client.
+	pub fn new(client: Arc<Client>, sync: Arc<SyncProvider>) -> Self {
+		TrustedClient {
+			client: Arc::downgrade(&client),
+			sync: Arc::downgrade(&sync),
+		}
+	}
+
+	/// Get 'trusted' `Client` reference only if it is synchronized && trusted.
+	pub fn get(&self) -> Option<Arc<Client>> {
+		self.client.upgrade()
+			.and_then(|client| self.sync.upgrade().map(|sync| (client, sync)))
+			.and_then(|(client, sync)| {
+				let is_synced = !sync.status().is_syncing(client.queue_info());
+				let is_trusted = client.chain_info().security_level().is_full();
+				match is_synced && is_trusted {
+					true => Some(client),
+					false => None,
+				}
+			})
+	}
+
+	/// Get untrusted `Client` reference.
+	pub fn get_untrusted(&self) -> Option<Arc<Client>> {
+		self.client.upgrade()
+	}
+}
diff --git a/secret_store/src/types/all.rs b/secret_store/src/types/all.rs
index 6867c82f36d3773567648c6b80fc610e5f4397d2..9c6f4d1721c18e77631576be66f188c8566756a5 100644
--- a/secret_store/src/types/all.rs
+++ b/secret_store/src/types/all.rs
@@ -18,28 +18,25 @@ use std::fmt;
 use std::collections::BTreeMap;
 use serde_json;
 
-use ethkey;
-use util;
-use key_server_cluster;
+use {ethkey, kvdb, bytes, ethereum_types, key_server_cluster};
 
 /// Node id.
 pub type NodeId = ethkey::Public;
 /// Server key id. When key is used to encrypt document, it could be document contents hash.
-pub type ServerKeyId = util::H256;
+pub type ServerKeyId = ethereum_types::H256;
 /// Encrypted document key type.
-pub type EncryptedDocumentKey = util::Bytes;
+pub type EncryptedDocumentKey = bytes::Bytes;
 /// Message hash.
-pub type MessageHash = util::H256;
+pub type MessageHash = ethereum_types::H256;
 /// Message signature.
-pub type EncryptedMessageSignature = util::Bytes;
+pub type EncryptedMessageSignature = bytes::Bytes;
 /// Request signature type.
 pub type RequestSignature = ethkey::Signature;
 /// Public key type.
 pub use ethkey::Public;
 
-#[derive(Debug, Clone, PartialEq)]
-#[binary]
 /// Secret store error
+#[derive(Debug, PartialEq)]
 pub enum Error {
 	/// Bad signature is passed
 	BadSignature,
@@ -47,6 +44,8 @@ pub enum Error {
 	AccessDenied,
 	/// Requested document not found
 	DocumentNotFound,
+	/// Hyper error
+	Hyper(String),
 	/// Serialization/deserialization error
 	Serde(String),
 	/// Database-related error
@@ -55,9 +54,8 @@ pub enum Error {
 	Internal(String),
 }
 
-#[derive(Debug, Clone)]
-#[binary]
 /// Secret store configuration
+#[derive(Debug, Clone)]
 pub struct NodeAddress {
 	/// IP address.
 	pub address: String,
@@ -65,12 +63,22 @@ pub struct NodeAddress {
 	pub port: u16,
 }
 
-#[derive(Debug)]
-#[binary]
+/// Contract address.
+#[derive(Debug, Clone)]
+pub enum ContractAddress {
+	/// Address is read from registry.
+	Registry,
+	/// Address is specified.
+	Address(ethkey::Address),
+}
+
 /// Secret store configuration
+#[derive(Debug)]
 pub struct ServiceConfiguration {
 	/// HTTP listener address. If None, HTTP API is disabled.
 	pub listener_address: Option<NodeAddress>,
+	/// Service contract address. If None, service contract API is disabled.
+	pub service_contract_address: Option<ContractAddress>,
 	/// Is ACL check enabled. If false, everyone has access to all keys. Useful for tests only.
 	pub acl_check_enabled: bool,
 	/// Data directory path for secret store
@@ -79,9 +87,8 @@ pub struct ServiceConfiguration {
 	pub cluster_config: ClusterConfiguration,
 }
 
-#[derive(Debug)]
-#[binary]
 /// Key server cluster configuration
+#[derive(Debug)]
 pub struct ClusterConfiguration {
 	/// Number of threads reserved by cluster.
 	pub threads: usize,
@@ -92,11 +99,15 @@ pub struct ClusterConfiguration {
 	/// Allow outbound connections to 'higher' nodes.
 	/// This is useful for tests, but slower a bit for production.
 	pub allow_connecting_to_higher_nodes: bool,
+	/// Administrator public key.
+	pub admin_public: Option<Public>,
+	/// Should key servers set change session should be started when servers set changes.
+	/// This will only work when servers set is configured using KeyServerSet contract.
+	pub auto_migrate_enabled: bool,
 }
 
-#[derive(Clone, Debug, PartialEq)]
-#[binary]
 /// Shadow decryption result.
+#[derive(Clone, Debug, PartialEq)]
 pub struct EncryptedDocumentKeyShadow {
 	/// Decrypted secret point. It is partially decrypted if shadow decrpytion was requested.
 	pub decrypted_secret: ethkey::Public,
@@ -106,12 +117,24 @@ pub struct EncryptedDocumentKeyShadow {
 	pub decrypt_shadows: Option<Vec<Vec<u8>>>,
 }
 
+/// Requester identification data.
+#[derive(Debug, Clone)]
+pub enum Requester {
+	/// Requested with server key id signature.
+	Signature(ethkey::Signature),
+	/// Requested with public key.
+	Public(ethkey::Public),
+	/// Requested with verified address.
+	Address(ethereum_types::Address),
+}
+
 impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
 		match *self {
 			Error::BadSignature => write!(f, "Bad signature"),
 			Error::AccessDenied => write!(f, "Access dened"),
 			Error::DocumentNotFound => write!(f, "Document not found"),
+			Error::Hyper(ref msg) => write!(f, "Hyper error: {}", msg),
 			Error::Serde(ref msg) => write!(f, "Serialization error: {}", msg),
 			Error::Database(ref msg) => write!(f, "Database error: {}", msg),
 			Error::Internal(ref msg) => write!(f, "Internal error: {}", msg),
@@ -131,10 +154,18 @@ impl From<ethkey::Error> for Error {
 	}
 }
 
+impl From<kvdb::Error> for Error {
+	fn from(err: kvdb::Error) -> Self {
+		Error::Database(err.to_string())
+	}
+}
+
 impl From<key_server_cluster::Error> for Error {
 	fn from(err: key_server_cluster::Error) -> Self {
 		match err {
-			key_server_cluster::Error::AccessDenied => Error::AccessDenied,
+			key_server_cluster::Error::ConsensusUnreachable
+				| key_server_cluster::Error::AccessDenied => Error::AccessDenied,
+			key_server_cluster::Error::MissingKeyShare => Error::DocumentNotFound,
 			_ => Error::Internal(err.into()),
 		}
 	}
@@ -145,3 +176,29 @@ impl Into<String> for Error {
 		format!("{}", self)
 	}
 }
+
+impl Default for Requester {
+	fn default() -> Self {
+		Requester::Signature(Default::default())
+	}
+}
+
+impl Requester {
+	pub fn public(&self, server_key_id: &ServerKeyId) -> Option<Public> {
+		match *self {
+			Requester::Signature(ref signature) => ethkey::recover(signature, server_key_id).ok(),
+			Requester::Public(ref public) => Some(public.clone()),
+			Requester::Address(_) => None,
+		}
+	}
+
+	pub fn address(&self, server_key_id: &ServerKeyId) -> Option<ethkey::Address> {
+		self.public(server_key_id).map(|p| ethkey::public_to_address(&p))
+	}
+}
+
+impl From<ethkey::Signature> for Requester {
+	fn from(signature: ethkey::Signature) -> Requester {
+		Requester::Signature(signature)
+	}
+}
diff --git a/secret_store/src/types/mod.rs b/secret_store/src/types/mod.rs
index 584e78f30c38b7b942c231629dc49aceb1ce6214..dc5bd3d8a0898a621b8a131d522e22abe4de718f 100644
--- a/secret_store/src/types/mod.rs
+++ b/secret_store/src/types/mod.rs
@@ -16,5 +16,4 @@
 
 //! Types used in the public api
 
-#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues
-include!(concat!(env!("OUT_DIR"), "/mod.rs.in"));
+pub mod all;
diff --git a/secret_store/src/types/mod.rs.in b/secret_store/src/types/mod.rs.in
deleted file mode 100644
index 0681e288452fc507f39d246d3fa731d517223c20..0000000000000000000000000000000000000000
--- a/secret_store/src/types/mod.rs.in
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-pub mod all;
diff --git a/snap/gui/icon.png b/snap/gui/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..35238121adfd1fdb130497498b1a33f74bceff92
Binary files /dev/null and b/snap/gui/icon.png differ
diff --git a/snap/gui/parity.desktop b/snap/gui/parity.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..c8f83be73d0b951327220f59a82587b655bb8c07
--- /dev/null
+++ b/snap/gui/parity.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=parity
+Comment=Fast, light, robust Ethereum implementation
+Exec=parity
+Icon=/usr/share/pixmaps/icon.png
+Terminal=true
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 2dfa984c159653dc1ddf91349aff8ce46802de6a..c0ca5507beca3d2ebbef4f0d6be0884cc41735bc 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -13,10 +13,27 @@ confinement: strict
 apps:
   parity:
     command: parity
-    plugs: [network, network-bind]
+    plugs: [home, network, network-bind, mount-observe, x11, unity7, desktop, desktop-legacy, wayland]
+    desktop: usr/share/applications/parity.desktop
+
+icon: snap/gui/icon.png
 
 parts:
+  desktop-icon:
+    source: ./snap
+    plugin: nil
+    prepare: |
+      mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/applications
+      mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
+      cp -v gui/parity.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications/
+      cp -v gui/icon.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/
   parity:
     source: .
     plugin: rust
+    build-attributes: [no-system-libraries]
     build-packages: [g++, libudev-dev, libssl-dev, make, pkg-config]
+    stage-packages: [libc6, libssl1.0.0, libudev1, libstdc++6]
+  df:
+    plugin: nil
+    stage-packages: [coreutils]
+    stage: [bin/df]
diff --git a/stratum/Cargo.toml b/stratum/Cargo.toml
index dcd605bb88782e8f54aba7fa1c1e66911ea404f4..0faed618638ca516bf2a030796b14bab3773d844 100644
--- a/stratum/Cargo.toml
+++ b/stratum/Cargo.toml
@@ -1,26 +1,22 @@
 [package]
 description = "Ethcore stratum lib"
 name = "ethcore-stratum"
-version = "1.8.0"
+version = "1.11.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[build-dependencies]
-ethcore-ipc-codegen = { path = "../ipc/codegen" }
 
 [dependencies]
+ethcore-logger = { path = "../logger" }
+ethereum-types = "0.2"
+keccak-hash = { path = "../util/hash" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-tcp-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 log = "0.3"
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-tcp-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-ethcore-util = { path = "../util" }
-ethcore-devtools = { path = "../devtools" }
-lazy_static = "0.2"
+parking_lot = "0.5"
+
+[dev-dependencies]
 env_logger = "0.4"
-ethcore-ipc = { path = "../ipc/rpc" }
-semver = "0.6"
-ethcore-ipc-nano = { path = "../ipc/nano" }
-futures = "0.1"
 tokio-core = "0.1"
+tokio-io = "0.1"
 ethcore-logger = { path = "../logger" }
diff --git a/stratum/build.rs b/stratum/build.rs
deleted file mode 100644
index bad927dc133a57b61833b86e1543d0c6508910c3..0000000000000000000000000000000000000000
--- a/stratum/build.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate ethcore_ipc_codegen;
-
-fn main() {
-	ethcore_ipc_codegen::derive_ipc("src/traits.rs").unwrap();
-}
diff --git a/stratum/src/lib.rs b/stratum/src/lib.rs
index 0042ab1e93dcb14ebb97c7de6aec8d34546ea9de..d43bcc5569e0da04a871b57a787e97565880f3a9 100644
--- a/stratum/src/lib.rs
+++ b/stratum/src/lib.rs
@@ -19,29 +19,20 @@
 extern crate jsonrpc_tcp_server;
 extern crate jsonrpc_core;
 extern crate jsonrpc_macros;
+extern crate ethereum_types;
+extern crate keccak_hash as hash;
+extern crate parking_lot;
+
 #[macro_use] extern crate log;
-extern crate ethcore_util as util;
-extern crate ethcore_ipc as ipc;
-extern crate semver;
-extern crate futures;
-extern crate ethcore_logger;
 
 #[cfg(test)] extern crate tokio_core;
-extern crate ethcore_devtools as devtools;
-#[cfg(test)] extern crate env_logger;
-#[cfg(test)] #[macro_use] extern crate lazy_static;
-
-use futures::{future, BoxFuture, Future};
+#[cfg(test)] extern crate tokio_io;
+#[cfg(test)] extern crate ethcore_logger;
 
-mod traits {
-	//! Stratum ipc interfaces specification
-	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
-	include!(concat!(env!("OUT_DIR"), "/traits.rs"));
-}
+mod traits;
 
 pub use traits::{
 	JobDispatcher, PushWorkHandler, Error, ServiceConfiguration,
-	RemoteWorkHandler, RemoteJobDispatcher,
 };
 
 use jsonrpc_tcp_server::{
@@ -54,68 +45,86 @@ use std::sync::Arc;
 
 use std::net::SocketAddr;
 use std::collections::{HashSet, HashMap};
-use util::{H256, Hashable, RwLock, RwLockReadGuard};
+use hash::keccak;
+use ethereum_types::H256;
+use parking_lot::RwLock;
 
-type RpcResult = BoxFuture<jsonrpc_core::Value, jsonrpc_core::Error>;
+type RpcResult = Result<jsonrpc_core::Value, jsonrpc_core::Error>;
 
 const NOTIFY_COUNTER_INITIAL: u32 = 16;
 
-struct StratumRpc {
-	stratum: RwLock<Option<Arc<Stratum>>>,
+/// Container which owns rpc server and stratum implementation
+pub struct Stratum {
+	/// RPC server
+	///
+	/// It is an `Option` so it can be easily closed and released during `drop` phase
+	rpc_server: Option<JsonRpcServer>,
+	/// stratum protocol implementation
+	///
+	/// It is owned by a container and rpc server
+	implementation: Arc<StratumImpl>,
+	/// Message dispatcher (tcp/ip service)
+	///
+	/// Used to push messages to peers
+	tcp_dispatcher: Dispatcher,
 }
 
-impl StratumRpc {
-	fn subscribe(&self, params: Params, meta: SocketMetadata) -> RpcResult {
-		self.stratum.read().as_ref().expect("RPC methods are called after stratum is set.")
-			.subscribe(params, meta)
-	}
+impl Stratum {
+	pub fn start(
+		addr: &SocketAddr,
+		dispatcher: Arc<JobDispatcher>,
+		secret: Option<H256>,
+	) -> Result<Arc<Stratum>, Error> {
 
-	fn authorize(&self, params: Params, meta: SocketMetadata) -> RpcResult {
-		self.stratum.read().as_ref().expect("RPC methods are called after stratum is set.")
-			.authorize(params, meta)
-	}
+		let implementation = Arc::new(StratumImpl {
+			subscribers: RwLock::new(Vec::new()),
+			job_que: RwLock::new(HashSet::new()),
+			dispatcher,
+			workers: Arc::new(RwLock::new(HashMap::new())),
+			secret,
+			notify_counter: RwLock::new(NOTIFY_COUNTER_INITIAL),
+		});
 
-	fn submit(&self, params: Params, meta: SocketMetadata) -> RpcResult {
-		self.stratum.read().as_ref().expect("RPC methods are called after stratum is set.")
-			.submit(params, meta)
-	}
-}
+		let mut delegate = IoDelegate::<StratumImpl, SocketMetadata>::new(implementation.clone());
+		delegate.add_method_with_meta("mining.subscribe", StratumImpl::subscribe);
+		delegate.add_method_with_meta("mining.authorize", StratumImpl::authorize);
+		delegate.add_method_with_meta("mining.submit", StratumImpl::submit);
+		let mut handler = MetaIoHandler::<SocketMetadata>::with_compatibility(Compatibility::Both);
+		handler.extend_with(delegate);
 
-#[derive(Clone)]
-pub struct SocketMetadata {
-	addr: SocketAddr,
-}
+		let server_builder = JsonRpcServerBuilder::new(handler);
+		let tcp_dispatcher = server_builder.dispatcher();
+		let server_builder = server_builder.session_meta_extractor(PeerMetaExtractor::new(tcp_dispatcher.clone()));
+		let server = server_builder.start(addr)?;
 
-impl Default for SocketMetadata {
-	fn default() -> Self {
-		SocketMetadata { addr: "0.0.0.0:0".parse().unwrap() }
-	}
-}
+		let stratum = Arc::new(Stratum {
+			rpc_server: Some(server),
+			implementation,
+			tcp_dispatcher,
+		});
 
-impl SocketMetadata {
-	pub fn addr(&self) -> &SocketAddr {
-		&self.addr
+		Ok(stratum)
 	}
 }
 
-impl Metadata for SocketMetadata { }
+impl PushWorkHandler for Stratum {
+	fn push_work_all(&self, payload: String) -> Result<(), Error> {
+		self.implementation.push_work_all(payload, &self.tcp_dispatcher)
+	}
 
-impl From<SocketAddr> for SocketMetadata {
-	fn from(addr: SocketAddr) -> SocketMetadata {
-		SocketMetadata { addr: addr }
+	fn push_work(&self, payloads: Vec<String>) -> Result<(), Error> {
+		self.implementation.push_work(payloads, &self.tcp_dispatcher)
 	}
 }
 
-pub struct PeerMetaExtractor;
-
-impl MetaExtractor<SocketMetadata> for PeerMetaExtractor {
-	fn extract(&self, context: &RequestContext) -> SocketMetadata {
-		context.peer_addr.into()
+impl Drop for Stratum {
+	fn drop(&mut self) {
+		// shut down rpc server
+		self.rpc_server.take().map(|server| server.close());
 	}
 }
 
-pub struct Stratum {
-	rpc_server: Option<JsonRpcServer>,
+struct StratumImpl {
 	/// Subscribed clients
 	subscribers: RwLock<Vec<SocketAddr>>,
 	/// List of workers supposed to receive job update
@@ -128,84 +137,10 @@ pub struct Stratum {
 	secret: Option<H256>,
 	/// Dispatch notify couinter
 	notify_counter: RwLock<u32>,
-	/// Message dispatcher (tcp/ip service)
-	tcp_dispatcher: Dispatcher,
-}
-
-impl Drop for Stratum {
-	fn drop(&mut self) {
-		self.rpc_server.take().map(|server| server.close());
-	}
 }
 
-impl Stratum {
-	pub fn start(
-		addr: &SocketAddr,
-		dispatcher: Arc<JobDispatcher>,
-		secret: Option<H256>,
-	) -> Result<Arc<Stratum>, Error> {
-
-		let rpc = Arc::new(StratumRpc {
-			stratum: RwLock::new(None),
-		});
-		let mut delegate = IoDelegate::<StratumRpc, SocketMetadata>::new(rpc.clone());
-		delegate.add_method_with_meta("mining.subscribe", StratumRpc::subscribe);
-		delegate.add_method_with_meta("mining.authorize", StratumRpc::authorize);
-		delegate.add_method_with_meta("mining.submit", StratumRpc::submit);
-		let mut handler = MetaIoHandler::<SocketMetadata>::with_compatibility(Compatibility::Both);
-		handler.extend_with(delegate);
-
-		let server = JsonRpcServerBuilder::new(handler)
-			.session_meta_extractor(PeerMetaExtractor);
-		let tcp_dispatcher = server.dispatcher();
-		let server = server.start(addr)?;
-
-		let stratum = Arc::new(Stratum {
-			tcp_dispatcher: tcp_dispatcher,
-			rpc_server: Some(server),
-			subscribers: RwLock::new(Vec::new()),
-			job_que: RwLock::new(HashSet::new()),
-			dispatcher: dispatcher,
-			workers: Arc::new(RwLock::new(HashMap::new())),
-			secret: secret,
-			notify_counter: RwLock::new(NOTIFY_COUNTER_INITIAL),
-		});
-		*rpc.stratum.write() = Some(stratum.clone());
-		Ok(stratum)
-	}
-
-	fn update_peers(&self) {
-		if let Some(job) = self.dispatcher.job() {
-			if let Err(e) = self.push_work_all(job) {
-				warn!("Failed to update some of the peers: {:?}", e);
-			}
-		}
-	}
-
-	fn submit(&self, params: Params, _meta: SocketMetadata) -> RpcResult {
-		future::ok(match params {
-			Params::Array(vals) => {
-				// first two elements are service messages (worker_id & job_id)
-				match self.dispatcher.submit(vals.iter().skip(2)
-					.filter_map(|val| match val { &Value::String(ref str) => Some(str.to_owned()), _ => None })
-					.collect::<Vec<String>>()) {
-						Ok(()) => {
-							self.update_peers();
-							to_value(true)
-						},
-						Err(submit_err) => {
-							warn!("Error while submitting share: {:?}", submit_err);
-							to_value(false)
-						}
-					}
-			},
-			_ => {
-				trace!(target: "stratum", "Invalid submit work format {:?}", params);
-				to_value(false)
-			}
-		}.expect("Only true/false is returned and it's always serializable; qed")).boxed()
-	}
-
+impl StratumImpl {
+	/// rpc method `mining.subscribe`
 	fn subscribe(&self, _params: Params, meta: SocketMetadata) -> RpcResult {
 		use std::str::FromStr;
 
@@ -213,7 +148,7 @@ impl Stratum {
 		self.job_que.write().insert(meta.addr().clone());
 		trace!(target: "stratum", "Subscription request from {:?}", meta.addr());
 
-		future::ok(match self.dispatcher.initial() {
+		Ok(match self.dispatcher.initial() {
 			Some(initial) => match jsonrpc_core::Value::from_str(&initial) {
 				Ok(val) => Ok(val),
 				Err(e) => {
@@ -222,13 +157,14 @@ impl Stratum {
 				},
 			},
 			None => to_value(&[0u8; 0]),
-		}.expect("Empty slices are serializable; qed")).boxed()
+		}.expect("Empty slices are serializable; qed"))
 	}
 
+	/// rpc method `mining.authorize`
 	fn authorize(&self, params: Params, meta: SocketMetadata) -> RpcResult {
-		future::result(params.parse::<(String, String)>().map(|(worker_id, secret)|{
+		params.parse::<(String, String)>().map(|(worker_id, secret)|{
 			if let Some(valid_secret) = self.secret {
-				let hash = secret.sha3();
+				let hash = keccak(secret);
 				if hash != valid_secret {
 					return to_value(&false);
 				}
@@ -236,26 +172,47 @@ impl Stratum {
 			trace!(target: "stratum", "New worker #{} registered", worker_id);
 			self.workers.write().insert(meta.addr().clone(), worker_id);
 			to_value(true)
-		}).map(|v| v.expect("Only true/false is returned and it's always serializable; qed"))).boxed()
+		}).map(|v| v.expect("Only true/false is returned and it's always serializable; qed"))
 	}
 
-	pub fn subscribers(&self) -> RwLockReadGuard<Vec<SocketAddr>> {
-		self.subscribers.read()
+	/// rpc method `mining.submit`
+	fn submit(&self, params: Params, meta: SocketMetadata) -> RpcResult {
+		Ok(match params {
+			Params::Array(vals) => {
+				// first two elements are service messages (worker_id & job_id)
+				match self.dispatcher.submit(vals.iter().skip(2)
+					.filter_map(|val| match *val {
+						Value::String(ref s) => Some(s.to_owned()),
+						_ => None
+					})
+					.collect::<Vec<String>>()) {
+						Ok(()) => {
+							self.update_peers(&meta.tcp_dispatcher.expect("tcp_dispatcher is always initialized; qed"));
+							to_value(true)
+						},
+						Err(submit_err) => {
+							warn!("Error while submitting share: {:?}", submit_err);
+							to_value(false)
+						}
+					}
+			},
+			_ => {
+				trace!(target: "stratum", "Invalid submit work format {:?}", params);
+				to_value(false)
+			}
+		}.expect("Only true/false is returned and it's always serializable; qed"))
 	}
 
-	pub fn maintain(&self) {
-		let mut job_que = self.job_que.write();
-		let job_payload = self.dispatcher.job();
-		for socket_addr in job_que.drain() {
-			job_payload.as_ref().map(
-				|json| self.tcp_dispatcher.push_message(&socket_addr, json.to_owned())
-			);
+	/// Helper method
+	fn update_peers(&self, tcp_dispatcher: &Dispatcher) {
+		if let Some(job) = self.dispatcher.job() {
+			if let Err(e) = self.push_work_all(job, tcp_dispatcher) {
+				warn!("Failed to update some of the peers: {:?}", e);
+			}
 		}
 	}
-}
 
-impl PushWorkHandler for Stratum {
-	fn push_work_all(&self, payload: String) -> Result<(), Error> {
+	fn push_work_all(&self, payload: String, tcp_dispatcher: &Dispatcher) -> Result<(), Error> {
 		let hup_peers = {
 			let workers = self.workers.read();
 			let next_request_id = {
@@ -270,7 +227,7 @@ impl PushWorkHandler for Stratum {
 			trace!(target: "stratum", "pushing work for {} workers (payload: '{}')", workers.len(), &workers_msg);
 			for (ref addr, _) in workers.iter() {
 				trace!(target: "stratum", "pusing work to {}", addr);
-				match self.tcp_dispatcher.push_message(addr, workers_msg.clone()) {
+				match tcp_dispatcher.push_message(addr, workers_msg.clone()) {
 					Err(PushMessageError::NoSuchPeer) => {
 						trace!(target: "stratum", "Worker no longer connected: {}", &addr);
 						hup_peers.insert(*addr.clone());
@@ -292,7 +249,7 @@ impl PushWorkHandler for Stratum {
 		Ok(())
 	}
 
-	fn push_work(&self, payloads: Vec<String>) -> Result<(), Error>  {
+	fn push_work(&self, payloads: Vec<String>, tcp_dispatcher: &Dispatcher) -> Result<(), Error> {
 		if !payloads.len() > 0 {
 			return Err(Error::NoWork);
 		}
@@ -306,16 +263,63 @@ impl PushWorkHandler for Stratum {
 		while que.len() > 0 {
 			let next_worker = addrs[addr_index];
 			let mut next_payload = que.drain(0..1);
-			self.tcp_dispatcher.push_message(
-					next_worker,
-					next_payload.nth(0).expect("drained successfully of 0..1, so 0-th element should exist")
-				)?;
+			tcp_dispatcher.push_message(
+				next_worker,
+				next_payload.nth(0).expect("drained successfully of 0..1, so 0-th element should exist")
+			)?;
 			addr_index = addr_index + 1;
 		}
 		Ok(())
 	}
 }
 
+#[derive(Clone)]
+pub struct SocketMetadata {
+	addr: SocketAddr,
+	// with the new version of jsonrpc-core, SocketMetadata
+	// won't have to implement default, so this field will not
+	// have to be an Option
+	tcp_dispatcher: Option<Dispatcher>,
+}
+
+impl Default for SocketMetadata {
+	fn default() -> Self {
+		SocketMetadata {
+			addr: "0.0.0.0:0".parse().unwrap(),
+			tcp_dispatcher: None,
+		}
+	}
+}
+
+impl SocketMetadata {
+	pub fn addr(&self) -> &SocketAddr {
+		&self.addr
+	}
+}
+
+impl Metadata for SocketMetadata { }
+
+pub struct PeerMetaExtractor {
+	tcp_dispatcher: Dispatcher,
+}
+
+impl PeerMetaExtractor {
+	fn new(tcp_dispatcher: Dispatcher) -> Self {
+		PeerMetaExtractor {
+			tcp_dispatcher,
+		}
+	}
+}
+
+impl MetaExtractor<SocketMetadata> for PeerMetaExtractor {
+	fn extract(&self, context: &RequestContext) -> SocketMetadata {
+		SocketMetadata {
+			addr: context.peer_addr,
+			tcp_dispatcher: Some(self.tcp_dispatcher.clone()),
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -325,8 +329,8 @@ mod tests {
 
 	use tokio_core::reactor::{Core, Timeout};
 	use tokio_core::net::TcpStream;
-	use tokio_core::io;
-	use futures::{Future, future};
+	use tokio_io::io;
+	use jsonrpc_core::futures::{Future, future};
 
 	use ethcore_logger::init_log;
 
@@ -374,7 +378,7 @@ mod tests {
 		let stratum = Stratum::start(&addr, Arc::new(VoidManager), None).unwrap();
 		let request = r#"{"jsonrpc": "2.0", "method": "mining.subscribe", "params": [], "id": 1}"#;
 		dummy_request(&addr, request);
-		assert_eq!(1, stratum.subscribers.read().len());
+		assert_eq!(1, stratum.implementation.subscribers.read().len());
 	}
 
 	struct DummyManager {
@@ -416,7 +420,7 @@ mod tests {
 	#[test]
 	fn receives_initial_paylaod() {
 		let addr = SocketAddr::from_str("127.0.0.1:19975").unwrap();
-		Stratum::start(&addr, DummyManager::new(), None).expect("There should be no error starting stratum");
+		let _stratum = Stratum::start(&addr, DummyManager::new(), None).expect("There should be no error starting stratum");
 		let request = r#"{"jsonrpc": "2.0", "method": "mining.subscribe", "params": [], "id": 2}"#;
 
 		let response = String::from_utf8(dummy_request(&addr, request)).unwrap();
@@ -437,7 +441,7 @@ mod tests {
 		let response = String::from_utf8(dummy_request(&addr, request)).unwrap();
 
 		assert_eq!(terminated_str(r#"{"jsonrpc":"2.0","result":true,"id":1}"#), response);
-		assert_eq!(1, stratum.workers.read().len());
+		assert_eq!(1, stratum.implementation.workers.read().len());
 	}
 
 	#[test]
diff --git a/stratum/src/traits.rs b/stratum/src/traits.rs
index c2c522b3b13d26185dd3ec89f701b688eb5be94c..431d338a428f15dd9a108fc8bc2a5b0e2e40e30f 100644
--- a/stratum/src/traits.rs
+++ b/stratum/src/traits.rs
@@ -16,12 +16,10 @@
 
 use std;
 use std::error::Error as StdError;
-use util::H256;
-use ipc::IpcConfig;
+use ethereum_types::H256;
 use jsonrpc_tcp_server::PushMessageError;
 
 #[derive(Debug, Clone)]
-#[binary]
 pub enum Error {
 	NoWork,
 	NoWorkers,
@@ -43,7 +41,6 @@ impl From<PushMessageError> for Error {
 }
 
 /// Interface that can provide pow/blockchain-specific responses for the clients
-#[ipc(client_ident="RemoteJobDispatcher")]
 pub trait JobDispatcher: Send + Sync {
 	// json for initial client handshake
 	fn initial(&self) -> Option<String> { None }
@@ -56,7 +53,6 @@ pub trait JobDispatcher: Send + Sync {
 }
 
 /// Interface that can handle requests to push job for workers
-#[ipc(client_ident="RemoteWorkHandler")]
 pub trait PushWorkHandler: Send + Sync {
 	/// push the same work package for all workers (`payload`: json of pow-specific set of work specification)
 	fn push_work_all(&self, payload: String) -> Result<(), Error>;
@@ -65,13 +61,9 @@ pub trait PushWorkHandler: Send + Sync {
 	fn push_work(&self, payloads: Vec<String>) -> Result<(), Error>;
 }
 
-#[binary]
 pub struct ServiceConfiguration {
 	pub io_path: String,
 	pub listen_addr: String,
 	pub port: u16,
 	pub secret: Option<H256>,
 }
-
-impl IpcConfig for PushWorkHandler { }
-impl IpcConfig for JobDispatcher { }
diff --git a/sync/Cargo.toml b/sync/Cargo.toml
index b9a411879b18df98e00c30769e4971c26d5bb89b..e82dd710de61622eb7b97268ae1c90b8a1432458 100644
--- a/sync/Cargo.toml
+++ b/sync/Cargo.toml
@@ -1,39 +1,36 @@
 [package]
 description = "Ethcore blockchain sync"
 name = "ethsync"
-version = "1.8.0"
+version = "1.11.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
 
 [lib]
 
-[build-dependencies]
-ethcore-ipc-codegen = { path = "../ipc/codegen" }
-
 [dependencies]
-ethcore-util = { path = "../util" }
+ethcore-bytes = { path = "../util/bytes" }
 ethcore-network = { path = "../util/network" }
+ethcore-network-devp2p = { path = "../util/network-devp2p" }
 ethcore-io = { path = "../util/io" }
-ethcore-light = { path = "../ethcore/light"}
+ethcore-light = { path = "../ethcore/light" }
+ethcore-transaction = { path = "../ethcore/transaction" }
 ethcore = { path = "../ethcore" }
+ethereum-types = "0.2"
+plain_hasher = { path = "../util/plain_hasher" }
 rlp = { path = "../util/rlp" }
-clippy = { version = "0.0.103", optional = true}
+keccak-hash = { path = "../util/hash" }
+triehash = { path = "../util/triehash" }
+kvdb = { path = "../util/kvdb" }
+macros = { path = "../util/macros" }
 log = "0.3"
 env_logger = "0.4"
-time = "0.1.34"
-rand = "0.3.13"
+rand = "0.4"
 heapsize = "0.4"
-ethcore-ipc = { path = "../ipc/rpc" }
 semver = "0.6"
 smallvec = { version = "0.4", features = ["heapsizeof"] }
-ethcore-ipc-nano = { path = "../ipc/nano" }
-ethcore-devtools = { path = "../devtools" }
-ethkey = { path = "../ethkey" }
-parking_lot = "0.4"
+parking_lot = "0.5"
 ipnetwork = "0.12.6"
 
-[features]
-default = []
-dev = ["clippy", "ethcore/dev", "ethcore-util/dev"]
-ipc = ["ethcore-light/ipc"]
+[dev-dependencies]
+ethkey = { path = "../ethkey" }
+kvdb-memorydb = { path = "../util/kvdb-memorydb" }
diff --git a/sync/build.rs b/sync/build.rs
deleted file mode 100644
index 7590a15946ae39d7efc0a2262766e2540e8ef2d6..0000000000000000000000000000000000000000
--- a/sync/build.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate ethcore_ipc_codegen;
-
-#[cfg(feature = "ipc")]
-fn main() {
-	ethcore_ipc_codegen::derive_ipc_cond("src/api.rs", true).unwrap();
-}
-
-#[cfg(not(feature = "ipc"))]
-fn main() {}
diff --git a/sync/src/api.rs b/sync/src/api.rs
index f3c5570ee0d8d067c90a0ad15cc7b01802a9d43b..38543de15c3cd28add4be966010334825d69c6a5 100644
--- a/sync/src/api.rs
+++ b/sync/src/api.rs
@@ -17,10 +17,11 @@
 use std::sync::Arc;
 use std::collections::{HashMap, BTreeMap};
 use std::io;
-use util::Bytes;
-use network::{NetworkProtocolHandler, NetworkService, NetworkContext, HostInfo, PeerId, ProtocolId,
-	NetworkConfiguration as BasicNetworkConfiguration, NonReservedPeerMode, NetworkError, ConnectionFilter};
-use util::{U256, H256, H512};
+use bytes::Bytes;
+use devp2p::{NetworkService, ConnectionFilter};
+use network::{NetworkProtocolHandler, NetworkContext, HostInfo, PeerId, ProtocolId,
+	NetworkConfiguration as BasicNetworkConfiguration, NonReservedPeerMode, Error, ErrorKind};
+use ethereum_types::{H256, H512, U256};
 use io::{TimerToken};
 use ethcore::ethstore::ethkey::Secret;
 use ethcore::client::{BlockChainClient, ChainNotify};
@@ -29,7 +30,6 @@ use ethcore::header::BlockNumber;
 use sync_io::NetSyncIo;
 use chain::{ChainSync, SyncStatus as EthSyncStatus};
 use std::net::{SocketAddr, AddrParseError};
-use ipc::{BinaryConvertable, BinaryConvertError, IpcConfig};
 use std::str::FromStr;
 use parking_lot::RwLock;
 use chain::{ETH_PACKET_COUNT, SNAPSHOT_SYNC_PACKET_COUNT};
@@ -81,9 +81,6 @@ impl Default for SyncConfig {
 	}
 }
 
-binary_fixed_size!(SyncConfig);
-binary_fixed_size!(EthSyncStatus);
-
 /// Current sync status
 pub trait SyncProvider: Send + Sync {
 	/// Get sync status
@@ -101,7 +98,6 @@ pub trait SyncProvider: Send + Sync {
 
 /// Transaction stats
 #[derive(Debug)]
-#[cfg_attr(feature = "ipc", derive(Binary))]
 pub struct TransactionStats {
 	/// Block number where this TX was first seen.
 	pub first_seen: u64,
@@ -111,7 +107,6 @@ pub struct TransactionStats {
 
 /// Peer connection information
 #[derive(Debug)]
-#[cfg_attr(feature = "ipc", derive(Binary))]
 pub struct PeerInfo {
 	/// Public node id
 	pub id: Option<String>,
@@ -131,7 +126,6 @@ pub struct PeerInfo {
 
 /// Ethereum protocol info.
 #[derive(Debug)]
-#[cfg_attr(feature = "ipc", derive(Binary))]
 pub struct EthProtocolInfo {
 	/// Protocol version
 	pub version: u32,
@@ -143,7 +137,6 @@ pub struct EthProtocolInfo {
 
 /// PIP protocol info.
 #[derive(Debug)]
-#[cfg_attr(feature = "ipc", derive(Binary))]
 pub struct PipProtocolInfo {
 	/// Protocol version
 	pub version: u32,
@@ -165,7 +158,6 @@ impl From<light_net::Status> for PipProtocolInfo {
 
 /// Configuration to attach alternate protocol handlers.
 /// Only works when IPC is disabled.
-#[cfg(not(feature = "ipc"))]
 pub struct AttachedProtocol {
 	/// The protocol handler in question.
 	pub handler: Arc<NetworkProtocolHandler + Send + Sync>,
@@ -177,13 +169,7 @@ pub struct AttachedProtocol {
 	pub versions: &'static [u8],
 }
 
-/// Attached protocol: disabled in IPC mode.
-#[cfg(feature = "ipc")]
-#[cfg_attr(feature = "ipc", derive(Binary))]
-pub struct AttachedProtocol;
-
 impl AttachedProtocol {
-	#[cfg(feature = "ipc")]
 	fn register(&self, network: &NetworkService) {
 		let res = network.register_protocol(
 			self.handler.clone(),
@@ -193,16 +179,12 @@ impl AttachedProtocol {
 		);
 
 		if let Err(e) = res {
-			warn!(target: "sync","Error attaching protocol {:?}", protocol_id);
+			warn!(target: "sync", "Error attaching protocol {:?}: {:?}", self.protocol_id, e);
 		}
 	}
-
-	#[cfg(not(feature = "ipc"))]
-	fn register(&self, _network: &NetworkService) {}
 }
 
 /// EthSync initialization parameters.
-#[cfg_attr(feature = "ipc", derive(Binary))]
 pub struct Params {
 	/// Configuration.
 	pub config: SyncConfig,
@@ -236,7 +218,7 @@ pub struct EthSync {
 
 impl EthSync {
 	/// Creates and register protocol with the network service
-	pub fn new(params: Params, connection_filter: Option<Arc<ConnectionFilter>>) -> Result<Arc<EthSync>, NetworkError> {
+	pub fn new(params: Params, connection_filter: Option<Arc<ConnectionFilter>>) -> Result<Arc<EthSync>, Error> {
 		const MAX_LIGHTSERV_LOAD: f64 = 0.5;
 
 		let pruning_info = params.chain.pruning_info();
@@ -292,7 +274,6 @@ impl EthSync {
 	}
 }
 
-#[cfg_attr(feature = "ipc", ipc(client_ident="SyncClient"))]
 impl SyncProvider for EthSync {
 	/// Get sync status
 	fn status(&self) -> EthSyncStatus {
@@ -313,7 +294,7 @@ impl SyncProvider for EthSync {
 				};
 
 				Some(PeerInfo {
-					id: session_info.id.map(|id| id.hex()),
+					id: session_info.id.map(|id| format!("{:x}", id)),
 					client_version: session_info.client_version,
 					capabilities: session_info.peer_capabilities.into_iter().map(|c| c.to_string()).collect(),
 					remote_address: session_info.remote_address,
@@ -413,7 +394,7 @@ impl ChainNotify for EthSync {
 			};
 
 			let chain_info = self.eth_handler.chain.chain_info();
-			light_proto.make_announcement(context, Announcement {
+			light_proto.make_announcement(&context, Announcement {
 				head_hash: chain_info.best_block_hash,
 				head_num: chain_info.best_block_number,
 				head_td: chain_info.total_difficulty,
@@ -427,8 +408,8 @@ impl ChainNotify for EthSync {
 	}
 
 	fn start(&self) {
-		match self.network.start() {
-			Err(NetworkError::StdIo(ref e)) if  e.kind() == io::ErrorKind::AddrInUse => warn!("Network port {:?} is already in use, make sure that another instance of an Ethereum client is not running or change the port using the --port option.", self.network.config().listen_address.expect("Listen address is not set.")),
+		match self.network.start().map_err(Into::into) {
+			Err(ErrorKind::Io(ref e)) if  e.kind() == io::ErrorKind::AddrInUse => warn!("Network port {:?} is already in use, make sure that another instance of an Ethereum client is not running or change the port using the --port option.", self.network.config().listen_address.expect("Listen address is not set.")),
 			Err(err) => warn!("Error starting network: {}", err),
 			_ => {},
 		}
@@ -471,15 +452,12 @@ impl ChainNotify for EthSync {
 struct TxRelay(Arc<BlockChainClient>);
 
 impl LightHandler for TxRelay {
-	fn on_transactions(&self, ctx: &EventContext, relay: &[::ethcore::transaction::UnverifiedTransaction]) {
+	fn on_transactions(&self, ctx: &EventContext, relay: &[::transaction::UnverifiedTransaction]) {
 		trace!(target: "pip", "Relaying {} transactions from peer {}", relay.len(), ctx.peer());
 		self.0.queue_transactions(relay.iter().map(|tx| ::rlp::encode(tx).into_vec()).collect(), ctx.peer())
 	}
 }
 
-impl IpcConfig for ManageNetwork { }
-impl IpcConfig for SyncProvider { }
-
 /// Trait for managing network
 pub trait ManageNetwork : Send + Sync {
 	/// Set to allow unreserved peers to connect
@@ -496,10 +474,11 @@ pub trait ManageNetwork : Send + Sync {
 	fn stop_network(&self);
 	/// Query the current configuration of the network
 	fn network_config(&self) -> NetworkConfiguration;
+	/// Get network context for protocol.
+	fn with_proto_context(&self, proto: ProtocolId, f: &mut FnMut(&NetworkContext));
 }
 
 
-#[cfg_attr(feature = "ipc", ipc(client_ident="NetworkManagerClient"))]
 impl ManageNetwork for EthSync {
 	fn accept_unreserved_peers(&self) {
 		self.network.set_non_reserved_mode(NonReservedPeerMode::Accept);
@@ -537,10 +516,13 @@ impl ManageNetwork for EthSync {
 	fn network_config(&self) -> NetworkConfiguration {
 		NetworkConfiguration::from(self.network.config().clone())
 	}
+
+	fn with_proto_context(&self, proto: ProtocolId, f: &mut FnMut(&NetworkContext)) {
+		self.network.with_context_eval(proto, f);
+	}
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "ipc", binary)]
 /// Network service configuration
 pub struct NetworkConfiguration {
 	/// Directory path to store general network configuration. None means nothing will be saved
@@ -575,6 +557,8 @@ pub struct NetworkConfiguration {
 	pub allow_non_reserved: bool,
 	/// IP Filtering
 	pub ip_filter: IpFilter,
+	/// Client version string
+	pub client_version: String,
 }
 
 impl NetworkConfiguration {
@@ -607,6 +591,7 @@ impl NetworkConfiguration {
 			reserved_nodes: self.reserved_nodes,
 			ip_filter: self.ip_filter,
 			non_reserved_mode: if self.allow_non_reserved { NonReservedPeerMode::Accept } else { NonReservedPeerMode::Deny },
+			client_version: self.client_version,
 		})
 	}
 }
@@ -630,13 +615,13 @@ impl From<BasicNetworkConfiguration> for NetworkConfiguration {
 			reserved_nodes: other.reserved_nodes,
 			ip_filter: other.ip_filter,
 			allow_non_reserved: match other.non_reserved_mode { NonReservedPeerMode::Accept => true, _ => false } ,
+			client_version: other.client_version,
 		}
 	}
 }
 
 /// Configuration for IPC service.
 #[derive(Debug, Clone)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct ServiceConfiguration {
 	/// Sync config.
 	pub sync: SyncConfig,
@@ -648,7 +633,6 @@ pub struct ServiceConfiguration {
 
 /// Numbers of peers (max, min, active).
 #[derive(Debug, Clone)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct PeerNumbers {
 	/// Number of connected peers.
 	pub connected: usize,
@@ -706,7 +690,7 @@ pub struct LightSync {
 
 impl LightSync {
 	/// Create a new light sync service.
-	pub fn new<L>(params: LightSyncParams<L>) -> Result<Self, NetworkError>
+	pub fn new<L>(params: LightSyncParams<L>) -> Result<Self, Error>
 		where L: AsLightClient + Provider + Sync + Send + 'static
 	{
 		use light_sync::LightSync as SyncHandler;
@@ -754,7 +738,7 @@ impl LightSync {
 	{
 		self.network.with_context_eval(
 			self.subprotocol_name,
-			move |ctx| self.proto.with_context(ctx, f),
+			move |ctx| self.proto.with_context(&ctx, f),
 		)
 	}
 }
@@ -783,8 +767,10 @@ impl ManageNetwork for LightSync {
 	}
 
 	fn start_network(&self) {
-		match self.network.start() {
-			Err(NetworkError::StdIo(ref e)) if  e.kind() == io::ErrorKind::AddrInUse => warn!("Network port {:?} is already in use, make sure that another instance of an Ethereum client is not running or change the port using the --port option.", self.network.config().listen_address.expect("Listen address is not set.")),
+		match self.network.start().map_err(Into::into) {
+			Err(ErrorKind::Io(ref e)) if e.kind() == io::ErrorKind::AddrInUse => {
+				warn!("Network port {:?} is already in use, make sure that another instance of an Ethereum client is not running or change the port using the --port option.", self.network.config().listen_address.expect("Listen address is not set."))
+			}
 			Err(err) => warn!("Error starting network: {}", err),
 			_ => {},
 		}
@@ -807,6 +793,10 @@ impl ManageNetwork for LightSync {
 	fn network_config(&self) -> NetworkConfiguration {
 		NetworkConfiguration::from(self.network.config().clone())
 	}
+
+	fn with_proto_context(&self, proto: ProtocolId, f: &mut FnMut(&NetworkContext)) {
+		self.network.with_context_eval(proto, f);
+	}
 }
 
 impl LightSyncProvider for LightSync {
@@ -832,7 +822,7 @@ impl LightSyncProvider for LightSync {
 				};
 
 				Some(PeerInfo {
-					id: session_info.id.map(|id| id.hex()),
+					id: session_info.id.map(|id| format!("{:x}", id)),
 					client_version: session_info.client_version,
 					capabilities: session_info.peer_capabilities.into_iter().map(|c| c.to_string()).collect(),
 					remote_address: session_info.remote_address,
diff --git a/sync/src/block_sync.rs b/sync/src/block_sync.rs
index 92c8df42957ab29f681d8e1a7b6602ce65642e6a..9e72c9d53db8f07d4a7da109102c9db958b485b6 100644
--- a/sync/src/block_sync.rs
+++ b/sync/src/block_sync.rs
@@ -20,7 +20,8 @@
 
 use std::collections::{HashSet, VecDeque};
 use std::cmp;
-use util::*;
+use heapsize::HeapSizeOf;
+use ethereum_types::H256;
 use rlp::*;
 use ethcore::views::{BlockView};
 use ethcore::header::{BlockNumber, Header as BlockHeader};
@@ -31,7 +32,7 @@ use sync_io::SyncIo;
 use blocks::BlockCollection;
 
 const MAX_HEADERS_TO_REQUEST: usize = 128;
-const MAX_BODIES_TO_REQUEST: usize = 64;
+const MAX_BODIES_TO_REQUEST: usize = 32;
 const MAX_RECEPITS_TO_REQUEST: usize = 128;
 const SUBCHAIN_SIZE: u64 = 256;
 const MAX_ROUND_PARENTS: usize = 16;
@@ -478,7 +479,7 @@ impl BlockDownloader {
 			let receipts = block_and_receipts.receipts;
 			let (h, number, parent) = {
 				let header = BlockView::new(&block).header_view();
-				(header.sha3(), header.number(), header.parent_hash())
+				(header.hash(), header.number(), header.parent_hash())
 			};
 
 			// Perform basic block verification
@@ -521,6 +522,10 @@ impl BlockDownloader {
 					trace!(target: "sync", "Unknown new block parent, restarting sync");
 					break;
 				},
+				Err(BlockImportError::Block(BlockError::TemporarilyInvalid(_))) => {
+					debug!(target: "sync", "Block temporarily invalid, restarting sync");
+					break;
+				},
 				Err(e) => {
 					debug!(target: "sync", "Bad block {:?} : {:?}", h, e);
 					bad = true;
diff --git a/sync/src/blocks.rs b/sync/src/blocks.rs
index dbd7970071c60ee4d89040049ef533a9edd3c965..65244a4e719076af587183bab750baad650bc5d3 100644
--- a/sync/src/blocks.rs
+++ b/sync/src/blocks.rs
@@ -17,9 +17,13 @@
 use std::collections::{HashSet, HashMap};
 use std::collections::hash_map::Entry;
 use smallvec::SmallVec;
-use util::*;
+use hash::{keccak, KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP};
+use heapsize::HeapSizeOf;
+use ethereum_types::H256;
+use triehash::ordered_trie_root;
+use bytes::Bytes;
 use rlp::*;
-use network::NetworkError;
+use network;
 use ethcore::header::Header as BlockHeader;
 
 known_heap_size!(0, HeaderId);
@@ -337,12 +341,12 @@ impl BlockCollection {
 		self.downloading_headers.contains(hash) || self.downloading_bodies.contains(hash)
 	}
 
-	fn insert_body(&mut self, b: Bytes) -> Result<(), NetworkError> {
+	fn insert_body(&mut self, b: Bytes) -> Result<(), network::Error> {
 		let header_id = {
 			let body = UntrustedRlp::new(&b);
 			let tx = body.at(0)?;
-			let tx_root = ordered_trie_root(tx.iter().map(|r| r.as_raw().to_vec())); //TODO: get rid of vectors here
-			let uncles = body.at(1)?.as_raw().sha3();
+			let tx_root = ordered_trie_root(tx.iter().map(|r| r.as_raw()));
+			let uncles = keccak(body.at(1)?.as_raw());
 			HeaderId {
 				transactions_root: tx_root,
 				uncles: uncles
@@ -361,21 +365,21 @@ impl BlockCollection {
 					},
 					None => {
 						warn!("Got body with no header {}", h);
-						Err(NetworkError::BadProtocol)
+						Err(network::ErrorKind::BadProtocol.into())
 					}
 				}
 			}
 			None => {
 				trace!(target: "sync", "Ignored unknown/stale block body. tx_root = {:?}, uncles = {:?}", header_id.transactions_root, header_id.uncles);
-				Err(NetworkError::BadProtocol)
+				Err(network::ErrorKind::BadProtocol.into())
 			}
 		}
 	}
 
-	fn insert_receipt(&mut self, r: Bytes) -> Result<(), NetworkError> {
+	fn insert_receipt(&mut self, r: Bytes) -> Result<(), network::Error> {
 		let receipt_root = {
 			let receipts = UntrustedRlp::new(&r);
-			ordered_trie_root(receipts.iter().map(|r| r.as_raw().to_vec())) //TODO: get rid of vectors here
+			ordered_trie_root(receipts.iter().map(|r| r.as_raw()))
 		};
 		self.downloading_receipts.remove(&receipt_root);
 		match self.receipt_ids.entry(receipt_root) {
@@ -388,7 +392,7 @@ impl BlockCollection {
 						},
 						None => {
 							warn!("Got receipt with no header {}", h);
-							return Err(NetworkError::BadProtocol)
+							return Err(network::ErrorKind::BadProtocol.into())
 						}
 					}
 				}
@@ -396,12 +400,12 @@ impl BlockCollection {
 			}
 			_ => {
 				trace!(target: "sync", "Ignored unknown/stale block receipt {:?}", receipt_root);
-				Err(NetworkError::BadProtocol)
+				Err(network::ErrorKind::BadProtocol.into())
 			}
 		}
 	}
 
-	fn insert_header(&mut self, header: Bytes) -> Result<H256, UtilError> {
+	fn insert_header(&mut self, header: Bytes) -> Result<H256, DecoderError> {
 		let info: BlockHeader = UntrustedRlp::new(&header).as_val()?;
 		let hash = info.hash();
 		if self.blocks.contains_key(&hash) {
@@ -425,7 +429,7 @@ impl BlockCollection {
 			transactions_root: info.transactions_root().clone(),
 			uncles: info.uncles_hash().clone(),
 		};
-		if header_id.transactions_root == sha3::SHA3_NULL_RLP && header_id.uncles == sha3::SHA3_EMPTY_LIST_RLP {
+		if header_id.transactions_root == KECCAK_NULL_RLP && header_id.uncles == KECCAK_EMPTY_LIST_RLP {
 			// empty body, just mark as downloaded
 			let mut body_stream = RlpStream::new_list(2);
 			body_stream.append_raw(&::rlp::EMPTY_LIST_RLP, 1);
@@ -438,7 +442,7 @@ impl BlockCollection {
 		}
 		if self.need_receipts {
 			let receipt_root = info.receipts_root().clone();
-			if receipt_root == sha3::SHA3_NULL_RLP {
+			if receipt_root == KECCAK_NULL_RLP {
 				let receipts_stream = RlpStream::new_list(0);
 				block.receipts = Some(receipts_stream.out());
 			} else {
@@ -449,7 +453,7 @@ impl BlockCollection {
 
 		self.parents.insert(info.parent_hash().clone(), hash.clone());
 		self.blocks.insert(hash.clone(), block);
-		trace!(target: "sync", "New header: {}", hash.hex());
+		trace!(target: "sync", "New header: {:x}", hash);
 		Ok(hash)
 	}
 
@@ -489,7 +493,6 @@ mod test {
 	use ethcore::client::{TestBlockChainClient, EachBlockWith, BlockId, BlockChainClient};
 	use ethcore::views::HeaderView;
 	use ethcore::header::BlockNumber;
-	use util::*;
 	use rlp::*;
 
 	fn is_empty(bc: &BlockCollection) -> bool {
@@ -526,7 +529,7 @@ mod test {
 			.map(|i| (&client as &BlockChainClient).block(BlockId::Number(i as BlockNumber)).unwrap().into_inner())
 			.collect();
 		let headers: Vec<_> = blocks.iter().map(|b| Rlp::new(b).at(0).as_raw().to_vec()).collect();
-		let hashes: Vec<_> = headers.iter().map(|h| HeaderView::new(h).sha3()).collect();
+		let hashes: Vec<_> = headers.iter().map(|h| HeaderView::new(h).hash()).collect();
 		let heads: Vec<_> = hashes.iter().enumerate().filter_map(|(i, h)| if i % 20 == 0 { Some(h.clone()) } else { None }).collect();
 		bc.reset_to(heads);
 		assert!(!bc.is_empty());
@@ -581,7 +584,7 @@ mod test {
 			.map(|i| (&client as &BlockChainClient).block(BlockId::Number(i as BlockNumber)).unwrap().into_inner())
 			.collect();
 		let headers: Vec<_> = blocks.iter().map(|b| Rlp::new(b).at(0).as_raw().to_vec()).collect();
-		let hashes: Vec<_> = headers.iter().map(|h| HeaderView::new(h).sha3()).collect();
+		let hashes: Vec<_> = headers.iter().map(|h| HeaderView::new(h).hash()).collect();
 		let heads: Vec<_> = hashes.iter().enumerate().filter_map(|(i, h)| if i % 20 == 0 { Some(h.clone()) } else { None }).collect();
 		bc.reset_to(heads);
 
@@ -605,7 +608,7 @@ mod test {
 			.map(|i| (&client as &BlockChainClient).block(BlockId::Number(i as BlockNumber)).unwrap().into_inner())
 			.collect();
 		let headers: Vec<_> = blocks.iter().map(|b| Rlp::new(b).at(0).as_raw().to_vec()).collect();
-		let hashes: Vec<_> = headers.iter().map(|h| HeaderView::new(h).sha3()).collect();
+		let hashes: Vec<_> = headers.iter().map(|h| HeaderView::new(h).hash()).collect();
 		let heads: Vec<_> = hashes.iter().enumerate().filter_map(|(i, h)| if i % 20 == 0 { Some(h.clone()) } else { None }).collect();
 		bc.reset_to(heads);
 
diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index 3a472c88f9f54316cf88cfc992773ab897b08df6..a4d72ac96be4752f8be2c94a8488eff4b3ab85bf 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-///
 /// `BlockChain` synchronization strategy.
 /// Syncs to peers and keeps up to date.
 /// This implementation uses ethereum protocol v63
@@ -91,16 +90,21 @@
 
 use std::collections::{HashSet, HashMap};
 use std::cmp;
-use util::*;
+use std::time::Instant;
+use hash::keccak;
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, U256};
+use plain_hasher::H256FastMap;
+use parking_lot::RwLock;
+use bytes::Bytes;
 use rlp::*;
-use network::*;
+use network::{self, PeerId, PacketId};
 use ethcore::header::{BlockNumber, Header as BlockHeader};
 use ethcore::client::{BlockChainClient, BlockStatus, BlockId, BlockChainInfo, BlockImportError, BlockQueueInfo};
 use ethcore::error::*;
 use ethcore::snapshot::{ManifestData, RestorationStatus};
-use ethcore::transaction::PendingTransaction;
+use transaction::PendingTransaction;
 use sync_io::SyncIo;
-use time;
 use super::SyncConfig;
 use block_sync::{BlockDownloader, BlockRequest, BlockDownloaderImportError as DownloaderImportError, DownloadAction};
 use rand::Rng;
@@ -125,7 +129,6 @@ const MIN_PEERS_PROPAGATION: usize = 4;
 const MAX_PEERS_PROPAGATION: usize = 128;
 const MAX_PEER_LAG_PROPAGATION: BlockNumber = 20;
 const MAX_NEW_HASHES: usize = 64;
-const MAX_TX_TO_IMPORT: usize = 512;
 const MAX_NEW_BLOCK_AGE: BlockNumber = 20;
 const MAX_TRANSACTION_SIZE: usize = 300*1024;
 // maximal packet size with transactions (cannot be greater than 16MB - protocol limitation).
@@ -133,7 +136,7 @@ const MAX_TRANSACTION_PACKET_SIZE: usize = 8 * 1024 * 1024;
 // Maximal number of transactions in sent in single packet.
 const MAX_TRANSACTIONS_TO_PROPAGATE: usize = 64;
 // Min number of blocks to be behind for a snapshot sync
-const SNAPSHOT_RESTORE_THRESHOLD: BlockNumber = 10000;
+const SNAPSHOT_RESTORE_THRESHOLD: BlockNumber = 30000;
 const SNAPSHOT_MIN_PEERS: usize = 3;
 
 const STATUS_PACKET: u8 = 0x00;
@@ -165,7 +168,7 @@ const MAX_SNAPSHOT_CHUNKS_DOWNLOAD_AHEAD: usize = 3;
 const WAIT_PEERS_TIMEOUT_SEC: u64 = 5;
 const STATUS_TIMEOUT_SEC: u64 = 5;
 const HEADERS_TIMEOUT_SEC: u64 = 15;
-const BODIES_TIMEOUT_SEC: u64 = 10;
+const BODIES_TIMEOUT_SEC: u64 = 20;
 const RECEIPTS_TIMEOUT_SEC: u64 = 10;
 const FORK_HEADER_TIMEOUT_SEC: u64 = 3;
 const SNAPSHOT_MANIFEST_TIMEOUT_SEC: u64 = 5;
@@ -302,7 +305,7 @@ struct PeerInfo {
 	/// Holds requested snapshot chunk hash if any.
 	asking_snapshot_data: Option<H256>,
 	/// Request timestamp
-	ask_time: u64,
+	ask_time: Instant,
 	/// Holds a set of transactions recently sent to this peer to avoid spamming.
 	last_sent_transactions: HashSet<H256>,
 	/// Pending request is expired and result should be ignored
@@ -374,9 +377,9 @@ pub struct ChainSync {
 	snapshot: Snapshot,
 	/// Connected peers pending Status message.
 	/// Value is request timestamp.
-	handshaking_peers: HashMap<PeerId, u64>,
+	handshaking_peers: HashMap<PeerId, Instant>,
 	/// Sync start timestamp. Measured when first peer is connected
-	sync_start_time: Option<u64>,
+	sync_start_time: Option<Instant>,
 	/// Transactions propagation statistics
 	transactions_stats: TransactionsStats,
 	/// Enable ancient block downloading
@@ -455,7 +458,7 @@ impl ChainSync {
 
 	/// Updates transactions were received by a peer
 	pub fn transactions_received(&mut self, hashes: Vec<H256>, peer_id: PeerId) {
-		if let Some(mut peer_info) = self.peers.get_mut(&peer_id) {
+		if let Some(peer_info) = self.peers.get_mut(&peer_id) {
 			peer_info.last_sent_transactions.extend(&hashes);
 		}
 	}
@@ -466,7 +469,6 @@ impl ChainSync {
 		self.peers.clear();
 	}
 
-	#[cfg_attr(feature="dev", allow(for_kv_map))] // Because it's not possible to get `values_mut()`
 	/// Reset sync. Clear all downloaded data but keep the queue
 	fn reset(&mut self, io: &mut SyncIo) {
 		self.new_blocks.reset();
@@ -542,7 +544,7 @@ impl ChainSync {
 			(best_hash, max_peers, snapshot_peers)
 		};
 
-		let timeout = (self.state == SyncState::WaitingPeers) && self.sync_start_time.map_or(false, |t| ((time::precise_time_ns() - t) / 1_000_000_000) > WAIT_PEERS_TIMEOUT_SEC);
+		let timeout = (self.state == SyncState::WaitingPeers) && self.sync_start_time.map_or(false, |t| t.elapsed().as_secs() > WAIT_PEERS_TIMEOUT_SEC);
 
 		if let (Some(hash), Some(peers)) = (best_hash, best_hash.map_or(None, |h| snapshot_peers.get(&h))) {
 			if max_peers >= SNAPSHOT_MIN_PEERS {
@@ -614,7 +616,7 @@ impl ChainSync {
 			asking: PeerAsking::Nothing,
 			asking_blocks: Vec::new(),
 			asking_hash: None,
-			ask_time: 0,
+			ask_time: Instant::now(),
 			last_sent_transactions: HashSet::new(),
 			expired: false,
 			confirmation: if self.fork_block.is_none() { ForkConfirmation::Confirmed } else { ForkConfirmation::Unconfirmed },
@@ -625,7 +627,7 @@ impl ChainSync {
 		};
 
 		if self.sync_start_time.is_none() {
-			self.sync_start_time = Some(time::precise_time_ns());
+			self.sync_start_time = Some(Instant::now());
 		}
 
 		trace!(target: "sync", "New peer {} (protocol: {}, network: {:?}, difficulty: {:?}, latest:{}, genesis:{}, snapshot:{:?})",
@@ -669,7 +671,6 @@ impl ChainSync {
 		Ok(())
 	}
 
-	#[cfg_attr(feature="dev", allow(cyclomatic_complexity, needless_borrow))]
 	/// Called by peer once it has new block headers during sync
 	fn on_peer_block_headers(&mut self, io: &mut SyncIo, peer_id: PeerId, r: &UntrustedRlp) -> Result<(), PacketDecodeError> {
 		let confirmed = match self.peers.get_mut(&peer_id) {
@@ -682,7 +683,7 @@ impl ChainSync {
 					peer.confirmation = ForkConfirmation::TooShort;
 				} else {
 					let header = r.at(0)?.as_raw();
-					if header.sha3() == fork_hash {
+					if keccak(&header) == fork_hash {
 						trace!(target: "sync", "{}: Confirmed peer", peer_id);
 						peer.confirmation = ForkConfirmation::Confirmed;
 						if !io.chain_overlay().read().contains_key(&fork_number) {
@@ -690,7 +691,7 @@ impl ChainSync {
 						}
 					} else {
 						trace!(target: "sync", "{}: Fork mismatch", peer_id);
-						io.disconnect_peer(peer_id);
+						io.disable_peer(peer_id);
 						return Ok(());
 					}
 				}
@@ -726,7 +727,7 @@ impl ChainSync {
 		}
 
 		let result =  {
-			let mut downloader = match block_set {
+			let downloader = match block_set {
 				BlockSet::NewBlocks => &mut self.new_blocks,
 				BlockSet::OldBlocks => {
 					match self.old_blocks {
@@ -791,7 +792,7 @@ impl ChainSync {
 		else
 		{
 			let result = {
-				let mut downloader = match block_set {
+				let downloader = match block_set {
 					BlockSet::NewBlocks => &mut self.new_blocks,
 					BlockSet::OldBlocks => match self.old_blocks {
 						None => {
@@ -845,7 +846,7 @@ impl ChainSync {
 		else
 		{
 			let result = {
-				let mut downloader = match block_set {
+				let downloader = match block_set {
 					BlockSet::NewBlocks => &mut self.new_blocks,
 					BlockSet::OldBlocks => match self.old_blocks {
 						None => {
@@ -880,7 +881,6 @@ impl ChainSync {
 	}
 
 	/// Called by peer once it has new block bodies
-	#[cfg_attr(feature="dev", allow(cyclomatic_complexity))]
 	fn on_peer_new_block(&mut self, io: &mut SyncIo, peer_id: PeerId, r: &UntrustedRlp) -> Result<(), PacketDecodeError> {
 		if !self.peers.get(&peer_id).map_or(false, |p| p.can_sync()) {
 			trace!(target: "sync", "Ignoring new block from unconfirmed peer {}", peer_id);
@@ -894,7 +894,7 @@ impl ChainSync {
 		}
 		let block_rlp = r.at(0)?;
 		let header_rlp = block_rlp.at(0)?;
-		let h = header_rlp.as_raw().sha3();
+		let h = keccak(&header_rlp.as_raw());
 		trace!(target: "sync", "{} -> NewBlock ({})", peer_id, h);
 		let header: BlockHeader = header_rlp.as_val()?;
 		if header.number() > self.highest_block.unwrap_or(0) {
@@ -1055,7 +1055,7 @@ impl ChainSync {
 			self.continue_sync(io);
 			return Ok(());
 		}
-		self.snapshot.reset_to(&manifest, &manifest_rlp.as_raw().sha3());
+		self.snapshot.reset_to(&manifest, &keccak(manifest_rlp.as_raw()));
 		io.snapshot_service().begin_restore(manifest);
 		self.state = SyncState::SnapshotData;
 
@@ -1148,9 +1148,9 @@ impl ChainSync {
 		trace!(target: "sync", "== Connected {}: {}", peer, io.peer_info(peer));
 		if let Err(e) = self.send_status(io, peer) {
 			debug!(target:"sync", "Error sending status request: {:?}", e);
-			io.disable_peer(peer);
+			io.disconnect_peer(peer);
 		} else {
-			self.handshaking_peers.insert(peer, time::precise_time_ns());
+			self.handshaking_peers.insert(peer, Instant::now());
 		}
 	}
 
@@ -1330,7 +1330,6 @@ impl ChainSync {
 	}
 
 	/// Checks if there are blocks fully downloaded that can be imported into the blockchain and does the import.
-	#[cfg_attr(feature="dev", allow(block_in_if_condition_stmt))]
 	fn collect_blocks(&mut self, io: &mut SyncIo, block_set: BlockSet) {
 		match block_set {
 			BlockSet::NewBlocks => {
@@ -1350,7 +1349,6 @@ impl ChainSync {
 	}
 
 	/// Request headers from a peer by block hash
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	fn request_headers_by_hash(&mut self, sync: &mut SyncIo, peer_id: PeerId, h: &H256, count: u64, skip: u64, reverse: bool, set: BlockSet) {
 		trace!(target: "sync", "{} <- GetBlockHeaders: {} entries starting from {}, set = {:?}", peer_id, count, h, set);
 		let mut rlp = RlpStream::new_list(4);
@@ -1365,7 +1363,6 @@ impl ChainSync {
 	}
 
 	/// Request headers from a peer by block number
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	fn request_fork_header_by_number(&mut self, sync: &mut SyncIo, peer_id: PeerId, n: BlockNumber) {
 		trace!(target: "sync", "{} <- GetForkHeader: at {}", peer_id, n);
 		let mut rlp = RlpStream::new_list(4);
@@ -1441,7 +1438,7 @@ impl ChainSync {
 				warn!(target:"sync", "Asking {:?} while requesting {:?}", peer.asking, asking);
 			}
 			peer.asking = asking;
-			peer.ask_time = time::precise_time_ns();
+			peer.ask_time = Instant::now();
 			let result = if packet_id >= ETH_PACKET_COUNT {
 				sync.send_protocol(WARP_SYNC_PROTOCOL_ID, peer_id, packet_id, packet)
 			} else {
@@ -1449,7 +1446,7 @@ impl ChainSync {
 			};
 			if let Err(e) = result {
 				debug!(target:"sync", "Error sending request: {:?}", e);
-				sync.disable_peer(peer_id);
+				sync.disconnect_peer(peer_id);
 			}
 		}
 	}
@@ -1458,7 +1455,7 @@ impl ChainSync {
 	fn send_packet(&mut self, sync: &mut SyncIo, peer_id: PeerId, packet_id: PacketId, packet: Bytes) {
 		if let Err(e) = sync.send(peer_id, packet_id, packet) {
 			debug!(target:"sync", "Error sending packet: {:?}", e);
-			sync.disable_peer(peer_id);
+			sync.disconnect_peer(peer_id);
 		}
 	}
 
@@ -1473,9 +1470,8 @@ impl ChainSync {
 			trace!(target: "sync", "{} Ignoring transactions from unconfirmed/unknown peer", peer_id);
 		}
 
-		let mut item_count = r.item_count()?;
+		let item_count = r.item_count()?;
 		trace!(target: "sync", "{:02} -> Transactions ({} entries)", peer_id, item_count);
-		item_count = cmp::min(item_count, MAX_TX_TO_IMPORT);
 		let mut transactions = Vec::with_capacity(item_count);
 		for i in 0 .. item_count {
 			let rlp = r.at(i)?;
@@ -1491,7 +1487,7 @@ impl ChainSync {
 	}
 
 	/// Send Status message
-	fn send_status(&mut self, io: &mut SyncIo, peer: PeerId) -> Result<(), NetworkError> {
+	fn send_status(&mut self, io: &mut SyncIo, peer: PeerId) -> Result<(), network::Error> {
 		let warp_protocol_version = io.protocol_version(&WARP_SYNC_PROTOCOL_ID, peer);
 		let warp_protocol = warp_protocol_version != 0;
 		let protocol = if warp_protocol { warp_protocol_version } else { PROTOCOL_VERSION_63 };
@@ -1509,7 +1505,7 @@ impl ChainSync {
 				false => io.snapshot_service().manifest(),
 			};
 			let block_number = manifest.as_ref().map_or(0, |m| m.block_number);
-			let manifest_hash = manifest.map_or(H256::new(), |m| m.into_rlp().sha3());
+			let manifest_hash = manifest.map_or(H256::new(), |m| keccak(m.into_rlp()));
 			packet.append(&manifest_hash);
 			packet.append(&block_number);
 		}
@@ -1531,7 +1527,7 @@ impl ChainSync {
 			match io.chain().block_header(BlockId::Hash(hash)) {
 				Some(hdr) => {
 					let number = hdr.number().into();
-					debug_assert_eq!(hdr.sha3(), hash);
+					debug_assert_eq!(hdr.hash(), hash);
 
 					if max_headers == 1 || io.chain().block_hash(BlockId::Number(number)) != Some(hash) {
 						// Non canonical header or single header requested
@@ -1703,7 +1699,7 @@ impl ChainSync {
 
 	fn return_rlp<FRlp, FError>(io: &mut SyncIo, rlp: &UntrustedRlp, peer: PeerId, rlp_func: FRlp, error_func: FError) -> Result<(), PacketDecodeError>
 		where FRlp : Fn(&SyncIo, &UntrustedRlp, PeerId) -> RlpResponseResult,
-			FError : FnOnce(NetworkError) -> String
+			FError : FnOnce(network::Error) -> String
 	{
 		let response = rlp_func(io, rlp, peer);
 		match response {
@@ -1781,12 +1777,11 @@ impl ChainSync {
 		})
 	}
 
-	#[cfg_attr(feature="dev", allow(match_same_arms))]
 	pub fn maintain_peers(&mut self, io: &mut SyncIo) {
-		let tick = time::precise_time_ns();
+		let tick = Instant::now();
 		let mut aborting = Vec::new();
 		for (peer_id, peer) in &self.peers {
-			let elapsed = (tick - peer.ask_time) / 1_000_000_000;
+			let elapsed = (tick - peer.ask_time).as_secs();
 			let timeout = match peer.asking {
 				PeerAsking::BlockHeaders => elapsed > HEADERS_TIMEOUT_SEC,
 				PeerAsking::BlockBodies => elapsed > BODIES_TIMEOUT_SEC,
@@ -1807,9 +1802,9 @@ impl ChainSync {
 		}
 
 		// Check for handshake timeouts
-		for (peer, ask_time) in &self.handshaking_peers {
+		for (peer, &ask_time) in &self.handshaking_peers {
 			let elapsed = (tick - ask_time) / 1_000_000_000;
-			if elapsed > STATUS_TIMEOUT_SEC {
+			if elapsed.as_secs() > STATUS_TIMEOUT_SEC {
 				trace!(target:"sync", "Status timeout {}", peer);
 				io.disconnect_peer(*peer);
 			}
@@ -2182,7 +2177,7 @@ impl ChainSync {
 			// Select random peer to re-broadcast transactions to.
 			let peer = random::new().gen_range(0, self.peers.len());
 			trace!(target: "sync", "Re-broadcasting transactions to a random peer.");
-			self.peers.values_mut().nth(peer).map(|mut peer_info|
+			self.peers.values_mut().nth(peer).map(|peer_info|
 				peer_info.last_sent_transactions.clear()
 			);
 		}
@@ -2225,22 +2220,21 @@ fn accepts_service_transaction(client_id: &str) -> bool {
 #[cfg(test)]
 mod tests {
 	use std::collections::{HashSet, VecDeque};
+	use ethkey;
 	use network::PeerId;
 	use tests::helpers::*;
 	use tests::snapshot::TestSnapshotService;
-	use util::{U256, Address, RwLock};
-	use util::sha3::Hashable;
-	use util::hash::H256;
-	use util::bytes::Bytes;
+	use ethereum_types::{H256, U256, Address};
+	use parking_lot::RwLock;
+	use bytes::Bytes;
 	use rlp::{Rlp, RlpStream, UntrustedRlp};
 	use super::*;
 	use ::SyncConfig;
 	use super::{PeerInfo, PeerAsking};
-	use ethkey;
 	use ethcore::header::*;
-	use ethcore::client::*;
-	use ethcore::transaction::UnverifiedTransaction;
+	use ethcore::client::{BlockChainClient, EachBlockWith, TestBlockChainClient, ChainInfo, BlockInfo};
 	use ethcore::miner::MinerService;
+	use transaction::UnverifiedTransaction;
 
 	fn get_dummy_block(order: u32, parent_hash: H256) -> Bytes {
 		let mut header = Header::new();
@@ -2394,7 +2388,7 @@ mod tests {
 		let blocks: Vec<_> = (0 .. 100)
 			.map(|i| (&client as &BlockChainClient).block(BlockId::Number(i as BlockNumber)).map(|b| b.into_inner()).unwrap()).collect();
 		let headers: Vec<_> = blocks.iter().map(|b| Rlp::new(b).at(0).as_raw().to_vec()).collect();
-		let hashes: Vec<_> = headers.iter().map(|h| HeaderView::new(h).sha3()).collect();
+		let hashes: Vec<_> = headers.iter().map(|h| HeaderView::new(h).hash()).collect();
 
 		let queue = RwLock::new(VecDeque::new());
 		let ss = TestSnapshotService::new();
@@ -2480,7 +2474,7 @@ mod tests {
 				asking: PeerAsking::Nothing,
 				asking_blocks: Vec::new(),
 				asking_hash: None,
-				ask_time: 0,
+				ask_time: Instant::now(),
 				last_sent_transactions: HashSet::new(),
 				expired: false,
 				confirmation: super::ForkConfirmation::Confirmed,
@@ -2601,7 +2595,7 @@ mod tests {
 				asking: PeerAsking::Nothing,
 				asking_blocks: Vec::new(),
 				asking_hash: None,
-				ask_time: 0,
+				ask_time: Instant::now(),
 				last_sent_transactions: HashSet::new(),
 				expired: false,
 				confirmation: super::ForkConfirmation::Confirmed,
diff --git a/sync/src/lib.rs b/sync/src/lib.rs
index 51947317df183cae9ed1b1841ef8aaa809cdabfe..9aee8f3d4ef1c7703429761b036ca7a3f975e169 100644
--- a/sync/src/lib.rs
+++ b/sync/src/lib.rs
@@ -15,12 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 #![warn(missing_docs)]
-#![cfg_attr(feature="dev", feature(plugin))]
-#![cfg_attr(feature="dev", plugin(clippy))]
-// Keeps consistency (all lines with `.clone()`) and helpful when changing ref to non-ref.
-#![cfg_attr(feature="dev", allow(clone_on_copy))]
-// In most cases it expresses function flow better
-#![cfg_attr(feature="dev", allow(if_not_else))]
 
 //! Blockchain sync module
 //! Implements ethereum protocol version 63 as specified here:
@@ -28,30 +22,35 @@
 //!
 
 extern crate ethcore_network as network;
+extern crate ethcore_network_devp2p as devp2p;
+extern crate ethcore_bytes as bytes;
 extern crate ethcore_io as io;
+extern crate ethcore_transaction as transaction;
 extern crate ethcore;
+extern crate ethereum_types;
 extern crate env_logger;
-extern crate time;
+extern crate plain_hasher;
 extern crate rand;
 extern crate semver;
 extern crate parking_lot;
 extern crate smallvec;
 extern crate rlp;
 extern crate ipnetwork;
+extern crate keccak_hash as hash;
+extern crate triehash;
+extern crate kvdb;
 
 extern crate ethcore_light as light;
 
-#[cfg(test)] extern crate ethcore_devtools as devtools;
 #[cfg(test)] extern crate ethkey;
+#[cfg(test)] extern crate kvdb_memorydb;
 
 #[macro_use]
-extern crate log;
+extern crate macros;
 #[macro_use]
-extern crate ethcore_util as util;
+extern crate log;
 #[macro_use]
 extern crate heapsize;
-#[macro_use]
-extern crate ethcore_ipc as ipc;
 
 mod chain;
 mod blocks;
@@ -65,21 +64,9 @@ pub mod light_sync;
 #[cfg(test)]
 mod tests;
 
-#[cfg(feature = "ipc")]
-mod api {
-	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
-	include!(concat!(env!("OUT_DIR"), "/api.rs"));
-}
-
-#[cfg(not(feature = "ipc"))]
 mod api;
 
 pub use api::*;
 pub use chain::{SyncStatus, SyncState};
-pub use network::{is_valid_node_url, NonReservedPeerMode, NetworkError, ConnectionFilter, ConnectionDirection};
-
-/// IPC interfaces
-#[cfg(feature="ipc")]
-pub mod remote {
-	pub use api::{SyncClient, NetworkManagerClient};
-}
+pub use devp2p::{validate_node_url, ConnectionFilter, ConnectionDirection};
+pub use network::{NonReservedPeerMode, Error, ErrorKind};
diff --git a/sync/src/light_sync/mod.rs b/sync/src/light_sync/mod.rs
index f05e4d7d0bc479d35abb7dab5be7b24263289eb0..ef1bd8742f3e233747b1c77dbad6741d9c767d13 100644
--- a/sync/src/light_sync/mod.rs
+++ b/sync/src/light_sync/mod.rs
@@ -35,6 +35,7 @@
 use std::collections::{HashMap, HashSet};
 use std::mem;
 use std::sync::Arc;
+use std::time::{Instant, Duration};
 
 use ethcore::encoded;
 use light::client::{AsLightClient, LightChainClient};
@@ -45,7 +46,8 @@ use light::net::{
 };
 use light::request::{self, CompleteHeadersRequest as HeadersRequest};
 use network::PeerId;
-use util::{U256, H256, Mutex, RwLock};
+use ethereum_types::{H256, U256};
+use parking_lot::{Mutex, RwLock};
 use rand::{Rng, OsRng};
 
 use self::sync_round::{AbortReason, SyncRound, ResponseContext};
@@ -56,6 +58,13 @@ mod sync_round;
 #[cfg(test)]
 mod tests;
 
+// Base number of milliseconds for the header request timeout.
+const REQ_TIMEOUT_MILLISECS_BASE: u64 = 7000;
+// Additional number of milliseconds for each requested header.
+// If we request N headers, then the timeout will be:
+//  REQ_TIMEOUT_MILLISECS_BASE + N * REQ_TIMEOUT_MILLISECS_PER_HEADER
+const REQ_TIMEOUT_MILLISECS_PER_HEADER: u64 = 10;
+
 /// Peer chain info.
 #[derive(Debug, Clone, PartialEq, Eq)]
 struct ChainInfo {
@@ -223,12 +232,18 @@ pub struct LightSync<L: AsLightClient> {
 	start_block_number: u64,
 	best_seen: Mutex<Option<ChainInfo>>, // best seen block on the network.
 	peers: RwLock<HashMap<PeerId, Mutex<Peer>>>, // peers which are relevant to synchronization.
-	pending_reqs: Mutex<HashSet<ReqId>>, // requests from this handler.
+	pending_reqs: Mutex<HashMap<ReqId, PendingReq>>, // requests from this handler
 	client: Arc<L>,
 	rng: Mutex<OsRng>,
 	state: Mutex<SyncState>,
 }
 
+#[derive(Debug, Clone)]
+struct PendingReq {
+	started: Instant,
+	timeout: Duration,
+}
+
 impl<L: AsLightClient + Send + Sync> Handler for LightSync<L> {
 	fn on_connect(
 		&self,
@@ -351,7 +366,7 @@ impl<L: AsLightClient + Send + Sync> Handler for LightSync<L> {
 			return
 		}
 
-		if !self.pending_reqs.lock().remove(&req_id) {
+		if self.pending_reqs.lock().remove(&req_id).is_none() {
 			return
 		}
 
@@ -410,7 +425,7 @@ impl<L: AsLightClient> LightSync<L> {
 		*state = SyncState::AncestorSearch(AncestorSearch::begin(chain_info.best_block_number));
 	}
 
-	// handles request dispatch, block import, and state machine transitions.
+	// handles request dispatch, block import, state machine transitions, and timeouts.
 	fn maintain_sync(&self, ctx: &BasicContext) {
 		const DRAIN_AMOUNT: usize = 128;
 
@@ -500,6 +515,32 @@ impl<L: AsLightClient> LightSync<L> {
 			}
 		}
 
+		// handle requests timeouts
+		{
+			let mut pending_reqs = self.pending_reqs.lock();
+			let mut unfulfilled = Vec::new();
+			for (req_id, info) in pending_reqs.iter() {
+				if info.started.elapsed() >= info.timeout {
+					debug!(target: "sync", "{} timed out", req_id);
+					unfulfilled.push(req_id.clone());
+				}
+			}
+
+			if !unfulfilled.is_empty() {
+				for unfulfilled in unfulfilled.iter() {
+					pending_reqs.remove(unfulfilled);
+				}
+				drop(pending_reqs);
+
+				*state = match mem::replace(&mut *state, SyncState::Idle) {
+					SyncState::Idle => SyncState::Idle,
+					SyncState::AncestorSearch(search) =>
+						SyncState::AncestorSearch(search.requests_abandoned(&unfulfilled)),
+					SyncState::Rounds(round) => SyncState::Rounds(round.requests_abandoned(&unfulfilled)),
+				};
+			}
+		}
+
 		// allow dispatching of requests.
 		{
 			let peers = self.peers.read();
@@ -520,7 +561,7 @@ impl<L: AsLightClient> LightSync<L> {
 				rng.shuffle(&mut peer_ids);
 
 				let request = {
-					let mut builder = request::RequestBuilder::default();
+					let mut builder = request::Builder::default();
 					builder.push(request::Request::Headers(request::IncompleteHeadersRequest {
 						start: req.start.into(),
 						skip: req.skip,
@@ -533,7 +574,12 @@ impl<L: AsLightClient> LightSync<L> {
 					if requested_from.contains(peer) { continue }
 					match ctx.request_from(*peer, request.clone()) {
 						Ok(id) => {
-							self.pending_reqs.lock().insert(id.clone());
+							let timeout_ms = REQ_TIMEOUT_MILLISECS_BASE +
+								req.max * REQ_TIMEOUT_MILLISECS_PER_HEADER;
+							self.pending_reqs.lock().insert(id.clone(), PendingReq {
+								started: Instant::now(),
+								timeout: Duration::from_millis(timeout_ms),
+							});
 							requested_from.insert(peer.clone());
 
 							return Some(id)
@@ -569,7 +615,7 @@ impl<L: AsLightClient> LightSync<L> {
 			start_block_number: client.as_light_client().chain_info().best_block_number,
 			best_seen: Mutex::new(None),
 			peers: RwLock::new(HashMap::new()),
-			pending_reqs: Mutex::new(HashSet::new()),
+			pending_reqs: Mutex::new(HashMap::new()),
 			client: client,
 			rng: Mutex::new(OsRng::new()?),
 			state: Mutex::new(SyncState::Idle),
diff --git a/sync/src/light_sync/response.rs b/sync/src/light_sync/response.rs
index 1ab504a9f3afd1cf3d3c795a0c1d606a0b65593d..4dfb383d4668a03f29c1f0e61252a550f20bffae 100644
--- a/sync/src/light_sync/response.rs
+++ b/sync/src/light_sync/response.rs
@@ -22,7 +22,7 @@ use ethcore::encoded;
 use ethcore::header::Header;
 use light::request::{HashOrNumber, CompleteHeadersRequest as HeadersRequest};
 use rlp::DecoderError;
-use util::H256;
+use ethereum_types::H256;
 
 /// Errors found when decoding headers and verifying with basic constraints.
 #[derive(Debug, PartialEq)]
diff --git a/sync/src/light_sync/sync_round.rs b/sync/src/light_sync/sync_round.rs
index dfa17aad432002632d650210f9d4507763b9c2f4..d477ecc81503f074d9cce3993b116502fb4e4d04 100644
--- a/sync/src/light_sync/sync_round.rs
+++ b/sync/src/light_sync/sync_round.rs
@@ -27,7 +27,7 @@ use light::net::ReqId;
 use light::request::CompleteHeadersRequest as HeadersRequest;
 
 use network::PeerId;
-use util::H256;
+use ethereum_types::H256;
 
 use super::response;
 
@@ -179,7 +179,7 @@ impl Fetcher {
 		};
 
 		trace!(target: "sync", "Received response for subchain ({} -> {})",
-			request.subchain_parent.0 + 1, request.subchain_end.0);
+			request.subchain_parent.0, request.subchain_end.0);
 
 		let headers = ctx.data();
 
@@ -241,6 +241,8 @@ impl Fetcher {
 	}
 
 	fn requests_abandoned(mut self, abandoned: &[ReqId]) -> SyncRound {
+		trace!(target: "sync", "Abandonned requests {:?}", abandoned);
+
 		for abandoned in abandoned {
 			match self.pending.remove(abandoned) {
 				None => {},
@@ -258,12 +260,14 @@ impl Fetcher {
 		while let Some(pending_req) = self.requests.pop() {
 			match dispatcher(pending_req.headers_request.clone()) {
 				Some(req_id) => {
-					trace!(target: "sync", "Assigned request for subchain ({} -> {})",
-						pending_req.subchain_parent.0 + 1, pending_req.subchain_end.0);
+					trace!(target: "sync", "Assigned request {} for subchain ({} -> {})",
+						req_id, pending_req.subchain_parent.0, pending_req.subchain_end.0);
 
 					self.pending.insert(req_id, pending_req);
 				}
 				None => {
+					trace!(target: "sync", "Failed to assign request for subchain ({} -> {})",
+						pending_req.subchain_parent.0, pending_req.subchain_end.0);
 					self.requests.push(pending_req);
 					break;
 				}
diff --git a/sync/src/light_sync/tests/mod.rs b/sync/src/light_sync/tests/mod.rs
index 1653d09d37049e966abb7c0eef679fc507c80a1b..9fd270838bf7bb0aee8e042f47052c8606152aca 100644
--- a/sync/src/light_sync/tests/mod.rs
+++ b/sync/src/light_sync/tests/mod.rs
@@ -16,7 +16,7 @@
 
 use tests::helpers::TestNet;
 
-use ethcore::client::{BlockChainClient, BlockId, EachBlockWith};
+use ethcore::client::{BlockInfo, BlockId, EachBlockWith};
 
 mod test_net;
 
diff --git a/sync/src/light_sync/tests/test_net.rs b/sync/src/light_sync/tests/test_net.rs
index f6d5eddf0c6b4b2b481085295fa7bff4ae0d9d37..f935680573f0e144d9394c7fd112e6d2210296ab 100644
--- a/sync/src/light_sync/tests/test_net.rs
+++ b/sync/src/light_sync/tests/test_net.rs
@@ -25,17 +25,20 @@ use tests::helpers::{TestNet, Peer as PeerLike, TestPacket};
 use ethcore::client::TestBlockChainClient;
 use ethcore::spec::Spec;
 use io::IoChannel;
-use light::client::Client as LightClient;
+use kvdb_memorydb;
+use light::client::fetch::{self, Unavailable};
 use light::net::{LightProtocol, IoContext, Capabilities, Params as LightParams};
 use light::provider::LightProvider;
 use network::{NodeId, PeerId};
-use util::RwLock;
+use parking_lot::RwLock;
 
-use time::Duration;
+use std::time::Duration;
 use light::cache::Cache;
 
 const NETWORK_ID: u64 = 0xcafebabe;
 
+pub type LightClient = ::light::client::Client<Unavailable>;
+
 struct TestIoContext<'a> {
 	queue: &'a RwLock<VecDeque<TestPacket>>,
 	sender: Option<PeerId>,
@@ -215,8 +218,18 @@ impl TestNet<Peer> {
 
 			// skip full verification because the blocks are bad.
 			config.verify_full = false;
-			let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
-			let client = LightClient::in_memory(config, &Spec::new_test(), IoChannel::disconnected(), cache);
+			let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
+			let db = kvdb_memorydb::create(0);
+			let client = LightClient::new(
+				config,
+				Arc::new(db),
+				None,
+				&Spec::new_test(),
+				fetch::unavailable(), // TODO: allow fetch from full nodes.
+				IoChannel::disconnected(),
+				cache
+			).expect("New DB creation infallible; qed");
+
 			peers.push(Arc::new(Peer::new_light(Arc::new(client))))
 		}
 
diff --git a/sync/src/snapshot.rs b/sync/src/snapshot.rs
index cecfbe425f6b7c3d4e15641f181cfc6c1db9ef0a..917e84c8846e41afaf10243d7339ae373d684e9d 100644
--- a/sync/src/snapshot.rs
+++ b/sync/src/snapshot.rs
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-
-use util::{H256, Hashable};
+use hash::keccak;
+use ethereum_types::H256;
 use std::collections::HashSet;
 use ethcore::snapshot::ManifestData;
 
@@ -71,9 +71,9 @@ impl Snapshot {
 
 	/// Validate chunk and mark it as downloaded
 	pub fn validate_chunk(&mut self, chunk: &[u8]) -> Result<ChunkType, ()> {
-		let hash = chunk.sha3();
+		let hash = keccak(chunk);
 		if self.completed_chunks.contains(&hash) {
-			trace!(target: "sync", "Ignored proccessed chunk: {}", hash.hex());
+			trace!(target: "sync", "Ignored proccessed chunk: {:x}", hash);
 			return Err(());
 		}
 		self.downloading_chunks.remove(&hash);
@@ -85,7 +85,7 @@ impl Snapshot {
 			self.completed_chunks.insert(hash.clone());
 			return Ok(ChunkType::State(hash));
 		}
-		trace!(target: "sync", "Ignored unknown chunk: {}", hash.hex());
+		trace!(target: "sync", "Ignored unknown chunk: {:x}", hash);
 		Err(())
 	}
 
@@ -136,7 +136,8 @@ impl Snapshot {
 
 #[cfg(test)]
 mod test {
-	use util::*;
+	use hash::keccak;
+	use bytes::Bytes;
 	use super::*;
 	use ethcore::snapshot::ManifestData;
 
@@ -153,13 +154,13 @@ mod test {
 		let block_chunks: Vec<Bytes> = (0..20).map(|_| H256::random().to_vec()).collect();
 		let manifest = ManifestData {
 			version: 2,
-			state_hashes: state_chunks.iter().map(|data| data.sha3()).collect(),
-			block_hashes: block_chunks.iter().map(|data| data.sha3()).collect(),
+			state_hashes: state_chunks.iter().map(|data| keccak(data)).collect(),
+			block_hashes: block_chunks.iter().map(|data| keccak(data)).collect(),
 			state_root: H256::new(),
 			block_number: 42,
 			block_hash: H256::new(),
 		};
-		let mhash = manifest.clone().into_rlp().sha3();
+		let mhash = keccak(manifest.clone().into_rlp());
 		(manifest, mhash, state_chunks, block_chunks)
 	}
 
@@ -211,7 +212,7 @@ mod test {
 		assert!(snapshot.is_complete());
 		assert_eq!(snapshot.done_chunks(), 40);
 		assert_eq!(snapshot.done_chunks(), snapshot.total_chunks());
-		assert_eq!(snapshot.snapshot_hash(), Some(manifest.into_rlp().sha3()));
+		assert_eq!(snapshot.snapshot_hash(), Some(keccak(manifest.into_rlp())));
 	}
 
 	#[test]
diff --git a/sync/src/sync_io.rs b/sync/src/sync_io.rs
index 6871a2e205dcaa6dc07804d537983c320ead6b02..76f323e82614151344a67786c4bdad18d0a3e42c 100644
--- a/sync/src/sync_io.rs
+++ b/sync/src/sync_io.rs
@@ -15,8 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::collections::HashMap;
-use network::{NetworkContext, PeerId, PacketId, NetworkError, SessionInfo, ProtocolId};
-use util::Bytes;
+use network::{NetworkContext, PeerId, PacketId, Error, SessionInfo, ProtocolId};
+use bytes::Bytes;
 use ethcore::client::BlockChainClient;
 use ethcore::header::BlockNumber;
 use ethcore::snapshot::SnapshotService;
@@ -31,11 +31,11 @@ pub trait SyncIo {
 	/// Disconnect peer
 	fn disconnect_peer(&mut self, peer_id: PeerId);
 	/// Respond to current request with a packet. Can be called from an IO handler for incoming packet.
-	fn respond(&mut self, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError>;
+	fn respond(&mut self, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error>;
 	/// Send a packet to a peer.
-	fn send(&mut self, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError>;
+	fn send(&mut self, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error>;
 	/// Send a packet to a peer using specified protocol.
-	fn send_protocol(&mut self, protocol: ProtocolId, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError>;
+	fn send_protocol(&mut self, protocol: ProtocolId, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error>;
 	/// Get the blockchain
 	fn chain(&self) -> &BlockChainClient;
 	/// Get the snapshot service.
@@ -61,19 +61,19 @@ pub trait SyncIo {
 }
 
 /// Wraps `NetworkContext` and the blockchain client
-pub struct NetSyncIo<'s, 'h> where 'h: 's {
-	network: &'s NetworkContext<'h>,
+pub struct NetSyncIo<'s> {
+	network: &'s NetworkContext,
 	chain: &'s BlockChainClient,
 	snapshot_service: &'s SnapshotService,
 	chain_overlay: &'s RwLock<HashMap<BlockNumber, Bytes>>,
 }
 
-impl<'s, 'h> NetSyncIo<'s, 'h> {
+impl<'s> NetSyncIo<'s> {
 	/// Creates a new instance from the `NetworkContext` and the blockchain client reference.
-	pub fn new(network: &'s NetworkContext<'h>,
+	pub fn new(network: &'s NetworkContext,
 		chain: &'s BlockChainClient,
 		snapshot_service: &'s SnapshotService,
-		chain_overlay: &'s RwLock<HashMap<BlockNumber, Bytes>>) -> NetSyncIo<'s, 'h> {
+		chain_overlay: &'s RwLock<HashMap<BlockNumber, Bytes>>) -> NetSyncIo<'s> {
 		NetSyncIo {
 			network: network,
 			chain: chain,
@@ -83,7 +83,7 @@ impl<'s, 'h> NetSyncIo<'s, 'h> {
 	}
 }
 
-impl<'s, 'h> SyncIo for NetSyncIo<'s, 'h> {
+impl<'s> SyncIo for NetSyncIo<'s> {
 	fn disable_peer(&mut self, peer_id: PeerId) {
 		self.network.disable_peer(peer_id);
 	}
@@ -92,15 +92,15 @@ impl<'s, 'h> SyncIo for NetSyncIo<'s, 'h> {
 		self.network.disconnect_peer(peer_id);
 	}
 
-	fn respond(&mut self, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError>{
+	fn respond(&mut self, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error>{
 		self.network.respond(packet_id, data)
 	}
 
-	fn send(&mut self, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError>{
+	fn send(&mut self, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error>{
 		self.network.send(peer_id, packet_id, data)
 	}
 
-	fn send_protocol(&mut self, protocol: ProtocolId, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError>{
+	fn send_protocol(&mut self, protocol: ProtocolId, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error>{
 		self.network.send_protocol(protocol, peer_id, packet_id, data)
 	}
 
diff --git a/sync/src/tests/chain.rs b/sync/src/tests/chain.rs
index f9ce17b5b7c6d24189beaeb3dc9e42c4c1431cd5..517ff0d99a4dc603e3928cf69ce21bfe7a20545e 100644
--- a/sync/src/tests/chain.rs
+++ b/sync/src/tests/chain.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::Arc;
-use ethcore::client::{TestBlockChainClient, BlockChainClient, BlockId, EachBlockWith};
+use ethcore::client::{TestBlockChainClient, BlockChainClient, BlockId, EachBlockWith, ChainInfo, BlockInfo};
 use chain::{SyncState};
 use super::helpers::*;
 use SyncConfig;
diff --git a/sync/src/tests/consensus.rs b/sync/src/tests/consensus.rs
index 9b01156b73335da30a1f2b3f436d1a040c59d94b..951c027afe8c5c775777828a57f33bb980cb3e42 100644
--- a/sync/src/tests/consensus.rs
+++ b/sync/src/tests/consensus.rs
@@ -15,15 +15,15 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::Arc;
-use util::*;
+use hash::keccak;
+use ethereum_types::{U256, Address};
 use io::{IoHandler, IoContext, IoChannel};
-use ethcore::client::{BlockChainClient, Client};
-use ethcore::service::ClientIoMessage;
+use ethcore::client::{Client, ChainInfo, ClientIoMessage};
 use ethcore::spec::Spec;
 use ethcore::miner::MinerService;
-use ethcore::transaction::*;
 use ethcore::account_provider::AccountProvider;
 use ethkey::{KeyPair, Secret};
+use transaction::{Action, PendingTransaction, Transaction};
 use super::helpers::*;
 use SyncConfig;
 
@@ -56,8 +56,8 @@ fn new_tx(secret: &Secret, nonce: U256, chain_id: u64) -> PendingTransaction {
 
 #[test]
 fn authority_round() {
-	let s0 = KeyPair::from_secret_slice(&"1".sha3()).unwrap();
-	let s1 = KeyPair::from_secret_slice(&"0".sha3()).unwrap();
+	let s0 = KeyPair::from_secret_slice(&keccak("1")).unwrap();
+	let s1 = KeyPair::from_secret_slice(&keccak("0")).unwrap();
 	let ap = Arc::new(AccountProvider::transient_provider());
 	ap.insert_account(s0.secret().clone(), "").unwrap();
 	ap.insert_account(s1.secret().clone(), "").unwrap();
@@ -69,8 +69,8 @@ fn authority_round() {
 	// Push transaction to both clients. Only one of them gets lucky to produce a block.
 	net.peer(0).chain.miner().set_engine_signer(s0.address(), "".to_owned()).unwrap();
 	net.peer(1).chain.miner().set_engine_signer(s1.address(), "".to_owned()).unwrap();
-	net.peer(0).chain.engine().register_client(Arc::downgrade(&net.peer(0).chain));
-	net.peer(1).chain.engine().register_client(Arc::downgrade(&net.peer(1).chain));
+	net.peer(0).chain.engine().register_client(Arc::downgrade(&net.peer(0).chain) as _);
+	net.peer(1).chain.engine().register_client(Arc::downgrade(&net.peer(1).chain) as _);
 	net.peer(0).chain.set_io_channel(IoChannel::to_handler(Arc::downgrade(&io_handler1)));
 	net.peer(1).chain.set_io_channel(IoChannel::to_handler(Arc::downgrade(&io_handler0)));
 	// exchange statuses
@@ -143,8 +143,8 @@ fn authority_round() {
 
 #[test]
 fn tendermint() {
-	let s0 = KeyPair::from_secret_slice(&"1".sha3()).unwrap();
-	let s1 = KeyPair::from_secret_slice(&"0".sha3()).unwrap();
+	let s0 = KeyPair::from_secret_slice(&keccak("1")).unwrap();
+	let s1 = KeyPair::from_secret_slice(&keccak("0")).unwrap();
 	let ap = Arc::new(AccountProvider::transient_provider());
 	ap.insert_account(s0.secret().clone(), "").unwrap();
 	ap.insert_account(s1.secret().clone(), "").unwrap();
@@ -158,8 +158,8 @@ fn tendermint() {
 	trace!(target: "poa", "Peer 0 is {}.", s0.address());
 	net.peer(1).chain.miner().set_engine_signer(s1.address(), "".to_owned()).unwrap();
 	trace!(target: "poa", "Peer 1 is {}.", s1.address());
-	net.peer(0).chain.engine().register_client(Arc::downgrade(&net.peer(0).chain));
-	net.peer(1).chain.engine().register_client(Arc::downgrade(&net.peer(1).chain));
+	net.peer(0).chain.engine().register_client(Arc::downgrade(&net.peer(0).chain) as _);
+	net.peer(1).chain.engine().register_client(Arc::downgrade(&net.peer(1).chain) as _);
 	net.peer(0).chain.set_io_channel(IoChannel::to_handler(Arc::downgrade(&io_handler0)));
 	net.peer(1).chain.set_io_channel(IoChannel::to_handler(Arc::downgrade(&io_handler1)));
 	// Exhange statuses
diff --git a/sync/src/tests/helpers.rs b/sync/src/tests/helpers.rs
index 3ac68b0fb6d546f1000e1104f1d6e8b0bad8572f..32a90b414fe28f7e0b39934744c1b7ed439a2176 100644
--- a/sync/src/tests/helpers.rs
+++ b/sync/src/tests/helpers.rs
@@ -16,8 +16,10 @@
 
 use std::collections::{VecDeque, HashSet, HashMap};
 use std::sync::Arc;
-use util::*;
-use network::*;
+use ethereum_types::H256;
+use parking_lot::RwLock;
+use bytes::Bytes;
+use network::{self, PeerId, ProtocolId, PacketId, SessionInfo};
 use tests::snapshot::*;
 use ethcore::client::{TestBlockChainClient, BlockChainClient, Client as EthcoreClient, ClientConfig, ChainNotify};
 use ethcore::header::BlockNumber;
@@ -88,7 +90,7 @@ impl<'p, C> SyncIo for TestIo<'p, C> where C: FlushingBlockChainClient, C: 'p {
 		false
 	}
 
-	fn respond(&mut self, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError> {
+	fn respond(&mut self, packet_id: PacketId, data: Vec<u8>) -> Result<(), network::Error> {
 		self.packets.push(TestPacket {
 			data: data,
 			packet_id: packet_id,
@@ -97,7 +99,7 @@ impl<'p, C> SyncIo for TestIo<'p, C> where C: FlushingBlockChainClient, C: 'p {
 		Ok(())
 	}
 
-	fn send(&mut self, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError> {
+	fn send(&mut self, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), network::Error> {
 		self.packets.push(TestPacket {
 			data: data,
 			packet_id: packet_id,
@@ -106,7 +108,7 @@ impl<'p, C> SyncIo for TestIo<'p, C> where C: FlushingBlockChainClient, C: 'p {
 		Ok(())
 	}
 
-	fn send_protocol(&mut self, _protocol: ProtocolId, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError> {
+	fn send_protocol(&mut self, _protocol: ProtocolId, peer_id: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), network::Error> {
 		self.send(peer_id, packet_id, data)
 	}
 
@@ -289,7 +291,7 @@ impl TestNet<EthPeer<EthcoreClient>> {
 		let client = EthcoreClient::new(
 			ClientConfig::default(),
 			&spec,
-			Arc::new(::util::kvdb::in_memory(::ethcore::db::NUM_COLUMNS.unwrap_or(0))),
+			Arc::new(::kvdb_memorydb::create(::ethcore::db::NUM_COLUMNS.unwrap_or(0))),
 			Arc::new(Miner::with_spec_and_accounts(&spec, accounts)),
 			IoChannel::disconnected(),
 		).unwrap();
diff --git a/sync/src/tests/snapshot.rs b/sync/src/tests/snapshot.rs
index 9303aa9f7fc72fb5a6e93ae11ac213c88b6e9284..516e3d7e2f0383f5caac09a6af6edce0628273f1 100644
--- a/sync/src/tests/snapshot.rs
+++ b/sync/src/tests/snapshot.rs
@@ -16,7 +16,10 @@
 
 use std::collections::HashMap;
 use std::sync::Arc;
-use util::*;
+use hash::keccak;
+use ethereum_types::H256;
+use parking_lot::Mutex;
+use bytes::Bytes;
 use ethcore::snapshot::{SnapshotService, ManifestData, RestorationStatus};
 use ethcore::header::BlockNumber;
 use ethcore::client::{EachBlockWith};
@@ -50,14 +53,14 @@ impl TestSnapshotService {
 		let block_chunks: Vec<Bytes> = (0..num_block_chunks).map(|_| H256::random().to_vec()).collect();
 		let manifest = ManifestData {
 			version: 2,
-			state_hashes: state_chunks.iter().map(|data| data.sha3()).collect(),
-			block_hashes: block_chunks.iter().map(|data| data.sha3()).collect(),
+			state_hashes: state_chunks.iter().map(|data| keccak(data)).collect(),
+			block_hashes: block_chunks.iter().map(|data| keccak(data)).collect(),
 			state_root: H256::new(),
 			block_number: block_number,
 			block_hash: block_hash,
 		};
-		let mut chunks: HashMap<H256, Bytes> = state_chunks.into_iter().map(|data| (data.sha3(), data)).collect();
-		chunks.extend(block_chunks.into_iter().map(|data| (data.sha3(), data)));
+		let mut chunks: HashMap<H256, Bytes> = state_chunks.into_iter().map(|data| (keccak(&data), data)).collect();
+		chunks.extend(block_chunks.into_iter().map(|data| (keccak(&data), data)));
 		TestSnapshotService {
 			manifest: Some(manifest),
 			chunks: chunks,
diff --git a/sync/src/transactions_stats.rs b/sync/src/transactions_stats.rs
index dcd2702c89b6c91cd7ed9c5dbbe905cbace8b86e..4d33008621a2e35e06b2611051cf6c22cd7e1d6b 100644
--- a/sync/src/transactions_stats.rs
+++ b/sync/src/transactions_stats.rs
@@ -16,8 +16,8 @@
 
 use api::TransactionStats;
 use std::collections::{HashSet, HashMap};
-use util::{H256, H512};
-use util::hash::H256FastMap;
+use ethereum_types::{H256, H512};
+use plain_hasher::H256FastMap;
 
 type NodeId = H512;
 type BlockNumber = u64;
@@ -58,8 +58,8 @@ impl TransactionsStats {
 	/// Increases number of propagations to given `enodeid`.
 	pub fn propagated(&mut self, hash: &H256, enode_id: Option<NodeId>, current_block_num: BlockNumber) {
 		let enode_id = enode_id.unwrap_or_default();
-		let mut stats = self.pending_transactions.entry(*hash).or_insert_with(|| Stats::new(current_block_num));
-		let mut count = stats.propagated_to.entry(enode_id).or_insert(0);
+		let stats = self.pending_transactions.entry(*hash).or_insert_with(|| Stats::new(current_block_num));
+		let count = stats.propagated_to.entry(enode_id).or_insert(0);
 		*count = count.saturating_add(1);
 	}
 
diff --git a/test.sh b/test.sh
index 7a2cac946787b4278b4bfd033dbed9ef8140ac55..69204fef2f5fb2b208c6c782b1cd4cdb84598ef6 100755
--- a/test.sh
+++ b/test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Running Parity Full Test Sute
+# Running Parity Full Test Suite
 
 FEATURES="json-tests"
 OPTIONS="--release"
@@ -24,6 +24,10 @@ esac
 
 set -e
 
+# Validate chainspecs
 ./scripts/validate_chainspecs.sh
 
 cargo test -j 8 $OPTIONS --features "$FEATURES" --all --exclude evmjit $1
+
+# Validate --no-default-features build
+cargo check --no-default-features
diff --git a/transaction-pool/Cargo.toml b/transaction-pool/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..49bf2db64dbb2d98e267052807cfee29e4d18747
--- /dev/null
+++ b/transaction-pool/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+description = "Generic transaction pool."
+name = "transaction-pool"
+version = "1.11.0"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+error-chain = "0.11"
+log = "0.3"
+smallvec = "0.4"
+ethereum-types = "0.2"
diff --git a/transaction-pool/src/error.rs b/transaction-pool/src/error.rs
new file mode 100644
index 0000000000000000000000000000000000000000..706a5b77b19fa8d8e283ea55a2c267b0d5beb1c5
--- /dev/null
+++ b/transaction-pool/src/error.rs
@@ -0,0 +1,51 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use ethereum_types::H256;
+
+error_chain! {
+	errors {
+		/// Transaction is already imported
+		AlreadyImported(hash: H256) {
+			description("transaction is already in the pool"),
+			display("[{:?}] transaction already imported", hash)
+		}
+		/// Transaction is too cheap to enter the queue
+		TooCheapToEnter(hash: H256) {
+			description("the pool is full and transaction is too cheap to replace any transaction"),
+			display("[{:?}] transaction too cheap to enter the pool", hash)
+		}
+		/// Transaction is too cheap to replace existing transaction that occupies the same slot.
+		TooCheapToReplace(old_hash: H256, hash: H256) {
+			description("transaction is too cheap to replace existing transaction in the pool"),
+			display("[{:?}] transaction too cheap to replace: {:?}", hash, old_hash)
+		}
+	}
+}
+
+#[cfg(test)]
+impl PartialEq for ErrorKind {
+	fn eq(&self, other: &Self) -> bool {
+		use self::ErrorKind::*;
+
+		match (self, other) {
+			(&AlreadyImported(ref h1), &AlreadyImported(ref h2)) => h1 == h2,
+			(&TooCheapToEnter(ref h1), &TooCheapToEnter(ref h2)) => h1 == h2,
+			(&TooCheapToReplace(ref old1, ref new1), &TooCheapToReplace(ref old2, ref new2)) => old1 == old2 && new1 == new2,
+			_ => false,
+		}
+	}
+}
diff --git a/transaction-pool/src/lib.rs b/transaction-pool/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..29353a1000869cd859fd715d2699f231382e256c
--- /dev/null
+++ b/transaction-pool/src/lib.rs
@@ -0,0 +1,118 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Generic Transaction Pool
+//!
+//! An extensible and performant implementation of Ethereum Transaction Pool.
+//! The pool stores ordered, verified transactions according to some pluggable
+//! `Scoring` implementation.
+//! The pool also allows you to construct a set of `pending` transactions according
+//! to some notion of `Readiness` (pluggable).
+//!
+//! The pool is generic over transactions and should make no assumptions about them.
+//! The only thing we can rely on is the `Scoring` that defines:
+//!  - the ordering of transactions from a single sender
+//!  - the priority of the transaction compared to other transactions from different senders
+//!
+//! NOTE: the transactions from a single sender are not ordered by priority,
+//! but still when constructing pending set we always need to maintain the ordering
+//! (i.e. `txs[1]` always needs to be included after `txs[0]` even if it has higher priority)
+//!
+//! ### Design Details
+//!
+//! Performance assumptions:
+//! - Possibility to handle tens of thousands of transactions
+//! - Fast insertions and replacements `O(per-sender + log(senders))`
+//! - Reasonably fast removal of stalled transactions `O(per-sender)`
+//! - Reasonably fast construction of pending set `O(txs * (log(senders) + log(per-sender))`
+//!
+//! The removal performance could be improved by trading some memory. Currently `SmallVec` is used
+//! to store senders transactions, instead we could use `VecDeque` and efficiently `pop_front`
+//! the best transactions.
+//!
+//! The pending set construction and insertion complexity could be reduced by introducing
+//! a notion of `nonce` - an absolute, numeric ordering of transactions.
+//! We don't do that because of possible implications of EIP208 where nonce might not be
+//! explicitly available.
+//!
+//! 1. The pool groups transactions from particular sender together
+//!    and stores them ordered by `Scoring` within that group
+//!    i.e. `HashMap<Sender, Vec<Transaction>>`.
+//! 2. Additionaly we maintain the best and the worst transaction from each sender
+//!    (by `Scoring` not `priority`) ordered by `priority`.
+//!    It means that we can easily identify the best transaction inside the entire pool
+//!    and the worst transaction.
+//! 3. Whenever new transaction is inserted to the queue:
+//!    - first check all the limits (overall, memory, per-sender)
+//!    - retrieve all transactions from a sender
+//!    - binary search for position to insert the transaction
+//!    - decide if we are replacing existing transaction (3 outcomes: drop, replace, insert)
+//!    - update best and worst transaction from that sender if affected
+//! 4. Pending List construction:
+//!    - Take the best transaction (by priority) from all senders to the List
+//!    - Replace the transaction with next transaction (by ordering) from that sender (if any)
+//!    - Repeat
+
+#![warn(missing_docs)]
+
+extern crate smallvec;
+extern crate ethereum_types;
+
+#[macro_use]
+extern crate error_chain;
+#[macro_use]
+extern crate log;
+
+#[cfg(test)]
+mod tests;
+
+mod error;
+mod listener;
+mod options;
+mod pool;
+mod ready;
+mod status;
+mod transactions;
+mod verifier;
+
+pub mod scoring;
+
+pub use self::listener::{Listener, NoopListener};
+pub use self::options::Options;
+pub use self::pool::{Pool, PendingIterator};
+pub use self::ready::{Ready, Readiness};
+pub use self::scoring::Scoring;
+pub use self::status::{LightStatus, Status};
+pub use self::verifier::Verifier;
+
+use std::fmt;
+
+use ethereum_types::{H256, Address};
+
+/// Already verified transaction that can be safely queued.
+pub trait VerifiedTransaction: fmt::Debug {
+	/// Transaction hash
+	fn hash(&self) -> &H256;
+
+	/// Memory usage
+	fn mem_usage(&self) -> usize;
+
+	/// Transaction sender
+	fn sender(&self) -> &Address;
+
+	/// Unique index of insertion (lower = older).
+	fn insertion_id(&self) -> u64;
+}
diff --git a/transaction-pool/src/listener.rs b/transaction-pool/src/listener.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2fc55528fe818126d6d86ac3e226d4cd7d628ce8
--- /dev/null
+++ b/transaction-pool/src/listener.rs
@@ -0,0 +1,49 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+
+/// Transaction pool listener.
+///
+/// Listener is being notified about status of every transaction in the pool.
+pub trait Listener<T> {
+	/// The transaction has been successfuly added to the pool.
+	/// If second argument is `Some` the transaction has took place of some other transaction
+	/// which was already in pool.
+	/// NOTE: You won't be notified about drop of `old` transaction separately.
+	fn added(&mut self, _tx: &Arc<T>, _old: Option<&Arc<T>>) {}
+
+	/// The transaction was rejected from the pool.
+	/// It means that it was too cheap to replace any transaction already in the pool.
+	fn rejected(&mut self, _tx: T) {}
+
+	/// The transaction was dropped from the pool because of a limit.
+	fn dropped(&mut self, _tx: &Arc<T>) {}
+
+	/// The transaction was marked as invalid by executor.
+	fn invalid(&mut self, _tx: &Arc<T>) {}
+
+	/// The transaction has been cancelled.
+	fn cancelled(&mut self, _tx: &Arc<T>) {}
+
+	/// The transaction has been mined.
+	fn mined(&mut self, _tx: &Arc<T>) {}
+}
+
+/// A no-op implementation of `Listener`.
+#[derive(Debug)]
+pub struct NoopListener;
+impl<T> Listener<T> for NoopListener {}
diff --git a/js/src/i18n/_default/contracts.js b/transaction-pool/src/options.rs
similarity index 64%
rename from js/src/i18n/_default/contracts.js
rename to transaction-pool/src/options.rs
index 4ff84075934c30728b3ed76824dc4b738cbaacd1..ddec912864fe2d644e38b9846111623545d5847b 100644
--- a/js/src/i18n/_default/contracts.js
+++ b/transaction-pool/src/options.rs
@@ -14,15 +14,23 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default {
-  buttons: {
-    deploy: `deploy`,
-    develop: `develop`,
-    watch: `watch`
-  },
-  sortOrder: {
-    date: `date`,
-    minedBlock: `mined block`
-  },
-  title: `Contracts`
-};
+/// Transaction Pool options.
+#[derive(Debug)]
+pub struct Options {
+	/// Maximal number of transactions in the pool.
+	pub max_count: usize,
+	/// Maximal number of transactions from single sender.
+	pub max_per_sender: usize,
+	/// Maximal memory usage.
+	pub max_mem_usage: usize,
+}
+
+impl Default for Options {
+	fn default() -> Self {
+		Options {
+			max_count: 1024,
+			max_per_sender: 16,
+			max_mem_usage: 8 * 1024 * 1024,
+		}
+	}
+}
diff --git a/transaction-pool/src/pool.rs b/transaction-pool/src/pool.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4f4a63920f1cf68e27b381d93322c9f7e88b8b07
--- /dev/null
+++ b/transaction-pool/src/pool.rs
@@ -0,0 +1,433 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+use std::collections::{HashMap, BTreeSet};
+
+use ethereum_types::{H160, H256};
+
+use error;
+use listener::{Listener, NoopListener};
+use options::Options;
+use ready::{Ready, Readiness};
+use scoring::{Scoring, ScoreWithRef};
+use status::{LightStatus, Status};
+use transactions::{AddResult, Transactions};
+
+use {VerifiedTransaction};
+
+type Sender = H160;
+
+/// A transaction pool.
+#[derive(Debug)]
+pub struct Pool<T, S: Scoring<T>, L = NoopListener> {
+	listener: L,
+	scoring: S,
+	options: Options,
+	mem_usage: usize,
+
+	transactions: HashMap<Sender, Transactions<T, S>>,
+	by_hash: HashMap<H256, Arc<T>>,
+
+	best_transactions: BTreeSet<ScoreWithRef<T, S::Score>>,
+	worst_transactions: BTreeSet<ScoreWithRef<T, S::Score>>,
+}
+
+impl<T: VerifiedTransaction, S: Scoring<T> + Default> Default for Pool<T, S> {
+	fn default() -> Self {
+		Self::with_scoring(S::default(), Options::default())
+	}
+}
+
+impl<T: VerifiedTransaction, S: Scoring<T> + Default> Pool<T, S> {
+	/// Creates a new `Pool` with given options
+	/// and default `Scoring` and `Listener`.
+	pub fn with_options(options: Options) -> Self {
+		Self::with_scoring(S::default(), options)
+	}
+}
+
+impl<T: VerifiedTransaction, S: Scoring<T>> Pool<T, S> {
+	/// Creates a new `Pool` with given `Scoring` and options.
+	pub fn with_scoring(scoring: S, options: Options) -> Self {
+		Self::new(NoopListener, scoring, options)
+	}
+}
+
+
+const INITIAL_NUMBER_OF_SENDERS: usize = 16;
+
+impl<T, S, L> Pool<T, S, L> where
+	T: VerifiedTransaction,
+	S: Scoring<T>,
+	L: Listener<T>,
+{
+	/// Creates new `Pool` with given `Scoring`, `Listener` and options.
+	pub fn new(listener: L, scoring: S, options: Options) -> Self {
+		let transactions = HashMap::with_capacity(INITIAL_NUMBER_OF_SENDERS);
+		let by_hash = HashMap::with_capacity(options.max_count / 16);
+
+		Pool {
+			listener,
+			scoring,
+			options,
+			mem_usage: 0,
+			transactions,
+			by_hash,
+			best_transactions: Default::default(),
+			worst_transactions: Default::default(),
+		}
+
+	}
+
+	/// Attempts to import new transaction to the pool, returns a `Arc<T>` or an `Error`.
+	///
+	/// NOTE: Since `Ready`ness is separate from the pool it's possible to import stalled transactions.
+	/// It's the caller responsibility to make sure that's not the case.
+	///
+	/// NOTE: The transaction may push out some other transactions from the pool
+	/// either because of limits (see `Options`) or because `Scoring` decides that the transaction
+	/// replaces an existing transaction from that sender.
+	/// If any limit is reached the transaction with the lowest `Score` is evicted to make room.
+	///
+	/// The `Listener` will be informed on any drops or rejections.
+	pub fn import(&mut self, mut transaction: T) -> error::Result<Arc<T>> {
+		let mem_usage = transaction.mem_usage();
+
+		ensure!(!self.by_hash.contains_key(transaction.hash()), error::ErrorKind::AlreadyImported(*transaction.hash()));
+
+		// TODO [ToDr] Most likely move this after the transsaction is inserted.
+		// Avoid using should_replace, but rather use scoring for that.
+		{
+			let remove_worst = |s: &mut Self, transaction| {
+				match s.remove_worst(&transaction) {
+					Err(err) => {
+						s.listener.rejected(transaction);
+						Err(err)
+					},
+					Ok(removed) => {
+						s.listener.dropped(&removed);
+						s.finalize_remove(removed.hash());
+						Ok(transaction)
+					},
+				}
+			};
+
+			while self.by_hash.len() + 1 > self.options.max_count {
+				transaction = remove_worst(self, transaction)?;
+			}
+
+			while self.mem_usage + mem_usage > self.options.max_mem_usage {
+				transaction = remove_worst(self, transaction)?;
+			}
+		}
+
+		let (result, prev_state, current_state) = {
+			let transactions = self.transactions.entry(*transaction.sender()).or_insert_with(Transactions::default);
+			// get worst and best transactions for comparison
+			let prev = transactions.worst_and_best();
+			let result = transactions.add(transaction, &self.scoring, self.options.max_per_sender);
+			let current = transactions.worst_and_best();
+			(result, prev, current)
+		};
+
+		// update best and worst transactions from this sender (if required)
+		self.update_senders_worst_and_best(prev_state, current_state);
+
+		match result {
+			AddResult::Ok(tx) => {
+				self.listener.added(&tx, None);
+				self.finalize_insert(&tx, None);
+				Ok(tx)
+			},
+			AddResult::PushedOut { new, old } |
+			AddResult::Replaced { new, old } => {
+				self.listener.added(&new, Some(&old));
+				self.finalize_insert(&new, Some(&old));
+				Ok(new)
+			},
+			AddResult::TooCheap { new, old } => {
+				let hash = *new.hash();
+				self.listener.rejected(new);
+				bail!(error::ErrorKind::TooCheapToReplace(*old.hash(), hash))
+			},
+			AddResult::TooCheapToEnter(new) => {
+				let hash = *new.hash();
+				self.listener.rejected(new);
+				bail!(error::ErrorKind::TooCheapToEnter(hash))
+			}
+		}
+	}
+
+	/// Updates state of the pool statistics if the transaction was added to a set.
+	fn finalize_insert(&mut self, new: &Arc<T>, old: Option<&Arc<T>>) {
+		self.mem_usage += new.mem_usage();
+		self.by_hash.insert(*new.hash(), new.clone());
+
+		if let Some(old) = old {
+			self.finalize_remove(old.hash());
+		}
+	}
+
+	/// Updates the pool statistics if transaction was removed.
+	fn finalize_remove(&mut self, hash: &H256) -> Option<Arc<T>> {
+		self.by_hash.remove(hash).map(|old| {
+			self.mem_usage -= old.mem_usage();
+			old
+		})
+	}
+
+	/// Updates best and worst transactions from a sender.
+	fn update_senders_worst_and_best(
+		&mut self,
+		previous: Option<((S::Score, Arc<T>), (S::Score, Arc<T>))>,
+		current: Option<((S::Score, Arc<T>), (S::Score, Arc<T>))>,
+	) {
+		let worst_collection = &mut self.worst_transactions;
+		let best_collection = &mut self.best_transactions;
+
+		let is_same = |a: &(S::Score, Arc<T>), b: &(S::Score, Arc<T>)| {
+			a.0 == b.0 && a.1.hash() == b.1.hash()
+		};
+
+		let update = |collection: &mut BTreeSet<_>, (score, tx), remove| if remove {
+			collection.remove(&ScoreWithRef::new(score, tx));
+		} else {
+			collection.insert(ScoreWithRef::new(score, tx));
+		};
+
+		match (previous, current) {
+			(None, Some((worst, best))) => {
+				update(worst_collection, worst, false);
+				update(best_collection, best, false);
+			},
+			(Some((worst, best)), None) => {
+				// all transactions from that sender has been removed.
+				// We can clear a hashmap entry.
+				self.transactions.remove(worst.1.sender());
+				update(worst_collection, worst, true);
+				update(best_collection, best, true);
+			},
+			(Some((w1, b1)), Some((w2, b2))) => {
+				if !is_same(&w1, &w2) {
+					update(worst_collection, w1, true);
+					update(worst_collection, w2, false);
+				}
+				if !is_same(&b1, &b2) {
+					update(best_collection, b1, true);
+					update(best_collection, b2, false);
+				}
+			},
+			(None, None) => {},
+		}
+	}
+
+	/// Attempts to remove the worst transaction from the pool if it's worse than the given one.
+	fn remove_worst(&mut self, transaction: &T) -> error::Result<Arc<T>> {
+		let to_remove = match self.worst_transactions.iter().next_back() {
+			// No elements to remove? and the pool is still full?
+			None => {
+				warn!("The pool is full but there are no transactions to remove.");
+				return Err(error::ErrorKind::TooCheapToEnter(*transaction.hash()).into());
+			},
+			Some(old) => if self.scoring.should_replace(&old.transaction, transaction) {
+				// New transaction is better than the worst one so we can replace it.
+				old.clone()
+			} else {
+				// otherwise fail
+				return Err(error::ErrorKind::TooCheapToEnter(*transaction.hash()).into())
+			},
+		};
+
+		// Remove from transaction set
+		self.remove_from_set(to_remove.transaction.sender(), |set, scoring| {
+			set.remove(&to_remove.transaction, scoring)
+		});
+		Ok(to_remove.transaction)
+	}
+
+	/// Removes transaction from sender's transaction `HashMap`.
+	fn remove_from_set<R, F: FnOnce(&mut Transactions<T, S>, &S) -> R>(&mut self, sender: &Sender, f: F) -> Option<R> {
+		let (prev, next, result) = if let Some(set) = self.transactions.get_mut(sender) {
+			let prev = set.worst_and_best();
+			let result = f(set, &self.scoring);
+			(prev, set.worst_and_best(), result)
+		} else {
+			return None;
+		};
+
+		self.update_senders_worst_and_best(prev, next);
+		Some(result)
+	}
+
+	/// Clears pool from all transactions.
+	/// This causes a listener notification that all transactions were dropped.
+	/// NOTE: the drop-notification order will be arbitrary.
+	pub fn clear(&mut self) {
+		self.mem_usage = 0;
+		self.transactions.clear();
+		self.best_transactions.clear();
+		self.worst_transactions.clear();
+
+		for (_hash, tx) in self.by_hash.drain() {
+			self.listener.dropped(&tx)
+		}
+	}
+
+	/// Removes single transaction from the pool.
+	/// Depending on the `is_invalid` flag the listener
+	/// will either get a `cancelled` or `invalid` notification.
+	pub fn remove(&mut self, hash: &H256, is_invalid: bool) -> Option<Arc<T>> {
+		if let Some(tx) = self.finalize_remove(hash) {
+			self.remove_from_set(tx.sender(), |set, scoring| {
+				set.remove(&tx, scoring)
+			});
+			if is_invalid {
+				self.listener.invalid(&tx);
+			} else {
+				self.listener.cancelled(&tx);
+			}
+			Some(tx)
+		} else {
+			None
+		}
+	}
+
+	/// Removes all stalled transactions from given sender.
+	fn remove_stalled<R: Ready<T>>(&mut self, sender: &Sender, ready: &mut R) -> usize {
+		let removed_from_set = self.remove_from_set(sender, |transactions, scoring| {
+			transactions.cull(ready, scoring)
+		});
+
+		match removed_from_set {
+			Some(removed) => {
+				let len = removed.len();
+				for tx in removed {
+					self.finalize_remove(tx.hash());
+					self.listener.mined(&tx);
+				}
+				len
+			},
+			None => 0,
+		}
+	}
+
+	/// Removes all stalled transactions from given sender list (or from all senders).
+	pub fn cull<R: Ready<T>>(&mut self, senders: Option<&[Sender]>, mut ready: R) -> usize {
+		let mut removed = 0;
+		match senders {
+			Some(senders) => {
+				for sender in senders {
+					removed += self.remove_stalled(sender, &mut ready);
+				}
+			},
+			None => {
+				let senders = self.transactions.keys().cloned().collect::<Vec<_>>();
+				for sender in senders {
+					removed += self.remove_stalled(&sender, &mut ready);
+				}
+			},
+		}
+
+		removed
+	}
+
+	/// Returns an iterator of pending (ready) transactions.
+	pub fn pending<R: Ready<T>>(&self, ready: R) -> PendingIterator<T, R, S, L> {
+		PendingIterator {
+			ready,
+			best_transactions: self.best_transactions.clone(),
+			pool: self,
+		}
+	}
+
+	/// Computes the full status of the pool (including readiness).
+	pub fn status<R: Ready<T>>(&self, mut ready: R) -> Status {
+		let mut status = Status::default();
+
+		for (_sender, transactions) in &self.transactions {
+			let len = transactions.len();
+			for (idx, tx) in transactions.iter().enumerate() {
+				match ready.is_ready(tx) {
+					Readiness::Stalled => status.stalled += 1,
+					Readiness::Ready => status.pending += 1,
+					Readiness::Future => {
+						status.future += len - idx;
+						break;
+					}
+				}
+			}
+		}
+
+		status
+	}
+
+	/// Returns light status of the pool.
+	pub fn light_status(&self) -> LightStatus {
+		LightStatus {
+			mem_usage: self.mem_usage,
+			transaction_count: self.by_hash.len(),
+			senders: self.transactions.len(),
+		}
+	}
+}
+
+/// An iterator over all pending (ready) transactions.
+/// NOTE: the transactions are not removed from the queue.
+/// You might remove them later by calling `cull`.
+pub struct PendingIterator<'a, T, R, S, L> where
+	T: VerifiedTransaction + 'a,
+	S: Scoring<T> + 'a,
+	L: 'a,
+{
+	ready: R,
+	best_transactions: BTreeSet<ScoreWithRef<T, S::Score>>,
+	pool: &'a Pool<T, S, L>,
+}
+
+impl<'a, T, R, S, L> Iterator for PendingIterator<'a, T, R, S, L> where
+	T: VerifiedTransaction,
+	R: Ready<T>,
+	S: Scoring<T>,
+{
+	type Item = Arc<T>;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		while !self.best_transactions.is_empty() {
+			let best = {
+				let best = self.best_transactions.iter().next().expect("current_best is not empty; qed").clone();
+				self.best_transactions.take(&best).expect("Just taken from iterator; qed")
+			};
+
+			match self.ready.is_ready(&best.transaction) {
+				Readiness::Ready => {
+					// retrieve next one from that sender.
+					let next = self.pool.transactions
+						.get(best.transaction.sender())
+						.and_then(|s| s.find_next(&best.transaction, &self.pool.scoring));
+					if let Some((score, tx)) = next {
+						self.best_transactions.insert(ScoreWithRef::new(score, tx));
+					}
+
+					return Some(best.transaction)
+				},
+				state => warn!("[{:?}] Ignoring {:?} transaction.", best.transaction.hash(), state),
+			}
+		}
+
+		None
+	}
+}
diff --git a/transaction-pool/src/ready.rs b/transaction-pool/src/ready.rs
new file mode 100644
index 0000000000000000000000000000000000000000..735244432275a6894b8b8f93bca02e02e8665f48
--- /dev/null
+++ b/transaction-pool/src/ready.rs
@@ -0,0 +1,54 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+/// Transaction readiness.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Readiness {
+	/// The transaction is stalled (and should/will be removed from the pool).
+	Stalled,
+	/// The transaction is ready to be included in pending set.
+	Ready,
+	/// The transaction is not yet ready.
+	Future,
+}
+
+/// A readiness indicator.
+pub trait Ready<T> {
+	/// Returns true if transaction is ready to be included in pending block,
+	/// given all previous transactions that were ready are already included.
+	///
+	/// NOTE: readiness of transactions will be checked according to `Score` ordering,
+	/// the implementation should maintain a state of already checked transactions.
+	fn is_ready(&mut self, tx: &T) -> Readiness;
+}
+
+impl<T, F> Ready<T> for F where F: FnMut(&T) -> Readiness {
+	fn is_ready(&mut self, tx: &T) -> Readiness {
+		(*self)(tx)
+	}
+}
+
+impl<T, A, B> Ready<T> for (A, B) where
+	A: Ready<T>,
+	B: Ready<T>,
+{
+	fn is_ready(&mut self, tx: &T) -> Readiness {
+		match self.0.is_ready(tx) {
+			Readiness::Ready => self.1.is_ready(tx),
+			r => r,
+		}
+	}
+}
diff --git a/transaction-pool/src/scoring.rs b/transaction-pool/src/scoring.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e4f923c9b5a9471853adc7bf4009d239c39bf803
--- /dev/null
+++ b/transaction-pool/src/scoring.rs
@@ -0,0 +1,145 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! A transactions ordering abstraction.
+
+use std::{cmp, fmt};
+use std::sync::Arc;
+
+use {VerifiedTransaction};
+
+/// Represents a decision what to do with
+/// a new transaction that tries to enter the pool.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Choice {
+	/// New transaction should be rejected
+	/// (i.e. the old transaction that occupies the same spot
+	/// is better).
+	RejectNew,
+	/// The old transaction should be dropped
+	/// in favour of the new one.
+	ReplaceOld,
+	/// The new transaction should be inserted
+	/// and both (old and new) should stay in the pool.
+	InsertNew,
+}
+
+/// Describes a reason why the `Score` of transactions
+/// should be updated.
+/// The `Scoring` implementations can use this information
+/// to update the `Score` table more efficiently.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Change {
+	/// New transaction has been inserted at given index.
+	/// The Score at that index is initialized with default value
+	/// and needs to be filled in.
+	InsertedAt(usize),
+	/// The transaction has been removed at given index and other transactions
+	/// shifted to it's place.
+	/// The scores were removed and shifted as well.
+	/// For simple scoring algorithms no action is required here.
+	RemovedAt(usize),
+	/// The transaction at given index has replaced a previous transaction.
+	/// The score at that index needs to be update (it contains value from previous transaction).
+	ReplacedAt(usize),
+	/// Given number of stalled transactions has been culled from the beginning.
+	/// Usually the score will have to be re-computed from scratch.
+	Culled(usize),
+}
+
+/// A transaction ordering.
+///
+/// The implementation should decide on order of transactions in the pool.
+/// Each transaction should also get assigned a `Score` which is used to later
+/// prioritize transactions in the pending set.
+///
+/// Implementation notes:
+/// - Returned `Score`s should match ordering of `compare` method.
+/// - `compare` will be called only within a context of transactions from the same sender.
+/// - `choose` will be called only if `compare` returns `Ordering::Equal`
+/// - `should_replace` is used to decide if new transaction should push out an old transaction already in the queue.
+/// - `Score`s and `compare` should align with `Ready` implementation.
+///
+/// Example: Natural ordering of Ethereum transactions.
+/// - `compare`: compares transaction `nonce` ()
+/// - `choose`: compares transactions `gasPrice` (decides if old transaction should be replaced)
+/// - `update_scores`: score defined as `gasPrice` if `n==0` and `max(scores[n-1], gasPrice)` if `n>0`
+/// - `should_replace`: compares `gasPrice` (decides if transaction from a different sender is more valuable)
+///
+pub trait Scoring<T> {
+	/// A score of a transaction.
+	type Score: cmp::Ord + Clone + Default + fmt::Debug;
+
+	/// Decides on ordering of `T`s from a particular sender.
+	fn compare(&self, old: &T, other: &T) -> cmp::Ordering;
+
+	/// Decides how to deal with two transactions from a sender that seem to occupy the same slot in the queue.
+	fn choose(&self, old: &T, new: &T) -> Choice;
+
+	/// Updates the transaction scores given a list of transactions and a change to previous scoring.
+	/// NOTE: you can safely assume that both slices have the same length.
+	/// (i.e. score at index `i` represents transaction at the same index)
+	fn update_scores(&self, txs: &[Arc<T>], scores: &mut [Self::Score], change: Change);
+
+	/// Decides if `new` should push out `old` transaction from the pool.
+	fn should_replace(&self, old: &T, new: &T) -> bool;
+}
+
+/// A score with a reference to the transaction.
+#[derive(Debug)]
+pub struct ScoreWithRef<T, S> {
+	/// Score
+	pub score: S,
+	/// Shared transaction
+	pub transaction: Arc<T>,
+}
+
+impl<T, S: Clone> Clone for ScoreWithRef<T, S> {
+	fn clone(&self) -> Self {
+		ScoreWithRef {
+			score: self.score.clone(),
+			transaction: self.transaction.clone(),
+		}
+	}
+}
+
+impl<T, S> ScoreWithRef<T, S> {
+	/// Creates a new `ScoreWithRef`
+	pub fn new(score: S, transaction: Arc<T>) -> Self {
+		ScoreWithRef { score, transaction }
+	}
+}
+
+impl<S: cmp::Ord, T: VerifiedTransaction> Ord for ScoreWithRef<T, S> {
+	fn cmp(&self, other: &Self) -> cmp::Ordering {
+		other.score.cmp(&self.score)
+			.then(other.transaction.insertion_id().cmp(&self.transaction.insertion_id()))
+	}
+}
+
+impl<S: cmp::Ord, T: VerifiedTransaction> PartialOrd for ScoreWithRef<T, S> {
+	fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
+		Some(self.cmp(other))
+	}
+}
+
+impl<S: cmp::Ord, T: VerifiedTransaction>  PartialEq for ScoreWithRef<T, S> {
+	fn eq(&self, other: &Self) -> bool {
+		self.score == other.score && self.transaction.insertion_id() == other.transaction.insertion_id()
+	}
+}
+
+impl<S: cmp::Ord, T: VerifiedTransaction> Eq for ScoreWithRef<T, S> {}
diff --git a/transaction-pool/src/status.rs b/transaction-pool/src/status.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5862f75a1ebf393ad1d9d1059493611c1ea66671
--- /dev/null
+++ b/transaction-pool/src/status.rs
@@ -0,0 +1,40 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+/// Light pool status.
+/// This status is cheap to compute and can be called frequently.
+#[derive(Default, Debug, PartialEq, Eq)]
+pub struct LightStatus {
+	/// Memory usage in bytes.
+	pub mem_usage: usize,
+	/// Total number of transactions in the pool.
+	pub transaction_count: usize,
+	/// Number of unique senders in the pool.
+	pub senders: usize,
+}
+
+/// A full queue status.
+/// To compute this status it is required to provide `Ready`.
+/// NOTE: To compute the status we need to visit each transaction in the pool.
+#[derive(Default, Debug, PartialEq, Eq)]
+pub struct Status {
+	/// Number of stalled transactions.
+	pub stalled: usize,
+	/// Number of pending (ready) transactions.
+	pub pending: usize,
+	/// Number of future (not ready) transactions.
+	pub future: usize,
+}
diff --git a/transaction-pool/src/tests/helpers.rs b/transaction-pool/src/tests/helpers.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4e03cc89612a88e6924c16dc053028a029fbaf10
--- /dev/null
+++ b/transaction-pool/src/tests/helpers.rs
@@ -0,0 +1,81 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::cmp;
+use std::collections::HashMap;
+
+use ethereum_types::U256;
+use {scoring, Scoring, Ready, Readiness, Address as Sender};
+use super::{Transaction, SharedTransaction};
+
+#[derive(Default)]
+pub struct DummyScoring;
+
+impl Scoring<Transaction> for DummyScoring {
+	type Score = U256;
+
+	fn compare(&self, old: &Transaction, new: &Transaction) -> cmp::Ordering {
+		old.nonce.cmp(&new.nonce)
+	}
+
+	fn choose(&self, old: &Transaction, new: &Transaction) -> scoring::Choice {
+		if old.nonce == new.nonce {
+			if new.gas_price > old.gas_price {
+				scoring::Choice::ReplaceOld
+			} else {
+				scoring::Choice::RejectNew
+			}
+		} else {
+			scoring::Choice::InsertNew
+		}
+	}
+
+	fn update_scores(&self, txs: &[SharedTransaction], scores: &mut [Self::Score], _change: scoring::Change) {
+		for i in 0..txs.len() {
+			scores[i] = txs[i].gas_price;
+		}
+	}
+
+	fn should_replace(&self, old: &Transaction, new: &Transaction) -> bool {
+		new.gas_price > old.gas_price
+	}
+}
+
+#[derive(Default)]
+pub struct NonceReady(HashMap<Sender, U256>, U256);
+
+impl NonceReady {
+	pub fn new<T: Into<U256>>(min: T) -> Self {
+		let mut n = NonceReady::default();
+		n.1 = min.into();
+		n
+	}
+}
+
+impl Ready<Transaction> for NonceReady {
+	fn is_ready(&mut self, tx: &Transaction) -> Readiness {
+		let min = self.1;
+		let nonce = self.0.entry(tx.sender).or_insert_with(|| min);
+		match tx.nonce.cmp(nonce) {
+			cmp::Ordering::Greater => Readiness::Future,
+			cmp::Ordering::Equal => {
+				*nonce = *nonce + 1.into();
+				Readiness::Ready
+			},
+			cmp::Ordering::Less => Readiness::Stalled,
+		}
+	}
+}
diff --git a/transaction-pool/src/tests/mod.rs b/transaction-pool/src/tests/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..05b72284b5a8392bf971885b89b6be50a5982a47
--- /dev/null
+++ b/transaction-pool/src/tests/mod.rs
@@ -0,0 +1,506 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+mod helpers;
+mod tx_builder;
+
+use self::helpers::{DummyScoring, NonceReady};
+use self::tx_builder::TransactionBuilder;
+
+use std::sync::Arc;
+
+use ethereum_types::{H256, U256, Address};
+use super::*;
+
+#[derive(Debug, PartialEq)]
+pub struct Transaction {
+	pub hash: H256,
+	pub nonce: U256,
+	pub gas_price: U256,
+	pub gas: U256,
+	pub sender: Address,
+	pub insertion_id: u64,
+	pub mem_usage: usize,
+}
+
+impl VerifiedTransaction for Transaction {
+	fn hash(&self) -> &H256 { &self.hash }
+	fn mem_usage(&self) -> usize { self.mem_usage }
+	fn sender(&self) -> &Address { &self.sender }
+	fn insertion_id(&self) -> u64 { self.insertion_id }
+}
+
+pub type SharedTransaction = Arc<Transaction>;
+
+type TestPool = Pool<Transaction, DummyScoring>;
+
+#[test]
+fn should_clear_queue() {
+	// given
+	let b = TransactionBuilder::default();
+	let mut txq = TestPool::default();
+	assert_eq!(txq.light_status(), LightStatus {
+		mem_usage: 0,
+		transaction_count: 0,
+		senders: 0,
+	});
+	let tx1 = b.tx().nonce(0).new();
+	let tx2 = b.tx().nonce(1).mem_usage(1).new();
+
+	// add
+	txq.import(tx1).unwrap();
+	txq.import(tx2).unwrap();
+	assert_eq!(txq.light_status(), LightStatus {
+		mem_usage: 1,
+		transaction_count: 2,
+		senders: 1,
+	});
+
+	// when
+	txq.clear();
+
+	// then
+	assert_eq!(txq.light_status(), LightStatus {
+		mem_usage: 0,
+		transaction_count: 0,
+		senders: 0,
+	});
+}
+
+#[test]
+fn should_not_allow_same_transaction_twice() {
+	// given
+	let b = TransactionBuilder::default();
+	let mut txq = TestPool::default();
+	let tx1 = b.tx().nonce(0).new();
+	let tx2 = b.tx().nonce(0).new();
+
+	// when
+	txq.import(tx1).unwrap();
+	txq.import(tx2).unwrap_err();
+
+	// then
+	assert_eq!(txq.light_status().transaction_count, 1);
+}
+
+#[test]
+fn should_replace_transaction() {
+	// given
+	let b = TransactionBuilder::default();
+	let mut txq = TestPool::default();
+	let tx1 = b.tx().nonce(0).gas_price(1).new();
+	let tx2 = b.tx().nonce(0).gas_price(2).new();
+
+	// when
+	txq.import(tx1).unwrap();
+	txq.import(tx2).unwrap();
+
+	// then
+	assert_eq!(txq.light_status().transaction_count, 1);
+}
+
+#[test]
+fn should_reject_if_above_count() {
+	let b = TransactionBuilder::default();
+	let mut txq = TestPool::with_options(Options {
+		max_count: 1,
+		..Default::default()
+	});
+
+	// Reject second
+	let tx1 = b.tx().nonce(0).new();
+	let tx2 = b.tx().nonce(1).new();
+	let hash = *tx2.hash();
+	txq.import(tx1).unwrap();
+	assert_eq!(txq.import(tx2).unwrap_err().kind(), &error::ErrorKind::TooCheapToEnter(hash));
+	assert_eq!(txq.light_status().transaction_count, 1);
+
+	txq.clear();
+
+	// Replace first
+	let tx1 = b.tx().nonce(0).new();
+	let tx2 = b.tx().nonce(0).sender(1).gas_price(2).new();
+	txq.import(tx1).unwrap();
+	txq.import(tx2).unwrap();
+	assert_eq!(txq.light_status().transaction_count, 1);
+}
+
+#[test]
+fn should_reject_if_above_mem_usage() {
+	let b = TransactionBuilder::default();
+	let mut txq = TestPool::with_options(Options {
+		max_mem_usage: 1,
+		..Default::default()
+	});
+
+	// Reject second
+	let tx1 = b.tx().nonce(1).mem_usage(1).new();
+	let tx2 = b.tx().nonce(2).mem_usage(2).new();
+	let hash = *tx2.hash();
+	txq.import(tx1).unwrap();
+	assert_eq!(txq.import(tx2).unwrap_err().kind(), &error::ErrorKind::TooCheapToEnter(hash));
+	assert_eq!(txq.light_status().transaction_count, 1);
+
+	txq.clear();
+
+	// Replace first
+	let tx1 = b.tx().nonce(1).mem_usage(1).new();
+	let tx2 = b.tx().nonce(1).sender(1).gas_price(2).mem_usage(1).new();
+	txq.import(tx1).unwrap();
+	txq.import(tx2).unwrap();
+	assert_eq!(txq.light_status().transaction_count, 1);
+}
+
+#[test]
+fn should_reject_if_above_sender_count() {
+	let b = TransactionBuilder::default();
+	let mut txq = TestPool::with_options(Options {
+		max_per_sender: 1,
+		..Default::default()
+	});
+
+	// Reject second
+	let tx1 = b.tx().nonce(1).new();
+	let tx2 = b.tx().nonce(2).new();
+	let hash = *tx2.hash();
+	txq.import(tx1).unwrap();
+	assert_eq!(txq.import(tx2).unwrap_err().kind(), &error::ErrorKind::TooCheapToEnter(hash));
+	assert_eq!(txq.light_status().transaction_count, 1);
+
+	txq.clear();
+
+	// Replace first
+	let tx1 = b.tx().nonce(1).new();
+	let tx2 = b.tx().nonce(2).gas_price(2).new();
+	let hash = *tx2.hash();
+	txq.import(tx1).unwrap();
+	// This results in error because we also compare nonces
+	assert_eq!(txq.import(tx2).unwrap_err().kind(), &error::ErrorKind::TooCheapToEnter(hash));
+	assert_eq!(txq.light_status().transaction_count, 1);
+}
+
+#[test]
+fn should_construct_pending() {
+	// given
+	let b = TransactionBuilder::default();
+	let mut txq = TestPool::default();
+
+	let tx0 = txq.import(b.tx().nonce(0).gas_price(5).new()).unwrap();
+	let tx1 = txq.import(b.tx().nonce(1).gas_price(5).new()).unwrap();
+	let tx2 = txq.import(b.tx().nonce(2).new()).unwrap();
+	// this transaction doesn't get to the block despite high gas price
+	// because of block gas limit and simplistic ordering algorithm.
+	txq.import(b.tx().nonce(3).gas_price(4).new()).unwrap();
+	//gap
+	txq.import(b.tx().nonce(5).new()).unwrap();
+
+	let tx5 = txq.import(b.tx().sender(1).nonce(0).new()).unwrap();
+	let tx6 = txq.import(b.tx().sender(1).nonce(1).new()).unwrap();
+	let tx7 = txq.import(b.tx().sender(1).nonce(2).new()).unwrap();
+	let tx8 = txq.import(b.tx().sender(1).nonce(3).gas_price(4).new()).unwrap();
+	// gap
+	txq.import(b.tx().sender(1).nonce(5).new()).unwrap();
+
+	let tx9 = txq.import(b.tx().sender(2).nonce(0).new()).unwrap();
+	assert_eq!(txq.light_status().transaction_count, 11);
+	assert_eq!(txq.status(NonceReady::default()), Status {
+		stalled: 0,
+		pending: 9,
+		future: 2,
+	});
+	assert_eq!(txq.status(NonceReady::new(1)), Status {
+		stalled: 3,
+		pending: 6,
+		future: 2,
+	});
+
+	// when
+	let mut current_gas = U256::zero();
+	let limit = (21_000 * 8).into();
+	let mut pending = txq.pending(NonceReady::default()).take_while(|tx| {
+		let should_take = tx.gas + current_gas <= limit;
+		if should_take {
+			current_gas = current_gas + tx.gas
+		}
+		should_take
+	});
+
+	assert_eq!(pending.next(), Some(tx0));
+	assert_eq!(pending.next(), Some(tx1));
+	assert_eq!(pending.next(), Some(tx9));
+	assert_eq!(pending.next(), Some(tx5));
+	assert_eq!(pending.next(), Some(tx6));
+	assert_eq!(pending.next(), Some(tx7));
+	assert_eq!(pending.next(), Some(tx8));
+	assert_eq!(pending.next(), Some(tx2));
+	assert_eq!(pending.next(), None);
+}
+
+#[test]
+fn should_remove_transaction() {
+	// given
+	let b = TransactionBuilder::default();
+	let mut txq = TestPool::default();
+
+	let tx1 = txq.import(b.tx().nonce(0).new()).unwrap();
+	let tx2 = txq.import(b.tx().nonce(1).new()).unwrap();
+	txq.import(b.tx().nonce(2).new()).unwrap();
+	assert_eq!(txq.light_status().transaction_count, 3);
+
+	// when
+	assert!(txq.remove(&tx2.hash(), false).is_some());
+
+	// then
+	assert_eq!(txq.light_status().transaction_count, 2);
+	let mut pending = txq.pending(NonceReady::default());
+	assert_eq!(pending.next(), Some(tx1));
+	assert_eq!(pending.next(), None);
+}
+
+#[test]
+fn should_cull_stalled_transactions() {
+	// given
+	let b = TransactionBuilder::default();
+	let mut txq = TestPool::default();
+
+	txq.import(b.tx().nonce(0).gas_price(5).new()).unwrap();
+	txq.import(b.tx().nonce(1).new()).unwrap();
+	txq.import(b.tx().nonce(3).new()).unwrap();
+
+	txq.import(b.tx().sender(1).nonce(0).new()).unwrap();
+	txq.import(b.tx().sender(1).nonce(1).new()).unwrap();
+	txq.import(b.tx().sender(1).nonce(5).new()).unwrap();
+
+	assert_eq!(txq.status(NonceReady::new(1)), Status {
+		stalled: 2,
+		pending: 2,
+		future: 2,
+	});
+
+	// when
+	assert_eq!(txq.cull(None, NonceReady::new(1)), 2);
+
+	// then
+	assert_eq!(txq.status(NonceReady::new(1)), Status {
+		stalled: 0,
+		pending: 2,
+		future: 2,
+	});
+	assert_eq!(txq.light_status(), LightStatus {
+		transaction_count: 4,
+		senders: 2,
+		mem_usage: 0,
+	});
+}
+
+#[test]
+fn should_cull_stalled_transactions_from_a_sender() {
+	// given
+	let b = TransactionBuilder::default();
+	let mut txq = TestPool::default();
+
+	txq.import(b.tx().nonce(0).gas_price(5).new()).unwrap();
+	txq.import(b.tx().nonce(1).new()).unwrap();
+
+	txq.import(b.tx().sender(1).nonce(0).new()).unwrap();
+	txq.import(b.tx().sender(1).nonce(1).new()).unwrap();
+	txq.import(b.tx().sender(1).nonce(2).new()).unwrap();
+
+	assert_eq!(txq.status(NonceReady::new(2)), Status {
+		stalled: 4,
+		pending: 1,
+		future: 0,
+	});
+
+	// when
+	let sender = 0.into();
+	assert_eq!(txq.cull(Some(&[sender]), NonceReady::new(2)), 2);
+
+	// then
+	assert_eq!(txq.status(NonceReady::new(2)), Status {
+		stalled: 2,
+		pending: 1,
+		future: 0,
+	});
+	assert_eq!(txq.light_status(), LightStatus {
+		transaction_count: 3,
+		senders: 1,
+		mem_usage: 0,
+	});
+}
+
+#[test]
+fn should_re_insert_after_cull() {
+	// given
+	let b = TransactionBuilder::default();
+	let mut txq = TestPool::default();
+
+	txq.import(b.tx().nonce(0).gas_price(5).new()).unwrap();
+	txq.import(b.tx().nonce(1).new()).unwrap();
+	txq.import(b.tx().sender(1).nonce(0).new()).unwrap();
+	txq.import(b.tx().sender(1).nonce(1).new()).unwrap();
+	assert_eq!(txq.status(NonceReady::new(1)), Status {
+		stalled: 2,
+		pending: 2,
+		future: 0,
+	});
+
+	// when
+	assert_eq!(txq.cull(None, NonceReady::new(1)), 2);
+	assert_eq!(txq.status(NonceReady::new(1)), Status {
+		stalled: 0,
+		pending: 2,
+		future: 0,
+	});
+	txq.import(b.tx().nonce(0).gas_price(5).new()).unwrap();
+	txq.import(b.tx().sender(1).nonce(0).new()).unwrap();
+
+	assert_eq!(txq.status(NonceReady::new(1)), Status {
+		stalled: 2,
+		pending: 2,
+		future: 0,
+	});
+}
+
+mod listener {
+	use std::cell::RefCell;
+	use std::rc::Rc;
+
+	use super::*;
+
+	#[derive(Default)]
+	struct MyListener(pub Rc<RefCell<Vec<&'static str>>>);
+
+	impl Listener<Transaction> for MyListener {
+		fn added(&mut self, _tx: &SharedTransaction, old: Option<&SharedTransaction>) {
+			self.0.borrow_mut().push(if old.is_some() { "replaced" } else { "added" });
+		}
+
+		fn rejected(&mut self, _tx: Transaction) {
+			self.0.borrow_mut().push("rejected".into());
+		}
+
+		fn dropped(&mut self, _tx: &SharedTransaction) {
+			self.0.borrow_mut().push("dropped".into());
+		}
+
+		fn invalid(&mut self, _tx: &SharedTransaction) {
+			self.0.borrow_mut().push("invalid".into());
+		}
+
+		fn cancelled(&mut self, _tx: &SharedTransaction) {
+			self.0.borrow_mut().push("cancelled".into());
+		}
+
+		fn mined(&mut self, _tx: &SharedTransaction) {
+			self.0.borrow_mut().push("mined".into());
+		}
+	}
+
+	#[test]
+	fn insert_transaction() {
+		let b = TransactionBuilder::default();
+		let listener = MyListener::default();
+		let results = listener.0.clone();
+		let mut txq = Pool::new(listener, DummyScoring, Options {
+			max_per_sender: 1,
+			max_count: 2,
+			..Default::default()
+		});
+		assert!(results.borrow().is_empty());
+
+		// Regular import
+		txq.import(b.tx().nonce(1).new()).unwrap();
+		assert_eq!(*results.borrow(), &["added"]);
+		// Already present (no notification)
+		txq.import(b.tx().nonce(1).new()).unwrap_err();
+		assert_eq!(*results.borrow(), &["added"]);
+		// Push out the first one
+		txq.import(b.tx().nonce(1).gas_price(1).new()).unwrap();
+		assert_eq!(*results.borrow(), &["added", "replaced"]);
+		// Reject
+		txq.import(b.tx().nonce(1).new()).unwrap_err();
+		assert_eq!(*results.borrow(), &["added", "replaced", "rejected"]);
+		results.borrow_mut().clear();
+		// Different sender (accept)
+		txq.import(b.tx().sender(1).nonce(1).gas_price(2).new()).unwrap();
+		assert_eq!(*results.borrow(), &["added"]);
+		// Third sender push out low gas price
+		txq.import(b.tx().sender(2).nonce(1).gas_price(4).new()).unwrap();
+		assert_eq!(*results.borrow(), &["added", "dropped", "added"]);
+		// Reject (too cheap)
+		txq.import(b.tx().sender(2).nonce(1).gas_price(2).new()).unwrap_err();
+		assert_eq!(*results.borrow(), &["added", "dropped", "added", "rejected"]);
+
+		assert_eq!(txq.light_status().transaction_count, 2);
+	}
+
+	#[test]
+	fn remove_transaction() {
+		let b = TransactionBuilder::default();
+		let listener = MyListener::default();
+		let results = listener.0.clone();
+		let mut txq = Pool::new(listener, DummyScoring, Options::default());
+
+		// insert
+		let tx1 = txq.import(b.tx().nonce(1).new()).unwrap();
+		let tx2 = txq.import(b.tx().nonce(2).new()).unwrap();
+
+		// then
+		txq.remove(&tx1.hash(), false);
+		assert_eq!(*results.borrow(), &["added", "added", "cancelled"]);
+		txq.remove(&tx2.hash(), true);
+		assert_eq!(*results.borrow(), &["added", "added", "cancelled", "invalid"]);
+		assert_eq!(txq.light_status().transaction_count, 0);
+	}
+
+	#[test]
+	fn clear_queue() {
+		let b = TransactionBuilder::default();
+		let listener = MyListener::default();
+		let results = listener.0.clone();
+		let mut txq = Pool::new(listener, DummyScoring, Options::default());
+
+		// insert
+		txq.import(b.tx().nonce(1).new()).unwrap();
+		txq.import(b.tx().nonce(2).new()).unwrap();
+
+		// when
+		txq.clear();
+
+		// then
+		assert_eq!(*results.borrow(), &["added", "added", "dropped", "dropped"]);
+	}
+
+	#[test]
+	fn cull_stalled() {
+		let b = TransactionBuilder::default();
+		let listener = MyListener::default();
+		let results = listener.0.clone();
+		let mut txq = Pool::new(listener, DummyScoring, Options::default());
+
+		// insert
+		txq.import(b.tx().nonce(1).new()).unwrap();
+		txq.import(b.tx().nonce(2).new()).unwrap();
+
+		// when
+		txq.cull(None, NonceReady::new(3));
+
+		// then
+		assert_eq!(*results.borrow(), &["added", "added", "mined", "mined"]);
+	}
+}
+
diff --git a/transaction-pool/src/tests/tx_builder.rs b/transaction-pool/src/tests/tx_builder.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e9c1c1d5fcd2d9be40234ef6e5515cfe26f613a0
--- /dev/null
+++ b/transaction-pool/src/tests/tx_builder.rs
@@ -0,0 +1,74 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::rc::Rc;
+use std::cell::Cell;
+
+use super::{Transaction, U256, Address};
+
+#[derive(Debug, Default, Clone)]
+pub struct TransactionBuilder {
+	nonce: U256,
+	gas_price: U256,
+	gas: U256,
+	sender: Address,
+	mem_usage: usize,
+	insertion_id: Rc<Cell<u64>>,
+}
+
+impl TransactionBuilder {
+	pub fn tx(&self) -> Self {
+		self.clone()
+	}
+
+	pub fn nonce<T: Into<U256>>(mut self, nonce: T) -> Self {
+		self.nonce = nonce.into();
+		self
+	}
+
+	pub fn gas_price<T: Into<U256>>(mut self, gas_price: T) -> Self {
+		self.gas_price = gas_price.into();
+		self
+	}
+
+	pub fn sender<T: Into<Address>>(mut self, sender: T) -> Self {
+		self.sender = sender.into();
+		self
+	}
+
+	pub fn mem_usage(mut self, mem_usage: usize) -> Self {
+		self.mem_usage = mem_usage;
+		self
+	}
+
+	pub fn new(self) -> Transaction {
+		let insertion_id = {
+			let id = self.insertion_id.get() + 1;
+			self.insertion_id.set(id);
+			id
+		};
+		let hash = self.nonce ^ (U256::from(100) * self.gas_price) ^ (U256::from(100_000) * U256::from(self.sender.low_u64()));
+		Transaction {
+			hash: hash.into(),
+			nonce: self.nonce,
+			gas_price: self.gas_price,
+			gas: 21_000.into(),
+			sender: self.sender,
+			insertion_id,
+			mem_usage: self.mem_usage,
+		}
+	}
+}
diff --git a/transaction-pool/src/transactions.rs b/transaction-pool/src/transactions.rs
new file mode 100644
index 0000000000000000000000000000000000000000..39fd08e931ca159be3b9835b7e941a25720011c9
--- /dev/null
+++ b/transaction-pool/src/transactions.rs
@@ -0,0 +1,216 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::{fmt, mem};
+use std::sync::Arc;
+
+use smallvec::SmallVec;
+
+use ready::{Ready, Readiness};
+use scoring::{self, Scoring};
+
+#[derive(Debug)]
+pub enum AddResult<T> {
+	Ok(Arc<T>),
+	TooCheapToEnter(T),
+	TooCheap {
+		old: Arc<T>,
+		new: T,
+	},
+	Replaced {
+		old: Arc<T>,
+		new: Arc<T>,
+	},
+	PushedOut {
+		old: Arc<T>,
+		new: Arc<T>,
+	},
+}
+
+/// Represents all transactions from a particular sender ordered by nonce.
+const PER_SENDER: usize = 8;
+#[derive(Debug)]
+pub struct Transactions<T, S: Scoring<T>> {
+	// TODO [ToDr] Consider using something that doesn't require shifting all records.
+	transactions: SmallVec<[Arc<T>; PER_SENDER]>,
+	scores: SmallVec<[S::Score; PER_SENDER]>,
+}
+
+impl<T, S: Scoring<T>> Default for Transactions<T, S> {
+	fn default() -> Self {
+		Transactions {
+			transactions: Default::default(),
+			scores: Default::default(),
+		}
+	}
+}
+
+impl<T: fmt::Debug, S: Scoring<T>> Transactions<T, S> {
+	pub fn is_empty(&self) -> bool {
+		self.transactions.is_empty()
+	}
+
+	pub fn len(&self) -> usize {
+		self.transactions.len()
+	}
+
+	pub fn iter(&self) -> ::std::slice::Iter<Arc<T>> {
+		self.transactions.iter()
+	}
+
+	pub fn worst_and_best(&self) -> Option<((S::Score, Arc<T>), (S::Score, Arc<T>))> {
+		let len = self.scores.len();
+		self.scores.get(0).cloned().map(|best| {
+			let worst = self.scores[len - 1].clone();
+			let best_tx = self.transactions[0].clone();
+			let worst_tx = self.transactions[len - 1].clone();
+
+			((worst, worst_tx), (best, best_tx))
+		})
+	}
+
+	pub fn find_next(&self, tx: &T, scoring: &S) -> Option<(S::Score, Arc<T>)> {
+		self.transactions.binary_search_by(|old| scoring.compare(old, &tx)).ok().and_then(|index| {
+			let index = index + 1;
+			if index < self.scores.len() {
+				Some((self.scores[index].clone(), self.transactions[index].clone()))
+			} else {
+				None
+			}
+		})
+	}
+
+	fn push_cheapest_transaction(&mut self, tx: T, scoring: &S, max_count: usize) -> AddResult<T> {
+		let index = self.transactions.len();
+		if index == max_count {
+			AddResult::TooCheapToEnter(tx)
+		} else {
+			let shared = Arc::new(tx);
+			self.transactions.push(shared.clone());
+			self.scores.push(Default::default());
+			scoring.update_scores(&self.transactions, &mut self.scores, scoring::Change::InsertedAt(index));
+
+			AddResult::Ok(shared)
+		}
+	}
+
+	pub fn add(&mut self, tx: T, scoring: &S, max_count: usize) -> AddResult<T> {
+		let index = match self.transactions.binary_search_by(|old| scoring.compare(old, &tx)) {
+			Ok(index) => index,
+			Err(index) => index,
+		};
+
+		// Insert at the end.
+		if index == self.transactions.len() {
+			return self.push_cheapest_transaction(tx, scoring, max_count)
+		}
+
+		// Decide if the transaction should replace some other.
+		match scoring.choose(&self.transactions[index], &tx) {
+			// New transaction should be rejected
+			scoring::Choice::RejectNew => AddResult::TooCheap {
+				old: self.transactions[index].clone(),
+				new: tx,
+			},
+			// New transaction should be kept along with old ones.
+			scoring::Choice::InsertNew => {
+				let new = Arc::new(tx);
+
+				self.transactions.insert(index, new.clone());
+				self.scores.insert(index, Default::default());
+				scoring.update_scores(&self.transactions, &mut self.scores, scoring::Change::InsertedAt(index));
+
+				if self.transactions.len() > max_count {
+					let old = self.transactions.pop().expect("len is non-zero");
+					self.scores.pop();
+					scoring.update_scores(&self.transactions, &mut self.scores, scoring::Change::RemovedAt(self.transactions.len()));
+
+					AddResult::PushedOut {
+						old,
+						new,
+					}
+				} else {
+					AddResult::Ok(new)
+				}
+			},
+			// New transaction is replacing some other transaction already in the queue.
+			scoring::Choice::ReplaceOld => {
+				let new = Arc::new(tx);
+				let old = mem::replace(&mut self.transactions[index], new.clone());
+				scoring.update_scores(&self.transactions, &mut self.scores, scoring::Change::ReplacedAt(index));
+
+				AddResult::Replaced {
+					old,
+					new,
+				}
+			},
+		}
+	}
+
+	pub fn remove(&mut self, tx: &T, scoring: &S) -> bool {
+		let index = match self.transactions.binary_search_by(|old| scoring.compare(old, tx)) {
+			Ok(index) => index,
+			Err(_) => {
+				warn!("Attempting to remove non-existent transaction {:?}", tx);
+				return false;
+			},
+		};
+
+		self.transactions.remove(index);
+		self.scores.remove(index);
+		// Update scoring
+		scoring.update_scores(&self.transactions, &mut self.scores, scoring::Change::RemovedAt(index));
+		return true;
+	}
+
+	pub fn cull<R: Ready<T>>(&mut self, ready: &mut R, scoring: &S) -> SmallVec<[Arc<T>; PER_SENDER]> {
+		let mut result = SmallVec::new();
+		if self.is_empty() {
+			return result;
+		}
+
+		let mut first_non_stalled = 0;
+		for tx in &self.transactions {
+			match ready.is_ready(tx) {
+				Readiness::Stalled => {
+					first_non_stalled += 1;
+				},
+				Readiness::Ready | Readiness::Future => break,
+			}
+		}
+
+		// reverse the vectors to easily remove first elements.
+		self.transactions.reverse();
+		self.scores.reverse();
+
+		for _ in 0..first_non_stalled {
+			self.scores.pop();
+			result.push(
+				self.transactions.pop().expect("first_non_stalled is never greater than transactions.len(); qed")
+			);
+		}
+
+		self.transactions.reverse();
+		self.scores.reverse();
+
+		// update scoring
+		scoring.update_scores(&self.transactions, &mut self.scores, scoring::Change::Culled(result.len()));
+
+		// reverse the result to maintain correct order.
+		result.reverse();
+		result
+	}
+}
diff --git a/build.rs b/transaction-pool/src/verifier.rs
similarity index 60%
rename from build.rs
rename to transaction-pool/src/verifier.rs
index 0deeff37e891f2b7e9bee043725f9a8286caed8c..e55a17e91198da8befbcd13e45deb2e864e6f08a 100644
--- a/build.rs
+++ b/transaction-pool/src/verifier.rs
@@ -14,22 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-extern crate rustc_version;
+use {VerifiedTransaction};
 
-const MIN_RUSTC_VERSION: &'static str = "1.15.1";
+/// Transaction verification.
+///
+/// Verifier is responsible to decide if the transaction should even be considered for pool inclusion.
+pub trait Verifier<U> {
+	/// Verification error.
+	type Error;
 
-fn main() {
-	let is = rustc_version::version().unwrap();
-	let required = MIN_RUSTC_VERSION.parse().unwrap();
-	assert!(is >= required, format!("
+	/// Verified transaction.
+	type VerifiedTransaction: VerifiedTransaction;
 
-It looks like you are compiling Parity with an old rustc compiler {}.
-Parity requires version {}. Please update your compiler.
-If you use rustup, try this:
-
-    rustup update stable
-
-and try building Parity again.
-
-", is, required));
+	/// Verifies a `UnverifiedTransaction` and produces `VerifiedTransaction` instance.
+	fn verify_transaction(&self, tx: U) -> Result<Self::VerifiedTransaction, Self::Error>;
 }
diff --git a/updater/Cargo.toml b/updater/Cargo.toml
index bb6557f6dfaae4ea2db4c6e2b4f4b8834a60fc37..0621fbc676aa040231e752c52a7e7c10708f83b7 100644
--- a/updater/Cargo.toml
+++ b/updater/Cargo.toml
@@ -1,24 +1,22 @@
 [package]
 description = "Parity Updater Service."
 name = "parity-updater"
-version = "1.8.0"
+version = "1.11.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[build-dependencies]
-ethcore-ipc-codegen = { path = "../ipc/codegen" }
 
 [dependencies]
 log = "0.3"
-ethabi = "2.0"
+ethabi = "5.1"
+ethabi-derive = "5.0"
+ethabi-contract = "5.0"
 target_info = "0.1"
+semver = "0.6"
 ethcore = { path = "../ethcore" }
 ethsync = { path = "../sync" }
-ethcore-util = { path = "../util" }
-futures = "0.1"
+ethcore-bytes = { path = "../util/bytes" }
+ethereum-types = "0.2"
+parking_lot = "0.5"
 parity-hash-fetch = { path = "../hash-fetch" }
-ipc-common-types = { path = "../ipc-common-types" }
-ethcore-ipc = { path = "../ipc/rpc" }
-parity-reactor = { path = "../util/reactor" }
+parity-version = { path = "../util/version" }
 path = { path = "../util/path" }
diff --git a/updater/build.rs b/updater/build.rs
deleted file mode 100644
index b962f1e60c27bbf7f9293361455ec78ed0eabc9d..0000000000000000000000000000000000000000
--- a/updater/build.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate ethcore_ipc_codegen;
-
-fn main() {
-	ethcore_ipc_codegen::derive_binary("src/types/mod.rs.in").unwrap();
-	ethcore_ipc_codegen::derive_ipc_cond("src/service.rs", cfg!(feature="ipc")).unwrap();
-}
diff --git a/updater/res/operations.json b/updater/res/operations.json
new file mode 100644
index 0000000000000000000000000000000000000000..2a14e0f0a01b8aed9f4f89b5cd968340480922f5
--- /dev/null
+++ b/updater/res/operations.json
@@ -0,0 +1,560 @@
+[
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_client",
+				"type": "bytes32"
+			},
+			{
+				"name": "_newOwner",
+				"type": "address"
+			}
+		],
+		"name": "resetClientOwner",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"name": "_client",
+				"type": "bytes32"
+			},
+			{
+				"name": "_release",
+				"type": "bytes32"
+			}
+		],
+		"name": "isLatest",
+		"outputs": [
+			{
+				"name": "",
+				"type": "bool"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_txid",
+				"type": "bytes32"
+			}
+		],
+		"name": "rejectTransaction",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_newOwner",
+				"type": "address"
+			}
+		],
+		"name": "setOwner",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_number",
+				"type": "uint32"
+			},
+			{
+				"name": "_name",
+				"type": "bytes32"
+			},
+			{
+				"name": "_hard",
+				"type": "bool"
+			},
+			{
+				"name": "_spec",
+				"type": "bytes32"
+			}
+		],
+		"name": "proposeFork",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_client",
+				"type": "bytes32"
+			}
+		],
+		"name": "removeClient",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"name": "_client",
+				"type": "bytes32"
+			},
+			{
+				"name": "_release",
+				"type": "bytes32"
+			}
+		],
+		"name": "release",
+		"outputs": [
+			{
+				"name": "o_forkBlock",
+				"type": "uint32"
+			},
+			{
+				"name": "o_track",
+				"type": "uint8"
+			},
+			{
+				"name": "o_semver",
+				"type": "uint24"
+			},
+			{
+				"name": "o_critical",
+				"type": "bool"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"name": "_client",
+				"type": "bytes32"
+			},
+			{
+				"name": "_checksum",
+				"type": "bytes32"
+			}
+		],
+		"name": "build",
+		"outputs": [
+			{
+				"name": "o_release",
+				"type": "bytes32"
+			},
+			{
+				"name": "o_platform",
+				"type": "bytes32"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [],
+		"name": "rejectFork",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"name": "",
+				"type": "bytes32"
+			}
+		],
+		"name": "client",
+		"outputs": [
+			{
+				"name": "owner",
+				"type": "address"
+			},
+			{
+				"name": "required",
+				"type": "bool"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_newOwner",
+				"type": "address"
+			}
+		],
+		"name": "setClientOwner",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"name": "",
+				"type": "uint32"
+			}
+		],
+		"name": "fork",
+		"outputs": [
+			{
+				"name": "name",
+				"type": "bytes32"
+			},
+			{
+				"name": "spec",
+				"type": "bytes32"
+			},
+			{
+				"name": "hard",
+				"type": "bool"
+			},
+			{
+				"name": "ratified",
+				"type": "bool"
+			},
+			{
+				"name": "requiredCount",
+				"type": "uint256"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_release",
+				"type": "bytes32"
+			},
+			{
+				"name": "_platform",
+				"type": "bytes32"
+			},
+			{
+				"name": "_checksum",
+				"type": "bytes32"
+			}
+		],
+		"name": "addChecksum",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_txid",
+				"type": "bytes32"
+			}
+		],
+		"name": "confirmTransaction",
+		"outputs": [
+			{
+				"name": "txSuccess",
+				"type": "uint256"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"name": "",
+				"type": "bytes32"
+			}
+		],
+		"name": "proxy",
+		"outputs": [
+			{
+				"name": "requiredCount",
+				"type": "uint256"
+			},
+			{
+				"name": "to",
+				"type": "address"
+			},
+			{
+				"name": "data",
+				"type": "bytes"
+			},
+			{
+				"name": "value",
+				"type": "uint256"
+			},
+			{
+				"name": "gas",
+				"type": "uint256"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_client",
+				"type": "bytes32"
+			},
+			{
+				"name": "_owner",
+				"type": "address"
+			}
+		],
+		"name": "addClient",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"name": "",
+				"type": "address"
+			}
+		],
+		"name": "clientOwner",
+		"outputs": [
+			{
+				"name": "",
+				"type": "bytes32"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_txid",
+				"type": "bytes32"
+			},
+			{
+				"name": "_to",
+				"type": "address"
+			},
+			{
+				"name": "_data",
+				"type": "bytes"
+			},
+			{
+				"name": "_value",
+				"type": "uint256"
+			},
+			{
+				"name": "_gas",
+				"type": "uint256"
+			}
+		],
+		"name": "proposeTransaction",
+		"outputs": [
+			{
+				"name": "txSuccess",
+				"type": "uint256"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "grandOwner",
+		"outputs": [
+			{
+				"name": "",
+				"type": "address"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_release",
+				"type": "bytes32"
+			},
+			{
+				"name": "_forkBlock",
+				"type": "uint32"
+			},
+			{
+				"name": "_track",
+				"type": "uint8"
+			},
+			{
+				"name": "_semver",
+				"type": "uint24"
+			},
+			{
+				"name": "_critical",
+				"type": "bool"
+			}
+		],
+		"name": "addRelease",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [],
+		"name": "acceptFork",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "clientsRequired",
+		"outputs": [
+			{
+				"name": "",
+				"type": "uint32"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"name": "_client",
+				"type": "bytes32"
+			},
+			{
+				"name": "_release",
+				"type": "bytes32"
+			}
+		],
+		"name": "track",
+		"outputs": [
+			{
+				"name": "",
+				"type": "uint8"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": false,
+		"inputs": [
+			{
+				"name": "_client",
+				"type": "bytes32"
+			},
+			{
+				"name": "_r",
+				"type": "bool"
+			}
+		],
+		"name": "setClientRequired",
+		"outputs": [],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "latestFork",
+		"outputs": [
+			{
+				"name": "",
+				"type": "uint32"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"name": "_client",
+				"type": "bytes32"
+			},
+			{
+				"name": "_track",
+				"type": "uint8"
+			}
+		],
+		"name": "latestInTrack",
+		"outputs": [
+			{
+				"name": "",
+				"type": "bytes32"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"name": "_client",
+				"type": "bytes32"
+			},
+			{
+				"name": "_release",
+				"type": "bytes32"
+			},
+			{
+				"name": "_platform",
+				"type": "bytes32"
+			}
+		],
+		"name": "checksum",
+		"outputs": [
+			{
+				"name": "",
+				"type": "bytes32"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "proposedFork",
+		"outputs": [
+			{
+				"name": "",
+				"type": "uint32"
+			}
+		],
+		"payable": false,
+		"type": "function"
+	}
+]
diff --git a/updater/src/lib.rs b/updater/src/lib.rs
index b27f2039eed08681eafac0f5f22e9899695ad227..c1e19cf1d59b67d3b23620f7013691498228706d 100644
--- a/updater/src/lib.rs
+++ b/updater/src/lib.rs
@@ -16,28 +16,29 @@
 
 //! Updater for Parity executables
 
-#[macro_use] extern crate log;
-extern crate ethcore_util as util;
-extern crate ipc_common_types;
-extern crate parity_hash_fetch as hash_fetch;
-extern crate ethcore;
 extern crate ethabi;
+extern crate ethcore;
+extern crate ethcore_bytes as bytes;
+extern crate ethereum_types;
 extern crate ethsync;
-extern crate ethcore_ipc as ipc;
-extern crate futures;
-extern crate target_info;
-extern crate parity_reactor;
+extern crate parity_hash_fetch as hash_fetch;
+extern crate parity_version as version;
+extern crate parking_lot;
 extern crate path;
+extern crate semver;
+extern crate target_info;
+
+#[macro_use]
+extern crate ethabi_contract;
+#[macro_use]
+extern crate ethabi_derive;
+#[macro_use]
+extern crate log;
 
 mod updater;
-mod operations;
 mod types;
+mod service;
 
-mod service {
-	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
-	include!(concat!(env!("OUT_DIR"), "/service.rs"));
-}
-
-pub use service::{Service};
-pub use types::all::{ReleaseInfo, OperationsInfo, CapState, VersionInfo, ReleaseTrack};
+pub use service::Service;
+pub use types::{ReleaseInfo, OperationsInfo, CapState, VersionInfo, ReleaseTrack};
 pub use updater::{Updater, UpdateFilter, UpdatePolicy};
diff --git a/updater/src/operations.rs b/updater/src/operations.rs
deleted file mode 100644
index d94459befa28dd35e7aa751e05249e8fcb62877a..0000000000000000000000000000000000000000
--- a/updater/src/operations.rs
+++ /dev/null
@@ -1,359 +0,0 @@
-// Autogenerated from JSON contract definition using Rust contract convertor.
-
-use std::string::String;
-use std::result::Result;
-use std::fmt;
-use ethabi;
-use util;
-
-pub struct Operations {
-	contract: ethabi::Contract,
-	address: util::Address,
-	do_call: Box<Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send + Sync + 'static>,
-}
-impl Operations {
-	pub fn new<F>(address: util::Address, do_call: F) -> Self where F: Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send + Sync + 'static {
-		Operations {
-			contract: ethabi::Contract::new(ethabi::Interface::load(b"[{\"constant\":false,\"inputs\":[{\"name\":\"_client\",\"type\":\"bytes32\"},{\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"resetClientOwner\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_client\",\"type\":\"bytes32\"},{\"name\":\"_release\",\"type\":\"bytes32\"}],\"name\":\"isLatest\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_txid\",\"type\":\"bytes32\"}],\"name\":\"rejectTransaction\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"setOwner\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_number\",\"type\":\"uint32\"},{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_hard\",\"type\":\"bool\"},{\"name\":\"_spec\",\"type\":\"bytes32\"}],\"name\":\"proposeFork\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_client\",\"type\":\"bytes32\"}],\"name\":\"removeClient\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_client\",\"type\":\"bytes32\"},{\"name\":\"_release\",\"type\":\"bytes32\"}],\"name\":\"release\",\"outputs\":[{\"name\":\"o_forkBlock\",\"type\":\"uint32\"},{\"name\":\"o_track\",\"type\":\"uint8\"},{\"name\":\"o_semver\",\"type\":\"uint24\"},{\"name\":\"o_critical\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_client\",\"type\":\"bytes32\"},{\"name\":\"_checksum\",\"type\":\"bytes32\"}],\"name\":\"build\",\"outputs\":[{\"name\":\"o_release\",\"type\":\"bytes32\"},{\"name\":\"o_platform\",\"type\":\"bytes32\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"rejectFork\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"client\",\"outputs\":[{\"name\":\"owner\",\"type\":\"address\"},{\"name\":\"required\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"setClientOwner\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"uint32\"}],\"name\":\"fork\",\"outputs\":[{\"name\":\"name\",\"type\":\"bytes32\"},{\"name\":\"spec\",\"type\":\"bytes32\"},{\"name\":\"hard\",\"type\":\"bool\"},{\"name\":\"ratified\",\"type\":\"bool\"},{\"name\":\"requiredCount\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_release\",\"type\":\"bytes32\"},{\"name\":\"_platform\",\"type\":\"bytes32\"},{\"name\":\"_checksum\",\"type\":\"bytes32\"}],\"name\":\"addChecksum\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_txid\",\"type\":\"bytes32\"}],\"name\":\"confirmTransaction\",\"outputs\":[{\"name\":\"txSuccess\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"proxy\",\"outputs\":[{\"name\":\"requiredCount\",\"type\":\"uint256\"},{\"name\":\"to\",\"type\":\"address\"},{\"name\":\"data\",\"type\":\"bytes\"},{\"name\":\"value\",\"type\":\"uint256\"},{\"name\":\"gas\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_client\",\"type\":\"bytes32\"},{\"name\":\"_owner\",\"type\":\"address\"}],\"name\":\"addClient\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"address\"}],\"name\":\"clientOwner\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_txid\",\"type\":\"bytes32\"},{\"name\":\"_to\",\"type\":\"address\"},{\"name\":\"_data\",\"type\":\"bytes\"},{\"name\":\"_value\",\"type\":\"uint256\"},{\"name\":\"_gas\",\"type\":\"uint256\"}],\"name\":\"proposeTransaction\",\"outputs\":[{\"name\":\"txSuccess\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"grandOwner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_release\",\"type\":\"bytes32\"},{\"name\":\"_forkBlock\",\"type\":\"uint32\"},{\"name\":\"_track\",\"type\":\"uint8\"},{\"name\":\"_semver\",\"type\":\"uint24\"},{\"name\":\"_critical\",\"type\":\"bool\"}],\"name\":\"addRelease\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"acceptFork\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"clientsRequired\",\"outputs\":[{\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_client\",\"type\":\"bytes32\"},{\"name\":\"_release\",\"type\":\"bytes32\"}],\"name\":\"track\",\"outputs\":[{\"name\":\"\",\"type\":\"uint8\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_client\",\"type\":\"bytes32\"},{\"name\":\"_r\",\"type\":\"bool\"}],\"name\":\"setClientRequired\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"latestFork\",\"outputs\":[{\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_client\",\"type\":\"bytes32\"},{\"name\":\"_track\",\"type\":\"uint8\"}],\"name\":\"latestInTrack\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_client\",\"type\":\"bytes32\"},{\"name\":\"_release\",\"type\":\"bytes32\"},{\"name\":\"_platform\",\"type\":\"bytes32\"}],\"name\":\"checksum\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"proposedFork\",\"outputs\":[{\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"type\":\"function\"}]").expect("JSON is autogenerated; qed")),
-			address: address,
-			do_call: Box::new(do_call),
-		}
-	}
-	fn as_string<T: fmt::Debug>(e: T) -> String { format!("{:?}", e) }
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_client","type":"bytes32"},{"name":"_newOwner","type":"address"}],"name":"resetClientOwner","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn reset_client_owner(&self, _client: &str, _new_owner: &util::Address) -> Result<(), String> {
-		let call = self.contract.function("resetClientOwner".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_client.as_bytes().to_owned()), ethabi::Token::Address(_new_owner.clone().0)]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_client","type":"bytes32"},{"name":"_release","type":"bytes32"}],"name":"isLatest","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn is_latest(&self, _client: &str, _release: &util::H256) -> Result<bool, String> {
-		let call = self.contract.function("isLatest".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_client.as_bytes().to_owned()), ethabi::Token::FixedBytes(_release.as_ref().to_owned())]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_txid","type":"bytes32"}],"name":"rejectTransaction","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn reject_transaction(&self, _txid: &util::H256) -> Result<(), String> {
-		let call = self.contract.function("rejectTransaction".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_txid.as_ref().to_owned())]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_newOwner","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn set_owner(&self, _new_owner: &util::Address) -> Result<(), String> {
-		let call = self.contract.function("setOwner".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::Address(_new_owner.clone().0)]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_number","type":"uint32"},{"name":"_name","type":"bytes32"},{"name":"_hard","type":"bool"},{"name":"_spec","type":"bytes32"}],"name":"proposeFork","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn propose_fork(&self, _number: u32, _name: &util::H256, _hard: bool, _spec: &util::H256) -> Result<(), String> {
-		let call = self.contract.function("proposeFork".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::Uint({ let mut r = [0u8; 32]; util::U256::from(_number as u64).to_big_endian(&mut r); r }), ethabi::Token::FixedBytes(_name.as_ref().to_owned()), ethabi::Token::Bool(_hard), ethabi::Token::FixedBytes(_spec.as_ref().to_owned())]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_client","type":"bytes32"}],"name":"removeClient","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn remove_client(&self, _client: &str) -> Result<(), String> {
-		let call = self.contract.function("removeClient".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_client.as_bytes().to_owned())]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_client","type":"bytes32"},{"name":"_release","type":"bytes32"}],"name":"release","outputs":[{"name":"o_forkBlock","type":"uint32"},{"name":"o_track","type":"uint8"},{"name":"o_semver","type":"uint24"},{"name":"o_critical","type":"bool"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn release(&self, _client: &str, _release: &util::H256) -> Result<(u32, u8, u32, bool), String> {
-		let call = self.contract.function("release".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_client.as_bytes().to_owned()), ethabi::Token::FixedBytes(_release.as_ref().to_owned())]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()).as_u64() as u32 }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()).as_u64() as u8 }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()).as_u64() as u32 }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_client","type":"bytes32"},{"name":"_checksum","type":"bytes32"}],"name":"build","outputs":[{"name":"o_release","type":"bytes32"},{"name":"o_platform","type":"bytes32"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn build(&self, _client: &str, _checksum: &util::H256) -> Result<(util::H256, util::H256), String> {
-		let call = self.contract.function("build".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_client.as_bytes().to_owned()), ethabi::Token::FixedBytes(_checksum.as_ref().to_owned())]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_fixed_bytes().ok_or("Invalid type returned")?; util::H256::from_slice(r.as_ref()) }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_fixed_bytes().ok_or("Invalid type returned")?; util::H256::from_slice(r.as_ref()) }))
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[],"name":"rejectFork","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn reject_fork(&self) -> Result<(), String> {
-		let call = self.contract.function("rejectFork".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"client","outputs":[{"name":"owner","type":"address"},{"name":"required","type":"bool"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn client(&self, _1: &util::H256) -> Result<(util::Address, bool), String> {
-		let call = self.contract.function("client".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_1.as_ref().to_owned())]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_address().ok_or("Invalid type returned")?; util::Address::from(r) }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_newOwner","type":"address"}],"name":"setClientOwner","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn set_client_owner(&self, _new_owner: &util::Address) -> Result<(), String> {
-		let call = self.contract.function("setClientOwner".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::Address(_new_owner.clone().0)]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"","type":"uint32"}],"name":"fork","outputs":[{"name":"name","type":"bytes32"},{"name":"spec","type":"bytes32"},{"name":"hard","type":"bool"},{"name":"ratified","type":"bool"},{"name":"requiredCount","type":"uint256"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn fork(&self, _1: u32) -> Result<(util::H256, util::H256, bool, bool, util::U256), String> {
-		let call = self.contract.function("fork".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::Uint({ let mut r = [0u8; 32]; util::U256::from(_1 as u64).to_big_endian(&mut r); r })]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_fixed_bytes().ok_or("Invalid type returned")?; util::H256::from_slice(r.as_ref()) }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_fixed_bytes().ok_or("Invalid type returned")?; util::H256::from_slice(r.as_ref()) }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()) }))
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_release","type":"bytes32"},{"name":"_platform","type":"bytes32"},{"name":"_checksum","type":"bytes32"}],"name":"addChecksum","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn add_checksum(&self, _release: &util::H256, _platform: &str, _checksum: &util::H256) -> Result<(), String> {
-		let call = self.contract.function("addChecksum".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_release.as_ref().to_owned()), ethabi::Token::FixedBytes(_platform.as_bytes().to_owned()), ethabi::Token::FixedBytes(_checksum.as_ref().to_owned())]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_txid","type":"bytes32"}],"name":"confirmTransaction","outputs":[{"name":"txSuccess","type":"uint256"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn confirm_transaction(&self, _txid: &util::H256) -> Result<util::U256, String> {
-		let call = self.contract.function("confirmTransaction".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_txid.as_ref().to_owned())]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()) }))
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"proxy","outputs":[{"name":"requiredCount","type":"uint256"},{"name":"to","type":"address"},{"name":"data","type":"bytes"},{"name":"value","type":"uint256"},{"name":"gas","type":"uint256"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn proxy(&self, _1: &util::H256) -> Result<(util::U256, util::Address, Vec<u8>, util::U256, util::U256), String> {
-		let call = self.contract.function("proxy".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_1.as_ref().to_owned())]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()) }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_address().ok_or("Invalid type returned")?; util::Address::from(r) }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bytes().ok_or("Invalid type returned")?; r }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()) }, { let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()) }))
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_client","type":"bytes32"},{"name":"_owner","type":"address"}],"name":"addClient","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn add_client(&self, _client: &str, _owner: &util::Address) -> Result<(), String> {
-		let call = self.contract.function("addClient".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_client.as_bytes().to_owned()), ethabi::Token::Address(_owner.clone().0)]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"clientOwner","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn client_owner(&self, _1: &util::Address) -> Result<util::H256, String> {
-		let call = self.contract.function("clientOwner".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::Address(_1.clone().0)]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_fixed_bytes().ok_or("Invalid type returned")?; util::H256::from_slice(r.as_ref()) }))
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_txid","type":"bytes32"},{"name":"_to","type":"address"},{"name":"_data","type":"bytes"},{"name":"_value","type":"uint256"},{"name":"_gas","type":"uint256"}],"name":"proposeTransaction","outputs":[{"name":"txSuccess","type":"uint256"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn propose_transaction(&self, _txid: &util::H256, _to: &util::Address, _data: &[u8], _value: util::U256, _gas: util::U256) -> Result<util::U256, String> {
-		let call = self.contract.function("proposeTransaction".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_txid.as_ref().to_owned()), ethabi::Token::Address(_to.clone().0), ethabi::Token::Bytes(_data.to_owned()), ethabi::Token::Uint({ let mut r = [0u8; 32]; _value.to_big_endian(&mut r); r }), ethabi::Token::Uint({ let mut r = [0u8; 32]; _gas.to_big_endian(&mut r); r })]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()) }))
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[],"name":"grandOwner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn grand_owner(&self) -> Result<util::Address, String> {
-		let call = self.contract.function("grandOwner".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_address().ok_or("Invalid type returned")?; util::Address::from(r) }))
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_release","type":"bytes32"},{"name":"_forkBlock","type":"uint32"},{"name":"_track","type":"uint8"},{"name":"_semver","type":"uint24"},{"name":"_critical","type":"bool"}],"name":"addRelease","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn add_release(&self, _release: &util::H256, _fork_block: u32, _track: u8, _semver: u32, _critical: bool) -> Result<(), String> {
-		let call = self.contract.function("addRelease".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_release.as_ref().to_owned()), ethabi::Token::Uint({ let mut r = [0u8; 32]; util::U256::from(_fork_block as u64).to_big_endian(&mut r); r }), ethabi::Token::Uint({ let mut r = [0u8; 32]; util::U256::from(_track as u64).to_big_endian(&mut r); r }), ethabi::Token::Uint({ let mut r = [0u8; 32]; util::U256::from(_semver as u64).to_big_endian(&mut r); r }), ethabi::Token::Bool(_critical)]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[],"name":"acceptFork","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn accept_fork(&self) -> Result<(), String> {
-		let call = self.contract.function("acceptFork".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[],"name":"clientsRequired","outputs":[{"name":"","type":"uint32"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn clients_required(&self) -> Result<u32, String> {
-		let call = self.contract.function("clientsRequired".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()).as_u64() as u32 }))
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_client","type":"bytes32"},{"name":"_release","type":"bytes32"}],"name":"track","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn track(&self, _client: &str, _release: &util::H256) -> Result<u8, String> {
-		let call = self.contract.function("track".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_client.as_bytes().to_owned()), ethabi::Token::FixedBytes(_release.as_ref().to_owned())]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()).as_u64() as u8 }))
-	}
-
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_client","type":"bytes32"},{"name":"_r","type":"bool"}],"name":"setClientRequired","outputs":[],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn set_client_required(&self, _client: &str, _r: bool) -> Result<(), String> {
-		let call = self.contract.function("setClientRequired".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_client.as_bytes().to_owned()), ethabi::Token::Bool(_r)]
-		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-
-		Ok(())
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[],"name":"latestFork","outputs":[{"name":"","type":"uint32"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn latest_fork(&self) -> Result<u32, String> {
-		let call = self.contract.function("latestFork".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()).as_u64() as u32 }))
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_client","type":"bytes32"},{"name":"_track","type":"uint8"}],"name":"latestInTrack","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn latest_in_track(&self, _client: &str, _track: u8) -> Result<util::H256, String> {
-		let call = self.contract.function("latestInTrack".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_client.as_bytes().to_owned()), ethabi::Token::Uint({ let mut r = [0u8; 32]; util::U256::from(_track as u64).to_big_endian(&mut r); r })]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_fixed_bytes().ok_or("Invalid type returned")?; util::H256::from_slice(r.as_ref()) }))
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_client","type":"bytes32"},{"name":"_release","type":"bytes32"},{"name":"_platform","type":"bytes32"}],"name":"checksum","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn checksum(&self, _client: &str, _release: &util::H256, _platform: &str) -> Result<util::H256, String> {
-		let call = self.contract.function("checksum".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_client.as_bytes().to_owned()), ethabi::Token::FixedBytes(_release.as_ref().to_owned()), ethabi::Token::FixedBytes(_platform.as_bytes().to_owned())]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_fixed_bytes().ok_or("Invalid type returned")?; util::H256::from_slice(r.as_ref()) }))
-	}
-
-	/// Auto-generated from: `{"constant":true,"inputs":[],"name":"proposedFork","outputs":[{"name":"","type":"uint32"}],"payable":false,"type":"function"}`
-	#[allow(dead_code)]
-	pub fn proposed_fork(&self) -> Result<u32, String> {
-		let call = self.contract.function("proposedFork".into()).map_err(Self::as_string)?;
-		let data = call.encode_call(
-			vec![]
-		).map_err(Self::as_string)?;
-		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()).as_u64() as u32 }))
-	}
-}
diff --git a/updater/src/service.rs b/updater/src/service.rs
index dbc7e0ead7223e63e6d2991c96d84f1e9f7b5d2a..b025eb42eaf455a08caa36f70b3d471e8d3b9b7d 100644
--- a/updater/src/service.rs
+++ b/updater/src/service.rs
@@ -14,10 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use types::all::{CapState, ReleaseInfo, OperationsInfo};
-use ipc_common_types::VersionInfo;
+use types::{CapState, ReleaseInfo, OperationsInfo, VersionInfo};
 
-#[ipc(client_ident="RemoteUpdater")]
 pub trait Service: Send + Sync {
 	/// Is the currently running client capable of supporting the current chain?
 	/// We default to true if there's no clear information.
diff --git a/updater/src/types/all.rs b/updater/src/types/all.rs
index dbb5f413a517d9bb9748a1f2b633de916c6c2b15..7079fb8dedb83dd2b70bd784064428b4a1ac91f1 100644
--- a/updater/src/types/all.rs
+++ b/updater/src/types/all.rs
@@ -16,12 +16,11 @@
 
 //! Types used in the public API
 
-use util::{H256};
-pub use ipc_common_types::{VersionInfo, ReleaseTrack};
+use ethereum_types::H256;
+use types::VersionInfo;
 
 /// Information regarding a particular release of Parity
 #[derive(Debug, Clone, PartialEq)]
-#[binary]
 pub struct ReleaseInfo {
 	/// Information on the version.
 	pub version: VersionInfo,
@@ -35,7 +34,6 @@ pub struct ReleaseInfo {
 
 /// Information on our operations environment.
 #[derive(Debug, Clone, PartialEq)]
-#[binary]
 pub struct OperationsInfo {
 	/// Our blockchain's latest fork.
 	pub fork: u64,
@@ -51,7 +49,6 @@ pub struct OperationsInfo {
 
 /// Information on the current version's consensus capabililty.
 #[derive(Debug, Clone, Copy, PartialEq)]
-#[binary]
 pub enum CapState {
 	/// Unknown.
 	Unknown,
diff --git a/updater/src/types/mod.rs b/updater/src/types/mod.rs
index 68dfe0b252839d0b6027446bc17c3ead1ea46d7d..b6d3c6025456940d0c06eb9c0f57a12a14e4e7d8 100644
--- a/updater/src/types/mod.rs
+++ b/updater/src/types/mod.rs
@@ -16,6 +16,11 @@
 
 //! Types used in the public api
 
-#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues
-include!(concat!(env!("OUT_DIR"), "/mod.rs.in"));
+mod all;
+mod release_track;
+mod version_info;
+
+pub use self::all::{ReleaseInfo, OperationsInfo, CapState};
+pub use self::release_track::ReleaseTrack;
+pub use self::version_info::VersionInfo;
 
diff --git a/updater/src/types/mod.rs.in b/updater/src/types/mod.rs.in
deleted file mode 100644
index 0681e288452fc507f39d246d3fa731d517223c20..0000000000000000000000000000000000000000
--- a/updater/src/types/mod.rs.in
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-pub mod all;
diff --git a/ipc-common-types/src/types/release_track.rs b/updater/src/types/release_track.rs
similarity index 54%
rename from ipc-common-types/src/types/release_track.rs
rename to updater/src/types/release_track.rs
index 418f590c88ce34d7a15286320c19753f4ec14b3d..a1f646805a3ef8b9826b41859d7a8f13bd00bc1e 100644
--- a/ipc-common-types/src/types/release_track.rs
+++ b/updater/src/types/release_track.rs
@@ -19,23 +19,23 @@
 use std::fmt;
 
 /// A release's track.
+#[repr(u8)]
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
-#[binary]
 pub enum ReleaseTrack {
 	/// Stable track.
-	Stable,
+	Stable = 1,
 	/// Beta track.
-	Beta,
+	Beta = 2,
 	/// Nightly track.
-	Nightly,
+	Nightly = 3,
 	/// Testing track.
-	Testing,
+	Testing = 4,
 	/// No known track, also "current executable's track" when it's not yet known.
-	Unknown,
+	Unknown = 0,
 }
 
 impl fmt::Display for ReleaseTrack {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		write!(f, "{}", match *self {
 			ReleaseTrack::Stable => "stable",
 			ReleaseTrack::Beta => "beta",
@@ -70,14 +70,50 @@ impl From<u8> for ReleaseTrack {
 	}
 }
 
-impl Into<u8> for ReleaseTrack {
-	fn into(self) -> u8 {
-		match self {
-			ReleaseTrack::Stable => 1,
-			ReleaseTrack::Beta => 2,
-			ReleaseTrack::Nightly => 3,
-			ReleaseTrack::Testing => 4,
-			ReleaseTrack::Unknown => 0,
-		}
+
+impl From<ReleaseTrack> for u8 {
+	fn from(rt: ReleaseTrack) -> Self {
+		rt as u8
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::ReleaseTrack;
+
+	#[test]
+	fn test_release_track_from() {
+		assert_eq!(ReleaseTrack::Stable, 1u8.into());
+		assert_eq!(ReleaseTrack::Beta, 2u8.into());
+		assert_eq!(ReleaseTrack::Nightly, 3u8.into());
+		assert_eq!(ReleaseTrack::Testing, 4u8.into());
+		assert_eq!(ReleaseTrack::Unknown, 0u8.into());
+	}
+
+	#[test]
+	fn test_release_track_into() {
+		assert_eq!(1u8, u8::from(ReleaseTrack::Stable));
+		assert_eq!(2u8, u8::from(ReleaseTrack::Beta));
+		assert_eq!(3u8, u8::from(ReleaseTrack::Nightly));
+		assert_eq!(4u8, u8::from(ReleaseTrack::Testing));
+		assert_eq!(0u8, u8::from(ReleaseTrack::Unknown));
+	}
+
+	#[test]
+	fn test_release_track_from_str() {
+		assert_eq!(ReleaseTrack::Stable, "stable".into());
+		assert_eq!(ReleaseTrack::Beta, "beta".into());
+		assert_eq!(ReleaseTrack::Nightly, "nightly".into());
+		assert_eq!(ReleaseTrack::Testing, "testing".into());
+		assert_eq!(ReleaseTrack::Unknown, "unknown".into());
+	}
+
+	#[test]
+	fn test_release_track_into_str() {
+		assert_eq!("stable", ReleaseTrack::Stable.to_string());
+		assert_eq!("beta", ReleaseTrack::Beta.to_string());
+		assert_eq!("nightly", ReleaseTrack::Nightly.to_string());
+		assert_eq!("testing", ReleaseTrack::Testing.to_string());
+		assert_eq!("unknown", ReleaseTrack::Unknown.to_string());
 	}
 }
diff --git a/ipc-common-types/src/types/version_info.rs b/updater/src/types/version_info.rs
similarity index 90%
rename from ipc-common-types/src/types/version_info.rs
rename to updater/src/types/version_info.rs
index 1f0e5845209f83da9e0f381aaf02cf7371bc4495..4409153e2ad2e9d4833b4998f126e3805b00b7e8 100644
--- a/ipc-common-types/src/types/version_info.rs
+++ b/updater/src/types/version_info.rs
@@ -17,15 +17,13 @@
 //! Types used in the public API
 
 use std::fmt;
-use std::str::FromStr;
-use semver::{Version};
-use util::H160;
-use util::misc::raw_package_info;
-use release_track::ReleaseTrack;
+use semver::Version;
+use ethereum_types::H160;
+use version::raw_package_info;
+use types::ReleaseTrack;
 
 /// Version information of a particular release.
 #[derive(Debug, Clone, PartialEq)]
-#[binary]
 pub struct VersionInfo {
 	/// The track on which it was released.
 	pub track: ReleaseTrack,
@@ -48,7 +46,7 @@ impl VersionInfo {
 		VersionInfo {
 			track: raw.0.into(),
 			version: { let mut v = Version::parse(raw.1).expect("Environment variables are known to be valid; qed"); v.build = vec![]; v.pre = vec![]; v },
-			hash: H160::from_str(raw.2).unwrap_or_else(|_| H160::zero()),
+			hash: raw.2.parse::<H160>().unwrap_or_else(|_| H160::zero()),
 		}
 	}
 
diff --git a/updater/src/updater.rs b/updater/src/updater.rs
index 81768868877ac2dfa336fe9ac1cb1bf1cbf39761..ba7a42c875b30fdee34e6815859d724c479f79de 100644
--- a/updater/src/updater.rs
+++ b/updater/src/updater.rs
@@ -18,21 +18,21 @@ use std::fs;
 use std::io::Write;
 use std::path::{PathBuf};
 use std::sync::{Arc, Weak};
+use std::time::{Duration, Instant};
 
 use ethcore::client::{BlockId, BlockChainClient, ChainNotify};
 use ethsync::{SyncProvider};
-use futures::{future, Future, BoxFuture};
 use hash_fetch::{self as fetch, HashFetch};
-use hash_fetch::fetch::Client as FetchService;
-use ipc_common_types::{VersionInfo, ReleaseTrack};
-use operations::Operations;
-use parity_reactor::Remote;
 use path::restrict_permissions_owner;
 use service::{Service};
 use target_info::Target;
-use types::all::{ReleaseInfo, OperationsInfo, CapState};
-use util::{Address, H160, H256, Mutex, Bytes};
-use util::misc;
+use types::{ReleaseInfo, OperationsInfo, CapState, VersionInfo, ReleaseTrack};
+use ethereum_types::H256;
+use bytes::Bytes;
+use parking_lot::Mutex;
+use version;
+
+use_contract!(operations_contract, "Operations", "res/operations.json");
 
 /// Filter for releases.
 #[derive(Debug, Eq, PartialEq, Clone)]
@@ -58,6 +58,8 @@ pub struct UpdatePolicy {
 	pub track: ReleaseTrack,
 	/// Path for the updates to go.
 	pub path: String,
+	/// Maximum download size.
+	pub max_size: usize,
 }
 
 impl Default for UpdatePolicy {
@@ -68,6 +70,7 @@ impl Default for UpdatePolicy {
 			filter: UpdateFilter::None,
 			track: ReleaseTrack::Unknown,
 			path: Default::default(),
+			max_size: 128 * 1024 * 1024,
 		}
 	}
 }
@@ -83,6 +86,8 @@ struct UpdaterState {
 	capability: CapState,
 
 	disabled: bool,
+
+	backoff: Option<(u32, Instant)>,
 }
 
 /// Service for checking for updates and determining whether we can achieve consensus.
@@ -92,8 +97,8 @@ pub struct Updater {
 	weak_self: Mutex<Weak<Updater>>,
 	client: Weak<BlockChainClient>,
 	sync: Weak<SyncProvider>,
-	fetcher: Mutex<Option<fetch::Client>>,
-	operations: Mutex<Option<Operations>>,
+	fetcher: fetch::Client,
+	operations_contract: operations_contract::Operations,
 	exit_handler: Mutex<Option<Box<Fn() + 'static + Send>>>,
 
 	// Our version info (static)
@@ -105,6 +110,10 @@ pub struct Updater {
 
 const CLIENT_ID: &'static str = "parity";
 
+fn client_id_hash() -> H256 {
+	CLIENT_ID.as_bytes().into()
+}
+
 fn platform() -> String {
 	if cfg!(target_os = "macos") {
 		"x86_64-apple-darwin".into()
@@ -113,24 +122,27 @@ fn platform() -> String {
 	} else if cfg!(target_os = "linux") {
 		format!("{}-unknown-linux-gnu", Target::arch())
 	} else {
-		misc::platform()
+		version::platform()
 	}
 }
 
+fn platform_id_hash() -> H256 {
+	platform().as_bytes().into()
+}
+
 impl Updater {
-	pub fn new(client: Weak<BlockChainClient>, sync: Weak<SyncProvider>, update_policy: UpdatePolicy, fetch: FetchService, remote: Remote) -> Arc<Self> {
+	pub fn new(client: Weak<BlockChainClient>, sync: Weak<SyncProvider>, update_policy: UpdatePolicy, fetcher: fetch::Client) -> Arc<Self> {
 		let r = Arc::new(Updater {
 			update_policy: update_policy,
 			weak_self: Mutex::new(Default::default()),
 			client: client.clone(),
 			sync: sync.clone(),
-			fetcher: Mutex::new(None),
-			operations: Mutex::new(None),
+			fetcher,
+			operations_contract: operations_contract::Operations::default(),
 			exit_handler: Mutex::new(None),
 			this: VersionInfo::this(),
 			state: Mutex::new(Default::default()),
 		});
-		*r.fetcher.lock() = Some(fetch::Client::with_fetch(r.clone(), fetch, remote));
 		*r.weak_self.lock() = Arc::downgrade(&r);
 		r.poll();
 		r
@@ -141,17 +153,30 @@ impl Updater {
 		*self.exit_handler.lock() = Some(Box::new(f));
 	}
 
-	fn collect_release_info(operations: &Operations, release_id: &H256) -> Result<ReleaseInfo, String> {
-		let (fork, track, semver, is_critical) = operations.release(CLIENT_ID, release_id)?;
-		let latest_binary = operations.checksum(CLIENT_ID, release_id, &platform())?;
+	fn collect_release_info<T: Fn(Vec<u8>) -> Result<Vec<u8>, String>>(&self, release_id: H256, do_call: &T) -> Result<ReleaseInfo, String> {
+		let (fork, track, semver, is_critical) = self.operations_contract.functions()
+			.release()
+			.call(client_id_hash(), release_id, &do_call)
+			.map_err(|e| format!("{:?}", e))?;
+
+		let (fork, track, semver) = (fork.low_u64(), track.low_u32(), semver.low_u32());
+
+		let latest_binary = self.operations_contract.functions()
+			.checksum()
+			.call(client_id_hash(), release_id, platform_id_hash(), &do_call)
+			.map_err(|e| format!("{:?}", e))?;
+
 		Ok(ReleaseInfo {
-			version: VersionInfo::from_raw(semver, track, release_id.clone().into()),
-			is_critical: is_critical,
-			fork: fork as u64,
+			version: VersionInfo::from_raw(semver, track as u8, release_id.into()),
+			is_critical,
+			fork,
 			binary: if latest_binary.is_zero() { None } else { Some(latest_binary) },
 		})
 	}
 
+	/// Returns release track of the parity node.
+	/// `update_policy.track` is the track specified from the command line, whereas `this.track`
+	/// is the track of the software which is currently run
 	fn track(&self) -> ReleaseTrack {
 		match self.update_policy.track {
 			ReleaseTrack::Unknown => self.this.track,
@@ -159,42 +184,68 @@ impl Updater {
 		}
 	}
 
+	fn latest_in_track<T: Fn(Vec<u8>) -> Result<Vec<u8>, String>>(&self, track: ReleaseTrack, do_call: &T) -> Result<H256, String> {
+		self.operations_contract.functions()
+			.latest_in_track()
+			.call(client_id_hash(), u8::from(track), do_call)
+			.map_err(|e| format!("{:?}", e))
+	}
+
 	fn collect_latest(&self) -> Result<OperationsInfo, String> {
-		if let Some(ref operations) = *self.operations.lock() {
-			let hh: H256 = self.this.hash.into();
-			trace!(target: "updater", "Looking up this_fork for our release: {}/{:?}", CLIENT_ID, hh);
-			let this_fork = operations.release(CLIENT_ID, &self.this.hash.into()).ok()
-				.and_then(|(fork, track, _, _)| {
-					trace!(target: "updater", "Operations returned fork={}, track={}", fork as u64, track);
-					if track > 0 {Some(fork as u64)} else {None}
-				});
-
-			if self.track() == ReleaseTrack::Unknown {
-				return Err(format!("Current executable ({}) is unreleased.", H160::from(self.this.hash)));
-			}
+		if self.track() == ReleaseTrack::Unknown {
+			return Err(format!("Current executable ({}) is unreleased.", self.this.hash));
+		}
 
-			let latest_in_track = operations.latest_in_track(CLIENT_ID, self.track().into())?;
-			let in_track = Self::collect_release_info(operations, &latest_in_track)?;
-			let mut in_minor = Some(in_track.clone());
-			const PROOF: &'static str = "in_minor initialised and assigned with Some; loop breaks if None assigned; qed";
-			while in_minor.as_ref().expect(PROOF).version.track != self.track() {
-				let track = match in_minor.as_ref().expect(PROOF).version.track {
-					ReleaseTrack::Beta => ReleaseTrack::Stable,
-					ReleaseTrack::Nightly => ReleaseTrack::Beta,
-					_ => { in_minor = None; break; }
-				};
-				in_minor = Some(Self::collect_release_info(operations, &operations.latest_in_track(CLIENT_ID, track.into())?)?);
-			}
+		let client = self.client.upgrade().ok_or_else(|| "Cannot obtain client")?;
+		let address = client.registry_address("operations".into(), BlockId::Latest).ok_or_else(|| "Cannot get operations contract address")?;
+		let do_call = |data| client.call_contract(BlockId::Latest, address, data).map_err(|e| format!("{:?}", e));
+
+		trace!(target: "updater", "Looking up this_fork for our release: {}/{:?}", CLIENT_ID, self.this.hash);
+
+		// get the fork number of this release
+		let this_fork = self.operations_contract.functions()
+			.release()
+			.call(client_id_hash(), self.this.hash, &do_call)
+			.ok()
+			.and_then(|(fork, track, _, _)| {
+				let this_track: ReleaseTrack = (track.low_u64() as u8).into();
+				match this_track {
+					ReleaseTrack::Unknown => None,
+					_ => Some(fork.low_u64()),
+				}
+			});
+
+		// get the hash of the latest release in our track
+		let latest_in_track = self.latest_in_track(self.track(), &do_call)?;
+
+		// get the release info for the latest version in track
+		let in_track = self.collect_release_info(latest_in_track, &do_call)?;
+		let mut in_minor = Some(in_track.clone());
+		const PROOF: &'static str = "in_minor initialised and assigned with Some; loop breaks if None assigned; qed";
+
+		// if the minor version has changed, let's check the minor version on a different track
+		while in_minor.as_ref().expect(PROOF).version.version.minor != self.this.version.minor {
+			let track = match in_minor.as_ref().expect(PROOF).version.track {
+				ReleaseTrack::Beta => ReleaseTrack::Stable,
+				ReleaseTrack::Nightly => ReleaseTrack::Beta,
+				_ => { in_minor = None; break; }
+			};
 
-			Ok(OperationsInfo {
-				fork: operations.latest_fork()? as u64,
-				this_fork: this_fork,
-				track: in_track,
-				minor: in_minor,
-			})
-		} else {
-			Err("Operations not available".into())
+			let latest_in_track = self.latest_in_track(track, &do_call)?;
+			in_minor = Some(self.collect_release_info(latest_in_track, &do_call)?);
 		}
+
+		let fork = self.operations_contract.functions()
+			.latest_fork()
+			.call(&do_call)
+			.map_err(|e| format!("{:?}", e))?.low_u64();
+
+		Ok(OperationsInfo {
+			fork,
+			this_fork,
+			track: in_track,
+			minor: in_minor,
+		})
 	}
 
 	fn update_file_name(v: &VersionInfo) -> String {
@@ -208,13 +259,26 @@ impl Updater {
 	}
 
 	fn fetch_done(&self, result: Result<PathBuf, fetch::Error>) {
+		// old below
 		(|| -> Result<(), (String, bool)> {
 			let auto = {
 				let mut s = self.state.lock();
 				let fetched = s.fetching.take().unwrap();
 				let dest = self.updates_path(&Self::update_file_name(&fetched.version));
 				if !dest.exists() {
-					let b = result.map_err(|e| (format!("Unable to fetch update ({}): {:?}", fetched.version, e), false))?;
+					let b = match result {
+						Ok(b) => {
+							s.backoff = None;
+							b
+						},
+						Err(e) => {
+							let mut n = s.backoff.map(|b| b.0 + 1).unwrap_or(1);
+							s.backoff = Some((n, Instant::now() + Duration::from_secs(2usize.pow(n) as u64)));
+
+							return Err((format!("Unable to fetch update ({}): {:?}", fetched.version, e), false));
+						},
+					};
+
 					info!(target: "updater", "Fetched latest version ({}) OK to {}", fetched.version, b.display());
 					fs::create_dir_all(dest.parent().expect("at least one thing pushed; qed")).map_err(|e| (format!("Unable to create updates path: {:?}", e), true))?;
 					fs::copy(&b, &dest).map_err(|e| (format!("Unable to copy update: {:?}", e), true))?;
@@ -245,17 +309,6 @@ impl Updater {
 			return;
 		}
 
-		if self.operations.lock().is_none() {
-			if let Some(ops_addr) = self.client.upgrade().and_then(|c| c.registry_address("operations".into())) {
-				trace!(target: "updater", "Found operations at {}", ops_addr);
-				let client = self.client.clone();
-				*self.operations.lock() = Some(Operations::new(ops_addr, move |a, d| client.upgrade().ok_or("No client!".into()).and_then(|c| c.call_contract(BlockId::Latest, a, d))));
-			} else {
-				// No Operations contract - bail.
-				return;
-			}
-		}
-
 		let current_number = self.client.upgrade().map_or(0, |c| c.block_number(BlockId::Latest).unwrap_or(0));
 
 		let mut capability = CapState::Unknown;
@@ -285,12 +338,15 @@ impl Updater {
 							drop(s);
 							self.fetch_done(Ok(PathBuf::new()));
 						} else {
-							info!(target: "updater", "Attempting to get parity binary {}", b);
-							s.fetching = Some(latest.track.clone());
-							drop(s);
-							let weak_self = self.weak_self.lock().clone();
-							let f = move |r: Result<PathBuf, fetch::Error>| if let Some(this) = weak_self.upgrade() { this.fetch_done(r) };
-							self.fetcher.lock().as_ref().expect("Created on `new`; qed").fetch(b, Box::new(f));
+							if s.backoff.iter().all(|&(_, instant)| Instant::now() >= instant) {
+								info!(target: "updater", "Attempting to get parity binary {}", b);
+								s.fetching = Some(latest.track.clone());
+								drop(s);
+								let weak_self = self.weak_self.lock().clone();
+								let f = move |r: Result<PathBuf, fetch::Error>| if let Some(this) = weak_self.upgrade() { this.fetch_done(r) };
+								let a = fetch::Abort::default().with_max_size(self.update_policy.max_size);
+								self.fetcher.fetch(b, a, Box::new(f));
+							}
 						}
 					}
 				}
@@ -319,6 +375,11 @@ impl Updater {
 		}
 
 		let mut s = self.state.lock();
+
+		if s.latest != latest {
+			s.backoff = None;
+		}
+
 		s.latest = latest;
 		s.capability = capability;
 	}
@@ -333,22 +394,6 @@ impl ChainNotify for Updater {
 	}
 }
 
-impl fetch::urlhint::ContractClient for Updater {
-	fn registrar(&self) -> Result<Address, String> {
-		self.client.upgrade().ok_or_else(|| "Client not available".to_owned())?
-			.registrar_address()
-			.ok_or_else(|| "Registrar not available".into())
-	}
-
-	fn call(&self, address: Address, data: Bytes) -> BoxFuture<Bytes, String> {
-		future::done(
-			self.client.upgrade()
-				.ok_or_else(|| "Client not available".into())
-				.and_then(move |c| c.call_contract(BlockId::Latest, address, data))
-		).boxed()
-	}
-}
-
 impl Service for Updater {
 	fn capability(&self) -> CapState {
 		self.state.lock().capability
@@ -359,36 +404,40 @@ impl Service for Updater {
 	}
 
 	fn execute_upgrade(&self) -> bool {
-		(|| -> Result<bool, String> {
-			let mut s = self.state.lock();
-			if let Some(r) = s.ready.take() {
-				let p = Self::update_file_name(&r.version);
-				let n = self.updates_path("latest");
-				// TODO: creating then writing is a bit fragile. would be nice to make it atomic.
-				match fs::File::create(&n).and_then(|mut f| f.write_all(p.as_bytes())) {
-					Ok(_) => {
-						info!(target: "updater", "Completed upgrade to {}", &r.version);
-						s.installed = Some(r);
-						if let Some(ref h) = *self.exit_handler.lock() {
-							(*h)();
-						} else {
-							info!("Update installed; ready for restart.");
-						}
-						Ok(true)
-					}
-					Err(e) => {
-						s.ready = Some(r);
-						Err(format!("Unable to create soft-link for update {:?}", e))
-					}
-				}
-			} else {
+		let mut s = self.state.lock();
+		let ready = match s.ready.take() {
+			Some(ready) => ready,
+			None => {
 				warn!(target: "updater", "Execute upgrade called when no upgrade ready.");
-				Ok(false)
+				return false;
 			}
-		})().unwrap_or_else(|e| { warn!("{}", e); false })
+		};
+
+		let p = Self::update_file_name(&ready.version);
+		let n = self.updates_path("latest");
+
+		// TODO: creating then writing is a bit fragile. would be nice to make it atomic.
+		if let Err(e) = fs::File::create(&n).and_then(|mut f| f.write_all(p.as_bytes())) {
+			s.ready = Some(ready);
+			warn!(target: "updater", "Unable to create soft-link for update {:?}", e);
+			return false;
+		}
+
+		info!(target: "updater", "Completed upgrade to {}", &ready.version);
+		s.installed = Some(ready);
+		match *self.exit_handler.lock() {
+			Some(ref h) => (*h)(),
+			None => info!(target: "updater", "Update installed; ready for restart."),
+		}
+
+		true
 	}
 
-	fn version_info(&self) -> VersionInfo { self.this.clone() }
+	fn version_info(&self) -> VersionInfo {
+		self.this.clone()
+	}
 
-	fn info(&self) -> Option<OperationsInfo> { self.state.lock().latest.clone() }
+	fn info(&self) -> Option<OperationsInfo> {
+		self.state.lock().latest.clone()
+	}
 }
diff --git a/util/Cargo.toml b/util/Cargo.toml
deleted file mode 100644
index 0e485431ec376084dc9883261a38d8dd8b3246b8..0000000000000000000000000000000000000000
--- a/util/Cargo.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-[package]
-description = "Ethcore utility library"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "ethcore-util"
-version = "1.8.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[dependencies]
-log = "0.3"
-env_logger = "0.4"
-rustc-hex = "1.0"
-rand = "0.3.12"
-time = "0.1.34"
-rocksdb = { git = "https://github.com/paritytech/rust-rocksdb" }
-eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
-rust-crypto = "0.2.34"
-elastic-array = "0.9"
-rlp = { path = "rlp" }
-heapsize = "0.4"
-sha3 = { path = "sha3" }
-clippy = { version = "0.0.103", optional = true}
-ethcore-devtools = { path = "../devtools" }
-libc = "0.2.7"
-vergen = "0.1"
-target_info = "0.1"
-ethcore-bigint = { path = "bigint", features = ["heapsizeof"] }
-parking_lot = "0.4"
-ansi_term = "0.9"
-tiny-keccak= "1.0"
-ethcore-bloom-journal = { path = "bloom" }
-regex = "0.2"
-lru-cache = "0.1.0"
-ethcore-logger = { path = "../logger" }
-
-[features]
-default = []
-dev = ["clippy"]
-final = []
-
-[build-dependencies]
-vergen = "*"
-rustc_version = "0.1.0"
diff --git a/util/bigint/Cargo.toml b/util/bigint/Cargo.toml
deleted file mode 100644
index fcca56078c1db7abdee23fe8ea8ddf20bb644957..0000000000000000000000000000000000000000
--- a/util/bigint/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-description = "Large fixed-size integers and hash function outputs"
-homepage = "http://parity.io"
-repository = "https://github.com/paritytech/parity"
-license = "MIT/Apache-2.0"
-name = "ethcore-bigint"
-version = "0.1.3"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-bigint = "4.0"
-rustc-hex = "1.0"
-rand = "0.3.12"
-libc = "0.2"
-heapsize = { version = "0.4", optional = true }
-plain_hasher = { path = "../plain_hasher" }
-
-[features]
-x64asm_arithmetic=[]
-rust_arithmetic=[]
-heapsizeof = ["heapsize", "bigint/heapsizeof"]
diff --git a/util/bigint/LICENSE-APACHE2 b/util/bigint/LICENSE-APACHE2
deleted file mode 100644
index 16fe87b06e802f094b3fbb0894b137bca2b16ef1..0000000000000000000000000000000000000000
--- a/util/bigint/LICENSE-APACHE2
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/util/bigint/LICENSE-MIT b/util/bigint/LICENSE-MIT
deleted file mode 100644
index cd8fdd2b9c6b9f6dec0c6dbf72ad38f3a8eb64b2..0000000000000000000000000000000000000000
--- a/util/bigint/LICENSE-MIT
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015-2017 Parity Technologies
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/util/bigint/README.md b/util/bigint/README.md
deleted file mode 100644
index 86cf41aab7578a4079b511ba4b2fadf187ecfa9c..0000000000000000000000000000000000000000
--- a/util/bigint/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Bigint
-
-Big numbers and hashes
-
-## License
-
-Unlike most parts of Parity, which fall under the GPLv3, this package is dual-licensed under MIT/Apache2 at the user's choice.
-Find the associated license files in this directory as `LICENSE-MIT` and `LICENSE-APACHE2` respectively.
diff --git a/util/bigint/license-header b/util/bigint/license-header
deleted file mode 100644
index 03df169c8be2de5fc58938dd2593888f3da115a9..0000000000000000000000000000000000000000
--- a/util/bigint/license-header
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2015-2017 Parity Technologies
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
diff --git a/util/bigint/src/hash.rs b/util/bigint/src/hash.rs
deleted file mode 100644
index 316062bc40657a072f6387373a4a461bb3081a93..0000000000000000000000000000000000000000
--- a/util/bigint/src/hash.rs
+++ /dev/null
@@ -1,526 +0,0 @@
-// Copyright 2015-2017 Parity Technologies
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! General hash types, a fixed-size raw-data type used as the output of hash functions.
-
-use std::{ops, fmt, cmp, str};
-use std::cmp::{min, Ordering};
-use std::ops::{Deref, DerefMut, BitXor, BitAnd, BitOr, IndexMut, Index};
-use std::hash::{Hash, Hasher, BuildHasherDefault};
-use std::collections::{HashMap, HashSet};
-use rand::{Rand, Rng};
-use rand::os::OsRng;
-use rustc_hex::{FromHex, FromHexError};
-use plain_hasher::PlainHasher;
-use bigint::U256;
-use libc::{c_void, memcmp};
-
-/// Return `s` without the `0x` at the beginning of it, if any.
-pub fn clean_0x(s: &str) -> &str {
-	if s.starts_with("0x") {
-		&s[2..]
-	} else {
-		s
-	}
-}
-
-macro_rules! impl_hash {
-	($from: ident, $size: expr) => {
-		#[repr(C)]
-		/// Unformatted binary data of fixed length.
-		pub struct $from (pub [u8; $size]);
-
-
-		impl From<[u8; $size]> for $from {
-			fn from(bytes: [u8; $size]) -> Self {
-				$from(bytes)
-			}
-		}
-
-		impl From<$from> for [u8; $size] {
-			fn from(s: $from) -> Self {
-				s.0
-			}
-		}
-
-		impl Deref for $from {
-			type Target = [u8];
-
-			#[inline]
-			fn deref(&self) -> &[u8] {
-				&self.0
-			}
-		}
-
-		impl AsRef<[u8]> for $from {
-			#[inline]
-			fn as_ref(&self) -> &[u8] {
-				&self.0
-			}
-		}
-
-		impl DerefMut for $from {
-			#[inline]
-			fn deref_mut(&mut self) -> &mut [u8] {
-				&mut self.0
-			}
-		}
-
-		impl $from {
-			/// Create a new, zero-initialised, instance.
-			pub fn new() -> $from {
-				$from([0; $size])
-			}
-
-			/// Synonym for `new()`. Prefer to new as it's more readable.
-			pub fn zero() -> $from {
-				$from([0; $size])
-			}
-
-			/// Create a new, cryptographically random, instance.
-			pub fn random() -> $from {
-				let mut hash = $from::new();
-				hash.randomize();
-				hash
-			}
-
-			/// Assign self have a cryptographically random value.
-			pub fn randomize(&mut self) {
-				let mut rng = OsRng::new().unwrap();
-				*self= $from::rand(&mut rng);
-			}
-
-			/// Get the size of this object in bytes.
-			pub fn len() -> usize {
-				$size
-			}
-
-			#[inline]
-			/// Assign self to be of the same value as a slice of bytes of length `len()`.
-			pub fn clone_from_slice(&mut self, src: &[u8]) -> usize {
-				let min = cmp::min($size, src.len());
-				self.0[..min].copy_from_slice(&src[..min]);
-				min
-			}
-
-			/// Convert a slice of bytes of length `len()` to an instance of this type.
-			pub fn from_slice(src: &[u8]) -> Self {
-				let mut r = Self::new();
-				r.clone_from_slice(src);
-				r
-			}
-
-			/// Copy the data of this object into some mutable slice of length `len()`.
-			pub fn copy_to(&self, dest: &mut[u8]) {
-				let min = cmp::min($size, dest.len());
-				dest[..min].copy_from_slice(&self.0[..min]);
-			}
-
-			/// Returns `true` if all bits set in `b` are also set in `self`.
-			pub fn contains<'a>(&'a self, b: &'a Self) -> bool {
-				&(b & self) == b
-			}
-
-			/// Returns `true` if no bits are set.
-			pub fn is_zero(&self) -> bool {
-				self.eq(&Self::new())
-			}
-
-			/// Returns the lowest 8 bytes interpreted as a BigEndian integer.
-			pub fn low_u64(&self) -> u64 {
-				let mut ret = 0u64;
-				for i in 0..min($size, 8) {
-					ret |= (self.0[$size - 1 - i] as u64) << (i * 8);
-				}
-				ret
-			}
-		}
-
-		impl str::FromStr for $from {
-			type Err = FromHexError;
-
-			fn from_str(s: &str) -> Result<$from, FromHexError> {
-				let a = s.from_hex()?;
-				if a.len() != $size {
-					return Err(FromHexError::InvalidHexLength);
-				}
-
-				let mut ret = [0;$size];
-				ret.copy_from_slice(&a);
-				Ok($from(ret))
-			}
-		}
-
-		impl fmt::Debug for $from {
-			fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-				for i in &self.0[..] {
-					write!(f, "{:02x}", i)?;
-				}
-				Ok(())
-			}
-		}
-
-		impl fmt::Display for $from {
-			fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-				for i in &self.0[0..2] {
-					write!(f, "{:02x}", i)?;
-				}
-				write!(f, "…")?;
-				for i in &self.0[$size - 2..$size] {
-					write!(f, "{:02x}", i)?;
-				}
-				Ok(())
-			}
-		}
-
-		impl Copy for $from {}
-		#[cfg_attr(feature="dev", allow(expl_impl_clone_on_copy))]
-		impl Clone for $from {
-			fn clone(&self) -> $from {
-				let mut ret = $from::new();
-				ret.0.copy_from_slice(&self.0);
-				ret
-			}
-		}
-
-		impl Eq for $from {}
-
-		impl PartialEq for $from {
-			fn eq(&self, other: &Self) -> bool {
-				unsafe { memcmp(self.0.as_ptr() as *const c_void, other.0.as_ptr() as *const c_void, $size) == 0 }
-			}
-		}
-
-		impl Ord for $from {
-			fn cmp(&self, other: &Self) -> Ordering {
-				let r = unsafe { memcmp(self.0.as_ptr() as *const c_void, other.0.as_ptr() as *const c_void, $size) };
-				if r < 0 { return Ordering::Less }
-				if r > 0 { return Ordering::Greater }
-				return Ordering::Equal;
-			}
-		}
-
-		impl PartialOrd for $from {
-			fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-				Some(self.cmp(other))
-			}
-		}
-
-		impl Hash for $from {
-			fn hash<H>(&self, state: &mut H) where H: Hasher {
-				state.write(&self.0);
-				state.finish();
-			}
-		}
-
-		impl Index<usize> for $from {
-			type Output = u8;
-
-			fn index(&self, index: usize) -> &u8 {
-				&self.0[index]
-			}
-		}
-		impl IndexMut<usize> for $from {
-			fn index_mut(&mut self, index: usize) -> &mut u8 {
-				&mut self.0[index]
-			}
-		}
-		impl Index<ops::Range<usize>> for $from {
-			type Output = [u8];
-
-			fn index(&self, index: ops::Range<usize>) -> &[u8] {
-				&self.0[index]
-			}
-		}
-		impl IndexMut<ops::Range<usize>> for $from {
-			fn index_mut(&mut self, index: ops::Range<usize>) -> &mut [u8] {
-				&mut self.0[index]
-			}
-		}
-		impl Index<ops::RangeFull> for $from {
-			type Output = [u8];
-
-			fn index(&self, _index: ops::RangeFull) -> &[u8] {
-				&self.0
-			}
-		}
-		impl IndexMut<ops::RangeFull> for $from {
-			fn index_mut(&mut self, _index: ops::RangeFull) -> &mut [u8] {
-				&mut self.0
-			}
-		}
-
-		/// `BitOr` on references
-		impl<'a> BitOr for &'a $from {
-			type Output = $from;
-
-			fn bitor(self, rhs: Self) -> Self::Output {
-				let mut ret: $from = $from::default();
-				for i in 0..$size {
-					ret.0[i] = self.0[i] | rhs.0[i];
-				}
-				ret
-			}
-		}
-
-		/// Moving `BitOr`
-		impl BitOr for $from {
-			type Output = $from;
-
-			fn bitor(self, rhs: Self) -> Self::Output {
-				&self | &rhs
-			}
-		}
-
-		/// `BitAnd` on references
-		impl <'a> BitAnd for &'a $from {
-			type Output = $from;
-
-			fn bitand(self, rhs: Self) -> Self::Output {
-				let mut ret: $from = $from::default();
-				for i in 0..$size {
-					ret.0[i] = self.0[i] & rhs.0[i];
-				}
-				ret
-			}
-		}
-
-		/// Moving `BitAnd`
-		impl BitAnd for $from {
-			type Output = $from;
-
-			fn bitand(self, rhs: Self) -> Self::Output {
-				&self & &rhs
-			}
-		}
-
-		/// `BitXor` on references
-		impl <'a> BitXor for &'a $from {
-			type Output = $from;
-
-			fn bitxor(self, rhs: Self) -> Self::Output {
-				let mut ret: $from = $from::default();
-				for i in 0..$size {
-					ret.0[i] = self.0[i] ^ rhs.0[i];
-				}
-				ret
-			}
-		}
-
-		/// Moving `BitXor`
-		impl BitXor for $from {
-			type Output = $from;
-
-			fn bitxor(self, rhs: Self) -> Self::Output {
-				&self ^ &rhs
-			}
-		}
-
-		impl $from {
-			/// Get a hex representation.
-			pub fn hex(&self) -> String {
-				format!("{:?}", self)
-			}
-		}
-
-		impl Default for $from {
-			fn default() -> Self { $from::new() }
-		}
-
-		impl From<u64> for $from {
-			fn from(mut value: u64) -> $from {
-				let mut ret = $from::new();
-				for i in 0..8 {
-					if i < $size {
-						ret.0[$size - i - 1] = (value & 0xff) as u8;
-						value >>= 8;
-					}
-				}
-				ret
-			}
-		}
-
-		impl From<&'static str> for $from {
-			fn from(s: &'static str) -> $from {
-				let s = clean_0x(s);
-				if s.len() % 2 == 1 {
-					("0".to_owned() + s).parse().unwrap()
-				} else {
-					s.parse().unwrap()
-				}
-			}
-		}
-
-		impl<'a> From<&'a [u8]> for $from {
-			fn from(s: &'a [u8]) -> $from {
-				$from::from_slice(s)
-			}
-		}
-
-		impl Rand for $from {
-			fn rand<R: Rng>(r: &mut R) -> Self {
-				let mut hash = $from::new();
-				r.fill_bytes(&mut hash.0);
-				hash
-			}
-		}
-	}
-}
-
-impl From<U256> for H256 {
-	fn from(value: U256) -> H256 {
-		let mut ret = H256::new();
-		value.to_big_endian(&mut ret);
-		ret
-	}
-}
-
-impl<'a> From<&'a U256> for H256 {
-	fn from(value: &'a U256) -> H256 {
-		let mut ret: H256 = H256::new();
-		value.to_big_endian(&mut ret);
-		ret
-	}
-}
-
-impl From<H256> for U256 {
-	fn from(value: H256) -> U256 {
-		U256::from(&value)
-	}
-}
-
-impl<'a> From<&'a H256> for U256 {
-	fn from(value: &'a H256) -> U256 {
-		U256::from(value.as_ref() as &[u8])
-	}
-}
-
-impl From<H256> for H160 {
-	fn from(value: H256) -> H160 {
-		let mut ret = H160::new();
-		ret.0.copy_from_slice(&value[12..32]);
-		ret
-	}
-}
-
-impl From<H256> for H64 {
-	fn from(value: H256) -> H64 {
-		let mut ret = H64::new();
-		ret.0.copy_from_slice(&value[20..28]);
-		ret
-	}
-}
-
-impl From<H160> for H256 {
-	fn from(value: H160) -> H256 {
-		let mut ret = H256::new();
-		ret.0[12..32].copy_from_slice(&value);
-		ret
-	}
-}
-
-impl<'a> From<&'a H160> for H256 {
-	fn from(value: &'a H160) -> H256 {
-		let mut ret = H256::new();
-		ret.0[12..32].copy_from_slice(value);
-		ret
-	}
-}
-
-impl_hash!(H32, 4);
-impl_hash!(H64, 8);
-impl_hash!(H128, 16);
-impl_hash!(H160, 20);
-impl_hash!(H256, 32);
-impl_hash!(H264, 33);
-impl_hash!(H512, 64);
-impl_hash!(H520, 65);
-impl_hash!(H1024, 128);
-impl_hash!(H2048, 256);
-
-#[cfg(feature="heapsizeof")]
-known_heap_size!(0, H32, H64, H128, H160, H256, H264, H512, H520, H1024, H2048);
-// Specialized HashMap and HashSet
-
-/// Specialized version of `HashMap` with H256 keys and fast hashing function.
-pub type H256FastMap<T> = HashMap<H256, T, BuildHasherDefault<PlainHasher>>;
-/// Specialized version of `HashSet` with H256 keys and fast hashing function.
-pub type H256FastSet = HashSet<H256, BuildHasherDefault<PlainHasher>>;
-
-#[cfg(test)]
-mod tests {
-	use hash::*;
-	use std::str::FromStr;
-
-	#[test]
-	fn hasher_alignment() {
-		use std::mem::align_of;
-		assert_eq!(align_of::<u64>(), align_of::<PlainHasher>());
-	}
-
-	#[test]
-	#[cfg_attr(feature="dev", allow(eq_op))]
-	fn hash() {
-		let h = H64([0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef]);
-		assert_eq!(H64::from_str("0123456789abcdef").unwrap(), h);
-		assert_eq!(format!("{}", h), "0123…cdef");
-		assert_eq!(format!("{:?}", h), "0123456789abcdef");
-		assert_eq!(h.hex(), "0123456789abcdef");
-		assert!(h == h);
-		assert!(h != H64([0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xee]));
-		assert!(h != H64([0; 8]));
-	}
-
-	#[test]
-	fn hash_bitor() {
-		let a = H64([1; 8]);
-		let b = H64([2; 8]);
-		let c = H64([3; 8]);
-
-		// borrow
-		assert_eq!(&a | &b, c);
-
-		// move
-		assert_eq!(a | b, c);
-	}
-
-	#[test]
-	fn from_and_to_address() {
-		let address: H160 = "ef2d6d194084c2de36e0dabfce45d046b37d1106".into();
-		let h = H256::from(address.clone());
-		let a = H160::from(h);
-		assert_eq!(address, a);
-	}
-
-	#[test]
-	fn from_u64() {
-		assert_eq!(H128::from(0x1234567890abcdef), H128::from_str("00000000000000001234567890abcdef").unwrap());
-		assert_eq!(H64::from(0x1234567890abcdef), H64::from_str("1234567890abcdef").unwrap());
-		assert_eq!(H32::from(0x1234567890abcdef), H32::from_str("90abcdef").unwrap());
-	}
-
-	#[test]
-	fn from_str() {
-		assert_eq!(H64::from(0x1234567890abcdef), H64::from("0x1234567890abcdef"));
-		assert_eq!(H64::from(0x1234567890abcdef), H64::from("1234567890abcdef"));
-		assert_eq!(H64::from(0x234567890abcdef), H64::from("0x234567890abcdef"));
-	}
-
-	#[test]
-	fn from_and_to_u256() {
-		let u: U256 = 0x123456789abcdef0u64.into();
-		let h = H256::from(u);
-		assert_eq!(H256::from(u), H256::from("000000000000000000000000000000000000000000000000123456789abcdef0"));
-		let h_ref = H256::from(&u);
-		assert_eq!(h, h_ref);
-		let r_ref: U256 = From::from(&h);
-		assert_eq!(r_ref, u);
-		let r: U256 = From::from(h);
-		assert_eq!(r, u);
-	}
-}
diff --git a/util/bigint/src/lib.rs b/util/bigint/src/lib.rs
deleted file mode 100644
index 1b1b5d4888a5a20095455ea8279519fe48a417c9..0000000000000000000000000000000000000000
--- a/util/bigint/src/lib.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015-2017 Parity Technologies
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Efficient large, fixed-size big integers and hashes.
-
-#![cfg_attr(asm_available, feature(asm))]
-
-extern crate rand;
-extern crate rustc_hex;
-extern crate bigint;
-extern crate libc;
-extern crate plain_hasher;
-
-#[cfg(feature="heapsizeof")]
-#[macro_use]
-extern crate heapsize;
-
-pub mod hash;
-
-/// A prelude module for re-exporting all the types defined in this crate.
-///
-/// ```rust
-/// use ethcore_bigint::prelude::*;
-///
-/// let x: U256 = U256::zero();
-/// let y = x + 1.into();
-/// ```
-pub mod prelude {
-	pub use ::bigint::*;
-	pub use ::hash::*;
-}
diff --git a/util/bloom/Cargo.toml b/util/bloom/Cargo.toml
index 99464879fac9e3752399db0565ce5fd02e394c4f..8c366a8522804e12428348369ee3fd70ba9fdfca 100644
--- a/util/bloom/Cargo.toml
+++ b/util/bloom/Cargo.toml
@@ -1,4 +1,4 @@
-[project]
+[package]
 name = "ethcore-bloom-journal"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
diff --git a/util/bloom/src/lib.rs b/util/bloom/src/lib.rs
index 91897ed447ecde7b009c1f00ae53f04dfd90e5c6..22a2cbc2aabb74d4b520c88d5bc6540035f438f3 100644
--- a/util/bloom/src/lib.rs
+++ b/util/bloom/src/lib.rs
@@ -24,9 +24,6 @@ use std::hash::{Hash, Hasher};
 use std::collections::HashSet;
 use siphasher::sip::SipHasher;
 
-// TODO [ToDr] Both hashers are exactly the same - no point to keep two.
-const NUMBER_OF_HASHERS: usize = 2;
-
 /// BitVec structure with journalling
 /// Every time any of the blocks is getting set it's index is tracked
 /// and can be then drained by `drain` method
@@ -80,8 +77,6 @@ pub struct Bloom {
 	bitmap: BitVecJournal,
 	bitmap_bits: u64,
 	k_num: u32,
-	// TODO [ToDr] Both hashers are exactly the same - no point to keep two.
-	sips: [SipHasher; NUMBER_OF_HASHERS],
 }
 
 impl Bloom {
@@ -93,12 +88,10 @@ impl Bloom {
 		let bitmap_bits = (bitmap_size as u64) * 8u64;
 		let k_num = Bloom::optimal_k_num(bitmap_bits, items_count);
 		let bitmap = BitVecJournal::new(bitmap_bits as usize);
-		let sips = [SipHasher::new(), SipHasher::new()];
 		Bloom {
 			bitmap: bitmap,
 			bitmap_bits: bitmap_bits,
 			k_num: k_num,
-			sips: sips,
 		}
 	}
 
@@ -107,12 +100,10 @@ impl Bloom {
 		let bitmap_size = parts.len() * 8;
 		let bitmap_bits = (bitmap_size as u64) * 8u64;
 		let bitmap = BitVecJournal::from_parts(parts);
-		let sips = [SipHasher::new(), SipHasher::new()];
 		Bloom {
 			bitmap: bitmap,
 			bitmap_bits: bitmap_bits,
 			k_num: k_num,
-			sips: sips,
 		}
 	}
 
@@ -139,9 +130,9 @@ impl Bloom {
 	pub fn set<T>(&mut self, item: T)
 		where T: Hash
 	{
-		let mut hashes = [0u64, 0u64];
+		let base_hash = Bloom::sip_hash(&item);
 		for k_i in 0..self.k_num {
-			let bit_offset = (self.bloom_hash(&mut hashes, &item, k_i) % self.bitmap_bits) as usize;
+			let bit_offset = (Bloom::bloom_hash(base_hash, k_i) % self.bitmap_bits) as usize;
 			self.bitmap.set(bit_offset);
 		}
 	}
@@ -151,9 +142,9 @@ impl Bloom {
 	pub fn check<T>(&self, item: T) -> bool
 		where T: Hash
 	{
-		let mut hashes = [0u64, 0u64];
+		let base_hash = Bloom::sip_hash(&item);
 		for k_i in 0..self.k_num {
-			let bit_offset = (self.bloom_hash(&mut hashes, &item, k_i) % self.bitmap_bits) as usize;
+			let bit_offset = (Bloom::bloom_hash(base_hash, k_i) % self.bitmap_bits) as usize;
 			if !self.bitmap.get(bit_offset) {
 				return false;
 			}
@@ -178,17 +169,20 @@ impl Bloom {
 		cmp::max(k_num, 1)
 	}
 
-	fn bloom_hash<T>(&self, hashes: &mut [u64; NUMBER_OF_HASHERS], item: &T, k_i: u32) -> u64
+	fn sip_hash<T>(item: &T) -> u64
 		where T: Hash
 	{
-		if k_i < NUMBER_OF_HASHERS as u32 {
-			let mut sip = self.sips[k_i as usize].clone();
-			item.hash(&mut sip);
-			let hash = sip.finish();
-			hashes[k_i as usize] = hash;
-			hash
+		let mut sip = SipHasher::new();
+		item.hash(&mut sip);
+		let hash = sip.finish();
+		hash
+	}
+
+	fn bloom_hash(base_hash: u64, k_i: u32) -> u64 {
+		if k_i < 2 {
+			base_hash
 		} else {
-			hashes[0].wrapping_add((k_i as u64).wrapping_mul(hashes[1]) % 0xffffffffffffffc5)
+			base_hash.wrapping_add((k_i as u64).wrapping_mul(base_hash) % 0xffffffffffffffc5)
 		}
 	}
 
@@ -218,6 +212,7 @@ pub struct BloomJournal {
 #[cfg(test)]
 mod tests {
 	use super::Bloom;
+	use std::collections::HashSet;
 
 	#[test]
 	fn get_set() {
@@ -248,4 +243,35 @@ mod tests {
 		// 2/8/64 = 0.00390625
 		assert!(full >= 0.0039f64 && full <= 0.004f64);
 	}
+
+	#[test]
+	fn hash_backward_compatibility_for_new() {
+		let ss = vec!["you", "should", "not", "break", "hash", "backward", "compatibility"];
+		let mut bloom = Bloom::new(16, 8);
+		for s in ss.iter() {
+			bloom.set(&s);
+		}
+
+		let drained_elems: HashSet<u64> = bloom.drain_journal().entries.into_iter().map(|t| t.1).collect();
+		let expected: HashSet<u64> = [2094615114573771027u64, 244675582389208413u64].iter().cloned().collect();
+		assert_eq!(drained_elems, expected);
+		assert_eq!(bloom.k_num, 12);
+	}
+
+	#[test]
+	fn hash_backward_compatibility_for_from_parts() {
+		let stored_state = vec![2094615114573771027u64, 244675582389208413u64];
+		let k_num = 12;
+		let bloom = Bloom::from_parts(&stored_state, k_num);
+
+		let ss = vec!["you", "should", "not", "break", "hash", "backward", "compatibility"];
+		let tt = vec!["this", "doesnot", "exist"];
+		for s in ss.iter() {
+			assert!(bloom.check(&s));
+		}
+		for s in tt.iter() {
+			assert!(!bloom.check(&s));
+		}
+
+	}
 }
diff --git a/util/bloomable/Cargo.toml b/util/bloomable/Cargo.toml
deleted file mode 100644
index f85b67943cd802ac4306e3d807d20b2cda6d30de..0000000000000000000000000000000000000000
--- a/util/bloomable/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "bloomable"
-version = "0.1.0"
-authors = ["debris <marek.kotewicz@gmail.com>"]
-
-[dependencies]
-ethcore-bigint = { path = "../bigint" }
-
-[dev-dependencies]
-tiny-keccak = "1.3"
diff --git a/util/bloomable/src/lib.rs b/util/bloomable/src/lib.rs
deleted file mode 100644
index 29a9abde5466190c4a36b215625b5c7e0dbbc33f..0000000000000000000000000000000000000000
--- a/util/bloomable/src/lib.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Bloom operations.
-
-extern crate ethcore_bigint;
-
-use std::mem;
-use std::ops::DerefMut;
-use ethcore_bigint::hash::{H64, H160, H256, H512, H520, H2048};
-
-/// Returns log2.
-pub fn log2(x: usize) -> u32 {
-	if x <= 1 {
-		return 0;
-	}
-
-	let n = x.leading_zeros();
-	mem::size_of::<usize>() as u32 * 8 - n
-}
-
-/// Bloom operations.
-pub trait Bloomable: Sized + Default + DerefMut<Target = [u8]> {
-	/// When interpreting self as a bloom output, augment (bit-wise OR) with the a bloomed version of `b`.
-	fn shift_bloomed<'a, T>(&'a mut self, b: &T) -> &'a mut Self where T: Bloomable;
-
-	/// Same as `shift_bloomed` except that `self` is consumed and a new value returned.
-	fn with_bloomed<T>(mut self, b: &T) -> Self where T: Bloomable {
-		self.shift_bloomed(b);
-		self
-	}
-
-	/// Construct new instance equal to the bloomed value of `b`.
-	fn from_bloomed<T>(b: &T) -> Self where T: Bloomable;
-
-	/// Bloom the current value using the bloom parameter `m`.
-	fn bloom_part<T>(&self, m: usize) -> T where T: Bloomable;
-
-	/// Check to see whether this hash, interpreted as a bloom, contains the value `b` when bloomed.
-	fn contains_bloomed<T>(&self, b: &T) -> bool where T: Bloomable;
-}
-
-macro_rules! impl_bloomable_for_hash {
-	($name: ident, $size: expr) => {
-		impl Bloomable for $name {
-			fn shift_bloomed<'a, T>(&'a mut self, b: &T) -> &'a mut Self where T: Bloomable {
-				let bp: Self = b.bloom_part($size);
-				let new_self = &bp | self;
-
-				self.0 = new_self.0;
-				self
-			}
-
-			fn bloom_part<T>(&self, m: usize) -> T where T: Bloomable + Default {
-				// numbers of bits
-				// TODO: move it to some constant
-				let p = 3;
-
-				let bloom_bits = m * 8;
-				let mask = bloom_bits - 1;
-				let bloom_bytes = (log2(bloom_bits) + 7) / 8;
-
-				// must be a power of 2
-				assert_eq!(m & (m - 1), 0);
-				// out of range
-				assert!(p * bloom_bytes <= $size);
-
-				// return type
-				let mut ret = T::default();
-
-				// 'ptr' to out slice
-				let mut ptr = 0;
-
-				// set p number of bits,
-				// p is equal 3 according to yellowpaper
-				for _ in 0..p {
-					let mut index = 0 as usize;
-					for _ in 0..bloom_bytes {
-						index = (index << 8) | self.0[ptr] as usize;
-						ptr += 1;
-					}
-					index &= mask;
-					ret[m - 1 - index / 8] |= 1 << (index % 8);
-				}
-
-				ret
-			}
-
-			fn contains_bloomed<T>(&self, b: &T) -> bool where T: Bloomable {
-				let bp: Self = b.bloom_part($size);
-				self.contains(&bp)
-			}
-
-			fn from_bloomed<T>(b: &T) -> Self where T: Bloomable {
-				b.bloom_part($size)
-			}
-		}
-	}
-}
-
-impl_bloomable_for_hash!(H64, 8);
-impl_bloomable_for_hash!(H160, 20);
-impl_bloomable_for_hash!(H256, 32);
-impl_bloomable_for_hash!(H512, 64);
-impl_bloomable_for_hash!(H520, 65);
-impl_bloomable_for_hash!(H2048, 256);
diff --git a/util/bloomable/tests/test.rs b/util/bloomable/tests/test.rs
deleted file mode 100644
index 85ced83e6e0485f37a5cb29dfadab65b49e6dc6d..0000000000000000000000000000000000000000
--- a/util/bloomable/tests/test.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-extern crate tiny_keccak;
-extern crate ethcore_bigint;
-extern crate bloomable;
-
-use ethcore_bigint::hash::{H160, H256, H2048};
-use bloomable::Bloomable;
-use tiny_keccak::keccak256;
-
-fn sha3(input: &[u8]) -> H256 {
-	keccak256(input).into()
-}
-
-#[test]
-fn shift_bloomed() {
-	let bloom: H2048 = "00000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020000000000000000000000000000000000000000000008000000001000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".into();
-	let address: H160 = "ef2d6d194084c2de36e0dabfce45d046b37d1106".into();
-	let topic: H256 = "02c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc".into();
-
-	let mut my_bloom = H2048::default();
-	assert!(!my_bloom.contains_bloomed(&sha3(&address)));
-	assert!(!my_bloom.contains_bloomed(&sha3(&topic)));
-
-	my_bloom.shift_bloomed(&sha3(&address));
-	assert!(my_bloom.contains_bloomed(&sha3(&address)));
-	assert!(!my_bloom.contains_bloomed(&sha3(&topic)));
-
-	my_bloom.shift_bloomed(&sha3(&topic));
-	assert_eq!(my_bloom, bloom);
-	assert!(my_bloom.contains_bloomed(&sha3(&address)));
-	assert!(my_bloom.contains_bloomed(&sha3(&topic)));
-}
diff --git a/js/wasm/ethkey/.gitignore b/util/bloomchain/.gitignore
similarity index 75%
rename from js/wasm/ethkey/.gitignore
rename to util/bloomchain/.gitignore
index a9d37c560c6ab8d4afbf47eda643e8c42e857716..d4f917d3d50d56523378d8c6d57fbe0ad068937f 100644
--- a/js/wasm/ethkey/.gitignore
+++ b/util/bloomchain/.gitignore
@@ -1,2 +1,3 @@
 target
 Cargo.lock
+*.swp
diff --git a/util/bloomchain/Cargo.toml b/util/bloomchain/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..a9bd8432c45cbd1f7a8b29e761b2769a7d59c6e9
--- /dev/null
+++ b/util/bloomchain/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+description = "Standalone blockchain bloom filter"
+homepage = "https://github.com/debris/bloomchain"
+name = "bloomchain"
+version = "0.2.0"
+authors = ["debris <marek.kotewicz@gmail.com>"]
+license = "MIT"
+keywords = ["ethereum", "ethcore", "bloom", "chain", "filter"]
+
+[dependencies]
+ethbloom = "0.4"
+
+[dev-dependencies]
+rustc-hex = "1.0"
+rand = "0.4"
diff --git a/util/bloomchain/README.md b/util/bloomchain/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..f5a1fafc8c1d58ff232b146db2b7a197717b5b26
--- /dev/null
+++ b/util/bloomchain/README.md
@@ -0,0 +1,9 @@
+# bloomchain
+Standalone blockchain bloom filter.
+
+[![Build Status][travis-image]][travis-url]
+
+[travis-image]: https://travis-ci.org/paritytech/bloomchain.svg?branch=master
+[travis-url]: https://travis-ci.org/paritytech/bloomchain
+
+[Documentation](http://paritytech.github.io/bloomchain/bloomchain/index.html)
diff --git a/util/bloomchain/src/chain.rs b/util/bloomchain/src/chain.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ba7bc21b356aeaef02711ce5dbc8d821fc6a6858
--- /dev/null
+++ b/util/bloomchain/src/chain.rs
@@ -0,0 +1,158 @@
+use std::collections::{HashMap, HashSet};
+use std::ops::Range;
+use number::Number;
+use position::{Position, Manager as PositionManager};
+use bloom::Bloom;
+use filter::Filter;
+use config::Config;
+use database::BloomDatabase;
+
+/// Prepares all bloom database operations.
+pub struct BloomChain<'a> {
+	positioner: PositionManager,
+	db: &'a BloomDatabase,
+}
+
+impl<'a> BloomChain<'a> {
+	/// Creates new bloom chain.
+	pub fn new(config: Config, db: &'a BloomDatabase) -> Self {
+		let positioner = PositionManager::new(config.elements_per_index, config.levels);
+
+		BloomChain {
+			positioner: positioner,
+			db: db,
+		}
+	}
+
+	/// Internal function which does bloom search recursively.
+	fn blocks(&self, range: &Range<Number>, bloom: &Bloom, level: usize, offset: usize) -> Option<Vec<usize>> {
+		let index = self.positioner.position(offset, level);
+
+		match self.db.bloom_at(&index) {
+			None => return None,
+			Some(level_bloom) => match level {
+				// if we are on the lowest level
+				0 if level_bloom.contains_bloom(bloom) => return Some(vec![offset]),
+				// return None if current level doesnt contain given bloom
+				_ if !level_bloom.contains_bloom(bloom) => return None,
+				// continue processing && go down
+				_ => ()
+			}
+		};
+
+		let level_size = self.positioner.level_size(level - 1);
+		let from_position = self.positioner.position(range.start, level - 1);
+		let to_position = self.positioner.position(range.end, level - 1);
+		let res: Vec<usize> = self.positioner.lower_level_positions(&index).into_iter()
+			// chose only blooms in range
+			.filter(|li| li.index >= from_position.index && li.index <= to_position.index)
+			// map them to offsets
+			.map(|li| li.index * level_size)
+			// get all blocks that may contain our bloom
+			// filter existing ones
+			.filter_map(|off| self.blocks(range, bloom, level - 1, off))
+			// flatten nested structures
+			.flat_map(|v| v)
+			.collect();
+		Some(res)
+	}
+
+	/// Inserts the bloom at all filter levels.
+	pub fn insert(&self, number: Number, bloom: Bloom) -> HashMap<Position, Bloom> {
+		let mut result: HashMap<Position, Bloom> = HashMap::new();
+
+		for level in 0..self.positioner.levels() {
+			let position = self.positioner.position(number, level);
+			let new_bloom = match self.db.bloom_at(&position) {
+				Some(mut old_bloom) => {
+					old_bloom.accrue_bloom(&bloom);
+					old_bloom
+				},
+				None => bloom.clone(),
+			};
+
+			result.insert(position, new_bloom);
+		}
+
+		result
+	}
+
+	/// Resets data in range.
+	/// Inserts new data.
+	/// Inserted data may exceed reseted range.
+	pub fn replace(&self, range: &Range<Number>, blooms: Vec<Bloom>) -> HashMap<Position, Bloom> {
+		let mut result: HashMap<Position, Bloom> = HashMap::new();
+
+		// insert all new blooms at level 0
+		for (i, bloom) in blooms.iter().enumerate() {
+			result.insert(self.positioner.position(range.start + i, 0), bloom.clone());
+		}
+
+		// reset the rest of blooms
+		for reset_number in range.start + blooms.len()..(range.end + 1) {
+			result.insert(self.positioner.position(reset_number, 0), Bloom::default());
+		}
+
+		for level in 1..self.positioner.levels() {
+			for i in 0..blooms.len() {
+
+				let index = self.positioner.position(range.start + i, level);
+				let new_bloom = {
+					// use new blooms before db blooms where necessary
+					let bloom_at = | index | { result.get(&index).cloned().or_else(|| self.db.bloom_at(&index)) };
+
+					self.positioner.lower_level_positions(&index)
+						.into_iter()
+						// get blooms
+						// filter existing ones
+						.filter_map(bloom_at)
+						// BitOr all of them
+						.fold(Bloom::default(), |mut acc, bloom| {
+							acc.accrue_bloom(&bloom);
+							acc
+						})
+				};
+
+				result.insert(index, new_bloom);
+			}
+		}
+
+		result
+	}
+
+	/// Returns all numbers with given bloom.
+	pub fn with_bloom(&self, range: &Range<Number>, bloom: &Bloom) -> Vec<Number> {
+		let mut result = vec![];
+		// lets start from highest level
+		let max_level = self.positioner.max_level();
+		let level_size = self.positioner.level_size(max_level);
+		let from_position = self.positioner.position(range.start, max_level);
+		let to_position = self.positioner.position(range.end, max_level);
+
+		for index in from_position.index..to_position.index + 1 {
+			// offset will be used to calculate where we are right now
+			let offset = level_size * index;
+
+			// go doooown!
+			if let Some(blocks) = self.blocks(range, bloom, max_level, offset) {
+				result.extend(blocks);
+			}
+		}
+
+		result
+	}
+
+	/// Filter the chain returing all numbers matching the filter.
+	pub fn filter(&self, filter: &Filter) -> Vec<Number> {
+		let range = filter.range();
+		let mut blocks = filter.bloom_possibilities()
+			.into_iter()
+			.flat_map(|ref bloom| self.with_bloom(&range, bloom))
+			.collect::<HashSet<Number>>()
+			.into_iter()
+			.collect::<Vec<Number>>();
+
+		blocks.sort();
+		blocks
+	}
+}
diff --git a/util/bloomchain/src/config.rs b/util/bloomchain/src/config.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3e729922a17962015a8b89d42377d17ad61b01be
--- /dev/null
+++ b/util/bloomchain/src/config.rs
@@ -0,0 +1,17 @@
+/// `BloomChain` configuration.
+#[derive(Debug, PartialEq, Clone, Copy)]
+pub struct Config {
+	/// Number of levels.
+	pub levels: usize,
+	/// Number of elements in a single index.
+	pub elements_per_index: usize,
+}
+
+impl Default for Config {
+	fn default() -> Self {
+		Config {
+			levels: 3,
+			elements_per_index: 16,
+		}
+	}
+}
diff --git a/util/bloomchain/src/database.rs b/util/bloomchain/src/database.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9aba41e7c6427c977340986775263e66fbb4fd10
--- /dev/null
+++ b/util/bloomchain/src/database.rs
@@ -0,0 +1,7 @@
+use position::Position;
+use bloom::Bloom;
+
+/// Readonly `Bloom` database.
+pub trait BloomDatabase {
+	fn bloom_at(&self, position: &Position) -> Option<Bloom>;
+}
diff --git a/util/bloomchain/src/filter.rs b/util/bloomchain/src/filter.rs
new file mode 100644
index 0000000000000000000000000000000000000000..06d657ba4427483c5d91c5eb1a82f5068ee6e7df
--- /dev/null
+++ b/util/bloomchain/src/filter.rs
@@ -0,0 +1,11 @@
+use std::ops::Range;
+use bloom::Bloom;
+use number::Number;
+
+/// Should be used to filter blocks from `BloomChain`.
+pub trait Filter {
+	/// All bloom possibilities that we are searching for.
+	fn bloom_possibilities(&self) -> Vec<Bloom>;
+	/// Range of search.
+	fn range(&self) -> Range<Number>;
+}
diff --git a/util/bloomchain/src/group/bridge.rs b/util/bloomchain/src/group/bridge.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b01650157c6326755b9df6d6f7baf1a9964d3e54
--- /dev/null
+++ b/util/bloomchain/src/group/bridge.rs
@@ -0,0 +1,31 @@
+use bloom::Bloom;
+use config::Config;
+use database::BloomDatabase;
+use position::Position;
+use group::position::Manager as PositionManager;
+use super::BloomGroupDatabase;
+
+/// Bridge between `BloomDatabase` and `BloomGroupDatabase`.
+pub struct GroupDatabaseBridge<'a> {
+	positioner: PositionManager,	
+	db: &'a BloomGroupDatabase,
+}
+
+impl<'a> GroupDatabaseBridge<'a> {
+	pub fn new(config: Config, db: &'a BloomGroupDatabase) -> Self {
+		let positioner = PositionManager::new(config.elements_per_index);
+
+		GroupDatabaseBridge {
+			positioner: positioner,
+			db: db,
+		}
+	}
+}
+
+impl<'a> BloomDatabase for GroupDatabaseBridge<'a> {
+	fn bloom_at(&self, position: &Position) -> Option<Bloom> {
+		let position = self.positioner.position(position);
+		self.db.blooms_at(&position.group)
+			.and_then(|group| group.blooms.into_iter().nth(position.number))
+	}
+}
diff --git a/util/bloomchain/src/group/chain.rs b/util/bloomchain/src/group/chain.rs
new file mode 100644
index 0000000000000000000000000000000000000000..cfd7796f4d08d6fff46d708dbd478ea9b0ff5d57
--- /dev/null
+++ b/util/bloomchain/src/group/chain.rs
@@ -0,0 +1,70 @@
+use std::collections::HashMap;
+use std::ops::Range;
+use bloom::Bloom;
+use chain::BloomChain;
+use config::Config;
+use number::Number;
+use filter::Filter;
+use position::Position as BloomPosition;
+use super::{GroupDatabaseBridge, BloomGroupDatabase, BloomGroup, GroupPosition};
+use super::position::Manager as PositionManager;
+
+/// Performs all bloom database operations using `BloomGroup`s.
+pub struct BloomGroupChain<'a> {
+	config: Config,
+	db: &'a BloomGroupDatabase,
+	bridge: GroupDatabaseBridge<'a>,
+}
+
+impl<'a> BloomGroupChain<'a> {
+	pub fn new(config: Config, db: &'a BloomGroupDatabase) -> Self {
+		let bridge = GroupDatabaseBridge::new(config, db);
+
+		BloomGroupChain {
+			config: config,
+			db: db,
+			bridge: bridge,
+		}
+	}
+
+	fn group_blooms(&self, blooms: HashMap<BloomPosition, Bloom>) -> HashMap<GroupPosition, BloomGroup> {
+		let positioner = PositionManager::new(self.config.elements_per_index);
+		blooms.into_iter()
+			.fold(HashMap::new(), | mut acc, (position, bloom) | {
+				{
+					let position = positioner.position(&position);
+					let group = acc
+						.entry(position.group.clone())
+						.or_insert_with(|| self.db
+							.blooms_at(&position.group)
+							.unwrap_or_else(|| BloomGroup::new(self.config.elements_per_index))
+						);
+					assert_eq!(self.config.elements_per_index, group.blooms.len());
+					group.blooms[position.number] = bloom;
+				}
+				acc
+			})
+	}
+
+	pub fn insert(&self, number: Number, bloom: Bloom) -> HashMap<GroupPosition, BloomGroup> {
+		let bloom_chain = BloomChain::new(self.config, &self.bridge);
+		let modified_blooms = bloom_chain.insert(number, bloom);
+		self.group_blooms(modified_blooms)
+	}
+
+	pub fn replace(&self, range: &Range<Number>, blooms: Vec<Bloom>) -> HashMap<GroupPosition, BloomGroup> {
+		let bloom_chain = BloomChain::new(self.config, &self.bridge);
+		let modified_blooms = bloom_chain.replace(range, blooms);
+		self.group_blooms(modified_blooms)
+	}
+
+	pub fn with_bloom(&self, range: &Range<Number>, bloom: &Bloom) -> Vec<Number> {
+		let bloom_chain = BloomChain::new(self.config, &self.bridge);
+		bloom_chain.with_bloom(range, bloom)
+	}
+
+	pub fn filter(&self, filter: &Filter) -> Vec<Number> {
+		let bloom_chain = BloomChain::new(self.config, &self.bridge);
+		bloom_chain.filter(filter)
+	}
+}
diff --git a/util/bloomchain/src/group/database.rs b/util/bloomchain/src/group/database.rs
new file mode 100644
index 0000000000000000000000000000000000000000..494184f3ebcff6d80616b0f6059840f091946249
--- /dev/null
+++ b/util/bloomchain/src/group/database.rs
@@ -0,0 +1,6 @@
+use group::{GroupPosition, BloomGroup};
+
+/// Readonly `BloomGroup` database.
+pub trait BloomGroupDatabase {
+	fn blooms_at(&self, position: &GroupPosition) -> Option<BloomGroup>;
+}
diff --git a/util/bloomchain/src/group/group.rs b/util/bloomchain/src/group/group.rs
new file mode 100644
index 0000000000000000000000000000000000000000..084c8f8e48e044d99f4919178af42d0cb6cb6deb
--- /dev/null
+++ b/util/bloomchain/src/group/group.rs
@@ -0,0 +1,17 @@
+use bloom::Bloom;
+
+/// Group of blooms that are in the same index.
+#[derive(Debug, Clone)]
+pub struct BloomGroup {
+	pub blooms: Vec<Bloom>,
+}
+
+impl BloomGroup {
+	pub fn new(size: usize) -> Self {
+		let blooms = (0..size).into_iter().map(|_| Bloom::default()).collect();
+
+		BloomGroup {
+			blooms: blooms
+		}
+	}
+}
diff --git a/util/bloomchain/src/group/mod.rs b/util/bloomchain/src/group/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b6cabf628fca25b61594e1bf35371140dd452f21
--- /dev/null
+++ b/util/bloomchain/src/group/mod.rs
@@ -0,0 +1,16 @@
+//! Bloom grouping.
+//! 
+//! Optimization gathering together blooms that are in the same index and are likely to be retrived together.
+
+mod bridge;
+mod chain;
+mod database;
+mod group;
+mod position;
+
+pub use self::bridge::GroupDatabaseBridge;
+pub use self::chain::BloomGroupChain;
+
+pub use self::database::BloomGroupDatabase;
+pub use self::group::BloomGroup;
+pub use self::position::GroupPosition;
diff --git a/util/bloomchain/src/group/position/manager.rs b/util/bloomchain/src/group/position/manager.rs
new file mode 100644
index 0000000000000000000000000000000000000000..611a5bb784c32c0929ff128b71b8a4ab8fa2a1a5
--- /dev/null
+++ b/util/bloomchain/src/group/position/manager.rs
@@ -0,0 +1,28 @@
+use super::{Position, GroupPosition};
+use position::Position as BloomPosition;
+
+pub struct Manager {
+	index_size: usize
+}
+
+impl Manager {
+	pub fn new(index_size: usize) -> Self {
+		Manager {
+			index_size: index_size
+		}
+	}
+
+	pub fn group_position(&self, pos: &BloomPosition) -> GroupPosition {
+		GroupPosition {
+			level: pos.level,
+			index: pos.index / self.index_size,
+		}
+	}
+
+	pub fn position(&self, pos: &BloomPosition) -> Position {
+		Position {
+			group: self.group_position(pos),
+			number: pos.index % self.index_size,	
+		}
+	}
+}
diff --git a/util/bloomchain/src/group/position/mod.rs b/util/bloomchain/src/group/position/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..fc95de4dd057bf01b783809f33f3b181e14ace3f
--- /dev/null
+++ b/util/bloomchain/src/group/position/mod.rs
@@ -0,0 +1,5 @@
+mod position;
+mod manager;
+
+pub use self::position::{Position, GroupPosition};
+pub use self::manager::Manager;
diff --git a/util/bloomchain/src/group/position/position.rs b/util/bloomchain/src/group/position/position.rs
new file mode 100644
index 0000000000000000000000000000000000000000..88f26d69abaa76928d01309ad65b4ed0740c9847
--- /dev/null
+++ b/util/bloomchain/src/group/position/position.rs
@@ -0,0 +1,17 @@
+/// Uniquely identifies bloom group position.
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
+pub struct GroupPosition {
+	/// Bloom level.
+	pub level: usize,
+	/// Index of the group.
+	pub index: usize,
+}
+
+/// Uniquely identifies bloom position including the position in the group.
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
+pub struct Position {
+ 	/// Group position.
+	pub group: GroupPosition,
+	/// Number in group.
+	pub number: usize,
+}
diff --git a/util/bloomchain/src/lib.rs b/util/bloomchain/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..997ae083912ed3442a0bfb39cd874e11d1ad1a1e
--- /dev/null
+++ b/util/bloomchain/src/lib.rs
@@ -0,0 +1,17 @@
+extern crate ethbloom as bloom;
+
+mod chain;
+mod config;
+mod database;
+pub mod group;
+mod number;
+mod position;
+mod filter;
+
+pub use bloom::{Bloom, BloomRef, Input};
+pub use chain::BloomChain;
+pub use config::Config;
+pub use database::BloomDatabase;
+pub use number::Number;
+pub use position::Position;
+pub use filter::Filter;
diff --git a/util/bloomchain/src/number.rs b/util/bloomchain/src/number.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3ff82f195731e52fea673d65a29c13461929ff08
--- /dev/null
+++ b/util/bloomchain/src/number.rs
@@ -0,0 +1,2 @@
+/// Represents block number.
+pub type Number = usize;
diff --git a/util/bloomchain/src/position/manager.rs b/util/bloomchain/src/position/manager.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a405878ab52eeb3692e002880a132bac7306444e
--- /dev/null
+++ b/util/bloomchain/src/position/manager.rs
@@ -0,0 +1,142 @@
+//! Simplifies working with bloom indexes.
+
+use super::Position;
+
+/// Simplifies working with bloom indexes.
+pub struct Manager {
+	index_size: usize,
+	level_sizes: Vec<usize>,
+}
+
+impl Manager {
+	/// Creates new indexer.
+	pub fn new(index_size: usize, levels: usize) -> Self {
+		if levels == 0 {
+			panic!("Manager requires at least 1 level.");
+		}
+
+		let mut level_sizes = vec![1];
+		level_sizes.extend_from_slice(&(1..).into_iter()
+			.scan(1, |acc, _| {
+				*acc = *acc * index_size;
+				Some(*acc)
+			})
+			.take(levels - 1)
+			.collect::<Vec<usize>>());
+
+		Manager {
+			index_size: index_size,
+			level_sizes: level_sizes,
+		}
+	}
+
+	/// Unsafely get level size.
+	pub fn level_size(&self, level: usize) -> usize {
+		self.level_sizes[level as usize]
+	}
+
+	/// Converts block number and level to `Position`.
+	pub fn position(&self, block_number: usize, level: usize) -> Position {
+		Position {
+			level: level,
+			index: block_number / self.level_size(level),
+		}
+	}
+
+	/// Return bloom which are dependencies for given index.
+	///
+	/// Bloom indexes are ordered from lowest to highest.
+	pub fn lower_level_positions(&self, index: &Position) -> Vec<Position> {
+		// this is the lowest level
+		if index.level == 0 {
+			return vec![];
+		}
+
+		let new_level = index.level - 1;
+		let offset = self.index_size * index.index;
+
+		(0..self.index_size)
+			.map(|i| Position {
+				level: new_level, 
+				index: offset + i
+			})
+			.collect()
+	}
+
+	/// Return number of levels.
+	pub fn levels(&self) -> usize {
+		self.level_sizes.len()
+	}
+
+	/// Returns max indexer level.
+	pub fn max_level(&self) -> usize {
+		self.level_sizes.len() - 1
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use position::Position;
+	use super::*;
+	#[test]
+	fn test_level_size() {
+		let indexer = Manager::new(16, 3);
+		assert_eq!(indexer.level_size(0), 1);
+		assert_eq!(indexer.level_size(1), 16);
+		assert_eq!(indexer.level_size(2), 256);
+	}
+
+	#[test]
+	fn test_position() {
+		let indexer = Manager::new(16, 3);
+
+		let bi0 = indexer.position(0, 0);
+		assert_eq!(bi0.level, 0);
+		assert_eq!(bi0.index, 0);
+
+		let bi1 = indexer.position(1, 0);
+		assert_eq!(bi1.level, 0);
+		assert_eq!(bi1.index, 1);
+
+		let bi2 = indexer.position(2, 0);
+		assert_eq!(bi2.level, 0);
+		assert_eq!(bi2.index, 2);
+
+		let bi3 = indexer.position(3, 1);
+		assert_eq!(bi3.level, 1);
+		assert_eq!(bi3.index, 0);
+
+		let bi4 = indexer.position(15, 1);
+		assert_eq!(bi4.level, 1);
+		assert_eq!(bi4.index, 0);
+
+		let bi5 = indexer.position(16, 1);
+		assert_eq!(bi5.level, 1);
+		assert_eq!(bi5.index, 1);
+
+		let bi6 = indexer.position(255, 2);
+		assert_eq!(bi6.level, 2);
+		assert_eq!(bi6.index, 0);
+
+		let bi7 = indexer.position(256, 2);
+		assert_eq!(bi7.level, 2);
+		assert_eq!(bi7.index, 1);
+	}
+
+	#[test]
+	fn test_lower_level_positions() {
+		let indexer = Manager::new(16, 3);
+
+		let bi = indexer.position(256, 2);
+		assert_eq!(bi.level, 2);
+		assert_eq!(bi.index, 1);
+
+		let mut ebis = vec![];
+		for i in 16..32 {
+			ebis.push(Position { level: 1, index: i});
+		}
+
+		let bis = indexer.lower_level_positions(&bi);
+		assert_eq!(ebis, bis);
+	}
+}
diff --git a/util/bloomchain/src/position/mod.rs b/util/bloomchain/src/position/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4fa736a1636bd772393453b124bc20f12b2c8b03
--- /dev/null
+++ b/util/bloomchain/src/position/mod.rs
@@ -0,0 +1,5 @@
+pub mod position;
+pub mod manager;
+
+pub use self::position::Position;
+pub use self::manager::Manager;
diff --git a/util/bloomchain/src/position/position.rs b/util/bloomchain/src/position/position.rs
new file mode 100644
index 0000000000000000000000000000000000000000..32845cbcc5db591a8098d5755f6c16cea58d40ea
--- /dev/null
+++ b/util/bloomchain/src/position/position.rs
@@ -0,0 +1,8 @@
+/// Uniquely identifies bloom position.
+#[derive(Debug, PartialEq, Eq, Hash)]
+pub struct Position {
+	/// Bloom level.
+	pub level: usize,
+	/// Index of the bloom.
+	pub index: usize,
+}
diff --git a/util/bloomchain/tests/bloomchain.rs b/util/bloomchain/tests/bloomchain.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4a77407a7a2b3eee642c27f2c28c00457abc2d6c
--- /dev/null
+++ b/util/bloomchain/tests/bloomchain.rs
@@ -0,0 +1,170 @@
+extern crate bloomchain;
+extern crate rustc_hex;
+
+mod util;
+
+use bloomchain::{Bloom, BloomChain, Config};
+use util::{BloomMemoryDatabase, FromHex, for_each_bloom, generate_n_random_blooms};
+
+#[test]
+fn simple_bloom_search() {
+	let config = Config::default();
+	let mut db = BloomMemoryDatabase::default();
+	let bloom = Bloom::from_hex("00000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020000000000000000000000000000000000000000000008000000001000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+
+	let modified_blooms = {
+		let chain = BloomChain::new(config, &db);
+		let block_number = 23;
+		chain.insert(block_number, bloom.clone())
+	};
+
+	// number of modified blooms should always be equal number of levels
+	assert_eq!(modified_blooms.len(), config.levels);
+	db.insert_blooms(modified_blooms);
+
+	let chain = BloomChain::new(config, &db);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom), vec![23]);
+	assert_eq!(chain.with_bloom(&(0..22), &bloom), vec![]);
+	assert_eq!(chain.with_bloom(&(23..23), &bloom), vec![23]);
+	assert_eq!(chain.with_bloom(&(24..100), &bloom), vec![]);
+}
+
+#[test]
+fn partly_matching_bloom_searach() {
+	let config = Config::default();
+	let mut db = BloomMemoryDatabase::default();
+	let bloom0 = Bloom::from_hex("10100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom1 = Bloom::from_hex("11000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom2 = Bloom::from_hex("10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+
+	let modified_blooms_0 = {
+		let chain = BloomChain::new(config, &db);
+		let block_number = 14;
+		chain.insert(block_number, bloom0)
+	};
+
+	db.insert_blooms(modified_blooms_0);
+
+	let modified_blooms_1 = {
+		let chain = BloomChain::new(config, &db);
+		let block_number = 15;
+		chain.insert(block_number, bloom1)
+	};
+
+	db.insert_blooms(modified_blooms_1);
+
+
+	let chain = BloomChain::new(config, &db);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom2), vec![14, 15]);
+}
+
+#[test]
+fn bloom_replace() {
+	let config = Config::default();
+	let mut db = BloomMemoryDatabase::default();
+	let bloom0 = Bloom::from_hex("10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom1 = Bloom::from_hex("01000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom2 = Bloom::from_hex("00100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom3 = Bloom::from_hex("00010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom4 = Bloom::from_hex("00001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom5 = Bloom::from_hex("00000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+
+	let modified_blooms_0 = {
+		let chain = BloomChain::new(config, &db);
+		let block_number = 14;
+		chain.insert(block_number, bloom0.clone())
+	};
+
+	db.insert_blooms(modified_blooms_0);
+
+	let modified_blooms_1 = {
+		let chain = BloomChain::new(config, &db);
+		let block_number = 15;
+		chain.insert(block_number, bloom1.clone())
+	};
+
+	db.insert_blooms(modified_blooms_1);
+
+	let modified_blooms_2 = {
+		let chain = BloomChain::new(config, &db);
+		let block_number = 16;
+		chain.insert(block_number, bloom2.clone())
+	};
+
+	db.insert_blooms(modified_blooms_2);
+
+	let modified_blooms_3 = {
+		let chain = BloomChain::new(config, &db);
+		let block_number = 17;
+		chain.insert(block_number, bloom3.clone())
+	};
+
+	db.insert_blooms(modified_blooms_3);
+
+
+	let reset_modified_blooms = {
+		let chain = BloomChain::new(config, &db);
+		chain.replace(&(15..17), vec![bloom4.clone(), bloom5.clone()])
+	};
+
+	db.insert_blooms(reset_modified_blooms);
+
+	let chain = BloomChain::new(config, &db);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom0), vec![14]);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom1), vec![]);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom2), vec![]);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom3), vec![]);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom4), vec![15]);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom5), vec![16]);
+}
+
+#[test]
+fn file_test_bloom_search() {
+	let config = Config::default();
+	let mut db = BloomMemoryDatabase::default();
+	let blooms_file = include_bytes!("data/blooms.txt");
+
+	for_each_bloom(blooms_file, | block_number, bloom | {
+		let modified_blooms = {
+			let chain = BloomChain::new(config, &db);
+			chain.insert(block_number, bloom)
+		};
+
+		// number of modified blooms should always be equal number of levels
+		assert_eq!(modified_blooms.len(), config.levels);
+		db.insert_blooms(modified_blooms);
+	});
+
+	for_each_bloom(blooms_file, | block_number, bloom | {
+		let chain = BloomChain::new(config, &db);
+		let blocks = chain.with_bloom(&(block_number..block_number), &bloom);
+		assert_eq!(blocks.len(), 1);
+		assert_eq!(blocks[0], block_number);
+	});
+}
+
+#[test]
+fn random_bloom_replacement() {
+	let insertions = 10_000;
+
+	let config = Config::default();
+	let mut db = BloomMemoryDatabase::default();
+	let blooms = generate_n_random_blooms(insertions);
+
+	for (i, bloom) in blooms.iter().enumerate() {
+
+		let modified_blooms = {
+			let chain = BloomChain::new(config, &db);
+			chain.replace(&(i..i), vec![bloom.clone()])
+		};
+
+		db.insert_blooms(modified_blooms);
+	}
+
+	for (i, bloom) in blooms.iter().enumerate() {
+		let chain = BloomChain::new(config, &db);
+		let blocks = chain.with_bloom(&(i..i), bloom);
+		assert_eq!(blocks.len(), 1);
+		assert_eq!(blocks[0], i);
+	}
+}
diff --git a/util/bloomchain/tests/data/blooms.txt b/util/bloomchain/tests/data/blooms.txt
new file mode 100644
index 0000000000000000000000000000000000000000..204186ec34923b4b61ab6a5f03064591dcd01d4b
--- /dev/null
+++ b/util/bloomchain/tests/data/blooms.txt
@@ -0,0 +1,739 @@
+300054 0x00000000000000000000000000000000000000000000020000001000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+300059 0x00000020000000000000000000000000000000000000000002000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000002000
+300221 0x00000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020000000000000000000000000000000000000000000008000000001000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+301826 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+303166 0x00000000000000000000000000000000000000001000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000808000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000020000000001000000000000000000000000000000000000000000000000000000000000000000
+303345 0x00000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020000000000000000000000000000000000000000000008000000001000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+303379 0x00000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000800000000000000001000000000000000000000000000000000000000000000000000000000000000000020000000000000000000800000000000000000000000000000080000000006000008000000000000000000080000000000000000000000000000000000000000001000000000000000000000008000000000400000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000800000000000000000000000000000000000002004000000000000
+303388 0x00000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000800000040000000001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000080000000006001008000000000000008000080000000000000000000000000000000000000000001000000000000000000000008000000000400000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000800000000000000040000000000000000000002004000000000000
+303621 0x00000000000000000000008000000000200000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000080000000000000000000000080000000001100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000
+303670 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000400200000000000000
+303674 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000040000000000000000000000000000000000000000000000000000000000000000000000001000000000000200000000000000
+303683 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000400200000000000000
+303689 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000080000000000000000000000000400000000000000000000000000000000000000000000000000000000001000000000040200000000000000
+303692 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000400000000000000000000000000000000000000000000000000000000001000000000040200000000000000
+303716 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000040000000000000000000000000000000000000000000000000000000000000000000000001000000000000200000000000000
+303717 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000040000000000000000000000000000000000000000000000000000000000000000000000001000000000000200000000000000
+303748 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000400200000000000000
+303756 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000080000000000000000000000000400000000000000000000000000000000000000000000000000000000001000000000040200000000000000
+303758 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000400000000000000000000000000000000000000000000000000000000001000000000040200000000000000
+304090 0x00000000000000000000000000000000100000000000000000000000000000000000000000000000000200000000000000800000000000000000000000040000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000003000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000
+304095 0x04000000000000000000000000000000100000000000000000000000000000000000000000000000000200000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000008000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000
+304107 0x00000000000000000000000000000000100000000000000000000000000000000000000000000000000200000000000000800000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000400000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+304113 0x00000000000000000000000000000000100000000000000000000000000000000000000000000000000200000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000002000000000000000000000000000000000000000000000000003008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+304222 0x00000000000000000000000000000000100000000000000000000000000000000000000000000000000200000000000000800000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000800000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+304245 0x00000000000000000000000000000000100000000000000000000000000000000000000000000000000200000000000000800000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000080000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+304247 0x000000080000000000000000000000800000020000000000000000000000000000000000000000000202000000000000008000004004000000000000000000000000000000000000000000000200000000200000000080000000000000000000000004000000000000000000000000000000001040000000000000000000000000000004000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000c0002000000000000000000000000000000001000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+304312 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000020000000000002000000000000000000040000000000000200000000000000000000000000000000000000000000000000000000000000000000000000
+304319 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000100000000000020000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000080000000000000000000000000008000000000000000000000000000000000008000000000000000000000000000000000000020000000000002000000000000000000040000000000000200000000000000000000000000000000000000000000000000000000000000000000000000
+304367 0x00000000000000000000001000000000000000000400020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000100000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+304375 0x00000000004000000000001000000000000000000400020000000800000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000020000000000000000000000000000000000000000000000000008000000000000010000000008000000000000000000000000000000000008000800000000000000000000000100000000000000000000000000000000000000000100000000000000002000000000002000000040010010000000000000000000000000000000000000000000000000000000000000000000000000000000000
+304407 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000002000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+304431 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+304433 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+304608 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000400000000000000000000040000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000
+304609 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000400000000000000000000040000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000
+304788 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+304794 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+304819 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+304835 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000002000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+304849 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+304856 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000002000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+304862 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000002000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+304872 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+304881 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+304902 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+304996 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+304999 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000002000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305006 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+305010 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000002000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305425 0x00000000004000000000000000000001000000000000020000000000000000000000000000000000000000000000000000000000008000000080000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010400000048000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000400000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305445 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000080000100000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305448 0x00000000004000000000000000000000000000000000020000000000000000000004000008000000000000000000000000000000000000000000000000000800000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000080000100000000002000000000000000000040000000000000000000000100000000000000000000000000000000000000000000000000000000000000000
+305450 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000080000000000000000000000000000020000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000004000000000000000000000000000
+305452 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000002000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000080000000000000000000000000000020000000000000000000000000000000000000000000008002000000000000000000040000000000000000000000000400000000000000000000000000000000004000000000000000000000000000
+305454 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000001000000040000000000000000000000000000000000000000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305457 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305463 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000200080000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305464 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000008000000000000000000000000000000000240000000200480000000000000000000000000000000000000000000000000000002000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305468 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305488 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000002000000000000008000000000000010000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305492 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000008000000000000000000000000000000008040000000000000000000000000000002000000000001000000000000000000000000000400000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000200000000000000000000000000000000000000000000
+305501 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000008000000000000000000040000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000080000000000000
+305502 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000008000000000000008000000000000000000040000000001000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000080000000000000000000000000000000000010000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000080000000000000
+305510 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000044000004000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305616 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305620 0x0000000000400000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000800000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000040000000001000000000a000000000000000010000000000000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305622 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000080000000000000000000000000200000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000080000000000000
+305624 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000001000000000000000080000000000000000000000000200000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000004000000000000000000000000004000000000000000000000000000000000000080000000000000
+305626 0x00000000004000000000100000000000000000000000020000000000000000000000000002000000000000000000000000000000200000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000004000000000002000000000000002000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305627 0x00000001000000000000000000000200000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305629 0x00000001004000000000000000000200000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000040000000000000000001040000000000000000000000000000000000000000000000000000000000000000000
+305634 0x00000000005080000000000000000000000000000000020000400000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008020000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000400000000000000000000000
+305826 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000400000000000000002000000000000000000840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305827 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000100000000000000000000000000040000000000000000000000000000000000000000000000000000000000000040000000000000000000000010000000008000000000000000000000000000000100008000000000000000000000000000000000000000000000000000000000000000000000400000000000000002004000000000000000840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305829 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000008000000000080000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000080000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305834 0x00000000004002000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000041000000000000000000000000000000000000008000000000080000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000020000000000000000000000000000008000000000000000000000000000000000000000000000080000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+305839 0x00000000000000000000000000000000000010000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000080000000000000000000000000000000000000000000000000000000000000
+305841 0x40000000004000000000000000000000000010000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000008000000008000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000080000000000000000000000000000000000000000000008000000000000000
+306889 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+307290 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+307508 0x00000000000000000000000000000000000000000000020000000000000000000000200000000000400000000000000000000000000000000000000000000000002000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+307509 0x00000000004000000000000000000000000000000000020000000000000000000000200000000000400000000000000000000000000000000000000000000000002000000000000000008000000000000000000000000000000000040000000000040000000000000000000000000000000000000000000000000000000000000000000000000010000000008000010000004000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+307513 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000004000000000000000000000000010000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000200000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+307519 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000001000000000000002000000000000000000040000000000000000000000000000000000000000000080000000000000000000000000000000000000000000
+307528 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000020000000000000000000000000000000000000000000000000000000000000000100000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+308010 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020000000000080000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000
+308115 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000040000000000000000000000000000000000000000000000000000000000000000000000001000000000000200000000000000
+308124 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000400200000000000000
+308127 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000040000000000000000000000000000000000000000000000000000000000000000000000001000000000000200000000000000
+308157 0x00000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000440000000000000000000000000000000000000020000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000
+308183 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000002020000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+308190 0x00000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000440000000000000000000000000000000000000020000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000
+308216 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000002020000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000
+308224 0x00000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000440000000000000000000000000000000000000020000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000
+308257 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+308265 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+308267 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+308268 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+308285 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+308599 0x00000000000000000000000000000000000000000000080000000000000800000000000000000010000000000000000000200002000000000000000000000000000000000000000000020000001000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004010010000002000000000000000400000000000000000000000000000000000000000000040000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+309175 0x00000000002000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+309177 0x00000000002000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+309184 0x00000000002000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+309186 0x00000000002000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+309190 0x00000000002000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+309194 0x00000000002000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+309198 0x00000000002000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+309417 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+309881 0x00400000000000000000000000000000000000000000004000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000
+309883 0x00400000000000000000000000000000000000000000004000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000
+309892 0x00400000000000000000000000000000000000000000004000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000
+310069 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000002000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+310114 0x00400000000000000000000000000000000000000000004000000000000000000000000000100000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+310116 0x00400000000000000000000000000000000000000000004000000000000000000000000000100000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+310177 0x00400000000000000000000000000000000000000000004000000000000000000000000000100000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+310533 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000002000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+310589 0x00000000000008000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+310592 0x00000000000008000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+310599 0x00000000000008000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+310601 0x00000000000008000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+310604 0x00000000000008000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+311317 0x00000000002000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+311758 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+311858 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+311859 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+311865 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+311888 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+312096 0x00400000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000200000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+312124 0x00400000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000200000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+312367 0x00400000000000000000000000000000000400000000004000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+312371 0x00400000000000000000000000000000000400000000004000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+312383 0x00400000000000000000000000000000000400000000004000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+313355 0x00000000000008000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+313368 0x00000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000002000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+313507 0x00000000000000000000000000000000000000000200000000000000000000000000800000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+313526 0x00000000000000000000000000000000000000000200000000000000000000000000800000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+313724 0x00000000000008000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+313789 0x00000000000008000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+314190 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+314375 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000008000000000000000008000400000000000000000000000000
+315698 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+315705 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+315780 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+316726 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000400000000000000000000000020000000000000000000000000000000000000000000040000000000000000
+316747 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+317179 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000040000000000000000000000000000000000000000000000000000000000000000000000001000000000000200000000000000
+317522 0x04000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000800000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000006001008000000000000008000080000000000000000000000000000000000000000001000000000100000000000008000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000040000000000000008000002004000000000000
+317526 0x00000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+317536 0x00000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000020000000000800000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000006000008000000000000000000080000000000000000000000000000000000000000001000000000000000000000008000000800400000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000002004000000000000
+317567 0x00000000000000200000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000001004000000000000000004000000020000000000000000000000000000000000000000000000000000000000000000000000000000000001000040000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+317588 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+317597 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000400000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+317606 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+317610 0x00000000000000200000000000000000000000000000000000020000000000000000000000000000000000400000000000000000000800000080000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000001044000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000400000000000000000000000000000000000000000000000000000000000000000000440000000000000000
+317643 0x00000000000000200000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000010000000000000000000000000000004000000000020000000000000000000000000000000000000000000001004000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000040000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+317646 0x00000000000000000000000000000000000000000000000000004000000000000000000000000000000000400000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000010000000000000000000000000000004000000000020000000000000000000000000000000000000000000001000000000000000000004000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+317660 0x00000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000800000000000000001000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000080000000006000008000000000000000000080000000000000000000000000000000000000000001000000000000000000000008000000000400002000000000000000000000000000000000000000000000000000008000000000000000000000000000000000800000000000000000000000000000000000002004000000000000
+317957 0x00000000000000000000000000000000000000000200000000000000000000000000800000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+318030 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+318032 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+318033 0x00000000001000000000000000000000000000000000000000000000000000000000000800000008000000000000000000000000000000000000800000000000000001000000000000000000000000000000000000000000000000000000000000000000020000000000000000000800000000000004000000000000000080000000006000000000000000000000000080000000000000000000000000000000000000000005000000000000000000000000000000008400000000000000000000000000000000000000000000000000008000000000000000000000000020000000000000800000000000000000000000000000000000002004000000000000
+318034 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+318036 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+318063 0x00000000001000000000000000000000000000000000000000000000000000000000000800000008000000000000000000000000000000000000800000040000000001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004000000000000000080000000006000000000000000000000000080000000000000000000000000000000000000000005000000000000000000000000000000008400000000000000000000000000000000000000000000000000008000000000000000000000000040000000000000800000000000000000000000000000000000002004000000000000
+318074 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000100000010020000000000000000000200000000000000000080000000020000000000000000000800000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000008000000000000000000000000000000000000000000000000000008000000000000000000000000020000000000000000000000000000000000000000000000000102000000000000000
+318096 0x04000000001000000000000000000000000000000000000000000000000000000000000800000008000000000000000000000000000000000000800000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000080000000006000000000000000000000000080000000000000000000000000000000000000000005000000000100000000000000000000008400000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000800000000000000000000000000000008000002004000000000000
+318137 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+318528 0x00000000001000000000000000000000000000000000000000000000000000000000000800000008000000000000000000000000020000000000800000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000080000000006000000000000000000000000080000000000000000000000000000000000000000005000000000000000000000000000000808400000000000000400000000000000000000000000000000000008000000000000000000000000000000000000000800000000000000000000000000000000000002004000000000000
+318627 0x00000000001000000000000000000000000000000000000000000000000000000000000800000008000000000000000000000000000000000000800000000000000001000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000004000000000000000080000000006000000000000000000000000080000000000000000000000000000000000000000005000000000000000000000000000000008400002000000000000000000000000000000000000000000000008000008000000000000000000000000000000000800000000000000000000000000000000000002004000000000000
+318639 0x00000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000800000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000002000000000000000000000010000000000000004800000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000080000000000000000000000000
+318650 0x00000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000800000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000010000000000000004000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000
+318653 0x00000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000004000000000000000000000000080000000000000000000000000000000000000000000000000000000200000000000000000000000000800000000000000000000000000000000000000000000000000000000000010000000000000000000000000800000000000000000000000000000000000000000000000000000
+318904 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+319523 0x00000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000400000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+321346 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+321884 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+321900 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000400000000000000000000000020000000000000000000000000000000000000000000040000000000000000
+322038 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+322041 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+322043 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+322047 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+322048 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+322056 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+322059 0x00000000001000000000000000000000000000000000000000000000000000000000000800000008000000000000000000000000000000000000800000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000080000000006000000000000000000000001080000800000000000000000000000000000000000005000000000000000000000000000000008400000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000800000000000000000000000000000000000002004000000000000
+322083 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+322090 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+322108 0x04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000010020000000000000000000200000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000080000000000000000000000000000000000000000004000000000100000000000000000000008000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000800000000000000000000000000000008000100000000000000000
+322121 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000010000000000100000010020000000000000000000200000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000001080000800000000000000000000000000000000000004000000000000000000000000000000808000000000000000400000000000000000000000000000000000008000000000000000000000000000000000000000800000000000000000000000000000000000100000000000000000
+322122 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000100000010020000000000000000040200000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000080000000000000000000000000000000000000000004000000000000000000000000000000008000000000000000000000000000000000000000000000000000008000000000000000000000000040000000000000800000000000000000000000000000000000100000000000000000
+322128 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000010020000000000000000000200000000000000000088000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000080000000000000000000000000000000000000000004000000000000000000000000000000008000002000000000000000000000000000000000000000000000008000008000000000000000000000000000000000800000000000000000000000000000000000100000000000000000
+322454 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008010000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000010000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000080000000000000000000000000000000000000000000000000000000000000000000000000
+322509 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008010000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000080000000000000000000000000000008000000000200000000000000000010000000000000000000000000000000000000000000000000000000002000000000200000000040000000000000080000000000000000000000000000000000000000000000000000000000000000000000000
+322550 0x00000000000000000000000000000000000000000200000000000000000000000000800000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+322749 0x00000000001000000000000000000000000000000000000000000000000000000000000800000008000000000000000000000000000400000000800000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000080000000006400000000000000000000000080000000000000000000000000000000000000000005000000000000000000000000000000008400000000080000000000000000000000000000000000000000008000000000000000000000000000000000000000800000000000000000000000000000000000002004000000000000
+322750 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000080000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000020000000000000040000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+322752 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000008000000000000000000080000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000080000020000000000000040000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000080000000000000000000000
+322758 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+322760 0x00000004004000000000000000000000000000000000020000000000000000000000100000000000000000000000000000000000000000000000000000000000010000000000000000008000000000000000000000000000000000040000000000002000000000000000000000000000000000000000000004000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+322764 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000001000000000000000000000000000000000000000000000000000000000000001000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000020000000000000000000000000000000
+322765 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000400000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000001000000000000000000000000000000000000000000000000000000000000001000000000000000002000000000200000000040000000000000000000000000000000000000000000000000000000020000000000000000000000000000000
+322767 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002080000000000000000040000000000000000000000000000000000000000000002000000000000000000000000000000000000000000
+322768 0x00000000004000000000000000000000000000000000120000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000400000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002080004000000000000040000000000000000000000000000000000000000000002000000000000000000000000000000000000000000
+322774 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009000000000000000008000000000000000000000000000000000000000000000000000000000000000000002001000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+322776 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000010000000000000000000000000040000000000000000000000000000000010000000008000000000000000000000000000000000009000000000000000008000000000000000000000000000000000000000000000000000000000000000000002001000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+322777 0x00000000004000000000008000100000000000000000020000000000000002000000000000000000000000000000000000000004000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000020000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000001000000000000000000000000000000000000000000000000
+324029 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+324316 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000004000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+324318 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000
+324322 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000400000000000000000000000000000000000000000000000000000008000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+325807 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+326760 0x00000000000000000000000000000000000000000000000000000040000000000000001000000000000000000000000000008000000000000000000000000000000000008000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000002000000000000008000000000000000
+327103 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+327105 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+327227 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000400000000000000000000000020000000000000000000000000000000000000000000040000000000000000
+327399 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+327544 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+327690 0x00000000000000000000000000000100000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+328002 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000200000000000
+328269 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+328529 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+328585 0x20000000000000000000100000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+328870 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+329480 0x00000000000000000000000000000000000000000000020000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000200000000000000000000000020000000000000000000000000000000000000000000
+329484 0x00000000004000000000000008000000000000000000020000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000040000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000200000000000000000000000020000000000000000000000000000000000000000000
+329485 0x00000000000000000000000000000000001000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+329491 0x00000000000000000000000000000000001000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+329513 0x00000000000000000000000000000000001000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+329519 0x00000000000000000000000000000000001000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+329659 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000020000000000000000000000000000000000000000000000000000000000020000000010000000008000000000000000000000000000000000008000000400000000000000000000000000000000000000000000000000000000000000000000000000000002000000080000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000020000000
+329667 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000100000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000002000000000000000000000000000000000000000000
+329668 0x0000000000400000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000004000000000000010000000000000000000000000000000000000000000000000001000000000000000000001000000000c000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000002000000000000000000800000000000000000000000
+329673 0x00000000004000001000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000004000000000000000000000000000000000000000000000000004000000000000000000010000000008000000000000000000000000000002000008000000000000000000000000000000000000000000000000000000000000000000000400400000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+329740 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000010000000000000
+329749 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000008000000000000000000000000000000000000000002000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+329750 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000008000000000000000000000000000000000040000000040000000000000000000000010000000000000000000000000000000000000000000000000000010000000008000000000000000000000080000000000008000000000000000000000000000000000000000002000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000400000000000000000000000000000000000000000000
+329824 0x00000000000000000000000000000000000000000000200000000000000000000000001000000000000000000000000000008000000008000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+329964 0x00000000000000000000000000000000000000000000000000000000100000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+330023 0x00000000000000000000000000000000000000000000000000000000100000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+330207 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000004000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000200000000000000000000000008000000000000000
+330473 0x00000000000400000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000001000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+330511 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000002000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000400000000000000000000000020000000000000000000000000000000000000000000040000000000000000
+330579 0x00000000000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000001000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+330683 0x00000000000000000000000000000000000000000000080000000000004000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+330919 0x00020000000000000000000000000000000000000000000000000000000000000008001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+331009 0x00000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+331542 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000100000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000004000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+332007 0x00000000000000000000000000000000000000000000000000000200000080000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008200000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+333256 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000400000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000010000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+333294 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+333583 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000200000000000000000000000000000000000000000000000000010008000000000000000
+333640 0x80000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000004000000008000000000000000000000000000000000000010000000000000000000000000000000000008000000000000000
+334263 0x00000000000000080000000000000000000000000000000000000000000000000100001000000000000010000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+334279 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000040000020000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000
+334883 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+334915 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000004000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+334919 0x00000020000000000000000000000000000000000000000000000000000000000000001000000000000020000000000000008000000000000000000000000000000000000020000000000000020000812000002000000000000000000000000001000000000000000000000000000000400000000000000000000000000000000000000000000000040000800000000010000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000008000400000000008000000000000000
+335076 0x00000000000000001000000000000000000000000000000000000000000000000000001000000000000000000100000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+335348 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000080000000008000000000000000000000040000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000008000000000
+335643 0x00000000000008000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+335649 0x00000000000008000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+335652 0x00000000000008000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+335684 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000002000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000004000000000000000000000000000000000000000000000000000000000000008000000000000000
+336089 0x0000000000000000000000000000000000000000000000000000000000020000000000100000000000000000000000000000800000000000000000000000000000000000000000000000000000000080200000a000000000000000000000000001000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+336231 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336234 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336242 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336243 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336244 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336245 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336247 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336248 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336255 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336260 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336263 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336264 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336266 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336334 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336336 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336337 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336338 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336439 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336451 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336452 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336453 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336461 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336495 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336497 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336507 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336508 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336509 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336510 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336518 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336520 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336521 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336522 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336526 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336527 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336528 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+336543 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000040000000000000000000200000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000
+337012 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000001000000000000000000000000400000000000000802000002000000200000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+337642 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000408000000000000000000000000000000000040000080000000000000000080000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000020000000000000000002000000000000000000040000000000000001000000000000000000000000000000000000000000000000000000000000000000000000
+337647 0x00000000000000000000000000000000000000000000020000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000800000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+337649 0x00000000004000000000000000000000000000000000020000000000000080000000100000000000000000000000000000000000000000000000000000000000000000000000000000008002000000000000000000000000000000040000000000000000000000000000000800000000000000000000000000000000000000000000000002000010000000008000000000000000000000000000000000008000000000000000000000000000000000200000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+337653 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000040000000000000000000040000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+337654 0x00000000004000000000008000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000020000040000000000000000000040000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+337655 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000040000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000400000000040000000000000000000000000000000000000000000000000000000000000000000000
+337656 0x00000000004000000000000000000000000400000000020000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000008000040000000000000000000000000000040000000000000000000000000000000000000000000000000000004000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000400000000040000000000000000000000000000000000000000000000000000000000000000000000
+337663 0x00000000004000000000000000000000080000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000001000000000000000000000000000050000000000000000000000000040000000000000000000000000000000000000000004000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000080000000000000000000000000000000000000
+337664 0x00000000000000000000000000000000000000000000020000000010000000000000000000000000001000000000000000000000000000000000000000000000000200000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+337669 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000020000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000008000000000
+337672 0x40000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000020000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000020000000000000010000000008000000000000000000000000008000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000008000008000000000
+337731 0x00000000000000000000000020000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000800000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+338275 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010004000200000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+338281 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010004000200000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+338336 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+338424 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008004000000000000000000000000000000000000100000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+338435 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000008000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000004000000000000000000000000010000000000000000000000000000000000000
+338439 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000010802000002000000000000000000000000001000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000040000000000000000000000000000000000000000000000008000000000000000
+338661 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+338991 0x00000000000000000000000000200000000000000008000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000400800000000000000000000000000000010000000000000000000000000000000000000000000000000
+339173 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002400000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000000000000000000088000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+339369 0x00000020000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+339427 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000020000000000000000000001000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+340633 0x00000000000000000000000000000000000000000000020000000004000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000008000000000000001000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+340635 0x00000000004000000000000000000000000000000000020000000004000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000008000000000000001000000000000200000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000001000000000200000000000000000000000000000000000000000000000000000000000000000000
+340653 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000001000000002000000000000000000040000000000000000000000000000000000000000000000000000000010000000000000000000000000000000
+340658 0x0000000000400000000000000000000400000000000002000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000001000000000800000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000100000000a000000000000000000040000000000000000000000000000000000000000000000000000000010000000000000000000000000000000
+340674 0x00000000000800000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000100000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040080000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+340675 0x00000000004800000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000100000000000000000000000000000000000000000000000000000000000000000000000000000002000010000000000000040080000000000000000000000000000000000002000000000000000000080000000000000000000000000000
+340685 0x00000000000000000000000000000000000000000000020010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000008000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+340686 0x00004000004000000000000000000000000000000000820010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000010000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000008000000000000040000000000000000000000000000000000000000000000000002000000000000000000000000000000000000
+340700 0x00000000004000000000000000000000000000000000020001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000080000000000000000000000000000000000008000000000000000000000000000000000000000000002004200000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000001000
+340708 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000008000000000000000000000000000040000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000080000000000000000000000000000000000000
+340710 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000008000000000000000000000000000040000000000000100000000000000000800000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000400000000000000000000000000000000000000000000000000002000002000000000000040000000000000000000000000000000000000000000000000080000000000000000000000000000000000000
+340712 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000008000000000200000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+340713 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000080840000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000028000000100000000000000000000000000008000000000200000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000001000000000000000000000
+340718 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000100000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000002000000000000
+340719 0x00000000004000000000000000000000000000000000020000000040000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000008000000000000080000002000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000100000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000002000000000000
+340727 0x00000000004000000000040000002000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000200000000000080000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000002000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000001000000000000000000000000000000
+340728 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000002000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000100000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+340835 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+340988 0x00000000000000000010000000000000000000000010000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000010000000000008000000000000000
+341695 0x00000000000000000000000010000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000001000000000000000000000000000000000000000000000000000000000008000000000000000
+341985 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000100000000000004000000000000001000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+341997 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000104000000000004000000000000001000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+342001 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000100000000000004000000000000001000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+342004 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000100000000000004000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+342007 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000004000000000000001000000040000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+342008 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000004000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+342026 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000002000000004000000000000000000000000000000000000000000000000000000001000000000000000000004000000020000080000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+342027 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+342033 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+342035 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+342036 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+342041 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000
+342047 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000100000000000000000000000000000000002000000104000000000044100000000000001000002000000000000000000000001000000000000000000004000000000000080000000000000000000000000000000000000002000000000000000000000000020000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+342053 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000040000000000000000
+342080 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000400000002000000000000000000000000000000000000000000040000000000000000000001040000000000000000000000000000000080000000010000000000000000000000000000000000000000000000000000000020000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000440000000000000000
+342101 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000
+342107 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000040000000000000000
+342111 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000040000000000000000
+342115 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000
+342118 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000400000002000000004000000000000000000000000000000000000000000000000000000001000000000000000000004000000000000080000000010000000000000000000000000000000000000000000000000000000020000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+342125 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000040000000000000000
+342140 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000008000000000000000000080000000000000000800000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000
+342141 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000040000000000000000
+342145 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000400000002000000000000000000000000000000000000000000040000000000000000000001040000000000000000000000000000000080000000010000000000000000000000000000000000000000000000000000000020000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000440000000000000000
+342162 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000040000000000000000
+342173 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000040000000000000000
+342188 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000040000000000000000
+342272 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000400000000000000000
+342386 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000008000000000000000000000000000000000000000000000000000004000000000000000000000000000008000000000000000000000000001000000000000000000004000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000010000000004000000000000000000000000010000000000000000000400000000000000000
+342399 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000
+342466 0x00000000000000000000000000000000000000000000000000002000000000000000001000000000080000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+342601 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000040000000000000000
+342616 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000008000000000000000000080000000000000000800000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000
+342618 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000008000000000000000000080000000000000000800000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000
+342924 0x00000000000000000000000000000000000010000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+342964 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000081000000000000000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+343006 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000080000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000
+343021 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000004000000000000000000000000000000000000000000000000080000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000
+343059 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000008000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+343079 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000200000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+343083 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000040000000000000802000002000000000000000000000000001000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+343133 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+343162 0x00000020000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000100000000000000000000000000008000400000000000000000000000000
+343185 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000008000400000000000000000000000000
+343339 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000080000000000000000802000002000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+343946 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+343966 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+343971 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+344121 0x00000000000000000000000000000000000000000000000000000040000000000000001000000000000000000000000000008000000000000000000000000000000000008000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000002000000000000008000000000000000
+344164 0x00000000000000000000000000000000000000000000000000000040000000000000001000000000000000000000000000008000000000000000000000000000000000008000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000002000000000000008000000000000000
+344839 0x00000000000000000000000000000000000000000000000000000000000000000200001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000008000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+345506 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+346112 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+346392 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+346395 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+346398 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+346425 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+346448 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+346451 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+346454 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+346464 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+346466 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+347014 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000400000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+347301 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000200000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000002000000000000000000000000000000000000000000000000000000000000000008000000000000000
+347333 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000200000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000002000000000000000000000000000000000000000000000000000000000000000008000000000000000
+347613 0x00000000000000000000000000000000000000000800000000000000000000000000000000000000000001000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010004000000002000000000000000000000000000000000000000000000000000000001000000040000000000000000000000800000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000001000000000000000000000
+347700 0x00000000000000000000000000000000000000000000000000000000002000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400010000000000000
+347705 0x00000000000000000000000000000000000000000000000000000000002000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400010000000000000
+347711 0x00000000000000000000000000000000000000004000000000020000002000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040010000000000000
+347853 0x00000000000000000000000000000000000000000000000000000000002000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000
+347953 0x00000000000000000000000000000000000000000000000000000000002000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000080000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000
+347958 0x00000000000000000000000000000000000000004000000000020000002000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040010000000000000
+347960 0x00000000000000000000000000000000000000000000000000020000002000000001000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040010000000000000
+348019 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+348244 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000004000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+348443 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000400000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+348675 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000080000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000400100000000000000000000000000000000000000000000000008000000000000000
+348743 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+348936 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000100000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000002000000000000000000000000000000000000000008000000000000000
+350544 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+351473 0x00000000000000000000000000000000000000000000000000000000002000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000
+353157 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+353181 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000004000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000400000000000000000
+353196 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000004000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000080000000000000000000000000000000000000040000000000000000
+353273 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000080000000000000000800000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000
+353276 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000080000000000000000000000000000000000000040000000000000000
+353359 0x00000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000200000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000100000040
+353360 0x00000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000040
+353361 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008002400000000000000000000000000
+353367 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000080000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000008000000000000000
+353370 0x02000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+353438 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000080000000000000000000000000000000000000000000000000002000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000040
+353443 0x0000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000a000400000000000000000000000000
+353447 0x00000028000000000000000000000080000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+353479 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000002000001000000000000000000000000100000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+354071 0x02000000000000000000000000000000000000000000020000000000000000000000000040000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000001000000000020000000000000000000000200000000000000020000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000140000000000000000
+354151 0x00000000000000000000000000000000000000000000002000000000000000000000400000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004040000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000080000000400000000000000000000000000000000000000000000000000000000000000000000000000000
+354162 0x00000000000000000000000000004000000000000000000000000000000000000000410000000000200000000000000002000000000002000000000040000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000
+354233 0x00000000000000000000000000000000000000000000000000000000000000000000400040000004000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024040000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000400000000000000000000000040000000000000000000000000000000000100000000000000000
+354585 0x00000000000000000000000000000000000000000000000000100000000000000000400000000000200000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004001000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000
+354866 0x00000000000000000000000000000000000000000000000000001000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000001
+356461 0x00000000000000000000000000200000000000000000000000000000010000000000000000000000000000000000000000202000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+356488 0x00000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000200000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000020000000000000080000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000
+356513 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000100001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000080000000000000a00000000000000000000000
+356526 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+356535 0x00000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000
+356543 0x00000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000800080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000
+357195 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+357579 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+357588 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+357590 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000200000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+357592 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+357600 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+357622 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+357630 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+358290 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000400000002000000004000000000000000000000000000000000000000000000000000000001000000000000000000004000000000000080000000010000000000000000000000000000000000000000000000000000000020000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+358426 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000
+358556 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+358811 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000400000000000000000000000000000000002000000000008000000000000000
+359114 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+359375 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000100000000000000000
+359378 0x00000020000000000010000000000000000004000000000000000200400000000000000000000000000000000002000000000000000000020000000000000000000000000000000000000000000000010000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000040000000000040010000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000400000000000
+359538 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+361585 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+361588 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+361732 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000842000002000000000000000000000000001000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000080000000000000000000000000000000000000000000000000000008000000000000000
+361757 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+361775 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000008000000000000000000080000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+362002 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000010000000000000000000000000802000002000000000000000000000400001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+365791 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000040
+365793 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000010000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000400010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+369141 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000200000000000000000000000000000000000000000000000000000000000000000008000000000010000
+369239 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+369249 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+369253 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+369259 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+369261 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+369263 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+369274 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+369426 0x00000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000200000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000100000040
+369428 0x20000020000000000000000000800000000004000000000000000200400000000000000040000000000000000000000000000000000000020000000000000000000000000000000000000000000000010000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000040000000000000010000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000008000400800000000000000000000000
+369431 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018000400000000000100000000000040
+369538 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000040
+369540 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000008000400000000000000000000000000
+370399 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000001000000000000802000002000000000000000000000000001000000100000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+370517 0x00000000000000000000000000000080200000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000080004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+370545 0x00000000000000000000000000000080200000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000080004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371190 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371280 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371286 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371288 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371299 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371307 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371327 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371329 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371352 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371360 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371362 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371369 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371378 0x00000000000000000000000000000080200000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000080004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371450 0x00000000000000000000000000000080200000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000080004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371489 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371509 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371532 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371658 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371660 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371876 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371904 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371906 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371912 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371914 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371918 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371931 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371933 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371938 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+371940 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+371973 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+372006 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+372014 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+372847 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+374209 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+374225 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+374365 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000010000000000000000000000000000000000000000000000000000000020000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+374388 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020001000000000000000000000200000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+375079 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+375093 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+375401 0x00000000000000000000000000000000000400000400000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+375440 0x00000000000000000000000000000000000400000400000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+375447 0x00000000000000000000000000000000000400000400000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+376493 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+376573 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+376588 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+376644 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+376650 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+376668 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+376906 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+377026 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+377139 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000001000000000000080000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000080000000000000000000000000000000000000040000000000000000
+377506 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+377523 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+377525 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+377581 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000040
+377586 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000040000000000000000000000100000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+377608 0x00000000000000000000000000000000000000000200000000000000000000000000800000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+377627 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000004000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000080000000000000000000000000000000000000040000000000000000
+377629 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000004000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000080000000000000000000000000000000000000040000000000000000
+377703 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000001000000000000080000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000080000000000000000000000000000000000000040000000000000000
+377730 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+377746 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000004000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000400000000000000000
+377877 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000400000002000000004000000000000000000000000000000000000000000000000000000001000000000000000000004000000000000080000000010000000000000000000000000000000000000000000000000000000020000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+377894 0x00000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+377905 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000400000002000000004000000000000000000000000000000000000000000000000000000001000000000000000000004000000000000080000000010000000000000000000000000000000000000000000000000000000020000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+377917 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000040000000000000000
+377922 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000040000000000000000
+377925 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+378345 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+378347 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+379027 0x00000020000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+379032 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+379039 0x08000020000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+379158 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000400000000000000000002000040000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+379161 0x00000400004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000040000000000000000000000000000000000000000000010000000008000000000000000000000000000000020008000000000000000000000000000000000000000000000000000000000000000000400000000000000000002000040000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+379163 0x00000000000000000000000000000000000000000000020000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000008000010000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000080000000000000000000000000000000000000000
+379164 0x00000000004000000000000000000000000000100000020000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000008000010000000000000000000000000000040000000000001000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000100000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000080000000000000000000000000000000000000000
+379167 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000004
+379170 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+379171 0x00000000004000000000000000800000000000000000020000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000008000000000000000000000000000002000140000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000004
+379172 0x00000000000000000010000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000200000000000000000000000000000000000000000000000000000000000000000000000
+379176 0x00000000004000000010000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000100000000000000000000000000000000000000000200000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000040000000000000000000000000000000002000000000000000000040000000000000000200000000000000000000000000000000000001000000000000000000000000000000000
+379180 0x00000000000080000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000800000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+379182 0x00000000004080000000000002000000000000000800020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000800000000000000000000050000000008000000000000000000000000800000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+379210 0x00000000000000040000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000004000000000000000000000400000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+379212 0x00000000004000040000000000000000000000000000020000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000200000000000008000000000000000000000000000000000000000004000000000000000000000400000000000000000000002000000000000000000040002000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+379214 0x00000001000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+379216 0x00000001004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000008000000000000008000000000000000000000000000000000040000000000000000000000000000000000020000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000020002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+379217 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000800000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000020000000000000000000000000000000000000000000000000000000000000000
+379219 0x00000000004000000000000000000000000000000000020000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000008000000000000000000000000010000000000000000010000000008800000000000000000000000000000000008000020000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000000000020000000000000000000000000000000000000000000000000000000000000000
+379220 0x00000000000000000000000000200000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000100000000000100002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+379224 0x00000000004000000000000000200000000000000000020000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000008000000000000000040000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000008000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000100000000000100002000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000400000000000000
+379235 0x00000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000040000000000000000080000000000000000000000000000000000000000800000000000000000000000000000
+379237 0x00000000004000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000040000000000000000000000000000000000000100000000008000000000000000000000000000000000000010000000008008000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000080000000000000040000000000000000080000000000000000000000000000000000000000800000000000000000000000000000
+381271 0x00000000000000000000000000000080000080004000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000200000000000004000000000000000000000000002000000000000000000400000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+381276 0x00000000000000000000000000000080000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+381689 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+382200 0x00000020000000000000000008000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+382217 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000400000010000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+382644 0x00000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000200000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000002000000000000000000000000000000000000000000000000000000000000000008000000000000000
+383284 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+383337 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+383354 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+383361 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+383427 0x00000000000000000000000000000000000004000800000000000000000000000000000000000000000001000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000800000001000000000008000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000040000000000000000000
+383466 0x00000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000021000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+383469 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000001000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+383515 0x00000000000000000000000000000000000004000800000000000000000000000000000000000000000001000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000800000001000000000008000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000040000000000000000000
+383519 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000010000000800000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000002000000000000000000000000000
+383630 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000400000000000000000
+383760 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000010000000000000000000000000000000000000000000000000000000020000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+383802 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000080000000000400000000000000000
+383815 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000000001000000000000000000004000000000000000000000010000000000000000000000040000000000000000000000000000000020000000100000040000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+383844 0x00000000000000000000000000000000100000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+383852 0x00000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000002000000000000000000000000000400000000000000004000000000000000080000000000000000000000000000000000000001000000000000000000004000000000000000000000010000000000000000000000000000000000000000000000000000000020000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+383859 0x00000000000000000000000000000000000000804000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000002000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+383864 0x00000000000000000000000000000000000000800000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000080000000000000000040000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+383968 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000001000000000000080000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000080000000000000000000000000000000000000040000000000000000
+383973 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000
+384127 0x00000000000000000000000000000000000004000800000000000000000000000000000000000000000001000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000800000001000000000008000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000040000000000000000000
+384138 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+384149 0x00000000000000000000000000000000100000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+384173 0x00000000000000000000000000000000100000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000400000000000000000000080000000000000000000000000000000000008000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000001000000000000000000005000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000800000000000000000000000000000400000000000000000
+384301 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000040000000000000000000000000000000000000000400000000000000000
+384422 0x00000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000400000000000000000
+384506 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+384511 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000400000000000000000
+384546 0x00000000000000000000000000000000000004000800000000000000000000000000000000000000000001000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000800000001000000000008000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000040000000000000000000
+384771 0x00001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000800000
+384825 0x00001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000
+384861 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000100000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+384917 0x00000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000400000000000000000
+384923 0x00002000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001000000
+384965 0x00000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+385067 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000008000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000400000000000000000
+385073 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000008000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000400000000000000000
+385356 0x00002000000000000000000000000000000000010000000000000000000000000000000400000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000004000000000000000000000000000000004000000000000000000000000000000000000000000000000000000001000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000001000000
+386571 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+386620 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000
+386736 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000040000000000000000000000000000010000000020000000000000000000000000000000000000000000000000000000000000000010
+386786 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000280000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000040000000000000000000000000000010000000040000000000000000000000000000000000000000000000000000000000000000010
+386795 0x04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000040000000000000000000000000000000000040000000000000000000000000000010000000000000000000000000000000000000000000000000000008000000000000000000010
+386804 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000040000000000400000000000000000000000040000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000010
+386812 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000042000000000000000000000000000000000040000000000000000008000000000010000000000000000000000000000000000000000000000000000000000000000000000000010
+386818 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000280000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000800000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000040000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000010
+386899 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000080000000000000000000000000000040000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000010
+386939 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000002000000000000000000000000000000000000000200000000000000000000000000000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000010000000020000000000000000000000000000000000000000000000000000000000000000000
+386945 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000020000000000000000000800000000000000000000000000000000000000000200000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000
+386975 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000100000000000000000020000000000000000000000000000000000000000000000000000000000000000000
+387011 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000010000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000
+387014 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000001000000000000000000000040000000000000000000000000000000000000000000000040000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000
+387016 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000400000000800000000
+387032 0x04000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000
+387044 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000020000000000000000000000000000000000000000000080000000000000000000000
+387045 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000400000000800000000
+387206 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+387225 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+387241 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+387276 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000008000000000000000004000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000021000000000000000000004000000000000000000000400000000000000000000000000000000080000000000000000000000000000000000000040000000000001000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+387284 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000040000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+387365 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000440000000000000000
+387615 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000800008000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+387627 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000800000000000000000400000000000000000
+387641 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800008000000000000000000000001000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+387648 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000800008000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+387654 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000800008000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+387658 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000800008000000000000000000000001000000000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+387683 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000800008000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+387688 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000800008000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+387690 0x00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000800008000000000000000000000001000000000000000000000000000000000000000000000000040000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+387761 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000
+388108 0x00000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+388111 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000800000000
+388150 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000800000000
+388246 0x00000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000001000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000
+388285 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+388296 0x00000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000001000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000
+388516 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+388860 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000020000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000
+388893 0x00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000008000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000001000000000000000000000000000008000000000000000020000000000000000000010000000000001000000000000000000000000000000000000000000000000000000000000000400000000000000000
+388894 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000020000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000
+388907 0x00000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000104000000000004000000000000001000000000000000000000000000001000000000000000000004080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000004000000000000000400000000000000000
+388909 0x00000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000400000000000000000
+388912 0x00000000000000000000000000000000000000004000000000020000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000004000000000000000040000000000000000
+388918 0x00000000000000000000000000000000000000000000000000020000002000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000040000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000004000000000000000040000000000000000
+388923 0x00000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000008000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000001000000000000000000000080000000000000000000000000000000000000000000000000000000000008000000000000000020000000000000000000000000000000001000000000000000000000000000000000000000000000004000000000000000400000000000000000
+388940 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000020000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000
+388971 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000004000000000000000000000000000000000000000800000000000000000000000000000000000
+388990 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000
+389012 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000
+389158 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000
+389206 0x00000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000400000000000000000
+389238 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+389277 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000100000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000400000000000000000
+389292 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000800000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+389301 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000020000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+389309 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000020000000000000000000000000000000000000000000000000000000008000000000000000000080000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+389324 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000008000000000000000000000000004000000000000000000000000004000000000000000000000000000000000000000000000000000000001000000000000800000024000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000440000000000000000
+389328 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+389343 0x00000000000000000000000000000000000000004000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000020000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000
+390001 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000001000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+390004 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000200000000000000000000000000000000000000020000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+390024 0x00000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+390042 0x00000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+390236 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+390306 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000001000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+390867 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+391685 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000010000000800000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000002000000000000000000000000000
+391690 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000010000000800000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000002000000000000000000000000000
+391691 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000010000000800000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000002000000000000000000000000000
+391697 0x00000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000040000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000
+391713 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000
+391849 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000100000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000400000000000000000
+392002 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000
+392097 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000020000000000000000000000000000000000000000000000000000000008000000000000000000080000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+392104 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000010000000000000000000000000000000000000000000000000000000020000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+392110 0x00000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000
+392294 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000001000000000000000000000000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000004000000000000000000000000000000000000000000000000000000000
+392697 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000010000000000000000000000000000400000000000000000
+392960 0x00000000000000200000400000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000002000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+392970 0x00000000000000200000400000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000002000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+392990 0x00000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000002000000000000000000000000000000100000000000000000100000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+393302 0x00000010000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000400000000000000000
+393370 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+393752 0x00000000000000000000000000000000001000000000000000000000000000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000
+394354 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000800000024000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+394389 0x00000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000002000000000000000000000000000000100000000000000000100000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+394390 0x00000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000002000000000000000000000000000000100000000000000000100000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+394391 0x00000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000002000000000000000000000000000000100000000000000000100000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+394393 0x00000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000002000000000000000000000000000000100000000000000000100000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+394394 0x00000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000002000000000000000000000000000000100000000000000000100000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+394395 0x00000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000002000000000000000000000000000000100000000000000000100000000000000000000000000000000000000000000000000000000000002000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+394426 0x00000000000000200000400000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000200000000000000000000000000000000000000000000000000000000000000000000000008000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+394800 0x00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000100000010000000000000000000000000000000000000000000000000000000000020000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000400000000000000000000000000
+395595 0x00000000000000000000000000000000000000000000000000000000000100000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000800000000000000000000000000000000000000000000000000000000000000000008000000000000000
+395969 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+396348 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000010000000000000000000000000000400000000000000000
+397108 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000004000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000
+397588 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000004000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000
+397591 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000004000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000
+398412 0x00000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000008000000000000000000000000000000000000000000000000000000000802000002000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000008000000000000000000000000000000000000000000000000080000000000000000000800008000000000000000
+398456 0x00000020000000080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000
+398477 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+398679 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040100000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+398968 0x00000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000
+398972 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000400000000000000000
+399058 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000200000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000
+399804 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000010000000000000000000000000000400000000000000000
+399849 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000004000000004000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000
diff --git a/util/bloomchain/tests/groupchain.rs b/util/bloomchain/tests/groupchain.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ec396346ac30ebf5d80da2c40a5e89cde4517707
--- /dev/null
+++ b/util/bloomchain/tests/groupchain.rs
@@ -0,0 +1,172 @@
+extern crate bloomchain;
+extern crate rustc_hex;
+
+mod util;
+
+use bloomchain::{Bloom, Config};
+use bloomchain::group::BloomGroupChain;
+use util::{BloomGroupMemoryDatabase, FromHex, for_each_bloom, generate_n_random_blooms};
+
+#[test]
+fn simple_bloom_group_search() {
+	let config = Config::default();
+	let mut db = BloomGroupMemoryDatabase::default();
+	let bloom = Bloom::from_hex("00000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020000000000000000000000000000000000000000000008000000001000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+
+	let modified_blooms = {
+		let chain = BloomGroupChain::new(config, &db);
+		let block_number = 23;
+		chain.insert(block_number, bloom.clone())
+	};
+
+	// number of modified blooms should always be equal number of levels
+	assert_eq!(modified_blooms.len(), config.levels);
+	db.insert_blooms(modified_blooms);
+
+
+	let chain = BloomGroupChain::new(config, &db);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom), vec![23]);
+	assert_eq!(chain.with_bloom(&(0..22), &bloom), vec![]);
+	assert_eq!(chain.with_bloom(&(23..23), &bloom), vec![23]);
+	assert_eq!(chain.with_bloom(&(24..100), &bloom), vec![]);
+}
+
+#[test]
+fn partly_matching_bloom_group_searach() {
+	let config = Config::default();
+	let mut db = BloomGroupMemoryDatabase::default();
+	let bloom0 = Bloom::from_hex("10100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom1 = Bloom::from_hex("11000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom2 = Bloom::from_hex("10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+
+	let modified_blooms_0 = {
+		let chain = BloomGroupChain::new(config, &db);
+		let block_number = 14;
+		chain.insert(block_number, bloom0)
+	};
+
+	db.insert_blooms(modified_blooms_0);
+
+	let modified_blooms_1 = {
+		let chain = BloomGroupChain::new(config, &db);
+		let block_number = 15;
+		chain.insert(block_number, bloom1)
+	};
+
+	db.insert_blooms(modified_blooms_1);
+
+
+	let chain = BloomGroupChain::new(config, &db);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom2), vec![14, 15]);
+}
+
+#[test]
+fn bloom_group_replace() {
+	let config = Config::default();
+	let mut db = BloomGroupMemoryDatabase::default();
+	let bloom0 = Bloom::from_hex("10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom1 = Bloom::from_hex("01000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom2 = Bloom::from_hex("00100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom3 = Bloom::from_hex("00010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom4 = Bloom::from_hex("00001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	let bloom5 = Bloom::from_hex("00000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+
+	let modified_blooms_0 = {
+		let chain = BloomGroupChain::new(config, &db);
+		let block_number = 14;
+		chain.insert(block_number, bloom0.clone())
+	};
+
+	db.insert_blooms(modified_blooms_0);
+
+	let modified_blooms_1 = {
+		let chain = BloomGroupChain::new(config, &db);
+		let block_number = 15;
+		chain.insert(block_number, bloom1.clone())
+	};
+
+	db.insert_blooms(modified_blooms_1);
+
+	let modified_blooms_2 = {
+		let chain = BloomGroupChain::new(config, &db);
+		let block_number = 16;
+		chain.insert(block_number, bloom2.clone())
+	};
+
+	db.insert_blooms(modified_blooms_2);
+
+	let modified_blooms_3 = {
+		let chain = BloomGroupChain::new(config, &db);
+		let block_number = 17;
+		chain.insert(block_number, bloom3.clone())
+	};
+
+	db.insert_blooms(modified_blooms_3);
+
+
+	let reset_modified_blooms = {
+		let chain = BloomGroupChain::new(config, &db);
+		chain.replace(&(15..17), vec![bloom4.clone(), bloom5.clone()])
+	};
+
+	db.insert_blooms(reset_modified_blooms);
+
+	let chain = BloomGroupChain::new(config, &db);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom0), vec![14]);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom1), vec![]);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom2), vec![]);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom3), vec![]);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom4), vec![15]);
+	assert_eq!(chain.with_bloom(&(0..100), &bloom5), vec![16]);
+}
+
+#[test]
+fn file_test_bloom_group_search() {
+	let config = Config::default();
+	let mut db = BloomGroupMemoryDatabase::default();
+	let blooms_file = include_bytes!("data/blooms.txt");
+
+	for_each_bloom(blooms_file, | block_number, bloom | {
+		let modified_blooms = {
+			let chain = BloomGroupChain::new(config, &db);
+			chain.insert(block_number, bloom)
+		};
+
+		// number of modified blooms should always be equal number of levels
+		assert_eq!(modified_blooms.len(), config.levels);
+		db.insert_blooms(modified_blooms);
+	});
+
+	for_each_bloom(blooms_file, | block_number, bloom | {
+		let chain = BloomGroupChain::new(config, &db);
+		let blocks = chain.with_bloom(&(block_number..block_number), &bloom);
+		assert_eq!(blocks.len(), 1);
+		assert_eq!(blocks[0], block_number);
+	});
+}
+
+#[test]
+fn random_bloom_group_replacement() {
+	let insertions = 10_000;
+
+	let config = Config::default();
+	let mut db = BloomGroupMemoryDatabase::default();
+	let blooms = generate_n_random_blooms(insertions);
+
+	for (i, bloom) in blooms.iter().enumerate() {
+
+		let modified_blooms = {
+			let chain = BloomGroupChain::new(config, &db);
+			chain.replace(&(i..i), vec![bloom.clone()])
+		};
+
+		db.insert_blooms(modified_blooms);
+	}
+
+	for (i, bloom) in blooms.iter().enumerate() {
+		let chain = BloomGroupChain::new(config, &db);
+		let blocks = chain.with_bloom(&(i..i), bloom);
+		assert_eq!(blocks.len(), 1);
+		assert_eq!(blocks[0], i);
+	}
+}
diff --git a/util/bloomchain/tests/util/db.rs b/util/bloomchain/tests/util/db.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8101b37848d41e2af70608390e22088966feac27
--- /dev/null
+++ b/util/bloomchain/tests/util/db.rs
@@ -0,0 +1,39 @@
+use std::collections::HashMap;
+use bloomchain::{Position, Bloom, BloomDatabase};
+use bloomchain::group::{GroupPosition, BloomGroup, BloomGroupDatabase};
+
+#[derive(Default)]
+pub struct BloomMemoryDatabase {
+	mem: HashMap<Position, Bloom>,
+}
+
+impl BloomMemoryDatabase {
+	#[allow(dead_code)]
+	pub fn insert_blooms(&mut self, blooms: HashMap<Position, Bloom>) {
+		self.mem.extend(blooms);
+	}
+}
+
+impl BloomDatabase for BloomMemoryDatabase {
+	fn bloom_at(&self, position: &Position) -> Option<Bloom> {
+		self.mem.get(position).cloned()
+	}
+}
+
+#[derive(Default)]
+pub struct BloomGroupMemoryDatabase {
+	mem: HashMap<GroupPosition, BloomGroup>,
+}
+
+impl BloomGroupMemoryDatabase {
+	#[allow(dead_code)]
+	pub fn insert_blooms(&mut self, groups: HashMap<GroupPosition, BloomGroup>) {
+		self.mem.extend(groups);
+	}
+}
+
+impl BloomGroupDatabase for BloomGroupMemoryDatabase {
+	fn blooms_at(&self, position: &GroupPosition) -> Option<BloomGroup> {
+		self.mem.get(position).cloned()
+	}
+}
diff --git a/util/bloomchain/tests/util/each.rs b/util/bloomchain/tests/util/each.rs
new file mode 100644
index 0000000000000000000000000000000000000000..19ca1b67cf5a6a936e7b1329f5559d8cf8321c2f
--- /dev/null
+++ b/util/bloomchain/tests/util/each.rs
@@ -0,0 +1,24 @@
+use std::io::{BufReader, Read, BufRead};
+use bloomchain::Bloom;
+use super::FromHex;
+
+pub fn for_each_bloom<F>(bytes: &[u8], mut f: F) where F: FnMut(usize, Bloom) {
+	let mut reader = BufReader::new(bytes);
+	let mut line = String::new();
+	while reader.read_line(&mut line).unwrap() > 0 {
+		{
+			let mut number_bytes = vec![];
+			let mut bloom_bytes = [0; 512];
+
+			let mut line_reader = BufReader::new(line.as_ref() as &[u8]);
+			line_reader.read_until(b' ', &mut number_bytes).unwrap();
+			line_reader.consume(2);
+			line_reader.read_exact(&mut bloom_bytes).unwrap();
+
+			let number = String::from_utf8(number_bytes).map(|s| s[..s.len() -1].to_owned()).unwrap().parse::<usize>().unwrap();
+			let bloom = Bloom::from_hex(&String::from_utf8(bloom_bytes.to_vec()).unwrap());
+			f(number, bloom);
+		}
+		line.clear();
+	}
+}
diff --git a/util/bloomchain/tests/util/from_hex.rs b/util/bloomchain/tests/util/from_hex.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9152d304fdf33e508345009e2b6c99c227e4e37b
--- /dev/null
+++ b/util/bloomchain/tests/util/from_hex.rs
@@ -0,0 +1,16 @@
+use rustc_hex::FromHex as RustcFromHex;
+use bloomchain::Bloom;
+
+pub trait FromHex {
+	fn from_hex(s: &str) -> Self where Self: Sized;
+}
+
+impl FromHex for Bloom {
+	fn from_hex(s: &str) -> Self {
+		let mut res = [0u8; 256];
+		let v = s.from_hex().unwrap();
+		assert_eq!(res.len(), v.len());
+		res.copy_from_slice(&v);
+		From::from(res)
+	}
+}
diff --git a/util/bloomchain/tests/util/mod.rs b/util/bloomchain/tests/util/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2a1e55af9a0a27ffd722bbf1880695450d1c11f3
--- /dev/null
+++ b/util/bloomchain/tests/util/mod.rs
@@ -0,0 +1,9 @@
+mod db;
+mod each;
+mod from_hex;
+mod random;
+
+pub use self::db::{BloomMemoryDatabase, BloomGroupMemoryDatabase};
+pub use self::each::for_each_bloom;
+pub use self::from_hex::FromHex;
+pub use self::random::{generate_random_bloom, generate_n_random_blooms};
diff --git a/util/bloomchain/tests/util/random.rs b/util/bloomchain/tests/util/random.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3d50b5ac10a8516af31d1ef29d9a69b9f1bcb064
--- /dev/null
+++ b/util/bloomchain/tests/util/random.rs
@@ -0,0 +1,24 @@
+extern crate rand;
+
+use self::rand::random;
+use bloomchain::Bloom;
+
+pub fn generate_random_bloom() -> Bloom {
+	let mut res = [0u8; 256];
+	let p0 = random::<u8>();
+	let b0 = random::<u8>() % 8;
+	let p1 = random::<u8>();
+	let b1 = random::<u8>() % 8;
+	let p2 = random::<u8>();
+	let b2 = random::<u8>() % 8;
+
+	res[p0 as usize] |= 1 << b0;
+	res[p1 as usize] |= 1 << b1;
+	res[p2 as usize] |= 1 << b2;
+	
+	From::from(res)
+}
+
+pub fn generate_n_random_blooms(n: usize) -> Vec<Bloom> {
+	(0..n).map(|_| generate_random_bloom()).collect()
+}
diff --git a/util/bytes/Cargo.toml b/util/bytes/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..b20e38a2aad7092ad2925ef9c353924b15f000a4
--- /dev/null
+++ b/util/bytes/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "ethcore-bytes"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "byte utilities for Parity"
+license = "GPL-3.0"
+
+[dependencies]
diff --git a/util/src/bytes.rs b/util/bytes/src/lib.rs
similarity index 100%
rename from util/src/bytes.rs
rename to util/bytes/src/lib.rs
diff --git a/util/dir/Cargo.toml b/util/dir/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..c94086386c908eff499731f34c3c8e362184b680
--- /dev/null
+++ b/util/dir/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "dir"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+ethereum-types = "0.2"
+journaldb = { path = "../journaldb" }
+app_dirs = "1.1.1"
diff --git a/util/build.rs b/util/dir/src/helpers.rs
similarity index 54%
rename from util/build.rs
rename to util/dir/src/helpers.rs
index 08ef81697854995f9093770ec64a6583fc687c05..95f8090c87834c8e8a78ee8947b1cdffaef50a2c 100644
--- a/util/build.rs
+++ b/util/dir/src/helpers.rs
@@ -14,24 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-extern crate vergen;
-extern crate rustc_version;
-
-use vergen::*;
+//! Directory helper functions
 use std::env;
-use std::fs::File;
-use std::io::Write;
-use std::path::Path;
 
-fn main() {
-	vergen(OutputFns::all()).unwrap();
-	let out_dir = env::var("OUT_DIR").unwrap();
-	let dest_path = Path::new(&out_dir).join("rustc_version.rs");
-	let mut f = File::create(&dest_path).unwrap();
-	f.write_all(format!("
-		/// Returns compiler version.
-		pub fn rustc_version() -> &'static str {{
-			\"{}\"
-		}}
-	", rustc_version::version()).as_bytes()).unwrap();
+/// Replaces `$HOME` str with home directory path.
+pub fn replace_home(base: &str, arg: &str) -> String {
+	// the $HOME directory on mac os should be `~/Library` or `~/Library/Application Support`
+	let r = arg.replace("$HOME", env::home_dir().unwrap().to_str().unwrap());
+	let r = r.replace("$BASE", base);
+	r.replace("/", &::std::path::MAIN_SEPARATOR.to_string())
+}
+
+/// Replaces `$HOME` str with home directory path and `$LOCAL` with local path.
+pub fn replace_home_and_local(base: &str, local: &str, arg: &str) -> String {
+	let r = replace_home(base, arg);
+	r.replace("$LOCAL", local)
 }
diff --git a/parity/dir.rs b/util/dir/src/lib.rs
similarity index 61%
rename from parity/dir.rs
rename to util/dir/src/lib.rs
index d254886b920854e4d23a7155d88b90e0862870cc..39175d000f3d2d3526239f24b77d03ca43164e43 100644
--- a/parity/dir.rs
+++ b/util/dir/src/lib.rs
@@ -14,27 +14,31 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::fs;
+#![warn(missing_docs)]
+
+//! Dir utilities for platform-specific operations
+extern crate app_dirs;
+extern crate ethereum_types;
+extern crate journaldb;
+
+pub mod helpers;
+use std::{env, fs};
 use std::path::{PathBuf, Path};
-use util::{H64, H256};
-use util::journaldb::Algorithm;
+use ethereum_types::{H64, H256};
+use journaldb::Algorithm;
 use helpers::{replace_home, replace_home_and_local};
 use app_dirs::{AppInfo, get_app_root, AppDataType};
+// re-export platform-specific functions
+use platform::*;
 
-#[cfg(target_os = "macos")] const AUTHOR: &'static str = "Parity";
-#[cfg(target_os = "macos")] const PRODUCT: &'static str = "io.parity.ethereum";
-#[cfg(target_os = "macos")] const PRODUCT_HYPERVISOR: &'static str = "io.parity.ethereum-updates";
-#[cfg(target_os = "windows")] const AUTHOR: &'static str = "Parity";
-#[cfg(target_os = "windows")] const PRODUCT: &'static str = "Ethereum";
-#[cfg(target_os = "windows")] const PRODUCT_HYPERVISOR: &'static str = "EthereumUpdates";
-#[cfg(not(any(target_os = "windows", target_os = "macos")))] const AUTHOR: &'static str = "parity";
-#[cfg(not(any(target_os = "windows", target_os = "macos")))] const PRODUCT: &'static str = "io.parity.ethereum";
-#[cfg(not(any(target_os = "windows", target_os = "macos")))] const PRODUCT_HYPERVISOR: &'static str = "io.parity.ethereum-updates";
-
+/// Platform-specific chains path - Windows only
 #[cfg(target_os = "windows")] pub const CHAINS_PATH: &'static str = "$LOCAL/chains";
+/// Platform-specific chains path
 #[cfg(not(target_os = "windows"))] pub const CHAINS_PATH: &'static str = "$BASE/chains";
 
+/// Platform-specific cache path - Windows only
 #[cfg(target_os = "windows")] pub const CACHE_PATH: &'static str = "$LOCAL/cache";
+/// Platform-specific cache path
 #[cfg(not(target_os = "windows"))] pub const CACHE_PATH: &'static str = "$BASE/cache";
 
 // this const is irrelevent cause we do have migrations now,
@@ -42,13 +46,21 @@ use app_dirs::{AppInfo, get_app_root, AppDataType};
 const LEGACY_CLIENT_DB_VER_STR: &'static str = "5.3";
 
 #[derive(Debug, PartialEq)]
+/// Parity local data directories
 pub struct Directories {
+	/// Base dir
 	pub base: String,
+	/// Database dir
 	pub db: String,
+	/// Cache dir
 	pub cache: String,
+	/// Dir to store keys
 	pub keys: String,
+	/// Signer dir
 	pub signer: String,
+	/// Dir to store dapps
 	pub dapps: String,
+	/// Secrets dir
 	pub secretstore: String,
 }
 
@@ -69,6 +81,7 @@ impl Default for Directories {
 }
 
 impl Directories {
+	/// Create local directories
 	pub fn create_dirs(&self, dapps_enabled: bool, signer_enabled: bool, secretstore_enabled: bool) -> Result<(), String> {
 		fs::create_dir_all(&self.base).map_err(|e| e.to_string())?;
 		fs::create_dir_all(&self.db).map_err(|e| e.to_string())?;
@@ -104,6 +117,7 @@ impl Directories {
 		dir
 	}
 
+	/// Legacy keys path
 	// TODO: remove in 1.7
 	pub fn legacy_keys_path(&self, testnet: bool) -> PathBuf {
 		let mut dir = Path::new(&self.base).to_path_buf();
@@ -115,6 +129,7 @@ impl Directories {
 		dir
 	}
 
+	/// Get the keys path
 	pub fn keys_path(&self, spec_name: &str) -> PathBuf {
 		let mut dir = PathBuf::from(&self.keys);
 		dir.push(spec_name);
@@ -123,11 +138,17 @@ impl Directories {
 }
 
 #[derive(Debug, PartialEq)]
+/// Database directories for the given fork.
 pub struct DatabaseDirectories {
+	/// Base path
 	pub path: String,
+	/// Legacy path
 	pub legacy_path: String,
+	/// Genesis hash
 	pub genesis_hash: H256,
+	/// Name of current fork
 	pub fork_name: Option<String>,
+	/// Name of current spec
 	pub spec_name: String,
 }
 
@@ -135,105 +156,182 @@ impl DatabaseDirectories {
 	/// Base DB directory for the given fork.
 	// TODO: remove in 1.7
 	pub fn legacy_fork_path(&self) -> PathBuf {
-		let mut dir = Path::new(&self.legacy_path).to_path_buf();
-		dir.push(format!("{:?}{}", H64::from(self.genesis_hash), self.fork_name.as_ref().map(|f| format!("-{}", f)).unwrap_or_default()));
-		dir
+		Path::new(&self.legacy_path).join(format!("{:?}{}", H64::from(self.genesis_hash), self.fork_name.as_ref().map(|f| format!("-{}", f)).unwrap_or_default()))
 	}
 
+	/// Spec root directory for the given fork.
 	pub fn spec_root_path(&self) -> PathBuf {
-		let mut dir = Path::new(&self.path).to_path_buf();
-		dir.push(&self.spec_name);
-		dir
+		Path::new(&self.path).join(&self.spec_name)
 	}
 
+	/// Generic client path
 	pub fn client_path(&self, pruning: Algorithm) -> PathBuf {
-		let mut dir = self.db_root_path();
-		dir.push(pruning.as_internal_name_str());
-		dir.push("db");
-		dir
+		self.db_root_path().join(pruning.as_internal_name_str()).join("db")
 	}
 
+	/// DB root path, named after genesis hash
 	pub fn db_root_path(&self) -> PathBuf {
-		let mut dir = self.spec_root_path();
-		dir.push("db");
-		dir.push(H64::from(self.genesis_hash).hex());
-		dir
+		self.spec_root_path().join("db").join(format!("{:x}", H64::from(self.genesis_hash)))
 	}
 
+	/// DB path
 	pub fn db_path(&self, pruning: Algorithm) -> PathBuf {
-		let mut dir = self.db_root_path();
-		dir.push(pruning.as_internal_name_str());
-		dir
+		self.db_root_path().join(pruning.as_internal_name_str())
 	}
 
 	/// Get the root path for database
 	// TODO: remove in 1.7
 	pub fn legacy_version_path(&self, pruning: Algorithm) -> PathBuf {
-		let mut dir = self.legacy_fork_path();
-		dir.push(format!("v{}-sec-{}", LEGACY_CLIENT_DB_VER_STR, pruning.as_internal_name_str()));
-		dir
+		self.legacy_fork_path().join(format!("v{}-sec-{}", LEGACY_CLIENT_DB_VER_STR, pruning.as_internal_name_str()))
 	}
 
-	/// Get user defaults path
+	/// Get user defaults path, legacy way
 	// TODO: remove in 1.7
 	pub fn legacy_user_defaults_path(&self) -> PathBuf {
-		let mut dir = self.legacy_fork_path();
-		dir.push("user_defaults");
-		dir
+		self.legacy_fork_path().join("user_defaults")
 	}
 
-	/// Get user defaults path
+	/// Get snapshot path, legacy way
 	// TODO: remove in 1.7
 	pub fn legacy_snapshot_path(&self) -> PathBuf {
-		let mut dir = self.legacy_fork_path();
-		dir.push("snapshot");
-		dir
+		self.legacy_fork_path().join("snapshot")
 	}
 
-	/// Get user defaults path
+	/// Get user defaults path, legacy way
 	// TODO: remove in 1.7
 	pub fn legacy_network_path(&self) -> PathBuf {
-		let mut dir = self.legacy_fork_path();
-		dir.push("network");
-		dir
+		self.legacy_fork_path().join("network")
 	}
 
+	/// Get user defauls path
 	pub fn user_defaults_path(&self) -> PathBuf {
-		let mut dir = self.spec_root_path();
-		dir.push("user_defaults");
-		dir
+		self.spec_root_path().join("user_defaults")
 	}
 
 	/// Get the path for the snapshot directory given the genesis hash and fork name.
 	pub fn snapshot_path(&self) -> PathBuf {
-		let mut dir = self.db_root_path();
-		dir.push("snapshot");
-		dir
+		self.db_root_path().join("snapshot")
 	}
 
 	/// Get the path for the network directory.
 	pub fn network_path(&self) -> PathBuf {
-		let mut dir = self.spec_root_path();
-		dir.push("network");
-		dir
+		self.spec_root_path().join("network")
 	}
 }
 
+/// Default data path
 pub fn default_data_path() -> String {
 	let app_info = AppInfo { name: PRODUCT, author: AUTHOR };
 	get_app_root(AppDataType::UserData, &app_info).map(|p| p.to_string_lossy().into_owned()).unwrap_or_else(|_| "$HOME/.parity".to_owned())
 }
 
+/// Default local path
 pub fn default_local_path() -> String {
 	let app_info = AppInfo { name: PRODUCT, author: AUTHOR };
 	get_app_root(AppDataType::UserCache, &app_info).map(|p| p.to_string_lossy().into_owned()).unwrap_or_else(|_| "$HOME/.parity".to_owned())
 }
 
+/// Default hypervisor path
 pub fn default_hypervisor_path() -> String {
 	let app_info = AppInfo { name: PRODUCT_HYPERVISOR, author: AUTHOR };
 	get_app_root(AppDataType::UserData, &app_info).map(|p| p.to_string_lossy().into_owned()).unwrap_or_else(|_| "$HOME/.parity-hypervisor".to_owned())
 }
 
+/// Get home directory.
+fn home() -> PathBuf {
+	env::home_dir().expect("Failed to get home dir")
+}
+
+/// Geth path
+pub fn geth(testnet: bool) -> PathBuf {
+	let mut base = geth_base();
+	if testnet {
+		base.push("testnet");
+	}
+	base.push("keystore");
+	base
+}
+
+/// Parity path for specific chain
+pub fn parity(chain: &str) -> PathBuf {
+	let mut base = parity_base();
+	base.push(chain);
+	base
+}
+
+#[cfg(target_os = "macos")]
+mod platform {
+	use std::path::PathBuf;
+	pub const AUTHOR: &'static str = "Parity";
+	pub const PRODUCT: &'static str = "io.parity.ethereum";
+	pub const PRODUCT_HYPERVISOR: &'static str = "io.parity.ethereum-updates";
+
+	pub fn parity_base() -> PathBuf {
+		let mut home = super::home();
+		home.push("Library");
+		home.push("Application Support");
+		home.push("io.parity.ethereum");
+		home.push("keys");
+		home
+	}
+
+	pub fn geth_base() -> PathBuf {
+		let mut home = super::home();
+		home.push("Library");
+		home.push("Ethereum");
+		home
+	}
+}
+
+#[cfg(windows)]
+mod platform {
+	use std::path::PathBuf;
+	pub const AUTHOR: &'static str = "Parity";
+	pub const PRODUCT: &'static str = "Ethereum";
+	pub const PRODUCT_HYPERVISOR: &'static str = "EthereumUpdates";
+
+	pub fn parity_base() -> PathBuf {
+		let mut home = super::home();
+		home.push("AppData");
+		home.push("Roaming");
+		home.push("Parity");
+		home.push("Ethereum");
+		home.push("keys");
+		home
+	}
+
+	pub fn geth_base() -> PathBuf {
+		let mut home = super::home();
+		home.push("AppData");
+		home.push("Roaming");
+		home.push("Ethereum");
+		home
+	}
+}
+
+#[cfg(not(any(target_os = "macos", windows)))]
+mod platform {
+	use std::path::PathBuf;
+	pub const AUTHOR: &'static str = "parity";
+	pub const PRODUCT: &'static str = "io.parity.ethereum";
+	pub const PRODUCT_HYPERVISOR: &'static str = "io.parity.ethereum-updates";
+
+	pub fn parity_base() -> PathBuf {
+		let mut home = super::home();
+		home.push(".local");
+		home.push("share");
+		home.push("io.parity.ethereum");
+		home.push("keys");
+		home
+	}
+
+	pub fn geth_base() -> PathBuf {
+		let mut home = super::home();
+		home.push(".ethereum");
+		home
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::Directories;
diff --git a/util/error/Cargo.toml b/util/error/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..ffbd8e4a7cd7beecd1bae971f746d464fd8b0843
--- /dev/null
+++ b/util/error/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "util-error"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+rlp = { path = "../rlp" }
+kvdb = { path = "../kvdb" }
+ethereum-types = "0.2"
+error-chain = { version = "0.11", default-features = false }
+rustc-hex = "1.0"
diff --git a/util/error/src/lib.rs b/util/error/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9a1ab875364f27d654e70e67342ceb888a07a386
--- /dev/null
+++ b/util/error/src/lib.rs
@@ -0,0 +1,77 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! General error types for use in ethcore.
+
+#![allow(missing_docs)]
+#![allow(unknown_lints)]
+
+#[macro_use]
+extern crate error_chain;
+
+extern crate ethereum_types;
+extern crate rlp;
+extern crate rustc_hex;
+extern crate kvdb;
+
+use std::fmt;
+use rustc_hex::FromHexError;
+use rlp::DecoderError;
+use ethereum_types::H256;
+
+#[derive(Debug)]
+/// Error in database subsystem.
+pub enum BaseDataError {
+	/// An entry was removed more times than inserted.
+	NegativelyReferencedHash(H256),
+	/// A committed value was inserted more than once.
+	AlreadyExists(H256),
+}
+
+impl fmt::Display for BaseDataError {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match *self {
+			BaseDataError::NegativelyReferencedHash(hash) =>
+				write!(f, "Entry {} removed from database more times than it was added.", hash),
+			BaseDataError::AlreadyExists(hash) =>
+				write!(f, "Committed key already exists in database: {}", hash),
+		}
+	}
+}
+
+impl std::error::Error for BaseDataError {
+	fn description(&self) -> &str {
+		"Error in database subsystem"
+	}
+}
+
+error_chain! {
+	types {
+		UtilError, ErrorKind, ResultExt, Result;
+	}
+
+	links {
+		Db(kvdb::Error, kvdb::ErrorKind);
+	}
+
+	foreign_links {
+		Io(::std::io::Error);
+		FromHex(FromHexError);
+		Decoder(DecoderError);
+		BaseData(BaseDataError);
+	}
+}
+
diff --git a/util/fetch/Cargo.toml b/util/fetch/Cargo.toml
index f88bdb551c52ea0725ad38ef659db7d777f4abd6..61925e189d1d107046408694d15b3bc22bfaee58 100644
--- a/util/fetch/Cargo.toml
+++ b/util/fetch/Cargo.toml
@@ -8,11 +8,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 futures = "0.1"
-futures-cpupool = "0.1"
-parking_lot = "0.4"
-log = "0.3"
-reqwest = "0.6"
-mime = "0.2"
+futures-timer = "0.1"
+hyper = "0.11"
+hyper-rustls = "0.11"
+log = "0.4"
+tokio-core = "0.1"
+url = "1"
 
 [features]
 default = []
diff --git a/util/fetch/src/client.rs b/util/fetch/src/client.rs
index 64193639ac5a4c2d020abd195ee7fa39670273c2..c57a362ca95b1af6c668b22ca1a00055924e4721 100644
--- a/util/fetch/src/client.rs
+++ b/util/fetch/src/client.rs
@@ -14,337 +14,665 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Fetching
-
-use std::{io, fmt, time};
+use futures::future::{self, Loop};
+use futures::sync::{mpsc, oneshot};
+use futures::{self, Future, Async, Sink, Stream};
+use futures_timer::FutureExt;
+use hyper::header::{UserAgent, Location, ContentLength, ContentType};
+use hyper::mime::Mime;
+use hyper::{self, Request, Method, StatusCode};
+use hyper_rustls;
+use std;
+use std::cmp::min;
 use std::sync::Arc;
-use std::sync::atomic::{self, AtomicBool};
-
-use futures::{self, BoxFuture, Future};
-use futures_cpupool::{CpuPool, CpuFuture};
-use mime::{self, Mime};
-use parking_lot::RwLock;
-use reqwest;
-
-/// Fetch abort control
-#[derive(Default, Debug, Clone)]
-pub struct Abort(Arc<AtomicBool>);
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::sync::mpsc::RecvTimeoutError;
+use std::thread;
+use std::time::Duration;
+use std::{io, fmt};
+use tokio_core::reactor;
+use url::{self, Url};
+
+const MAX_SIZE: usize = 64 * 1024 * 1024;
+const MAX_SECS: u64 = 5;
+const MAX_REDR: usize = 5;
+
+/// A handle to abort requests.
+///
+/// Requests are either aborted based on reaching thresholds such as
+/// maximum response size, timeouts or too many redirects, or else
+/// they can be aborted explicitly by the calling code.
+#[derive(Clone, Debug)]
+pub struct Abort {
+	abort: Arc<AtomicBool>,
+	size: usize,
+	time: Duration,
+	redir: usize,
+}
 
-impl Abort {
-	/// Returns `true` if request is aborted.
-	pub fn is_aborted(&self) -> bool {
-		self.0.load(atomic::Ordering::SeqCst)
+impl Default for Abort {
+	fn default() -> Abort {
+		Abort {
+			abort: Arc::new(AtomicBool::new(false)),
+			size: MAX_SIZE,
+			time: Duration::from_secs(MAX_SECS),
+			redir: MAX_REDR,
+		}
 	}
 }
 
 impl From<Arc<AtomicBool>> for Abort {
-	fn from(a: Arc<AtomicBool>) -> Self {
-		Abort(a)
+	fn from(a: Arc<AtomicBool>) -> Abort {
+		Abort {
+			abort: a,
+			size: MAX_SIZE,
+			time: Duration::from_secs(MAX_SECS),
+			redir: MAX_REDR,
+		}
 	}
 }
 
-/// Fetch
-pub trait Fetch: Clone + Send + Sync + 'static {
-	/// Result type
-	type Result: Future<Item=Response, Error=Error> + Send + 'static;
+impl Abort {
+	/// True if `abort` has been invoked.
+	pub fn is_aborted(&self) -> bool {
+		self.abort.load(Ordering::SeqCst)
+	}
 
-	/// Creates new Fetch object.
-	fn new() -> Result<Self, Error> where Self: Sized;
+	/// The maximum response body size.
+	pub fn max_size(&self) -> usize {
+		self.size
+	}
 
-	/// Spawn the future in context of this `Fetch` thread pool.
-	/// Implementation is optional.
-	fn process<F, I, E>(&self, f: F) -> BoxFuture<I, E> where
-		F: Future<Item=I, Error=E> + Send + 'static,
-		I: Send + 'static,
-		E: Send + 'static,
-	{
-		f.boxed()
+	/// The maximum total time, including redirects.
+	pub fn max_duration(&self) -> Duration {
+		self.time
 	}
 
-	/// Spawn the future in context of this `Fetch` thread pool as "fire and forget", i.e. dropping this future without
-	/// canceling the underlying future.
-	/// Implementation is optional.
-	fn forget<F, I, E>(&self, _: F) where
-		F: Future<Item=I, Error=E> + Send + 'static,
-		I: Send + 'static,
-		E: Send + 'static {}
+	/// The maximum number of redirects to allow.
+	pub fn max_redirects(&self) -> usize {
+		self.redir
+	}
 
-	/// Fetch URL and get a future for the result.
-	/// Supports aborting the request in the middle of execution.
-	fn fetch_with_abort(&self, url: &str, abort: Abort) -> Self::Result;
+	/// Mark as aborted.
+	pub fn abort(&self) {
+		self.abort.store(true, Ordering::SeqCst)
+	}
 
-	/// Fetch URL and get a future for the result.
-	fn fetch(&self, url: &str) -> Self::Result {
-		self.fetch_with_abort(url, Default::default())
+	/// Set the maximum reponse body size.
+	pub fn with_max_size(self, n: usize) -> Abort {
+		Abort { size: n, .. self }
 	}
 
-	/// Fetch URL and get the result synchronously.
-	fn fetch_sync(&self, url: &str) -> Result<Response, Error> {
-		self.fetch(url).wait()
+	/// Set the maximum duration (including redirects).
+	pub fn with_max_duration(self, d: Duration) -> Abort {
+		Abort { time: d, .. self }
 	}
 
-	/// Closes this client
-	fn close(self) where Self: Sized {}
+	/// Set the maximum number of redirects to follow.
+	pub fn with_max_redirects(self, n: usize) -> Abort {
+		Abort { redir: n, .. self }
+	}
 }
 
-const CLIENT_TIMEOUT_SECONDS: u64 = 5;
+/// Types which retrieve content from some URL.
+pub trait Fetch: Clone + Send + Sync + 'static {
+	/// The result future.
+	type Result: Future<Item=Response, Error=Error> + Send + 'static;
+
+	/// Get content from some URL.
+	fn fetch(&self, url: &str, abort: Abort) -> Self::Result;
+}
 
-/// Fetch client
+type TxResponse = oneshot::Sender<Result<Response, Error>>;
+type TxStartup = std::sync::mpsc::SyncSender<Result<(), io::Error>>;
+type ChanItem = Option<(Url, Abort, TxResponse)>;
+
+/// An implementation of `Fetch` using a `hyper` client.
+// Due to the `Send` bound of `Fetch` we spawn a background thread for
+// actual request/response processing as `hyper::Client` itself does
+// not implement `Send` currently.
+#[derive(Debug)]
 pub struct Client {
-	client: RwLock<(time::Instant, Arc<reqwest::Client>)>,
-	pool: CpuPool,
-	limit: Option<usize>,
+	core: mpsc::Sender<ChanItem>,
+	refs: Arc<AtomicUsize>,
 }
 
+// When cloning a client we increment the internal reference counter.
 impl Clone for Client {
-	fn clone(&self) -> Self {
-		let (ref time, ref client) = *self.client.read();
+	fn clone(&self) -> Client {
+		self.refs.fetch_add(1, Ordering::SeqCst);
 		Client {
-			client: RwLock::new((time.clone(), client.clone())),
-			pool: self.pool.clone(),
-			limit: self.limit.clone(),
+			core: self.core.clone(),
+			refs: self.refs.clone(),
 		}
 	}
 }
 
-impl Client {
-	fn new_client() -> Result<Arc<reqwest::Client>, Error> {
-		let mut client = reqwest::Client::new()?;
-		client.redirect(reqwest::RedirectPolicy::limited(5));
-		Ok(Arc::new(client))
+// When dropping a client, we decrement the reference counter.
+// Once it reaches 0 we terminate the background thread.
+impl Drop for Client {
+	fn drop(&mut self) {
+		if self.refs.fetch_sub(1, Ordering::SeqCst) == 1 {
+			// ignore send error as it means the background thread is gone already
+			let _ = self.core.clone().send(None).wait();
+		}
 	}
+}
 
-	fn with_limit(limit: Option<usize>) -> Result<Self, Error> {
-		Ok(Client {
-			client: RwLock::new((time::Instant::now(), Self::new_client()?)),
-			pool: CpuPool::new(4),
-			limit: limit,
-		})
-	}
+impl Client {
+	/// Create a new fetch client.
+	pub fn new() -> Result<Self, Error> {
+		let (tx_start, rx_start) = std::sync::mpsc::sync_channel(1);
+		let (tx_proto, rx_proto) = mpsc::channel(64);
+
+		Client::background_thread(tx_start, rx_proto)?;
 
-	fn client(&self) -> Result<Arc<reqwest::Client>, Error> {
-		{
-			let (ref time, ref client) = *self.client.read();
-			if time.elapsed() < time::Duration::from_secs(CLIENT_TIMEOUT_SECONDS) {
-				return Ok(client.clone());
+		match rx_start.recv_timeout(Duration::from_secs(10)) {
+			Err(RecvTimeoutError::Timeout) => {
+				error!(target: "fetch", "timeout starting background thread");
+				return Err(Error::BackgroundThreadDead)
 			}
+			Err(RecvTimeoutError::Disconnected) => {
+				error!(target: "fetch", "background thread gone");
+				return Err(Error::BackgroundThreadDead)
+			}
+			Ok(Err(e)) => {
+				error!(target: "fetch", "error starting background thread: {}", e);
+				return Err(e.into())
+			}
+			Ok(Ok(())) => {}
 		}
 
-		let client = Self::new_client()?;
-		*self.client.write() = (time::Instant::now(), client.clone());
-		Ok(client)
+		Ok(Client {
+			core: tx_proto,
+			refs: Arc::new(AtomicUsize::new(1)),
+		})
 	}
 
-	/// Returns a handle to underlying CpuPool of this client.
-	pub fn pool(&self) -> CpuPool {
-		self.pool.clone()
+	fn background_thread(tx_start: TxStartup, rx_proto: mpsc::Receiver<ChanItem>) -> io::Result<thread::JoinHandle<()>> {
+		thread::Builder::new().name("fetch".into()).spawn(move || {
+			let mut core = match reactor::Core::new() {
+				Ok(c) => c,
+				Err(e) => return tx_start.send(Err(e)).unwrap_or(())
+			};
+
+			let handle = core.handle();
+			let hyper = hyper::Client::configure()
+				.connector(hyper_rustls::HttpsConnector::new(4, &core.handle()))
+				.build(&core.handle());
+
+			let future = rx_proto.take_while(|item| Ok(item.is_some()))
+				.map(|item| item.expect("`take_while` is only passing on channel items != None; qed"))
+				.for_each(|(url, abort, sender)|
+			{
+				trace!(target: "fetch", "new request to {}", url);
+				if abort.is_aborted() {
+					return future::ok(sender.send(Err(Error::Aborted)).unwrap_or(()))
+				}
+				let ini = (hyper.clone(), url, abort, 0);
+				let fut = future::loop_fn(ini, |(client, url, abort, redirects)| {
+					let url2 = url.clone();
+					let abort2 = abort.clone();
+					client.request(get(&url))
+						.map(move |resp| Response::new(url2, resp, abort2))
+						.from_err()
+						.and_then(move |resp| {
+							if abort.is_aborted() {
+								debug!(target: "fetch", "fetch of {} aborted", url);
+								return Err(Error::Aborted)
+							}
+							if let Some(next_url) = redirect_location(url, &resp) {
+								if redirects >= abort.max_redirects() {
+									return Err(Error::TooManyRedirects)
+								}
+								Ok(Loop::Continue((client, next_url, abort, redirects + 1)))
+							} else {
+								let content_len = resp.headers.get::<ContentLength>().cloned();
+								if content_len.map(|n| *n > abort.max_size() as u64).unwrap_or(false) {
+									return Err(Error::SizeLimit)
+								}
+								Ok(Loop::Break(resp))
+							}
+						})
+					})
+					.then(|result| {
+						future::ok(sender.send(result).unwrap_or(()))
+					});
+				handle.spawn(fut);
+				trace!(target: "fetch", "waiting for next request ...");
+				future::ok(())
+			});
+
+			tx_start.send(Ok(())).unwrap_or(());
+
+			debug!(target: "fetch", "processing requests ...");
+			if let Err(()) = core.run(future) {
+				error!(target: "fetch", "error while executing future")
+			}
+			debug!(target: "fetch", "fetch background thread finished")
+		})
 	}
 }
 
 impl Fetch for Client {
-	type Result = CpuFuture<Response, Error>;
-
-	fn new() -> Result<Self, Error> {
-		// Max 50MB will be downloaded.
-		Self::with_limit(Some(50*1024*1024))
-	}
-
-	fn process<F, I, E>(&self, f: F) -> BoxFuture<I, E> where
-		F: Future<Item=I, Error=E> + Send + 'static,
-		I: Send + 'static,
-		E: Send + 'static,
-	{
-		self.pool.spawn(f).boxed()
-	}
-
-	fn forget<F, I, E>(&self, f: F) where
-		F: Future<Item=I, Error=E> + Send + 'static,
-		I: Send + 'static,
-		E: Send + 'static,
-	{
-		self.pool.spawn(f).forget()
-	}
-
-	fn fetch_with_abort(&self, url: &str, abort: Abort) -> Self::Result {
-		debug!(target: "fetch", "Fetching from: {:?}", url);
-
-		match self.client() {
-			Ok(client) => {
-				self.pool.spawn(FetchTask {
-					url: url.into(),
-					client: client,
-					limit: self.limit,
-					abort: abort,
-				})
-			},
-			Err(err) => {
-				self.pool.spawn(futures::future::err(err))
-			},
+	type Result = Box<Future<Item=Response, Error=Error> + Send>;
+
+	fn fetch(&self, url: &str, abort: Abort) -> Self::Result {
+		debug!(target: "fetch", "fetching: {:?}", url);
+		if abort.is_aborted() {
+			return Box::new(future::err(Error::Aborted))
 		}
+		let url: Url = match url.parse() {
+			Ok(u) => u,
+			Err(e) => return Box::new(future::err(e.into()))
+		};
+		let (tx_res, rx_res) = oneshot::channel();
+		let maxdur = abort.max_duration();
+		let sender = self.core.clone();
+		let future = sender.send(Some((url.clone(), abort, tx_res)))
+			.map_err(|e| {
+				error!(target: "fetch", "failed to schedule request: {}", e);
+				Error::BackgroundThreadDead
+			})
+			.and_then(|_| rx_res.map_err(|oneshot::Canceled| Error::BackgroundThreadDead))
+			.and_then(future::result)
+			.timeout(maxdur)
+			.map_err(|err| {
+				if let Error::Io(ref e) = err {
+					if let io::ErrorKind::TimedOut = e.kind() {
+						return Error::Timeout
+					}
+				}
+				err.into()
+			});
+		Box::new(future)
 	}
 }
 
-struct FetchTask {
-	url: String,
-	client: Arc<reqwest::Client>,
-	limit: Option<usize>,
+// Extract redirect location from response.
+fn redirect_location(u: Url, r: &Response) -> Option<Url> {
+	use hyper::StatusCode::*;
+	match r.status() {
+		MovedPermanently
+		| PermanentRedirect
+		| TemporaryRedirect
+		| Found
+		| SeeOther => {
+			if let Some(loc) = r.headers.get::<Location>() {
+				u.join(loc).ok()
+			} else {
+				None
+			}
+		}
+		_ => None
+	}
+}
+
+// Build a simple GET request for the given Url.
+fn get(u: &Url) -> hyper::Request {
+	let uri = u.as_ref().parse().expect("Every valid URL is aso a URI.");
+	let mut rq = Request::new(Method::Get, uri);
+	rq.headers_mut().set(UserAgent::new("Parity Fetch Neo"));
+	rq
+}
+
+/// An HTTP response.
+#[derive(Debug)]
+pub struct Response {
+	url: Url,
+	status: StatusCode,
+	headers: hyper::Headers,
+	body: hyper::Body,
 	abort: Abort,
+	nread: usize,
 }
 
-impl Future for FetchTask {
-	// TODO [ToDr] timeouts handling?
-	type Item = Response;
+impl Response {
+	/// Create a new response, wrapping a hyper response.
+	pub fn new(u: Url, r: hyper::Response, a: Abort) -> Response {
+		Response {
+			url: u,
+			status: r.status(),
+			headers: r.headers().clone(),
+			body: r.body(),
+			abort: a,
+			nread: 0,
+		}
+	}
+
+	/// The response status.
+	pub fn status(&self) -> StatusCode {
+		self.status
+	}
+
+	/// Status code == OK (200)?
+	pub fn is_success(&self) -> bool {
+		self.status() == StatusCode::Ok
+	}
+
+	/// Is the content-type text/html?
+	pub fn is_html(&self) -> bool {
+		if let Some(ref mime) = self.content_type() {
+			mime.type_() == "text" && mime.subtype() == "html"
+		} else {
+			false
+		}
+	}
+
+	/// The conten-type header value.
+	pub fn content_type(&self) -> Option<Mime> {
+		self.headers.get::<ContentType>().map(|ct| ct.0.clone())
+	}
+}
+
+impl Stream for Response {
+	type Item = hyper::Chunk;
 	type Error = Error;
 
-	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
+	fn poll(&mut self) -> futures::Poll<Option<Self::Item>, Self::Error> {
 		if self.abort.is_aborted() {
-			trace!(target: "fetch", "Fetch of {:?} aborted.", self.url);
-			return Err(Error::Aborted);
+			debug!(target: "fetch", "fetch of {} aborted", self.url);
+			return Err(Error::Aborted)
+		}
+		match try_ready!(self.body.poll()) {
+			None => Ok(Async::Ready(None)),
+			Some(c) => {
+				if self.nread + c.len() > self.abort.max_size() {
+					debug!(target: "fetch", "size limit {:?} for {} exceeded", self.abort.max_size(), self.url);
+					return Err(Error::SizeLimit)
+				}
+				self.nread += c.len();
+				Ok(Async::Ready(Some(c)))
+			}
 		}
+	}
+}
 
-		trace!(target: "fetch", "Starting fetch task: {:?}", self.url);
-		let result = self.client.get(&self.url)
-						  .header(reqwest::header::UserAgent("Parity Fetch".into()))
-						  .send()?;
+/// `BodyReader` serves as an adapter from async to sync I/O.
+///
+/// It implements `io::Read` by repedately waiting for the next `Chunk`
+/// of hyper's response `Body` which blocks the current thread.
+pub struct BodyReader {
+	chunk: hyper::Chunk,
+	body: Option<hyper::Body>,
+	abort: Abort,
+	offset: usize,
+	count: usize,
+}
 
-		Ok(futures::Async::Ready(Response {
-			inner: ResponseInner::Response(result),
-			abort: self.abort.clone(),
-			limit: self.limit,
-			read: 0,
-		}))
+impl BodyReader {
+	/// Create a new body reader for the given response.
+	pub fn new(r: Response) -> BodyReader {
+		BodyReader {
+			body: Some(r.body),
+			chunk: Default::default(),
+			abort: r.abort,
+			offset: 0,
+			count: 0,
+		}
 	}
 }
 
-/// Fetch Error
+impl io::Read for BodyReader {
+	fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+		let mut n = 0;
+		while self.body.is_some() {
+			// Can we still read from the current chunk?
+			if self.offset < self.chunk.len() {
+				let k = min(self.chunk.len() - self.offset, buf.len() - n);
+				if self.count + k > self.abort.max_size() {
+					debug!(target: "fetch", "size limit {:?} exceeded", self.abort.max_size());
+					return Err(io::Error::new(io::ErrorKind::PermissionDenied, "size limit exceeded"))
+				}
+				let c = &self.chunk[self.offset .. self.offset + k];
+				(&mut buf[n .. n + k]).copy_from_slice(c);
+				self.offset += k;
+				self.count += k;
+				n += k;
+				if n == buf.len() {
+					break
+				}
+			} else {
+				let body = self.body.take().expect("loop condition ensures `self.body` is always defined; qed");
+				match body.into_future().wait() { // wait for next chunk
+					Err((e, _)) => {
+						error!(target: "fetch", "failed to read chunk: {}", e);
+						return Err(io::Error::new(io::ErrorKind::Other, "failed to read body chunk"))
+					}
+					Ok((None, _)) => break, // body is exhausted, break out of the loop
+					Ok((Some(c), b)) => {
+						self.body = Some(b);
+						self.chunk = c;
+						self.offset = 0
+					}
+				}
+			}
+		}
+		Ok(n)
+	}
+}
+
+/// Fetch error cases.
 #[derive(Debug)]
 pub enum Error {
-	/// Internal fetch error
-	Fetch(reqwest::Error),
-	/// Request aborted
+	/// Hyper gave us an error.
+	Hyper(hyper::Error),
+	/// Some I/O error occured.
+	Io(io::Error),
+	/// Invalid URLs where attempted to parse.
+	Url(url::ParseError),
+	/// Calling code invoked `Abort::abort`.
 	Aborted,
+	/// Too many redirects have been encountered.
+	TooManyRedirects,
+	/// The maximum duration was reached.
+	Timeout,
+	/// The response body is too large.
+	SizeLimit,
+	/// The background processing thread does not run.
+	BackgroundThreadDead,
 }
 
 impl fmt::Display for Error {
 	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
 		match *self {
 			Error::Aborted => write!(fmt, "The request has been aborted."),
-			Error::Fetch(ref err) => write!(fmt, "{}", err),
+			Error::Hyper(ref e) => write!(fmt, "{}", e),
+			Error::Url(ref e) => write!(fmt, "{}", e),
+			Error::Io(ref e) => write!(fmt, "{}", e),
+			Error::BackgroundThreadDead => write!(fmt, "background thread gond"),
+			Error::TooManyRedirects => write!(fmt, "too many redirects"),
+			Error::Timeout => write!(fmt, "request timed out"),
+			Error::SizeLimit => write!(fmt, "size limit reached"),
 		}
 	}
 }
 
-impl From<reqwest::Error> for Error {
-	fn from(error: reqwest::Error) -> Self {
-		Error::Fetch(error)
+impl From<hyper::Error> for Error {
+	fn from(e: hyper::Error) -> Self {
+		Error::Hyper(e)
 	}
 }
 
-enum ResponseInner {
-	Response(reqwest::Response),
-	Reader(Box<io::Read + Send>),
-	NotFound,
+impl From<io::Error> for Error {
+	fn from(e: io::Error) -> Self {
+		Error::Io(e)
+	}
 }
 
-impl fmt::Debug for ResponseInner {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		match *self {
-			ResponseInner::Response(ref response) => response.fmt(f),
-			ResponseInner::NotFound => write!(f, "Not found"),
-			ResponseInner::Reader(_) => write!(f, "io Reader"),
-		}
+impl From<url::ParseError> for Error {
+	fn from(e: url::ParseError) -> Self {
+		Error::Url(e)
 	}
 }
 
-/// A fetch response type.
-#[derive(Debug)]
-pub struct Response {
-	inner: ResponseInner,
-	abort: Abort,
-	limit: Option<usize>,
-	read: usize,
-}
+#[cfg(test)]
+mod test {
+	use super::*;
+	use futures::future;
+	use futures::sync::mpsc;
+	use futures_timer::Delay;
+	use hyper::StatusCode;
+	use hyper::server::{Http, Request, Response, Service};
+	use std;
+	use std::io::Read;
+	use std::net::SocketAddr;
+
+	const ADDRESS: &str = "127.0.0.1:0";
+
+	#[test]
+	fn it_should_fetch() {
+		let server = TestServer::run();
+		let client = Client::new().unwrap();
+		let future = client.fetch(&format!("http://{}?123", server.addr()), Default::default());
+		let resp = future.wait().unwrap();
+		assert!(resp.is_success());
+		let body = resp.concat2().wait().unwrap();
+		assert_eq!(&body[..], b"123")
+	}
 
-impl Response {
-	/// Creates new successfuly response reading from a file.
-	pub fn from_reader<R: io::Read + Send + 'static>(reader: R) -> Self {
-		Response {
-			inner: ResponseInner::Reader(Box::new(reader)),
-			abort: Abort::default(),
-			limit: None,
-			read: 0,
+	#[test]
+	fn it_should_timeout() {
+		let server = TestServer::run();
+		let client = Client::new().unwrap();
+		let abort = Abort::default().with_max_duration(Duration::from_secs(1));
+		match client.fetch(&format!("http://{}/delay?3", server.addr()), abort).wait() {
+			Err(Error::Timeout) => {}
+			other => panic!("expected timeout, got {:?}", other)
 		}
 	}
 
-	/// Creates 404 response (useful for tests)
-	pub fn not_found() -> Self {
-		Response {
-			inner: ResponseInner::NotFound,
-			abort: Abort::default(),
-			limit: None,
-			read: 0,
-		}
+	#[test]
+	fn it_should_follow_redirects() {
+		let server = TestServer::run();
+		let client = Client::new().unwrap();
+		let abort = Abort::default();
+		let future = client.fetch(&format!("http://{}/redirect?http://{}/", server.addr(), server.addr()), abort);
+		assert!(future.wait().unwrap().is_success())
 	}
 
-	/// Returns status code of this response.
-	pub fn status(&self) -> reqwest::StatusCode {
-		match self.inner {
-			ResponseInner::Response(ref r) => *r.status(),
-			ResponseInner::NotFound => reqwest::StatusCode::NotFound,
-			_ => reqwest::StatusCode::Ok,
+	#[test]
+	fn it_should_follow_relative_redirects() {
+		let server = TestServer::run();
+		let client = Client::new().unwrap();
+		let abort = Abort::default().with_max_redirects(4);
+		let future = client.fetch(&format!("http://{}/redirect?/", server.addr()), abort);
+		assert!(future.wait().unwrap().is_success())
+	}
+
+	#[test]
+	fn it_should_not_follow_too_many_redirects() {
+		let server = TestServer::run();
+		let client = Client::new().unwrap();
+		let abort = Abort::default().with_max_redirects(3);
+		match client.fetch(&format!("http://{}/loop", server.addr()), abort).wait() {
+			Err(Error::TooManyRedirects) => {}
+			other => panic!("expected too many redirects error, got {:?}", other)
 		}
 	}
 
-	/// Returns `true` if response status code is successful.
-	pub fn is_success(&self) -> bool {
-		self.status() == reqwest::StatusCode::Ok
+	#[test]
+	fn it_should_read_data() {
+		let server = TestServer::run();
+		let client = Client::new().unwrap();
+		let abort = Abort::default();
+		let future = client.fetch(&format!("http://{}?abcdefghijklmnopqrstuvwxyz", server.addr()), abort);
+		let resp = future.wait().unwrap();
+		assert!(resp.is_success());
+		assert_eq!(&resp.concat2().wait().unwrap()[..], b"abcdefghijklmnopqrstuvwxyz")
 	}
 
-	/// Returns `true` if content type of this response is `text/html`
-	pub fn is_html(&self) -> bool {
-		match self.content_type() {
-			Some(Mime(mime::TopLevel::Text, mime::SubLevel::Html, _)) => true,
-			_ => false,
+	#[test]
+	fn it_should_not_read_too_much_data() {
+		let server = TestServer::run();
+		let client = Client::new().unwrap();
+		let abort = Abort::default().with_max_size(3);
+		let resp = client.fetch(&format!("http://{}/?1234", server.addr()), abort).wait().unwrap();
+		assert!(resp.is_success());
+		match resp.concat2().wait() {
+			Err(Error::SizeLimit) => {}
+			other => panic!("expected size limit error, got {:?}", other)
 		}
 	}
 
-	/// Returns content type of this response (if present)
-	pub fn content_type(&self) -> Option<Mime> {
-		match self.inner {
-			ResponseInner::Response(ref r) => {
-				let content_type = r.headers().get::<reqwest::header::ContentType>();
-				content_type.map(|mime| mime.0.clone())
-			},
-			_ => None,
+	#[test]
+	fn it_should_not_read_too_much_data_sync() {
+		let server = TestServer::run();
+		let client = Client::new().unwrap();
+		let abort = Abort::default().with_max_size(3);
+		let resp = client.fetch(&format!("http://{}/?1234", server.addr()), abort).wait().unwrap();
+		assert!(resp.is_success());
+		let mut buffer = Vec::new();
+		let mut reader = BodyReader::new(resp);
+		match reader.read_to_end(&mut buffer) {
+			Err(ref e) if e.kind() == io::ErrorKind::PermissionDenied => {}
+			other => panic!("expected size limit error, got {:?}", other)
 		}
 	}
-}
 
-impl io::Read for Response {
-	fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-		if self.abort.is_aborted() {
-			return Err(io::Error::new(io::ErrorKind::ConnectionAborted, "Fetch aborted."));
+	struct TestServer;
+
+	impl Service for TestServer {
+		type Request = Request;
+		type Response = Response;
+		type Error = hyper::Error;
+		type Future = Box<Future<Item=Self::Response, Error=Self::Error>>;
+
+		fn call(&self, req: Request) -> Self::Future {
+			match req.uri().path() {
+				"/" => {
+					let body = req.uri().query().unwrap_or("").to_string();
+					let req = Response::new().with_body(body);
+					Box::new(future::ok(req))
+				}
+				"/redirect" => {
+					let loc = Location::new(req.uri().query().unwrap_or("/").to_string());
+					let req = Response::new()
+						.with_status(StatusCode::MovedPermanently)
+						.with_header(loc);
+					Box::new(future::ok(req))
+				}
+				"/loop" => {
+					let req = Response::new()
+						.with_status(StatusCode::MovedPermanently)
+						.with_header(Location::new("/loop".to_string()));
+					Box::new(future::ok(req))
+				}
+				"/delay" => {
+					let d = Duration::from_secs(req.uri().query().unwrap_or("0").parse().unwrap());
+					Box::new(Delay::new(d).from_err().map(|_| Response::new()))
+				}
+				_ => Box::new(future::ok(Response::new().with_status(StatusCode::NotFound)))
+			}
 		}
+	}
 
-		let res = match self.inner {
-			ResponseInner::Response(ref mut response) => response.read(buf),
-			ResponseInner::NotFound => return Ok(0),
-			ResponseInner::Reader(ref mut reader) => reader.read(buf),
-		};
-
-		// increase bytes read
-		if let Ok(read) = res {
-			self.read += read;
+	impl TestServer {
+		fn run() -> Handle {
+			let (tx_start, rx_start) = std::sync::mpsc::sync_channel(1);
+			let (tx_end, rx_end) = mpsc::channel(0);
+			let rx_end_fut = rx_end.into_future().map(|_| ()).map_err(|_| ());
+			thread::spawn(move || {
+				let addr = ADDRESS.parse().unwrap();
+				let server = Http::new().bind(&addr, || Ok(TestServer)).unwrap();
+				tx_start.send(server.local_addr().unwrap()).unwrap_or(());
+				server.run_until(rx_end_fut).unwrap();
+			});
+			Handle(rx_start.recv().unwrap(), tx_end)
 		}
+	}
 
-		// check limit
-		match self.limit {
-			Some(limit) if limit < self.read => {
-				return Err(io::Error::new(io::ErrorKind::PermissionDenied, "Size limit reached."));
-			},
-			_ => {},
+	struct Handle(SocketAddr, mpsc::Sender<()>);
+
+	impl Handle {
+		fn addr(&self) -> SocketAddr {
+			self.0
 		}
+	}
 
-		res
+	impl Drop for Handle {
+		fn drop(&mut self) {
+			self.1.clone().send(()).wait().unwrap();
+		}
 	}
 }
diff --git a/util/fetch/src/lib.rs b/util/fetch/src/lib.rs
index 21905c532c49be4a98ef14055d0fdd3c7c51f773..a5722dfe26a925a0b24aecb7c0e319b9317f634a 100644
--- a/util/fetch/src/lib.rs
+++ b/util/fetch/src/lib.rs
@@ -21,15 +21,19 @@
 #[macro_use]
 extern crate log;
 
+#[macro_use]
 extern crate futures;
-extern crate futures_cpupool;
-extern crate parking_lot;
-extern crate reqwest;
+extern crate futures_timer;
+
+extern crate hyper;
+extern crate hyper_rustls;
+
+extern crate tokio_core;
+extern crate url;
 
-pub extern crate mime;
+/// Fetch client implementation.
 pub mod client;
 
-pub use self::reqwest::StatusCode;
-pub use self::mime::Mime;
-pub use self::client::{Client, Fetch, Error, Response, Abort};
+pub use url::Url;
+pub use self::client::{Client, Fetch, Error, Response, Abort, BodyReader};
 
diff --git a/util/sha3/Cargo.toml b/util/hash/Cargo.toml
similarity index 64%
rename from util/sha3/Cargo.toml
rename to util/hash/Cargo.toml
index 8f8d6d160816908ba6d1ab783844e4ed5fcc7b77..c7fee36e016f82ada58f87fa444f197325004b8a 100644
--- a/util/sha3/Cargo.toml
+++ b/util/hash/Cargo.toml
@@ -2,10 +2,17 @@
 description = "Rust bindings for tinykeccak C library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
-name = "sha3"
+name = "keccak-hash"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
+[dependencies]
+ethereum-types = "0.2"
+tiny-keccak = "1.3"
+
 [build-dependencies]
-gcc = "0.3"
+cc = "1.0"
+
+[dev-dependencies]
+tempdir = "0.3"
diff --git a/util/sha3/build.rs b/util/hash/build.rs
similarity index 82%
rename from util/sha3/build.rs
rename to util/hash/build.rs
index 2370855fe0687dadb9b18ac49dbb271d5553ab6b..eecb804f90d5014eac876df4e4fcd7845371f016 100644
--- a/util/sha3/build.rs
+++ b/util/hash/build.rs
@@ -16,11 +16,11 @@
 
  // build.rs
 
-// Bring in a dependency on an externally maintained `gcc` package which manages
+// Bring in a dependency on an externally maintained `cc` package which manages
 // invoking the C compiler.
-extern crate gcc;
+extern crate cc;
 
 fn main() {
-    gcc::compile_library("libtinykeccak.a", &["src/tinykeccak.c"]);
+	cc::Build::new().file("src/tinykeccak.c").compile("libtinykeccak.a");
 }
 
diff --git a/util/hash/src/lib.rs b/util/hash/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0982c11da413c6e8d2df35540fffa6c8df50838b
--- /dev/null
+++ b/util/hash/src/lib.rs
@@ -0,0 +1,110 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate ethereum_types;
+extern crate tiny_keccak;
+
+use std::io;
+use tiny_keccak::Keccak;
+pub use ethereum_types::H256;
+
+/// Get the KECCAK (i.e. Keccak) hash of the empty bytes string.
+pub const KECCAK_EMPTY: H256 = H256( [0xc5, 0xd2, 0x46, 0x01, 0x86, 0xf7, 0x23, 0x3c, 0x92, 0x7e, 0x7d, 0xb2, 0xdc, 0xc7, 0x03, 0xc0, 0xe5, 0x00, 0xb6, 0x53, 0xca, 0x82, 0x27, 0x3b, 0x7b, 0xfa, 0xd8, 0x04, 0x5d, 0x85, 0xa4, 0x70] );
+
+/// The KECCAK of the RLP encoding of empty data.
+pub const KECCAK_NULL_RLP: H256 = H256( [0x56, 0xe8, 0x1f, 0x17, 0x1b, 0xcc, 0x55, 0xa6, 0xff, 0x83, 0x45, 0xe6, 0x92, 0xc0, 0xf8, 0x6e, 0x5b, 0x48, 0xe0, 0x1b, 0x99, 0x6c, 0xad, 0xc0, 0x01, 0x62, 0x2f, 0xb5, 0xe3, 0x63, 0xb4, 0x21] );
+
+/// The KECCAK of the RLP encoding of empty list.
+pub const KECCAK_EMPTY_LIST_RLP: H256 = H256( [0x1d, 0xcc, 0x4d, 0xe8, 0xde, 0xc7, 0x5d, 0x7a, 0xab, 0x85, 0xb5, 0x67, 0xb6, 0xcc, 0xd4, 0x1a, 0xd3, 0x12, 0x45, 0x1b, 0x94, 0x8a, 0x74, 0x13, 0xf0, 0xa1, 0x42, 0xfd, 0x40, 0xd4, 0x93, 0x47] );
+
+extern {
+	/// Hashes input. Returns -1 if either out or input does not exist. Otherwise returns 0.
+	pub fn keccak_256(out: *mut u8, outlen: usize, input: *const u8, inputlen: usize) -> i32;
+	/// Hashes input. Returns -1 if either out or input does not exist. Otherwise returns 0.
+	pub fn keccak_512(out: *mut u8, outlen: usize, input: *const u8, inputlen: usize) -> i32;
+}
+
+pub fn keccak<T: AsRef<[u8]>>(s: T) -> H256 {
+	let mut result = [0u8; 32];
+	write_keccak(s, &mut result);
+	H256(result)
+}
+
+pub fn write_keccak<T: AsRef<[u8]>>(s: T, dest: &mut [u8]) {
+	let input = s.as_ref();
+	unsafe {
+		// we can safely ignore keccak_256 output, cause we know that both input
+		// and dest are properly allocated
+		keccak_256(dest.as_mut_ptr(), dest.len(), input.as_ptr(), input.len());
+	}
+}
+
+pub fn keccak_buffer(r: &mut io::BufRead) -> Result<H256, io::Error> {
+	let mut output = [0u8; 32];
+	let mut input = [0u8; 1024];
+	let mut keccak = Keccak::new_keccak256();
+
+	// read file
+	loop {
+		let some = r.read(&mut input)?;
+		if some == 0 {
+			break;
+		}
+		keccak.update(&input[0..some]);
+	}
+
+	keccak.finalize(&mut output);
+	Ok(output.into())
+}
+
+#[cfg(test)]
+mod tests {
+	extern crate tempdir;
+
+	use std::fs;
+	use std::io::{Write, BufReader};
+	use self::tempdir::TempDir;
+	use super::{keccak, keccak_buffer, KECCAK_EMPTY};
+
+	#[test]
+	fn keccak_empty() {
+		assert_eq!(keccak([0u8; 0]), KECCAK_EMPTY);
+	}
+	#[test]
+	fn keccak_as() {
+		assert_eq!(keccak([0x41u8; 32]), From::from("59cad5948673622c1d64e2322488bf01619f7ff45789741b15a9f782ce9290a8"));
+	}
+
+	#[test]
+	fn should_keccak_a_file() {
+		// given
+		let tempdir = TempDir::new("keccak").unwrap();
+		let mut path = tempdir.path().to_owned();
+		path.push("should_keccak_a_file");
+		// Prepare file
+		{
+			let mut file = fs::File::create(&path).unwrap();
+			file.write_all(b"something").unwrap();
+		}
+
+		let mut file = BufReader::new(fs::File::open(&path).unwrap());
+		// when
+		let hash = keccak_buffer(&mut file).unwrap();
+
+		// then
+		assert_eq!(format!("{:?}", hash), "68371d7e884c168ae2022c82bd837d51837718a7f7dfb7aa3f753074a35e1d87");
+	}
+}
diff --git a/util/sha3/src/tinykeccak.c b/util/hash/src/tinykeccak.c
similarity index 92%
rename from util/sha3/src/tinykeccak.c
rename to util/hash/src/tinykeccak.c
index 1f93ce2db43f21cd1d74d27dfe437e7ab10cf0aa..bfe172e5f6d5f90ac7d62564397588475fe3be84 100644
--- a/util/sha3/src/tinykeccak.c
+++ b/util/hash/src/tinykeccak.c
@@ -13,15 +13,15 @@
 #define decshake(bits) \
   int shake##bits(uint8_t*, size_t, const uint8_t*, size_t);
 
-#define decsha3(bits) \
-  int sha3_##bits(uint8_t*, size_t, const uint8_t*, size_t);
+#define deckeccak(bits) \
+  int keccak_##bits(uint8_t*, size_t, const uint8_t*, size_t);
 
 decshake(128)
 decshake(256)
-decsha3(224)
-decsha3(256)
-decsha3(384)
-decsha3(512)
+deckeccak(224)
+deckeccak(256)
+deckeccak(384)
+deckeccak(512)
 
 /******** The Keccak-f[1600] permutation ********/
 
@@ -154,8 +154,8 @@ static inline int hash(uint8_t* out, size_t outlen,
 				  const uint8_t* in, size_t inlen) {              \
 	return hash(out, outlen, in, inlen, 200 - (bits / 4), 0x1f);  \
   }
-#define defsha3(bits)                                             \
-  int sha3_##bits(uint8_t* out, size_t outlen,                    \
+#define defkeccak(bits)                                             \
+  int keccak_##bits(uint8_t* out, size_t outlen,                    \
 				  const uint8_t* in, size_t inlen) {              \
 	if (outlen > (bits/8)) {                                      \
 	  return -1;                                                  \
@@ -168,10 +168,10 @@ defshake(128)
 defshake(256)
 
 /*** FIPS202 SHA3 FOFs ***/
-defsha3(224)
-defsha3(256)
-defsha3(384)
-defsha3(512)
+defkeccak(224)
+defkeccak(256)
+defkeccak(384)
+defkeccak(512)
 
 
 
diff --git a/util/hashdb/Cargo.toml b/util/hashdb/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..e6250fb56a1a52207f55c5a01ffbf258995b1810
--- /dev/null
+++ b/util/hashdb/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "hashdb"
+version = "0.1.1"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "trait for hash-keyed databases."
+license = "GPL-3.0"
+
+[dependencies]
+elastic-array = "0.10"
+ethereum-types = "0.2"
diff --git a/util/src/hashdb.rs b/util/hashdb/src/lib.rs
similarity index 57%
rename from util/src/hashdb.rs
rename to util/hashdb/src/lib.rs
index ca4120702ecc767d0fef2bcec15c87af61773367..b65f304e423673f0d7dcb9b84a264b602866dca4 100644
--- a/util/src/hashdb.rs
+++ b/util/hashdb/src/lib.rs
@@ -15,9 +15,12 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Database of byte-slices keyed to their Keccak hash.
-use hash::*;
+extern crate elastic_array;
+extern crate ethereum_types;
+
 use std::collections::HashMap;
 use elastic_array::ElasticArray128;
+use ethereum_types::H256;
 
 /// `HashDB` value type.
 pub type DBValue = ElasticArray128<u8>;
@@ -29,57 +32,14 @@ pub trait HashDB: AsHashDB + Send + Sync {
 
 	/// Look up a given hash into the bytes that hash to it, returning None if the
 	/// hash is not known.
-	///
-	/// # Examples
-	/// ```rust
-	/// extern crate ethcore_util;
-	/// use ethcore_util::hashdb::*;
-	/// use ethcore_util::memorydb::*;
-	/// fn main() {
-	///   let mut m = MemoryDB::new();
-	///   let hello_bytes = "Hello world!".as_bytes();
-	///   let hash = m.insert(hello_bytes);
-	///   assert_eq!(m.get(&hash).unwrap(), hello_bytes);
-	/// }
-	/// ```
 	fn get(&self, key: &H256) -> Option<DBValue>;
 
 	/// Check for the existance of a hash-key.
-	///
-	/// # Examples
-	/// ```rust
-	/// extern crate ethcore_util;
-	/// use ethcore_util::hashdb::*;
-	/// use ethcore_util::memorydb::*;
-	/// use ethcore_util::sha3::*;
-	/// fn main() {
-	///   let mut m = MemoryDB::new();
-	///   let hello_bytes = "Hello world!".as_bytes();
-	///   assert!(!m.contains(&hello_bytes.sha3()));
-	///   let key = m.insert(hello_bytes);
-	///   assert!(m.contains(&key));
-	///   m.remove(&key);
-	///   assert!(!m.contains(&key));
-	/// }
-	/// ```
 	fn contains(&self, key: &H256) -> bool;
 
 	/// Insert a datum item into the DB and return the datum's hash for a later lookup. Insertions
 	/// are counted and the equivalent number of `remove()`s must be performed before the data
 	/// is considered dead.
-	///
-	/// # Examples
-	/// ```rust
-	/// extern crate ethcore_util;
-	/// use ethcore_util::hashdb::*;
-	/// use ethcore_util::memorydb::*;
-	/// use ethcore_util::hash::*;
-	/// fn main() {
-	///   let mut m = MemoryDB::new();
-	///   let key = m.insert("Hello world!".as_bytes());
-	///   assert!(m.contains(&key));
-	/// }
-	/// ```
 	fn insert(&mut self, value: &[u8]) -> H256;
 
 	/// Like `insert()` , except you provide the key and the data is all moved.
@@ -87,29 +47,6 @@ pub trait HashDB: AsHashDB + Send + Sync {
 
 	/// Remove a datum previously inserted. Insertions can be "owed" such that the same number of `insert()`s may
 	/// happen without the data being eventually being inserted into the DB. It can be "owed" more than once.
-	///
-	/// # Examples
-	/// ```rust
-	/// extern crate ethcore_util;
-	/// use ethcore_util::hashdb::*;
-	/// use ethcore_util::memorydb::*;
-	/// use ethcore_util::sha3::*;
-	/// fn main() {
-	///   let mut m = MemoryDB::new();
-	///   let d = "Hello world!".as_bytes();
-	///   let key = &d.sha3();
-	///   m.remove(key);	// OK - we now owe an insertion.
-	///   assert!(!m.contains(key));
-	///   m.remove(key);	// OK - we now owe two insertions.
-	///   assert!(!m.contains(key));
-	///   m.insert(d);	// OK - still owed.
-	///   assert!(!m.contains(key));
-	///   m.insert(d);	// OK - now it's "empty" again.
-	///   assert!(!m.contains(key));
-	///   m.insert(d);	// OK - now we've
-	///   assert_eq!(m.get(key).unwrap(), d);
-	/// }
-	/// ```
 	fn remove(&mut self, key: &H256);
 }
 
diff --git a/util/io/Cargo.toml b/util/io/Cargo.toml
index 654ac1978aeab6940c275ae642b3adf62062cbae..dca0426d509fa321ff63349361b19374f1dbb7f9 100644
--- a/util/io/Cargo.toml
+++ b/util/io/Cargo.toml
@@ -3,13 +3,13 @@ description = "Ethcore IO library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-io"
-version = "1.8.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 mio = "0.6.8"
-crossbeam = "0.2"
-parking_lot = "0.4"
+crossbeam = "0.3"
+parking_lot = "0.5"
 log = "0.3"
 slab = "0.2"
 
diff --git a/util/io/src/lib.rs b/util/io/src/lib.rs
index cc3597fb4db163fc5dbbefacb33fae137cff9623..22241a2f5d0902749bd5aed4952b05d1538d1052 100644
--- a/util/io/src/lib.rs
+++ b/util/io/src/lib.rs
@@ -67,9 +67,9 @@ extern crate parking_lot;
 mod service;
 mod worker;
 
-use mio::{Token};
+use std::{fmt, error};
 use mio::deprecated::{EventLoop, NotifyError};
-use std::fmt;
+use mio::Token;
 
 pub use worker::LOCAL_STACK_SIZE;
 
@@ -93,6 +93,12 @@ impl fmt::Display for IoError {
 	}
 }
 
+impl error::Error for IoError {
+	fn description(&self) -> &str {
+		"IO error"
+	}
+}
+
 impl From<::std::io::Error> for IoError {
 	fn from(err: ::std::io::Error) -> IoError {
 		IoError::StdIo(err)
diff --git a/util/journaldb/Cargo.toml b/util/journaldb/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..d3d4708f044425bf1b3352f928381ff90b0f7e6c
--- /dev/null
+++ b/util/journaldb/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "journaldb"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "A `HashDB` which can manage a short-term journal potentially containing many forks of mutually exclusive actions"
+license = "GPL3"
+
+[dependencies]
+ethcore-bytes = { path = "../bytes" }
+ethereum-types = "0.2"
+hashdb = { path = "../hashdb" }
+heapsize = "0.4"
+kvdb = { path = "../kvdb" }
+log = "0.3"
+memorydb = { path = "../memorydb" }
+parking_lot = "0.5"
+plain_hasher = { path = "../plain_hasher" }
+rlp = { path = "../rlp" }
+util-error = { path = "../error" }
+
+[dev-dependencies]
+ethcore-logger = { path = "../../logger" }
+keccak-hash = { path = "../hash" }
+kvdb-memorydb = { path = "../kvdb-memorydb" }
diff --git a/util/src/journaldb/archivedb.rs b/util/journaldb/src/archivedb.rs
similarity index 64%
rename from util/src/journaldb/archivedb.rs
rename to util/journaldb/src/archivedb.rs
index 8c87ef6235cb70c882b1dea2febb5d1627f88d0d..e00b37d3c4afcd28f836924e7254427492faabb4 100644
--- a/util/src/journaldb/archivedb.rs
+++ b/util/journaldb/src/archivedb.rs
@@ -19,13 +19,15 @@
 use std::collections::HashMap;
 use std::collections::hash_map::Entry;
 use std::sync::Arc;
-use rlp::*;
+use rlp::{encode, decode};
 use hashdb::*;
-use memorydb::*;
+use super::memorydb::*;
 use super::{DB_PREFIX_LEN, LATEST_ERA_KEY};
-use super::traits::JournalDB;
+use traits::JournalDB;
 use kvdb::{KeyValueDB, DBTransaction};
-use {Bytes, H256, BaseDataError, UtilError};
+use ethereum_types::H256;
+use error::{BaseDataError, UtilError};
+use bytes::Bytes;
 
 /// Implementation of the `HashDB` trait for a disk-backed database with a memory overlay
 /// and latent-removal semantics.
@@ -44,7 +46,8 @@ pub struct ArchiveDB {
 impl ArchiveDB {
 	/// Create a new instance from a key-value db.
 	pub fn new(backing: Arc<KeyValueDB>, col: Option<u32>) -> ArchiveDB {
-		let latest_era = backing.get(col, &LATEST_ERA_KEY).expect("Low-level database error.").map(|val| decode::<u64>(&val));
+		let latest_era = backing.get(col, &LATEST_ERA_KEY).expect("Low-level database error.")
+			.map(|val| decode::<u64>(&val));
 		ArchiveDB {
 			overlay: MemoryDB::new(),
 			backing: backing,
@@ -53,13 +56,6 @@ impl ArchiveDB {
 		}
 	}
 
-	/// Create a new instance with an anonymous temporary database.
-	#[cfg(test)]
-	fn new_temp() -> ArchiveDB {
-		let backing = Arc::new(::kvdb::in_memory(0));
-		Self::new(backing, None)
-	}
-
 	fn payload(&self, key: &H256) -> Option<DBValue> {
 		self.backing.get(self.column, key).expect("Low-level database error. Some issue with your hard disk?")
 	}
@@ -201,34 +197,30 @@ impl JournalDB for ArchiveDB {
 
 #[cfg(test)]
 mod tests {
-	#![cfg_attr(feature="dev", allow(blacklisted_name))]
-	#![cfg_attr(feature="dev", allow(similar_names))]
 
-	use std::path::Path;
+	use keccak::keccak;
 	use hashdb::{HashDB, DBValue};
 	use super::*;
-	use journaldb::traits::JournalDB;
-	use kvdb::Database;
-	use {Hashable, H32};
+	use {kvdb_memorydb, JournalDB};
 
 	#[test]
 	fn insert_same_in_fork() {
 		// history is 1
-		let mut jdb = ArchiveDB::new_temp();
+		let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
 
 		let x = jdb.insert(b"X");
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
-		jdb.commit_batch(3, &b"1002a".sha3(), Some((1, b"1".sha3()))).unwrap();
-		jdb.commit_batch(4, &b"1003a".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
+		jdb.commit_batch(3, &keccak(b"1002a"), Some((1, keccak(b"1")))).unwrap();
+		jdb.commit_batch(4, &keccak(b"1003a"), Some((2, keccak(b"2")))).unwrap();
 
 		jdb.remove(&x);
-		jdb.commit_batch(3, &b"1002b".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"1002b"), Some((1, keccak(b"1")))).unwrap();
 		let x = jdb.insert(b"X");
-		jdb.commit_batch(4, &b"1003b".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"1003b"), Some((2, keccak(b"2")))).unwrap();
 
-		jdb.commit_batch(5, &b"1004a".sha3(), Some((3, b"1002a".sha3()))).unwrap();
-		jdb.commit_batch(6, &b"1005a".sha3(), Some((4, b"1003a".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"1004a"), Some((3, keccak(b"1002a")))).unwrap();
+		jdb.commit_batch(6, &keccak(b"1005a"), Some((4, keccak(b"1003a")))).unwrap();
 
 		assert!(jdb.contains(&x));
 	}
@@ -236,232 +228,224 @@ mod tests {
 	#[test]
 	fn long_history() {
 		// history is 3
-		let mut jdb = ArchiveDB::new_temp();
+		let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
 		let h = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.contains(&h));
 		jdb.remove(&h);
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(3, &b"3".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(4, &b"4".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.contains(&h));
 	}
 
 	#[test]
 	#[should_panic]
 	fn multiple_owed_removal_not_allowed() {
-		let mut jdb = ArchiveDB::new_temp();
+		let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
 		let h = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.contains(&h));
 		jdb.remove(&h);
 		jdb.remove(&h);
 		// commit_batch would call journal_under(),
 		// and we don't allow multiple owned removals.
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 	}
 
 	#[test]
 	fn complex() {
 		// history is 1
-		let mut jdb = ArchiveDB::new_temp();
+		let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
 
 		let foo = jdb.insert(b"foo");
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 
 		jdb.remove(&foo);
 		jdb.remove(&bar);
 		let baz = jdb.insert(b"baz");
-		jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 		assert!(jdb.contains(&baz));
 
 		let foo = jdb.insert(b"foo");
 		jdb.remove(&baz);
-		jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&baz));
 
 		jdb.remove(&foo);
-		jdb.commit_batch(3, &b"3".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), Some((2, keccak(b"2")))).unwrap();
 		assert!(jdb.contains(&foo));
 
-		jdb.commit_batch(4, &b"4".sha3(), Some((3, b"3".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((3, keccak(b"3")))).unwrap();
 	}
 
 	#[test]
 	fn fork() {
 		// history is 1
-		let mut jdb = ArchiveDB::new_temp();
+		let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
 
 		let foo = jdb.insert(b"foo");
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 
 		jdb.remove(&foo);
 		let baz = jdb.insert(b"baz");
-		jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 
 		jdb.remove(&bar);
-		jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 		assert!(jdb.contains(&baz));
 
-		jdb.commit_batch(2, &b"2b".sha3(), Some((1, b"1b".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2b"), Some((1, keccak(b"1b")))).unwrap();
 		assert!(jdb.contains(&foo));
 	}
 
 	#[test]
 	fn overwrite() {
 		// history is 1
-		let mut jdb = ArchiveDB::new_temp();
+		let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
 
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.contains(&foo));
 
 		jdb.remove(&foo);
-		jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 		jdb.insert(b"foo");
 		assert!(jdb.contains(&foo));
-		jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.contains(&foo));
-		jdb.commit_batch(3, &b"2".sha3(), Some((0, b"2".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"2"), Some((0, keccak(b"2")))).unwrap();
 		assert!(jdb.contains(&foo));
 	}
 
 	#[test]
 	fn fork_same_key() {
 		// history is 1
-		let mut jdb = ArchiveDB::new_temp();
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.contains(&foo));
 
-		jdb.commit_batch(2, &b"2a".sha3(), Some((1, b"1a".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2a"), Some((1, keccak(b"1a")))).unwrap();
 		assert!(jdb.contains(&foo));
 	}
 
-	fn new_db(dir: &Path) -> ArchiveDB {
-		let db = Database::open_default(dir.to_str().unwrap()).unwrap();
-		ArchiveDB::new(Arc::new(db), None)
-	}
-
 	#[test]
 	fn reopen() {
-		let mut dir = ::std::env::temp_dir();
-		dir.push(H32::random().hex());
+		let shared_db = Arc::new(kvdb_memorydb::create(0));
 		let bar = H256::random();
 
 		let foo = {
-			let mut jdb = new_db(&dir);
+			let mut jdb = ArchiveDB::new(shared_db.clone(), None);
 			// history is 1
 			let foo = jdb.insert(b"foo");
 			jdb.emplace(bar.clone(), DBValue::from_slice(b"bar"));
-			jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+			jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 			foo
 		};
 
 		{
-			let mut jdb = new_db(&dir);
+			let mut jdb = ArchiveDB::new(shared_db.clone(), None);
 			jdb.remove(&foo);
-			jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 		}
 
 		{
-			let mut jdb = new_db(&dir);
+			let mut jdb = ArchiveDB::new(shared_db, None);
 			assert!(jdb.contains(&foo));
 			assert!(jdb.contains(&bar));
-			jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+			jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 		}
 	}
 
 	#[test]
 	fn reopen_remove() {
-		let mut dir = ::std::env::temp_dir();
-		dir.push(H32::random().hex());
+		let shared_db = Arc::new(kvdb_memorydb::create(0));
 
 		let foo = {
-			let mut jdb = new_db(&dir);
+			let mut jdb = ArchiveDB::new(shared_db.clone(), None);
 			// history is 1
 			let foo = jdb.insert(b"foo");
-			jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
-			jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
+			jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 
 			// foo is ancient history.
 
 			jdb.insert(b"foo");
-			jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+			jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 			foo
 		};
 
 		{
-			let mut jdb = new_db(&dir);
+			let mut jdb = ArchiveDB::new(shared_db, None);
 			jdb.remove(&foo);
-			jdb.commit_batch(3, &b"3".sha3(), Some((2, b"2".sha3()))).unwrap();
+			jdb.commit_batch(3, &keccak(b"3"), Some((2, keccak(b"2")))).unwrap();
 			assert!(jdb.contains(&foo));
 			jdb.remove(&foo);
-			jdb.commit_batch(4, &b"4".sha3(), Some((3, b"3".sha3()))).unwrap();
-			jdb.commit_batch(5, &b"5".sha3(), Some((4, b"4".sha3()))).unwrap();
+			jdb.commit_batch(4, &keccak(b"4"), Some((3, keccak(b"3")))).unwrap();
+			jdb.commit_batch(5, &keccak(b"5"), Some((4, keccak(b"4")))).unwrap();
 		}
 	}
 
 	#[test]
 	fn reopen_fork() {
-		let mut dir = ::std::env::temp_dir();
-		dir.push(H32::random().hex());
+		let shared_db = Arc::new(kvdb_memorydb::create(0));
 		let (foo, _, _) = {
-			let mut jdb = new_db(&dir);
+			let mut jdb = ArchiveDB::new(shared_db.clone(), None);
 			// history is 1
 			let foo = jdb.insert(b"foo");
 			let bar = jdb.insert(b"bar");
-			jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+			jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 			jdb.remove(&foo);
 			let baz = jdb.insert(b"baz");
-			jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 
 			jdb.remove(&bar);
-			jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 			(foo, bar, baz)
 		};
 
 		{
-			let mut jdb = new_db(&dir);
-			jdb.commit_batch(2, &b"2b".sha3(), Some((1, b"1b".sha3()))).unwrap();
+			let mut jdb = ArchiveDB::new(shared_db, None);
+			jdb.commit_batch(2, &keccak(b"2b"), Some((1, keccak(b"1b")))).unwrap();
 			assert!(jdb.contains(&foo));
 		}
 	}
 
 	#[test]
 	fn returns_state() {
-		let temp = ::devtools::RandomTempPath::new();
+		let shared_db = Arc::new(kvdb_memorydb::create(0));
 
 		let key = {
-			let mut jdb = new_db(temp.as_path().as_path());
+			let mut jdb = ArchiveDB::new(shared_db.clone(), None);
 			let key = jdb.insert(b"foo");
-			jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+			jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 			key
 		};
 
 		{
-			let jdb = new_db(temp.as_path().as_path());
+			let jdb = ArchiveDB::new(shared_db, None);
 			let state = jdb.state(&key);
 			assert!(state.is_some());
 		}
@@ -469,9 +453,7 @@ mod tests {
 
 	#[test]
 	fn inject() {
-		let temp = ::devtools::RandomTempPath::new();
-
-		let mut jdb = new_db(temp.as_path().as_path());
+		let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
 		let key = jdb.insert(b"dog");
 		jdb.inject_batch().unwrap();
 
diff --git a/util/src/journaldb/earlymergedb.rs b/util/journaldb/src/earlymergedb.rs
similarity index 69%
rename from util/src/journaldb/earlymergedb.rs
rename to util/journaldb/src/earlymergedb.rs
index 0d0681a0353742faaa81edbb959a754c079d9b52..bb8e49d41edfe2a6eec6ed5999e930429f17f6f4 100644
--- a/util/src/journaldb/earlymergedb.rs
+++ b/util/journaldb/src/earlymergedb.rs
@@ -16,21 +16,23 @@
 
 //! Disk-backed `HashDB` implementation.
 
-use std::fmt;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry;
 use std::sync::Arc;
 use parking_lot::RwLock;
 use heapsize::HeapSizeOf;
-use rlp::*;
+use rlp::{encode, decode};
 use hashdb::*;
 use memorydb::*;
 use super::{DB_PREFIX_LEN, LATEST_ERA_KEY};
 use super::traits::JournalDB;
 use kvdb::{KeyValueDB, DBTransaction};
-use {H256, BaseDataError, UtilError, Bytes};
+use ethereum_types::H256;
+use error::{BaseDataError, UtilError};
+use bytes::Bytes;
+use util::{DatabaseKey, DatabaseValueView, DatabaseValueRef};
 
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 struct RefInfo {
 	queue_refs: usize,
 	in_archive: bool,
@@ -40,18 +42,6 @@ impl HeapSizeOf for RefInfo {
 	fn heap_size_of_children(&self) -> usize { 0 }
 }
 
-impl fmt::Display for RefInfo {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "{}+{}", self.queue_refs, if self.in_archive {1} else {0})
-	}
-}
-
-impl fmt::Debug for RefInfo {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "{}+{}", self.queue_refs, if self.in_archive {1} else {0})
-	}
-}
-
 #[derive(Clone, PartialEq, Eq)]
 enum RemoveFrom {
 	Queue,
@@ -122,8 +112,6 @@ pub struct EarlyMergeDB {
 	column: Option<u32>,
 }
 
-const PADDING : [u8; 10] = [ 0u8; 10 ];
-
 impl EarlyMergeDB {
 	/// Create a new instance from file
 	pub fn new(backing: Arc<KeyValueDB>, col: Option<u32>) -> EarlyMergeDB {
@@ -138,13 +126,6 @@ impl EarlyMergeDB {
 		}
 	}
 
-	/// Create a new instance with an anonymous temporary database.
-	#[cfg(test)]
-	fn new_temp() -> EarlyMergeDB {
-		let backing = Arc::new(::kvdb::in_memory(0));
-		Self::new(backing, None)
-	}
-
 	fn morph_key(key: &H256, index: u8) -> Bytes {
 		let mut ret = (&**key).to_owned();
 		ret.push(index);
@@ -158,16 +139,14 @@ impl EarlyMergeDB {
 		backing.get(col, &Self::morph_key(key, 0)).expect("Low-level database error. Some issue with your hard disk?").is_some()
 	}
 
-	fn insert_keys(inserts: &[(H256, DBValue)], backing: &KeyValueDB, col: Option<u32>, refs: &mut HashMap<H256, RefInfo>, batch: &mut DBTransaction, trace: bool) {
+	fn insert_keys(inserts: &[(H256, DBValue)], backing: &KeyValueDB, col: Option<u32>, refs: &mut HashMap<H256, RefInfo>, batch: &mut DBTransaction) {
 		for &(ref h, ref d) in inserts {
 			match refs.entry(*h) {
 				Entry::Occupied(mut entry) => {
 					let info = entry.get_mut();
 					// already counting. increment.
 					info.queue_refs += 1;
-					if trace {
-						trace!(target: "jdb.fine", "    insert({}): In queue: Incrementing refs to {}", h, info.queue_refs);
-					}
+					trace!(target: "jdb.fine", "    insert({}): In queue: Incrementing refs to {}", h, info.queue_refs);
 				},
 				Entry::Vacant(entry) => {
 					// this is the first entry for this node in the journal.
@@ -175,16 +154,12 @@ impl EarlyMergeDB {
 					if in_archive {
 						// already in the backing DB. start counting, and remember it was already in.
 						Self::set_already_in(batch, col, h);
-						if trace {
-							trace!(target: "jdb.fine", "    insert({}): New to queue, in DB: Recording and inserting into queue", h);
-						}
+						trace!(target: "jdb.fine", "    insert({}): New to queue, in DB: Recording and inserting into queue", h);
 					} else {
 						// Gets removed when a key leaves the journal, so should never be set when we're placing a new key.
 						//Self::reset_already_in(&h);
 						assert!(!Self::is_already_in(backing, col, h));
-						if trace {
-							trace!(target: "jdb.fine", "    insert({}): New to queue, not in DB: Inserting into queue and DB", h);
-						}
+						trace!(target: "jdb.fine", "    insert({}): New to queue, not in DB: Inserting into queue and DB", h);
 						batch.put(col, h, d);
 					}
 					entry.insert(RefInfo {
@@ -217,7 +192,7 @@ impl EarlyMergeDB {
 		trace!(target: "jdb.fine", "replay_keys: (end) refs={:?}", refs);
 	}
 
-	fn remove_keys(deletes: &[H256], refs: &mut HashMap<H256, RefInfo>, batch: &mut DBTransaction, col: Option<u32>, from: RemoveFrom, trace: bool) {
+	fn remove_keys(deletes: &[H256], refs: &mut HashMap<H256, RefInfo>, batch: &mut DBTransaction, col: Option<u32>, from: RemoveFrom) {
 		// with a remove on {queue_refs: 1, in_archive: true}, we have two options:
 		// - convert to {queue_refs: 1, in_archive: false} (i.e. remove it from the conceptual archive)
 		// - convert to {queue_refs: 0, in_archive: true} (i.e. remove it from the conceptual queue)
@@ -230,16 +205,12 @@ impl EarlyMergeDB {
 					if entry.get().in_archive && from == RemoveFrom::Archive {
 						entry.get_mut().in_archive = false;
 						Self::reset_already_in(batch, col, h);
-						if trace {
-							trace!(target: "jdb.fine", "    remove({}): In archive, 1 in queue: Reducing to queue only and recording", h);
-						}
+						trace!(target: "jdb.fine", "    remove({}): In archive, 1 in queue: Reducing to queue only and recording", h);
 						continue;
 					}
 					if entry.get().queue_refs > 1 {
 						entry.get_mut().queue_refs -= 1;
-						if trace {
-							trace!(target: "jdb.fine", "    remove({}): In queue > 1 refs: Decrementing ref count to {}", h, entry.get().queue_refs);
-						}
+						trace!(target: "jdb.fine", "    remove({}): In queue > 1 refs: Decrementing ref count to {}", h, entry.get().queue_refs);
 						continue;
 					}
 
@@ -250,16 +221,12 @@ impl EarlyMergeDB {
 						(1, true) => {
 							entry.remove();
 							Self::reset_already_in(batch, col, h);
-							if trace {
-								trace!(target: "jdb.fine", "    remove({}): In archive, 1 in queue: Removing from queue and leaving in archive", h);
-							}
+							trace!(target: "jdb.fine", "    remove({}): In archive, 1 in queue: Removing from queue and leaving in archive", h);
 						},
 						(1, false) => {
 							entry.remove();
 							batch.delete(col, h);
-							if trace {
-								trace!(target: "jdb.fine", "    remove({}): Not in archive, only 1 ref in queue: Removing from queue and DB", h);
-							}
+							trace!(target: "jdb.fine", "    remove({}): Not in archive, only 1 ref in queue: Removing from queue and DB", h);
 						},
 						_ => panic!("Invalid value in refs: {:?}", entry.get()),
 					}
@@ -268,9 +235,7 @@ impl EarlyMergeDB {
 					// Gets removed when moving from 1 to 0 additional refs. Should never be here at 0 additional refs.
 					//assert!(!Self::is_already_in(db, &h));
 					batch.delete(col, h);
-					if trace {
-						trace!(target: "jdb.fine", "    remove({}): Not in queue - MUST BE IN ARCHIVE: Removing from DB", h);
-					}
+					trace!(target: "jdb.fine", "    remove({}): Not in queue - MUST BE IN ARCHIVE: Removing from DB", h);
 				},
 			}
 		}
@@ -301,20 +266,16 @@ impl EarlyMergeDB {
 			let mut era = decode::<u64>(&val);
 			latest_era = Some(era);
 			loop {
-				let mut index = 0usize;
-				while let Some(rlp_data) = db.get(col, {
-					let mut r = RlpStream::new_list(3);
-					r.append(&era);
-					r.append(&index);
-					r.append(&&PADDING[..]);
-					&r.drain()
-				}).expect("Low-level database error.") {
-					let rlp = Rlp::new(&rlp_data);
-					let inserts: Vec<H256> = rlp.list_at(1);
+				let mut db_key = DatabaseKey {
+					era,
+					index: 0usize,
+				};
+				while let Some(rlp_data) = db.get(col, &encode(&db_key)).expect("Low-level database error.") {
+					let inserts = DatabaseValueView::from_rlp(&rlp_data).inserts().expect("rlp read from db; qed");
 					Self::replay_keys(&inserts, db, col, &mut refs);
-					index += 1;
+					db_key.index += 1;
 				};
-				if index == 0 || era == 0 {
+				if db_key.index == 0 || era == 0 {
 					break;
 				}
 				era -= 1;
@@ -400,8 +361,6 @@ impl JournalDB for EarlyMergeDB {
 	}
 
 	fn journal_under(&mut self, batch: &mut DBTransaction, now: u64, id: &H256) -> Result<u32, UtilError> {
-		let trace = false;
-
 		// record new commit's details.
 		let mut refs = match self.refs.as_ref() {
 			Some(refs) => refs.write(),
@@ -409,25 +368,22 @@ impl JournalDB for EarlyMergeDB {
 		};
 
 		{
-			let mut index = 0usize;
+			let mut db_key = DatabaseKey {
+				era: now,
+				index: 0usize,
+			};
 			let mut last;
 
 			while self.backing.get(self.column, {
-				let mut r = RlpStream::new_list(3);
-				r.append(&now);
-				r.append(&index);
-				r.append(&&PADDING[..]);
-				last = r.drain();
+				last = encode(&db_key);
 				&last
 			})?.is_some() {
-				index += 1;
+				db_key.index += 1;
 			}
 
 			let drained = self.overlay.drain();
 
-			if trace {
-				trace!(target: "jdb", "commit: #{} ({})", now, id);
-			}
+			trace!(target: "jdb", "commit: #{} ({})", now, id);
 
 			let removes: Vec<H256> = drained
 				.iter()
@@ -441,30 +397,25 @@ impl JournalDB for EarlyMergeDB {
 
 			// TODO: check all removes are in the db.
 
-			let mut r = RlpStream::new_list(3);
-			r.append(id);
-
 			// Process the new inserts.
 			// We use the inserts for three things. For each:
 			// - we place into the backing DB or increment the counter if already in;
 			// - we note in the backing db that it was already in;
 			// - we write the key into our journal for this block;
 
-			r.begin_list(inserts.len());
-			for &(k, _) in &inserts {
-				r.append(&k);
-			}
-			r.append_list(&removes);
-			Self::insert_keys(&inserts, &*self.backing, self.column, &mut refs, batch, trace);
+			Self::insert_keys(&inserts, &*self.backing, self.column, &mut refs, batch);
 
 			let ins = inserts.iter().map(|&(k, _)| k).collect::<Vec<_>>();
+			let value_ref = DatabaseValueRef {
+				id,
+				inserts: &ins,
+				deletes: &removes,
+			};
 
-			if trace {
-				trace!(target: "jdb.ops", "  Deletes: {:?}", removes);
-				trace!(target: "jdb.ops", "  Inserts: {:?}", ins);
-			}
+			trace!(target: "jdb.ops", "  Deletes: {:?}", removes);
+			trace!(target: "jdb.ops", "  Inserts: {:?}", ins);
 
-			batch.put(self.column, &last, r.as_raw());
+			batch.put(self.column, &last, &encode(&value_ref));
 			if self.latest_era.map_or(true, |e| now > e) {
 				batch.put(self.column, &LATEST_ERA_KEY, &encode(&now));
 				self.latest_era = Some(now);
@@ -474,34 +425,30 @@ impl JournalDB for EarlyMergeDB {
 		}
 	}
 
-	#[cfg_attr(feature="dev", allow(cyclomatic_complexity))]
 	fn mark_canonical(&mut self, batch: &mut DBTransaction, end_era: u64, canon_id: &H256) -> Result<u32, UtilError> {
-		let trace = false;
-
 		let mut refs = self.refs.as_ref().unwrap().write();
 
 		// apply old commits' details
-		let mut index = 0usize;
+		let mut db_key = DatabaseKey {
+			era: end_era,
+			index: 0usize,
+		};
 		let mut last;
 
-		while let Some(rlp_data) = self.backing.get(self.column, {
-			let mut r = RlpStream::new_list(3);
-			r.append(&end_era);
-			r.append(&index);
-			r.append(&&PADDING[..]);
-			last = r.drain();
-			&last
-		})? {
-			let rlp = Rlp::new(&rlp_data);
-			let inserts: Vec<H256> = rlp.list_at(1);
-
-			if canon_id == &rlp.val_at::<H256>(0) {
+		while let Some(rlp_data) = {
+			last = encode(&db_key);
+			self.backing.get(self.column, &last)
+		}? {
+			let view = DatabaseValueView::from_rlp(&rlp_data);
+			let inserts = view.inserts().expect("rlp read from db; qed");
+
+			if canon_id == &view.id().expect("rlp read from db; qed") {
 				// Collect keys to be removed. Canon block - remove the (enacted) deletes.
-				let deletes: Vec<H256> = rlp.list_at(2);
+				let deletes = view.deletes().expect("rlp read from db; qed");
 				trace!(target: "jdb.ops", "  Expunging: {:?}", deletes);
-				Self::remove_keys(&deletes, &mut refs, batch, self.column, RemoveFrom::Archive, trace);
+				Self::remove_keys(&deletes, &mut refs, batch, self.column, RemoveFrom::Archive);
 
-					trace!(target: "jdb.ops", "  Finalising: {:?}", inserts);
+				trace!(target: "jdb.ops", "  Finalising: {:?}", inserts);
 				for k in &inserts {
 					match refs.get(k).cloned() {
 						None => {
@@ -527,15 +474,15 @@ impl JournalDB for EarlyMergeDB {
 			} else {
 				// Collect keys to be removed. Non-canon block - remove the (reverted) inserts.
 				trace!(target: "jdb.ops", "  Reverting: {:?}", inserts);
-				Self::remove_keys(&inserts, &mut refs, batch, self.column, RemoveFrom::Queue, trace);
+				Self::remove_keys(&inserts, &mut refs, batch, self.column, RemoveFrom::Queue);
 			}
 
 			batch.delete(self.column, &last);
-			index += 1;
+			db_key.index += 1;
 		}
 
-		trace!(target: "jdb", "EarlyMergeDB: delete journal for time #{}.{}, (canon was {})", end_era, index, canon_id);
-		trace!(target: "jdb", "OK: {:?}", refs.clone());
+		trace!(target: "jdb", "EarlyMergeDB: delete journal for time #{}.{}, (canon was {})", end_era, db_key.index, canon_id);
+		trace!(target: "jdb", "OK: {:?}", &*refs);
 
 		Ok(0)
 	}
@@ -573,42 +520,39 @@ impl JournalDB for EarlyMergeDB {
 
 #[cfg(test)]
 mod tests {
-	#![cfg_attr(feature="dev", allow(blacklisted_name))]
-	#![cfg_attr(feature="dev", allow(similar_names))]
 
-	use std::path::Path;
+	use keccak::keccak;
 	use hashdb::{HashDB, DBValue};
 	use super::*;
 	use super::super::traits::JournalDB;
 	use ethcore_logger::init_log;
-	use kvdb::{DatabaseConfig};
-	use {Hashable, H32};
+	use kvdb_memorydb;
 
 	#[test]
 	fn insert_same_in_fork() {
 		// history is 1
-		let mut jdb = EarlyMergeDB::new_temp();
+		let mut jdb = new_db();
 
 		let x = jdb.insert(b"X");
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(3, &b"1002a".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"1002a"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(4, &b"1003a".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"1003a"), Some((2, keccak(b"2")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&x);
-		jdb.commit_batch(3, &b"1002b".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"1002b"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		let x = jdb.insert(b"X");
-		jdb.commit_batch(4, &b"1003b".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"1003b"), Some((2, keccak(b"2")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
-		jdb.commit_batch(5, &b"1004a".sha3(), Some((3, b"1002a".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"1004a"), Some((3, keccak(b"1002a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(6, &b"1005a".sha3(), Some((4, b"1003a".sha3()))).unwrap();
+		jdb.commit_batch(6, &keccak(b"1005a"), Some((4, keccak(b"1003a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		assert!(jdb.contains(&x));
@@ -616,19 +560,19 @@ mod tests {
 
 	#[test]
 	fn insert_older_era() {
-		let mut jdb = EarlyMergeDB::new_temp();
+		let mut jdb = new_db();
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0a".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0a"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0a".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&bar);
-		jdb.commit_batch(0, &b"0b".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0b"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
@@ -637,22 +581,22 @@ mod tests {
 	#[test]
 	fn long_history() {
 		// history is 3
-		let mut jdb = EarlyMergeDB::new_temp();
+		let mut jdb = new_db();
 		let h = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&h));
 		jdb.remove(&h);
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(3, &b"3".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(4, &b"4".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(!jdb.contains(&h));
 	}
@@ -660,11 +604,11 @@ mod tests {
 	#[test]
 	fn complex() {
 		// history is 1
-		let mut jdb = EarlyMergeDB::new_temp();
+		let mut jdb = new_db();
 
 		let foo = jdb.insert(b"foo");
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
@@ -672,7 +616,7 @@ mod tests {
 		jdb.remove(&foo);
 		jdb.remove(&bar);
 		let baz = jdb.insert(b"baz");
-		jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
@@ -680,20 +624,20 @@ mod tests {
 
 		let foo = jdb.insert(b"foo");
 		jdb.remove(&baz);
-		jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(!jdb.contains(&bar));
 		assert!(jdb.contains(&baz));
 
 		jdb.remove(&foo);
-		jdb.commit_batch(3, &b"3".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), Some((2, keccak(b"2")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(!jdb.contains(&bar));
 		assert!(!jdb.contains(&baz));
 
-		jdb.commit_batch(4, &b"4".sha3(), Some((3, b"3".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((3, keccak(b"3")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(!jdb.contains(&foo));
 		assert!(!jdb.contains(&bar));
@@ -703,29 +647,29 @@ mod tests {
 	#[test]
 	fn fork() {
 		// history is 1
-		let mut jdb = EarlyMergeDB::new_temp();
+		let mut jdb = new_db();
 
 		let foo = jdb.insert(b"foo");
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 
 		jdb.remove(&foo);
 		let baz = jdb.insert(b"baz");
-		jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&bar);
-		jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 		assert!(jdb.contains(&baz));
 
-		jdb.commit_batch(2, &b"2b".sha3(), Some((1, b"1b".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2b"), Some((1, keccak(b"1b")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(!jdb.contains(&baz));
@@ -735,22 +679,22 @@ mod tests {
 	#[test]
 	fn overwrite() {
 		// history is 1
-		let mut jdb = EarlyMergeDB::new_temp();
+		let mut jdb = new_db();
 
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 
 		jdb.remove(&foo);
-		jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.insert(b"foo");
 		assert!(jdb.contains(&foo));
-		jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
-		jdb.commit_batch(3, &b"2".sha3(), Some((0, b"2".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"2"), Some((0, keccak(b"2")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 	}
@@ -758,121 +702,119 @@ mod tests {
 	#[test]
 	fn fork_same_key_one() {
 
-		let mut jdb = EarlyMergeDB::new_temp();
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		let mut jdb = new_db();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1c".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1c"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		assert!(jdb.contains(&foo));
 
-		jdb.commit_batch(2, &b"2a".sha3(), Some((1, b"1a".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2a"), Some((1, keccak(b"1a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 	}
 
 	#[test]
 	fn fork_same_key_other() {
-		let mut jdb = EarlyMergeDB::new_temp();
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		let mut jdb = new_db();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1c".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1c"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		assert!(jdb.contains(&foo));
 
-		jdb.commit_batch(2, &b"2b".sha3(), Some((1, b"1b".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2b"), Some((1, keccak(b"1b")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 	}
 
 	#[test]
 	fn fork_ins_del_ins() {
-		let mut jdb = EarlyMergeDB::new_temp();
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		let mut jdb = new_db();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(2, &b"2a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2a"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(2, &b"2b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2b"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(3, &b"3a".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3a"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(3, &b"3b".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3b"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
-		jdb.commit_batch(4, &b"4a".sha3(), Some((2, b"2a".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4a"), Some((2, keccak(b"2a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
-		jdb.commit_batch(5, &b"5a".sha3(), Some((3, b"3a".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"5a"), Some((3, keccak(b"3a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 	}
 
-	fn new_db(path: &Path) -> EarlyMergeDB {
-		let config = DatabaseConfig::with_columns(Some(1));
-		let backing = Arc::new(::kvdb::Database::open(&config, path.to_str().unwrap()).unwrap());
-		EarlyMergeDB::new(backing, Some(0))
+	fn new_db() -> EarlyMergeDB {
+		let backing = Arc::new(kvdb_memorydb::create(0));
+		EarlyMergeDB::new(backing, None)
 	}
 
 	#[test]
 	fn reopen() {
-		let mut dir = ::std::env::temp_dir();
-		dir.push(H32::random().hex());
+		let shared_db = Arc::new(kvdb_memorydb::create(0));
 		let bar = H256::random();
 
 		let foo = {
-			let mut jdb = new_db(&dir);
+			let mut jdb = EarlyMergeDB::new(shared_db.clone(), None);
 			// history is 1
 			let foo = jdb.insert(b"foo");
 			jdb.emplace(bar.clone(), DBValue::from_slice(b"bar"));
-			jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+			jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			foo
 		};
 
 		{
-			let mut jdb = new_db(&dir);
+			let mut jdb = EarlyMergeDB::new(shared_db.clone(), None);
 			jdb.remove(&foo);
-			jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 		}
 
 		{
-			let mut jdb = new_db(&dir);
+			let mut jdb = EarlyMergeDB::new(shared_db, None);
 			assert!(jdb.contains(&foo));
 			assert!(jdb.contains(&bar));
-			jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+			jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(!jdb.contains(&foo));
 		}
@@ -882,135 +824,135 @@ mod tests {
 	fn insert_delete_insert_delete_insert_expunge() {
 		init_log();
 
-		let mut jdb = EarlyMergeDB::new_temp();
+		let mut jdb = new_db();
 
 		// history is 4
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.remove(&foo);
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.insert(b"foo");
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.remove(&foo);
-		jdb.commit_batch(3, &b"3".sha3(), None).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.insert(b"foo");
-		jdb.commit_batch(4, &b"4".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		// expunge foo
-		jdb.commit_batch(5, &b"5".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"5"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 	}
 
 	#[test]
 	fn forked_insert_delete_insert_delete_insert_expunge() {
 		init_log();
-		let mut jdb = EarlyMergeDB::new_temp();
+		let mut jdb = new_db();
 
 		// history is 4
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(1, &b"1a".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1a"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(1, &b"1b".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1b"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(2, &b"2a".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2a"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(2, &b"2b".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2b"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(3, &b"3a".sha3(), None).unwrap();
+		jdb.commit_batch(3, &keccak(b"3a"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(3, &b"3b".sha3(), None).unwrap();
+		jdb.commit_batch(3, &keccak(b"3b"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(4, &b"4a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4a"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(4, &b"4b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4b"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		// expunge foo
-		jdb.commit_batch(5, &b"5".sha3(), Some((1, b"1a".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"5"), Some((1, keccak(b"1a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 	}
 
 	#[test]
 	fn broken_assert() {
-		let mut jdb = EarlyMergeDB::new_temp();
+		let mut jdb = new_db();
 
 		// history is 1
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		// foo is ancient history.
 
 		jdb.remove(&foo);
-		jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(3, &b"3".sha3(), Some((2, b"2".sha3()))).unwrap();	// BROKEN
+		jdb.commit_batch(3, &keccak(b"3"), Some((2, keccak(b"2")))).unwrap();	// BROKEN
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 
 		jdb.remove(&foo);
-		jdb.commit_batch(4, &b"4".sha3(), Some((3, b"3".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((3, keccak(b"3")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
-		jdb.commit_batch(5, &b"5".sha3(), Some((4, b"4".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"5"), Some((4, keccak(b"4")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(!jdb.contains(&foo));
 	}
 
 	#[test]
 	fn reopen_test() {
-		let mut jdb = EarlyMergeDB::new_temp();
+		let mut jdb = new_db();
 
 		// history is 4
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(3, &b"3".sha3(), None).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(4, &b"4".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		// foo is ancient history.
 
 		jdb.insert(b"foo");
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(5, &b"5".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"5"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.remove(&foo);
 		jdb.remove(&bar);
-		jdb.commit_batch(6, &b"6".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(6, &keccak(b"6"), Some((2, keccak(b"2")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.insert(b"foo");
 		jdb.insert(b"bar");
-		jdb.commit_batch(7, &b"7".sha3(), Some((3, b"3".sha3()))).unwrap();
+		jdb.commit_batch(7, &keccak(b"7"), Some((3, keccak(b"3")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 	}
 
@@ -1018,54 +960,52 @@ mod tests {
 	fn reopen_remove_three() {
 		init_log();
 
-		let mut dir = ::std::env::temp_dir();
-		dir.push(H32::random().hex());
-
-		let foo = b"foo".sha3();
+		let shared_db = Arc::new(kvdb_memorydb::create(0));
+		let foo = keccak(b"foo");
 
 		{
-			let mut jdb = new_db(&dir);
+			let mut jdb = EarlyMergeDB::new(shared_db.clone(), None);
 			// history is 1
 			jdb.insert(b"foo");
-			jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+			jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 			assert!(jdb.can_reconstruct_refs());
-			jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+			jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 
 			// foo is ancient history.
 
 			jdb.remove(&foo);
-			jdb.commit_batch(2, &b"2".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(2, &keccak(b"2"), Some((0, keccak(b"0")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(jdb.contains(&foo));
 
 			jdb.insert(b"foo");
-			jdb.commit_batch(3, &b"3".sha3(), Some((1, b"1".sha3()))).unwrap();
+			jdb.commit_batch(3, &keccak(b"3"), Some((1, keccak(b"1")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(jdb.contains(&foo));
 
 		// incantation to reopen the db
 		}; {
-			let mut jdb = new_db(&dir);
+			let mut jdb = EarlyMergeDB::new(shared_db.clone(), None);
 
 			jdb.remove(&foo);
-			jdb.commit_batch(4, &b"4".sha3(), Some((2, b"2".sha3()))).unwrap();
+			jdb.commit_batch(4, &keccak(b"4"), Some((2, keccak(b"2")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(jdb.contains(&foo));
 
 		// incantation to reopen the db
 		}; {
-			let mut jdb = new_db(&dir);
+			let mut jdb = EarlyMergeDB::new(shared_db.clone(), None);
 
-			jdb.commit_batch(5, &b"5".sha3(), Some((3, b"3".sha3()))).unwrap();
+			jdb.commit_batch(5, &keccak(b"5"), Some((3, keccak(b"3")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(jdb.contains(&foo));
 
 		// incantation to reopen the db
 		}; {
-			let mut jdb = new_db(&dir);
+			let mut jdb = EarlyMergeDB::new(shared_db, None);
 
-			jdb.commit_batch(6, &b"6".sha3(), Some((4, b"4".sha3()))).unwrap();
+			jdb.commit_batch(6, &keccak(b"6"), Some((4, keccak(b"4")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(!jdb.contains(&foo));
 		}
@@ -1073,29 +1013,29 @@ mod tests {
 
 	#[test]
 	fn reopen_fork() {
-		let mut dir = ::std::env::temp_dir();
-		dir.push(H32::random().hex());
+		let shared_db = Arc::new(kvdb_memorydb::create(0));
+
 		let (foo, bar, baz) = {
-			let mut jdb = new_db(&dir);
+			let mut jdb = EarlyMergeDB::new(shared_db.clone(), None);
 			// history is 1
 			let foo = jdb.insert(b"foo");
 			let bar = jdb.insert(b"bar");
-			jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+			jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			jdb.remove(&foo);
 			let baz = jdb.insert(b"baz");
-			jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 
 			jdb.remove(&bar);
-			jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			(foo, bar, baz)
 		};
 
 		{
-			let mut jdb = new_db(&dir);
-			jdb.commit_batch(2, &b"2b".sha3(), Some((1, b"1b".sha3()))).unwrap();
+			let mut jdb = EarlyMergeDB::new(shared_db, None);
+			jdb.commit_batch(2, &keccak(b"2b"), Some((1, keccak(b"1b")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(jdb.contains(&foo));
 			assert!(!jdb.contains(&baz));
@@ -1105,9 +1045,7 @@ mod tests {
 
 	#[test]
 	fn inject() {
-		let temp = ::devtools::RandomTempPath::new();
-
-		let mut jdb = new_db(temp.as_path().as_path());
+		let mut jdb = new_db();
 		let key = jdb.insert(b"dog");
 		jdb.inject_batch().unwrap();
 
diff --git a/util/src/journaldb/mod.rs b/util/journaldb/src/lib.rs
similarity index 91%
rename from util/src/journaldb/mod.rs
rename to util/journaldb/src/lib.rs
index 4f0f2fb1b979c1e7e3cec3bc34ce3101c10ddda4..c1fb23b6cd15eff9e685d40cbded05016772fc3b 100644
--- a/util/src/journaldb/mod.rs
+++ b/util/journaldb/src/lib.rs
@@ -16,20 +16,44 @@
 
 //! `JournalDB` interface and implementation.
 
+extern crate heapsize;
+#[macro_use]
+extern crate log;
+
+extern crate ethereum_types;
+extern crate ethcore_bytes as bytes;
+extern crate hashdb;
+extern crate kvdb;
+extern crate memorydb;
+extern crate parking_lot;
+extern crate plain_hasher;
+extern crate rlp;
+extern crate util_error as error;
+
+#[cfg(test)]
+extern crate ethcore_logger;
+#[cfg(test)]
+extern crate keccak_hash as keccak;
+#[cfg(test)]
+extern crate kvdb_memorydb;
+
 use std::{fmt, str};
 use std::sync::Arc;
 
 /// Export the journaldb module.
-pub mod traits;
+mod traits;
 mod archivedb;
 mod earlymergedb;
 mod overlayrecentdb;
 mod refcounteddb;
+mod util;
+
+pub mod overlaydb;
 
 /// Export the `JournalDB` trait.
 pub use self::traits::JournalDB;
 
-/// A journal database algorithm.
+/// Journal database operating strategy.
 #[derive(Debug, PartialEq, Clone, Copy)]
 pub enum Algorithm {
 	/// Keep all keys forever.
diff --git a/util/src/overlaydb.rs b/util/journaldb/src/overlaydb.rs
similarity index 86%
rename from util/src/overlaydb.rs
rename to util/journaldb/src/overlaydb.rs
index 80cc499b9a8cd8554108aa4dc9bf0eca3884d744..6ff1b97e8be42ce4221968b19572f1b075ee6bf6 100644
--- a/util/src/overlaydb.rs
+++ b/util/journaldb/src/overlaydb.rs
@@ -19,9 +19,9 @@
 use std::sync::Arc;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry;
-use error::*;
-use hash::*;
-use rlp::*;
+use error::{Result, BaseDataError};
+use ethereum_types::H256;
+use rlp::{UntrustedRlp, RlpStream, Encodable, DecoderError, Decodable, encode, decode};
 use hashdb::*;
 use memorydb::*;
 use kvdb::{KeyValueDB, DBTransaction};
@@ -41,6 +41,39 @@ pub struct OverlayDB {
 	column: Option<u32>,
 }
 
+struct Payload {
+	count: u32,
+	value: DBValue,
+}
+
+impl Payload {
+	fn new(count: u32, value: DBValue) -> Self {
+		Payload {
+			count,
+			value,
+		}
+	}
+}
+
+impl Encodable for Payload {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.begin_list(2);
+		s.append(&self.count);
+		s.append(&&*self.value);
+	}
+}
+
+impl Decodable for Payload {
+	fn decode(rlp: &UntrustedRlp) -> ::std::result::Result<Self, DecoderError> {
+		let payload = Payload {
+			count: rlp.val_at(0)?,
+			value: DBValue::from_slice(rlp.at(1)?.data()?),
+		};
+
+		Ok(payload)
+	}
+}
+
 impl OverlayDB {
 	/// Create a new instance of OverlayDB given a `backing` database.
 	pub fn new(backing: Arc<KeyValueDB>, col: Option<u32>) -> OverlayDB {
@@ -50,20 +83,20 @@ impl OverlayDB {
 	/// Create a new instance of OverlayDB with an anonymous temporary database.
 	#[cfg(test)]
 	pub fn new_temp() -> OverlayDB {
-		let backing = Arc::new(::kvdb::in_memory(0));
+		let backing = Arc::new(::kvdb_memorydb::create(0));
 		Self::new(backing, None)
 	}
 
 	/// Commit all operations in a single batch.
 	#[cfg(test)]
-	pub fn commit(&mut self) -> Result<u32, UtilError> {
+	pub fn commit(&mut self) -> Result<u32> {
 		let mut batch = self.backing.transaction();
 		let res = self.commit_to_batch(&mut batch)?;
 		self.backing.write(batch).map(|_| res).map_err(|e| e.into())
 	}
 
 	/// Commit all operations to given batch.
-	pub fn commit_to_batch(&mut self, batch: &mut DBTransaction) -> Result<u32, UtilError> {
+	pub fn commit_to_batch(&mut self, batch: &mut DBTransaction) -> Result<u32> {
 		let mut ret = 0u32;
 		let mut deletes = 0usize;
 		for i in self.overlay.drain() {
@@ -71,18 +104,19 @@ impl OverlayDB {
 			if rc != 0 {
 				match self.payload(&key) {
 					Some(x) => {
-						let (back_value, back_rc) = x;
-						let total_rc: i32 = back_rc as i32 + rc;
+						let total_rc: i32 = x.count as i32 + rc;
 						if total_rc < 0 {
 							return Err(From::from(BaseDataError::NegativelyReferencedHash(key)));
 						}
-						deletes += if self.put_payload_in_batch(batch, &key, (back_value, total_rc as u32)) {1} else {0};
+						let payload = Payload::new(total_rc as u32, x.value);
+						deletes += if self.put_payload_in_batch(batch, &key, &payload) {1} else {0};
 					}
 					None => {
 						if rc < 0 {
 							return Err(From::from(BaseDataError::NegativelyReferencedHash(key)));
 						}
-						self.put_payload_in_batch(batch, &key, (value, rc as u32));
+						let payload = Payload::new(rc as u32, value);
+						self.put_payload_in_batch(batch, &key, &payload);
 					}
 				};
 				ret += 1;
@@ -100,22 +134,16 @@ impl OverlayDB {
 	pub fn commit_refs(&self, key: &H256) -> i32 { self.overlay.raw(key).map_or(0, |(_, refs)| refs) }
 
 	/// Get the refs and value of the given key.
-	fn payload(&self, key: &H256) -> Option<(DBValue, u32)> {
+	fn payload(&self, key: &H256) -> Option<Payload> {
 		self.backing.get(self.column, key)
 			.expect("Low-level database error. Some issue with your hard disk?")
-			.map(|d| {
-				let r = Rlp::new(&d);
-				(DBValue::from_slice(r.at(1).data()), r.at(0).as_val())
-			})
+			.map(|d| decode(&d))
 	}
 
 	/// Put the refs and value of the given key, possibly deleting it from the db.
-	fn put_payload_in_batch(&self, batch: &mut DBTransaction, key: &H256, payload: (DBValue, u32)) -> bool {
-		if payload.1 > 0 {
-			let mut s = RlpStream::new_list(2);
-			s.append(&payload.1);
-			s.append(&&*payload.0);
-			batch.put(self.column, key, s.as_raw());
+	fn put_payload_in_batch(&self, batch: &mut DBTransaction, key: &H256, payload: &Payload) -> bool {
+		if payload.count > 0 {
+			batch.put(self.column, key, &encode(payload));
 			false
 		} else {
 			batch.delete(self.column, key);
@@ -129,7 +157,7 @@ impl HashDB for OverlayDB {
 		let mut ret: HashMap<H256, i32> = self.backing.iter(self.column)
 			.map(|(key, _)| {
 				let h = H256::from_slice(&*key);
-				let r = self.payload(&h).unwrap().1;
+				let r = self.payload(&h).unwrap().count;
 				(h, r as i32)
 			})
 			.collect();
@@ -161,9 +189,8 @@ impl HashDB for OverlayDB {
 		};
 		match self.payload(key) {
 			Some(x) => {
-				let (d, rc) = x;
-				if rc as i32 + memrc > 0 {
-					Some(d)
+				if x.count as i32 + memrc > 0 {
+					Some(x.value)
 				}
 				else {
 					None
@@ -185,8 +212,7 @@ impl HashDB for OverlayDB {
 				let memrc = k.map_or(0, |(_, rc)| rc);
 				match self.payload(key) {
 					Some(x) => {
-						let (_, rc) = x;
-						rc as i32 + memrc > 0
+						x.count as i32 + memrc > 0
 					}
 					// Replace above match arm with this once https://github.com/rust-lang/rust/issues/15287 is done.
 					//Some((d, rc)) if rc + memrc > 0 => true,
@@ -202,7 +228,6 @@ impl HashDB for OverlayDB {
 }
 
 #[test]
-#[cfg_attr(feature="dev", allow(blacklisted_name))]
 fn overlaydb_revert() {
 	let mut m = OverlayDB::new_temp();
 	let foo = m.insert(b"foo");          // insert foo.
diff --git a/util/src/journaldb/overlayrecentdb.rs b/util/journaldb/src/overlayrecentdb.rs
similarity index 70%
rename from util/src/journaldb/overlayrecentdb.rs
rename to util/journaldb/src/overlayrecentdb.rs
index 975abd8e8de2efdc390aeda493ca42c396608afa..9ac8a4e294f2e9c1c5554e545774e46257c9549b 100644
--- a/util/src/journaldb/overlayrecentdb.rs
+++ b/util/journaldb/src/overlayrecentdb.rs
@@ -21,13 +21,17 @@ use std::collections::hash_map::Entry;
 use std::sync::Arc;
 use parking_lot::RwLock;
 use heapsize::HeapSizeOf;
-use rlp::*;
+use rlp::{UntrustedRlp, RlpStream, encode, decode, DecoderError, Decodable, Encodable};
 use hashdb::*;
 use memorydb::*;
 use super::{DB_PREFIX_LEN, LATEST_ERA_KEY};
 use kvdb::{KeyValueDB, DBTransaction};
 use super::JournalDB;
-use {H256, BaseDataError, UtilError, Bytes, H256FastMap};
+use ethereum_types::H256;
+use plain_hasher::H256FastMap;
+use error::{BaseDataError, UtilError};
+use bytes::Bytes;
+use util::DatabaseKey;
 
 /// Implementation of the `JournalDB` trait for a disk-backed database with a memory overlay
 /// and, possibly, latent-removal semantics.
@@ -67,6 +71,52 @@ pub struct OverlayRecentDB {
 	column: Option<u32>,
 }
 
+struct DatabaseValue {
+	id: H256,
+	inserts: Vec<(H256, DBValue)>,
+	deletes: Vec<H256>,
+}
+
+impl Decodable for DatabaseValue {
+	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+		let id = rlp.val_at(0)?;
+		let inserts = rlp.at(1)?.iter().map(|r| {
+			let k = r.val_at(0)?;
+			let v = DBValue::from_slice(r.at(1)?.data()?);
+			Ok((k, v))
+		}).collect::<Result<Vec<_>, _>>()?;
+		let deletes = rlp.list_at(2)?;
+
+		let value = DatabaseValue {
+			id,
+			inserts,
+			deletes,
+		};
+
+		Ok(value)
+	}
+}
+
+struct DatabaseValueRef<'a> {
+	id: &'a H256,
+	inserts: &'a [(H256, DBValue)],
+	deletes: &'a [H256],
+}
+
+impl<'a> Encodable for DatabaseValueRef<'a> {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.begin_list(3);
+		s.append(self.id);
+		s.begin_list(self.inserts.len());
+		for kv in self.inserts {
+			s.begin_list(2);
+			s.append(&kv.0);
+			s.append(&&*kv.1);
+		}
+		s.append_list(self.deletes);
+	}
+}
+
 #[derive(PartialEq)]
 struct JournalOverlay {
 	backing_overlay: MemoryDB, // Nodes added in the history period
@@ -101,8 +151,6 @@ impl Clone for OverlayRecentDB {
 	}
 }
 
-const PADDING : [u8; 10] = [ 0u8; 10 ];
-
 impl OverlayRecentDB {
 	/// Create a new instance.
 	pub fn new(backing: Arc<KeyValueDB>, col: Option<u32>) -> OverlayRecentDB {
@@ -115,13 +163,6 @@ impl OverlayRecentDB {
 		}
 	}
 
-	/// Create a new instance with an anonymous temporary database.
-	#[cfg(test)]
-	pub fn new_temp() -> OverlayRecentDB {
-		let backing = Arc::new(::kvdb::in_memory(0));
-		Self::new(backing, None)
-	}
-
 	#[cfg(test)]
 	fn can_reconstruct_refs(&self) -> bool {
 		let reconstructed = Self::read_overlay(&*self.backing, self.column);
@@ -148,43 +189,34 @@ impl OverlayRecentDB {
 			let mut era = decode::<u64>(&val);
 			latest_era = Some(era);
 			loop {
-				let mut index = 0usize;
-				while let Some(rlp_data) = db.get(col, {
-					let mut r = RlpStream::new_list(3);
-					r.append(&era);
-					r.append(&index);
-					r.append(&&PADDING[..]);
-					&r.drain()
-				}).expect("Low-level database error.") {
-					trace!("read_overlay: era={}, index={}", era, index);
-					let rlp = Rlp::new(&rlp_data);
-					let id: H256 = rlp.val_at(0);
-					let insertions = rlp.at(1);
-					let deletions: Vec<H256> = rlp.list_at(2);
+				let mut db_key = DatabaseKey {
+					era,
+					index: 0usize,
+				};
+				while let Some(rlp_data) = db.get(col, &encode(&db_key)).expect("Low-level database error.") {
+					trace!("read_overlay: era={}, index={}", era, db_key.index);
+					let value = decode::<DatabaseValue>(&rlp_data);
+					count += value.inserts.len();
 					let mut inserted_keys = Vec::new();
-					for r in insertions.iter() {
-						let k: H256 = r.val_at(0);
-						let v = r.at(1).data();
-
+					for (k, v) in value.inserts {
 						let short_key = to_short_key(&k);
 
 						if !overlay.contains(&short_key) {
 							cumulative_size += v.len();
 						}
 
-						overlay.emplace(short_key, DBValue::from_slice(v));
+						overlay.emplace(short_key, v);
 						inserted_keys.push(k);
-						count += 1;
 					}
 					journal.entry(era).or_insert_with(Vec::new).push(JournalEntry {
-						id: id,
+						id: value.id,
 						insertions: inserted_keys,
-						deletions: deletions,
+						deletions: value.deletes,
 					});
-					index += 1;
+					db_key.index += 1;
 					earliest_era = Some(era);
 				};
-				if index == 0 || era == 0 {
+				if db_key.index == 0 || era == 0 {
 					break;
 				}
 				era -= 1;
@@ -200,8 +232,6 @@ impl OverlayRecentDB {
 			cumulative_size: cumulative_size,
 		}
 	}
-
-
 }
 
 #[inline]
@@ -260,22 +290,24 @@ impl JournalDB for OverlayRecentDB {
 		// flush previous changes
 		journal_overlay.pending_overlay.clear();
 
-		let mut r = RlpStream::new_list(3);
 		let mut tx = self.transaction_overlay.drain();
 		let inserted_keys: Vec<_> = tx.iter().filter_map(|(k, &(_, c))| if c > 0 { Some(k.clone()) } else { None }).collect();
 		let removed_keys: Vec<_> = tx.iter().filter_map(|(k, &(_, c))| if c < 0 { Some(k.clone()) } else { None }).collect();
 		let ops = inserted_keys.len() + removed_keys.len();
 
 		// Increase counter for each inserted key no matter if the block is canonical or not.
-		let insertions = tx.drain().filter_map(|(k, (v, c))| if c > 0 { Some((k, v)) } else { None });
+		let insertions: Vec<_> = tx.drain().filter_map(|(k, (v, c))| if c > 0 { Some((k, v)) } else { None }).collect();
+
+		let encoded_value = {
+			let value_ref = DatabaseValueRef {
+				id,
+				inserts: &insertions,
+				deletes: &removed_keys,
+			};
+			encode(&value_ref)
+		};
 
-		r.append(id);
-		r.begin_list(inserted_keys.len());
 		for (k, v) in insertions {
-			r.begin_list(2);
-			r.append(&k);
-			r.append(&&*v);
-
 			let short_key = to_short_key(&k);
 			if !journal_overlay.backing_overlay.contains(&short_key) {
 				journal_overlay.cumulative_size += v.len();
@@ -283,14 +315,14 @@ impl JournalDB for OverlayRecentDB {
 
 			journal_overlay.backing_overlay.emplace(short_key, v);
 		}
-		r.append_list(&removed_keys);
 
-		let mut k = RlpStream::new_list(3);
 		let index = journal_overlay.journal.get(&now).map_or(0, |j| j.len());
-		k.append(&now);
-		k.append(&index);
-		k.append(&&PADDING[..]);
-		batch.put_vec(self.column, &k.drain(), r.out());
+		let db_key = DatabaseKey {
+			era: now,
+			index,
+		};
+
+		batch.put_vec(self.column, &encode(&db_key), encoded_value.into_vec());
 		if journal_overlay.latest_era.map_or(true, |e| now > e) {
 			trace!(target: "journaldb", "Set latest era to {}", now);
 			batch.put_vec(self.column, &LATEST_ERA_KEY, encode(&now).into_vec());
@@ -321,11 +353,11 @@ impl JournalDB for OverlayRecentDB {
 			let mut index = 0usize;
 			for mut journal in records.drain(..) {
 				//delete the record from the db
-				let mut r = RlpStream::new_list(3);
-				r.append(&end_era);
-				r.append(&index);
-				r.append(&&PADDING[..]);
-				batch.delete(self.column, &r.drain());
+				let db_key = DatabaseKey {
+					era: end_era,
+					index,
+				};
+				batch.delete(self.column, &encode(&db_key));
 				trace!(target: "journaldb", "Delete journal for time #{}.{}: {}, (canon was {}): +{} -{} entries", end_era, index, journal.id, canon_id, journal.insertions.len(), journal.deletions.len());
 				{
 					if *canon_id == journal.id {
@@ -457,47 +489,43 @@ impl HashDB for OverlayRecentDB {
 
 #[cfg(test)]
 mod tests {
-	#![cfg_attr(feature="dev", allow(blacklisted_name))]
-	#![cfg_attr(feature="dev", allow(similar_names))]
 
-	use std::path::Path;
+	use keccak::keccak;
 	use super::*;
 	use hashdb::{HashDB, DBValue};
 	use ethcore_logger::init_log;
-	use journaldb::JournalDB;
-	use kvdb::Database;
-	use {H32, Hashable};
+	use {kvdb_memorydb, JournalDB};
 
-	fn new_db(path: &Path) -> OverlayRecentDB {
-		let backing = Arc::new(Database::open_default(path.to_str().unwrap()).unwrap());
+	fn new_db() -> OverlayRecentDB {
+		let backing = Arc::new(kvdb_memorydb::create(0));
 		OverlayRecentDB::new(backing, None)
 	}
 
 	#[test]
 	fn insert_same_in_fork() {
 		// history is 1
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 
 		let x = jdb.insert(b"X");
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(3, &b"1002a".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"1002a"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(4, &b"1003a".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"1003a"), Some((2, keccak(b"2")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&x);
-		jdb.commit_batch(3, &b"1002b".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"1002b"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		let x = jdb.insert(b"X");
-		jdb.commit_batch(4, &b"1003b".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"1003b"), Some((2, keccak(b"2")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
-		jdb.commit_batch(5, &b"1004a".sha3(), Some((3, b"1002a".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"1004a"), Some((3, keccak(b"1002a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(6, &b"1005a".sha3(), Some((4, b"1003a".sha3()))).unwrap();
+		jdb.commit_batch(6, &keccak(b"1005a"), Some((4, keccak(b"1003a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		assert!(jdb.contains(&x));
@@ -506,22 +534,22 @@ mod tests {
 	#[test]
 	fn long_history() {
 		// history is 3
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 		let h = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&h));
 		jdb.remove(&h);
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(3, &b"3".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(4, &b"4".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(!jdb.contains(&h));
 	}
@@ -529,11 +557,11 @@ mod tests {
 	#[test]
 	fn complex() {
 		// history is 1
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 
 		let foo = jdb.insert(b"foo");
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
@@ -541,7 +569,7 @@ mod tests {
 		jdb.remove(&foo);
 		jdb.remove(&bar);
 		let baz = jdb.insert(b"baz");
-		jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
@@ -549,20 +577,20 @@ mod tests {
 
 		let foo = jdb.insert(b"foo");
 		jdb.remove(&baz);
-		jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(!jdb.contains(&bar));
 		assert!(jdb.contains(&baz));
 
 		jdb.remove(&foo);
-		jdb.commit_batch(3, &b"3".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), Some((2, keccak(b"2")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(!jdb.contains(&bar));
 		assert!(!jdb.contains(&baz));
 
-		jdb.commit_batch(4, &b"4".sha3(), Some((3, b"3".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((3, keccak(b"3")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(!jdb.contains(&foo));
 		assert!(!jdb.contains(&bar));
@@ -572,29 +600,29 @@ mod tests {
 	#[test]
 	fn fork() {
 		// history is 1
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 
 		let foo = jdb.insert(b"foo");
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 
 		jdb.remove(&foo);
 		let baz = jdb.insert(b"baz");
-		jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&bar);
-		jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 		assert!(jdb.contains(&baz));
 
-		jdb.commit_batch(2, &b"2b".sha3(), Some((1, b"1b".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2b"), Some((1, keccak(b"1b")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 		assert!(!jdb.contains(&baz));
@@ -604,139 +632,138 @@ mod tests {
 	#[test]
 	fn overwrite() {
 		// history is 1
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 
 		jdb.remove(&foo);
-		jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.insert(b"foo");
 		assert!(jdb.contains(&foo));
-		jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
-		jdb.commit_batch(3, &b"2".sha3(), Some((0, b"2".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"2"), Some((0, keccak(b"2")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 	}
 
 	#[test]
 	fn fork_same_key_one() {
-		let mut jdb = OverlayRecentDB::new_temp();
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		let mut jdb = new_db();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1c".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1c"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		assert!(jdb.contains(&foo));
 
-		jdb.commit_batch(2, &b"2a".sha3(), Some((1, b"1a".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2a"), Some((1, keccak(b"1a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 	}
 
 	#[test]
 	fn fork_same_key_other() {
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1c".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1c"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		assert!(jdb.contains(&foo));
 
-		jdb.commit_batch(2, &b"2b".sha3(), Some((1, b"1b".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2b"), Some((1, keccak(b"1b")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 	}
 
 	#[test]
 	fn fork_ins_del_ins() {
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(2, &b"2a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2a"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(2, &b"2b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2b"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(3, &b"3a".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3a"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(3, &b"3b".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3b"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
-		jdb.commit_batch(4, &b"4a".sha3(), Some((2, b"2a".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4a"), Some((2, keccak(b"2a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
-		jdb.commit_batch(5, &b"5a".sha3(), Some((3, b"3a".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"5a"), Some((3, keccak(b"3a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 	}
 
 	#[test]
 	fn reopen() {
-		let mut dir = ::std::env::temp_dir();
-		dir.push(H32::random().hex());
+		let shared_db = Arc::new(kvdb_memorydb::create(0));
 		let bar = H256::random();
 
 		let foo = {
-			let mut jdb = new_db(&dir);
+			let mut jdb = OverlayRecentDB::new(shared_db.clone(), None);
 			// history is 1
 			let foo = jdb.insert(b"foo");
 			jdb.emplace(bar.clone(), DBValue::from_slice(b"bar"));
-			jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+			jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			foo
 		};
 
 		{
-			let mut jdb = new_db(&dir);
+			let mut jdb = OverlayRecentDB::new(shared_db.clone(), None);
 			jdb.remove(&foo);
-			jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 		}
 
 		{
-			let mut jdb = new_db(&dir);
+			let mut jdb = OverlayRecentDB::new(shared_db.clone(), None);
 			assert!(jdb.contains(&foo));
 			assert!(jdb.contains(&bar));
-			jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+			jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(!jdb.contains(&foo));
 		}
@@ -745,133 +772,133 @@ mod tests {
 	#[test]
 	fn insert_delete_insert_delete_insert_expunge() {
 		init_log();
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 
 		// history is 4
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.remove(&foo);
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.insert(b"foo");
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.remove(&foo);
-		jdb.commit_batch(3, &b"3".sha3(), None).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.insert(b"foo");
-		jdb.commit_batch(4, &b"4".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		// expunge foo
-		jdb.commit_batch(5, &b"5".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"5"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 	}
 
 	#[test]
 	fn forked_insert_delete_insert_delete_insert_expunge() {
 		init_log();
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 
 		// history is 4
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(1, &b"1a".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1a"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(1, &b"1b".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1b"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(2, &b"2a".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2a"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(2, &b"2b".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2b"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(3, &b"3a".sha3(), None).unwrap();
+		jdb.commit_batch(3, &keccak(b"3a"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&foo);
-		jdb.commit_batch(3, &b"3b".sha3(), None).unwrap();
+		jdb.commit_batch(3, &keccak(b"3b"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(4, &b"4a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4a"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(4, &b"4b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4b"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		// expunge foo
-		jdb.commit_batch(5, &b"5".sha3(), Some((1, b"1a".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"5"), Some((1, keccak(b"1a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 	}
 
 	#[test]
 	fn broken_assert() {
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		// foo is ancient history.
 
 		jdb.remove(&foo);
-		jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.insert(b"foo");
-		jdb.commit_batch(3, &b"3".sha3(), Some((2, b"2".sha3()))).unwrap();	// BROKEN
+		jdb.commit_batch(3, &keccak(b"3"), Some((2, keccak(b"2")))).unwrap();	// BROKEN
 		assert!(jdb.can_reconstruct_refs());
 		assert!(jdb.contains(&foo));
 
 		jdb.remove(&foo);
-		jdb.commit_batch(4, &b"4".sha3(), Some((3, b"3".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((3, keccak(b"3")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
-		jdb.commit_batch(5, &b"5".sha3(), Some((4, b"4".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"5"), Some((4, keccak(b"4")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		assert!(!jdb.contains(&foo));
 	}
 
 	#[test]
 	fn reopen_test() {
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 		// history is 4
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(3, &b"3".sha3(), None).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(4, &b"4".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		// foo is ancient history.
 
 		jdb.insert(b"foo");
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(5, &b"5".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(5, &keccak(b"5"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.remove(&foo);
 		jdb.remove(&bar);
-		jdb.commit_batch(6, &b"6".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(6, &keccak(b"6"), Some((2, keccak(b"2")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 		jdb.insert(b"foo");
 		jdb.insert(b"bar");
-		jdb.commit_batch(7, &b"7".sha3(), Some((3, b"3".sha3()))).unwrap();
+		jdb.commit_batch(7, &keccak(b"7"), Some((3, keccak(b"3")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 	}
 
@@ -879,54 +906,52 @@ mod tests {
 	fn reopen_remove_three() {
 		init_log();
 
-		let mut dir = ::std::env::temp_dir();
-		dir.push(H32::random().hex());
-
-		let foo = b"foo".sha3();
+		let shared_db = Arc::new(kvdb_memorydb::create(0));
+		let foo = keccak(b"foo");
 
 		{
-			let mut jdb = new_db(&dir);
+			let mut jdb = OverlayRecentDB::new(shared_db.clone(), None);
 			// history is 1
 			jdb.insert(b"foo");
-			jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+			jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 			assert!(jdb.can_reconstruct_refs());
-			jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+			jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 
 			// foo is ancient history.
 
 			jdb.remove(&foo);
-			jdb.commit_batch(2, &b"2".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(2, &keccak(b"2"), Some((0, keccak(b"0")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(jdb.contains(&foo));
 
 			jdb.insert(b"foo");
-			jdb.commit_batch(3, &b"3".sha3(), Some((1, b"1".sha3()))).unwrap();
+			jdb.commit_batch(3, &keccak(b"3"), Some((1, keccak(b"1")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(jdb.contains(&foo));
 
 		// incantation to reopen the db
 		}; {
-			let mut jdb = new_db(&dir);
+			let mut jdb = OverlayRecentDB::new(shared_db.clone(), None);
 
 			jdb.remove(&foo);
-			jdb.commit_batch(4, &b"4".sha3(), Some((2, b"2".sha3()))).unwrap();
+			jdb.commit_batch(4, &keccak(b"4"), Some((2, keccak(b"2")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(jdb.contains(&foo));
 
 		// incantation to reopen the db
 		}; {
-			let mut jdb = new_db(&dir);
+			let mut jdb = OverlayRecentDB::new(shared_db.clone(), None);
 
-			jdb.commit_batch(5, &b"5".sha3(), Some((3, b"3".sha3()))).unwrap();
+			jdb.commit_batch(5, &keccak(b"5"), Some((3, keccak(b"3")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(jdb.contains(&foo));
 
 		// incantation to reopen the db
 		}; {
-			let mut jdb = new_db(&dir);
+			let mut jdb = OverlayRecentDB::new(shared_db, None);
 
-			jdb.commit_batch(6, &b"6".sha3(), Some((4, b"4".sha3()))).unwrap();
+			jdb.commit_batch(6, &keccak(b"6"), Some((4, keccak(b"4")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(!jdb.contains(&foo));
 		}
@@ -934,29 +959,29 @@ mod tests {
 
 	#[test]
 	fn reopen_fork() {
-		let mut dir = ::std::env::temp_dir();
-		dir.push(H32::random().hex());
+		let shared_db = Arc::new(kvdb_memorydb::create(0));
+
 		let (foo, bar, baz) = {
-			let mut jdb = new_db(&dir);
+			let mut jdb = OverlayRecentDB::new(shared_db.clone(), None);
 			// history is 1
 			let foo = jdb.insert(b"foo");
 			let bar = jdb.insert(b"bar");
-			jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+			jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			jdb.remove(&foo);
 			let baz = jdb.insert(b"baz");
-			jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 
 			jdb.remove(&bar);
-			jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+			jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			(foo, bar, baz)
 		};
 
 		{
-			let mut jdb = new_db(&dir);
-			jdb.commit_batch(2, &b"2b".sha3(), Some((1, b"1b".sha3()))).unwrap();
+			let mut jdb = OverlayRecentDB::new(shared_db, None);
+			jdb.commit_batch(2, &keccak(b"2b"), Some((1, keccak(b"1b")))).unwrap();
 			assert!(jdb.can_reconstruct_refs());
 			assert!(jdb.contains(&foo));
 			assert!(!jdb.contains(&baz));
@@ -966,19 +991,19 @@ mod tests {
 
 	#[test]
 	fn insert_older_era() {
-		let mut jdb = OverlayRecentDB::new_temp();
+		let mut jdb = new_db();
 		let foo = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0a".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0a"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0a".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0a")))).unwrap();
 		assert!(jdb.can_reconstruct_refs());
 
 		jdb.remove(&bar);
-		jdb.commit_batch(0, &b"0b".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0b"), None).unwrap();
 		assert!(jdb.can_reconstruct_refs());
-		jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
@@ -986,9 +1011,7 @@ mod tests {
 
 	#[test]
 	fn inject() {
-		let temp = ::devtools::RandomTempPath::new();
-
-		let mut jdb = new_db(temp.as_path().as_path());
+		let mut jdb = new_db();
 		let key = jdb.insert(b"dog");
 		jdb.inject_batch().unwrap();
 
@@ -1001,44 +1024,44 @@ mod tests {
 
 	#[test]
 	fn earliest_era() {
-		let temp = ::devtools::RandomTempPath::new();
+		let shared_db = Arc::new(kvdb_memorydb::create(0));
 
 		// empty DB
-		let mut jdb = new_db(temp.as_path().as_path());
+		let mut jdb = OverlayRecentDB::new(shared_db.clone(), None);
 		assert!(jdb.earliest_era().is_none());
 
 		// single journalled era.
 		let _key = jdb.insert(b"hello!");
 		let mut batch = jdb.backing().transaction();
-		jdb.journal_under(&mut batch, 0, &b"0".sha3()).unwrap();
+		jdb.journal_under(&mut batch, 0, &keccak(b"0")).unwrap();
 		jdb.backing().write_buffered(batch);
 
 		assert_eq!(jdb.earliest_era(), Some(0));
 
 		// second journalled era.
 		let mut batch = jdb.backing().transaction();
-		jdb.journal_under(&mut batch, 1, &b"1".sha3()).unwrap();
+		jdb.journal_under(&mut batch, 1, &keccak(b"1")).unwrap();
 		jdb.backing().write_buffered(batch);
 
 		assert_eq!(jdb.earliest_era(), Some(0));
 
 		// single journalled era.
 		let mut batch = jdb.backing().transaction();
-		jdb.mark_canonical(&mut batch, 0, &b"0".sha3()).unwrap();
+		jdb.mark_canonical(&mut batch, 0, &keccak(b"0")).unwrap();
 		jdb.backing().write_buffered(batch);
 
 		assert_eq!(jdb.earliest_era(), Some(1));
 
 		// no journalled eras.
 		let mut batch = jdb.backing().transaction();
-		jdb.mark_canonical(&mut batch, 1, &b"1".sha3()).unwrap();
+		jdb.mark_canonical(&mut batch, 1, &keccak(b"1")).unwrap();
 		jdb.backing().write_buffered(batch);
 
 		assert_eq!(jdb.earliest_era(), Some(1));
 
 		// reconstructed: no journal entries.
 		drop(jdb);
-		let jdb = new_db(temp.as_path().as_path());
+		let jdb = OverlayRecentDB::new(shared_db, None);
 		assert_eq!(jdb.earliest_era(), None);
 	}
 }
diff --git a/util/src/journaldb/refcounteddb.rs b/util/journaldb/src/refcounteddb.rs
similarity index 73%
rename from util/src/journaldb/refcounteddb.rs
rename to util/journaldb/src/refcounteddb.rs
index 1b9c9ded89630dc71fc0a09f216c2e1867dd1186..bf366faf75311c97c7b7246113700eec86b2558b 100644
--- a/util/src/journaldb/refcounteddb.rs
+++ b/util/journaldb/src/refcounteddb.rs
@@ -19,14 +19,17 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 use heapsize::HeapSizeOf;
-use rlp::*;
+use rlp::{encode, decode};
 use hashdb::*;
 use overlaydb::OverlayDB;
 use memorydb::MemoryDB;
 use super::{DB_PREFIX_LEN, LATEST_ERA_KEY};
 use super::traits::JournalDB;
 use kvdb::{KeyValueDB, DBTransaction};
-use {UtilError, H256, Bytes};
+use ethereum_types::H256;
+use error::UtilError;
+use bytes::Bytes;
+use util::{DatabaseKey, DatabaseValueView, DatabaseValueRef};
 
 /// Implementation of the `HashDB` trait for a disk-backed database with a memory overlay
 /// and latent-removal semantics.
@@ -57,12 +60,11 @@ pub struct RefCountedDB {
 	column: Option<u32>,
 }
 
-const PADDING : [u8; 10] = [ 0u8; 10 ];
-
 impl RefCountedDB {
 	/// Create a new instance given a `backing` database.
 	pub fn new(backing: Arc<KeyValueDB>, col: Option<u32>) -> RefCountedDB {
-		let latest_era = backing.get(col, &LATEST_ERA_KEY).expect("Low-level database error.").map(|val| decode::<u64>(&val));
+		let latest_era = backing.get(col, &LATEST_ERA_KEY).expect("Low-level database error.")
+			.map(|val| decode::<u64>(&val));
 
 		RefCountedDB {
 			forward: OverlayDB::new(backing.clone(), col),
@@ -73,13 +75,6 @@ impl RefCountedDB {
 			column: col,
 		}
 	}
-
-	/// Create a new instance with an anonymous temporary database.
-	#[cfg(test)]
-	fn new_temp() -> RefCountedDB {
-		let backing = Arc::new(::kvdb::in_memory(0));
-		Self::new(backing, None)
-	}
 }
 
 impl HashDB for RefCountedDB {
@@ -123,29 +118,32 @@ impl JournalDB for RefCountedDB {
 
 	fn journal_under(&mut self, batch: &mut DBTransaction, now: u64, id: &H256) -> Result<u32, UtilError> {
 		// record new commit's details.
-		let mut index = 0usize;
+		let mut db_key = DatabaseKey {
+			era: now,
+			index: 0usize,
+		};
 		let mut last;
 
 		while self.backing.get(self.column, {
-			let mut r = RlpStream::new_list(3);
-			r.append(&now);
-			r.append(&index);
-			r.append(&&PADDING[..]);
-			last = r.drain();
+			last = encode(&db_key);
 			&last
 		})?.is_some() {
-			index += 1;
+			db_key.index += 1;
 		}
 
-		let mut r = RlpStream::new_list(3);
-		r.append(id);
-		r.append_list(&self.inserts);
-		r.append_list(&self.removes);
-		batch.put(self.column, &last, r.as_raw());
+		{
+			let value_ref = DatabaseValueRef {
+				id,
+				inserts: &self.inserts,
+				deletes: &self.removes,
+			};
+
+			batch.put(self.column, &last, &encode(&value_ref));
+		}
 
 		let ops = self.inserts.len() + self.removes.len();
 
-		trace!(target: "rcdb", "new journal for time #{}.{} => {}: inserts={:?}, removes={:?}", now, index, id, self.inserts, self.removes);
+		trace!(target: "rcdb", "new journal for time #{}.{} => {}: inserts={:?}, removes={:?}", now, db_key.index, id, self.inserts, self.removes);
 
 		self.inserts.clear();
 		self.removes.clear();
@@ -160,27 +158,30 @@ impl JournalDB for RefCountedDB {
 
 	fn mark_canonical(&mut self, batch: &mut DBTransaction, end_era: u64, canon_id: &H256) -> Result<u32, UtilError> {
 		// apply old commits' details
-		let mut index = 0usize;
+		let mut db_key = DatabaseKey {
+			era: end_era,
+			index: 0usize,
+		};
 		let mut last;
 		while let Some(rlp_data) = {
 			self.backing.get(self.column, {
-				let mut r = RlpStream::new_list(3);
-				r.append(&end_era);
-				r.append(&index);
-				r.append(&&PADDING[..]);
-				last = r.drain();
+				last = encode(&db_key);
 				&last
 			})?
 		} {
-			let rlp = Rlp::new(&rlp_data);
-			let our_id: H256 = rlp.val_at(0);
-			let to_remove: Vec<H256> = rlp.list_at(if *canon_id == our_id {2} else {1});
-			trace!(target: "rcdb", "delete journal for time #{}.{}=>{}, (canon was {}): deleting {:?}", end_era, index, our_id, canon_id, to_remove);
+			let view = DatabaseValueView::from_rlp(&rlp_data);
+			let our_id = view.id().expect("rlp read from db; qed");
+			let to_remove = if canon_id == &our_id {
+				view.deletes()
+			} else {
+				view.inserts()
+			}.expect("rlp read from db; qed");
+			trace!(target: "rcdb", "delete journal for time #{}.{}=>{}, (canon was {}): deleting {:?}", end_era, db_key.index, our_id, canon_id, to_remove);
 			for i in &to_remove {
 				self.forward.remove(i);
 			}
 			batch.delete(self.column, &last);
-			index += 1;
+			db_key.index += 1;
 		}
 
 		let r = self.forward.commit_to_batch(batch)?;
@@ -210,84 +211,87 @@ impl JournalDB for RefCountedDB {
 
 #[cfg(test)]
 mod tests {
-	#![cfg_attr(feature="dev", allow(blacklisted_name))]
-	#![cfg_attr(feature="dev", allow(similar_names))]
 
+	use keccak::keccak;
 	use hashdb::{HashDB, DBValue};
 	use super::*;
-	use super::super::traits::JournalDB;
-	use {Hashable};
+	use {JournalDB, kvdb_memorydb};
+
+	fn new_db() -> RefCountedDB {
+		let backing = Arc::new(kvdb_memorydb::create(0));
+		RefCountedDB::new(backing, None)
+	}
 
 	#[test]
 	fn long_history() {
 		// history is 3
-		let mut jdb = RefCountedDB::new_temp();
+		let mut jdb = new_db();
 		let h = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.contains(&h));
 		jdb.remove(&h);
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(3, &b"3".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.contains(&h));
-		jdb.commit_batch(4, &b"4".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((1, keccak(b"1")))).unwrap();
 		assert!(!jdb.contains(&h));
 	}
 
 	#[test]
 	fn latest_era_should_work() {
 		// history is 3
-		let mut jdb = RefCountedDB::new_temp();
+		let mut jdb = new_db();
 		assert_eq!(jdb.latest_era(), None);
 		let h = jdb.insert(b"foo");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert_eq!(jdb.latest_era(), Some(0));
 		jdb.remove(&h);
-		jdb.commit_batch(1, &b"1".sha3(), None).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
 		assert_eq!(jdb.latest_era(), Some(1));
-		jdb.commit_batch(2, &b"2".sha3(), None).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), None).unwrap();
 		assert_eq!(jdb.latest_era(), Some(2));
-		jdb.commit_batch(3, &b"3".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), Some((0, keccak(b"0")))).unwrap();
 		assert_eq!(jdb.latest_era(), Some(3));
-		jdb.commit_batch(4, &b"4".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((1, keccak(b"1")))).unwrap();
 		assert_eq!(jdb.latest_era(), Some(4));
 	}
 
 	#[test]
 	fn complex() {
 		// history is 1
-		let mut jdb = RefCountedDB::new_temp();
+		let mut jdb = new_db();
 
 		let foo = jdb.insert(b"foo");
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 
 		jdb.remove(&foo);
 		jdb.remove(&bar);
 		let baz = jdb.insert(b"baz");
-		jdb.commit_batch(1, &b"1".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1"), Some((0, keccak(b"0")))).unwrap();
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 		assert!(jdb.contains(&baz));
 
 		let foo = jdb.insert(b"foo");
 		jdb.remove(&baz);
-		jdb.commit_batch(2, &b"2".sha3(), Some((1, b"1".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2"), Some((1, keccak(b"1")))).unwrap();
 		assert!(jdb.contains(&foo));
 		assert!(!jdb.contains(&bar));
 		assert!(jdb.contains(&baz));
 
 		jdb.remove(&foo);
-		jdb.commit_batch(3, &b"3".sha3(), Some((2, b"2".sha3()))).unwrap();
+		jdb.commit_batch(3, &keccak(b"3"), Some((2, keccak(b"2")))).unwrap();
 		assert!(jdb.contains(&foo));
 		assert!(!jdb.contains(&bar));
 		assert!(!jdb.contains(&baz));
 
-		jdb.commit_batch(4, &b"4".sha3(), Some((3, b"3".sha3()))).unwrap();
+		jdb.commit_batch(4, &keccak(b"4"), Some((3, keccak(b"3")))).unwrap();
 		assert!(!jdb.contains(&foo));
 		assert!(!jdb.contains(&bar));
 		assert!(!jdb.contains(&baz));
@@ -296,26 +300,26 @@ mod tests {
 	#[test]
 	fn fork() {
 		// history is 1
-		let mut jdb = RefCountedDB::new_temp();
+		let mut jdb = new_db();
 
 		let foo = jdb.insert(b"foo");
 		let bar = jdb.insert(b"bar");
-		jdb.commit_batch(0, &b"0".sha3(), None).unwrap();
+		jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 
 		jdb.remove(&foo);
 		let baz = jdb.insert(b"baz");
-		jdb.commit_batch(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1a"), Some((0, keccak(b"0")))).unwrap();
 
 		jdb.remove(&bar);
-		jdb.commit_batch(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap();
+		jdb.commit_batch(1, &keccak(b"1b"), Some((0, keccak(b"0")))).unwrap();
 
 		assert!(jdb.contains(&foo));
 		assert!(jdb.contains(&bar));
 		assert!(jdb.contains(&baz));
 
-		jdb.commit_batch(2, &b"2b".sha3(), Some((1, b"1b".sha3()))).unwrap();
+		jdb.commit_batch(2, &keccak(b"2b"), Some((1, keccak(b"1b")))).unwrap();
 		assert!(jdb.contains(&foo));
 		assert!(!jdb.contains(&baz));
 		assert!(!jdb.contains(&bar));
@@ -323,7 +327,7 @@ mod tests {
 
 	#[test]
 	fn inject() {
-		let mut jdb = RefCountedDB::new_temp();
+		let mut jdb = new_db();
 		let key = jdb.insert(b"dog");
 		jdb.inject_batch().unwrap();
 
diff --git a/util/src/journaldb/traits.rs b/util/journaldb/src/traits.rs
similarity index 98%
rename from util/src/journaldb/traits.rs
rename to util/journaldb/src/traits.rs
index 1f14e976572fbf7dcac7c0aba9c2b4c9cb6d34d0..aaf5b27970141962d0cfc16142f95d94273e3f5c 100644
--- a/util/src/journaldb/traits.rs
+++ b/util/journaldb/src/traits.rs
@@ -19,7 +19,9 @@
 use std::sync::Arc;
 use hashdb::*;
 use kvdb::{self, DBTransaction};
-use {Bytes, H256, UtilError};
+use ethereum_types::H256;
+use error::UtilError;
+use bytes::Bytes;
 
 /// A `HashDB` which can manage a short-term journal potentially containing many forks of mutually
 /// exclusive actions.
diff --git a/util/journaldb/src/util.rs b/util/journaldb/src/util.rs
new file mode 100644
index 0000000000000000000000000000000000000000..52dbad7e1daad66cc28616243170486a451ba7f4
--- /dev/null
+++ b/util/journaldb/src/util.rs
@@ -0,0 +1,76 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use ethereum_types::H256;
+use rlp::{RlpStream, Encodable, UntrustedRlp, DecoderError};
+
+const PADDING : [u8; 10] = [ 0u8; 10 ];
+
+pub struct DatabaseKey {
+	pub era: u64,
+	pub index: usize,
+}
+
+impl Encodable for DatabaseKey {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.begin_list(3);
+		s.append(&self.era);
+		s.append(&self.index);
+		s.append(&&PADDING[..]);
+	}
+}
+
+pub struct DatabaseValueView<'a> {
+	rlp: UntrustedRlp<'a>,
+}
+
+impl<'a> DatabaseValueView<'a> {
+	pub fn from_rlp(data: &'a [u8]) -> Self {
+		DatabaseValueView {
+			rlp: UntrustedRlp::new(data),
+		}
+	}
+
+	#[inline]
+	pub fn id(&self) -> Result<H256, DecoderError> {
+		self.rlp.val_at(0)
+	}
+
+	#[inline]
+	pub fn inserts(&self) -> Result<Vec<H256>, DecoderError> {
+		self.rlp.list_at(1)
+	}
+
+	#[inline]
+	pub fn deletes(&self) -> Result<Vec<H256>, DecoderError> {
+		self.rlp.list_at(2)
+	}
+}
+
+pub struct DatabaseValueRef<'a> {
+	pub id: &'a H256,
+	pub inserts: &'a [H256],
+	pub deletes: &'a [H256],
+}
+
+impl<'a> Encodable for DatabaseValueRef<'a> {
+	fn rlp_append(&self, s: &mut RlpStream) {
+		s.begin_list(3);
+		s.append(self.id);
+		s.append_list(self.inserts);
+		s.append_list(self.deletes);
+	}
+}
diff --git a/util/kvdb-memorydb/Cargo.toml b/util/kvdb-memorydb/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..4dbad628c4243cd36b3e379aa1f3b0472ff66f36
--- /dev/null
+++ b/util/kvdb-memorydb/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "kvdb-memorydb"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+parking_lot = "0.5"
+kvdb = { path = "../kvdb" }
diff --git a/util/kvdb-memorydb/src/lib.rs b/util/kvdb-memorydb/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0530c613e3185e95268469859a5fddb3edd386bd
--- /dev/null
+++ b/util/kvdb-memorydb/src/lib.rs
@@ -0,0 +1,117 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate parking_lot;
+extern crate kvdb;
+
+use std::collections::{BTreeMap, HashMap};
+use parking_lot::RwLock;
+use kvdb::{DBValue, DBTransaction, KeyValueDB, DBOp, Result};
+
+/// A key-value database fulfilling the `KeyValueDB` trait, living in memory.
+/// This is generally intended for tests and is not particularly optimized.
+#[derive(Default)]
+pub struct InMemory {
+	columns: RwLock<HashMap<Option<u32>, BTreeMap<Vec<u8>, DBValue>>>,
+}
+
+/// Create an in-memory database with the given number of columns.
+/// Columns will be indexable by 0..`num_cols`
+pub fn create(num_cols: u32) -> InMemory {
+	let mut cols = HashMap::new();
+	cols.insert(None, BTreeMap::new());
+
+	for idx in 0..num_cols {
+		cols.insert(Some(idx), BTreeMap::new());
+	}
+
+	InMemory {
+		columns: RwLock::new(cols)
+	}
+}
+
+impl KeyValueDB for InMemory {
+	fn get(&self, col: Option<u32>, key: &[u8]) -> Result<Option<DBValue>> {
+		let columns = self.columns.read();
+		match columns.get(&col) {
+			None => Err(format!("No such column family: {:?}", col).into()),
+			Some(map) => Ok(map.get(key).cloned()),
+		}
+	}
+
+	fn get_by_prefix(&self, col: Option<u32>, prefix: &[u8]) -> Option<Box<[u8]>> {
+		let columns = self.columns.read();
+		match columns.get(&col) {
+			None => None,
+			Some(map) =>
+				map.iter()
+					.find(|&(ref k ,_)| k.starts_with(prefix))
+					.map(|(_, v)| v.to_vec().into_boxed_slice())
+		}
+	}
+
+	fn write_buffered(&self, transaction: DBTransaction) {
+		let mut columns = self.columns.write();
+		let ops = transaction.ops;
+		for op in ops {
+			match op {
+				DBOp::Insert { col, key, value } => {
+					if let Some(col) = columns.get_mut(&col) {
+						col.insert(key.into_vec(), value);
+					}
+				},
+				DBOp::Delete { col, key } => {
+					if let Some(col) = columns.get_mut(&col) {
+						col.remove(&*key);
+					}
+				},
+			}
+		}
+	}
+
+	fn flush(&self) -> Result<()> {
+		Ok(())
+	}
+
+	fn iter<'a>(&'a self, col: Option<u32>) -> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a> {
+		match self.columns.read().get(&col) {
+			Some(map) => Box::new( // TODO: worth optimizing at all?
+				map.clone()
+					.into_iter()
+					.map(|(k, v)| (k.into_boxed_slice(), v.into_vec().into_boxed_slice()))
+			),
+			None => Box::new(None.into_iter()),
+		}
+	}
+
+	fn iter_from_prefix<'a>(&'a self, col: Option<u32>, prefix: &'a [u8])
+		-> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a>
+	{
+		match self.columns.read().get(&col) {
+			Some(map) => Box::new(
+				map.clone()
+					.into_iter()
+					.skip_while(move |&(ref k, _)| !k.starts_with(prefix))
+					.map(|(k, v)| (k.into_boxed_slice(), v.into_vec().into_boxed_slice()))
+			),
+			None => Box::new(None.into_iter()),
+		}
+	}
+
+	fn restore(&self, _new_db: &str) -> Result<()> {
+		Err("Attempted to restore in-memory database".into())
+	}
+}
diff --git a/util/kvdb-rocksdb/Cargo.toml b/util/kvdb-rocksdb/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..89a2f6403faf44a1422b8a49bf5e7b53c2ffe573
--- /dev/null
+++ b/util/kvdb-rocksdb/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "kvdb-rocksdb"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+elastic-array = "0.10"
+ethereum-types = "0.2"
+kvdb = { path = "../kvdb" }
+log = "0.3"
+num_cpus = "1.0"
+parking_lot = "0.5"
+regex = "0.2"
+rocksdb = { git = "https://github.com/paritytech/rust-rocksdb" }
+interleaved-ordered = "0.1.0"
+
+[dev-dependencies]
+tempdir = "0.3"
diff --git a/util/src/kvdb.rs b/util/kvdb-rocksdb/src/lib.rs
similarity index 59%
rename from util/src/kvdb.rs
rename to util/kvdb-rocksdb/src/lib.rs
index 44321c531bc916962ee7bac2e037132480ce0950..4f2220a11dd179637bbaba13db7b86e2580c8018 100644
--- a/util/src/kvdb.rs
+++ b/util/kvdb-rocksdb/src/lib.rs
@@ -14,22 +14,34 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Key-Value store abstraction with `RocksDB` backend.
+#[macro_use]
+extern crate log;
 
-use std::{mem, fs};
-use std::collections::{HashMap, BTreeMap};
-use std::io::ErrorKind;
+extern crate elastic_array;
+extern crate interleaved_ordered;
+extern crate num_cpus;
+extern crate parking_lot;
+extern crate regex;
+extern crate rocksdb;
+
+extern crate ethereum_types;
+extern crate kvdb;
+
+use std::cmp;
+use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::path::{PathBuf, Path};
-use parking_lot::{Mutex, MutexGuard, RwLock};
+use std::{fs, io, mem, result};
 
-use elastic_array::*;
-use hashdb::DBValue;
-use rlp::{UntrustedRlp, RlpType, Compressible};
-use rocksdb::{DB, Writable, WriteBatch, WriteOptions, IteratorMode, DBIterator,
-	Options, DBCompactionStyle, BlockBasedOptions, Direction, Cache, Column, ReadOptions};
-use {UtilError, Bytes};
+use parking_lot::{Mutex, MutexGuard, RwLock};
+use rocksdb::{
+	DB, Writable, WriteBatch, WriteOptions, IteratorMode, DBIterator,
+	Options, BlockBasedOptions, Direction, Cache, Column, ReadOptions
+};
+use interleaved_ordered::{interleave_ordered, InterleaveOrdered};
 
+use elastic_array::ElasticArray32;
+use kvdb::{KeyValueDB, DBTransaction, DBValue, DBOp, Result};
 
 #[cfg(target_os = "linux")]
 use regex::Regex;
@@ -38,258 +50,20 @@ use std::process::Command;
 #[cfg(target_os = "linux")]
 use std::fs::File;
 
-const DB_BACKGROUND_FLUSHES: i32 = 2;
-const DB_BACKGROUND_COMPACTIONS: i32 = 2;
-const DB_WRITE_BUFFER_SIZE: usize = 2048 * 1000;
-
-/// Required length of prefixes.
-pub const PREFIX_LEN: usize = 12;
-
-/// Write transaction. Batches a sequence of put/delete operations for efficiency.
-#[derive(Default, Clone, PartialEq)]
-pub struct DBTransaction {
-	ops: Vec<DBOp>,
-}
-
-#[derive(Clone, PartialEq)]
-enum DBOp {
-	Insert {
-		col: Option<u32>,
-		key: ElasticArray32<u8>,
-		value: DBValue,
-	},
-	InsertCompressed {
-		col: Option<u32>,
-		key: ElasticArray32<u8>,
-		value: DBValue,
-	},
-	Delete {
-		col: Option<u32>,
-		key: ElasticArray32<u8>,
-	}
-}
-
-impl DBTransaction {
-	/// Create new transaction.
-	pub fn new() -> DBTransaction {
-		DBTransaction::with_capacity(256)
-	}
-
-	/// Create new transaction with capacity.
-	pub fn with_capacity(cap: usize) -> DBTransaction {
-		DBTransaction {
-			ops: Vec::with_capacity(cap)
-		}
-	}
-
-	/// Insert a key-value pair in the transaction. Any existing value will be overwritten upon write.
-	pub fn put(&mut self, col: Option<u32>, key: &[u8], value: &[u8]) {
-		let mut ekey = ElasticArray32::new();
-		ekey.append_slice(key);
-		self.ops.push(DBOp::Insert {
-			col: col,
-			key: ekey,
-			value: DBValue::from_slice(value),
-		});
-	}
-
-	/// Insert a key-value pair in the transaction. Any existing value will be overwritten upon write.
-	pub fn put_vec(&mut self, col: Option<u32>, key: &[u8], value: Bytes) {
-		let mut ekey = ElasticArray32::new();
-		ekey.append_slice(key);
-		self.ops.push(DBOp::Insert {
-			col: col,
-			key: ekey,
-			value: DBValue::from_vec(value),
-		});
-	}
-
-	/// Insert a key-value pair in the transaction. Any existing value will be overwritten upon write.
-	/// Value will be RLP-compressed on flush
-	pub fn put_compressed(&mut self, col: Option<u32>, key: &[u8], value: Bytes) {
-		let mut ekey = ElasticArray32::new();
-		ekey.append_slice(key);
-		self.ops.push(DBOp::InsertCompressed {
-			col: col,
-			key: ekey,
-			value: DBValue::from_vec(value),
-		});
-	}
-
-	/// Delete value by key.
-	pub fn delete(&mut self, col: Option<u32>, key: &[u8]) {
-		let mut ekey = ElasticArray32::new();
-		ekey.append_slice(key);
-		self.ops.push(DBOp::Delete {
-			col: col,
-			key: ekey,
-		});
-	}
-}
+const DB_DEFAULT_MEMORY_BUDGET_MB: usize = 128;
 
 enum KeyState {
 	Insert(DBValue),
-	InsertCompressed(DBValue),
 	Delete,
 }
 
-/// Generic key-value database.
-///
-/// This makes a distinction between "buffered" and "flushed" values. Values which have been
-/// written can always be read, but may be present in an in-memory buffer. Values which have
-/// been flushed have been moved to backing storage, like a RocksDB instance. There are certain
-/// operations which are only guaranteed to operate on flushed data and not buffered,
-/// although implementations may differ in this regard.
-///
-/// The contents of an interior buffer may be explicitly flushed using the `flush` method.
-///
-/// The `KeyValueDB` also deals in "column families", which can be thought of as distinct
-/// stores within a database. Keys written in one column family will not be accessible from
-/// any other. The number of column families must be specified at initialization, with a
-/// differing interface for each database. The `None` argument in place of a column index
-/// is always supported.
-///
-/// The API laid out here, along with the `Sync` bound implies interior synchronization for
-/// implementation.
-pub trait KeyValueDB: Sync + Send {
-	/// Helper to create a new transaction.
-	fn transaction(&self) -> DBTransaction { DBTransaction::new() }
-
-	/// Get a value by key.
-	fn get(&self, col: Option<u32>, key: &[u8]) -> Result<Option<DBValue>, String>;
-
-	/// Get a value by partial key. Only works for flushed data.
-	fn get_by_prefix(&self, col: Option<u32>, prefix: &[u8]) -> Option<Box<[u8]>>;
-
-	/// Write a transaction of changes to the buffer.
-	fn write_buffered(&self, transaction: DBTransaction);
-
-	/// Write a transaction of changes to the backing store.
-	fn write(&self, transaction: DBTransaction) -> Result<(), String> {
-		self.write_buffered(transaction);
-		self.flush()
-	}
-
-	/// Flush all buffered data.
-	fn flush(&self) -> Result<(), String>;
-
-	/// Iterate over flushed data for a given column.
-	fn iter<'a>(&'a self, col: Option<u32>) -> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a>;
-
-	/// Iterate over flushed data for a given column, starting from a given prefix.
-	fn iter_from_prefix<'a>(&'a self, col: Option<u32>, prefix: &'a [u8])
-		-> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a>;
-
-	/// Attempt to replace this database with a new one located at the given path.
-	fn restore(&self, new_db: &str) -> Result<(), UtilError>;
-}
-
-/// A key-value database fulfilling the `KeyValueDB` trait, living in memory.
-/// This is generally intended for tests and is not particularly optimized.
-pub struct InMemory {
-	columns: RwLock<HashMap<Option<u32>, BTreeMap<Vec<u8>, DBValue>>>,
-}
-
-/// Create an in-memory database with the given number of columns.
-/// Columns will be indexable by 0..`num_cols`
-pub fn in_memory(num_cols: u32) -> InMemory {
-	let mut cols = HashMap::new();
-	cols.insert(None, BTreeMap::new());
-
-	for idx in 0..num_cols {
-		cols.insert(Some(idx), BTreeMap::new());
-	}
-
-	InMemory {
-		columns: RwLock::new(cols)
-	}
-}
-
-impl KeyValueDB for InMemory {
-	fn get(&self, col: Option<u32>, key: &[u8]) -> Result<Option<DBValue>, String> {
-		let columns = self.columns.read();
-		match columns.get(&col) {
-			None => Err(format!("No such column family: {:?}", col)),
-			Some(map) => Ok(map.get(key).cloned()),
-		}
-	}
-
-	fn get_by_prefix(&self, col: Option<u32>, prefix: &[u8]) -> Option<Box<[u8]>> {
-		let columns = self.columns.read();
-		match columns.get(&col) {
-			None => None,
-			Some(map) =>
-				map.iter()
-					.find(|&(ref k ,_)| k.starts_with(prefix))
-					.map(|(_, v)| v.to_vec().into_boxed_slice())
-		}
-	}
-
-	fn write_buffered(&self, transaction: DBTransaction) {
-		let mut columns = self.columns.write();
-		let ops = transaction.ops;
-		for op in ops {
-			match op {
-				DBOp::Insert { col, key, value } => {
-					if let Some(mut col) = columns.get_mut(&col) {
-						col.insert(key.into_vec(), value);
-					}
-				},
-				DBOp::InsertCompressed { col, key, value } => {
-					if let Some(mut col) = columns.get_mut(&col) {
-						let compressed = UntrustedRlp::new(&value).compress(RlpType::Blocks);
-						let mut value = DBValue::new();
-						value.append_slice(&compressed);
-						col.insert(key.into_vec(), value);
-					}
-				},
-				DBOp::Delete { col, key } => {
-					if let Some(mut col) = columns.get_mut(&col) {
-						col.remove(&*key);
-					}
-				},
-			}
-		}
-	}
-
-	fn flush(&self) -> Result<(), String> { Ok(()) }
-	fn iter<'a>(&'a self, col: Option<u32>) -> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a> {
-		match self.columns.read().get(&col) {
-			Some(map) => Box::new( // TODO: worth optimizing at all?
-				map.clone()
-					.into_iter()
-					.map(|(k, v)| (k.into_boxed_slice(), v.into_vec().into_boxed_slice()))
-			),
-			None => Box::new(None.into_iter()),
-		}
-	}
-
-	fn iter_from_prefix<'a>(&'a self, col: Option<u32>, prefix: &'a [u8])
-		-> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a>
-	{
-		match self.columns.read().get(&col) {
-			Some(map) => Box::new(
-				map.clone()
-					.into_iter()
-					.skip_while(move |&(ref k, _)| !k.starts_with(prefix))
-					.map(|(k, v)| (k.into_boxed_slice(), v.into_vec().into_boxed_slice()))
-			),
-			None => Box::new(None.into_iter()),
-		}
-	}
-
-	fn restore(&self, _new_db: &str) -> Result<(), UtilError> {
-		Err(UtilError::SimpleString("Attempted to restore in-memory database".into()))
-	}
-}
-
 /// Compaction profile for the database settings
 #[derive(Clone, Copy, PartialEq, Debug)]
 pub struct CompactionProfile {
 	/// L0-L1 target file size
 	pub initial_file_size: u64,
-	/// L2-LN target file size multiplier
-	pub file_size_multiplier: i32,
+	/// block size
+	pub block_size: usize,
 	/// rate limiter for background flushes and compactions, bytes/sec, if any
 	pub write_rate_limit: Option<u64>,
 }
@@ -359,8 +133,8 @@ impl CompactionProfile {
 	/// Default profile suitable for SSD storage
 	pub fn ssd() -> CompactionProfile {
 		CompactionProfile {
-			initial_file_size: 32 * 1024 * 1024,
-			file_size_multiplier: 2,
+			initial_file_size: 64 * 1024 * 1024,
+			block_size: 16 * 1024,
 			write_rate_limit: None,
 		}
 	}
@@ -368,9 +142,9 @@ impl CompactionProfile {
 	/// Slow HDD compaction profile
 	pub fn hdd() -> CompactionProfile {
 		CompactionProfile {
-			initial_file_size: 192 * 1024 * 1024,
-			file_size_multiplier: 1,
-			write_rate_limit: Some(8 * 1024 * 1024),
+			initial_file_size: 256 * 1024 * 1024,
+			block_size: 64 * 1024,
+			write_rate_limit: Some(16 * 1024 * 1024),
 		}
 	}
 }
@@ -380,8 +154,8 @@ impl CompactionProfile {
 pub struct DatabaseConfig {
 	/// Max number of open files.
 	pub max_open_files: i32,
-	/// Cache sizes (in MiB) for specific columns.
-	pub cache_sizes: HashMap<Option<u32>, usize>,
+	/// Memory budget (in MiB) used for setting block cache size, write buffer size.
+	pub memory_budget: Option<usize>,
 	/// Compaction profile
 	pub compaction: CompactionProfile,
 	/// Set number of columns
@@ -399,17 +173,20 @@ impl DatabaseConfig {
 		config
 	}
 
-	/// Set the column cache size in MiB.
-	pub fn set_cache(&mut self, col: Option<u32>, size: usize) {
-		self.cache_sizes.insert(col, size);
+	pub fn memory_budget(&self) -> usize {
+		self.memory_budget.unwrap_or(DB_DEFAULT_MEMORY_BUDGET_MB) * 1024 * 1024
+	}
+
+	pub fn memory_budget_per_col(&self) -> usize {
+		self.memory_budget() / self.columns.unwrap_or(1) as usize
 	}
 }
 
 impl Default for DatabaseConfig {
 	fn default() -> DatabaseConfig {
 		DatabaseConfig {
-			cache_sizes: HashMap::new(),
 			max_open_files: 512,
+			memory_budget: None,
 			compaction: CompactionProfile::default(),
 			columns: None,
 			wal: true,
@@ -422,14 +199,14 @@ impl Default for DatabaseConfig {
 // inner DB (to prevent closing via restoration) may be re-evaluated in the future.
 //
 pub struct DatabaseIterator<'a> {
-	iter: DBIterator,
+	iter: InterleaveOrdered<::std::vec::IntoIter<(Box<[u8]>, Box<[u8]>)>, DBIterator>,
 	_marker: PhantomData<&'a Database>,
 }
 
 impl<'a> Iterator for DatabaseIterator<'a> {
 	type Item = (Box<[u8]>, Box<[u8]>);
 
-    fn next(&mut self) -> Option<Self::Item> {
+	fn next(&mut self) -> Option<Self::Item> {
 		self.iter.next()
 	}
 }
@@ -440,27 +217,24 @@ struct DBAndColumns {
 }
 
 // get column family configuration from database config.
-fn col_config(col: u32, config: &DatabaseConfig) -> Options {
-	// default cache size for columns not specified.
-	const DEFAULT_CACHE: usize = 2;
-
+fn col_config(config: &DatabaseConfig, block_opts: &BlockBasedOptions) -> Result<Options> {
 	let mut opts = Options::new();
-	opts.set_compaction_style(DBCompactionStyle::DBUniversalCompaction);
-	opts.set_target_file_size_base(config.compaction.initial_file_size);
-	opts.set_target_file_size_multiplier(config.compaction.file_size_multiplier);
-	opts.set_db_write_buffer_size(DB_WRITE_BUFFER_SIZE);
 
-	let col_opt = config.columns.map(|_| col);
+	opts.set_parsed_options("level_compaction_dynamic_level_bytes=true")?;
 
-	{
-		let cache_size = config.cache_sizes.get(&col_opt).cloned().unwrap_or(DEFAULT_CACHE);
-		let mut block_opts = BlockBasedOptions::new();
-		// all goes to read cache.
-		block_opts.set_cache(Cache::new(cache_size * 1024 * 1024));
-		opts.set_block_based_table_factory(&block_opts);
-	}
+	opts.set_block_based_table_factory(block_opts);
+
+	opts.set_parsed_options(
+		&format!("block_based_table_factory={{{};{}}}",
+				 "cache_index_and_filter_blocks=true",
+				 "pin_l0_filter_and_index_blocks_in_cache=true"))?;
+
+	opts.optimize_level_style_compaction(config.memory_budget_per_col() as i32);
+	opts.set_target_file_size_base(config.compaction.initial_file_size);
 
-	opts
+	opts.set_parsed_options("compression_per_level=")?;
+
+	Ok(opts)
 }
 
 /// Key-Value database.
@@ -469,6 +243,7 @@ pub struct Database {
 	config: DatabaseConfig,
 	write_opts: WriteOptions,
 	read_opts: ReadOptions,
+	block_opts: BlockBasedOptions,
 	path: String,
 	// Dirty values added with `write_buffered`. Cleaned on `flush`.
 	overlay: RwLock<Vec<HashMap<ElasticArray32<u8>, KeyState>>>,
@@ -479,40 +254,70 @@ pub struct Database {
 	flushing_lock: Mutex<bool>,
 }
 
+#[inline]
+fn check_for_corruption<T, P: AsRef<Path>>(path: P, res: result::Result<T, String>) -> result::Result<T, String> {
+	if let Err(ref s) = res {
+		if s.starts_with("Corruption:") {
+			warn!("DB corrupted: {}. Repair will be triggered on next restart", s);
+			let _ = fs::File::create(path.as_ref().join(Database::CORRUPTION_FILE_NAME));
+		}
+	}
+
+	res
+}
+
+fn is_corrupted(s: &str) -> bool {
+	s.starts_with("Corruption:") || s.starts_with("Invalid argument: You have to open all column families")
+}
+
 impl Database {
+	const CORRUPTION_FILE_NAME: &'static str = "CORRUPTED";
+
 	/// Open database with default settings.
-	pub fn open_default(path: &str) -> Result<Database, String> {
+	pub fn open_default(path: &str) -> Result<Database> {
 		Database::open(&DatabaseConfig::default(), path)
 	}
 
 	/// Open database file. Creates if it does not exist.
-	pub fn open(config: &DatabaseConfig, path: &str) -> Result<Database, String> {
+	pub fn open(config: &DatabaseConfig, path: &str) -> Result<Database> {
 		let mut opts = Options::new();
+
 		if let Some(rate_limit) = config.compaction.write_rate_limit {
 			opts.set_parsed_options(&format!("rate_limiter_bytes_per_sec={}", rate_limit))?;
 		}
-		opts.set_parsed_options(&format!("max_total_wal_size={}", 64 * 1024 * 1024))?;
-		opts.set_parsed_options("verify_checksums_in_compaction=0")?;
-		opts.set_parsed_options("keep_log_file_num=1")?;
-		opts.set_max_open_files(config.max_open_files);
-		opts.create_if_missing(true);
 		opts.set_use_fsync(false);
-		opts.set_db_write_buffer_size(DB_WRITE_BUFFER_SIZE);
+		opts.create_if_missing(true);
+		opts.set_max_open_files(config.max_open_files);
+		opts.set_parsed_options("keep_log_file_num=1")?;
+		opts.set_parsed_options("bytes_per_sync=1048576")?;
+		opts.set_db_write_buffer_size(config.memory_budget_per_col() / 2);
+		opts.increase_parallelism(cmp::max(1, ::num_cpus::get() as i32 / 2));
+
+		let mut block_opts = BlockBasedOptions::new();
 
-		opts.set_max_background_flushes(DB_BACKGROUND_FLUSHES);
-		opts.set_max_background_compactions(DB_BACKGROUND_COMPACTIONS);
+		{
+			block_opts.set_block_size(config.compaction.block_size);
+			let cache_size = cmp::max(8, config.memory_budget() / 3);
+			let cache = Cache::new(cache_size);
+			block_opts.set_cache(cache);
+		}
+
+		// attempt database repair if it has been previously marked as corrupted
+		let db_corrupted = Path::new(path).join(Database::CORRUPTION_FILE_NAME);
+		if db_corrupted.exists() {
+			warn!("DB has been previously marked as corrupted, attempting repair");
+			DB::repair(&opts, path)?;
+			fs::remove_file(db_corrupted)?;
+		}
 
-		// compaction settings
-		opts.set_compaction_style(DBCompactionStyle::DBUniversalCompaction);
-		opts.set_target_file_size_base(config.compaction.initial_file_size);
-		opts.set_target_file_size_multiplier(config.compaction.file_size_multiplier);
+		let columns = config.columns.unwrap_or(0) as usize;
 
-		let mut cf_options = Vec::with_capacity(config.columns.unwrap_or(0) as usize);
-		let cfnames: Vec<_> = (0..config.columns.unwrap_or(0)).map(|c| format!("col{}", c)).collect();
+		let mut cf_options = Vec::with_capacity(columns);
+		let cfnames: Vec<_> = (0..columns).map(|c| format!("col{}", c)).collect();
 		let cfnames: Vec<&str> = cfnames.iter().map(|n| n as &str).collect();
 
-		for col in 0 .. config.columns.unwrap_or(0) {
-			cf_options.push(col_config(col, &config));
+		for _ in 0 .. config.columns.unwrap_or(0) {
+			cf_options.push(col_config(&config, &block_opts)?);
 		}
 
 		let mut write_opts = WriteOptions::new();
@@ -524,22 +329,21 @@ impl Database {
 
 		let mut cfs: Vec<Column> = Vec::new();
 		let db = match config.columns {
-			Some(columns) => {
+			Some(_) => {
 				match DB::open_cf(&opts, path, &cfnames, &cf_options) {
 					Ok(db) => {
 						cfs = cfnames.iter().map(|n| db.cf_handle(n)
 							.expect("rocksdb opens a cf_handle for each cfname; qed")).collect();
-						assert!(cfs.len() == columns as usize);
 						Ok(db)
 					}
 					Err(_) => {
 						// retry and create CFs
 						match DB::open_cf(&opts, path, &[], &[]) {
 							Ok(mut db) => {
-								cfs = cfnames.iter().enumerate().map(|(i, n)| db.create_cf(n, &cf_options[i])).collect::<Result<_, _>>()?;
+								cfs = cfnames.iter().enumerate().map(|(i, n)| db.create_cf(n, &cf_options[i])).collect::<::std::result::Result<_, _>>()?;
 								Ok(db)
 							},
-							err @ Err(_) => err,
+							err => err,
 						}
 					}
 				}
@@ -549,17 +353,21 @@ impl Database {
 
 		let db = match db {
 			Ok(db) => db,
-			Err(ref s) if s.starts_with("Corruption:") => {
-				info!("{}", s);
-				info!("Attempting DB repair for {}", path);
+			Err(ref s) if is_corrupted(s) => {
+				warn!("DB corrupted: {}, attempting repair", s);
 				DB::repair(&opts, path)?;
 
 				match cfnames.is_empty() {
 					true => DB::open(&opts, path)?,
-					false => DB::open_cf(&opts, path, &cfnames, &cf_options)?
+					false => {
+						let db = DB::open_cf(&opts, path, &cfnames, &cf_options)?;
+						cfs = cfnames.iter().map(|n| db.cf_handle(n)
+							.expect("rocksdb opens a cf_handle for each cfname; qed")).collect();
+						db
+					},
 				}
 			},
-			Err(s) => { return Err(s); }
+			Err(s) => { return Err(s.into()); }
 		};
 		let num_cols = cfs.len();
 		Ok(Database {
@@ -568,9 +376,10 @@ impl Database {
 			write_opts: write_opts,
 			overlay: RwLock::new((0..(num_cols + 1)).map(|_| HashMap::new()).collect()),
 			flushing: RwLock::new((0..(num_cols + 1)).map(|_| HashMap::new()).collect()),
-			flushing_lock: Mutex::new((false)),
+			flushing_lock: Mutex::new(false),
 			path: path.to_owned(),
 			read_opts: read_opts,
+			block_opts: block_opts,
 		})
 	}
 
@@ -594,10 +403,6 @@ impl Database {
 					let c = Self::to_overlay_column(col);
 					overlay[c].insert(key, KeyState::Insert(value));
 				},
-				DBOp::InsertCompressed { col, key, value } => {
-					let c = Self::to_overlay_column(col);
-					overlay[c].insert(key, KeyState::InsertCompressed(value));
-				},
 				DBOp::Delete { col, key } => {
 					let c = Self::to_overlay_column(col);
 					overlay[c].insert(key, KeyState::Delete);
@@ -607,7 +412,7 @@ impl Database {
 	}
 
 	/// Commit buffered changes to database. Must be called under `flush_lock`
-	fn write_flushing_with_lock(&self, _lock: &mut MutexGuard<bool>) -> Result<(), String> {
+	fn write_flushing_with_lock(&self, _lock: &mut MutexGuard<bool>) -> Result<()> {
 		match *self.db.read() {
 			Some(DBAndColumns { ref db, ref cfs }) => {
 				let batch = WriteBatch::new();
@@ -630,37 +435,33 @@ impl Database {
 										batch.put(&key, &value)?;
 									}
 								},
-								KeyState::InsertCompressed(ref value) => {
-									let compressed = UntrustedRlp::new(&value).compress(RlpType::Blocks);
-									if c > 0 {
-										batch.put_cf(cfs[c - 1], &key, &compressed)?;
-									} else {
-										batch.put(&key, &value)?;
-									}
-								}
 							}
 						}
 					}
 				}
-				db.write_opt(batch, &self.write_opts)?;
+
+				check_for_corruption(
+					&self.path,
+					db.write_opt(batch, &self.write_opts))?;
+
 				for column in self.flushing.write().iter_mut() {
 					column.clear();
 					column.shrink_to_fit();
 				}
 				Ok(())
 			},
-			None => Err("Database is closed".to_owned())
+			None => Err("Database is closed".into())
 		}
 	}
 
 	/// Commit buffered changes to database.
-	pub fn flush(&self) -> Result<(), String> {
+	pub fn flush(&self) -> Result<()> {
 		let mut lock = self.flushing_lock.lock();
 		// If RocksDB batch allocation fails the thread gets terminated and the lock is released.
 		// The value inside the lock is used to detect that.
 		if *lock {
 			// This can only happen if another flushing thread is terminated unexpectedly.
-			return Err("Database write failure. Running low on memory perhaps?".to_owned());
+			return Err("Database write failure. Running low on memory perhaps?".into());
 		}
 		*lock = true;
 		let result = self.write_flushing_with_lock(&mut lock);
@@ -669,48 +470,51 @@ impl Database {
 	}
 
 	/// Commit transaction to database.
-	pub fn write(&self, tr: DBTransaction) -> Result<(), String> {
+	pub fn write(&self, tr: DBTransaction) -> Result<()> {
 		match *self.db.read() {
 			Some(DBAndColumns { ref db, ref cfs }) => {
 				let batch = WriteBatch::new();
 				let ops = tr.ops;
 				for op in ops {
+					// remove any buffered operation for this key
+					self.overlay.write()[Self::to_overlay_column(op.col())].remove(op.key());
+
 					match op {
 						DBOp::Insert { col, key, value } => {
 							col.map_or_else(|| batch.put(&key, &value), |c| batch.put_cf(cfs[c as usize], &key, &value))?
 						},
-						DBOp::InsertCompressed { col, key, value } => {
-							let compressed = UntrustedRlp::new(&value).compress(RlpType::Blocks);
-							col.map_or_else(|| batch.put(&key, &compressed), |c| batch.put_cf(cfs[c as usize], &key, &compressed))?
-						},
 						DBOp::Delete { col, key } => {
 							col.map_or_else(|| batch.delete(&key), |c| batch.delete_cf(cfs[c as usize], &key))?
 						},
 					}
 				}
-				db.write_opt(batch, &self.write_opts)
+
+				check_for_corruption(
+					&self.path,
+					db.write_opt(batch, &self.write_opts)).map_err(Into::into)
 			},
-			None => Err("Database is closed".to_owned())
+			None => Err("Database is closed".into())
 		}
 	}
 
 	/// Get value by key.
-	pub fn get(&self, col: Option<u32>, key: &[u8]) -> Result<Option<DBValue>, String> {
+	pub fn get(&self, col: Option<u32>, key: &[u8]) -> Result<Option<DBValue>> {
 		match *self.db.read() {
 			Some(DBAndColumns { ref db, ref cfs }) => {
 				let overlay = &self.overlay.read()[Self::to_overlay_column(col)];
 				match overlay.get(key) {
-					Some(&KeyState::Insert(ref value)) | Some(&KeyState::InsertCompressed(ref value)) => Ok(Some(value.clone())),
+					Some(&KeyState::Insert(ref value)) => Ok(Some(value.clone())),
 					Some(&KeyState::Delete) => Ok(None),
 					None => {
 						let flushing = &self.flushing.read()[Self::to_overlay_column(col)];
 						match flushing.get(key) {
-							Some(&KeyState::Insert(ref value)) | Some(&KeyState::InsertCompressed(ref value)) => Ok(Some(value.clone())),
+							Some(&KeyState::Insert(ref value)) => Ok(Some(value.clone())),
 							Some(&KeyState::Delete) => Ok(None),
 							None => {
 								col.map_or_else(
 									|| db.get_opt(key, &self.read_opts).map(|r| r.map(|v| DBValue::from_slice(&v))),
 									|c| db.get_cf_opt(cfs[c as usize], key, &self.read_opts).map(|r| r.map(|v| DBValue::from_slice(&v))))
+									.map_err(Into::into)
 							},
 						}
 					},
@@ -734,9 +538,17 @@ impl Database {
 
 	/// Get database iterator for flushed data.
 	pub fn iter(&self, col: Option<u32>) -> Option<DatabaseIterator> {
-		//TODO: iterate over overlay
 		match *self.db.read() {
 			Some(DBAndColumns { ref db, ref cfs }) => {
+				let overlay = &self.overlay.read()[Self::to_overlay_column(col)];
+				let mut overlay_data = overlay.iter()
+					.filter_map(|(k, v)| match *v {
+						KeyState::Insert(ref value) =>
+							Some((k.clone().into_vec().into_boxed_slice(), value.clone().into_vec().into_boxed_slice())),
+						KeyState::Delete => None,
+					}).collect::<Vec<_>>();
+				overlay_data.sort();
+
 				let iter = col.map_or_else(
 					|| db.iterator_opt(IteratorMode::Start, &self.read_opts),
 					|c| db.iterator_cf_opt(cfs[c as usize], IteratorMode::Start, &self.read_opts)
@@ -744,7 +556,7 @@ impl Database {
 				);
 
 				Some(DatabaseIterator {
-					iter: iter,
+					iter: interleave_ordered(overlay_data, iter),
 					_marker: PhantomData,
 				})
 			},
@@ -760,7 +572,7 @@ impl Database {
 						.expect("iterator params are valid; qed"));
 
 				Some(DatabaseIterator {
-					iter: iter,
+					iter: interleave_ordered(Vec::new(), iter),
 					_marker: PhantomData,
 				})
 			},
@@ -776,7 +588,7 @@ impl Database {
 	}
 
 	/// Restore the database from a copy at given path.
-	pub fn restore(&self, new_db: &str) -> Result<(), UtilError> {
+	pub fn restore(&self, new_db: &str) -> Result<()> {
 		self.close();
 
 		let mut backup_db = PathBuf::from(&self.path);
@@ -785,7 +597,7 @@ impl Database {
 
 		let existed = match fs::rename(&self.path, &backup_db) {
 			Ok(_) => true,
-			Err(e) => if let ErrorKind::NotFound = e.kind() {
+			Err(e) => if let io::ErrorKind::NotFound = e.kind() {
 				false
 			} else {
 				return Err(e.into());
@@ -825,7 +637,7 @@ impl Database {
 	}
 
 	/// Drop a column family.
-	pub fn drop_column(&self) -> Result<(), String> {
+	pub fn drop_column(&self) -> Result<()> {
 		match *self.db.write() {
 			Some(DBAndColumns { ref mut db, ref mut cfs }) => {
 				if let Some(col) = cfs.pop() {
@@ -840,12 +652,12 @@ impl Database {
 	}
 
 	/// Add a column family.
-	pub fn add_column(&self) -> Result<(), String> {
+	pub fn add_column(&self) -> Result<()> {
 		match *self.db.write() {
 			Some(DBAndColumns { ref mut db, ref mut cfs }) => {
 				let col = cfs.len() as u32;
 				let name = format!("col{}", col);
-				cfs.push(db.create_cf(&name, &col_config(col, &self.config))?);
+				cfs.push(db.create_cf(&name, &col_config(&self.config, &self.block_opts)?)?);
 				Ok(())
 			},
 			None => Ok(()),
@@ -856,7 +668,7 @@ impl Database {
 // duplicate declaration of methods here to avoid trait import in certain existing cases
 // at time of addition.
 impl KeyValueDB for Database {
-	fn get(&self, col: Option<u32>, key: &[u8]) -> Result<Option<DBValue>, String> {
+	fn get(&self, col: Option<u32>, key: &[u8]) -> Result<Option<DBValue>> {
 		Database::get(self, col, key)
 	}
 
@@ -868,11 +680,11 @@ impl KeyValueDB for Database {
 		Database::write_buffered(self, transaction)
 	}
 
-	fn write(&self, transaction: DBTransaction) -> Result<(), String> {
+	fn write(&self, transaction: DBTransaction) -> Result<()> {
 		Database::write(self, transaction)
 	}
 
-	fn flush(&self) -> Result<(), String> {
+	fn flush(&self) -> Result<()> {
 		Database::flush(self)
 	}
 
@@ -888,7 +700,7 @@ impl KeyValueDB for Database {
 		Box::new(unboxed.into_iter().flat_map(|inner| inner))
 	}
 
-	fn restore(&self, new_db: &str) -> Result<(), UtilError> {
+	fn restore(&self, new_db: &str) -> Result<()> {
 		Database::restore(self, new_db)
 	}
 }
@@ -902,14 +714,16 @@ impl Drop for Database {
 
 #[cfg(test)]
 mod tests {
-	use hash::H256;
-	use super::*;
-	use devtools::*;
+	extern crate tempdir;
+
 	use std::str::FromStr;
+	use self::tempdir::TempDir;
+	use ethereum_types::H256;
+	use super::*;
 
 	fn test_db(config: &DatabaseConfig) {
-		let path = RandomTempPath::create_dir();
-		let db = Database::open(config, path.as_path().to_str().unwrap()).unwrap();
+		let tempdir = TempDir::new("").unwrap();
+		let db = Database::open(config, tempdir.path().to_str().unwrap()).unwrap();
 		let key1 = H256::from_str("02c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc").unwrap();
 		let key2 = H256::from_str("03c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc").unwrap();
 		let key3 = H256::from_str("01c69be41d0b7e40352fc85be1cd65eb03d40ef8427a0ca4596b1ead9a00e9fc").unwrap();
@@ -962,8 +776,8 @@ mod tests {
 
 	#[test]
 	fn kvdb() {
-		let path = RandomTempPath::create_dir();
-		let _ = Database::open_default(path.as_path().to_str().unwrap()).unwrap();
+		let tempdir = TempDir::new("").unwrap();
+		let _ = Database::open_default(tempdir.path().to_str().unwrap()).unwrap();
 		test_db(&DatabaseConfig::default());
 	}
 
@@ -982,11 +796,11 @@ mod tests {
 		let config = DatabaseConfig::default();
 		let config_5 = DatabaseConfig::with_columns(Some(5));
 
-		let path = RandomTempPath::create_dir();
+		let tempdir = TempDir::new("").unwrap();
 
 		// open empty, add 5.
 		{
-			let db = Database::open(&config, path.as_path().to_str().unwrap()).unwrap();
+			let db = Database::open(&config, tempdir.path().to_str().unwrap()).unwrap();
 			assert_eq!(db.num_columns(), 0);
 
 			for i in 0..5 {
@@ -997,7 +811,7 @@ mod tests {
 
 		// reopen as 5.
 		{
-			let db = Database::open(&config_5, path.as_path().to_str().unwrap()).unwrap();
+			let db = Database::open(&config_5, tempdir.path().to_str().unwrap()).unwrap();
 			assert_eq!(db.num_columns(), 5);
 		}
 	}
@@ -1007,11 +821,11 @@ mod tests {
 		let config = DatabaseConfig::default();
 		let config_5 = DatabaseConfig::with_columns(Some(5));
 
-		let path = RandomTempPath::create_dir();
+		let tempdir = TempDir::new("").unwrap();
 
 		// open 5, remove all.
 		{
-			let db = Database::open(&config_5, path.as_path().to_str().unwrap()).unwrap();
+			let db = Database::open(&config_5, tempdir.path().to_str().unwrap()).unwrap();
 			assert_eq!(db.num_columns(), 5);
 
 			for i in (0..5).rev() {
@@ -1022,8 +836,25 @@ mod tests {
 
 		// reopen as 0.
 		{
-			let db = Database::open(&config, path.as_path().to_str().unwrap()).unwrap();
+			let db = Database::open(&config, tempdir.path().to_str().unwrap()).unwrap();
 			assert_eq!(db.num_columns(), 0);
 		}
 	}
+
+	#[test]
+	fn write_clears_buffered_ops() {
+		let tempdir = TempDir::new("").unwrap();
+		let config = DatabaseConfig::default();
+		let db = Database::open(&config, tempdir.path().to_str().unwrap()).unwrap();
+
+		let mut batch = db.transaction();
+		batch.put(None, b"foo", b"bar");
+		db.write_buffered(batch);
+
+		let mut batch = db.transaction();
+		batch.put(None, b"foo", b"baz");
+		db.write(batch).unwrap();
+
+		assert_eq!(db.get(None, b"foo").unwrap().unwrap().as_ref(), b"baz");
+	}
 }
diff --git a/util/kvdb/Cargo.toml b/util/kvdb/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..820f6e35fb4037f557512e5e23d6bf1a801a4a85
--- /dev/null
+++ b/util/kvdb/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "kvdb"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+elastic-array = "0.10"
+error-chain = { version = "0.11", default-features = false }
+ethcore-bytes = { path = "../bytes" }
diff --git a/util/kvdb/src/lib.rs b/util/kvdb/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..6a8412c0e8c32fd7a2f12e3d0d9eae782683d9bc
--- /dev/null
+++ b/util/kvdb/src/lib.rs
@@ -0,0 +1,178 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Key-Value store abstraction with `RocksDB` backend.
+
+#[macro_use]
+extern crate error_chain;
+extern crate elastic_array;
+extern crate ethcore_bytes as bytes;
+
+use std::io;
+use elastic_array::{ElasticArray128, ElasticArray32};
+use bytes::Bytes;
+
+/// Required length of prefixes.
+pub const PREFIX_LEN: usize = 12;
+
+/// Database value.
+pub type DBValue = ElasticArray128<u8>;
+
+error_chain! {
+	types {
+		Error, ErrorKind, ResultExt, Result;
+	}
+
+	foreign_links {
+		Io(io::Error);
+	}
+}
+
+/// Write transaction. Batches a sequence of put/delete operations for efficiency.
+#[derive(Default, Clone, PartialEq)]
+pub struct DBTransaction {
+	/// Database operations.
+	pub ops: Vec<DBOp>,
+}
+
+/// Database operation.
+#[derive(Clone, PartialEq)]
+pub enum DBOp {
+	Insert {
+		col: Option<u32>,
+		key: ElasticArray32<u8>,
+		value: DBValue,
+	},
+	Delete {
+		col: Option<u32>,
+		key: ElasticArray32<u8>,
+	}
+}
+
+impl DBOp {
+	/// Returns the key associated with this operation.
+	pub fn key(&self) -> &[u8] {
+		match *self {
+			DBOp::Insert { ref key, .. } => key,
+			DBOp::Delete { ref key, .. } => key,
+		}
+	}
+
+	/// Returns the column associated with this operation.
+	pub fn col(&self) -> Option<u32> {
+		match *self {
+			DBOp::Insert { col, .. } => col,
+			DBOp::Delete { col, .. } => col,
+		}
+	}
+}
+
+impl DBTransaction {
+	/// Create new transaction.
+	pub fn new() -> DBTransaction {
+		DBTransaction::with_capacity(256)
+	}
+
+	/// Create new transaction with capacity.
+	pub fn with_capacity(cap: usize) -> DBTransaction {
+		DBTransaction {
+			ops: Vec::with_capacity(cap)
+		}
+	}
+
+	/// Insert a key-value pair in the transaction. Any existing value will be overwritten upon write.
+	pub fn put(&mut self, col: Option<u32>, key: &[u8], value: &[u8]) {
+		let mut ekey = ElasticArray32::new();
+		ekey.append_slice(key);
+		self.ops.push(DBOp::Insert {
+			col: col,
+			key: ekey,
+			value: DBValue::from_slice(value),
+		});
+	}
+
+	/// Insert a key-value pair in the transaction. Any existing value will be overwritten upon write.
+	pub fn put_vec(&mut self, col: Option<u32>, key: &[u8], value: Bytes) {
+		let mut ekey = ElasticArray32::new();
+		ekey.append_slice(key);
+		self.ops.push(DBOp::Insert {
+			col: col,
+			key: ekey,
+			value: DBValue::from_vec(value),
+		});
+	}
+
+	/// Delete value by key.
+	pub fn delete(&mut self, col: Option<u32>, key: &[u8]) {
+		let mut ekey = ElasticArray32::new();
+		ekey.append_slice(key);
+		self.ops.push(DBOp::Delete {
+			col: col,
+			key: ekey,
+		});
+	}
+}
+
+/// Generic key-value database.
+///
+/// This makes a distinction between "buffered" and "flushed" values. Values which have been
+/// written can always be read, but may be present in an in-memory buffer. Values which have
+/// been flushed have been moved to backing storage, like a RocksDB instance. There are certain
+/// operations which are only guaranteed to operate on flushed data and not buffered,
+/// although implementations may differ in this regard.
+///
+/// The contents of an interior buffer may be explicitly flushed using the `flush` method.
+///
+/// The `KeyValueDB` also deals in "column families", which can be thought of as distinct
+/// stores within a database. Keys written in one column family will not be accessible from
+/// any other. The number of column families must be specified at initialization, with a
+/// differing interface for each database. The `None` argument in place of a column index
+/// is always supported.
+///
+/// The API laid out here, along with the `Sync` bound implies interior synchronization for
+/// implementation.
+pub trait KeyValueDB: Sync + Send {
+	/// Helper to create a new transaction.
+	fn transaction(&self) -> DBTransaction { DBTransaction::new() }
+
+	/// Get a value by key.
+	fn get(&self, col: Option<u32>, key: &[u8]) -> Result<Option<DBValue>>;
+
+	/// Get a value by partial key. Only works for flushed data.
+	fn get_by_prefix(&self, col: Option<u32>, prefix: &[u8]) -> Option<Box<[u8]>>;
+
+	/// Write a transaction of changes to the buffer.
+	fn write_buffered(&self, transaction: DBTransaction);
+
+	/// Write a transaction of changes to the backing store.
+	fn write(&self, transaction: DBTransaction) -> Result<()> {
+		self.write_buffered(transaction);
+		self.flush()
+	}
+
+	/// Flush all buffered data.
+	fn flush(&self) -> Result<()>;
+
+	/// Iterate over flushed data for a given column.
+	fn iter<'a>(&'a self, col: Option<u32>) -> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a>;
+
+	/// Iterate over flushed data for a given column, starting from a given prefix.
+	fn iter_from_prefix<'a>(&'a self, col: Option<u32>, prefix: &'a [u8])
+		-> Box<Iterator<Item=(Box<[u8]>, Box<[u8]>)> + 'a>;
+
+	/// Attempt to replace this database with a new one located at the given path.
+	fn restore(&self, new_db: &str) -> Result<()>;
+}
diff --git a/util/macros/Cargo.toml b/util/macros/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..01d85935c54b35c9998b0c5089872538d116796f
--- /dev/null
+++ b/util/macros/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "macros"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
diff --git a/util/src/common.rs b/util/macros/src/lib.rs
similarity index 93%
rename from util/src/common.rs
rename to util/macros/src/lib.rs
index 4bf3a06ed0c948356143050ced5858fed3db2106..78bcd0397efb33b959c94808568b7171e2af3777 100644
--- a/util/src/common.rs
+++ b/util/macros/src/lib.rs
@@ -82,8 +82,8 @@ macro_rules! map_into {
 
 #[macro_export]
 macro_rules! flush {
-	($arg:expr) => ($crate::common::flush($arg.into()));
-	($($arg:tt)*) => ($crate::common::flush(format!("{}", format_args!($($arg)*))));
+	($arg:expr) => ($crate::flush($arg.into()));
+	($($arg:tt)*) => ($crate::flush(format!("{}", format_args!($($arg)*))));
 }
 
 #[macro_export]
diff --git a/util/memory_cache/Cargo.toml b/util/memory_cache/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..f2b612463acd185952e254218e9e0edd75c7c8c3
--- /dev/null
+++ b/util/memory_cache/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "memory-cache"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "An LRU-cache which operates on memory used"
+license = "GPL3"
+
+[dependencies]
+heapsize = "0.4"
+lru-cache = "0.1"
diff --git a/util/src/cache.rs b/util/memory_cache/src/lib.rs
similarity index 98%
rename from util/src/cache.rs
rename to util/memory_cache/src/lib.rs
index e6f204192af2d278ef4723714ef4fcc8ba737771..af70b0cff30eb59abdb5dccca97caf21a7960ea8 100644
--- a/util/src/cache.rs
+++ b/util/memory_cache/src/lib.rs
@@ -18,6 +18,9 @@
 //! crate.
 // TODO: push changes upstream in a clean way.
 
+extern crate heapsize;
+extern crate lru_cache;
+
 use heapsize::HeapSizeOf;
 use lru_cache::LruCache;
 
diff --git a/util/memorydb/Cargo.toml b/util/memorydb/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..e5feabe5fb7d22fdc3b97ebc3dd5074739e87f51
--- /dev/null
+++ b/util/memorydb/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "memorydb"
+version = "0.1.1"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "in-memory implementation of hashdb"
+license = "GPL-3.0"
+
+[dependencies]
+bigint = "4.0"
+elastic-array = "0.10"
+heapsize = "0.4"
+ethereum-types = "0.2"
+keccak-hash = { version = "0.1.0", path = "../hash" }
+hashdb = { version = "0.1.1", path = "../hashdb" }
+plain_hasher = { path = "../plain_hasher" }
+rlp = { version = "0.2.1", path = "../rlp" }
diff --git a/util/src/memorydb.rs b/util/memorydb/src/lib.rs
similarity index 90%
rename from util/src/memorydb.rs
rename to util/memorydb/src/lib.rs
index 6c9cb63fef4493bd9b8eaa0227e8269d528130cc..12eb62e0574aec38f0f09b06e7bec5b20f28d599 100644
--- a/util/src/memorydb.rs
+++ b/util/memorydb/src/lib.rs
@@ -15,16 +15,23 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Reference-counted memory-based `HashDB` implementation.
+extern crate heapsize;
+extern crate ethereum_types;
+extern crate hashdb;
+extern crate keccak_hash as keccak;
+extern crate plain_hasher;
+extern crate rlp;
+extern crate elastic_array;
 
 use std::mem;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry;
 use heapsize::HeapSizeOf;
-use hash::{H256FastMap, H256};
+use ethereum_types::H256;
+use hashdb::{HashDB, DBValue};
+use keccak::{KECCAK_NULL_RLP, keccak};
+use plain_hasher::H256FastMap;
 use rlp::NULL_RLP;
-use sha3::*;
-use hashdb::*;
-
 /// Reference-counted memory-based `HashDB` implementation.
 ///
 /// Use `new()` to create a new database. Insert items with `insert()`, remove items
@@ -34,9 +41,10 @@ use hashdb::*;
 ///
 /// # Example
 /// ```rust
-/// extern crate ethcore_util;
-/// use ethcore_util::hashdb::*;
-/// use ethcore_util::memorydb::*;
+/// extern crate hashdb;
+/// extern crate memorydb;
+/// use hashdb::*;
+/// use memorydb::*;
 /// fn main() {
 ///   let mut m = MemoryDB::new();
 ///   let d = "Hello world!".as_bytes();
@@ -85,9 +93,10 @@ impl MemoryDB {
 	///
 	/// # Examples
 	/// ```rust
-	/// extern crate ethcore_util;
-	/// use ethcore_util::hashdb::*;
-	/// use ethcore_util::memorydb::*;
+	/// extern crate hashdb;
+	/// extern crate memorydb;
+	/// use hashdb::*;
+	/// use memorydb::*;
 	/// fn main() {
 	///   let mut m = MemoryDB::new();
 	///   let hello_bytes = "Hello world!".as_bytes();
@@ -117,7 +126,7 @@ impl MemoryDB {
 	/// Even when Some is returned, the data is only guaranteed to be useful
 	/// when the refs > 0.
 	pub fn raw(&self, key: &H256) -> Option<(DBValue, i32)> {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return Some((DBValue::from_slice(&NULL_RLP), 1));
 		}
 		self.data.get(key).cloned()
@@ -131,7 +140,7 @@ impl MemoryDB {
 	/// Remove an element and delete it from storage if reference count reaches zero.
 	/// If the value was purged, return the old value.
 	pub fn remove_and_purge(&mut self, key: &H256) -> Option<DBValue> {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return None;
 		}
 		match self.data.entry(key.clone()) {
@@ -170,7 +179,7 @@ impl MemoryDB {
 
 impl HashDB for MemoryDB {
 	fn get(&self, key: &H256) -> Option<DBValue> {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return Some(DBValue::from_slice(&NULL_RLP));
 		}
 
@@ -191,7 +200,7 @@ impl HashDB for MemoryDB {
 	}
 
 	fn contains(&self, key: &H256) -> bool {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return true;
 		}
 
@@ -203,9 +212,9 @@ impl HashDB for MemoryDB {
 
 	fn insert(&mut self, value: &[u8]) -> H256 {
 		if value == &NULL_RLP {
-			return SHA3_NULL_RLP.clone();
+			return KECCAK_NULL_RLP.clone();
 		}
-		let key = value.sha3();
+		let key = keccak(value);
 		match self.data.entry(key) {
 			Entry::Occupied(mut entry) => {
 				let &mut (ref mut old_value, ref mut rc) = entry.get_mut();
@@ -241,7 +250,7 @@ impl HashDB for MemoryDB {
 	}
 
 	fn remove(&mut self, key: &H256) {
-		if key == &SHA3_NULL_RLP {
+		if key == &KECCAK_NULL_RLP {
 			return;
 		}
 
@@ -259,12 +268,13 @@ impl HashDB for MemoryDB {
 
 #[cfg(test)]
 mod tests {
+	use keccak::keccak;
 	use super::*;
 
 	#[test]
 	fn memorydb_remove_and_purge() {
 		let hello_bytes = b"Hello world!";
-		let hello_key = hello_bytes.sha3();
+		let hello_key = keccak(hello_bytes);
 
 		let mut m = MemoryDB::new();
 		m.remove(&hello_key);
diff --git a/util/migration/Cargo.toml b/util/migration/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..d938822bacdff21a0b8678c45db3068aa202b3d3
--- /dev/null
+++ b/util/migration/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "migration"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+log = "0.3"
+macros = { path = "../macros" }
+kvdb = { path = "../kvdb" }
+kvdb-rocksdb = { path = "../kvdb-rocksdb" }
+error-chain = { version = "0.11", default-features = false }
+
+[dev-dependencies]
+tempdir = "0.3"
diff --git a/util/src/migration/mod.rs b/util/migration/src/lib.rs
similarity index 80%
rename from util/src/migration/mod.rs
rename to util/migration/src/lib.rs
index 3e6b898ff6779df38b94593df70202b56e0ce0d2..fbc9681b40e7249a2a5e6b25add3d556e012edf5 100644
--- a/util/src/migration/mod.rs
+++ b/util/migration/src/lib.rs
@@ -15,16 +15,46 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! DB Migration module.
-#[cfg(test)]
-mod tests;
+
+#[macro_use]
+extern crate log;
+#[macro_use]
+extern crate macros;
+#[macro_use]
+extern crate error_chain;
+
+extern crate kvdb;
+extern crate kvdb_rocksdb;
 
 use std::collections::BTreeMap;
-use std::fs;
-use std::fmt;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
+use std::{fs, io};
+
+use kvdb::DBTransaction;
+use kvdb_rocksdb::{CompactionProfile, Database, DatabaseConfig};
+
+error_chain! {
+	links {
+		Db(kvdb::Error, kvdb::ErrorKind);
+	}
+
+	foreign_links {
+		Io(io::Error);
+	}
 
-use ::kvdb::{CompactionProfile, Database, DatabaseConfig, DBTransaction};
+	errors {
+		CannotAddMigration {
+			description("Cannot add migration"),
+			display("Cannot add migration"),
+		}
+
+		MigrationImpossible {
+			description("Migration impossible"),
+			display("Migration impossible"),
+		}
+	}
+}
 
 /// Migration config.
 #[derive(Clone)]
@@ -62,7 +92,7 @@ impl Batch {
 	}
 
 	/// Insert a value into the batch, committing if necessary.
-	pub fn insert(&mut self, key: Vec<u8>, value: Vec<u8>, dest: &mut Database) -> Result<(), Error> {
+	pub fn insert(&mut self, key: Vec<u8>, value: Vec<u8>, dest: &mut Database) -> Result<()> {
 		self.inner.insert(key, value);
 		if self.inner.len() == self.batch_size {
 			self.commit(dest)?;
@@ -71,7 +101,7 @@ impl Batch {
 	}
 
 	/// Commit all the items in the batch to the given database.
-	pub fn commit(&mut self, dest: &mut Database) -> Result<(), Error> {
+	pub fn commit(&mut self, dest: &mut Database) -> Result<()> {
 		if self.inner.is_empty() { return Ok(()) }
 
 		let mut transaction = DBTransaction::new();
@@ -81,43 +111,7 @@ impl Batch {
 		}
 
 		self.inner.clear();
-		dest.write(transaction).map_err(Error::Custom)
-	}
-}
-
-/// Migration error.
-#[derive(Debug)]
-pub enum Error {
-	/// Error returned when it is impossible to add new migration rules.
-	CannotAddMigration,
-	/// Error returned when migration from specific version can not be performed.
-	MigrationImpossible,
-	/// Io Error.
-	Io(::std::io::Error),
-	/// Custom error.
-	Custom(String),
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			Error::CannotAddMigration => write!(f, "Cannot add migration"),
-			Error::MigrationImpossible => write!(f, "Migration impossible"),
-			Error::Io(ref err) => write!(f, "{}", err),
-			Error::Custom(ref err) => write!(f, "{}", err),
-		}
-	}
-}
-
-impl From<::std::io::Error> for Error {
-	fn from(e: ::std::io::Error) -> Self {
-		Error::Io(e)
-	}
-}
-
-impl From<String> for Error {
-	fn from(e: String) -> Self {
-		Error::Custom(e)
+		dest.write(transaction).map_err(Into::into)
 	}
 }
 
@@ -133,15 +127,17 @@ pub trait Migration: 'static {
 	/// Version of the database after the migration.
 	fn version(&self) -> u32;
 	/// Migrate a source to a destination.
-	fn migrate(&mut self, source: Arc<Database>, config: &Config, destination: &mut Database, col: Option<u32>) -> Result<(), Error>;
+	fn migrate(&mut self, source: Arc<Database>, config: &Config, destination: &mut Database, col: Option<u32>) -> Result<()>;
 }
 
-/// A simple migration over key-value pairs.
+/// A simple migration over key-value pairs of a single column.
 pub trait SimpleMigration: 'static {
 	/// Number of columns in database after the migration.
 	fn columns(&self) -> Option<u32>;
 	/// Version of database after the migration.
 	fn version(&self) -> u32;
+	/// Index of column which should be migrated.
+	fn migrated_column_index(&self) -> Option<u32>;
 	/// Should migrate existing object to new database.
 	/// Returns `None` if the object does not exist in new version of database.
 	fn simple_migrate(&mut self, key: Vec<u8>, value: Vec<u8>) -> Option<(Vec<u8>, Vec<u8>)>;
@@ -154,7 +150,8 @@ impl<T: SimpleMigration> Migration for T {
 
 	fn alters_existing(&self) -> bool { true }
 
-	fn migrate(&mut self, source: Arc<Database>, config: &Config, dest: &mut Database, col: Option<u32>) -> Result<(), Error> {
+	fn migrate(&mut self, source: Arc<Database>, config: &Config, dest: &mut Database, col: Option<u32>) -> Result<()> {
+		let migration_needed = col == SimpleMigration::migrated_column_index(self);
 		let mut batch = Batch::new(config, col);
 
 		let iter = match source.iter(col) {
@@ -163,8 +160,12 @@ impl<T: SimpleMigration> Migration for T {
 		};
 
 		for (key, value) in iter {
-			if let Some((key, value)) = self.simple_migrate(key.into_vec(), value.into_vec()) {
-				batch.insert(key, value, dest)?;
+			if migration_needed {
+				if let Some((key, value)) = self.simple_migrate(key.into_vec(), value.into_vec()) {
+					batch.insert(key, value, dest)?;
+				}
+			} else {
+				batch.insert(key.into_vec(), value.into_vec(), dest)?;
 			}
 		}
 
@@ -187,7 +188,7 @@ impl Migration for ChangeColumns {
 	fn columns(&self) -> Option<u32> { self.post_columns }
 	fn version(&self) -> u32 { self.version }
 	fn alters_existing(&self) -> bool { false }
-	fn migrate(&mut self, _: Arc<Database>, _: &Config, _: &mut Database, _: Option<u32>) -> Result<(), Error> {
+	fn migrate(&mut self, _: Arc<Database>, _: &Config, _: &mut Database, _: Option<u32>) -> Result<()> {
 		Ok(())
 	}
 }
@@ -241,7 +242,7 @@ impl Manager {
 	}
 
 	/// Adds new migration rules.
-	pub fn add_migration<T>(&mut self, migration: T) -> Result<(), Error> where T: Migration {
+	pub fn add_migration<T>(&mut self, migration: T) -> Result<()> where T: Migration {
 		let is_new = match self.migrations.last() {
 			Some(last) => migration.version() > last.version(),
 			None => true,
@@ -249,24 +250,26 @@ impl Manager {
 
 		match is_new {
 			true => Ok(self.migrations.push(Box::new(migration))),
-			false => Err(Error::CannotAddMigration),
+			false => Err(ErrorKind::CannotAddMigration.into()),
 		}
 	}
 
 	/// Performs migration in order, starting with a source path, migrating between two temporary databases,
 	/// and producing a path where the final migration lives.
-	pub fn execute(&mut self, old_path: &Path, version: u32) -> Result<PathBuf, Error> {
+	pub fn execute(&mut self, old_path: &Path, version: u32) -> Result<PathBuf> {
 		let config = self.config.clone();
 		let migrations = self.migrations_from(version);
 		trace!(target: "migration", "Total migrations to execute for version {}: {}", version, migrations.len());
-		if migrations.is_empty() { return Err(Error::MigrationImpossible) };
+		if migrations.is_empty() {
+			return Err(ErrorKind::MigrationImpossible.into())
+		};
 
 		let columns = migrations.get(0).and_then(|m| m.pre_columns());
 
 		trace!(target: "migration", "Expecting database to contain {:?} columns", columns);
 		let mut db_config = DatabaseConfig {
 			max_open_files: 64,
-			cache_sizes: Default::default(),
+			memory_budget: None,
 			compaction: config.compaction_profile,
 			columns: columns,
 			wal: true,
@@ -277,8 +280,8 @@ impl Manager {
 		let mut temp_path = old_path.to_path_buf();
 
 		// start with the old db.
-		let old_path_str = old_path.to_str().ok_or(Error::MigrationImpossible)?;
-		let mut cur_db = Arc::new(Database::open(&db_config, old_path_str).map_err(Error::Custom)?);
+		let old_path_str = old_path.to_str().ok_or(ErrorKind::MigrationImpossible)?;
+		let mut cur_db = Arc::new(Database::open(&db_config, old_path_str)?);
 
 		for migration in migrations {
 			trace!(target: "migration", "starting migration to version {}", migration.version());
@@ -291,8 +294,8 @@ impl Manager {
 				temp_path = temp_idx.path(&db_root);
 
 				// open the target temporary database.
-				let temp_path_str = temp_path.to_str().ok_or(Error::MigrationImpossible)?;
-				let mut new_db = Database::open(&db_config, temp_path_str).map_err(Error::Custom)?;
+				let temp_path_str = temp_path.to_str().ok_or(ErrorKind::MigrationImpossible)?;
+				let mut new_db = Database::open(&db_config, temp_path_str)?;
 
 				match current_columns {
 					// migrate only default column
@@ -315,11 +318,11 @@ impl Manager {
 				// we can do this in-place.
 				let goal_columns = migration.columns().unwrap_or(0);
 				while cur_db.num_columns() < goal_columns {
-					cur_db.add_column().map_err(Error::Custom)?;
+					cur_db.add_column().map_err(kvdb::Error::from)?;
 				}
 
 				while cur_db.num_columns() > goal_columns {
-					cur_db.drop_column().map_err(Error::Custom)?;
+					cur_db.drop_column().map_err(kvdb::Error::from)?;
 				}
 			}
 		}
diff --git a/util/src/migration/tests.rs b/util/migration/tests/tests.rs
similarity index 82%
rename from util/src/migration/tests.rs
rename to util/migration/tests/tests.rs
index 64f2d976acb5b0526e22851c387a64f9e17c2a01..c1ff8228f87a7767d1af107eee13716125ffd460 100644
--- a/util/src/migration/tests.rs
+++ b/util/migration/tests/tests.rs
@@ -18,17 +18,22 @@
 //! A random temp directory is created. A database is created within it, and migrations
 //! are performed in temp sub-directories.
 
+#[macro_use]
+extern crate macros;
+extern crate tempdir;
+extern crate kvdb_rocksdb;
+extern crate migration;
+
 use std::collections::BTreeMap;
-use std::sync::Arc;
 use std::path::{Path, PathBuf};
-use migration::{Batch, Config, Error, SimpleMigration, Migration, Manager};
-use kvdb::Database;
-use devtools::RandomTempPath;
+use std::sync::Arc;
+use tempdir::TempDir;
+use kvdb_rocksdb::Database;
+use migration::{Batch, Config, Error, SimpleMigration, Migration, Manager, ChangeColumns};
 
+#[inline]
 fn db_path(path: &Path) -> PathBuf {
-	let mut p = path.to_owned();
-	p.push("db");
-	p
+	path.join("db")
 }
 
 // initialize a database at the given directory with the given values.
@@ -58,9 +63,17 @@ fn verify_migration(path: &Path, pairs: BTreeMap<Vec<u8>, Vec<u8>>) {
 struct Migration0;
 
 impl SimpleMigration for Migration0 {
-	fn columns(&self) -> Option<u32> { None }
+	fn columns(&self) -> Option<u32> {
+		None
+	}
 
-	fn version(&self) -> u32 { 1 }
+	fn version(&self) -> u32 {
+		1
+	}
+
+	fn migrated_column_index(&self) -> Option<u32> {
+		None
+	}
 
 	fn simple_migrate(&mut self, mut key: Vec<u8>, mut value: Vec<u8>) -> Option<(Vec<u8>, Vec<u8>)> {
 		key.push(0x11);
@@ -73,9 +86,17 @@ impl SimpleMigration for Migration0 {
 struct Migration1;
 
 impl SimpleMigration for Migration1 {
-	fn columns(&self) -> Option<u32> { None }
+	fn columns(&self) -> Option<u32> {
+		None
+	}
 
-	fn version(&self) -> u32 { 2 }
+	fn version(&self) -> u32 {
+		2
+	}
+
+	fn migrated_column_index(&self) -> Option<u32> {
+		None
+	}
 
 	fn simple_migrate(&mut self, key: Vec<u8>, _value: Vec<u8>) -> Option<(Vec<u8>, Vec<u8>)> {
 		Some((key, vec![]))
@@ -109,8 +130,8 @@ impl Migration for AddsColumn {
 
 #[test]
 fn one_simple_migration() {
-	let dir = RandomTempPath::create_dir();
-	let db_path = db_path(dir.as_path());
+	let tempdir = TempDir::new("").unwrap();
+	let db_path = db_path(tempdir.path());
 	let mut manager = Manager::new(Config::default());
 	make_db(&db_path, map![vec![] => vec![], vec![1] => vec![1]]);
 	let expected = map![vec![0x11] => vec![0x22], vec![1, 0x11] => vec![1, 0x22]];
@@ -124,8 +145,8 @@ fn one_simple_migration() {
 #[test]
 #[should_panic]
 fn no_migration_needed() {
-	let dir = RandomTempPath::create_dir();
-	let db_path = db_path(dir.as_path());
+	let tempdir = TempDir::new("").unwrap();
+	let db_path = db_path(tempdir.path());
 	let mut manager = Manager::new(Config::default());
 	make_db(&db_path, map![vec![] => vec![], vec![1] => vec![1]]);
 
@@ -136,8 +157,8 @@ fn no_migration_needed() {
 #[test]
 #[should_panic]
 fn wrong_adding_order() {
-	let dir = RandomTempPath::create_dir();
-	let db_path = db_path(dir.as_path());
+	let tempdir = TempDir::new("").unwrap();
+	let db_path = db_path(tempdir.path());
 	let mut manager = Manager::new(Config::default());
 	make_db(&db_path, map![vec![] => vec![], vec![1] => vec![1]]);
 
@@ -147,8 +168,8 @@ fn wrong_adding_order() {
 
 #[test]
 fn multiple_migrations() {
-	let dir = RandomTempPath::create_dir();
-	let db_path = db_path(dir.as_path());
+	let tempdir = TempDir::new("").unwrap();
+	let db_path = db_path(tempdir.path());
 	let mut manager = Manager::new(Config::default());
 	make_db(&db_path, map![vec![] => vec![], vec![1] => vec![1]]);
 	let expected = map![vec![0x11] => vec![], vec![1, 0x11] => vec![]];
@@ -162,8 +183,8 @@ fn multiple_migrations() {
 
 #[test]
 fn second_migration() {
-	let dir = RandomTempPath::create_dir();
-	let db_path = db_path(dir.as_path());
+	let tempdir = TempDir::new("").unwrap();
+	let db_path = db_path(tempdir.path());
 	let mut manager = Manager::new(Config::default());
 	make_db(&db_path, map![vec![] => vec![], vec![1] => vec![1]]);
 	let expected = map![vec![] => vec![], vec![1] => vec![]];
@@ -177,8 +198,8 @@ fn second_migration() {
 
 #[test]
 fn first_and_noop_migration() {
-	let dir = RandomTempPath::create_dir();
-	let db_path = db_path(dir.as_path());
+	let tempdir = TempDir::new("").unwrap();
+	let db_path = db_path(tempdir.path());
 	let mut manager = Manager::new(Config::default());
 	make_db(&db_path, map![vec![] => vec![], vec![1] => vec![1]]);
 	let expected = map![vec![0x11] => vec![0x22], vec![1, 0x11] => vec![1, 0x22]];
@@ -191,8 +212,8 @@ fn first_and_noop_migration() {
 
 #[test]
 fn noop_and_second_migration() {
-	let dir = RandomTempPath::create_dir();
-	let db_path = db_path(dir.as_path());
+	let tempdir = TempDir::new("").unwrap();
+	let db_path = db_path(tempdir.path());
 	let mut manager = Manager::new(Config::default());
 	make_db(&db_path, map![vec![] => vec![], vec![1] => vec![1]]);
 	let expected = map![vec![] => vec![], vec![1] => vec![]];
@@ -219,8 +240,8 @@ fn pre_columns() {
 	let mut manager = Manager::new(Config::default());
 	manager.add_migration(AddsColumn).unwrap();
 
-	let dir = RandomTempPath::create_dir();
-	let db_path = db_path(dir.as_path());
+	let tempdir = TempDir::new("").unwrap();
+	let db_path = db_path(tempdir.path());
 
 	// this shouldn't fail to open the database even though it's one column
 	// short of the one before it.
@@ -229,17 +250,17 @@ fn pre_columns() {
 
 #[test]
 fn change_columns() {
-	use kvdb::DatabaseConfig;
+	use kvdb_rocksdb::DatabaseConfig;
 
 	let mut manager = Manager::new(Config::default());
-	manager.add_migration(::migration::ChangeColumns {
+	manager.add_migration(ChangeColumns {
 		pre_columns: None,
 		post_columns: Some(4),
 		version: 1,
 	}).unwrap();
 
-	let dir = RandomTempPath::create_dir();
-	let db_path = db_path(dir.as_path());
+	let tempdir = TempDir::new("").unwrap();
+	let db_path = db_path(tempdir.path());
 
 	let new_path = manager.execute(&db_path, 0).unwrap();
 
diff --git a/util/network-devp2p/Cargo.toml b/util/network-devp2p/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..7d86ce7a073333ace7b366f0954b61fb08fa3828
--- /dev/null
+++ b/util/network-devp2p/Cargo.toml
@@ -0,0 +1,43 @@
+[package]
+description = "DevP2P implementation of the ethcore network library"
+homepage = "http://parity.io"
+license = "GPL-3.0"
+name = "ethcore-network-devp2p"
+version = "1.11.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+log = "0.3"
+mio = "0.6.8"
+bytes = "0.4"
+rand = "0.4"
+tiny-keccak = "1.3"
+rust-crypto = "0.2.34"
+slab = "0.2"
+igd = "0.6"
+libc = "0.2.7"
+parking_lot = "0.5"
+ansi_term = "0.10"
+rustc-hex = "1.0"
+ethcore-io = { path = "../io" }
+ethcore-bytes = { path = "../bytes" }
+ethcore-network = { path = "../network" }
+ethereum-types = "0.2"
+ethkey = { path = "../../ethkey" }
+ethcrypto = { path = "../../ethcrypto" }
+rlp = { path = "../rlp" }
+path = { path = "../path" }
+ethcore-logger = { path ="../../logger" }
+ipnetwork = "0.12.6"
+keccak-hash = { path = "../hash" }
+snappy = { git = "https://github.com/paritytech/rust-snappy" }
+serde = "1.0"
+serde_json = "1.0"
+serde_derive = "1.0"
+error-chain = { version = "0.11", default-features = false }
+
+[dev-dependencies]
+tempdir = "0.3"
+
+[features]
+default = []
diff --git a/util/network/src/connection.rs b/util/network-devp2p/src/connection.rs
similarity index 88%
rename from util/network/src/connection.rs
rename to util/network-devp2p/src/connection.rs
index a9cb05c002505605831eecc3707a91faf451a960..e32439756fdfff13788bb599d9594e317d9dcabc 100644
--- a/util/network/src/connection.rs
+++ b/util/network-devp2p/src/connection.rs
@@ -18,15 +18,14 @@ use std::sync::Arc;
 use std::collections::VecDeque;
 use std::net::SocketAddr;
 use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
+use hash::{keccak, write_keccak};
 use mio::{Token, Ready, PollOpt};
 use mio::deprecated::{Handler, EventLoop, TryRead, TryWrite};
 use mio::tcp::*;
-use util::hash::*;
-use util::sha3::*;
-use util::bytes::*;
+use ethereum_types::{H128, H256, H512};
+use ethcore_bytes::*;
 use rlp::*;
 use std::io::{self, Cursor, Read, Write};
-use error::*;
 use io::{IoContext, StreamToken};
 use handshake::Handshake;
 use stats::NetworkStats;
@@ -37,9 +36,11 @@ use rcrypto::buffer::*;
 use tiny_keccak::Keccak;
 use bytes::{Buf, BufMut};
 use crypto;
+use network::{Error, ErrorKind};
 
 const ENCRYPTED_HEADER_LEN: usize = 32;
 const RECIEVE_PAYLOAD_TIMEOUT: u64 = 30000;
+pub const MAX_PAYLOAD_SIZE: usize = (1 << 24) - 1;
 
 pub trait GenericSocket : Read + Write {
 }
@@ -124,7 +125,7 @@ impl<Socket: GenericSocket> GenericConnection<Socket> {
 	}
 
 	/// Writable IO handler. Called when the socket is ready to send.
-	pub fn writable<Message>(&mut self, io: &IoContext<Message>) -> Result<WriteStatus, NetworkError> where Message: Send + Clone + Sync + 'static {
+	pub fn writable<Message>(&mut self, io: &IoContext<Message>) -> Result<WriteStatus, Error> where Message: Send + Clone + Sync + 'static {
 		{
 			let buf = match self.send_queue.front_mut() {
 				Some(buf) => buf,
@@ -299,7 +300,7 @@ pub struct EncryptedConnection {
 
 impl EncryptedConnection {
 	/// Create an encrypted connection out of the handshake.
-	pub fn new(handshake: &mut Handshake) -> Result<EncryptedConnection, NetworkError> {
+	pub fn new(handshake: &mut Handshake) -> Result<EncryptedConnection, Error> {
 		let shared = crypto::ecdh::agree(handshake.ecdhe.secret(), &handshake.remote_ephemeral)?;
 		let mut nonce_material = H512::new();
 		if handshake.originated {
@@ -312,16 +313,16 @@ impl EncryptedConnection {
 		}
 		let mut key_material = H512::new();
 		shared.copy_to(&mut key_material[0..32]);
-		nonce_material.sha3_into(&mut key_material[32..64]);
-		key_material.sha3().copy_to(&mut key_material[32..64]);
-		key_material.sha3().copy_to(&mut key_material[32..64]);
+		write_keccak(&nonce_material, &mut key_material[32..64]);
+		keccak(&key_material).copy_to(&mut key_material[32..64]);
+		keccak(&key_material).copy_to(&mut key_material[32..64]);
 
 		let iv = vec![0u8; 16];
 		let encoder = CtrMode::new(AesSafe256Encryptor::new(&key_material[32..64]), iv);
 		let iv = vec![0u8; 16];
 		let decoder = CtrMode::new(AesSafe256Encryptor::new(&key_material[32..64]), iv);
 
-		key_material.sha3().copy_to(&mut key_material[32..64]);
+		keccak(&key_material).copy_to(&mut key_material[32..64]);
 		let mac_encoder = EcbEncryptor::new(AesSafe256Encryptor::new(&key_material[32..64]), NoPadding);
 
 		let mut egress_mac = Keccak::new_keccak256();
@@ -345,18 +346,18 @@ impl EncryptedConnection {
 			ingress_mac: ingress_mac,
 			read_state: EncryptedConnectionState::Header,
 			protocol_id: 0,
-			payload_len: 0
+			payload_len: 0,
 		};
 		enc.connection.expect(ENCRYPTED_HEADER_LEN);
 		Ok(enc)
 	}
 
 	/// Send a packet
-	pub fn send_packet<Message>(&mut self, io: &IoContext<Message>, payload: &[u8]) -> Result<(), NetworkError> where Message: Send + Clone + Sync + 'static {
+	pub fn send_packet<Message>(&mut self, io: &IoContext<Message>, payload: &[u8]) -> Result<(), Error> where Message: Send + Clone + Sync + 'static {
 		let mut header = RlpStream::new();
 		let len = payload.len();
-		if len >= (1 << 24) {
-			return Err(NetworkError::OversizedPacket);
+		if len > MAX_PAYLOAD_SIZE {
+			bail!(ErrorKind::OversizedPacket);
 		}
 		header.append_raw(&[(len >> 16) as u8, (len >> 8) as u8, len as u8], 1);
 		header.append_raw(&[0xc2u8, 0x80u8, 0x80u8], 1);
@@ -365,7 +366,7 @@ impl EncryptedConnection {
 		let padding = (16 - (payload.len() % 16)) % 16;
 		header.resize(16, 0u8);
 
-		let mut packet = vec![0u8; (32 + payload.len() + padding + 16)];
+		let mut packet = vec![0u8; 32 + payload.len() + padding + 16];
 		self.encoder.encrypt(&mut RefReadBuffer::new(&header), &mut RefWriteBuffer::new(&mut packet), false).expect("Invalid length or padding");
 		EncryptedConnection::update_mac(&mut self.egress_mac, &mut self.mac_encoder,  &packet[0..16]);
 		self.egress_mac.clone().finalize(&mut packet[16..32]);
@@ -382,16 +383,16 @@ impl EncryptedConnection {
 	}
 
 	/// Decrypt and authenticate an incoming packet header. Prepare for receiving payload.
-	fn read_header(&mut self, header: &[u8]) -> Result<(), NetworkError> {
+	fn read_header(&mut self, header: &[u8]) -> Result<(), Error> {
 		if header.len() != ENCRYPTED_HEADER_LEN {
-			return Err(From::from(NetworkError::Auth));
+			return Err(ErrorKind::Auth.into());
 		}
 		EncryptedConnection::update_mac(&mut self.ingress_mac, &mut self.mac_encoder, &header[0..16]);
 		let mac = &header[16..];
 		let mut expected = H256::new();
 		self.ingress_mac.clone().finalize(&mut expected);
 		if mac != &expected[0..16] {
-			return Err(From::from(NetworkError::Auth));
+			return Err(ErrorKind::Auth.into());
 		}
 
 		let mut hdec = H128::new();
@@ -412,11 +413,11 @@ impl EncryptedConnection {
 	}
 
 	/// Decrypt and authenticate packet payload.
-	fn read_payload(&mut self, payload: &[u8]) -> Result<Packet, NetworkError> {
+	fn read_payload(&mut self, payload: &[u8]) -> Result<Packet, Error> {
 		let padding = (16 - (self.payload_len  % 16)) % 16;
 		let full_length = self.payload_len + padding + 16;
 		if payload.len() != full_length {
-			return Err(From::from(NetworkError::Auth));
+			return Err(ErrorKind::Auth.into());
 		}
 		self.ingress_mac.update(&payload[0..payload.len() - 16]);
 		EncryptedConnection::update_mac(&mut self.ingress_mac, &mut self.mac_encoder, &[0u8; 0]);
@@ -424,7 +425,7 @@ impl EncryptedConnection {
 		let mut expected = H128::new();
 		self.ingress_mac.clone().finalize(&mut expected);
 		if mac != &expected[..] {
-			return Err(From::from(NetworkError::Auth));
+			return Err(ErrorKind::Auth.into());
 		}
 
 		let mut packet = vec![0u8; self.payload_len];
@@ -450,7 +451,7 @@ impl EncryptedConnection {
 	}
 
 	/// Readable IO handler. Tracker receive status and returns decoded packet if avaialable.
-	pub fn readable<Message>(&mut self, io: &IoContext<Message>) -> Result<Option<Packet>, NetworkError> where Message: Send + Clone + Sync + 'static {
+	pub fn readable<Message>(&mut self, io: &IoContext<Message>) -> Result<Option<Packet>, Error> where Message: Send + Clone + Sync + 'static {
 		io.clear_timer(self.connection.token)?;
 		if let EncryptedConnectionState::Header = self.read_state {
 			if let Some(data) = self.connection.readable()? {
@@ -473,7 +474,7 @@ impl EncryptedConnection {
 	}
 
 	/// Writable IO handler. Processes send queeue.
-	pub fn writable<Message>(&mut self, io: &IoContext<Message>) -> Result<(), NetworkError> where Message: Send + Clone + Sync + 'static {
+	pub fn writable<Message>(&mut self, io: &IoContext<Message>) -> Result<(), Error> where Message: Send + Clone + Sync + 'static {
 		self.connection.writable(io)?;
 		Ok(())
 	}
@@ -481,7 +482,7 @@ impl EncryptedConnection {
 
 #[test]
 pub fn test_encryption() {
-	use util::hash::*;
+	use ethereum_types::{H256, H128};
 	use std::str::FromStr;
 	let key = H256::from_str("2212767d793a7a3d66f869ae324dd11bd17044b82c9f463b8a541a4d089efec5").unwrap();
 	let before = H128::from_str("12532abaec065082a3cf1da7d0136f15").unwrap();
@@ -503,16 +504,85 @@ pub fn test_encryption() {
 
 #[cfg(test)]
 mod tests {
-	use super::*;
+	use std::cmp;
+	use std::collections::VecDeque;
+	use std::io::{Read, Write, Cursor, ErrorKind, Result, Error};
 	use std::sync::Arc;
 	use std::sync::atomic::AtomicBool;
-	use super::super::stats::*;
-	use std::io::{Read, Write, Error, Cursor, ErrorKind};
+
 	use mio::{Ready};
-	use std::collections::VecDeque;
-	use util::bytes::Bytes;
-	use devtools::*;
+	use ethcore_bytes::Bytes;
 	use io::*;
+	use super::super::stats::*;
+	use super::*;
+
+	pub struct TestSocket {
+		pub read_buffer: Vec<u8>,
+		pub write_buffer: Vec<u8>,
+		pub cursor: usize,
+		pub buf_size: usize,
+	}
+
+	impl Default for TestSocket {
+		fn default() -> Self {
+			TestSocket::new()
+		}
+	}
+
+	impl TestSocket {
+		pub fn new() -> Self {
+			TestSocket {
+				read_buffer: vec![],
+				write_buffer: vec![],
+				cursor: 0,
+				buf_size: 0,
+			}
+		}
+
+		pub fn new_buf(buf_size: usize) -> TestSocket {
+			TestSocket {
+				read_buffer: vec![],
+				write_buffer: vec![],
+				cursor: 0,
+				buf_size: buf_size,
+			}
+		}
+	}
+
+	impl Read for TestSocket {
+		fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
+			let end_position = cmp::min(self.read_buffer.len(), self.cursor+buf.len());
+			if self.cursor > end_position { return Ok(0) }
+			let len = cmp::max(end_position - self.cursor, 0);
+			match len {
+				0 => Ok(0),
+				_ => {
+					for i in self.cursor..end_position {
+						buf[i-self.cursor] = self.read_buffer[i];
+					}
+					self.cursor = end_position;
+					Ok(len)
+				}
+			}
+		}
+	}
+
+	impl Write for TestSocket {
+		fn write(&mut self, buf: &[u8]) -> Result<usize> {
+			if self.buf_size == 0 || buf.len() < self.buf_size {
+				self.write_buffer.extend(buf.iter().cloned());
+				Ok(buf.len())
+			}
+			else {
+				self.write_buffer.extend(buf.iter().take(self.buf_size).cloned());
+				Ok(self.buf_size)
+			}
+		}
+
+		fn flush(&mut self) -> Result<()> {
+			unimplemented!();
+		}
+	}
 
 	impl GenericSocket for TestSocket {}
 
@@ -521,17 +591,17 @@ mod tests {
 	}
 
 	impl Read for TestBrokenSocket {
-		fn read(&mut self, _: &mut [u8]) -> Result<usize, Error> {
+		fn read(&mut self, _: &mut [u8]) -> Result<usize> {
 			Err(Error::new(ErrorKind::Other, self.error.clone()))
 		}
 	}
 
 	impl Write for TestBrokenSocket {
-		fn write(&mut self, _: &[u8]) -> Result<usize, Error> {
+		fn write(&mut self, _: &[u8]) -> Result<usize> {
 			Err(Error::new(ErrorKind::Other, self.error.clone()))
 		}
 
-		fn flush(&mut self) -> Result<(), Error> {
+		fn flush(&mut self) -> Result<()> {
 			unimplemented!();
 		}
 	}
diff --git a/util/network/src/connection_filter.rs b/util/network-devp2p/src/connection_filter.rs
similarity index 100%
rename from util/network/src/connection_filter.rs
rename to util/network-devp2p/src/connection_filter.rs
diff --git a/util/network/src/discovery.rs b/util/network-devp2p/src/discovery.rs
similarity index 88%
rename from util/network/src/discovery.rs
rename to util/network-devp2p/src/discovery.rs
index 3dcd8548d09ac060c37283b17dd5962d34ed6218..4a43ab3eb62ff968e1bf94cf3cf45ae6030eaa40 100644
--- a/util/network/src/discovery.rs
+++ b/util/network-devp2p/src/discovery.rs
@@ -14,23 +14,23 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::bytes::Bytes;
+use ethcore_bytes::Bytes;
 use std::net::SocketAddr;
 use std::collections::{HashSet, HashMap, BTreeMap, VecDeque};
 use std::mem;
 use std::default::Default;
+use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 use mio::*;
 use mio::deprecated::{Handler, EventLoop};
 use mio::udp::*;
-use util::sha3::*;
-use time;
-use util::hash::*;
+use hash::keccak;
+use ethereum_types::{H256, H520};
 use rlp::*;
 use node_table::*;
-use error::NetworkError;
+use network::{Error, ErrorKind};
 use io::{StreamToken, IoContext};
 use ethkey::{Secret, KeyPair, sign, recover};
-use IpFilter;
+use network::IpFilter;
 
 use PROTOCOL_VERSION;
 
@@ -59,7 +59,7 @@ pub struct NodeEntry {
 pub struct BucketEntry {
 	pub address: NodeEntry,
 	pub id_hash: H256,
-	pub timeout: Option<u64>,
+	pub timeout: Option<Instant>,
 }
 
 pub struct NodeBucket {
@@ -112,7 +112,7 @@ impl Discovery {
 		let socket = UdpSocket::bind(&listen).expect("Error binding UDP socket");
 		Discovery {
 			id: key.public().clone(),
-			id_hash: key.public().sha3(),
+			id_hash: keccak(key.public()),
 			secret: key.secret().clone(),
 			public_endpoint: public,
 			token: token,
@@ -154,9 +154,9 @@ impl Discovery {
 
 	fn update_node(&mut self, e: NodeEntry) {
 		trace!(target: "discovery", "Inserting {:?}", &e);
-		let id_hash = e.id.sha3();
+		let id_hash = keccak(e.id);
 		let ping = {
-			let mut bucket = &mut self.node_buckets[Discovery::distance(&self.id_hash, &id_hash) as usize];
+			let bucket = &mut self.node_buckets[Discovery::distance(&self.id_hash, &id_hash) as usize];
 			let updated = if let Some(node) = bucket.nodes.iter_mut().find(|n| n.address.id == e.id) {
 				node.address = e.clone();
 				node.timeout = None;
@@ -169,8 +169,8 @@ impl Discovery {
 
 			if bucket.nodes.len() > BUCKET_SIZE {
 				//ping least active node
-				let mut last = bucket.nodes.back_mut().expect("Last item is always present when len() > 0");
-				last.timeout = Some(time::precise_time_ns());
+				let last = bucket.nodes.back_mut().expect("Last item is always present when len() > 0");
+				last.timeout = Some(Instant::now());
 				Some(last.address.endpoint.clone())
 			} else { None }
 		};
@@ -179,13 +179,15 @@ impl Discovery {
 		}
 	}
 
+	/// Removes the timeout of a given NodeId if it can be found in one of the discovery buckets
 	fn clear_ping(&mut self, id: &NodeId) {
-		let mut bucket = &mut self.node_buckets[Discovery::distance(&self.id_hash, &id.sha3()) as usize];
+		let bucket = &mut self.node_buckets[Discovery::distance(&self.id_hash, &keccak(id)) as usize];
 		if let Some(node) = bucket.nodes.iter_mut().find(|n| &n.address.id == id) {
 			node.timeout = None;
 		}
 	}
 
+	/// Starts the discovery process at round 0
 	fn start(&mut self) {
 		trace!(target: "discovery", "Starting discovery");
 		self.discovery_round = 0;
@@ -260,11 +262,11 @@ impl Discovery {
 		for i in 0 .. source.item_count() {
 			rlp.append_raw(source.at(i).as_raw(), 1);
 		}
-		let timestamp = time::get_time().sec as u32 + 60;
+		let timestamp = 60 + SystemTime::now().duration_since(UNIX_EPOCH).unwrap_or_default().as_secs() as u32;
 		rlp.append(&timestamp);
 
 		let bytes = rlp.drain();
-		let hash = bytes.as_ref().sha3();
+		let hash = keccak(bytes.as_ref());
 		let signature = match sign(&self.secret, &hash) {
 			Ok(s) => s,
 			Err(_) => {
@@ -276,16 +278,15 @@ impl Discovery {
 		packet.extend(hash.iter());
 		packet.extend(signature.iter());
 		packet.extend(bytes.iter());
-		let signed_hash = (&packet[32..]).sha3();
+		let signed_hash = keccak(&packet[32..]);
 		packet[0..32].clone_from_slice(&signed_hash);
 		self.send_to(packet, address.clone());
 	}
 
-	#[cfg_attr(feature="dev", allow(map_clone))]
 	fn nearest_node_entries(target: &NodeId, buckets: &[NodeBucket]) -> Vec<NodeEntry> {
 		let mut found: BTreeMap<u32, Vec<&NodeEntry>> = BTreeMap::new();
 		let mut count = 0;
-		let target_hash = target.sha3();
+		let target_hash = keccak(target);
 
 		// Sort nodes by distance to target
 		for bucket in buckets {
@@ -362,25 +363,25 @@ impl Discovery {
 		res
 	}
 
-	fn on_packet(&mut self, packet: &[u8], from: SocketAddr) -> Result<Option<TableUpdates>, NetworkError> {
+	fn on_packet(&mut self, packet: &[u8], from: SocketAddr) -> Result<Option<TableUpdates>, Error> {
 		// validate packet
 		if packet.len() < 32 + 65 + 4 + 1 {
-			return Err(NetworkError::BadProtocol);
+			return Err(ErrorKind::BadProtocol.into());
 		}
 
-		let hash_signed = (&packet[32..]).sha3();
+		let hash_signed = keccak(&packet[32..]);
 		if hash_signed[..] != packet[0..32] {
-			return Err(NetworkError::BadProtocol);
+			return Err(ErrorKind::BadProtocol.into());
 		}
 
 		let signed = &packet[(32 + 65)..];
 		let signature = H520::from_slice(&packet[32..(32 + 65)]);
-		let node_id = recover(&signature.into(), &signed.sha3())?;
+		let node_id = recover(&signature.into(), &keccak(signed))?;
 
 		let packet_id = signed[0];
 		let rlp = UntrustedRlp::new(&signed[1..]);
 		match packet_id {
-			PACKET_PING => self.on_ping(&rlp, &node_id, &from),
+			PACKET_PING => self.on_ping(&rlp, &node_id, &from, &hash_signed),
 			PACKET_PONG => self.on_pong(&rlp, &node_id, &from),
 			PACKET_FIND_NODE => self.on_find_node(&rlp, &node_id, &from),
 			PACKET_NEIGHBOURS => self.on_neighbours(&rlp, &node_id, &from),
@@ -391,10 +392,12 @@ impl Discovery {
 		}
 	}
 
-	fn check_timestamp(&self, timestamp: u64) -> Result<(), NetworkError> {
-		if self.check_timestamps && timestamp < time::get_time().sec as u64{
+	/// Validate that given timestamp is in within one second of now or in the future
+	fn check_timestamp(&self, timestamp: u64) -> Result<(), Error> {
+		let secs_since_epoch = SystemTime::now().duration_since(UNIX_EPOCH).unwrap_or_default().as_secs();
+		if self.check_timestamps && timestamp < secs_since_epoch {
 			debug!(target: "discovery", "Expired packet");
-			return Err(NetworkError::Expired);
+			return Err(ErrorKind::Expired.into());
 		}
 		Ok(())
 	}
@@ -403,7 +406,7 @@ impl Discovery {
 		entry.endpoint.is_allowed(&self.ip_filter) && entry.id != self.id
 	}
 
-	fn on_ping(&mut self, rlp: &UntrustedRlp, node: &NodeId, from: &SocketAddr) -> Result<Option<TableUpdates>, NetworkError> {
+	fn on_ping(&mut self, rlp: &UntrustedRlp, node: &NodeId, from: &SocketAddr, echo_hash: &[u8]) -> Result<Option<TableUpdates>, Error> {
 		trace!(target: "discovery", "Got Ping from {:?}", &from);
 		let source = NodeEndpoint::from_rlp(&rlp.at(1)?)?;
 		let dest = NodeEndpoint::from_rlp(&rlp.at(2)?)?;
@@ -419,18 +422,17 @@ impl Discovery {
 			self.update_node(entry.clone());
 			added_map.insert(node.clone(), entry);
 		}
-		let hash = rlp.as_raw().sha3();
 		let mut response = RlpStream::new_list(2);
 		dest.to_rlp_list(&mut response);
-		response.append(&hash);
+		response.append(&echo_hash);
 		self.send_packet(PACKET_PONG, from, &response.drain());
 
 		Ok(Some(TableUpdates { added: added_map, removed: HashSet::new() }))
 	}
 
-	fn on_pong(&mut self, rlp: &UntrustedRlp, node: &NodeId, from: &SocketAddr) -> Result<Option<TableUpdates>, NetworkError> {
+	fn on_pong(&mut self, rlp: &UntrustedRlp, node: &NodeId, from: &SocketAddr) -> Result<Option<TableUpdates>, Error> {
 		trace!(target: "discovery", "Got Pong from {:?}", &from);
-		// TODO: validate pong packet
+		// TODO: validate pong packet in rlp.val_at(1)
 		let dest = NodeEndpoint::from_rlp(&rlp.at(0)?)?;
 		let timestamp: u64 = rlp.val_at(2)?;
 		self.check_timestamp(timestamp)?;
@@ -440,12 +442,10 @@ impl Discovery {
 			entry.endpoint.address = from.clone();
 		}
 		self.clear_ping(node);
-		let mut added_map = HashMap::new();
-		added_map.insert(node.clone(), entry);
 		Ok(None)
 	}
 
-	fn on_find_node(&mut self, rlp: &UntrustedRlp, _node: &NodeId, from: &SocketAddr) -> Result<Option<TableUpdates>, NetworkError> {
+	fn on_find_node(&mut self, rlp: &UntrustedRlp, _node: &NodeId, from: &SocketAddr) -> Result<Option<TableUpdates>, Error> {
 		trace!(target: "discovery", "Got FindNode from {:?}", &from);
 		let target: NodeId = rlp.val_at(0)?;
 		let timestamp: u64 = rlp.val_at(1)?;
@@ -478,7 +478,7 @@ impl Discovery {
 		packets.collect()
 	}
 
-	fn on_neighbours(&mut self, rlp: &UntrustedRlp, _node: &NodeId, from: &SocketAddr) -> Result<Option<TableUpdates>, NetworkError> {
+	fn on_neighbours(&mut self, rlp: &UntrustedRlp, _node: &NodeId, from: &SocketAddr) -> Result<Option<TableUpdates>, Error> {
 		// TODO: validate packet
 		let mut added = HashMap::new();
 		trace!(target: "discovery", "Got {} Neighbours from {:?}", rlp.at(0)?.item_count()?, &from);
@@ -505,12 +505,12 @@ impl Discovery {
 	}
 
 	fn check_expired(&mut self, force: bool) -> HashSet<NodeId> {
-		let now = time::precise_time_ns();
+		let now = Instant::now();
 		let mut removed: HashSet<NodeId> = HashSet::new();
 		for bucket in &mut self.node_buckets {
 			bucket.nodes.retain(|node| {
 				if let Some(timeout) = node.timeout {
-					if !force && now - timeout < PING_TIMEOUT_MS * 1000_0000 {
+					if !force && now.duration_since(timeout) < Duration::from_millis(PING_TIMEOUT_MS) {
 						true
 					}
 					else {
@@ -536,12 +536,12 @@ impl Discovery {
 		self.start();
 	}
 
-	pub fn register_socket<Host:Handler>(&self, event_loop: &mut EventLoop<Host>) -> Result<(), NetworkError> {
+	pub fn register_socket<Host:Handler>(&self, event_loop: &mut EventLoop<Host>) -> Result<(), Error> {
 		event_loop.register(&self.udp_socket, Token(self.token), Ready::all(), PollOpt::edge()).expect("Error registering UDP socket");
 		Ok(())
 	}
 
-	pub fn update_registration<Host:Handler>(&self, event_loop: &mut EventLoop<Host>) -> Result<(), NetworkError> {
+	pub fn update_registration<Host:Handler>(&self, event_loop: &mut EventLoop<Host>) -> Result<(), Error> {
 		let registration = if !self.send_queue.is_empty() {
 			Ready::readable() | Ready::writable()
 		} else {
@@ -636,7 +636,7 @@ mod tests {
 			buckets[0].nodes.push_back(BucketEntry {
 				address: NodeEntry { id: NodeId::new(), endpoint: ep.clone() },
 				timeout: None,
-				id_hash: NodeId::new().sha3(),
+				id_hash: keccak(NodeId::new()),
 			});
 		}
 		let nearest = Discovery::nearest_node_entries(&NodeId::new(), &buckets);
@@ -708,4 +708,21 @@ mod tests {
 		assert!(discovery.on_packet(&packet, from.clone()).is_ok());
 	}
 
+	#[test]
+	fn test_ping() {
+		let key1 = Random.generate().unwrap();
+		let key2 = Random.generate().unwrap();
+		let ep1 = NodeEndpoint { address: SocketAddr::from_str("127.0.0.1:40344").unwrap(), udp_port: 40344 };
+		let ep2 = NodeEndpoint { address: SocketAddr::from_str("127.0.0.1:40345").unwrap(), udp_port: 40345 };
+		let mut discovery1 = Discovery::new(&key1, ep1.address.clone(), ep1.clone(), 0, IpFilter::default());
+		let mut discovery2 = Discovery::new(&key2, ep2.address.clone(), ep2.clone(), 0, IpFilter::default());
+
+		discovery1.ping(&ep2);
+		let ping_data = discovery1.send_queue.pop_front().unwrap();
+		discovery2.on_packet(&ping_data.payload, ep1.address.clone()).ok();
+		let pong_data = discovery2.send_queue.pop_front().unwrap();
+		let data = &pong_data.payload[(32 + 65)..];
+		let rlp = UntrustedRlp::new(&data[1..]);
+		assert_eq!(ping_data.payload[0..32], rlp.val_at::<Vec<u8>>(1).unwrap()[..])
+	}
 }
diff --git a/util/network/src/handshake.rs b/util/network-devp2p/src/handshake.rs
similarity index 94%
rename from util/network/src/handshake.rs
rename to util/network-devp2p/src/handshake.rs
index f5c4e118aac8903ecfc8afbfe509991caae430df..240046a98e12007bca70b83d63b455cb2df9ea3a 100644
--- a/util/network/src/handshake.rs
+++ b/util/network-devp2p/src/handshake.rs
@@ -16,19 +16,18 @@
 
 use std::sync::Arc;
 use rand::random;
+use hash::write_keccak;
 use mio::tcp::*;
-use util::hash::*;
-use util::sha3::Hashable;
-use util::bytes::Bytes;
+use ethereum_types::{H256, H520};
+use ethcore_bytes::Bytes;
 use rlp::*;
 use connection::{Connection};
-use host::{HostInfo};
 use node_table::NodeId;
-use error::*;
 use stats::NetworkStats;
 use io::{IoContext, StreamToken};
 use ethkey::{KeyPair, Public, Secret, recover, sign, Generator, Random};
 use crypto::{ecdh, ecies};
+use network::{Error, ErrorKind, HostInfo};
 
 #[derive(PartialEq, Eq, Debug)]
 enum HandshakeState {
@@ -83,7 +82,7 @@ const ECIES_OVERHEAD: usize = 113;
 
 impl Handshake {
 	/// Create a new handshake object
-	pub fn new(token: StreamToken, id: Option<&NodeId>, socket: TcpStream, nonce: &H256, stats: Arc<NetworkStats>) -> Result<Handshake, NetworkError> {
+	pub fn new(token: StreamToken, id: Option<&NodeId>, socket: TcpStream, nonce: &H256, stats: Arc<NetworkStats>) -> Result<Handshake, Error> {
 		Ok(Handshake {
 			id: if let Some(id) = id { id.clone()} else { NodeId::new() },
 			connection: Connection::new(token, socket, stats),
@@ -106,7 +105,7 @@ impl Handshake {
 	}
 
 	/// Start a handhsake
-	pub fn start<Message>(&mut self, io: &IoContext<Message>, host: &HostInfo, originated: bool) -> Result<(), NetworkError> where Message: Send + Clone+ Sync + 'static {
+	pub fn start<Message>(&mut self, io: &IoContext<Message>, host: &HostInfo, originated: bool) -> Result<(), Error> where Message: Send + Clone+ Sync + 'static {
 		self.originated = originated;
 		io.register_timer(self.connection.token, HANDSHAKE_TIMEOUT).ok();
 		if originated {
@@ -125,7 +124,7 @@ impl Handshake {
 	}
 
 	/// Readable IO handler. Drives the state change.
-	pub fn readable<Message>(&mut self, io: &IoContext<Message>, host: &HostInfo) -> Result<(), NetworkError> where Message: Send + Clone + Sync + 'static {
+	pub fn readable<Message>(&mut self, io: &IoContext<Message>, host: &HostInfo) -> Result<(), Error> where Message: Send + Clone + Sync + 'static {
 		if !self.expired() {
 			while let Some(data) = self.connection.readable()? {
 				match self.state {
@@ -154,14 +153,14 @@ impl Handshake {
 	}
 
 	/// Writabe IO handler.
-	pub fn writable<Message>(&mut self, io: &IoContext<Message>) -> Result<(), NetworkError> where Message: Send + Clone + Sync + 'static {
+	pub fn writable<Message>(&mut self, io: &IoContext<Message>) -> Result<(), Error> where Message: Send + Clone + Sync + 'static {
 		if !self.expired() {
 			self.connection.writable(io)?;
 		}
 		Ok(())
 	}
 
-	fn set_auth(&mut self, host_secret: &Secret, sig: &[u8], remote_public: &[u8], remote_nonce: &[u8], remote_version: u64) -> Result<(), NetworkError> {
+	fn set_auth(&mut self, host_secret: &Secret, sig: &[u8], remote_public: &[u8], remote_nonce: &[u8], remote_version: u64) -> Result<(), Error> {
 		self.id.clone_from_slice(remote_public);
 		self.remote_nonce.clone_from_slice(remote_nonce);
 		self.remote_version = remote_version;
@@ -172,11 +171,11 @@ impl Handshake {
 	}
 
 	/// Parse, validate and confirm auth message
-	fn read_auth<Message>(&mut self, io: &IoContext<Message>, secret: &Secret, data: &[u8]) -> Result<(), NetworkError> where Message: Send + Clone + Sync + 'static {
+	fn read_auth<Message>(&mut self, io: &IoContext<Message>, secret: &Secret, data: &[u8]) -> Result<(), Error> where Message: Send + Clone + Sync + 'static {
 		trace!(target: "network", "Received handshake auth from {:?}", self.connection.remote_addr_str());
 		if data.len() != V4_AUTH_PACKET_SIZE {
 			debug!(target: "network", "Wrong auth packet size");
-			return Err(From::from(NetworkError::BadProtocol));
+			return Err(ErrorKind::BadProtocol.into());
 		}
 		self.auth_cipher = data.to_vec();
 		match ecies::decrypt(secret, &[], data) {
@@ -193,7 +192,7 @@ impl Handshake {
 				let total = (((data[0] as u16) << 8 | (data[1] as u16)) as usize) + 2;
 				if total < V4_AUTH_PACKET_SIZE {
 					debug!(target: "network", "Wrong EIP8 auth packet size");
-					return Err(From::from(NetworkError::BadProtocol));
+					return Err(ErrorKind::BadProtocol.into());
 				}
 				let rest = total - data.len();
 				self.state = HandshakeState::ReadingAuthEip8;
@@ -203,7 +202,7 @@ impl Handshake {
 		Ok(())
 	}
 
-	fn read_auth_eip8<Message>(&mut self, io: &IoContext<Message>, secret: &Secret, data: &[u8]) -> Result<(), NetworkError> where Message: Send + Clone + Sync + 'static {
+	fn read_auth_eip8<Message>(&mut self, io: &IoContext<Message>, secret: &Secret, data: &[u8]) -> Result<(), Error> where Message: Send + Clone + Sync + 'static {
 		trace!(target: "network", "Received EIP8 handshake auth from {:?}", self.connection.remote_addr_str());
 		self.auth_cipher.extend_from_slice(data);
 		let auth = ecies::decrypt(secret, &self.auth_cipher[0..2], &self.auth_cipher[2..])?;
@@ -218,11 +217,11 @@ impl Handshake {
 	}
 
 	/// Parse and validate ack message
-	fn read_ack(&mut self, secret: &Secret, data: &[u8]) -> Result<(), NetworkError> {
+	fn read_ack(&mut self, secret: &Secret, data: &[u8]) -> Result<(), Error> {
 		trace!(target: "network", "Received handshake ack from {:?}", self.connection.remote_addr_str());
 		if data.len() != V4_ACK_PACKET_SIZE {
 			debug!(target: "network", "Wrong ack packet size");
-			return Err(From::from(NetworkError::BadProtocol));
+			return Err(ErrorKind::BadProtocol.into());
 		}
 		self.ack_cipher = data.to_vec();
 		match ecies::decrypt(secret, &[], data) {
@@ -236,7 +235,7 @@ impl Handshake {
 				let total = (((data[0] as u16) << 8 | (data[1] as u16)) as usize) + 2;
 				if total < V4_ACK_PACKET_SIZE {
 					debug!(target: "network", "Wrong EIP8 ack packet size");
-					return Err(From::from(NetworkError::BadProtocol));
+					return Err(ErrorKind::BadProtocol.into());
 				}
 				let rest = total - data.len();
 				self.state = HandshakeState::ReadingAckEip8;
@@ -246,7 +245,7 @@ impl Handshake {
 		Ok(())
 	}
 
-	fn read_ack_eip8(&mut self, secret: &Secret, data: &[u8]) -> Result<(), NetworkError> {
+	fn read_ack_eip8(&mut self, secret: &Secret, data: &[u8]) -> Result<(), Error> {
 		trace!(target: "network", "Received EIP8 handshake auth from {:?}", self.connection.remote_addr_str());
 		self.ack_cipher.extend_from_slice(data);
 		let ack = ecies::decrypt(secret, &self.ack_cipher[0..2], &self.ack_cipher[2..])?;
@@ -259,7 +258,7 @@ impl Handshake {
 	}
 
 	/// Sends auth message
-	fn write_auth<Message>(&mut self, io: &IoContext<Message>, secret: &Secret, public: &Public) -> Result<(), NetworkError> where Message: Send + Clone + Sync + 'static {
+	fn write_auth<Message>(&mut self, io: &IoContext<Message>, secret: &Secret, public: &Public) -> Result<(), Error> where Message: Send + Clone + Sync + 'static {
 		trace!(target: "network", "Sending handshake auth to {:?}", self.connection.remote_addr_str());
 		let mut data = [0u8; /*Signature::SIZE*/ 65 + /*H256::SIZE*/ 32 + /*Public::SIZE*/ 64 + /*H256::SIZE*/ 32 + 1]; //TODO: use associated constants
 		let len = data.len();
@@ -273,7 +272,7 @@ impl Handshake {
 			// E(remote-pubk, S(ecdhe-random, ecdh-shared-secret^nonce) || H(ecdhe-random-pubk) || pubk || nonce || 0x0)
 			let shared = *ecdh::agree(secret, &self.id)?;
 			sig.copy_from_slice(&*sign(self.ecdhe.secret(), &(&shared ^ &self.nonce))?);
-			self.ecdhe.public().sha3_into(hepubk);
+			write_keccak(self.ecdhe.public(), hepubk);
 			pubk.copy_from_slice(public);
 			nonce.copy_from_slice(&self.nonce);
 		}
@@ -286,7 +285,7 @@ impl Handshake {
 	}
 
 	/// Sends ack message
-	fn write_ack<Message>(&mut self, io: &IoContext<Message>) -> Result<(), NetworkError> where Message: Send + Clone + Sync + 'static {
+	fn write_ack<Message>(&mut self, io: &IoContext<Message>) -> Result<(), Error> where Message: Send + Clone + Sync + 'static {
 		trace!(target: "network", "Sending handshake ack to {:?}", self.connection.remote_addr_str());
 		let mut data = [0u8; 1 + /*Public::SIZE*/ 64 + /*H256::SIZE*/ 32]; //TODO: use associated constants
 		let len = data.len();
@@ -305,7 +304,7 @@ impl Handshake {
 	}
 
 	/// Sends EIP8 ack message
-	fn write_ack_eip8<Message>(&mut self, io: &IoContext<Message>) -> Result<(), NetworkError> where Message: Send + Clone + Sync + 'static {
+	fn write_ack_eip8<Message>(&mut self, io: &IoContext<Message>) -> Result<(), Error> where Message: Send + Clone + Sync + 'static {
 		trace!(target: "network", "Sending EIP8 handshake ack to {:?}", self.connection.remote_addr_str());
 		let mut rlp = RlpStream::new_list(3);
 		rlp.append(self.ecdhe.public());
@@ -333,7 +332,7 @@ mod test {
 	use std::sync::Arc;
 	use rustc_hex::FromHex;
 	use super::*;
-	use util::hash::H256;
+	use ethereum_types::H256;
 	use io::*;
 	use mio::tcp::TcpStream;
 	use stats::NetworkStats;
diff --git a/util/network/src/host.rs b/util/network-devp2p/src/host.rs
similarity index 79%
rename from util/network/src/host.rs
rename to util/network-devp2p/src/host.rs
index d74b2fa6e7d2adb901383a0cfe4e3a9125119385..c23527c328e060297967a138b1dd5547e6af7f7a 100644
--- a/util/network/src/host.rs
+++ b/util/network-devp2p/src/host.rs
@@ -18,25 +18,27 @@ use std::net::{SocketAddr, SocketAddrV4, Ipv4Addr};
 use std::collections::{HashMap, HashSet};
 use std::str::FromStr;
 use std::sync::Arc;
-use std::sync::atomic::{AtomicUsize, AtomicBool, Ordering as AtomicOrdering};
+use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
 use std::ops::*;
-use std::cmp::min;
+use std::cmp::{min, max};
 use std::path::{Path, PathBuf};
-use std::io::{Read, Write, ErrorKind};
+use std::io::{Read, Write, self};
 use std::fs;
 use ethkey::{KeyPair, Secret, Random, Generator};
+use hash::keccak;
 use mio::*;
 use mio::deprecated::{EventLoop};
 use mio::tcp::*;
-use util::hash::*;
-use util::Hashable;
-use util::version;
+use ethereum_types::H256;
 use rlp::*;
-use session::{Session, SessionInfo, SessionData};
-use error::*;
+use session::{Session, SessionData};
 use io::*;
-use {NetworkProtocolHandler, NonReservedPeerMode, PROTOCOL_VERSION, IpFilter};
+use PROTOCOL_VERSION;
 use node_table::*;
+use network::{NetworkConfiguration, NetworkIoMessage, ProtocolId, PeerId, PacketId};
+use network::{NonReservedPeerMode, NetworkContext as NetworkContextTrait};
+use network::HostInfo as HostInfoTrait;
+use network::{SessionInfo, Error, ErrorKind, DisconnectReason, NetworkProtocolHandler};
 use stats::NetworkStats;
 use discovery::{Discovery, TableUpdates, NodeEntry};
 use ip_utils::{map_external_address, select_public_address};
@@ -73,129 +75,6 @@ const DISCOVERY_ROUND_TIMEOUT: u64 = 300;
 // for NODE_TABLE TimerToken
 const NODE_TABLE_TIMEOUT: u64 = 300_000;
 
-#[derive(Debug, PartialEq, Clone)]
-/// Network service configuration
-pub struct NetworkConfiguration {
-	/// Directory path to store general network configuration. None means nothing will be saved
-	pub config_path: Option<String>,
-	/// Directory path to store network-specific configuration. None means nothing will be saved
-	pub net_config_path: Option<String>,
-	/// IP address to listen for incoming connections. Listen to all connections by default
-	pub listen_address: Option<SocketAddr>,
-	/// IP address to advertise. Detected automatically if none.
-	pub public_address: Option<SocketAddr>,
-	/// Port for UDP connections, same as TCP by default
-	pub udp_port: Option<u16>,
-	/// Enable NAT configuration
-	pub nat_enabled: bool,
-	/// Enable discovery
-	pub discovery_enabled: bool,
-	/// List of initial node addresses
-	pub boot_nodes: Vec<String>,
-	/// Use provided node key instead of default
-	pub use_secret: Option<Secret>,
-	/// Minimum number of connected peers to maintain
-	pub min_peers: u32,
-	/// Maximum allowed number of peers
-	pub max_peers: u32,
-	/// Maximum handshakes
-	pub max_handshakes: u32,
-	/// Reserved protocols. Peers with <key> protocol get additional <value> connection slots.
-	pub reserved_protocols: HashMap<ProtocolId, u32>,
-	/// List of reserved node addresses.
-	pub reserved_nodes: Vec<String>,
-	/// The non-reserved peer mode.
-	pub non_reserved_mode: NonReservedPeerMode,
-	/// IP filter
-	pub ip_filter: IpFilter,
-}
-
-impl Default for NetworkConfiguration {
-	fn default() -> Self {
-		NetworkConfiguration::new()
-	}
-}
-
-impl NetworkConfiguration {
-	/// Create a new instance of default settings.
-	pub fn new() -> Self {
-		NetworkConfiguration {
-			config_path: None,
-			net_config_path: None,
-			listen_address: None,
-			public_address: None,
-			udp_port: None,
-			nat_enabled: true,
-			discovery_enabled: true,
-			boot_nodes: Vec::new(),
-			use_secret: None,
-			min_peers: 25,
-			max_peers: 50,
-			max_handshakes: 64,
-			reserved_protocols: HashMap::new(),
-			ip_filter: IpFilter::default(),
-			reserved_nodes: Vec::new(),
-			non_reserved_mode: NonReservedPeerMode::Accept,
-		}
-	}
-
-	/// Create new default configuration with sepcified listen port.
-	pub fn new_with_port(port: u16) -> NetworkConfiguration {
-		let mut config = NetworkConfiguration::new();
-		config.listen_address = Some(SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), port)));
-		config
-	}
-
-	/// Create new default configuration for localhost-only connection with random port (usefull for testing)
-	pub fn new_local() -> NetworkConfiguration {
-		let mut config = NetworkConfiguration::new();
-		config.listen_address = Some(SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(127, 0, 0, 1), 0)));
-		config.nat_enabled = false;
-		config
-	}
-}
-
-/// Protocol handler level packet id
-pub type PacketId = u8;
-/// Protocol / handler id
-pub type ProtocolId = [u8; 3];
-
-/// Messages used to communitate with the event loop from other threads.
-#[derive(Clone)]
-pub enum NetworkIoMessage {
-	/// Register a new protocol handler.
-	AddHandler {
-		/// Handler shared instance.
-		handler: Arc<NetworkProtocolHandler + Sync>,
-		/// Protocol Id.
-		protocol: ProtocolId,
-		/// Supported protocol versions.
-		versions: Vec<u8>,
-		/// Number of packet IDs reserved by the protocol.
-		packet_count: u8,
-	},
-	/// Register a new protocol timer
-	AddTimer {
-		/// Protocol Id.
-		protocol: ProtocolId,
-		/// Timer token.
-		token: TimerToken,
-		/// Timer delay in milliseconds.
-		delay: u64,
-	},
-	/// Initliaze public interface.
-	InitPublicInterface,
-	/// Disconnect a peer.
-	Disconnect(PeerId),
-	/// Disconnect and temporary disable peer.
-	DisablePeer(PeerId),
-	/// Network has been started with the host as the given enode.
-	NetworkStarted(String),
-}
-
-/// Local (temporary) peer session ID.
-pub type PeerId = usize;
-
 #[derive(Debug, PartialEq, Eq)]
 /// Protocol info
 pub struct CapabilityInfo {
@@ -246,53 +125,47 @@ impl<'s> NetworkContext<'s> {
 			_ => self.sessions.read().get(peer).cloned(),
 		}
 	}
+}
 
-	/// Send a packet over the network to another peer.
-	pub fn send(&self, peer: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError> {
+impl<'s> NetworkContextTrait for NetworkContext<'s> {
+	fn send(&self, peer: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error> {
 		self.send_protocol(self.protocol, peer, packet_id, data)
 	}
 
-	/// Send a packet over the network to another peer using specified protocol.
-	pub fn send_protocol(&self, protocol: ProtocolId, peer: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError> {
+	fn send_protocol(&self, protocol: ProtocolId, peer: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error> {
 		let session = self.resolve_session(peer);
 		if let Some(session) = session {
-			session.lock().send_packet(self.io, protocol, packet_id as u8, &data)?;
+			session.lock().send_packet(self.io, Some(protocol), packet_id as u8, &data)?;
 		} else  {
 			trace!(target: "network", "Send: Peer no longer exist")
 		}
 		Ok(())
 	}
 
-	/// Respond to a current network message. Panics if no there is no packet in the context. If the session is expired returns nothing.
-	pub fn respond(&self, packet_id: PacketId, data: Vec<u8>) -> Result<(), NetworkError> {
+	fn respond(&self, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error> {
 		assert!(self.session.is_some(), "Respond called without network context");
-		self.session_id.map_or_else(|| Err(NetworkError::Expired), |id| self.send(id, packet_id, data))
+		self.session_id.map_or_else(|| Err(ErrorKind::Expired.into()), |id| self.send(id, packet_id, data))
 	}
 
-	/// Get an IoChannel.
-	pub fn io_channel(&self) -> IoChannel<NetworkIoMessage> {
+	fn io_channel(&self) -> IoChannel<NetworkIoMessage> {
 		self.io.channel()
 	}
 
-	/// Disconnect a peer and prevent it from connecting again.
-	pub fn disable_peer(&self, peer: PeerId) {
+	fn disable_peer(&self, peer: PeerId) {
 		self.io.message(NetworkIoMessage::DisablePeer(peer))
 			.unwrap_or_else(|e| warn!("Error sending network IO message: {:?}", e));
 	}
 
-	/// Disconnect peer. Reconnect can be attempted later.
-	pub fn disconnect_peer(&self, peer: PeerId) {
+	fn disconnect_peer(&self, peer: PeerId) {
 		self.io.message(NetworkIoMessage::Disconnect(peer))
 			.unwrap_or_else(|e| warn!("Error sending network IO message: {:?}", e));
 	}
 
-	/// Check if the session is still active.
-	pub fn is_expired(&self) -> bool {
+	fn is_expired(&self) -> bool {
 		self.session.as_ref().map_or(false, |s| s.lock().expired())
 	}
 
-	/// Register a new IO timer. 'IoHandler::timeout' will be called with the token.
-	pub fn register_timer(&self, token: TimerToken, ms: u64) -> Result<(), NetworkError> {
+	fn register_timer(&self, token: TimerToken, ms: u64) -> Result<(), Error> {
 		self.io.message(NetworkIoMessage::AddTimer {
 			token: token,
 			delay: ms,
@@ -301,24 +174,20 @@ impl<'s> NetworkContext<'s> {
 		Ok(())
 	}
 
-	/// Returns peer identification string
-	pub fn peer_client_version(&self, peer: PeerId) -> String {
+	fn peer_client_version(&self, peer: PeerId) -> String {
 		self.resolve_session(peer).map_or("unknown".to_owned(), |s| s.lock().info.client_version.clone())
 	}
 
-	/// Returns information on p2p session
-	pub fn session_info(&self, peer: PeerId) -> Option<SessionInfo> {
+	fn session_info(&self, peer: PeerId) -> Option<SessionInfo> {
 		self.resolve_session(peer).map(|s| s.lock().info.clone())
 	}
 
-	/// Returns max version for a given protocol.
-	pub fn protocol_version(&self, protocol: ProtocolId, peer: PeerId) -> Option<u8> {
+	fn protocol_version(&self, protocol: ProtocolId, peer: PeerId) -> Option<u8> {
 		let session = self.resolve_session(peer);
 		session.and_then(|s| s.lock().capability_version(protocol))
 	}
 
-	/// Returns this object's subprotocol name.
-	pub fn subprotocol_name(&self) -> ProtocolId { self.protocol }
+	fn subprotocol_name(&self) -> ProtocolId { self.protocol }
 }
 
 /// Shared host information
@@ -331,8 +200,6 @@ pub struct HostInfo {
 	nonce: H256,
 	/// RLPx protocol version
 	pub protocol_version: u32,
-	/// Client identifier
-	pub client_version: String,
 	/// Registered capabilities (handlers)
 	pub capabilities: Vec<CapabilityInfo>,
 	/// Local address + discovery port
@@ -341,21 +208,22 @@ pub struct HostInfo {
 	pub public_endpoint: Option<NodeEndpoint>,
 }
 
-impl HostInfo {
-	/// Returns public key
-	pub fn id(&self) -> &NodeId {
+impl HostInfoTrait for HostInfo {
+	fn id(&self) -> &NodeId {
 		self.keys.public()
 	}
 
-	/// Returns secret key
-	pub fn secret(&self) -> &Secret {
+	fn secret(&self) -> &Secret {
 		self.keys.secret()
 	}
 
-	/// Increments and returns connection nonce.
-	pub fn next_nonce(&mut self) -> H256 {
-		self.nonce = self.nonce.sha3();
-		self.nonce.clone()
+	fn next_nonce(&mut self) -> H256 {
+		self.nonce = keccak(&self.nonce);
+		self.nonce
+	}
+
+	fn client_version(&self) -> &str {
+		&self.config.client_version
 	}
 }
 
@@ -374,19 +242,18 @@ pub struct Host {
 	sessions: Arc<RwLock<Slab<SharedSession>>>,
 	discovery: Mutex<Option<Discovery>>,
 	nodes: RwLock<NodeTable>,
-	handlers: RwLock<HashMap<ProtocolId, Arc<NetworkProtocolHandler>>>,
+	handlers: RwLock<HashMap<ProtocolId, Arc<NetworkProtocolHandler + Sync>>>,
 	timers: RwLock<HashMap<TimerToken, ProtocolTimer>>,
 	timer_counter: RwLock<usize>,
 	stats: Arc<NetworkStats>,
 	reserved_nodes: RwLock<HashSet<NodeId>>,
-	num_sessions: AtomicUsize,
 	stopping: AtomicBool,
 	filter: Option<Arc<ConnectionFilter>>,
 }
 
 impl Host {
 	/// Create a new instance
-	pub fn new(mut config: NetworkConfiguration, stats: Arc<NetworkStats>, filter: Option<Arc<ConnectionFilter>>) -> Result<Host, NetworkError> {
+	pub fn new(mut config: NetworkConfiguration, stats: Arc<NetworkStats>, filter: Option<Arc<ConnectionFilter>>) -> Result<Host, Error> {
 		let mut listen_address = match config.listen_address {
 			None => SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), DEFAULT_PORT)),
 			Some(addr) => addr,
@@ -423,7 +290,6 @@ impl Host {
 				config: config,
 				nonce: H256::random(),
 				protocol_version: PROTOCOL_VERSION,
-				client_version: version(),
 				capabilities: Vec::new(),
 				public_endpoint: None,
 				local_endpoint: local_endpoint,
@@ -437,7 +303,6 @@ impl Host {
 			timer_counter: RwLock::new(USER_TIMER),
 			stats: stats,
 			reserved_nodes: RwLock::new(HashSet::new()),
-			num_sessions: AtomicUsize::new(0),
 			stopping: AtomicBool::new(false),
 			filter: filter,
 		};
@@ -468,7 +333,7 @@ impl Host {
 		}
 	}
 
-	pub fn add_reserved_node(&self, id: &str) -> Result<(), NetworkError> {
+	pub fn add_reserved_node(&self, id: &str) -> Result<(), Error> {
 		let n = Node::from_str(id)?;
 
 		let entry = NodeEntry { endpoint: n.endpoint.clone(), id: n.id.clone() };
@@ -492,7 +357,7 @@ impl Host {
 				// disconnect all non-reserved peers here.
 				let reserved: HashSet<NodeId> = self.reserved_nodes.read().clone();
 				let mut to_kill = Vec::new();
-				for e in self.sessions.write().iter_mut() {
+				for e in self.sessions.read().iter() {
 					let mut s = e.lock();
 					{
 						let id = s.id();
@@ -512,17 +377,13 @@ impl Host {
 		}
 	}
 
-	pub fn remove_reserved_node(&self, id: &str) -> Result<(), NetworkError> {
+	pub fn remove_reserved_node(&self, id: &str) -> Result<(), Error> {
 		let n = Node::from_str(id)?;
 		self.reserved_nodes.write().remove(&n.id);
 
 		Ok(())
 	}
 
-	pub fn client_version() -> String {
-		version()
-	}
-
 	pub fn external_url(&self) -> Option<String> {
 		let info = self.info.read();
 		info.public_endpoint.as_ref().map(|e| format!("{}", Node::new(info.id().clone(), e.clone())))
@@ -533,10 +394,10 @@ impl Host {
 		format!("{}", Node::new(info.id().clone(), info.local_endpoint.clone()))
 	}
 
-	pub fn stop(&self, io: &IoContext<NetworkIoMessage>) -> Result<(), NetworkError> {
+	pub fn stop(&self, io: &IoContext<NetworkIoMessage>) -> Result<(), Error> {
 		self.stopping.store(true, AtomicOrdering::Release);
 		let mut to_kill = Vec::new();
-		for e in self.sessions.write().iter_mut() {
+		for e in self.sessions.read().iter() {
 			let mut s = e.lock();
 			s.disconnect(io, DisconnectReason::ClientQuit);
 			to_kill.push(s.token());
@@ -563,7 +424,7 @@ impl Host {
 		peers
 	}
 
-	fn init_public_interface(&self, io: &IoContext<NetworkIoMessage>) -> Result<(), NetworkError> {
+	fn init_public_interface(&self, io: &IoContext<NetworkIoMessage>) -> Result<(), Error> {
 		if self.info.read().public_endpoint.is_some() {
 			return Ok(());
 		}
@@ -606,8 +467,8 @@ impl Host {
 		};
 
 		if let Some(mut discovery) = discovery {
-			discovery.init_node_list(self.nodes.read().unordered_entries());
-			discovery.add_node_list(self.nodes.read().unordered_entries());
+			discovery.init_node_list(self.nodes.read().entries());
+			discovery.add_node_list(self.nodes.read().entries());
 			*self.discovery.lock() = Some(discovery);
 			io.register_stream(DISCOVERY)?;
 			io.register_timer(DISCOVERY_REFRESH, DISCOVERY_REFRESH_TIMEOUT)?;
@@ -627,22 +488,28 @@ impl Host {
 		self.sessions.read().iter().any(|e| e.lock().info.id == Some(id.clone()))
 	}
 
-	fn session_count(&self) -> usize {
-		self.num_sessions.load(AtomicOrdering::Relaxed)
+	// returns (handshakes, egress, ingress)
+	fn session_count(&self) -> (usize, usize, usize) {
+		let mut handshakes = 0;
+		let mut egress = 0;
+		let mut ingress = 0;
+		for s in self.sessions.read().iter() {
+			match s.try_lock() {
+				Some(ref s) if s.is_ready() && s.info.originated => egress += 1,
+				Some(ref s) if s.is_ready() && !s.info.originated => ingress += 1,
+				_ => handshakes +=1,
+			}
+		}
+		(handshakes, egress, ingress)
 	}
 
 	fn connecting_to(&self, id: &NodeId) -> bool {
 		self.sessions.read().iter().any(|e| e.lock().id() == Some(id))
 	}
 
-	fn handshake_count(&self) -> usize {
-		// session_count < total_count is possible because of the data race.
-		self.sessions.read().count().saturating_sub(self.session_count())
-	}
-
 	fn keep_alive(&self, io: &IoContext<NetworkIoMessage>) {
 		let mut to_kill = Vec::new();
-		for e in self.sessions.write().iter_mut() {
+		for e in self.sessions.read().iter() {
 			let mut s = e.lock();
 			if !s.keep_alive(io) {
 				s.disconnect(io, DisconnectReason::PingTimeout);
@@ -666,9 +533,9 @@ impl Host {
 			(config.min_peers, config.non_reserved_mode == NonReservedPeerMode::Deny, config.max_handshakes as usize, config.ip_filter.clone(), info.id().clone())
 		};
 
-		let session_count = self.session_count();
+		let (handshake_count, egress_count, ingress_count) = self.session_count();
 		let reserved_nodes = self.reserved_nodes.read();
-		if session_count >= min_peers as usize + reserved_nodes.len() {
+		if egress_count + ingress_count >= min_peers as usize + reserved_nodes.len() {
 			// check if all pinned nodes are connected.
 			if reserved_nodes.iter().all(|n| self.have_session(n) && self.connecting_to(n)) {
 				return;
@@ -678,7 +545,6 @@ impl Host {
 			pin = true;
 		}
 
-		let handshake_count = self.handshake_count();
 		// allow 16 slots for incoming connections
 		if handshake_count >= max_handshakes {
 			return;
@@ -694,7 +560,7 @@ impl Host {
 
 		let max_handshakes_per_round = max_handshakes / 2;
 		let mut started: usize = 0;
-		for id in nodes.filter(|id| 
+		for id in nodes.filter(|id|
 				!self.have_session(id) &&
 				!self.connecting_to(id) &&
 				*id != self_id &&
@@ -703,10 +569,9 @@ impl Host {
 			self.connect_peer(&id, io);
 			started += 1;
 		}
-		debug!(target: "network", "Connecting peers: {} sessions, {} pending, {} started", self.session_count(), self.handshake_count(), started);
+		debug!(target: "network", "Connecting peers: {} sessions, {} pending + {} started", egress_count + ingress_count, handshake_count, started);
 	}
 
-	#[cfg_attr(feature="dev", allow(single_match))]
 	fn connect_peer(&self, id: &NodeId, io: &IoContext<NetworkIoMessage>) {
 		if self.have_session(id) {
 			trace!(target: "network", "Aborted connect. Node already connected.");
@@ -721,7 +586,7 @@ impl Host {
 			let address = {
 				let mut nodes = self.nodes.write();
 				if let Some(node) = nodes.get_mut(id) {
-					node.last_attempted = Some(::time::now());
+					node.attempts += 1;
 					node.endpoint.address
 				}
 				else {
@@ -740,13 +605,13 @@ impl Host {
 				}
 			}
 		};
+
 		if let Err(e) = self.create_connection(socket, Some(id), io) {
 			debug!(target: "network", "Can't create connection: {:?}", e);
 		}
 	}
 
-	#[cfg_attr(feature="dev", allow(block_in_if_condition_stmt))]
-	fn create_connection(&self, socket: TcpStream, id: Option<&NodeId>, io: &IoContext<NetworkIoMessage>) -> Result<(), NetworkError> {
+	fn create_connection(&self, socket: TcpStream, id: Option<&NodeId>, io: &IoContext<NetworkIoMessage>) -> Result<(), Error> {
 		let nonce = self.info.write().next_nonce();
 		let mut sessions = self.sessions.write();
 
@@ -775,7 +640,7 @@ impl Host {
 			let socket = match self.tcp_listener.lock().accept() {
 				Ok((sock, _addr)) => sock,
 				Err(e) => {
-					if e.kind() != ErrorKind::WouldBlock {
+					if e.kind() != io::ErrorKind::WouldBlock {
 						debug!(target: "network", "Error accepting connection: {:?}", e);
 					}
 					break
@@ -806,7 +671,6 @@ impl Host {
 		self.kill_connection(token, io, true);
 	}
 
-	#[cfg_attr(feature="dev", allow(collapsible_if))]
 	fn session_readable(&self, token: StreamToken, io: &IoContext<NetworkIoMessage>) {
 		let mut ready_data: Vec<ProtocolId> = Vec::new();
 		let mut packet_data: Vec<(ProtocolId, PacketId, Vec<u8>)> = Vec::new();
@@ -815,13 +679,13 @@ impl Host {
 		let mut ready_id = None;
 		if let Some(session) = session.clone() {
 			{
-				let mut s = session.lock();
 				loop {
-					let session_result = s.readable(io, &self.info.read());
+					let session_result = session.lock().readable(io, &self.info.read());
 					match session_result {
 						Err(e) => {
+							let s = session.lock();
 							trace!(target: "network", "Session read error: {}:{:?} ({:?}) {:?}", token, s.id(), s.remote_addr(), e);
-							if let NetworkError::Disconnect(DisconnectReason::IncompatibleProtocol) = e {
+							if let ErrorKind::Disconnect(DisconnectReason::IncompatibleProtocol) = *e.kind() {
 								if let Some(id) = s.id() {
 									if !self.reserved_nodes.read().contains(id) {
 										self.nodes.write().mark_as_useless(id);
@@ -832,9 +696,9 @@ impl Host {
 							break;
 						},
 						Ok(SessionData::Ready) => {
-							self.num_sessions.fetch_add(1, AtomicOrdering::SeqCst);
-							let session_count = self.session_count();
-							let (min_peers, max_peers, reserved_only, self_id) = {
+							let (_, egress_count, ingress_count) = self.session_count();
+							let mut s = session.lock();
+							let (min_peers, mut max_peers, reserved_only, self_id) = {
 								let info = self.info.read();
 								let mut max_peers = info.config.max_peers;
 								for cap in s.info.capabilities.iter() {
@@ -846,12 +710,17 @@ impl Host {
 								(info.config.min_peers as usize, max_peers as usize, info.config.non_reserved_mode == NonReservedPeerMode::Deny, info.id().clone())
 							};
 
+							max_peers = max(max_peers, min_peers);
+
 							let id = s.id().expect("Ready session always has id").clone();
 
-							// Check for the session limit. session_counts accounts for the new session.
+							// Check for the session limit.
+							// Outgoing connections are allowed as long as their count is <= min_peers
+							// Incoming connections are allowed to take all of the max_peers reserve, or at most half of the slots.
+							let max_ingress = max(max_peers - min_peers, min_peers / 2);
 							if reserved_only ||
-								(s.info.originated && session_count > min_peers) ||
-								(!s.info.originated && session_count > max_peers) {
+								(s.info.originated && egress_count > min_peers) ||
+								(!s.info.originated && ingress_count > max_ingress) {
 								// only proceed if the connecting peer is reserved.
 								if !self.reserved_nodes.read().contains(&id) {
 									s.disconnect(io, DisconnectReason::TooManyPeers);
@@ -938,7 +807,7 @@ impl Host {
 			for (p, packet_id, data) in packet_data {
 				let reserved = self.reserved_nodes.read();
 				if let Some(h) = handlers.get(&p).clone() {
-					h.read(&NetworkContext::new(io, p, Some(session.clone()), self.sessions.clone(), &reserved), &token, packet_id, &data[1..]);
+					h.read(&NetworkContext::new(io, p, Some(session.clone()), self.sessions.clone(), &reserved), &token, packet_id, &data);
 				}
 			}
 		}
@@ -955,13 +824,12 @@ impl Host {
 		let mut deregister = false;
 		let mut expired_session = None;
 		if let FIRST_SESSION ... LAST_SESSION = token {
-			let sessions = self.sessions.write();
+			let sessions = self.sessions.read();
 			if let Some(session) = sessions.get(token).cloned() {
 				expired_session = Some(session.clone());
 				let mut s = session.lock();
 				if !s.expired() {
 					if s.is_ready() {
-						self.num_sessions.fetch_sub(1, AtomicOrdering::SeqCst);
 						for (p, _) in self.handlers.read().iter() {
 							if s.have_capability(*p)  {
 								to_disconnect.push(*p);
@@ -993,7 +861,7 @@ impl Host {
 	fn update_nodes(&self, _io: &IoContext<NetworkIoMessage>, node_changes: TableUpdates) {
 		let mut to_remove: Vec<PeerId> = Vec::new();
 		{
-			let sessions = self.sessions.write();
+			let sessions = self.sessions.read();
 			for c in sessions.iter() {
 				let s = c.lock();
 				if let Some(id) = s.id() {
@@ -1009,14 +877,14 @@ impl Host {
 		self.nodes.write().update(node_changes, &*self.reserved_nodes.read());
 	}
 
-	pub fn with_context<F>(&self, protocol: ProtocolId, io: &IoContext<NetworkIoMessage>, action: F) where F: FnOnce(&NetworkContext) {
+	pub fn with_context<F>(&self, protocol: ProtocolId, io: &IoContext<NetworkIoMessage>, action: F) where F: FnOnce(&NetworkContextTrait) {
 		let reserved = { self.reserved_nodes.read() };
 
 		let context = NetworkContext::new(io, protocol, None, self.sessions.clone(), &reserved);
 		action(&context);
 	}
 
-	pub fn with_context_eval<F, T>(&self, protocol: ProtocolId, io: &IoContext<NetworkIoMessage>, action: F) -> T where F: FnOnce(&NetworkContext) -> T {
+	pub fn with_context_eval<F, T>(&self, protocol: ProtocolId, io: &IoContext<NetworkIoMessage>, action: F) -> T where F: FnOnce(&NetworkContextTrait) -> T {
 		let reserved = { self.reserved_nodes.read() };
 
 		let context = NetworkContext::new(io, protocol, None, self.sessions.clone(), &reserved);
@@ -1267,11 +1135,12 @@ fn load_key(path: &Path) -> Option<Secret> {
 
 #[test]
 fn key_save_load() {
-	use ::devtools::RandomTempPath;
-	let temp_path = RandomTempPath::create_dir();
+	use tempdir::TempDir;
+
+	let tempdir = TempDir::new("").unwrap();
 	let key = H256::random().into();
-	save_key(temp_path.as_path(), &key);
-	let r = load_key(temp_path.as_path());
+	save_key(tempdir.path(), &key);
+	let r = load_key(tempdir.path());
 	assert_eq!(key, r.unwrap());
 }
 
@@ -1284,4 +1153,3 @@ fn host_client_url() {
 	let host: Host = Host::new(config, Arc::new(NetworkStats::new()), None).unwrap();
 	assert!(host.local_url().starts_with("enode://101b3ef5a4ea7a1c7928e24c4c75fd053c235d7b80c22ae5c03d145d0ac7396e2a4ffff9adee3133a7b05044a5cee08115fd65145e5165d646bde371010d803c@"));
 }
-
diff --git a/util/network/src/ip_utils.rs b/util/network-devp2p/src/ip_utils.rs
similarity index 99%
rename from util/network/src/ip_utils.rs
rename to util/network-devp2p/src/ip_utils.rs
index d637dbee85d06502472dae088f02a424d933cf13..3767fbb15a7851f1e40eb96a04652c31800bb9ce 100644
--- a/util/network/src/ip_utils.rs
+++ b/util/network-devp2p/src/ip_utils.rs
@@ -365,7 +365,6 @@ fn can_map_external_address_or_fail() {
 
 #[test]
 fn ipv4_properties() {
-	#![cfg_attr(feature="dev", allow(too_many_arguments))]
 	fn check(octets: &[u8; 4], unspec: bool, loopback: bool,
 			 private: bool, link_local: bool, global: bool,
 			 multicast: bool, broadcast: bool, documentation: bool) {
diff --git a/util/network-devp2p/src/lib.rs b/util/network-devp2p/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0dfda0b16e470172867fd366333cf531cd9a705b
--- /dev/null
+++ b/util/network-devp2p/src/lib.rs
@@ -0,0 +1,117 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Network and general IO module.
+//!
+//! Example usage for creating a network service and adding an IO handler:
+//!
+//! ```rust
+//! extern crate ethcore_network as net;
+//! extern crate ethcore_network_devp2p as devp2p;
+//! use net::*;
+//! use devp2p::NetworkService;
+//! use std::sync::Arc;
+//!
+//! struct MyHandler;
+//!
+//! impl NetworkProtocolHandler for MyHandler {
+//!		fn initialize(&self, io: &NetworkContext, _host_info: &HostInfo) {
+//!			io.register_timer(0, 1000);
+//!		}
+//!
+//!		fn read(&self, io: &NetworkContext, peer: &PeerId, packet_id: u8, data: &[u8]) {
+//!			println!("Received {} ({} bytes) from {}", packet_id, data.len(), peer);
+//!		}
+//!
+//!		fn connected(&self, io: &NetworkContext, peer: &PeerId) {
+//!			println!("Connected {}", peer);
+//!		}
+//!
+//!		fn disconnected(&self, io: &NetworkContext, peer: &PeerId) {
+//!			println!("Disconnected {}", peer);
+//!		}
+//! }
+//!
+//! fn main () {
+//! 	let mut service = NetworkService::new(NetworkConfiguration::new_local(), None).expect("Error creating network service");
+//! 	service.start().expect("Error starting service");
+//! 	service.register_protocol(Arc::new(MyHandler), *b"myp", 1, &[1u8]);
+//!
+//! 	// Wait for quit condition
+//! 	// ...
+//! 	// Drop the service
+//! }
+//! ```
+
+//TODO: use Poll from mio
+#![allow(deprecated)]
+
+extern crate ethcore_io as io;
+extern crate ethcore_bytes;
+extern crate ethereum_types;
+extern crate parking_lot;
+extern crate mio;
+extern crate tiny_keccak;
+extern crate crypto as rcrypto;
+extern crate rand;
+extern crate ansi_term; //TODO: remove this
+extern crate rustc_hex;
+extern crate igd;
+extern crate libc;
+extern crate slab;
+extern crate ethkey;
+extern crate ethcrypto as crypto;
+extern crate rlp;
+extern crate bytes;
+extern crate path;
+extern crate ethcore_logger;
+extern crate ethcore_network as network;
+extern crate ipnetwork;
+extern crate keccak_hash as hash;
+extern crate serde;
+extern crate serde_json;
+extern crate snappy;
+
+#[macro_use]
+extern crate error_chain;
+#[macro_use]
+extern crate log;
+#[macro_use]
+extern crate serde_derive;
+
+#[cfg(test)]
+extern crate tempdir;
+
+mod host;
+mod connection;
+mod handshake;
+mod session;
+mod discovery;
+mod service;
+mod node_table;
+mod stats;
+mod ip_utils;
+mod connection_filter;
+
+pub use service::NetworkService;
+pub use stats::NetworkStats;
+pub use connection_filter::{ConnectionFilter, ConnectionDirection};
+pub use host::NetworkContext;
+
+pub use io::TimerToken;
+pub use node_table::{validate_node_url, NodeId};
+
+const PROTOCOL_VERSION: u32 = 5;
diff --git a/util/network/src/node_table.rs b/util/network-devp2p/src/node_table.rs
similarity index 66%
rename from util/network/src/node_table.rs
rename to util/network-devp2p/src/node_table.rs
index f9d4e958949b44e8a60bb855c935b352c00b4d88..244f518f218d34f41404c1603d810c8f7838466b 100644
--- a/util/network/src/node_table.rs
+++ b/util/network-devp2p/src/node_table.rs
@@ -14,26 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::mem;
-use std::slice::from_raw_parts;
-use std::net::{SocketAddr, ToSocketAddrs, SocketAddrV4, SocketAddrV6, Ipv4Addr, Ipv6Addr};
-use std::hash::{Hash, Hasher};
-use std::str::{FromStr};
 use std::collections::{HashMap, HashSet};
-use std::fmt::{Display, Formatter};
-use std::path::{PathBuf};
-use std::fmt;
-use std::fs;
-use std::io::{Read, Write};
-use util::hash::*;
-use util::UtilError;
+use std::fmt::{self, Display, Formatter};
+use std::hash::{Hash, Hasher};
+use std::net::{SocketAddr, ToSocketAddrs, SocketAddrV4, SocketAddrV6, Ipv4Addr, Ipv6Addr};
+use std::path::PathBuf;
+use std::str::FromStr;
+use std::{fs, mem, slice};
+use ethereum_types::H512;
 use rlp::*;
-use time::Tm;
-use error::NetworkError;
-use {AllowIP, IpFilter};
+use network::{Error, ErrorKind, AllowIP, IpFilter};
 use discovery::{TableUpdates, NodeEntry};
 use ip_utils::*;
-pub use rustc_serialize::json::Json;
+use serde_json;
 
 /// Node public key
 pub type NodeId = H512;
@@ -58,7 +51,7 @@ impl NodeEndpoint {
 	pub fn is_allowed(&self, filter: &IpFilter) -> bool {
 		(self.is_allowed_by_predefined(&filter.predefined) || filter.custom_allow.iter().any(|ipnet| {
 			self.address.ip().is_within(ipnet)
-		})) 
+		}))
 		&& !filter.custom_block.iter().any(|ipnet| {
 			self.address.ip().is_within(ipnet)
 		})
@@ -81,7 +74,7 @@ impl NodeEndpoint {
 			4 => Ok(SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(addr_bytes[0], addr_bytes[1], addr_bytes[2], addr_bytes[3]), tcp_port))),
 			16 => unsafe {
 				let o: *const u16 = mem::transmute(addr_bytes.as_ptr());
-				let o = from_raw_parts(o, 8);
+				let o = slice::from_raw_parts(o, 8);
 				Ok(SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::new(o[0], o[1], o[2], o[3], o[4], o[5], o[6], o[7]), tcp_port, 0, 0)))
 			},
 			_ => Err(DecoderError::RlpInconsistentLengthAndData)
@@ -96,7 +89,7 @@ impl NodeEndpoint {
 			}
 			SocketAddr::V6(a) => unsafe {
 				let o: *const u8 = mem::transmute(a.ip().segments().as_ptr());
-				rlp.append(&from_raw_parts(o, 16));
+				rlp.append(&slice::from_raw_parts(o, 16));
 			}
 		};
 		rlp.append(&self.udp_port);
@@ -108,6 +101,7 @@ impl NodeEndpoint {
 		self.to_rlp(rlp);
 	}
 
+	/// Validates that the port is not 0 and address IP is specified
 	pub fn is_valid(&self) -> bool {
 		self.udp_port != 0 && self.address.port() != 0 &&
 		match self.address {
@@ -118,18 +112,18 @@ impl NodeEndpoint {
 }
 
 impl FromStr for NodeEndpoint {
-	type Err = NetworkError;
+	type Err = Error;
 
 	/// Create endpoint from string. Performs name resolution if given a host name.
-	fn from_str(s: &str) -> Result<NodeEndpoint, NetworkError> {
+	fn from_str(s: &str) -> Result<NodeEndpoint, Error> {
 		let address = s.to_socket_addrs().map(|mut i| i.next());
 		match address {
 			Ok(Some(a)) => Ok(NodeEndpoint {
 				address: a,
 				udp_port: a.port()
 			}),
-			Ok(_) => Err(NetworkError::AddressResolve(None)),
-			Err(e) => Err(NetworkError::AddressResolve(Some(e)))
+			Ok(_) => Err(ErrorKind::AddressResolve(None).into()),
+			Err(e) => Err(ErrorKind::AddressResolve(Some(e)).into())
 		}
 	}
 }
@@ -144,18 +138,30 @@ pub struct Node {
 	pub id: NodeId,
 	pub endpoint: NodeEndpoint,
 	pub peer_type: PeerType,
+	pub attempts: u32,
 	pub failures: u32,
-	pub last_attempted: Option<Tm>,
 }
 
+const DEFAULT_FAILURE_PERCENTAGE: usize = 50;
+
 impl Node {
 	pub fn new(id: NodeId, endpoint: NodeEndpoint) -> Node {
 		Node {
 			id: id,
 			endpoint: endpoint,
 			peer_type: PeerType::Optional,
+			attempts: 0,
 			failures: 0,
-			last_attempted: None,
+		}
+	}
+
+	/// Returns the node's failure percentage (0..100) in buckets of 5%. If there are 0 connection attempts for this
+	/// node the default failure percentage is returned (50%).
+	pub fn failure_percentage(&self) -> usize {
+		if self.attempts == 0 {
+			DEFAULT_FAILURE_PERCENTAGE
+		} else {
+			(self.failures * 100 / self.attempts / 5 * 5) as usize
 		}
 	}
 }
@@ -172,10 +178,10 @@ impl Display for Node {
 }
 
 impl FromStr for Node {
-	type Err = NetworkError;
+	type Err = Error;
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		let (id, endpoint) = if s.len() > 136 && &s[0..8] == "enode://" && &s[136..137] == "@" {
-			(s[8..136].parse().map_err(UtilError::from)?, NodeEndpoint::from_str(&s[137..])?)
+			(s[8..136].parse().map_err(|_| ErrorKind::InvalidNodeId)?, NodeEndpoint::from_str(&s[137..])?)
 		}
 		else {
 			(NodeId::new(), NodeEndpoint::from_str(s)?)
@@ -185,7 +191,7 @@ impl FromStr for Node {
 			id: id,
 			endpoint: endpoint,
 			peer_type: PeerType::Optional,
-			last_attempted: None,
+			attempts: 0,
 			failures: 0,
 		})
 	}
@@ -204,6 +210,9 @@ impl Hash for Node {
 	}
 }
 
+const MAX_NODES: usize = 1024;
+const NODES_FILE: &str = "nodes.json";
+
 /// Node table backed by disk file.
 pub struct NodeTable {
 	nodes: HashMap<NodeId, Node>,
@@ -222,23 +231,46 @@ impl NodeTable {
 
 	/// Add a node to table
 	pub fn add_node(&mut self, mut node: Node) {
-		// preserve failure counter
-		let failures = self.nodes.get(&node.id).map_or(0, |n| n.failures);
+		// preserve attempts and failure counter
+		let (attempts, failures) =
+			self.nodes.get(&node.id).map_or((0, 0), |n| (n.attempts, n.failures));
+
+		node.attempts = attempts;
 		node.failures = failures;
+
 		self.nodes.insert(node.id.clone(), node);
 	}
 
-	/// Returns node ids sorted by number of failures
+	fn ordered_entries(&self) -> Vec<&Node> {
+		let mut refs: Vec<&Node> = self.nodes.values()
+			.filter(|n| !self.useless_nodes.contains(&n.id))
+			.collect();
+
+		refs.sort_by(|a, b| {
+			a.failure_percentage().cmp(&b.failure_percentage())
+				.then_with(|| a.failures.cmp(&b.failures))
+				.then_with(|| b.attempts.cmp(&a.attempts)) // we use reverse ordering for number of attempts
+		});
+
+		refs
+	}
+
+	/// Returns node ids sorted by failure percentage, for nodes with the same failure percentage the absolute number of
+	/// failures is considered.
 	pub fn nodes(&self, filter: IpFilter) -> Vec<NodeId> {
-		let mut refs: Vec<&Node> = self.nodes.values().filter(|n| !self.useless_nodes.contains(&n.id) && n.endpoint.is_allowed(&filter)).collect();
-		refs.sort_by(|a, b| a.failures.cmp(&b.failures));
-		refs.iter().map(|n| n.id.clone()).collect()
+		self.ordered_entries().iter()
+			.filter(|n| n.endpoint.is_allowed(&filter))
+			.map(|n| n.id)
+			.collect()
 	}
 
-	/// Unordered list of all entries
-	pub fn unordered_entries(&self) -> Vec<NodeEntry> {
-		// preserve failure counter
-		self.nodes.values().map(|n| NodeEntry { endpoint: n.endpoint.clone(), id: n.id.clone() }).collect()
+	/// Ordered list of all entries by failure percentage, for nodes with the same failure percentage the absolute
+	/// number of failures is considered.
+	pub fn entries(&self) -> Vec<NodeEntry> {
+		self.ordered_entries().iter().map(|n| NodeEntry {
+			endpoint: n.endpoint.clone(),
+			id: n.id.clone(),
+		}).collect()
 	}
 
 	/// Get particular node
@@ -254,7 +286,7 @@ impl NodeTable {
 	/// Apply table changes coming from discovery
 	pub fn update(&mut self, mut update: TableUpdates, reserved: &HashSet<NodeId>) {
 		for (_, node) in update.added.drain() {
-			let mut entry = self.nodes.entry(node.id.clone()).or_insert_with(|| Node::new(node.id.clone(), node.endpoint.clone()));
+			let entry = self.nodes.entry(node.id.clone()).or_insert_with(|| Node::new(node.id.clone(), node.endpoint.clone()));
 			entry.endpoint = node.endpoint;
 		}
 		for r in update.removed {
@@ -271,7 +303,7 @@ impl NodeTable {
 		}
 	}
 
-	/// Mark as useless, no furter attempts to connect until next call to `clear_useless`.
+	/// Mark as useless, no further attempts to connect until next call to `clear_useless`.
 	pub fn mark_as_useless(&mut self, id: &NodeId) {
 		self.useless_nodes.insert(id.clone());
 	}
@@ -283,77 +315,62 @@ impl NodeTable {
 
 	/// Save the nodes.json file.
 	pub fn save(&self) {
-		if let Some(ref path) = self.path {
-			let mut path_buf = PathBuf::from(path);
-			if let Err(e) = fs::create_dir_all(path_buf.as_path()) {
-				warn!("Error creating node table directory: {:?}", e);
-				return;
-			};
-			path_buf.push("nodes.json");
-			let mut json = String::new();
-			json.push_str("{\n");
-			json.push_str("\"nodes\": [\n");
-			let node_ids = self.nodes(IpFilter::default());
-			for i in 0 .. node_ids.len() {
-				let node = self.nodes.get(&node_ids[i]).expect("self.nodes() only returns node IDs from self.nodes");
-				json.push_str(&format!("\t{{ \"url\": \"{}\", \"failures\": {} }}{}\n", node, node.failures, if i == node_ids.len() - 1 {""} else {","}))
-			}
-			json.push_str("]\n");
-			json.push_str("}");
-			let mut file = match fs::File::create(path_buf.as_path()) {
-				Ok(file) => file,
-				Err(e) => {
-					warn!("Error creating node table file: {:?}", e);
-					return;
+		let mut path = match self.path {
+			Some(ref path) => PathBuf::from(path),
+			None => return,
+		};
+		if let Err(e) = fs::create_dir_all(&path) {
+			warn!("Error creating node table directory: {:?}", e);
+			return;
+		}
+		path.push(NODES_FILE);
+		let node_ids = self.nodes(IpFilter::default());
+		let nodes = node_ids.into_iter()
+			.map(|id| self.nodes.get(&id).expect("self.nodes() only returns node IDs from self.nodes"))
+			.take(MAX_NODES)
+			.map(|node| node.clone())
+			.map(Into::into)
+			.collect();
+		let table = json::NodeTable { nodes };
+
+		match fs::File::create(&path) {
+			Ok(file) => {
+				if let Err(e) = serde_json::to_writer_pretty(file, &table) {
+					warn!("Error writing node table file: {:?}", e);
 				}
-			};
-			if let Err(e) = file.write(&json.into_bytes()) {
-				warn!("Error writing node table file: {:?}", e);
+			},
+			Err(e) => {
+				warn!("Error creating node table file: {:?}", e);
 			}
 		}
 	}
 
 	fn load(path: Option<String>) -> HashMap<NodeId, Node> {
-		let mut nodes: HashMap<NodeId, Node> = HashMap::new();
-		if let Some(path) = path {
-			let mut path_buf = PathBuf::from(path);
-			path_buf.push("nodes.json");
-			let mut file = match fs::File::open(path_buf.as_path()) {
-				Ok(file) => file,
-				Err(e) => {
-					debug!("Error opening node table file: {:?}", e);
-					return nodes;
-				}
-			};
-			let mut buf = String::new();
-			match file.read_to_string(&mut buf) {
-				Ok(_) => {},
-				Err(e) => {
-					warn!("Error reading node table file: {:?}", e);
-					return nodes;
-				}
-			}
-			let json = match Json::from_str(&buf) {
-				Ok(json) => json,
-				Err(e) => {
-					warn!("Error parsing node table file: {:?}", e);
-					return nodes;
-				}
-			};
-			if let Some(list) = json.as_object().and_then(|o| o.get("nodes")).and_then(|n| n.as_array()) {
-				for n in list.iter().filter_map(|n| n.as_object()) {
-					if let Some(url) = n.get("url").and_then(|u| u.as_string()) {
-						if let Ok(mut node) = Node::from_str(url) {
-							if let Some(failures) = n.get("failures").and_then(|f| f.as_u64()) {
-								node.failures = failures as u32;
-							}
-							nodes.insert(node.id.clone(), node);
-						}
-					}
-				}
-			}
+		let path = match path {
+			Some(path) => PathBuf::from(path).join(NODES_FILE),
+			None => return Default::default(),
+		};
+
+		let file = match fs::File::open(&path) {
+			Ok(file) => file,
+			Err(e) => {
+				debug!("Error opening node table file: {:?}", e);
+				return Default::default();
+			},
+		};
+		let res: Result<json::NodeTable, _> = serde_json::from_reader(file);
+		match res {
+			Ok(table) => {
+				table.nodes.into_iter()
+					.filter_map(|n| n.into_node())
+					.map(|n| (n.id.clone(), n))
+					.collect()
+			},
+			Err(e) => {
+				warn!("Error reading node table file: {:?}", e);
+				Default::default()
+			},
 		}
-		nodes
 	}
 }
 
@@ -364,18 +381,59 @@ impl Drop for NodeTable {
 }
 
 /// Check if node url is valid
-pub fn is_valid_node_url(url: &str) -> bool {
-	use std::str::FromStr;
-	Node::from_str(url).is_ok()
+pub fn validate_node_url(url: &str) -> Option<Error> {
+	match Node::from_str(url) {
+		Ok(_) => None,
+		Err(e) => Some(e)
+	}
+}
+
+mod json {
+	use super::*;
+
+	#[derive(Serialize, Deserialize)]
+	pub struct NodeTable {
+		pub nodes: Vec<Node>,
+	}
+
+	#[derive(Serialize, Deserialize)]
+	pub struct Node {
+		pub url: String,
+		pub attempts: u32,
+		pub failures: u32,
+	}
+
+	impl Node {
+		pub fn into_node(self) -> Option<super::Node> {
+			match super::Node::from_str(&self.url) {
+				Ok(mut node) => {
+					node.attempts = self.attempts;
+					node.failures = self.failures;
+					Some(node)
+				},
+				_ => None,
+			}
+		}
+	}
+
+	impl<'a> From<&'a super::Node> for Node {
+		fn from(node: &'a super::Node) -> Self {
+			Node {
+				url: format!("{}", node),
+				attempts: node.attempts,
+				failures: node.failures,
+			}
+		}
+	}
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
 	use std::net::{SocketAddr, SocketAddrV4, Ipv4Addr};
-	use util::H512;
+	use ethereum_types::H512;
 	use std::str::FromStr;
-	use devtools::*;
+	use tempdir::TempDir;
 	use ipnetwork::IpNetwork;
 
 	#[test]
@@ -391,7 +449,7 @@ mod tests {
 
 	#[test]
 	fn node_parse() {
-		assert!(is_valid_node_url("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770"));
+		assert!(validate_node_url("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770").is_none());
 		let node = Node::from_str("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770");
 		assert!(node.is_ok());
 		let node = node.unwrap();
@@ -406,44 +464,63 @@ mod tests {
 	}
 
 	#[test]
-	fn table_failure_order() {
+	fn table_failure_percentage_order() {
 		let node1 = Node::from_str("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770").unwrap();
 		let node2 = Node::from_str("enode://b979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770").unwrap();
 		let node3 = Node::from_str("enode://c979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770").unwrap();
+		let node4 = Node::from_str("enode://d979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770").unwrap();
 		let id1 = H512::from_str("a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c").unwrap();
 		let id2 = H512::from_str("b979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c").unwrap();
 		let id3 = H512::from_str("c979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c").unwrap();
+		let id4 = H512::from_str("d979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c").unwrap();
 		let mut table = NodeTable::new(None);
-		table.add_node(node3);
+
 		table.add_node(node1);
 		table.add_node(node2);
+		table.add_node(node3);
+		table.add_node(node4);
 
+		// node 1 - failure percentage 100%
+		table.get_mut(&id1).unwrap().attempts = 2;
 		table.note_failure(&id1);
 		table.note_failure(&id1);
+
+		// node2 - failure percentage 33%
+		table.get_mut(&id2).unwrap().attempts = 3;
 		table.note_failure(&id2);
 
+		// node3 - failure percentage 0%
+		table.get_mut(&id3).unwrap().attempts = 1;
+
+		// node4 - failure percentage 50% (default when no attempts)
+
 		let r = table.nodes(IpFilter::default());
+
 		assert_eq!(r[0][..], id3[..]);
 		assert_eq!(r[1][..], id2[..]);
-		assert_eq!(r[2][..], id1[..]);
+		assert_eq!(r[2][..], id4[..]);
+		assert_eq!(r[3][..], id1[..]);
 	}
 
 	#[test]
 	fn table_save_load() {
-		let temp_path = RandomTempPath::create_dir();
+		let tempdir = TempDir::new("").unwrap();
 		let node1 = Node::from_str("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770").unwrap();
 		let node2 = Node::from_str("enode://b979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@22.99.55.44:7770").unwrap();
 		let id1 = H512::from_str("a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c").unwrap();
 		let id2 = H512::from_str("b979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c").unwrap();
 		{
-			let mut table = NodeTable::new(Some(temp_path.as_path().to_str().unwrap().to_owned()));
+			let mut table = NodeTable::new(Some(tempdir.path().to_str().unwrap().to_owned()));
 			table.add_node(node1);
 			table.add_node(node2);
+
+			table.get_mut(&id1).unwrap().attempts = 1;
+			table.get_mut(&id2).unwrap().attempts = 1;
 			table.note_failure(&id2);
 		}
 
 		{
-			let table = NodeTable::new(Some(temp_path.as_path().to_str().unwrap().to_owned()));
+			let table = NodeTable::new(Some(tempdir.path().to_str().unwrap().to_owned()));
 			let r = table.nodes(IpFilter::default());
 			assert_eq!(r[0][..], id1[..]);
 			assert_eq!(r[1][..], id2[..]);
diff --git a/util/network/src/service.rs b/util/network-devp2p/src/service.rs
similarity index 90%
rename from util/network/src/service.rs
rename to util/network-devp2p/src/service.rs
index bce31e00aa3ef3c4c21ba2b04642d708b0356e8c..95867f8eb0abc5efec984f0ff59e31099be52178 100644
--- a/util/network/src/service.rs
+++ b/util/network-devp2p/src/service.rs
@@ -14,9 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use {NetworkProtocolHandler, NetworkConfiguration, NonReservedPeerMode};
-use error::NetworkError;
-use host::{Host, NetworkContext, NetworkIoMessage, PeerId, ProtocolId};
+use network::{Error, NetworkConfiguration, NetworkProtocolHandler, NonReservedPeerMode};
+use network::{NetworkContext, PeerId, ProtocolId, NetworkIoMessage};
+use host::Host;
 use stats::NetworkStats;
 use io::*;
 use parking_lot::RwLock;
@@ -54,15 +54,14 @@ pub struct NetworkService {
 
 impl NetworkService {
 	/// Starts IO event loop
-	pub fn new(config: NetworkConfiguration, filter: Option<Arc<ConnectionFilter>>) -> Result<NetworkService, NetworkError> {
+	pub fn new(config: NetworkConfiguration, filter: Option<Arc<ConnectionFilter>>) -> Result<NetworkService, Error> {
 		let host_handler = Arc::new(HostHandler { public_url: RwLock::new(None) });
 		let io_service = IoService::<NetworkIoMessage>::start()?;
 
 		let stats = Arc::new(NetworkStats::new());
-		let host_info = Host::client_version();
 		Ok(NetworkService {
 			io_service: io_service,
-			host_info: host_info,
+			host_info: config.client_version.clone(),
 			stats: stats,
 			host: RwLock::new(None),
 			config: config,
@@ -72,7 +71,7 @@ impl NetworkService {
 	}
 
 	/// Regiter a new protocol handler with the event loop.
-	pub fn register_protocol(&self, handler: Arc<NetworkProtocolHandler + Send + Sync>, protocol: ProtocolId, packet_count: u8, versions: &[u8]) -> Result<(), NetworkError> {
+	pub fn register_protocol(&self, handler: Arc<NetworkProtocolHandler + Send + Sync>, protocol: ProtocolId, packet_count: u8, versions: &[u8]) -> Result<(), Error> {
 		self.io_service.send_message(NetworkIoMessage::AddHandler {
 			handler: handler,
 			protocol: protocol,
@@ -115,7 +114,7 @@ impl NetworkService {
 	}
 
 	/// Start network IO
-	pub fn start(&self) -> Result<(), NetworkError> {
+	pub fn start(&self) -> Result<(), Error> {
 		let mut host = self.host.write();
 		if host.is_none() {
 			let h = Arc::new(Host::new(self.config.clone(), self.stats.clone(), self.filter.clone())?);
@@ -131,7 +130,7 @@ impl NetworkService {
 	}
 
 	/// Stop network IO
-	pub fn stop(&self) -> Result<(), NetworkError> {
+	pub fn stop(&self) -> Result<(), Error> {
 		let mut host = self.host.write();
 		if let Some(ref host) = *host {
 			let io = IoContext::new(self.io_service.channel(), 0); //TODO: take token id from host
@@ -147,7 +146,7 @@ impl NetworkService {
 	}
 
 	/// Try to add a reserved peer.
-	pub fn add_reserved_peer(&self, peer: &str) -> Result<(), NetworkError> {
+	pub fn add_reserved_peer(&self, peer: &str) -> Result<(), Error> {
 		let host = self.host.read();
 		if let Some(ref host) = *host {
 			host.add_reserved_node(peer)
@@ -157,7 +156,7 @@ impl NetworkService {
 	}
 
 	/// Try to remove a reserved peer.
-	pub fn remove_reserved_peer(&self, peer: &str) -> Result<(), NetworkError> {
+	pub fn remove_reserved_peer(&self, peer: &str) -> Result<(), Error> {
 		let host = self.host.read();
 		if let Some(ref host) = *host {
 			host.remove_reserved_node(peer)
diff --git a/util/network/src/session.rs b/util/network-devp2p/src/session.rs
similarity index 71%
rename from util/network/src/session.rs
rename to util/network-devp2p/src/session.rs
index 8affb4cf75ad8bba5139bac1b1cf05407c24ab7b..39c96c063e09865b533ba0c5d1df282c08d203ff 100644
--- a/util/network/src/session.rs
+++ b/util/network-devp2p/src/session.rs
@@ -16,27 +16,30 @@
 
 use std::{str, io};
 use std::net::SocketAddr;
-use std::cmp::Ordering;
 use std::sync::*;
 use std::collections::HashMap;
+use std::time::{Duration, Instant};
 
 use mio::*;
 use mio::deprecated::{Handler, EventLoop};
 use mio::tcp::*;
-use util::hash::*;
+use ethereum_types::H256;
 use rlp::*;
-use connection::{EncryptedConnection, Packet, Connection};
+use connection::{EncryptedConnection, Packet, Connection, MAX_PAYLOAD_SIZE};
 use handshake::Handshake;
 use io::{IoContext, StreamToken};
-use error::{NetworkError, DisconnectReason};
+use network::{Error, ErrorKind, DisconnectReason, SessionInfo, ProtocolId, PeerCapabilityInfo};
+use network::{SessionCapabilityInfo, HostInfo as HostInfoTrait};
 use host::*;
 use node_table::NodeId;
 use stats::NetworkStats;
-use time;
+use snappy;
 
 // Timeout must be less than (interval - 1).
 const PING_TIMEOUT_SEC: u64 = 60;
 const PING_INTERVAL_SEC: u64 = 120;
+const MIN_PROTOCOL_VERSION: u32 = 4;
+const MIN_COMPRESSION_PROTOCOL_VERSION: u32 = 5;
 
 #[derive(Debug, Clone)]
 enum ProtocolState {
@@ -56,11 +59,12 @@ pub struct Session {
 	had_hello: bool,
 	/// Session is no longer active flag.
 	expired: bool,
-	ping_time_ns: u64,
-	pong_time_ns: Option<u64>,
+	ping_time: Instant,
+	pong_time: Option<Instant>,
 	state: State,
 	// Protocol states -- accumulates pending packets until signaled as ready.
 	protocol_states: HashMap<ProtocolId, ProtocolState>,
+	compression: bool,
 }
 
 enum State {
@@ -86,81 +90,6 @@ pub enum SessionData {
 	Continue,
 }
 
-/// Shared session information
-#[derive(Debug, Clone)]
-pub struct SessionInfo {
-	/// Peer public key
-	pub id: Option<NodeId>,
-	/// Peer client ID
-	pub client_version: String,
-	/// Peer RLPx protocol version
-	pub protocol_version: u32,
-	/// Session protocol capabilities
-	pub capabilities: Vec<SessionCapabilityInfo>,
-	/// Peer protocol capabilities
-	pub peer_capabilities: Vec<PeerCapabilityInfo>,
-	/// Peer ping delay in milliseconds
-	pub ping_ms: Option<u64>,
-	/// True if this session was originated by us.
-	pub originated: bool,
-	/// Remote endpoint address of the session
-	pub remote_address: String,
-	/// Local endpoint address of the session
-	pub local_address: String,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct PeerCapabilityInfo {
-	pub protocol: ProtocolId,
-	pub version: u8,
-}
-
-impl Decodable for PeerCapabilityInfo {
-	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
-		let p: Vec<u8> = rlp.val_at(0)?;
-		if p.len() != 3 {
-			return Err(DecoderError::Custom("Invalid subprotocol string length. Should be 3"));
-		}
-		let mut p2: ProtocolId = [0u8; 3];
-		p2.clone_from_slice(&p);
-		Ok(PeerCapabilityInfo {
-			protocol: p2,
-			version: rlp.val_at(1)?
-		})
-	}
-}
-
-impl ToString for PeerCapabilityInfo {
-	fn to_string(&self) -> String {
-		format!("{}/{}", str::from_utf8(&self.protocol[..]).unwrap_or("???"), self.version)
-	}
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SessionCapabilityInfo {
-	pub protocol: [u8; 3],
-	pub version: u8,
-	pub packet_count: u8,
-	pub id_offset: u8,
-}
-
-impl PartialOrd for SessionCapabilityInfo {
-	fn partial_cmp(&self, other: &SessionCapabilityInfo) -> Option<Ordering> {
-		Some(self.cmp(other))
-	}
-}
-
-impl Ord for SessionCapabilityInfo {
-	fn cmp(&self, b: &SessionCapabilityInfo) -> Ordering {
-		// By protocol id first
-		if self.protocol != b.protocol {
-			return self.protocol.cmp(&b.protocol);
-		}
-		// By version
-		self.version.cmp(&b.version)
-	}
-}
-
 const PACKET_HELLO: u8 = 0x80;
 const PACKET_DISCONNECT: u8 = 0x01;
 const PACKET_PING: u8 = 0x02;
@@ -174,7 +103,7 @@ impl Session {
 	/// Create a new session out of comepleted handshake. This clones the handshake connection object
 	/// and leaves the handhsake in limbo to be deregistered from the event loop.
 	pub fn new<Message>(io: &IoContext<Message>, socket: TcpStream, token: StreamToken, id: Option<&NodeId>,
-		nonce: &H256, stats: Arc<NetworkStats>, host: &HostInfo) -> Result<Session, NetworkError>
+		nonce: &H256, stats: Arc<NetworkStats>, host: &HostInfo) -> Result<Session, Error>
 		where Message: Send + Clone + Sync + 'static {
 		let originated = id.is_some();
 		let mut handshake = Handshake::new(token, id, socket, nonce, stats).expect("Can't create handshake");
@@ -194,14 +123,15 @@ impl Session {
 				remote_address: "Handshake".to_owned(),
 				local_address: local_addr,
 			},
-			ping_time_ns: 0,
-			pong_time_ns: None,
+			ping_time: Instant::now(),
+			pong_time: None,
 			expired: false,
 			protocol_states: HashMap::new(),
+			compression: false,
 		})
 	}
 
-	fn complete_handshake<Message>(&mut self, io: &IoContext<Message>, host: &HostInfo) -> Result<(), NetworkError> where Message: Send + Sync + Clone {
+	fn complete_handshake<Message>(&mut self, io: &IoContext<Message>, host: &HostInfo) -> Result<(), Error> where Message: Send + Sync + Clone {
 		let connection = if let State::Handshake(ref mut h) = self.state {
 			self.info.id = Some(h.id.clone());
 			self.info.remote_address = h.connection.remote_addr_str();
@@ -211,7 +141,6 @@ impl Session {
 		};
 		self.state = State::Session(connection);
 		self.write_hello(io, host)?;
-		self.send_ping(io)?;
 		Ok(())
 	}
 
@@ -256,7 +185,7 @@ impl Session {
 	}
 
 	/// Readable IO handler. Returns packet data if available.
-	pub fn readable<Message>(&mut self, io: &IoContext<Message>, host: &HostInfo) -> Result<SessionData, NetworkError>  where Message: Send + Sync + Clone {
+	pub fn readable<Message>(&mut self, io: &IoContext<Message>, host: &HostInfo) -> Result<SessionData, Error>  where Message: Send + Sync + Clone {
 		if self.expired() {
 			return Ok(SessionData::None)
 		}
@@ -287,7 +216,7 @@ impl Session {
 	}
 
 	/// Writable IO handler. Sends pending packets.
-	pub fn writable<Message>(&mut self, io: &IoContext<Message>, _host: &HostInfo) -> Result<(), NetworkError> where Message: Send + Sync + Clone {
+	pub fn writable<Message>(&mut self, io: &IoContext<Message>, _host: &HostInfo) -> Result<(), Error> where Message: Send + Sync + Clone {
 		match self.state {
 			State::Handshake(ref mut h) => h.writable(io),
 			State::Session(ref mut s) => s.writable(io),
@@ -305,7 +234,7 @@ impl Session {
 	}
 
 	/// Register the session socket with the event loop
-	pub fn register_socket<Host:Handler<Timeout = Token>>(&self, reg: Token, event_loop: &mut EventLoop<Host>) -> Result<(), NetworkError> {
+	pub fn register_socket<Host:Handler<Timeout = Token>>(&self, reg: Token, event_loop: &mut EventLoop<Host>) -> Result<(), Error> {
 		if self.expired() {
 			return Ok(());
 		}
@@ -314,40 +243,55 @@ impl Session {
 	}
 
 	/// Update registration with the event loop. Should be called at the end of the IO handler.
-	pub fn update_socket<Host:Handler>(&self, reg:Token, event_loop: &mut EventLoop<Host>) -> Result<(), NetworkError> {
+	pub fn update_socket<Host:Handler>(&self, reg:Token, event_loop: &mut EventLoop<Host>) -> Result<(), Error> {
 		self.connection().update_socket(reg, event_loop)?;
 		Ok(())
 	}
 
 	/// Delete registration
-	pub fn deregister_socket<Host:Handler>(&self, event_loop: &mut EventLoop<Host>) -> Result<(), NetworkError> {
+	pub fn deregister_socket<Host:Handler>(&self, event_loop: &mut EventLoop<Host>) -> Result<(), Error> {
 		self.connection().deregister_socket(event_loop)?;
 		Ok(())
 	}
 
 	/// Send a protocol packet to peer.
-	pub fn send_packet<Message>(&mut self, io: &IoContext<Message>, protocol: [u8; 3], packet_id: u8, data: &[u8]) -> Result<(), NetworkError>
+	pub fn send_packet<Message>(&mut self, io: &IoContext<Message>, protocol: Option<[u8; 3]>, packet_id: u8, data: &[u8]) -> Result<(), Error>
         where Message: Send + Sync + Clone {
-		if self.info.capabilities.is_empty() || !self.had_hello {
-			debug!(target: "network", "Sending to unconfirmed session {}, protocol: {}, packet: {}", self.token(), str::from_utf8(&protocol[..]).unwrap_or("??"), packet_id);
-			return Err(From::from(NetworkError::BadProtocol));
+		if protocol.is_some() && (self.info.capabilities.is_empty() || !self.had_hello) {
+			debug!(target: "network", "Sending to unconfirmed session {}, protocol: {:?}, packet: {}", self.token(), protocol.as_ref().map(|p| str::from_utf8(&p[..]).unwrap_or("??")), packet_id);
+			bail!(ErrorKind::BadProtocol);
 		}
 		if self.expired() {
-			return Err(From::from(NetworkError::Expired));
+			return Err(ErrorKind::Expired.into());
 		}
 		let mut i = 0usize;
-		while protocol != self.info.capabilities[i].protocol {
-			i += 1;
-			if i == self.info.capabilities.len() {
-				debug!(target: "network", "Unknown protocol: {:?}", protocol);
-				return Ok(())
-			}
-		}
-		let pid = self.info.capabilities[i].id_offset + packet_id;
+		let pid = match protocol {
+			Some(protocol) => {
+				while protocol != self.info.capabilities[i].protocol {
+					i += 1;
+					if i == self.info.capabilities.len() {
+						debug!(target: "network", "Unknown protocol: {:?}", protocol);
+						return Ok(())
+					}
+				}
+				self.info.capabilities[i].id_offset + packet_id
+			},
+			None => packet_id
+		};
 		let mut rlp = RlpStream::new();
 		rlp.append(&(pid as u32));
-		rlp.append_raw(data, 1);
-		self.send(io, rlp)
+		let mut compressed = Vec::new();
+		let mut payload = data; // create a reference with local lifetime
+		if self.compression {
+			if payload.len() > MAX_PAYLOAD_SIZE {
+				bail!(ErrorKind::OversizedPacket);
+			}
+			let len = snappy::compress_into(&payload, &mut compressed);
+			trace!(target: "network", "compressed {} to {}", payload.len(), len);
+			payload = &compressed[0..len];
+		}
+		rlp.append_raw(payload, 1);
+		self.send(io, &rlp.drain())
 	}
 
 	/// Keep this session alive. Returns false if ping timeout happened
@@ -355,13 +299,13 @@ impl Session {
 		if let State::Handshake(_) = self.state {
 			return true;
 		}
-		let timed_out = if let Some(pong) = self.pong_time_ns {
-			pong - self.ping_time_ns > PING_TIMEOUT_SEC * 1000_000_000
+		let timed_out = if let Some(pong) = self.pong_time {
+			pong.duration_since(self.ping_time) > Duration::from_secs(PING_TIMEOUT_SEC)
 		} else {
-			time::precise_time_ns() - self.ping_time_ns > PING_TIMEOUT_SEC * 1000_000_000
+			self.ping_time.elapsed() > Duration::from_secs(PING_TIMEOUT_SEC)
 		};
 
-		if !timed_out && time::precise_time_ns() - self.ping_time_ns > PING_INTERVAL_SEC * 1000_000_000 {
+		if !timed_out && self.ping_time.elapsed() > Duration::from_secs(PING_INTERVAL_SEC) {
 			if let Err(e) = self.send_ping(io) {
 				debug!("Error sending ping message: {:?}", e);
 			}
@@ -387,37 +331,48 @@ impl Session {
 		}
 	}
 
-	fn read_packet<Message>(&mut self, io: &IoContext<Message>, packet: Packet, host: &HostInfo) -> Result<SessionData, NetworkError>
+	fn read_packet<Message>(&mut self, io: &IoContext<Message>, packet: Packet, host: &HostInfo) -> Result<SessionData, Error>
 	where Message: Send + Sync + Clone {
 		if packet.data.len() < 2 {
-			return Err(From::from(NetworkError::BadProtocol));
+			return Err(ErrorKind::BadProtocol.into());
 		}
 		let packet_id = packet.data[0];
 		if packet_id != PACKET_HELLO && packet_id != PACKET_DISCONNECT && !self.had_hello {
-			return Err(From::from(NetworkError::BadProtocol));
+			return Err(ErrorKind::BadProtocol.into());
 		}
+		let data = if self.compression {
+			let compressed = &packet.data[1..];
+			if snappy::decompressed_len(&compressed)? > MAX_PAYLOAD_SIZE {
+				bail!(ErrorKind::OversizedPacket);
+			}
+			snappy::decompress(&compressed)?
+		} else {
+			packet.data[1..].to_owned()
+		};
 		match packet_id {
 			PACKET_HELLO => {
-				let rlp = UntrustedRlp::new(&packet.data[1..]); //TODO: validate rlp expected size
+				let rlp = UntrustedRlp::new(&data); //TODO: validate rlp expected size
 				self.read_hello(io, &rlp, host)?;
 				Ok(SessionData::Ready)
 			},
 			PACKET_DISCONNECT => {
-				let rlp = UntrustedRlp::new(&packet.data[1..]);
+				let rlp = UntrustedRlp::new(&data);
 				let reason: u8 = rlp.val_at(0)?;
 				if self.had_hello {
 					debug!(target:"network", "Disconnected: {}: {:?}", self.token(), DisconnectReason::from_u8(reason));
 				}
-				Err(From::from(NetworkError::Disconnect(DisconnectReason::from_u8(reason))))
+				Err(ErrorKind::Disconnect(DisconnectReason::from_u8(reason)).into())
 			}
 			PACKET_PING => {
 				self.send_pong(io)?;
 				Ok(SessionData::Continue)
 			},
 			PACKET_PONG => {
-				let time = time::precise_time_ns();
-				self.pong_time_ns = Some(time);
-				self.info.ping_ms = Some((time - self.ping_time_ns) / 1000_000);
+				let time = Instant::now();
+				self.pong_time = Some(time);
+				let ping_elapsed = time.duration_since(self.ping_time);
+				self.info.ping_ms = Some(ping_elapsed.as_secs() * 1_000 +
+										ping_elapsed.subsec_nanos() as u64 / 1_000_000);
 				Ok(SessionData::Continue)
 			},
 			PACKET_GET_PEERS => Ok(SessionData::None), //TODO;
@@ -439,11 +394,11 @@ impl Session {
 				match *self.protocol_states.entry(protocol).or_insert_with(|| ProtocolState::Pending(Vec::new())) {
 					ProtocolState::Connected => {
 						trace!(target: "network", "Packet {} mapped to {:?}:{}, i={}, capabilities={:?}", packet_id, protocol, protocol_packet_id, i, self.info.capabilities);
-						Ok(SessionData::Packet { data: packet.data, protocol: protocol, packet_id: protocol_packet_id } )
+						Ok(SessionData::Packet { data: data, protocol: protocol, packet_id: protocol_packet_id } )
 					}
 					ProtocolState::Pending(ref mut pending) => {
 						trace!(target: "network", "Packet {} deferred until protocol connection event completion", packet_id);
-						pending.push((packet.data, protocol_packet_id));
+						pending.push((data, protocol_packet_id));
 
 						Ok(SessionData::Continue)
 					}
@@ -456,19 +411,19 @@ impl Session {
 		}
 	}
 
-	fn write_hello<Message>(&mut self, io: &IoContext<Message>, host: &HostInfo) -> Result<(), NetworkError> where Message: Send + Sync + Clone {
+	fn write_hello<Message>(&mut self, io: &IoContext<Message>, host: &HostInfo) -> Result<(), Error> where Message: Send + Sync + Clone {
 		let mut rlp = RlpStream::new();
 		rlp.append_raw(&[PACKET_HELLO as u8], 0);
 		rlp.begin_list(5)
 			.append(&host.protocol_version)
-			.append(&host.client_version)
+			.append(&host.client_version())
 			.append_list(&host.capabilities)
 			.append(&host.local_endpoint.address.port())
 			.append(host.id());
-		self.send(io, rlp)
+		self.send(io, &rlp.drain())
 	}
 
-	fn read_hello<Message>(&mut self, io: &IoContext<Message>, rlp: &UntrustedRlp, host: &HostInfo) -> Result<(), NetworkError>
+	fn read_hello<Message>(&mut self, io: &IoContext<Message>, rlp: &UntrustedRlp, host: &HostInfo) -> Result<(), Error>
 	where Message: Send + Sync + Clone {
 		let protocol = rlp.val_at::<u32>(0)?;
 		let client_version = rlp.val_at::<String>(1)?;
@@ -494,8 +449,7 @@ impl Session {
 		while i < caps.len() {
 			if caps.iter().any(|c| c.protocol == caps[i].protocol && c.version > caps[i].version) {
 				caps.remove(i);
-			}
-			else {
+			} else {
 				i += 1;
 			}
 		}
@@ -511,6 +465,7 @@ impl Session {
 			i += 1;
 		}
 		debug!(target: "network", "Hello: {} v{} {} {:?}", client_version, protocol, id, caps);
+		let protocol = ::std::cmp::min(protocol, host.protocol_version);
 		self.info.protocol_version = protocol;
 		self.info.client_version = client_version;
 		self.info.capabilities = caps;
@@ -519,52 +474,46 @@ impl Session {
 			trace!(target: "network", "No common capabilities with peer.");
 			return Err(From::from(self.disconnect(io, DisconnectReason::UselessPeer)));
 		}
-		if protocol != host.protocol_version {
+		if protocol < MIN_PROTOCOL_VERSION {
 			trace!(target: "network", "Peer protocol version mismatch: {}", protocol);
 			return Err(From::from(self.disconnect(io, DisconnectReason::UselessPeer)));
 		}
+		self.compression = protocol >= MIN_COMPRESSION_PROTOCOL_VERSION;
+		self.send_ping(io)?;
 		self.had_hello = true;
 		Ok(())
 	}
 
-	/// Senf ping packet
-	pub fn send_ping<Message>(&mut self, io: &IoContext<Message>) -> Result<(), NetworkError> where Message: Send + Sync + Clone {
-		self.send(io, Session::prepare(PACKET_PING)?)?;
-		self.ping_time_ns = time::precise_time_ns();
-		self.pong_time_ns = None;
+	/// Send ping packet
+	pub fn send_ping<Message>(&mut self, io: &IoContext<Message>) -> Result<(), Error> where Message: Send + Sync + Clone {
+		self.send_packet(io, None, PACKET_PING, &EMPTY_LIST_RLP)?;
+		self.ping_time = Instant::now();
+		self.pong_time = None;
 		Ok(())
 	}
 
-	fn send_pong<Message>(&mut self, io: &IoContext<Message>) -> Result<(), NetworkError> where Message: Send + Sync + Clone {
-		self.send(io, Session::prepare(PACKET_PONG)?)
+	fn send_pong<Message>(&mut self, io: &IoContext<Message>) -> Result<(), Error> where Message: Send + Sync + Clone {
+		self.send_packet(io, None, PACKET_PONG, &EMPTY_LIST_RLP)
 	}
 
 	/// Disconnect this session
-	pub fn disconnect<Message>(&mut self, io: &IoContext<Message>, reason: DisconnectReason) -> NetworkError where Message: Send + Sync + Clone {
+	pub fn disconnect<Message>(&mut self, io: &IoContext<Message>, reason: DisconnectReason) -> Error where Message: Send + Sync + Clone {
 		if let State::Session(_) = self.state {
 			let mut rlp = RlpStream::new();
-			rlp.append(&(PACKET_DISCONNECT as u32));
 			rlp.begin_list(1);
 			rlp.append(&(reason as u32));
-			self.send(io, rlp).ok();
+			self.send_packet(io, None, PACKET_DISCONNECT, &rlp.drain()).ok();
 		}
-		NetworkError::Disconnect(reason)
-	}
-
-	fn prepare(packet_id: u8) -> Result<RlpStream, NetworkError> {
-		let mut rlp = RlpStream::new();
-		rlp.append(&(packet_id as u32));
-		rlp.begin_list(0);
-		Ok(rlp)
+		ErrorKind::Disconnect(reason).into()
 	}
 
-	fn send<Message>(&mut self, io: &IoContext<Message>, rlp: RlpStream) -> Result<(), NetworkError> where Message: Send + Sync + Clone {
+	fn send<Message>(&mut self, io: &IoContext<Message>, data: &[u8]) -> Result<(), Error> where Message: Send + Sync + Clone {
 		match self.state {
 			State::Handshake(_) => {
 				warn!(target:"network", "Unexpected send request");
 			},
 			State::Session(ref mut s) => {
-				s.send_packet(io, &rlp.out())?
+				s.send_packet(io, data)?
 			},
 		}
 		Ok(())
diff --git a/util/network/src/stats.rs b/util/network-devp2p/src/stats.rs
similarity index 100%
rename from util/network/src/stats.rs
rename to util/network-devp2p/src/stats.rs
diff --git a/util/network/src/tests.rs b/util/network-devp2p/tests/tests.rs
similarity index 93%
rename from util/network/src/tests.rs
rename to util/network-devp2p/tests/tests.rs
index d743318abe4a41073049f943cc59cd9de043b0d0..e964a9a8b50ce210076aa0b6bc311ee60b05f86c 100644
--- a/util/network/src/tests.rs
+++ b/util/network-devp2p/tests/tests.rs
@@ -14,14 +14,26 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use super::*;
+#[macro_use]
+extern crate log;
+extern crate parking_lot;
+extern crate ethcore_bytes;
+extern crate ethcore_io as io;
+extern crate ethcore_logger;
+extern crate ethcore_network;
+extern crate ethcore_network_devp2p;
+extern crate ethkey;
+
 use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
 use std::sync::Arc;
 use std::thread;
 use std::time::*;
-use util::{Bytes, Mutex};
-use io::TimerToken;
+use parking_lot::Mutex;
+use ethcore_bytes::Bytes;
+use ethcore_network::*;
+use ethcore_network_devp2p::NetworkService;
 use ethkey::{Random, Generator};
+use io::TimerToken;
 
 pub struct TestProtocol {
 	drop_session: bool,
diff --git a/util/network/Cargo.toml b/util/network/Cargo.toml
index 2d571d6324f7a7f4de88dc866ee7b146a33fe09a..7f9b30400b5aac60b62a54013ae9d9e056f1de51 100644
--- a/util/network/Cargo.toml
+++ b/util/network/Cargo.toml
@@ -3,35 +3,15 @@ description = "Ethcore network library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-network"
-version = "1.8.0"
+version = "1.11.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-log = "0.3"
-mio = "0.6.8"
-bytes = "0.4"
-rand = "0.3.12"
-time = "0.1.34"
-tiny-keccak = "1.3"
-rust-crypto = "0.2.34"
-slab = "0.2"
-clippy = { version = "0.0.103", optional = true}
-igd = "0.6"
-libc = "0.2.7"
-parking_lot = "0.4"
-ansi_term = "0.9"
-rustc-hex = "1.0"
-rustc-serialize = "0.3"
 ethcore-io = { path = "../io" }
-ethcore-util = { path = ".." }
-ethcore-devtools = { path = "../../devtools" }
+ethereum-types = "0.2"
 ethkey = { path = "../../ethkey" }
 ethcrypto = { path = "../../ethcrypto" }
 rlp = { path = "../rlp" }
-path = { path = "../path" }
-ethcore-logger = { path ="../../logger" }
 ipnetwork = "0.12.6"
-
-[features]
-default = []
-dev = ["clippy"]
+snappy = { git = "https://github.com/paritytech/rust-snappy" }
+error-chain = { version = "0.11", default-features = false }
diff --git a/util/network/src/error.rs b/util/network/src/error.rs
index 11cf8fdf00f16ce11f4fed9efee735a9ab93f839..48bcf75965635d56ba568d7828d1c1b27574addf 100644
--- a/util/network/src/error.rs
+++ b/util/network/src/error.rs
@@ -14,12 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::{io, net, fmt};
 use io::IoError;
-use rlp::*;
-use util::UtilError;
-use std::fmt;
-use ethkey::Error as KeyError;
-use crypto::Error as CryptoError;
+use {rlp, ethkey, crypto, snappy};
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum DisconnectReason
@@ -83,95 +80,80 @@ impl fmt::Display for DisconnectReason {
 	}
 }
 
-#[derive(Debug)]
-/// Network error.
-pub enum NetworkError {
-	/// Authentication error.
-	Auth,
-	/// Unrecognised protocol.
-	BadProtocol,
-	/// Message expired.
-	Expired,
-	/// Peer not found.
-	PeerNotFound,
-	/// Peer is diconnected.
-	Disconnect(DisconnectReason),
-	/// Util error.
-	Util(UtilError),
-	/// Socket IO error.
-	Io(IoError),
-	/// Error concerning the network address parsing subsystem.
-	AddressParse(::std::net::AddrParseError),
-	/// Error concerning the network address resolution subsystem.
-	AddressResolve(Option<::std::io::Error>),
-	/// Error concerning the Rust standard library's IO subsystem.
-	StdIo(::std::io::Error),
-	/// Packet size is over the protocol limit.
-	OversizedPacket,
-}
+error_chain! {
+	foreign_links {
+		SocketIo(IoError) #[doc = "Socket IO error."];
+		Io(io::Error) #[doc = "Error concerning the Rust standard library's IO subsystem."];
+		AddressParse(net::AddrParseError) #[doc = "Error concerning the network address parsing subsystem."];
+		Decompression(snappy::InvalidInput) #[doc = "Decompression error."];
+	}
 
-impl fmt::Display for NetworkError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		use self::NetworkError::*;
+	errors {
+		#[doc = "Error concerning the network address resolution subsystem."]
+		AddressResolve(err: Option<io::Error>) {
+			description("Failed to resolve network address"),
+			display("Failed to resolve network address {}", err.as_ref().map_or("".to_string(), |e| e.to_string())),
+		}
 
-		let msg = match *self {
-			Auth => "Authentication failure".into(),
-			BadProtocol => "Bad protocol".into(),
-			Expired => "Expired message".into(),
-			PeerNotFound => "Peer not found".into(),
-			Disconnect(ref reason) => format!("Peer disconnected: {}", reason),
-			Io(ref err) => format!("Socket I/O error: {}", err),
-			AddressParse(ref err) => format!("{}", err),
-			AddressResolve(Some(ref err)) => format!("{}", err),
-			AddressResolve(_) => "Failed to resolve network address.".into(),
-			StdIo(ref err) => format!("{}", err),
-			Util(ref err) => format!("{}", err),
-			OversizedPacket => "Packet is too large".into(),
-		};
+		#[doc = "Authentication failure"]
+		Auth {
+			description("Authentication failure"),
+			display("Authentication failure"),
+		}
 
-		f.write_fmt(format_args!("Network error ({})", msg))
-	}
-}
+		#[doc = "Unrecognised protocol"]
+		BadProtocol {
+			description("Bad protocol"),
+			display("Bad protocol"),
+		}
 
-impl From<DecoderError> for NetworkError {
-	fn from(_err: DecoderError) -> NetworkError {
-		NetworkError::Auth
-	}
-}
+		#[doc = "Expired message"]
+		Expired {
+			description("Expired message"),
+			display("Expired message"),
+		}
 
-impl From<::std::io::Error> for NetworkError {
-	fn from(err: ::std::io::Error) -> NetworkError {
-		NetworkError::StdIo(err)
-	}
-}
+		#[doc = "Peer not found"]
+		PeerNotFound {
+			description("Peer not found"),
+			display("Peer not found"),
+		}
 
-impl From<IoError> for NetworkError {
-	fn from(err: IoError) -> NetworkError {
-		NetworkError::Io(err)
-	}
-}
+		#[doc = "Peer is disconnected"]
+		Disconnect(reason: DisconnectReason) {
+			description("Peer disconnected"),
+			display("Peer disconnected: {}", reason),
+		}
 
-impl From<UtilError> for NetworkError {
-	fn from(err: UtilError) -> NetworkError {
-		NetworkError::Util(err)
+		#[doc = "Invalid node id"]
+		InvalidNodeId {
+			description("Invalid node id"),
+			display("Invalid node id"),
+		}
+
+		#[doc = "Packet size is over the protocol limit"]
+		OversizedPacket {
+			description("Packet is too large"),
+			display("Packet is too large"),
+		}
 	}
 }
 
-impl From<KeyError> for NetworkError {
-	fn from(_err: KeyError) -> Self {
-		NetworkError::Auth
+impl From<rlp::DecoderError> for Error {
+	fn from(_err: rlp::DecoderError) -> Self {
+		ErrorKind::Auth.into()
 	}
 }
 
-impl From<CryptoError> for NetworkError {
-	fn from(_err: CryptoError) -> NetworkError {
-		NetworkError::Auth
+impl From<ethkey::Error> for Error {
+	fn from(_err: ethkey::Error) -> Self {
+		ErrorKind::Auth.into()
 	}
 }
 
-impl From<::std::net::AddrParseError> for NetworkError {
-	fn from(err: ::std::net::AddrParseError) -> NetworkError {
-		NetworkError::AddressParse(err)
+impl From<crypto::Error> for Error {
+	fn from(_err: crypto::Error) -> Self {
+		ErrorKind::Auth.into()
 	}
 }
 
@@ -184,13 +166,13 @@ fn test_errors() {
 	}
 	assert_eq!(DisconnectReason::Unknown, r);
 
-	match <NetworkError as From<DecoderError>>::from(DecoderError::RlpIsTooBig) {
-		NetworkError::Auth => {},
+	match *<Error as From<rlp::DecoderError>>::from(rlp::DecoderError::RlpIsTooBig).kind() {
+		ErrorKind::Auth => {},
 		_ => panic!("Unexpeceted error"),
 	}
 
-	match <NetworkError as From<CryptoError>>::from(CryptoError::InvalidMessage) {
-		NetworkError::Auth => {},
+	match *<Error as From<crypto::Error>>::from(crypto::Error::InvalidMessage).kind() {
+		ErrorKind::Auth => {},
 		_ => panic!("Unexpeceted error"),
 	}
 }
diff --git a/util/network/src/lib.rs b/util/network/src/lib.rs
index 5695b81963eb135c3fa0cc804019f7df847dd9ed..7bd13d1f392dac3633bfbaf1b74007aadcf322c7 100644
--- a/util/network/src/lib.rs
+++ b/util/network/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -14,105 +14,338 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Network and general IO module.
-//!
-//! Example usage for craeting a network service and adding an IO handler:
-//!
-//! ```rust
-//! extern crate ethcore_network as net;
-//! use net::*;
-//! use std::sync::Arc;
-//!
-//! struct MyHandler;
-//!
-//! impl NetworkProtocolHandler for MyHandler {
-//!		fn initialize(&self, io: &NetworkContext, _host_info: &HostInfo) {
-//!			io.register_timer(0, 1000);
-//!		}
-//!
-//!		fn read(&self, io: &NetworkContext, peer: &PeerId, packet_id: u8, data: &[u8]) {
-//!			println!("Received {} ({} bytes) from {}", packet_id, data.len(), peer);
-//!		}
-//!
-//!		fn connected(&self, io: &NetworkContext, peer: &PeerId) {
-//!			println!("Connected {}", peer);
-//!		}
-//!
-//!		fn disconnected(&self, io: &NetworkContext, peer: &PeerId) {
-//!			println!("Disconnected {}", peer);
-//!		}
-//! }
-//!
-//! fn main () {
-//! 	let mut service = NetworkService::new(NetworkConfiguration::new_local(), None).expect("Error creating network service");
-//! 	service.start().expect("Error starting service");
-//! 	service.register_protocol(Arc::new(MyHandler), *b"myp", 1, &[1u8]);
-//!
-//! 	// Wait for quit condition
-//! 	// ...
-//! 	// Drop the service
-//! }
-//! ```
-
-//TODO: use Poll from mio
-#![allow(deprecated)]
+#![recursion_limit="128"]
 
 extern crate ethcore_io as io;
-extern crate ethcore_util as util;
-extern crate parking_lot;
-extern crate mio;
-extern crate tiny_keccak;
-extern crate crypto as rcrypto;
-extern crate rand;
-extern crate time;
-extern crate ansi_term; //TODO: remove this
-extern crate rustc_hex;
-extern crate rustc_serialize;
-extern crate igd;
-extern crate libc;
-extern crate slab;
-extern crate ethkey;
 extern crate ethcrypto as crypto;
+extern crate ethereum_types;
+extern crate ethkey;
 extern crate rlp;
-extern crate bytes;
-extern crate path;
-extern crate ethcore_logger;
 extern crate ipnetwork;
+extern crate snappy;
 
 #[macro_use]
-extern crate log;
-
-#[cfg(test)]
-extern crate ethcore_devtools as devtools;
+extern crate error_chain;
 
-mod host;
-mod connection;
-mod handshake;
-mod session;
-mod discovery;
-mod service;
 mod error;
-mod node_table;
-mod stats;
-mod ip_utils;
-mod connection_filter;
-
-#[cfg(test)]
-mod tests;
-
-pub use host::{HostInfo, PeerId, PacketId, ProtocolId, NetworkContext, NetworkIoMessage, NetworkConfiguration};
-pub use service::NetworkService;
-pub use error::NetworkError;
-pub use stats::NetworkStats;
-pub use session::SessionInfo;
-pub use connection_filter::{ConnectionFilter, ConnectionDirection};
 
 pub use io::TimerToken;
-pub use node_table::{is_valid_node_url, NodeId};
+pub use error::{Error, ErrorKind, DisconnectReason};
+
+use std::cmp::Ordering;
+use std::collections::HashMap;
+use std::net::{SocketAddr, SocketAddrV4, Ipv4Addr};
+use std::str::{self, FromStr};
+use std::sync::Arc;
 use ipnetwork::{IpNetwork, IpNetworkError};
-use std::str::FromStr;
+use io::IoChannel;
+use ethkey::Secret;
+use ethereum_types::{H256, H512};
+use rlp::{Decodable, DecoderError, UntrustedRlp};
+
+/// Protocol handler level packet id
+pub type PacketId = u8;
+/// Protocol / handler id
+pub type ProtocolId = [u8; 3];
+
+/// Node public key
+pub type NodeId = H512;
+
+/// Local (temporary) peer session ID.
+pub type PeerId = usize;
+
+/// Messages used to communitate with the event loop from other threads.
+#[derive(Clone)]
+pub enum NetworkIoMessage {
+	/// Register a new protocol handler.
+	AddHandler {
+		/// Handler shared instance.
+		handler: Arc<NetworkProtocolHandler + Sync>,
+		/// Protocol Id.
+		protocol: ProtocolId,
+		/// Supported protocol versions.
+		versions: Vec<u8>,
+		/// Number of packet IDs reserved by the protocol.
+		packet_count: u8,
+	},
+	/// Register a new protocol timer
+	AddTimer {
+		/// Protocol Id.
+		protocol: ProtocolId,
+		/// Timer token.
+		token: TimerToken,
+		/// Timer delay in milliseconds.
+		delay: u64,
+	},
+	/// Initliaze public interface.
+	InitPublicInterface,
+	/// Disconnect a peer.
+	Disconnect(PeerId),
+	/// Disconnect and temporary disable peer.
+	DisablePeer(PeerId),
+	/// Network has been started with the host as the given enode.
+	NetworkStarted(String),
+}
+
+/// Shared session information
+#[derive(Debug, Clone)]
+pub struct SessionInfo {
+	/// Peer public key
+	pub id: Option<NodeId>,
+	/// Peer client ID
+	pub client_version: String,
+	/// Peer RLPx protocol version
+	pub protocol_version: u32,
+	/// Session protocol capabilities
+	pub capabilities: Vec<SessionCapabilityInfo>,
+	/// Peer protocol capabilities
+	pub peer_capabilities: Vec<PeerCapabilityInfo>,
+	/// Peer ping delay in milliseconds
+	pub ping_ms: Option<u64>,
+	/// True if this session was originated by us.
+	pub originated: bool,
+	/// Remote endpoint address of the session
+	pub remote_address: String,
+	/// Local endpoint address of the session
+	pub local_address: String,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct PeerCapabilityInfo {
+	pub protocol: ProtocolId,
+	pub version: u8,
+}
+
+impl Decodable for PeerCapabilityInfo {
+	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+		let p: Vec<u8> = rlp.val_at(0)?;
+		if p.len() != 3 {
+			return Err(DecoderError::Custom("Invalid subprotocol string length. Should be 3"));
+		}
+		let mut p2: ProtocolId = [0u8; 3];
+		p2.clone_from_slice(&p);
+		Ok(PeerCapabilityInfo {
+			protocol: p2,
+			version: rlp.val_at(1)?
+		})
+	}
+}
+
+impl ToString for PeerCapabilityInfo {
+	fn to_string(&self) -> String {
+		format!("{}/{}", str::from_utf8(&self.protocol[..]).unwrap_or("???"), self.version)
+	}
+}
 
-const PROTOCOL_VERSION: u32 = 4;
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct SessionCapabilityInfo {
+	pub protocol: [u8; 3],
+	pub version: u8,
+	pub packet_count: u8,
+	pub id_offset: u8,
+}
+
+impl PartialOrd for SessionCapabilityInfo {
+	fn partial_cmp(&self, other: &SessionCapabilityInfo) -> Option<Ordering> {
+		Some(self.cmp(other))
+	}
+}
+
+impl Ord for SessionCapabilityInfo {
+	fn cmp(&self, b: &SessionCapabilityInfo) -> Ordering {
+		// By protocol id first
+		if self.protocol != b.protocol {
+			return self.protocol.cmp(&b.protocol);
+		}
+		// By version
+		self.version.cmp(&b.version)
+	}
+}
+
+/// Network service configuration
+#[derive(Debug, PartialEq, Clone)]
+pub struct NetworkConfiguration {
+	/// Directory path to store general network configuration. None means nothing will be saved
+	pub config_path: Option<String>,
+	/// Directory path to store network-specific configuration. None means nothing will be saved
+	pub net_config_path: Option<String>,
+	/// IP address to listen for incoming connections. Listen to all connections by default
+	pub listen_address: Option<SocketAddr>,
+	/// IP address to advertise. Detected automatically if none.
+	pub public_address: Option<SocketAddr>,
+	/// Port for UDP connections, same as TCP by default
+	pub udp_port: Option<u16>,
+	/// Enable NAT configuration
+	pub nat_enabled: bool,
+	/// Enable discovery
+	pub discovery_enabled: bool,
+	/// List of initial node addresses
+	pub boot_nodes: Vec<String>,
+	/// Use provided node key instead of default
+	pub use_secret: Option<Secret>,
+	/// Minimum number of connected peers to maintain
+	pub min_peers: u32,
+	/// Maximum allowed number of peers
+	pub max_peers: u32,
+	/// Maximum handshakes
+	pub max_handshakes: u32,
+	/// Reserved protocols. Peers with <key> protocol get additional <value> connection slots.
+	pub reserved_protocols: HashMap<ProtocolId, u32>,
+	/// List of reserved node addresses.
+	pub reserved_nodes: Vec<String>,
+	/// The non-reserved peer mode.
+	pub non_reserved_mode: NonReservedPeerMode,
+	/// IP filter
+	pub ip_filter: IpFilter,
+	/// Client identifier
+	pub client_version: String,
+}
+
+impl Default for NetworkConfiguration {
+	fn default() -> Self {
+		NetworkConfiguration::new()
+	}
+}
+
+impl NetworkConfiguration {
+	/// Create a new instance of default settings.
+	pub fn new() -> Self {
+		NetworkConfiguration {
+			config_path: None,
+			net_config_path: None,
+			listen_address: None,
+			public_address: None,
+			udp_port: None,
+			nat_enabled: true,
+			discovery_enabled: true,
+			boot_nodes: Vec::new(),
+			use_secret: None,
+			min_peers: 25,
+			max_peers: 50,
+			max_handshakes: 64,
+			reserved_protocols: HashMap::new(),
+			ip_filter: IpFilter::default(),
+			reserved_nodes: Vec::new(),
+			non_reserved_mode: NonReservedPeerMode::Accept,
+			client_version: "Parity-network".into(),
+		}
+	}
+
+	/// Create new default configuration with specified listen port.
+	pub fn new_with_port(port: u16) -> NetworkConfiguration {
+		let mut config = NetworkConfiguration::new();
+		config.listen_address = Some(SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), port)));
+		config
+	}
+
+	/// Create new default configuration for localhost-only connection with random port (usefull for testing)
+	pub fn new_local() -> NetworkConfiguration {
+		let mut config = NetworkConfiguration::new();
+		config.listen_address = Some(SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(127, 0, 0, 1), 0)));
+		config.nat_enabled = false;
+		config
+	}
+}
+
+/// IO access point. This is passed to all IO handlers and provides an interface to the IO subsystem.
+pub trait NetworkContext {
+	/// Send a packet over the network to another peer.
+	fn send(&self, peer: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error>;
+
+	/// Send a packet over the network to another peer using specified protocol.
+	fn send_protocol(&self, protocol: ProtocolId, peer: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error>;
+
+	/// Respond to a current network message. Panics if no there is no packet in the context. If the session is expired returns nothing.
+	fn respond(&self, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error>;
+
+	/// Get an IoChannel.
+	fn io_channel(&self) -> IoChannel<NetworkIoMessage>;
+
+	/// Disconnect a peer and prevent it from connecting again.
+	fn disable_peer(&self, peer: PeerId);
+
+	/// Disconnect peer. Reconnect can be attempted later.
+	fn disconnect_peer(&self, peer: PeerId);
+
+	/// Check if the session is still active.
+	fn is_expired(&self) -> bool;
+
+	/// Register a new IO timer. 'IoHandler::timeout' will be called with the token.
+	fn register_timer(&self, token: TimerToken, ms: u64) -> Result<(), Error>;
+
+	/// Returns peer identification string
+	fn peer_client_version(&self, peer: PeerId) -> String;
+
+	/// Returns information on p2p session
+	fn session_info(&self, peer: PeerId) -> Option<SessionInfo>;
+
+	/// Returns max version for a given protocol.
+	fn protocol_version(&self, protocol: ProtocolId, peer: PeerId) -> Option<u8>;
+
+	/// Returns this object's subprotocol name.
+	fn subprotocol_name(&self) -> ProtocolId;
+}
+
+impl<'a, T> NetworkContext for &'a T where T: ?Sized + NetworkContext {
+	fn send(&self, peer: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error> {
+		(**self).send(peer, packet_id, data)
+	}
+
+	fn send_protocol(&self, protocol: ProtocolId, peer: PeerId, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error> {
+		(**self).send_protocol(protocol, peer, packet_id, data)
+	}
+
+	fn respond(&self, packet_id: PacketId, data: Vec<u8>) -> Result<(), Error> {
+		(**self).respond(packet_id, data)
+	}
+
+	fn io_channel(&self) -> IoChannel<NetworkIoMessage> {
+		(**self).io_channel()
+	}
+
+	fn disable_peer(&self, peer: PeerId) {
+		(**self).disable_peer(peer)
+	}
+
+	fn disconnect_peer(&self, peer: PeerId) {
+		(**self).disconnect_peer(peer)
+	}
+
+	fn is_expired(&self) -> bool {
+		(**self).is_expired()
+	}
+
+	fn register_timer(&self, token: TimerToken, ms: u64) -> Result<(), Error> {
+		(**self).register_timer(token, ms)
+	}
+
+	fn peer_client_version(&self, peer: PeerId) -> String {
+		(**self).peer_client_version(peer)
+	}
+
+	fn session_info(&self, peer: PeerId) -> Option<SessionInfo> {
+		(**self).session_info(peer)
+	}
+
+	fn protocol_version(&self, protocol: ProtocolId, peer: PeerId) -> Option<u8> {
+		(**self).protocol_version(protocol, peer)
+	}
+
+	fn subprotocol_name(&self) -> ProtocolId {
+		(**self).subprotocol_name()
+	}
+}
+
+pub trait HostInfo {
+	/// Returns public key
+	fn id(&self) -> &NodeId;
+	/// Returns secret key
+	fn secret(&self) -> &Secret;
+	/// Increments and returns connection nonce.
+	fn next_nonce(&mut self) -> H256;
+    /// Returns the client version.
+	fn client_version(&self) -> &str;
+}
 
 /// Network IO protocol handler. This needs to be implemented for each new subprotocol.
 /// All the handler function are called from within IO event loop.
@@ -151,12 +384,11 @@ impl NonReservedPeerMode {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub struct IpFilter {
     pub predefined: AllowIP,
     pub custom_allow: Vec<IpNetwork>,
     pub custom_block: Vec<IpNetwork>,
-} 
+}
 
 impl Default for IpFilter {
     fn default() -> Self {
@@ -203,4 +435,3 @@ pub enum AllowIP {
     /// Block all addresses
     None,
 }
-
diff --git a/panic_hook/Cargo.toml b/util/panic_hook/Cargo.toml
similarity index 100%
rename from panic_hook/Cargo.toml
rename to util/panic_hook/Cargo.toml
diff --git a/panic_hook/src/lib.rs b/util/panic_hook/src/lib.rs
similarity index 100%
rename from panic_hook/src/lib.rs
rename to util/panic_hook/src/lib.rs
index a1487eb780f74c8e1e478cf730b4cdc22eca9e82..1136e9e362378fe97568b2727c1ad80f1f6f1d42 100644
--- a/panic_hook/src/lib.rs
+++ b/util/panic_hook/src/lib.rs
@@ -18,10 +18,10 @@
 
 extern crate backtrace;
 
-use backtrace::Backtrace;
 use std::io::{self, Write};
 use std::panic::{self, PanicInfo};
 use std::thread;
+use backtrace::Backtrace;
 
 /// Set the panic hook
 pub fn set() {
diff --git a/util/patricia_trie/Cargo.toml b/util/patricia_trie/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..318db6b9988ee9ddd7e9c3f9d877b728f93f7535
--- /dev/null
+++ b/util/patricia_trie/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "patricia-trie"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "Merkle-Patricia Trie (Ethereum Style)"
+license = "GPL-3.0"
+
+[dependencies]
+elastic-array = "0.10"
+log = "0.3"
+rand = "0.4"
+ethcore-bytes = { version = "0.1.0", path = "../bytes" }
+ethereum-types = "0.2"
+keccak-hash = { version = "0.1.0", path = "../hash" }
+hashdb = { version = "0.1.1", path = "../hashdb" }
+rlp = { version = "0.2.1", path = "../rlp" }
+triehash = { version = "0.1.0", path = "../triehash" }
+memorydb = { version = "0.1.0", path = "../memorydb" }
+ethcore-logger = { version = "1.9.0", path = "../../logger" }
+
+[dev-dependencies]
+trie-standardmap = { path = "../trie-standardmap" }
diff --git a/util/benches/trie.rs b/util/patricia_trie/benches/trie.rs
similarity index 64%
rename from util/benches/trie.rs
rename to util/patricia_trie/benches/trie.rs
index e02077ad40c452d3e01f3cceb9df152b2b9a81e8..f26febdb59592fbe2ad6dfd03f335adb08d00d0e 100644
--- a/util/benches/trie.rs
+++ b/util/patricia_trie/benches/trie.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -17,22 +17,24 @@
 #![feature(test)]
 
 extern crate test;
-extern crate ethcore_util;
-#[macro_use]
-extern crate log;
-
+extern crate ethcore_bytes;
+extern crate ethereum_types;
+extern crate memorydb;
+extern crate patricia_trie as trie;
+extern crate keccak_hash;
+extern crate trie_standardmap;
+
+use ethcore_bytes::Bytes;
+use ethereum_types::H256;
+use keccak_hash::keccak;
+use memorydb::MemoryDB;
 use test::{Bencher, black_box};
-use ethcore_util::hash::*;
-use ethcore_util::bytes::*;
-use ethcore_util::trie::*;
-use ethcore_util::memorydb::*;
-use ethcore_util::triehash::*;
-use ethcore_util::sha3::*;
-
+use trie::{TrieDBMut, TrieDB, TrieMut, Trie};
+use trie_standardmap::{Alphabet, ValueMode, StandardMap};
 
 fn random_word(alphabet: &[u8], min_count: usize, diff_count: usize, seed: &mut H256) -> Vec<u8> {
 	assert!(min_count + diff_count <= 32);
-	*seed = seed.sha3();
+	*seed = keccak(&seed);
 	let r = min_count + (seed[31] as usize % (diff_count + 1));
 	let mut ret: Vec<u8> = Vec::with_capacity(r);
 	for i in 0..r {
@@ -43,13 +45,13 @@ fn random_word(alphabet: &[u8], min_count: usize, diff_count: usize, seed: &mut
 
 fn random_bytes(min_count: usize, diff_count: usize, seed: &mut H256) -> Vec<u8> {
 	assert!(min_count + diff_count <= 32);
-	*seed = seed.sha3();
+	*seed = keccak(&seed);
 	let r = min_count + (seed[31] as usize % (diff_count + 1));
 	seed[0..r].to_vec()
 }
 
 fn random_value(seed: &mut H256) -> Bytes {
-	*seed = seed.sha3();
+	*seed = keccak(&seed);
 	match seed[0] % 2 {
 		1 => vec![seed[31];1],
 		_ => seed.to_vec(),
@@ -66,7 +68,6 @@ fn trie_insertions_32_mir_1k(b: &mut Bencher) {
 		count: 1000,
 	};
 	let d = st.make();
-	let mut hash_count = 0usize;
 	b.iter(&mut ||{
 		let mut memdb = MemoryDB::new();
 		let mut root = H256::new();
@@ -74,9 +75,7 @@ fn trie_insertions_32_mir_1k(b: &mut Bencher) {
 		for i in d.iter() {
 			t.insert(&i.0, &i.1).unwrap();
 		}
-		hash_count = t.hash_count;
 	});
-//	println!("hash_count: {}", hash_count);
 }
 #[bench]
 fn trie_iter(b: &mut Bencher) {
@@ -105,21 +104,6 @@ fn trie_iter(b: &mut Bencher) {
 	});
 }
 
-#[bench]
-fn triehash_insertions_32_mir_1k(b: &mut Bencher) {
-	let st = StandardMap {
-		alphabet: Alphabet::All,
-		min_key: 32,
-		journal_key: 0,
-		value_mode: ValueMode::Mirror,
-		count: 1000,
-	};
-	let d = st.make();
-	b.iter(&mut ||{
-		trie_root(d.clone()).clone();
-	});
-}
-
 #[bench]
 fn trie_insertions_32_ran_1k(b: &mut Bencher) {
 	let st = StandardMap {
@@ -130,7 +114,6 @@ fn trie_insertions_32_ran_1k(b: &mut Bencher) {
 		count: 1000,
 	};
 	let d = st.make();
-	let mut hash_count = 0usize;
 	let mut r = H256::new();
 	b.iter(&mut ||{
 		let mut memdb = MemoryDB::new();
@@ -139,25 +122,8 @@ fn trie_insertions_32_ran_1k(b: &mut Bencher) {
 		for i in d.iter() {
 			t.insert(&i.0, &i.1).unwrap();
 		}
-		hash_count = t.hash_count;
 		r = t.root().clone();
 	});
-//	println!("result: {}", hash_count);
-}
-
-#[bench]
-fn triehash_insertions_32_ran_1k(b: &mut Bencher) {
-	let st = StandardMap {
-		alphabet: Alphabet::All,
-		min_key: 32,
-		journal_key: 0,
-		value_mode: ValueMode::Random,
-		count: 1000,
-	};
-	let d = st.make();
-	b.iter(&mut ||{
-		trie_root(d.clone()).clone();
-	});
 }
 
 #[bench]
@@ -180,21 +146,6 @@ fn trie_insertions_six_high(b: &mut Bencher) {
 	})
 }
 
-#[bench]
-fn triehash_insertions_six_high(b: &mut Bencher) {
-	let mut d: Vec<(Bytes, Bytes)> = Vec::new();
-	let mut seed = H256::new();
-	for _ in 0..1000 {
-		let k = random_bytes(6, 0, &mut seed);
-		let v = random_value(&mut seed);
-		d.push((k, v))
-	}
-
-	b.iter(&||{
-		trie_root(d.clone());
-	})
-}
-
 #[bench]
 fn trie_insertions_six_mid(b: &mut Bencher) {
 	let alphabet = b"@QWERTYUIOPASDFGHJKLZXCVBNM[/]^_";
@@ -212,22 +163,6 @@ fn trie_insertions_six_mid(b: &mut Bencher) {
 		for i in d.iter() {
 			t.insert(&i.0, &i.1).unwrap();
 		}
-		debug!("hash_count={:?}", t.hash_count);
-	})
-}
-
-#[bench]
-fn triehash_insertions_six_mid(b: &mut Bencher) {
-	let alphabet = b"@QWERTYUIOPASDFGHJKLZXCVBNM[/]^_";
-	let mut d: Vec<(Bytes, Bytes)> = Vec::new();
-	let mut seed = H256::new();
-	for _ in 0..1000 {
-		let k = random_word(alphabet, 6, 0, &mut seed);
-		let v = random_value(&mut seed);
-		d.push((k, v))
-	}
-	b.iter(||{
-		trie_root(d.clone());
 	})
 }
 
@@ -252,22 +187,6 @@ fn trie_insertions_random_mid(b: &mut Bencher) {
 	})
 }
 
-#[bench]
-fn triehash_insertions_random_mid(b: &mut Bencher) {
-	let alphabet = b"@QWERTYUIOPASDFGHJKLZXCVBNM[/]^_";
-	let mut d: Vec<(Bytes, Bytes)> = Vec::new();
-	let mut seed = H256::new();
-	for _ in 0..1000 {
-		let k = random_word(alphabet, 1, 5, &mut seed);
-		let v = random_value(&mut seed);
-		d.push((k, v))
-	}
-
-	b.iter(||{
-		trie_root(d.clone());
-	})
-}
-
 #[bench]
 fn trie_insertions_six_low(b: &mut Bencher) {
 	let alphabet = b"abcdef";
@@ -288,29 +207,3 @@ fn trie_insertions_six_low(b: &mut Bencher) {
 		}
 	})
 }
-
-#[bench]
-fn triehash_insertions_six_low(b: &mut Bencher) {
-	let alphabet = b"abcdef";
-	let mut d: Vec<(Bytes, Bytes)> = Vec::new();
-	let mut seed = H256::new();
-	for _ in 0..1000 {
-		let k = random_word(alphabet, 6, 0, &mut seed);
-		let v = random_value(&mut seed);
-		d.push((k, v))
-	}
-
-	b.iter(||{
-		trie_root(d.clone());
-	})
-}
-
-#[bench]
-fn sha3x10000(b: &mut Bencher) {
-	b.iter(||{
-		let mut seed = H256::new();
-		for _ in 0..10000 {
-			seed = seed.sha3()
-		}
-	})
-}
diff --git a/util/src/trie/fatdb.rs b/util/patricia_trie/src/fatdb.rs
similarity index 92%
rename from util/src/trie/fatdb.rs
rename to util/patricia_trie/src/fatdb.rs
index f10e6d4bfe537835333b9fbb119b2d83ac3855d6..d428ff8116b18bbaf83f9c01a67d09969b7ab4f1 100644
--- a/util/src/trie/fatdb.rs
+++ b/util/patricia_trie/src/fatdb.rs
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use hash::H256;
-use sha3::Hashable;
+use ethereum_types::H256;
+use keccak::keccak;
 use hashdb::HashDB;
 use super::{TrieDB, Trie, TrieDBIterator, TrieItem, TrieIterator, Query};
 
@@ -55,13 +55,13 @@ impl<'db> Trie for FatDB<'db> {
 	}
 
 	fn contains(&self, key: &[u8]) -> super::Result<bool> {
-		self.raw.contains(&key.sha3())
+		self.raw.contains(&keccak(key))
 	}
 
 	fn get_with<'a, 'key, Q: Query>(&'a self, key: &'key [u8], query: Q) -> super::Result<Option<Q::Item>>
 		where 'a: 'key
 	{
-		self.raw.get_with(&key.sha3(), query)
+		self.raw.get_with(&keccak(key), query)
 	}
 }
 
@@ -83,7 +83,7 @@ impl<'db> FatDBIterator<'db> {
 
 impl<'db> TrieIterator for FatDBIterator<'db> {
 	fn seek(&mut self, key: &[u8]) -> super::Result<()> {
-		self.trie_iterator.seek(&key.sha3())
+		self.trie_iterator.seek(&keccak(key))
 	}
 }
 
@@ -94,7 +94,7 @@ impl<'db> Iterator for FatDBIterator<'db> {
 		self.trie_iterator.next()
 			.map(|res|
 				res.map(|(hash, value)| {
-					let aux_hash = hash.sha3();
+					let aux_hash = keccak(hash);
 					(self.trie.db().get(&aux_hash).expect("Missing fatdb hash").into_vec(), value)
 				})
 			)
@@ -105,7 +105,8 @@ impl<'db> Iterator for FatDBIterator<'db> {
 fn fatdb_to_trie() {
 	use memorydb::MemoryDB;
 	use hashdb::DBValue;
-	use trie::{FatDBMut, TrieMut};
+	use super::fatdbmut::FatDBMut;
+	use super::TrieMut;
 
 	let mut memdb = MemoryDB::new();
 	let mut root = H256::default();
diff --git a/util/src/trie/fatdbmut.rs b/util/patricia_trie/src/fatdbmut.rs
similarity index 91%
rename from util/src/trie/fatdbmut.rs
rename to util/patricia_trie/src/fatdbmut.rs
index 0f5d6f47e2a88dbcd21b268071c7f2d54361057d..4b7f2de0632acc049528c309834ae848da66d814 100644
--- a/util/src/trie/fatdbmut.rs
+++ b/util/patricia_trie/src/fatdbmut.rs
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use hash::H256;
-use sha3::Hashable;
+use ethereum_types::H256;
+use keccak::keccak;
 use hashdb::{HashDB, DBValue};
 use super::{TrieDBMut, TrieMut};
 
@@ -53,7 +53,7 @@ impl<'db> FatDBMut<'db> {
 	}
 
 	fn to_aux_key(key: &[u8]) -> H256 {
-		key.sha3()
+		keccak(key)
 	}
 }
 
@@ -67,17 +67,17 @@ impl<'db> TrieMut for FatDBMut<'db> {
 	}
 
 	fn contains(&self, key: &[u8]) -> super::Result<bool> {
-		self.raw.contains(&key.sha3())
+		self.raw.contains(&keccak(key))
 	}
 
 	fn get<'a, 'key>(&'a self, key: &'key [u8]) -> super::Result<Option<DBValue>>
 		where 'a: 'key
 	{
-		self.raw.get(&key.sha3())
+		self.raw.get(&keccak(key))
 	}
 
 	fn insert(&mut self, key: &[u8], value: &[u8]) -> super::Result<Option<DBValue>> {
-		let hash = key.sha3();
+		let hash = keccak(key);
 		let out = self.raw.insert(&hash, value)?;
 		let db = self.raw.db_mut();
 
@@ -89,7 +89,7 @@ impl<'db> TrieMut for FatDBMut<'db> {
 	}
 
 	fn remove(&mut self, key: &[u8]) -> super::Result<Option<DBValue>> {
-		let hash = key.sha3();
+		let hash = keccak(key);
 		let out = self.raw.remove(&hash)?;
 
 		// don't remove if it already exists.
@@ -114,5 +114,5 @@ fn fatdb_to_trie() {
 		t.insert(&[0x01u8, 0x23], &[0x01u8, 0x23]).unwrap();
 	}
 	let t = TrieDB::new(&memdb, &root).unwrap();
-	assert_eq!(t.get(&(&[0x01u8, 0x23]).sha3()).unwrap().unwrap(), DBValue::from_slice(&[0x01u8, 0x23]));
+	assert_eq!(t.get(&keccak(&[0x01u8, 0x23])).unwrap().unwrap(), DBValue::from_slice(&[0x01u8, 0x23]));
 }
diff --git a/util/src/trie/mod.rs b/util/patricia_trie/src/lib.rs
similarity index 91%
rename from util/src/trie/mod.rs
rename to util/patricia_trie/src/lib.rs
index cae980505b78b4dd98d0d5b51241baa070df13a9..3a1d683c26cf6812ae2b1f99815d15cf5bfceef2 100644
--- a/util/src/trie/mod.rs
+++ b/util/patricia_trie/src/lib.rs
@@ -15,32 +15,40 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Trie interface and implementation.
-
-use std::fmt;
-use hash::H256;
+extern crate rand;
+extern crate ethereum_types;
+extern crate keccak_hash as keccak;
+extern crate rlp;
+extern crate hashdb;
+extern crate ethcore_bytes as bytes;
+extern crate elastic_array;
+extern crate memorydb;
+extern crate ethcore_logger;
+
+#[cfg(test)]
+extern crate trie_standardmap as standardmap;
+
+#[macro_use]
+extern crate log;
+
+use std::{fmt, error};
+use ethereum_types::H256;
+use keccak::KECCAK_NULL_RLP;
 use hashdb::{HashDB, DBValue};
 
-/// Export the standardmap module.
-pub mod standardmap;
-/// Export the node module.
 pub mod node;
-/// Export the triedb module.
 pub mod triedb;
-/// Export the triedbmut module.
 pub mod triedbmut;
-/// Export the sectriedb module.
 pub mod sectriedb;
-/// Export the sectriedbmut module.
 pub mod sectriedbmut;
-/// Trie query recording.
 pub mod recorder;
 
-
 mod fatdb;
 mod fatdbmut;
 mod lookup;
+mod nibbleslice;
+mod nibblevec;
 
-pub use self::standardmap::{Alphabet, StandardMap, ValueMode};
 pub use self::triedbmut::TrieDBMut;
 pub use self::triedb::{TrieDB, TrieDBIterator};
 pub use self::sectriedbmut::SecTrieDBMut;
@@ -71,6 +79,15 @@ impl fmt::Display for TrieError {
 	}
 }
 
+impl error::Error for TrieError {
+	fn description(&self) -> &str {
+		match *self {
+			TrieError::InvalidStateRoot(_) => "Invalid state root",
+			TrieError::IncompleteDatabase(_) => "Incomplete database",
+		}
+	}
+}
+
 /// Trie result type. Boxed to avoid copying around extra space for `H256`s on successful queries.
 pub type Result<T> = ::std::result::Result<T, Box<TrieError>>;
 
@@ -123,7 +140,7 @@ pub trait Trie {
 	fn root(&self) -> &H256;
 
 	/// Is the trie empty?
-	fn is_empty(&self) -> bool { *self.root() == ::sha3::SHA3_NULL_RLP }
+	fn is_empty(&self) -> bool { *self.root() == KECCAK_NULL_RLP }
 
 	/// Does the trie contain a given key?
 	fn contains(&self, key: &[u8]) -> Result<bool> {
@@ -244,7 +261,6 @@ impl<'db> Trie for TrieKinds<'db> {
 	}
 }
 
-#[cfg_attr(feature="dev", allow(wrong_self_convention))]
 impl TrieFactory {
 	/// Creates new factory.
 	pub fn new(spec: TrieSpec) -> Self {
diff --git a/util/src/trie/lookup.rs b/util/patricia_trie/src/lookup.rs
similarity index 93%
rename from util/src/trie/lookup.rs
rename to util/patricia_trie/src/lookup.rs
index d24a82e169157fe6d8ec88a0d6bd2f3d7aeb88d3..88d2bc66e02c962688d12116b13ca90a403e24de 100644
--- a/util/src/trie/lookup.rs
+++ b/util/patricia_trie/src/lookup.rs
@@ -18,8 +18,7 @@
 
 use hashdb::HashDB;
 use nibbleslice::NibbleSlice;
-use rlp::Rlp;
-use ::{H256};
+use ethereum_types::H256;
 
 use super::{TrieError, Query};
 use super::node::Node;
@@ -56,7 +55,7 @@ impl<'a, Q: Query> Lookup<'a, Q> {
 			// without incrementing the depth.
 			let mut node_data = &node_data[..];
 			loop {
-				match Node::decoded(node_data) {
+				match Node::decoded(node_data).expect("rlp read from db; qed") {
 					Node::Leaf(slice, value) => {
 						return Ok(match slice == key {
 							true => Some(self.query.decode(value)),
@@ -82,9 +81,8 @@ impl<'a, Q: Query> Lookup<'a, Q> {
 				}
 
 				// check if new node data is inline or hash.
-				let r = Rlp::new(node_data);
-				if r.is_data() && r.size() == 32 {
-					hash = r.as_val();
+				if let Some(h) = Node::try_decode_hash(&node_data) {
+					hash = h;
 					break
 				}
 			}
diff --git a/util/src/nibbleslice.rs b/util/patricia_trie/src/nibbleslice.rs
similarity index 99%
rename from util/src/nibbleslice.rs
rename to util/patricia_trie/src/nibbleslice.rs
index d56c5ca480893ea95fb8ff89b01f47a12995afc2..c2dd6611e21326842651241a73d33bf3740f9ef7 100644
--- a/util/src/nibbleslice.rs
+++ b/util/patricia_trie/src/nibbleslice.rs
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Nibble-orientated view onto byte-slice, allowing nibble-precision offsets.
+
 use std::cmp::*;
 use std::fmt;
 use elastic_array::ElasticArray36;
@@ -24,9 +25,8 @@ use elastic_array::ElasticArray36;
 /// This is an immutable struct. No operations actually change it.
 ///
 /// # Example
-/// ```rust
-/// extern crate ethcore_util;
-/// use ethcore_util::nibbleslice::*;
+/// ```snippet
+/// use patricia_trie::nibbleslice::NibbleSlice;
 /// fn main() {
 ///   let d1 = &[0x01u8, 0x23, 0x45];
 ///   let d2 = &[0x34u8, 0x50, 0x12];
diff --git a/util/src/nibblevec.rs b/util/patricia_trie/src/nibblevec.rs
similarity index 99%
rename from util/src/nibblevec.rs
rename to util/patricia_trie/src/nibblevec.rs
index b38198593b215b7a46f6ff8c11ee9c918f7ed3d0..fbe97496ae84881846d1e79ecbc1aed83f9ca210 100644
--- a/util/src/nibblevec.rs
+++ b/util/patricia_trie/src/nibblevec.rs
@@ -14,11 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-
 //! An owning, nibble-oriented byte vector.
-
-use nibbleslice::NibbleSlice;
 use elastic_array::ElasticArray36;
+use nibbleslice::NibbleSlice;
 
 /// Owning, nibble-oriented byte vector. Counterpart to `NibbleSlice`.
 #[derive(Clone, PartialEq, Eq, Debug)]
diff --git a/util/src/trie/node.rs b/util/patricia_trie/src/node.rs
similarity index 70%
rename from util/src/trie/node.rs
rename to util/patricia_trie/src/node.rs
index d44890bd0454a4c7591c433342c478103c2f7e41..47807940fee2a9eba86300f4a816956e8991e04a 100644
--- a/util/src/trie/node.rs
+++ b/util/patricia_trie/src/node.rs
@@ -14,11 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use ethereum_types::H256;
 use elastic_array::ElasticArray36;
-use nibbleslice::*;
+use nibbleslice::NibbleSlice;
 use nibblevec::NibbleVec;
 use bytes::*;
-use rlp::*;
+use rlp::{UntrustedRlp, RlpStream, Prototype, DecoderError};
 use hashdb::DBValue;
 
 /// Partial node key type.
@@ -39,30 +40,30 @@ pub enum Node<'a> {
 
 impl<'a> Node<'a> {
 	/// Decode the `node_rlp` and return the Node.
-	pub fn decoded(node_rlp: &'a [u8]) -> Self {
-		let r = Rlp::new(node_rlp);
-		match r.prototype() {
+	pub fn decoded(node_rlp: &'a [u8]) -> Result<Self, DecoderError> {
+		let r = UntrustedRlp::new(node_rlp);
+		match r.prototype()? {
 			// either leaf or extension - decode first item with NibbleSlice::???
 			// and use is_leaf return to figure out which.
 			// if leaf, second item is a value (is_data())
 			// if extension, second item is a node (either SHA3 to be looked up and
 			// fed back into this function or inline RLP which can be fed back into this function).
-			Prototype::List(2) => match NibbleSlice::from_encoded(r.at(0).data()) {
-				(slice, true) => Node::Leaf(slice, r.at(1).data()),
-				(slice, false) => Node::Extension(slice, r.at(1).as_raw()),
+			Prototype::List(2) => match NibbleSlice::from_encoded(r.at(0)?.data()?) {
+				(slice, true) => Ok(Node::Leaf(slice, r.at(1)?.data()?)),
+				(slice, false) => Ok(Node::Extension(slice, r.at(1)?.as_raw())),
 			},
 			// branch - first 16 are nodes, 17th is a value (or empty).
 			Prototype::List(17) => {
 				let mut nodes = [&[] as &[u8]; 16];
 				for i in 0..16 {
-					nodes[i] = r.at(i).as_raw();
+					nodes[i] = r.at(i)?.as_raw();
 				}
-				Node::Branch(nodes, if r.at(16).is_empty() { None } else { Some(r.at(16).data()) })
+				Ok(Node::Branch(nodes, if r.at(16)?.is_empty() { None } else { Some(r.at(16)?.data()?) }))
 			},
 			// an empty branch index.
-			Prototype::Data(0) => Node::Empty,
+			Prototype::Data(0) => Ok(Node::Empty),
 			// something went wrong.
-			_ => panic!("Rlp is not valid.")
+			_ => Err(DecoderError::Custom("Rlp is not valid."))
 		}
 	}
 
@@ -102,6 +103,15 @@ impl<'a> Node<'a> {
 			}
 		}
 	}
+
+	pub fn try_decode_hash(node_data: &[u8]) -> Option<H256> {
+		let r = UntrustedRlp::new(node_data);
+		if r.is_data() && r.size() == 32 {
+			Some(r.as_val().expect("Hash is the correct size of 32 bytes; qed"))
+		} else {
+			None
+		}
+	}
 }
 
 /// An owning node type. Useful for trie iterators.
@@ -117,30 +127,6 @@ pub enum OwnedNode {
 	Branch([NodeKey; 16], Option<DBValue>),
 }
 
-impl Clone for OwnedNode {
-	fn clone(&self) -> Self {
-		match *self {
-			OwnedNode::Empty => OwnedNode::Empty,
-			OwnedNode::Leaf(ref k, ref v) => OwnedNode::Leaf(k.clone(), v.clone()),
-			OwnedNode::Extension(ref k, ref c) => OwnedNode::Extension(k.clone(), c.clone()),
-			OwnedNode::Branch(ref c, ref v) => {
-				let mut children = [
-					NodeKey::new(), NodeKey::new(), NodeKey::new(), NodeKey::new(),
-					NodeKey::new(), NodeKey::new(), NodeKey::new(), NodeKey::new(),
-					NodeKey::new(), NodeKey::new(), NodeKey::new(), NodeKey::new(),
-					NodeKey::new(), NodeKey::new(), NodeKey::new(), NodeKey::new(),
-				];
-
-				for (owned, borrowed) in children.iter_mut().zip(c.iter()) {
-					*owned = borrowed.clone()
-				}
-
-				OwnedNode::Branch(children, v.as_ref().cloned())
-			}
-		}
-	}
-}
-
 impl<'a> From<Node<'a>> for OwnedNode {
 	fn from(node: Node<'a>) -> Self {
 		match node {
@@ -148,17 +134,13 @@ impl<'a> From<Node<'a>> for OwnedNode {
 			Node::Leaf(k, v) => OwnedNode::Leaf(k.into(), DBValue::from_slice(v)),
 			Node::Extension(k, child) => OwnedNode::Extension(k.into(), DBValue::from_slice(child)),
 			Node::Branch(c, val) => {
-				let mut children = [
-					NodeKey::new(), NodeKey::new(), NodeKey::new(), NodeKey::new(),
-					NodeKey::new(), NodeKey::new(), NodeKey::new(), NodeKey::new(),
-					NodeKey::new(), NodeKey::new(), NodeKey::new(), NodeKey::new(),
-					NodeKey::new(), NodeKey::new(), NodeKey::new(), NodeKey::new(),
+				let children = [
+					NodeKey::from_slice(c[0]), NodeKey::from_slice(c[1]), NodeKey::from_slice(c[2]), NodeKey::from_slice(c[3]),
+					NodeKey::from_slice(c[4]), NodeKey::from_slice(c[5]), NodeKey::from_slice(c[6]), NodeKey::from_slice(c[7]),
+					NodeKey::from_slice(c[8]), NodeKey::from_slice(c[9]), NodeKey::from_slice(c[10]), NodeKey::from_slice(c[11]),
+					NodeKey::from_slice(c[12]), NodeKey::from_slice(c[13]), NodeKey::from_slice(c[14]), NodeKey::from_slice(c[15]),
 				];
 
-				for (owned, borrowed) in children.iter_mut().zip(c.iter()) {
-					*owned = NodeKey::from_slice(borrowed)
-				}
-
 				OwnedNode::Branch(children, val.map(DBValue::from_slice))
 			}
 		}
diff --git a/util/src/trie/recorder.rs b/util/patricia_trie/src/recorder.rs
similarity index 94%
rename from util/src/trie/recorder.rs
rename to util/patricia_trie/src/recorder.rs
index 8d79b4315875a5eb603bd872b23e2b40965dab5a..35a515b704d52951a3636ad2c02f4a0e901230d9 100644
--- a/util/src/trie/recorder.rs
+++ b/util/patricia_trie/src/recorder.rs
@@ -16,8 +16,9 @@
 
 //! Trie query recorder.
 
-use sha3::Hashable;
-use {Bytes, H256};
+use keccak::keccak;
+use ethereum_types::H256;
+use bytes::Bytes;
 
 /// A record of a visited node.
 #[derive(PartialEq, Eq, Debug, Clone)]
@@ -62,7 +63,7 @@ impl Recorder {
 
 	/// Record a visited node, given its hash, data, and depth.
 	pub fn record(&mut self, hash: &H256, data: &[u8], depth: u32) {
-		debug_assert_eq!(data.sha3(), *hash);
+		debug_assert_eq!(keccak(data), *hash);
 
 		if depth >= self.min_depth {
 			self.nodes.push(Record {
@@ -82,8 +83,7 @@ impl Recorder {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sha3::Hashable;
-	use ::H256;
+	use ethereum_types::H256;
 
 	#[test]
 	fn basic_recorder() {
@@ -92,7 +92,7 @@ mod tests {
 		let node1 = vec![1, 2, 3, 4];
 		let node2 = vec![4, 5, 6, 7, 8, 9, 10];
 
-		let (hash1, hash2) = (node1.sha3(), node2.sha3());
+		let (hash1, hash2) = (keccak(&node1), keccak(&node2));
 		basic.record(&hash1, &node1, 0);
 		basic.record(&hash2, &node2, 456);
 
@@ -118,8 +118,8 @@ mod tests {
 		let node1 = vec![1, 2, 3, 4];
 		let node2 = vec![4, 5, 6, 7, 8, 9, 10];
 
-		let hash1 = node1.sha3();
-		let hash2 = node2.sha3();
+		let hash1 = keccak(&node1);
+		let hash2 = keccak(&node2);
 		basic.record(&hash1, &node1, 0);
 		basic.record(&hash2, &node2, 456);
 
@@ -136,7 +136,7 @@ mod tests {
 
 	#[test]
 	fn trie_record() {
-		use trie::{TrieDB, TrieDBMut, Trie, TrieMut};
+		use super::super::{TrieDB, TrieDBMut, Trie, TrieMut};
 		use memorydb::MemoryDB;
 
 		let mut db = MemoryDB::new();
diff --git a/util/src/trie/sectriedb.rs b/util/patricia_trie/src/sectriedb.rs
similarity index 92%
rename from util/src/trie/sectriedb.rs
rename to util/patricia_trie/src/sectriedb.rs
index b2f344794a197f2023b9ca90b5907aee80f63b26..a9176d022ab357fdd496ebacf4e84e29e2689db6 100644
--- a/util/src/trie/sectriedb.rs
+++ b/util/patricia_trie/src/sectriedb.rs
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use hash::H256;
-use sha3::Hashable;
+use ethereum_types::H256;
+use keccak::keccak;
 use hashdb::HashDB;
 use super::triedb::TrieDB;
 use super::{Trie, TrieItem, TrieIterator, Query};
@@ -56,13 +56,13 @@ impl<'db> Trie for SecTrieDB<'db> {
 	fn root(&self) -> &H256 { self.raw.root() }
 
 	fn contains(&self, key: &[u8]) -> super::Result<bool> {
-		self.raw.contains(&key.sha3())
+		self.raw.contains(&keccak(key))
 	}
 
 	fn get_with<'a, 'key, Q: Query>(&'a self, key: &'key [u8], query: Q) -> super::Result<Option<Q::Item>>
 		where 'a: 'key
 	{
-		self.raw.get_with(&key.sha3(), query)
+		self.raw.get_with(&keccak(key), query)
 	}
 }
 
@@ -71,13 +71,13 @@ fn trie_to_sectrie() {
 	use memorydb::MemoryDB;
 	use hashdb::DBValue;
 	use super::triedbmut::TrieDBMut;
-	use super::super::TrieMut;
+	use super::TrieMut;
 
 	let mut memdb = MemoryDB::new();
 	let mut root = H256::default();
 	{
 		let mut t = TrieDBMut::new(&mut memdb, &mut root);
-		t.insert(&(&[0x01u8, 0x23]).sha3(), &[0x01u8, 0x23]).unwrap();
+		t.insert(&keccak(&[0x01u8, 0x23]), &[0x01u8, 0x23]).unwrap();
 	}
 	let t = SecTrieDB::new(&memdb, &root).unwrap();
 	assert_eq!(t.get(&[0x01u8, 0x23]).unwrap().unwrap(), DBValue::from_slice(&[0x01u8, 0x23]));
diff --git a/util/src/trie/sectriedbmut.rs b/util/patricia_trie/src/sectriedbmut.rs
similarity index 90%
rename from util/src/trie/sectriedbmut.rs
rename to util/patricia_trie/src/sectriedbmut.rs
index 5cfdc4b9f3ad911d869177642601f367da8d5b67..b0436b271f6490d0939295d2c15510bd507dfcda 100644
--- a/util/src/trie/sectriedbmut.rs
+++ b/util/patricia_trie/src/sectriedbmut.rs
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use hash::H256;
-use sha3::Hashable;
+use ethereum_types::H256;
+use keccak::keccak;
 use hashdb::{HashDB, DBValue};
 use super::triedbmut::TrieDBMut;
 use super::TrieMut;
@@ -59,21 +59,21 @@ impl<'db> TrieMut for SecTrieDBMut<'db> {
 	}
 
 	fn contains(&self, key: &[u8]) -> super::Result<bool> {
-		self.raw.contains(&key.sha3())
+		self.raw.contains(&keccak(key))
 	}
 
 	fn get<'a, 'key>(&'a self, key: &'key [u8]) -> super::Result<Option<DBValue>>
 		where 'a: 'key
 	{
-		self.raw.get(&key.sha3())
+		self.raw.get(&keccak(key))
 	}
 
 	fn insert(&mut self, key: &[u8], value: &[u8]) -> super::Result<Option<DBValue>> {
-		self.raw.insert(&key.sha3(), value)
+		self.raw.insert(&keccak(key), value)
 	}
 
 	fn remove(&mut self, key: &[u8]) -> super::Result<Option<DBValue>> {
-		self.raw.remove(&key.sha3())
+		self.raw.remove(&keccak(key))
 	}
 }
 
@@ -90,5 +90,5 @@ fn sectrie_to_trie() {
 		t.insert(&[0x01u8, 0x23], &[0x01u8, 0x23]).unwrap();
 	}
 	let t = TrieDB::new(&memdb, &root).unwrap();
-	assert_eq!(t.get(&(&[0x01u8, 0x23]).sha3()).unwrap().unwrap(), DBValue::from_slice(&[0x01u8, 0x23]));
+	assert_eq!(t.get(&keccak(&[0x01u8, 0x23])).unwrap().unwrap(), DBValue::from_slice(&[0x01u8, 0x23]));
 }
diff --git a/util/src/trie/triedb.rs b/util/patricia_trie/src/triedb.rs
similarity index 89%
rename from util/src/trie/triedb.rs
rename to util/patricia_trie/src/triedb.rs
index 3e62550ba29cc1431b2311a2c9c8384c91679455..682f12467d3dcb17fe4177bb0b670b5d02697e2c 100644
--- a/util/src/trie/triedb.rs
+++ b/util/patricia_trie/src/triedb.rs
@@ -16,12 +16,12 @@
 
 use std::fmt;
 use hashdb::*;
-use nibbleslice::*;
-use rlp::*;
+use nibbleslice::NibbleSlice;
 use super::node::{Node, OwnedNode};
 use super::lookup::Lookup;
 use super::{Trie, TrieItem, TrieError, TrieIterator, Query};
-use {ToPretty, Bytes, H256};
+use ethereum_types::H256;
+use bytes::{ToPretty, Bytes};
 
 /// A `Trie` implementation using a generic `HashDB` backing database.
 ///
@@ -30,12 +30,15 @@ use {ToPretty, Bytes, H256};
 ///
 /// # Example
 /// ```
-/// extern crate ethcore_util as util;
+/// extern crate patricia_trie as trie;
+/// extern crate hashdb;
+/// extern crate memorydb;
+/// extern crate ethereum_types;
 ///
-/// use util::trie::*;
-/// use util::hashdb::*;
-/// use util::memorydb::*;
-/// use util::hash::*;
+/// use trie::*;
+/// use hashdb::*;
+/// use memorydb::*;
+/// use ethereum_types::H256;
 ///
 /// fn main() {
 ///   let mut memdb = MemoryDB::new();
@@ -50,10 +53,9 @@ pub struct TrieDB<'db> {
 	db: &'db HashDB,
 	root: &'db H256,
 	/// The number of hashes performed so far in operations on this trie.
-	pub hash_count: usize,
+	hash_count: usize,
 }
 
-#[cfg_attr(feature="dev", allow(wrong_self_convention))]
 impl<'db> TrieDB<'db> {
 	/// Create a new trie with the backing database `db` and `root`
 	/// Returns an error if `root` does not exist
@@ -94,7 +96,10 @@ impl<'db> TrieDB<'db> {
 			Node::Extension(ref slice, ref item) => {
 				write!(f, "'{:?} ", slice)?;
 				if let Ok(node) = self.get_raw_or_lookup(&*item) {
-					self.fmt_all(Node::decoded(&node), f, deepness)?;
+					match Node::decoded(&node) {
+						Ok(n) => self.fmt_all(n, f, deepness)?,
+						Err(err) => writeln!(f, "ERROR decoding node extension Rlp: {}", err)?,
+					}
 				}
 			},
 			Node::Branch(ref nodes, ref value) => {
@@ -105,12 +110,19 @@ impl<'db> TrieDB<'db> {
 				}
 				for i in 0..16 {
 					let node = self.get_raw_or_lookup(&*nodes[i]);
-					match node.as_ref().map(|n| Node::decoded(&*n)) {
-						Ok(Node::Empty) => {},
+					match node.as_ref() { 
 						Ok(n) => {
-							self.fmt_indent(f, deepness + 1)?;
-							write!(f, "'{:x} ", i)?;
-							self.fmt_all(n, f, deepness + 1)?;
+							match Node::decoded(&*n) {
+								Ok(Node::Empty) => {},
+								Ok(n) => {
+									self.fmt_indent(f, deepness + 1)?;
+									write!(f, "'{:x} ", i)?;
+									self.fmt_all(n, f, deepness + 1)?;
+								}
+								Err(e) => {
+									write!(f, "ERROR decoding node branch Rlp: {}", e)?
+								}
+							}
 						}
 						Err(e) => {
 							write!(f, "ERROR: {}", e)?;
@@ -130,16 +142,18 @@ impl<'db> TrieDB<'db> {
 	/// This could be a simple identity operation in the case that the node is sufficiently small, but
 	/// may require a database lookup.
 	fn get_raw_or_lookup(&'db self, node: &'db [u8]) -> super::Result<DBValue> {
-		// check if its sha3 + len
-		let r = Rlp::new(node);
-		match r.is_data() && r.size() == 32 {
-			true => {
-				let key = r.as_val::<H256>();
+		match Node::try_decode_hash(node) {
+			Some(key) => {
 				self.db.get(&key).ok_or_else(|| Box::new(TrieError::IncompleteDatabase(key)))
 			}
-			false => Ok(DBValue::from_slice(node))
+			None => Ok(DBValue::from_slice(node))
 		}
 	}
+
+	/// Create a node from raw rlp bytes, assumes valid rlp because encoded locally
+	fn decode_node(node: &'db [u8]) -> Node {
+		Node::decoded(node).expect("rlp read from db; qed")
+	}
 }
 
 impl<'db> Trie for TrieDB<'db> {
@@ -164,7 +178,10 @@ impl<'db> fmt::Debug for TrieDB<'db> {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		writeln!(f, "c={:?} [", self.hash_count)?;
 		let root_rlp = self.db.get(self.root).expect("Trie root not found!");
-		self.fmt_all(Node::decoded(&root_rlp), f, 0)?;
+		match Node::decoded(&root_rlp) {
+			Ok(node) => self.fmt_all(node, f, 0)?,
+			Err(e) => writeln!(f, "ERROR decoding node rlp: {}", e)?,
+		}
 		writeln!(f, "]")
 	}
 }
@@ -177,7 +194,7 @@ enum Status {
 	Exiting,
 }
 
-#[derive(Clone, Eq, PartialEq)]
+#[derive(Eq, PartialEq)]
 struct Crumb {
 	node: OwnedNode,
 	status: Status,
@@ -197,7 +214,6 @@ impl Crumb {
 }
 
 /// Iterator for going through all values in the trie.
-#[derive(Clone)]
 pub struct TrieDBIterator<'a> {
 	db: &'a TrieDB<'a>,
 	trail: Vec<Crumb>,
@@ -220,7 +236,7 @@ impl<'a> TrieDBIterator<'a> {
 	fn seek<'key>(&mut self, mut node_data: DBValue, mut key: NibbleSlice<'key>) -> super::Result<()> {
 		loop {
 			let (data, mid) = {
-				let node = Node::decoded(&node_data);
+				let node = TrieDB::decode_node(&node_data);
 				match node {
 					Node::Leaf(slice, _) => {
 						if slice == key {
@@ -282,7 +298,7 @@ impl<'a> TrieDBIterator<'a> {
 
 	/// Descend into a payload.
 	fn descend(&mut self, d: &[u8]) -> super::Result<()> {
-		let node = Node::decoded(&self.db.get_raw_or_lookup(d)?).into();
+		let node = TrieDB::decode_node(&self.db.get_raw_or_lookup(d)?).into();
 		Ok(self.descend_into_node(node))
 	}
 
@@ -337,11 +353,7 @@ impl<'a> Iterator for TrieDBIterator<'a> {
 
 		loop {
 			let iter_step = {
-				match self.trail.last_mut() {
-					Some(b) => { b.increment(); },
-					None => return None,
-				}
-
+				self.trail.last_mut()?.increment();
 				let b = self.trail.last().expect("trail.last_mut().is_some(); qed");
 
 				match (b.status.clone(), &b.node) {
@@ -384,7 +396,7 @@ impl<'a> Iterator for TrieDBIterator<'a> {
 					self.trail.pop();
 				},
 				IterStep::Descend(Ok(d)) => {
-					self.descend_into_node(Node::decoded(&d).into())
+					self.descend_into_node(TrieDB::decode_node(&d).into())
 				},
 				IterStep::Descend(Err(e)) => {
 					return Some(Err(e))
diff --git a/util/src/trie/triedbmut.rs b/util/patricia_trie/src/triedbmut.rs
similarity index 92%
rename from util/src/trie/triedbmut.rs
rename to util/patricia_trie/src/triedbmut.rs
index 6c770a9d5c73a348cc117bd7ec9bb6f829765963..98215de012fd5bebe81d6ef1461ac8138bf1d39c 100644
--- a/util/src/trie/triedbmut.rs
+++ b/util/patricia_trie/src/triedbmut.rs
@@ -21,18 +21,18 @@ use super::lookup::Lookup;
 use super::node::Node as RlpNode;
 use super::node::NodeKey;
 
-use ::{HashDB, H256};
-use ::bytes::ToPretty;
-use ::nibbleslice::NibbleSlice;
-use ::rlp::{Rlp, RlpStream};
-use ::sha3::SHA3_NULL_RLP;
+use hashdb::HashDB;
+use bytes::ToPretty;
+use nibbleslice::NibbleSlice;
+use rlp::{UntrustedRlp, RlpStream};
 use hashdb::DBValue;
 
-use elastic_array::ElasticArray1024;
-
 use std::collections::{HashSet, VecDeque};
 use std::mem;
 use std::ops::Index;
+use ethereum_types::H256;
+use elastic_array::ElasticArray1024;
+use keccak::{KECCAK_NULL_RLP};
 
 // For lookups into the Node storage buffer.
 // This is deliberately non-copyable.
@@ -88,33 +88,39 @@ enum Node {
 impl Node {
 	// load an inline node into memory or get the hash to do the lookup later.
 	fn inline_or_hash(node: &[u8], db: &HashDB, storage: &mut NodeStorage) -> NodeHandle {
-		let r = Rlp::new(node);
-		if r.is_data() && r.size() == 32 {
-			NodeHandle::Hash(r.as_val::<H256>())
-		} else {
-			let child = Node::from_rlp(node, db, storage);
-			NodeHandle::InMemory(storage.alloc(Stored::New(child)))
-		}
+		RlpNode::try_decode_hash(&node)
+			.map(NodeHandle::Hash)
+			.unwrap_or_else(|| {
+				let child = Node::from_rlp(node, db, storage);
+				NodeHandle::InMemory(storage.alloc(Stored::New(child)))
+			})
 	}
 
 	// decode a node from rlp without getting its children.
 	fn from_rlp(rlp: &[u8], db: &HashDB, storage: &mut NodeStorage) -> Self {
-		match RlpNode::decoded(rlp) {
+		match RlpNode::decoded(rlp).expect("rlp read from db; qed") {
 			RlpNode::Empty => Node::Empty,
 			RlpNode::Leaf(k, v) => Node::Leaf(k.encoded(true), DBValue::from_slice(&v)),
 			RlpNode::Extension(key, cb) => {
 				Node::Extension(key.encoded(false), Self::inline_or_hash(cb, db, storage))
 			}
-			RlpNode::Branch(children_rlp, val) => {
-				let mut children = empty_children();
-
-				for i in 0..16 {
+			RlpNode::Branch(ref children_rlp, val) => {
+				let mut child = |i| {
 					let raw = children_rlp[i];
-					let child_rlp = Rlp::new(raw);
-					if !child_rlp.is_empty()  {
-						children[i] = Some(Self::inline_or_hash(raw, db, storage));
+					let child_rlp = UntrustedRlp::new(raw);
+					if !child_rlp.is_empty() {
+						Some(Self::inline_or_hash(raw, db, storage))
+					} else {
+						None
 					}
-				}
+				};
+
+				let children = Box::new([
+					child(0), child(1), child(2), child(3),
+					child(4), child(5), child(6), child(7),
+					child(8), child(9), child(10), child(11),
+					child(12), child(13), child(14), child(15),
+				]);
 
 				Node::Branch(children, val.map(DBValue::from_slice))
 			}
@@ -261,19 +267,24 @@ impl<'a> Index<&'a StorageHandle> for NodeStorage {
 ///
 /// # Example
 /// ```
-/// extern crate ethcore_util as util;
+/// extern crate patricia_trie as trie;
+/// extern crate keccak_hash;
+/// extern crate hashdb;
+/// extern crate memorydb;
+/// extern crate ethereum_types;
 ///
-/// use util::trie::*;
-/// use util::hashdb::*;
-/// use util::memorydb::*;
-/// use util::hash::*;
+/// use keccak_hash::KECCAK_NULL_RLP;
+/// use trie::*;
+/// use hashdb::*;
+/// use memorydb::*;
+/// use ethereum_types::H256;
 ///
 /// fn main() {
 ///   let mut memdb = MemoryDB::new();
 ///   let mut root = H256::new();
 ///   let mut t = TrieDBMut::new(&mut memdb, &mut root);
 ///   assert!(t.is_empty());
-///   assert_eq!(*t.root(), ::util::sha3::SHA3_NULL_RLP);
+///   assert_eq!(*t.root(), KECCAK_NULL_RLP);
 ///   t.insert(b"foo", b"bar").unwrap();
 ///   assert!(t.contains(b"foo").unwrap());
 ///   assert_eq!(t.get(b"foo").unwrap().unwrap(), DBValue::from_slice(b"bar"));
@@ -289,14 +300,14 @@ pub struct TrieDBMut<'a> {
 	death_row: HashSet<H256>,
 	/// The number of hash operations this trie has performed.
 	/// Note that none are performed until changes are committed.
-	pub hash_count: usize,
+	hash_count: usize,
 }
 
 impl<'a> TrieDBMut<'a> {
 	/// Create a new trie with backing database `db` and empty `root`.
 	pub fn new(db: &'a mut HashDB, root: &'a mut H256) -> Self {
-		*root = SHA3_NULL_RLP;
-		let root_handle = NodeHandle::Hash(SHA3_NULL_RLP);
+		*root = KECCAK_NULL_RLP;
+		let root_handle = NodeHandle::Hash(KECCAK_NULL_RLP);
 
 		TrieDBMut {
 			storage: NodeStorage::empty(),
@@ -367,44 +378,50 @@ impl<'a> TrieDBMut<'a> {
 	}
 
 	// walk the trie, attempting to find the key's node.
-	fn lookup<'x, 'key>(&'x self, partial: NibbleSlice<'key>, handle: &NodeHandle) -> super::Result<Option<DBValue>>
+	fn lookup<'x, 'key>(&'x self, mut partial: NibbleSlice<'key>, handle: &NodeHandle) -> super::Result<Option<DBValue>>
 		where 'x: 'key
 	{
-		match *handle {
-			NodeHandle::Hash(ref hash) => Lookup {
-				db: &*self.db,
-				query: DBValue::from_slice,
-				hash: hash.clone(),
-			}.look_up(partial),
-			NodeHandle::InMemory(ref handle) => match self.storage[handle] {
-				Node::Empty => Ok(None),
-				Node::Leaf(ref key, ref value) => {
-					if NibbleSlice::from_encoded(key).0 == partial {
-						Ok(Some(DBValue::from_slice(value)))
-					} else {
-						Ok(None)
+		let mut handle = handle;
+		loop {
+			let (mid, child) = match *handle {
+				NodeHandle::Hash(ref hash) => return Lookup {
+					db: &*self.db,
+					query: DBValue::from_slice,
+					hash: hash.clone(),
+				}.look_up(partial),
+				NodeHandle::InMemory(ref handle) => match self.storage[handle] {
+					Node::Empty => return Ok(None),
+					Node::Leaf(ref key, ref value) => {
+						if NibbleSlice::from_encoded(key).0 == partial {
+							return Ok(Some(DBValue::from_slice(value)));
+						} else {
+							return Ok(None);
+						}
 					}
-				}
-				Node::Extension(ref slice, ref child) => {
-					let slice = NibbleSlice::from_encoded(slice).0;
-					if partial.starts_with(&slice) {
-						self.lookup(partial.mid(slice.len()), child)
-					} else {
-						Ok(None)
+					Node::Extension(ref slice, ref child) => {
+						let slice = NibbleSlice::from_encoded(slice).0;
+						if partial.starts_with(&slice) {
+							(slice.len(), child)
+						} else {
+							return Ok(None);
+						}
 					}
-				}
-				Node::Branch(ref children, ref value) => {
-					if partial.is_empty() {
-						Ok(value.as_ref().map(|v| DBValue::from_slice(v)))
-					} else {
-						let idx = partial.at(0);
-						match children[idx as usize].as_ref() {
-							Some(child) => self.lookup(partial.mid(1), child),
-							None => Ok(None),
+					Node::Branch(ref children, ref value) => {
+						if partial.is_empty() {
+							return Ok(value.as_ref().map(|v| DBValue::from_slice(v)));
+						} else {
+							let idx = partial.at(0);
+							match children[idx as usize].as_ref() {
+								Some(child) => (1, child),
+								None => return Ok(None),
+							}
 						}
 					}
 				}
-			}
+			};
+
+			partial = partial.mid(mid);
+			handle = child;
 		}
 	}
 
@@ -425,7 +442,6 @@ impl<'a> TrieDBMut<'a> {
 	}
 
 	/// the insertion inspector.
-	#[cfg_attr(feature = "dev", allow(cyclomatic_complexity))]
 	fn insert_inspector(&mut self, node: Node, partial: NibbleSlice, value: DBValue, old_val: &mut Option<DBValue>)
 		-> super::Result<InsertAction>
 	{
@@ -865,7 +881,7 @@ impl<'a> TrieMut for TrieDBMut<'a> {
 
 	fn is_empty(&self) -> bool {
 		match self.root_handle {
-			NodeHandle::Hash(h) => h == SHA3_NULL_RLP,
+			NodeHandle::Hash(h) => h == KECCAK_NULL_RLP,
 			NodeHandle::InMemory(ref h) => match self.storage[h] {
 				Node::Empty => true,
 				_ => false,
@@ -913,8 +929,8 @@ impl<'a> TrieMut for TrieDBMut<'a> {
 			}
 			None => {
 				trace!(target: "trie", "remove: obliterated trie");
-				self.root_handle = NodeHandle::Hash(SHA3_NULL_RLP);
-				*self.root = SHA3_NULL_RLP;
+				self.root_handle = NodeHandle::Hash(KECCAK_NULL_RLP);
+				*self.root = KECCAK_NULL_RLP;
 			}
 		}
 
@@ -930,14 +946,16 @@ impl<'a> Drop for TrieDBMut<'a> {
 
 #[cfg(test)]
 mod tests {
-	use triehash::trie_root;
+	extern crate triehash;
+
+	use self::triehash::trie_root;
 	use hashdb::*;
 	use memorydb::*;
 	use super::*;
 	use bytes::ToPretty;
-	use sha3::SHA3_NULL_RLP;
+	use keccak::KECCAK_NULL_RLP;
 	use super::super::TrieMut;
-	use super::super::standardmap::*;
+	use standardmap::*;
 
 	fn populate_trie<'db>(db: &'db mut HashDB, root: &'db mut H256, v: &[(Vec<u8>, Vec<u8>)]) -> TrieDBMut<'db> {
 		let mut t = TrieDBMut::new(db, root);
@@ -990,7 +1008,7 @@ mod tests {
 			assert_eq!(*memtrie.root(), real);
 			unpopulate_trie(&mut memtrie, &x);
 			memtrie.commit();
-			if *memtrie.root() != SHA3_NULL_RLP {
+			if *memtrie.root() != KECCAK_NULL_RLP {
 				println!("- TRIE MISMATCH");
 				println!("");
 				println!("{:?} vs {:?}", memtrie.root(), real);
@@ -998,7 +1016,7 @@ mod tests {
 					println!("{:?} -> {:?}", i.0.pretty(), i.1.pretty());
 				}
 			}
-			assert_eq!(*memtrie.root(), SHA3_NULL_RLP);
+			assert_eq!(*memtrie.root(), KECCAK_NULL_RLP);
 		}
 	}
 
@@ -1007,7 +1025,7 @@ mod tests {
 		let mut memdb = MemoryDB::new();
 		let mut root = H256::new();
 		let mut t = TrieDBMut::new(&mut memdb, &mut root);
-		assert_eq!(*t.root(), SHA3_NULL_RLP);
+		assert_eq!(*t.root(), KECCAK_NULL_RLP);
 	}
 
 	#[test]
@@ -1262,7 +1280,7 @@ mod tests {
 		}
 
 		assert!(t.is_empty());
-		assert_eq!(*t.root(), SHA3_NULL_RLP);
+		assert_eq!(*t.root(), KECCAK_NULL_RLP);
 	}
 
 	#[test]
diff --git a/util/plain_hasher/Cargo.toml b/util/plain_hasher/Cargo.toml
index 0ed45ba36ccb027324d039a0db2b2f41697a3535..d79ea4c5e42c58d93451f72a7dcff1e6e848a5be 100644
--- a/util/plain_hasher/Cargo.toml
+++ b/util/plain_hasher/Cargo.toml
@@ -5,8 +5,8 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 keywords = ["hash", "hasher"]
-categories = ["no-std"]
 homepage = "https://github.com/paritytech/plain_hasher"
 
 [dependencies]
 crunchy = "0.1.6"
+ethereum-types = "0.2"
diff --git a/util/plain_hasher/src/lib.rs b/util/plain_hasher/src/lib.rs
index b16596363b23111a5eff7d1125ee24f34b64fabd..54bad92f47ede21336a912732f9ee2e113c38bbb 100644
--- a/util/plain_hasher/src/lib.rs
+++ b/util/plain_hasher/src/lib.rs
@@ -1,8 +1,15 @@
-#![no_std]
 #[macro_use]
 extern crate crunchy;
+extern crate ethereum_types;
 
-use core::{hash, mem};
+use std::{hash, mem};
+use std::collections::{HashMap, HashSet};
+use ethereum_types::H256;
+
+/// Specialized version of `HashMap` with H256 keys and fast hashing function.
+pub type H256FastMap<T> = HashMap<H256, T, hash::BuildHasherDefault<PlainHasher>>;
+/// Specialized version of `HashSet` with H256 keys and fast hashing function.
+pub type H256FastSet = HashSet<H256, hash::BuildHasherDefault<PlainHasher>>;
 
 /// Hasher that just takes 8 bytes of the provided value.
 /// May only be used for keys which are 32 bytes.
@@ -41,7 +48,7 @@ impl hash::Hasher for PlainHasher {
 
 #[cfg(test)]
 mod tests {
-	use core::hash::Hasher;
+	use std::hash::Hasher;
 	use super::PlainHasher;
 
 	#[test]
diff --git a/util/rlp/Cargo.toml b/util/rlp/Cargo.toml
index aa682e4699f1faf21a8c6ea411853e19544015cd..ecb3b39312b4f34899c574abbb8497d4935265bc 100644
--- a/util/rlp/Cargo.toml
+++ b/util/rlp/Cargo.toml
@@ -3,12 +3,11 @@ description = "Recursive-length prefix encoding, decoding, and compression"
 repository = "https://github.com/paritytech/parity"
 license = "MIT/Apache-2.0"
 name = "rlp"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-elastic-array = "0.9"
-ethcore-bigint = { path = "../bigint" }
-lazy_static = "0.2"
+elastic-array = "0.10"
+ethereum-types = "0.2"
 rustc-hex = "1.0"
 byteorder = "1.0"
diff --git a/util/rlp/src/compression.rs b/util/rlp/src/compression.rs
deleted file mode 100644
index f76a3b7ab6d7ad06ef228f9db3c0c6d24be23d94..0000000000000000000000000000000000000000
--- a/util/rlp/src/compression.rs
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright 2015-2017 Parity Technologies
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::collections::HashMap;
-use elastic_array::ElasticArray1024;
-use common::{BLOCKS_RLP_SWAPPER, SNAPSHOT_RLP_SWAPPER};
-use {UntrustedRlp, Compressible, encode, RlpStream};
-
-/// Stores RLPs used for compression
-pub struct InvalidRlpSwapper<'a> {
-	invalid_to_valid: HashMap<&'a [u8], &'a [u8]>,
-	valid_to_invalid: HashMap<&'a [u8], &'a [u8]>,
-}
-
-impl<'a> InvalidRlpSwapper<'a> {
-	/// Construct a swapper from a list of common RLPs
-	pub fn new(rlps_to_swap: &[&'a [u8]], invalid_rlps: &[&'a [u8]]) -> Self {
-		if rlps_to_swap.len() > 0x7e {
-			panic!("Invalid usage, only 127 RLPs can be swappable.");
-		}
-		let mut invalid_to_valid = HashMap::new();
-		let mut valid_to_invalid = HashMap::new();
-		for (&rlp, &invalid) in rlps_to_swap.iter().zip(invalid_rlps.iter()) {
-			invalid_to_valid.insert(invalid, rlp);
-			valid_to_invalid.insert(rlp, invalid);
-		}
-		InvalidRlpSwapper {
-			invalid_to_valid: invalid_to_valid,
-			valid_to_invalid: valid_to_invalid
-		}
-	}
-	/// Get a valid RLP corresponding to an invalid one
-	fn get_valid(&self, invalid_rlp: &[u8]) -> Option<&[u8]> {
-		self.invalid_to_valid.get(invalid_rlp).cloned()
-	}
-	/// Get an invalid RLP corresponding to a valid one
-	fn get_invalid(&self, valid_rlp: &[u8]) -> Option<&[u8]> {
-		self.valid_to_invalid.get(valid_rlp).cloned()
-	}
-}
-
-/// Type of RLP indicating its origin database.
-pub enum RlpType {
-	/// RLP used in blocks database.
-	Blocks,
-	/// RLP used in snapshots.
-	Snapshot,
-}
-
-fn to_elastic(slice: &[u8]) -> ElasticArray1024<u8> {
-	let mut out = ElasticArray1024::new();
-	out.append_slice(slice);
-	out
-}
-
-fn map_rlp<F>(rlp: &UntrustedRlp, f: F) -> Option<ElasticArray1024<u8>> where
-	F: Fn(&UntrustedRlp) -> Option<ElasticArray1024<u8>> {
-	match rlp.iter()
-		.fold((false, RlpStream::new_list(rlp.item_count().unwrap_or(0))),
-		|(is_some, mut acc), subrlp| {
-  		let new = f(&subrlp);
-  		if let Some(ref insert) = new {
-  			acc.append_raw(&insert[..], 1);
-  		} else {
-  			acc.append_raw(subrlp.as_raw(), 1);
-  		}
-  		(is_some || new.is_some(), acc)
-  	  }) {
-  	(true, s) => Some(s.drain()),
-  	_ => None,
-  }
-}
-
-/// Replace common RLPs with invalid shorter ones.
-fn simple_compress(rlp: &UntrustedRlp, swapper: &InvalidRlpSwapper) -> ElasticArray1024<u8> {
-	if rlp.is_data() {
-		to_elastic(swapper.get_invalid(rlp.as_raw()).unwrap_or_else(|| rlp.as_raw()))
-	} else {
-		map_rlp(rlp, |r| Some(simple_compress(r, swapper))).unwrap_or_else(|| to_elastic(rlp.as_raw()))
-	}
-}
-
-/// Recover valid RLP from a compressed form.
-fn simple_decompress(rlp: &UntrustedRlp, swapper: &InvalidRlpSwapper) -> ElasticArray1024<u8> {
-	if rlp.is_data() {
-		to_elastic(swapper.get_valid(rlp.as_raw()).unwrap_or_else(|| rlp.as_raw()))
-	} else {
-		map_rlp(rlp, |r| Some(simple_decompress(r, swapper))).unwrap_or_else(|| to_elastic(rlp.as_raw()))
-	}
-}
-
-/// Recover valid RLP from a compressed form, None if no decompression achieved.
-/// Tries to decompress compressed data insides.
-fn deep_decompress(rlp: &UntrustedRlp, swapper: &InvalidRlpSwapper) -> Option<ElasticArray1024<u8>> {
-	let simple_swap = ||
-		swapper.get_valid(rlp.as_raw()).map(to_elastic);
-	// Simply decompress data.
-	if rlp.is_data() { return simple_swap(); }
-	match rlp.item_count().unwrap_or(0) {
-		// Look for special compressed list, which contains nested data.
-		2 if rlp.at(0).map(|r| r.as_raw() == &[0x81, 0x7f]).unwrap_or(false) =>
-			rlp.at(1).ok().map_or(simple_swap(),
-			|r| deep_decompress(&r, swapper).map(|d| { let v = d.into_vec(); encode(&v) })),
-		// Iterate through RLP while checking if it has been compressed.
-		_ => map_rlp(rlp, |r| deep_decompress(r, swapper)),
-  	}
-}
-
-impl<'a> Compressible for UntrustedRlp<'a> {
-	type DataType = RlpType;
-
-	fn compress(&self, t: RlpType) -> ElasticArray1024<u8> {
-		match t {
-			RlpType::Snapshot => simple_compress(self, &SNAPSHOT_RLP_SWAPPER),
-			RlpType::Blocks => simple_compress(self, &BLOCKS_RLP_SWAPPER),
-		}
-	}
-
-	fn decompress(&self, t: RlpType) -> ElasticArray1024<u8> {
-		match t {
-			RlpType::Snapshot => simple_decompress(self, &SNAPSHOT_RLP_SWAPPER),
-			RlpType::Blocks => deep_decompress(self, &BLOCKS_RLP_SWAPPER).unwrap_or_else(|| to_elastic(self.as_raw())),
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use compression::InvalidRlpSwapper;
-	use {UntrustedRlp, Compressible, RlpType};
-
-	#[test]
-	fn invalid_rlp_swapper() {
-		let to_swap: &[&[u8]] = &[&[0x83, b'c', b'a', b't'], &[0x83, b'd', b'o', b'g']];
-		let invalid_rlp: &[&[u8]] = &[&[0x81, 0x00], &[0x81, 0x01]];
-		let swapper = InvalidRlpSwapper::new(to_swap, invalid_rlp);
-		assert_eq!(Some(invalid_rlp[0]), swapper.get_invalid(&[0x83, b'c', b'a', b't']));
-		assert_eq!(None, swapper.get_invalid(&[0x83, b'b', b'a', b't']));
-		assert_eq!(Some(to_swap[1]), swapper.get_valid(invalid_rlp[1]));
-	}
-
-	#[test]
-	fn simple_compression() {
-		let basic_account_rlp = vec![248, 68, 4, 2, 160, 86, 232, 31, 23, 27, 204, 85, 166, 255, 131, 69, 230, 146, 192, 248, 110, 91, 72, 224, 27, 153, 108, 173, 192, 1, 98, 47, 181, 227, 99, 180, 33, 160, 197, 210, 70, 1, 134, 247, 35, 60, 146, 126, 125, 178, 220, 199, 3, 192, 229, 0, 182, 83, 202, 130, 39, 59, 123, 250, 216, 4, 93, 133, 164, 112];
-		let rlp = UntrustedRlp::new(&basic_account_rlp);
-		let compressed = rlp.compress(RlpType::Snapshot).into_vec();
-		assert_eq!(compressed, vec![198, 4, 2, 129, 0, 129, 1]);
-		let compressed_rlp = UntrustedRlp::new(&compressed);
-		assert_eq!(compressed_rlp.decompress(RlpType::Snapshot).into_vec(), basic_account_rlp);
-	}
-
-	#[test]
-	fn data_compression() {
-		let data_basic_account_rlp = vec![184, 70, 248, 68, 4, 2, 160, 86, 232, 31, 23, 27, 204, 85, 166, 255, 131, 69, 230, 146, 192, 248, 110, 91, 72, 224, 27, 153, 108, 173, 192, 1, 98, 47, 181, 227, 99, 180, 33, 160, 197, 210, 70, 1, 134, 247, 35, 60, 146, 126, 125, 178, 220, 199, 3, 192, 229, 0, 182, 83, 202, 130, 39, 59, 123, 250, 216, 4, 93, 133, 164, 112];
-		let compressed = vec![201, 129, 127, 198, 4, 2, 129, 0, 129, 1];
-		let compressed_rlp = UntrustedRlp::new(&compressed);
-		assert_eq!(compressed_rlp.decompress(RlpType::Blocks).into_vec(), data_basic_account_rlp);
-	}
-
-	#[test]
-	fn nested_list_rlp() {
-		let nested_basic_account_rlp = vec![228, 4, 226, 2, 160, 86, 232, 31, 23, 27, 204, 85, 166, 255, 131, 69, 230, 146, 192, 248, 110, 91, 72, 224, 27, 153, 108, 173, 192, 1, 98, 47, 181, 227, 99, 180, 33];
-		let nested_rlp = UntrustedRlp::new(&nested_basic_account_rlp);
-		let compressed = nested_rlp.compress(RlpType::Blocks).into_vec();
-		assert_eq!(compressed, vec![197, 4, 195, 2, 129, 0]);
-		let compressed_rlp = UntrustedRlp::new(&compressed);
-		assert_eq!(compressed_rlp.decompress(RlpType::Blocks).into_vec(), nested_basic_account_rlp);
-		let compressed = nested_rlp.compress(RlpType::Snapshot).into_vec();
-		assert_eq!(compressed, vec![197, 4, 195, 2, 129, 0]);
-		let compressed_rlp = UntrustedRlp::new(&compressed);
-		assert_eq!(compressed_rlp.decompress(RlpType::Snapshot).into_vec(), nested_basic_account_rlp);
-	}
-
-	#[test]
-	fn malformed_rlp() {
-		let malformed = vec![248, 81, 128, 128, 128, 128, 128, 160, 12, 51, 241, 93, 69, 218, 74, 138, 79, 115, 227, 44, 216, 81, 46, 132, 85, 235, 96, 45, 252, 48, 181, 29, 75, 141, 217, 215, 86, 160, 109, 130, 160, 140, 36, 93, 200, 109, 215, 100, 241, 246, 99, 135, 92, 168, 149, 170, 114, 9, 143, 4, 93, 25, 76, 54, 176, 119, 230, 170, 154, 105, 47, 121, 10, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128];
-		let malformed_rlp = UntrustedRlp::new(&malformed);
-		assert_eq!(malformed_rlp.decompress(RlpType::Blocks).into_vec(), malformed);
-	}
-
-	#[test]
-	fn large_block() {
-		let block = vec![249, 97, 87, 249, 2, 19, 160, 137, 152, 36, 115, 234, 67, 89, 207, 44, 42, 186, 128, 91, 242, 10, 16, 42, 193, 195, 2, 129, 60, 181, 150, 192, 178, 117, 15, 18, 100, 174, 249, 160, 29, 204, 77, 232, 222, 199, 93, 122, 171, 133, 181, 103, 182, 204, 212, 26, 211, 18, 69, 27, 148, 138, 116, 19, 240, 161, 66, 253, 64, 212, 147, 71, 148, 223, 125, 126, 5, 57, 51, 181, 204, 36, 55, 47, 135, 140, 144, 230, 45, 173, 173, 93, 66, 160, 93, 42, 52, 28, 156, 139, 242, 60, 121, 90, 117, 99, 92, 182, 196, 25, 131, 16, 155, 186, 239, 137, 33, 118, 105, 232, 230, 239, 213, 240, 207, 6, 160, 59, 72, 35, 216, 124, 37, 62, 178, 34, 97, 180, 254, 212, 103, 179, 45, 247, 168, 205, 145, 7, 157, 75, 247, 83, 230, 233, 248, 97, 132, 232, 161, 160, 122, 167, 249, 196, 203, 2, 173, 180, 106, 203, 129, 214, 232, 181, 87, 39, 60, 99, 135, 6, 40, 34, 163, 118, 140, 149, 79, 241, 238, 230, 201, 194, 185, 1, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 134, 36, 160, 31, 187, 182, 29, 131, 58, 212, 207, 131, 71, 168, 13, 131, 45, 60, 7, 132, 89, 53, 51, 233, 147, 69, 84, 67, 32, 101, 116, 104, 101, 114, 109, 105, 110, 101, 32, 45, 32, 69, 85, 49, 160, 204, 49, 229, 99, 26, 47, 30, 50, 223, 117, 111, 168, 102, 158, 12, 186, 140, 98, 193, 196, 214, 29, 13, 87, 44, 31, 216, 48, 250, 251, 148, 69, 136, 225, 206, 131, 96, 2, 39, 50, 46, 249, 95, 61, 248, 109, 1, 133, 4, 227, 178, 146, 0, 130, 82, 8, 148, 123, 45, 95, 28, 247, 139, 190, 196, 52, 39, 251, 53, 226, 79, 251, 1, 98, 34, 68, 240, 136, 18, 81, 1, 26, 180, 46, 168, 0, 128, 129, 157, 160, 31, 164, 62, 186, 38, 56, 118, 133, 24, 180, 239, 139, 254, 154, 196, 115, 8, 246, 45, 233, 227, 165, 192, 193, 7, 111, 1, 169, 2, 204, 2, 144, 160, 42, 60, 78, 200, 5, 113, 98, 65, 250, 105, 0, 164, 152, 81, 235, 154, 100, 204, 182, 141, 174, 39, 107, 127, 219, 120, 63, 221, 237, 87, 57, 9, 249, 94, 203, 52, 133, 2, 84, 11, 228, 0, 131, 44, 233, 255, 148, 137, 61, 196, 25, 119, 102, 53, 248, 253, 27, 31, 169, 147, 75, 245, 41, 174, 242, 86, 7, 128, 185, 94, 100, 194, 32, 154, 203, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 131, 110, 76, 27, 36, 34, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 91, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 248, 249, 1, 245, 160, 89, 97, 73, 3, 84, 63, 105, 163, 169, 7, 237, 254, 220, 243, 13, 27, 0, 45, 215, 39, 235, 232, 237, 22, 162, 83, 99, 164, 247, 240, 48, 66, 160, 29, 204, 77, 232, 222, 199, 93, 122, 171, 133, 181, 103, 182, 204, 212, 26, 211, 18, 69, 27, 148, 138, 116, 19, 240, 161, 66, 253, 64, 212, 147, 71, 148, 137, 61, 196, 25, 119, 102, 53, 248, 253, 27, 31, 169, 147, 75, 245, 41, 174, 242, 86, 7, 160, 243, 100, 253, 32, 58, 153, 124, 189, 215, 216, 21, 229, 230, 182, 39, 222, 135, 217, 92, 155, 164, 143, 79, 14, 178, 128, 26, 245, 152, 197, 247, 33, 160, 98, 156, 249, 227, 33, 40, 127, 226, 250, 254, 222, 21, 37, 66, 5, 23, 142, 73, 121, 64, 233, 198, 110, 212, 131, 134, 126, 38, 218, 85, 149, 212, 160, 32, 179, 60, 112, 219, 114, 185, 205, 184, 204, 31, 210, 181, 8, 109, 97, 227, 206, 41, 177, 238, 122, 205, 193, 93, 163, 176, 107, 28, 181, 63, 19, 185, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134, 36, 236, 76, 26, 58, 130, 131, 58, 210, 155, 131, 71, 183, 132, 130, 82, 8, 132, 89, 53, 19, 83, 160, 83, 109, 97, 114, 116, 80, 111, 111, 108, 45, 79, 76, 69, 66, 100, 120, 122, 50, 54, 106, 73, 50, 74, 65, 72, 109, 52, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 203, 86, 242, 75, 191, 176, 245, 37, 106, 66, 34, 44, 77, 161, 164, 143, 56, 229, 102, 192, 191, 114, 46, 137, 15, 59, 249, 198, 20, 64, 167, 176, 167, 146, 234, 72, 147, 122, 168, 34, 174, 210, 94, 131, 105, 110, 180, 48, 248, 10, 127, 156, 194, 83, 60, 48, 89, 126, 86, 90, 218, 235, 170, 15, 206, 23, 82, 13, 250, 255, 240, 112, 168, 137, 111, 204, 205, 125, 24, 81, 118, 165, 92, 28, 127, 50, 223, 173, 231, 234, 212, 181, 9, 113, 72, 250, 97, 126, 194, 18, 102, 51, 189, 147, 246, 2, 201, 27, 206, 15, 130, 172, 1, 206, 219, 204, 49, 211, 162, 78, 101, 26, 16, 73, 106, 70, 209, 118, 140, 59, 133, 162, 114, 14, 92, 8, 26, 83, 213, 91, 136, 207, 228, 86, 13, 208, 64, 85, 211, 143, 252, 181, 128, 77, 187, 198, 50, 91, 26, 156, 109, 233, 136, 36, 216, 142, 87, 112, 45, 166, 235, 118, 128, 191, 66, 23, 48, 32, 3, 41, 37, 103, 8, 180, 236, 77, 106, 59, 18, 77, 206, 23, 154, 143, 236, 63, 235, 52, 105, 155, 38, 207, 31, 145, 193, 98, 251, 216, 224, 213, 250, 164, 22, 21, 227, 190, 223, 74, 29, 107, 0, 103, 187, 53, 129, 204, 202, 170, 156, 19, 67, 185, 100, 252, 5, 129, 164, 58, 228, 121, 214, 27, 53, 35, 16, 238, 93, 64, 94, 4, 250, 138, 102, 22, 128, 37, 229, 104, 40, 245, 216, 107, 16, 52, 202, 54, 98, 43, 162, 245, 56, 48, 150, 41, 3, 224, 167, 171, 5, 254, 106, 199, 0, 47, 238, 162, 27, 114, 168, 111, 231, 241, 102, 79, 138, 66, 168, 38, 157, 140, 76, 56, 155, 66, 109, 253, 243, 207, 79, 88, 167, 111, 251, 135, 38, 249, 85, 167, 36, 113, 7, 243, 34, 132, 113, 117, 8, 245, 93, 79, 171, 12, 223, 157, 41, 201, 221, 129, 60, 186, 164, 123, 1, 247, 202, 28, 61, 121, 156, 214, 55, 68, 36, 205, 113, 203, 45, 173, 24, 190, 32, 42, 207, 69, 189, 209, 221, 50, 18, 77, 60, 249, 233, 101, 216, 168, 47, 16, 155, 172, 248, 90, 115, 162, 134, 95, 6, 227, 202, 46, 26, 133, 135, 65, 251, 97, 109, 181, 141, 87, 156, 59, 40, 253, 87, 116, 244, 225, 242, 133, 77, 199, 120, 210, 152, 108, 90, 137, 127, 214, 137, 250, 180, 148, 113, 71, 68, 183, 216, 166, 169, 54, 174, 235, 51, 45, 172, 47, 5, 205, 154, 71, 241, 106, 228, 222, 150, 34, 95, 68, 251, 78, 244, 111, 59, 252, 138, 106, 31, 185, 107, 123, 22, 37, 184, 249, 117, 231, 56, 224, 137, 13, 254, 50, 240, 252, 220, 74, 33, 223, 163, 97, 74, 180, 232, 189, 92, 104, 193, 59, 255, 80, 10, 146, 236, 17, 80, 90, 139, 35, 212, 153, 19, 13, 159, 7, 184, 77, 193, 43, 251, 149, 176, 147, 169, 227, 236, 74, 98, 163, 193, 180, 4, 186, 19, 29, 212, 166, 177, 114, 30, 254, 241, 141, 95, 72, 99, 104, 101, 21, 141, 181, 85, 200, 184, 190, 11, 255, 74, 39, 89, 41, 204, 187, 96, 202, 188, 191, 157, 135, 239, 166, 155, 86, 32, 228, 198, 117, 41, 31, 54, 151, 229, 214, 56, 149, 187, 177, 123, 164, 182, 232, 188, 21, 94, 2, 155, 177, 124, 94, 151, 249, 116, 78, 62, 0, 194, 76, 156, 86, 227, 11, 25, 35, 6, 175, 77, 151, 60, 44, 114, 234, 153, 124, 79, 114, 88, 36, 178, 223, 229, 61, 90, 198, 60, 237, 224, 169, 115, 22, 152, 254, 235, 17, 130, 53, 1, 235, 67, 90, 238, 52, 170, 182, 73, 182, 138, 182, 189, 130, 170, 200, 91, 14, 150, 174, 100, 63, 29, 93, 171, 150, 154, 93, 72, 34, 156, 173, 108, 74, 29, 107, 197, 130, 86, 106, 178, 138, 210, 0, 92, 11, 78, 111, 226, 120, 169, 222, 50, 18, 156, 170, 98, 206, 97, 21, 28, 112, 234, 145, 2, 216, 188, 172, 150, 183, 39, 125, 17, 146, 49, 184, 242, 2, 60, 19, 162, 180, 210, 254, 249, 182, 240, 148, 184, 118, 113, 198, 27, 115, 165, 193, 97, 232, 201, 140, 63, 200, 153, 10, 162, 170, 69, 68, 152, 199, 103, 14, 164, 228, 120, 71, 47, 196, 217, 251, 181, 26, 112, 185, 116, 184, 77, 93, 236, 160, 235, 40, 0, 162, 199, 123, 223, 37, 53, 73, 177, 69, 207, 11, 137, 67, 204, 57, 231, 50, 185, 148, 48, 30, 102, 195, 248, 40, 189, 227, 187, 95, 166, 1, 7, 30, 112, 32, 101, 38, 72, 208, 52, 67, 131, 96, 34, 192, 156, 48, 92, 231, 188, 97, 103, 97, 41, 254, 33, 72, 190, 68, 184, 85, 114, 25, 94, 65, 144, 102, 176, 150, 76, 247, 146, 9, 188, 66, 4, 144, 98, 233, 196, 166, 7, 15, 54, 148, 247, 81, 52, 253, 27, 113, 235, 255, 230, 179, 168, 140, 95, 230, 163, 86, 235, 119, 185, 152, 223, 129, 48, 169, 170, 225, 224, 154, 164, 209, 129, 232, 92, 190, 187, 38, 217, 36, 113, 250, 61, 125, 168, 25, 70, 227, 39, 142, 12, 226, 20, 134, 82, 143, 147, 211, 173, 149, 223, 58, 27, 163, 18, 252, 148, 112, 19, 101, 144, 21, 105, 34, 200, 254, 11, 254, 8, 247, 210, 142, 194, 54, 150, 34, 171, 33, 203, 79, 79, 135, 186, 51, 68, 215, 106, 100, 21, 239, 178, 68, 230, 238, 72, 4, 31, 101, 161, 29, 204, 129, 234, 66, 195, 6, 69, 77, 48, 157, 137, 236, 96, 138, 119, 86, 147, 205, 172, 242, 28, 115, 188, 254, 216, 35, 89, 33, 27, 162, 243, 58, 102, 131, 50, 23, 169, 58, 218, 111, 6, 199, 164, 171, 104, 207, 34, 111, 229, 3, 207, 124, 96, 241, 95, 105, 113, 4, 16, 48, 163, 153, 0, 96, 174, 246, 3, 154, 124, 14, 132, 237, 184, 91, 217, 201, 53, 80, 39, 31, 113, 246, 67, 132, 85, 62, 153, 187, 240, 180, 117, 162, 17, 27, 190, 72, 178, 14, 101, 173, 200, 14, 196, 225, 212, 38, 153, 165, 147, 130, 51, 134, 40, 36, 7, 234, 179, 73, 28, 224, 4, 222, 10, 61, 65, 78, 23, 98, 246, 144, 9, 16, 180, 248, 56, 214, 162, 214, 18, 50, 67, 207, 3, 77, 7, 6, 28, 43, 131, 124, 117, 124, 213, 160, 67, 1, 44, 39, 15, 28, 149, 45, 54, 127, 157, 237, 193, 132, 174, 214, 8, 164, 106, 159, 213, 27, 173, 33, 24, 31, 110, 210, 95, 140, 236, 71, 68, 207, 225, 134, 105, 25, 226, 168, 119, 172, 1, 252, 11, 231, 182, 93, 254, 211, 58, 78, 192, 168, 67, 71, 11, 160, 76, 111, 234, 138, 119, 135, 51, 226, 113, 167, 146, 103, 97, 43, 192, 133, 252, 124, 42, 190, 217, 38, 95, 95, 222, 14, 245, 192, 116, 245, 68, 114, 253, 25, 229, 221, 0, 158, 27, 163, 45, 244, 200, 0, 205, 150, 162, 76, 224, 168, 203, 79, 114, 137, 18, 206, 12, 152, 241, 159, 245, 197, 175, 146, 16, 62, 152, 112, 233, 23, 132, 151, 100, 175, 26, 83, 0, 254, 150, 230, 94, 174, 77, 39, 57, 106, 155, 69, 85, 230, 239, 202, 205, 49, 17, 47, 72, 128, 251, 42, 157, 218, 234, 213, 127, 118, 152, 74, 139, 99, 120, 217, 116, 16, 73, 79, 40, 88, 107, 38, 132, 34, 101, 225, 109, 114, 91, 66, 69, 10, 44, 191, 6, 160, 208, 104, 123, 247, 247, 49, 151, 246, 216, 228, 157, 69, 140, 155, 98, 147, 202, 12, 79, 168, 40, 210, 164, 230, 241, 107, 109, 231, 243, 187, 252, 100, 70, 41, 140, 35, 231, 115, 98, 49, 192, 102, 46, 12, 82, 162, 226, 104, 86, 169, 42, 34, 213, 76, 89, 197, 131, 10, 25, 120, 204, 115, 231, 103, 217, 164, 13, 166, 139, 141, 77, 75, 27, 21, 84, 212, 209, 189, 148, 198, 213, 96, 234, 190, 213, 40, 210, 152, 141, 4, 110, 167, 209, 226, 236, 247, 139, 119, 215, 175, 30, 49, 225, 174, 42, 195, 251, 228, 170, 246, 94, 117, 128, 34, 177, 10, 15, 126, 165, 52, 159, 249, 67, 35, 200, 86, 65, 254, 141, 198, 219, 55, 225, 240, 111, 248, 101, 29, 235, 192, 112, 225, 19, 255, 139, 129, 46, 42, 9, 8, 74, 58, 254, 191, 49, 173, 189, 32, 5, 174, 81, 223, 94, 145, 85, 40, 194, 145, 251, 88, 168, 166, 143, 39, 33, 111, 230, 115, 77, 113, 83, 100, 211, 244, 163, 201, 141, 71, 193, 106, 138, 3, 215, 134, 217, 191, 10, 177, 250, 233, 247, 127, 162, 112, 206, 150, 187, 205, 141, 211, 181, 58, 199, 11, 220, 91, 180, 169, 182, 178, 224, 159, 144, 105, 146, 29, 162, 221, 106, 190, 209, 151, 126, 98, 187, 91, 50, 91, 198, 210, 78, 189, 155, 193, 208, 178, 164, 0, 189, 145, 189, 7, 162, 88, 156, 33, 118, 176, 125, 130, 199, 108, 240, 99, 125, 119, 202, 188, 53, 17, 140, 102, 26, 30, 23, 30, 214, 203, 93, 82, 6, 67, 28, 31, 12, 166, 105, 63, 132, 69, 166, 208, 252, 140, 56, 175, 245, 17, 170, 3, 193, 26, 168, 92, 40, 131, 82, 17, 144, 128, 91, 48, 220, 16, 209, 53, 226, 4, 225, 6, 253, 141, 25, 254, 146, 41, 63, 90, 19, 6, 75, 96, 130, 156, 14, 91, 231, 207, 128, 244, 15, 135, 63, 45, 235, 51, 134, 10, 75, 252, 212, 63, 51, 131, 253, 110, 144, 239, 182, 194, 107, 45, 103, 124, 83, 154, 173, 181, 51, 60, 63, 75, 172, 103, 222, 53, 31, 73, 93, 76, 159, 184, 24, 240, 41, 97, 72, 131, 54, 113, 170, 233, 182, 86, 62, 88, 131, 206, 86, 180, 32, 143, 172, 114, 41, 233, 121, 221, 190, 192, 97, 48, 196, 185, 135, 67, 79, 190, 66, 181, 196, 246, 211, 94, 250, 228, 62, 117, 159, 141, 54, 186, 81, 143, 113, 108, 102, 252, 182, 146, 233, 20, 135, 30, 255, 237, 33, 224, 68, 8, 175, 33, 58, 49, 16, 226, 113, 54, 90, 209, 159, 211, 193, 203, 187, 186, 156, 89, 81, 127, 211, 171, 113, 92, 238, 193, 159, 11, 242, 183, 97, 67, 211, 138, 203, 35, 113, 247, 64, 205, 71, 2, 127, 208, 90, 139, 132, 148, 180, 247, 7, 119, 195, 128, 96, 221, 195, 110, 44, 53, 114, 26, 196, 226, 219, 134, 195, 190, 205, 171, 29, 137, 224, 75, 167, 188, 94, 123, 199, 64, 167, 105, 191, 52, 247, 43, 224, 181, 250, 58, 109, 25, 1, 120, 7, 223, 250, 69, 199, 83, 15, 20, 136, 90, 247, 128, 109, 169, 243, 24, 220, 215, 188, 169, 46, 31, 131, 112, 79, 132, 93, 170, 127, 238, 207, 138, 110, 201, 232, 163, 214, 77, 45, 113, 103, 179, 197, 206, 83, 148, 6, 185, 231, 174, 111, 171, 162, 147, 39, 252, 36, 132, 173, 145, 77, 43, 223, 164, 46, 136, 129, 210, 219, 221, 202, 246, 182, 95, 135, 8, 55, 229, 71, 245, 57, 131, 217, 93, 90, 179, 195, 230, 102, 169, 80, 51, 197, 6, 48, 143, 112, 121, 27, 79, 174, 47, 88, 240, 47, 10, 62, 94, 177, 78, 234, 112, 136, 65, 84, 4, 245, 190, 138, 38, 98, 108, 187, 47, 236, 65, 95, 233, 245, 47, 126, 208, 199, 74, 229, 158, 20, 238, 148, 218, 241, 233, 229, 13, 14, 206, 95, 42, 22, 65, 191, 218, 73, 116, 90, 23, 4, 166, 32, 236, 51, 107, 252, 198, 10, 163, 100, 140, 221, 174, 111, 179, 171, 183, 159, 204, 229, 104, 156, 190, 99, 142, 130, 46, 142, 31, 244, 30, 114, 69, 86, 159, 173, 185, 88, 130, 238, 12, 216, 140, 134, 15, 104, 64, 131, 106, 95, 206, 11, 1, 183, 75, 167, 43, 63, 188, 39, 144, 14, 179, 140, 47, 140, 253, 202, 192, 215, 156, 108, 18, 211, 9, 75, 108, 47, 212, 81, 24, 149, 244, 189, 60, 199, 210, 251, 22, 15, 247, 145, 136, 59, 51, 228, 31, 227, 226, 12, 199, 36, 126, 167, 153, 168, 220, 216, 56, 68, 79, 99, 88, 13, 34, 125, 123, 33, 239, 167, 121, 240, 167, 65, 1, 82, 9, 126, 165, 52, 107, 207, 11, 48, 112, 3, 150, 102, 30, 177, 250, 211, 194, 239, 204, 242, 27, 31, 118, 231, 44, 200, 178, 138, 104, 164, 131, 113, 205, 95, 88, 165, 136, 177, 7, 111, 216, 83, 186, 110, 193, 241, 164, 24, 237, 204, 95, 250, 183, 26, 100, 70, 58, 91, 190, 43, 165, 31, 136, 139, 190, 27, 67, 52, 72, 65, 120, 121, 54, 81, 27, 209, 28, 74, 51, 58, 211, 86, 46, 92, 123, 222, 10, 44, 145, 78, 90, 26, 61, 64, 143, 228, 227, 254, 73, 218, 85, 93, 218, 33, 123, 181, 195, 9, 76, 237, 41, 119, 145, 131, 106, 4, 150, 58, 7, 156, 65, 113, 108, 28, 135, 43, 21, 245, 159, 20, 163, 123, 27, 20, 58, 212, 183, 242, 82, 228, 110, 80, 53, 164, 161, 180, 244, 125, 168, 207, 81, 4, 253, 95, 101, 88, 31, 63, 25, 134, 59, 130, 0, 90, 220, 24, 200, 221, 149, 76, 225, 16, 26, 77, 179, 172, 190, 145, 199, 145, 239, 140, 106, 131, 29, 211, 187, 12, 207, 40, 205, 237, 151, 159, 18, 76, 49, 193, 137, 196, 197, 105, 181, 171, 23, 172, 208, 115, 95, 139, 136, 150, 211, 251, 132, 247, 206, 93, 70, 19, 181, 13, 205, 216, 79, 238, 229, 123, 12, 38, 24, 233, 96, 205, 223, 126, 95, 54, 15, 145, 149, 40, 41, 34, 30, 17, 1, 153, 252, 244, 214, 40, 66, 158, 71, 219, 142, 206, 216, 251, 200, 191, 75, 34, 147, 163, 27, 127, 64, 195, 187, 129, 132, 63, 224, 112, 1, 154, 28, 76, 141, 165, 195, 155, 53, 84, 189, 57, 148, 144, 98, 14, 232, 213, 179, 55, 191, 169, 203, 103, 99, 120, 159, 254, 201, 113, 51, 23, 99, 116, 246, 200, 59, 122, 13, 165, 118, 14, 230, 35, 231, 158, 48, 20, 104, 147, 121, 161, 241, 83, 109, 58, 84, 246, 251, 170, 145, 99, 179, 150, 32, 203, 93, 193, 99, 13, 86, 8, 224, 237, 61, 69, 58, 27, 79, 229, 84, 129, 145, 109, 58, 2, 230, 50, 0, 38, 189, 160, 18, 89, 158, 44, 255, 190, 108, 59, 161, 43, 49, 238, 84, 229, 223, 183, 138, 75, 130, 84, 208, 112, 183, 75, 108, 229, 254, 186, 103, 207, 244, 244, 149, 217, 71, 217, 238, 59, 98, 49, 214, 251, 83, 43, 104, 84, 0, 244, 181, 253, 235, 119, 236, 31, 36, 163, 105, 46, 52, 21, 212, 81, 170, 106, 186, 162, 63, 24, 235, 197, 184, 239, 229, 147, 105, 73, 145, 164, 214, 128, 23, 141, 50, 203, 41, 135, 32, 169, 168, 152, 137, 199, 38, 93, 226, 205, 20, 190, 208, 216, 76, 204, 133, 134, 137, 99, 89, 32, 57, 235, 138, 176, 10, 63, 159, 110, 85, 155, 164, 250, 194, 190, 58, 202, 52, 237, 95, 54, 149, 206, 144, 74, 123, 152, 231, 41, 202, 121, 248, 243, 40, 247, 161, 225, 88, 148, 188, 79, 6, 235, 43, 132, 24, 200, 229, 86, 53, 166, 123, 116, 233, 203, 23, 212, 55, 0, 195, 238, 247, 152, 247, 216, 229, 23, 93, 244, 224, 96, 37, 6, 61, 24, 107, 51, 63, 254, 187, 179, 71, 7, 45, 170, 122, 160, 223, 44, 203, 190, 142, 134, 129, 210, 67, 41, 17, 118, 139, 196, 163, 243, 54, 81, 192, 212, 129, 52, 227, 168, 113, 238, 178, 185, 158, 213, 144, 12, 198, 236, 234, 35, 179, 157, 91, 138, 46, 220, 35, 65, 82, 11, 16, 125, 96, 248, 199, 155, 100, 48, 154, 106, 187, 141, 250, 191, 130, 222, 131, 227, 14, 138, 219, 23, 23, 190, 180, 155, 147, 58, 224, 150, 39, 182, 226, 239, 3, 45, 47, 99, 255, 32, 73, 242, 233, 180, 149, 238, 45, 103, 39, 196, 231, 138, 16, 51, 224, 221, 136, 174, 205, 149, 132, 92, 83, 186, 48, 133, 204, 210, 5, 40, 57, 22, 64, 160, 4, 73, 168, 178, 229, 222, 185, 235, 109, 196, 109, 183, 150, 158, 0, 56, 16, 41, 43, 193, 31, 204, 169, 219, 50, 167, 242, 107, 206, 105, 228, 246, 59, 53, 18, 42, 19, 217, 56, 220, 59, 46, 160, 107, 200, 164, 0, 5, 213, 178, 133, 187, 142, 174, 218, 60, 252, 237, 61, 66, 146, 207, 179, 93, 234, 83, 219, 93, 55, 107, 92, 139, 101, 151, 198, 135, 246, 223, 101, 139, 44, 166, 82, 97, 233, 217, 130, 67, 22, 88, 36, 131, 80, 179, 192, 34, 206, 119, 167, 17, 65, 217, 71, 250, 52, 253, 29, 4, 156, 63, 64, 81, 6, 67, 130, 79, 0, 95, 87, 36, 43, 4, 26, 51, 250, 24, 178, 197, 41, 20, 142, 187, 180, 239, 156, 102, 113, 15, 13, 18, 90, 70, 184, 7, 250, 193, 117, 127, 60, 0, 198, 218, 128, 116, 119, 124, 126, 160, 129, 231, 68, 189, 98, 48, 43, 120, 178, 91, 54, 242, 66, 112, 55, 188, 42, 179, 94, 60, 249, 136, 81, 149, 132, 98, 209, 181, 219, 223, 31, 40, 235, 55, 5, 69, 11, 63, 192, 51, 224, 119, 107, 193, 84, 178, 191, 58, 217, 222, 183, 118, 114, 95, 45, 48, 126, 184, 10, 207, 0, 217, 59, 167, 244, 219, 9, 238, 41, 13, 127, 191, 123, 139, 9, 74, 40, 164, 194, 205, 116, 204, 185, 230, 133, 148, 215, 50, 105, 173, 220, 113, 117, 98, 233, 80, 209, 185, 211, 232, 29, 157, 12, 206, 228, 187, 26, 240, 193, 21, 15, 69, 115, 120, 66, 2, 92, 165, 103, 29, 177, 151, 154, 211, 107, 177, 89, 16, 135, 243, 135, 178, 237, 184, 110, 191, 169, 230, 243, 106, 16, 95, 128, 124, 73, 132, 107, 116, 123, 38, 0, 72, 24, 171, 8, 113, 227, 43, 136, 168, 25, 174, 100, 201, 252, 212, 119, 246, 131, 95, 78, 65, 222, 89, 192, 87, 66, 102, 58, 237, 94, 56, 138, 71, 121, 65, 49, 22, 65, 29, 183, 56, 59, 27, 16, 176, 232, 120, 22, 104, 212, 83, 32, 55, 90, 2, 37, 108, 112, 146, 113, 34, 64, 78, 65, 80, 198, 101, 190, 60, 69, 60, 230, 72, 216, 215, 225, 166, 155, 122, 140, 137, 245, 89, 77, 237, 209, 242, 67, 37, 88, 5, 117, 101, 165, 98, 84, 139, 18, 57, 118, 67, 78, 254, 178, 60, 181, 124, 144, 169, 13, 20, 233, 60, 51, 55, 1, 215, 225, 224, 42, 191, 189, 227, 246, 25, 53, 164, 27, 1, 66, 112, 36, 211, 67, 195, 172, 119, 52, 81, 244, 10, 39, 11, 219, 160, 35, 230, 225, 176, 171, 74, 254, 100, 229, 4, 64, 140, 85, 94, 85, 197, 63, 234, 173, 243, 129, 52, 220, 154, 175, 195, 223, 23, 85, 20, 171, 79, 240, 185, 10, 14, 93, 185, 93, 100, 11, 41, 39, 106, 137, 70, 122, 173, 221, 195, 73, 174, 145, 7, 85, 1, 232, 126, 67, 38, 213, 104, 164, 213, 213, 5, 23, 233, 233, 47, 222, 14, 3, 33, 180, 180, 49, 136, 73, 46, 237, 209, 47, 197, 173, 95, 131, 4, 157, 40, 217, 217, 156, 31, 81, 103, 24, 116, 208, 225, 123, 11, 122, 143, 55, 224, 125, 121, 42, 109, 151, 120, 245, 141, 176, 100, 12, 237, 222, 197, 100, 79, 16, 168, 247, 103, 223, 85, 92, 26, 17, 23, 91, 90, 249, 228, 162, 166, 164, 178, 215, 48, 203, 209, 138, 42, 42, 87, 132, 134, 120, 39, 13, 50, 77, 187, 15, 42, 82, 80, 242, 210, 141, 28, 213, 194, 241, 75, 86, 159, 120, 217, 98, 94, 100, 129, 1, 228, 157, 183, 171, 186, 164, 245, 72, 107, 119, 241, 227, 77, 109, 120, 58, 248, 36, 82, 38, 188, 50, 177, 65, 227, 192, 169, 124, 7, 137, 254, 80, 151, 200, 73, 55, 99, 30, 150, 192, 13, 106, 41, 236, 18, 6, 73, 73, 16, 239, 162, 0, 218, 201, 184, 78, 184, 137, 253, 12, 130, 241, 245, 158, 233, 159, 0, 130, 99, 50, 12, 240, 186, 207, 221, 250, 179, 115, 138, 137, 154, 182, 72, 119, 204, 16, 18, 101, 107, 27, 98, 142, 16, 143, 116, 161, 238, 232, 227, 70, 247, 124, 150, 157, 67, 114, 24, 162, 246, 158, 205, 24, 77, 79, 107, 232, 141, 103, 99, 128, 101, 40, 241, 212, 127, 90, 40, 2, 229, 105, 51, 164, 70, 216, 95, 2, 240, 54, 224, 11, 241, 201, 181, 97, 113, 49, 10, 170, 203, 10, 7, 130, 42, 236, 195, 146, 175, 222, 91, 235, 145, 13, 33, 82, 81, 187, 250, 248, 59, 250, 222, 136, 69, 192, 178, 189, 103, 176, 235, 101, 89, 133, 145, 203, 35, 138, 157, 180, 144, 6, 172, 55, 58, 147, 217, 109, 95, 81, 141, 214, 209, 245, 146, 96, 23, 130, 101, 107, 180, 188, 69, 204, 224, 195, 29, 108, 199, 70, 239, 18, 199, 143, 68, 161, 121, 110, 132, 238, 186, 97, 217, 227, 106, 86, 162, 24, 170, 155, 34, 8, 92, 154, 199, 184, 210, 214, 20, 31, 200, 22, 169, 186, 176, 26, 52, 62, 5, 251, 241, 108, 67, 153, 104, 242, 20, 28, 143, 23, 92, 191, 96, 254, 141, 235, 113, 154, 10, 219, 117, 159, 56, 31, 140, 161, 225, 247, 236, 253, 126, 160, 115, 23, 15, 175, 190, 227, 94, 149, 166, 102, 173, 251, 60, 192, 100, 70, 126, 89, 88, 154, 70, 176, 82, 212, 137, 12, 243, 203, 215, 247, 252, 91, 27, 19, 104, 229, 123, 83, 164, 166, 1, 90, 189, 251, 6, 81, 168, 28, 250, 206, 104, 62, 122, 66, 100, 183, 204, 196, 12, 57, 237, 25, 151, 165, 202, 65, 176, 124, 4, 94, 99, 250, 31, 43, 245, 160, 19, 247, 137, 120, 147, 24, 227, 192, 34, 21, 113, 168, 214, 235, 104, 140, 252, 170, 127, 90, 181, 149, 35, 160, 69, 110, 233, 71, 194, 66, 156, 225, 152, 129, 163, 168, 162, 154, 99, 172, 144, 85, 253, 238, 250, 48, 69, 99, 139, 49, 133, 200, 148, 34, 238, 235, 163, 13, 229, 232, 206, 118, 9, 132, 186, 253, 112, 251, 185, 191, 253, 155, 31, 161, 100, 249, 50, 145, 99, 243, 16, 21, 182, 137, 81, 104, 165, 96, 66, 112, 137, 68, 233, 58, 217, 65, 209, 62, 125, 164, 71, 64, 3, 44, 47, 172, 14, 211, 105, 241, 194, 50, 196, 89, 82, 26, 174, 194, 101, 119, 171, 140, 162, 141, 123, 206, 115, 85, 248, 33, 85, 228, 42, 92, 97, 100, 0, 16, 52, 27, 111, 146, 22, 223, 104, 54, 254, 70, 119, 180, 9, 126, 226, 173, 218, 140, 232, 213, 96, 232, 138, 148, 131, 144, 15, 69, 136, 43, 252, 203, 249, 20, 198, 32, 153, 17, 9, 28, 69, 183, 178, 240, 203, 31, 197, 112, 215, 34, 199, 95, 180, 116, 231, 191, 216, 12, 90, 216, 161, 227, 246, 5, 183, 26, 243, 239, 47, 193, 208, 140, 195, 151, 178, 100, 250, 38, 182, 15, 156, 211, 44, 207, 216, 110, 150, 234, 92, 160, 204, 228, 246, 38, 224, 16, 83, 166, 33, 22, 163, 174, 99, 80, 3, 23, 142, 55, 3, 253, 128, 63, 222, 111, 158, 184, 10, 60, 153, 124, 202, 53, 189, 14, 118, 45, 87, 79, 252, 20, 226, 58, 249, 197, 29, 162, 78, 211, 147, 165, 240, 7, 60, 175, 73, 90, 61, 167, 239, 68, 104, 66, 207, 208, 194, 87, 148, 158, 184, 247, 129, 7, 150, 171, 62, 157, 62, 240, 137, 36, 88, 122, 225, 83, 173, 245, 238, 245, 249, 227, 252, 152, 40, 8, 3, 150, 155, 71, 121, 187, 46, 173, 248, 107, 78, 135, 232, 20, 174, 165, 135, 5, 106, 244, 62, 79, 249, 72, 99, 252, 177, 27, 158, 223, 235, 59, 34, 141, 45, 221, 238, 31, 102, 247, 65, 170, 15, 219, 210, 232, 80, 100, 68, 171, 37, 211, 156, 83, 147, 246, 219, 89, 41, 195, 110, 252, 146, 164, 200, 63, 22, 154, 235, 157, 224, 24, 13, 102, 218, 53, 116, 235, 195, 57, 44, 157, 20, 89, 193, 102, 118, 163, 6, 24, 185, 177, 103, 106, 237, 7, 242, 206, 186, 232, 186, 164, 89, 138, 96, 207, 218, 228, 8, 77, 218, 15, 219, 168, 183, 178, 106, 155, 150, 37, 27, 139, 195, 72, 245, 64, 122, 219, 34, 125, 244, 159, 107, 23, 200, 151, 221, 249, 115, 21, 122, 60, 189, 31, 36, 127, 78, 52, 175, 187, 142, 179, 50, 53, 30, 246, 156, 89, 21, 120, 137, 129, 51, 10, 219, 176, 167, 197, 56, 128, 1, 21, 249, 225, 157, 135, 91, 248, 216, 237, 108, 143, 105, 159, 168, 97, 56, 54, 26, 181, 62, 66, 194, 192, 246, 142, 174, 157, 28, 52, 18, 33, 44, 54, 106, 28, 19, 94, 56, 49, 80, 181, 104, 237, 198, 100, 25, 119, 50, 224, 202, 71, 203, 246, 127, 108, 93, 3, 58, 61, 195, 222, 215, 50, 146, 156, 110, 216, 51, 40, 228, 9, 192, 77, 26, 58, 144, 247, 220, 122, 136, 51, 97, 227, 255, 158, 63, 76, 105, 203, 118, 96, 163, 154, 19, 163, 65, 249, 170, 225, 220, 193, 235, 177, 57, 168, 2, 14, 44, 34, 130, 107, 145, 189, 125, 158, 223, 106, 229, 0, 175, 136, 163, 176, 151, 192, 102, 36, 251, 135, 128, 146, 36, 182, 219, 135, 150, 115, 34, 164, 3, 69, 39, 128, 31, 3, 250, 103, 109, 228, 88, 77, 91, 51, 229, 228, 39, 140, 87, 33, 182, 110, 20, 127, 154, 139, 110, 252, 14, 92, 5, 39, 245, 215, 141, 132, 66, 99, 195, 210, 248, 104, 29, 72, 126, 58, 54, 254, 137, 250, 235, 51, 200, 139, 32, 61, 174, 43, 194, 99, 179, 203, 207, 53, 245, 133, 177, 124, 73, 203, 155, 38, 11, 171, 223, 12, 171, 48, 169, 129, 190, 14, 43, 247, 147, 163, 204, 5, 102, 247, 251, 92, 79, 18, 195, 208, 25, 55, 228, 229, 55, 83, 17, 96, 4, 60, 85, 10, 218, 76, 101, 24, 172, 80, 228, 108, 45, 55, 129, 87, 97, 22, 86, 102, 70, 31, 187, 191, 1, 178, 184, 253, 120, 104, 197, 84, 242, 112, 17, 245, 82, 85, 96, 40, 21, 9, 4, 45, 209, 147, 162, 110, 90, 34, 41, 194, 135, 169, 75, 169, 114, 206, 220, 166, 81, 141, 187, 64, 120, 169, 165, 23, 66, 222, 214, 18, 184, 136, 116, 199, 67, 91, 151, 67, 123, 201, 40, 171, 30, 81, 53, 172, 11, 252, 52, 200, 191, 236, 81, 63, 28, 28, 79, 197, 11, 72, 49, 4, 124, 134, 233, 232, 35, 46, 146, 22, 245, 251, 182, 162, 76, 231, 32, 196, 244, 181, 102, 124, 215, 106, 183, 214, 60, 118, 51, 84, 203, 105, 179, 56, 73, 212, 219, 228, 251, 38, 126, 206, 115, 119, 115, 151, 21, 49, 80, 168, 206, 170, 174, 215, 59, 70, 84, 59, 126, 167, 254, 115, 232, 114, 60, 182, 40, 129, 177, 240, 200, 38, 37, 198, 209, 23, 76, 170, 118, 83, 1, 131, 247, 56, 26, 57, 127, 156, 31, 144, 27, 184, 203, 148, 35, 11, 202, 85, 112, 185, 103, 107, 238, 6, 233, 105, 127, 30, 36, 5, 87, 171, 241, 3, 56, 204, 132, 15, 217, 229, 139, 21, 217, 129, 72, 249, 87, 89, 79, 96, 37, 236, 89, 92, 155, 19, 126, 84, 218, 53, 184, 26, 224, 179, 7, 109, 243, 241, 91, 4, 121, 186, 223, 116, 222, 74, 23, 153, 101, 79, 27, 149, 143, 26, 68, 95, 238, 21, 43, 211, 107, 255, 231, 205, 156, 7, 52, 151, 74, 253, 249, 109, 51, 153, 31, 163, 151, 172, 121, 248, 150, 198, 13, 118, 76, 248, 18, 210, 184, 219, 23, 234, 59, 115, 254, 81, 254, 67, 110, 53, 177, 188, 60, 180, 25, 87, 10, 150, 44, 208, 115, 144, 16, 3, 244, 119, 137, 173, 22, 158, 135, 89, 82, 86, 224, 43, 127, 108, 234, 223, 64, 224, 50, 214, 124, 246, 207, 122, 29, 99, 234, 199, 48, 125, 106, 221, 148, 40, 5, 16, 140, 234, 185, 222, 239, 214, 67, 77, 22, 165, 135, 224, 121, 236, 251, 70, 6, 123, 22, 230, 117, 208, 172, 131, 59, 53, 108, 100, 173, 136, 63, 22, 130, 83, 137, 15, 28, 82, 36, 34, 221, 235, 226, 114, 79, 126, 119, 218, 50, 130, 122, 143, 128, 240, 138, 49, 95, 254, 117, 105, 94, 76, 117, 93, 6, 189, 236, 192, 252, 227, 60, 208, 190, 216, 173, 157, 42, 240, 134, 97, 184, 215, 46, 30, 152, 214, 186, 205, 122, 64, 241, 9, 165, 113, 56, 244, 89, 27, 38, 41, 168, 30, 3, 50, 249, 121, 35, 55, 79, 10, 253, 33, 221, 231, 112, 53, 230, 15, 241, 247, 11, 202, 123, 27, 169, 254, 215, 208, 212, 184, 229, 58, 145, 142, 227, 155, 8, 98, 108, 50, 239, 238, 82, 161, 80, 228, 170, 128, 65, 71, 94, 4, 135, 27, 30, 28, 176, 66, 87, 245, 58, 0, 242, 162, 155, 1, 230, 130, 191, 161, 30, 167, 132, 37, 170, 137, 45, 70, 182, 29, 64, 230, 204, 218, 12, 26, 236, 146, 21, 130, 38, 184, 0, 185, 21, 57, 51, 227, 123, 26, 216, 87, 227, 198, 78, 106, 171, 224, 255, 223, 12, 92, 86, 191, 171, 109, 68, 29, 196, 31, 189, 44, 47, 198, 240, 63, 119, 237, 15, 4, 66, 204, 61, 54, 105, 188, 52, 38, 85, 29, 10, 181, 57, 21, 63, 27, 248, 254, 144, 201, 69, 96, 72, 176, 206, 105, 209, 182, 227, 107, 31, 34, 36, 199, 71, 50, 233, 205, 40, 110, 204, 197, 190, 202, 175, 155, 208, 26, 241, 28, 118, 239, 86, 87, 198, 167, 203, 148, 79, 69, 114, 108, 111, 178, 8, 29, 141, 229, 254, 121, 55, 99, 138, 88, 211, 25, 213, 124, 32, 248, 28, 178, 12, 184, 96, 118, 178, 219, 74, 186, 235, 22, 144, 68, 124, 152, 163, 132, 152, 125, 193, 123, 203, 54, 115, 216, 254, 245, 228, 88, 47, 119, 152, 56, 194, 120, 93, 63, 251, 138, 157, 142, 83, 235, 111, 98, 208, 67, 226, 204, 115, 172, 14, 15, 217, 122, 68, 94, 214, 215, 29, 196, 49, 82, 155, 80, 204, 30, 180, 143, 142, 231, 118, 154, 68, 4, 61, 180, 33, 86, 157, 251, 119, 49, 46, 239, 175, 251, 115, 135, 182, 34, 219, 38, 134, 237, 12, 183, 159, 71, 196, 175, 119, 134, 146, 175, 239, 200, 85, 24, 217, 227, 238, 110, 252, 34, 213, 35, 175, 138, 193, 218, 182, 239, 83, 198, 26, 3, 30, 86, 54, 168, 174, 79, 129, 135, 146, 192, 218, 114, 151, 242, 108, 220, 232, 99, 46, 215, 49, 77, 5, 233, 222, 144, 69, 82, 85, 250, 180, 112, 61, 41, 7, 70, 35, 129, 219, 1, 102, 71, 40, 17, 52, 46, 102, 92, 75, 71, 121, 235, 18, 248, 78, 23, 237, 185, 36, 1, 253, 155, 195, 206, 244, 208, 255, 183, 10, 124, 207, 30, 200, 87, 15, 2, 31, 82, 248, 77, 199, 99, 110, 49, 133, 23, 175, 42, 20, 172, 13, 61, 178, 71, 197, 1, 87, 56, 214, 83, 138, 223, 121, 216, 209, 94, 188, 153, 136, 22, 101, 223, 251, 36, 70, 159, 160, 137, 55, 158, 136, 136, 94, 201, 249, 232, 129, 31, 163, 204, 148, 185, 219, 185, 188, 250, 87, 91, 233, 206, 199, 222, 41, 173, 48, 157, 166, 37, 53, 134, 142, 204, 169, 185, 136, 17, 238, 221, 67, 31, 233, 131, 78, 85, 250, 158, 115, 59, 6, 197, 0, 29, 209, 138, 21, 65, 208, 208, 100, 2, 249, 160, 42, 114, 168, 84, 100, 83, 98, 42, 113, 93, 199, 99, 3, 23, 187, 223, 35, 173, 167, 172, 12, 250, 132, 84, 191, 41, 161, 177, 90, 245, 36, 174, 96, 92, 4, 65, 80, 221, 118, 130, 137, 210, 181, 216, 234, 6, 114, 245, 247, 11, 183, 159, 78, 227, 93, 225, 188, 56, 210, 246, 105, 24, 127, 13, 3, 223, 213, 164, 180, 246, 129, 106, 153, 92, 20, 112, 229, 65, 37, 202, 16, 204, 79, 45, 14, 159, 111, 103, 125, 63, 209, 11, 212, 23, 29, 14, 106, 187, 95, 125, 231, 159, 247, 143, 149, 128, 20, 201, 139, 220, 243, 141, 124, 26, 171, 218, 135, 196, 74, 252, 154, 52, 245, 147, 236, 196, 248, 112, 70, 142, 237, 97, 191, 75, 100, 47, 234, 68, 85, 201, 28, 130, 3, 198, 86, 253, 79, 150, 148, 144, 204, 233, 54, 3, 5, 106, 19, 90, 161, 130, 16, 147, 168, 51, 234, 73, 72, 190, 54, 204, 146, 106, 213, 51, 33, 182, 127, 68, 91, 247, 225, 121, 4, 90, 117, 154, 82, 244, 70, 88, 15, 122, 187, 153, 136, 172, 52, 21, 174, 107, 175, 69, 121, 80, 180, 17, 154, 197, 30, 205, 200, 150, 198, 136, 64, 199, 22, 175, 74, 4, 195, 49, 111, 218, 52, 213, 176, 230, 58, 138, 61, 209, 13, 2, 114, 124, 80, 26, 50, 139, 86, 36, 192, 192, 36, 71, 80, 0, 59, 30, 135, 185, 103, 130, 115, 138, 250, 126, 155, 175, 240, 84, 122, 137, 200, 171, 68, 72, 164, 79, 79, 28, 90, 84, 110, 130, 122, 133, 165, 245, 35, 124, 195, 10, 99, 78, 140, 219, 139, 219, 107, 1, 172, 39, 0, 28, 150, 91, 243, 188, 215, 147, 12, 70, 161, 15, 172, 102, 17, 146, 175, 95, 79, 20, 209, 180, 207, 154, 153, 229, 190, 251, 73, 215, 11, 113, 37, 230, 193, 192, 218, 119, 83, 16, 237, 167, 193, 157, 157, 102, 102, 203, 198, 68, 237, 252, 121, 120, 132, 126, 65, 199, 197, 59, 186, 66, 182, 38, 126, 221, 17, 96, 102, 99, 218, 185, 124, 152, 18, 240, 92, 241, 171, 178, 231, 64, 223, 228, 161, 110, 182, 217, 95, 166, 165, 113, 6, 203, 8, 254, 9, 241, 90, 157, 60, 194, 125, 210, 73, 213, 243, 16, 159, 123, 119, 162, 42, 178, 159, 91, 130, 235, 17, 142, 202, 65, 31, 213, 60, 108, 95, 53, 161, 25, 85, 114, 18, 117, 199, 73, 71, 168, 243, 188, 126, 180, 37, 10, 239, 179, 38, 227, 177, 184, 213, 193, 130, 45, 115, 2, 196, 136, 54, 99, 161, 163, 212, 189, 9, 142, 113, 251, 137, 138, 187, 11, 117, 189, 246, 30, 193, 150, 187, 60, 70, 108, 189, 10, 152, 108, 36, 102, 189, 204, 224, 8, 100, 72, 219, 66, 97, 53, 90, 23, 109, 82, 49, 94, 227, 67, 207, 146, 127, 199, 212, 174, 5, 115, 160, 81, 23, 44, 130, 49, 248, 2, 67, 94, 32, 231, 7, 238, 13, 65, 115, 85, 211, 138, 184, 26, 88, 21, 69, 115, 129, 30, 63, 79, 116, 118, 207, 139, 204, 42, 88, 114, 154, 26, 166, 116, 28, 189, 75, 201, 163, 102, 236, 156, 198, 58, 122, 99, 97, 179, 132, 66, 245, 26, 90, 49, 91, 69, 117, 71, 163, 122, 152, 220, 240, 131, 139, 80, 95, 199, 50, 34, 131, 99, 154, 8, 240, 77, 238, 85, 0, 60, 144, 102, 5, 83, 16, 174, 3, 125, 158, 231, 212, 80, 67, 109, 64, 129, 65, 152, 126, 217, 180, 3, 123, 31, 139, 40, 177, 229, 154, 149, 0, 9, 108, 240, 174, 68, 247, 2, 95, 106, 173, 104, 173, 73, 133, 174, 64, 164, 216, 90, 210, 114, 220, 105, 214, 232, 155, 157, 25, 103, 74, 72, 105, 6, 96, 3, 14, 168, 64, 0, 14, 74, 135, 241, 67, 80, 41, 107, 78, 44, 201, 206, 166, 31, 187, 72, 108, 29, 225, 109, 224, 21, 189, 198, 90, 74, 132, 170, 45, 181, 124, 167, 55, 178, 176, 245, 3, 121, 248, 88, 55, 57, 84, 168, 38, 97, 212, 185, 211, 75, 237, 191, 148, 160, 19, 135, 106, 139, 109, 230, 29, 169, 143, 40, 88, 55, 125, 152, 99, 211, 249, 146, 19, 108, 39, 87, 216, 202, 57, 193, 173, 54, 237, 94, 199, 249, 113, 60, 220, 114, 138, 147, 252, 244, 211, 29, 16, 5, 38, 145, 100, 157, 148, 247, 85, 131, 132, 234, 56, 134, 249, 247, 149, 240, 128, 102, 26, 196, 211, 204, 188, 41, 146, 59, 238, 60, 118, 144, 97, 167, 147, 181, 37, 102, 245, 87, 136, 136, 183, 194, 224, 215, 16, 26, 176, 144, 248, 243, 216, 151, 198, 208, 45, 25, 158, 102, 99, 84, 117, 57, 69, 24, 248, 8, 171, 198, 227, 0, 97, 117, 125, 39, 56, 98, 7, 78, 237, 199, 252, 17, 128, 35, 21, 191, 162, 252, 97, 165, 185, 20, 182, 71, 25, 192, 235, 193, 9, 108, 32, 162, 82, 45, 226, 247, 149, 106, 183, 197, 123, 208, 64, 32, 231, 114, 123, 249, 204, 31, 126, 229, 191, 93, 154, 255, 251, 163, 84, 109, 176, 62, 9, 91, 54, 135, 174, 214, 219, 244, 55, 159, 138, 47, 141, 95, 225, 222, 146, 81, 136, 14, 49, 71, 142, 141, 198, 178, 143, 42, 126, 67, 81, 73, 244, 110, 174, 53, 160, 244, 221, 117, 44, 13, 86, 181, 20, 163, 145, 49, 126, 196, 202, 24, 55, 167, 72, 21, 88, 64, 190, 217, 248, 29, 46, 25, 147, 233, 239, 109, 41, 178, 123, 54, 78, 205, 11, 77, 66, 172, 204, 254, 48, 206, 14, 170, 65, 25, 4, 88, 231, 174, 21, 231, 98, 191, 171, 70, 249, 226, 12, 15, 173, 103, 0, 52, 83, 81, 236, 239, 45, 4, 3, 243, 172, 42, 73, 19, 244, 141, 114, 119, 169, 73, 185, 221, 81, 46, 251, 25, 248, 147, 227, 140, 25, 133, 123, 209, 122, 68, 120, 188, 68, 131, 220, 204, 48, 59, 131, 50, 0, 63, 164, 97, 145, 194, 192, 196, 187, 250, 118, 225, 50, 121, 49, 17, 98, 221, 231, 79, 222, 91, 99, 124, 27, 226, 73, 141, 116, 188, 90, 55, 204, 111, 53, 54, 36, 225, 24, 179, 36, 97, 25, 224, 43, 204, 164, 245, 213, 62, 220, 246, 111, 166, 164, 10, 239, 90, 231, 156, 71, 192, 68, 16, 48, 152, 110, 158, 120, 170, 117, 188, 129, 88, 26, 66, 1, 172, 32, 102, 243, 220, 12, 165, 248, 190, 83, 143, 22, 45, 166, 182, 87, 198, 76, 59, 235, 90, 82, 147, 207, 219, 77, 15, 175, 33, 94, 132, 155, 247, 0, 233, 108, 219, 2, 115, 43, 239, 200, 102, 48, 22, 29, 127, 98, 33, 131, 111, 232, 27, 45, 119, 14, 138, 8, 165, 210, 165, 59, 92, 49, 87, 238, 157, 19, 109, 116, 34, 152, 203, 239, 125, 242, 148, 246, 83, 229, 231, 67, 221, 170, 75, 187, 111, 96, 105, 206, 20, 123, 222, 223, 9, 33, 251, 167, 255, 69, 65, 196, 201, 26, 44, 149, 169, 81, 133, 65, 107, 143, 168, 33, 169, 39, 12, 34, 37, 116, 244, 21, 198, 162, 120, 221, 110, 71, 169, 248, 173, 37, 178, 128, 28, 26, 113, 92, 144, 75, 42, 223, 212, 129, 210, 141, 135, 166, 193, 192, 97, 52, 222, 254, 23, 148, 9, 112, 114, 64, 84, 12, 0, 125, 189, 173, 232, 223, 134, 210, 13, 236, 70, 153, 231, 212, 20, 224, 146, 173, 139, 57, 190, 134, 118, 153, 147, 141, 236, 92, 50, 237, 88, 178, 184, 155, 140, 69, 133, 101, 211, 123, 101, 137, 130, 38, 50, 225, 155, 224, 53, 213, 65, 112, 198, 206, 81, 96, 203, 29, 141, 206, 29, 232, 124, 216, 35, 8, 62, 149, 236, 178, 118, 57, 28, 94, 86, 43, 220, 48, 108, 137, 108, 195, 130, 28, 212, 104, 37, 93, 83, 174, 52, 92, 137, 136, 245, 238, 54, 132, 123, 121, 136, 105, 15, 23, 185, 141, 208, 44, 117, 156, 169, 74, 234, 83, 135, 181, 51, 173, 98, 228, 101, 216, 166, 90, 42, 211, 115, 53, 198, 255, 53, 31, 204, 244, 146, 83, 100, 59, 103, 100, 81, 139, 131, 47, 109, 149, 157, 235, 100, 64, 188, 73, 77, 255, 230, 192, 121, 88, 233, 145, 46, 214, 145, 195, 177, 107, 1, 169, 44, 54, 69, 197, 68, 16, 16, 211, 16, 41, 134, 144, 71, 40, 46, 249, 160, 144, 31, 188, 218, 244, 180, 195, 35, 145, 40, 126, 240, 86, 250, 200, 74, 203, 70, 69, 84, 247, 148, 178, 102, 232, 217, 29, 244, 63, 41, 26, 206, 12, 208, 188, 160, 66, 96, 29, 86, 185, 152, 172, 183, 67, 182, 163, 158, 61, 102, 22, 162, 176, 127, 184, 115, 86, 214, 84, 179, 215, 43, 8, 32, 27, 18, 198, 40, 69, 143, 122, 55, 55, 223, 36, 87, 74, 116, 38, 173, 95, 4, 148, 104, 217, 54, 158, 80, 118, 68, 201, 80, 167, 172, 236, 11, 8, 3, 182, 231, 105, 248, 122, 83, 91, 190, 108, 124, 232, 144, 34, 30, 140, 1, 223, 30, 13, 33, 206, 8, 1, 116, 227, 249, 185, 192, 4, 233, 99, 7, 81, 144, 170, 102, 29, 7, 5, 87, 164, 208, 142, 13, 147, 99, 116, 47, 176, 157, 71, 76, 229, 175, 151, 190, 117, 238, 161, 140, 126, 154, 114, 180, 109, 197, 60, 160, 11, 117, 113, 139, 72, 90, 145, 223, 126, 26, 201, 46, 122, 157, 144, 164, 170, 154, 74, 54, 76, 213, 67, 33, 232, 148, 219, 175, 216, 59, 68, 148, 51, 30, 162, 24, 112, 162, 40, 8, 181, 90, 210, 95, 250, 35, 209, 11, 162, 205, 2, 241, 95, 18, 61, 11, 6, 90, 79, 128, 18, 110, 247, 101, 192, 234, 27, 38, 155, 204, 170, 160, 194, 35, 212, 120, 110, 174, 173, 19, 10, 66, 171, 122, 206, 171, 1, 209, 22, 166, 136, 66, 166, 203, 93, 90, 27, 82, 13, 158, 240, 229, 146, 152, 71, 67, 152, 107, 142, 44, 196, 232, 54, 36, 188, 124, 55, 50, 233, 162, 60, 143, 197, 182, 77, 110, 109, 87, 254, 90, 79, 17, 102, 226, 93, 222, 158, 110, 239, 210, 198, 179, 5, 50, 42, 156, 176, 5, 177, 27, 249, 68, 0, 187, 12, 115, 74, 112, 137, 39, 176, 122, 69, 69, 138, 17, 215, 146, 56, 43, 68, 4, 249, 214, 116, 40, 27, 97, 79, 13, 190, 147, 73, 27, 111, 70, 178, 119, 109, 108, 188, 243, 136, 192, 39, 30, 74, 240, 247, 103, 121, 55, 51, 207, 225, 5, 98, 186, 68, 147, 229, 160, 13, 92, 57, 193, 90, 130, 235, 169, 255, 92, 162, 111, 143, 244, 67, 83, 68, 23, 140, 96, 32, 91, 24, 238, 76, 85, 235, 104, 111, 221, 13, 159, 85, 162, 98, 242, 60, 137, 64, 25, 248, 161, 233, 176, 134, 117, 35, 128, 69, 199, 149, 178, 73, 219, 5, 27, 165, 40, 31, 28, 17, 2, 217, 119, 10, 80, 102, 140, 22, 214, 243, 96, 35, 87, 61, 225, 211, 101, 235, 249, 232, 211, 175, 52, 136, 197, 21, 125, 175, 194, 6, 252, 236, 9, 18, 139, 76, 85, 88, 173, 19, 238, 191, 220, 28, 29, 225, 9, 88, 23, 211, 214, 102, 232, 121, 143, 243, 133, 66, 152, 113, 159, 120, 114, 177, 77, 51, 44, 176, 78, 165, 41, 182, 156, 139, 101, 89, 0, 43, 60, 178, 117, 161, 19, 17, 29, 9, 71, 38, 75, 70, 176, 161, 253, 47, 35, 75, 129, 198, 163, 219, 120, 3, 49, 32, 70, 134, 81, 62, 62, 236, 194, 82, 106, 132, 113, 138, 5, 40, 178, 48, 80, 151, 204, 209, 117, 201, 208, 89, 209, 130, 50, 66, 137, 242, 219, 157, 9, 186, 112, 202, 119, 138, 43, 241, 249, 46, 200, 126, 31, 27, 3, 119, 210, 152, 232, 126, 119, 116, 239, 79, 245, 79, 189, 48, 234, 24, 193, 98, 172, 103, 103, 7, 188, 95, 183, 218, 250, 187, 230, 48, 173, 251, 206, 246, 244, 233, 56, 163, 21, 23, 155, 101, 135, 29, 94, 4, 27, 194, 130, 146, 177, 228, 245, 191, 85, 9, 243, 101, 174, 242, 230, 183, 221, 66, 169, 52, 217, 74, 73, 47, 16, 174, 199, 174, 236, 138, 59, 88, 131, 209, 190, 146, 212, 5, 126, 237, 23, 43, 112, 107, 85, 53, 245, 47, 214, 10, 165, 155, 170, 227, 242, 91, 253, 25, 151, 177, 80, 22, 69, 42, 197, 119, 193, 18, 70, 115, 36, 18, 118, 57, 93, 194, 23, 84, 154, 40, 66, 194, 238, 31, 241, 251, 215, 147, 250, 144, 65, 168, 67, 128, 213, 2, 210, 39, 193, 34, 4, 29, 111, 112, 25, 249, 169, 1, 157, 135, 246, 133, 148, 202, 202, 72, 208, 231, 115, 19, 123, 246, 9, 168, 182, 85, 181, 26, 184, 157, 236, 238, 146, 87, 141, 13, 30, 82, 23, 22, 76, 35, 123, 61, 53, 148, 248, 52, 49, 84, 72, 238, 109, 106, 69, 159, 230, 51, 229, 164, 61, 192, 192, 52, 172, 173, 121, 35, 209, 109, 154, 199, 51, 45, 255, 29, 66, 154, 251, 78, 14, 205, 6, 166, 20, 118, 225, 82, 242, 122, 89, 184, 105, 91, 232, 232, 36, 254, 8, 147, 188, 247, 201, 227, 123, 132, 66, 178, 130, 166, 246, 162, 213, 195, 204, 53, 230, 201, 219, 161, 254, 65, 134, 224, 52, 61, 92, 115, 135, 127, 130, 225, 130, 188, 60, 35, 146, 126, 246, 50, 216, 171, 206, 209, 193, 222, 29, 57, 236, 252, 61, 184, 236, 74, 180, 23, 197, 160, 46, 25, 22, 144, 114, 224, 53, 164, 147, 179, 190, 98, 200, 197, 50, 153, 163, 153, 240, 205, 73, 94, 129, 40, 225, 2, 132, 61, 241, 227, 99, 9, 206, 10, 244, 61, 16, 2, 204, 37, 103, 242, 104, 28, 132, 115, 153, 186, 27, 102, 215, 98, 254, 149, 188, 50, 52, 184, 139, 133, 54, 210, 81, 77, 215, 134, 70, 70, 56, 83, 64, 237, 5, 175, 232, 241, 64, 34, 237, 149, 117, 112, 136, 26, 240, 126, 71, 131, 27, 248, 73, 249, 150, 227, 212, 13, 141, 158, 95, 83, 46, 225, 74, 116, 112, 90, 252, 58, 102, 95, 58, 186, 138, 60, 204, 74, 0, 235, 103, 141, 117, 40, 48, 175, 208, 192, 30, 88, 253, 35, 1, 212, 172, 63, 176, 12, 149, 222, 34, 41, 71, 192, 86, 224, 88, 217, 16, 133, 235, 4, 70, 205, 25, 154, 138, 33, 243, 32, 176, 250, 65, 82, 107, 42, 184, 230, 159, 165, 30, 54, 62, 111, 235, 222, 214, 173, 232, 15, 22, 52, 10, 66, 205, 42, 11, 144, 212, 214, 45, 177, 229, 128, 5, 189, 248, 35, 169, 215, 78, 15, 149, 188, 162, 209, 253, 193, 239, 244, 183, 37, 233, 157, 190, 203, 172, 86, 163, 49, 91, 41, 166, 98, 137, 88, 31, 76, 157, 204, 185, 162, 36, 169, 111, 212, 107, 59, 47, 16, 193, 109, 235, 128, 230, 166, 239, 157, 14, 23, 13, 176, 237, 152, 255, 147, 93, 114, 117, 39, 23, 178, 75, 67, 183, 124, 38, 140, 121, 186, 74, 115, 178, 9, 197, 118, 1, 23, 222, 221, 151, 92, 64, 145, 130, 131, 245, 205, 21, 189, 155, 201, 244, 155, 239, 101, 67, 186, 249, 9, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 192, 52, 174, 242, 81, 205, 211, 61, 25, 139, 159, 177, 105, 41, 30, 42, 213, 46, 197, 53, 167, 58, 7, 239, 29, 185, 82, 211, 68, 212, 184, 107, 226, 41, 43, 224, 22, 195, 136, 195, 83, 229, 114, 175, 66, 156, 29, 234, 244, 207, 2, 130, 205, 111, 77, 101, 218, 137, 131, 12, 134, 83, 223, 104, 127, 53, 221, 160, 131, 7, 177, 14, 230, 144, 57, 252, 186, 129, 17, 232, 197, 196, 98, 209, 1, 45, 125, 38, 79, 78, 79, 205, 86, 137, 34, 148, 236, 104, 255, 148, 126, 139, 170, 152, 81, 124, 241, 99, 85, 64, 219, 190, 41, 26, 241, 189, 46, 120, 146, 174, 125, 38, 89, 232, 191, 159, 41, 60, 59, 124, 3, 83, 90, 193, 179, 178, 218, 237, 71, 118, 84, 146, 132, 171, 138, 85, 203, 68, 215, 196, 179, 144, 14, 177, 7, 131, 178, 35, 178, 60, 195, 206, 133, 204, 114, 45, 244, 85, 215, 54, 6, 195, 13, 21, 169, 53, 170, 193, 40, 111, 41, 129, 135, 1, 7, 231, 11, 30, 182, 1, 49, 39, 153, 125, 42, 194, 181, 161, 31, 225, 12, 7, 203, 136, 56, 221, 249, 243, 10, 70, 40, 7, 185, 44, 130, 246, 110, 117, 80, 156, 16, 107, 9, 208, 52, 225, 196, 107, 78, 99, 182, 163, 75, 85, 211, 230, 155, 237, 90, 188, 158, 228, 168, 219, 214, 1, 214, 10, 208, 65, 24, 6, 106, 197, 31, 24, 182, 90, 212, 193, 164, 165, 72, 252, 129, 220, 23, 60, 110, 87, 37, 248, 212, 75, 104, 132, 28, 240, 211, 62, 28, 98, 56, 14, 84, 116, 201, 72, 203, 112, 226, 194, 235, 85, 186, 124, 193, 204, 158, 88, 88, 154, 237, 87, 112, 209, 204, 251, 167, 218, 9, 3, 92, 176, 47, 83, 94, 17, 116, 73, 210, 76, 89, 65, 53, 117, 81, 135, 24, 123, 72, 228, 209, 12, 130, 113, 64, 15, 0, 129, 145, 180, 246, 137, 98, 85, 142, 28, 11, 98, 31, 212, 141, 27, 126, 36, 194, 225, 96, 107, 28, 56, 46, 129, 86, 211, 202, 198, 8, 130, 145, 168, 251, 168, 47, 190, 124, 154, 7, 24, 236, 155, 6, 216, 2, 52, 183, 14, 81, 237, 145, 106, 163, 57, 70, 110, 201, 195, 76, 225, 169, 141, 27, 123, 4, 168, 127, 46, 127, 235, 142, 233, 238, 31, 216, 199, 11, 226, 248, 73, 60, 46, 31, 130, 42, 199, 120, 19, 114, 194, 175, 145, 98, 24, 241, 112, 251, 162, 211, 147, 73, 105, 44, 119, 124, 155, 203, 208, 30, 84, 236, 50, 175, 194, 84, 2, 84, 57, 101, 137, 115, 18, 205, 178, 85, 140, 239, 187, 40, 123, 255, 215, 212, 221, 248, 8, 108, 82, 221, 132, 14, 109, 202, 131, 101, 219, 111, 5, 104, 94, 147, 8, 157, 43, 127, 65, 229, 59, 138, 201, 160, 29, 119, 166, 145, 221, 160, 237, 117, 188, 140, 19, 233, 86, 27, 112, 176, 201, 67, 209, 58, 131, 86, 64, 101, 220, 165, 73, 191, 134, 42, 233, 90, 100, 18, 227, 209, 125, 238, 13, 77, 212, 120, 177, 12, 53, 15, 253, 142, 192, 182, 156, 74, 171, 128, 12, 35, 10, 156, 182, 209, 168, 84, 192, 114, 145, 152, 124, 207, 225, 128, 108, 54, 189, 60, 250, 115, 88, 184, 129, 7, 54, 68, 99, 212, 251, 57, 193, 136, 36, 125, 173, 9, 110, 84, 241, 59, 165, 113, 22, 152, 51, 85, 215, 160, 211, 164, 74, 19, 92, 36, 28, 182, 244, 9, 168, 250, 79, 123, 164, 160, 207, 240, 29, 29, 91, 38, 31, 188, 16, 228, 118, 149, 198, 198, 123, 14, 133, 20, 110, 176, 129, 138, 94, 248, 218, 77, 108, 191, 3, 141, 69, 248, 163, 99, 44, 87, 208, 18, 202, 33, 184, 40, 2, 222, 223, 120, 144, 93, 173, 140, 217, 214, 57, 15, 78, 141, 161, 248, 165, 4, 189, 14, 213, 23, 46, 113, 141, 18, 31, 137, 224, 228, 19, 62, 168, 70, 248, 204, 171, 125, 122, 155, 19, 50, 210, 89, 69, 6, 23, 241, 173, 182, 133, 86, 219, 241, 9, 215, 247, 155, 68, 18, 22, 107, 167, 120, 118, 169, 9, 221, 231, 153, 100, 199, 129, 43, 239, 122, 102, 79, 161, 133, 75, 74, 184, 210, 30, 175, 5, 20, 8, 48, 208, 5, 219, 33, 224, 96, 252, 1, 42, 19, 38, 147, 44, 197, 172, 222, 84, 156, 79, 217, 103, 46, 60, 174, 144, 121, 208, 111, 207, 54, 16, 163, 104, 156, 10, 207, 160, 151, 193, 121, 38, 251, 43, 200, 28, 137, 109, 22, 140, 17, 13, 95, 69, 119, 61, 222, 131, 92, 105, 130, 56, 96, 236, 209, 218, 51, 172, 213, 244, 44, 64, 60, 88, 192, 199, 41, 83, 141, 237, 224, 62, 187, 134, 251, 89, 48, 18, 12, 121, 63, 28, 218, 86, 160, 86, 109, 99, 206, 2, 236, 50, 26, 239, 237, 63, 12, 102, 84, 252, 215, 145, 131, 231, 49, 212, 54, 43, 99, 224, 120, 178, 36, 106, 99, 92, 77, 4, 176, 3, 99, 0, 188, 98, 168, 58, 123, 240, 159, 102, 55, 108, 176, 198, 49, 8, 141, 220, 122, 216, 43, 55, 35, 106, 133, 53, 123, 69, 84, 167, 23, 9, 209, 194, 29, 186, 63, 184, 71, 241, 49, 33, 47, 88, 39, 65, 91, 85, 92, 198, 126, 212, 129, 102, 167, 100, 174, 89, 228, 134, 42, 212, 208, 194, 252, 67, 150, 198, 132, 209, 16, 209, 249, 44, 238, 138, 179, 128, 92, 6, 197, 10, 134, 97, 232, 147, 219, 143, 72, 209, 83, 35, 210, 182, 162, 183, 213, 125, 47, 156, 218, 18, 194, 137, 234, 117, 231, 112, 250, 48, 146, 123, 141, 174, 61, 213, 177, 251, 162, 214, 211, 122, 171, 155, 211, 117, 228, 198, 235, 155, 225, 14, 85, 57, 54, 8, 168, 75, 216, 68, 135, 19, 133, 24, 26, 138, 111, 72, 0, 250, 101, 237, 246, 137, 8, 38, 83, 123, 237, 250, 104, 106, 31, 217, 235, 103, 177, 73, 174, 208, 233, 230, 69, 77, 161, 21, 10, 223, 157, 62, 232, 133, 80, 117, 214, 254, 247, 93, 53, 45, 130, 226, 118, 216, 149, 78, 143, 25, 30, 110, 134, 48, 72, 1, 107, 197, 211, 48, 235, 82, 179, 54, 95, 171, 91, 36, 188, 53, 85, 24, 216, 236, 79, 62, 90, 52, 157, 175, 171, 127, 132, 118, 187, 200, 5, 60, 22, 6, 117, 78, 242, 169, 102, 46, 74, 185, 188, 138, 221, 79, 49, 13, 247, 196, 176, 199, 53, 220, 208, 175, 132, 8, 186, 175, 76, 125, 227, 33, 44, 193, 209, 17, 52, 110, 227, 212, 139, 93, 154, 218, 220, 57, 5, 255, 119, 252, 7, 69, 145, 109, 118, 76, 45, 48, 20, 218, 123, 26, 193, 203, 254, 58, 206, 189, 91, 87, 28, 112, 27, 204, 145, 8, 8, 203, 83, 199, 179, 70, 32, 208, 8, 44, 44, 217, 69, 93, 32, 74, 13, 105, 100, 232, 134, 89, 67, 98, 52, 242, 113, 109, 36, 244, 169, 115, 146, 186, 48, 75, 128, 102, 149, 174, 100, 5, 87, 23, 88, 161, 184, 135, 198, 80, 194, 179, 150, 4, 182, 153, 124, 63, 34, 251, 63, 73, 37, 18, 188, 143, 151, 211, 2, 11, 182, 108, 6, 109, 9, 192, 85, 67, 251, 113, 129, 185, 10, 81, 246, 134, 57, 249, 181, 39, 2, 172, 177, 69, 221, 100, 77, 234, 159, 108, 192, 187, 22, 239, 204, 26, 94, 199, 59, 193, 124, 97, 107, 238, 43, 72, 36, 172, 173, 100, 3, 161, 92, 128, 18, 51, 253, 186, 99, 120, 241, 227, 110, 163, 21, 128, 76, 0, 148, 199, 82, 165, 71, 150, 145, 226, 233, 70, 52, 185, 206, 113, 110, 186, 143, 46, 101, 113, 96, 134, 203, 115, 46, 55, 192, 157, 132, 213, 103, 74, 56, 60, 226, 172, 157, 32, 97, 223, 104, 48, 125, 83, 201, 108, 78, 237, 12, 215, 156, 61, 116, 134, 118, 63, 200, 81, 7, 47, 77, 30, 241, 4, 137, 72, 8, 91, 145, 131, 254, 195, 186, 45, 197, 110, 40, 219, 97, 152, 169, 225, 55, 192, 230, 111, 60, 241, 161, 50, 177, 243, 51, 234, 106, 27, 142, 1, 189, 193, 154, 186, 97, 14, 148, 58, 207, 191, 184, 68, 201, 243, 178, 192, 239, 119, 184, 134, 119, 241, 66, 223, 13, 66, 95, 251, 229, 94, 98, 209, 155, 193, 245, 65, 137, 119, 28, 21, 248, 157, 7, 38, 235, 152, 149, 26, 232, 137, 163, 244, 168, 119, 255, 98, 154, 244, 184, 192, 128, 41, 22, 106, 88, 67, 221, 88, 250, 13, 146, 186, 159, 222, 62, 120, 192, 209, 111, 237, 74, 128, 194, 125, 45, 48, 161, 135, 15, 178, 28, 138, 107, 200, 198, 196, 70, 193, 133, 132, 133, 166, 177, 202, 99, 13, 217, 192, 252, 46, 121, 76, 53, 138, 194, 89, 188, 116, 79, 121, 226, 110, 5, 152, 64, 100, 50, 210, 195, 168, 80, 1, 241, 155, 92, 104, 113, 111, 242, 97, 185, 175, 105, 220, 50, 208, 175, 77, 147, 100, 181, 2, 190, 96, 109, 124, 113, 30, 81, 143, 151, 17, 71, 202, 252, 10, 155, 190, 218, 183, 185, 200, 67, 199, 111, 150, 251, 13, 147, 58, 133, 186, 141, 249, 64, 223, 148, 110, 28, 236, 49, 22, 57, 17, 73, 146, 239, 146, 30, 234, 88, 167, 108, 235, 12, 88, 131, 33, 37, 202, 137, 81, 186, 89, 6, 6, 72, 210, 191, 90, 124, 235, 98, 144, 97, 245, 49, 67, 169, 106, 190, 157, 56, 227, 0, 196, 55, 177, 246, 5, 171, 178, 130, 214, 132, 191, 0, 218, 236, 129, 191, 155, 129, 241, 33, 208, 156, 254, 132, 121, 163, 189, 231, 51, 180, 21, 190, 87, 29, 5, 102, 185, 218, 136, 248, 113, 65, 209, 238, 177, 109, 248, 167, 189, 241, 181, 115, 24, 89, 95, 67, 115, 211, 244, 218, 63, 79, 148, 168, 238, 47, 110, 82, 130, 96, 55, 120, 139, 149, 120, 204, 85, 249, 232, 88, 139, 152, 111, 170, 143, 209, 129, 105, 87, 50, 12, 192, 50, 227, 191, 29, 194, 102, 243, 193, 142, 62, 49, 248, 188, 92, 11, 60, 228, 133, 100, 209, 8, 246, 85, 143, 169, 197, 81, 169, 72, 51, 102, 19, 210, 249, 185, 78, 200, 179, 42, 40, 111, 94, 84, 221, 156, 90, 2, 216, 95, 53, 92, 217, 172, 192, 97, 130, 77, 87, 163, 65, 112, 45, 250, 81, 131, 95, 4, 68, 136, 139, 240, 43, 141, 251, 195, 36, 31, 179, 197, 10, 76, 230, 247, 154, 134, 215, 76, 134, 240, 248, 151, 186, 16, 253, 99, 129, 147, 47, 55, 53, 116, 139, 65, 64, 44, 29, 168, 200, 169, 8, 118, 38, 100, 162, 124, 48, 46, 137, 246, 255, 39, 156, 70, 228, 139, 6, 35, 67, 229, 235, 18, 114, 66, 206, 217, 236, 11, 86, 119, 106, 120, 177, 150, 118, 52, 6, 204, 14, 4, 196, 40, 149, 120, 162, 11, 143, 168, 138, 248, 243, 62, 123, 15, 78, 255, 23, 100, 206, 115, 143, 144, 114, 210, 165, 115, 161, 73, 211, 146, 104, 185, 127, 166, 117, 50, 63, 25, 242, 101, 119, 219, 108, 208, 71, 204, 116, 138, 226, 175, 178, 243, 52, 238, 124, 85, 161, 173, 70, 233, 141, 108, 161, 84, 14, 226, 235, 12, 28, 16, 249, 79, 198, 120, 192, 204, 17, 138, 231, 159, 81, 25, 130, 216, 29, 246, 62, 212, 113, 237, 67, 131, 145, 221, 189, 143, 137, 244, 17, 214, 165, 13, 205, 92, 172, 241, 8, 205, 146, 131, 246, 97, 210, 91, 107, 167, 251, 32, 155, 208, 141, 74, 184, 228, 40, 237, 171, 12, 29, 152, 31, 144, 168, 66, 216, 171, 187, 23, 118, 55, 159, 194, 137, 51, 119, 14, 95, 153, 62, 186, 38, 69, 119, 144, 155, 50, 15, 54, 37, 88, 32, 225, 3, 105, 136, 254, 28, 104, 210, 231, 16, 238, 109, 37, 117, 150, 0, 253, 121, 33, 14, 83, 178, 187, 112, 57, 96, 197, 72, 0, 164, 107, 236, 45, 138, 56, 214, 34, 5, 141, 86, 227, 107, 107, 110, 121, 191, 132, 151, 203, 91, 158, 82, 180, 65, 249, 109, 94, 169, 45, 25, 99, 86, 87, 79, 140, 44, 141, 40, 166, 128, 206, 146, 244, 31, 200, 192, 125, 35, 161, 202, 241, 225, 82, 44, 114, 189, 42, 135, 50, 99, 166, 200, 107, 92, 178, 232, 4, 88, 33, 27, 122, 192, 174, 138, 147, 154, 54, 111, 75, 46, 159, 73, 34, 154, 255, 102, 16, 123, 161, 222, 172, 154, 208, 206, 23, 69, 76, 84, 152, 153, 178, 151, 12, 41, 104, 98, 214, 142, 202, 114, 183, 30, 242, 8, 237, 182, 133, 229, 57, 209, 32, 164, 139, 247, 137, 6, 42, 127, 100, 170, 141, 113, 52, 13, 52, 137, 66, 237, 43, 61, 149, 191, 124, 73, 232, 14, 109, 168, 151, 164, 237, 141, 6, 228, 197, 168, 143, 4, 171, 113, 28, 46, 228, 101, 111, 198, 205, 32, 110, 35, 49, 127, 95, 207, 11, 155, 221, 27, 85, 188, 14, 127, 211, 19, 208, 139, 67, 182, 153, 229, 29, 214, 156, 191, 29, 10, 66, 187, 194, 168, 194, 246, 234, 118, 170, 194, 82, 179, 242, 24, 58, 142, 24, 232, 103, 109, 114, 210, 10, 237, 8, 201, 66, 125, 245, 52, 129, 60, 10, 211, 199, 73, 152, 116, 175, 216, 111, 213, 141, 162, 172, 78, 204, 92, 182, 12, 158, 165, 129, 98, 54, 130, 236, 12, 47, 203, 63, 133, 20, 225, 128, 178, 150, 84, 94, 228, 236, 54, 44, 68, 65, 204, 84, 216, 7, 253, 22, 254, 225, 203, 108, 200, 59, 166, 91, 70, 119, 185, 166, 175, 76, 129, 175, 203, 58, 205, 39, 126, 15, 239, 104, 20, 95, 127, 161, 196, 28, 88, 51, 11, 232, 44, 119, 45, 25, 32, 240, 237, 147, 222, 74, 129, 161, 39, 7, 235, 65, 113, 108, 75, 194, 117, 54, 46, 48, 252, 23, 145, 253, 146, 26, 193, 71, 31, 93, 190, 129, 74, 30, 64, 22, 204, 73, 25, 56, 130, 29, 202, 84, 67, 84, 150, 164, 154, 229, 67, 49, 125, 31, 114, 44, 74, 83, 199, 26, 129, 218, 21, 91, 180, 169, 142, 104, 114, 150, 34, 97, 39, 153, 115, 240, 90, 71, 179, 198, 137, 15, 66, 82, 243, 142, 188, 61, 73, 39, 162, 29, 127, 183, 2, 204, 3, 194, 51, 47, 29, 7, 155, 6, 98, 225, 25, 98, 224, 30, 47, 152, 184, 23, 80, 115, 202, 48, 161, 23, 137, 32, 230, 210, 45, 42, 173, 117, 116, 181, 11, 250, 108, 100, 129, 45, 98, 77, 208, 215, 113, 103, 107, 140, 17, 213, 253, 202, 22, 158, 153, 224, 216, 53, 131, 125, 60, 138, 229, 199, 236, 168, 121, 174, 126, 204, 113, 113, 66, 147, 2, 58, 143, 50, 120, 123, 27, 55, 132, 118, 255, 152, 128, 137, 97, 145, 144, 164, 102, 71, 95, 59, 57, 109, 99, 172, 77, 159, 69, 81, 107, 38, 58, 81, 173, 30, 17, 123, 58, 208, 159, 212, 204, 195, 146, 48, 129, 223, 62, 74, 34, 161, 188, 185, 150, 124, 2, 175, 205, 241, 202, 161, 7, 50, 19, 78, 41, 248, 70, 9, 211, 53, 242, 147, 222, 158, 230, 133, 149, 90, 83, 177, 133, 78, 189, 246, 129, 242, 39, 93, 171, 33, 26, 131, 211, 140, 34, 230, 172, 138, 61, 193, 246, 253, 205, 210, 92, 248, 181, 219, 3, 47, 200, 24, 91, 124, 122, 15, 213, 192, 115, 177, 196, 142, 141, 121, 98, 28, 202, 32, 156, 46, 6, 34, 21, 164, 212, 186, 205, 85, 161, 61, 176, 237, 250, 33, 184, 250, 248, 154, 133, 16, 186, 207, 2, 199, 145, 74, 196, 234, 201, 66, 76, 221, 85, 66, 241, 112, 97, 15, 52, 249, 211, 90, 132, 14, 74, 167, 81, 28, 184, 221, 51, 158, 96, 161, 144, 80, 7, 154, 174, 61, 234, 66, 93, 40, 229, 187, 186, 239, 121, 90, 137, 103, 229, 48, 116, 19, 212, 231, 195, 114, 57, 28, 234, 149, 211, 73, 204, 202, 52, 71, 112, 132, 143, 103, 10, 83, 205, 185, 251, 62, 174, 243, 32, 121, 28, 252, 92, 167, 231, 119, 110, 129, 14, 233, 37, 69, 120, 15, 90, 41, 124, 169, 196, 161, 137, 0, 217, 44, 15, 93, 212, 239, 58, 181, 20, 176, 159, 162, 74, 229, 41, 99, 14, 145, 65, 31, 224, 179, 30, 132, 226, 71, 18, 132, 48, 78, 33, 247, 86, 205, 28, 197, 175, 204, 126, 44, 140, 66, 13, 112, 183, 84, 3, 143, 214, 80, 133, 126, 145, 143, 34, 77, 23, 146, 177, 165, 151, 70, 240, 223, 116, 115, 25, 212, 248, 27, 113, 47, 200, 90, 132, 56, 26, 94, 0, 76, 138, 174, 112, 47, 54, 107, 193, 149, 73, 53, 142, 218, 91, 57, 238, 46, 178, 154, 71, 19, 189, 166, 196, 94, 170, 218, 133, 118, 205, 225, 108, 153, 24, 237, 27, 111, 37, 90, 14, 100, 15, 229, 18, 128, 213, 4, 155, 143, 166, 39, 142, 206, 78, 189, 91, 166, 159, 129, 30, 7, 139, 72, 227, 164, 164, 161, 100, 94, 162, 55, 49, 248, 189, 179, 206, 146, 255, 91, 179, 82, 6, 138, 24, 141, 171, 146, 217, 50, 135, 32, 203, 177, 27, 91, 24, 204, 252, 137, 121, 90, 226, 43, 35, 226, 246, 38, 72, 212, 172, 188, 173, 69, 107, 148, 163, 88, 125, 144, 127, 44, 41, 190, 71, 0, 88, 70, 175, 189, 233, 55, 206, 220, 185, 192, 197, 165, 193, 87, 146, 249, 94, 72, 59, 57, 43, 52, 203, 194, 56, 221, 21, 130, 183, 78, 75, 154, 67, 18, 74, 151, 201, 38, 202, 108, 61, 8, 29, 98, 62, 172, 77, 155, 227, 189, 10, 116, 179, 50, 165, 152, 74, 209, 96, 200, 230, 180, 188, 191, 165, 245, 108, 36, 26, 37, 17, 167, 125, 120, 111, 236, 211, 66, 183, 1, 251, 79, 34, 26, 121, 28, 136, 33, 149, 17, 174, 43, 206, 137, 77, 10, 173, 243, 111, 73, 106, 241, 252, 70, 43, 147, 120, 40, 229, 121, 201, 69, 195, 63, 43, 87, 45, 203, 174, 214, 181, 35, 46, 226, 47, 44, 56, 123, 56, 73, 166, 252, 144, 150, 100, 73, 156, 177, 225, 105, 161, 41, 226, 162, 167, 132, 45, 62, 211, 104, 16, 89, 173, 255, 70, 194, 254, 186, 130, 50, 135, 121, 197, 147, 84, 97, 49, 107, 26, 164, 189, 151, 234, 39, 72, 117, 21, 92, 43, 119, 110, 45, 209, 172, 192, 131, 45, 2, 99, 179, 131, 248, 69, 144, 223, 23, 151, 0, 196, 64, 161, 172, 49, 56, 114, 108, 68, 134, 160, 209, 154, 30, 240, 206, 156, 140, 80, 70, 34, 218, 43, 187, 80, 209, 26, 166, 69, 4, 240, 135, 148, 68, 64, 170, 244, 134, 32, 69, 87, 50, 135, 112, 91, 71, 0, 134, 245, 80, 30, 27, 12, 234, 212, 223, 168, 27, 78, 19, 126, 77, 138, 121, 75, 51, 47, 44, 5, 253, 227, 88, 41, 226, 189, 183, 124, 184, 68, 210, 6, 171, 77, 78, 221, 154, 78, 229, 88, 147, 147, 21, 119, 13, 251, 71, 89, 237, 224, 152, 21, 88, 234, 234, 130, 74, 119, 115, 27, 8, 139, 155, 243, 195, 29, 196, 213, 5, 161, 117, 41, 246, 92, 204, 143, 186, 229, 59, 18, 76, 171, 224, 152, 224, 82, 193, 115, 208, 9, 84, 177, 130, 178, 122, 251, 216, 39, 253, 73, 199, 154, 88, 236, 215, 219, 154, 195, 11, 235, 165, 217, 212, 248, 65, 43, 0, 112, 35, 39, 18, 238, 212, 151, 187, 53, 30, 235, 202, 217, 163, 177, 80, 70, 97, 90, 98, 174, 5, 163, 246, 219, 124, 216, 253, 43, 114, 108, 69, 2, 242, 77, 85, 51, 91, 7, 226, 100, 238, 213, 183, 55, 47, 222, 65, 222, 75, 49, 102, 29, 20, 10, 103, 232, 107, 0, 27, 247, 112, 177, 121, 185, 250, 215, 18, 78, 186, 87, 112, 147, 225, 75, 236, 241, 197, 161, 123, 146, 132, 217, 240, 98, 201, 17, 53, 82, 60, 237, 232, 92, 177, 174, 1, 51, 12, 54, 226, 215, 58, 61, 186, 15, 135, 103, 195, 176, 10, 74, 110, 97, 106, 100, 112, 153, 16, 115, 248, 136, 36, 43, 245, 26, 211, 246, 143, 10, 112, 14, 176, 86, 8, 62, 93, 100, 135, 160, 125, 244, 49, 17, 192, 63, 42, 110, 36, 61, 93, 14, 16, 41, 98, 232, 84, 222, 245, 155, 24, 210, 135, 16, 84, 204, 214, 83, 67, 255, 217, 117, 85, 99, 107, 3, 247, 112, 24, 143, 221, 99, 49, 222, 12, 113, 185, 146, 231, 24, 10, 163, 80, 92, 208, 40, 35, 42, 4, 179, 164, 133, 228, 238, 37, 194, 173, 2, 132, 221, 127, 26, 108, 192, 48, 29, 100, 252, 150, 41, 204, 9, 103, 1, 14, 158, 249, 155, 88, 236, 122, 184, 21, 190, 12, 42, 239, 63, 211, 105, 218, 77, 199, 63, 86, 126, 40, 209, 229, 23, 173, 73, 180, 54, 17, 136, 94, 9, 80, 145, 207, 18, 196, 81, 163, 232, 195, 15, 97, 189, 3, 77, 171, 13, 209, 115, 43, 111, 139, 101, 26, 181, 212, 49, 27, 98, 60, 243, 94, 127, 50, 134, 131, 80, 13, 83, 89, 166, 11, 230, 42, 243, 219, 131, 143, 64, 179, 1, 44, 206, 1, 25, 71, 47, 102, 1, 174, 91, 96, 145, 66, 205, 155, 46, 175, 197, 35, 134, 19, 142, 96, 224, 80, 249, 187, 203, 133, 189, 178, 243, 148, 190, 210, 96, 235, 209, 39, 47, 228, 34, 95, 211, 22, 212, 179, 144, 17, 7, 167, 105, 181, 197, 163, 21, 92, 227, 106, 99, 97, 69, 82, 75, 81, 252, 134, 112, 88, 12, 199, 223, 255, 127, 120, 203, 252, 45, 155, 20, 111, 208, 148, 38, 62, 26, 44, 198, 171, 101, 105, 55, 59, 34, 149, 250, 144, 241, 173, 52, 152, 11, 206, 218, 250, 31, 106, 194, 66, 21, 172, 43, 23, 96, 152, 74, 41, 111, 46, 57, 67, 46, 115, 157, 120, 32, 244, 181, 120, 138, 172, 192, 72, 145, 198, 4, 153, 118, 250, 158, 115, 197, 143, 215, 34, 193, 194, 184, 38, 232, 194, 11, 238, 179, 12, 171, 247, 147, 122, 216, 224, 15, 240, 70, 64, 139, 209, 176, 39, 37, 185, 63, 97, 103, 177, 114, 120, 230, 242, 13, 34, 185, 145, 67, 129, 107, 21, 250, 38, 222, 4, 102, 72, 61, 149, 25, 82, 132, 101, 245, 189, 223, 10, 48, 15, 181, 35, 98, 9, 193, 88, 8, 9, 178, 105, 94, 34, 146, 236, 134, 168, 46, 201, 101, 93, 30, 11, 6, 30, 76, 87, 11, 46, 168, 244, 47, 150, 194, 127, 252, 157, 124, 161, 197, 169, 21, 17, 224, 26, 55, 22, 112, 96, 0, 46, 220, 143, 129, 166, 108, 155, 239, 158, 186, 125, 240, 44, 54, 141, 156, 129, 184, 216, 180, 189, 158, 14, 197, 64, 97, 152, 154, 39, 159, 106, 74, 166, 252, 70, 203, 206, 30, 218, 69, 26, 139, 113, 26, 68, 177, 99, 237, 180, 12, 66, 108, 95, 8, 136, 80, 81, 206, 131, 94, 203, 20, 229, 54, 14, 70, 50, 176, 87, 128, 171, 187, 37, 118, 77, 147, 114, 186, 163, 3, 198, 64, 85, 226, 183, 5, 182, 14, 213, 237, 27, 89, 154, 51, 218, 52, 253, 88, 56, 106, 3, 52, 10, 165, 125, 60, 174, 246, 189, 50, 27, 253, 116, 62, 247, 131, 198, 18, 119, 202, 10, 60, 233, 29, 6, 46, 39, 204, 152, 116, 182, 243, 99, 52, 230, 84, 207, 220, 58, 27, 222, 198, 85, 142, 186, 46, 182, 163, 65, 94, 109, 13, 50, 127, 209, 124, 50, 2, 55, 128, 139, 183, 23, 15, 168, 159, 36, 109, 138, 41, 12, 175, 132, 224, 65, 70, 52, 80, 2, 179, 46, 220, 218, 110, 187, 70, 230, 200, 212, 235, 95, 35, 160, 155, 161, 34, 168, 200, 173, 13, 3, 229, 241, 25, 186, 115, 182, 157, 24, 88, 100, 80, 207, 59, 128, 100, 106, 141, 146, 170, 121, 110, 112, 25, 5, 26, 101, 107, 30, 17, 72, 177, 162, 164, 54, 100, 210, 196, 191, 71, 5, 236, 4, 55, 242, 132, 64, 101, 37, 124, 222, 15, 39, 229, 111, 76, 210, 171, 236, 7, 93, 14, 216, 248, 45, 79, 218, 85, 211, 199, 250, 104, 33, 143, 222, 15, 88, 238, 164, 172, 135, 2, 101, 11, 255, 112, 8, 238, 139, 63, 190, 149, 130, 215, 130, 110, 68, 83, 56, 239, 253, 120, 96, 196, 38, 198, 153, 137, 110, 157, 87, 94, 69, 70, 176, 197, 220, 237, 73, 176, 217, 112, 186, 20, 16, 151, 251, 244, 204, 120, 42, 216, 194, 250, 127, 191, 45, 87, 138, 204, 145, 110, 119, 217, 185, 242, 50, 47, 102, 253, 107, 242, 121, 122, 204, 10, 232, 48, 214, 183, 190, 152, 249, 7, 228, 139, 181, 252, 84, 123, 199, 146, 175, 30, 152, 54, 4, 162, 26, 19, 103, 112, 216, 130, 148, 218, 40, 215, 53, 114, 87, 174, 194, 30, 148, 70, 183, 213, 103, 2, 24, 161, 173, 212, 50, 52, 10, 46, 252, 205, 46, 192, 187, 105, 16, 187, 193, 255, 182, 92, 222, 209, 193, 118, 129, 137, 218, 80, 242, 213, 89, 122, 224, 65, 158, 65, 104, 40, 15, 135, 86, 159, 63, 139, 29, 195, 230, 20, 180, 82, 142, 98, 48, 228, 204, 22, 199, 47, 96, 30, 125, 192, 222, 237, 243, 115, 222, 31, 182, 150, 172, 42, 17, 232, 108, 142, 241, 119, 143, 215, 117, 221, 37, 188, 136, 68, 166, 53, 120, 198, 16, 59, 74, 184, 175, 120, 42, 72, 102, 137, 171, 56, 141, 189, 173, 89, 128, 12, 114, 241, 189, 111, 136, 73, 132, 123, 93, 249, 199, 130, 191, 251, 1, 251, 208, 58, 108, 177, 41, 72, 20, 202, 120, 187, 38, 8, 163, 75, 63, 139, 91, 159, 26, 233, 162, 204, 152, 80, 228, 52, 96, 166, 8, 250, 206, 115, 97, 28, 220, 48, 59, 19, 66, 12, 137, 203, 7, 95, 23, 107, 3, 185, 110, 57, 39, 117, 13, 68, 70, 54, 238, 106, 230, 167, 242, 216, 208, 42, 154, 110, 41, 188, 51, 156, 153, 0, 199, 221, 58, 21, 57, 68, 24, 114, 67, 93, 90, 0, 252, 188, 145, 7, 24, 55, 189, 176, 50, 106, 154, 57, 17, 95, 223, 93, 17, 125, 163, 80, 18, 22, 229, 212, 90, 138, 222, 86, 8, 125, 63, 229, 145, 190, 200, 10, 39, 176, 9, 182, 211, 236, 122, 29, 134, 1, 186, 231, 227, 215, 194, 42, 240, 7, 196, 0, 179, 211, 150, 193, 21, 137, 84, 32, 92, 218, 185, 7, 200, 34, 179, 138, 244, 114, 167, 159, 23, 51, 124, 60, 253, 124, 75, 8, 65, 123, 59, 88, 219, 250, 242, 250, 112, 27, 222, 143, 17, 107, 48, 44, 172, 13, 223, 78, 218, 107, 93, 235, 5, 208, 23, 179, 176, 38, 213, 101, 154, 64, 132, 134, 83, 63, 77, 229, 126, 65, 142, 245, 167, 180, 96, 51, 24, 148, 105, 243, 63, 186, 163, 124, 34, 50, 179, 29, 215, 142, 5, 239, 54, 7, 196, 36, 81, 188, 247, 192, 3, 244, 124, 253, 168, 19, 233, 109, 231, 192, 175, 145, 117, 76, 63, 70, 62, 40, 182, 78, 254, 130, 186, 51, 198, 159, 107, 19, 156, 134, 103, 50, 90, 103, 74, 56, 89, 219, 199, 9, 95, 82, 84, 194, 128, 42, 20, 199, 148, 228, 7, 118, 119, 197, 45, 128, 9, 170, 208, 53, 183, 193, 219, 5, 217, 212, 134, 223, 36, 133, 92, 186, 235, 96, 221, 117, 0, 193, 177, 162, 117, 175, 70, 109, 31, 153, 192, 154, 149, 154, 14, 97, 150, 111, 227, 28, 62, 28, 87, 9, 143, 179, 167, 61, 34, 56, 49, 214, 103, 226, 6, 252, 32, 41, 67, 251, 82, 211, 79, 59, 118, 84, 13, 186, 17, 210, 208, 173, 195, 188, 134, 107, 74, 31, 134, 203, 90, 191, 112, 36, 15, 24, 25, 235, 139, 143, 62, 206, 200, 184, 140, 76, 38, 33, 145, 111, 208, 150, 137, 130, 192, 60, 198, 200, 136, 65, 8, 120, 228, 137, 230, 157, 86, 120, 28, 249, 236, 246, 108, 236, 190, 181, 14, 130, 11, 117, 191, 234, 124, 3, 114, 238, 202, 204, 12, 64, 157, 68, 242, 69, 222, 71, 38, 20, 167, 248, 156, 18, 118, 68, 41, 139, 228, 235, 148, 91, 226, 42, 148, 22, 166, 232, 244, 29, 159, 154, 36, 142, 96, 176, 49, 183, 130, 138, 26, 37, 220, 156, 202, 183, 34, 131, 245, 174, 136, 48, 154, 230, 37, 118, 121, 68, 231, 79, 63, 221, 46, 137, 160, 179, 87, 17, 218, 214, 63, 102, 102, 99, 169, 198, 113, 33, 76, 13, 61, 36, 89, 148, 49, 134, 239, 253, 12, 242, 28, 5, 21, 143, 242, 106, 146, 125, 164, 137, 207, 95, 235, 57, 211, 192, 118, 224, 242, 249, 16, 83, 56, 41, 181, 124, 108, 16, 28, 185, 71, 171, 15, 164, 118, 198, 66, 198, 194, 107, 83, 84, 163, 186, 219, 43, 221, 9, 3, 20, 103, 40, 59, 249, 24, 216, 106, 16, 99, 168, 109, 128, 169, 57, 46, 158, 81, 167, 201, 255, 62, 103, 14, 62, 238, 99, 254, 210, 106, 23, 120, 215, 2, 3, 73, 251, 237, 135, 128, 128, 206, 101, 77, 245, 27, 70, 53, 196, 81, 223, 13, 0, 204, 10, 222, 12, 164, 202, 100, 79, 25, 249, 121, 215, 148, 225, 91, 127, 75, 75, 163, 110, 205, 5, 204, 177, 254, 134, 245, 217, 178, 64, 239, 106, 55, 124, 16, 80, 124, 16, 81, 169, 61, 200, 221, 24, 221, 18, 233, 230, 164, 121, 212, 126, 79, 2, 216, 164, 249, 41, 255, 39, 98, 231, 12, 123, 13, 116, 220, 172, 166, 89, 112, 113, 250, 61, 176, 153, 84, 225, 187, 162, 79, 65, 106, 221, 173, 209, 157, 70, 33, 75, 158, 110, 152, 39, 200, 89, 91, 89, 253, 126, 84, 27, 158, 181, 101, 249, 32, 129, 198, 38, 144, 92, 64, 112, 208, 113, 60, 212, 72, 138, 49, 82, 95, 183, 174, 225, 77, 53, 121, 211, 223, 131, 161, 148, 220, 88, 131, 151, 69, 208, 240, 49, 163, 151, 121, 50, 79, 129, 137, 98, 57, 18, 33, 202, 150, 120, 255, 99, 34, 54, 85, 204, 172, 120, 77, 42, 123, 242, 129, 92, 196, 78, 101, 98, 25, 146, 73, 186, 132, 227, 246, 96, 236, 208, 63, 50, 90, 183, 134, 219, 143, 100, 54, 175, 20, 172, 107, 171, 169, 199, 50, 110, 252, 135, 93, 169, 144, 100, 236, 91, 122, 111, 40, 196, 143, 73, 177, 56, 50, 27, 21, 249, 185, 212, 182, 40, 134, 197, 187, 55, 165, 125, 48, 132, 76, 242, 184, 173, 177, 111, 150, 67, 58, 189, 122, 152, 228, 51, 241, 130, 42, 113, 112, 62, 70, 131, 4, 23, 177, 114, 212, 125, 157, 28, 8, 238, 223, 158, 211, 172, 145, 188, 65, 125, 62, 45, 220, 124, 226, 100, 34, 36, 153, 93, 76, 157, 89, 219, 60, 42, 88, 68, 158, 155, 181, 124, 242, 72, 167, 74, 56, 176, 56, 114, 203, 54, 170, 85, 155, 235, 79, 29, 201, 71, 124, 181, 127, 180, 139, 147, 47, 167, 26, 18, 67, 141, 150, 37, 197, 6, 170, 96, 68, 89, 209, 246, 182, 183, 53, 68, 239, 126, 147, 50, 210, 34, 248, 246, 109, 34, 41, 213, 229, 134, 154, 97, 241, 132, 17, 162, 180, 74, 151, 253, 150, 69, 251, 151, 63, 192, 219, 79, 253, 212, 137, 234, 196, 133, 215, 211, 147, 128, 54, 85, 93, 202, 30, 168, 167, 128, 125, 150, 188, 250, 23, 195, 249, 52, 179, 26, 207, 129, 227, 68, 78, 56, 2, 17, 86, 220, 89, 99, 19, 20, 173, 57, 203, 140, 66, 231, 27, 69, 214, 238, 201, 134, 89, 102, 254, 85, 249, 132, 115, 51, 39, 65, 184, 199, 187, 14, 44, 6, 217, 16, 227, 116, 185, 66, 201, 188, 95, 66, 178, 243, 103, 79, 144, 147, 139, 59, 123, 238, 28, 18, 202, 166, 75, 59, 246, 190, 150, 75, 73, 182, 251, 132, 15, 248, 96, 112, 253, 41, 3, 203, 44, 141, 147, 255, 69, 85, 78, 129, 60, 145, 81, 166, 224, 131, 132, 215, 210, 169, 5, 136, 178, 23, 30, 139, 153, 106, 40, 54, 139, 244, 214, 43, 132, 229, 221, 58, 81, 81, 57, 190, 168, 255, 114, 63, 122, 173, 6, 136, 110, 159, 188, 50, 188, 91, 56, 185, 99, 107, 139, 120, 176, 228, 142, 146, 209, 96, 27, 133, 77, 69, 254, 114, 99, 194, 195, 4, 80, 36, 220, 147, 252, 207, 142, 66, 65, 64, 226, 63, 85, 218, 66, 125, 108, 197, 49, 143, 59, 43, 182, 0, 253, 169, 234, 209, 57, 90, 190, 234, 14, 25, 237, 62, 155, 188, 246, 92, 78, 241, 21, 154, 242, 201, 59, 16, 147, 73, 252, 52, 13, 175, 51, 158, 248, 118, 159, 4, 186, 101, 250, 170, 10, 16, 135, 251, 224, 114, 97, 61, 25, 102, 23, 74, 58, 118, 158, 32, 74, 115, 104, 240, 131, 42, 187, 155, 134, 209, 171, 225, 85, 13, 71, 252, 156, 81, 126, 72, 110, 45, 207, 84, 113, 187, 61, 152, 107, 111, 80, 105, 35, 104, 81, 245, 68, 28, 51, 67, 212, 172, 99, 191, 248, 217, 91, 186, 232, 145, 201, 135, 56, 164, 52, 127, 137, 111, 186, 6, 164, 236, 112, 31, 232, 75, 224, 58, 209, 31, 205, 204, 46, 180, 127, 215, 44, 45, 13, 147, 165, 245, 241, 162, 178, 249, 226, 241, 113, 104, 80, 175, 59, 1, 43, 12, 25, 255, 146, 70, 208, 140, 140, 225, 122, 125, 181, 239, 73, 89, 5, 107, 9, 241, 8, 16, 223, 203, 176, 57, 33, 4, 115, 216, 80, 155, 249, 103, 241, 188, 44, 216, 37, 115, 171, 104, 154, 145, 134, 183, 58, 141, 141, 178, 123, 166, 222, 67, 68, 154, 167, 52, 235, 31, 112, 206, 223, 53, 6, 183, 5, 146, 93, 226, 30, 73, 237, 197, 140, 19, 34, 104, 116, 213, 152, 6, 75, 215, 218, 214, 66, 101, 19, 72, 244, 9, 81, 57, 43, 202, 165, 46, 36, 100, 31, 15, 218, 44, 181, 120, 172, 25, 99, 242, 188, 3, 83, 202, 190, 27, 251, 130, 200, 101, 175, 176, 105, 39, 227, 210, 240, 121, 137, 42, 27, 128, 5, 30, 234, 109, 232, 77, 59, 100, 180, 107, 5, 215, 28, 55, 228, 186, 224, 16, 156, 182, 238, 181, 59, 124, 105, 117, 32, 66, 83, 110, 109, 112, 68, 95, 77, 121, 139, 94, 176, 190, 6, 58, 109, 213, 214, 24, 253, 72, 61, 86, 209, 20, 88, 36, 146, 179, 79, 168, 66, 209, 168, 48, 253, 177, 239, 139, 166, 213, 72, 242, 160, 36, 254, 135, 57, 207, 55, 198, 205, 150, 198, 54, 140, 247, 242, 52, 106, 132, 71, 67, 233, 29, 181, 247, 189, 36, 48, 232, 111, 130, 149, 234, 243, 241, 165, 66, 221, 64, 173, 207, 0, 69, 201, 111, 209, 157, 16, 56, 217, 29, 157, 106, 232, 206, 148, 110, 71, 113, 29, 228, 195, 57, 249, 181, 71, 203, 211, 131, 64, 92, 141, 89, 58, 210, 70, 246, 227, 146, 137, 63, 41, 250, 187, 56, 160, 17, 174, 45, 28, 245, 204, 63, 18, 174, 162, 53, 208, 121, 187, 1, 121, 46, 50, 245, 207, 140, 5, 186, 237, 72, 158, 163, 44, 143, 197, 127, 34, 160, 41, 242, 108, 220, 123, 138, 205, 164, 23, 164, 18, 117, 123, 153, 22, 150, 73, 141, 43, 176, 88, 251, 198, 143, 93, 33, 20, 40, 143, 84, 197, 67, 255, 148, 57, 146, 198, 114, 33, 71, 30, 82, 192, 170, 52, 234, 239, 80, 64, 40, 102, 84, 166, 173, 142, 183, 193, 94, 230, 23, 141, 252, 243, 157, 35, 237, 118, 118, 42, 74, 1, 54, 87, 226, 144, 53, 58, 204, 32, 19, 74, 57, 167, 120, 21, 185, 51, 252, 176, 109, 2, 92, 125, 240, 132, 20, 197, 113, 129, 104, 179, 18, 64, 47, 115, 96, 209, 210, 76, 191, 39, 127, 230, 135, 242, 56, 42, 214, 109, 188, 170, 192, 204, 9, 204, 190, 58, 162, 143, 115, 247, 60, 155, 37, 146, 119, 159, 64, 247, 242, 239, 189, 181, 85, 25, 145, 123, 81, 123, 205, 83, 33, 144, 45, 196, 64, 114, 13, 18, 247, 116, 14, 202, 246, 213, 177, 225, 152, 217, 119, 24, 39, 253, 158, 222, 242, 242, 175, 77, 241, 126, 29, 93, 45, 170, 185, 71, 131, 214, 114, 43, 181, 150, 252, 39, 6, 87, 37, 134, 229, 17, 8, 15, 186, 181, 205, 161, 20, 235, 0, 12, 137, 197, 184, 41, 11, 222, 237, 139, 70, 19, 213, 30, 122, 10, 226, 173, 98, 29, 245, 52, 215, 124, 12, 134, 182, 57, 22, 177, 59, 226, 249, 248, 41, 180, 183, 47, 165, 116, 170, 152, 20, 74, 194, 122, 200, 136, 75, 176, 189, 240, 211, 88, 98, 205, 34, 105, 216, 138, 137, 72, 56, 215, 175, 140, 70, 137, 91, 54, 133, 221, 38, 226, 239, 139, 212, 80, 177, 248, 110, 195, 61, 196, 255, 7, 156, 229, 136, 198, 72, 3, 234, 106, 16, 83, 14, 210, 94, 51, 205, 43, 23, 224, 60, 41, 139, 192, 59, 25, 111, 190, 82, 39, 54, 189, 75, 126, 229, 83, 220, 32, 148, 43, 104, 248, 214, 206, 224, 215, 16, 60, 193, 15, 56, 193, 32, 170, 160, 23, 190, 102, 110, 19, 17, 72, 35, 17, 208, 211, 97, 113, 200, 24, 54, 117, 191, 45, 89, 163, 74, 198, 191, 150, 95, 253, 192, 22, 129, 130, 32, 152, 172, 103, 119, 229, 128, 56, 107, 92, 200, 44, 214, 191, 125, 210, 215, 82, 117, 251, 113, 109, 109, 226, 6, 169, 109, 74, 23, 249, 245, 34, 66, 19, 101, 185, 162, 211, 82, 34, 142, 17, 229, 51, 118, 89, 199, 214, 28, 129, 55, 42, 45, 223, 195, 53, 145, 14, 230, 108, 57, 10, 38, 30, 54, 47, 103, 228, 177, 43, 124, 215, 126, 179, 126, 224, 136, 52, 213, 200, 239, 248, 56, 200, 140, 211, 100, 66, 168, 7, 73, 198, 24, 116, 195, 168, 244, 221, 29, 96, 70, 60, 223, 74, 211, 190, 250, 31, 253, 102, 252, 5, 79, 214, 195, 57, 178, 97, 227, 185, 105, 107, 5, 36, 58, 5, 55, 206, 148, 62, 127, 7, 185, 106, 245, 3, 39, 244, 34, 213, 127, 5, 102, 234, 34, 21, 55, 212, 6, 181, 98, 25, 92, 178, 172, 22, 221, 208, 146, 54, 119, 64, 138, 248, 54, 134, 7, 72, 247, 6, 228, 125, 93, 153, 23, 141, 207, 95, 56, 117, 215, 95, 159, 159, 214, 117, 97, 43, 109, 88, 50, 163, 148, 70, 44, 108, 208, 165, 89, 202, 104, 76, 241, 196, 12, 40, 102, 154, 234, 158, 197, 135, 31, 129, 203, 135, 181, 145, 20, 117, 153, 231, 212, 228, 118, 193, 211, 167, 59, 198, 170, 28, 74, 11, 164, 211, 1, 189, 68, 202, 163, 110, 158, 216, 123, 31, 16, 30, 31, 111, 81, 108, 235, 56, 98, 114, 76, 29, 142, 234, 159, 214, 18, 38, 226, 183, 37, 36, 15, 56, 53, 141, 161, 85, 198, 76, 246, 223, 82, 137, 2, 27, 186, 111, 208, 68, 146, 181, 205, 85, 101, 70, 19, 33, 38, 254, 177, 231, 88, 176, 43, 130, 244, 94, 228, 81, 193, 13, 224, 8, 45, 35, 185, 9, 103, 112, 133, 124, 107, 172, 66, 48, 64, 33, 84, 14, 127, 69, 54, 46, 68, 14, 225, 255, 48, 107, 32, 75, 160, 60, 67, 158, 149, 12, 243, 130, 168, 250, 146, 60, 29, 121, 117, 186, 93, 171, 26, 187, 23, 130, 200, 105, 169, 14, 241, 206, 210, 146, 59, 79, 197, 56, 14, 119, 202, 166, 82, 77, 90, 96, 193, 7, 176, 83, 166, 12, 5, 99, 4, 173, 44, 162, 241, 216, 251, 218, 158, 2, 222, 159, 93, 5, 189, 82, 143, 147, 50, 220, 207, 150, 229, 93, 47, 39, 242, 159, 236, 141, 31, 209, 237, 21, 156, 8, 199, 201, 62, 55, 18, 132, 140, 65, 177, 159, 152, 137, 179, 4, 196, 88, 135, 212, 251, 156, 138, 108, 108, 84, 178, 243, 153, 151, 175, 177, 23, 163, 44, 180, 29, 98, 159, 125, 91, 169, 25, 131, 30, 65, 139, 56, 16, 177, 161, 230, 244, 121, 38, 207, 45, 64, 0, 235, 250, 149, 220, 128, 161, 118, 12, 148, 229, 107, 33, 108, 158, 197, 103, 236, 220, 167, 93, 108, 227, 34, 17, 54, 31, 131, 135, 182, 166, 130, 136, 244, 128, 130, 64, 45, 59, 203, 121, 207, 228, 46, 75, 96, 55, 66, 87, 173, 145, 207, 106, 111, 97, 224, 103, 86, 128, 36, 37, 105, 165, 77, 69, 13, 29, 220, 163, 123, 49, 209, 38, 212, 238, 25, 4, 232, 186, 232, 133, 3, 163, 79, 139, 249, 111, 69, 0, 187, 128, 212, 60, 242, 147, 148, 223, 17, 73, 194, 244, 125, 146, 191, 38, 15, 247, 52, 4, 91, 229, 37, 22, 64, 135, 77, 181, 241, 149, 80, 196, 124, 21, 200, 117, 76, 105, 121, 30, 188, 3, 65, 161, 205, 178, 242, 67, 111, 175, 58, 9, 95, 46, 201, 105, 23, 224, 249, 98, 100, 205, 255, 23, 50, 131, 30, 216, 87, 102, 59, 91, 156, 114, 45, 237, 187, 117, 192, 231, 51, 65, 183, 127, 231, 90, 69, 131, 6, 141, 83, 217, 17, 41, 150, 182, 89, 2, 191, 56, 69, 42, 120, 196, 10, 177, 255, 154, 238, 104, 210, 58, 33, 13, 163, 136, 178, 244, 61, 163, 206, 79, 81, 212, 50, 23, 56, 28, 182, 165, 29, 84, 29, 173, 150, 194, 201, 221, 239, 145, 151, 60, 119, 233, 183, 171, 240, 201, 10, 91, 26, 12, 55, 126, 52, 113, 9, 105, 150, 111, 58, 76, 222, 35, 54, 5, 36, 51, 229, 13, 222, 167, 248, 130, 166, 6, 108, 78, 44, 228, 219, 155, 216, 122, 66, 163, 52, 100, 111, 104, 166, 127, 253, 123, 15, 179, 63, 102, 161, 23, 86, 81, 41, 241, 164, 196, 71, 122, 216, 18, 22, 196, 39, 126, 223, 86, 220, 81, 90, 103, 74, 116, 226, 16, 125, 173, 210, 46, 194, 102, 224, 246, 149, 225, 35, 1, 248, 108, 64, 20, 74, 48, 89, 109, 173, 212, 114, 175, 87, 97, 217, 241, 107, 253, 67, 82, 32, 14, 1, 219, 60, 10, 73, 19, 183, 87, 110, 95, 252, 101, 56, 34, 67, 24, 180, 179, 55, 32, 247, 187, 98, 99, 235, 73, 77, 243, 29, 29, 93, 242, 60, 26, 51, 27, 102, 109, 98, 251, 98, 76, 235, 39, 89, 1, 108, 46, 238, 115, 33, 59, 45, 46, 4, 56, 141, 65, 192, 26, 110, 192, 216, 245, 71, 57, 65, 144, 246, 236, 191, 64, 159, 245, 245, 14, 36, 66, 6, 98, 18, 148, 99, 141, 82, 64, 51, 168, 215, 201, 82, 150, 68, 84, 237, 2, 185, 49, 39, 122, 245, 239, 219, 60, 142, 16, 78, 165, 59, 145, 226, 38, 19, 228, 26, 159, 176, 90, 32, 1, 163, 43, 127, 125, 232, 29, 223, 231, 232, 176, 78, 57, 34, 219, 177, 64, 17, 186, 201, 72, 51, 195, 59, 140, 226, 123, 219, 243, 10, 190, 99, 40, 236, 187, 46, 119, 180, 164, 197, 70, 134, 167, 185, 241, 187, 218, 249, 220, 62, 226, 47, 97, 251, 132, 155, 218, 32, 253, 182, 144, 98, 22, 209, 215, 16, 95, 246, 4, 58, 32, 214, 187, 1, 103, 224, 60, 163, 97, 233, 219, 15, 97, 6, 176, 177, 176, 174, 149, 111, 229, 17, 47, 10, 167, 193, 114, 2, 14, 131, 72, 117, 147, 68, 11, 217, 168, 7, 84, 89, 255, 130, 70, 149, 123, 55, 161, 5, 27, 3, 133, 147, 51, 133, 120, 139, 225, 134, 107, 121, 199, 129, 150, 117, 73, 6, 190, 67, 1, 127, 99, 203, 123, 26, 10, 131, 160, 255, 55, 205, 8, 109, 202, 165, 46, 13, 144, 141, 238, 4, 15, 30, 91, 78, 167, 56, 207, 181, 100, 89, 226, 166, 91, 6, 87, 42, 161, 18, 173, 46, 134, 84, 47, 192, 51, 192, 86, 143, 106, 143, 68, 251, 155, 48, 132, 148, 113, 151, 135, 133, 68, 135, 223, 141, 62, 40, 237, 173, 32, 255, 82, 138, 211, 98, 135, 17, 208, 76, 110, 10, 169, 109, 29, 94, 79, 56, 157, 83, 52, 181, 250, 138, 162, 188, 220, 51, 204, 209, 222, 189, 226, 142, 162, 134, 34, 176, 136, 149, 252, 25, 172, 22, 56, 41, 175, 96, 189, 47, 60, 197, 122, 228, 229, 174, 7, 187, 59, 62, 90, 104, 81, 171, 136, 40, 100, 33, 61, 107, 104, 93, 125, 99, 111, 143, 164, 107, 234, 102, 20, 82, 79, 151, 211, 159, 79, 36, 159, 15, 137, 116, 236, 128, 31, 195, 155, 61, 48, 44, 168, 114, 179, 176, 19, 154, 247, 138, 187, 48, 108, 202, 239, 31, 5, 253, 101, 72, 112, 65, 48, 8, 136, 4, 140, 125, 19, 45, 76, 151, 233, 69, 65, 39, 222, 33, 169, 153, 248, 69, 22, 63, 82, 47, 141, 89, 69, 102, 183, 148, 108, 230, 206, 254, 173, 111, 126, 205, 73, 85, 110, 8, 195, 112, 225, 241, 117, 201, 155, 66, 182, 43, 95, 192, 172, 85, 95, 200, 55, 150, 254, 183, 79, 51, 140, 194, 243, 218, 6, 207, 43, 112, 155, 165, 185, 81, 231, 61, 156, 78, 134, 159, 39, 52, 3, 54, 202, 111, 201, 137, 237, 153, 86, 65, 220, 47, 171, 44, 200, 196, 150, 157, 71, 245, 230, 122, 68, 43, 159, 42, 220, 239, 39, 59, 81, 215, 190, 128, 130, 45, 90, 180, 95, 118, 120, 37, 13, 88, 3, 66, 233, 214, 12, 132, 171, 162, 38, 115, 151, 111, 181, 74, 10, 105, 88, 147, 18, 179, 28, 209, 232, 145, 185, 92, 144, 230, 74, 12, 70, 230, 10, 109, 202, 47, 127, 142, 241, 226, 160, 99, 236, 6, 133, 69, 212, 154, 166, 91, 50, 29, 34, 28, 146, 191, 43, 169, 86, 236, 44, 39, 96, 174, 26, 12, 210, 205, 182, 94, 148, 21, 71, 7, 55, 243, 169, 236, 251, 148, 255, 130, 169, 82, 153, 21, 140, 25, 11, 83, 255, 108, 240, 128, 13, 36, 35, 182, 182, 242, 102, 57, 202, 171, 124, 196, 136, 92, 214, 60, 128, 224, 239, 59, 200, 208, 243, 143, 95, 97, 220, 171, 167, 40, 18, 63, 70, 152, 3, 129, 146, 154, 72, 146, 176, 144, 56, 0, 216, 206, 217, 145, 170, 82, 110, 208, 56, 155, 158, 133, 32, 72, 127, 55, 98, 223, 55, 57, 226, 184, 221, 143, 62, 205, 153, 184, 72, 233, 147, 245, 235, 115, 24, 146, 28, 29, 191, 188, 195, 216, 0, 79, 123, 176, 54, 74, 228, 161, 151, 255, 57, 132, 208, 222, 172, 239, 205, 243, 127, 50, 141, 9, 28, 72, 123, 85, 122, 138, 248, 107, 55, 73, 183, 2, 189, 140, 161, 129, 16, 183, 182, 207, 76, 105, 61, 159, 207, 220, 140, 223, 15, 72, 164, 232, 55, 246, 173, 204, 217, 67, 72, 116, 35, 22, 247, 217, 8, 97, 20, 37, 53, 199, 137, 14, 183, 78, 33, 179, 245, 104, 161, 143, 174, 147, 54, 58, 153, 221, 189, 50, 27, 25, 252, 142, 76, 18, 135, 116, 106, 21, 78, 71, 130, 246, 120, 35, 81, 60, 230, 156, 147, 127, 104, 209, 94, 21, 168, 51, 226, 215, 97, 176, 83, 122, 225, 117, 106, 49, 117, 171, 146, 184, 154, 203, 205, 153, 155, 84, 153, 95, 190, 76, 32, 248, 17, 43, 20, 48, 114, 56, 234, 90, 101, 59, 154, 217, 35, 15, 234, 180, 156, 178, 214, 117, 220, 215, 178, 12, 37, 247, 61, 212, 186, 28, 176, 157, 38, 125, 116, 68, 128, 229, 191, 65, 183, 125, 81, 130, 183, 131, 93, 244, 175, 42, 119, 240, 179, 174, 78, 1, 125, 226, 231, 160, 105, 14, 32, 19, 86, 170, 9, 226, 40, 148, 47, 70, 27, 37, 13, 56, 247, 89, 179, 103, 45, 105, 94, 115, 97, 185, 56, 13, 24, 135, 47, 150, 57, 56, 72, 31, 70, 31, 48, 75, 206, 216, 69, 184, 201, 237, 221, 113, 183, 214, 140, 167, 68, 69, 187, 226, 254, 182, 189, 142, 132, 1, 220, 204, 174, 248, 29, 216, 137, 194, 87, 139, 131, 224, 76, 73, 194, 165, 71, 63, 157, 208, 134, 167, 116, 14, 87, 226, 46, 76, 101, 73, 42, 99, 13, 76, 238, 140, 44, 48, 118, 246, 56, 74, 153, 113, 185, 44, 218, 130, 32, 218, 143, 177, 174, 194, 189, 188, 12, 248, 30, 201, 111, 41, 179, 117, 45, 168, 224, 254, 10, 90, 226, 81, 242, 96, 40, 61, 225, 156, 143, 248, 187, 220, 74, 237, 159, 165, 63, 246, 200, 229, 75, 103, 203, 208, 187, 92, 84, 138, 17, 36, 207, 108, 67, 138, 71, 82, 252, 122, 231, 150, 11, 109, 169, 15, 75, 46, 149, 100, 227, 59, 95, 15, 40, 246, 192, 66, 68, 36, 248, 149, 74, 54, 28, 207, 167, 237, 62, 186, 11, 49, 155, 38, 20, 117, 62, 18, 201, 9, 166, 33, 74, 232, 160, 202, 178, 77, 25, 107, 220, 210, 141, 40, 172, 79, 179, 55, 185, 100, 199, 98, 115, 207, 191, 151, 67, 174, 160, 99, 155, 76, 33, 141, 242, 154, 100, 87, 243, 208, 43, 160, 42, 126, 22, 177, 199, 150, 245, 244, 247, 186, 241, 222, 110, 37, 208, 33, 61, 184, 15, 72, 19, 103, 39, 215, 155, 210, 224, 71, 180, 11, 172, 63, 25, 19, 134, 108, 93, 35, 239, 49, 159, 42, 238, 79, 117, 86, 16, 121, 66, 93, 45, 199, 23, 187, 127, 36, 85, 208, 230, 132, 244, 81, 51, 107, 51, 72, 30, 81, 50, 238, 169, 204, 134, 134, 45, 5, 148, 235, 84, 132, 46, 226, 36, 102, 68, 51, 213, 138, 238, 72, 88, 110, 117, 31, 222, 121, 76, 130, 195, 232, 169, 252, 218, 169, 141, 41, 51, 63, 78, 122, 236, 42, 150, 182, 48, 40, 80, 44, 60, 40, 167, 42, 133, 21, 222, 175, 242, 236, 255, 53, 141, 153, 55, 223, 175, 247, 251, 102, 105, 54, 31, 47, 236, 176, 106, 191, 35, 249, 141, 170, 115, 8, 43, 117, 98, 108, 207, 43, 62, 247, 140, 37, 234, 0, 243, 31, 52, 42, 240, 226, 94, 128, 246, 249, 56, 37, 226, 92, 53, 36, 72, 144, 138, 181, 113, 54, 159, 116, 37, 26, 174, 73, 158, 179, 22, 173, 173, 76, 118, 38, 13, 255, 67, 194, 86, 90, 199, 243, 65, 3, 10, 210, 37, 198, 22, 139, 92, 210, 95, 166, 208, 227, 48, 255, 255, 78, 64, 150, 209, 86, 77, 140, 215, 139, 1, 112, 216, 14, 126, 41, 52, 81, 240, 166, 110, 246, 236, 70, 106, 95, 165, 112, 102, 214, 225, 248, 58, 57, 164, 225, 7, 167, 15, 66, 26, 243, 153, 184, 43, 67, 226, 136, 56, 251, 245, 85, 141, 129, 183, 244, 109, 227, 163, 251, 110, 135, 174, 205, 49, 67, 131, 32, 134, 231, 225, 203, 78, 160, 182, 78, 140, 213, 115, 82, 156, 130, 102, 106, 184, 123, 84, 13, 160, 185, 162, 47, 227, 197, 165, 83, 122, 68, 128, 131, 150, 125, 112, 150, 138, 8, 148, 69, 176, 172, 114, 73, 127, 86, 70, 212, 0, 157, 63, 184, 197, 6, 82, 157, 55, 154, 33, 170, 56, 181, 70, 206, 169, 92, 122, 27, 184, 159, 242, 206, 225, 177, 242, 162, 148, 117, 158, 172, 72, 76, 186, 59, 60, 8, 161, 188, 101, 31, 233, 37, 240, 69, 226, 40, 247, 105, 19, 211, 15, 90, 90, 102, 180, 61, 128, 50, 212, 248, 144, 135, 178, 49, 175, 106, 28, 225, 242, 203, 247, 6, 165, 202, 108, 36, 8, 155, 177, 240, 70, 84, 16, 250, 91, 0, 19, 54, 91, 196, 133, 73, 197, 2, 211, 143, 201, 123, 80, 142, 191, 119, 98, 18, 245, 100, 73, 93, 243, 201, 35, 54, 231, 238, 241, 5, 155, 127, 0, 254, 121, 146, 12, 127, 122, 195, 64, 99, 255, 95, 186, 185, 45, 7, 180, 159, 154, 64, 100, 182, 150, 27, 189, 63, 7, 52, 11, 159, 184, 38, 230, 77, 198, 241, 22, 194, 222, 20, 202, 53, 236, 141, 149, 64, 148, 242, 76, 79, 56, 46, 188, 118, 201, 56, 142, 141, 123, 75, 119, 211, 5, 54, 61, 145, 48, 231, 130, 81, 12, 80, 29, 248, 136, 242, 226, 149, 57, 110, 1, 184, 147, 187, 208, 86, 103, 131, 34, 214, 35, 146, 124, 252, 177, 76, 110, 156, 99, 118, 76, 153, 73, 89, 49, 37, 178, 14, 250, 151, 170, 254, 220, 59, 171, 75, 84, 164, 65, 121, 87, 122, 212, 27, 65, 94, 57, 60, 250, 249, 156, 80, 109, 238, 235, 92, 201, 39, 192, 86, 162, 30, 106, 104, 114, 182, 9, 183, 97, 95, 231, 16, 40, 87, 196, 43, 69, 29, 136, 219, 68, 42, 215, 122, 197, 109, 134, 88, 61, 55, 177, 209, 174, 109, 110, 217, 95, 201, 16, 133, 149, 147, 244, 155, 105, 39, 28, 105, 247, 251, 139, 219, 63, 176, 161, 71, 101, 63, 98, 218, 96, 33, 127, 192, 31, 69, 166, 61, 74, 143, 142, 88, 225, 134, 65, 235, 214, 145, 245, 107, 56, 238, 119, 101, 160, 247, 38, 236, 87, 124, 117, 93, 199, 107, 151, 217, 41, 30, 69, 61, 60, 228, 120, 38, 61, 202, 4, 196, 60, 107, 93, 230, 40, 247, 224, 159, 40, 66, 236, 243, 135, 202, 146, 209, 197, 56, 33, 126, 2, 150, 230, 154, 253, 35, 136, 132, 121, 244, 123, 201, 99, 100, 34, 233, 123, 210, 194, 205, 243, 251, 205, 118, 7, 211, 100, 55, 210, 42, 228, 153, 167, 251, 150, 182, 182, 23, 158, 81, 162, 157, 253, 5, 44, 163, 226, 150, 71, 84, 7, 94, 209, 240, 30, 86, 146, 182, 130, 210, 61, 179, 233, 42, 26, 151, 54, 91, 14, 155, 19, 142, 113, 38, 169, 23, 73, 254, 124, 16, 15, 81, 67, 86, 230, 56, 77, 86, 225, 157, 240, 176, 138, 0, 179, 194, 157, 235, 199, 57, 160, 108, 54, 67, 205, 162, 28, 140, 215, 230, 18, 47, 130, 185, 162, 65, 150, 58, 177, 194, 149, 41, 64, 20, 205, 76, 57, 68, 53, 128, 73, 52, 99, 239, 127, 206, 232, 68, 50, 48, 176, 235, 249, 65, 38, 39, 152, 147, 79, 184, 174, 106, 120, 67, 79, 81, 97, 56, 196, 246, 63, 10, 133, 104, 2, 134, 231, 66, 48, 202, 47, 125, 78, 73, 181, 93, 140, 185, 53, 223, 108, 194, 31, 97, 227, 137, 251, 150, 126, 82, 77, 115, 123, 6, 224, 250, 235, 144, 171, 159, 213, 113, 246, 46, 151, 87, 13, 119, 210, 206, 215, 189, 246, 27, 228, 25, 69, 4, 248, 63, 128, 9, 67, 54, 72, 217, 224, 134, 171, 137, 235, 100, 152, 160, 155, 85, 223, 5, 138, 178, 94, 25, 223, 12, 180, 199, 151, 120, 38, 4, 121, 192, 69, 126, 105, 16, 7, 22, 26, 187, 124, 6, 203, 17, 11, 231, 196, 67, 234, 38, 86, 246, 52, 16, 112, 156, 178, 231, 251, 108, 147, 239, 177, 185, 211, 79, 1, 136, 247, 203, 252, 140, 213, 247, 230, 147, 90, 110, 53, 207, 160, 70, 250, 109, 6, 44, 231, 3, 185, 25, 85, 200, 137, 200, 34, 92, 52, 151, 250, 44, 132, 111, 80, 243, 47, 234, 216, 229, 22, 231, 52, 195, 171, 132, 133, 33, 38, 232, 245, 226, 186, 146, 58, 40, 73, 163, 32, 82, 203, 121, 68, 128, 95, 107, 20, 11, 76, 242, 165, 111, 52, 144, 156, 147, 63, 100, 94, 226, 149, 56, 39, 32, 58, 34, 153, 138, 224, 4, 95, 129, 192, 92, 247, 139, 190, 177, 0, 50, 83, 231, 45, 59, 59, 13, 24, 117, 66, 5, 16, 145, 172, 84, 230, 74, 90, 94, 208, 92, 219, 54, 218, 134, 162, 251, 162, 99, 78, 191, 188, 71, 249, 101, 232, 123, 16, 123, 177, 248, 47, 254, 56, 11, 39, 62, 155, 143, 137, 174, 99, 73, 186, 53, 169, 27, 241, 40, 29, 166, 22, 41, 90, 31, 62, 28, 12, 230, 143, 15, 68, 119, 28, 126, 94, 55, 161, 151, 211, 129, 162, 206, 109, 158, 173, 85, 119, 18, 54, 107, 213, 68, 29, 99, 62, 188, 115, 105, 95, 2, 135, 83, 183, 67, 210, 255, 160, 128, 83, 141, 177, 169, 129, 223, 157, 30, 0, 68, 103, 164, 42, 103, 35, 179, 193, 54, 200, 250, 197, 233, 163, 86, 231, 73, 242, 217, 81, 48, 62, 230, 40, 173, 144, 84, 7, 199, 88, 61, 166, 38, 187, 80, 60, 136, 44, 242, 62, 224, 98, 169, 210, 116, 9, 233, 199, 224, 1, 82, 201, 179, 116, 145, 37, 75, 101, 153, 31, 55, 129, 184, 193, 179, 55, 174, 186, 144, 178, 179, 118, 148, 33, 84, 250, 164, 85, 137, 168, 250, 89, 21, 237, 153, 127, 29, 86, 131, 72, 118, 175, 255, 160, 160, 78, 202, 88, 140, 237, 161, 195, 157, 85, 15, 234, 31, 168, 47, 189, 111, 47, 243, 160, 208, 218, 128, 2, 3, 82, 214, 40, 174, 190, 92, 201, 109, 235, 231, 112, 248, 229, 169, 93, 38, 100, 47, 43, 17, 55, 160, 208, 158, 64, 96, 147, 178, 156, 194, 179, 197, 166, 34, 156, 165, 124, 160, 189, 213, 20, 144, 108, 45, 99, 202, 209, 121, 163, 23, 138, 219, 56, 251, 153, 134, 129, 8, 97, 220, 30, 228, 217, 13, 225, 75, 209, 193, 32, 9, 16, 195, 85, 27, 193, 112, 192, 21, 21, 37, 46, 24, 252, 43, 212, 110, 152, 164, 90, 125, 111, 218, 35, 67, 171, 237, 146, 80, 22, 243, 160, 105, 146, 234, 181, 180, 71, 41, 146, 102, 250, 55, 46, 175, 92, 103, 43, 197, 59, 67, 118, 181, 189, 30, 185, 114, 71, 82, 16, 177, 167, 54, 106, 253, 174, 16, 51, 123, 54, 138, 200, 171, 89, 180, 183, 101, 207, 34, 112, 59, 3, 70, 172, 251, 177, 30, 232, 31, 10, 182, 220, 90, 116, 128, 201, 9, 43, 165, 0, 240, 72, 63, 137, 152, 20, 249, 146, 189, 148, 197, 160, 236, 224, 27, 222, 150, 0, 116, 38, 147, 169, 95, 0, 248, 196, 168, 222, 48, 72, 33, 67, 78, 73, 34, 186, 173, 18, 62, 181, 23, 165, 248, 62, 244, 123, 26, 241, 223, 76, 3, 186, 242, 41, 210, 210, 237, 65, 61, 55, 58, 94, 241, 147, 119, 27, 74, 112, 249, 193, 147, 157, 20, 4, 128, 142, 54, 213, 217, 60, 47, 9, 109, 162, 197, 147, 81, 76, 167, 7, 175, 223, 128, 217, 229, 40, 157, 182, 157, 171, 75, 204, 114, 152, 7, 164, 198, 239, 88, 148, 178, 217, 122, 187, 151, 105, 66, 51, 164, 92, 78, 168, 118, 143, 117, 64, 252, 91, 214, 145, 212, 138, 131, 5, 225, 150, 184, 184, 6, 138, 153, 120, 154, 194, 161, 33, 99, 204, 177, 237, 41, 32, 157, 36, 164, 246, 212, 120, 128, 48, 82, 218, 165, 206, 206, 105, 150, 204, 206, 124, 214, 233, 139, 53, 2, 36, 13, 21, 44, 79, 163, 163, 164, 28, 181, 134, 74, 128, 3, 53, 190, 125, 115, 155, 58, 63, 198, 87, 227, 191, 172, 49, 217, 71, 178, 118, 68, 19, 105, 142, 170, 115, 32, 135, 82, 203, 62, 132, 241, 200, 132, 101, 220, 251, 229, 204, 138, 31, 106, 33, 253, 157, 217, 71, 132, 66, 165, 203, 227, 243, 231, 22, 249, 159, 131, 27, 33, 156, 16, 58, 211, 229, 167, 144, 173, 111, 0, 195, 144, 177, 116, 78, 103, 158, 13, 248, 193, 107, 210, 62, 245, 116, 118, 24, 127, 187, 225, 100, 120, 91, 10, 102, 4, 200, 220, 200, 230, 238, 51, 89, 166, 63, 147, 149, 104, 47, 62, 171, 171, 59, 23, 143, 241, 99, 30, 84, 138, 19, 223, 133, 9, 221, 142, 76, 204, 164, 189, 170, 45, 75, 123, 133, 106, 196, 83, 57, 213, 182, 237, 52, 36, 222, 231, 127, 66, 120, 60, 81, 164, 109, 202, 239, 232, 180, 138, 153, 2, 255, 32, 247, 187, 79, 240, 104, 129, 192, 138, 249, 160, 8, 121, 178, 118, 13, 166, 27, 59, 29, 190, 147, 216, 204, 246, 184, 122, 194, 184, 58, 155, 133, 170, 194, 86, 22, 250, 122, 210, 127, 128, 157, 175, 131, 19, 188, 121, 118, 158, 93, 19, 110, 23, 209, 26, 19, 197, 2, 55, 221, 229, 155, 177, 20, 89, 154, 211, 185, 72, 213, 202, 136, 238, 42, 251, 228, 224, 191, 158, 39, 162, 231, 2, 128, 188, 49, 36, 104, 158, 163, 95, 82, 92, 255, 213, 162, 147, 211, 189, 44, 190, 220, 166, 0, 102, 10, 162, 99, 13, 55, 222, 95, 172, 195, 4, 37, 44, 100, 97, 112, 244, 251, 65, 67, 114, 88, 179, 150, 13, 176, 190, 86, 221, 113, 80, 243, 68, 221, 148, 98, 24, 179, 251, 40, 158, 171, 97, 223, 158, 131, 74, 182, 28, 39, 38, 254, 13, 3, 35, 107, 161, 178, 99, 22, 87, 101, 77, 208, 8, 58, 138, 113, 13, 60, 26, 3, 89, 77, 215, 108, 69, 221, 115, 207, 213, 216, 93, 32, 85, 210, 87, 199, 212, 79, 2, 63, 85, 70, 221, 136, 237, 79, 99, 59, 92, 57, 58, 51, 217, 141, 103, 17, 219, 153, 125, 209, 188, 57, 180, 23, 146, 104, 85, 229, 209, 155, 46, 99, 89, 244, 120, 122, 124, 218, 56, 44, 25, 61, 129, 130, 228, 55, 241, 74, 32, 187, 145, 149, 209, 10, 230, 245, 20, 16, 94, 26, 128, 15, 207, 132, 34, 33, 15, 61, 105, 98, 250, 221, 91, 113, 81, 64, 11, 131, 255, 75, 225, 190, 50, 95, 170, 69, 209, 215, 178, 89, 223, 190, 175, 55, 159, 176, 99, 12, 21, 221, 201, 211, 132, 234, 58, 251, 204, 61, 85, 153, 173, 81, 11, 8, 239, 170, 130, 41, 53, 165, 199, 70, 111, 30, 79, 181, 39, 105, 105, 104, 159, 52, 124, 253, 38, 191, 242, 73, 99, 65, 106, 128, 191, 172, 116, 182, 53, 71, 143, 85, 113, 195, 169, 227, 233, 232, 50, 99, 69, 244, 53, 148, 212, 1, 204, 147, 138, 157, 119, 246, 39, 240, 9, 65, 207, 52, 81, 43, 68, 81, 155, 65, 168, 204, 178, 108, 223, 249, 218, 180, 228, 83, 136, 79, 230, 12, 138, 229, 11, 69, 2, 97, 77, 99, 174, 37, 180, 12, 83, 141, 139, 41, 108, 40, 93, 160, 232, 30, 232, 159, 126, 223, 93, 90, 45, 88, 245, 158, 141, 88, 241, 91, 120, 252, 230, 140, 200, 195, 248, 58, 98, 152, 93, 232, 127, 89, 95, 106, 173, 142, 242, 24, 115, 66, 215, 211, 201, 240, 36, 140, 223, 207, 165, 241, 180, 34, 11, 159, 155, 250, 94, 136, 164, 214, 95, 154, 30, 106, 97, 114, 217, 176, 92, 18, 198, 157, 255, 78, 82, 208, 161, 185, 45, 209, 137, 91, 97, 227, 8, 185, 59, 203, 189, 25, 50, 230, 220, 135, 167, 13, 227, 236, 142, 141, 8, 16, 173, 250, 39, 18, 9, 75, 191, 174, 189, 226, 50, 125, 158, 188, 26, 109, 99, 57, 200, 231, 153, 197, 250, 247, 224, 57, 218, 53, 34, 172, 142, 30, 196, 98, 117, 187, 203, 134, 45, 87, 207, 6, 40, 205, 151, 192, 214, 214, 139, 206, 36, 121, 162, 25, 28, 206, 229, 18, 154, 136, 107, 204, 65, 235, 122, 185, 132, 50, 165, 227, 161, 234, 187, 27, 231, 212, 27, 113, 54, 208, 235, 204, 46, 47, 85, 217, 212, 6, 5, 222, 164, 126, 75, 51, 39, 94, 145, 145, 159, 255, 29, 240, 196, 214, 43, 242, 169, 34, 138, 132, 111, 181, 251, 51, 100, 115, 156, 246, 20, 179, 242, 151, 174, 252, 146, 226, 109, 180, 228, 254, 82, 143, 136, 145, 239, 4, 163, 200, 121, 67, 9, 11, 192, 42, 211, 156, 37, 16, 169, 120, 181, 223, 204, 86, 98, 174, 15, 46, 85, 75, 156, 43, 98, 90, 90, 158, 8, 135, 228, 42, 231, 56, 201, 199, 80, 141, 242, 25, 34, 169, 190, 232, 245, 47, 73, 17, 195, 41, 168, 247, 75, 124, 125, 201, 38, 85, 69, 132, 255, 113, 31, 89, 209, 45, 8, 142, 77, 148, 109, 204, 246, 229, 34, 22, 213, 34, 255, 106, 3, 42, 161, 193, 77, 135, 204, 225, 218, 48, 3, 254, 213, 42, 199, 174, 123, 143, 86, 217, 94, 137, 239, 137, 99, 200, 251, 208, 39, 101, 154, 44, 7, 26, 125, 245, 76, 122, 201, 11, 190, 108, 134, 231, 225, 43, 8, 158, 154, 158, 37, 191, 27, 72, 150, 249, 39, 230, 240, 58, 76, 61, 59, 127, 14, 172, 38, 117, 115, 231, 148, 243, 194, 3, 213, 191, 219, 84, 101, 30, 210, 88, 191, 188, 113, 92, 66, 253, 166, 28, 146, 23, 51, 85, 65, 217, 233, 190, 248, 126, 238, 242, 244, 113, 189, 105, 192, 143, 189, 236, 37, 222, 28, 212, 33, 101, 138, 157, 203, 134, 87, 129, 74, 122, 251, 3, 202, 170, 239, 162, 148, 182, 203, 183, 157, 130, 115, 213, 90, 4, 96, 25, 196, 143, 234, 135, 14, 0, 103, 8, 178, 46, 205, 167, 74, 183, 57, 201, 148, 226, 211, 177, 145, 85, 144, 34, 66, 144, 101, 192, 93, 86, 205, 82, 35, 231, 189, 37, 56, 59, 121, 40, 108, 211, 252, 202, 71, 209, 174, 29, 171, 63, 75, 226, 253, 6, 106, 207, 195, 184, 134, 148, 172, 59, 167, 223, 138, 168, 181, 51, 85, 107, 239, 40, 201, 2, 236, 162, 34, 243, 200, 227, 21, 180, 114, 11, 33, 191, 87, 55, 119, 41, 126, 220, 86, 243, 165, 101, 67, 208, 29, 191, 16, 138, 156, 196, 200, 178, 9, 39, 202, 174, 182, 241, 166, 116, 90, 30, 185, 68, 199, 239, 177, 201, 163, 61, 195, 82, 180, 170, 34, 101, 201, 79, 150, 243, 34, 99, 197, 177, 224, 181, 203, 222, 205, 86, 60, 138, 175, 0, 84, 209, 163, 39, 233, 91, 106, 117, 23, 59, 6, 126, 120, 206, 73, 106, 245, 115, 17, 5, 19, 225, 61, 149, 216, 108, 251, 192, 196, 6, 155, 69, 58, 162, 106, 211, 167, 116, 191, 222, 187, 101, 51, 250, 76, 247, 187, 195, 40, 120, 236, 32, 86, 221, 8, 65, 202, 233, 74, 242, 25, 197, 188, 240, 41, 148, 107, 49, 198, 214, 142, 122, 186, 28, 193, 27, 2, 115, 140, 146, 126, 45, 52, 216, 53, 167, 60, 225, 147, 67, 50, 115, 24, 193, 230, 170, 141, 49, 253, 13, 251, 92, 207, 24, 157, 212, 223, 21, 158, 171, 90, 173, 218, 152, 1, 4, 74, 128, 245, 51, 167, 73, 61, 253, 20, 120, 152, 240, 195, 200, 169, 207, 207, 199, 179, 74, 115, 32, 172, 199, 119, 59, 66, 53, 124, 115, 104, 159, 26, 161, 110, 77, 238, 114, 225, 75, 25, 152, 24, 80, 84, 223, 99, 224, 99, 190, 88, 73, 235, 76, 117, 179, 228, 193, 205, 227, 61, 202, 175, 239, 231, 221, 176, 198, 240, 214, 66, 131, 123, 161, 255, 16, 184, 163, 207, 149, 32, 65, 160, 120, 224, 255, 106, 36, 131, 192, 71, 15, 168, 214, 81, 48, 126, 178, 172, 35, 174, 78, 144, 7, 159, 13, 254, 74, 177, 112, 85, 14, 86, 82, 92, 14, 214, 148, 241, 177, 165, 0, 15, 51, 162, 181, 60, 117, 39, 242, 239, 82, 227, 236, 216, 139, 193, 55, 113, 19, 133, 63, 76, 83, 4, 237, 100, 118, 87, 150, 163, 127, 176, 226, 140, 181, 2, 249, 73, 81, 192, 4, 196, 165, 197, 196, 81, 214, 193, 144, 239, 115, 210, 135, 229, 193, 131, 224, 18, 157, 211, 54, 189, 124, 73, 166, 180, 210, 23, 228, 78, 169, 106, 217, 242, 68, 86, 50, 138, 249, 136, 123, 99, 129, 144, 18, 33, 67, 117, 168, 140, 231, 225, 179, 70, 4, 209, 82, 40, 231, 4, 232, 248, 137, 234, 15, 194, 115, 71, 101, 219, 154, 36, 119, 29, 150, 31, 28, 6, 33, 251, 86, 176, 240, 192, 141, 246, 134, 158, 194, 124, 33, 173, 241, 9, 102, 21, 236, 162, 98, 17, 119, 128, 86, 87, 148, 250, 148, 219, 51, 133, 29, 252, 50, 108, 1, 22, 80, 80, 60, 104, 238, 72, 11, 179, 15, 206, 48, 189, 24, 108, 101, 203, 17, 117, 32, 196, 147, 250, 234, 49, 147, 132, 250, 105, 149, 170, 104, 192, 184, 115, 46, 248, 209, 182, 38, 60, 144, 231, 158, 96, 229, 121, 234, 12, 209, 120, 186, 192, 245, 124, 237, 19, 113, 117, 110, 163, 30, 26, 63, 49, 98, 8, 253, 24, 82, 51, 117, 64, 45, 250, 6, 74, 199, 184, 39, 122, 187, 75, 119, 101, 5, 62, 243, 82, 61, 239, 20, 65, 88, 194, 141, 218, 217, 127, 176, 235, 26, 88, 175, 75, 154, 86, 82, 111, 226, 147, 149, 229, 182, 17, 32, 95, 6, 116, 75, 7, 87, 108, 154, 94, 194, 250, 97, 106, 50, 125, 249, 29, 243, 218, 74, 218, 36, 136, 231, 41, 43, 199, 226, 225, 83, 248, 39, 115, 187, 233, 231, 28, 68, 168, 221, 37, 197, 152, 95, 128, 61, 109, 87, 87, 28, 45, 245, 191, 132, 168, 143, 181, 227, 13, 35, 22, 40, 179, 55, 230, 103, 145, 87, 61, 50, 104, 245, 173, 34, 19, 57, 22, 215, 86, 144, 0, 194, 139, 14, 235, 236, 119, 79, 186, 44, 185, 152, 190, 154, 91, 31, 132, 45, 68, 187, 97, 253, 122, 113, 4, 144, 92, 102, 7, 172, 235, 28, 36, 159, 27, 139, 245, 165, 97, 44, 80, 233, 55, 72, 221, 162, 147, 198, 151, 201, 174, 60, 186, 119, 78, 95, 141, 66, 99, 35, 32, 20, 61, 67, 71, 69, 166, 237, 165, 45, 194, 143, 44, 242, 96, 14, 54, 204, 121, 108, 115, 132, 172, 151, 47, 6, 217, 127, 202, 228, 166, 154, 94, 174, 198, 5, 62, 145, 112, 149, 165, 188, 55, 47, 13, 62, 75, 234, 208, 167, 136, 37, 209, 203, 188, 85, 72, 228, 173, 50, 51, 212, 69, 194, 112, 112, 26, 135, 27, 82, 219, 210, 93, 168, 193, 1, 167, 153, 116, 207, 12, 101, 157, 98, 8, 211, 170, 92, 200, 152, 33, 129, 81, 167, 2, 189, 245, 210, 6, 159, 83, 29, 211, 128, 148, 221, 28, 103, 45, 133, 245, 212, 39, 204, 94, 16, 92, 116, 251, 163, 18, 159, 160, 49, 38, 95, 212, 191, 235, 215, 248, 88, 202, 45, 45, 93, 244, 187, 79, 134, 75, 104, 83, 189, 31, 172, 21, 64, 217, 93, 123, 45, 161, 68, 50, 194, 147, 23, 19, 1, 37, 169, 199, 207, 140, 31, 184, 104, 81, 143, 200, 198, 14, 205, 209, 252, 228, 253, 247, 242, 132, 29, 43, 149, 212, 68, 29, 154, 221, 71, 150, 77, 169, 83, 200, 251, 152, 46, 214, 206, 245, 199, 53, 166, 12, 112, 216, 52, 135, 33, 2, 188, 75, 63, 110, 140, 42, 155, 136, 164, 175, 113, 54, 151, 16, 80, 8, 140, 220, 48, 252, 143, 70, 151, 255, 150, 253, 105, 192, 249, 80, 92, 142, 21, 76, 55, 223, 85, 224, 171, 61, 14, 81, 66, 24, 141, 70, 171, 223, 250, 200, 140, 132, 239, 151, 235, 4, 118, 218, 235, 51, 210, 0, 61, 54, 136, 131, 52, 98, 157, 243, 68, 99, 139, 159, 61, 208, 155, 124, 90, 189, 236, 37, 222, 28, 212, 33, 101, 138, 157, 203, 134, 87, 129, 74, 122, 251, 3, 202, 170, 239, 162, 148, 182, 203, 183, 157, 130, 115, 213, 90, 4, 96, 25, 196, 143, 234, 135, 14, 0, 103, 8, 178, 46, 205, 167, 74, 183, 57, 201, 148, 226, 211, 177, 145, 85, 144, 34, 66, 144, 101, 192, 93, 86, 205, 82, 35, 231, 189, 37, 56, 59, 121, 40, 108, 211, 252, 202, 71, 209, 174, 29, 171, 63, 75, 226, 253, 6, 106, 207, 195, 184, 134, 148, 172, 59, 167, 223, 138, 168, 181, 51, 85, 107, 239, 40, 201, 2, 236, 162, 34, 243, 200, 227, 21, 180, 114, 11, 33, 191, 87, 55, 119, 41, 126, 220, 86, 243, 171, 6, 126, 106, 15, 240, 10, 62, 186, 1, 93, 195, 223, 205, 122, 188, 96, 141, 116, 119, 239, 8, 101, 111, 226, 65, 153, 103, 109, 240, 238, 201, 133, 154, 97, 7, 164, 128, 8, 239, 201, 39, 153, 121, 233, 62, 104, 57, 194, 223, 107, 234, 83, 63, 117, 127, 15, 171, 177, 140, 226, 182, 166, 233, 207, 204, 175, 222, 11, 7, 78, 222, 243, 139, 61, 73, 157, 159, 146, 86, 223, 99, 13, 51, 57, 95, 141, 178, 3, 125, 3, 177, 21, 158, 43, 16, 64, 3, 35, 54, 6, 88, 72, 81, 133, 184, 179, 125, 243, 26, 144, 145, 51, 119, 72, 121, 218, 50, 190, 106, 233, 75, 190, 137, 222, 240, 124, 228, 52, 0, 69, 73, 216, 67, 65, 204, 4, 167, 173, 64, 105, 5, 164, 30, 17, 59, 1, 65, 159, 250, 254, 99, 159, 75, 170, 11, 40, 181, 130, 112, 214, 190, 10, 140, 254, 137, 249, 211, 65, 109, 159, 135, 11, 182, 194, 192, 112, 83, 73, 19, 73, 184, 58, 192, 204, 129, 60, 250, 180, 116, 136, 60, 214, 240, 155, 212, 2, 38, 34, 4, 89, 116, 98, 128, 174, 158, 113, 229, 236, 55, 95, 168, 88, 173, 231, 151, 32, 39, 127, 88, 222, 77, 27, 211, 1, 214, 34, 55, 204, 205, 186, 252, 201, 160, 99, 52, 38, 173, 187, 57, 126, 151, 1, 18, 5, 127, 67, 254, 222, 143, 200, 1, 241, 176, 10, 223, 156, 96, 61, 230, 53, 42, 22, 105, 153, 97, 225, 204, 98, 5, 67, 32, 247, 191, 186, 100, 32, 110, 216, 180, 108, 225, 54, 219, 68, 174, 71, 168, 205, 118, 38, 248, 144, 7, 160, 125, 112, 19, 125, 178, 165, 150, 239, 71, 163, 236, 204, 201, 40, 124, 125, 196, 17, 109, 238, 45, 177, 46, 107, 98, 48, 28, 191, 65, 86, 13, 133, 7, 60, 139, 16, 8, 235, 38, 185, 253, 187, 183, 207, 11, 233, 134, 246, 230, 241, 121, 110, 253, 126, 89, 29, 126, 177, 62, 51, 39, 95, 119, 123, 255, 188, 37, 244, 140, 187, 210, 55, 198, 175, 198, 218, 0, 8, 84, 103, 128, 73, 198, 0, 4, 235, 15, 193, 194, 239, 6, 56, 197, 251, 119, 135, 113, 166, 133, 243, 237, 192, 104, 180, 171, 13, 116, 144, 40, 192, 49, 119, 150, 69, 149, 23, 54, 234, 118, 49, 169, 242, 232, 80, 103, 30, 169, 52, 98, 49, 140, 255, 186, 65, 192, 224, 90, 86, 248, 173, 27, 183, 162, 183, 208, 145, 104, 210, 220, 136, 26, 227, 167, 161, 69, 73, 218, 119, 46, 126, 10, 224, 207, 60, 107, 47, 128, 194, 66, 127, 18, 104, 161, 209, 64, 0, 18, 45, 212, 82, 204, 204, 50, 98, 224, 32, 169, 240, 5, 180, 202, 189, 22, 201, 86, 250, 239, 212, 197, 56, 6, 45, 5, 24, 188, 98, 15, 75, 224, 227, 173, 61, 233, 116, 148, 98, 51, 165, 138, 170, 62, 94, 228, 187, 142, 57, 214, 181, 10, 6, 178, 122, 138, 242, 181, 54, 229, 80, 48, 48, 167, 54, 25, 245, 79, 63, 64, 72, 191, 44, 146, 70, 79, 109, 90, 32, 91, 141, 67, 251, 66, 37, 21, 155, 42, 3, 97, 61, 40, 106, 169, 225, 180, 5, 158, 116, 32, 148, 214, 27, 227, 40, 215, 227, 104, 91, 181, 203, 86, 76, 91, 0, 222, 98, 74, 178, 24, 1, 163, 217, 120, 207, 112, 153, 10, 231, 149, 147, 15, 90, 238, 106, 196, 130, 148, 98, 26, 208, 71, 47, 144, 72, 19, 23, 208, 43, 75, 38, 161, 225, 203, 133, 147, 249, 225, 233, 245, 225, 37, 222, 77, 227, 65, 12, 60, 155, 177, 76, 243, 93, 35, 168, 70, 180, 23, 148, 195, 239, 135, 63, 179, 193, 153, 73, 99, 230, 83, 220, 232, 190, 113, 86, 24, 130, 182, 79, 80, 250, 67, 144, 140, 128, 228, 110, 174, 255, 4, 37, 242, 168, 11, 2, 0, 184, 10, 140, 16, 71, 5, 82, 10, 253, 85, 168, 36, 76, 89, 222, 22, 115, 173, 206, 44, 252, 127, 242, 131, 111, 129, 79, 185, 20, 102, 38, 193, 74, 120, 182, 211, 9, 108, 225, 0, 250, 103, 67, 231, 218, 20, 11, 250, 33, 77, 157, 222, 239, 116, 253, 58, 232, 191, 196, 232, 100, 206, 56, 202, 68, 121, 33, 186, 22, 255, 114, 243, 66, 197, 25, 122, 223, 62, 11, 101, 92, 75, 36, 20, 165, 177, 66, 171, 215, 102, 109, 180, 38, 140, 26, 174, 159, 227, 113, 202, 106, 221, 58, 229, 111, 8, 248, 144, 140, 178, 225, 43, 151, 226, 211, 211, 49, 123, 98, 50, 50, 121, 68, 91, 154, 31, 106, 95, 52, 200, 208, 147, 73, 167, 95, 254, 81, 178, 41, 66, 7, 116, 143, 156, 147, 193, 60, 83, 116, 21, 105, 68, 133, 25, 39, 211, 80, 39, 0, 237, 159, 165, 230, 232, 7, 198, 140, 184, 38, 12, 210, 38, 149, 8, 36, 154, 108, 28, 100, 25, 144, 85, 86, 197, 68, 54, 175, 49, 167, 183, 4, 111, 174, 169, 125, 79, 201, 234, 129, 250, 49, 95, 233, 170, 26, 88, 76, 245, 178, 253, 34, 160, 61, 140, 30, 87, 105, 114, 35, 165, 10, 178, 35, 192, 237, 220, 249, 59, 18, 237, 162, 206, 250, 211, 218, 47, 74, 159, 162, 33, 208, 234, 96, 63, 104, 121, 36, 187, 162, 155, 7, 247, 173, 223, 10, 144, 21, 191, 60, 129, 109, 191, 65, 116, 54, 228, 29, 237, 174, 65, 145, 21, 240, 44, 63, 236, 88, 184, 28, 67, 55, 123, 9, 152, 72, 108, 108, 237, 194, 6, 42, 88, 221, 80, 109, 224, 123, 209, 53, 159, 7, 0, 49, 66, 54, 99, 36, 105, 97, 3, 7, 73, 159, 72, 142, 146, 141, 164, 150, 134, 74, 89, 192, 208, 96, 8, 3, 127, 118, 154, 48, 34, 209, 255, 145, 208, 178, 246, 209, 134, 55, 193, 124, 32, 34, 151, 212, 120, 155, 94, 137, 142, 201, 99, 196, 42, 162, 94, 109, 129, 3, 69, 73, 0, 91, 252, 83, 61, 226, 164, 137, 162, 17, 2, 83, 154, 202, 241, 189, 236, 182, 84, 162, 184, 79, 179, 52, 233, 176, 53, 151, 228, 80, 153, 220, 158, 133, 134, 160, 220, 171, 149, 170, 164, 64, 181, 27, 19, 249, 32, 77, 110, 194, 11, 18, 110, 79, 57, 198, 172, 56, 54, 217, 86, 88, 122, 150, 76, 94, 117, 149, 234, 147, 237, 22, 191, 87, 107, 204, 108, 95, 178, 38, 3, 158, 84, 85, 245, 208, 78, 59, 4, 1, 159, 0, 172, 90, 118, 165, 24, 228, 176, 56, 254, 90, 34, 4, 134, 245, 119, 34, 35, 210, 56, 140, 137, 216, 234, 218, 78, 202, 207, 205, 46, 116, 90, 200, 190, 160, 123, 213, 246, 177, 232, 114, 52, 141, 44, 223, 183, 194, 145, 57, 155, 69, 96, 68, 41, 176, 128, 233, 84, 209, 146, 5, 119, 144, 46, 204, 49, 231, 47, 249, 202, 62, 255, 213, 195, 148, 42, 216, 124, 122, 89, 131, 78, 158, 213, 218, 29, 32, 122, 56, 80, 233, 104, 42, 55, 189, 107, 194, 238, 245, 219, 88, 183, 209, 49, 211, 215, 169, 193, 248, 3, 217, 53, 165, 201, 20, 8, 208, 254, 23, 152, 88, 94, 8, 60, 214, 18, 234, 252, 251, 0, 95, 130, 207, 248, 26, 224, 84, 177, 80, 194, 83, 132, 147, 21, 166, 77, 40, 42, 220, 172, 151, 164, 190, 173, 177, 139, 255, 12, 10, 19, 62, 94, 92, 174, 4, 36, 9, 173, 249, 58, 100, 243, 221, 42, 221, 88, 19, 23, 252, 179, 226, 75, 43, 25, 8, 250, 174, 14, 39, 230, 247, 87, 97, 215, 51, 228, 46, 222, 103, 151, 200, 137, 73, 223, 202, 205, 127, 72, 132, 3, 195, 156, 97, 166, 22, 194, 236, 46, 57, 47, 49, 249, 90, 153, 15, 47, 198, 219, 110, 8, 203, 43, 140, 232, 191, 49, 44, 103, 30, 39, 168, 70, 136, 180, 23, 245, 82, 207, 240, 107, 65, 66, 74, 96, 178, 136, 191, 161, 92, 42, 225, 100, 210, 52, 229, 252, 189, 69, 110, 255, 244, 15, 21, 209, 140, 80, 203, 140, 85, 205, 8, 135, 86, 176, 166, 216, 91, 189, 196, 79, 80, 246, 106, 41, 248, 185, 195, 46, 179, 168, 109, 71, 121, 153, 143, 111, 63, 22, 69, 52, 37, 2, 155, 145, 104, 85, 43, 47, 69, 60, 65, 22, 19, 198, 104, 215, 56, 12, 184, 98, 37, 32, 199, 106, 71, 115, 176, 75, 122, 248, 39, 177, 189, 244, 72, 96, 135, 214, 77, 209, 140, 68, 180, 102, 233, 127, 212, 59, 4, 181, 231, 62, 225, 240, 62, 18, 179, 44, 59, 135, 47, 197, 182, 6, 100, 162, 56, 159, 43, 35, 209, 35, 197, 203, 143, 58, 139, 166, 13, 80, 9, 242, 49, 45, 99, 115, 238, 190, 236, 47, 250, 96, 28, 6, 119, 197, 178, 112, 171, 50, 41, 143, 171, 212, 168, 8, 51, 212, 90, 171, 75, 47, 156, 103, 80, 28, 172, 228, 49, 227, 215, 213, 62, 111, 153, 20, 112, 179, 11, 16, 60, 207, 161, 86, 116, 116, 250, 81, 74, 232, 151, 34, 165, 85, 139, 202, 161, 208, 179, 141, 201, 224, 108, 168, 30, 54, 32, 34, 4, 243, 35, 18, 47, 174, 240, 115, 229, 17, 185, 144, 180, 30, 239, 68, 235, 182, 77, 76, 207, 102, 165, 1, 200, 145, 125, 139, 253, 239, 40, 83, 255, 171, 78, 120, 109, 92, 120, 76, 120, 205, 116, 211, 161, 17, 76, 109, 126, 28, 241, 63, 183, 39, 177, 224, 192, 198, 137, 110, 225, 202, 64, 6, 239, 237, 121, 13, 35, 19, 205, 39, 43, 230, 203, 77, 184, 99, 145, 240, 37, 114, 134, 117, 17, 54, 9, 95, 193, 88, 65, 126, 39, 146, 126, 62, 114, 55, 187, 222, 121, 145, 149, 211, 121, 6, 17, 107, 175, 89, 122, 34, 44, 116, 218, 126, 187, 71, 191, 16, 228, 98, 23, 87, 77, 81, 13, 14, 38, 157, 141, 169, 233, 29, 98, 152, 8, 234, 96, 91, 77, 120, 220, 211, 46, 121, 180, 111, 168, 40, 242, 38, 236, 168, 111, 10, 85, 94, 133, 45, 74, 250, 28, 253, 107, 199, 6, 218, 55, 207, 103, 119, 97, 160, 250, 176, 135, 252, 21, 176, 224, 188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 89, 53, 19, 83, 80, 184, 110, 48, 13, 148, 38, 57, 0, 0, 0, 0, 89, 53, 19, 83, 80, 184, 110, 48, 13, 148, 38, 57, 0, 0, 0, 0, 89, 53, 19, 83, 53, 157, 46, 228, 44, 100, 6, 157, 0, 0, 0, 0, 89, 53, 19, 83, 49, 100, 95, 92, 3, 214, 107, 168, 0, 0, 0, 0, 89, 53, 19, 83, 105, 200, 47, 192, 42, 36, 168, 23, 0, 0, 0, 0, 89, 53, 19, 83, 103, 248, 160, 44, 8, 171, 233, 143, 0, 0, 0, 0, 89, 53, 19, 83, 43, 27, 189, 16, 28, 10, 94, 76, 0, 0, 0, 0, 89, 53, 19, 68, 242, 185, 50, 196, 1, 216, 57, 65, 0, 0, 0, 0, 89, 53, 19, 139, 37, 34, 243, 88, 5, 112, 102, 11, 0, 0, 0, 0, 89, 53, 19, 83, 123, 8, 171, 64, 33, 188, 59, 16, 0, 0, 0, 0, 89, 53, 19, 163, 245, 104, 124, 68, 9, 98, 25, 235, 0, 0, 0, 0, 89, 53, 19, 139, 65, 107, 226, 4, 8, 144, 155, 158, 0, 0, 0, 0, 89, 53, 19, 234, 192, 216, 187, 232, 5, 154, 84, 215, 0, 0, 0, 0, 89, 53, 19, 191, 0, 65, 23, 88, 9, 157, 187, 194, 0, 0, 0, 0, 89, 53, 19, 68, 167, 194, 165, 224, 10, 219, 222, 27, 0, 0, 0, 0, 89, 53, 18, 125, 157, 130, 214, 120, 4, 43, 225, 191, 0, 0, 0, 0, 89, 53, 21, 136, 206, 70, 37, 64, 17, 207, 214, 132, 0, 0, 0, 0, 89, 53, 19, 234, 199, 35, 129, 64, 7, 207, 4, 156, 0, 0, 0, 0, 89, 53, 18, 125, 97, 236, 218, 12, 5, 48, 197, 88, 0, 0, 0, 0, 89, 53, 15, 12, 8, 154, 2, 16, 3, 86, 85, 126, 0, 0, 0, 0, 89, 53, 21, 208, 43, 160, 216, 240, 2, 140, 168, 206, 0, 0, 0, 0, 89, 53, 21, 136, 214, 251, 86, 200, 5, 246, 36, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196, 143, 72, 43, 189, 196, 235, 72, 200, 143, 170, 119, 170, 14, 207, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 177, 44, 72, 181, 35, 106, 117, 91, 162, 103, 79, 11, 78, 19, 252, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 184, 42, 92, 84, 222, 230, 10, 98, 4, 230, 99, 133, 197, 27, 254, 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 162, 126, 6, 242, 61, 40, 168, 218, 169, 143, 71, 23, 196, 156, 153, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 205, 239, 124, 102, 148, 144, 125, 146, 206, 3, 105, 225, 248, 47, 202, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95, 181, 12, 13, 236, 84, 197, 170, 108, 219, 112, 173, 238, 156, 144, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 81, 73, 188, 4, 159, 115, 0, 157, 56, 153, 159, 78, 129, 71, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 209, 66, 138, 207, 127, 187, 145, 247, 131, 145, 228, 118, 103, 112, 67, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 243, 190, 107, 187, 182, 254, 134, 98, 69, 119, 21, 167, 187, 240, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 193, 218, 206, 184, 36, 238, 107, 27, 165, 73, 170, 187, 47, 157, 136, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 180, 158, 110, 146, 49, 211, 192, 184, 117, 18, 88, 103, 37, 136, 172, 79, 27, 160, 123, 142, 7, 160, 51, 68, 215, 216, 144, 248, 89, 147, 47, 63, 12, 16, 98, 29, 203, 214, 232, 245, 170, 92, 58, 10, 193, 138, 40, 201, 159, 227, 160, 120, 50, 119, 93, 239, 86, 22, 245, 98, 16, 169, 180, 14, 136, 163, 121, 187, 213, 145, 33, 8, 153, 67, 177, 91, 117, 75, 65, 71, 46, 130, 81, 192];
-		let block_rlp = UntrustedRlp::new(&block);
-		let compressed = block_rlp.compress(RlpType::Blocks).into_vec();
-		let compressed_rlp = UntrustedRlp::new(&compressed);
-		assert_eq!(compressed_rlp.decompress(RlpType::Blocks).into_vec(), block);
-	}
-}
diff --git a/util/rlp/src/impls.rs b/util/rlp/src/impls.rs
index bc3caa495630dd5071637c902cd394508b53c8dc..7cb6572fec9123deb6d9c4ae1de4afdad7dd308b 100644
--- a/util/rlp/src/impls.rs
+++ b/util/rlp/src/impls.rs
@@ -8,7 +8,7 @@
 
 use std::{cmp, mem, str};
 use byteorder::{ByteOrder, BigEndian};
-use bigint::prelude::{U128, U256, H64, H128, H160, H256, H512, H520, H2048};
+use bigint::{U128, U256, H64, H128, H160, H256, H512, H520, Bloom};
 use traits::{Encodable, Decodable};
 use stream::RlpStream;
 use {UntrustedRlp, DecoderError};
@@ -213,7 +213,7 @@ impl_encodable_for_hash!(H160);
 impl_encodable_for_hash!(H256);
 impl_encodable_for_hash!(H512);
 impl_encodable_for_hash!(H520);
-impl_encodable_for_hash!(H2048);
+impl_encodable_for_hash!(Bloom);
 
 impl_decodable_for_hash!(H64, 8);
 impl_decodable_for_hash!(H128, 16);
@@ -221,7 +221,7 @@ impl_decodable_for_hash!(H160, 20);
 impl_decodable_for_hash!(H256, 32);
 impl_decodable_for_hash!(H512, 64);
 impl_decodable_for_hash!(H520, 65);
-impl_decodable_for_hash!(H2048, 256);
+impl_decodable_for_hash!(Bloom, 256);
 
 macro_rules! impl_encodable_for_uint {
 	($name: ident, $size: expr) => {
diff --git a/util/rlp/src/lib.rs b/util/rlp/src/lib.rs
index f7596b2bce2d8082064125f454f0f241af192e2a..a5889a4efc22efb84cd178e7f18c7eacc4c370b7 100644
--- a/util/rlp/src/lib.rs
+++ b/util/rlp/src/lib.rs
@@ -39,31 +39,25 @@
 //! * You don't want to decode whole rlp at once.
 
 extern crate byteorder;
-extern crate ethcore_bigint as bigint;
+extern crate ethereum_types as bigint;
 extern crate elastic_array;
 extern crate rustc_hex;
 
-#[macro_use]
-extern crate lazy_static;
-
 mod traits;
 mod error;
 mod rlpin;
 mod untrusted_rlp;
 mod stream;
-mod compression;
-mod common;
 mod impls;
 
 use std::borrow::Borrow;
 use elastic_array::ElasticArray1024;
 
 pub use error::DecoderError;
-pub use traits::{Decodable, Encodable, Compressible};
+pub use traits::{Decodable, Encodable};
 pub use untrusted_rlp::{UntrustedRlp, UntrustedRlpIterator, PayloadInfo, Prototype};
 pub use rlpin::{Rlp, RlpIterator};
 pub use stream::RlpStream;
-pub use compression::RlpType;
 
 /// The RLP encoded empty data (used to mean "null value").
 pub const NULL_RLP: [u8; 1] = [0x80; 1];
diff --git a/util/rlp/src/rlpin.rs b/util/rlp/src/rlpin.rs
index f4f3d3d58e18fd330722870716e5424165535ca3..c9679591308aeeabc228e6f5dea307549df9a581 100644
--- a/util/rlp/src/rlpin.rs
+++ b/util/rlp/src/rlpin.rs
@@ -274,7 +274,7 @@ impl<'a, 'view> Iterator for RlpIterator<'a, 'view> {
 #[test]
 fn break_it() {
 	use rustc_hex::FromHex;
-	use bigint::prelude::U256;
+	use bigint::U256;
 
 	let h: Vec<u8> = FromHex::from_hex("f84d0589010efbef67941f79b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470").unwrap();
 	let r: Rlp = Rlp::new(&h);
diff --git a/util/rlp/src/traits.rs b/util/rlp/src/traits.rs
index e2bb2ab9173b1c015883046c2b4fb0149fe201b4..193d0bf84adfb6727770494a9631a19729e5df8f 100644
--- a/util/rlp/src/traits.rs
+++ b/util/rlp/src/traits.rs
@@ -28,14 +28,3 @@ pub trait Encodable {
 		s.drain()
 	}
 }
-
-/// Trait for compressing and decompressing RLP by replacement of common terms.
-pub trait Compressible: Sized {
-	/// Indicates the origin of RLP to be compressed.
-	type DataType;
-
-	/// Compress given RLP type using appropriate methods.
-	fn compress(&self, t: Self::DataType) -> ElasticArray1024<u8>;
-	/// Decompress given RLP type using appropriate methods.
-	fn decompress(&self, t: Self::DataType) -> ElasticArray1024<u8>;
-}
diff --git a/util/rlp/src/untrusted_rlp.rs b/util/rlp/src/untrusted_rlp.rs
index 41149606caf9972ef44072345d91bc406c700df0..7f95ce2efedaa80e00f75851ebf762a8c2c48443 100644
--- a/util/rlp/src/untrusted_rlp.rs
+++ b/util/rlp/src/untrusted_rlp.rs
@@ -276,7 +276,7 @@ impl<'a, 'view> UntrustedRlp<'a> where 'a: 'view {
 		let mut result = bytes;
 		for _ in 0..items {
 			let i = BasicDecoder::payload_info(result)?;
-			result = UntrustedRlp::consume(result, (i.header_len + i.value_len))?;
+			result = UntrustedRlp::consume(result, i.header_len + i.value_len)?;
 		}
 		Ok(result)
 	}
diff --git a/util/rlp/tests/tests.rs b/util/rlp/tests/tests.rs
index 81035d57029e6747d2f91d9dd5c596b1d3885eb4..03151c5bf78eb0928b29ed621a694d79a5983b95 100644
--- a/util/rlp/tests/tests.rs
+++ b/util/rlp/tests/tests.rs
@@ -6,11 +6,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate ethcore_bigint as bigint;
+extern crate ethereum_types as bigint;
 extern crate rlp;
 
 use std::{fmt, cmp};
-use bigint::prelude::U256;
+use bigint::{U256, H160};
 use rlp::{Encodable, Decodable, UntrustedRlp, RlpStream, DecoderError};
 
 #[test]
@@ -164,8 +164,6 @@ fn encode_str() {
 
 #[test]
 fn encode_address() {
-	use bigint::hash::H160;
-
 	let tests = vec![
 		ETestPair(H160::from("ef2d6d194084c2de36e0dabfce45d046b37d1106"),
 				  vec![0x94, 0xef, 0x2d, 0x6d, 0x19, 0x40, 0x84, 0xc2, 0xde,
@@ -308,8 +306,6 @@ fn decode_untrusted_str() {
 
 #[test]
 fn decode_untrusted_address() {
-	use bigint::hash::H160;
-
 	let tests = vec![
 		DTestPair(H160::from("ef2d6d194084c2de36e0dabfce45d046b37d1106"),
 				  vec![0x94, 0xef, 0x2d, 0x6d, 0x19, 0x40, 0x84, 0xc2, 0xde,
diff --git a/util/rlp_compress/Cargo.toml b/util/rlp_compress/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..d5f85425f2376a025922ec43f0191e0bcd62e43c
--- /dev/null
+++ b/util/rlp_compress/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "rlp_compress"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+rlp = { path = "../rlp" }
+elastic-array = "0.10"
+lazy_static = "1.0"
diff --git a/util/rlp/src/common.rs b/util/rlp_compress/src/common.rs
similarity index 92%
rename from util/rlp/src/common.rs
rename to util/rlp_compress/src/common.rs
index 07c75cf9809c238107763dfa2ad32b01c50b84a1..79f8a93c1f8b686a161eb62b6c545d17e9b89ae5 100644
--- a/util/rlp/src/common.rs
+++ b/util/rlp_compress/src/common.rs
@@ -8,29 +8,29 @@
 
 //! Contains RLPs used for compression.
 
-use compression::InvalidRlpSwapper;
+use Swapper;
 
 lazy_static! {
 	/// Swapper for snapshot compression.
-	pub static ref SNAPSHOT_RLP_SWAPPER: InvalidRlpSwapper<'static> = InvalidRlpSwapper::new(EMPTY_RLPS, INVALID_RLPS);
+	pub static ref SNAPSHOT_SWAPPER: Swapper<'static> = Swapper::new(EMPTY_RLPS, INVALID_RLPS);
 }
 
 lazy_static! {
 	/// Swapper with common long RLPs, up to 127 can be added.
-	pub static ref BLOCKS_RLP_SWAPPER: InvalidRlpSwapper<'static> = InvalidRlpSwapper::new(COMMON_RLPS, INVALID_RLPS);
+	pub static ref BLOCKS_SWAPPER: Swapper<'static> = Swapper::new(COMMON_RLPS, INVALID_RLPS);
 }
 
 static EMPTY_RLPS: &'static [&'static [u8]] = &[
-	// RLP of SHA3_NULL_RLP
+	// RLP of KECCAK_NULL_RLP
 	&[160, 86, 232, 31, 23, 27, 204, 85, 166, 255, 131, 69, 230, 146, 192, 248, 110, 91, 72, 224, 27, 153, 108, 173, 192, 1, 98, 47, 181, 227, 99, 180, 33],
-	// RLP of SHA3_EMPTY
+	// RLP of KECCAK_EMPTY
 	&[160, 197, 210, 70, 1, 134, 247, 35, 60, 146, 126, 125, 178, 220, 199, 3, 192, 229, 0, 182, 83, 202, 130, 39, 59, 123, 250, 216, 4, 93, 133, 164, 112]
 ];
 
 static COMMON_RLPS: &'static [&'static [u8]] = &[
-	// RLP of SHA3_NULL_RLP
+	// RLP of KECCAK_NULL_RLP
 	&[160, 86, 232, 31, 23, 27, 204, 85, 166, 255, 131, 69, 230, 146, 192, 248, 110, 91, 72, 224, 27, 153, 108, 173, 192, 1, 98, 47, 181, 227, 99, 180, 33],
-	// RLP of SHA3_EMPTY
+	// RLP of KECCAK_EMPTY
 	&[160, 197, 210, 70, 1, 134, 247, 35, 60, 146, 126, 125, 178, 220, 199, 3, 192, 229, 0, 182, 83, 202, 130, 39, 59, 123, 250, 216, 4, 93, 133, 164, 112],
 	// Other RLPs found in blocks DB using the test below.
 	&[160, 29, 204, 77, 232, 222, 199, 93, 122, 171, 133, 181, 103, 182, 204, 212, 26, 211, 18, 69, 27, 148, 138, 116, 19, 240, 161, 66, 253, 64, 212, 147, 71],
diff --git a/util/rlp_compress/src/lib.rs b/util/rlp_compress/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..89c5e83283416c1e186ffd575e4bb440db8c7784
--- /dev/null
+++ b/util/rlp_compress/src/lib.rs
@@ -0,0 +1,110 @@
+// Copyright 2015-2018 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+extern crate elastic_array;
+#[macro_use]
+extern crate lazy_static;
+extern crate rlp;
+
+mod common;
+
+use std::cmp;
+use std::collections::HashMap;
+use elastic_array::ElasticArray1024;
+use rlp::{UntrustedRlp, RlpStream};
+use common::{SNAPSHOT_SWAPPER, BLOCKS_SWAPPER};
+
+pub fn snapshot_swapper() -> &'static Swapper<'static> {
+	&SNAPSHOT_SWAPPER as &Swapper
+}
+
+pub fn blocks_swapper() -> &'static Swapper<'static> {
+	&BLOCKS_SWAPPER as &Swapper
+}
+
+/// A trait used to compress rlp.
+pub trait Compressor {
+	/// Get compressed version of given rlp.
+	fn compressed(&self, rlp: &[u8]) -> Option<&[u8]>;
+}
+
+/// A trait used to convert compressed rlp into it's original version.
+pub trait Decompressor {
+	/// Get decompressed rlp.
+	fn decompressed(&self, compressed: &[u8]) -> Option<&[u8]>;
+}
+
+/// Call this function to compress rlp.
+pub fn compress(c: &[u8], swapper: &Compressor) -> ElasticArray1024<u8> {
+	let rlp = UntrustedRlp::new(c);
+	if rlp.is_data() {
+		ElasticArray1024::from_slice(swapper.compressed(rlp.as_raw()).unwrap_or_else(|| rlp.as_raw()))
+	} else {
+		map_rlp(&rlp, |r| compress(r.as_raw(), swapper))
+	}
+}
+
+/// Call this function to decompress rlp.
+pub fn decompress(c: &[u8], swapper: &Decompressor) -> ElasticArray1024<u8> {
+	let rlp = UntrustedRlp::new(c);
+	if rlp.is_data() {
+		ElasticArray1024::from_slice(swapper.decompressed(rlp.as_raw()).unwrap_or_else(|| rlp.as_raw()))
+	} else {
+		map_rlp(&rlp, |r| decompress(r.as_raw(), swapper))
+	}
+}
+
+fn map_rlp<F: Fn(&UntrustedRlp) -> ElasticArray1024<u8>>(rlp: &UntrustedRlp, f: F) -> ElasticArray1024<u8> {
+	let mut stream = RlpStream::new_list(rlp.item_count().unwrap_or_default());
+	for subrlp in rlp.iter() {
+		stream.append_raw(&f(&subrlp), 1);
+	}
+	stream.drain()
+}
+
+/// Stores RLPs used for compression
+pub struct Swapper<'a> {
+	compressed_to_rlp: HashMap<&'a [u8], &'a [u8]>,
+	rlp_to_compressed: HashMap<&'a [u8], &'a [u8]>,
+}
+
+impl<'a> Swapper<'a> {
+	/// Construct a swapper from a list of common RLPs
+	pub fn new(rlps_to_swap: &[&'a [u8]], compressed: &[&'a [u8]]) -> Self {
+		if rlps_to_swap.len() > 0x7e {
+			panic!("Invalid usage, only 127 RLPs can be swappable.");
+		}
+
+		let items = cmp::min(rlps_to_swap.len(), compressed.len());
+		let mut compressed_to_rlp = HashMap::with_capacity(items);
+		let mut rlp_to_compressed = HashMap::with_capacity(items);
+
+		for (&rlp, &compressed) in rlps_to_swap.iter().zip(compressed.iter()) {
+			compressed_to_rlp.insert(compressed, rlp);
+			rlp_to_compressed.insert(rlp, compressed);
+		}
+
+		Swapper {
+			compressed_to_rlp,
+			rlp_to_compressed,
+		}
+	}
+}
+
+impl<'a> Decompressor for Swapper<'a> {
+	fn decompressed(&self, compressed: &[u8]) -> Option<&[u8]> {
+		self.compressed_to_rlp.get(compressed).cloned()
+	}
+}
+
+impl<'a> Compressor for Swapper<'a> {
+	fn compressed(&self, rlp: &[u8]) -> Option<&[u8]> {
+		self.rlp_to_compressed.get(rlp).cloned()
+	}
+}
+
diff --git a/util/rlp_compress/tests/compress.rs b/util/rlp_compress/tests/compress.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a01dbde358c1e0d5066bce11cc70f5d7f32a96f6
--- /dev/null
+++ b/util/rlp_compress/tests/compress.rs
@@ -0,0 +1,50 @@
+extern crate rlp_compress;
+
+use rlp_compress::{compress, decompress, Swapper, snapshot_swapper, blocks_swapper, Compressor, Decompressor};
+
+#[test]
+fn invalid_rlp_swapper() {
+	let to_swap: &[&[u8]] = &[&[0x83, b'c', b'a', b't'], &[0x83, b'd', b'o', b'g']];
+	let invalid_rlp: &[&[u8]] = &[&[0x81, 0x00], &[0x81, 0x01]];
+	let swapper = Swapper::new(to_swap, invalid_rlp);
+	assert_eq!(Some(invalid_rlp[0]), swapper.compressed(&[0x83, b'c', b'a', b't']));
+	assert_eq!(None, swapper.compressed(&[0x83, b'b', b'a', b't']));
+	assert_eq!(Some(to_swap[1]), swapper.decompressed(invalid_rlp[1]));
+}
+
+#[test]
+fn simple_compression() {
+	let basic_account_rlp = vec![248, 68, 4, 2, 160, 86, 232, 31, 23, 27, 204, 85, 166, 255, 131, 69, 230, 146, 192, 248, 110, 91, 72, 224, 27, 153, 108, 173, 192, 1, 98, 47, 181, 227, 99, 180, 33, 160, 197, 210, 70, 1, 134, 247, 35, 60, 146, 126, 125, 178, 220, 199, 3, 192, 229, 0, 182, 83, 202, 130, 39, 59, 123, 250, 216, 4, 93, 133, 164, 112];
+	let compressed = compress(&basic_account_rlp, snapshot_swapper());
+	assert_eq!(compressed.to_vec(), vec![198, 4, 2, 129, 0, 129, 1]);
+	let decompressed = decompress(&compressed, snapshot_swapper());
+	assert_eq!(decompressed.to_vec(), basic_account_rlp);
+}
+
+#[test]
+fn nested_list_rlp() {
+	let nested_basic_account_rlp = vec![228, 4, 226, 2, 160, 86, 232, 31, 23, 27, 204, 85, 166, 255, 131, 69, 230, 146, 192, 248, 110, 91, 72, 224, 27, 153, 108, 173, 192, 1, 98, 47, 181, 227, 99, 180, 33];
+
+	let compressed = compress(&nested_basic_account_rlp, blocks_swapper());
+	assert_eq!(compressed, vec![197, 4, 195, 2, 129, 0]);
+	let decompressed = decompress(&compressed, blocks_swapper());
+	assert_eq!(decompressed.into_vec(), nested_basic_account_rlp);
+	let compressed = compress(&nested_basic_account_rlp, snapshot_swapper());
+	assert_eq!(compressed, vec![197, 4, 195, 2, 129, 0]);
+	let decompressed = decompress(&compressed, snapshot_swapper());
+	assert_eq!(decompressed.into_vec(), nested_basic_account_rlp);
+}
+
+#[test]
+fn malformed_rlp() {
+	let malformed = vec![248, 81, 128, 128, 128, 128, 128, 160, 12, 51, 241, 93, 69, 218, 74, 138, 79, 115, 227, 44, 216, 81, 46, 132, 85, 235, 96, 45, 252, 48, 181, 29, 75, 141, 217, 215, 86, 160, 109, 130, 160, 140, 36, 93, 200, 109, 215, 100, 241, 246, 99, 135, 92, 168, 149, 170, 114, 9, 143, 4, 93, 25, 76, 54, 176, 119, 230, 170, 154, 105, 47, 121, 10, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128];
+	assert_eq!(decompress(&malformed, blocks_swapper()).into_vec(), malformed);
+}
+
+#[test]
+fn large_block() {
+	let block = vec![249, 97, 87, 249, 2, 19, 160, 137, 152, 36, 115, 234, 67, 89, 207, 44, 42, 186, 128, 91, 242, 10, 16, 42, 193, 195, 2, 129, 60, 181, 150, 192, 178, 117, 15, 18, 100, 174, 249, 160, 29, 204, 77, 232, 222, 199, 93, 122, 171, 133, 181, 103, 182, 204, 212, 26, 211, 18, 69, 27, 148, 138, 116, 19, 240, 161, 66, 253, 64, 212, 147, 71, 148, 223, 125, 126, 5, 57, 51, 181, 204, 36, 55, 47, 135, 140, 144, 230, 45, 173, 173, 93, 66, 160, 93, 42, 52, 28, 156, 139, 242, 60, 121, 90, 117, 99, 92, 182, 196, 25, 131, 16, 155, 186, 239, 137, 33, 118, 105, 232, 230, 239, 213, 240, 207, 6, 160, 59, 72, 35, 216, 124, 37, 62, 178, 34, 97, 180, 254, 212, 103, 179, 45, 247, 168, 205, 145, 7, 157, 75, 247, 83, 230, 233, 248, 97, 132, 232, 161, 160, 122, 167, 249, 196, 203, 2, 173, 180, 106, 203, 129, 214, 232, 181, 87, 39, 60, 99, 135, 6, 40, 34, 163, 118, 140, 149, 79, 241, 238, 230, 201, 194, 185, 1, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 134, 36, 160, 31, 187, 182, 29, 131, 58, 212, 207, 131, 71, 168, 13, 131, 45, 60, 7, 132, 89, 53, 51, 233, 147, 69, 84, 67, 32, 101, 116, 104, 101, 114, 109, 105, 110, 101, 32, 45, 32, 69, 85, 49, 160, 204, 49, 229, 99, 26, 47, 30, 50, 223, 117, 111, 168, 102, 158, 12, 186, 140, 98, 193, 196, 214, 29, 13, 87, 44, 31, 216, 48, 250, 251, 148, 69, 136, 225, 206, 131, 96, 2, 39, 50, 46, 249, 95, 61, 248, 109, 1, 133, 4, 227, 178, 146, 0, 130, 82, 8, 148, 123, 45, 95, 28, 247, 139, 190, 196, 52, 39, 251, 53, 226, 79, 251, 1, 98, 34, 68, 240, 136, 18, 81, 1, 26, 180, 46, 168, 0, 128, 129, 157, 160, 31, 164, 62, 186, 38, 56, 118, 133, 24, 180, 239, 139, 254, 154, 196, 115, 8, 246, 45, 233, 227, 165, 192, 193, 7, 111, 1, 169, 2, 204, 2, 144, 160, 42, 60, 78, 200, 5, 113, 98, 65, 250, 105, 0, 164, 152, 81, 235, 154, 100, 204, 182, 141, 174, 39, 107, 127, 219, 120, 63, 221, 237, 87, 57, 9, 249, 94, 203, 52, 133, 2, 84, 11, 228, 0, 131, 44, 233, 255, 148, 137, 61, 196, 25, 119, 102, 53, 248, 253, 27, 31, 169, 147, 75, 245, 41, 174, 242, 86, 7, 128, 185, 94, 100, 194, 32, 154, 203, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 131, 110, 76, 27, 36, 34, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 91, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 248, 249, 1, 245, 160, 89, 97, 73, 3, 84, 63, 105, 163, 169, 7, 237, 254, 220, 243, 13, 27, 0, 45, 215, 39, 235, 232, 237, 22, 162, 83, 99, 164, 247, 240, 48, 66, 160, 29, 204, 77, 232, 222, 199, 93, 122, 171, 133, 181, 103, 182, 204, 212, 26, 211, 18, 69, 27, 148, 138, 116, 19, 240, 161, 66, 253, 64, 212, 147, 71, 148, 137, 61, 196, 25, 119, 102, 53, 248, 253, 27, 31, 169, 147, 75, 245, 41, 174, 242, 86, 7, 160, 243, 100, 253, 32, 58, 153, 124, 189, 215, 216, 21, 229, 230, 182, 39, 222, 135, 217, 92, 155, 164, 143, 79, 14, 178, 128, 26, 245, 152, 197, 247, 33, 160, 98, 156, 249, 227, 33, 40, 127, 226, 250, 254, 222, 21, 37, 66, 5, 23, 142, 73, 121, 64, 233, 198, 110, 212, 131, 134, 126, 38, 218, 85, 149, 212, 160, 32, 179, 60, 112, 219, 114, 185, 205, 184, 204, 31, 210, 181, 8, 109, 97, 227, 206, 41, 177, 238, 122, 205, 193, 93, 163, 176, 107, 28, 181, 63, 19, 185, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 134, 36, 236, 76, 26, 58, 130, 131, 58, 210, 155, 131, 71, 183, 132, 130, 82, 8, 132, 89, 53, 19, 83, 160, 83, 109, 97, 114, 116, 80, 111, 111, 108, 45, 79, 76, 69, 66, 100, 120, 122, 50, 54, 106, 73, 50, 74, 65, 72, 109, 52, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 203, 86, 242, 75, 191, 176, 245, 37, 106, 66, 34, 44, 77, 161, 164, 143, 56, 229, 102, 192, 191, 114, 46, 137, 15, 59, 249, 198, 20, 64, 167, 176, 167, 146, 234, 72, 147, 122, 168, 34, 174, 210, 94, 131, 105, 110, 180, 48, 248, 10, 127, 156, 194, 83, 60, 48, 89, 126, 86, 90, 218, 235, 170, 15, 206, 23, 82, 13, 250, 255, 240, 112, 168, 137, 111, 204, 205, 125, 24, 81, 118, 165, 92, 28, 127, 50, 223, 173, 231, 234, 212, 181, 9, 113, 72, 250, 97, 126, 194, 18, 102, 51, 189, 147, 246, 2, 201, 27, 206, 15, 130, 172, 1, 206, 219, 204, 49, 211, 162, 78, 101, 26, 16, 73, 106, 70, 209, 118, 140, 59, 133, 162, 114, 14, 92, 8, 26, 83, 213, 91, 136, 207, 228, 86, 13, 208, 64, 85, 211, 143, 252, 181, 128, 77, 187, 198, 50, 91, 26, 156, 109, 233, 136, 36, 216, 142, 87, 112, 45, 166, 235, 118, 128, 191, 66, 23, 48, 32, 3, 41, 37, 103, 8, 180, 236, 77, 106, 59, 18, 77, 206, 23, 154, 143, 236, 63, 235, 52, 105, 155, 38, 207, 31, 145, 193, 98, 251, 216, 224, 213, 250, 164, 22, 21, 227, 190, 223, 74, 29, 107, 0, 103, 187, 53, 129, 204, 202, 170, 156, 19, 67, 185, 100, 252, 5, 129, 164, 58, 228, 121, 214, 27, 53, 35, 16, 238, 93, 64, 94, 4, 250, 138, 102, 22, 128, 37, 229, 104, 40, 245, 216, 107, 16, 52, 202, 54, 98, 43, 162, 245, 56, 48, 150, 41, 3, 224, 167, 171, 5, 254, 106, 199, 0, 47, 238, 162, 27, 114, 168, 111, 231, 241, 102, 79, 138, 66, 168, 38, 157, 140, 76, 56, 155, 66, 109, 253, 243, 207, 79, 88, 167, 111, 251, 135, 38, 249, 85, 167, 36, 113, 7, 243, 34, 132, 113, 117, 8, 245, 93, 79, 171, 12, 223, 157, 41, 201, 221, 129, 60, 186, 164, 123, 1, 247, 202, 28, 61, 121, 156, 214, 55, 68, 36, 205, 113, 203, 45, 173, 24, 190, 32, 42, 207, 69, 189, 209, 221, 50, 18, 77, 60, 249, 233, 101, 216, 168, 47, 16, 155, 172, 248, 90, 115, 162, 134, 95, 6, 227, 202, 46, 26, 133, 135, 65, 251, 97, 109, 181, 141, 87, 156, 59, 40, 253, 87, 116, 244, 225, 242, 133, 77, 199, 120, 210, 152, 108, 90, 137, 127, 214, 137, 250, 180, 148, 113, 71, 68, 183, 216, 166, 169, 54, 174, 235, 51, 45, 172, 47, 5, 205, 154, 71, 241, 106, 228, 222, 150, 34, 95, 68, 251, 78, 244, 111, 59, 252, 138, 106, 31, 185, 107, 123, 22, 37, 184, 249, 117, 231, 56, 224, 137, 13, 254, 50, 240, 252, 220, 74, 33, 223, 163, 97, 74, 180, 232, 189, 92, 104, 193, 59, 255, 80, 10, 146, 236, 17, 80, 90, 139, 35, 212, 153, 19, 13, 159, 7, 184, 77, 193, 43, 251, 149, 176, 147, 169, 227, 236, 74, 98, 163, 193, 180, 4, 186, 19, 29, 212, 166, 177, 114, 30, 254, 241, 141, 95, 72, 99, 104, 101, 21, 141, 181, 85, 200, 184, 190, 11, 255, 74, 39, 89, 41, 204, 187, 96, 202, 188, 191, 157, 135, 239, 166, 155, 86, 32, 228, 198, 117, 41, 31, 54, 151, 229, 214, 56, 149, 187, 177, 123, 164, 182, 232, 188, 21, 94, 2, 155, 177, 124, 94, 151, 249, 116, 78, 62, 0, 194, 76, 156, 86, 227, 11, 25, 35, 6, 175, 77, 151, 60, 44, 114, 234, 153, 124, 79, 114, 88, 36, 178, 223, 229, 61, 90, 198, 60, 237, 224, 169, 115, 22, 152, 254, 235, 17, 130, 53, 1, 235, 67, 90, 238, 52, 170, 182, 73, 182, 138, 182, 189, 130, 170, 200, 91, 14, 150, 174, 100, 63, 29, 93, 171, 150, 154, 93, 72, 34, 156, 173, 108, 74, 29, 107, 197, 130, 86, 106, 178, 138, 210, 0, 92, 11, 78, 111, 226, 120, 169, 222, 50, 18, 156, 170, 98, 206, 97, 21, 28, 112, 234, 145, 2, 216, 188, 172, 150, 183, 39, 125, 17, 146, 49, 184, 242, 2, 60, 19, 162, 180, 210, 254, 249, 182, 240, 148, 184, 118, 113, 198, 27, 115, 165, 193, 97, 232, 201, 140, 63, 200, 153, 10, 162, 170, 69, 68, 152, 199, 103, 14, 164, 228, 120, 71, 47, 196, 217, 251, 181, 26, 112, 185, 116, 184, 77, 93, 236, 160, 235, 40, 0, 162, 199, 123, 223, 37, 53, 73, 177, 69, 207, 11, 137, 67, 204, 57, 231, 50, 185, 148, 48, 30, 102, 195, 248, 40, 189, 227, 187, 95, 166, 1, 7, 30, 112, 32, 101, 38, 72, 208, 52, 67, 131, 96, 34, 192, 156, 48, 92, 231, 188, 97, 103, 97, 41, 254, 33, 72, 190, 68, 184, 85, 114, 25, 94, 65, 144, 102, 176, 150, 76, 247, 146, 9, 188, 66, 4, 144, 98, 233, 196, 166, 7, 15, 54, 148, 247, 81, 52, 253, 27, 113, 235, 255, 230, 179, 168, 140, 95, 230, 163, 86, 235, 119, 185, 152, 223, 129, 48, 169, 170, 225, 224, 154, 164, 209, 129, 232, 92, 190, 187, 38, 217, 36, 113, 250, 61, 125, 168, 25, 70, 227, 39, 142, 12, 226, 20, 134, 82, 143, 147, 211, 173, 149, 223, 58, 27, 163, 18, 252, 148, 112, 19, 101, 144, 21, 105, 34, 200, 254, 11, 254, 8, 247, 210, 142, 194, 54, 150, 34, 171, 33, 203, 79, 79, 135, 186, 51, 68, 215, 106, 100, 21, 239, 178, 68, 230, 238, 72, 4, 31, 101, 161, 29, 204, 129, 234, 66, 195, 6, 69, 77, 48, 157, 137, 236, 96, 138, 119, 86, 147, 205, 172, 242, 28, 115, 188, 254, 216, 35, 89, 33, 27, 162, 243, 58, 102, 131, 50, 23, 169, 58, 218, 111, 6, 199, 164, 171, 104, 207, 34, 111, 229, 3, 207, 124, 96, 241, 95, 105, 113, 4, 16, 48, 163, 153, 0, 96, 174, 246, 3, 154, 124, 14, 132, 237, 184, 91, 217, 201, 53, 80, 39, 31, 113, 246, 67, 132, 85, 62, 153, 187, 240, 180, 117, 162, 17, 27, 190, 72, 178, 14, 101, 173, 200, 14, 196, 225, 212, 38, 153, 165, 147, 130, 51, 134, 40, 36, 7, 234, 179, 73, 28, 224, 4, 222, 10, 61, 65, 78, 23, 98, 246, 144, 9, 16, 180, 248, 56, 214, 162, 214, 18, 50, 67, 207, 3, 77, 7, 6, 28, 43, 131, 124, 117, 124, 213, 160, 67, 1, 44, 39, 15, 28, 149, 45, 54, 127, 157, 237, 193, 132, 174, 214, 8, 164, 106, 159, 213, 27, 173, 33, 24, 31, 110, 210, 95, 140, 236, 71, 68, 207, 225, 134, 105, 25, 226, 168, 119, 172, 1, 252, 11, 231, 182, 93, 254, 211, 58, 78, 192, 168, 67, 71, 11, 160, 76, 111, 234, 138, 119, 135, 51, 226, 113, 167, 146, 103, 97, 43, 192, 133, 252, 124, 42, 190, 217, 38, 95, 95, 222, 14, 245, 192, 116, 245, 68, 114, 253, 25, 229, 221, 0, 158, 27, 163, 45, 244, 200, 0, 205, 150, 162, 76, 224, 168, 203, 79, 114, 137, 18, 206, 12, 152, 241, 159, 245, 197, 175, 146, 16, 62, 152, 112, 233, 23, 132, 151, 100, 175, 26, 83, 0, 254, 150, 230, 94, 174, 77, 39, 57, 106, 155, 69, 85, 230, 239, 202, 205, 49, 17, 47, 72, 128, 251, 42, 157, 218, 234, 213, 127, 118, 152, 74, 139, 99, 120, 217, 116, 16, 73, 79, 40, 88, 107, 38, 132, 34, 101, 225, 109, 114, 91, 66, 69, 10, 44, 191, 6, 160, 208, 104, 123, 247, 247, 49, 151, 246, 216, 228, 157, 69, 140, 155, 98, 147, 202, 12, 79, 168, 40, 210, 164, 230, 241, 107, 109, 231, 243, 187, 252, 100, 70, 41, 140, 35, 231, 115, 98, 49, 192, 102, 46, 12, 82, 162, 226, 104, 86, 169, 42, 34, 213, 76, 89, 197, 131, 10, 25, 120, 204, 115, 231, 103, 217, 164, 13, 166, 139, 141, 77, 75, 27, 21, 84, 212, 209, 189, 148, 198, 213, 96, 234, 190, 213, 40, 210, 152, 141, 4, 110, 167, 209, 226, 236, 247, 139, 119, 215, 175, 30, 49, 225, 174, 42, 195, 251, 228, 170, 246, 94, 117, 128, 34, 177, 10, 15, 126, 165, 52, 159, 249, 67, 35, 200, 86, 65, 254, 141, 198, 219, 55, 225, 240, 111, 248, 101, 29, 235, 192, 112, 225, 19, 255, 139, 129, 46, 42, 9, 8, 74, 58, 254, 191, 49, 173, 189, 32, 5, 174, 81, 223, 94, 145, 85, 40, 194, 145, 251, 88, 168, 166, 143, 39, 33, 111, 230, 115, 77, 113, 83, 100, 211, 244, 163, 201, 141, 71, 193, 106, 138, 3, 215, 134, 217, 191, 10, 177, 250, 233, 247, 127, 162, 112, 206, 150, 187, 205, 141, 211, 181, 58, 199, 11, 220, 91, 180, 169, 182, 178, 224, 159, 144, 105, 146, 29, 162, 221, 106, 190, 209, 151, 126, 98, 187, 91, 50, 91, 198, 210, 78, 189, 155, 193, 208, 178, 164, 0, 189, 145, 189, 7, 162, 88, 156, 33, 118, 176, 125, 130, 199, 108, 240, 99, 125, 119, 202, 188, 53, 17, 140, 102, 26, 30, 23, 30, 214, 203, 93, 82, 6, 67, 28, 31, 12, 166, 105, 63, 132, 69, 166, 208, 252, 140, 56, 175, 245, 17, 170, 3, 193, 26, 168, 92, 40, 131, 82, 17, 144, 128, 91, 48, 220, 16, 209, 53, 226, 4, 225, 6, 253, 141, 25, 254, 146, 41, 63, 90, 19, 6, 75, 96, 130, 156, 14, 91, 231, 207, 128, 244, 15, 135, 63, 45, 235, 51, 134, 10, 75, 252, 212, 63, 51, 131, 253, 110, 144, 239, 182, 194, 107, 45, 103, 124, 83, 154, 173, 181, 51, 60, 63, 75, 172, 103, 222, 53, 31, 73, 93, 76, 159, 184, 24, 240, 41, 97, 72, 131, 54, 113, 170, 233, 182, 86, 62, 88, 131, 206, 86, 180, 32, 143, 172, 114, 41, 233, 121, 221, 190, 192, 97, 48, 196, 185, 135, 67, 79, 190, 66, 181, 196, 246, 211, 94, 250, 228, 62, 117, 159, 141, 54, 186, 81, 143, 113, 108, 102, 252, 182, 146, 233, 20, 135, 30, 255, 237, 33, 224, 68, 8, 175, 33, 58, 49, 16, 226, 113, 54, 90, 209, 159, 211, 193, 203, 187, 186, 156, 89, 81, 127, 211, 171, 113, 92, 238, 193, 159, 11, 242, 183, 97, 67, 211, 138, 203, 35, 113, 247, 64, 205, 71, 2, 127, 208, 90, 139, 132, 148, 180, 247, 7, 119, 195, 128, 96, 221, 195, 110, 44, 53, 114, 26, 196, 226, 219, 134, 195, 190, 205, 171, 29, 137, 224, 75, 167, 188, 94, 123, 199, 64, 167, 105, 191, 52, 247, 43, 224, 181, 250, 58, 109, 25, 1, 120, 7, 223, 250, 69, 199, 83, 15, 20, 136, 90, 247, 128, 109, 169, 243, 24, 220, 215, 188, 169, 46, 31, 131, 112, 79, 132, 93, 170, 127, 238, 207, 138, 110, 201, 232, 163, 214, 77, 45, 113, 103, 179, 197, 206, 83, 148, 6, 185, 231, 174, 111, 171, 162, 147, 39, 252, 36, 132, 173, 145, 77, 43, 223, 164, 46, 136, 129, 210, 219, 221, 202, 246, 182, 95, 135, 8, 55, 229, 71, 245, 57, 131, 217, 93, 90, 179, 195, 230, 102, 169, 80, 51, 197, 6, 48, 143, 112, 121, 27, 79, 174, 47, 88, 240, 47, 10, 62, 94, 177, 78, 234, 112, 136, 65, 84, 4, 245, 190, 138, 38, 98, 108, 187, 47, 236, 65, 95, 233, 245, 47, 126, 208, 199, 74, 229, 158, 20, 238, 148, 218, 241, 233, 229, 13, 14, 206, 95, 42, 22, 65, 191, 218, 73, 116, 90, 23, 4, 166, 32, 236, 51, 107, 252, 198, 10, 163, 100, 140, 221, 174, 111, 179, 171, 183, 159, 204, 229, 104, 156, 190, 99, 142, 130, 46, 142, 31, 244, 30, 114, 69, 86, 159, 173, 185, 88, 130, 238, 12, 216, 140, 134, 15, 104, 64, 131, 106, 95, 206, 11, 1, 183, 75, 167, 43, 63, 188, 39, 144, 14, 179, 140, 47, 140, 253, 202, 192, 215, 156, 108, 18, 211, 9, 75, 108, 47, 212, 81, 24, 149, 244, 189, 60, 199, 210, 251, 22, 15, 247, 145, 136, 59, 51, 228, 31, 227, 226, 12, 199, 36, 126, 167, 153, 168, 220, 216, 56, 68, 79, 99, 88, 13, 34, 125, 123, 33, 239, 167, 121, 240, 167, 65, 1, 82, 9, 126, 165, 52, 107, 207, 11, 48, 112, 3, 150, 102, 30, 177, 250, 211, 194, 239, 204, 242, 27, 31, 118, 231, 44, 200, 178, 138, 104, 164, 131, 113, 205, 95, 88, 165, 136, 177, 7, 111, 216, 83, 186, 110, 193, 241, 164, 24, 237, 204, 95, 250, 183, 26, 100, 70, 58, 91, 190, 43, 165, 31, 136, 139, 190, 27, 67, 52, 72, 65, 120, 121, 54, 81, 27, 209, 28, 74, 51, 58, 211, 86, 46, 92, 123, 222, 10, 44, 145, 78, 90, 26, 61, 64, 143, 228, 227, 254, 73, 218, 85, 93, 218, 33, 123, 181, 195, 9, 76, 237, 41, 119, 145, 131, 106, 4, 150, 58, 7, 156, 65, 113, 108, 28, 135, 43, 21, 245, 159, 20, 163, 123, 27, 20, 58, 212, 183, 242, 82, 228, 110, 80, 53, 164, 161, 180, 244, 125, 168, 207, 81, 4, 253, 95, 101, 88, 31, 63, 25, 134, 59, 130, 0, 90, 220, 24, 200, 221, 149, 76, 225, 16, 26, 77, 179, 172, 190, 145, 199, 145, 239, 140, 106, 131, 29, 211, 187, 12, 207, 40, 205, 237, 151, 159, 18, 76, 49, 193, 137, 196, 197, 105, 181, 171, 23, 172, 208, 115, 95, 139, 136, 150, 211, 251, 132, 247, 206, 93, 70, 19, 181, 13, 205, 216, 79, 238, 229, 123, 12, 38, 24, 233, 96, 205, 223, 126, 95, 54, 15, 145, 149, 40, 41, 34, 30, 17, 1, 153, 252, 244, 214, 40, 66, 158, 71, 219, 142, 206, 216, 251, 200, 191, 75, 34, 147, 163, 27, 127, 64, 195, 187, 129, 132, 63, 224, 112, 1, 154, 28, 76, 141, 165, 195, 155, 53, 84, 189, 57, 148, 144, 98, 14, 232, 213, 179, 55, 191, 169, 203, 103, 99, 120, 159, 254, 201, 113, 51, 23, 99, 116, 246, 200, 59, 122, 13, 165, 118, 14, 230, 35, 231, 158, 48, 20, 104, 147, 121, 161, 241, 83, 109, 58, 84, 246, 251, 170, 145, 99, 179, 150, 32, 203, 93, 193, 99, 13, 86, 8, 224, 237, 61, 69, 58, 27, 79, 229, 84, 129, 145, 109, 58, 2, 230, 50, 0, 38, 189, 160, 18, 89, 158, 44, 255, 190, 108, 59, 161, 43, 49, 238, 84, 229, 223, 183, 138, 75, 130, 84, 208, 112, 183, 75, 108, 229, 254, 186, 103, 207, 244, 244, 149, 217, 71, 217, 238, 59, 98, 49, 214, 251, 83, 43, 104, 84, 0, 244, 181, 253, 235, 119, 236, 31, 36, 163, 105, 46, 52, 21, 212, 81, 170, 106, 186, 162, 63, 24, 235, 197, 184, 239, 229, 147, 105, 73, 145, 164, 214, 128, 23, 141, 50, 203, 41, 135, 32, 169, 168, 152, 137, 199, 38, 93, 226, 205, 20, 190, 208, 216, 76, 204, 133, 134, 137, 99, 89, 32, 57, 235, 138, 176, 10, 63, 159, 110, 85, 155, 164, 250, 194, 190, 58, 202, 52, 237, 95, 54, 149, 206, 144, 74, 123, 152, 231, 41, 202, 121, 248, 243, 40, 247, 161, 225, 88, 148, 188, 79, 6, 235, 43, 132, 24, 200, 229, 86, 53, 166, 123, 116, 233, 203, 23, 212, 55, 0, 195, 238, 247, 152, 247, 216, 229, 23, 93, 244, 224, 96, 37, 6, 61, 24, 107, 51, 63, 254, 187, 179, 71, 7, 45, 170, 122, 160, 223, 44, 203, 190, 142, 134, 129, 210, 67, 41, 17, 118, 139, 196, 163, 243, 54, 81, 192, 212, 129, 52, 227, 168, 113, 238, 178, 185, 158, 213, 144, 12, 198, 236, 234, 35, 179, 157, 91, 138, 46, 220, 35, 65, 82, 11, 16, 125, 96, 248, 199, 155, 100, 48, 154, 106, 187, 141, 250, 191, 130, 222, 131, 227, 14, 138, 219, 23, 23, 190, 180, 155, 147, 58, 224, 150, 39, 182, 226, 239, 3, 45, 47, 99, 255, 32, 73, 242, 233, 180, 149, 238, 45, 103, 39, 196, 231, 138, 16, 51, 224, 221, 136, 174, 205, 149, 132, 92, 83, 186, 48, 133, 204, 210, 5, 40, 57, 22, 64, 160, 4, 73, 168, 178, 229, 222, 185, 235, 109, 196, 109, 183, 150, 158, 0, 56, 16, 41, 43, 193, 31, 204, 169, 219, 50, 167, 242, 107, 206, 105, 228, 246, 59, 53, 18, 42, 19, 217, 56, 220, 59, 46, 160, 107, 200, 164, 0, 5, 213, 178, 133, 187, 142, 174, 218, 60, 252, 237, 61, 66, 146, 207, 179, 93, 234, 83, 219, 93, 55, 107, 92, 139, 101, 151, 198, 135, 246, 223, 101, 139, 44, 166, 82, 97, 233, 217, 130, 67, 22, 88, 36, 131, 80, 179, 192, 34, 206, 119, 167, 17, 65, 217, 71, 250, 52, 253, 29, 4, 156, 63, 64, 81, 6, 67, 130, 79, 0, 95, 87, 36, 43, 4, 26, 51, 250, 24, 178, 197, 41, 20, 142, 187, 180, 239, 156, 102, 113, 15, 13, 18, 90, 70, 184, 7, 250, 193, 117, 127, 60, 0, 198, 218, 128, 116, 119, 124, 126, 160, 129, 231, 68, 189, 98, 48, 43, 120, 178, 91, 54, 242, 66, 112, 55, 188, 42, 179, 94, 60, 249, 136, 81, 149, 132, 98, 209, 181, 219, 223, 31, 40, 235, 55, 5, 69, 11, 63, 192, 51, 224, 119, 107, 193, 84, 178, 191, 58, 217, 222, 183, 118, 114, 95, 45, 48, 126, 184, 10, 207, 0, 217, 59, 167, 244, 219, 9, 238, 41, 13, 127, 191, 123, 139, 9, 74, 40, 164, 194, 205, 116, 204, 185, 230, 133, 148, 215, 50, 105, 173, 220, 113, 117, 98, 233, 80, 209, 185, 211, 232, 29, 157, 12, 206, 228, 187, 26, 240, 193, 21, 15, 69, 115, 120, 66, 2, 92, 165, 103, 29, 177, 151, 154, 211, 107, 177, 89, 16, 135, 243, 135, 178, 237, 184, 110, 191, 169, 230, 243, 106, 16, 95, 128, 124, 73, 132, 107, 116, 123, 38, 0, 72, 24, 171, 8, 113, 227, 43, 136, 168, 25, 174, 100, 201, 252, 212, 119, 246, 131, 95, 78, 65, 222, 89, 192, 87, 66, 102, 58, 237, 94, 56, 138, 71, 121, 65, 49, 22, 65, 29, 183, 56, 59, 27, 16, 176, 232, 120, 22, 104, 212, 83, 32, 55, 90, 2, 37, 108, 112, 146, 113, 34, 64, 78, 65, 80, 198, 101, 190, 60, 69, 60, 230, 72, 216, 215, 225, 166, 155, 122, 140, 137, 245, 89, 77, 237, 209, 242, 67, 37, 88, 5, 117, 101, 165, 98, 84, 139, 18, 57, 118, 67, 78, 254, 178, 60, 181, 124, 144, 169, 13, 20, 233, 60, 51, 55, 1, 215, 225, 224, 42, 191, 189, 227, 246, 25, 53, 164, 27, 1, 66, 112, 36, 211, 67, 195, 172, 119, 52, 81, 244, 10, 39, 11, 219, 160, 35, 230, 225, 176, 171, 74, 254, 100, 229, 4, 64, 140, 85, 94, 85, 197, 63, 234, 173, 243, 129, 52, 220, 154, 175, 195, 223, 23, 85, 20, 171, 79, 240, 185, 10, 14, 93, 185, 93, 100, 11, 41, 39, 106, 137, 70, 122, 173, 221, 195, 73, 174, 145, 7, 85, 1, 232, 126, 67, 38, 213, 104, 164, 213, 213, 5, 23, 233, 233, 47, 222, 14, 3, 33, 180, 180, 49, 136, 73, 46, 237, 209, 47, 197, 173, 95, 131, 4, 157, 40, 217, 217, 156, 31, 81, 103, 24, 116, 208, 225, 123, 11, 122, 143, 55, 224, 125, 121, 42, 109, 151, 120, 245, 141, 176, 100, 12, 237, 222, 197, 100, 79, 16, 168, 247, 103, 223, 85, 92, 26, 17, 23, 91, 90, 249, 228, 162, 166, 164, 178, 215, 48, 203, 209, 138, 42, 42, 87, 132, 134, 120, 39, 13, 50, 77, 187, 15, 42, 82, 80, 242, 210, 141, 28, 213, 194, 241, 75, 86, 159, 120, 217, 98, 94, 100, 129, 1, 228, 157, 183, 171, 186, 164, 245, 72, 107, 119, 241, 227, 77, 109, 120, 58, 248, 36, 82, 38, 188, 50, 177, 65, 227, 192, 169, 124, 7, 137, 254, 80, 151, 200, 73, 55, 99, 30, 150, 192, 13, 106, 41, 236, 18, 6, 73, 73, 16, 239, 162, 0, 218, 201, 184, 78, 184, 137, 253, 12, 130, 241, 245, 158, 233, 159, 0, 130, 99, 50, 12, 240, 186, 207, 221, 250, 179, 115, 138, 137, 154, 182, 72, 119, 204, 16, 18, 101, 107, 27, 98, 142, 16, 143, 116, 161, 238, 232, 227, 70, 247, 124, 150, 157, 67, 114, 24, 162, 246, 158, 205, 24, 77, 79, 107, 232, 141, 103, 99, 128, 101, 40, 241, 212, 127, 90, 40, 2, 229, 105, 51, 164, 70, 216, 95, 2, 240, 54, 224, 11, 241, 201, 181, 97, 113, 49, 10, 170, 203, 10, 7, 130, 42, 236, 195, 146, 175, 222, 91, 235, 145, 13, 33, 82, 81, 187, 250, 248, 59, 250, 222, 136, 69, 192, 178, 189, 103, 176, 235, 101, 89, 133, 145, 203, 35, 138, 157, 180, 144, 6, 172, 55, 58, 147, 217, 109, 95, 81, 141, 214, 209, 245, 146, 96, 23, 130, 101, 107, 180, 188, 69, 204, 224, 195, 29, 108, 199, 70, 239, 18, 199, 143, 68, 161, 121, 110, 132, 238, 186, 97, 217, 227, 106, 86, 162, 24, 170, 155, 34, 8, 92, 154, 199, 184, 210, 214, 20, 31, 200, 22, 169, 186, 176, 26, 52, 62, 5, 251, 241, 108, 67, 153, 104, 242, 20, 28, 143, 23, 92, 191, 96, 254, 141, 235, 113, 154, 10, 219, 117, 159, 56, 31, 140, 161, 225, 247, 236, 253, 126, 160, 115, 23, 15, 175, 190, 227, 94, 149, 166, 102, 173, 251, 60, 192, 100, 70, 126, 89, 88, 154, 70, 176, 82, 212, 137, 12, 243, 203, 215, 247, 252, 91, 27, 19, 104, 229, 123, 83, 164, 166, 1, 90, 189, 251, 6, 81, 168, 28, 250, 206, 104, 62, 122, 66, 100, 183, 204, 196, 12, 57, 237, 25, 151, 165, 202, 65, 176, 124, 4, 94, 99, 250, 31, 43, 245, 160, 19, 247, 137, 120, 147, 24, 227, 192, 34, 21, 113, 168, 214, 235, 104, 140, 252, 170, 127, 90, 181, 149, 35, 160, 69, 110, 233, 71, 194, 66, 156, 225, 152, 129, 163, 168, 162, 154, 99, 172, 144, 85, 253, 238, 250, 48, 69, 99, 139, 49, 133, 200, 148, 34, 238, 235, 163, 13, 229, 232, 206, 118, 9, 132, 186, 253, 112, 251, 185, 191, 253, 155, 31, 161, 100, 249, 50, 145, 99, 243, 16, 21, 182, 137, 81, 104, 165, 96, 66, 112, 137, 68, 233, 58, 217, 65, 209, 62, 125, 164, 71, 64, 3, 44, 47, 172, 14, 211, 105, 241, 194, 50, 196, 89, 82, 26, 174, 194, 101, 119, 171, 140, 162, 141, 123, 206, 115, 85, 248, 33, 85, 228, 42, 92, 97, 100, 0, 16, 52, 27, 111, 146, 22, 223, 104, 54, 254, 70, 119, 180, 9, 126, 226, 173, 218, 140, 232, 213, 96, 232, 138, 148, 131, 144, 15, 69, 136, 43, 252, 203, 249, 20, 198, 32, 153, 17, 9, 28, 69, 183, 178, 240, 203, 31, 197, 112, 215, 34, 199, 95, 180, 116, 231, 191, 216, 12, 90, 216, 161, 227, 246, 5, 183, 26, 243, 239, 47, 193, 208, 140, 195, 151, 178, 100, 250, 38, 182, 15, 156, 211, 44, 207, 216, 110, 150, 234, 92, 160, 204, 228, 246, 38, 224, 16, 83, 166, 33, 22, 163, 174, 99, 80, 3, 23, 142, 55, 3, 253, 128, 63, 222, 111, 158, 184, 10, 60, 153, 124, 202, 53, 189, 14, 118, 45, 87, 79, 252, 20, 226, 58, 249, 197, 29, 162, 78, 211, 147, 165, 240, 7, 60, 175, 73, 90, 61, 167, 239, 68, 104, 66, 207, 208, 194, 87, 148, 158, 184, 247, 129, 7, 150, 171, 62, 157, 62, 240, 137, 36, 88, 122, 225, 83, 173, 245, 238, 245, 249, 227, 252, 152, 40, 8, 3, 150, 155, 71, 121, 187, 46, 173, 248, 107, 78, 135, 232, 20, 174, 165, 135, 5, 106, 244, 62, 79, 249, 72, 99, 252, 177, 27, 158, 223, 235, 59, 34, 141, 45, 221, 238, 31, 102, 247, 65, 170, 15, 219, 210, 232, 80, 100, 68, 171, 37, 211, 156, 83, 147, 246, 219, 89, 41, 195, 110, 252, 146, 164, 200, 63, 22, 154, 235, 157, 224, 24, 13, 102, 218, 53, 116, 235, 195, 57, 44, 157, 20, 89, 193, 102, 118, 163, 6, 24, 185, 177, 103, 106, 237, 7, 242, 206, 186, 232, 186, 164, 89, 138, 96, 207, 218, 228, 8, 77, 218, 15, 219, 168, 183, 178, 106, 155, 150, 37, 27, 139, 195, 72, 245, 64, 122, 219, 34, 125, 244, 159, 107, 23, 200, 151, 221, 249, 115, 21, 122, 60, 189, 31, 36, 127, 78, 52, 175, 187, 142, 179, 50, 53, 30, 246, 156, 89, 21, 120, 137, 129, 51, 10, 219, 176, 167, 197, 56, 128, 1, 21, 249, 225, 157, 135, 91, 248, 216, 237, 108, 143, 105, 159, 168, 97, 56, 54, 26, 181, 62, 66, 194, 192, 246, 142, 174, 157, 28, 52, 18, 33, 44, 54, 106, 28, 19, 94, 56, 49, 80, 181, 104, 237, 198, 100, 25, 119, 50, 224, 202, 71, 203, 246, 127, 108, 93, 3, 58, 61, 195, 222, 215, 50, 146, 156, 110, 216, 51, 40, 228, 9, 192, 77, 26, 58, 144, 247, 220, 122, 136, 51, 97, 227, 255, 158, 63, 76, 105, 203, 118, 96, 163, 154, 19, 163, 65, 249, 170, 225, 220, 193, 235, 177, 57, 168, 2, 14, 44, 34, 130, 107, 145, 189, 125, 158, 223, 106, 229, 0, 175, 136, 163, 176, 151, 192, 102, 36, 251, 135, 128, 146, 36, 182, 219, 135, 150, 115, 34, 164, 3, 69, 39, 128, 31, 3, 250, 103, 109, 228, 88, 77, 91, 51, 229, 228, 39, 140, 87, 33, 182, 110, 20, 127, 154, 139, 110, 252, 14, 92, 5, 39, 245, 215, 141, 132, 66, 99, 195, 210, 248, 104, 29, 72, 126, 58, 54, 254, 137, 250, 235, 51, 200, 139, 32, 61, 174, 43, 194, 99, 179, 203, 207, 53, 245, 133, 177, 124, 73, 203, 155, 38, 11, 171, 223, 12, 171, 48, 169, 129, 190, 14, 43, 247, 147, 163, 204, 5, 102, 247, 251, 92, 79, 18, 195, 208, 25, 55, 228, 229, 55, 83, 17, 96, 4, 60, 85, 10, 218, 76, 101, 24, 172, 80, 228, 108, 45, 55, 129, 87, 97, 22, 86, 102, 70, 31, 187, 191, 1, 178, 184, 253, 120, 104, 197, 84, 242, 112, 17, 245, 82, 85, 96, 40, 21, 9, 4, 45, 209, 147, 162, 110, 90, 34, 41, 194, 135, 169, 75, 169, 114, 206, 220, 166, 81, 141, 187, 64, 120, 169, 165, 23, 66, 222, 214, 18, 184, 136, 116, 199, 67, 91, 151, 67, 123, 201, 40, 171, 30, 81, 53, 172, 11, 252, 52, 200, 191, 236, 81, 63, 28, 28, 79, 197, 11, 72, 49, 4, 124, 134, 233, 232, 35, 46, 146, 22, 245, 251, 182, 162, 76, 231, 32, 196, 244, 181, 102, 124, 215, 106, 183, 214, 60, 118, 51, 84, 203, 105, 179, 56, 73, 212, 219, 228, 251, 38, 126, 206, 115, 119, 115, 151, 21, 49, 80, 168, 206, 170, 174, 215, 59, 70, 84, 59, 126, 167, 254, 115, 232, 114, 60, 182, 40, 129, 177, 240, 200, 38, 37, 198, 209, 23, 76, 170, 118, 83, 1, 131, 247, 56, 26, 57, 127, 156, 31, 144, 27, 184, 203, 148, 35, 11, 202, 85, 112, 185, 103, 107, 238, 6, 233, 105, 127, 30, 36, 5, 87, 171, 241, 3, 56, 204, 132, 15, 217, 229, 139, 21, 217, 129, 72, 249, 87, 89, 79, 96, 37, 236, 89, 92, 155, 19, 126, 84, 218, 53, 184, 26, 224, 179, 7, 109, 243, 241, 91, 4, 121, 186, 223, 116, 222, 74, 23, 153, 101, 79, 27, 149, 143, 26, 68, 95, 238, 21, 43, 211, 107, 255, 231, 205, 156, 7, 52, 151, 74, 253, 249, 109, 51, 153, 31, 163, 151, 172, 121, 248, 150, 198, 13, 118, 76, 248, 18, 210, 184, 219, 23, 234, 59, 115, 254, 81, 254, 67, 110, 53, 177, 188, 60, 180, 25, 87, 10, 150, 44, 208, 115, 144, 16, 3, 244, 119, 137, 173, 22, 158, 135, 89, 82, 86, 224, 43, 127, 108, 234, 223, 64, 224, 50, 214, 124, 246, 207, 122, 29, 99, 234, 199, 48, 125, 106, 221, 148, 40, 5, 16, 140, 234, 185, 222, 239, 214, 67, 77, 22, 165, 135, 224, 121, 236, 251, 70, 6, 123, 22, 230, 117, 208, 172, 131, 59, 53, 108, 100, 173, 136, 63, 22, 130, 83, 137, 15, 28, 82, 36, 34, 221, 235, 226, 114, 79, 126, 119, 218, 50, 130, 122, 143, 128, 240, 138, 49, 95, 254, 117, 105, 94, 76, 117, 93, 6, 189, 236, 192, 252, 227, 60, 208, 190, 216, 173, 157, 42, 240, 134, 97, 184, 215, 46, 30, 152, 214, 186, 205, 122, 64, 241, 9, 165, 113, 56, 244, 89, 27, 38, 41, 168, 30, 3, 50, 249, 121, 35, 55, 79, 10, 253, 33, 221, 231, 112, 53, 230, 15, 241, 247, 11, 202, 123, 27, 169, 254, 215, 208, 212, 184, 229, 58, 145, 142, 227, 155, 8, 98, 108, 50, 239, 238, 82, 161, 80, 228, 170, 128, 65, 71, 94, 4, 135, 27, 30, 28, 176, 66, 87, 245, 58, 0, 242, 162, 155, 1, 230, 130, 191, 161, 30, 167, 132, 37, 170, 137, 45, 70, 182, 29, 64, 230, 204, 218, 12, 26, 236, 146, 21, 130, 38, 184, 0, 185, 21, 57, 51, 227, 123, 26, 216, 87, 227, 198, 78, 106, 171, 224, 255, 223, 12, 92, 86, 191, 171, 109, 68, 29, 196, 31, 189, 44, 47, 198, 240, 63, 119, 237, 15, 4, 66, 204, 61, 54, 105, 188, 52, 38, 85, 29, 10, 181, 57, 21, 63, 27, 248, 254, 144, 201, 69, 96, 72, 176, 206, 105, 209, 182, 227, 107, 31, 34, 36, 199, 71, 50, 233, 205, 40, 110, 204, 197, 190, 202, 175, 155, 208, 26, 241, 28, 118, 239, 86, 87, 198, 167, 203, 148, 79, 69, 114, 108, 111, 178, 8, 29, 141, 229, 254, 121, 55, 99, 138, 88, 211, 25, 213, 124, 32, 248, 28, 178, 12, 184, 96, 118, 178, 219, 74, 186, 235, 22, 144, 68, 124, 152, 163, 132, 152, 125, 193, 123, 203, 54, 115, 216, 254, 245, 228, 88, 47, 119, 152, 56, 194, 120, 93, 63, 251, 138, 157, 142, 83, 235, 111, 98, 208, 67, 226, 204, 115, 172, 14, 15, 217, 122, 68, 94, 214, 215, 29, 196, 49, 82, 155, 80, 204, 30, 180, 143, 142, 231, 118, 154, 68, 4, 61, 180, 33, 86, 157, 251, 119, 49, 46, 239, 175, 251, 115, 135, 182, 34, 219, 38, 134, 237, 12, 183, 159, 71, 196, 175, 119, 134, 146, 175, 239, 200, 85, 24, 217, 227, 238, 110, 252, 34, 213, 35, 175, 138, 193, 218, 182, 239, 83, 198, 26, 3, 30, 86, 54, 168, 174, 79, 129, 135, 146, 192, 218, 114, 151, 242, 108, 220, 232, 99, 46, 215, 49, 77, 5, 233, 222, 144, 69, 82, 85, 250, 180, 112, 61, 41, 7, 70, 35, 129, 219, 1, 102, 71, 40, 17, 52, 46, 102, 92, 75, 71, 121, 235, 18, 248, 78, 23, 237, 185, 36, 1, 253, 155, 195, 206, 244, 208, 255, 183, 10, 124, 207, 30, 200, 87, 15, 2, 31, 82, 248, 77, 199, 99, 110, 49, 133, 23, 175, 42, 20, 172, 13, 61, 178, 71, 197, 1, 87, 56, 214, 83, 138, 223, 121, 216, 209, 94, 188, 153, 136, 22, 101, 223, 251, 36, 70, 159, 160, 137, 55, 158, 136, 136, 94, 201, 249, 232, 129, 31, 163, 204, 148, 185, 219, 185, 188, 250, 87, 91, 233, 206, 199, 222, 41, 173, 48, 157, 166, 37, 53, 134, 142, 204, 169, 185, 136, 17, 238, 221, 67, 31, 233, 131, 78, 85, 250, 158, 115, 59, 6, 197, 0, 29, 209, 138, 21, 65, 208, 208, 100, 2, 249, 160, 42, 114, 168, 84, 100, 83, 98, 42, 113, 93, 199, 99, 3, 23, 187, 223, 35, 173, 167, 172, 12, 250, 132, 84, 191, 41, 161, 177, 90, 245, 36, 174, 96, 92, 4, 65, 80, 221, 118, 130, 137, 210, 181, 216, 234, 6, 114, 245, 247, 11, 183, 159, 78, 227, 93, 225, 188, 56, 210, 246, 105, 24, 127, 13, 3, 223, 213, 164, 180, 246, 129, 106, 153, 92, 20, 112, 229, 65, 37, 202, 16, 204, 79, 45, 14, 159, 111, 103, 125, 63, 209, 11, 212, 23, 29, 14, 106, 187, 95, 125, 231, 159, 247, 143, 149, 128, 20, 201, 139, 220, 243, 141, 124, 26, 171, 218, 135, 196, 74, 252, 154, 52, 245, 147, 236, 196, 248, 112, 70, 142, 237, 97, 191, 75, 100, 47, 234, 68, 85, 201, 28, 130, 3, 198, 86, 253, 79, 150, 148, 144, 204, 233, 54, 3, 5, 106, 19, 90, 161, 130, 16, 147, 168, 51, 234, 73, 72, 190, 54, 204, 146, 106, 213, 51, 33, 182, 127, 68, 91, 247, 225, 121, 4, 90, 117, 154, 82, 244, 70, 88, 15, 122, 187, 153, 136, 172, 52, 21, 174, 107, 175, 69, 121, 80, 180, 17, 154, 197, 30, 205, 200, 150, 198, 136, 64, 199, 22, 175, 74, 4, 195, 49, 111, 218, 52, 213, 176, 230, 58, 138, 61, 209, 13, 2, 114, 124, 80, 26, 50, 139, 86, 36, 192, 192, 36, 71, 80, 0, 59, 30, 135, 185, 103, 130, 115, 138, 250, 126, 155, 175, 240, 84, 122, 137, 200, 171, 68, 72, 164, 79, 79, 28, 90, 84, 110, 130, 122, 133, 165, 245, 35, 124, 195, 10, 99, 78, 140, 219, 139, 219, 107, 1, 172, 39, 0, 28, 150, 91, 243, 188, 215, 147, 12, 70, 161, 15, 172, 102, 17, 146, 175, 95, 79, 20, 209, 180, 207, 154, 153, 229, 190, 251, 73, 215, 11, 113, 37, 230, 193, 192, 218, 119, 83, 16, 237, 167, 193, 157, 157, 102, 102, 203, 198, 68, 237, 252, 121, 120, 132, 126, 65, 199, 197, 59, 186, 66, 182, 38, 126, 221, 17, 96, 102, 99, 218, 185, 124, 152, 18, 240, 92, 241, 171, 178, 231, 64, 223, 228, 161, 110, 182, 217, 95, 166, 165, 113, 6, 203, 8, 254, 9, 241, 90, 157, 60, 194, 125, 210, 73, 213, 243, 16, 159, 123, 119, 162, 42, 178, 159, 91, 130, 235, 17, 142, 202, 65, 31, 213, 60, 108, 95, 53, 161, 25, 85, 114, 18, 117, 199, 73, 71, 168, 243, 188, 126, 180, 37, 10, 239, 179, 38, 227, 177, 184, 213, 193, 130, 45, 115, 2, 196, 136, 54, 99, 161, 163, 212, 189, 9, 142, 113, 251, 137, 138, 187, 11, 117, 189, 246, 30, 193, 150, 187, 60, 70, 108, 189, 10, 152, 108, 36, 102, 189, 204, 224, 8, 100, 72, 219, 66, 97, 53, 90, 23, 109, 82, 49, 94, 227, 67, 207, 146, 127, 199, 212, 174, 5, 115, 160, 81, 23, 44, 130, 49, 248, 2, 67, 94, 32, 231, 7, 238, 13, 65, 115, 85, 211, 138, 184, 26, 88, 21, 69, 115, 129, 30, 63, 79, 116, 118, 207, 139, 204, 42, 88, 114, 154, 26, 166, 116, 28, 189, 75, 201, 163, 102, 236, 156, 198, 58, 122, 99, 97, 179, 132, 66, 245, 26, 90, 49, 91, 69, 117, 71, 163, 122, 152, 220, 240, 131, 139, 80, 95, 199, 50, 34, 131, 99, 154, 8, 240, 77, 238, 85, 0, 60, 144, 102, 5, 83, 16, 174, 3, 125, 158, 231, 212, 80, 67, 109, 64, 129, 65, 152, 126, 217, 180, 3, 123, 31, 139, 40, 177, 229, 154, 149, 0, 9, 108, 240, 174, 68, 247, 2, 95, 106, 173, 104, 173, 73, 133, 174, 64, 164, 216, 90, 210, 114, 220, 105, 214, 232, 155, 157, 25, 103, 74, 72, 105, 6, 96, 3, 14, 168, 64, 0, 14, 74, 135, 241, 67, 80, 41, 107, 78, 44, 201, 206, 166, 31, 187, 72, 108, 29, 225, 109, 224, 21, 189, 198, 90, 74, 132, 170, 45, 181, 124, 167, 55, 178, 176, 245, 3, 121, 248, 88, 55, 57, 84, 168, 38, 97, 212, 185, 211, 75, 237, 191, 148, 160, 19, 135, 106, 139, 109, 230, 29, 169, 143, 40, 88, 55, 125, 152, 99, 211, 249, 146, 19, 108, 39, 87, 216, 202, 57, 193, 173, 54, 237, 94, 199, 249, 113, 60, 220, 114, 138, 147, 252, 244, 211, 29, 16, 5, 38, 145, 100, 157, 148, 247, 85, 131, 132, 234, 56, 134, 249, 247, 149, 240, 128, 102, 26, 196, 211, 204, 188, 41, 146, 59, 238, 60, 118, 144, 97, 167, 147, 181, 37, 102, 245, 87, 136, 136, 183, 194, 224, 215, 16, 26, 176, 144, 248, 243, 216, 151, 198, 208, 45, 25, 158, 102, 99, 84, 117, 57, 69, 24, 248, 8, 171, 198, 227, 0, 97, 117, 125, 39, 56, 98, 7, 78, 237, 199, 252, 17, 128, 35, 21, 191, 162, 252, 97, 165, 185, 20, 182, 71, 25, 192, 235, 193, 9, 108, 32, 162, 82, 45, 226, 247, 149, 106, 183, 197, 123, 208, 64, 32, 231, 114, 123, 249, 204, 31, 126, 229, 191, 93, 154, 255, 251, 163, 84, 109, 176, 62, 9, 91, 54, 135, 174, 214, 219, 244, 55, 159, 138, 47, 141, 95, 225, 222, 146, 81, 136, 14, 49, 71, 142, 141, 198, 178, 143, 42, 126, 67, 81, 73, 244, 110, 174, 53, 160, 244, 221, 117, 44, 13, 86, 181, 20, 163, 145, 49, 126, 196, 202, 24, 55, 167, 72, 21, 88, 64, 190, 217, 248, 29, 46, 25, 147, 233, 239, 109, 41, 178, 123, 54, 78, 205, 11, 77, 66, 172, 204, 254, 48, 206, 14, 170, 65, 25, 4, 88, 231, 174, 21, 231, 98, 191, 171, 70, 249, 226, 12, 15, 173, 103, 0, 52, 83, 81, 236, 239, 45, 4, 3, 243, 172, 42, 73, 19, 244, 141, 114, 119, 169, 73, 185, 221, 81, 46, 251, 25, 248, 147, 227, 140, 25, 133, 123, 209, 122, 68, 120, 188, 68, 131, 220, 204, 48, 59, 131, 50, 0, 63, 164, 97, 145, 194, 192, 196, 187, 250, 118, 225, 50, 121, 49, 17, 98, 221, 231, 79, 222, 91, 99, 124, 27, 226, 73, 141, 116, 188, 90, 55, 204, 111, 53, 54, 36, 225, 24, 179, 36, 97, 25, 224, 43, 204, 164, 245, 213, 62, 220, 246, 111, 166, 164, 10, 239, 90, 231, 156, 71, 192, 68, 16, 48, 152, 110, 158, 120, 170, 117, 188, 129, 88, 26, 66, 1, 172, 32, 102, 243, 220, 12, 165, 248, 190, 83, 143, 22, 45, 166, 182, 87, 198, 76, 59, 235, 90, 82, 147, 207, 219, 77, 15, 175, 33, 94, 132, 155, 247, 0, 233, 108, 219, 2, 115, 43, 239, 200, 102, 48, 22, 29, 127, 98, 33, 131, 111, 232, 27, 45, 119, 14, 138, 8, 165, 210, 165, 59, 92, 49, 87, 238, 157, 19, 109, 116, 34, 152, 203, 239, 125, 242, 148, 246, 83, 229, 231, 67, 221, 170, 75, 187, 111, 96, 105, 206, 20, 123, 222, 223, 9, 33, 251, 167, 255, 69, 65, 196, 201, 26, 44, 149, 169, 81, 133, 65, 107, 143, 168, 33, 169, 39, 12, 34, 37, 116, 244, 21, 198, 162, 120, 221, 110, 71, 169, 248, 173, 37, 178, 128, 28, 26, 113, 92, 144, 75, 42, 223, 212, 129, 210, 141, 135, 166, 193, 192, 97, 52, 222, 254, 23, 148, 9, 112, 114, 64, 84, 12, 0, 125, 189, 173, 232, 223, 134, 210, 13, 236, 70, 153, 231, 212, 20, 224, 146, 173, 139, 57, 190, 134, 118, 153, 147, 141, 236, 92, 50, 237, 88, 178, 184, 155, 140, 69, 133, 101, 211, 123, 101, 137, 130, 38, 50, 225, 155, 224, 53, 213, 65, 112, 198, 206, 81, 96, 203, 29, 141, 206, 29, 232, 124, 216, 35, 8, 62, 149, 236, 178, 118, 57, 28, 94, 86, 43, 220, 48, 108, 137, 108, 195, 130, 28, 212, 104, 37, 93, 83, 174, 52, 92, 137, 136, 245, 238, 54, 132, 123, 121, 136, 105, 15, 23, 185, 141, 208, 44, 117, 156, 169, 74, 234, 83, 135, 181, 51, 173, 98, 228, 101, 216, 166, 90, 42, 211, 115, 53, 198, 255, 53, 31, 204, 244, 146, 83, 100, 59, 103, 100, 81, 139, 131, 47, 109, 149, 157, 235, 100, 64, 188, 73, 77, 255, 230, 192, 121, 88, 233, 145, 46, 214, 145, 195, 177, 107, 1, 169, 44, 54, 69, 197, 68, 16, 16, 211, 16, 41, 134, 144, 71, 40, 46, 249, 160, 144, 31, 188, 218, 244, 180, 195, 35, 145, 40, 126, 240, 86, 250, 200, 74, 203, 70, 69, 84, 247, 148, 178, 102, 232, 217, 29, 244, 63, 41, 26, 206, 12, 208, 188, 160, 66, 96, 29, 86, 185, 152, 172, 183, 67, 182, 163, 158, 61, 102, 22, 162, 176, 127, 184, 115, 86, 214, 84, 179, 215, 43, 8, 32, 27, 18, 198, 40, 69, 143, 122, 55, 55, 223, 36, 87, 74, 116, 38, 173, 95, 4, 148, 104, 217, 54, 158, 80, 118, 68, 201, 80, 167, 172, 236, 11, 8, 3, 182, 231, 105, 248, 122, 83, 91, 190, 108, 124, 232, 144, 34, 30, 140, 1, 223, 30, 13, 33, 206, 8, 1, 116, 227, 249, 185, 192, 4, 233, 99, 7, 81, 144, 170, 102, 29, 7, 5, 87, 164, 208, 142, 13, 147, 99, 116, 47, 176, 157, 71, 76, 229, 175, 151, 190, 117, 238, 161, 140, 126, 154, 114, 180, 109, 197, 60, 160, 11, 117, 113, 139, 72, 90, 145, 223, 126, 26, 201, 46, 122, 157, 144, 164, 170, 154, 74, 54, 76, 213, 67, 33, 232, 148, 219, 175, 216, 59, 68, 148, 51, 30, 162, 24, 112, 162, 40, 8, 181, 90, 210, 95, 250, 35, 209, 11, 162, 205, 2, 241, 95, 18, 61, 11, 6, 90, 79, 128, 18, 110, 247, 101, 192, 234, 27, 38, 155, 204, 170, 160, 194, 35, 212, 120, 110, 174, 173, 19, 10, 66, 171, 122, 206, 171, 1, 209, 22, 166, 136, 66, 166, 203, 93, 90, 27, 82, 13, 158, 240, 229, 146, 152, 71, 67, 152, 107, 142, 44, 196, 232, 54, 36, 188, 124, 55, 50, 233, 162, 60, 143, 197, 182, 77, 110, 109, 87, 254, 90, 79, 17, 102, 226, 93, 222, 158, 110, 239, 210, 198, 179, 5, 50, 42, 156, 176, 5, 177, 27, 249, 68, 0, 187, 12, 115, 74, 112, 137, 39, 176, 122, 69, 69, 138, 17, 215, 146, 56, 43, 68, 4, 249, 214, 116, 40, 27, 97, 79, 13, 190, 147, 73, 27, 111, 70, 178, 119, 109, 108, 188, 243, 136, 192, 39, 30, 74, 240, 247, 103, 121, 55, 51, 207, 225, 5, 98, 186, 68, 147, 229, 160, 13, 92, 57, 193, 90, 130, 235, 169, 255, 92, 162, 111, 143, 244, 67, 83, 68, 23, 140, 96, 32, 91, 24, 238, 76, 85, 235, 104, 111, 221, 13, 159, 85, 162, 98, 242, 60, 137, 64, 25, 248, 161, 233, 176, 134, 117, 35, 128, 69, 199, 149, 178, 73, 219, 5, 27, 165, 40, 31, 28, 17, 2, 217, 119, 10, 80, 102, 140, 22, 214, 243, 96, 35, 87, 61, 225, 211, 101, 235, 249, 232, 211, 175, 52, 136, 197, 21, 125, 175, 194, 6, 252, 236, 9, 18, 139, 76, 85, 88, 173, 19, 238, 191, 220, 28, 29, 225, 9, 88, 23, 211, 214, 102, 232, 121, 143, 243, 133, 66, 152, 113, 159, 120, 114, 177, 77, 51, 44, 176, 78, 165, 41, 182, 156, 139, 101, 89, 0, 43, 60, 178, 117, 161, 19, 17, 29, 9, 71, 38, 75, 70, 176, 161, 253, 47, 35, 75, 129, 198, 163, 219, 120, 3, 49, 32, 70, 134, 81, 62, 62, 236, 194, 82, 106, 132, 113, 138, 5, 40, 178, 48, 80, 151, 204, 209, 117, 201, 208, 89, 209, 130, 50, 66, 137, 242, 219, 157, 9, 186, 112, 202, 119, 138, 43, 241, 249, 46, 200, 126, 31, 27, 3, 119, 210, 152, 232, 126, 119, 116, 239, 79, 245, 79, 189, 48, 234, 24, 193, 98, 172, 103, 103, 7, 188, 95, 183, 218, 250, 187, 230, 48, 173, 251, 206, 246, 244, 233, 56, 163, 21, 23, 155, 101, 135, 29, 94, 4, 27, 194, 130, 146, 177, 228, 245, 191, 85, 9, 243, 101, 174, 242, 230, 183, 221, 66, 169, 52, 217, 74, 73, 47, 16, 174, 199, 174, 236, 138, 59, 88, 131, 209, 190, 146, 212, 5, 126, 237, 23, 43, 112, 107, 85, 53, 245, 47, 214, 10, 165, 155, 170, 227, 242, 91, 253, 25, 151, 177, 80, 22, 69, 42, 197, 119, 193, 18, 70, 115, 36, 18, 118, 57, 93, 194, 23, 84, 154, 40, 66, 194, 238, 31, 241, 251, 215, 147, 250, 144, 65, 168, 67, 128, 213, 2, 210, 39, 193, 34, 4, 29, 111, 112, 25, 249, 169, 1, 157, 135, 246, 133, 148, 202, 202, 72, 208, 231, 115, 19, 123, 246, 9, 168, 182, 85, 181, 26, 184, 157, 236, 238, 146, 87, 141, 13, 30, 82, 23, 22, 76, 35, 123, 61, 53, 148, 248, 52, 49, 84, 72, 238, 109, 106, 69, 159, 230, 51, 229, 164, 61, 192, 192, 52, 172, 173, 121, 35, 209, 109, 154, 199, 51, 45, 255, 29, 66, 154, 251, 78, 14, 205, 6, 166, 20, 118, 225, 82, 242, 122, 89, 184, 105, 91, 232, 232, 36, 254, 8, 147, 188, 247, 201, 227, 123, 132, 66, 178, 130, 166, 246, 162, 213, 195, 204, 53, 230, 201, 219, 161, 254, 65, 134, 224, 52, 61, 92, 115, 135, 127, 130, 225, 130, 188, 60, 35, 146, 126, 246, 50, 216, 171, 206, 209, 193, 222, 29, 57, 236, 252, 61, 184, 236, 74, 180, 23, 197, 160, 46, 25, 22, 144, 114, 224, 53, 164, 147, 179, 190, 98, 200, 197, 50, 153, 163, 153, 240, 205, 73, 94, 129, 40, 225, 2, 132, 61, 241, 227, 99, 9, 206, 10, 244, 61, 16, 2, 204, 37, 103, 242, 104, 28, 132, 115, 153, 186, 27, 102, 215, 98, 254, 149, 188, 50, 52, 184, 139, 133, 54, 210, 81, 77, 215, 134, 70, 70, 56, 83, 64, 237, 5, 175, 232, 241, 64, 34, 237, 149, 117, 112, 136, 26, 240, 126, 71, 131, 27, 248, 73, 249, 150, 227, 212, 13, 141, 158, 95, 83, 46, 225, 74, 116, 112, 90, 252, 58, 102, 95, 58, 186, 138, 60, 204, 74, 0, 235, 103, 141, 117, 40, 48, 175, 208, 192, 30, 88, 253, 35, 1, 212, 172, 63, 176, 12, 149, 222, 34, 41, 71, 192, 86, 224, 88, 217, 16, 133, 235, 4, 70, 205, 25, 154, 138, 33, 243, 32, 176, 250, 65, 82, 107, 42, 184, 230, 159, 165, 30, 54, 62, 111, 235, 222, 214, 173, 232, 15, 22, 52, 10, 66, 205, 42, 11, 144, 212, 214, 45, 177, 229, 128, 5, 189, 248, 35, 169, 215, 78, 15, 149, 188, 162, 209, 253, 193, 239, 244, 183, 37, 233, 157, 190, 203, 172, 86, 163, 49, 91, 41, 166, 98, 137, 88, 31, 76, 157, 204, 185, 162, 36, 169, 111, 212, 107, 59, 47, 16, 193, 109, 235, 128, 230, 166, 239, 157, 14, 23, 13, 176, 237, 152, 255, 147, 93, 114, 117, 39, 23, 178, 75, 67, 183, 124, 38, 140, 121, 186, 74, 115, 178, 9, 197, 118, 1, 23, 222, 221, 151, 92, 64, 145, 130, 131, 245, 205, 21, 189, 155, 201, 244, 155, 239, 101, 67, 186, 249, 9, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 192, 52, 174, 242, 81, 205, 211, 61, 25, 139, 159, 177, 105, 41, 30, 42, 213, 46, 197, 53, 167, 58, 7, 239, 29, 185, 82, 211, 68, 212, 184, 107, 226, 41, 43, 224, 22, 195, 136, 195, 83, 229, 114, 175, 66, 156, 29, 234, 244, 207, 2, 130, 205, 111, 77, 101, 218, 137, 131, 12, 134, 83, 223, 104, 127, 53, 221, 160, 131, 7, 177, 14, 230, 144, 57, 252, 186, 129, 17, 232, 197, 196, 98, 209, 1, 45, 125, 38, 79, 78, 79, 205, 86, 137, 34, 148, 236, 104, 255, 148, 126, 139, 170, 152, 81, 124, 241, 99, 85, 64, 219, 190, 41, 26, 241, 189, 46, 120, 146, 174, 125, 38, 89, 232, 191, 159, 41, 60, 59, 124, 3, 83, 90, 193, 179, 178, 218, 237, 71, 118, 84, 146, 132, 171, 138, 85, 203, 68, 215, 196, 179, 144, 14, 177, 7, 131, 178, 35, 178, 60, 195, 206, 133, 204, 114, 45, 244, 85, 215, 54, 6, 195, 13, 21, 169, 53, 170, 193, 40, 111, 41, 129, 135, 1, 7, 231, 11, 30, 182, 1, 49, 39, 153, 125, 42, 194, 181, 161, 31, 225, 12, 7, 203, 136, 56, 221, 249, 243, 10, 70, 40, 7, 185, 44, 130, 246, 110, 117, 80, 156, 16, 107, 9, 208, 52, 225, 196, 107, 78, 99, 182, 163, 75, 85, 211, 230, 155, 237, 90, 188, 158, 228, 168, 219, 214, 1, 214, 10, 208, 65, 24, 6, 106, 197, 31, 24, 182, 90, 212, 193, 164, 165, 72, 252, 129, 220, 23, 60, 110, 87, 37, 248, 212, 75, 104, 132, 28, 240, 211, 62, 28, 98, 56, 14, 84, 116, 201, 72, 203, 112, 226, 194, 235, 85, 186, 124, 193, 204, 158, 88, 88, 154, 237, 87, 112, 209, 204, 251, 167, 218, 9, 3, 92, 176, 47, 83, 94, 17, 116, 73, 210, 76, 89, 65, 53, 117, 81, 135, 24, 123, 72, 228, 209, 12, 130, 113, 64, 15, 0, 129, 145, 180, 246, 137, 98, 85, 142, 28, 11, 98, 31, 212, 141, 27, 126, 36, 194, 225, 96, 107, 28, 56, 46, 129, 86, 211, 202, 198, 8, 130, 145, 168, 251, 168, 47, 190, 124, 154, 7, 24, 236, 155, 6, 216, 2, 52, 183, 14, 81, 237, 145, 106, 163, 57, 70, 110, 201, 195, 76, 225, 169, 141, 27, 123, 4, 168, 127, 46, 127, 235, 142, 233, 238, 31, 216, 199, 11, 226, 248, 73, 60, 46, 31, 130, 42, 199, 120, 19, 114, 194, 175, 145, 98, 24, 241, 112, 251, 162, 211, 147, 73, 105, 44, 119, 124, 155, 203, 208, 30, 84, 236, 50, 175, 194, 84, 2, 84, 57, 101, 137, 115, 18, 205, 178, 85, 140, 239, 187, 40, 123, 255, 215, 212, 221, 248, 8, 108, 82, 221, 132, 14, 109, 202, 131, 101, 219, 111, 5, 104, 94, 147, 8, 157, 43, 127, 65, 229, 59, 138, 201, 160, 29, 119, 166, 145, 221, 160, 237, 117, 188, 140, 19, 233, 86, 27, 112, 176, 201, 67, 209, 58, 131, 86, 64, 101, 220, 165, 73, 191, 134, 42, 233, 90, 100, 18, 227, 209, 125, 238, 13, 77, 212, 120, 177, 12, 53, 15, 253, 142, 192, 182, 156, 74, 171, 128, 12, 35, 10, 156, 182, 209, 168, 84, 192, 114, 145, 152, 124, 207, 225, 128, 108, 54, 189, 60, 250, 115, 88, 184, 129, 7, 54, 68, 99, 212, 251, 57, 193, 136, 36, 125, 173, 9, 110, 84, 241, 59, 165, 113, 22, 152, 51, 85, 215, 160, 211, 164, 74, 19, 92, 36, 28, 182, 244, 9, 168, 250, 79, 123, 164, 160, 207, 240, 29, 29, 91, 38, 31, 188, 16, 228, 118, 149, 198, 198, 123, 14, 133, 20, 110, 176, 129, 138, 94, 248, 218, 77, 108, 191, 3, 141, 69, 248, 163, 99, 44, 87, 208, 18, 202, 33, 184, 40, 2, 222, 223, 120, 144, 93, 173, 140, 217, 214, 57, 15, 78, 141, 161, 248, 165, 4, 189, 14, 213, 23, 46, 113, 141, 18, 31, 137, 224, 228, 19, 62, 168, 70, 248, 204, 171, 125, 122, 155, 19, 50, 210, 89, 69, 6, 23, 241, 173, 182, 133, 86, 219, 241, 9, 215, 247, 155, 68, 18, 22, 107, 167, 120, 118, 169, 9, 221, 231, 153, 100, 199, 129, 43, 239, 122, 102, 79, 161, 133, 75, 74, 184, 210, 30, 175, 5, 20, 8, 48, 208, 5, 219, 33, 224, 96, 252, 1, 42, 19, 38, 147, 44, 197, 172, 222, 84, 156, 79, 217, 103, 46, 60, 174, 144, 121, 208, 111, 207, 54, 16, 163, 104, 156, 10, 207, 160, 151, 193, 121, 38, 251, 43, 200, 28, 137, 109, 22, 140, 17, 13, 95, 69, 119, 61, 222, 131, 92, 105, 130, 56, 96, 236, 209, 218, 51, 172, 213, 244, 44, 64, 60, 88, 192, 199, 41, 83, 141, 237, 224, 62, 187, 134, 251, 89, 48, 18, 12, 121, 63, 28, 218, 86, 160, 86, 109, 99, 206, 2, 236, 50, 26, 239, 237, 63, 12, 102, 84, 252, 215, 145, 131, 231, 49, 212, 54, 43, 99, 224, 120, 178, 36, 106, 99, 92, 77, 4, 176, 3, 99, 0, 188, 98, 168, 58, 123, 240, 159, 102, 55, 108, 176, 198, 49, 8, 141, 220, 122, 216, 43, 55, 35, 106, 133, 53, 123, 69, 84, 167, 23, 9, 209, 194, 29, 186, 63, 184, 71, 241, 49, 33, 47, 88, 39, 65, 91, 85, 92, 198, 126, 212, 129, 102, 167, 100, 174, 89, 228, 134, 42, 212, 208, 194, 252, 67, 150, 198, 132, 209, 16, 209, 249, 44, 238, 138, 179, 128, 92, 6, 197, 10, 134, 97, 232, 147, 219, 143, 72, 209, 83, 35, 210, 182, 162, 183, 213, 125, 47, 156, 218, 18, 194, 137, 234, 117, 231, 112, 250, 48, 146, 123, 141, 174, 61, 213, 177, 251, 162, 214, 211, 122, 171, 155, 211, 117, 228, 198, 235, 155, 225, 14, 85, 57, 54, 8, 168, 75, 216, 68, 135, 19, 133, 24, 26, 138, 111, 72, 0, 250, 101, 237, 246, 137, 8, 38, 83, 123, 237, 250, 104, 106, 31, 217, 235, 103, 177, 73, 174, 208, 233, 230, 69, 77, 161, 21, 10, 223, 157, 62, 232, 133, 80, 117, 214, 254, 247, 93, 53, 45, 130, 226, 118, 216, 149, 78, 143, 25, 30, 110, 134, 48, 72, 1, 107, 197, 211, 48, 235, 82, 179, 54, 95, 171, 91, 36, 188, 53, 85, 24, 216, 236, 79, 62, 90, 52, 157, 175, 171, 127, 132, 118, 187, 200, 5, 60, 22, 6, 117, 78, 242, 169, 102, 46, 74, 185, 188, 138, 221, 79, 49, 13, 247, 196, 176, 199, 53, 220, 208, 175, 132, 8, 186, 175, 76, 125, 227, 33, 44, 193, 209, 17, 52, 110, 227, 212, 139, 93, 154, 218, 220, 57, 5, 255, 119, 252, 7, 69, 145, 109, 118, 76, 45, 48, 20, 218, 123, 26, 193, 203, 254, 58, 206, 189, 91, 87, 28, 112, 27, 204, 145, 8, 8, 203, 83, 199, 179, 70, 32, 208, 8, 44, 44, 217, 69, 93, 32, 74, 13, 105, 100, 232, 134, 89, 67, 98, 52, 242, 113, 109, 36, 244, 169, 115, 146, 186, 48, 75, 128, 102, 149, 174, 100, 5, 87, 23, 88, 161, 184, 135, 198, 80, 194, 179, 150, 4, 182, 153, 124, 63, 34, 251, 63, 73, 37, 18, 188, 143, 151, 211, 2, 11, 182, 108, 6, 109, 9, 192, 85, 67, 251, 113, 129, 185, 10, 81, 246, 134, 57, 249, 181, 39, 2, 172, 177, 69, 221, 100, 77, 234, 159, 108, 192, 187, 22, 239, 204, 26, 94, 199, 59, 193, 124, 97, 107, 238, 43, 72, 36, 172, 173, 100, 3, 161, 92, 128, 18, 51, 253, 186, 99, 120, 241, 227, 110, 163, 21, 128, 76, 0, 148, 199, 82, 165, 71, 150, 145, 226, 233, 70, 52, 185, 206, 113, 110, 186, 143, 46, 101, 113, 96, 134, 203, 115, 46, 55, 192, 157, 132, 213, 103, 74, 56, 60, 226, 172, 157, 32, 97, 223, 104, 48, 125, 83, 201, 108, 78, 237, 12, 215, 156, 61, 116, 134, 118, 63, 200, 81, 7, 47, 77, 30, 241, 4, 137, 72, 8, 91, 145, 131, 254, 195, 186, 45, 197, 110, 40, 219, 97, 152, 169, 225, 55, 192, 230, 111, 60, 241, 161, 50, 177, 243, 51, 234, 106, 27, 142, 1, 189, 193, 154, 186, 97, 14, 148, 58, 207, 191, 184, 68, 201, 243, 178, 192, 239, 119, 184, 134, 119, 241, 66, 223, 13, 66, 95, 251, 229, 94, 98, 209, 155, 193, 245, 65, 137, 119, 28, 21, 248, 157, 7, 38, 235, 152, 149, 26, 232, 137, 163, 244, 168, 119, 255, 98, 154, 244, 184, 192, 128, 41, 22, 106, 88, 67, 221, 88, 250, 13, 146, 186, 159, 222, 62, 120, 192, 209, 111, 237, 74, 128, 194, 125, 45, 48, 161, 135, 15, 178, 28, 138, 107, 200, 198, 196, 70, 193, 133, 132, 133, 166, 177, 202, 99, 13, 217, 192, 252, 46, 121, 76, 53, 138, 194, 89, 188, 116, 79, 121, 226, 110, 5, 152, 64, 100, 50, 210, 195, 168, 80, 1, 241, 155, 92, 104, 113, 111, 242, 97, 185, 175, 105, 220, 50, 208, 175, 77, 147, 100, 181, 2, 190, 96, 109, 124, 113, 30, 81, 143, 151, 17, 71, 202, 252, 10, 155, 190, 218, 183, 185, 200, 67, 199, 111, 150, 251, 13, 147, 58, 133, 186, 141, 249, 64, 223, 148, 110, 28, 236, 49, 22, 57, 17, 73, 146, 239, 146, 30, 234, 88, 167, 108, 235, 12, 88, 131, 33, 37, 202, 137, 81, 186, 89, 6, 6, 72, 210, 191, 90, 124, 235, 98, 144, 97, 245, 49, 67, 169, 106, 190, 157, 56, 227, 0, 196, 55, 177, 246, 5, 171, 178, 130, 214, 132, 191, 0, 218, 236, 129, 191, 155, 129, 241, 33, 208, 156, 254, 132, 121, 163, 189, 231, 51, 180, 21, 190, 87, 29, 5, 102, 185, 218, 136, 248, 113, 65, 209, 238, 177, 109, 248, 167, 189, 241, 181, 115, 24, 89, 95, 67, 115, 211, 244, 218, 63, 79, 148, 168, 238, 47, 110, 82, 130, 96, 55, 120, 139, 149, 120, 204, 85, 249, 232, 88, 139, 152, 111, 170, 143, 209, 129, 105, 87, 50, 12, 192, 50, 227, 191, 29, 194, 102, 243, 193, 142, 62, 49, 248, 188, 92, 11, 60, 228, 133, 100, 209, 8, 246, 85, 143, 169, 197, 81, 169, 72, 51, 102, 19, 210, 249, 185, 78, 200, 179, 42, 40, 111, 94, 84, 221, 156, 90, 2, 216, 95, 53, 92, 217, 172, 192, 97, 130, 77, 87, 163, 65, 112, 45, 250, 81, 131, 95, 4, 68, 136, 139, 240, 43, 141, 251, 195, 36, 31, 179, 197, 10, 76, 230, 247, 154, 134, 215, 76, 134, 240, 248, 151, 186, 16, 253, 99, 129, 147, 47, 55, 53, 116, 139, 65, 64, 44, 29, 168, 200, 169, 8, 118, 38, 100, 162, 124, 48, 46, 137, 246, 255, 39, 156, 70, 228, 139, 6, 35, 67, 229, 235, 18, 114, 66, 206, 217, 236, 11, 86, 119, 106, 120, 177, 150, 118, 52, 6, 204, 14, 4, 196, 40, 149, 120, 162, 11, 143, 168, 138, 248, 243, 62, 123, 15, 78, 255, 23, 100, 206, 115, 143, 144, 114, 210, 165, 115, 161, 73, 211, 146, 104, 185, 127, 166, 117, 50, 63, 25, 242, 101, 119, 219, 108, 208, 71, 204, 116, 138, 226, 175, 178, 243, 52, 238, 124, 85, 161, 173, 70, 233, 141, 108, 161, 84, 14, 226, 235, 12, 28, 16, 249, 79, 198, 120, 192, 204, 17, 138, 231, 159, 81, 25, 130, 216, 29, 246, 62, 212, 113, 237, 67, 131, 145, 221, 189, 143, 137, 244, 17, 214, 165, 13, 205, 92, 172, 241, 8, 205, 146, 131, 246, 97, 210, 91, 107, 167, 251, 32, 155, 208, 141, 74, 184, 228, 40, 237, 171, 12, 29, 152, 31, 144, 168, 66, 216, 171, 187, 23, 118, 55, 159, 194, 137, 51, 119, 14, 95, 153, 62, 186, 38, 69, 119, 144, 155, 50, 15, 54, 37, 88, 32, 225, 3, 105, 136, 254, 28, 104, 210, 231, 16, 238, 109, 37, 117, 150, 0, 253, 121, 33, 14, 83, 178, 187, 112, 57, 96, 197, 72, 0, 164, 107, 236, 45, 138, 56, 214, 34, 5, 141, 86, 227, 107, 107, 110, 121, 191, 132, 151, 203, 91, 158, 82, 180, 65, 249, 109, 94, 169, 45, 25, 99, 86, 87, 79, 140, 44, 141, 40, 166, 128, 206, 146, 244, 31, 200, 192, 125, 35, 161, 202, 241, 225, 82, 44, 114, 189, 42, 135, 50, 99, 166, 200, 107, 92, 178, 232, 4, 88, 33, 27, 122, 192, 174, 138, 147, 154, 54, 111, 75, 46, 159, 73, 34, 154, 255, 102, 16, 123, 161, 222, 172, 154, 208, 206, 23, 69, 76, 84, 152, 153, 178, 151, 12, 41, 104, 98, 214, 142, 202, 114, 183, 30, 242, 8, 237, 182, 133, 229, 57, 209, 32, 164, 139, 247, 137, 6, 42, 127, 100, 170, 141, 113, 52, 13, 52, 137, 66, 237, 43, 61, 149, 191, 124, 73, 232, 14, 109, 168, 151, 164, 237, 141, 6, 228, 197, 168, 143, 4, 171, 113, 28, 46, 228, 101, 111, 198, 205, 32, 110, 35, 49, 127, 95, 207, 11, 155, 221, 27, 85, 188, 14, 127, 211, 19, 208, 139, 67, 182, 153, 229, 29, 214, 156, 191, 29, 10, 66, 187, 194, 168, 194, 246, 234, 118, 170, 194, 82, 179, 242, 24, 58, 142, 24, 232, 103, 109, 114, 210, 10, 237, 8, 201, 66, 125, 245, 52, 129, 60, 10, 211, 199, 73, 152, 116, 175, 216, 111, 213, 141, 162, 172, 78, 204, 92, 182, 12, 158, 165, 129, 98, 54, 130, 236, 12, 47, 203, 63, 133, 20, 225, 128, 178, 150, 84, 94, 228, 236, 54, 44, 68, 65, 204, 84, 216, 7, 253, 22, 254, 225, 203, 108, 200, 59, 166, 91, 70, 119, 185, 166, 175, 76, 129, 175, 203, 58, 205, 39, 126, 15, 239, 104, 20, 95, 127, 161, 196, 28, 88, 51, 11, 232, 44, 119, 45, 25, 32, 240, 237, 147, 222, 74, 129, 161, 39, 7, 235, 65, 113, 108, 75, 194, 117, 54, 46, 48, 252, 23, 145, 253, 146, 26, 193, 71, 31, 93, 190, 129, 74, 30, 64, 22, 204, 73, 25, 56, 130, 29, 202, 84, 67, 84, 150, 164, 154, 229, 67, 49, 125, 31, 114, 44, 74, 83, 199, 26, 129, 218, 21, 91, 180, 169, 142, 104, 114, 150, 34, 97, 39, 153, 115, 240, 90, 71, 179, 198, 137, 15, 66, 82, 243, 142, 188, 61, 73, 39, 162, 29, 127, 183, 2, 204, 3, 194, 51, 47, 29, 7, 155, 6, 98, 225, 25, 98, 224, 30, 47, 152, 184, 23, 80, 115, 202, 48, 161, 23, 137, 32, 230, 210, 45, 42, 173, 117, 116, 181, 11, 250, 108, 100, 129, 45, 98, 77, 208, 215, 113, 103, 107, 140, 17, 213, 253, 202, 22, 158, 153, 224, 216, 53, 131, 125, 60, 138, 229, 199, 236, 168, 121, 174, 126, 204, 113, 113, 66, 147, 2, 58, 143, 50, 120, 123, 27, 55, 132, 118, 255, 152, 128, 137, 97, 145, 144, 164, 102, 71, 95, 59, 57, 109, 99, 172, 77, 159, 69, 81, 107, 38, 58, 81, 173, 30, 17, 123, 58, 208, 159, 212, 204, 195, 146, 48, 129, 223, 62, 74, 34, 161, 188, 185, 150, 124, 2, 175, 205, 241, 202, 161, 7, 50, 19, 78, 41, 248, 70, 9, 211, 53, 242, 147, 222, 158, 230, 133, 149, 90, 83, 177, 133, 78, 189, 246, 129, 242, 39, 93, 171, 33, 26, 131, 211, 140, 34, 230, 172, 138, 61, 193, 246, 253, 205, 210, 92, 248, 181, 219, 3, 47, 200, 24, 91, 124, 122, 15, 213, 192, 115, 177, 196, 142, 141, 121, 98, 28, 202, 32, 156, 46, 6, 34, 21, 164, 212, 186, 205, 85, 161, 61, 176, 237, 250, 33, 184, 250, 248, 154, 133, 16, 186, 207, 2, 199, 145, 74, 196, 234, 201, 66, 76, 221, 85, 66, 241, 112, 97, 15, 52, 249, 211, 90, 132, 14, 74, 167, 81, 28, 184, 221, 51, 158, 96, 161, 144, 80, 7, 154, 174, 61, 234, 66, 93, 40, 229, 187, 186, 239, 121, 90, 137, 103, 229, 48, 116, 19, 212, 231, 195, 114, 57, 28, 234, 149, 211, 73, 204, 202, 52, 71, 112, 132, 143, 103, 10, 83, 205, 185, 251, 62, 174, 243, 32, 121, 28, 252, 92, 167, 231, 119, 110, 129, 14, 233, 37, 69, 120, 15, 90, 41, 124, 169, 196, 161, 137, 0, 217, 44, 15, 93, 212, 239, 58, 181, 20, 176, 159, 162, 74, 229, 41, 99, 14, 145, 65, 31, 224, 179, 30, 132, 226, 71, 18, 132, 48, 78, 33, 247, 86, 205, 28, 197, 175, 204, 126, 44, 140, 66, 13, 112, 183, 84, 3, 143, 214, 80, 133, 126, 145, 143, 34, 77, 23, 146, 177, 165, 151, 70, 240, 223, 116, 115, 25, 212, 248, 27, 113, 47, 200, 90, 132, 56, 26, 94, 0, 76, 138, 174, 112, 47, 54, 107, 193, 149, 73, 53, 142, 218, 91, 57, 238, 46, 178, 154, 71, 19, 189, 166, 196, 94, 170, 218, 133, 118, 205, 225, 108, 153, 24, 237, 27, 111, 37, 90, 14, 100, 15, 229, 18, 128, 213, 4, 155, 143, 166, 39, 142, 206, 78, 189, 91, 166, 159, 129, 30, 7, 139, 72, 227, 164, 164, 161, 100, 94, 162, 55, 49, 248, 189, 179, 206, 146, 255, 91, 179, 82, 6, 138, 24, 141, 171, 146, 217, 50, 135, 32, 203, 177, 27, 91, 24, 204, 252, 137, 121, 90, 226, 43, 35, 226, 246, 38, 72, 212, 172, 188, 173, 69, 107, 148, 163, 88, 125, 144, 127, 44, 41, 190, 71, 0, 88, 70, 175, 189, 233, 55, 206, 220, 185, 192, 197, 165, 193, 87, 146, 249, 94, 72, 59, 57, 43, 52, 203, 194, 56, 221, 21, 130, 183, 78, 75, 154, 67, 18, 74, 151, 201, 38, 202, 108, 61, 8, 29, 98, 62, 172, 77, 155, 227, 189, 10, 116, 179, 50, 165, 152, 74, 209, 96, 200, 230, 180, 188, 191, 165, 245, 108, 36, 26, 37, 17, 167, 125, 120, 111, 236, 211, 66, 183, 1, 251, 79, 34, 26, 121, 28, 136, 33, 149, 17, 174, 43, 206, 137, 77, 10, 173, 243, 111, 73, 106, 241, 252, 70, 43, 147, 120, 40, 229, 121, 201, 69, 195, 63, 43, 87, 45, 203, 174, 214, 181, 35, 46, 226, 47, 44, 56, 123, 56, 73, 166, 252, 144, 150, 100, 73, 156, 177, 225, 105, 161, 41, 226, 162, 167, 132, 45, 62, 211, 104, 16, 89, 173, 255, 70, 194, 254, 186, 130, 50, 135, 121, 197, 147, 84, 97, 49, 107, 26, 164, 189, 151, 234, 39, 72, 117, 21, 92, 43, 119, 110, 45, 209, 172, 192, 131, 45, 2, 99, 179, 131, 248, 69, 144, 223, 23, 151, 0, 196, 64, 161, 172, 49, 56, 114, 108, 68, 134, 160, 209, 154, 30, 240, 206, 156, 140, 80, 70, 34, 218, 43, 187, 80, 209, 26, 166, 69, 4, 240, 135, 148, 68, 64, 170, 244, 134, 32, 69, 87, 50, 135, 112, 91, 71, 0, 134, 245, 80, 30, 27, 12, 234, 212, 223, 168, 27, 78, 19, 126, 77, 138, 121, 75, 51, 47, 44, 5, 253, 227, 88, 41, 226, 189, 183, 124, 184, 68, 210, 6, 171, 77, 78, 221, 154, 78, 229, 88, 147, 147, 21, 119, 13, 251, 71, 89, 237, 224, 152, 21, 88, 234, 234, 130, 74, 119, 115, 27, 8, 139, 155, 243, 195, 29, 196, 213, 5, 161, 117, 41, 246, 92, 204, 143, 186, 229, 59, 18, 76, 171, 224, 152, 224, 82, 193, 115, 208, 9, 84, 177, 130, 178, 122, 251, 216, 39, 253, 73, 199, 154, 88, 236, 215, 219, 154, 195, 11, 235, 165, 217, 212, 248, 65, 43, 0, 112, 35, 39, 18, 238, 212, 151, 187, 53, 30, 235, 202, 217, 163, 177, 80, 70, 97, 90, 98, 174, 5, 163, 246, 219, 124, 216, 253, 43, 114, 108, 69, 2, 242, 77, 85, 51, 91, 7, 226, 100, 238, 213, 183, 55, 47, 222, 65, 222, 75, 49, 102, 29, 20, 10, 103, 232, 107, 0, 27, 247, 112, 177, 121, 185, 250, 215, 18, 78, 186, 87, 112, 147, 225, 75, 236, 241, 197, 161, 123, 146, 132, 217, 240, 98, 201, 17, 53, 82, 60, 237, 232, 92, 177, 174, 1, 51, 12, 54, 226, 215, 58, 61, 186, 15, 135, 103, 195, 176, 10, 74, 110, 97, 106, 100, 112, 153, 16, 115, 248, 136, 36, 43, 245, 26, 211, 246, 143, 10, 112, 14, 176, 86, 8, 62, 93, 100, 135, 160, 125, 244, 49, 17, 192, 63, 42, 110, 36, 61, 93, 14, 16, 41, 98, 232, 84, 222, 245, 155, 24, 210, 135, 16, 84, 204, 214, 83, 67, 255, 217, 117, 85, 99, 107, 3, 247, 112, 24, 143, 221, 99, 49, 222, 12, 113, 185, 146, 231, 24, 10, 163, 80, 92, 208, 40, 35, 42, 4, 179, 164, 133, 228, 238, 37, 194, 173, 2, 132, 221, 127, 26, 108, 192, 48, 29, 100, 252, 150, 41, 204, 9, 103, 1, 14, 158, 249, 155, 88, 236, 122, 184, 21, 190, 12, 42, 239, 63, 211, 105, 218, 77, 199, 63, 86, 126, 40, 209, 229, 23, 173, 73, 180, 54, 17, 136, 94, 9, 80, 145, 207, 18, 196, 81, 163, 232, 195, 15, 97, 189, 3, 77, 171, 13, 209, 115, 43, 111, 139, 101, 26, 181, 212, 49, 27, 98, 60, 243, 94, 127, 50, 134, 131, 80, 13, 83, 89, 166, 11, 230, 42, 243, 219, 131, 143, 64, 179, 1, 44, 206, 1, 25, 71, 47, 102, 1, 174, 91, 96, 145, 66, 205, 155, 46, 175, 197, 35, 134, 19, 142, 96, 224, 80, 249, 187, 203, 133, 189, 178, 243, 148, 190, 210, 96, 235, 209, 39, 47, 228, 34, 95, 211, 22, 212, 179, 144, 17, 7, 167, 105, 181, 197, 163, 21, 92, 227, 106, 99, 97, 69, 82, 75, 81, 252, 134, 112, 88, 12, 199, 223, 255, 127, 120, 203, 252, 45, 155, 20, 111, 208, 148, 38, 62, 26, 44, 198, 171, 101, 105, 55, 59, 34, 149, 250, 144, 241, 173, 52, 152, 11, 206, 218, 250, 31, 106, 194, 66, 21, 172, 43, 23, 96, 152, 74, 41, 111, 46, 57, 67, 46, 115, 157, 120, 32, 244, 181, 120, 138, 172, 192, 72, 145, 198, 4, 153, 118, 250, 158, 115, 197, 143, 215, 34, 193, 194, 184, 38, 232, 194, 11, 238, 179, 12, 171, 247, 147, 122, 216, 224, 15, 240, 70, 64, 139, 209, 176, 39, 37, 185, 63, 97, 103, 177, 114, 120, 230, 242, 13, 34, 185, 145, 67, 129, 107, 21, 250, 38, 222, 4, 102, 72, 61, 149, 25, 82, 132, 101, 245, 189, 223, 10, 48, 15, 181, 35, 98, 9, 193, 88, 8, 9, 178, 105, 94, 34, 146, 236, 134, 168, 46, 201, 101, 93, 30, 11, 6, 30, 76, 87, 11, 46, 168, 244, 47, 150, 194, 127, 252, 157, 124, 161, 197, 169, 21, 17, 224, 26, 55, 22, 112, 96, 0, 46, 220, 143, 129, 166, 108, 155, 239, 158, 186, 125, 240, 44, 54, 141, 156, 129, 184, 216, 180, 189, 158, 14, 197, 64, 97, 152, 154, 39, 159, 106, 74, 166, 252, 70, 203, 206, 30, 218, 69, 26, 139, 113, 26, 68, 177, 99, 237, 180, 12, 66, 108, 95, 8, 136, 80, 81, 206, 131, 94, 203, 20, 229, 54, 14, 70, 50, 176, 87, 128, 171, 187, 37, 118, 77, 147, 114, 186, 163, 3, 198, 64, 85, 226, 183, 5, 182, 14, 213, 237, 27, 89, 154, 51, 218, 52, 253, 88, 56, 106, 3, 52, 10, 165, 125, 60, 174, 246, 189, 50, 27, 253, 116, 62, 247, 131, 198, 18, 119, 202, 10, 60, 233, 29, 6, 46, 39, 204, 152, 116, 182, 243, 99, 52, 230, 84, 207, 220, 58, 27, 222, 198, 85, 142, 186, 46, 182, 163, 65, 94, 109, 13, 50, 127, 209, 124, 50, 2, 55, 128, 139, 183, 23, 15, 168, 159, 36, 109, 138, 41, 12, 175, 132, 224, 65, 70, 52, 80, 2, 179, 46, 220, 218, 110, 187, 70, 230, 200, 212, 235, 95, 35, 160, 155, 161, 34, 168, 200, 173, 13, 3, 229, 241, 25, 186, 115, 182, 157, 24, 88, 100, 80, 207, 59, 128, 100, 106, 141, 146, 170, 121, 110, 112, 25, 5, 26, 101, 107, 30, 17, 72, 177, 162, 164, 54, 100, 210, 196, 191, 71, 5, 236, 4, 55, 242, 132, 64, 101, 37, 124, 222, 15, 39, 229, 111, 76, 210, 171, 236, 7, 93, 14, 216, 248, 45, 79, 218, 85, 211, 199, 250, 104, 33, 143, 222, 15, 88, 238, 164, 172, 135, 2, 101, 11, 255, 112, 8, 238, 139, 63, 190, 149, 130, 215, 130, 110, 68, 83, 56, 239, 253, 120, 96, 196, 38, 198, 153, 137, 110, 157, 87, 94, 69, 70, 176, 197, 220, 237, 73, 176, 217, 112, 186, 20, 16, 151, 251, 244, 204, 120, 42, 216, 194, 250, 127, 191, 45, 87, 138, 204, 145, 110, 119, 217, 185, 242, 50, 47, 102, 253, 107, 242, 121, 122, 204, 10, 232, 48, 214, 183, 190, 152, 249, 7, 228, 139, 181, 252, 84, 123, 199, 146, 175, 30, 152, 54, 4, 162, 26, 19, 103, 112, 216, 130, 148, 218, 40, 215, 53, 114, 87, 174, 194, 30, 148, 70, 183, 213, 103, 2, 24, 161, 173, 212, 50, 52, 10, 46, 252, 205, 46, 192, 187, 105, 16, 187, 193, 255, 182, 92, 222, 209, 193, 118, 129, 137, 218, 80, 242, 213, 89, 122, 224, 65, 158, 65, 104, 40, 15, 135, 86, 159, 63, 139, 29, 195, 230, 20, 180, 82, 142, 98, 48, 228, 204, 22, 199, 47, 96, 30, 125, 192, 222, 237, 243, 115, 222, 31, 182, 150, 172, 42, 17, 232, 108, 142, 241, 119, 143, 215, 117, 221, 37, 188, 136, 68, 166, 53, 120, 198, 16, 59, 74, 184, 175, 120, 42, 72, 102, 137, 171, 56, 141, 189, 173, 89, 128, 12, 114, 241, 189, 111, 136, 73, 132, 123, 93, 249, 199, 130, 191, 251, 1, 251, 208, 58, 108, 177, 41, 72, 20, 202, 120, 187, 38, 8, 163, 75, 63, 139, 91, 159, 26, 233, 162, 204, 152, 80, 228, 52, 96, 166, 8, 250, 206, 115, 97, 28, 220, 48, 59, 19, 66, 12, 137, 203, 7, 95, 23, 107, 3, 185, 110, 57, 39, 117, 13, 68, 70, 54, 238, 106, 230, 167, 242, 216, 208, 42, 154, 110, 41, 188, 51, 156, 153, 0, 199, 221, 58, 21, 57, 68, 24, 114, 67, 93, 90, 0, 252, 188, 145, 7, 24, 55, 189, 176, 50, 106, 154, 57, 17, 95, 223, 93, 17, 125, 163, 80, 18, 22, 229, 212, 90, 138, 222, 86, 8, 125, 63, 229, 145, 190, 200, 10, 39, 176, 9, 182, 211, 236, 122, 29, 134, 1, 186, 231, 227, 215, 194, 42, 240, 7, 196, 0, 179, 211, 150, 193, 21, 137, 84, 32, 92, 218, 185, 7, 200, 34, 179, 138, 244, 114, 167, 159, 23, 51, 124, 60, 253, 124, 75, 8, 65, 123, 59, 88, 219, 250, 242, 250, 112, 27, 222, 143, 17, 107, 48, 44, 172, 13, 223, 78, 218, 107, 93, 235, 5, 208, 23, 179, 176, 38, 213, 101, 154, 64, 132, 134, 83, 63, 77, 229, 126, 65, 142, 245, 167, 180, 96, 51, 24, 148, 105, 243, 63, 186, 163, 124, 34, 50, 179, 29, 215, 142, 5, 239, 54, 7, 196, 36, 81, 188, 247, 192, 3, 244, 124, 253, 168, 19, 233, 109, 231, 192, 175, 145, 117, 76, 63, 70, 62, 40, 182, 78, 254, 130, 186, 51, 198, 159, 107, 19, 156, 134, 103, 50, 90, 103, 74, 56, 89, 219, 199, 9, 95, 82, 84, 194, 128, 42, 20, 199, 148, 228, 7, 118, 119, 197, 45, 128, 9, 170, 208, 53, 183, 193, 219, 5, 217, 212, 134, 223, 36, 133, 92, 186, 235, 96, 221, 117, 0, 193, 177, 162, 117, 175, 70, 109, 31, 153, 192, 154, 149, 154, 14, 97, 150, 111, 227, 28, 62, 28, 87, 9, 143, 179, 167, 61, 34, 56, 49, 214, 103, 226, 6, 252, 32, 41, 67, 251, 82, 211, 79, 59, 118, 84, 13, 186, 17, 210, 208, 173, 195, 188, 134, 107, 74, 31, 134, 203, 90, 191, 112, 36, 15, 24, 25, 235, 139, 143, 62, 206, 200, 184, 140, 76, 38, 33, 145, 111, 208, 150, 137, 130, 192, 60, 198, 200, 136, 65, 8, 120, 228, 137, 230, 157, 86, 120, 28, 249, 236, 246, 108, 236, 190, 181, 14, 130, 11, 117, 191, 234, 124, 3, 114, 238, 202, 204, 12, 64, 157, 68, 242, 69, 222, 71, 38, 20, 167, 248, 156, 18, 118, 68, 41, 139, 228, 235, 148, 91, 226, 42, 148, 22, 166, 232, 244, 29, 159, 154, 36, 142, 96, 176, 49, 183, 130, 138, 26, 37, 220, 156, 202, 183, 34, 131, 245, 174, 136, 48, 154, 230, 37, 118, 121, 68, 231, 79, 63, 221, 46, 137, 160, 179, 87, 17, 218, 214, 63, 102, 102, 99, 169, 198, 113, 33, 76, 13, 61, 36, 89, 148, 49, 134, 239, 253, 12, 242, 28, 5, 21, 143, 242, 106, 146, 125, 164, 137, 207, 95, 235, 57, 211, 192, 118, 224, 242, 249, 16, 83, 56, 41, 181, 124, 108, 16, 28, 185, 71, 171, 15, 164, 118, 198, 66, 198, 194, 107, 83, 84, 163, 186, 219, 43, 221, 9, 3, 20, 103, 40, 59, 249, 24, 216, 106, 16, 99, 168, 109, 128, 169, 57, 46, 158, 81, 167, 201, 255, 62, 103, 14, 62, 238, 99, 254, 210, 106, 23, 120, 215, 2, 3, 73, 251, 237, 135, 128, 128, 206, 101, 77, 245, 27, 70, 53, 196, 81, 223, 13, 0, 204, 10, 222, 12, 164, 202, 100, 79, 25, 249, 121, 215, 148, 225, 91, 127, 75, 75, 163, 110, 205, 5, 204, 177, 254, 134, 245, 217, 178, 64, 239, 106, 55, 124, 16, 80, 124, 16, 81, 169, 61, 200, 221, 24, 221, 18, 233, 230, 164, 121, 212, 126, 79, 2, 216, 164, 249, 41, 255, 39, 98, 231, 12, 123, 13, 116, 220, 172, 166, 89, 112, 113, 250, 61, 176, 153, 84, 225, 187, 162, 79, 65, 106, 221, 173, 209, 157, 70, 33, 75, 158, 110, 152, 39, 200, 89, 91, 89, 253, 126, 84, 27, 158, 181, 101, 249, 32, 129, 198, 38, 144, 92, 64, 112, 208, 113, 60, 212, 72, 138, 49, 82, 95, 183, 174, 225, 77, 53, 121, 211, 223, 131, 161, 148, 220, 88, 131, 151, 69, 208, 240, 49, 163, 151, 121, 50, 79, 129, 137, 98, 57, 18, 33, 202, 150, 120, 255, 99, 34, 54, 85, 204, 172, 120, 77, 42, 123, 242, 129, 92, 196, 78, 101, 98, 25, 146, 73, 186, 132, 227, 246, 96, 236, 208, 63, 50, 90, 183, 134, 219, 143, 100, 54, 175, 20, 172, 107, 171, 169, 199, 50, 110, 252, 135, 93, 169, 144, 100, 236, 91, 122, 111, 40, 196, 143, 73, 177, 56, 50, 27, 21, 249, 185, 212, 182, 40, 134, 197, 187, 55, 165, 125, 48, 132, 76, 242, 184, 173, 177, 111, 150, 67, 58, 189, 122, 152, 228, 51, 241, 130, 42, 113, 112, 62, 70, 131, 4, 23, 177, 114, 212, 125, 157, 28, 8, 238, 223, 158, 211, 172, 145, 188, 65, 125, 62, 45, 220, 124, 226, 100, 34, 36, 153, 93, 76, 157, 89, 219, 60, 42, 88, 68, 158, 155, 181, 124, 242, 72, 167, 74, 56, 176, 56, 114, 203, 54, 170, 85, 155, 235, 79, 29, 201, 71, 124, 181, 127, 180, 139, 147, 47, 167, 26, 18, 67, 141, 150, 37, 197, 6, 170, 96, 68, 89, 209, 246, 182, 183, 53, 68, 239, 126, 147, 50, 210, 34, 248, 246, 109, 34, 41, 213, 229, 134, 154, 97, 241, 132, 17, 162, 180, 74, 151, 253, 150, 69, 251, 151, 63, 192, 219, 79, 253, 212, 137, 234, 196, 133, 215, 211, 147, 128, 54, 85, 93, 202, 30, 168, 167, 128, 125, 150, 188, 250, 23, 195, 249, 52, 179, 26, 207, 129, 227, 68, 78, 56, 2, 17, 86, 220, 89, 99, 19, 20, 173, 57, 203, 140, 66, 231, 27, 69, 214, 238, 201, 134, 89, 102, 254, 85, 249, 132, 115, 51, 39, 65, 184, 199, 187, 14, 44, 6, 217, 16, 227, 116, 185, 66, 201, 188, 95, 66, 178, 243, 103, 79, 144, 147, 139, 59, 123, 238, 28, 18, 202, 166, 75, 59, 246, 190, 150, 75, 73, 182, 251, 132, 15, 248, 96, 112, 253, 41, 3, 203, 44, 141, 147, 255, 69, 85, 78, 129, 60, 145, 81, 166, 224, 131, 132, 215, 210, 169, 5, 136, 178, 23, 30, 139, 153, 106, 40, 54, 139, 244, 214, 43, 132, 229, 221, 58, 81, 81, 57, 190, 168, 255, 114, 63, 122, 173, 6, 136, 110, 159, 188, 50, 188, 91, 56, 185, 99, 107, 139, 120, 176, 228, 142, 146, 209, 96, 27, 133, 77, 69, 254, 114, 99, 194, 195, 4, 80, 36, 220, 147, 252, 207, 142, 66, 65, 64, 226, 63, 85, 218, 66, 125, 108, 197, 49, 143, 59, 43, 182, 0, 253, 169, 234, 209, 57, 90, 190, 234, 14, 25, 237, 62, 155, 188, 246, 92, 78, 241, 21, 154, 242, 201, 59, 16, 147, 73, 252, 52, 13, 175, 51, 158, 248, 118, 159, 4, 186, 101, 250, 170, 10, 16, 135, 251, 224, 114, 97, 61, 25, 102, 23, 74, 58, 118, 158, 32, 74, 115, 104, 240, 131, 42, 187, 155, 134, 209, 171, 225, 85, 13, 71, 252, 156, 81, 126, 72, 110, 45, 207, 84, 113, 187, 61, 152, 107, 111, 80, 105, 35, 104, 81, 245, 68, 28, 51, 67, 212, 172, 99, 191, 248, 217, 91, 186, 232, 145, 201, 135, 56, 164, 52, 127, 137, 111, 186, 6, 164, 236, 112, 31, 232, 75, 224, 58, 209, 31, 205, 204, 46, 180, 127, 215, 44, 45, 13, 147, 165, 245, 241, 162, 178, 249, 226, 241, 113, 104, 80, 175, 59, 1, 43, 12, 25, 255, 146, 70, 208, 140, 140, 225, 122, 125, 181, 239, 73, 89, 5, 107, 9, 241, 8, 16, 223, 203, 176, 57, 33, 4, 115, 216, 80, 155, 249, 103, 241, 188, 44, 216, 37, 115, 171, 104, 154, 145, 134, 183, 58, 141, 141, 178, 123, 166, 222, 67, 68, 154, 167, 52, 235, 31, 112, 206, 223, 53, 6, 183, 5, 146, 93, 226, 30, 73, 237, 197, 140, 19, 34, 104, 116, 213, 152, 6, 75, 215, 218, 214, 66, 101, 19, 72, 244, 9, 81, 57, 43, 202, 165, 46, 36, 100, 31, 15, 218, 44, 181, 120, 172, 25, 99, 242, 188, 3, 83, 202, 190, 27, 251, 130, 200, 101, 175, 176, 105, 39, 227, 210, 240, 121, 137, 42, 27, 128, 5, 30, 234, 109, 232, 77, 59, 100, 180, 107, 5, 215, 28, 55, 228, 186, 224, 16, 156, 182, 238, 181, 59, 124, 105, 117, 32, 66, 83, 110, 109, 112, 68, 95, 77, 121, 139, 94, 176, 190, 6, 58, 109, 213, 214, 24, 253, 72, 61, 86, 209, 20, 88, 36, 146, 179, 79, 168, 66, 209, 168, 48, 253, 177, 239, 139, 166, 213, 72, 242, 160, 36, 254, 135, 57, 207, 55, 198, 205, 150, 198, 54, 140, 247, 242, 52, 106, 132, 71, 67, 233, 29, 181, 247, 189, 36, 48, 232, 111, 130, 149, 234, 243, 241, 165, 66, 221, 64, 173, 207, 0, 69, 201, 111, 209, 157, 16, 56, 217, 29, 157, 106, 232, 206, 148, 110, 71, 113, 29, 228, 195, 57, 249, 181, 71, 203, 211, 131, 64, 92, 141, 89, 58, 210, 70, 246, 227, 146, 137, 63, 41, 250, 187, 56, 160, 17, 174, 45, 28, 245, 204, 63, 18, 174, 162, 53, 208, 121, 187, 1, 121, 46, 50, 245, 207, 140, 5, 186, 237, 72, 158, 163, 44, 143, 197, 127, 34, 160, 41, 242, 108, 220, 123, 138, 205, 164, 23, 164, 18, 117, 123, 153, 22, 150, 73, 141, 43, 176, 88, 251, 198, 143, 93, 33, 20, 40, 143, 84, 197, 67, 255, 148, 57, 146, 198, 114, 33, 71, 30, 82, 192, 170, 52, 234, 239, 80, 64, 40, 102, 84, 166, 173, 142, 183, 193, 94, 230, 23, 141, 252, 243, 157, 35, 237, 118, 118, 42, 74, 1, 54, 87, 226, 144, 53, 58, 204, 32, 19, 74, 57, 167, 120, 21, 185, 51, 252, 176, 109, 2, 92, 125, 240, 132, 20, 197, 113, 129, 104, 179, 18, 64, 47, 115, 96, 209, 210, 76, 191, 39, 127, 230, 135, 242, 56, 42, 214, 109, 188, 170, 192, 204, 9, 204, 190, 58, 162, 143, 115, 247, 60, 155, 37, 146, 119, 159, 64, 247, 242, 239, 189, 181, 85, 25, 145, 123, 81, 123, 205, 83, 33, 144, 45, 196, 64, 114, 13, 18, 247, 116, 14, 202, 246, 213, 177, 225, 152, 217, 119, 24, 39, 253, 158, 222, 242, 242, 175, 77, 241, 126, 29, 93, 45, 170, 185, 71, 131, 214, 114, 43, 181, 150, 252, 39, 6, 87, 37, 134, 229, 17, 8, 15, 186, 181, 205, 161, 20, 235, 0, 12, 137, 197, 184, 41, 11, 222, 237, 139, 70, 19, 213, 30, 122, 10, 226, 173, 98, 29, 245, 52, 215, 124, 12, 134, 182, 57, 22, 177, 59, 226, 249, 248, 41, 180, 183, 47, 165, 116, 170, 152, 20, 74, 194, 122, 200, 136, 75, 176, 189, 240, 211, 88, 98, 205, 34, 105, 216, 138, 137, 72, 56, 215, 175, 140, 70, 137, 91, 54, 133, 221, 38, 226, 239, 139, 212, 80, 177, 248, 110, 195, 61, 196, 255, 7, 156, 229, 136, 198, 72, 3, 234, 106, 16, 83, 14, 210, 94, 51, 205, 43, 23, 224, 60, 41, 139, 192, 59, 25, 111, 190, 82, 39, 54, 189, 75, 126, 229, 83, 220, 32, 148, 43, 104, 248, 214, 206, 224, 215, 16, 60, 193, 15, 56, 193, 32, 170, 160, 23, 190, 102, 110, 19, 17, 72, 35, 17, 208, 211, 97, 113, 200, 24, 54, 117, 191, 45, 89, 163, 74, 198, 191, 150, 95, 253, 192, 22, 129, 130, 32, 152, 172, 103, 119, 229, 128, 56, 107, 92, 200, 44, 214, 191, 125, 210, 215, 82, 117, 251, 113, 109, 109, 226, 6, 169, 109, 74, 23, 249, 245, 34, 66, 19, 101, 185, 162, 211, 82, 34, 142, 17, 229, 51, 118, 89, 199, 214, 28, 129, 55, 42, 45, 223, 195, 53, 145, 14, 230, 108, 57, 10, 38, 30, 54, 47, 103, 228, 177, 43, 124, 215, 126, 179, 126, 224, 136, 52, 213, 200, 239, 248, 56, 200, 140, 211, 100, 66, 168, 7, 73, 198, 24, 116, 195, 168, 244, 221, 29, 96, 70, 60, 223, 74, 211, 190, 250, 31, 253, 102, 252, 5, 79, 214, 195, 57, 178, 97, 227, 185, 105, 107, 5, 36, 58, 5, 55, 206, 148, 62, 127, 7, 185, 106, 245, 3, 39, 244, 34, 213, 127, 5, 102, 234, 34, 21, 55, 212, 6, 181, 98, 25, 92, 178, 172, 22, 221, 208, 146, 54, 119, 64, 138, 248, 54, 134, 7, 72, 247, 6, 228, 125, 93, 153, 23, 141, 207, 95, 56, 117, 215, 95, 159, 159, 214, 117, 97, 43, 109, 88, 50, 163, 148, 70, 44, 108, 208, 165, 89, 202, 104, 76, 241, 196, 12, 40, 102, 154, 234, 158, 197, 135, 31, 129, 203, 135, 181, 145, 20, 117, 153, 231, 212, 228, 118, 193, 211, 167, 59, 198, 170, 28, 74, 11, 164, 211, 1, 189, 68, 202, 163, 110, 158, 216, 123, 31, 16, 30, 31, 111, 81, 108, 235, 56, 98, 114, 76, 29, 142, 234, 159, 214, 18, 38, 226, 183, 37, 36, 15, 56, 53, 141, 161, 85, 198, 76, 246, 223, 82, 137, 2, 27, 186, 111, 208, 68, 146, 181, 205, 85, 101, 70, 19, 33, 38, 254, 177, 231, 88, 176, 43, 130, 244, 94, 228, 81, 193, 13, 224, 8, 45, 35, 185, 9, 103, 112, 133, 124, 107, 172, 66, 48, 64, 33, 84, 14, 127, 69, 54, 46, 68, 14, 225, 255, 48, 107, 32, 75, 160, 60, 67, 158, 149, 12, 243, 130, 168, 250, 146, 60, 29, 121, 117, 186, 93, 171, 26, 187, 23, 130, 200, 105, 169, 14, 241, 206, 210, 146, 59, 79, 197, 56, 14, 119, 202, 166, 82, 77, 90, 96, 193, 7, 176, 83, 166, 12, 5, 99, 4, 173, 44, 162, 241, 216, 251, 218, 158, 2, 222, 159, 93, 5, 189, 82, 143, 147, 50, 220, 207, 150, 229, 93, 47, 39, 242, 159, 236, 141, 31, 209, 237, 21, 156, 8, 199, 201, 62, 55, 18, 132, 140, 65, 177, 159, 152, 137, 179, 4, 196, 88, 135, 212, 251, 156, 138, 108, 108, 84, 178, 243, 153, 151, 175, 177, 23, 163, 44, 180, 29, 98, 159, 125, 91, 169, 25, 131, 30, 65, 139, 56, 16, 177, 161, 230, 244, 121, 38, 207, 45, 64, 0, 235, 250, 149, 220, 128, 161, 118, 12, 148, 229, 107, 33, 108, 158, 197, 103, 236, 220, 167, 93, 108, 227, 34, 17, 54, 31, 131, 135, 182, 166, 130, 136, 244, 128, 130, 64, 45, 59, 203, 121, 207, 228, 46, 75, 96, 55, 66, 87, 173, 145, 207, 106, 111, 97, 224, 103, 86, 128, 36, 37, 105, 165, 77, 69, 13, 29, 220, 163, 123, 49, 209, 38, 212, 238, 25, 4, 232, 186, 232, 133, 3, 163, 79, 139, 249, 111, 69, 0, 187, 128, 212, 60, 242, 147, 148, 223, 17, 73, 194, 244, 125, 146, 191, 38, 15, 247, 52, 4, 91, 229, 37, 22, 64, 135, 77, 181, 241, 149, 80, 196, 124, 21, 200, 117, 76, 105, 121, 30, 188, 3, 65, 161, 205, 178, 242, 67, 111, 175, 58, 9, 95, 46, 201, 105, 23, 224, 249, 98, 100, 205, 255, 23, 50, 131, 30, 216, 87, 102, 59, 91, 156, 114, 45, 237, 187, 117, 192, 231, 51, 65, 183, 127, 231, 90, 69, 131, 6, 141, 83, 217, 17, 41, 150, 182, 89, 2, 191, 56, 69, 42, 120, 196, 10, 177, 255, 154, 238, 104, 210, 58, 33, 13, 163, 136, 178, 244, 61, 163, 206, 79, 81, 212, 50, 23, 56, 28, 182, 165, 29, 84, 29, 173, 150, 194, 201, 221, 239, 145, 151, 60, 119, 233, 183, 171, 240, 201, 10, 91, 26, 12, 55, 126, 52, 113, 9, 105, 150, 111, 58, 76, 222, 35, 54, 5, 36, 51, 229, 13, 222, 167, 248, 130, 166, 6, 108, 78, 44, 228, 219, 155, 216, 122, 66, 163, 52, 100, 111, 104, 166, 127, 253, 123, 15, 179, 63, 102, 161, 23, 86, 81, 41, 241, 164, 196, 71, 122, 216, 18, 22, 196, 39, 126, 223, 86, 220, 81, 90, 103, 74, 116, 226, 16, 125, 173, 210, 46, 194, 102, 224, 246, 149, 225, 35, 1, 248, 108, 64, 20, 74, 48, 89, 109, 173, 212, 114, 175, 87, 97, 217, 241, 107, 253, 67, 82, 32, 14, 1, 219, 60, 10, 73, 19, 183, 87, 110, 95, 252, 101, 56, 34, 67, 24, 180, 179, 55, 32, 247, 187, 98, 99, 235, 73, 77, 243, 29, 29, 93, 242, 60, 26, 51, 27, 102, 109, 98, 251, 98, 76, 235, 39, 89, 1, 108, 46, 238, 115, 33, 59, 45, 46, 4, 56, 141, 65, 192, 26, 110, 192, 216, 245, 71, 57, 65, 144, 246, 236, 191, 64, 159, 245, 245, 14, 36, 66, 6, 98, 18, 148, 99, 141, 82, 64, 51, 168, 215, 201, 82, 150, 68, 84, 237, 2, 185, 49, 39, 122, 245, 239, 219, 60, 142, 16, 78, 165, 59, 145, 226, 38, 19, 228, 26, 159, 176, 90, 32, 1, 163, 43, 127, 125, 232, 29, 223, 231, 232, 176, 78, 57, 34, 219, 177, 64, 17, 186, 201, 72, 51, 195, 59, 140, 226, 123, 219, 243, 10, 190, 99, 40, 236, 187, 46, 119, 180, 164, 197, 70, 134, 167, 185, 241, 187, 218, 249, 220, 62, 226, 47, 97, 251, 132, 155, 218, 32, 253, 182, 144, 98, 22, 209, 215, 16, 95, 246, 4, 58, 32, 214, 187, 1, 103, 224, 60, 163, 97, 233, 219, 15, 97, 6, 176, 177, 176, 174, 149, 111, 229, 17, 47, 10, 167, 193, 114, 2, 14, 131, 72, 117, 147, 68, 11, 217, 168, 7, 84, 89, 255, 130, 70, 149, 123, 55, 161, 5, 27, 3, 133, 147, 51, 133, 120, 139, 225, 134, 107, 121, 199, 129, 150, 117, 73, 6, 190, 67, 1, 127, 99, 203, 123, 26, 10, 131, 160, 255, 55, 205, 8, 109, 202, 165, 46, 13, 144, 141, 238, 4, 15, 30, 91, 78, 167, 56, 207, 181, 100, 89, 226, 166, 91, 6, 87, 42, 161, 18, 173, 46, 134, 84, 47, 192, 51, 192, 86, 143, 106, 143, 68, 251, 155, 48, 132, 148, 113, 151, 135, 133, 68, 135, 223, 141, 62, 40, 237, 173, 32, 255, 82, 138, 211, 98, 135, 17, 208, 76, 110, 10, 169, 109, 29, 94, 79, 56, 157, 83, 52, 181, 250, 138, 162, 188, 220, 51, 204, 209, 222, 189, 226, 142, 162, 134, 34, 176, 136, 149, 252, 25, 172, 22, 56, 41, 175, 96, 189, 47, 60, 197, 122, 228, 229, 174, 7, 187, 59, 62, 90, 104, 81, 171, 136, 40, 100, 33, 61, 107, 104, 93, 125, 99, 111, 143, 164, 107, 234, 102, 20, 82, 79, 151, 211, 159, 79, 36, 159, 15, 137, 116, 236, 128, 31, 195, 155, 61, 48, 44, 168, 114, 179, 176, 19, 154, 247, 138, 187, 48, 108, 202, 239, 31, 5, 253, 101, 72, 112, 65, 48, 8, 136, 4, 140, 125, 19, 45, 76, 151, 233, 69, 65, 39, 222, 33, 169, 153, 248, 69, 22, 63, 82, 47, 141, 89, 69, 102, 183, 148, 108, 230, 206, 254, 173, 111, 126, 205, 73, 85, 110, 8, 195, 112, 225, 241, 117, 201, 155, 66, 182, 43, 95, 192, 172, 85, 95, 200, 55, 150, 254, 183, 79, 51, 140, 194, 243, 218, 6, 207, 43, 112, 155, 165, 185, 81, 231, 61, 156, 78, 134, 159, 39, 52, 3, 54, 202, 111, 201, 137, 237, 153, 86, 65, 220, 47, 171, 44, 200, 196, 150, 157, 71, 245, 230, 122, 68, 43, 159, 42, 220, 239, 39, 59, 81, 215, 190, 128, 130, 45, 90, 180, 95, 118, 120, 37, 13, 88, 3, 66, 233, 214, 12, 132, 171, 162, 38, 115, 151, 111, 181, 74, 10, 105, 88, 147, 18, 179, 28, 209, 232, 145, 185, 92, 144, 230, 74, 12, 70, 230, 10, 109, 202, 47, 127, 142, 241, 226, 160, 99, 236, 6, 133, 69, 212, 154, 166, 91, 50, 29, 34, 28, 146, 191, 43, 169, 86, 236, 44, 39, 96, 174, 26, 12, 210, 205, 182, 94, 148, 21, 71, 7, 55, 243, 169, 236, 251, 148, 255, 130, 169, 82, 153, 21, 140, 25, 11, 83, 255, 108, 240, 128, 13, 36, 35, 182, 182, 242, 102, 57, 202, 171, 124, 196, 136, 92, 214, 60, 128, 224, 239, 59, 200, 208, 243, 143, 95, 97, 220, 171, 167, 40, 18, 63, 70, 152, 3, 129, 146, 154, 72, 146, 176, 144, 56, 0, 216, 206, 217, 145, 170, 82, 110, 208, 56, 155, 158, 133, 32, 72, 127, 55, 98, 223, 55, 57, 226, 184, 221, 143, 62, 205, 153, 184, 72, 233, 147, 245, 235, 115, 24, 146, 28, 29, 191, 188, 195, 216, 0, 79, 123, 176, 54, 74, 228, 161, 151, 255, 57, 132, 208, 222, 172, 239, 205, 243, 127, 50, 141, 9, 28, 72, 123, 85, 122, 138, 248, 107, 55, 73, 183, 2, 189, 140, 161, 129, 16, 183, 182, 207, 76, 105, 61, 159, 207, 220, 140, 223, 15, 72, 164, 232, 55, 246, 173, 204, 217, 67, 72, 116, 35, 22, 247, 217, 8, 97, 20, 37, 53, 199, 137, 14, 183, 78, 33, 179, 245, 104, 161, 143, 174, 147, 54, 58, 153, 221, 189, 50, 27, 25, 252, 142, 76, 18, 135, 116, 106, 21, 78, 71, 130, 246, 120, 35, 81, 60, 230, 156, 147, 127, 104, 209, 94, 21, 168, 51, 226, 215, 97, 176, 83, 122, 225, 117, 106, 49, 117, 171, 146, 184, 154, 203, 205, 153, 155, 84, 153, 95, 190, 76, 32, 248, 17, 43, 20, 48, 114, 56, 234, 90, 101, 59, 154, 217, 35, 15, 234, 180, 156, 178, 214, 117, 220, 215, 178, 12, 37, 247, 61, 212, 186, 28, 176, 157, 38, 125, 116, 68, 128, 229, 191, 65, 183, 125, 81, 130, 183, 131, 93, 244, 175, 42, 119, 240, 179, 174, 78, 1, 125, 226, 231, 160, 105, 14, 32, 19, 86, 170, 9, 226, 40, 148, 47, 70, 27, 37, 13, 56, 247, 89, 179, 103, 45, 105, 94, 115, 97, 185, 56, 13, 24, 135, 47, 150, 57, 56, 72, 31, 70, 31, 48, 75, 206, 216, 69, 184, 201, 237, 221, 113, 183, 214, 140, 167, 68, 69, 187, 226, 254, 182, 189, 142, 132, 1, 220, 204, 174, 248, 29, 216, 137, 194, 87, 139, 131, 224, 76, 73, 194, 165, 71, 63, 157, 208, 134, 167, 116, 14, 87, 226, 46, 76, 101, 73, 42, 99, 13, 76, 238, 140, 44, 48, 118, 246, 56, 74, 153, 113, 185, 44, 218, 130, 32, 218, 143, 177, 174, 194, 189, 188, 12, 248, 30, 201, 111, 41, 179, 117, 45, 168, 224, 254, 10, 90, 226, 81, 242, 96, 40, 61, 225, 156, 143, 248, 187, 220, 74, 237, 159, 165, 63, 246, 200, 229, 75, 103, 203, 208, 187, 92, 84, 138, 17, 36, 207, 108, 67, 138, 71, 82, 252, 122, 231, 150, 11, 109, 169, 15, 75, 46, 149, 100, 227, 59, 95, 15, 40, 246, 192, 66, 68, 36, 248, 149, 74, 54, 28, 207, 167, 237, 62, 186, 11, 49, 155, 38, 20, 117, 62, 18, 201, 9, 166, 33, 74, 232, 160, 202, 178, 77, 25, 107, 220, 210, 141, 40, 172, 79, 179, 55, 185, 100, 199, 98, 115, 207, 191, 151, 67, 174, 160, 99, 155, 76, 33, 141, 242, 154, 100, 87, 243, 208, 43, 160, 42, 126, 22, 177, 199, 150, 245, 244, 247, 186, 241, 222, 110, 37, 208, 33, 61, 184, 15, 72, 19, 103, 39, 215, 155, 210, 224, 71, 180, 11, 172, 63, 25, 19, 134, 108, 93, 35, 239, 49, 159, 42, 238, 79, 117, 86, 16, 121, 66, 93, 45, 199, 23, 187, 127, 36, 85, 208, 230, 132, 244, 81, 51, 107, 51, 72, 30, 81, 50, 238, 169, 204, 134, 134, 45, 5, 148, 235, 84, 132, 46, 226, 36, 102, 68, 51, 213, 138, 238, 72, 88, 110, 117, 31, 222, 121, 76, 130, 195, 232, 169, 252, 218, 169, 141, 41, 51, 63, 78, 122, 236, 42, 150, 182, 48, 40, 80, 44, 60, 40, 167, 42, 133, 21, 222, 175, 242, 236, 255, 53, 141, 153, 55, 223, 175, 247, 251, 102, 105, 54, 31, 47, 236, 176, 106, 191, 35, 249, 141, 170, 115, 8, 43, 117, 98, 108, 207, 43, 62, 247, 140, 37, 234, 0, 243, 31, 52, 42, 240, 226, 94, 128, 246, 249, 56, 37, 226, 92, 53, 36, 72, 144, 138, 181, 113, 54, 159, 116, 37, 26, 174, 73, 158, 179, 22, 173, 173, 76, 118, 38, 13, 255, 67, 194, 86, 90, 199, 243, 65, 3, 10, 210, 37, 198, 22, 139, 92, 210, 95, 166, 208, 227, 48, 255, 255, 78, 64, 150, 209, 86, 77, 140, 215, 139, 1, 112, 216, 14, 126, 41, 52, 81, 240, 166, 110, 246, 236, 70, 106, 95, 165, 112, 102, 214, 225, 248, 58, 57, 164, 225, 7, 167, 15, 66, 26, 243, 153, 184, 43, 67, 226, 136, 56, 251, 245, 85, 141, 129, 183, 244, 109, 227, 163, 251, 110, 135, 174, 205, 49, 67, 131, 32, 134, 231, 225, 203, 78, 160, 182, 78, 140, 213, 115, 82, 156, 130, 102, 106, 184, 123, 84, 13, 160, 185, 162, 47, 227, 197, 165, 83, 122, 68, 128, 131, 150, 125, 112, 150, 138, 8, 148, 69, 176, 172, 114, 73, 127, 86, 70, 212, 0, 157, 63, 184, 197, 6, 82, 157, 55, 154, 33, 170, 56, 181, 70, 206, 169, 92, 122, 27, 184, 159, 242, 206, 225, 177, 242, 162, 148, 117, 158, 172, 72, 76, 186, 59, 60, 8, 161, 188, 101, 31, 233, 37, 240, 69, 226, 40, 247, 105, 19, 211, 15, 90, 90, 102, 180, 61, 128, 50, 212, 248, 144, 135, 178, 49, 175, 106, 28, 225, 242, 203, 247, 6, 165, 202, 108, 36, 8, 155, 177, 240, 70, 84, 16, 250, 91, 0, 19, 54, 91, 196, 133, 73, 197, 2, 211, 143, 201, 123, 80, 142, 191, 119, 98, 18, 245, 100, 73, 93, 243, 201, 35, 54, 231, 238, 241, 5, 155, 127, 0, 254, 121, 146, 12, 127, 122, 195, 64, 99, 255, 95, 186, 185, 45, 7, 180, 159, 154, 64, 100, 182, 150, 27, 189, 63, 7, 52, 11, 159, 184, 38, 230, 77, 198, 241, 22, 194, 222, 20, 202, 53, 236, 141, 149, 64, 148, 242, 76, 79, 56, 46, 188, 118, 201, 56, 142, 141, 123, 75, 119, 211, 5, 54, 61, 145, 48, 231, 130, 81, 12, 80, 29, 248, 136, 242, 226, 149, 57, 110, 1, 184, 147, 187, 208, 86, 103, 131, 34, 214, 35, 146, 124, 252, 177, 76, 110, 156, 99, 118, 76, 153, 73, 89, 49, 37, 178, 14, 250, 151, 170, 254, 220, 59, 171, 75, 84, 164, 65, 121, 87, 122, 212, 27, 65, 94, 57, 60, 250, 249, 156, 80, 109, 238, 235, 92, 201, 39, 192, 86, 162, 30, 106, 104, 114, 182, 9, 183, 97, 95, 231, 16, 40, 87, 196, 43, 69, 29, 136, 219, 68, 42, 215, 122, 197, 109, 134, 88, 61, 55, 177, 209, 174, 109, 110, 217, 95, 201, 16, 133, 149, 147, 244, 155, 105, 39, 28, 105, 247, 251, 139, 219, 63, 176, 161, 71, 101, 63, 98, 218, 96, 33, 127, 192, 31, 69, 166, 61, 74, 143, 142, 88, 225, 134, 65, 235, 214, 145, 245, 107, 56, 238, 119, 101, 160, 247, 38, 236, 87, 124, 117, 93, 199, 107, 151, 217, 41, 30, 69, 61, 60, 228, 120, 38, 61, 202, 4, 196, 60, 107, 93, 230, 40, 247, 224, 159, 40, 66, 236, 243, 135, 202, 146, 209, 197, 56, 33, 126, 2, 150, 230, 154, 253, 35, 136, 132, 121, 244, 123, 201, 99, 100, 34, 233, 123, 210, 194, 205, 243, 251, 205, 118, 7, 211, 100, 55, 210, 42, 228, 153, 167, 251, 150, 182, 182, 23, 158, 81, 162, 157, 253, 5, 44, 163, 226, 150, 71, 84, 7, 94, 209, 240, 30, 86, 146, 182, 130, 210, 61, 179, 233, 42, 26, 151, 54, 91, 14, 155, 19, 142, 113, 38, 169, 23, 73, 254, 124, 16, 15, 81, 67, 86, 230, 56, 77, 86, 225, 157, 240, 176, 138, 0, 179, 194, 157, 235, 199, 57, 160, 108, 54, 67, 205, 162, 28, 140, 215, 230, 18, 47, 130, 185, 162, 65, 150, 58, 177, 194, 149, 41, 64, 20, 205, 76, 57, 68, 53, 128, 73, 52, 99, 239, 127, 206, 232, 68, 50, 48, 176, 235, 249, 65, 38, 39, 152, 147, 79, 184, 174, 106, 120, 67, 79, 81, 97, 56, 196, 246, 63, 10, 133, 104, 2, 134, 231, 66, 48, 202, 47, 125, 78, 73, 181, 93, 140, 185, 53, 223, 108, 194, 31, 97, 227, 137, 251, 150, 126, 82, 77, 115, 123, 6, 224, 250, 235, 144, 171, 159, 213, 113, 246, 46, 151, 87, 13, 119, 210, 206, 215, 189, 246, 27, 228, 25, 69, 4, 248, 63, 128, 9, 67, 54, 72, 217, 224, 134, 171, 137, 235, 100, 152, 160, 155, 85, 223, 5, 138, 178, 94, 25, 223, 12, 180, 199, 151, 120, 38, 4, 121, 192, 69, 126, 105, 16, 7, 22, 26, 187, 124, 6, 203, 17, 11, 231, 196, 67, 234, 38, 86, 246, 52, 16, 112, 156, 178, 231, 251, 108, 147, 239, 177, 185, 211, 79, 1, 136, 247, 203, 252, 140, 213, 247, 230, 147, 90, 110, 53, 207, 160, 70, 250, 109, 6, 44, 231, 3, 185, 25, 85, 200, 137, 200, 34, 92, 52, 151, 250, 44, 132, 111, 80, 243, 47, 234, 216, 229, 22, 231, 52, 195, 171, 132, 133, 33, 38, 232, 245, 226, 186, 146, 58, 40, 73, 163, 32, 82, 203, 121, 68, 128, 95, 107, 20, 11, 76, 242, 165, 111, 52, 144, 156, 147, 63, 100, 94, 226, 149, 56, 39, 32, 58, 34, 153, 138, 224, 4, 95, 129, 192, 92, 247, 139, 190, 177, 0, 50, 83, 231, 45, 59, 59, 13, 24, 117, 66, 5, 16, 145, 172, 84, 230, 74, 90, 94, 208, 92, 219, 54, 218, 134, 162, 251, 162, 99, 78, 191, 188, 71, 249, 101, 232, 123, 16, 123, 177, 248, 47, 254, 56, 11, 39, 62, 155, 143, 137, 174, 99, 73, 186, 53, 169, 27, 241, 40, 29, 166, 22, 41, 90, 31, 62, 28, 12, 230, 143, 15, 68, 119, 28, 126, 94, 55, 161, 151, 211, 129, 162, 206, 109, 158, 173, 85, 119, 18, 54, 107, 213, 68, 29, 99, 62, 188, 115, 105, 95, 2, 135, 83, 183, 67, 210, 255, 160, 128, 83, 141, 177, 169, 129, 223, 157, 30, 0, 68, 103, 164, 42, 103, 35, 179, 193, 54, 200, 250, 197, 233, 163, 86, 231, 73, 242, 217, 81, 48, 62, 230, 40, 173, 144, 84, 7, 199, 88, 61, 166, 38, 187, 80, 60, 136, 44, 242, 62, 224, 98, 169, 210, 116, 9, 233, 199, 224, 1, 82, 201, 179, 116, 145, 37, 75, 101, 153, 31, 55, 129, 184, 193, 179, 55, 174, 186, 144, 178, 179, 118, 148, 33, 84, 250, 164, 85, 137, 168, 250, 89, 21, 237, 153, 127, 29, 86, 131, 72, 118, 175, 255, 160, 160, 78, 202, 88, 140, 237, 161, 195, 157, 85, 15, 234, 31, 168, 47, 189, 111, 47, 243, 160, 208, 218, 128, 2, 3, 82, 214, 40, 174, 190, 92, 201, 109, 235, 231, 112, 248, 229, 169, 93, 38, 100, 47, 43, 17, 55, 160, 208, 158, 64, 96, 147, 178, 156, 194, 179, 197, 166, 34, 156, 165, 124, 160, 189, 213, 20, 144, 108, 45, 99, 202, 209, 121, 163, 23, 138, 219, 56, 251, 153, 134, 129, 8, 97, 220, 30, 228, 217, 13, 225, 75, 209, 193, 32, 9, 16, 195, 85, 27, 193, 112, 192, 21, 21, 37, 46, 24, 252, 43, 212, 110, 152, 164, 90, 125, 111, 218, 35, 67, 171, 237, 146, 80, 22, 243, 160, 105, 146, 234, 181, 180, 71, 41, 146, 102, 250, 55, 46, 175, 92, 103, 43, 197, 59, 67, 118, 181, 189, 30, 185, 114, 71, 82, 16, 177, 167, 54, 106, 253, 174, 16, 51, 123, 54, 138, 200, 171, 89, 180, 183, 101, 207, 34, 112, 59, 3, 70, 172, 251, 177, 30, 232, 31, 10, 182, 220, 90, 116, 128, 201, 9, 43, 165, 0, 240, 72, 63, 137, 152, 20, 249, 146, 189, 148, 197, 160, 236, 224, 27, 222, 150, 0, 116, 38, 147, 169, 95, 0, 248, 196, 168, 222, 48, 72, 33, 67, 78, 73, 34, 186, 173, 18, 62, 181, 23, 165, 248, 62, 244, 123, 26, 241, 223, 76, 3, 186, 242, 41, 210, 210, 237, 65, 61, 55, 58, 94, 241, 147, 119, 27, 74, 112, 249, 193, 147, 157, 20, 4, 128, 142, 54, 213, 217, 60, 47, 9, 109, 162, 197, 147, 81, 76, 167, 7, 175, 223, 128, 217, 229, 40, 157, 182, 157, 171, 75, 204, 114, 152, 7, 164, 198, 239, 88, 148, 178, 217, 122, 187, 151, 105, 66, 51, 164, 92, 78, 168, 118, 143, 117, 64, 252, 91, 214, 145, 212, 138, 131, 5, 225, 150, 184, 184, 6, 138, 153, 120, 154, 194, 161, 33, 99, 204, 177, 237, 41, 32, 157, 36, 164, 246, 212, 120, 128, 48, 82, 218, 165, 206, 206, 105, 150, 204, 206, 124, 214, 233, 139, 53, 2, 36, 13, 21, 44, 79, 163, 163, 164, 28, 181, 134, 74, 128, 3, 53, 190, 125, 115, 155, 58, 63, 198, 87, 227, 191, 172, 49, 217, 71, 178, 118, 68, 19, 105, 142, 170, 115, 32, 135, 82, 203, 62, 132, 241, 200, 132, 101, 220, 251, 229, 204, 138, 31, 106, 33, 253, 157, 217, 71, 132, 66, 165, 203, 227, 243, 231, 22, 249, 159, 131, 27, 33, 156, 16, 58, 211, 229, 167, 144, 173, 111, 0, 195, 144, 177, 116, 78, 103, 158, 13, 248, 193, 107, 210, 62, 245, 116, 118, 24, 127, 187, 225, 100, 120, 91, 10, 102, 4, 200, 220, 200, 230, 238, 51, 89, 166, 63, 147, 149, 104, 47, 62, 171, 171, 59, 23, 143, 241, 99, 30, 84, 138, 19, 223, 133, 9, 221, 142, 76, 204, 164, 189, 170, 45, 75, 123, 133, 106, 196, 83, 57, 213, 182, 237, 52, 36, 222, 231, 127, 66, 120, 60, 81, 164, 109, 202, 239, 232, 180, 138, 153, 2, 255, 32, 247, 187, 79, 240, 104, 129, 192, 138, 249, 160, 8, 121, 178, 118, 13, 166, 27, 59, 29, 190, 147, 216, 204, 246, 184, 122, 194, 184, 58, 155, 133, 170, 194, 86, 22, 250, 122, 210, 127, 128, 157, 175, 131, 19, 188, 121, 118, 158, 93, 19, 110, 23, 209, 26, 19, 197, 2, 55, 221, 229, 155, 177, 20, 89, 154, 211, 185, 72, 213, 202, 136, 238, 42, 251, 228, 224, 191, 158, 39, 162, 231, 2, 128, 188, 49, 36, 104, 158, 163, 95, 82, 92, 255, 213, 162, 147, 211, 189, 44, 190, 220, 166, 0, 102, 10, 162, 99, 13, 55, 222, 95, 172, 195, 4, 37, 44, 100, 97, 112, 244, 251, 65, 67, 114, 88, 179, 150, 13, 176, 190, 86, 221, 113, 80, 243, 68, 221, 148, 98, 24, 179, 251, 40, 158, 171, 97, 223, 158, 131, 74, 182, 28, 39, 38, 254, 13, 3, 35, 107, 161, 178, 99, 22, 87, 101, 77, 208, 8, 58, 138, 113, 13, 60, 26, 3, 89, 77, 215, 108, 69, 221, 115, 207, 213, 216, 93, 32, 85, 210, 87, 199, 212, 79, 2, 63, 85, 70, 221, 136, 237, 79, 99, 59, 92, 57, 58, 51, 217, 141, 103, 17, 219, 153, 125, 209, 188, 57, 180, 23, 146, 104, 85, 229, 209, 155, 46, 99, 89, 244, 120, 122, 124, 218, 56, 44, 25, 61, 129, 130, 228, 55, 241, 74, 32, 187, 145, 149, 209, 10, 230, 245, 20, 16, 94, 26, 128, 15, 207, 132, 34, 33, 15, 61, 105, 98, 250, 221, 91, 113, 81, 64, 11, 131, 255, 75, 225, 190, 50, 95, 170, 69, 209, 215, 178, 89, 223, 190, 175, 55, 159, 176, 99, 12, 21, 221, 201, 211, 132, 234, 58, 251, 204, 61, 85, 153, 173, 81, 11, 8, 239, 170, 130, 41, 53, 165, 199, 70, 111, 30, 79, 181, 39, 105, 105, 104, 159, 52, 124, 253, 38, 191, 242, 73, 99, 65, 106, 128, 191, 172, 116, 182, 53, 71, 143, 85, 113, 195, 169, 227, 233, 232, 50, 99, 69, 244, 53, 148, 212, 1, 204, 147, 138, 157, 119, 246, 39, 240, 9, 65, 207, 52, 81, 43, 68, 81, 155, 65, 168, 204, 178, 108, 223, 249, 218, 180, 228, 83, 136, 79, 230, 12, 138, 229, 11, 69, 2, 97, 77, 99, 174, 37, 180, 12, 83, 141, 139, 41, 108, 40, 93, 160, 232, 30, 232, 159, 126, 223, 93, 90, 45, 88, 245, 158, 141, 88, 241, 91, 120, 252, 230, 140, 200, 195, 248, 58, 98, 152, 93, 232, 127, 89, 95, 106, 173, 142, 242, 24, 115, 66, 215, 211, 201, 240, 36, 140, 223, 207, 165, 241, 180, 34, 11, 159, 155, 250, 94, 136, 164, 214, 95, 154, 30, 106, 97, 114, 217, 176, 92, 18, 198, 157, 255, 78, 82, 208, 161, 185, 45, 209, 137, 91, 97, 227, 8, 185, 59, 203, 189, 25, 50, 230, 220, 135, 167, 13, 227, 236, 142, 141, 8, 16, 173, 250, 39, 18, 9, 75, 191, 174, 189, 226, 50, 125, 158, 188, 26, 109, 99, 57, 200, 231, 153, 197, 250, 247, 224, 57, 218, 53, 34, 172, 142, 30, 196, 98, 117, 187, 203, 134, 45, 87, 207, 6, 40, 205, 151, 192, 214, 214, 139, 206, 36, 121, 162, 25, 28, 206, 229, 18, 154, 136, 107, 204, 65, 235, 122, 185, 132, 50, 165, 227, 161, 234, 187, 27, 231, 212, 27, 113, 54, 208, 235, 204, 46, 47, 85, 217, 212, 6, 5, 222, 164, 126, 75, 51, 39, 94, 145, 145, 159, 255, 29, 240, 196, 214, 43, 242, 169, 34, 138, 132, 111, 181, 251, 51, 100, 115, 156, 246, 20, 179, 242, 151, 174, 252, 146, 226, 109, 180, 228, 254, 82, 143, 136, 145, 239, 4, 163, 200, 121, 67, 9, 11, 192, 42, 211, 156, 37, 16, 169, 120, 181, 223, 204, 86, 98, 174, 15, 46, 85, 75, 156, 43, 98, 90, 90, 158, 8, 135, 228, 42, 231, 56, 201, 199, 80, 141, 242, 25, 34, 169, 190, 232, 245, 47, 73, 17, 195, 41, 168, 247, 75, 124, 125, 201, 38, 85, 69, 132, 255, 113, 31, 89, 209, 45, 8, 142, 77, 148, 109, 204, 246, 229, 34, 22, 213, 34, 255, 106, 3, 42, 161, 193, 77, 135, 204, 225, 218, 48, 3, 254, 213, 42, 199, 174, 123, 143, 86, 217, 94, 137, 239, 137, 99, 200, 251, 208, 39, 101, 154, 44, 7, 26, 125, 245, 76, 122, 201, 11, 190, 108, 134, 231, 225, 43, 8, 158, 154, 158, 37, 191, 27, 72, 150, 249, 39, 230, 240, 58, 76, 61, 59, 127, 14, 172, 38, 117, 115, 231, 148, 243, 194, 3, 213, 191, 219, 84, 101, 30, 210, 88, 191, 188, 113, 92, 66, 253, 166, 28, 146, 23, 51, 85, 65, 217, 233, 190, 248, 126, 238, 242, 244, 113, 189, 105, 192, 143, 189, 236, 37, 222, 28, 212, 33, 101, 138, 157, 203, 134, 87, 129, 74, 122, 251, 3, 202, 170, 239, 162, 148, 182, 203, 183, 157, 130, 115, 213, 90, 4, 96, 25, 196, 143, 234, 135, 14, 0, 103, 8, 178, 46, 205, 167, 74, 183, 57, 201, 148, 226, 211, 177, 145, 85, 144, 34, 66, 144, 101, 192, 93, 86, 205, 82, 35, 231, 189, 37, 56, 59, 121, 40, 108, 211, 252, 202, 71, 209, 174, 29, 171, 63, 75, 226, 253, 6, 106, 207, 195, 184, 134, 148, 172, 59, 167, 223, 138, 168, 181, 51, 85, 107, 239, 40, 201, 2, 236, 162, 34, 243, 200, 227, 21, 180, 114, 11, 33, 191, 87, 55, 119, 41, 126, 220, 86, 243, 165, 101, 67, 208, 29, 191, 16, 138, 156, 196, 200, 178, 9, 39, 202, 174, 182, 241, 166, 116, 90, 30, 185, 68, 199, 239, 177, 201, 163, 61, 195, 82, 180, 170, 34, 101, 201, 79, 150, 243, 34, 99, 197, 177, 224, 181, 203, 222, 205, 86, 60, 138, 175, 0, 84, 209, 163, 39, 233, 91, 106, 117, 23, 59, 6, 126, 120, 206, 73, 106, 245, 115, 17, 5, 19, 225, 61, 149, 216, 108, 251, 192, 196, 6, 155, 69, 58, 162, 106, 211, 167, 116, 191, 222, 187, 101, 51, 250, 76, 247, 187, 195, 40, 120, 236, 32, 86, 221, 8, 65, 202, 233, 74, 242, 25, 197, 188, 240, 41, 148, 107, 49, 198, 214, 142, 122, 186, 28, 193, 27, 2, 115, 140, 146, 126, 45, 52, 216, 53, 167, 60, 225, 147, 67, 50, 115, 24, 193, 230, 170, 141, 49, 253, 13, 251, 92, 207, 24, 157, 212, 223, 21, 158, 171, 90, 173, 218, 152, 1, 4, 74, 128, 245, 51, 167, 73, 61, 253, 20, 120, 152, 240, 195, 200, 169, 207, 207, 199, 179, 74, 115, 32, 172, 199, 119, 59, 66, 53, 124, 115, 104, 159, 26, 161, 110, 77, 238, 114, 225, 75, 25, 152, 24, 80, 84, 223, 99, 224, 99, 190, 88, 73, 235, 76, 117, 179, 228, 193, 205, 227, 61, 202, 175, 239, 231, 221, 176, 198, 240, 214, 66, 131, 123, 161, 255, 16, 184, 163, 207, 149, 32, 65, 160, 120, 224, 255, 106, 36, 131, 192, 71, 15, 168, 214, 81, 48, 126, 178, 172, 35, 174, 78, 144, 7, 159, 13, 254, 74, 177, 112, 85, 14, 86, 82, 92, 14, 214, 148, 241, 177, 165, 0, 15, 51, 162, 181, 60, 117, 39, 242, 239, 82, 227, 236, 216, 139, 193, 55, 113, 19, 133, 63, 76, 83, 4, 237, 100, 118, 87, 150, 163, 127, 176, 226, 140, 181, 2, 249, 73, 81, 192, 4, 196, 165, 197, 196, 81, 214, 193, 144, 239, 115, 210, 135, 229, 193, 131, 224, 18, 157, 211, 54, 189, 124, 73, 166, 180, 210, 23, 228, 78, 169, 106, 217, 242, 68, 86, 50, 138, 249, 136, 123, 99, 129, 144, 18, 33, 67, 117, 168, 140, 231, 225, 179, 70, 4, 209, 82, 40, 231, 4, 232, 248, 137, 234, 15, 194, 115, 71, 101, 219, 154, 36, 119, 29, 150, 31, 28, 6, 33, 251, 86, 176, 240, 192, 141, 246, 134, 158, 194, 124, 33, 173, 241, 9, 102, 21, 236, 162, 98, 17, 119, 128, 86, 87, 148, 250, 148, 219, 51, 133, 29, 252, 50, 108, 1, 22, 80, 80, 60, 104, 238, 72, 11, 179, 15, 206, 48, 189, 24, 108, 101, 203, 17, 117, 32, 196, 147, 250, 234, 49, 147, 132, 250, 105, 149, 170, 104, 192, 184, 115, 46, 248, 209, 182, 38, 60, 144, 231, 158, 96, 229, 121, 234, 12, 209, 120, 186, 192, 245, 124, 237, 19, 113, 117, 110, 163, 30, 26, 63, 49, 98, 8, 253, 24, 82, 51, 117, 64, 45, 250, 6, 74, 199, 184, 39, 122, 187, 75, 119, 101, 5, 62, 243, 82, 61, 239, 20, 65, 88, 194, 141, 218, 217, 127, 176, 235, 26, 88, 175, 75, 154, 86, 82, 111, 226, 147, 149, 229, 182, 17, 32, 95, 6, 116, 75, 7, 87, 108, 154, 94, 194, 250, 97, 106, 50, 125, 249, 29, 243, 218, 74, 218, 36, 136, 231, 41, 43, 199, 226, 225, 83, 248, 39, 115, 187, 233, 231, 28, 68, 168, 221, 37, 197, 152, 95, 128, 61, 109, 87, 87, 28, 45, 245, 191, 132, 168, 143, 181, 227, 13, 35, 22, 40, 179, 55, 230, 103, 145, 87, 61, 50, 104, 245, 173, 34, 19, 57, 22, 215, 86, 144, 0, 194, 139, 14, 235, 236, 119, 79, 186, 44, 185, 152, 190, 154, 91, 31, 132, 45, 68, 187, 97, 253, 122, 113, 4, 144, 92, 102, 7, 172, 235, 28, 36, 159, 27, 139, 245, 165, 97, 44, 80, 233, 55, 72, 221, 162, 147, 198, 151, 201, 174, 60, 186, 119, 78, 95, 141, 66, 99, 35, 32, 20, 61, 67, 71, 69, 166, 237, 165, 45, 194, 143, 44, 242, 96, 14, 54, 204, 121, 108, 115, 132, 172, 151, 47, 6, 217, 127, 202, 228, 166, 154, 94, 174, 198, 5, 62, 145, 112, 149, 165, 188, 55, 47, 13, 62, 75, 234, 208, 167, 136, 37, 209, 203, 188, 85, 72, 228, 173, 50, 51, 212, 69, 194, 112, 112, 26, 135, 27, 82, 219, 210, 93, 168, 193, 1, 167, 153, 116, 207, 12, 101, 157, 98, 8, 211, 170, 92, 200, 152, 33, 129, 81, 167, 2, 189, 245, 210, 6, 159, 83, 29, 211, 128, 148, 221, 28, 103, 45, 133, 245, 212, 39, 204, 94, 16, 92, 116, 251, 163, 18, 159, 160, 49, 38, 95, 212, 191, 235, 215, 248, 88, 202, 45, 45, 93, 244, 187, 79, 134, 75, 104, 83, 189, 31, 172, 21, 64, 217, 93, 123, 45, 161, 68, 50, 194, 147, 23, 19, 1, 37, 169, 199, 207, 140, 31, 184, 104, 81, 143, 200, 198, 14, 205, 209, 252, 228, 253, 247, 242, 132, 29, 43, 149, 212, 68, 29, 154, 221, 71, 150, 77, 169, 83, 200, 251, 152, 46, 214, 206, 245, 199, 53, 166, 12, 112, 216, 52, 135, 33, 2, 188, 75, 63, 110, 140, 42, 155, 136, 164, 175, 113, 54, 151, 16, 80, 8, 140, 220, 48, 252, 143, 70, 151, 255, 150, 253, 105, 192, 249, 80, 92, 142, 21, 76, 55, 223, 85, 224, 171, 61, 14, 81, 66, 24, 141, 70, 171, 223, 250, 200, 140, 132, 239, 151, 235, 4, 118, 218, 235, 51, 210, 0, 61, 54, 136, 131, 52, 98, 157, 243, 68, 99, 139, 159, 61, 208, 155, 124, 90, 189, 236, 37, 222, 28, 212, 33, 101, 138, 157, 203, 134, 87, 129, 74, 122, 251, 3, 202, 170, 239, 162, 148, 182, 203, 183, 157, 130, 115, 213, 90, 4, 96, 25, 196, 143, 234, 135, 14, 0, 103, 8, 178, 46, 205, 167, 74, 183, 57, 201, 148, 226, 211, 177, 145, 85, 144, 34, 66, 144, 101, 192, 93, 86, 205, 82, 35, 231, 189, 37, 56, 59, 121, 40, 108, 211, 252, 202, 71, 209, 174, 29, 171, 63, 75, 226, 253, 6, 106, 207, 195, 184, 134, 148, 172, 59, 167, 223, 138, 168, 181, 51, 85, 107, 239, 40, 201, 2, 236, 162, 34, 243, 200, 227, 21, 180, 114, 11, 33, 191, 87, 55, 119, 41, 126, 220, 86, 243, 171, 6, 126, 106, 15, 240, 10, 62, 186, 1, 93, 195, 223, 205, 122, 188, 96, 141, 116, 119, 239, 8, 101, 111, 226, 65, 153, 103, 109, 240, 238, 201, 133, 154, 97, 7, 164, 128, 8, 239, 201, 39, 153, 121, 233, 62, 104, 57, 194, 223, 107, 234, 83, 63, 117, 127, 15, 171, 177, 140, 226, 182, 166, 233, 207, 204, 175, 222, 11, 7, 78, 222, 243, 139, 61, 73, 157, 159, 146, 86, 223, 99, 13, 51, 57, 95, 141, 178, 3, 125, 3, 177, 21, 158, 43, 16, 64, 3, 35, 54, 6, 88, 72, 81, 133, 184, 179, 125, 243, 26, 144, 145, 51, 119, 72, 121, 218, 50, 190, 106, 233, 75, 190, 137, 222, 240, 124, 228, 52, 0, 69, 73, 216, 67, 65, 204, 4, 167, 173, 64, 105, 5, 164, 30, 17, 59, 1, 65, 159, 250, 254, 99, 159, 75, 170, 11, 40, 181, 130, 112, 214, 190, 10, 140, 254, 137, 249, 211, 65, 109, 159, 135, 11, 182, 194, 192, 112, 83, 73, 19, 73, 184, 58, 192, 204, 129, 60, 250, 180, 116, 136, 60, 214, 240, 155, 212, 2, 38, 34, 4, 89, 116, 98, 128, 174, 158, 113, 229, 236, 55, 95, 168, 88, 173, 231, 151, 32, 39, 127, 88, 222, 77, 27, 211, 1, 214, 34, 55, 204, 205, 186, 252, 201, 160, 99, 52, 38, 173, 187, 57, 126, 151, 1, 18, 5, 127, 67, 254, 222, 143, 200, 1, 241, 176, 10, 223, 156, 96, 61, 230, 53, 42, 22, 105, 153, 97, 225, 204, 98, 5, 67, 32, 247, 191, 186, 100, 32, 110, 216, 180, 108, 225, 54, 219, 68, 174, 71, 168, 205, 118, 38, 248, 144, 7, 160, 125, 112, 19, 125, 178, 165, 150, 239, 71, 163, 236, 204, 201, 40, 124, 125, 196, 17, 109, 238, 45, 177, 46, 107, 98, 48, 28, 191, 65, 86, 13, 133, 7, 60, 139, 16, 8, 235, 38, 185, 253, 187, 183, 207, 11, 233, 134, 246, 230, 241, 121, 110, 253, 126, 89, 29, 126, 177, 62, 51, 39, 95, 119, 123, 255, 188, 37, 244, 140, 187, 210, 55, 198, 175, 198, 218, 0, 8, 84, 103, 128, 73, 198, 0, 4, 235, 15, 193, 194, 239, 6, 56, 197, 251, 119, 135, 113, 166, 133, 243, 237, 192, 104, 180, 171, 13, 116, 144, 40, 192, 49, 119, 150, 69, 149, 23, 54, 234, 118, 49, 169, 242, 232, 80, 103, 30, 169, 52, 98, 49, 140, 255, 186, 65, 192, 224, 90, 86, 248, 173, 27, 183, 162, 183, 208, 145, 104, 210, 220, 136, 26, 227, 167, 161, 69, 73, 218, 119, 46, 126, 10, 224, 207, 60, 107, 47, 128, 194, 66, 127, 18, 104, 161, 209, 64, 0, 18, 45, 212, 82, 204, 204, 50, 98, 224, 32, 169, 240, 5, 180, 202, 189, 22, 201, 86, 250, 239, 212, 197, 56, 6, 45, 5, 24, 188, 98, 15, 75, 224, 227, 173, 61, 233, 116, 148, 98, 51, 165, 138, 170, 62, 94, 228, 187, 142, 57, 214, 181, 10, 6, 178, 122, 138, 242, 181, 54, 229, 80, 48, 48, 167, 54, 25, 245, 79, 63, 64, 72, 191, 44, 146, 70, 79, 109, 90, 32, 91, 141, 67, 251, 66, 37, 21, 155, 42, 3, 97, 61, 40, 106, 169, 225, 180, 5, 158, 116, 32, 148, 214, 27, 227, 40, 215, 227, 104, 91, 181, 203, 86, 76, 91, 0, 222, 98, 74, 178, 24, 1, 163, 217, 120, 207, 112, 153, 10, 231, 149, 147, 15, 90, 238, 106, 196, 130, 148, 98, 26, 208, 71, 47, 144, 72, 19, 23, 208, 43, 75, 38, 161, 225, 203, 133, 147, 249, 225, 233, 245, 225, 37, 222, 77, 227, 65, 12, 60, 155, 177, 76, 243, 93, 35, 168, 70, 180, 23, 148, 195, 239, 135, 63, 179, 193, 153, 73, 99, 230, 83, 220, 232, 190, 113, 86, 24, 130, 182, 79, 80, 250, 67, 144, 140, 128, 228, 110, 174, 255, 4, 37, 242, 168, 11, 2, 0, 184, 10, 140, 16, 71, 5, 82, 10, 253, 85, 168, 36, 76, 89, 222, 22, 115, 173, 206, 44, 252, 127, 242, 131, 111, 129, 79, 185, 20, 102, 38, 193, 74, 120, 182, 211, 9, 108, 225, 0, 250, 103, 67, 231, 218, 20, 11, 250, 33, 77, 157, 222, 239, 116, 253, 58, 232, 191, 196, 232, 100, 206, 56, 202, 68, 121, 33, 186, 22, 255, 114, 243, 66, 197, 25, 122, 223, 62, 11, 101, 92, 75, 36, 20, 165, 177, 66, 171, 215, 102, 109, 180, 38, 140, 26, 174, 159, 227, 113, 202, 106, 221, 58, 229, 111, 8, 248, 144, 140, 178, 225, 43, 151, 226, 211, 211, 49, 123, 98, 50, 50, 121, 68, 91, 154, 31, 106, 95, 52, 200, 208, 147, 73, 167, 95, 254, 81, 178, 41, 66, 7, 116, 143, 156, 147, 193, 60, 83, 116, 21, 105, 68, 133, 25, 39, 211, 80, 39, 0, 237, 159, 165, 230, 232, 7, 198, 140, 184, 38, 12, 210, 38, 149, 8, 36, 154, 108, 28, 100, 25, 144, 85, 86, 197, 68, 54, 175, 49, 167, 183, 4, 111, 174, 169, 125, 79, 201, 234, 129, 250, 49, 95, 233, 170, 26, 88, 76, 245, 178, 253, 34, 160, 61, 140, 30, 87, 105, 114, 35, 165, 10, 178, 35, 192, 237, 220, 249, 59, 18, 237, 162, 206, 250, 211, 218, 47, 74, 159, 162, 33, 208, 234, 96, 63, 104, 121, 36, 187, 162, 155, 7, 247, 173, 223, 10, 144, 21, 191, 60, 129, 109, 191, 65, 116, 54, 228, 29, 237, 174, 65, 145, 21, 240, 44, 63, 236, 88, 184, 28, 67, 55, 123, 9, 152, 72, 108, 108, 237, 194, 6, 42, 88, 221, 80, 109, 224, 123, 209, 53, 159, 7, 0, 49, 66, 54, 99, 36, 105, 97, 3, 7, 73, 159, 72, 142, 146, 141, 164, 150, 134, 74, 89, 192, 208, 96, 8, 3, 127, 118, 154, 48, 34, 209, 255, 145, 208, 178, 246, 209, 134, 55, 193, 124, 32, 34, 151, 212, 120, 155, 94, 137, 142, 201, 99, 196, 42, 162, 94, 109, 129, 3, 69, 73, 0, 91, 252, 83, 61, 226, 164, 137, 162, 17, 2, 83, 154, 202, 241, 189, 236, 182, 84, 162, 184, 79, 179, 52, 233, 176, 53, 151, 228, 80, 153, 220, 158, 133, 134, 160, 220, 171, 149, 170, 164, 64, 181, 27, 19, 249, 32, 77, 110, 194, 11, 18, 110, 79, 57, 198, 172, 56, 54, 217, 86, 88, 122, 150, 76, 94, 117, 149, 234, 147, 237, 22, 191, 87, 107, 204, 108, 95, 178, 38, 3, 158, 84, 85, 245, 208, 78, 59, 4, 1, 159, 0, 172, 90, 118, 165, 24, 228, 176, 56, 254, 90, 34, 4, 134, 245, 119, 34, 35, 210, 56, 140, 137, 216, 234, 218, 78, 202, 207, 205, 46, 116, 90, 200, 190, 160, 123, 213, 246, 177, 232, 114, 52, 141, 44, 223, 183, 194, 145, 57, 155, 69, 96, 68, 41, 176, 128, 233, 84, 209, 146, 5, 119, 144, 46, 204, 49, 231, 47, 249, 202, 62, 255, 213, 195, 148, 42, 216, 124, 122, 89, 131, 78, 158, 213, 218, 29, 32, 122, 56, 80, 233, 104, 42, 55, 189, 107, 194, 238, 245, 219, 88, 183, 209, 49, 211, 215, 169, 193, 248, 3, 217, 53, 165, 201, 20, 8, 208, 254, 23, 152, 88, 94, 8, 60, 214, 18, 234, 252, 251, 0, 95, 130, 207, 248, 26, 224, 84, 177, 80, 194, 83, 132, 147, 21, 166, 77, 40, 42, 220, 172, 151, 164, 190, 173, 177, 139, 255, 12, 10, 19, 62, 94, 92, 174, 4, 36, 9, 173, 249, 58, 100, 243, 221, 42, 221, 88, 19, 23, 252, 179, 226, 75, 43, 25, 8, 250, 174, 14, 39, 230, 247, 87, 97, 215, 51, 228, 46, 222, 103, 151, 200, 137, 73, 223, 202, 205, 127, 72, 132, 3, 195, 156, 97, 166, 22, 194, 236, 46, 57, 47, 49, 249, 90, 153, 15, 47, 198, 219, 110, 8, 203, 43, 140, 232, 191, 49, 44, 103, 30, 39, 168, 70, 136, 180, 23, 245, 82, 207, 240, 107, 65, 66, 74, 96, 178, 136, 191, 161, 92, 42, 225, 100, 210, 52, 229, 252, 189, 69, 110, 255, 244, 15, 21, 209, 140, 80, 203, 140, 85, 205, 8, 135, 86, 176, 166, 216, 91, 189, 196, 79, 80, 246, 106, 41, 248, 185, 195, 46, 179, 168, 109, 71, 121, 153, 143, 111, 63, 22, 69, 52, 37, 2, 155, 145, 104, 85, 43, 47, 69, 60, 65, 22, 19, 198, 104, 215, 56, 12, 184, 98, 37, 32, 199, 106, 71, 115, 176, 75, 122, 248, 39, 177, 189, 244, 72, 96, 135, 214, 77, 209, 140, 68, 180, 102, 233, 127, 212, 59, 4, 181, 231, 62, 225, 240, 62, 18, 179, 44, 59, 135, 47, 197, 182, 6, 100, 162, 56, 159, 43, 35, 209, 35, 197, 203, 143, 58, 139, 166, 13, 80, 9, 242, 49, 45, 99, 115, 238, 190, 236, 47, 250, 96, 28, 6, 119, 197, 178, 112, 171, 50, 41, 143, 171, 212, 168, 8, 51, 212, 90, 171, 75, 47, 156, 103, 80, 28, 172, 228, 49, 227, 215, 213, 62, 111, 153, 20, 112, 179, 11, 16, 60, 207, 161, 86, 116, 116, 250, 81, 74, 232, 151, 34, 165, 85, 139, 202, 161, 208, 179, 141, 201, 224, 108, 168, 30, 54, 32, 34, 4, 243, 35, 18, 47, 174, 240, 115, 229, 17, 185, 144, 180, 30, 239, 68, 235, 182, 77, 76, 207, 102, 165, 1, 200, 145, 125, 139, 253, 239, 40, 83, 255, 171, 78, 120, 109, 92, 120, 76, 120, 205, 116, 211, 161, 17, 76, 109, 126, 28, 241, 63, 183, 39, 177, 224, 192, 198, 137, 110, 225, 202, 64, 6, 239, 237, 121, 13, 35, 19, 205, 39, 43, 230, 203, 77, 184, 99, 145, 240, 37, 114, 134, 117, 17, 54, 9, 95, 193, 88, 65, 126, 39, 146, 126, 62, 114, 55, 187, 222, 121, 145, 149, 211, 121, 6, 17, 107, 175, 89, 122, 34, 44, 116, 218, 126, 187, 71, 191, 16, 228, 98, 23, 87, 77, 81, 13, 14, 38, 157, 141, 169, 233, 29, 98, 152, 8, 234, 96, 91, 77, 120, 220, 211, 46, 121, 180, 111, 168, 40, 242, 38, 236, 168, 111, 10, 85, 94, 133, 45, 74, 250, 28, 253, 107, 199, 6, 218, 55, 207, 103, 119, 97, 160, 250, 176, 135, 252, 21, 176, 224, 188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 89, 53, 19, 83, 80, 184, 110, 48, 13, 148, 38, 57, 0, 0, 0, 0, 89, 53, 19, 83, 80, 184, 110, 48, 13, 148, 38, 57, 0, 0, 0, 0, 89, 53, 19, 83, 53, 157, 46, 228, 44, 100, 6, 157, 0, 0, 0, 0, 89, 53, 19, 83, 49, 100, 95, 92, 3, 214, 107, 168, 0, 0, 0, 0, 89, 53, 19, 83, 105, 200, 47, 192, 42, 36, 168, 23, 0, 0, 0, 0, 89, 53, 19, 83, 103, 248, 160, 44, 8, 171, 233, 143, 0, 0, 0, 0, 89, 53, 19, 83, 43, 27, 189, 16, 28, 10, 94, 76, 0, 0, 0, 0, 89, 53, 19, 68, 242, 185, 50, 196, 1, 216, 57, 65, 0, 0, 0, 0, 89, 53, 19, 139, 37, 34, 243, 88, 5, 112, 102, 11, 0, 0, 0, 0, 89, 53, 19, 83, 123, 8, 171, 64, 33, 188, 59, 16, 0, 0, 0, 0, 89, 53, 19, 163, 245, 104, 124, 68, 9, 98, 25, 235, 0, 0, 0, 0, 89, 53, 19, 139, 65, 107, 226, 4, 8, 144, 155, 158, 0, 0, 0, 0, 89, 53, 19, 234, 192, 216, 187, 232, 5, 154, 84, 215, 0, 0, 0, 0, 89, 53, 19, 191, 0, 65, 23, 88, 9, 157, 187, 194, 0, 0, 0, 0, 89, 53, 19, 68, 167, 194, 165, 224, 10, 219, 222, 27, 0, 0, 0, 0, 89, 53, 18, 125, 157, 130, 214, 120, 4, 43, 225, 191, 0, 0, 0, 0, 89, 53, 21, 136, 206, 70, 37, 64, 17, 207, 214, 132, 0, 0, 0, 0, 89, 53, 19, 234, 199, 35, 129, 64, 7, 207, 4, 156, 0, 0, 0, 0, 89, 53, 18, 125, 97, 236, 218, 12, 5, 48, 197, 88, 0, 0, 0, 0, 89, 53, 15, 12, 8, 154, 2, 16, 3, 86, 85, 126, 0, 0, 0, 0, 89, 53, 21, 208, 43, 160, 216, 240, 2, 140, 168, 206, 0, 0, 0, 0, 89, 53, 21, 136, 214, 251, 86, 200, 5, 246, 36, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196, 143, 72, 43, 189, 196, 235, 72, 200, 143, 170, 119, 170, 14, 207, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 177, 44, 72, 181, 35, 106, 117, 91, 162, 103, 79, 11, 78, 19, 252, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 184, 42, 92, 84, 222, 230, 10, 98, 4, 230, 99, 133, 197, 27, 254, 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 162, 126, 6, 242, 61, 40, 168, 218, 169, 143, 71, 23, 196, 156, 153, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 205, 239, 124, 102, 148, 144, 125, 146, 206, 3, 105, 225, 248, 47, 202, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95, 181, 12, 13, 236, 84, 197, 170, 108, 219, 112, 173, 238, 156, 144, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 81, 73, 188, 4, 159, 115, 0, 157, 56, 153, 159, 78, 129, 71, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 209, 66, 138, 207, 127, 187, 145, 247, 131, 145, 228, 118, 103, 112, 67, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 243, 190, 107, 187, 182, 254, 134, 98, 69, 119, 21, 167, 187, 240, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 193, 218, 206, 184, 36, 238, 107, 27, 165, 73, 170, 187, 47, 157, 136, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 180, 158, 110, 146, 49, 211, 192, 184, 117, 18, 88, 103, 37, 136, 172, 79, 27, 160, 123, 142, 7, 160, 51, 68, 215, 216, 144, 248, 89, 147, 47, 63, 12, 16, 98, 29, 203, 214, 232, 245, 170, 92, 58, 10, 193, 138, 40, 201, 159, 227, 160, 120, 50, 119, 93, 239, 86, 22, 245, 98, 16, 169, 180, 14, 136, 163, 121, 187, 213, 145, 33, 8, 153, 67, 177, 91, 117, 75, 65, 71, 46, 130, 81, 192];
+	let compressed = compress(&block, blocks_swapper());
+	let decompressed = decompress(&compressed, blocks_swapper());
+	assert_eq!(decompressed.into_vec(), block);
+}
diff --git a/util/rlp_derive/Cargo.toml b/util/rlp_derive/Cargo.toml
index 81e50cd443e42caea401088ea71972377489f5d9..8a78eff41f6cfaef2ac791c1262450fe7c190cb6 100644
--- a/util/rlp_derive/Cargo.toml
+++ b/util/rlp_derive/Cargo.toml
@@ -8,8 +8,8 @@ name = "rlp_derive"
 proc-macro = true
 
 [dependencies]
-syn = "0.11.11"
-quote = "0.3.15"
+syn = "0.12"
+quote = "0.4.2"
 
 [dev-dependencies]
 rlp = { path = "../rlp" }
diff --git a/util/rlp_derive/src/de.rs b/util/rlp_derive/src/de.rs
index a3e32739a99a9b85836953a137aa909dc7a118f6..7432d3e2e83aaff0f607a149356075d2cb0f9dd6 100644
--- a/util/rlp_derive/src/de.rs
+++ b/util/rlp_derive/src/de.rs
@@ -23,20 +23,16 @@ fn decodable_wrapper_parse_quotes() -> ParseQuotes {
 }
 
 pub fn impl_decodable(ast: &syn::DeriveInput) -> quote::Tokens {
-	let body = match ast.body {
-		syn::Body::Struct(ref s) => s,
+	let body = match ast.data {
+		syn::Data::Struct(ref s) => s,
 		_ => panic!("#[derive(RlpDecodable)] is only defined for structs."),
 	};
 
-	let stmts: Vec<_> = match *body {
-		syn::VariantData::Struct(ref fields) | syn::VariantData::Tuple(ref fields) =>
-			fields.iter().enumerate().map(decodable_field_map).collect(),
-		syn::VariantData::Unit => panic!("#[derive(RlpDecodable)] is not defined for Unit structs."),
-	};
 
+	let stmts: Vec<_> = body.fields.iter().enumerate().map(decodable_field_map).collect();
 	let name = &ast.ident;
 
-	let dummy_const = syn::Ident::new(format!("_IMPL_RLP_DECODABLE_FOR_{}", name));
+	let dummy_const: syn::Ident = format!("_IMPL_RLP_DECODABLE_FOR_{}", name).into();
 	let impl_block = quote! {
 		impl rlp::Decodable for #name {
 			fn decode(rlp: &rlp::UntrustedRlp) -> Result<Self, rlp::DecoderError> {
@@ -59,26 +55,24 @@ pub fn impl_decodable(ast: &syn::DeriveInput) -> quote::Tokens {
 }
 
 pub fn impl_decodable_wrapper(ast: &syn::DeriveInput) -> quote::Tokens {
-	let body = match ast.body {
-		syn::Body::Struct(ref s) => s,
+	let body = match ast.data {
+		syn::Data::Struct(ref s) => s,
 		_ => panic!("#[derive(RlpDecodableWrapper)] is only defined for structs."),
 	};
 
-	let stmt = match *body {
-		syn::VariantData::Struct(ref fields) | syn::VariantData::Tuple(ref fields) => {
-			if fields.len() == 1 {
-				let field = fields.first().expect("fields.len() == 1; qed");
-				decodable_field(0, field, decodable_wrapper_parse_quotes())
-			} else {
-				panic!("#[derive(RlpDecodableWrapper)] is only defined for structs with one field.")
-			}
-		},
-		syn::VariantData::Unit => panic!("#[derive(RlpDecodableWrapper)] is not defined for Unit structs."),
+	let stmt = {
+		let fields: Vec<_> = body.fields.iter().collect();
+		if fields.len() == 1 {
+			let field = fields.first().expect("fields.len() == 1; qed");
+			decodable_field(0, field, decodable_wrapper_parse_quotes())
+		} else {
+			panic!("#[derive(RlpEncodableWrapper)] is only defined for structs with one field.")
+		}
 	};
 
 	let name = &ast.ident;
 
-	let dummy_const = syn::Ident::new(format!("_IMPL_RLP_DECODABLE_FOR_{}", name));
+	let dummy_const: syn::Ident = format!("_IMPL_RLP_DECODABLE_FOR_{}", name).into();
 	let impl_block = quote! {
 		impl rlp::Decodable for #name {
 			fn decode(rlp: &rlp::UntrustedRlp) -> Result<Self, rlp::DecoderError> {
@@ -105,20 +99,22 @@ fn decodable_field_map(tuple: (usize, &syn::Field)) -> quote::Tokens {
 }
 
 fn decodable_field(index: usize, field: &syn::Field, quotes: ParseQuotes) -> quote::Tokens {
-	let ident = match field.ident {
-		Some(ref ident) => ident.to_string(),
-		None => index.to_string(),
+	let id = match field.ident {
+		Some(ref ident) => quote! { #ident },
+		None => {
+			let index: syn::Index = index.into();
+			quote! { #index }
+		}
 	};
 
-	let id = syn::Ident::new(ident);
-	let index = syn::Ident::new(index.to_string());
+	let index = quote! { #index };
 
 	let single = quotes.single;
 	let list = quotes.list;
 
 	match field.ty {
-		syn::Ty::Path(_, ref path) => {
-			let ident = &path.segments.first().expect("there must be at least 1 segment").ident;
+		syn::Type::Path(ref path) => {
+			let ident = &path.path.segments.first().expect("there must be at least 1 segment").value().ident;
 			if &ident.to_string() == "Vec" {
 				if quotes.takes_index {
 					quote! { #id: #list(#index)?, }
diff --git a/util/rlp_derive/src/en.rs b/util/rlp_derive/src/en.rs
index 77f361200de89b3fce51bafc7e2637081afdbbf4..484ac015e5dcf72f56befc572779c60d8c0217a0 100644
--- a/util/rlp_derive/src/en.rs
+++ b/util/rlp_derive/src/en.rs
@@ -1,21 +1,17 @@
 use {syn, quote};
 
 pub fn impl_encodable(ast: &syn::DeriveInput) -> quote::Tokens {
-	let body = match ast.body {
-		syn::Body::Struct(ref s) => s,
+	let body = match ast.data {
+		syn::Data::Struct(ref s) => s,
 		_ => panic!("#[derive(RlpEncodable)] is only defined for structs."),
 	};
 
-	let stmts: Vec<_> = match *body {
-		syn::VariantData::Struct(ref fields) | syn::VariantData::Tuple(ref fields) =>
-			fields.iter().enumerate().map(encodable_field_map).collect(),
-		syn::VariantData::Unit => panic!("#[derive(RlpEncodable)] is not defined for Unit structs."),
-	};
-
+	let stmts: Vec<_> = body.fields.iter().enumerate().map(encodable_field_map).collect();
 	let name = &ast.ident;
 
-	let stmts_len = syn::Ident::new(stmts.len().to_string());
-	let dummy_const = syn::Ident::new(format!("_IMPL_RLP_ENCODABLE_FOR_{}", name));
+	let stmts_len = stmts.len();
+	let stmts_len = quote! { #stmts_len };
+	let dummy_const: syn::Ident = format!("_IMPL_RLP_ENCODABLE_FOR_{}", name).into();
 	let impl_block = quote! {
 		impl rlp::Encodable for #name {
 			fn rlp_append(&self, stream: &mut rlp::RlpStream) {
@@ -35,26 +31,24 @@ pub fn impl_encodable(ast: &syn::DeriveInput) -> quote::Tokens {
 }
 
 pub fn impl_encodable_wrapper(ast: &syn::DeriveInput) -> quote::Tokens {
-	let body = match ast.body {
-		syn::Body::Struct(ref s) => s,
+	let body = match ast.data {
+		syn::Data::Struct(ref s) => s,
 		_ => panic!("#[derive(RlpEncodableWrapper)] is only defined for structs."),
 	};
 
-	let stmt = match *body {
-		syn::VariantData::Struct(ref fields) | syn::VariantData::Tuple(ref fields) => {
-			if fields.len() == 1 {
-				let field = fields.first().expect("fields.len() == 1; qed");
-				encodable_field(0, field)
-			} else {
-				panic!("#[derive(RlpEncodableWrapper)] is only defined for structs with one field.")
-			}
-		},
-		syn::VariantData::Unit => panic!("#[derive(RlpEncodableWrapper)] is not defined for Unit structs."),
+	let stmt = {
+		let fields: Vec<_> = body.fields.iter().collect();
+		if fields.len() == 1 {
+			let field = fields.first().expect("fields.len() == 1; qed");
+			encodable_field(0, field)
+		} else {
+			panic!("#[derive(RlpEncodableWrapper)] is only defined for structs with one field.")
+		}
 	};
 
 	let name = &ast.ident;
 
-	let dummy_const = syn::Ident::new(format!("_IMPL_RLP_ENCODABLE_FOR_{}", name));
+	let dummy_const: syn::Ident = format!("_IMPL_RLP_ENCODABLE_FOR_{}", name).into();
 	let impl_block = quote! {
 		impl rlp::Encodable for #name {
 			fn rlp_append(&self, stream: &mut rlp::RlpStream) {
@@ -78,22 +72,25 @@ fn encodable_field_map(tuple: (usize, &syn::Field)) -> quote::Tokens {
 
 fn encodable_field(index: usize, field: &syn::Field) -> quote::Tokens {
 	let ident = match field.ident {
-		Some(ref ident) => ident.to_string(),
-		None => index.to_string(),
+		Some(ref ident) => quote! { #ident },
+		None => {
+			let index: syn::Index = index.into();
+			quote! { #index }
+		}
 	};
 
-	let id = syn::Ident::new(format!("self.{}", ident));
+	let id = quote! { self.#ident };
 
 	match field.ty {
-		syn::Ty::Path(_, ref path) => {
-			let top_segment = path.segments.first().expect("there must be at least 1 segment");
-			let ident = &top_segment.ident;
+		syn::Type::Path(ref path) => {
+			let top_segment = path.path.segments.first().expect("there must be at least 1 segment");
+			let ident = &top_segment.value().ident;
 			if &ident.to_string() == "Vec" {
-				let inner_ident = match top_segment.parameters {
-					syn::PathParameters::AngleBracketed(ref angle) => {
-						let ty = angle.types.first().expect("Vec has only one angle bracketed type; qed");
-						match *ty {
-							syn::Ty::Path(_, ref path) => &path.segments.first().expect("there must be at least 1 segment").ident,
+				let inner_ident = match top_segment.value().arguments {
+					syn::PathArguments::AngleBracketed(ref angle) => {
+						let ty = angle.args.first().expect("Vec has only one angle bracketed type; qed");
+						match **ty.value() {
+							syn::GenericArgument::Type(syn::Type::Path(ref path)) => &path.path.segments.first().expect("there must be at least 1 segment").value().ident,
 							_ => panic!("rlp_derive not supported"),
 						}
 					},
diff --git a/util/rlp_derive/src/lib.rs b/util/rlp_derive/src/lib.rs
index 9c598d08e80d7298ee0efc62a96573e1df882fab..93f8d9619d10b861d5d1baba967213de2291e6a0 100644
--- a/util/rlp_derive/src/lib.rs
+++ b/util/rlp_derive/src/lib.rs
@@ -12,32 +12,28 @@ use de::{impl_decodable, impl_decodable_wrapper};
 
 #[proc_macro_derive(RlpEncodable)]
 pub fn encodable(input: TokenStream) -> TokenStream {
-	let s = input.to_string();
-	let ast = syn::parse_derive_input(&s).unwrap();
+	let ast = syn::parse(input).unwrap();
 	let gen = impl_encodable(&ast);
-	gen.parse().unwrap()
+	gen.into()
 }
 
 #[proc_macro_derive(RlpEncodableWrapper)]
 pub fn encodable_wrapper(input: TokenStream) -> TokenStream {
-	let s = input.to_string();
-	let ast = syn::parse_derive_input(&s).unwrap();
+	let ast = syn::parse(input).unwrap();
 	let gen = impl_encodable_wrapper(&ast);
-	gen.parse().unwrap()
+	gen.into()
 }
 
 #[proc_macro_derive(RlpDecodable)]
 pub fn decodable(input: TokenStream) -> TokenStream {
-	let s = input.to_string();
-	let ast = syn::parse_derive_input(&s).unwrap();
+	let ast = syn::parse(input).unwrap();
 	let gen = impl_decodable(&ast);
-	gen.parse().unwrap()
+	gen.into()
 }
 
 #[proc_macro_derive(RlpDecodableWrapper)]
 pub fn decodable_wrapper(input: TokenStream) -> TokenStream {
-	let s = input.to_string();
-	let ast = syn::parse_derive_input(&s).unwrap();
+	let ast = syn::parse(input).unwrap();
 	let gen = impl_decodable_wrapper(&ast);
-	gen.parse().unwrap()
+	gen.into()
 }
diff --git a/util/sha3/src/lib.rs b/util/sha3/src/lib.rs
deleted file mode 100644
index 77ecd84c399f695f8b50b99f649dae45b0eae009..0000000000000000000000000000000000000000
--- a/util/sha3/src/lib.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern {
-	pub fn sha3_256(out: *mut u8, outlen: usize, input: *const u8, inputlen: usize) -> i32;
-	pub fn sha3_512(out: *mut u8, outlen: usize, input: *const u8, inputlen: usize) -> i32;
-}
diff --git a/util/src/error.rs b/util/src/error.rs
deleted file mode 100644
index b0e887434a1d9a6f78f6e637de734d8986926944..0000000000000000000000000000000000000000
--- a/util/src/error.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! General error types for use in ethcore.
-
-use rustc_hex::FromHexError;
-use rlp::DecoderError;
-use std::fmt;
-use bigint::hash::H256;
-
-#[derive(Debug)]
-/// Error in database subsystem.
-pub enum BaseDataError {
-	/// An entry was removed more times than inserted.
-	NegativelyReferencedHash(H256),
-	/// A committed value was inserted more than once.
-	AlreadyExists(H256),
-}
-
-impl fmt::Display for BaseDataError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		match *self {
-			BaseDataError::NegativelyReferencedHash(hash) =>
-				write!(f, "Entry {} removed from database more times than it was added.", hash),
-			BaseDataError::AlreadyExists(hash) =>
-				write!(f, "Committed key already exists in database: {}", hash),
-		}
-	}
-}
-
-#[derive(Debug)]
-/// General error type which should be capable of representing all errors in ethcore.
-pub enum UtilError {
-	/// Error concerning the Rust standard library's IO subsystem.
-	StdIo(::std::io::Error),
-	/// Error concerning the hex conversion logic.
-	FromHex(FromHexError),
-	/// Error concerning the database abstraction logic.
-	BaseData(BaseDataError),
-	/// Error concerning the RLP decoder.
-	Decoder(DecoderError),
-	/// Miscellaneous error described by a string.
-	SimpleString(String),
-	/// Error from a bad input size being given for the needed output.
-	BadSize,
-	/// Error from snappy.
-	Snappy(::snappy::InvalidInput),
-}
-
-impl fmt::Display for UtilError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		match *self {
-			UtilError::StdIo(ref err) => f.write_fmt(format_args!("{}", err)),
-			UtilError::FromHex(ref err) => f.write_fmt(format_args!("{}", err)),
-			UtilError::BaseData(ref err) => f.write_fmt(format_args!("{}", err)),
-			UtilError::Decoder(ref err) => f.write_fmt(format_args!("{}", err)),
-			UtilError::SimpleString(ref msg) => f.write_str(msg),
-			UtilError::BadSize => f.write_str("Bad input size."),
-			UtilError::Snappy(ref err) => f.write_fmt(format_args!("{}", err)),
-		}
-	}
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-/// Error indicating an expected value was not found.
-pub struct Mismatch<T: fmt::Debug> {
-	/// Value expected.
-	pub expected: T,
-	/// Value found.
-	pub found: T,
-}
-
-impl<T: fmt::Debug + fmt::Display> fmt::Display for Mismatch<T> {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		f.write_fmt(format_args!("Expected {}, found {}", self.expected, self.found))
-	}
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-/// Error indicating value found is outside of a valid range.
-pub struct OutOfBounds<T: fmt::Debug> {
-	/// Minimum allowed value.
-	pub min: Option<T>,
-	/// Maximum allowed value.
-	pub max: Option<T>,
-	/// Value found.
-	pub found: T,
-}
-
-impl<T: fmt::Debug + fmt::Display> fmt::Display for OutOfBounds<T> {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		let msg = match (self.min.as_ref(), self.max.as_ref()) {
-			(Some(min), Some(max)) => format!("Min={}, Max={}", min, max),
-			(Some(min), _) => format!("Min={}", min),
-			(_, Some(max)) => format!("Max={}", max),
-			(None, None) => "".into(),
-		};
-
-		f.write_fmt(format_args!("Value {} out of bounds. {}", self.found, msg))
-	}
-}
-
-impl From<FromHexError> for UtilError {
-	fn from(err: FromHexError) -> UtilError {
-		UtilError::FromHex(err)
-	}
-}
-
-impl From<BaseDataError> for UtilError {
-	fn from(err: BaseDataError) -> UtilError {
-		UtilError::BaseData(err)
-	}
-}
-
-impl From<::std::io::Error> for UtilError {
-	fn from(err: ::std::io::Error) -> UtilError {
-		UtilError::StdIo(err)
-	}
-}
-
-impl From<::rlp::DecoderError> for UtilError {
-	fn from(err: ::rlp::DecoderError) -> UtilError {
-		UtilError::Decoder(err)
-	}
-}
-
-impl From<String> for UtilError {
-	fn from(err: String) -> UtilError {
-		UtilError::SimpleString(err)
-	}
-}
-
-impl From<::snappy::InvalidInput> for UtilError {
-	fn from(err: ::snappy::InvalidInput) -> UtilError {
-		UtilError::Snappy(err)
-	}
-}
-
-// TODO: uncomment below once https://github.com/rust-lang/rust/issues/27336 sorted.
-/*#![feature(concat_idents)]
-macro_rules! assimilate {
-    ($name:ident) => (
-		impl From<concat_idents!($name, Error)> for Error {
-			fn from(err: concat_idents!($name, Error)) -> Error {
-				Error:: $name (err)
-			}
-		}
-    )
-}
-assimilate!(FromHex);
-assimilate!(BaseData);*/
diff --git a/util/src/lib.rs b/util/src/lib.rs
deleted file mode 100644
index 46730fe9cece136cad6c361c91ae21ad19fb255d..0000000000000000000000000000000000000000
--- a/util/src/lib.rs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![warn(missing_docs)]
-#![cfg_attr(feature="dev", feature(plugin))]
-#![cfg_attr(feature="dev", plugin(clippy))]
-
-// Clippy settings
-// Most of the time much more readable
-#![cfg_attr(feature="dev", allow(needless_range_loop))]
-// Shorter than if-else
-#![cfg_attr(feature="dev", allow(match_bool))]
-// We use that to be more explicit about handled cases
-#![cfg_attr(feature="dev", allow(match_same_arms))]
-// Keeps consistency (all lines with `.clone()`).
-#![cfg_attr(feature="dev", allow(clone_on_copy))]
-// Some false positives when doing pattern matching.
-#![cfg_attr(feature="dev", allow(needless_borrow))]
-// TODO [todr] a lot of warnings to be fixed
-#![cfg_attr(feature="dev", allow(assign_op_pattern))]
-
-
-//! Ethcore-util library
-//!
-//! ### Rust version:
-//! - nightly
-//!
-//! ### Supported platforms:
-//! - OSX
-//! - Linux
-//!
-//! ### Building:
-//!
-//! - Ubuntu 14.04 and later:
-//!
-//!   ```bash
-//!   # install rocksdb
-//!   add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main"
-//!   apt-get update
-//!   apt-get install -y --force-yes librocksdb
-//!
-//!   # install multirust
-//!   curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
-//!
-//!   # install nightly and make it default
-//!   multirust update nightly && multirust default nightly
-//!
-//!   # export rust LIBRARY_PATH
-//!   export LIBRARY_PATH=/usr/local/lib
-//!
-//!   # download and build parity
-//!   git clone https://github.com/paritytech/parity
-//!   cd parity
-//!   cargo build --release
-//!   ```
-//!
-//! - OSX:
-//!
-//!   ```bash
-//!   # install rocksdb && multirust
-//!   brew update
-//!   brew install rocksdb
-//!   brew install multirust
-//!
-//!   # install nightly and make it default
-//!   multirust update nightly && multirust default nightly
-//!
-//!   # export rust LIBRARY_PATH
-//!   export LIBRARY_PATH=/usr/local/lib
-//!
-//!   # download and build parity
-//!   git clone https://github.com/paritytech/parity
-//!   cd parity
-//!   cargo build --release
-//!   ```
-
-extern crate rustc_hex;
-extern crate rand;
-extern crate rocksdb;
-extern crate env_logger;
-extern crate crypto as rcrypto;
-extern crate secp256k1;
-extern crate elastic_array;
-extern crate time;
-extern crate ethcore_devtools as devtools;
-extern crate libc;
-extern crate target_info;
-extern crate ethcore_bigint as bigint;
-extern crate parking_lot;
-extern crate ansi_term;
-extern crate tiny_keccak;
-extern crate rlp;
-extern crate regex;
-extern crate lru_cache;
-extern crate heapsize;
-extern crate ethcore_logger;
-
-#[macro_use]
-extern crate log as rlog;
-
-#[macro_use]
-pub mod common;
-pub mod error;
-pub mod bytes;
-pub mod misc;
-pub mod vector;
-pub mod sha3;
-pub mod hashdb;
-pub mod memorydb;
-pub mod migration;
-pub mod overlaydb;
-pub mod journaldb;
-pub mod kvdb;
-pub mod triehash;
-pub mod trie;
-pub mod nibbleslice;
-pub mod nibblevec;
-pub mod semantic_version;
-pub mod snappy;
-pub mod cache;
-mod timer;
-
-pub use misc::*;
-pub use hashdb::*;
-pub use memorydb::MemoryDB;
-pub use overlaydb::*;
-pub use journaldb::JournalDB;
-pub use triehash::*;
-pub use trie::{Trie, TrieMut, TrieDB, TrieDBMut, TrieFactory, TrieError, SecTrieDB, SecTrieDBMut};
-pub use semantic_version::*;
-pub use kvdb::*;
-pub use timer::*;
-pub use error::*;
-pub use bytes::*;
-pub use vector::*;
-pub use sha3::*;
-pub use bigint::prelude::*;
-pub use bigint::hash;
-
-pub use ansi_term::{Colour, Style};
-pub use heapsize::HeapSizeOf;
-pub use parking_lot::{Condvar, Mutex, MutexGuard, RwLock, RwLockReadGuard, RwLockWriteGuard};
-
-/// 160-bit integer representing account address
-pub type Address = H160;
diff --git a/util/src/semantic_version.rs b/util/src/semantic_version.rs
deleted file mode 100644
index fe4b8727fc0c9876cac419896dc09144b9f7419e..0000000000000000000000000000000000000000
--- a/util/src/semantic_version.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Semantic version formatting and comparing.
-
-/// A version value with strict meaning. Use `as_u32` to convert to a simple integer.
-///
-/// # Example
-/// ```
-/// extern crate ethcore_util as util;
-/// use util::semantic_version::*;
-///
-/// fn main() {
-///   assert_eq!(SemanticVersion::new(1, 2, 3).as_u32(), 0x010203);
-/// }
-/// ```
-pub struct SemanticVersion {
-	/// Major version - API/feature removals & breaking changes.
-	pub major: u8,
-	/// Minor version - API/feature additions.
-	pub minor: u8,
-	/// Tiny version - bug fixes.
-	pub tiny: u8,
-}
-
-impl SemanticVersion {
-	/// Create a new object.
-	pub fn new(major: u8, minor: u8, tiny: u8) -> SemanticVersion { SemanticVersion{major: major, minor: minor, tiny: tiny} }
-
-	/// Convert to a `u32` representation.
-	pub fn as_u32(&self) -> u32 { ((self.major as u32) << 16) + ((self.minor as u32) << 8) + self.tiny as u32 }
-}
-
-// TODO: implement Eq, Comparison and Debug/Display for SemanticVersion.
diff --git a/util/src/sha3.rs b/util/src/sha3.rs
deleted file mode 100644
index 8adcfbfeec982fa7f8fb44fe17061eb49d8d454e..0000000000000000000000000000000000000000
--- a/util/src/sha3.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Wrapper around tiny-keccak crate as well as common hash constants.
-extern crate sha3 as sha3_ext;
-
-use std::io;
-use tiny_keccak::Keccak;
-use hash::H256;
-use self::sha3_ext::*;
-
-/// Get the SHA3 (i.e. Keccak) hash of the empty bytes string.
-pub const SHA3_EMPTY: H256 = H256( [0xc5, 0xd2, 0x46, 0x01, 0x86, 0xf7, 0x23, 0x3c, 0x92, 0x7e, 0x7d, 0xb2, 0xdc, 0xc7, 0x03, 0xc0, 0xe5, 0x00, 0xb6, 0x53, 0xca, 0x82, 0x27, 0x3b, 0x7b, 0xfa, 0xd8, 0x04, 0x5d, 0x85, 0xa4, 0x70] );
-
-/// The SHA3 of the RLP encoding of empty data.
-pub const SHA3_NULL_RLP: H256 = H256( [0x56, 0xe8, 0x1f, 0x17, 0x1b, 0xcc, 0x55, 0xa6, 0xff, 0x83, 0x45, 0xe6, 0x92, 0xc0, 0xf8, 0x6e, 0x5b, 0x48, 0xe0, 0x1b, 0x99, 0x6c, 0xad, 0xc0, 0x01, 0x62, 0x2f, 0xb5, 0xe3, 0x63, 0xb4, 0x21] );
-
-/// The SHA3 of the RLP encoding of empty list.
-pub const SHA3_EMPTY_LIST_RLP: H256 = H256( [0x1d, 0xcc, 0x4d, 0xe8, 0xde, 0xc7, 0x5d, 0x7a, 0xab, 0x85, 0xb5, 0x67, 0xb6, 0xcc, 0xd4, 0x1a, 0xd3, 0x12, 0x45, 0x1b, 0x94, 0x8a, 0x74, 0x13, 0xf0, 0xa1, 0x42, 0xfd, 0x40, 0xd4, 0x93, 0x47] );
-
-/// Types implementing this trait are sha3able.
-///
-/// ```
-/// extern crate ethcore_util as util;
-/// use std::str::FromStr;
-/// use util::sha3::*;
-/// use util::hash::*;
-///
-/// fn main() {
-/// 	assert_eq!([0u8; 0].sha3(), H256::from_str("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470").unwrap());
-/// }
-/// ```
-pub trait Hashable {
-	/// Calculate SHA3 of this object.
-	fn sha3(&self) -> H256;
-
-	/// Calculate SHA3 of this object and place result into dest.
-	fn sha3_into(&self, dest: &mut [u8]) {
-		self.sha3().copy_to(dest);
-	}
-}
-
-impl<T> Hashable for T where T: AsRef<[u8]> {
-	fn sha3(&self) -> H256 {
-		let mut ret: H256 = H256::zero();
-		self.sha3_into(&mut *ret);
-		ret
-	}
-	fn sha3_into(&self, dest: &mut [u8]) {
-		let input: &[u8] = self.as_ref();
-
-		unsafe {
-			sha3_256(dest.as_mut_ptr(), dest.len(), input.as_ptr(), input.len());
-		}
-	}
-}
-
-/// Calculate SHA3 of given stream.
-pub fn sha3(r: &mut io::BufRead) -> Result<H256, io::Error> {
-	let mut output = [0u8; 32];
-	let mut input = [0u8; 1024];
-	let mut sha3 = Keccak::new_keccak256();
-
-	// read file
-	loop {
-		let some = r.read(&mut input)?;
-		if some == 0 {
-			break;
-		}
-		sha3.update(&input[0..some]);
-	}
-
-	sha3.finalize(&mut output);
-	Ok(output.into())
-}
-
-#[cfg(test)]
-mod tests {
-	use std::fs;
-	use std::io::{Write, BufReader};
-	use super::*;
-
-	#[test]
-	fn sha3_empty() {
-		assert_eq!([0u8; 0].sha3(), SHA3_EMPTY);
-	}
-	#[test]
-	fn sha3_as() {
-		assert_eq!([0x41u8; 32].sha3(), From::from("59cad5948673622c1d64e2322488bf01619f7ff45789741b15a9f782ce9290a8"));
-	}
-
-	#[test]
-	fn should_sha3_a_file() {
-		// given
-		use devtools::RandomTempPath;
-		let path = RandomTempPath::new();
-		// Prepare file
-		{
-			let mut file = fs::File::create(&path).unwrap();
-			file.write_all(b"something").unwrap();
-		}
-
-		let mut file = BufReader::new(fs::File::open(&path).unwrap());
-		// when
-		let hash = sha3(&mut file).unwrap();
-
-		// then
-		assert_eq!(format!("{:?}", hash), "68371d7e884c168ae2022c82bd837d51837718a7f7dfb7aa3f753074a35e1d87");
-	}
-}
diff --git a/util/src/snappy.rs b/util/src/snappy.rs
deleted file mode 100644
index fd15bd307803062357272fad55d014c53aa9015c..0000000000000000000000000000000000000000
--- a/util/src/snappy.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Snappy compression bindings.
-
-use std::fmt;
-use libc::{c_char, c_int, size_t};
-
-const SNAPPY_OK: c_int = 0;
-const SNAPPY_INVALID_INPUT: c_int = 1;
-const SNAPPY_BUFFER_TOO_SMALL: c_int = 2;
-
-extern {
-	fn snappy_compress(
-		input: *const c_char,
-		input_len: size_t,
-		compressed: *mut c_char,
-		compressed_len: *mut size_t
-	) -> c_int;
-
-	fn snappy_max_compressed_length(source_len: size_t) -> size_t;
-
-	fn snappy_uncompress(
-		compressed: *const c_char,
-		compressed_len: size_t,
-		uncompressed: *mut c_char,
-		uncompressed_len: *mut size_t,
-	) -> c_int;
-
-	fn snappy_uncompressed_length(
-		compressed: *const c_char,
-		compressed_len: size_t,
-		result: *mut size_t,
-	) -> c_int;
-
-	fn snappy_validate_compressed_buffer(
-		compressed: *const c_char,
-		compressed_len: size_t,
-	) -> c_int;
-}
-
-/// Attempted to decompress an uncompressed buffer.
-#[derive(Debug)]
-pub struct InvalidInput;
-
-impl fmt::Display for InvalidInput {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "Attempted snappy decompression with invalid input")
-	}
-}
-
-/// The maximum compressed length given a size.
-pub fn max_compressed_len(len: usize) -> usize {
-	unsafe { snappy_max_compressed_length(len as size_t) as usize }
-}
-
-/// How large the given data will be when decompressed.
-pub fn decompressed_len(compressed: &[u8]) -> Result<usize, InvalidInput> {
-	let mut size: size_t = 0;
-	let len = compressed.len() as size_t;
-
-	let status = unsafe { snappy_uncompressed_length(compressed.as_ptr() as *const c_char, len, &mut size) };
-
-	if status == SNAPPY_INVALID_INPUT {
-		Err(InvalidInput)
-	} else {
-		Ok(size)
-	}
-}
-
-/// Compress a buffer using snappy.
-pub fn compress(input: &[u8]) -> Vec<u8> {
-	let mut buf = Vec::new();
-	compress_into(input, &mut buf);
-	buf
-}
-
-/// Compress a buffer using snappy, writing the result into
-/// the given output buffer, growing it if necessary.
-/// Otherwise, returns the length of the compressed data.
-pub fn compress_into(input: &[u8], output: &mut Vec<u8>) -> usize {
-	let mut len = max_compressed_len(input.len());
-
-	if output.len() < len {
-		output.resize(len, 0);
-	}
-
-	let status = unsafe {
-		snappy_compress(
-			input.as_ptr() as *const c_char,
-			input.len() as size_t,
-			output.as_mut_ptr() as *mut c_char,
-			&mut len as &mut size_t,
-		)
-	};
-
-	match status {
-		SNAPPY_OK => len,
-		SNAPPY_INVALID_INPUT => panic!("snappy compression has no concept of invalid input"),
-		SNAPPY_BUFFER_TOO_SMALL => panic!("buffer cannot be too small, the capacity was just ensured."),
-		_ => panic!("snappy returned unspecified status"),
-	}
-}
-
-/// Decompress a buffer using snappy. Will return an error if the buffer is not snappy-compressed.
-pub fn decompress(input: &[u8]) -> Result<Vec<u8>, InvalidInput> {
-	let mut v = Vec::new();
-	decompress_into(input, &mut v).map(|_| v)
-}
-
-/// Decompress a buffer using snappy, writing the result into
-/// the given output buffer, growing it if necessary.
-/// Will error if the input buffer is not snappy-compressed.
-/// Otherwise, returns the length of the decompressed data.
-pub fn decompress_into(input: &[u8], output: &mut Vec<u8>) -> Result<usize, InvalidInput> {
-	let mut len = decompressed_len(input)?;
-
-	if output.len() < len {
-		output.resize(len, 0);
-	}
-
-	let status = unsafe {
-		snappy_uncompress(
-			input.as_ptr() as *const c_char,
-			input.len() as size_t,
-			output.as_mut_ptr() as *mut c_char,
-			&mut len as &mut size_t,
-		)
-	};
-
-	match status {
-		SNAPPY_OK => Ok(len as usize),
-		SNAPPY_INVALID_INPUT => Err(InvalidInput),
-		SNAPPY_BUFFER_TOO_SMALL => panic!("buffer cannot be too small, size was just set to large enough."),
-		_ => panic!("snappy returned unspecified status"),
-	}
-}
-
-/// Validate a compressed buffer. True if valid, false if not.
-pub fn validate_compressed_buffer(input: &[u8]) -> bool {
-	let status = unsafe { snappy_validate_compressed_buffer(input.as_ptr() as *const c_char, input.len() as size_t )};
-	status == SNAPPY_OK
-}
diff --git a/util/src/vector.rs b/util/src/vector.rs
deleted file mode 100644
index 951d396c7369ae4204878549aaa67325e04fab8b..0000000000000000000000000000000000000000
--- a/util/src/vector.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Vector extensions.
-
-/// Returns len of prefix shared with elem
-///
-/// ```rust
-///	extern crate ethcore_util as util;
-///	use util::vector::SharedPrefix;
-///
-///	fn main () {
-///		let a = vec![1,2,3,3,5];
-///		let b = vec![1,2,3];
-///		assert_eq!(a.shared_prefix_len(&b), 3);
-///	}
-/// ```
-pub trait SharedPrefix<T> {
-	/// Get common prefix length
-	fn shared_prefix_len(&self, elem: &[T]) -> usize;
-}
-
-impl<T> SharedPrefix<T> for [T] where T: Eq {
-	fn shared_prefix_len(&self, elem: &[T]) -> usize {
-		use std::cmp;
-		let len = cmp::min(self.len(), elem.len());
-		(0..len).take_while(|&i| self[i] == elem[i]).count()
-	}
-}
-
-#[cfg(test)]
-mod test {
-	use vector::SharedPrefix;
-
-	#[test]
-	fn test_shared_prefix() {
-		let a = vec![1,2,3,4,5,6];
-		let b = vec![4,2,3,4,5,6];
-		assert_eq!(a.shared_prefix_len(&b), 0);
-	}
-
-	#[test]
-	fn test_shared_prefix2() {
-		let a = vec![1,2,3,3,5];
-		let b = vec![1,2,3];
-		assert_eq!(a.shared_prefix_len(&b), 3);
-	}
-
-	#[test]
-	fn test_shared_prefix3() {
-		let a = vec![1,2,3,4,5,6];
-		let b = vec![1,2,3,4,5,6];
-		assert_eq!(a.shared_prefix_len(&b), 6);
-	}
-}
diff --git a/util/stats/src/lib.rs b/util/stats/src/lib.rs
index 01c988232fd4323e7a9084827a9aeae122a2577c..74fda927265612247284b213986a5fd584fc6d17 100644
--- a/util/stats/src/lib.rs
+++ b/util/stats/src/lib.rs
@@ -46,6 +46,18 @@ impl<T> Deref for Corpus<T> {
 }
 
 impl<T: Ord> Corpus<T> {
+	/// Get given percentile (approximated).
+	pub fn percentile(&self, val: usize) -> Option<&T> {
+		let len = self.0.len();
+		let x = val * len / 100;
+		let x = ::std::cmp::min(x, len);
+		if x == 0 {
+			return None;
+		}
+
+		self.0.get(x - 1)
+	}
+
 	/// Get the median element, if it exists.
 	pub fn median(&self) -> Option<&T> {
 		self.0.get(self.0.len() / 2)
@@ -121,7 +133,19 @@ impl<T: Ord + Copy + ::std::fmt::Display> Histogram<T>
 
 #[cfg(test)]
 mod tests {
-	use super::Histogram;
+	use super::*;
+
+	#[test]
+	fn check_corpus() {
+		let corpus = Corpus::from(vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+		assert_eq!(corpus.percentile(0), None);
+		assert_eq!(corpus.percentile(1), None);
+		assert_eq!(corpus.percentile(101), Some(&10));
+		assert_eq!(corpus.percentile(100), Some(&10));
+		assert_eq!(corpus.percentile(50), Some(&5));
+		assert_eq!(corpus.percentile(60), Some(&6));
+		assert_eq!(corpus.median(), Some(&6));
+	}
 
 	#[test]
 	fn check_histogram() {
diff --git a/util/stop-guard/Cargo.toml b/util/stop-guard/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..bf870fb615834b58a3276034ebf9172217307660
--- /dev/null
+++ b/util/stop-guard/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "stop-guard"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
diff --git a/devtools/src/stop_guard.rs b/util/stop-guard/src/lib.rs
similarity index 100%
rename from devtools/src/stop_guard.rs
rename to util/stop-guard/src/lib.rs
diff --git a/util/table/src/lib.rs b/util/table/src/lib.rs
index e84fce07d63e87403d5de18040cc28607f4c1e55..78b2c646ae09e0810d7da23788a11e5f80566074 100644
--- a/util/table/src/lib.rs
+++ b/util/table/src/lib.rs
@@ -91,7 +91,7 @@ impl<Row, Col, Val> Table<Row, Col, Val>
 			if let None = row_map {
 				return None;
 			}
-			let mut row_map = row_map.unwrap();
+			let row_map = row_map.unwrap();
 			let val = row_map.remove(col);
 			(val, row_map.is_empty())
 		};
@@ -247,7 +247,7 @@ mod test {
 
 		// when
 		{
-			let mut row = table.row_mut(&1).unwrap();
+			let row = table.row_mut(&1).unwrap();
 			row.remove(&1);
 			row.remove(&2);
 		}
diff --git a/util/trace-time/Cargo.toml b/util/trace-time/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..00597ebfc4900121d969527854f97a9cd16bf3ba
--- /dev/null
+++ b/util/trace-time/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "trace-time"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+log = "0.3"
diff --git a/util/src/timer.rs b/util/trace-time/src/lib.rs
similarity index 73%
rename from util/src/timer.rs
rename to util/trace-time/src/lib.rs
index 791c74f152dd9cb9f586c411d4a1d6bbd486be64..e9566e7f94419fff266b1bcdd3066e40d7342fbe 100644
--- a/util/src/timer.rs
+++ b/util/trace-time/src/lib.rs
@@ -15,37 +15,41 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Performance timer with logging
-use time::precise_time_ns;
+
+#[macro_use]
+extern crate log;
+
+use std::time::Instant;
+
+#[macro_export]
+macro_rules! trace_time {
+	($name: expr) => {
+		let _timer = $crate::PerfTimer::new($name);
+	}
+}
 
 /// Performance timer with logging. Starts measuring time in the constructor, prints
 /// elapsed time in the destructor or when `stop` is called.
 pub struct PerfTimer {
 	name: &'static str,
-	start: u64,
-	stopped: bool,
+	start: Instant,
 }
 
 impl PerfTimer {
 	/// Create an instance with given name.
 	pub fn new(name: &'static str) -> PerfTimer {
 		PerfTimer {
-			name: name,
-			start: precise_time_ns(),
-			stopped: false,
-		}
-	}
-
-	/// Stop the timer and print elapsed time on trace level with `perf` target.
-	pub fn stop(&mut self) {
-		if !self.stopped {
-			trace!(target: "perf", "{}: {:.2}ms", self.name, (precise_time_ns()  - self.start) as f32 / 1000_000.0);
-			self.stopped = true;
+			name,
+			start: Instant::now(),
 		}
 	}
 }
 
 impl Drop for PerfTimer {
 	fn drop(&mut self) {
-		self.stop()
+		let elapsed = self.start.elapsed();
+		let ms = elapsed.subsec_nanos() as f32 / 1_000_000.0 +
+				 elapsed.as_secs() as f32 * 1_000.0;
+		trace!(target: "perf", "{}: {:.2}ms", self.name, ms);
 	}
 }
diff --git a/util/trie-standardmap/Cargo.toml b/util/trie-standardmap/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..caa915c542aba2aaee60eff4f11d0425275d02d2
--- /dev/null
+++ b/util/trie-standardmap/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "trie-standardmap"
+version = "0.1.0"
+authors = ["debris <marek.kotewicz@gmail.com>"]
+description = "Standard test map for profiling tries"
+
+[dependencies]
+ethcore-bytes = { path = "../bytes" }
+ethereum-types = "0.2"
+keccak-hash = { path = "../hash" }
+rlp = { path = "../rlp" }
diff --git a/util/src/trie/standardmap.rs b/util/trie-standardmap/src/lib.rs
similarity index 93%
rename from util/src/trie/standardmap.rs
rename to util/trie-standardmap/src/lib.rs
index f839f4f2ef80d718804e6147b8841f236e152d74..d7ee08ac46cc879366a7cadf8a87d7144efa00d4 100644
--- a/util/src/trie/standardmap.rs
+++ b/util/trie-standardmap/src/lib.rs
@@ -15,11 +15,15 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Key-value datastore with a modified Merkle tree.
-extern crate rand;
 
-use bytes::*;
-use sha3::*;
-use hash::*;
+extern crate ethcore_bytes as bytes;
+extern crate ethereum_types;
+extern crate keccak_hash;
+extern crate rlp;
+
+use bytes::Bytes;
+use ethereum_types::H256;
+use keccak_hash::keccak;
 use rlp::encode;
 
 /// Alphabet to use when creating words for insertion into tries.
@@ -63,14 +67,14 @@ impl StandardMap {
 	/// `seed` is mutated pseudoramdonly and used.
 	fn random_bytes(min_count: usize, journal_count: usize, seed: &mut H256) -> Vec<u8> {
 		assert!(min_count + journal_count <= 32);
-		*seed = seed.sha3();
+		*seed = keccak(&seed);
 		let r = min_count + (seed[31] as usize % (journal_count + 1));
 		seed[0..r].to_vec()
 	}
 
 	/// Get a random value. Equal chance of being 1 byte as of 32. `seed` is mutated pseudoramdonly and used.
 	fn random_value(seed: &mut H256) -> Bytes {
-		*seed = seed.sha3();
+		*seed = keccak(&seed);
 		match seed[0] % 2 {
 			1 => vec![seed[31];1],
 			_ => seed.to_vec(),
@@ -81,7 +85,7 @@ impl StandardMap {
 	/// Each byte is an item from `alphabet`. `seed` is mutated pseudoramdonly and used.
 	fn random_word(alphabet: &[u8], min_count: usize, journal_count: usize, seed: &mut H256) -> Vec<u8> {
 		assert!(min_count + journal_count <= 32);
-		*seed = seed.sha3();
+		*seed = keccak(&seed);
 		let r = min_count + (seed[31] as usize % (journal_count + 1));
 		let mut ret: Vec<u8> = Vec::with_capacity(r);
 		for i in 0..r {
diff --git a/util/triehash/Cargo.toml b/util/triehash/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..52af5911d4f31bf8958ec4a19f7baf8b6ca5e920
--- /dev/null
+++ b/util/triehash/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "triehash"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "in memory patricia trie operations"
+license = "GPL-3.0"
+
+[dependencies]
+elastic-array = "0.10"
+rlp = { version = "0.2.1", path = "../rlp" }
+ethereum-types = "0.2"
+keccak-hash = { version = "0.1", path = "../hash" }
+
+[dev-dependencies]
+trie-standardmap = { path = "../trie-standardmap" }
diff --git a/util/triehash/benches/triehash.rs b/util/triehash/benches/triehash.rs
new file mode 100644
index 0000000000000000000000000000000000000000..505ea1223d985d2af6dd0fb31e789faf2f68b19a
--- /dev/null
+++ b/util/triehash/benches/triehash.rs
@@ -0,0 +1,147 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![feature(test)]
+
+extern crate ethereum_types;
+extern crate keccak_hash;
+extern crate test;
+extern crate trie_standardmap;
+extern crate triehash;
+
+use ethereum_types::H256;
+use keccak_hash::keccak;
+use test::Bencher;
+use trie_standardmap::{Alphabet, ValueMode, StandardMap};
+use triehash::trie_root;
+
+fn random_word(alphabet: &[u8], min_count: usize, diff_count: usize, seed: &mut H256) -> Vec<u8> {
+	assert!(min_count + diff_count <= 32);
+	*seed = keccak(&seed);
+	let r = min_count + (seed[31] as usize % (diff_count + 1));
+	let mut ret: Vec<u8> = Vec::with_capacity(r);
+	for i in 0..r {
+		ret.push(alphabet[seed[i] as usize % alphabet.len()]);
+	}
+	ret
+}
+
+fn random_bytes(min_count: usize, diff_count: usize, seed: &mut H256) -> Vec<u8> {
+	assert!(min_count + diff_count <= 32);
+	*seed = keccak(&seed);
+	let r = min_count + (seed[31] as usize % (diff_count + 1));
+	seed[0..r].to_vec()
+}
+
+fn random_value(seed: &mut H256) -> Vec<u8> {
+	*seed = keccak(&seed);
+	match seed[0] % 2 {
+		1 => vec![seed[31];1],
+		_ => seed.to_vec(),
+	}
+}
+
+#[bench]
+fn triehash_insertions_32_mir_1k(b: &mut Bencher) {
+	let st = StandardMap {
+		alphabet: Alphabet::All,
+		min_key: 32,
+		journal_key: 0,
+		value_mode: ValueMode::Mirror,
+		count: 1000,
+	};
+	let d = st.make();
+	b.iter(&mut ||{
+		trie_root(d.clone()).clone();
+	});
+}
+
+#[bench]
+fn triehash_insertions_32_ran_1k(b: &mut Bencher) {
+	let st = StandardMap {
+		alphabet: Alphabet::All,
+		min_key: 32,
+		journal_key: 0,
+		value_mode: ValueMode::Random,
+		count: 1000,
+	};
+	let d = st.make();
+	b.iter(&mut ||{
+		trie_root(d.clone()).clone();
+	});
+}
+
+#[bench]
+fn triehash_insertions_six_high(b: &mut Bencher) {
+	let mut d: Vec<(Vec<u8>, Vec<u8>)> = Vec::new();
+	let mut seed = H256::new();
+	for _ in 0..1000 {
+		let k = random_bytes(6, 0, &mut seed);
+		let v = random_value(&mut seed);
+		d.push((k, v))
+	}
+
+	b.iter(&||{
+		trie_root(d.clone());
+	})
+}
+
+#[bench]
+fn triehash_insertions_six_mid(b: &mut Bencher) {
+	let alphabet = b"@QWERTYUIOPASDFGHJKLZXCVBNM[/]^_";
+	let mut d: Vec<(Vec<u8>, Vec<u8>)> = Vec::new();
+	let mut seed = H256::new();
+	for _ in 0..1000 {
+		let k = random_word(alphabet, 6, 0, &mut seed);
+		let v = random_value(&mut seed);
+		d.push((k, v))
+	}
+	b.iter(||{
+		trie_root(d.clone());
+	})
+}
+
+#[bench]
+fn triehash_insertions_random_mid(b: &mut Bencher) {
+	let alphabet = b"@QWERTYUIOPASDFGHJKLZXCVBNM[/]^_";
+	let mut d: Vec<(Vec<u8>, Vec<u8>)> = Vec::new();
+	let mut seed = H256::new();
+	for _ in 0..1000 {
+		let k = random_word(alphabet, 1, 5, &mut seed);
+		let v = random_value(&mut seed);
+		d.push((k, v))
+	}
+
+	b.iter(||{
+		trie_root(d.clone());
+	})
+}
+
+#[bench]
+fn triehash_insertions_six_low(b: &mut Bencher) {
+	let alphabet = b"abcdef";
+	let mut d: Vec<(Vec<u8>, Vec<u8>)> = Vec::new();
+	let mut seed = H256::new();
+	for _ in 0..1000 {
+		let k = random_word(alphabet, 6, 0, &mut seed);
+		let v = random_value(&mut seed);
+		d.push((k, v))
+	}
+
+	b.iter(||{
+		trie_root(d.clone());
+	})
+}
diff --git a/util/src/triehash.rs b/util/triehash/src/lib.rs
similarity index 60%
rename from util/src/triehash.rs
rename to util/triehash/src/lib.rs
index 62d3dbf97c613327f5257da249f5a53177f3942b..7f20d3915e145fd23d8b0266ad3687d4cc26c0ac 100644
--- a/util/src/triehash.rs
+++ b/util/triehash/src/lib.rs
@@ -18,117 +18,127 @@
 //!
 //! This module should be used to generate trie root hash.
 
+extern crate elastic_array;
+extern crate ethereum_types;
+extern crate keccak_hash as hash;
+extern crate rlp;
+
 use std::collections::BTreeMap;
 use std::cmp;
-use hash::*;
-use sha3::*;
-use rlp;
+use elastic_array::{ElasticArray4, ElasticArray8};
+use ethereum_types::H256;
+use hash::keccak;
 use rlp::RlpStream;
-use vector::SharedPrefix;
+
+fn shared_prefix_len<T: Eq>(first: &[T], second: &[T]) -> usize {
+	let len = cmp::min(first.len(), second.len());
+	(0..len).take_while(|&i| first[i] == second[i]).count()
+}
 
 /// Generates a trie root hash for a vector of values
 ///
 /// ```rust
-/// extern crate ethcore_util as util;
-/// use std::str::FromStr;
-/// use util::triehash::*;
-/// use util::hash::*;
+/// extern crate triehash;
+/// use triehash::ordered_trie_root;
 ///
 /// fn main() {
-/// 	let v = vec![From::from("doe"), From::from("reindeer")];
+/// 	let v = &["doe", "reindeer"];
 /// 	let root = "e766d5d51b89dc39d981b41bda63248d7abce4f0225eefd023792a540bcffee3";
-/// 	assert_eq!(ordered_trie_root(v), H256::from_str(root).unwrap());
+/// 	assert_eq!(ordered_trie_root(v), root.into());
 /// }
 /// ```
-pub fn ordered_trie_root<I>(input: I) -> H256
-	where I: IntoIterator<Item=Vec<u8>>
+pub fn ordered_trie_root<I, A>(input: I) -> H256
+	where I: IntoIterator<Item = A>,
+		  A: AsRef<[u8]>,
 {
-	let gen_input = input
+	let gen_input: Vec<_> = input
 		// first put elements into btree to sort them by nibbles
 		// optimize it later
 		.into_iter()
 		.enumerate()
-		.map(|(i, vec)| (rlp::encode(&i).into_vec(), vec))
+		.map(|(i, slice)| (rlp::encode(&i), slice))
 		.collect::<BTreeMap<_, _>>()
 		// then move them to a vector
 		.into_iter()
 		.map(|(k, v)| (as_nibbles(&k), v) )
 		.collect();
 
-	gen_trie_root(gen_input)
+	gen_trie_root(&gen_input)
 }
 
 /// Generates a trie root hash for a vector of key-values
 ///
 /// ```rust
-/// extern crate ethcore_util as util;
-/// use std::str::FromStr;
-/// use util::triehash::*;
-/// use util::hash::*;
+/// extern crate triehash;
+/// use triehash::trie_root;
 ///
 /// fn main() {
 /// 	let v = vec![
-/// 		(From::from("doe"), From::from("reindeer")),
-/// 		(From::from("dog"), From::from("puppy")),
-/// 		(From::from("dogglesworth"), From::from("cat")),
+/// 		("doe", "reindeer"),
+/// 		("dog", "puppy"),
+/// 		("dogglesworth", "cat"),
 /// 	];
 ///
 /// 	let root = "8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3";
-/// 	assert_eq!(trie_root(v), H256::from_str(root).unwrap());
+/// 	assert_eq!(trie_root(v), root.into());
 /// }
 /// ```
-pub fn trie_root<I>(input: I) -> H256
-	where I: IntoIterator<Item=(Vec<u8>, Vec<u8>)>
+pub fn trie_root<I, A, B>(input: I) -> H256
+	where I: IntoIterator<Item = (A, B)>,
+		  A: AsRef<[u8]> + Ord,
+		  B: AsRef<[u8]>,
 {
-	let gen_input = input
+	let gen_input: Vec<_> = input
 		// first put elements into btree to sort them and to remove duplicates
 		.into_iter()
 		.collect::<BTreeMap<_, _>>()
 		// then move them to a vector
 		.into_iter()
-		.map(|(k, v)| (as_nibbles(&k), v) )
+		.map(|(k, v)| (as_nibbles(k.as_ref()), v) )
 		.collect();
 
-	gen_trie_root(gen_input)
+	gen_trie_root(&gen_input)
 }
 
 /// Generates a key-hashed (secure) trie root hash for a vector of key-values.
 ///
 /// ```rust
-/// extern crate ethcore_util as util;
-/// use std::str::FromStr;
-/// use util::triehash::*;
-/// use util::hash::*;
+/// extern crate triehash;
+/// use triehash::sec_trie_root;
 ///
 /// fn main() {
 /// 	let v = vec![
-/// 		(From::from("doe"), From::from("reindeer")),
-/// 		(From::from("dog"), From::from("puppy")),
-/// 		(From::from("dogglesworth"), From::from("cat")),
+/// 		("doe", "reindeer"),
+/// 		("dog", "puppy"),
+/// 		("dogglesworth", "cat"),
 /// 	];
 ///
 /// 	let root = "d4cd937e4a4368d7931a9cf51686b7e10abb3dce38a39000fd7902a092b64585";
-/// 	assert_eq!(sec_trie_root(v), H256::from_str(root).unwrap());
+/// 	assert_eq!(sec_trie_root(v), root.into());
 /// }
 /// ```
-pub fn sec_trie_root(input: Vec<(Vec<u8>, Vec<u8>)>) -> H256 {
-	let gen_input = input
+pub fn sec_trie_root<I, A, B>(input: I) -> H256
+	where I: IntoIterator<Item = (A, B)>,
+		  A: AsRef<[u8]>,
+		  B: AsRef<[u8]>,
+{
+	let gen_input: Vec<_> = input
 		// first put elements into btree to sort them and to remove duplicates
 		.into_iter()
-		.map(|(k, v)| (k.sha3(), v))
+		.map(|(k, v)| (keccak(k), v))
 		.collect::<BTreeMap<_, _>>()
 		// then move them to a vector
 		.into_iter()
 		.map(|(k, v)| (as_nibbles(&k), v) )
 		.collect();
 
-	gen_trie_root(gen_input)
+	gen_trie_root(&gen_input)
 }
 
-fn gen_trie_root(input: Vec<(Vec<u8>, Vec<u8>)>) -> H256 {
+fn gen_trie_root<A: AsRef<[u8]>, B: AsRef<[u8]>>(input: &[(A, B)]) -> H256 {
 	let mut stream = RlpStream::new();
-	hash256rlp(&input, 0, &mut stream);
-	stream.out().sha3()
+	hash256rlp(input, 0, &mut stream);
+	keccak(stream.out())
 }
 
 /// Hex-prefix Notation. First nibble has flags: oddness = 2^0 & termination = 2^1.
@@ -150,12 +160,10 @@ fn gen_trie_root(input: Vec<(Vec<u8>, Vec<u8>)>) -> H256 {
 ///  [1,2,3,4,5,T]     0x312345   // 5 > 3
 ///  [1,2,3,4,T]       0x201234   // 4 > 3
 /// ```
-fn hex_prefix_encode(nibbles: &[u8], leaf: bool) -> Vec<u8> {
+fn hex_prefix_encode(nibbles: &[u8], leaf: bool) -> ElasticArray4<u8> {
 	let inlen = nibbles.len();
 	let oddness_factor = inlen % 2;
-	// next even number divided by two
-	let reslen = (inlen + 2) >> 1;
-	let mut res = Vec::with_capacity(reslen);
+	let mut res = ElasticArray4::new();
 
 	let first_byte = {
 		let mut bits = ((inlen as u8 & 1) + (2 * leaf as u8)) << 4;
@@ -178,8 +186,8 @@ fn hex_prefix_encode(nibbles: &[u8], leaf: bool) -> Vec<u8> {
 }
 
 /// Converts slice of bytes to nibbles.
-fn as_nibbles(bytes: &[u8]) -> Vec<u8> {
-	let mut res = Vec::with_capacity(bytes.len() * 2);
+fn as_nibbles(bytes: &[u8]) -> ElasticArray8<u8> {
+	let mut res = ElasticArray8::new();
 	for i in 0..bytes.len() {
 		let byte = bytes[i];
 		res.push(byte >> 4);
@@ -188,7 +196,7 @@ fn as_nibbles(bytes: &[u8]) -> Vec<u8> {
 	res
 }
 
-fn hash256rlp(input: &[(Vec<u8>, Vec<u8>)], pre_len: usize, stream: &mut RlpStream) {
+fn hash256rlp<A: AsRef<[u8]>, B: AsRef<[u8]>>(input: &[(A, B)], pre_len: usize, stream: &mut RlpStream) {
 	let inlen = input.len();
 
 	// in case of empty slice, just append empty data
@@ -198,14 +206,14 @@ fn hash256rlp(input: &[(Vec<u8>, Vec<u8>)], pre_len: usize, stream: &mut RlpStre
 	}
 
 	// take slices
-	let key: &[u8] = &input[0].0;
-	let value: &[u8] = &input[0].1;
+	let key: &[u8] = &input[0].0.as_ref();
+	let value: &[u8] = &input[0].1.as_ref();
 
 	// if the slice contains just one item, append the suffix of the key
 	// and then append value
 	if inlen == 1 {
 		stream.begin_list(2);
-		stream.append(&hex_prefix_encode(&key[pre_len..], true));
+		stream.append(&&*hex_prefix_encode(&key[pre_len..], true));
 		stream.append(&value);
 		return;
 	}
@@ -216,7 +224,7 @@ fn hash256rlp(input: &[(Vec<u8>, Vec<u8>)], pre_len: usize, stream: &mut RlpStre
 		.skip(1)
 		// get minimum number of shared nibbles between first and each successive
 		.fold(key.len(), | acc, &(ref k, _) | {
-			cmp::min(key.shared_prefix_len(k), acc)
+			cmp::min(shared_prefix_len(key, k.as_ref()), acc)
 		});
 
 	// if shared prefix is higher than current prefix append its
@@ -224,7 +232,7 @@ fn hash256rlp(input: &[(Vec<u8>, Vec<u8>)], pre_len: usize, stream: &mut RlpStre
 	// then recursively append suffixes of all items who had this key
 	if shared_prefix > pre_len {
 		stream.begin_list(2);
-		stream.append(&hex_prefix_encode(&key[pre_len..shared_prefix], false));
+		stream.append(&&*hex_prefix_encode(&key[pre_len..shared_prefix], false));
 		hash256aux(input, shared_prefix, stream);
 		return;
 	}
@@ -244,7 +252,7 @@ fn hash256rlp(input: &[(Vec<u8>, Vec<u8>)], pre_len: usize, stream: &mut RlpStre
 		// cout how many successive elements have same next nibble
 		let len = match begin < input.len() {
 			true => input[begin..].iter()
-				.take_while(| pair | pair.0[pre_len] == i )
+				.take_while(| pair | pair.0.as_ref()[pre_len] == i )
 				.count(),
 			false => 0
 		};
@@ -265,13 +273,13 @@ fn hash256rlp(input: &[(Vec<u8>, Vec<u8>)], pre_len: usize, stream: &mut RlpStre
 	};
 }
 
-fn hash256aux(input: &[(Vec<u8>, Vec<u8>)], pre_len: usize, stream: &mut RlpStream) {
+fn hash256aux<A: AsRef<[u8]>, B: AsRef<[u8]>>(input: &[(A, B)], pre_len: usize, stream: &mut RlpStream) {
 	let mut s = RlpStream::new();
 	hash256rlp(input, pre_len, &mut s);
 	let out = s.out();
 	match out.len() {
 		0...31 => stream.append_raw(&out, 1),
-		_ => stream.append(&out.sha3())
+		_ => stream.append(&keccak(out))
 	};
 }
 
@@ -288,50 +296,49 @@ fn test_nibbles() {
 	assert_eq!(as_nibbles(&v), e);
 }
 
-#[test]
-fn test_hex_prefix_encode() {
-	let v = vec![0, 0, 1, 2, 3, 4, 5];
-	let e = vec![0x10, 0x01, 0x23, 0x45];
-	let h = hex_prefix_encode(&v, false);
-	assert_eq!(h, e);
-
-	let v = vec![0, 1, 2, 3, 4, 5];
-	let e = vec![0x00, 0x01, 0x23, 0x45];
-	let h = hex_prefix_encode(&v, false);
-	assert_eq!(h, e);
-
-	let v = vec![0, 1, 2, 3, 4, 5];
-	let e = vec![0x20, 0x01, 0x23, 0x45];
-	let h = hex_prefix_encode(&v, true);
-	assert_eq!(h, e);
-
-	let v = vec![1, 2, 3, 4, 5];
-	let e = vec![0x31, 0x23, 0x45];
-	let h = hex_prefix_encode(&v, true);
-	assert_eq!(h, e);
-
-	let v = vec![1, 2, 3, 4];
-	let e = vec![0x00, 0x12, 0x34];
-	let h = hex_prefix_encode(&v, false);
-	assert_eq!(h, e);
-
-	let v = vec![4, 1];
-	let e = vec![0x20, 0x41];
-	let h = hex_prefix_encode(&v, true);
-	assert_eq!(h, e);
-}
 
 #[cfg(test)]
 mod tests {
-	use std::str::FromStr;
-	use hash::H256;
-	use super::trie_root;
+	use super::{trie_root, shared_prefix_len, hex_prefix_encode};
+
+	#[test]
+	fn test_hex_prefix_encode() {
+		let v = vec![0, 0, 1, 2, 3, 4, 5];
+		let e = vec![0x10, 0x01, 0x23, 0x45];
+		let h = hex_prefix_encode(&v, false);
+		assert_eq!(h, e);
+
+		let v = vec![0, 1, 2, 3, 4, 5];
+		let e = vec![0x00, 0x01, 0x23, 0x45];
+		let h = hex_prefix_encode(&v, false);
+		assert_eq!(h, e);
+
+		let v = vec![0, 1, 2, 3, 4, 5];
+		let e = vec![0x20, 0x01, 0x23, 0x45];
+		let h = hex_prefix_encode(&v, true);
+		assert_eq!(h, e);
+
+		let v = vec![1, 2, 3, 4, 5];
+		let e = vec![0x31, 0x23, 0x45];
+		let h = hex_prefix_encode(&v, true);
+		assert_eq!(h, e);
+
+		let v = vec![1, 2, 3, 4];
+		let e = vec![0x00, 0x12, 0x34];
+		let h = hex_prefix_encode(&v, false);
+		assert_eq!(h, e);
+
+		let v = vec![4, 1];
+		let e = vec![0x20, 0x41];
+		let h = hex_prefix_encode(&v, true);
+		assert_eq!(h, e);
+	}
 
 	#[test]
 	fn simple_test() {
 		assert_eq!(trie_root(vec![
-			(b"A".to_vec(), b"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".to_vec())
-		]), H256::from_str("d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab").unwrap());
+			(b"A", b"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" as &[u8])
+		]), "d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab".into());
 	}
 
 	#[test]
@@ -348,4 +355,24 @@ mod tests {
 		]));
 	}
 
+	#[test]
+	fn test_shared_prefix() {
+		let a = vec![1,2,3,4,5,6];
+		let b = vec![4,2,3,4,5,6];
+		assert_eq!(shared_prefix_len(&a, &b), 0);
+	}
+
+	#[test]
+	fn test_shared_prefix2() {
+		let a = vec![1,2,3,3,5];
+		let b = vec![1,2,3];
+		assert_eq!(shared_prefix_len(&a, &b), 3);
+	}
+
+	#[test]
+	fn test_shared_prefix3() {
+		let a = vec![1,2,3,4,5,6];
+		let b = vec![1,2,3,4,5,6];
+		assert_eq!(shared_prefix_len(&a, &b), 6);
+	}
 }
diff --git a/util/unexpected/Cargo.toml b/util/unexpected/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..35ff1a535def922ef894b5760d44511f85a25040
--- /dev/null
+++ b/util/unexpected/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "unexpected"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
diff --git a/util/unexpected/src/lib.rs b/util/unexpected/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e34b2326cf36aa389b5e214dd52db00b8d1eabcc
--- /dev/null
+++ b/util/unexpected/src/lib.rs
@@ -0,0 +1,58 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Error utils
+
+use std::fmt;
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+/// Error indicating an expected value was not found.
+pub struct Mismatch<T> {
+	/// Value expected.
+	pub expected: T,
+	/// Value found.
+	pub found: T,
+}
+
+impl<T: fmt::Display> fmt::Display for Mismatch<T> {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		f.write_fmt(format_args!("Expected {}, found {}", self.expected, self.found))
+	}
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+/// Error indicating value found is outside of a valid range.
+pub struct OutOfBounds<T> {
+	/// Minimum allowed value.
+	pub min: Option<T>,
+	/// Maximum allowed value.
+	pub max: Option<T>,
+	/// Value found.
+	pub found: T,
+}
+
+impl<T: fmt::Display> fmt::Display for OutOfBounds<T> {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		let msg = match (self.min.as_ref(), self.max.as_ref()) {
+			(Some(min), Some(max)) => format!("Min={}, Max={}", min, max),
+			(Some(min), _) => format!("Min={}", min),
+			(_, Some(max)) => format!("Max={}", max),
+			(None, None) => "".into(),
+		};
+
+		f.write_fmt(format_args!("Value {} out of bounds. {}", self.found, msg))
+	}
+}
diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..febed85c21877b78f1eb03e5fee3b29fd423a5f5
--- /dev/null
+++ b/util/version/Cargo.toml
@@ -0,0 +1,35 @@
+# NOTE This file is used by the auto-updater service.
+# Make sure to update the service if it's moved or the structure is changed.
+[package]
+name = "parity-version"
+# NOTE: this value is used for Parity version string (via env CARGO_PKG_VERSION)
+version = "1.11.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"
+
+[package.metadata]
+# This versions track. Should be changed to `stable` or `beta` when on respective branches.
+# Used by auto-updater and for Parity version string.
+track = "nightly"
+
+# Indicates a critical release in this track (i.e. consensus issue)
+critical = true
+
+# Latest supported fork blocks for various networks. Used ONLY by auto-updater.
+[package.metadata.forks]
+foundation = 4370000
+ropsten = 10
+kovan = 6600000
+
+[dependencies]
+ethcore-bytes = { path = "../bytes" }
+rlp = { path = "../rlp" }
+target_info = "0.1"
+
+[build-dependencies]
+vergen = "0.1"
+rustc_version = "0.2.0"
+toml = "0.4"
+
+[features]
+final = []
diff --git a/util/version/build.rs b/util/version/build.rs
new file mode 100644
index 0000000000000000000000000000000000000000..47c0e128f2244889aadb3d4e29d70fc20dbf5e04
--- /dev/null
+++ b/util/version/build.rs
@@ -0,0 +1,57 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate rustc_version;
+extern crate toml;
+extern crate vergen;
+
+use std::env;
+use std::fs::File;
+use std::io::Write;
+use std::path::Path;
+use vergen::{vergen, OutputFns};
+
+const ERROR_MSG: &'static str = "Failed to generate metadata files";
+
+fn main() {
+	vergen(OutputFns::all()).expect(ERROR_MSG);
+
+	let version = rustc_version::version().expect(ERROR_MSG);
+
+	let cargo: toml::Value = toml::from_str(include_str!("./Cargo.toml")).expect(ERROR_MSG);
+	let track = cargo["package"]["metadata"]["track"].as_str().expect("'track' has to be a string!");
+
+	create_file("meta.rs", format!("
+			/// This versions track.
+			#[allow(unused)]
+			pub const TRACK: &str = {track:?};
+
+			/// Returns compiler version.
+			pub fn rustc_version() -> &'static str {{
+				\"{version}\"
+			}}
+		",
+		track = track,
+		version = version,
+	));
+}
+
+fn create_file(filename: &str, data: String) {
+	let out_dir = env::var("OUT_DIR").expect(ERROR_MSG);
+	let dest_path = Path::new(&out_dir).join(filename);
+	let mut f = File::create(&dest_path).expect(ERROR_MSG);
+	f.write_all(data.as_bytes()).expect(ERROR_MSG);
+}
diff --git a/util/src/misc.rs b/util/version/src/lib.rs
similarity index 76%
rename from util/src/misc.rs
rename to util/version/src/lib.rs
index e33b5e85786cd90d401c7b74a85afe70a18176d0..6c56bfb7e6817a9f6669fe060bd020d087ef39a3 100644
--- a/util/src/misc.rs
+++ b/util/version/src/lib.rs
@@ -14,32 +14,33 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Diff misc.
+//! Parity version specific information.
+
+extern crate target_info;
+extern crate ethcore_bytes as bytes;
+extern crate rlp;
 
-use rlp::RlpStream;
 use target_info::Target;
-use Bytes;
+use bytes::Bytes;
+use rlp::RlpStream;
+
+mod vergen {
+	#![allow(unused)]
+	include!(concat!(env!("OUT_DIR"), "/version.rs"));
+}
 
-include!(concat!(env!("OUT_DIR"), "/version.rs"));
-include!(concat!(env!("OUT_DIR"), "/rustc_version.rs"));
+mod generated {
+	include!(concat!(env!("OUT_DIR"), "/meta.rs"));
+}
 
 #[cfg(feature = "final")]
-const THIS_TRACK: &'static str = "nightly";
-// ^^^ should be reset to "stable" or "beta" according to the release branch.
+const THIS_TRACK: &'static str = generated::TRACK;
+// ^^^ should be reset in Cargo.toml to "stable" or "beta" according to the release branch.
 
 #[cfg(not(feature = "final"))]
 const THIS_TRACK: &'static str = "unstable";
 // ^^^ This gets used when we're not building a final release; should stay as "unstable".
 
-/// Boolean type for clean/dirty status.
-#[derive(PartialEq, Eq, Clone, Copy, Debug)]
-pub enum Filth {
-	/// Data has not been changed.
-	Clean,
-	/// Data has been changed.
-	Dirty,
-}
-
 /// Get the platform identifier.
 pub fn platform() -> String {
 	let env = Target::env();
@@ -49,11 +50,11 @@ pub fn platform() -> String {
 
 /// Get the standard version string for this software.
 pub fn version() -> String {
-	let sha3 = short_sha();
+	let sha3 = vergen::short_sha();
 	let sha3_dash = if sha3.is_empty() { "" } else { "-" };
-	let commit_date = commit_date().replace("-", "");
+	let commit_date = vergen::commit_date().replace("-", "");
 	let date_dash = if commit_date.is_empty() { "" } else { "-" };
-	format!("Parity/v{}-{}{}{}{}{}/{}/rustc{}", env!("CARGO_PKG_VERSION"), THIS_TRACK, sha3_dash, sha3, date_dash, commit_date, platform(), rustc_version())
+	format!("Parity/v{}-{}{}{}{}{}/{}/rustc{}", env!("CARGO_PKG_VERSION"), THIS_TRACK, sha3_dash, sha3, date_dash, commit_date, platform(), generated::rustc_version())
 }
 
 /// Get the standard version data for this software.
@@ -65,12 +66,12 @@ pub fn version_data() -> Bytes {
 		env!("CARGO_PKG_VERSION_PATCH").parse::<u32>().expect("Environment variables are known to be valid; qed");
 	s.append(&v);
 	s.append(&"Parity");
-	s.append(&rustc_version());
+	s.append(&generated::rustc_version());
 	s.append(&&Target::os()[0..2]);
 	s.out()
 }
 
 /// Provide raw information on the package.
 pub fn raw_package_info() -> (&'static str, &'static str, &'static str) {
-	(THIS_TRACK, env!["CARGO_PKG_VERSION"], sha())
+	(THIS_TRACK, env!["CARGO_PKG_VERSION"], vergen::sha())
 }
diff --git a/whisper/Cargo.toml b/whisper/Cargo.toml
index b4898f00d61242ab80d030a841974b1e2ac632ab..35d15fa76e17625f9128bafd172c547d56e51701 100644
--- a/whisper/Cargo.toml
+++ b/whisper/Cargo.toml
@@ -7,26 +7,24 @@ description = "Whisper Protocol implementation for Parity"
 [dependencies]
 bitflags = "0.9"
 byteorder = "1.0.0"
-ethcore-bigint = { path = "../util/bigint" }
+ethereum-types = "0.2"
 ethcore-network = { path = "../util/network" }
 ethcrypto = { path = "../ethcrypto" }
 ethkey = { path = "../ethkey" }
-futures = "0.1"
 hex = "0.2"
 log = "0.3"
 ordered-float = "0.5"
-parking_lot = "0.4"
-rand = "0.3"
-ring = "0.9.5"
+parking_lot = "0.5"
+rand = "0.4"
+ring = "0.12"
 rlp = { path = "../util/rlp" }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 slab = "0.3"
 smallvec = "0.4"
-time = "0.1"
 tiny-keccak = "1.3"
 
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
diff --git a/whisper/src/lib.rs b/whisper/src/lib.rs
index e865637edd0f20d9dbc499707eb37e689463ccf9..1f8449604bdd57eb735b2de15395c10e6c45d624 100644
--- a/whisper/src/lib.rs
+++ b/whisper/src/lib.rs
@@ -18,11 +18,10 @@
 //! interface.
 
 extern crate byteorder;
-extern crate ethcore_bigint as bigint;
 extern crate ethcore_network as network;
 extern crate ethcrypto;
+extern crate ethereum_types;
 extern crate ethkey;
-extern crate futures;
 extern crate hex;
 extern crate ordered_float;
 extern crate parking_lot;
@@ -30,10 +29,8 @@ extern crate rand;
 extern crate rlp;
 extern crate ring;
 extern crate serde;
-extern crate serde_json;
 extern crate slab;
 extern crate smallvec;
-extern crate time;
 extern crate tiny_keccak;
 
 extern crate jsonrpc_core;
@@ -51,6 +48,9 @@ extern crate jsonrpc_macros;
 #[macro_use]
 extern crate serde_derive;
 
+#[cfg(test)]
+extern crate serde_json;
+
 pub use self::message::Message;
 pub use self::net::{Network, MessageHandler};
 
diff --git a/whisper/src/message.rs b/whisper/src/message.rs
index e5202c5839b92299e82452ab9ea1538076a80704..126acebd25abaf96f821d5ea077979c6e8025fc8 100644
--- a/whisper/src/message.rs
+++ b/whisper/src/message.rs
@@ -17,9 +17,9 @@
 //! Whisper message parsing, handlers, and construction.
 
 use std::fmt;
-use std::time::{self, SystemTime, Duration};
+use std::time::{self, SystemTime, Duration, Instant};
 
-use bigint::hash::{H256, H512};
+use ethereum_types::{H256, H512};
 use rlp::{self, DecoderError, RlpStream, UntrustedRlp};
 use smallvec::SmallVec;
 use tiny_keccak::{keccak256, Keccak};
@@ -56,23 +56,18 @@ impl Topic {
 	/// this takes 3 sets of 9 bits, treating each as an index in the range
 	/// 0..512 into the bloom and setting the corresponding bit in the bloom to 1.
 	pub fn bloom_into(&self, bloom: &mut H512) {
-		let mut set_bit = |idx: usize| {
-			let idx = idx & 511;
-			bloom[idx / 8] |= 1 << idx % 8;
-		};
 
 		let data = &self.0;
-		let mut combined = ((data[0] as usize) << 24) |
-			((data[1] as usize) << 16) |
-			((data[2] as usize) << 8) |
-			data[3] as usize;
+		for i in 0..3 {
+			let mut idx = data[i] as usize;
 
-		// take off the last 5 bits as we only use 27.
-		combined >>= 5;
+			if data[3] & (1 << i) != 0 {
+				idx += 256;
+			}
 
-		set_bit(combined);
-		set_bit(combined >> 9);
-		set_bit(combined >> 18);
+			debug_assert!(idx <= 511);
+			bloom[idx / 8] |= 1 << (7 - idx % 8);
+		}
 	}
 
 	/// Get bloom for single topic.
@@ -118,6 +113,7 @@ pub fn bloom_topics(topics: &[Topic]) -> H512 {
 #[derive(Debug)]
 pub enum Error {
 	Decoder(DecoderError),
+	EmptyTopics,
 	LivesTooLong,
 	IssuedInFuture,
 	ZeroTTL,
@@ -136,10 +132,27 @@ impl fmt::Display for Error {
 			Error::LivesTooLong => write!(f, "Message claims to be issued before the unix epoch."),
 			Error::IssuedInFuture => write!(f, "Message issued in future."),
 			Error::ZeroTTL => write!(f, "Message live for zero time."),
+			Error::EmptyTopics => write!(f, "Message has no topics."),
 		}
 	}
 }
 
+fn append_topics<'a>(s: &'a mut RlpStream, topics: &[Topic]) -> &'a mut RlpStream {
+	if topics.len() == 1 {
+		s.append(&topics[0])
+	} else {
+		s.append_list(&topics)
+	}
+}
+
+fn decode_topics(rlp: UntrustedRlp) -> Result<SmallVec<[Topic; 4]>, DecoderError> {
+	if rlp.is_list() {
+		rlp.iter().map(|r| r.as_val::<Topic>()).collect()
+	} else {
+		rlp.as_val().map(|t| SmallVec::from_slice(&[t]))
+	}
+}
+
 // Raw envelope struct.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Envelope {
@@ -156,15 +169,20 @@ pub struct Envelope {
 }
 
 impl Envelope {
+	/// Whether the message is multi-topic. Only relay these to Parity peers.
+	pub fn is_multitopic(&self) -> bool {
+		self.topics.len() != 1
+	}
+
 	fn proving_hash(&self) -> H256 {
 		use byteorder::{BigEndian, ByteOrder};
 
 		let mut buf = [0; 32];
 
 		let mut stream = RlpStream::new_list(4);
-		stream.append(&self.expiry)
-			.append(&self.ttl)
-			.append_list(&self.topics)
+		stream.append(&self.expiry).append(&self.ttl);
+
+		append_topics(&mut stream, &self.topics)
 			.append(&self.data);
 
 		let mut digest = Keccak::new_keccak256();
@@ -185,8 +203,9 @@ impl rlp::Encodable for Envelope {
 	fn rlp_append(&self, s: &mut RlpStream) {
 		s.begin_list(5)
 			.append(&self.expiry)
-			.append(&self.ttl)
-			.append_list(&self.topics)
+			.append(&self.ttl);
+
+		append_topics(s, &self.topics)
 			.append(&self.data)
 			.append(&self.nonce);
 	}
@@ -199,13 +218,17 @@ impl rlp::Decodable for Envelope {
 		Ok(Envelope {
 			expiry: rlp.val_at(0)?,
 			ttl: rlp.val_at(1)?,
-			topics: rlp.at(2)?.iter().map(|x| x.as_val()).collect::<Result<_, _>>()?,
+			topics: decode_topics(rlp.at(2)?)?,
 			data: rlp.val_at(3)?,
 			nonce: rlp.val_at(4)?,
 		})
 	}
 }
 
+/// Error indicating no topics.
+#[derive(Debug, Copy, Clone)]
+pub struct EmptyTopics;
+
 /// Message creation parameters.
 /// Pass this to `Message::create` to make a message.
 pub struct CreateParams {
@@ -213,7 +236,7 @@ pub struct CreateParams {
 	pub ttl: u64,
 	/// payload data.
 	pub payload: Vec<u8>,
-	/// Topics.
+	/// Topics. May not be empty.
 	pub topics: Vec<Topic>,
 	/// How many milliseconds to spend proving work.
 	pub work: u64,
@@ -231,10 +254,12 @@ pub struct Message {
 impl Message {
 	/// Create a message from creation parameters.
 	/// Panics if TTL is 0.
-	pub fn create(params: CreateParams) -> Self {
+	pub fn create(params: CreateParams) -> Result<Self, EmptyTopics> {
 		use byteorder::{BigEndian, ByteOrder};
 		use rand::{Rng, SeedableRng, XorShiftRng};
 
+		if params.topics.is_empty() { return Err(EmptyTopics) }
+
 		let mut rng = {
 			let mut thread_rng = ::rand::thread_rng();
 
@@ -254,10 +279,8 @@ impl Message {
 
 		let start_digest = {
 			let mut stream = RlpStream::new_list(4);
-			stream.append(&expiry)
-				.append(&params.ttl)
-				.append_list(&params.topics)
-				.append(&params.payload);
+			stream.append(&expiry).append(&params.ttl);
+			append_topics(&mut stream, &params.topics).append(&params.payload);
 
 			let mut digest = Keccak::new_keccak256();
 			digest.update(&*stream.drain());
@@ -276,9 +299,9 @@ impl Message {
 		let mut nonce: [u8; 8] = rng.gen();
 		let mut best_found = try_nonce(&nonce);
 
-		let start = ::time::precise_time_ns();
+		let start = Instant::now();
 
-		while ::time::precise_time_ns() <= start + params.work * 1_000_000 {
+		while start.elapsed() <= Duration::from_millis(params.work) {
 			let temp_nonce = rng.gen();
 			let hash = try_nonce(&temp_nonce);
 
@@ -300,12 +323,12 @@ impl Message {
 
 		let encoded = ::rlp::encode(&envelope);
 
-		Message::from_components(
+		Ok(Message::from_components(
 			envelope,
 			encoded.len(),
 			H256(keccak256(&encoded)),
 			SystemTime::now(),
-		).expect("Message generated here known to be valid; qed")
+		).expect("Message generated here known to be valid; qed"))
 	}
 
 	/// Decode message from RLP and check for validity against system time.
@@ -327,6 +350,8 @@ impl Message {
 		if envelope.expiry <= envelope.ttl { return Err(Error::LivesTooLong) }
 		if envelope.ttl == 0 { return Err(Error::ZeroTTL) }
 
+		if envelope.topics.is_empty() { return Err(Error::EmptyTopics) }
+
 		let issue_time_adjusted = Duration::from_secs(
 			(envelope.expiry - envelope.ttl).saturating_sub(LEEWAY_SECONDS)
 		);
@@ -394,6 +419,7 @@ mod tests {
 	use super::*;
 	use std::time::{self, Duration, SystemTime};
 	use rlp::UntrustedRlp;
+	use smallvec::SmallVec;
 
 	fn unix_time(x: u64) -> SystemTime {
 		time::UNIX_EPOCH + Duration::from_secs(x)
@@ -401,12 +427,12 @@ mod tests {
 
 	#[test]
 	fn create_message() {
-		let _ = Message::create(CreateParams {
+		assert!(Message::create(CreateParams {
 			ttl: 100,
 			payload: vec![1, 2, 3, 4],
-			topics: Vec::new(),
+			topics: vec![Topic([1, 2, 1, 2])],
 			work: 50,
-		});
+		}).is_ok());
 	}
 
 	#[test]
@@ -415,7 +441,23 @@ mod tests {
 			expiry: 100_000,
 			ttl: 30,
 			data: vec![9; 256],
-			topics: Default::default(),
+			topics: SmallVec::from_slice(&[Default::default()]),
+			nonce: 1010101,
+		};
+
+		let encoded = ::rlp::encode(&envelope);
+		let decoded = ::rlp::decode(&encoded);
+
+		assert_eq!(envelope, decoded)
+	}
+
+	#[test]
+	fn round_trip_multitopic() {
+		let envelope = Envelope {
+			expiry: 100_000,
+			ttl: 30,
+			data: vec![9; 256],
+			topics: SmallVec::from_slice(&[Default::default(), Topic([1, 2, 3, 4])]),
 			nonce: 1010101,
 		};
 
@@ -431,7 +473,7 @@ mod tests {
 			expiry: 100_000,
 			ttl: 30,
 			data: vec![9; 256],
-			topics: Default::default(),
+			topics: SmallVec::from_slice(&[Default::default()]),
 			nonce: 1010101,
 		};
 
@@ -450,7 +492,7 @@ mod tests {
 			expiry: 100_000,
 			ttl: 30,
 			data: vec![9; 256],
-			topics: Default::default(),
+			topics: SmallVec::from_slice(&[Default::default()]),
 			nonce: 1010101,
 		};
 
@@ -467,7 +509,7 @@ mod tests {
 			expiry: 100_000,
 			ttl: 200_000,
 			data: vec![9; 256],
-			topics: Default::default(),
+			topics: SmallVec::from_slice(&[Default::default()]),
 			nonce: 1010101,
 		};
 
diff --git a/whisper/src/net.rs b/whisper/src/net/mod.rs
similarity index 72%
rename from whisper/src/net.rs
rename to whisper/src/net/mod.rs
index 5553f27e62ecd0e41210ef7b03ec9e634660bfc6..621da8fa1d754eee5871e2149146592ecd5846f6 100644
--- a/whisper/src/net.rs
+++ b/whisper/src/net/mod.rs
@@ -22,32 +22,49 @@ use std::fmt;
 use std::time::{Duration, SystemTime};
 use std::sync::Arc;
 
-use bigint::hash::{H256, H512};
-use network::{HostInfo, NetworkContext, NetworkError, NodeId, PeerId, TimerToken};
+use ethereum_types::{H256, H512};
+use network::{self, HostInfo, NetworkContext, NodeId, PeerId, ProtocolId, TimerToken};
 use ordered_float::OrderedFloat;
 use parking_lot::{Mutex, RwLock};
 use rlp::{DecoderError, RlpStream, UntrustedRlp};
 
 use message::{Message, Error as MessageError};
 
+#[cfg(test)]
+mod tests;
+
+// how often periodic relays are. when messages are imported
+// we directly broadcast.
 const RALLY_TOKEN: TimerToken = 1;
-const RALLY_TIMEOUT_MS: u64 = 750; // supposed to be at least once per second.
+const RALLY_TIMEOUT_MS: u64 = 2500;
 
-const PROTOCOL_VERSION: usize = 2;
+/// Current protocol version.
+pub const PROTOCOL_VERSION: usize = 6;
 
 /// Supported protocol versions.
 pub const SUPPORTED_VERSIONS: &'static [u8] = &[PROTOCOL_VERSION as u8];
 
 // maximum tolerated delay between messages packets.
-const MAX_TOLERATED_DELAY_MS: u64 = 2000;
+const MAX_TOLERATED_DELAY_MS: u64 = 5000;
+
+/// Number of packets. A bunch are reserved.
+pub const PACKET_COUNT: u8 = 128;
+
+/// Whisper protocol ID
+pub const PROTOCOL_ID: ::network::ProtocolId = *b"shh";
 
-/// Number of packets.
-pub const PACKET_COUNT: u8 = 3;
+/// Parity-whisper protocol ID
+/// Current parity-specific extensions:
+///   - Multiple topics in packet.
+pub const PARITY_PROTOCOL_ID: ::network::ProtocolId = *b"pwh";
 
 mod packet {
 	pub const STATUS: u8 = 0;
 	pub const MESSAGES: u8 = 1;
-	pub const TOPIC_FILTER: u8 = 2;
+	pub const POW_REQUIREMENT: u8 = 2;
+	pub const TOPIC_FILTER: u8 = 3;
+
+	// 126, 127 for mail server stuff we will never implement here.
 }
 
 /// Handles messages within a single packet.
@@ -65,13 +82,11 @@ pub trait MessageHandler: Send + Sync {
 #[derive(Debug)]
 enum Error {
 	Decoder(DecoderError),
-	Network(NetworkError),
+	Network(network::Error),
 	Message(MessageError),
-	UnknownPacket(u8),
 	UnknownPeer(PeerId),
-	ProtocolVersionMismatch(usize),
-	SameNodeKey,
 	UnexpectedMessage,
+	InvalidPowReq,
 }
 
 impl From<DecoderError> for Error {
@@ -80,8 +95,8 @@ impl From<DecoderError> for Error {
 	}
 }
 
-impl From<NetworkError> for Error {
-	fn from(err: NetworkError) -> Self {
+impl From<network::Error> for Error {
+	fn from(err: network::Error) -> Self {
 		Error::Network(err)
 	}
 }
@@ -98,12 +113,9 @@ impl fmt::Display for Error {
 			Error::Decoder(ref err) => write!(f, "Failed to decode packet: {}", err),
 			Error::Network(ref err) => write!(f, "Network error: {}", err),
 			Error::Message(ref err) => write!(f, "Error decoding message: {}", err),
-			Error::UnknownPacket(ref id) => write!(f, "Unknown packet kind: {}", id),
 			Error::UnknownPeer(ref id) => write!(f, "Message received from unknown peer: {}", id),
-			Error::ProtocolVersionMismatch(ref proto) =>
-				write!(f, "Unknown protocol version: {}", proto),
 			Error::UnexpectedMessage => write!(f, "Unexpected message."),
-			Error::SameNodeKey => write!(f, "Peer and us have same node key."),
+			Error::InvalidPowReq => write!(f, "Peer sent invalid PoW requirement."),
 		}
 	}
 }
@@ -298,15 +310,18 @@ impl Messages {
 
 enum State {
 	Unconfirmed(SystemTime), // awaiting status packet.
-	TheirTurn(SystemTime), // it has been their turn to send since stored time.
-	OurTurn,
+	Confirmed,
 }
 
+#[allow(dead_code)] // for node key. this will be useful for topic routing.
 struct Peer {
 	node_key: NodeId,
 	state: State,
 	known_messages: HashSet<H256>,
 	topic_filter: Option<H512>,
+	pow_requirement: f64,
+	is_parity: bool,
+	_protocol_version: usize,
 }
 
 impl Peer {
@@ -319,16 +334,18 @@ impl Peer {
 
 	// whether this peer will accept the message.
 	fn will_accept(&self, message: &Message) -> bool {
-		let known = self.known_messages.contains(message.hash());
+		if self.known_messages.contains(message.hash()) { return false }
 
-		let matches_bloom = self.topic_filter.as_ref()
-			.map_or(true, |topic| topic & message.bloom() == message.bloom().clone());
+		// only parity peers will accept multitopic messages.
+		if message.envelope().is_multitopic() && !self.is_parity { return false }
+		if message.work_proved() < self.pow_requirement { return false }
 
-		!known && matches_bloom
+		self.topic_filter.as_ref()
+			.map_or(true, |filter| &(filter & message.bloom()) == message.bloom())
 	}
 
-	// note a message as known. returns true if it was already
-	// known, false otherwise.
+	// note a message as known. returns false if it was already
+	// known, true otherwise.
 	fn note_known(&mut self, message: &Message) -> bool {
 		self.known_messages.insert(message.hash().clone())
 	}
@@ -337,10 +354,14 @@ impl Peer {
 		self.topic_filter = Some(topic);
 	}
 
+	fn set_pow_requirement(&mut self, pow_requirement: f64) {
+		self.pow_requirement = pow_requirement;
+	}
+
 	fn can_send_messages(&self) -> bool {
 		match self.state {
-			State::Unconfirmed(_) | State::OurTurn => false,
-			State::TheirTurn(_) => true,
+			State::Unconfirmed(_) => false,
+			State::Confirmed => true,
 		}
 	}
 }
@@ -357,21 +378,41 @@ pub struct PoolStatus {
 	pub target_size: usize,
 }
 
-/// Handle to the pool, for posting messages or getting info.
-#[derive(Clone)]
-pub struct PoolHandle {
-	messages: Arc<RwLock<Messages>>,
+/// Generic network context.
+pub trait Context {
+	/// Disconnect a peer.
+	fn disconnect_peer(&self, PeerId);
+	/// Disable a peer.
+	fn disable_peer(&self, PeerId);
+	/// Get a peer's node key.
+	fn node_key(&self, PeerId) -> Option<NodeId>;
+	/// Get a peer's protocol version for given protocol.
+	fn protocol_version(&self, ProtocolId, PeerId) -> Option<u8>;
+	/// Send message to peer.
+	fn send(&self, PeerId, u8, Vec<u8>);
 }
 
-impl PoolHandle {
-	/// Post a message to the whisper network to be relayed.
-	pub fn post_message(&self, message: Message) -> bool {
-		self.messages.write().insert(message)
+impl<T> Context for T where T: ?Sized + NetworkContext {
+	fn disconnect_peer(&self, peer: PeerId) {
+		NetworkContext::disconnect_peer(self, peer);
+	}
+	fn disable_peer(&self, peer: PeerId) {
+		NetworkContext::disable_peer(self, peer)
+	}
+	fn node_key(&self, peer: PeerId) -> Option<NodeId> {
+		self.session_info(peer).and_then(|info| info.id)
+	}
+	fn protocol_version(&self, proto_id: ProtocolId, peer: PeerId) -> Option<u8> {
+		NetworkContext::protocol_version(self, proto_id, peer)
 	}
 
-	/// Get number of messages and amount of memory used by them.
-	pub fn pool_status(&self) -> PoolStatus {
-		self.messages.read().status()
+	fn send(&self, peer: PeerId, packet_id: u8, message: Vec<u8>) {
+		if let Err(e) = NetworkContext::send(self, peer, packet_id, message) {
+			debug!(target: "whisper", "Failed to send packet {} to peer {}: {}",
+				packet_id, peer, e);
+
+			self.disconnect_peer(peer)
+		}
 	}
 }
 
@@ -395,15 +436,23 @@ impl<T> Network<T> {
 		}
 	}
 
-	/// Acquire a sender to asynchronously feed messages to the whisper
-	/// network.
-	pub fn handle(&self) -> PoolHandle {
-		PoolHandle { messages: self.messages.clone() }
+	/// Post a message to the whisper network to be relayed.
+	pub fn post_message<C: ?Sized + Context>(&self, message: Message, context: &C) -> bool
+		where T: MessageHandler
+	{
+		let ok = self.messages.write().insert(message);
+		if ok { self.rally(context) }
+		ok
+	}
+
+	/// Get number of messages and amount of memory used by them.
+	pub fn pool_status(&self) -> PoolStatus {
+		self.messages.read().status()
 	}
 }
 
 impl<T: MessageHandler> Network<T> {
-	fn rally(&self, io: &NetworkContext) {
+	fn rally<C: ?Sized + Context>(&self, io: &C) {
 		// cannot be greater than 16MB (protocol limitation)
 		const MAX_MESSAGES_PACKET_SIZE: usize = 8 * 1024 * 1024;
 
@@ -428,11 +477,11 @@ impl<T: MessageHandler> Network<T> {
 
 			// check timeouts and skip peers who we can't send a rally to.
 			match peer_data.state {
-				State::Unconfirmed(ref time) | State::TheirTurn(ref time) => {
+				State::Unconfirmed(ref time)  => {
 					punish_timeout(time);
 					continue;
 				}
-				State::OurTurn => {}
+				State::Confirmed => {}
 			}
 
 			// construct packet, skipping messages the peer won't accept.
@@ -452,39 +501,19 @@ impl<T: MessageHandler> Network<T> {
 
 			stream.complete_unbounded_list();
 
-			peer_data.state = State::TheirTurn(SystemTime::now());
-			if let Err(e) = io.send(*peer_id, packet::MESSAGES, stream.out()) {
-				debug!(target: "whisper", "Failed to send messages packet to peer {}: {}", peer_id, e);
-				io.disconnect_peer(*peer_id);
-			}
+			io.send(*peer_id, packet::MESSAGES, stream.out());
 		}
 	}
 
 	// handle status packet from peer.
-	fn on_status(&self, peer: &PeerId, status: UntrustedRlp)
+	fn on_status(&self, peer: &PeerId, _status: UntrustedRlp)
 		-> Result<(), Error>
 	{
-		let proto: usize = status.as_val()?;
-		if proto != PROTOCOL_VERSION { return Err(Error::ProtocolVersionMismatch(proto)) }
-
 		let peers = self.peers.read();
+
 		match peers.get(peer) {
 			Some(peer) => {
-				let mut peer = peer.lock();
-				let our_node_key = self.node_key.read().clone();
-
-				// handle this basically impossible edge case gracefully.
-				if peer.node_key == our_node_key {
-					return Err(Error::SameNodeKey);
-				}
-
-				// peer with lower node key begins the rally.
-				if peer.node_key > our_node_key {
-					peer.state = State::OurTurn;
-				} else {
-					peer.state = State::TheirTurn(SystemTime::now());
-				}
-
+				peer.lock().state = State::Confirmed;
 				Ok(())
 			}
 			None => {
@@ -513,8 +542,6 @@ impl<T: MessageHandler> Network<T> {
 				return Err(Error::UnexpectedMessage);
 			}
 
-			peer.state = State::OurTurn;
-
 			let now = SystemTime::now();
 			let mut messages_vec = message_packet.iter().map(|rlp| Message::decode(rlp, now))
 				.collect::<Result<Vec<_>, _>>()?;
@@ -541,6 +568,42 @@ impl<T: MessageHandler> Network<T> {
 		Ok(())
 	}
 
+	fn on_pow_requirement(&self, peer: &PeerId, requirement: UntrustedRlp)
+		-> Result<(), Error>
+	{
+		use byteorder::{ByteOrder, BigEndian};
+
+		let peers = self.peers.read();
+		match peers.get(peer) {
+			Some(peer) => {
+				let mut peer = peer.lock();
+
+				if let State::Unconfirmed(_) = peer.state {
+					return Err(Error::UnexpectedMessage);
+				}
+				let bytes: Vec<u8> = requirement.as_val()?;
+				if bytes.len() != ::std::mem::size_of::<f64>() {
+					return Err(Error::InvalidPowReq);
+				}
+
+				// as of byteorder 1.1.0, this is always defined.
+				let req = BigEndian::read_f64(&bytes[..]);
+
+				if !req.is_normal() {
+					return Err(Error::InvalidPowReq);
+				}
+
+				peer.set_pow_requirement(req);
+			}
+			None => {
+				debug!(target: "whisper", "Received message from unknown peer.");
+				return Err(Error::UnknownPeer(*peer));
+			}
+		}
+
+		Ok(())
+	}
+
 	fn on_topic_filter(&self, peer: &PeerId, filter: UntrustedRlp)
 		-> Result<(), Error>
 	{
@@ -564,10 +627,10 @@ impl<T: MessageHandler> Network<T> {
 		Ok(())
 	}
 
-	fn on_connect(&self, io: &NetworkContext, peer: &PeerId) {
+	fn on_connect<C: ?Sized + Context>(&self, io: &C, peer: &PeerId) {
 		trace!(target: "whisper", "Connecting peer {}", peer);
 
-		let node_key = match io.session_info(*peer).and_then(|info| info.id) {
+		let node_key = match io.node_key(*peer) {
 			Some(node_key) => node_key,
 			None => {
 				debug!(target: "whisper", "Disconnecting peer {}, who has no node key.", peer);
@@ -576,16 +639,40 @@ impl<T: MessageHandler> Network<T> {
 			}
 		};
 
+		let version = match io.protocol_version(PROTOCOL_ID, *peer) {
+			Some(version) => version as usize,
+			None => {
+				io.disable_peer(*peer);
+				return
+			}
+		};
+
 		self.peers.write().insert(*peer, Mutex::new(Peer {
 			node_key: node_key,
 			state: State::Unconfirmed(SystemTime::now()),
 			known_messages: HashSet::new(),
 			topic_filter: None,
+			pow_requirement: 0f64,
+			is_parity: io.protocol_version(PARITY_PROTOCOL_ID, *peer).is_some(),
+			_protocol_version: version,
 		}));
 
-		if let Err(e) = io.send(*peer, packet::STATUS, ::rlp::encode(&PROTOCOL_VERSION).to_vec()) {
-			debug!(target: "whisper", "Error sending status: {}", e);
-			io.disconnect_peer(*peer);
+		io.send(*peer, packet::STATUS, ::rlp::EMPTY_LIST_RLP.to_vec());
+	}
+
+	fn on_packet<C: ?Sized + Context>(&self, io: &C, peer: &PeerId, packet_id: u8, data: &[u8]) {
+		let rlp = UntrustedRlp::new(data);
+		let res = match packet_id {
+			packet::STATUS => self.on_status(peer, rlp),
+			packet::MESSAGES => self.on_messages(peer, rlp),
+			packet::POW_REQUIREMENT => self.on_pow_requirement(peer, rlp),
+			packet::TOPIC_FILTER => self.on_topic_filter(peer, rlp),
+			_ => Ok(()), // ignore unknown packets.
+		};
+
+		if let Err(e) = res {
+			trace!(target: "whisper", "Disabling peer due to misbehavior: {}", e);
+			io.disable_peer(*peer);
 		}
 	}
 
@@ -605,18 +692,7 @@ impl<T: MessageHandler> ::network::NetworkProtocolHandler for Network<T> {
 	}
 
 	fn read(&self, io: &NetworkContext, peer: &PeerId, packet_id: u8, data: &[u8]) {
-		let rlp = UntrustedRlp::new(data);
-		let res = match packet_id {
-			packet::STATUS => self.on_status(peer, rlp),
-			packet::MESSAGES => self.on_messages(peer, rlp),
-			packet::TOPIC_FILTER => self.on_topic_filter(peer, rlp),
-			other => Err(Error::UnknownPacket(other)),
-		};
-
-		if let Err(e) = res {
-			trace!(target: "whisper", "Disabling peer due to misbehavior: {}", e);
-			io.disable_peer(*peer);
-		}
+		self.on_packet(io, peer, packet_id, data)
 	}
 
 	fn connected(&self, io: &NetworkContext, peer: &PeerId) {
@@ -632,7 +708,23 @@ impl<T: MessageHandler> ::network::NetworkProtocolHandler for Network<T> {
 		// rally with each peer and handle timeouts.
 		match timer {
 			RALLY_TOKEN => self.rally(io),
-			other => debug!(target: "whisper", "Timout triggered on unknown token {}", other),
+			other => debug!(target: "whisper", "Timeout triggered on unknown token {}", other),
 		}
 	}
 }
+
+/// Dummy subprotocol used for parity extensions.
+#[derive(Debug, Copy, Clone)]
+pub struct ParityExtensions;
+
+impl ::network::NetworkProtocolHandler for ParityExtensions {
+	fn initialize(&self, _io: &NetworkContext, _host_info: &HostInfo) { }
+
+	fn read(&self, _io: &NetworkContext, _peer: &PeerId, _id: u8, _msg: &[u8]) { }
+
+	fn connected(&self, _io: &NetworkContext, _peer: &PeerId) { }
+
+	fn disconnected(&self, _io: &NetworkContext, _peer: &PeerId) { }
+
+	fn timeout(&self, _io: &NetworkContext, _timer: TimerToken) { }
+}
diff --git a/whisper/src/net/tests.rs b/whisper/src/net/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..51c9c00ce272653f8c8db7dd110fc8943b79b3e2
--- /dev/null
+++ b/whisper/src/net/tests.rs
@@ -0,0 +1,192 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Tests for the whisper network module.
+
+use std::collections::HashSet;
+use std::sync::mpsc;
+
+use parking_lot::Mutex;
+use network::{NodeId, PeerId};
+
+use message::{CreateParams, Message};
+use super::*;
+
+struct TestHandler(Mutex<mpsc::Sender<Message>>);
+
+impl MessageHandler for TestHandler {
+	fn handle_messages(&self, messages: &[Message]) {
+		let tx = self.0.lock();
+		for message in messages {
+			let _ = tx.send(message.clone());
+		}
+	}
+}
+
+struct TestPeer {
+	network: Network<TestHandler>,
+	recv: mpsc::Receiver<Message>,
+	disconnected: Mutex<HashSet<PeerId>>,
+}
+
+impl TestPeer {
+	fn create() -> Self {
+		let (tx, rx) = mpsc::channel();
+
+		TestPeer {
+			network: Network::new(10 * 1024 * 1024, TestHandler(Mutex::new(tx))),
+			recv: rx,
+			disconnected: Mutex::new(HashSet::new()),
+		}
+	}
+}
+
+struct TestNetwork {
+	peers: Vec<TestPeer>,
+}
+
+impl TestNetwork {
+	fn new(n_peers: usize) -> Self {
+		let unconnected_peers: Vec<_> = (0..n_peers).map(|_| TestPeer::create()).collect();
+		for i in 0..n_peers {
+			for j in (i + 1)..n_peers {
+				let (peer1, peer2) = (&unconnected_peers[i], &unconnected_peers[j]);
+				let ctx1 = TestContext::new(&unconnected_peers, i);
+				let ctx2 = TestContext::new(&unconnected_peers, j);
+
+				peer1.network.on_connect(&ctx1, &j);
+				peer2.network.on_connect(&ctx2, &i);
+			}
+		}
+
+		TestNetwork {
+			peers: unconnected_peers,
+		}
+	}
+
+	fn post_message_from(&self, id: PeerId, msg: Message) {
+		self.peers[id].network.post_message(msg, &TestContext::new(&self.peers, id));
+	}
+}
+
+enum Event {
+	Disconnect(PeerId, PeerId),
+	Send(PeerId, PeerId, u8, Vec<u8>),
+}
+
+struct TestContext<'a> {
+	peers: &'a [TestPeer],
+	local_id: PeerId,
+	events: Mutex<Vec<Event>>,
+}
+
+impl<'a> TestContext<'a> {
+	fn new(peers: &'a [TestPeer], local_id: PeerId) -> Self {
+		TestContext {
+			peers,
+			local_id,
+			events: Mutex::new(Vec::new()),
+		}
+	}
+}
+
+impl<'a> Context for TestContext<'a> {
+	fn disconnect_peer(&self, id: PeerId) {
+		self.events.lock().push(Event::Disconnect(self.local_id, id));
+	}
+
+	fn disable_peer(&self, id: PeerId) {
+		self.events.lock().push(Event::Disconnect(self.local_id, id));
+	}
+
+	fn node_key(&self, peer: PeerId) -> Option<NodeId> {
+		let mut id = NodeId::default();
+		id[0] = peer as _;
+		Some(id)
+	}
+
+	fn protocol_version(&self, id: ::network::ProtocolId, _peer: PeerId) -> Option<u8> {
+		if &id == b"shh" || &id == b"pwh" {
+			Some(PROTOCOL_VERSION as _)
+		} else {
+			None
+		}
+	}
+
+	fn send(&self, peer: PeerId, packet: u8, data: Vec<u8>) {
+		self.events.lock().push(Event::Send(self.local_id, peer, packet, data));
+	}
+}
+
+impl<'a> Drop for TestContext<'a> {
+	fn drop(&mut self) {
+		let events = self.events.get_mut();
+		while !events.is_empty() {
+			let mut deferred = Vec::new();
+			for event in events.drain(..) {
+				match event {
+					Event::Disconnect(from, target) => {
+						self.peers[from].network.on_disconnect(&target);
+						self.peers[target].network.on_disconnect(&from);
+
+						self.peers[from].disconnected.lock().insert(target);
+						self.peers[target].disconnected.lock().insert(from);
+					}
+					Event::Send(from, target, packet, data) => {
+						if self.peers[from].disconnected.lock().contains(&target) {
+							continue;
+						}
+
+						let mut inner_ctx = TestContext::new(self.peers, target);
+
+						self.peers[target].network.on_packet(
+							&inner_ctx,
+							&from,
+							packet,
+							&data[..]
+						);
+
+						// don't recursively apply disconnects or new messages
+						// from the receiver's actions yet.
+						let inner_events = ::std::mem::replace(inner_ctx.events.get_mut(), Vec::new());
+						deferred.extend(inner_events);
+					}
+				}
+			}
+
+			events.extend(deferred);
+		}
+	}
+}
+
+#[test]
+fn message_gets_relayed() {
+	let network = TestNetwork::new(5);
+	let message = Message::create(CreateParams {
+		ttl: 500,
+		payload: b"this is my payload, pal".to_vec(),
+		topics: vec![[0, 1, 2, 3].into()],
+		work: 25,
+	}).unwrap();
+
+	network.post_message_from(0, message.clone());
+
+	assert!(network.peers[0].recv.try_recv().is_err());
+
+	for i in 1..5 {
+		assert_eq!(network.peers[i].recv.try_recv().unwrap(), message);
+	}
+}
diff --git a/whisper/src/rpc/crypto.rs b/whisper/src/rpc/crypto.rs
index 19c26fda876a22ded07f7db788a73aec73c7b0dd..8dcfed88a61c3d07451d3d15d006756c6d07daf1 100644
--- a/whisper/src/rpc/crypto.rs
+++ b/whisper/src/rpc/crypto.rs
@@ -16,7 +16,7 @@
 
 //! Encryption schemes supported by RPC layer.
 
-use bigint::hash::H256;
+use ethereum_types::H256;
 use ethkey::{self, Public, Secret};
 use ring::aead::{self, AES_256_GCM, SealingKey, OpeningKey};
 
diff --git a/whisper/src/rpc/filter.rs b/whisper/src/rpc/filter.rs
index 2b0c7544ddf4d8c06a4b7eda4a5576f11fcc8379..663c6a6bf7b1725d7229bbfec38d0aafe0abd5a9 100644
--- a/whisper/src/rpc/filter.rs
+++ b/whisper/src/rpc/filter.rs
@@ -20,7 +20,7 @@ use std::collections::HashMap;
 use std::sync::{mpsc, Arc};
 use std::thread;
 
-use bigint::hash::{H256, H512};
+use ethereum_types::{H256, H512};
 use ethkey::Public;
 use jsonrpc_macros::pubsub::{Subscriber, Sink};
 use parking_lot::{Mutex, RwLock};
@@ -111,7 +111,7 @@ impl Manager {
 			.map_err(|_| "unable to acquire secure randomness")?
 			.gen();
 
-		sub.assign_id(::jsonrpc_pubsub::SubscriptionId::String(id.hex()))
+		sub.assign_id(::jsonrpc_pubsub::SubscriptionId::String(format!("{:x}", id)))
 			.map(move |sink| {
 				let entry = FilterEntry::Subscription(Arc::new(filter), sink);
 				self.filters.write().insert(id, entry);
@@ -307,7 +307,7 @@ impl Filter {
 
 #[cfg(test)]
 mod tests {
-	use message::{CreateParams, Message};
+	use message::{CreateParams, Message, Topic};
 	use rpc::types::{FilterRequest, HexEncode};
 	use rpc::abridge_topic;
 	use super::*;
@@ -325,38 +325,40 @@ mod tests {
 
 	#[test]
 	fn basic_match() {
-		let topics = vec![vec![1, 2, 3], vec![4, 5, 6]];
+		let topics = vec![vec![1, 2, 3, 4], vec![5, 6, 7, 8]];
+		let abridged_topics: Vec<_> = topics.iter().map(|x| abridge_topic(&x)).collect();
+
 		let req = FilterRequest {
 			decrypt_with: Default::default(),
 			from: None,
-			topics: topics.iter().cloned().map(HexEncode).collect(),
+			topics: topics.into_iter().map(HexEncode).collect(),
 		};
 
 		let filter = Filter::new(req).unwrap();
 		let message = Message::create(CreateParams {
 			ttl: 100,
 			payload: vec![1, 3, 5, 7, 9],
-			topics: topics.iter().map(|x| abridge_topic(&x)).collect(),
+			topics: abridged_topics.clone(),
 			work: 0,
-		});
+		}).unwrap();
 
 		assert!(filter.basic_matches(&message));
 
 		let message = Message::create(CreateParams {
 			ttl: 100,
 			payload: vec![1, 3, 5, 7, 9],
-			topics: topics.iter().take(1).map(|x| abridge_topic(&x)).collect(),
+			topics: abridged_topics.clone(),
 			work: 0,
-		});
+		}).unwrap();
 
 		assert!(filter.basic_matches(&message));
 
 		let message = Message::create(CreateParams {
 			ttl: 100,
 			payload: vec![1, 3, 5, 7, 9],
-			topics: Vec::new(),
+			topics: vec![Topic([1, 8, 3, 99])],
 			work: 0,
-		});
+		}).unwrap();
 
 		assert!(!filter.basic_matches(&message));
 	}
@@ -366,6 +368,9 @@ mod tests {
 		use rpc::payload::{self, EncodeParams};
 		use rpc::key_store::{Key, KeyStore};
 
+		let topics = vec![vec![1, 2, 3, 4], vec![5, 6, 7, 8]];
+		let abridged_topics: Vec<_> = topics.iter().map(|x| abridge_topic(&x)).collect();
+
 		let mut store = KeyStore::new().unwrap();
 		let signing_pair = Key::new_asymmetric(store.rng());
 		let encrypting_key = Key::new_symmetric(store.rng());
@@ -386,24 +391,25 @@ mod tests {
 		let message = Message::create(CreateParams {
 			ttl: 100,
 			payload: encrypted,
-			topics: vec![abridge_topic(&[9; 32])],
+			topics: abridged_topics.clone(),
 			work: 0,
-		});
+		}).unwrap();
 
 		let message2 = Message::create(CreateParams {
 			ttl: 100,
 			payload: vec![3, 5, 7, 9],
-			topics: vec![abridge_topic(&[9; 32])],
+			topics: abridged_topics,
 			work: 0,
-		});
+		}).unwrap();
 
 		let filter = Filter::new(FilterRequest {
 			decrypt_with: Some(HexEncode(decrypt_id)),
 			from: Some(HexEncode(signing_pair.public().unwrap().clone())),
-			topics: vec![HexEncode(vec![9; 32])],
+			topics: topics.into_iter().map(HexEncode).collect(),
 		}).unwrap();
 
 		assert!(filter.basic_matches(&message));
+		assert!(filter.basic_matches(&message2));
 
 		let items = ::std::cell::Cell::new(0);
 		let on_match = |_| { items.set(items.get() + 1); };
diff --git a/whisper/src/rpc/key_store.rs b/whisper/src/rpc/key_store.rs
index ac9e758d6e780716894f478c4699587722d3061a..f71ec5bf3b3294ea7e0c535d3338610317cb6cec 100644
--- a/whisper/src/rpc/key_store.rs
+++ b/whisper/src/rpc/key_store.rs
@@ -21,7 +21,7 @@
 
 use std::collections::HashMap;
 
-use bigint::hash::H256;
+use ethereum_types::H256;
 use ethkey::{KeyPair, Public, Secret};
 use rand::{Rng, OsRng};
 use ring::error::Unspecified;
diff --git a/whisper/src/rpc/mod.rs b/whisper/src/rpc/mod.rs
index 6cec20c6958f17b35107b7fc9dd73d79b18e3c82..039df08a87a658f594151e8cbc5383883f330eee 100644
--- a/whisper/src/rpc/mod.rs
+++ b/whisper/src/rpc/mod.rs
@@ -27,8 +27,7 @@ use jsonrpc_core::{Error, ErrorCode, Metadata};
 use jsonrpc_pubsub::{Session, PubSubMetadata, SubscriptionId};
 use jsonrpc_macros::pubsub;
 
-use bigint::hash::H256;
-use futures::{future, BoxFuture};
+use ethereum_types::H256;
 use parking_lot::RwLock;
 
 use self::filter::Filter;
@@ -140,7 +139,7 @@ build_rpc_trait! {
 			/// Unsubscribe from filter matching given ID. Return
 			/// true on success, error otherwise.
 			#[rpc(name = "shh_unsubscribe")]
-			fn unsubscribe(&self, SubscriptionId) -> BoxFuture<bool, Error>;
+			fn unsubscribe(&self, SubscriptionId) -> Result<bool, Error>;
 		}
 	}
 }
@@ -155,16 +154,6 @@ pub trait PoolHandle: Send + Sync {
 	fn pool_status(&self) -> ::net::PoolStatus;
 }
 
-impl PoolHandle for ::net::PoolHandle {
-	fn relay(&self, message: Message) -> bool {
-		self.post_message(message)
-	}
-
-	fn pool_status(&self) -> ::net::PoolStatus {
-		::net::PoolHandle::pool_status(self)
-	}
-}
-
 /// Default, simple metadata implementation.
 #[derive(Clone, Default)]
 pub struct Meta {
@@ -339,7 +328,7 @@ impl<P: PoolHandle + 'static, M: Send + Sync + 'static> Whisper for WhisperClien
 			payload: encrypted,
 			topics: req.topics.into_iter().map(|x| abridge_topic(&x.into_inner())).collect(),
 			work: req.priority,
-		});
+		}).map_err(|_| whisper_error("Empty topics"))?;
 
 		if !self.pool.relay(message) {
 			Err(whisper_error("PoW too low to compete with other messages"))
@@ -387,7 +376,7 @@ impl<P: PoolHandle + 'static, M: Send + Sync + PubSubMetadata> WhisperPubSub for
 		}
 	}
 
-	fn unsubscribe(&self, id: SubscriptionId) -> BoxFuture<bool, Error> {
+	fn unsubscribe(&self, id: SubscriptionId) -> Result<bool, Error> {
 		use std::str::FromStr;
 
 		let res = match id {
@@ -397,6 +386,6 @@ impl<P: PoolHandle + 'static, M: Send + Sync + PubSubMetadata> WhisperPubSub for
 			SubscriptionId::Number(_) => Err("unrecognized ID"),
 		};
 
-		Box::new(future::done(res.map_err(whisper_error)))
+		res.map_err(whisper_error)
 	}
 }
diff --git a/whisper/src/rpc/payload.rs b/whisper/src/rpc/payload.rs
index b68f55a29151d730aab8911c3dd0dbd3bff28c00..75d24bd7cfe70778f4233742bf19232f210e85d5 100644
--- a/whisper/src/rpc/payload.rs
+++ b/whisper/src/rpc/payload.rs
@@ -33,7 +33,7 @@
 //!
 //! AES-256-GCM will append 12 bytes of metadata to the front of the message.
 
-use bigint::hash::H256;
+use ethereum_types::H256;
 use byteorder::{BigEndian, ByteOrder, WriteBytesExt};
 use ethkey::{Public, Secret};
 use tiny_keccak::keccak256;
diff --git a/whisper/src/rpc/types.rs b/whisper/src/rpc/types.rs
index ac06d69d5de97f5ffbe72537b42a1bb7fec55a94..9598f48bf8e7473607482a73e4bc5fc9363e2a65 100644
--- a/whisper/src/rpc/types.rs
+++ b/whisper/src/rpc/types.rs
@@ -19,7 +19,7 @@
 use std::fmt;
 use std::ops::Deref;
 
-use bigint::hash::*;
+use ethereum_types::{H32, H64, H128, H256, H264, H512, H1024};
 use hex::{ToHex, FromHex};
 
 use serde::{Serialize, Serializer, Deserialize, Deserializer};
@@ -221,7 +221,7 @@ pub struct FilterItem {
 	/// Time to live in seconds.
 	pub ttl: u64,
 
-	/// Abridged topics that matched the filter.
+	/// Topics that matched the filter.
 	pub topics: Vec<Bytes>,
 
 	/// Unix timestamp of the message generation.
diff --git a/windows/ptray/ptray.cpp b/windows/ptray/ptray.cpp
index 30f41b35a021a76d8e9e690ad8b6ddb776f0a3bf..8fc29880e9eb8114e6d59df41199d1343c7f6fe0 100644
--- a/windows/ptray/ptray.cpp
+++ b/windows/ptray/ptray.cpp
@@ -315,8 +315,9 @@ void OpenUI()
 	STARTUPINFO startupInfo = { sizeof(STARTUPINFO) };
 
 	LPWSTR args = new WCHAR[lstrlen(commandLineFiltered) + MAX_PATH + 2];
-	lstrcpy(args, L"parity.exe ui ");
+	lstrcpy(args, L"parity.exe ");
 	lstrcat(args, commandLineFiltered);
+	lstrcat(args, L" ui");
 	CreateProcess(path, args, nullptr, nullptr, false, CREATE_NO_WINDOW, nullptr, nullptr, &startupInfo, &procInfo);
 }
 
diff --git a/windows/ptray/ptray.ico b/windows/ptray/ptray.ico
index 337475b70f72e51fd991f9b672a275eacd446b0d..cda99eef8b3668827befd6a13ff8268c096ceae4 100644
Binary files a/windows/ptray/ptray.ico and b/windows/ptray/ptray.ico differ